From 7a6b6e3286b2d53e9514f6c28112d147d8a7f2b7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 2 Feb 2020 21:30:46 +0200 Subject: [PATCH 0001/2667] Revert "Close hass mariadb ports" This reverts commit 9f4f7b530f2a8c6723ec9746cba961319791df51. --- docker/homeautomation/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 18f5c96b..0af8f85d 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -68,5 +68,7 @@ services: restart: always environment: - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + ports: + - '3308:3306' volumes: - /docker/homeautomation/mariadb:/var/lib/mysql From d6d7e528a6efd8c29653c5c51a430480425ddba2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 2 Feb 2020 21:30:46 +0200 Subject: [PATCH 0002/2667] Revert "Close hass mariadb ports" This reverts commit 5d440f2da26469b3379729d0d99201838b99ffb5. --- docker/homeautomation/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 18f5c96b..0af8f85d 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -68,5 +68,7 @@ services: restart: always environment: - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + ports: + - '3308:3306' volumes: - /docker/homeautomation/mariadb:/var/lib/mysql From 9e022ab03cffa0a6012fb3efba633950ca803262 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 2 Feb 2020 21:36:32 +0200 Subject: [PATCH 0003/2667] Small fix --- docker/gitea/docker-compose.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 3dab71fe..5cfe0da4 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -12,7 +12,7 @@ services: - USER_UID=1000 - USER_GID=1000 - DB_TYPE=mysql - - DB_HOST=db:3306 + - DB_HOST=mariadb-gitea:3306 - DB_NAME=gitea - DB_USER=gitea - DB_PASSWD=gitea @@ -27,9 +27,9 @@ services: - '3000:3000' - '222:22' depends_on: - - db + - mariadb-gitea - mariadb: + mariadb-gitea: container_name: mariadb-gitea image: mariadb restart: always From 99a23c459ed25993f717b59338f95cac368a6aaf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 2 Feb 2020 21:36:32 +0200 Subject: [PATCH 0004/2667] Small fix --- docker/gitea/docker-compose.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 3dab71fe..5cfe0da4 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -12,7 +12,7 @@ services: - USER_UID=1000 - USER_GID=1000 - DB_TYPE=mysql - - DB_HOST=db:3306 + - DB_HOST=mariadb-gitea:3306 - DB_NAME=gitea - DB_USER=gitea - DB_PASSWD=gitea @@ -27,9 +27,9 @@ services: - '3000:3000' - '222:22' depends_on: - - db + - mariadb-gitea - mariadb: + mariadb-gitea: container_name: mariadb-gitea image: mariadb restart: always From 8dce460010b3a71c1563353d0ecd33cf767c46ef Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 15:12:48 +0200 Subject: [PATCH 0005/2667] Add replaygain to mpv --- home/.config/mpv/mpv.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index 265b49ba..396ee1a3 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -18,6 +18,7 @@ ao=alsa ############# pulse-buffer=50 # using a large buffer causes seeking issues audio-pitch-correction=yes # automatically insert scaletempo when playing with higher speed +replaygain=track ############# # Plugins/misc # From c3c0a1c4db0a687b35721d8ac61a1209a01e48c0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 15:12:48 +0200 Subject: [PATCH 0006/2667] Add replaygain to mpv --- home/.config/mpv/mpv.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index 265b49ba..396ee1a3 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -18,6 +18,7 @@ ao=alsa ############# pulse-buffer=50 # using a large buffer causes seeking issues audio-pitch-correction=yes # automatically insert scaletempo when playing with higher speed +replaygain=track ############# # Plugins/misc # From 3df77990b2cbd20525131336ab2bb81dbbc7aeda Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:21:11 +0200 Subject: [PATCH 0007/2667] Move tvheadend and gitea to docker --- docker/gitea/docker-compose.yaml | 7 ++++--- docker/tvheadend/docker-compose.yaml | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 docker/tvheadend/docker-compose.yaml diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 5cfe0da4..b05f2773 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -33,9 +33,10 @@ services: container_name: mariadb-gitea image: mariadb restart: always + networks: + - gitea environment: - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - ports: - - '3308:3306' + - MYSQL_ROOT_PASSWORD=gitea volumes: - /docker/gitea/mariadb:/var/lib/mysql + - /etc/localtime:/etc/localtime:ro diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml new file mode 100644 index 00000000..ef5edad4 --- /dev/null +++ b/docker/tvheadend/docker-compose.yaml @@ -0,0 +1,19 @@ +version: '2' +services: + tvheadend: + image: linuxserver/tvheadend + container_name: tvheadend + environment: + - PUID=1001 + - PGID=985 + volumes: + - /docker/tvheadend:/config + - /mnt/Storage/Media/PVR:/recordings + - /etc/localtime:/etc/localtime:ro + ports: + - 9981:9981 + - 9982:9982 + devices: + - /dev/dri:/dev/dri #hardware acceleration + - /dev/dvb:/dev/dvb #tuner card + restart: always From 9de39fde972ccbcb6f18b1ebde0a44bcc3278bcd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:21:11 +0200 Subject: [PATCH 0008/2667] Move tvheadend and gitea to docker --- docker/gitea/docker-compose.yaml | 7 ++++--- docker/tvheadend/docker-compose.yaml | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 docker/tvheadend/docker-compose.yaml diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 5cfe0da4..b05f2773 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -33,9 +33,10 @@ services: container_name: mariadb-gitea image: mariadb restart: always + networks: + - gitea environment: - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - ports: - - '3308:3306' + - MYSQL_ROOT_PASSWORD=gitea volumes: - /docker/gitea/mariadb:/var/lib/mysql + - /etc/localtime:/etc/localtime:ro diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml new file mode 100644 index 00000000..ef5edad4 --- /dev/null +++ b/docker/tvheadend/docker-compose.yaml @@ -0,0 +1,19 @@ +version: '2' +services: + tvheadend: + image: linuxserver/tvheadend + container_name: tvheadend + environment: + - PUID=1001 + - PGID=985 + volumes: + - /docker/tvheadend:/config + - /mnt/Storage/Media/PVR:/recordings + - /etc/localtime:/etc/localtime:ro + ports: + - 9981:9981 + - 9982:9982 + devices: + - /dev/dri:/dev/dri #hardware acceleration + - /dev/dvb:/dev/dvb #tuner card + restart: always From 0a81f69da6cdf2f49781bd7b0f68d39b50573a59 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:21:26 +0200 Subject: [PATCH 0009/2667] Change rivendell ssh port --- home/.ssh/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.ssh/config b/home/.ssh/config index 47217b82..9fa6018c 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -1,6 +1,6 @@ host gitea - HostName git.reekynet.com - user gitea + HostName reekynet.com + user git host gitlab HostName gitlab.com @@ -20,7 +20,7 @@ Host aur host rivendell HostName reekynet.com - port 22 + port 222 User gimli ForwardAgent yes From 25813f6680d42e791da57a76e89eefb87000b292 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:21:26 +0200 Subject: [PATCH 0010/2667] Change rivendell ssh port --- home/.ssh/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.ssh/config b/home/.ssh/config index 47217b82..9fa6018c 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -1,6 +1,6 @@ host gitea - HostName git.reekynet.com - user gitea + HostName reekynet.com + user git host gitlab HostName gitlab.com @@ -20,7 +20,7 @@ Host aur host rivendell HostName reekynet.com - port 22 + port 222 User gimli ForwardAgent yes From bb2f9580dfddc47a9c3b8224dabaa475888b030f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:21:43 +0200 Subject: [PATCH 0011/2667] Small fixes --- home/.EFISTUB/01-arch.efi | 2 +- home/.newsboat/urls | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/home/.EFISTUB/01-arch.efi b/home/.EFISTUB/01-arch.efi index 61ab7e03..a5f67c2b 100755 --- a/home/.EFISTUB/01-arch.efi +++ b/home/.EFISTUB/01-arch.efi @@ -9,4 +9,4 @@ sudo efibootmgr \ --remove-dups \ --label "Arch Linux" \ --loader /vmlinuz-linux \ - --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=3 vga=current vt.global_cursor_default=0 processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0' + --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=3 vga=current processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0' diff --git a/home/.newsboat/urls b/home/.newsboat/urls index 713ee5b1..e4ef2427 100644 --- a/home/.newsboat/urls +++ b/home/.newsboat/urls @@ -1,6 +1,4 @@ -https://www.mindfactory.de/xml/rss/mindstar_artikel.xml https://github.com/TeamNewPipe/NewPipe/releases.atom "Git" -https://github.com/overdodactyl/ShadowFox/releases.atom "Git" https://github.com/home-assistant/home-assistant/releases.atom "Git" https://github.com/zeapo/Android-Password-Store/releases.atom "Git" https://github.com/ccrama/Slide/releases.atom "Git" From 5273fd2432d3bd59b05110252e214e93f3c4d3c9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:21:43 +0200 Subject: [PATCH 0012/2667] Small fixes --- home/.EFISTUB/01-arch.efi | 2 +- home/.newsboat/urls | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/home/.EFISTUB/01-arch.efi b/home/.EFISTUB/01-arch.efi index 61ab7e03..a5f67c2b 100755 --- a/home/.EFISTUB/01-arch.efi +++ b/home/.EFISTUB/01-arch.efi @@ -9,4 +9,4 @@ sudo efibootmgr \ --remove-dups \ --label "Arch Linux" \ --loader /vmlinuz-linux \ - --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=3 vga=current vt.global_cursor_default=0 processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0' + --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=3 vga=current processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0' diff --git a/home/.newsboat/urls b/home/.newsboat/urls index 713ee5b1..e4ef2427 100644 --- a/home/.newsboat/urls +++ b/home/.newsboat/urls @@ -1,6 +1,4 @@ -https://www.mindfactory.de/xml/rss/mindstar_artikel.xml https://github.com/TeamNewPipe/NewPipe/releases.atom "Git" -https://github.com/overdodactyl/ShadowFox/releases.atom "Git" https://github.com/home-assistant/home-assistant/releases.atom "Git" https://github.com/zeapo/Android-Password-Store/releases.atom "Git" https://github.com/ccrama/Slide/releases.atom "Git" From b0e9ce34f241f9c889b05b9b8a76cf67f087261c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:23:04 +0200 Subject: [PATCH 0013/2667] Fix timezones --- docker/homeautomation/docker-compose.yml | 12 +++++++----- docker/jellyfin/docker-compose.yaml | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 0af8f85d..bc213ec1 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -1,13 +1,12 @@ version: '3' services: home-assistant: - environment: - TZ: 'Europe/Helsinki' container_name: home-assistant restart: always image: homeassistant/home-assistant volumes: - /docker/homeautomation/home-assistant:/config + - /etc/localtime:/etc/localtime:ro network_mode: host depends_on: - deconz @@ -26,8 +25,9 @@ services: DEBUG_OTAU: 1 network_mode: host volumes: - - /etc/localtime:/etc/localtime:ro - /docker/homeautomation/deconz:/root/.local/share/dresden-elektronik/deCONZ + + - /etc/localtime:/etc/localtime:ro devices: - /dev/ttyACM0 @@ -35,12 +35,11 @@ services: container_name: node-red image: nodered/node-red restart: always - environment: - TZ: 'Europe/Helsinki' ports: - '1880:1880' volumes: - /docker/homeautomation/node-red:/data + - /etc/localtime:/etc/localtime:ro depends_on: - home-assistant @@ -53,6 +52,7 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - /docker/homeautomation/portainer:/data + - /etc/localtime:/etc/localtime:ro mosquitto: container_name: mosquitto @@ -61,6 +61,7 @@ services: network_mode: host volumes: - /docker/homeautomation/mosquitto:/mosquitto + - /etc/localtime:/etc/localtime:ro mariadb: container_name: mariadb-hass @@ -72,3 +73,4 @@ services: - '3308:3306' volumes: - /docker/homeautomation/mariadb:/var/lib/mysql + - /etc/localtime:/etc/localtime:ro diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 99481612..859c1861 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -10,3 +10,4 @@ services: - /docker/jellyfin/config:/config - /docker/jellyfin/cache:/cache - /mnt/Storage/Media:/media + - /etc/localtime:/etc/localtime:ro From 3b374a70d545be712c41df39438df31b4e3d34ea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:23:04 +0200 Subject: [PATCH 0014/2667] Fix timezones --- docker/homeautomation/docker-compose.yml | 12 +++++++----- docker/jellyfin/docker-compose.yaml | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 0af8f85d..bc213ec1 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -1,13 +1,12 @@ version: '3' services: home-assistant: - environment: - TZ: 'Europe/Helsinki' container_name: home-assistant restart: always image: homeassistant/home-assistant volumes: - /docker/homeautomation/home-assistant:/config + - /etc/localtime:/etc/localtime:ro network_mode: host depends_on: - deconz @@ -26,8 +25,9 @@ services: DEBUG_OTAU: 1 network_mode: host volumes: - - /etc/localtime:/etc/localtime:ro - /docker/homeautomation/deconz:/root/.local/share/dresden-elektronik/deCONZ + + - /etc/localtime:/etc/localtime:ro devices: - /dev/ttyACM0 @@ -35,12 +35,11 @@ services: container_name: node-red image: nodered/node-red restart: always - environment: - TZ: 'Europe/Helsinki' ports: - '1880:1880' volumes: - /docker/homeautomation/node-red:/data + - /etc/localtime:/etc/localtime:ro depends_on: - home-assistant @@ -53,6 +52,7 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - /docker/homeautomation/portainer:/data + - /etc/localtime:/etc/localtime:ro mosquitto: container_name: mosquitto @@ -61,6 +61,7 @@ services: network_mode: host volumes: - /docker/homeautomation/mosquitto:/mosquitto + - /etc/localtime:/etc/localtime:ro mariadb: container_name: mariadb-hass @@ -72,3 +73,4 @@ services: - '3308:3306' volumes: - /docker/homeautomation/mariadb:/var/lib/mysql + - /etc/localtime:/etc/localtime:ro diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 99481612..859c1861 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -10,3 +10,4 @@ services: - /docker/jellyfin/config:/config - /docker/jellyfin/cache:/cache - /mnt/Storage/Media:/media + - /etc/localtime:/etc/localtime:ro From 04fc693e77edd1c91a1ae7f35bd270f7ff24d5d4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:25:15 +0200 Subject: [PATCH 0015/2667] Move portainer to it's own stack --- docker/homeautomation/docker-compose.yml | 11 ----------- docker/portainer/docker-compose.yaml | 12 ++++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 docker/portainer/docker-compose.yaml diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index bc213ec1..fb53ef47 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -43,17 +43,6 @@ services: depends_on: - home-assistant - portainer: - container_name: portainer - image: portainer/portainer - restart: always - ports: - - '9000:9000' - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - /docker/homeautomation/portainer:/data - - /etc/localtime:/etc/localtime:ro - mosquitto: container_name: mosquitto image: eclipse-mosquitto diff --git a/docker/portainer/docker-compose.yaml b/docker/portainer/docker-compose.yaml new file mode 100644 index 00000000..04a36899 --- /dev/null +++ b/docker/portainer/docker-compose.yaml @@ -0,0 +1,12 @@ +version: '3' +services: + portainer: + container_name: portainer + image: portainer/portainer + restart: always + ports: + - '9000:9000' + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /docker/homeautomation/portainer:/data + - /etc/localtime:/etc/localtime:ro From 0e08dea809b905f7facf4b8189e94e7137553d5c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:25:15 +0200 Subject: [PATCH 0016/2667] Move portainer to it's own stack --- docker/homeautomation/docker-compose.yml | 11 ----------- docker/portainer/docker-compose.yaml | 12 ++++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 docker/portainer/docker-compose.yaml diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index bc213ec1..fb53ef47 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -43,17 +43,6 @@ services: depends_on: - home-assistant - portainer: - container_name: portainer - image: portainer/portainer - restart: always - ports: - - '9000:9000' - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - /docker/homeautomation/portainer:/data - - /etc/localtime:/etc/localtime:ro - mosquitto: container_name: mosquitto image: eclipse-mosquitto diff --git a/docker/portainer/docker-compose.yaml b/docker/portainer/docker-compose.yaml new file mode 100644 index 00000000..04a36899 --- /dev/null +++ b/docker/portainer/docker-compose.yaml @@ -0,0 +1,12 @@ +version: '3' +services: + portainer: + container_name: portainer + image: portainer/portainer + restart: always + ports: + - '9000:9000' + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /docker/homeautomation/portainer:/data + - /etc/localtime:/etc/localtime:ro From 8543481f81bd1b4da9508c7d3feba89d1e1725fc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:25:37 +0200 Subject: [PATCH 0017/2667] Change portainer volume path --- docker/portainer/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/portainer/docker-compose.yaml b/docker/portainer/docker-compose.yaml index 04a36899..38ea459f 100644 --- a/docker/portainer/docker-compose.yaml +++ b/docker/portainer/docker-compose.yaml @@ -8,5 +8,5 @@ services: - '9000:9000' volumes: - /var/run/docker.sock:/var/run/docker.sock - - /docker/homeautomation/portainer:/data + - /docker/portainer:/data - /etc/localtime:/etc/localtime:ro From 6a086f709ee3566e89b83fdfc40fb5cadbf0e9d9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:25:37 +0200 Subject: [PATCH 0018/2667] Change portainer volume path --- docker/portainer/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/portainer/docker-compose.yaml b/docker/portainer/docker-compose.yaml index 04a36899..38ea459f 100644 --- a/docker/portainer/docker-compose.yaml +++ b/docker/portainer/docker-compose.yaml @@ -8,5 +8,5 @@ services: - '9000:9000' volumes: - /var/run/docker.sock:/var/run/docker.sock - - /docker/homeautomation/portainer:/data + - /docker/portainer:/data - /etc/localtime:/etc/localtime:ro From c6a8d99bf910b14a8b1995bfe109f300228dbf32 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 8 Feb 2020 17:27:58 +0200 Subject: [PATCH 0019/2667] Remove freepbx --- docker/freepbx/docker-compose.yaml | 31 ------------------------------ 1 file changed, 31 deletions(-) delete mode 100644 docker/freepbx/docker-compose.yaml diff --git a/docker/freepbx/docker-compose.yaml b/docker/freepbx/docker-compose.yaml deleted file mode 100644 index 149da0b6..00000000 --- a/docker/freepbx/docker-compose.yaml +++ /dev/null @@ -1,31 +0,0 @@ -version: '2' - -services: - freepbx: - container_name: freepbx - image: tiredofit/freepbx - ports: - - 8012:80 - - 5060:5060 - - 5160:5160 - - 18000-18100:18000-18100/udp - #### Flash Operator Panel - - 4445:4445 - volumes: - - /docker/freepbx/certs:/certs - - /docker/freepbx/data:/data - - /docker/freepbx/logs:/var/log - - /docker/freepbx/www:/var/www/html - - /docker/freepbx/db:/var/lib/mysql - - environment: - - RTP_START=18000 - - RTP_FINISH=18100 - - DB_EMBEDDED=TRUE - - restart: always - - ### These final lines are for Fail2ban. If you don't want, comment and also add ENABLE_FAIL2BAN=FALSE to your environment - cap_add: - - NET_ADMIN - privileged: true From 124325abbf00a017bee79ca917fea86ea1f3e568 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 8 Feb 2020 17:27:58 +0200 Subject: [PATCH 0020/2667] Remove freepbx --- docker/freepbx/docker-compose.yaml | 31 ------------------------------ 1 file changed, 31 deletions(-) delete mode 100644 docker/freepbx/docker-compose.yaml diff --git a/docker/freepbx/docker-compose.yaml b/docker/freepbx/docker-compose.yaml deleted file mode 100644 index 149da0b6..00000000 --- a/docker/freepbx/docker-compose.yaml +++ /dev/null @@ -1,31 +0,0 @@ -version: '2' - -services: - freepbx: - container_name: freepbx - image: tiredofit/freepbx - ports: - - 8012:80 - - 5060:5060 - - 5160:5160 - - 18000-18100:18000-18100/udp - #### Flash Operator Panel - - 4445:4445 - volumes: - - /docker/freepbx/certs:/certs - - /docker/freepbx/data:/data - - /docker/freepbx/logs:/var/log - - /docker/freepbx/www:/var/www/html - - /docker/freepbx/db:/var/lib/mysql - - environment: - - RTP_START=18000 - - RTP_FINISH=18100 - - DB_EMBEDDED=TRUE - - restart: always - - ### These final lines are for Fail2ban. If you don't want, comment and also add ENABLE_FAIL2BAN=FALSE to your environment - cap_add: - - NET_ADMIN - privileged: true From f5eaece644f4d580b5d223c6479af6b114a2dcc0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 00:20:41 +0200 Subject: [PATCH 0021/2667] Add mumble to docker --- docker/mumble/docker-compose.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 docker/mumble/docker-compose.yaml diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml new file mode 100644 index 00000000..e94079b2 --- /dev/null +++ b/docker/mumble/docker-compose.yaml @@ -0,0 +1,14 @@ +version: '3' + +services: + gitea: + container_name: gitea + image: gitea/gitea:latest + restart: always + volumes: + - /docker/mumble:/etc/mumble + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + ports: + - '64748:64738' + - '64748:64738/udp' From fbdb0b7a11d936132fc8fc44ddd1adfa84a1b0a0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 00:20:41 +0200 Subject: [PATCH 0022/2667] Add mumble to docker --- docker/mumble/docker-compose.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 docker/mumble/docker-compose.yaml diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml new file mode 100644 index 00000000..e94079b2 --- /dev/null +++ b/docker/mumble/docker-compose.yaml @@ -0,0 +1,14 @@ +version: '3' + +services: + gitea: + container_name: gitea + image: gitea/gitea:latest + restart: always + volumes: + - /docker/mumble:/etc/mumble + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + ports: + - '64748:64738' + - '64748:64738/udp' From 607fad8d2da7f1465700dd21e9d439adbd8c1508 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 00:31:05 +0200 Subject: [PATCH 0023/2667] Update timezone stuff --- docker/gitea/docker-compose.yaml | 3 ++- docker/homeautomation/docker-compose.yml | 30 +++++++++++++++--------- docker/jellyfin/docker-compose.yaml | 2 ++ docker/portainer/docker-compose.yaml | 4 +++- docker/tvheadend/docker-compose.yaml | 1 + 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index b05f2773..09486fdd 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -9,6 +9,7 @@ services: container_name: gitea image: gitea/gitea:latest environment: + - TZ=Europe/Helsinki - USER_UID=1000 - USER_GID=1000 - DB_TYPE=mysql @@ -21,7 +22,6 @@ services: - gitea volumes: - /docker/gitea/gitea:/data - - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: - '3000:3000' @@ -36,6 +36,7 @@ services: networks: - gitea environment: + - TZ=Europe/Helsinki - MYSQL_ROOT_PASSWORD=gitea volumes: - /docker/gitea/mariadb:/var/lib/mysql diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index fb53ef47..68dec2f9 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -2,11 +2,13 @@ version: '3' services: home-assistant: container_name: home-assistant - restart: always image: homeassistant/home-assistant + environment: + - TZ=Europe/Helsinki volumes: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro + restart: always network_mode: host depends_on: - deconz @@ -15,51 +17,57 @@ services: deconz: container_name: deconz image: marthoc/deconz - restart: always environment: - DECONZ_WEB_PORT: 8083 - DECONZ_WS_PORT: 8084 - DECONZ_VNC_PORT: 5901 - DECONZ_VNC_MODE: 1 - DECONZ_VNC_PASSWORD: '${DECONZ_VNC_PASSWORD}' - DEBUG_OTAU: 1 + - TZ=Europe/Helsinki + - DECONZ_WEB_PORT=8083 + - DECONZ_WS_PORT=8084 + - DECONZ_VNC_PORT=5901 + - DECONZ_VNC_MODE=1 + - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} + - DEBUG_OTAU=1 network_mode: host volumes: - /docker/homeautomation/deconz:/root/.local/share/dresden-elektronik/deCONZ - /etc/localtime:/etc/localtime:ro + restart: always devices: - /dev/ttyACM0 node-red: container_name: node-red image: nodered/node-red - restart: always + environment: + - TZ=Europe/Helsinki ports: - '1880:1880' volumes: - /docker/homeautomation/node-red:/data - /etc/localtime:/etc/localtime:ro + restart: always depends_on: - home-assistant mosquitto: container_name: mosquitto image: eclipse-mosquitto - restart: always + environment: + - TZ=Europe/Helsinki network_mode: host volumes: - /docker/homeautomation/mosquitto:/mosquitto - /etc/localtime:/etc/localtime:ro + restart: always mariadb: container_name: mariadb-hass image: mariadb - restart: always environment: + - TZ=Europe/Helsinki - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} ports: - '3308:3306' volumes: - /docker/homeautomation/mariadb:/var/lib/mysql - /etc/localtime:/etc/localtime:ro + restart: always diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 859c1861..2f2ccb80 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -3,6 +3,8 @@ services: jellyfin: image: jellyfin/jellyfin container_name: jellyfin + environment: + - TZ=Europe/Helsinki user: 1001:985 network_mode: 'host' restart: always diff --git a/docker/portainer/docker-compose.yaml b/docker/portainer/docker-compose.yaml index 38ea459f..d4a58395 100644 --- a/docker/portainer/docker-compose.yaml +++ b/docker/portainer/docker-compose.yaml @@ -1,8 +1,10 @@ version: '3' services: portainer: - container_name: portainer image: portainer/portainer + container_name: portainer + environment: + - TZ=Europe/Helsinki restart: always ports: - '9000:9000' diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index ef5edad4..a8024bec 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -4,6 +4,7 @@ services: image: linuxserver/tvheadend container_name: tvheadend environment: + - TZ=Europe/Helsinki - PUID=1001 - PGID=985 volumes: From 9954836be09b8584ddbed495b8ff5605989f7062 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 00:31:05 +0200 Subject: [PATCH 0024/2667] Update timezone stuff --- docker/gitea/docker-compose.yaml | 3 ++- docker/homeautomation/docker-compose.yml | 30 +++++++++++++++--------- docker/jellyfin/docker-compose.yaml | 2 ++ docker/portainer/docker-compose.yaml | 4 +++- docker/tvheadend/docker-compose.yaml | 1 + 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index b05f2773..09486fdd 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -9,6 +9,7 @@ services: container_name: gitea image: gitea/gitea:latest environment: + - TZ=Europe/Helsinki - USER_UID=1000 - USER_GID=1000 - DB_TYPE=mysql @@ -21,7 +22,6 @@ services: - gitea volumes: - /docker/gitea/gitea:/data - - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: - '3000:3000' @@ -36,6 +36,7 @@ services: networks: - gitea environment: + - TZ=Europe/Helsinki - MYSQL_ROOT_PASSWORD=gitea volumes: - /docker/gitea/mariadb:/var/lib/mysql diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index fb53ef47..68dec2f9 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -2,11 +2,13 @@ version: '3' services: home-assistant: container_name: home-assistant - restart: always image: homeassistant/home-assistant + environment: + - TZ=Europe/Helsinki volumes: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro + restart: always network_mode: host depends_on: - deconz @@ -15,51 +17,57 @@ services: deconz: container_name: deconz image: marthoc/deconz - restart: always environment: - DECONZ_WEB_PORT: 8083 - DECONZ_WS_PORT: 8084 - DECONZ_VNC_PORT: 5901 - DECONZ_VNC_MODE: 1 - DECONZ_VNC_PASSWORD: '${DECONZ_VNC_PASSWORD}' - DEBUG_OTAU: 1 + - TZ=Europe/Helsinki + - DECONZ_WEB_PORT=8083 + - DECONZ_WS_PORT=8084 + - DECONZ_VNC_PORT=5901 + - DECONZ_VNC_MODE=1 + - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} + - DEBUG_OTAU=1 network_mode: host volumes: - /docker/homeautomation/deconz:/root/.local/share/dresden-elektronik/deCONZ - /etc/localtime:/etc/localtime:ro + restart: always devices: - /dev/ttyACM0 node-red: container_name: node-red image: nodered/node-red - restart: always + environment: + - TZ=Europe/Helsinki ports: - '1880:1880' volumes: - /docker/homeautomation/node-red:/data - /etc/localtime:/etc/localtime:ro + restart: always depends_on: - home-assistant mosquitto: container_name: mosquitto image: eclipse-mosquitto - restart: always + environment: + - TZ=Europe/Helsinki network_mode: host volumes: - /docker/homeautomation/mosquitto:/mosquitto - /etc/localtime:/etc/localtime:ro + restart: always mariadb: container_name: mariadb-hass image: mariadb - restart: always environment: + - TZ=Europe/Helsinki - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} ports: - '3308:3306' volumes: - /docker/homeautomation/mariadb:/var/lib/mysql - /etc/localtime:/etc/localtime:ro + restart: always diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 859c1861..2f2ccb80 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -3,6 +3,8 @@ services: jellyfin: image: jellyfin/jellyfin container_name: jellyfin + environment: + - TZ=Europe/Helsinki user: 1001:985 network_mode: 'host' restart: always diff --git a/docker/portainer/docker-compose.yaml b/docker/portainer/docker-compose.yaml index 38ea459f..d4a58395 100644 --- a/docker/portainer/docker-compose.yaml +++ b/docker/portainer/docker-compose.yaml @@ -1,8 +1,10 @@ version: '3' services: portainer: - container_name: portainer image: portainer/portainer + container_name: portainer + environment: + - TZ=Europe/Helsinki restart: always ports: - '9000:9000' diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index ef5edad4..a8024bec 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -4,6 +4,7 @@ services: image: linuxserver/tvheadend container_name: tvheadend environment: + - TZ=Europe/Helsinki - PUID=1001 - PGID=985 volumes: From a92a2c023cc158a1235a4d903f6f4bd8049ebfe2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 00:32:53 +0200 Subject: [PATCH 0025/2667] Forgot to change image name etc --- docker/mumble/docker-compose.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml index e94079b2..a7d753b1 100644 --- a/docker/mumble/docker-compose.yaml +++ b/docker/mumble/docker-compose.yaml @@ -1,14 +1,15 @@ version: '3' services: - gitea: - container_name: gitea - image: gitea/gitea:latest - restart: always - volumes: - - /docker/mumble:/etc/mumble - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro + mumble: + container_name: mumble + image: phlak/mumble + environment: + - TZ=Europe/Helsinki ports: - '64748:64738' - '64748:64738/udp' + volumes: + - /docker/mumble:/etc/mumble + - /etc/localtime:/etc/localtime:ro + restart: always From fa36bb058cfae0da92cfaf9cf943c5b5d8bcb960 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 00:32:53 +0200 Subject: [PATCH 0026/2667] Forgot to change image name etc --- docker/mumble/docker-compose.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml index e94079b2..a7d753b1 100644 --- a/docker/mumble/docker-compose.yaml +++ b/docker/mumble/docker-compose.yaml @@ -1,14 +1,15 @@ version: '3' services: - gitea: - container_name: gitea - image: gitea/gitea:latest - restart: always - volumes: - - /docker/mumble:/etc/mumble - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro + mumble: + container_name: mumble + image: phlak/mumble + environment: + - TZ=Europe/Helsinki ports: - '64748:64738' - '64748:64738/udp' + volumes: + - /docker/mumble:/etc/mumble + - /etc/localtime:/etc/localtime:ro + restart: always From 731b2d6095d5e3b51b623015cc5b7fd3db2cca47 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 00:49:20 +0200 Subject: [PATCH 0027/2667] Update permission env vars --- docker/mumble/docker-compose.yaml | 2 ++ docker/tvheadend/docker-compose.yaml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml index a7d753b1..19cf69be 100644 --- a/docker/mumble/docker-compose.yaml +++ b/docker/mumble/docker-compose.yaml @@ -6,6 +6,8 @@ services: image: phlak/mumble environment: - TZ=Europe/Helsinki + - PUID=${UID} + - PGID=${GID} ports: - '64748:64738' - '64748:64738/udp' diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index a8024bec..d2211ca4 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -5,8 +5,8 @@ services: container_name: tvheadend environment: - TZ=Europe/Helsinki - - PUID=1001 - - PGID=985 + - PUID=${UID} + - PGID=${GID} volumes: - /docker/tvheadend:/config - /mnt/Storage/Media/PVR:/recordings From a1c04bbb78ebc75dd15452e176854cec3034dbdb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 00:49:20 +0200 Subject: [PATCH 0028/2667] Update permission env vars --- docker/mumble/docker-compose.yaml | 2 ++ docker/tvheadend/docker-compose.yaml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml index a7d753b1..19cf69be 100644 --- a/docker/mumble/docker-compose.yaml +++ b/docker/mumble/docker-compose.yaml @@ -6,6 +6,8 @@ services: image: phlak/mumble environment: - TZ=Europe/Helsinki + - PUID=${UID} + - PGID=${GID} ports: - '64748:64738' - '64748:64738/udp' diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index a8024bec..d2211ca4 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -5,8 +5,8 @@ services: container_name: tvheadend environment: - TZ=Europe/Helsinki - - PUID=1001 - - PGID=985 + - PUID=${UID} + - PGID=${GID} volumes: - /docker/tvheadend:/config - /mnt/Storage/Media/PVR:/recordings From c32f65a3e9ec2cec9fcdf5b2fb6c6124246b370f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 00:55:58 +0200 Subject: [PATCH 0029/2667] Change UID and GID --- docker/mumble/docker-compose.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml index 19cf69be..9639e686 100644 --- a/docker/mumble/docker-compose.yaml +++ b/docker/mumble/docker-compose.yaml @@ -4,10 +4,9 @@ services: mumble: container_name: mumble image: phlak/mumble + user: '${UID}:${GID}' environment: - TZ=Europe/Helsinki - - PUID=${UID} - - PGID=${GID} ports: - '64748:64738' - '64748:64738/udp' From fb4d4b2ab9955e3ff2756f3d2e98cf3b7955b83e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 00:55:58 +0200 Subject: [PATCH 0030/2667] Change UID and GID --- docker/mumble/docker-compose.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml index 19cf69be..9639e686 100644 --- a/docker/mumble/docker-compose.yaml +++ b/docker/mumble/docker-compose.yaml @@ -4,10 +4,9 @@ services: mumble: container_name: mumble image: phlak/mumble + user: '${UID}:${GID}' environment: - TZ=Europe/Helsinki - - PUID=${UID} - - PGID=${GID} ports: - '64748:64738' - '64748:64738/udp' From df12c3ef01ebabf8ba7256a90514532f17152a36 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 11:40:46 +0200 Subject: [PATCH 0031/2667] Small fixes --- home/.config/mpv/scripts/iptv.lua | 505 ++++++++++++++++++ home/.config/systemd/user/thunderbird.service | 1 + 2 files changed, 506 insertions(+) create mode 100644 home/.config/mpv/scripts/iptv.lua diff --git a/home/.config/mpv/scripts/iptv.lua b/home/.config/mpv/scripts/iptv.lua new file mode 100644 index 00000000..ab43a6d5 --- /dev/null +++ b/home/.config/mpv/scripts/iptv.lua @@ -0,0 +1,505 @@ +--redefine keybindings here if needed; multiple bindings are possible +keybinds = { + activate = {'\\', 'MOUSE_BTN2'}, + plsup = {'UP', 'MOUSE_BTN3'}, + plsdown = {'DOWN', 'MOUSE_BTN4'}, + plsenter = {'ENTER', 'MOUSE_BTN0'} + } +--hide playlist after specified number of seconds +osd_time=10 +--show only specified number of playlist entries +window=7 +--fade video when showing playlist +fade=false +--if fade=true; -100 — black, 0 — normal +plsbrightness=-70 +--favorites get promotion to the top of the pls +favorites = {} +-- END OF CONFIGURABLE VARIABLES + +-- put your settings in (SCRIPTS DIR)/_iptvconf.lua +pcall(require, "_iptvconf") + +local timer +--local plscount +local pattern="" +local is_active +local is_playlist_loaded + +-- UTF-8 lower/upper conversion +local utf8_lc_uc = { + ["a"] = "A", + ["b"] = "B", + ["c"] = "C", + ["d"] = "D", + ["e"] = "E", + ["f"] = "F", + ["g"] = "G", + ["h"] = "H", + ["i"] = "I", + ["j"] = "J", + ["k"] = "K", + ["l"] = "L", + ["m"] = "M", + ["n"] = "N", + ["o"] = "O", + ["p"] = "P", + ["q"] = "Q", + ["r"] = "R", + ["s"] = "S", + ["t"] = "T", + ["u"] = "U", + ["v"] = "V", + ["w"] = "W", + ["x"] = "X", + ["y"] = "Y", + ["z"] = "Z", + ["а"] = "А", + ["б"] = "Б", + ["в"] = "В", + ["г"] = "Г", + ["д"] = "Д", + ["е"] = "Е", + ["ж"] = "Ж", + ["з"] = "З", + ["и"] = "И", + ["й"] = "Й", + ["к"] = "К", + ["л"] = "Л", + ["м"] = "М", + ["н"] = "Н", + ["о"] = "О", + ["п"] = "П", + ["р"] = "Р", + ["с"] = "С", + ["т"] = "Т", + ["у"] = "У", + ["ф"] = "Ф", + ["х"] = "Х", + ["ц"] = "Ц", + ["ч"] = "Ч", + ["ш"] = "Ш", + ["щ"] = "Щ", + ["ъ"] = "Ъ", + ["ы"] = "Ы", + ["ь"] = "Ь", + ["э"] = "Э", + ["ю"] = "Ю", + ["я"] = "Я", + ["ё"] = "Ё" +} + +local utf8_uc_lc = { + ["A"] = "a", + ["B"] = "b", + ["C"] = "c", + ["D"] = "d", + ["E"] = "e", + ["F"] = "f", + ["G"] = "g", + ["H"] = "h", + ["I"] = "i", + ["J"] = "j", + ["K"] = "k", + ["L"] = "l", + ["M"] = "m", + ["N"] = "n", + ["O"] = "o", + ["P"] = "p", + ["Q"] = "q", + ["R"] = "r", + ["S"] = "s", + ["T"] = "t", + ["U"] = "u", + ["V"] = "v", + ["W"] = "w", + ["X"] = "x", + ["Y"] = "y", + ["Z"] = "z", + ["А"] = "а", + ["Б"] = "б", + ["В"] = "в", + ["Г"] = "г", + ["Д"] = "д", + ["Е"] = "е", + ["Ж"] = "ж", + ["З"] = "з", + ["И"] = "и", + ["Й"] = "й", + ["К"] = "к", + ["Л"] = "л", + ["М"] = "м", + ["Н"] = "н", + ["О"] = "о", + ["П"] = "п", + ["Р"] = "р", + ["С"] = "с", + ["Т"] = "т", + ["У"] = "у", + ["Ф"] = "ф", + ["Х"] = "х", + ["Ц"] = "ц", + ["Ч"] = "ч", + ["Ш"] = "ш", + ["Щ"] = "щ", + ["Ъ"] = "ъ", + ["Ы"] = "ы", + ["Ь"] = "ь", + ["Э"] = "э", + ["Ю"] = "ю", + ["Я"] = "я", + ["Ё"] = "ё" +} + +--utf8 char pattern +local utf8_char="[\1-\127\192-\223][\128-\191]*" + +local cyr_chars={'а','б','в','г','д','е','ё','ж','з','и','й','к','л','м','н','о','п','р','с','т','у','ф','х','ц','ч','ш','щ','ъ','ы','ь','э','ю','я'} + +-- символы, которые возможно вводить для поиска +local chars={} +for i=string.byte('a'),string.byte('z') do + table.insert(chars,i) +end +for i=string.byte('A'),string.byte('Z') do + table.insert(chars,i) +end +for i=string.byte('0'),string.byte('9') do + table.insert(chars,i) +end +for _,v in ipairs({',','^','$','(',')','%','.','[',']','*','+','-','?','`',"'",";"}) do + table.insert(chars,string.byte(v)) +end + +local keybinder = { + remove = function(action) + for i,_ in ipairs(keybinds[action]) do + mp.remove_key_binding(action..tostring(i)) + end + end, + add = function(action, func, repeatable) + for i,key in ipairs(keybinds[action]) do + assert(type(func)=="function", "not a function") + if repeatable then + mp.add_forced_key_binding(key, action..tostring(i), func, "repeatable") + else + mp.add_forced_key_binding(key, action..tostring(i), func) + end + end + end +} + +local fader = { + saved_brtns, + on = function(self) + if fade and not self.saved_brtns then + self.saved_brtns = mp.get_property("brightness") + mp.set_property("brightness", plsbrightness) + end + end, + off = function(self) + if fade and self.saved_brtns then + mp.set_property("brightness", self.saved_brtns) + self.saved_brtns=nil + end + end +} + +local playlister = { +-- pls — список элементов плейлиста + pls, +-- plsfiltered — список индексов выбранных фильтром элементов плейлиста + plsfiltered, + plspos, + wndstart, + wndend, + cursor, + + init = function(self) + if not self.pls then + self.pls = mp.get_property_native("playlist") + end + mp.commandv("stop") + --need to mark first entry non-current (mpv bug?) + if self.pls[1] then + self.pls[1].current = false + end + if favorites and #favorites>0 then + self:sortfavs() + end + pattern = "" + self.plsfiltered = tablekeys(self.pls) + end, + + show = function(self) + local i + local newpos + local msg + --media-title + --playlist t[2].title + + if not self.plsfiltered then + return + end + if not self.plspos then + self.plspos=mp.get_property_native("playlist-pos-1") + --plscount=mp.get_property_native("playlist-count") + end + if not self.wndstart or not self.cursor then + self.wndstart=1 + self.cursor=0 + end + + msg="" + i = self.wndstart + local prefix + while self.plsfiltered[i] and i<=self.wndstart+window-1 do + if self.pls[self.plsfiltered[i]].current then + prefix="*" + elseif i==self.wndstart+self.cursor then + prefix=">" + else + prefix=" " + end + msg = msg..prefix..(self.pls[self.plsfiltered[i]].title or "").."\n" + i=i+1 + end + if self.wndstart>1 then + msg = "...\n"..msg + else + msg = " \n"..msg + end + if self.wndstart+window-1<#self.plsfiltered then + msg = msg.."..." + end + msg="/"..pattern.."\n"..msg + mp.osd_message(msg, osd_time) + end, + + sortfavs = function(self) + --favorites bubbles to the top + local favs={} + local nonfavs={} + for _,v in ipairs(self.pls) do + if in_array(favorites,v.title) then + favs[#favs+1] = v + else + nonfavs[#nonfavs+1] = v + end + end + for i=1,#nonfavs do + favs[#favs+1] = nonfavs[i] + end + self.pls = favs + end, + + filter = function(self) + self.plsfiltered={} + for i,v in ipairs(self.pls) do + if string.match(mylower(v.title),'.*'..prepat(pattern)..'.*') then + table.insert(self.plsfiltered,i) + end + end + self.wndstart=1 + self.cursor=0 + end, + + down = function(self) + if self.cursor >= #self.plsfiltered-1 then return end + if self.cursor0 then + self.cursor=self.cursor-1 + self.show(self) + else + if self.wndstart>1 then + self.wndstart=self.wndstart-1 + self.show(self) + end + end + end, + + play = function(self) + mp.commandv("loadfile",self.pls[self.plsfiltered[self.wndstart+self.cursor]].filename) + if self.plspos then + self.pls[self.plspos].current=false + end + self.plspos=self.plsfiltered[self.wndstart+self.cursor] + self.pls[self.plspos].current=true + end +} + +function add_bindings() + keybinder.add("plsup", up, true) + keybinder.add("plsdown", down, true) + for i,v in ipairs(chars) do + c=string.char(v) + mp.add_forced_key_binding(c, 'search'..v, typing(c),"repeatable") + end + mp.add_forced_key_binding('SPACE', 'search32', typing(' '),"repeatable") + +--[[ mp.add_key_binding('а', 'search1000', typing('а'),"repeatable") + mp.add_key_binding('с', 'search1001', typing('с'),"repeatable")]] + + mp.add_forced_key_binding('BS', 'searchbs', backspace,"repeatable") + keybinder.add("plsenter", play) + for i,v in ipairs(cyr_chars) do + mp.add_forced_key_binding(v, 'search'..i+1000, typing(v),"repeatable") + end +end + +function remove_bindings() + keybinder.remove('plsup') + keybinder.remove('plsdown') + keybinder.remove('plsenter') + for i,v in ipairs(chars) do + c=string.char(v) + mp.remove_key_binding('search'..v) + end + mp.remove_key_binding('search32') + mp.remove_key_binding('searchbs') + for i,v in ipairs(cyr_chars) do + mp.remove_key_binding('search'..i+1000) + end +end + +function activate() + if is_active then + shutdown() + return + else + is_active=true + fader:on() + playlister:show() + add_bindings() + if not timer then + timer=mp.add_periodic_timer(osd_time, shutdown) + timer.oneshot=true + else + resumetimer() + end + end +end + +function tablekeys(t) + local result={} + for i,v in ipairs(t) do + table.insert(result,i) + end + return result +end + +function in_array(array, value) + for _,v in ipairs(array) do + if v==value then + return true + end + end + return false +end + +function mylower(s) + local res,n = string.gsub(s,utf8_char,function (c) + return utf8_uc_lc[c] + end) + return res +end + +function myupper(s) + local res,n = string.gsub(s,utf8_char,function (c) + return utf8_lc_uc[c] + end) + return res +end + +function prepat(s) +--prepare nocase and magic chars + s = string.gsub(s, "[%^%$%(%)%%%.%[%]%*%+%-%?]",function (c) + return '%'..c + end) +--[[ s = string.gsub(s, utf8_char, function (c) + return string.format("[%s%s]", utf8_uc_lc[c] or c, utf8_lc_uc[c] or c) + end)]] + return s +end + +function resumetimer() + timer:kill() + timer:resume() +end + +function typing(char) + return function() + local c=string.lower(char) + pattern = pattern..c + playlister:filter() + playlister:show() + resumetimer() + end +end + +function backspace() + if string.len(pattern)>0 then +-- pattern = string.sub(pattern,1,-2) +-- for unicode + pattern = string.match(pattern,"(.*)"..utf8_char.."$") + playlister:filter() + playlister:show() + resumetimer() + end +end + +function play() +-- mp.commandv("playlist-move", wndstart+cursor, 1) +-- mp.commandv("playlist-clear") +-- mp.commandv("playlist-next") + fader:off() + playlister:play() + playlister:show() + resumetimer() +end + +function shutdown() + fader:off() + remove_bindings() + is_active=false + mp.osd_message("", 1) +end + +function down() + fader:on() + playlister:down() + resumetimer() +end + +function up() + fader:on() + playlister:up() + resumetimer() +end + +function on_start_file() + if is_playlist_loaded then + playlister:init() + mp.unregister_event(on_start_file) + activate() + else + is_playlist_loaded = true + end +end + +if mp.get_opt("iptv") then + mp.set_property_bool("idle", true) + mp.set_property_bool("force-window", true) + mp.register_event("start-file", on_start_file) + keybinder.add("activate", activate) +end + diff --git a/home/.config/systemd/user/thunderbird.service b/home/.config/systemd/user/thunderbird.service index 6d6fba8b..949a0e76 100644 --- a/home/.config/systemd/user/thunderbird.service +++ b/home/.config/systemd/user/thunderbird.service @@ -4,6 +4,7 @@ PartOf=graphical-session.target [Service] Type=simple +Environment="LANG=en_XX.UTF-8@POSIX" ExecStart=/usr/bin/thunderbird [Install] From 7c1efbd74c49bdb15394b3ab3cef5adc8a7dbd0d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 11:40:46 +0200 Subject: [PATCH 0032/2667] Small fixes --- home/.config/mpv/scripts/iptv.lua | 505 ++++++++++++++++++ home/.config/systemd/user/thunderbird.service | 1 + 2 files changed, 506 insertions(+) create mode 100644 home/.config/mpv/scripts/iptv.lua diff --git a/home/.config/mpv/scripts/iptv.lua b/home/.config/mpv/scripts/iptv.lua new file mode 100644 index 00000000..ab43a6d5 --- /dev/null +++ b/home/.config/mpv/scripts/iptv.lua @@ -0,0 +1,505 @@ +--redefine keybindings here if needed; multiple bindings are possible +keybinds = { + activate = {'\\', 'MOUSE_BTN2'}, + plsup = {'UP', 'MOUSE_BTN3'}, + plsdown = {'DOWN', 'MOUSE_BTN4'}, + plsenter = {'ENTER', 'MOUSE_BTN0'} + } +--hide playlist after specified number of seconds +osd_time=10 +--show only specified number of playlist entries +window=7 +--fade video when showing playlist +fade=false +--if fade=true; -100 — black, 0 — normal +plsbrightness=-70 +--favorites get promotion to the top of the pls +favorites = {} +-- END OF CONFIGURABLE VARIABLES + +-- put your settings in (SCRIPTS DIR)/_iptvconf.lua +pcall(require, "_iptvconf") + +local timer +--local plscount +local pattern="" +local is_active +local is_playlist_loaded + +-- UTF-8 lower/upper conversion +local utf8_lc_uc = { + ["a"] = "A", + ["b"] = "B", + ["c"] = "C", + ["d"] = "D", + ["e"] = "E", + ["f"] = "F", + ["g"] = "G", + ["h"] = "H", + ["i"] = "I", + ["j"] = "J", + ["k"] = "K", + ["l"] = "L", + ["m"] = "M", + ["n"] = "N", + ["o"] = "O", + ["p"] = "P", + ["q"] = "Q", + ["r"] = "R", + ["s"] = "S", + ["t"] = "T", + ["u"] = "U", + ["v"] = "V", + ["w"] = "W", + ["x"] = "X", + ["y"] = "Y", + ["z"] = "Z", + ["а"] = "А", + ["б"] = "Б", + ["в"] = "В", + ["г"] = "Г", + ["д"] = "Д", + ["е"] = "Е", + ["ж"] = "Ж", + ["з"] = "З", + ["и"] = "И", + ["й"] = "Й", + ["к"] = "К", + ["л"] = "Л", + ["м"] = "М", + ["н"] = "Н", + ["о"] = "О", + ["п"] = "П", + ["р"] = "Р", + ["с"] = "С", + ["т"] = "Т", + ["у"] = "У", + ["ф"] = "Ф", + ["х"] = "Х", + ["ц"] = "Ц", + ["ч"] = "Ч", + ["ш"] = "Ш", + ["щ"] = "Щ", + ["ъ"] = "Ъ", + ["ы"] = "Ы", + ["ь"] = "Ь", + ["э"] = "Э", + ["ю"] = "Ю", + ["я"] = "Я", + ["ё"] = "Ё" +} + +local utf8_uc_lc = { + ["A"] = "a", + ["B"] = "b", + ["C"] = "c", + ["D"] = "d", + ["E"] = "e", + ["F"] = "f", + ["G"] = "g", + ["H"] = "h", + ["I"] = "i", + ["J"] = "j", + ["K"] = "k", + ["L"] = "l", + ["M"] = "m", + ["N"] = "n", + ["O"] = "o", + ["P"] = "p", + ["Q"] = "q", + ["R"] = "r", + ["S"] = "s", + ["T"] = "t", + ["U"] = "u", + ["V"] = "v", + ["W"] = "w", + ["X"] = "x", + ["Y"] = "y", + ["Z"] = "z", + ["А"] = "а", + ["Б"] = "б", + ["В"] = "в", + ["Г"] = "г", + ["Д"] = "д", + ["Е"] = "е", + ["Ж"] = "ж", + ["З"] = "з", + ["И"] = "и", + ["Й"] = "й", + ["К"] = "к", + ["Л"] = "л", + ["М"] = "м", + ["Н"] = "н", + ["О"] = "о", + ["П"] = "п", + ["Р"] = "р", + ["С"] = "с", + ["Т"] = "т", + ["У"] = "у", + ["Ф"] = "ф", + ["Х"] = "х", + ["Ц"] = "ц", + ["Ч"] = "ч", + ["Ш"] = "ш", + ["Щ"] = "щ", + ["Ъ"] = "ъ", + ["Ы"] = "ы", + ["Ь"] = "ь", + ["Э"] = "э", + ["Ю"] = "ю", + ["Я"] = "я", + ["Ё"] = "ё" +} + +--utf8 char pattern +local utf8_char="[\1-\127\192-\223][\128-\191]*" + +local cyr_chars={'а','б','в','г','д','е','ё','ж','з','и','й','к','л','м','н','о','п','р','с','т','у','ф','х','ц','ч','ш','щ','ъ','ы','ь','э','ю','я'} + +-- символы, которые возможно вводить для поиска +local chars={} +for i=string.byte('a'),string.byte('z') do + table.insert(chars,i) +end +for i=string.byte('A'),string.byte('Z') do + table.insert(chars,i) +end +for i=string.byte('0'),string.byte('9') do + table.insert(chars,i) +end +for _,v in ipairs({',','^','$','(',')','%','.','[',']','*','+','-','?','`',"'",";"}) do + table.insert(chars,string.byte(v)) +end + +local keybinder = { + remove = function(action) + for i,_ in ipairs(keybinds[action]) do + mp.remove_key_binding(action..tostring(i)) + end + end, + add = function(action, func, repeatable) + for i,key in ipairs(keybinds[action]) do + assert(type(func)=="function", "not a function") + if repeatable then + mp.add_forced_key_binding(key, action..tostring(i), func, "repeatable") + else + mp.add_forced_key_binding(key, action..tostring(i), func) + end + end + end +} + +local fader = { + saved_brtns, + on = function(self) + if fade and not self.saved_brtns then + self.saved_brtns = mp.get_property("brightness") + mp.set_property("brightness", plsbrightness) + end + end, + off = function(self) + if fade and self.saved_brtns then + mp.set_property("brightness", self.saved_brtns) + self.saved_brtns=nil + end + end +} + +local playlister = { +-- pls — список элементов плейлиста + pls, +-- plsfiltered — список индексов выбранных фильтром элементов плейлиста + plsfiltered, + plspos, + wndstart, + wndend, + cursor, + + init = function(self) + if not self.pls then + self.pls = mp.get_property_native("playlist") + end + mp.commandv("stop") + --need to mark first entry non-current (mpv bug?) + if self.pls[1] then + self.pls[1].current = false + end + if favorites and #favorites>0 then + self:sortfavs() + end + pattern = "" + self.plsfiltered = tablekeys(self.pls) + end, + + show = function(self) + local i + local newpos + local msg + --media-title + --playlist t[2].title + + if not self.plsfiltered then + return + end + if not self.plspos then + self.plspos=mp.get_property_native("playlist-pos-1") + --plscount=mp.get_property_native("playlist-count") + end + if not self.wndstart or not self.cursor then + self.wndstart=1 + self.cursor=0 + end + + msg="" + i = self.wndstart + local prefix + while self.plsfiltered[i] and i<=self.wndstart+window-1 do + if self.pls[self.plsfiltered[i]].current then + prefix="*" + elseif i==self.wndstart+self.cursor then + prefix=">" + else + prefix=" " + end + msg = msg..prefix..(self.pls[self.plsfiltered[i]].title or "").."\n" + i=i+1 + end + if self.wndstart>1 then + msg = "...\n"..msg + else + msg = " \n"..msg + end + if self.wndstart+window-1<#self.plsfiltered then + msg = msg.."..." + end + msg="/"..pattern.."\n"..msg + mp.osd_message(msg, osd_time) + end, + + sortfavs = function(self) + --favorites bubbles to the top + local favs={} + local nonfavs={} + for _,v in ipairs(self.pls) do + if in_array(favorites,v.title) then + favs[#favs+1] = v + else + nonfavs[#nonfavs+1] = v + end + end + for i=1,#nonfavs do + favs[#favs+1] = nonfavs[i] + end + self.pls = favs + end, + + filter = function(self) + self.plsfiltered={} + for i,v in ipairs(self.pls) do + if string.match(mylower(v.title),'.*'..prepat(pattern)..'.*') then + table.insert(self.plsfiltered,i) + end + end + self.wndstart=1 + self.cursor=0 + end, + + down = function(self) + if self.cursor >= #self.plsfiltered-1 then return end + if self.cursor0 then + self.cursor=self.cursor-1 + self.show(self) + else + if self.wndstart>1 then + self.wndstart=self.wndstart-1 + self.show(self) + end + end + end, + + play = function(self) + mp.commandv("loadfile",self.pls[self.plsfiltered[self.wndstart+self.cursor]].filename) + if self.plspos then + self.pls[self.plspos].current=false + end + self.plspos=self.plsfiltered[self.wndstart+self.cursor] + self.pls[self.plspos].current=true + end +} + +function add_bindings() + keybinder.add("plsup", up, true) + keybinder.add("plsdown", down, true) + for i,v in ipairs(chars) do + c=string.char(v) + mp.add_forced_key_binding(c, 'search'..v, typing(c),"repeatable") + end + mp.add_forced_key_binding('SPACE', 'search32', typing(' '),"repeatable") + +--[[ mp.add_key_binding('а', 'search1000', typing('а'),"repeatable") + mp.add_key_binding('с', 'search1001', typing('с'),"repeatable")]] + + mp.add_forced_key_binding('BS', 'searchbs', backspace,"repeatable") + keybinder.add("plsenter", play) + for i,v in ipairs(cyr_chars) do + mp.add_forced_key_binding(v, 'search'..i+1000, typing(v),"repeatable") + end +end + +function remove_bindings() + keybinder.remove('plsup') + keybinder.remove('plsdown') + keybinder.remove('plsenter') + for i,v in ipairs(chars) do + c=string.char(v) + mp.remove_key_binding('search'..v) + end + mp.remove_key_binding('search32') + mp.remove_key_binding('searchbs') + for i,v in ipairs(cyr_chars) do + mp.remove_key_binding('search'..i+1000) + end +end + +function activate() + if is_active then + shutdown() + return + else + is_active=true + fader:on() + playlister:show() + add_bindings() + if not timer then + timer=mp.add_periodic_timer(osd_time, shutdown) + timer.oneshot=true + else + resumetimer() + end + end +end + +function tablekeys(t) + local result={} + for i,v in ipairs(t) do + table.insert(result,i) + end + return result +end + +function in_array(array, value) + for _,v in ipairs(array) do + if v==value then + return true + end + end + return false +end + +function mylower(s) + local res,n = string.gsub(s,utf8_char,function (c) + return utf8_uc_lc[c] + end) + return res +end + +function myupper(s) + local res,n = string.gsub(s,utf8_char,function (c) + return utf8_lc_uc[c] + end) + return res +end + +function prepat(s) +--prepare nocase and magic chars + s = string.gsub(s, "[%^%$%(%)%%%.%[%]%*%+%-%?]",function (c) + return '%'..c + end) +--[[ s = string.gsub(s, utf8_char, function (c) + return string.format("[%s%s]", utf8_uc_lc[c] or c, utf8_lc_uc[c] or c) + end)]] + return s +end + +function resumetimer() + timer:kill() + timer:resume() +end + +function typing(char) + return function() + local c=string.lower(char) + pattern = pattern..c + playlister:filter() + playlister:show() + resumetimer() + end +end + +function backspace() + if string.len(pattern)>0 then +-- pattern = string.sub(pattern,1,-2) +-- for unicode + pattern = string.match(pattern,"(.*)"..utf8_char.."$") + playlister:filter() + playlister:show() + resumetimer() + end +end + +function play() +-- mp.commandv("playlist-move", wndstart+cursor, 1) +-- mp.commandv("playlist-clear") +-- mp.commandv("playlist-next") + fader:off() + playlister:play() + playlister:show() + resumetimer() +end + +function shutdown() + fader:off() + remove_bindings() + is_active=false + mp.osd_message("", 1) +end + +function down() + fader:on() + playlister:down() + resumetimer() +end + +function up() + fader:on() + playlister:up() + resumetimer() +end + +function on_start_file() + if is_playlist_loaded then + playlister:init() + mp.unregister_event(on_start_file) + activate() + else + is_playlist_loaded = true + end +end + +if mp.get_opt("iptv") then + mp.set_property_bool("idle", true) + mp.set_property_bool("force-window", true) + mp.register_event("start-file", on_start_file) + keybinder.add("activate", activate) +end + diff --git a/home/.config/systemd/user/thunderbird.service b/home/.config/systemd/user/thunderbird.service index 6d6fba8b..949a0e76 100644 --- a/home/.config/systemd/user/thunderbird.service +++ b/home/.config/systemd/user/thunderbird.service @@ -4,6 +4,7 @@ PartOf=graphical-session.target [Service] Type=simple +Environment="LANG=en_XX.UTF-8@POSIX" ExecStart=/usr/bin/thunderbird [Install] From 5b356b9ff54b0d994df4c251186f1c91083c9bef Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 19:15:07 +0200 Subject: [PATCH 0033/2667] Add new server profile --- config-home.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config-home.yaml b/config-home.yaml index b130afa7..3d1aaecb 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -217,6 +217,11 @@ profiles: - Terminal - Media - Pacman + Moria: + include: + - Terminal + - Media + - Pacman Terminal: dotfiles: - f_nvimpager_init.vim From 345af1bd4a7d0dcad8111bdb4df9ae5ecf7233c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 19:15:07 +0200 Subject: [PATCH 0034/2667] Add new server profile --- config-home.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config-home.yaml b/config-home.yaml index b130afa7..3d1aaecb 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -217,6 +217,11 @@ profiles: - Terminal - Media - Pacman + Moria: + include: + - Terminal + - Media + - Pacman Terminal: dotfiles: - f_nvimpager_init.vim From 82c150587b7f8e8ca85c39842048c3d00c3c4293 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 19:35:16 +0200 Subject: [PATCH 0035/2667] Add root dotfiles for new server --- config-root.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config-root.yaml b/config-root.yaml index 8b911673..0392d952 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -168,3 +168,7 @@ profiles: - f_sshd_config - f_nightly-reboot.service - f_nightly-reboot.timer + Moria: + include: + - Locale + - Pacman From 85b6ae70933d693be86a540795b3a6e3a64b5914 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 19:35:16 +0200 Subject: [PATCH 0036/2667] Add root dotfiles for new server --- config-root.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config-root.yaml b/config-root.yaml index 8b911673..0392d952 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -168,3 +168,7 @@ profiles: - f_sshd_config - f_nightly-reboot.service - f_nightly-reboot.timer + Moria: + include: + - Locale + - Pacman From 565e9381180c5bedc48274f98fb882f1c3180710 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 19:45:25 +0200 Subject: [PATCH 0037/2667] Add sshd conf for Moria --- config-root.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config-root.yaml b/config-root.yaml index 0392d952..81205ec6 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -172,3 +172,5 @@ profiles: include: - Locale - Pacman + dotfiles: + - f_sshd_config From 49b8c9df0755c96d3552f006e9f81bf4e02b919b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 19:45:25 +0200 Subject: [PATCH 0038/2667] Add sshd conf for Moria --- config-root.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config-root.yaml b/config-root.yaml index 0392d952..81205ec6 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -172,3 +172,5 @@ profiles: include: - Locale - Pacman + dotfiles: + - f_sshd_config From 63e1060ab0dd734279a1423f422101d091fbe750 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 20:15:16 +0200 Subject: [PATCH 0039/2667] Add Moria to ssh config --- home/.ssh/config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index 9fa6018c..2752d112 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -18,6 +18,12 @@ Host aur HostName aur.archlinux.org User aur +host moria + HostName reekynet.com + port 221 + User gimli + ForwardAgent yes + host rivendell HostName reekynet.com port 222 From 5b31eff960a3b4cbb1183cb8cd833113429e90ef Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 20:15:16 +0200 Subject: [PATCH 0040/2667] Add Moria to ssh config --- home/.ssh/config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index 9fa6018c..2752d112 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -18,6 +18,12 @@ Host aur HostName aur.archlinux.org User aur +host moria + HostName reekynet.com + port 221 + User gimli + ForwardAgent yes + host rivendell HostName reekynet.com port 222 From afa01d3e3bca7cc085af32e00e21d53653c45462 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 20:18:20 +0200 Subject: [PATCH 0041/2667] Small fixes --- home/.config/mimeo/associations.txt | 3 +++ home/.config/nvim/coc-settings.json | 2 +- home/.ssh/config | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/home/.config/mimeo/associations.txt b/home/.config/mimeo/associations.txt index 931b7e0b..0c350544 100644 --- a/home/.config/mimeo/associations.txt +++ b/home/.config/mimeo/associations.txt @@ -45,3 +45,6 @@ alacritty -e rtv "%U" alacritty -e rtv "%U" ^https?://redd.it.* + +mpv "$(yle-dl --showurl %U)" + ^https?://areena.yle.fi.* diff --git a/home/.config/nvim/coc-settings.json b/home/.config/nvim/coc-settings.json index 6ad1c293..62b68d72 100644 --- a/home/.config/nvim/coc-settings.json +++ b/home/.config/nvim/coc-settings.json @@ -11,7 +11,7 @@ "javascriptreact", "yaml" ], - "prettier.singleQuote": true, + "prettier.singleQuote": false, "diagnostic.errorSign": "•", "diagnostic.warningSign": "•", "diagnostic.infoSign": "•", diff --git a/home/.ssh/config b/home/.ssh/config index 2752d112..080ac75c 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -21,7 +21,7 @@ Host aur host moria HostName reekynet.com port 221 - User gimli + User balrog ForwardAgent yes host rivendell From 2ffe5b1cdc872c3f537f8f30d32774b03d2d2b1e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 20:18:20 +0200 Subject: [PATCH 0042/2667] Small fixes --- home/.config/mimeo/associations.txt | 3 +++ home/.config/nvim/coc-settings.json | 2 +- home/.ssh/config | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/home/.config/mimeo/associations.txt b/home/.config/mimeo/associations.txt index 931b7e0b..0c350544 100644 --- a/home/.config/mimeo/associations.txt +++ b/home/.config/mimeo/associations.txt @@ -45,3 +45,6 @@ alacritty -e rtv "%U" alacritty -e rtv "%U" ^https?://redd.it.* + +mpv "$(yle-dl --showurl %U)" + ^https?://areena.yle.fi.* diff --git a/home/.config/nvim/coc-settings.json b/home/.config/nvim/coc-settings.json index 6ad1c293..62b68d72 100644 --- a/home/.config/nvim/coc-settings.json +++ b/home/.config/nvim/coc-settings.json @@ -11,7 +11,7 @@ "javascriptreact", "yaml" ], - "prettier.singleQuote": true, + "prettier.singleQuote": false, "diagnostic.errorSign": "•", "diagnostic.warningSign": "•", "diagnostic.infoSign": "•", diff --git a/home/.ssh/config b/home/.ssh/config index 2752d112..080ac75c 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -21,7 +21,7 @@ Host aur host moria HostName reekynet.com port 221 - User gimli + User balrog ForwardAgent yes host rivendell From f7259339dbed45b67bae46749e9b5d16c0601fb5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 20:22:05 +0200 Subject: [PATCH 0043/2667] Remove timesyncd from rivendell --- config-root.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config-root.yaml b/config-root.yaml index 81205ec6..0163e560 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -164,7 +164,6 @@ profiles: - f_mkinitcpio.conf - f_bluetooth.conf - f_60-uinput-permissions.rules - - f_timesyncd.conf - f_sshd_config - f_nightly-reboot.service - f_nightly-reboot.timer From a19656cb59d6d7ca83fe37787a4712d38f66c7e4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 20:22:05 +0200 Subject: [PATCH 0044/2667] Remove timesyncd from rivendell --- config-root.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config-root.yaml b/config-root.yaml index 81205ec6..0163e560 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -164,7 +164,6 @@ profiles: - f_mkinitcpio.conf - f_bluetooth.conf - f_60-uinput-permissions.rules - - f_timesyncd.conf - f_sshd_config - f_nightly-reboot.service - f_nightly-reboot.timer From e519140370a677bb26eb6d0e1611722f378969bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 21:24:50 +0200 Subject: [PATCH 0045/2667] Move to traefik proxy --- docker/gitea/docker-compose.yaml | 32 ++++++++++++---- docker/homeautomation/docker-compose.yml | 49 ++++++++++++++++++++++-- docker/jellyfin/docker-compose.yaml | 24 +++++++++++- docker/portainer/docker-compose.yaml | 23 ++++++++++- docker/traefik/docker-compose.yaml | 41 ++++++++++++++++++++ 5 files changed, 156 insertions(+), 13 deletions(-) create mode 100644 docker/traefik/docker-compose.yaml diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 09486fdd..f2b31f23 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -1,9 +1,5 @@ version: '2' -networks: - gitea: - external: false - services: gitea: container_name: gitea @@ -20,14 +16,30 @@ services: restart: always networks: - gitea - volumes: - - /docker/gitea/gitea:/data - - /etc/localtime:/etc/localtime:ro + - proxy ports: - '3000:3000' - '222:22' depends_on: - mariadb-gitea + volumes: + - /docker/gitea/gitea:/data + - /etc/localtime:/etc/localtime:ro + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.gitea-redirect.entrypoints=http' + - 'traefik.http.routers.gitea-redirect.rule=Host(`git.reekynet.com`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.gitea-redirect.middlewares=http2https' + + - 'traefik.http.routers.gitea.entrypoints=https' + - 'traefik.http.routers.gitea.rule=Host(`git.reekynet.com`)' + - 'traefik.http.routers.gitea.tls=true' + - 'traefik.http.routers.gitea.tls.certresolver=http' + - 'traefik.http.routers.gitea.service=gitea' + - 'traefik.docker.network=proxy' + - 'traefik.http.services.gitea.loadbalancer.server.port=3000' mariadb-gitea: container_name: mariadb-gitea @@ -41,3 +53,9 @@ services: volumes: - /docker/gitea/mariadb:/var/lib/mysql - /etc/localtime:/etc/localtime:ro + +networks: + gitea: + external: false + proxy: + external: true diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 68dec2f9..abe6a2e6 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -9,10 +9,29 @@ services: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro restart: always - network_mode: host + networks: + - home-assistant + - proxy + ports: + - '8123:8123' depends_on: - deconz - mosquitto + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.home-assistant-redirect.entrypoints=http' + - 'traefik.http.routers.home-assistant-redirect.rule=Host(`home.reekynet.com`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.home-assistant-redirect.middlewares=http2https' + + - 'traefik.http.routers.home-assistant.entrypoints=https' + - 'traefik.http.routers.home-assistant.rule=Host(`home.reekynet.com`)' + - 'traefik.http.routers.home-assistant.tls=true' + - 'traefik.http.routers.home-assistant.tls.certresolver=http' + - 'traefik.http.routers.home-assistant.service=home-assistant' + - 'traefik.docker.network=proxy' + - 'traefik.http.services.home-assistant.loadbalancer.server.port=8123' deconz: container_name: deconz @@ -39,6 +58,9 @@ services: image: nodered/node-red environment: - TZ=Europe/Helsinki + networks: + - home-assistant + - proxy ports: - '1880:1880' volumes: @@ -47,6 +69,21 @@ services: restart: always depends_on: - home-assistant + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.node-red-redirect.entrypoints=http' + - 'traefik.http.routers.node-red-redirect.rule=Host(`node.reekynet.com`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.node-red-redirect.middlewares=http2https' + + - 'traefik.http.routers.node-red.entrypoints=https' + - 'traefik.http.routers.node-red.rule=Host(`node.reekynet.com`)' + - 'traefik.http.routers.node-red.tls=true' + - 'traefik.http.routers.node-red.tls.certresolver=http' + - 'traefik.http.routers.node-red.service=node-red' + - 'traefik.docker.network=proxy' + - 'traefik.http.services.node.loadbalancer.server.port=1880' mosquitto: container_name: mosquitto @@ -65,9 +102,15 @@ services: environment: - TZ=Europe/Helsinki - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - ports: - - '3308:3306' + networks: + - home-assistant volumes: - /docker/homeautomation/mariadb:/var/lib/mysql - /etc/localtime:/etc/localtime:ro restart: always + +networks: + home-assistant: + external: false + proxy: + external: true diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 2f2ccb80..8cc073a8 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -6,10 +6,32 @@ services: environment: - TZ=Europe/Helsinki user: 1001:985 - network_mode: 'host' + ports: + - '8096:8096' + networks: + - proxy restart: always volumes: - /docker/jellyfin/config:/config - /docker/jellyfin/cache:/cache - /mnt/Storage/Media:/media - /etc/localtime:/etc/localtime:ro + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.jellyfin-redirect.entrypoints=http' + - 'traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.reekynet.com`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.jellyfin-redirect.middlewares=http2https' + + - 'traefik.http.routers.jellyfin.entrypoints=https' + - 'traefik.http.routers.jellyfin.rule=Host(`jellyfin.reekynet.com`)' + - 'traefik.http.routers.jellyfin.tls=true' + - 'traefik.http.routers.jellyfin.tls.certresolver=http' + - 'traefik.http.routers.jellyfin.service=jellyfin' + - 'traefik.docker.network=proxy' + - 'traefik.http.services.jellyfin.loadbalancer.server.port=8096' + +networks: + proxy: + external: true diff --git a/docker/portainer/docker-compose.yaml b/docker/portainer/docker-compose.yaml index d4a58395..76ffaccd 100644 --- a/docker/portainer/docker-compose.yaml +++ b/docker/portainer/docker-compose.yaml @@ -6,9 +6,28 @@ services: environment: - TZ=Europe/Helsinki restart: always - ports: - - '9000:9000' + networks: + - proxy volumes: - /var/run/docker.sock:/var/run/docker.sock - /docker/portainer:/data - /etc/localtime:/etc/localtime:ro + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.portainer-redirect.entrypoints=http' + - 'traefik.http.routers.portainer-redirect.rule=Host(`portainer.reekynet.com`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.portainer-redirect.middlewares=http2https' + + - 'traefik.http.routers.portainer.entrypoints=https' + - 'traefik.http.routers.portainer.rule=Host(`portainer.reekynet.com`)' + - 'traefik.http.routers.portainer.tls=true' + - 'traefik.http.routers.portainer.tls.certresolver=http' + - 'traefik.http.routers.portainer.service=portainer' + - 'traefik.docker.network=proxy' + - 'traefik.http.services.portainer.loadbalancer.server.port=9000' + +networks: + proxy: + external: true diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml new file mode 100644 index 00000000..b1ac5057 --- /dev/null +++ b/docker/traefik/docker-compose.yaml @@ -0,0 +1,41 @@ +version: '3' + +services: + traefik: + image: traefik:v2.0 + container_name: traefik + restart: unless-stopped + ports: + - '80:80' + - '443:443' + environment: + - TZ=Europe/Helsinki + security_opt: + - no-new-privileges:true + networks: + - proxy + volumes: + - /etc/localtime:/etc/localtime:ro + - /var/run/docker.sock:/var/run/docker.sock:ro + - /docker/traefik/traefik.yml:/traefik.yml:ro + - /docker/traefik/dashboard-users:/dashboard-users:ro + - /docker/traefik/acme.json:/acme.json + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.redirect.entrypoints=http' + - 'traefik.http.routers.redirect.rule=Host(`traefik.reekynet.com`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.redirect.middlewares=http2https' + + - 'traefik.http.routers.dashboard.entrypoints=https' + - 'traefik.http.routers.dashboard.rule=Host(`traefik.reekynet.com`)' + - 'traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users' + - 'traefik.http.routers.dashboard.middlewares=dashboard-auth' + - 'traefik.http.routers.dashboard.tls=true' + - 'traefik.http.routers.dashboard.tls.certresolver=http' + - 'traefik.http.routers.dashboard.service=api@internal' + +networks: + proxy: + external: true From 029eceb92e44170e6c938fbb33e66e3700797c8e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 21:24:50 +0200 Subject: [PATCH 0046/2667] Move to traefik proxy --- docker/gitea/docker-compose.yaml | 32 ++++++++++++---- docker/homeautomation/docker-compose.yml | 49 ++++++++++++++++++++++-- docker/jellyfin/docker-compose.yaml | 24 +++++++++++- docker/portainer/docker-compose.yaml | 23 ++++++++++- docker/traefik/docker-compose.yaml | 41 ++++++++++++++++++++ 5 files changed, 156 insertions(+), 13 deletions(-) create mode 100644 docker/traefik/docker-compose.yaml diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 09486fdd..f2b31f23 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -1,9 +1,5 @@ version: '2' -networks: - gitea: - external: false - services: gitea: container_name: gitea @@ -20,14 +16,30 @@ services: restart: always networks: - gitea - volumes: - - /docker/gitea/gitea:/data - - /etc/localtime:/etc/localtime:ro + - proxy ports: - '3000:3000' - '222:22' depends_on: - mariadb-gitea + volumes: + - /docker/gitea/gitea:/data + - /etc/localtime:/etc/localtime:ro + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.gitea-redirect.entrypoints=http' + - 'traefik.http.routers.gitea-redirect.rule=Host(`git.reekynet.com`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.gitea-redirect.middlewares=http2https' + + - 'traefik.http.routers.gitea.entrypoints=https' + - 'traefik.http.routers.gitea.rule=Host(`git.reekynet.com`)' + - 'traefik.http.routers.gitea.tls=true' + - 'traefik.http.routers.gitea.tls.certresolver=http' + - 'traefik.http.routers.gitea.service=gitea' + - 'traefik.docker.network=proxy' + - 'traefik.http.services.gitea.loadbalancer.server.port=3000' mariadb-gitea: container_name: mariadb-gitea @@ -41,3 +53,9 @@ services: volumes: - /docker/gitea/mariadb:/var/lib/mysql - /etc/localtime:/etc/localtime:ro + +networks: + gitea: + external: false + proxy: + external: true diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 68dec2f9..abe6a2e6 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -9,10 +9,29 @@ services: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro restart: always - network_mode: host + networks: + - home-assistant + - proxy + ports: + - '8123:8123' depends_on: - deconz - mosquitto + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.home-assistant-redirect.entrypoints=http' + - 'traefik.http.routers.home-assistant-redirect.rule=Host(`home.reekynet.com`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.home-assistant-redirect.middlewares=http2https' + + - 'traefik.http.routers.home-assistant.entrypoints=https' + - 'traefik.http.routers.home-assistant.rule=Host(`home.reekynet.com`)' + - 'traefik.http.routers.home-assistant.tls=true' + - 'traefik.http.routers.home-assistant.tls.certresolver=http' + - 'traefik.http.routers.home-assistant.service=home-assistant' + - 'traefik.docker.network=proxy' + - 'traefik.http.services.home-assistant.loadbalancer.server.port=8123' deconz: container_name: deconz @@ -39,6 +58,9 @@ services: image: nodered/node-red environment: - TZ=Europe/Helsinki + networks: + - home-assistant + - proxy ports: - '1880:1880' volumes: @@ -47,6 +69,21 @@ services: restart: always depends_on: - home-assistant + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.node-red-redirect.entrypoints=http' + - 'traefik.http.routers.node-red-redirect.rule=Host(`node.reekynet.com`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.node-red-redirect.middlewares=http2https' + + - 'traefik.http.routers.node-red.entrypoints=https' + - 'traefik.http.routers.node-red.rule=Host(`node.reekynet.com`)' + - 'traefik.http.routers.node-red.tls=true' + - 'traefik.http.routers.node-red.tls.certresolver=http' + - 'traefik.http.routers.node-red.service=node-red' + - 'traefik.docker.network=proxy' + - 'traefik.http.services.node.loadbalancer.server.port=1880' mosquitto: container_name: mosquitto @@ -65,9 +102,15 @@ services: environment: - TZ=Europe/Helsinki - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - ports: - - '3308:3306' + networks: + - home-assistant volumes: - /docker/homeautomation/mariadb:/var/lib/mysql - /etc/localtime:/etc/localtime:ro restart: always + +networks: + home-assistant: + external: false + proxy: + external: true diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 2f2ccb80..8cc073a8 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -6,10 +6,32 @@ services: environment: - TZ=Europe/Helsinki user: 1001:985 - network_mode: 'host' + ports: + - '8096:8096' + networks: + - proxy restart: always volumes: - /docker/jellyfin/config:/config - /docker/jellyfin/cache:/cache - /mnt/Storage/Media:/media - /etc/localtime:/etc/localtime:ro + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.jellyfin-redirect.entrypoints=http' + - 'traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.reekynet.com`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.jellyfin-redirect.middlewares=http2https' + + - 'traefik.http.routers.jellyfin.entrypoints=https' + - 'traefik.http.routers.jellyfin.rule=Host(`jellyfin.reekynet.com`)' + - 'traefik.http.routers.jellyfin.tls=true' + - 'traefik.http.routers.jellyfin.tls.certresolver=http' + - 'traefik.http.routers.jellyfin.service=jellyfin' + - 'traefik.docker.network=proxy' + - 'traefik.http.services.jellyfin.loadbalancer.server.port=8096' + +networks: + proxy: + external: true diff --git a/docker/portainer/docker-compose.yaml b/docker/portainer/docker-compose.yaml index d4a58395..76ffaccd 100644 --- a/docker/portainer/docker-compose.yaml +++ b/docker/portainer/docker-compose.yaml @@ -6,9 +6,28 @@ services: environment: - TZ=Europe/Helsinki restart: always - ports: - - '9000:9000' + networks: + - proxy volumes: - /var/run/docker.sock:/var/run/docker.sock - /docker/portainer:/data - /etc/localtime:/etc/localtime:ro + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.portainer-redirect.entrypoints=http' + - 'traefik.http.routers.portainer-redirect.rule=Host(`portainer.reekynet.com`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.portainer-redirect.middlewares=http2https' + + - 'traefik.http.routers.portainer.entrypoints=https' + - 'traefik.http.routers.portainer.rule=Host(`portainer.reekynet.com`)' + - 'traefik.http.routers.portainer.tls=true' + - 'traefik.http.routers.portainer.tls.certresolver=http' + - 'traefik.http.routers.portainer.service=portainer' + - 'traefik.docker.network=proxy' + - 'traefik.http.services.portainer.loadbalancer.server.port=9000' + +networks: + proxy: + external: true diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml new file mode 100644 index 00000000..b1ac5057 --- /dev/null +++ b/docker/traefik/docker-compose.yaml @@ -0,0 +1,41 @@ +version: '3' + +services: + traefik: + image: traefik:v2.0 + container_name: traefik + restart: unless-stopped + ports: + - '80:80' + - '443:443' + environment: + - TZ=Europe/Helsinki + security_opt: + - no-new-privileges:true + networks: + - proxy + volumes: + - /etc/localtime:/etc/localtime:ro + - /var/run/docker.sock:/var/run/docker.sock:ro + - /docker/traefik/traefik.yml:/traefik.yml:ro + - /docker/traefik/dashboard-users:/dashboard-users:ro + - /docker/traefik/acme.json:/acme.json + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.redirect.entrypoints=http' + - 'traefik.http.routers.redirect.rule=Host(`traefik.reekynet.com`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.redirect.middlewares=http2https' + + - 'traefik.http.routers.dashboard.entrypoints=https' + - 'traefik.http.routers.dashboard.rule=Host(`traefik.reekynet.com`)' + - 'traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users' + - 'traefik.http.routers.dashboard.middlewares=dashboard-auth' + - 'traefik.http.routers.dashboard.tls=true' + - 'traefik.http.routers.dashboard.tls.certresolver=http' + - 'traefik.http.routers.dashboard.service=api@internal' + +networks: + proxy: + external: true From 087db7fffc1fb90fead232108a8f41de7c5b374b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 23:57:30 +0200 Subject: [PATCH 0047/2667] Change jellyfin user --- docker/jellyfin/docker-compose.yaml | 30 ++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 8cc073a8..50e95a23 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -1,13 +1,13 @@ -version: '3' +version: "3" services: jellyfin: image: jellyfin/jellyfin container_name: jellyfin environment: - TZ=Europe/Helsinki - user: 1001:985 + user: "${UID}:${GID}" ports: - - '8096:8096' + - "8096:8096" networks: - proxy restart: always @@ -17,20 +17,20 @@ services: - /mnt/Storage/Media:/media - /etc/localtime:/etc/localtime:ro labels: - - 'traefik.enable=true' + - "traefik.enable=true" - - 'traefik.http.routers.jellyfin-redirect.entrypoints=http' - - 'traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.reekynet.com`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.jellyfin-redirect.middlewares=http2https' + - "traefik.http.routers.jellyfin-redirect.entrypoints=http" + - "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.jellyfin-redirect.middlewares=http2https" - - 'traefik.http.routers.jellyfin.entrypoints=https' - - 'traefik.http.routers.jellyfin.rule=Host(`jellyfin.reekynet.com`)' - - 'traefik.http.routers.jellyfin.tls=true' - - 'traefik.http.routers.jellyfin.tls.certresolver=http' - - 'traefik.http.routers.jellyfin.service=jellyfin' - - 'traefik.docker.network=proxy' - - 'traefik.http.services.jellyfin.loadbalancer.server.port=8096' + - "traefik.http.routers.jellyfin.entrypoints=https" + - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.reekynet.com`)" + - "traefik.http.routers.jellyfin.tls=true" + - "traefik.http.routers.jellyfin.tls.certresolver=http" + - "traefik.http.routers.jellyfin.service=jellyfin" + - "traefik.docker.network=proxy" + - "traefik.http.services.jellyfin.loadbalancer.server.port=8096" networks: proxy: From 7fb89281ee5b399c79aee7cc9715c02adef365ab Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 23:57:30 +0200 Subject: [PATCH 0048/2667] Change jellyfin user --- docker/jellyfin/docker-compose.yaml | 30 ++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 8cc073a8..50e95a23 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -1,13 +1,13 @@ -version: '3' +version: "3" services: jellyfin: image: jellyfin/jellyfin container_name: jellyfin environment: - TZ=Europe/Helsinki - user: 1001:985 + user: "${UID}:${GID}" ports: - - '8096:8096' + - "8096:8096" networks: - proxy restart: always @@ -17,20 +17,20 @@ services: - /mnt/Storage/Media:/media - /etc/localtime:/etc/localtime:ro labels: - - 'traefik.enable=true' + - "traefik.enable=true" - - 'traefik.http.routers.jellyfin-redirect.entrypoints=http' - - 'traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.reekynet.com`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.jellyfin-redirect.middlewares=http2https' + - "traefik.http.routers.jellyfin-redirect.entrypoints=http" + - "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.jellyfin-redirect.middlewares=http2https" - - 'traefik.http.routers.jellyfin.entrypoints=https' - - 'traefik.http.routers.jellyfin.rule=Host(`jellyfin.reekynet.com`)' - - 'traefik.http.routers.jellyfin.tls=true' - - 'traefik.http.routers.jellyfin.tls.certresolver=http' - - 'traefik.http.routers.jellyfin.service=jellyfin' - - 'traefik.docker.network=proxy' - - 'traefik.http.services.jellyfin.loadbalancer.server.port=8096' + - "traefik.http.routers.jellyfin.entrypoints=https" + - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.reekynet.com`)" + - "traefik.http.routers.jellyfin.tls=true" + - "traefik.http.routers.jellyfin.tls.certresolver=http" + - "traefik.http.routers.jellyfin.service=jellyfin" + - "traefik.docker.network=proxy" + - "traefik.http.services.jellyfin.loadbalancer.server.port=8096" networks: proxy: From 68d5cc280184d56529d8ce66f9c431387ad169cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 00:32:56 +0200 Subject: [PATCH 0049/2667] Update user --- docker/tvheadend/docker-compose.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index d2211ca4..a9f10f42 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -1,12 +1,11 @@ -version: '2' +version: "2" services: tvheadend: image: linuxserver/tvheadend container_name: tvheadend + user: $UID:$GID environment: - TZ=Europe/Helsinki - - PUID=${UID} - - PGID=${GID} volumes: - /docker/tvheadend:/config - /mnt/Storage/Media/PVR:/recordings From 16ad69644e7f6f36ec062e90464314b61d457249 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 00:32:56 +0200 Subject: [PATCH 0050/2667] Update user --- docker/tvheadend/docker-compose.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index d2211ca4..a9f10f42 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -1,12 +1,11 @@ -version: '2' +version: "2" services: tvheadend: image: linuxserver/tvheadend container_name: tvheadend + user: $UID:$GID environment: - TZ=Europe/Helsinki - - PUID=${UID} - - PGID=${GID} volumes: - /docker/tvheadend:/config - /mnt/Storage/Media/PVR:/recordings From 582c328985c1db779a89660ef89cb868669ecd41 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 00:42:37 +0200 Subject: [PATCH 0051/2667] Fix users and groups --- docker/jellyfin/docker-compose.yaml | 2 +- docker/tvheadend/docker-compose.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 50e95a23..12344cc2 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -5,7 +5,7 @@ services: container_name: jellyfin environment: - TZ=Europe/Helsinki - user: "${UID}:${GID}" + user: "1000:985" ports: - "8096:8096" networks: diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index a9f10f42..5b6652c3 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -3,9 +3,11 @@ services: tvheadend: image: linuxserver/tvheadend container_name: tvheadend - user: $UID:$GID + user: "1000:985" environment: - TZ=Europe/Helsinki + - PUID=1000 + - PGID=985 volumes: - /docker/tvheadend:/config - /mnt/Storage/Media/PVR:/recordings From 2d843fa4292129259e05972587808ec40a2e1d51 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 00:42:37 +0200 Subject: [PATCH 0052/2667] Fix users and groups --- docker/jellyfin/docker-compose.yaml | 2 +- docker/tvheadend/docker-compose.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 50e95a23..12344cc2 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -5,7 +5,7 @@ services: container_name: jellyfin environment: - TZ=Europe/Helsinki - user: "${UID}:${GID}" + user: "1000:985" ports: - "8096:8096" networks: diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index a9f10f42..5b6652c3 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -3,9 +3,11 @@ services: tvheadend: image: linuxserver/tvheadend container_name: tvheadend - user: $UID:$GID + user: "1000:985" environment: - TZ=Europe/Helsinki + - PUID=1000 + - PGID=985 volumes: - /docker/tvheadend:/config - /mnt/Storage/Media/PVR:/recordings From 8922ddc658088a7a190a9ba2047699bb7aca07c9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 00:44:51 +0200 Subject: [PATCH 0053/2667] Does it work now? --- docker/tvheadend/docker-compose.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 5b6652c3..0c6edcda 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -3,7 +3,6 @@ services: tvheadend: image: linuxserver/tvheadend container_name: tvheadend - user: "1000:985" environment: - TZ=Europe/Helsinki - PUID=1000 From 1627d59a24b2d7766f3fabbcc364bfba9d3fcb17 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 00:44:51 +0200 Subject: [PATCH 0054/2667] Does it work now? --- docker/tvheadend/docker-compose.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 5b6652c3..0c6edcda 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -3,7 +3,6 @@ services: tvheadend: image: linuxserver/tvheadend container_name: tvheadend - user: "1000:985" environment: - TZ=Europe/Helsinki - PUID=1000 From 7fdf22b3bd911feebb53fd55026ba143aba38c72 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:11:23 +0200 Subject: [PATCH 0055/2667] Added ipmi control scripts --- home/Scripts/ipmi-static.sh | 22 ++++++++++++++++++++++ home/Scripts/ipmi-temp.sh | 17 +++++++++++++++++ secrets/env | 1 + secrets/secrets.sh | 1 + 4 files changed, 41 insertions(+) create mode 100755 home/Scripts/ipmi-static.sh create mode 100644 home/Scripts/ipmi-temp.sh diff --git a/home/Scripts/ipmi-static.sh b/home/Scripts/ipmi-static.sh new file mode 100755 index 00000000..f06d66b9 --- /dev/null +++ b/home/Scripts/ipmi-static.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +# ---------------------------------------------------------------------------------- +# Script for setting manual fan speed to 2160 RPM (on my R710) +# +# Requires: +# ipmitool – apt-get install ipmitool +# slacktee.sh – https://github.com/course-hero/slacktee +# ---------------------------------------------------------------------------------- + + +# IPMI SETTINGS: +# Modify to suit your needs. +# DEFAULT IP: 192.168.0.120 +IPMIHOST=10.0.0.174 +IPMIUSER=ReekyMarko +IPMIPW={{@@ env['PASS_IPMI'] @@}} +IPMIEK=0000000000000000000000000000000000000000 + +printf "Activating manual fan speeds! (2160 RPM)" +ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x00 +ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x02 0xff 0x09 diff --git a/home/Scripts/ipmi-temp.sh b/home/Scripts/ipmi-temp.sh new file mode 100644 index 00000000..fb693aed --- /dev/null +++ b/home/Scripts/ipmi-temp.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +IPMIHOST=10.0.0.174 +IPMIUSER=ReekyMarko +IPMIPW={{@@ env['PASS_IPMI'] @@}} +IPMIEK=0000000000000000000000000000000000000000 +MAXTEMP=27 +TEMP=$(ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr type temperature |grep Ambient |grep degrees |grep -Po '\d{2}' | tail -1) + + +if [[ $TEMP > $MAXTEMP ]]; + then + printf "Warning: Temperature is too high! Activating dynamic fan control! ($TEMP C)" + ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x01 + else + printf "Temperature is OK ($TEMP C)" +fi diff --git a/secrets/env b/secrets/env index c9e35d7b..1883ef69 100755 --- a/secrets/env +++ b/secrets/env @@ -6,6 +6,7 @@ export PASS_MUSPY="$(pass entertainment/muspy.com | head -n 1)" export PASS_ARIA2="$(pass linux/aria2 | head -n 1)" export PASS_MPD="$(pass linux/mpd | head -n 1)" export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -n 1)" +export PASS_IPMI="$(pass reekynet/idrac | head -n 1)" export ME_FULLNAME="$(pass me | head -n 1)" export ME_ADDRESS="$(pass me | rg 'address' | cut -d' ' -f2-)" diff --git a/secrets/secrets.sh b/secrets/secrets.sh index 2de5945f..c1ae535f 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -10,6 +10,7 @@ export PASS_MUSPY="$PASS_MUSPY" export PASS_ARIA2="$PASS_ARIA2" export PASS_MPD="$PASS_MPD" export PASS_MPD_ADMIN="$PASS_MPD_ADMIN" +export PASS_IPMI="$PASS_IPMI" export ME_FULLNAME="$ME_FULLNAME" export ME_ADDRESS="$ME_ADDRESS" From 78dc41b64a899def026cf29e8024c15e842debc8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:11:23 +0200 Subject: [PATCH 0056/2667] Added ipmi control scripts --- home/Scripts/ipmi-static.sh | 22 ++++++++++++++++++++++ home/Scripts/ipmi-temp.sh | 17 +++++++++++++++++ secrets/env | 1 + secrets/secrets.sh | 1 + 4 files changed, 41 insertions(+) create mode 100755 home/Scripts/ipmi-static.sh create mode 100644 home/Scripts/ipmi-temp.sh diff --git a/home/Scripts/ipmi-static.sh b/home/Scripts/ipmi-static.sh new file mode 100755 index 00000000..f06d66b9 --- /dev/null +++ b/home/Scripts/ipmi-static.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +# ---------------------------------------------------------------------------------- +# Script for setting manual fan speed to 2160 RPM (on my R710) +# +# Requires: +# ipmitool – apt-get install ipmitool +# slacktee.sh – https://github.com/course-hero/slacktee +# ---------------------------------------------------------------------------------- + + +# IPMI SETTINGS: +# Modify to suit your needs. +# DEFAULT IP: 192.168.0.120 +IPMIHOST=10.0.0.174 +IPMIUSER=ReekyMarko +IPMIPW={{@@ env['PASS_IPMI'] @@}} +IPMIEK=0000000000000000000000000000000000000000 + +printf "Activating manual fan speeds! (2160 RPM)" +ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x00 +ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x02 0xff 0x09 diff --git a/home/Scripts/ipmi-temp.sh b/home/Scripts/ipmi-temp.sh new file mode 100644 index 00000000..fb693aed --- /dev/null +++ b/home/Scripts/ipmi-temp.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +IPMIHOST=10.0.0.174 +IPMIUSER=ReekyMarko +IPMIPW={{@@ env['PASS_IPMI'] @@}} +IPMIEK=0000000000000000000000000000000000000000 +MAXTEMP=27 +TEMP=$(ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr type temperature |grep Ambient |grep degrees |grep -Po '\d{2}' | tail -1) + + +if [[ $TEMP > $MAXTEMP ]]; + then + printf "Warning: Temperature is too high! Activating dynamic fan control! ($TEMP C)" + ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x01 + else + printf "Temperature is OK ($TEMP C)" +fi diff --git a/secrets/env b/secrets/env index c9e35d7b..1883ef69 100755 --- a/secrets/env +++ b/secrets/env @@ -6,6 +6,7 @@ export PASS_MUSPY="$(pass entertainment/muspy.com | head -n 1)" export PASS_ARIA2="$(pass linux/aria2 | head -n 1)" export PASS_MPD="$(pass linux/mpd | head -n 1)" export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -n 1)" +export PASS_IPMI="$(pass reekynet/idrac | head -n 1)" export ME_FULLNAME="$(pass me | head -n 1)" export ME_ADDRESS="$(pass me | rg 'address' | cut -d' ' -f2-)" diff --git a/secrets/secrets.sh b/secrets/secrets.sh index 2de5945f..c1ae535f 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -10,6 +10,7 @@ export PASS_MUSPY="$PASS_MUSPY" export PASS_ARIA2="$PASS_ARIA2" export PASS_MPD="$PASS_MPD" export PASS_MPD_ADMIN="$PASS_MPD_ADMIN" +export PASS_IPMI="$PASS_IPMI" export ME_FULLNAME="$ME_FULLNAME" export ME_ADDRESS="$ME_ADDRESS" From bf69da8ab1e8083c042795c021a001a6edcc75eb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:26:00 +0200 Subject: [PATCH 0057/2667] Add ipmi-temp service and timer --- config-root.yaml | 12 ++++++++++++ root/etc/systemd/system/ipmi-temp.service | 9 +++++++++ root/etc/systemd/system/ipmi-temp.timer | 9 +++++++++ 3 files changed, 30 insertions(+) create mode 100644 root/etc/systemd/system/ipmi-temp.service create mode 100644 root/etc/systemd/system/ipmi-temp.timer diff --git a/config-root.yaml b/config-root.yaml index 0163e560..079c108a 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -116,7 +116,16 @@ dotfiles: f_20-quiet-printk.conf: src: etc/sysctl.d/20-quiet-printk.conf dst: /etc/sysctl.d/20-quiet-printk.conf + f_ipmi-temp.timer: + src: etc/systemd/system/ipmi-temp.timer + dst: /etc/systemd/system/ipmi-temp.timer + f_ipmi-temp.service: + src: etc/systemd/system/ipmi-temp.service + dst: /etc/systemd/system/ipmi-temp.service profiles: + IPMI: + dotfiles: f_ipmi-temp.timer + f_ipmi-temp.service Locale: dotfiles: - f_locale.conf @@ -151,6 +160,8 @@ profiles: - f_mkinitcpio.conf - f_vconsole.conf - f_20-quiet-printk.conf + - f_ipmi-temp.timer + - f_ipmi-temp.service include: - Locale - Pacman @@ -171,5 +182,6 @@ profiles: include: - Locale - Pacman + - IPMI dotfiles: - f_sshd_config diff --git a/root/etc/systemd/system/ipmi-temp.service b/root/etc/systemd/system/ipmi-temp.service new file mode 100644 index 00000000..fc231cb8 --- /dev/null +++ b/root/etc/systemd/system/ipmi-temp.service @@ -0,0 +1,9 @@ +[Unit] +Description=Watch server temperature + +[Service] +Type=simple +ExecStart=/home/balrog/Scripts/ipmi-temp.sh + +[Install] +WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.timer b/root/etc/systemd/system/ipmi-temp.timer new file mode 100644 index 00000000..d6605b13 --- /dev/null +++ b/root/etc/systemd/system/ipmi-temp.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Watches server temperature + +[Timer] +OnUnitInactiveSec=5s +OnBootSec=5s + +[Install] +WantedBy=timers.target From 2afba83f047972ffd2084bb98bcd8ddf11fc8f49 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:26:00 +0200 Subject: [PATCH 0058/2667] Add ipmi-temp service and timer --- config-root.yaml | 12 ++++++++++++ root/etc/systemd/system/ipmi-temp.service | 9 +++++++++ root/etc/systemd/system/ipmi-temp.timer | 9 +++++++++ 3 files changed, 30 insertions(+) create mode 100644 root/etc/systemd/system/ipmi-temp.service create mode 100644 root/etc/systemd/system/ipmi-temp.timer diff --git a/config-root.yaml b/config-root.yaml index 0163e560..079c108a 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -116,7 +116,16 @@ dotfiles: f_20-quiet-printk.conf: src: etc/sysctl.d/20-quiet-printk.conf dst: /etc/sysctl.d/20-quiet-printk.conf + f_ipmi-temp.timer: + src: etc/systemd/system/ipmi-temp.timer + dst: /etc/systemd/system/ipmi-temp.timer + f_ipmi-temp.service: + src: etc/systemd/system/ipmi-temp.service + dst: /etc/systemd/system/ipmi-temp.service profiles: + IPMI: + dotfiles: f_ipmi-temp.timer + f_ipmi-temp.service Locale: dotfiles: - f_locale.conf @@ -151,6 +160,8 @@ profiles: - f_mkinitcpio.conf - f_vconsole.conf - f_20-quiet-printk.conf + - f_ipmi-temp.timer + - f_ipmi-temp.service include: - Locale - Pacman @@ -171,5 +182,6 @@ profiles: include: - Locale - Pacman + - IPMI dotfiles: - f_sshd_config diff --git a/root/etc/systemd/system/ipmi-temp.service b/root/etc/systemd/system/ipmi-temp.service new file mode 100644 index 00000000..fc231cb8 --- /dev/null +++ b/root/etc/systemd/system/ipmi-temp.service @@ -0,0 +1,9 @@ +[Unit] +Description=Watch server temperature + +[Service] +Type=simple +ExecStart=/home/balrog/Scripts/ipmi-temp.sh + +[Install] +WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.timer b/root/etc/systemd/system/ipmi-temp.timer new file mode 100644 index 00000000..d6605b13 --- /dev/null +++ b/root/etc/systemd/system/ipmi-temp.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Watches server temperature + +[Timer] +OnUnitInactiveSec=5s +OnBootSec=5s + +[Install] +WantedBy=timers.target From 62a13b7b451358c984cffd9d215830bc57d96f4a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:26:50 +0200 Subject: [PATCH 0059/2667] Fix name --- config-root.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 079c108a..de740957 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -123,7 +123,7 @@ dotfiles: src: etc/systemd/system/ipmi-temp.service dst: /etc/systemd/system/ipmi-temp.service profiles: - IPMI: + Ipmi: dotfiles: f_ipmi-temp.timer f_ipmi-temp.service Locale: @@ -182,6 +182,6 @@ profiles: include: - Locale - Pacman - - IPMI + - Ipmi dotfiles: - f_sshd_config From ae226bca736345eb89ff4d20e8359fd7d2725aee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:26:50 +0200 Subject: [PATCH 0060/2667] Fix name --- config-root.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 079c108a..de740957 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -123,7 +123,7 @@ dotfiles: src: etc/systemd/system/ipmi-temp.service dst: /etc/systemd/system/ipmi-temp.service profiles: - IPMI: + Ipmi: dotfiles: f_ipmi-temp.timer f_ipmi-temp.service Locale: @@ -182,6 +182,6 @@ profiles: include: - Locale - Pacman - - IPMI + - Ipmi dotfiles: - f_sshd_config From 9b1a58d56a3ec78f5575cc1c69f43ef2f9b49fbf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:27:47 +0200 Subject: [PATCH 0061/2667] Fix typo --- config-root.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index de740957..6bd5356e 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -123,9 +123,10 @@ dotfiles: src: etc/systemd/system/ipmi-temp.service dst: /etc/systemd/system/ipmi-temp.service profiles: - Ipmi: - dotfiles: f_ipmi-temp.timer - f_ipmi-temp.service + IPMI: + dotfiles: + - f_ipmi-temp.timer + - f_ipmi-temp.service Locale: dotfiles: - f_locale.conf @@ -182,6 +183,6 @@ profiles: include: - Locale - Pacman - - Ipmi + - IPMI dotfiles: - f_sshd_config From 3d2a507daafc3a218edb84490cdaa57184940b19 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:27:47 +0200 Subject: [PATCH 0062/2667] Fix typo --- config-root.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index de740957..6bd5356e 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -123,9 +123,10 @@ dotfiles: src: etc/systemd/system/ipmi-temp.service dst: /etc/systemd/system/ipmi-temp.service profiles: - Ipmi: - dotfiles: f_ipmi-temp.timer - f_ipmi-temp.service + IPMI: + dotfiles: + - f_ipmi-temp.timer + - f_ipmi-temp.service Locale: dotfiles: - f_locale.conf @@ -182,6 +183,6 @@ profiles: include: - Locale - Pacman - - Ipmi + - IPMI dotfiles: - f_sshd_config From 00a14149181f9cc96cbdc8b8c211921051f1b4b1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:28:41 +0200 Subject: [PATCH 0063/2667] Make executable --- home/Scripts/ipmi-temp.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 home/Scripts/ipmi-temp.sh diff --git a/home/Scripts/ipmi-temp.sh b/home/Scripts/ipmi-temp.sh old mode 100644 new mode 100755 From 60c7b48c59b9bdf3474a33b262ed2cbbcc867ba2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:28:41 +0200 Subject: [PATCH 0064/2667] Make executable --- home/Scripts/ipmi-temp.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 home/Scripts/ipmi-temp.sh diff --git a/home/Scripts/ipmi-temp.sh b/home/Scripts/ipmi-temp.sh old mode 100644 new mode 100755 From 4b482ba16718b4e601e4bd4920673998058adcde Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:32:04 +0200 Subject: [PATCH 0065/2667] Add static fanspeed script --- config-root.yaml | 6 ++++-- root/etc/systemd/system/ipmi-static.service | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 root/etc/systemd/system/ipmi-static.service diff --git a/config-root.yaml b/config-root.yaml index 6bd5356e..367f6c3c 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -122,11 +122,15 @@ dotfiles: f_ipmi-temp.service: src: etc/systemd/system/ipmi-temp.service dst: /etc/systemd/system/ipmi-temp.service + f_ipmi-static.service: + src: etc/systemd/system/ipmi-static.service + dst: /etc/systemd/system/ipmi-static.service profiles: IPMI: dotfiles: - f_ipmi-temp.timer - f_ipmi-temp.service + - f_ipmi-static.service Locale: dotfiles: - f_locale.conf @@ -161,8 +165,6 @@ profiles: - f_mkinitcpio.conf - f_vconsole.conf - f_20-quiet-printk.conf - - f_ipmi-temp.timer - - f_ipmi-temp.service include: - Locale - Pacman diff --git a/root/etc/systemd/system/ipmi-static.service b/root/etc/systemd/system/ipmi-static.service new file mode 100644 index 00000000..9588c2a8 --- /dev/null +++ b/root/etc/systemd/system/ipmi-static.service @@ -0,0 +1,9 @@ +[Unit] +Description=Set fan speed + +[Service] +Type=simple +ExecStart=/home/balrog/Scripts/ipmi-static.sh + +[Install] +WantedBy=multi-user.target From 83f1de447d7fa250440810d086579db2c6649dd4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:32:04 +0200 Subject: [PATCH 0066/2667] Add static fanspeed script --- config-root.yaml | 6 ++++-- root/etc/systemd/system/ipmi-static.service | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 root/etc/systemd/system/ipmi-static.service diff --git a/config-root.yaml b/config-root.yaml index 6bd5356e..367f6c3c 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -122,11 +122,15 @@ dotfiles: f_ipmi-temp.service: src: etc/systemd/system/ipmi-temp.service dst: /etc/systemd/system/ipmi-temp.service + f_ipmi-static.service: + src: etc/systemd/system/ipmi-static.service + dst: /etc/systemd/system/ipmi-static.service profiles: IPMI: dotfiles: - f_ipmi-temp.timer - f_ipmi-temp.service + - f_ipmi-static.service Locale: dotfiles: - f_locale.conf @@ -161,8 +165,6 @@ profiles: - f_mkinitcpio.conf - f_vconsole.conf - f_20-quiet-printk.conf - - f_ipmi-temp.timer - - f_ipmi-temp.service include: - Locale - Pacman diff --git a/root/etc/systemd/system/ipmi-static.service b/root/etc/systemd/system/ipmi-static.service new file mode 100644 index 00000000..9588c2a8 --- /dev/null +++ b/root/etc/systemd/system/ipmi-static.service @@ -0,0 +1,9 @@ +[Unit] +Description=Set fan speed + +[Service] +Type=simple +ExecStart=/home/balrog/Scripts/ipmi-static.sh + +[Install] +WantedBy=multi-user.target From 08f4628cd24ecbdfbb77b5c3f8e5b2d9425a93b9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 02:29:28 +0200 Subject: [PATCH 0067/2667] Add ip forwarding for Moria --- config-root.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config-root.yaml b/config-root.yaml index 367f6c3c..4071ca8d 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -188,3 +188,4 @@ profiles: - IPMI dotfiles: - f_sshd_config + - f_99-sysctl.conf From cf0a4ca9c952c4de5025d584465c7c3687b6f3cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 02:29:28 +0200 Subject: [PATCH 0068/2667] Add ip forwarding for Moria --- config-root.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config-root.yaml b/config-root.yaml index 367f6c3c..4071ca8d 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -188,3 +188,4 @@ profiles: - IPMI dotfiles: - f_sshd_config + - f_99-sysctl.conf From 4df83367e4ae83dcbaabc4f7e4a3f3e298c1f83b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 14:44:37 +0200 Subject: [PATCH 0069/2667] Move from deconz to zha --- docker/homeautomation/docker-compose.yml | 90 ++++++++---------------- 1 file changed, 29 insertions(+), 61 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index abe6a2e6..ecc42170 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3' +version: "3" services: home-assistant: container_name: home-assistant @@ -8,50 +8,29 @@ services: volumes: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro + devices: + - /dev/ttyACM0 restart: always networks: - home-assistant - proxy ports: - - '8123:8123' - depends_on: - - deconz - - mosquitto + - "8123:8123" labels: - - 'traefik.enable=true' + - "traefik.enable=true" - - 'traefik.http.routers.home-assistant-redirect.entrypoints=http' - - 'traefik.http.routers.home-assistant-redirect.rule=Host(`home.reekynet.com`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.home-assistant-redirect.middlewares=http2https' + - "traefik.http.routers.home-assistant-redirect.entrypoints=http" + - "traefik.http.routers.home-assistant-redirect.rule=Host(`home.reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.home-assistant-redirect.middlewares=http2https" - - 'traefik.http.routers.home-assistant.entrypoints=https' - - 'traefik.http.routers.home-assistant.rule=Host(`home.reekynet.com`)' - - 'traefik.http.routers.home-assistant.tls=true' - - 'traefik.http.routers.home-assistant.tls.certresolver=http' - - 'traefik.http.routers.home-assistant.service=home-assistant' - - 'traefik.docker.network=proxy' - - 'traefik.http.services.home-assistant.loadbalancer.server.port=8123' - - deconz: - container_name: deconz - image: marthoc/deconz - environment: - - TZ=Europe/Helsinki - - DECONZ_WEB_PORT=8083 - - DECONZ_WS_PORT=8084 - - DECONZ_VNC_PORT=5901 - - DECONZ_VNC_MODE=1 - - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} - - DEBUG_OTAU=1 - network_mode: host - volumes: - - /docker/homeautomation/deconz:/root/.local/share/dresden-elektronik/deCONZ - - - /etc/localtime:/etc/localtime:ro - restart: always - devices: - - /dev/ttyACM0 + - "traefik.http.routers.home-assistant.entrypoints=https" + - "traefik.http.routers.home-assistant.rule=Host(`home.reekynet.com`)" + - "traefik.http.routers.home-assistant.tls=true" + - "traefik.http.routers.home-assistant.tls.certresolver=http" + - "traefik.http.routers.home-assistant.service=home-assistant" + - "traefik.docker.network=proxy" + - "traefik.http.services.home-assistant.loadbalancer.server.port=8123" node-red: container_name: node-red @@ -62,7 +41,7 @@ services: - home-assistant - proxy ports: - - '1880:1880' + - "1880:1880" volumes: - /docker/homeautomation/node-red:/data - /etc/localtime:/etc/localtime:ro @@ -70,31 +49,20 @@ services: depends_on: - home-assistant labels: - - 'traefik.enable=true' + - "traefik.enable=true" - - 'traefik.http.routers.node-red-redirect.entrypoints=http' - - 'traefik.http.routers.node-red-redirect.rule=Host(`node.reekynet.com`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.node-red-redirect.middlewares=http2https' + - "traefik.http.routers.node-red-redirect.entrypoints=http" + - "traefik.http.routers.node-red-redirect.rule=Host(`node.reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.node-red-redirect.middlewares=http2https" - - 'traefik.http.routers.node-red.entrypoints=https' - - 'traefik.http.routers.node-red.rule=Host(`node.reekynet.com`)' - - 'traefik.http.routers.node-red.tls=true' - - 'traefik.http.routers.node-red.tls.certresolver=http' - - 'traefik.http.routers.node-red.service=node-red' - - 'traefik.docker.network=proxy' - - 'traefik.http.services.node.loadbalancer.server.port=1880' - - mosquitto: - container_name: mosquitto - image: eclipse-mosquitto - environment: - - TZ=Europe/Helsinki - network_mode: host - volumes: - - /docker/homeautomation/mosquitto:/mosquitto - - /etc/localtime:/etc/localtime:ro - restart: always + - "traefik.http.routers.node-red.entrypoints=https" + - "traefik.http.routers.node-red.rule=Host(`node.reekynet.com`)" + - "traefik.http.routers.node-red.tls=true" + - "traefik.http.routers.node-red.tls.certresolver=http" + - "traefik.http.routers.node-red.service=node-red" + - "traefik.docker.network=proxy" + - "traefik.http.services.node.loadbalancer.server.port=1880" mariadb: container_name: mariadb-hass From 57ceac9dbc9e4a57069cda2b6afb093013baa549 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 14:44:37 +0200 Subject: [PATCH 0070/2667] Move from deconz to zha --- docker/homeautomation/docker-compose.yml | 90 ++++++++---------------- 1 file changed, 29 insertions(+), 61 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index abe6a2e6..ecc42170 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3' +version: "3" services: home-assistant: container_name: home-assistant @@ -8,50 +8,29 @@ services: volumes: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro + devices: + - /dev/ttyACM0 restart: always networks: - home-assistant - proxy ports: - - '8123:8123' - depends_on: - - deconz - - mosquitto + - "8123:8123" labels: - - 'traefik.enable=true' + - "traefik.enable=true" - - 'traefik.http.routers.home-assistant-redirect.entrypoints=http' - - 'traefik.http.routers.home-assistant-redirect.rule=Host(`home.reekynet.com`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.home-assistant-redirect.middlewares=http2https' + - "traefik.http.routers.home-assistant-redirect.entrypoints=http" + - "traefik.http.routers.home-assistant-redirect.rule=Host(`home.reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.home-assistant-redirect.middlewares=http2https" - - 'traefik.http.routers.home-assistant.entrypoints=https' - - 'traefik.http.routers.home-assistant.rule=Host(`home.reekynet.com`)' - - 'traefik.http.routers.home-assistant.tls=true' - - 'traefik.http.routers.home-assistant.tls.certresolver=http' - - 'traefik.http.routers.home-assistant.service=home-assistant' - - 'traefik.docker.network=proxy' - - 'traefik.http.services.home-assistant.loadbalancer.server.port=8123' - - deconz: - container_name: deconz - image: marthoc/deconz - environment: - - TZ=Europe/Helsinki - - DECONZ_WEB_PORT=8083 - - DECONZ_WS_PORT=8084 - - DECONZ_VNC_PORT=5901 - - DECONZ_VNC_MODE=1 - - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} - - DEBUG_OTAU=1 - network_mode: host - volumes: - - /docker/homeautomation/deconz:/root/.local/share/dresden-elektronik/deCONZ - - - /etc/localtime:/etc/localtime:ro - restart: always - devices: - - /dev/ttyACM0 + - "traefik.http.routers.home-assistant.entrypoints=https" + - "traefik.http.routers.home-assistant.rule=Host(`home.reekynet.com`)" + - "traefik.http.routers.home-assistant.tls=true" + - "traefik.http.routers.home-assistant.tls.certresolver=http" + - "traefik.http.routers.home-assistant.service=home-assistant" + - "traefik.docker.network=proxy" + - "traefik.http.services.home-assistant.loadbalancer.server.port=8123" node-red: container_name: node-red @@ -62,7 +41,7 @@ services: - home-assistant - proxy ports: - - '1880:1880' + - "1880:1880" volumes: - /docker/homeautomation/node-red:/data - /etc/localtime:/etc/localtime:ro @@ -70,31 +49,20 @@ services: depends_on: - home-assistant labels: - - 'traefik.enable=true' + - "traefik.enable=true" - - 'traefik.http.routers.node-red-redirect.entrypoints=http' - - 'traefik.http.routers.node-red-redirect.rule=Host(`node.reekynet.com`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.node-red-redirect.middlewares=http2https' + - "traefik.http.routers.node-red-redirect.entrypoints=http" + - "traefik.http.routers.node-red-redirect.rule=Host(`node.reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.node-red-redirect.middlewares=http2https" - - 'traefik.http.routers.node-red.entrypoints=https' - - 'traefik.http.routers.node-red.rule=Host(`node.reekynet.com`)' - - 'traefik.http.routers.node-red.tls=true' - - 'traefik.http.routers.node-red.tls.certresolver=http' - - 'traefik.http.routers.node-red.service=node-red' - - 'traefik.docker.network=proxy' - - 'traefik.http.services.node.loadbalancer.server.port=1880' - - mosquitto: - container_name: mosquitto - image: eclipse-mosquitto - environment: - - TZ=Europe/Helsinki - network_mode: host - volumes: - - /docker/homeautomation/mosquitto:/mosquitto - - /etc/localtime:/etc/localtime:ro - restart: always + - "traefik.http.routers.node-red.entrypoints=https" + - "traefik.http.routers.node-red.rule=Host(`node.reekynet.com`)" + - "traefik.http.routers.node-red.tls=true" + - "traefik.http.routers.node-red.tls.certresolver=http" + - "traefik.http.routers.node-red.service=node-red" + - "traefik.docker.network=proxy" + - "traefik.http.services.node.loadbalancer.server.port=1880" mariadb: container_name: mariadb-hass From bf9a0f1a26a3024a54c69866305860b435f3749d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 15:20:11 +0200 Subject: [PATCH 0071/2667] Small fix --- docker/homeautomation/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index ecc42170..b4f5a2bc 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -9,7 +9,7 @@ services: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro devices: - - /dev/ttyACM0 + - /dev/ttyACM0:/dev/ttyACM0 restart: always networks: - home-assistant From cc44e0654a047081522dbedb1c77bacc6fc3e8e4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 15:20:11 +0200 Subject: [PATCH 0072/2667] Small fix --- docker/homeautomation/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index ecc42170..b4f5a2bc 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -9,7 +9,7 @@ services: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro devices: - - /dev/ttyACM0 + - /dev/ttyACM0:/dev/ttyACM0 restart: always networks: - home-assistant From 2e23c6c1b1f326381e6d0a1c4c7f9c698b8d4f26 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 17:23:15 +0200 Subject: [PATCH 0073/2667] Move back to deconz This reverts commit 07865cc313a40fb7bce3c678b5066ec4262c3ceb. --- config-root.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config-root.yaml b/config-root.yaml index 4071ca8d..367f6c3c 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -188,4 +188,3 @@ profiles: - IPMI dotfiles: - f_sshd_config - - f_99-sysctl.conf From 37e2aad2cbdc12233619521fe281805d15a489c8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 17:23:15 +0200 Subject: [PATCH 0074/2667] Move back to deconz This reverts commit 03ff7a70fdc52c70a7abf8b8374e3a6aa5d167f0. --- config-root.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config-root.yaml b/config-root.yaml index 4071ca8d..367f6c3c 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -188,4 +188,3 @@ profiles: - IPMI dotfiles: - f_sshd_config - - f_99-sysctl.conf From 4f81463438b836604701e0da305471f5f4112384 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 17:25:29 +0200 Subject: [PATCH 0075/2667] Oops wrong commit reverted This reverts commit a51192282fb613c730a85b6f5a274ac34d08ff7d. --- config-root.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config-root.yaml b/config-root.yaml index 367f6c3c..4071ca8d 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -188,3 +188,4 @@ profiles: - IPMI dotfiles: - f_sshd_config + - f_99-sysctl.conf From f6bba18a8b423bfbd86ec43edbf57a59a07b50b8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 17:25:29 +0200 Subject: [PATCH 0076/2667] Oops wrong commit reverted This reverts commit 37ead768836247870e8a4adb91cc2489b4f7ba82. --- config-root.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config-root.yaml b/config-root.yaml index 367f6c3c..4071ca8d 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -188,3 +188,4 @@ profiles: - IPMI dotfiles: - f_sshd_config + - f_99-sysctl.conf From f4343b4757d7ccfc30cb1178cc40c062108bea32 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 17:27:55 +0200 Subject: [PATCH 0077/2667] Revert "Move from deconz to zha" This reverts commit 36c87467d79885e37d11fb224941f685c7bfe646. --- docker/homeautomation/docker-compose.yml | 36 +++++- docker/homeautomation/docker-compose.yml.orig | 121 ++++++++++++++++++ 2 files changed, 155 insertions(+), 2 deletions(-) create mode 100644 docker/homeautomation/docker-compose.yml.orig diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index b4f5a2bc..05a905f1 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -8,14 +8,15 @@ services: volumes: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro - devices: - - /dev/ttyACM0:/dev/ttyACM0 restart: always networks: - home-assistant - proxy ports: - "8123:8123" + depends_on: + - deconz + - mosquitto labels: - "traefik.enable=true" @@ -32,6 +33,26 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.home-assistant.loadbalancer.server.port=8123" + deconz: + container_name: deconz + image: marthoc/deconz + environment: + - TZ=Europe/Helsinki + - DECONZ_WEB_PORT=8083 + - DECONZ_WS_PORT=8084 + - DECONZ_VNC_PORT=5901 + - DECONZ_VNC_MODE=1 + - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} + - DEBUG_OTAU=1 + network_mode: host + volumes: + - /docker/homeautomation/deconz:/root/.local/share/dresden-elektronik/deCONZ + + - /etc/localtime:/etc/localtime:ro + restart: always + devices: + - /dev/ttyACM0 + node-red: container_name: node-red image: nodered/node-red @@ -64,6 +85,17 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.node.loadbalancer.server.port=1880" + mosquitto: + container_name: mosquitto + image: eclipse-mosquitto + environment: + - TZ=Europe/Helsinki + network_mode: host + volumes: + - /docker/homeautomation/mosquitto:/mosquitto + - /etc/localtime:/etc/localtime:ro + restart: always + mariadb: container_name: mariadb-hass image: mariadb diff --git a/docker/homeautomation/docker-compose.yml.orig b/docker/homeautomation/docker-compose.yml.orig new file mode 100644 index 00000000..225e773b --- /dev/null +++ b/docker/homeautomation/docker-compose.yml.orig @@ -0,0 +1,121 @@ +version: '3' +services: + home-assistant: + container_name: home-assistant + image: homeassistant/home-assistant + environment: + - TZ=Europe/Helsinki + volumes: + - /docker/homeautomation/home-assistant:/config + - /etc/localtime:/etc/localtime:ro +<<<<<<< HEAD + devices: + - /dev/ttyACM0:/dev/ttyACM0 +======= +>>>>>>> parent of 36c8746... Move from deconz to zha + restart: always + networks: + - home-assistant + - proxy + ports: + - '8123:8123' + depends_on: + - deconz + - mosquitto + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.home-assistant-redirect.entrypoints=http' + - 'traefik.http.routers.home-assistant-redirect.rule=Host(`home.reekynet.com`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.home-assistant-redirect.middlewares=http2https' + + - 'traefik.http.routers.home-assistant.entrypoints=https' + - 'traefik.http.routers.home-assistant.rule=Host(`home.reekynet.com`)' + - 'traefik.http.routers.home-assistant.tls=true' + - 'traefik.http.routers.home-assistant.tls.certresolver=http' + - 'traefik.http.routers.home-assistant.service=home-assistant' + - 'traefik.docker.network=proxy' + - 'traefik.http.services.home-assistant.loadbalancer.server.port=8123' + + deconz: + container_name: deconz + image: marthoc/deconz + environment: + - TZ=Europe/Helsinki + - DECONZ_WEB_PORT=8083 + - DECONZ_WS_PORT=8084 + - DECONZ_VNC_PORT=5901 + - DECONZ_VNC_MODE=1 + - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} + - DEBUG_OTAU=1 + network_mode: host + volumes: + - /docker/homeautomation/deconz:/root/.local/share/dresden-elektronik/deCONZ + + - /etc/localtime:/etc/localtime:ro + restart: always + devices: + - /dev/ttyACM0 + + node-red: + container_name: node-red + image: nodered/node-red + environment: + - TZ=Europe/Helsinki + networks: + - home-assistant + - proxy + ports: + - '1880:1880' + volumes: + - /docker/homeautomation/node-red:/data + - /etc/localtime:/etc/localtime:ro + restart: always + depends_on: + - home-assistant + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.node-red-redirect.entrypoints=http' + - 'traefik.http.routers.node-red-redirect.rule=Host(`node.reekynet.com`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.node-red-redirect.middlewares=http2https' + + - 'traefik.http.routers.node-red.entrypoints=https' + - 'traefik.http.routers.node-red.rule=Host(`node.reekynet.com`)' + - 'traefik.http.routers.node-red.tls=true' + - 'traefik.http.routers.node-red.tls.certresolver=http' + - 'traefik.http.routers.node-red.service=node-red' + - 'traefik.docker.network=proxy' + - 'traefik.http.services.node.loadbalancer.server.port=1880' + + mosquitto: + container_name: mosquitto + image: eclipse-mosquitto + environment: + - TZ=Europe/Helsinki + network_mode: host + volumes: + - /docker/homeautomation/mosquitto:/mosquitto + - /etc/localtime:/etc/localtime:ro + restart: always + + mariadb: + container_name: mariadb-hass + image: mariadb + environment: + - TZ=Europe/Helsinki + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + networks: + - home-assistant + volumes: + - /docker/homeautomation/mariadb:/var/lib/mysql + - /etc/localtime:/etc/localtime:ro + restart: always + +networks: + home-assistant: + external: false + proxy: + external: true From efd7a318fb38221e7eded2701ea2a05c828cd5f7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 17:27:55 +0200 Subject: [PATCH 0078/2667] Revert "Move from deconz to zha" This reverts commit 2fb5a214f161e22671ff3c377699516b9c4abbd8. --- docker/homeautomation/docker-compose.yml | 36 +++++- docker/homeautomation/docker-compose.yml.orig | 121 ++++++++++++++++++ 2 files changed, 155 insertions(+), 2 deletions(-) create mode 100644 docker/homeautomation/docker-compose.yml.orig diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index b4f5a2bc..05a905f1 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -8,14 +8,15 @@ services: volumes: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro - devices: - - /dev/ttyACM0:/dev/ttyACM0 restart: always networks: - home-assistant - proxy ports: - "8123:8123" + depends_on: + - deconz + - mosquitto labels: - "traefik.enable=true" @@ -32,6 +33,26 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.home-assistant.loadbalancer.server.port=8123" + deconz: + container_name: deconz + image: marthoc/deconz + environment: + - TZ=Europe/Helsinki + - DECONZ_WEB_PORT=8083 + - DECONZ_WS_PORT=8084 + - DECONZ_VNC_PORT=5901 + - DECONZ_VNC_MODE=1 + - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} + - DEBUG_OTAU=1 + network_mode: host + volumes: + - /docker/homeautomation/deconz:/root/.local/share/dresden-elektronik/deCONZ + + - /etc/localtime:/etc/localtime:ro + restart: always + devices: + - /dev/ttyACM0 + node-red: container_name: node-red image: nodered/node-red @@ -64,6 +85,17 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.node.loadbalancer.server.port=1880" + mosquitto: + container_name: mosquitto + image: eclipse-mosquitto + environment: + - TZ=Europe/Helsinki + network_mode: host + volumes: + - /docker/homeautomation/mosquitto:/mosquitto + - /etc/localtime:/etc/localtime:ro + restart: always + mariadb: container_name: mariadb-hass image: mariadb diff --git a/docker/homeautomation/docker-compose.yml.orig b/docker/homeautomation/docker-compose.yml.orig new file mode 100644 index 00000000..225e773b --- /dev/null +++ b/docker/homeautomation/docker-compose.yml.orig @@ -0,0 +1,121 @@ +version: '3' +services: + home-assistant: + container_name: home-assistant + image: homeassistant/home-assistant + environment: + - TZ=Europe/Helsinki + volumes: + - /docker/homeautomation/home-assistant:/config + - /etc/localtime:/etc/localtime:ro +<<<<<<< HEAD + devices: + - /dev/ttyACM0:/dev/ttyACM0 +======= +>>>>>>> parent of 36c8746... Move from deconz to zha + restart: always + networks: + - home-assistant + - proxy + ports: + - '8123:8123' + depends_on: + - deconz + - mosquitto + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.home-assistant-redirect.entrypoints=http' + - 'traefik.http.routers.home-assistant-redirect.rule=Host(`home.reekynet.com`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.home-assistant-redirect.middlewares=http2https' + + - 'traefik.http.routers.home-assistant.entrypoints=https' + - 'traefik.http.routers.home-assistant.rule=Host(`home.reekynet.com`)' + - 'traefik.http.routers.home-assistant.tls=true' + - 'traefik.http.routers.home-assistant.tls.certresolver=http' + - 'traefik.http.routers.home-assistant.service=home-assistant' + - 'traefik.docker.network=proxy' + - 'traefik.http.services.home-assistant.loadbalancer.server.port=8123' + + deconz: + container_name: deconz + image: marthoc/deconz + environment: + - TZ=Europe/Helsinki + - DECONZ_WEB_PORT=8083 + - DECONZ_WS_PORT=8084 + - DECONZ_VNC_PORT=5901 + - DECONZ_VNC_MODE=1 + - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} + - DEBUG_OTAU=1 + network_mode: host + volumes: + - /docker/homeautomation/deconz:/root/.local/share/dresden-elektronik/deCONZ + + - /etc/localtime:/etc/localtime:ro + restart: always + devices: + - /dev/ttyACM0 + + node-red: + container_name: node-red + image: nodered/node-red + environment: + - TZ=Europe/Helsinki + networks: + - home-assistant + - proxy + ports: + - '1880:1880' + volumes: + - /docker/homeautomation/node-red:/data + - /etc/localtime:/etc/localtime:ro + restart: always + depends_on: + - home-assistant + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.node-red-redirect.entrypoints=http' + - 'traefik.http.routers.node-red-redirect.rule=Host(`node.reekynet.com`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.node-red-redirect.middlewares=http2https' + + - 'traefik.http.routers.node-red.entrypoints=https' + - 'traefik.http.routers.node-red.rule=Host(`node.reekynet.com`)' + - 'traefik.http.routers.node-red.tls=true' + - 'traefik.http.routers.node-red.tls.certresolver=http' + - 'traefik.http.routers.node-red.service=node-red' + - 'traefik.docker.network=proxy' + - 'traefik.http.services.node.loadbalancer.server.port=1880' + + mosquitto: + container_name: mosquitto + image: eclipse-mosquitto + environment: + - TZ=Europe/Helsinki + network_mode: host + volumes: + - /docker/homeautomation/mosquitto:/mosquitto + - /etc/localtime:/etc/localtime:ro + restart: always + + mariadb: + container_name: mariadb-hass + image: mariadb + environment: + - TZ=Europe/Helsinki + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + networks: + - home-assistant + volumes: + - /docker/homeautomation/mariadb:/var/lib/mysql + - /etc/localtime:/etc/localtime:ro + restart: always + +networks: + home-assistant: + external: false + proxy: + external: true From c6ee85492bad016ebe95215ec04df641df50f7a0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 18:21:38 +0200 Subject: [PATCH 0079/2667] Add ikea firmware volume --- docker/homeautomation/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 05a905f1..478e39a2 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -46,8 +46,8 @@ services: - DEBUG_OTAU=1 network_mode: host volumes: - - /docker/homeautomation/deconz:/root/.local/share/dresden-elektronik/deCONZ - + - /docker/homeautomation/deconz/deconz:/root/.local/share/dresden-elektronik/deCONZ + - /docker/homeautomation/deconz/otau:/root/otau - /etc/localtime:/etc/localtime:ro restart: always devices: From cfd6385c7a284f86c6510795ae7f97541d5e3691 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 18:21:38 +0200 Subject: [PATCH 0080/2667] Add ikea firmware volume --- docker/homeautomation/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 05a905f1..478e39a2 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -46,8 +46,8 @@ services: - DEBUG_OTAU=1 network_mode: host volumes: - - /docker/homeautomation/deconz:/root/.local/share/dresden-elektronik/deCONZ - + - /docker/homeautomation/deconz/deconz:/root/.local/share/dresden-elektronik/deCONZ + - /docker/homeautomation/deconz/otau:/root/otau - /etc/localtime:/etc/localtime:ro restart: always devices: From fcff6be5902b6721be63a45adf522db149fbb942 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 18:22:28 +0200 Subject: [PATCH 0081/2667] Remove mosquitto --- docker/homeautomation/docker-compose.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 478e39a2..4dd82403 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -16,7 +16,6 @@ services: - "8123:8123" depends_on: - deconz - - mosquitto labels: - "traefik.enable=true" @@ -85,17 +84,6 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.node.loadbalancer.server.port=1880" - mosquitto: - container_name: mosquitto - image: eclipse-mosquitto - environment: - - TZ=Europe/Helsinki - network_mode: host - volumes: - - /docker/homeautomation/mosquitto:/mosquitto - - /etc/localtime:/etc/localtime:ro - restart: always - mariadb: container_name: mariadb-hass image: mariadb From 9e03c1989f7ef5a9205e8c94c6d9d3eeefc369cd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 18:22:28 +0200 Subject: [PATCH 0082/2667] Remove mosquitto --- docker/homeautomation/docker-compose.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 478e39a2..4dd82403 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -16,7 +16,6 @@ services: - "8123:8123" depends_on: - deconz - - mosquitto labels: - "traefik.enable=true" @@ -85,17 +84,6 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.node.loadbalancer.server.port=1880" - mosquitto: - container_name: mosquitto - image: eclipse-mosquitto - environment: - - TZ=Europe/Helsinki - network_mode: host - volumes: - - /docker/homeautomation/mosquitto:/mosquitto - - /etc/localtime:/etc/localtime:ro - restart: always - mariadb: container_name: mariadb-hass image: mariadb From 94830053b6c896ba4516d3a121ee445c00fd6e45 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 22:03:07 +0200 Subject: [PATCH 0083/2667] Close down deconz --- docker/homeautomation/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 4dd82403..b25d0208 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -43,7 +43,8 @@ services: - DECONZ_VNC_MODE=1 - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} - DEBUG_OTAU=1 - network_mode: host + ports: + - "8083:8083" volumes: - /docker/homeautomation/deconz/deconz:/root/.local/share/dresden-elektronik/deCONZ - /docker/homeautomation/deconz/otau:/root/otau From 52666e524889d34129a183b125b646bf4879f3f4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 22:03:07 +0200 Subject: [PATCH 0084/2667] Close down deconz --- docker/homeautomation/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 4dd82403..b25d0208 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -43,7 +43,8 @@ services: - DECONZ_VNC_MODE=1 - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} - DEBUG_OTAU=1 - network_mode: host + ports: + - "8083:8083" volumes: - /docker/homeautomation/deconz/deconz:/root/.local/share/dresden-elektronik/deCONZ - /docker/homeautomation/deconz/otau:/root/otau From b6c7d1448e1c488c70aede3449c3dbc03cc72038 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 22:03:42 +0200 Subject: [PATCH 0085/2667] Remove leftover file --- docker/homeautomation/docker-compose.yml.orig | 121 ------------------ 1 file changed, 121 deletions(-) delete mode 100644 docker/homeautomation/docker-compose.yml.orig diff --git a/docker/homeautomation/docker-compose.yml.orig b/docker/homeautomation/docker-compose.yml.orig deleted file mode 100644 index 225e773b..00000000 --- a/docker/homeautomation/docker-compose.yml.orig +++ /dev/null @@ -1,121 +0,0 @@ -version: '3' -services: - home-assistant: - container_name: home-assistant - image: homeassistant/home-assistant - environment: - - TZ=Europe/Helsinki - volumes: - - /docker/homeautomation/home-assistant:/config - - /etc/localtime:/etc/localtime:ro -<<<<<<< HEAD - devices: - - /dev/ttyACM0:/dev/ttyACM0 -======= ->>>>>>> parent of 36c8746... Move from deconz to zha - restart: always - networks: - - home-assistant - - proxy - ports: - - '8123:8123' - depends_on: - - deconz - - mosquitto - labels: - - 'traefik.enable=true' - - - 'traefik.http.routers.home-assistant-redirect.entrypoints=http' - - 'traefik.http.routers.home-assistant-redirect.rule=Host(`home.reekynet.com`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.home-assistant-redirect.middlewares=http2https' - - - 'traefik.http.routers.home-assistant.entrypoints=https' - - 'traefik.http.routers.home-assistant.rule=Host(`home.reekynet.com`)' - - 'traefik.http.routers.home-assistant.tls=true' - - 'traefik.http.routers.home-assistant.tls.certresolver=http' - - 'traefik.http.routers.home-assistant.service=home-assistant' - - 'traefik.docker.network=proxy' - - 'traefik.http.services.home-assistant.loadbalancer.server.port=8123' - - deconz: - container_name: deconz - image: marthoc/deconz - environment: - - TZ=Europe/Helsinki - - DECONZ_WEB_PORT=8083 - - DECONZ_WS_PORT=8084 - - DECONZ_VNC_PORT=5901 - - DECONZ_VNC_MODE=1 - - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} - - DEBUG_OTAU=1 - network_mode: host - volumes: - - /docker/homeautomation/deconz:/root/.local/share/dresden-elektronik/deCONZ - - - /etc/localtime:/etc/localtime:ro - restart: always - devices: - - /dev/ttyACM0 - - node-red: - container_name: node-red - image: nodered/node-red - environment: - - TZ=Europe/Helsinki - networks: - - home-assistant - - proxy - ports: - - '1880:1880' - volumes: - - /docker/homeautomation/node-red:/data - - /etc/localtime:/etc/localtime:ro - restart: always - depends_on: - - home-assistant - labels: - - 'traefik.enable=true' - - - 'traefik.http.routers.node-red-redirect.entrypoints=http' - - 'traefik.http.routers.node-red-redirect.rule=Host(`node.reekynet.com`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.node-red-redirect.middlewares=http2https' - - - 'traefik.http.routers.node-red.entrypoints=https' - - 'traefik.http.routers.node-red.rule=Host(`node.reekynet.com`)' - - 'traefik.http.routers.node-red.tls=true' - - 'traefik.http.routers.node-red.tls.certresolver=http' - - 'traefik.http.routers.node-red.service=node-red' - - 'traefik.docker.network=proxy' - - 'traefik.http.services.node.loadbalancer.server.port=1880' - - mosquitto: - container_name: mosquitto - image: eclipse-mosquitto - environment: - - TZ=Europe/Helsinki - network_mode: host - volumes: - - /docker/homeautomation/mosquitto:/mosquitto - - /etc/localtime:/etc/localtime:ro - restart: always - - mariadb: - container_name: mariadb-hass - image: mariadb - environment: - - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - networks: - - home-assistant - volumes: - - /docker/homeautomation/mariadb:/var/lib/mysql - - /etc/localtime:/etc/localtime:ro - restart: always - -networks: - home-assistant: - external: false - proxy: - external: true From ee39c7da310caeb4ff3250de368e8480a33f431c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 22:03:42 +0200 Subject: [PATCH 0086/2667] Remove leftover file --- docker/homeautomation/docker-compose.yml.orig | 121 ------------------ 1 file changed, 121 deletions(-) delete mode 100644 docker/homeautomation/docker-compose.yml.orig diff --git a/docker/homeautomation/docker-compose.yml.orig b/docker/homeautomation/docker-compose.yml.orig deleted file mode 100644 index 225e773b..00000000 --- a/docker/homeautomation/docker-compose.yml.orig +++ /dev/null @@ -1,121 +0,0 @@ -version: '3' -services: - home-assistant: - container_name: home-assistant - image: homeassistant/home-assistant - environment: - - TZ=Europe/Helsinki - volumes: - - /docker/homeautomation/home-assistant:/config - - /etc/localtime:/etc/localtime:ro -<<<<<<< HEAD - devices: - - /dev/ttyACM0:/dev/ttyACM0 -======= ->>>>>>> parent of 36c8746... Move from deconz to zha - restart: always - networks: - - home-assistant - - proxy - ports: - - '8123:8123' - depends_on: - - deconz - - mosquitto - labels: - - 'traefik.enable=true' - - - 'traefik.http.routers.home-assistant-redirect.entrypoints=http' - - 'traefik.http.routers.home-assistant-redirect.rule=Host(`home.reekynet.com`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.home-assistant-redirect.middlewares=http2https' - - - 'traefik.http.routers.home-assistant.entrypoints=https' - - 'traefik.http.routers.home-assistant.rule=Host(`home.reekynet.com`)' - - 'traefik.http.routers.home-assistant.tls=true' - - 'traefik.http.routers.home-assistant.tls.certresolver=http' - - 'traefik.http.routers.home-assistant.service=home-assistant' - - 'traefik.docker.network=proxy' - - 'traefik.http.services.home-assistant.loadbalancer.server.port=8123' - - deconz: - container_name: deconz - image: marthoc/deconz - environment: - - TZ=Europe/Helsinki - - DECONZ_WEB_PORT=8083 - - DECONZ_WS_PORT=8084 - - DECONZ_VNC_PORT=5901 - - DECONZ_VNC_MODE=1 - - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} - - DEBUG_OTAU=1 - network_mode: host - volumes: - - /docker/homeautomation/deconz:/root/.local/share/dresden-elektronik/deCONZ - - - /etc/localtime:/etc/localtime:ro - restart: always - devices: - - /dev/ttyACM0 - - node-red: - container_name: node-red - image: nodered/node-red - environment: - - TZ=Europe/Helsinki - networks: - - home-assistant - - proxy - ports: - - '1880:1880' - volumes: - - /docker/homeautomation/node-red:/data - - /etc/localtime:/etc/localtime:ro - restart: always - depends_on: - - home-assistant - labels: - - 'traefik.enable=true' - - - 'traefik.http.routers.node-red-redirect.entrypoints=http' - - 'traefik.http.routers.node-red-redirect.rule=Host(`node.reekynet.com`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.node-red-redirect.middlewares=http2https' - - - 'traefik.http.routers.node-red.entrypoints=https' - - 'traefik.http.routers.node-red.rule=Host(`node.reekynet.com`)' - - 'traefik.http.routers.node-red.tls=true' - - 'traefik.http.routers.node-red.tls.certresolver=http' - - 'traefik.http.routers.node-red.service=node-red' - - 'traefik.docker.network=proxy' - - 'traefik.http.services.node.loadbalancer.server.port=1880' - - mosquitto: - container_name: mosquitto - image: eclipse-mosquitto - environment: - - TZ=Europe/Helsinki - network_mode: host - volumes: - - /docker/homeautomation/mosquitto:/mosquitto - - /etc/localtime:/etc/localtime:ro - restart: always - - mariadb: - container_name: mariadb-hass - image: mariadb - environment: - - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - networks: - - home-assistant - volumes: - - /docker/homeautomation/mariadb:/var/lib/mysql - - /etc/localtime:/etc/localtime:ro - restart: always - -networks: - home-assistant: - external: false - proxy: - external: true From 8039b9c896493e6d426396a2f34c39eb20dc6e6c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 22:09:02 +0200 Subject: [PATCH 0087/2667] Add dependency to mariadb --- docker/homeautomation/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index b25d0208..371e242b 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -16,6 +16,7 @@ services: - "8123:8123" depends_on: - deconz + - mariadb labels: - "traefik.enable=true" From 5d876bce724ff9beb6037840b8b9ac65e5f10110 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 22:09:02 +0200 Subject: [PATCH 0088/2667] Add dependency to mariadb --- docker/homeautomation/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index b25d0208..371e242b 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -16,6 +16,7 @@ services: - "8123:8123" depends_on: - deconz + - mariadb labels: - "traefik.enable=true" From 29a14d1b0aeafc27161a13a85e31db1969a34720 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 22:11:32 +0200 Subject: [PATCH 0089/2667] Add port --- docker/homeautomation/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 371e242b..e5c081f5 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -46,6 +46,7 @@ services: - DEBUG_OTAU=1 ports: - "8083:8083" + - "8084:8084" volumes: - /docker/homeautomation/deconz/deconz:/root/.local/share/dresden-elektronik/deCONZ - /docker/homeautomation/deconz/otau:/root/otau From e2977cea92ec37cfe121dfaba95dcc6f953317e5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 22:11:32 +0200 Subject: [PATCH 0090/2667] Add port --- docker/homeautomation/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 371e242b..e5c081f5 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -46,6 +46,7 @@ services: - DEBUG_OTAU=1 ports: - "8083:8083" + - "8084:8084" volumes: - /docker/homeautomation/deconz/deconz:/root/.local/share/dresden-elektronik/deCONZ - /docker/homeautomation/deconz/otau:/root/otau From ea69ecbcf780e9c06849bcac33e7dca10d54f457 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 22:15:54 +0200 Subject: [PATCH 0091/2667] Change network mode back to host and disable upnp --- docker/homeautomation/docker-compose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index e5c081f5..b9447efe 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -40,13 +40,12 @@ services: - TZ=Europe/Helsinki - DECONZ_WEB_PORT=8083 - DECONZ_WS_PORT=8084 + - DECONZ_UPNP=0 - DECONZ_VNC_PORT=5901 - DECONZ_VNC_MODE=1 - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} - DEBUG_OTAU=1 - ports: - - "8083:8083" - - "8084:8084" + network_mode: host volumes: - /docker/homeautomation/deconz/deconz:/root/.local/share/dresden-elektronik/deCONZ - /docker/homeautomation/deconz/otau:/root/otau From 4014bd76714c8ada6c6fe6fec402bc664bb7645b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 22:15:54 +0200 Subject: [PATCH 0092/2667] Change network mode back to host and disable upnp --- docker/homeautomation/docker-compose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index e5c081f5..b9447efe 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -40,13 +40,12 @@ services: - TZ=Europe/Helsinki - DECONZ_WEB_PORT=8083 - DECONZ_WS_PORT=8084 + - DECONZ_UPNP=0 - DECONZ_VNC_PORT=5901 - DECONZ_VNC_MODE=1 - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} - DEBUG_OTAU=1 - ports: - - "8083:8083" - - "8084:8084" + network_mode: host volumes: - /docker/homeautomation/deconz/deconz:/root/.local/share/dresden-elektronik/deCONZ - /docker/homeautomation/deconz/otau:/root/otau From e973f9dcebfa7076e3dd3085bad0a8009d376be4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 13:22:21 +0200 Subject: [PATCH 0093/2667] Echo ipmi temp to /tmp for use in home assistant --- home/Scripts/ipmi-auto.sh | 9 +++++++++ home/Scripts/ipmi-static.sh | 14 +------------- home/Scripts/ipmi-temp.sh | 4 +++- 3 files changed, 13 insertions(+), 14 deletions(-) create mode 100755 home/Scripts/ipmi-auto.sh diff --git a/home/Scripts/ipmi-auto.sh b/home/Scripts/ipmi-auto.sh new file mode 100755 index 00000000..60b75181 --- /dev/null +++ b/home/Scripts/ipmi-auto.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +IPMIHOST=10.0.0.82 +IPMIUSER=ReekyMarko +IPMIPW={{@@ env['PASS_IPMI'] @@}} +IPMIEK=0000000000000000000000000000000000000000 + +printf "Activating dynamic fan control." +ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x01 diff --git a/home/Scripts/ipmi-static.sh b/home/Scripts/ipmi-static.sh index f06d66b9..e82c3a6f 100755 --- a/home/Scripts/ipmi-static.sh +++ b/home/Scripts/ipmi-static.sh @@ -1,18 +1,6 @@ #!/usr/bin/env bash -# ---------------------------------------------------------------------------------- -# Script for setting manual fan speed to 2160 RPM (on my R710) -# -# Requires: -# ipmitool – apt-get install ipmitool -# slacktee.sh – https://github.com/course-hero/slacktee -# ---------------------------------------------------------------------------------- - - -# IPMI SETTINGS: -# Modify to suit your needs. -# DEFAULT IP: 192.168.0.120 -IPMIHOST=10.0.0.174 +IPMIHOST=10.0.0.82 IPMIUSER=ReekyMarko IPMIPW={{@@ env['PASS_IPMI'] @@}} IPMIEK=0000000000000000000000000000000000000000 diff --git a/home/Scripts/ipmi-temp.sh b/home/Scripts/ipmi-temp.sh index fb693aed..b25f111b 100755 --- a/home/Scripts/ipmi-temp.sh +++ b/home/Scripts/ipmi-temp.sh @@ -1,12 +1,14 @@ #!/bin/bash -IPMIHOST=10.0.0.174 +IPMIHOST=10.0.0.82 IPMIUSER=ReekyMarko IPMIPW={{@@ env['PASS_IPMI'] @@}} IPMIEK=0000000000000000000000000000000000000000 MAXTEMP=27 TEMP=$(ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr type temperature |grep Ambient |grep degrees |grep -Po '\d{2}' | tail -1) +echo $TEMP > /tmp/idrac-temp + if [[ $TEMP > $MAXTEMP ]]; then From 2da55dc5bdb7462bd4c939dda742e21d1c3e04ce Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 13:22:21 +0200 Subject: [PATCH 0094/2667] Echo ipmi temp to /tmp for use in home assistant --- home/Scripts/ipmi-auto.sh | 9 +++++++++ home/Scripts/ipmi-static.sh | 14 +------------- home/Scripts/ipmi-temp.sh | 4 +++- 3 files changed, 13 insertions(+), 14 deletions(-) create mode 100755 home/Scripts/ipmi-auto.sh diff --git a/home/Scripts/ipmi-auto.sh b/home/Scripts/ipmi-auto.sh new file mode 100755 index 00000000..60b75181 --- /dev/null +++ b/home/Scripts/ipmi-auto.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +IPMIHOST=10.0.0.82 +IPMIUSER=ReekyMarko +IPMIPW={{@@ env['PASS_IPMI'] @@}} +IPMIEK=0000000000000000000000000000000000000000 + +printf "Activating dynamic fan control." +ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x01 diff --git a/home/Scripts/ipmi-static.sh b/home/Scripts/ipmi-static.sh index f06d66b9..e82c3a6f 100755 --- a/home/Scripts/ipmi-static.sh +++ b/home/Scripts/ipmi-static.sh @@ -1,18 +1,6 @@ #!/usr/bin/env bash -# ---------------------------------------------------------------------------------- -# Script for setting manual fan speed to 2160 RPM (on my R710) -# -# Requires: -# ipmitool – apt-get install ipmitool -# slacktee.sh – https://github.com/course-hero/slacktee -# ---------------------------------------------------------------------------------- - - -# IPMI SETTINGS: -# Modify to suit your needs. -# DEFAULT IP: 192.168.0.120 -IPMIHOST=10.0.0.174 +IPMIHOST=10.0.0.82 IPMIUSER=ReekyMarko IPMIPW={{@@ env['PASS_IPMI'] @@}} IPMIEK=0000000000000000000000000000000000000000 diff --git a/home/Scripts/ipmi-temp.sh b/home/Scripts/ipmi-temp.sh index fb693aed..b25f111b 100755 --- a/home/Scripts/ipmi-temp.sh +++ b/home/Scripts/ipmi-temp.sh @@ -1,12 +1,14 @@ #!/bin/bash -IPMIHOST=10.0.0.174 +IPMIHOST=10.0.0.82 IPMIUSER=ReekyMarko IPMIPW={{@@ env['PASS_IPMI'] @@}} IPMIEK=0000000000000000000000000000000000000000 MAXTEMP=27 TEMP=$(ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr type temperature |grep Ambient |grep degrees |grep -Po '\d{2}' | tail -1) +echo $TEMP > /tmp/idrac-temp + if [[ $TEMP > $MAXTEMP ]]; then From 08e2aebea28ed75c99388385830b57f5ea830f98 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 13:24:50 +0200 Subject: [PATCH 0095/2667] Mount idrac temp file in hass --- docker/homeautomation/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index b9447efe..b45a9c45 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -7,6 +7,7 @@ services: - TZ=Europe/Helsinki volumes: - /docker/homeautomation/home-assistant:/config + - /tmp/idrac-temp:/config/idrac-temp - /etc/localtime:/etc/localtime:ro restart: always networks: From dae594005d70b4841b04e22bcb3d171f885dad10 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 13:24:50 +0200 Subject: [PATCH 0096/2667] Mount idrac temp file in hass --- docker/homeautomation/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index b9447efe..b45a9c45 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -7,6 +7,7 @@ services: - TZ=Europe/Helsinki volumes: - /docker/homeautomation/home-assistant:/config + - /tmp/idrac-temp:/config/idrac-temp - /etc/localtime:/etc/localtime:ro restart: always networks: From 87c1beec1231d6613d9304256dfb310cedae27cc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 13:27:33 +0200 Subject: [PATCH 0097/2667] Revert "Mount idrac temp file in hass" This reverts commit f3e35bbcb075e8a471444f148694c7b232e5eb1a. --- docker/homeautomation/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index b45a9c45..b9447efe 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -7,7 +7,6 @@ services: - TZ=Europe/Helsinki volumes: - /docker/homeautomation/home-assistant:/config - - /tmp/idrac-temp:/config/idrac-temp - /etc/localtime:/etc/localtime:ro restart: always networks: From a27e4a1fc93920d1706c1bde606ebe82f7854f26 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 13:27:33 +0200 Subject: [PATCH 0098/2667] Revert "Mount idrac temp file in hass" This reverts commit 81b62e181090763d63e3f0169daec4f9f0d9d21b. --- docker/homeautomation/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index b45a9c45..b9447efe 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -7,7 +7,6 @@ services: - TZ=Europe/Helsinki volumes: - /docker/homeautomation/home-assistant:/config - - /tmp/idrac-temp:/config/idrac-temp - /etc/localtime:/etc/localtime:ro restart: always networks: From 1e7cb8ac7e6347c924e82723d52689586e610bfd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 13:38:52 +0200 Subject: [PATCH 0099/2667] Mount idrac temp in hass --- docker/homeautomation/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index b9447efe..946b5e71 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -7,6 +7,7 @@ services: - TZ=Europe/Helsinki volumes: - /docker/homeautomation/home-assistant:/config + - /tmp/idrac-temp:/idrac-temp - /etc/localtime:/etc/localtime:ro restart: always networks: From ecaf14ecb8e1c02505b6b8f82870b51b7c619d68 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 13:38:52 +0200 Subject: [PATCH 0100/2667] Mount idrac temp in hass --- docker/homeautomation/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index b9447efe..946b5e71 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -7,6 +7,7 @@ services: - TZ=Europe/Helsinki volumes: - /docker/homeautomation/home-assistant:/config + - /tmp/idrac-temp:/idrac-temp - /etc/localtime:/etc/localtime:ro restart: always networks: From 3c68936ebc40b4c7d356761685b61135683980cc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 13:52:25 +0200 Subject: [PATCH 0101/2667] Move some files around --- config-root.yaml | 13 ++++--------- home/Scripts/{ipmi-auto.sh => ipmi/auto.sh} | 0 home/Scripts/{ipmi-temp.sh => ipmi/fans.sh} | 0 .../{ipmi-static.sh => ipmi/static.sh} | 0 home/Scripts/ipmi/temp.sh | 19 +++++++++++++++++++ .../systemd/system/ipmi/ipmi-static.service | 9 +++++++++ .../etc/systemd/system/ipmi/ipmi-temp.service | 9 +++++++++ root/etc/systemd/system/ipmi/ipmi-temp.timer | 9 +++++++++ 8 files changed, 50 insertions(+), 9 deletions(-) rename home/Scripts/{ipmi-auto.sh => ipmi/auto.sh} (100%) rename home/Scripts/{ipmi-temp.sh => ipmi/fans.sh} (100%) rename home/Scripts/{ipmi-static.sh => ipmi/static.sh} (100%) create mode 100755 home/Scripts/ipmi/temp.sh create mode 100644 root/etc/systemd/system/ipmi/ipmi-static.service create mode 100644 root/etc/systemd/system/ipmi/ipmi-temp.service create mode 100644 root/etc/systemd/system/ipmi/ipmi-temp.timer diff --git a/config-root.yaml b/config-root.yaml index 4071ca8d..23d66cbd 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -116,15 +116,9 @@ dotfiles: f_20-quiet-printk.conf: src: etc/sysctl.d/20-quiet-printk.conf dst: /etc/sysctl.d/20-quiet-printk.conf - f_ipmi-temp.timer: - src: etc/systemd/system/ipmi-temp.timer - dst: /etc/systemd/system/ipmi-temp.timer - f_ipmi-temp.service: - src: etc/systemd/system/ipmi-temp.service - dst: /etc/systemd/system/ipmi-temp.service - f_ipmi-static.service: - src: etc/systemd/system/ipmi-static.service - dst: /etc/systemd/system/ipmi-static.service + d_ipmi: + src: etc/systemd/system/ipmi + dst: /etc/systemd/system/ipmi profiles: IPMI: dotfiles: @@ -165,6 +159,7 @@ profiles: - f_mkinitcpio.conf - f_vconsole.conf - f_20-quiet-printk.conf + - d_ipmi include: - Locale - Pacman diff --git a/home/Scripts/ipmi-auto.sh b/home/Scripts/ipmi/auto.sh similarity index 100% rename from home/Scripts/ipmi-auto.sh rename to home/Scripts/ipmi/auto.sh diff --git a/home/Scripts/ipmi-temp.sh b/home/Scripts/ipmi/fans.sh similarity index 100% rename from home/Scripts/ipmi-temp.sh rename to home/Scripts/ipmi/fans.sh diff --git a/home/Scripts/ipmi-static.sh b/home/Scripts/ipmi/static.sh similarity index 100% rename from home/Scripts/ipmi-static.sh rename to home/Scripts/ipmi/static.sh diff --git a/home/Scripts/ipmi/temp.sh b/home/Scripts/ipmi/temp.sh new file mode 100755 index 00000000..b25f111b --- /dev/null +++ b/home/Scripts/ipmi/temp.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +IPMIHOST=10.0.0.82 +IPMIUSER=ReekyMarko +IPMIPW={{@@ env['PASS_IPMI'] @@}} +IPMIEK=0000000000000000000000000000000000000000 +MAXTEMP=27 +TEMP=$(ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr type temperature |grep Ambient |grep degrees |grep -Po '\d{2}' | tail -1) + +echo $TEMP > /tmp/idrac-temp + + +if [[ $TEMP > $MAXTEMP ]]; + then + printf "Warning: Temperature is too high! Activating dynamic fan control! ($TEMP C)" + ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x01 + else + printf "Temperature is OK ($TEMP C)" +fi diff --git a/root/etc/systemd/system/ipmi/ipmi-static.service b/root/etc/systemd/system/ipmi/ipmi-static.service new file mode 100644 index 00000000..9588c2a8 --- /dev/null +++ b/root/etc/systemd/system/ipmi/ipmi-static.service @@ -0,0 +1,9 @@ +[Unit] +Description=Set fan speed + +[Service] +Type=simple +ExecStart=/home/balrog/Scripts/ipmi-static.sh + +[Install] +WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi/ipmi-temp.service b/root/etc/systemd/system/ipmi/ipmi-temp.service new file mode 100644 index 00000000..fc231cb8 --- /dev/null +++ b/root/etc/systemd/system/ipmi/ipmi-temp.service @@ -0,0 +1,9 @@ +[Unit] +Description=Watch server temperature + +[Service] +Type=simple +ExecStart=/home/balrog/Scripts/ipmi-temp.sh + +[Install] +WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi/ipmi-temp.timer b/root/etc/systemd/system/ipmi/ipmi-temp.timer new file mode 100644 index 00000000..d6605b13 --- /dev/null +++ b/root/etc/systemd/system/ipmi/ipmi-temp.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Watches server temperature + +[Timer] +OnUnitInactiveSec=5s +OnBootSec=5s + +[Install] +WantedBy=timers.target From eed7aabf01b3b2cfd088359415dfb3a1a8a0aaec Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 13:52:25 +0200 Subject: [PATCH 0102/2667] Move some files around --- config-root.yaml | 13 ++++--------- home/Scripts/{ipmi-auto.sh => ipmi/auto.sh} | 0 home/Scripts/{ipmi-temp.sh => ipmi/fans.sh} | 0 .../{ipmi-static.sh => ipmi/static.sh} | 0 home/Scripts/ipmi/temp.sh | 19 +++++++++++++++++++ .../systemd/system/ipmi/ipmi-static.service | 9 +++++++++ .../etc/systemd/system/ipmi/ipmi-temp.service | 9 +++++++++ root/etc/systemd/system/ipmi/ipmi-temp.timer | 9 +++++++++ 8 files changed, 50 insertions(+), 9 deletions(-) rename home/Scripts/{ipmi-auto.sh => ipmi/auto.sh} (100%) rename home/Scripts/{ipmi-temp.sh => ipmi/fans.sh} (100%) rename home/Scripts/{ipmi-static.sh => ipmi/static.sh} (100%) create mode 100755 home/Scripts/ipmi/temp.sh create mode 100644 root/etc/systemd/system/ipmi/ipmi-static.service create mode 100644 root/etc/systemd/system/ipmi/ipmi-temp.service create mode 100644 root/etc/systemd/system/ipmi/ipmi-temp.timer diff --git a/config-root.yaml b/config-root.yaml index 4071ca8d..23d66cbd 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -116,15 +116,9 @@ dotfiles: f_20-quiet-printk.conf: src: etc/sysctl.d/20-quiet-printk.conf dst: /etc/sysctl.d/20-quiet-printk.conf - f_ipmi-temp.timer: - src: etc/systemd/system/ipmi-temp.timer - dst: /etc/systemd/system/ipmi-temp.timer - f_ipmi-temp.service: - src: etc/systemd/system/ipmi-temp.service - dst: /etc/systemd/system/ipmi-temp.service - f_ipmi-static.service: - src: etc/systemd/system/ipmi-static.service - dst: /etc/systemd/system/ipmi-static.service + d_ipmi: + src: etc/systemd/system/ipmi + dst: /etc/systemd/system/ipmi profiles: IPMI: dotfiles: @@ -165,6 +159,7 @@ profiles: - f_mkinitcpio.conf - f_vconsole.conf - f_20-quiet-printk.conf + - d_ipmi include: - Locale - Pacman diff --git a/home/Scripts/ipmi-auto.sh b/home/Scripts/ipmi/auto.sh similarity index 100% rename from home/Scripts/ipmi-auto.sh rename to home/Scripts/ipmi/auto.sh diff --git a/home/Scripts/ipmi-temp.sh b/home/Scripts/ipmi/fans.sh similarity index 100% rename from home/Scripts/ipmi-temp.sh rename to home/Scripts/ipmi/fans.sh diff --git a/home/Scripts/ipmi-static.sh b/home/Scripts/ipmi/static.sh similarity index 100% rename from home/Scripts/ipmi-static.sh rename to home/Scripts/ipmi/static.sh diff --git a/home/Scripts/ipmi/temp.sh b/home/Scripts/ipmi/temp.sh new file mode 100755 index 00000000..b25f111b --- /dev/null +++ b/home/Scripts/ipmi/temp.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +IPMIHOST=10.0.0.82 +IPMIUSER=ReekyMarko +IPMIPW={{@@ env['PASS_IPMI'] @@}} +IPMIEK=0000000000000000000000000000000000000000 +MAXTEMP=27 +TEMP=$(ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr type temperature |grep Ambient |grep degrees |grep -Po '\d{2}' | tail -1) + +echo $TEMP > /tmp/idrac-temp + + +if [[ $TEMP > $MAXTEMP ]]; + then + printf "Warning: Temperature is too high! Activating dynamic fan control! ($TEMP C)" + ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x01 + else + printf "Temperature is OK ($TEMP C)" +fi diff --git a/root/etc/systemd/system/ipmi/ipmi-static.service b/root/etc/systemd/system/ipmi/ipmi-static.service new file mode 100644 index 00000000..9588c2a8 --- /dev/null +++ b/root/etc/systemd/system/ipmi/ipmi-static.service @@ -0,0 +1,9 @@ +[Unit] +Description=Set fan speed + +[Service] +Type=simple +ExecStart=/home/balrog/Scripts/ipmi-static.sh + +[Install] +WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi/ipmi-temp.service b/root/etc/systemd/system/ipmi/ipmi-temp.service new file mode 100644 index 00000000..fc231cb8 --- /dev/null +++ b/root/etc/systemd/system/ipmi/ipmi-temp.service @@ -0,0 +1,9 @@ +[Unit] +Description=Watch server temperature + +[Service] +Type=simple +ExecStart=/home/balrog/Scripts/ipmi-temp.sh + +[Install] +WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi/ipmi-temp.timer b/root/etc/systemd/system/ipmi/ipmi-temp.timer new file mode 100644 index 00000000..d6605b13 --- /dev/null +++ b/root/etc/systemd/system/ipmi/ipmi-temp.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Watches server temperature + +[Timer] +OnUnitInactiveSec=5s +OnBootSec=5s + +[Install] +WantedBy=timers.target From fb06f8f26457b6cd97106c002bd327bd2f1ed9e5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 15:09:09 +0200 Subject: [PATCH 0103/2667] Add more ipmi stuff --- config-root.yaml | 6 +----- docker/homeautomation/docker-compose.yml | 2 +- home/Scripts/ipmi/fans.sh | 20 +++++++++---------- home/Scripts/ipmi/temp.sh | 4 +++- .../systemd/system/ipmi/ipmi-static.service | 2 +- .../etc/systemd/system/ipmi/ipmi-temp.service | 2 +- 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 23d66cbd..200d311a 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -120,11 +120,6 @@ dotfiles: src: etc/systemd/system/ipmi dst: /etc/systemd/system/ipmi profiles: - IPMI: - dotfiles: - - f_ipmi-temp.timer - - f_ipmi-temp.service - - f_ipmi-static.service Locale: dotfiles: - f_locale.conf @@ -184,3 +179,4 @@ profiles: dotfiles: - f_sshd_config - f_99-sysctl.conf + - d_ipmi diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 946b5e71..9d2ccbca 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -7,7 +7,7 @@ services: - TZ=Europe/Helsinki volumes: - /docker/homeautomation/home-assistant:/config - - /tmp/idrac-temp:/idrac-temp + - /tmp/ipmi:/ipmi - /etc/localtime:/etc/localtime:ro restart: always networks: diff --git a/home/Scripts/ipmi/fans.sh b/home/Scripts/ipmi/fans.sh index b25f111b..3649a0ca 100755 --- a/home/Scripts/ipmi/fans.sh +++ b/home/Scripts/ipmi/fans.sh @@ -4,16 +4,16 @@ IPMIHOST=10.0.0.82 IPMIUSER=ReekyMarko IPMIPW={{@@ env['PASS_IPMI'] @@}} IPMIEK=0000000000000000000000000000000000000000 -MAXTEMP=27 -TEMP=$(ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr type temperature |grep Ambient |grep degrees |grep -Po '\d{2}' | tail -1) -echo $TEMP > /tmp/idrac-temp +mkdir -p /tmp/ipmi +DATA=`ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr get "FAN 1 RPM" "FAN 2 RPM" "FAN 3 RPM" "FAN 4 RPM" "FAN 5 RPM" "FAN 6 RPM" | grep "Sensor Reading" | awk '{ print $4 }'` -if [[ $TEMP > $MAXTEMP ]]; - then - printf "Warning: Temperature is too high! Activating dynamic fan control! ($TEMP C)" - ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x01 - else - printf "Temperature is OK ($TEMP C)" -fi +echo "$DATA" + +echo "$DATA" | head -1 | tail -1> /tmp/ipmi/fan1 +echo "$DATA" | head -2 | tail -1> /tmp/ipmi/fan2 +echo "$DATA" | head -3 | tail -1> /tmp/ipmi/fan3 +echo "$DATA" | head -4 | tail -1> /tmp/ipmi/fan4 +echo "$DATA" | head -5 | tail -1> /tmp/ipmi/fan5 +echo "$DATA" | head -6 | tail -1> /tmp/ipmi/fan6 diff --git a/home/Scripts/ipmi/temp.sh b/home/Scripts/ipmi/temp.sh index b25f111b..72caa949 100755 --- a/home/Scripts/ipmi/temp.sh +++ b/home/Scripts/ipmi/temp.sh @@ -7,7 +7,9 @@ IPMIEK=0000000000000000000000000000000000000000 MAXTEMP=27 TEMP=$(ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr type temperature |grep Ambient |grep degrees |grep -Po '\d{2}' | tail -1) -echo $TEMP > /tmp/idrac-temp +mkdir -p /tmp/ipmi + +echo $TEMP > /tmp/ipmi/temp if [[ $TEMP > $MAXTEMP ]]; diff --git a/root/etc/systemd/system/ipmi/ipmi-static.service b/root/etc/systemd/system/ipmi/ipmi-static.service index 9588c2a8..fb5c1bfb 100644 --- a/root/etc/systemd/system/ipmi/ipmi-static.service +++ b/root/etc/systemd/system/ipmi/ipmi-static.service @@ -3,7 +3,7 @@ Description=Set fan speed [Service] Type=simple -ExecStart=/home/balrog/Scripts/ipmi-static.sh +ExecStart=/home/balrog/Scripts/ipmi/static.sh [Install] WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi/ipmi-temp.service b/root/etc/systemd/system/ipmi/ipmi-temp.service index fc231cb8..64a9615f 100644 --- a/root/etc/systemd/system/ipmi/ipmi-temp.service +++ b/root/etc/systemd/system/ipmi/ipmi-temp.service @@ -3,7 +3,7 @@ Description=Watch server temperature [Service] Type=simple -ExecStart=/home/balrog/Scripts/ipmi-temp.sh +ExecStart=/home/balrog/Scripts/ipmi/temp.sh [Install] WantedBy=multi-user.target From 6649ff205cb57c7b986072c7c384d967117dde43 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 15:09:09 +0200 Subject: [PATCH 0104/2667] Add more ipmi stuff --- config-root.yaml | 6 +----- docker/homeautomation/docker-compose.yml | 2 +- home/Scripts/ipmi/fans.sh | 20 +++++++++---------- home/Scripts/ipmi/temp.sh | 4 +++- .../systemd/system/ipmi/ipmi-static.service | 2 +- .../etc/systemd/system/ipmi/ipmi-temp.service | 2 +- 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 23d66cbd..200d311a 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -120,11 +120,6 @@ dotfiles: src: etc/systemd/system/ipmi dst: /etc/systemd/system/ipmi profiles: - IPMI: - dotfiles: - - f_ipmi-temp.timer - - f_ipmi-temp.service - - f_ipmi-static.service Locale: dotfiles: - f_locale.conf @@ -184,3 +179,4 @@ profiles: dotfiles: - f_sshd_config - f_99-sysctl.conf + - d_ipmi diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 946b5e71..9d2ccbca 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -7,7 +7,7 @@ services: - TZ=Europe/Helsinki volumes: - /docker/homeautomation/home-assistant:/config - - /tmp/idrac-temp:/idrac-temp + - /tmp/ipmi:/ipmi - /etc/localtime:/etc/localtime:ro restart: always networks: diff --git a/home/Scripts/ipmi/fans.sh b/home/Scripts/ipmi/fans.sh index b25f111b..3649a0ca 100755 --- a/home/Scripts/ipmi/fans.sh +++ b/home/Scripts/ipmi/fans.sh @@ -4,16 +4,16 @@ IPMIHOST=10.0.0.82 IPMIUSER=ReekyMarko IPMIPW={{@@ env['PASS_IPMI'] @@}} IPMIEK=0000000000000000000000000000000000000000 -MAXTEMP=27 -TEMP=$(ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr type temperature |grep Ambient |grep degrees |grep -Po '\d{2}' | tail -1) -echo $TEMP > /tmp/idrac-temp +mkdir -p /tmp/ipmi +DATA=`ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr get "FAN 1 RPM" "FAN 2 RPM" "FAN 3 RPM" "FAN 4 RPM" "FAN 5 RPM" "FAN 6 RPM" | grep "Sensor Reading" | awk '{ print $4 }'` -if [[ $TEMP > $MAXTEMP ]]; - then - printf "Warning: Temperature is too high! Activating dynamic fan control! ($TEMP C)" - ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x01 - else - printf "Temperature is OK ($TEMP C)" -fi +echo "$DATA" + +echo "$DATA" | head -1 | tail -1> /tmp/ipmi/fan1 +echo "$DATA" | head -2 | tail -1> /tmp/ipmi/fan2 +echo "$DATA" | head -3 | tail -1> /tmp/ipmi/fan3 +echo "$DATA" | head -4 | tail -1> /tmp/ipmi/fan4 +echo "$DATA" | head -5 | tail -1> /tmp/ipmi/fan5 +echo "$DATA" | head -6 | tail -1> /tmp/ipmi/fan6 diff --git a/home/Scripts/ipmi/temp.sh b/home/Scripts/ipmi/temp.sh index b25f111b..72caa949 100755 --- a/home/Scripts/ipmi/temp.sh +++ b/home/Scripts/ipmi/temp.sh @@ -7,7 +7,9 @@ IPMIEK=0000000000000000000000000000000000000000 MAXTEMP=27 TEMP=$(ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr type temperature |grep Ambient |grep degrees |grep -Po '\d{2}' | tail -1) -echo $TEMP > /tmp/idrac-temp +mkdir -p /tmp/ipmi + +echo $TEMP > /tmp/ipmi/temp if [[ $TEMP > $MAXTEMP ]]; diff --git a/root/etc/systemd/system/ipmi/ipmi-static.service b/root/etc/systemd/system/ipmi/ipmi-static.service index 9588c2a8..fb5c1bfb 100644 --- a/root/etc/systemd/system/ipmi/ipmi-static.service +++ b/root/etc/systemd/system/ipmi/ipmi-static.service @@ -3,7 +3,7 @@ Description=Set fan speed [Service] Type=simple -ExecStart=/home/balrog/Scripts/ipmi-static.sh +ExecStart=/home/balrog/Scripts/ipmi/static.sh [Install] WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi/ipmi-temp.service b/root/etc/systemd/system/ipmi/ipmi-temp.service index fc231cb8..64a9615f 100644 --- a/root/etc/systemd/system/ipmi/ipmi-temp.service +++ b/root/etc/systemd/system/ipmi/ipmi-temp.service @@ -3,7 +3,7 @@ Description=Watch server temperature [Service] Type=simple -ExecStart=/home/balrog/Scripts/ipmi-temp.sh +ExecStart=/home/balrog/Scripts/ipmi/temp.sh [Install] WantedBy=multi-user.target From d9ef8fbc5bd059be81ce384f25f4b7dd9b5580b4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 15:10:24 +0200 Subject: [PATCH 0105/2667] Move ipmi services to own directory --- root/etc/systemd/system/ipmi-static.service | 9 --------- root/etc/systemd/system/ipmi-temp.service | 9 --------- root/etc/systemd/system/ipmi-temp.timer | 9 --------- 3 files changed, 27 deletions(-) delete mode 100644 root/etc/systemd/system/ipmi-static.service delete mode 100644 root/etc/systemd/system/ipmi-temp.service delete mode 100644 root/etc/systemd/system/ipmi-temp.timer diff --git a/root/etc/systemd/system/ipmi-static.service b/root/etc/systemd/system/ipmi-static.service deleted file mode 100644 index 9588c2a8..00000000 --- a/root/etc/systemd/system/ipmi-static.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Set fan speed - -[Service] -Type=simple -ExecStart=/home/balrog/Scripts/ipmi-static.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.service b/root/etc/systemd/system/ipmi-temp.service deleted file mode 100644 index fc231cb8..00000000 --- a/root/etc/systemd/system/ipmi-temp.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Watch server temperature - -[Service] -Type=simple -ExecStart=/home/balrog/Scripts/ipmi-temp.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.timer b/root/etc/systemd/system/ipmi-temp.timer deleted file mode 100644 index d6605b13..00000000 --- a/root/etc/systemd/system/ipmi-temp.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Watches server temperature - -[Timer] -OnUnitInactiveSec=5s -OnBootSec=5s - -[Install] -WantedBy=timers.target From 1ef8f794ea391f41b54467e8cfe0cf7768e3f149 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 15:10:24 +0200 Subject: [PATCH 0106/2667] Move ipmi services to own directory --- root/etc/systemd/system/ipmi-static.service | 9 --------- root/etc/systemd/system/ipmi-temp.service | 9 --------- root/etc/systemd/system/ipmi-temp.timer | 9 --------- 3 files changed, 27 deletions(-) delete mode 100644 root/etc/systemd/system/ipmi-static.service delete mode 100644 root/etc/systemd/system/ipmi-temp.service delete mode 100644 root/etc/systemd/system/ipmi-temp.timer diff --git a/root/etc/systemd/system/ipmi-static.service b/root/etc/systemd/system/ipmi-static.service deleted file mode 100644 index 9588c2a8..00000000 --- a/root/etc/systemd/system/ipmi-static.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Set fan speed - -[Service] -Type=simple -ExecStart=/home/balrog/Scripts/ipmi-static.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.service b/root/etc/systemd/system/ipmi-temp.service deleted file mode 100644 index fc231cb8..00000000 --- a/root/etc/systemd/system/ipmi-temp.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Watch server temperature - -[Service] -Type=simple -ExecStart=/home/balrog/Scripts/ipmi-temp.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.timer b/root/etc/systemd/system/ipmi-temp.timer deleted file mode 100644 index d6605b13..00000000 --- a/root/etc/systemd/system/ipmi-temp.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Watches server temperature - -[Timer] -OnUnitInactiveSec=5s -OnBootSec=5s - -[Install] -WantedBy=timers.target From ecb3dbb04c6e9485f45c01f21d403ab78533c5f8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 15:12:40 +0200 Subject: [PATCH 0107/2667] Add fan service --- root/etc/systemd/system/ipmi/ipmi-fans.service | 9 +++++++++ root/etc/systemd/system/ipmi/ipmi-fans.timer | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 root/etc/systemd/system/ipmi/ipmi-fans.service create mode 100644 root/etc/systemd/system/ipmi/ipmi-fans.timer diff --git a/root/etc/systemd/system/ipmi/ipmi-fans.service b/root/etc/systemd/system/ipmi/ipmi-fans.service new file mode 100644 index 00000000..d6610daf --- /dev/null +++ b/root/etc/systemd/system/ipmi/ipmi-fans.service @@ -0,0 +1,9 @@ +[Unit] +Description=Write fan speeds to tmp + +[Service] +Type=simple +ExecStart=/home/balrog/Scripts/ipmi/fans.sh + +[Install] +WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi/ipmi-fans.timer b/root/etc/systemd/system/ipmi/ipmi-fans.timer new file mode 100644 index 00000000..554be356 --- /dev/null +++ b/root/etc/systemd/system/ipmi/ipmi-fans.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Run fans service every 30s + +[Timer] +OnUnitInactiveSec=15s +OnBootSec=15s + +[Install] +WantedBy=timers.target From 90dcc0b6ee612f248464cc34d183e239e34337db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 15:12:40 +0200 Subject: [PATCH 0108/2667] Add fan service --- root/etc/systemd/system/ipmi/ipmi-fans.service | 9 +++++++++ root/etc/systemd/system/ipmi/ipmi-fans.timer | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 root/etc/systemd/system/ipmi/ipmi-fans.service create mode 100644 root/etc/systemd/system/ipmi/ipmi-fans.timer diff --git a/root/etc/systemd/system/ipmi/ipmi-fans.service b/root/etc/systemd/system/ipmi/ipmi-fans.service new file mode 100644 index 00000000..d6610daf --- /dev/null +++ b/root/etc/systemd/system/ipmi/ipmi-fans.service @@ -0,0 +1,9 @@ +[Unit] +Description=Write fan speeds to tmp + +[Service] +Type=simple +ExecStart=/home/balrog/Scripts/ipmi/fans.sh + +[Install] +WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi/ipmi-fans.timer b/root/etc/systemd/system/ipmi/ipmi-fans.timer new file mode 100644 index 00000000..554be356 --- /dev/null +++ b/root/etc/systemd/system/ipmi/ipmi-fans.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Run fans service every 30s + +[Timer] +OnUnitInactiveSec=15s +OnBootSec=15s + +[Install] +WantedBy=timers.target From c0e5e2a92d4007324e81dc26ca51db151fcaf8b2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 15:19:53 +0200 Subject: [PATCH 0109/2667] Forgot these --- config-root.yaml | 114 ++++++++++-------- .../system/{ipmi => }/ipmi-fans.service | 0 .../systemd/system/{ipmi => }/ipmi-fans.timer | 0 root/etc/systemd/system/ipmi-static.service | 9 ++ root/etc/systemd/system/ipmi-temp.service | 9 ++ root/etc/systemd/system/ipmi-temp.timer | 9 ++ 6 files changed, 91 insertions(+), 50 deletions(-) rename root/etc/systemd/system/{ipmi => }/ipmi-fans.service (100%) rename root/etc/systemd/system/{ipmi => }/ipmi-fans.timer (100%) create mode 100644 root/etc/systemd/system/ipmi-static.service create mode 100644 root/etc/systemd/system/ipmi-temp.service create mode 100644 root/etc/systemd/system/ipmi-temp.timer diff --git a/config-root.yaml b/config-root.yaml index 200d311a..929702f3 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -116,67 +116,81 @@ dotfiles: f_20-quiet-printk.conf: src: etc/sysctl.d/20-quiet-printk.conf dst: /etc/sysctl.d/20-quiet-printk.conf - d_ipmi: - src: etc/systemd/system/ipmi - dst: /etc/systemd/system/ipmi + f_ipmi-static.service: + src: etc/systemd/system/ipmi-static.service + dst: /etc/systemd/system/ipmi-static.service + f_ipmi-temp.service: + src: etc/systemd/system/ipmi-temp.service + dst: /etc/systemd/system/ipmi-temp.service + f_ipmi-temp.timer: + src: etc/systemd/system/ipmi-temp.timer + dst: /etc/systemd/system/ipmi-temp.timer + f_ipmi-fans.service: + src: etc/systemd/system/ipmi-fans.service + dst: /etc/systemd/system/ipmi-fans.service + f_ipmi-fans.timer: + src: etc/systemd/system/ipmi-fans.timer + dst: /etc/systemd/system/ipmi-fans.timer profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf - - f_pacman-dl.service - - f_pacman-dl.timer + - f_pacman.conf + - f_pacserve.service.conf + - f_pacman-dl.service + - f_pacman-dl.timer Mirkwood: dotfiles: - - f_getty.conf - - f_environment - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_loader.conf - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_zsh.hook - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - d_ipmi + - f_getty.conf + - f_environment + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_loader.conf + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_zsh.hook + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_ipmi-static.service + - f_ipmi-temp.service + - f_ipmi-temp.timer + - f_ipmi-fans.service + - f_ipmi-fans.timer include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config - - f_nightly-reboot.service - - f_nightly-reboot.timer + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_sshd_config + - f_nightly-reboot.service + - f_nightly-reboot.timer Moria: include: - - Locale - - Pacman - - IPMI + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - d_ipmi + - f_sshd_config + - f_99-sysctl.conf diff --git a/root/etc/systemd/system/ipmi/ipmi-fans.service b/root/etc/systemd/system/ipmi-fans.service similarity index 100% rename from root/etc/systemd/system/ipmi/ipmi-fans.service rename to root/etc/systemd/system/ipmi-fans.service diff --git a/root/etc/systemd/system/ipmi/ipmi-fans.timer b/root/etc/systemd/system/ipmi-fans.timer similarity index 100% rename from root/etc/systemd/system/ipmi/ipmi-fans.timer rename to root/etc/systemd/system/ipmi-fans.timer diff --git a/root/etc/systemd/system/ipmi-static.service b/root/etc/systemd/system/ipmi-static.service new file mode 100644 index 00000000..9588c2a8 --- /dev/null +++ b/root/etc/systemd/system/ipmi-static.service @@ -0,0 +1,9 @@ +[Unit] +Description=Set fan speed + +[Service] +Type=simple +ExecStart=/home/balrog/Scripts/ipmi-static.sh + +[Install] +WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.service b/root/etc/systemd/system/ipmi-temp.service new file mode 100644 index 00000000..fc231cb8 --- /dev/null +++ b/root/etc/systemd/system/ipmi-temp.service @@ -0,0 +1,9 @@ +[Unit] +Description=Watch server temperature + +[Service] +Type=simple +ExecStart=/home/balrog/Scripts/ipmi-temp.sh + +[Install] +WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.timer b/root/etc/systemd/system/ipmi-temp.timer new file mode 100644 index 00000000..d6605b13 --- /dev/null +++ b/root/etc/systemd/system/ipmi-temp.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Watches server temperature + +[Timer] +OnUnitInactiveSec=5s +OnBootSec=5s + +[Install] +WantedBy=timers.target From 5ebe2facced14abf29d005b1562051a27ae20dd0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 15:19:53 +0200 Subject: [PATCH 0110/2667] Forgot these --- config-root.yaml | 114 ++++++++++-------- .../system/{ipmi => }/ipmi-fans.service | 0 .../systemd/system/{ipmi => }/ipmi-fans.timer | 0 root/etc/systemd/system/ipmi-static.service | 9 ++ root/etc/systemd/system/ipmi-temp.service | 9 ++ root/etc/systemd/system/ipmi-temp.timer | 9 ++ 6 files changed, 91 insertions(+), 50 deletions(-) rename root/etc/systemd/system/{ipmi => }/ipmi-fans.service (100%) rename root/etc/systemd/system/{ipmi => }/ipmi-fans.timer (100%) create mode 100644 root/etc/systemd/system/ipmi-static.service create mode 100644 root/etc/systemd/system/ipmi-temp.service create mode 100644 root/etc/systemd/system/ipmi-temp.timer diff --git a/config-root.yaml b/config-root.yaml index 200d311a..929702f3 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -116,67 +116,81 @@ dotfiles: f_20-quiet-printk.conf: src: etc/sysctl.d/20-quiet-printk.conf dst: /etc/sysctl.d/20-quiet-printk.conf - d_ipmi: - src: etc/systemd/system/ipmi - dst: /etc/systemd/system/ipmi + f_ipmi-static.service: + src: etc/systemd/system/ipmi-static.service + dst: /etc/systemd/system/ipmi-static.service + f_ipmi-temp.service: + src: etc/systemd/system/ipmi-temp.service + dst: /etc/systemd/system/ipmi-temp.service + f_ipmi-temp.timer: + src: etc/systemd/system/ipmi-temp.timer + dst: /etc/systemd/system/ipmi-temp.timer + f_ipmi-fans.service: + src: etc/systemd/system/ipmi-fans.service + dst: /etc/systemd/system/ipmi-fans.service + f_ipmi-fans.timer: + src: etc/systemd/system/ipmi-fans.timer + dst: /etc/systemd/system/ipmi-fans.timer profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf - - f_pacman-dl.service - - f_pacman-dl.timer + - f_pacman.conf + - f_pacserve.service.conf + - f_pacman-dl.service + - f_pacman-dl.timer Mirkwood: dotfiles: - - f_getty.conf - - f_environment - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_loader.conf - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_zsh.hook - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - d_ipmi + - f_getty.conf + - f_environment + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_loader.conf + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_zsh.hook + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_ipmi-static.service + - f_ipmi-temp.service + - f_ipmi-temp.timer + - f_ipmi-fans.service + - f_ipmi-fans.timer include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config - - f_nightly-reboot.service - - f_nightly-reboot.timer + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_sshd_config + - f_nightly-reboot.service + - f_nightly-reboot.timer Moria: include: - - Locale - - Pacman - - IPMI + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - d_ipmi + - f_sshd_config + - f_99-sysctl.conf diff --git a/root/etc/systemd/system/ipmi/ipmi-fans.service b/root/etc/systemd/system/ipmi-fans.service similarity index 100% rename from root/etc/systemd/system/ipmi/ipmi-fans.service rename to root/etc/systemd/system/ipmi-fans.service diff --git a/root/etc/systemd/system/ipmi/ipmi-fans.timer b/root/etc/systemd/system/ipmi-fans.timer similarity index 100% rename from root/etc/systemd/system/ipmi/ipmi-fans.timer rename to root/etc/systemd/system/ipmi-fans.timer diff --git a/root/etc/systemd/system/ipmi-static.service b/root/etc/systemd/system/ipmi-static.service new file mode 100644 index 00000000..9588c2a8 --- /dev/null +++ b/root/etc/systemd/system/ipmi-static.service @@ -0,0 +1,9 @@ +[Unit] +Description=Set fan speed + +[Service] +Type=simple +ExecStart=/home/balrog/Scripts/ipmi-static.sh + +[Install] +WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.service b/root/etc/systemd/system/ipmi-temp.service new file mode 100644 index 00000000..fc231cb8 --- /dev/null +++ b/root/etc/systemd/system/ipmi-temp.service @@ -0,0 +1,9 @@ +[Unit] +Description=Watch server temperature + +[Service] +Type=simple +ExecStart=/home/balrog/Scripts/ipmi-temp.sh + +[Install] +WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.timer b/root/etc/systemd/system/ipmi-temp.timer new file mode 100644 index 00000000..d6605b13 --- /dev/null +++ b/root/etc/systemd/system/ipmi-temp.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Watches server temperature + +[Timer] +OnUnitInactiveSec=5s +OnBootSec=5s + +[Install] +WantedBy=timers.target From 6bb1f530d8259e7908626171ec3c88ac714c0641 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 15:20:46 +0200 Subject: [PATCH 0111/2667] Move ipmi stuff to server profile --- config-root.yaml | 98 ++++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 929702f3..e0f3574c 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -134,63 +134,63 @@ dotfiles: profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf - - f_pacman-dl.service - - f_pacman-dl.timer + - f_pacman.conf + - f_pacserve.service.conf + - f_pacman-dl.service + - f_pacman-dl.timer Mirkwood: dotfiles: - - f_getty.conf - - f_environment - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_loader.conf - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_zsh.hook - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_ipmi-static.service - - f_ipmi-temp.service - - f_ipmi-temp.timer - - f_ipmi-fans.service - - f_ipmi-fans.timer + - f_getty.conf + - f_environment + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_loader.conf + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_zsh.hook + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config - - f_nightly-reboot.service - - f_nightly-reboot.timer + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_sshd_config + - f_nightly-reboot.service + - f_nightly-reboot.timer Moria: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf + - f_sshd_config + - f_99-sysctl.conf + - f_ipmi-static.service + - f_ipmi-temp.service + - f_ipmi-temp.timer + - f_ipmi-fans.service + - f_ipmi-fans.timer From 20e5f252fa82a6ab89ab63747fee28b627634925 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 15:20:46 +0200 Subject: [PATCH 0112/2667] Move ipmi stuff to server profile --- config-root.yaml | 98 ++++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 929702f3..e0f3574c 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -134,63 +134,63 @@ dotfiles: profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf - - f_pacman-dl.service - - f_pacman-dl.timer + - f_pacman.conf + - f_pacserve.service.conf + - f_pacman-dl.service + - f_pacman-dl.timer Mirkwood: dotfiles: - - f_getty.conf - - f_environment - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_loader.conf - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_zsh.hook - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_ipmi-static.service - - f_ipmi-temp.service - - f_ipmi-temp.timer - - f_ipmi-fans.service - - f_ipmi-fans.timer + - f_getty.conf + - f_environment + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_loader.conf + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_zsh.hook + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config - - f_nightly-reboot.service - - f_nightly-reboot.timer + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_sshd_config + - f_nightly-reboot.service + - f_nightly-reboot.timer Moria: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf + - f_sshd_config + - f_99-sysctl.conf + - f_ipmi-static.service + - f_ipmi-temp.service + - f_ipmi-temp.timer + - f_ipmi-fans.service + - f_ipmi-fans.timer From 467336b42af0959e54219ab5e31a38ce5f647ce7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 23:43:57 +0200 Subject: [PATCH 0113/2667] Add second authorized_key --- home/.ssh/authorized_keys | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.ssh/authorized_keys b/home/.ssh/authorized_keys index 17e74ec1..03dfb898 100644 --- a/home/.ssh/authorized_keys +++ b/home/.ssh/authorized_keys @@ -1 +1,2 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDPIoTVXJ2gljf+Tpk7GdwAihhAlnyoblOWYiwFenKeomcYizLt8arEXNT+1Hr+jit7+Fg2Izv31ovo9M1ePyhzuO1jcuCOZkIPvcaN0c6XIH83ZiA04Ysd/HIGv1r7tDTxNnXeKfl55tWpd+F2A0BF3D3dIDBqDfX2Z2odXIjKXHoFBgETATl45bm0txpjTjbpjIiPbaRHg6+lcSnWm3f5p8lCzXs5MIGCdXcBxMhVVxszAI3CD/cEBmnweCam1Ji3J1qYna4BOrIyW5Z3HzS6vAkajxZd2wPU47gpoc3/2sXBwJeE/iOACECC+34rYqadZThprihpYc7D8gIDr7IDN16rvFfEcxE8SFvsPmM1Qbo7uH/F2TFF6mb0FzGQuTcdR4bqcms5jMsgqPGfEs6Rd1pkOXTcxwKOtbH27VYhSs/ow5TEbVHrbLwTU35ohIfZRqlKbrMv3CGgTNzj9MlN339x6G3//lnKR36i/W+Z4FPjT/KayhwbsNR1B5Mfdlr7tbmvFcI2KxvyD7Rr5XuouVTx98s3nlc2MJpII/Q/oX2tWPnYAK/myJC7ucY7G4Y/3uoCv2GYTi2flpEFJITSDPqzwrX19yYK2ooYyvg40Cd2mt4xu9sj4SyEMUu98CIfECT7dsaKVPfcjQqaRZb2Spr4tPfMrcUZYiZgJBPxWQ== cardno:000610127408 +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvsd9UtWtqfG+vmx9ByEwQwKJlcelWwZlN4b4WG0al3 reekymarko@reekynet.com From 0965d9a259cad16e6ceb0e5c46d71154b988d52b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 23:43:57 +0200 Subject: [PATCH 0114/2667] Add second authorized_key --- home/.ssh/authorized_keys | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.ssh/authorized_keys b/home/.ssh/authorized_keys index 17e74ec1..03dfb898 100644 --- a/home/.ssh/authorized_keys +++ b/home/.ssh/authorized_keys @@ -1 +1,2 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDPIoTVXJ2gljf+Tpk7GdwAihhAlnyoblOWYiwFenKeomcYizLt8arEXNT+1Hr+jit7+Fg2Izv31ovo9M1ePyhzuO1jcuCOZkIPvcaN0c6XIH83ZiA04Ysd/HIGv1r7tDTxNnXeKfl55tWpd+F2A0BF3D3dIDBqDfX2Z2odXIjKXHoFBgETATl45bm0txpjTjbpjIiPbaRHg6+lcSnWm3f5p8lCzXs5MIGCdXcBxMhVVxszAI3CD/cEBmnweCam1Ji3J1qYna4BOrIyW5Z3HzS6vAkajxZd2wPU47gpoc3/2sXBwJeE/iOACECC+34rYqadZThprihpYc7D8gIDr7IDN16rvFfEcxE8SFvsPmM1Qbo7uH/F2TFF6mb0FzGQuTcdR4bqcms5jMsgqPGfEs6Rd1pkOXTcxwKOtbH27VYhSs/ow5TEbVHrbLwTU35ohIfZRqlKbrMv3CGgTNzj9MlN339x6G3//lnKR36i/W+Z4FPjT/KayhwbsNR1B5Mfdlr7tbmvFcI2KxvyD7Rr5XuouVTx98s3nlc2MJpII/Q/oX2tWPnYAK/myJC7ucY7G4Y/3uoCv2GYTi2flpEFJITSDPqzwrX19yYK2ooYyvg40Cd2mt4xu9sj4SyEMUu98CIfECT7dsaKVPfcjQqaRZb2Spr4tPfMrcUZYiZgJBPxWQ== cardno:000610127408 +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvsd9UtWtqfG+vmx9ByEwQwKJlcelWwZlN4b4WG0al3 reekymarko@reekynet.com From 79adde278237e395b8b8a1bf0108636dcdb1841b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 23:45:16 +0200 Subject: [PATCH 0115/2667] Make fan speed a bit higher --- home/Scripts/ipmi/static.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/Scripts/ipmi/static.sh b/home/Scripts/ipmi/static.sh index e82c3a6f..617dc7bc 100755 --- a/home/Scripts/ipmi/static.sh +++ b/home/Scripts/ipmi/static.sh @@ -7,4 +7,4 @@ IPMIEK=0000000000000000000000000000000000000000 printf "Activating manual fan speeds! (2160 RPM)" ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x00 -ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x02 0xff 0x09 +ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x02 0xff 0x11 From 76fe9f2e6b70e59b32e29f4c061f7f0aa32216da Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 23:45:16 +0200 Subject: [PATCH 0116/2667] Make fan speed a bit higher --- home/Scripts/ipmi/static.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/Scripts/ipmi/static.sh b/home/Scripts/ipmi/static.sh index e82c3a6f..617dc7bc 100755 --- a/home/Scripts/ipmi/static.sh +++ b/home/Scripts/ipmi/static.sh @@ -7,4 +7,4 @@ IPMIEK=0000000000000000000000000000000000000000 printf "Activating manual fan speeds! (2160 RPM)" ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x00 -ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x02 0xff 0x09 +ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x02 0xff 0x11 From d53d815e8005248652b02afb6202ba72d0d16209 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 23:52:40 +0200 Subject: [PATCH 0117/2667] Make moria and rivendell use lan addresses --- home/.ssh/config | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index 080ac75c..fc93742a 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -19,14 +19,24 @@ Host aur User aur host moria +{%@@ if profile == "Rivendell" @@%} + HostName moria.reekynet.lan + port 22 +{%@@ else @@%} HostName reekynet.com port 221 +{%@@ endif @@%} User balrog ForwardAgent yes host rivendell +{%@@ if profile == "Moria" @@%} + HostName rivendell.reekynet.lan + port 22 +{%@@ else @@%} HostName reekynet.com port 222 +{%@@ endif @@%} User gimli ForwardAgent yes From 0b27ec5d29af2884bc92017b532316a98ec0c639 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 23:52:40 +0200 Subject: [PATCH 0118/2667] Make moria and rivendell use lan addresses --- home/.ssh/config | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index 080ac75c..fc93742a 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -19,14 +19,24 @@ Host aur User aur host moria +{%@@ if profile == "Rivendell" @@%} + HostName moria.reekynet.lan + port 22 +{%@@ else @@%} HostName reekynet.com port 221 +{%@@ endif @@%} User balrog ForwardAgent yes host rivendell +{%@@ if profile == "Moria" @@%} + HostName rivendell.reekynet.lan + port 22 +{%@@ else @@%} HostName reekynet.com port 222 +{%@@ endif @@%} User gimli ForwardAgent yes From bd40eda2a09b6cc14def07f7ffaa7a24b79597a0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 00:01:55 +0200 Subject: [PATCH 0119/2667] Fix script path --- root/etc/systemd/system/ipmi-static.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/systemd/system/ipmi-static.service b/root/etc/systemd/system/ipmi-static.service index 9588c2a8..fb5c1bfb 100644 --- a/root/etc/systemd/system/ipmi-static.service +++ b/root/etc/systemd/system/ipmi-static.service @@ -3,7 +3,7 @@ Description=Set fan speed [Service] Type=simple -ExecStart=/home/balrog/Scripts/ipmi-static.sh +ExecStart=/home/balrog/Scripts/ipmi/static.sh [Install] WantedBy=multi-user.target From 6c11af2f2c2c53b55a6873c84bb972b4966c98d7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 00:01:55 +0200 Subject: [PATCH 0120/2667] Fix script path --- root/etc/systemd/system/ipmi-static.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/systemd/system/ipmi-static.service b/root/etc/systemd/system/ipmi-static.service index 9588c2a8..fb5c1bfb 100644 --- a/root/etc/systemd/system/ipmi-static.service +++ b/root/etc/systemd/system/ipmi-static.service @@ -3,7 +3,7 @@ Description=Set fan speed [Service] Type=simple -ExecStart=/home/balrog/Scripts/ipmi-static.sh +ExecStart=/home/balrog/Scripts/ipmi/static.sh [Install] WantedBy=multi-user.target From c958a214f52a429e9b21ff9ca2253f3f80b93c81 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:16:41 +0200 Subject: [PATCH 0121/2667] Fix script path --- root/etc/systemd/system/ipmi-temp.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/systemd/system/ipmi-temp.service b/root/etc/systemd/system/ipmi-temp.service index fc231cb8..64a9615f 100644 --- a/root/etc/systemd/system/ipmi-temp.service +++ b/root/etc/systemd/system/ipmi-temp.service @@ -3,7 +3,7 @@ Description=Watch server temperature [Service] Type=simple -ExecStart=/home/balrog/Scripts/ipmi-temp.sh +ExecStart=/home/balrog/Scripts/ipmi/temp.sh [Install] WantedBy=multi-user.target From 7e2ada839d6203292772a899f54eea8f921e4ffd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:16:41 +0200 Subject: [PATCH 0122/2667] Fix script path --- root/etc/systemd/system/ipmi-temp.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/systemd/system/ipmi-temp.service b/root/etc/systemd/system/ipmi-temp.service index fc231cb8..64a9615f 100644 --- a/root/etc/systemd/system/ipmi-temp.service +++ b/root/etc/systemd/system/ipmi-temp.service @@ -3,7 +3,7 @@ Description=Watch server temperature [Service] Type=simple -ExecStart=/home/balrog/Scripts/ipmi-temp.sh +ExecStart=/home/balrog/Scripts/ipmi/temp.sh [Install] WantedBy=multi-user.target From 6451e5f0228ab7d4c2260a700426ac6b09008dd9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:23:24 +0200 Subject: [PATCH 0123/2667] Add mosquitto back --- docker/homeautomation/docker-compose.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 9d2ccbca..19787cc2 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -55,6 +55,17 @@ services: devices: - /dev/ttyACM0 + mosquitto: + container_name: mosquitto + image: eclipse-mosquitto + environment: + - TZ=Europe/Helsinki + network_mode: host + volumes: + - /docker/homeautomation/mosquitto:/mosquitto + - /etc/localtime:/etc/localtime:ro + restart: always + node-red: container_name: node-red image: nodered/node-red From 5ee48f1ecb309ff590f79a1493d359a7fc9c1942 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:23:24 +0200 Subject: [PATCH 0124/2667] Add mosquitto back --- docker/homeautomation/docker-compose.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 9d2ccbca..19787cc2 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -55,6 +55,17 @@ services: devices: - /dev/ttyACM0 + mosquitto: + container_name: mosquitto + image: eclipse-mosquitto + environment: + - TZ=Europe/Helsinki + network_mode: host + volumes: + - /docker/homeautomation/mosquitto:/mosquitto + - /etc/localtime:/etc/localtime:ro + restart: always + node-red: container_name: node-red image: nodered/node-red From 30b29dc5aeef246e033eed904af62f3e8d536c42 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:24:40 +0200 Subject: [PATCH 0125/2667] Add mosquitto dependency for HA --- docker/homeautomation/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 19787cc2..ac6e2465 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -18,6 +18,7 @@ services: depends_on: - deconz - mariadb + - mosquitto labels: - "traefik.enable=true" From 07efd74874494471649216578f6caa074a4ac0c9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:24:40 +0200 Subject: [PATCH 0126/2667] Add mosquitto dependency for HA --- docker/homeautomation/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 19787cc2..ac6e2465 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -18,6 +18,7 @@ services: depends_on: - deconz - mariadb + - mosquitto labels: - "traefik.enable=true" From 3e8759ab477f15328a2b37697ee8b57c97704cee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:26:15 +0200 Subject: [PATCH 0127/2667] Remove ipmi files --- docker/homeautomation/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index ac6e2465..bf46ebd2 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -7,7 +7,6 @@ services: - TZ=Europe/Helsinki volumes: - /docker/homeautomation/home-assistant:/config - - /tmp/ipmi:/ipmi - /etc/localtime:/etc/localtime:ro restart: always networks: From 6d6fd98060cf05f9955a0f51828cc07bb22f81e2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:26:15 +0200 Subject: [PATCH 0128/2667] Remove ipmi files --- docker/homeautomation/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index ac6e2465..bf46ebd2 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -7,7 +7,6 @@ services: - TZ=Europe/Helsinki volumes: - /docker/homeautomation/home-assistant:/config - - /tmp/ipmi:/ipmi - /etc/localtime:/etc/localtime:ro restart: always networks: From a26e7cdfb34a6af0e3d11cec59e9d7745317ae18 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:28:18 +0200 Subject: [PATCH 0129/2667] Forward mqtt ports --- docker/homeautomation/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index bf46ebd2..1a2e0b2a 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -60,7 +60,8 @@ services: image: eclipse-mosquitto environment: - TZ=Europe/Helsinki - network_mode: host + ports: + - "1883:1883" volumes: - /docker/homeautomation/mosquitto:/mosquitto - /etc/localtime:/etc/localtime:ro From cab85033bbbdd92199cf8ad82f0f67a7f3bb9ae3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:28:18 +0200 Subject: [PATCH 0130/2667] Forward mqtt ports --- docker/homeautomation/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index bf46ebd2..1a2e0b2a 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -60,7 +60,8 @@ services: image: eclipse-mosquitto environment: - TZ=Europe/Helsinki - network_mode: host + ports: + - "1883:1883" volumes: - /docker/homeautomation/mosquitto:/mosquitto - /etc/localtime:/etc/localtime:ro From e88e1d4c18c2e4e63d0a0033692126d3881c2715 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:29:49 +0200 Subject: [PATCH 0131/2667] Add mosquitto to HA network --- docker/homeautomation/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 1a2e0b2a..332b0821 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -62,6 +62,8 @@ services: - TZ=Europe/Helsinki ports: - "1883:1883" + networks: + - home-assistant volumes: - /docker/homeautomation/mosquitto:/mosquitto - /etc/localtime:/etc/localtime:ro From fa6fa78418d63d2149e1a128ed45b5b5a75c7b45 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:29:49 +0200 Subject: [PATCH 0132/2667] Add mosquitto to HA network --- docker/homeautomation/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 1a2e0b2a..332b0821 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -62,6 +62,8 @@ services: - TZ=Europe/Helsinki ports: - "1883:1883" + networks: + - home-assistant volumes: - /docker/homeautomation/mosquitto:/mosquitto - /etc/localtime:/etc/localtime:ro From 704c8619a622ef9f67c469053d214442430b7ac8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:44:17 +0200 Subject: [PATCH 0133/2667] Move ipmi scripts to mqtt --- home/Scripts/ipmi/fans.sh | 12 ++++++------ home/Scripts/ipmi/temp.sh | 2 +- secrets/env | 1 + secrets/secrets.sh | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/home/Scripts/ipmi/fans.sh b/home/Scripts/ipmi/fans.sh index 3649a0ca..17dc4b08 100755 --- a/home/Scripts/ipmi/fans.sh +++ b/home/Scripts/ipmi/fans.sh @@ -11,9 +11,9 @@ DATA=`ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr ge echo "$DATA" -echo "$DATA" | head -1 | tail -1> /tmp/ipmi/fan1 -echo "$DATA" | head -2 | tail -1> /tmp/ipmi/fan2 -echo "$DATA" | head -3 | tail -1> /tmp/ipmi/fan3 -echo "$DATA" | head -4 | tail -1> /tmp/ipmi/fan4 -echo "$DATA" | head -5 | tail -1> /tmp/ipmi/fan5 -echo "$DATA" | head -6 | tail -1> /tmp/ipmi/fan6 +mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan1" -m "$(echo "$DATA" | head -1 | tail -1)" +mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan2" -m "$(echo "$DATA" | head -2 | tail -1)" +mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan3" -m "$(echo "$DATA" | head -3 | tail -1)" +mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan4" -m "$(echo "$DATA" | head -4 | tail -1)" +mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan5" -m "$(echo "$DATA" | head -5 | tail -1)" +mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan6" -m "$(echo "$DATA" | head -6 | tail -1)" diff --git a/home/Scripts/ipmi/temp.sh b/home/Scripts/ipmi/temp.sh index 72caa949..e9b47d47 100755 --- a/home/Scripts/ipmi/temp.sh +++ b/home/Scripts/ipmi/temp.sh @@ -9,7 +9,7 @@ TEMP=$(ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr t mkdir -p /tmp/ipmi -echo $TEMP > /tmp/ipmi/temp +mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/temp" -m "$TEMP" if [[ $TEMP > $MAXTEMP ]]; diff --git a/secrets/env b/secrets/env index 1883ef69..73aa9fed 100755 --- a/secrets/env +++ b/secrets/env @@ -7,6 +7,7 @@ export PASS_ARIA2="$(pass linux/aria2 | head -n 1)" export PASS_MPD="$(pass linux/mpd | head -n 1)" export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -n 1)" export PASS_IPMI="$(pass reekynet/idrac | head -n 1)" +export PASS_MQTT="$(pass reekynet/mqtt.reekynet.com | head -n 1)" export ME_FULLNAME="$(pass me | head -n 1)" export ME_ADDRESS="$(pass me | rg 'address' | cut -d' ' -f2-)" diff --git a/secrets/secrets.sh b/secrets/secrets.sh index c1ae535f..78c68db6 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -11,6 +11,7 @@ export PASS_ARIA2="$PASS_ARIA2" export PASS_MPD="$PASS_MPD" export PASS_MPD_ADMIN="$PASS_MPD_ADMIN" export PASS_IPMI="$PASS_IPMI" +export PASS_MQTT="$PASS_MQTT" export ME_FULLNAME="$ME_FULLNAME" export ME_ADDRESS="$ME_ADDRESS" From 1d7b00931c9654f61a4a2ed0b43015c98b6bcf26 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:44:17 +0200 Subject: [PATCH 0134/2667] Move ipmi scripts to mqtt --- home/Scripts/ipmi/fans.sh | 12 ++++++------ home/Scripts/ipmi/temp.sh | 2 +- secrets/env | 1 + secrets/secrets.sh | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/home/Scripts/ipmi/fans.sh b/home/Scripts/ipmi/fans.sh index 3649a0ca..17dc4b08 100755 --- a/home/Scripts/ipmi/fans.sh +++ b/home/Scripts/ipmi/fans.sh @@ -11,9 +11,9 @@ DATA=`ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr ge echo "$DATA" -echo "$DATA" | head -1 | tail -1> /tmp/ipmi/fan1 -echo "$DATA" | head -2 | tail -1> /tmp/ipmi/fan2 -echo "$DATA" | head -3 | tail -1> /tmp/ipmi/fan3 -echo "$DATA" | head -4 | tail -1> /tmp/ipmi/fan4 -echo "$DATA" | head -5 | tail -1> /tmp/ipmi/fan5 -echo "$DATA" | head -6 | tail -1> /tmp/ipmi/fan6 +mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan1" -m "$(echo "$DATA" | head -1 | tail -1)" +mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan2" -m "$(echo "$DATA" | head -2 | tail -1)" +mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan3" -m "$(echo "$DATA" | head -3 | tail -1)" +mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan4" -m "$(echo "$DATA" | head -4 | tail -1)" +mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan5" -m "$(echo "$DATA" | head -5 | tail -1)" +mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan6" -m "$(echo "$DATA" | head -6 | tail -1)" diff --git a/home/Scripts/ipmi/temp.sh b/home/Scripts/ipmi/temp.sh index 72caa949..e9b47d47 100755 --- a/home/Scripts/ipmi/temp.sh +++ b/home/Scripts/ipmi/temp.sh @@ -9,7 +9,7 @@ TEMP=$(ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr t mkdir -p /tmp/ipmi -echo $TEMP > /tmp/ipmi/temp +mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/temp" -m "$TEMP" if [[ $TEMP > $MAXTEMP ]]; diff --git a/secrets/env b/secrets/env index 1883ef69..73aa9fed 100755 --- a/secrets/env +++ b/secrets/env @@ -7,6 +7,7 @@ export PASS_ARIA2="$(pass linux/aria2 | head -n 1)" export PASS_MPD="$(pass linux/mpd | head -n 1)" export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -n 1)" export PASS_IPMI="$(pass reekynet/idrac | head -n 1)" +export PASS_MQTT="$(pass reekynet/mqtt.reekynet.com | head -n 1)" export ME_FULLNAME="$(pass me | head -n 1)" export ME_ADDRESS="$(pass me | rg 'address' | cut -d' ' -f2-)" diff --git a/secrets/secrets.sh b/secrets/secrets.sh index c1ae535f..78c68db6 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -11,6 +11,7 @@ export PASS_ARIA2="$PASS_ARIA2" export PASS_MPD="$PASS_MPD" export PASS_MPD_ADMIN="$PASS_MPD_ADMIN" export PASS_IPMI="$PASS_IPMI" +export PASS_MQTT="$PASS_MQTT" export ME_FULLNAME="$ME_FULLNAME" export ME_ADDRESS="$ME_ADDRESS" From 907ac33c1e4038a0c8717cef84f46ba5bfdf794e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 19 Feb 2020 20:33:15 +0200 Subject: [PATCH 0135/2667] Add full speed fan script --- home/Scripts/ipmi/full.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 home/Scripts/ipmi/full.sh diff --git a/home/Scripts/ipmi/full.sh b/home/Scripts/ipmi/full.sh new file mode 100755 index 00000000..8218be99 --- /dev/null +++ b/home/Scripts/ipmi/full.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +IPMIHOST=10.0.0.82 +IPMIUSER=ReekyMarko +IPMIPW={{@@ env['PASS_IPMI'] @@}} +IPMIEK=0000000000000000000000000000000000000000 + +printf "speeeed!" +ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x00 +ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x02 0xff 0x64 From 90fc7f56ec36dc8b161f8cc5ff243f137002395d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 19 Feb 2020 20:33:15 +0200 Subject: [PATCH 0136/2667] Add full speed fan script --- home/Scripts/ipmi/full.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 home/Scripts/ipmi/full.sh diff --git a/home/Scripts/ipmi/full.sh b/home/Scripts/ipmi/full.sh new file mode 100755 index 00000000..8218be99 --- /dev/null +++ b/home/Scripts/ipmi/full.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +IPMIHOST=10.0.0.82 +IPMIUSER=ReekyMarko +IPMIPW={{@@ env['PASS_IPMI'] @@}} +IPMIEK=0000000000000000000000000000000000000000 + +printf "speeeed!" +ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x00 +ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x02 0xff 0x64 From 332e8aae69b69098c7d7a351e87d9b1fd8d5ae3b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 19 Feb 2020 22:31:51 +0200 Subject: [PATCH 0137/2667] Remove redundant line --- home/Scripts/ipmi/temp.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/home/Scripts/ipmi/temp.sh b/home/Scripts/ipmi/temp.sh index e9b47d47..b468b766 100755 --- a/home/Scripts/ipmi/temp.sh +++ b/home/Scripts/ipmi/temp.sh @@ -7,8 +7,6 @@ IPMIEK=0000000000000000000000000000000000000000 MAXTEMP=27 TEMP=$(ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr type temperature |grep Ambient |grep degrees |grep -Po '\d{2}' | tail -1) -mkdir -p /tmp/ipmi - mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/temp" -m "$TEMP" From c78f77e290c3bd04bfa97d12f519d6223b9c9511 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 19 Feb 2020 22:31:51 +0200 Subject: [PATCH 0138/2667] Remove redundant line --- home/Scripts/ipmi/temp.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/home/Scripts/ipmi/temp.sh b/home/Scripts/ipmi/temp.sh index e9b47d47..b468b766 100755 --- a/home/Scripts/ipmi/temp.sh +++ b/home/Scripts/ipmi/temp.sh @@ -7,8 +7,6 @@ IPMIEK=0000000000000000000000000000000000000000 MAXTEMP=27 TEMP=$(ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr type temperature |grep Ambient |grep degrees |grep -Po '\d{2}' | tail -1) -mkdir -p /tmp/ipmi - mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/temp" -m "$TEMP" From 854ddf4ccd96466f06737eb72b8144eb523a6fa0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 19 Feb 2020 22:32:28 +0200 Subject: [PATCH 0139/2667] Remove redundant line --- home/Scripts/ipmi/fans.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/home/Scripts/ipmi/fans.sh b/home/Scripts/ipmi/fans.sh index 17dc4b08..c23b4a6b 100755 --- a/home/Scripts/ipmi/fans.sh +++ b/home/Scripts/ipmi/fans.sh @@ -5,8 +5,6 @@ IPMIUSER=ReekyMarko IPMIPW={{@@ env['PASS_IPMI'] @@}} IPMIEK=0000000000000000000000000000000000000000 -mkdir -p /tmp/ipmi - DATA=`ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr get "FAN 1 RPM" "FAN 2 RPM" "FAN 3 RPM" "FAN 4 RPM" "FAN 5 RPM" "FAN 6 RPM" | grep "Sensor Reading" | awk '{ print $4 }'` echo "$DATA" From 476a684319d63b730f7bae58ac6c9911c3393676 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 19 Feb 2020 22:32:28 +0200 Subject: [PATCH 0140/2667] Remove redundant line --- home/Scripts/ipmi/fans.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/home/Scripts/ipmi/fans.sh b/home/Scripts/ipmi/fans.sh index 17dc4b08..c23b4a6b 100755 --- a/home/Scripts/ipmi/fans.sh +++ b/home/Scripts/ipmi/fans.sh @@ -5,8 +5,6 @@ IPMIUSER=ReekyMarko IPMIPW={{@@ env['PASS_IPMI'] @@}} IPMIEK=0000000000000000000000000000000000000000 -mkdir -p /tmp/ipmi - DATA=`ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr get "FAN 1 RPM" "FAN 2 RPM" "FAN 3 RPM" "FAN 4 RPM" "FAN 5 RPM" "FAN 6 RPM" | grep "Sensor Reading" | awk '{ print $4 }'` echo "$DATA" From 2b1e15930181098717129fc56210d446988dd38f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Feb 2020 13:29:54 +0200 Subject: [PATCH 0141/2667] Fix wob --- home/.config/sway/conf.d/05-keybinds.conf | 8 ++++---- home/.config/sway/conf.d/07-exec.conf | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/home/.config/sway/conf.d/05-keybinds.conf b/home/.config/sway/conf.d/05-keybinds.conf index 793fb416..034e5cc1 100644 --- a/home/.config/sway/conf.d/05-keybinds.conf +++ b/home/.config/sway/conf.d/05-keybinds.conf @@ -115,8 +115,8 @@ bindsym $mod+r mode "resize" bindsym $mod+b exec firefox-nightly # media keys -bindsym XF86AudioRaiseVolume exec pamixer -ui 2 && pamixer --get-volume > $SWAYSOCK.wob -bindsym XF86AudioLowerVolume exec pamixer -ud 2 && pamixer --get-volume > $SWAYSOCK.wob +bindsym XF86AudioRaiseVolume exec pamixer -ui 2 && pamixer --get-volume > /tmp/sway.wob +bindsym XF86AudioLowerVolume exec pamixer -ud 2 && pamixer --get-volume > /tmp/sway.wob bindsym --locked XF86AudioMute exec pulseaudio-ctl mute bindsym --locked XF86AudioNext exec playerctl next bindsym --locked XF86AudioPrev exec playerctl previous @@ -135,8 +135,8 @@ bindsym $mod+m+l output eDP-1 transform 90 bindsym $mod+m+k output eDP-1 transform 0 # display brightness -bindsym XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob -bindsym XF86MonBrightnessDown exec light -U 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob +bindsym XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > /tmp/sway.wob +bindsym XF86MonBrightnessDown exec light -U 5 && light -G | cut -d'.' -f1 > /tmp/sway.wob # Switch to urgent workspace bindsym $mod+u [urgent=latest] focus diff --git a/home/.config/sway/conf.d/07-exec.conf b/home/.config/sway/conf.d/07-exec.conf index f4b5ff69..dbaa2533 100644 --- a/home/.config/sway/conf.d/07-exec.conf +++ b/home/.config/sway/conf.d/07-exec.conf @@ -3,6 +3,7 @@ exec { systemctl --user import-environment systemctl --user start sway-session.target + "tail -f /tmp/sway.wob | wob" } exec_always { From bc80c516a98eb3a2fcf2be8c161b86012ef60e3e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Feb 2020 13:29:54 +0200 Subject: [PATCH 0142/2667] Fix wob --- home/.config/sway/conf.d/05-keybinds.conf | 8 ++++---- home/.config/sway/conf.d/07-exec.conf | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/home/.config/sway/conf.d/05-keybinds.conf b/home/.config/sway/conf.d/05-keybinds.conf index 793fb416..034e5cc1 100644 --- a/home/.config/sway/conf.d/05-keybinds.conf +++ b/home/.config/sway/conf.d/05-keybinds.conf @@ -115,8 +115,8 @@ bindsym $mod+r mode "resize" bindsym $mod+b exec firefox-nightly # media keys -bindsym XF86AudioRaiseVolume exec pamixer -ui 2 && pamixer --get-volume > $SWAYSOCK.wob -bindsym XF86AudioLowerVolume exec pamixer -ud 2 && pamixer --get-volume > $SWAYSOCK.wob +bindsym XF86AudioRaiseVolume exec pamixer -ui 2 && pamixer --get-volume > /tmp/sway.wob +bindsym XF86AudioLowerVolume exec pamixer -ud 2 && pamixer --get-volume > /tmp/sway.wob bindsym --locked XF86AudioMute exec pulseaudio-ctl mute bindsym --locked XF86AudioNext exec playerctl next bindsym --locked XF86AudioPrev exec playerctl previous @@ -135,8 +135,8 @@ bindsym $mod+m+l output eDP-1 transform 90 bindsym $mod+m+k output eDP-1 transform 0 # display brightness -bindsym XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob -bindsym XF86MonBrightnessDown exec light -U 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob +bindsym XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > /tmp/sway.wob +bindsym XF86MonBrightnessDown exec light -U 5 && light -G | cut -d'.' -f1 > /tmp/sway.wob # Switch to urgent workspace bindsym $mod+u [urgent=latest] focus diff --git a/home/.config/sway/conf.d/07-exec.conf b/home/.config/sway/conf.d/07-exec.conf index f4b5ff69..dbaa2533 100644 --- a/home/.config/sway/conf.d/07-exec.conf +++ b/home/.config/sway/conf.d/07-exec.conf @@ -3,6 +3,7 @@ exec { systemctl --user import-environment systemctl --user start sway-session.target + "tail -f /tmp/sway.wob | wob" } exec_always { From ec9213bf4f024fa613f334dfceab1986432d1cd2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Feb 2020 13:30:13 +0200 Subject: [PATCH 0143/2667] Add pihole --- docker/pihole/docker-compose.yml | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 docker/pihole/docker-compose.yml diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml new file mode 100644 index 00000000..61e9a196 --- /dev/null +++ b/docker/pihole/docker-compose.yml @@ -0,0 +1,34 @@ +version: "3" + +services: + pihole: + container_name: pihole + image: pihole/pihole:latest + ports: + - "53:53/tcp" + - "53:53/udp" + - "67:67/udp" + - "8053:80/tcp" + environment: + TZ: "Europe/Helsinki" + volumes: + - /docker/pihole/pihole/:/etc/pihole/ + - /docker/pihole/dnsmasq/:/etc/dnsmasq.d/ + - /docker/pihole/log/:/var/log/pihole.log + - /etc/localtime:/etc/localtime:ro + dns: + - 127.0.0.1 + - 1.1.1.1 + cap_add: + - NET_ADMIN + restart: always + labels: + - "traefik.enable=true" + - "traefik.frontend.rule=HostRegexp:pihole.reekynet.lan,{catchall:.*}" + - "traefik.frontend.priority=1" + - "traefik.backend=pihole" + - "traefik.port=80" + +networks: + proxy: + external: true From 44c060ed43b14490353fff74e4710fd8a7ff1661 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Feb 2020 13:30:13 +0200 Subject: [PATCH 0144/2667] Add pihole --- docker/pihole/docker-compose.yml | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 docker/pihole/docker-compose.yml diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml new file mode 100644 index 00000000..61e9a196 --- /dev/null +++ b/docker/pihole/docker-compose.yml @@ -0,0 +1,34 @@ +version: "3" + +services: + pihole: + container_name: pihole + image: pihole/pihole:latest + ports: + - "53:53/tcp" + - "53:53/udp" + - "67:67/udp" + - "8053:80/tcp" + environment: + TZ: "Europe/Helsinki" + volumes: + - /docker/pihole/pihole/:/etc/pihole/ + - /docker/pihole/dnsmasq/:/etc/dnsmasq.d/ + - /docker/pihole/log/:/var/log/pihole.log + - /etc/localtime:/etc/localtime:ro + dns: + - 127.0.0.1 + - 1.1.1.1 + cap_add: + - NET_ADMIN + restart: always + labels: + - "traefik.enable=true" + - "traefik.frontend.rule=HostRegexp:pihole.reekynet.lan,{catchall:.*}" + - "traefik.frontend.priority=1" + - "traefik.backend=pihole" + - "traefik.port=80" + +networks: + proxy: + external: true From 1b1c9230b30cae65ff0230905808a5e9327bce20 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Feb 2020 13:31:00 +0200 Subject: [PATCH 0145/2667] Fix log path --- docker/pihole/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index 61e9a196..fb50628d 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -14,7 +14,7 @@ services: volumes: - /docker/pihole/pihole/:/etc/pihole/ - /docker/pihole/dnsmasq/:/etc/dnsmasq.d/ - - /docker/pihole/log/:/var/log/pihole.log + - /docker/pihole/log/:/var/log/ - /etc/localtime:/etc/localtime:ro dns: - 127.0.0.1 From 07c7f7ce7c5caac1bef7b423b173a3d42a62d916 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Feb 2020 13:31:00 +0200 Subject: [PATCH 0146/2667] Fix log path --- docker/pihole/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index 61e9a196..fb50628d 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -14,7 +14,7 @@ services: volumes: - /docker/pihole/pihole/:/etc/pihole/ - /docker/pihole/dnsmasq/:/etc/dnsmasq.d/ - - /docker/pihole/log/:/var/log/pihole.log + - /docker/pihole/log/:/var/log/ - /etc/localtime:/etc/localtime:ro dns: - 127.0.0.1 From 7f79e67bbec74c4a824a6ec31781ef39db940e9d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Feb 2020 13:31:57 +0200 Subject: [PATCH 0147/2667] Add network --- docker/pihole/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index fb50628d..17f8d6b4 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -2,6 +2,8 @@ version: "3" services: pihole: + networks: + - proxy container_name: pihole image: pihole/pihole:latest ports: From eccaabea5762d245671c9d85a72f2e0d9399b885 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Feb 2020 13:31:57 +0200 Subject: [PATCH 0148/2667] Add network --- docker/pihole/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index fb50628d..17f8d6b4 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -2,6 +2,8 @@ version: "3" services: pihole: + networks: + - proxy container_name: pihole image: pihole/pihole:latest ports: From 598bf3012666d3842649b3adc3e9608880f8f80f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Feb 2020 16:26:15 +0200 Subject: [PATCH 0149/2667] Small fix --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 829c05eb..ef7110d9 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -124,7 +124,7 @@ dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } passync() { pass git pull && pass git push && updatesecrets } # update stuff -plugupdate() { vim +PlugUpgrade +PlugUpdate +CocUpdate +qa && zinit update && $HOME/.tmux/plugins/tpm/bin/update_plugins all } +plugupdate() { vim +PlugUpgrade +PlugUpdate +CocUpdate +qa && zinit self-update && zinit update -p && $HOME/.tmux/plugins/tpm/bin/update_plugins all } update() { yay -Syu --devel firefox-nightly } updateall() { update; plugupdate; sudo awman-update } From 4990dd964500044fb633de7e55fcb84b6182c0a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Feb 2020 16:26:15 +0200 Subject: [PATCH 0150/2667] Small fix --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 829c05eb..ef7110d9 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -124,7 +124,7 @@ dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } passync() { pass git pull && pass git push && updatesecrets } # update stuff -plugupdate() { vim +PlugUpgrade +PlugUpdate +CocUpdate +qa && zinit update && $HOME/.tmux/plugins/tpm/bin/update_plugins all } +plugupdate() { vim +PlugUpgrade +PlugUpdate +CocUpdate +qa && zinit self-update && zinit update -p && $HOME/.tmux/plugins/tpm/bin/update_plugins all } update() { yay -Syu --devel firefox-nightly } updateall() { update; plugupdate; sudo awman-update } From 74a876b40e142bbaf25fbd6f13618727af5b1516 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Feb 2020 18:13:02 +0200 Subject: [PATCH 0151/2667] Add nextcloud --- docker/nextcloud/docker-compose.yml | 74 +++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 docker/nextcloud/docker-compose.yml diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml new file mode 100644 index 00000000..56be37f6 --- /dev/null +++ b/docker/nextcloud/docker-compose.yml @@ -0,0 +1,74 @@ +version: "3" + +services: + nextcloud: + image: nextcloud:apache + container_name: nextcloud + restart: always + networks: + - nextcloud + - proxy + volumes: + - /docker/nextcloud/nextcloud:/var/www/html + - /mnt/Storage/Nextcloud:/var/www/html/data + - /etc/localtime:/etc/localtime:ro + environment: + - TZ=Europe/Helsinki + - MYSQL_HOST=mariadb-nextcloud + - REDIS_HOST=redis + depends_on: + - mariadb-nextcloud + - redis + labels: + - "traefik.enable=true" + + - "traefik.http.routers.nextcloud-redirect.entrypoints=http" + - "traefik.http.routers.nextcloud-redirect.rule=Host(`nextcloud`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.nextcloud-redirect.middlewares=http2https" + + - "traefik.http.routers.nextcloud.entrypoints=https" + - "traefik.http.routers.nextcloud.rule=Host(`nextcloud`)" + - "traefik.http.routers.nextcloud.tls=true" + - "traefik.http.routers.nextcloud.tls.certresolver=http" + - "traefik.http.routers.nextcloud.service=nextcloud" + - "traefik.docker.network=proxy" + - "traefik.http.services.nextcloud.loadbalancer.server.port=80" + + mariadb-nextcloud: + container_name: mariadb-nextcloud + image: mariadb + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW + restart: always + networks: + - nextcloud + environment: + - TZ=Europe/Helsinki + - MYSQL_ROOT_PASSWORD=nextcloud + volumes: + - /docker/nextcloud/mariadb:/var/lib/mysql + - /etc/localtime:/etc/localtime:ro + + redis: + image: redis:alpine + container_name: redis + networks: + - nextcloud + restart: always + + cron: + image: nextcloud:apache + container_name: cron + restart: always + volumes: + - nextcloud:/var/www/html + entrypoint: /cron.sh + depends_on: + - mariadb-nextcloud + - redis + +networks: + nextcloud: + external: false + proxy: + external: true From cd57e22c9827a7c10dd3ef47040d0032e759c7dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Feb 2020 18:13:02 +0200 Subject: [PATCH 0152/2667] Add nextcloud --- docker/nextcloud/docker-compose.yml | 74 +++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 docker/nextcloud/docker-compose.yml diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml new file mode 100644 index 00000000..56be37f6 --- /dev/null +++ b/docker/nextcloud/docker-compose.yml @@ -0,0 +1,74 @@ +version: "3" + +services: + nextcloud: + image: nextcloud:apache + container_name: nextcloud + restart: always + networks: + - nextcloud + - proxy + volumes: + - /docker/nextcloud/nextcloud:/var/www/html + - /mnt/Storage/Nextcloud:/var/www/html/data + - /etc/localtime:/etc/localtime:ro + environment: + - TZ=Europe/Helsinki + - MYSQL_HOST=mariadb-nextcloud + - REDIS_HOST=redis + depends_on: + - mariadb-nextcloud + - redis + labels: + - "traefik.enable=true" + + - "traefik.http.routers.nextcloud-redirect.entrypoints=http" + - "traefik.http.routers.nextcloud-redirect.rule=Host(`nextcloud`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.nextcloud-redirect.middlewares=http2https" + + - "traefik.http.routers.nextcloud.entrypoints=https" + - "traefik.http.routers.nextcloud.rule=Host(`nextcloud`)" + - "traefik.http.routers.nextcloud.tls=true" + - "traefik.http.routers.nextcloud.tls.certresolver=http" + - "traefik.http.routers.nextcloud.service=nextcloud" + - "traefik.docker.network=proxy" + - "traefik.http.services.nextcloud.loadbalancer.server.port=80" + + mariadb-nextcloud: + container_name: mariadb-nextcloud + image: mariadb + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW + restart: always + networks: + - nextcloud + environment: + - TZ=Europe/Helsinki + - MYSQL_ROOT_PASSWORD=nextcloud + volumes: + - /docker/nextcloud/mariadb:/var/lib/mysql + - /etc/localtime:/etc/localtime:ro + + redis: + image: redis:alpine + container_name: redis + networks: + - nextcloud + restart: always + + cron: + image: nextcloud:apache + container_name: cron + restart: always + volumes: + - nextcloud:/var/www/html + entrypoint: /cron.sh + depends_on: + - mariadb-nextcloud + - redis + +networks: + nextcloud: + external: false + proxy: + external: true From 8b4e6a53c80b154f1de7f785f352579294de8681 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Feb 2020 18:14:13 +0200 Subject: [PATCH 0153/2667] Fix cron volume --- docker/nextcloud/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index 56be37f6..bf4f5880 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -61,7 +61,7 @@ services: container_name: cron restart: always volumes: - - nextcloud:/var/www/html + - /docker/nextcloud/nextcloud:/var/www/html entrypoint: /cron.sh depends_on: - mariadb-nextcloud From 5a219b0949ac0819186c944c6f3d77bf9d9cae53 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Feb 2020 18:14:13 +0200 Subject: [PATCH 0154/2667] Fix cron volume --- docker/nextcloud/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index 56be37f6..bf4f5880 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -61,7 +61,7 @@ services: container_name: cron restart: always volumes: - - nextcloud:/var/www/html + - /docker/nextcloud/nextcloud:/var/www/html entrypoint: /cron.sh depends_on: - mariadb-nextcloud From 72b9a4a30fcf80dc5e236bc0544415250f4260ce Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Feb 2020 18:17:54 +0200 Subject: [PATCH 0155/2667] Expose port --- docker/nextcloud/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index bf4f5880..45f73f73 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -5,6 +5,8 @@ services: image: nextcloud:apache container_name: nextcloud restart: always + ports: + - "1869:80" networks: - nextcloud - proxy From 4df82f90c285aad3865a6c859e0a84e3f76335aa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Feb 2020 18:17:54 +0200 Subject: [PATCH 0156/2667] Expose port --- docker/nextcloud/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index bf4f5880..45f73f73 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -5,6 +5,8 @@ services: image: nextcloud:apache container_name: nextcloud restart: always + ports: + - "1869:80" networks: - nextcloud - proxy From 5a29344d476035610e7a15e4e6beb6a660653269 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Feb 2020 18:27:47 +0200 Subject: [PATCH 0157/2667] Fix domain --- docker/nextcloud/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index 45f73f73..bb1b73d4 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -25,12 +25,12 @@ services: - "traefik.enable=true" - "traefik.http.routers.nextcloud-redirect.entrypoints=http" - - "traefik.http.routers.nextcloud-redirect.rule=Host(`nextcloud`)" + - "traefik.http.routers.nextcloud-redirect.rule=Host(`cloud.reekynet.com`)" - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - "traefik.http.routers.nextcloud-redirect.middlewares=http2https" - "traefik.http.routers.nextcloud.entrypoints=https" - - "traefik.http.routers.nextcloud.rule=Host(`nextcloud`)" + - "traefik.http.routers.nextcloud.rule=Host(`cloud.reekynet.com`)" - "traefik.http.routers.nextcloud.tls=true" - "traefik.http.routers.nextcloud.tls.certresolver=http" - "traefik.http.routers.nextcloud.service=nextcloud" From 3b09dda0a50d9c85ecc5ec92cf948acf62974f7f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Feb 2020 18:27:47 +0200 Subject: [PATCH 0158/2667] Fix domain --- docker/nextcloud/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index 45f73f73..bb1b73d4 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -25,12 +25,12 @@ services: - "traefik.enable=true" - "traefik.http.routers.nextcloud-redirect.entrypoints=http" - - "traefik.http.routers.nextcloud-redirect.rule=Host(`nextcloud`)" + - "traefik.http.routers.nextcloud-redirect.rule=Host(`cloud.reekynet.com`)" - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - "traefik.http.routers.nextcloud-redirect.middlewares=http2https" - "traefik.http.routers.nextcloud.entrypoints=https" - - "traefik.http.routers.nextcloud.rule=Host(`nextcloud`)" + - "traefik.http.routers.nextcloud.rule=Host(`cloud.reekynet.com`)" - "traefik.http.routers.nextcloud.tls=true" - "traefik.http.routers.nextcloud.tls.certresolver=http" - "traefik.http.routers.nextcloud.service=nextcloud" From 105c7c021dba0e1474af8ad15d27cbc0ea2de602 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Feb 2020 19:44:55 +0200 Subject: [PATCH 0159/2667] Fix uid/gid --- docker/mumble/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml index 9639e686..62da2c65 100644 --- a/docker/mumble/docker-compose.yaml +++ b/docker/mumble/docker-compose.yaml @@ -4,7 +4,7 @@ services: mumble: container_name: mumble image: phlak/mumble - user: '${UID}:${GID}' + user: '1000:985' environment: - TZ=Europe/Helsinki ports: From a3de0e2713cd51df1b1899c00ecf4936978d2512 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Feb 2020 19:44:55 +0200 Subject: [PATCH 0160/2667] Fix uid/gid --- docker/mumble/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml index 9639e686..62da2c65 100644 --- a/docker/mumble/docker-compose.yaml +++ b/docker/mumble/docker-compose.yaml @@ -4,7 +4,7 @@ services: mumble: container_name: mumble image: phlak/mumble - user: '${UID}:${GID}' + user: '1000:985' environment: - TZ=Europe/Helsinki ports: From ac5ca6404c5d94dcefa8261746d377ee0698f008 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 12:42:31 +0200 Subject: [PATCH 0161/2667] Change network_mode to host --- docker/mumble/docker-compose.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml index 62da2c65..163f08aa 100644 --- a/docker/mumble/docker-compose.yaml +++ b/docker/mumble/docker-compose.yaml @@ -1,15 +1,13 @@ -version: '3' +version: "3" services: mumble: container_name: mumble image: phlak/mumble - user: '1000:985' + user: "1000:985" environment: - TZ=Europe/Helsinki - ports: - - '64748:64738' - - '64748:64738/udp' + network_mode: host volumes: - /docker/mumble:/etc/mumble - /etc/localtime:/etc/localtime:ro From 5e247a343a5d4abefc57f29c296efb266a5899e0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 12:42:31 +0200 Subject: [PATCH 0162/2667] Change network_mode to host --- docker/mumble/docker-compose.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml index 62da2c65..163f08aa 100644 --- a/docker/mumble/docker-compose.yaml +++ b/docker/mumble/docker-compose.yaml @@ -1,15 +1,13 @@ -version: '3' +version: "3" services: mumble: container_name: mumble image: phlak/mumble - user: '1000:985' + user: "1000:985" environment: - TZ=Europe/Helsinki - ports: - - '64748:64738' - - '64748:64738/udp' + network_mode: host volumes: - /docker/mumble:/etc/mumble - /etc/localtime:/etc/localtime:ro From 7842b98a7d2b217593045f0e2be81ee56c938b50 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:09:51 +0200 Subject: [PATCH 0163/2667] Add minecraft server --- docker/minecraft/docker-compose.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 docker/minecraft/docker-compose.yml diff --git a/docker/minecraft/docker-compose.yml b/docker/minecraft/docker-compose.yml new file mode 100644 index 00000000..7f362cd7 --- /dev/null +++ b/docker/minecraft/docker-compose.yml @@ -0,0 +1,15 @@ +version: "3" + +services: + mumble: + container_name: minecraft + image: bbriggs/bukkit + environment: + - TZ=Europe/Helsinki + - EULA=true + ports: + - "25565:25565" + volumes: + - /docker/minecraft:/data + - /etc/localtime:/etc/localtime:ro + restart: always From 8a0f94f8ccdb36ebc765ae1cbcea057a37249951 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:09:51 +0200 Subject: [PATCH 0164/2667] Add minecraft server --- docker/minecraft/docker-compose.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 docker/minecraft/docker-compose.yml diff --git a/docker/minecraft/docker-compose.yml b/docker/minecraft/docker-compose.yml new file mode 100644 index 00000000..7f362cd7 --- /dev/null +++ b/docker/minecraft/docker-compose.yml @@ -0,0 +1,15 @@ +version: "3" + +services: + mumble: + container_name: minecraft + image: bbriggs/bukkit + environment: + - TZ=Europe/Helsinki + - EULA=true + ports: + - "25565:25565" + volumes: + - /docker/minecraft:/data + - /etc/localtime:/etc/localtime:ro + restart: always From 5c018f8a0e0b606223a0f3252a86a733508197b3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:10:49 +0200 Subject: [PATCH 0165/2667] Fix name --- docker/minecraft/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/minecraft/docker-compose.yml b/docker/minecraft/docker-compose.yml index 7f362cd7..352da7b3 100644 --- a/docker/minecraft/docker-compose.yml +++ b/docker/minecraft/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - mumble: + minecraft: container_name: minecraft image: bbriggs/bukkit environment: From 917911cf77e079339b6e0c1c27361e9b8e6ad95d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:10:49 +0200 Subject: [PATCH 0166/2667] Fix name --- docker/minecraft/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/minecraft/docker-compose.yml b/docker/minecraft/docker-compose.yml index 7f362cd7..352da7b3 100644 --- a/docker/minecraft/docker-compose.yml +++ b/docker/minecraft/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - mumble: + minecraft: container_name: minecraft image: bbriggs/bukkit environment: From 8b52197e8127886c66649e050734d1f940c8b8db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:17:33 +0200 Subject: [PATCH 0167/2667] Small fix --- docker/minecraft/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/minecraft/docker-compose.yml b/docker/minecraft/docker-compose.yml index 352da7b3..fb499d82 100644 --- a/docker/minecraft/docker-compose.yml +++ b/docker/minecraft/docker-compose.yml @@ -4,6 +4,7 @@ services: minecraft: container_name: minecraft image: bbriggs/bukkit + command: spigot environment: - TZ=Europe/Helsinki - EULA=true From db06e4e081e157341a219fd6d4771d705a0cd5ed Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:17:33 +0200 Subject: [PATCH 0168/2667] Small fix --- docker/minecraft/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/minecraft/docker-compose.yml b/docker/minecraft/docker-compose.yml index 352da7b3..fb499d82 100644 --- a/docker/minecraft/docker-compose.yml +++ b/docker/minecraft/docker-compose.yml @@ -4,6 +4,7 @@ services: minecraft: container_name: minecraft image: bbriggs/bukkit + command: spigot environment: - TZ=Europe/Helsinki - EULA=true From 6b163f79ca2295550d32dc566169a1425a18a32d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:20:29 +0200 Subject: [PATCH 0169/2667] Add tag --- docker/minecraft/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/minecraft/docker-compose.yml b/docker/minecraft/docker-compose.yml index fb499d82..78c6614b 100644 --- a/docker/minecraft/docker-compose.yml +++ b/docker/minecraft/docker-compose.yml @@ -3,7 +3,7 @@ version: "3" services: minecraft: container_name: minecraft - image: bbriggs/bukkit + image: bbriggs/bukkit/1.15.1 command: spigot environment: - TZ=Europe/Helsinki From 9eb2379017b85ad9a767189a688f230f6005e719 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:20:29 +0200 Subject: [PATCH 0170/2667] Add tag --- docker/minecraft/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/minecraft/docker-compose.yml b/docker/minecraft/docker-compose.yml index fb499d82..78c6614b 100644 --- a/docker/minecraft/docker-compose.yml +++ b/docker/minecraft/docker-compose.yml @@ -3,7 +3,7 @@ version: "3" services: minecraft: container_name: minecraft - image: bbriggs/bukkit + image: bbriggs/bukkit/1.15.1 command: spigot environment: - TZ=Europe/Helsinki From 35b981044c78c2bf4e7a6c702851d20444048f95 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:43:18 +0200 Subject: [PATCH 0171/2667] Change image --- docker/minecraft/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/minecraft/docker-compose.yml b/docker/minecraft/docker-compose.yml index 78c6614b..95676def 100644 --- a/docker/minecraft/docker-compose.yml +++ b/docker/minecraft/docker-compose.yml @@ -3,7 +3,7 @@ version: "3" services: minecraft: container_name: minecraft - image: bbriggs/bukkit/1.15.1 + image: c2d6e524006b command: spigot environment: - TZ=Europe/Helsinki From 86fb836bb2176f3415dec3e027c6bb9faa130b38 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:43:18 +0200 Subject: [PATCH 0172/2667] Change image --- docker/minecraft/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/minecraft/docker-compose.yml b/docker/minecraft/docker-compose.yml index 78c6614b..95676def 100644 --- a/docker/minecraft/docker-compose.yml +++ b/docker/minecraft/docker-compose.yml @@ -3,7 +3,7 @@ version: "3" services: minecraft: container_name: minecraft - image: bbriggs/bukkit/1.15.1 + image: c2d6e524006b command: spigot environment: - TZ=Europe/Helsinki From 60279079cc0180f51c25d492c1ac3952f64de193 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:44:39 +0200 Subject: [PATCH 0173/2667] Fix typo --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index ef7110d9..7101d14c 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -168,7 +168,7 @@ blkid() { grc blkid $@ } du() { grc du $@ } dnf() { grc dnf $@ } docker() { grc docker $@ } -docke-machine() { grc docker-machine $@ } +docker-machine() { grc docker-machine $@ } env() { grc env $@ } id() { grc id $@ } ip() { grc ip $@ } From e72e2e45dff2487239b98f1ae30c5e1c218ffb1c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:44:39 +0200 Subject: [PATCH 0174/2667] Fix typo --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index ef7110d9..7101d14c 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -168,7 +168,7 @@ blkid() { grc blkid $@ } du() { grc du $@ } dnf() { grc dnf $@ } docker() { grc docker $@ } -docke-machine() { grc docker-machine $@ } +docker-machine() { grc docker-machine $@ } env() { grc env $@ } id() { grc id $@ } ip() { grc ip $@ } From 83bb38e4720be5c8fd814a3154bdaa847a029ff6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:46:37 +0200 Subject: [PATCH 0175/2667] I'll install mc from aur instead --- docker/minecraft/docker-compose.yml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 docker/minecraft/docker-compose.yml diff --git a/docker/minecraft/docker-compose.yml b/docker/minecraft/docker-compose.yml deleted file mode 100644 index 95676def..00000000 --- a/docker/minecraft/docker-compose.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: "3" - -services: - minecraft: - container_name: minecraft - image: c2d6e524006b - command: spigot - environment: - - TZ=Europe/Helsinki - - EULA=true - ports: - - "25565:25565" - volumes: - - /docker/minecraft:/data - - /etc/localtime:/etc/localtime:ro - restart: always From a453cf59483dc53e203e6490b5833e4992466c06 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:46:37 +0200 Subject: [PATCH 0176/2667] I'll install mc from aur instead --- docker/minecraft/docker-compose.yml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 docker/minecraft/docker-compose.yml diff --git a/docker/minecraft/docker-compose.yml b/docker/minecraft/docker-compose.yml deleted file mode 100644 index 95676def..00000000 --- a/docker/minecraft/docker-compose.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: "3" - -services: - minecraft: - container_name: minecraft - image: c2d6e524006b - command: spigot - environment: - - TZ=Europe/Helsinki - - EULA=true - ports: - - "25565:25565" - volumes: - - /docker/minecraft:/data - - /etc/localtime:/etc/localtime:ro - restart: always From f9fed41576e05def4281a0d7782de8a3e8fe1d68 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:37:48 +0200 Subject: [PATCH 0177/2667] Move some sway stuff away from systemd --- home/.config/sway/conf.d/02-bar.conf | 6 ++++++ .../sway/conf.d/{02-input.conf => 03-input.conf} | 0 .../sway/conf.d/{03-output.conf => 04-output.conf} | 0 .../conf.d/{04-workspaces.conf => 05-workspaces.conf} | 0 .../conf.d/{05-keybinds.conf => 06-keybinds.conf} | 0 .../conf.d/{06-appearance.conf => 07-appearance.conf} | 0 .../sway/conf.d/{07-exec.conf => 08-exec.conf} | 11 ++++++++--- home/Scripts/sway-exit.sh | 2 +- 8 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 home/.config/sway/conf.d/02-bar.conf rename home/.config/sway/conf.d/{02-input.conf => 03-input.conf} (100%) rename home/.config/sway/conf.d/{03-output.conf => 04-output.conf} (100%) rename home/.config/sway/conf.d/{04-workspaces.conf => 05-workspaces.conf} (100%) rename home/.config/sway/conf.d/{05-keybinds.conf => 06-keybinds.conf} (100%) rename home/.config/sway/conf.d/{06-appearance.conf => 07-appearance.conf} (100%) rename home/.config/sway/conf.d/{07-exec.conf => 08-exec.conf} (69%) diff --git a/home/.config/sway/conf.d/02-bar.conf b/home/.config/sway/conf.d/02-bar.conf new file mode 100644 index 00000000..645edb4f --- /dev/null +++ b/home/.config/sway/conf.d/02-bar.conf @@ -0,0 +1,6 @@ +# vim:ft=i3config + +bar { + swaybar_command waybar + output eDP-1 +} diff --git a/home/.config/sway/conf.d/02-input.conf b/home/.config/sway/conf.d/03-input.conf similarity index 100% rename from home/.config/sway/conf.d/02-input.conf rename to home/.config/sway/conf.d/03-input.conf diff --git a/home/.config/sway/conf.d/03-output.conf b/home/.config/sway/conf.d/04-output.conf similarity index 100% rename from home/.config/sway/conf.d/03-output.conf rename to home/.config/sway/conf.d/04-output.conf diff --git a/home/.config/sway/conf.d/04-workspaces.conf b/home/.config/sway/conf.d/05-workspaces.conf similarity index 100% rename from home/.config/sway/conf.d/04-workspaces.conf rename to home/.config/sway/conf.d/05-workspaces.conf diff --git a/home/.config/sway/conf.d/05-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf similarity index 100% rename from home/.config/sway/conf.d/05-keybinds.conf rename to home/.config/sway/conf.d/06-keybinds.conf diff --git a/home/.config/sway/conf.d/06-appearance.conf b/home/.config/sway/conf.d/07-appearance.conf similarity index 100% rename from home/.config/sway/conf.d/06-appearance.conf rename to home/.config/sway/conf.d/07-appearance.conf diff --git a/home/.config/sway/conf.d/07-exec.conf b/home/.config/sway/conf.d/08-exec.conf similarity index 69% rename from home/.config/sway/conf.d/07-exec.conf rename to home/.config/sway/conf.d/08-exec.conf index dbaa2533..94996c8d 100644 --- a/home/.config/sway/conf.d/07-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -1,9 +1,14 @@ # vim:ft=i3config exec { - systemctl --user import-environment - systemctl --user start sway-session.target - "tail -f /tmp/sway.wob | wob" + $HOME/Scripts/swayidle.sh + autotiling + redshift-gtk -m wayland + telegram-desktop + kdeconnect-indicator + thunderbird + mkfifo /tmp/sway.wob && tail -f /tmp/sway.wob | wob + mako } exec_always { diff --git a/home/Scripts/sway-exit.sh b/home/Scripts/sway-exit.sh index f25ab74f..87f28905 100755 --- a/home/Scripts/sway-exit.sh +++ b/home/Scripts/sway-exit.sh @@ -23,7 +23,7 @@ case "$RESP" in loginctl lock-session $(loginctl show-user $USER -p Sessions | cut -d'=' -f2) ;; Exit) - systemctl --user stop sway + swaymsg exit ;; *) exit 1 From ed3ef91c56db6dfb373246d140d42d1b94610803 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:37:48 +0200 Subject: [PATCH 0178/2667] Move some sway stuff away from systemd --- home/.config/sway/conf.d/02-bar.conf | 6 ++++++ .../sway/conf.d/{02-input.conf => 03-input.conf} | 0 .../sway/conf.d/{03-output.conf => 04-output.conf} | 0 .../conf.d/{04-workspaces.conf => 05-workspaces.conf} | 0 .../conf.d/{05-keybinds.conf => 06-keybinds.conf} | 0 .../conf.d/{06-appearance.conf => 07-appearance.conf} | 0 .../sway/conf.d/{07-exec.conf => 08-exec.conf} | 11 ++++++++--- home/Scripts/sway-exit.sh | 2 +- 8 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 home/.config/sway/conf.d/02-bar.conf rename home/.config/sway/conf.d/{02-input.conf => 03-input.conf} (100%) rename home/.config/sway/conf.d/{03-output.conf => 04-output.conf} (100%) rename home/.config/sway/conf.d/{04-workspaces.conf => 05-workspaces.conf} (100%) rename home/.config/sway/conf.d/{05-keybinds.conf => 06-keybinds.conf} (100%) rename home/.config/sway/conf.d/{06-appearance.conf => 07-appearance.conf} (100%) rename home/.config/sway/conf.d/{07-exec.conf => 08-exec.conf} (69%) diff --git a/home/.config/sway/conf.d/02-bar.conf b/home/.config/sway/conf.d/02-bar.conf new file mode 100644 index 00000000..645edb4f --- /dev/null +++ b/home/.config/sway/conf.d/02-bar.conf @@ -0,0 +1,6 @@ +# vim:ft=i3config + +bar { + swaybar_command waybar + output eDP-1 +} diff --git a/home/.config/sway/conf.d/02-input.conf b/home/.config/sway/conf.d/03-input.conf similarity index 100% rename from home/.config/sway/conf.d/02-input.conf rename to home/.config/sway/conf.d/03-input.conf diff --git a/home/.config/sway/conf.d/03-output.conf b/home/.config/sway/conf.d/04-output.conf similarity index 100% rename from home/.config/sway/conf.d/03-output.conf rename to home/.config/sway/conf.d/04-output.conf diff --git a/home/.config/sway/conf.d/04-workspaces.conf b/home/.config/sway/conf.d/05-workspaces.conf similarity index 100% rename from home/.config/sway/conf.d/04-workspaces.conf rename to home/.config/sway/conf.d/05-workspaces.conf diff --git a/home/.config/sway/conf.d/05-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf similarity index 100% rename from home/.config/sway/conf.d/05-keybinds.conf rename to home/.config/sway/conf.d/06-keybinds.conf diff --git a/home/.config/sway/conf.d/06-appearance.conf b/home/.config/sway/conf.d/07-appearance.conf similarity index 100% rename from home/.config/sway/conf.d/06-appearance.conf rename to home/.config/sway/conf.d/07-appearance.conf diff --git a/home/.config/sway/conf.d/07-exec.conf b/home/.config/sway/conf.d/08-exec.conf similarity index 69% rename from home/.config/sway/conf.d/07-exec.conf rename to home/.config/sway/conf.d/08-exec.conf index dbaa2533..94996c8d 100644 --- a/home/.config/sway/conf.d/07-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -1,9 +1,14 @@ # vim:ft=i3config exec { - systemctl --user import-environment - systemctl --user start sway-session.target - "tail -f /tmp/sway.wob | wob" + $HOME/Scripts/swayidle.sh + autotiling + redshift-gtk -m wayland + telegram-desktop + kdeconnect-indicator + thunderbird + mkfifo /tmp/sway.wob && tail -f /tmp/sway.wob | wob + mako } exec_always { diff --git a/home/Scripts/sway-exit.sh b/home/Scripts/sway-exit.sh index f25ab74f..87f28905 100755 --- a/home/Scripts/sway-exit.sh +++ b/home/Scripts/sway-exit.sh @@ -23,7 +23,7 @@ case "$RESP" in loginctl lock-session $(loginctl show-user $USER -p Sessions | cut -d'=' -f2) ;; Exit) - systemctl --user stop sway + swaymsg exit ;; *) exit 1 From e8c8c11c7f479ea51d49aa95b086fce86e50983f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:38:10 +0200 Subject: [PATCH 0179/2667] Add syncthing volume --- docker/nextcloud/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index bb1b73d4..799f8706 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -13,6 +13,7 @@ services: volumes: - /docker/nextcloud/nextcloud:/var/www/html - /mnt/Storage/Nextcloud:/var/www/html/data + - /mnt/Storage/Syncthing:/Syncthing - /etc/localtime:/etc/localtime:ro environment: - TZ=Europe/Helsinki From f88680995d53cd3f4007f7794ff47dff4083a63d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:38:10 +0200 Subject: [PATCH 0180/2667] Add syncthing volume --- docker/nextcloud/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index bb1b73d4..799f8706 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -13,6 +13,7 @@ services: volumes: - /docker/nextcloud/nextcloud:/var/www/html - /mnt/Storage/Nextcloud:/var/www/html/data + - /mnt/Storage/Syncthing:/Syncthing - /etc/localtime:/etc/localtime:ro environment: - TZ=Europe/Helsinki From fcd29e1cec9b2479093d64a35e547df165abb9f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:38:33 +0200 Subject: [PATCH 0181/2667] Redo mpvqueue script --- home/Scripts/mpvqueue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/home/Scripts/mpvqueue b/home/Scripts/mpvqueue index d55fcca7..a3fe6d96 100755 --- a/home/Scripts/mpvqueue +++ b/home/Scripts/mpvqueue @@ -4,11 +4,11 @@ MPVPIPE=/tmp/mpvqueue.playlist notify="notify-send -i mpv -a mpv" -# if link is a youtube playlist, open recursively -if [[ ${1} =~ (^.*(youtu.be\/|list=)([^#\&\?]*).*) ]]; then - $notify "Adding playlist ${@}" - /usr/local/bin/mpvqueue $(youtube-dl -j --flat-playlist "${1}" | jq -r '.id' | sed 's_^_https://youtube.com/watch?v=_') - exit +# if link is a youtube playlist, clean up url +if [[ ${1} =~ /^((?:https?:)?\/\/)?((?:www|m)\.)?((?:youtube\.com|youtu.be))(\/(?:[\w\-]+\?v=|embed\/|v\/)?)([\w\-]+)(\S+)?$ ]]; then + url="https://youtube.com/playlist?list=${1#*list=}" +else + url="$1" fi # See if MPV is already running @@ -18,16 +18,16 @@ if [ -z "$(pidof mpv)" ]; then rm -f $MPVPIPE && mkfifo $MPVPIPE # start mpv - /usr/bin/mpv --no-terminal --input-file="${MPVPIPE}" "${@}" & disown + /usr/bin/mpv --no-terminal --input-file="${MPVPIPE}" "$url" & disown # Wait for mpv to be up before moving on to adding anything else to playlist while [ -z "$(pidof mpv)" ]; do sleep 1 done - $notify "Playing ${@}" + $notify "Playing $url" else # mpv is running, so add stuff to playlist - $notify "Adding ${@}" - echo "loadfile \"${@}\" append-play" >> "${MPVPIPE}" + $notify "Adding $url" + echo "loadfile \"$url\" append-play" >> "${MPVPIPE}" fi From 6e324e4c6b6d209381c22e43e4427df277ff8727 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:38:33 +0200 Subject: [PATCH 0182/2667] Redo mpvqueue script --- home/Scripts/mpvqueue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/home/Scripts/mpvqueue b/home/Scripts/mpvqueue index d55fcca7..a3fe6d96 100755 --- a/home/Scripts/mpvqueue +++ b/home/Scripts/mpvqueue @@ -4,11 +4,11 @@ MPVPIPE=/tmp/mpvqueue.playlist notify="notify-send -i mpv -a mpv" -# if link is a youtube playlist, open recursively -if [[ ${1} =~ (^.*(youtu.be\/|list=)([^#\&\?]*).*) ]]; then - $notify "Adding playlist ${@}" - /usr/local/bin/mpvqueue $(youtube-dl -j --flat-playlist "${1}" | jq -r '.id' | sed 's_^_https://youtube.com/watch?v=_') - exit +# if link is a youtube playlist, clean up url +if [[ ${1} =~ /^((?:https?:)?\/\/)?((?:www|m)\.)?((?:youtube\.com|youtu.be))(\/(?:[\w\-]+\?v=|embed\/|v\/)?)([\w\-]+)(\S+)?$ ]]; then + url="https://youtube.com/playlist?list=${1#*list=}" +else + url="$1" fi # See if MPV is already running @@ -18,16 +18,16 @@ if [ -z "$(pidof mpv)" ]; then rm -f $MPVPIPE && mkfifo $MPVPIPE # start mpv - /usr/bin/mpv --no-terminal --input-file="${MPVPIPE}" "${@}" & disown + /usr/bin/mpv --no-terminal --input-file="${MPVPIPE}" "$url" & disown # Wait for mpv to be up before moving on to adding anything else to playlist while [ -z "$(pidof mpv)" ]; do sleep 1 done - $notify "Playing ${@}" + $notify "Playing $url" else # mpv is running, so add stuff to playlist - $notify "Adding ${@}" - echo "loadfile \"${@}\" append-play" >> "${MPVPIPE}" + $notify "Adding $url" + echo "loadfile \"$url\" append-play" >> "${MPVPIPE}" fi From 2049c855fecdaa17be6347101d2542c8df5c38e3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:43:38 +0200 Subject: [PATCH 0183/2667] Add zprofile back to mirkwood --- config-home.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config-home.yaml b/config-home.yaml index 3d1aaecb..31ba3b92 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -196,6 +196,7 @@ profiles: - f_mimeo_associations.txt - f_tdesktop_lang.strings - f_fonts.conf + - f_zprofile Pacman: dotfiles: - f_yay_config.json From a275c099b6acd5978229f44ea79c0d1d6c3c6373 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:43:38 +0200 Subject: [PATCH 0184/2667] Add zprofile back to mirkwood --- config-home.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config-home.yaml b/config-home.yaml index 3d1aaecb..31ba3b92 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -196,6 +196,7 @@ profiles: - f_mimeo_associations.txt - f_tdesktop_lang.strings - f_fonts.conf + - f_zprofile Pacman: dotfiles: - f_yay_config.json From 2a36a1e32fe5b3157ea55203cf8c56eecf98906f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:48:34 +0200 Subject: [PATCH 0185/2667] Small changes --- home/.config/systemd/user/ydotoold.service | 5 ++--- home/.zprofile | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/home/.config/systemd/user/ydotoold.service b/home/.config/systemd/user/ydotoold.service index 9e0cda73..2832af66 100644 --- a/home/.config/systemd/user/ydotoold.service +++ b/home/.config/systemd/user/ydotoold.service @@ -1,10 +1,9 @@ [Unit] Description=Generic command-line automation tool -PartOf=graphical-session.target [Service] -Type=simple ExecStart=/usr/bin/ydotoold +Restart=on-failure [Install] -WantedBy=sway-session.target +WantedBy=default.target diff --git a/home/.zprofile b/home/.zprofile index c7215bd7..7131b02d 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1 +1 @@ -[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway > /dev/null 2>&1 +[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && source ~/.config/sway/env && sway > /dev/null 2>&1 From 5d031ac2497d1461328c2c8b574820803326e957 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:48:34 +0200 Subject: [PATCH 0186/2667] Small changes --- home/.config/systemd/user/ydotoold.service | 5 ++--- home/.zprofile | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/home/.config/systemd/user/ydotoold.service b/home/.config/systemd/user/ydotoold.service index 9e0cda73..2832af66 100644 --- a/home/.config/systemd/user/ydotoold.service +++ b/home/.config/systemd/user/ydotoold.service @@ -1,10 +1,9 @@ [Unit] Description=Generic command-line automation tool -PartOf=graphical-session.target [Service] -Type=simple ExecStart=/usr/bin/ydotoold +Restart=on-failure [Install] -WantedBy=sway-session.target +WantedBy=default.target diff --git a/home/.zprofile b/home/.zprofile index c7215bd7..7131b02d 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1 +1 @@ -[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway > /dev/null 2>&1 +[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && source ~/.config/sway/env && sway > /dev/null 2>&1 From 45577ddd37f71d1a0ce7d340c02402e5876f77b0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:49:14 +0200 Subject: [PATCH 0187/2667] Added music volume --- docker/nextcloud/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index 799f8706..9a85368e 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -14,6 +14,7 @@ services: - /docker/nextcloud/nextcloud:/var/www/html - /mnt/Storage/Nextcloud:/var/www/html/data - /mnt/Storage/Syncthing:/Syncthing + - /mnt/Storage/Media/Music:/Music - /etc/localtime:/etc/localtime:ro environment: - TZ=Europe/Helsinki From 26069003d8a06e9a48d9126126c6fc3c72899c6e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:49:14 +0200 Subject: [PATCH 0188/2667] Added music volume --- docker/nextcloud/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index 799f8706..9a85368e 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -14,6 +14,7 @@ services: - /docker/nextcloud/nextcloud:/var/www/html - /mnt/Storage/Nextcloud:/var/www/html/data - /mnt/Storage/Syncthing:/Syncthing + - /mnt/Storage/Media/Music:/Music - /etc/localtime:/etc/localtime:ro environment: - TZ=Europe/Helsinki From d3de793962e13323deedaf8afb68b1d3e55a733c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 13:29:23 +0200 Subject: [PATCH 0189/2667] Fix wob --- home/.config/sway/conf.d/06-keybinds.conf | 13 ++++++------- home/.config/sway/conf.d/08-exec.conf | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 034e5cc1..1bee5b4b 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -23,8 +23,7 @@ bindsym $mod+Shift+r reload bindsym $mod+Shift+o exec mimeo "$(wl-paste)" # turn on and off internal screen -bindsym --locked XF86Search output eDP-1 enable -bindsym --locked Shift+XF86Search output eDP-1 disable +bindsym --locked XF86Search output eDP-1 toggle # FZF # exit menu @@ -115,9 +114,9 @@ bindsym $mod+r mode "resize" bindsym $mod+b exec firefox-nightly # media keys -bindsym XF86AudioRaiseVolume exec pamixer -ui 2 && pamixer --get-volume > /tmp/sway.wob -bindsym XF86AudioLowerVolume exec pamixer -ud 2 && pamixer --get-volume > /tmp/sway.wob -bindsym --locked XF86AudioMute exec pulseaudio-ctl mute +bindsym XF86AudioRaiseVolume exec pamixer -ui 2 && pamixer --get-volume > $SWAYSOCK.wob +bindsym XF86AudioLowerVolume exec pamixer -ud 2 && pamixer --get-volume > $SWAYSOCK.wob +bindsym XF86AudioMute exec pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob bindsym --locked XF86AudioNext exec playerctl next bindsym --locked XF86AudioPrev exec playerctl previous bindsym --locked XF86AudioPlay exec playerctl play-pause @@ -135,8 +134,8 @@ bindsym $mod+m+l output eDP-1 transform 90 bindsym $mod+m+k output eDP-1 transform 0 # display brightness -bindsym XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > /tmp/sway.wob -bindsym XF86MonBrightnessDown exec light -U 5 && light -G | cut -d'.' -f1 > /tmp/sway.wob +bindsym XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob +bindsym XF86MonBrightnessDown exec light -U 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob # Switch to urgent workspace bindsym $mod+u [urgent=latest] focus diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 94996c8d..76d62035 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -7,8 +7,8 @@ exec { telegram-desktop kdeconnect-indicator thunderbird - mkfifo /tmp/sway.wob && tail -f /tmp/sway.wob | wob mako + mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob } exec_always { From fde871f4104d13b452e08783846b6badbb04da9a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 13:29:23 +0200 Subject: [PATCH 0190/2667] Fix wob --- home/.config/sway/conf.d/06-keybinds.conf | 13 ++++++------- home/.config/sway/conf.d/08-exec.conf | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 034e5cc1..1bee5b4b 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -23,8 +23,7 @@ bindsym $mod+Shift+r reload bindsym $mod+Shift+o exec mimeo "$(wl-paste)" # turn on and off internal screen -bindsym --locked XF86Search output eDP-1 enable -bindsym --locked Shift+XF86Search output eDP-1 disable +bindsym --locked XF86Search output eDP-1 toggle # FZF # exit menu @@ -115,9 +114,9 @@ bindsym $mod+r mode "resize" bindsym $mod+b exec firefox-nightly # media keys -bindsym XF86AudioRaiseVolume exec pamixer -ui 2 && pamixer --get-volume > /tmp/sway.wob -bindsym XF86AudioLowerVolume exec pamixer -ud 2 && pamixer --get-volume > /tmp/sway.wob -bindsym --locked XF86AudioMute exec pulseaudio-ctl mute +bindsym XF86AudioRaiseVolume exec pamixer -ui 2 && pamixer --get-volume > $SWAYSOCK.wob +bindsym XF86AudioLowerVolume exec pamixer -ud 2 && pamixer --get-volume > $SWAYSOCK.wob +bindsym XF86AudioMute exec pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob bindsym --locked XF86AudioNext exec playerctl next bindsym --locked XF86AudioPrev exec playerctl previous bindsym --locked XF86AudioPlay exec playerctl play-pause @@ -135,8 +134,8 @@ bindsym $mod+m+l output eDP-1 transform 90 bindsym $mod+m+k output eDP-1 transform 0 # display brightness -bindsym XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > /tmp/sway.wob -bindsym XF86MonBrightnessDown exec light -U 5 && light -G | cut -d'.' -f1 > /tmp/sway.wob +bindsym XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob +bindsym XF86MonBrightnessDown exec light -U 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob # Switch to urgent workspace bindsym $mod+u [urgent=latest] focus diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 94996c8d..76d62035 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -7,8 +7,8 @@ exec { telegram-desktop kdeconnect-indicator thunderbird - mkfifo /tmp/sway.wob && tail -f /tmp/sway.wob | wob mako + mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob } exec_always { From a49127da0df0e5b295d82a54e2e0ebf3f19633db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 13:30:03 +0200 Subject: [PATCH 0191/2667] Make volume step 1 --- home/.config/sway/conf.d/06-keybinds.conf | 4 ++-- home/.config/waybar/config | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 1bee5b4b..784e1639 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -114,8 +114,8 @@ bindsym $mod+r mode "resize" bindsym $mod+b exec firefox-nightly # media keys -bindsym XF86AudioRaiseVolume exec pamixer -ui 2 && pamixer --get-volume > $SWAYSOCK.wob -bindsym XF86AudioLowerVolume exec pamixer -ud 2 && pamixer --get-volume > $SWAYSOCK.wob +bindsym XF86AudioRaiseVolume exec pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob +bindsym XF86AudioLowerVolume exec pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob bindsym XF86AudioMute exec pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob bindsym --locked XF86AudioNext exec playerctl next bindsym --locked XF86AudioPrev exec playerctl previous diff --git a/home/.config/waybar/config b/home/.config/waybar/config index ea82c4f3..07b88d1d 100644 --- a/home/.config/waybar/config +++ b/home/.config/waybar/config @@ -104,8 +104,8 @@ }, "on-click": "pulseaudio-ctl mute", "on-click-right": "pavucontrol", - "on-scroll-up": "pulseaudio-ctl up", - "on-scroll-down": "pulseaudio-ctl down" + "on-scroll-up": "pulseaudio-ctl up 1", + "on-scroll-down": "pulseaudio-ctl down 1" }, "custom/playerctl": { "tooltip": false, From a2cc1c585edd7b0168350163d0f34f39aff6b6a4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 13:30:03 +0200 Subject: [PATCH 0192/2667] Make volume step 1 --- home/.config/sway/conf.d/06-keybinds.conf | 4 ++-- home/.config/waybar/config | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 1bee5b4b..784e1639 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -114,8 +114,8 @@ bindsym $mod+r mode "resize" bindsym $mod+b exec firefox-nightly # media keys -bindsym XF86AudioRaiseVolume exec pamixer -ui 2 && pamixer --get-volume > $SWAYSOCK.wob -bindsym XF86AudioLowerVolume exec pamixer -ud 2 && pamixer --get-volume > $SWAYSOCK.wob +bindsym XF86AudioRaiseVolume exec pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob +bindsym XF86AudioLowerVolume exec pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob bindsym XF86AudioMute exec pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob bindsym --locked XF86AudioNext exec playerctl next bindsym --locked XF86AudioPrev exec playerctl previous diff --git a/home/.config/waybar/config b/home/.config/waybar/config index ea82c4f3..07b88d1d 100644 --- a/home/.config/waybar/config +++ b/home/.config/waybar/config @@ -104,8 +104,8 @@ }, "on-click": "pulseaudio-ctl mute", "on-click-right": "pavucontrol", - "on-scroll-up": "pulseaudio-ctl up", - "on-scroll-down": "pulseaudio-ctl down" + "on-scroll-up": "pulseaudio-ctl up 1", + "on-scroll-down": "pulseaudio-ctl down 1" }, "custom/playerctl": { "tooltip": false, From ef657d109e80837d4f8f9b71fb328ef2190a2d98 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 13:30:19 +0200 Subject: [PATCH 0193/2667] Small fix --- home/.zprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.zprofile b/home/.zprofile index 7131b02d..c7215bd7 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1 +1 @@ -[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && source ~/.config/sway/env && sway > /dev/null 2>&1 +[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway > /dev/null 2>&1 From 253cea241836988fb0ce7b83cd5be93179178e36 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 13:30:19 +0200 Subject: [PATCH 0194/2667] Small fix --- home/.zprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.zprofile b/home/.zprofile index 7131b02d..c7215bd7 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1 +1 @@ -[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && source ~/.config/sway/env && sway > /dev/null 2>&1 +[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway > /dev/null 2>&1 From 94db3ba86cf5fc277aacafe3d30218d0230132e0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 13:51:13 +0200 Subject: [PATCH 0195/2667] Move env to /etc --- home/.config/sway/env | 19 ------------------- root/etc/environment | 20 +++++++++++++++++++- 2 files changed, 19 insertions(+), 20 deletions(-) delete mode 100644 home/.config/sway/env diff --git a/home/.config/sway/env b/home/.config/sway/env deleted file mode 100644 index 5aa01188..00000000 --- a/home/.config/sway/env +++ /dev/null @@ -1,19 +0,0 @@ -# Fix java on wayland -_JAVA_AWT_WM_NONREPARENTING=1 -_JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' - -# Enable qt5 theming and wayland support -QT_QPA_PLATFORMTHEME=qt5ct -QT_QPA_PLATFORM=wayland-egl -QT_WAYLAND_DISABLE_WINDOWDECORATION=1 - -# Firefox -MOZ_ENABLE_WAYLAND=1 -MOZ_USE_XINPUT2=1 -MOZ_WEBRENDER=1 - -# Fix redshift on wlroots -WLR_DRM_NO_ATOMIC=1 - -# Use wayland in SDL2 -SDL_VIDEODRIVER=wayland diff --git a/root/etc/environment b/root/etc/environment index a5e7f909..5aa01188 100755 --- a/root/etc/environment +++ b/root/etc/environment @@ -1 +1,19 @@ -XDG_SESSION_TYPE=wayland +# Fix java on wayland +_JAVA_AWT_WM_NONREPARENTING=1 +_JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' + +# Enable qt5 theming and wayland support +QT_QPA_PLATFORMTHEME=qt5ct +QT_QPA_PLATFORM=wayland-egl +QT_WAYLAND_DISABLE_WINDOWDECORATION=1 + +# Firefox +MOZ_ENABLE_WAYLAND=1 +MOZ_USE_XINPUT2=1 +MOZ_WEBRENDER=1 + +# Fix redshift on wlroots +WLR_DRM_NO_ATOMIC=1 + +# Use wayland in SDL2 +SDL_VIDEODRIVER=wayland From e1eb5a38d16cacfb080c0f843291ce97d46908f9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 13:51:13 +0200 Subject: [PATCH 0196/2667] Move env to /etc --- home/.config/sway/env | 19 ------------------- root/etc/environment | 20 +++++++++++++++++++- 2 files changed, 19 insertions(+), 20 deletions(-) delete mode 100644 home/.config/sway/env diff --git a/home/.config/sway/env b/home/.config/sway/env deleted file mode 100644 index 5aa01188..00000000 --- a/home/.config/sway/env +++ /dev/null @@ -1,19 +0,0 @@ -# Fix java on wayland -_JAVA_AWT_WM_NONREPARENTING=1 -_JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' - -# Enable qt5 theming and wayland support -QT_QPA_PLATFORMTHEME=qt5ct -QT_QPA_PLATFORM=wayland-egl -QT_WAYLAND_DISABLE_WINDOWDECORATION=1 - -# Firefox -MOZ_ENABLE_WAYLAND=1 -MOZ_USE_XINPUT2=1 -MOZ_WEBRENDER=1 - -# Fix redshift on wlroots -WLR_DRM_NO_ATOMIC=1 - -# Use wayland in SDL2 -SDL_VIDEODRIVER=wayland diff --git a/root/etc/environment b/root/etc/environment index a5e7f909..5aa01188 100755 --- a/root/etc/environment +++ b/root/etc/environment @@ -1 +1,19 @@ -XDG_SESSION_TYPE=wayland +# Fix java on wayland +_JAVA_AWT_WM_NONREPARENTING=1 +_JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' + +# Enable qt5 theming and wayland support +QT_QPA_PLATFORMTHEME=qt5ct +QT_QPA_PLATFORM=wayland-egl +QT_WAYLAND_DISABLE_WINDOWDECORATION=1 + +# Firefox +MOZ_ENABLE_WAYLAND=1 +MOZ_USE_XINPUT2=1 +MOZ_WEBRENDER=1 + +# Fix redshift on wlroots +WLR_DRM_NO_ATOMIC=1 + +# Use wayland in SDL2 +SDL_VIDEODRIVER=wayland From 0d0c0e876d80782d7285597aa1a186709a69be81 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 16:54:13 +0200 Subject: [PATCH 0197/2667] Make mpdris depend on mpv --- home/.config/systemd/user/mpDris2.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/systemd/user/mpDris2.service b/home/.config/systemd/user/mpDris2.service index bb8eee03..e6b4c18e 100644 --- a/home/.config/systemd/user/mpDris2.service +++ b/home/.config/systemd/user/mpDris2.service @@ -1,10 +1,10 @@ [Unit] Description=MPRIS2 support for MPD -PartOf=graphical-session.target +After=mpd.service [Service] Type=simple ExecStart=/usr/bin/mpDris2 [Install] -WantedBy=sway-session.target +WantedBy=default.target From cb917178373050c49b6216750a4bbb18afaf1199 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 16:54:13 +0200 Subject: [PATCH 0198/2667] Make mpdris depend on mpv --- home/.config/systemd/user/mpDris2.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/systemd/user/mpDris2.service b/home/.config/systemd/user/mpDris2.service index bb8eee03..e6b4c18e 100644 --- a/home/.config/systemd/user/mpDris2.service +++ b/home/.config/systemd/user/mpDris2.service @@ -1,10 +1,10 @@ [Unit] Description=MPRIS2 support for MPD -PartOf=graphical-session.target +After=mpd.service [Service] Type=simple ExecStart=/usr/bin/mpDris2 [Install] -WantedBy=sway-session.target +WantedBy=default.target From d57da904e218e5533e221f000e03bb17450cbbf0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 16:54:32 +0200 Subject: [PATCH 0199/2667] Added archiso download alias --- home/.config/zsh/03-aliases.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 7101d14c..58b303fa 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -143,6 +143,9 @@ alias ls='ls_extended' # default icon for notify-send alias notify-send='notify-send --icon=alarm' +# download archiso +alias archiso='curl "http://mirror.rackspace.com/archlinux/iso/$(date +%Y.%m).01/archlinux-$(date +%Y.%m).01-x86_64.iso"' + # encrypted tar's with zstd compression cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg } From b93f052019ddd4261c2fa748695a3da68c47f0fa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 16:54:32 +0200 Subject: [PATCH 0200/2667] Added archiso download alias --- home/.config/zsh/03-aliases.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 7101d14c..58b303fa 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -143,6 +143,9 @@ alias ls='ls_extended' # default icon for notify-send alias notify-send='notify-send --icon=alarm' +# download archiso +alias archiso='curl "http://mirror.rackspace.com/archlinux/iso/$(date +%Y.%m).01/archlinux-$(date +%Y.%m).01-x86_64.iso"' + # encrypted tar's with zstd compression cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg } From 02ffd643fb43399023e7017c2b202473f9c241e5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 16:54:47 +0200 Subject: [PATCH 0201/2667] Trying out a lower static speed --- home/Scripts/ipmi/static.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/Scripts/ipmi/static.sh b/home/Scripts/ipmi/static.sh index 617dc7bc..cc4bc509 100755 --- a/home/Scripts/ipmi/static.sh +++ b/home/Scripts/ipmi/static.sh @@ -7,4 +7,4 @@ IPMIEK=0000000000000000000000000000000000000000 printf "Activating manual fan speeds! (2160 RPM)" ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x00 -ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x02 0xff 0x11 +ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x02 0xff 0x10 From 35fa6f4d9c4331cab0ddb2ebfe4b564f5c191388 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 16:54:47 +0200 Subject: [PATCH 0202/2667] Trying out a lower static speed --- home/Scripts/ipmi/static.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/Scripts/ipmi/static.sh b/home/Scripts/ipmi/static.sh index 617dc7bc..cc4bc509 100755 --- a/home/Scripts/ipmi/static.sh +++ b/home/Scripts/ipmi/static.sh @@ -7,4 +7,4 @@ IPMIEK=0000000000000000000000000000000000000000 printf "Activating manual fan speeds! (2160 RPM)" ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x00 -ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x02 0xff 0x11 +ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x02 0xff 0x10 From 3d43f4d7e0a37781ded271579320f66a2a3f8279 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 17:43:40 +0200 Subject: [PATCH 0203/2667] Switch to wofi --- home/.config/sway/conf.d/06-keybinds.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 784e1639..fd5fcca3 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -29,7 +29,7 @@ bindsym --locked XF86Search output eDP-1 toggle # exit menu bindsym $mod+Shift+e exec $term --class fzf-launcher -e $HOME/Scripts/sway-exit.sh # launch a program -bindsym $mod+d exec $term --class fzf-launcher --title "FZF Launcher" -e sh -c 'TERMINAL_COMMAND="alacritty -e" sway-launcher-desktop' +bindsym $mod+d exec wofi --show drun # password manager bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass From 0fca4f134242670490087a44a3b825aaa6adede1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 17:43:40 +0200 Subject: [PATCH 0204/2667] Switch to wofi --- home/.config/sway/conf.d/06-keybinds.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 784e1639..fd5fcca3 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -29,7 +29,7 @@ bindsym --locked XF86Search output eDP-1 toggle # exit menu bindsym $mod+Shift+e exec $term --class fzf-launcher -e $HOME/Scripts/sway-exit.sh # launch a program -bindsym $mod+d exec $term --class fzf-launcher --title "FZF Launcher" -e sh -c 'TERMINAL_COMMAND="alacritty -e" sway-launcher-desktop' +bindsym $mod+d exec wofi --show drun # password manager bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass From fd4bec64f244687b06636aee9da7e8661689cb72 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 17:46:20 +0200 Subject: [PATCH 0205/2667] Added wofi mode --- home/.config/sway/conf.d/06-keybinds.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index fd5fcca3..84091f16 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -30,6 +30,7 @@ bindsym --locked XF86Search output eDP-1 toggle bindsym $mod+Shift+e exec $term --class fzf-launcher -e $HOME/Scripts/sway-exit.sh # launch a program bindsym $mod+d exec wofi --show drun +bindsym $mod+Shift+d exec wofi --show drun # password manager bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass From 05cc525b97ebb940d2b4545d3ce7066808a462fb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 17:46:20 +0200 Subject: [PATCH 0206/2667] Added wofi mode --- home/.config/sway/conf.d/06-keybinds.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index fd5fcca3..84091f16 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -30,6 +30,7 @@ bindsym --locked XF86Search output eDP-1 toggle bindsym $mod+Shift+e exec $term --class fzf-launcher -e $HOME/Scripts/sway-exit.sh # launch a program bindsym $mod+d exec wofi --show drun +bindsym $mod+Shift+d exec wofi --show drun # password manager bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass From f77de7253dcb2aa00cb667e32b429b4f4ea54bcf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 17:47:06 +0200 Subject: [PATCH 0207/2667] Fix typo --- home/.config/sway/conf.d/06-keybinds.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 84091f16..6b77cbe6 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -30,7 +30,7 @@ bindsym --locked XF86Search output eDP-1 toggle bindsym $mod+Shift+e exec $term --class fzf-launcher -e $HOME/Scripts/sway-exit.sh # launch a program bindsym $mod+d exec wofi --show drun -bindsym $mod+Shift+d exec wofi --show drun +bindsym $mod+Shift+d exec wofi --show run # password manager bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass From 09dd181a017f1b95cbc4e28fc967b3be2b47d157 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 17:47:06 +0200 Subject: [PATCH 0208/2667] Fix typo --- home/.config/sway/conf.d/06-keybinds.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 84091f16..6b77cbe6 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -30,7 +30,7 @@ bindsym --locked XF86Search output eDP-1 toggle bindsym $mod+Shift+e exec $term --class fzf-launcher -e $HOME/Scripts/sway-exit.sh # launch a program bindsym $mod+d exec wofi --show drun -bindsym $mod+Shift+d exec wofi --show drun +bindsym $mod+Shift+d exec wofi --show run # password manager bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass From 6382a95f1199994c37735f40a79d8ddce1a9c15d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 5 Mar 2020 14:04:13 +0200 Subject: [PATCH 0209/2667] Add clipman --- home/.config/sway/conf.d/08-exec.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 76d62035..b7f80c15 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -8,6 +8,7 @@ exec { kdeconnect-indicator thunderbird mako + wl-paste -t text --watch clipman store mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob } From 5de85b9174dc7f463931f69691922928591b3817 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 5 Mar 2020 14:04:13 +0200 Subject: [PATCH 0210/2667] Add clipman --- home/.config/sway/conf.d/08-exec.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 76d62035..b7f80c15 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -8,6 +8,7 @@ exec { kdeconnect-indicator thunderbird mako + wl-paste -t text --watch clipman store mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob } From 87c1f1ccd63e4817e0e2b63669a54bbe49ef4a38 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 5 Mar 2020 21:28:10 +0200 Subject: [PATCH 0211/2667] Some tweaks for latex --- home/.config/nvim/conf.d/02-appearance.vim | 3 +++ home/.config/nvim/conf.d/03-keybinds.vim | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/home/.config/nvim/conf.d/02-appearance.vim b/home/.config/nvim/conf.d/02-appearance.vim index 7d4f593d..955d2a24 100644 --- a/home/.config/nvim/conf.d/02-appearance.vim +++ b/home/.config/nvim/conf.d/02-appearance.vim @@ -41,3 +41,6 @@ set shiftwidth=4 " Make gutter and cursorline bg transparent highlight CursorLineNr guibg=transparent highlight SignColumn guibg=transparent + +" Don't wrap in the middle of words +set linebreak diff --git a/home/.config/nvim/conf.d/03-keybinds.vim b/home/.config/nvim/conf.d/03-keybinds.vim index 53bf144f..3f37e03a 100644 --- a/home/.config/nvim/conf.d/03-keybinds.vim +++ b/home/.config/nvim/conf.d/03-keybinds.vim @@ -33,3 +33,7 @@ function ToggleEqual () endfunction nnoremap = :call ToggleEqual() + +" Navigate display lines insted of physical lines +nnoremap j gj +nnoremap k gk From 65a60d5cae55a588ee7465e9523c51a3f8f0d9e0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 5 Mar 2020 21:28:10 +0200 Subject: [PATCH 0212/2667] Some tweaks for latex --- home/.config/nvim/conf.d/02-appearance.vim | 3 +++ home/.config/nvim/conf.d/03-keybinds.vim | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/home/.config/nvim/conf.d/02-appearance.vim b/home/.config/nvim/conf.d/02-appearance.vim index 7d4f593d..955d2a24 100644 --- a/home/.config/nvim/conf.d/02-appearance.vim +++ b/home/.config/nvim/conf.d/02-appearance.vim @@ -41,3 +41,6 @@ set shiftwidth=4 " Make gutter and cursorline bg transparent highlight CursorLineNr guibg=transparent highlight SignColumn guibg=transparent + +" Don't wrap in the middle of words +set linebreak diff --git a/home/.config/nvim/conf.d/03-keybinds.vim b/home/.config/nvim/conf.d/03-keybinds.vim index 53bf144f..3f37e03a 100644 --- a/home/.config/nvim/conf.d/03-keybinds.vim +++ b/home/.config/nvim/conf.d/03-keybinds.vim @@ -33,3 +33,7 @@ function ToggleEqual () endfunction nnoremap = :call ToggleEqual() + +" Navigate display lines insted of physical lines +nnoremap j gj +nnoremap k gk From 69df73b4eb32eb4e70668e22b31a2e0aba3c5891 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 10 Mar 2020 11:48:16 +0200 Subject: [PATCH 0213/2667] Small fixes --- home/.config/sway/conf.d/06-keybinds.conf | 6 +++--- home/.config/sway/conf.d/08-exec.conf | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 6b77cbe6..f80beb08 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -115,9 +115,9 @@ bindsym $mod+r mode "resize" bindsym $mod+b exec firefox-nightly # media keys -bindsym XF86AudioRaiseVolume exec pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob -bindsym XF86AudioLowerVolume exec pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob -bindsym XF86AudioMute exec pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob +bindsym --locked XF86AudioRaiseVolume exec pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob +bindsym --locked XF86AudioLowerVolume exec pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob +bindsym --locked XF86AudioMute exec pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob bindsym --locked XF86AudioNext exec playerctl next bindsym --locked XF86AudioPrev exec playerctl previous bindsym --locked XF86AudioPlay exec playerctl play-pause diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index b7f80c15..ff5e80c1 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -10,6 +10,7 @@ exec { mako wl-paste -t text --watch clipman store mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob + mpDris2 } exec_always { From 57bd8a6636e9b7a9776ff261576851d25553664c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 10 Mar 2020 11:48:16 +0200 Subject: [PATCH 0214/2667] Small fixes --- home/.config/sway/conf.d/06-keybinds.conf | 6 +++--- home/.config/sway/conf.d/08-exec.conf | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 6b77cbe6..f80beb08 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -115,9 +115,9 @@ bindsym $mod+r mode "resize" bindsym $mod+b exec firefox-nightly # media keys -bindsym XF86AudioRaiseVolume exec pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob -bindsym XF86AudioLowerVolume exec pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob -bindsym XF86AudioMute exec pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob +bindsym --locked XF86AudioRaiseVolume exec pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob +bindsym --locked XF86AudioLowerVolume exec pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob +bindsym --locked XF86AudioMute exec pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob bindsym --locked XF86AudioNext exec playerctl next bindsym --locked XF86AudioPrev exec playerctl previous bindsym --locked XF86AudioPlay exec playerctl play-pause diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index b7f80c15..ff5e80c1 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -10,6 +10,7 @@ exec { mako wl-paste -t text --watch clipman store mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob + mpDris2 } exec_always { From 9a270e56940bae14cec4572f91b1d621f5bfcc98 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 10 Mar 2020 11:48:35 +0200 Subject: [PATCH 0215/2667] Remove ydotoold service. Using supplied one --- home/.config/systemd/user/ydotoold.service | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 home/.config/systemd/user/ydotoold.service diff --git a/home/.config/systemd/user/ydotoold.service b/home/.config/systemd/user/ydotoold.service deleted file mode 100644 index 2832af66..00000000 --- a/home/.config/systemd/user/ydotoold.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Generic command-line automation tool - -[Service] -ExecStart=/usr/bin/ydotoold -Restart=on-failure - -[Install] -WantedBy=default.target From c7e86884aee648bc3849e3411af2de99e76f105d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 10 Mar 2020 11:48:35 +0200 Subject: [PATCH 0216/2667] Remove ydotoold service. Using supplied one --- home/.config/systemd/user/ydotoold.service | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 home/.config/systemd/user/ydotoold.service diff --git a/home/.config/systemd/user/ydotoold.service b/home/.config/systemd/user/ydotoold.service deleted file mode 100644 index 2832af66..00000000 --- a/home/.config/systemd/user/ydotoold.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Generic command-line automation tool - -[Service] -ExecStart=/usr/bin/ydotoold -Restart=on-failure - -[Install] -WantedBy=default.target From 3cc5a3b2b4190e77ec5bb3e0f9fa7f5f9c59d808 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 10 Mar 2020 11:49:38 +0200 Subject: [PATCH 0217/2667] Trying out organizr --- docker/organizr/docker-compose.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 docker/organizr/docker-compose.yaml diff --git a/docker/organizr/docker-compose.yaml b/docker/organizr/docker-compose.yaml new file mode 100644 index 00000000..8785e0b1 --- /dev/null +++ b/docker/organizr/docker-compose.yaml @@ -0,0 +1,14 @@ +version: "3" + +services: + organizr: + container_name: organizr + image: organizrtools/organizr-v2 + environment: + - TZ=Europe/Helsinki + restart: always + ports: + - "3123:80" + volumes: + - /docker/organizr:/data + - /etc/localtime:/etc/localtime:ro From 12ec0215b7eb1f124a9630e2c3415dd60072f0d6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 10 Mar 2020 11:49:38 +0200 Subject: [PATCH 0218/2667] Trying out organizr --- docker/organizr/docker-compose.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 docker/organizr/docker-compose.yaml diff --git a/docker/organizr/docker-compose.yaml b/docker/organizr/docker-compose.yaml new file mode 100644 index 00000000..8785e0b1 --- /dev/null +++ b/docker/organizr/docker-compose.yaml @@ -0,0 +1,14 @@ +version: "3" + +services: + organizr: + container_name: organizr + image: organizrtools/organizr-v2 + environment: + - TZ=Europe/Helsinki + restart: always + ports: + - "3123:80" + volumes: + - /docker/organizr:/data + - /etc/localtime:/etc/localtime:ro From 028cf3f2709e4bd69f3c90f710efc85d8423c3ba Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 10 Mar 2020 11:59:47 +0200 Subject: [PATCH 0219/2667] Fix path --- docker/organizr/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/organizr/docker-compose.yaml b/docker/organizr/docker-compose.yaml index 8785e0b1..2bfa4835 100644 --- a/docker/organizr/docker-compose.yaml +++ b/docker/organizr/docker-compose.yaml @@ -10,5 +10,5 @@ services: ports: - "3123:80" volumes: - - /docker/organizr:/data + - /docker/organizr:/config - /etc/localtime:/etc/localtime:ro From 4b5494821befbe0a0a982c4c6d0ac45efa6ac806 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 10 Mar 2020 11:59:47 +0200 Subject: [PATCH 0220/2667] Fix path --- docker/organizr/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/organizr/docker-compose.yaml b/docker/organizr/docker-compose.yaml index 8785e0b1..2bfa4835 100644 --- a/docker/organizr/docker-compose.yaml +++ b/docker/organizr/docker-compose.yaml @@ -10,5 +10,5 @@ services: ports: - "3123:80" volumes: - - /docker/organizr:/data + - /docker/organizr:/config - /etc/localtime:/etc/localtime:ro From 2b0b1518c78dd2f4e68da78139b711b60e9587fb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 12 Mar 2020 18:45:02 +0200 Subject: [PATCH 0221/2667] Fix screen rotate keybind --- home/.config/sway/conf.d/06-keybinds.conf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index f80beb08..2c4249c4 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -125,14 +125,14 @@ bindsym --locked XF86AudioStop exec playerctl stop bindsym --locked Ctrl+Alt+s exec playerctl stop # rotate screen -bindsym $mod+m+Right output eDP-1 transform 90 -bindsym $mod+m+Up output eDP-1 transform 0 -bindsym $mod+m+Down output eDP-1 transform 180 -bindsym $mod+m+Left output eDP-1 transform 270 -bindsym $mod+m+h output eDP-1 transform 270 -bindsym $mod+m+j output eDP-1 transform 180 -bindsym $mod+m+l output eDP-1 transform 90 -bindsym $mod+m+k output eDP-1 transform 0 +bindsym $mod+Control+Right output eDP-1 transform 90 +bindsym $mod+Control+Up output eDP-1 transform 0 +bindsym $mod+Control+Down output eDP-1 transform 180 +bindsym $mod+Control+Left output eDP-1 transform 270 +bindsym $mod+Control+h output eDP-1 transform 270 +bindsym $mod+Control+j output eDP-1 transform 180 +bindsym $mod+Control+l output eDP-1 transform 90 +bindsym $mod+Control+k output eDP-1 transform 0 # display brightness bindsym XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob From 223205856d1288f3803392cfb0291e070e16c1ac Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 12 Mar 2020 18:45:02 +0200 Subject: [PATCH 0222/2667] Fix screen rotate keybind --- home/.config/sway/conf.d/06-keybinds.conf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index f80beb08..2c4249c4 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -125,14 +125,14 @@ bindsym --locked XF86AudioStop exec playerctl stop bindsym --locked Ctrl+Alt+s exec playerctl stop # rotate screen -bindsym $mod+m+Right output eDP-1 transform 90 -bindsym $mod+m+Up output eDP-1 transform 0 -bindsym $mod+m+Down output eDP-1 transform 180 -bindsym $mod+m+Left output eDP-1 transform 270 -bindsym $mod+m+h output eDP-1 transform 270 -bindsym $mod+m+j output eDP-1 transform 180 -bindsym $mod+m+l output eDP-1 transform 90 -bindsym $mod+m+k output eDP-1 transform 0 +bindsym $mod+Control+Right output eDP-1 transform 90 +bindsym $mod+Control+Up output eDP-1 transform 0 +bindsym $mod+Control+Down output eDP-1 transform 180 +bindsym $mod+Control+Left output eDP-1 transform 270 +bindsym $mod+Control+h output eDP-1 transform 270 +bindsym $mod+Control+j output eDP-1 transform 180 +bindsym $mod+Control+l output eDP-1 transform 90 +bindsym $mod+Control+k output eDP-1 transform 0 # display brightness bindsym XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob From 9f30db8fadd36871128971660b2ed109065d4a86 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 12 Mar 2020 18:45:32 +0200 Subject: [PATCH 0223/2667] Remove systemd stuff from dotdrop actions --- config-home.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config-home.yaml b/config-home.yaml index 31ba3b92..9317603b 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -1,8 +1,6 @@ actions: vim-plug: nvim +PlugInstall +qall zplug: zplug install - waybar: systemctl --user restart waybar - mako: systemctl --user restart mako config: backup: true banner: true @@ -37,8 +35,6 @@ dotfiles: dst: ~/.local/share/TelegramDesktop/tdata/ticons src: .local/share/TelegramDesktop/tdata/ticons d_waybar: - actions: - - waybar dst: ~/.config/waybar src: .config/waybar f_abcde.conf: @@ -80,8 +76,6 @@ dotfiles: f_mako_config: dst: ~/.config/mako/config src: .config/mako/config - actions: - - mako f_mimeo_associations.txt: dst: ~/.config/mimeo/associations.txt src: .config/mimeo/associations.txt From 1d60c6cc55e1b7e0ff018475e8c22c250b9710bc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 12 Mar 2020 18:45:32 +0200 Subject: [PATCH 0224/2667] Remove systemd stuff from dotdrop actions --- config-home.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config-home.yaml b/config-home.yaml index 31ba3b92..9317603b 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -1,8 +1,6 @@ actions: vim-plug: nvim +PlugInstall +qall zplug: zplug install - waybar: systemctl --user restart waybar - mako: systemctl --user restart mako config: backup: true banner: true @@ -37,8 +35,6 @@ dotfiles: dst: ~/.local/share/TelegramDesktop/tdata/ticons src: .local/share/TelegramDesktop/tdata/ticons d_waybar: - actions: - - waybar dst: ~/.config/waybar src: .config/waybar f_abcde.conf: @@ -80,8 +76,6 @@ dotfiles: f_mako_config: dst: ~/.config/mako/config src: .config/mako/config - actions: - - mako f_mimeo_associations.txt: dst: ~/.config/mimeo/associations.txt src: .config/mimeo/associations.txt From 57725a904a77e4380e10cf87bd132f966eebf07f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 12 Mar 2020 18:45:52 +0200 Subject: [PATCH 0225/2667] Switch from ls_extended to exa --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 58b303fa..c39db1dd 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -138,7 +138,7 @@ tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/nu alias reflect='sudo reflector --latest 200 --threads 8 --verbose --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist' # better ls -alias ls='ls_extended' +alias ls='exa --time-style=long-iso --git' # default icon for notify-send alias notify-send='notify-send --icon=alarm' From b7ff6de76e644805c8456834feee316f6dd8f25c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 12 Mar 2020 18:45:52 +0200 Subject: [PATCH 0226/2667] Switch from ls_extended to exa --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 58b303fa..c39db1dd 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -138,7 +138,7 @@ tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/nu alias reflect='sudo reflector --latest 200 --threads 8 --verbose --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist' # better ls -alias ls='ls_extended' +alias ls='exa --time-style=long-iso --git' # default icon for notify-send alias notify-send='notify-send --icon=alarm' From e1d2e34d2dccad0624fcc40b7baab41ea5348c1a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 12 Mar 2020 18:46:18 +0200 Subject: [PATCH 0227/2667] Add wob to waybar --- home/.config/waybar/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/waybar/config b/home/.config/waybar/config index 07b88d1d..17f62774 100644 --- a/home/.config/waybar/config +++ b/home/.config/waybar/config @@ -102,10 +102,10 @@ "car": "", "default": ["", ""] }, - "on-click": "pulseaudio-ctl mute", + "on-click": "pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob", "on-click-right": "pavucontrol", - "on-scroll-up": "pulseaudio-ctl up 1", - "on-scroll-down": "pulseaudio-ctl down 1" + "on-scroll-up": "pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob", + "on-scroll-down": "pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob" }, "custom/playerctl": { "tooltip": false, From 3dabf533df379d2a83d189535ada378472aa2581 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 12 Mar 2020 18:46:18 +0200 Subject: [PATCH 0228/2667] Add wob to waybar --- home/.config/waybar/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/waybar/config b/home/.config/waybar/config index 07b88d1d..17f62774 100644 --- a/home/.config/waybar/config +++ b/home/.config/waybar/config @@ -102,10 +102,10 @@ "car": "", "default": ["", ""] }, - "on-click": "pulseaudio-ctl mute", + "on-click": "pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob", "on-click-right": "pavucontrol", - "on-scroll-up": "pulseaudio-ctl up 1", - "on-scroll-down": "pulseaudio-ctl down 1" + "on-scroll-up": "pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob", + "on-scroll-down": "pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob" }, "custom/playerctl": { "tooltip": false, From 7378d4fd8640458857d107a33bf3c326f4d6d646 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 24 Mar 2020 10:43:19 +0200 Subject: [PATCH 0229/2667] Add recursive parameter to autoremove alias --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index c39db1dd..c4025814 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -129,7 +129,7 @@ update() { yay -Syu --devel firefox-nightly } updateall() { update; plugupdate; sudo awman-update } # remove unneeded packages -autoremove() { sudo pacman -R $(pacman -Qdtq) } +autoremove() { sudo pacman -Rns $(pacman -Qdtq) } # turn on usb tethering on my android phone tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/null } From 34ad966e124478958a1a38447227b0a41b168ae8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 24 Mar 2020 10:43:19 +0200 Subject: [PATCH 0230/2667] Add recursive parameter to autoremove alias --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index c39db1dd..c4025814 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -129,7 +129,7 @@ update() { yay -Syu --devel firefox-nightly } updateall() { update; plugupdate; sudo awman-update } # remove unneeded packages -autoremove() { sudo pacman -R $(pacman -Qdtq) } +autoremove() { sudo pacman -Rns $(pacman -Qdtq) } # turn on usb tethering on my android phone tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/null } From b6e7bf0af2f6579fa28fec054c0dd20289f9196e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 24 Mar 2020 10:43:40 +0200 Subject: [PATCH 0231/2667] Remove redundant icon from bluetooth audio --- home/.config/waybar/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/waybar/config b/home/.config/waybar/config index 17f62774..c8e8fe77 100644 --- a/home/.config/waybar/config +++ b/home/.config/waybar/config @@ -91,7 +91,7 @@ "tooltip": false, //"scroll-step": 1, "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon}", + "format-bluetooth": "{volume}% ", "format-muted": "", "format-icons": { "headphones": "", From c91415653426f2e7652992a3b717af178856fc15 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 24 Mar 2020 10:43:40 +0200 Subject: [PATCH 0232/2667] Remove redundant icon from bluetooth audio --- home/.config/waybar/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/waybar/config b/home/.config/waybar/config index 17f62774..c8e8fe77 100644 --- a/home/.config/waybar/config +++ b/home/.config/waybar/config @@ -91,7 +91,7 @@ "tooltip": false, //"scroll-step": 1, "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon}", + "format-bluetooth": "{volume}% ", "format-muted": "", "format-icons": { "headphones": "", From 92800877d210983995491f8dacd3731259c78b5f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 24 Mar 2020 10:44:05 +0200 Subject: [PATCH 0233/2667] Run keyring and polkit --- home/.config/sway/conf.d/08-exec.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index ff5e80c1..7d7a179d 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -10,6 +10,8 @@ exec { mako wl-paste -t text --watch clipman store mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob + /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 + gnome-keyring-daemon --start --components=secrets mpDris2 } From a2a9b9d1f9131b2e676225eeb7d3fdcfcbcb43a2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 24 Mar 2020 10:44:05 +0200 Subject: [PATCH 0234/2667] Run keyring and polkit --- home/.config/sway/conf.d/08-exec.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index ff5e80c1..7d7a179d 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -10,6 +10,8 @@ exec { mako wl-paste -t text --watch clipman store mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob + /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 + gnome-keyring-daemon --start --components=secrets mpDris2 } From 55b9e2e7ee3bc39d57fa10e3b6a218508078fdd2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 24 Mar 2020 10:44:34 +0200 Subject: [PATCH 0235/2667] Remove bootloader config --- config-root.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config-root.yaml b/config-root.yaml index e0f3574c..df88b300 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -152,7 +152,6 @@ profiles: - f_adb.service - f_bluetooth.conf - f_iwd@.service - - f_loader.conf - f_sshd_config - f_logind.conf - f_60-uinput-permissions.rules From cb16407646356759fb53f789b2dac31321b0c5b5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 24 Mar 2020 10:44:34 +0200 Subject: [PATCH 0236/2667] Remove bootloader config --- config-root.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config-root.yaml b/config-root.yaml index e0f3574c..df88b300 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -152,7 +152,6 @@ profiles: - f_adb.service - f_bluetooth.conf - f_iwd@.service - - f_loader.conf - f_sshd_config - f_logind.conf - f_60-uinput-permissions.rules From dfbdc85a28bd8c00457689a76c28b2c9ee17f9ad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Mar 2020 18:19:55 +0300 Subject: [PATCH 0237/2667] Some config cleanup. Also fixed an issue with the touchpad not working on external monitors. Touchpad should not be mapped to output (D'oh) --- home/.config/sway/conf.d/02-bar.conf | 1 - home/.config/sway/conf.d/03-input.conf | 1 - home/.config/sway/conf.d/08-exec.conf | 1 + home/.config/sway/security.d/00-defaults | 43 ------------------------ 4 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 home/.config/sway/security.d/00-defaults diff --git a/home/.config/sway/conf.d/02-bar.conf b/home/.config/sway/conf.d/02-bar.conf index 645edb4f..04630004 100644 --- a/home/.config/sway/conf.d/02-bar.conf +++ b/home/.config/sway/conf.d/02-bar.conf @@ -2,5 +2,4 @@ bar { swaybar_command waybar - output eDP-1 } diff --git a/home/.config/sway/conf.d/03-input.conf b/home/.config/sway/conf.d/03-input.conf index eeafff07..dc3b2dad 100644 --- a/home/.config/sway/conf.d/03-input.conf +++ b/home/.config/sway/conf.d/03-input.conf @@ -11,4 +11,3 @@ input "1739:32382:DELL0884:00_06CB:7E7E_Touchpad" { } input "1267:9364:ELAN_Touchscreen" map_to_output eDP-1 -input "1739:32382:DELL0884:00_06CB:7E7E_Touchpad" map_to_output eDP-1 diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 7d7a179d..9536b761 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -5,6 +5,7 @@ exec { autotiling redshift-gtk -m wayland telegram-desktop + /usr/lib/kdeconnectd kdeconnect-indicator thunderbird mako diff --git a/home/.config/sway/security.d/00-defaults b/home/.config/sway/security.d/00-defaults deleted file mode 100644 index 8b52dfd7..00000000 --- a/home/.config/sway/security.d/00-defaults +++ /dev/null @@ -1,43 +0,0 @@ -# DO NOT CHANGE THIS FILE. Override these defaults by writing new files in -# /etc/sway/security.d/* - -# Configures enabled compositor features for specific programs -permit * fullscreen keyboard mouse -permit /usr/bin/swaylock lock -permit /usr/bin/swaybg background -permit /usr/bin/swaybar panel - -# Configures enabled IPC features for specific programs -ipc /usr/bin/swaymsg { - * enabled - - events { - * disabled - } -} - -ipc /usr/bin/swaybar { - bar-config enabled - outputs enabled - workspaces enabled - command enabled - - events { - workspace enabled - mode enabled - } -} - -ipc /usr/bin/swaylock { - outputs enabled -} - -# Limits the contexts from which certain commands are permitted -commands { - * all - - fullscreen binding criteria - bindsym config - exit binding - kill binding -} From 1df6812cf131b9f8f7808d52e0a2626aacccfe77 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Mar 2020 18:19:55 +0300 Subject: [PATCH 0238/2667] Some config cleanup. Also fixed an issue with the touchpad not working on external monitors. Touchpad should not be mapped to output (D'oh) --- home/.config/sway/conf.d/02-bar.conf | 1 - home/.config/sway/conf.d/03-input.conf | 1 - home/.config/sway/conf.d/08-exec.conf | 1 + home/.config/sway/security.d/00-defaults | 43 ------------------------ 4 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 home/.config/sway/security.d/00-defaults diff --git a/home/.config/sway/conf.d/02-bar.conf b/home/.config/sway/conf.d/02-bar.conf index 645edb4f..04630004 100644 --- a/home/.config/sway/conf.d/02-bar.conf +++ b/home/.config/sway/conf.d/02-bar.conf @@ -2,5 +2,4 @@ bar { swaybar_command waybar - output eDP-1 } diff --git a/home/.config/sway/conf.d/03-input.conf b/home/.config/sway/conf.d/03-input.conf index eeafff07..dc3b2dad 100644 --- a/home/.config/sway/conf.d/03-input.conf +++ b/home/.config/sway/conf.d/03-input.conf @@ -11,4 +11,3 @@ input "1739:32382:DELL0884:00_06CB:7E7E_Touchpad" { } input "1267:9364:ELAN_Touchscreen" map_to_output eDP-1 -input "1739:32382:DELL0884:00_06CB:7E7E_Touchpad" map_to_output eDP-1 diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 7d7a179d..9536b761 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -5,6 +5,7 @@ exec { autotiling redshift-gtk -m wayland telegram-desktop + /usr/lib/kdeconnectd kdeconnect-indicator thunderbird mako diff --git a/home/.config/sway/security.d/00-defaults b/home/.config/sway/security.d/00-defaults deleted file mode 100644 index 8b52dfd7..00000000 --- a/home/.config/sway/security.d/00-defaults +++ /dev/null @@ -1,43 +0,0 @@ -# DO NOT CHANGE THIS FILE. Override these defaults by writing new files in -# /etc/sway/security.d/* - -# Configures enabled compositor features for specific programs -permit * fullscreen keyboard mouse -permit /usr/bin/swaylock lock -permit /usr/bin/swaybg background -permit /usr/bin/swaybar panel - -# Configures enabled IPC features for specific programs -ipc /usr/bin/swaymsg { - * enabled - - events { - * disabled - } -} - -ipc /usr/bin/swaybar { - bar-config enabled - outputs enabled - workspaces enabled - command enabled - - events { - workspace enabled - mode enabled - } -} - -ipc /usr/bin/swaylock { - outputs enabled -} - -# Limits the contexts from which certain commands are permitted -commands { - * all - - fullscreen binding criteria - bindsym config - exit binding - kill binding -} From 1c4b4796b3336d760af322ee5a4c7e1927600098 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Mar 2020 18:21:00 +0300 Subject: [PATCH 0239/2667] Add reboot to kodi option --- home/.config/zsh/03-aliases.zsh | 2 ++ home/.zprofile | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index c4025814..7befc9ee 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -46,6 +46,8 @@ fman() { alias :q='exit' alias :wq='exit' +alias reboot-kodi='systemctl reboot --boot-loader-entry=kodi.conf' + # zbar output only data alias zbarimg='zbarimg -q --raw' alias zbarcam='zbarcam -q --raw' diff --git a/home/.zprofile b/home/.zprofile index c7215bd7..2101c123 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1 +1,5 @@ -[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway > /dev/null 2>&1 +if cat /proc/cmdline | grep -q "video=eDP-1:d"; then + [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && kodi +else + [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway > /dev/null 2>&1 +fi From d222003be70b57588f6a61680b62a6a0dca6a9f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Mar 2020 18:21:00 +0300 Subject: [PATCH 0240/2667] Add reboot to kodi option --- home/.config/zsh/03-aliases.zsh | 2 ++ home/.zprofile | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index c4025814..7befc9ee 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -46,6 +46,8 @@ fman() { alias :q='exit' alias :wq='exit' +alias reboot-kodi='systemctl reboot --boot-loader-entry=kodi.conf' + # zbar output only data alias zbarimg='zbarimg -q --raw' alias zbarcam='zbarcam -q --raw' diff --git a/home/.zprofile b/home/.zprofile index c7215bd7..2101c123 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1 +1,5 @@ -[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway > /dev/null 2>&1 +if cat /proc/cmdline | grep -q "video=eDP-1:d"; then + [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && kodi +else + [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway > /dev/null 2>&1 +fi From 5dda9fd831c23de2df9486845e3a7421add3bea0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Mar 2020 18:21:16 +0300 Subject: [PATCH 0241/2667] Add system.conf modifications --- config-root.yaml | 100 ++++++++++++++++++----------------- root/etc/systemd/system.conf | 70 ++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 48 deletions(-) create mode 100644 root/etc/systemd/system.conf diff --git a/config-root.yaml b/config-root.yaml index df88b300..951c857f 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -131,65 +131,69 @@ dotfiles: f_ipmi-fans.timer: src: etc/systemd/system/ipmi-fans.timer dst: /etc/systemd/system/ipmi-fans.timer + f_system.conf: + src: etc/systemd/system.conf + dst: /etc/systemd/system.conf profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf - - f_pacman-dl.service - - f_pacman-dl.timer + - f_pacman.conf + - f_pacserve.service.conf + - f_pacman-dl.service + - f_pacman-dl.timer Mirkwood: dotfiles: - - f_getty.conf - - f_environment - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_zsh.hook - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf + - f_getty.conf + - f_environment + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_zsh.hook + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config - - f_nightly-reboot.service - - f_nightly-reboot.timer + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_sshd_config + - f_nightly-reboot.service + - f_nightly-reboot.timer Moria: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_ipmi-static.service - - f_ipmi-temp.service - - f_ipmi-temp.timer - - f_ipmi-fans.service - - f_ipmi-fans.timer + - f_sshd_config + - f_99-sysctl.conf + - f_ipmi-static.service + - f_ipmi-temp.service + - f_ipmi-temp.timer + - f_ipmi-fans.service + - f_ipmi-fans.timer diff --git a/root/etc/systemd/system.conf b/root/etc/systemd/system.conf new file mode 100644 index 00000000..9c7832d4 --- /dev/null +++ b/root/etc/systemd/system.conf @@ -0,0 +1,70 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# Entries in this file show the compile time defaults. +# You can change settings by editing this file. +# Defaults can be restored by simply deleting this file. +# +# See systemd-system.conf(5) for details. + +[Manager] +#LogLevel=info +#LogTarget=journal-or-kmsg +#LogColor=yes +#LogLocation=no +#DumpCore=yes +#ShowStatus=yes +#CrashChangeVT=no +#CrashShell=no +#CrashReboot=no +#CtrlAltDelBurstAction=reboot-force +#CPUAffinity=1 2 +#NUMAPolicy=default +#NUMAMask= +#RuntimeWatchdogSec=0 +#RebootWatchdogSec=10min +#ShutdownWatchdogSec=10min +#KExecWatchdogSec=0 +#WatchdogDevice= +#CapabilityBoundingSet= +#NoNewPrivileges=no +#SystemCallArchitectures= +#TimerSlackNSec= +#StatusUnitFormat=description +#DefaultTimerAccuracySec=1min +#DefaultStandardOutput=journal +#DefaultStandardError=inherit +#DefaultTimeoutStartSec=90s +DefaultTimeoutStopSec=30s +#DefaultTimeoutAbortSec= +#DefaultRestartSec=100ms +#DefaultStartLimitIntervalSec=10s +#DefaultStartLimitBurst=5 +#DefaultEnvironment= +#DefaultCPUAccounting=no +#DefaultIOAccounting=no +#DefaultIPAccounting=no +#DefaultBlockIOAccounting=no +#DefaultMemoryAccounting=yes +#DefaultTasksAccounting=yes +#DefaultTasksMax=15% +#DefaultLimitCPU= +#DefaultLimitFSIZE= +#DefaultLimitDATA= +#DefaultLimitSTACK= +#DefaultLimitCORE= +#DefaultLimitRSS= +#DefaultLimitNOFILE=1024:524288 +#DefaultLimitAS= +#DefaultLimitNPROC= +#DefaultLimitMEMLOCK= +#DefaultLimitLOCKS= +#DefaultLimitSIGPENDING= +#DefaultLimitMSGQUEUE= +#DefaultLimitNICE= +#DefaultLimitRTPRIO= +#DefaultLimitRTTIME= From 05b9ccfaa26c6e0b11b9300ea8eff001128aa272 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Mar 2020 18:21:16 +0300 Subject: [PATCH 0242/2667] Add system.conf modifications --- config-root.yaml | 100 ++++++++++++++++++----------------- root/etc/systemd/system.conf | 70 ++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 48 deletions(-) create mode 100644 root/etc/systemd/system.conf diff --git a/config-root.yaml b/config-root.yaml index df88b300..951c857f 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -131,65 +131,69 @@ dotfiles: f_ipmi-fans.timer: src: etc/systemd/system/ipmi-fans.timer dst: /etc/systemd/system/ipmi-fans.timer + f_system.conf: + src: etc/systemd/system.conf + dst: /etc/systemd/system.conf profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf - - f_pacman-dl.service - - f_pacman-dl.timer + - f_pacman.conf + - f_pacserve.service.conf + - f_pacman-dl.service + - f_pacman-dl.timer Mirkwood: dotfiles: - - f_getty.conf - - f_environment - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_zsh.hook - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf + - f_getty.conf + - f_environment + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_zsh.hook + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config - - f_nightly-reboot.service - - f_nightly-reboot.timer + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_sshd_config + - f_nightly-reboot.service + - f_nightly-reboot.timer Moria: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_ipmi-static.service - - f_ipmi-temp.service - - f_ipmi-temp.timer - - f_ipmi-fans.service - - f_ipmi-fans.timer + - f_sshd_config + - f_99-sysctl.conf + - f_ipmi-static.service + - f_ipmi-temp.service + - f_ipmi-temp.timer + - f_ipmi-fans.service + - f_ipmi-fans.timer diff --git a/root/etc/systemd/system.conf b/root/etc/systemd/system.conf new file mode 100644 index 00000000..9c7832d4 --- /dev/null +++ b/root/etc/systemd/system.conf @@ -0,0 +1,70 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# Entries in this file show the compile time defaults. +# You can change settings by editing this file. +# Defaults can be restored by simply deleting this file. +# +# See systemd-system.conf(5) for details. + +[Manager] +#LogLevel=info +#LogTarget=journal-or-kmsg +#LogColor=yes +#LogLocation=no +#DumpCore=yes +#ShowStatus=yes +#CrashChangeVT=no +#CrashShell=no +#CrashReboot=no +#CtrlAltDelBurstAction=reboot-force +#CPUAffinity=1 2 +#NUMAPolicy=default +#NUMAMask= +#RuntimeWatchdogSec=0 +#RebootWatchdogSec=10min +#ShutdownWatchdogSec=10min +#KExecWatchdogSec=0 +#WatchdogDevice= +#CapabilityBoundingSet= +#NoNewPrivileges=no +#SystemCallArchitectures= +#TimerSlackNSec= +#StatusUnitFormat=description +#DefaultTimerAccuracySec=1min +#DefaultStandardOutput=journal +#DefaultStandardError=inherit +#DefaultTimeoutStartSec=90s +DefaultTimeoutStopSec=30s +#DefaultTimeoutAbortSec= +#DefaultRestartSec=100ms +#DefaultStartLimitIntervalSec=10s +#DefaultStartLimitBurst=5 +#DefaultEnvironment= +#DefaultCPUAccounting=no +#DefaultIOAccounting=no +#DefaultIPAccounting=no +#DefaultBlockIOAccounting=no +#DefaultMemoryAccounting=yes +#DefaultTasksAccounting=yes +#DefaultTasksMax=15% +#DefaultLimitCPU= +#DefaultLimitFSIZE= +#DefaultLimitDATA= +#DefaultLimitSTACK= +#DefaultLimitCORE= +#DefaultLimitRSS= +#DefaultLimitNOFILE=1024:524288 +#DefaultLimitAS= +#DefaultLimitNPROC= +#DefaultLimitMEMLOCK= +#DefaultLimitLOCKS= +#DefaultLimitSIGPENDING= +#DefaultLimitMSGQUEUE= +#DefaultLimitNICE= +#DefaultLimitRTPRIO= +#DefaultLimitRTTIME= From b47c93a49068357aa61468159bde35a2fa857dbb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Mar 2020 18:21:34 +0300 Subject: [PATCH 0243/2667] Map audio-delay --- home/.config/mpv/input.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/mpv/input.conf b/home/.config/mpv/input.conf index 92466f08..4dc916fa 100644 --- a/home/.config/mpv/input.conf +++ b/home/.config/mpv/input.conf @@ -19,3 +19,6 @@ m cycle ao-mute VOLUME_DOWN add ao-volume -2 VOLUME_UP add ao-volume +2 MUTE cycle ao-mute + += add audio-delay 0.100 +- add audio-delay -0.100 From d95f12900fa7969619659b606a8e3e2e99daf64c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Mar 2020 18:21:34 +0300 Subject: [PATCH 0244/2667] Map audio-delay --- home/.config/mpv/input.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/mpv/input.conf b/home/.config/mpv/input.conf index 92466f08..4dc916fa 100644 --- a/home/.config/mpv/input.conf +++ b/home/.config/mpv/input.conf @@ -19,3 +19,6 @@ m cycle ao-mute VOLUME_DOWN add ao-volume -2 VOLUME_UP add ao-volume +2 MUTE cycle ao-mute + += add audio-delay 0.100 +- add audio-delay -0.100 From 495ad3a2c89c1968ed521d2a6479803416b2ed73 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:30:12 +0300 Subject: [PATCH 0245/2667] Added wofi --- config-home.yaml | 17 ++++------------- home/.config/wofi/config | 2 ++ 2 files changed, 6 insertions(+), 13 deletions(-) create mode 100644 home/.config/wofi/config diff --git a/config-home.yaml b/config-home.yaml index 9317603b..130be670 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -37,6 +37,9 @@ dotfiles: d_waybar: dst: ~/.config/waybar src: .config/waybar + d_wofi: + src: .config/wofi + dst: ~/.config/wofi f_abcde.conf: dst: ~/.abcde.conf src: .abcde.conf @@ -100,9 +103,6 @@ dotfiles: f_redshift.conf: dst: ~/.config/redshift/redshift.conf src: .config/redshift/redshift.conf - f_rofi-pass.conf: - dst: ~/.config/rofi-pass/config - src: .config/rofi-pass/config f_rtv.cfg: dst: ~/.config/rtv/rtv.cfg src: .config/rtv/rtv.cfg @@ -136,9 +136,6 @@ dotfiles: f_zshrc: dst: ~/.zshrc src: .zshrc - d_rofi: - src: .config/rofi - dst: ~/.config/rofi d_zsh: src: .config/zsh dst: ~/.config/zsh @@ -154,9 +151,6 @@ dotfiles: f_ncmpcpp.conf: src: .config/ncmpcpp/config dst: ~/.config/ncmpcpp/config - d_efistub: - src: .EFISTUB - dst: ~/.EFISTUB f_hushlogin: src: .hushlogin dst: ~/.hushlogin @@ -182,10 +176,9 @@ profiles: dotfiles: - d_sway - d_waybar - - d_rofi + - d_wofi - f_mako_config - f_redshift.conf - - f_rofi-pass.conf - f_zathurarc - f_mimeo_associations.txt - f_tdesktop_lang.strings @@ -196,8 +189,6 @@ profiles: - f_yay_config.json - f_makepkg.conf Mirkwood: - dotfiles: - - d_efistub include: - Base - Terminal diff --git a/home/.config/wofi/config b/home/.config/wofi/config new file mode 100644 index 00000000..ff4508eb --- /dev/null +++ b/home/.config/wofi/config @@ -0,0 +1,2 @@ +show=drun +allow_images=true From afd34f841166c790dc9f5c0de7ea64e986c91fb4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:30:12 +0300 Subject: [PATCH 0246/2667] Added wofi --- config-home.yaml | 17 ++++------------- home/.config/wofi/config | 2 ++ 2 files changed, 6 insertions(+), 13 deletions(-) create mode 100644 home/.config/wofi/config diff --git a/config-home.yaml b/config-home.yaml index 9317603b..130be670 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -37,6 +37,9 @@ dotfiles: d_waybar: dst: ~/.config/waybar src: .config/waybar + d_wofi: + src: .config/wofi + dst: ~/.config/wofi f_abcde.conf: dst: ~/.abcde.conf src: .abcde.conf @@ -100,9 +103,6 @@ dotfiles: f_redshift.conf: dst: ~/.config/redshift/redshift.conf src: .config/redshift/redshift.conf - f_rofi-pass.conf: - dst: ~/.config/rofi-pass/config - src: .config/rofi-pass/config f_rtv.cfg: dst: ~/.config/rtv/rtv.cfg src: .config/rtv/rtv.cfg @@ -136,9 +136,6 @@ dotfiles: f_zshrc: dst: ~/.zshrc src: .zshrc - d_rofi: - src: .config/rofi - dst: ~/.config/rofi d_zsh: src: .config/zsh dst: ~/.config/zsh @@ -154,9 +151,6 @@ dotfiles: f_ncmpcpp.conf: src: .config/ncmpcpp/config dst: ~/.config/ncmpcpp/config - d_efistub: - src: .EFISTUB - dst: ~/.EFISTUB f_hushlogin: src: .hushlogin dst: ~/.hushlogin @@ -182,10 +176,9 @@ profiles: dotfiles: - d_sway - d_waybar - - d_rofi + - d_wofi - f_mako_config - f_redshift.conf - - f_rofi-pass.conf - f_zathurarc - f_mimeo_associations.txt - f_tdesktop_lang.strings @@ -196,8 +189,6 @@ profiles: - f_yay_config.json - f_makepkg.conf Mirkwood: - dotfiles: - - d_efistub include: - Base - Terminal diff --git a/home/.config/wofi/config b/home/.config/wofi/config new file mode 100644 index 00000000..ff4508eb --- /dev/null +++ b/home/.config/wofi/config @@ -0,0 +1,2 @@ +show=drun +allow_images=true From 43bb3227d5aec7477ebdcea7b4b836e0e90f0b45 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:30:43 +0300 Subject: [PATCH 0247/2667] Moved wireguard to systemd-networkd --- secrets/env | 7 +++++++ secrets/secrets.sh | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/secrets/env b/secrets/env index 73aa9fed..6f1f0d11 100755 --- a/secrets/env +++ b/secrets/env @@ -12,3 +12,10 @@ export PASS_MQTT="$(pass reekynet/mqtt.reekynet.com | head -n 1)" export ME_FULLNAME="$(pass me | head -n 1)" export ME_ADDRESS="$(pass me | rg 'address' | cut -d' ' -f2-)" export ME_PHONE="$(pass me | rg 'phone' | cut -d' ' -f2-)" + +export WIREGUARD_MIRKWOOD_PRIVKEY="$(pass reekynet/wireguard/mirkwood | grep PrivateKey | cut -d' ' -f2-)" +export WIREGUARD_MIRKWOOD_PUBKEY="$(pass reekynet/wireguard/mirkwood | grep PublicKey | cut -d' ' -f2-)" +export WIREGUARD_MIRKWOOD_PSK="$(pass reekynet/wireguard/mirkwood | grep PreSharedKey | cut -d' ' -f2-)" + +export WIREGUARD_MORIA_PRIVKEY="$(pass reekynet/wireguard/moria | grep PrivateKey | cut -d' ' -f2-)" +export WIREGUARD_MORIA_PUBKEY="$(pass reekynet/wireguard/moria | grep PublicKey | cut -d' ' -f2-)" diff --git a/secrets/secrets.sh b/secrets/secrets.sh index 78c68db6..724a5b9b 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -16,4 +16,11 @@ export PASS_MQTT="$PASS_MQTT" export ME_FULLNAME="$ME_FULLNAME" export ME_ADDRESS="$ME_ADDRESS" export ME_PHONE="$ME_PHONE" + +export WIREGUARD_MIRKWOOD_PRIVKEY="$WIREGUARD_MIRKWOOD_PRIVKEY" +export WIREGUARD_MIRKWOOD_PUBKEY="$WIREGUARD_MIRKWOOD_PUBKEY" +export WIREGUARD_MIRKWOOD_PSK="$WIREGUARD_MIRKWOOD_PSK" + +export WIREGUARD_MORIA_PRIVKEY="$WIREGUARD_MORIA_PRIVKEY" +export WIREGUARD_MORIA_PUBKEY="$WIREGUARD_MORIA_PUBKEY" SECRET From 6d81ef9d8b49425c095d37e0b11cb40f7e7e76c1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:30:43 +0300 Subject: [PATCH 0248/2667] Moved wireguard to systemd-networkd --- secrets/env | 7 +++++++ secrets/secrets.sh | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/secrets/env b/secrets/env index 73aa9fed..6f1f0d11 100755 --- a/secrets/env +++ b/secrets/env @@ -12,3 +12,10 @@ export PASS_MQTT="$(pass reekynet/mqtt.reekynet.com | head -n 1)" export ME_FULLNAME="$(pass me | head -n 1)" export ME_ADDRESS="$(pass me | rg 'address' | cut -d' ' -f2-)" export ME_PHONE="$(pass me | rg 'phone' | cut -d' ' -f2-)" + +export WIREGUARD_MIRKWOOD_PRIVKEY="$(pass reekynet/wireguard/mirkwood | grep PrivateKey | cut -d' ' -f2-)" +export WIREGUARD_MIRKWOOD_PUBKEY="$(pass reekynet/wireguard/mirkwood | grep PublicKey | cut -d' ' -f2-)" +export WIREGUARD_MIRKWOOD_PSK="$(pass reekynet/wireguard/mirkwood | grep PreSharedKey | cut -d' ' -f2-)" + +export WIREGUARD_MORIA_PRIVKEY="$(pass reekynet/wireguard/moria | grep PrivateKey | cut -d' ' -f2-)" +export WIREGUARD_MORIA_PUBKEY="$(pass reekynet/wireguard/moria | grep PublicKey | cut -d' ' -f2-)" diff --git a/secrets/secrets.sh b/secrets/secrets.sh index 78c68db6..724a5b9b 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -16,4 +16,11 @@ export PASS_MQTT="$PASS_MQTT" export ME_FULLNAME="$ME_FULLNAME" export ME_ADDRESS="$ME_ADDRESS" export ME_PHONE="$ME_PHONE" + +export WIREGUARD_MIRKWOOD_PRIVKEY="$WIREGUARD_MIRKWOOD_PRIVKEY" +export WIREGUARD_MIRKWOOD_PUBKEY="$WIREGUARD_MIRKWOOD_PUBKEY" +export WIREGUARD_MIRKWOOD_PSK="$WIREGUARD_MIRKWOOD_PSK" + +export WIREGUARD_MORIA_PRIVKEY="$WIREGUARD_MORIA_PRIVKEY" +export WIREGUARD_MORIA_PUBKEY="$WIREGUARD_MORIA_PUBKEY" SECRET From 193cf194133b2f1e5bb35e4f0122738296af7492 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:31:11 +0300 Subject: [PATCH 0249/2667] Back up network stuff --- config-root.yaml | 32 ++++++++++++++++++++ root/etc/systemd/network/01-wired.network | 8 +++++ root/etc/systemd/network/02-usb0.link | 6 ++++ root/etc/systemd/network/02-usb0.network | 8 +++++ root/etc/systemd/network/03-wireless.network | 8 +++++ root/etc/systemd/network/04-wlan0.link | 6 ++++ root/etc/systemd/network/04-wlan0.network | 8 +++++ 7 files changed, 76 insertions(+) create mode 100644 root/etc/systemd/network/01-wired.network create mode 100644 root/etc/systemd/network/02-usb0.link create mode 100644 root/etc/systemd/network/02-usb0.network create mode 100644 root/etc/systemd/network/03-wireless.network create mode 100644 root/etc/systemd/network/04-wlan0.link create mode 100644 root/etc/systemd/network/04-wlan0.network diff --git a/config-root.yaml b/config-root.yaml index 951c857f..fd19ec32 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -134,6 +134,30 @@ dotfiles: f_system.conf: src: etc/systemd/system.conf dst: /etc/systemd/system.conf + f_99-wireguard.netdev: + src: etc/systemd/network/99-wireguard.netdev + dst: /etc/systemd/network/99-wireguard.netdev + f_99-wireguard.network: + src: etc/systemd/network/99-wireguard.network + dst: /etc/systemd/network/99-wireguard.network + f_01-wired.network: + src: etc/systemd/network/01-wired.network + dst: /etc/systemd/network/01-wired.network + f_02-usb0.link: + src: etc/systemd/network/02-usb0.link + dst: /etc/systemd/network/02-usb0.link + f_02-usb0.network: + src: etc/systemd/network/02-usb0.network + dst: /etc/systemd/network/02-usb0.network + f_03-wireless.network: + src: etc/systemd/network/03-wireless.network + dst: /etc/systemd/network/03-wireless.network + f_04-wlan0.link: + src: etc/systemd/network/04-wlan0.link + dst: /etc/systemd/network/04-wlan0.link + f_04-wlan0.network: + src: etc/systemd/network/04-wlan0.network + dst: /etc/systemd/network/04-wlan0.network profiles: Locale: dotfiles: @@ -169,6 +193,14 @@ profiles: - f_vconsole.conf - f_20-quiet-printk.conf - f_system.conf + - f_99-wireguard.netdev + - f_99-wireguard.network + - f_01-wired.network + - f_02-usb0.link + - f_02-usb0.network + - f_03-wireless.network + - f_04-wlan0.link + - f_04-wlan0.network include: - Locale - Pacman diff --git a/root/etc/systemd/network/01-wired.network b/root/etc/systemd/network/01-wired.network new file mode 100644 index 00000000..de6a082a --- /dev/null +++ b/root/etc/systemd/network/01-wired.network @@ -0,0 +1,8 @@ +[Match] +Name=enp* + +[Network] +DHCP=ipv4 + +[DHCP] +RouteMetric=10 diff --git a/root/etc/systemd/network/02-usb0.link b/root/etc/systemd/network/02-usb0.link new file mode 100644 index 00000000..6167e221 --- /dev/null +++ b/root/etc/systemd/network/02-usb0.link @@ -0,0 +1,6 @@ +[Match] +MACAddress=00:e0:4c:68:05:90 + +[Link] +Description=USB to Ethernet Adapter +Name=usb0 diff --git a/root/etc/systemd/network/02-usb0.network b/root/etc/systemd/network/02-usb0.network new file mode 100644 index 00000000..29b43b08 --- /dev/null +++ b/root/etc/systemd/network/02-usb0.network @@ -0,0 +1,8 @@ +[Match] +Name=usb0 + +[Network] +DHCP=ipv4 + +[DHCP] +RouteMetric=10 diff --git a/root/etc/systemd/network/03-wireless.network b/root/etc/systemd/network/03-wireless.network new file mode 100644 index 00000000..3c39f957 --- /dev/null +++ b/root/etc/systemd/network/03-wireless.network @@ -0,0 +1,8 @@ +[Match] +Name=wlp* + +[Network] +DHCP=ipv4 + +[DHCP] +RouteMetric=20 diff --git a/root/etc/systemd/network/04-wlan0.link b/root/etc/systemd/network/04-wlan0.link new file mode 100644 index 00000000..407a7bf5 --- /dev/null +++ b/root/etc/systemd/network/04-wlan0.link @@ -0,0 +1,6 @@ +[Match] +MACAddress=dc:fb:48:2b:b7:86 + +[Link] +Description=Internal wireless adapter +Name=wlan0 diff --git a/root/etc/systemd/network/04-wlan0.network b/root/etc/systemd/network/04-wlan0.network new file mode 100644 index 00000000..16e7cfb2 --- /dev/null +++ b/root/etc/systemd/network/04-wlan0.network @@ -0,0 +1,8 @@ +[Match] +Name=wlan0 + +[Network] +DHCP=ipv4 + +[DHCP] +RouteMetric=20 From be4be91cd499e1b6b0edad5315d71fcc5a5c5a7a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:31:11 +0300 Subject: [PATCH 0250/2667] Back up network stuff --- config-root.yaml | 32 ++++++++++++++++++++ root/etc/systemd/network/01-wired.network | 8 +++++ root/etc/systemd/network/02-usb0.link | 6 ++++ root/etc/systemd/network/02-usb0.network | 8 +++++ root/etc/systemd/network/03-wireless.network | 8 +++++ root/etc/systemd/network/04-wlan0.link | 6 ++++ root/etc/systemd/network/04-wlan0.network | 8 +++++ 7 files changed, 76 insertions(+) create mode 100644 root/etc/systemd/network/01-wired.network create mode 100644 root/etc/systemd/network/02-usb0.link create mode 100644 root/etc/systemd/network/02-usb0.network create mode 100644 root/etc/systemd/network/03-wireless.network create mode 100644 root/etc/systemd/network/04-wlan0.link create mode 100644 root/etc/systemd/network/04-wlan0.network diff --git a/config-root.yaml b/config-root.yaml index 951c857f..fd19ec32 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -134,6 +134,30 @@ dotfiles: f_system.conf: src: etc/systemd/system.conf dst: /etc/systemd/system.conf + f_99-wireguard.netdev: + src: etc/systemd/network/99-wireguard.netdev + dst: /etc/systemd/network/99-wireguard.netdev + f_99-wireguard.network: + src: etc/systemd/network/99-wireguard.network + dst: /etc/systemd/network/99-wireguard.network + f_01-wired.network: + src: etc/systemd/network/01-wired.network + dst: /etc/systemd/network/01-wired.network + f_02-usb0.link: + src: etc/systemd/network/02-usb0.link + dst: /etc/systemd/network/02-usb0.link + f_02-usb0.network: + src: etc/systemd/network/02-usb0.network + dst: /etc/systemd/network/02-usb0.network + f_03-wireless.network: + src: etc/systemd/network/03-wireless.network + dst: /etc/systemd/network/03-wireless.network + f_04-wlan0.link: + src: etc/systemd/network/04-wlan0.link + dst: /etc/systemd/network/04-wlan0.link + f_04-wlan0.network: + src: etc/systemd/network/04-wlan0.network + dst: /etc/systemd/network/04-wlan0.network profiles: Locale: dotfiles: @@ -169,6 +193,14 @@ profiles: - f_vconsole.conf - f_20-quiet-printk.conf - f_system.conf + - f_99-wireguard.netdev + - f_99-wireguard.network + - f_01-wired.network + - f_02-usb0.link + - f_02-usb0.network + - f_03-wireless.network + - f_04-wlan0.link + - f_04-wlan0.network include: - Locale - Pacman diff --git a/root/etc/systemd/network/01-wired.network b/root/etc/systemd/network/01-wired.network new file mode 100644 index 00000000..de6a082a --- /dev/null +++ b/root/etc/systemd/network/01-wired.network @@ -0,0 +1,8 @@ +[Match] +Name=enp* + +[Network] +DHCP=ipv4 + +[DHCP] +RouteMetric=10 diff --git a/root/etc/systemd/network/02-usb0.link b/root/etc/systemd/network/02-usb0.link new file mode 100644 index 00000000..6167e221 --- /dev/null +++ b/root/etc/systemd/network/02-usb0.link @@ -0,0 +1,6 @@ +[Match] +MACAddress=00:e0:4c:68:05:90 + +[Link] +Description=USB to Ethernet Adapter +Name=usb0 diff --git a/root/etc/systemd/network/02-usb0.network b/root/etc/systemd/network/02-usb0.network new file mode 100644 index 00000000..29b43b08 --- /dev/null +++ b/root/etc/systemd/network/02-usb0.network @@ -0,0 +1,8 @@ +[Match] +Name=usb0 + +[Network] +DHCP=ipv4 + +[DHCP] +RouteMetric=10 diff --git a/root/etc/systemd/network/03-wireless.network b/root/etc/systemd/network/03-wireless.network new file mode 100644 index 00000000..3c39f957 --- /dev/null +++ b/root/etc/systemd/network/03-wireless.network @@ -0,0 +1,8 @@ +[Match] +Name=wlp* + +[Network] +DHCP=ipv4 + +[DHCP] +RouteMetric=20 diff --git a/root/etc/systemd/network/04-wlan0.link b/root/etc/systemd/network/04-wlan0.link new file mode 100644 index 00000000..407a7bf5 --- /dev/null +++ b/root/etc/systemd/network/04-wlan0.link @@ -0,0 +1,6 @@ +[Match] +MACAddress=dc:fb:48:2b:b7:86 + +[Link] +Description=Internal wireless adapter +Name=wlan0 diff --git a/root/etc/systemd/network/04-wlan0.network b/root/etc/systemd/network/04-wlan0.network new file mode 100644 index 00000000..16e7cfb2 --- /dev/null +++ b/root/etc/systemd/network/04-wlan0.network @@ -0,0 +1,8 @@ +[Match] +Name=wlan0 + +[Network] +DHCP=ipv4 + +[DHCP] +RouteMetric=20 From e10d1cf8b3e6a148804978301ea5b2c63b83177a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:33:25 +0300 Subject: [PATCH 0251/2667] Chmod wireguard stuff --- root/etc/systemd/network/99-wireguard.netdev | 14 ++++++++++++++ root/etc/systemd/network/99-wireguard.network | 9 +++++++++ 2 files changed, 23 insertions(+) create mode 100755 root/etc/systemd/network/99-wireguard.netdev create mode 100755 root/etc/systemd/network/99-wireguard.network diff --git a/root/etc/systemd/network/99-wireguard.netdev b/root/etc/systemd/network/99-wireguard.netdev new file mode 100755 index 00000000..dee034b1 --- /dev/null +++ b/root/etc/systemd/network/99-wireguard.netdev @@ -0,0 +1,14 @@ +[NetDev] +Name = wg0 +Kind = wireguard +Description = ReekyNET WireGuard + +[WireGuard] +PrivateKey = {{@@ env['WIREGUARD_MIRKWOOD_PRIVKEY'] @@}} + +[WireGuardPeer] +PublicKey = {{@@ env['WIREGUARD_MORIA_PUBKEY'] @@}} +PresharedKey = {{@@ env['WIREGUARD_MIRKWOOD_PSK'] @@}} +AllowedIPs = 10.200.0.0/24 +Endpoint = reekynet.com:48574 +PersistentKeepalive = 25 diff --git a/root/etc/systemd/network/99-wireguard.network b/root/etc/systemd/network/99-wireguard.network new file mode 100755 index 00000000..569d7692 --- /dev/null +++ b/root/etc/systemd/network/99-wireguard.network @@ -0,0 +1,9 @@ +[Match] +Name = wg0 + +[Network] +Address = 10.200.200.2/24 + +[Route] +Gateway = 10.200.200.1 +Destination = 10.200.200.0/24 From 124ac1dce8a550a2ce8775e07bc8bfa29097a5ab Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:33:25 +0300 Subject: [PATCH 0252/2667] Chmod wireguard stuff --- root/etc/systemd/network/99-wireguard.netdev | 14 ++++++++++++++ root/etc/systemd/network/99-wireguard.network | 9 +++++++++ 2 files changed, 23 insertions(+) create mode 100755 root/etc/systemd/network/99-wireguard.netdev create mode 100755 root/etc/systemd/network/99-wireguard.network diff --git a/root/etc/systemd/network/99-wireguard.netdev b/root/etc/systemd/network/99-wireguard.netdev new file mode 100755 index 00000000..dee034b1 --- /dev/null +++ b/root/etc/systemd/network/99-wireguard.netdev @@ -0,0 +1,14 @@ +[NetDev] +Name = wg0 +Kind = wireguard +Description = ReekyNET WireGuard + +[WireGuard] +PrivateKey = {{@@ env['WIREGUARD_MIRKWOOD_PRIVKEY'] @@}} + +[WireGuardPeer] +PublicKey = {{@@ env['WIREGUARD_MORIA_PUBKEY'] @@}} +PresharedKey = {{@@ env['WIREGUARD_MIRKWOOD_PSK'] @@}} +AllowedIPs = 10.200.0.0/24 +Endpoint = reekynet.com:48574 +PersistentKeepalive = 25 diff --git a/root/etc/systemd/network/99-wireguard.network b/root/etc/systemd/network/99-wireguard.network new file mode 100755 index 00000000..569d7692 --- /dev/null +++ b/root/etc/systemd/network/99-wireguard.network @@ -0,0 +1,9 @@ +[Match] +Name = wg0 + +[Network] +Address = 10.200.200.2/24 + +[Route] +Gateway = 10.200.200.1 +Destination = 10.200.200.0/24 From ea378239e04986e0049b580ea32d6205045484eb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:38:39 +0300 Subject: [PATCH 0253/2667] Change icon theme and misc stuff --- home/.config/sway/conf.d/06-keybinds.conf | 7 ++++++- home/.config/sway/conf.d/08-exec.conf | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 2c4249c4..88351cd6 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -29,7 +29,7 @@ bindsym --locked XF86Search output eDP-1 toggle # exit menu bindsym $mod+Shift+e exec $term --class fzf-launcher -e $HOME/Scripts/sway-exit.sh # launch a program -bindsym $mod+d exec wofi --show drun +bindsym $mod+d exec wofi bindsym $mod+Shift+d exec wofi --show run # password manager bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass @@ -138,6 +138,11 @@ bindsym $mod+Control+k output eDP-1 transform 0 bindsym XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob bindsym XF86MonBrightnessDown exec light -U 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob +# Some built-in keyboard keys +bindsym XF86Mail workspace 4 +bindsym XF86Messenger workspace 3 +bindsym XF86Calculator exec alacritty -e calc + # Switch to urgent workspace bindsym $mod+u [urgent=latest] focus diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 9536b761..5ef5045f 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -18,7 +18,7 @@ exec { exec_always { gsettings set $gnome-schema gtk-theme 'vimix-dark-doder' - gsettings set $gnome-schema icon-theme 'Numix' + gsettings set $gnome-schema icon-theme 'Papirus-Dark' gsettings set $gnome-schema cursor-theme 'Breeze' gsettings set $gnome-schema font-name 'Overpass 12' gsettings set $gnome-schema document-font-name 'Overpass 12' From ed38479befecb31c80f5311bfc55705a558ea940 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:38:39 +0300 Subject: [PATCH 0254/2667] Change icon theme and misc stuff --- home/.config/sway/conf.d/06-keybinds.conf | 7 ++++++- home/.config/sway/conf.d/08-exec.conf | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 2c4249c4..88351cd6 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -29,7 +29,7 @@ bindsym --locked XF86Search output eDP-1 toggle # exit menu bindsym $mod+Shift+e exec $term --class fzf-launcher -e $HOME/Scripts/sway-exit.sh # launch a program -bindsym $mod+d exec wofi --show drun +bindsym $mod+d exec wofi bindsym $mod+Shift+d exec wofi --show run # password manager bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass @@ -138,6 +138,11 @@ bindsym $mod+Control+k output eDP-1 transform 0 bindsym XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob bindsym XF86MonBrightnessDown exec light -U 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob +# Some built-in keyboard keys +bindsym XF86Mail workspace 4 +bindsym XF86Messenger workspace 3 +bindsym XF86Calculator exec alacritty -e calc + # Switch to urgent workspace bindsym $mod+u [urgent=latest] focus diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 9536b761..5ef5045f 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -18,7 +18,7 @@ exec { exec_always { gsettings set $gnome-schema gtk-theme 'vimix-dark-doder' - gsettings set $gnome-schema icon-theme 'Numix' + gsettings set $gnome-schema icon-theme 'Papirus-Dark' gsettings set $gnome-schema cursor-theme 'Breeze' gsettings set $gnome-schema font-name 'Overpass 12' gsettings set $gnome-schema document-font-name 'Overpass 12' From f7f6f8fa49629bc38608371b56e80dcb22e315d1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:39:00 +0300 Subject: [PATCH 0255/2667] Remove deprecated keys --- home/.config/alacritty/alacritty.yml | 45 +++++++++++++--------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml index 24c86093..33b45f18 100644 --- a/home/.config/alacritty/alacritty.yml +++ b/home/.config/alacritty/alacritty.yml @@ -11,9 +11,6 @@ window: scrolling: history: 10000 multiplier: 3 - auto_scroll: false - -tabspaces: 8 font: normal: @@ -31,40 +28,40 @@ font: colors: # Default colors primary: - background: '0x282c34' - foreground: '0xabb2bf' + background: "0x282c34" + foreground: "0xabb2bf" # Cursor colors cursor: - text: '0x282c34' - cursor: '0xabb2bf' + text: "0x282c34" + cursor: "0xabb2bf" # Normal colors normal: - black: '0x282c34' - red: '0xe06c75' - green: '0x98c379' - yellow: '0xe5c07b' - blue: '0x61afef' - magenta: '0xc678dd' - cyan: '0x56b6c2' - white: '0xabb2bf' + black: "0x282c34" + red: "0xe06c75" + green: "0x98c379" + yellow: "0xe5c07b" + blue: "0x61afef" + magenta: "0xc678dd" + cyan: "0x56b6c2" + white: "0xabb2bf" # Bright colors bright: - black: '0x3e4452' - red: '0xbe5046' - green: '0x98c379' - yellow: '0xd19a66' - blue: '0x61afef' - magenta: '0xc678dd' - cyan: '0x56b6c2' - white: '0x5c6370' + black: "0x3e4452" + red: "0xbe5046" + green: "0x98c379" + yellow: "0xd19a66" + blue: "0x61afef" + magenta: "0xc678dd" + cyan: "0x56b6c2" + white: "0x5c6370" visual_bell: animation: EaseOutExpo duration: 0 - color: '#ffffff' + color: "#ffffff" background_opacity: 1.0 From 404a25c690dded71d29a5e93a2122054bbe1fc93 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:39:00 +0300 Subject: [PATCH 0256/2667] Remove deprecated keys --- home/.config/alacritty/alacritty.yml | 45 +++++++++++++--------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml index 24c86093..33b45f18 100644 --- a/home/.config/alacritty/alacritty.yml +++ b/home/.config/alacritty/alacritty.yml @@ -11,9 +11,6 @@ window: scrolling: history: 10000 multiplier: 3 - auto_scroll: false - -tabspaces: 8 font: normal: @@ -31,40 +28,40 @@ font: colors: # Default colors primary: - background: '0x282c34' - foreground: '0xabb2bf' + background: "0x282c34" + foreground: "0xabb2bf" # Cursor colors cursor: - text: '0x282c34' - cursor: '0xabb2bf' + text: "0x282c34" + cursor: "0xabb2bf" # Normal colors normal: - black: '0x282c34' - red: '0xe06c75' - green: '0x98c379' - yellow: '0xe5c07b' - blue: '0x61afef' - magenta: '0xc678dd' - cyan: '0x56b6c2' - white: '0xabb2bf' + black: "0x282c34" + red: "0xe06c75" + green: "0x98c379" + yellow: "0xe5c07b" + blue: "0x61afef" + magenta: "0xc678dd" + cyan: "0x56b6c2" + white: "0xabb2bf" # Bright colors bright: - black: '0x3e4452' - red: '0xbe5046' - green: '0x98c379' - yellow: '0xd19a66' - blue: '0x61afef' - magenta: '0xc678dd' - cyan: '0x56b6c2' - white: '0x5c6370' + black: "0x3e4452" + red: "0xbe5046" + green: "0x98c379" + yellow: "0xd19a66" + blue: "0x61afef" + magenta: "0xc678dd" + cyan: "0x56b6c2" + white: "0x5c6370" visual_bell: animation: EaseOutExpo duration: 0 - color: '#ffffff' + color: "#ffffff" background_opacity: 1.0 From 218ae90ff821450076a9fce15b2c3c1eb6abd724 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:39:08 +0300 Subject: [PATCH 0257/2667] Maintenance --- config-root.yaml | 138 ++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 81 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index fd19ec32..a35e1b29 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -1,3 +1,5 @@ +actions: + chmod-wireguard: chmod 0640 /etc/systemd/network/99-wireguard.netdev config: backup: true banner: true @@ -17,6 +19,11 @@ dotfiles: d_bin: dst: /usr/local/bin src: usr/local/bin + d_networkd: + actions: + - chmod-wireguard + src: etc/systemd/network + dst: /etc/systemd/network f_99-sysctl.conf: dst: /etc/sysctl.d/99-sysctl.conf src: etc/sysctl.d/99-sysctl.conf @@ -134,98 +141,67 @@ dotfiles: f_system.conf: src: etc/systemd/system.conf dst: /etc/systemd/system.conf - f_99-wireguard.netdev: - src: etc/systemd/network/99-wireguard.netdev - dst: /etc/systemd/network/99-wireguard.netdev - f_99-wireguard.network: - src: etc/systemd/network/99-wireguard.network - dst: /etc/systemd/network/99-wireguard.network - f_01-wired.network: - src: etc/systemd/network/01-wired.network - dst: /etc/systemd/network/01-wired.network - f_02-usb0.link: - src: etc/systemd/network/02-usb0.link - dst: /etc/systemd/network/02-usb0.link - f_02-usb0.network: - src: etc/systemd/network/02-usb0.network - dst: /etc/systemd/network/02-usb0.network - f_03-wireless.network: - src: etc/systemd/network/03-wireless.network - dst: /etc/systemd/network/03-wireless.network - f_04-wlan0.link: - src: etc/systemd/network/04-wlan0.link - dst: /etc/systemd/network/04-wlan0.link - f_04-wlan0.network: - src: etc/systemd/network/04-wlan0.network - dst: /etc/systemd/network/04-wlan0.network profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf - - f_pacman-dl.service - - f_pacman-dl.timer + - f_pacman.conf + - f_pacserve.service.conf + - f_pacman-dl.service + - f_pacman-dl.timer Mirkwood: dotfiles: - - f_getty.conf - - f_environment - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_zsh.hook - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_99-wireguard.netdev - - f_99-wireguard.network - - f_01-wired.network - - f_02-usb0.link - - f_02-usb0.network - - f_03-wireless.network - - f_04-wlan0.link - - f_04-wlan0.network + - f_getty.conf + - f_environment + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - d_networkd + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_zsh.hook + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config - - f_nightly-reboot.service - - f_nightly-reboot.timer + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_sshd_config + - f_nightly-reboot.service + - f_nightly-reboot.timer Moria: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_ipmi-static.service - - f_ipmi-temp.service - - f_ipmi-temp.timer - - f_ipmi-fans.service - - f_ipmi-fans.timer + - f_sshd_config + - f_99-sysctl.conf + - f_ipmi-static.service + - f_ipmi-temp.service + - f_ipmi-temp.timer + - f_ipmi-fans.service + - f_ipmi-fans.timer From 77952b0622ab11784f1364d5fd61c305ef274fda Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:39:08 +0300 Subject: [PATCH 0258/2667] Maintenance --- config-root.yaml | 138 ++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 81 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index fd19ec32..a35e1b29 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -1,3 +1,5 @@ +actions: + chmod-wireguard: chmod 0640 /etc/systemd/network/99-wireguard.netdev config: backup: true banner: true @@ -17,6 +19,11 @@ dotfiles: d_bin: dst: /usr/local/bin src: usr/local/bin + d_networkd: + actions: + - chmod-wireguard + src: etc/systemd/network + dst: /etc/systemd/network f_99-sysctl.conf: dst: /etc/sysctl.d/99-sysctl.conf src: etc/sysctl.d/99-sysctl.conf @@ -134,98 +141,67 @@ dotfiles: f_system.conf: src: etc/systemd/system.conf dst: /etc/systemd/system.conf - f_99-wireguard.netdev: - src: etc/systemd/network/99-wireguard.netdev - dst: /etc/systemd/network/99-wireguard.netdev - f_99-wireguard.network: - src: etc/systemd/network/99-wireguard.network - dst: /etc/systemd/network/99-wireguard.network - f_01-wired.network: - src: etc/systemd/network/01-wired.network - dst: /etc/systemd/network/01-wired.network - f_02-usb0.link: - src: etc/systemd/network/02-usb0.link - dst: /etc/systemd/network/02-usb0.link - f_02-usb0.network: - src: etc/systemd/network/02-usb0.network - dst: /etc/systemd/network/02-usb0.network - f_03-wireless.network: - src: etc/systemd/network/03-wireless.network - dst: /etc/systemd/network/03-wireless.network - f_04-wlan0.link: - src: etc/systemd/network/04-wlan0.link - dst: /etc/systemd/network/04-wlan0.link - f_04-wlan0.network: - src: etc/systemd/network/04-wlan0.network - dst: /etc/systemd/network/04-wlan0.network profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf - - f_pacman-dl.service - - f_pacman-dl.timer + - f_pacman.conf + - f_pacserve.service.conf + - f_pacman-dl.service + - f_pacman-dl.timer Mirkwood: dotfiles: - - f_getty.conf - - f_environment - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_zsh.hook - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_99-wireguard.netdev - - f_99-wireguard.network - - f_01-wired.network - - f_02-usb0.link - - f_02-usb0.network - - f_03-wireless.network - - f_04-wlan0.link - - f_04-wlan0.network + - f_getty.conf + - f_environment + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - d_networkd + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_zsh.hook + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config - - f_nightly-reboot.service - - f_nightly-reboot.timer + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_sshd_config + - f_nightly-reboot.service + - f_nightly-reboot.timer Moria: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_ipmi-static.service - - f_ipmi-temp.service - - f_ipmi-temp.timer - - f_ipmi-fans.service - - f_ipmi-fans.timer + - f_sshd_config + - f_99-sysctl.conf + - f_ipmi-static.service + - f_ipmi-temp.service + - f_ipmi-temp.timer + - f_ipmi-fans.service + - f_ipmi-fans.timer From aa84653a5c9a26afbfdc7102eba9c52d84504bcc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Apr 2020 13:28:12 +0300 Subject: [PATCH 0259/2667] Cleaned up input.conf --- home/.config/sway/conf.d/03-input.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/sway/conf.d/03-input.conf b/home/.config/sway/conf.d/03-input.conf index dc3b2dad..1f1a7394 100644 --- a/home/.config/sway/conf.d/03-input.conf +++ b/home/.config/sway/conf.d/03-input.conf @@ -1,11 +1,11 @@ # vim:ft=i3config -input * { +input type:keyboard { xkb_layout eu xkb_options caps:escape } -input "1739:32382:DELL0884:00_06CB:7E7E_Touchpad" { +input type:touchpad { tap enabled natural_scroll enabled } From 2b15ddf18e8cbd658409ff062f0c452bb3495917 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Apr 2020 13:28:12 +0300 Subject: [PATCH 0260/2667] Cleaned up input.conf --- home/.config/sway/conf.d/03-input.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/sway/conf.d/03-input.conf b/home/.config/sway/conf.d/03-input.conf index dc3b2dad..1f1a7394 100644 --- a/home/.config/sway/conf.d/03-input.conf +++ b/home/.config/sway/conf.d/03-input.conf @@ -1,11 +1,11 @@ # vim:ft=i3config -input * { +input type:keyboard { xkb_layout eu xkb_options caps:escape } -input "1739:32382:DELL0884:00_06CB:7E7E_Touchpad" { +input type:touchpad { tap enabled natural_scroll enabled } From 5983c567de6494129e06bf13449d103146a74cea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Apr 2020 13:29:13 +0300 Subject: [PATCH 0261/2667] Added new mediaplayer script for waybar --- home/.config/waybar/config | 12 +- home/.config/waybar/style.css | 4 +- home/Scripts/fzf-pass.sh | 1 - home/Scripts/mediaplayer.py | 126 ++++++++++++++++++++ home/Scripts/metadata.sh | 9 -- home/Scripts/mpvqueue | 11 +- home/Scripts/panextsink.sh | 32 ----- home/Scripts/sway-launcher-desktop.sh | 165 -------------------------- home/Scripts/swayidle.sh | 8 +- home/Scripts/switchlayout.sh | 8 -- 10 files changed, 142 insertions(+), 234 deletions(-) delete mode 100755 home/Scripts/fzf-pass.sh create mode 100755 home/Scripts/mediaplayer.py delete mode 100755 home/Scripts/metadata.sh delete mode 100644 home/Scripts/panextsink.sh delete mode 100755 home/Scripts/sway-launcher-desktop.sh delete mode 100755 home/Scripts/switchlayout.sh diff --git a/home/.config/waybar/config b/home/.config/waybar/config index c8e8fe77..359ea57c 100644 --- a/home/.config/waybar/config +++ b/home/.config/waybar/config @@ -2,7 +2,7 @@ { "layer": "bottom", // Waybar at top layer "height": 22, // Waybar height - "modules-left": ["sway/workspaces", "sway/mode", "custom/playerctl"], + "modules-left": ["sway/workspaces", "sway/mode", "custom/media"], "modules-center": ["sway/window"], "modules-right": [ "idle_inhibitor", @@ -107,12 +107,12 @@ "on-scroll-up": "pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob", "on-scroll-down": "pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob" }, - "custom/playerctl": { + "custom/media": { "tooltip": false, "format": "{}", - "exec": "$HOME/Scripts/metadata.sh", - "interval": 2, - "max-length": 40, + "return-type": "json", + "exec": "$HOME/Scripts/mediaplayer.py 2>/dev/null", + "max-length": 50, "on-click": "playerctl play-pause", "on-click-right": "playerctl next", "on-scroll-up": "playerctl volume 0.05+", @@ -123,7 +123,7 @@ "format": "{} ", "exec": "yay -Qu | wc -l", "interval": 300, - "on-click": "alacritty -e yay" + "on-click": "gnome-software --mode=updates" }, "temperature": { "format": "{temperatureC}°C " diff --git a/home/.config/waybar/style.css b/home/.config/waybar/style.css index 78fcae7a..7610afcd 100644 --- a/home/.config/waybar/style.css +++ b/home/.config/waybar/style.css @@ -26,7 +26,7 @@ window#waybar { background: #64727D; } -#clock, #battery, #cpu, #temperature, #memory, #backlight, #network, #pulseaudio, #custom-playerctl, #custom-yay, #tray, #mode, #idle_inhibitor { +#clock, #battery, #cpu, #temperature, #memory, #backlight, #network, #pulseaudio, #custom-media, #custom-yay, #tray, #mode, #idle_inhibitor { padding: 0 10px; margin: 0 5px; } @@ -110,7 +110,7 @@ window#waybar { color: #2a5c45; } -#custom-playerctl { +#custom-media { background: #97B084; color: black; } diff --git a/home/Scripts/fzf-pass.sh b/home/Scripts/fzf-pass.sh deleted file mode 100755 index 61e512a7..00000000 --- a/home/Scripts/fzf-pass.sh +++ /dev/null @@ -1 +0,0 @@ -Moved to https://git.reekynet.com/ReekyMarko/fzf-pass diff --git a/home/Scripts/mediaplayer.py b/home/Scripts/mediaplayer.py new file mode 100755 index 00000000..aa9dc613 --- /dev/null +++ b/home/Scripts/mediaplayer.py @@ -0,0 +1,126 @@ +#!/usr/bin/env python3 +import argparse +import logging +import sys +import signal +import gi +import json +gi.require_version('Playerctl', '2.0') +from gi.repository import Playerctl, GLib + +logger = logging.getLogger(__name__) + + +def write_output(text, player): + logger.info('Writing output') + + output = {'text': text, + 'class': 'custom-' + player.props.player_name, + 'alt': player.props.player_name} + + sys.stdout.write(json.dumps(output) + '\n') + sys.stdout.flush() + + +def on_play(player, status, manager): + logger.info('Received new playback status') + on_metadata(player, player.props.metadata, manager) + + +def on_metadata(player, metadata, manager): + logger.info('Received new metadata') + track_info = '' + + if player.get_artist() != '' and player.get_title() != '': + track_info = '{artist} - {title}'.format(artist=player.get_artist(), + title=player.get_title()) + else: + track_info = player.get_title() + + if player.props.status == 'Playing' and track_info: + track_info = ' ' + track_info + else: + track_info = ' ' + track_info + + write_output(track_info, player) + + +def on_player_appeared(manager, player, selected_player=None): + if player is not None and (selected_player is None or player.name == selected_player): + init_player(manager, player) + else: + logger.debug("New player appeared, but it's not the selected player, skipping") + + +def on_player_vanished(manager, player): + logger.info('Player has vanished') + sys.stdout.write('\n') + sys.stdout.flush() + + +def init_player(manager, name): + logger.debug('Initialize player: {player}'.format(player=name.name)) + player = Playerctl.Player.new_from_name(name) + player.connect('playback-status', on_play, manager) + player.connect('metadata', on_metadata, manager) + manager.manage_player(player) + on_metadata(player, player.props.metadata, manager) + + +def signal_handler(sig, frame): + logger.debug('Received signal to stop, exiting') + sys.stdout.write('\n') + sys.stdout.flush() + # loop.quit() + sys.exit(0) + + +def parse_arguments(): + parser = argparse.ArgumentParser() + + # Increase verbosity with every occurence of -v + parser.add_argument('-v', '--verbose', action='count', default=0) + + # Define for which player we're listening + parser.add_argument('--player') + + return parser.parse_args() + + +def main(): + arguments = parse_arguments() + + # Initialize logging + logging.basicConfig(stream=sys.stderr, level=logging.DEBUG, + format='%(name)s %(levelname)s %(message)s') + + # Logging is set by default to WARN and higher. + # With every occurrence of -v it's lowered by one + logger.setLevel(max((3 - arguments.verbose) * 10, 0)) + + # Log the sent command line arguments + logger.debug('Arguments received {}'.format(vars(arguments))) + + manager = Playerctl.PlayerManager() + loop = GLib.MainLoop() + + manager.connect('name-appeared', lambda *args: on_player_appeared(*args, arguments.player)) + manager.connect('player-vanished', on_player_vanished) + + signal.signal(signal.SIGINT, signal_handler) + signal.signal(signal.SIGTERM, signal_handler) + + for player in manager.props.player_names: + if arguments.player is not None and arguments.player != player.name: + logger.debug('{player} is not the filtered player, skipping it' + .format(player=player.name) + ) + continue + + init_player(manager, player) + + loop.run() + + +if __name__ == '__main__': + main() diff --git a/home/Scripts/metadata.sh b/home/Scripts/metadata.sh deleted file mode 100755 index 91689b31..00000000 --- a/home/Scripts/metadata.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -ARTIST=$(playerctl metadata | grep 'xesam:artist' | cut -d' ' -f5- | sed 's/^[ \t]*//') -TITLE=$(playerctl metadata title) - -if [ -n "$ARTIST" ]; then - echo "$ARTIST - $TITLE" -else - echo "$TITLE" -fi diff --git a/home/Scripts/mpvqueue b/home/Scripts/mpvqueue index a3fe6d96..81e40f41 100755 --- a/home/Scripts/mpvqueue +++ b/home/Scripts/mpvqueue @@ -3,13 +3,7 @@ MPVPIPE=/tmp/mpvqueue.playlist notify="notify-send -i mpv -a mpv" - -# if link is a youtube playlist, clean up url -if [[ ${1} =~ /^((?:https?:)?\/\/)?((?:www|m)\.)?((?:youtube\.com|youtu.be))(\/(?:[\w\-]+\?v=|embed\/|v\/)?)([\w\-]+)(\S+)?$ ]]; then - url="https://youtube.com/playlist?list=${1#*list=}" -else - url="$1" -fi +url="$1" # See if MPV is already running if [ -z "$(pidof mpv)" ]; then @@ -17,6 +11,9 @@ if [ -z "$(pidof mpv)" ]; then # remove fifo rm -f $MPVPIPE && mkfifo $MPVPIPE + # pause other players + playerctl pause + # start mpv /usr/bin/mpv --no-terminal --input-file="${MPVPIPE}" "$url" & disown diff --git a/home/Scripts/panextsink.sh b/home/Scripts/panextsink.sh deleted file mode 100644 index d3338391..00000000 --- a/home/Scripts/panextsink.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Get the pid of the window that is to be moved to the next sink -pid_to_move=$(swaymsg -t get_tree | jq -r '.nodes[]?.nodes[]?.nodes[]?.nodes[]?.nodes[] | select(.focused==true).pid') - -# Assign all the sink indices into an array -sink_array=($(pacmd list-sinks | grep index | sed 's/index://' | sed 's/*//' | xargs)) - -# Get the sink inputs to prepare to be inserted into array of arrays -# The following raw string format is index sink pid\nindex sink pid -sink_inputs_raw=$(pacmd list-sink-inputs | grep -e index -e sink: -e process.id | sed 's/<[^"]*>//' | sed 's/[^0-9]*//g' | tr '\n' ' ' | xargs | sed 's/\([[:digit:]]*\) \([[:digit:]]*\) \([[:digit:]]*\) /\1 \2 \3\n/g') - -# Find the corresponding pid -sink_input_selected_pid=$(echo "$sink_inputs_raw" | grep $pid_to_move) - -# Parse the individual values from the info retrieved above -selected_input_index=$(echo $sink_input_selected_pid | awk '{print $1;}') -selected_input_sink=$(echo $sink_input_selected_pid | awk '{print $2;}') -selected_input_pid=$(echo $sink_input_selected_pid | awk '{print $3;}') - -len=${#sink_array[@]} - -for (( i=0; i<$len; i++ )); do - if [[ $selected_input_sink == "${sink_array[$i]}" ]]; then - len_idx=$((len-1)) - if (( $i == $len_idx )); then - pacmd move-sink-input $selected_input_index ${sink_array[0]} - else - pacmd move-sink-input $selected_input_index ${sink_array[$((i+1))]} - fi - fi -done diff --git a/home/Scripts/sway-launcher-desktop.sh b/home/Scripts/sway-launcher-desktop.sh deleted file mode 100755 index efcb8e2d..00000000 --- a/home/Scripts/sway-launcher-desktop.sh +++ /dev/null @@ -1,165 +0,0 @@ -#!/usr/bin/env bash -# terminal application launcher for sway, using fzf -# Based on: https://gitlab.com/FlyingWombat/my-scripts/blob/master/sway-launcher - -shopt -s nullglob -if [[ "$1" == 'describe' ]]; then - shift - if [[ $2 == 'command' ]]; then - title=$1 - readarray arr < <(whatis -l "$1" 2>/dev/null) - description="${arr[0]}" - description="${description%*-}" - else - title=$(sed -ne '/^Name=/{s/^Name=//;p;q}' "$1") - description=$(sed -ne '/^Comment=/{s/^Comment=//;p;q}' "$1") - fi - echo -e "\033[33m$title\033[0m" - echo "${description:-No description}" - exit -fi - -HIST_FILE="${XDG_CACHE_HOME:-$HOME/.cache}/${0##*/}-history.txt" - -DIRS=( - /usr/share/applications - "$HOME/.local/share/applications" - /usr/local/share/applications -) - -GLYPH_COMMAND=" " -GLYPH_DESKTOP=" " - -touch "$HIST_FILE" -readarray HIST_LINES <"$HIST_FILE" -FZFPIPE=$(mktemp) -PIDFILE=$(mktemp) -trap 'rm "$FZFPIPE" "$PIDFILE"' EXIT INT - -# Append Launcher History, removing usage count -(printf '%s' "${HIST_LINES[@]#* }" >>"$FZFPIPE") & - -# Load and append Desktop entries -( - for dir in "${DIRS[@]}"; do - [[ -d "$dir" ]] || continue - awk -v pre="$GLYPH_DESKTOP" -F= ' - BEGINFILE{application=0;block="";a=0} - /^\[Desktop Entry\]/{block="entry"} - /^Type=Application/{application=1} - /^\[Desktop Action/{ - sub("^\\[Desktop Action ", ""); - sub("\\]$", ""); - block="action"; - a++; - actions[a,"key"]=$0 - } - /^Name=/{ - if(block=="action") { - actions[a,"name"]=$2; - } else { - name=$2 - } - } - ENDFILE{ - if (application){ - print FILENAME "\034desktop\034\033[33m" pre name "\033[0m"; - if (a>0) - for (i=1; i<=a; i++) - print FILENAME "\034desktop\034\033[33m" pre name "\033[0m (" actions[i, "name"] ")\034" actions[i, "key"] - } - }' \ - "$dir/"*.desktop >"$FZFPIPE" - # the empty stdin is needed in case no *.desktop files - done -) & - -# Load and append command list -( - IFS=: - read -ra path <<<"$PATH" - for dir in "${path[@]}"; do - printf '%s\n' "$dir/"* | - awk -F / -v pre="$GLYPH_COMMAND" '{print $NF "\034command\034\033[31m" pre "\033[0m" $NF;}' - done | sort -u >>"$FZFPIPE" -) & - -COMMAND_STR=$( - ( - tail -n +0 -f "$FZFPIPE" & - echo $! >"$PIDFILE" - ) | - fzf +s -x -d '\034' --nth ..3 --with-nth 3 \ - --preview "$0 describe {1} {2}" \ - --preview-window=up:3:wrap --ansi - kill -9 "$(<"$PIDFILE")" | tail -n1 -) || exit 1 - -[ -z "$COMMAND_STR" ] && exit 1 - -# update history -for i in "${!HIST_LINES[@]}"; do - if [[ "${HIST_LINES[i]}" == *" $COMMAND_STR"$'\n' ]]; then - HIST_COUNT=${HIST_LINES[i]%% *} - HIST_LINES[$i]="$((HIST_COUNT + 1)) $COMMAND_STR"$'\n' - match=1 - break - fi -done -if ! ((match)); then - HIST_LINES+=("1 $COMMAND_STR"$'\n') -fi - -printf '%s' "${HIST_LINES[@]}" | sort -nr >"$HIST_FILE" - -command='echo "nope"' -# shellcheck disable=SC2086 -readarray -d $'\034' -t PARAMS <<<${COMMAND_STR} -# COMMAND_STR is "\034" -case ${PARAMS[1]} in -desktop) - # Define the search pattern that specifies the block to search for within the .desktop file - PATTERN="^\\\\[Desktop Entry\\\\]" - if [[ -n ${PARAMS[3]} ]]; then - PATTERN="^\\\\[Desktop Action ${PARAMS[3]%?}\\\\]" - fi - # 1. We see a line starting [Desktop, but we're already searching: deactivate search again - # 2. We see the specified pattern: start search - # 3. We see an Exec= line during search: remove field codes and set variable - # 3. We see a Path= line during search: set variable - # 4. Finally, build command line - command=$(awk -v pattern="${PATTERN}" -F= ' - BEGIN{a=0;exec=0; path=0} - /^\[Desktop/{ - if(a){ - a=0 - } - } - $0 ~ pattern{ - a=1 - } - /^Exec=/{ - if(a && !exec){ - sub("^Exec=", ""); - gsub(" ?%[cDdFfikmNnUuv]", ""); - exec=$0; - } - } - /^Path=/{ - if(a && !path){ - path=$2 - } - } - - END{ - if(path){ - print "cd " path " &&" - } - print exec - }' "${PARAMS[0]}") - ;; -command) - command="${PARAMS[0]}" - ;; -esac -swaymsg -t command exec "$command" diff --git a/home/Scripts/swayidle.sh b/home/Scripts/swayidle.sh index 87ad8998..bc851146 100755 --- a/home/Scripts/swayidle.sh +++ b/home/Scripts/swayidle.sh @@ -1,13 +1,13 @@ #!/bin/bash swaylock="$HOME/Scripts/swaylock.sh" -dimscreen="$HOME/Scripts/dim-screen.sh" screenon="swaymsg 'output * dpms on'" screenoff="swaymsg 'output * dpms off'" swayidle \ lock "$swaylock" \ + unlock "pkill -9 swaylock" \ timeout 300 "lqsd -d" \ resume "lqsd -r" \ - timeout 600 "loginctl lock-session $(loginctl show-user $USER -p Sessions | cut -d'=' -f2); sleep 0.5; $screenoff" \ + timeout 600 "loginctl lock-session" \ + timeout 610 "$screenoff" \ resume "$screenon; lqsd -r" \ - before-sleep "playerctl pause; loginctl lock-session $(loginctl show-user $USER -p Sessions | cut -d'=' -f2)" \ - unlock "pkill -9 swaylock" + before-sleep "playerctl pause; loginctl lock-session)" diff --git a/home/Scripts/switchlayout.sh b/home/Scripts/switchlayout.sh deleted file mode 100755 index 66fa8351..00000000 --- a/home/Scripts/switchlayout.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -curLayout=$(setxkbmap -query | grep layout | sed 's/layout: //g') - -if [ $curLayout == "eu" ]; then - setxkbmap dvorak -else - setxkbmap eu -fi From 8b06f68da787b2d2d93e72cca1e1569309bffd78 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Apr 2020 13:29:13 +0300 Subject: [PATCH 0262/2667] Added new mediaplayer script for waybar --- home/.config/waybar/config | 12 +- home/.config/waybar/style.css | 4 +- home/Scripts/fzf-pass.sh | 1 - home/Scripts/mediaplayer.py | 126 ++++++++++++++++++++ home/Scripts/metadata.sh | 9 -- home/Scripts/mpvqueue | 11 +- home/Scripts/panextsink.sh | 32 ----- home/Scripts/sway-launcher-desktop.sh | 165 -------------------------- home/Scripts/swayidle.sh | 8 +- home/Scripts/switchlayout.sh | 8 -- 10 files changed, 142 insertions(+), 234 deletions(-) delete mode 100755 home/Scripts/fzf-pass.sh create mode 100755 home/Scripts/mediaplayer.py delete mode 100755 home/Scripts/metadata.sh delete mode 100644 home/Scripts/panextsink.sh delete mode 100755 home/Scripts/sway-launcher-desktop.sh delete mode 100755 home/Scripts/switchlayout.sh diff --git a/home/.config/waybar/config b/home/.config/waybar/config index c8e8fe77..359ea57c 100644 --- a/home/.config/waybar/config +++ b/home/.config/waybar/config @@ -2,7 +2,7 @@ { "layer": "bottom", // Waybar at top layer "height": 22, // Waybar height - "modules-left": ["sway/workspaces", "sway/mode", "custom/playerctl"], + "modules-left": ["sway/workspaces", "sway/mode", "custom/media"], "modules-center": ["sway/window"], "modules-right": [ "idle_inhibitor", @@ -107,12 +107,12 @@ "on-scroll-up": "pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob", "on-scroll-down": "pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob" }, - "custom/playerctl": { + "custom/media": { "tooltip": false, "format": "{}", - "exec": "$HOME/Scripts/metadata.sh", - "interval": 2, - "max-length": 40, + "return-type": "json", + "exec": "$HOME/Scripts/mediaplayer.py 2>/dev/null", + "max-length": 50, "on-click": "playerctl play-pause", "on-click-right": "playerctl next", "on-scroll-up": "playerctl volume 0.05+", @@ -123,7 +123,7 @@ "format": "{} ", "exec": "yay -Qu | wc -l", "interval": 300, - "on-click": "alacritty -e yay" + "on-click": "gnome-software --mode=updates" }, "temperature": { "format": "{temperatureC}°C " diff --git a/home/.config/waybar/style.css b/home/.config/waybar/style.css index 78fcae7a..7610afcd 100644 --- a/home/.config/waybar/style.css +++ b/home/.config/waybar/style.css @@ -26,7 +26,7 @@ window#waybar { background: #64727D; } -#clock, #battery, #cpu, #temperature, #memory, #backlight, #network, #pulseaudio, #custom-playerctl, #custom-yay, #tray, #mode, #idle_inhibitor { +#clock, #battery, #cpu, #temperature, #memory, #backlight, #network, #pulseaudio, #custom-media, #custom-yay, #tray, #mode, #idle_inhibitor { padding: 0 10px; margin: 0 5px; } @@ -110,7 +110,7 @@ window#waybar { color: #2a5c45; } -#custom-playerctl { +#custom-media { background: #97B084; color: black; } diff --git a/home/Scripts/fzf-pass.sh b/home/Scripts/fzf-pass.sh deleted file mode 100755 index 61e512a7..00000000 --- a/home/Scripts/fzf-pass.sh +++ /dev/null @@ -1 +0,0 @@ -Moved to https://git.reekynet.com/ReekyMarko/fzf-pass diff --git a/home/Scripts/mediaplayer.py b/home/Scripts/mediaplayer.py new file mode 100755 index 00000000..aa9dc613 --- /dev/null +++ b/home/Scripts/mediaplayer.py @@ -0,0 +1,126 @@ +#!/usr/bin/env python3 +import argparse +import logging +import sys +import signal +import gi +import json +gi.require_version('Playerctl', '2.0') +from gi.repository import Playerctl, GLib + +logger = logging.getLogger(__name__) + + +def write_output(text, player): + logger.info('Writing output') + + output = {'text': text, + 'class': 'custom-' + player.props.player_name, + 'alt': player.props.player_name} + + sys.stdout.write(json.dumps(output) + '\n') + sys.stdout.flush() + + +def on_play(player, status, manager): + logger.info('Received new playback status') + on_metadata(player, player.props.metadata, manager) + + +def on_metadata(player, metadata, manager): + logger.info('Received new metadata') + track_info = '' + + if player.get_artist() != '' and player.get_title() != '': + track_info = '{artist} - {title}'.format(artist=player.get_artist(), + title=player.get_title()) + else: + track_info = player.get_title() + + if player.props.status == 'Playing' and track_info: + track_info = ' ' + track_info + else: + track_info = ' ' + track_info + + write_output(track_info, player) + + +def on_player_appeared(manager, player, selected_player=None): + if player is not None and (selected_player is None or player.name == selected_player): + init_player(manager, player) + else: + logger.debug("New player appeared, but it's not the selected player, skipping") + + +def on_player_vanished(manager, player): + logger.info('Player has vanished') + sys.stdout.write('\n') + sys.stdout.flush() + + +def init_player(manager, name): + logger.debug('Initialize player: {player}'.format(player=name.name)) + player = Playerctl.Player.new_from_name(name) + player.connect('playback-status', on_play, manager) + player.connect('metadata', on_metadata, manager) + manager.manage_player(player) + on_metadata(player, player.props.metadata, manager) + + +def signal_handler(sig, frame): + logger.debug('Received signal to stop, exiting') + sys.stdout.write('\n') + sys.stdout.flush() + # loop.quit() + sys.exit(0) + + +def parse_arguments(): + parser = argparse.ArgumentParser() + + # Increase verbosity with every occurence of -v + parser.add_argument('-v', '--verbose', action='count', default=0) + + # Define for which player we're listening + parser.add_argument('--player') + + return parser.parse_args() + + +def main(): + arguments = parse_arguments() + + # Initialize logging + logging.basicConfig(stream=sys.stderr, level=logging.DEBUG, + format='%(name)s %(levelname)s %(message)s') + + # Logging is set by default to WARN and higher. + # With every occurrence of -v it's lowered by one + logger.setLevel(max((3 - arguments.verbose) * 10, 0)) + + # Log the sent command line arguments + logger.debug('Arguments received {}'.format(vars(arguments))) + + manager = Playerctl.PlayerManager() + loop = GLib.MainLoop() + + manager.connect('name-appeared', lambda *args: on_player_appeared(*args, arguments.player)) + manager.connect('player-vanished', on_player_vanished) + + signal.signal(signal.SIGINT, signal_handler) + signal.signal(signal.SIGTERM, signal_handler) + + for player in manager.props.player_names: + if arguments.player is not None and arguments.player != player.name: + logger.debug('{player} is not the filtered player, skipping it' + .format(player=player.name) + ) + continue + + init_player(manager, player) + + loop.run() + + +if __name__ == '__main__': + main() diff --git a/home/Scripts/metadata.sh b/home/Scripts/metadata.sh deleted file mode 100755 index 91689b31..00000000 --- a/home/Scripts/metadata.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -ARTIST=$(playerctl metadata | grep 'xesam:artist' | cut -d' ' -f5- | sed 's/^[ \t]*//') -TITLE=$(playerctl metadata title) - -if [ -n "$ARTIST" ]; then - echo "$ARTIST - $TITLE" -else - echo "$TITLE" -fi diff --git a/home/Scripts/mpvqueue b/home/Scripts/mpvqueue index a3fe6d96..81e40f41 100755 --- a/home/Scripts/mpvqueue +++ b/home/Scripts/mpvqueue @@ -3,13 +3,7 @@ MPVPIPE=/tmp/mpvqueue.playlist notify="notify-send -i mpv -a mpv" - -# if link is a youtube playlist, clean up url -if [[ ${1} =~ /^((?:https?:)?\/\/)?((?:www|m)\.)?((?:youtube\.com|youtu.be))(\/(?:[\w\-]+\?v=|embed\/|v\/)?)([\w\-]+)(\S+)?$ ]]; then - url="https://youtube.com/playlist?list=${1#*list=}" -else - url="$1" -fi +url="$1" # See if MPV is already running if [ -z "$(pidof mpv)" ]; then @@ -17,6 +11,9 @@ if [ -z "$(pidof mpv)" ]; then # remove fifo rm -f $MPVPIPE && mkfifo $MPVPIPE + # pause other players + playerctl pause + # start mpv /usr/bin/mpv --no-terminal --input-file="${MPVPIPE}" "$url" & disown diff --git a/home/Scripts/panextsink.sh b/home/Scripts/panextsink.sh deleted file mode 100644 index d3338391..00000000 --- a/home/Scripts/panextsink.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Get the pid of the window that is to be moved to the next sink -pid_to_move=$(swaymsg -t get_tree | jq -r '.nodes[]?.nodes[]?.nodes[]?.nodes[]?.nodes[] | select(.focused==true).pid') - -# Assign all the sink indices into an array -sink_array=($(pacmd list-sinks | grep index | sed 's/index://' | sed 's/*//' | xargs)) - -# Get the sink inputs to prepare to be inserted into array of arrays -# The following raw string format is index sink pid\nindex sink pid -sink_inputs_raw=$(pacmd list-sink-inputs | grep -e index -e sink: -e process.id | sed 's/<[^"]*>//' | sed 's/[^0-9]*//g' | tr '\n' ' ' | xargs | sed 's/\([[:digit:]]*\) \([[:digit:]]*\) \([[:digit:]]*\) /\1 \2 \3\n/g') - -# Find the corresponding pid -sink_input_selected_pid=$(echo "$sink_inputs_raw" | grep $pid_to_move) - -# Parse the individual values from the info retrieved above -selected_input_index=$(echo $sink_input_selected_pid | awk '{print $1;}') -selected_input_sink=$(echo $sink_input_selected_pid | awk '{print $2;}') -selected_input_pid=$(echo $sink_input_selected_pid | awk '{print $3;}') - -len=${#sink_array[@]} - -for (( i=0; i<$len; i++ )); do - if [[ $selected_input_sink == "${sink_array[$i]}" ]]; then - len_idx=$((len-1)) - if (( $i == $len_idx )); then - pacmd move-sink-input $selected_input_index ${sink_array[0]} - else - pacmd move-sink-input $selected_input_index ${sink_array[$((i+1))]} - fi - fi -done diff --git a/home/Scripts/sway-launcher-desktop.sh b/home/Scripts/sway-launcher-desktop.sh deleted file mode 100755 index efcb8e2d..00000000 --- a/home/Scripts/sway-launcher-desktop.sh +++ /dev/null @@ -1,165 +0,0 @@ -#!/usr/bin/env bash -# terminal application launcher for sway, using fzf -# Based on: https://gitlab.com/FlyingWombat/my-scripts/blob/master/sway-launcher - -shopt -s nullglob -if [[ "$1" == 'describe' ]]; then - shift - if [[ $2 == 'command' ]]; then - title=$1 - readarray arr < <(whatis -l "$1" 2>/dev/null) - description="${arr[0]}" - description="${description%*-}" - else - title=$(sed -ne '/^Name=/{s/^Name=//;p;q}' "$1") - description=$(sed -ne '/^Comment=/{s/^Comment=//;p;q}' "$1") - fi - echo -e "\033[33m$title\033[0m" - echo "${description:-No description}" - exit -fi - -HIST_FILE="${XDG_CACHE_HOME:-$HOME/.cache}/${0##*/}-history.txt" - -DIRS=( - /usr/share/applications - "$HOME/.local/share/applications" - /usr/local/share/applications -) - -GLYPH_COMMAND=" " -GLYPH_DESKTOP=" " - -touch "$HIST_FILE" -readarray HIST_LINES <"$HIST_FILE" -FZFPIPE=$(mktemp) -PIDFILE=$(mktemp) -trap 'rm "$FZFPIPE" "$PIDFILE"' EXIT INT - -# Append Launcher History, removing usage count -(printf '%s' "${HIST_LINES[@]#* }" >>"$FZFPIPE") & - -# Load and append Desktop entries -( - for dir in "${DIRS[@]}"; do - [[ -d "$dir" ]] || continue - awk -v pre="$GLYPH_DESKTOP" -F= ' - BEGINFILE{application=0;block="";a=0} - /^\[Desktop Entry\]/{block="entry"} - /^Type=Application/{application=1} - /^\[Desktop Action/{ - sub("^\\[Desktop Action ", ""); - sub("\\]$", ""); - block="action"; - a++; - actions[a,"key"]=$0 - } - /^Name=/{ - if(block=="action") { - actions[a,"name"]=$2; - } else { - name=$2 - } - } - ENDFILE{ - if (application){ - print FILENAME "\034desktop\034\033[33m" pre name "\033[0m"; - if (a>0) - for (i=1; i<=a; i++) - print FILENAME "\034desktop\034\033[33m" pre name "\033[0m (" actions[i, "name"] ")\034" actions[i, "key"] - } - }' \ - "$dir/"*.desktop >"$FZFPIPE" - # the empty stdin is needed in case no *.desktop files - done -) & - -# Load and append command list -( - IFS=: - read -ra path <<<"$PATH" - for dir in "${path[@]}"; do - printf '%s\n' "$dir/"* | - awk -F / -v pre="$GLYPH_COMMAND" '{print $NF "\034command\034\033[31m" pre "\033[0m" $NF;}' - done | sort -u >>"$FZFPIPE" -) & - -COMMAND_STR=$( - ( - tail -n +0 -f "$FZFPIPE" & - echo $! >"$PIDFILE" - ) | - fzf +s -x -d '\034' --nth ..3 --with-nth 3 \ - --preview "$0 describe {1} {2}" \ - --preview-window=up:3:wrap --ansi - kill -9 "$(<"$PIDFILE")" | tail -n1 -) || exit 1 - -[ -z "$COMMAND_STR" ] && exit 1 - -# update history -for i in "${!HIST_LINES[@]}"; do - if [[ "${HIST_LINES[i]}" == *" $COMMAND_STR"$'\n' ]]; then - HIST_COUNT=${HIST_LINES[i]%% *} - HIST_LINES[$i]="$((HIST_COUNT + 1)) $COMMAND_STR"$'\n' - match=1 - break - fi -done -if ! ((match)); then - HIST_LINES+=("1 $COMMAND_STR"$'\n') -fi - -printf '%s' "${HIST_LINES[@]}" | sort -nr >"$HIST_FILE" - -command='echo "nope"' -# shellcheck disable=SC2086 -readarray -d $'\034' -t PARAMS <<<${COMMAND_STR} -# COMMAND_STR is "\034" -case ${PARAMS[1]} in -desktop) - # Define the search pattern that specifies the block to search for within the .desktop file - PATTERN="^\\\\[Desktop Entry\\\\]" - if [[ -n ${PARAMS[3]} ]]; then - PATTERN="^\\\\[Desktop Action ${PARAMS[3]%?}\\\\]" - fi - # 1. We see a line starting [Desktop, but we're already searching: deactivate search again - # 2. We see the specified pattern: start search - # 3. We see an Exec= line during search: remove field codes and set variable - # 3. We see a Path= line during search: set variable - # 4. Finally, build command line - command=$(awk -v pattern="${PATTERN}" -F= ' - BEGIN{a=0;exec=0; path=0} - /^\[Desktop/{ - if(a){ - a=0 - } - } - $0 ~ pattern{ - a=1 - } - /^Exec=/{ - if(a && !exec){ - sub("^Exec=", ""); - gsub(" ?%[cDdFfikmNnUuv]", ""); - exec=$0; - } - } - /^Path=/{ - if(a && !path){ - path=$2 - } - } - - END{ - if(path){ - print "cd " path " &&" - } - print exec - }' "${PARAMS[0]}") - ;; -command) - command="${PARAMS[0]}" - ;; -esac -swaymsg -t command exec "$command" diff --git a/home/Scripts/swayidle.sh b/home/Scripts/swayidle.sh index 87ad8998..bc851146 100755 --- a/home/Scripts/swayidle.sh +++ b/home/Scripts/swayidle.sh @@ -1,13 +1,13 @@ #!/bin/bash swaylock="$HOME/Scripts/swaylock.sh" -dimscreen="$HOME/Scripts/dim-screen.sh" screenon="swaymsg 'output * dpms on'" screenoff="swaymsg 'output * dpms off'" swayidle \ lock "$swaylock" \ + unlock "pkill -9 swaylock" \ timeout 300 "lqsd -d" \ resume "lqsd -r" \ - timeout 600 "loginctl lock-session $(loginctl show-user $USER -p Sessions | cut -d'=' -f2); sleep 0.5; $screenoff" \ + timeout 600 "loginctl lock-session" \ + timeout 610 "$screenoff" \ resume "$screenon; lqsd -r" \ - before-sleep "playerctl pause; loginctl lock-session $(loginctl show-user $USER -p Sessions | cut -d'=' -f2)" \ - unlock "pkill -9 swaylock" + before-sleep "playerctl pause; loginctl lock-session)" diff --git a/home/Scripts/switchlayout.sh b/home/Scripts/switchlayout.sh deleted file mode 100755 index 66fa8351..00000000 --- a/home/Scripts/switchlayout.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -curLayout=$(setxkbmap -query | grep layout | sed 's/layout: //g') - -if [ $curLayout == "eu" ]; then - setxkbmap dvorak -else - setxkbmap eu -fi From 24448cfbb13f665cc21cafb4875d4370e826f17d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Apr 2020 13:29:53 +0300 Subject: [PATCH 0263/2667] These don't work --- root/etc/systemd/network/99-wireguard.netdev | 14 -------------- root/etc/systemd/network/99-wireguard.network | 9 --------- 2 files changed, 23 deletions(-) delete mode 100755 root/etc/systemd/network/99-wireguard.netdev delete mode 100755 root/etc/systemd/network/99-wireguard.network diff --git a/root/etc/systemd/network/99-wireguard.netdev b/root/etc/systemd/network/99-wireguard.netdev deleted file mode 100755 index dee034b1..00000000 --- a/root/etc/systemd/network/99-wireguard.netdev +++ /dev/null @@ -1,14 +0,0 @@ -[NetDev] -Name = wg0 -Kind = wireguard -Description = ReekyNET WireGuard - -[WireGuard] -PrivateKey = {{@@ env['WIREGUARD_MIRKWOOD_PRIVKEY'] @@}} - -[WireGuardPeer] -PublicKey = {{@@ env['WIREGUARD_MORIA_PUBKEY'] @@}} -PresharedKey = {{@@ env['WIREGUARD_MIRKWOOD_PSK'] @@}} -AllowedIPs = 10.200.0.0/24 -Endpoint = reekynet.com:48574 -PersistentKeepalive = 25 diff --git a/root/etc/systemd/network/99-wireguard.network b/root/etc/systemd/network/99-wireguard.network deleted file mode 100755 index 569d7692..00000000 --- a/root/etc/systemd/network/99-wireguard.network +++ /dev/null @@ -1,9 +0,0 @@ -[Match] -Name = wg0 - -[Network] -Address = 10.200.200.2/24 - -[Route] -Gateway = 10.200.200.1 -Destination = 10.200.200.0/24 From fdfb45921ff12bfc789fea88cbf9348be1f8da65 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Apr 2020 13:29:53 +0300 Subject: [PATCH 0264/2667] These don't work --- root/etc/systemd/network/99-wireguard.netdev | 14 -------------- root/etc/systemd/network/99-wireguard.network | 9 --------- 2 files changed, 23 deletions(-) delete mode 100755 root/etc/systemd/network/99-wireguard.netdev delete mode 100755 root/etc/systemd/network/99-wireguard.network diff --git a/root/etc/systemd/network/99-wireguard.netdev b/root/etc/systemd/network/99-wireguard.netdev deleted file mode 100755 index dee034b1..00000000 --- a/root/etc/systemd/network/99-wireguard.netdev +++ /dev/null @@ -1,14 +0,0 @@ -[NetDev] -Name = wg0 -Kind = wireguard -Description = ReekyNET WireGuard - -[WireGuard] -PrivateKey = {{@@ env['WIREGUARD_MIRKWOOD_PRIVKEY'] @@}} - -[WireGuardPeer] -PublicKey = {{@@ env['WIREGUARD_MORIA_PUBKEY'] @@}} -PresharedKey = {{@@ env['WIREGUARD_MIRKWOOD_PSK'] @@}} -AllowedIPs = 10.200.0.0/24 -Endpoint = reekynet.com:48574 -PersistentKeepalive = 25 diff --git a/root/etc/systemd/network/99-wireguard.network b/root/etc/systemd/network/99-wireguard.network deleted file mode 100755 index 569d7692..00000000 --- a/root/etc/systemd/network/99-wireguard.network +++ /dev/null @@ -1,9 +0,0 @@ -[Match] -Name = wg0 - -[Network] -Address = 10.200.200.2/24 - -[Route] -Gateway = 10.200.200.1 -Destination = 10.200.200.0/24 From 5149b6840e953f20e028190ccc7523e82321e5ad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Apr 2020 16:23:51 +0300 Subject: [PATCH 0265/2667] Fix typo --- home/Scripts/swayidle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/Scripts/swayidle.sh b/home/Scripts/swayidle.sh index bc851146..c096921d 100755 --- a/home/Scripts/swayidle.sh +++ b/home/Scripts/swayidle.sh @@ -10,4 +10,4 @@ swayidle \ timeout 600 "loginctl lock-session" \ timeout 610 "$screenoff" \ resume "$screenon; lqsd -r" \ - before-sleep "playerctl pause; loginctl lock-session)" + before-sleep "playerctl pause; loginctl lock-session" From 29a4de93dc853b4d5cdafc3c88f0ab992592a1b2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Apr 2020 16:23:51 +0300 Subject: [PATCH 0266/2667] Fix typo --- home/Scripts/swayidle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/Scripts/swayidle.sh b/home/Scripts/swayidle.sh index bc851146..c096921d 100755 --- a/home/Scripts/swayidle.sh +++ b/home/Scripts/swayidle.sh @@ -10,4 +10,4 @@ swayidle \ timeout 600 "loginctl lock-session" \ timeout 610 "$screenoff" \ resume "$screenon; lqsd -r" \ - before-sleep "playerctl pause; loginctl lock-session)" + before-sleep "playerctl pause; loginctl lock-session" From f07883e21688e67565ff7b206ab626c1db4bc9fc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Apr 2020 16:24:05 +0300 Subject: [PATCH 0267/2667] Refactor update function --- home/.config/zsh/03-aliases.zsh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 7befc9ee..96c11b0b 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -126,7 +126,12 @@ dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } passync() { pass git pull && pass git push && updatesecrets } # update stuff -plugupdate() { vim +PlugUpgrade +PlugUpdate +CocUpdate +qa && zinit self-update && zinit update -p && $HOME/.tmux/plugins/tpm/bin/update_plugins all } +plugupdate() { + vim +PlugUpgrade +PlugUpdate +CocUpdate +qa + zinit self-update + zinit update -p + $HOME/.tmux/plugins/tpm/bin/update_plugins all +} update() { yay -Syu --devel firefox-nightly } updateall() { update; plugupdate; sudo awman-update } From 9f5b20897c540da8eddbed7a32ee390cd0c5d05d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Apr 2020 16:24:05 +0300 Subject: [PATCH 0268/2667] Refactor update function --- home/.config/zsh/03-aliases.zsh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 7befc9ee..96c11b0b 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -126,7 +126,12 @@ dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } passync() { pass git pull && pass git push && updatesecrets } # update stuff -plugupdate() { vim +PlugUpgrade +PlugUpdate +CocUpdate +qa && zinit self-update && zinit update -p && $HOME/.tmux/plugins/tpm/bin/update_plugins all } +plugupdate() { + vim +PlugUpgrade +PlugUpdate +CocUpdate +qa + zinit self-update + zinit update -p + $HOME/.tmux/plugins/tpm/bin/update_plugins all +} update() { yay -Syu --devel firefox-nightly } updateall() { update; plugupdate; sudo awman-update } From 9642c4da60cc362071b4dac37778d358c0e74f77 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Apr 2020 16:24:20 +0300 Subject: [PATCH 0269/2667] Remove pacserve --- root/etc/pacman.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index f572251b..38ec88a2 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -10,19 +10,15 @@ LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg [core] -Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [extra] -Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [community] -Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [multilib] -Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [repo-ck] From f089b14ec6dcc46025f20ef37242bfc0baf4b38a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Apr 2020 16:24:20 +0300 Subject: [PATCH 0270/2667] Remove pacserve --- root/etc/pacman.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index f572251b..38ec88a2 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -10,19 +10,15 @@ LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg [core] -Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [extra] -Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [community] -Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [multilib] -Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [repo-ck] From 8eba8dea7a4ff9569da0be72ab522f59636aae3c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Apr 2020 13:04:36 +0300 Subject: [PATCH 0271/2667] Moved environment to home --- config-home.yaml | 34 +++++++------------ config-root.yaml | 4 --- home/.config/environment.d/firefox.conf | 3 ++ home/.config/environment.d/java.conf | 3 -- .../.config/environment.d/sway.conf | 5 --- 5 files changed, 16 insertions(+), 33 deletions(-) create mode 100644 home/.config/environment.d/firefox.conf delete mode 100644 home/.config/environment.d/java.conf rename root/etc/environment => home/.config/environment.d/sway.conf (86%) mode change 100755 => 100644 diff --git a/config-home.yaml b/config-home.yaml index 130be670..b431b65c 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -1,6 +1,5 @@ actions: vim-plug: nvim +PlugInstall +qall - zplug: zplug install config: backup: true banner: true @@ -20,20 +19,26 @@ dotfiles: d_mpv: dst: ~/.config/mpv src: .config/mpv + d_environment: + dst: ~/.config/environment.d + src: .config/environment.d + f_init.vim: + dst: ~/.config/nvim/init.vim + src: .config/nvim/init.vim d_nvim_config: actions: - vim-plug dst: ~/.config/nvim/conf.d src: .config/nvim/conf.d + f_coc-settings.json: + dst: ~/.config/nvim/coc-settings.json + src: .config/nvim/coc-settings.json d_scripts: dst: ~/Scripts src: Scripts d_sway: dst: ~/.config/sway src: .config/sway - d_ticons: - dst: ~/.local/share/TelegramDesktop/tdata/ticons - src: .local/share/TelegramDesktop/tdata/ticons d_waybar: dst: ~/.config/waybar src: .config/waybar @@ -58,15 +63,9 @@ dotfiles: f_bspwmrc: dst: ~/.config/bspwm/bspwmrc src: .config/bspwm/bspwmrc - f_coc-settings.json: - dst: ~/.config/nvim/coc-settings.json - src: .config/nvim/coc-settings.json f_gitconfig: dst: ~/.gitconfig src: .gitconfig - f_init.vim: - dst: ~/.config/nvim/init.vim - src: .config/nvim/init.vim f_libra_config: dst: ~/.config/libra/config.toml src: .config/libra/config.toml @@ -124,9 +123,6 @@ dotfiles: f_youtube-dl_config: dst: ~/.config/youtube-dl/config src: .config/youtube-dl/config - f_youtube-viewer.conf: - dst: ~/.config/youtube-viewer/youtube-viewer.conf - src: .config/youtube-viewer/youtube-viewer.conf f_zathurarc: dst: ~/.config/zathura/zathurarc src: .config/zathura/zathurarc @@ -142,10 +138,10 @@ dotfiles: f_fonts.conf: src: .config/fontconfig/fonts.conf dst: ~/.config/fontconfig/fonts.conf - f_ignore: + f_ripgrep_ignore: src: .ignore dst: ~/.ignore - f_nvimpager_init.vim: + f_nvimpager: src: .config/nvimpager/init.vim dst: ~/.config/nvimpager/init.vim f_ncmpcpp.conf: @@ -171,7 +167,6 @@ profiles: - f_libra_config - f_mpdscribble.conf - f_mpdris2.conf - - f_youtube-viewer.conf Sway: dotfiles: - d_sway @@ -195,9 +190,6 @@ profiles: - Media - Sway - Pacman - ReekyRaspberry: - include: - - Terminal Rivendell: include: - Terminal @@ -210,9 +202,9 @@ profiles: - Pacman Terminal: dotfiles: - - f_nvimpager_init.vim + - f_nvimpager - f_hushlogin - - f_ignore + - f_ripgrep_ignore - f_ranger_commands.py - f_rtv.cfg - f_mailcap diff --git a/config-root.yaml b/config-root.yaml index a35e1b29..b2bf0cec 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -39,9 +39,6 @@ dotfiles: f_detected.sh: dst: /etc/clamav/detected.sh src: etc/clamav/detected.sh - f_environment: - dst: /etc/environment - src: etc/environment f_freetype2.sh: dst: /etc/profile.d/freetype2.sh src: etc/profile.d/freetype2.sh @@ -155,7 +152,6 @@ profiles: Mirkwood: dotfiles: - f_getty.conf - - f_environment - f_cryptissue - f_welcomemessage.conf - d_bin diff --git a/home/.config/environment.d/firefox.conf b/home/.config/environment.d/firefox.conf new file mode 100644 index 00000000..a882e761 --- /dev/null +++ b/home/.config/environment.d/firefox.conf @@ -0,0 +1,3 @@ +MOZ_ENABLE_WAYLAND=1 +MOZ_USE_XINPUT2=1 +MOZ_WEBRENDER=1 diff --git a/home/.config/environment.d/java.conf b/home/.config/environment.d/java.conf deleted file mode 100644 index ccb1305b..00000000 --- a/home/.config/environment.d/java.conf +++ /dev/null @@ -1,3 +0,0 @@ - _JAVA_AWT_WM_NONREPARENTING=1 - _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' - JAVA_FONTS=/usr/share/fonts/TTF diff --git a/root/etc/environment b/home/.config/environment.d/sway.conf old mode 100755 new mode 100644 similarity index 86% rename from root/etc/environment rename to home/.config/environment.d/sway.conf index 5aa01188..449de9ba --- a/root/etc/environment +++ b/home/.config/environment.d/sway.conf @@ -7,11 +7,6 @@ QT_QPA_PLATFORMTHEME=qt5ct QT_QPA_PLATFORM=wayland-egl QT_WAYLAND_DISABLE_WINDOWDECORATION=1 -# Firefox -MOZ_ENABLE_WAYLAND=1 -MOZ_USE_XINPUT2=1 -MOZ_WEBRENDER=1 - # Fix redshift on wlroots WLR_DRM_NO_ATOMIC=1 From 5586cbc9ef5435e2273ff942ed38b773b05ed2ec Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Apr 2020 13:04:36 +0300 Subject: [PATCH 0272/2667] Moved environment to home --- config-home.yaml | 34 +++++++------------ config-root.yaml | 4 --- home/.config/environment.d/firefox.conf | 3 ++ home/.config/environment.d/java.conf | 3 -- .../.config/environment.d/sway.conf | 5 --- 5 files changed, 16 insertions(+), 33 deletions(-) create mode 100644 home/.config/environment.d/firefox.conf delete mode 100644 home/.config/environment.d/java.conf rename root/etc/environment => home/.config/environment.d/sway.conf (86%) mode change 100755 => 100644 diff --git a/config-home.yaml b/config-home.yaml index 130be670..b431b65c 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -1,6 +1,5 @@ actions: vim-plug: nvim +PlugInstall +qall - zplug: zplug install config: backup: true banner: true @@ -20,20 +19,26 @@ dotfiles: d_mpv: dst: ~/.config/mpv src: .config/mpv + d_environment: + dst: ~/.config/environment.d + src: .config/environment.d + f_init.vim: + dst: ~/.config/nvim/init.vim + src: .config/nvim/init.vim d_nvim_config: actions: - vim-plug dst: ~/.config/nvim/conf.d src: .config/nvim/conf.d + f_coc-settings.json: + dst: ~/.config/nvim/coc-settings.json + src: .config/nvim/coc-settings.json d_scripts: dst: ~/Scripts src: Scripts d_sway: dst: ~/.config/sway src: .config/sway - d_ticons: - dst: ~/.local/share/TelegramDesktop/tdata/ticons - src: .local/share/TelegramDesktop/tdata/ticons d_waybar: dst: ~/.config/waybar src: .config/waybar @@ -58,15 +63,9 @@ dotfiles: f_bspwmrc: dst: ~/.config/bspwm/bspwmrc src: .config/bspwm/bspwmrc - f_coc-settings.json: - dst: ~/.config/nvim/coc-settings.json - src: .config/nvim/coc-settings.json f_gitconfig: dst: ~/.gitconfig src: .gitconfig - f_init.vim: - dst: ~/.config/nvim/init.vim - src: .config/nvim/init.vim f_libra_config: dst: ~/.config/libra/config.toml src: .config/libra/config.toml @@ -124,9 +123,6 @@ dotfiles: f_youtube-dl_config: dst: ~/.config/youtube-dl/config src: .config/youtube-dl/config - f_youtube-viewer.conf: - dst: ~/.config/youtube-viewer/youtube-viewer.conf - src: .config/youtube-viewer/youtube-viewer.conf f_zathurarc: dst: ~/.config/zathura/zathurarc src: .config/zathura/zathurarc @@ -142,10 +138,10 @@ dotfiles: f_fonts.conf: src: .config/fontconfig/fonts.conf dst: ~/.config/fontconfig/fonts.conf - f_ignore: + f_ripgrep_ignore: src: .ignore dst: ~/.ignore - f_nvimpager_init.vim: + f_nvimpager: src: .config/nvimpager/init.vim dst: ~/.config/nvimpager/init.vim f_ncmpcpp.conf: @@ -171,7 +167,6 @@ profiles: - f_libra_config - f_mpdscribble.conf - f_mpdris2.conf - - f_youtube-viewer.conf Sway: dotfiles: - d_sway @@ -195,9 +190,6 @@ profiles: - Media - Sway - Pacman - ReekyRaspberry: - include: - - Terminal Rivendell: include: - Terminal @@ -210,9 +202,9 @@ profiles: - Pacman Terminal: dotfiles: - - f_nvimpager_init.vim + - f_nvimpager - f_hushlogin - - f_ignore + - f_ripgrep_ignore - f_ranger_commands.py - f_rtv.cfg - f_mailcap diff --git a/config-root.yaml b/config-root.yaml index a35e1b29..b2bf0cec 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -39,9 +39,6 @@ dotfiles: f_detected.sh: dst: /etc/clamav/detected.sh src: etc/clamav/detected.sh - f_environment: - dst: /etc/environment - src: etc/environment f_freetype2.sh: dst: /etc/profile.d/freetype2.sh src: etc/profile.d/freetype2.sh @@ -155,7 +152,6 @@ profiles: Mirkwood: dotfiles: - f_getty.conf - - f_environment - f_cryptissue - f_welcomemessage.conf - d_bin diff --git a/home/.config/environment.d/firefox.conf b/home/.config/environment.d/firefox.conf new file mode 100644 index 00000000..a882e761 --- /dev/null +++ b/home/.config/environment.d/firefox.conf @@ -0,0 +1,3 @@ +MOZ_ENABLE_WAYLAND=1 +MOZ_USE_XINPUT2=1 +MOZ_WEBRENDER=1 diff --git a/home/.config/environment.d/java.conf b/home/.config/environment.d/java.conf deleted file mode 100644 index ccb1305b..00000000 --- a/home/.config/environment.d/java.conf +++ /dev/null @@ -1,3 +0,0 @@ - _JAVA_AWT_WM_NONREPARENTING=1 - _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' - JAVA_FONTS=/usr/share/fonts/TTF diff --git a/root/etc/environment b/home/.config/environment.d/sway.conf old mode 100755 new mode 100644 similarity index 86% rename from root/etc/environment rename to home/.config/environment.d/sway.conf index 5aa01188..449de9ba --- a/root/etc/environment +++ b/home/.config/environment.d/sway.conf @@ -7,11 +7,6 @@ QT_QPA_PLATFORMTHEME=qt5ct QT_QPA_PLATFORM=wayland-egl QT_WAYLAND_DISABLE_WINDOWDECORATION=1 -# Firefox -MOZ_ENABLE_WAYLAND=1 -MOZ_USE_XINPUT2=1 -MOZ_WEBRENDER=1 - # Fix redshift on wlroots WLR_DRM_NO_ATOMIC=1 From 527e6da88c791ee49564d3eea6290857aaf6e1f1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Apr 2020 13:44:15 +0300 Subject: [PATCH 0273/2667] Move environment vars to sway start script --- config-home.yaml | 3 --- home/.zprofile | 2 +- home/Scripts/sway-run.sh | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) create mode 100755 home/Scripts/sway-run.sh diff --git a/config-home.yaml b/config-home.yaml index b431b65c..0be18204 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -19,9 +19,6 @@ dotfiles: d_mpv: dst: ~/.config/mpv src: .config/mpv - d_environment: - dst: ~/.config/environment.d - src: .config/environment.d f_init.vim: dst: ~/.config/nvim/init.vim src: .config/nvim/init.vim diff --git a/home/.zprofile b/home/.zprofile index 2101c123..dcbf3fe2 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,5 +1,5 @@ if cat /proc/cmdline | grep -q "video=eDP-1:d"; then [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && kodi else - [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway > /dev/null 2>&1 + [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && $HOME/Scripts/sway-run.sh > /dev/null 2>&1 fi diff --git a/home/Scripts/sway-run.sh b/home/Scripts/sway-run.sh new file mode 100755 index 00000000..cff3e15f --- /dev/null +++ b/home/Scripts/sway-run.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +# Set environment variables for Sway + +# Firefox +export MOZ_ENABLE_WAYLAND=1 +export MOZ_USE_XINPUT2=1 +export MOZ_WEBRENDER=1 + +# Fix java on wayland +export _JAVA_AWT_WM_NONREPARENTING=1 +export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' + +# Enable qt5 theming and wayland support +export QT_QPA_PLATFORMTHEME=qt5ct +export QT_QPA_PLATFORM=wayland-egl +export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 + +# Fix redshift on wlroots +export WLR_DRM_NO_ATOMIC=1 + +# Use wayland in SDL2 +export SDL_VIDEODRIVER=wayland + +# Run sway +sway + +# Unset the variables after quitting Sway +unset MOZ_ENABLE_WAYLAND=1 +unset MOZ_USE_XINPUT2=1 +unset MOZ_WEBRENDER=1 +unset _JAVA_AWT_WM_NONREPARENTING=1 +unset _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' +unset QT_QPA_PLATFORMTHEME=qt5ct +unset QT_QPA_PLATFORM=wayland-egl +unset QT_WAYLAND_DISABLE_WINDOWDECORATION=1 +unset WLR_DRM_NO_ATOMIC=1 +unset SDL_VIDEODRIVER=wayland From a5ae6ab883eb39927603cb66b73967d78510a261 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Apr 2020 13:44:15 +0300 Subject: [PATCH 0274/2667] Move environment vars to sway start script --- config-home.yaml | 3 --- home/.zprofile | 2 +- home/Scripts/sway-run.sh | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) create mode 100755 home/Scripts/sway-run.sh diff --git a/config-home.yaml b/config-home.yaml index b431b65c..0be18204 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -19,9 +19,6 @@ dotfiles: d_mpv: dst: ~/.config/mpv src: .config/mpv - d_environment: - dst: ~/.config/environment.d - src: .config/environment.d f_init.vim: dst: ~/.config/nvim/init.vim src: .config/nvim/init.vim diff --git a/home/.zprofile b/home/.zprofile index 2101c123..dcbf3fe2 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,5 +1,5 @@ if cat /proc/cmdline | grep -q "video=eDP-1:d"; then [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && kodi else - [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway > /dev/null 2>&1 + [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && $HOME/Scripts/sway-run.sh > /dev/null 2>&1 fi diff --git a/home/Scripts/sway-run.sh b/home/Scripts/sway-run.sh new file mode 100755 index 00000000..cff3e15f --- /dev/null +++ b/home/Scripts/sway-run.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +# Set environment variables for Sway + +# Firefox +export MOZ_ENABLE_WAYLAND=1 +export MOZ_USE_XINPUT2=1 +export MOZ_WEBRENDER=1 + +# Fix java on wayland +export _JAVA_AWT_WM_NONREPARENTING=1 +export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' + +# Enable qt5 theming and wayland support +export QT_QPA_PLATFORMTHEME=qt5ct +export QT_QPA_PLATFORM=wayland-egl +export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 + +# Fix redshift on wlroots +export WLR_DRM_NO_ATOMIC=1 + +# Use wayland in SDL2 +export SDL_VIDEODRIVER=wayland + +# Run sway +sway + +# Unset the variables after quitting Sway +unset MOZ_ENABLE_WAYLAND=1 +unset MOZ_USE_XINPUT2=1 +unset MOZ_WEBRENDER=1 +unset _JAVA_AWT_WM_NONREPARENTING=1 +unset _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' +unset QT_QPA_PLATFORMTHEME=qt5ct +unset QT_QPA_PLATFORM=wayland-egl +unset QT_WAYLAND_DISABLE_WINDOWDECORATION=1 +unset WLR_DRM_NO_ATOMIC=1 +unset SDL_VIDEODRIVER=wayland From 0241f6f746c69a7a86db409345c3cb8574c70495 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 13 Apr 2020 13:23:39 +0300 Subject: [PATCH 0275/2667] Fix mimeo keybind --- home/.config/sway/conf.d/06-keybinds.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 88351cd6..1335220d 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -20,7 +20,7 @@ floating_modifier $mod normal bindsym $mod+Shift+r reload # open link from clipboard in default application -bindsym $mod+Shift+o exec mimeo "$(wl-paste)" +bindsym $mod+Shift+o exec mimeo $(wl-paste) # turn on and off internal screen bindsym --locked XF86Search output eDP-1 toggle From 5e35d9e8f428efdfbc3f63ee6593d9fd840dcdaa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 13 Apr 2020 13:23:39 +0300 Subject: [PATCH 0276/2667] Fix mimeo keybind --- home/.config/sway/conf.d/06-keybinds.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 88351cd6..1335220d 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -20,7 +20,7 @@ floating_modifier $mod normal bindsym $mod+Shift+r reload # open link from clipboard in default application -bindsym $mod+Shift+o exec mimeo "$(wl-paste)" +bindsym $mod+Shift+o exec mimeo $(wl-paste) # turn on and off internal screen bindsym --locked XF86Search output eDP-1 toggle From 14cf4dda79f484fb3fd9d150cd5898b1d6ac1430 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 13 Apr 2020 13:24:20 +0300 Subject: [PATCH 0277/2667] Make power management more automatic --- home/.config/zsh/03-aliases.zsh | 15 ++------------- root/etc/default/cpupower | 2 ++ 2 files changed, 4 insertions(+), 13 deletions(-) create mode 100644 root/etc/default/cpupower diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 96c11b0b..8169086e 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -93,23 +93,12 @@ cpick() { grim -g "$(slurp -p)" -t ppm - | convert - -format "%[pixel:p{0,0}]" t alias i='iwctl station wlan0' # change cpu power settings -battery() { - sudo cpupower frequency-set -g powersave +gpulow() { echo low | sudo tee /sys/class/drm/card0/device/power_dpm_force_performance_level } -plugged() { - sudo cpupower frequency-set -g schedutil +gpuauto() { echo auto | sudo tee /sys/class/drm/card0/device/power_dpm_force_performance_level } -ultimatepowersave() { - battery - powersave - sudo ryzenadj --stapm-limit=25000 --fast-limit=25000 --slow-limit=25000 --tctl-temp=20; -} -performance() { - sudo cpupower frequency-set -g performance - sudo ryzenadj --stapm-limit=45000 --fast-limit=45000 --slow-limit=45000 --tctl-temp=90 -} # monitor cpu freq cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } diff --git a/root/etc/default/cpupower b/root/etc/default/cpupower new file mode 100644 index 00000000..98c1cb2f --- /dev/null +++ b/root/etc/default/cpupower @@ -0,0 +1,2 @@ +# vim:set ts=2 sw=2 ft=sh et: +governor='powersave' From 9a1e2a35de0857e8d039524da6eb5722237980a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 13 Apr 2020 13:24:20 +0300 Subject: [PATCH 0278/2667] Make power management more automatic --- home/.config/zsh/03-aliases.zsh | 15 ++------------- root/etc/default/cpupower | 2 ++ 2 files changed, 4 insertions(+), 13 deletions(-) create mode 100644 root/etc/default/cpupower diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 96c11b0b..8169086e 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -93,23 +93,12 @@ cpick() { grim -g "$(slurp -p)" -t ppm - | convert - -format "%[pixel:p{0,0}]" t alias i='iwctl station wlan0' # change cpu power settings -battery() { - sudo cpupower frequency-set -g powersave +gpulow() { echo low | sudo tee /sys/class/drm/card0/device/power_dpm_force_performance_level } -plugged() { - sudo cpupower frequency-set -g schedutil +gpuauto() { echo auto | sudo tee /sys/class/drm/card0/device/power_dpm_force_performance_level } -ultimatepowersave() { - battery - powersave - sudo ryzenadj --stapm-limit=25000 --fast-limit=25000 --slow-limit=25000 --tctl-temp=20; -} -performance() { - sudo cpupower frequency-set -g performance - sudo ryzenadj --stapm-limit=45000 --fast-limit=45000 --slow-limit=45000 --tctl-temp=90 -} # monitor cpu freq cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } diff --git a/root/etc/default/cpupower b/root/etc/default/cpupower new file mode 100644 index 00000000..98c1cb2f --- /dev/null +++ b/root/etc/default/cpupower @@ -0,0 +1,2 @@ +# vim:set ts=2 sw=2 ft=sh et: +governor='powersave' From 394c15ee95132f7279873cf725cf53c1d79e46a4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 13 Apr 2020 13:24:37 +0300 Subject: [PATCH 0279/2667] Remove unused containers --- docker/organizr/docker-compose.yaml | 14 ----------- docker/pihole/docker-compose.yml | 36 ----------------------------- 2 files changed, 50 deletions(-) delete mode 100644 docker/organizr/docker-compose.yaml delete mode 100644 docker/pihole/docker-compose.yml diff --git a/docker/organizr/docker-compose.yaml b/docker/organizr/docker-compose.yaml deleted file mode 100644 index 2bfa4835..00000000 --- a/docker/organizr/docker-compose.yaml +++ /dev/null @@ -1,14 +0,0 @@ -version: "3" - -services: - organizr: - container_name: organizr - image: organizrtools/organizr-v2 - environment: - - TZ=Europe/Helsinki - restart: always - ports: - - "3123:80" - volumes: - - /docker/organizr:/config - - /etc/localtime:/etc/localtime:ro diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml deleted file mode 100644 index 17f8d6b4..00000000 --- a/docker/pihole/docker-compose.yml +++ /dev/null @@ -1,36 +0,0 @@ -version: "3" - -services: - pihole: - networks: - - proxy - container_name: pihole - image: pihole/pihole:latest - ports: - - "53:53/tcp" - - "53:53/udp" - - "67:67/udp" - - "8053:80/tcp" - environment: - TZ: "Europe/Helsinki" - volumes: - - /docker/pihole/pihole/:/etc/pihole/ - - /docker/pihole/dnsmasq/:/etc/dnsmasq.d/ - - /docker/pihole/log/:/var/log/ - - /etc/localtime:/etc/localtime:ro - dns: - - 127.0.0.1 - - 1.1.1.1 - cap_add: - - NET_ADMIN - restart: always - labels: - - "traefik.enable=true" - - "traefik.frontend.rule=HostRegexp:pihole.reekynet.lan,{catchall:.*}" - - "traefik.frontend.priority=1" - - "traefik.backend=pihole" - - "traefik.port=80" - -networks: - proxy: - external: true From d83921a29bc9d7b7566ba9737831850372986db5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 13 Apr 2020 13:24:37 +0300 Subject: [PATCH 0280/2667] Remove unused containers --- docker/organizr/docker-compose.yaml | 14 ----------- docker/pihole/docker-compose.yml | 36 ----------------------------- 2 files changed, 50 deletions(-) delete mode 100644 docker/organizr/docker-compose.yaml delete mode 100644 docker/pihole/docker-compose.yml diff --git a/docker/organizr/docker-compose.yaml b/docker/organizr/docker-compose.yaml deleted file mode 100644 index 2bfa4835..00000000 --- a/docker/organizr/docker-compose.yaml +++ /dev/null @@ -1,14 +0,0 @@ -version: "3" - -services: - organizr: - container_name: organizr - image: organizrtools/organizr-v2 - environment: - - TZ=Europe/Helsinki - restart: always - ports: - - "3123:80" - volumes: - - /docker/organizr:/config - - /etc/localtime:/etc/localtime:ro diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml deleted file mode 100644 index 17f8d6b4..00000000 --- a/docker/pihole/docker-compose.yml +++ /dev/null @@ -1,36 +0,0 @@ -version: "3" - -services: - pihole: - networks: - - proxy - container_name: pihole - image: pihole/pihole:latest - ports: - - "53:53/tcp" - - "53:53/udp" - - "67:67/udp" - - "8053:80/tcp" - environment: - TZ: "Europe/Helsinki" - volumes: - - /docker/pihole/pihole/:/etc/pihole/ - - /docker/pihole/dnsmasq/:/etc/dnsmasq.d/ - - /docker/pihole/log/:/var/log/ - - /etc/localtime:/etc/localtime:ro - dns: - - 127.0.0.1 - - 1.1.1.1 - cap_add: - - NET_ADMIN - restart: always - labels: - - "traefik.enable=true" - - "traefik.frontend.rule=HostRegexp:pihole.reekynet.lan,{catchall:.*}" - - "traefik.frontend.priority=1" - - "traefik.backend=pihole" - - "traefik.port=80" - -networks: - proxy: - external: true From acea8f12d81b8101c58fee77f240fa61cc6ee2cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 13 Apr 2020 13:24:46 +0300 Subject: [PATCH 0281/2667] Update config-root --- config-root.yaml | 104 ++++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 50 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index b2bf0cec..1667e3c0 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -21,7 +21,7 @@ dotfiles: src: usr/local/bin d_networkd: actions: - - chmod-wireguard + - chmod-wireguard src: etc/systemd/network dst: /etc/systemd/network f_99-sysctl.conf: @@ -138,66 +138,70 @@ dotfiles: f_system.conf: src: etc/systemd/system.conf dst: /etc/systemd/system.conf + f_cpupower: + src: etc/default/cpupower + dst: /etc/default/cpupower profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf - - f_pacman-dl.service - - f_pacman-dl.timer + - f_pacman.conf + - f_pacserve.service.conf + - f_pacman-dl.service + - f_pacman-dl.timer Mirkwood: dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - d_networkd - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_zsh.hook - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf + - f_getty.conf + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - d_networkd + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_zsh.hook + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf + - f_cpupower include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config - - f_nightly-reboot.service - - f_nightly-reboot.timer + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_sshd_config + - f_nightly-reboot.service + - f_nightly-reboot.timer Moria: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_ipmi-static.service - - f_ipmi-temp.service - - f_ipmi-temp.timer - - f_ipmi-fans.service - - f_ipmi-fans.timer + - f_sshd_config + - f_99-sysctl.conf + - f_ipmi-static.service + - f_ipmi-temp.service + - f_ipmi-temp.timer + - f_ipmi-fans.service + - f_ipmi-fans.timer From 6db33545c3d311a288dc1b2d257b0d6e5bcab16d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 13 Apr 2020 13:24:46 +0300 Subject: [PATCH 0282/2667] Update config-root --- config-root.yaml | 104 ++++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 50 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index b2bf0cec..1667e3c0 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -21,7 +21,7 @@ dotfiles: src: usr/local/bin d_networkd: actions: - - chmod-wireguard + - chmod-wireguard src: etc/systemd/network dst: /etc/systemd/network f_99-sysctl.conf: @@ -138,66 +138,70 @@ dotfiles: f_system.conf: src: etc/systemd/system.conf dst: /etc/systemd/system.conf + f_cpupower: + src: etc/default/cpupower + dst: /etc/default/cpupower profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf - - f_pacman-dl.service - - f_pacman-dl.timer + - f_pacman.conf + - f_pacserve.service.conf + - f_pacman-dl.service + - f_pacman-dl.timer Mirkwood: dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - d_networkd - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_zsh.hook - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf + - f_getty.conf + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - d_networkd + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_zsh.hook + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf + - f_cpupower include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config - - f_nightly-reboot.service - - f_nightly-reboot.timer + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_sshd_config + - f_nightly-reboot.service + - f_nightly-reboot.timer Moria: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_ipmi-static.service - - f_ipmi-temp.service - - f_ipmi-temp.timer - - f_ipmi-fans.service - - f_ipmi-fans.timer + - f_sshd_config + - f_99-sysctl.conf + - f_ipmi-static.service + - f_ipmi-temp.service + - f_ipmi-temp.timer + - f_ipmi-fans.service + - f_ipmi-fans.timer From e1b93121eba81d713123c51bb0c4ecff3353cdd7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 10:27:39 +0300 Subject: [PATCH 0283/2667] Made update alias print news --- home/.config/zsh/03-aliases.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 8169086e..66d4a557 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -121,8 +121,8 @@ plugupdate() { zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all } -update() { yay -Syu --devel firefox-nightly } -updateall() { update; plugupdate; sudo awman-update } +update() { yay -Pw && yay } +updateall() { yay -Syu --devel firefox-nightly; plugupdate; sudo awman-update } # remove unneeded packages autoremove() { sudo pacman -Rns $(pacman -Qdtq) } From ecd25a0d448e4c3bfdc1b453a28855f1230f8ffe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 10:27:39 +0300 Subject: [PATCH 0284/2667] Made update alias print news --- home/.config/zsh/03-aliases.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 8169086e..66d4a557 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -121,8 +121,8 @@ plugupdate() { zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all } -update() { yay -Syu --devel firefox-nightly } -updateall() { update; plugupdate; sudo awman-update } +update() { yay -Pw && yay } +updateall() { yay -Syu --devel firefox-nightly; plugupdate; sudo awman-update } # remove unneeded packages autoremove() { sudo pacman -Rns $(pacman -Qdtq) } From 734a8f02e221c18d064b1714fa61ee868c21522a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 12:36:52 +0300 Subject: [PATCH 0285/2667] Added docker-prune alias --- home/.config/zsh/03-aliases.zsh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 66d4a557..291597e3 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -29,6 +29,12 @@ yi() { fi } +docker-prune() { + docker image prune -a + docker volume prune + docker container prune +} + # search and remove packages with fzf yr() { SELECTED_PKGS="$(yay -Qsq | fzf --header='Remove packages' -m --preview 'yay -Si {1}')" From cf48709744d597780666f2bc636a46cc3138e2aa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 12:36:52 +0300 Subject: [PATCH 0286/2667] Added docker-prune alias --- home/.config/zsh/03-aliases.zsh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 66d4a557..291597e3 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -29,6 +29,12 @@ yi() { fi } +docker-prune() { + docker image prune -a + docker volume prune + docker container prune +} + # search and remove packages with fzf yr() { SELECTED_PKGS="$(yay -Qsq | fzf --header='Remove packages' -m --preview 'yay -Si {1}')" From a73fa759ebbb412274d8e83ee8693d73521ea20f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 12:37:19 +0300 Subject: [PATCH 0287/2667] Small changes --- home/.config/nvim/conf.d/01-plugins.vim | 3 - home/.config/waybar/config | 254 ++++++++++++------------ home/Scripts/sway-run.sh | 4 - 3 files changed, 125 insertions(+), 136 deletions(-) diff --git a/home/.config/nvim/conf.d/01-plugins.vim b/home/.config/nvim/conf.d/01-plugins.vim index e951fdc2..650e8552 100644 --- a/home/.config/nvim/conf.d/01-plugins.vim +++ b/home/.config/nvim/conf.d/01-plugins.vim @@ -31,9 +31,6 @@ Plug 'https://git.zx2c4.com/password-store', { 'rtp': 'contrib/vim/redact_pass.v " Colorize color words Plug 'norcalli/nvim-colorizer.lua' -" Use neovim from firefox -Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } } - " Spelling Plug 'vim-scripts/Vimchant' diff --git a/home/.config/waybar/config b/home/.config/waybar/config index 359ea57c..11b6c186 100644 --- a/home/.config/waybar/config +++ b/home/.config/waybar/config @@ -1,131 +1,127 @@ -// vim: ft=jsonc +// vim: ft=json { - "layer": "bottom", // Waybar at top layer - "height": 22, // Waybar height - "modules-left": ["sway/workspaces", "sway/mode", "custom/media"], - "modules-center": ["sway/window"], - "modules-right": [ - "idle_inhibitor", - "pulseaudio", - "custom/yay", - "network", - "temperature", - "battery", - "clock", - "tray" - ], - // Modules configuration - "sway/workspaces": { - "disable-scroll": true, - "all-outputs": true, - "format": "{icon}", - "format-icons": { - "1": "", - "2": "", - "3": "", - "4": "", - "5": "", - "urgent": "", - "focused": "", - "default": "" - } - }, - "sway/mode": { - "format": "{}" - }, - "idle_inhibitor": { - "tooltip": false, - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "network": { - "format": "{ifname}", - "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "{ipaddr} ", - "format-disconnected": "Disconnected ", //An empty format will hide the module. - "tooltip-format": "{ifname}", - "tooltip-format-wifi": "{ifname} {frequency}MHz ", - "tooltip-format-ethernet": "{ifname} ", - "tooltip-format-disconnected": "Disconnected" - }, - "tray": { - // "icon-size": 21, - "spacing": 10 - }, - "clock": { - "tooltip": false, - "format": "{:%Y-%m-%d %H:%M} " - }, - "cpu": { - "tooltip": false, - "format": "{usage}% " - }, - "memory": { - "tooltip": false, - "format": "{}% " - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}% {icon}", - "format-icons": ["", ""] - }, - "battery": { - "tooltip": false, - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - "format-icons": ["", "", "", "", ""] - }, - "battery#bat2": { - "bat": "BAT2" - }, - "pulseaudio": { - "tooltip": false, - //"scroll-step": 1, - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% ", - "format-muted": "", - "format-icons": { - "headphones": "", - "handsfree": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", ""] - }, - "on-click": "pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob", - "on-click-right": "pavucontrol", - "on-scroll-up": "pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob", - "on-scroll-down": "pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob" - }, - "custom/media": { - "tooltip": false, - "format": "{}", - "return-type": "json", - "exec": "$HOME/Scripts/mediaplayer.py 2>/dev/null", - "max-length": 50, - "on-click": "playerctl play-pause", - "on-click-right": "playerctl next", - "on-scroll-up": "playerctl volume 0.05+", - "on-scroll-down": "playerctl volume 0.05-" - }, - "custom/yay":{ - "tooltip": false, - "format": "{} ", - "exec": "yay -Qu | wc -l", - "interval": 300, - "on-click": "gnome-software --mode=updates" - }, - "temperature": { - "format": "{temperatureC}°C " - } + "layer": "top", + "test": "asd", + "height": 22, + "modules-left": ["sway/workspaces", "sway/mode", "custom/media"], + "modules-center": ["sway/window"], + "modules-right": [ + "idle_inhibitor", + "pulseaudio", + "custom/yay", + "network", + "temperature", + "battery", + "clock", + "tray" + ], + "sway/workspaces": { + "disable-scroll": true, + "all-outputs": true, + "format": "{icon}", + "format-icons": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "urgent": "", + "focused": "", + "default": "" + } + }, + "sway/mode": { + "format": "{}" + }, + "idle_inhibitor": { + "tooltip": false, + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "network": { + "format": "{ifname}", + "format-wifi": "{essid} ({signalStrength}%) ", + "format-ethernet": "{ipaddr} ", + "format-disconnected": "Disconnected ", + "tooltip-format": "{ifname}", + "tooltip-format-wifi": "{ifname} {frequency}MHz ", + "tooltip-format-ethernet": "{ifname} ", + "tooltip-format-disconnected": "Disconnected" + }, + "tray": { + "spacing": 10 + }, + "clock": { + "tooltip": true, + "tooltip-format": "{:%Y %B}\n{calendar}", + "format": "{:%Y-%m-%d %H:%M} " + }, + "cpu": { + "tooltip": false, + "format": "{usage}% " + }, + "memory": { + "tooltip": false, + "format": "{}% " + }, + "backlight": { + "format": "{percent}% {icon}", + "format-icons": ["", ""] + }, + "battery": { + "tooltip": true, + "tooltip-format": "{time}", + "states": { + "warning": 30, + "critical": 15 + }, + "format": "{capacity}% {icon}", + "format-icons": ["", "", "", "", ""] + }, + "battery#bat2": { + "bat": "BAT2" + }, + "pulseaudio": { + "tooltip": false, + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% ", + "format-muted": "", + "format-icons": { + "headphones": "", + "handsfree": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", ""] + }, + "on-click": "pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob", + "on-click-right": "pavucontrol", + "on-scroll-up": "pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob", + "on-scroll-down": "pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob" + }, + "custom/media": { + "tooltip": false, + "format": "{}", + "return-type": "json", + "exec": "$HOME/Scripts/mediaplayer.py 2>/dev/null", + "max-length": 50, + "on-click": "playerctl play-pause", + "on-click-right": "playerctl next", + "on-scroll-up": "playerctl volume 0.05+", + "on-scroll-down": "playerctl volume 0.05-" + }, + "custom/yay": { + "tooltip": false, + "format": "{} ", + "exec": "yay -Qu | wc -l", + "interval": 300, + "on-click": "gnome-software --mode=updates" + }, + "temperature": { + "format": "{temperatureC}°C " + } } diff --git a/home/Scripts/sway-run.sh b/home/Scripts/sway-run.sh index cff3e15f..445a3529 100755 --- a/home/Scripts/sway-run.sh +++ b/home/Scripts/sway-run.sh @@ -19,9 +19,6 @@ export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 # Fix redshift on wlroots export WLR_DRM_NO_ATOMIC=1 -# Use wayland in SDL2 -export SDL_VIDEODRIVER=wayland - # Run sway sway @@ -35,4 +32,3 @@ unset QT_QPA_PLATFORMTHEME=qt5ct unset QT_QPA_PLATFORM=wayland-egl unset QT_WAYLAND_DISABLE_WINDOWDECORATION=1 unset WLR_DRM_NO_ATOMIC=1 -unset SDL_VIDEODRIVER=wayland From e7656b50bd34e881736fb3cbf2b21358969c9323 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 12:37:19 +0300 Subject: [PATCH 0288/2667] Small changes --- home/.config/nvim/conf.d/01-plugins.vim | 3 - home/.config/waybar/config | 254 ++++++++++++------------ home/Scripts/sway-run.sh | 4 - 3 files changed, 125 insertions(+), 136 deletions(-) diff --git a/home/.config/nvim/conf.d/01-plugins.vim b/home/.config/nvim/conf.d/01-plugins.vim index e951fdc2..650e8552 100644 --- a/home/.config/nvim/conf.d/01-plugins.vim +++ b/home/.config/nvim/conf.d/01-plugins.vim @@ -31,9 +31,6 @@ Plug 'https://git.zx2c4.com/password-store', { 'rtp': 'contrib/vim/redact_pass.v " Colorize color words Plug 'norcalli/nvim-colorizer.lua' -" Use neovim from firefox -Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } } - " Spelling Plug 'vim-scripts/Vimchant' diff --git a/home/.config/waybar/config b/home/.config/waybar/config index 359ea57c..11b6c186 100644 --- a/home/.config/waybar/config +++ b/home/.config/waybar/config @@ -1,131 +1,127 @@ -// vim: ft=jsonc +// vim: ft=json { - "layer": "bottom", // Waybar at top layer - "height": 22, // Waybar height - "modules-left": ["sway/workspaces", "sway/mode", "custom/media"], - "modules-center": ["sway/window"], - "modules-right": [ - "idle_inhibitor", - "pulseaudio", - "custom/yay", - "network", - "temperature", - "battery", - "clock", - "tray" - ], - // Modules configuration - "sway/workspaces": { - "disable-scroll": true, - "all-outputs": true, - "format": "{icon}", - "format-icons": { - "1": "", - "2": "", - "3": "", - "4": "", - "5": "", - "urgent": "", - "focused": "", - "default": "" - } - }, - "sway/mode": { - "format": "{}" - }, - "idle_inhibitor": { - "tooltip": false, - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "network": { - "format": "{ifname}", - "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "{ipaddr} ", - "format-disconnected": "Disconnected ", //An empty format will hide the module. - "tooltip-format": "{ifname}", - "tooltip-format-wifi": "{ifname} {frequency}MHz ", - "tooltip-format-ethernet": "{ifname} ", - "tooltip-format-disconnected": "Disconnected" - }, - "tray": { - // "icon-size": 21, - "spacing": 10 - }, - "clock": { - "tooltip": false, - "format": "{:%Y-%m-%d %H:%M} " - }, - "cpu": { - "tooltip": false, - "format": "{usage}% " - }, - "memory": { - "tooltip": false, - "format": "{}% " - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}% {icon}", - "format-icons": ["", ""] - }, - "battery": { - "tooltip": false, - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - "format-icons": ["", "", "", "", ""] - }, - "battery#bat2": { - "bat": "BAT2" - }, - "pulseaudio": { - "tooltip": false, - //"scroll-step": 1, - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% ", - "format-muted": "", - "format-icons": { - "headphones": "", - "handsfree": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", ""] - }, - "on-click": "pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob", - "on-click-right": "pavucontrol", - "on-scroll-up": "pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob", - "on-scroll-down": "pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob" - }, - "custom/media": { - "tooltip": false, - "format": "{}", - "return-type": "json", - "exec": "$HOME/Scripts/mediaplayer.py 2>/dev/null", - "max-length": 50, - "on-click": "playerctl play-pause", - "on-click-right": "playerctl next", - "on-scroll-up": "playerctl volume 0.05+", - "on-scroll-down": "playerctl volume 0.05-" - }, - "custom/yay":{ - "tooltip": false, - "format": "{} ", - "exec": "yay -Qu | wc -l", - "interval": 300, - "on-click": "gnome-software --mode=updates" - }, - "temperature": { - "format": "{temperatureC}°C " - } + "layer": "top", + "test": "asd", + "height": 22, + "modules-left": ["sway/workspaces", "sway/mode", "custom/media"], + "modules-center": ["sway/window"], + "modules-right": [ + "idle_inhibitor", + "pulseaudio", + "custom/yay", + "network", + "temperature", + "battery", + "clock", + "tray" + ], + "sway/workspaces": { + "disable-scroll": true, + "all-outputs": true, + "format": "{icon}", + "format-icons": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "urgent": "", + "focused": "", + "default": "" + } + }, + "sway/mode": { + "format": "{}" + }, + "idle_inhibitor": { + "tooltip": false, + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "network": { + "format": "{ifname}", + "format-wifi": "{essid} ({signalStrength}%) ", + "format-ethernet": "{ipaddr} ", + "format-disconnected": "Disconnected ", + "tooltip-format": "{ifname}", + "tooltip-format-wifi": "{ifname} {frequency}MHz ", + "tooltip-format-ethernet": "{ifname} ", + "tooltip-format-disconnected": "Disconnected" + }, + "tray": { + "spacing": 10 + }, + "clock": { + "tooltip": true, + "tooltip-format": "{:%Y %B}\n{calendar}", + "format": "{:%Y-%m-%d %H:%M} " + }, + "cpu": { + "tooltip": false, + "format": "{usage}% " + }, + "memory": { + "tooltip": false, + "format": "{}% " + }, + "backlight": { + "format": "{percent}% {icon}", + "format-icons": ["", ""] + }, + "battery": { + "tooltip": true, + "tooltip-format": "{time}", + "states": { + "warning": 30, + "critical": 15 + }, + "format": "{capacity}% {icon}", + "format-icons": ["", "", "", "", ""] + }, + "battery#bat2": { + "bat": "BAT2" + }, + "pulseaudio": { + "tooltip": false, + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% ", + "format-muted": "", + "format-icons": { + "headphones": "", + "handsfree": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", ""] + }, + "on-click": "pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob", + "on-click-right": "pavucontrol", + "on-scroll-up": "pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob", + "on-scroll-down": "pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob" + }, + "custom/media": { + "tooltip": false, + "format": "{}", + "return-type": "json", + "exec": "$HOME/Scripts/mediaplayer.py 2>/dev/null", + "max-length": 50, + "on-click": "playerctl play-pause", + "on-click-right": "playerctl next", + "on-scroll-up": "playerctl volume 0.05+", + "on-scroll-down": "playerctl volume 0.05-" + }, + "custom/yay": { + "tooltip": false, + "format": "{} ", + "exec": "yay -Qu | wc -l", + "interval": 300, + "on-click": "gnome-software --mode=updates" + }, + "temperature": { + "format": "{temperatureC}°C " + } } diff --git a/home/Scripts/sway-run.sh b/home/Scripts/sway-run.sh index cff3e15f..445a3529 100755 --- a/home/Scripts/sway-run.sh +++ b/home/Scripts/sway-run.sh @@ -19,9 +19,6 @@ export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 # Fix redshift on wlroots export WLR_DRM_NO_ATOMIC=1 -# Use wayland in SDL2 -export SDL_VIDEODRIVER=wayland - # Run sway sway @@ -35,4 +32,3 @@ unset QT_QPA_PLATFORMTHEME=qt5ct unset QT_QPA_PLATFORM=wayland-egl unset QT_WAYLAND_DISABLE_WINDOWDECORATION=1 unset WLR_DRM_NO_ATOMIC=1 -unset SDL_VIDEODRIVER=wayland From 759b22199e5084f6f80d9d662eb19599589e6b20 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 12:40:57 +0300 Subject: [PATCH 0289/2667] Remove docker-prune alias (docker system prune -a) --- home/.config/zsh/03-aliases.zsh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 291597e3..66d4a557 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -29,12 +29,6 @@ yi() { fi } -docker-prune() { - docker image prune -a - docker volume prune - docker container prune -} - # search and remove packages with fzf yr() { SELECTED_PKGS="$(yay -Qsq | fzf --header='Remove packages' -m --preview 'yay -Si {1}')" From aa9dfd099833da40918b0c47b8c474fca464b254 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 12:40:57 +0300 Subject: [PATCH 0290/2667] Remove docker-prune alias (docker system prune -a) --- home/.config/zsh/03-aliases.zsh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 291597e3..66d4a557 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -29,12 +29,6 @@ yi() { fi } -docker-prune() { - docker image prune -a - docker volume prune - docker container prune -} - # search and remove packages with fzf yr() { SELECTED_PKGS="$(yay -Qsq | fzf --header='Remove packages' -m --preview 'yay -Si {1}')" From 6792993ba66417cec7b608582f1ca250fdfcf8d1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 13:36:42 +0300 Subject: [PATCH 0291/2667] Add update scripts for docker --- docker/update.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 docker/update.sh diff --git a/docker/update.sh b/docker/update.sh new file mode 100644 index 00000000..ce8b5cdc --- /dev/null +++ b/docker/update.sh @@ -0,0 +1,6 @@ +#!/bin/zsh +for dir in */; do + cd $dir + docker-compose pull && docker-compose down && docker-compose up -d + cd .. +done From 2f3338404680b05a1eb89e5810733e1febcc1c32 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 13:36:42 +0300 Subject: [PATCH 0292/2667] Add update scripts for docker --- docker/update.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 docker/update.sh diff --git a/docker/update.sh b/docker/update.sh new file mode 100644 index 00000000..ce8b5cdc --- /dev/null +++ b/docker/update.sh @@ -0,0 +1,6 @@ +#!/bin/zsh +for dir in */; do + cd $dir + docker-compose pull && docker-compose down && docker-compose up -d + cd .. +done From da233b3b27afe78a0c37677354f0eea2ce89473b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 13:37:25 +0300 Subject: [PATCH 0293/2667] chmod +x --- docker/update.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 docker/update.sh diff --git a/docker/update.sh b/docker/update.sh old mode 100644 new mode 100755 From d0264df887b70c43356370bf7ac350e7b0035298 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 13:37:25 +0300 Subject: [PATCH 0294/2667] chmod +x --- docker/update.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 docker/update.sh diff --git a/docker/update.sh b/docker/update.sh old mode 100644 new mode 100755 From ec6971b9c4be93d5a34cdf8404ede4492493450a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 14:03:21 +0300 Subject: [PATCH 0295/2667] Revise update aliases --- docker/update.sh | 6 ------ home/.config/zsh/03-aliases.zsh | 26 +++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 7 deletions(-) delete mode 100755 docker/update.sh diff --git a/docker/update.sh b/docker/update.sh deleted file mode 100755 index ce8b5cdc..00000000 --- a/docker/update.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/zsh -for dir in */; do - cd $dir - docker-compose pull && docker-compose down && docker-compose up -d - cd .. -done diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 66d4a557..90588ccc 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -111,6 +111,7 @@ compdef _dotdrop-completion.zsh sdotdrop alias dotgit='git -C $DOTREPO' dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } + # sync password manager passync() { pass git pull && pass git push && updatesecrets } @@ -121,8 +122,31 @@ plugupdate() { zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all } + update() { yay -Pw && yay } -updateall() { yay -Syu --devel firefox-nightly; plugupdate; sudo awman-update } + +{%@@ if profile == "Moria" @@%} +update-docker() { + for dir in $HOME/Git/dotfiles/docker/*; do + cd $dir + docker-compose pull + docker-compose up -d + cd .. + done +} + +update-all() { + update + plugupdate + update-docker +} +{%@@ else @@%} +updateall() { + yay -Pw + yay -Syu --devel firefox-nightly + plugupdate + sudo awman-update +} # remove unneeded packages autoremove() { sudo pacman -Rns $(pacman -Qdtq) } From 13d5c540121542f5cd54a1fa2b1c8f93f2ea1cd5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 14:03:21 +0300 Subject: [PATCH 0296/2667] Revise update aliases --- docker/update.sh | 6 ------ home/.config/zsh/03-aliases.zsh | 26 +++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 7 deletions(-) delete mode 100755 docker/update.sh diff --git a/docker/update.sh b/docker/update.sh deleted file mode 100755 index ce8b5cdc..00000000 --- a/docker/update.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/zsh -for dir in */; do - cd $dir - docker-compose pull && docker-compose down && docker-compose up -d - cd .. -done diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 66d4a557..90588ccc 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -111,6 +111,7 @@ compdef _dotdrop-completion.zsh sdotdrop alias dotgit='git -C $DOTREPO' dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } + # sync password manager passync() { pass git pull && pass git push && updatesecrets } @@ -121,8 +122,31 @@ plugupdate() { zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all } + update() { yay -Pw && yay } -updateall() { yay -Syu --devel firefox-nightly; plugupdate; sudo awman-update } + +{%@@ if profile == "Moria" @@%} +update-docker() { + for dir in $HOME/Git/dotfiles/docker/*; do + cd $dir + docker-compose pull + docker-compose up -d + cd .. + done +} + +update-all() { + update + plugupdate + update-docker +} +{%@@ else @@%} +updateall() { + yay -Pw + yay -Syu --devel firefox-nightly + plugupdate + sudo awman-update +} # remove unneeded packages autoremove() { sudo pacman -Rns $(pacman -Qdtq) } From 98892460d4f481a82e247f0a1f1ebc5b66d2a409 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 14:04:22 +0300 Subject: [PATCH 0297/2667] Forgot endif --- home/.config/zsh/03-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 90588ccc..42d2cbbe 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -147,6 +147,7 @@ updateall() { plugupdate sudo awman-update } +{%@@ endif @@%} # remove unneeded packages autoremove() { sudo pacman -Rns $(pacman -Qdtq) } From cfd8e0e9332ea8ba2762604e1f03190d412ca1f4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 14:04:22 +0300 Subject: [PATCH 0298/2667] Forgot endif --- home/.config/zsh/03-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 90588ccc..42d2cbbe 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -147,6 +147,7 @@ updateall() { plugupdate sudo awman-update } +{%@@ endif @@%} # remove unneeded packages autoremove() { sudo pacman -Rns $(pacman -Qdtq) } From dee1c7161dc412dd66d804261d10e35f93395420 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 14:38:51 +0300 Subject: [PATCH 0299/2667] Made a new update function --- home/.config/zsh/03-aliases.zsh | 80 +++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 29 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 42d2cbbe..46ca3653 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -115,39 +115,61 @@ dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } # sync password manager passync() { pass git pull && pass git push && updatesecrets } -# update stuff -plugupdate() { - vim +PlugUpgrade +PlugUpdate +CocUpdate +qa - zinit self-update - zinit update -p - $HOME/.tmux/plugins/tpm/bin/update_plugins all -} +update() { + all() { + base --devel + plugins + {%@@ if profile == "Moria" @@%} + docker + {%@@ else @@%} + yay -Syu firefox-nightly + {%@@ endif @@%} + sudo awman-update + } -update() { yay -Pw && yay } + base() { + yay -Pw + yay $@ + } -{%@@ if profile == "Moria" @@%} -update-docker() { - for dir in $HOME/Git/dotfiles/docker/*; do - cd $dir - docker-compose pull - docker-compose up -d - cd .. - done -} + plugins() { + vim +PlugUpgrade +PlugUpdate +CocUpdate +qa + zinit self-update + zinit update -p + $HOME/.tmux/plugins/tpm/bin/update_plugins all + } -update-all() { - update - plugupdate - update-docker + docker() { + for dir in $HOME/Git/dotfiles/docker/*; do + cd $dir + docker-compose pull + docker-compose up -d + cd .. + done + } + + if [ $# -eq 0 ]; then + 1=base + fi + + case "$1" in + all) + all + ;; + base) + base + ;; + plugins) + plugins + ;; + docker) + docker + ;; + *) + printf "$1: not a valid action" + ;; + esac } -{%@@ else @@%} -updateall() { - yay -Pw - yay -Syu --devel firefox-nightly - plugupdate - sudo awman-update -} -{%@@ endif @@%} # remove unneeded packages autoremove() { sudo pacman -Rns $(pacman -Qdtq) } From 93b7a41cc664d70d2ebb8704618113904003a8ad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 14:38:51 +0300 Subject: [PATCH 0300/2667] Made a new update function --- home/.config/zsh/03-aliases.zsh | 80 +++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 29 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 42d2cbbe..46ca3653 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -115,39 +115,61 @@ dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } # sync password manager passync() { pass git pull && pass git push && updatesecrets } -# update stuff -plugupdate() { - vim +PlugUpgrade +PlugUpdate +CocUpdate +qa - zinit self-update - zinit update -p - $HOME/.tmux/plugins/tpm/bin/update_plugins all -} +update() { + all() { + base --devel + plugins + {%@@ if profile == "Moria" @@%} + docker + {%@@ else @@%} + yay -Syu firefox-nightly + {%@@ endif @@%} + sudo awman-update + } -update() { yay -Pw && yay } + base() { + yay -Pw + yay $@ + } -{%@@ if profile == "Moria" @@%} -update-docker() { - for dir in $HOME/Git/dotfiles/docker/*; do - cd $dir - docker-compose pull - docker-compose up -d - cd .. - done -} + plugins() { + vim +PlugUpgrade +PlugUpdate +CocUpdate +qa + zinit self-update + zinit update -p + $HOME/.tmux/plugins/tpm/bin/update_plugins all + } -update-all() { - update - plugupdate - update-docker + docker() { + for dir in $HOME/Git/dotfiles/docker/*; do + cd $dir + docker-compose pull + docker-compose up -d + cd .. + done + } + + if [ $# -eq 0 ]; then + 1=base + fi + + case "$1" in + all) + all + ;; + base) + base + ;; + plugins) + plugins + ;; + docker) + docker + ;; + *) + printf "$1: not a valid action" + ;; + esac } -{%@@ else @@%} -updateall() { - yay -Pw - yay -Syu --devel firefox-nightly - plugupdate - sudo awman-update -} -{%@@ endif @@%} # remove unneeded packages autoremove() { sudo pacman -Rns $(pacman -Qdtq) } From b0f199a2b01f452e79a525d95695160cb9df927d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 14:44:16 +0300 Subject: [PATCH 0301/2667] Made firefox-nightly update only for Mirkwood --- home/.config/zsh/03-aliases.zsh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 46ca3653..ad885e67 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -117,19 +117,21 @@ passync() { pass git pull && pass git push && updatesecrets } update() { all() { - base --devel plugins {%@@ if profile == "Moria" @@%} + base --devel docker + {%@@ elif profile == "Mirkwood" @@%} + base --devel firefox-nightly {%@@ else @@%} - yay -Syu firefox-nightly + base --devel {%@@ endif @@%} sudo awman-update } base() { yay -Pw - yay $@ + yay -Syu $@ } plugins() { From 3d6aaee81de6321a908f0bb477eb09509a1057ff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 14:44:16 +0300 Subject: [PATCH 0302/2667] Made firefox-nightly update only for Mirkwood --- home/.config/zsh/03-aliases.zsh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 46ca3653..ad885e67 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -117,19 +117,21 @@ passync() { pass git pull && pass git push && updatesecrets } update() { all() { - base --devel plugins {%@@ if profile == "Moria" @@%} + base --devel docker + {%@@ elif profile == "Mirkwood" @@%} + base --devel firefox-nightly {%@@ else @@%} - yay -Syu firefox-nightly + base --devel {%@@ endif @@%} sudo awman-update } base() { yay -Pw - yay $@ + yay -Syu $@ } plugins() { From 5b77a78e7638078eeef0c2ac45a92633efbff504 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 15:05:05 +0300 Subject: [PATCH 0303/2667] Exclude docker from others than Moria --- home/.config/zsh/03-aliases.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index ad885e67..6a362f3b 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -140,6 +140,7 @@ update() { zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all } + {%@@ if profile == "Moria" @@%} docker() { for dir in $HOME/Git/dotfiles/docker/*; do @@ -150,6 +151,7 @@ update() { done } + {%@@ endif @@%} if [ $# -eq 0 ]; then 1=base fi @@ -164,9 +166,11 @@ update() { plugins) plugins ;; + {%@@ if profile == "Moria" @@%} docker) docker ;; + {%@@ endif @@%} *) printf "$1: not a valid action" ;; From 0e80996300e185ee4f03fef8d2377dc5b938399d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 15:05:05 +0300 Subject: [PATCH 0304/2667] Exclude docker from others than Moria --- home/.config/zsh/03-aliases.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index ad885e67..6a362f3b 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -140,6 +140,7 @@ update() { zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all } + {%@@ if profile == "Moria" @@%} docker() { for dir in $HOME/Git/dotfiles/docker/*; do @@ -150,6 +151,7 @@ update() { done } + {%@@ endif @@%} if [ $# -eq 0 ]; then 1=base fi @@ -164,9 +166,11 @@ update() { plugins) plugins ;; + {%@@ if profile == "Moria" @@%} docker) docker ;; + {%@@ endif @@%} *) printf "$1: not a valid action" ;; From 0510059d85e4a00396a91d8a528810d9e4c72f9e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 22:34:56 +0300 Subject: [PATCH 0305/2667] Switch to stable gitea image --- docker/gitea/docker-compose.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index f2b31f23..ac8684ce 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -1,9 +1,9 @@ -version: '2' +version: "2" services: gitea: container_name: gitea - image: gitea/gitea:latest + image: gitea/gitea:1 environment: - TZ=Europe/Helsinki - USER_UID=1000 @@ -18,28 +18,28 @@ services: - gitea - proxy ports: - - '3000:3000' - - '222:22' + - "3000:3000" + - "222:22" depends_on: - mariadb-gitea volumes: - /docker/gitea/gitea:/data - /etc/localtime:/etc/localtime:ro labels: - - 'traefik.enable=true' + - "traefik.enable=true" - - 'traefik.http.routers.gitea-redirect.entrypoints=http' - - 'traefik.http.routers.gitea-redirect.rule=Host(`git.reekynet.com`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.gitea-redirect.middlewares=http2https' + - "traefik.http.routers.gitea-redirect.entrypoints=http" + - "traefik.http.routers.gitea-redirect.rule=Host(`git.reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.gitea-redirect.middlewares=http2https" - - 'traefik.http.routers.gitea.entrypoints=https' - - 'traefik.http.routers.gitea.rule=Host(`git.reekynet.com`)' - - 'traefik.http.routers.gitea.tls=true' - - 'traefik.http.routers.gitea.tls.certresolver=http' - - 'traefik.http.routers.gitea.service=gitea' - - 'traefik.docker.network=proxy' - - 'traefik.http.services.gitea.loadbalancer.server.port=3000' + - "traefik.http.routers.gitea.entrypoints=https" + - "traefik.http.routers.gitea.rule=Host(`git.reekynet.com`)" + - "traefik.http.routers.gitea.tls=true" + - "traefik.http.routers.gitea.tls.certresolver=http" + - "traefik.http.routers.gitea.service=gitea" + - "traefik.docker.network=proxy" + - "traefik.http.services.gitea.loadbalancer.server.port=3000" mariadb-gitea: container_name: mariadb-gitea From 76cad1cb1c9a3e51552f39b6cf8e2bd52513bb40 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 22:34:56 +0300 Subject: [PATCH 0306/2667] Switch to stable gitea image --- docker/gitea/docker-compose.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index f2b31f23..ac8684ce 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -1,9 +1,9 @@ -version: '2' +version: "2" services: gitea: container_name: gitea - image: gitea/gitea:latest + image: gitea/gitea:1 environment: - TZ=Europe/Helsinki - USER_UID=1000 @@ -18,28 +18,28 @@ services: - gitea - proxy ports: - - '3000:3000' - - '222:22' + - "3000:3000" + - "222:22" depends_on: - mariadb-gitea volumes: - /docker/gitea/gitea:/data - /etc/localtime:/etc/localtime:ro labels: - - 'traefik.enable=true' + - "traefik.enable=true" - - 'traefik.http.routers.gitea-redirect.entrypoints=http' - - 'traefik.http.routers.gitea-redirect.rule=Host(`git.reekynet.com`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.gitea-redirect.middlewares=http2https' + - "traefik.http.routers.gitea-redirect.entrypoints=http" + - "traefik.http.routers.gitea-redirect.rule=Host(`git.reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.gitea-redirect.middlewares=http2https" - - 'traefik.http.routers.gitea.entrypoints=https' - - 'traefik.http.routers.gitea.rule=Host(`git.reekynet.com`)' - - 'traefik.http.routers.gitea.tls=true' - - 'traefik.http.routers.gitea.tls.certresolver=http' - - 'traefik.http.routers.gitea.service=gitea' - - 'traefik.docker.network=proxy' - - 'traefik.http.services.gitea.loadbalancer.server.port=3000' + - "traefik.http.routers.gitea.entrypoints=https" + - "traefik.http.routers.gitea.rule=Host(`git.reekynet.com`)" + - "traefik.http.routers.gitea.tls=true" + - "traefik.http.routers.gitea.tls.certresolver=http" + - "traefik.http.routers.gitea.service=gitea" + - "traefik.docker.network=proxy" + - "traefik.http.services.gitea.loadbalancer.server.port=3000" mariadb-gitea: container_name: mariadb-gitea From 338e28e8c6db591807b3f243b5003cad06dee46f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 22:41:49 +0300 Subject: [PATCH 0307/2667] Fix docker update function name --- home/.config/zsh/03-aliases.zsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 6a362f3b..21461ce3 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -120,7 +120,7 @@ update() { plugins {%@@ if profile == "Moria" @@%} base --devel - docker + docker-pull {%@@ elif profile == "Mirkwood" @@%} base --devel firefox-nightly {%@@ else @@%} @@ -142,7 +142,7 @@ update() { } {%@@ if profile == "Moria" @@%} - docker() { + docker-pull() { for dir in $HOME/Git/dotfiles/docker/*; do cd $dir docker-compose pull @@ -168,7 +168,7 @@ update() { ;; {%@@ if profile == "Moria" @@%} docker) - docker + docker-pull ;; {%@@ endif @@%} *) From c62b2c98bc4c17f664c5877fdfff2582dee98fc6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 22:41:49 +0300 Subject: [PATCH 0308/2667] Fix docker update function name --- home/.config/zsh/03-aliases.zsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 6a362f3b..21461ce3 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -120,7 +120,7 @@ update() { plugins {%@@ if profile == "Moria" @@%} base --devel - docker + docker-pull {%@@ elif profile == "Mirkwood" @@%} base --devel firefox-nightly {%@@ else @@%} @@ -142,7 +142,7 @@ update() { } {%@@ if profile == "Moria" @@%} - docker() { + docker-pull() { for dir in $HOME/Git/dotfiles/docker/*; do cd $dir docker-compose pull @@ -168,7 +168,7 @@ update() { ;; {%@@ if profile == "Moria" @@%} docker) - docker + docker-pull ;; {%@@ endif @@%} *) From 9083499cc830782e0baa07370d56db33cfe97e80 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 22:43:59 +0300 Subject: [PATCH 0309/2667] Revert "Fix docker update function name" This reverts commit 9491c53af7f0c9550f86623d5eddbb5c6f86059b. --- home/.config/zsh/03-aliases.zsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 21461ce3..6a362f3b 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -120,7 +120,7 @@ update() { plugins {%@@ if profile == "Moria" @@%} base --devel - docker-pull + docker {%@@ elif profile == "Mirkwood" @@%} base --devel firefox-nightly {%@@ else @@%} @@ -142,7 +142,7 @@ update() { } {%@@ if profile == "Moria" @@%} - docker-pull() { + docker() { for dir in $HOME/Git/dotfiles/docker/*; do cd $dir docker-compose pull @@ -168,7 +168,7 @@ update() { ;; {%@@ if profile == "Moria" @@%} docker) - docker-pull + docker ;; {%@@ endif @@%} *) From cf1128622f810df24d3396e70a878afde67b8df4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 22:43:59 +0300 Subject: [PATCH 0310/2667] Revert "Fix docker update function name" This reverts commit 93e9f035ef61553fb492121919dc1f8178cc3a21. --- home/.config/zsh/03-aliases.zsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 21461ce3..6a362f3b 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -120,7 +120,7 @@ update() { plugins {%@@ if profile == "Moria" @@%} base --devel - docker-pull + docker {%@@ elif profile == "Mirkwood" @@%} base --devel firefox-nightly {%@@ else @@%} @@ -142,7 +142,7 @@ update() { } {%@@ if profile == "Moria" @@%} - docker-pull() { + docker() { for dir in $HOME/Git/dotfiles/docker/*; do cd $dir docker-compose pull @@ -168,7 +168,7 @@ update() { ;; {%@@ if profile == "Moria" @@%} docker) - docker-pull + docker ;; {%@@ endif @@%} *) From 166bad79b481bf19569715e6f0f659bde54476b9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 23:28:13 +0300 Subject: [PATCH 0311/2667] Change gtk theme --- home/.config/sway/conf.d/08-exec.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 5ef5045f..397e2323 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -17,7 +17,7 @@ exec { } exec_always { - gsettings set $gnome-schema gtk-theme 'vimix-dark-doder' + gsettings set $gnome-schema gtk-theme 'Matcha-dark-azul' gsettings set $gnome-schema icon-theme 'Papirus-Dark' gsettings set $gnome-schema cursor-theme 'Breeze' gsettings set $gnome-schema font-name 'Overpass 12' From ab5f5f7899b190fbf4a5a4be46be624911bee8d8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 23:28:13 +0300 Subject: [PATCH 0312/2667] Change gtk theme --- home/.config/sway/conf.d/08-exec.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 5ef5045f..397e2323 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -17,7 +17,7 @@ exec { } exec_always { - gsettings set $gnome-schema gtk-theme 'vimix-dark-doder' + gsettings set $gnome-schema gtk-theme 'Matcha-dark-azul' gsettings set $gnome-schema icon-theme 'Papirus-Dark' gsettings set $gnome-schema cursor-theme 'Breeze' gsettings set $gnome-schema font-name 'Overpass 12' From 787982c35b8a67d8ec9a69ff32595aad0d9d8daf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Apr 2020 13:09:11 +0300 Subject: [PATCH 0313/2667] Change docker update function name --- home/.config/zsh/03-aliases.zsh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 6a362f3b..89a7179a 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -120,7 +120,7 @@ update() { plugins {%@@ if profile == "Moria" @@%} base --devel - docker + docker-update {%@@ elif profile == "Mirkwood" @@%} base --devel firefox-nightly {%@@ else @@%} @@ -142,7 +142,7 @@ update() { } {%@@ if profile == "Moria" @@%} - docker() { + docker-update() { for dir in $HOME/Git/dotfiles/docker/*; do cd $dir docker-compose pull @@ -168,7 +168,7 @@ update() { ;; {%@@ if profile == "Moria" @@%} docker) - docker + docker-update ;; {%@@ endif @@%} *) @@ -187,7 +187,7 @@ tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/nu alias reflect='sudo reflector --latest 200 --threads 8 --verbose --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist' # better ls -alias ls='exa --time-style=long-iso --git' +alias ls='ls_extended -I' # default icon for notify-send alias notify-send='notify-send --icon=alarm' From d003263cb6c316fbdcb2c01b360a369fde071292 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Apr 2020 13:09:11 +0300 Subject: [PATCH 0314/2667] Change docker update function name --- home/.config/zsh/03-aliases.zsh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 6a362f3b..89a7179a 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -120,7 +120,7 @@ update() { plugins {%@@ if profile == "Moria" @@%} base --devel - docker + docker-update {%@@ elif profile == "Mirkwood" @@%} base --devel firefox-nightly {%@@ else @@%} @@ -142,7 +142,7 @@ update() { } {%@@ if profile == "Moria" @@%} - docker() { + docker-update() { for dir in $HOME/Git/dotfiles/docker/*; do cd $dir docker-compose pull @@ -168,7 +168,7 @@ update() { ;; {%@@ if profile == "Moria" @@%} docker) - docker + docker-update ;; {%@@ endif @@%} *) @@ -187,7 +187,7 @@ tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/nu alias reflect='sudo reflector --latest 200 --threads 8 --verbose --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist' # better ls -alias ls='exa --time-style=long-iso --git' +alias ls='ls_extended -I' # default icon for notify-send alias notify-send='notify-send --icon=alarm' From a2f69c646a0bee648e2669809cc7dd64d6e9da9a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Apr 2020 10:36:41 +0300 Subject: [PATCH 0315/2667] Cleaned up scripts folder and moved some stuff --- config-home.yaml | 4 +- home/.config/sway/conf.d/01-vars.conf | 1 + home/.config/sway/conf.d/06-keybinds.conf | 32 +++++++++- home/.config/sway/conf.d/08-exec.conf | 2 +- .../sway/scripts/exit.sh} | 0 .../sway/scripts/idle.sh} | 4 +- .../sway/scripts/lock.sh} | 0 .../sway/scripts/run.sh} | 0 home/.config/user-dirs.dirs | 7 -- home/.config/waybar/config | 2 +- .../waybar/scripts}/mediaplayer.py | 0 home/.config/zsh/01-env.zsh | 1 + home/.config/zsh/03-aliases.zsh | 6 +- home/{Scripts => .scripts}/autorotate.sh | 0 .../confgen/termite.conf.gen.sh | 0 .../confgen/zathura.conf.gen.sh | 0 .../hibernate-lowbattery.sh | 0 home/{Scripts => .scripts}/ipmi/auto.sh | 0 home/{Scripts => .scripts}/ipmi/fans.sh | 0 home/{Scripts => .scripts}/ipmi/full.sh | 0 home/{Scripts => .scripts}/ipmi/static.sh | 0 home/{Scripts => .scripts}/ipmi/temp.sh | 0 home/{Scripts => .scripts/media}/imageviewer | 0 home/{Scripts => .scripts/media}/imgurviewer | 0 home/{Scripts => .scripts/media}/mpvqueue | 0 home/{Scripts => .scripts}/open_with_linux.py | 4 +- home/.zprofile | 2 +- home/Scripts/check-mail.sh | 4 -- home/Scripts/fonts.sh | 3 - home/Scripts/fzf-shot.sh | 64 ------------------- home/Scripts/lidclose.sh | 9 --- home/Scripts/polybar.sh | 13 ---- home/Scripts/touchpadtoggle.sh | 26 -------- 33 files changed, 42 insertions(+), 142 deletions(-) rename home/{Scripts/sway-exit.sh => .config/sway/scripts/exit.sh} (100%) rename home/{Scripts/swayidle.sh => .config/sway/scripts/idle.sh} (74%) rename home/{Scripts/swaylock.sh => .config/sway/scripts/lock.sh} (100%) rename home/{Scripts/sway-run.sh => .config/sway/scripts/run.sh} (100%) rename home/{Scripts => .config/waybar/scripts}/mediaplayer.py (100%) rename home/{Scripts => .scripts}/autorotate.sh (100%) rename home/{Scripts => .scripts}/confgen/termite.conf.gen.sh (100%) rename home/{Scripts => .scripts}/confgen/zathura.conf.gen.sh (100%) rename home/{Scripts => .scripts}/hibernate-lowbattery.sh (100%) rename home/{Scripts => .scripts}/ipmi/auto.sh (100%) rename home/{Scripts => .scripts}/ipmi/fans.sh (100%) rename home/{Scripts => .scripts}/ipmi/full.sh (100%) rename home/{Scripts => .scripts}/ipmi/static.sh (100%) rename home/{Scripts => .scripts}/ipmi/temp.sh (100%) rename home/{Scripts => .scripts/media}/imageviewer (100%) rename home/{Scripts => .scripts/media}/imgurviewer (100%) rename home/{Scripts => .scripts/media}/mpvqueue (100%) rename home/{Scripts => .scripts}/open_with_linux.py (95%) delete mode 100755 home/Scripts/check-mail.sh delete mode 100755 home/Scripts/fonts.sh delete mode 100755 home/Scripts/fzf-shot.sh delete mode 100755 home/Scripts/lidclose.sh delete mode 100755 home/Scripts/polybar.sh delete mode 100755 home/Scripts/touchpadtoggle.sh diff --git a/config-home.yaml b/config-home.yaml index 0be18204..abf4370c 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -31,8 +31,8 @@ dotfiles: dst: ~/.config/nvim/coc-settings.json src: .config/nvim/coc-settings.json d_scripts: - dst: ~/Scripts - src: Scripts + dst: ~/.scripts + src: .scripts d_sway: dst: ~/.config/sway src: .config/sway diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index 11347159..5ca6f7ef 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -4,3 +4,4 @@ set $mod Mod4 set $term alacritty set $gnome-schema org.gnome.desktop.interface set $wallpaper ~/Pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) +set $scripts ~/.config/sway/scripts diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 1335220d..df869500 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -6,8 +6,34 @@ bindsym $mod+Return exec $term # kill focused window bindsym $mod+w kill -# start your launcher -bindsym $mod+Shift+p exec rofi-pass --bmarks +# Modes for controlling gaps +set $mode_gaps Gaps: (o) outer, (i) inner +set $mode_gaps_outer Outer Gaps: j|k|0|r|i +set $mode_gaps_inner Inner Gaps: j|k|0|r|o +bindsym $mod+g mode "$mode_gaps" + +mode "$mode_gaps" { + bindsym o mode "$mode_gaps_outer" + bindsym i mode "$mode_gaps_inner" + bindsym Escape mode "default" +} + +mode "$mode_gaps_inner" { + bindsym j gaps inner all minus 1 + bindsym k gaps inner all plus 1 + bindsym 0 gaps inner all set 0 + bindsym r gaps inner all set 10 + bindsym i mode "$mode_gaps_outer" + bindsym Escape mode "default" +} +mode "$mode_gaps_outer" { + bindsym j gaps outer all minus 1 + bindsym k gaps outer all plus 1 + bindsym 0 gaps outer all set 0 + bindsym r gaps outer all set 10 + bindsym o mode "$mode_gaps_inner" + bindsym Escape mode "default" +} # Drag floating windows by holding down $mod and left mouse button. # Resize them with right mouse button + $mod. @@ -27,7 +53,7 @@ bindsym --locked XF86Search output eDP-1 toggle # FZF # exit menu -bindsym $mod+Shift+e exec $term --class fzf-launcher -e $HOME/Scripts/sway-exit.sh +bindsym $mod+Shift+e exec $term --class fzf-launcher -e $scripts/exit.sh # launch a program bindsym $mod+d exec wofi bindsym $mod+Shift+d exec wofi --show run diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 397e2323..420bb6e0 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -1,7 +1,7 @@ # vim:ft=i3config exec { - $HOME/Scripts/swayidle.sh + $scripts/idle.sh autotiling redshift-gtk -m wayland telegram-desktop diff --git a/home/Scripts/sway-exit.sh b/home/.config/sway/scripts/exit.sh similarity index 100% rename from home/Scripts/sway-exit.sh rename to home/.config/sway/scripts/exit.sh diff --git a/home/Scripts/swayidle.sh b/home/.config/sway/scripts/idle.sh similarity index 74% rename from home/Scripts/swayidle.sh rename to home/.config/sway/scripts/idle.sh index c096921d..5b9fc27c 100755 --- a/home/Scripts/swayidle.sh +++ b/home/.config/sway/scripts/idle.sh @@ -1,5 +1,5 @@ #!/bin/bash -swaylock="$HOME/Scripts/swaylock.sh" +swaylock="$HOME/.config/sway/scripts/lock.sh" screenon="swaymsg 'output * dpms on'" screenoff="swaymsg 'output * dpms off'" swayidle \ @@ -10,4 +10,4 @@ swayidle \ timeout 600 "loginctl lock-session" \ timeout 610 "$screenoff" \ resume "$screenon; lqsd -r" \ - before-sleep "playerctl pause; loginctl lock-session" + before-sleep "playerctl pause; loginctl lock-session" \ diff --git a/home/Scripts/swaylock.sh b/home/.config/sway/scripts/lock.sh similarity index 100% rename from home/Scripts/swaylock.sh rename to home/.config/sway/scripts/lock.sh diff --git a/home/Scripts/sway-run.sh b/home/.config/sway/scripts/run.sh similarity index 100% rename from home/Scripts/sway-run.sh rename to home/.config/sway/scripts/run.sh diff --git a/home/.config/user-dirs.dirs b/home/.config/user-dirs.dirs index 7f9a9593..4356ac10 100644 --- a/home/.config/user-dirs.dirs +++ b/home/.config/user-dirs.dirs @@ -1,10 +1,3 @@ -# This file is written by xdg-user-dirs-update -# If you want to change or add directories, just edit the line you're -# interested in. All local changes will be retained on the next run. -# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped -# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an -# absolute path. No other format is supported. -# XDG_DESKTOP_DIR="$HOME/Desktop" XDG_DOWNLOAD_DIR="$HOME/Downloads" XDG_TEMPLATES_DIR="$HOME/Templates" diff --git a/home/.config/waybar/config b/home/.config/waybar/config index 11b6c186..d0e27762 100644 --- a/home/.config/waybar/config +++ b/home/.config/waybar/config @@ -107,7 +107,7 @@ "tooltip": false, "format": "{}", "return-type": "json", - "exec": "$HOME/Scripts/mediaplayer.py 2>/dev/null", + "exec": "$HOME/.config/waybar/scripts/mediaplayer.py 2>/dev/null", "max-length": 50, "on-click": "playerctl play-pause", "on-click-right": "playerctl next", diff --git a/home/Scripts/mediaplayer.py b/home/.config/waybar/scripts/mediaplayer.py similarity index 100% rename from home/Scripts/mediaplayer.py rename to home/.config/waybar/scripts/mediaplayer.py diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 47431a93..b35516fb 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -18,6 +18,7 @@ export GOPATH=~/.bin/go # fzf settings export FZF_DEFAULT_COMMAND='rg --files --hidden 2>/dev/null' +export FZF_DEFAULT_OPTS='-m --bind ctrl-a:select-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" export FZF_CTRL_T_OPTS='--preview "/usr/bin/cat {} | nvimpager -c "' diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 89a7179a..721fcc14 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -140,7 +140,6 @@ update() { zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all } - {%@@ if profile == "Moria" @@%} docker-update() { for dir in $HOME/Git/dotfiles/docker/*; do @@ -151,7 +150,6 @@ update() { done } - {%@@ endif @@%} if [ $# -eq 0 ]; then 1=base fi @@ -166,11 +164,9 @@ update() { plugins) plugins ;; - {%@@ if profile == "Moria" @@%} docker) docker-update ;; - {%@@ endif @@%} *) printf "$1: not a valid action" ;; @@ -187,7 +183,7 @@ tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/nu alias reflect='sudo reflector --latest 200 --threads 8 --verbose --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist' # better ls -alias ls='ls_extended -I' +alias ls='ls_extended -Ih' # default icon for notify-send alias notify-send='notify-send --icon=alarm' diff --git a/home/Scripts/autorotate.sh b/home/.scripts/autorotate.sh similarity index 100% rename from home/Scripts/autorotate.sh rename to home/.scripts/autorotate.sh diff --git a/home/Scripts/confgen/termite.conf.gen.sh b/home/.scripts/confgen/termite.conf.gen.sh similarity index 100% rename from home/Scripts/confgen/termite.conf.gen.sh rename to home/.scripts/confgen/termite.conf.gen.sh diff --git a/home/Scripts/confgen/zathura.conf.gen.sh b/home/.scripts/confgen/zathura.conf.gen.sh similarity index 100% rename from home/Scripts/confgen/zathura.conf.gen.sh rename to home/.scripts/confgen/zathura.conf.gen.sh diff --git a/home/Scripts/hibernate-lowbattery.sh b/home/.scripts/hibernate-lowbattery.sh similarity index 100% rename from home/Scripts/hibernate-lowbattery.sh rename to home/.scripts/hibernate-lowbattery.sh diff --git a/home/Scripts/ipmi/auto.sh b/home/.scripts/ipmi/auto.sh similarity index 100% rename from home/Scripts/ipmi/auto.sh rename to home/.scripts/ipmi/auto.sh diff --git a/home/Scripts/ipmi/fans.sh b/home/.scripts/ipmi/fans.sh similarity index 100% rename from home/Scripts/ipmi/fans.sh rename to home/.scripts/ipmi/fans.sh diff --git a/home/Scripts/ipmi/full.sh b/home/.scripts/ipmi/full.sh similarity index 100% rename from home/Scripts/ipmi/full.sh rename to home/.scripts/ipmi/full.sh diff --git a/home/Scripts/ipmi/static.sh b/home/.scripts/ipmi/static.sh similarity index 100% rename from home/Scripts/ipmi/static.sh rename to home/.scripts/ipmi/static.sh diff --git a/home/Scripts/ipmi/temp.sh b/home/.scripts/ipmi/temp.sh similarity index 100% rename from home/Scripts/ipmi/temp.sh rename to home/.scripts/ipmi/temp.sh diff --git a/home/Scripts/imageviewer b/home/.scripts/media/imageviewer similarity index 100% rename from home/Scripts/imageviewer rename to home/.scripts/media/imageviewer diff --git a/home/Scripts/imgurviewer b/home/.scripts/media/imgurviewer similarity index 100% rename from home/Scripts/imgurviewer rename to home/.scripts/media/imgurviewer diff --git a/home/Scripts/mpvqueue b/home/.scripts/media/mpvqueue similarity index 100% rename from home/Scripts/mpvqueue rename to home/.scripts/media/mpvqueue diff --git a/home/Scripts/open_with_linux.py b/home/.scripts/open_with_linux.py similarity index 95% rename from home/Scripts/open_with_linux.py rename to home/.scripts/open_with_linux.py index fe1dbecf..6a4f9799 100755 --- a/home/Scripts/open_with_linux.py +++ b/home/.scripts/open_with_linux.py @@ -7,7 +7,7 @@ import json import struct import subprocess -VERSION = '7.1b2' +VERSION = '7.2.2' try: sys.stdin.buffer @@ -63,6 +63,8 @@ def install(): } locations = { 'chrome': os.path.join(home_path, '.config', 'google-chrome', 'NativeMessagingHosts'), + 'chrome-beta': os.path.join(home_path, '.config', 'google-chrome-beta', 'NativeMessagingHosts'), + 'chrome-unstable': os.path.join(home_path, '.config', 'google-chrome-unstable', 'NativeMessagingHosts'), 'chromium': os.path.join(home_path, '.config', 'chromium', 'NativeMessagingHosts'), 'firefox': os.path.join(home_path, '.mozilla', 'native-messaging-hosts'), } diff --git a/home/.zprofile b/home/.zprofile index dcbf3fe2..ed8b10ac 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,5 +1,5 @@ if cat /proc/cmdline | grep -q "video=eDP-1:d"; then [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && kodi else - [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && $HOME/Scripts/sway-run.sh > /dev/null 2>&1 + [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && $HOME/.config/sway/scripts/run.sh > /dev/null 2>&1 fi diff --git a/home/Scripts/check-mail.sh b/home/Scripts/check-mail.sh deleted file mode 100755 index 8afa3967..00000000 --- a/home/Scripts/check-mail.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -mbsync -a -notmuch new -notifymuch diff --git a/home/Scripts/fonts.sh b/home/Scripts/fonts.sh deleted file mode 100755 index d15202a7..00000000 --- a/home/Scripts/fonts.sh +++ /dev/null @@ -1,3 +0,0 @@ -sudo ln -s /etc/fonts/conf.avail/70-no-bitmaps.conf /etc/fonts/conf.d -sudo ln -s /etc/fonts/conf.avail/10-sub-pixel-rgb.conf /etc/fonts/conf.d -sudo ln -s /etc/fonts/conf.avail/11-lcdfilter-default.conf /etc/fonts/conf.d diff --git a/home/Scripts/fzf-shot.sh b/home/Scripts/fzf-shot.sh deleted file mode 100755 index 66cc94b4..00000000 --- a/home/Scripts/fzf-shot.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -TYPE=$(cat < /home/reekymarko/Scripts/suspendcommand -else - echo "won't suspend, external display connected" - echo " " > /home/reekymarko/Scripts/suspendcommand -fi diff --git a/home/Scripts/polybar.sh b/home/Scripts/polybar.sh deleted file mode 100755 index 21ee5522..00000000 --- a/home/Scripts/polybar.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env sh - -# Terminate already running bar instances -killall -q polybar - -# Wait until the processes have been shut down -while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done - -# Launch bar1 and bar2 -polybar top & - - -echo "Bars launched..." diff --git a/home/Scripts/touchpadtoggle.sh b/home/Scripts/touchpadtoggle.sh deleted file mode 100755 index ec3a10ea..00000000 --- a/home/Scripts/touchpadtoggle.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - - -gr="FocalTechPS/2 FocalTech Touchpad" -#gr="SynPS/2 Synaptics TouchPad" - - -#Creates a file if it does not exist to store the 0 or 1 bit to check if touchpad is enabled or disabled. Set to 0 by default -if [ ! -f .touchpad ]; - then - echo 0 > .touchpad; - -fi - -if grep -q 0 ".touchpad"; -then - xinput enable "$gr"; - echo 1 > .touchpad; - echo "Touchpad enabled" - notify-send "Touchpad enabled" -else - xinput disable "$gr"; - echo 0 > .touchpad; - echo "Touchpad Disabled" - notify-send "Touchpad disabled" -fi From 02642f9dc6861f34aa9d4a35474f71630bf06d9e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Apr 2020 10:36:41 +0300 Subject: [PATCH 0316/2667] Cleaned up scripts folder and moved some stuff --- config-home.yaml | 4 +- home/.config/sway/conf.d/01-vars.conf | 1 + home/.config/sway/conf.d/06-keybinds.conf | 32 +++++++++- home/.config/sway/conf.d/08-exec.conf | 2 +- .../sway/scripts/exit.sh} | 0 .../sway/scripts/idle.sh} | 4 +- .../sway/scripts/lock.sh} | 0 .../sway/scripts/run.sh} | 0 home/.config/user-dirs.dirs | 7 -- home/.config/waybar/config | 2 +- .../waybar/scripts}/mediaplayer.py | 0 home/.config/zsh/01-env.zsh | 1 + home/.config/zsh/03-aliases.zsh | 6 +- home/{Scripts => .scripts}/autorotate.sh | 0 .../confgen/termite.conf.gen.sh | 0 .../confgen/zathura.conf.gen.sh | 0 .../hibernate-lowbattery.sh | 0 home/{Scripts => .scripts}/ipmi/auto.sh | 0 home/{Scripts => .scripts}/ipmi/fans.sh | 0 home/{Scripts => .scripts}/ipmi/full.sh | 0 home/{Scripts => .scripts}/ipmi/static.sh | 0 home/{Scripts => .scripts}/ipmi/temp.sh | 0 home/{Scripts => .scripts/media}/imageviewer | 0 home/{Scripts => .scripts/media}/imgurviewer | 0 home/{Scripts => .scripts/media}/mpvqueue | 0 home/{Scripts => .scripts}/open_with_linux.py | 4 +- home/.zprofile | 2 +- home/Scripts/check-mail.sh | 4 -- home/Scripts/fonts.sh | 3 - home/Scripts/fzf-shot.sh | 64 ------------------- home/Scripts/lidclose.sh | 9 --- home/Scripts/polybar.sh | 13 ---- home/Scripts/touchpadtoggle.sh | 26 -------- 33 files changed, 42 insertions(+), 142 deletions(-) rename home/{Scripts/sway-exit.sh => .config/sway/scripts/exit.sh} (100%) rename home/{Scripts/swayidle.sh => .config/sway/scripts/idle.sh} (74%) rename home/{Scripts/swaylock.sh => .config/sway/scripts/lock.sh} (100%) rename home/{Scripts/sway-run.sh => .config/sway/scripts/run.sh} (100%) rename home/{Scripts => .config/waybar/scripts}/mediaplayer.py (100%) rename home/{Scripts => .scripts}/autorotate.sh (100%) rename home/{Scripts => .scripts}/confgen/termite.conf.gen.sh (100%) rename home/{Scripts => .scripts}/confgen/zathura.conf.gen.sh (100%) rename home/{Scripts => .scripts}/hibernate-lowbattery.sh (100%) rename home/{Scripts => .scripts}/ipmi/auto.sh (100%) rename home/{Scripts => .scripts}/ipmi/fans.sh (100%) rename home/{Scripts => .scripts}/ipmi/full.sh (100%) rename home/{Scripts => .scripts}/ipmi/static.sh (100%) rename home/{Scripts => .scripts}/ipmi/temp.sh (100%) rename home/{Scripts => .scripts/media}/imageviewer (100%) rename home/{Scripts => .scripts/media}/imgurviewer (100%) rename home/{Scripts => .scripts/media}/mpvqueue (100%) rename home/{Scripts => .scripts}/open_with_linux.py (95%) delete mode 100755 home/Scripts/check-mail.sh delete mode 100755 home/Scripts/fonts.sh delete mode 100755 home/Scripts/fzf-shot.sh delete mode 100755 home/Scripts/lidclose.sh delete mode 100755 home/Scripts/polybar.sh delete mode 100755 home/Scripts/touchpadtoggle.sh diff --git a/config-home.yaml b/config-home.yaml index 0be18204..abf4370c 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -31,8 +31,8 @@ dotfiles: dst: ~/.config/nvim/coc-settings.json src: .config/nvim/coc-settings.json d_scripts: - dst: ~/Scripts - src: Scripts + dst: ~/.scripts + src: .scripts d_sway: dst: ~/.config/sway src: .config/sway diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index 11347159..5ca6f7ef 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -4,3 +4,4 @@ set $mod Mod4 set $term alacritty set $gnome-schema org.gnome.desktop.interface set $wallpaper ~/Pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) +set $scripts ~/.config/sway/scripts diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 1335220d..df869500 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -6,8 +6,34 @@ bindsym $mod+Return exec $term # kill focused window bindsym $mod+w kill -# start your launcher -bindsym $mod+Shift+p exec rofi-pass --bmarks +# Modes for controlling gaps +set $mode_gaps Gaps: (o) outer, (i) inner +set $mode_gaps_outer Outer Gaps: j|k|0|r|i +set $mode_gaps_inner Inner Gaps: j|k|0|r|o +bindsym $mod+g mode "$mode_gaps" + +mode "$mode_gaps" { + bindsym o mode "$mode_gaps_outer" + bindsym i mode "$mode_gaps_inner" + bindsym Escape mode "default" +} + +mode "$mode_gaps_inner" { + bindsym j gaps inner all minus 1 + bindsym k gaps inner all plus 1 + bindsym 0 gaps inner all set 0 + bindsym r gaps inner all set 10 + bindsym i mode "$mode_gaps_outer" + bindsym Escape mode "default" +} +mode "$mode_gaps_outer" { + bindsym j gaps outer all minus 1 + bindsym k gaps outer all plus 1 + bindsym 0 gaps outer all set 0 + bindsym r gaps outer all set 10 + bindsym o mode "$mode_gaps_inner" + bindsym Escape mode "default" +} # Drag floating windows by holding down $mod and left mouse button. # Resize them with right mouse button + $mod. @@ -27,7 +53,7 @@ bindsym --locked XF86Search output eDP-1 toggle # FZF # exit menu -bindsym $mod+Shift+e exec $term --class fzf-launcher -e $HOME/Scripts/sway-exit.sh +bindsym $mod+Shift+e exec $term --class fzf-launcher -e $scripts/exit.sh # launch a program bindsym $mod+d exec wofi bindsym $mod+Shift+d exec wofi --show run diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 397e2323..420bb6e0 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -1,7 +1,7 @@ # vim:ft=i3config exec { - $HOME/Scripts/swayidle.sh + $scripts/idle.sh autotiling redshift-gtk -m wayland telegram-desktop diff --git a/home/Scripts/sway-exit.sh b/home/.config/sway/scripts/exit.sh similarity index 100% rename from home/Scripts/sway-exit.sh rename to home/.config/sway/scripts/exit.sh diff --git a/home/Scripts/swayidle.sh b/home/.config/sway/scripts/idle.sh similarity index 74% rename from home/Scripts/swayidle.sh rename to home/.config/sway/scripts/idle.sh index c096921d..5b9fc27c 100755 --- a/home/Scripts/swayidle.sh +++ b/home/.config/sway/scripts/idle.sh @@ -1,5 +1,5 @@ #!/bin/bash -swaylock="$HOME/Scripts/swaylock.sh" +swaylock="$HOME/.config/sway/scripts/lock.sh" screenon="swaymsg 'output * dpms on'" screenoff="swaymsg 'output * dpms off'" swayidle \ @@ -10,4 +10,4 @@ swayidle \ timeout 600 "loginctl lock-session" \ timeout 610 "$screenoff" \ resume "$screenon; lqsd -r" \ - before-sleep "playerctl pause; loginctl lock-session" + before-sleep "playerctl pause; loginctl lock-session" \ diff --git a/home/Scripts/swaylock.sh b/home/.config/sway/scripts/lock.sh similarity index 100% rename from home/Scripts/swaylock.sh rename to home/.config/sway/scripts/lock.sh diff --git a/home/Scripts/sway-run.sh b/home/.config/sway/scripts/run.sh similarity index 100% rename from home/Scripts/sway-run.sh rename to home/.config/sway/scripts/run.sh diff --git a/home/.config/user-dirs.dirs b/home/.config/user-dirs.dirs index 7f9a9593..4356ac10 100644 --- a/home/.config/user-dirs.dirs +++ b/home/.config/user-dirs.dirs @@ -1,10 +1,3 @@ -# This file is written by xdg-user-dirs-update -# If you want to change or add directories, just edit the line you're -# interested in. All local changes will be retained on the next run. -# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped -# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an -# absolute path. No other format is supported. -# XDG_DESKTOP_DIR="$HOME/Desktop" XDG_DOWNLOAD_DIR="$HOME/Downloads" XDG_TEMPLATES_DIR="$HOME/Templates" diff --git a/home/.config/waybar/config b/home/.config/waybar/config index 11b6c186..d0e27762 100644 --- a/home/.config/waybar/config +++ b/home/.config/waybar/config @@ -107,7 +107,7 @@ "tooltip": false, "format": "{}", "return-type": "json", - "exec": "$HOME/Scripts/mediaplayer.py 2>/dev/null", + "exec": "$HOME/.config/waybar/scripts/mediaplayer.py 2>/dev/null", "max-length": 50, "on-click": "playerctl play-pause", "on-click-right": "playerctl next", diff --git a/home/Scripts/mediaplayer.py b/home/.config/waybar/scripts/mediaplayer.py similarity index 100% rename from home/Scripts/mediaplayer.py rename to home/.config/waybar/scripts/mediaplayer.py diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 47431a93..b35516fb 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -18,6 +18,7 @@ export GOPATH=~/.bin/go # fzf settings export FZF_DEFAULT_COMMAND='rg --files --hidden 2>/dev/null' +export FZF_DEFAULT_OPTS='-m --bind ctrl-a:select-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" export FZF_CTRL_T_OPTS='--preview "/usr/bin/cat {} | nvimpager -c "' diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 89a7179a..721fcc14 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -140,7 +140,6 @@ update() { zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all } - {%@@ if profile == "Moria" @@%} docker-update() { for dir in $HOME/Git/dotfiles/docker/*; do @@ -151,7 +150,6 @@ update() { done } - {%@@ endif @@%} if [ $# -eq 0 ]; then 1=base fi @@ -166,11 +164,9 @@ update() { plugins) plugins ;; - {%@@ if profile == "Moria" @@%} docker) docker-update ;; - {%@@ endif @@%} *) printf "$1: not a valid action" ;; @@ -187,7 +183,7 @@ tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/nu alias reflect='sudo reflector --latest 200 --threads 8 --verbose --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist' # better ls -alias ls='ls_extended -I' +alias ls='ls_extended -Ih' # default icon for notify-send alias notify-send='notify-send --icon=alarm' diff --git a/home/Scripts/autorotate.sh b/home/.scripts/autorotate.sh similarity index 100% rename from home/Scripts/autorotate.sh rename to home/.scripts/autorotate.sh diff --git a/home/Scripts/confgen/termite.conf.gen.sh b/home/.scripts/confgen/termite.conf.gen.sh similarity index 100% rename from home/Scripts/confgen/termite.conf.gen.sh rename to home/.scripts/confgen/termite.conf.gen.sh diff --git a/home/Scripts/confgen/zathura.conf.gen.sh b/home/.scripts/confgen/zathura.conf.gen.sh similarity index 100% rename from home/Scripts/confgen/zathura.conf.gen.sh rename to home/.scripts/confgen/zathura.conf.gen.sh diff --git a/home/Scripts/hibernate-lowbattery.sh b/home/.scripts/hibernate-lowbattery.sh similarity index 100% rename from home/Scripts/hibernate-lowbattery.sh rename to home/.scripts/hibernate-lowbattery.sh diff --git a/home/Scripts/ipmi/auto.sh b/home/.scripts/ipmi/auto.sh similarity index 100% rename from home/Scripts/ipmi/auto.sh rename to home/.scripts/ipmi/auto.sh diff --git a/home/Scripts/ipmi/fans.sh b/home/.scripts/ipmi/fans.sh similarity index 100% rename from home/Scripts/ipmi/fans.sh rename to home/.scripts/ipmi/fans.sh diff --git a/home/Scripts/ipmi/full.sh b/home/.scripts/ipmi/full.sh similarity index 100% rename from home/Scripts/ipmi/full.sh rename to home/.scripts/ipmi/full.sh diff --git a/home/Scripts/ipmi/static.sh b/home/.scripts/ipmi/static.sh similarity index 100% rename from home/Scripts/ipmi/static.sh rename to home/.scripts/ipmi/static.sh diff --git a/home/Scripts/ipmi/temp.sh b/home/.scripts/ipmi/temp.sh similarity index 100% rename from home/Scripts/ipmi/temp.sh rename to home/.scripts/ipmi/temp.sh diff --git a/home/Scripts/imageviewer b/home/.scripts/media/imageviewer similarity index 100% rename from home/Scripts/imageviewer rename to home/.scripts/media/imageviewer diff --git a/home/Scripts/imgurviewer b/home/.scripts/media/imgurviewer similarity index 100% rename from home/Scripts/imgurviewer rename to home/.scripts/media/imgurviewer diff --git a/home/Scripts/mpvqueue b/home/.scripts/media/mpvqueue similarity index 100% rename from home/Scripts/mpvqueue rename to home/.scripts/media/mpvqueue diff --git a/home/Scripts/open_with_linux.py b/home/.scripts/open_with_linux.py similarity index 95% rename from home/Scripts/open_with_linux.py rename to home/.scripts/open_with_linux.py index fe1dbecf..6a4f9799 100755 --- a/home/Scripts/open_with_linux.py +++ b/home/.scripts/open_with_linux.py @@ -7,7 +7,7 @@ import json import struct import subprocess -VERSION = '7.1b2' +VERSION = '7.2.2' try: sys.stdin.buffer @@ -63,6 +63,8 @@ def install(): } locations = { 'chrome': os.path.join(home_path, '.config', 'google-chrome', 'NativeMessagingHosts'), + 'chrome-beta': os.path.join(home_path, '.config', 'google-chrome-beta', 'NativeMessagingHosts'), + 'chrome-unstable': os.path.join(home_path, '.config', 'google-chrome-unstable', 'NativeMessagingHosts'), 'chromium': os.path.join(home_path, '.config', 'chromium', 'NativeMessagingHosts'), 'firefox': os.path.join(home_path, '.mozilla', 'native-messaging-hosts'), } diff --git a/home/.zprofile b/home/.zprofile index dcbf3fe2..ed8b10ac 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,5 +1,5 @@ if cat /proc/cmdline | grep -q "video=eDP-1:d"; then [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && kodi else - [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && $HOME/Scripts/sway-run.sh > /dev/null 2>&1 + [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && $HOME/.config/sway/scripts/run.sh > /dev/null 2>&1 fi diff --git a/home/Scripts/check-mail.sh b/home/Scripts/check-mail.sh deleted file mode 100755 index 8afa3967..00000000 --- a/home/Scripts/check-mail.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -mbsync -a -notmuch new -notifymuch diff --git a/home/Scripts/fonts.sh b/home/Scripts/fonts.sh deleted file mode 100755 index d15202a7..00000000 --- a/home/Scripts/fonts.sh +++ /dev/null @@ -1,3 +0,0 @@ -sudo ln -s /etc/fonts/conf.avail/70-no-bitmaps.conf /etc/fonts/conf.d -sudo ln -s /etc/fonts/conf.avail/10-sub-pixel-rgb.conf /etc/fonts/conf.d -sudo ln -s /etc/fonts/conf.avail/11-lcdfilter-default.conf /etc/fonts/conf.d diff --git a/home/Scripts/fzf-shot.sh b/home/Scripts/fzf-shot.sh deleted file mode 100755 index 66cc94b4..00000000 --- a/home/Scripts/fzf-shot.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -TYPE=$(cat < /home/reekymarko/Scripts/suspendcommand -else - echo "won't suspend, external display connected" - echo " " > /home/reekymarko/Scripts/suspendcommand -fi diff --git a/home/Scripts/polybar.sh b/home/Scripts/polybar.sh deleted file mode 100755 index 21ee5522..00000000 --- a/home/Scripts/polybar.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env sh - -# Terminate already running bar instances -killall -q polybar - -# Wait until the processes have been shut down -while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done - -# Launch bar1 and bar2 -polybar top & - - -echo "Bars launched..." diff --git a/home/Scripts/touchpadtoggle.sh b/home/Scripts/touchpadtoggle.sh deleted file mode 100755 index ec3a10ea..00000000 --- a/home/Scripts/touchpadtoggle.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - - -gr="FocalTechPS/2 FocalTech Touchpad" -#gr="SynPS/2 Synaptics TouchPad" - - -#Creates a file if it does not exist to store the 0 or 1 bit to check if touchpad is enabled or disabled. Set to 0 by default -if [ ! -f .touchpad ]; - then - echo 0 > .touchpad; - -fi - -if grep -q 0 ".touchpad"; -then - xinput enable "$gr"; - echo 1 > .touchpad; - echo "Touchpad enabled" - notify-send "Touchpad enabled" -else - xinput disable "$gr"; - echo 0 > .touchpad; - echo "Touchpad Disabled" - notify-send "Touchpad disabled" -fi From 67b488904c99ed6ea6af2a1adf36443cd4db1d17 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Apr 2020 10:45:33 +0300 Subject: [PATCH 0317/2667] Fix ipmi script paths --- root/etc/systemd/system/ipmi-fans.service | 2 +- root/etc/systemd/system/ipmi-temp.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/systemd/system/ipmi-fans.service b/root/etc/systemd/system/ipmi-fans.service index d6610daf..5f21b041 100644 --- a/root/etc/systemd/system/ipmi-fans.service +++ b/root/etc/systemd/system/ipmi-fans.service @@ -3,7 +3,7 @@ Description=Write fan speeds to tmp [Service] Type=simple -ExecStart=/home/balrog/Scripts/ipmi/fans.sh +ExecStart=/home/balrog/.scripts/ipmi/fans.sh [Install] WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.service b/root/etc/systemd/system/ipmi-temp.service index 64a9615f..11f921e6 100644 --- a/root/etc/systemd/system/ipmi-temp.service +++ b/root/etc/systemd/system/ipmi-temp.service @@ -3,7 +3,7 @@ Description=Watch server temperature [Service] Type=simple -ExecStart=/home/balrog/Scripts/ipmi/temp.sh +ExecStart=/home/balrog/.scripts/ipmi/temp.sh [Install] WantedBy=multi-user.target From b15d213ff57c0faddb27ba943c66f72f524873f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Apr 2020 10:45:33 +0300 Subject: [PATCH 0318/2667] Fix ipmi script paths --- root/etc/systemd/system/ipmi-fans.service | 2 +- root/etc/systemd/system/ipmi-temp.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/systemd/system/ipmi-fans.service b/root/etc/systemd/system/ipmi-fans.service index d6610daf..5f21b041 100644 --- a/root/etc/systemd/system/ipmi-fans.service +++ b/root/etc/systemd/system/ipmi-fans.service @@ -3,7 +3,7 @@ Description=Write fan speeds to tmp [Service] Type=simple -ExecStart=/home/balrog/Scripts/ipmi/fans.sh +ExecStart=/home/balrog/.scripts/ipmi/fans.sh [Install] WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.service b/root/etc/systemd/system/ipmi-temp.service index 64a9615f..11f921e6 100644 --- a/root/etc/systemd/system/ipmi-temp.service +++ b/root/etc/systemd/system/ipmi-temp.service @@ -3,7 +3,7 @@ Description=Watch server temperature [Service] Type=simple -ExecStart=/home/balrog/Scripts/ipmi/temp.sh +ExecStart=/home/balrog/.scripts/ipmi/temp.sh [Install] WantedBy=multi-user.target From ed822d11e6bf7d905435d47c41a90245796ff7ea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Apr 2020 13:40:46 +0300 Subject: [PATCH 0319/2667] Add XDG_CURRENT_DESKTOP --- home/.config/sway/scripts/run.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/sway/scripts/run.sh b/home/.config/sway/scripts/run.sh index 445a3529..1aaf96ac 100755 --- a/home/.config/sway/scripts/run.sh +++ b/home/.config/sway/scripts/run.sh @@ -7,6 +7,9 @@ export MOZ_ENABLE_WAYLAND=1 export MOZ_USE_XINPUT2=1 export MOZ_WEBRENDER=1 +# Enable xdg-desktop-portal-wlr +export XDG_CURRENT_DESKTOP=sway + # Fix java on wayland export _JAVA_AWT_WM_NONREPARENTING=1 export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' @@ -32,3 +35,4 @@ unset QT_QPA_PLATFORMTHEME=qt5ct unset QT_QPA_PLATFORM=wayland-egl unset QT_WAYLAND_DISABLE_WINDOWDECORATION=1 unset WLR_DRM_NO_ATOMIC=1 +unset XDG_CURRENT_DESKTOP=sway From 3b418809dd6d20bd1e0598cf1e29ad84e63a3a94 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Apr 2020 13:40:46 +0300 Subject: [PATCH 0320/2667] Add XDG_CURRENT_DESKTOP --- home/.config/sway/scripts/run.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/sway/scripts/run.sh b/home/.config/sway/scripts/run.sh index 445a3529..1aaf96ac 100755 --- a/home/.config/sway/scripts/run.sh +++ b/home/.config/sway/scripts/run.sh @@ -7,6 +7,9 @@ export MOZ_ENABLE_WAYLAND=1 export MOZ_USE_XINPUT2=1 export MOZ_WEBRENDER=1 +# Enable xdg-desktop-portal-wlr +export XDG_CURRENT_DESKTOP=sway + # Fix java on wayland export _JAVA_AWT_WM_NONREPARENTING=1 export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' @@ -32,3 +35,4 @@ unset QT_QPA_PLATFORMTHEME=qt5ct unset QT_QPA_PLATFORM=wayland-egl unset QT_WAYLAND_DISABLE_WINDOWDECORATION=1 unset WLR_DRM_NO_ATOMIC=1 +unset XDG_CURRENT_DESKTOP=sway From aeba9fb488c597b5e812b4fc80af2489dd85b510 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Apr 2020 13:41:00 +0300 Subject: [PATCH 0321/2667] Add journalctl aliases --- home/.config/zsh/03-aliases.zsh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 721fcc14..85df2376 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -52,9 +52,11 @@ alias reboot-kodi='systemctl reboot --boot-loader-entry=kodi.conf' alias zbarimg='zbarimg -q --raw' alias zbarcam='zbarcam -q --raw' -# shorten systemctl -alias sc='sudo systemctl' +# shorten systemctl and journalctl +alias sc='systemctl' alias scu='systemctl --user' +alias jc='journalctl' +alias jcu='journalctl --user' # switch to desktop mode alias dock='swaymsg output eDP-1 disable' From f402f21cd2e4a3f45428ce35268d61c4b4f788e3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Apr 2020 13:41:00 +0300 Subject: [PATCH 0322/2667] Add journalctl aliases --- home/.config/zsh/03-aliases.zsh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 721fcc14..85df2376 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -52,9 +52,11 @@ alias reboot-kodi='systemctl reboot --boot-loader-entry=kodi.conf' alias zbarimg='zbarimg -q --raw' alias zbarcam='zbarcam -q --raw' -# shorten systemctl -alias sc='sudo systemctl' +# shorten systemctl and journalctl +alias sc='systemctl' alias scu='systemctl --user' +alias jc='journalctl' +alias jcu='journalctl --user' # switch to desktop mode alias dock='swaymsg output eDP-1 disable' From a1ce705fae8c31b9f39014c578265d1b244854a8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Apr 2020 13:41:09 +0300 Subject: [PATCH 0323/2667] Fixed mixed up keybinds in gaps mode --- home/.config/sway/conf.d/06-keybinds.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index df869500..4cb5873b 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -23,7 +23,7 @@ mode "$mode_gaps_inner" { bindsym k gaps inner all plus 1 bindsym 0 gaps inner all set 0 bindsym r gaps inner all set 10 - bindsym i mode "$mode_gaps_outer" + bindsym o mode "$mode_gaps_outer" bindsym Escape mode "default" } mode "$mode_gaps_outer" { @@ -31,7 +31,7 @@ mode "$mode_gaps_outer" { bindsym k gaps outer all plus 1 bindsym 0 gaps outer all set 0 bindsym r gaps outer all set 10 - bindsym o mode "$mode_gaps_inner" + bindsym i mode "$mode_gaps_inner" bindsym Escape mode "default" } From 8310e6943c648be0210856a19a1b0a89559f38cb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Apr 2020 13:41:09 +0300 Subject: [PATCH 0324/2667] Fixed mixed up keybinds in gaps mode --- home/.config/sway/conf.d/06-keybinds.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index df869500..4cb5873b 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -23,7 +23,7 @@ mode "$mode_gaps_inner" { bindsym k gaps inner all plus 1 bindsym 0 gaps inner all set 0 bindsym r gaps inner all set 10 - bindsym i mode "$mode_gaps_outer" + bindsym o mode "$mode_gaps_outer" bindsym Escape mode "default" } mode "$mode_gaps_outer" { @@ -31,7 +31,7 @@ mode "$mode_gaps_outer" { bindsym k gaps outer all plus 1 bindsym 0 gaps outer all set 0 bindsym r gaps outer all set 10 - bindsym o mode "$mode_gaps_inner" + bindsym i mode "$mode_gaps_inner" bindsym Escape mode "default" } From 04a7f6e75cb5bd01ac5d4ac430c528f21668da24 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 19 Apr 2020 11:54:48 +0300 Subject: [PATCH 0325/2667] Shouldn't copy paste stuff blindly --- home/.config/sway/scripts/run.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/home/.config/sway/scripts/run.sh b/home/.config/sway/scripts/run.sh index 1aaf96ac..ff524923 100755 --- a/home/.config/sway/scripts/run.sh +++ b/home/.config/sway/scripts/run.sh @@ -16,7 +16,7 @@ export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswi # Enable qt5 theming and wayland support export QT_QPA_PLATFORMTHEME=qt5ct -export QT_QPA_PLATFORM=wayland-egl +export QT_QPA_PLATFORM=wayland export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 # Fix redshift on wlroots @@ -26,13 +26,13 @@ export WLR_DRM_NO_ATOMIC=1 sway # Unset the variables after quitting Sway -unset MOZ_ENABLE_WAYLAND=1 -unset MOZ_USE_XINPUT2=1 -unset MOZ_WEBRENDER=1 -unset _JAVA_AWT_WM_NONREPARENTING=1 -unset _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' -unset QT_QPA_PLATFORMTHEME=qt5ct -unset QT_QPA_PLATFORM=wayland-egl -unset QT_WAYLAND_DISABLE_WINDOWDECORATION=1 -unset WLR_DRM_NO_ATOMIC=1 -unset XDG_CURRENT_DESKTOP=sway +unset MOZ_ENABLE_WAYLAND +unset MOZ_USE_XINPUT2 +unset MOZ_WEBRENDER +unset _JAVA_AWT_WM_NONREPARENTING +unset _JAVA_OPTIONS +unset QT_QPA_PLATFORMTHEME +unset QT_QPA_PLATFORM +unset QT_WAYLAND_DISABLE_WINDOWDECORATION +unset WLR_DRM_NO_ATOMIC +unset XDG_CURRENT_DESKTOP From d107cf44ec60a0522c3ddf1aee35ef8b82a6fe6b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 19 Apr 2020 11:54:48 +0300 Subject: [PATCH 0326/2667] Shouldn't copy paste stuff blindly --- home/.config/sway/scripts/run.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/home/.config/sway/scripts/run.sh b/home/.config/sway/scripts/run.sh index 1aaf96ac..ff524923 100755 --- a/home/.config/sway/scripts/run.sh +++ b/home/.config/sway/scripts/run.sh @@ -16,7 +16,7 @@ export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswi # Enable qt5 theming and wayland support export QT_QPA_PLATFORMTHEME=qt5ct -export QT_QPA_PLATFORM=wayland-egl +export QT_QPA_PLATFORM=wayland export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 # Fix redshift on wlroots @@ -26,13 +26,13 @@ export WLR_DRM_NO_ATOMIC=1 sway # Unset the variables after quitting Sway -unset MOZ_ENABLE_WAYLAND=1 -unset MOZ_USE_XINPUT2=1 -unset MOZ_WEBRENDER=1 -unset _JAVA_AWT_WM_NONREPARENTING=1 -unset _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' -unset QT_QPA_PLATFORMTHEME=qt5ct -unset QT_QPA_PLATFORM=wayland-egl -unset QT_WAYLAND_DISABLE_WINDOWDECORATION=1 -unset WLR_DRM_NO_ATOMIC=1 -unset XDG_CURRENT_DESKTOP=sway +unset MOZ_ENABLE_WAYLAND +unset MOZ_USE_XINPUT2 +unset MOZ_WEBRENDER +unset _JAVA_AWT_WM_NONREPARENTING +unset _JAVA_OPTIONS +unset QT_QPA_PLATFORMTHEME +unset QT_QPA_PLATFORM +unset QT_WAYLAND_DISABLE_WINDOWDECORATION +unset WLR_DRM_NO_ATOMIC +unset XDG_CURRENT_DESKTOP From a9adedba1ef349dc9e7a233c5062eac8bf6fc56a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Apr 2020 21:51:00 +0300 Subject: [PATCH 0327/2667] Small tweak for update function --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 85df2376..859dd104 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -170,7 +170,7 @@ update() { docker-update ;; *) - printf "$1: not a valid action" + base $@ ;; esac } From 3958470ab9db72cefafe690a1745f6c858ed0e3c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Apr 2020 21:51:00 +0300 Subject: [PATCH 0328/2667] Small tweak for update function --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 85df2376..859dd104 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -170,7 +170,7 @@ update() { docker-update ;; *) - printf "$1: not a valid action" + base $@ ;; esac } From b977804a48787681aac58f3da322e1e4da1dcc50 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 13:13:12 +0300 Subject: [PATCH 0329/2667] Add profile for localhost --- config-home.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config-home.yaml b/config-home.yaml index abf4370c..9db79326 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -226,3 +226,7 @@ profiles: include: - Terminal - Pacman + localhost: + include: + - Terminal + - Pacman From 880145c186f6569434f2711ba809b946c6bc375f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 13:13:12 +0300 Subject: [PATCH 0330/2667] Add profile for localhost --- config-home.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config-home.yaml b/config-home.yaml index abf4370c..9db79326 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -226,3 +226,7 @@ profiles: include: - Terminal - Pacman + localhost: + include: + - Terminal + - Pacman From a23712d138d069c3c925403aed2a5769edf85d70 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 14:20:47 +0300 Subject: [PATCH 0331/2667] Add localhost --- config-root.yaml | 105 ++++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 1667e3c0..52cd03b0 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -21,7 +21,7 @@ dotfiles: src: usr/local/bin d_networkd: actions: - - chmod-wireguard + - chmod-wireguard src: etc/systemd/network dst: /etc/systemd/network f_99-sysctl.conf: @@ -144,64 +144,67 @@ dotfiles: profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf - - f_pacman-dl.service - - f_pacman-dl.timer + - f_pacman.conf + - f_pacserve.service.conf + - f_pacman-dl.service + - f_pacman-dl.timer Mirkwood: dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - d_networkd - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_zsh.hook - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_cpupower + - f_getty.conf + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - d_networkd + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_zsh.hook + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf + - f_cpupower include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config - - f_nightly-reboot.service - - f_nightly-reboot.timer + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_sshd_config + - f_nightly-reboot.service + - f_nightly-reboot.timer + localhost: + include: + - Pacman Moria: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_ipmi-static.service - - f_ipmi-temp.service - - f_ipmi-temp.timer - - f_ipmi-fans.service - - f_ipmi-fans.timer + - f_sshd_config + - f_99-sysctl.conf + - f_ipmi-static.service + - f_ipmi-temp.service + - f_ipmi-temp.timer + - f_ipmi-fans.service + - f_ipmi-fans.timer From 3318d7504e6be86b7f3f2ce61a304569ecc90742 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 14:20:47 +0300 Subject: [PATCH 0332/2667] Add localhost --- config-root.yaml | 105 ++++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 1667e3c0..52cd03b0 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -21,7 +21,7 @@ dotfiles: src: usr/local/bin d_networkd: actions: - - chmod-wireguard + - chmod-wireguard src: etc/systemd/network dst: /etc/systemd/network f_99-sysctl.conf: @@ -144,64 +144,67 @@ dotfiles: profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf - - f_pacman-dl.service - - f_pacman-dl.timer + - f_pacman.conf + - f_pacserve.service.conf + - f_pacman-dl.service + - f_pacman-dl.timer Mirkwood: dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - d_networkd - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_zsh.hook - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_cpupower + - f_getty.conf + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - d_networkd + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_zsh.hook + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf + - f_cpupower include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config - - f_nightly-reboot.service - - f_nightly-reboot.timer + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_sshd_config + - f_nightly-reboot.service + - f_nightly-reboot.timer + localhost: + include: + - Pacman Moria: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_ipmi-static.service - - f_ipmi-temp.service - - f_ipmi-temp.timer - - f_ipmi-fans.service - - f_ipmi-fans.timer + - f_sshd_config + - f_99-sysctl.conf + - f_ipmi-static.service + - f_ipmi-temp.service + - f_ipmi-temp.timer + - f_ipmi-fans.service + - f_ipmi-fans.timer From c566e445fd0cbd3c634ea40caa09c969f2e3f97f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 14:24:34 +0300 Subject: [PATCH 0333/2667] Pacman tweaks --- config-root.yaml | 3 --- root/etc/pacman.conf | 3 --- 2 files changed, 6 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 52cd03b0..4aeb246a 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -193,9 +193,6 @@ profiles: - f_sshd_config - f_nightly-reboot.service - f_nightly-reboot.timer - localhost: - include: - - Pacman Moria: include: - Locale diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 38ec88a2..7e0bc5b1 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -20,6 +20,3 @@ Include = /etc/pacman.d/mirrorlist [multilib] Include = /etc/pacman.d/mirrorlist - -[repo-ck] -Server = http://repo-ck.com/$arch From 58708c1e834be4c053c440d48b2d17005ef6599f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 14:24:34 +0300 Subject: [PATCH 0334/2667] Pacman tweaks --- config-root.yaml | 3 --- root/etc/pacman.conf | 3 --- 2 files changed, 6 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 52cd03b0..4aeb246a 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -193,9 +193,6 @@ profiles: - f_sshd_config - f_nightly-reboot.service - f_nightly-reboot.timer - localhost: - include: - - Pacman Moria: include: - Locale diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 38ec88a2..7e0bc5b1 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -20,6 +20,3 @@ Include = /etc/pacman.d/mirrorlist [multilib] Include = /etc/pacman.d/mirrorlist - -[repo-ck] -Server = http://repo-ck.com/$arch From 2835d2b89d5e867a2d32bdc061c4c1b90969daf2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 14:29:22 +0300 Subject: [PATCH 0335/2667] Add locale configs to localhost --- config-root.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config-root.yaml b/config-root.yaml index 4aeb246a..d2e55913 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -205,3 +205,6 @@ profiles: - f_ipmi-temp.timer - f_ipmi-fans.service - f_ipmi-fans.timer + localhost: + include: + - Locale From d04e13e6ddf30a46e49c504c616ded1a93b1ce6b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 14:29:22 +0300 Subject: [PATCH 0336/2667] Add locale configs to localhost --- config-root.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config-root.yaml b/config-root.yaml index 4aeb246a..d2e55913 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -205,3 +205,6 @@ profiles: - f_ipmi-temp.timer - f_ipmi-fans.service - f_ipmi-fans.timer + localhost: + include: + - Locale From af3f2ea9466c4ced2d3f032cd8bd3ebf0b385d60 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 14:29:35 +0300 Subject: [PATCH 0337/2667] Change mpv osd font --- home/.config/mpv/mpv.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index 396ee1a3..2a3f77ed 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -63,7 +63,7 @@ sub-shadow-color="#33000000" sub-spacing=0.5 # OSD customizations -osd-font="Overpass" +osd-font="Lucida Console" osd-font-size=30 osd-color="#ffffffff" # ARGB format osd-border-color="#ff151515" # ARGB format From 5b1c6c49f597a4995d6fa829a6e900cf58e748cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 14:29:35 +0300 Subject: [PATCH 0338/2667] Change mpv osd font --- home/.config/mpv/mpv.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index 396ee1a3..2a3f77ed 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -63,7 +63,7 @@ sub-shadow-color="#33000000" sub-spacing=0.5 # OSD customizations -osd-font="Overpass" +osd-font="Lucida Console" osd-font-size=30 osd-color="#ffffffff" # ARGB format osd-border-color="#ff151515" # ARGB format From 9e136127d1797d49a83cf10320e12ee3cac90273 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 14:30:43 +0300 Subject: [PATCH 0339/2667] Small tweaks to sway --- home/.config/sway/conf.d/08-exec.conf | 1 + home/.config/sway/scripts/run.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 420bb6e0..87eadd40 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -14,6 +14,7 @@ exec { /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 gnome-keyring-daemon --start --components=secrets mpDris2 + swaymsg workspace 1 } exec_always { diff --git a/home/.config/sway/scripts/run.sh b/home/.config/sway/scripts/run.sh index ff524923..819221c9 100755 --- a/home/.config/sway/scripts/run.sh +++ b/home/.config/sway/scripts/run.sh @@ -23,7 +23,7 @@ export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 export WLR_DRM_NO_ATOMIC=1 # Run sway -sway +dbus-run-session sway # Unset the variables after quitting Sway unset MOZ_ENABLE_WAYLAND From 59a80c8b2f4ea1f4f1fd064c56e5afcd8e9300e1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 14:30:43 +0300 Subject: [PATCH 0340/2667] Small tweaks to sway --- home/.config/sway/conf.d/08-exec.conf | 1 + home/.config/sway/scripts/run.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 420bb6e0..87eadd40 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -14,6 +14,7 @@ exec { /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 gnome-keyring-daemon --start --components=secrets mpDris2 + swaymsg workspace 1 } exec_always { diff --git a/home/.config/sway/scripts/run.sh b/home/.config/sway/scripts/run.sh index ff524923..819221c9 100755 --- a/home/.config/sway/scripts/run.sh +++ b/home/.config/sway/scripts/run.sh @@ -23,7 +23,7 @@ export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 export WLR_DRM_NO_ATOMIC=1 # Run sway -sway +dbus-run-session sway # Unset the variables after quitting Sway unset MOZ_ENABLE_WAYLAND From 93a096540b7b60b3da5cc61e568db92b6216dfd5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 27 Apr 2020 12:08:35 +0300 Subject: [PATCH 0341/2667] Make nvimpager cat alias ncat instead --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 859dd104..bf89e3c5 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -5,7 +5,7 @@ alias gpull='git pull' alias gpush='git push' # Syntax highlighting cat -alias cat='nvimpager -c' +alias ncat='nvimpager -c' rip() { abcde From 99b5d215c2906db5c6dbd5d231770ee31416c3fb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 27 Apr 2020 12:08:35 +0300 Subject: [PATCH 0342/2667] Make nvimpager cat alias ncat instead --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 859dd104..bf89e3c5 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -5,7 +5,7 @@ alias gpull='git pull' alias gpush='git push' # Syntax highlighting cat -alias cat='nvimpager -c' +alias ncat='nvimpager -c' rip() { abcde From 8f81558f9dd596462d73dc356ae009114831ecd2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 27 Apr 2020 12:16:02 +0300 Subject: [PATCH 0343/2667] Make cat alias use regular cat if output not term --- home/.config/zsh/03-aliases.zsh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index bf89e3c5..f5e18811 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -4,8 +4,15 @@ alias gac='ga && gc' alias gpull='git pull' alias gpush='git push' -# Syntax highlighting cat -alias ncat='nvimpager -c' +# Syntax highlighting cat if output is a terminal +cat() { + # Check if output is a terminal, else use regular cat + if [ -t 1 ]; then + nvimpager -c $@ + else + /usr/bin/cat $@ + fi +} rip() { abcde From 1dd15d1484a99b1577d6db77550ba073ed12537c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 27 Apr 2020 12:16:02 +0300 Subject: [PATCH 0344/2667] Make cat alias use regular cat if output not term --- home/.config/zsh/03-aliases.zsh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index bf89e3c5..f5e18811 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -4,8 +4,15 @@ alias gac='ga && gc' alias gpull='git pull' alias gpush='git push' -# Syntax highlighting cat -alias ncat='nvimpager -c' +# Syntax highlighting cat if output is a terminal +cat() { + # Check if output is a terminal, else use regular cat + if [ -t 1 ]; then + nvimpager -c $@ + else + /usr/bin/cat $@ + fi +} rip() { abcde From f0f752b6c5a35a99e89b5a5d6d7469d268da8c74 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 27 Apr 2020 13:22:08 +0300 Subject: [PATCH 0345/2667] I use it btw --- home/.config/zsh/03-aliases.zsh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index f5e18811..a5d1a4a8 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -253,3 +253,26 @@ stat() { grc stat $@ } showmount() { grc showmount $@ } tune2fs() { grc tune2fs $@ } tcpdum() { grc tcpdum $@ } + +btw, () { + echo " I use" + echo " ▄ + ▟█▙ + ▟███▙ + ▟█████▙ + ▟███████▙ + ▂▔▀▜██████▙ + ▟██▅▂▝▜█████▙ + ▟█████████████▙ + ▟███████████████▙ + ▟█████████████████▙ + ▟███████████████████▙ + ▟█████████▛▀▀▜████████▙ + ▟████████▛ ▜███████▙ + ▟█████████ ████████▙ + ▟██████████ █████▆▅▄▃▂ + ▟██████████▛ ▜█████████▙ + ▟██████▀▀▀ ▀▀██████▙ + ▟███▀▘ ▝▀███▙ + ▟▛▀ ▀▜▙" +} From fea318ad8994bb3af58669443dde5d217fbb03b5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 27 Apr 2020 13:22:08 +0300 Subject: [PATCH 0346/2667] I use it btw --- home/.config/zsh/03-aliases.zsh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index f5e18811..a5d1a4a8 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -253,3 +253,26 @@ stat() { grc stat $@ } showmount() { grc showmount $@ } tune2fs() { grc tune2fs $@ } tcpdum() { grc tcpdum $@ } + +btw, () { + echo " I use" + echo " ▄ + ▟█▙ + ▟███▙ + ▟█████▙ + ▟███████▙ + ▂▔▀▜██████▙ + ▟██▅▂▝▜█████▙ + ▟█████████████▙ + ▟███████████████▙ + ▟█████████████████▙ + ▟███████████████████▙ + ▟█████████▛▀▀▜████████▙ + ▟████████▛ ▜███████▙ + ▟█████████ ████████▙ + ▟██████████ █████▆▅▄▃▂ + ▟██████████▛ ▜█████████▙ + ▟██████▀▀▀ ▀▀██████▙ + ▟███▀▘ ▝▀███▙ + ▟▛▀ ▀▜▙" +} From e43e6971d98f73039790d44afd3e1bf9da272fd0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 May 2020 09:47:03 +0300 Subject: [PATCH 0347/2667] Lots of changes --- config-home.yaml | 1 - config-root.yaml | 131 +++--- home/.config/mako/config | 1 + home/.config/sway/conf.d/05-workspaces.conf | 3 +- home/.config/sway/conf.d/07-appearance.conf | 4 +- home/.config/sway/conf.d/08-exec.conf | 2 +- home/.config/systemd/user/trash-empty.service | 6 + home/.config/systemd/user/trash-empty.timer | 9 + root/boot/loader/entries/arch-lts.conf | 10 +- root/boot/loader/entries/arch.conf | 10 +- root/boot/loader/entries/kodi.conf | 5 + root/boot/loader/loader.conf | 3 - root/etc/mkinitcpio.conf | 7 +- .../etc/systemd/system/nightly-reboot.service | 6 - root/etc/systemd/system/nightly-reboot.timer | 8 - root/etc/systemd/system/pacman-dl.service | 10 - root/etc/systemd/system/pacman-dl.timer | 8 - root/usr/local/bin/audacity | 1 - root/usr/local/bin/evenbetterlockscreen | 373 ------------------ root/usr/local/bin/gnome-terminal | 6 - root/usr/local/bin/ikhal | 1 - root/usr/local/bin/khal | 1 - root/usr/local/bin/qtwebflix | 1 - .../run.sh => root/usr/local/bin/sway-run | 0 24 files changed, 98 insertions(+), 509 deletions(-) create mode 100644 home/.config/systemd/user/trash-empty.service create mode 100644 home/.config/systemd/user/trash-empty.timer create mode 100755 root/boot/loader/entries/kodi.conf delete mode 100755 root/boot/loader/loader.conf delete mode 100644 root/etc/systemd/system/nightly-reboot.service delete mode 100644 root/etc/systemd/system/nightly-reboot.timer delete mode 100755 root/etc/systemd/system/pacman-dl.service delete mode 100644 root/etc/systemd/system/pacman-dl.timer delete mode 100755 root/usr/local/bin/audacity delete mode 100755 root/usr/local/bin/evenbetterlockscreen delete mode 100755 root/usr/local/bin/gnome-terminal delete mode 100755 root/usr/local/bin/ikhal delete mode 100755 root/usr/local/bin/khal delete mode 100755 root/usr/local/bin/qtwebflix rename home/.config/sway/scripts/run.sh => root/usr/local/bin/sway-run (100%) diff --git a/config-home.yaml b/config-home.yaml index 9db79326..e3b5a74b 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -229,4 +229,3 @@ profiles: localhost: include: - Terminal - - Pacman diff --git a/config-root.yaml b/config-root.yaml index d2e55913..bf23ee7a 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -21,7 +21,7 @@ dotfiles: src: usr/local/bin d_networkd: actions: - - chmod-wireguard + - chmod-wireguard src: etc/systemd/network dst: /etc/systemd/network f_99-sysctl.conf: @@ -45,9 +45,6 @@ dotfiles: f_iwd@.service: dst: /etc/systemd/system/iwd@.service src: etc/systemd/system/iwd@.service - f_loader.conf: - dst: /boot/loader/loader.conf - src: boot/loader/loader.conf f_fonts.conf: dst: /etc/fonts/local.conf src: etc/fonts/local.conf @@ -66,9 +63,6 @@ dotfiles: f_pacman.conf: dst: /etc/pacman.conf src: etc/pacman.conf - f_pacserve.service.conf: - dst: /etc/pacserve/pacserve.service.conf - src: etc/pacserve/pacserve.service.conf f_sshd_config: dst: /etc/ssh/sshd_config src: etc/ssh/sshd_config @@ -96,21 +90,6 @@ dotfiles: f_ignore: src: .ignore dst: /.ignore - f_pacman-dl.service: - src: etc/systemd/system/pacman-dl.service - dst: /etc/systemd/system/pacman-dl.service - f_pacman-dl.timer: - src: etc/systemd/system/pacman-dl.timer - dst: /etc/systemd/system/pacman-dl.timer - f_zsh.hook: - src: etc/pacman.d/hooks/zsh.hook - dst: /etc/pacman.d/hooks/zsh.hook - f_nightly-reboot.service: - src: etc/systemd/system/nightly-reboot.service - dst: /etc/systemd/system/nightly-reboot.service - f_nightly-reboot.timer: - src: etc/systemd/system/nightly-reboot.timer - dst: /etc/systemd/system/nightly-reboot.timer f_mkinitcpio.conf: src: etc/mkinitcpio.conf dst: /etc/mkinitcpio.conf @@ -141,70 +120,76 @@ dotfiles: f_cpupower: src: etc/default/cpupower dst: /etc/default/cpupower + f_arch.conf: + src: boot/loader/entries/arch.conf + dst: /boot/loader/entries/arch.conf + f_arch-lts.conf: + src: boot/loader/entries/arch-lts.conf + dst: /boot/loader/entries/arch-lts.conf + f_kodi.conf: + src: boot/loader/entries/kodi.conf + dst: /boot/loader/entries/kodi.conf profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf - - f_pacman-dl.service - - f_pacman-dl.timer + - f_pacman.conf Mirkwood: dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - d_networkd - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_zsh.hook - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_cpupower + - f_getty.conf + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - d_networkd + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf + - f_cpupower + - f_arch.conf + - f_arch-lts.conf + - f_kodi.conf include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config - - f_nightly-reboot.service - - f_nightly-reboot.timer + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_sshd_config Moria: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_ipmi-static.service - - f_ipmi-temp.service - - f_ipmi-temp.timer - - f_ipmi-fans.service - - f_ipmi-fans.timer + - f_sshd_config + - f_99-sysctl.conf + - f_ipmi-static.service + - f_ipmi-temp.service + - f_ipmi-temp.timer + - f_ipmi-fans.service + - f_ipmi-fans.timer localhost: include: - - Locale + - Locale diff --git a/home/.config/mako/config b/home/.config/mako/config index aa7ae8e3..791c9619 100644 --- a/home/.config/mako/config +++ b/home/.config/mako/config @@ -4,3 +4,4 @@ border-color=#D65D0E icons=1 default-timeout=5000 max-visible=6 +layer=overlay diff --git a/home/.config/sway/conf.d/05-workspaces.conf b/home/.config/sway/conf.d/05-workspaces.conf index 0f88c773..f33cf423 100644 --- a/home/.config/sway/conf.d/05-workspaces.conf +++ b/home/.config/sway/conf.d/05-workspaces.conf @@ -11,5 +11,6 @@ for_window [urgent="latest"] focus # Gimp export window for_window [title="Export Image*"] floating enable for_window [app_id="fzf-launcher"] focus, floating enabled, border pixel 1 -for_window [title="Mullvad VPN"] floating disable for_window [app_id="firefox" title="^Extension: \(PassFF\)"] floating enable +for_window [title="About Firefox Nightly"] floating enable +for_window [title="About Mozilla Firefox"] floating enable diff --git a/home/.config/sway/conf.d/07-appearance.conf b/home/.config/sway/conf.d/07-appearance.conf index 8947ed4b..241d3d70 100644 --- a/home/.config/sway/conf.d/07-appearance.conf +++ b/home/.config/sway/conf.d/07-appearance.conf @@ -1,8 +1,8 @@ # vim:ft=i3config default_border none -gaps inner 10 -gaps outer 20 +gaps inner 15 +gaps outer 15 # Hide cursor after 4 seconds of inactivity seat * hide_cursor 4000 diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 87eadd40..f6f9633e 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -9,7 +9,7 @@ exec { kdeconnect-indicator thunderbird mako - wl-paste -t text --watch clipman store + wl-paste -t text --watch clipman store 1>> ~/.log/clipman 2>&1 & mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 gnome-keyring-daemon --start --components=secrets diff --git a/home/.config/systemd/user/trash-empty.service b/home/.config/systemd/user/trash-empty.service new file mode 100644 index 00000000..37e2a8c9 --- /dev/null +++ b/home/.config/systemd/user/trash-empty.service @@ -0,0 +1,6 @@ +[Unit] +Description=Removes files older than a week from trash can + +[Service] +Type=oneshot +ExecStart=/usr/bin/trash-empty 7 diff --git a/home/.config/systemd/user/trash-empty.timer b/home/.config/systemd/user/trash-empty.timer new file mode 100644 index 00000000..2ea280f0 --- /dev/null +++ b/home/.config/systemd/user/trash-empty.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Runs trash-empty.service every hour + +[Timer] +OnUnitActiveSec=1h +Unit=trash-empty.service + +[Install] +WantedBy=timers.target diff --git a/root/boot/loader/entries/arch-lts.conf b/root/boot/loader/entries/arch-lts.conf index 7cd59828..428dcba6 100755 --- a/root/boot/loader/entries/arch-lts.conf +++ b/root/boot/loader/entries/arch-lts.conf @@ -1,5 +1,5 @@ -title Arch Linux -linux /vmlinuz-linux-lts -initrd /amd-ucode.img -initrd /initramfs-linux-lts.img -options cryptdevice=/dev/disk/by-uuid/2fedee0d-fbf1-41ee-8d27-01feb25d9e8d:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=__arch/root resume=/dev/mapper/cryptswap quiet acpi_backlight=vendor rw +title Arch Linux (LTS) +initrd /amd-ucode.img +initrd /initramfs-linux-lts.img +linux /vmlinuz-linux-lts +options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet splash vga=current idle=nomwait diff --git a/root/boot/loader/entries/arch.conf b/root/boot/loader/entries/arch.conf index afe144c8..3afa2de9 100755 --- a/root/boot/loader/entries/arch.conf +++ b/root/boot/loader/entries/arch.conf @@ -1,5 +1,5 @@ -title Arch Linux -linux /vmlinuz-linux -initrd /amd-ucode.img -initrd /initramfs-linux.img -options cryptdevice=/dev/disk/by-uuid/2fedee0d-fbf1-41ee-8d27-01feb25d9e8d:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=__arch/root resume=/dev/mapper/cryptswap cpuidle.governor=teo acpi_backlight=vendor amd_iommu=on iommu=pt rw idle=nomwait rcu_nocbs=0-7 quiet fastboot +title Arch Linux +initrd /amd-ucode.img +initrd /initramfs-linux.img +linux /vmlinuz-linux +options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw vga=current idle=nomwait diff --git a/root/boot/loader/entries/kodi.conf b/root/boot/loader/entries/kodi.conf new file mode 100755 index 00000000..97a46272 --- /dev/null +++ b/root/boot/loader/entries/kodi.conf @@ -0,0 +1,5 @@ +title Kodi +initrd /amd-ucode.img +initrd /initramfs-linux.img +linux /vmlinuz-linux +options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet splash vga=current idle=nomwait video=eDP-1:d diff --git a/root/boot/loader/loader.conf b/root/boot/loader/loader.conf deleted file mode 100755 index 49951610..00000000 --- a/root/boot/loader/loader.conf +++ /dev/null @@ -1,3 +0,0 @@ -default arch -timeout 0 -editor 1 diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 12264164..de3c350e 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -1,8 +1,9 @@ MODULES=(amdgpu) -BINARIES=() FILES=() {%@@ if profile == "Mirkwood" @@%} -HOOKS=(base udev autodetect modconf block filesystems keyboard colors consolefont welcomemessage encrypt resume fsck) -{%@@ elif profile == "Rivendell" @@%} +BINARIES=("/usr/bin/btrfs") +HOOKS=(base autodetect modconf block filesystems keyboard fsck systemd sd-welcomemessage sd-encrypt) +{%@@ else @@%} +BINARIES=() HOOKS=(colors consolefont base udev autodetect modconf block filesystems keyboard fsck) {%@@ endif @@%} diff --git a/root/etc/systemd/system/nightly-reboot.service b/root/etc/systemd/system/nightly-reboot.service deleted file mode 100644 index 702dda78..00000000 --- a/root/etc/systemd/system/nightly-reboot.service +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Nightly reboot - -[Service] -Type=simple -ExecStart=/usr/bin/systemctl reboot diff --git a/root/etc/systemd/system/nightly-reboot.timer b/root/etc/systemd/system/nightly-reboot.timer deleted file mode 100644 index a03a53c4..00000000 --- a/root/etc/systemd/system/nightly-reboot.timer +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Reboot Scheduling. - -[Timer] -OnCalendar=*-*-* 03:00:00 - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/pacman-dl.service b/root/etc/systemd/system/pacman-dl.service deleted file mode 100755 index 43611ee8..00000000 --- a/root/etc/systemd/system/pacman-dl.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Download package updates -After=network-online.target - -[Service] -Type=oneshot -ExecStart=/usr/bin/pacman -Syuw --noconfirm - -[Install] -WantedBy=network-online.target diff --git a/root/etc/systemd/system/pacman-dl.timer b/root/etc/systemd/system/pacman-dl.timer deleted file mode 100644 index 1ffd0a9f..00000000 --- a/root/etc/systemd/system/pacman-dl.timer +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Download packages hourly - -[Timer] -OnCalendar=hourly - -[Install] -WantedBy=timers.target diff --git a/root/usr/local/bin/audacity b/root/usr/local/bin/audacity deleted file mode 100755 index 22f7cecd..00000000 --- a/root/usr/local/bin/audacity +++ /dev/null @@ -1 +0,0 @@ -GTK_THEME=Adwaita /usr/bin/audacity $@ diff --git a/root/usr/local/bin/evenbetterlockscreen b/root/usr/local/bin/evenbetterlockscreen deleted file mode 100755 index 501a27dd..00000000 --- a/root/usr/local/bin/evenbetterlockscreen +++ /dev/null @@ -1,373 +0,0 @@ -#!/usr/bin/env bash - -# Author : Pavan Jadhaw -# Github Profile : https://github.com/pavanjadhaw -# Project Repository : https://github.com/pavanjadhaw/betterlockscreen - - -# create folder in ~/.cache/i3lock directory -folder="$HOME/.cache/i3lock" - -# ratio for rectangle to be drawn for time background on lockscreen -# Original Image -orig_wall="$folder/wall.png" - -# Versions (from here) -# You can use these images to set different versions as wallpaper -# lockscreen background. -resized="$folder/resized.png" # resized image for your resolution - -# images to be used as wallpaper -dim="$folder/dim.png" # image with subtle overlay of black -blur="$folder/blur.png" # blurred version -dimblur="$folder/dimblur.png" - -# lockscreen images (images to be used as lockscreen background) -l_resized="$folder/l_resized.png" -l_dim="$folder/l_dim.png" -l_blur="$folder/l_blur.png" -l_dimblur="$folder/l_dimblur.png" - - -prelock() { - pkill -u "$USER" -USR1 dunst -} - -lock() { - #$1 image path - letterEnteredColor=d23c3dff - letterRemovedColor=d23c3dff - passwordCorrect=00000000 - passwordIncorrect=d23c3dff - background=00000000 - foreground=ffffffff - i3lock \ - -n \ - --timestr="%H:%M" \ - -t -i "$1" \ - --timepos="110:h-70" \ - --datepos="135:h-45" \ - --clock --datestr "Type password to unlock" \ - --insidecolor=$background --ringcolor=$foreground --line-uses-inside \ - --keyhlcolor=$letterEnteredColor --bshlcolor=$letterRemovedColor --separatorcolor=$background \ - --insidevercolor=$passwordCorrect --insidewrongcolor=$passwordIncorrect \ - --ringvercolor=$foreground --ringwrongcolor=$foreground --indpos="x+280:h-70" \ - --radius=20 --ring-width=4 --veriftext="" --wrongtext="" \ - --verifcolor="$foreground" --timecolor="$foreground" --datecolor="$foreground" \ - --noinputtext="" \ - --force-clock -} - -postlock() { - pkill -u "$USER" -USR2 dunst -} - -rec_get_random() { - dir="$1" - if [ ! -d "$dir" ]; then - user_input="$dir" - return - fi - dir=($dir/*) - dir=${dir[RANDOM % ${#dir[@]}]} - rec_get_random "$dir" -} - -usage() { - - echo "Important : Update the image cache, Ex: betterlockscreen -u path/to/image.jpg" - echo " Image cache must be updated to initially configure or update wallpaper used" - echo - echo - echo "See : https://github.com/pavanjadhaw/betterlockscreen for additional info..." - echo - echo - echo "Options:" - echo - echo " -h --help" - - echo " For help. Ex: betterlockscreen -h or betterlockscreen --help" - echo - echo - echo " -u --update" - echo " to update image cache, you should do this before using any other options" - - echo " Ex: betterlockscreen -u path/to/image.png when image.png is custom background" - echo " Or you can use betterlockscreen -u path/to/imagedir and a random file will be selected" - echo - echo - echo " -l --lock" - echo " to lock screen, Ex. betterlockscreen -l" - echo " you can also use dimmed or blurred background for lockscreen" - echo " Ex: betterlockscreen -l dim (for dimmed background)" - echo " Ex: betterlockscreen -l blur (for blurred background)" - echo " Ex: betterlockscreen -l dimblur (for dimmed + blurred background)" - echo - echo - echo " -s --suspend" - echo " to suspend system and lock screen, Ex. betterlockscreen -s" - echo " you can also use dimmed or blurred background for lockscreen" - echo " Ex: betterlockscreen -s dim (for dimmed background)" - echo " Ex: betterlockscreen -s blur (for blurred background)" - echo " Ex: betterlockscreen -s dimblur (for dimmed + blurred background)" - echo - echo - echo " -w --wall" - echo " you can also set lockscreen background as wallpaper" - echo " to set wallpaper. Ex betterlockscreen -w or betterlockscreen --wall" - echo " you can also use dimmed or blurred variants" - echo " Ex: betterlockscreen -w dim (for dimmed wallpaper)" - echo " Ex: betterlockscreen -w blur (for blurred wallpaper)" - echo " Ex: betterlockscreen -w dimblur (for dimmed + blurred wallpaper)" - echo - echo - echo " -r --resolution" - echo " to be used after -u" - echo " used to set a custom resolution for the image cache." - echo " Ex: betterlockscreen -u path/to/image.png -r 1920x1080" - echo " Ex: betterlockscreen -u path/to/image.png --resolution 3840x1080" - echo - echo " -b --blur" - echo " to be used after -u" - echo " used to set blur intensity. Default to 1." - echo " Ex: betterlockscreen -u path/to/image.png -b 3" - echo " Ex: betterlockscreen -u path/to/image.png --blur 0.5" - echo - -} - -# Options -case "$1" in - "") - if [ ! -f $l_dim ]; then - - echo "Important : Update the image cache, Ex. betterlockscreen -u path/to/image.jpg" - echo - echo " Image cache must be updated to initially configure or update wallpaper used" - echo - echo "See also : For other set of options and help use help command." - echo "Ex. betterlockscreen -h or betterlockscreen --help" - - echo - echo "See : https://github.com/pavanjadhaw/betterlockscreen for addition info..." - exit 1 - else - echo - echo "Seems you havent provided any argument, see below for usage info" - echo - echo "See also : For other set of options and help use help command." - - echo "Ex. betterlockscreen -h or betterlockscreen --help" - - echo - echo "See : https://github.com/pavanjadhaw/betterlockscreen for addition info..." - echo - exit 1 - fi - ;; - - -h | --help) - - usage - - ;; - - -l | --lock) - case "$2" in - "") - # default lockscreen - prelock - lock "$l_resized" - postlock - ;; - - dim) - # lockscreen with dimmed background - prelock - lock "$l_dim" - postlock - ;; - - blur) - # set lockscreen with blurred background - prelock - lock "$l_blur" - postlock - ;; - - dimblur) - # set lockscreen with dimmed + blurred background - prelock - lock "$l_dimblur" - postlock - ;; - esac - ;; - - -s | --suspend) - case "$2" in - "") - # default lockscreen - prelock - lock "$l_resized" && systemctl suspend - postlock - ;; - - dim) - # lockscreen with dimmed background - prelock - lock "$l_dim" && systemctl suspend - postlock - ;; - - blur) - # set lockscreen with blurred background - prelock - lock "$l_blur" && systemctl suspend - postlock - ;; - - dimblur) - # set lockscreen with dimmed + blurred background - prelock - lock "$l_dimblur" && systemctl suspend - postlock - ;; - esac - ;; - - - -w | --wall) - case "$2" in - "") - # set resized image as wallpaper if no argument is supplied by user - feh --bg-fill $resized - ;; - - dim) - # set dimmed image as wallpaper - feh --bg-fill $dim - ;; - - blur) - # set blurred image as wallpaper - feh --bg-fill $blur - ;; - - dimblur) - # set dimmed + blurred image as wallpaper - feh --bg-fill $dimblur - ;; - esac - ;; - - -u | --update) - background="$2" - shift 2 - - # find your resolution so images can be resized to match your screen resolution - y_res=$(xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+x[0-9]+).*$/\1/') - # default blur level - blur_level=1 - - # parse update arguments - while [ $# -gt 0 ]; do - case "$1" in - -r | --resolution ) - y_res="$2" - shift 2 - ;; - -b | --blur ) - blur_level="$2" - shift 2 - ;; - *) - shift ;; - esac - done - - rectangles=" " - SR=$(xrandr --query | grep ' connected' | grep -o '[0-9][0-9]*x[0-9][0-9]*[^ ]*') - for RES in $SR; do - SRA=(${RES//[x+]/ }) - CX=$((${SRA[2]} + 25)) - CY=$((${SRA[1]} - 30)) - rectangles+="rectangle $CX,$CY $((CX+300)),$((CY-80)) " - done - - # User supplied Image - user_image="$folder/user_image.png" - - # create folder - if [ ! -d $folder ]; then - echo "Creating '$folder' directory to cache processed images." - mkdir -p "$folder" - fi - - # get random file in dir if passed argument is a dir - rec_get_random "$background" - - # get user image - cp "$user_input" "$user_image" - if [ ! -f $user_image ]; then - echo "Please specify the path to the image you would like to use" - exit 1 - fi - - # replace orignal with user image - cp "$user_image" "$orig_wall" - rm "$user_image" - - echo "Generating alternate images based on the image you specified," - echo "please wait this might take few seconds..." - - # wallpapers - - echo - echo "Converting provided image to match your resolution..." - # resize image - convert "$orig_wall" -resize "$y_res""^" -gravity center -extent "$y_res" "$resized" - - echo - echo "Applying dim and blur effect to resized image" - # dim - convert "$resized" -fill black -colorize 40% "$dim" - - # blur - blur_shrink=$(echo "scale=2; 20 / $blur_level" | bc) - blur_sigma=$(echo "scale=2; 0.6 * $blur_level" | bc) - convert "$resized" \ - -filter Gaussian \ - -resize "$blur_shrink%" \ - -define "filter:sigma=$blur_sigma" \ - -resize "$y_res^" -gravity center -extent "$y_res" \ - "$blur" - - # dimblur - convert "$dim" \ - -filter Gaussian \ - -resize "$blur_shrink%" \ - -define "filter:sigma=$blur_sigma" \ - -resize "$y_res^" -gravity center -extent "$y_res" \ - "$dimblur" - - # lockscreen backgrounds - - echo - echo "Caching images for faster screen locking" - # resized - convert "$resized" -draw "fill rgba(0, 0, 0, 0.4) $rectangles" "$l_resized" - - # dim - convert "$dim" -draw "fill rgba(0, 0, 0, 0.4) $rectangles" "$l_dim" - - # blur - convert "$blur" -draw "fill rgba(0, 0, 0, 0.4) $rectangles" "$l_blur" - - # blur - convert "$dimblur" -draw "fill rgba(0, 0, 0, 0.4) $rectangles" "$l_dimblur" - echo - echo "All required changes have been applied" - ;; -esac - diff --git a/root/usr/local/bin/gnome-terminal b/root/usr/local/bin/gnome-terminal deleted file mode 100755 index 54812cd2..00000000 --- a/root/usr/local/bin/gnome-terminal +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -if [ $# -eq 1 ]; then - /usr/bin/alacritty -e "nvim $1" -else - /usr/bin/alacritty -e "$@" -fi diff --git a/root/usr/local/bin/ikhal b/root/usr/local/bin/ikhal deleted file mode 100755 index 687c8cbb..00000000 --- a/root/usr/local/bin/ikhal +++ /dev/null @@ -1 +0,0 @@ -LANG="en_US.UTF-8" /usr/bin/ikhal $* diff --git a/root/usr/local/bin/khal b/root/usr/local/bin/khal deleted file mode 100755 index 4597e2fe..00000000 --- a/root/usr/local/bin/khal +++ /dev/null @@ -1 +0,0 @@ -LANG="en_US.UTF-8" /usr/bin/khal $* diff --git a/root/usr/local/bin/qtwebflix b/root/usr/local/bin/qtwebflix deleted file mode 100755 index f33cd83d..00000000 --- a/root/usr/local/bin/qtwebflix +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/qtwebflix --register-pepper-plugins="/usr/lib/qt/plugins/ppapi/libwidevinecdmadapter.so; application/x-ppapi-widevine-cdm" diff --git a/home/.config/sway/scripts/run.sh b/root/usr/local/bin/sway-run similarity index 100% rename from home/.config/sway/scripts/run.sh rename to root/usr/local/bin/sway-run From 139da63a824a4b542b2ce9f6ceed458b9dd8df83 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 May 2020 09:47:03 +0300 Subject: [PATCH 0348/2667] Lots of changes --- config-home.yaml | 1 - config-root.yaml | 131 +++--- home/.config/mako/config | 1 + home/.config/sway/conf.d/05-workspaces.conf | 3 +- home/.config/sway/conf.d/07-appearance.conf | 4 +- home/.config/sway/conf.d/08-exec.conf | 2 +- home/.config/systemd/user/trash-empty.service | 6 + home/.config/systemd/user/trash-empty.timer | 9 + root/boot/loader/entries/arch-lts.conf | 10 +- root/boot/loader/entries/arch.conf | 10 +- root/boot/loader/entries/kodi.conf | 5 + root/boot/loader/loader.conf | 3 - root/etc/mkinitcpio.conf | 7 +- .../etc/systemd/system/nightly-reboot.service | 6 - root/etc/systemd/system/nightly-reboot.timer | 8 - root/etc/systemd/system/pacman-dl.service | 10 - root/etc/systemd/system/pacman-dl.timer | 8 - root/usr/local/bin/audacity | 1 - root/usr/local/bin/evenbetterlockscreen | 373 ------------------ root/usr/local/bin/gnome-terminal | 6 - root/usr/local/bin/ikhal | 1 - root/usr/local/bin/khal | 1 - root/usr/local/bin/qtwebflix | 1 - .../run.sh => root/usr/local/bin/sway-run | 0 24 files changed, 98 insertions(+), 509 deletions(-) create mode 100644 home/.config/systemd/user/trash-empty.service create mode 100644 home/.config/systemd/user/trash-empty.timer create mode 100755 root/boot/loader/entries/kodi.conf delete mode 100755 root/boot/loader/loader.conf delete mode 100644 root/etc/systemd/system/nightly-reboot.service delete mode 100644 root/etc/systemd/system/nightly-reboot.timer delete mode 100755 root/etc/systemd/system/pacman-dl.service delete mode 100644 root/etc/systemd/system/pacman-dl.timer delete mode 100755 root/usr/local/bin/audacity delete mode 100755 root/usr/local/bin/evenbetterlockscreen delete mode 100755 root/usr/local/bin/gnome-terminal delete mode 100755 root/usr/local/bin/ikhal delete mode 100755 root/usr/local/bin/khal delete mode 100755 root/usr/local/bin/qtwebflix rename home/.config/sway/scripts/run.sh => root/usr/local/bin/sway-run (100%) diff --git a/config-home.yaml b/config-home.yaml index 9db79326..e3b5a74b 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -229,4 +229,3 @@ profiles: localhost: include: - Terminal - - Pacman diff --git a/config-root.yaml b/config-root.yaml index d2e55913..bf23ee7a 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -21,7 +21,7 @@ dotfiles: src: usr/local/bin d_networkd: actions: - - chmod-wireguard + - chmod-wireguard src: etc/systemd/network dst: /etc/systemd/network f_99-sysctl.conf: @@ -45,9 +45,6 @@ dotfiles: f_iwd@.service: dst: /etc/systemd/system/iwd@.service src: etc/systemd/system/iwd@.service - f_loader.conf: - dst: /boot/loader/loader.conf - src: boot/loader/loader.conf f_fonts.conf: dst: /etc/fonts/local.conf src: etc/fonts/local.conf @@ -66,9 +63,6 @@ dotfiles: f_pacman.conf: dst: /etc/pacman.conf src: etc/pacman.conf - f_pacserve.service.conf: - dst: /etc/pacserve/pacserve.service.conf - src: etc/pacserve/pacserve.service.conf f_sshd_config: dst: /etc/ssh/sshd_config src: etc/ssh/sshd_config @@ -96,21 +90,6 @@ dotfiles: f_ignore: src: .ignore dst: /.ignore - f_pacman-dl.service: - src: etc/systemd/system/pacman-dl.service - dst: /etc/systemd/system/pacman-dl.service - f_pacman-dl.timer: - src: etc/systemd/system/pacman-dl.timer - dst: /etc/systemd/system/pacman-dl.timer - f_zsh.hook: - src: etc/pacman.d/hooks/zsh.hook - dst: /etc/pacman.d/hooks/zsh.hook - f_nightly-reboot.service: - src: etc/systemd/system/nightly-reboot.service - dst: /etc/systemd/system/nightly-reboot.service - f_nightly-reboot.timer: - src: etc/systemd/system/nightly-reboot.timer - dst: /etc/systemd/system/nightly-reboot.timer f_mkinitcpio.conf: src: etc/mkinitcpio.conf dst: /etc/mkinitcpio.conf @@ -141,70 +120,76 @@ dotfiles: f_cpupower: src: etc/default/cpupower dst: /etc/default/cpupower + f_arch.conf: + src: boot/loader/entries/arch.conf + dst: /boot/loader/entries/arch.conf + f_arch-lts.conf: + src: boot/loader/entries/arch-lts.conf + dst: /boot/loader/entries/arch-lts.conf + f_kodi.conf: + src: boot/loader/entries/kodi.conf + dst: /boot/loader/entries/kodi.conf profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf - - f_pacman-dl.service - - f_pacman-dl.timer + - f_pacman.conf Mirkwood: dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - d_networkd - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_zsh.hook - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_cpupower + - f_getty.conf + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - d_networkd + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf + - f_cpupower + - f_arch.conf + - f_arch-lts.conf + - f_kodi.conf include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config - - f_nightly-reboot.service - - f_nightly-reboot.timer + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_sshd_config Moria: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_ipmi-static.service - - f_ipmi-temp.service - - f_ipmi-temp.timer - - f_ipmi-fans.service - - f_ipmi-fans.timer + - f_sshd_config + - f_99-sysctl.conf + - f_ipmi-static.service + - f_ipmi-temp.service + - f_ipmi-temp.timer + - f_ipmi-fans.service + - f_ipmi-fans.timer localhost: include: - - Locale + - Locale diff --git a/home/.config/mako/config b/home/.config/mako/config index aa7ae8e3..791c9619 100644 --- a/home/.config/mako/config +++ b/home/.config/mako/config @@ -4,3 +4,4 @@ border-color=#D65D0E icons=1 default-timeout=5000 max-visible=6 +layer=overlay diff --git a/home/.config/sway/conf.d/05-workspaces.conf b/home/.config/sway/conf.d/05-workspaces.conf index 0f88c773..f33cf423 100644 --- a/home/.config/sway/conf.d/05-workspaces.conf +++ b/home/.config/sway/conf.d/05-workspaces.conf @@ -11,5 +11,6 @@ for_window [urgent="latest"] focus # Gimp export window for_window [title="Export Image*"] floating enable for_window [app_id="fzf-launcher"] focus, floating enabled, border pixel 1 -for_window [title="Mullvad VPN"] floating disable for_window [app_id="firefox" title="^Extension: \(PassFF\)"] floating enable +for_window [title="About Firefox Nightly"] floating enable +for_window [title="About Mozilla Firefox"] floating enable diff --git a/home/.config/sway/conf.d/07-appearance.conf b/home/.config/sway/conf.d/07-appearance.conf index 8947ed4b..241d3d70 100644 --- a/home/.config/sway/conf.d/07-appearance.conf +++ b/home/.config/sway/conf.d/07-appearance.conf @@ -1,8 +1,8 @@ # vim:ft=i3config default_border none -gaps inner 10 -gaps outer 20 +gaps inner 15 +gaps outer 15 # Hide cursor after 4 seconds of inactivity seat * hide_cursor 4000 diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 87eadd40..f6f9633e 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -9,7 +9,7 @@ exec { kdeconnect-indicator thunderbird mako - wl-paste -t text --watch clipman store + wl-paste -t text --watch clipman store 1>> ~/.log/clipman 2>&1 & mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 gnome-keyring-daemon --start --components=secrets diff --git a/home/.config/systemd/user/trash-empty.service b/home/.config/systemd/user/trash-empty.service new file mode 100644 index 00000000..37e2a8c9 --- /dev/null +++ b/home/.config/systemd/user/trash-empty.service @@ -0,0 +1,6 @@ +[Unit] +Description=Removes files older than a week from trash can + +[Service] +Type=oneshot +ExecStart=/usr/bin/trash-empty 7 diff --git a/home/.config/systemd/user/trash-empty.timer b/home/.config/systemd/user/trash-empty.timer new file mode 100644 index 00000000..2ea280f0 --- /dev/null +++ b/home/.config/systemd/user/trash-empty.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Runs trash-empty.service every hour + +[Timer] +OnUnitActiveSec=1h +Unit=trash-empty.service + +[Install] +WantedBy=timers.target diff --git a/root/boot/loader/entries/arch-lts.conf b/root/boot/loader/entries/arch-lts.conf index 7cd59828..428dcba6 100755 --- a/root/boot/loader/entries/arch-lts.conf +++ b/root/boot/loader/entries/arch-lts.conf @@ -1,5 +1,5 @@ -title Arch Linux -linux /vmlinuz-linux-lts -initrd /amd-ucode.img -initrd /initramfs-linux-lts.img -options cryptdevice=/dev/disk/by-uuid/2fedee0d-fbf1-41ee-8d27-01feb25d9e8d:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=__arch/root resume=/dev/mapper/cryptswap quiet acpi_backlight=vendor rw +title Arch Linux (LTS) +initrd /amd-ucode.img +initrd /initramfs-linux-lts.img +linux /vmlinuz-linux-lts +options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet splash vga=current idle=nomwait diff --git a/root/boot/loader/entries/arch.conf b/root/boot/loader/entries/arch.conf index afe144c8..3afa2de9 100755 --- a/root/boot/loader/entries/arch.conf +++ b/root/boot/loader/entries/arch.conf @@ -1,5 +1,5 @@ -title Arch Linux -linux /vmlinuz-linux -initrd /amd-ucode.img -initrd /initramfs-linux.img -options cryptdevice=/dev/disk/by-uuid/2fedee0d-fbf1-41ee-8d27-01feb25d9e8d:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=__arch/root resume=/dev/mapper/cryptswap cpuidle.governor=teo acpi_backlight=vendor amd_iommu=on iommu=pt rw idle=nomwait rcu_nocbs=0-7 quiet fastboot +title Arch Linux +initrd /amd-ucode.img +initrd /initramfs-linux.img +linux /vmlinuz-linux +options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw vga=current idle=nomwait diff --git a/root/boot/loader/entries/kodi.conf b/root/boot/loader/entries/kodi.conf new file mode 100755 index 00000000..97a46272 --- /dev/null +++ b/root/boot/loader/entries/kodi.conf @@ -0,0 +1,5 @@ +title Kodi +initrd /amd-ucode.img +initrd /initramfs-linux.img +linux /vmlinuz-linux +options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet splash vga=current idle=nomwait video=eDP-1:d diff --git a/root/boot/loader/loader.conf b/root/boot/loader/loader.conf deleted file mode 100755 index 49951610..00000000 --- a/root/boot/loader/loader.conf +++ /dev/null @@ -1,3 +0,0 @@ -default arch -timeout 0 -editor 1 diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 12264164..de3c350e 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -1,8 +1,9 @@ MODULES=(amdgpu) -BINARIES=() FILES=() {%@@ if profile == "Mirkwood" @@%} -HOOKS=(base udev autodetect modconf block filesystems keyboard colors consolefont welcomemessage encrypt resume fsck) -{%@@ elif profile == "Rivendell" @@%} +BINARIES=("/usr/bin/btrfs") +HOOKS=(base autodetect modconf block filesystems keyboard fsck systemd sd-welcomemessage sd-encrypt) +{%@@ else @@%} +BINARIES=() HOOKS=(colors consolefont base udev autodetect modconf block filesystems keyboard fsck) {%@@ endif @@%} diff --git a/root/etc/systemd/system/nightly-reboot.service b/root/etc/systemd/system/nightly-reboot.service deleted file mode 100644 index 702dda78..00000000 --- a/root/etc/systemd/system/nightly-reboot.service +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Nightly reboot - -[Service] -Type=simple -ExecStart=/usr/bin/systemctl reboot diff --git a/root/etc/systemd/system/nightly-reboot.timer b/root/etc/systemd/system/nightly-reboot.timer deleted file mode 100644 index a03a53c4..00000000 --- a/root/etc/systemd/system/nightly-reboot.timer +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Reboot Scheduling. - -[Timer] -OnCalendar=*-*-* 03:00:00 - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/pacman-dl.service b/root/etc/systemd/system/pacman-dl.service deleted file mode 100755 index 43611ee8..00000000 --- a/root/etc/systemd/system/pacman-dl.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Download package updates -After=network-online.target - -[Service] -Type=oneshot -ExecStart=/usr/bin/pacman -Syuw --noconfirm - -[Install] -WantedBy=network-online.target diff --git a/root/etc/systemd/system/pacman-dl.timer b/root/etc/systemd/system/pacman-dl.timer deleted file mode 100644 index 1ffd0a9f..00000000 --- a/root/etc/systemd/system/pacman-dl.timer +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Download packages hourly - -[Timer] -OnCalendar=hourly - -[Install] -WantedBy=timers.target diff --git a/root/usr/local/bin/audacity b/root/usr/local/bin/audacity deleted file mode 100755 index 22f7cecd..00000000 --- a/root/usr/local/bin/audacity +++ /dev/null @@ -1 +0,0 @@ -GTK_THEME=Adwaita /usr/bin/audacity $@ diff --git a/root/usr/local/bin/evenbetterlockscreen b/root/usr/local/bin/evenbetterlockscreen deleted file mode 100755 index 501a27dd..00000000 --- a/root/usr/local/bin/evenbetterlockscreen +++ /dev/null @@ -1,373 +0,0 @@ -#!/usr/bin/env bash - -# Author : Pavan Jadhaw -# Github Profile : https://github.com/pavanjadhaw -# Project Repository : https://github.com/pavanjadhaw/betterlockscreen - - -# create folder in ~/.cache/i3lock directory -folder="$HOME/.cache/i3lock" - -# ratio for rectangle to be drawn for time background on lockscreen -# Original Image -orig_wall="$folder/wall.png" - -# Versions (from here) -# You can use these images to set different versions as wallpaper -# lockscreen background. -resized="$folder/resized.png" # resized image for your resolution - -# images to be used as wallpaper -dim="$folder/dim.png" # image with subtle overlay of black -blur="$folder/blur.png" # blurred version -dimblur="$folder/dimblur.png" - -# lockscreen images (images to be used as lockscreen background) -l_resized="$folder/l_resized.png" -l_dim="$folder/l_dim.png" -l_blur="$folder/l_blur.png" -l_dimblur="$folder/l_dimblur.png" - - -prelock() { - pkill -u "$USER" -USR1 dunst -} - -lock() { - #$1 image path - letterEnteredColor=d23c3dff - letterRemovedColor=d23c3dff - passwordCorrect=00000000 - passwordIncorrect=d23c3dff - background=00000000 - foreground=ffffffff - i3lock \ - -n \ - --timestr="%H:%M" \ - -t -i "$1" \ - --timepos="110:h-70" \ - --datepos="135:h-45" \ - --clock --datestr "Type password to unlock" \ - --insidecolor=$background --ringcolor=$foreground --line-uses-inside \ - --keyhlcolor=$letterEnteredColor --bshlcolor=$letterRemovedColor --separatorcolor=$background \ - --insidevercolor=$passwordCorrect --insidewrongcolor=$passwordIncorrect \ - --ringvercolor=$foreground --ringwrongcolor=$foreground --indpos="x+280:h-70" \ - --radius=20 --ring-width=4 --veriftext="" --wrongtext="" \ - --verifcolor="$foreground" --timecolor="$foreground" --datecolor="$foreground" \ - --noinputtext="" \ - --force-clock -} - -postlock() { - pkill -u "$USER" -USR2 dunst -} - -rec_get_random() { - dir="$1" - if [ ! -d "$dir" ]; then - user_input="$dir" - return - fi - dir=($dir/*) - dir=${dir[RANDOM % ${#dir[@]}]} - rec_get_random "$dir" -} - -usage() { - - echo "Important : Update the image cache, Ex: betterlockscreen -u path/to/image.jpg" - echo " Image cache must be updated to initially configure or update wallpaper used" - echo - echo - echo "See : https://github.com/pavanjadhaw/betterlockscreen for additional info..." - echo - echo - echo "Options:" - echo - echo " -h --help" - - echo " For help. Ex: betterlockscreen -h or betterlockscreen --help" - echo - echo - echo " -u --update" - echo " to update image cache, you should do this before using any other options" - - echo " Ex: betterlockscreen -u path/to/image.png when image.png is custom background" - echo " Or you can use betterlockscreen -u path/to/imagedir and a random file will be selected" - echo - echo - echo " -l --lock" - echo " to lock screen, Ex. betterlockscreen -l" - echo " you can also use dimmed or blurred background for lockscreen" - echo " Ex: betterlockscreen -l dim (for dimmed background)" - echo " Ex: betterlockscreen -l blur (for blurred background)" - echo " Ex: betterlockscreen -l dimblur (for dimmed + blurred background)" - echo - echo - echo " -s --suspend" - echo " to suspend system and lock screen, Ex. betterlockscreen -s" - echo " you can also use dimmed or blurred background for lockscreen" - echo " Ex: betterlockscreen -s dim (for dimmed background)" - echo " Ex: betterlockscreen -s blur (for blurred background)" - echo " Ex: betterlockscreen -s dimblur (for dimmed + blurred background)" - echo - echo - echo " -w --wall" - echo " you can also set lockscreen background as wallpaper" - echo " to set wallpaper. Ex betterlockscreen -w or betterlockscreen --wall" - echo " you can also use dimmed or blurred variants" - echo " Ex: betterlockscreen -w dim (for dimmed wallpaper)" - echo " Ex: betterlockscreen -w blur (for blurred wallpaper)" - echo " Ex: betterlockscreen -w dimblur (for dimmed + blurred wallpaper)" - echo - echo - echo " -r --resolution" - echo " to be used after -u" - echo " used to set a custom resolution for the image cache." - echo " Ex: betterlockscreen -u path/to/image.png -r 1920x1080" - echo " Ex: betterlockscreen -u path/to/image.png --resolution 3840x1080" - echo - echo " -b --blur" - echo " to be used after -u" - echo " used to set blur intensity. Default to 1." - echo " Ex: betterlockscreen -u path/to/image.png -b 3" - echo " Ex: betterlockscreen -u path/to/image.png --blur 0.5" - echo - -} - -# Options -case "$1" in - "") - if [ ! -f $l_dim ]; then - - echo "Important : Update the image cache, Ex. betterlockscreen -u path/to/image.jpg" - echo - echo " Image cache must be updated to initially configure or update wallpaper used" - echo - echo "See also : For other set of options and help use help command." - echo "Ex. betterlockscreen -h or betterlockscreen --help" - - echo - echo "See : https://github.com/pavanjadhaw/betterlockscreen for addition info..." - exit 1 - else - echo - echo "Seems you havent provided any argument, see below for usage info" - echo - echo "See also : For other set of options and help use help command." - - echo "Ex. betterlockscreen -h or betterlockscreen --help" - - echo - echo "See : https://github.com/pavanjadhaw/betterlockscreen for addition info..." - echo - exit 1 - fi - ;; - - -h | --help) - - usage - - ;; - - -l | --lock) - case "$2" in - "") - # default lockscreen - prelock - lock "$l_resized" - postlock - ;; - - dim) - # lockscreen with dimmed background - prelock - lock "$l_dim" - postlock - ;; - - blur) - # set lockscreen with blurred background - prelock - lock "$l_blur" - postlock - ;; - - dimblur) - # set lockscreen with dimmed + blurred background - prelock - lock "$l_dimblur" - postlock - ;; - esac - ;; - - -s | --suspend) - case "$2" in - "") - # default lockscreen - prelock - lock "$l_resized" && systemctl suspend - postlock - ;; - - dim) - # lockscreen with dimmed background - prelock - lock "$l_dim" && systemctl suspend - postlock - ;; - - blur) - # set lockscreen with blurred background - prelock - lock "$l_blur" && systemctl suspend - postlock - ;; - - dimblur) - # set lockscreen with dimmed + blurred background - prelock - lock "$l_dimblur" && systemctl suspend - postlock - ;; - esac - ;; - - - -w | --wall) - case "$2" in - "") - # set resized image as wallpaper if no argument is supplied by user - feh --bg-fill $resized - ;; - - dim) - # set dimmed image as wallpaper - feh --bg-fill $dim - ;; - - blur) - # set blurred image as wallpaper - feh --bg-fill $blur - ;; - - dimblur) - # set dimmed + blurred image as wallpaper - feh --bg-fill $dimblur - ;; - esac - ;; - - -u | --update) - background="$2" - shift 2 - - # find your resolution so images can be resized to match your screen resolution - y_res=$(xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+x[0-9]+).*$/\1/') - # default blur level - blur_level=1 - - # parse update arguments - while [ $# -gt 0 ]; do - case "$1" in - -r | --resolution ) - y_res="$2" - shift 2 - ;; - -b | --blur ) - blur_level="$2" - shift 2 - ;; - *) - shift ;; - esac - done - - rectangles=" " - SR=$(xrandr --query | grep ' connected' | grep -o '[0-9][0-9]*x[0-9][0-9]*[^ ]*') - for RES in $SR; do - SRA=(${RES//[x+]/ }) - CX=$((${SRA[2]} + 25)) - CY=$((${SRA[1]} - 30)) - rectangles+="rectangle $CX,$CY $((CX+300)),$((CY-80)) " - done - - # User supplied Image - user_image="$folder/user_image.png" - - # create folder - if [ ! -d $folder ]; then - echo "Creating '$folder' directory to cache processed images." - mkdir -p "$folder" - fi - - # get random file in dir if passed argument is a dir - rec_get_random "$background" - - # get user image - cp "$user_input" "$user_image" - if [ ! -f $user_image ]; then - echo "Please specify the path to the image you would like to use" - exit 1 - fi - - # replace orignal with user image - cp "$user_image" "$orig_wall" - rm "$user_image" - - echo "Generating alternate images based on the image you specified," - echo "please wait this might take few seconds..." - - # wallpapers - - echo - echo "Converting provided image to match your resolution..." - # resize image - convert "$orig_wall" -resize "$y_res""^" -gravity center -extent "$y_res" "$resized" - - echo - echo "Applying dim and blur effect to resized image" - # dim - convert "$resized" -fill black -colorize 40% "$dim" - - # blur - blur_shrink=$(echo "scale=2; 20 / $blur_level" | bc) - blur_sigma=$(echo "scale=2; 0.6 * $blur_level" | bc) - convert "$resized" \ - -filter Gaussian \ - -resize "$blur_shrink%" \ - -define "filter:sigma=$blur_sigma" \ - -resize "$y_res^" -gravity center -extent "$y_res" \ - "$blur" - - # dimblur - convert "$dim" \ - -filter Gaussian \ - -resize "$blur_shrink%" \ - -define "filter:sigma=$blur_sigma" \ - -resize "$y_res^" -gravity center -extent "$y_res" \ - "$dimblur" - - # lockscreen backgrounds - - echo - echo "Caching images for faster screen locking" - # resized - convert "$resized" -draw "fill rgba(0, 0, 0, 0.4) $rectangles" "$l_resized" - - # dim - convert "$dim" -draw "fill rgba(0, 0, 0, 0.4) $rectangles" "$l_dim" - - # blur - convert "$blur" -draw "fill rgba(0, 0, 0, 0.4) $rectangles" "$l_blur" - - # blur - convert "$dimblur" -draw "fill rgba(0, 0, 0, 0.4) $rectangles" "$l_dimblur" - echo - echo "All required changes have been applied" - ;; -esac - diff --git a/root/usr/local/bin/gnome-terminal b/root/usr/local/bin/gnome-terminal deleted file mode 100755 index 54812cd2..00000000 --- a/root/usr/local/bin/gnome-terminal +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -if [ $# -eq 1 ]; then - /usr/bin/alacritty -e "nvim $1" -else - /usr/bin/alacritty -e "$@" -fi diff --git a/root/usr/local/bin/ikhal b/root/usr/local/bin/ikhal deleted file mode 100755 index 687c8cbb..00000000 --- a/root/usr/local/bin/ikhal +++ /dev/null @@ -1 +0,0 @@ -LANG="en_US.UTF-8" /usr/bin/ikhal $* diff --git a/root/usr/local/bin/khal b/root/usr/local/bin/khal deleted file mode 100755 index 4597e2fe..00000000 --- a/root/usr/local/bin/khal +++ /dev/null @@ -1 +0,0 @@ -LANG="en_US.UTF-8" /usr/bin/khal $* diff --git a/root/usr/local/bin/qtwebflix b/root/usr/local/bin/qtwebflix deleted file mode 100755 index f33cd83d..00000000 --- a/root/usr/local/bin/qtwebflix +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/qtwebflix --register-pepper-plugins="/usr/lib/qt/plugins/ppapi/libwidevinecdmadapter.so; application/x-ppapi-widevine-cdm" diff --git a/home/.config/sway/scripts/run.sh b/root/usr/local/bin/sway-run similarity index 100% rename from home/.config/sway/scripts/run.sh rename to root/usr/local/bin/sway-run From 709fd4c78be388f3f38fb7ab94b450f60d968cc9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 May 2020 20:15:52 +0300 Subject: [PATCH 0349/2667] Small fixes --- docker/homeautomation/docker-compose.yml | 1 + root/boot/loader/entries/arch.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 332b0821..9b0c476b 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -12,6 +12,7 @@ services: networks: - home-assistant - proxy + network_mode: host ports: - "8123:8123" depends_on: diff --git a/root/boot/loader/entries/arch.conf b/root/boot/loader/entries/arch.conf index 3afa2de9..6c568dad 100755 --- a/root/boot/loader/entries/arch.conf +++ b/root/boot/loader/entries/arch.conf @@ -2,4 +2,4 @@ title Arch Linux initrd /amd-ucode.img initrd /initramfs-linux.img linux /vmlinuz-linux -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw vga=current idle=nomwait +options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet splash vga=current idle=nomwait From a4edad2a049c06ac6beecd8436580ca583b2cda5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 May 2020 20:15:52 +0300 Subject: [PATCH 0350/2667] Small fixes --- docker/homeautomation/docker-compose.yml | 1 + root/boot/loader/entries/arch.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 332b0821..9b0c476b 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -12,6 +12,7 @@ services: networks: - home-assistant - proxy + network_mode: host ports: - "8123:8123" depends_on: diff --git a/root/boot/loader/entries/arch.conf b/root/boot/loader/entries/arch.conf index 3afa2de9..6c568dad 100755 --- a/root/boot/loader/entries/arch.conf +++ b/root/boot/loader/entries/arch.conf @@ -2,4 +2,4 @@ title Arch Linux initrd /amd-ucode.img initrd /initramfs-linux.img linux /vmlinuz-linux -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw vga=current idle=nomwait +options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet splash vga=current idle=nomwait From e5a3676adbc0b4230aa1234061cf6e926d274130 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 May 2020 20:18:52 +0300 Subject: [PATCH 0351/2667] Revert network mode host --- docker/homeautomation/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 9b0c476b..332b0821 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -12,7 +12,6 @@ services: networks: - home-assistant - proxy - network_mode: host ports: - "8123:8123" depends_on: From 5d58b35f67b067f01a1acee0870ba65ed7f26c6b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 May 2020 20:18:52 +0300 Subject: [PATCH 0352/2667] Revert network mode host --- docker/homeautomation/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 9b0c476b..332b0821 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -12,7 +12,6 @@ services: networks: - home-assistant - proxy - network_mode: host ports: - "8123:8123" depends_on: From a06e2f4f97e1fe616cc58c9c5172fdab82525fd6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 21 May 2020 16:30:34 +0300 Subject: [PATCH 0353/2667] Small fixes --- home/.config/sway/conf.d/06-keybinds.conf | 4 ++-- home/.config/youtube-dl/config | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 4cb5873b..0c9ecef1 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -161,8 +161,8 @@ bindsym $mod+Control+l output eDP-1 transform 90 bindsym $mod+Control+k output eDP-1 transform 0 # display brightness -bindsym XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob -bindsym XF86MonBrightnessDown exec light -U 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob +bindsym --locked XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob +bindsym --locked XF86MonBrightnessDown exec light -U 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob # Some built-in keyboard keys bindsym XF86Mail workspace 4 diff --git a/home/.config/youtube-dl/config b/home/.config/youtube-dl/config index 1a7eb023..e3dad33c 100644 --- a/home/.config/youtube-dl/config +++ b/home/.config/youtube-dl/config @@ -2,7 +2,6 @@ --write-sub --sub-lang en --embed-subs ---embed-thumbnail --add-metadata --prefer-ffmpeg --yes-playlist From 285a1512ccd8372444df07d6daefda40893836f1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 21 May 2020 16:30:34 +0300 Subject: [PATCH 0354/2667] Small fixes --- home/.config/sway/conf.d/06-keybinds.conf | 4 ++-- home/.config/youtube-dl/config | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 4cb5873b..0c9ecef1 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -161,8 +161,8 @@ bindsym $mod+Control+l output eDP-1 transform 90 bindsym $mod+Control+k output eDP-1 transform 0 # display brightness -bindsym XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob -bindsym XF86MonBrightnessDown exec light -U 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob +bindsym --locked XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob +bindsym --locked XF86MonBrightnessDown exec light -U 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob # Some built-in keyboard keys bindsym XF86Mail workspace 4 diff --git a/home/.config/youtube-dl/config b/home/.config/youtube-dl/config index 1a7eb023..e3dad33c 100644 --- a/home/.config/youtube-dl/config +++ b/home/.config/youtube-dl/config @@ -2,7 +2,6 @@ --write-sub --sub-lang en --embed-subs ---embed-thumbnail --add-metadata --prefer-ffmpeg --yes-playlist From 94ad011760279f188cd7479588cd094fa1a25ebf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 08:47:01 +0300 Subject: [PATCH 0355/2667] Add matterbridge --- docker/matterbridge/docker-compose.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 docker/matterbridge/docker-compose.yaml diff --git a/docker/matterbridge/docker-compose.yaml b/docker/matterbridge/docker-compose.yaml new file mode 100644 index 00000000..cec62171 --- /dev/null +++ b/docker/matterbridge/docker-compose.yaml @@ -0,0 +1,7 @@ +version: "3.7" +services: + matterbridge: + image: 42wim/matterbridge + restart: always + volumes: + - /docker/matterbridge:/etc/matterbridge From 10a961dfe614ed76dc123c0228d041961a24588a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 08:47:01 +0300 Subject: [PATCH 0356/2667] Add matterbridge --- docker/matterbridge/docker-compose.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 docker/matterbridge/docker-compose.yaml diff --git a/docker/matterbridge/docker-compose.yaml b/docker/matterbridge/docker-compose.yaml new file mode 100644 index 00000000..cec62171 --- /dev/null +++ b/docker/matterbridge/docker-compose.yaml @@ -0,0 +1,7 @@ +version: "3.7" +services: + matterbridge: + image: 42wim/matterbridge + restart: always + volumes: + - /docker/matterbridge:/etc/matterbridge From 62b2c012a515444a3289150e06f116c2a9ea7aa0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 09:01:34 +0300 Subject: [PATCH 0357/2667] Add container name to matterbridge --- docker/matterbridge/docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/matterbridge/docker-compose.yaml b/docker/matterbridge/docker-compose.yaml index cec62171..4d839aff 100644 --- a/docker/matterbridge/docker-compose.yaml +++ b/docker/matterbridge/docker-compose.yaml @@ -2,6 +2,7 @@ version: "3.7" services: matterbridge: image: 42wim/matterbridge + container_name: matterbridge restart: always volumes: - /docker/matterbridge:/etc/matterbridge From 1dd24e6dde83a9bb8c54ee003ad43c78fd5d1326 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 09:01:34 +0300 Subject: [PATCH 0358/2667] Add container name to matterbridge --- docker/matterbridge/docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/matterbridge/docker-compose.yaml b/docker/matterbridge/docker-compose.yaml index cec62171..4d839aff 100644 --- a/docker/matterbridge/docker-compose.yaml +++ b/docker/matterbridge/docker-compose.yaml @@ -2,6 +2,7 @@ version: "3.7" services: matterbridge: image: 42wim/matterbridge + container_name: matterbridge restart: always volumes: - /docker/matterbridge:/etc/matterbridge From 25a323f00851856b41b25bfd05ce2eb65ce14e04 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 09:07:02 +0300 Subject: [PATCH 0359/2667] Change matterbridge version to stable --- docker/matterbridge/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/matterbridge/docker-compose.yaml b/docker/matterbridge/docker-compose.yaml index 4d839aff..13e12bd0 100644 --- a/docker/matterbridge/docker-compose.yaml +++ b/docker/matterbridge/docker-compose.yaml @@ -1,7 +1,7 @@ version: "3.7" services: matterbridge: - image: 42wim/matterbridge + image: 42wim/matterbridge:stable container_name: matterbridge restart: always volumes: From b5de5b73f65ad5bdfdb93f82869bbbb15dce641c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 09:07:02 +0300 Subject: [PATCH 0360/2667] Change matterbridge version to stable --- docker/matterbridge/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/matterbridge/docker-compose.yaml b/docker/matterbridge/docker-compose.yaml index 4d839aff..13e12bd0 100644 --- a/docker/matterbridge/docker-compose.yaml +++ b/docker/matterbridge/docker-compose.yaml @@ -1,7 +1,7 @@ version: "3.7" services: matterbridge: - image: 42wim/matterbridge + image: 42wim/matterbridge:stable container_name: matterbridge restart: always volumes: From 53b6dadc8f61d1820349570be9e3d0a854184def Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 09:15:18 +0300 Subject: [PATCH 0361/2667] Add pacserve --- root/etc/pacman.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 7e0bc5b1..ecc0ee2f 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -11,12 +11,16 @@ CacheDir = /var/cache/pacman/pkg [core] Include = /etc/pacman.d/mirrorlist +Include = /etc/pacman.d/pacserve [extra] Include = /etc/pacman.d/mirrorlist +Include = /etc/pacman.d/pacserve [community] Include = /etc/pacman.d/mirrorlist +Include = /etc/pacman.d/pacserve [multilib] Include = /etc/pacman.d/mirrorlist +Include = /etc/pacman.d/pacserve From d266fd979e6d99059a3eea10df2995aa29a145b5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 09:15:18 +0300 Subject: [PATCH 0362/2667] Add pacserve --- root/etc/pacman.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 7e0bc5b1..ecc0ee2f 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -11,12 +11,16 @@ CacheDir = /var/cache/pacman/pkg [core] Include = /etc/pacman.d/mirrorlist +Include = /etc/pacman.d/pacserve [extra] Include = /etc/pacman.d/mirrorlist +Include = /etc/pacman.d/pacserve [community] Include = /etc/pacman.d/mirrorlist +Include = /etc/pacman.d/pacserve [multilib] Include = /etc/pacman.d/mirrorlist +Include = /etc/pacman.d/pacserve From c3b9e0a3a6cec1b4cb9cffdd9114408160179bce Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 09:18:17 +0300 Subject: [PATCH 0363/2667] Add pacserve --- config-root.yaml | 103 +++++++++++++----------- root/etc/pacserve/pacserve.service.conf | 0 2 files changed, 54 insertions(+), 49 deletions(-) mode change 100755 => 100644 root/etc/pacserve/pacserve.service.conf diff --git a/config-root.yaml b/config-root.yaml index bf23ee7a..8b1eb859 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -21,7 +21,7 @@ dotfiles: src: usr/local/bin d_networkd: actions: - - chmod-wireguard + - chmod-wireguard src: etc/systemd/network dst: /etc/systemd/network f_99-sysctl.conf: @@ -129,67 +129,72 @@ dotfiles: f_kodi.conf: src: boot/loader/entries/kodi.conf dst: /boot/loader/entries/kodi.conf + f_pacserve.service.conf: + src: etc/pacserve/pacserve.service.conf + dst: /etc/pacserve/pacserve.service.conf profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf + - f_pacman.conf + - f_pacserve.service.conf Mirkwood: dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - d_networkd - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_cpupower - - f_arch.conf - - f_arch-lts.conf - - f_kodi.conf + - f_getty.conf + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - d_networkd + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf + - f_cpupower + - f_arch.conf + - f_arch-lts.conf + - f_kodi.conf + - f_pacserve.service.conf include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_sshd_config Moria: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_ipmi-static.service - - f_ipmi-temp.service - - f_ipmi-temp.timer - - f_ipmi-fans.service - - f_ipmi-fans.timer + - f_sshd_config + - f_99-sysctl.conf + - f_ipmi-static.service + - f_ipmi-temp.service + - f_ipmi-temp.timer + - f_ipmi-fans.service + - f_ipmi-fans.timer localhost: include: - - Locale + - Locale diff --git a/root/etc/pacserve/pacserve.service.conf b/root/etc/pacserve/pacserve.service.conf old mode 100755 new mode 100644 From 9915958ccc2d909c36a7b3ed4f708f4c8405a219 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 09:18:17 +0300 Subject: [PATCH 0364/2667] Add pacserve --- config-root.yaml | 103 +++++++++++++----------- root/etc/pacserve/pacserve.service.conf | 0 2 files changed, 54 insertions(+), 49 deletions(-) mode change 100755 => 100644 root/etc/pacserve/pacserve.service.conf diff --git a/config-root.yaml b/config-root.yaml index bf23ee7a..8b1eb859 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -21,7 +21,7 @@ dotfiles: src: usr/local/bin d_networkd: actions: - - chmod-wireguard + - chmod-wireguard src: etc/systemd/network dst: /etc/systemd/network f_99-sysctl.conf: @@ -129,67 +129,72 @@ dotfiles: f_kodi.conf: src: boot/loader/entries/kodi.conf dst: /boot/loader/entries/kodi.conf + f_pacserve.service.conf: + src: etc/pacserve/pacserve.service.conf + dst: /etc/pacserve/pacserve.service.conf profiles: Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf + - f_pacman.conf + - f_pacserve.service.conf Mirkwood: dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - d_networkd - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_cpupower - - f_arch.conf - - f_arch-lts.conf - - f_kodi.conf + - f_getty.conf + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - d_networkd + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_timesyncd.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf + - f_cpupower + - f_arch.conf + - f_arch-lts.conf + - f_kodi.conf + - f_pacserve.service.conf include: - - Locale - - Pacman + - Locale + - Pacman Rivendell: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config + - f_getty.conf + - f_vconsole.conf + - f_mkinitcpio.conf + - f_bluetooth.conf + - f_60-uinput-permissions.rules + - f_sshd_config Moria: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_ipmi-static.service - - f_ipmi-temp.service - - f_ipmi-temp.timer - - f_ipmi-fans.service - - f_ipmi-fans.timer + - f_sshd_config + - f_99-sysctl.conf + - f_ipmi-static.service + - f_ipmi-temp.service + - f_ipmi-temp.timer + - f_ipmi-fans.service + - f_ipmi-fans.timer localhost: include: - - Locale + - Locale diff --git a/root/etc/pacserve/pacserve.service.conf b/root/etc/pacserve/pacserve.service.conf old mode 100755 new mode 100644 From cfdd465bb128ac91189b618fae05f4504ca1eef3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 09:24:48 +0300 Subject: [PATCH 0365/2667] Fix pacserve order --- root/etc/pacman.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index ecc0ee2f..43ca4cc3 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -10,17 +10,17 @@ LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg [core] -Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/mirrorlist [extra] -Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/mirrorlist [community] -Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/mirrorlist [multilib] -Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/mirrorlist From 5077ff09c6d7d3f7e280bebdd8f5b4ffe9090078 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 09:24:48 +0300 Subject: [PATCH 0366/2667] Fix pacserve order --- root/etc/pacman.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index ecc0ee2f..43ca4cc3 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -10,17 +10,17 @@ LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg [core] -Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/mirrorlist [extra] -Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/mirrorlist [community] -Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/mirrorlist [multilib] -Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/mirrorlist From 15fb305fba213a4aa169e2e2874cc5003415f1d6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 13:12:44 +0300 Subject: [PATCH 0367/2667] Tweak update function --- home/.config/zsh/03-aliases.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index a5d1a4a8..09dca871 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -130,11 +130,13 @@ update() { {%@@ if profile == "Moria" @@%} base --devel docker-update + docker system prune --volumes {%@@ elif profile == "Mirkwood" @@%} base --devel firefox-nightly {%@@ else @@%} base --devel {%@@ endif @@%} + flatpak update sudo awman-update } From 038b83473891ce784a7b88fa10a40efb47f8a593 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 13:12:44 +0300 Subject: [PATCH 0368/2667] Tweak update function --- home/.config/zsh/03-aliases.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index a5d1a4a8..09dca871 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -130,11 +130,13 @@ update() { {%@@ if profile == "Moria" @@%} base --devel docker-update + docker system prune --volumes {%@@ elif profile == "Mirkwood" @@%} base --devel firefox-nightly {%@@ else @@%} base --devel {%@@ endif @@%} + flatpak update sudo awman-update } From bb70186f7c6eb4b5aa394a0e6f8c5e54e7c068e4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 10:37:48 +0300 Subject: [PATCH 0369/2667] Added tt-rss --- docker/tt-rss/docker-compose.yml | 56 ++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 docker/tt-rss/docker-compose.yml diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml new file mode 100644 index 00000000..6ffe6d77 --- /dev/null +++ b/docker/tt-rss/docker-compose.yml @@ -0,0 +1,56 @@ +version: "3" + +services: + db: + image: postgres:12-alpine + restart: unless-stopped + volumes: + - /docker/tt-rss/postgresql:/var/lib/postgresql/data + environment: + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - POSTGRES_USER=${POSTGRES_USER} + + app: + image: cthulhoo/ttrss-fpm-pgsql-static + restart: unless-stopped + environment: + - DB_TYPE=pgsql + - DB_HOST=db + - DB_NAME=${POSTGRES_USER} + - DB_USER=${POSTGRES_USER} + - DB_PASS=${POSTGRES_PASSWORD} + - OWNER_UID=${OWNER_UID} + - OWNER_GID=${OWNER_GID} + - SELF_URL_PATH=${SELF_URL_PATH} + volumes: + - /docker/tt-rss/app:/var/www/html + depends_on: + - db + + updater: + image: cthulhoo/ttrss-fpm-pgsql-static + restart: unless-stopped + environment: + - DB_TYPE=pgsql + - DB_HOST=db + - DB_NAME=${POSTGRES_USER} + - DB_USER=${POSTGRES_USER} + - DB_PASS=${POSTGRES_PASSWORD} + - OWNER_UID=${OWNER_UID} + - OWNER_GID=${OWNER_GID} + - SELF_URL_PATH=${SELF_URL_PATH} + volumes: + - /docker/tt-rss/app:/var/www/html + depends_on: + - app + command: /updater.sh + + web: + image: cthulhoo/ttrss-web + restart: unless-stopped + ports: + - ${HTTP_PORT}:2015 + volumes: + - /docker/tt-rss/app:/var/www/html:ro + depends_on: + - app From c7eb1ecf762cc0ff55ab0b345a6a2dc2bf32fffb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 10:37:48 +0300 Subject: [PATCH 0370/2667] Added tt-rss --- docker/tt-rss/docker-compose.yml | 56 ++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 docker/tt-rss/docker-compose.yml diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml new file mode 100644 index 00000000..6ffe6d77 --- /dev/null +++ b/docker/tt-rss/docker-compose.yml @@ -0,0 +1,56 @@ +version: "3" + +services: + db: + image: postgres:12-alpine + restart: unless-stopped + volumes: + - /docker/tt-rss/postgresql:/var/lib/postgresql/data + environment: + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - POSTGRES_USER=${POSTGRES_USER} + + app: + image: cthulhoo/ttrss-fpm-pgsql-static + restart: unless-stopped + environment: + - DB_TYPE=pgsql + - DB_HOST=db + - DB_NAME=${POSTGRES_USER} + - DB_USER=${POSTGRES_USER} + - DB_PASS=${POSTGRES_PASSWORD} + - OWNER_UID=${OWNER_UID} + - OWNER_GID=${OWNER_GID} + - SELF_URL_PATH=${SELF_URL_PATH} + volumes: + - /docker/tt-rss/app:/var/www/html + depends_on: + - db + + updater: + image: cthulhoo/ttrss-fpm-pgsql-static + restart: unless-stopped + environment: + - DB_TYPE=pgsql + - DB_HOST=db + - DB_NAME=${POSTGRES_USER} + - DB_USER=${POSTGRES_USER} + - DB_PASS=${POSTGRES_PASSWORD} + - OWNER_UID=${OWNER_UID} + - OWNER_GID=${OWNER_GID} + - SELF_URL_PATH=${SELF_URL_PATH} + volumes: + - /docker/tt-rss/app:/var/www/html + depends_on: + - app + command: /updater.sh + + web: + image: cthulhoo/ttrss-web + restart: unless-stopped + ports: + - ${HTTP_PORT}:2015 + volumes: + - /docker/tt-rss/app:/var/www/html:ro + depends_on: + - app From 22dc766c4c957b0ae79f4e18eebdc608160c1130 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 10:38:40 +0300 Subject: [PATCH 0371/2667] Added gitignore --- docker/tt-rss/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 docker/tt-rss/.gitignore diff --git a/docker/tt-rss/.gitignore b/docker/tt-rss/.gitignore new file mode 100644 index 00000000..ad70dc7a --- /dev/null +++ b/docker/tt-rss/.gitignore @@ -0,0 +1 @@ +.env-dist From 1666275218e57d04d6e5b8c9b1f57a4bad1bb04e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 10:38:40 +0300 Subject: [PATCH 0372/2667] Added gitignore --- docker/tt-rss/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 docker/tt-rss/.gitignore diff --git a/docker/tt-rss/.gitignore b/docker/tt-rss/.gitignore new file mode 100644 index 00000000..ad70dc7a --- /dev/null +++ b/docker/tt-rss/.gitignore @@ -0,0 +1 @@ +.env-dist From 2b4111cb15f6b141ace6597cd61b8e817320f8c0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 10:48:03 +0300 Subject: [PATCH 0373/2667] Small changes --- docker/tt-rss/.env-dist | 18 ++++++++++++++++++ docker/tt-rss/.gitignore | 1 - docker/tt-rss/docker-compose.yml | 17 ++++++++++++++++- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 docker/tt-rss/.env-dist delete mode 100644 docker/tt-rss/.gitignore diff --git a/docker/tt-rss/.env-dist b/docker/tt-rss/.env-dist new file mode 100644 index 00000000..1ea7ab13 --- /dev/null +++ b/docker/tt-rss/.env-dist @@ -0,0 +1,18 @@ +# Copy this file to .env before building the container. +# Put any local modifications here. + +BUILD_TAG=latest + +POSTGRES_USER=postgres +POSTGRES_PASSWORD=password + +OWNER_UID=1000 +OWNER_GID=1000 + +# You can keep this as localhost unless you want to use the ssl sidecar +# container (I suggest terminating ssl on the reverse proxy instead). +HTTP_HOST=localhost + +# You will likely need to set this to the correct value, see README.md +# for more information. +SELF_URL_PATH=http://localhost:8280/tt-rss diff --git a/docker/tt-rss/.gitignore b/docker/tt-rss/.gitignore deleted file mode 100644 index ad70dc7a..00000000 --- a/docker/tt-rss/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.env-dist diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml index 6ffe6d77..98237eda 100644 --- a/docker/tt-rss/docker-compose.yml +++ b/docker/tt-rss/docker-compose.yml @@ -49,8 +49,23 @@ services: image: cthulhoo/ttrss-web restart: unless-stopped ports: - - ${HTTP_PORT}:2015 + - 8280:2015 volumes: - /docker/tt-rss/app:/var/www/html:ro depends_on: - app + labels: + - "traefik.enable=true" + + - "traefik.http.routers.tt-rss-redirect.entrypoints=http" + - "traefik.http.routers.tt-rss-redirect.rule=Host(`rss.reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.tt-rss-redirect.middlewares=http2https" + + - "traefik.http.routers.tt-rss.entrypoints=https" + - "traefik.http.routers.tt-rss.rule=Host(`rss.reekynet.com`)" + - "traefik.http.routers.tt-rss.tls=true" + - "traefik.http.routers.tt-rss.tls.certresolver=http" + - "traefik.http.routers.tt-rss.service=tt-rss" + - "traefik.docker.network=proxy" + - "traefik.http.services.tt-rss.loadbalancer.server.port=8280" From 564af1ac5de8b4c0afd92295bfd856c4cdb088c5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 10:48:03 +0300 Subject: [PATCH 0374/2667] Small changes --- docker/tt-rss/.env-dist | 18 ++++++++++++++++++ docker/tt-rss/.gitignore | 1 - docker/tt-rss/docker-compose.yml | 17 ++++++++++++++++- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 docker/tt-rss/.env-dist delete mode 100644 docker/tt-rss/.gitignore diff --git a/docker/tt-rss/.env-dist b/docker/tt-rss/.env-dist new file mode 100644 index 00000000..1ea7ab13 --- /dev/null +++ b/docker/tt-rss/.env-dist @@ -0,0 +1,18 @@ +# Copy this file to .env before building the container. +# Put any local modifications here. + +BUILD_TAG=latest + +POSTGRES_USER=postgres +POSTGRES_PASSWORD=password + +OWNER_UID=1000 +OWNER_GID=1000 + +# You can keep this as localhost unless you want to use the ssl sidecar +# container (I suggest terminating ssl on the reverse proxy instead). +HTTP_HOST=localhost + +# You will likely need to set this to the correct value, see README.md +# for more information. +SELF_URL_PATH=http://localhost:8280/tt-rss diff --git a/docker/tt-rss/.gitignore b/docker/tt-rss/.gitignore deleted file mode 100644 index ad70dc7a..00000000 --- a/docker/tt-rss/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.env-dist diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml index 6ffe6d77..98237eda 100644 --- a/docker/tt-rss/docker-compose.yml +++ b/docker/tt-rss/docker-compose.yml @@ -49,8 +49,23 @@ services: image: cthulhoo/ttrss-web restart: unless-stopped ports: - - ${HTTP_PORT}:2015 + - 8280:2015 volumes: - /docker/tt-rss/app:/var/www/html:ro depends_on: - app + labels: + - "traefik.enable=true" + + - "traefik.http.routers.tt-rss-redirect.entrypoints=http" + - "traefik.http.routers.tt-rss-redirect.rule=Host(`rss.reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.tt-rss-redirect.middlewares=http2https" + + - "traefik.http.routers.tt-rss.entrypoints=https" + - "traefik.http.routers.tt-rss.rule=Host(`rss.reekynet.com`)" + - "traefik.http.routers.tt-rss.tls=true" + - "traefik.http.routers.tt-rss.tls.certresolver=http" + - "traefik.http.routers.tt-rss.service=tt-rss" + - "traefik.docker.network=proxy" + - "traefik.http.services.tt-rss.loadbalancer.server.port=8280" From f4ff17f56cde82fc359f2904961809f1b66365fd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 10:51:02 +0300 Subject: [PATCH 0375/2667] Small fixes --- docker/tt-rss/docker-compose.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml index 98237eda..c908dcee 100644 --- a/docker/tt-rss/docker-compose.yml +++ b/docker/tt-rss/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - db: + tt-rss-db: image: postgres:12-alpine restart: unless-stopped volumes: @@ -10,12 +10,12 @@ services: - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_USER=${POSTGRES_USER} - app: + tt-rss-app: image: cthulhoo/ttrss-fpm-pgsql-static restart: unless-stopped environment: - DB_TYPE=pgsql - - DB_HOST=db + - DB_HOST=tt-rss-db - DB_NAME=${POSTGRES_USER} - DB_USER=${POSTGRES_USER} - DB_PASS=${POSTGRES_PASSWORD} @@ -25,14 +25,14 @@ services: volumes: - /docker/tt-rss/app:/var/www/html depends_on: - - db + - tt-rss-db - updater: + tt-rss-updater: image: cthulhoo/ttrss-fpm-pgsql-static restart: unless-stopped environment: - DB_TYPE=pgsql - - DB_HOST=db + - DB_HOST=tt-rss-db - DB_NAME=${POSTGRES_USER} - DB_USER=${POSTGRES_USER} - DB_PASS=${POSTGRES_PASSWORD} @@ -42,10 +42,10 @@ services: volumes: - /docker/tt-rss/app:/var/www/html depends_on: - - app + - tt-rss-app command: /updater.sh - web: + tt-rss-web: image: cthulhoo/ttrss-web restart: unless-stopped ports: @@ -53,7 +53,7 @@ services: volumes: - /docker/tt-rss/app:/var/www/html:ro depends_on: - - app + - tt-rss-app labels: - "traefik.enable=true" From 283b7539aa7137d441e8e4366412bcdb7c75149c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 10:51:02 +0300 Subject: [PATCH 0376/2667] Small fixes --- docker/tt-rss/docker-compose.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml index 98237eda..c908dcee 100644 --- a/docker/tt-rss/docker-compose.yml +++ b/docker/tt-rss/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - db: + tt-rss-db: image: postgres:12-alpine restart: unless-stopped volumes: @@ -10,12 +10,12 @@ services: - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_USER=${POSTGRES_USER} - app: + tt-rss-app: image: cthulhoo/ttrss-fpm-pgsql-static restart: unless-stopped environment: - DB_TYPE=pgsql - - DB_HOST=db + - DB_HOST=tt-rss-db - DB_NAME=${POSTGRES_USER} - DB_USER=${POSTGRES_USER} - DB_PASS=${POSTGRES_PASSWORD} @@ -25,14 +25,14 @@ services: volumes: - /docker/tt-rss/app:/var/www/html depends_on: - - db + - tt-rss-db - updater: + tt-rss-updater: image: cthulhoo/ttrss-fpm-pgsql-static restart: unless-stopped environment: - DB_TYPE=pgsql - - DB_HOST=db + - DB_HOST=tt-rss-db - DB_NAME=${POSTGRES_USER} - DB_USER=${POSTGRES_USER} - DB_PASS=${POSTGRES_PASSWORD} @@ -42,10 +42,10 @@ services: volumes: - /docker/tt-rss/app:/var/www/html depends_on: - - app + - tt-rss-app command: /updater.sh - web: + tt-rss-web: image: cthulhoo/ttrss-web restart: unless-stopped ports: @@ -53,7 +53,7 @@ services: volumes: - /docker/tt-rss/app:/var/www/html:ro depends_on: - - app + - tt-rss-app labels: - "traefik.enable=true" From ccfc1880754c44c047fa97493a97da0e14955d0a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 10:59:24 +0300 Subject: [PATCH 0377/2667] Small changes --- docker/tt-rss/.env-dist | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/docker/tt-rss/.env-dist b/docker/tt-rss/.env-dist index 1ea7ab13..fa38dad3 100644 --- a/docker/tt-rss/.env-dist +++ b/docker/tt-rss/.env-dist @@ -1,18 +1,8 @@ -# Copy this file to .env before building the container. -# Put any local modifications here. - BUILD_TAG=latest - POSTGRES_USER=postgres POSTGRES_PASSWORD=password - OWNER_UID=1000 OWNER_GID=1000 - -# You can keep this as localhost unless you want to use the ssl sidecar -# container (I suggest terminating ssl on the reverse proxy instead). HTTP_HOST=localhost - -# You will likely need to set this to the correct value, see README.md -# for more information. -SELF_URL_PATH=http://localhost:8280/tt-rss +SELF_URL_PATH=https://rss.reekynet.com +HTTP_PORT=8280 From 6dd6d660dfa100ca510a0be22e1729f1ffb57810 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 10:59:24 +0300 Subject: [PATCH 0378/2667] Small changes --- docker/tt-rss/.env-dist | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/docker/tt-rss/.env-dist b/docker/tt-rss/.env-dist index 1ea7ab13..fa38dad3 100644 --- a/docker/tt-rss/.env-dist +++ b/docker/tt-rss/.env-dist @@ -1,18 +1,8 @@ -# Copy this file to .env before building the container. -# Put any local modifications here. - BUILD_TAG=latest - POSTGRES_USER=postgres POSTGRES_PASSWORD=password - OWNER_UID=1000 OWNER_GID=1000 - -# You can keep this as localhost unless you want to use the ssl sidecar -# container (I suggest terminating ssl on the reverse proxy instead). HTTP_HOST=localhost - -# You will likely need to set this to the correct value, see README.md -# for more information. -SELF_URL_PATH=http://localhost:8280/tt-rss +SELF_URL_PATH=https://rss.reekynet.com +HTTP_PORT=8280 From a274d7356b247b8dda08c693fdeffc6f09e8e045 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:02:01 +0300 Subject: [PATCH 0379/2667] Fix GID --- docker/tt-rss/.env-dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/tt-rss/.env-dist b/docker/tt-rss/.env-dist index fa38dad3..7d5414f7 100644 --- a/docker/tt-rss/.env-dist +++ b/docker/tt-rss/.env-dist @@ -2,7 +2,7 @@ BUILD_TAG=latest POSTGRES_USER=postgres POSTGRES_PASSWORD=password OWNER_UID=1000 -OWNER_GID=1000 +OWNER_GID=985 HTTP_HOST=localhost SELF_URL_PATH=https://rss.reekynet.com HTTP_PORT=8280 From af93bdf66058aee85f2d6dbe34191c592f963cca Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:02:01 +0300 Subject: [PATCH 0380/2667] Fix GID --- docker/tt-rss/.env-dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/tt-rss/.env-dist b/docker/tt-rss/.env-dist index fa38dad3..7d5414f7 100644 --- a/docker/tt-rss/.env-dist +++ b/docker/tt-rss/.env-dist @@ -2,7 +2,7 @@ BUILD_TAG=latest POSTGRES_USER=postgres POSTGRES_PASSWORD=password OWNER_UID=1000 -OWNER_GID=1000 +OWNER_GID=985 HTTP_HOST=localhost SELF_URL_PATH=https://rss.reekynet.com HTTP_PORT=8280 From 249262483cf0d14be56c186872b40f18e7e0a766 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:04:29 +0300 Subject: [PATCH 0381/2667] Add networks --- docker/tt-rss/docker-compose.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml index c908dcee..90ae8a96 100644 --- a/docker/tt-rss/docker-compose.yml +++ b/docker/tt-rss/docker-compose.yml @@ -9,6 +9,8 @@ services: environment: - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_USER=${POSTGRES_USER} + networks: + - tt-rss tt-rss-app: image: cthulhoo/ttrss-fpm-pgsql-static @@ -26,6 +28,8 @@ services: - /docker/tt-rss/app:/var/www/html depends_on: - tt-rss-db + networks: + - tt-rss tt-rss-updater: image: cthulhoo/ttrss-fpm-pgsql-static @@ -44,6 +48,8 @@ services: depends_on: - tt-rss-app command: /updater.sh + networks: + - tt-rss tt-rss-web: image: cthulhoo/ttrss-web @@ -54,6 +60,9 @@ services: - /docker/tt-rss/app:/var/www/html:ro depends_on: - tt-rss-app + networks: + - tt-rss + - proxy labels: - "traefik.enable=true" @@ -69,3 +78,9 @@ services: - "traefik.http.routers.tt-rss.service=tt-rss" - "traefik.docker.network=proxy" - "traefik.http.services.tt-rss.loadbalancer.server.port=8280" + +networks: + tt-rss: + external: false + proxy: + external: true From bf870de435b1e81e029abd4aa637a0f929006b49 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:04:29 +0300 Subject: [PATCH 0382/2667] Add networks --- docker/tt-rss/docker-compose.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml index c908dcee..90ae8a96 100644 --- a/docker/tt-rss/docker-compose.yml +++ b/docker/tt-rss/docker-compose.yml @@ -9,6 +9,8 @@ services: environment: - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_USER=${POSTGRES_USER} + networks: + - tt-rss tt-rss-app: image: cthulhoo/ttrss-fpm-pgsql-static @@ -26,6 +28,8 @@ services: - /docker/tt-rss/app:/var/www/html depends_on: - tt-rss-db + networks: + - tt-rss tt-rss-updater: image: cthulhoo/ttrss-fpm-pgsql-static @@ -44,6 +48,8 @@ services: depends_on: - tt-rss-app command: /updater.sh + networks: + - tt-rss tt-rss-web: image: cthulhoo/ttrss-web @@ -54,6 +60,9 @@ services: - /docker/tt-rss/app:/var/www/html:ro depends_on: - tt-rss-app + networks: + - tt-rss + - proxy labels: - "traefik.enable=true" @@ -69,3 +78,9 @@ services: - "traefik.http.routers.tt-rss.service=tt-rss" - "traefik.docker.network=proxy" - "traefik.http.services.tt-rss.loadbalancer.server.port=8280" + +networks: + tt-rss: + external: false + proxy: + external: true From 1bc0815dd4f393667ab42d87566e6242801bd31d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:07:51 +0300 Subject: [PATCH 0383/2667] Added new rebase option --- home/.gitconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.gitconfig b/home/.gitconfig index 423e9f15..7074f04b 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -6,9 +6,11 @@ [commit] signoff = true gpgsign = true + [tag] gpgSign = true signoff = true + [format] signoff = true @@ -21,5 +23,9 @@ [diff] prompt = false tool = nvim-diff + [difftool "nvim-diff"] cmd = nvim -d -c 'set nomodifiable' + +[pull] + rebase = false From a761409cefa1ba66898be31dd3dcd65a7d4f8a55 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:07:51 +0300 Subject: [PATCH 0384/2667] Added new rebase option --- home/.gitconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.gitconfig b/home/.gitconfig index 423e9f15..7074f04b 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -6,9 +6,11 @@ [commit] signoff = true gpgsign = true + [tag] gpgSign = true signoff = true + [format] signoff = true @@ -21,5 +23,9 @@ [diff] prompt = false tool = nvim-diff + [difftool "nvim-diff"] cmd = nvim -d -c 'set nomodifiable' + +[pull] + rebase = false From c8f5a9819c2ce5807190d622b9e4f46e8571ffd8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:12:45 +0300 Subject: [PATCH 0385/2667] Add container names --- docker/tt-rss/docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml index 90ae8a96..d8ecdbb5 100644 --- a/docker/tt-rss/docker-compose.yml +++ b/docker/tt-rss/docker-compose.yml @@ -2,6 +2,7 @@ version: "3" services: tt-rss-db: + container_name: tt-rss-db image: postgres:12-alpine restart: unless-stopped volumes: @@ -13,6 +14,7 @@ services: - tt-rss tt-rss-app: + container_name: tt-rss-app image: cthulhoo/ttrss-fpm-pgsql-static restart: unless-stopped environment: @@ -32,6 +34,7 @@ services: - tt-rss tt-rss-updater: + container_name: tt-rss-updater image: cthulhoo/ttrss-fpm-pgsql-static restart: unless-stopped environment: @@ -52,6 +55,7 @@ services: - tt-rss tt-rss-web: + container_name: tt-rss-web image: cthulhoo/ttrss-web restart: unless-stopped ports: From 2fe179099f63f2605dc04a7a863b120167d34e83 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:12:45 +0300 Subject: [PATCH 0386/2667] Add container names --- docker/tt-rss/docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml index 90ae8a96..d8ecdbb5 100644 --- a/docker/tt-rss/docker-compose.yml +++ b/docker/tt-rss/docker-compose.yml @@ -2,6 +2,7 @@ version: "3" services: tt-rss-db: + container_name: tt-rss-db image: postgres:12-alpine restart: unless-stopped volumes: @@ -13,6 +14,7 @@ services: - tt-rss tt-rss-app: + container_name: tt-rss-app image: cthulhoo/ttrss-fpm-pgsql-static restart: unless-stopped environment: @@ -32,6 +34,7 @@ services: - tt-rss tt-rss-updater: + container_name: tt-rss-updater image: cthulhoo/ttrss-fpm-pgsql-static restart: unless-stopped environment: @@ -52,6 +55,7 @@ services: - tt-rss tt-rss-web: + container_name: tt-rss-web image: cthulhoo/ttrss-web restart: unless-stopped ports: From 4c62b31767e6495a01fde156c91e9098ce540ec6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:21:20 +0300 Subject: [PATCH 0387/2667] Renamed db volume --- docker/tt-rss/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml index d8ecdbb5..4cedc285 100644 --- a/docker/tt-rss/docker-compose.yml +++ b/docker/tt-rss/docker-compose.yml @@ -6,7 +6,7 @@ services: image: postgres:12-alpine restart: unless-stopped volumes: - - /docker/tt-rss/postgresql:/var/lib/postgresql/data + - /docker/tt-rss/db:/var/lib/postgresql/data environment: - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_USER=${POSTGRES_USER} From 27a940264b6ac0ed4aab0bcca6d2f7b2763ccd37 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:21:20 +0300 Subject: [PATCH 0388/2667] Renamed db volume --- docker/tt-rss/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml index d8ecdbb5..4cedc285 100644 --- a/docker/tt-rss/docker-compose.yml +++ b/docker/tt-rss/docker-compose.yml @@ -6,7 +6,7 @@ services: image: postgres:12-alpine restart: unless-stopped volumes: - - /docker/tt-rss/postgresql:/var/lib/postgresql/data + - /docker/tt-rss/db:/var/lib/postgresql/data environment: - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_USER=${POSTGRES_USER} From 0f58c30fcaeb1d8b20e1e83138199b884a7adbb9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:26:25 +0300 Subject: [PATCH 0389/2667] Small fixes --- docker/tt-rss/{.env-dist => .env} | 0 docker/tt-rss/docker-compose.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename docker/tt-rss/{.env-dist => .env} (100%) diff --git a/docker/tt-rss/.env-dist b/docker/tt-rss/.env similarity index 100% rename from docker/tt-rss/.env-dist rename to docker/tt-rss/.env diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml index 4cedc285..1616cafc 100644 --- a/docker/tt-rss/docker-compose.yml +++ b/docker/tt-rss/docker-compose.yml @@ -59,7 +59,7 @@ services: image: cthulhoo/ttrss-web restart: unless-stopped ports: - - 8280:2015 + - ${HTTP_PORT}:2015 volumes: - /docker/tt-rss/app:/var/www/html:ro depends_on: From 9d74f42f96ebc5abea5f98127ae2e173b8b058fb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:26:25 +0300 Subject: [PATCH 0390/2667] Small fixes --- docker/tt-rss/{.env-dist => .env} | 0 docker/tt-rss/docker-compose.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename docker/tt-rss/{.env-dist => .env} (100%) diff --git a/docker/tt-rss/.env-dist b/docker/tt-rss/.env similarity index 100% rename from docker/tt-rss/.env-dist rename to docker/tt-rss/.env diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml index 4cedc285..1616cafc 100644 --- a/docker/tt-rss/docker-compose.yml +++ b/docker/tt-rss/docker-compose.yml @@ -59,7 +59,7 @@ services: image: cthulhoo/ttrss-web restart: unless-stopped ports: - - 8280:2015 + - ${HTTP_PORT}:2015 volumes: - /docker/tt-rss/app:/var/www/html:ro depends_on: From 4e6ecd32310fffc97e5e7c2f622517ea417211f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:32:36 +0300 Subject: [PATCH 0391/2667] Fix container names --- docker/tt-rss/docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml index 1616cafc..c22dc5f8 100644 --- a/docker/tt-rss/docker-compose.yml +++ b/docker/tt-rss/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - tt-rss-db: + db: container_name: tt-rss-db image: postgres:12-alpine restart: unless-stopped @@ -13,7 +13,7 @@ services: networks: - tt-rss - tt-rss-app: + app: container_name: tt-rss-app image: cthulhoo/ttrss-fpm-pgsql-static restart: unless-stopped @@ -33,7 +33,7 @@ services: networks: - tt-rss - tt-rss-updater: + updater: container_name: tt-rss-updater image: cthulhoo/ttrss-fpm-pgsql-static restart: unless-stopped @@ -54,7 +54,7 @@ services: networks: - tt-rss - tt-rss-web: + web: container_name: tt-rss-web image: cthulhoo/ttrss-web restart: unless-stopped From acd7873899c1a96829f875f9f5e76192690a5dfb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:32:36 +0300 Subject: [PATCH 0392/2667] Fix container names --- docker/tt-rss/docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml index 1616cafc..c22dc5f8 100644 --- a/docker/tt-rss/docker-compose.yml +++ b/docker/tt-rss/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - tt-rss-db: + db: container_name: tt-rss-db image: postgres:12-alpine restart: unless-stopped @@ -13,7 +13,7 @@ services: networks: - tt-rss - tt-rss-app: + app: container_name: tt-rss-app image: cthulhoo/ttrss-fpm-pgsql-static restart: unless-stopped @@ -33,7 +33,7 @@ services: networks: - tt-rss - tt-rss-updater: + updater: container_name: tt-rss-updater image: cthulhoo/ttrss-fpm-pgsql-static restart: unless-stopped @@ -54,7 +54,7 @@ services: networks: - tt-rss - tt-rss-web: + web: container_name: tt-rss-web image: cthulhoo/ttrss-web restart: unless-stopped From ee20b4a7b6eb4e9dfd37f874d20eb2ac68e85c10 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:34:42 +0300 Subject: [PATCH 0393/2667] Fix depends --- docker/tt-rss/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml index c22dc5f8..c4e7bb45 100644 --- a/docker/tt-rss/docker-compose.yml +++ b/docker/tt-rss/docker-compose.yml @@ -29,7 +29,7 @@ services: volumes: - /docker/tt-rss/app:/var/www/html depends_on: - - tt-rss-db + - db networks: - tt-rss @@ -49,7 +49,7 @@ services: volumes: - /docker/tt-rss/app:/var/www/html depends_on: - - tt-rss-app + - app command: /updater.sh networks: - tt-rss @@ -63,7 +63,7 @@ services: volumes: - /docker/tt-rss/app:/var/www/html:ro depends_on: - - tt-rss-app + - app networks: - tt-rss - proxy From c7de6ce5c59221d1fb4d5a25c2fe824468b8a187 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:34:42 +0300 Subject: [PATCH 0394/2667] Fix depends --- docker/tt-rss/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml index c22dc5f8..c4e7bb45 100644 --- a/docker/tt-rss/docker-compose.yml +++ b/docker/tt-rss/docker-compose.yml @@ -29,7 +29,7 @@ services: volumes: - /docker/tt-rss/app:/var/www/html depends_on: - - tt-rss-db + - db networks: - tt-rss @@ -49,7 +49,7 @@ services: volumes: - /docker/tt-rss/app:/var/www/html depends_on: - - tt-rss-app + - app command: /updater.sh networks: - tt-rss @@ -63,7 +63,7 @@ services: volumes: - /docker/tt-rss/app:/var/www/html:ro depends_on: - - tt-rss-app + - app networks: - tt-rss - proxy From 6aaa73dfdf1b33cbf59a960508220aaff7878bcc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jun 2020 15:06:09 +0300 Subject: [PATCH 0395/2667] Added nvidia HW acceleration --- docker/jellyfin/docker-compose.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 12344cc2..fb46cfd7 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -5,6 +5,8 @@ services: container_name: jellyfin environment: - TZ=Europe/Helsinki + - NVIDIA_VISIBLE_DEVICES=all + - NVIDIA_DRIVER_CAPABILITIES=all user: "1000:985" ports: - "8096:8096" From 794250db3b9de3986a4f5f44102b96cfef8e094a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jun 2020 15:06:09 +0300 Subject: [PATCH 0396/2667] Added nvidia HW acceleration --- docker/jellyfin/docker-compose.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 12344cc2..fb46cfd7 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -5,6 +5,8 @@ services: container_name: jellyfin environment: - TZ=Europe/Helsinki + - NVIDIA_VISIBLE_DEVICES=all + - NVIDIA_DRIVER_CAPABILITIES=all user: "1000:985" ports: - "8096:8096" From 6c58c58a513296f60b5aff2100df4042550501f1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jun 2020 15:28:40 +0300 Subject: [PATCH 0397/2667] Remove nvidia hwaccel --- docker/jellyfin/docker-compose.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index fb46cfd7..12344cc2 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -5,8 +5,6 @@ services: container_name: jellyfin environment: - TZ=Europe/Helsinki - - NVIDIA_VISIBLE_DEVICES=all - - NVIDIA_DRIVER_CAPABILITIES=all user: "1000:985" ports: - "8096:8096" From e55e17b669894a26890ad35f33adaa93a84e0ea4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jun 2020 15:28:40 +0300 Subject: [PATCH 0398/2667] Remove nvidia hwaccel --- docker/jellyfin/docker-compose.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index fb46cfd7..12344cc2 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -5,8 +5,6 @@ services: container_name: jellyfin environment: - TZ=Europe/Helsinki - - NVIDIA_VISIBLE_DEVICES=all - - NVIDIA_DRIVER_CAPABILITIES=all user: "1000:985" ports: - "8096:8096" From 9b65ff59fe6b738e4d6ccb22445e2e84371e884a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 11:21:34 +0300 Subject: [PATCH 0399/2667] Switch to newsblur --- .gitmodules | 3 + docker/{tt-rss => newsblur}/.env | 0 docker/newsblur/NewsBlur | 1 + docker/newsblur/docker-compose.yml | 75 +++++++++++++++++++++++++ docker/tt-rss/docker-compose.yml | 90 ------------------------------ 5 files changed, 79 insertions(+), 90 deletions(-) rename docker/{tt-rss => newsblur}/.env (100%) create mode 160000 docker/newsblur/NewsBlur create mode 100644 docker/newsblur/docker-compose.yml delete mode 100644 docker/tt-rss/docker-compose.yml diff --git a/.gitmodules b/.gitmodules index 674e4c51..9aee77b0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "dotdrop"] path = dotdrop url = https://github.com/deadc0de6/dotdrop.git +[submodule "docker/newsblur/NewsBlur"] + path = docker/newsblur/NewsBlur + url = https://github.com/samuelclay/NewsBlur.git diff --git a/docker/tt-rss/.env b/docker/newsblur/.env similarity index 100% rename from docker/tt-rss/.env rename to docker/newsblur/.env diff --git a/docker/newsblur/NewsBlur b/docker/newsblur/NewsBlur new file mode 160000 index 00000000..d0f15ab1 --- /dev/null +++ b/docker/newsblur/NewsBlur @@ -0,0 +1 @@ +Subproject commit d0f15ab141b5a51db38a7947e3e484cd366fac07 diff --git a/docker/newsblur/docker-compose.yml b/docker/newsblur/docker-compose.yml new file mode 100644 index 00000000..dc74a931 --- /dev/null +++ b/docker/newsblur/docker-compose.yml @@ -0,0 +1,75 @@ +version: "2" +services: + newsblur: + container_name: newsblur + build: + context: . + dockerfile: docker/Dockerfile + image: newsblur + links: + - mongo-nb + - postgres-nb + - elasticsearch-nb + - redis-nb + ports: + - "8000:8000" + networks: + - proxy + - newsblur + + postgres-nb: + container_name: postgres-nb + image: postgres:9 + environment: + - POSTGRES_USER=newsblur + - POSTGRES_PASSWORD=newsblur + ports: + - "5432:5432" + volumes: + - "/docker/newsblur/postgres/entrypoint:/docker-entrypoint-initdb.d" + - "/docker/newsblur/postgres/data:/var/lib/postgresql/data" + networks: + - newsblur + + redis-nb: + container_name: redis-nb + image: redis:3 + ports: + - "6379:6379" + volumes: + - "/docker/newsblur/redis/data:/data" + - "/docker/newsblur/redis/redis.conf:/usr/local/etc/redis_server.conf" + - "/docker/newsblur/redis/redis_server.conf:/etc/redis_server.conf" + - "/docker/newsblur/redis/redis.var.lib:/var/lib/redis" + command: /usr/local/bin/redis-server /usr/local/etc/redis_server.conf + networks: + - newsblur + + elasticsearch-nb: + container_name: elasticsearch-nb + image: elasticsearch:1.7 + ports: + - "9200:9200" + volumes: + - "/docker/newsblur/elasticsearch:/usr/share/elasticsearch/data" + networks: + - newsblur + + mongo-nb: + image: mongo:3.2 + ports: + - "27017:27017" + command: mongod --smallfiles + volumes: + - "/docker/newsblur/mongo:/data/db" + networks: + - newsblur + +networks: + proxy: + external: true + newsblur: + driver: bridge + ipam: + driver: default + internal: true diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml deleted file mode 100644 index c4e7bb45..00000000 --- a/docker/tt-rss/docker-compose.yml +++ /dev/null @@ -1,90 +0,0 @@ -version: "3" - -services: - db: - container_name: tt-rss-db - image: postgres:12-alpine - restart: unless-stopped - volumes: - - /docker/tt-rss/db:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - - POSTGRES_USER=${POSTGRES_USER} - networks: - - tt-rss - - app: - container_name: tt-rss-app - image: cthulhoo/ttrss-fpm-pgsql-static - restart: unless-stopped - environment: - - DB_TYPE=pgsql - - DB_HOST=tt-rss-db - - DB_NAME=${POSTGRES_USER} - - DB_USER=${POSTGRES_USER} - - DB_PASS=${POSTGRES_PASSWORD} - - OWNER_UID=${OWNER_UID} - - OWNER_GID=${OWNER_GID} - - SELF_URL_PATH=${SELF_URL_PATH} - volumes: - - /docker/tt-rss/app:/var/www/html - depends_on: - - db - networks: - - tt-rss - - updater: - container_name: tt-rss-updater - image: cthulhoo/ttrss-fpm-pgsql-static - restart: unless-stopped - environment: - - DB_TYPE=pgsql - - DB_HOST=tt-rss-db - - DB_NAME=${POSTGRES_USER} - - DB_USER=${POSTGRES_USER} - - DB_PASS=${POSTGRES_PASSWORD} - - OWNER_UID=${OWNER_UID} - - OWNER_GID=${OWNER_GID} - - SELF_URL_PATH=${SELF_URL_PATH} - volumes: - - /docker/tt-rss/app:/var/www/html - depends_on: - - app - command: /updater.sh - networks: - - tt-rss - - web: - container_name: tt-rss-web - image: cthulhoo/ttrss-web - restart: unless-stopped - ports: - - ${HTTP_PORT}:2015 - volumes: - - /docker/tt-rss/app:/var/www/html:ro - depends_on: - - app - networks: - - tt-rss - - proxy - labels: - - "traefik.enable=true" - - - "traefik.http.routers.tt-rss-redirect.entrypoints=http" - - "traefik.http.routers.tt-rss-redirect.rule=Host(`rss.reekynet.com`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.tt-rss-redirect.middlewares=http2https" - - - "traefik.http.routers.tt-rss.entrypoints=https" - - "traefik.http.routers.tt-rss.rule=Host(`rss.reekynet.com`)" - - "traefik.http.routers.tt-rss.tls=true" - - "traefik.http.routers.tt-rss.tls.certresolver=http" - - "traefik.http.routers.tt-rss.service=tt-rss" - - "traefik.docker.network=proxy" - - "traefik.http.services.tt-rss.loadbalancer.server.port=8280" - -networks: - tt-rss: - external: false - proxy: - external: true From 4821ee8e01b22d4475b969813020d60bdc4da0ef Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 11:21:34 +0300 Subject: [PATCH 0400/2667] Switch to newsblur --- .gitmodules | 3 + docker/{tt-rss => newsblur}/.env | 0 docker/newsblur/NewsBlur | 1 + docker/newsblur/docker-compose.yml | 75 +++++++++++++++++++++++++ docker/tt-rss/docker-compose.yml | 90 ------------------------------ 5 files changed, 79 insertions(+), 90 deletions(-) rename docker/{tt-rss => newsblur}/.env (100%) create mode 160000 docker/newsblur/NewsBlur create mode 100644 docker/newsblur/docker-compose.yml delete mode 100644 docker/tt-rss/docker-compose.yml diff --git a/.gitmodules b/.gitmodules index 674e4c51..9aee77b0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "dotdrop"] path = dotdrop url = https://github.com/deadc0de6/dotdrop.git +[submodule "docker/newsblur/NewsBlur"] + path = docker/newsblur/NewsBlur + url = https://github.com/samuelclay/NewsBlur.git diff --git a/docker/tt-rss/.env b/docker/newsblur/.env similarity index 100% rename from docker/tt-rss/.env rename to docker/newsblur/.env diff --git a/docker/newsblur/NewsBlur b/docker/newsblur/NewsBlur new file mode 160000 index 00000000..d0f15ab1 --- /dev/null +++ b/docker/newsblur/NewsBlur @@ -0,0 +1 @@ +Subproject commit d0f15ab141b5a51db38a7947e3e484cd366fac07 diff --git a/docker/newsblur/docker-compose.yml b/docker/newsblur/docker-compose.yml new file mode 100644 index 00000000..dc74a931 --- /dev/null +++ b/docker/newsblur/docker-compose.yml @@ -0,0 +1,75 @@ +version: "2" +services: + newsblur: + container_name: newsblur + build: + context: . + dockerfile: docker/Dockerfile + image: newsblur + links: + - mongo-nb + - postgres-nb + - elasticsearch-nb + - redis-nb + ports: + - "8000:8000" + networks: + - proxy + - newsblur + + postgres-nb: + container_name: postgres-nb + image: postgres:9 + environment: + - POSTGRES_USER=newsblur + - POSTGRES_PASSWORD=newsblur + ports: + - "5432:5432" + volumes: + - "/docker/newsblur/postgres/entrypoint:/docker-entrypoint-initdb.d" + - "/docker/newsblur/postgres/data:/var/lib/postgresql/data" + networks: + - newsblur + + redis-nb: + container_name: redis-nb + image: redis:3 + ports: + - "6379:6379" + volumes: + - "/docker/newsblur/redis/data:/data" + - "/docker/newsblur/redis/redis.conf:/usr/local/etc/redis_server.conf" + - "/docker/newsblur/redis/redis_server.conf:/etc/redis_server.conf" + - "/docker/newsblur/redis/redis.var.lib:/var/lib/redis" + command: /usr/local/bin/redis-server /usr/local/etc/redis_server.conf + networks: + - newsblur + + elasticsearch-nb: + container_name: elasticsearch-nb + image: elasticsearch:1.7 + ports: + - "9200:9200" + volumes: + - "/docker/newsblur/elasticsearch:/usr/share/elasticsearch/data" + networks: + - newsblur + + mongo-nb: + image: mongo:3.2 + ports: + - "27017:27017" + command: mongod --smallfiles + volumes: + - "/docker/newsblur/mongo:/data/db" + networks: + - newsblur + +networks: + proxy: + external: true + newsblur: + driver: bridge + ipam: + driver: default + internal: true diff --git a/docker/tt-rss/docker-compose.yml b/docker/tt-rss/docker-compose.yml deleted file mode 100644 index c4e7bb45..00000000 --- a/docker/tt-rss/docker-compose.yml +++ /dev/null @@ -1,90 +0,0 @@ -version: "3" - -services: - db: - container_name: tt-rss-db - image: postgres:12-alpine - restart: unless-stopped - volumes: - - /docker/tt-rss/db:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - - POSTGRES_USER=${POSTGRES_USER} - networks: - - tt-rss - - app: - container_name: tt-rss-app - image: cthulhoo/ttrss-fpm-pgsql-static - restart: unless-stopped - environment: - - DB_TYPE=pgsql - - DB_HOST=tt-rss-db - - DB_NAME=${POSTGRES_USER} - - DB_USER=${POSTGRES_USER} - - DB_PASS=${POSTGRES_PASSWORD} - - OWNER_UID=${OWNER_UID} - - OWNER_GID=${OWNER_GID} - - SELF_URL_PATH=${SELF_URL_PATH} - volumes: - - /docker/tt-rss/app:/var/www/html - depends_on: - - db - networks: - - tt-rss - - updater: - container_name: tt-rss-updater - image: cthulhoo/ttrss-fpm-pgsql-static - restart: unless-stopped - environment: - - DB_TYPE=pgsql - - DB_HOST=tt-rss-db - - DB_NAME=${POSTGRES_USER} - - DB_USER=${POSTGRES_USER} - - DB_PASS=${POSTGRES_PASSWORD} - - OWNER_UID=${OWNER_UID} - - OWNER_GID=${OWNER_GID} - - SELF_URL_PATH=${SELF_URL_PATH} - volumes: - - /docker/tt-rss/app:/var/www/html - depends_on: - - app - command: /updater.sh - networks: - - tt-rss - - web: - container_name: tt-rss-web - image: cthulhoo/ttrss-web - restart: unless-stopped - ports: - - ${HTTP_PORT}:2015 - volumes: - - /docker/tt-rss/app:/var/www/html:ro - depends_on: - - app - networks: - - tt-rss - - proxy - labels: - - "traefik.enable=true" - - - "traefik.http.routers.tt-rss-redirect.entrypoints=http" - - "traefik.http.routers.tt-rss-redirect.rule=Host(`rss.reekynet.com`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.tt-rss-redirect.middlewares=http2https" - - - "traefik.http.routers.tt-rss.entrypoints=https" - - "traefik.http.routers.tt-rss.rule=Host(`rss.reekynet.com`)" - - "traefik.http.routers.tt-rss.tls=true" - - "traefik.http.routers.tt-rss.tls.certresolver=http" - - "traefik.http.routers.tt-rss.service=tt-rss" - - "traefik.docker.network=proxy" - - "traefik.http.services.tt-rss.loadbalancer.server.port=8280" - -networks: - tt-rss: - external: false - proxy: - external: true From 5cb1a0805220eade8f53dffb2791277ce53b1788 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 11:23:53 +0300 Subject: [PATCH 0401/2667] Remove unneeded directory --- docker/newsblur/NewsBlur | 1 - 1 file changed, 1 deletion(-) delete mode 160000 docker/newsblur/NewsBlur diff --git a/docker/newsblur/NewsBlur b/docker/newsblur/NewsBlur deleted file mode 160000 index d0f15ab1..00000000 --- a/docker/newsblur/NewsBlur +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d0f15ab141b5a51db38a7947e3e484cd366fac07 From 00ef02f104b18befd6c0cebd654d0757be38062b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 11:23:53 +0300 Subject: [PATCH 0402/2667] Remove unneeded directory --- docker/newsblur/NewsBlur | 1 - 1 file changed, 1 deletion(-) delete mode 160000 docker/newsblur/NewsBlur diff --git a/docker/newsblur/NewsBlur b/docker/newsblur/NewsBlur deleted file mode 160000 index d0f15ab1..00000000 --- a/docker/newsblur/NewsBlur +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d0f15ab141b5a51db38a7947e3e484cd366fac07 From 4692f764e8843582ed6e0e4b7cd9087484d22a5b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:02:51 +0300 Subject: [PATCH 0403/2667] Switch to freshrss --- .gitmodules | 3 -- docker/freshrss/docker-compose.yml | 14 ++++++ docker/newsblur/.env | 8 ---- docker/newsblur/docker-compose.yml | 75 ------------------------------ 4 files changed, 14 insertions(+), 86 deletions(-) create mode 100644 docker/freshrss/docker-compose.yml delete mode 100644 docker/newsblur/.env delete mode 100644 docker/newsblur/docker-compose.yml diff --git a/.gitmodules b/.gitmodules index 9aee77b0..674e4c51 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "dotdrop"] path = dotdrop url = https://github.com/deadc0de6/dotdrop.git -[submodule "docker/newsblur/NewsBlur"] - path = docker/newsblur/NewsBlur - url = https://github.com/samuelclay/NewsBlur.git diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml new file mode 100644 index 00000000..e6a4ef8b --- /dev/null +++ b/docker/freshrss/docker-compose.yml @@ -0,0 +1,14 @@ +version: "2.1" +services: + freshrss: + image: linuxserver/freshrss + container_name: freshrss + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/Helsinki + volumes: + - "/docker/freshrss:/config" + ports: + - 8088:80 + restart: unless-stopped diff --git a/docker/newsblur/.env b/docker/newsblur/.env deleted file mode 100644 index 7d5414f7..00000000 --- a/docker/newsblur/.env +++ /dev/null @@ -1,8 +0,0 @@ -BUILD_TAG=latest -POSTGRES_USER=postgres -POSTGRES_PASSWORD=password -OWNER_UID=1000 -OWNER_GID=985 -HTTP_HOST=localhost -SELF_URL_PATH=https://rss.reekynet.com -HTTP_PORT=8280 diff --git a/docker/newsblur/docker-compose.yml b/docker/newsblur/docker-compose.yml deleted file mode 100644 index dc74a931..00000000 --- a/docker/newsblur/docker-compose.yml +++ /dev/null @@ -1,75 +0,0 @@ -version: "2" -services: - newsblur: - container_name: newsblur - build: - context: . - dockerfile: docker/Dockerfile - image: newsblur - links: - - mongo-nb - - postgres-nb - - elasticsearch-nb - - redis-nb - ports: - - "8000:8000" - networks: - - proxy - - newsblur - - postgres-nb: - container_name: postgres-nb - image: postgres:9 - environment: - - POSTGRES_USER=newsblur - - POSTGRES_PASSWORD=newsblur - ports: - - "5432:5432" - volumes: - - "/docker/newsblur/postgres/entrypoint:/docker-entrypoint-initdb.d" - - "/docker/newsblur/postgres/data:/var/lib/postgresql/data" - networks: - - newsblur - - redis-nb: - container_name: redis-nb - image: redis:3 - ports: - - "6379:6379" - volumes: - - "/docker/newsblur/redis/data:/data" - - "/docker/newsblur/redis/redis.conf:/usr/local/etc/redis_server.conf" - - "/docker/newsblur/redis/redis_server.conf:/etc/redis_server.conf" - - "/docker/newsblur/redis/redis.var.lib:/var/lib/redis" - command: /usr/local/bin/redis-server /usr/local/etc/redis_server.conf - networks: - - newsblur - - elasticsearch-nb: - container_name: elasticsearch-nb - image: elasticsearch:1.7 - ports: - - "9200:9200" - volumes: - - "/docker/newsblur/elasticsearch:/usr/share/elasticsearch/data" - networks: - - newsblur - - mongo-nb: - image: mongo:3.2 - ports: - - "27017:27017" - command: mongod --smallfiles - volumes: - - "/docker/newsblur/mongo:/data/db" - networks: - - newsblur - -networks: - proxy: - external: true - newsblur: - driver: bridge - ipam: - driver: default - internal: true From 94bfc8da66c17cb2151cbb6a3c10f36aec1c3579 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:02:51 +0300 Subject: [PATCH 0404/2667] Switch to freshrss --- .gitmodules | 3 -- docker/freshrss/docker-compose.yml | 14 ++++++ docker/newsblur/.env | 8 ---- docker/newsblur/docker-compose.yml | 75 ------------------------------ 4 files changed, 14 insertions(+), 86 deletions(-) create mode 100644 docker/freshrss/docker-compose.yml delete mode 100644 docker/newsblur/.env delete mode 100644 docker/newsblur/docker-compose.yml diff --git a/.gitmodules b/.gitmodules index 9aee77b0..674e4c51 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "dotdrop"] path = dotdrop url = https://github.com/deadc0de6/dotdrop.git -[submodule "docker/newsblur/NewsBlur"] - path = docker/newsblur/NewsBlur - url = https://github.com/samuelclay/NewsBlur.git diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml new file mode 100644 index 00000000..e6a4ef8b --- /dev/null +++ b/docker/freshrss/docker-compose.yml @@ -0,0 +1,14 @@ +version: "2.1" +services: + freshrss: + image: linuxserver/freshrss + container_name: freshrss + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/Helsinki + volumes: + - "/docker/freshrss:/config" + ports: + - 8088:80 + restart: unless-stopped diff --git a/docker/newsblur/.env b/docker/newsblur/.env deleted file mode 100644 index 7d5414f7..00000000 --- a/docker/newsblur/.env +++ /dev/null @@ -1,8 +0,0 @@ -BUILD_TAG=latest -POSTGRES_USER=postgres -POSTGRES_PASSWORD=password -OWNER_UID=1000 -OWNER_GID=985 -HTTP_HOST=localhost -SELF_URL_PATH=https://rss.reekynet.com -HTTP_PORT=8280 diff --git a/docker/newsblur/docker-compose.yml b/docker/newsblur/docker-compose.yml deleted file mode 100644 index dc74a931..00000000 --- a/docker/newsblur/docker-compose.yml +++ /dev/null @@ -1,75 +0,0 @@ -version: "2" -services: - newsblur: - container_name: newsblur - build: - context: . - dockerfile: docker/Dockerfile - image: newsblur - links: - - mongo-nb - - postgres-nb - - elasticsearch-nb - - redis-nb - ports: - - "8000:8000" - networks: - - proxy - - newsblur - - postgres-nb: - container_name: postgres-nb - image: postgres:9 - environment: - - POSTGRES_USER=newsblur - - POSTGRES_PASSWORD=newsblur - ports: - - "5432:5432" - volumes: - - "/docker/newsblur/postgres/entrypoint:/docker-entrypoint-initdb.d" - - "/docker/newsblur/postgres/data:/var/lib/postgresql/data" - networks: - - newsblur - - redis-nb: - container_name: redis-nb - image: redis:3 - ports: - - "6379:6379" - volumes: - - "/docker/newsblur/redis/data:/data" - - "/docker/newsblur/redis/redis.conf:/usr/local/etc/redis_server.conf" - - "/docker/newsblur/redis/redis_server.conf:/etc/redis_server.conf" - - "/docker/newsblur/redis/redis.var.lib:/var/lib/redis" - command: /usr/local/bin/redis-server /usr/local/etc/redis_server.conf - networks: - - newsblur - - elasticsearch-nb: - container_name: elasticsearch-nb - image: elasticsearch:1.7 - ports: - - "9200:9200" - volumes: - - "/docker/newsblur/elasticsearch:/usr/share/elasticsearch/data" - networks: - - newsblur - - mongo-nb: - image: mongo:3.2 - ports: - - "27017:27017" - command: mongod --smallfiles - volumes: - - "/docker/newsblur/mongo:/data/db" - networks: - - newsblur - -networks: - proxy: - external: true - newsblur: - driver: bridge - ipam: - driver: default - internal: true From 51063de92f38f58e70370ed274e120e6653975bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:13:51 +0300 Subject: [PATCH 0405/2667] Add network stuff and db --- docker/freshrss/docker-compose.yml | 44 ++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index e6a4ef8b..b0c365cd 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -3,12 +3,50 @@ services: freshrss: image: linuxserver/freshrss container_name: freshrss + restart: unless-stopped + networks: + - freshrss + - proxy + ports: + - 8088:80 environment: - PUID=1000 - PGID=1000 - TZ=Europe/Helsinki volumes: - - "/docker/freshrss:/config" - ports: - - 8088:80 + - /docker/freshrss/freshrss:/config + - /etc/localtime:/etc/localtime:ro + labels: + - "traefik.enable=true" + + - "traefik.http.routers.freshrss-redirect.entrypoints=http" + - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.freshrss-redirect.middlewares=http2https" + + - "traefik.http.routers.freshrss.entrypoints=https" + - "traefik.http.routers.freshrss.rule=Host(`rss.reekynet.com`)" + - "traefik.http.routers.freshrss.tls=true" + - "traefik.http.routers.freshrss.tls.certresolver=http" + - "traefik.http.routers.freshrss.service=freshrss" + - "traefik.docker.network=proxy" + - "traefik.http.services.freshrss.loadbalancer.server.port=3000" + + mariadb-freshrss: + container_name: mariadb-freshrss + image: mariadb restart: unless-stopped + networks: + - freshrss + environment: + - TZ=Europe/Helsinki + - MYSQL_ROOT_PASSWORD=gitea + volumes: + - /docker/freshrss/mariadb:/var/lib/mysql + - /etc/localtime:/etc/localtime:ro + +networks: + freshrss: + external: false + proxy: + external: true From 8816d19522903cf1ebeec955156f6ba58bd735a5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:13:51 +0300 Subject: [PATCH 0406/2667] Add network stuff and db --- docker/freshrss/docker-compose.yml | 44 ++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index e6a4ef8b..b0c365cd 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -3,12 +3,50 @@ services: freshrss: image: linuxserver/freshrss container_name: freshrss + restart: unless-stopped + networks: + - freshrss + - proxy + ports: + - 8088:80 environment: - PUID=1000 - PGID=1000 - TZ=Europe/Helsinki volumes: - - "/docker/freshrss:/config" - ports: - - 8088:80 + - /docker/freshrss/freshrss:/config + - /etc/localtime:/etc/localtime:ro + labels: + - "traefik.enable=true" + + - "traefik.http.routers.freshrss-redirect.entrypoints=http" + - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.freshrss-redirect.middlewares=http2https" + + - "traefik.http.routers.freshrss.entrypoints=https" + - "traefik.http.routers.freshrss.rule=Host(`rss.reekynet.com`)" + - "traefik.http.routers.freshrss.tls=true" + - "traefik.http.routers.freshrss.tls.certresolver=http" + - "traefik.http.routers.freshrss.service=freshrss" + - "traefik.docker.network=proxy" + - "traefik.http.services.freshrss.loadbalancer.server.port=3000" + + mariadb-freshrss: + container_name: mariadb-freshrss + image: mariadb restart: unless-stopped + networks: + - freshrss + environment: + - TZ=Europe/Helsinki + - MYSQL_ROOT_PASSWORD=gitea + volumes: + - /docker/freshrss/mariadb:/var/lib/mysql + - /etc/localtime:/etc/localtime:ro + +networks: + freshrss: + external: false + proxy: + external: true From 48dbfa66c9463868e0da64939d40c7ff9443abf6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:14:15 +0300 Subject: [PATCH 0407/2667] Change db password --- docker/freshrss/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index b0c365cd..3f717f45 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -40,7 +40,7 @@ services: - freshrss environment: - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=gitea + - MYSQL_ROOT_PASSWORD=freshrss volumes: - /docker/freshrss/mariadb:/var/lib/mysql - /etc/localtime:/etc/localtime:ro From f3ee112016ac6463d4fab1ac43d2c4382c02d4e4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:14:15 +0300 Subject: [PATCH 0408/2667] Change db password --- docker/freshrss/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index b0c365cd..3f717f45 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -40,7 +40,7 @@ services: - freshrss environment: - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=gitea + - MYSQL_ROOT_PASSWORD=freshrss volumes: - /docker/freshrss/mariadb:/var/lib/mysql - /etc/localtime:/etc/localtime:ro From 027c4766a628518d6bebd938371836596b0b66d1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:15:18 +0300 Subject: [PATCH 0409/2667] Change port --- docker/freshrss/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 3f717f45..4ae62a10 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -30,7 +30,7 @@ services: - "traefik.http.routers.freshrss.tls.certresolver=http" - "traefik.http.routers.freshrss.service=freshrss" - "traefik.docker.network=proxy" - - "traefik.http.services.freshrss.loadbalancer.server.port=3000" + - "traefik.http.services.freshrss.loadbalancer.server.port=80" mariadb-freshrss: container_name: mariadb-freshrss From 7a27b957fad7996297a53f8a0ddc136aa3dcd64a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:15:18 +0300 Subject: [PATCH 0410/2667] Change port --- docker/freshrss/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 3f717f45..4ae62a10 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -30,7 +30,7 @@ services: - "traefik.http.routers.freshrss.tls.certresolver=http" - "traefik.http.routers.freshrss.service=freshrss" - "traefik.docker.network=proxy" - - "traefik.http.services.freshrss.loadbalancer.server.port=3000" + - "traefik.http.services.freshrss.loadbalancer.server.port=80" mariadb-freshrss: container_name: mariadb-freshrss From c6d6be56d6c5210f7fab7457932789cf3172ad0c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:17:03 +0300 Subject: [PATCH 0411/2667] Update GID --- docker/freshrss/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 4ae62a10..9c071d26 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -11,7 +11,7 @@ services: - 8088:80 environment: - PUID=1000 - - PGID=1000 + - PGID=985 - TZ=Europe/Helsinki volumes: - /docker/freshrss/freshrss:/config From 8daae1002f1532c6e86117c0fcecacd4b6986965 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:17:03 +0300 Subject: [PATCH 0412/2667] Update GID --- docker/freshrss/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 4ae62a10..9c071d26 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -11,7 +11,7 @@ services: - 8088:80 environment: - PUID=1000 - - PGID=1000 + - PGID=985 - TZ=Europe/Helsinki volumes: - /docker/freshrss/freshrss:/config From e75b6c4ec7deb2b3172bf9c886f8fb81e9812d34 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Jul 2020 11:18:16 +0300 Subject: [PATCH 0413/2667] Remove prettier formatonsave --- config-home.yaml | 3 +++ home/.config/nvim/coc-settings.json | 9 +-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/config-home.yaml b/config-home.yaml index e3b5a74b..302c4e8d 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -197,6 +197,9 @@ profiles: - Terminal - Media - Pacman + mko-laptop: + include: + - Terminal Terminal: dotfiles: - f_nvimpager diff --git a/home/.config/nvim/coc-settings.json b/home/.config/nvim/coc-settings.json index 62b68d72..f6b66928 100644 --- a/home/.config/nvim/coc-settings.json +++ b/home/.config/nvim/coc-settings.json @@ -3,14 +3,7 @@ "suggest.noselect": false, "suggest.echodocSupport": true, "suggest.maxCompleteItemCount": 20, - "coc.preferences.formatOnSaveFiletypes": [ - "javascript", - "typescript", - "typescriptreact", - "json", - "javascriptreact", - "yaml" - ], + "coc.preferences.formatOnSaveFiletypes": [], "prettier.singleQuote": false, "diagnostic.errorSign": "•", "diagnostic.warningSign": "•", From c0981d57817d84e1649f708e59b632b3d8d75d75 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Jul 2020 11:18:16 +0300 Subject: [PATCH 0414/2667] Remove prettier formatonsave --- config-home.yaml | 3 +++ home/.config/nvim/coc-settings.json | 9 +-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/config-home.yaml b/config-home.yaml index e3b5a74b..302c4e8d 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -197,6 +197,9 @@ profiles: - Terminal - Media - Pacman + mko-laptop: + include: + - Terminal Terminal: dotfiles: - f_nvimpager diff --git a/home/.config/nvim/coc-settings.json b/home/.config/nvim/coc-settings.json index 62b68d72..f6b66928 100644 --- a/home/.config/nvim/coc-settings.json +++ b/home/.config/nvim/coc-settings.json @@ -3,14 +3,7 @@ "suggest.noselect": false, "suggest.echodocSupport": true, "suggest.maxCompleteItemCount": 20, - "coc.preferences.formatOnSaveFiletypes": [ - "javascript", - "typescript", - "typescriptreact", - "json", - "javascriptreact", - "yaml" - ], + "coc.preferences.formatOnSaveFiletypes": [], "prettier.singleQuote": false, "diagnostic.errorSign": "•", "diagnostic.warningSign": "•", From 036f52248fd468b50bbc70f00cb9c6335af34c1a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:21:32 +0300 Subject: [PATCH 0415/2667] Added mariadb standalone container --- docker/mariadb/docker-compose.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 docker/mariadb/docker-compose.yaml diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml new file mode 100644 index 00000000..3bdbe3ea --- /dev/null +++ b/docker/mariadb/docker-compose.yaml @@ -0,0 +1,16 @@ +mariadb: + container_name: mariadb + image: mariadb + environment: + - TZ=Europe/Helsinki + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + networks: + - mariadb + volumes: + - /docker/mariadb:/var/lib/mysql + - /etc/localtime:/etc/localtime:ro + restart: always + +networks: + mariadb: + external: true From 731ce88fa662fcb751800d2003608a0d260756d0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:21:32 +0300 Subject: [PATCH 0416/2667] Added mariadb standalone container --- docker/mariadb/docker-compose.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 docker/mariadb/docker-compose.yaml diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml new file mode 100644 index 00000000..3bdbe3ea --- /dev/null +++ b/docker/mariadb/docker-compose.yaml @@ -0,0 +1,16 @@ +mariadb: + container_name: mariadb + image: mariadb + environment: + - TZ=Europe/Helsinki + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + networks: + - mariadb + volumes: + - /docker/mariadb:/var/lib/mysql + - /etc/localtime:/etc/localtime:ro + restart: always + +networks: + mariadb: + external: true From 0ddfa65e505412c9d5daff1d592f4450f31c77a1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:24:17 +0300 Subject: [PATCH 0417/2667] Remove init script --- docker/homeautomation/init.sh | 8 -------- 1 file changed, 8 deletions(-) delete mode 100755 docker/homeautomation/init.sh diff --git a/docker/homeautomation/init.sh b/docker/homeautomation/init.sh deleted file mode 100755 index 08b509f6..00000000 --- a/docker/homeautomation/init.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -cat < .env -MYSQL_ROOT_PASSWORD=$(pass reekynet/docker-home-automation | rg 'MYSQL_ROOT_PASSWORD' | cut -d' ' -f2-) -HA_MYSQL_PASSWORD="$(pass reekynet/docker-home-automation | rg 'HA_MYSQL_PASSWORD' | cut -d' ' -f2-) -DECONZ_VNC_PASSWORD=$(pass reekynet/docker-home-automation | rg 'DECONZ_VNC_PASSWORD' | cut -d' ' -f2-) -ENV - -docker-compose up -d From 543bf3be0c492bf64feb81ee22ce01cbed3ae0d5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:24:17 +0300 Subject: [PATCH 0418/2667] Remove init script --- docker/homeautomation/init.sh | 8 -------- 1 file changed, 8 deletions(-) delete mode 100755 docker/homeautomation/init.sh diff --git a/docker/homeautomation/init.sh b/docker/homeautomation/init.sh deleted file mode 100755 index 08b509f6..00000000 --- a/docker/homeautomation/init.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -cat < .env -MYSQL_ROOT_PASSWORD=$(pass reekynet/docker-home-automation | rg 'MYSQL_ROOT_PASSWORD' | cut -d' ' -f2-) -HA_MYSQL_PASSWORD="$(pass reekynet/docker-home-automation | rg 'HA_MYSQL_PASSWORD' | cut -d' ' -f2-) -DECONZ_VNC_PASSWORD=$(pass reekynet/docker-home-automation | rg 'DECONZ_VNC_PASSWORD' | cut -d' ' -f2-) -ENV - -docker-compose up -d From 74366235d11b9d319c044a0bf255580406cfffc8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:27:16 +0300 Subject: [PATCH 0419/2667] Added common gitignore for env --- docker/.gitignore | 1 + docker/homeautomation/.gitignore | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 docker/.gitignore delete mode 100644 docker/homeautomation/.gitignore diff --git a/docker/.gitignore b/docker/.gitignore new file mode 100644 index 00000000..934c1fb2 --- /dev/null +++ b/docker/.gitignore @@ -0,0 +1 @@ +*/.env diff --git a/docker/homeautomation/.gitignore b/docker/homeautomation/.gitignore deleted file mode 100644 index 4c49bd78..00000000 --- a/docker/homeautomation/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.env From 6d4f7373140fbd024c02e33aded61307714c7ee6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:27:16 +0300 Subject: [PATCH 0420/2667] Added common gitignore for env --- docker/.gitignore | 1 + docker/homeautomation/.gitignore | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 docker/.gitignore delete mode 100644 docker/homeautomation/.gitignore diff --git a/docker/.gitignore b/docker/.gitignore new file mode 100644 index 00000000..934c1fb2 --- /dev/null +++ b/docker/.gitignore @@ -0,0 +1 @@ +*/.env diff --git a/docker/homeautomation/.gitignore b/docker/homeautomation/.gitignore deleted file mode 100644 index 4c49bd78..00000000 --- a/docker/homeautomation/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.env From a7bb3c51e72c9acb722ea02fca22af65f2bf6ce2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:30:49 +0300 Subject: [PATCH 0421/2667] Change network name --- docker/mariadb/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml index 3bdbe3ea..5a7bdc7e 100644 --- a/docker/mariadb/docker-compose.yaml +++ b/docker/mariadb/docker-compose.yaml @@ -12,5 +12,5 @@ mariadb: restart: always networks: - mariadb: + db: external: true From 24b192907e14aaf6ce4c90ff7ac65a84a08b02ce Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:30:49 +0300 Subject: [PATCH 0422/2667] Change network name --- docker/mariadb/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml index 3bdbe3ea..5a7bdc7e 100644 --- a/docker/mariadb/docker-compose.yaml +++ b/docker/mariadb/docker-compose.yaml @@ -12,5 +12,5 @@ mariadb: restart: always networks: - mariadb: + db: external: true From f7b779aa6f639f52b2354c6b847f622a35697d35 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:32:00 +0300 Subject: [PATCH 0423/2667] Fix syntax --- docker/mariadb/docker-compose.yaml | 32 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml index 5a7bdc7e..ea276856 100644 --- a/docker/mariadb/docker-compose.yaml +++ b/docker/mariadb/docker-compose.yaml @@ -1,16 +1,18 @@ -mariadb: - container_name: mariadb - image: mariadb - environment: - - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - networks: - - mariadb - volumes: - - /docker/mariadb:/var/lib/mysql - - /etc/localtime:/etc/localtime:ro - restart: always +version: "3" +services: + mariadb: + container_name: mariadb + image: mariadb + environment: + - TZ=Europe/Helsinki + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + networks: + - mariadb + volumes: + - /docker/mariadb:/var/lib/mysql + - /etc/localtime:/etc/localtime:ro + restart: always -networks: - db: - external: true + networks: + db: + external: true From 466cf7f15d92f4ce1997c5631ab4b7757d9382d6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:32:00 +0300 Subject: [PATCH 0424/2667] Fix syntax --- docker/mariadb/docker-compose.yaml | 32 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml index 5a7bdc7e..ea276856 100644 --- a/docker/mariadb/docker-compose.yaml +++ b/docker/mariadb/docker-compose.yaml @@ -1,16 +1,18 @@ -mariadb: - container_name: mariadb - image: mariadb - environment: - - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - networks: - - mariadb - volumes: - - /docker/mariadb:/var/lib/mysql - - /etc/localtime:/etc/localtime:ro - restart: always +version: "3" +services: + mariadb: + container_name: mariadb + image: mariadb + environment: + - TZ=Europe/Helsinki + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + networks: + - mariadb + volumes: + - /docker/mariadb:/var/lib/mysql + - /etc/localtime:/etc/localtime:ro + restart: always -networks: - db: - external: true + networks: + db: + external: true From e41511512d4ece4135590ba23edb57cd873ee17e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:33:26 +0300 Subject: [PATCH 0425/2667] Fix syntax --- docker/mariadb/docker-compose.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml index ea276856..240f56d6 100644 --- a/docker/mariadb/docker-compose.yaml +++ b/docker/mariadb/docker-compose.yaml @@ -13,6 +13,6 @@ services: - /etc/localtime:/etc/localtime:ro restart: always - networks: - db: - external: true +networks: + db: + external: true From b7cd414a41369d453b6516b537ec28ffd236e1ca Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:33:26 +0300 Subject: [PATCH 0426/2667] Fix syntax --- docker/mariadb/docker-compose.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml index ea276856..240f56d6 100644 --- a/docker/mariadb/docker-compose.yaml +++ b/docker/mariadb/docker-compose.yaml @@ -13,6 +13,6 @@ services: - /etc/localtime:/etc/localtime:ro restart: always - networks: - db: - external: true +networks: + db: + external: true From 70c6d8e732206c1e12809c7cf724d80039fd0e8d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:34:04 +0300 Subject: [PATCH 0427/2667] Change network name --- docker/mariadb/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml index 240f56d6..afc637e7 100644 --- a/docker/mariadb/docker-compose.yaml +++ b/docker/mariadb/docker-compose.yaml @@ -14,5 +14,5 @@ services: restart: always networks: - db: + mariadb: external: true From 8109d3f9eac74c8d29fd469955a2b6e70e9c32f8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:34:04 +0300 Subject: [PATCH 0428/2667] Change network name --- docker/mariadb/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml index 240f56d6..afc637e7 100644 --- a/docker/mariadb/docker-compose.yaml +++ b/docker/mariadb/docker-compose.yaml @@ -14,5 +14,5 @@ services: restart: always networks: - db: + mariadb: external: true From 658792a0aefafa5b91bb141f6146f40a1c00bad6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 13:00:48 +0300 Subject: [PATCH 0429/2667] Change hass mariadb to standalone container --- docker/homeautomation/docker-compose.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 332b0821..cf353e6f 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -11,12 +11,12 @@ services: restart: always networks: - home-assistant + - mariadb - proxy ports: - "8123:8123" depends_on: - deconz - - mariadb - mosquitto labels: - "traefik.enable=true" @@ -101,21 +101,10 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.node.loadbalancer.server.port=1880" - mariadb: - container_name: mariadb-hass - image: mariadb - environment: - - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - networks: - - home-assistant - volumes: - - /docker/homeautomation/mariadb:/var/lib/mysql - - /etc/localtime:/etc/localtime:ro - restart: always - networks: home-assistant: external: false + mariadb: + external: true proxy: external: true From 82fa54bbed2496c2c38b2789ef8f54a8e39d3e66 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 13:00:48 +0300 Subject: [PATCH 0430/2667] Change hass mariadb to standalone container --- docker/homeautomation/docker-compose.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 332b0821..cf353e6f 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -11,12 +11,12 @@ services: restart: always networks: - home-assistant + - mariadb - proxy ports: - "8123:8123" depends_on: - deconz - - mariadb - mosquitto labels: - "traefik.enable=true" @@ -101,21 +101,10 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.node.loadbalancer.server.port=1880" - mariadb: - container_name: mariadb-hass - image: mariadb - environment: - - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - networks: - - home-assistant - volumes: - - /docker/homeautomation/mariadb:/var/lib/mysql - - /etc/localtime:/etc/localtime:ro - restart: always - networks: home-assistant: external: false + mariadb: + external: true proxy: external: true From 57bc1e1145ff704f9242f54349ab1250b1502c7e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 13:36:40 +0300 Subject: [PATCH 0431/2667] Small fix --- docker/gitea/docker-compose.yaml | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index ac8684ce..369764b3 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -9,21 +9,20 @@ services: - USER_UID=1000 - USER_GID=1000 - DB_TYPE=mysql - - DB_HOST=mariadb-gitea:3306 + - DB_HOST=mariadb:3306 - DB_NAME=gitea - DB_USER=gitea - - DB_PASSWD=gitea + - DB_PASSWD=${MYSQL_PASS} restart: always networks: - gitea + - mariadb - proxy ports: - "3000:3000" - "222:22" - depends_on: - - mariadb-gitea volumes: - - /docker/gitea/gitea:/data + - /docker/gitea:/data - /etc/localtime:/etc/localtime:ro labels: - "traefik.enable=true" @@ -41,21 +40,10 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.gitea.loadbalancer.server.port=3000" - mariadb-gitea: - container_name: mariadb-gitea - image: mariadb - restart: always - networks: - - gitea - environment: - - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=gitea - volumes: - - /docker/gitea/mariadb:/var/lib/mysql - - /etc/localtime:/etc/localtime:ro - networks: gitea: external: false + mariadb: + external: true proxy: external: true From 6bde663d0310aad1d50f3e2ce9acfc89030a062f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 13:36:40 +0300 Subject: [PATCH 0432/2667] Small fix --- docker/gitea/docker-compose.yaml | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index ac8684ce..369764b3 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -9,21 +9,20 @@ services: - USER_UID=1000 - USER_GID=1000 - DB_TYPE=mysql - - DB_HOST=mariadb-gitea:3306 + - DB_HOST=mariadb:3306 - DB_NAME=gitea - DB_USER=gitea - - DB_PASSWD=gitea + - DB_PASSWD=${MYSQL_PASS} restart: always networks: - gitea + - mariadb - proxy ports: - "3000:3000" - "222:22" - depends_on: - - mariadb-gitea volumes: - - /docker/gitea/gitea:/data + - /docker/gitea:/data - /etc/localtime:/etc/localtime:ro labels: - "traefik.enable=true" @@ -41,21 +40,10 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.gitea.loadbalancer.server.port=3000" - mariadb-gitea: - container_name: mariadb-gitea - image: mariadb - restart: always - networks: - - gitea - environment: - - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=gitea - volumes: - - /docker/gitea/mariadb:/var/lib/mysql - - /etc/localtime:/etc/localtime:ro - networks: gitea: external: false + mariadb: + external: true proxy: external: true From 811419bfe873acb63e14b687882625d3ac508dc9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 13:45:05 +0300 Subject: [PATCH 0433/2667] Change nextcloud to standalone mariadb --- docker/nextcloud/docker-compose.yml | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index 9a85368e..250c1824 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -9,9 +9,10 @@ services: - "1869:80" networks: - nextcloud + - mariadb - proxy volumes: - - /docker/nextcloud/nextcloud:/var/www/html + - /docker/nextcloud:/var/www/html - /mnt/Storage/Nextcloud:/var/www/html/data - /mnt/Storage/Syncthing:/Syncthing - /mnt/Storage/Media/Music:/Music @@ -21,7 +22,6 @@ services: - MYSQL_HOST=mariadb-nextcloud - REDIS_HOST=redis depends_on: - - mariadb-nextcloud - redis labels: - "traefik.enable=true" @@ -39,20 +39,6 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.nextcloud.loadbalancer.server.port=80" - mariadb-nextcloud: - container_name: mariadb-nextcloud - image: mariadb - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW - restart: always - networks: - - nextcloud - environment: - - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=nextcloud - volumes: - - /docker/nextcloud/mariadb:/var/lib/mysql - - /etc/localtime:/etc/localtime:ro - redis: image: redis:alpine container_name: redis @@ -65,7 +51,7 @@ services: container_name: cron restart: always volumes: - - /docker/nextcloud/nextcloud:/var/www/html + - /docker/nextcloud:/var/www/html entrypoint: /cron.sh depends_on: - mariadb-nextcloud @@ -74,5 +60,7 @@ services: networks: nextcloud: external: false + mariadb: + external: true proxy: external: true From f348349405eb490b9983d2e7cf56155095e08064 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 13:45:05 +0300 Subject: [PATCH 0434/2667] Change nextcloud to standalone mariadb --- docker/nextcloud/docker-compose.yml | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index 9a85368e..250c1824 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -9,9 +9,10 @@ services: - "1869:80" networks: - nextcloud + - mariadb - proxy volumes: - - /docker/nextcloud/nextcloud:/var/www/html + - /docker/nextcloud:/var/www/html - /mnt/Storage/Nextcloud:/var/www/html/data - /mnt/Storage/Syncthing:/Syncthing - /mnt/Storage/Media/Music:/Music @@ -21,7 +22,6 @@ services: - MYSQL_HOST=mariadb-nextcloud - REDIS_HOST=redis depends_on: - - mariadb-nextcloud - redis labels: - "traefik.enable=true" @@ -39,20 +39,6 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.nextcloud.loadbalancer.server.port=80" - mariadb-nextcloud: - container_name: mariadb-nextcloud - image: mariadb - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW - restart: always - networks: - - nextcloud - environment: - - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=nextcloud - volumes: - - /docker/nextcloud/mariadb:/var/lib/mysql - - /etc/localtime:/etc/localtime:ro - redis: image: redis:alpine container_name: redis @@ -65,7 +51,7 @@ services: container_name: cron restart: always volumes: - - /docker/nextcloud/nextcloud:/var/www/html + - /docker/nextcloud:/var/www/html entrypoint: /cron.sh depends_on: - mariadb-nextcloud @@ -74,5 +60,7 @@ services: networks: nextcloud: external: false + mariadb: + external: true proxy: external: true From 668faaf4fdf8f9483a8079d294657ca293ffecb7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 13:52:37 +0300 Subject: [PATCH 0435/2667] Remove depends --- docker/nextcloud/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index 250c1824..087e0a6e 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -54,7 +54,6 @@ services: - /docker/nextcloud:/var/www/html entrypoint: /cron.sh depends_on: - - mariadb-nextcloud - redis networks: From 908cce8a3aa38a30e9e0536f22e4b2527406a718 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 13:52:37 +0300 Subject: [PATCH 0436/2667] Remove depends --- docker/nextcloud/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index 250c1824..087e0a6e 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -54,7 +54,6 @@ services: - /docker/nextcloud:/var/www/html entrypoint: /cron.sh depends_on: - - mariadb-nextcloud - redis networks: From bda3299f1e299e055ed0bb386af89ddedb59ea3f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 14:00:27 +0300 Subject: [PATCH 0437/2667] Move freshrss to standalone mariadb --- docker/freshrss/docker-compose.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 9c071d26..6e6750d9 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -6,6 +6,7 @@ services: restart: unless-stopped networks: - freshrss + - mariadb - proxy ports: - 8088:80 @@ -14,7 +15,7 @@ services: - PGID=985 - TZ=Europe/Helsinki volumes: - - /docker/freshrss/freshrss:/config + - /docker/freshrss:/config - /etc/localtime:/etc/localtime:ro labels: - "traefik.enable=true" @@ -32,21 +33,10 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.freshrss.loadbalancer.server.port=80" - mariadb-freshrss: - container_name: mariadb-freshrss - image: mariadb - restart: unless-stopped - networks: - - freshrss - environment: - - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=freshrss - volumes: - - /docker/freshrss/mariadb:/var/lib/mysql - - /etc/localtime:/etc/localtime:ro - networks: freshrss: external: false + mariadb: + external: true proxy: external: true From 7fe16d336569cc44ef567d4a9d8800f313350ee7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 14:00:27 +0300 Subject: [PATCH 0438/2667] Move freshrss to standalone mariadb --- docker/freshrss/docker-compose.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 9c071d26..6e6750d9 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -6,6 +6,7 @@ services: restart: unless-stopped networks: - freshrss + - mariadb - proxy ports: - 8088:80 @@ -14,7 +15,7 @@ services: - PGID=985 - TZ=Europe/Helsinki volumes: - - /docker/freshrss/freshrss:/config + - /docker/freshrss:/config - /etc/localtime:/etc/localtime:ro labels: - "traefik.enable=true" @@ -32,21 +33,10 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.freshrss.loadbalancer.server.port=80" - mariadb-freshrss: - container_name: mariadb-freshrss - image: mariadb - restart: unless-stopped - networks: - - freshrss - environment: - - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=freshrss - volumes: - - /docker/freshrss/mariadb:/var/lib/mysql - - /etc/localtime:/etc/localtime:ro - networks: freshrss: external: false + mariadb: + external: true proxy: external: true From 97efc3ae7499b5296721a6751dff6be7b2cc065e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 14:15:50 +0300 Subject: [PATCH 0439/2667] Add server mariadb access alias --- home/.config/zsh/03-aliases.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 09dca871..bfd19362 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -4,6 +4,9 @@ alias gac='ga && gc' alias gpull='git pull' alias gpush='git push' +# Access server mariadb +alias moria-mariadb='ssh -tt moria docker exec -it mariadb mysql -p' + # Syntax highlighting cat if output is a terminal cat() { # Check if output is a terminal, else use regular cat @@ -278,3 +281,4 @@ btw, () { ▟███▀▘ ▝▀███▙ ▟▛▀ ▀▜▙" } + From 1a1a829ddfecc8f5e4a710354a87ffe047bce734 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 14:15:50 +0300 Subject: [PATCH 0440/2667] Add server mariadb access alias --- home/.config/zsh/03-aliases.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 09dca871..bfd19362 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -4,6 +4,9 @@ alias gac='ga && gc' alias gpull='git pull' alias gpush='git push' +# Access server mariadb +alias moria-mariadb='ssh -tt moria docker exec -it mariadb mysql -p' + # Syntax highlighting cat if output is a terminal cat() { # Check if output is a terminal, else use regular cat @@ -278,3 +281,4 @@ btw, () { ▟███▀▘ ▝▀███▙ ▟▛▀ ▀▜▙" } + From 8e0f439765d668923cd5d64626a63734a709dd0d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 14:24:47 +0300 Subject: [PATCH 0441/2667] Restart containers unless stopped --- docker/gitea/docker-compose.yaml | 2 +- docker/jellyfin/docker-compose.yaml | 2 +- docker/mariadb/docker-compose.yaml | 2 +- docker/matterbridge/docker-compose.yaml | 2 +- docker/mumble/docker-compose.yaml | 2 +- docker/portainer/docker-compose.yaml | 2 +- docker/tvheadend/docker-compose.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 369764b3..7a02733b 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -13,7 +13,7 @@ services: - DB_NAME=gitea - DB_USER=gitea - DB_PASSWD=${MYSQL_PASS} - restart: always + restart: unless-stopped networks: - gitea - mariadb diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 12344cc2..54521321 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -10,7 +10,7 @@ services: - "8096:8096" networks: - proxy - restart: always + restart: unless-stopped volumes: - /docker/jellyfin/config:/config - /docker/jellyfin/cache:/cache diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml index afc637e7..e09fa124 100644 --- a/docker/mariadb/docker-compose.yaml +++ b/docker/mariadb/docker-compose.yaml @@ -11,7 +11,7 @@ services: volumes: - /docker/mariadb:/var/lib/mysql - /etc/localtime:/etc/localtime:ro - restart: always + restart: unless-stopped networks: mariadb: diff --git a/docker/matterbridge/docker-compose.yaml b/docker/matterbridge/docker-compose.yaml index 13e12bd0..35588ef0 100644 --- a/docker/matterbridge/docker-compose.yaml +++ b/docker/matterbridge/docker-compose.yaml @@ -3,6 +3,6 @@ services: matterbridge: image: 42wim/matterbridge:stable container_name: matterbridge - restart: always + restart: unless-stopped volumes: - /docker/matterbridge:/etc/matterbridge diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml index 163f08aa..aaebe2e1 100644 --- a/docker/mumble/docker-compose.yaml +++ b/docker/mumble/docker-compose.yaml @@ -11,4 +11,4 @@ services: volumes: - /docker/mumble:/etc/mumble - /etc/localtime:/etc/localtime:ro - restart: always + restart: unless-stopped diff --git a/docker/portainer/docker-compose.yaml b/docker/portainer/docker-compose.yaml index 76ffaccd..36bab854 100644 --- a/docker/portainer/docker-compose.yaml +++ b/docker/portainer/docker-compose.yaml @@ -5,7 +5,7 @@ services: container_name: portainer environment: - TZ=Europe/Helsinki - restart: always + restart: unless-stopped networks: - proxy volumes: diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 0c6edcda..e72db84a 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -17,4 +17,4 @@ services: devices: - /dev/dri:/dev/dri #hardware acceleration - /dev/dvb:/dev/dvb #tuner card - restart: always + restart: unless-stopped From 8ebf1663e3e5c01dd92911753e15ea6be36c2cbb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 14:24:47 +0300 Subject: [PATCH 0442/2667] Restart containers unless stopped --- docker/gitea/docker-compose.yaml | 2 +- docker/jellyfin/docker-compose.yaml | 2 +- docker/mariadb/docker-compose.yaml | 2 +- docker/matterbridge/docker-compose.yaml | 2 +- docker/mumble/docker-compose.yaml | 2 +- docker/portainer/docker-compose.yaml | 2 +- docker/tvheadend/docker-compose.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 369764b3..7a02733b 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -13,7 +13,7 @@ services: - DB_NAME=gitea - DB_USER=gitea - DB_PASSWD=${MYSQL_PASS} - restart: always + restart: unless-stopped networks: - gitea - mariadb diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 12344cc2..54521321 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -10,7 +10,7 @@ services: - "8096:8096" networks: - proxy - restart: always + restart: unless-stopped volumes: - /docker/jellyfin/config:/config - /docker/jellyfin/cache:/cache diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml index afc637e7..e09fa124 100644 --- a/docker/mariadb/docker-compose.yaml +++ b/docker/mariadb/docker-compose.yaml @@ -11,7 +11,7 @@ services: volumes: - /docker/mariadb:/var/lib/mysql - /etc/localtime:/etc/localtime:ro - restart: always + restart: unless-stopped networks: mariadb: diff --git a/docker/matterbridge/docker-compose.yaml b/docker/matterbridge/docker-compose.yaml index 13e12bd0..35588ef0 100644 --- a/docker/matterbridge/docker-compose.yaml +++ b/docker/matterbridge/docker-compose.yaml @@ -3,6 +3,6 @@ services: matterbridge: image: 42wim/matterbridge:stable container_name: matterbridge - restart: always + restart: unless-stopped volumes: - /docker/matterbridge:/etc/matterbridge diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml index 163f08aa..aaebe2e1 100644 --- a/docker/mumble/docker-compose.yaml +++ b/docker/mumble/docker-compose.yaml @@ -11,4 +11,4 @@ services: volumes: - /docker/mumble:/etc/mumble - /etc/localtime:/etc/localtime:ro - restart: always + restart: unless-stopped diff --git a/docker/portainer/docker-compose.yaml b/docker/portainer/docker-compose.yaml index 76ffaccd..36bab854 100644 --- a/docker/portainer/docker-compose.yaml +++ b/docker/portainer/docker-compose.yaml @@ -5,7 +5,7 @@ services: container_name: portainer environment: - TZ=Europe/Helsinki - restart: always + restart: unless-stopped networks: - proxy volumes: diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 0c6edcda..e72db84a 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -17,4 +17,4 @@ services: devices: - /dev/dri:/dev/dri #hardware acceleration - /dev/dvb:/dev/dvb #tuner card - restart: always + restart: unless-stopped From 0e159b31f63f3b2896bc86f25c0b30292ea0c74c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 11:29:58 +0300 Subject: [PATCH 0443/2667] Fix node-red traefik label --- docker/homeautomation/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index cf353e6f..87c25ccf 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -99,7 +99,7 @@ services: - "traefik.http.routers.node-red.tls.certresolver=http" - "traefik.http.routers.node-red.service=node-red" - "traefik.docker.network=proxy" - - "traefik.http.services.node.loadbalancer.server.port=1880" + - "traefik.http.services.node-red.loadbalancer.server.port=1880" networks: home-assistant: From 3a8dc03148b72c8793317db7ae5684fc1e05a6f4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 11:29:58 +0300 Subject: [PATCH 0444/2667] Fix node-red traefik label --- docker/homeautomation/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index cf353e6f..87c25ccf 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -99,7 +99,7 @@ services: - "traefik.http.routers.node-red.tls.certresolver=http" - "traefik.http.routers.node-red.service=node-red" - "traefik.docker.network=proxy" - - "traefik.http.services.node.loadbalancer.server.port=1880" + - "traefik.http.services.node-red.loadbalancer.server.port=1880" networks: home-assistant: From 1206448e3f8bab68bb55be480c9b2fab14adef8c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 11:59:30 +0300 Subject: [PATCH 0445/2667] Add pi-hole --- docker/pi-hole/docker-compose.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 docker/pi-hole/docker-compose.yml diff --git a/docker/pi-hole/docker-compose.yml b/docker/pi-hole/docker-compose.yml new file mode 100644 index 00000000..f493a269 --- /dev/null +++ b/docker/pi-hole/docker-compose.yml @@ -0,0 +1,27 @@ +version: "3" + +services: + pihole: + container_name: pihole + image: pihole/pihole:latest + ports: + - "53:53/tcp" + - "53:53/udp" + - "67:67/udp" + - "8069:80/tcp" + - "443:443/tcp" + environment: + TZ: "Europe/Helsinki" + WEBPASSWORD: "${WEBPASSWORD}" + # Volumes store your data between container upgrades + volumes: + - "/docker/pi-hole/pi-hole:/etc/pihole/" + - "/docker/pi-hole/dnsmasq:/etc/dnsmasq.d/" + dns: + - 127.0.0.1 + - 1.1.1.1 + # Recommended but not required (DHCP needs NET_ADMIN) + # https://github.com/pi-hole/docker-pi-hole#note-on-capabilities + cap_add: + - NET_ADMIN + restart: unless-stopped From b9517b4c024c0ced6030f69e937ddb336804d5d6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 11:59:30 +0300 Subject: [PATCH 0446/2667] Add pi-hole --- docker/pi-hole/docker-compose.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 docker/pi-hole/docker-compose.yml diff --git a/docker/pi-hole/docker-compose.yml b/docker/pi-hole/docker-compose.yml new file mode 100644 index 00000000..f493a269 --- /dev/null +++ b/docker/pi-hole/docker-compose.yml @@ -0,0 +1,27 @@ +version: "3" + +services: + pihole: + container_name: pihole + image: pihole/pihole:latest + ports: + - "53:53/tcp" + - "53:53/udp" + - "67:67/udp" + - "8069:80/tcp" + - "443:443/tcp" + environment: + TZ: "Europe/Helsinki" + WEBPASSWORD: "${WEBPASSWORD}" + # Volumes store your data between container upgrades + volumes: + - "/docker/pi-hole/pi-hole:/etc/pihole/" + - "/docker/pi-hole/dnsmasq:/etc/dnsmasq.d/" + dns: + - 127.0.0.1 + - 1.1.1.1 + # Recommended but not required (DHCP needs NET_ADMIN) + # https://github.com/pi-hole/docker-pi-hole#note-on-capabilities + cap_add: + - NET_ADMIN + restart: unless-stopped From 46a0455a266e0f1f903d336502386b4328a22587 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 12:01:46 +0300 Subject: [PATCH 0447/2667] Rename pi-hole -> pihole --- docker/{pi-hole => pihole}/docker-compose.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) rename docker/{pi-hole => pihole}/docker-compose.yml (67%) diff --git a/docker/pi-hole/docker-compose.yml b/docker/pihole/docker-compose.yml similarity index 67% rename from docker/pi-hole/docker-compose.yml rename to docker/pihole/docker-compose.yml index f493a269..8c72d08d 100644 --- a/docker/pi-hole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -13,15 +13,14 @@ services: environment: TZ: "Europe/Helsinki" WEBPASSWORD: "${WEBPASSWORD}" - # Volumes store your data between container upgrades volumes: - - "/docker/pi-hole/pi-hole:/etc/pihole/" - - "/docker/pi-hole/dnsmasq:/etc/dnsmasq.d/" + - "/docker/pihole/pihole:/etc/pihole/" + - "/docker/pihole/dnsmasq:/etc/dnsmasq.d/" dns: - 127.0.0.1 - 1.1.1.1 # Recommended but not required (DHCP needs NET_ADMIN) - # https://github.com/pi-hole/docker-pi-hole#note-on-capabilities + # https://github.com/pihole/docker-pihole#note-on-capabilities cap_add: - NET_ADMIN restart: unless-stopped From ee5b40ac9da38c667ef598009750727da82da744 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 12:01:46 +0300 Subject: [PATCH 0448/2667] Rename pi-hole -> pihole --- docker/{pi-hole => pihole}/docker-compose.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) rename docker/{pi-hole => pihole}/docker-compose.yml (67%) diff --git a/docker/pi-hole/docker-compose.yml b/docker/pihole/docker-compose.yml similarity index 67% rename from docker/pi-hole/docker-compose.yml rename to docker/pihole/docker-compose.yml index f493a269..8c72d08d 100644 --- a/docker/pi-hole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -13,15 +13,14 @@ services: environment: TZ: "Europe/Helsinki" WEBPASSWORD: "${WEBPASSWORD}" - # Volumes store your data between container upgrades volumes: - - "/docker/pi-hole/pi-hole:/etc/pihole/" - - "/docker/pi-hole/dnsmasq:/etc/dnsmasq.d/" + - "/docker/pihole/pihole:/etc/pihole/" + - "/docker/pihole/dnsmasq:/etc/dnsmasq.d/" dns: - 127.0.0.1 - 1.1.1.1 # Recommended but not required (DHCP needs NET_ADMIN) - # https://github.com/pi-hole/docker-pi-hole#note-on-capabilities + # https://github.com/pihole/docker-pihole#note-on-capabilities cap_add: - NET_ADMIN restart: unless-stopped From 7a4f314d2c6d0ec89c28ecdf0cd4c78b23c889c3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 12:03:24 +0300 Subject: [PATCH 0449/2667] Change port --- docker/pihole/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index 8c72d08d..f31c4096 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -9,7 +9,7 @@ services: - "53:53/udp" - "67:67/udp" - "8069:80/tcp" - - "443:443/tcp" + - "8070:443/tcp" environment: TZ: "Europe/Helsinki" WEBPASSWORD: "${WEBPASSWORD}" From d14f802f396cac6d8e2cb174402a2456d0a46740 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 12:03:24 +0300 Subject: [PATCH 0450/2667] Change port --- docker/pihole/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index 8c72d08d..f31c4096 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -9,7 +9,7 @@ services: - "53:53/udp" - "67:67/udp" - "8069:80/tcp" - - "443:443/tcp" + - "8070:443/tcp" environment: TZ: "Europe/Helsinki" WEBPASSWORD: "${WEBPASSWORD}" From 08a0c4e4b8b48577bc4ef64aa4a576190ca67a9d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 13:23:18 +0300 Subject: [PATCH 0451/2667] Add pihole to traefik --- docker/pihole/docker-compose.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index f31c4096..c5d49580 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -24,3 +24,18 @@ services: cap_add: - NET_ADMIN restart: unless-stopped + labels: + - "traefik.enable=true" + + - "traefik.http.routers.pihole-redirect.entrypoints=http" + - "traefik.http.routers.pihole-redirect.rule=Host(`pihole.reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.pihole-redirect.middlewares=http2https" + + - "traefik.http.routers.pihole.entrypoints=https" + - "traefik.http.routers.pihole.rule=Host(`pihole.reekynet.com`)" + - "traefik.http.routers.pihole.tls=true" + - "traefik.http.routers.pihole.tls.certresolver=http" + - "traefik.http.routers.pihole.service=pihole" + - "traefik.docker.network=proxy" + - "traefik.http.services.pihole.loadbalancer.server.port=8069" From bfa7a1b99b8147b4c8187d3c879ebbfd5c621942 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 13:23:18 +0300 Subject: [PATCH 0452/2667] Add pihole to traefik --- docker/pihole/docker-compose.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index f31c4096..c5d49580 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -24,3 +24,18 @@ services: cap_add: - NET_ADMIN restart: unless-stopped + labels: + - "traefik.enable=true" + + - "traefik.http.routers.pihole-redirect.entrypoints=http" + - "traefik.http.routers.pihole-redirect.rule=Host(`pihole.reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.pihole-redirect.middlewares=http2https" + + - "traefik.http.routers.pihole.entrypoints=https" + - "traefik.http.routers.pihole.rule=Host(`pihole.reekynet.com`)" + - "traefik.http.routers.pihole.tls=true" + - "traefik.http.routers.pihole.tls.certresolver=http" + - "traefik.http.routers.pihole.service=pihole" + - "traefik.docker.network=proxy" + - "traefik.http.services.pihole.loadbalancer.server.port=8069" From 5a72b4b6d41c54de600ddf051a01f5d366028faf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 13:27:17 +0300 Subject: [PATCH 0453/2667] Add networks --- docker/pihole/docker-compose.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index c5d49580..7ed771bb 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -10,6 +10,8 @@ services: - "67:67/udp" - "8069:80/tcp" - "8070:443/tcp" + networks: + - proxy environment: TZ: "Europe/Helsinki" WEBPASSWORD: "${WEBPASSWORD}" @@ -39,3 +41,9 @@ services: - "traefik.http.routers.pihole.service=pihole" - "traefik.docker.network=proxy" - "traefik.http.services.pihole.loadbalancer.server.port=8069" + +networks: + pihole: + external: false + proxy: + external: true From b2afc34ea37a808cb90288e7124ccf1ce41c76b0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 13:27:17 +0300 Subject: [PATCH 0454/2667] Add networks --- docker/pihole/docker-compose.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index c5d49580..7ed771bb 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -10,6 +10,8 @@ services: - "67:67/udp" - "8069:80/tcp" - "8070:443/tcp" + networks: + - proxy environment: TZ: "Europe/Helsinki" WEBPASSWORD: "${WEBPASSWORD}" @@ -39,3 +41,9 @@ services: - "traefik.http.routers.pihole.service=pihole" - "traefik.docker.network=proxy" - "traefik.http.services.pihole.loadbalancer.server.port=8069" + +networks: + pihole: + external: false + proxy: + external: true From 167d60b0faa3744f0fb4ce007a3f979c5db071b3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 13:28:02 +0300 Subject: [PATCH 0455/2667] Remove unneeded network --- docker/pihole/docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index 7ed771bb..27854dcf 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -43,7 +43,5 @@ services: - "traefik.http.services.pihole.loadbalancer.server.port=8069" networks: - pihole: - external: false proxy: external: true From 0666124f401152b639eaf5aebe2eaae5b1f849e9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 13:28:02 +0300 Subject: [PATCH 0456/2667] Remove unneeded network --- docker/pihole/docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index 7ed771bb..27854dcf 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -43,7 +43,5 @@ services: - "traefik.http.services.pihole.loadbalancer.server.port=8069" networks: - pihole: - external: false proxy: external: true From 7609b5e50ccb072efde84dee8e5f0ac8d0a3e29d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 13:32:27 +0300 Subject: [PATCH 0457/2667] Fix traefik port on pihole --- docker/pihole/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index 27854dcf..0decdb90 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -40,7 +40,7 @@ services: - "traefik.http.routers.pihole.tls.certresolver=http" - "traefik.http.routers.pihole.service=pihole" - "traefik.docker.network=proxy" - - "traefik.http.services.pihole.loadbalancer.server.port=8069" + - "traefik.http.services.pihole.loadbalancer.server.port=80" networks: proxy: From eb0505c848da18fdd5381ab1c0f82278ecb5cd23 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 13:32:27 +0300 Subject: [PATCH 0458/2667] Fix traefik port on pihole --- docker/pihole/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index 27854dcf..0decdb90 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -40,7 +40,7 @@ services: - "traefik.http.routers.pihole.tls.certresolver=http" - "traefik.http.routers.pihole.service=pihole" - "traefik.docker.network=proxy" - - "traefik.http.services.pihole.loadbalancer.server.port=8069" + - "traefik.http.services.pihole.loadbalancer.server.port=80" networks: proxy: From 71e80785bc964c36940ac5515748032f2f8f58f6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 13:45:12 +0300 Subject: [PATCH 0459/2667] Add hostname for pihole --- docker/pihole/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index 0decdb90..2e4092b6 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -3,6 +3,7 @@ version: "3" services: pihole: container_name: pihole + hostname: pihole.reekynet.com image: pihole/pihole:latest ports: - "53:53/tcp" From 1abd2a40a33ae8ddd462b90b0bd98d0004df6dfe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 13:45:12 +0300 Subject: [PATCH 0460/2667] Add hostname for pihole --- docker/pihole/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index 0decdb90..2e4092b6 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -3,6 +3,7 @@ version: "3" services: pihole: container_name: pihole + hostname: pihole.reekynet.com image: pihole/pihole:latest ports: - "53:53/tcp" From 30dee6d34533eac19b035032338f9722882d013a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 14:03:41 +0300 Subject: [PATCH 0461/2667] Remove hostname --- docker/pihole/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index 2e4092b6..0decdb90 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -3,7 +3,6 @@ version: "3" services: pihole: container_name: pihole - hostname: pihole.reekynet.com image: pihole/pihole:latest ports: - "53:53/tcp" From eafb70c69e4d240dd6185aadf2602d3cdfe17bc8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 14:03:41 +0300 Subject: [PATCH 0462/2667] Remove hostname --- docker/pihole/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index 2e4092b6..0decdb90 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -3,7 +3,6 @@ version: "3" services: pihole: container_name: pihole - hostname: pihole.reekynet.com image: pihole/pihole:latest ports: - "53:53/tcp" From 85b851ec42e06090eb38154ac62bc7ffe0919306 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 14:04:53 +0300 Subject: [PATCH 0463/2667] Remove unneeded port --- docker/pihole/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index 0decdb90..bce339bf 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -9,7 +9,6 @@ services: - "53:53/udp" - "67:67/udp" - "8069:80/tcp" - - "8070:443/tcp" networks: - proxy environment: From 52a3ff6fda4aee729a1481563b553daf1a587cdd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 14:04:53 +0300 Subject: [PATCH 0464/2667] Remove unneeded port --- docker/pihole/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index 0decdb90..bce339bf 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -9,7 +9,6 @@ services: - "53:53/udp" - "67:67/udp" - "8069:80/tcp" - - "8070:443/tcp" networks: - proxy environment: From 9afc9425e84ab119382f798914f5315dc11cc85a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Jul 2020 16:08:30 +0300 Subject: [PATCH 0465/2667] Add coc-java --- home/.config/nvim/conf.d/01-plugins.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/conf.d/01-plugins.vim b/home/.config/nvim/conf.d/01-plugins.vim index 650e8552..ba2fa574 100644 --- a/home/.config/nvim/conf.d/01-plugins.vim +++ b/home/.config/nvim/conf.d/01-plugins.vim @@ -18,6 +18,7 @@ let g:coc_global_extensions = [ \ 'coc-rust-analyzer', \ 'coc-markdownlint', \ 'coc-snippets', + \ 'coc-java' \ ] call plug#begin() From 1249e2731f7116d55b0cefb09f34984093417b5d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Jul 2020 16:08:30 +0300 Subject: [PATCH 0466/2667] Add coc-java --- home/.config/nvim/conf.d/01-plugins.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/conf.d/01-plugins.vim b/home/.config/nvim/conf.d/01-plugins.vim index 650e8552..ba2fa574 100644 --- a/home/.config/nvim/conf.d/01-plugins.vim +++ b/home/.config/nvim/conf.d/01-plugins.vim @@ -18,6 +18,7 @@ let g:coc_global_extensions = [ \ 'coc-rust-analyzer', \ 'coc-markdownlint', \ 'coc-snippets', + \ 'coc-java' \ ] call plug#begin() From 0abcfeac78d9d0f22e84828e72249a650a8961e0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 8 Aug 2020 00:56:21 +0300 Subject: [PATCH 0467/2667] Small fixes --- home/.config/alacritty/alacritty.yml | 5 ++--- root/boot/loader/entries/arch-lts.conf | 10 +++++----- root/boot/loader/entries/arch.conf | 10 +++++----- root/boot/loader/loader.conf | 3 +++ root/etc/pacserve/pacserve.service.conf | 0 5 files changed, 15 insertions(+), 13 deletions(-) create mode 100755 root/boot/loader/loader.conf mode change 100644 => 100755 root/etc/pacserve/pacserve.service.conf diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml index 33b45f18..5574fc86 100644 --- a/home/.config/alacritty/alacritty.yml +++ b/home/.config/alacritty/alacritty.yml @@ -6,6 +6,7 @@ window: x: 30 y: 20 dynamic_padding: false + dynamic_title: true decorations: full scrolling: @@ -58,7 +59,7 @@ colors: cyan: "0x56b6c2" white: "0x5c6370" -visual_bell: +bell: animation: EaseOutExpo duration: 0 color: "#ffffff" @@ -79,8 +80,6 @@ selection: semantic_escape_chars: ',│`|:"'' ()[]{}<>' save_to_clipboard: false -dynamic_title: true - cursor: style: Block unfocused_hollow: true diff --git a/root/boot/loader/entries/arch-lts.conf b/root/boot/loader/entries/arch-lts.conf index 428dcba6..7cd59828 100755 --- a/root/boot/loader/entries/arch-lts.conf +++ b/root/boot/loader/entries/arch-lts.conf @@ -1,5 +1,5 @@ -title Arch Linux (LTS) -initrd /amd-ucode.img -initrd /initramfs-linux-lts.img -linux /vmlinuz-linux-lts -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet splash vga=current idle=nomwait +title Arch Linux +linux /vmlinuz-linux-lts +initrd /amd-ucode.img +initrd /initramfs-linux-lts.img +options cryptdevice=/dev/disk/by-uuid/2fedee0d-fbf1-41ee-8d27-01feb25d9e8d:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=__arch/root resume=/dev/mapper/cryptswap quiet acpi_backlight=vendor rw diff --git a/root/boot/loader/entries/arch.conf b/root/boot/loader/entries/arch.conf index 6c568dad..afe144c8 100755 --- a/root/boot/loader/entries/arch.conf +++ b/root/boot/loader/entries/arch.conf @@ -1,5 +1,5 @@ -title Arch Linux -initrd /amd-ucode.img -initrd /initramfs-linux.img -linux /vmlinuz-linux -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet splash vga=current idle=nomwait +title Arch Linux +linux /vmlinuz-linux +initrd /amd-ucode.img +initrd /initramfs-linux.img +options cryptdevice=/dev/disk/by-uuid/2fedee0d-fbf1-41ee-8d27-01feb25d9e8d:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=__arch/root resume=/dev/mapper/cryptswap cpuidle.governor=teo acpi_backlight=vendor amd_iommu=on iommu=pt rw idle=nomwait rcu_nocbs=0-7 quiet fastboot diff --git a/root/boot/loader/loader.conf b/root/boot/loader/loader.conf new file mode 100755 index 00000000..49951610 --- /dev/null +++ b/root/boot/loader/loader.conf @@ -0,0 +1,3 @@ +default arch +timeout 0 +editor 1 diff --git a/root/etc/pacserve/pacserve.service.conf b/root/etc/pacserve/pacserve.service.conf old mode 100644 new mode 100755 From b2f5ca123c04f11de538dc37b78635e61a2a1420 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 8 Aug 2020 00:56:21 +0300 Subject: [PATCH 0468/2667] Small fixes --- home/.config/alacritty/alacritty.yml | 5 ++--- root/boot/loader/entries/arch-lts.conf | 10 +++++----- root/boot/loader/entries/arch.conf | 10 +++++----- root/boot/loader/loader.conf | 3 +++ root/etc/pacserve/pacserve.service.conf | 0 5 files changed, 15 insertions(+), 13 deletions(-) create mode 100755 root/boot/loader/loader.conf mode change 100644 => 100755 root/etc/pacserve/pacserve.service.conf diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml index 33b45f18..5574fc86 100644 --- a/home/.config/alacritty/alacritty.yml +++ b/home/.config/alacritty/alacritty.yml @@ -6,6 +6,7 @@ window: x: 30 y: 20 dynamic_padding: false + dynamic_title: true decorations: full scrolling: @@ -58,7 +59,7 @@ colors: cyan: "0x56b6c2" white: "0x5c6370" -visual_bell: +bell: animation: EaseOutExpo duration: 0 color: "#ffffff" @@ -79,8 +80,6 @@ selection: semantic_escape_chars: ',│`|:"'' ()[]{}<>' save_to_clipboard: false -dynamic_title: true - cursor: style: Block unfocused_hollow: true diff --git a/root/boot/loader/entries/arch-lts.conf b/root/boot/loader/entries/arch-lts.conf index 428dcba6..7cd59828 100755 --- a/root/boot/loader/entries/arch-lts.conf +++ b/root/boot/loader/entries/arch-lts.conf @@ -1,5 +1,5 @@ -title Arch Linux (LTS) -initrd /amd-ucode.img -initrd /initramfs-linux-lts.img -linux /vmlinuz-linux-lts -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet splash vga=current idle=nomwait +title Arch Linux +linux /vmlinuz-linux-lts +initrd /amd-ucode.img +initrd /initramfs-linux-lts.img +options cryptdevice=/dev/disk/by-uuid/2fedee0d-fbf1-41ee-8d27-01feb25d9e8d:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=__arch/root resume=/dev/mapper/cryptswap quiet acpi_backlight=vendor rw diff --git a/root/boot/loader/entries/arch.conf b/root/boot/loader/entries/arch.conf index 6c568dad..afe144c8 100755 --- a/root/boot/loader/entries/arch.conf +++ b/root/boot/loader/entries/arch.conf @@ -1,5 +1,5 @@ -title Arch Linux -initrd /amd-ucode.img -initrd /initramfs-linux.img -linux /vmlinuz-linux -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet splash vga=current idle=nomwait +title Arch Linux +linux /vmlinuz-linux +initrd /amd-ucode.img +initrd /initramfs-linux.img +options cryptdevice=/dev/disk/by-uuid/2fedee0d-fbf1-41ee-8d27-01feb25d9e8d:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=__arch/root resume=/dev/mapper/cryptswap cpuidle.governor=teo acpi_backlight=vendor amd_iommu=on iommu=pt rw idle=nomwait rcu_nocbs=0-7 quiet fastboot diff --git a/root/boot/loader/loader.conf b/root/boot/loader/loader.conf new file mode 100755 index 00000000..49951610 --- /dev/null +++ b/root/boot/loader/loader.conf @@ -0,0 +1,3 @@ +default arch +timeout 0 +editor 1 diff --git a/root/etc/pacserve/pacserve.service.conf b/root/etc/pacserve/pacserve.service.conf old mode 100644 new mode 100755 From 15e507ebb0fc04f43f5fc5a73ea5ec9893236aec Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Sep 2020 23:26:58 +0300 Subject: [PATCH 0469/2667] Switched to fd --- home/.config/zsh/01-env.zsh | 4 ++-- home/.config/zsh/03-aliases.zsh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index b35516fb..f9077444 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -17,12 +17,12 @@ export USRNAME=$USER export GOPATH=~/.bin/go # fzf settings -export FZF_DEFAULT_COMMAND='rg --files --hidden 2>/dev/null' +export FZF_DEFAULT_COMMAND='fd -Ht f' +export FZF_ALT_C_COMMAND='fd -Ht d' export FZF_DEFAULT_OPTS='-m --bind ctrl-a:select-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" export FZF_CTRL_T_OPTS='--preview "/usr/bin/cat {} | nvimpager -c "' -export FZF_ALT_C_COMMAND='rg --hidden --files --null --sort path 2>/dev/null | xargs -0 dirname | uniq' # use lesspipe with less export LESSOPEN="|lesspipe.sh %s" diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index bfd19362..52928ff0 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -11,7 +11,7 @@ alias moria-mariadb='ssh -tt moria docker exec -it mariadb mysql -p' cat() { # Check if output is a terminal, else use regular cat if [ -t 1 ]; then - nvimpager -c $@ + nvimpager $@ else /usr/bin/cat $@ fi From 8ab3e18ac6eddfa8aa9c03f21ba85b72300316e9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Sep 2020 23:26:58 +0300 Subject: [PATCH 0470/2667] Switched to fd --- home/.config/zsh/01-env.zsh | 4 ++-- home/.config/zsh/03-aliases.zsh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index b35516fb..f9077444 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -17,12 +17,12 @@ export USRNAME=$USER export GOPATH=~/.bin/go # fzf settings -export FZF_DEFAULT_COMMAND='rg --files --hidden 2>/dev/null' +export FZF_DEFAULT_COMMAND='fd -Ht f' +export FZF_ALT_C_COMMAND='fd -Ht d' export FZF_DEFAULT_OPTS='-m --bind ctrl-a:select-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" export FZF_CTRL_T_OPTS='--preview "/usr/bin/cat {} | nvimpager -c "' -export FZF_ALT_C_COMMAND='rg --hidden --files --null --sort path 2>/dev/null | xargs -0 dirname | uniq' # use lesspipe with less export LESSOPEN="|lesspipe.sh %s" diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index bfd19362..52928ff0 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -11,7 +11,7 @@ alias moria-mariadb='ssh -tt moria docker exec -it mariadb mysql -p' cat() { # Check if output is a terminal, else use regular cat if [ -t 1 ]; then - nvimpager -c $@ + nvimpager $@ else /usr/bin/cat $@ fi From a62da4a2241e780c2d6a66019de29a9802020fa4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Sep 2020 23:27:31 +0300 Subject: [PATCH 0471/2667] Fixed swap --- root/boot/loader/entries/arch-lts.conf | 10 +++++----- root/boot/loader/entries/arch.conf | 10 +++++----- root/etc/systemd/sleep.conf | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/root/boot/loader/entries/arch-lts.conf b/root/boot/loader/entries/arch-lts.conf index 7cd59828..1df835e8 100755 --- a/root/boot/loader/entries/arch-lts.conf +++ b/root/boot/loader/entries/arch-lts.conf @@ -1,5 +1,5 @@ -title Arch Linux -linux /vmlinuz-linux-lts -initrd /amd-ucode.img -initrd /initramfs-linux-lts.img -options cryptdevice=/dev/disk/by-uuid/2fedee0d-fbf1-41ee-8d27-01feb25d9e8d:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=__arch/root resume=/dev/mapper/cryptswap quiet acpi_backlight=vendor rw +title Arch Linux LTS +initrd /amd-ucode.img +initrd /initramfs-linux-lts.img +linux /vmlinuz-linux-lts +options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo diff --git a/root/boot/loader/entries/arch.conf b/root/boot/loader/entries/arch.conf index afe144c8..3592520f 100755 --- a/root/boot/loader/entries/arch.conf +++ b/root/boot/loader/entries/arch.conf @@ -1,5 +1,5 @@ -title Arch Linux -linux /vmlinuz-linux -initrd /amd-ucode.img -initrd /initramfs-linux.img -options cryptdevice=/dev/disk/by-uuid/2fedee0d-fbf1-41ee-8d27-01feb25d9e8d:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=__arch/root resume=/dev/mapper/cryptswap cpuidle.governor=teo acpi_backlight=vendor amd_iommu=on iommu=pt rw idle=nomwait rcu_nocbs=0-7 quiet fastboot +title Arch Linux +initrd /amd-ucode.img +initrd /initramfs-linux.img +linux /vmlinuz-linux +options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo diff --git a/root/etc/systemd/sleep.conf b/root/etc/systemd/sleep.conf index fda7b736..3ade3978 100644 --- a/root/etc/systemd/sleep.conf +++ b/root/etc/systemd/sleep.conf @@ -1,5 +1,5 @@ [Sleep] AllowSuspendThenHibernate=yes -SuspendMode=suspend +SuspendMode=suspend-then-hibernate SuspendState=disk -HibernateDelaySec=120min +HibernateDelaySec=1min From bf52dbe408cf1bbf539bb394096bf55b0fa446ee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Sep 2020 23:27:31 +0300 Subject: [PATCH 0472/2667] Fixed swap --- root/boot/loader/entries/arch-lts.conf | 10 +++++----- root/boot/loader/entries/arch.conf | 10 +++++----- root/etc/systemd/sleep.conf | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/root/boot/loader/entries/arch-lts.conf b/root/boot/loader/entries/arch-lts.conf index 7cd59828..1df835e8 100755 --- a/root/boot/loader/entries/arch-lts.conf +++ b/root/boot/loader/entries/arch-lts.conf @@ -1,5 +1,5 @@ -title Arch Linux -linux /vmlinuz-linux-lts -initrd /amd-ucode.img -initrd /initramfs-linux-lts.img -options cryptdevice=/dev/disk/by-uuid/2fedee0d-fbf1-41ee-8d27-01feb25d9e8d:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=__arch/root resume=/dev/mapper/cryptswap quiet acpi_backlight=vendor rw +title Arch Linux LTS +initrd /amd-ucode.img +initrd /initramfs-linux-lts.img +linux /vmlinuz-linux-lts +options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo diff --git a/root/boot/loader/entries/arch.conf b/root/boot/loader/entries/arch.conf index afe144c8..3592520f 100755 --- a/root/boot/loader/entries/arch.conf +++ b/root/boot/loader/entries/arch.conf @@ -1,5 +1,5 @@ -title Arch Linux -linux /vmlinuz-linux -initrd /amd-ucode.img -initrd /initramfs-linux.img -options cryptdevice=/dev/disk/by-uuid/2fedee0d-fbf1-41ee-8d27-01feb25d9e8d:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=__arch/root resume=/dev/mapper/cryptswap cpuidle.governor=teo acpi_backlight=vendor amd_iommu=on iommu=pt rw idle=nomwait rcu_nocbs=0-7 quiet fastboot +title Arch Linux +initrd /amd-ucode.img +initrd /initramfs-linux.img +linux /vmlinuz-linux +options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo diff --git a/root/etc/systemd/sleep.conf b/root/etc/systemd/sleep.conf index fda7b736..3ade3978 100644 --- a/root/etc/systemd/sleep.conf +++ b/root/etc/systemd/sleep.conf @@ -1,5 +1,5 @@ [Sleep] AllowSuspendThenHibernate=yes -SuspendMode=suspend +SuspendMode=suspend-then-hibernate SuspendState=disk -HibernateDelaySec=120min +HibernateDelaySec=1min From 9def02fa3666c9a5269392649df19445325cb585 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Sep 2020 23:28:06 +0300 Subject: [PATCH 0473/2667] Updated FZF stuff, some other minor tweaks --- home/.config/nvim/coc-settings.json | 1 + home/.config/nvim/conf.d/06-misc.vim | 3 +++ home/.config/nvim/conf.d/08-fzf.vim | 8 -------- home/.config/sway/conf.d/06-keybinds.conf | 4 ++++ home/.ignore | 5 +++++ 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/home/.config/nvim/coc-settings.json b/home/.config/nvim/coc-settings.json index f6b66928..eddd81b5 100644 --- a/home/.config/nvim/coc-settings.json +++ b/home/.config/nvim/coc-settings.json @@ -9,6 +9,7 @@ "diagnostic.warningSign": "•", "diagnostic.infoSign": "•", "suggest.snippetIndicator": "~", + "rust-analyzer.serverPath": "/usr/bin/rust-analyzer", "languageserver": { "bash": { "command": "bash-language-server", diff --git a/home/.config/nvim/conf.d/06-misc.vim b/home/.config/nvim/conf.d/06-misc.vim index 2768d29d..1315f116 100644 --- a/home/.config/nvim/conf.d/06-misc.vim +++ b/home/.config/nvim/conf.d/06-misc.vim @@ -2,6 +2,9 @@ let g:python3_host_prog='/usr/bin/python3' let pyxversion=3 +" LaTex fallback flavor +let g:tex_flavor = 'latex' + " Use suda by default let g:suda_smart_edit = 1 diff --git a/home/.config/nvim/conf.d/08-fzf.vim b/home/.config/nvim/conf.d/08-fzf.vim index b8568b23..b71f31fe 100644 --- a/home/.config/nvim/conf.d/08-fzf.vim +++ b/home/.config/nvim/conf.d/08-fzf.vim @@ -36,14 +36,6 @@ endfunction nmap :Files nmap :Rg -" Files command customization -command! -bang -nargs=* Rg - \ call fzf#vim#files( - \ 'rg --files --hidden 2>/dev/null'.shellescape(), 1, - \ 0 ? fzf#vim#with_preview('up:60%') - \ : fzf#vim#with_preview('right:50%:hidden', '?'), - \ 0) - " Ripgrep command customization command! -bang -nargs=* Rg \ call fzf#vim#grep( diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 0c9ecef1..0e44439b 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -218,3 +218,7 @@ bindsym Alt+h exec ydotool key left bindsym Alt+j exec ydotool key down bindsym Alt+k exec ydotool key up bindsym Alt+l exec ydotool key right + +# Mumble push to talk + bindsym --no-repeat F12 exec gdbus call -e -d net.sourceforge.mumble.mumble -o / -m net.sourceforge.mumble.Mumble.startTalk + bindsym --release F12 exec gdbus call -e -d net.sourceforge.mumble.mumble -o / -m net.sourceforge.mumble.Mumble.stopTalk diff --git a/home/.ignore b/home/.ignore index 8ee79ae6..be7a2281 100644 --- a/home/.ignore +++ b/home/.ignore @@ -10,3 +10,8 @@ .zplugin/ .config/nvim/plugged/ .local/share/Trash/ +.bin/ +.AndroidStudio*/ +.android/ +.audacity-data/ +.zcompdump* From 1108939904f910066c6ba805453e0e6a1b247e8c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Sep 2020 23:28:06 +0300 Subject: [PATCH 0474/2667] Updated FZF stuff, some other minor tweaks --- home/.config/nvim/coc-settings.json | 1 + home/.config/nvim/conf.d/06-misc.vim | 3 +++ home/.config/nvim/conf.d/08-fzf.vim | 8 -------- home/.config/sway/conf.d/06-keybinds.conf | 4 ++++ home/.ignore | 5 +++++ 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/home/.config/nvim/coc-settings.json b/home/.config/nvim/coc-settings.json index f6b66928..eddd81b5 100644 --- a/home/.config/nvim/coc-settings.json +++ b/home/.config/nvim/coc-settings.json @@ -9,6 +9,7 @@ "diagnostic.warningSign": "•", "diagnostic.infoSign": "•", "suggest.snippetIndicator": "~", + "rust-analyzer.serverPath": "/usr/bin/rust-analyzer", "languageserver": { "bash": { "command": "bash-language-server", diff --git a/home/.config/nvim/conf.d/06-misc.vim b/home/.config/nvim/conf.d/06-misc.vim index 2768d29d..1315f116 100644 --- a/home/.config/nvim/conf.d/06-misc.vim +++ b/home/.config/nvim/conf.d/06-misc.vim @@ -2,6 +2,9 @@ let g:python3_host_prog='/usr/bin/python3' let pyxversion=3 +" LaTex fallback flavor +let g:tex_flavor = 'latex' + " Use suda by default let g:suda_smart_edit = 1 diff --git a/home/.config/nvim/conf.d/08-fzf.vim b/home/.config/nvim/conf.d/08-fzf.vim index b8568b23..b71f31fe 100644 --- a/home/.config/nvim/conf.d/08-fzf.vim +++ b/home/.config/nvim/conf.d/08-fzf.vim @@ -36,14 +36,6 @@ endfunction nmap :Files nmap :Rg -" Files command customization -command! -bang -nargs=* Rg - \ call fzf#vim#files( - \ 'rg --files --hidden 2>/dev/null'.shellescape(), 1, - \ 0 ? fzf#vim#with_preview('up:60%') - \ : fzf#vim#with_preview('right:50%:hidden', '?'), - \ 0) - " Ripgrep command customization command! -bang -nargs=* Rg \ call fzf#vim#grep( diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 0c9ecef1..0e44439b 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -218,3 +218,7 @@ bindsym Alt+h exec ydotool key left bindsym Alt+j exec ydotool key down bindsym Alt+k exec ydotool key up bindsym Alt+l exec ydotool key right + +# Mumble push to talk + bindsym --no-repeat F12 exec gdbus call -e -d net.sourceforge.mumble.mumble -o / -m net.sourceforge.mumble.Mumble.startTalk + bindsym --release F12 exec gdbus call -e -d net.sourceforge.mumble.mumble -o / -m net.sourceforge.mumble.Mumble.stopTalk diff --git a/home/.ignore b/home/.ignore index 8ee79ae6..be7a2281 100644 --- a/home/.ignore +++ b/home/.ignore @@ -10,3 +10,8 @@ .zplugin/ .config/nvim/plugged/ .local/share/Trash/ +.bin/ +.AndroidStudio*/ +.android/ +.audacity-data/ +.zcompdump* From 4b3792be11393c5097442c303c78215701f992c3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Oct 2020 20:38:15 +0300 Subject: [PATCH 0475/2667] Accumulated changes while server was down --- home/.config/mimeo/associations.txt | 20 +++---- root/boot/loader/entries/kodi.conf | 2 +- root/etc/mkinitcpio.conf | 2 +- root/usr/local/bin/sway-run | 1 + root/usr/local/bin/umpv | 84 +++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+), 12 deletions(-) create mode 100755 root/usr/local/bin/umpv diff --git a/home/.config/mimeo/associations.txt b/home/.config/mimeo/associations.txt index 0c350544..27e0d1a5 100644 --- a/home/.config/mimeo/associations.txt +++ b/home/.config/mimeo/associations.txt @@ -1,31 +1,31 @@ -mpvq %U +umpv %U ^https?://invidio.us/.* -mpvq %U +umpv %U ^https?://(m.)?(www.)?youtube.com/watch\?.*v= -mpvq %U +umpv %U ^https?://(www.)?youtube.com/playlist\?.*list= -mpvq %U +umpv %U ^https?://(www.)?youtu.be/ -mpvq %U +umpv %U ^https?://(www.)?(m.)?twitch.tv/ -mpvq %U +umpv %U ^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:mp4|mkv|webm|avi|3gp|gif|gifv) -mpvq %U +umpv %U ^https?://www.facebook.com/.*/videos/ -mpvq %U +umpv %U ^https?://gfycat.com/.* -mpvq %U +umpv %U ^https?://vimeo.com/.* -mpvq %U +umpv %U ^https?://v.redd.it/.* imgurviewer %U diff --git a/root/boot/loader/entries/kodi.conf b/root/boot/loader/entries/kodi.conf index 97a46272..5a86d927 100755 --- a/root/boot/loader/entries/kodi.conf +++ b/root/boot/loader/entries/kodi.conf @@ -2,4 +2,4 @@ title Kodi initrd /amd-ucode.img initrd /initramfs-linux.img linux /vmlinuz-linux -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet splash vga=current idle=nomwait video=eDP-1:d +options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait video=eDP-1:d video=1920x1080@60 diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index de3c350e..12d768ea 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -2,7 +2,7 @@ MODULES=(amdgpu) FILES=() {%@@ if profile == "Mirkwood" @@%} BINARIES=("/usr/bin/btrfs") -HOOKS=(base autodetect modconf block filesystems keyboard fsck systemd sd-welcomemessage sd-encrypt) +HOOKS=(base autodetect modconf block filesystems keyboard fsck systemd sd-colors sd-vconsole sd-encrypt) {%@@ else @@%} BINARIES=() HOOKS=(colors consolefont base udev autodetect modconf block filesystems keyboard fsck) diff --git a/root/usr/local/bin/sway-run b/root/usr/local/bin/sway-run index 819221c9..762d6e13 100755 --- a/root/usr/local/bin/sway-run +++ b/root/usr/local/bin/sway-run @@ -9,6 +9,7 @@ export MOZ_WEBRENDER=1 # Enable xdg-desktop-portal-wlr export XDG_CURRENT_DESKTOP=sway +export XDG_SESSION_TYPE=wayland # Fix java on wayland export _JAVA_AWT_WM_NONREPARENTING=1 diff --git a/root/usr/local/bin/umpv b/root/usr/local/bin/umpv new file mode 100755 index 00000000..37a00a6e --- /dev/null +++ b/root/usr/local/bin/umpv @@ -0,0 +1,84 @@ +#!/usr/bin/env python3 + +""" +This script emulates "unique application" functionality on Linux. When starting +playback with this script, it will try to reuse an already running instance of +mpv (but only if that was started with umpv). Other mpv instances (not started +by umpv) are ignored, and the script doesn't know about them. +This only takes filenames as arguments. Custom options can't be used; the script +interprets them as filenames. If mpv is already running, the files passed to +umpv are appended to mpv's internal playlist. If a file does not exist or is +otherwise not playable, mpv will skip the playlist entry when attempting to +play it (from the GUI perspective, it's silently ignored). +If mpv isn't running yet, this script will start mpv and let it control the +current terminal. It will not write output to stdout/stderr, because this +will typically just fill ~/.xsession-errors with garbage. +mpv will terminate if there are no more files to play, and running the umpv +script after that will start a new mpv instance. +Note: you can supply custom mpv path and options with the MPV environment + variable. The environment variable will be split on whitespace, and the + first item is used as path to mpv binary and the rest is passed as options + _if_ the script starts mpv. If mpv is not started by the script (i.e. mpv + is already running), this will be ignored. +""" + +import sys +import os +import socket +import errno +import subprocess +import fcntl +import stat +import string + +files = sys.argv[1:] + +# this is the same method mpv uses to decide this +def is_url(filename): + parts = filename.split("://", 1) + if len(parts) < 2: + return False + # protocol prefix has no special characters => it's an URL + allowed_symbols = string.ascii_letters + string.digits + '_' + prefix = parts[0] + return all(map(lambda c: c in allowed_symbols, prefix)) + +# make them absolute; also makes them safe against interpretation as options +def make_abs(filename): + if not is_url(filename): + return os.path.abspath(filename) + return filename +files = [make_abs(f) for f in files] + +SOCK = os.path.join(os.getenv("HOME"), ".umpv_socket") + +sock = None +try: + sock = socket.socket(socket.AF_UNIX) + sock.connect(SOCK) +except socket.error as e: + if e.errno == errno.ECONNREFUSED: + sock = None + pass # abandoned socket + elif e.errno == errno.ENOENT: + sock = None + pass # doesn't exist + else: + raise e + +if sock: + # Unhandled race condition: what if mpv is terminating right now? + for f in files: + # escape: \ \n " + f = f.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n") + f = "\"" + f + "\"" + sock.send(("raw loadfile " + f + " append\n").encode("utf-8")) +else: + # Let mpv recreate socket if it doesn't already exist. + + opts = (os.getenv("MPV") or "mpv").split() + opts.extend(["--no-terminal", "--force-window", "--input-ipc-server=" + SOCK, + "--"]) + opts.extend(files) + + subprocess.check_call(opts) From d7cc370c5b9caf77f3979894c0edf8dba9325334 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Oct 2020 20:38:15 +0300 Subject: [PATCH 0476/2667] Accumulated changes while server was down --- home/.config/mimeo/associations.txt | 20 +++---- root/boot/loader/entries/kodi.conf | 2 +- root/etc/mkinitcpio.conf | 2 +- root/usr/local/bin/sway-run | 1 + root/usr/local/bin/umpv | 84 +++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+), 12 deletions(-) create mode 100755 root/usr/local/bin/umpv diff --git a/home/.config/mimeo/associations.txt b/home/.config/mimeo/associations.txt index 0c350544..27e0d1a5 100644 --- a/home/.config/mimeo/associations.txt +++ b/home/.config/mimeo/associations.txt @@ -1,31 +1,31 @@ -mpvq %U +umpv %U ^https?://invidio.us/.* -mpvq %U +umpv %U ^https?://(m.)?(www.)?youtube.com/watch\?.*v= -mpvq %U +umpv %U ^https?://(www.)?youtube.com/playlist\?.*list= -mpvq %U +umpv %U ^https?://(www.)?youtu.be/ -mpvq %U +umpv %U ^https?://(www.)?(m.)?twitch.tv/ -mpvq %U +umpv %U ^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:mp4|mkv|webm|avi|3gp|gif|gifv) -mpvq %U +umpv %U ^https?://www.facebook.com/.*/videos/ -mpvq %U +umpv %U ^https?://gfycat.com/.* -mpvq %U +umpv %U ^https?://vimeo.com/.* -mpvq %U +umpv %U ^https?://v.redd.it/.* imgurviewer %U diff --git a/root/boot/loader/entries/kodi.conf b/root/boot/loader/entries/kodi.conf index 97a46272..5a86d927 100755 --- a/root/boot/loader/entries/kodi.conf +++ b/root/boot/loader/entries/kodi.conf @@ -2,4 +2,4 @@ title Kodi initrd /amd-ucode.img initrd /initramfs-linux.img linux /vmlinuz-linux -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet splash vga=current idle=nomwait video=eDP-1:d +options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait video=eDP-1:d video=1920x1080@60 diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index de3c350e..12d768ea 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -2,7 +2,7 @@ MODULES=(amdgpu) FILES=() {%@@ if profile == "Mirkwood" @@%} BINARIES=("/usr/bin/btrfs") -HOOKS=(base autodetect modconf block filesystems keyboard fsck systemd sd-welcomemessage sd-encrypt) +HOOKS=(base autodetect modconf block filesystems keyboard fsck systemd sd-colors sd-vconsole sd-encrypt) {%@@ else @@%} BINARIES=() HOOKS=(colors consolefont base udev autodetect modconf block filesystems keyboard fsck) diff --git a/root/usr/local/bin/sway-run b/root/usr/local/bin/sway-run index 819221c9..762d6e13 100755 --- a/root/usr/local/bin/sway-run +++ b/root/usr/local/bin/sway-run @@ -9,6 +9,7 @@ export MOZ_WEBRENDER=1 # Enable xdg-desktop-portal-wlr export XDG_CURRENT_DESKTOP=sway +export XDG_SESSION_TYPE=wayland # Fix java on wayland export _JAVA_AWT_WM_NONREPARENTING=1 diff --git a/root/usr/local/bin/umpv b/root/usr/local/bin/umpv new file mode 100755 index 00000000..37a00a6e --- /dev/null +++ b/root/usr/local/bin/umpv @@ -0,0 +1,84 @@ +#!/usr/bin/env python3 + +""" +This script emulates "unique application" functionality on Linux. When starting +playback with this script, it will try to reuse an already running instance of +mpv (but only if that was started with umpv). Other mpv instances (not started +by umpv) are ignored, and the script doesn't know about them. +This only takes filenames as arguments. Custom options can't be used; the script +interprets them as filenames. If mpv is already running, the files passed to +umpv are appended to mpv's internal playlist. If a file does not exist or is +otherwise not playable, mpv will skip the playlist entry when attempting to +play it (from the GUI perspective, it's silently ignored). +If mpv isn't running yet, this script will start mpv and let it control the +current terminal. It will not write output to stdout/stderr, because this +will typically just fill ~/.xsession-errors with garbage. +mpv will terminate if there are no more files to play, and running the umpv +script after that will start a new mpv instance. +Note: you can supply custom mpv path and options with the MPV environment + variable. The environment variable will be split on whitespace, and the + first item is used as path to mpv binary and the rest is passed as options + _if_ the script starts mpv. If mpv is not started by the script (i.e. mpv + is already running), this will be ignored. +""" + +import sys +import os +import socket +import errno +import subprocess +import fcntl +import stat +import string + +files = sys.argv[1:] + +# this is the same method mpv uses to decide this +def is_url(filename): + parts = filename.split("://", 1) + if len(parts) < 2: + return False + # protocol prefix has no special characters => it's an URL + allowed_symbols = string.ascii_letters + string.digits + '_' + prefix = parts[0] + return all(map(lambda c: c in allowed_symbols, prefix)) + +# make them absolute; also makes them safe against interpretation as options +def make_abs(filename): + if not is_url(filename): + return os.path.abspath(filename) + return filename +files = [make_abs(f) for f in files] + +SOCK = os.path.join(os.getenv("HOME"), ".umpv_socket") + +sock = None +try: + sock = socket.socket(socket.AF_UNIX) + sock.connect(SOCK) +except socket.error as e: + if e.errno == errno.ECONNREFUSED: + sock = None + pass # abandoned socket + elif e.errno == errno.ENOENT: + sock = None + pass # doesn't exist + else: + raise e + +if sock: + # Unhandled race condition: what if mpv is terminating right now? + for f in files: + # escape: \ \n " + f = f.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n") + f = "\"" + f + "\"" + sock.send(("raw loadfile " + f + " append\n").encode("utf-8")) +else: + # Let mpv recreate socket if it doesn't already exist. + + opts = (os.getenv("MPV") or "mpv").split() + opts.extend(["--no-terminal", "--force-window", "--input-ipc-server=" + SOCK, + "--"]) + opts.extend(files) + + subprocess.check_call(opts) From 6dd0fa03017ce68d063d2ffba93ea480fb2589da Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Oct 2020 11:53:27 +0300 Subject: [PATCH 0477/2667] Fixes for nextcloud and added rhasspy --- docker/homeautomation/docker-compose.yml | 26 ++++++++++++++++++++---- docker/nextcloud/docker-compose.yml | 2 ++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 87c25ccf..d44b5541 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -8,7 +8,7 @@ services: volumes: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro - restart: always + restart: unless-stopped networks: - home-assistant - mariadb @@ -51,7 +51,7 @@ services: - /docker/homeautomation/deconz/deconz:/root/.local/share/dresden-elektronik/deCONZ - /docker/homeautomation/deconz/otau:/root/otau - /etc/localtime:/etc/localtime:ro - restart: always + restart: unless-stopped devices: - /dev/ttyACM0 @@ -67,7 +67,25 @@ services: volumes: - /docker/homeautomation/mosquitto:/mosquitto - /etc/localtime:/etc/localtime:ro - restart: always + restart: unless-stopped + + rhasspy: + container_name: rhasspy + image: rhasspy/rhasspy + command: --profile en --user-profiles /profiles + volumes: + - /docker/homeautomation/rhasspy:/profiles + environment: + - TZ=Europe/Helsinki + networks: + - home-assistant + ports: + - "12101:12101" + restart: unless-stopped + depends_on: + - home-assistant + devices: + - "/dev/snd:/dev/snd" node-red: container_name: node-red @@ -82,7 +100,7 @@ services: volumes: - /docker/homeautomation/node-red:/data - /etc/localtime:/etc/localtime:ro - restart: always + restart: unless-stopped depends_on: - home-assistant labels: diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index 087e0a6e..f88f03a7 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -21,6 +21,7 @@ services: - TZ=Europe/Helsinki - MYSQL_HOST=mariadb-nextcloud - REDIS_HOST=redis + - REDIS_HOST_PASSWORD=123 depends_on: - redis labels: @@ -45,6 +46,7 @@ services: networks: - nextcloud restart: always + command: redis-server --requirepass 123 cron: image: nextcloud:apache From 5ad2dff0650f86da07b66511f90d29eecfe027c7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Oct 2020 11:53:27 +0300 Subject: [PATCH 0478/2667] Fixes for nextcloud and added rhasspy --- docker/homeautomation/docker-compose.yml | 26 ++++++++++++++++++++---- docker/nextcloud/docker-compose.yml | 2 ++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 87c25ccf..d44b5541 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -8,7 +8,7 @@ services: volumes: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro - restart: always + restart: unless-stopped networks: - home-assistant - mariadb @@ -51,7 +51,7 @@ services: - /docker/homeautomation/deconz/deconz:/root/.local/share/dresden-elektronik/deCONZ - /docker/homeautomation/deconz/otau:/root/otau - /etc/localtime:/etc/localtime:ro - restart: always + restart: unless-stopped devices: - /dev/ttyACM0 @@ -67,7 +67,25 @@ services: volumes: - /docker/homeautomation/mosquitto:/mosquitto - /etc/localtime:/etc/localtime:ro - restart: always + restart: unless-stopped + + rhasspy: + container_name: rhasspy + image: rhasspy/rhasspy + command: --profile en --user-profiles /profiles + volumes: + - /docker/homeautomation/rhasspy:/profiles + environment: + - TZ=Europe/Helsinki + networks: + - home-assistant + ports: + - "12101:12101" + restart: unless-stopped + depends_on: + - home-assistant + devices: + - "/dev/snd:/dev/snd" node-red: container_name: node-red @@ -82,7 +100,7 @@ services: volumes: - /docker/homeautomation/node-red:/data - /etc/localtime:/etc/localtime:ro - restart: always + restart: unless-stopped depends_on: - home-assistant labels: diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index 087e0a6e..f88f03a7 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -21,6 +21,7 @@ services: - TZ=Europe/Helsinki - MYSQL_HOST=mariadb-nextcloud - REDIS_HOST=redis + - REDIS_HOST_PASSWORD=123 depends_on: - redis labels: @@ -45,6 +46,7 @@ services: networks: - nextcloud restart: always + command: redis-server --requirepass 123 cron: image: nextcloud:apache From 8e63339424dd5a3d5b97a4a8ba01201e4ce4bc41 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Oct 2020 12:31:03 +0300 Subject: [PATCH 0479/2667] Added wordpress --- docker/gitea/docker-compose.yaml | 3 --- docker/wordpress/docker-compose.yaml | 40 ++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 docker/wordpress/docker-compose.yaml diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 7a02733b..65a0fac2 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -15,7 +15,6 @@ services: - DB_PASSWD=${MYSQL_PASS} restart: unless-stopped networks: - - gitea - mariadb - proxy ports: @@ -41,8 +40,6 @@ services: - "traefik.http.services.gitea.loadbalancer.server.port=3000" networks: - gitea: - external: false mariadb: external: true proxy: diff --git a/docker/wordpress/docker-compose.yaml b/docker/wordpress/docker-compose.yaml new file mode 100644 index 00000000..46864f79 --- /dev/null +++ b/docker/wordpress/docker-compose.yaml @@ -0,0 +1,40 @@ +version: "3.3" + +services: + wordpress: + container_name: wordpress + image: wordpress:latest + environment: + - TZ=Europe/Helsinki + - WORDPRESS_DB_HOST=mariadb:3306 + - WORDPRESS_DB_NAME=wordpress + - WORDPRESS_DB_USER=wordpress + - WORDPRESS_DB_PASSWORD=wordpress + restart: unless-stopped + networks: + - mariadb + - proxy + volumes: + - /docker/wordpress:/var/www/html + - /etc/localtime:/etc/localtime:ro + labels: + - "traefik.enable=true" + + - "traefik.http.routers.wordpress-redirect.entrypoints=http" + - "traefik.http.routers.wordpress-redirect.rule=Host(`reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.wordpress-redirect.middlewares=http2https" + + - "traefik.http.routers.wordpress.entrypoints=https" + - "traefik.http.routers.wordpress.rule=Host(`reekynet.com`)" + - "traefik.http.routers.wordpress.tls=true" + - "traefik.http.routers.wordpress.tls.certresolver=http" + - "traefik.http.routers.wordpress.service=wordpress" + - "traefik.docker.network=proxy" + - "traefik.http.services.wordpress.loadbalancer.server.port=80" + +networks: + mariadb: + external: true + proxy: + external: true From 6da8cff4cae206c925e7b30f5bb94cb13a15e0ed Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Oct 2020 12:31:03 +0300 Subject: [PATCH 0480/2667] Added wordpress --- docker/gitea/docker-compose.yaml | 3 --- docker/wordpress/docker-compose.yaml | 40 ++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 docker/wordpress/docker-compose.yaml diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 7a02733b..65a0fac2 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -15,7 +15,6 @@ services: - DB_PASSWD=${MYSQL_PASS} restart: unless-stopped networks: - - gitea - mariadb - proxy ports: @@ -41,8 +40,6 @@ services: - "traefik.http.services.gitea.loadbalancer.server.port=3000" networks: - gitea: - external: false mariadb: external: true proxy: diff --git a/docker/wordpress/docker-compose.yaml b/docker/wordpress/docker-compose.yaml new file mode 100644 index 00000000..46864f79 --- /dev/null +++ b/docker/wordpress/docker-compose.yaml @@ -0,0 +1,40 @@ +version: "3.3" + +services: + wordpress: + container_name: wordpress + image: wordpress:latest + environment: + - TZ=Europe/Helsinki + - WORDPRESS_DB_HOST=mariadb:3306 + - WORDPRESS_DB_NAME=wordpress + - WORDPRESS_DB_USER=wordpress + - WORDPRESS_DB_PASSWORD=wordpress + restart: unless-stopped + networks: + - mariadb + - proxy + volumes: + - /docker/wordpress:/var/www/html + - /etc/localtime:/etc/localtime:ro + labels: + - "traefik.enable=true" + + - "traefik.http.routers.wordpress-redirect.entrypoints=http" + - "traefik.http.routers.wordpress-redirect.rule=Host(`reekynet.com`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.wordpress-redirect.middlewares=http2https" + + - "traefik.http.routers.wordpress.entrypoints=https" + - "traefik.http.routers.wordpress.rule=Host(`reekynet.com`)" + - "traefik.http.routers.wordpress.tls=true" + - "traefik.http.routers.wordpress.tls.certresolver=http" + - "traefik.http.routers.wordpress.service=wordpress" + - "traefik.docker.network=proxy" + - "traefik.http.services.wordpress.loadbalancer.server.port=80" + +networks: + mariadb: + external: true + proxy: + external: true From 6e7bf9edd0fcdfe963e101e82b9f43e5851531db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Oct 2020 17:21:24 +0300 Subject: [PATCH 0481/2667] Add wireguard --- docker/wireguard/docker-compose.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 docker/wireguard/docker-compose.yml diff --git a/docker/wireguard/docker-compose.yml b/docker/wireguard/docker-compose.yml new file mode 100644 index 00000000..bf1a34a9 --- /dev/null +++ b/docker/wireguard/docker-compose.yml @@ -0,0 +1,22 @@ +version: "2.1" +services: + wireguard: + image: linuxserver/wireguard + container_name: wireguard + cap_add: + - NET_ADMIN + - SYS_MODULE + environment: + - TZ=Europe/Helsinki + - PEERS=4 + - SERVERURL=reekynet.com + - SERVERPORT=48574 + - INTERNAL_SUBNET=10.200.200.0/24 + volumes: + - /docker/wireguard:/config + - /lib/modules:/lib/modules + ports: + - 48574:51820/udp + sysctls: + - net.ipv4.conf.all.src_valid_mark=1 + restart: unless-stopped From 14968517ceefa8f9e7a7c7eb1d7834d13fe60627 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Oct 2020 17:21:24 +0300 Subject: [PATCH 0482/2667] Add wireguard --- docker/wireguard/docker-compose.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 docker/wireguard/docker-compose.yml diff --git a/docker/wireguard/docker-compose.yml b/docker/wireguard/docker-compose.yml new file mode 100644 index 00000000..bf1a34a9 --- /dev/null +++ b/docker/wireguard/docker-compose.yml @@ -0,0 +1,22 @@ +version: "2.1" +services: + wireguard: + image: linuxserver/wireguard + container_name: wireguard + cap_add: + - NET_ADMIN + - SYS_MODULE + environment: + - TZ=Europe/Helsinki + - PEERS=4 + - SERVERURL=reekynet.com + - SERVERPORT=48574 + - INTERNAL_SUBNET=10.200.200.0/24 + volumes: + - /docker/wireguard:/config + - /lib/modules:/lib/modules + ports: + - 48574:51820/udp + sysctls: + - net.ipv4.conf.all.src_valid_mark=1 + restart: unless-stopped From d9f90d4880a538003f80ab2c0eba844109a4e83c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Oct 2020 23:03:43 +0300 Subject: [PATCH 0483/2667] Added new VPS --- config-home.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config-home.yaml b/config-home.yaml index 302c4e8d..2df5db3c 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -197,6 +197,10 @@ profiles: - Terminal - Media - Pacman + Gondor: + include: + - Terminal + - Pacman mko-laptop: include: - Terminal From 954c08f2d02c240b315e08c22e2a3d84e71db10a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Oct 2020 23:03:43 +0300 Subject: [PATCH 0484/2667] Added new VPS --- config-home.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config-home.yaml b/config-home.yaml index 302c4e8d..2df5db3c 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -197,6 +197,10 @@ profiles: - Terminal - Media - Pacman + Gondor: + include: + - Terminal + - Pacman mko-laptop: include: - Terminal From 94019c6d51f0ebd18044a778bb6f7ff13a90872a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 12:27:35 +0200 Subject: [PATCH 0485/2667] Add root config for gondor --- config-root.yaml | 23 +++++++---------------- home/.ssh/config | 16 +++------------- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 8b1eb859..7a40d82f 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -172,17 +172,6 @@ profiles: include: - Locale - Pacman - Rivendell: - include: - - Locale - - Pacman - dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config Moria: include: - Locale @@ -190,11 +179,13 @@ profiles: dotfiles: - f_sshd_config - f_99-sysctl.conf - - f_ipmi-static.service - - f_ipmi-temp.service - - f_ipmi-temp.timer - - f_ipmi-fans.service - - f_ipmi-fans.timer + Gondor: + include: + - Locale + - Pacman + dotfiles: + - f_sshd_config + - f_99-sysctl.conf localhost: include: - Locale diff --git a/home/.ssh/config b/home/.ssh/config index fc93742a..8248253a 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -19,25 +19,15 @@ Host aur User aur host moria -{%@@ if profile == "Rivendell" @@%} - HostName moria.reekynet.lan - port 22 -{%@@ else @@%} HostName reekynet.com port 221 -{%@@ endif @@%} User balrog ForwardAgent yes -host rivendell -{%@@ if profile == "Moria" @@%} - HostName rivendell.reekynet.lan +host gondor + hostname gondor.reekynet.com port 22 -{%@@ else @@%} - HostName reekynet.com - port 222 -{%@@ endif @@%} - User gimli + User reekymarko ForwardAgent yes host mirkwood From 377e745ca7205522f999aaeddcf09dc34bdb76e7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 12:27:35 +0200 Subject: [PATCH 0486/2667] Add root config for gondor --- config-root.yaml | 23 +++++++---------------- home/.ssh/config | 16 +++------------- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 8b1eb859..7a40d82f 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -172,17 +172,6 @@ profiles: include: - Locale - Pacman - Rivendell: - include: - - Locale - - Pacman - dotfiles: - - f_getty.conf - - f_vconsole.conf - - f_mkinitcpio.conf - - f_bluetooth.conf - - f_60-uinput-permissions.rules - - f_sshd_config Moria: include: - Locale @@ -190,11 +179,13 @@ profiles: dotfiles: - f_sshd_config - f_99-sysctl.conf - - f_ipmi-static.service - - f_ipmi-temp.service - - f_ipmi-temp.timer - - f_ipmi-fans.service - - f_ipmi-fans.timer + Gondor: + include: + - Locale + - Pacman + dotfiles: + - f_sshd_config + - f_99-sysctl.conf localhost: include: - Locale diff --git a/home/.ssh/config b/home/.ssh/config index fc93742a..8248253a 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -19,25 +19,15 @@ Host aur User aur host moria -{%@@ if profile == "Rivendell" @@%} - HostName moria.reekynet.lan - port 22 -{%@@ else @@%} HostName reekynet.com port 221 -{%@@ endif @@%} User balrog ForwardAgent yes -host rivendell -{%@@ if profile == "Moria" @@%} - HostName rivendell.reekynet.lan +host gondor + hostname gondor.reekynet.com port 22 -{%@@ else @@%} - HostName reekynet.com - port 222 -{%@@ endif @@%} - User gimli + User reekymarko ForwardAgent yes host mirkwood From cfb5dcbb54e3d78c14a07c404360ed4425267ee3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 12:27:52 +0200 Subject: [PATCH 0487/2667] Remove rivendell --- config-home.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config-home.yaml b/config-home.yaml index 2df5db3c..959260f9 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -187,11 +187,6 @@ profiles: - Media - Sway - Pacman - Rivendell: - include: - - Terminal - - Media - - Pacman Moria: include: - Terminal From ce2bfc821df73686e90aed7aa1a651bdd3abf1ec Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 12:27:52 +0200 Subject: [PATCH 0488/2667] Remove rivendell --- config-home.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config-home.yaml b/config-home.yaml index 2df5db3c..959260f9 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -187,11 +187,6 @@ profiles: - Media - Sway - Pacman - Rivendell: - include: - - Terminal - - Media - - Pacman Moria: include: - Terminal From bb865f62443ee636babd706fb4a22f8caa1f2ba6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 12:30:01 +0200 Subject: [PATCH 0489/2667] Remove pacman config from Gondor --- config-root.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 7a40d82f..becfe0ad 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -182,10 +182,8 @@ profiles: Gondor: include: - Locale - - Pacman dotfiles: - f_sshd_config - - f_99-sysctl.conf localhost: include: - Locale From 18bb002436a84ed61b55928cba328fd6125aba9b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 12:30:01 +0200 Subject: [PATCH 0490/2667] Remove pacman config from Gondor --- config-root.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 7a40d82f..becfe0ad 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -182,10 +182,8 @@ profiles: Gondor: include: - Locale - - Pacman dotfiles: - f_sshd_config - - f_99-sysctl.conf localhost: include: - Locale From 4a2b5ffc39ca02ec1a5a3e608aa408cbfd49c787 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 13:01:43 +0200 Subject: [PATCH 0491/2667] Disallow root login over ssh --- root/etc/ssh/sshd_config | 1 + 1 file changed, 1 insertion(+) diff --git a/root/etc/ssh/sshd_config b/root/etc/ssh/sshd_config index 448f96a6..7d7d5278 100644 --- a/root/etc/ssh/sshd_config +++ b/root/etc/ssh/sshd_config @@ -4,6 +4,7 @@ StreamLocalBindUnlink yes X11Forwarding yes AuthorizedKeysFile .ssh/authorized_keys PasswordAuthentication no +PermitRootLogin no ChallengeResponseAuthentication no UsePAM yes PrintMotd no # pam does that From 5dee3fd36b08f83738ffb1e48c5994167719e628 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 13:01:43 +0200 Subject: [PATCH 0492/2667] Disallow root login over ssh --- root/etc/ssh/sshd_config | 1 + 1 file changed, 1 insertion(+) diff --git a/root/etc/ssh/sshd_config b/root/etc/ssh/sshd_config index 448f96a6..7d7d5278 100644 --- a/root/etc/ssh/sshd_config +++ b/root/etc/ssh/sshd_config @@ -4,6 +4,7 @@ StreamLocalBindUnlink yes X11Forwarding yes AuthorizedKeysFile .ssh/authorized_keys PasswordAuthentication no +PermitRootLogin no ChallengeResponseAuthentication no UsePAM yes PrintMotd no # pam does that From 8369d36a2e800765df6c118a5c8d4a05e583a219 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 14:05:58 +0200 Subject: [PATCH 0493/2667] Moved wordpress to gondor --- docker/wordpress/docker-compose.yaml | 40 ---------------------------- 1 file changed, 40 deletions(-) delete mode 100644 docker/wordpress/docker-compose.yaml diff --git a/docker/wordpress/docker-compose.yaml b/docker/wordpress/docker-compose.yaml deleted file mode 100644 index 46864f79..00000000 --- a/docker/wordpress/docker-compose.yaml +++ /dev/null @@ -1,40 +0,0 @@ -version: "3.3" - -services: - wordpress: - container_name: wordpress - image: wordpress:latest - environment: - - TZ=Europe/Helsinki - - WORDPRESS_DB_HOST=mariadb:3306 - - WORDPRESS_DB_NAME=wordpress - - WORDPRESS_DB_USER=wordpress - - WORDPRESS_DB_PASSWORD=wordpress - restart: unless-stopped - networks: - - mariadb - - proxy - volumes: - - /docker/wordpress:/var/www/html - - /etc/localtime:/etc/localtime:ro - labels: - - "traefik.enable=true" - - - "traefik.http.routers.wordpress-redirect.entrypoints=http" - - "traefik.http.routers.wordpress-redirect.rule=Host(`reekynet.com`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.wordpress-redirect.middlewares=http2https" - - - "traefik.http.routers.wordpress.entrypoints=https" - - "traefik.http.routers.wordpress.rule=Host(`reekynet.com`)" - - "traefik.http.routers.wordpress.tls=true" - - "traefik.http.routers.wordpress.tls.certresolver=http" - - "traefik.http.routers.wordpress.service=wordpress" - - "traefik.docker.network=proxy" - - "traefik.http.services.wordpress.loadbalancer.server.port=80" - -networks: - mariadb: - external: true - proxy: - external: true From 8381065d02136f968f3ba4ec13b6f552e535eec7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 14:05:58 +0200 Subject: [PATCH 0494/2667] Moved wordpress to gondor --- docker/wordpress/docker-compose.yaml | 40 ---------------------------- 1 file changed, 40 deletions(-) delete mode 100644 docker/wordpress/docker-compose.yaml diff --git a/docker/wordpress/docker-compose.yaml b/docker/wordpress/docker-compose.yaml deleted file mode 100644 index 46864f79..00000000 --- a/docker/wordpress/docker-compose.yaml +++ /dev/null @@ -1,40 +0,0 @@ -version: "3.3" - -services: - wordpress: - container_name: wordpress - image: wordpress:latest - environment: - - TZ=Europe/Helsinki - - WORDPRESS_DB_HOST=mariadb:3306 - - WORDPRESS_DB_NAME=wordpress - - WORDPRESS_DB_USER=wordpress - - WORDPRESS_DB_PASSWORD=wordpress - restart: unless-stopped - networks: - - mariadb - - proxy - volumes: - - /docker/wordpress:/var/www/html - - /etc/localtime:/etc/localtime:ro - labels: - - "traefik.enable=true" - - - "traefik.http.routers.wordpress-redirect.entrypoints=http" - - "traefik.http.routers.wordpress-redirect.rule=Host(`reekynet.com`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.wordpress-redirect.middlewares=http2https" - - - "traefik.http.routers.wordpress.entrypoints=https" - - "traefik.http.routers.wordpress.rule=Host(`reekynet.com`)" - - "traefik.http.routers.wordpress.tls=true" - - "traefik.http.routers.wordpress.tls.certresolver=http" - - "traefik.http.routers.wordpress.service=wordpress" - - "traefik.docker.network=proxy" - - "traefik.http.services.wordpress.loadbalancer.server.port=80" - -networks: - mariadb: - external: true - proxy: - external: true From ee9935d9c6a6abc8c6a3642c6cecf2385bbc7de4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 14:07:26 +0200 Subject: [PATCH 0495/2667] Removed docker configs for stuff I don't use anymore --- docker/matterbridge/docker-compose.yaml | 8 -------- docker/tvheadend/docker-compose.yaml | 20 -------------------- 2 files changed, 28 deletions(-) delete mode 100644 docker/matterbridge/docker-compose.yaml delete mode 100644 docker/tvheadend/docker-compose.yaml diff --git a/docker/matterbridge/docker-compose.yaml b/docker/matterbridge/docker-compose.yaml deleted file mode 100644 index 35588ef0..00000000 --- a/docker/matterbridge/docker-compose.yaml +++ /dev/null @@ -1,8 +0,0 @@ -version: "3.7" -services: - matterbridge: - image: 42wim/matterbridge:stable - container_name: matterbridge - restart: unless-stopped - volumes: - - /docker/matterbridge:/etc/matterbridge diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml deleted file mode 100644 index e72db84a..00000000 --- a/docker/tvheadend/docker-compose.yaml +++ /dev/null @@ -1,20 +0,0 @@ -version: "2" -services: - tvheadend: - image: linuxserver/tvheadend - container_name: tvheadend - environment: - - TZ=Europe/Helsinki - - PUID=1000 - - PGID=985 - volumes: - - /docker/tvheadend:/config - - /mnt/Storage/Media/PVR:/recordings - - /etc/localtime:/etc/localtime:ro - ports: - - 9981:9981 - - 9982:9982 - devices: - - /dev/dri:/dev/dri #hardware acceleration - - /dev/dvb:/dev/dvb #tuner card - restart: unless-stopped From 6c7a10e1f0f8d5ca4ae129598161e0c6f819c303 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 14:07:26 +0200 Subject: [PATCH 0496/2667] Removed docker configs for stuff I don't use anymore --- docker/matterbridge/docker-compose.yaml | 8 -------- docker/tvheadend/docker-compose.yaml | 20 -------------------- 2 files changed, 28 deletions(-) delete mode 100644 docker/matterbridge/docker-compose.yaml delete mode 100644 docker/tvheadend/docker-compose.yaml diff --git a/docker/matterbridge/docker-compose.yaml b/docker/matterbridge/docker-compose.yaml deleted file mode 100644 index 35588ef0..00000000 --- a/docker/matterbridge/docker-compose.yaml +++ /dev/null @@ -1,8 +0,0 @@ -version: "3.7" -services: - matterbridge: - image: 42wim/matterbridge:stable - container_name: matterbridge - restart: unless-stopped - volumes: - - /docker/matterbridge:/etc/matterbridge diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml deleted file mode 100644 index e72db84a..00000000 --- a/docker/tvheadend/docker-compose.yaml +++ /dev/null @@ -1,20 +0,0 @@ -version: "2" -services: - tvheadend: - image: linuxserver/tvheadend - container_name: tvheadend - environment: - - TZ=Europe/Helsinki - - PUID=1000 - - PGID=985 - volumes: - - /docker/tvheadend:/config - - /mnt/Storage/Media/PVR:/recordings - - /etc/localtime:/etc/localtime:ro - ports: - - 9981:9981 - - 9982:9982 - devices: - - /dev/dri:/dev/dri #hardware acceleration - - /dev/dvb:/dev/dvb #tuner card - restart: unless-stopped From 2f31ac0d6a8498b08c411bbe841e07a4fccb2291 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Nov 2020 17:43:18 +0200 Subject: [PATCH 0497/2667] Update gitea domain in ssh conf --- home/.ssh/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.ssh/config b/home/.ssh/config index 8248253a..fde5afe1 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -1,5 +1,5 @@ host gitea - HostName reekynet.com + HostName korhonen.cc user git host gitlab From cfc0dfdfbd2d35e9332b7e2346b68f1bd1fd308b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Nov 2020 17:43:18 +0200 Subject: [PATCH 0498/2667] Update gitea domain in ssh conf --- home/.ssh/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.ssh/config b/home/.ssh/config index 8248253a..fde5afe1 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -1,5 +1,5 @@ host gitea - HostName reekynet.com + HostName korhonen.cc user git host gitlab From 6de7f58df31d8894060becf48652c5a4813d3053 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Nov 2020 11:50:40 +0200 Subject: [PATCH 0499/2667] Small fixes --- home/.config/zsh/01-env.zsh | 2 -- home/.config/zsh/02-plugins.zsh | 4 ++++ home/.ssh/config | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index f9077444..6bb9c623 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -34,12 +34,10 @@ export DOTREPO="$HOME/Git/dotfiles" export EDITOR=nvim export PAGER="nvimpager -p" -{%@@ if profile == "Mirkwood" @@%} # use gpg for ssh export GPG_TTY="$(tty)" export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh" gpg-connect-agent updatestartuptty /bye > /dev/null -{%@@ endif @@%} # tehfuk eval $(thefuck --alias) diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh index 94efc2a9..26b690b9 100644 --- a/home/.config/zsh/02-plugins.zsh +++ b/home/.config/zsh/02-plugins.zsh @@ -43,5 +43,9 @@ zinit ice lucid atinit'zpcompinit' zinit light zdharma/fast-syntax-highlighting # use fzf with zsh +{%@@ if profile == "mko-laptop" @@%} +source ~/.fzf.zsh +{%@@ else @@%} source /usr/share/fzf/key-bindings.zsh source /usr/share/fzf/completion.zsh +{%@@ endif @@%} diff --git a/home/.ssh/config b/home/.ssh/config index fde5afe1..7630876a 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -19,7 +19,7 @@ Host aur User aur host moria - HostName reekynet.com + HostName korhonen.cc port 221 User balrog ForwardAgent yes @@ -31,7 +31,7 @@ host gondor ForwardAgent yes host mirkwood - HostName reekynet.com + HostName korhonen.cc port 8123 User reekymarko From a48f147daeaaa754a479b25057fcf835dd3e5d96 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Nov 2020 11:50:40 +0200 Subject: [PATCH 0500/2667] Small fixes --- home/.config/zsh/01-env.zsh | 2 -- home/.config/zsh/02-plugins.zsh | 4 ++++ home/.ssh/config | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index f9077444..6bb9c623 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -34,12 +34,10 @@ export DOTREPO="$HOME/Git/dotfiles" export EDITOR=nvim export PAGER="nvimpager -p" -{%@@ if profile == "Mirkwood" @@%} # use gpg for ssh export GPG_TTY="$(tty)" export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh" gpg-connect-agent updatestartuptty /bye > /dev/null -{%@@ endif @@%} # tehfuk eval $(thefuck --alias) diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh index 94efc2a9..26b690b9 100644 --- a/home/.config/zsh/02-plugins.zsh +++ b/home/.config/zsh/02-plugins.zsh @@ -43,5 +43,9 @@ zinit ice lucid atinit'zpcompinit' zinit light zdharma/fast-syntax-highlighting # use fzf with zsh +{%@@ if profile == "mko-laptop" @@%} +source ~/.fzf.zsh +{%@@ else @@%} source /usr/share/fzf/key-bindings.zsh source /usr/share/fzf/completion.zsh +{%@@ endif @@%} diff --git a/home/.ssh/config b/home/.ssh/config index fde5afe1..7630876a 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -19,7 +19,7 @@ Host aur User aur host moria - HostName reekynet.com + HostName korhonen.cc port 221 User balrog ForwardAgent yes @@ -31,7 +31,7 @@ host gondor ForwardAgent yes host mirkwood - HostName reekynet.com + HostName korhonen.cc port 8123 User reekymarko From 2a0e5325c09018cedfa082ba267fa83edf1e5b64 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Nov 2020 18:34:29 +0200 Subject: [PATCH 0501/2667] Added firenvim --- home/.config/nvim/conf.d/01-plugins.vim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/conf.d/01-plugins.vim b/home/.config/nvim/conf.d/01-plugins.vim index ba2fa574..690629e2 100644 --- a/home/.config/nvim/conf.d/01-plugins.vim +++ b/home/.config/nvim/conf.d/01-plugins.vim @@ -32,6 +32,9 @@ Plug 'https://git.zx2c4.com/password-store', { 'rtp': 'contrib/vim/redact_pass.v " Colorize color words Plug 'norcalli/nvim-colorizer.lua' +" NeoVim in Firefox +Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } } + " Spelling Plug 'vim-scripts/Vimchant' From 7bf992b40996487e2eaf16678a881f15fe0ce0d0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Nov 2020 18:34:29 +0200 Subject: [PATCH 0502/2667] Added firenvim --- home/.config/nvim/conf.d/01-plugins.vim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/conf.d/01-plugins.vim b/home/.config/nvim/conf.d/01-plugins.vim index ba2fa574..690629e2 100644 --- a/home/.config/nvim/conf.d/01-plugins.vim +++ b/home/.config/nvim/conf.d/01-plugins.vim @@ -32,6 +32,9 @@ Plug 'https://git.zx2c4.com/password-store', { 'rtp': 'contrib/vim/redact_pass.v " Colorize color words Plug 'norcalli/nvim-colorizer.lua' +" NeoVim in Firefox +Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } } + " Spelling Plug 'vim-scripts/Vimchant' From ee7ae5bcb0714933bfffdce4102f52544287201d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 20 Nov 2020 00:23:02 +0200 Subject: [PATCH 0503/2667] Moved to paru --- home/.config/zsh/03-aliases.zsh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 52928ff0..1b1b60a8 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -32,18 +32,18 @@ _fzf_compgen_path() { } # search and install packages with fzf -yi() { - SELECTED_PKGS="$(yay -Slq | fzf --header='Install packages' -m --preview 'yay -Si {1}')" +pi() { + SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}')" if [ -n "$SELECTED_PKGS" ]; then - yay -S $(echo $SELECTED_PKGS) + paru -S $(echo $SELECTED_PKGS) fi } # search and remove packages with fzf -yr() { - SELECTED_PKGS="$(yay -Qsq | fzf --header='Remove packages' -m --preview 'yay -Si {1}')" +pr() { + SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}')" if [ -n "$SELECTED_PKGS" ]; then - yay -Rns $(echo $SELECTED_PKGS) + paru -Rns $(echo $SELECTED_PKGS) fi } @@ -80,7 +80,7 @@ clean() { SPACEBEFORE=$(eval "$DFCMD") trash-empty 10 sudo journalctl --vacuum-size=500M - yay -Sc + paru -Sc SPACEAFTER=$(eval "$DFCMD") echo "Saved $(calc $SPACEAFTER - $SPACEBEFORE)G of space" } @@ -144,8 +144,8 @@ update() { } base() { - yay -Pw - yay -Syu $@ + paru -Pw + paru -Syu $@ } plugins() { From 9f44d02ed66b26007a62a3e3cee4a351c65ed9dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 20 Nov 2020 00:23:02 +0200 Subject: [PATCH 0504/2667] Moved to paru --- home/.config/zsh/03-aliases.zsh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 52928ff0..1b1b60a8 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -32,18 +32,18 @@ _fzf_compgen_path() { } # search and install packages with fzf -yi() { - SELECTED_PKGS="$(yay -Slq | fzf --header='Install packages' -m --preview 'yay -Si {1}')" +pi() { + SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}')" if [ -n "$SELECTED_PKGS" ]; then - yay -S $(echo $SELECTED_PKGS) + paru -S $(echo $SELECTED_PKGS) fi } # search and remove packages with fzf -yr() { - SELECTED_PKGS="$(yay -Qsq | fzf --header='Remove packages' -m --preview 'yay -Si {1}')" +pr() { + SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}')" if [ -n "$SELECTED_PKGS" ]; then - yay -Rns $(echo $SELECTED_PKGS) + paru -Rns $(echo $SELECTED_PKGS) fi } @@ -80,7 +80,7 @@ clean() { SPACEBEFORE=$(eval "$DFCMD") trash-empty 10 sudo journalctl --vacuum-size=500M - yay -Sc + paru -Sc SPACEAFTER=$(eval "$DFCMD") echo "Saved $(calc $SPACEAFTER - $SPACEBEFORE)G of space" } @@ -144,8 +144,8 @@ update() { } base() { - yay -Pw - yay -Syu $@ + paru -Pw + paru -Syu $@ } plugins() { From 33ab66fbb56391e41e6e8266c5a3343996988d6a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 13:02:03 +0200 Subject: [PATCH 0505/2667] Update secrets --- secrets/env | 17 ++++++++++------- secrets/secrets.sh | 5 +++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/secrets/env b/secrets/env index 6f1f0d11..55e10bcc 100755 --- a/secrets/env +++ b/secrets/env @@ -6,16 +6,19 @@ export PASS_MUSPY="$(pass entertainment/muspy.com | head -n 1)" export PASS_ARIA2="$(pass linux/aria2 | head -n 1)" export PASS_MPD="$(pass linux/mpd | head -n 1)" export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -n 1)" -export PASS_IPMI="$(pass reekynet/idrac | head -n 1)" -export PASS_MQTT="$(pass reekynet/mqtt.reekynet.com | head -n 1)" +export PASS_IPMI="$(pass selfhosted/idrac | head -n 1)" +export PASS_MQTT="$(pass selfhosted/mqtt.reekynet.com | head -n 1)" export ME_FULLNAME="$(pass me | head -n 1)" export ME_ADDRESS="$(pass me | rg 'address' | cut -d' ' -f2-)" export ME_PHONE="$(pass me | rg 'phone' | cut -d' ' -f2-)" -export WIREGUARD_MIRKWOOD_PRIVKEY="$(pass reekynet/wireguard/mirkwood | grep PrivateKey | cut -d' ' -f2-)" -export WIREGUARD_MIRKWOOD_PUBKEY="$(pass reekynet/wireguard/mirkwood | grep PublicKey | cut -d' ' -f2-)" -export WIREGUARD_MIRKWOOD_PSK="$(pass reekynet/wireguard/mirkwood | grep PreSharedKey | cut -d' ' -f2-)" +export WIREGUARD_MIRKWOOD_PRIVKEY="$(pass selfhosted/wireguard/mirkwood | grep PrivateKey | cut -d' ' -f2-)" +export WIREGUARD_MIRKWOOD_PUBKEY="$(pass selfhosted/wireguard/mirkwood | grep PublicKey | cut -d' ' -f2-)" +export WIREGUARD_MIRKWOOD_PSK="$(pass selfhosted/wireguard/mirkwood | grep PreSharedKey | cut -d' ' -f2-)" -export WIREGUARD_MORIA_PRIVKEY="$(pass reekynet/wireguard/moria | grep PrivateKey | cut -d' ' -f2-)" -export WIREGUARD_MORIA_PUBKEY="$(pass reekynet/wireguard/moria | grep PublicKey | cut -d' ' -f2-)" +export WIREGUARD_MORIA_PRIVKEY="$(pass selfhosted/wireguard/moria | grep PrivateKey | cut -d' ' -f2-)" +export WIREGUARD_MORIA_PUBKEY="$(pass selfhosted/wireguard/moria | grep PublicKey | cut -d' ' -f2-)" + +export EMAIL_MARKO_PASS="$(pass email/marko@korhonen.cc | head -1)" +export EMAIL_ADMIN_PASS="$(pass email/admin@korhonen.cc | head -1)" diff --git a/secrets/secrets.sh b/secrets/secrets.sh index 724a5b9b..535020d6 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -23,4 +23,9 @@ export WIREGUARD_MIRKWOOD_PSK="$WIREGUARD_MIRKWOOD_PSK" export WIREGUARD_MORIA_PRIVKEY="$WIREGUARD_MORIA_PRIVKEY" export WIREGUARD_MORIA_PUBKEY="$WIREGUARD_MORIA_PUBKEY" + +export EMAIL_MARKO_PASS="$EMAIL_MARKO_PASS" +export EMAIL_ADMIN_PASS="$EMAIL_MARKO_PASS" SECRET + +chmod 600 $DOTREPO/secrets/secrets From f81ffb448084071c6424714ecb0dabdfba6748c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 13:02:03 +0200 Subject: [PATCH 0506/2667] Update secrets --- secrets/env | 17 ++++++++++------- secrets/secrets.sh | 5 +++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/secrets/env b/secrets/env index 6f1f0d11..55e10bcc 100755 --- a/secrets/env +++ b/secrets/env @@ -6,16 +6,19 @@ export PASS_MUSPY="$(pass entertainment/muspy.com | head -n 1)" export PASS_ARIA2="$(pass linux/aria2 | head -n 1)" export PASS_MPD="$(pass linux/mpd | head -n 1)" export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -n 1)" -export PASS_IPMI="$(pass reekynet/idrac | head -n 1)" -export PASS_MQTT="$(pass reekynet/mqtt.reekynet.com | head -n 1)" +export PASS_IPMI="$(pass selfhosted/idrac | head -n 1)" +export PASS_MQTT="$(pass selfhosted/mqtt.reekynet.com | head -n 1)" export ME_FULLNAME="$(pass me | head -n 1)" export ME_ADDRESS="$(pass me | rg 'address' | cut -d' ' -f2-)" export ME_PHONE="$(pass me | rg 'phone' | cut -d' ' -f2-)" -export WIREGUARD_MIRKWOOD_PRIVKEY="$(pass reekynet/wireguard/mirkwood | grep PrivateKey | cut -d' ' -f2-)" -export WIREGUARD_MIRKWOOD_PUBKEY="$(pass reekynet/wireguard/mirkwood | grep PublicKey | cut -d' ' -f2-)" -export WIREGUARD_MIRKWOOD_PSK="$(pass reekynet/wireguard/mirkwood | grep PreSharedKey | cut -d' ' -f2-)" +export WIREGUARD_MIRKWOOD_PRIVKEY="$(pass selfhosted/wireguard/mirkwood | grep PrivateKey | cut -d' ' -f2-)" +export WIREGUARD_MIRKWOOD_PUBKEY="$(pass selfhosted/wireguard/mirkwood | grep PublicKey | cut -d' ' -f2-)" +export WIREGUARD_MIRKWOOD_PSK="$(pass selfhosted/wireguard/mirkwood | grep PreSharedKey | cut -d' ' -f2-)" -export WIREGUARD_MORIA_PRIVKEY="$(pass reekynet/wireguard/moria | grep PrivateKey | cut -d' ' -f2-)" -export WIREGUARD_MORIA_PUBKEY="$(pass reekynet/wireguard/moria | grep PublicKey | cut -d' ' -f2-)" +export WIREGUARD_MORIA_PRIVKEY="$(pass selfhosted/wireguard/moria | grep PrivateKey | cut -d' ' -f2-)" +export WIREGUARD_MORIA_PUBKEY="$(pass selfhosted/wireguard/moria | grep PublicKey | cut -d' ' -f2-)" + +export EMAIL_MARKO_PASS="$(pass email/marko@korhonen.cc | head -1)" +export EMAIL_ADMIN_PASS="$(pass email/admin@korhonen.cc | head -1)" diff --git a/secrets/secrets.sh b/secrets/secrets.sh index 724a5b9b..535020d6 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -23,4 +23,9 @@ export WIREGUARD_MIRKWOOD_PSK="$WIREGUARD_MIRKWOOD_PSK" export WIREGUARD_MORIA_PRIVKEY="$WIREGUARD_MORIA_PRIVKEY" export WIREGUARD_MORIA_PUBKEY="$WIREGUARD_MORIA_PUBKEY" + +export EMAIL_MARKO_PASS="$EMAIL_MARKO_PASS" +export EMAIL_ADMIN_PASS="$EMAIL_MARKO_PASS" SECRET + +chmod 600 $DOTREPO/secrets/secrets From b4caabcbb046f9808787441e14c6230bf7a39306 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 13:23:01 +0200 Subject: [PATCH 0507/2667] Update secrets --- secrets/env | 24 ++++++++++++------------ secrets/secrets.sh | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/secrets/env b/secrets/env index 55e10bcc..9d4d342a 100755 --- a/secrets/env +++ b/secrets/env @@ -1,15 +1,18 @@ #!/bin/bash -export PASS_LIBREFM="$(pass entertainment/libre.fm | head -n 1)" -export PASS_MUSICBRAINZ="$(pass entertainment/musicbrainz.org | head -n 1)" +export PASS_LIBREFM="$(pass entertainment/libre.fm | head -1)" +export PASS_MUSICBRAINZ="$(pass entertainment/musicbrainz.org | head -1)" export PASS_LISTENBRAINZ="$(pass entertainment/musicbrainz.org | rg 'listenbrainz_token' | cut -d' ' -f2-)" -export PASS_MUSPY="$(pass entertainment/muspy.com | head -n 1)" -export PASS_ARIA2="$(pass linux/aria2 | head -n 1)" -export PASS_MPD="$(pass linux/mpd | head -n 1)" -export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -n 1)" -export PASS_IPMI="$(pass selfhosted/idrac | head -n 1)" -export PASS_MQTT="$(pass selfhosted/mqtt.reekynet.com | head -n 1)" +export PASS_MUSPY="$(pass entertainment/muspy.com | head -1)" +export PASS_ARIA2="$(pass linux/aria2 | head -1)" +export PASS_MPD="$(pass linux/mpd | head -1)" +export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -1)" +export PASS_IPMI="$(pass selfhosted/idrac | head -1)" +export PASS_MQTT="$(pass selfhosted/mqtt.reekynet.com | head -1)" -export ME_FULLNAME="$(pass me | head -n 1)" +export PASS_EMAIL_MARKO="$(pass email/marko@korhonen.cc | head -1)" +export PASS_EMAIL_ADMIN="$(pass email/admin@korhonen.cc | head -1)" + +export ME_FULLNAME="$(pass me | head -1)" export ME_ADDRESS="$(pass me | rg 'address' | cut -d' ' -f2-)" export ME_PHONE="$(pass me | rg 'phone' | cut -d' ' -f2-)" @@ -19,6 +22,3 @@ export WIREGUARD_MIRKWOOD_PSK="$(pass selfhosted/wireguard/mirkwood | grep PreSh export WIREGUARD_MORIA_PRIVKEY="$(pass selfhosted/wireguard/moria | grep PrivateKey | cut -d' ' -f2-)" export WIREGUARD_MORIA_PUBKEY="$(pass selfhosted/wireguard/moria | grep PublicKey | cut -d' ' -f2-)" - -export EMAIL_MARKO_PASS="$(pass email/marko@korhonen.cc | head -1)" -export EMAIL_ADMIN_PASS="$(pass email/admin@korhonen.cc | head -1)" diff --git a/secrets/secrets.sh b/secrets/secrets.sh index 535020d6..3f866ad8 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -13,6 +13,9 @@ export PASS_MPD_ADMIN="$PASS_MPD_ADMIN" export PASS_IPMI="$PASS_IPMI" export PASS_MQTT="$PASS_MQTT" +export PASS_EMAIL_MARKO="$PASS_EMAIL_MARKO" +export PASS_EMAIL_ADMIN="$PASS_EMAIL_MARKO" + export ME_FULLNAME="$ME_FULLNAME" export ME_ADDRESS="$ME_ADDRESS" export ME_PHONE="$ME_PHONE" @@ -23,9 +26,6 @@ export WIREGUARD_MIRKWOOD_PSK="$WIREGUARD_MIRKWOOD_PSK" export WIREGUARD_MORIA_PRIVKEY="$WIREGUARD_MORIA_PRIVKEY" export WIREGUARD_MORIA_PUBKEY="$WIREGUARD_MORIA_PUBKEY" - -export EMAIL_MARKO_PASS="$EMAIL_MARKO_PASS" -export EMAIL_ADMIN_PASS="$EMAIL_MARKO_PASS" SECRET chmod 600 $DOTREPO/secrets/secrets From c8afa83400be74b1005e2d540dae2d65c8cabe36 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 13:23:01 +0200 Subject: [PATCH 0508/2667] Update secrets --- secrets/env | 24 ++++++++++++------------ secrets/secrets.sh | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/secrets/env b/secrets/env index 55e10bcc..9d4d342a 100755 --- a/secrets/env +++ b/secrets/env @@ -1,15 +1,18 @@ #!/bin/bash -export PASS_LIBREFM="$(pass entertainment/libre.fm | head -n 1)" -export PASS_MUSICBRAINZ="$(pass entertainment/musicbrainz.org | head -n 1)" +export PASS_LIBREFM="$(pass entertainment/libre.fm | head -1)" +export PASS_MUSICBRAINZ="$(pass entertainment/musicbrainz.org | head -1)" export PASS_LISTENBRAINZ="$(pass entertainment/musicbrainz.org | rg 'listenbrainz_token' | cut -d' ' -f2-)" -export PASS_MUSPY="$(pass entertainment/muspy.com | head -n 1)" -export PASS_ARIA2="$(pass linux/aria2 | head -n 1)" -export PASS_MPD="$(pass linux/mpd | head -n 1)" -export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -n 1)" -export PASS_IPMI="$(pass selfhosted/idrac | head -n 1)" -export PASS_MQTT="$(pass selfhosted/mqtt.reekynet.com | head -n 1)" +export PASS_MUSPY="$(pass entertainment/muspy.com | head -1)" +export PASS_ARIA2="$(pass linux/aria2 | head -1)" +export PASS_MPD="$(pass linux/mpd | head -1)" +export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -1)" +export PASS_IPMI="$(pass selfhosted/idrac | head -1)" +export PASS_MQTT="$(pass selfhosted/mqtt.reekynet.com | head -1)" -export ME_FULLNAME="$(pass me | head -n 1)" +export PASS_EMAIL_MARKO="$(pass email/marko@korhonen.cc | head -1)" +export PASS_EMAIL_ADMIN="$(pass email/admin@korhonen.cc | head -1)" + +export ME_FULLNAME="$(pass me | head -1)" export ME_ADDRESS="$(pass me | rg 'address' | cut -d' ' -f2-)" export ME_PHONE="$(pass me | rg 'phone' | cut -d' ' -f2-)" @@ -19,6 +22,3 @@ export WIREGUARD_MIRKWOOD_PSK="$(pass selfhosted/wireguard/mirkwood | grep PreSh export WIREGUARD_MORIA_PRIVKEY="$(pass selfhosted/wireguard/moria | grep PrivateKey | cut -d' ' -f2-)" export WIREGUARD_MORIA_PUBKEY="$(pass selfhosted/wireguard/moria | grep PublicKey | cut -d' ' -f2-)" - -export EMAIL_MARKO_PASS="$(pass email/marko@korhonen.cc | head -1)" -export EMAIL_ADMIN_PASS="$(pass email/admin@korhonen.cc | head -1)" diff --git a/secrets/secrets.sh b/secrets/secrets.sh index 535020d6..3f866ad8 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -13,6 +13,9 @@ export PASS_MPD_ADMIN="$PASS_MPD_ADMIN" export PASS_IPMI="$PASS_IPMI" export PASS_MQTT="$PASS_MQTT" +export PASS_EMAIL_MARKO="$PASS_EMAIL_MARKO" +export PASS_EMAIL_ADMIN="$PASS_EMAIL_MARKO" + export ME_FULLNAME="$ME_FULLNAME" export ME_ADDRESS="$ME_ADDRESS" export ME_PHONE="$ME_PHONE" @@ -23,9 +26,6 @@ export WIREGUARD_MIRKWOOD_PSK="$WIREGUARD_MIRKWOOD_PSK" export WIREGUARD_MORIA_PRIVKEY="$WIREGUARD_MORIA_PRIVKEY" export WIREGUARD_MORIA_PUBKEY="$WIREGUARD_MORIA_PUBKEY" - -export EMAIL_MARKO_PASS="$EMAIL_MARKO_PASS" -export EMAIL_ADMIN_PASS="$EMAIL_MARKO_PASS" SECRET chmod 600 $DOTREPO/secrets/secrets From f3ddc2bdde5819273cdf85398ded8d0b7323fe2a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 14:52:26 +0200 Subject: [PATCH 0509/2667] Updated dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 2d64e2ee..0ebbdf7a 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 2d64e2ee59281e358253fadb04432a040f9392ee +Subproject commit 0ebbdf7a84c557a41e415afbe4e0a41ed8a2f1e5 From 6df6755198d2cd6b59e5b126eb3b4cc35694ee96 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 14:52:26 +0200 Subject: [PATCH 0510/2667] Updated dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 2d64e2ee..0ebbdf7a 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 2d64e2ee59281e358253fadb04432a040f9392ee +Subproject commit 0ebbdf7a84c557a41e415afbe4e0a41ed8a2f1e5 From e43d577871aa44128f6858f83944157fe7136a5a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 14:55:13 +0200 Subject: [PATCH 0511/2667] Switch to paru --- home/.config/paru/paru.conf | 2 ++ home/.config/yay/config.json | 40 ------------------------------------ 2 files changed, 2 insertions(+), 40 deletions(-) create mode 100644 home/.config/paru/paru.conf delete mode 100644 home/.config/yay/config.json diff --git a/home/.config/paru/paru.conf b/home/.config/paru/paru.conf new file mode 100644 index 00000000..1a8d3038 --- /dev/null +++ b/home/.config/paru/paru.conf @@ -0,0 +1,2 @@ +[options] +NewsOnUpgrade diff --git a/home/.config/yay/config.json b/home/.config/yay/config.json deleted file mode 100644 index 7bf0b632..00000000 --- a/home/.config/yay/config.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "aururl": "https://aur.archlinux.org", - "buildDir": "$HOME/.cache/yay", - "editor": "vim", - "editorflags": "", - "makepkgbin": "makepkg", - "makepkgconf": "", - "pacmanbin": "pacman", - "pacmanconf": "/etc/pacman.conf", - "tarbin": "bsdtar", - "redownload": "no", - "rebuild": "no", - "answerclean": "", - "answerdiff": "", - "answeredit": "", - "answerupgrade": "", - "gitbin": "git", - "gpgbin": "gpg", - "gpgflags": "", - "mflags": "", - "sortby": "votes", - "gitflags": "", - "removemake": "ask", - "requestsplitn": 150, - "sortmode": 0, - "completionrefreshtime": 7, - "sudoloop": false, - "timeupdate": false, - "devel": false, - "cleanAfter": false, - "gitclone": true, - "provides": true, - "pgpfetch": true, - "upgrademenu": true, - "cleanmenu": true, - "diffmenu": true, - "editmenu": false, - "combinedupgrade": true, - "useask": false -} From d78c648118fabb207dd132dc2b3a4050533c00ca Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 14:55:13 +0200 Subject: [PATCH 0512/2667] Switch to paru --- home/.config/paru/paru.conf | 2 ++ home/.config/yay/config.json | 40 ------------------------------------ 2 files changed, 2 insertions(+), 40 deletions(-) create mode 100644 home/.config/paru/paru.conf delete mode 100644 home/.config/yay/config.json diff --git a/home/.config/paru/paru.conf b/home/.config/paru/paru.conf new file mode 100644 index 00000000..1a8d3038 --- /dev/null +++ b/home/.config/paru/paru.conf @@ -0,0 +1,2 @@ +[options] +NewsOnUpgrade diff --git a/home/.config/yay/config.json b/home/.config/yay/config.json deleted file mode 100644 index 7bf0b632..00000000 --- a/home/.config/yay/config.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "aururl": "https://aur.archlinux.org", - "buildDir": "$HOME/.cache/yay", - "editor": "vim", - "editorflags": "", - "makepkgbin": "makepkg", - "makepkgconf": "", - "pacmanbin": "pacman", - "pacmanconf": "/etc/pacman.conf", - "tarbin": "bsdtar", - "redownload": "no", - "rebuild": "no", - "answerclean": "", - "answerdiff": "", - "answeredit": "", - "answerupgrade": "", - "gitbin": "git", - "gpgbin": "gpg", - "gpgflags": "", - "mflags": "", - "sortby": "votes", - "gitflags": "", - "removemake": "ask", - "requestsplitn": 150, - "sortmode": 0, - "completionrefreshtime": 7, - "sudoloop": false, - "timeupdate": false, - "devel": false, - "cleanAfter": false, - "gitclone": true, - "provides": true, - "pgpfetch": true, - "upgrademenu": true, - "cleanmenu": true, - "diffmenu": true, - "editmenu": false, - "combinedupgrade": true, - "useask": false -} From 5dee29be707c51b93f287e451f042f9195ad1305 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 15:36:35 +0200 Subject: [PATCH 0513/2667] Update deploy.sh --- deploy.sh | 87 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 33 deletions(-) mode change 100644 => 100755 deploy.sh diff --git a/deploy.sh b/deploy.sh old mode 100644 new mode 100755 index b7546ff5..7c5b8e78 --- a/deploy.sh +++ b/deploy.sh @@ -1,18 +1,19 @@ -#!/bin/bash +#!/bin/zsh -# to run this, execute -# bash <(curl -sL git.reekynet.com/ReekyMarko/dotfiles/raw/branch/master/deploy.sh) +# This is a script that should be ran once +# on a new system. Dotdrop will take it from there. +# It is higly tailored to my own needs and +# you (the random person on the internet) should probably not run it -# Run this to install my dotfiles on a fresh Arch Linux installation. -# This should work on any Arch Linux install with an internet connection -# and sudo rights +export DOTREPO="$HOME/git/dotfiles" +DISTRO="$(lsb_release -ds | sed 's/"//g')" -# When asked a hostname, make sure it's already in the dotrop config, -# otherwise dotdrop won't install anything +PKGLIST="" -export DOTREPO="$HOME/Git/dotfiles" -export HOSTNAME="$(hostnamectl | head -n 1 | sed 's/ //g' | cut -d':' -f2-)" -export DISTRO="$(lsb_release -ds | sed 's/"//g')" +if [ -d $DOTREPO ]; then + print "Dotfile repository already exists, exiting..." + exit 1 +fi if [ "$DISTRO" -ne "Arch Linux" ]; then print "Not running on Arch Linux" @@ -20,31 +21,51 @@ if [ "$DISTRO" -ne "Arch Linux" ]; then exit 1 fi -read -p "Hostname [$HOSTNAME]: " -i $HOSTNAME NEWHOSTNAME -if [ "$HOSTNAME -ne $NEWHOSTNAME" ]; then - sudo hostnamectl set-hostname $NEWHOSTNAME -fi -HOSTNAME=$NEWHOSTNAME - -# install yay -if ! [ -x "$(command -v yay)" ]; then - read -p "Install yay? [Y/n] " -i "y" IYAY - if [ "$(tr '[:upper:]' ':lower:' $IYAY)" -eq "y" ]; then - print "Installing yay" +# install neovim if not installed +if ! [ -x "$(command -v nvim)" ]; then + read -p "Install neovim? [Y/n] " -i "y" INVIM + if [ "$(tr '[:upper:]' ':lower:' $INVIM)" -eq "y" ]; then + print "Installing neovim" + PKGLIST=$PKGLIST + " neovim neovim-dropin" fi - sudo pacman -Syu --needed --noconfirm git wget base-devel - cd - wget https://aur.archlinux.org/cgit/aur.git/snapshot/yay.tar.gz - tar xfv yay.tar.gz - cd yay - makepkg -si --noconfirm - cd .. - rm -r yay* fi -mkdir ~/Git -git clone https://git.reekynet.com/ReekyMarko/dotfiles.git $DOTREPO -cd ~/Git/dotfiles +# install zsh if not installed +if ! [ -x "$(command -v zsh)" ]; then + read -p "Install zsh? [Y/n] " -i "y" IZSH + if [ "$(tr '[:upper:]' ':lower:' $INVIM)" -eq "y" ]; then + print "Installing zsh" + PKGLIST=$PKGLIST + " zsh" + fi +fi + +# install paru if not installed +if ! [ -x "$(command -v paru)" ]; then + read -p "Install paru? [Y/n] " -i "y" IYAY + if [ "$(tr '[:upper:]' ':lower:' $IYAY)" -eq "y" ]; then + print "Installing paru" + sudo pacman -Syu --needed --noconfirm git wget base-devel + cd + wget https://aur.archlinux.org/cgit/aur.git/snapshot/paru-bin.tar.gz + tar xfv paru.tar.gz + cd paru + makepkg -si --noconfirm + cd .. + rm -r paru* + fi +fi + +if [ $PKGLIST -ne "" ] + if ! [ -x "$(command -v paru)" ]; then + print "Can't continue without paru" + + paru -S $PKGLIST + fi +fi + +mkdir ~/git +git clone https://git.korhonen.cc/ReekyMarko/dotfiles.git $DOTREPO +cd ~/git/dotfiles git submodule init git submodule update $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-home.yaml install From a636b35727f9ac5d7bf1c511fbe43225b5fd711e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 15:36:35 +0200 Subject: [PATCH 0514/2667] Update deploy.sh --- deploy.sh | 87 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 33 deletions(-) mode change 100644 => 100755 deploy.sh diff --git a/deploy.sh b/deploy.sh old mode 100644 new mode 100755 index b7546ff5..7c5b8e78 --- a/deploy.sh +++ b/deploy.sh @@ -1,18 +1,19 @@ -#!/bin/bash +#!/bin/zsh -# to run this, execute -# bash <(curl -sL git.reekynet.com/ReekyMarko/dotfiles/raw/branch/master/deploy.sh) +# This is a script that should be ran once +# on a new system. Dotdrop will take it from there. +# It is higly tailored to my own needs and +# you (the random person on the internet) should probably not run it -# Run this to install my dotfiles on a fresh Arch Linux installation. -# This should work on any Arch Linux install with an internet connection -# and sudo rights +export DOTREPO="$HOME/git/dotfiles" +DISTRO="$(lsb_release -ds | sed 's/"//g')" -# When asked a hostname, make sure it's already in the dotrop config, -# otherwise dotdrop won't install anything +PKGLIST="" -export DOTREPO="$HOME/Git/dotfiles" -export HOSTNAME="$(hostnamectl | head -n 1 | sed 's/ //g' | cut -d':' -f2-)" -export DISTRO="$(lsb_release -ds | sed 's/"//g')" +if [ -d $DOTREPO ]; then + print "Dotfile repository already exists, exiting..." + exit 1 +fi if [ "$DISTRO" -ne "Arch Linux" ]; then print "Not running on Arch Linux" @@ -20,31 +21,51 @@ if [ "$DISTRO" -ne "Arch Linux" ]; then exit 1 fi -read -p "Hostname [$HOSTNAME]: " -i $HOSTNAME NEWHOSTNAME -if [ "$HOSTNAME -ne $NEWHOSTNAME" ]; then - sudo hostnamectl set-hostname $NEWHOSTNAME -fi -HOSTNAME=$NEWHOSTNAME - -# install yay -if ! [ -x "$(command -v yay)" ]; then - read -p "Install yay? [Y/n] " -i "y" IYAY - if [ "$(tr '[:upper:]' ':lower:' $IYAY)" -eq "y" ]; then - print "Installing yay" +# install neovim if not installed +if ! [ -x "$(command -v nvim)" ]; then + read -p "Install neovim? [Y/n] " -i "y" INVIM + if [ "$(tr '[:upper:]' ':lower:' $INVIM)" -eq "y" ]; then + print "Installing neovim" + PKGLIST=$PKGLIST + " neovim neovim-dropin" fi - sudo pacman -Syu --needed --noconfirm git wget base-devel - cd - wget https://aur.archlinux.org/cgit/aur.git/snapshot/yay.tar.gz - tar xfv yay.tar.gz - cd yay - makepkg -si --noconfirm - cd .. - rm -r yay* fi -mkdir ~/Git -git clone https://git.reekynet.com/ReekyMarko/dotfiles.git $DOTREPO -cd ~/Git/dotfiles +# install zsh if not installed +if ! [ -x "$(command -v zsh)" ]; then + read -p "Install zsh? [Y/n] " -i "y" IZSH + if [ "$(tr '[:upper:]' ':lower:' $INVIM)" -eq "y" ]; then + print "Installing zsh" + PKGLIST=$PKGLIST + " zsh" + fi +fi + +# install paru if not installed +if ! [ -x "$(command -v paru)" ]; then + read -p "Install paru? [Y/n] " -i "y" IYAY + if [ "$(tr '[:upper:]' ':lower:' $IYAY)" -eq "y" ]; then + print "Installing paru" + sudo pacman -Syu --needed --noconfirm git wget base-devel + cd + wget https://aur.archlinux.org/cgit/aur.git/snapshot/paru-bin.tar.gz + tar xfv paru.tar.gz + cd paru + makepkg -si --noconfirm + cd .. + rm -r paru* + fi +fi + +if [ $PKGLIST -ne "" ] + if ! [ -x "$(command -v paru)" ]; then + print "Can't continue without paru" + + paru -S $PKGLIST + fi +fi + +mkdir ~/git +git clone https://git.korhonen.cc/ReekyMarko/dotfiles.git $DOTREPO +cd ~/git/dotfiles git submodule init git submodule update $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-home.yaml install From b6f0f453e3c70076971c3ac9d6c895383cfda155 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 15:36:57 +0200 Subject: [PATCH 0515/2667] Update dotdrop --- dotdrop | 2 +- dotdrop.sh | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100755 dotdrop.sh diff --git a/dotdrop b/dotdrop index 0ebbdf7a..675c8206 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 0ebbdf7a84c557a41e415afbe4e0a41ed8a2f1e5 +Subproject commit 675c8206061269a10ed3e03871be0264fc784ce2 diff --git a/dotdrop.sh b/dotdrop.sh new file mode 100755 index 00000000..8c458a5f --- /dev/null +++ b/dotdrop.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash +# author: deadc0de6 (https://github.com/deadc0de6) +# Copyright (c) 2017, deadc0de6 + +# check for readlink/realpath presence +# https://github.com/deadc0de6/dotdrop/issues/6 +rl="readlink -f" + +if ! ${rl} "${0}" >/dev/null 2>&1; then + rl="realpath" + + if ! hash ${rl}; then + echo "\"${rl}\" not found!" && exit 1 + fi +fi + +# setup variables +args=("$@") +cur=$(dirname "$(${rl} "${0}")") +opwd=$(pwd) +cfg="${cur}/config.yaml" +sub="dotdrop" + +# pivot +cd "${cur}" || { echo "Directory \"${cur}\" doesn't exist, aborting." && exit 1; } +# init/update the submodule +if [ "${DOTDROP_AUTOUPDATE-yes}" = yes ] ; then + git submodule update --init --recursive + git submodule update --remote dotdrop +fi +# launch dotdrop +PYTHONPATH=dotdrop python3 -m dotdrop.dotdrop "${args[@]}" +ret="$?" +# pivot back +cd "${opwd}" || { echo "Directory \"${opwd}\" doesn't exist, aborting." && exit 1; } +# exit with dotdrop exit code +exit ${ret} From 4f1b4b54d3d65685ae0a79933e5229b75405d863 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 15:36:57 +0200 Subject: [PATCH 0516/2667] Update dotdrop --- dotdrop | 2 +- dotdrop.sh | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100755 dotdrop.sh diff --git a/dotdrop b/dotdrop index 0ebbdf7a..675c8206 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 0ebbdf7a84c557a41e415afbe4e0a41ed8a2f1e5 +Subproject commit 675c8206061269a10ed3e03871be0264fc784ce2 diff --git a/dotdrop.sh b/dotdrop.sh new file mode 100755 index 00000000..8c458a5f --- /dev/null +++ b/dotdrop.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash +# author: deadc0de6 (https://github.com/deadc0de6) +# Copyright (c) 2017, deadc0de6 + +# check for readlink/realpath presence +# https://github.com/deadc0de6/dotdrop/issues/6 +rl="readlink -f" + +if ! ${rl} "${0}" >/dev/null 2>&1; then + rl="realpath" + + if ! hash ${rl}; then + echo "\"${rl}\" not found!" && exit 1 + fi +fi + +# setup variables +args=("$@") +cur=$(dirname "$(${rl} "${0}")") +opwd=$(pwd) +cfg="${cur}/config.yaml" +sub="dotdrop" + +# pivot +cd "${cur}" || { echo "Directory \"${cur}\" doesn't exist, aborting." && exit 1; } +# init/update the submodule +if [ "${DOTDROP_AUTOUPDATE-yes}" = yes ] ; then + git submodule update --init --recursive + git submodule update --remote dotdrop +fi +# launch dotdrop +PYTHONPATH=dotdrop python3 -m dotdrop.dotdrop "${args[@]}" +ret="$?" +# pivot back +cd "${opwd}" || { echo "Directory \"${opwd}\" doesn't exist, aborting." && exit 1; } +# exit with dotdrop exit code +exit ${ret} From f5f4c5c267bce84fd8b697e8e9362ec76354c4bb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 15:37:58 +0200 Subject: [PATCH 0517/2667] Working on migrating to neomutt --- config-home.yaml | 153 ++++++++++-------- config.yaml | 1 + .../.config/imapnotify/admin@korhonen.cc.conf | 13 ++ .../.config/imapnotify/marko@korhonen.cc.conf | 13 ++ ...orhonen@reekynet.com => admin@korhonen.cc} | 4 +- .../neomutt/accounts/admin@reekynet.com | 14 -- ...rhonen@metropolia.fi => marko@korhonen.cc} | 8 +- .../neomutt/accounts/reekymarko@reekynet.com | 15 -- home/.config/neomutt/neomuttrc | 10 +- home/.config/neomutt/sidebar | 2 +- home/.config/zsh/01-env.zsh | 4 +- home/.config/zsh/03-aliases.zsh | 6 +- home/.mbsyncrc | 99 +++--------- secrets/secrets.sh | 2 +- 14 files changed, 153 insertions(+), 191 deletions(-) create mode 120000 config.yaml create mode 100644 home/.config/imapnotify/admin@korhonen.cc.conf create mode 100644 home/.config/imapnotify/marko@korhonen.cc.conf rename home/.config/neomutt/accounts/{marko.korhonen@reekynet.com => admin@korhonen.cc} (87%) delete mode 100644 home/.config/neomutt/accounts/admin@reekynet.com rename home/.config/neomutt/accounts/{marko.korhonen@metropolia.fi => marko@korhonen.cc} (74%) delete mode 100644 home/.config/neomutt/accounts/reekymarko@reekynet.com diff --git a/config-home.yaml b/config-home.yaml index 959260f9..e34b03a2 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -19,12 +19,18 @@ dotfiles: d_mpv: dst: ~/.config/mpv src: .config/mpv + d_neomutt: + dst: ~/.config/neomutt + src: .config/neomutt + d_goimapnotify: + dst: ~/.config/imapnotify + src: .config/imapnotify f_init.vim: dst: ~/.config/nvim/init.vim src: .config/nvim/init.vim d_nvim_config: actions: - - vim-plug + - vim-plug dst: ~/.config/nvim/conf.d src: .config/nvim/conf.d f_coc-settings.json: @@ -45,6 +51,9 @@ dotfiles: f_abcde.conf: dst: ~/.abcde.conf src: .abcde.conf + f_mbsyncrc: + dst: ~/.mbsyncrc + src: .mbsyncrc f_alacritty.yml: dst: ~/.config/alacritty/alacritty.yml src: .config/alacritty/alacritty.yml @@ -114,9 +123,6 @@ dotfiles: f_tmux.conf: dst: ~/.tmux.conf src: .tmux.conf - f_yay_config.json: - dst: ~/.config/yay/config.json - src: .config/yay/config.json f_youtube-dl_config: dst: ~/.config/youtube-dl/config src: .config/youtube-dl/config @@ -147,87 +153,98 @@ dotfiles: f_hushlogin: src: .hushlogin dst: ~/.hushlogin + f_paru.conf: + src: .config/paru/paru.conf + dst: ~/.config/paru/paru.conf profiles: - Base: + base: dotfiles: - - d_systemd - Media: + - d_systemd + terminal: dotfiles: - - f_beets_config - - f_beets_whitelist - - f_abcde.conf - - d_mpv - - f_youtube-dl_config - - f_mpd.conf - - f_ncmpcpp_bindings - - f_ncmpcpp.conf - - f_libra_config - - f_mpdscribble.conf - - f_mpdris2.conf - Sway: + - f_nvimpager + - f_hushlogin + - f_ripgrep_ignore + - f_ranger_commands.py + - f_rtv.cfg + - f_mailcap + - d_zsh + - f_zshrc + - f_tmux.conf + - f_gitconfig + - f_ranger.conf + - f_ssh.conf + - f_authorized_keys + - d_scripts + - d_nvim_config + - f_init.vim + - f_coc-settings.json + - f_gitconfig + - f_alacritty.yml + email: dotfiles: - - d_sway - - d_waybar - - d_wofi - - f_mako_config - - f_redshift.conf - - f_zathurarc - - f_mimeo_associations.txt - - f_tdesktop_lang.strings - - f_fonts.conf - - f_zprofile + - d_neomutt + - d_goimapnotify + - f_mbsyncrc + media: + dotfiles: + - f_beets_config + - f_beets_whitelist + - f_abcde.conf + - d_mpv + - f_youtube-dl_config + - f_mpd.conf + - f_ncmpcpp_bindings + - f_ncmpcpp.conf + - f_libra_config + - f_mpdscribble.conf + - f_mpdris2.conf + sway: + dotfiles: + - d_sway + - d_waybar + - d_wofi + - f_mako_config + - f_redshift.conf + - f_zathurarc + - f_mimeo_associations.txt + - f_tdesktop_lang.strings + - f_fonts.conf + - f_zprofile Pacman: dotfiles: - - f_yay_config.json - - f_makepkg.conf + - f_makepkg.conf + - f_paru.conf Mirkwood: include: - - Base - - Terminal - - Media - - Sway - - Pacman + - base + - terminal + - email + - media + - sway + - Pacman + dotfiles: + - f_paru.conf Moria: include: - - Terminal - - Media - - Pacman + - terminal + - media + - Pacman Gondor: include: - - Terminal - - Pacman + - terminal + - Pacman mko-laptop: include: - - Terminal - Terminal: - dotfiles: - - f_nvimpager - - f_hushlogin - - f_ripgrep_ignore - - f_ranger_commands.py - - f_rtv.cfg - - f_mailcap - - d_zsh - - f_zshrc - - f_tmux.conf - - f_gitconfig - - f_ranger.conf - - f_ssh.conf - - f_authorized_keys - - d_scripts - - d_nvim_config - - f_init.vim - - f_coc-settings.json - - f_gitconfig - - f_alacritty.yml + - terminal AnittaPC: include: - - Terminal - - Pacman + - terminal + - Pacman TakamakiPC: include: - - Terminal - - Pacman + - terminal + - Pacman localhost: include: - - Terminal + - terminal diff --git a/config.yaml b/config.yaml new file mode 120000 index 00000000..65245343 --- /dev/null +++ b/config.yaml @@ -0,0 +1 @@ +config-home.yaml \ No newline at end of file diff --git a/home/.config/imapnotify/admin@korhonen.cc.conf b/home/.config/imapnotify/admin@korhonen.cc.conf new file mode 100644 index 00000000..cecd8bad --- /dev/null +++ b/home/.config/imapnotify/admin@korhonen.cc.conf @@ -0,0 +1,13 @@ +{ + "host": "imap.migadu.com", + "port": 993, + "tls": true, + "tlsOptions": { + "rejectUnauthorized": true + }, + "username": "admin@korhonen.cc", + "password": "{{@@ env['PASS_EMAIL_ADMIN'] @@}}", + "onNewMail": "mbsync admin@korhonen.cc", + "onNewMailPost": "", + "boxes": [ "INBOX" ] +} diff --git a/home/.config/imapnotify/marko@korhonen.cc.conf b/home/.config/imapnotify/marko@korhonen.cc.conf new file mode 100644 index 00000000..4572d3d7 --- /dev/null +++ b/home/.config/imapnotify/marko@korhonen.cc.conf @@ -0,0 +1,13 @@ +{ + "host": "imap.migadu.com", + "port": 993, + "tls": true, + "tlsOptions": { + "rejectUnauthorized": true + }, + "username": "marko@korhonen.cc", + "password": "{{@@ env['PASS_EMAIL_MARKO'] @@}}", + "onNewMail": "mbsync marko@korhonen.cc", + "onNewMailPost": "", + "boxes": [ "INBOX" ] +} diff --git a/home/.config/neomutt/accounts/marko.korhonen@reekynet.com b/home/.config/neomutt/accounts/admin@korhonen.cc similarity index 87% rename from home/.config/neomutt/accounts/marko.korhonen@reekynet.com rename to home/.config/neomutt/accounts/admin@korhonen.cc index 8b9d02be..4bea53ab 100644 --- a/home/.config/neomutt/accounts/marko.korhonen@reekynet.com +++ b/home/.config/neomutt/accounts/admin@korhonen.cc @@ -1,6 +1,6 @@ -# vim: filetype=muttrc +# vim: filetype=neomuttrc -set my_email = "marko.korhonen@reekynet.com" +set my_email = "admin@korhonen.cc" set from = $my_email set sendmail = "/usr/bin/msmtp -a $my_email" set realname = "Marko Korhonen" diff --git a/home/.config/neomutt/accounts/admin@reekynet.com b/home/.config/neomutt/accounts/admin@reekynet.com deleted file mode 100644 index 45503efe..00000000 --- a/home/.config/neomutt/accounts/admin@reekynet.com +++ /dev/null @@ -1,14 +0,0 @@ -# vim: filetype=muttrc - -set my_email = "admin@reekynet.com" -set from = $my_email -set sendmail = "/usr/bin/msmtp -a $my_email" -set realname = "ReekyNET Admin" -set status_format = "-%r-Mutt: $my_email %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---" -set mbox_type = Maildir -set folder = "~/.mail/$my_email" -set mbox = "+INBOX" -set record = "+INBOX" -set postponed = "+Drafts" -set spoolfile = "+INBOX" -mailboxes = +INBOX diff --git a/home/.config/neomutt/accounts/marko.korhonen@metropolia.fi b/home/.config/neomutt/accounts/marko@korhonen.cc similarity index 74% rename from home/.config/neomutt/accounts/marko.korhonen@metropolia.fi rename to home/.config/neomutt/accounts/marko@korhonen.cc index f6c3442e..514d3598 100644 --- a/home/.config/neomutt/accounts/marko.korhonen@metropolia.fi +++ b/home/.config/neomutt/accounts/marko@korhonen.cc @@ -1,8 +1,8 @@ -# vim: filetype=muttrc +# vim: filetype=neomuttrc -set my_email = "marko.korhonen@metropolia.fi" -set from = $my_email -set sendmail = "/usr/bin/msmtp -a $my_email" +set my_email = "marko@korhonen.cc" +set from = $my_email +set sendmail = "/usr/bin/msmtp -a $my_email" set realname = "Marko Korhonen" set status_format = "-%r-Mutt: $my_email %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---" set mbox_type = Maildir diff --git a/home/.config/neomutt/accounts/reekymarko@reekynet.com b/home/.config/neomutt/accounts/reekymarko@reekynet.com deleted file mode 100644 index 9d578a85..00000000 --- a/home/.config/neomutt/accounts/reekymarko@reekynet.com +++ /dev/null @@ -1,15 +0,0 @@ -# vim: filetype=muttrc - -# Incoming mail from maildir -set my_email = "reekymarko@reekynet.com" -set from = $my_email -set sendmail = "/usr/bin/msmtp -a $my_email" -set realname = "Marko Korhonen" -set status_format = "-%r-Mutt: $my_email %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---" -set mbox_type = Maildir -set folder = ~/.mail/$my_email -set mbox = +INBOX -set record = +Sent -set postponed = +Drafts -set spoolfile = +INBOX -mailboxes = +INBOX diff --git a/home/.config/neomutt/neomuttrc b/home/.config/neomutt/neomuttrc index 85ff9e15..74020721 100644 --- a/home/.config/neomutt/neomuttrc +++ b/home/.config/neomutt/neomuttrc @@ -1,4 +1,4 @@ -# vim: filetype=muttrc +# vim: filetype=neomuttrc set sendmail = "/usr/bin/msmtp" set mbox_type = Maildir @@ -7,9 +7,7 @@ set spoolfile = +Personal/INBOX source ~/.config/neomutt/appearance source ~/.config/neomutt/sidebar -source ~/.config/neomutt/accounts/reekymarko@reekynet.com +source ~/.config/neomutt/accounts/marko@korhonen.cc -macro index 'source ~/.config/neomutt/accounts/reekymarko@reekynet.com!' -macro index 'source ~/.config/neomutt/accounts/marko.korhonen@reekynet.com!' -macro index 'source ~/.config/neomutt/accounts/admin@reekynet.com!' -macro index 'source ~/.config/neomutt/accounts/marko.korhonen@metropolia.fi!' +macro index 'source ~/.config/neomutt/accounts/marko@korhonen.cc!' +macro index 'source ~/.config/neomutt/accounts/admin@korhonen.cc!' diff --git a/home/.config/neomutt/sidebar b/home/.config/neomutt/sidebar index 616d505b..48b12525 100644 --- a/home/.config/neomutt/sidebar +++ b/home/.config/neomutt/sidebar @@ -1,4 +1,4 @@ -# vim: filetype=muttrc +# vim: filetype=neomuttrc set sidebar_visible = yes set sidebar_indent_string = ' ' diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 6bb9c623..8e509d7e 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -27,8 +27,8 @@ export FZF_CTRL_T_OPTS='--preview "/usr/bin/cat {} | nvimpager -c "' # use lesspipe with less export LESSOPEN="|lesspipe.sh %s" -# dotdrop repository location -export DOTREPO="$HOME/Git/dotfiles" +# dotfile repository location +export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 1b1b60a8..6fa5d6b3 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -117,8 +117,8 @@ cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } -dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-home.yaml $@ } -sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-root.yaml $@ } +dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-home.yaml $@ } +sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-root.yaml $@ } compdef _dotdrop-completion.zsh sdotdrop alias dotgit='git -C $DOTREPO' dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } @@ -156,7 +156,7 @@ update() { } docker-update() { - for dir in $HOME/Git/dotfiles/docker/*; do + for dir in $HOME/git/dotfiles/docker/*; do cd $dir docker-compose pull docker-compose up -d diff --git a/home/.mbsyncrc b/home/.mbsyncrc index 5f83b782..b9e97e87 100644 --- a/home/.mbsyncrc +++ b/home/.mbsyncrc @@ -1,99 +1,48 @@ -### reekymarko@reekynet.com ##################################### -IMAPAccount reekymarko@reekynet.com +### marko@korhonen.cc ##################################### +IMAPAccount marko@korhonen.cc Host imap.migadu.com -User reekymarko@reekynet.com -PassCmd "pass email/reekymarko@reekynet.com | head -n 1" +User marko@korhonen.cc +Pass "{{@@ env['PASS_EMAIL_MARKO'] @@}}" SSLType IMAPS Port 993 CertificateFile /etc/ssl/certs/ca-certificates.crt -IMAPStore reekymarko@reekynet.com-remote -Account reekymarko@reekynet.com +IMAPStore marko@korhonen.cc-remote +Account marko@korhonen.cc -MaildirStore reekymarko@reekynet.com-local +MaildirStore marko@korhonen.cc-local Subfolders Verbatim -Path ~/.mail/reekymarko@reekynet.com/ -Inbox ~/.mail/reekymarko@reekynet.com/INBOX +Path ~/.mail/marko@korhonen.cc/ +Inbox ~/.mail/marko@korhonen.cc/INBOX -Channel reekymarko@reekynet.com -Master :reekymarko@reekynet.com-remote: -Slave :reekymarko@reekynet.com-local: +Channel marko@korhonen.cc +Master :marko@korhonen.cc-remote: +Slave :marko@korhonen.cc-local: Create Both Patterns * SyncState * ################################################################# -### marko.korhonen@reekynet.com ##################################### -IMAPAccount marko.korhonen@reekynet.com +### admin@korhonen.cc ##################################### +IMAPAccount admin@korhonen.cc Host imap.migadu.com -User marko.korhonen@reekynet.com -PassCmd "pass email/marko.korhonen@reekynet.com | head -n 1" +User admin@korhonen.cc +Pass "{{@@ env['PASS_EMAIL_ADMIN'] @@}}" SSLType IMAPS Port 993 CertificateFile /etc/ssl/certs/ca-certificates.crt -IMAPStore marko.korhonen@reekynet.com-remote -Account marko.korhonen@reekynet.com +IMAPStore admin@korhonen.cc-remote +Account admin@korhonen.cc -MaildirStore marko.korhonen@reekynet.com-local +MaildirStore admin@korhonen.cc-local Subfolders Verbatim -Path ~/.mail/marko.korhonen@reekynet.com/ -Inbox ~/.mail/marko.korhonen@reekynet.com/INBOX +Path ~/.mail/admin@korhonen.cc/ +Inbox ~/.mail/admin@korhonen.cc/INBOX -Channel marko.korhonen@reekynet.com -Master :marko.korhonen@reekynet.com-remote: -Slave :marko.korhonen@reekynet.com-local: -Create Both -Patterns * -SyncState * -################################################################# - - -### admin@reekynet.com ##################################### -IMAPAccount admin@reekynet.com -Host imap.migadu.com -User admin@reekynet.com -PassCmd "pass email/admin@reekynet.com | head -n 1" -SSLType IMAPS -Port 993 -CertificateFile /etc/ssl/certs/ca-certificates.crt - -IMAPStore admin@reekynet.com-remote -Account admin@reekynet.com - -MaildirStore admin@reekynet.com-local -Subfolders Verbatim -Path ~/.mail/admin@reekynet.com/ -Inbox ~/.mail/admin@reekynet.com/INBOX - -Channel admin@reekynet.com -Master :admin@reekynet.com-remote: -Slave :admin@reekynet.com-local: -Create Both -Patterns * -SyncState * -################################################################# - -### marko.korhonen@metropolia.fi ##################################### -IMAPAccount marko.korhonen@metropolia.fi -Host imap.metropolia.fi -User markoak -PassCmd "pass email/marko.korhonen@metropolia.fi | head -n 1" -SSLType IMAPS -Port 993 -CertificateFile /etc/ssl/certs/ca-certificates.crt - -IMAPStore marko.korhonen@metropolia.fi-remote -Account marko.korhonen@metropolia.fi - -MaildirStore marko.korhonen@metropolia.fi-local -Subfolders Verbatim -Path ~/.mail/marko.korhonen@metropolia.fi/ -Inbox ~/.mail/marko.korhonen@metropolia.fi/INBOX - -Channel marko.korhonen@metropolia.fi -Master :marko.korhonen@metropolia.fi-remote: -Slave :marko.korhonen@metropolia.fi-local: +Channel admin@korhonen.cc +Master :admin@korhonen.cc-remote: +Slave :admin@korhonen.cc-local: Create Both Patterns * SyncState * diff --git a/secrets/secrets.sh b/secrets/secrets.sh index 3f866ad8..a33dac08 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -14,7 +14,7 @@ export PASS_IPMI="$PASS_IPMI" export PASS_MQTT="$PASS_MQTT" export PASS_EMAIL_MARKO="$PASS_EMAIL_MARKO" -export PASS_EMAIL_ADMIN="$PASS_EMAIL_MARKO" +export PASS_EMAIL_ADMIN="$PASS_EMAIL_ADMIN" export ME_FULLNAME="$ME_FULLNAME" export ME_ADDRESS="$ME_ADDRESS" From 4bdd1ca610e436b687883c6107a5707a11204a79 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 15:37:58 +0200 Subject: [PATCH 0518/2667] Working on migrating to neomutt --- config-home.yaml | 153 ++++++++++-------- config.yaml | 1 + .../.config/imapnotify/admin@korhonen.cc.conf | 13 ++ .../.config/imapnotify/marko@korhonen.cc.conf | 13 ++ ...orhonen@reekynet.com => admin@korhonen.cc} | 4 +- .../neomutt/accounts/admin@reekynet.com | 14 -- ...rhonen@metropolia.fi => marko@korhonen.cc} | 8 +- .../neomutt/accounts/reekymarko@reekynet.com | 15 -- home/.config/neomutt/neomuttrc | 10 +- home/.config/neomutt/sidebar | 2 +- home/.config/zsh/01-env.zsh | 4 +- home/.config/zsh/03-aliases.zsh | 6 +- home/.mbsyncrc | 99 +++--------- secrets/secrets.sh | 2 +- 14 files changed, 153 insertions(+), 191 deletions(-) create mode 120000 config.yaml create mode 100644 home/.config/imapnotify/admin@korhonen.cc.conf create mode 100644 home/.config/imapnotify/marko@korhonen.cc.conf rename home/.config/neomutt/accounts/{marko.korhonen@reekynet.com => admin@korhonen.cc} (87%) delete mode 100644 home/.config/neomutt/accounts/admin@reekynet.com rename home/.config/neomutt/accounts/{marko.korhonen@metropolia.fi => marko@korhonen.cc} (74%) delete mode 100644 home/.config/neomutt/accounts/reekymarko@reekynet.com diff --git a/config-home.yaml b/config-home.yaml index 959260f9..e34b03a2 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -19,12 +19,18 @@ dotfiles: d_mpv: dst: ~/.config/mpv src: .config/mpv + d_neomutt: + dst: ~/.config/neomutt + src: .config/neomutt + d_goimapnotify: + dst: ~/.config/imapnotify + src: .config/imapnotify f_init.vim: dst: ~/.config/nvim/init.vim src: .config/nvim/init.vim d_nvim_config: actions: - - vim-plug + - vim-plug dst: ~/.config/nvim/conf.d src: .config/nvim/conf.d f_coc-settings.json: @@ -45,6 +51,9 @@ dotfiles: f_abcde.conf: dst: ~/.abcde.conf src: .abcde.conf + f_mbsyncrc: + dst: ~/.mbsyncrc + src: .mbsyncrc f_alacritty.yml: dst: ~/.config/alacritty/alacritty.yml src: .config/alacritty/alacritty.yml @@ -114,9 +123,6 @@ dotfiles: f_tmux.conf: dst: ~/.tmux.conf src: .tmux.conf - f_yay_config.json: - dst: ~/.config/yay/config.json - src: .config/yay/config.json f_youtube-dl_config: dst: ~/.config/youtube-dl/config src: .config/youtube-dl/config @@ -147,87 +153,98 @@ dotfiles: f_hushlogin: src: .hushlogin dst: ~/.hushlogin + f_paru.conf: + src: .config/paru/paru.conf + dst: ~/.config/paru/paru.conf profiles: - Base: + base: dotfiles: - - d_systemd - Media: + - d_systemd + terminal: dotfiles: - - f_beets_config - - f_beets_whitelist - - f_abcde.conf - - d_mpv - - f_youtube-dl_config - - f_mpd.conf - - f_ncmpcpp_bindings - - f_ncmpcpp.conf - - f_libra_config - - f_mpdscribble.conf - - f_mpdris2.conf - Sway: + - f_nvimpager + - f_hushlogin + - f_ripgrep_ignore + - f_ranger_commands.py + - f_rtv.cfg + - f_mailcap + - d_zsh + - f_zshrc + - f_tmux.conf + - f_gitconfig + - f_ranger.conf + - f_ssh.conf + - f_authorized_keys + - d_scripts + - d_nvim_config + - f_init.vim + - f_coc-settings.json + - f_gitconfig + - f_alacritty.yml + email: dotfiles: - - d_sway - - d_waybar - - d_wofi - - f_mako_config - - f_redshift.conf - - f_zathurarc - - f_mimeo_associations.txt - - f_tdesktop_lang.strings - - f_fonts.conf - - f_zprofile + - d_neomutt + - d_goimapnotify + - f_mbsyncrc + media: + dotfiles: + - f_beets_config + - f_beets_whitelist + - f_abcde.conf + - d_mpv + - f_youtube-dl_config + - f_mpd.conf + - f_ncmpcpp_bindings + - f_ncmpcpp.conf + - f_libra_config + - f_mpdscribble.conf + - f_mpdris2.conf + sway: + dotfiles: + - d_sway + - d_waybar + - d_wofi + - f_mako_config + - f_redshift.conf + - f_zathurarc + - f_mimeo_associations.txt + - f_tdesktop_lang.strings + - f_fonts.conf + - f_zprofile Pacman: dotfiles: - - f_yay_config.json - - f_makepkg.conf + - f_makepkg.conf + - f_paru.conf Mirkwood: include: - - Base - - Terminal - - Media - - Sway - - Pacman + - base + - terminal + - email + - media + - sway + - Pacman + dotfiles: + - f_paru.conf Moria: include: - - Terminal - - Media - - Pacman + - terminal + - media + - Pacman Gondor: include: - - Terminal - - Pacman + - terminal + - Pacman mko-laptop: include: - - Terminal - Terminal: - dotfiles: - - f_nvimpager - - f_hushlogin - - f_ripgrep_ignore - - f_ranger_commands.py - - f_rtv.cfg - - f_mailcap - - d_zsh - - f_zshrc - - f_tmux.conf - - f_gitconfig - - f_ranger.conf - - f_ssh.conf - - f_authorized_keys - - d_scripts - - d_nvim_config - - f_init.vim - - f_coc-settings.json - - f_gitconfig - - f_alacritty.yml + - terminal AnittaPC: include: - - Terminal - - Pacman + - terminal + - Pacman TakamakiPC: include: - - Terminal - - Pacman + - terminal + - Pacman localhost: include: - - Terminal + - terminal diff --git a/config.yaml b/config.yaml new file mode 120000 index 00000000..65245343 --- /dev/null +++ b/config.yaml @@ -0,0 +1 @@ +config-home.yaml \ No newline at end of file diff --git a/home/.config/imapnotify/admin@korhonen.cc.conf b/home/.config/imapnotify/admin@korhonen.cc.conf new file mode 100644 index 00000000..cecd8bad --- /dev/null +++ b/home/.config/imapnotify/admin@korhonen.cc.conf @@ -0,0 +1,13 @@ +{ + "host": "imap.migadu.com", + "port": 993, + "tls": true, + "tlsOptions": { + "rejectUnauthorized": true + }, + "username": "admin@korhonen.cc", + "password": "{{@@ env['PASS_EMAIL_ADMIN'] @@}}", + "onNewMail": "mbsync admin@korhonen.cc", + "onNewMailPost": "", + "boxes": [ "INBOX" ] +} diff --git a/home/.config/imapnotify/marko@korhonen.cc.conf b/home/.config/imapnotify/marko@korhonen.cc.conf new file mode 100644 index 00000000..4572d3d7 --- /dev/null +++ b/home/.config/imapnotify/marko@korhonen.cc.conf @@ -0,0 +1,13 @@ +{ + "host": "imap.migadu.com", + "port": 993, + "tls": true, + "tlsOptions": { + "rejectUnauthorized": true + }, + "username": "marko@korhonen.cc", + "password": "{{@@ env['PASS_EMAIL_MARKO'] @@}}", + "onNewMail": "mbsync marko@korhonen.cc", + "onNewMailPost": "", + "boxes": [ "INBOX" ] +} diff --git a/home/.config/neomutt/accounts/marko.korhonen@reekynet.com b/home/.config/neomutt/accounts/admin@korhonen.cc similarity index 87% rename from home/.config/neomutt/accounts/marko.korhonen@reekynet.com rename to home/.config/neomutt/accounts/admin@korhonen.cc index 8b9d02be..4bea53ab 100644 --- a/home/.config/neomutt/accounts/marko.korhonen@reekynet.com +++ b/home/.config/neomutt/accounts/admin@korhonen.cc @@ -1,6 +1,6 @@ -# vim: filetype=muttrc +# vim: filetype=neomuttrc -set my_email = "marko.korhonen@reekynet.com" +set my_email = "admin@korhonen.cc" set from = $my_email set sendmail = "/usr/bin/msmtp -a $my_email" set realname = "Marko Korhonen" diff --git a/home/.config/neomutt/accounts/admin@reekynet.com b/home/.config/neomutt/accounts/admin@reekynet.com deleted file mode 100644 index 45503efe..00000000 --- a/home/.config/neomutt/accounts/admin@reekynet.com +++ /dev/null @@ -1,14 +0,0 @@ -# vim: filetype=muttrc - -set my_email = "admin@reekynet.com" -set from = $my_email -set sendmail = "/usr/bin/msmtp -a $my_email" -set realname = "ReekyNET Admin" -set status_format = "-%r-Mutt: $my_email %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---" -set mbox_type = Maildir -set folder = "~/.mail/$my_email" -set mbox = "+INBOX" -set record = "+INBOX" -set postponed = "+Drafts" -set spoolfile = "+INBOX" -mailboxes = +INBOX diff --git a/home/.config/neomutt/accounts/marko.korhonen@metropolia.fi b/home/.config/neomutt/accounts/marko@korhonen.cc similarity index 74% rename from home/.config/neomutt/accounts/marko.korhonen@metropolia.fi rename to home/.config/neomutt/accounts/marko@korhonen.cc index f6c3442e..514d3598 100644 --- a/home/.config/neomutt/accounts/marko.korhonen@metropolia.fi +++ b/home/.config/neomutt/accounts/marko@korhonen.cc @@ -1,8 +1,8 @@ -# vim: filetype=muttrc +# vim: filetype=neomuttrc -set my_email = "marko.korhonen@metropolia.fi" -set from = $my_email -set sendmail = "/usr/bin/msmtp -a $my_email" +set my_email = "marko@korhonen.cc" +set from = $my_email +set sendmail = "/usr/bin/msmtp -a $my_email" set realname = "Marko Korhonen" set status_format = "-%r-Mutt: $my_email %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---" set mbox_type = Maildir diff --git a/home/.config/neomutt/accounts/reekymarko@reekynet.com b/home/.config/neomutt/accounts/reekymarko@reekynet.com deleted file mode 100644 index 9d578a85..00000000 --- a/home/.config/neomutt/accounts/reekymarko@reekynet.com +++ /dev/null @@ -1,15 +0,0 @@ -# vim: filetype=muttrc - -# Incoming mail from maildir -set my_email = "reekymarko@reekynet.com" -set from = $my_email -set sendmail = "/usr/bin/msmtp -a $my_email" -set realname = "Marko Korhonen" -set status_format = "-%r-Mutt: $my_email %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---" -set mbox_type = Maildir -set folder = ~/.mail/$my_email -set mbox = +INBOX -set record = +Sent -set postponed = +Drafts -set spoolfile = +INBOX -mailboxes = +INBOX diff --git a/home/.config/neomutt/neomuttrc b/home/.config/neomutt/neomuttrc index 85ff9e15..74020721 100644 --- a/home/.config/neomutt/neomuttrc +++ b/home/.config/neomutt/neomuttrc @@ -1,4 +1,4 @@ -# vim: filetype=muttrc +# vim: filetype=neomuttrc set sendmail = "/usr/bin/msmtp" set mbox_type = Maildir @@ -7,9 +7,7 @@ set spoolfile = +Personal/INBOX source ~/.config/neomutt/appearance source ~/.config/neomutt/sidebar -source ~/.config/neomutt/accounts/reekymarko@reekynet.com +source ~/.config/neomutt/accounts/marko@korhonen.cc -macro index 'source ~/.config/neomutt/accounts/reekymarko@reekynet.com!' -macro index 'source ~/.config/neomutt/accounts/marko.korhonen@reekynet.com!' -macro index 'source ~/.config/neomutt/accounts/admin@reekynet.com!' -macro index 'source ~/.config/neomutt/accounts/marko.korhonen@metropolia.fi!' +macro index 'source ~/.config/neomutt/accounts/marko@korhonen.cc!' +macro index 'source ~/.config/neomutt/accounts/admin@korhonen.cc!' diff --git a/home/.config/neomutt/sidebar b/home/.config/neomutt/sidebar index 616d505b..48b12525 100644 --- a/home/.config/neomutt/sidebar +++ b/home/.config/neomutt/sidebar @@ -1,4 +1,4 @@ -# vim: filetype=muttrc +# vim: filetype=neomuttrc set sidebar_visible = yes set sidebar_indent_string = ' ' diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 6bb9c623..8e509d7e 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -27,8 +27,8 @@ export FZF_CTRL_T_OPTS='--preview "/usr/bin/cat {} | nvimpager -c "' # use lesspipe with less export LESSOPEN="|lesspipe.sh %s" -# dotdrop repository location -export DOTREPO="$HOME/Git/dotfiles" +# dotfile repository location +export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 1b1b60a8..6fa5d6b3 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -117,8 +117,8 @@ cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } -dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-home.yaml $@ } -sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-root.yaml $@ } +dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-home.yaml $@ } +sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-root.yaml $@ } compdef _dotdrop-completion.zsh sdotdrop alias dotgit='git -C $DOTREPO' dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } @@ -156,7 +156,7 @@ update() { } docker-update() { - for dir in $HOME/Git/dotfiles/docker/*; do + for dir in $HOME/git/dotfiles/docker/*; do cd $dir docker-compose pull docker-compose up -d diff --git a/home/.mbsyncrc b/home/.mbsyncrc index 5f83b782..b9e97e87 100644 --- a/home/.mbsyncrc +++ b/home/.mbsyncrc @@ -1,99 +1,48 @@ -### reekymarko@reekynet.com ##################################### -IMAPAccount reekymarko@reekynet.com +### marko@korhonen.cc ##################################### +IMAPAccount marko@korhonen.cc Host imap.migadu.com -User reekymarko@reekynet.com -PassCmd "pass email/reekymarko@reekynet.com | head -n 1" +User marko@korhonen.cc +Pass "{{@@ env['PASS_EMAIL_MARKO'] @@}}" SSLType IMAPS Port 993 CertificateFile /etc/ssl/certs/ca-certificates.crt -IMAPStore reekymarko@reekynet.com-remote -Account reekymarko@reekynet.com +IMAPStore marko@korhonen.cc-remote +Account marko@korhonen.cc -MaildirStore reekymarko@reekynet.com-local +MaildirStore marko@korhonen.cc-local Subfolders Verbatim -Path ~/.mail/reekymarko@reekynet.com/ -Inbox ~/.mail/reekymarko@reekynet.com/INBOX +Path ~/.mail/marko@korhonen.cc/ +Inbox ~/.mail/marko@korhonen.cc/INBOX -Channel reekymarko@reekynet.com -Master :reekymarko@reekynet.com-remote: -Slave :reekymarko@reekynet.com-local: +Channel marko@korhonen.cc +Master :marko@korhonen.cc-remote: +Slave :marko@korhonen.cc-local: Create Both Patterns * SyncState * ################################################################# -### marko.korhonen@reekynet.com ##################################### -IMAPAccount marko.korhonen@reekynet.com +### admin@korhonen.cc ##################################### +IMAPAccount admin@korhonen.cc Host imap.migadu.com -User marko.korhonen@reekynet.com -PassCmd "pass email/marko.korhonen@reekynet.com | head -n 1" +User admin@korhonen.cc +Pass "{{@@ env['PASS_EMAIL_ADMIN'] @@}}" SSLType IMAPS Port 993 CertificateFile /etc/ssl/certs/ca-certificates.crt -IMAPStore marko.korhonen@reekynet.com-remote -Account marko.korhonen@reekynet.com +IMAPStore admin@korhonen.cc-remote +Account admin@korhonen.cc -MaildirStore marko.korhonen@reekynet.com-local +MaildirStore admin@korhonen.cc-local Subfolders Verbatim -Path ~/.mail/marko.korhonen@reekynet.com/ -Inbox ~/.mail/marko.korhonen@reekynet.com/INBOX +Path ~/.mail/admin@korhonen.cc/ +Inbox ~/.mail/admin@korhonen.cc/INBOX -Channel marko.korhonen@reekynet.com -Master :marko.korhonen@reekynet.com-remote: -Slave :marko.korhonen@reekynet.com-local: -Create Both -Patterns * -SyncState * -################################################################# - - -### admin@reekynet.com ##################################### -IMAPAccount admin@reekynet.com -Host imap.migadu.com -User admin@reekynet.com -PassCmd "pass email/admin@reekynet.com | head -n 1" -SSLType IMAPS -Port 993 -CertificateFile /etc/ssl/certs/ca-certificates.crt - -IMAPStore admin@reekynet.com-remote -Account admin@reekynet.com - -MaildirStore admin@reekynet.com-local -Subfolders Verbatim -Path ~/.mail/admin@reekynet.com/ -Inbox ~/.mail/admin@reekynet.com/INBOX - -Channel admin@reekynet.com -Master :admin@reekynet.com-remote: -Slave :admin@reekynet.com-local: -Create Both -Patterns * -SyncState * -################################################################# - -### marko.korhonen@metropolia.fi ##################################### -IMAPAccount marko.korhonen@metropolia.fi -Host imap.metropolia.fi -User markoak -PassCmd "pass email/marko.korhonen@metropolia.fi | head -n 1" -SSLType IMAPS -Port 993 -CertificateFile /etc/ssl/certs/ca-certificates.crt - -IMAPStore marko.korhonen@metropolia.fi-remote -Account marko.korhonen@metropolia.fi - -MaildirStore marko.korhonen@metropolia.fi-local -Subfolders Verbatim -Path ~/.mail/marko.korhonen@metropolia.fi/ -Inbox ~/.mail/marko.korhonen@metropolia.fi/INBOX - -Channel marko.korhonen@metropolia.fi -Master :marko.korhonen@metropolia.fi-remote: -Slave :marko.korhonen@metropolia.fi-local: +Channel admin@korhonen.cc +Master :admin@korhonen.cc-remote: +Slave :admin@korhonen.cc-local: Create Both Patterns * SyncState * diff --git a/secrets/secrets.sh b/secrets/secrets.sh index 3f866ad8..a33dac08 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -14,7 +14,7 @@ export PASS_IPMI="$PASS_IPMI" export PASS_MQTT="$PASS_MQTT" export PASS_EMAIL_MARKO="$PASS_EMAIL_MARKO" -export PASS_EMAIL_ADMIN="$PASS_EMAIL_MARKO" +export PASS_EMAIL_ADMIN="$PASS_EMAIL_ADMIN" export ME_FULLNAME="$ME_FULLNAME" export ME_ADDRESS="$ME_ADDRESS" From b24b42488bfcee328553abcc6288dbb736eabc4b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 15:57:41 +0200 Subject: [PATCH 0519/2667] Small fix --- deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index 7c5b8e78..5828a3a4 100755 --- a/deploy.sh +++ b/deploy.sh @@ -47,8 +47,8 @@ if ! [ -x "$(command -v paru)" ]; then sudo pacman -Syu --needed --noconfirm git wget base-devel cd wget https://aur.archlinux.org/cgit/aur.git/snapshot/paru-bin.tar.gz - tar xfv paru.tar.gz - cd paru + tar xfv paru-bin.tar.gz + cd paru-bin makepkg -si --noconfirm cd .. rm -r paru* From fc01fdc58395219397bb362bc79b6af1407aa797 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 15:57:41 +0200 Subject: [PATCH 0520/2667] Small fix --- deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index 7c5b8e78..5828a3a4 100755 --- a/deploy.sh +++ b/deploy.sh @@ -47,8 +47,8 @@ if ! [ -x "$(command -v paru)" ]; then sudo pacman -Syu --needed --noconfirm git wget base-devel cd wget https://aur.archlinux.org/cgit/aur.git/snapshot/paru-bin.tar.gz - tar xfv paru.tar.gz - cd paru + tar xfv paru-bin.tar.gz + cd paru-bin makepkg -si --noconfirm cd .. rm -r paru* From 4d890fb9f73c00793450f7581224fc1b52e7a073 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 15:59:54 +0200 Subject: [PATCH 0521/2667] Add dotdrop deps --- deploy.sh | 2 +- dotdrop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index 5828a3a4..2c63408e 100755 --- a/deploy.sh +++ b/deploy.sh @@ -8,7 +8,7 @@ export DOTREPO="$HOME/git/dotfiles" DISTRO="$(lsb_release -ds | sed 's/"//g')" -PKGLIST="" +PKGLIST="python-ruamel-yaml python-magic-git python-jinja python-docopt" if [ -d $DOTREPO ]; then print "Dotfile repository already exists, exiting..." diff --git a/dotdrop b/dotdrop index 675c8206..581c82da 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 675c8206061269a10ed3e03871be0264fc784ce2 +Subproject commit 581c82da3817b1e2284ba86e9ed4445a95a3882f From 34f56ecda5fca93244ec556786b9cba12f37863c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 15:59:54 +0200 Subject: [PATCH 0522/2667] Add dotdrop deps --- deploy.sh | 2 +- dotdrop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index 5828a3a4..2c63408e 100755 --- a/deploy.sh +++ b/deploy.sh @@ -8,7 +8,7 @@ export DOTREPO="$HOME/git/dotfiles" DISTRO="$(lsb_release -ds | sed 's/"//g')" -PKGLIST="" +PKGLIST="python-ruamel-yaml python-magic-git python-jinja python-docopt" if [ -d $DOTREPO ]; then print "Dotfile repository already exists, exiting..." diff --git a/dotdrop b/dotdrop index 675c8206..581c82da 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 675c8206061269a10ed3e03871be0264fc784ce2 +Subproject commit 581c82da3817b1e2284ba86e9ed4445a95a3882f From 21f1c9f0bc4f87e413be47d41862eb808dc43135 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 17:41:44 +0200 Subject: [PATCH 0523/2667] Configure msmtp and misc changes --- config-home.yaml | 250 ------------------------------- config.yaml | 255 +++++++++++++++++++++++++++++++- dotdrop | 2 +- home/.config/msmtp/config | 25 ++++ home/.config/zsh/03-aliases.zsh | 2 +- 5 files changed, 281 insertions(+), 253 deletions(-) delete mode 100644 config-home.yaml mode change 120000 => 100644 config.yaml create mode 100644 home/.config/msmtp/config diff --git a/config-home.yaml b/config-home.yaml deleted file mode 100644 index e34b03a2..00000000 --- a/config-home.yaml +++ /dev/null @@ -1,250 +0,0 @@ -actions: - vim-plug: nvim +PlugInstall +qall -config: - backup: true - banner: true - create: true - dotpath: home - ignoreempty: false - keepdot: true - link_dotfile_default: nolink - link_on_import: nolink - longkey: false - showdiff: false - workdir: ~/.config/dotdrop -dotfiles: - d_systemd: - dst: ~/.config/systemd/user - src: .config/systemd/user - d_mpv: - dst: ~/.config/mpv - src: .config/mpv - d_neomutt: - dst: ~/.config/neomutt - src: .config/neomutt - d_goimapnotify: - dst: ~/.config/imapnotify - src: .config/imapnotify - f_init.vim: - dst: ~/.config/nvim/init.vim - src: .config/nvim/init.vim - d_nvim_config: - actions: - - vim-plug - dst: ~/.config/nvim/conf.d - src: .config/nvim/conf.d - f_coc-settings.json: - dst: ~/.config/nvim/coc-settings.json - src: .config/nvim/coc-settings.json - d_scripts: - dst: ~/.scripts - src: .scripts - d_sway: - dst: ~/.config/sway - src: .config/sway - d_waybar: - dst: ~/.config/waybar - src: .config/waybar - d_wofi: - src: .config/wofi - dst: ~/.config/wofi - f_abcde.conf: - dst: ~/.abcde.conf - src: .abcde.conf - f_mbsyncrc: - dst: ~/.mbsyncrc - src: .mbsyncrc - f_alacritty.yml: - dst: ~/.config/alacritty/alacritty.yml - src: .config/alacritty/alacritty.yml - f_authorized_keys: - dst: ~/.ssh/authorized_keys - src: .ssh/authorized_keys - f_beets_config: - dst: ~/.config/beets/config.yaml - src: .config/beets/config.yaml - f_beets_whitelist: - dst: ~/.config/beets/whitelist - src: .config/beets/whitelist - f_bspwmrc: - dst: ~/.config/bspwm/bspwmrc - src: .config/bspwm/bspwmrc - f_gitconfig: - dst: ~/.gitconfig - src: .gitconfig - f_libra_config: - dst: ~/.config/libra/config.toml - src: .config/libra/config.toml - f_mailcap: - dst: ~/.mailcap - src: .mailcap - f_makepkg.conf: - dst: ~/.config/pacman/makepkg.conf - src: .config/pacman/makepkg.conf - f_mako_config: - dst: ~/.config/mako/config - src: .config/mako/config - f_mimeo_associations.txt: - dst: ~/.config/mimeo/associations.txt - src: .config/mimeo/associations.txt - f_mpd.conf: - dst: ~/.config/mpd/mpd.conf - src: .config/mpd/mpd.conf - f_mpdris2.conf: - dst: ~/.config/mpDris2/mpDris2.conf - src: .config/mpDris2/mpDris2.conf - f_mpdscribble.conf: - dst: ~/.mpdscribble/mpdscribble.conf - src: .mpdscribble/mpdscribble.conf - f_ncmpcpp_bindings: - dst: ~/.config/ncmpcpp/bindings - src: .config/ncmpcpp/bindings - f_ranger.conf: - dst: ~/.config/ranger/rc.conf - src: .config/ranger/rc.conf - f_ranger_commands.py: - dst: ~/.config/ranger/commands.py - src: .config/ranger/commands.py - f_redshift.conf: - dst: ~/.config/redshift/redshift.conf - src: .config/redshift/redshift.conf - f_rtv.cfg: - dst: ~/.config/rtv/rtv.cfg - src: .config/rtv/rtv.cfg - f_ssh.conf: - dst: ~/.ssh/config - src: .ssh/config - f_steam-native.desktop: - dst: ~/.local/share/applications/steam-native.desktop - src: .local/share/applications/steam-native.desktop - f_tdesktop_lang.strings: - dst: ~/.config/telegram-desktop/lang.strings - src: .config/telegram-desktop/lang.strings - f_tmux.conf: - dst: ~/.tmux.conf - src: .tmux.conf - f_youtube-dl_config: - dst: ~/.config/youtube-dl/config - src: .config/youtube-dl/config - f_zathurarc: - dst: ~/.config/zathura/zathurarc - src: .config/zathura/zathurarc - f_zprofile: - dst: ~/.zprofile - src: .zprofile - f_zshrc: - dst: ~/.zshrc - src: .zshrc - d_zsh: - src: .config/zsh - dst: ~/.config/zsh - f_fonts.conf: - src: .config/fontconfig/fonts.conf - dst: ~/.config/fontconfig/fonts.conf - f_ripgrep_ignore: - src: .ignore - dst: ~/.ignore - f_nvimpager: - src: .config/nvimpager/init.vim - dst: ~/.config/nvimpager/init.vim - f_ncmpcpp.conf: - src: .config/ncmpcpp/config - dst: ~/.config/ncmpcpp/config - f_hushlogin: - src: .hushlogin - dst: ~/.hushlogin - f_paru.conf: - src: .config/paru/paru.conf - dst: ~/.config/paru/paru.conf -profiles: - base: - dotfiles: - - d_systemd - terminal: - dotfiles: - - f_nvimpager - - f_hushlogin - - f_ripgrep_ignore - - f_ranger_commands.py - - f_rtv.cfg - - f_mailcap - - d_zsh - - f_zshrc - - f_tmux.conf - - f_gitconfig - - f_ranger.conf - - f_ssh.conf - - f_authorized_keys - - d_scripts - - d_nvim_config - - f_init.vim - - f_coc-settings.json - - f_gitconfig - - f_alacritty.yml - email: - dotfiles: - - d_neomutt - - d_goimapnotify - - f_mbsyncrc - media: - dotfiles: - - f_beets_config - - f_beets_whitelist - - f_abcde.conf - - d_mpv - - f_youtube-dl_config - - f_mpd.conf - - f_ncmpcpp_bindings - - f_ncmpcpp.conf - - f_libra_config - - f_mpdscribble.conf - - f_mpdris2.conf - sway: - dotfiles: - - d_sway - - d_waybar - - d_wofi - - f_mako_config - - f_redshift.conf - - f_zathurarc - - f_mimeo_associations.txt - - f_tdesktop_lang.strings - - f_fonts.conf - - f_zprofile - Pacman: - dotfiles: - - f_makepkg.conf - - f_paru.conf - Mirkwood: - include: - - base - - terminal - - email - - media - - sway - - Pacman - dotfiles: - - f_paru.conf - Moria: - include: - - terminal - - media - - Pacman - Gondor: - include: - - terminal - - Pacman - mko-laptop: - include: - - terminal - AnittaPC: - include: - - terminal - - Pacman - TakamakiPC: - include: - - terminal - - Pacman - localhost: - include: - - terminal diff --git a/config.yaml b/config.yaml deleted file mode 120000 index 65245343..00000000 --- a/config.yaml +++ /dev/null @@ -1 +0,0 @@ -config-home.yaml \ No newline at end of file diff --git a/config.yaml b/config.yaml new file mode 100644 index 00000000..6215cdba --- /dev/null +++ b/config.yaml @@ -0,0 +1,254 @@ +actions: + vim-plug: nvim +PlugInstall +qall +config: + backup: true + banner: true + create: true + dotpath: home + ignoreempty: false + keepdot: true + link_dotfile_default: nolink + link_on_import: nolink + longkey: false + showdiff: false + workdir: ~/.config/dotdrop +dotfiles: + d_systemd: + dst: ~/.config/systemd/user + src: .config/systemd/user + d_mpv: + dst: ~/.config/mpv + src: .config/mpv + d_neomutt: + dst: ~/.config/neomutt + src: .config/neomutt + d_goimapnotify: + dst: ~/.config/imapnotify + src: .config/imapnotify + f_init.vim: + dst: ~/.config/nvim/init.vim + src: .config/nvim/init.vim + d_nvim_config: + actions: + - vim-plug + dst: ~/.config/nvim/conf.d + src: .config/nvim/conf.d + f_coc-settings.json: + dst: ~/.config/nvim/coc-settings.json + src: .config/nvim/coc-settings.json + d_scripts: + dst: ~/.scripts + src: .scripts + d_sway: + dst: ~/.config/sway + src: .config/sway + d_waybar: + dst: ~/.config/waybar + src: .config/waybar + d_wofi: + src: .config/wofi + dst: ~/.config/wofi + f_abcde.conf: + dst: ~/.abcde.conf + src: .abcde.conf + f_mbsyncrc: + dst: ~/.mbsyncrc + src: .mbsyncrc + f_alacritty.yml: + dst: ~/.config/alacritty/alacritty.yml + src: .config/alacritty/alacritty.yml + f_authorized_keys: + dst: ~/.ssh/authorized_keys + src: .ssh/authorized_keys + f_beets_config: + dst: ~/.config/beets/config.yaml + src: .config/beets/config.yaml + f_beets_whitelist: + dst: ~/.config/beets/whitelist + src: .config/beets/whitelist + f_bspwmrc: + dst: ~/.config/bspwm/bspwmrc + src: .config/bspwm/bspwmrc + f_gitconfig: + dst: ~/.gitconfig + src: .gitconfig + f_libra_config: + dst: ~/.config/libra/config.toml + src: .config/libra/config.toml + f_mailcap: + dst: ~/.mailcap + src: .mailcap + f_makepkg.conf: + dst: ~/.config/pacman/makepkg.conf + src: .config/pacman/makepkg.conf + f_mako_config: + dst: ~/.config/mako/config + src: .config/mako/config + f_mimeo_associations.txt: + dst: ~/.config/mimeo/associations.txt + src: .config/mimeo/associations.txt + f_mpd.conf: + dst: ~/.config/mpd/mpd.conf + src: .config/mpd/mpd.conf + f_mpdris2.conf: + dst: ~/.config/mpDris2/mpDris2.conf + src: .config/mpDris2/mpDris2.conf + f_mpdscribble.conf: + dst: ~/.mpdscribble/mpdscribble.conf + src: .mpdscribble/mpdscribble.conf + f_ncmpcpp_bindings: + dst: ~/.config/ncmpcpp/bindings + src: .config/ncmpcpp/bindings + f_ranger.conf: + dst: ~/.config/ranger/rc.conf + src: .config/ranger/rc.conf + f_ranger_commands.py: + dst: ~/.config/ranger/commands.py + src: .config/ranger/commands.py + f_redshift.conf: + dst: ~/.config/redshift/redshift.conf + src: .config/redshift/redshift.conf + f_rtv.cfg: + dst: ~/.config/rtv/rtv.cfg + src: .config/rtv/rtv.cfg + f_ssh.conf: + dst: ~/.ssh/config + src: .ssh/config + f_steam-native.desktop: + dst: ~/.local/share/applications/steam-native.desktop + src: .local/share/applications/steam-native.desktop + f_tdesktop_lang.strings: + dst: ~/.config/telegram-desktop/lang.strings + src: .config/telegram-desktop/lang.strings + f_tmux.conf: + dst: ~/.tmux.conf + src: .tmux.conf + f_youtube-dl_config: + dst: ~/.config/youtube-dl/config + src: .config/youtube-dl/config + f_zathurarc: + dst: ~/.config/zathura/zathurarc + src: .config/zathura/zathurarc + f_zprofile: + dst: ~/.zprofile + src: .zprofile + f_zshrc: + dst: ~/.zshrc + src: .zshrc + d_zsh: + src: .config/zsh + dst: ~/.config/zsh + f_fonts.conf: + src: .config/fontconfig/fonts.conf + dst: ~/.config/fontconfig/fonts.conf + f_ripgrep_ignore: + src: .ignore + dst: ~/.ignore + f_nvimpager: + src: .config/nvimpager/init.vim + dst: ~/.config/nvimpager/init.vim + f_ncmpcpp.conf: + src: .config/ncmpcpp/config + dst: ~/.config/ncmpcpp/config + f_hushlogin: + src: .hushlogin + dst: ~/.hushlogin + f_paru.conf: + src: .config/paru/paru.conf + dst: ~/.config/paru/paru.conf + f_msmtp_config: + src: .config/msmtp/config + dst: ~/.config/msmtp/config +profiles: + base: + dotfiles: + - d_systemd + terminal: + dotfiles: + - f_nvimpager + - f_hushlogin + - f_ripgrep_ignore + - f_ranger_commands.py + - f_rtv.cfg + - f_mailcap + - d_zsh + - f_zshrc + - f_tmux.conf + - f_gitconfig + - f_ranger.conf + - f_ssh.conf + - f_authorized_keys + - d_scripts + - d_nvim_config + - f_init.vim + - f_coc-settings.json + - f_gitconfig + - f_alacritty.yml + email: + dotfiles: + - d_neomutt + - d_goimapnotify + - f_mbsyncrc + - f_msmtp_config + media: + dotfiles: + - f_beets_config + - f_beets_whitelist + - f_abcde.conf + - d_mpv + - f_youtube-dl_config + - f_mpd.conf + - f_ncmpcpp_bindings + - f_ncmpcpp.conf + - f_libra_config + - f_mpdscribble.conf + - f_mpdris2.conf + sway: + dotfiles: + - d_sway + - d_waybar + - d_wofi + - f_mako_config + - f_redshift.conf + - f_zathurarc + - f_mimeo_associations.txt + - f_tdesktop_lang.strings + - f_fonts.conf + - f_zprofile + Pacman: + dotfiles: + - f_makepkg.conf + - f_paru.conf + Mirkwood: + include: + - base + - terminal + - email + - media + - sway + - Pacman + dotfiles: + - f_paru.conf + Moria: + include: + - terminal + - media + - Pacman + Gondor: + include: + - terminal + - Pacman + mko-laptop: + include: + - terminal + AnittaPC: + include: + - terminal + - Pacman + TakamakiPC: + include: + - terminal + - Pacman + localhost: + include: + - terminal diff --git a/dotdrop b/dotdrop index 581c82da..d42d810a 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 581c82da3817b1e2284ba86e9ed4445a95a3882f +Subproject commit d42d810ab1842c9568f655127491eeedf1d376fc diff --git a/home/.config/msmtp/config b/home/.config/msmtp/config new file mode 100644 index 00000000..81ca24cf --- /dev/null +++ b/home/.config/msmtp/config @@ -0,0 +1,25 @@ +# marko@korhonen.cc +account marko@korhonen.cc +from marko@korhonen.cc +user marko@korhonen.cc +password "{{@@ env['PASS_EMAIL_MARKO'] @@}}" +auth on +tls on +tls_starttls off +tls_trust_file /etc/ssl/certs/ca-certificates.crt +logfile ~/.log/msmtp/marko@korhonen.cc.log +host smtp.migadu.com +port 465 + +# admin@korhonen.cc +account admin@korhonen.cc +from admin@korhonen.cc +user admin@korhonen.cc +password "{{@@ env['PASS_EMAIL_ADMIN'] @@}}" +auth on +tls on +tls_starttls off +tls_trust_file /etc/ssl/certs/ca-certificates.crt +logfile ~/.log/msmtp/admin@korhonen.cc.log +host smtp.migadu.com +port 465 diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 6fa5d6b3..85a94561 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -117,7 +117,7 @@ cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } -dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-home.yaml $@ } +dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop.sh $@ } sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-root.yaml $@ } compdef _dotdrop-completion.zsh sdotdrop alias dotgit='git -C $DOTREPO' From cdcdad9e338f850cac1c95449eb0e708440a9be0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 17:41:44 +0200 Subject: [PATCH 0524/2667] Configure msmtp and misc changes --- config-home.yaml | 250 ------------------------------- config.yaml | 255 +++++++++++++++++++++++++++++++- dotdrop | 2 +- home/.config/msmtp/config | 25 ++++ home/.config/zsh/03-aliases.zsh | 2 +- 5 files changed, 281 insertions(+), 253 deletions(-) delete mode 100644 config-home.yaml mode change 120000 => 100644 config.yaml create mode 100644 home/.config/msmtp/config diff --git a/config-home.yaml b/config-home.yaml deleted file mode 100644 index e34b03a2..00000000 --- a/config-home.yaml +++ /dev/null @@ -1,250 +0,0 @@ -actions: - vim-plug: nvim +PlugInstall +qall -config: - backup: true - banner: true - create: true - dotpath: home - ignoreempty: false - keepdot: true - link_dotfile_default: nolink - link_on_import: nolink - longkey: false - showdiff: false - workdir: ~/.config/dotdrop -dotfiles: - d_systemd: - dst: ~/.config/systemd/user - src: .config/systemd/user - d_mpv: - dst: ~/.config/mpv - src: .config/mpv - d_neomutt: - dst: ~/.config/neomutt - src: .config/neomutt - d_goimapnotify: - dst: ~/.config/imapnotify - src: .config/imapnotify - f_init.vim: - dst: ~/.config/nvim/init.vim - src: .config/nvim/init.vim - d_nvim_config: - actions: - - vim-plug - dst: ~/.config/nvim/conf.d - src: .config/nvim/conf.d - f_coc-settings.json: - dst: ~/.config/nvim/coc-settings.json - src: .config/nvim/coc-settings.json - d_scripts: - dst: ~/.scripts - src: .scripts - d_sway: - dst: ~/.config/sway - src: .config/sway - d_waybar: - dst: ~/.config/waybar - src: .config/waybar - d_wofi: - src: .config/wofi - dst: ~/.config/wofi - f_abcde.conf: - dst: ~/.abcde.conf - src: .abcde.conf - f_mbsyncrc: - dst: ~/.mbsyncrc - src: .mbsyncrc - f_alacritty.yml: - dst: ~/.config/alacritty/alacritty.yml - src: .config/alacritty/alacritty.yml - f_authorized_keys: - dst: ~/.ssh/authorized_keys - src: .ssh/authorized_keys - f_beets_config: - dst: ~/.config/beets/config.yaml - src: .config/beets/config.yaml - f_beets_whitelist: - dst: ~/.config/beets/whitelist - src: .config/beets/whitelist - f_bspwmrc: - dst: ~/.config/bspwm/bspwmrc - src: .config/bspwm/bspwmrc - f_gitconfig: - dst: ~/.gitconfig - src: .gitconfig - f_libra_config: - dst: ~/.config/libra/config.toml - src: .config/libra/config.toml - f_mailcap: - dst: ~/.mailcap - src: .mailcap - f_makepkg.conf: - dst: ~/.config/pacman/makepkg.conf - src: .config/pacman/makepkg.conf - f_mako_config: - dst: ~/.config/mako/config - src: .config/mako/config - f_mimeo_associations.txt: - dst: ~/.config/mimeo/associations.txt - src: .config/mimeo/associations.txt - f_mpd.conf: - dst: ~/.config/mpd/mpd.conf - src: .config/mpd/mpd.conf - f_mpdris2.conf: - dst: ~/.config/mpDris2/mpDris2.conf - src: .config/mpDris2/mpDris2.conf - f_mpdscribble.conf: - dst: ~/.mpdscribble/mpdscribble.conf - src: .mpdscribble/mpdscribble.conf - f_ncmpcpp_bindings: - dst: ~/.config/ncmpcpp/bindings - src: .config/ncmpcpp/bindings - f_ranger.conf: - dst: ~/.config/ranger/rc.conf - src: .config/ranger/rc.conf - f_ranger_commands.py: - dst: ~/.config/ranger/commands.py - src: .config/ranger/commands.py - f_redshift.conf: - dst: ~/.config/redshift/redshift.conf - src: .config/redshift/redshift.conf - f_rtv.cfg: - dst: ~/.config/rtv/rtv.cfg - src: .config/rtv/rtv.cfg - f_ssh.conf: - dst: ~/.ssh/config - src: .ssh/config - f_steam-native.desktop: - dst: ~/.local/share/applications/steam-native.desktop - src: .local/share/applications/steam-native.desktop - f_tdesktop_lang.strings: - dst: ~/.config/telegram-desktop/lang.strings - src: .config/telegram-desktop/lang.strings - f_tmux.conf: - dst: ~/.tmux.conf - src: .tmux.conf - f_youtube-dl_config: - dst: ~/.config/youtube-dl/config - src: .config/youtube-dl/config - f_zathurarc: - dst: ~/.config/zathura/zathurarc - src: .config/zathura/zathurarc - f_zprofile: - dst: ~/.zprofile - src: .zprofile - f_zshrc: - dst: ~/.zshrc - src: .zshrc - d_zsh: - src: .config/zsh - dst: ~/.config/zsh - f_fonts.conf: - src: .config/fontconfig/fonts.conf - dst: ~/.config/fontconfig/fonts.conf - f_ripgrep_ignore: - src: .ignore - dst: ~/.ignore - f_nvimpager: - src: .config/nvimpager/init.vim - dst: ~/.config/nvimpager/init.vim - f_ncmpcpp.conf: - src: .config/ncmpcpp/config - dst: ~/.config/ncmpcpp/config - f_hushlogin: - src: .hushlogin - dst: ~/.hushlogin - f_paru.conf: - src: .config/paru/paru.conf - dst: ~/.config/paru/paru.conf -profiles: - base: - dotfiles: - - d_systemd - terminal: - dotfiles: - - f_nvimpager - - f_hushlogin - - f_ripgrep_ignore - - f_ranger_commands.py - - f_rtv.cfg - - f_mailcap - - d_zsh - - f_zshrc - - f_tmux.conf - - f_gitconfig - - f_ranger.conf - - f_ssh.conf - - f_authorized_keys - - d_scripts - - d_nvim_config - - f_init.vim - - f_coc-settings.json - - f_gitconfig - - f_alacritty.yml - email: - dotfiles: - - d_neomutt - - d_goimapnotify - - f_mbsyncrc - media: - dotfiles: - - f_beets_config - - f_beets_whitelist - - f_abcde.conf - - d_mpv - - f_youtube-dl_config - - f_mpd.conf - - f_ncmpcpp_bindings - - f_ncmpcpp.conf - - f_libra_config - - f_mpdscribble.conf - - f_mpdris2.conf - sway: - dotfiles: - - d_sway - - d_waybar - - d_wofi - - f_mako_config - - f_redshift.conf - - f_zathurarc - - f_mimeo_associations.txt - - f_tdesktop_lang.strings - - f_fonts.conf - - f_zprofile - Pacman: - dotfiles: - - f_makepkg.conf - - f_paru.conf - Mirkwood: - include: - - base - - terminal - - email - - media - - sway - - Pacman - dotfiles: - - f_paru.conf - Moria: - include: - - terminal - - media - - Pacman - Gondor: - include: - - terminal - - Pacman - mko-laptop: - include: - - terminal - AnittaPC: - include: - - terminal - - Pacman - TakamakiPC: - include: - - terminal - - Pacman - localhost: - include: - - terminal diff --git a/config.yaml b/config.yaml deleted file mode 120000 index 65245343..00000000 --- a/config.yaml +++ /dev/null @@ -1 +0,0 @@ -config-home.yaml \ No newline at end of file diff --git a/config.yaml b/config.yaml new file mode 100644 index 00000000..6215cdba --- /dev/null +++ b/config.yaml @@ -0,0 +1,254 @@ +actions: + vim-plug: nvim +PlugInstall +qall +config: + backup: true + banner: true + create: true + dotpath: home + ignoreempty: false + keepdot: true + link_dotfile_default: nolink + link_on_import: nolink + longkey: false + showdiff: false + workdir: ~/.config/dotdrop +dotfiles: + d_systemd: + dst: ~/.config/systemd/user + src: .config/systemd/user + d_mpv: + dst: ~/.config/mpv + src: .config/mpv + d_neomutt: + dst: ~/.config/neomutt + src: .config/neomutt + d_goimapnotify: + dst: ~/.config/imapnotify + src: .config/imapnotify + f_init.vim: + dst: ~/.config/nvim/init.vim + src: .config/nvim/init.vim + d_nvim_config: + actions: + - vim-plug + dst: ~/.config/nvim/conf.d + src: .config/nvim/conf.d + f_coc-settings.json: + dst: ~/.config/nvim/coc-settings.json + src: .config/nvim/coc-settings.json + d_scripts: + dst: ~/.scripts + src: .scripts + d_sway: + dst: ~/.config/sway + src: .config/sway + d_waybar: + dst: ~/.config/waybar + src: .config/waybar + d_wofi: + src: .config/wofi + dst: ~/.config/wofi + f_abcde.conf: + dst: ~/.abcde.conf + src: .abcde.conf + f_mbsyncrc: + dst: ~/.mbsyncrc + src: .mbsyncrc + f_alacritty.yml: + dst: ~/.config/alacritty/alacritty.yml + src: .config/alacritty/alacritty.yml + f_authorized_keys: + dst: ~/.ssh/authorized_keys + src: .ssh/authorized_keys + f_beets_config: + dst: ~/.config/beets/config.yaml + src: .config/beets/config.yaml + f_beets_whitelist: + dst: ~/.config/beets/whitelist + src: .config/beets/whitelist + f_bspwmrc: + dst: ~/.config/bspwm/bspwmrc + src: .config/bspwm/bspwmrc + f_gitconfig: + dst: ~/.gitconfig + src: .gitconfig + f_libra_config: + dst: ~/.config/libra/config.toml + src: .config/libra/config.toml + f_mailcap: + dst: ~/.mailcap + src: .mailcap + f_makepkg.conf: + dst: ~/.config/pacman/makepkg.conf + src: .config/pacman/makepkg.conf + f_mako_config: + dst: ~/.config/mako/config + src: .config/mako/config + f_mimeo_associations.txt: + dst: ~/.config/mimeo/associations.txt + src: .config/mimeo/associations.txt + f_mpd.conf: + dst: ~/.config/mpd/mpd.conf + src: .config/mpd/mpd.conf + f_mpdris2.conf: + dst: ~/.config/mpDris2/mpDris2.conf + src: .config/mpDris2/mpDris2.conf + f_mpdscribble.conf: + dst: ~/.mpdscribble/mpdscribble.conf + src: .mpdscribble/mpdscribble.conf + f_ncmpcpp_bindings: + dst: ~/.config/ncmpcpp/bindings + src: .config/ncmpcpp/bindings + f_ranger.conf: + dst: ~/.config/ranger/rc.conf + src: .config/ranger/rc.conf + f_ranger_commands.py: + dst: ~/.config/ranger/commands.py + src: .config/ranger/commands.py + f_redshift.conf: + dst: ~/.config/redshift/redshift.conf + src: .config/redshift/redshift.conf + f_rtv.cfg: + dst: ~/.config/rtv/rtv.cfg + src: .config/rtv/rtv.cfg + f_ssh.conf: + dst: ~/.ssh/config + src: .ssh/config + f_steam-native.desktop: + dst: ~/.local/share/applications/steam-native.desktop + src: .local/share/applications/steam-native.desktop + f_tdesktop_lang.strings: + dst: ~/.config/telegram-desktop/lang.strings + src: .config/telegram-desktop/lang.strings + f_tmux.conf: + dst: ~/.tmux.conf + src: .tmux.conf + f_youtube-dl_config: + dst: ~/.config/youtube-dl/config + src: .config/youtube-dl/config + f_zathurarc: + dst: ~/.config/zathura/zathurarc + src: .config/zathura/zathurarc + f_zprofile: + dst: ~/.zprofile + src: .zprofile + f_zshrc: + dst: ~/.zshrc + src: .zshrc + d_zsh: + src: .config/zsh + dst: ~/.config/zsh + f_fonts.conf: + src: .config/fontconfig/fonts.conf + dst: ~/.config/fontconfig/fonts.conf + f_ripgrep_ignore: + src: .ignore + dst: ~/.ignore + f_nvimpager: + src: .config/nvimpager/init.vim + dst: ~/.config/nvimpager/init.vim + f_ncmpcpp.conf: + src: .config/ncmpcpp/config + dst: ~/.config/ncmpcpp/config + f_hushlogin: + src: .hushlogin + dst: ~/.hushlogin + f_paru.conf: + src: .config/paru/paru.conf + dst: ~/.config/paru/paru.conf + f_msmtp_config: + src: .config/msmtp/config + dst: ~/.config/msmtp/config +profiles: + base: + dotfiles: + - d_systemd + terminal: + dotfiles: + - f_nvimpager + - f_hushlogin + - f_ripgrep_ignore + - f_ranger_commands.py + - f_rtv.cfg + - f_mailcap + - d_zsh + - f_zshrc + - f_tmux.conf + - f_gitconfig + - f_ranger.conf + - f_ssh.conf + - f_authorized_keys + - d_scripts + - d_nvim_config + - f_init.vim + - f_coc-settings.json + - f_gitconfig + - f_alacritty.yml + email: + dotfiles: + - d_neomutt + - d_goimapnotify + - f_mbsyncrc + - f_msmtp_config + media: + dotfiles: + - f_beets_config + - f_beets_whitelist + - f_abcde.conf + - d_mpv + - f_youtube-dl_config + - f_mpd.conf + - f_ncmpcpp_bindings + - f_ncmpcpp.conf + - f_libra_config + - f_mpdscribble.conf + - f_mpdris2.conf + sway: + dotfiles: + - d_sway + - d_waybar + - d_wofi + - f_mako_config + - f_redshift.conf + - f_zathurarc + - f_mimeo_associations.txt + - f_tdesktop_lang.strings + - f_fonts.conf + - f_zprofile + Pacman: + dotfiles: + - f_makepkg.conf + - f_paru.conf + Mirkwood: + include: + - base + - terminal + - email + - media + - sway + - Pacman + dotfiles: + - f_paru.conf + Moria: + include: + - terminal + - media + - Pacman + Gondor: + include: + - terminal + - Pacman + mko-laptop: + include: + - terminal + AnittaPC: + include: + - terminal + - Pacman + TakamakiPC: + include: + - terminal + - Pacman + localhost: + include: + - terminal diff --git a/dotdrop b/dotdrop index 581c82da..d42d810a 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 581c82da3817b1e2284ba86e9ed4445a95a3882f +Subproject commit d42d810ab1842c9568f655127491eeedf1d376fc diff --git a/home/.config/msmtp/config b/home/.config/msmtp/config new file mode 100644 index 00000000..81ca24cf --- /dev/null +++ b/home/.config/msmtp/config @@ -0,0 +1,25 @@ +# marko@korhonen.cc +account marko@korhonen.cc +from marko@korhonen.cc +user marko@korhonen.cc +password "{{@@ env['PASS_EMAIL_MARKO'] @@}}" +auth on +tls on +tls_starttls off +tls_trust_file /etc/ssl/certs/ca-certificates.crt +logfile ~/.log/msmtp/marko@korhonen.cc.log +host smtp.migadu.com +port 465 + +# admin@korhonen.cc +account admin@korhonen.cc +from admin@korhonen.cc +user admin@korhonen.cc +password "{{@@ env['PASS_EMAIL_ADMIN'] @@}}" +auth on +tls on +tls_starttls off +tls_trust_file /etc/ssl/certs/ca-certificates.crt +logfile ~/.log/msmtp/admin@korhonen.cc.log +host smtp.migadu.com +port 465 diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 6fa5d6b3..85a94561 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -117,7 +117,7 @@ cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } -dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-home.yaml $@ } +dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop.sh $@ } sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-root.yaml $@ } compdef _dotdrop-completion.zsh sdotdrop alias dotgit='git -C $DOTREPO' From ab9bd17296bee62ea222c4bfa6c10da4fe723ae1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 24 Nov 2020 19:48:51 +0200 Subject: [PATCH 0525/2667] Update README --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 95bde0c9..405eb8fc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ReekyMarko's dotfiles +# FunctionalHacker's dotfiles ![screenshot of my setup](https://i.imgur.com/lz1Q4Zz.png?raw=true") My personal dotfiles for my workstations, mostly for easy access for myself @@ -7,10 +7,10 @@ but feel free to steal them for yourself! I'm using [dotdrop](https://github.com/deadc0de6/dotdrop) to manage and ease deployment of my dotfiles. ## Mirrors -This repository lives at [ReekyNET Git](https://git.reekynet.com/ReekyMarko/dotfiles), but it is also mirrored to: -- [GitLab](https://gitlab.com/ReekyMarko/dotfiles) -- [GitHub](https://github.com/ReekyMarko/dotfiles) -- [Bitbucket](https://bitbucket.org/ReekyMarko/dotfiles) -- [codeberg](https://codeberg.org/ReekyMarko/dotfiles) +This repository lives at [My git server](https://git.korhonen.cc/FunctionalHacker/dotfiles), but it is also mirrored to: +- [GitLab](https://gitlab.com/FunctionalHacker/dotfiles) +- [GitHub](https://github.com/FunctionalHacker/dotfiles) +- [Bitbucket](https://bitbucket.org/FunctionalHacker/dotfiles) +- [codeberg](https://codeberg.org/FunctionalHacker/dotfiles) -If you have any ideas for improvements, questions or anything of this sort, you can open an issue or a pull request in either ReekyNET Git (registrations open for anyone), or any of the mirrors. +If you have any ideas for improvements, questions or anything of this sort, you can open an issue or a pull request in either my git server (registrations open for anyone), or any of the mirrors. From 91836193e71b988dfd137b06953589e70ada4b1d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 24 Nov 2020 19:48:51 +0200 Subject: [PATCH 0526/2667] Update README --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 95bde0c9..405eb8fc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ReekyMarko's dotfiles +# FunctionalHacker's dotfiles ![screenshot of my setup](https://i.imgur.com/lz1Q4Zz.png?raw=true") My personal dotfiles for my workstations, mostly for easy access for myself @@ -7,10 +7,10 @@ but feel free to steal them for yourself! I'm using [dotdrop](https://github.com/deadc0de6/dotdrop) to manage and ease deployment of my dotfiles. ## Mirrors -This repository lives at [ReekyNET Git](https://git.reekynet.com/ReekyMarko/dotfiles), but it is also mirrored to: -- [GitLab](https://gitlab.com/ReekyMarko/dotfiles) -- [GitHub](https://github.com/ReekyMarko/dotfiles) -- [Bitbucket](https://bitbucket.org/ReekyMarko/dotfiles) -- [codeberg](https://codeberg.org/ReekyMarko/dotfiles) +This repository lives at [My git server](https://git.korhonen.cc/FunctionalHacker/dotfiles), but it is also mirrored to: +- [GitLab](https://gitlab.com/FunctionalHacker/dotfiles) +- [GitHub](https://github.com/FunctionalHacker/dotfiles) +- [Bitbucket](https://bitbucket.org/FunctionalHacker/dotfiles) +- [codeberg](https://codeberg.org/FunctionalHacker/dotfiles) -If you have any ideas for improvements, questions or anything of this sort, you can open an issue or a pull request in either ReekyNET Git (registrations open for anyone), or any of the mirrors. +If you have any ideas for improvements, questions or anything of this sort, you can open an issue or a pull request in either my git server (registrations open for anyone), or any of the mirrors. From ddbee7f6926f6bac8fbc6d909ec904bd9746b352 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 25 Nov 2020 10:06:19 +0200 Subject: [PATCH 0527/2667] Working on neomutt setup and some other small fixes --- config.yaml | 12 +++--- dotdrop | 2 +- .../.config/imapnotify/admin@korhonen.cc.conf | 13 ------- home/.config/imapnotify/admin@korhonen.cc.js | 19 ++++++++++ .../functionalhacker@korhonen.cc.js | 19 ++++++++++ .../.config/imapnotify/marko@korhonen.cc.conf | 13 ------- home/.config/imapnotify/marko@korhonen.cc.js | 19 ++++++++++ home/.config/mimeo/associations.txt | 20 +++++----- home/.config/mpd/mpd.conf | 4 +- home/.config/msmtp/config | 29 +++++++------- .../neomutt/accounts/admin@korhonen.cc | 14 ------- .../neomutt/accounts/marko@korhonen.cc | 14 ------- home/.config/neomutt/appearance | 1 - home/.config/neomutt/neomuttrc | 13 ------- home/.config/neomutt/sidebar | 5 --- home/.config/sway/conf.d/01-vars.conf | 2 +- home/.config/user-dirs.dirs | 16 ++++---- home/.config/zsh/03-aliases.zsh | 3 +- home/.mbsyncrc | 25 ++++++++++++ home/.msmtprc | 38 ------------------- {home/.scripts => scripts}/autorotate.sh | 0 .../confgen/termite.conf.gen.sh | 0 .../confgen/zathura.conf.gen.sh | 0 .../hibernate-lowbattery.sh | 0 {home/.scripts => scripts}/ipmi/auto.sh | 0 {home/.scripts => scripts}/ipmi/fans.sh | 0 {home/.scripts => scripts}/ipmi/full.sh | 0 {home/.scripts => scripts}/ipmi/static.sh | 0 {home/.scripts => scripts}/ipmi/temp.sh | 0 scripts/mail/notify-new-mail.sh | 24 ++++++++++++ {home/.scripts => scripts}/media/imageviewer | 0 {home/.scripts => scripts}/media/imgurviewer | 0 {home/.scripts => scripts}/media/mpvqueue | 0 {home/.scripts => scripts}/open_with_linux.py | 0 secrets/env | 1 + secrets/secrets.sh | 1 + 36 files changed, 152 insertions(+), 155 deletions(-) delete mode 100644 home/.config/imapnotify/admin@korhonen.cc.conf create mode 100644 home/.config/imapnotify/admin@korhonen.cc.js create mode 100644 home/.config/imapnotify/functionalhacker@korhonen.cc.js delete mode 100644 home/.config/imapnotify/marko@korhonen.cc.conf create mode 100644 home/.config/imapnotify/marko@korhonen.cc.js delete mode 100644 home/.config/neomutt/accounts/admin@korhonen.cc delete mode 100644 home/.config/neomutt/accounts/marko@korhonen.cc delete mode 100644 home/.config/neomutt/appearance delete mode 100644 home/.config/neomutt/neomuttrc delete mode 100644 home/.config/neomutt/sidebar delete mode 100644 home/.msmtprc rename {home/.scripts => scripts}/autorotate.sh (100%) rename {home/.scripts => scripts}/confgen/termite.conf.gen.sh (100%) rename {home/.scripts => scripts}/confgen/zathura.conf.gen.sh (100%) rename {home/.scripts => scripts}/hibernate-lowbattery.sh (100%) rename {home/.scripts => scripts}/ipmi/auto.sh (100%) rename {home/.scripts => scripts}/ipmi/fans.sh (100%) rename {home/.scripts => scripts}/ipmi/full.sh (100%) rename {home/.scripts => scripts}/ipmi/static.sh (100%) rename {home/.scripts => scripts}/ipmi/temp.sh (100%) create mode 100755 scripts/mail/notify-new-mail.sh rename {home/.scripts => scripts}/media/imageviewer (100%) rename {home/.scripts => scripts}/media/imgurviewer (100%) rename {home/.scripts => scripts}/media/mpvqueue (100%) rename {home/.scripts => scripts}/open_with_linux.py (100%) diff --git a/config.yaml b/config.yaml index 6215cdba..fef2fb1d 100644 --- a/config.yaml +++ b/config.yaml @@ -22,7 +22,7 @@ dotfiles: d_neomutt: dst: ~/.config/neomutt src: .config/neomutt - d_goimapnotify: + d_imapnotify: dst: ~/.config/imapnotify src: .config/imapnotify f_init.vim: @@ -33,12 +33,12 @@ dotfiles: - vim-plug dst: ~/.config/nvim/conf.d src: .config/nvim/conf.d + f_user-dirs.dirs: + dst: ~/.config/user-dirs.dirs + src: .config/user-dirs.dirs f_coc-settings.json: dst: ~/.config/nvim/coc-settings.json src: .config/nvim/coc-settings.json - d_scripts: - dst: ~/.scripts - src: .scripts d_sway: dst: ~/.config/sway src: .config/sway @@ -178,7 +178,6 @@ profiles: - f_ranger.conf - f_ssh.conf - f_authorized_keys - - d_scripts - d_nvim_config - f_init.vim - f_coc-settings.json @@ -187,7 +186,7 @@ profiles: email: dotfiles: - d_neomutt - - d_goimapnotify + - d_imapnotify - f_mbsyncrc - f_msmtp_config media: @@ -229,6 +228,7 @@ profiles: - Pacman dotfiles: - f_paru.conf + - f_user-dirs.dirs Moria: include: - terminal diff --git a/dotdrop b/dotdrop index d42d810a..fe2681e3 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit d42d810ab1842c9568f655127491eeedf1d376fc +Subproject commit fe2681e32ca6d387cd9693bb704b2273b440e664 diff --git a/home/.config/imapnotify/admin@korhonen.cc.conf b/home/.config/imapnotify/admin@korhonen.cc.conf deleted file mode 100644 index cecd8bad..00000000 --- a/home/.config/imapnotify/admin@korhonen.cc.conf +++ /dev/null @@ -1,13 +0,0 @@ -{ - "host": "imap.migadu.com", - "port": 993, - "tls": true, - "tlsOptions": { - "rejectUnauthorized": true - }, - "username": "admin@korhonen.cc", - "password": "{{@@ env['PASS_EMAIL_ADMIN'] @@}}", - "onNewMail": "mbsync admin@korhonen.cc", - "onNewMailPost": "", - "boxes": [ "INBOX" ] -} diff --git a/home/.config/imapnotify/admin@korhonen.cc.js b/home/.config/imapnotify/admin@korhonen.cc.js new file mode 100644 index 00000000..de3e0a53 --- /dev/null +++ b/home/.config/imapnotify/admin@korhonen.cc.js @@ -0,0 +1,19 @@ +var child_process = require("child_process"); + +function getStdout(cmd) { + var stdout = child_process.execSync(cmd); + return stdout.toString().trim(); +} + +exports.host = "imap.migadu.com"; +exports.port = 993; +exports.tls = true; +exports.tlsOptions = { + rejectUnauthorized: true, +}; +exports.username = "admin@korhonen.cc"; +exports.password = "{{@@ env['PASS_EMAIL_ADMIN'] @@}}"; +exports.onNewMail = "mbsync admin@korhonen.cc"; +exports.onNewMailPost = + "~/git/dotfiles/scripts/mail/notify-new-mail.sh admin@korhonen.cc"; +exports.boxes = ["INBOX"]; diff --git a/home/.config/imapnotify/functionalhacker@korhonen.cc.js b/home/.config/imapnotify/functionalhacker@korhonen.cc.js new file mode 100644 index 00000000..1ca0937d --- /dev/null +++ b/home/.config/imapnotify/functionalhacker@korhonen.cc.js @@ -0,0 +1,19 @@ +var child_process = require("child_process"); + +function getStdout(cmd) { + var stdout = child_process.execSync(cmd); + return stdout.toString().trim(); +} + +exports.host = "imap.migadu.com"; +exports.port = 993; +exports.tls = true; +exports.tlsOptions = { + rejectUnauthorized: true, +}; +exports.username = "functionalhacker@korhonen.cc"; +exports.password = "{{@@ env['PASS_EMAIL_HACKER'] @@}}"; +exports.onNewMail = "mbsync functionalhacker@korhonen.cc"; +exports.onNewMailPost = + "~/git/dotfiles/scripts/mail/notify-new-mail.sh functionalhacker@korhonen.cc"; +exports.boxes = ["INBOX"]; diff --git a/home/.config/imapnotify/marko@korhonen.cc.conf b/home/.config/imapnotify/marko@korhonen.cc.conf deleted file mode 100644 index 4572d3d7..00000000 --- a/home/.config/imapnotify/marko@korhonen.cc.conf +++ /dev/null @@ -1,13 +0,0 @@ -{ - "host": "imap.migadu.com", - "port": 993, - "tls": true, - "tlsOptions": { - "rejectUnauthorized": true - }, - "username": "marko@korhonen.cc", - "password": "{{@@ env['PASS_EMAIL_MARKO'] @@}}", - "onNewMail": "mbsync marko@korhonen.cc", - "onNewMailPost": "", - "boxes": [ "INBOX" ] -} diff --git a/home/.config/imapnotify/marko@korhonen.cc.js b/home/.config/imapnotify/marko@korhonen.cc.js new file mode 100644 index 00000000..f86cca94 --- /dev/null +++ b/home/.config/imapnotify/marko@korhonen.cc.js @@ -0,0 +1,19 @@ +var child_process = require("child_process"); + +function getStdout(cmd) { + var stdout = child_process.execSync(cmd); + return stdout.toString().trim(); +} + +exports.host = "imap.migadu.com"; +exports.port = 993; +exports.tls = true; +exports.tlsOptions = { + rejectUnauthorized: true, +}; +exports.username = "marko@korhonen.cc"; +exports.password = "{{@@ env['PASS_EMAIL_MARKO'] @@}}"; +exports.onNewMail = "mbsync marko@korhonen.cc"; +exports.onNewMailPost = + "~/git/dotfiles/scripts/mail/notify-new-mail.sh marko@korhonen.cc"; +exports.boxes = ["INBOX"]; diff --git a/home/.config/mimeo/associations.txt b/home/.config/mimeo/associations.txt index 27e0d1a5..9d7fd9a6 100644 --- a/home/.config/mimeo/associations.txt +++ b/home/.config/mimeo/associations.txt @@ -1,31 +1,31 @@ -umpv %U +mpvqueue %U ^https?://invidio.us/.* -umpv %U +mpvqueue %U ^https?://(m.)?(www.)?youtube.com/watch\?.*v= -umpv %U +mpvqueue %U ^https?://(www.)?youtube.com/playlist\?.*list= -umpv %U +mpvqueue %U ^https?://(www.)?youtu.be/ -umpv %U +mpvqueue %U ^https?://(www.)?(m.)?twitch.tv/ -umpv %U +mpvqueue %U ^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:mp4|mkv|webm|avi|3gp|gif|gifv) -umpv %U +mpvqueue %U ^https?://www.facebook.com/.*/videos/ -umpv %U +mpvqueue %U ^https?://gfycat.com/.* -umpv %U +mpvqueue %U ^https?://vimeo.com/.* -umpv %U +mpvqueue %U ^https?://v.redd.it/.* imgurviewer %U diff --git a/home/.config/mpd/mpd.conf b/home/.config/mpd/mpd.conf index 01504433..0e05ab85 100644 --- a/home/.config/mpd/mpd.conf +++ b/home/.config/mpd/mpd.conf @@ -1,5 +1,5 @@ -music_directory "~/Music" -playlist_directory "~/Music/Playlists" +music_directory "~/music" +playlist_directory "~/music/Playlists" db_file "~/.mpd/database" log_file "~/.mpd/log" pid_file "~/.mpd/pid" diff --git a/home/.config/msmtp/config b/home/.config/msmtp/config index 81ca24cf..1179ee87 100644 --- a/home/.config/msmtp/config +++ b/home/.config/msmtp/config @@ -1,25 +1,26 @@ +defaults +auth on +tls on +tls_starttls off +tls_trust_file /etc/ssl/certs/ca-certificates.crt +logfile ~/.log/msmtp.log +host smtp.migadu.com +port 465 + +# functionalhacker@korhonen.cc +account functionalhacker@korhonen.cc +from functionalhacker@korhonen.cc +user functionalhacker@korhonen.cc +password "{{@@ env['PASS_EMAIL_HACKER'] @@}}" + # marko@korhonen.cc account marko@korhonen.cc from marko@korhonen.cc user marko@korhonen.cc password "{{@@ env['PASS_EMAIL_MARKO'] @@}}" -auth on -tls on -tls_starttls off -tls_trust_file /etc/ssl/certs/ca-certificates.crt -logfile ~/.log/msmtp/marko@korhonen.cc.log -host smtp.migadu.com -port 465 # admin@korhonen.cc account admin@korhonen.cc from admin@korhonen.cc user admin@korhonen.cc password "{{@@ env['PASS_EMAIL_ADMIN'] @@}}" -auth on -tls on -tls_starttls off -tls_trust_file /etc/ssl/certs/ca-certificates.crt -logfile ~/.log/msmtp/admin@korhonen.cc.log -host smtp.migadu.com -port 465 diff --git a/home/.config/neomutt/accounts/admin@korhonen.cc b/home/.config/neomutt/accounts/admin@korhonen.cc deleted file mode 100644 index 4bea53ab..00000000 --- a/home/.config/neomutt/accounts/admin@korhonen.cc +++ /dev/null @@ -1,14 +0,0 @@ -# vim: filetype=neomuttrc - -set my_email = "admin@korhonen.cc" -set from = $my_email -set sendmail = "/usr/bin/msmtp -a $my_email" -set realname = "Marko Korhonen" -set status_format = "-%r-Mutt: $my_email %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---" -set mbox_type = Maildir -set folder = "~/.mail/$my_email" -set mbox = "+INBOX" -set record = "+INBOX" -set postponed = "+Drafts" -set spoolfile = "+INBOX" -mailboxes = +INBOX diff --git a/home/.config/neomutt/accounts/marko@korhonen.cc b/home/.config/neomutt/accounts/marko@korhonen.cc deleted file mode 100644 index 514d3598..00000000 --- a/home/.config/neomutt/accounts/marko@korhonen.cc +++ /dev/null @@ -1,14 +0,0 @@ -# vim: filetype=neomuttrc - -set my_email = "marko@korhonen.cc" -set from = $my_email -set sendmail = "/usr/bin/msmtp -a $my_email" -set realname = "Marko Korhonen" -set status_format = "-%r-Mutt: $my_email %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---" -set mbox_type = Maildir -set folder = "~/.mail/$my_email" -set mbox = "+INBOX" -set record = "+INBOX" -set postponed = "+Drafts" -set spoolfile = "+INBOX" -mailboxes = +INBOX diff --git a/home/.config/neomutt/appearance b/home/.config/neomutt/appearance deleted file mode 100644 index 49493cdb..00000000 --- a/home/.config/neomutt/appearance +++ /dev/null @@ -1 +0,0 @@ -color normal default default diff --git a/home/.config/neomutt/neomuttrc b/home/.config/neomutt/neomuttrc deleted file mode 100644 index 74020721..00000000 --- a/home/.config/neomutt/neomuttrc +++ /dev/null @@ -1,13 +0,0 @@ -# vim: filetype=neomuttrc - -set sendmail = "/usr/bin/msmtp" -set mbox_type = Maildir -set folder = ~/.mail -set spoolfile = +Personal/INBOX - -source ~/.config/neomutt/appearance -source ~/.config/neomutt/sidebar -source ~/.config/neomutt/accounts/marko@korhonen.cc - -macro index 'source ~/.config/neomutt/accounts/marko@korhonen.cc!' -macro index 'source ~/.config/neomutt/accounts/admin@korhonen.cc!' diff --git a/home/.config/neomutt/sidebar b/home/.config/neomutt/sidebar deleted file mode 100644 index 48b12525..00000000 --- a/home/.config/neomutt/sidebar +++ /dev/null @@ -1,5 +0,0 @@ -# vim: filetype=neomuttrc - -set sidebar_visible = yes -set sidebar_indent_string = ' ' -sidebar_whitelist '~/.mail/<>/INBOX' diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index 5ca6f7ef..2736d7e0 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -3,5 +3,5 @@ set $mod Mod4 set $term alacritty set $gnome-schema org.gnome.desktop.interface -set $wallpaper ~/Pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) +set $wallpaper ~/pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) set $scripts ~/.config/sway/scripts diff --git a/home/.config/user-dirs.dirs b/home/.config/user-dirs.dirs index 4356ac10..99266f46 100644 --- a/home/.config/user-dirs.dirs +++ b/home/.config/user-dirs.dirs @@ -1,8 +1,8 @@ -XDG_DESKTOP_DIR="$HOME/Desktop" -XDG_DOWNLOAD_DIR="$HOME/Downloads" -XDG_TEMPLATES_DIR="$HOME/Templates" -XDG_PUBLICSHARE_DIR="$HOME/Public" -XDG_DOCUMENTS_DIR="$HOME/Documents" -XDG_MUSIC_DIR="$HOME/Music" -XDG_PICTURES_DIR="$HOME/Pictures" -XDG_VIDEOS_DIR="$HOME/Videos" +XDG_DESKTOP_DIR="$HOME/desktop" +XDG_DOWNLOAD_DIR="$HOME/downloads" +XDG_TEMPLATES_DIR="$HOME/templates" +XDG_PUBLICSHARE_DIR="$HOME/public" +XDG_DOCUMENTS_DIR="$HOME/documents" +XDG_MUSIC_DIR="$HOME/music" +XDG_PICTURES_DIR="$HOME/pictures" +XDG_VIDEOS_DIR="$HOME/videos" diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 85a94561..7f0afa24 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -4,8 +4,7 @@ alias gac='ga && gc' alias gpull='git pull' alias gpush='git push' -# Access server mariadb -alias moria-mariadb='ssh -tt moria docker exec -it mariadb mysql -p' +alias mutt='neomutt' # Syntax highlighting cat if output is a terminal cat() { diff --git a/home/.mbsyncrc b/home/.mbsyncrc index b9e97e87..d16d2f42 100644 --- a/home/.mbsyncrc +++ b/home/.mbsyncrc @@ -1,3 +1,28 @@ +### functionalhacker@korhonen.cc ##################################### +IMAPAccount functionalhacker@korhonen.cc +Host imap.migadu.com +User functionalhacker@korhonen.cc +Pass "{{@@ env['PASS_EMAIL_HACKER'] @@}}" +SSLType IMAPS +Port 993 +CertificateFile /etc/ssl/certs/ca-certificates.crt + +IMAPStore functionalhacker@korhonen.cc-remote +Account functionalhacker@korhonen.cc + +MaildirStore functionalhacker@korhonen.cc-local +Subfolders Verbatim +Path ~/.mail/functionalhacker@korhonen.cc/ +Inbox ~/.mail/functionalhacker@korhonen.cc/INBOX + +Channel functionalhacker@korhonen.cc +Master :functionalhacker@korhonen.cc-remote: +Slave :functionalhacker@korhonen.cc-local: +Create Both +Patterns * +SyncState * +################################################################# + ### marko@korhonen.cc ##################################### IMAPAccount marko@korhonen.cc Host imap.migadu.com diff --git a/home/.msmtprc b/home/.msmtprc deleted file mode 100644 index 79c5ce7a..00000000 --- a/home/.msmtprc +++ /dev/null @@ -1,38 +0,0 @@ -defaults -auth on -logfile ~/.msmtp.log -tls on -tls_trust_file /etc/ssl/certs/ca-certificates.crt - -# reekymarko@reekynet.com -account reekymarko@reekynet.com -host smtp.migadu.com -port 587 -from reekymarko@reekynet.com -user reekymarko@reekynet.com -passwordeval "pass email/reekymarko@reekynet.com | head -n 1" - -# marko.korhonen@reekynet.com -account marko.korhonen@reekynet.com -host smtp.migadu.com -port 587 -from marko.korhonen@reekynet.com -user marko.korhonen@reekynet.com -passwordeval "pass email/marko.korhonen@reekynet.com | head -n 1" - - -# admin@reekynet.com -account admin@reekynet.com -host smtp.migadu.com -port 587 -from admin@reekynet.com -user admin@reekynet.com -passwordeval "pass email/admin@reekynet.com | head -n 1" - -# marko.korhonen@metropolia.fi -account marko.korhonen@metropolia.fi -host smtp.metropolia.fi -port 587 -from marko.korhonen@metropolia.fi -user markoak -passwordeval "pass email/marko.korhonen@metropolia.fi | head -n 1" diff --git a/home/.scripts/autorotate.sh b/scripts/autorotate.sh similarity index 100% rename from home/.scripts/autorotate.sh rename to scripts/autorotate.sh diff --git a/home/.scripts/confgen/termite.conf.gen.sh b/scripts/confgen/termite.conf.gen.sh similarity index 100% rename from home/.scripts/confgen/termite.conf.gen.sh rename to scripts/confgen/termite.conf.gen.sh diff --git a/home/.scripts/confgen/zathura.conf.gen.sh b/scripts/confgen/zathura.conf.gen.sh similarity index 100% rename from home/.scripts/confgen/zathura.conf.gen.sh rename to scripts/confgen/zathura.conf.gen.sh diff --git a/home/.scripts/hibernate-lowbattery.sh b/scripts/hibernate-lowbattery.sh similarity index 100% rename from home/.scripts/hibernate-lowbattery.sh rename to scripts/hibernate-lowbattery.sh diff --git a/home/.scripts/ipmi/auto.sh b/scripts/ipmi/auto.sh similarity index 100% rename from home/.scripts/ipmi/auto.sh rename to scripts/ipmi/auto.sh diff --git a/home/.scripts/ipmi/fans.sh b/scripts/ipmi/fans.sh similarity index 100% rename from home/.scripts/ipmi/fans.sh rename to scripts/ipmi/fans.sh diff --git a/home/.scripts/ipmi/full.sh b/scripts/ipmi/full.sh similarity index 100% rename from home/.scripts/ipmi/full.sh rename to scripts/ipmi/full.sh diff --git a/home/.scripts/ipmi/static.sh b/scripts/ipmi/static.sh similarity index 100% rename from home/.scripts/ipmi/static.sh rename to scripts/ipmi/static.sh diff --git a/home/.scripts/ipmi/temp.sh b/scripts/ipmi/temp.sh similarity index 100% rename from home/.scripts/ipmi/temp.sh rename to scripts/ipmi/temp.sh diff --git a/scripts/mail/notify-new-mail.sh b/scripts/mail/notify-new-mail.sh new file mode 100755 index 00000000..298d6b35 --- /dev/null +++ b/scripts/mail/notify-new-mail.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +NEWMAILDIR=~/.mail/$1/INBOX/new +COUNT=$(ls $NEWMAILDIR | wc -l) +ICON=/usr/share/icons/Papirus-Dark/64x64/apps/email.svg +SOUND=/usr/share/sounds/Oxygen-Im-Message-In.ogg + + +if [ $COUNT -ne 0 ]; then + mpv $SOUND & +fi + +if [ $COUNT -gt 1 ]; then + fromaddress=$(cat $NEWMAILDIR/$(ls $NEWMAILDIR | sort -R | tail -1) | formail -x From | tail -1) + notify-send.sh -i $ICON "$COUNT new messages in $1" "From $fromaddress and others" + +elif [ $COUNT -eq 1 ]; then + mailsubject=$(cat $NEWMAILDIR/* | formail -x Subject) + fromaddress=$(cat $NEWMAILDIR/* | formail -x From | tail -1) + + notify-send.sh -i $ICON "New message in $1" "$fromaddress $mailsubject" +else + echo "No new mail" +fi diff --git a/home/.scripts/media/imageviewer b/scripts/media/imageviewer similarity index 100% rename from home/.scripts/media/imageviewer rename to scripts/media/imageviewer diff --git a/home/.scripts/media/imgurviewer b/scripts/media/imgurviewer similarity index 100% rename from home/.scripts/media/imgurviewer rename to scripts/media/imgurviewer diff --git a/home/.scripts/media/mpvqueue b/scripts/media/mpvqueue similarity index 100% rename from home/.scripts/media/mpvqueue rename to scripts/media/mpvqueue diff --git a/home/.scripts/open_with_linux.py b/scripts/open_with_linux.py similarity index 100% rename from home/.scripts/open_with_linux.py rename to scripts/open_with_linux.py diff --git a/secrets/env b/secrets/env index 9d4d342a..7b41c97b 100755 --- a/secrets/env +++ b/secrets/env @@ -9,6 +9,7 @@ export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -1)" export PASS_IPMI="$(pass selfhosted/idrac | head -1)" export PASS_MQTT="$(pass selfhosted/mqtt.reekynet.com | head -1)" +export PASS_EMAIL_HACKER="$(pass email/functionalhacker@korhonen.cc | head -1)" export PASS_EMAIL_MARKO="$(pass email/marko@korhonen.cc | head -1)" export PASS_EMAIL_ADMIN="$(pass email/admin@korhonen.cc | head -1)" diff --git a/secrets/secrets.sh b/secrets/secrets.sh index a33dac08..349c03a6 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -13,6 +13,7 @@ export PASS_MPD_ADMIN="$PASS_MPD_ADMIN" export PASS_IPMI="$PASS_IPMI" export PASS_MQTT="$PASS_MQTT" +export PASS_EMAIL_HACKER="$PASS_EMAIL_HACKER" export PASS_EMAIL_MARKO="$PASS_EMAIL_MARKO" export PASS_EMAIL_ADMIN="$PASS_EMAIL_ADMIN" From bf10ef8645217cfc6dee2300a73912b1663fa030 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 25 Nov 2020 10:06:19 +0200 Subject: [PATCH 0528/2667] Working on neomutt setup and some other small fixes --- config.yaml | 12 +++--- dotdrop | 2 +- .../.config/imapnotify/admin@korhonen.cc.conf | 13 ------- home/.config/imapnotify/admin@korhonen.cc.js | 19 ++++++++++ .../functionalhacker@korhonen.cc.js | 19 ++++++++++ .../.config/imapnotify/marko@korhonen.cc.conf | 13 ------- home/.config/imapnotify/marko@korhonen.cc.js | 19 ++++++++++ home/.config/mimeo/associations.txt | 20 +++++----- home/.config/mpd/mpd.conf | 4 +- home/.config/msmtp/config | 29 +++++++------- .../neomutt/accounts/admin@korhonen.cc | 14 ------- .../neomutt/accounts/marko@korhonen.cc | 14 ------- home/.config/neomutt/appearance | 1 - home/.config/neomutt/neomuttrc | 13 ------- home/.config/neomutt/sidebar | 5 --- home/.config/sway/conf.d/01-vars.conf | 2 +- home/.config/user-dirs.dirs | 16 ++++---- home/.config/zsh/03-aliases.zsh | 3 +- home/.mbsyncrc | 25 ++++++++++++ home/.msmtprc | 38 ------------------- {home/.scripts => scripts}/autorotate.sh | 0 .../confgen/termite.conf.gen.sh | 0 .../confgen/zathura.conf.gen.sh | 0 .../hibernate-lowbattery.sh | 0 {home/.scripts => scripts}/ipmi/auto.sh | 0 {home/.scripts => scripts}/ipmi/fans.sh | 0 {home/.scripts => scripts}/ipmi/full.sh | 0 {home/.scripts => scripts}/ipmi/static.sh | 0 {home/.scripts => scripts}/ipmi/temp.sh | 0 scripts/mail/notify-new-mail.sh | 24 ++++++++++++ {home/.scripts => scripts}/media/imageviewer | 0 {home/.scripts => scripts}/media/imgurviewer | 0 {home/.scripts => scripts}/media/mpvqueue | 0 {home/.scripts => scripts}/open_with_linux.py | 0 secrets/env | 1 + secrets/secrets.sh | 1 + 36 files changed, 152 insertions(+), 155 deletions(-) delete mode 100644 home/.config/imapnotify/admin@korhonen.cc.conf create mode 100644 home/.config/imapnotify/admin@korhonen.cc.js create mode 100644 home/.config/imapnotify/functionalhacker@korhonen.cc.js delete mode 100644 home/.config/imapnotify/marko@korhonen.cc.conf create mode 100644 home/.config/imapnotify/marko@korhonen.cc.js delete mode 100644 home/.config/neomutt/accounts/admin@korhonen.cc delete mode 100644 home/.config/neomutt/accounts/marko@korhonen.cc delete mode 100644 home/.config/neomutt/appearance delete mode 100644 home/.config/neomutt/neomuttrc delete mode 100644 home/.config/neomutt/sidebar delete mode 100644 home/.msmtprc rename {home/.scripts => scripts}/autorotate.sh (100%) rename {home/.scripts => scripts}/confgen/termite.conf.gen.sh (100%) rename {home/.scripts => scripts}/confgen/zathura.conf.gen.sh (100%) rename {home/.scripts => scripts}/hibernate-lowbattery.sh (100%) rename {home/.scripts => scripts}/ipmi/auto.sh (100%) rename {home/.scripts => scripts}/ipmi/fans.sh (100%) rename {home/.scripts => scripts}/ipmi/full.sh (100%) rename {home/.scripts => scripts}/ipmi/static.sh (100%) rename {home/.scripts => scripts}/ipmi/temp.sh (100%) create mode 100755 scripts/mail/notify-new-mail.sh rename {home/.scripts => scripts}/media/imageviewer (100%) rename {home/.scripts => scripts}/media/imgurviewer (100%) rename {home/.scripts => scripts}/media/mpvqueue (100%) rename {home/.scripts => scripts}/open_with_linux.py (100%) diff --git a/config.yaml b/config.yaml index 6215cdba..fef2fb1d 100644 --- a/config.yaml +++ b/config.yaml @@ -22,7 +22,7 @@ dotfiles: d_neomutt: dst: ~/.config/neomutt src: .config/neomutt - d_goimapnotify: + d_imapnotify: dst: ~/.config/imapnotify src: .config/imapnotify f_init.vim: @@ -33,12 +33,12 @@ dotfiles: - vim-plug dst: ~/.config/nvim/conf.d src: .config/nvim/conf.d + f_user-dirs.dirs: + dst: ~/.config/user-dirs.dirs + src: .config/user-dirs.dirs f_coc-settings.json: dst: ~/.config/nvim/coc-settings.json src: .config/nvim/coc-settings.json - d_scripts: - dst: ~/.scripts - src: .scripts d_sway: dst: ~/.config/sway src: .config/sway @@ -178,7 +178,6 @@ profiles: - f_ranger.conf - f_ssh.conf - f_authorized_keys - - d_scripts - d_nvim_config - f_init.vim - f_coc-settings.json @@ -187,7 +186,7 @@ profiles: email: dotfiles: - d_neomutt - - d_goimapnotify + - d_imapnotify - f_mbsyncrc - f_msmtp_config media: @@ -229,6 +228,7 @@ profiles: - Pacman dotfiles: - f_paru.conf + - f_user-dirs.dirs Moria: include: - terminal diff --git a/dotdrop b/dotdrop index d42d810a..fe2681e3 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit d42d810ab1842c9568f655127491eeedf1d376fc +Subproject commit fe2681e32ca6d387cd9693bb704b2273b440e664 diff --git a/home/.config/imapnotify/admin@korhonen.cc.conf b/home/.config/imapnotify/admin@korhonen.cc.conf deleted file mode 100644 index cecd8bad..00000000 --- a/home/.config/imapnotify/admin@korhonen.cc.conf +++ /dev/null @@ -1,13 +0,0 @@ -{ - "host": "imap.migadu.com", - "port": 993, - "tls": true, - "tlsOptions": { - "rejectUnauthorized": true - }, - "username": "admin@korhonen.cc", - "password": "{{@@ env['PASS_EMAIL_ADMIN'] @@}}", - "onNewMail": "mbsync admin@korhonen.cc", - "onNewMailPost": "", - "boxes": [ "INBOX" ] -} diff --git a/home/.config/imapnotify/admin@korhonen.cc.js b/home/.config/imapnotify/admin@korhonen.cc.js new file mode 100644 index 00000000..de3e0a53 --- /dev/null +++ b/home/.config/imapnotify/admin@korhonen.cc.js @@ -0,0 +1,19 @@ +var child_process = require("child_process"); + +function getStdout(cmd) { + var stdout = child_process.execSync(cmd); + return stdout.toString().trim(); +} + +exports.host = "imap.migadu.com"; +exports.port = 993; +exports.tls = true; +exports.tlsOptions = { + rejectUnauthorized: true, +}; +exports.username = "admin@korhonen.cc"; +exports.password = "{{@@ env['PASS_EMAIL_ADMIN'] @@}}"; +exports.onNewMail = "mbsync admin@korhonen.cc"; +exports.onNewMailPost = + "~/git/dotfiles/scripts/mail/notify-new-mail.sh admin@korhonen.cc"; +exports.boxes = ["INBOX"]; diff --git a/home/.config/imapnotify/functionalhacker@korhonen.cc.js b/home/.config/imapnotify/functionalhacker@korhonen.cc.js new file mode 100644 index 00000000..1ca0937d --- /dev/null +++ b/home/.config/imapnotify/functionalhacker@korhonen.cc.js @@ -0,0 +1,19 @@ +var child_process = require("child_process"); + +function getStdout(cmd) { + var stdout = child_process.execSync(cmd); + return stdout.toString().trim(); +} + +exports.host = "imap.migadu.com"; +exports.port = 993; +exports.tls = true; +exports.tlsOptions = { + rejectUnauthorized: true, +}; +exports.username = "functionalhacker@korhonen.cc"; +exports.password = "{{@@ env['PASS_EMAIL_HACKER'] @@}}"; +exports.onNewMail = "mbsync functionalhacker@korhonen.cc"; +exports.onNewMailPost = + "~/git/dotfiles/scripts/mail/notify-new-mail.sh functionalhacker@korhonen.cc"; +exports.boxes = ["INBOX"]; diff --git a/home/.config/imapnotify/marko@korhonen.cc.conf b/home/.config/imapnotify/marko@korhonen.cc.conf deleted file mode 100644 index 4572d3d7..00000000 --- a/home/.config/imapnotify/marko@korhonen.cc.conf +++ /dev/null @@ -1,13 +0,0 @@ -{ - "host": "imap.migadu.com", - "port": 993, - "tls": true, - "tlsOptions": { - "rejectUnauthorized": true - }, - "username": "marko@korhonen.cc", - "password": "{{@@ env['PASS_EMAIL_MARKO'] @@}}", - "onNewMail": "mbsync marko@korhonen.cc", - "onNewMailPost": "", - "boxes": [ "INBOX" ] -} diff --git a/home/.config/imapnotify/marko@korhonen.cc.js b/home/.config/imapnotify/marko@korhonen.cc.js new file mode 100644 index 00000000..f86cca94 --- /dev/null +++ b/home/.config/imapnotify/marko@korhonen.cc.js @@ -0,0 +1,19 @@ +var child_process = require("child_process"); + +function getStdout(cmd) { + var stdout = child_process.execSync(cmd); + return stdout.toString().trim(); +} + +exports.host = "imap.migadu.com"; +exports.port = 993; +exports.tls = true; +exports.tlsOptions = { + rejectUnauthorized: true, +}; +exports.username = "marko@korhonen.cc"; +exports.password = "{{@@ env['PASS_EMAIL_MARKO'] @@}}"; +exports.onNewMail = "mbsync marko@korhonen.cc"; +exports.onNewMailPost = + "~/git/dotfiles/scripts/mail/notify-new-mail.sh marko@korhonen.cc"; +exports.boxes = ["INBOX"]; diff --git a/home/.config/mimeo/associations.txt b/home/.config/mimeo/associations.txt index 27e0d1a5..9d7fd9a6 100644 --- a/home/.config/mimeo/associations.txt +++ b/home/.config/mimeo/associations.txt @@ -1,31 +1,31 @@ -umpv %U +mpvqueue %U ^https?://invidio.us/.* -umpv %U +mpvqueue %U ^https?://(m.)?(www.)?youtube.com/watch\?.*v= -umpv %U +mpvqueue %U ^https?://(www.)?youtube.com/playlist\?.*list= -umpv %U +mpvqueue %U ^https?://(www.)?youtu.be/ -umpv %U +mpvqueue %U ^https?://(www.)?(m.)?twitch.tv/ -umpv %U +mpvqueue %U ^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:mp4|mkv|webm|avi|3gp|gif|gifv) -umpv %U +mpvqueue %U ^https?://www.facebook.com/.*/videos/ -umpv %U +mpvqueue %U ^https?://gfycat.com/.* -umpv %U +mpvqueue %U ^https?://vimeo.com/.* -umpv %U +mpvqueue %U ^https?://v.redd.it/.* imgurviewer %U diff --git a/home/.config/mpd/mpd.conf b/home/.config/mpd/mpd.conf index 01504433..0e05ab85 100644 --- a/home/.config/mpd/mpd.conf +++ b/home/.config/mpd/mpd.conf @@ -1,5 +1,5 @@ -music_directory "~/Music" -playlist_directory "~/Music/Playlists" +music_directory "~/music" +playlist_directory "~/music/Playlists" db_file "~/.mpd/database" log_file "~/.mpd/log" pid_file "~/.mpd/pid" diff --git a/home/.config/msmtp/config b/home/.config/msmtp/config index 81ca24cf..1179ee87 100644 --- a/home/.config/msmtp/config +++ b/home/.config/msmtp/config @@ -1,25 +1,26 @@ +defaults +auth on +tls on +tls_starttls off +tls_trust_file /etc/ssl/certs/ca-certificates.crt +logfile ~/.log/msmtp.log +host smtp.migadu.com +port 465 + +# functionalhacker@korhonen.cc +account functionalhacker@korhonen.cc +from functionalhacker@korhonen.cc +user functionalhacker@korhonen.cc +password "{{@@ env['PASS_EMAIL_HACKER'] @@}}" + # marko@korhonen.cc account marko@korhonen.cc from marko@korhonen.cc user marko@korhonen.cc password "{{@@ env['PASS_EMAIL_MARKO'] @@}}" -auth on -tls on -tls_starttls off -tls_trust_file /etc/ssl/certs/ca-certificates.crt -logfile ~/.log/msmtp/marko@korhonen.cc.log -host smtp.migadu.com -port 465 # admin@korhonen.cc account admin@korhonen.cc from admin@korhonen.cc user admin@korhonen.cc password "{{@@ env['PASS_EMAIL_ADMIN'] @@}}" -auth on -tls on -tls_starttls off -tls_trust_file /etc/ssl/certs/ca-certificates.crt -logfile ~/.log/msmtp/admin@korhonen.cc.log -host smtp.migadu.com -port 465 diff --git a/home/.config/neomutt/accounts/admin@korhonen.cc b/home/.config/neomutt/accounts/admin@korhonen.cc deleted file mode 100644 index 4bea53ab..00000000 --- a/home/.config/neomutt/accounts/admin@korhonen.cc +++ /dev/null @@ -1,14 +0,0 @@ -# vim: filetype=neomuttrc - -set my_email = "admin@korhonen.cc" -set from = $my_email -set sendmail = "/usr/bin/msmtp -a $my_email" -set realname = "Marko Korhonen" -set status_format = "-%r-Mutt: $my_email %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---" -set mbox_type = Maildir -set folder = "~/.mail/$my_email" -set mbox = "+INBOX" -set record = "+INBOX" -set postponed = "+Drafts" -set spoolfile = "+INBOX" -mailboxes = +INBOX diff --git a/home/.config/neomutt/accounts/marko@korhonen.cc b/home/.config/neomutt/accounts/marko@korhonen.cc deleted file mode 100644 index 514d3598..00000000 --- a/home/.config/neomutt/accounts/marko@korhonen.cc +++ /dev/null @@ -1,14 +0,0 @@ -# vim: filetype=neomuttrc - -set my_email = "marko@korhonen.cc" -set from = $my_email -set sendmail = "/usr/bin/msmtp -a $my_email" -set realname = "Marko Korhonen" -set status_format = "-%r-Mutt: $my_email %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---" -set mbox_type = Maildir -set folder = "~/.mail/$my_email" -set mbox = "+INBOX" -set record = "+INBOX" -set postponed = "+Drafts" -set spoolfile = "+INBOX" -mailboxes = +INBOX diff --git a/home/.config/neomutt/appearance b/home/.config/neomutt/appearance deleted file mode 100644 index 49493cdb..00000000 --- a/home/.config/neomutt/appearance +++ /dev/null @@ -1 +0,0 @@ -color normal default default diff --git a/home/.config/neomutt/neomuttrc b/home/.config/neomutt/neomuttrc deleted file mode 100644 index 74020721..00000000 --- a/home/.config/neomutt/neomuttrc +++ /dev/null @@ -1,13 +0,0 @@ -# vim: filetype=neomuttrc - -set sendmail = "/usr/bin/msmtp" -set mbox_type = Maildir -set folder = ~/.mail -set spoolfile = +Personal/INBOX - -source ~/.config/neomutt/appearance -source ~/.config/neomutt/sidebar -source ~/.config/neomutt/accounts/marko@korhonen.cc - -macro index 'source ~/.config/neomutt/accounts/marko@korhonen.cc!' -macro index 'source ~/.config/neomutt/accounts/admin@korhonen.cc!' diff --git a/home/.config/neomutt/sidebar b/home/.config/neomutt/sidebar deleted file mode 100644 index 48b12525..00000000 --- a/home/.config/neomutt/sidebar +++ /dev/null @@ -1,5 +0,0 @@ -# vim: filetype=neomuttrc - -set sidebar_visible = yes -set sidebar_indent_string = ' ' -sidebar_whitelist '~/.mail/<>/INBOX' diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index 5ca6f7ef..2736d7e0 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -3,5 +3,5 @@ set $mod Mod4 set $term alacritty set $gnome-schema org.gnome.desktop.interface -set $wallpaper ~/Pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) +set $wallpaper ~/pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) set $scripts ~/.config/sway/scripts diff --git a/home/.config/user-dirs.dirs b/home/.config/user-dirs.dirs index 4356ac10..99266f46 100644 --- a/home/.config/user-dirs.dirs +++ b/home/.config/user-dirs.dirs @@ -1,8 +1,8 @@ -XDG_DESKTOP_DIR="$HOME/Desktop" -XDG_DOWNLOAD_DIR="$HOME/Downloads" -XDG_TEMPLATES_DIR="$HOME/Templates" -XDG_PUBLICSHARE_DIR="$HOME/Public" -XDG_DOCUMENTS_DIR="$HOME/Documents" -XDG_MUSIC_DIR="$HOME/Music" -XDG_PICTURES_DIR="$HOME/Pictures" -XDG_VIDEOS_DIR="$HOME/Videos" +XDG_DESKTOP_DIR="$HOME/desktop" +XDG_DOWNLOAD_DIR="$HOME/downloads" +XDG_TEMPLATES_DIR="$HOME/templates" +XDG_PUBLICSHARE_DIR="$HOME/public" +XDG_DOCUMENTS_DIR="$HOME/documents" +XDG_MUSIC_DIR="$HOME/music" +XDG_PICTURES_DIR="$HOME/pictures" +XDG_VIDEOS_DIR="$HOME/videos" diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 85a94561..7f0afa24 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -4,8 +4,7 @@ alias gac='ga && gc' alias gpull='git pull' alias gpush='git push' -# Access server mariadb -alias moria-mariadb='ssh -tt moria docker exec -it mariadb mysql -p' +alias mutt='neomutt' # Syntax highlighting cat if output is a terminal cat() { diff --git a/home/.mbsyncrc b/home/.mbsyncrc index b9e97e87..d16d2f42 100644 --- a/home/.mbsyncrc +++ b/home/.mbsyncrc @@ -1,3 +1,28 @@ +### functionalhacker@korhonen.cc ##################################### +IMAPAccount functionalhacker@korhonen.cc +Host imap.migadu.com +User functionalhacker@korhonen.cc +Pass "{{@@ env['PASS_EMAIL_HACKER'] @@}}" +SSLType IMAPS +Port 993 +CertificateFile /etc/ssl/certs/ca-certificates.crt + +IMAPStore functionalhacker@korhonen.cc-remote +Account functionalhacker@korhonen.cc + +MaildirStore functionalhacker@korhonen.cc-local +Subfolders Verbatim +Path ~/.mail/functionalhacker@korhonen.cc/ +Inbox ~/.mail/functionalhacker@korhonen.cc/INBOX + +Channel functionalhacker@korhonen.cc +Master :functionalhacker@korhonen.cc-remote: +Slave :functionalhacker@korhonen.cc-local: +Create Both +Patterns * +SyncState * +################################################################# + ### marko@korhonen.cc ##################################### IMAPAccount marko@korhonen.cc Host imap.migadu.com diff --git a/home/.msmtprc b/home/.msmtprc deleted file mode 100644 index 79c5ce7a..00000000 --- a/home/.msmtprc +++ /dev/null @@ -1,38 +0,0 @@ -defaults -auth on -logfile ~/.msmtp.log -tls on -tls_trust_file /etc/ssl/certs/ca-certificates.crt - -# reekymarko@reekynet.com -account reekymarko@reekynet.com -host smtp.migadu.com -port 587 -from reekymarko@reekynet.com -user reekymarko@reekynet.com -passwordeval "pass email/reekymarko@reekynet.com | head -n 1" - -# marko.korhonen@reekynet.com -account marko.korhonen@reekynet.com -host smtp.migadu.com -port 587 -from marko.korhonen@reekynet.com -user marko.korhonen@reekynet.com -passwordeval "pass email/marko.korhonen@reekynet.com | head -n 1" - - -# admin@reekynet.com -account admin@reekynet.com -host smtp.migadu.com -port 587 -from admin@reekynet.com -user admin@reekynet.com -passwordeval "pass email/admin@reekynet.com | head -n 1" - -# marko.korhonen@metropolia.fi -account marko.korhonen@metropolia.fi -host smtp.metropolia.fi -port 587 -from marko.korhonen@metropolia.fi -user markoak -passwordeval "pass email/marko.korhonen@metropolia.fi | head -n 1" diff --git a/home/.scripts/autorotate.sh b/scripts/autorotate.sh similarity index 100% rename from home/.scripts/autorotate.sh rename to scripts/autorotate.sh diff --git a/home/.scripts/confgen/termite.conf.gen.sh b/scripts/confgen/termite.conf.gen.sh similarity index 100% rename from home/.scripts/confgen/termite.conf.gen.sh rename to scripts/confgen/termite.conf.gen.sh diff --git a/home/.scripts/confgen/zathura.conf.gen.sh b/scripts/confgen/zathura.conf.gen.sh similarity index 100% rename from home/.scripts/confgen/zathura.conf.gen.sh rename to scripts/confgen/zathura.conf.gen.sh diff --git a/home/.scripts/hibernate-lowbattery.sh b/scripts/hibernate-lowbattery.sh similarity index 100% rename from home/.scripts/hibernate-lowbattery.sh rename to scripts/hibernate-lowbattery.sh diff --git a/home/.scripts/ipmi/auto.sh b/scripts/ipmi/auto.sh similarity index 100% rename from home/.scripts/ipmi/auto.sh rename to scripts/ipmi/auto.sh diff --git a/home/.scripts/ipmi/fans.sh b/scripts/ipmi/fans.sh similarity index 100% rename from home/.scripts/ipmi/fans.sh rename to scripts/ipmi/fans.sh diff --git a/home/.scripts/ipmi/full.sh b/scripts/ipmi/full.sh similarity index 100% rename from home/.scripts/ipmi/full.sh rename to scripts/ipmi/full.sh diff --git a/home/.scripts/ipmi/static.sh b/scripts/ipmi/static.sh similarity index 100% rename from home/.scripts/ipmi/static.sh rename to scripts/ipmi/static.sh diff --git a/home/.scripts/ipmi/temp.sh b/scripts/ipmi/temp.sh similarity index 100% rename from home/.scripts/ipmi/temp.sh rename to scripts/ipmi/temp.sh diff --git a/scripts/mail/notify-new-mail.sh b/scripts/mail/notify-new-mail.sh new file mode 100755 index 00000000..298d6b35 --- /dev/null +++ b/scripts/mail/notify-new-mail.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +NEWMAILDIR=~/.mail/$1/INBOX/new +COUNT=$(ls $NEWMAILDIR | wc -l) +ICON=/usr/share/icons/Papirus-Dark/64x64/apps/email.svg +SOUND=/usr/share/sounds/Oxygen-Im-Message-In.ogg + + +if [ $COUNT -ne 0 ]; then + mpv $SOUND & +fi + +if [ $COUNT -gt 1 ]; then + fromaddress=$(cat $NEWMAILDIR/$(ls $NEWMAILDIR | sort -R | tail -1) | formail -x From | tail -1) + notify-send.sh -i $ICON "$COUNT new messages in $1" "From $fromaddress and others" + +elif [ $COUNT -eq 1 ]; then + mailsubject=$(cat $NEWMAILDIR/* | formail -x Subject) + fromaddress=$(cat $NEWMAILDIR/* | formail -x From | tail -1) + + notify-send.sh -i $ICON "New message in $1" "$fromaddress $mailsubject" +else + echo "No new mail" +fi diff --git a/home/.scripts/media/imageviewer b/scripts/media/imageviewer similarity index 100% rename from home/.scripts/media/imageviewer rename to scripts/media/imageviewer diff --git a/home/.scripts/media/imgurviewer b/scripts/media/imgurviewer similarity index 100% rename from home/.scripts/media/imgurviewer rename to scripts/media/imgurviewer diff --git a/home/.scripts/media/mpvqueue b/scripts/media/mpvqueue similarity index 100% rename from home/.scripts/media/mpvqueue rename to scripts/media/mpvqueue diff --git a/home/.scripts/open_with_linux.py b/scripts/open_with_linux.py similarity index 100% rename from home/.scripts/open_with_linux.py rename to scripts/open_with_linux.py diff --git a/secrets/env b/secrets/env index 9d4d342a..7b41c97b 100755 --- a/secrets/env +++ b/secrets/env @@ -9,6 +9,7 @@ export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -1)" export PASS_IPMI="$(pass selfhosted/idrac | head -1)" export PASS_MQTT="$(pass selfhosted/mqtt.reekynet.com | head -1)" +export PASS_EMAIL_HACKER="$(pass email/functionalhacker@korhonen.cc | head -1)" export PASS_EMAIL_MARKO="$(pass email/marko@korhonen.cc | head -1)" export PASS_EMAIL_ADMIN="$(pass email/admin@korhonen.cc | head -1)" diff --git a/secrets/secrets.sh b/secrets/secrets.sh index a33dac08..349c03a6 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -13,6 +13,7 @@ export PASS_MPD_ADMIN="$PASS_MPD_ADMIN" export PASS_IPMI="$PASS_IPMI" export PASS_MQTT="$PASS_MQTT" +export PASS_EMAIL_HACKER="$PASS_EMAIL_HACKER" export PASS_EMAIL_MARKO="$PASS_EMAIL_MARKO" export PASS_EMAIL_ADMIN="$PASS_EMAIL_ADMIN" From 9e41240cddac5f8f2c3ee951c0eb2814e12ccb25 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 25 Nov 2020 10:19:18 +0200 Subject: [PATCH 0529/2667] Change git config to use new mail address --- config.yaml | 2 +- home/.gitconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.yaml b/config.yaml index fef2fb1d..e68711d4 100644 --- a/config.yaml +++ b/config.yaml @@ -174,7 +174,6 @@ profiles: - d_zsh - f_zshrc - f_tmux.conf - - f_gitconfig - f_ranger.conf - f_ssh.conf - f_authorized_keys @@ -229,6 +228,7 @@ profiles: dotfiles: - f_paru.conf - f_user-dirs.dirs + - f_gitconfig Moria: include: - terminal diff --git a/home/.gitconfig b/home/.gitconfig index 7074f04b..9734926e 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -1,5 +1,5 @@ [user] - email = marko.korhonen@reekynet.com + email = marko@korhonen.cc name = Marko Korhonen signingkey = C514037F1EFF4FA6 From 979861cd6b16dcb106f6d0813a2fb69fa0da660b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 25 Nov 2020 10:19:18 +0200 Subject: [PATCH 0530/2667] Change git config to use new mail address --- config.yaml | 2 +- home/.gitconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.yaml b/config.yaml index fef2fb1d..e68711d4 100644 --- a/config.yaml +++ b/config.yaml @@ -174,7 +174,6 @@ profiles: - d_zsh - f_zshrc - f_tmux.conf - - f_gitconfig - f_ranger.conf - f_ssh.conf - f_authorized_keys @@ -229,6 +228,7 @@ profiles: dotfiles: - f_paru.conf - f_user-dirs.dirs + - f_gitconfig Moria: include: - terminal diff --git a/home/.gitconfig b/home/.gitconfig index 7074f04b..9734926e 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -1,5 +1,5 @@ [user] - email = marko.korhonen@reekynet.com + email = marko@korhonen.cc name = Marko Korhonen signingkey = C514037F1EFF4FA6 From 757c3a750a7aa3bff5a48c9a942b1ba86d5b6b83 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 1 Dec 2020 18:03:30 +0200 Subject: [PATCH 0531/2667] Removed a workaround that is not needed anymore --- dotdrop | 2 +- home/.config/nvim/conf.d/07-clipboardfix.vim | 18 ------------------ .../nvim/conf.d/{08-fzf.vim => 07-fzf.vim} | 0 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 home/.config/nvim/conf.d/07-clipboardfix.vim rename home/.config/nvim/conf.d/{08-fzf.vim => 07-fzf.vim} (100%) diff --git a/dotdrop b/dotdrop index fe2681e3..831b3ddc 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit fe2681e32ca6d387cd9693bb704b2273b440e664 +Subproject commit 831b3ddc1a49ae5b96fba6d394a07f76963196a2 diff --git a/home/.config/nvim/conf.d/07-clipboardfix.vim b/home/.config/nvim/conf.d/07-clipboardfix.vim deleted file mode 100644 index 4942a685..00000000 --- a/home/.config/nvim/conf.d/07-clipboardfix.vim +++ /dev/null @@ -1,18 +0,0 @@ -{%@@ if profile == "Mirkwood" @@%} -" Wayland clipboard provider that strips carriage returns (GTK3 issue). -" This is needed because currently there's an issue where GTK3 applications on -" Wayland contain carriage returns at the end of the lines (this is a root -" issue that needs to be fixed). -let g:clipboard = { - \ 'name': 'wayland-strip-carriage', - \ 'copy': { - \ '+': 'wl-copy --foreground --type text/plain', - \ '*': 'wl-copy --foreground --type text/plain --primary', - \ }, - \ 'paste': { - \ '+': {-> systemlist('wl-paste --no-newline | tr -d "\r"')}, - \ '*': {-> systemlist('wl-paste --no-newline --primary | tr -d "\r"')}, - \ }, - \ 'cache_enabled': 1, - \ } -{%@@ endif @@%} diff --git a/home/.config/nvim/conf.d/08-fzf.vim b/home/.config/nvim/conf.d/07-fzf.vim similarity index 100% rename from home/.config/nvim/conf.d/08-fzf.vim rename to home/.config/nvim/conf.d/07-fzf.vim From 106d651980a524d9d2eabd125aaee0fab6ad7085 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 1 Dec 2020 18:03:30 +0200 Subject: [PATCH 0532/2667] Removed a workaround that is not needed anymore --- dotdrop | 2 +- home/.config/nvim/conf.d/07-clipboardfix.vim | 18 ------------------ .../nvim/conf.d/{08-fzf.vim => 07-fzf.vim} | 0 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 home/.config/nvim/conf.d/07-clipboardfix.vim rename home/.config/nvim/conf.d/{08-fzf.vim => 07-fzf.vim} (100%) diff --git a/dotdrop b/dotdrop index fe2681e3..831b3ddc 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit fe2681e32ca6d387cd9693bb704b2273b440e664 +Subproject commit 831b3ddc1a49ae5b96fba6d394a07f76963196a2 diff --git a/home/.config/nvim/conf.d/07-clipboardfix.vim b/home/.config/nvim/conf.d/07-clipboardfix.vim deleted file mode 100644 index 4942a685..00000000 --- a/home/.config/nvim/conf.d/07-clipboardfix.vim +++ /dev/null @@ -1,18 +0,0 @@ -{%@@ if profile == "Mirkwood" @@%} -" Wayland clipboard provider that strips carriage returns (GTK3 issue). -" This is needed because currently there's an issue where GTK3 applications on -" Wayland contain carriage returns at the end of the lines (this is a root -" issue that needs to be fixed). -let g:clipboard = { - \ 'name': 'wayland-strip-carriage', - \ 'copy': { - \ '+': 'wl-copy --foreground --type text/plain', - \ '*': 'wl-copy --foreground --type text/plain --primary', - \ }, - \ 'paste': { - \ '+': {-> systemlist('wl-paste --no-newline | tr -d "\r"')}, - \ '*': {-> systemlist('wl-paste --no-newline --primary | tr -d "\r"')}, - \ }, - \ 'cache_enabled': 1, - \ } -{%@@ endif @@%} diff --git a/home/.config/nvim/conf.d/08-fzf.vim b/home/.config/nvim/conf.d/07-fzf.vim similarity index 100% rename from home/.config/nvim/conf.d/08-fzf.vim rename to home/.config/nvim/conf.d/07-fzf.vim From 1b53634d0be0057d05045e58748670e293378120 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Dec 2020 20:33:43 +0200 Subject: [PATCH 0533/2667] Rework network config --- config-root.yaml | 94 ++++++++++---------- root/etc/systemd/network/01-wired.network | 3 +- root/etc/systemd/network/02-usb0.network | 3 +- root/etc/systemd/network/03-wireless.network | 3 +- root/etc/systemd/network/04-wlan0.network | 3 +- root/etc/systemd/networkd.conf | 3 + root/etc/systemd/resolved.conf | 2 + 7 files changed, 61 insertions(+), 50 deletions(-) create mode 100644 root/etc/systemd/networkd.conf create mode 100644 root/etc/systemd/resolved.conf diff --git a/config-root.yaml b/config-root.yaml index becfe0ad..450e4672 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -1,5 +1,3 @@ -actions: - chmod-wireguard: chmod 0640 /etc/systemd/network/99-wireguard.netdev config: backup: true banner: true @@ -20,10 +18,11 @@ dotfiles: dst: /usr/local/bin src: usr/local/bin d_networkd: - actions: - - chmod-wireguard src: etc/systemd/network dst: /etc/systemd/network + f_networkd: + src: etc/systemd/networkd.conf + dst: /etc/systemd/networkd.conf f_99-sysctl.conf: dst: /etc/sysctl.d/99-sysctl.conf src: etc/sysctl.d/99-sysctl.conf @@ -66,9 +65,6 @@ dotfiles: f_sshd_config: dst: /etc/ssh/sshd_config src: etc/ssh/sshd_config - f_timesyncd.conf: - dst: /etc/systemd/timesyncd.conf - src: etc/systemd/timesyncd.conf f_welcomemessage.conf: dst: /etc/welcomemessage.conf src: etc/welcomemessage.conf @@ -132,58 +128,64 @@ dotfiles: f_pacserve.service.conf: src: etc/pacserve/pacserve.service.conf dst: /etc/pacserve/pacserve.service.conf + f_resolved.conf: + src: etc/systemd/resolved.conf + dst: /etc/systemd/resolved.conf profiles: + Network: + dotfiles: + - d_networkd + - f_resolved.conf Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf + - f_pacman.conf + - f_pacserve.service.conf Mirkwood: dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - d_networkd - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_cpupower - - f_arch.conf - - f_arch-lts.conf - - f_kodi.conf - - f_pacserve.service.conf + - f_getty.conf + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf + - f_cpupower + - f_arch.conf + - f_arch-lts.conf + - f_kodi.conf + - f_pacserve.service.conf include: - - Locale - - Pacman + - Locale + - Pacman + - Network Moria: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf + - f_sshd_config + - f_99-sysctl.conf Gondor: include: - - Locale + - Locale dotfiles: - - f_sshd_config + - f_sshd_config localhost: include: - - Locale + - Locale diff --git a/root/etc/systemd/network/01-wired.network b/root/etc/systemd/network/01-wired.network index de6a082a..92ec5d67 100644 --- a/root/etc/systemd/network/01-wired.network +++ b/root/etc/systemd/network/01-wired.network @@ -2,7 +2,8 @@ Name=enp* [Network] -DHCP=ipv4 +DHCP=yes [DHCP] RouteMetric=10 +UseDomains=true diff --git a/root/etc/systemd/network/02-usb0.network b/root/etc/systemd/network/02-usb0.network index 29b43b08..8ae44320 100644 --- a/root/etc/systemd/network/02-usb0.network +++ b/root/etc/systemd/network/02-usb0.network @@ -2,7 +2,8 @@ Name=usb0 [Network] -DHCP=ipv4 +DHCP=yes [DHCP] RouteMetric=10 +UseDomains=true diff --git a/root/etc/systemd/network/03-wireless.network b/root/etc/systemd/network/03-wireless.network index 3c39f957..94b6271b 100644 --- a/root/etc/systemd/network/03-wireless.network +++ b/root/etc/systemd/network/03-wireless.network @@ -2,7 +2,8 @@ Name=wlp* [Network] -DHCP=ipv4 +DHCP=yes [DHCP] RouteMetric=20 +UseDomains=true diff --git a/root/etc/systemd/network/04-wlan0.network b/root/etc/systemd/network/04-wlan0.network index 16e7cfb2..6252119e 100644 --- a/root/etc/systemd/network/04-wlan0.network +++ b/root/etc/systemd/network/04-wlan0.network @@ -2,7 +2,8 @@ Name=wlan0 [Network] -DHCP=ipv4 +DHCP=yes [DHCP] RouteMetric=20 +UseDomains=true diff --git a/root/etc/systemd/networkd.conf b/root/etc/systemd/networkd.conf new file mode 100644 index 00000000..966d4b58 --- /dev/null +++ b/root/etc/systemd/networkd.conf @@ -0,0 +1,3 @@ +[Network] +SpeedMeter=yes +SpeedMeterIntervalSec=10sec diff --git a/root/etc/systemd/resolved.conf b/root/etc/systemd/resolved.conf new file mode 100644 index 00000000..ad4ea0b2 --- /dev/null +++ b/root/etc/systemd/resolved.conf @@ -0,0 +1,2 @@ +[Resolve] +LLMNR=no From cf6d03573b2fab71303caaff497fee5c2e88403b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Dec 2020 20:33:43 +0200 Subject: [PATCH 0534/2667] Rework network config --- config-root.yaml | 94 ++++++++++---------- root/etc/systemd/network/01-wired.network | 3 +- root/etc/systemd/network/02-usb0.network | 3 +- root/etc/systemd/network/03-wireless.network | 3 +- root/etc/systemd/network/04-wlan0.network | 3 +- root/etc/systemd/networkd.conf | 3 + root/etc/systemd/resolved.conf | 2 + 7 files changed, 61 insertions(+), 50 deletions(-) create mode 100644 root/etc/systemd/networkd.conf create mode 100644 root/etc/systemd/resolved.conf diff --git a/config-root.yaml b/config-root.yaml index becfe0ad..450e4672 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -1,5 +1,3 @@ -actions: - chmod-wireguard: chmod 0640 /etc/systemd/network/99-wireguard.netdev config: backup: true banner: true @@ -20,10 +18,11 @@ dotfiles: dst: /usr/local/bin src: usr/local/bin d_networkd: - actions: - - chmod-wireguard src: etc/systemd/network dst: /etc/systemd/network + f_networkd: + src: etc/systemd/networkd.conf + dst: /etc/systemd/networkd.conf f_99-sysctl.conf: dst: /etc/sysctl.d/99-sysctl.conf src: etc/sysctl.d/99-sysctl.conf @@ -66,9 +65,6 @@ dotfiles: f_sshd_config: dst: /etc/ssh/sshd_config src: etc/ssh/sshd_config - f_timesyncd.conf: - dst: /etc/systemd/timesyncd.conf - src: etc/systemd/timesyncd.conf f_welcomemessage.conf: dst: /etc/welcomemessage.conf src: etc/welcomemessage.conf @@ -132,58 +128,64 @@ dotfiles: f_pacserve.service.conf: src: etc/pacserve/pacserve.service.conf dst: /etc/pacserve/pacserve.service.conf + f_resolved.conf: + src: etc/systemd/resolved.conf + dst: /etc/systemd/resolved.conf profiles: + Network: + dotfiles: + - d_networkd + - f_resolved.conf Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf + - f_pacman.conf + - f_pacserve.service.conf Mirkwood: dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - d_networkd - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_timesyncd.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_cpupower - - f_arch.conf - - f_arch-lts.conf - - f_kodi.conf - - f_pacserve.service.conf + - f_getty.conf + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_99-sysctl.conf + - f_99-lowbat.rules + - f_ignore + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf + - f_cpupower + - f_arch.conf + - f_arch-lts.conf + - f_kodi.conf + - f_pacserve.service.conf include: - - Locale - - Pacman + - Locale + - Pacman + - Network Moria: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config - - f_99-sysctl.conf + - f_sshd_config + - f_99-sysctl.conf Gondor: include: - - Locale + - Locale dotfiles: - - f_sshd_config + - f_sshd_config localhost: include: - - Locale + - Locale diff --git a/root/etc/systemd/network/01-wired.network b/root/etc/systemd/network/01-wired.network index de6a082a..92ec5d67 100644 --- a/root/etc/systemd/network/01-wired.network +++ b/root/etc/systemd/network/01-wired.network @@ -2,7 +2,8 @@ Name=enp* [Network] -DHCP=ipv4 +DHCP=yes [DHCP] RouteMetric=10 +UseDomains=true diff --git a/root/etc/systemd/network/02-usb0.network b/root/etc/systemd/network/02-usb0.network index 29b43b08..8ae44320 100644 --- a/root/etc/systemd/network/02-usb0.network +++ b/root/etc/systemd/network/02-usb0.network @@ -2,7 +2,8 @@ Name=usb0 [Network] -DHCP=ipv4 +DHCP=yes [DHCP] RouteMetric=10 +UseDomains=true diff --git a/root/etc/systemd/network/03-wireless.network b/root/etc/systemd/network/03-wireless.network index 3c39f957..94b6271b 100644 --- a/root/etc/systemd/network/03-wireless.network +++ b/root/etc/systemd/network/03-wireless.network @@ -2,7 +2,8 @@ Name=wlp* [Network] -DHCP=ipv4 +DHCP=yes [DHCP] RouteMetric=20 +UseDomains=true diff --git a/root/etc/systemd/network/04-wlan0.network b/root/etc/systemd/network/04-wlan0.network index 16e7cfb2..6252119e 100644 --- a/root/etc/systemd/network/04-wlan0.network +++ b/root/etc/systemd/network/04-wlan0.network @@ -2,7 +2,8 @@ Name=wlan0 [Network] -DHCP=ipv4 +DHCP=yes [DHCP] RouteMetric=20 +UseDomains=true diff --git a/root/etc/systemd/networkd.conf b/root/etc/systemd/networkd.conf new file mode 100644 index 00000000..966d4b58 --- /dev/null +++ b/root/etc/systemd/networkd.conf @@ -0,0 +1,3 @@ +[Network] +SpeedMeter=yes +SpeedMeterIntervalSec=10sec diff --git a/root/etc/systemd/resolved.conf b/root/etc/systemd/resolved.conf new file mode 100644 index 00000000..ad4ea0b2 --- /dev/null +++ b/root/etc/systemd/resolved.conf @@ -0,0 +1,2 @@ +[Resolve] +LLMNR=no From f203732a94d2dce28b82446c253c59d5d18ea8cc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 4 Dec 2020 10:41:08 +0200 Subject: [PATCH 0535/2667] Improve vim ripgrep --- home/.config/nvim/conf.d/08-fzf.vim | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/home/.config/nvim/conf.d/08-fzf.vim b/home/.config/nvim/conf.d/08-fzf.vim index b71f31fe..60be3f2e 100644 --- a/home/.config/nvim/conf.d/08-fzf.vim +++ b/home/.config/nvim/conf.d/08-fzf.vim @@ -32,14 +32,12 @@ endfunction " Looks "let $FZF_DEFAULT_OPTS=' --color=dark --color=fg:15,bg:-1,hl:1,fg+:#ffffff,bg+:0,hl+:1 --color=info:0,prompt:0,pointer:12,marker:4,spinner:11,header:-1 --layout=reverse --margin=1,4' +" ripgrep custom settings +command! -bang -nargs=* Rg + \ call fzf#vim#grep('rg --column --line-number --no-heading --color=always --smart-case ' + \ . (len() > 0 ? : '""'), 0, + \ fzf#vim#with_preview({'options': ['--delimiter=:', '--nth=2..', '--layout=reverse', '--info=inline']}), 0) + " Keybinds nmap :Files nmap :Rg - -" Ripgrep command customization -command! -bang -nargs=* Rg - \ call fzf#vim#grep( - \ 'rg --column --hidden --line-number --no-heading --color=always --smart-case '.shellescape(), 1, - \ 0 ? fzf#vim#with_preview('up:60%') - \ : fzf#vim#with_preview('right:50%:hidden', '?'), - \ 0) From 784ee8526eaeaa67d22fd6493473a304832a43f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 4 Dec 2020 10:41:08 +0200 Subject: [PATCH 0536/2667] Improve vim ripgrep --- home/.config/nvim/conf.d/08-fzf.vim | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/home/.config/nvim/conf.d/08-fzf.vim b/home/.config/nvim/conf.d/08-fzf.vim index b71f31fe..60be3f2e 100644 --- a/home/.config/nvim/conf.d/08-fzf.vim +++ b/home/.config/nvim/conf.d/08-fzf.vim @@ -32,14 +32,12 @@ endfunction " Looks "let $FZF_DEFAULT_OPTS=' --color=dark --color=fg:15,bg:-1,hl:1,fg+:#ffffff,bg+:0,hl+:1 --color=info:0,prompt:0,pointer:12,marker:4,spinner:11,header:-1 --layout=reverse --margin=1,4' +" ripgrep custom settings +command! -bang -nargs=* Rg + \ call fzf#vim#grep('rg --column --line-number --no-heading --color=always --smart-case ' + \ . (len() > 0 ? : '""'), 0, + \ fzf#vim#with_preview({'options': ['--delimiter=:', '--nth=2..', '--layout=reverse', '--info=inline']}), 0) + " Keybinds nmap :Files nmap :Rg - -" Ripgrep command customization -command! -bang -nargs=* Rg - \ call fzf#vim#grep( - \ 'rg --column --hidden --line-number --no-heading --color=always --smart-case '.shellescape(), 1, - \ 0 ? fzf#vim#with_preview('up:60%') - \ : fzf#vim#with_preview('right:50%:hidden', '?'), - \ 0) From c12b4bfc9c0414f1a2b6617326c70a4f6eac2d69 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 11:36:01 +0200 Subject: [PATCH 0537/2667] Change domains and other things --- docker/freshrss/docker-compose.yml | 4 +- docker/gitea/docker-compose.yaml | 4 +- docker/homeautomation/docker-compose.yml | 76 +++++++++++++++++--- docker/jellyfin/docker-compose.yaml | 4 +- docker/marko.korhonen.cc/docker-compose.yaml | 30 ++++++++ docker/nextcloud/docker-compose.yml | 4 +- docker/pihole/docker-compose.yml | 4 +- docker/portainer/docker-compose.yaml | 6 +- docker/traefik/docker-compose.yaml | 6 +- docker/wireguard/docker-compose.yml | 2 +- dotdrop | 2 +- 11 files changed, 113 insertions(+), 29 deletions(-) create mode 100644 docker/marko.korhonen.cc/docker-compose.yaml diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 6e6750d9..aaf1286e 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -21,12 +21,12 @@ services: - "traefik.enable=true" - "traefik.http.routers.freshrss-redirect.entrypoints=http" - - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.reekynet.com`)" + - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.korhonen.cc`)" - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - "traefik.http.routers.freshrss-redirect.middlewares=http2https" - "traefik.http.routers.freshrss.entrypoints=https" - - "traefik.http.routers.freshrss.rule=Host(`rss.reekynet.com`)" + - "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)" - "traefik.http.routers.freshrss.tls=true" - "traefik.http.routers.freshrss.tls.certresolver=http" - "traefik.http.routers.freshrss.service=freshrss" diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 65a0fac2..4fafc49e 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -27,12 +27,12 @@ services: - "traefik.enable=true" - "traefik.http.routers.gitea-redirect.entrypoints=http" - - "traefik.http.routers.gitea-redirect.rule=Host(`git.reekynet.com`)" + - "traefik.http.routers.gitea-redirect.rule=Host(`git.korhonen.cc`)" - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - "traefik.http.routers.gitea-redirect.middlewares=http2https" - "traefik.http.routers.gitea.entrypoints=https" - - "traefik.http.routers.gitea.rule=Host(`git.reekynet.com`)" + - "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)" - "traefik.http.routers.gitea.tls=true" - "traefik.http.routers.gitea.tls.certresolver=http" - "traefik.http.routers.gitea.service=gitea" diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index d44b5541..d45f02f8 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -10,7 +10,7 @@ services: - /etc/localtime:/etc/localtime:ro restart: unless-stopped networks: - - home-assistant + - homeautomation - mariadb - proxy ports: @@ -22,12 +22,12 @@ services: - "traefik.enable=true" - "traefik.http.routers.home-assistant-redirect.entrypoints=http" - - "traefik.http.routers.home-assistant-redirect.rule=Host(`home.reekynet.com`)" + - "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)" - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - "traefik.http.routers.home-assistant-redirect.middlewares=http2https" - "traefik.http.routers.home-assistant.entrypoints=https" - - "traefik.http.routers.home-assistant.rule=Host(`home.reekynet.com`)" + - "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)" - "traefik.http.routers.home-assistant.tls=true" - "traefik.http.routers.home-assistant.tls.certresolver=http" - "traefik.http.routers.home-assistant.service=home-assistant" @@ -63,7 +63,7 @@ services: ports: - "1883:1883" networks: - - home-assistant + - homeautomation volumes: - /docker/homeautomation/mosquitto:/mosquitto - /etc/localtime:/etc/localtime:ro @@ -77,26 +77,52 @@ services: - /docker/homeautomation/rhasspy:/profiles environment: - TZ=Europe/Helsinki - networks: - - home-assistant ports: - "12101:12101" + networks: + - homeautomation restart: unless-stopped depends_on: - home-assistant + - opentts devices: - "/dev/snd:/dev/snd" + opentts: + image: synesthesiam/opentts + container_name: opentts + ports: + - 5500:5500 + command: --marytts-url http://marytts:59125 --mozillatts-url http://mozillatts:5002 + tty: true + networks: + - homeautomation + depends_on: + - marytts + - mozillatts + marytts: + image: synesthesiam/marytts:5.2 + container_name: marytts + tty: true + networks: + - homeautomation + mozillatts: + image: synesthesiam/mozilla-tts + container_name: mozillatts + tty: true + networks: + - homeautomation + node-red: container_name: node-red image: nodered/node-red environment: - TZ=Europe/Helsinki - networks: - - home-assistant - proxy ports: - "1880:1880" + networks: + - homeautomation volumes: - /docker/homeautomation/node-red:/data - /etc/localtime:/etc/localtime:ro @@ -107,20 +133,48 @@ services: - "traefik.enable=true" - "traefik.http.routers.node-red-redirect.entrypoints=http" - - "traefik.http.routers.node-red-redirect.rule=Host(`node.reekynet.com`)" + - "traefik.http.routers.node-red-redirect.rule=Host(`node.korhonen.cc`)" - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - "traefik.http.routers.node-red-redirect.middlewares=http2https" - "traefik.http.routers.node-red.entrypoints=https" - - "traefik.http.routers.node-red.rule=Host(`node.reekynet.com`)" + - "traefik.http.routers.node-red.rule=Host(`node.korhonen.cc`)" - "traefik.http.routers.node-red.tls=true" - "traefik.http.routers.node-red.tls.certresolver=http" - "traefik.http.routers.node-red.service=node-red" - "traefik.docker.network=proxy" - "traefik.http.services.node-red.loadbalancer.server.port=1880" + gotify: + image: gotify/server + container_name: gotify + volumes: + - /docker/homeautomation/gotify:/app/data + environment: + - GOTIFY_DATABASE_DIALECT=mysql + - GOTIFY_DATABASE_CONNECTION=gotify:gotify@tcp(mariadb:3306)/gotify?charset=utf8&parseTime=True&loc=Local + networks: + - proxy + - mariadb + restart: unless-stopped + labels: + - "traefik.enable=true" + + - "traefik.http.routers.gotify-redirect.entrypoints=http" + - "traefik.http.routers.gotify-redirect.rule=Host(`gotify.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.gotify-redirect.middlewares=http2https" + + - "traefik.http.routers.gotify.entrypoints=https" + - "traefik.http.routers.gotify.rule=Host(`gotify.korhonen.cc`)" + - "traefik.http.routers.gotify.tls=true" + - "traefik.http.routers.gotify.tls.certresolver=http" + - "traefik.http.routers.gotify.service=gotify" + - "traefik.docker.network=proxy" + - "traefik.http.services.gotify.loadbalancer.server.port=80" + networks: - home-assistant: + homeautomation: external: false mariadb: external: true diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 54521321..18fa2074 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -20,12 +20,12 @@ services: - "traefik.enable=true" - "traefik.http.routers.jellyfin-redirect.entrypoints=http" - - "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.reekynet.com`)" + - "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)" - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - "traefik.http.routers.jellyfin-redirect.middlewares=http2https" - "traefik.http.routers.jellyfin.entrypoints=https" - - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.reekynet.com`)" + - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)" - "traefik.http.routers.jellyfin.tls=true" - "traefik.http.routers.jellyfin.tls.certresolver=http" - "traefik.http.routers.jellyfin.service=jellyfin" diff --git a/docker/marko.korhonen.cc/docker-compose.yaml b/docker/marko.korhonen.cc/docker-compose.yaml new file mode 100644 index 00000000..522dbc17 --- /dev/null +++ b/docker/marko.korhonen.cc/docker-compose.yaml @@ -0,0 +1,30 @@ +version: "3" + +services: + site: + image: nginx:alpine + container_name: marko.korhonen.cc + volumes: + - /docker/marko.korhonen.cc:/usr/share/nginx/html:ro + networks: + - proxy + restart: unless-stopped + labels: + - "traefik.enable=true" + + - "traefik.http.routers.marko-redirect.entrypoints=http" + - "traefik.http.routers.marko-redirect.rule=Host(`marko.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.marko-redirect.middlewares=http2https" + + - "traefik.http.routers.marko.entrypoints=https" + - "traefik.http.routers.marko.rule=Host(`marko.korhonen.cc`)" + - "traefik.http.routers.marko.tls=true" + - "traefik.http.routers.marko.tls.certresolver=http" + - "traefik.http.routers.marko.service=marko" + - "traefik.docker.network=proxy" + - "traefik.http.services.marko.loadbalancer.server.port=80" + +networks: + proxy: + external: true diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index f88f03a7..e424267e 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -28,12 +28,12 @@ services: - "traefik.enable=true" - "traefik.http.routers.nextcloud-redirect.entrypoints=http" - - "traefik.http.routers.nextcloud-redirect.rule=Host(`cloud.reekynet.com`)" + - "traefik.http.routers.nextcloud-redirect.rule=Host(`cloud.korhonen.cc`)" - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - "traefik.http.routers.nextcloud-redirect.middlewares=http2https" - "traefik.http.routers.nextcloud.entrypoints=https" - - "traefik.http.routers.nextcloud.rule=Host(`cloud.reekynet.com`)" + - "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)" - "traefik.http.routers.nextcloud.tls=true" - "traefik.http.routers.nextcloud.tls.certresolver=http" - "traefik.http.routers.nextcloud.service=nextcloud" diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index bce339bf..1738d8f5 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -29,12 +29,12 @@ services: - "traefik.enable=true" - "traefik.http.routers.pihole-redirect.entrypoints=http" - - "traefik.http.routers.pihole-redirect.rule=Host(`pihole.reekynet.com`)" + - "traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)" - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - "traefik.http.routers.pihole-redirect.middlewares=http2https" - "traefik.http.routers.pihole.entrypoints=https" - - "traefik.http.routers.pihole.rule=Host(`pihole.reekynet.com`)" + - "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)" - "traefik.http.routers.pihole.tls=true" - "traefik.http.routers.pihole.tls.certresolver=http" - "traefik.http.routers.pihole.service=pihole" diff --git a/docker/portainer/docker-compose.yaml b/docker/portainer/docker-compose.yaml index 36bab854..4335bcfc 100644 --- a/docker/portainer/docker-compose.yaml +++ b/docker/portainer/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3' services: portainer: - image: portainer/portainer + image: portainer/portainer-ce container_name: portainer environment: - TZ=Europe/Helsinki @@ -16,12 +16,12 @@ services: - 'traefik.enable=true' - 'traefik.http.routers.portainer-redirect.entrypoints=http' - - 'traefik.http.routers.portainer-redirect.rule=Host(`portainer.reekynet.com`)' + - 'traefik.http.routers.portainer-redirect.rule=Host(`portainer.korhonen.cc`)' - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - 'traefik.http.routers.portainer-redirect.middlewares=http2https' - 'traefik.http.routers.portainer.entrypoints=https' - - 'traefik.http.routers.portainer.rule=Host(`portainer.reekynet.com`)' + - 'traefik.http.routers.portainer.rule=Host(`portainer.korhonen.cc`)' - 'traefik.http.routers.portainer.tls=true' - 'traefik.http.routers.portainer.tls.certresolver=http' - 'traefik.http.routers.portainer.service=portainer' diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml index b1ac5057..0b89e1ff 100644 --- a/docker/traefik/docker-compose.yaml +++ b/docker/traefik/docker-compose.yaml @@ -2,7 +2,7 @@ version: '3' services: traefik: - image: traefik:v2.0 + image: traefik:latest container_name: traefik restart: unless-stopped ports: @@ -24,12 +24,12 @@ services: - 'traefik.enable=true' - 'traefik.http.routers.redirect.entrypoints=http' - - 'traefik.http.routers.redirect.rule=Host(`traefik.reekynet.com`)' + - 'traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)' - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - 'traefik.http.routers.redirect.middlewares=http2https' - 'traefik.http.routers.dashboard.entrypoints=https' - - 'traefik.http.routers.dashboard.rule=Host(`traefik.reekynet.com`)' + - 'traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)' - 'traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users' - 'traefik.http.routers.dashboard.middlewares=dashboard-auth' - 'traefik.http.routers.dashboard.tls=true' diff --git a/docker/wireguard/docker-compose.yml b/docker/wireguard/docker-compose.yml index bf1a34a9..41769138 100644 --- a/docker/wireguard/docker-compose.yml +++ b/docker/wireguard/docker-compose.yml @@ -9,7 +9,7 @@ services: environment: - TZ=Europe/Helsinki - PEERS=4 - - SERVERURL=reekynet.com + - SERVERURL=korhonen.cc - SERVERPORT=48574 - INTERNAL_SUBNET=10.200.200.0/24 volumes: diff --git a/dotdrop b/dotdrop index 831b3ddc..2d64e2ee 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 831b3ddc1a49ae5b96fba6d394a07f76963196a2 +Subproject commit 2d64e2ee59281e358253fadb04432a040f9392ee From 6fe85ac768a2d67ddc452e4cd31de2ffe5787d92 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 11:36:01 +0200 Subject: [PATCH 0538/2667] Change domains and other things --- docker/freshrss/docker-compose.yml | 4 +- docker/gitea/docker-compose.yaml | 4 +- docker/homeautomation/docker-compose.yml | 76 +++++++++++++++++--- docker/jellyfin/docker-compose.yaml | 4 +- docker/marko.korhonen.cc/docker-compose.yaml | 30 ++++++++ docker/nextcloud/docker-compose.yml | 4 +- docker/pihole/docker-compose.yml | 4 +- docker/portainer/docker-compose.yaml | 6 +- docker/traefik/docker-compose.yaml | 6 +- docker/wireguard/docker-compose.yml | 2 +- dotdrop | 2 +- 11 files changed, 113 insertions(+), 29 deletions(-) create mode 100644 docker/marko.korhonen.cc/docker-compose.yaml diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 6e6750d9..aaf1286e 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -21,12 +21,12 @@ services: - "traefik.enable=true" - "traefik.http.routers.freshrss-redirect.entrypoints=http" - - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.reekynet.com`)" + - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.korhonen.cc`)" - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - "traefik.http.routers.freshrss-redirect.middlewares=http2https" - "traefik.http.routers.freshrss.entrypoints=https" - - "traefik.http.routers.freshrss.rule=Host(`rss.reekynet.com`)" + - "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)" - "traefik.http.routers.freshrss.tls=true" - "traefik.http.routers.freshrss.tls.certresolver=http" - "traefik.http.routers.freshrss.service=freshrss" diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 65a0fac2..4fafc49e 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -27,12 +27,12 @@ services: - "traefik.enable=true" - "traefik.http.routers.gitea-redirect.entrypoints=http" - - "traefik.http.routers.gitea-redirect.rule=Host(`git.reekynet.com`)" + - "traefik.http.routers.gitea-redirect.rule=Host(`git.korhonen.cc`)" - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - "traefik.http.routers.gitea-redirect.middlewares=http2https" - "traefik.http.routers.gitea.entrypoints=https" - - "traefik.http.routers.gitea.rule=Host(`git.reekynet.com`)" + - "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)" - "traefik.http.routers.gitea.tls=true" - "traefik.http.routers.gitea.tls.certresolver=http" - "traefik.http.routers.gitea.service=gitea" diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index d44b5541..d45f02f8 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -10,7 +10,7 @@ services: - /etc/localtime:/etc/localtime:ro restart: unless-stopped networks: - - home-assistant + - homeautomation - mariadb - proxy ports: @@ -22,12 +22,12 @@ services: - "traefik.enable=true" - "traefik.http.routers.home-assistant-redirect.entrypoints=http" - - "traefik.http.routers.home-assistant-redirect.rule=Host(`home.reekynet.com`)" + - "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)" - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - "traefik.http.routers.home-assistant-redirect.middlewares=http2https" - "traefik.http.routers.home-assistant.entrypoints=https" - - "traefik.http.routers.home-assistant.rule=Host(`home.reekynet.com`)" + - "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)" - "traefik.http.routers.home-assistant.tls=true" - "traefik.http.routers.home-assistant.tls.certresolver=http" - "traefik.http.routers.home-assistant.service=home-assistant" @@ -63,7 +63,7 @@ services: ports: - "1883:1883" networks: - - home-assistant + - homeautomation volumes: - /docker/homeautomation/mosquitto:/mosquitto - /etc/localtime:/etc/localtime:ro @@ -77,26 +77,52 @@ services: - /docker/homeautomation/rhasspy:/profiles environment: - TZ=Europe/Helsinki - networks: - - home-assistant ports: - "12101:12101" + networks: + - homeautomation restart: unless-stopped depends_on: - home-assistant + - opentts devices: - "/dev/snd:/dev/snd" + opentts: + image: synesthesiam/opentts + container_name: opentts + ports: + - 5500:5500 + command: --marytts-url http://marytts:59125 --mozillatts-url http://mozillatts:5002 + tty: true + networks: + - homeautomation + depends_on: + - marytts + - mozillatts + marytts: + image: synesthesiam/marytts:5.2 + container_name: marytts + tty: true + networks: + - homeautomation + mozillatts: + image: synesthesiam/mozilla-tts + container_name: mozillatts + tty: true + networks: + - homeautomation + node-red: container_name: node-red image: nodered/node-red environment: - TZ=Europe/Helsinki - networks: - - home-assistant - proxy ports: - "1880:1880" + networks: + - homeautomation volumes: - /docker/homeautomation/node-red:/data - /etc/localtime:/etc/localtime:ro @@ -107,20 +133,48 @@ services: - "traefik.enable=true" - "traefik.http.routers.node-red-redirect.entrypoints=http" - - "traefik.http.routers.node-red-redirect.rule=Host(`node.reekynet.com`)" + - "traefik.http.routers.node-red-redirect.rule=Host(`node.korhonen.cc`)" - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - "traefik.http.routers.node-red-redirect.middlewares=http2https" - "traefik.http.routers.node-red.entrypoints=https" - - "traefik.http.routers.node-red.rule=Host(`node.reekynet.com`)" + - "traefik.http.routers.node-red.rule=Host(`node.korhonen.cc`)" - "traefik.http.routers.node-red.tls=true" - "traefik.http.routers.node-red.tls.certresolver=http" - "traefik.http.routers.node-red.service=node-red" - "traefik.docker.network=proxy" - "traefik.http.services.node-red.loadbalancer.server.port=1880" + gotify: + image: gotify/server + container_name: gotify + volumes: + - /docker/homeautomation/gotify:/app/data + environment: + - GOTIFY_DATABASE_DIALECT=mysql + - GOTIFY_DATABASE_CONNECTION=gotify:gotify@tcp(mariadb:3306)/gotify?charset=utf8&parseTime=True&loc=Local + networks: + - proxy + - mariadb + restart: unless-stopped + labels: + - "traefik.enable=true" + + - "traefik.http.routers.gotify-redirect.entrypoints=http" + - "traefik.http.routers.gotify-redirect.rule=Host(`gotify.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.gotify-redirect.middlewares=http2https" + + - "traefik.http.routers.gotify.entrypoints=https" + - "traefik.http.routers.gotify.rule=Host(`gotify.korhonen.cc`)" + - "traefik.http.routers.gotify.tls=true" + - "traefik.http.routers.gotify.tls.certresolver=http" + - "traefik.http.routers.gotify.service=gotify" + - "traefik.docker.network=proxy" + - "traefik.http.services.gotify.loadbalancer.server.port=80" + networks: - home-assistant: + homeautomation: external: false mariadb: external: true diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 54521321..18fa2074 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -20,12 +20,12 @@ services: - "traefik.enable=true" - "traefik.http.routers.jellyfin-redirect.entrypoints=http" - - "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.reekynet.com`)" + - "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)" - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - "traefik.http.routers.jellyfin-redirect.middlewares=http2https" - "traefik.http.routers.jellyfin.entrypoints=https" - - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.reekynet.com`)" + - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)" - "traefik.http.routers.jellyfin.tls=true" - "traefik.http.routers.jellyfin.tls.certresolver=http" - "traefik.http.routers.jellyfin.service=jellyfin" diff --git a/docker/marko.korhonen.cc/docker-compose.yaml b/docker/marko.korhonen.cc/docker-compose.yaml new file mode 100644 index 00000000..522dbc17 --- /dev/null +++ b/docker/marko.korhonen.cc/docker-compose.yaml @@ -0,0 +1,30 @@ +version: "3" + +services: + site: + image: nginx:alpine + container_name: marko.korhonen.cc + volumes: + - /docker/marko.korhonen.cc:/usr/share/nginx/html:ro + networks: + - proxy + restart: unless-stopped + labels: + - "traefik.enable=true" + + - "traefik.http.routers.marko-redirect.entrypoints=http" + - "traefik.http.routers.marko-redirect.rule=Host(`marko.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.marko-redirect.middlewares=http2https" + + - "traefik.http.routers.marko.entrypoints=https" + - "traefik.http.routers.marko.rule=Host(`marko.korhonen.cc`)" + - "traefik.http.routers.marko.tls=true" + - "traefik.http.routers.marko.tls.certresolver=http" + - "traefik.http.routers.marko.service=marko" + - "traefik.docker.network=proxy" + - "traefik.http.services.marko.loadbalancer.server.port=80" + +networks: + proxy: + external: true diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index f88f03a7..e424267e 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -28,12 +28,12 @@ services: - "traefik.enable=true" - "traefik.http.routers.nextcloud-redirect.entrypoints=http" - - "traefik.http.routers.nextcloud-redirect.rule=Host(`cloud.reekynet.com`)" + - "traefik.http.routers.nextcloud-redirect.rule=Host(`cloud.korhonen.cc`)" - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - "traefik.http.routers.nextcloud-redirect.middlewares=http2https" - "traefik.http.routers.nextcloud.entrypoints=https" - - "traefik.http.routers.nextcloud.rule=Host(`cloud.reekynet.com`)" + - "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)" - "traefik.http.routers.nextcloud.tls=true" - "traefik.http.routers.nextcloud.tls.certresolver=http" - "traefik.http.routers.nextcloud.service=nextcloud" diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yml index bce339bf..1738d8f5 100644 --- a/docker/pihole/docker-compose.yml +++ b/docker/pihole/docker-compose.yml @@ -29,12 +29,12 @@ services: - "traefik.enable=true" - "traefik.http.routers.pihole-redirect.entrypoints=http" - - "traefik.http.routers.pihole-redirect.rule=Host(`pihole.reekynet.com`)" + - "traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)" - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - "traefik.http.routers.pihole-redirect.middlewares=http2https" - "traefik.http.routers.pihole.entrypoints=https" - - "traefik.http.routers.pihole.rule=Host(`pihole.reekynet.com`)" + - "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)" - "traefik.http.routers.pihole.tls=true" - "traefik.http.routers.pihole.tls.certresolver=http" - "traefik.http.routers.pihole.service=pihole" diff --git a/docker/portainer/docker-compose.yaml b/docker/portainer/docker-compose.yaml index 36bab854..4335bcfc 100644 --- a/docker/portainer/docker-compose.yaml +++ b/docker/portainer/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3' services: portainer: - image: portainer/portainer + image: portainer/portainer-ce container_name: portainer environment: - TZ=Europe/Helsinki @@ -16,12 +16,12 @@ services: - 'traefik.enable=true' - 'traefik.http.routers.portainer-redirect.entrypoints=http' - - 'traefik.http.routers.portainer-redirect.rule=Host(`portainer.reekynet.com`)' + - 'traefik.http.routers.portainer-redirect.rule=Host(`portainer.korhonen.cc`)' - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - 'traefik.http.routers.portainer-redirect.middlewares=http2https' - 'traefik.http.routers.portainer.entrypoints=https' - - 'traefik.http.routers.portainer.rule=Host(`portainer.reekynet.com`)' + - 'traefik.http.routers.portainer.rule=Host(`portainer.korhonen.cc`)' - 'traefik.http.routers.portainer.tls=true' - 'traefik.http.routers.portainer.tls.certresolver=http' - 'traefik.http.routers.portainer.service=portainer' diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml index b1ac5057..0b89e1ff 100644 --- a/docker/traefik/docker-compose.yaml +++ b/docker/traefik/docker-compose.yaml @@ -2,7 +2,7 @@ version: '3' services: traefik: - image: traefik:v2.0 + image: traefik:latest container_name: traefik restart: unless-stopped ports: @@ -24,12 +24,12 @@ services: - 'traefik.enable=true' - 'traefik.http.routers.redirect.entrypoints=http' - - 'traefik.http.routers.redirect.rule=Host(`traefik.reekynet.com`)' + - 'traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)' - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - 'traefik.http.routers.redirect.middlewares=http2https' - 'traefik.http.routers.dashboard.entrypoints=https' - - 'traefik.http.routers.dashboard.rule=Host(`traefik.reekynet.com`)' + - 'traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)' - 'traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users' - 'traefik.http.routers.dashboard.middlewares=dashboard-auth' - 'traefik.http.routers.dashboard.tls=true' diff --git a/docker/wireguard/docker-compose.yml b/docker/wireguard/docker-compose.yml index bf1a34a9..41769138 100644 --- a/docker/wireguard/docker-compose.yml +++ b/docker/wireguard/docker-compose.yml @@ -9,7 +9,7 @@ services: environment: - TZ=Europe/Helsinki - PEERS=4 - - SERVERURL=reekynet.com + - SERVERURL=korhonen.cc - SERVERPORT=48574 - INTERNAL_SUBNET=10.200.200.0/24 volumes: diff --git a/dotdrop b/dotdrop index 831b3ddc..2d64e2ee 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 831b3ddc1a49ae5b96fba6d394a07f76963196a2 +Subproject commit 2d64e2ee59281e358253fadb04432a040f9392ee From cc31ba15ccc7f2fcd7211e4d449b8fa8d2aabd31 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 11:37:14 +0200 Subject: [PATCH 0539/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 2d64e2ee..831b3ddc 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 2d64e2ee59281e358253fadb04432a040f9392ee +Subproject commit 831b3ddc1a49ae5b96fba6d394a07f76963196a2 From da8bc2153fcc9f1861470dc6bf2f5e19503c8f0c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 11:37:14 +0200 Subject: [PATCH 0540/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 2d64e2ee..831b3ddc 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 2d64e2ee59281e358253fadb04432a040f9392ee +Subproject commit 831b3ddc1a49ae5b96fba6d394a07f76963196a2 From 819bdd2eae7d8590e25eb2fd574532b6114a9307 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 11:39:02 +0200 Subject: [PATCH 0541/2667] Small fixes --- home/.config/neomutt/accounts/marko@korhonen.cc | 9 +++++++++ home/.config/neomutt/neomuttrc | 9 +++++++++ home/.config/nvimpager/init.vim | 1 - home/.config/sway/conf.d/01-vars.conf | 2 +- home/.config/sway/conf.d/06-keybinds.conf | 8 ++++++-- home/.config/sway/conf.d/08-exec.conf | 4 ++-- root/etc/systemd/timesyncd.conf | 3 --- 7 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 home/.config/neomutt/accounts/marko@korhonen.cc create mode 100644 home/.config/neomutt/neomuttrc delete mode 100644 root/etc/systemd/timesyncd.conf diff --git a/home/.config/neomutt/accounts/marko@korhonen.cc b/home/.config/neomutt/accounts/marko@korhonen.cc new file mode 100644 index 00000000..d054f631 --- /dev/null +++ b/home/.config/neomutt/accounts/marko@korhonen.cc @@ -0,0 +1,9 @@ +# vim: filetype=neomuttrc + +set folder = ~/.mail/marko@korhonen.cc +set spoolfile = +INBOX +set postponed = +Drafts +set record = +Sent + +set realname='Marko Korhonen' +set from=marko@korhonen.cc diff --git a/home/.config/neomutt/neomuttrc b/home/.config/neomutt/neomuttrc new file mode 100644 index 00000000..f37ec331 --- /dev/null +++ b/home/.config/neomutt/neomuttrc @@ -0,0 +1,9 @@ +# vim: filetype=neomuttrc + +## General options +set header_cache = "~/.cache/neomutt" +set mbox_type=Maildir + +# Accounts +source "~/.config/neomutt/accounts/marko@korhonen.cc" +folder-hook $folder 'source ~/.config/neomutt/accounts/marko@korhonen.cc' diff --git a/home/.config/nvimpager/init.vim b/home/.config/nvimpager/init.vim index e963c9aa..76dd80bb 100644 --- a/home/.config/nvimpager/init.vim +++ b/home/.config/nvimpager/init.vim @@ -8,4 +8,3 @@ set runtimepath+=~/.config/nvim/plugged/vim-polyglot source ~/.config/nvim/conf.d/02-appearance.vim source ~/.config/nvim/conf.d/03-keybinds.vim source ~/.config/nvim/conf.d/06-misc.vim -source ~/.config/nvim/conf.d/07-clipboardfix.vim diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index 2736d7e0..5bc7c612 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -3,5 +3,5 @@ set $mod Mod4 set $term alacritty set $gnome-schema org.gnome.desktop.interface -set $wallpaper ~/pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) +set $wallpaper ~/pictures/Wallpapers/random/$(ls ~/pictures/Wallpapers/random | sort -R | tail -n 1) set $scripts ~/.config/sway/scripts diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 0e44439b..d0ad336a 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -54,11 +54,15 @@ bindsym --locked XF86Search output eDP-1 toggle # FZF # exit menu bindsym $mod+Shift+e exec $term --class fzf-launcher -e $scripts/exit.sh +# password manager +bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass + # launch a program bindsym $mod+d exec wofi bindsym $mod+Shift+d exec wofi --show run -# password manager -bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass + +# manage clipboard +bindsym $mod+c exec clipman pick -t wofi # manage notifications bindsym $mod+Backspace exec makoctl invoke diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index f6f9633e..f8d685a8 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -7,9 +7,9 @@ exec { telegram-desktop /usr/lib/kdeconnectd kdeconnect-indicator - thunderbird mako - wl-paste -t text --watch clipman store 1>> ~/.log/clipman 2>&1 & + wl-paste -t text --watch clipman store --notify 1>> ~/.log/clipman 2>&1 + wl-paste -p -t text --watch clipman store -P --histpath="~/.local/share/clipman-primary.json" mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 gnome-keyring-daemon --start --components=secrets diff --git a/root/etc/systemd/timesyncd.conf b/root/etc/systemd/timesyncd.conf deleted file mode 100644 index e1aac332..00000000 --- a/root/etc/systemd/timesyncd.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Time] -NTP=0.arch.pool.ntp.org -FallbackNTP=0.pfsense.pool.ntp.org From e25601f71ed745e4f43570faecd4d3d87e9ad293 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 11:39:02 +0200 Subject: [PATCH 0542/2667] Small fixes --- home/.config/neomutt/accounts/marko@korhonen.cc | 9 +++++++++ home/.config/neomutt/neomuttrc | 9 +++++++++ home/.config/nvimpager/init.vim | 1 - home/.config/sway/conf.d/01-vars.conf | 2 +- home/.config/sway/conf.d/06-keybinds.conf | 8 ++++++-- home/.config/sway/conf.d/08-exec.conf | 4 ++-- root/etc/systemd/timesyncd.conf | 3 --- 7 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 home/.config/neomutt/accounts/marko@korhonen.cc create mode 100644 home/.config/neomutt/neomuttrc delete mode 100644 root/etc/systemd/timesyncd.conf diff --git a/home/.config/neomutt/accounts/marko@korhonen.cc b/home/.config/neomutt/accounts/marko@korhonen.cc new file mode 100644 index 00000000..d054f631 --- /dev/null +++ b/home/.config/neomutt/accounts/marko@korhonen.cc @@ -0,0 +1,9 @@ +# vim: filetype=neomuttrc + +set folder = ~/.mail/marko@korhonen.cc +set spoolfile = +INBOX +set postponed = +Drafts +set record = +Sent + +set realname='Marko Korhonen' +set from=marko@korhonen.cc diff --git a/home/.config/neomutt/neomuttrc b/home/.config/neomutt/neomuttrc new file mode 100644 index 00000000..f37ec331 --- /dev/null +++ b/home/.config/neomutt/neomuttrc @@ -0,0 +1,9 @@ +# vim: filetype=neomuttrc + +## General options +set header_cache = "~/.cache/neomutt" +set mbox_type=Maildir + +# Accounts +source "~/.config/neomutt/accounts/marko@korhonen.cc" +folder-hook $folder 'source ~/.config/neomutt/accounts/marko@korhonen.cc' diff --git a/home/.config/nvimpager/init.vim b/home/.config/nvimpager/init.vim index e963c9aa..76dd80bb 100644 --- a/home/.config/nvimpager/init.vim +++ b/home/.config/nvimpager/init.vim @@ -8,4 +8,3 @@ set runtimepath+=~/.config/nvim/plugged/vim-polyglot source ~/.config/nvim/conf.d/02-appearance.vim source ~/.config/nvim/conf.d/03-keybinds.vim source ~/.config/nvim/conf.d/06-misc.vim -source ~/.config/nvim/conf.d/07-clipboardfix.vim diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index 2736d7e0..5bc7c612 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -3,5 +3,5 @@ set $mod Mod4 set $term alacritty set $gnome-schema org.gnome.desktop.interface -set $wallpaper ~/pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) +set $wallpaper ~/pictures/Wallpapers/random/$(ls ~/pictures/Wallpapers/random | sort -R | tail -n 1) set $scripts ~/.config/sway/scripts diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 0e44439b..d0ad336a 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -54,11 +54,15 @@ bindsym --locked XF86Search output eDP-1 toggle # FZF # exit menu bindsym $mod+Shift+e exec $term --class fzf-launcher -e $scripts/exit.sh +# password manager +bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass + # launch a program bindsym $mod+d exec wofi bindsym $mod+Shift+d exec wofi --show run -# password manager -bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass + +# manage clipboard +bindsym $mod+c exec clipman pick -t wofi # manage notifications bindsym $mod+Backspace exec makoctl invoke diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index f6f9633e..f8d685a8 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -7,9 +7,9 @@ exec { telegram-desktop /usr/lib/kdeconnectd kdeconnect-indicator - thunderbird mako - wl-paste -t text --watch clipman store 1>> ~/.log/clipman 2>&1 & + wl-paste -t text --watch clipman store --notify 1>> ~/.log/clipman 2>&1 + wl-paste -p -t text --watch clipman store -P --histpath="~/.local/share/clipman-primary.json" mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 gnome-keyring-daemon --start --components=secrets diff --git a/root/etc/systemd/timesyncd.conf b/root/etc/systemd/timesyncd.conf deleted file mode 100644 index e1aac332..00000000 --- a/root/etc/systemd/timesyncd.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Time] -NTP=0.arch.pool.ntp.org -FallbackNTP=0.pfsense.pool.ntp.org From e4111019fd8bae8fded0462d4cb18f1286444a21 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 11:44:07 +0200 Subject: [PATCH 0543/2667] Update root config --- config-root.yaml | 80 ++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 450e4672..1b5ba22b 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -134,58 +134,58 @@ dotfiles: profiles: Network: dotfiles: - - d_networkd - - f_resolved.conf + - d_networkd + - f_resolved.conf Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf + - f_pacman.conf + - f_pacserve.service.conf Mirkwood: dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_cpupower - - f_arch.conf - - f_arch-lts.conf - - f_kodi.conf - - f_pacserve.service.conf + - f_getty.conf + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_99-lowbat.rules + - f_ignore + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf + - f_cpupower + - f_arch.conf + - f_arch-lts.conf + - f_kodi.conf include: - - Locale - - Pacman - - Network + - Locale + - Pacman + - Network Moria: include: - - Locale - - Pacman + - Locale + - Pacman + - Network dotfiles: - - f_sshd_config - - f_99-sysctl.conf + - f_sshd_config + - f_99-sysctl.conf + - f_cpupower Gondor: include: - - Locale + - Locale dotfiles: - - f_sshd_config + - f_sshd_config localhost: include: - - Locale + - Locale From 5749b6bc597970a84b07023c82409bd357fa5627 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 11:44:07 +0200 Subject: [PATCH 0544/2667] Update root config --- config-root.yaml | 80 ++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index 450e4672..1b5ba22b 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -134,58 +134,58 @@ dotfiles: profiles: Network: dotfiles: - - d_networkd - - f_resolved.conf + - d_networkd + - f_resolved.conf Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf + - f_pacman.conf + - f_pacserve.service.conf Mirkwood: dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - f_adb.service - - f_bluetooth.conf - - f_iwd@.service - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_99-sysctl.conf - - f_99-lowbat.rules - - f_ignore - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_cpupower - - f_arch.conf - - f_arch-lts.conf - - f_kodi.conf - - f_pacserve.service.conf + - f_getty.conf + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - f_adb.service + - f_bluetooth.conf + - f_iwd@.service + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_99-lowbat.rules + - f_ignore + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf + - f_cpupower + - f_arch.conf + - f_arch-lts.conf + - f_kodi.conf include: - - Locale - - Pacman - - Network + - Locale + - Pacman + - Network Moria: include: - - Locale - - Pacman + - Locale + - Pacman + - Network dotfiles: - - f_sshd_config - - f_99-sysctl.conf + - f_sshd_config + - f_99-sysctl.conf + - f_cpupower Gondor: include: - - Locale + - Locale dotfiles: - - f_sshd_config + - f_sshd_config localhost: include: - - Locale + - Locale From 4c929adeb04d9dfc34f96696b46bc3df41fa2fdf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 12:43:17 +0200 Subject: [PATCH 0545/2667] Simplified network config and removed old service files --- config-root.yaml | 19 ------ root/etc/systemd/network/01-wired.network | 1 - root/etc/systemd/network/02-usb0.link | 6 -- .../{02-usb0.network => 02-wireless.network} | 3 +- root/etc/systemd/network/03-wireless.network | 9 --- root/etc/systemd/network/04-wlan0.link | 6 -- root/etc/systemd/network/04-wlan0.network | 9 --- root/etc/systemd/system.conf | 68 ------------------- root/etc/systemd/system/ipmi-fans.service | 9 --- root/etc/systemd/system/ipmi-fans.timer | 9 --- root/etc/systemd/system/ipmi-static.service | 9 --- root/etc/systemd/system/ipmi-temp.service | 9 --- root/etc/systemd/system/ipmi-temp.timer | 9 --- .../systemd/system/ipmi/ipmi-static.service | 9 --- .../etc/systemd/system/ipmi/ipmi-temp.service | 9 --- root/etc/systemd/system/ipmi/ipmi-temp.timer | 9 --- .../system/iwd.service.d/override.conf | 3 - root/etc/systemd/system/iwd@.service | 14 ---- root/etc/systemd/system/rtorrent.service | 13 ---- 19 files changed, 1 insertion(+), 222 deletions(-) delete mode 100644 root/etc/systemd/network/02-usb0.link rename root/etc/systemd/network/{02-usb0.network => 02-wireless.network} (67%) delete mode 100644 root/etc/systemd/network/03-wireless.network delete mode 100644 root/etc/systemd/network/04-wlan0.link delete mode 100644 root/etc/systemd/network/04-wlan0.network delete mode 100644 root/etc/systemd/system/ipmi-fans.service delete mode 100644 root/etc/systemd/system/ipmi-fans.timer delete mode 100644 root/etc/systemd/system/ipmi-static.service delete mode 100644 root/etc/systemd/system/ipmi-temp.service delete mode 100644 root/etc/systemd/system/ipmi-temp.timer delete mode 100644 root/etc/systemd/system/ipmi/ipmi-static.service delete mode 100644 root/etc/systemd/system/ipmi/ipmi-temp.service delete mode 100644 root/etc/systemd/system/ipmi/ipmi-temp.timer delete mode 100755 root/etc/systemd/system/iwd.service.d/override.conf delete mode 100755 root/etc/systemd/system/iwd@.service delete mode 100644 root/etc/systemd/system/rtorrent.service diff --git a/config-root.yaml b/config-root.yaml index 1b5ba22b..39e08660 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -41,9 +41,6 @@ dotfiles: f_freetype2.sh: dst: /etc/profile.d/freetype2.sh src: etc/profile.d/freetype2.sh - f_iwd@.service: - dst: /etc/systemd/system/iwd@.service - src: etc/systemd/system/iwd@.service f_fonts.conf: dst: /etc/fonts/local.conf src: etc/fonts/local.conf @@ -95,21 +92,6 @@ dotfiles: f_20-quiet-printk.conf: src: etc/sysctl.d/20-quiet-printk.conf dst: /etc/sysctl.d/20-quiet-printk.conf - f_ipmi-static.service: - src: etc/systemd/system/ipmi-static.service - dst: /etc/systemd/system/ipmi-static.service - f_ipmi-temp.service: - src: etc/systemd/system/ipmi-temp.service - dst: /etc/systemd/system/ipmi-temp.service - f_ipmi-temp.timer: - src: etc/systemd/system/ipmi-temp.timer - dst: /etc/systemd/system/ipmi-temp.timer - f_ipmi-fans.service: - src: etc/systemd/system/ipmi-fans.service - dst: /etc/systemd/system/ipmi-fans.service - f_ipmi-fans.timer: - src: etc/systemd/system/ipmi-fans.timer - dst: /etc/systemd/system/ipmi-fans.timer f_system.conf: src: etc/systemd/system.conf dst: /etc/systemd/system.conf @@ -152,7 +134,6 @@ profiles: - d_bin - f_adb.service - f_bluetooth.conf - - f_iwd@.service - f_sshd_config - f_logind.conf - f_60-uinput-permissions.rules diff --git a/root/etc/systemd/network/01-wired.network b/root/etc/systemd/network/01-wired.network index 92ec5d67..3775e67c 100644 --- a/root/etc/systemd/network/01-wired.network +++ b/root/etc/systemd/network/01-wired.network @@ -5,5 +5,4 @@ Name=enp* DHCP=yes [DHCP] -RouteMetric=10 UseDomains=true diff --git a/root/etc/systemd/network/02-usb0.link b/root/etc/systemd/network/02-usb0.link deleted file mode 100644 index 6167e221..00000000 --- a/root/etc/systemd/network/02-usb0.link +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -MACAddress=00:e0:4c:68:05:90 - -[Link] -Description=USB to Ethernet Adapter -Name=usb0 diff --git a/root/etc/systemd/network/02-usb0.network b/root/etc/systemd/network/02-wireless.network similarity index 67% rename from root/etc/systemd/network/02-usb0.network rename to root/etc/systemd/network/02-wireless.network index 8ae44320..0f966cc7 100644 --- a/root/etc/systemd/network/02-usb0.network +++ b/root/etc/systemd/network/02-wireless.network @@ -1,9 +1,8 @@ [Match] -Name=usb0 +Name=w* [Network] DHCP=yes [DHCP] -RouteMetric=10 UseDomains=true diff --git a/root/etc/systemd/network/03-wireless.network b/root/etc/systemd/network/03-wireless.network deleted file mode 100644 index 94b6271b..00000000 --- a/root/etc/systemd/network/03-wireless.network +++ /dev/null @@ -1,9 +0,0 @@ -[Match] -Name=wlp* - -[Network] -DHCP=yes - -[DHCP] -RouteMetric=20 -UseDomains=true diff --git a/root/etc/systemd/network/04-wlan0.link b/root/etc/systemd/network/04-wlan0.link deleted file mode 100644 index 407a7bf5..00000000 --- a/root/etc/systemd/network/04-wlan0.link +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -MACAddress=dc:fb:48:2b:b7:86 - -[Link] -Description=Internal wireless adapter -Name=wlan0 diff --git a/root/etc/systemd/network/04-wlan0.network b/root/etc/systemd/network/04-wlan0.network deleted file mode 100644 index 6252119e..00000000 --- a/root/etc/systemd/network/04-wlan0.network +++ /dev/null @@ -1,9 +0,0 @@ -[Match] -Name=wlan0 - -[Network] -DHCP=yes - -[DHCP] -RouteMetric=20 -UseDomains=true diff --git a/root/etc/systemd/system.conf b/root/etc/systemd/system.conf index 9c7832d4..65ff02c8 100644 --- a/root/etc/systemd/system.conf +++ b/root/etc/systemd/system.conf @@ -1,70 +1,2 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# Entries in this file show the compile time defaults. -# You can change settings by editing this file. -# Defaults can be restored by simply deleting this file. -# -# See systemd-system.conf(5) for details. - [Manager] -#LogLevel=info -#LogTarget=journal-or-kmsg -#LogColor=yes -#LogLocation=no -#DumpCore=yes -#ShowStatus=yes -#CrashChangeVT=no -#CrashShell=no -#CrashReboot=no -#CtrlAltDelBurstAction=reboot-force -#CPUAffinity=1 2 -#NUMAPolicy=default -#NUMAMask= -#RuntimeWatchdogSec=0 -#RebootWatchdogSec=10min -#ShutdownWatchdogSec=10min -#KExecWatchdogSec=0 -#WatchdogDevice= -#CapabilityBoundingSet= -#NoNewPrivileges=no -#SystemCallArchitectures= -#TimerSlackNSec= -#StatusUnitFormat=description -#DefaultTimerAccuracySec=1min -#DefaultStandardOutput=journal -#DefaultStandardError=inherit -#DefaultTimeoutStartSec=90s DefaultTimeoutStopSec=30s -#DefaultTimeoutAbortSec= -#DefaultRestartSec=100ms -#DefaultStartLimitIntervalSec=10s -#DefaultStartLimitBurst=5 -#DefaultEnvironment= -#DefaultCPUAccounting=no -#DefaultIOAccounting=no -#DefaultIPAccounting=no -#DefaultBlockIOAccounting=no -#DefaultMemoryAccounting=yes -#DefaultTasksAccounting=yes -#DefaultTasksMax=15% -#DefaultLimitCPU= -#DefaultLimitFSIZE= -#DefaultLimitDATA= -#DefaultLimitSTACK= -#DefaultLimitCORE= -#DefaultLimitRSS= -#DefaultLimitNOFILE=1024:524288 -#DefaultLimitAS= -#DefaultLimitNPROC= -#DefaultLimitMEMLOCK= -#DefaultLimitLOCKS= -#DefaultLimitSIGPENDING= -#DefaultLimitMSGQUEUE= -#DefaultLimitNICE= -#DefaultLimitRTPRIO= -#DefaultLimitRTTIME= diff --git a/root/etc/systemd/system/ipmi-fans.service b/root/etc/systemd/system/ipmi-fans.service deleted file mode 100644 index 5f21b041..00000000 --- a/root/etc/systemd/system/ipmi-fans.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Write fan speeds to tmp - -[Service] -Type=simple -ExecStart=/home/balrog/.scripts/ipmi/fans.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-fans.timer b/root/etc/systemd/system/ipmi-fans.timer deleted file mode 100644 index 554be356..00000000 --- a/root/etc/systemd/system/ipmi-fans.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Run fans service every 30s - -[Timer] -OnUnitInactiveSec=15s -OnBootSec=15s - -[Install] -WantedBy=timers.target diff --git a/root/etc/systemd/system/ipmi-static.service b/root/etc/systemd/system/ipmi-static.service deleted file mode 100644 index fb5c1bfb..00000000 --- a/root/etc/systemd/system/ipmi-static.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Set fan speed - -[Service] -Type=simple -ExecStart=/home/balrog/Scripts/ipmi/static.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.service b/root/etc/systemd/system/ipmi-temp.service deleted file mode 100644 index 11f921e6..00000000 --- a/root/etc/systemd/system/ipmi-temp.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Watch server temperature - -[Service] -Type=simple -ExecStart=/home/balrog/.scripts/ipmi/temp.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.timer b/root/etc/systemd/system/ipmi-temp.timer deleted file mode 100644 index d6605b13..00000000 --- a/root/etc/systemd/system/ipmi-temp.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Watches server temperature - -[Timer] -OnUnitInactiveSec=5s -OnBootSec=5s - -[Install] -WantedBy=timers.target diff --git a/root/etc/systemd/system/ipmi/ipmi-static.service b/root/etc/systemd/system/ipmi/ipmi-static.service deleted file mode 100644 index fb5c1bfb..00000000 --- a/root/etc/systemd/system/ipmi/ipmi-static.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Set fan speed - -[Service] -Type=simple -ExecStart=/home/balrog/Scripts/ipmi/static.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi/ipmi-temp.service b/root/etc/systemd/system/ipmi/ipmi-temp.service deleted file mode 100644 index 64a9615f..00000000 --- a/root/etc/systemd/system/ipmi/ipmi-temp.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Watch server temperature - -[Service] -Type=simple -ExecStart=/home/balrog/Scripts/ipmi/temp.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi/ipmi-temp.timer b/root/etc/systemd/system/ipmi/ipmi-temp.timer deleted file mode 100644 index d6605b13..00000000 --- a/root/etc/systemd/system/ipmi/ipmi-temp.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Watches server temperature - -[Timer] -OnUnitInactiveSec=5s -OnBootSec=5s - -[Install] -WantedBy=timers.target diff --git a/root/etc/systemd/system/iwd.service.d/override.conf b/root/etc/systemd/system/iwd.service.d/override.conf deleted file mode 100755 index 3f1920ca..00000000 --- a/root/etc/systemd/system/iwd.service.d/override.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -BindsTo=sys-subsystem-net-devices-wlan0.device -After=sys-subsystem-net-devices-wlan0.device diff --git a/root/etc/systemd/system/iwd@.service b/root/etc/systemd/system/iwd@.service deleted file mode 100755 index 2dca19dc..00000000 --- a/root/etc/systemd/system/iwd@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Wireless service on %I -BindsTo=sys-subsystem-net-devices-%i.device -After=sys-subsystem-net-devices-%i.device - -[Service] -Type=dbus -BusName=net.connman.iwd -ExecStart=/usr/lib/iwd/iwd --interface %i -LimitNPROC=1 -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/rtorrent.service b/root/etc/systemd/system/rtorrent.service deleted file mode 100644 index 38da7b4b..00000000 --- a/root/etc/systemd/system/rtorrent.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=rTorrent in tmux -After=network.target - -[Service] -User=rtorrent -WorkingDirectory=/home/rtorrent -Environment="TERM=linux" -Type=forking -ExecStart=/bin/bash -c "/usr/bin/tmux -2u -L rtps-%u new-session -s rtps-%u -n rT-PS -d /bin/bash -c rtorrent" - -[Install] -WantedBy=default.target From d5b3c28e8df43fe38ad28d7f5b3f98b05a0b9e73 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 12:43:17 +0200 Subject: [PATCH 0546/2667] Simplified network config and removed old service files --- config-root.yaml | 19 ------ root/etc/systemd/network/01-wired.network | 1 - root/etc/systemd/network/02-usb0.link | 6 -- .../{02-usb0.network => 02-wireless.network} | 3 +- root/etc/systemd/network/03-wireless.network | 9 --- root/etc/systemd/network/04-wlan0.link | 6 -- root/etc/systemd/network/04-wlan0.network | 9 --- root/etc/systemd/system.conf | 68 ------------------- root/etc/systemd/system/ipmi-fans.service | 9 --- root/etc/systemd/system/ipmi-fans.timer | 9 --- root/etc/systemd/system/ipmi-static.service | 9 --- root/etc/systemd/system/ipmi-temp.service | 9 --- root/etc/systemd/system/ipmi-temp.timer | 9 --- .../systemd/system/ipmi/ipmi-static.service | 9 --- .../etc/systemd/system/ipmi/ipmi-temp.service | 9 --- root/etc/systemd/system/ipmi/ipmi-temp.timer | 9 --- .../system/iwd.service.d/override.conf | 3 - root/etc/systemd/system/iwd@.service | 14 ---- root/etc/systemd/system/rtorrent.service | 13 ---- 19 files changed, 1 insertion(+), 222 deletions(-) delete mode 100644 root/etc/systemd/network/02-usb0.link rename root/etc/systemd/network/{02-usb0.network => 02-wireless.network} (67%) delete mode 100644 root/etc/systemd/network/03-wireless.network delete mode 100644 root/etc/systemd/network/04-wlan0.link delete mode 100644 root/etc/systemd/network/04-wlan0.network delete mode 100644 root/etc/systemd/system/ipmi-fans.service delete mode 100644 root/etc/systemd/system/ipmi-fans.timer delete mode 100644 root/etc/systemd/system/ipmi-static.service delete mode 100644 root/etc/systemd/system/ipmi-temp.service delete mode 100644 root/etc/systemd/system/ipmi-temp.timer delete mode 100644 root/etc/systemd/system/ipmi/ipmi-static.service delete mode 100644 root/etc/systemd/system/ipmi/ipmi-temp.service delete mode 100644 root/etc/systemd/system/ipmi/ipmi-temp.timer delete mode 100755 root/etc/systemd/system/iwd.service.d/override.conf delete mode 100755 root/etc/systemd/system/iwd@.service delete mode 100644 root/etc/systemd/system/rtorrent.service diff --git a/config-root.yaml b/config-root.yaml index 1b5ba22b..39e08660 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -41,9 +41,6 @@ dotfiles: f_freetype2.sh: dst: /etc/profile.d/freetype2.sh src: etc/profile.d/freetype2.sh - f_iwd@.service: - dst: /etc/systemd/system/iwd@.service - src: etc/systemd/system/iwd@.service f_fonts.conf: dst: /etc/fonts/local.conf src: etc/fonts/local.conf @@ -95,21 +92,6 @@ dotfiles: f_20-quiet-printk.conf: src: etc/sysctl.d/20-quiet-printk.conf dst: /etc/sysctl.d/20-quiet-printk.conf - f_ipmi-static.service: - src: etc/systemd/system/ipmi-static.service - dst: /etc/systemd/system/ipmi-static.service - f_ipmi-temp.service: - src: etc/systemd/system/ipmi-temp.service - dst: /etc/systemd/system/ipmi-temp.service - f_ipmi-temp.timer: - src: etc/systemd/system/ipmi-temp.timer - dst: /etc/systemd/system/ipmi-temp.timer - f_ipmi-fans.service: - src: etc/systemd/system/ipmi-fans.service - dst: /etc/systemd/system/ipmi-fans.service - f_ipmi-fans.timer: - src: etc/systemd/system/ipmi-fans.timer - dst: /etc/systemd/system/ipmi-fans.timer f_system.conf: src: etc/systemd/system.conf dst: /etc/systemd/system.conf @@ -152,7 +134,6 @@ profiles: - d_bin - f_adb.service - f_bluetooth.conf - - f_iwd@.service - f_sshd_config - f_logind.conf - f_60-uinput-permissions.rules diff --git a/root/etc/systemd/network/01-wired.network b/root/etc/systemd/network/01-wired.network index 92ec5d67..3775e67c 100644 --- a/root/etc/systemd/network/01-wired.network +++ b/root/etc/systemd/network/01-wired.network @@ -5,5 +5,4 @@ Name=enp* DHCP=yes [DHCP] -RouteMetric=10 UseDomains=true diff --git a/root/etc/systemd/network/02-usb0.link b/root/etc/systemd/network/02-usb0.link deleted file mode 100644 index 6167e221..00000000 --- a/root/etc/systemd/network/02-usb0.link +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -MACAddress=00:e0:4c:68:05:90 - -[Link] -Description=USB to Ethernet Adapter -Name=usb0 diff --git a/root/etc/systemd/network/02-usb0.network b/root/etc/systemd/network/02-wireless.network similarity index 67% rename from root/etc/systemd/network/02-usb0.network rename to root/etc/systemd/network/02-wireless.network index 8ae44320..0f966cc7 100644 --- a/root/etc/systemd/network/02-usb0.network +++ b/root/etc/systemd/network/02-wireless.network @@ -1,9 +1,8 @@ [Match] -Name=usb0 +Name=w* [Network] DHCP=yes [DHCP] -RouteMetric=10 UseDomains=true diff --git a/root/etc/systemd/network/03-wireless.network b/root/etc/systemd/network/03-wireless.network deleted file mode 100644 index 94b6271b..00000000 --- a/root/etc/systemd/network/03-wireless.network +++ /dev/null @@ -1,9 +0,0 @@ -[Match] -Name=wlp* - -[Network] -DHCP=yes - -[DHCP] -RouteMetric=20 -UseDomains=true diff --git a/root/etc/systemd/network/04-wlan0.link b/root/etc/systemd/network/04-wlan0.link deleted file mode 100644 index 407a7bf5..00000000 --- a/root/etc/systemd/network/04-wlan0.link +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -MACAddress=dc:fb:48:2b:b7:86 - -[Link] -Description=Internal wireless adapter -Name=wlan0 diff --git a/root/etc/systemd/network/04-wlan0.network b/root/etc/systemd/network/04-wlan0.network deleted file mode 100644 index 6252119e..00000000 --- a/root/etc/systemd/network/04-wlan0.network +++ /dev/null @@ -1,9 +0,0 @@ -[Match] -Name=wlan0 - -[Network] -DHCP=yes - -[DHCP] -RouteMetric=20 -UseDomains=true diff --git a/root/etc/systemd/system.conf b/root/etc/systemd/system.conf index 9c7832d4..65ff02c8 100644 --- a/root/etc/systemd/system.conf +++ b/root/etc/systemd/system.conf @@ -1,70 +1,2 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# Entries in this file show the compile time defaults. -# You can change settings by editing this file. -# Defaults can be restored by simply deleting this file. -# -# See systemd-system.conf(5) for details. - [Manager] -#LogLevel=info -#LogTarget=journal-or-kmsg -#LogColor=yes -#LogLocation=no -#DumpCore=yes -#ShowStatus=yes -#CrashChangeVT=no -#CrashShell=no -#CrashReboot=no -#CtrlAltDelBurstAction=reboot-force -#CPUAffinity=1 2 -#NUMAPolicy=default -#NUMAMask= -#RuntimeWatchdogSec=0 -#RebootWatchdogSec=10min -#ShutdownWatchdogSec=10min -#KExecWatchdogSec=0 -#WatchdogDevice= -#CapabilityBoundingSet= -#NoNewPrivileges=no -#SystemCallArchitectures= -#TimerSlackNSec= -#StatusUnitFormat=description -#DefaultTimerAccuracySec=1min -#DefaultStandardOutput=journal -#DefaultStandardError=inherit -#DefaultTimeoutStartSec=90s DefaultTimeoutStopSec=30s -#DefaultTimeoutAbortSec= -#DefaultRestartSec=100ms -#DefaultStartLimitIntervalSec=10s -#DefaultStartLimitBurst=5 -#DefaultEnvironment= -#DefaultCPUAccounting=no -#DefaultIOAccounting=no -#DefaultIPAccounting=no -#DefaultBlockIOAccounting=no -#DefaultMemoryAccounting=yes -#DefaultTasksAccounting=yes -#DefaultTasksMax=15% -#DefaultLimitCPU= -#DefaultLimitFSIZE= -#DefaultLimitDATA= -#DefaultLimitSTACK= -#DefaultLimitCORE= -#DefaultLimitRSS= -#DefaultLimitNOFILE=1024:524288 -#DefaultLimitAS= -#DefaultLimitNPROC= -#DefaultLimitMEMLOCK= -#DefaultLimitLOCKS= -#DefaultLimitSIGPENDING= -#DefaultLimitMSGQUEUE= -#DefaultLimitNICE= -#DefaultLimitRTPRIO= -#DefaultLimitRTTIME= diff --git a/root/etc/systemd/system/ipmi-fans.service b/root/etc/systemd/system/ipmi-fans.service deleted file mode 100644 index 5f21b041..00000000 --- a/root/etc/systemd/system/ipmi-fans.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Write fan speeds to tmp - -[Service] -Type=simple -ExecStart=/home/balrog/.scripts/ipmi/fans.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-fans.timer b/root/etc/systemd/system/ipmi-fans.timer deleted file mode 100644 index 554be356..00000000 --- a/root/etc/systemd/system/ipmi-fans.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Run fans service every 30s - -[Timer] -OnUnitInactiveSec=15s -OnBootSec=15s - -[Install] -WantedBy=timers.target diff --git a/root/etc/systemd/system/ipmi-static.service b/root/etc/systemd/system/ipmi-static.service deleted file mode 100644 index fb5c1bfb..00000000 --- a/root/etc/systemd/system/ipmi-static.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Set fan speed - -[Service] -Type=simple -ExecStart=/home/balrog/Scripts/ipmi/static.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.service b/root/etc/systemd/system/ipmi-temp.service deleted file mode 100644 index 11f921e6..00000000 --- a/root/etc/systemd/system/ipmi-temp.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Watch server temperature - -[Service] -Type=simple -ExecStart=/home/balrog/.scripts/ipmi/temp.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.timer b/root/etc/systemd/system/ipmi-temp.timer deleted file mode 100644 index d6605b13..00000000 --- a/root/etc/systemd/system/ipmi-temp.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Watches server temperature - -[Timer] -OnUnitInactiveSec=5s -OnBootSec=5s - -[Install] -WantedBy=timers.target diff --git a/root/etc/systemd/system/ipmi/ipmi-static.service b/root/etc/systemd/system/ipmi/ipmi-static.service deleted file mode 100644 index fb5c1bfb..00000000 --- a/root/etc/systemd/system/ipmi/ipmi-static.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Set fan speed - -[Service] -Type=simple -ExecStart=/home/balrog/Scripts/ipmi/static.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi/ipmi-temp.service b/root/etc/systemd/system/ipmi/ipmi-temp.service deleted file mode 100644 index 64a9615f..00000000 --- a/root/etc/systemd/system/ipmi/ipmi-temp.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Watch server temperature - -[Service] -Type=simple -ExecStart=/home/balrog/Scripts/ipmi/temp.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi/ipmi-temp.timer b/root/etc/systemd/system/ipmi/ipmi-temp.timer deleted file mode 100644 index d6605b13..00000000 --- a/root/etc/systemd/system/ipmi/ipmi-temp.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Watches server temperature - -[Timer] -OnUnitInactiveSec=5s -OnBootSec=5s - -[Install] -WantedBy=timers.target diff --git a/root/etc/systemd/system/iwd.service.d/override.conf b/root/etc/systemd/system/iwd.service.d/override.conf deleted file mode 100755 index 3f1920ca..00000000 --- a/root/etc/systemd/system/iwd.service.d/override.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -BindsTo=sys-subsystem-net-devices-wlan0.device -After=sys-subsystem-net-devices-wlan0.device diff --git a/root/etc/systemd/system/iwd@.service b/root/etc/systemd/system/iwd@.service deleted file mode 100755 index 2dca19dc..00000000 --- a/root/etc/systemd/system/iwd@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Wireless service on %I -BindsTo=sys-subsystem-net-devices-%i.device -After=sys-subsystem-net-devices-%i.device - -[Service] -Type=dbus -BusName=net.connman.iwd -ExecStart=/usr/lib/iwd/iwd --interface %i -LimitNPROC=1 -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/rtorrent.service b/root/etc/systemd/system/rtorrent.service deleted file mode 100644 index 38da7b4b..00000000 --- a/root/etc/systemd/system/rtorrent.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=rTorrent in tmux -After=network.target - -[Service] -User=rtorrent -WorkingDirectory=/home/rtorrent -Environment="TERM=linux" -Type=forking -ExecStart=/bin/bash -c "/usr/bin/tmux -2u -L rtps-%u new-session -s rtps-%u -n rT-PS -d /bin/bash -c rtorrent" - -[Install] -WantedBy=default.target From be1edb411a5d4f3adf8f0183a645caf29d912822 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 12:49:29 +0200 Subject: [PATCH 0547/2667] Remove resolved.conf --- config-root.yaml | 11 ++++------- root/etc/systemd/resolved.conf | 2 -- 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 root/etc/systemd/resolved.conf diff --git a/config-root.yaml b/config-root.yaml index 39e08660..3346e1dd 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -17,10 +17,10 @@ dotfiles: d_bin: dst: /usr/local/bin src: usr/local/bin - d_networkd: + d_network: src: etc/systemd/network dst: /etc/systemd/network - f_networkd: + f_networkd.conf: src: etc/systemd/networkd.conf dst: /etc/systemd/networkd.conf f_99-sysctl.conf: @@ -110,14 +110,11 @@ dotfiles: f_pacserve.service.conf: src: etc/pacserve/pacserve.service.conf dst: /etc/pacserve/pacserve.service.conf - f_resolved.conf: - src: etc/systemd/resolved.conf - dst: /etc/systemd/resolved.conf profiles: Network: dotfiles: - - d_networkd - - f_resolved.conf + - d_network + - f_networkd.conf Locale: dotfiles: - f_locale.conf diff --git a/root/etc/systemd/resolved.conf b/root/etc/systemd/resolved.conf deleted file mode 100644 index ad4ea0b2..00000000 --- a/root/etc/systemd/resolved.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Resolve] -LLMNR=no From 8b3c279ee239787a8d13503593677ee3bfd7ac87 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 12:49:29 +0200 Subject: [PATCH 0548/2667] Remove resolved.conf --- config-root.yaml | 11 ++++------- root/etc/systemd/resolved.conf | 2 -- 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 root/etc/systemd/resolved.conf diff --git a/config-root.yaml b/config-root.yaml index 39e08660..3346e1dd 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -17,10 +17,10 @@ dotfiles: d_bin: dst: /usr/local/bin src: usr/local/bin - d_networkd: + d_network: src: etc/systemd/network dst: /etc/systemd/network - f_networkd: + f_networkd.conf: src: etc/systemd/networkd.conf dst: /etc/systemd/networkd.conf f_99-sysctl.conf: @@ -110,14 +110,11 @@ dotfiles: f_pacserve.service.conf: src: etc/pacserve/pacserve.service.conf dst: /etc/pacserve/pacserve.service.conf - f_resolved.conf: - src: etc/systemd/resolved.conf - dst: /etc/systemd/resolved.conf profiles: Network: dotfiles: - - d_networkd - - f_resolved.conf + - d_network + - f_networkd.conf Locale: dotfiles: - f_locale.conf diff --git a/root/etc/systemd/resolved.conf b/root/etc/systemd/resolved.conf deleted file mode 100644 index ad4ea0b2..00000000 --- a/root/etc/systemd/resolved.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Resolve] -LLMNR=no From d7365dc27648a766a741f1f7609b88d52cc46fa4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 12:52:08 +0200 Subject: [PATCH 0549/2667] Move from deconz to ZHA --- docker/homeautomation/docker-compose.yml | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index d45f02f8..27854b28 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -5,6 +5,8 @@ services: image: homeassistant/home-assistant environment: - TZ=Europe/Helsinki + devices: + - /dev/ttyACM0 volumes: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro @@ -16,7 +18,6 @@ services: ports: - "8123:8123" depends_on: - - deconz - mosquitto labels: - "traefik.enable=true" @@ -34,27 +35,6 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.home-assistant.loadbalancer.server.port=8123" - deconz: - container_name: deconz - image: marthoc/deconz - environment: - - TZ=Europe/Helsinki - - DECONZ_WEB_PORT=8083 - - DECONZ_WS_PORT=8084 - - DECONZ_UPNP=0 - - DECONZ_VNC_PORT=5901 - - DECONZ_VNC_MODE=1 - - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} - - DEBUG_OTAU=1 - network_mode: host - volumes: - - /docker/homeautomation/deconz/deconz:/root/.local/share/dresden-elektronik/deCONZ - - /docker/homeautomation/deconz/otau:/root/otau - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped - devices: - - /dev/ttyACM0 - mosquitto: container_name: mosquitto image: eclipse-mosquitto From 266bb5e575683ce2e4d973d649a30ad4e6e6b87c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 12:52:08 +0200 Subject: [PATCH 0550/2667] Move from deconz to ZHA --- docker/homeautomation/docker-compose.yml | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index d45f02f8..27854b28 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -5,6 +5,8 @@ services: image: homeassistant/home-assistant environment: - TZ=Europe/Helsinki + devices: + - /dev/ttyACM0 volumes: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro @@ -16,7 +18,6 @@ services: ports: - "8123:8123" depends_on: - - deconz - mosquitto labels: - "traefik.enable=true" @@ -34,27 +35,6 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.home-assistant.loadbalancer.server.port=8123" - deconz: - container_name: deconz - image: marthoc/deconz - environment: - - TZ=Europe/Helsinki - - DECONZ_WEB_PORT=8083 - - DECONZ_WS_PORT=8084 - - DECONZ_UPNP=0 - - DECONZ_VNC_PORT=5901 - - DECONZ_VNC_MODE=1 - - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} - - DEBUG_OTAU=1 - network_mode: host - volumes: - - /docker/homeautomation/deconz/deconz:/root/.local/share/dresden-elektronik/deCONZ - - /docker/homeautomation/deconz/otau:/root/otau - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped - devices: - - /dev/ttyACM0 - mosquitto: container_name: mosquitto image: eclipse-mosquitto From 1e715f1f46e5761ca3e485700bc99c9034e97078 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 14:48:53 +0200 Subject: [PATCH 0551/2667] Update ssh config --- home/.ssh/config | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/home/.ssh/config b/home/.ssh/config index 7630876a..b99bf18d 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -25,16 +25,11 @@ host moria ForwardAgent yes host gondor - hostname gondor.reekynet.com + hostname gondor.korhonen.cc port 22 User reekymarko ForwardAgent yes -host mirkwood - HostName korhonen.cc - port 8123 - User reekymarko - host anitta HostName 10.200.200.4 port 22 From 0c11135ed9e1572f148e494b6a0b5236b70a4b2f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 14:48:53 +0200 Subject: [PATCH 0552/2667] Update ssh config --- home/.ssh/config | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/home/.ssh/config b/home/.ssh/config index 7630876a..b99bf18d 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -25,16 +25,11 @@ host moria ForwardAgent yes host gondor - hostname gondor.reekynet.com + hostname gondor.korhonen.cc port 22 User reekymarko ForwardAgent yes -host mirkwood - HostName korhonen.cc - port 8123 - User reekymarko - host anitta HostName 10.200.200.4 port 22 From 3f13162ebf44044d40fdb235b28a67720f2c7436 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 14 Dec 2020 16:55:23 +0200 Subject: [PATCH 0553/2667] Update work laptop config --- config.yaml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/config.yaml b/config.yaml index e68711d4..adbd2326 100644 --- a/config.yaml +++ b/config.yaml @@ -239,8 +239,21 @@ profiles: - terminal - Pacman mko-laptop: - include: - - terminal + dotfiles: + - f_nvimpager + - f_hushlogin + - f_ripgrep_ignore + - f_ranger_commands.py + - f_rtv.cfg + - f_mailcap + - d_zsh + - f_zshrc + - f_tmux.conf + - f_ranger.conf + - d_nvim_config + - f_init.vim + - f_coc-settings.json + - f_alacritty.yml AnittaPC: include: - terminal From 576e6a255b9a8bb1d10cf18f04c96f06f98cc41f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 14 Dec 2020 16:55:23 +0200 Subject: [PATCH 0554/2667] Update work laptop config --- config.yaml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/config.yaml b/config.yaml index e68711d4..adbd2326 100644 --- a/config.yaml +++ b/config.yaml @@ -239,8 +239,21 @@ profiles: - terminal - Pacman mko-laptop: - include: - - terminal + dotfiles: + - f_nvimpager + - f_hushlogin + - f_ripgrep_ignore + - f_ranger_commands.py + - f_rtv.cfg + - f_mailcap + - d_zsh + - f_zshrc + - f_tmux.conf + - f_ranger.conf + - d_nvim_config + - f_init.vim + - f_coc-settings.json + - f_alacritty.yml AnittaPC: include: - terminal From 4e5f0ed5fab6ac743031e27f128b5a543c9dc245 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 14 Dec 2020 16:56:06 +0200 Subject: [PATCH 0555/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 831b3ddc..636c1ade 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 831b3ddc1a49ae5b96fba6d394a07f76963196a2 +Subproject commit 636c1ade26a5205ca84aef624ed971c0e529ffa7 From 36ba76894446781602b5f8c8fead6b168da9e54e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 14 Dec 2020 16:56:06 +0200 Subject: [PATCH 0556/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 831b3ddc..636c1ade 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 831b3ddc1a49ae5b96fba6d394a07f76963196a2 +Subproject commit 636c1ade26a5205ca84aef624ed971c0e529ffa7 From 960b57890d327e81401b374b25c805c8f6805726 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 14 Dec 2020 19:00:08 +0200 Subject: [PATCH 0557/2667] Add restart parameter for tts services --- docker/homeautomation/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 27854b28..d339b160 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -80,9 +80,11 @@ services: depends_on: - marytts - mozillatts + restart: unless-stopped marytts: image: synesthesiam/marytts:5.2 container_name: marytts + restart: unless-stopped tty: true networks: - homeautomation From 23365905c8a9f00843407245e0040d0366bc4731 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 14 Dec 2020 19:00:08 +0200 Subject: [PATCH 0558/2667] Add restart parameter for tts services --- docker/homeautomation/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index 27854b28..d339b160 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -80,9 +80,11 @@ services: depends_on: - marytts - mozillatts + restart: unless-stopped marytts: image: synesthesiam/marytts:5.2 container_name: marytts + restart: unless-stopped tty: true networks: - homeautomation From d98a57fbd27909667fa4b2ce569e4a852e7257aa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Dec 2020 17:07:24 +0200 Subject: [PATCH 0559/2667] Switch sway terminal emulator to foot --- config.yaml | 4 ++++ home/.config/foot/foot.ini | 30 +++++++++++++++++++++++++++ home/.config/sway/conf.d/01-vars.conf | 2 +- home/.config/sway/conf.d/08-exec.conf | 1 + 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 home/.config/foot/foot.ini diff --git a/config.yaml b/config.yaml index adbd2326..22ea54df 100644 --- a/config.yaml +++ b/config.yaml @@ -159,6 +159,9 @@ dotfiles: f_msmtp_config: src: .config/msmtp/config dst: ~/.config/msmtp/config + f_foot.ini: + src: .config/foot/foot.ini + dst: ~/.config/foot/foot.ini profiles: base: dotfiles: @@ -229,6 +232,7 @@ profiles: - f_paru.conf - f_user-dirs.dirs - f_gitconfig + - f_foot.ini Moria: include: - terminal diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini new file mode 100644 index 00000000..572268b4 --- /dev/null +++ b/home/.config/foot/foot.ini @@ -0,0 +1,30 @@ +pad=20x20 + +[scrollback] +lines=1000 + +[cursor] +blink=yes + +[mouse] +hide-when-typing=yes + +[colors] +background=282c34 +foreground=abb2bf +regular0=282c34 +regular1=e06c75 +regular2=98c379 +regular3=e5c07b +regular4=61afef +regular5=c678dd +regular6=56b6c2 +regular7=abb2bf +bright0=3e4452 +bright1=be5046 +bright2=98c379 +bright3=d19a66 +bright4=61afef +bright5=c678dd +bright6=56b6c2 +bright7=5c6370 diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index 5bc7c612..530dd5ec 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -1,7 +1,7 @@ # vim:ft=i3config set $mod Mod4 -set $term alacritty +set $term footclient set $gnome-schema org.gnome.desktop.interface set $wallpaper ~/pictures/Wallpapers/random/$(ls ~/pictures/Wallpapers/random | sort -R | tail -n 1) set $scripts ~/.config/sway/scripts diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index f8d685a8..e6ed537a 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -15,6 +15,7 @@ exec { gnome-keyring-daemon --start --components=secrets mpDris2 swaymsg workspace 1 + foot -s } exec_always { From 62fb238425d7154b1c6609ee328a29b7fc56bb32 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Dec 2020 17:07:24 +0200 Subject: [PATCH 0560/2667] Switch sway terminal emulator to foot --- config.yaml | 4 ++++ home/.config/foot/foot.ini | 30 +++++++++++++++++++++++++++ home/.config/sway/conf.d/01-vars.conf | 2 +- home/.config/sway/conf.d/08-exec.conf | 1 + 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 home/.config/foot/foot.ini diff --git a/config.yaml b/config.yaml index adbd2326..22ea54df 100644 --- a/config.yaml +++ b/config.yaml @@ -159,6 +159,9 @@ dotfiles: f_msmtp_config: src: .config/msmtp/config dst: ~/.config/msmtp/config + f_foot.ini: + src: .config/foot/foot.ini + dst: ~/.config/foot/foot.ini profiles: base: dotfiles: @@ -229,6 +232,7 @@ profiles: - f_paru.conf - f_user-dirs.dirs - f_gitconfig + - f_foot.ini Moria: include: - terminal diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini new file mode 100644 index 00000000..572268b4 --- /dev/null +++ b/home/.config/foot/foot.ini @@ -0,0 +1,30 @@ +pad=20x20 + +[scrollback] +lines=1000 + +[cursor] +blink=yes + +[mouse] +hide-when-typing=yes + +[colors] +background=282c34 +foreground=abb2bf +regular0=282c34 +regular1=e06c75 +regular2=98c379 +regular3=e5c07b +regular4=61afef +regular5=c678dd +regular6=56b6c2 +regular7=abb2bf +bright0=3e4452 +bright1=be5046 +bright2=98c379 +bright3=d19a66 +bright4=61afef +bright5=c678dd +bright6=56b6c2 +bright7=5c6370 diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index 5bc7c612..530dd5ec 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -1,7 +1,7 @@ # vim:ft=i3config set $mod Mod4 -set $term alacritty +set $term footclient set $gnome-schema org.gnome.desktop.interface set $wallpaper ~/pictures/Wallpapers/random/$(ls ~/pictures/Wallpapers/random | sort -R | tail -n 1) set $scripts ~/.config/sway/scripts diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index f8d685a8..e6ed537a 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -15,6 +15,7 @@ exec { gnome-keyring-daemon --start --components=secrets mpDris2 swaymsg workspace 1 + foot -s } exec_always { From 05572ab69c42dbded00965cf1f5fa21bfdf51979 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Dec 2020 18:06:56 +0200 Subject: [PATCH 0561/2667] Update keybinds to use foot --- home/.config/sway/conf.d/06-keybinds.conf | 5 +---- home/.config/sway/conf.d/08-exec.conf | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index d0ad336a..4f68b1c7 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -51,11 +51,8 @@ bindsym $mod+Shift+o exec mimeo $(wl-paste) # turn on and off internal screen bindsym --locked XF86Search output eDP-1 toggle -# FZF # exit menu -bindsym $mod+Shift+e exec $term --class fzf-launcher -e $scripts/exit.sh -# password manager -bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass +bindsym $mod+Shift+e exec $term --app-id fzf-launcher --login-shell /bin/sh -c "$scripts/exit.sh" # launch a program bindsym $mod+d exec wofi diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index e6ed537a..4be331fe 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -1,6 +1,7 @@ # vim:ft=i3config exec { + foot -s $scripts/idle.sh autotiling redshift-gtk -m wayland @@ -15,7 +16,6 @@ exec { gnome-keyring-daemon --start --components=secrets mpDris2 swaymsg workspace 1 - foot -s } exec_always { From 0a138f5c615e27dc475d8367a4e7582e7a05cbc8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Dec 2020 18:06:56 +0200 Subject: [PATCH 0562/2667] Update keybinds to use foot --- home/.config/sway/conf.d/06-keybinds.conf | 5 +---- home/.config/sway/conf.d/08-exec.conf | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index d0ad336a..4f68b1c7 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -51,11 +51,8 @@ bindsym $mod+Shift+o exec mimeo $(wl-paste) # turn on and off internal screen bindsym --locked XF86Search output eDP-1 toggle -# FZF # exit menu -bindsym $mod+Shift+e exec $term --class fzf-launcher -e $scripts/exit.sh -# password manager -bindsym $mod+p exec $term --class fzf-launcher --title "FZF pass" -e sh -c fzf-pass +bindsym $mod+Shift+e exec $term --app-id fzf-launcher --login-shell /bin/sh -c "$scripts/exit.sh" # launch a program bindsym $mod+d exec wofi diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index e6ed537a..4be331fe 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -1,6 +1,7 @@ # vim:ft=i3config exec { + foot -s $scripts/idle.sh autotiling redshift-gtk -m wayland @@ -15,7 +16,6 @@ exec { gnome-keyring-daemon --start --components=secrets mpDris2 swaymsg workspace 1 - foot -s } exec_always { From 03eb9ab6e7cb3273ed0ae092d031c501332d64d4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Dec 2020 21:32:24 +0200 Subject: [PATCH 0563/2667] Add index.korhonen.cc and aur repository --- docker/index.korhonen.cc/docker-compose.yaml | 33 ++++++++++++++++++++ docker/marko.korhonen.cc/docker-compose.yaml | 30 ------------------ root/etc/pacman.conf | 9 ++++++ 3 files changed, 42 insertions(+), 30 deletions(-) create mode 100644 docker/index.korhonen.cc/docker-compose.yaml delete mode 100644 docker/marko.korhonen.cc/docker-compose.yaml diff --git a/docker/index.korhonen.cc/docker-compose.yaml b/docker/index.korhonen.cc/docker-compose.yaml new file mode 100644 index 00000000..16ded23e --- /dev/null +++ b/docker/index.korhonen.cc/docker-compose.yaml @@ -0,0 +1,33 @@ +version: "3" + +services: + nginx: + image: fraoustin/fancyindex + container_name: index.korhonen.cc + environment: + - DISABLE_AUTH=true + - CONTAINER_TIMEZONE="Europe/Helsinki" + volumes: + - /docker/index.korhonen.cc:/share + networks: + - proxy + restart: unless-stopped + labels: + - "traefik.enable=true" + + - "traefik.http.routers.index-redirect.entrypoints=http" + - "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.index-redirect.middlewares=http2https" + + - "traefik.http.routers.index.entrypoints=https" + - "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)" + - "traefik.http.routers.index.tls=true" + - "traefik.http.routers.index.tls.certresolver=http" + - "traefik.http.routers.index.service=index" + - "traefik.docker.network=proxy" + - "traefik.http.services.index.loadbalancer.server.port=80" + +networks: + proxy: + external: true diff --git a/docker/marko.korhonen.cc/docker-compose.yaml b/docker/marko.korhonen.cc/docker-compose.yaml deleted file mode 100644 index 522dbc17..00000000 --- a/docker/marko.korhonen.cc/docker-compose.yaml +++ /dev/null @@ -1,30 +0,0 @@ -version: "3" - -services: - site: - image: nginx:alpine - container_name: marko.korhonen.cc - volumes: - - /docker/marko.korhonen.cc:/usr/share/nginx/html:ro - networks: - - proxy - restart: unless-stopped - labels: - - "traefik.enable=true" - - - "traefik.http.routers.marko-redirect.entrypoints=http" - - "traefik.http.routers.marko-redirect.rule=Host(`marko.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.marko-redirect.middlewares=http2https" - - - "traefik.http.routers.marko.entrypoints=https" - - "traefik.http.routers.marko.rule=Host(`marko.korhonen.cc`)" - - "traefik.http.routers.marko.tls=true" - - "traefik.http.routers.marko.tls.certresolver=http" - - "traefik.http.routers.marko.service=marko" - - "traefik.docker.network=proxy" - - "traefik.http.services.marko.loadbalancer.server.port=80" - -networks: - proxy: - external: true diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 43ca4cc3..42a140e9 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -9,6 +9,15 @@ Architecture = auto LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg +[korhonen-aur] +{%@@ if profile == "Moria" @@%} +Server = file:///docker/index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur +CleanMethod=KeepCurrent +CacheDir=/docker/index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur +{%@@ else @@%} +Server = https://index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur +{%@@ endif @@%} + [core] Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist From b29400e51980b7339a074d44a0a2360a1b289235 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Dec 2020 21:32:24 +0200 Subject: [PATCH 0564/2667] Add index.korhonen.cc and aur repository --- docker/index.korhonen.cc/docker-compose.yaml | 33 ++++++++++++++++++++ docker/marko.korhonen.cc/docker-compose.yaml | 30 ------------------ root/etc/pacman.conf | 9 ++++++ 3 files changed, 42 insertions(+), 30 deletions(-) create mode 100644 docker/index.korhonen.cc/docker-compose.yaml delete mode 100644 docker/marko.korhonen.cc/docker-compose.yaml diff --git a/docker/index.korhonen.cc/docker-compose.yaml b/docker/index.korhonen.cc/docker-compose.yaml new file mode 100644 index 00000000..16ded23e --- /dev/null +++ b/docker/index.korhonen.cc/docker-compose.yaml @@ -0,0 +1,33 @@ +version: "3" + +services: + nginx: + image: fraoustin/fancyindex + container_name: index.korhonen.cc + environment: + - DISABLE_AUTH=true + - CONTAINER_TIMEZONE="Europe/Helsinki" + volumes: + - /docker/index.korhonen.cc:/share + networks: + - proxy + restart: unless-stopped + labels: + - "traefik.enable=true" + + - "traefik.http.routers.index-redirect.entrypoints=http" + - "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.index-redirect.middlewares=http2https" + + - "traefik.http.routers.index.entrypoints=https" + - "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)" + - "traefik.http.routers.index.tls=true" + - "traefik.http.routers.index.tls.certresolver=http" + - "traefik.http.routers.index.service=index" + - "traefik.docker.network=proxy" + - "traefik.http.services.index.loadbalancer.server.port=80" + +networks: + proxy: + external: true diff --git a/docker/marko.korhonen.cc/docker-compose.yaml b/docker/marko.korhonen.cc/docker-compose.yaml deleted file mode 100644 index 522dbc17..00000000 --- a/docker/marko.korhonen.cc/docker-compose.yaml +++ /dev/null @@ -1,30 +0,0 @@ -version: "3" - -services: - site: - image: nginx:alpine - container_name: marko.korhonen.cc - volumes: - - /docker/marko.korhonen.cc:/usr/share/nginx/html:ro - networks: - - proxy - restart: unless-stopped - labels: - - "traefik.enable=true" - - - "traefik.http.routers.marko-redirect.entrypoints=http" - - "traefik.http.routers.marko-redirect.rule=Host(`marko.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.marko-redirect.middlewares=http2https" - - - "traefik.http.routers.marko.entrypoints=https" - - "traefik.http.routers.marko.rule=Host(`marko.korhonen.cc`)" - - "traefik.http.routers.marko.tls=true" - - "traefik.http.routers.marko.tls.certresolver=http" - - "traefik.http.routers.marko.service=marko" - - "traefik.docker.network=proxy" - - "traefik.http.services.marko.loadbalancer.server.port=80" - -networks: - proxy: - external: true diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 43ca4cc3..42a140e9 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -9,6 +9,15 @@ Architecture = auto LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg +[korhonen-aur] +{%@@ if profile == "Moria" @@%} +Server = file:///docker/index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur +CleanMethod=KeepCurrent +CacheDir=/docker/index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur +{%@@ else @@%} +Server = https://index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur +{%@@ endif @@%} + [core] Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist From d178b3bb8bf3661619738311b0b9f336c8536431 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Dec 2020 00:03:06 +0200 Subject: [PATCH 0565/2667] Fix gpg env setup --- home/.config/zsh/01-env.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 8e509d7e..5289a9ac 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -36,8 +36,8 @@ export PAGER="nvimpager -p" # use gpg for ssh export GPG_TTY="$(tty)" -export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh" -gpg-connect-agent updatestartuptty /bye > /dev/null +export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) +gpgconf --launch gpg-agent # tehfuk eval $(thefuck --alias) From 9115ab83d54830e3c9a2f63438628b03de061892 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Dec 2020 00:03:06 +0200 Subject: [PATCH 0566/2667] Fix gpg env setup --- home/.config/zsh/01-env.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 8e509d7e..5289a9ac 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -36,8 +36,8 @@ export PAGER="nvimpager -p" # use gpg for ssh export GPG_TTY="$(tty)" -export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh" -gpg-connect-agent updatestartuptty /bye > /dev/null +export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) +gpgconf --launch gpg-agent # tehfuk eval $(thefuck --alias) From fd934cbff32710387f024e856a0f5f758aceee10 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Dec 2020 00:08:23 +0200 Subject: [PATCH 0567/2667] Only set SSH_AUTH_SOCK if not logging in over SSH --- home/.config/zsh/01-env.zsh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 5289a9ac..d2899fa0 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -34,10 +34,14 @@ export DOTREPO="$HOME/git/dotfiles" export EDITOR=nvim export PAGER="nvimpager -p" -# use gpg for ssh +# Use GPG for SSH authentication export GPG_TTY="$(tty)" -export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) -gpgconf --launch gpg-agent + +# set SSH_AUTH_SOCK if not logging in over SSH +if [ "$SSH_CONNECTION" != "" ]; then + export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) + gpgconf --launch gpg-agent +fi # tehfuk eval $(thefuck --alias) From 9fef0b7dede7c936fe2a1a54f7621c576a886ebe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Dec 2020 00:08:23 +0200 Subject: [PATCH 0568/2667] Only set SSH_AUTH_SOCK if not logging in over SSH --- home/.config/zsh/01-env.zsh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 5289a9ac..d2899fa0 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -34,10 +34,14 @@ export DOTREPO="$HOME/git/dotfiles" export EDITOR=nvim export PAGER="nvimpager -p" -# use gpg for ssh +# Use GPG for SSH authentication export GPG_TTY="$(tty)" -export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) -gpgconf --launch gpg-agent + +# set SSH_AUTH_SOCK if not logging in over SSH +if [ "$SSH_CONNECTION" != "" ]; then + export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) + gpgconf --launch gpg-agent +fi # tehfuk eval $(thefuck --alias) From 51df4a5453dde84f4cd4f254dbcf0139bb5eeae5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 20 Dec 2020 12:05:48 +0200 Subject: [PATCH 0569/2667] Move aur repo path --- root/etc/pacman.conf | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 42a140e9..ce1d41be 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -8,14 +8,16 @@ SigLevel = Required DatabaseOptional Architecture = auto LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg - -[korhonen-aur] {%@@ if profile == "Moria" @@%} -Server = file:///docker/index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur CleanMethod=KeepCurrent -CacheDir=/docker/index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur +CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/$arch +{%@@ endif @@%} + +[korhonen_aur] +{%@@ if profile == "Moria" @@%} +Server = file:///docker/index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ else @@%} -Server = https://index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur +Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ endif @@%} [core] From f0a539efab4f4baa84f7b5cf087c145f864a7b58 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 20 Dec 2020 12:05:48 +0200 Subject: [PATCH 0570/2667] Move aur repo path --- root/etc/pacman.conf | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 42a140e9..ce1d41be 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -8,14 +8,16 @@ SigLevel = Required DatabaseOptional Architecture = auto LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg - -[korhonen-aur] {%@@ if profile == "Moria" @@%} -Server = file:///docker/index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur CleanMethod=KeepCurrent -CacheDir=/docker/index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur +CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/$arch +{%@@ endif @@%} + +[korhonen_aur] +{%@@ if profile == "Moria" @@%} +Server = file:///docker/index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ else @@%} -Server = https://index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur +Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ endif @@%} [core] From 184c4340abad9b6bb4930e94676075a51dfc28ad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 20 Dec 2020 15:34:07 +0200 Subject: [PATCH 0571/2667] Add repo maintenance alias and AUR_PAGER in env --- home/.config/zsh/01-env.zsh | 1 + home/.config/zsh/03-aliases.zsh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index d2899fa0..e742dd41 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -33,6 +33,7 @@ export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim export PAGER="nvimpager -p" +export AUR_PAGER=$PAGER # Use GPG for SSH authentication export GPG_TTY="$(tty)" diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 7f0afa24..cd4d4d89 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -204,6 +204,9 @@ alias notify-send='notify-send --icon=alarm' # download archiso alias archiso='curl "http://mirror.rackspace.com/archlinux/iso/$(date +%Y.%m).01/archlinux-$(date +%Y.%m).01-x86_64.iso"' +# Update repository +alias repoupdate='aur sync -Su --margs --noconfirm' + # encrypted tar's with zstd compression cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg } @@ -280,4 +283,3 @@ btw, () { ▟███▀▘ ▝▀███▙ ▟▛▀ ▀▜▙" } - From 996436c1cdefc02296bd5f2e928b444f932dc327 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 20 Dec 2020 15:34:07 +0200 Subject: [PATCH 0572/2667] Add repo maintenance alias and AUR_PAGER in env --- home/.config/zsh/01-env.zsh | 1 + home/.config/zsh/03-aliases.zsh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index d2899fa0..e742dd41 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -33,6 +33,7 @@ export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim export PAGER="nvimpager -p" +export AUR_PAGER=$PAGER # Use GPG for SSH authentication export GPG_TTY="$(tty)" diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 7f0afa24..cd4d4d89 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -204,6 +204,9 @@ alias notify-send='notify-send --icon=alarm' # download archiso alias archiso='curl "http://mirror.rackspace.com/archlinux/iso/$(date +%Y.%m).01/archlinux-$(date +%Y.%m).01-x86_64.iso"' +# Update repository +alias repoupdate='aur sync -Su --margs --noconfirm' + # encrypted tar's with zstd compression cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg } @@ -280,4 +283,3 @@ btw, () { ▟███▀▘ ▝▀███▙ ▟▛▀ ▀▜▙" } - From f57467139dd4cc4d708c363be5ca7756f105ef6e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 10:59:03 +0200 Subject: [PATCH 0573/2667] Small fixes --- home/.config/zsh/03-aliases.zsh | 17 +++++------------ home/.ssh/config | 2 -- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index cd4d4d89..b874255e 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -130,21 +130,18 @@ update() { all() { plugins {%@@ if profile == "Moria" @@%} - base --devel + repo docker-update docker system prune --volumes - {%@@ elif profile == "Mirkwood" @@%} - base --devel firefox-nightly {%@@ else @@%} - base --devel + paru {%@@ endif @@%} flatpak update sudo awman-update } - base() { - paru -Pw - paru -Syu $@ + repo() { + aur sync -Su --margs --noconfirm } plugins() { @@ -171,9 +168,6 @@ update() { all) all ;; - base) - base - ;; plugins) plugins ;; @@ -181,7 +175,7 @@ update() { docker-update ;; *) - base $@ + paru ;; esac } @@ -205,7 +199,6 @@ alias notify-send='notify-send --icon=alarm' alias archiso='curl "http://mirror.rackspace.com/archlinux/iso/$(date +%Y.%m).01/archlinux-$(date +%Y.%m).01-x86_64.iso"' # Update repository -alias repoupdate='aur sync -Su --margs --noconfirm' # encrypted tar's with zstd compression diff --git a/home/.ssh/config b/home/.ssh/config index b99bf18d..f58a5d37 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -28,13 +28,11 @@ host gondor hostname gondor.korhonen.cc port 22 User reekymarko - ForwardAgent yes host anitta HostName 10.200.200.4 port 22 user reekymarko - ForwardAgent yes host takamaki HostName 10.200.200.5 From 3a451f753809d8f053a5a8cdc885fd199277d4ed Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 10:59:03 +0200 Subject: [PATCH 0574/2667] Small fixes --- home/.config/zsh/03-aliases.zsh | 17 +++++------------ home/.ssh/config | 2 -- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index cd4d4d89..b874255e 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -130,21 +130,18 @@ update() { all() { plugins {%@@ if profile == "Moria" @@%} - base --devel + repo docker-update docker system prune --volumes - {%@@ elif profile == "Mirkwood" @@%} - base --devel firefox-nightly {%@@ else @@%} - base --devel + paru {%@@ endif @@%} flatpak update sudo awman-update } - base() { - paru -Pw - paru -Syu $@ + repo() { + aur sync -Su --margs --noconfirm } plugins() { @@ -171,9 +168,6 @@ update() { all) all ;; - base) - base - ;; plugins) plugins ;; @@ -181,7 +175,7 @@ update() { docker-update ;; *) - base $@ + paru ;; esac } @@ -205,7 +199,6 @@ alias notify-send='notify-send --icon=alarm' alias archiso='curl "http://mirror.rackspace.com/archlinux/iso/$(date +%Y.%m).01/archlinux-$(date +%Y.%m).01-x86_64.iso"' # Update repository -alias repoupdate='aur sync -Su --margs --noconfirm' # encrypted tar's with zstd compression diff --git a/home/.ssh/config b/home/.ssh/config index b99bf18d..f58a5d37 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -28,13 +28,11 @@ host gondor hostname gondor.korhonen.cc port 22 User reekymarko - ForwardAgent yes host anitta HostName 10.200.200.4 port 22 user reekymarko - ForwardAgent yes host takamaki HostName 10.200.200.5 From 59f0c1f7d8d706d616f1fc93d051b4feafe6ad81 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 11:05:49 +0200 Subject: [PATCH 0575/2667] Update firefox nightly every time repo updates --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index b874255e..a8236fda 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -141,7 +141,7 @@ update() { } repo() { - aur sync -Su --margs --noconfirm + aur sync -Su --margs --noconfirm firefox-nightly } plugins() { From 6cba0b727d9360763974aed73520e82c2277707b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 11:05:49 +0200 Subject: [PATCH 0576/2667] Update firefox nightly every time repo updates --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index b874255e..a8236fda 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -141,7 +141,7 @@ update() { } repo() { - aur sync -Su --margs --noconfirm + aur sync -Su --margs --noconfirm firefox-nightly } plugins() { From e84f18d303d72b8f9a649ed451b4a69c07444cbb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 11:11:53 +0200 Subject: [PATCH 0577/2667] Small fix --- home/.config/zsh/03-aliases.zsh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index a8236fda..10371bbe 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -128,15 +128,14 @@ passync() { pass git pull && pass git push && updatesecrets } update() { all() { + paru plugins {%@@ if profile == "Moria" @@%} repo docker-update docker system prune --volumes - {%@@ else @@%} - paru {%@@ endif @@%} - flatpak update + sudo flatpak update sudo awman-update } @@ -174,6 +173,9 @@ update() { docker) docker-update ;; + repo) + repo + ;; *) paru ;; From 9cf26407064a0531fb0258b710ab914fbe85e2e6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 11:11:53 +0200 Subject: [PATCH 0578/2667] Small fix --- home/.config/zsh/03-aliases.zsh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index a8236fda..10371bbe 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -128,15 +128,14 @@ passync() { pass git pull && pass git push && updatesecrets } update() { all() { + paru plugins {%@@ if profile == "Moria" @@%} repo docker-update docker system prune --volumes - {%@@ else @@%} - paru {%@@ endif @@%} - flatpak update + sudo flatpak update sudo awman-update } @@ -174,6 +173,9 @@ update() { docker) docker-update ;; + repo) + repo + ;; *) paru ;; From 03dbe6225ab275f7d45ff4730cceb040a9207a65 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 11:46:44 +0200 Subject: [PATCH 0579/2667] Add Edoras and use pacserve for korhonen_aur --- config-root.yaml | 3 +++ root/etc/pacman.conf | 1 + 2 files changed, 4 insertions(+) diff --git a/config-root.yaml b/config-root.yaml index 3346e1dd..35c32064 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -167,3 +167,6 @@ profiles: localhost: include: - Locale + Edoras: + include: + - Pacman diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index ce1d41be..fb164ac2 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -17,6 +17,7 @@ CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/$arch {%@@ if profile == "Moria" @@%} Server = file:///docker/index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ else @@%} +Include = /etc/pacman.d/pacserve Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ endif @@%} From f7fe7f92407b95820621f107dc5804bbc8cc21f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 11:46:44 +0200 Subject: [PATCH 0580/2667] Add Edoras and use pacserve for korhonen_aur --- config-root.yaml | 3 +++ root/etc/pacman.conf | 1 + 2 files changed, 4 insertions(+) diff --git a/config-root.yaml b/config-root.yaml index 3346e1dd..35c32064 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -167,3 +167,6 @@ profiles: localhost: include: - Locale + Edoras: + include: + - Pacman diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index ce1d41be..fb164ac2 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -17,6 +17,7 @@ CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/$arch {%@@ if profile == "Moria" @@%} Server = file:///docker/index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ else @@%} +Include = /etc/pacman.d/pacserve Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ endif @@%} From 6298896219a943f9a59987248765775a65724744 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 11:49:03 +0200 Subject: [PATCH 0581/2667] AnittaPC -> Edoras --- config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index 22ea54df..09c49dec 100644 --- a/config.yaml +++ b/config.yaml @@ -258,7 +258,7 @@ profiles: - f_init.vim - f_coc-settings.json - f_alacritty.yml - AnittaPC: + Edoras: include: - terminal - Pacman From cf1359f6ba42fbf3642c1bf8c5a85eec62498a50 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 11:49:03 +0200 Subject: [PATCH 0582/2667] AnittaPC -> Edoras --- config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index 22ea54df..09c49dec 100644 --- a/config.yaml +++ b/config.yaml @@ -258,7 +258,7 @@ profiles: - f_init.vim - f_coc-settings.json - f_alacritty.yml - AnittaPC: + Edoras: include: - terminal - Pacman From 143017a55d297a226b9b7347a34e38c4eb934d6b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 14:39:12 +0200 Subject: [PATCH 0583/2667] Add ubooquity --- docker/ubooquity/docker-compose.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 docker/ubooquity/docker-compose.yaml diff --git a/docker/ubooquity/docker-compose.yaml b/docker/ubooquity/docker-compose.yaml new file mode 100644 index 00000000..10a0fd8d --- /dev/null +++ b/docker/ubooquity/docker-compose.yaml @@ -0,0 +1,19 @@ +version: "2.1" +services: + ubooquity: + image: ghcr.io/linuxserver/ubooquity + container_name: ubooquity + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/Helsinki + - MAXMEM=1024 + volumes: + - /docker/ubooquity/config:/config + - /docker/ubooquity/books:/books + - /docker/ubooquity/comics:/comics + - /docker/ubooquity/files:/files + ports: + - 2202:2202 + - 2203:2203 + restart: unless-stopped From b7e1f224d308d69538a92adf4631355195bea1f1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 14:39:12 +0200 Subject: [PATCH 0584/2667] Add ubooquity --- docker/ubooquity/docker-compose.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 docker/ubooquity/docker-compose.yaml diff --git a/docker/ubooquity/docker-compose.yaml b/docker/ubooquity/docker-compose.yaml new file mode 100644 index 00000000..10a0fd8d --- /dev/null +++ b/docker/ubooquity/docker-compose.yaml @@ -0,0 +1,19 @@ +version: "2.1" +services: + ubooquity: + image: ghcr.io/linuxserver/ubooquity + container_name: ubooquity + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/Helsinki + - MAXMEM=1024 + volumes: + - /docker/ubooquity/config:/config + - /docker/ubooquity/books:/books + - /docker/ubooquity/comics:/comics + - /docker/ubooquity/files:/files + ports: + - 2202:2202 + - 2203:2203 + restart: unless-stopped From fcd1b70ef0c969b338e9ffe54af133d524ffaca2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 30 Dec 2020 10:58:25 +0200 Subject: [PATCH 0585/2667] Add pacman config for gondor --- config-root.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config-root.yaml b/config-root.yaml index 35c32064..714389bd 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -162,6 +162,7 @@ profiles: Gondor: include: - Locale + - Pacman dotfiles: - f_sshd_config localhost: From e8fddc9938466bd45d8afde350ecfa47ba31f37c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 30 Dec 2020 10:58:25 +0200 Subject: [PATCH 0586/2667] Add pacman config for gondor --- config-root.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config-root.yaml b/config-root.yaml index 35c32064..714389bd 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -162,6 +162,7 @@ profiles: Gondor: include: - Locale + - Pacman dotfiles: - f_sshd_config localhost: From d9519ca1dafc729a0c2da65f0c2f8d35157746a0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Jan 2021 13:47:13 +0200 Subject: [PATCH 0587/2667] Add remote forward --- home/.ssh/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index f58a5d37..a00f477a 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -23,11 +23,13 @@ host moria port 221 User balrog ForwardAgent yes + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host gondor hostname gondor.korhonen.cc port 22 User reekymarko + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host anitta HostName 10.200.200.4 From f8252e440183b59e52cb71d3c41dbdb80b646b4b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Jan 2021 13:47:13 +0200 Subject: [PATCH 0588/2667] Add remote forward --- home/.ssh/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index f58a5d37..a00f477a 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -23,11 +23,13 @@ host moria port 221 User balrog ForwardAgent yes + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host gondor hostname gondor.korhonen.cc port 22 User reekymarko + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host anitta HostName 10.200.200.4 From 873e117f21a20d9383d05efdbf6ba447039695a3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Jan 2021 13:51:59 +0200 Subject: [PATCH 0589/2667] Update dotdrop, remove ubooquity --- docker/ubooquity/docker-compose.yaml | 19 ------------------- dotdrop | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 docker/ubooquity/docker-compose.yaml diff --git a/docker/ubooquity/docker-compose.yaml b/docker/ubooquity/docker-compose.yaml deleted file mode 100644 index 10a0fd8d..00000000 --- a/docker/ubooquity/docker-compose.yaml +++ /dev/null @@ -1,19 +0,0 @@ -version: "2.1" -services: - ubooquity: - image: ghcr.io/linuxserver/ubooquity - container_name: ubooquity - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/Helsinki - - MAXMEM=1024 - volumes: - - /docker/ubooquity/config:/config - - /docker/ubooquity/books:/books - - /docker/ubooquity/comics:/comics - - /docker/ubooquity/files:/files - ports: - - 2202:2202 - - 2203:2203 - restart: unless-stopped diff --git a/dotdrop b/dotdrop index 636c1ade..39d52a2c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 636c1ade26a5205ca84aef624ed971c0e529ffa7 +Subproject commit 39d52a2c8042d250f0258b1135d7d94e37a14e8f From 52d85bc160439ae61f3d70983b68a7658f9910e4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Jan 2021 13:51:59 +0200 Subject: [PATCH 0590/2667] Update dotdrop, remove ubooquity --- docker/ubooquity/docker-compose.yaml | 19 ------------------- dotdrop | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 docker/ubooquity/docker-compose.yaml diff --git a/docker/ubooquity/docker-compose.yaml b/docker/ubooquity/docker-compose.yaml deleted file mode 100644 index 10a0fd8d..00000000 --- a/docker/ubooquity/docker-compose.yaml +++ /dev/null @@ -1,19 +0,0 @@ -version: "2.1" -services: - ubooquity: - image: ghcr.io/linuxserver/ubooquity - container_name: ubooquity - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/Helsinki - - MAXMEM=1024 - volumes: - - /docker/ubooquity/config:/config - - /docker/ubooquity/books:/books - - /docker/ubooquity/comics:/comics - - /docker/ubooquity/files:/files - ports: - - 2202:2202 - - 2203:2203 - restart: unless-stopped diff --git a/dotdrop b/dotdrop index 636c1ade..39d52a2c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 636c1ade26a5205ca84aef624ed971c0e529ffa7 +Subproject commit 39d52a2c8042d250f0258b1135d7d94e37a14e8f From b1b29546fde4c8c8762f9acdf2b5a4aef59e1fb6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Jan 2021 14:03:30 +0200 Subject: [PATCH 0591/2667] Fix cachedir on repo --- root/etc/pacman.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index fb164ac2..01d8a2a7 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -10,7 +10,7 @@ LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg {%@@ if profile == "Moria" @@%} CleanMethod=KeepCurrent -CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/$arch +CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} [korhonen_aur] From a7b48d6b9cdf79dd8cc7cc571f3de05953fff583 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Jan 2021 14:03:30 +0200 Subject: [PATCH 0592/2667] Fix cachedir on repo --- root/etc/pacman.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index fb164ac2..01d8a2a7 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -10,7 +10,7 @@ LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg {%@@ if profile == "Moria" @@%} CleanMethod=KeepCurrent -CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/$arch +CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} [korhonen_aur] From 4bb85c1664e42f9776572081efd603a64a9b5231 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 3 Jan 2021 21:34:03 +0200 Subject: [PATCH 0593/2667] Add tvheadend --- docker/tvheadend/docker-compose.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 docker/tvheadend/docker-compose.yaml diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml new file mode 100644 index 00000000..e72db84a --- /dev/null +++ b/docker/tvheadend/docker-compose.yaml @@ -0,0 +1,20 @@ +version: "2" +services: + tvheadend: + image: linuxserver/tvheadend + container_name: tvheadend + environment: + - TZ=Europe/Helsinki + - PUID=1000 + - PGID=985 + volumes: + - /docker/tvheadend:/config + - /mnt/Storage/Media/PVR:/recordings + - /etc/localtime:/etc/localtime:ro + ports: + - 9981:9981 + - 9982:9982 + devices: + - /dev/dri:/dev/dri #hardware acceleration + - /dev/dvb:/dev/dvb #tuner card + restart: unless-stopped From 48c865b7066b62cb0f2ffb5a4ed281a626251fec Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 3 Jan 2021 21:34:03 +0200 Subject: [PATCH 0594/2667] Add tvheadend --- docker/tvheadend/docker-compose.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 docker/tvheadend/docker-compose.yaml diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml new file mode 100644 index 00000000..e72db84a --- /dev/null +++ b/docker/tvheadend/docker-compose.yaml @@ -0,0 +1,20 @@ +version: "2" +services: + tvheadend: + image: linuxserver/tvheadend + container_name: tvheadend + environment: + - TZ=Europe/Helsinki + - PUID=1000 + - PGID=985 + volumes: + - /docker/tvheadend:/config + - /mnt/Storage/Media/PVR:/recordings + - /etc/localtime:/etc/localtime:ro + ports: + - 9981:9981 + - 9982:9982 + devices: + - /dev/dri:/dev/dri #hardware acceleration + - /dev/dvb:/dev/dvb #tuner card + restart: unless-stopped From cad5015d08f7d18232a2977720c9298e1fab1b75 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Jan 2021 22:10:35 +0200 Subject: [PATCH 0595/2667] Add tvh to traefik --- docker/tvheadend/docker-compose.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index e72db84a..1667bbdc 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -12,9 +12,23 @@ services: - /mnt/Storage/Media/PVR:/recordings - /etc/localtime:/etc/localtime:ro ports: - - 9981:9981 - 9982:9982 devices: - /dev/dri:/dev/dri #hardware acceleration - /dev/dvb:/dev/dvb #tuner card restart: unless-stopped + labels: + - "traefik.enable=true" + + - "traefik.http.routers.tvheadend-redirect.entrypoints=http" + - "traefik.http.routers.tvheadend-redirect.rule=Host(`tvheadend.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.tvheadend-redirect.middlewares=http2https" + + - "traefik.http.routers.tvheadend.entrypoints=https" + - "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)" + - "traefik.http.routers.tvheadend.tls=true" + - "traefik.http.routers.tvheadend.tls.certresolver=http" + - "traefik.http.routers.tvheadend.service=tvheadend" + - "traefik.docker.network=proxy" + - "traefik.http.services.tvheadend.loadbalancer.server.port=9981" From 8754b128dbee00bb55b930a84ba0264051329587 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Jan 2021 22:10:35 +0200 Subject: [PATCH 0596/2667] Add tvh to traefik --- docker/tvheadend/docker-compose.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index e72db84a..1667bbdc 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -12,9 +12,23 @@ services: - /mnt/Storage/Media/PVR:/recordings - /etc/localtime:/etc/localtime:ro ports: - - 9981:9981 - 9982:9982 devices: - /dev/dri:/dev/dri #hardware acceleration - /dev/dvb:/dev/dvb #tuner card restart: unless-stopped + labels: + - "traefik.enable=true" + + - "traefik.http.routers.tvheadend-redirect.entrypoints=http" + - "traefik.http.routers.tvheadend-redirect.rule=Host(`tvheadend.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.tvheadend-redirect.middlewares=http2https" + + - "traefik.http.routers.tvheadend.entrypoints=https" + - "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)" + - "traefik.http.routers.tvheadend.tls=true" + - "traefik.http.routers.tvheadend.tls.certresolver=http" + - "traefik.http.routers.tvheadend.service=tvheadend" + - "traefik.docker.network=proxy" + - "traefik.http.services.tvheadend.loadbalancer.server.port=9981" From 4422e2ca676a818474eb6c8458f2e23ee350bfb6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Jan 2021 22:14:56 +0200 Subject: [PATCH 0597/2667] Add proxy network for tvh --- docker/tvheadend/docker-compose.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 1667bbdc..583667f1 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -17,6 +17,8 @@ services: - /dev/dri:/dev/dri #hardware acceleration - /dev/dvb:/dev/dvb #tuner card restart: unless-stopped + networks: + - proxy labels: - "traefik.enable=true" @@ -32,3 +34,7 @@ services: - "traefik.http.routers.tvheadend.service=tvheadend" - "traefik.docker.network=proxy" - "traefik.http.services.tvheadend.loadbalancer.server.port=9981" + +networks: + proxy: + external: true From 5148815f423a3788eb53c0411c4049bc5152b30c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Jan 2021 22:14:56 +0200 Subject: [PATCH 0598/2667] Add proxy network for tvh --- docker/tvheadend/docker-compose.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 1667bbdc..583667f1 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -17,6 +17,8 @@ services: - /dev/dri:/dev/dri #hardware acceleration - /dev/dvb:/dev/dvb #tuner card restart: unless-stopped + networks: + - proxy labels: - "traefik.enable=true" @@ -32,3 +34,7 @@ services: - "traefik.http.routers.tvheadend.service=tvheadend" - "traefik.docker.network=proxy" - "traefik.http.services.tvheadend.loadbalancer.server.port=9981" + +networks: + proxy: + external: true From 55c7bd0b28cd0d729d5a89aa6d2bb3f566a69496 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 11:47:08 +0200 Subject: [PATCH 0599/2667] Add postgresql --- docker/postgres/docker-compose.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 docker/postgres/docker-compose.yaml diff --git a/docker/postgres/docker-compose.yaml b/docker/postgres/docker-compose.yaml new file mode 100644 index 00000000..92942046 --- /dev/null +++ b/docker/postgres/docker-compose.yaml @@ -0,0 +1,20 @@ +version: "3" +services: + postgres: + container_name: postgres + image: postgres:13 + environment: + - TZ=Europe/Helsinki + - POSTGRES_PASSWORD=12345 + ports: + - 5432:5432 + networks: + - postgres + volumes: + - /docker/postgres:/var/lib/postgresql/data + - /etc/localtime:/etc/localtime:ro + restart: unless-stopped + +networks: + postgres: + external: true From 8500294bf77a928a2dc5ab6794ef5d5bb3699696 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 11:47:08 +0200 Subject: [PATCH 0600/2667] Add postgresql --- docker/postgres/docker-compose.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 docker/postgres/docker-compose.yaml diff --git a/docker/postgres/docker-compose.yaml b/docker/postgres/docker-compose.yaml new file mode 100644 index 00000000..92942046 --- /dev/null +++ b/docker/postgres/docker-compose.yaml @@ -0,0 +1,20 @@ +version: "3" +services: + postgres: + container_name: postgres + image: postgres:13 + environment: + - TZ=Europe/Helsinki + - POSTGRES_PASSWORD=12345 + ports: + - 5432:5432 + networks: + - postgres + volumes: + - /docker/postgres:/var/lib/postgresql/data + - /etc/localtime:/etc/localtime:ro + restart: unless-stopped + +networks: + postgres: + external: true From eb5fd2705f77b1f23a8fa5076b5fd6570a1bf476 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 11:47:26 +0200 Subject: [PATCH 0601/2667] Move nextcloud to postgresql --- docker/nextcloud/docker-compose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index e424267e..50275831 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -9,7 +9,7 @@ services: - "1869:80" networks: - nextcloud - - mariadb + - postgres - proxy volumes: - /docker/nextcloud:/var/www/html @@ -19,7 +19,6 @@ services: - /etc/localtime:/etc/localtime:ro environment: - TZ=Europe/Helsinki - - MYSQL_HOST=mariadb-nextcloud - REDIS_HOST=redis - REDIS_HOST_PASSWORD=123 depends_on: @@ -61,7 +60,7 @@ services: networks: nextcloud: external: false - mariadb: + postgres: external: true proxy: external: true From 5a04ce912a03ec0ccc8258c4455de6d6ab114513 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 11:47:26 +0200 Subject: [PATCH 0602/2667] Move nextcloud to postgresql --- docker/nextcloud/docker-compose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index e424267e..50275831 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -9,7 +9,7 @@ services: - "1869:80" networks: - nextcloud - - mariadb + - postgres - proxy volumes: - /docker/nextcloud:/var/www/html @@ -19,7 +19,6 @@ services: - /etc/localtime:/etc/localtime:ro environment: - TZ=Europe/Helsinki - - MYSQL_HOST=mariadb-nextcloud - REDIS_HOST=redis - REDIS_HOST_PASSWORD=123 depends_on: @@ -61,7 +60,7 @@ services: networks: nextcloud: external: false - mariadb: + postgres: external: true proxy: external: true From 379d4101d35e613622ef07f482c8acb7d17ee93e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 12:14:05 +0200 Subject: [PATCH 0603/2667] Change freshrss to postgresql --- docker/freshrss/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index aaf1286e..5c2ec94f 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -6,7 +6,7 @@ services: restart: unless-stopped networks: - freshrss - - mariadb + - postgres - proxy ports: - 8088:80 @@ -36,7 +36,7 @@ services: networks: freshrss: external: false - mariadb: + postgres: external: true proxy: external: true From 78d5eddfc158006030bc1a6bbcaf43004744e5ba Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 12:14:05 +0200 Subject: [PATCH 0604/2667] Change freshrss to postgresql --- docker/freshrss/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index aaf1286e..5c2ec94f 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -6,7 +6,7 @@ services: restart: unless-stopped networks: - freshrss - - mariadb + - postgres - proxy ports: - 8088:80 @@ -36,7 +36,7 @@ services: networks: freshrss: external: false - mariadb: + postgres: external: true proxy: external: true From 42b23d06d0afc0f5d9a8f8522b5fa07ef9a8ab84 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 13:40:57 +0200 Subject: [PATCH 0605/2667] Move gitea to postgresql --- docker/gitea/docker-compose.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 4fafc49e..b633d3e7 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -8,14 +8,9 @@ services: - TZ=Europe/Helsinki - USER_UID=1000 - USER_GID=1000 - - DB_TYPE=mysql - - DB_HOST=mariadb:3306 - - DB_NAME=gitea - - DB_USER=gitea - - DB_PASSWD=${MYSQL_PASS} restart: unless-stopped networks: - - mariadb + - postgres - proxy ports: - "3000:3000" @@ -40,7 +35,7 @@ services: - "traefik.http.services.gitea.loadbalancer.server.port=3000" networks: - mariadb: + postgres: external: true proxy: external: true From 8268daeb9b95773d5f5e4dcaf37aa88f08ef1ee8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 13:40:57 +0200 Subject: [PATCH 0606/2667] Move gitea to postgresql --- docker/gitea/docker-compose.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 4fafc49e..b633d3e7 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -8,14 +8,9 @@ services: - TZ=Europe/Helsinki - USER_UID=1000 - USER_GID=1000 - - DB_TYPE=mysql - - DB_HOST=mariadb:3306 - - DB_NAME=gitea - - DB_USER=gitea - - DB_PASSWD=${MYSQL_PASS} restart: unless-stopped networks: - - mariadb + - postgres - proxy ports: - "3000:3000" @@ -40,7 +35,7 @@ services: - "traefik.http.services.gitea.loadbalancer.server.port=3000" networks: - mariadb: + postgres: external: true proxy: external: true From 343787d2522805ff2a3727b2e68fcecea55c87f7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 13:41:25 +0200 Subject: [PATCH 0607/2667] Move homeautomation for postgresql --- docker/homeautomation/docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index d339b160..ebcf1206 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -13,7 +13,7 @@ services: restart: unless-stopped networks: - homeautomation - - mariadb + - postgres - proxy ports: - "8123:8123" @@ -133,11 +133,11 @@ services: volumes: - /docker/homeautomation/gotify:/app/data environment: - - GOTIFY_DATABASE_DIALECT=mysql - - GOTIFY_DATABASE_CONNECTION=gotify:gotify@tcp(mariadb:3306)/gotify?charset=utf8&parseTime=True&loc=Local + - GOTIFY_DATABASE_DIALECT=postgres + - GOTIFY_DATABASE_CONNECTION="host=postgres port=5432 user=gotify dbname=gotify password=${GOTIFY_PGPASS} sslmode=disable" networks: - proxy - - mariadb + - postgres restart: unless-stopped labels: - "traefik.enable=true" @@ -158,7 +158,7 @@ services: networks: homeautomation: external: false - mariadb: + postgres: external: true proxy: external: true From 10aff5d999c165dfecfac63d2824ca47bd30c131 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 13:41:25 +0200 Subject: [PATCH 0608/2667] Move homeautomation for postgresql --- docker/homeautomation/docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index d339b160..ebcf1206 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -13,7 +13,7 @@ services: restart: unless-stopped networks: - homeautomation - - mariadb + - postgres - proxy ports: - "8123:8123" @@ -133,11 +133,11 @@ services: volumes: - /docker/homeautomation/gotify:/app/data environment: - - GOTIFY_DATABASE_DIALECT=mysql - - GOTIFY_DATABASE_CONNECTION=gotify:gotify@tcp(mariadb:3306)/gotify?charset=utf8&parseTime=True&loc=Local + - GOTIFY_DATABASE_DIALECT=postgres + - GOTIFY_DATABASE_CONNECTION="host=postgres port=5432 user=gotify dbname=gotify password=${GOTIFY_PGPASS} sslmode=disable" networks: - proxy - - mariadb + - postgres restart: unless-stopped labels: - "traefik.enable=true" @@ -158,7 +158,7 @@ services: networks: homeautomation: external: false - mariadb: + postgres: external: true proxy: external: true From c40d93b8de2a16b3e2dedb509a13569c2b9f2c7b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:07:38 +0200 Subject: [PATCH 0609/2667] Fix firefox nightly update function --- home/.config/zsh/03-aliases.zsh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 10371bbe..1a483f00 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -140,7 +140,11 @@ update() { } repo() { - aur sync -Su --margs --noconfirm firefox-nightly + aur sync -Su --margs --noconfirm + } + + firefox() { + aur sync -S --rebuild --margs --noconfirm firefox-nightly } plugins() { From 60188ea0d31bf02693a75f91fee188ccbf1b655f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:07:38 +0200 Subject: [PATCH 0610/2667] Fix firefox nightly update function --- home/.config/zsh/03-aliases.zsh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 10371bbe..1a483f00 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -140,7 +140,11 @@ update() { } repo() { - aur sync -Su --margs --noconfirm firefox-nightly + aur sync -Su --margs --noconfirm + } + + firefox() { + aur sync -S --rebuild --margs --noconfirm firefox-nightly } plugins() { From 898d9c4b664a948440db9072809cc99abee7c7d1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:07:38 +0200 Subject: [PATCH 0611/2667] Fix firefox nightly update function --- home/.config/zsh/03-aliases.zsh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 10371bbe..1a483f00 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -140,7 +140,11 @@ update() { } repo() { - aur sync -Su --margs --noconfirm firefox-nightly + aur sync -Su --margs --noconfirm + } + + firefox() { + aur sync -S --rebuild --margs --noconfirm firefox-nightly } plugins() { From 4ca00a8068348fbbcc5ff12c119ac95e5f95aa62 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:07:38 +0200 Subject: [PATCH 0612/2667] Fix firefox nightly update function --- home/.config/zsh/03-aliases.zsh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 10371bbe..1a483f00 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -140,7 +140,11 @@ update() { } repo() { - aur sync -Su --margs --noconfirm firefox-nightly + aur sync -Su --margs --noconfirm + } + + firefox() { + aur sync -S --rebuild --margs --noconfirm firefox-nightly } plugins() { From 3eabe2fddd97609c8985946fec3440c4a50cc7b6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:10:24 +0200 Subject: [PATCH 0613/2667] Fix firefox update function --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 1a483f00..95ba75de 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -144,7 +144,7 @@ update() { } firefox() { - aur sync -S --rebuild --margs --noconfirm firefox-nightly + aur sync -S --rebuild firefox-nightly --margs --noconfirm } plugins() { From c1762007fc7cd0a41677152e670bb21c42394179 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:10:24 +0200 Subject: [PATCH 0614/2667] Fix firefox update function --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 1a483f00..95ba75de 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -144,7 +144,7 @@ update() { } firefox() { - aur sync -S --rebuild --margs --noconfirm firefox-nightly + aur sync -S --rebuild firefox-nightly --margs --noconfirm } plugins() { From 38836acf0150dcbfbfbc9e313331fb6f5b1cea60 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:13:33 +0200 Subject: [PATCH 0615/2667] Fix firefox update function --- home/.config/zsh/03-aliases.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 95ba75de..7268096d 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -180,6 +180,9 @@ update() { repo) repo ;; + firefox) + firefox + ;; *) paru ;; From 31edb64dbbb2aad476b722d3527096639e845a9f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:13:33 +0200 Subject: [PATCH 0616/2667] Fix firefox update function --- home/.config/zsh/03-aliases.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 95ba75de..7268096d 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -180,6 +180,9 @@ update() { repo) repo ;; + firefox) + firefox + ;; *) paru ;; From ab2bb2f705eb4267905da3a3e9e899d243ed2e65 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:14:40 +0200 Subject: [PATCH 0617/2667] Update firefox with all target --- home/.config/zsh/03-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 7268096d..35fbdae1 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -132,6 +132,7 @@ update() { plugins {%@@ if profile == "Moria" @@%} repo + firefox docker-update docker system prune --volumes {%@@ endif @@%} From dfd5b5082ca7096936c6e3523e339d2e67d37b8a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:14:40 +0200 Subject: [PATCH 0618/2667] Update firefox with all target --- home/.config/zsh/03-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 7268096d..35fbdae1 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -132,6 +132,7 @@ update() { plugins {%@@ if profile == "Moria" @@%} repo + firefox docker-update docker system prune --volumes {%@@ endif @@%} From 3678b8056072d8a67bc7b861ef0dd15615668e17 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:24:45 +0200 Subject: [PATCH 0619/2667] Add spotifeed --- docker/freshrss/.gitignore | 1 + docker/freshrss/docker-compose.yml | 7 +++++++ docker/freshrss/spotifeed/Dockerfile | 10 ++++++++++ 3 files changed, 18 insertions(+) create mode 100644 docker/freshrss/.gitignore create mode 100644 docker/freshrss/spotifeed/Dockerfile diff --git a/docker/freshrss/.gitignore b/docker/freshrss/.gitignore new file mode 100644 index 00000000..4c49bd78 --- /dev/null +++ b/docker/freshrss/.gitignore @@ -0,0 +1 @@ +.env diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 5c2ec94f..d2d9ef1b 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -33,6 +33,13 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.freshrss.loadbalancer.server.port=80" + spotifeed: + build: ./spotifeed + container_name: spotifeed + restart: unless-stopped + networks: + - freshrss + networks: freshrss: external: false diff --git a/docker/freshrss/spotifeed/Dockerfile b/docker/freshrss/spotifeed/Dockerfile new file mode 100644 index 00000000..89e030e0 --- /dev/null +++ b/docker/freshrss/spotifeed/Dockerfile @@ -0,0 +1,10 @@ +FROM ruby:2.7.2 +RUN git clone https://github.com/timdorr/spotifeed +WORKDIR /spotifeed +RUN git checkout a105f0956b33444c71a47a1cddff44f12b77c297 +RUN bundle install +EXPOSE 8083 +RUN apt-get update +RUN apt-get upgrade +RUN apt-get install redis-server -y +CMD puma -p 8083 & redis-server From a1cf3d89434b214f3d7cf0c5b8e27e16c4f34278 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:24:45 +0200 Subject: [PATCH 0620/2667] Add spotifeed --- docker/freshrss/.gitignore | 1 + docker/freshrss/docker-compose.yml | 7 +++++++ docker/freshrss/spotifeed/Dockerfile | 10 ++++++++++ 3 files changed, 18 insertions(+) create mode 100644 docker/freshrss/.gitignore create mode 100644 docker/freshrss/spotifeed/Dockerfile diff --git a/docker/freshrss/.gitignore b/docker/freshrss/.gitignore new file mode 100644 index 00000000..4c49bd78 --- /dev/null +++ b/docker/freshrss/.gitignore @@ -0,0 +1 @@ +.env diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 5c2ec94f..d2d9ef1b 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -33,6 +33,13 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.freshrss.loadbalancer.server.port=80" + spotifeed: + build: ./spotifeed + container_name: spotifeed + restart: unless-stopped + networks: + - freshrss + networks: freshrss: external: false diff --git a/docker/freshrss/spotifeed/Dockerfile b/docker/freshrss/spotifeed/Dockerfile new file mode 100644 index 00000000..89e030e0 --- /dev/null +++ b/docker/freshrss/spotifeed/Dockerfile @@ -0,0 +1,10 @@ +FROM ruby:2.7.2 +RUN git clone https://github.com/timdorr/spotifeed +WORKDIR /spotifeed +RUN git checkout a105f0956b33444c71a47a1cddff44f12b77c297 +RUN bundle install +EXPOSE 8083 +RUN apt-get update +RUN apt-get upgrade +RUN apt-get install redis-server -y +CMD puma -p 8083 & redis-server From b763a09919ce15e88d91c1b2fa49aba739e5c7fc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:26:46 +0200 Subject: [PATCH 0621/2667] Make freshrss depend on spotifeed --- docker/freshrss/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index d2d9ef1b..08aba513 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -14,6 +14,8 @@ services: - PUID=1000 - PGID=985 - TZ=Europe/Helsinki + depends_on: + - spotifeed volumes: - /docker/freshrss:/config - /etc/localtime:/etc/localtime:ro From 479c072fc5e3063915e99736b956a8cdcded93f6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:26:46 +0200 Subject: [PATCH 0622/2667] Make freshrss depend on spotifeed --- docker/freshrss/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index d2d9ef1b..08aba513 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -14,6 +14,8 @@ services: - PUID=1000 - PGID=985 - TZ=Europe/Helsinki + depends_on: + - spotifeed volumes: - /docker/freshrss:/config - /etc/localtime:/etc/localtime:ro From 53bba8f92e3f00f2be04536862a30ea784c17dfc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:30:24 +0200 Subject: [PATCH 0623/2667] Use master version of spotifeed --- docker/freshrss/spotifeed/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/freshrss/spotifeed/Dockerfile b/docker/freshrss/spotifeed/Dockerfile index 89e030e0..63c1604d 100644 --- a/docker/freshrss/spotifeed/Dockerfile +++ b/docker/freshrss/spotifeed/Dockerfile @@ -1,7 +1,6 @@ FROM ruby:2.7.2 RUN git clone https://github.com/timdorr/spotifeed WORKDIR /spotifeed -RUN git checkout a105f0956b33444c71a47a1cddff44f12b77c297 RUN bundle install EXPOSE 8083 RUN apt-get update From 2254c618c46cfc01fff170e3a1501bdfe8004155 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:30:24 +0200 Subject: [PATCH 0624/2667] Use master version of spotifeed --- docker/freshrss/spotifeed/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/freshrss/spotifeed/Dockerfile b/docker/freshrss/spotifeed/Dockerfile index 89e030e0..63c1604d 100644 --- a/docker/freshrss/spotifeed/Dockerfile +++ b/docker/freshrss/spotifeed/Dockerfile @@ -1,7 +1,6 @@ FROM ruby:2.7.2 RUN git clone https://github.com/timdorr/spotifeed WORKDIR /spotifeed -RUN git checkout a105f0956b33444c71a47a1cddff44f12b77c297 RUN bundle install EXPOSE 8083 RUN apt-get update From c8b026881e0134aa224923f13db3a53a23e748f8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:32:34 +0200 Subject: [PATCH 0625/2667] Add image name for spotifeed and open ports --- docker/freshrss/docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 08aba513..22d7c08e 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -37,6 +37,9 @@ services: spotifeed: build: ./spotifeed + image: spotifeed + ports: + - "8083:8083" container_name: spotifeed restart: unless-stopped networks: From 0107d1c4defa1db50789b9b41b8526338d882399 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:32:34 +0200 Subject: [PATCH 0626/2667] Add image name for spotifeed and open ports --- docker/freshrss/docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 08aba513..22d7c08e 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -37,6 +37,9 @@ services: spotifeed: build: ./spotifeed + image: spotifeed + ports: + - "8083:8083" container_name: spotifeed restart: unless-stopped networks: From e4b5afb4235383931dbf66e9f87008448db2e6f7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:46:00 +0200 Subject: [PATCH 0627/2667] Add bibliogram --- docker/freshrss/docker-compose.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 22d7c08e..d6c1fc3c 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -17,7 +17,7 @@ services: depends_on: - spotifeed volumes: - - /docker/freshrss:/config + - /docker/freshrss/freshrss:/config - /etc/localtime:/etc/localtime:ro labels: - "traefik.enable=true" @@ -38,13 +38,24 @@ services: spotifeed: build: ./spotifeed image: spotifeed - ports: - - "8083:8083" container_name: spotifeed + ports: + - 8083:8083 restart: unless-stopped networks: - freshrss + bibliogram: + image: cloudrac3r/bibliogram + container_name: bibliogram + restart: unless-stopped + volumes: + - /docker/freshrss/bibliogram/db:/app/db + networks: + - freshrss + ports: + - 10407:10407 + networks: freshrss: external: false From 8978b8c328ee43eaa28520fed2cfa26030a61880 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:46:00 +0200 Subject: [PATCH 0628/2667] Add bibliogram --- docker/freshrss/docker-compose.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 22d7c08e..d6c1fc3c 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -17,7 +17,7 @@ services: depends_on: - spotifeed volumes: - - /docker/freshrss:/config + - /docker/freshrss/freshrss:/config - /etc/localtime:/etc/localtime:ro labels: - "traefik.enable=true" @@ -38,13 +38,24 @@ services: spotifeed: build: ./spotifeed image: spotifeed - ports: - - "8083:8083" container_name: spotifeed + ports: + - 8083:8083 restart: unless-stopped networks: - freshrss + bibliogram: + image: cloudrac3r/bibliogram + container_name: bibliogram + restart: unless-stopped + volumes: + - /docker/freshrss/bibliogram/db:/app/db + networks: + - freshrss + ports: + - 10407:10407 + networks: freshrss: external: false From 7b8f3bff95b1b1f97f2625a4c578e370ddfbc1cc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:50:35 +0200 Subject: [PATCH 0629/2667] Publish bibliogram on the proxy --- docker/freshrss/docker-compose.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index d6c1fc3c..8a9c0b4d 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -53,8 +53,22 @@ services: - /docker/freshrss/bibliogram/db:/app/db networks: - freshrss - ports: - - 10407:10407 + - proxy + labels: + - "traefik.enable=true" + + - "traefik.http.routers.bibliogram-redirect.entrypoints=http" + - "traefik.http.routers.bibliogram-redirect.rule=Host(`bibliogram.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.bibliogram-redirect.middlewares=http2https" + + - "traefik.http.routers.bibliogram.entrypoints=https" + - "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)" + - "traefik.http.routers.bibliogram.tls=true" + - "traefik.http.routers.bibliogram.tls.certresolver=http" + - "traefik.http.routers.bibliogram.service=bibliogram" + - "traefik.docker.network=proxy" + - "traefik.http.services.bibliogram.loadbalancer.server.port=10407" networks: freshrss: From b055113c390c9eb5cd1c56a25d8098e3ccf94a8a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:50:35 +0200 Subject: [PATCH 0630/2667] Publish bibliogram on the proxy --- docker/freshrss/docker-compose.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index d6c1fc3c..8a9c0b4d 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -53,8 +53,22 @@ services: - /docker/freshrss/bibliogram/db:/app/db networks: - freshrss - ports: - - 10407:10407 + - proxy + labels: + - "traefik.enable=true" + + - "traefik.http.routers.bibliogram-redirect.entrypoints=http" + - "traefik.http.routers.bibliogram-redirect.rule=Host(`bibliogram.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.bibliogram-redirect.middlewares=http2https" + + - "traefik.http.routers.bibliogram.entrypoints=https" + - "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)" + - "traefik.http.routers.bibliogram.tls=true" + - "traefik.http.routers.bibliogram.tls.certresolver=http" + - "traefik.http.routers.bibliogram.service=bibliogram" + - "traefik.docker.network=proxy" + - "traefik.http.services.bibliogram.loadbalancer.server.port=10407" networks: freshrss: From 787d709c45446ff47c63981da0f5cc2d046f91cc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:58:54 +0200 Subject: [PATCH 0631/2667] Mount bibliogram config --- docker/freshrss/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 8a9c0b4d..7498ace6 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -51,6 +51,7 @@ services: restart: unless-stopped volumes: - /docker/freshrss/bibliogram/db:/app/db + - /docker/freshrss/bibliogram/config.js:/app/config.js networks: - freshrss - proxy From aa3ab82769e28d1bd8b81a659d0491702a54c2f1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:58:54 +0200 Subject: [PATCH 0632/2667] Mount bibliogram config --- docker/freshrss/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 8a9c0b4d..7498ace6 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -51,6 +51,7 @@ services: restart: unless-stopped volumes: - /docker/freshrss/bibliogram/db:/app/db + - /docker/freshrss/bibliogram/config.js:/app/config.js networks: - freshrss - proxy From a7b1a124584cb1472f83e55e43a553b216f63046 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 19 Jan 2021 18:40:44 +0200 Subject: [PATCH 0633/2667] Make update repo function update firefox too --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 35fbdae1..4c0d4215 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -132,7 +132,6 @@ update() { plugins {%@@ if profile == "Moria" @@%} repo - firefox docker-update docker system prune --volumes {%@@ endif @@%} @@ -142,6 +141,7 @@ update() { repo() { aur sync -Su --margs --noconfirm + firefox } firefox() { From fdadd3671fd591dda08f65c72e72d27172033be7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 19 Jan 2021 18:40:44 +0200 Subject: [PATCH 0634/2667] Make update repo function update firefox too --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 35fbdae1..4c0d4215 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -132,7 +132,6 @@ update() { plugins {%@@ if profile == "Moria" @@%} repo - firefox docker-update docker system prune --volumes {%@@ endif @@%} @@ -142,6 +141,7 @@ update() { repo() { aur sync -Su --margs --noconfirm + firefox } firefox() { From 4e20c13275c4c749bc581678ac869495d6171955 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 30 Jan 2021 11:22:45 +0200 Subject: [PATCH 0635/2667] Remove deprecated ncmpcpp options --- home/.config/ncmpcpp/config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home/.config/ncmpcpp/config b/home/.config/ncmpcpp/config index c6b5ccd9..ebe09fb9 100644 --- a/home/.config/ncmpcpp/config +++ b/home/.config/ncmpcpp/config @@ -9,10 +9,9 @@ mpd_music_dir = ~/Music mpd_crossfade_time = 2 ##### visualizer ##### -visualizer_fifo_path = /tmp/mpd.fifo +visualizer_data_source = /tmp/mpd.fifo visualizer_output_name = Visualizer visualizer_in_stereo = yes -visualizer_sync_interval = 30 # spectrum,wave,wave_filled,ellipse. visualizer_type = wave_filled visualizer_look = ●▮ From 6f64e8296c391d10f199d457b7d03db59fb17e8e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 30 Jan 2021 11:22:45 +0200 Subject: [PATCH 0636/2667] Remove deprecated ncmpcpp options --- home/.config/ncmpcpp/config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home/.config/ncmpcpp/config b/home/.config/ncmpcpp/config index c6b5ccd9..ebe09fb9 100644 --- a/home/.config/ncmpcpp/config +++ b/home/.config/ncmpcpp/config @@ -9,10 +9,9 @@ mpd_music_dir = ~/Music mpd_crossfade_time = 2 ##### visualizer ##### -visualizer_fifo_path = /tmp/mpd.fifo +visualizer_data_source = /tmp/mpd.fifo visualizer_output_name = Visualizer visualizer_in_stereo = yes -visualizer_sync_interval = 30 # spectrum,wave,wave_filled,ellipse. visualizer_type = wave_filled visualizer_look = ●▮ From 6c5121dd54272c1f82cdeefb2293a02856929456 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 30 Jan 2021 11:23:00 +0200 Subject: [PATCH 0637/2667] Add coc-flutter to nvim --- home/.config/nvim/conf.d/01-plugins.vim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/conf.d/01-plugins.vim b/home/.config/nvim/conf.d/01-plugins.vim index 690629e2..6c18ec60 100644 --- a/home/.config/nvim/conf.d/01-plugins.vim +++ b/home/.config/nvim/conf.d/01-plugins.vim @@ -18,7 +18,8 @@ let g:coc_global_extensions = [ \ 'coc-rust-analyzer', \ 'coc-markdownlint', \ 'coc-snippets', - \ 'coc-java' + \ 'coc-java', + \ 'coc-flutter' \ ] call plug#begin() From c9674bc9ad930c79f6ef76c8e895820cc73d4cd9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 30 Jan 2021 11:23:00 +0200 Subject: [PATCH 0638/2667] Add coc-flutter to nvim --- home/.config/nvim/conf.d/01-plugins.vim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/conf.d/01-plugins.vim b/home/.config/nvim/conf.d/01-plugins.vim index 690629e2..6c18ec60 100644 --- a/home/.config/nvim/conf.d/01-plugins.vim +++ b/home/.config/nvim/conf.d/01-plugins.vim @@ -18,7 +18,8 @@ let g:coc_global_extensions = [ \ 'coc-rust-analyzer', \ 'coc-markdownlint', \ 'coc-snippets', - \ 'coc-java' + \ 'coc-java', + \ 'coc-flutter' \ ] call plug#begin() From e1f8924f4182dcec3094cfad8b1b16fc8d357635 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 30 Jan 2021 11:46:02 +0200 Subject: [PATCH 0639/2667] Add wordpress --- docker/mariadb/docker-compose.yaml | 18 ---------- docker/wordpress/docker-compose.yaml | 54 ++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 18 deletions(-) delete mode 100644 docker/mariadb/docker-compose.yaml create mode 100644 docker/wordpress/docker-compose.yaml diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml deleted file mode 100644 index e09fa124..00000000 --- a/docker/mariadb/docker-compose.yaml +++ /dev/null @@ -1,18 +0,0 @@ -version: "3" -services: - mariadb: - container_name: mariadb - image: mariadb - environment: - - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - networks: - - mariadb - volumes: - - /docker/mariadb:/var/lib/mysql - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped - -networks: - mariadb: - external: true diff --git a/docker/wordpress/docker-compose.yaml b/docker/wordpress/docker-compose.yaml new file mode 100644 index 00000000..8db8cd1d --- /dev/null +++ b/docker/wordpress/docker-compose.yaml @@ -0,0 +1,54 @@ +version: "3.3" + +services: + wordpress: + container_name: wordpress + image: wordpress:latest + environment: + - TZ=Europe/Helsinki + - WORDPRESS_DB_HOST=mariadb-wordpress:3306 + - WORDPRESS_DB_USER=wordpress + - WORDPRESS_DB_PASSWORD=wordpress + - WORDPRESS_DB_NAME=wordpress + restart: unless-stopped + networks: + - proxy + - wordpress + volumes: + - /docker/wordpress/wordpress:/var/www/html + - /etc/localtime:/etc/localtime:ro + labels: + - "traefik.enable=true" + + - "traefik.http.routers.wordpress-redirect.entrypoints=http" + - "traefik.http.routers.wordpress-redirect.rule=Host(`johanna.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.wordpress-redirect.middlewares=http2https" + + - "traefik.http.routers.wordpress.entrypoints=https" + - "traefik.http.routers.wordpress.rule=Host(`johanna.korhonen.cc`)" + - "traefik.http.routers.wordpress.tls=true" + - "traefik.http.routers.wordpress.tls.certresolver=http" + - "traefik.http.routers.wordpress.service=wordpress" + - "traefik.docker.network=proxy" + - "traefik.http.services.wordpress.loadbalancer.server.port=80" + + mariadb-wordpress: + image: mariadb + container_name: mariadb-wordpress + volumes: + - /docker/wordpress/mariadb:/var/lib/mysql + restart: always + networks: + - wordpress + environment: + - MYSQL_ROOT_PASSWORD=oT8Veu3Vre4ohj3E + - MYSQL_DATABASE=wordpress + - MYSQL_USER=wordpress + - MYSQL_PASSWORD=wordpress + +networks: + proxy: + external: true + wordpress: + external: false From 26e09764538d9858c22f8808822d4f999e035424 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 30 Jan 2021 11:46:02 +0200 Subject: [PATCH 0640/2667] Add wordpress --- docker/mariadb/docker-compose.yaml | 18 ---------- docker/wordpress/docker-compose.yaml | 54 ++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 18 deletions(-) delete mode 100644 docker/mariadb/docker-compose.yaml create mode 100644 docker/wordpress/docker-compose.yaml diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml deleted file mode 100644 index e09fa124..00000000 --- a/docker/mariadb/docker-compose.yaml +++ /dev/null @@ -1,18 +0,0 @@ -version: "3" -services: - mariadb: - container_name: mariadb - image: mariadb - environment: - - TZ=Europe/Helsinki - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - networks: - - mariadb - volumes: - - /docker/mariadb:/var/lib/mysql - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped - -networks: - mariadb: - external: true diff --git a/docker/wordpress/docker-compose.yaml b/docker/wordpress/docker-compose.yaml new file mode 100644 index 00000000..8db8cd1d --- /dev/null +++ b/docker/wordpress/docker-compose.yaml @@ -0,0 +1,54 @@ +version: "3.3" + +services: + wordpress: + container_name: wordpress + image: wordpress:latest + environment: + - TZ=Europe/Helsinki + - WORDPRESS_DB_HOST=mariadb-wordpress:3306 + - WORDPRESS_DB_USER=wordpress + - WORDPRESS_DB_PASSWORD=wordpress + - WORDPRESS_DB_NAME=wordpress + restart: unless-stopped + networks: + - proxy + - wordpress + volumes: + - /docker/wordpress/wordpress:/var/www/html + - /etc/localtime:/etc/localtime:ro + labels: + - "traefik.enable=true" + + - "traefik.http.routers.wordpress-redirect.entrypoints=http" + - "traefik.http.routers.wordpress-redirect.rule=Host(`johanna.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.wordpress-redirect.middlewares=http2https" + + - "traefik.http.routers.wordpress.entrypoints=https" + - "traefik.http.routers.wordpress.rule=Host(`johanna.korhonen.cc`)" + - "traefik.http.routers.wordpress.tls=true" + - "traefik.http.routers.wordpress.tls.certresolver=http" + - "traefik.http.routers.wordpress.service=wordpress" + - "traefik.docker.network=proxy" + - "traefik.http.services.wordpress.loadbalancer.server.port=80" + + mariadb-wordpress: + image: mariadb + container_name: mariadb-wordpress + volumes: + - /docker/wordpress/mariadb:/var/lib/mysql + restart: always + networks: + - wordpress + environment: + - MYSQL_ROOT_PASSWORD=oT8Veu3Vre4ohj3E + - MYSQL_DATABASE=wordpress + - MYSQL_USER=wordpress + - MYSQL_PASSWORD=wordpress + +networks: + proxy: + external: true + wordpress: + external: false From 082e1cfe0d30cb3eecc1c1e9b48a8077d023f7ea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 30 Jan 2021 12:18:54 +0200 Subject: [PATCH 0641/2667] Update mko-laptop files --- config.yaml | 17 ++--------------- dotdrop | 2 +- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/config.yaml b/config.yaml index 09c49dec..c2186244 100644 --- a/config.yaml +++ b/config.yaml @@ -243,21 +243,8 @@ profiles: - terminal - Pacman mko-laptop: - dotfiles: - - f_nvimpager - - f_hushlogin - - f_ripgrep_ignore - - f_ranger_commands.py - - f_rtv.cfg - - f_mailcap - - d_zsh - - f_zshrc - - f_tmux.conf - - f_ranger.conf - - d_nvim_config - - f_init.vim - - f_coc-settings.json - - f_alacritty.yml + include: + - terminal Edoras: include: - terminal diff --git a/dotdrop b/dotdrop index 39d52a2c..900f705b 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 39d52a2c8042d250f0258b1135d7d94e37a14e8f +Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 From 7bd5b0b9e71faec67bce73c515dcb2d7fc362698 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 30 Jan 2021 12:18:54 +0200 Subject: [PATCH 0642/2667] Update mko-laptop files --- config.yaml | 17 ++--------------- dotdrop | 2 +- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/config.yaml b/config.yaml index 09c49dec..c2186244 100644 --- a/config.yaml +++ b/config.yaml @@ -243,21 +243,8 @@ profiles: - terminal - Pacman mko-laptop: - dotfiles: - - f_nvimpager - - f_hushlogin - - f_ripgrep_ignore - - f_ranger_commands.py - - f_rtv.cfg - - f_mailcap - - d_zsh - - f_zshrc - - f_tmux.conf - - f_ranger.conf - - d_nvim_config - - f_init.vim - - f_coc-settings.json - - f_alacritty.yml + include: + - terminal Edoras: include: - terminal diff --git a/dotdrop b/dotdrop index 39d52a2c..900f705b 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 39d52a2c8042d250f0258b1135d7d94e37a14e8f +Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 From cc813a34b65d2d3bcffe3da6a39ee8cc7c11f3fe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Feb 2021 22:05:52 +0200 Subject: [PATCH 0643/2667] Mount picons to tvheadend --- docker/tvheadend/docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 583667f1..73ceb00a 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -10,6 +10,7 @@ services: volumes: - /docker/tvheadend:/config - /mnt/Storage/Media/PVR:/recordings + - /mnt/Storage/picons:/picons - /etc/localtime:/etc/localtime:ro ports: - 9982:9982 From 1ea8ff0cdd91cda853388dc17008dc28b8f7738c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Feb 2021 22:05:52 +0200 Subject: [PATCH 0644/2667] Mount picons to tvheadend --- docker/tvheadend/docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 583667f1..73ceb00a 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -10,6 +10,7 @@ services: volumes: - /docker/tvheadend:/config - /mnt/Storage/Media/PVR:/recordings + - /mnt/Storage/picons:/picons - /etc/localtime:/etc/localtime:ro ports: - 9982:9982 From d89d01b4952a7229a80548832b34a193ce18b117 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 10 Feb 2021 17:59:26 +0200 Subject: [PATCH 0645/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 900f705b..06842103 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 +Subproject commit 06842103672ad8f394b39e5fea2c1ab4442c1f44 From 776945ac7009b96f5490738f10161617f2547dca Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 10 Feb 2021 17:59:26 +0200 Subject: [PATCH 0646/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 900f705b..06842103 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 +Subproject commit 06842103672ad8f394b39e5fea2c1ab4442c1f44 From 371ef1c8f193ae13420538df724bb9361a661270 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 11 Feb 2021 17:24:26 +0200 Subject: [PATCH 0647/2667] Open tvheadend port again --- docker/tvheadend/docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 73ceb00a..d4e4acd3 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -13,6 +13,7 @@ services: - /mnt/Storage/picons:/picons - /etc/localtime:/etc/localtime:ro ports: + - 9981:9981 - 9982:9982 devices: - /dev/dri:/dev/dri #hardware acceleration From 0632f9e75e1ccae82f36805f0c544856db816ee4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 11 Feb 2021 17:24:26 +0200 Subject: [PATCH 0648/2667] Open tvheadend port again --- docker/tvheadend/docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 73ceb00a..d4e4acd3 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -13,6 +13,7 @@ services: - /mnt/Storage/picons:/picons - /etc/localtime:/etc/localtime:ro ports: + - 9981:9981 - 9982:9982 devices: - /dev/dri:/dev/dri #hardware acceleration From a4320027db3f44b60db4fde7b2ca303b07fbbd2b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 11 Feb 2021 17:25:18 +0200 Subject: [PATCH 0649/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 06842103..39d52a2c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 06842103672ad8f394b39e5fea2c1ab4442c1f44 +Subproject commit 39d52a2c8042d250f0258b1135d7d94e37a14e8f From 977bf2de1d1c7c2ee12a508d242bff709e73555c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 11 Feb 2021 17:25:18 +0200 Subject: [PATCH 0650/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 06842103..39d52a2c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 06842103672ad8f394b39e5fea2c1ab4442c1f44 +Subproject commit 39d52a2c8042d250f0258b1135d7d94e37a14e8f From 49442587e07cadf7b6c03576902a121c99f38f5d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 12 Feb 2021 19:06:24 +0200 Subject: [PATCH 0651/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 39d52a2c..06842103 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 39d52a2c8042d250f0258b1135d7d94e37a14e8f +Subproject commit 06842103672ad8f394b39e5fea2c1ab4442c1f44 From 13f7c3dd4d0f7dbdb55e909b7becbeeba99c584d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 12 Feb 2021 19:06:24 +0200 Subject: [PATCH 0652/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 39d52a2c..06842103 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 39d52a2c8042d250f0258b1135d7d94e37a14e8f +Subproject commit 06842103672ad8f394b39e5fea2c1ab4442c1f44 From 6bf2c1cafc2b5d68e32c72b5582ab94108d9a6e8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 12 Feb 2021 19:06:35 +0200 Subject: [PATCH 0653/2667] Use mpv input-ipc instead of input-file on mpvqueue script Fixes #3 --- scripts/media/mpvqueue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/media/mpvqueue b/scripts/media/mpvqueue index 81e40f41..5a84bc64 100755 --- a/scripts/media/mpvqueue +++ b/scripts/media/mpvqueue @@ -1,23 +1,23 @@ #!/usr/bin/env bash -MPVPIPE=/tmp/mpvqueue.playlist - notify="notify-send -i mpv -a mpv" url="$1" +# NOTE: You need to configure mpv to +# enable ipc server on this path (see my mpv config for an example) +MPVSOCKET="/tmp/mpvsocket" + # See if MPV is already running if [ -z "$(pidof mpv)" ]; then # mpv is not running - # remove fifo - rm -f $MPVPIPE && mkfifo $MPVPIPE # pause other players playerctl pause # start mpv - /usr/bin/mpv --no-terminal --input-file="${MPVPIPE}" "$url" & disown + /usr/bin/mpv --no-terminal "$url" & disown - # Wait for mpv to be up before moving on to adding anything else to playlist + # Wait for mpv to be up before adding anything else to playlist while [ -z "$(pidof mpv)" ]; do sleep 1 done @@ -26,5 +26,5 @@ if [ -z "$(pidof mpv)" ]; then else # mpv is running, so add stuff to playlist $notify "Adding $url" - echo "loadfile \"$url\" append-play" >> "${MPVPIPE}" + echo "{\"command\": [\"loadfile\", \"$url\", \"append\"]}" | socat - /tmp/mpvsocket fi From 6fe89e101667619e371d09960425c44b028d0af9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 12 Feb 2021 19:06:35 +0200 Subject: [PATCH 0654/2667] Use mpv input-ipc instead of input-file on mpvqueue script Fixes #3 --- scripts/media/mpvqueue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/media/mpvqueue b/scripts/media/mpvqueue index 81e40f41..5a84bc64 100755 --- a/scripts/media/mpvqueue +++ b/scripts/media/mpvqueue @@ -1,23 +1,23 @@ #!/usr/bin/env bash -MPVPIPE=/tmp/mpvqueue.playlist - notify="notify-send -i mpv -a mpv" url="$1" +# NOTE: You need to configure mpv to +# enable ipc server on this path (see my mpv config for an example) +MPVSOCKET="/tmp/mpvsocket" + # See if MPV is already running if [ -z "$(pidof mpv)" ]; then # mpv is not running - # remove fifo - rm -f $MPVPIPE && mkfifo $MPVPIPE # pause other players playerctl pause # start mpv - /usr/bin/mpv --no-terminal --input-file="${MPVPIPE}" "$url" & disown + /usr/bin/mpv --no-terminal "$url" & disown - # Wait for mpv to be up before moving on to adding anything else to playlist + # Wait for mpv to be up before adding anything else to playlist while [ -z "$(pidof mpv)" ]; do sleep 1 done @@ -26,5 +26,5 @@ if [ -z "$(pidof mpv)" ]; then else # mpv is running, so add stuff to playlist $notify "Adding $url" - echo "loadfile \"$url\" append-play" >> "${MPVPIPE}" + echo "{\"command\": [\"loadfile\", \"$url\", \"append\"]}" | socat - /tmp/mpvsocket fi From 9f08bbea78bd0767dfdfd57f1704394a532f3771 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 15 Feb 2021 17:06:27 +0200 Subject: [PATCH 0655/2667] Don't load mpris plugin in config Fixes #4. Apparently the AUR package has been updated to load the plugin automatically --- home/.config/mpv/mpv.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index 2a3f77ed..be2d89c7 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -21,10 +21,8 @@ audio-pitch-correction=yes # automatically insert scaletempo when playing with h replaygain=track ############# -# Plugins/misc # +# misc # ############# -# Mpris plugin -script=/usr/lib/mpv/mpris.so # Start ipc server input-ipc-server=/tmp/mpvsocket From 24dd62e0aa4300fb4d0d9914b966fd2356eb84f8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 15 Feb 2021 17:06:27 +0200 Subject: [PATCH 0656/2667] Don't load mpris plugin in config Fixes #4. Apparently the AUR package has been updated to load the plugin automatically --- home/.config/mpv/mpv.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index 2a3f77ed..be2d89c7 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -21,10 +21,8 @@ audio-pitch-correction=yes # automatically insert scaletempo when playing with h replaygain=track ############# -# Plugins/misc # +# misc # ############# -# Mpris plugin -script=/usr/lib/mpv/mpris.so # Start ipc server input-ipc-server=/tmp/mpvsocket From c7055c751a393fdb7b0cf54f2f185e2066ab7b93 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 17:47:10 +0200 Subject: [PATCH 0657/2667] Switch from systemd-boot to efistub --- config-root.yaml | 9 --------- efistub/arch.efi | 12 ++++++++++++ efistub/lts.efi | 12 ++++++++++++ {home/.EFISTUB => efistub}/update.sh | 2 +- home/.EFISTUB/01-arch.efi | 12 ------------ home/.EFISTUB/02-ck.efi | 12 ------------ home/.EFISTUB/03-lts.efi | 12 ------------ root/boot/loader/entries/arch-lts.conf | 5 ----- root/boot/loader/entries/kodi.conf | 5 ----- 9 files changed, 25 insertions(+), 56 deletions(-) create mode 100755 efistub/arch.efi create mode 100755 efistub/lts.efi rename {home/.EFISTUB => efistub}/update.sh (85%) delete mode 100755 home/.EFISTUB/01-arch.efi delete mode 100755 home/.EFISTUB/02-ck.efi delete mode 100755 home/.EFISTUB/03-lts.efi delete mode 100755 root/boot/loader/entries/arch-lts.conf delete mode 100755 root/boot/loader/entries/kodi.conf diff --git a/config-root.yaml b/config-root.yaml index 714389bd..f2e0485d 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -98,15 +98,6 @@ dotfiles: f_cpupower: src: etc/default/cpupower dst: /etc/default/cpupower - f_arch.conf: - src: boot/loader/entries/arch.conf - dst: /boot/loader/entries/arch.conf - f_arch-lts.conf: - src: boot/loader/entries/arch-lts.conf - dst: /boot/loader/entries/arch-lts.conf - f_kodi.conf: - src: boot/loader/entries/kodi.conf - dst: /boot/loader/entries/kodi.conf f_pacserve.service.conf: src: etc/pacserve/pacserve.service.conf dst: /etc/pacserve/pacserve.service.conf diff --git a/efistub/arch.efi b/efistub/arch.efi new file mode 100755 index 00000000..46c60cdf --- /dev/null +++ b/efistub/arch.efi @@ -0,0 +1,12 @@ +#/bin/bash +# vim:ft=sh + +sudo efibootmgr \ + --disk /dev/sda \ + --part 1 \ + --create \ + --quiet \ + --remove-dups \ + --label "Arch Linux" \ + --loader /vmlinuz-linux \ + --unicode 'rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' diff --git a/efistub/lts.efi b/efistub/lts.efi new file mode 100755 index 00000000..9a77a197 --- /dev/null +++ b/efistub/lts.efi @@ -0,0 +1,12 @@ +#!/bin/bash +# vim:ft=sh + +sudo efibootmgr \ + --disk /dev/sda \ + --part 1 \ + --create \ + --quiet \ + --remove-dups \ + --label "Arch Linux LTS" \ + --loader /vmlinuz-linux-lts \ + --unicode 'rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' diff --git a/home/.EFISTUB/update.sh b/efistub/update.sh similarity index 85% rename from home/.EFISTUB/update.sh rename to efistub/update.sh index 07c1dba8..19a17d85 100755 --- a/home/.EFISTUB/update.sh +++ b/efistub/update.sh @@ -11,4 +11,4 @@ for bootscript in *.efi; do done # set bootorder -sudo efibootmgr --bootorder 0000,0001,0002 +sudo efibootmgr --bootorder 0000,0001 diff --git a/home/.EFISTUB/01-arch.efi b/home/.EFISTUB/01-arch.efi deleted file mode 100755 index a5f67c2b..00000000 --- a/home/.EFISTUB/01-arch.efi +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# vim:ft=sh - -sudo efibootmgr \ - --disk /dev/sda \ - --part 1 \ - --create \ - --quiet \ - --remove-dups \ - --label "Arch Linux" \ - --loader /vmlinuz-linux \ - --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=3 vga=current processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0' diff --git a/home/.EFISTUB/02-ck.efi b/home/.EFISTUB/02-ck.efi deleted file mode 100755 index b387bad3..00000000 --- a/home/.EFISTUB/02-ck.efi +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# vim:ft=sh - -sudo efibootmgr \ - --disk /dev/sda \ - --part 1 \ - --create \ - --quiet \ - --remove-dups \ - --label "Arch Linux CK" \ - --loader /vmlinuz-linux-ck-zen \ - --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=3 vga=current vt.global_cursor_default=0 processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0' diff --git a/home/.EFISTUB/03-lts.efi b/home/.EFISTUB/03-lts.efi deleted file mode 100755 index fd74e762..00000000 --- a/home/.EFISTUB/03-lts.efi +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# vim:ft=sh - -sudo efibootmgr \ - --disk /dev/sda \ - --part 1 \ - --create \ - --quiet \ - --remove-dups \ - --label "Arch Linux LTS" \ - --loader /vmlinuz-linux-lts \ - --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=3 vga=current vt.global_cursor_default=0 processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0' diff --git a/root/boot/loader/entries/arch-lts.conf b/root/boot/loader/entries/arch-lts.conf deleted file mode 100755 index 1df835e8..00000000 --- a/root/boot/loader/entries/arch-lts.conf +++ /dev/null @@ -1,5 +0,0 @@ -title Arch Linux LTS -initrd /amd-ucode.img -initrd /initramfs-linux-lts.img -linux /vmlinuz-linux-lts -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo diff --git a/root/boot/loader/entries/kodi.conf b/root/boot/loader/entries/kodi.conf deleted file mode 100755 index 5a86d927..00000000 --- a/root/boot/loader/entries/kodi.conf +++ /dev/null @@ -1,5 +0,0 @@ -title Kodi -initrd /amd-ucode.img -initrd /initramfs-linux.img -linux /vmlinuz-linux -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait video=eDP-1:d video=1920x1080@60 From 2775d4183059998f7793cb5d963595fd34d20959 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 17:47:10 +0200 Subject: [PATCH 0658/2667] Switch from systemd-boot to efistub --- config-root.yaml | 9 --------- efistub/arch.efi | 12 ++++++++++++ efistub/lts.efi | 12 ++++++++++++ {home/.EFISTUB => efistub}/update.sh | 2 +- home/.EFISTUB/01-arch.efi | 12 ------------ home/.EFISTUB/02-ck.efi | 12 ------------ home/.EFISTUB/03-lts.efi | 12 ------------ root/boot/loader/entries/arch-lts.conf | 5 ----- root/boot/loader/entries/kodi.conf | 5 ----- 9 files changed, 25 insertions(+), 56 deletions(-) create mode 100755 efistub/arch.efi create mode 100755 efistub/lts.efi rename {home/.EFISTUB => efistub}/update.sh (85%) delete mode 100755 home/.EFISTUB/01-arch.efi delete mode 100755 home/.EFISTUB/02-ck.efi delete mode 100755 home/.EFISTUB/03-lts.efi delete mode 100755 root/boot/loader/entries/arch-lts.conf delete mode 100755 root/boot/loader/entries/kodi.conf diff --git a/config-root.yaml b/config-root.yaml index 714389bd..f2e0485d 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -98,15 +98,6 @@ dotfiles: f_cpupower: src: etc/default/cpupower dst: /etc/default/cpupower - f_arch.conf: - src: boot/loader/entries/arch.conf - dst: /boot/loader/entries/arch.conf - f_arch-lts.conf: - src: boot/loader/entries/arch-lts.conf - dst: /boot/loader/entries/arch-lts.conf - f_kodi.conf: - src: boot/loader/entries/kodi.conf - dst: /boot/loader/entries/kodi.conf f_pacserve.service.conf: src: etc/pacserve/pacserve.service.conf dst: /etc/pacserve/pacserve.service.conf diff --git a/efistub/arch.efi b/efistub/arch.efi new file mode 100755 index 00000000..46c60cdf --- /dev/null +++ b/efistub/arch.efi @@ -0,0 +1,12 @@ +#/bin/bash +# vim:ft=sh + +sudo efibootmgr \ + --disk /dev/sda \ + --part 1 \ + --create \ + --quiet \ + --remove-dups \ + --label "Arch Linux" \ + --loader /vmlinuz-linux \ + --unicode 'rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' diff --git a/efistub/lts.efi b/efistub/lts.efi new file mode 100755 index 00000000..9a77a197 --- /dev/null +++ b/efistub/lts.efi @@ -0,0 +1,12 @@ +#!/bin/bash +# vim:ft=sh + +sudo efibootmgr \ + --disk /dev/sda \ + --part 1 \ + --create \ + --quiet \ + --remove-dups \ + --label "Arch Linux LTS" \ + --loader /vmlinuz-linux-lts \ + --unicode 'rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' diff --git a/home/.EFISTUB/update.sh b/efistub/update.sh similarity index 85% rename from home/.EFISTUB/update.sh rename to efistub/update.sh index 07c1dba8..19a17d85 100755 --- a/home/.EFISTUB/update.sh +++ b/efistub/update.sh @@ -11,4 +11,4 @@ for bootscript in *.efi; do done # set bootorder -sudo efibootmgr --bootorder 0000,0001,0002 +sudo efibootmgr --bootorder 0000,0001 diff --git a/home/.EFISTUB/01-arch.efi b/home/.EFISTUB/01-arch.efi deleted file mode 100755 index a5f67c2b..00000000 --- a/home/.EFISTUB/01-arch.efi +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# vim:ft=sh - -sudo efibootmgr \ - --disk /dev/sda \ - --part 1 \ - --create \ - --quiet \ - --remove-dups \ - --label "Arch Linux" \ - --loader /vmlinuz-linux \ - --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=3 vga=current processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0' diff --git a/home/.EFISTUB/02-ck.efi b/home/.EFISTUB/02-ck.efi deleted file mode 100755 index b387bad3..00000000 --- a/home/.EFISTUB/02-ck.efi +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# vim:ft=sh - -sudo efibootmgr \ - --disk /dev/sda \ - --part 1 \ - --create \ - --quiet \ - --remove-dups \ - --label "Arch Linux CK" \ - --loader /vmlinuz-linux-ck-zen \ - --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=3 vga=current vt.global_cursor_default=0 processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0' diff --git a/home/.EFISTUB/03-lts.efi b/home/.EFISTUB/03-lts.efi deleted file mode 100755 index fd74e762..00000000 --- a/home/.EFISTUB/03-lts.efi +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# vim:ft=sh - -sudo efibootmgr \ - --disk /dev/sda \ - --part 1 \ - --create \ - --quiet \ - --remove-dups \ - --label "Arch Linux LTS" \ - --loader /vmlinuz-linux-lts \ - --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=3 vga=current vt.global_cursor_default=0 processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0' diff --git a/root/boot/loader/entries/arch-lts.conf b/root/boot/loader/entries/arch-lts.conf deleted file mode 100755 index 1df835e8..00000000 --- a/root/boot/loader/entries/arch-lts.conf +++ /dev/null @@ -1,5 +0,0 @@ -title Arch Linux LTS -initrd /amd-ucode.img -initrd /initramfs-linux-lts.img -linux /vmlinuz-linux-lts -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo diff --git a/root/boot/loader/entries/kodi.conf b/root/boot/loader/entries/kodi.conf deleted file mode 100755 index 5a86d927..00000000 --- a/root/boot/loader/entries/kodi.conf +++ /dev/null @@ -1,5 +0,0 @@ -title Kodi -initrd /amd-ucode.img -initrd /initramfs-linux.img -linux /vmlinuz-linux -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait video=eDP-1:d video=1920x1080@60 From 9dd9e7185ee4e3807b74bebdbfe490e0c9dda4e8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 18:18:09 +0200 Subject: [PATCH 0659/2667] Switch to busybox init hooks from systemd --- efistub/arch.efi | 2 +- root/etc/mkinitcpio.conf | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/efistub/arch.efi b/efistub/arch.efi index 46c60cdf..1f0d26a5 100755 --- a/efistub/arch.efi +++ b/efistub/arch.efi @@ -9,4 +9,4 @@ sudo efibootmgr \ --remove-dups \ --label "Arch Linux" \ --loader /vmlinuz-linux \ - --unicode 'rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' + --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 12d768ea..1c602676 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -1,8 +1,10 @@ MODULES=(amdgpu) FILES=() + {%@@ if profile == "Mirkwood" @@%} BINARIES=("/usr/bin/btrfs") -HOOKS=(base autodetect modconf block filesystems keyboard fsck systemd sd-colors sd-vconsole sd-encrypt) +HOOKS=(colors consolefont welcomemessage base udev autodetect modconf block filesystems btrfs keyboard encrypt fsck) + {%@@ else @@%} BINARIES=() HOOKS=(colors consolefont base udev autodetect modconf block filesystems keyboard fsck) From c31598ccb01c5c563b306b483b552c887c514e19 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 18:18:09 +0200 Subject: [PATCH 0660/2667] Switch to busybox init hooks from systemd --- efistub/arch.efi | 2 +- root/etc/mkinitcpio.conf | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/efistub/arch.efi b/efistub/arch.efi index 46c60cdf..1f0d26a5 100755 --- a/efistub/arch.efi +++ b/efistub/arch.efi @@ -9,4 +9,4 @@ sudo efibootmgr \ --remove-dups \ --label "Arch Linux" \ --loader /vmlinuz-linux \ - --unicode 'rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' + --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 12d768ea..1c602676 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -1,8 +1,10 @@ MODULES=(amdgpu) FILES=() + {%@@ if profile == "Mirkwood" @@%} BINARIES=("/usr/bin/btrfs") -HOOKS=(base autodetect modconf block filesystems keyboard fsck systemd sd-colors sd-vconsole sd-encrypt) +HOOKS=(colors consolefont welcomemessage base udev autodetect modconf block filesystems btrfs keyboard encrypt fsck) + {%@@ else @@%} BINARIES=() HOOKS=(colors consolefont base udev autodetect modconf block filesystems keyboard fsck) From f9ab29e00357a9b903279d9bf7d3b137ede9d3f8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 18:29:40 +0200 Subject: [PATCH 0661/2667] Update dotdrop and fix root config --- config-root.yaml | 3 --- dotdrop | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index f2e0485d..d1430269 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -134,9 +134,6 @@ profiles: - f_20-quiet-printk.conf - f_system.conf - f_cpupower - - f_arch.conf - - f_arch-lts.conf - - f_kodi.conf include: - Locale - Pacman diff --git a/dotdrop b/dotdrop index 06842103..f0da6a6f 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 06842103672ad8f394b39e5fea2c1ab4442c1f44 +Subproject commit f0da6a6f9c59892e9f820443d235350ef0b2e8fd From 1c345857bf0fb0367dca10da90765145e6c0a801 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 18:29:40 +0200 Subject: [PATCH 0662/2667] Update dotdrop and fix root config --- config-root.yaml | 3 --- dotdrop | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index f2e0485d..d1430269 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -134,9 +134,6 @@ profiles: - f_20-quiet-printk.conf - f_system.conf - f_cpupower - - f_arch.conf - - f_arch-lts.conf - - f_kodi.conf include: - Locale - Pacman diff --git a/dotdrop b/dotdrop index 06842103..f0da6a6f 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 06842103672ad8f394b39e5fea2c1ab4442c1f44 +Subproject commit f0da6a6f9c59892e9f820443d235350ef0b2e8fd From 99f69a558d6aa7bd8079a9dc5f5a60e6f7aa7c01 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 18:54:26 +0200 Subject: [PATCH 0663/2667] Update systemd-boot config for future reference --- root/boot/loader/README.md | 2 ++ root/boot/loader/entries/arch-busybox.conf | 5 +++++ root/boot/loader/entries/{arch.conf => arch-systemd.conf} | 0 root/boot/loader/loader.conf | 4 ++-- 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 root/boot/loader/README.md create mode 100755 root/boot/loader/entries/arch-busybox.conf rename root/boot/loader/entries/{arch.conf => arch-systemd.conf} (100%) diff --git a/root/boot/loader/README.md b/root/boot/loader/README.md new file mode 100644 index 00000000..f0138427 --- /dev/null +++ b/root/boot/loader/README.md @@ -0,0 +1,2 @@ +I don't use systemd-boot on my main system anymore but this is here for reference +when I'm setting up new systems. diff --git a/root/boot/loader/entries/arch-busybox.conf b/root/boot/loader/entries/arch-busybox.conf new file mode 100755 index 00000000..db073af3 --- /dev/null +++ b/root/boot/loader/entries/arch-busybox.conf @@ -0,0 +1,5 @@ +title Arch Linux +initrd /amd-ucode.img +initrd /initramfs-linux.img +linux /vmlinuz-linux +options cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo diff --git a/root/boot/loader/entries/arch.conf b/root/boot/loader/entries/arch-systemd.conf similarity index 100% rename from root/boot/loader/entries/arch.conf rename to root/boot/loader/entries/arch-systemd.conf diff --git a/root/boot/loader/loader.conf b/root/boot/loader/loader.conf index 49951610..62bce553 100755 --- a/root/boot/loader/loader.conf +++ b/root/boot/loader/loader.conf @@ -1,3 +1,3 @@ -default arch +default arch-busybox timeout 0 -editor 1 +editor 0 From bc3e5550742160848305beefbd5e7f6745928a3d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 18:54:26 +0200 Subject: [PATCH 0664/2667] Update systemd-boot config for future reference --- root/boot/loader/README.md | 2 ++ root/boot/loader/entries/arch-busybox.conf | 5 +++++ root/boot/loader/entries/{arch.conf => arch-systemd.conf} | 0 root/boot/loader/loader.conf | 4 ++-- 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 root/boot/loader/README.md create mode 100755 root/boot/loader/entries/arch-busybox.conf rename root/boot/loader/entries/{arch.conf => arch-systemd.conf} (100%) diff --git a/root/boot/loader/README.md b/root/boot/loader/README.md new file mode 100644 index 00000000..f0138427 --- /dev/null +++ b/root/boot/loader/README.md @@ -0,0 +1,2 @@ +I don't use systemd-boot on my main system anymore but this is here for reference +when I'm setting up new systems. diff --git a/root/boot/loader/entries/arch-busybox.conf b/root/boot/loader/entries/arch-busybox.conf new file mode 100755 index 00000000..db073af3 --- /dev/null +++ b/root/boot/loader/entries/arch-busybox.conf @@ -0,0 +1,5 @@ +title Arch Linux +initrd /amd-ucode.img +initrd /initramfs-linux.img +linux /vmlinuz-linux +options cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo diff --git a/root/boot/loader/entries/arch.conf b/root/boot/loader/entries/arch-systemd.conf similarity index 100% rename from root/boot/loader/entries/arch.conf rename to root/boot/loader/entries/arch-systemd.conf diff --git a/root/boot/loader/loader.conf b/root/boot/loader/loader.conf index 49951610..62bce553 100755 --- a/root/boot/loader/loader.conf +++ b/root/boot/loader/loader.conf @@ -1,3 +1,3 @@ -default arch +default arch-busybox timeout 0 -editor 1 +editor 0 From 767c4b6b741fdea38db57cbd86ae4e33d2294682 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 18:54:50 +0200 Subject: [PATCH 0665/2667] Add customized encrypt hook --- config-root.yaml | 80 ++++++++------- root/usr/lib/initcpio/hooks/encrypt | 149 ++++++++++++++++++++++++++++ 2 files changed, 191 insertions(+), 38 deletions(-) create mode 100644 root/usr/lib/initcpio/hooks/encrypt diff --git a/config-root.yaml b/config-root.yaml index d1430269..05d3c267 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -101,61 +101,65 @@ dotfiles: f_pacserve.service.conf: src: etc/pacserve/pacserve.service.conf dst: /etc/pacserve/pacserve.service.conf + f_encrypt: + src: usr/lib/initcpio/hooks/encrypt + dst: /usr/lib/initcpio/hooks/encrypt profiles: Network: dotfiles: - - d_network - - f_networkd.conf + - d_network + - f_networkd.conf Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf + - f_pacman.conf + - f_pacserve.service.conf Mirkwood: dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - f_adb.service - - f_bluetooth.conf - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_99-lowbat.rules - - f_ignore - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_cpupower + - f_getty.conf + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - f_adb.service + - f_bluetooth.conf + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_99-lowbat.rules + - f_ignore + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf + - f_cpupower + - f_encrypt include: - - Locale - - Pacman - - Network + - Locale + - Pacman + - Network Moria: include: - - Locale - - Pacman - - Network + - Locale + - Pacman + - Network dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_cpupower + - f_sshd_config + - f_99-sysctl.conf + - f_cpupower Gondor: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config + - f_sshd_config localhost: include: - - Locale + - Locale Edoras: include: - - Pacman + - Pacman diff --git a/root/usr/lib/initcpio/hooks/encrypt b/root/usr/lib/initcpio/hooks/encrypt new file mode 100644 index 00000000..a25c1f60 --- /dev/null +++ b/root/usr/lib/initcpio/hooks/encrypt @@ -0,0 +1,149 @@ +#!/usr/bin/ash + +run_hook() { + modprobe -a -q dm-crypt >/dev/null 2>&1 + [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" + + # Get keyfile if specified + ckeyfile="/crypto_keyfile.bin" + if [ -n "$cryptkey" ]; then + IFS=: read ckdev ckarg1 ckarg2 </dev/null 2>&1 + umount /ckey + ;; + *) + # Read raw data from the block device + # ckarg1 is numeric: ckarg1=offset, ckarg2=length + dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1 + ;; + esac + fi + [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." + fi + + if [ -n "${cryptdevice}" ]; then + DEPRECATED_CRYPT=0 + IFS=: read cryptdev cryptname cryptoptions <&2 + ;; + esac + done + set +f + IFS="$OLDIFS" + unset OLDIFS + + if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then + if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + dopassphrase=1 + # If keyfile exists, try to use that + if [ -f ${ckeyfile} ]; then + if eval cryptsetup --key-file ${ckeyfile} open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then + dopassphrase=0 + else + echo "Invalid keyfile. Reverting to passphrase." + fi + fi + # Ask for a passphrase + if [ ${dopassphrase} -gt 0 ]; then + echo "" + echo "Enter password to decrypt disk:" + + #loop until we get a real password + while ! eval cryptsetup open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do + sleep 2; + done + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" + fi + else + err "Password succeeded, but ${cryptname} creation failed, aborting..." + return 1 + fi + elif [ -n "${crypto}" ]; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + msg "Non-LUKS encrypted device found..." + if echo "$crypto" | awk -F: '{ exit(NF == 5) }'; then + err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" + err "Non-LUKS decryption not attempted..." + return 1 + fi + exe="cryptsetup open --type plain $resolved $cryptname $cryptargs" + IFS=: read c_hash c_cipher c_keysize c_offset c_skip < Date: Thu, 18 Feb 2021 18:54:50 +0200 Subject: [PATCH 0666/2667] Add customized encrypt hook --- config-root.yaml | 80 ++++++++------- root/usr/lib/initcpio/hooks/encrypt | 149 ++++++++++++++++++++++++++++ 2 files changed, 191 insertions(+), 38 deletions(-) create mode 100644 root/usr/lib/initcpio/hooks/encrypt diff --git a/config-root.yaml b/config-root.yaml index d1430269..05d3c267 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -101,61 +101,65 @@ dotfiles: f_pacserve.service.conf: src: etc/pacserve/pacserve.service.conf dst: /etc/pacserve/pacserve.service.conf + f_encrypt: + src: usr/lib/initcpio/hooks/encrypt + dst: /usr/lib/initcpio/hooks/encrypt profiles: Network: dotfiles: - - d_network - - f_networkd.conf + - d_network + - f_networkd.conf Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf + - f_pacman.conf + - f_pacserve.service.conf Mirkwood: dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - f_adb.service - - f_bluetooth.conf - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_99-lowbat.rules - - f_ignore - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_cpupower + - f_getty.conf + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - f_adb.service + - f_bluetooth.conf + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_99-lowbat.rules + - f_ignore + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf + - f_cpupower + - f_encrypt include: - - Locale - - Pacman - - Network + - Locale + - Pacman + - Network Moria: include: - - Locale - - Pacman - - Network + - Locale + - Pacman + - Network dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_cpupower + - f_sshd_config + - f_99-sysctl.conf + - f_cpupower Gondor: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config + - f_sshd_config localhost: include: - - Locale + - Locale Edoras: include: - - Pacman + - Pacman diff --git a/root/usr/lib/initcpio/hooks/encrypt b/root/usr/lib/initcpio/hooks/encrypt new file mode 100644 index 00000000..a25c1f60 --- /dev/null +++ b/root/usr/lib/initcpio/hooks/encrypt @@ -0,0 +1,149 @@ +#!/usr/bin/ash + +run_hook() { + modprobe -a -q dm-crypt >/dev/null 2>&1 + [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" + + # Get keyfile if specified + ckeyfile="/crypto_keyfile.bin" + if [ -n "$cryptkey" ]; then + IFS=: read ckdev ckarg1 ckarg2 </dev/null 2>&1 + umount /ckey + ;; + *) + # Read raw data from the block device + # ckarg1 is numeric: ckarg1=offset, ckarg2=length + dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1 + ;; + esac + fi + [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." + fi + + if [ -n "${cryptdevice}" ]; then + DEPRECATED_CRYPT=0 + IFS=: read cryptdev cryptname cryptoptions <&2 + ;; + esac + done + set +f + IFS="$OLDIFS" + unset OLDIFS + + if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then + if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + dopassphrase=1 + # If keyfile exists, try to use that + if [ -f ${ckeyfile} ]; then + if eval cryptsetup --key-file ${ckeyfile} open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then + dopassphrase=0 + else + echo "Invalid keyfile. Reverting to passphrase." + fi + fi + # Ask for a passphrase + if [ ${dopassphrase} -gt 0 ]; then + echo "" + echo "Enter password to decrypt disk:" + + #loop until we get a real password + while ! eval cryptsetup open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do + sleep 2; + done + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" + fi + else + err "Password succeeded, but ${cryptname} creation failed, aborting..." + return 1 + fi + elif [ -n "${crypto}" ]; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + msg "Non-LUKS encrypted device found..." + if echo "$crypto" | awk -F: '{ exit(NF == 5) }'; then + err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" + err "Non-LUKS decryption not attempted..." + return 1 + fi + exe="cryptsetup open --type plain $resolved $cryptname $cryptargs" + IFS=: read c_hash c_cipher c_keysize c_offset c_skip < Date: Thu, 18 Feb 2021 18:57:15 +0200 Subject: [PATCH 0667/2667] Add initrd to efistub configs --- efistub/arch.efi | 2 +- efistub/lts.efi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/efistub/arch.efi b/efistub/arch.efi index 1f0d26a5..c0932d67 100755 --- a/efistub/arch.efi +++ b/efistub/arch.efi @@ -9,4 +9,4 @@ sudo efibootmgr \ --remove-dups \ --label "Arch Linux" \ --loader /vmlinuz-linux \ - --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' + --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' diff --git a/efistub/lts.efi b/efistub/lts.efi index 9a77a197..9a9d0613 100755 --- a/efistub/lts.efi +++ b/efistub/lts.efi @@ -9,4 +9,4 @@ sudo efibootmgr \ --remove-dups \ --label "Arch Linux LTS" \ --loader /vmlinuz-linux-lts \ - --unicode 'rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' + --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux-lts.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' From f96ce754bcf6f74059a781627ebe33d0e48bd414 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 18:57:15 +0200 Subject: [PATCH 0668/2667] Add initrd to efistub configs --- efistub/arch.efi | 2 +- efistub/lts.efi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/efistub/arch.efi b/efistub/arch.efi index 1f0d26a5..c0932d67 100755 --- a/efistub/arch.efi +++ b/efistub/arch.efi @@ -9,4 +9,4 @@ sudo efibootmgr \ --remove-dups \ --label "Arch Linux" \ --loader /vmlinuz-linux \ - --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' + --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' diff --git a/efistub/lts.efi b/efistub/lts.efi index 9a77a197..9a9d0613 100755 --- a/efistub/lts.efi +++ b/efistub/lts.efi @@ -9,4 +9,4 @@ sudo efibootmgr \ --remove-dups \ --label "Arch Linux LTS" \ --loader /vmlinuz-linux-lts \ - --unicode 'rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' + --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux-lts.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' From e03a96f683ab848e09dec83656ce89018f430a95 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 19:05:53 +0200 Subject: [PATCH 0669/2667] Remove custom encrypt initcpio hook --- config-root.yaml | 4 - root/usr/lib/initcpio/hooks/encrypt | 149 ---------------------------- 2 files changed, 153 deletions(-) delete mode 100644 root/usr/lib/initcpio/hooks/encrypt diff --git a/config-root.yaml b/config-root.yaml index 05d3c267..0b292e37 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -101,9 +101,6 @@ dotfiles: f_pacserve.service.conf: src: etc/pacserve/pacserve.service.conf dst: /etc/pacserve/pacserve.service.conf - f_encrypt: - src: usr/lib/initcpio/hooks/encrypt - dst: /usr/lib/initcpio/hooks/encrypt profiles: Network: dotfiles: @@ -137,7 +134,6 @@ profiles: - f_20-quiet-printk.conf - f_system.conf - f_cpupower - - f_encrypt include: - Locale - Pacman diff --git a/root/usr/lib/initcpio/hooks/encrypt b/root/usr/lib/initcpio/hooks/encrypt deleted file mode 100644 index a25c1f60..00000000 --- a/root/usr/lib/initcpio/hooks/encrypt +++ /dev/null @@ -1,149 +0,0 @@ -#!/usr/bin/ash - -run_hook() { - modprobe -a -q dm-crypt >/dev/null 2>&1 - [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" - - # Get keyfile if specified - ckeyfile="/crypto_keyfile.bin" - if [ -n "$cryptkey" ]; then - IFS=: read ckdev ckarg1 ckarg2 </dev/null 2>&1 - umount /ckey - ;; - *) - # Read raw data from the block device - # ckarg1 is numeric: ckarg1=offset, ckarg2=length - dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1 - ;; - esac - fi - [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." - fi - - if [ -n "${cryptdevice}" ]; then - DEPRECATED_CRYPT=0 - IFS=: read cryptdev cryptname cryptoptions <&2 - ;; - esac - done - set +f - IFS="$OLDIFS" - unset OLDIFS - - if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then - if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then - [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated - dopassphrase=1 - # If keyfile exists, try to use that - if [ -f ${ckeyfile} ]; then - if eval cryptsetup --key-file ${ckeyfile} open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then - dopassphrase=0 - else - echo "Invalid keyfile. Reverting to passphrase." - fi - fi - # Ask for a passphrase - if [ ${dopassphrase} -gt 0 ]; then - echo "" - echo "Enter password to decrypt disk:" - - #loop until we get a real password - while ! eval cryptsetup open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do - sleep 2; - done - fi - if [ -e "/dev/mapper/${cryptname}" ]; then - if [ ${DEPRECATED_CRYPT} -eq 1 ]; then - export root="/dev/mapper/root" - fi - else - err "Password succeeded, but ${cryptname} creation failed, aborting..." - return 1 - fi - elif [ -n "${crypto}" ]; then - [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated - msg "Non-LUKS encrypted device found..." - if echo "$crypto" | awk -F: '{ exit(NF == 5) }'; then - err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" - err "Non-LUKS decryption not attempted..." - return 1 - fi - exe="cryptsetup open --type plain $resolved $cryptname $cryptargs" - IFS=: read c_hash c_cipher c_keysize c_offset c_skip < Date: Thu, 18 Feb 2021 19:05:53 +0200 Subject: [PATCH 0670/2667] Remove custom encrypt initcpio hook --- config-root.yaml | 4 - root/usr/lib/initcpio/hooks/encrypt | 149 ---------------------------- 2 files changed, 153 deletions(-) delete mode 100644 root/usr/lib/initcpio/hooks/encrypt diff --git a/config-root.yaml b/config-root.yaml index 05d3c267..0b292e37 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -101,9 +101,6 @@ dotfiles: f_pacserve.service.conf: src: etc/pacserve/pacserve.service.conf dst: /etc/pacserve/pacserve.service.conf - f_encrypt: - src: usr/lib/initcpio/hooks/encrypt - dst: /usr/lib/initcpio/hooks/encrypt profiles: Network: dotfiles: @@ -137,7 +134,6 @@ profiles: - f_20-quiet-printk.conf - f_system.conf - f_cpupower - - f_encrypt include: - Locale - Pacman diff --git a/root/usr/lib/initcpio/hooks/encrypt b/root/usr/lib/initcpio/hooks/encrypt deleted file mode 100644 index a25c1f60..00000000 --- a/root/usr/lib/initcpio/hooks/encrypt +++ /dev/null @@ -1,149 +0,0 @@ -#!/usr/bin/ash - -run_hook() { - modprobe -a -q dm-crypt >/dev/null 2>&1 - [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" - - # Get keyfile if specified - ckeyfile="/crypto_keyfile.bin" - if [ -n "$cryptkey" ]; then - IFS=: read ckdev ckarg1 ckarg2 </dev/null 2>&1 - umount /ckey - ;; - *) - # Read raw data from the block device - # ckarg1 is numeric: ckarg1=offset, ckarg2=length - dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1 - ;; - esac - fi - [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." - fi - - if [ -n "${cryptdevice}" ]; then - DEPRECATED_CRYPT=0 - IFS=: read cryptdev cryptname cryptoptions <&2 - ;; - esac - done - set +f - IFS="$OLDIFS" - unset OLDIFS - - if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then - if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then - [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated - dopassphrase=1 - # If keyfile exists, try to use that - if [ -f ${ckeyfile} ]; then - if eval cryptsetup --key-file ${ckeyfile} open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then - dopassphrase=0 - else - echo "Invalid keyfile. Reverting to passphrase." - fi - fi - # Ask for a passphrase - if [ ${dopassphrase} -gt 0 ]; then - echo "" - echo "Enter password to decrypt disk:" - - #loop until we get a real password - while ! eval cryptsetup open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do - sleep 2; - done - fi - if [ -e "/dev/mapper/${cryptname}" ]; then - if [ ${DEPRECATED_CRYPT} -eq 1 ]; then - export root="/dev/mapper/root" - fi - else - err "Password succeeded, but ${cryptname} creation failed, aborting..." - return 1 - fi - elif [ -n "${crypto}" ]; then - [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated - msg "Non-LUKS encrypted device found..." - if echo "$crypto" | awk -F: '{ exit(NF == 5) }'; then - err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" - err "Non-LUKS decryption not attempted..." - return 1 - fi - exe="cryptsetup open --type plain $resolved $cryptname $cryptargs" - IFS=: read c_hash c_cipher c_keysize c_offset c_skip < Date: Thu, 18 Feb 2021 19:06:19 +0200 Subject: [PATCH 0671/2667] Use zstd compression for initrd --- root/etc/mkinitcpio.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 1c602676..54c22309 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -1,3 +1,4 @@ +COMPRESSION="zstd" MODULES=(amdgpu) FILES=() From b32eb40b73402344206addefbd676f3eeb4ef1c5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 19:06:19 +0200 Subject: [PATCH 0672/2667] Use zstd compression for initrd --- root/etc/mkinitcpio.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 1c602676..54c22309 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -1,3 +1,4 @@ +COMPRESSION="zstd" MODULES=(amdgpu) FILES=() From 90db3844b209f605c60d7e8641b7a5ad9fcfa0b0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Feb 2021 11:49:51 +0200 Subject: [PATCH 0673/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index f0da6a6f..900f705b 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit f0da6a6f9c59892e9f820443d235350ef0b2e8fd +Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 From 828b889625c02396725b9f19a23135be54eb65a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Feb 2021 11:49:51 +0200 Subject: [PATCH 0674/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index f0da6a6f..900f705b 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit f0da6a6f9c59892e9f820443d235350ef0b2e8fd +Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 From a0c2c2e74d0fa18ed339650d6875fafcfa32772c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Feb 2021 11:49:59 +0200 Subject: [PATCH 0675/2667] Disable laptop screen output when closing lid --- home/.config/sway/conf.d/04-output.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/sway/conf.d/04-output.conf b/home/.config/sway/conf.d/04-output.conf index b6030a4a..0a264714 100644 --- a/home/.config/sway/conf.d/04-output.conf +++ b/home/.config/sway/conf.d/04-output.conf @@ -3,3 +3,7 @@ output * bg $wallpaper fill output eDP-1 position 0 0 output HDMI-A-1 position 1920 0 + +# Disable laptop screen when lid is closed +bindswitch --locked lid:on output $laptop disable +bindswitch --locked lid:off output $laptop enable From 9b68f61d88deae6bcddec7a0212cc9bc80c8969c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Feb 2021 11:49:59 +0200 Subject: [PATCH 0676/2667] Disable laptop screen output when closing lid --- home/.config/sway/conf.d/04-output.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/sway/conf.d/04-output.conf b/home/.config/sway/conf.d/04-output.conf index b6030a4a..0a264714 100644 --- a/home/.config/sway/conf.d/04-output.conf +++ b/home/.config/sway/conf.d/04-output.conf @@ -3,3 +3,7 @@ output * bg $wallpaper fill output eDP-1 position 0 0 output HDMI-A-1 position 1920 0 + +# Disable laptop screen when lid is closed +bindswitch --locked lid:on output $laptop disable +bindswitch --locked lid:off output $laptop enable From 7be4ba1e3e55ad832b6c14aa7758893e7ac69a75 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Feb 2021 11:53:19 +0200 Subject: [PATCH 0677/2667] Fix output name --- home/.config/sway/conf.d/04-output.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/sway/conf.d/04-output.conf b/home/.config/sway/conf.d/04-output.conf index 0a264714..8d701a78 100644 --- a/home/.config/sway/conf.d/04-output.conf +++ b/home/.config/sway/conf.d/04-output.conf @@ -5,5 +5,5 @@ output eDP-1 position 0 0 output HDMI-A-1 position 1920 0 # Disable laptop screen when lid is closed -bindswitch --locked lid:on output $laptop disable -bindswitch --locked lid:off output $laptop enable +bindswitch --locked lid:on output eDP-1 disable +bindswitch --locked lid:off output eDP-1 enable From 798d849e6e21150f99f7621c6a79cc7d78eec6fc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Feb 2021 11:53:19 +0200 Subject: [PATCH 0678/2667] Fix output name --- home/.config/sway/conf.d/04-output.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/sway/conf.d/04-output.conf b/home/.config/sway/conf.d/04-output.conf index 0a264714..8d701a78 100644 --- a/home/.config/sway/conf.d/04-output.conf +++ b/home/.config/sway/conf.d/04-output.conf @@ -5,5 +5,5 @@ output eDP-1 position 0 0 output HDMI-A-1 position 1920 0 # Disable laptop screen when lid is closed -bindswitch --locked lid:on output $laptop disable -bindswitch --locked lid:off output $laptop enable +bindswitch --locked lid:on output eDP-1 disable +bindswitch --locked lid:off output eDP-1 enable From c2c6e38f865a3423f331412ef111eadac0543586 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Feb 2021 12:28:19 +0200 Subject: [PATCH 0679/2667] Remove gnome-keyring --- home/.config/sway/conf.d/08-exec.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 4be331fe..6791278a 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -13,7 +13,6 @@ exec { wl-paste -p -t text --watch clipman store -P --histpath="~/.local/share/clipman-primary.json" mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 - gnome-keyring-daemon --start --components=secrets mpDris2 swaymsg workspace 1 } From c0044a88e3352b4c8a87a1e52de67ed595f59db5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Feb 2021 12:28:19 +0200 Subject: [PATCH 0680/2667] Remove gnome-keyring --- home/.config/sway/conf.d/08-exec.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 4be331fe..6791278a 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -13,7 +13,6 @@ exec { wl-paste -p -t text --watch clipman store -P --histpath="~/.local/share/clipman-primary.json" mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 - gnome-keyring-daemon --start --components=secrets mpDris2 swaymsg workspace 1 } From 2ecca4546354231607046e24751192eb05f28014 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Mar 2021 20:47:47 +0200 Subject: [PATCH 0681/2667] Fix spotifeed --- docker/freshrss/docker-compose.yml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 7498ace6..9d948bbb 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -8,14 +8,13 @@ services: - freshrss - postgres - proxy - ports: - - 8088:80 environment: - PUID=1000 - PGID=985 - TZ=Europe/Helsinki depends_on: - spotifeed + - bibliogram volumes: - /docker/freshrss/freshrss:/config - /etc/localtime:/etc/localtime:ro @@ -39,11 +38,28 @@ services: build: ./spotifeed image: spotifeed container_name: spotifeed - ports: - - 8083:8083 + environment: + - SPOTIFY_CLIENT_ID=${SPOTIFY_CLIENT_ID} + - SPOTIFY_CLIENT_SECRET=${SPOTIFY_CLIENT_SECRET} restart: unless-stopped networks: - freshrss + - proxy + labels: + - "traefik.enable=true" + + - "traefik.http.routers.spotifeed-redirect.entrypoints=http" + - "traefik.http.routers.spotifeed-redirect.rule=Host(`spotifeed.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.spotifeed-redirect.middlewares=http2https" + + - "traefik.http.routers.spotifeed.entrypoints=https" + - "traefik.http.routers.spotifeed.rule=Host(`spotifeed.korhonen.cc`)" + - "traefik.http.routers.spotifeed.tls=true" + - "traefik.http.routers.spotifeed.tls.certresolver=http" + - "traefik.http.routers.spotifeed.service=spotifeed" + - "traefik.docker.network=proxy" + - "traefik.http.services.spotifeed.loadbalancer.server.port=8083" bibliogram: image: cloudrac3r/bibliogram From 7cc75c912d097689ecb46711c5e27aade4c4df31 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Mar 2021 20:47:47 +0200 Subject: [PATCH 0682/2667] Fix spotifeed --- docker/freshrss/docker-compose.yml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 7498ace6..9d948bbb 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -8,14 +8,13 @@ services: - freshrss - postgres - proxy - ports: - - 8088:80 environment: - PUID=1000 - PGID=985 - TZ=Europe/Helsinki depends_on: - spotifeed + - bibliogram volumes: - /docker/freshrss/freshrss:/config - /etc/localtime:/etc/localtime:ro @@ -39,11 +38,28 @@ services: build: ./spotifeed image: spotifeed container_name: spotifeed - ports: - - 8083:8083 + environment: + - SPOTIFY_CLIENT_ID=${SPOTIFY_CLIENT_ID} + - SPOTIFY_CLIENT_SECRET=${SPOTIFY_CLIENT_SECRET} restart: unless-stopped networks: - freshrss + - proxy + labels: + - "traefik.enable=true" + + - "traefik.http.routers.spotifeed-redirect.entrypoints=http" + - "traefik.http.routers.spotifeed-redirect.rule=Host(`spotifeed.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.spotifeed-redirect.middlewares=http2https" + + - "traefik.http.routers.spotifeed.entrypoints=https" + - "traefik.http.routers.spotifeed.rule=Host(`spotifeed.korhonen.cc`)" + - "traefik.http.routers.spotifeed.tls=true" + - "traefik.http.routers.spotifeed.tls.certresolver=http" + - "traefik.http.routers.spotifeed.service=spotifeed" + - "traefik.docker.network=proxy" + - "traefik.http.services.spotifeed.loadbalancer.server.port=8083" bibliogram: image: cloudrac3r/bibliogram From 650cc69eb1a6c35192e45a577a43489461489a1e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Mar 2021 18:43:52 +0200 Subject: [PATCH 0683/2667] Fix beets music library path --- home/.config/beets/config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml index acea956c..a3d863da 100644 --- a/home/.config/beets/config.yaml +++ b/home/.config/beets/config.yaml @@ -1,5 +1,5 @@ -directory: ~/Music -library: ~/Music/beets.db +directory: ~/music +library: ~/music/beets.db plugins: - acousticbrainz - check From 87fd6fed1aa149466112c322a55a636246e8c6b9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Mar 2021 18:43:52 +0200 Subject: [PATCH 0684/2667] Fix beets music library path --- home/.config/beets/config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml index acea956c..a3d863da 100644 --- a/home/.config/beets/config.yaml +++ b/home/.config/beets/config.yaml @@ -1,5 +1,5 @@ -directory: ~/Music -library: ~/Music/beets.db +directory: ~/music +library: ~/music/beets.db plugins: - acousticbrainz - check From f1c9efb51f86982ea36bf495dd4f2241231e0eaf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Mar 2021 12:50:10 +0200 Subject: [PATCH 0685/2667] Add nvidia passthrough for jellyfin --- docker/jellyfin/docker-compose.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 18fa2074..e36f27f6 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -1,11 +1,12 @@ -version: "3" +version: "2.3" services: jellyfin: image: jellyfin/jellyfin container_name: jellyfin environment: - TZ=Europe/Helsinki - user: "1000:985" + - NVIDIA_DRIVER_CAPABILITIES=all + - NVIDIA_VISIBLE_DEVICES=all ports: - "8096:8096" networks: @@ -16,6 +17,8 @@ services: - /docker/jellyfin/cache:/cache - /mnt/Storage/Media:/media - /etc/localtime:/etc/localtime:ro + devices: + - /dev/dri:/dev/dri labels: - "traefik.enable=true" From 9e0adbc3c5ab57e70b4871b4bd7c45786f88d04f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Mar 2021 12:50:10 +0200 Subject: [PATCH 0686/2667] Add nvidia passthrough for jellyfin --- docker/jellyfin/docker-compose.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 18fa2074..e36f27f6 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -1,11 +1,12 @@ -version: "3" +version: "2.3" services: jellyfin: image: jellyfin/jellyfin container_name: jellyfin environment: - TZ=Europe/Helsinki - user: "1000:985" + - NVIDIA_DRIVER_CAPABILITIES=all + - NVIDIA_VISIBLE_DEVICES=all ports: - "8096:8096" networks: @@ -16,6 +17,8 @@ services: - /docker/jellyfin/cache:/cache - /mnt/Storage/Media:/media - /etc/localtime:/etc/localtime:ro + devices: + - /dev/dri:/dev/dri labels: - "traefik.enable=true" From 122ed754f870768376f30d29e8a2829c4429d5a5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Mar 2021 12:50:41 +0200 Subject: [PATCH 0687/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 900f705b..636c1ade 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 +Subproject commit 636c1ade26a5205ca84aef624ed971c0e529ffa7 From f00b0d9a3703127bd9e34b40c1bc9b164c151123 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Mar 2021 12:50:41 +0200 Subject: [PATCH 0688/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 900f705b..636c1ade 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 +Subproject commit 636c1ade26a5205ca84aef624ed971c0e529ffa7 From 5d769f55d7b720729a748b699ee305c51dd41a4c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 9 Apr 2021 21:02:47 +0300 Subject: [PATCH 0689/2667] Update dotdrop, add viirujateippi profile --- config.yaml | 3 +++ dotdrop | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index c2186244..484fa06f 100644 --- a/config.yaml +++ b/config.yaml @@ -256,3 +256,6 @@ profiles: localhost: include: - terminal + ViiruJaTeippi: + include: + - terminal diff --git a/dotdrop b/dotdrop index 636c1ade..900f705b 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 636c1ade26a5205ca84aef624ed971c0e529ffa7 +Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 From afa761e3df361d5e55aa80e064a6e64ea32da37c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 9 Apr 2021 21:02:47 +0300 Subject: [PATCH 0690/2667] Update dotdrop, add viirujateippi profile --- config.yaml | 3 +++ dotdrop | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index c2186244..484fa06f 100644 --- a/config.yaml +++ b/config.yaml @@ -256,3 +256,6 @@ profiles: localhost: include: - terminal + ViiruJaTeippi: + include: + - terminal diff --git a/dotdrop b/dotdrop index 636c1ade..900f705b 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 636c1ade26a5205ca84aef624ed971c0e529ffa7 +Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 From 8c6393a776ab303f021338acf0484d2079bb02ac Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 11 Apr 2021 10:42:33 +0300 Subject: [PATCH 0691/2667] Update facebook video regex's --- home/.config/mimeo/associations.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home/.config/mimeo/associations.txt b/home/.config/mimeo/associations.txt index 9d7fd9a6..c15f4260 100644 --- a/home/.config/mimeo/associations.txt +++ b/home/.config/mimeo/associations.txt @@ -17,7 +17,10 @@ mpvqueue %U ^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:mp4|mkv|webm|avi|3gp|gif|gifv) mpvqueue %U - ^https?://www.facebook.com/.*/videos/ + ^https://www.facebook.com/watch/?v=.* + +mpvqueue %U + ^https://fb.watch/.* mpvqueue %U ^https?://gfycat.com/.* From a7fd9883e3f107ec8b925ea57b74594bde1e41a2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 11 Apr 2021 10:42:33 +0300 Subject: [PATCH 0692/2667] Update facebook video regex's --- home/.config/mimeo/associations.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home/.config/mimeo/associations.txt b/home/.config/mimeo/associations.txt index 9d7fd9a6..c15f4260 100644 --- a/home/.config/mimeo/associations.txt +++ b/home/.config/mimeo/associations.txt @@ -17,7 +17,10 @@ mpvqueue %U ^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:mp4|mkv|webm|avi|3gp|gif|gifv) mpvqueue %U - ^https?://www.facebook.com/.*/videos/ + ^https://www.facebook.com/watch/?v=.* + +mpvqueue %U + ^https://fb.watch/.* mpvqueue %U ^https?://gfycat.com/.* From 5a218b3925650d6918c8a2962928546a5ff22c7e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:17:45 +0300 Subject: [PATCH 0693/2667] =?UTF-8?q?Rework=20tr=C3=A6fik=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/{traefik => træfik}/docker-compose.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker/{traefik => træfik}/docker-compose.yaml (100%) diff --git a/docker/traefik/docker-compose.yaml b/docker/træfik/docker-compose.yaml similarity index 100% rename from docker/traefik/docker-compose.yaml rename to docker/træfik/docker-compose.yaml From 02afcbc241e02d12caaecb09c1421dfeb30050c8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:17:45 +0300 Subject: [PATCH 0694/2667] =?UTF-8?q?Rework=20tr=C3=A6fik=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/{traefik => træfik}/docker-compose.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker/{traefik => træfik}/docker-compose.yaml (100%) diff --git a/docker/traefik/docker-compose.yaml b/docker/træfik/docker-compose.yaml similarity index 100% rename from docker/traefik/docker-compose.yaml rename to docker/træfik/docker-compose.yaml From 0c07155261c5f8ec8e82bfb286c82f0ac179f25a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:19:14 +0300 Subject: [PATCH 0695/2667] Misc changes --- docker/træfik/docker-compose.yaml | 18 ++++++++-- docker/wordpress/docker-compose.yaml | 54 ---------------------------- 2 files changed, 15 insertions(+), 57 deletions(-) delete mode 100644 docker/wordpress/docker-compose.yaml diff --git a/docker/træfik/docker-compose.yaml b/docker/træfik/docker-compose.yaml index 0b89e1ff..1a4f7914 100644 --- a/docker/træfik/docker-compose.yaml +++ b/docker/træfik/docker-compose.yaml @@ -17,9 +17,10 @@ services: volumes: - /etc/localtime:/etc/localtime:ro - /var/run/docker.sock:/var/run/docker.sock:ro - - /docker/traefik/traefik.yml:/traefik.yml:ro - - /docker/traefik/dashboard-users:/dashboard-users:ro - - /docker/traefik/acme.json:/acme.json + - /docker/træfik/træfik/traefik.yml:/traefik.yml:ro + - /docker/træfik/træfik/dashboard-users:/dashboard-users:ro + - /docker/træfik/træfik/acme.json:/acme.json + - /docker/træfik/træfik/log:/var/log labels: - 'traefik.enable=true' @@ -36,6 +37,17 @@ services: - 'traefik.http.routers.dashboard.tls.certresolver=http' - 'traefik.http.routers.dashboard.service=api@internal' + fail2ban: + image: crazymax/fail2ban:latest + container_name: fail2ban + restart: unless-stopped + network_mode: "host" + cap_add: + - NET_ADMIN + - NET_RAW + volumes: + - /docker/træfik/træfik/log:/var/log/træfik:ro + - /docker/træfik/fail2ban:/data networks: proxy: external: true diff --git a/docker/wordpress/docker-compose.yaml b/docker/wordpress/docker-compose.yaml deleted file mode 100644 index 8db8cd1d..00000000 --- a/docker/wordpress/docker-compose.yaml +++ /dev/null @@ -1,54 +0,0 @@ -version: "3.3" - -services: - wordpress: - container_name: wordpress - image: wordpress:latest - environment: - - TZ=Europe/Helsinki - - WORDPRESS_DB_HOST=mariadb-wordpress:3306 - - WORDPRESS_DB_USER=wordpress - - WORDPRESS_DB_PASSWORD=wordpress - - WORDPRESS_DB_NAME=wordpress - restart: unless-stopped - networks: - - proxy - - wordpress - volumes: - - /docker/wordpress/wordpress:/var/www/html - - /etc/localtime:/etc/localtime:ro - labels: - - "traefik.enable=true" - - - "traefik.http.routers.wordpress-redirect.entrypoints=http" - - "traefik.http.routers.wordpress-redirect.rule=Host(`johanna.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.wordpress-redirect.middlewares=http2https" - - - "traefik.http.routers.wordpress.entrypoints=https" - - "traefik.http.routers.wordpress.rule=Host(`johanna.korhonen.cc`)" - - "traefik.http.routers.wordpress.tls=true" - - "traefik.http.routers.wordpress.tls.certresolver=http" - - "traefik.http.routers.wordpress.service=wordpress" - - "traefik.docker.network=proxy" - - "traefik.http.services.wordpress.loadbalancer.server.port=80" - - mariadb-wordpress: - image: mariadb - container_name: mariadb-wordpress - volumes: - - /docker/wordpress/mariadb:/var/lib/mysql - restart: always - networks: - - wordpress - environment: - - MYSQL_ROOT_PASSWORD=oT8Veu3Vre4ohj3E - - MYSQL_DATABASE=wordpress - - MYSQL_USER=wordpress - - MYSQL_PASSWORD=wordpress - -networks: - proxy: - external: true - wordpress: - external: false From 87d442cf262c3353f95818f6fc00281c62779d42 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:19:14 +0300 Subject: [PATCH 0696/2667] Misc changes --- docker/træfik/docker-compose.yaml | 18 ++++++++-- docker/wordpress/docker-compose.yaml | 54 ---------------------------- 2 files changed, 15 insertions(+), 57 deletions(-) delete mode 100644 docker/wordpress/docker-compose.yaml diff --git a/docker/træfik/docker-compose.yaml b/docker/træfik/docker-compose.yaml index 0b89e1ff..1a4f7914 100644 --- a/docker/træfik/docker-compose.yaml +++ b/docker/træfik/docker-compose.yaml @@ -17,9 +17,10 @@ services: volumes: - /etc/localtime:/etc/localtime:ro - /var/run/docker.sock:/var/run/docker.sock:ro - - /docker/traefik/traefik.yml:/traefik.yml:ro - - /docker/traefik/dashboard-users:/dashboard-users:ro - - /docker/traefik/acme.json:/acme.json + - /docker/træfik/træfik/traefik.yml:/traefik.yml:ro + - /docker/træfik/træfik/dashboard-users:/dashboard-users:ro + - /docker/træfik/træfik/acme.json:/acme.json + - /docker/træfik/træfik/log:/var/log labels: - 'traefik.enable=true' @@ -36,6 +37,17 @@ services: - 'traefik.http.routers.dashboard.tls.certresolver=http' - 'traefik.http.routers.dashboard.service=api@internal' + fail2ban: + image: crazymax/fail2ban:latest + container_name: fail2ban + restart: unless-stopped + network_mode: "host" + cap_add: + - NET_ADMIN + - NET_RAW + volumes: + - /docker/træfik/træfik/log:/var/log/træfik:ro + - /docker/træfik/fail2ban:/data networks: proxy: external: true diff --git a/docker/wordpress/docker-compose.yaml b/docker/wordpress/docker-compose.yaml deleted file mode 100644 index 8db8cd1d..00000000 --- a/docker/wordpress/docker-compose.yaml +++ /dev/null @@ -1,54 +0,0 @@ -version: "3.3" - -services: - wordpress: - container_name: wordpress - image: wordpress:latest - environment: - - TZ=Europe/Helsinki - - WORDPRESS_DB_HOST=mariadb-wordpress:3306 - - WORDPRESS_DB_USER=wordpress - - WORDPRESS_DB_PASSWORD=wordpress - - WORDPRESS_DB_NAME=wordpress - restart: unless-stopped - networks: - - proxy - - wordpress - volumes: - - /docker/wordpress/wordpress:/var/www/html - - /etc/localtime:/etc/localtime:ro - labels: - - "traefik.enable=true" - - - "traefik.http.routers.wordpress-redirect.entrypoints=http" - - "traefik.http.routers.wordpress-redirect.rule=Host(`johanna.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.wordpress-redirect.middlewares=http2https" - - - "traefik.http.routers.wordpress.entrypoints=https" - - "traefik.http.routers.wordpress.rule=Host(`johanna.korhonen.cc`)" - - "traefik.http.routers.wordpress.tls=true" - - "traefik.http.routers.wordpress.tls.certresolver=http" - - "traefik.http.routers.wordpress.service=wordpress" - - "traefik.docker.network=proxy" - - "traefik.http.services.wordpress.loadbalancer.server.port=80" - - mariadb-wordpress: - image: mariadb - container_name: mariadb-wordpress - volumes: - - /docker/wordpress/mariadb:/var/lib/mysql - restart: always - networks: - - wordpress - environment: - - MYSQL_ROOT_PASSWORD=oT8Veu3Vre4ohj3E - - MYSQL_DATABASE=wordpress - - MYSQL_USER=wordpress - - MYSQL_PASSWORD=wordpress - -networks: - proxy: - external: true - wordpress: - external: false From 052041ac72caab4d5581974c6f74e6e07c549dab Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:19:41 +0300 Subject: [PATCH 0697/2667] Begin setting up openldap etc --- docker/auth/.gitignore | 1 + docker/auth/docker-compose.yaml | 20 +++++++++++++++++ docker/homeautomation/docker-compose.yml | 28 ------------------------ 3 files changed, 21 insertions(+), 28 deletions(-) create mode 100644 docker/auth/.gitignore create mode 100644 docker/auth/docker-compose.yaml diff --git a/docker/auth/.gitignore b/docker/auth/.gitignore new file mode 100644 index 00000000..4c49bd78 --- /dev/null +++ b/docker/auth/.gitignore @@ -0,0 +1 @@ +.env diff --git a/docker/auth/docker-compose.yaml b/docker/auth/docker-compose.yaml new file mode 100644 index 00000000..7bbc62f1 --- /dev/null +++ b/docker/auth/docker-compose.yaml @@ -0,0 +1,20 @@ +version: "2" + +services: + openldap: + container_name: openldap + image: osixia/openldap:stable + environment: + - TZ=Europe/Helsinki + - LDAP_ORGANIZATION="Korhonen" + - LDAP_DOMAIN="korhonen.cc" + - LDAP_ADMIN_PASSWORD="${LDAP_ADMIN_PASSWORD}" + hostname: ldap.korhonen.cc + ports: + - 389:389 + - 636:636 + restart: unless-stopped + volumes: + - /docker/auth/openldap/ldap:/var/lib/ldap + - /docker/auth/openldap/slapd.d:/etc/ldap/slapd.d + - /etc/localtime:/etc/localtime:ro diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index ebcf1206..ea29011d 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -64,37 +64,9 @@ services: restart: unless-stopped depends_on: - home-assistant - - opentts devices: - "/dev/snd:/dev/snd" - opentts: - image: synesthesiam/opentts - container_name: opentts - ports: - - 5500:5500 - command: --marytts-url http://marytts:59125 --mozillatts-url http://mozillatts:5002 - tty: true - networks: - - homeautomation - depends_on: - - marytts - - mozillatts - restart: unless-stopped - marytts: - image: synesthesiam/marytts:5.2 - container_name: marytts - restart: unless-stopped - tty: true - networks: - - homeautomation - mozillatts: - image: synesthesiam/mozilla-tts - container_name: mozillatts - tty: true - networks: - - homeautomation - node-red: container_name: node-red image: nodered/node-red From 326941dcf844fef6ad86d0df2076482d0fa46af7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:19:41 +0300 Subject: [PATCH 0698/2667] Begin setting up openldap etc --- docker/auth/.gitignore | 1 + docker/auth/docker-compose.yaml | 20 +++++++++++++++++ docker/homeautomation/docker-compose.yml | 28 ------------------------ 3 files changed, 21 insertions(+), 28 deletions(-) create mode 100644 docker/auth/.gitignore create mode 100644 docker/auth/docker-compose.yaml diff --git a/docker/auth/.gitignore b/docker/auth/.gitignore new file mode 100644 index 00000000..4c49bd78 --- /dev/null +++ b/docker/auth/.gitignore @@ -0,0 +1 @@ +.env diff --git a/docker/auth/docker-compose.yaml b/docker/auth/docker-compose.yaml new file mode 100644 index 00000000..7bbc62f1 --- /dev/null +++ b/docker/auth/docker-compose.yaml @@ -0,0 +1,20 @@ +version: "2" + +services: + openldap: + container_name: openldap + image: osixia/openldap:stable + environment: + - TZ=Europe/Helsinki + - LDAP_ORGANIZATION="Korhonen" + - LDAP_DOMAIN="korhonen.cc" + - LDAP_ADMIN_PASSWORD="${LDAP_ADMIN_PASSWORD}" + hostname: ldap.korhonen.cc + ports: + - 389:389 + - 636:636 + restart: unless-stopped + volumes: + - /docker/auth/openldap/ldap:/var/lib/ldap + - /docker/auth/openldap/slapd.d:/etc/ldap/slapd.d + - /etc/localtime:/etc/localtime:ro diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index ebcf1206..ea29011d 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -64,37 +64,9 @@ services: restart: unless-stopped depends_on: - home-assistant - - opentts devices: - "/dev/snd:/dev/snd" - opentts: - image: synesthesiam/opentts - container_name: opentts - ports: - - 5500:5500 - command: --marytts-url http://marytts:59125 --mozillatts-url http://mozillatts:5002 - tty: true - networks: - - homeautomation - depends_on: - - marytts - - mozillatts - restart: unless-stopped - marytts: - image: synesthesiam/marytts:5.2 - container_name: marytts - restart: unless-stopped - tty: true - networks: - - homeautomation - mozillatts: - image: synesthesiam/mozilla-tts - container_name: mozillatts - tty: true - networks: - - homeautomation - node-red: container_name: node-red image: nodered/node-red From 2ca80f9f20e5b0a9cccc9183713ccc9c29c627b6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:20:21 +0300 Subject: [PATCH 0699/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 900f705b..9ae90d51 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 +Subproject commit 9ae90d51095b7fe9b26350c8dd33902e862466a5 From 30ffb809cd9243c95055bb20ef61151fd6f2872e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:20:21 +0300 Subject: [PATCH 0700/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 900f705b..9ae90d51 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 +Subproject commit 9ae90d51095b7fe9b26350c8dd33902e862466a5 From 966748c1e5fca488dc332f9ea35ce4dadf8f70cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:20:55 +0300 Subject: [PATCH 0701/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 9ae90d51..900f705b 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 9ae90d51095b7fe9b26350c8dd33902e862466a5 +Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 From 57f60ce7e2de27de512e66a23378bb0a8f6562fc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:20:55 +0300 Subject: [PATCH 0702/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 9ae90d51..900f705b 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 9ae90d51095b7fe9b26350c8dd33902e862466a5 +Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 From 4f5835e88117f4e706b2e012303b63fa5032887a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:21:19 +0300 Subject: [PATCH 0703/2667] Add viiru ja teippu ssh --- home/.ssh/config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index a00f477a..b39bd8de 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -40,3 +40,8 @@ host takamaki HostName 10.200.200.5 port 22 user reekymarko + +host viirujateippi + HostName viirujateippi.fi + port 22 + user functionalhacker From 240f18b25a13c143fadfe37a790f809a11a5cc89 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:21:19 +0300 Subject: [PATCH 0704/2667] Add viiru ja teippu ssh --- home/.ssh/config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index a00f477a..b39bd8de 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -40,3 +40,8 @@ host takamaki HostName 10.200.200.5 port 22 user reekymarko + +host viirujateippi + HostName viirujateippi.fi + port 22 + user functionalhacker From 117f7fc56bb60b484cc1f5e30cfb9aa0ffa35547 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:22:23 +0300 Subject: [PATCH 0705/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 900f705b..9ae90d51 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 +Subproject commit 9ae90d51095b7fe9b26350c8dd33902e862466a5 From 8fd0c78fe0eca7177d6e33d937bd0c1ee5bee671 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:22:23 +0300 Subject: [PATCH 0706/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 900f705b..9ae90d51 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 +Subproject commit 9ae90d51095b7fe9b26350c8dd33902e862466a5 From 6d6ffef7cf2db2d57a50ec6035f6e77c16e48fd5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Apr 2021 17:15:30 +0300 Subject: [PATCH 0707/2667] Add dbus-update-activation-environment to sway exec, fixes pinentry-gnome3 --- home/.config/sway/conf.d/08-exec.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 6791278a..19289cfe 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -15,6 +15,7 @@ exec { /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 mpDris2 swaymsg workspace 1 + dbus-update-activation-environment DISPLAY } exec_always { From 30a2ef11ffa98ed9035713ee0cb643957faa62f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Apr 2021 17:15:30 +0300 Subject: [PATCH 0708/2667] Add dbus-update-activation-environment to sway exec, fixes pinentry-gnome3 --- home/.config/sway/conf.d/08-exec.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 6791278a..19289cfe 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -15,6 +15,7 @@ exec { /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 mpDris2 swaymsg workspace 1 + dbus-update-activation-environment DISPLAY } exec_always { From edda8b944040daae2bf0d17f23c7c46ae8543549 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Apr 2021 17:46:54 +0300 Subject: [PATCH 0709/2667] Fix gpg-agent --- home/.config/zsh/01-env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index e742dd41..2658b0d0 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -39,7 +39,7 @@ export AUR_PAGER=$PAGER export GPG_TTY="$(tty)" # set SSH_AUTH_SOCK if not logging in over SSH -if [ "$SSH_CONNECTION" != "" ]; then +if [ "$SSH_CONNECTION" -eq "" ]; then export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) gpgconf --launch gpg-agent fi From 2f1317359c917722c2ef15356e228094d573da18 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Apr 2021 17:46:54 +0300 Subject: [PATCH 0710/2667] Fix gpg-agent --- home/.config/zsh/01-env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index e742dd41..2658b0d0 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -39,7 +39,7 @@ export AUR_PAGER=$PAGER export GPG_TTY="$(tty)" # set SSH_AUTH_SOCK if not logging in over SSH -if [ "$SSH_CONNECTION" != "" ]; then +if [ "$SSH_CONNECTION" -eq "" ]; then export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) gpgconf --launch gpg-agent fi From bf2f8630cd01d5da5d662cc209aff2daa57afd25 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Apr 2021 18:00:22 +0300 Subject: [PATCH 0711/2667] Enable optimized build for rust and x86-v3 --- home/.config/pacman/makepkg.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.config/pacman/makepkg.conf b/home/.config/pacman/makepkg.conf index 48b6c3f5..2153de54 100644 --- a/home/.config/pacman/makepkg.conf +++ b/home/.config/pacman/makepkg.conf @@ -15,8 +15,9 @@ CARCH="x86_64" CHOST="x86_64-pc-linux-gnu" CPPFLAGS="-D_FORTIFY_SOURCE=2" -CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" -CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" +CFLAGS="-march=native -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" +CXXFLAGS="${CFLAGS}" +RUSTFLAGS="-C opt-level=3 -C target-cpu=native" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" MAKEFLAGS="-j$(nproc)" DEBUG_CFLAGS="-g -fvar-tracking-assignments" From a2b19f120a46d1fd0c365ddbfed31c04edeac515 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Apr 2021 18:00:22 +0300 Subject: [PATCH 0712/2667] Enable optimized build for rust and x86-v3 --- home/.config/pacman/makepkg.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.config/pacman/makepkg.conf b/home/.config/pacman/makepkg.conf index 48b6c3f5..2153de54 100644 --- a/home/.config/pacman/makepkg.conf +++ b/home/.config/pacman/makepkg.conf @@ -15,8 +15,9 @@ CARCH="x86_64" CHOST="x86_64-pc-linux-gnu" CPPFLAGS="-D_FORTIFY_SOURCE=2" -CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" -CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" +CFLAGS="-march=native -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" +CXXFLAGS="${CFLAGS}" +RUSTFLAGS="-C opt-level=3 -C target-cpu=native" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" MAKEFLAGS="-j$(nproc)" DEBUG_CFLAGS="-g -fvar-tracking-assignments" From 2db8a37ee271c1c75f16627b327553a7ae826f07 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Apr 2021 18:35:03 +0300 Subject: [PATCH 0713/2667] Add packager information to makepkg --- home/.config/pacman/makepkg.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/pacman/makepkg.conf b/home/.config/pacman/makepkg.conf index 2153de54..0e014014 100644 --- a/home/.config/pacman/makepkg.conf +++ b/home/.config/pacman/makepkg.conf @@ -1,3 +1,4 @@ +PACKAGER="Marko Korhonen " DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u' 'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' 'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' From 5d13d202c0876cab5ecbfa813f97bf57c967abc4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Apr 2021 18:35:03 +0300 Subject: [PATCH 0714/2667] Add packager information to makepkg --- home/.config/pacman/makepkg.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/pacman/makepkg.conf b/home/.config/pacman/makepkg.conf index 2153de54..0e014014 100644 --- a/home/.config/pacman/makepkg.conf +++ b/home/.config/pacman/makepkg.conf @@ -1,3 +1,4 @@ +PACKAGER="Marko Korhonen " DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u' 'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' 'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' From 8b147866bf9cfe97cd859edcbd05d7bab43cef49 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 8 May 2021 12:06:36 +0300 Subject: [PATCH 0715/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 9ae90d51..5d4b12ea 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 9ae90d51095b7fe9b26350c8dd33902e862466a5 +Subproject commit 5d4b12eaf44b940ba3a478ded48b1cde039471a6 From 570435b227e14d7fc852e71566a8a6e398e95fc0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 8 May 2021 12:06:36 +0300 Subject: [PATCH 0716/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 9ae90d51..5d4b12ea 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 9ae90d51095b7fe9b26350c8dd33902e862466a5 +Subproject commit 5d4b12eaf44b940ba3a478ded48b1cde039471a6 From 928436c1674ee0055de21aa3b4f4132171f94167 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 May 2021 09:03:12 +0300 Subject: [PATCH 0717/2667] Add rebase merges to gitconfig --- home/.gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.gitconfig b/home/.gitconfig index 9734926e..8be410c2 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -28,4 +28,4 @@ cmd = nvim -d -c 'set nomodifiable' [pull] - rebase = false + rebase = merges From 19c7cb93ca42da735c8291c508e89dd12d9f50a9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 May 2021 09:03:12 +0300 Subject: [PATCH 0718/2667] Add rebase merges to gitconfig --- home/.gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.gitconfig b/home/.gitconfig index 9734926e..8be410c2 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -28,4 +28,4 @@ cmd = nvim -d -c 'set nomodifiable' [pull] - rebase = false + rebase = merges From 65ef7981563ba7bd245f262e5d4eec37831af779 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 May 2021 09:03:34 +0300 Subject: [PATCH 0719/2667] Add media profile to mko-laptop --- config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.yaml b/config.yaml index c2186244..68335dc7 100644 --- a/config.yaml +++ b/config.yaml @@ -245,6 +245,7 @@ profiles: mko-laptop: include: - terminal + - media Edoras: include: - terminal From d3c14c0ef7c51f86f55ace532f898a9245c2af58 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 May 2021 09:03:34 +0300 Subject: [PATCH 0720/2667] Add media profile to mko-laptop --- config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.yaml b/config.yaml index c2186244..68335dc7 100644 --- a/config.yaml +++ b/config.yaml @@ -245,6 +245,7 @@ profiles: mko-laptop: include: - terminal + - media Edoras: include: - terminal From b7d63ab2ad73801bede6882796644a3d9de05775 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 10 Jun 2021 10:14:42 +0300 Subject: [PATCH 0721/2667] Remove deprecated option from pacman.conf --- root/etc/pacman.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 01d8a2a7..aaab5f1c 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -2,7 +2,6 @@ ILoveCandy Color CheckSpace -TotalDownload HoldPkg = pacman glibc SigLevel = Required DatabaseOptional Architecture = auto From af2950badcbd77b011bfc5df4def136999d385e3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 10 Jun 2021 10:14:42 +0300 Subject: [PATCH 0722/2667] Remove deprecated option from pacman.conf --- root/etc/pacman.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 01d8a2a7..aaab5f1c 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -2,7 +2,6 @@ ILoveCandy Color CheckSpace -TotalDownload HoldPkg = pacman glibc SigLevel = Required DatabaseOptional Architecture = auto From 239324e0ab210aa368c6029c92b44d4f98804070 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Jun 2021 10:53:35 +0300 Subject: [PATCH 0723/2667] Change grc functions to aliases. Fixes some syntax errors (?) --- home/.config/zsh/03-aliases.zsh | 94 ++++++++++++++++----------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 4c0d4215..18d530fd 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -216,53 +216,53 @@ cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg } xgpgtar() { gpg -d $1 | tar x --zstd } # colorise output -cvs() { grc cvs $@ } -df() { grc df $@ } -digg() { grc digg $@ } -gcc() { grc gcc $@ } -g++() { grc g++ $@ } -ifconfig() { grc ifconfig $@ } -make() { grc make $@ } -mount() { grc mount $@ } -mtr() { grc mtr $@ } -netstat() { grc mount $@ } -ping() { grc ping $@ } -ps() { grc ps $@ } -tail() { grc tail $@ } -traceroute() { grc traceroute $@ } -wdiff() { grc wdiff $@ } -blkid() { grc blkid $@ } -du() { grc du $@ } -dnf() { grc dnf $@ } -docker() { grc docker $@ } -docker-machine() { grc docker-machine $@ } -env() { grc env $@ } -id() { grc id $@ } -ip() { grc ip $@ } -iostat() { grc iostat $@ } -last() { grc last $@ } -lsattr() { grc lsattr $@ } -lsblk() { grc lsblk $@ } -lspci() { grc lspci $@ } -lsmod() { grc lsmod $@ } -lsof() { grc lsof $@ } -getfacl() { grc getfacl $@ } -getsebool() { grc getsebool $@ } -ulimit() { grc ulimit $@ } -uptime() { grc uptime $@ } -nmap() { grc nmap $@ } -fdisk() { grc fdisk $@ } -findmnt() { grc findmnt $@ } -free() { grc free $@ } -semanage() { grc semanage $@ } -sar() { grc sar $@ } -ss() { grc ss $@ } -sysctl() { grc sysctl $@ } -systemctl() { grc systemctl $@ } -stat() { grc stat $@ } -showmount() { grc showmount $@ } -tune2fs() { grc tune2fs $@ } -tcpdum() { grc tcpdum $@ } +alias cvs='grc cvs $@' +alias df='grc df $@' +alias digg='grc digg $@' +alias gcc='grc gcc $@' +alias g++='grc g++ $@' +alias ifconfig='grc ifconfig $@' +alias make='grc make $@' +alias mount='grc mount $@' +alias mtr='grc mtr $@' +alias netstat='grc mount $@' +alias ping='grc ping $@' +alias ps='grc ps $@' +alias tail='grc tail $@' +alias traceroute='grc traceroute $@' +alias wdiff='grc wdiff $@' +alias blkid='grc blkid $@' +alias du='grc du $@' +alias dnf='grc dnf $@' +alias docker='grc docker $@' +alias docker-machine='grc docker-machine $@' +alias env='grc env $@' +alias id='grc id $@' +alias ip='grc ip $@' +alias iostat='grc iostat $@' +alias last='grc last $@' +alias lsattr='grc lsattr $@' +alias lsblk='grc lsblk $@' +alias lspci='grc lspci $@' +alias lsmod='grc lsmod $@' +alias lsof='grc lsof $@' +alias getfacl='grc getfacl $@' +alias getsebool='grc getsebool $@' +alias ulimit='grc ulimit $@' +alias uptime='grc uptime $@' +alias nmap='grc nmap $@' +alias fdisk='grc fdisk $@' +alias findmnt='grc findmnt $@' +alias free='grc free $@' +alias semanage='grc semanage $@' +alias sar='grc sar $@' +alias ss='grc ss $@' +alias sysctl='grc sysctl $@' +alias systemctl='grc systemctl $@' +alias stat='grc stat $@' +alias showmount='grc showmount $@' +alias tune2fs='grc tune2fs $@' +alias tcpdum='grc tcpdum $@' btw, () { echo " I use" From 64fc8d9c0da9063bbd3177a5efdead83c7d1937f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Jun 2021 10:53:35 +0300 Subject: [PATCH 0724/2667] Change grc functions to aliases. Fixes some syntax errors (?) --- home/.config/zsh/03-aliases.zsh | 94 ++++++++++++++++----------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 4c0d4215..18d530fd 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -216,53 +216,53 @@ cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg } xgpgtar() { gpg -d $1 | tar x --zstd } # colorise output -cvs() { grc cvs $@ } -df() { grc df $@ } -digg() { grc digg $@ } -gcc() { grc gcc $@ } -g++() { grc g++ $@ } -ifconfig() { grc ifconfig $@ } -make() { grc make $@ } -mount() { grc mount $@ } -mtr() { grc mtr $@ } -netstat() { grc mount $@ } -ping() { grc ping $@ } -ps() { grc ps $@ } -tail() { grc tail $@ } -traceroute() { grc traceroute $@ } -wdiff() { grc wdiff $@ } -blkid() { grc blkid $@ } -du() { grc du $@ } -dnf() { grc dnf $@ } -docker() { grc docker $@ } -docker-machine() { grc docker-machine $@ } -env() { grc env $@ } -id() { grc id $@ } -ip() { grc ip $@ } -iostat() { grc iostat $@ } -last() { grc last $@ } -lsattr() { grc lsattr $@ } -lsblk() { grc lsblk $@ } -lspci() { grc lspci $@ } -lsmod() { grc lsmod $@ } -lsof() { grc lsof $@ } -getfacl() { grc getfacl $@ } -getsebool() { grc getsebool $@ } -ulimit() { grc ulimit $@ } -uptime() { grc uptime $@ } -nmap() { grc nmap $@ } -fdisk() { grc fdisk $@ } -findmnt() { grc findmnt $@ } -free() { grc free $@ } -semanage() { grc semanage $@ } -sar() { grc sar $@ } -ss() { grc ss $@ } -sysctl() { grc sysctl $@ } -systemctl() { grc systemctl $@ } -stat() { grc stat $@ } -showmount() { grc showmount $@ } -tune2fs() { grc tune2fs $@ } -tcpdum() { grc tcpdum $@ } +alias cvs='grc cvs $@' +alias df='grc df $@' +alias digg='grc digg $@' +alias gcc='grc gcc $@' +alias g++='grc g++ $@' +alias ifconfig='grc ifconfig $@' +alias make='grc make $@' +alias mount='grc mount $@' +alias mtr='grc mtr $@' +alias netstat='grc mount $@' +alias ping='grc ping $@' +alias ps='grc ps $@' +alias tail='grc tail $@' +alias traceroute='grc traceroute $@' +alias wdiff='grc wdiff $@' +alias blkid='grc blkid $@' +alias du='grc du $@' +alias dnf='grc dnf $@' +alias docker='grc docker $@' +alias docker-machine='grc docker-machine $@' +alias env='grc env $@' +alias id='grc id $@' +alias ip='grc ip $@' +alias iostat='grc iostat $@' +alias last='grc last $@' +alias lsattr='grc lsattr $@' +alias lsblk='grc lsblk $@' +alias lspci='grc lspci $@' +alias lsmod='grc lsmod $@' +alias lsof='grc lsof $@' +alias getfacl='grc getfacl $@' +alias getsebool='grc getsebool $@' +alias ulimit='grc ulimit $@' +alias uptime='grc uptime $@' +alias nmap='grc nmap $@' +alias fdisk='grc fdisk $@' +alias findmnt='grc findmnt $@' +alias free='grc free $@' +alias semanage='grc semanage $@' +alias sar='grc sar $@' +alias ss='grc ss $@' +alias sysctl='grc sysctl $@' +alias systemctl='grc systemctl $@' +alias stat='grc stat $@' +alias showmount='grc showmount $@' +alias tune2fs='grc tune2fs $@' +alias tcpdum='grc tcpdum $@' btw, () { echo " I use" From b32f1b4362fdb6a6b5133a35b63fba7388b94d4c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Jun 2021 10:55:55 +0300 Subject: [PATCH 0725/2667] Aliases don't need $@ --- home/.config/zsh/03-aliases.zsh | 94 ++++++++++++++++----------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 18d530fd..c0811358 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -216,53 +216,53 @@ cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg } xgpgtar() { gpg -d $1 | tar x --zstd } # colorise output -alias cvs='grc cvs $@' -alias df='grc df $@' -alias digg='grc digg $@' -alias gcc='grc gcc $@' -alias g++='grc g++ $@' -alias ifconfig='grc ifconfig $@' -alias make='grc make $@' -alias mount='grc mount $@' -alias mtr='grc mtr $@' -alias netstat='grc mount $@' -alias ping='grc ping $@' -alias ps='grc ps $@' -alias tail='grc tail $@' -alias traceroute='grc traceroute $@' -alias wdiff='grc wdiff $@' -alias blkid='grc blkid $@' -alias du='grc du $@' -alias dnf='grc dnf $@' -alias docker='grc docker $@' -alias docker-machine='grc docker-machine $@' -alias env='grc env $@' -alias id='grc id $@' -alias ip='grc ip $@' -alias iostat='grc iostat $@' -alias last='grc last $@' -alias lsattr='grc lsattr $@' -alias lsblk='grc lsblk $@' -alias lspci='grc lspci $@' -alias lsmod='grc lsmod $@' -alias lsof='grc lsof $@' -alias getfacl='grc getfacl $@' -alias getsebool='grc getsebool $@' -alias ulimit='grc ulimit $@' -alias uptime='grc uptime $@' -alias nmap='grc nmap $@' -alias fdisk='grc fdisk $@' -alias findmnt='grc findmnt $@' -alias free='grc free $@' -alias semanage='grc semanage $@' -alias sar='grc sar $@' -alias ss='grc ss $@' -alias sysctl='grc sysctl $@' -alias systemctl='grc systemctl $@' -alias stat='grc stat $@' -alias showmount='grc showmount $@' -alias tune2fs='grc tune2fs $@' -alias tcpdum='grc tcpdum $@' +alias cvs='grc cvs' +alias df='grc df' +alias digg='grc digg' +alias gcc='grc gcc' +alias g++='grc g++' +alias ifconfig='grc ifconfig' +alias make='grc make' +alias mount='grc mount' +alias mtr='grc mtr' +alias netstat='grc mount' +alias ping='grc ping' +alias ps='grc ps' +alias tail='grc tail' +alias traceroute='grc traceroute' +alias wdiff='grc wdiff' +alias blkid='grc blkid' +alias du='grc du' +alias dnf='grc dnf' +alias docker='grc docker' +alias docker-machine='grc docker-machine' +alias env='grc env' +alias id='grc id' +alias ip='grc ip' +alias iostat='grc iostat' +alias last='grc last' +alias lsattr='grc lsattr' +alias lsblk='grc lsblk' +alias lspci='grc lspci' +alias lsmod='grc lsmod' +alias lsof='grc lsof' +alias getfacl='grc getfacl' +alias getsebool='grc getsebool' +alias ulimit='grc ulimit' +alias uptime='grc uptime' +alias nmap='grc nmap' +alias fdisk='grc fdisk' +alias findmnt='grc findmnt' +alias free='grc free' +alias semanage='grc semanage' +alias sar='grc sar' +alias ss='grc ss' +alias sysctl='grc sysctl' +alias systemctl='grc systemctl' +alias stat='grc stat' +alias showmount='grc showmount' +alias tune2fs='grc tune2fs' +alias tcpdum='grc tcpdum' btw, () { echo " I use" From a64d1345ee27a4e0d24e4e268f92fcaf910c13d5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Jun 2021 10:55:55 +0300 Subject: [PATCH 0726/2667] Aliases don't need $@ --- home/.config/zsh/03-aliases.zsh | 94 ++++++++++++++++----------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 18d530fd..c0811358 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -216,53 +216,53 @@ cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg } xgpgtar() { gpg -d $1 | tar x --zstd } # colorise output -alias cvs='grc cvs $@' -alias df='grc df $@' -alias digg='grc digg $@' -alias gcc='grc gcc $@' -alias g++='grc g++ $@' -alias ifconfig='grc ifconfig $@' -alias make='grc make $@' -alias mount='grc mount $@' -alias mtr='grc mtr $@' -alias netstat='grc mount $@' -alias ping='grc ping $@' -alias ps='grc ps $@' -alias tail='grc tail $@' -alias traceroute='grc traceroute $@' -alias wdiff='grc wdiff $@' -alias blkid='grc blkid $@' -alias du='grc du $@' -alias dnf='grc dnf $@' -alias docker='grc docker $@' -alias docker-machine='grc docker-machine $@' -alias env='grc env $@' -alias id='grc id $@' -alias ip='grc ip $@' -alias iostat='grc iostat $@' -alias last='grc last $@' -alias lsattr='grc lsattr $@' -alias lsblk='grc lsblk $@' -alias lspci='grc lspci $@' -alias lsmod='grc lsmod $@' -alias lsof='grc lsof $@' -alias getfacl='grc getfacl $@' -alias getsebool='grc getsebool $@' -alias ulimit='grc ulimit $@' -alias uptime='grc uptime $@' -alias nmap='grc nmap $@' -alias fdisk='grc fdisk $@' -alias findmnt='grc findmnt $@' -alias free='grc free $@' -alias semanage='grc semanage $@' -alias sar='grc sar $@' -alias ss='grc ss $@' -alias sysctl='grc sysctl $@' -alias systemctl='grc systemctl $@' -alias stat='grc stat $@' -alias showmount='grc showmount $@' -alias tune2fs='grc tune2fs $@' -alias tcpdum='grc tcpdum $@' +alias cvs='grc cvs' +alias df='grc df' +alias digg='grc digg' +alias gcc='grc gcc' +alias g++='grc g++' +alias ifconfig='grc ifconfig' +alias make='grc make' +alias mount='grc mount' +alias mtr='grc mtr' +alias netstat='grc mount' +alias ping='grc ping' +alias ps='grc ps' +alias tail='grc tail' +alias traceroute='grc traceroute' +alias wdiff='grc wdiff' +alias blkid='grc blkid' +alias du='grc du' +alias dnf='grc dnf' +alias docker='grc docker' +alias docker-machine='grc docker-machine' +alias env='grc env' +alias id='grc id' +alias ip='grc ip' +alias iostat='grc iostat' +alias last='grc last' +alias lsattr='grc lsattr' +alias lsblk='grc lsblk' +alias lspci='grc lspci' +alias lsmod='grc lsmod' +alias lsof='grc lsof' +alias getfacl='grc getfacl' +alias getsebool='grc getsebool' +alias ulimit='grc ulimit' +alias uptime='grc uptime' +alias nmap='grc nmap' +alias fdisk='grc fdisk' +alias findmnt='grc findmnt' +alias free='grc free' +alias semanage='grc semanage' +alias sar='grc sar' +alias ss='grc ss' +alias sysctl='grc sysctl' +alias systemctl='grc systemctl' +alias stat='grc stat' +alias showmount='grc showmount' +alias tune2fs='grc tune2fs' +alias tcpdum='grc tcpdum' btw, () { echo " I use" From f9656d3a6dff1a45469f308e7de9585b721b2382 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 23 Jun 2021 13:04:58 +0300 Subject: [PATCH 0727/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 5d4b12ea..44791be1 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 5d4b12eaf44b940ba3a478ded48b1cde039471a6 +Subproject commit 44791be1199a5eec56ec219540da8329b225abdf From e778278a7245a56e9504433c3635fa74809bb5c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 23 Jun 2021 13:04:58 +0300 Subject: [PATCH 0728/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 5d4b12ea..44791be1 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 5d4b12eaf44b940ba3a478ded48b1cde039471a6 +Subproject commit 44791be1199a5eec56ec219540da8329b225abdf From ee7f90f5f961aa67c501a4d567a69de5434c4312 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 23 Jun 2021 13:05:17 +0300 Subject: [PATCH 0729/2667] Add gpg conf --- config.yaml | 9 +++++++++ home/.gnupg/gpg-agent.conf | 5 +++++ home/.gnupg/gpg.conf | 19 ++----------------- 3 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 home/.gnupg/gpg-agent.conf diff --git a/config.yaml b/config.yaml index 15de07f4..316f56d2 100644 --- a/config.yaml +++ b/config.yaml @@ -162,6 +162,13 @@ dotfiles: f_foot.ini: src: .config/foot/foot.ini dst: ~/.config/foot/foot.ini + f_gpg-agent.conf: + src: .gnupg/gpg-agent.conf + dst: ~/.gnupg/gpg-agent.conf + chmod: '600' + f_gpg.conf: + src: .gnupg/gpg.conf + dst: ~/.gnupg/gpg.conf profiles: base: dotfiles: @@ -233,6 +240,8 @@ profiles: - f_user-dirs.dirs - f_gitconfig - f_foot.ini + - f_gpg-agent.conf + - f_gpg.conf Moria: include: - terminal diff --git a/home/.gnupg/gpg-agent.conf b/home/.gnupg/gpg-agent.conf new file mode 100644 index 00000000..a2009825 --- /dev/null +++ b/home/.gnupg/gpg-agent.conf @@ -0,0 +1,5 @@ +enable-ssh-support +pinentry-program /usr/bin/pinentry-gnome3 +default-cache-ttl 60 +max-cache-ttl 120 +extra-socket /run/user/1000/gnupg/S.gpg-agent.extra diff --git a/home/.gnupg/gpg.conf b/home/.gnupg/gpg.conf index 50a0191b..0a9596e7 100644 --- a/home/.gnupg/gpg.conf +++ b/home/.gnupg/gpg.conf @@ -1,17 +1,2 @@ -# File re-created by pEp -# See backup in '/home/reekymarko/.gnupg/gpg.conf.1.pep.bkp' - -# File re-created by pEp -# See backup in '/home/reekymarko/.gnupg/gpg.conf.0.pep.bkp' - -# GnuPG config file created by KGpg - -default-key A90767494C36DEC2EBBCFB8E83850D9D26A2216C -keyserver hkp://keys.gnupg.net -cert-digest-algo SHA256 -no-emit-version -no-comments -personal-cipher-preferences AES AES256 AES192 CAST5 -personal-digest-preferences SHA256 SHA512 SHA384 SHA224 -ignore-time-conflict -allow-freeform-uid +use-agent +keyserver hkps://keys.openpgp.org From 08e1e091113bb40f39014740b06c803f8446aa09 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 23 Jun 2021 13:05:17 +0300 Subject: [PATCH 0730/2667] Add gpg conf --- config.yaml | 9 +++++++++ home/.gnupg/gpg-agent.conf | 5 +++++ home/.gnupg/gpg.conf | 19 ++----------------- 3 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 home/.gnupg/gpg-agent.conf diff --git a/config.yaml b/config.yaml index 15de07f4..316f56d2 100644 --- a/config.yaml +++ b/config.yaml @@ -162,6 +162,13 @@ dotfiles: f_foot.ini: src: .config/foot/foot.ini dst: ~/.config/foot/foot.ini + f_gpg-agent.conf: + src: .gnupg/gpg-agent.conf + dst: ~/.gnupg/gpg-agent.conf + chmod: '600' + f_gpg.conf: + src: .gnupg/gpg.conf + dst: ~/.gnupg/gpg.conf profiles: base: dotfiles: @@ -233,6 +240,8 @@ profiles: - f_user-dirs.dirs - f_gitconfig - f_foot.ini + - f_gpg-agent.conf + - f_gpg.conf Moria: include: - terminal diff --git a/home/.gnupg/gpg-agent.conf b/home/.gnupg/gpg-agent.conf new file mode 100644 index 00000000..a2009825 --- /dev/null +++ b/home/.gnupg/gpg-agent.conf @@ -0,0 +1,5 @@ +enable-ssh-support +pinentry-program /usr/bin/pinentry-gnome3 +default-cache-ttl 60 +max-cache-ttl 120 +extra-socket /run/user/1000/gnupg/S.gpg-agent.extra diff --git a/home/.gnupg/gpg.conf b/home/.gnupg/gpg.conf index 50a0191b..0a9596e7 100644 --- a/home/.gnupg/gpg.conf +++ b/home/.gnupg/gpg.conf @@ -1,17 +1,2 @@ -# File re-created by pEp -# See backup in '/home/reekymarko/.gnupg/gpg.conf.1.pep.bkp' - -# File re-created by pEp -# See backup in '/home/reekymarko/.gnupg/gpg.conf.0.pep.bkp' - -# GnuPG config file created by KGpg - -default-key A90767494C36DEC2EBBCFB8E83850D9D26A2216C -keyserver hkp://keys.gnupg.net -cert-digest-algo SHA256 -no-emit-version -no-comments -personal-cipher-preferences AES AES256 AES192 CAST5 -personal-digest-preferences SHA256 SHA512 SHA384 SHA224 -ignore-time-conflict -allow-freeform-uid +use-agent +keyserver hkps://keys.openpgp.org From 9dcd1e618c5d9d4ec9be292decee791f294abfe5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Jul 2021 13:11:21 +0300 Subject: [PATCH 0731/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 44791be1..5c886ba2 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 44791be1199a5eec56ec219540da8329b225abdf +Subproject commit 5c886ba2b0572caae45ca2d72c918cc14ef9ed8f From f404f5c758b29753f2869263c1dd92bc99699d95 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Jul 2021 13:11:21 +0300 Subject: [PATCH 0732/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 44791be1..5c886ba2 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 44791be1199a5eec56ec219540da8329b225abdf +Subproject commit 5c886ba2b0572caae45ca2d72c918cc14ef9ed8f From 7536ad03d4ea1850c2d816eb5e56f88bce431027 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Jul 2021 13:11:29 +0300 Subject: [PATCH 0733/2667] Remove deprecated option from alacritty --- home/.config/alacritty/alacritty.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml index 5574fc86..8fa9eb14 100644 --- a/home/.config/alacritty/alacritty.yml +++ b/home/.config/alacritty/alacritty.yml @@ -73,8 +73,6 @@ mouse: double_click: { threshold: 300 } triple_click: { threshold: 300 } hide_when_typing: false - url: - modifiers: None selection: semantic_escape_chars: ',│`|:"'' ()[]{}<>' From aa7280dac28bc9a4f087ad7722b43dacfcdfa398 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Jul 2021 13:11:29 +0300 Subject: [PATCH 0734/2667] Remove deprecated option from alacritty --- home/.config/alacritty/alacritty.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml index 5574fc86..8fa9eb14 100644 --- a/home/.config/alacritty/alacritty.yml +++ b/home/.config/alacritty/alacritty.yml @@ -73,8 +73,6 @@ mouse: double_click: { threshold: 300 } triple_click: { threshold: 300 } hide_when_typing: false - url: - modifiers: None selection: semantic_escape_chars: ',│`|:"'' ()[]{}<>' From 488ef48eb41391575349e2b1a7eeb9b6e159ce8d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Jul 2021 11:28:34 +0300 Subject: [PATCH 0735/2667] Add an include file for Rossum hosts --- home/.ssh/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index b39bd8de..637e7359 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -1,3 +1,5 @@ +Include ~/.ssh/rossum_hosts + host gitea HostName korhonen.cc user git From e67f95431e9ed38cc533e626179b8b96292b01bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Jul 2021 11:28:34 +0300 Subject: [PATCH 0736/2667] Add an include file for Rossum hosts --- home/.ssh/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index b39bd8de..637e7359 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -1,3 +1,5 @@ +Include ~/.ssh/rossum_hosts + host gitea HostName korhonen.cc user git From 60c1448c793207bd421db41f937f7a1534248530 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Jul 2021 11:28:57 +0300 Subject: [PATCH 0737/2667] Dynamic git config for work laptop --- home/.gitconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.gitconfig b/home/.gitconfig index 8be410c2..16d6ce2d 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -1,5 +1,9 @@ [user] + {%@@ if profile == "mko-laptop" @@%} + email = marko.korhonen@rossum.fi + {%@@ else @@%} email = marko@korhonen.cc + {%@@ endif @@%} name = Marko Korhonen signingkey = C514037F1EFF4FA6 From 6d1ed94046ed42f32c0d920c63486b9fc58dc225 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Jul 2021 11:28:57 +0300 Subject: [PATCH 0738/2667] Dynamic git config for work laptop --- home/.gitconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.gitconfig b/home/.gitconfig index 8be410c2..16d6ce2d 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -1,5 +1,9 @@ [user] + {%@@ if profile == "mko-laptop" @@%} + email = marko.korhonen@rossum.fi + {%@@ else @@%} email = marko@korhonen.cc + {%@@ endif @@%} name = Marko Korhonen signingkey = C514037F1EFF4FA6 From 8de5e4c0e50b62a1bba6ab76c1874483f8c006c9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Jul 2021 11:29:14 +0300 Subject: [PATCH 0739/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 5c886ba2..3f00e21e 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 5c886ba2b0572caae45ca2d72c918cc14ef9ed8f +Subproject commit 3f00e21ee4ce8a235782a714a99f7578db5d0adb From 881c8afadc7464677fdf39dc962c7cb3d465a05b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Jul 2021 11:29:14 +0300 Subject: [PATCH 0740/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 5c886ba2..3f00e21e 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 5c886ba2b0572caae45ca2d72c918cc14ef9ed8f +Subproject commit 3f00e21ee4ce8a235782a714a99f7578db5d0adb From dbc2aaed26e5c845bc15bc98bd768f8d960684f8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Jul 2021 11:29:24 +0300 Subject: [PATCH 0741/2667] Only add vulkan and wayland stuff for mirkwood mpv --- home/.config/mpv/mpv.conf | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index be2d89c7..26d19160 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -9,8 +9,10 @@ hwdec-codecs=all {%@@ if profile == "Mirkwood" @@%} gpu-context=wayland -{%@@ elif profile == "Rivendell" @@%} -ao=alsa +{%@@ endif @@%} + +{%@@ if profile == "mko-laptop" @@%} +script=~/bin/mpris.so {%@@ endif @@%} ############# @@ -104,8 +106,11 @@ ytdl-format="bestvideo[height<=2160]+bestaudio/best[height<=2160]" [best] ytdl-format="bestvideo+bestaudio" + +{%@@ if profile == "Mirkwood" @@%} # Vulkan hwdec profile [vulkan] gpu-api=vulkan gpu-context=waylandvk hwdec=vaapi-copy +{%@@ endif @@%} From 80728aa90fbac1f3931e873c14826f3324d7b9fa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Jul 2021 11:29:24 +0300 Subject: [PATCH 0742/2667] Only add vulkan and wayland stuff for mirkwood mpv --- home/.config/mpv/mpv.conf | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index be2d89c7..26d19160 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -9,8 +9,10 @@ hwdec-codecs=all {%@@ if profile == "Mirkwood" @@%} gpu-context=wayland -{%@@ elif profile == "Rivendell" @@%} -ao=alsa +{%@@ endif @@%} + +{%@@ if profile == "mko-laptop" @@%} +script=~/bin/mpris.so {%@@ endif @@%} ############# @@ -104,8 +106,11 @@ ytdl-format="bestvideo[height<=2160]+bestaudio/best[height<=2160]" [best] ytdl-format="bestvideo+bestaudio" + +{%@@ if profile == "Mirkwood" @@%} # Vulkan hwdec profile [vulkan] gpu-api=vulkan gpu-context=waylandvk hwdec=vaapi-copy +{%@@ endif @@%} From b46f5575f376e1825eeccadac5f109c75f11e0d4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Jul 2021 12:11:27 +0300 Subject: [PATCH 0743/2667] Enable parallel downloads for pacman --- root/etc/pacman.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index aaab5f1c..97733f89 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -2,6 +2,7 @@ ILoveCandy Color CheckSpace +ParallelDownloads = 5 HoldPkg = pacman glibc SigLevel = Required DatabaseOptional Architecture = auto From 5764bcc6cbc4750ee9ddc478ee5cb5407d8bf52b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Jul 2021 12:11:27 +0300 Subject: [PATCH 0744/2667] Enable parallel downloads for pacman --- root/etc/pacman.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index aaab5f1c..97733f89 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -2,6 +2,7 @@ ILoveCandy Color CheckSpace +ParallelDownloads = 5 HoldPkg = pacman glibc SigLevel = Required DatabaseOptional Architecture = auto From eee771f57d3fb07686cd6ffb639dbf0f8654adff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 27 Jul 2021 09:18:40 +0300 Subject: [PATCH 0745/2667] Add cpupower conf to mko-laptop --- config-root.yaml | 3 +++ root/etc/default/cpupower | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/config-root.yaml b/config-root.yaml index 0b292e37..a7264f7c 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -159,3 +159,6 @@ profiles: Edoras: include: - Pacman + mko-laptop: + dotfiles: + - f_cpupower diff --git a/root/etc/default/cpupower b/root/etc/default/cpupower index 98c1cb2f..08af34fe 100644 --- a/root/etc/default/cpupower +++ b/root/etc/default/cpupower @@ -1,2 +1,6 @@ # vim:set ts=2 sw=2 ft=sh et: +{%@@ if profile == "Mirkwood" @@%} governor='powersave' +{%@@ else @@%} +governor='performance' +{%@@ endif @@%} From 18074cde8bdd66d15c4f89b3e6718acfb29e944b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 27 Jul 2021 09:18:40 +0300 Subject: [PATCH 0746/2667] Add cpupower conf to mko-laptop --- config-root.yaml | 3 +++ root/etc/default/cpupower | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/config-root.yaml b/config-root.yaml index 0b292e37..a7264f7c 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -159,3 +159,6 @@ profiles: Edoras: include: - Pacman + mko-laptop: + dotfiles: + - f_cpupower diff --git a/root/etc/default/cpupower b/root/etc/default/cpupower index 98c1cb2f..08af34fe 100644 --- a/root/etc/default/cpupower +++ b/root/etc/default/cpupower @@ -1,2 +1,6 @@ # vim:set ts=2 sw=2 ft=sh et: +{%@@ if profile == "Mirkwood" @@%} governor='powersave' +{%@@ else @@%} +governor='performance' +{%@@ endif @@%} From 24d017e941d735c0e6650c99e1ce1d0ea62c434e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 27 Jul 2021 10:28:11 +0300 Subject: [PATCH 0747/2667] Add emulated hue --- docker/homeautomation/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index ea29011d..a42a39f3 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -17,6 +17,7 @@ services: - proxy ports: - "8123:8123" + - "8300:8300" depends_on: - mosquitto labels: From 3bd0ce5af72addaa399a6c2af7824e3c9d087fd0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 27 Jul 2021 10:28:11 +0300 Subject: [PATCH 0748/2667] Add emulated hue --- docker/homeautomation/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index ea29011d..a42a39f3 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -17,6 +17,7 @@ services: - proxy ports: - "8123:8123" + - "8300:8300" depends_on: - mosquitto labels: From 5e284e44de00fed8235f7fb2fc3b1fa355f51d87 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 27 Jul 2021 10:28:21 +0300 Subject: [PATCH 0749/2667] Remove spotifeed --- docker/freshrss/docker-compose.yml | 28 ---------------------------- docker/freshrss/spotifeed/Dockerfile | 9 --------- 2 files changed, 37 deletions(-) delete mode 100644 docker/freshrss/spotifeed/Dockerfile diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 9d948bbb..1de8bfef 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -13,7 +13,6 @@ services: - PGID=985 - TZ=Europe/Helsinki depends_on: - - spotifeed - bibliogram volumes: - /docker/freshrss/freshrss:/config @@ -34,33 +33,6 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.freshrss.loadbalancer.server.port=80" - spotifeed: - build: ./spotifeed - image: spotifeed - container_name: spotifeed - environment: - - SPOTIFY_CLIENT_ID=${SPOTIFY_CLIENT_ID} - - SPOTIFY_CLIENT_SECRET=${SPOTIFY_CLIENT_SECRET} - restart: unless-stopped - networks: - - freshrss - - proxy - labels: - - "traefik.enable=true" - - - "traefik.http.routers.spotifeed-redirect.entrypoints=http" - - "traefik.http.routers.spotifeed-redirect.rule=Host(`spotifeed.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.spotifeed-redirect.middlewares=http2https" - - - "traefik.http.routers.spotifeed.entrypoints=https" - - "traefik.http.routers.spotifeed.rule=Host(`spotifeed.korhonen.cc`)" - - "traefik.http.routers.spotifeed.tls=true" - - "traefik.http.routers.spotifeed.tls.certresolver=http" - - "traefik.http.routers.spotifeed.service=spotifeed" - - "traefik.docker.network=proxy" - - "traefik.http.services.spotifeed.loadbalancer.server.port=8083" - bibliogram: image: cloudrac3r/bibliogram container_name: bibliogram diff --git a/docker/freshrss/spotifeed/Dockerfile b/docker/freshrss/spotifeed/Dockerfile deleted file mode 100644 index 63c1604d..00000000 --- a/docker/freshrss/spotifeed/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM ruby:2.7.2 -RUN git clone https://github.com/timdorr/spotifeed -WORKDIR /spotifeed -RUN bundle install -EXPOSE 8083 -RUN apt-get update -RUN apt-get upgrade -RUN apt-get install redis-server -y -CMD puma -p 8083 & redis-server From 24f4d3fc423599d9699f281bce8de65903e59cb8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 27 Jul 2021 10:28:21 +0300 Subject: [PATCH 0750/2667] Remove spotifeed --- docker/freshrss/docker-compose.yml | 28 ---------------------------- docker/freshrss/spotifeed/Dockerfile | 9 --------- 2 files changed, 37 deletions(-) delete mode 100644 docker/freshrss/spotifeed/Dockerfile diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 9d948bbb..1de8bfef 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -13,7 +13,6 @@ services: - PGID=985 - TZ=Europe/Helsinki depends_on: - - spotifeed - bibliogram volumes: - /docker/freshrss/freshrss:/config @@ -34,33 +33,6 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.freshrss.loadbalancer.server.port=80" - spotifeed: - build: ./spotifeed - image: spotifeed - container_name: spotifeed - environment: - - SPOTIFY_CLIENT_ID=${SPOTIFY_CLIENT_ID} - - SPOTIFY_CLIENT_SECRET=${SPOTIFY_CLIENT_SECRET} - restart: unless-stopped - networks: - - freshrss - - proxy - labels: - - "traefik.enable=true" - - - "traefik.http.routers.spotifeed-redirect.entrypoints=http" - - "traefik.http.routers.spotifeed-redirect.rule=Host(`spotifeed.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.spotifeed-redirect.middlewares=http2https" - - - "traefik.http.routers.spotifeed.entrypoints=https" - - "traefik.http.routers.spotifeed.rule=Host(`spotifeed.korhonen.cc`)" - - "traefik.http.routers.spotifeed.tls=true" - - "traefik.http.routers.spotifeed.tls.certresolver=http" - - "traefik.http.routers.spotifeed.service=spotifeed" - - "traefik.docker.network=proxy" - - "traefik.http.services.spotifeed.loadbalancer.server.port=8083" - bibliogram: image: cloudrac3r/bibliogram container_name: bibliogram diff --git a/docker/freshrss/spotifeed/Dockerfile b/docker/freshrss/spotifeed/Dockerfile deleted file mode 100644 index 63c1604d..00000000 --- a/docker/freshrss/spotifeed/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM ruby:2.7.2 -RUN git clone https://github.com/timdorr/spotifeed -WORKDIR /spotifeed -RUN bundle install -EXPOSE 8083 -RUN apt-get update -RUN apt-get upgrade -RUN apt-get install redis-server -y -CMD puma -p 8083 & redis-server From 2fe24572aee8358d204bcdaed3abb7a2613cdc64 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 29 Jul 2021 22:41:28 +0300 Subject: [PATCH 0751/2667] Remove docker-compose zsh completion since it's provided by default nowadays --- home/.config/zsh/02-plugins.zsh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh index 26b690b9..ddc94ff5 100644 --- a/home/.config/zsh/02-plugins.zsh +++ b/home/.config/zsh/02-plugins.zsh @@ -34,10 +34,6 @@ zinit snippet https://gist.githubusercontent.com/RPigott/a3efdc08fa4d5fd7df38d09 zinit ice wait'1' lucid as'completion' zinit snippet '$DOTREPO/dotdrop/completion/_dotdrop-completion.zsh' -# docker-compose completion -zinit ice wait'1' lucid as'completion' -zinit snippet https://raw.githubusercontent.com/docker/compose/master/contrib/completion/zsh/_docker-compose - # syntax highlighting zinit ice lucid atinit'zpcompinit' zinit light zdharma/fast-syntax-highlighting From ec490c0d32d6e6831e4d2b85de0775ef85a72c03 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 29 Jul 2021 22:41:28 +0300 Subject: [PATCH 0752/2667] Remove docker-compose zsh completion since it's provided by default nowadays --- home/.config/zsh/02-plugins.zsh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh index 26b690b9..ddc94ff5 100644 --- a/home/.config/zsh/02-plugins.zsh +++ b/home/.config/zsh/02-plugins.zsh @@ -34,10 +34,6 @@ zinit snippet https://gist.githubusercontent.com/RPigott/a3efdc08fa4d5fd7df38d09 zinit ice wait'1' lucid as'completion' zinit snippet '$DOTREPO/dotdrop/completion/_dotdrop-completion.zsh' -# docker-compose completion -zinit ice wait'1' lucid as'completion' -zinit snippet https://raw.githubusercontent.com/docker/compose/master/contrib/completion/zsh/_docker-compose - # syntax highlighting zinit ice lucid atinit'zpcompinit' zinit light zdharma/fast-syntax-highlighting From 59cf0f1c1fddd3bd29d1f275092cfa5f01548ddc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Aug 2021 12:03:39 +0300 Subject: [PATCH 0753/2667] Use fd instead of ripgrep in zsh fzf plugin --- home/.config/zsh/03-aliases.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index c0811358..263062bd 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -24,10 +24,10 @@ rip() { # make fzf zsh plugin use ripgrep _fzf_compgen_dir() { - rg --hidden --files --null --sort path "$1" 2>/dev/null | xargs -0 dirname | uniq + fd -Ht d } _fzf_compgen_path() { - rg --files --hidden "$1" 2>/dev/null + fd -Ht f } # search and install packages with fzf From 924cc4f80737bbe4bd0befe8f923147590e1845f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Aug 2021 12:03:39 +0300 Subject: [PATCH 0754/2667] Use fd instead of ripgrep in zsh fzf plugin --- home/.config/zsh/03-aliases.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index c0811358..263062bd 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -24,10 +24,10 @@ rip() { # make fzf zsh plugin use ripgrep _fzf_compgen_dir() { - rg --hidden --files --null --sort path "$1" 2>/dev/null | xargs -0 dirname | uniq + fd -Ht d } _fzf_compgen_path() { - rg --files --hidden "$1" 2>/dev/null + fd -Ht f } # search and install packages with fzf From d98bf69a3bbbb5495f5228f198aa3c52bbfbb476 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 8 Aug 2021 15:22:24 +0300 Subject: [PATCH 0755/2667] Add coturn to nextcloud --- docker/nextcloud/.gitignore | 1 + docker/nextcloud/docker-compose.yml | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 docker/nextcloud/.gitignore diff --git a/docker/nextcloud/.gitignore b/docker/nextcloud/.gitignore new file mode 100644 index 00000000..4c49bd78 --- /dev/null +++ b/docker/nextcloud/.gitignore @@ -0,0 +1 @@ +.env diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index 50275831..a71a4152 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -57,6 +57,25 @@ services: depends_on: - redis + coturn: + image: instrumentisto/coturn + container_name: coturn + restart: unless-stopped + env_file: .env + ports: + - "3478:3478/tcp" + - "3478:3478/udp" + networks: + - nextcloud + command: + - -n + - --log-file=stdout + - --min-port=49160 + - --max-port=49200 + - --realm=cloud.korhonen.cc + - --use-auth-secret + - --static-auth-secret=${STATIC_AUTH_SECRET} + networks: nextcloud: external: false From 9cdd992f20c442564cc4d93afc62327c70d4d4b2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 8 Aug 2021 15:22:24 +0300 Subject: [PATCH 0756/2667] Add coturn to nextcloud --- docker/nextcloud/.gitignore | 1 + docker/nextcloud/docker-compose.yml | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 docker/nextcloud/.gitignore diff --git a/docker/nextcloud/.gitignore b/docker/nextcloud/.gitignore new file mode 100644 index 00000000..4c49bd78 --- /dev/null +++ b/docker/nextcloud/.gitignore @@ -0,0 +1 @@ +.env diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index 50275831..a71a4152 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -57,6 +57,25 @@ services: depends_on: - redis + coturn: + image: instrumentisto/coturn + container_name: coturn + restart: unless-stopped + env_file: .env + ports: + - "3478:3478/tcp" + - "3478:3478/udp" + networks: + - nextcloud + command: + - -n + - --log-file=stdout + - --min-port=49160 + - --max-port=49200 + - --realm=cloud.korhonen.cc + - --use-auth-secret + - --static-auth-secret=${STATIC_AUTH_SECRET} + networks: nextcloud: external: false From 022adf7d50e1f3f16ea7e806d4fd78534cd2a9ed Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 8 Aug 2021 15:22:54 +0300 Subject: [PATCH 0757/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 3f00e21e..5dfbf5d0 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 3f00e21ee4ce8a235782a714a99f7578db5d0adb +Subproject commit 5dfbf5d044a22d7aa183f282b4a490f228553932 From 9d4cea56a4eab277cb4c2ff32a94f2092095c9a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 8 Aug 2021 15:22:54 +0300 Subject: [PATCH 0758/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 3f00e21e..5dfbf5d0 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 3f00e21ee4ce8a235782a714a99f7578db5d0adb +Subproject commit 5dfbf5d044a22d7aa183f282b4a490f228553932 From 80c6f3c9c3fe623bbe00128daaea0ce8e2638b58 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 8 Aug 2021 15:25:20 +0300 Subject: [PATCH 0759/2667] Add MOZ_DBUS_REMOTE env variable --- root/usr/local/bin/sway-run | 2 ++ 1 file changed, 2 insertions(+) diff --git a/root/usr/local/bin/sway-run b/root/usr/local/bin/sway-run index 762d6e13..8009f18f 100755 --- a/root/usr/local/bin/sway-run +++ b/root/usr/local/bin/sway-run @@ -6,6 +6,7 @@ export MOZ_ENABLE_WAYLAND=1 export MOZ_USE_XINPUT2=1 export MOZ_WEBRENDER=1 +export MOZ_DBUS_REMOTE=1 # Enable xdg-desktop-portal-wlr export XDG_CURRENT_DESKTOP=sway @@ -30,6 +31,7 @@ dbus-run-session sway unset MOZ_ENABLE_WAYLAND unset MOZ_USE_XINPUT2 unset MOZ_WEBRENDER +unset MOZ_DBUS_REMOTE unset _JAVA_AWT_WM_NONREPARENTING unset _JAVA_OPTIONS unset QT_QPA_PLATFORMTHEME From b4f2b570605b27b4ab9cd59002703f25f34f7b24 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 8 Aug 2021 15:25:20 +0300 Subject: [PATCH 0760/2667] Add MOZ_DBUS_REMOTE env variable --- root/usr/local/bin/sway-run | 2 ++ 1 file changed, 2 insertions(+) diff --git a/root/usr/local/bin/sway-run b/root/usr/local/bin/sway-run index 762d6e13..8009f18f 100755 --- a/root/usr/local/bin/sway-run +++ b/root/usr/local/bin/sway-run @@ -6,6 +6,7 @@ export MOZ_ENABLE_WAYLAND=1 export MOZ_USE_XINPUT2=1 export MOZ_WEBRENDER=1 +export MOZ_DBUS_REMOTE=1 # Enable xdg-desktop-portal-wlr export XDG_CURRENT_DESKTOP=sway @@ -30,6 +31,7 @@ dbus-run-session sway unset MOZ_ENABLE_WAYLAND unset MOZ_USE_XINPUT2 unset MOZ_WEBRENDER +unset MOZ_DBUS_REMOTE unset _JAVA_AWT_WM_NONREPARENTING unset _JAVA_OPTIONS unset QT_QPA_PLATFORMTHEME From c024a40316ebcd83d82c353a12025a58ff544099 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 8 Aug 2021 15:33:23 +0300 Subject: [PATCH 0761/2667] Refactor neovim config (#2) Changes include: - [x] Use init.lua instead of init.vim - Some keybindings are still to be converted - [x] Use packer as a package manager instead of vim-plug - [ ] Use built-in lsp instead of coc.nvim - [x] Set up language servers - [x] Completion - [x] Formatting (previously coc-prettier, now neoformat) - [ ] Snippets - [ ] Replace fzf with telescope.nvim - [x] Implement treesitter syntax highlighting - More info: https://github.com/nvim-treesitter/nvim-treesitter Note that this requires neovim nightly until 0.5 is released Reviewed-on: https://git.korhonen.cc/FunctionalHacker/dotfiles/pulls/2 Co-authored-by: Marko Korhonen Co-committed-by: Marko Korhonen --- config.yaml | 164 +++++++++--------- home/.config/nvim/coc-settings.json | 33 ---- home/.config/nvim/conf.d/01-plugins.vim | 96 ---------- home/.config/nvim/conf.d/02-appearance.vim | 46 ----- home/.config/nvim/conf.d/03-keybinds.vim | 39 ----- home/.config/nvim/conf.d/04-coc.vim | 129 -------------- home/.config/nvim/conf.d/05-language.vim | 12 -- home/.config/nvim/conf.d/06-misc.vim | 41 ----- home/.config/nvim/conf.d/07-fzf.vim | 43 ----- home/.config/nvim/init.lua | 13 ++ home/.config/nvim/init.vim | 3 - home/.config/nvim/lua/autocmd.lua | 7 + home/.config/nvim/lua/keybinds.lua | 27 +++ .../nvim/lua/pluginconf/bufferline.lua | 1 + .../nvim/lua/pluginconf/completion.lua | 4 + .../nvim/lua/pluginconf/indent-blankline.lua | 1 + home/.config/nvim/lua/pluginconf/lsp.lua | 143 +++++++++++++++ home/.config/nvim/lua/pluginconf/lualine.lua | 3 + .../.config/nvim/lua/pluginconf/telescope.lua | 36 ++++ .../nvim/lua/pluginconf/treesitter.lua | 6 + home/.config/nvim/lua/pluginmanager.lua | 90 ++++++++++ home/.config/nvim/lua/settings.lua | 61 +++++++ home/.config/nvim/scripts/java-lsp.sh | 17 ++ home/.config/zsh/03-aliases.zsh | 2 +- 24 files changed, 492 insertions(+), 525 deletions(-) delete mode 100644 home/.config/nvim/coc-settings.json delete mode 100644 home/.config/nvim/conf.d/01-plugins.vim delete mode 100644 home/.config/nvim/conf.d/02-appearance.vim delete mode 100644 home/.config/nvim/conf.d/03-keybinds.vim delete mode 100644 home/.config/nvim/conf.d/04-coc.vim delete mode 100644 home/.config/nvim/conf.d/05-language.vim delete mode 100644 home/.config/nvim/conf.d/06-misc.vim delete mode 100644 home/.config/nvim/conf.d/07-fzf.vim create mode 100644 home/.config/nvim/init.lua delete mode 100644 home/.config/nvim/init.vim create mode 100644 home/.config/nvim/lua/autocmd.lua create mode 100644 home/.config/nvim/lua/keybinds.lua create mode 100644 home/.config/nvim/lua/pluginconf/bufferline.lua create mode 100644 home/.config/nvim/lua/pluginconf/completion.lua create mode 100644 home/.config/nvim/lua/pluginconf/indent-blankline.lua create mode 100644 home/.config/nvim/lua/pluginconf/lsp.lua create mode 100644 home/.config/nvim/lua/pluginconf/lualine.lua create mode 100644 home/.config/nvim/lua/pluginconf/telescope.lua create mode 100644 home/.config/nvim/lua/pluginconf/treesitter.lua create mode 100644 home/.config/nvim/lua/pluginmanager.lua create mode 100644 home/.config/nvim/lua/settings.lua create mode 100755 home/.config/nvim/scripts/java-lsp.sh diff --git a/config.yaml b/config.yaml index 316f56d2..c46a4c86 100644 --- a/config.yaml +++ b/config.yaml @@ -1,5 +1,5 @@ actions: - vim-plug: nvim +PlugInstall +qall + nvim-packer-install: nvim +PackerInstall config: backup: true banner: true @@ -25,20 +25,20 @@ dotfiles: d_imapnotify: dst: ~/.config/imapnotify src: .config/imapnotify - f_init.vim: - dst: ~/.config/nvim/init.vim - src: .config/nvim/init.vim - d_nvim_config: + f_nvim_init: + dst: ~/.config/nvim/init.lua + src: .config/nvim/init.lua + d_nvim_lua: actions: - - vim-plug - dst: ~/.config/nvim/conf.d - src: .config/nvim/conf.d + - nvim-packer-install + dst: ~/.config/nvim/lua + src: .config/nvim/lua + d_nvim_scripts: + dst: ~/.config/nvim/scripts + src: .config/nvim/scripts f_user-dirs.dirs: dst: ~/.config/user-dirs.dirs src: .config/user-dirs.dirs - f_coc-settings.json: - dst: ~/.config/nvim/coc-settings.json - src: .config/nvim/coc-settings.json d_sway: dst: ~/.config/sway src: .config/sway @@ -165,107 +165,107 @@ dotfiles: f_gpg-agent.conf: src: .gnupg/gpg-agent.conf dst: ~/.gnupg/gpg-agent.conf - chmod: '600' + chmod: "600" f_gpg.conf: src: .gnupg/gpg.conf dst: ~/.gnupg/gpg.conf profiles: base: dotfiles: - - d_systemd + - d_systemd terminal: dotfiles: - - f_nvimpager - - f_hushlogin - - f_ripgrep_ignore - - f_ranger_commands.py - - f_rtv.cfg - - f_mailcap - - d_zsh - - f_zshrc - - f_tmux.conf - - f_ranger.conf - - f_ssh.conf - - f_authorized_keys - - d_nvim_config - - f_init.vim - - f_coc-settings.json - - f_gitconfig - - f_alacritty.yml + - f_nvimpager + - f_hushlogin + - f_ripgrep_ignore + - f_ranger_commands.py + - f_rtv.cfg + - f_mailcap + - d_zsh + - f_zshrc + - f_tmux.conf + - f_ranger.conf + - f_ssh.conf + - f_authorized_keys + - d_nvim_lua + - d_nvim_scripts + - f_nvim_init + - f_gitconfig + - f_alacritty.yml email: dotfiles: - - d_neomutt - - d_imapnotify - - f_mbsyncrc - - f_msmtp_config + - d_neomutt + - d_imapnotify + - f_mbsyncrc + - f_msmtp_config media: dotfiles: - - f_beets_config - - f_beets_whitelist - - f_abcde.conf - - d_mpv - - f_youtube-dl_config - - f_mpd.conf - - f_ncmpcpp_bindings - - f_ncmpcpp.conf - - f_libra_config - - f_mpdscribble.conf - - f_mpdris2.conf + - f_beets_config + - f_beets_whitelist + - f_abcde.conf + - d_mpv + - f_youtube-dl_config + - f_mpd.conf + - f_ncmpcpp_bindings + - f_ncmpcpp.conf + - f_libra_config + - f_mpdscribble.conf + - f_mpdris2.conf sway: dotfiles: - - d_sway - - d_waybar - - d_wofi - - f_mako_config - - f_redshift.conf - - f_zathurarc - - f_mimeo_associations.txt - - f_tdesktop_lang.strings - - f_fonts.conf - - f_zprofile + - d_sway + - d_waybar + - d_wofi + - f_mako_config + - f_redshift.conf + - f_zathurarc + - f_mimeo_associations.txt + - f_tdesktop_lang.strings + - f_fonts.conf + - f_zprofile Pacman: dotfiles: - - f_makepkg.conf - - f_paru.conf + - f_makepkg.conf + - f_paru.conf Mirkwood: include: - - base - - terminal - - email - - media - - sway - - Pacman + - base + - terminal + - email + - media + - sway + - Pacman dotfiles: - - f_paru.conf - - f_user-dirs.dirs - - f_gitconfig - - f_foot.ini - - f_gpg-agent.conf - - f_gpg.conf + - f_paru.conf + - f_user-dirs.dirs + - f_gitconfig + - f_foot.ini + - f_gpg-agent.conf + - f_gpg.conf Moria: include: - - terminal - - media - - Pacman + - terminal + - media + - Pacman Gondor: include: - - terminal - - Pacman + - terminal + - Pacman mko-laptop: include: - - terminal - - media + - terminal + - media Edoras: include: - - terminal - - Pacman + - terminal + - Pacman TakamakiPC: include: - - terminal - - Pacman + - terminal + - Pacman localhost: include: - - terminal + - terminal ViiruJaTeippi: include: - - terminal + - terminal diff --git a/home/.config/nvim/coc-settings.json b/home/.config/nvim/coc-settings.json deleted file mode 100644 index eddd81b5..00000000 --- a/home/.config/nvim/coc-settings.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "python.jediEnabled": false, - "suggest.noselect": false, - "suggest.echodocSupport": true, - "suggest.maxCompleteItemCount": 20, - "coc.preferences.formatOnSaveFiletypes": [], - "prettier.singleQuote": false, - "diagnostic.errorSign": "•", - "diagnostic.warningSign": "•", - "diagnostic.infoSign": "•", - "suggest.snippetIndicator": "~", - "rust-analyzer.serverPath": "/usr/bin/rust-analyzer", - "languageserver": { - "bash": { - "command": "bash-language-server", - "args": ["start"], - "filetypes": ["sh"], - "ignoredRootPaths": ["~"] - }, - "xml": { - "command": "xml-language-server", - "args": ["start"], - "filetypes": ["xml"], - "ignoredRootPaths": ["~"] - } - }, - "markdownlint.config": { - "rules": { - "default": true, - "line_length": false - } - } -} diff --git a/home/.config/nvim/conf.d/01-plugins.vim b/home/.config/nvim/conf.d/01-plugins.vim deleted file mode 100644 index 6c18ec60..00000000 --- a/home/.config/nvim/conf.d/01-plugins.vim +++ /dev/null @@ -1,96 +0,0 @@ -" Auto-install vim-plug -if empty(glob('~/.config/nvim/autoload/plug.vim')) - silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim - autocmd VimEnter * PlugInstall -endif - -" Set coc extensions -let g:coc_global_extensions = [ - \ 'coc-tsserver', - \ 'coc-html', - \ 'coc-tsserver', - \ 'coc-json', - \ 'coc-yaml', - \ 'coc-texlab', - \ 'coc-prettier', - \ 'coc-python', - \ 'coc-emmet', - \ 'coc-rust-analyzer', - \ 'coc-markdownlint', - \ 'coc-snippets', - \ 'coc-java', - \ 'coc-flutter' - \ ] - -call plug#begin() - -" statusline/tabline -Plug 'vim-airline/vim-airline' - -" Make editing passwords safer -Plug 'https://git.zx2c4.com/password-store', { 'rtp': 'contrib/vim/redact_pass.vim' } - -" Colorize color words -Plug 'norcalli/nvim-colorizer.lua' - -" NeoVim in Firefox -Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } } - -" Spelling -Plug 'vim-scripts/Vimchant' - -" Pandoc plugins -Plug 'vim-pandoc/vim-pandoc' -Plug 'conornewton/vim-pandoc-markdown-preview' - -" Fuzzy finder -Plug 'junegunn/fzf' -Plug 'junegunn/fzf.vim' - -" Language syntax pack -Plug 'sheerun/vim-polyglot' - -" Read editorconfig settings -Plug 'editorconfig/editorconfig-vim' - -" Make directory if it doesn't exist -Plug 'pbrisbin/vim-mkdir' - -" Tree explorer -Plug 'scrooloose/nerdtree' - -" Moar snippets -Plug 'honza/vim-snippets' - -" Filetype icons -Plug 'ryanoasis/vim-devicons' - -" Surround stuff with brackets and quotes -Plug 'tpope/vim-surround' - -" Do stuff as sudo -Plug 'lambdalisue/suda.vim' - -" Conguer of Completion -Plug 'neoclide/coc.nvim', {'do': './install.sh nightly'} - -" VimL source for CoC -Plug 'Shougo/neco-vim' -Plug 'neoclide/coc-neco' - -" Git plugin -Plug 'jreybert/vimagit' - -" Git diff in gutter -Plug 'airblade/vim-gitgutter' - -" Gpg support -Plug 'jamessan/vim-gnupg' - -" Colorscheme -Plug 'joshdick/onedark.vim' - -" Latex plugin -Plug 'lervag/vimtex' - -call plug#end() diff --git a/home/.config/nvim/conf.d/02-appearance.vim b/home/.config/nvim/conf.d/02-appearance.vim deleted file mode 100644 index 955d2a24..00000000 --- a/home/.config/nvim/conf.d/02-appearance.vim +++ /dev/null @@ -1,46 +0,0 @@ -" Set colorscheme -colorscheme onedark - -" Floating window transparency -set winblend=10 - -" Enable italics -let g:onedark_terminal_italics=1 - -" Disable built-in statusline because airline shows it -set noshowmode - -" Airline -set laststatus=2 -set encoding=utf-8 -let g:airline#extensions#tabline#enabled = 1 -let g:airline_powerline_fonts = 1 -let g:airline_section_warning = '' -let g:airline_section_error = '' -let g:airline_theme='onedark' - -" True color support -set termguicolors - -" Line numbering -set relativenumber -set number - -" Always show signcolumn -set signcolumn=yes - -" Autoindent and syntax highlight -set autoindent -set smartindent -syntax on -filetype on -filetype plugin indent on -set tabstop=4 -set shiftwidth=4 - -" Make gutter and cursorline bg transparent -highlight CursorLineNr guibg=transparent -highlight SignColumn guibg=transparent - -" Don't wrap in the middle of words -set linebreak diff --git a/home/.config/nvim/conf.d/03-keybinds.vim b/home/.config/nvim/conf.d/03-keybinds.vim deleted file mode 100644 index 3f37e03a..00000000 --- a/home/.config/nvim/conf.d/03-keybinds.vim +++ /dev/null @@ -1,39 +0,0 @@ -" Change leader to space -nnoremap -let mapleader = ' ' - -" Toggle nerdtree -map :NERDTreeToggle - -" Markdown preview -nmap MarkdownPreview -nmap MarkdownPreviewStop -nmap MarkdownPreviewToggle - -set splitbelow -set splitright - -" Move between buffers -nnoremap :bn -nnoremap :bp - -" Move between splits -nnoremap -nnoremap -nnoremap -nnoremap - -" Enable mouse -set mouse=a - -" Toggle equalalways -function ToggleEqual () - :set equalalways! - :set equalalways! -endfunction - -nnoremap = :call ToggleEqual() - -" Navigate display lines insted of physical lines -nnoremap j gj -nnoremap k gk diff --git a/home/.config/nvim/conf.d/04-coc.vim b/home/.config/nvim/conf.d/04-coc.vim deleted file mode 100644 index a0424537..00000000 --- a/home/.config/nvim/conf.d/04-coc.vim +++ /dev/null @@ -1,129 +0,0 @@ -" Enable symbol highlight -autocmd CursorHold * silent call CocActionAsync('highlight') - -" If hidden is not set, TextEdit might fail. -set hidden - -" Some servers have issues with backup files, see #649 -set nobackup -set nowritebackup - -" Better display for messages -set cmdheight=2 - -" Smaller updatetime for CursorHold & CursorHoldI -set updatetime=300 - -" Don't give |ins-completion-menu| messages. -set shortmess+=c - -" Use tab for trigger completion with characters ahead and navigate. -" Use command ':verbose imap ' to make sure tab is not mapped by other plugin. -inoremap - \ pumvisible() ? "\" : - \ check_back_space() ? "\" : - \ coc#refresh() -inoremap pumvisible() ? "\" : "\" - -function! s:check_back_space() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' -endfunction - -" Use to confirm snippet -inoremap pumvisible() ? coc#_select_confirm() : - \"\u\\=coc#on_enter()\" - -" Use to trigger completion. -inoremap coc#refresh() - -" Use to confirm completion, `u` means break undo chain at current position. -" Coc only does snippet and additional edit on confirm. -inoremap pumvisible() ? "\" : "\u\" - -" Use `[c` and `]c` to navigate diagnostics -nmap [c (coc-diagnostic-prev) -nmap ]c (coc-diagnostic-next) - -" Remap keys for gotos -nmap gd (coc-definition) -nmap gy (coc-type-definition) -nmap gi (coc-implementation) -nmap gr (coc-references) - -" Use K to show documentation in preview window -nnoremap K :call show_documentation() - -function! s:show_documentation() - if (index(['vim','help'], &filetype) >= 0) - execute 'h '.expand('') - else - call CocAction('doHover') - endif -endfunction - -" Highlight symbol under cursor on CursorHold -autocmd CursorHold * silent call CocActionAsync('highlight') - -" Remap for rename current word -nmap rn (coc-rename) - -" Remap for format selected region -xmap f (coc-format-selected) -nmap f (coc-format-selected) - -augroup mygroup - autocmd! - " Setup formatexpr specified filetype(s). - autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected') - " Update signature help on jump placeholder - autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp') -augroup end - -" Remap for do codeAction of selected region, ex: `aap` for current paragraph -xmap a (coc-codeaction-selected) -nmap a (coc-codeaction-selected) - -" Remap for do codeAction of current line -nmap ac (coc-codeaction) -" Fix autofix problem of current line -nmap qf (coc-fix-current) - -" Use `:Format` to format current buffer -command! -nargs=0 Format :call CocAction('format') - -" Use `:Fold` to fold current buffer -command! -nargs=? Fold :call CocAction('fold', ) - - -" Add diagnostic info for https://github.com/itchyny/lightline.vim -let g:lightline = { - \ 'colorscheme': 'wombat', - \ 'active': { - \ 'left': [ [ 'mode', 'paste' ], - \ [ 'cocstatus', 'readonly', 'filename', 'modified' ] ] - \ }, - \ 'component_function': { - \ 'cocstatus': 'coc#status' - \ }, - \ } - - - -" Using CocList -" Show all diagnostics -nnoremap a :CocList diagnostics -" Manage extensions -nnoremap e :CocList extensions -" Show commands -nnoremap c :CocList commands -" Find symbol of current document -nnoremap o :CocList outline -" Search workspace symbols -nnoremap s :CocList -I symbols -" Do default action for next item. -nnoremap j :CocNext -" Do default action for previous item. -nnoremap k :CocPrev -" Resume latest coc list -nnoremap p :CocListResume diff --git a/home/.config/nvim/conf.d/05-language.vim b/home/.config/nvim/conf.d/05-language.vim deleted file mode 100644 index e5e7cb5e..00000000 --- a/home/.config/nvim/conf.d/05-language.vim +++ /dev/null @@ -1,12 +0,0 @@ -" LaTex settings -let g:vimtex_view_method='zathura' -let g:Tex_DefaultTargetFormat='pdf' -let g:Tex_MultipleCompileFormats='pdf, aux' -let g:vimtex_compiler_progname='nvr' - -" YAML settings -au! BufNewFile,BufReadPost *.{yaml,yml} set filetype=yaml foldmethod=indent -autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab - -" Run rustfmt on save -let g:rustfmt_autosave = 1 diff --git a/home/.config/nvim/conf.d/06-misc.vim b/home/.config/nvim/conf.d/06-misc.vim deleted file mode 100644 index 1315f116..00000000 --- a/home/.config/nvim/conf.d/06-misc.vim +++ /dev/null @@ -1,41 +0,0 @@ -" Enable python support -let g:python3_host_prog='/usr/bin/python3' -let pyxversion=3 - -" LaTex fallback flavor -let g:tex_flavor = 'latex' - -" Use suda by default -let g:suda_smart_edit = 1 - -" Remap exit terminal mode to esc -au TermOpen * tnoremap - -" Use system clipboard -set clipboard=unnamedplus - -" Remove extra line -set cmdheight=1 - -" Disable auto commenting -set formatoptions-=cro - -" Set pandoc preview program -let g:pandoc_preview_pdf_cmd = "zathura" - -" Case insensitive search -set ignorecase -set smartcase - -" Nerdtree settings -let NERDTreeMinimalUI = 1 "remove press ? for help" -let NERDTreeAutoDeleteBuffer = 1 " delete buffer when file is deleted -let NERDTreeQuitOnOpen = 1 " close nerdtree when opening file -let NERDTreeDirArrows = 1 - -" Firenvim filetypes -au BufEnter github.com_*.txt set filetype=markdown -au BufEnter gitlab.com_*.txt set filetype=markdown -au BufEnter git.reekynet.com_*.txt set filetype=markdown -au BufEnter www.reddit.com_*.txt set filetype=markdown -au BufEnter node.reekynet.com_*.txt set filetype=json diff --git a/home/.config/nvim/conf.d/07-fzf.vim b/home/.config/nvim/conf.d/07-fzf.vim deleted file mode 100644 index 60be3f2e..00000000 --- a/home/.config/nvim/conf.d/07-fzf.vim +++ /dev/null @@ -1,43 +0,0 @@ -" FZF in floating window - -autocmd! FileType fzf -autocmd FileType fzf call SetFZFoptions() -function SetFZFoptions() - set noshowmode noruler nonumber norelativenumber - tunmap -endfunction - -let g:fzf_layout = { 'window': 'call FloatingFZF()' } -function! FloatingFZF() - let buf = nvim_create_buf(v:false, v:true) - call setbufvar(buf, '&signcolumn', 'no') - - let width = float2nr(&columns * 0.8) - let height = float2nr(&lines * 0.6) - let horizontal = 1 - let vertical = 1 - - let opts = { - \ 'relative': 'editor', - \ 'row': (&lines - height) / 2, - \ 'col': (&columns - width) / 2, - \ 'width': width, - \ 'height': height, - \ 'style': 'minimal' - \ } - - call nvim_open_win(buf, v:true, opts) -endfunction - -" Looks -"let $FZF_DEFAULT_OPTS=' --color=dark --color=fg:15,bg:-1,hl:1,fg+:#ffffff,bg+:0,hl+:1 --color=info:0,prompt:0,pointer:12,marker:4,spinner:11,header:-1 --layout=reverse --margin=1,4' - -" ripgrep custom settings -command! -bang -nargs=* Rg - \ call fzf#vim#grep('rg --column --line-number --no-heading --color=always --smart-case ' - \ . (len() > 0 ? : '""'), 0, - \ fzf#vim#with_preview({'options': ['--delimiter=:', '--nth=2..', '--layout=reverse', '--info=inline']}), 0) - -" Keybinds -nmap :Files -nmap :Rg diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua new file mode 100644 index 00000000..586b1780 --- /dev/null +++ b/home/.config/nvim/init.lua @@ -0,0 +1,13 @@ +require 'pluginmanager' +require 'autocmd' +require 'keybinds' +require 'settings' + +-- Plugin configurations +require 'pluginconf.lualine' +require 'pluginconf.bufferline' +require 'pluginconf.completion' +require 'pluginconf.lsp' +require 'pluginconf.treesitter' +require 'pluginconf.telescope' +-- require 'pluginconf.indent-blankline' diff --git a/home/.config/nvim/init.vim b/home/.config/nvim/init.vim deleted file mode 100644 index 6d4602ff..00000000 --- a/home/.config/nvim/init.vim +++ /dev/null @@ -1,3 +0,0 @@ -for f in split(glob('~/.config/nvim/conf.d/*.vim'), '\n') - exe 'source' f -endfor diff --git a/home/.config/nvim/lua/autocmd.lua b/home/.config/nvim/lua/autocmd.lua new file mode 100644 index 00000000..00a0940c --- /dev/null +++ b/home/.config/nvim/lua/autocmd.lua @@ -0,0 +1,7 @@ +local cmd = vim.cmd + +-- Remap exit terminal mode to esc +cmd('au TermOpen * tnoremap ') + +-- Fix YAML indentation +cmd('au FileType yaml setlocal ts=2 sts=2 sw=2 expandtab') diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua new file mode 100644 index 00000000..198a667d --- /dev/null +++ b/home/.config/nvim/lua/keybinds.lua @@ -0,0 +1,27 @@ +local function map(mode, lhs, rhs, opts) + local options = {noremap = true} + if opts then options = vim.tbl_extend('force', options, opts) end + vim.api.nvim_set_keymap(mode, lhs, rhs, options) +end + +-- Open/close tree browser +map('n', '', 'NvimTreeToggle') + +-- Telescope +map('n', '', 'Telescope find_files find_command=fd,-Ht,f') +map('n', '', 'Telescope live_grep') + +-- Completion +-- Navigate completions with tab and shift tab +map('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) +map('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) + +-- Navigate between buffers +map('n', '', ':bn', {silent = true}) +map('n', '', ':bp', {silent = true}) + +-- Navigate between splits +map('n', '', '') +map('n', '', '') +map('n', '', '') +map('n', '', '') diff --git a/home/.config/nvim/lua/pluginconf/bufferline.lua b/home/.config/nvim/lua/pluginconf/bufferline.lua new file mode 100644 index 00000000..1c295dc9 --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/bufferline.lua @@ -0,0 +1 @@ +require("bufferline").setup{} diff --git a/home/.config/nvim/lua/pluginconf/completion.lua b/home/.config/nvim/lua/pluginconf/completion.lua new file mode 100644 index 00000000..a4e34543 --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/completion.lua @@ -0,0 +1,4 @@ +vim.o.completeopt = 'menuone,noinsert,noselect' + +-- Enable for all buffers (for now) +vim.api.nvim_command('autocmd BufEnter * lua require\'completion\'.on_attach()') diff --git a/home/.config/nvim/lua/pluginconf/indent-blankline.lua b/home/.config/nvim/lua/pluginconf/indent-blankline.lua new file mode 100644 index 00000000..a46bc830 --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/indent-blankline.lua @@ -0,0 +1 @@ +require('indent_blankline').setup {filetype_exclude = {'help'}} diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua new file mode 100644 index 00000000..0c8d629b --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -0,0 +1,143 @@ +-- List of servers to install +local required_servers = { + "css", "html", "java", "json", "lua", "rust", "yaml", "dockerfile", "latex", + "bash", "typescript", "php" +} + +-- keymaps +local on_attach = function(client, bufnr) + local function buf_set_keymap(...) + vim.api.nvim_buf_set_keymap(bufnr, ...) + end + local function buf_set_option(...) + vim.api.nvim_buf_set_option(bufnr, ...) + end + + buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') + + -- Mappings. + local opts = {noremap = true, silent = true} + buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) + buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) + buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) + buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) + buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', + opts) + buf_set_keymap('n', 'wa', + 'lua vim.lsp.buf.add_workspace_folder()', opts) + buf_set_keymap('n', 'wr', + 'lua vim.lsp.buf.remove_workspace_folder()', opts) + buf_set_keymap('n', 'wl', + 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', + opts) + buf_set_keymap('n', 'D', + 'lua vim.lsp.buf.type_definition()', opts) + buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) + buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) + buf_set_keymap('n', 'e', + 'lua vim.lsp.diagnostic.show_line_diagnostics()', + opts) + buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', + opts) + buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', + opts) + buf_set_keymap('n', 'q', + 'lua vim.lsp.diagnostic.set_loclist()', opts) + + -- Set some keybinds conditional on server capabilities + if client.resolved_capabilities.document_formatting then + buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", + opts) + elseif client.resolved_capabilities.document_range_formatting then + buf_set_keymap("n", "f", + "lua vim.lsp.buf.range_formatting()", opts) + end + + -- Set autocommands conditional on server_capabilities + if client.resolved_capabilities.document_highlight then + vim.api.nvim_exec([[ + augroup lsp_document_highlight + autocmd! * + autocmd CursorHold lua vim.lsp.buf.document_highlight() + autocmd CursorMoved lua vim.lsp.buf.clear_references() + augroup END + ]], false) + end +end + +-- Configure lua language server for neovim development +local lua_settings = { + Lua = { + runtime = { + -- LuaJIT in the case of Neovim + version = 'LuaJIT', + path = vim.split(package.path, ';') + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = {'vim'} + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = { + [vim.fn.expand('$VIMRUNTIME/lua')] = true, + [vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true + } + } + } +} + +-- config that activates keymaps and enables snippet support +local function make_config() + local capabilities = vim.lsp.protocol.make_client_capabilities() + capabilities.textDocument.completion.completionItem.snippetSupport = true + return { + -- enable snippet support + capabilities = capabilities, + -- map buffer local keybindings when the language server attaches + on_attach = on_attach + } +end + +-- lsp-install +local function setup_servers() + require'lspinstall'.setup() + + -- get all installed servers + local servers = require'lspinstall'.installed_servers() + + -- install server if not already installed but required + -- for _, server in pairs(required_servers) do + -- if not vim.tbl_contains(servers) then + -- require'lspinstall'.install_server(server) + -- end + -- end + + -- Refresh servers list in case of newly installed servers + servers = require'lspinstall'.installed_servers() + + for _, server in pairs(servers) do + local config = make_config() + + -- language specific config + if server == "lua" then config.settings = lua_settings end + require'lspconfig'[server].setup(config) + + -- Java LSP client is started by the plugin nvim-jdtls + if server == "java" then return end + + end +end + +setup_servers() + +require('jdtls').start_or_attach({ + cmd = {'java-lsp.sh'}, + root_dir = require('jdtls.setup').find_root({'gradle.build', 'pom.xml'}) +}) + +-- Automatically reload after `:LspInstall ` so we don't have to restart neovim +require'lspinstall'.post_install_hook = function() + setup_servers() -- reload installed servers + vim.cmd("bufdo e") -- this triggers the FileType autocmd that starts the server +end diff --git a/home/.config/nvim/lua/pluginconf/lualine.lua b/home/.config/nvim/lua/pluginconf/lualine.lua new file mode 100644 index 00000000..2479044b --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/lualine.lua @@ -0,0 +1,3 @@ +require'lualine'.setup { + options = {theme = 'onedark'}, +} diff --git a/home/.config/nvim/lua/pluginconf/telescope.lua b/home/.config/nvim/lua/pluginconf/telescope.lua new file mode 100644 index 00000000..e931d68a --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/telescope.lua @@ -0,0 +1,36 @@ +require('telescope').setup { + defaults = { + vimgrep_arguments = { + 'rg', '--hidden', '--color=never', '--no-heading', + '--with-filename', '--line-number', '--column', '--smart-case' + }, + prompt_prefix = "> ", + selection_caret = "> ", + entry_prefix = " ", + initial_mode = "insert", + selection_strategy = "reset", + sorting_strategy = "descending", + layout_strategy = "horizontal", + layout_config = { + horizontal = {mirror = false}, + vertical = {mirror = false} + }, + file_sorter = require'telescope.sorters'.get_fuzzy_file, + file_ignore_patterns = {}, + generic_sorter = require'telescope.sorters'.get_generic_fuzzy_sorter, + winblend = 0, + border = {}, + borderchars = {'─', '│', '─', '│', '╭', '╮', '╯', '╰'}, + color_devicons = true, + use_less = true, + path_display = {}, + set_env = {['COLORTERM'] = 'truecolor'}, -- default = nil, + file_previewer = require'telescope.previewers'.vim_buffer_cat.new, + grep_previewer = require'telescope.previewers'.vim_buffer_vimgrep.new, + qflist_previewer = require'telescope.previewers'.vim_buffer_qflist.new, + + -- Developer configurations: Not meant for general override + buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker + }, + pickers = {find_files = {find_command = {"fd", "-Ht", "f"}}} +} diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua new file mode 100644 index 00000000..12ab42bc --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -0,0 +1,6 @@ +require'nvim-treesitter.configs'.setup { + ensure_installed = 'maintained', + highlight = {enable = true}, + indent = {enable = true}, + incremental_selection = {enable = true} +} diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua new file mode 100644 index 00000000..9b559cbf --- /dev/null +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -0,0 +1,90 @@ +local fn = vim.fn +local cmd = vim.cmd + +-- Install packer if it's not yet installed +local install_path = fn.stdpath('data') .. '/site/pack/packer/opt/packer.nvim' +local packer_not_installed = fn.empty(fn.glob(install_path)) + +if packer_not_installed > 0 then + print('Packer is not installed, cloning it now...') + cmd('silent !git clone https://github.com/wbthomason/packer.nvim ' .. + install_path) +end + +-- Configure packer +cmd 'packadd packer.nvim' +local use = require('packer').use +require('packer').startup(function() + + -- The plugin manager itself + use {'wbthomason/packer.nvim', opt = true} + + -- Colorscheme + use 'monsonjeremy/onedark.nvim' + + -- Statusline + use { + 'hoob3rt/lualine.nvim', + requires = {'kyazdani42/nvim-web-devicons', opt = true} + } + + -- Tabline/bufferline + use { + 'akinsho/nvim-bufferline.lua', + requires = 'kyazdani42/nvim-web-devicons' + } + + -- Indent characters + --use "lukas-reineke/indent-blankline.nvim" + + -- Tree explorer + use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} + + -- Telescope + use { + 'nvim-telescope/telescope.nvim', + requires = {{'nvim-lua/popup.nvim'}, {'nvim-lua/plenary.nvim'}} + } + + -- Do stuff as sudo + use 'lambdalisue/suda.vim' + + -- Read editorconfig settings + use 'editorconfig/editorconfig-vim' + + -- Configs for built-in LSP + use 'neovim/nvim-lspconfig' + + -- Install LSP executables + use 'kabouzeid/nvim-lspinstall' + + -- Extensions for eclipse.jdt.ls + use 'mfussenegger/nvim-jdtls' + + -- Completion framework + use 'nvim-lua/completion-nvim' + + -- treesitter syntax highlight + use { + 'nvim-treesitter/nvim-treesitter', + branch = '0.5-compat', + run = ':TSUpdate' + } + + -- Syntax highlighting for languages + -- that are not supported by treesitter + use 'sheerun/vim-polyglot' + + -- Formatter plugin + use 'sbdchd/neoformat' + + -- Make editing passwords safer + use { + 'https://git.zx2c4.com/password-store', + rtp = 'contrib/vim/redact_pass.vim' + } + +end) + +-- Install plugins if packer was not installed +if packer_not_installed > 0 then cmd 'PackerInstall' end diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua new file mode 100644 index 00000000..4965e6ce --- /dev/null +++ b/home/.config/nvim/lua/settings.lua @@ -0,0 +1,61 @@ +local o = vim.o +local g = vim.g +local cmd = vim.cmd + +------ Appearance ------ + +-- Set colorscheme +require('onedark').setup() + +-- True colors +o.termguicolors = true + +-- Floating window transparency +o.winblend = 10 + +-- Remove extra line +o.cmdheight = 1 + +-- Always show signcolumn +o.signcolumn = 'yes' + +-- Blinking cursor +cmd 'set guicursor=i:ver1' +cmd 'set guicursor+=a:blinkon1' + +-- Gutter and cursoline bg transparent +cmd 'highlight CursorLineNr guibg=transparent' +cmd 'highlight SignColumn guibg=transparent' + +------ Misc ------- + +-- Use suda by default +g.suda_smart_edit = 1 + + +-- Split direction +o.splitbelow = true +o.splitright = true + + +-- Case insensitive search +o.ignorecase = true +o.smartcase = true + +-- Use mouse +o.mouse = 'a' + +-- Use system clipboard +o.clipboard = 'unnamedplus' + +-- Autoindent and syntax higlight +o.autoindent = true +o.smartindent = true +o.tabstop = 4 +o.shiftwidth = 4 +cmd 'syntax on' +cmd 'filetype on' +cmd 'filetype plugin indent on' + +-- Disable auto commenting +o.formatoptions = 'cro' diff --git a/home/.config/nvim/scripts/java-lsp.sh b/home/.config/nvim/scripts/java-lsp.sh new file mode 100755 index 00000000..876383a1 --- /dev/null +++ b/home/.config/nvim/scripts/java-lsp.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +JAR="$HOME/.local/share/nvim/lspinstall/java/plugins/org.eclipse.equinox.launcher_*.jar" +GRADLE_HOME=$HOME/gradle /usr/lib/jvm/default/bin/java \ + -Declipse.application=org.eclipse.jdt.ls.core.id1 \ + -Dosgi.bundles.defaultStartLevel=4 \ + -Declipse.product=org.eclipse.jdt.ls.core.product \ + -Dlog.protocol=true \ + -Dlog.level=ALL \ + -Xms1g \ + -Xmx2G \ + -jar $(echo "$JAR") \ + -configuration "$HOME/.local/share/nvim/lspinstall/java/config_linux" \ + -data "${1:-$HOME/workspace}" \ + --add-modules=ALL-SYSTEM \ + --add-opens java.base/java.util=ALL-UNNAMED \ + --add-opens java.base/java.lang=ALL-UNNAMED diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 263062bd..7341da1e 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -149,7 +149,7 @@ update() { } plugins() { - vim +PlugUpgrade +PlugUpdate +CocUpdate +qa + nvim +PackerUpdate +TSUpdate +qa zinit self-update zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all From 95a99aa1bfcf4b05357d1588347cafdcf9663817 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 8 Aug 2021 15:33:23 +0300 Subject: [PATCH 0762/2667] Refactor neovim config (#2) Changes include: - [x] Use init.lua instead of init.vim - Some keybindings are still to be converted - [x] Use packer as a package manager instead of vim-plug - [ ] Use built-in lsp instead of coc.nvim - [x] Set up language servers - [x] Completion - [x] Formatting (previously coc-prettier, now neoformat) - [ ] Snippets - [ ] Replace fzf with telescope.nvim - [x] Implement treesitter syntax highlighting - More info: https://github.com/nvim-treesitter/nvim-treesitter Note that this requires neovim nightly until 0.5 is released Reviewed-on: https://git.korhonen.cc/FunctionalHacker/dotfiles/pulls/2 Co-authored-by: Marko Korhonen Co-committed-by: Marko Korhonen --- config.yaml | 164 +++++++++--------- home/.config/nvim/coc-settings.json | 33 ---- home/.config/nvim/conf.d/01-plugins.vim | 96 ---------- home/.config/nvim/conf.d/02-appearance.vim | 46 ----- home/.config/nvim/conf.d/03-keybinds.vim | 39 ----- home/.config/nvim/conf.d/04-coc.vim | 129 -------------- home/.config/nvim/conf.d/05-language.vim | 12 -- home/.config/nvim/conf.d/06-misc.vim | 41 ----- home/.config/nvim/conf.d/07-fzf.vim | 43 ----- home/.config/nvim/init.lua | 13 ++ home/.config/nvim/init.vim | 3 - home/.config/nvim/lua/autocmd.lua | 7 + home/.config/nvim/lua/keybinds.lua | 27 +++ .../nvim/lua/pluginconf/bufferline.lua | 1 + .../nvim/lua/pluginconf/completion.lua | 4 + .../nvim/lua/pluginconf/indent-blankline.lua | 1 + home/.config/nvim/lua/pluginconf/lsp.lua | 143 +++++++++++++++ home/.config/nvim/lua/pluginconf/lualine.lua | 3 + .../.config/nvim/lua/pluginconf/telescope.lua | 36 ++++ .../nvim/lua/pluginconf/treesitter.lua | 6 + home/.config/nvim/lua/pluginmanager.lua | 90 ++++++++++ home/.config/nvim/lua/settings.lua | 61 +++++++ home/.config/nvim/scripts/java-lsp.sh | 17 ++ home/.config/zsh/03-aliases.zsh | 2 +- 24 files changed, 492 insertions(+), 525 deletions(-) delete mode 100644 home/.config/nvim/coc-settings.json delete mode 100644 home/.config/nvim/conf.d/01-plugins.vim delete mode 100644 home/.config/nvim/conf.d/02-appearance.vim delete mode 100644 home/.config/nvim/conf.d/03-keybinds.vim delete mode 100644 home/.config/nvim/conf.d/04-coc.vim delete mode 100644 home/.config/nvim/conf.d/05-language.vim delete mode 100644 home/.config/nvim/conf.d/06-misc.vim delete mode 100644 home/.config/nvim/conf.d/07-fzf.vim create mode 100644 home/.config/nvim/init.lua delete mode 100644 home/.config/nvim/init.vim create mode 100644 home/.config/nvim/lua/autocmd.lua create mode 100644 home/.config/nvim/lua/keybinds.lua create mode 100644 home/.config/nvim/lua/pluginconf/bufferline.lua create mode 100644 home/.config/nvim/lua/pluginconf/completion.lua create mode 100644 home/.config/nvim/lua/pluginconf/indent-blankline.lua create mode 100644 home/.config/nvim/lua/pluginconf/lsp.lua create mode 100644 home/.config/nvim/lua/pluginconf/lualine.lua create mode 100644 home/.config/nvim/lua/pluginconf/telescope.lua create mode 100644 home/.config/nvim/lua/pluginconf/treesitter.lua create mode 100644 home/.config/nvim/lua/pluginmanager.lua create mode 100644 home/.config/nvim/lua/settings.lua create mode 100755 home/.config/nvim/scripts/java-lsp.sh diff --git a/config.yaml b/config.yaml index 316f56d2..c46a4c86 100644 --- a/config.yaml +++ b/config.yaml @@ -1,5 +1,5 @@ actions: - vim-plug: nvim +PlugInstall +qall + nvim-packer-install: nvim +PackerInstall config: backup: true banner: true @@ -25,20 +25,20 @@ dotfiles: d_imapnotify: dst: ~/.config/imapnotify src: .config/imapnotify - f_init.vim: - dst: ~/.config/nvim/init.vim - src: .config/nvim/init.vim - d_nvim_config: + f_nvim_init: + dst: ~/.config/nvim/init.lua + src: .config/nvim/init.lua + d_nvim_lua: actions: - - vim-plug - dst: ~/.config/nvim/conf.d - src: .config/nvim/conf.d + - nvim-packer-install + dst: ~/.config/nvim/lua + src: .config/nvim/lua + d_nvim_scripts: + dst: ~/.config/nvim/scripts + src: .config/nvim/scripts f_user-dirs.dirs: dst: ~/.config/user-dirs.dirs src: .config/user-dirs.dirs - f_coc-settings.json: - dst: ~/.config/nvim/coc-settings.json - src: .config/nvim/coc-settings.json d_sway: dst: ~/.config/sway src: .config/sway @@ -165,107 +165,107 @@ dotfiles: f_gpg-agent.conf: src: .gnupg/gpg-agent.conf dst: ~/.gnupg/gpg-agent.conf - chmod: '600' + chmod: "600" f_gpg.conf: src: .gnupg/gpg.conf dst: ~/.gnupg/gpg.conf profiles: base: dotfiles: - - d_systemd + - d_systemd terminal: dotfiles: - - f_nvimpager - - f_hushlogin - - f_ripgrep_ignore - - f_ranger_commands.py - - f_rtv.cfg - - f_mailcap - - d_zsh - - f_zshrc - - f_tmux.conf - - f_ranger.conf - - f_ssh.conf - - f_authorized_keys - - d_nvim_config - - f_init.vim - - f_coc-settings.json - - f_gitconfig - - f_alacritty.yml + - f_nvimpager + - f_hushlogin + - f_ripgrep_ignore + - f_ranger_commands.py + - f_rtv.cfg + - f_mailcap + - d_zsh + - f_zshrc + - f_tmux.conf + - f_ranger.conf + - f_ssh.conf + - f_authorized_keys + - d_nvim_lua + - d_nvim_scripts + - f_nvim_init + - f_gitconfig + - f_alacritty.yml email: dotfiles: - - d_neomutt - - d_imapnotify - - f_mbsyncrc - - f_msmtp_config + - d_neomutt + - d_imapnotify + - f_mbsyncrc + - f_msmtp_config media: dotfiles: - - f_beets_config - - f_beets_whitelist - - f_abcde.conf - - d_mpv - - f_youtube-dl_config - - f_mpd.conf - - f_ncmpcpp_bindings - - f_ncmpcpp.conf - - f_libra_config - - f_mpdscribble.conf - - f_mpdris2.conf + - f_beets_config + - f_beets_whitelist + - f_abcde.conf + - d_mpv + - f_youtube-dl_config + - f_mpd.conf + - f_ncmpcpp_bindings + - f_ncmpcpp.conf + - f_libra_config + - f_mpdscribble.conf + - f_mpdris2.conf sway: dotfiles: - - d_sway - - d_waybar - - d_wofi - - f_mako_config - - f_redshift.conf - - f_zathurarc - - f_mimeo_associations.txt - - f_tdesktop_lang.strings - - f_fonts.conf - - f_zprofile + - d_sway + - d_waybar + - d_wofi + - f_mako_config + - f_redshift.conf + - f_zathurarc + - f_mimeo_associations.txt + - f_tdesktop_lang.strings + - f_fonts.conf + - f_zprofile Pacman: dotfiles: - - f_makepkg.conf - - f_paru.conf + - f_makepkg.conf + - f_paru.conf Mirkwood: include: - - base - - terminal - - email - - media - - sway - - Pacman + - base + - terminal + - email + - media + - sway + - Pacman dotfiles: - - f_paru.conf - - f_user-dirs.dirs - - f_gitconfig - - f_foot.ini - - f_gpg-agent.conf - - f_gpg.conf + - f_paru.conf + - f_user-dirs.dirs + - f_gitconfig + - f_foot.ini + - f_gpg-agent.conf + - f_gpg.conf Moria: include: - - terminal - - media - - Pacman + - terminal + - media + - Pacman Gondor: include: - - terminal - - Pacman + - terminal + - Pacman mko-laptop: include: - - terminal - - media + - terminal + - media Edoras: include: - - terminal - - Pacman + - terminal + - Pacman TakamakiPC: include: - - terminal - - Pacman + - terminal + - Pacman localhost: include: - - terminal + - terminal ViiruJaTeippi: include: - - terminal + - terminal diff --git a/home/.config/nvim/coc-settings.json b/home/.config/nvim/coc-settings.json deleted file mode 100644 index eddd81b5..00000000 --- a/home/.config/nvim/coc-settings.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "python.jediEnabled": false, - "suggest.noselect": false, - "suggest.echodocSupport": true, - "suggest.maxCompleteItemCount": 20, - "coc.preferences.formatOnSaveFiletypes": [], - "prettier.singleQuote": false, - "diagnostic.errorSign": "•", - "diagnostic.warningSign": "•", - "diagnostic.infoSign": "•", - "suggest.snippetIndicator": "~", - "rust-analyzer.serverPath": "/usr/bin/rust-analyzer", - "languageserver": { - "bash": { - "command": "bash-language-server", - "args": ["start"], - "filetypes": ["sh"], - "ignoredRootPaths": ["~"] - }, - "xml": { - "command": "xml-language-server", - "args": ["start"], - "filetypes": ["xml"], - "ignoredRootPaths": ["~"] - } - }, - "markdownlint.config": { - "rules": { - "default": true, - "line_length": false - } - } -} diff --git a/home/.config/nvim/conf.d/01-plugins.vim b/home/.config/nvim/conf.d/01-plugins.vim deleted file mode 100644 index 6c18ec60..00000000 --- a/home/.config/nvim/conf.d/01-plugins.vim +++ /dev/null @@ -1,96 +0,0 @@ -" Auto-install vim-plug -if empty(glob('~/.config/nvim/autoload/plug.vim')) - silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim - autocmd VimEnter * PlugInstall -endif - -" Set coc extensions -let g:coc_global_extensions = [ - \ 'coc-tsserver', - \ 'coc-html', - \ 'coc-tsserver', - \ 'coc-json', - \ 'coc-yaml', - \ 'coc-texlab', - \ 'coc-prettier', - \ 'coc-python', - \ 'coc-emmet', - \ 'coc-rust-analyzer', - \ 'coc-markdownlint', - \ 'coc-snippets', - \ 'coc-java', - \ 'coc-flutter' - \ ] - -call plug#begin() - -" statusline/tabline -Plug 'vim-airline/vim-airline' - -" Make editing passwords safer -Plug 'https://git.zx2c4.com/password-store', { 'rtp': 'contrib/vim/redact_pass.vim' } - -" Colorize color words -Plug 'norcalli/nvim-colorizer.lua' - -" NeoVim in Firefox -Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } } - -" Spelling -Plug 'vim-scripts/Vimchant' - -" Pandoc plugins -Plug 'vim-pandoc/vim-pandoc' -Plug 'conornewton/vim-pandoc-markdown-preview' - -" Fuzzy finder -Plug 'junegunn/fzf' -Plug 'junegunn/fzf.vim' - -" Language syntax pack -Plug 'sheerun/vim-polyglot' - -" Read editorconfig settings -Plug 'editorconfig/editorconfig-vim' - -" Make directory if it doesn't exist -Plug 'pbrisbin/vim-mkdir' - -" Tree explorer -Plug 'scrooloose/nerdtree' - -" Moar snippets -Plug 'honza/vim-snippets' - -" Filetype icons -Plug 'ryanoasis/vim-devicons' - -" Surround stuff with brackets and quotes -Plug 'tpope/vim-surround' - -" Do stuff as sudo -Plug 'lambdalisue/suda.vim' - -" Conguer of Completion -Plug 'neoclide/coc.nvim', {'do': './install.sh nightly'} - -" VimL source for CoC -Plug 'Shougo/neco-vim' -Plug 'neoclide/coc-neco' - -" Git plugin -Plug 'jreybert/vimagit' - -" Git diff in gutter -Plug 'airblade/vim-gitgutter' - -" Gpg support -Plug 'jamessan/vim-gnupg' - -" Colorscheme -Plug 'joshdick/onedark.vim' - -" Latex plugin -Plug 'lervag/vimtex' - -call plug#end() diff --git a/home/.config/nvim/conf.d/02-appearance.vim b/home/.config/nvim/conf.d/02-appearance.vim deleted file mode 100644 index 955d2a24..00000000 --- a/home/.config/nvim/conf.d/02-appearance.vim +++ /dev/null @@ -1,46 +0,0 @@ -" Set colorscheme -colorscheme onedark - -" Floating window transparency -set winblend=10 - -" Enable italics -let g:onedark_terminal_italics=1 - -" Disable built-in statusline because airline shows it -set noshowmode - -" Airline -set laststatus=2 -set encoding=utf-8 -let g:airline#extensions#tabline#enabled = 1 -let g:airline_powerline_fonts = 1 -let g:airline_section_warning = '' -let g:airline_section_error = '' -let g:airline_theme='onedark' - -" True color support -set termguicolors - -" Line numbering -set relativenumber -set number - -" Always show signcolumn -set signcolumn=yes - -" Autoindent and syntax highlight -set autoindent -set smartindent -syntax on -filetype on -filetype plugin indent on -set tabstop=4 -set shiftwidth=4 - -" Make gutter and cursorline bg transparent -highlight CursorLineNr guibg=transparent -highlight SignColumn guibg=transparent - -" Don't wrap in the middle of words -set linebreak diff --git a/home/.config/nvim/conf.d/03-keybinds.vim b/home/.config/nvim/conf.d/03-keybinds.vim deleted file mode 100644 index 3f37e03a..00000000 --- a/home/.config/nvim/conf.d/03-keybinds.vim +++ /dev/null @@ -1,39 +0,0 @@ -" Change leader to space -nnoremap -let mapleader = ' ' - -" Toggle nerdtree -map :NERDTreeToggle - -" Markdown preview -nmap MarkdownPreview -nmap MarkdownPreviewStop -nmap MarkdownPreviewToggle - -set splitbelow -set splitright - -" Move between buffers -nnoremap :bn -nnoremap :bp - -" Move between splits -nnoremap -nnoremap -nnoremap -nnoremap - -" Enable mouse -set mouse=a - -" Toggle equalalways -function ToggleEqual () - :set equalalways! - :set equalalways! -endfunction - -nnoremap = :call ToggleEqual() - -" Navigate display lines insted of physical lines -nnoremap j gj -nnoremap k gk diff --git a/home/.config/nvim/conf.d/04-coc.vim b/home/.config/nvim/conf.d/04-coc.vim deleted file mode 100644 index a0424537..00000000 --- a/home/.config/nvim/conf.d/04-coc.vim +++ /dev/null @@ -1,129 +0,0 @@ -" Enable symbol highlight -autocmd CursorHold * silent call CocActionAsync('highlight') - -" If hidden is not set, TextEdit might fail. -set hidden - -" Some servers have issues with backup files, see #649 -set nobackup -set nowritebackup - -" Better display for messages -set cmdheight=2 - -" Smaller updatetime for CursorHold & CursorHoldI -set updatetime=300 - -" Don't give |ins-completion-menu| messages. -set shortmess+=c - -" Use tab for trigger completion with characters ahead and navigate. -" Use command ':verbose imap ' to make sure tab is not mapped by other plugin. -inoremap - \ pumvisible() ? "\" : - \ check_back_space() ? "\" : - \ coc#refresh() -inoremap pumvisible() ? "\" : "\" - -function! s:check_back_space() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' -endfunction - -" Use to confirm snippet -inoremap pumvisible() ? coc#_select_confirm() : - \"\u\\=coc#on_enter()\" - -" Use to trigger completion. -inoremap coc#refresh() - -" Use to confirm completion, `u` means break undo chain at current position. -" Coc only does snippet and additional edit on confirm. -inoremap pumvisible() ? "\" : "\u\" - -" Use `[c` and `]c` to navigate diagnostics -nmap [c (coc-diagnostic-prev) -nmap ]c (coc-diagnostic-next) - -" Remap keys for gotos -nmap gd (coc-definition) -nmap gy (coc-type-definition) -nmap gi (coc-implementation) -nmap gr (coc-references) - -" Use K to show documentation in preview window -nnoremap K :call show_documentation() - -function! s:show_documentation() - if (index(['vim','help'], &filetype) >= 0) - execute 'h '.expand('') - else - call CocAction('doHover') - endif -endfunction - -" Highlight symbol under cursor on CursorHold -autocmd CursorHold * silent call CocActionAsync('highlight') - -" Remap for rename current word -nmap rn (coc-rename) - -" Remap for format selected region -xmap f (coc-format-selected) -nmap f (coc-format-selected) - -augroup mygroup - autocmd! - " Setup formatexpr specified filetype(s). - autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected') - " Update signature help on jump placeholder - autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp') -augroup end - -" Remap for do codeAction of selected region, ex: `aap` for current paragraph -xmap a (coc-codeaction-selected) -nmap a (coc-codeaction-selected) - -" Remap for do codeAction of current line -nmap ac (coc-codeaction) -" Fix autofix problem of current line -nmap qf (coc-fix-current) - -" Use `:Format` to format current buffer -command! -nargs=0 Format :call CocAction('format') - -" Use `:Fold` to fold current buffer -command! -nargs=? Fold :call CocAction('fold', ) - - -" Add diagnostic info for https://github.com/itchyny/lightline.vim -let g:lightline = { - \ 'colorscheme': 'wombat', - \ 'active': { - \ 'left': [ [ 'mode', 'paste' ], - \ [ 'cocstatus', 'readonly', 'filename', 'modified' ] ] - \ }, - \ 'component_function': { - \ 'cocstatus': 'coc#status' - \ }, - \ } - - - -" Using CocList -" Show all diagnostics -nnoremap a :CocList diagnostics -" Manage extensions -nnoremap e :CocList extensions -" Show commands -nnoremap c :CocList commands -" Find symbol of current document -nnoremap o :CocList outline -" Search workspace symbols -nnoremap s :CocList -I symbols -" Do default action for next item. -nnoremap j :CocNext -" Do default action for previous item. -nnoremap k :CocPrev -" Resume latest coc list -nnoremap p :CocListResume diff --git a/home/.config/nvim/conf.d/05-language.vim b/home/.config/nvim/conf.d/05-language.vim deleted file mode 100644 index e5e7cb5e..00000000 --- a/home/.config/nvim/conf.d/05-language.vim +++ /dev/null @@ -1,12 +0,0 @@ -" LaTex settings -let g:vimtex_view_method='zathura' -let g:Tex_DefaultTargetFormat='pdf' -let g:Tex_MultipleCompileFormats='pdf, aux' -let g:vimtex_compiler_progname='nvr' - -" YAML settings -au! BufNewFile,BufReadPost *.{yaml,yml} set filetype=yaml foldmethod=indent -autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab - -" Run rustfmt on save -let g:rustfmt_autosave = 1 diff --git a/home/.config/nvim/conf.d/06-misc.vim b/home/.config/nvim/conf.d/06-misc.vim deleted file mode 100644 index 1315f116..00000000 --- a/home/.config/nvim/conf.d/06-misc.vim +++ /dev/null @@ -1,41 +0,0 @@ -" Enable python support -let g:python3_host_prog='/usr/bin/python3' -let pyxversion=3 - -" LaTex fallback flavor -let g:tex_flavor = 'latex' - -" Use suda by default -let g:suda_smart_edit = 1 - -" Remap exit terminal mode to esc -au TermOpen * tnoremap - -" Use system clipboard -set clipboard=unnamedplus - -" Remove extra line -set cmdheight=1 - -" Disable auto commenting -set formatoptions-=cro - -" Set pandoc preview program -let g:pandoc_preview_pdf_cmd = "zathura" - -" Case insensitive search -set ignorecase -set smartcase - -" Nerdtree settings -let NERDTreeMinimalUI = 1 "remove press ? for help" -let NERDTreeAutoDeleteBuffer = 1 " delete buffer when file is deleted -let NERDTreeQuitOnOpen = 1 " close nerdtree when opening file -let NERDTreeDirArrows = 1 - -" Firenvim filetypes -au BufEnter github.com_*.txt set filetype=markdown -au BufEnter gitlab.com_*.txt set filetype=markdown -au BufEnter git.reekynet.com_*.txt set filetype=markdown -au BufEnter www.reddit.com_*.txt set filetype=markdown -au BufEnter node.reekynet.com_*.txt set filetype=json diff --git a/home/.config/nvim/conf.d/07-fzf.vim b/home/.config/nvim/conf.d/07-fzf.vim deleted file mode 100644 index 60be3f2e..00000000 --- a/home/.config/nvim/conf.d/07-fzf.vim +++ /dev/null @@ -1,43 +0,0 @@ -" FZF in floating window - -autocmd! FileType fzf -autocmd FileType fzf call SetFZFoptions() -function SetFZFoptions() - set noshowmode noruler nonumber norelativenumber - tunmap -endfunction - -let g:fzf_layout = { 'window': 'call FloatingFZF()' } -function! FloatingFZF() - let buf = nvim_create_buf(v:false, v:true) - call setbufvar(buf, '&signcolumn', 'no') - - let width = float2nr(&columns * 0.8) - let height = float2nr(&lines * 0.6) - let horizontal = 1 - let vertical = 1 - - let opts = { - \ 'relative': 'editor', - \ 'row': (&lines - height) / 2, - \ 'col': (&columns - width) / 2, - \ 'width': width, - \ 'height': height, - \ 'style': 'minimal' - \ } - - call nvim_open_win(buf, v:true, opts) -endfunction - -" Looks -"let $FZF_DEFAULT_OPTS=' --color=dark --color=fg:15,bg:-1,hl:1,fg+:#ffffff,bg+:0,hl+:1 --color=info:0,prompt:0,pointer:12,marker:4,spinner:11,header:-1 --layout=reverse --margin=1,4' - -" ripgrep custom settings -command! -bang -nargs=* Rg - \ call fzf#vim#grep('rg --column --line-number --no-heading --color=always --smart-case ' - \ . (len() > 0 ? : '""'), 0, - \ fzf#vim#with_preview({'options': ['--delimiter=:', '--nth=2..', '--layout=reverse', '--info=inline']}), 0) - -" Keybinds -nmap :Files -nmap :Rg diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua new file mode 100644 index 00000000..586b1780 --- /dev/null +++ b/home/.config/nvim/init.lua @@ -0,0 +1,13 @@ +require 'pluginmanager' +require 'autocmd' +require 'keybinds' +require 'settings' + +-- Plugin configurations +require 'pluginconf.lualine' +require 'pluginconf.bufferline' +require 'pluginconf.completion' +require 'pluginconf.lsp' +require 'pluginconf.treesitter' +require 'pluginconf.telescope' +-- require 'pluginconf.indent-blankline' diff --git a/home/.config/nvim/init.vim b/home/.config/nvim/init.vim deleted file mode 100644 index 6d4602ff..00000000 --- a/home/.config/nvim/init.vim +++ /dev/null @@ -1,3 +0,0 @@ -for f in split(glob('~/.config/nvim/conf.d/*.vim'), '\n') - exe 'source' f -endfor diff --git a/home/.config/nvim/lua/autocmd.lua b/home/.config/nvim/lua/autocmd.lua new file mode 100644 index 00000000..00a0940c --- /dev/null +++ b/home/.config/nvim/lua/autocmd.lua @@ -0,0 +1,7 @@ +local cmd = vim.cmd + +-- Remap exit terminal mode to esc +cmd('au TermOpen * tnoremap ') + +-- Fix YAML indentation +cmd('au FileType yaml setlocal ts=2 sts=2 sw=2 expandtab') diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua new file mode 100644 index 00000000..198a667d --- /dev/null +++ b/home/.config/nvim/lua/keybinds.lua @@ -0,0 +1,27 @@ +local function map(mode, lhs, rhs, opts) + local options = {noremap = true} + if opts then options = vim.tbl_extend('force', options, opts) end + vim.api.nvim_set_keymap(mode, lhs, rhs, options) +end + +-- Open/close tree browser +map('n', '', 'NvimTreeToggle') + +-- Telescope +map('n', '', 'Telescope find_files find_command=fd,-Ht,f') +map('n', '', 'Telescope live_grep') + +-- Completion +-- Navigate completions with tab and shift tab +map('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) +map('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) + +-- Navigate between buffers +map('n', '', ':bn', {silent = true}) +map('n', '', ':bp', {silent = true}) + +-- Navigate between splits +map('n', '', '') +map('n', '', '') +map('n', '', '') +map('n', '', '') diff --git a/home/.config/nvim/lua/pluginconf/bufferline.lua b/home/.config/nvim/lua/pluginconf/bufferline.lua new file mode 100644 index 00000000..1c295dc9 --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/bufferline.lua @@ -0,0 +1 @@ +require("bufferline").setup{} diff --git a/home/.config/nvim/lua/pluginconf/completion.lua b/home/.config/nvim/lua/pluginconf/completion.lua new file mode 100644 index 00000000..a4e34543 --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/completion.lua @@ -0,0 +1,4 @@ +vim.o.completeopt = 'menuone,noinsert,noselect' + +-- Enable for all buffers (for now) +vim.api.nvim_command('autocmd BufEnter * lua require\'completion\'.on_attach()') diff --git a/home/.config/nvim/lua/pluginconf/indent-blankline.lua b/home/.config/nvim/lua/pluginconf/indent-blankline.lua new file mode 100644 index 00000000..a46bc830 --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/indent-blankline.lua @@ -0,0 +1 @@ +require('indent_blankline').setup {filetype_exclude = {'help'}} diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua new file mode 100644 index 00000000..0c8d629b --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -0,0 +1,143 @@ +-- List of servers to install +local required_servers = { + "css", "html", "java", "json", "lua", "rust", "yaml", "dockerfile", "latex", + "bash", "typescript", "php" +} + +-- keymaps +local on_attach = function(client, bufnr) + local function buf_set_keymap(...) + vim.api.nvim_buf_set_keymap(bufnr, ...) + end + local function buf_set_option(...) + vim.api.nvim_buf_set_option(bufnr, ...) + end + + buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') + + -- Mappings. + local opts = {noremap = true, silent = true} + buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) + buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) + buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) + buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) + buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', + opts) + buf_set_keymap('n', 'wa', + 'lua vim.lsp.buf.add_workspace_folder()', opts) + buf_set_keymap('n', 'wr', + 'lua vim.lsp.buf.remove_workspace_folder()', opts) + buf_set_keymap('n', 'wl', + 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', + opts) + buf_set_keymap('n', 'D', + 'lua vim.lsp.buf.type_definition()', opts) + buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) + buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) + buf_set_keymap('n', 'e', + 'lua vim.lsp.diagnostic.show_line_diagnostics()', + opts) + buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', + opts) + buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', + opts) + buf_set_keymap('n', 'q', + 'lua vim.lsp.diagnostic.set_loclist()', opts) + + -- Set some keybinds conditional on server capabilities + if client.resolved_capabilities.document_formatting then + buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", + opts) + elseif client.resolved_capabilities.document_range_formatting then + buf_set_keymap("n", "f", + "lua vim.lsp.buf.range_formatting()", opts) + end + + -- Set autocommands conditional on server_capabilities + if client.resolved_capabilities.document_highlight then + vim.api.nvim_exec([[ + augroup lsp_document_highlight + autocmd! * + autocmd CursorHold lua vim.lsp.buf.document_highlight() + autocmd CursorMoved lua vim.lsp.buf.clear_references() + augroup END + ]], false) + end +end + +-- Configure lua language server for neovim development +local lua_settings = { + Lua = { + runtime = { + -- LuaJIT in the case of Neovim + version = 'LuaJIT', + path = vim.split(package.path, ';') + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = {'vim'} + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = { + [vim.fn.expand('$VIMRUNTIME/lua')] = true, + [vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true + } + } + } +} + +-- config that activates keymaps and enables snippet support +local function make_config() + local capabilities = vim.lsp.protocol.make_client_capabilities() + capabilities.textDocument.completion.completionItem.snippetSupport = true + return { + -- enable snippet support + capabilities = capabilities, + -- map buffer local keybindings when the language server attaches + on_attach = on_attach + } +end + +-- lsp-install +local function setup_servers() + require'lspinstall'.setup() + + -- get all installed servers + local servers = require'lspinstall'.installed_servers() + + -- install server if not already installed but required + -- for _, server in pairs(required_servers) do + -- if not vim.tbl_contains(servers) then + -- require'lspinstall'.install_server(server) + -- end + -- end + + -- Refresh servers list in case of newly installed servers + servers = require'lspinstall'.installed_servers() + + for _, server in pairs(servers) do + local config = make_config() + + -- language specific config + if server == "lua" then config.settings = lua_settings end + require'lspconfig'[server].setup(config) + + -- Java LSP client is started by the plugin nvim-jdtls + if server == "java" then return end + + end +end + +setup_servers() + +require('jdtls').start_or_attach({ + cmd = {'java-lsp.sh'}, + root_dir = require('jdtls.setup').find_root({'gradle.build', 'pom.xml'}) +}) + +-- Automatically reload after `:LspInstall ` so we don't have to restart neovim +require'lspinstall'.post_install_hook = function() + setup_servers() -- reload installed servers + vim.cmd("bufdo e") -- this triggers the FileType autocmd that starts the server +end diff --git a/home/.config/nvim/lua/pluginconf/lualine.lua b/home/.config/nvim/lua/pluginconf/lualine.lua new file mode 100644 index 00000000..2479044b --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/lualine.lua @@ -0,0 +1,3 @@ +require'lualine'.setup { + options = {theme = 'onedark'}, +} diff --git a/home/.config/nvim/lua/pluginconf/telescope.lua b/home/.config/nvim/lua/pluginconf/telescope.lua new file mode 100644 index 00000000..e931d68a --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/telescope.lua @@ -0,0 +1,36 @@ +require('telescope').setup { + defaults = { + vimgrep_arguments = { + 'rg', '--hidden', '--color=never', '--no-heading', + '--with-filename', '--line-number', '--column', '--smart-case' + }, + prompt_prefix = "> ", + selection_caret = "> ", + entry_prefix = " ", + initial_mode = "insert", + selection_strategy = "reset", + sorting_strategy = "descending", + layout_strategy = "horizontal", + layout_config = { + horizontal = {mirror = false}, + vertical = {mirror = false} + }, + file_sorter = require'telescope.sorters'.get_fuzzy_file, + file_ignore_patterns = {}, + generic_sorter = require'telescope.sorters'.get_generic_fuzzy_sorter, + winblend = 0, + border = {}, + borderchars = {'─', '│', '─', '│', '╭', '╮', '╯', '╰'}, + color_devicons = true, + use_less = true, + path_display = {}, + set_env = {['COLORTERM'] = 'truecolor'}, -- default = nil, + file_previewer = require'telescope.previewers'.vim_buffer_cat.new, + grep_previewer = require'telescope.previewers'.vim_buffer_vimgrep.new, + qflist_previewer = require'telescope.previewers'.vim_buffer_qflist.new, + + -- Developer configurations: Not meant for general override + buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker + }, + pickers = {find_files = {find_command = {"fd", "-Ht", "f"}}} +} diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua new file mode 100644 index 00000000..12ab42bc --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -0,0 +1,6 @@ +require'nvim-treesitter.configs'.setup { + ensure_installed = 'maintained', + highlight = {enable = true}, + indent = {enable = true}, + incremental_selection = {enable = true} +} diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua new file mode 100644 index 00000000..9b559cbf --- /dev/null +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -0,0 +1,90 @@ +local fn = vim.fn +local cmd = vim.cmd + +-- Install packer if it's not yet installed +local install_path = fn.stdpath('data') .. '/site/pack/packer/opt/packer.nvim' +local packer_not_installed = fn.empty(fn.glob(install_path)) + +if packer_not_installed > 0 then + print('Packer is not installed, cloning it now...') + cmd('silent !git clone https://github.com/wbthomason/packer.nvim ' .. + install_path) +end + +-- Configure packer +cmd 'packadd packer.nvim' +local use = require('packer').use +require('packer').startup(function() + + -- The plugin manager itself + use {'wbthomason/packer.nvim', opt = true} + + -- Colorscheme + use 'monsonjeremy/onedark.nvim' + + -- Statusline + use { + 'hoob3rt/lualine.nvim', + requires = {'kyazdani42/nvim-web-devicons', opt = true} + } + + -- Tabline/bufferline + use { + 'akinsho/nvim-bufferline.lua', + requires = 'kyazdani42/nvim-web-devicons' + } + + -- Indent characters + --use "lukas-reineke/indent-blankline.nvim" + + -- Tree explorer + use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} + + -- Telescope + use { + 'nvim-telescope/telescope.nvim', + requires = {{'nvim-lua/popup.nvim'}, {'nvim-lua/plenary.nvim'}} + } + + -- Do stuff as sudo + use 'lambdalisue/suda.vim' + + -- Read editorconfig settings + use 'editorconfig/editorconfig-vim' + + -- Configs for built-in LSP + use 'neovim/nvim-lspconfig' + + -- Install LSP executables + use 'kabouzeid/nvim-lspinstall' + + -- Extensions for eclipse.jdt.ls + use 'mfussenegger/nvim-jdtls' + + -- Completion framework + use 'nvim-lua/completion-nvim' + + -- treesitter syntax highlight + use { + 'nvim-treesitter/nvim-treesitter', + branch = '0.5-compat', + run = ':TSUpdate' + } + + -- Syntax highlighting for languages + -- that are not supported by treesitter + use 'sheerun/vim-polyglot' + + -- Formatter plugin + use 'sbdchd/neoformat' + + -- Make editing passwords safer + use { + 'https://git.zx2c4.com/password-store', + rtp = 'contrib/vim/redact_pass.vim' + } + +end) + +-- Install plugins if packer was not installed +if packer_not_installed > 0 then cmd 'PackerInstall' end diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua new file mode 100644 index 00000000..4965e6ce --- /dev/null +++ b/home/.config/nvim/lua/settings.lua @@ -0,0 +1,61 @@ +local o = vim.o +local g = vim.g +local cmd = vim.cmd + +------ Appearance ------ + +-- Set colorscheme +require('onedark').setup() + +-- True colors +o.termguicolors = true + +-- Floating window transparency +o.winblend = 10 + +-- Remove extra line +o.cmdheight = 1 + +-- Always show signcolumn +o.signcolumn = 'yes' + +-- Blinking cursor +cmd 'set guicursor=i:ver1' +cmd 'set guicursor+=a:blinkon1' + +-- Gutter and cursoline bg transparent +cmd 'highlight CursorLineNr guibg=transparent' +cmd 'highlight SignColumn guibg=transparent' + +------ Misc ------- + +-- Use suda by default +g.suda_smart_edit = 1 + + +-- Split direction +o.splitbelow = true +o.splitright = true + + +-- Case insensitive search +o.ignorecase = true +o.smartcase = true + +-- Use mouse +o.mouse = 'a' + +-- Use system clipboard +o.clipboard = 'unnamedplus' + +-- Autoindent and syntax higlight +o.autoindent = true +o.smartindent = true +o.tabstop = 4 +o.shiftwidth = 4 +cmd 'syntax on' +cmd 'filetype on' +cmd 'filetype plugin indent on' + +-- Disable auto commenting +o.formatoptions = 'cro' diff --git a/home/.config/nvim/scripts/java-lsp.sh b/home/.config/nvim/scripts/java-lsp.sh new file mode 100755 index 00000000..876383a1 --- /dev/null +++ b/home/.config/nvim/scripts/java-lsp.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +JAR="$HOME/.local/share/nvim/lspinstall/java/plugins/org.eclipse.equinox.launcher_*.jar" +GRADLE_HOME=$HOME/gradle /usr/lib/jvm/default/bin/java \ + -Declipse.application=org.eclipse.jdt.ls.core.id1 \ + -Dosgi.bundles.defaultStartLevel=4 \ + -Declipse.product=org.eclipse.jdt.ls.core.product \ + -Dlog.protocol=true \ + -Dlog.level=ALL \ + -Xms1g \ + -Xmx2G \ + -jar $(echo "$JAR") \ + -configuration "$HOME/.local/share/nvim/lspinstall/java/config_linux" \ + -data "${1:-$HOME/workspace}" \ + --add-modules=ALL-SYSTEM \ + --add-opens java.base/java.util=ALL-UNNAMED \ + --add-opens java.base/java.lang=ALL-UNNAMED diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 263062bd..7341da1e 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -149,7 +149,7 @@ update() { } plugins() { - vim +PlugUpgrade +PlugUpdate +CocUpdate +qa + nvim +PackerUpdate +TSUpdate +qa zinit self-update zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all From 57574537c845cd755d5292d8cc23979e2dd74314 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 8 Aug 2021 15:41:23 +0300 Subject: [PATCH 0763/2667] Fix zprofile sway start --- home/.zprofile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/home/.zprofile b/home/.zprofile index ed8b10ac..52c6cb96 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,5 +1 @@ -if cat /proc/cmdline | grep -q "video=eDP-1:d"; then - [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && kodi -else - [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && $HOME/.config/sway/scripts/run.sh > /dev/null 2>&1 -fi +[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway-run From 55187f9675c361abf979d8af405fdea6f486acd7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 8 Aug 2021 15:41:23 +0300 Subject: [PATCH 0764/2667] Fix zprofile sway start --- home/.zprofile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/home/.zprofile b/home/.zprofile index ed8b10ac..52c6cb96 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,5 +1 @@ -if cat /proc/cmdline | grep -q "video=eDP-1:d"; then - [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && kodi -else - [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && $HOME/.config/sway/scripts/run.sh > /dev/null 2>&1 -fi +[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway-run From 32e6a78a37b3da4331c0d30fd67c808cf6959b70 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 10 Aug 2021 11:31:19 +0300 Subject: [PATCH 0765/2667] Add mergetest git alias --- home/.gitconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.gitconfig b/home/.gitconfig index 16d6ce2d..2a49244e 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -33,3 +33,6 @@ [pull] rebase = merges + +[alias] + mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 From bbad1c4253de48f3cdc3618243c4ba8ed2ef917a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 10 Aug 2021 11:31:19 +0300 Subject: [PATCH 0766/2667] Add mergetest git alias --- home/.gitconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.gitconfig b/home/.gitconfig index 16d6ce2d..2a49244e 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -33,3 +33,6 @@ [pull] rebase = merges + +[alias] + mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 From 029bd1e41faf7625fbb1e74593ae2cd364a09880 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 12 Aug 2021 09:37:45 +0300 Subject: [PATCH 0767/2667] Add push to git mergetest alias --- home/.gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.gitconfig b/home/.gitconfig index 2a49244e..7e7a12ee 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -35,4 +35,4 @@ rebase = merges [alias] - mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 + mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 && git push From 3ea614cc214c6ff62923c3b8b1820cde2f0e2002 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 12 Aug 2021 09:37:45 +0300 Subject: [PATCH 0768/2667] Add push to git mergetest alias --- home/.gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.gitconfig b/home/.gitconfig index 2a49244e..7e7a12ee 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -35,4 +35,4 @@ rebase = merges [alias] - mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 + mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 && git push From 0502c29cdb496cbc72faf732889169e54ed2aa1d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Aug 2021 22:30:50 +0300 Subject: [PATCH 0769/2667] Enable wayland for electron and clutter --- config.yaml | 152 +++++++++++++++-------------- home/.config/electron-flags.conf | 2 + home/.config/electron12-flags.conf | 2 + root/usr/local/bin/sway-run | 4 + 4 files changed, 88 insertions(+), 72 deletions(-) create mode 100644 home/.config/electron-flags.conf create mode 100644 home/.config/electron12-flags.conf diff --git a/config.yaml b/config.yaml index c46a4c86..6cecc98b 100644 --- a/config.yaml +++ b/config.yaml @@ -30,7 +30,7 @@ dotfiles: src: .config/nvim/init.lua d_nvim_lua: actions: - - nvim-packer-install + - nvim-packer-install dst: ~/.config/nvim/lua src: .config/nvim/lua d_nvim_scripts: @@ -165,107 +165,115 @@ dotfiles: f_gpg-agent.conf: src: .gnupg/gpg-agent.conf dst: ~/.gnupg/gpg-agent.conf - chmod: "600" + chmod: '600' f_gpg.conf: src: .gnupg/gpg.conf dst: ~/.gnupg/gpg.conf + f_electron-flags.conf: + src: .config/electron-flags.conf + dst: ~/.config/electron-flags.conf + f_electron12-flags.conf: + src: .config/electron12-flags.conf + dst: ~/.config/electron12-flags.conf profiles: base: dotfiles: - - d_systemd + - d_systemd terminal: dotfiles: - - f_nvimpager - - f_hushlogin - - f_ripgrep_ignore - - f_ranger_commands.py - - f_rtv.cfg - - f_mailcap - - d_zsh - - f_zshrc - - f_tmux.conf - - f_ranger.conf - - f_ssh.conf - - f_authorized_keys - - d_nvim_lua - - d_nvim_scripts - - f_nvim_init - - f_gitconfig - - f_alacritty.yml + - f_nvimpager + - f_hushlogin + - f_ripgrep_ignore + - f_ranger_commands.py + - f_rtv.cfg + - f_mailcap + - d_zsh + - f_zshrc + - f_tmux.conf + - f_ranger.conf + - f_ssh.conf + - f_authorized_keys + - d_nvim_lua + - d_nvim_scripts + - f_nvim_init + - f_gitconfig + - f_alacritty.yml email: dotfiles: - - d_neomutt - - d_imapnotify - - f_mbsyncrc - - f_msmtp_config + - d_neomutt + - d_imapnotify + - f_mbsyncrc + - f_msmtp_config media: dotfiles: - - f_beets_config - - f_beets_whitelist - - f_abcde.conf - - d_mpv - - f_youtube-dl_config - - f_mpd.conf - - f_ncmpcpp_bindings - - f_ncmpcpp.conf - - f_libra_config - - f_mpdscribble.conf - - f_mpdris2.conf + - f_beets_config + - f_beets_whitelist + - f_abcde.conf + - d_mpv + - f_youtube-dl_config + - f_mpd.conf + - f_ncmpcpp_bindings + - f_ncmpcpp.conf + - f_libra_config + - f_mpdscribble.conf + - f_mpdris2.conf sway: dotfiles: - - d_sway - - d_waybar - - d_wofi - - f_mako_config - - f_redshift.conf - - f_zathurarc - - f_mimeo_associations.txt - - f_tdesktop_lang.strings - - f_fonts.conf - - f_zprofile + - d_sway + - d_waybar + - d_wofi + - f_mako_config + - f_redshift.conf + - f_zathurarc + - f_mimeo_associations.txt + - f_tdesktop_lang.strings + - f_fonts.conf + - f_zprofile Pacman: dotfiles: - - f_makepkg.conf - - f_paru.conf + - f_makepkg.conf + - f_paru.conf Mirkwood: include: - - base - - terminal - - email - - media - - sway - - Pacman + - base + - terminal + - email + - media + - sway + - Pacman dotfiles: - - f_paru.conf - - f_user-dirs.dirs - - f_gitconfig - - f_foot.ini - - f_gpg-agent.conf - - f_gpg.conf + - f_paru.conf + - f_user-dirs.dirs + - f_gitconfig + - f_foot.ini + - f_gpg-agent.conf + - f_gpg.conf + - f_electron-flags.conf + - f_electron12-flags.conf Moria: include: - - terminal - - media - - Pacman + - terminal + - media + - Pacman Gondor: include: - - terminal - - Pacman + - terminal + - Pacman mko-laptop: include: - - terminal - - media + - terminal + - media Edoras: include: - - terminal - - Pacman + - terminal + - Pacman TakamakiPC: include: - - terminal - - Pacman + - terminal + - Pacman localhost: include: - - terminal + - terminal ViiruJaTeippi: include: - - terminal + - terminal diff --git a/home/.config/electron-flags.conf b/home/.config/electron-flags.conf new file mode 100644 index 00000000..51bdd86f --- /dev/null +++ b/home/.config/electron-flags.conf @@ -0,0 +1,2 @@ +--enable-features=UseOzonePlatform +--ozone-platform=wayland diff --git a/home/.config/electron12-flags.conf b/home/.config/electron12-flags.conf new file mode 100644 index 00000000..51bdd86f --- /dev/null +++ b/home/.config/electron12-flags.conf @@ -0,0 +1,2 @@ +--enable-features=UseOzonePlatform +--ozone-platform=wayland diff --git a/root/usr/local/bin/sway-run b/root/usr/local/bin/sway-run index 8009f18f..ac015c91 100755 --- a/root/usr/local/bin/sway-run +++ b/root/usr/local/bin/sway-run @@ -21,6 +21,9 @@ export QT_QPA_PLATFORMTHEME=qt5ct export QT_QPA_PLATFORM=wayland export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 +# Enable wayland support on clutter +export CLUTTER_BACKEND=wayland + # Fix redshift on wlroots export WLR_DRM_NO_ATOMIC=1 @@ -37,5 +40,6 @@ unset _JAVA_OPTIONS unset QT_QPA_PLATFORMTHEME unset QT_QPA_PLATFORM unset QT_WAYLAND_DISABLE_WINDOWDECORATION +unset CLUTTER_BACKEND unset WLR_DRM_NO_ATOMIC unset XDG_CURRENT_DESKTOP From cb3ef3651576f5207767380d6f986db19c0ccdb6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Aug 2021 22:30:50 +0300 Subject: [PATCH 0770/2667] Enable wayland for electron and clutter --- config.yaml | 152 +++++++++++++++-------------- home/.config/electron-flags.conf | 2 + home/.config/electron12-flags.conf | 2 + root/usr/local/bin/sway-run | 4 + 4 files changed, 88 insertions(+), 72 deletions(-) create mode 100644 home/.config/electron-flags.conf create mode 100644 home/.config/electron12-flags.conf diff --git a/config.yaml b/config.yaml index c46a4c86..6cecc98b 100644 --- a/config.yaml +++ b/config.yaml @@ -30,7 +30,7 @@ dotfiles: src: .config/nvim/init.lua d_nvim_lua: actions: - - nvim-packer-install + - nvim-packer-install dst: ~/.config/nvim/lua src: .config/nvim/lua d_nvim_scripts: @@ -165,107 +165,115 @@ dotfiles: f_gpg-agent.conf: src: .gnupg/gpg-agent.conf dst: ~/.gnupg/gpg-agent.conf - chmod: "600" + chmod: '600' f_gpg.conf: src: .gnupg/gpg.conf dst: ~/.gnupg/gpg.conf + f_electron-flags.conf: + src: .config/electron-flags.conf + dst: ~/.config/electron-flags.conf + f_electron12-flags.conf: + src: .config/electron12-flags.conf + dst: ~/.config/electron12-flags.conf profiles: base: dotfiles: - - d_systemd + - d_systemd terminal: dotfiles: - - f_nvimpager - - f_hushlogin - - f_ripgrep_ignore - - f_ranger_commands.py - - f_rtv.cfg - - f_mailcap - - d_zsh - - f_zshrc - - f_tmux.conf - - f_ranger.conf - - f_ssh.conf - - f_authorized_keys - - d_nvim_lua - - d_nvim_scripts - - f_nvim_init - - f_gitconfig - - f_alacritty.yml + - f_nvimpager + - f_hushlogin + - f_ripgrep_ignore + - f_ranger_commands.py + - f_rtv.cfg + - f_mailcap + - d_zsh + - f_zshrc + - f_tmux.conf + - f_ranger.conf + - f_ssh.conf + - f_authorized_keys + - d_nvim_lua + - d_nvim_scripts + - f_nvim_init + - f_gitconfig + - f_alacritty.yml email: dotfiles: - - d_neomutt - - d_imapnotify - - f_mbsyncrc - - f_msmtp_config + - d_neomutt + - d_imapnotify + - f_mbsyncrc + - f_msmtp_config media: dotfiles: - - f_beets_config - - f_beets_whitelist - - f_abcde.conf - - d_mpv - - f_youtube-dl_config - - f_mpd.conf - - f_ncmpcpp_bindings - - f_ncmpcpp.conf - - f_libra_config - - f_mpdscribble.conf - - f_mpdris2.conf + - f_beets_config + - f_beets_whitelist + - f_abcde.conf + - d_mpv + - f_youtube-dl_config + - f_mpd.conf + - f_ncmpcpp_bindings + - f_ncmpcpp.conf + - f_libra_config + - f_mpdscribble.conf + - f_mpdris2.conf sway: dotfiles: - - d_sway - - d_waybar - - d_wofi - - f_mako_config - - f_redshift.conf - - f_zathurarc - - f_mimeo_associations.txt - - f_tdesktop_lang.strings - - f_fonts.conf - - f_zprofile + - d_sway + - d_waybar + - d_wofi + - f_mako_config + - f_redshift.conf + - f_zathurarc + - f_mimeo_associations.txt + - f_tdesktop_lang.strings + - f_fonts.conf + - f_zprofile Pacman: dotfiles: - - f_makepkg.conf - - f_paru.conf + - f_makepkg.conf + - f_paru.conf Mirkwood: include: - - base - - terminal - - email - - media - - sway - - Pacman + - base + - terminal + - email + - media + - sway + - Pacman dotfiles: - - f_paru.conf - - f_user-dirs.dirs - - f_gitconfig - - f_foot.ini - - f_gpg-agent.conf - - f_gpg.conf + - f_paru.conf + - f_user-dirs.dirs + - f_gitconfig + - f_foot.ini + - f_gpg-agent.conf + - f_gpg.conf + - f_electron-flags.conf + - f_electron12-flags.conf Moria: include: - - terminal - - media - - Pacman + - terminal + - media + - Pacman Gondor: include: - - terminal - - Pacman + - terminal + - Pacman mko-laptop: include: - - terminal - - media + - terminal + - media Edoras: include: - - terminal - - Pacman + - terminal + - Pacman TakamakiPC: include: - - terminal - - Pacman + - terminal + - Pacman localhost: include: - - terminal + - terminal ViiruJaTeippi: include: - - terminal + - terminal diff --git a/home/.config/electron-flags.conf b/home/.config/electron-flags.conf new file mode 100644 index 00000000..51bdd86f --- /dev/null +++ b/home/.config/electron-flags.conf @@ -0,0 +1,2 @@ +--enable-features=UseOzonePlatform +--ozone-platform=wayland diff --git a/home/.config/electron12-flags.conf b/home/.config/electron12-flags.conf new file mode 100644 index 00000000..51bdd86f --- /dev/null +++ b/home/.config/electron12-flags.conf @@ -0,0 +1,2 @@ +--enable-features=UseOzonePlatform +--ozone-platform=wayland diff --git a/root/usr/local/bin/sway-run b/root/usr/local/bin/sway-run index 8009f18f..ac015c91 100755 --- a/root/usr/local/bin/sway-run +++ b/root/usr/local/bin/sway-run @@ -21,6 +21,9 @@ export QT_QPA_PLATFORMTHEME=qt5ct export QT_QPA_PLATFORM=wayland export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 +# Enable wayland support on clutter +export CLUTTER_BACKEND=wayland + # Fix redshift on wlroots export WLR_DRM_NO_ATOMIC=1 @@ -37,5 +40,6 @@ unset _JAVA_OPTIONS unset QT_QPA_PLATFORMTHEME unset QT_QPA_PLATFORM unset QT_WAYLAND_DISABLE_WINDOWDECORATION +unset CLUTTER_BACKEND unset WLR_DRM_NO_ATOMIC unset XDG_CURRENT_DESKTOP From 1b7cf19018cb03a6e9dc65e43b8c0d9e062dec02 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Aug 2021 22:32:37 +0300 Subject: [PATCH 0771/2667] Enable corectl --- efistub/arch.efi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/efistub/arch.efi b/efistub/arch.efi index c0932d67..55640c6b 100755 --- a/efistub/arch.efi +++ b/efistub/arch.efi @@ -9,4 +9,4 @@ sudo efibootmgr \ --remove-dups \ --label "Arch Linux" \ --loader /vmlinuz-linux \ - --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' + --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo amdgpu.ppfeaturemask=0xffffffff' From ff7e505a60ca90c421002489d6dd9f4a4f3e4424 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Aug 2021 22:32:37 +0300 Subject: [PATCH 0772/2667] Enable corectl --- efistub/arch.efi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/efistub/arch.efi b/efistub/arch.efi index c0932d67..55640c6b 100755 --- a/efistub/arch.efi +++ b/efistub/arch.efi @@ -9,4 +9,4 @@ sudo efibootmgr \ --remove-dups \ --label "Arch Linux" \ --loader /vmlinuz-linux \ - --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' + --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo amdgpu.ppfeaturemask=0xffffffff' From db8e895e3d6c51c3d91cce0a9a76c88c0f350f5a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Aug 2021 22:33:11 +0300 Subject: [PATCH 0773/2667] Add gammastep for sway --- home/.config/sway/conf.d/08-exec.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 19289cfe..adca6ca2 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -16,6 +16,8 @@ exec { mpDris2 swaymsg workspace 1 dbus-update-activation-environment DISPLAY + /usr/lib/geoclue-2.0/demos/agent + gammastep-indicator } exec_always { From f6cf8443e4d0c48acbd21296065ab3ffbe96eada Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Aug 2021 22:33:11 +0300 Subject: [PATCH 0774/2667] Add gammastep for sway --- home/.config/sway/conf.d/08-exec.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 19289cfe..adca6ca2 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -16,6 +16,8 @@ exec { mpDris2 swaymsg workspace 1 dbus-update-activation-environment DISPLAY + /usr/lib/geoclue-2.0/demos/agent + gammastep-indicator } exec_always { From 5e92dccee02449f25ea6b33aba314419e2d5f7a0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Aug 2021 22:33:24 +0300 Subject: [PATCH 0775/2667] Disable java lsp for now --- home/.config/nvim/lua/pluginconf/lsp.lua | 25 +----------------------- 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 0c8d629b..1f654b98 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -1,9 +1,3 @@ --- List of servers to install -local required_servers = { - "css", "html", "java", "json", "lua", "rust", "yaml", "dockerfile", "latex", - "bash", "typescript", "php" -} - -- keymaps local on_attach = function(client, bufnr) local function buf_set_keymap(...) @@ -106,36 +100,19 @@ local function setup_servers() -- get all installed servers local servers = require'lspinstall'.installed_servers() - -- install server if not already installed but required - -- for _, server in pairs(required_servers) do - -- if not vim.tbl_contains(servers) then - -- require'lspinstall'.install_server(server) - -- end - -- end - - -- Refresh servers list in case of newly installed servers - servers = require'lspinstall'.installed_servers() - for _, server in pairs(servers) do local config = make_config() -- language specific config if server == "lua" then config.settings = lua_settings end - require'lspconfig'[server].setup(config) - -- Java LSP client is started by the plugin nvim-jdtls - if server == "java" then return end + require'lspconfig'[server].setup(config) end end setup_servers() -require('jdtls').start_or_attach({ - cmd = {'java-lsp.sh'}, - root_dir = require('jdtls.setup').find_root({'gradle.build', 'pom.xml'}) -}) - -- Automatically reload after `:LspInstall ` so we don't have to restart neovim require'lspinstall'.post_install_hook = function() setup_servers() -- reload installed servers From b55b6468d1cd394e30aaf9017522c9d30af29ebd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Aug 2021 22:33:24 +0300 Subject: [PATCH 0776/2667] Disable java lsp for now --- home/.config/nvim/lua/pluginconf/lsp.lua | 25 +----------------------- 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 0c8d629b..1f654b98 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -1,9 +1,3 @@ --- List of servers to install -local required_servers = { - "css", "html", "java", "json", "lua", "rust", "yaml", "dockerfile", "latex", - "bash", "typescript", "php" -} - -- keymaps local on_attach = function(client, bufnr) local function buf_set_keymap(...) @@ -106,36 +100,19 @@ local function setup_servers() -- get all installed servers local servers = require'lspinstall'.installed_servers() - -- install server if not already installed but required - -- for _, server in pairs(required_servers) do - -- if not vim.tbl_contains(servers) then - -- require'lspinstall'.install_server(server) - -- end - -- end - - -- Refresh servers list in case of newly installed servers - servers = require'lspinstall'.installed_servers() - for _, server in pairs(servers) do local config = make_config() -- language specific config if server == "lua" then config.settings = lua_settings end - require'lspconfig'[server].setup(config) - -- Java LSP client is started by the plugin nvim-jdtls - if server == "java" then return end + require'lspconfig'[server].setup(config) end end setup_servers() -require('jdtls').start_or_attach({ - cmd = {'java-lsp.sh'}, - root_dir = require('jdtls.setup').find_root({'gradle.build', 'pom.xml'}) -}) - -- Automatically reload after `:LspInstall ` so we don't have to restart neovim require'lspinstall'.post_install_hook = function() setup_servers() -- reload installed servers From 71cc2c21c5d045b2f5c5e62e88ad3505c9308a7e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Aug 2021 23:05:32 +0300 Subject: [PATCH 0777/2667] Remove unused docker-compose stack --- docker/auth/.gitignore | 1 - docker/auth/docker-compose.yaml | 20 -------------------- 2 files changed, 21 deletions(-) delete mode 100644 docker/auth/.gitignore delete mode 100644 docker/auth/docker-compose.yaml diff --git a/docker/auth/.gitignore b/docker/auth/.gitignore deleted file mode 100644 index 4c49bd78..00000000 --- a/docker/auth/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.env diff --git a/docker/auth/docker-compose.yaml b/docker/auth/docker-compose.yaml deleted file mode 100644 index 7bbc62f1..00000000 --- a/docker/auth/docker-compose.yaml +++ /dev/null @@ -1,20 +0,0 @@ -version: "2" - -services: - openldap: - container_name: openldap - image: osixia/openldap:stable - environment: - - TZ=Europe/Helsinki - - LDAP_ORGANIZATION="Korhonen" - - LDAP_DOMAIN="korhonen.cc" - - LDAP_ADMIN_PASSWORD="${LDAP_ADMIN_PASSWORD}" - hostname: ldap.korhonen.cc - ports: - - 389:389 - - 636:636 - restart: unless-stopped - volumes: - - /docker/auth/openldap/ldap:/var/lib/ldap - - /docker/auth/openldap/slapd.d:/etc/ldap/slapd.d - - /etc/localtime:/etc/localtime:ro From b301ede52aa64720d487e55bd00dd73b0a2e98ff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Aug 2021 23:05:32 +0300 Subject: [PATCH 0778/2667] Remove unused docker-compose stack --- docker/auth/.gitignore | 1 - docker/auth/docker-compose.yaml | 20 -------------------- 2 files changed, 21 deletions(-) delete mode 100644 docker/auth/.gitignore delete mode 100644 docker/auth/docker-compose.yaml diff --git a/docker/auth/.gitignore b/docker/auth/.gitignore deleted file mode 100644 index 4c49bd78..00000000 --- a/docker/auth/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.env diff --git a/docker/auth/docker-compose.yaml b/docker/auth/docker-compose.yaml deleted file mode 100644 index 7bbc62f1..00000000 --- a/docker/auth/docker-compose.yaml +++ /dev/null @@ -1,20 +0,0 @@ -version: "2" - -services: - openldap: - container_name: openldap - image: osixia/openldap:stable - environment: - - TZ=Europe/Helsinki - - LDAP_ORGANIZATION="Korhonen" - - LDAP_DOMAIN="korhonen.cc" - - LDAP_ADMIN_PASSWORD="${LDAP_ADMIN_PASSWORD}" - hostname: ldap.korhonen.cc - ports: - - 389:389 - - 636:636 - restart: unless-stopped - volumes: - - /docker/auth/openldap/ldap:/var/lib/ldap - - /docker/auth/openldap/slapd.d:/etc/ldap/slapd.d - - /etc/localtime:/etc/localtime:ro From 357743c47200372299298f9eb36f40e054242215 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 17:41:52 +0300 Subject: [PATCH 0779/2667] Sway: fix unfocused text color --- home/.config/sway/conf.d/07-appearance.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/07-appearance.conf b/home/.config/sway/conf.d/07-appearance.conf index 241d3d70..70dfb113 100644 --- a/home/.config/sway/conf.d/07-appearance.conf +++ b/home/.config/sway/conf.d/07-appearance.conf @@ -10,7 +10,7 @@ seat * hide_cursor 4000 ###### Borders ###### # class border backgr. text indicator child_border client.focused #8AC6F2 #8AC6F2 #292D3E #8AC6F2 #8AC6F2 -client.focused_inactive #292D3E #FFFFFF #FFFFFF #292D3E #292D3E +client.focused_inactive #292D3E #FFFFFF #292D3E #292D3E #292D3E client.unfocused #292D3E #292D3E #FFFFFF #282828 #292D3E for_window [app_id="^.*"] border pixel 4 From e5d07324a5cc13cbbe40c08a9dfefde1619ab77e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 17:41:52 +0300 Subject: [PATCH 0780/2667] Sway: fix unfocused text color --- home/.config/sway/conf.d/07-appearance.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/07-appearance.conf b/home/.config/sway/conf.d/07-appearance.conf index 241d3d70..70dfb113 100644 --- a/home/.config/sway/conf.d/07-appearance.conf +++ b/home/.config/sway/conf.d/07-appearance.conf @@ -10,7 +10,7 @@ seat * hide_cursor 4000 ###### Borders ###### # class border backgr. text indicator child_border client.focused #8AC6F2 #8AC6F2 #292D3E #8AC6F2 #8AC6F2 -client.focused_inactive #292D3E #FFFFFF #FFFFFF #292D3E #292D3E +client.focused_inactive #292D3E #FFFFFF #292D3E #292D3E #292D3E client.unfocused #292D3E #292D3E #FFFFFF #282828 #292D3E for_window [app_id="^.*"] border pixel 4 From f6fc1d4bdfe1ae5f990bd2220738cc019b5ae541 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 17:43:30 +0300 Subject: [PATCH 0781/2667] Switch from nvimpager to just nvim as pager --- home/.config/zsh/01-env.zsh | 5 +++-- home/.config/zsh/03-aliases.zsh | 11 ++--------- home/.gitconfig | 4 ++++ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 2658b0d0..b7e8540b 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -22,7 +22,7 @@ export FZF_ALT_C_COMMAND='fd -Ht d' export FZF_DEFAULT_OPTS='-m --bind ctrl-a:select-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" -export FZF_CTRL_T_OPTS='--preview "/usr/bin/cat {} | nvimpager -c "' +export FZF_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' # use lesspipe with less export LESSOPEN="|lesspipe.sh %s" @@ -32,8 +32,9 @@ export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim -export PAGER="nvimpager -p" +export PAGER="sed 's/\x1b\[[0-9;]*m//g' | nvim -R" export AUR_PAGER=$PAGER +export MANPAGER="nvim -c 'set ft=man' -R" # Use GPG for SSH authentication export GPG_TTY="$(tty)" diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 7341da1e..56001b24 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -6,15 +6,8 @@ alias gpush='git push' alias mutt='neomutt' -# Syntax highlighting cat if output is a terminal -cat() { - # Check if output is a terminal, else use regular cat - if [ -t 1 ]; then - nvimpager $@ - else - /usr/bin/cat $@ - fi -} +# Syntax highlighting cat +alias cat='bat' rip() { abcde diff --git a/home/.gitconfig b/home/.gitconfig index 7e7a12ee..fb3d29c2 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -21,6 +21,7 @@ [merge] prompt = false tool = nvim-merge + [mergetool "nvim-merge"] cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' @@ -36,3 +37,6 @@ [alias] mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 && git push + +[color] + pager = no From 9d3972a54a70715b25f8578ae47b73ee415c3ad5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 17:43:30 +0300 Subject: [PATCH 0782/2667] Switch from nvimpager to just nvim as pager --- home/.config/zsh/01-env.zsh | 5 +++-- home/.config/zsh/03-aliases.zsh | 11 ++--------- home/.gitconfig | 4 ++++ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 2658b0d0..b7e8540b 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -22,7 +22,7 @@ export FZF_ALT_C_COMMAND='fd -Ht d' export FZF_DEFAULT_OPTS='-m --bind ctrl-a:select-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" -export FZF_CTRL_T_OPTS='--preview "/usr/bin/cat {} | nvimpager -c "' +export FZF_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' # use lesspipe with less export LESSOPEN="|lesspipe.sh %s" @@ -32,8 +32,9 @@ export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim -export PAGER="nvimpager -p" +export PAGER="sed 's/\x1b\[[0-9;]*m//g' | nvim -R" export AUR_PAGER=$PAGER +export MANPAGER="nvim -c 'set ft=man' -R" # Use GPG for SSH authentication export GPG_TTY="$(tty)" diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 7341da1e..56001b24 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -6,15 +6,8 @@ alias gpush='git push' alias mutt='neomutt' -# Syntax highlighting cat if output is a terminal -cat() { - # Check if output is a terminal, else use regular cat - if [ -t 1 ]; then - nvimpager $@ - else - /usr/bin/cat $@ - fi -} +# Syntax highlighting cat +alias cat='bat' rip() { abcde diff --git a/home/.gitconfig b/home/.gitconfig index 7e7a12ee..fb3d29c2 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -21,6 +21,7 @@ [merge] prompt = false tool = nvim-merge + [mergetool "nvim-merge"] cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' @@ -36,3 +37,6 @@ [alias] mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 && git push + +[color] + pager = no From 9103822ae8210285792b095f35b75df89abe480d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 19:17:38 +0300 Subject: [PATCH 0783/2667] ZSH improvements: - Move from FZF to skim (seems to be a bit faster and smooth) - Improve history * Add new options to not save duplicate entries etc * pi/pr aliases expand the paru command to history now --- home/.config/zsh/01-env.zsh | 42 ++++++++++++++++++++++----------- home/.config/zsh/02-plugins.zsh | 6 ++--- home/.config/zsh/03-aliases.zsh | 23 +++++++----------- 3 files changed, 40 insertions(+), 31 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index b7e8540b..b9542c50 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -1,14 +1,23 @@ -# zsh key timeout +# key timeout export KEYTIMEOUT=1 # prompt customization export PURE_PROMPT_SYMBOL="λ" export PURE_PROMPT_VICMD_SYMBOL="y" -# zsh history settings +# history settings export HISTFILE=~/.zsh_history -export HISTSIZE=1000 -export SAVEHIST=1000 +export HISTSIZE=10000 +export SAVEHIST=10000 +# Ignore these functions from history since they will +# append the expandend command to the history +export HISTORY_IGNORE="(pi|pr)" +# Additional settings (source https://jdhao.github.io/2021/03/24/zsh_history_setup) +setopt HIST_IGNORE_ALL_DUPS +setopt HIST_SAVE_NO_DUPS +setopt HIST_REDUCE_BLANKS +setopt INC_APPEND_HISTORY_TIME +setopt EXTENDED_HISTORY # Variable to pass to sdotdrop to get current user export USRNAME=$USER @@ -16,16 +25,21 @@ export USRNAME=$USER # go path export GOPATH=~/.bin/go -# fzf settings -export FZF_DEFAULT_COMMAND='fd -Ht f' -export FZF_ALT_C_COMMAND='fd -Ht d' -export FZF_DEFAULT_OPTS='-m --bind ctrl-a:select-all,ctrl-d:deselect-all,ctrl-t:toggle-all' -export FZF_COMPLETION_TRIGGER='**' -export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" -export FZF_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' - -# use lesspipe with less -export LESSOPEN="|lesspipe.sh %s" +# skim settings +export SKIM_DEFAULT_COMMAND='fd -Ht f' +export SKIM_ALT_C_COMMAND='fd -Ht d' +export SKIM_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' +export SKIM_DEFAULT_OPTIONS="$SKIM_DEFAULT_OPTS" # TODO make an issue/PR about this difference +export SKIM_COMPLETION_TRIGGER='**' +export SKIM_CTRL_T_COMMAND="$SKIM_DEFAULT_COMMAND" +export SKIM_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' +# copy for fzf, incase I ever use it +export FZF_DEFAULT_COMMAND="$SKIM_DEFAULT_COMMAND" +export FZF_ALT_C_COMMAND="$SKIM_ALT_C_COMMAND" +export FZF_DEFAULT_OPTS="$SKIM_DEFAULT_OPTS" +export FZF_COMPLETION_TRIGGER="$SKIM_COMPLETION_TRIGGER" +export FZF_CTRL_T_COMMAND="$SKIM_DEFAULT_COMMAND" +export FZF_CTRL_T_OPTS="$SKIM_CTRL_T_OPTS" # dotfile repository location export DOTREPO="$HOME/git/dotfiles" diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh index ddc94ff5..52a53068 100644 --- a/home/.config/zsh/02-plugins.zsh +++ b/home/.config/zsh/02-plugins.zsh @@ -40,8 +40,8 @@ zinit light zdharma/fast-syntax-highlighting # use fzf with zsh {%@@ if profile == "mko-laptop" @@%} -source ~/.fzf.zsh +source ~/.skim.zsh {%@@ else @@%} -source /usr/share/fzf/key-bindings.zsh -source /usr/share/fzf/completion.zsh +source /usr/share/skim/key-bindings.zsh +source /usr/share/skim/completion.zsh {%@@ endif @@%} diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 56001b24..162fdcf2 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -6,16 +6,7 @@ alias gpush='git push' alias mutt='neomutt' -# Syntax highlighting cat -alias cat='bat' - -rip() { - abcde - printf "Ripping done. Importing to library" - beet import ~/Documents/Rip/flac/* -} - -# make fzf zsh plugin use ripgrep +# make fzf zsh plugin use fd _fzf_compgen_dir() { fd -Ht d } @@ -23,18 +14,22 @@ _fzf_compgen_path() { fd -Ht f } -# search and install packages with fzf +# search and install packages with skim pi() { - SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}')" + SELECTED_PKGS="$(paru -Slq | sk --header='Install packages' -m --preview 'paru -Si {1}')" if [ -n "$SELECTED_PKGS" ]; then + # Append the expanded command to history + print -s "paru -S $(echo $SELECTED_PKGS)" paru -S $(echo $SELECTED_PKGS) fi } -# search and remove packages with fzf +# search and remove packages with skim pr() { - SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}')" + SELECTED_PKGS="$(paru -Qsq | sk --header='Remove packages' -m --preview 'paru -Si {1}')" if [ -n "$SELECTED_PKGS" ]; then + # Append the expanded command to history + print -s "paru -Rns $(echo $SELECTED_PKGS)" paru -Rns $(echo $SELECTED_PKGS) fi } From 270a580e8ec49938d15f1251cc81147d7e1b0463 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 19:17:38 +0300 Subject: [PATCH 0784/2667] ZSH improvements: - Move from FZF to skim (seems to be a bit faster and smooth) - Improve history * Add new options to not save duplicate entries etc * pi/pr aliases expand the paru command to history now --- home/.config/zsh/01-env.zsh | 42 ++++++++++++++++++++++----------- home/.config/zsh/02-plugins.zsh | 6 ++--- home/.config/zsh/03-aliases.zsh | 23 +++++++----------- 3 files changed, 40 insertions(+), 31 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index b7e8540b..b9542c50 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -1,14 +1,23 @@ -# zsh key timeout +# key timeout export KEYTIMEOUT=1 # prompt customization export PURE_PROMPT_SYMBOL="λ" export PURE_PROMPT_VICMD_SYMBOL="y" -# zsh history settings +# history settings export HISTFILE=~/.zsh_history -export HISTSIZE=1000 -export SAVEHIST=1000 +export HISTSIZE=10000 +export SAVEHIST=10000 +# Ignore these functions from history since they will +# append the expandend command to the history +export HISTORY_IGNORE="(pi|pr)" +# Additional settings (source https://jdhao.github.io/2021/03/24/zsh_history_setup) +setopt HIST_IGNORE_ALL_DUPS +setopt HIST_SAVE_NO_DUPS +setopt HIST_REDUCE_BLANKS +setopt INC_APPEND_HISTORY_TIME +setopt EXTENDED_HISTORY # Variable to pass to sdotdrop to get current user export USRNAME=$USER @@ -16,16 +25,21 @@ export USRNAME=$USER # go path export GOPATH=~/.bin/go -# fzf settings -export FZF_DEFAULT_COMMAND='fd -Ht f' -export FZF_ALT_C_COMMAND='fd -Ht d' -export FZF_DEFAULT_OPTS='-m --bind ctrl-a:select-all,ctrl-d:deselect-all,ctrl-t:toggle-all' -export FZF_COMPLETION_TRIGGER='**' -export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" -export FZF_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' - -# use lesspipe with less -export LESSOPEN="|lesspipe.sh %s" +# skim settings +export SKIM_DEFAULT_COMMAND='fd -Ht f' +export SKIM_ALT_C_COMMAND='fd -Ht d' +export SKIM_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' +export SKIM_DEFAULT_OPTIONS="$SKIM_DEFAULT_OPTS" # TODO make an issue/PR about this difference +export SKIM_COMPLETION_TRIGGER='**' +export SKIM_CTRL_T_COMMAND="$SKIM_DEFAULT_COMMAND" +export SKIM_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' +# copy for fzf, incase I ever use it +export FZF_DEFAULT_COMMAND="$SKIM_DEFAULT_COMMAND" +export FZF_ALT_C_COMMAND="$SKIM_ALT_C_COMMAND" +export FZF_DEFAULT_OPTS="$SKIM_DEFAULT_OPTS" +export FZF_COMPLETION_TRIGGER="$SKIM_COMPLETION_TRIGGER" +export FZF_CTRL_T_COMMAND="$SKIM_DEFAULT_COMMAND" +export FZF_CTRL_T_OPTS="$SKIM_CTRL_T_OPTS" # dotfile repository location export DOTREPO="$HOME/git/dotfiles" diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh index ddc94ff5..52a53068 100644 --- a/home/.config/zsh/02-plugins.zsh +++ b/home/.config/zsh/02-plugins.zsh @@ -40,8 +40,8 @@ zinit light zdharma/fast-syntax-highlighting # use fzf with zsh {%@@ if profile == "mko-laptop" @@%} -source ~/.fzf.zsh +source ~/.skim.zsh {%@@ else @@%} -source /usr/share/fzf/key-bindings.zsh -source /usr/share/fzf/completion.zsh +source /usr/share/skim/key-bindings.zsh +source /usr/share/skim/completion.zsh {%@@ endif @@%} diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 56001b24..162fdcf2 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -6,16 +6,7 @@ alias gpush='git push' alias mutt='neomutt' -# Syntax highlighting cat -alias cat='bat' - -rip() { - abcde - printf "Ripping done. Importing to library" - beet import ~/Documents/Rip/flac/* -} - -# make fzf zsh plugin use ripgrep +# make fzf zsh plugin use fd _fzf_compgen_dir() { fd -Ht d } @@ -23,18 +14,22 @@ _fzf_compgen_path() { fd -Ht f } -# search and install packages with fzf +# search and install packages with skim pi() { - SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}')" + SELECTED_PKGS="$(paru -Slq | sk --header='Install packages' -m --preview 'paru -Si {1}')" if [ -n "$SELECTED_PKGS" ]; then + # Append the expanded command to history + print -s "paru -S $(echo $SELECTED_PKGS)" paru -S $(echo $SELECTED_PKGS) fi } -# search and remove packages with fzf +# search and remove packages with skim pr() { - SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}')" + SELECTED_PKGS="$(paru -Qsq | sk --header='Remove packages' -m --preview 'paru -Si {1}')" if [ -n "$SELECTED_PKGS" ]; then + # Append the expanded command to history + print -s "paru -Rns $(echo $SELECTED_PKGS)" paru -Rns $(echo $SELECTED_PKGS) fi } From 8dd183766de84cce0e6ecea929c1b06aad3496ed Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 19:36:11 +0300 Subject: [PATCH 0785/2667] Add ~/.bin to path --- home/.config/zsh/01-env.zsh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index b9542c50..66f25094 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -22,8 +22,11 @@ setopt EXTENDED_HISTORY # Variable to pass to sdotdrop to get current user export USRNAME=$USER +# Add ~/.bin to path +export PATH="/home/$USER/.bin:$PATH" + # go path -export GOPATH=~/.bin/go +export GOPATH=~/.go # skim settings export SKIM_DEFAULT_COMMAND='fd -Ht f' From 0f653f785f5c1534b1028924f7181284ed19cf9b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 19:36:11 +0300 Subject: [PATCH 0786/2667] Add ~/.bin to path --- home/.config/zsh/01-env.zsh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index b9542c50..66f25094 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -22,8 +22,11 @@ setopt EXTENDED_HISTORY # Variable to pass to sdotdrop to get current user export USRNAME=$USER +# Add ~/.bin to path +export PATH="/home/$USER/.bin:$PATH" + # go path -export GOPATH=~/.bin/go +export GOPATH=~/.go # skim settings export SKIM_DEFAULT_COMMAND='fd -Ht f' From a0d236b56fbd0a18d641238ea490dd1685317c53 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 20:32:46 +0300 Subject: [PATCH 0787/2667] Some fixes for skim --- home/.config/zsh/02-plugins.zsh | 11 +++++++---- home/.config/zsh/03-aliases.zsh | 17 ++++++++++++----- home/.ignore | 3 ++- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh index 52a53068..f82c01c4 100644 --- a/home/.config/zsh/02-plugins.zsh +++ b/home/.config/zsh/02-plugins.zsh @@ -10,7 +10,7 @@ source ~/.zinit/bin/zinit.zsh zinit ice load multisrc'{async,pure}.zsh' zinit light sindresorhus/pure -# fzf as tab completion +# skim as tab completion zinit ice lucid zinit light Aloxaf/fzf-tab @@ -18,7 +18,7 @@ zinit light Aloxaf/fzf-tab zinit ice lucid zinit light zsh-users/zsh-history-substring-search -# fzf git awesomeness +# skim git awesomeness zinit ice wait'1' lucid atload'source $HOME/.config/zsh/03-aliases.zsh' zinit light wfxr/forgit @@ -38,9 +38,12 @@ zinit snippet '$DOTREPO/dotdrop/completion/_dotdrop-completion.zsh' zinit ice lucid atinit'zpcompinit' zinit light zdharma/fast-syntax-highlighting -# use fzf with zsh +# use skim with zsh {%@@ if profile == "mko-laptop" @@%} -source ~/.skim.zsh +# Source from home directory since mko-laptop is ubuntu and it doesn't +# have skim in it's repositories +source ~/Software/skim/shell/key-bindings.zsh +source ~/Software/skim/shell/completion.zsh {%@@ else @@%} source /usr/share/skim/key-bindings.zsh source /usr/share/skim/completion.zsh diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 162fdcf2..1190315d 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -6,13 +6,20 @@ alias gpush='git push' alias mutt='neomutt' -# make fzf zsh plugin use fd -_fzf_compgen_dir() { +# make skim zsh plugin use fd +_skim_compgen_dir() { fd -Ht d } -_fzf_compgen_path() { +_skim_compgen_path() { fd -Ht f } +# same for fzf +_fzf_compgen_dir() { + _skim_compgen_dir +} +_fzf_compgen_path() { + _skim_compgen_path +} # search and install packages with skim pi() { @@ -34,9 +41,9 @@ pr() { fi } -# find and open man pages with fzf +# find and open man pages with skim fman() { - man -k . | fzf --prompt='Man> ' | awk '{print $1}' | xargs -r man + man -k . | sk --prompt='Man> ' | awk '{print $1}' | xargs -r man } # I'm retarded so I need this diff --git a/home/.ignore b/home/.ignore index be7a2281..2dc5ae47 100644 --- a/home/.ignore +++ b/home/.ignore @@ -7,7 +7,8 @@ .cache/ .cargo/ .rustup/ -.zplugin/ +.go/ +.zinit/ .config/nvim/plugged/ .local/share/Trash/ .bin/ From 02508766494e48c6f8977e35cdd94e09c4cdd781 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 20:32:46 +0300 Subject: [PATCH 0788/2667] Some fixes for skim --- home/.config/zsh/02-plugins.zsh | 11 +++++++---- home/.config/zsh/03-aliases.zsh | 17 ++++++++++++----- home/.ignore | 3 ++- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh index 52a53068..f82c01c4 100644 --- a/home/.config/zsh/02-plugins.zsh +++ b/home/.config/zsh/02-plugins.zsh @@ -10,7 +10,7 @@ source ~/.zinit/bin/zinit.zsh zinit ice load multisrc'{async,pure}.zsh' zinit light sindresorhus/pure -# fzf as tab completion +# skim as tab completion zinit ice lucid zinit light Aloxaf/fzf-tab @@ -18,7 +18,7 @@ zinit light Aloxaf/fzf-tab zinit ice lucid zinit light zsh-users/zsh-history-substring-search -# fzf git awesomeness +# skim git awesomeness zinit ice wait'1' lucid atload'source $HOME/.config/zsh/03-aliases.zsh' zinit light wfxr/forgit @@ -38,9 +38,12 @@ zinit snippet '$DOTREPO/dotdrop/completion/_dotdrop-completion.zsh' zinit ice lucid atinit'zpcompinit' zinit light zdharma/fast-syntax-highlighting -# use fzf with zsh +# use skim with zsh {%@@ if profile == "mko-laptop" @@%} -source ~/.skim.zsh +# Source from home directory since mko-laptop is ubuntu and it doesn't +# have skim in it's repositories +source ~/Software/skim/shell/key-bindings.zsh +source ~/Software/skim/shell/completion.zsh {%@@ else @@%} source /usr/share/skim/key-bindings.zsh source /usr/share/skim/completion.zsh diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 162fdcf2..1190315d 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -6,13 +6,20 @@ alias gpush='git push' alias mutt='neomutt' -# make fzf zsh plugin use fd -_fzf_compgen_dir() { +# make skim zsh plugin use fd +_skim_compgen_dir() { fd -Ht d } -_fzf_compgen_path() { +_skim_compgen_path() { fd -Ht f } +# same for fzf +_fzf_compgen_dir() { + _skim_compgen_dir +} +_fzf_compgen_path() { + _skim_compgen_path +} # search and install packages with skim pi() { @@ -34,9 +41,9 @@ pr() { fi } -# find and open man pages with fzf +# find and open man pages with skim fman() { - man -k . | fzf --prompt='Man> ' | awk '{print $1}' | xargs -r man + man -k . | sk --prompt='Man> ' | awk '{print $1}' | xargs -r man } # I'm retarded so I need this diff --git a/home/.ignore b/home/.ignore index be7a2281..2dc5ae47 100644 --- a/home/.ignore +++ b/home/.ignore @@ -7,7 +7,8 @@ .cache/ .cargo/ .rustup/ -.zplugin/ +.go/ +.zinit/ .config/nvim/plugged/ .local/share/Trash/ .bin/ From ed5db34d5b7cff2208664c318da3f0b32590bd07 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 20:54:45 +0300 Subject: [PATCH 0789/2667] Activate zsh rehash with pacman hook --- config-root.yaml | 4 ++++ home/.config/zsh/03-aliases.zsh | 28 ++++++++++++++++++++++++++++ home/.config/zsh/06-pacman.zsh | 19 +++++++++++++++---- root/etc/pacman.d/hooks/zsh.hook | 5 ++--- 4 files changed, 49 insertions(+), 7 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index a7264f7c..f4b22ec4 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -59,6 +59,9 @@ dotfiles: f_pacman.conf: dst: /etc/pacman.conf src: etc/pacman.conf + f_pacman_zsh_hook: + dst: /etc/pacman.d/hooks/zsh.hook + src: etc/pacman.d/hooks/zsh.hook f_sshd_config: dst: /etc/ssh/sshd_config src: etc/ssh/sshd_config @@ -113,6 +116,7 @@ profiles: Pacman: dotfiles: - f_pacman.conf + - f_pacman_zsh_hook - f_pacserve.service.conf Mirkwood: dotfiles: diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 1190315d..82a98df6 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -21,6 +21,34 @@ _fzf_compgen_path() { _skim_compgen_path } +# Command not found handler +# source https://wiki.archlinux.org/title/Zsh#pacman_-F_%22command_not_found%22_handler +function command_not_found_handler { + local purple='\e[1;35m' bright='\e[0;1m' green='\e[1;32m' reset='\e[0m' + printf 'zsh: command not found: %s\n' "$1" + local entries=( + ${(f)"$(/usr/bin/pacman -F --machinereadable -- "/usr/bin/$1")"} + ) + if (( ${#entries[@]} )) + then + printf "${bright}$1${reset} may be found in the following packages:\n" + local pkg + for entry in "${entries[@]}" + do + # (repo package version file) + local fields=( + ${(0)entry} + ) + if [[ "$pkg" != "${fields[2]}" ]] + then + printf "${purple}%s/${bright}%s ${green}%s${reset}\n" "${fields[1]}" "${fields[2]}" "${fields[3]}" + fi + printf ' /%s\n' "${fields[4]}" + pkg="${fields[2]}" + done + fi +} + # search and install packages with skim pi() { SELECTED_PKGS="$(paru -Slq | sk --header='Install packages' -m --preview 'paru -Si {1}')" diff --git a/home/.config/zsh/06-pacman.zsh b/home/.config/zsh/06-pacman.zsh index 56ebbcea..0398c378 100644 --- a/home/.config/zsh/06-pacman.zsh +++ b/home/.config/zsh/06-pacman.zsh @@ -1,6 +1,17 @@ # from https://wiki.archlinux.org/index.php/Zsh#On-demand_rehash -catch_signal_usr1() { - trap catch_signal_usr1 USR1 - rehash + +zshcache_time="$(date +%s%N)" + +autoload -Uz add-zsh-hook + +rehash_precmd() { + if [[ -a /var/cache/zsh/pacman ]]; then + local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)" + if (( zshcache_time < paccache_time )); then + rehash + zshcache_time="$paccache_time" + fi + fi } -trap catch_signal_usr1 USR1 + +add-zsh-hook -Uz precmd rehash_precmd diff --git a/root/etc/pacman.d/hooks/zsh.hook b/root/etc/pacman.d/hooks/zsh.hook index 4c3881c0..567e8b83 100644 --- a/root/etc/pacman.d/hooks/zsh.hook +++ b/root/etc/pacman.d/hooks/zsh.hook @@ -2,11 +2,10 @@ Operation = Install Operation = Upgrade Operation = Remove -Type = Package +Type = Path Target = usr/bin/* [Action] Depends = zsh -Depends = procps-ng When = PostTransaction -Exec = /usr/bin/pkill zsh --signal=USR1 +Exec = /usr/bin/install -Dm644 /dev/null /var/cache/zsh/pacman From da9abb7282280752329080a75a2579ecc0d253b4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 20:54:45 +0300 Subject: [PATCH 0790/2667] Activate zsh rehash with pacman hook --- config-root.yaml | 4 ++++ home/.config/zsh/03-aliases.zsh | 28 ++++++++++++++++++++++++++++ home/.config/zsh/06-pacman.zsh | 19 +++++++++++++++---- root/etc/pacman.d/hooks/zsh.hook | 5 ++--- 4 files changed, 49 insertions(+), 7 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index a7264f7c..f4b22ec4 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -59,6 +59,9 @@ dotfiles: f_pacman.conf: dst: /etc/pacman.conf src: etc/pacman.conf + f_pacman_zsh_hook: + dst: /etc/pacman.d/hooks/zsh.hook + src: etc/pacman.d/hooks/zsh.hook f_sshd_config: dst: /etc/ssh/sshd_config src: etc/ssh/sshd_config @@ -113,6 +116,7 @@ profiles: Pacman: dotfiles: - f_pacman.conf + - f_pacman_zsh_hook - f_pacserve.service.conf Mirkwood: dotfiles: diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 1190315d..82a98df6 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -21,6 +21,34 @@ _fzf_compgen_path() { _skim_compgen_path } +# Command not found handler +# source https://wiki.archlinux.org/title/Zsh#pacman_-F_%22command_not_found%22_handler +function command_not_found_handler { + local purple='\e[1;35m' bright='\e[0;1m' green='\e[1;32m' reset='\e[0m' + printf 'zsh: command not found: %s\n' "$1" + local entries=( + ${(f)"$(/usr/bin/pacman -F --machinereadable -- "/usr/bin/$1")"} + ) + if (( ${#entries[@]} )) + then + printf "${bright}$1${reset} may be found in the following packages:\n" + local pkg + for entry in "${entries[@]}" + do + # (repo package version file) + local fields=( + ${(0)entry} + ) + if [[ "$pkg" != "${fields[2]}" ]] + then + printf "${purple}%s/${bright}%s ${green}%s${reset}\n" "${fields[1]}" "${fields[2]}" "${fields[3]}" + fi + printf ' /%s\n' "${fields[4]}" + pkg="${fields[2]}" + done + fi +} + # search and install packages with skim pi() { SELECTED_PKGS="$(paru -Slq | sk --header='Install packages' -m --preview 'paru -Si {1}')" diff --git a/home/.config/zsh/06-pacman.zsh b/home/.config/zsh/06-pacman.zsh index 56ebbcea..0398c378 100644 --- a/home/.config/zsh/06-pacman.zsh +++ b/home/.config/zsh/06-pacman.zsh @@ -1,6 +1,17 @@ # from https://wiki.archlinux.org/index.php/Zsh#On-demand_rehash -catch_signal_usr1() { - trap catch_signal_usr1 USR1 - rehash + +zshcache_time="$(date +%s%N)" + +autoload -Uz add-zsh-hook + +rehash_precmd() { + if [[ -a /var/cache/zsh/pacman ]]; then + local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)" + if (( zshcache_time < paccache_time )); then + rehash + zshcache_time="$paccache_time" + fi + fi } -trap catch_signal_usr1 USR1 + +add-zsh-hook -Uz precmd rehash_precmd diff --git a/root/etc/pacman.d/hooks/zsh.hook b/root/etc/pacman.d/hooks/zsh.hook index 4c3881c0..567e8b83 100644 --- a/root/etc/pacman.d/hooks/zsh.hook +++ b/root/etc/pacman.d/hooks/zsh.hook @@ -2,11 +2,10 @@ Operation = Install Operation = Upgrade Operation = Remove -Type = Package +Type = Path Target = usr/bin/* [Action] Depends = zsh -Depends = procps-ng When = PostTransaction -Exec = /usr/bin/pkill zsh --signal=USR1 +Exec = /usr/bin/install -Dm644 /dev/null /var/cache/zsh/pacman From d7290836f3e2eb5d4fe73f0e0d593f517735ae07 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 21:02:58 +0300 Subject: [PATCH 0791/2667] Only enable pacman command not found handler for archlinux hosts --- home/.config/zsh/03-aliases.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 82a98df6..4e500651 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -21,6 +21,7 @@ _fzf_compgen_path() { _skim_compgen_path } +{%@@ if profile != "mko-laptop" @@%} # Command not found handler # source https://wiki.archlinux.org/title/Zsh#pacman_-F_%22command_not_found%22_handler function command_not_found_handler { @@ -48,6 +49,7 @@ function command_not_found_handler { done fi } +{%@@ endif @@%} # search and install packages with skim pi() { From b6b878e461b4d154365fd5343f78b4e58c182cbd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 21:02:58 +0300 Subject: [PATCH 0792/2667] Only enable pacman command not found handler for archlinux hosts --- home/.config/zsh/03-aliases.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 82a98df6..4e500651 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -21,6 +21,7 @@ _fzf_compgen_path() { _skim_compgen_path } +{%@@ if profile != "mko-laptop" @@%} # Command not found handler # source https://wiki.archlinux.org/title/Zsh#pacman_-F_%22command_not_found%22_handler function command_not_found_handler { @@ -48,6 +49,7 @@ function command_not_found_handler { done fi } +{%@@ endif @@%} # search and install packages with skim pi() { From ef7a36920f596780161022be3b174f7a2173b830 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 21:26:05 +0300 Subject: [PATCH 0793/2667] Fixes to PAGER --- home/.config/zsh/01-env.zsh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 66f25094..74b63cc1 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -49,9 +49,10 @@ export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim -export PAGER="sed 's/\x1b\[[0-9;]*m//g' | nvim -R" +export PAGER="nvim -R" +export PARU_PAGER="$PAGER -c 'set ft=PKGBUILD'" export AUR_PAGER=$PAGER -export MANPAGER="nvim -c 'set ft=man' -R" +export MANPAGER="nvim +Man!" # Use GPG for SSH authentication export GPG_TTY="$(tty)" From a824b29e717f6646cac08cb74498eef362d26bd1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 21:26:05 +0300 Subject: [PATCH 0794/2667] Fixes to PAGER --- home/.config/zsh/01-env.zsh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 66f25094..74b63cc1 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -49,9 +49,10 @@ export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim -export PAGER="sed 's/\x1b\[[0-9;]*m//g' | nvim -R" +export PAGER="nvim -R" +export PARU_PAGER="$PAGER -c 'set ft=PKGBUILD'" export AUR_PAGER=$PAGER -export MANPAGER="nvim -c 'set ft=man' -R" +export MANPAGER="nvim +Man!" # Use GPG for SSH authentication export GPG_TTY="$(tty)" From 028282b30c45f3662b729c08fb704f04da9d3a7c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 22:36:48 +0300 Subject: [PATCH 0795/2667] Add diff settings for neovim --- home/.config/nvim/lua/settings.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 4965e6ce..282dae29 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -19,6 +19,9 @@ o.cmdheight = 1 -- Always show signcolumn o.signcolumn = 'yes' +-- Diff settings +cmd 'set diffopt=filler,internal,algorithm:histogram,indent-heuristic' + -- Blinking cursor cmd 'set guicursor=i:ver1' cmd 'set guicursor+=a:blinkon1' From c3dd70706cdc3a1730a9b0c832f69f1c8bd4a79b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 22:36:48 +0300 Subject: [PATCH 0796/2667] Add diff settings for neovim --- home/.config/nvim/lua/settings.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 4965e6ce..282dae29 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -19,6 +19,9 @@ o.cmdheight = 1 -- Always show signcolumn o.signcolumn = 'yes' +-- Diff settings +cmd 'set diffopt=filler,internal,algorithm:histogram,indent-heuristic' + -- Blinking cursor cmd 'set guicursor=i:ver1' cmd 'set guicursor+=a:blinkon1' From c265be48ff24a47b5e4158961a944bc1afdbcada Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 09:29:44 +0300 Subject: [PATCH 0797/2667] Nvim: add git gutter and line numbers --- home/.config/nvim/lua/pluginmanager.lua | 3 +++ home/.config/nvim/lua/settings.lua | 3 +++ 2 files changed, 6 insertions(+) diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 9b559cbf..8d9c88af 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -22,6 +22,9 @@ require('packer').startup(function() -- Colorscheme use 'monsonjeremy/onedark.nvim' + -- Git in signcolumn + use 'airblade/vim-gitgutter' + -- Statusline use { 'hoob3rt/lualine.nvim', diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 282dae29..42ee769d 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -22,6 +22,9 @@ o.signcolumn = 'yes' -- Diff settings cmd 'set diffopt=filler,internal,algorithm:histogram,indent-heuristic' +-- Show line numbers +cmd 'set number' + -- Blinking cursor cmd 'set guicursor=i:ver1' cmd 'set guicursor+=a:blinkon1' From 80fb138fc14ea61edd5322aa947547b94f00715a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 09:29:44 +0300 Subject: [PATCH 0798/2667] Nvim: add git gutter and line numbers --- home/.config/nvim/lua/pluginmanager.lua | 3 +++ home/.config/nvim/lua/settings.lua | 3 +++ 2 files changed, 6 insertions(+) diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 9b559cbf..8d9c88af 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -22,6 +22,9 @@ require('packer').startup(function() -- Colorscheme use 'monsonjeremy/onedark.nvim' + -- Git in signcolumn + use 'airblade/vim-gitgutter' + -- Statusline use { 'hoob3rt/lualine.nvim', diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 282dae29..42ee769d 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -22,6 +22,9 @@ o.signcolumn = 'yes' -- Diff settings cmd 'set diffopt=filler,internal,algorithm:histogram,indent-heuristic' +-- Show line numbers +cmd 'set number' + -- Blinking cursor cmd 'set guicursor=i:ver1' cmd 'set guicursor+=a:blinkon1' From 1f0d88274594d627d1c8cb6915fb9ac131082978 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 09:30:09 +0300 Subject: [PATCH 0799/2667] Change git diff tool configuration --- home/.gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.gitconfig b/home/.gitconfig index fb3d29c2..64e110d5 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -30,7 +30,7 @@ tool = nvim-diff [difftool "nvim-diff"] - cmd = nvim -d -c 'set nomodifiable' + cmd = nvim -d -R [pull] rebase = merges From 21c0c53c95086a0d90232a9f7760c36aa440b528 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 09:30:09 +0300 Subject: [PATCH 0800/2667] Change git diff tool configuration --- home/.gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.gitconfig b/home/.gitconfig index fb3d29c2..64e110d5 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -30,7 +30,7 @@ tool = nvim-diff [difftool "nvim-diff"] - cmd = nvim -d -c 'set nomodifiable' + cmd = nvim -d -R [pull] rebase = merges From 3cccb61089da8a60f97f0284e2d96f6e49a79855 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 09:30:21 +0300 Subject: [PATCH 0801/2667] Alias ls and cat to exa and bat --- home/.config/zsh/03-aliases.zsh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 4e500651..0e8a40f5 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -21,6 +21,10 @@ _fzf_compgen_path() { _skim_compgen_path } +# Modern replacements for cat and ls +alias cat='bat' +alias ls='exa' + {%@@ if profile != "mko-laptop" @@%} # Command not found handler # source https://wiki.archlinux.org/title/Zsh#pacman_-F_%22command_not_found%22_handler @@ -224,9 +228,6 @@ tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/nu # update arch mirrorlist alias reflect='sudo reflector --latest 200 --threads 8 --verbose --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist' -# better ls -alias ls='ls_extended -Ih' - # default icon for notify-send alias notify-send='notify-send --icon=alarm' From bdf01fdae1673d2274e3d25ad41932d64a8c13ce Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 09:30:21 +0300 Subject: [PATCH 0802/2667] Alias ls and cat to exa and bat --- home/.config/zsh/03-aliases.zsh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 4e500651..0e8a40f5 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -21,6 +21,10 @@ _fzf_compgen_path() { _skim_compgen_path } +# Modern replacements for cat and ls +alias cat='bat' +alias ls='exa' + {%@@ if profile != "mko-laptop" @@%} # Command not found handler # source https://wiki.archlinux.org/title/Zsh#pacman_-F_%22command_not_found%22_handler @@ -224,9 +228,6 @@ tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/nu # update arch mirrorlist alias reflect='sudo reflector --latest 200 --threads 8 --verbose --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist' -# better ls -alias ls='ls_extended -Ih' - # default icon for notify-send alias notify-send='notify-send --icon=alarm' From 709cb2418fae762c72a27ab279b01d77eb8d6d0c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 09:31:32 +0300 Subject: [PATCH 0803/2667] Disable bat spacing in cat mode --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 0e8a40f5..ecc41baa 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -22,7 +22,7 @@ _fzf_compgen_path() { } # Modern replacements for cat and ls -alias cat='bat' +alias cat='bat --paging=never' alias ls='exa' {%@@ if profile != "mko-laptop" @@%} From 58a7a64346d351d4cadc1ed300f9140f70e2594b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 09:31:32 +0300 Subject: [PATCH 0804/2667] Disable bat spacing in cat mode --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 0e8a40f5..ecc41baa 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -22,7 +22,7 @@ _fzf_compgen_path() { } # Modern replacements for cat and ls -alias cat='bat' +alias cat='bat --paging=never' alias ls='exa' {%@@ if profile != "mko-laptop" @@%} From 003c6f13c06ff03893d3c86263bd069f3e75abcc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 14:17:19 +0300 Subject: [PATCH 0805/2667] Nvim: add fugitive --- home/.config/nvim/lua/pluginmanager.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 8d9c88af..05a37b1c 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -37,6 +37,9 @@ require('packer').startup(function() requires = 'kyazdani42/nvim-web-devicons' } + -- Git commands + use 'tpope/vim-fugitive' + -- Indent characters --use "lukas-reineke/indent-blankline.nvim" From cd62b162b8827d42d43cd100947c5200549fc953 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 14:17:19 +0300 Subject: [PATCH 0806/2667] Nvim: add fugitive --- home/.config/nvim/lua/pluginmanager.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 8d9c88af..05a37b1c 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -37,6 +37,9 @@ require('packer').startup(function() requires = 'kyazdani42/nvim-web-devicons' } + -- Git commands + use 'tpope/vim-fugitive' + -- Indent characters --use "lukas-reineke/indent-blankline.nvim" From 1821340f033ef236c72c228899f8ea5041f82bdb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 21:20:20 +0300 Subject: [PATCH 0807/2667] Nvim: improvements to syntax highlighting and add a couple of plugins --- config.yaml | 8 ++----- .../nvim/lua/pluginconf/treesitter.lua | 3 ++- home/.config/nvim/lua/pluginmanager.lua | 22 ++++++++++++------- home/.config/nvim/lua/settings.lua | 2 +- home/.config/nvim/scripts/java-lsp.sh | 17 -------------- home/.config/sway/conf.d/01-vars.conf | 2 +- home/.config/sway/conf.d/02-bar.conf | 2 +- home/.config/sway/conf.d/03-input.conf | 2 +- home/.config/sway/conf.d/04-output.conf | 2 +- home/.config/sway/conf.d/05-workspaces.conf | 2 +- home/.config/sway/conf.d/06-keybinds.conf | 2 +- home/.config/sway/conf.d/07-appearance.conf | 2 +- home/.config/sway/conf.d/08-exec.conf | 2 +- 13 files changed, 27 insertions(+), 41 deletions(-) delete mode 100755 home/.config/nvim/scripts/java-lsp.sh diff --git a/config.yaml b/config.yaml index 6cecc98b..40f704e2 100644 --- a/config.yaml +++ b/config.yaml @@ -1,5 +1,5 @@ actions: - nvim-packer-install: nvim +PackerInstall + nvim-packer-sync: nvim +PackerSync config: backup: true banner: true @@ -30,12 +30,9 @@ dotfiles: src: .config/nvim/init.lua d_nvim_lua: actions: - - nvim-packer-install + - nvim-packer-sync dst: ~/.config/nvim/lua src: .config/nvim/lua - d_nvim_scripts: - dst: ~/.config/nvim/scripts - src: .config/nvim/scripts f_user-dirs.dirs: dst: ~/.config/user-dirs.dirs src: .config/user-dirs.dirs @@ -194,7 +191,6 @@ profiles: - f_ssh.conf - f_authorized_keys - d_nvim_lua - - d_nvim_scripts - f_nvim_init - f_gitconfig - f_alacritty.yml diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua index 12ab42bc..939303e9 100644 --- a/home/.config/nvim/lua/pluginconf/treesitter.lua +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -2,5 +2,6 @@ require'nvim-treesitter.configs'.setup { ensure_installed = 'maintained', highlight = {enable = true}, indent = {enable = true}, - incremental_selection = {enable = true} + incremental_selection = {enable = true}, + context_commentstring = {enable = true} } diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 05a37b1c..fc915306 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -20,7 +20,7 @@ require('packer').startup(function() use {'wbthomason/packer.nvim', opt = true} -- Colorscheme - use 'monsonjeremy/onedark.nvim' + use 'EdenEast/nightfox.nvim' -- Git in signcolumn use 'airblade/vim-gitgutter' @@ -41,7 +41,7 @@ require('packer').startup(function() use 'tpope/vim-fugitive' -- Indent characters - --use "lukas-reineke/indent-blankline.nvim" + -- use "lukas-reineke/indent-blankline.nvim" -- Tree explorer use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} @@ -64,9 +64,6 @@ require('packer').startup(function() -- Install LSP executables use 'kabouzeid/nvim-lspinstall' - -- Extensions for eclipse.jdt.ls - use 'mfussenegger/nvim-jdtls' - -- Completion framework use 'nvim-lua/completion-nvim' @@ -77,9 +74,18 @@ require('packer').startup(function() run = ':TSUpdate' } - -- Syntax highlighting for languages - -- that are not supported by treesitter - use 'sheerun/vim-polyglot' + -- treesitter plugin for commentstring + use 'JoosepAlviste/nvim-ts-context-commentstring' + + -- Additional plugins for formats not supported + -- by treesitter + use 'jamespeapen/swayconfig.vim' + + -- mappings for commenting in code + use 'tpope/vim-commentary' + + -- we all know this one + use 'tpope/vim-surround' -- Formatter plugin use 'sbdchd/neoformat' diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 42ee769d..22848b9a 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -5,7 +5,7 @@ local cmd = vim.cmd ------ Appearance ------ -- Set colorscheme -require('onedark').setup() +require('nightfox').set() -- True colors o.termguicolors = true diff --git a/home/.config/nvim/scripts/java-lsp.sh b/home/.config/nvim/scripts/java-lsp.sh deleted file mode 100755 index 876383a1..00000000 --- a/home/.config/nvim/scripts/java-lsp.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -JAR="$HOME/.local/share/nvim/lspinstall/java/plugins/org.eclipse.equinox.launcher_*.jar" -GRADLE_HOME=$HOME/gradle /usr/lib/jvm/default/bin/java \ - -Declipse.application=org.eclipse.jdt.ls.core.id1 \ - -Dosgi.bundles.defaultStartLevel=4 \ - -Declipse.product=org.eclipse.jdt.ls.core.product \ - -Dlog.protocol=true \ - -Dlog.level=ALL \ - -Xms1g \ - -Xmx2G \ - -jar $(echo "$JAR") \ - -configuration "$HOME/.local/share/nvim/lspinstall/java/config_linux" \ - -data "${1:-$HOME/workspace}" \ - --add-modules=ALL-SYSTEM \ - --add-opens java.base/java.util=ALL-UNNAMED \ - --add-opens java.base/java.lang=ALL-UNNAMED diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index 530dd5ec..dade25d0 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -1,4 +1,4 @@ -# vim:ft=i3config +# vim:ft=swayconfig set $mod Mod4 set $term footclient diff --git a/home/.config/sway/conf.d/02-bar.conf b/home/.config/sway/conf.d/02-bar.conf index 04630004..8027d960 100644 --- a/home/.config/sway/conf.d/02-bar.conf +++ b/home/.config/sway/conf.d/02-bar.conf @@ -1,4 +1,4 @@ -# vim:ft=i3config +# vim:ft=swayconfig bar { swaybar_command waybar diff --git a/home/.config/sway/conf.d/03-input.conf b/home/.config/sway/conf.d/03-input.conf index 1f1a7394..aea31fbe 100644 --- a/home/.config/sway/conf.d/03-input.conf +++ b/home/.config/sway/conf.d/03-input.conf @@ -1,4 +1,4 @@ -# vim:ft=i3config +# vim:ft=swayconfig input type:keyboard { xkb_layout eu diff --git a/home/.config/sway/conf.d/04-output.conf b/home/.config/sway/conf.d/04-output.conf index 8d701a78..9e524bf1 100644 --- a/home/.config/sway/conf.d/04-output.conf +++ b/home/.config/sway/conf.d/04-output.conf @@ -1,4 +1,4 @@ -# vim:ft=i3config +# vim:ft=swayconfig output * bg $wallpaper fill output eDP-1 position 0 0 diff --git a/home/.config/sway/conf.d/05-workspaces.conf b/home/.config/sway/conf.d/05-workspaces.conf index f33cf423..ea67ffe8 100644 --- a/home/.config/sway/conf.d/05-workspaces.conf +++ b/home/.config/sway/conf.d/05-workspaces.conf @@ -1,4 +1,4 @@ -# vim:ft=i3config +# vim:ft=swayconfig # Start applications in specific workspaces assign [app_id="telegramdesktop"] workspace 3 diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 4f68b1c7..3eed3076 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -1,4 +1,4 @@ -# vim:ft=i3config +# vim:ft=swayconfig # start terminal bindsym $mod+Return exec $term diff --git a/home/.config/sway/conf.d/07-appearance.conf b/home/.config/sway/conf.d/07-appearance.conf index 70dfb113..a558c60b 100644 --- a/home/.config/sway/conf.d/07-appearance.conf +++ b/home/.config/sway/conf.d/07-appearance.conf @@ -1,4 +1,4 @@ -# vim:ft=i3config +# vim:ft=swayconfig default_border none gaps inner 15 diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index adca6ca2..d87e72e1 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -1,4 +1,4 @@ -# vim:ft=i3config +# vim:ft=swayconfig exec { foot -s From e18f384d4189c78ff496c87de7962c4c756bc0db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 21:20:20 +0300 Subject: [PATCH 0808/2667] Nvim: improvements to syntax highlighting and add a couple of plugins --- config.yaml | 8 ++----- .../nvim/lua/pluginconf/treesitter.lua | 3 ++- home/.config/nvim/lua/pluginmanager.lua | 22 ++++++++++++------- home/.config/nvim/lua/settings.lua | 2 +- home/.config/nvim/scripts/java-lsp.sh | 17 -------------- home/.config/sway/conf.d/01-vars.conf | 2 +- home/.config/sway/conf.d/02-bar.conf | 2 +- home/.config/sway/conf.d/03-input.conf | 2 +- home/.config/sway/conf.d/04-output.conf | 2 +- home/.config/sway/conf.d/05-workspaces.conf | 2 +- home/.config/sway/conf.d/06-keybinds.conf | 2 +- home/.config/sway/conf.d/07-appearance.conf | 2 +- home/.config/sway/conf.d/08-exec.conf | 2 +- 13 files changed, 27 insertions(+), 41 deletions(-) delete mode 100755 home/.config/nvim/scripts/java-lsp.sh diff --git a/config.yaml b/config.yaml index 6cecc98b..40f704e2 100644 --- a/config.yaml +++ b/config.yaml @@ -1,5 +1,5 @@ actions: - nvim-packer-install: nvim +PackerInstall + nvim-packer-sync: nvim +PackerSync config: backup: true banner: true @@ -30,12 +30,9 @@ dotfiles: src: .config/nvim/init.lua d_nvim_lua: actions: - - nvim-packer-install + - nvim-packer-sync dst: ~/.config/nvim/lua src: .config/nvim/lua - d_nvim_scripts: - dst: ~/.config/nvim/scripts - src: .config/nvim/scripts f_user-dirs.dirs: dst: ~/.config/user-dirs.dirs src: .config/user-dirs.dirs @@ -194,7 +191,6 @@ profiles: - f_ssh.conf - f_authorized_keys - d_nvim_lua - - d_nvim_scripts - f_nvim_init - f_gitconfig - f_alacritty.yml diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua index 12ab42bc..939303e9 100644 --- a/home/.config/nvim/lua/pluginconf/treesitter.lua +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -2,5 +2,6 @@ require'nvim-treesitter.configs'.setup { ensure_installed = 'maintained', highlight = {enable = true}, indent = {enable = true}, - incremental_selection = {enable = true} + incremental_selection = {enable = true}, + context_commentstring = {enable = true} } diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 05a37b1c..fc915306 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -20,7 +20,7 @@ require('packer').startup(function() use {'wbthomason/packer.nvim', opt = true} -- Colorscheme - use 'monsonjeremy/onedark.nvim' + use 'EdenEast/nightfox.nvim' -- Git in signcolumn use 'airblade/vim-gitgutter' @@ -41,7 +41,7 @@ require('packer').startup(function() use 'tpope/vim-fugitive' -- Indent characters - --use "lukas-reineke/indent-blankline.nvim" + -- use "lukas-reineke/indent-blankline.nvim" -- Tree explorer use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} @@ -64,9 +64,6 @@ require('packer').startup(function() -- Install LSP executables use 'kabouzeid/nvim-lspinstall' - -- Extensions for eclipse.jdt.ls - use 'mfussenegger/nvim-jdtls' - -- Completion framework use 'nvim-lua/completion-nvim' @@ -77,9 +74,18 @@ require('packer').startup(function() run = ':TSUpdate' } - -- Syntax highlighting for languages - -- that are not supported by treesitter - use 'sheerun/vim-polyglot' + -- treesitter plugin for commentstring + use 'JoosepAlviste/nvim-ts-context-commentstring' + + -- Additional plugins for formats not supported + -- by treesitter + use 'jamespeapen/swayconfig.vim' + + -- mappings for commenting in code + use 'tpope/vim-commentary' + + -- we all know this one + use 'tpope/vim-surround' -- Formatter plugin use 'sbdchd/neoformat' diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 42ee769d..22848b9a 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -5,7 +5,7 @@ local cmd = vim.cmd ------ Appearance ------ -- Set colorscheme -require('onedark').setup() +require('nightfox').set() -- True colors o.termguicolors = true diff --git a/home/.config/nvim/scripts/java-lsp.sh b/home/.config/nvim/scripts/java-lsp.sh deleted file mode 100755 index 876383a1..00000000 --- a/home/.config/nvim/scripts/java-lsp.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -JAR="$HOME/.local/share/nvim/lspinstall/java/plugins/org.eclipse.equinox.launcher_*.jar" -GRADLE_HOME=$HOME/gradle /usr/lib/jvm/default/bin/java \ - -Declipse.application=org.eclipse.jdt.ls.core.id1 \ - -Dosgi.bundles.defaultStartLevel=4 \ - -Declipse.product=org.eclipse.jdt.ls.core.product \ - -Dlog.protocol=true \ - -Dlog.level=ALL \ - -Xms1g \ - -Xmx2G \ - -jar $(echo "$JAR") \ - -configuration "$HOME/.local/share/nvim/lspinstall/java/config_linux" \ - -data "${1:-$HOME/workspace}" \ - --add-modules=ALL-SYSTEM \ - --add-opens java.base/java.util=ALL-UNNAMED \ - --add-opens java.base/java.lang=ALL-UNNAMED diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index 530dd5ec..dade25d0 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -1,4 +1,4 @@ -# vim:ft=i3config +# vim:ft=swayconfig set $mod Mod4 set $term footclient diff --git a/home/.config/sway/conf.d/02-bar.conf b/home/.config/sway/conf.d/02-bar.conf index 04630004..8027d960 100644 --- a/home/.config/sway/conf.d/02-bar.conf +++ b/home/.config/sway/conf.d/02-bar.conf @@ -1,4 +1,4 @@ -# vim:ft=i3config +# vim:ft=swayconfig bar { swaybar_command waybar diff --git a/home/.config/sway/conf.d/03-input.conf b/home/.config/sway/conf.d/03-input.conf index 1f1a7394..aea31fbe 100644 --- a/home/.config/sway/conf.d/03-input.conf +++ b/home/.config/sway/conf.d/03-input.conf @@ -1,4 +1,4 @@ -# vim:ft=i3config +# vim:ft=swayconfig input type:keyboard { xkb_layout eu diff --git a/home/.config/sway/conf.d/04-output.conf b/home/.config/sway/conf.d/04-output.conf index 8d701a78..9e524bf1 100644 --- a/home/.config/sway/conf.d/04-output.conf +++ b/home/.config/sway/conf.d/04-output.conf @@ -1,4 +1,4 @@ -# vim:ft=i3config +# vim:ft=swayconfig output * bg $wallpaper fill output eDP-1 position 0 0 diff --git a/home/.config/sway/conf.d/05-workspaces.conf b/home/.config/sway/conf.d/05-workspaces.conf index f33cf423..ea67ffe8 100644 --- a/home/.config/sway/conf.d/05-workspaces.conf +++ b/home/.config/sway/conf.d/05-workspaces.conf @@ -1,4 +1,4 @@ -# vim:ft=i3config +# vim:ft=swayconfig # Start applications in specific workspaces assign [app_id="telegramdesktop"] workspace 3 diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 4f68b1c7..3eed3076 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -1,4 +1,4 @@ -# vim:ft=i3config +# vim:ft=swayconfig # start terminal bindsym $mod+Return exec $term diff --git a/home/.config/sway/conf.d/07-appearance.conf b/home/.config/sway/conf.d/07-appearance.conf index 70dfb113..a558c60b 100644 --- a/home/.config/sway/conf.d/07-appearance.conf +++ b/home/.config/sway/conf.d/07-appearance.conf @@ -1,4 +1,4 @@ -# vim:ft=i3config +# vim:ft=swayconfig default_border none gaps inner 15 diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index adca6ca2..d87e72e1 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -1,4 +1,4 @@ -# vim:ft=i3config +# vim:ft=swayconfig exec { foot -s From 9f39433bba902c51f9aa9fdb75d3af0fe90a55ac Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 11:32:40 +0300 Subject: [PATCH 0809/2667] Change foot colors to nightfox --- home/.config/foot/foot.ini | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini index 572268b4..00ddce03 100644 --- a/home/.config/foot/foot.ini +++ b/home/.config/foot/foot.ini @@ -10,21 +10,21 @@ blink=yes hide-when-typing=yes [colors] -background=282c34 -foreground=abb2bf -regular0=282c34 -regular1=e06c75 -regular2=98c379 -regular3=e5c07b -regular4=61afef -regular5=c678dd -regular6=56b6c2 -regular7=abb2bf -bright0=3e4452 -bright1=be5046 -bright2=98c379 -bright3=d19a66 -bright4=61afef -bright5=c678dd -bright6=56b6c2 -bright7=5c6370 +foreground=CDCECF +background=192330 +regular0=393B44 +regular1=C94F6D +regular2=81B29A +regular3=DBC074 +regular4=719CD6 +regular5=9D79D6 +regular6=63CDCF +regular7=DFDFE0 +bright0=7F8C98 +bright1=D6616B +bright2=58CD8B +bright3=FFE37E +bright4=84CEE4 +bright5=B8A1E3 +bright6=59F0FF +bright7=F2F2F2 From 34ec6271729fdedcb279d34ebd9f5b64f83a7ecb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 11:32:40 +0300 Subject: [PATCH 0810/2667] Change foot colors to nightfox --- home/.config/foot/foot.ini | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini index 572268b4..00ddce03 100644 --- a/home/.config/foot/foot.ini +++ b/home/.config/foot/foot.ini @@ -10,21 +10,21 @@ blink=yes hide-when-typing=yes [colors] -background=282c34 -foreground=abb2bf -regular0=282c34 -regular1=e06c75 -regular2=98c379 -regular3=e5c07b -regular4=61afef -regular5=c678dd -regular6=56b6c2 -regular7=abb2bf -bright0=3e4452 -bright1=be5046 -bright2=98c379 -bright3=d19a66 -bright4=61afef -bright5=c678dd -bright6=56b6c2 -bright7=5c6370 +foreground=CDCECF +background=192330 +regular0=393B44 +regular1=C94F6D +regular2=81B29A +regular3=DBC074 +regular4=719CD6 +regular5=9D79D6 +regular6=63CDCF +regular7=DFDFE0 +bright0=7F8C98 +bright1=D6616B +bright2=58CD8B +bright3=FFE37E +bright4=84CEE4 +bright5=B8A1E3 +bright6=59F0FF +bright7=F2F2F2 From 7f8605354e4c691f2d5ef420cc6ed4bfe82f7755 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 11:33:15 +0300 Subject: [PATCH 0811/2667] Add more configuration for indent-blankline --- .../nvim/lua/pluginconf/indent-blankline.lua | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/pluginconf/indent-blankline.lua b/home/.config/nvim/lua/pluginconf/indent-blankline.lua index a46bc830..b103c7ac 100644 --- a/home/.config/nvim/lua/pluginconf/indent-blankline.lua +++ b/home/.config/nvim/lua/pluginconf/indent-blankline.lua @@ -1 +1,15 @@ -require('indent_blankline').setup {filetype_exclude = {'help'}} +require('indent_blankline').setup {char = " ", filetype_exclude = {'help', 'terminal'}} + +-- define the highlight groups with only background colors (or leave odd empty to just show the normal background) +vim.cmd [[highlight IndentOdd guifg=NONE guibg=NONE gui=nocombine]] +vim.cmd [[highlight IndentEven guifg=NONE guibg=#354254 gui=nocombine]] +-- and then use the highlight groups +vim.g.indent_blankline_char_highlight_list = {"IndentOdd", "IndentEven"} +vim.g.indent_blankline_space_char_highlight_list = {"IndentOdd", "IndentEven"} + +-- don't show any characters +vim.g.indent_blankline_char = " " +vim.g.indent_blankline_space_char = " " + +-- when using background, the trailing indent is not needed / looks wrong +vim.g.indent_blankline_show_trailing_blankline_indent = false From e32190aa3018974e101f2f0731f6ef2590b5b1d9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 11:33:15 +0300 Subject: [PATCH 0812/2667] Add more configuration for indent-blankline --- .../nvim/lua/pluginconf/indent-blankline.lua | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/pluginconf/indent-blankline.lua b/home/.config/nvim/lua/pluginconf/indent-blankline.lua index a46bc830..b103c7ac 100644 --- a/home/.config/nvim/lua/pluginconf/indent-blankline.lua +++ b/home/.config/nvim/lua/pluginconf/indent-blankline.lua @@ -1 +1,15 @@ -require('indent_blankline').setup {filetype_exclude = {'help'}} +require('indent_blankline').setup {char = " ", filetype_exclude = {'help', 'terminal'}} + +-- define the highlight groups with only background colors (or leave odd empty to just show the normal background) +vim.cmd [[highlight IndentOdd guifg=NONE guibg=NONE gui=nocombine]] +vim.cmd [[highlight IndentEven guifg=NONE guibg=#354254 gui=nocombine]] +-- and then use the highlight groups +vim.g.indent_blankline_char_highlight_list = {"IndentOdd", "IndentEven"} +vim.g.indent_blankline_space_char_highlight_list = {"IndentOdd", "IndentEven"} + +-- don't show any characters +vim.g.indent_blankline_char = " " +vim.g.indent_blankline_space_char = " " + +-- when using background, the trailing indent is not needed / looks wrong +vim.g.indent_blankline_show_trailing_blankline_indent = false From 62d55eda608f40b3c73baee53361aee7be6052f7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 11:34:40 +0300 Subject: [PATCH 0813/2667] Rename docker-compose.yml -> docker-compose.yaml to be more consistent --- docker/freshrss/{docker-compose.yml => docker-compose.yaml} | 0 docker/homeautomation/{docker-compose.yml => docker-compose.yaml} | 0 docker/nextcloud/{docker-compose.yml => docker-compose.yaml} | 0 docker/pihole/{docker-compose.yml => docker-compose.yaml} | 0 docker/wireguard/{docker-compose.yml => docker-compose.yaml} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename docker/freshrss/{docker-compose.yml => docker-compose.yaml} (100%) rename docker/homeautomation/{docker-compose.yml => docker-compose.yaml} (100%) rename docker/nextcloud/{docker-compose.yml => docker-compose.yaml} (100%) rename docker/pihole/{docker-compose.yml => docker-compose.yaml} (100%) rename docker/wireguard/{docker-compose.yml => docker-compose.yaml} (100%) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yaml similarity index 100% rename from docker/freshrss/docker-compose.yml rename to docker/freshrss/docker-compose.yaml diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yaml similarity index 100% rename from docker/homeautomation/docker-compose.yml rename to docker/homeautomation/docker-compose.yaml diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yaml similarity index 100% rename from docker/nextcloud/docker-compose.yml rename to docker/nextcloud/docker-compose.yaml diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yaml similarity index 100% rename from docker/pihole/docker-compose.yml rename to docker/pihole/docker-compose.yaml diff --git a/docker/wireguard/docker-compose.yml b/docker/wireguard/docker-compose.yaml similarity index 100% rename from docker/wireguard/docker-compose.yml rename to docker/wireguard/docker-compose.yaml From 0370e045b94b4926387ed1316be6929322bd604d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 11:34:40 +0300 Subject: [PATCH 0814/2667] Rename docker-compose.yml -> docker-compose.yaml to be more consistent --- docker/freshrss/{docker-compose.yml => docker-compose.yaml} | 0 docker/homeautomation/{docker-compose.yml => docker-compose.yaml} | 0 docker/nextcloud/{docker-compose.yml => docker-compose.yaml} | 0 docker/pihole/{docker-compose.yml => docker-compose.yaml} | 0 docker/wireguard/{docker-compose.yml => docker-compose.yaml} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename docker/freshrss/{docker-compose.yml => docker-compose.yaml} (100%) rename docker/homeautomation/{docker-compose.yml => docker-compose.yaml} (100%) rename docker/nextcloud/{docker-compose.yml => docker-compose.yaml} (100%) rename docker/pihole/{docker-compose.yml => docker-compose.yaml} (100%) rename docker/wireguard/{docker-compose.yml => docker-compose.yaml} (100%) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yaml similarity index 100% rename from docker/freshrss/docker-compose.yml rename to docker/freshrss/docker-compose.yaml diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yaml similarity index 100% rename from docker/homeautomation/docker-compose.yml rename to docker/homeautomation/docker-compose.yaml diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yaml similarity index 100% rename from docker/nextcloud/docker-compose.yml rename to docker/nextcloud/docker-compose.yaml diff --git a/docker/pihole/docker-compose.yml b/docker/pihole/docker-compose.yaml similarity index 100% rename from docker/pihole/docker-compose.yml rename to docker/pihole/docker-compose.yaml diff --git a/docker/wireguard/docker-compose.yml b/docker/wireguard/docker-compose.yaml similarity index 100% rename from docker/wireguard/docker-compose.yml rename to docker/wireguard/docker-compose.yaml From de2a505613e8fe6b40a6d0c674a0009c07c67a12 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 11:36:58 +0300 Subject: [PATCH 0815/2667] Fix nvim plugin update --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index ecc41baa..b1e55a88 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -178,7 +178,7 @@ update() { } plugins() { - nvim +PackerUpdate +TSUpdate +qa + nvim +PackerSync +TSUpdate zinit self-update zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all From d1b217a506b02ec38c21637a17e08b6eec7ab7e8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 11:36:58 +0300 Subject: [PATCH 0816/2667] Fix nvim plugin update --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index ecc41baa..b1e55a88 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -178,7 +178,7 @@ update() { } plugins() { - nvim +PackerUpdate +TSUpdate +qa + nvim +PackerSync +TSUpdate zinit self-update zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all From df4c45f5b856c9eaa9c41651fe5a21c5b4c72172 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 19:10:14 +0300 Subject: [PATCH 0817/2667] Remove portainer --- docker/portainer/docker-compose.yaml | 33 ---------------------------- 1 file changed, 33 deletions(-) delete mode 100644 docker/portainer/docker-compose.yaml diff --git a/docker/portainer/docker-compose.yaml b/docker/portainer/docker-compose.yaml deleted file mode 100644 index 4335bcfc..00000000 --- a/docker/portainer/docker-compose.yaml +++ /dev/null @@ -1,33 +0,0 @@ -version: '3' -services: - portainer: - image: portainer/portainer-ce - container_name: portainer - environment: - - TZ=Europe/Helsinki - restart: unless-stopped - networks: - - proxy - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - /docker/portainer:/data - - /etc/localtime:/etc/localtime:ro - labels: - - 'traefik.enable=true' - - - 'traefik.http.routers.portainer-redirect.entrypoints=http' - - 'traefik.http.routers.portainer-redirect.rule=Host(`portainer.korhonen.cc`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.portainer-redirect.middlewares=http2https' - - - 'traefik.http.routers.portainer.entrypoints=https' - - 'traefik.http.routers.portainer.rule=Host(`portainer.korhonen.cc`)' - - 'traefik.http.routers.portainer.tls=true' - - 'traefik.http.routers.portainer.tls.certresolver=http' - - 'traefik.http.routers.portainer.service=portainer' - - 'traefik.docker.network=proxy' - - 'traefik.http.services.portainer.loadbalancer.server.port=9000' - -networks: - proxy: - external: true From 859e9b66987dcffe3f5f851d3be7835953c266f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 19:10:14 +0300 Subject: [PATCH 0818/2667] Remove portainer --- docker/portainer/docker-compose.yaml | 33 ---------------------------- 1 file changed, 33 deletions(-) delete mode 100644 docker/portainer/docker-compose.yaml diff --git a/docker/portainer/docker-compose.yaml b/docker/portainer/docker-compose.yaml deleted file mode 100644 index 4335bcfc..00000000 --- a/docker/portainer/docker-compose.yaml +++ /dev/null @@ -1,33 +0,0 @@ -version: '3' -services: - portainer: - image: portainer/portainer-ce - container_name: portainer - environment: - - TZ=Europe/Helsinki - restart: unless-stopped - networks: - - proxy - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - /docker/portainer:/data - - /etc/localtime:/etc/localtime:ro - labels: - - 'traefik.enable=true' - - - 'traefik.http.routers.portainer-redirect.entrypoints=http' - - 'traefik.http.routers.portainer-redirect.rule=Host(`portainer.korhonen.cc`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.portainer-redirect.middlewares=http2https' - - - 'traefik.http.routers.portainer.entrypoints=https' - - 'traefik.http.routers.portainer.rule=Host(`portainer.korhonen.cc`)' - - 'traefik.http.routers.portainer.tls=true' - - 'traefik.http.routers.portainer.tls.certresolver=http' - - 'traefik.http.routers.portainer.service=portainer' - - 'traefik.docker.network=proxy' - - 'traefik.http.services.portainer.loadbalancer.server.port=9000' - -networks: - proxy: - external: true From b09a17ae319fa19fe1c9bba86e72cb03cc5a7ebb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 19:11:05 +0300 Subject: [PATCH 0819/2667] Add fail2ban jails for gitea and nextcloud --- docker/traefik/docker-compose.yaml | 55 ++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 docker/traefik/docker-compose.yaml diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml new file mode 100644 index 00000000..2dddcb86 --- /dev/null +++ b/docker/traefik/docker-compose.yaml @@ -0,0 +1,55 @@ +version: '3' + +services: + traefik: + image: traefik:latest + container_name: traefik + restart: unless-stopped + ports: + - '80:80' + - '443:443' + environment: + - TZ=Europe/Helsinki + security_opt: + - no-new-privileges:true + networks: + - proxy + volumes: + - /etc/localtime:/etc/localtime:ro + - /var/run/docker.sock:/var/run/docker.sock:ro + - /docker/træfik/træfik/traefik.yml:/traefik.yml:ro + - /docker/træfik/træfik/dashboard-users:/dashboard-users:ro + - /docker/træfik/træfik/acme.json:/acme.json + - /docker/træfik/træfik/log:/var/log + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.redirect.entrypoints=http' + - 'traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.redirect.middlewares=http2https' + + - 'traefik.http.routers.dashboard.entrypoints=https' + - 'traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)' + - 'traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users' + - 'traefik.http.routers.dashboard.middlewares=dashboard-auth' + - 'traefik.http.routers.dashboard.tls=true' + - 'traefik.http.routers.dashboard.tls.certresolver=http' + - 'traefik.http.routers.dashboard.service=api@internal' + + fail2ban: + image: crazymax/fail2ban:latest + container_name: fail2ban + restart: unless-stopped + network_mode: "host" + cap_add: + - NET_ADMIN + - NET_RAW + volumes: + - /docker/træfik/træfik/log:/var/log/træfik:ro + - /docker/træfik/fail2ban:/data + - /mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro + - /docker/gitea/gitea/log/gitea.log:/var/log/gitea:ro +networks: + proxy: + external: true From 21a89943de5b528a043e774c4970c46cc76af891 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 19:11:05 +0300 Subject: [PATCH 0820/2667] Add fail2ban jails for gitea and nextcloud --- docker/traefik/docker-compose.yaml | 55 ++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 docker/traefik/docker-compose.yaml diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml new file mode 100644 index 00000000..2dddcb86 --- /dev/null +++ b/docker/traefik/docker-compose.yaml @@ -0,0 +1,55 @@ +version: '3' + +services: + traefik: + image: traefik:latest + container_name: traefik + restart: unless-stopped + ports: + - '80:80' + - '443:443' + environment: + - TZ=Europe/Helsinki + security_opt: + - no-new-privileges:true + networks: + - proxy + volumes: + - /etc/localtime:/etc/localtime:ro + - /var/run/docker.sock:/var/run/docker.sock:ro + - /docker/træfik/træfik/traefik.yml:/traefik.yml:ro + - /docker/træfik/træfik/dashboard-users:/dashboard-users:ro + - /docker/træfik/træfik/acme.json:/acme.json + - /docker/træfik/træfik/log:/var/log + labels: + - 'traefik.enable=true' + + - 'traefik.http.routers.redirect.entrypoints=http' + - 'traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)' + - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' + - 'traefik.http.routers.redirect.middlewares=http2https' + + - 'traefik.http.routers.dashboard.entrypoints=https' + - 'traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)' + - 'traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users' + - 'traefik.http.routers.dashboard.middlewares=dashboard-auth' + - 'traefik.http.routers.dashboard.tls=true' + - 'traefik.http.routers.dashboard.tls.certresolver=http' + - 'traefik.http.routers.dashboard.service=api@internal' + + fail2ban: + image: crazymax/fail2ban:latest + container_name: fail2ban + restart: unless-stopped + network_mode: "host" + cap_add: + - NET_ADMIN + - NET_RAW + volumes: + - /docker/træfik/træfik/log:/var/log/træfik:ro + - /docker/træfik/fail2ban:/data + - /mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro + - /docker/gitea/gitea/log/gitea.log:/var/log/gitea:ro +networks: + proxy: + external: true From 64edce5c9afbc18bb8137b1fe366fc7b134b40f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 19:16:06 +0300 Subject: [PATCH 0821/2667] Fix fail2ban timezone --- docker/traefik/docker-compose.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml index 2dddcb86..0afc8aea 100644 --- a/docker/traefik/docker-compose.yaml +++ b/docker/traefik/docker-compose.yaml @@ -45,7 +45,10 @@ services: cap_add: - NET_ADMIN - NET_RAW + environment: + - TZ=Europe/Helsinki volumes: + - /etc/localtime:/etc/localtime:ro - /docker/træfik/træfik/log:/var/log/træfik:ro - /docker/træfik/fail2ban:/data - /mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro From f750d718fa926d10801ff513e1831a4b9da1f0bc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 19:16:06 +0300 Subject: [PATCH 0822/2667] Fix fail2ban timezone --- docker/traefik/docker-compose.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml index 2dddcb86..0afc8aea 100644 --- a/docker/traefik/docker-compose.yaml +++ b/docker/traefik/docker-compose.yaml @@ -45,7 +45,10 @@ services: cap_add: - NET_ADMIN - NET_RAW + environment: + - TZ=Europe/Helsinki volumes: + - /etc/localtime:/etc/localtime:ro - /docker/træfik/træfik/log:/var/log/træfik:ro - /docker/træfik/fail2ban:/data - /mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro From 6fca99aedac655249a6d5b3691227b94b636296a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 19:23:07 +0300 Subject: [PATCH 0823/2667] Rename some volumes --- docker/traefik/docker-compose.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml index 0afc8aea..5edeefa2 100644 --- a/docker/traefik/docker-compose.yaml +++ b/docker/traefik/docker-compose.yaml @@ -17,10 +17,10 @@ services: volumes: - /etc/localtime:/etc/localtime:ro - /var/run/docker.sock:/var/run/docker.sock:ro - - /docker/træfik/træfik/traefik.yml:/traefik.yml:ro - - /docker/træfik/træfik/dashboard-users:/dashboard-users:ro - - /docker/træfik/træfik/acme.json:/acme.json - - /docker/træfik/træfik/log:/var/log + - /docker/traefik/traefik/traefik.yml:/traefik.yml:ro + - /docker/trawfik/traefik/dashboard-users:/dashboard-users:ro + - /docker/traefik/traefik/acme.json:/acme.json + - /docker/traefik/traefik/log:/var/log labels: - 'traefik.enable=true' @@ -49,8 +49,8 @@ services: - TZ=Europe/Helsinki volumes: - /etc/localtime:/etc/localtime:ro - - /docker/træfik/træfik/log:/var/log/træfik:ro - - /docker/træfik/fail2ban:/data + - /docker/traefik/traefik/log:/var/log/traefik:ro + - /docker/traefik/fail2ban:/data - /mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro - /docker/gitea/gitea/log/gitea.log:/var/log/gitea:ro networks: From c67776feb9edafbb56ab943aa554ce9c33f10f79 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 19:23:07 +0300 Subject: [PATCH 0824/2667] Rename some volumes --- docker/traefik/docker-compose.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml index 0afc8aea..5edeefa2 100644 --- a/docker/traefik/docker-compose.yaml +++ b/docker/traefik/docker-compose.yaml @@ -17,10 +17,10 @@ services: volumes: - /etc/localtime:/etc/localtime:ro - /var/run/docker.sock:/var/run/docker.sock:ro - - /docker/træfik/træfik/traefik.yml:/traefik.yml:ro - - /docker/træfik/træfik/dashboard-users:/dashboard-users:ro - - /docker/træfik/træfik/acme.json:/acme.json - - /docker/træfik/træfik/log:/var/log + - /docker/traefik/traefik/traefik.yml:/traefik.yml:ro + - /docker/trawfik/traefik/dashboard-users:/dashboard-users:ro + - /docker/traefik/traefik/acme.json:/acme.json + - /docker/traefik/traefik/log:/var/log labels: - 'traefik.enable=true' @@ -49,8 +49,8 @@ services: - TZ=Europe/Helsinki volumes: - /etc/localtime:/etc/localtime:ro - - /docker/træfik/træfik/log:/var/log/træfik:ro - - /docker/træfik/fail2ban:/data + - /docker/traefik/traefik/log:/var/log/traefik:ro + - /docker/traefik/fail2ban:/data - /mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro - /docker/gitea/gitea/log/gitea.log:/var/log/gitea:ro networks: From 34d4ef77aa2464c7194e287ee3da6ad860313602 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 19:50:35 +0300 Subject: [PATCH 0825/2667] Add home assitant to fail2ban --- docker/traefik/docker-compose.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml index 5edeefa2..98b190ac 100644 --- a/docker/traefik/docker-compose.yaml +++ b/docker/traefik/docker-compose.yaml @@ -18,7 +18,7 @@ services: - /etc/localtime:/etc/localtime:ro - /var/run/docker.sock:/var/run/docker.sock:ro - /docker/traefik/traefik/traefik.yml:/traefik.yml:ro - - /docker/trawfik/traefik/dashboard-users:/dashboard-users:ro + - /docker/traefik/traefik/dashboard-users:/dashboard-users:ro - /docker/traefik/traefik/acme.json:/acme.json - /docker/traefik/traefik/log:/var/log labels: @@ -51,8 +51,9 @@ services: - /etc/localtime:/etc/localtime:ro - /docker/traefik/traefik/log:/var/log/traefik:ro - /docker/traefik/fail2ban:/data - - /mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro - /docker/gitea/gitea/log/gitea.log:/var/log/gitea:ro + - /docker/homeautomation/home-assistant/home-assistant.log:/var/log/hass + - /mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro networks: proxy: external: true From 6b2755f1aecb3c0fc3126e1f80477f88f11c02e3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 19:50:35 +0300 Subject: [PATCH 0826/2667] Add home assitant to fail2ban --- docker/traefik/docker-compose.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml index 5edeefa2..98b190ac 100644 --- a/docker/traefik/docker-compose.yaml +++ b/docker/traefik/docker-compose.yaml @@ -18,7 +18,7 @@ services: - /etc/localtime:/etc/localtime:ro - /var/run/docker.sock:/var/run/docker.sock:ro - /docker/traefik/traefik/traefik.yml:/traefik.yml:ro - - /docker/trawfik/traefik/dashboard-users:/dashboard-users:ro + - /docker/traefik/traefik/dashboard-users:/dashboard-users:ro - /docker/traefik/traefik/acme.json:/acme.json - /docker/traefik/traefik/log:/var/log labels: @@ -51,8 +51,9 @@ services: - /etc/localtime:/etc/localtime:ro - /docker/traefik/traefik/log:/var/log/traefik:ro - /docker/traefik/fail2ban:/data - - /mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro - /docker/gitea/gitea/log/gitea.log:/var/log/gitea:ro + - /docker/homeautomation/home-assistant/home-assistant.log:/var/log/hass + - /mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro networks: proxy: external: true From c8f638115a7e75724e8ba7c33c010f79a0c66dbd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Aug 2021 16:08:27 +0300 Subject: [PATCH 0827/2667] Add tftp server --- docker/tftp/docker-compose.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 docker/tftp/docker-compose.yaml diff --git a/docker/tftp/docker-compose.yaml b/docker/tftp/docker-compose.yaml new file mode 100644 index 00000000..1ce83b1c --- /dev/null +++ b/docker/tftp/docker-compose.yaml @@ -0,0 +1,14 @@ +version: "2" + +services: + tftp: + container_name: tftp + image: pghalliday/tftp + environment: + - TZ=Europe/Helsinki + restart: unless-stopped + ports: + - 69:69/udp + volumes: + - /etc/localtime:/etc/localtime:ro + - /docker/tftp:/var/tftpboot From bb848dc70f16ca5c20fda94ae2ee3177eb000ed9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Aug 2021 16:08:27 +0300 Subject: [PATCH 0828/2667] Add tftp server --- docker/tftp/docker-compose.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 docker/tftp/docker-compose.yaml diff --git a/docker/tftp/docker-compose.yaml b/docker/tftp/docker-compose.yaml new file mode 100644 index 00000000..1ce83b1c --- /dev/null +++ b/docker/tftp/docker-compose.yaml @@ -0,0 +1,14 @@ +version: "2" + +services: + tftp: + container_name: tftp + image: pghalliday/tftp + environment: + - TZ=Europe/Helsinki + restart: unless-stopped + ports: + - 69:69/udp + volumes: + - /etc/localtime:/etc/localtime:ro + - /docker/tftp:/var/tftpboot From 6a3183b4c45e58156a5fdf9be8f62d076724674c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Aug 2021 16:08:38 +0300 Subject: [PATCH 0829/2667] Enable http3 for all services, use central certResolver config --- docker/freshrss/docker-compose.yaml | 4 ---- docker/gitea/docker-compose.yaml | 2 -- docker/homeautomation/docker-compose.yaml | 4 ---- docker/index.korhonen.cc/docker-compose.yaml | 2 -- docker/jellyfin/docker-compose.yaml | 2 -- docker/nextcloud/docker-compose.yaml | 2 -- docker/pihole/docker-compose.yaml | 2 -- docker/traefik/docker-compose.yaml | 7 +++---- docker/tvheadend/docker-compose.yaml | 2 -- root/etc/ssh/sshd_config | 3 +++ 10 files changed, 6 insertions(+), 24 deletions(-) diff --git a/docker/freshrss/docker-compose.yaml b/docker/freshrss/docker-compose.yaml index 1de8bfef..86862668 100644 --- a/docker/freshrss/docker-compose.yaml +++ b/docker/freshrss/docker-compose.yaml @@ -27,8 +27,6 @@ services: - "traefik.http.routers.freshrss.entrypoints=https" - "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)" - - "traefik.http.routers.freshrss.tls=true" - - "traefik.http.routers.freshrss.tls.certresolver=http" - "traefik.http.routers.freshrss.service=freshrss" - "traefik.docker.network=proxy" - "traefik.http.services.freshrss.loadbalancer.server.port=80" @@ -53,8 +51,6 @@ services: - "traefik.http.routers.bibliogram.entrypoints=https" - "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)" - - "traefik.http.routers.bibliogram.tls=true" - - "traefik.http.routers.bibliogram.tls.certresolver=http" - "traefik.http.routers.bibliogram.service=bibliogram" - "traefik.docker.network=proxy" - "traefik.http.services.bibliogram.loadbalancer.server.port=10407" diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index b633d3e7..750a5fd0 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -28,8 +28,6 @@ services: - "traefik.http.routers.gitea.entrypoints=https" - "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)" - - "traefik.http.routers.gitea.tls=true" - - "traefik.http.routers.gitea.tls.certresolver=http" - "traefik.http.routers.gitea.service=gitea" - "traefik.docker.network=proxy" - "traefik.http.services.gitea.loadbalancer.server.port=3000" diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index a42a39f3..052d85fa 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -30,8 +30,6 @@ services: - "traefik.http.routers.home-assistant.entrypoints=https" - "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)" - - "traefik.http.routers.home-assistant.tls=true" - - "traefik.http.routers.home-assistant.tls.certresolver=http" - "traefik.http.routers.home-assistant.service=home-assistant" - "traefik.docker.network=proxy" - "traefik.http.services.home-assistant.loadbalancer.server.port=8123" @@ -94,8 +92,6 @@ services: - "traefik.http.routers.node-red.entrypoints=https" - "traefik.http.routers.node-red.rule=Host(`node.korhonen.cc`)" - - "traefik.http.routers.node-red.tls=true" - - "traefik.http.routers.node-red.tls.certresolver=http" - "traefik.http.routers.node-red.service=node-red" - "traefik.docker.network=proxy" - "traefik.http.services.node-red.loadbalancer.server.port=1880" diff --git a/docker/index.korhonen.cc/docker-compose.yaml b/docker/index.korhonen.cc/docker-compose.yaml index 16ded23e..2859a129 100644 --- a/docker/index.korhonen.cc/docker-compose.yaml +++ b/docker/index.korhonen.cc/docker-compose.yaml @@ -22,8 +22,6 @@ services: - "traefik.http.routers.index.entrypoints=https" - "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)" - - "traefik.http.routers.index.tls=true" - - "traefik.http.routers.index.tls.certresolver=http" - "traefik.http.routers.index.service=index" - "traefik.docker.network=proxy" - "traefik.http.services.index.loadbalancer.server.port=80" diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index e36f27f6..ff34298d 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -29,8 +29,6 @@ services: - "traefik.http.routers.jellyfin.entrypoints=https" - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)" - - "traefik.http.routers.jellyfin.tls=true" - - "traefik.http.routers.jellyfin.tls.certresolver=http" - "traefik.http.routers.jellyfin.service=jellyfin" - "traefik.docker.network=proxy" - "traefik.http.services.jellyfin.loadbalancer.server.port=8096" diff --git a/docker/nextcloud/docker-compose.yaml b/docker/nextcloud/docker-compose.yaml index a71a4152..d959a14a 100644 --- a/docker/nextcloud/docker-compose.yaml +++ b/docker/nextcloud/docker-compose.yaml @@ -33,8 +33,6 @@ services: - "traefik.http.routers.nextcloud.entrypoints=https" - "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)" - - "traefik.http.routers.nextcloud.tls=true" - - "traefik.http.routers.nextcloud.tls.certresolver=http" - "traefik.http.routers.nextcloud.service=nextcloud" - "traefik.docker.network=proxy" - "traefik.http.services.nextcloud.loadbalancer.server.port=80" diff --git a/docker/pihole/docker-compose.yaml b/docker/pihole/docker-compose.yaml index 1738d8f5..65ca2f52 100644 --- a/docker/pihole/docker-compose.yaml +++ b/docker/pihole/docker-compose.yaml @@ -35,8 +35,6 @@ services: - "traefik.http.routers.pihole.entrypoints=https" - "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)" - - "traefik.http.routers.pihole.tls=true" - - "traefik.http.routers.pihole.tls.certresolver=http" - "traefik.http.routers.pihole.service=pihole" - "traefik.docker.network=proxy" - "traefik.http.services.pihole.loadbalancer.server.port=80" diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml index 98b190ac..ca5657ca 100644 --- a/docker/traefik/docker-compose.yaml +++ b/docker/traefik/docker-compose.yaml @@ -7,7 +7,8 @@ services: restart: unless-stopped ports: - '80:80' - - '443:443' + - '443:443/tcp' + - '443:443/udp' environment: - TZ=Europe/Helsinki security_opt: @@ -22,8 +23,8 @@ services: - /docker/traefik/traefik/acme.json:/acme.json - /docker/traefik/traefik/log:/var/log labels: + # Serve dashboard - 'traefik.enable=true' - - 'traefik.http.routers.redirect.entrypoints=http' - 'traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)' - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' @@ -33,8 +34,6 @@ services: - 'traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)' - 'traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users' - 'traefik.http.routers.dashboard.middlewares=dashboard-auth' - - 'traefik.http.routers.dashboard.tls=true' - - 'traefik.http.routers.dashboard.tls.certresolver=http' - 'traefik.http.routers.dashboard.service=api@internal' fail2ban: diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index d4e4acd3..091c7660 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -31,8 +31,6 @@ services: - "traefik.http.routers.tvheadend.entrypoints=https" - "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)" - - "traefik.http.routers.tvheadend.tls=true" - - "traefik.http.routers.tvheadend.tls.certresolver=http" - "traefik.http.routers.tvheadend.service=tvheadend" - "traefik.docker.network=proxy" - "traefik.http.services.tvheadend.loadbalancer.server.port=9981" diff --git a/root/etc/ssh/sshd_config b/root/etc/ssh/sshd_config index 7d7d5278..5c681a2a 100644 --- a/root/etc/ssh/sshd_config +++ b/root/etc/ssh/sshd_config @@ -1,6 +1,9 @@ # Remove socket for gpg agent forwarding StreamLocalBindUnlink yes +{%@@ if profile == "Moria" @@%} +Port 221 +{%@@ endif @@%} X11Forwarding yes AuthorizedKeysFile .ssh/authorized_keys PasswordAuthentication no From 1afe0f59cf5f037a341ff2de41315f56419fe7ae Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Aug 2021 16:08:38 +0300 Subject: [PATCH 0830/2667] Enable http3 for all services, use central certResolver config --- docker/freshrss/docker-compose.yaml | 4 ---- docker/gitea/docker-compose.yaml | 2 -- docker/homeautomation/docker-compose.yaml | 4 ---- docker/index.korhonen.cc/docker-compose.yaml | 2 -- docker/jellyfin/docker-compose.yaml | 2 -- docker/nextcloud/docker-compose.yaml | 2 -- docker/pihole/docker-compose.yaml | 2 -- docker/traefik/docker-compose.yaml | 7 +++---- docker/tvheadend/docker-compose.yaml | 2 -- root/etc/ssh/sshd_config | 3 +++ 10 files changed, 6 insertions(+), 24 deletions(-) diff --git a/docker/freshrss/docker-compose.yaml b/docker/freshrss/docker-compose.yaml index 1de8bfef..86862668 100644 --- a/docker/freshrss/docker-compose.yaml +++ b/docker/freshrss/docker-compose.yaml @@ -27,8 +27,6 @@ services: - "traefik.http.routers.freshrss.entrypoints=https" - "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)" - - "traefik.http.routers.freshrss.tls=true" - - "traefik.http.routers.freshrss.tls.certresolver=http" - "traefik.http.routers.freshrss.service=freshrss" - "traefik.docker.network=proxy" - "traefik.http.services.freshrss.loadbalancer.server.port=80" @@ -53,8 +51,6 @@ services: - "traefik.http.routers.bibliogram.entrypoints=https" - "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)" - - "traefik.http.routers.bibliogram.tls=true" - - "traefik.http.routers.bibliogram.tls.certresolver=http" - "traefik.http.routers.bibliogram.service=bibliogram" - "traefik.docker.network=proxy" - "traefik.http.services.bibliogram.loadbalancer.server.port=10407" diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index b633d3e7..750a5fd0 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -28,8 +28,6 @@ services: - "traefik.http.routers.gitea.entrypoints=https" - "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)" - - "traefik.http.routers.gitea.tls=true" - - "traefik.http.routers.gitea.tls.certresolver=http" - "traefik.http.routers.gitea.service=gitea" - "traefik.docker.network=proxy" - "traefik.http.services.gitea.loadbalancer.server.port=3000" diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index a42a39f3..052d85fa 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -30,8 +30,6 @@ services: - "traefik.http.routers.home-assistant.entrypoints=https" - "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)" - - "traefik.http.routers.home-assistant.tls=true" - - "traefik.http.routers.home-assistant.tls.certresolver=http" - "traefik.http.routers.home-assistant.service=home-assistant" - "traefik.docker.network=proxy" - "traefik.http.services.home-assistant.loadbalancer.server.port=8123" @@ -94,8 +92,6 @@ services: - "traefik.http.routers.node-red.entrypoints=https" - "traefik.http.routers.node-red.rule=Host(`node.korhonen.cc`)" - - "traefik.http.routers.node-red.tls=true" - - "traefik.http.routers.node-red.tls.certresolver=http" - "traefik.http.routers.node-red.service=node-red" - "traefik.docker.network=proxy" - "traefik.http.services.node-red.loadbalancer.server.port=1880" diff --git a/docker/index.korhonen.cc/docker-compose.yaml b/docker/index.korhonen.cc/docker-compose.yaml index 16ded23e..2859a129 100644 --- a/docker/index.korhonen.cc/docker-compose.yaml +++ b/docker/index.korhonen.cc/docker-compose.yaml @@ -22,8 +22,6 @@ services: - "traefik.http.routers.index.entrypoints=https" - "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)" - - "traefik.http.routers.index.tls=true" - - "traefik.http.routers.index.tls.certresolver=http" - "traefik.http.routers.index.service=index" - "traefik.docker.network=proxy" - "traefik.http.services.index.loadbalancer.server.port=80" diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index e36f27f6..ff34298d 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -29,8 +29,6 @@ services: - "traefik.http.routers.jellyfin.entrypoints=https" - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)" - - "traefik.http.routers.jellyfin.tls=true" - - "traefik.http.routers.jellyfin.tls.certresolver=http" - "traefik.http.routers.jellyfin.service=jellyfin" - "traefik.docker.network=proxy" - "traefik.http.services.jellyfin.loadbalancer.server.port=8096" diff --git a/docker/nextcloud/docker-compose.yaml b/docker/nextcloud/docker-compose.yaml index a71a4152..d959a14a 100644 --- a/docker/nextcloud/docker-compose.yaml +++ b/docker/nextcloud/docker-compose.yaml @@ -33,8 +33,6 @@ services: - "traefik.http.routers.nextcloud.entrypoints=https" - "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)" - - "traefik.http.routers.nextcloud.tls=true" - - "traefik.http.routers.nextcloud.tls.certresolver=http" - "traefik.http.routers.nextcloud.service=nextcloud" - "traefik.docker.network=proxy" - "traefik.http.services.nextcloud.loadbalancer.server.port=80" diff --git a/docker/pihole/docker-compose.yaml b/docker/pihole/docker-compose.yaml index 1738d8f5..65ca2f52 100644 --- a/docker/pihole/docker-compose.yaml +++ b/docker/pihole/docker-compose.yaml @@ -35,8 +35,6 @@ services: - "traefik.http.routers.pihole.entrypoints=https" - "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)" - - "traefik.http.routers.pihole.tls=true" - - "traefik.http.routers.pihole.tls.certresolver=http" - "traefik.http.routers.pihole.service=pihole" - "traefik.docker.network=proxy" - "traefik.http.services.pihole.loadbalancer.server.port=80" diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml index 98b190ac..ca5657ca 100644 --- a/docker/traefik/docker-compose.yaml +++ b/docker/traefik/docker-compose.yaml @@ -7,7 +7,8 @@ services: restart: unless-stopped ports: - '80:80' - - '443:443' + - '443:443/tcp' + - '443:443/udp' environment: - TZ=Europe/Helsinki security_opt: @@ -22,8 +23,8 @@ services: - /docker/traefik/traefik/acme.json:/acme.json - /docker/traefik/traefik/log:/var/log labels: + # Serve dashboard - 'traefik.enable=true' - - 'traefik.http.routers.redirect.entrypoints=http' - 'traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)' - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' @@ -33,8 +34,6 @@ services: - 'traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)' - 'traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users' - 'traefik.http.routers.dashboard.middlewares=dashboard-auth' - - 'traefik.http.routers.dashboard.tls=true' - - 'traefik.http.routers.dashboard.tls.certresolver=http' - 'traefik.http.routers.dashboard.service=api@internal' fail2ban: diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index d4e4acd3..091c7660 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -31,8 +31,6 @@ services: - "traefik.http.routers.tvheadend.entrypoints=https" - "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)" - - "traefik.http.routers.tvheadend.tls=true" - - "traefik.http.routers.tvheadend.tls.certresolver=http" - "traefik.http.routers.tvheadend.service=tvheadend" - "traefik.docker.network=proxy" - "traefik.http.services.tvheadend.loadbalancer.server.port=9981" diff --git a/root/etc/ssh/sshd_config b/root/etc/ssh/sshd_config index 7d7d5278..5c681a2a 100644 --- a/root/etc/ssh/sshd_config +++ b/root/etc/ssh/sshd_config @@ -1,6 +1,9 @@ # Remove socket for gpg agent forwarding StreamLocalBindUnlink yes +{%@@ if profile == "Moria" @@%} +Port 221 +{%@@ endif @@%} X11Forwarding yes AuthorizedKeysFile .ssh/authorized_keys PasswordAuthentication no From a061ba3a40fad0b78400b60704e039d755635c2d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Aug 2021 16:10:01 +0300 Subject: [PATCH 0831/2667] Remove leftover traefik config --- docker/træfik/docker-compose.yaml | 53 ------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 docker/træfik/docker-compose.yaml diff --git a/docker/træfik/docker-compose.yaml b/docker/træfik/docker-compose.yaml deleted file mode 100644 index 1a4f7914..00000000 --- a/docker/træfik/docker-compose.yaml +++ /dev/null @@ -1,53 +0,0 @@ -version: '3' - -services: - traefik: - image: traefik:latest - container_name: traefik - restart: unless-stopped - ports: - - '80:80' - - '443:443' - environment: - - TZ=Europe/Helsinki - security_opt: - - no-new-privileges:true - networks: - - proxy - volumes: - - /etc/localtime:/etc/localtime:ro - - /var/run/docker.sock:/var/run/docker.sock:ro - - /docker/træfik/træfik/traefik.yml:/traefik.yml:ro - - /docker/træfik/træfik/dashboard-users:/dashboard-users:ro - - /docker/træfik/træfik/acme.json:/acme.json - - /docker/træfik/træfik/log:/var/log - labels: - - 'traefik.enable=true' - - - 'traefik.http.routers.redirect.entrypoints=http' - - 'traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.redirect.middlewares=http2https' - - - 'traefik.http.routers.dashboard.entrypoints=https' - - 'traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)' - - 'traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users' - - 'traefik.http.routers.dashboard.middlewares=dashboard-auth' - - 'traefik.http.routers.dashboard.tls=true' - - 'traefik.http.routers.dashboard.tls.certresolver=http' - - 'traefik.http.routers.dashboard.service=api@internal' - - fail2ban: - image: crazymax/fail2ban:latest - container_name: fail2ban - restart: unless-stopped - network_mode: "host" - cap_add: - - NET_ADMIN - - NET_RAW - volumes: - - /docker/træfik/træfik/log:/var/log/træfik:ro - - /docker/træfik/fail2ban:/data -networks: - proxy: - external: true From e94a2ed26b4f640803bef2949e557f45163287ff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Aug 2021 16:10:01 +0300 Subject: [PATCH 0832/2667] Remove leftover traefik config --- docker/træfik/docker-compose.yaml | 53 ------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 docker/træfik/docker-compose.yaml diff --git a/docker/træfik/docker-compose.yaml b/docker/træfik/docker-compose.yaml deleted file mode 100644 index 1a4f7914..00000000 --- a/docker/træfik/docker-compose.yaml +++ /dev/null @@ -1,53 +0,0 @@ -version: '3' - -services: - traefik: - image: traefik:latest - container_name: traefik - restart: unless-stopped - ports: - - '80:80' - - '443:443' - environment: - - TZ=Europe/Helsinki - security_opt: - - no-new-privileges:true - networks: - - proxy - volumes: - - /etc/localtime:/etc/localtime:ro - - /var/run/docker.sock:/var/run/docker.sock:ro - - /docker/træfik/træfik/traefik.yml:/traefik.yml:ro - - /docker/træfik/træfik/dashboard-users:/dashboard-users:ro - - /docker/træfik/træfik/acme.json:/acme.json - - /docker/træfik/træfik/log:/var/log - labels: - - 'traefik.enable=true' - - - 'traefik.http.routers.redirect.entrypoints=http' - - 'traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.redirect.middlewares=http2https' - - - 'traefik.http.routers.dashboard.entrypoints=https' - - 'traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)' - - 'traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users' - - 'traefik.http.routers.dashboard.middlewares=dashboard-auth' - - 'traefik.http.routers.dashboard.tls=true' - - 'traefik.http.routers.dashboard.tls.certresolver=http' - - 'traefik.http.routers.dashboard.service=api@internal' - - fail2ban: - image: crazymax/fail2ban:latest - container_name: fail2ban - restart: unless-stopped - network_mode: "host" - cap_add: - - NET_ADMIN - - NET_RAW - volumes: - - /docker/træfik/træfik/log:/var/log/træfik:ro - - /docker/træfik/fail2ban:/data -networks: - proxy: - external: true From 1b1ae24ba117e57f26a6615eae00d8231f52de14 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Aug 2021 16:41:57 +0300 Subject: [PATCH 0833/2667] Nightfox: `set()` has been deprecated in favor of `load()` --- home/.config/nvim/lua/settings.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 22848b9a..61828d55 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -5,7 +5,7 @@ local cmd = vim.cmd ------ Appearance ------ -- Set colorscheme -require('nightfox').set() +require('nightfox').load() -- True colors o.termguicolors = true From d0d51f9ea6126b6d02e4b20fe49b889259003ed1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Aug 2021 16:41:57 +0300 Subject: [PATCH 0834/2667] Nightfox: `set()` has been deprecated in favor of `load()` --- home/.config/nvim/lua/settings.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 22848b9a..61828d55 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -5,7 +5,7 @@ local cmd = vim.cmd ------ Appearance ------ -- Set colorscheme -require('nightfox').set() +require('nightfox').load() -- True colors o.termguicolors = true From 3301139cd3a302974dfcbe7f5b5c5da59feb2186 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Aug 2021 16:42:06 +0300 Subject: [PATCH 0835/2667] Fix mko-laptop mpv --- home/.config/mpv/mpv.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index 26d19160..cc7cefba 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -12,7 +12,7 @@ gpu-context=wayland {%@@ endif @@%} {%@@ if profile == "mko-laptop" @@%} -script=~/bin/mpris.so +script=~/.lib/mpris.so {%@@ endif @@%} ############# From d2e54b7ef5cfbab2eec24cdf17d57e19fa3a39d0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Aug 2021 16:42:06 +0300 Subject: [PATCH 0836/2667] Fix mko-laptop mpv --- home/.config/mpv/mpv.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index 26d19160..cc7cefba 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -12,7 +12,7 @@ gpu-context=wayland {%@@ endif @@%} {%@@ if profile == "mko-laptop" @@%} -script=~/bin/mpris.so +script=~/.lib/mpris.so {%@@ endif @@%} ############# From fca406be0da4796555ea6388b3a80203b50d36bf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 3 Sep 2021 15:16:18 +0300 Subject: [PATCH 0837/2667] Change gitea outward facing port --- docker/gitea/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 750a5fd0..0b8b0bb5 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -14,7 +14,7 @@ services: - proxy ports: - "3000:3000" - - "222:22" + - "22:22" volumes: - /docker/gitea:/data - /etc/localtime:/etc/localtime:ro From d7ce6319b46ca9107f6e6e9d9a952a798ea2c810 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 3 Sep 2021 15:16:18 +0300 Subject: [PATCH 0838/2667] Change gitea outward facing port --- docker/gitea/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 750a5fd0..0b8b0bb5 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -14,7 +14,7 @@ services: - proxy ports: - "3000:3000" - - "222:22" + - "22:22" volumes: - /docker/gitea:/data - /etc/localtime:/etc/localtime:ro From c52737d9b33f08cbcf293ad81f863fcdd17a3014 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 3 Sep 2021 15:45:13 +0300 Subject: [PATCH 0839/2667] Enable wayland for plasma --- config.yaml | 4 ++++ home/.config/plasma-workspace/env/wayland.sh | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 home/.config/plasma-workspace/env/wayland.sh diff --git a/config.yaml b/config.yaml index 40f704e2..d82bc865 100644 --- a/config.yaml +++ b/config.yaml @@ -172,6 +172,9 @@ dotfiles: f_electron12-flags.conf: src: .config/electron12-flags.conf dst: ~/.config/electron12-flags.conf + f_wayland.sh: + src: .config/plasma-workspace/env/wayland.sh + dst: ~/.config/plasma-workspace/env/wayland.sh profiles: base: dotfiles: @@ -246,6 +249,7 @@ profiles: - f_gpg.conf - f_electron-flags.conf - f_electron12-flags.conf + - f_wayland.sh Moria: include: - terminal diff --git a/home/.config/plasma-workspace/env/wayland.sh b/home/.config/plasma-workspace/env/wayland.sh new file mode 100644 index 00000000..17afd060 --- /dev/null +++ b/home/.config/plasma-workspace/env/wayland.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# Set environment variables for Sway + +# Firefox +export MOZ_ENABLE_WAYLAND=1 +export MOZ_USE_XINPUT2=1 +export MOZ_WEBRENDER=1 +export MOZ_DBUS_REMOTE=1 + +# Fix java on wayland +export _JAVA_AWT_WM_NONREPARENTING=1 +export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' + +# Enable wayland support on clutter +export CLUTTER_BACKEND=wayland From f8b538e2757c4c040e16597667877a46101fb229 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 3 Sep 2021 15:45:13 +0300 Subject: [PATCH 0840/2667] Enable wayland for plasma --- config.yaml | 4 ++++ home/.config/plasma-workspace/env/wayland.sh | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 home/.config/plasma-workspace/env/wayland.sh diff --git a/config.yaml b/config.yaml index 40f704e2..d82bc865 100644 --- a/config.yaml +++ b/config.yaml @@ -172,6 +172,9 @@ dotfiles: f_electron12-flags.conf: src: .config/electron12-flags.conf dst: ~/.config/electron12-flags.conf + f_wayland.sh: + src: .config/plasma-workspace/env/wayland.sh + dst: ~/.config/plasma-workspace/env/wayland.sh profiles: base: dotfiles: @@ -246,6 +249,7 @@ profiles: - f_gpg.conf - f_electron-flags.conf - f_electron12-flags.conf + - f_wayland.sh Moria: include: - terminal diff --git a/home/.config/plasma-workspace/env/wayland.sh b/home/.config/plasma-workspace/env/wayland.sh new file mode 100644 index 00000000..17afd060 --- /dev/null +++ b/home/.config/plasma-workspace/env/wayland.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# Set environment variables for Sway + +# Firefox +export MOZ_ENABLE_WAYLAND=1 +export MOZ_USE_XINPUT2=1 +export MOZ_WEBRENDER=1 +export MOZ_DBUS_REMOTE=1 + +# Fix java on wayland +export _JAVA_AWT_WM_NONREPARENTING=1 +export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' + +# Enable wayland support on clutter +export CLUTTER_BACKEND=wayland From 413cf6a1ecb7f399edb995bf25ea7ee1bb95cc36 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 19 Sep 2021 13:22:04 +0300 Subject: [PATCH 0841/2667] Remove thefuck alias from zsh --- home/.config/zsh/01-env.zsh | 3 --- 1 file changed, 3 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 74b63cc1..94108d64 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -62,6 +62,3 @@ if [ "$SSH_CONNECTION" -eq "" ]; then export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) gpgconf --launch gpg-agent fi - -# tehfuk -eval $(thefuck --alias) From 33460617b7425b9f7c787fc05ebcbdb64c4951c3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 19 Sep 2021 13:22:04 +0300 Subject: [PATCH 0842/2667] Remove thefuck alias from zsh --- home/.config/zsh/01-env.zsh | 3 --- 1 file changed, 3 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 74b63cc1..94108d64 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -62,6 +62,3 @@ if [ "$SSH_CONNECTION" -eq "" ]; then export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) gpgconf --launch gpg-agent fi - -# tehfuk -eval $(thefuck --alias) From ad496b54ec1567710d639698651de948381959e3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 19 Sep 2021 13:22:19 +0300 Subject: [PATCH 0843/2667] Deleted telegram desktop custom launcher --- root/usr/local/bin/telegram-desktop | 1 - 1 file changed, 1 deletion(-) delete mode 100755 root/usr/local/bin/telegram-desktop diff --git a/root/usr/local/bin/telegram-desktop b/root/usr/local/bin/telegram-desktop deleted file mode 100755 index 05f66f23..00000000 --- a/root/usr/local/bin/telegram-desktop +++ /dev/null @@ -1 +0,0 @@ -LANG=en_DK.UTF-8 QT_QPA_PLATFORMTHEME="" QT_STYLE_OVERRIDE="" /usr/bin/telegram-desktop $@ From 00df564e7777b298acfe53bc03103479c353877c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 19 Sep 2021 13:22:19 +0300 Subject: [PATCH 0844/2667] Deleted telegram desktop custom launcher --- root/usr/local/bin/telegram-desktop | 1 - 1 file changed, 1 deletion(-) delete mode 100755 root/usr/local/bin/telegram-desktop diff --git a/root/usr/local/bin/telegram-desktop b/root/usr/local/bin/telegram-desktop deleted file mode 100755 index 05f66f23..00000000 --- a/root/usr/local/bin/telegram-desktop +++ /dev/null @@ -1 +0,0 @@ -LANG=en_DK.UTF-8 QT_QPA_PLATFORMTHEME="" QT_STYLE_OVERRIDE="" /usr/bin/telegram-desktop $@ From aa2bf466b80fb068c52f71d0b7264bc15a1d7f7d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Sep 2021 18:04:08 +0300 Subject: [PATCH 0845/2667] Update to new docker-compose v2 syntax --- home/.config/zsh/03-aliases.zsh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index b1e55a88..8f894ba5 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -187,8 +187,7 @@ update() { docker-update() { for dir in $HOME/git/dotfiles/docker/*; do cd $dir - docker-compose pull - docker-compose up -d + docker compose up -d cd .. done } From 85b6500c194898bafe9f77e6e4dee18b567d2462 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Sep 2021 18:04:08 +0300 Subject: [PATCH 0846/2667] Update to new docker-compose v2 syntax --- home/.config/zsh/03-aliases.zsh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index b1e55a88..8f894ba5 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -187,8 +187,7 @@ update() { docker-update() { for dir in $HOME/git/dotfiles/docker/*; do cd $dir - docker-compose pull - docker-compose up -d + docker compose up -d cd .. done } From 1b9eb3a6e1ef3fa2042e705c74982fa38c959356 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Sep 2021 18:19:54 +0300 Subject: [PATCH 0847/2667] Add pull to docker update --- home/.config/zsh/03-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 8f894ba5..c0f82cc9 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -187,6 +187,7 @@ update() { docker-update() { for dir in $HOME/git/dotfiles/docker/*; do cd $dir + docker compose pull docker compose up -d cd .. done From c6639a94919df46325461313ae667d3d01e36d9b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Sep 2021 18:19:54 +0300 Subject: [PATCH 0848/2667] Add pull to docker update --- home/.config/zsh/03-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 8f894ba5..c0f82cc9 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -187,6 +187,7 @@ update() { docker-update() { for dir in $HOME/git/dotfiles/docker/*; do cd $dir + docker compose pull docker compose up -d cd .. done From 3f95366a5fa09d1356bc135bf2efeec7d7ebdb37 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 6 Sep 2021 13:01:34 +0300 Subject: [PATCH 0849/2667] Use exa completions for aliased ls --- home/.config/zsh/01-env.zsh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 94108d64..a32de6b8 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -19,6 +19,12 @@ setopt HIST_REDUCE_BLANKS setopt INC_APPEND_HISTORY_TIME setopt EXTENDED_HISTORY +# Enable completions for aliases +setopt complete_aliases + +# Use exa completions for ls +compdef ls='exa' + # Variable to pass to sdotdrop to get current user export USRNAME=$USER From fcc5cc64de25afa21db1e7df76a17194a80415cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 6 Sep 2021 13:01:34 +0300 Subject: [PATCH 0850/2667] Use exa completions for aliased ls --- home/.config/zsh/01-env.zsh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 94108d64..a32de6b8 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -19,6 +19,12 @@ setopt HIST_REDUCE_BLANKS setopt INC_APPEND_HISTORY_TIME setopt EXTENDED_HISTORY +# Enable completions for aliases +setopt complete_aliases + +# Use exa completions for ls +compdef ls='exa' + # Variable to pass to sdotdrop to get current user export USRNAME=$USER From ccd6548da0f4e4ac15bc141fae7db3c2f4c09962 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 16:31:09 +0300 Subject: [PATCH 0851/2667] Nvim: allow changing buffers with unsaved changes --- home/.config/nvim/lua/settings.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 61828d55..57bd0d71 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -22,6 +22,9 @@ o.signcolumn = 'yes' -- Diff settings cmd 'set diffopt=filler,internal,algorithm:histogram,indent-heuristic' +-- Allow switching buffers with unsaved changes +cmd 'set hidden' + -- Show line numbers cmd 'set number' From fe6dbaaa601fa73cd01e55326216dbb29fc51f16 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 16:31:09 +0300 Subject: [PATCH 0852/2667] Nvim: allow changing buffers with unsaved changes --- home/.config/nvim/lua/settings.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 61828d55..57bd0d71 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -22,6 +22,9 @@ o.signcolumn = 'yes' -- Diff settings cmd 'set diffopt=filler,internal,algorithm:histogram,indent-heuristic' +-- Allow switching buffers with unsaved changes +cmd 'set hidden' + -- Show line numbers cmd 'set number' From 9ce9264cf18f58a073050471f8eeaf6062b5ab34 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 16:31:28 +0300 Subject: [PATCH 0853/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 5dfbf5d0..55d7d560 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 5dfbf5d044a22d7aa183f282b4a490f228553932 +Subproject commit 55d7d5602e16edd44f9d4237da54134681402a61 From cff0adb487ed7e9c9d46866404a190b39c60f2b2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 16:31:28 +0300 Subject: [PATCH 0854/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 5dfbf5d0..55d7d560 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 5dfbf5d044a22d7aa183f282b4a490f228553932 +Subproject commit 55d7d5602e16edd44f9d4237da54134681402a61 From 756cebca4082b321967447390cea1dd079c15510 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 19:08:11 +0300 Subject: [PATCH 0855/2667] Neovim: switch completion plugin to coq.nvim --- home/.config/nvim/init.lua | 1 - home/.config/nvim/lua/autocmd.lua | 3 +++ .../nvim/lua/pluginconf/completion.lua | 4 ---- home/.config/nvim/lua/pluginmanager.lua | 23 +++++++++---------- 4 files changed, 14 insertions(+), 17 deletions(-) delete mode 100644 home/.config/nvim/lua/pluginconf/completion.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 586b1780..37c7a232 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -6,7 +6,6 @@ require 'settings' -- Plugin configurations require 'pluginconf.lualine' require 'pluginconf.bufferline' -require 'pluginconf.completion' require 'pluginconf.lsp' require 'pluginconf.treesitter' require 'pluginconf.telescope' diff --git a/home/.config/nvim/lua/autocmd.lua b/home/.config/nvim/lua/autocmd.lua index 00a0940c..8182a216 100644 --- a/home/.config/nvim/lua/autocmd.lua +++ b/home/.config/nvim/lua/autocmd.lua @@ -5,3 +5,6 @@ cmd('au TermOpen * tnoremap ') -- Fix YAML indentation cmd('au FileType yaml setlocal ts=2 sts=2 sw=2 expandtab') + +-- Run coq.nvim on startup +cmd('au VimEnter * COQnow --shut-up') diff --git a/home/.config/nvim/lua/pluginconf/completion.lua b/home/.config/nvim/lua/pluginconf/completion.lua deleted file mode 100644 index a4e34543..00000000 --- a/home/.config/nvim/lua/pluginconf/completion.lua +++ /dev/null @@ -1,4 +0,0 @@ -vim.o.completeopt = 'menuone,noinsert,noselect' - --- Enable for all buffers (for now) -vim.api.nvim_command('autocmd BufEnter * lua require\'completion\'.on_attach()') diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index fc915306..bd53975f 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -64,28 +64,27 @@ require('packer').startup(function() -- Install LSP executables use 'kabouzeid/nvim-lspinstall' - -- Completion framework - use 'nvim-lua/completion-nvim' + -- Completion + use {'ms-jpq/coq_nvim', branch = 'coq'} + + -- Snippets for coq_nvim + use {'ms-jpq/coq.artifacts', branch = 'artifacts'} -- treesitter syntax highlight - use { - 'nvim-treesitter/nvim-treesitter', - branch = '0.5-compat', - run = ':TSUpdate' - } + use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} -- treesitter plugin for commentstring use 'JoosepAlviste/nvim-ts-context-commentstring' - -- Additional plugins for formats not supported - -- by treesitter - use 'jamespeapen/swayconfig.vim' + -- Additional plugins for formats not supported + -- by treesitter + use 'jamespeapen/swayconfig.vim' -- mappings for commenting in code use 'tpope/vim-commentary' - -- we all know this one - use 'tpope/vim-surround' + -- we all know this one + use 'tpope/vim-surround' -- Formatter plugin use 'sbdchd/neoformat' From 027049acedc84e813b91a5c9d883ea726c7244fc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 19:08:11 +0300 Subject: [PATCH 0856/2667] Neovim: switch completion plugin to coq.nvim --- home/.config/nvim/init.lua | 1 - home/.config/nvim/lua/autocmd.lua | 3 +++ .../nvim/lua/pluginconf/completion.lua | 4 ---- home/.config/nvim/lua/pluginmanager.lua | 23 +++++++++---------- 4 files changed, 14 insertions(+), 17 deletions(-) delete mode 100644 home/.config/nvim/lua/pluginconf/completion.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 586b1780..37c7a232 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -6,7 +6,6 @@ require 'settings' -- Plugin configurations require 'pluginconf.lualine' require 'pluginconf.bufferline' -require 'pluginconf.completion' require 'pluginconf.lsp' require 'pluginconf.treesitter' require 'pluginconf.telescope' diff --git a/home/.config/nvim/lua/autocmd.lua b/home/.config/nvim/lua/autocmd.lua index 00a0940c..8182a216 100644 --- a/home/.config/nvim/lua/autocmd.lua +++ b/home/.config/nvim/lua/autocmd.lua @@ -5,3 +5,6 @@ cmd('au TermOpen * tnoremap ') -- Fix YAML indentation cmd('au FileType yaml setlocal ts=2 sts=2 sw=2 expandtab') + +-- Run coq.nvim on startup +cmd('au VimEnter * COQnow --shut-up') diff --git a/home/.config/nvim/lua/pluginconf/completion.lua b/home/.config/nvim/lua/pluginconf/completion.lua deleted file mode 100644 index a4e34543..00000000 --- a/home/.config/nvim/lua/pluginconf/completion.lua +++ /dev/null @@ -1,4 +0,0 @@ -vim.o.completeopt = 'menuone,noinsert,noselect' - --- Enable for all buffers (for now) -vim.api.nvim_command('autocmd BufEnter * lua require\'completion\'.on_attach()') diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index fc915306..bd53975f 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -64,28 +64,27 @@ require('packer').startup(function() -- Install LSP executables use 'kabouzeid/nvim-lspinstall' - -- Completion framework - use 'nvim-lua/completion-nvim' + -- Completion + use {'ms-jpq/coq_nvim', branch = 'coq'} + + -- Snippets for coq_nvim + use {'ms-jpq/coq.artifacts', branch = 'artifacts'} -- treesitter syntax highlight - use { - 'nvim-treesitter/nvim-treesitter', - branch = '0.5-compat', - run = ':TSUpdate' - } + use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} -- treesitter plugin for commentstring use 'JoosepAlviste/nvim-ts-context-commentstring' - -- Additional plugins for formats not supported - -- by treesitter - use 'jamespeapen/swayconfig.vim' + -- Additional plugins for formats not supported + -- by treesitter + use 'jamespeapen/swayconfig.vim' -- mappings for commenting in code use 'tpope/vim-commentary' - -- we all know this one - use 'tpope/vim-surround' + -- we all know this one + use 'tpope/vim-surround' -- Formatter plugin use 'sbdchd/neoformat' From 1f9f777b7099198e1a6c8221819d6955b37f38d3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 20:55:50 +0300 Subject: [PATCH 0857/2667] Fix gpg pinentry on ssh --- home/.config/zsh/01-env.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index a32de6b8..f07a9207 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -62,6 +62,8 @@ export MANPAGER="nvim +Man!" # Use GPG for SSH authentication export GPG_TTY="$(tty)" +# Fix for pinentry not working for ssh +gpg-connect-agent updatestartuptty /bye >/dev/null # set SSH_AUTH_SOCK if not logging in over SSH if [ "$SSH_CONNECTION" -eq "" ]; then From 77c42375cac533368c9c15283af2bb7c0cd01e5d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 20:55:50 +0300 Subject: [PATCH 0858/2667] Fix gpg pinentry on ssh --- home/.config/zsh/01-env.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index a32de6b8..f07a9207 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -62,6 +62,8 @@ export MANPAGER="nvim +Man!" # Use GPG for SSH authentication export GPG_TTY="$(tty)" +# Fix for pinentry not working for ssh +gpg-connect-agent updatestartuptty /bye >/dev/null # set SSH_AUTH_SOCK if not logging in over SSH if [ "$SSH_CONNECTION" -eq "" ]; then From 43bfd1a5a247a536134cf11cf54844c26d40af6d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 21:26:24 +0300 Subject: [PATCH 0859/2667] Fixes for gpg-agent --- config.yaml | 12 ++++++------ dotdrop | 2 +- home/.config/zsh/01-env.zsh | 10 +++------- home/.config/zsh/03-aliases.zsh | 1 + home/.pam_environment | 2 ++ 5 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 home/.pam_environment diff --git a/config.yaml b/config.yaml index d82bc865..269c6074 100644 --- a/config.yaml +++ b/config.yaml @@ -172,9 +172,9 @@ dotfiles: f_electron12-flags.conf: src: .config/electron12-flags.conf dst: ~/.config/electron12-flags.conf - f_wayland.sh: - src: .config/plasma-workspace/env/wayland.sh - dst: ~/.config/plasma-workspace/env/wayland.sh + f_pam_environment: + src: .pam_environment + dst: ~/.pam_environment profiles: base: dotfiles: @@ -189,6 +189,7 @@ profiles: - f_mailcap - d_zsh - f_zshrc + - f_pam_environment - f_tmux.conf - f_ranger.conf - f_ssh.conf @@ -228,6 +229,8 @@ profiles: - f_tdesktop_lang.strings - f_fonts.conf - f_zprofile + - f_electron-flags.conf + - f_electron12-flags.conf Pacman: dotfiles: - f_makepkg.conf @@ -247,9 +250,6 @@ profiles: - f_foot.ini - f_gpg-agent.conf - f_gpg.conf - - f_electron-flags.conf - - f_electron12-flags.conf - - f_wayland.sh Moria: include: - terminal diff --git a/dotdrop b/dotdrop index 55d7d560..06e9cde0 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 55d7d5602e16edd44f9d4237da54134681402a61 +Subproject commit 06e9cde0be3afa4d59f4785bbcecbd3e9f9fd6ca diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index f07a9207..6c787080 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -22,9 +22,6 @@ setopt EXTENDED_HISTORY # Enable completions for aliases setopt complete_aliases -# Use exa completions for ls -compdef ls='exa' - # Variable to pass to sdotdrop to get current user export USRNAME=$USER @@ -62,11 +59,10 @@ export MANPAGER="nvim +Man!" # Use GPG for SSH authentication export GPG_TTY="$(tty)" -# Fix for pinentry not working for ssh -gpg-connect-agent updatestartuptty /bye >/dev/null # set SSH_AUTH_SOCK if not logging in over SSH -if [ "$SSH_CONNECTION" -eq "" ]; then +if [ "$SSH_CONNECTION" = "" ]; then export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - gpgconf --launch gpg-agent + #gpgconf --launch gpg-agent + gpg-connect-agent updatestartuptty /bye >/dev/null fi diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index c0f82cc9..0e57d187 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -24,6 +24,7 @@ _fzf_compgen_path() { # Modern replacements for cat and ls alias cat='bat --paging=never' alias ls='exa' +compdef ls='exa' {%@@ if profile != "mko-laptop" @@%} # Command not found handler diff --git a/home/.pam_environment b/home/.pam_environment new file mode 100644 index 00000000..b55fba74 --- /dev/null +++ b/home/.pam_environment @@ -0,0 +1,2 @@ +SSH_AGENT_PID DEFAULT= +SSH_AUTH_SOCK DEFAULT="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh" From 36d787125675c49c75e05880f65101b4963f3ae7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 21:26:24 +0300 Subject: [PATCH 0860/2667] Fixes for gpg-agent --- config.yaml | 12 ++++++------ dotdrop | 2 +- home/.config/zsh/01-env.zsh | 10 +++------- home/.config/zsh/03-aliases.zsh | 1 + home/.pam_environment | 2 ++ 5 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 home/.pam_environment diff --git a/config.yaml b/config.yaml index d82bc865..269c6074 100644 --- a/config.yaml +++ b/config.yaml @@ -172,9 +172,9 @@ dotfiles: f_electron12-flags.conf: src: .config/electron12-flags.conf dst: ~/.config/electron12-flags.conf - f_wayland.sh: - src: .config/plasma-workspace/env/wayland.sh - dst: ~/.config/plasma-workspace/env/wayland.sh + f_pam_environment: + src: .pam_environment + dst: ~/.pam_environment profiles: base: dotfiles: @@ -189,6 +189,7 @@ profiles: - f_mailcap - d_zsh - f_zshrc + - f_pam_environment - f_tmux.conf - f_ranger.conf - f_ssh.conf @@ -228,6 +229,8 @@ profiles: - f_tdesktop_lang.strings - f_fonts.conf - f_zprofile + - f_electron-flags.conf + - f_electron12-flags.conf Pacman: dotfiles: - f_makepkg.conf @@ -247,9 +250,6 @@ profiles: - f_foot.ini - f_gpg-agent.conf - f_gpg.conf - - f_electron-flags.conf - - f_electron12-flags.conf - - f_wayland.sh Moria: include: - terminal diff --git a/dotdrop b/dotdrop index 55d7d560..06e9cde0 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 55d7d5602e16edd44f9d4237da54134681402a61 +Subproject commit 06e9cde0be3afa4d59f4785bbcecbd3e9f9fd6ca diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index f07a9207..6c787080 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -22,9 +22,6 @@ setopt EXTENDED_HISTORY # Enable completions for aliases setopt complete_aliases -# Use exa completions for ls -compdef ls='exa' - # Variable to pass to sdotdrop to get current user export USRNAME=$USER @@ -62,11 +59,10 @@ export MANPAGER="nvim +Man!" # Use GPG for SSH authentication export GPG_TTY="$(tty)" -# Fix for pinentry not working for ssh -gpg-connect-agent updatestartuptty /bye >/dev/null # set SSH_AUTH_SOCK if not logging in over SSH -if [ "$SSH_CONNECTION" -eq "" ]; then +if [ "$SSH_CONNECTION" = "" ]; then export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - gpgconf --launch gpg-agent + #gpgconf --launch gpg-agent + gpg-connect-agent updatestartuptty /bye >/dev/null fi diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index c0f82cc9..0e57d187 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -24,6 +24,7 @@ _fzf_compgen_path() { # Modern replacements for cat and ls alias cat='bat --paging=never' alias ls='exa' +compdef ls='exa' {%@@ if profile != "mko-laptop" @@%} # Command not found handler diff --git a/home/.pam_environment b/home/.pam_environment new file mode 100644 index 00000000..b55fba74 --- /dev/null +++ b/home/.pam_environment @@ -0,0 +1,2 @@ +SSH_AGENT_PID DEFAULT= +SSH_AUTH_SOCK DEFAULT="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh" From 1114ecdc85e9f1c62c47a357af0b223bd2b458c7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 21:37:23 +0300 Subject: [PATCH 0861/2667] Fixes for gpg, refactor dotdrop config --- config.yaml | 30 +++++++++++++++++------------- home/.gnupg/scdaemon.conf | 1 + 2 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 home/.gnupg/scdaemon.conf diff --git a/config.yaml b/config.yaml index 269c6074..1854167c 100644 --- a/config.yaml +++ b/config.yaml @@ -33,9 +33,6 @@ dotfiles: - nvim-packer-sync dst: ~/.config/nvim/lua src: .config/nvim/lua - f_user-dirs.dirs: - dst: ~/.config/user-dirs.dirs - src: .config/user-dirs.dirs d_sway: dst: ~/.config/sway src: .config/sway @@ -166,6 +163,9 @@ dotfiles: f_gpg.conf: src: .gnupg/gpg.conf dst: ~/.gnupg/gpg.conf + f_gpg_scdaemon.conf: + src: .gnupg/scdaemon.conf + dst: ~/.gnupg/scdaemon.conf f_electron-flags.conf: src: .config/electron-flags.conf dst: ~/.config/electron-flags.conf @@ -189,7 +189,6 @@ profiles: - f_mailcap - d_zsh - f_zshrc - - f_pam_environment - f_tmux.conf - f_ranger.conf - f_ssh.conf @@ -231,10 +230,16 @@ profiles: - f_zprofile - f_electron-flags.conf - f_electron12-flags.conf - Pacman: + pacman: dotfiles: - f_makepkg.conf - f_paru.conf + gpg: + dotfiles: + - f_gpg-agent.conf + - f_gpg.conf + - f_gpg_scdaemon.conf + - f_pam_environment Mirkwood: include: - base @@ -242,35 +247,34 @@ profiles: - email - media - sway - - Pacman + - pacman + - gpg dotfiles: - f_paru.conf - - f_user-dirs.dirs - f_gitconfig - f_foot.ini - - f_gpg-agent.conf - - f_gpg.conf Moria: include: - terminal - media - - Pacman + - pacman Gondor: include: - terminal - - Pacman + - pacman mko-laptop: include: - terminal - media + - gpg Edoras: include: - terminal - - Pacman + - pacman TakamakiPC: include: - terminal - - Pacman + - pacman localhost: include: - terminal diff --git a/home/.gnupg/scdaemon.conf b/home/.gnupg/scdaemon.conf new file mode 100644 index 00000000..eb818ddf --- /dev/null +++ b/home/.gnupg/scdaemon.conf @@ -0,0 +1 @@ +disable-ccid From cad211b2f89bfda13ade12c3c4cac499581c4d6b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 21:37:23 +0300 Subject: [PATCH 0862/2667] Fixes for gpg, refactor dotdrop config --- config.yaml | 30 +++++++++++++++++------------- home/.gnupg/scdaemon.conf | 1 + 2 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 home/.gnupg/scdaemon.conf diff --git a/config.yaml b/config.yaml index 269c6074..1854167c 100644 --- a/config.yaml +++ b/config.yaml @@ -33,9 +33,6 @@ dotfiles: - nvim-packer-sync dst: ~/.config/nvim/lua src: .config/nvim/lua - f_user-dirs.dirs: - dst: ~/.config/user-dirs.dirs - src: .config/user-dirs.dirs d_sway: dst: ~/.config/sway src: .config/sway @@ -166,6 +163,9 @@ dotfiles: f_gpg.conf: src: .gnupg/gpg.conf dst: ~/.gnupg/gpg.conf + f_gpg_scdaemon.conf: + src: .gnupg/scdaemon.conf + dst: ~/.gnupg/scdaemon.conf f_electron-flags.conf: src: .config/electron-flags.conf dst: ~/.config/electron-flags.conf @@ -189,7 +189,6 @@ profiles: - f_mailcap - d_zsh - f_zshrc - - f_pam_environment - f_tmux.conf - f_ranger.conf - f_ssh.conf @@ -231,10 +230,16 @@ profiles: - f_zprofile - f_electron-flags.conf - f_electron12-flags.conf - Pacman: + pacman: dotfiles: - f_makepkg.conf - f_paru.conf + gpg: + dotfiles: + - f_gpg-agent.conf + - f_gpg.conf + - f_gpg_scdaemon.conf + - f_pam_environment Mirkwood: include: - base @@ -242,35 +247,34 @@ profiles: - email - media - sway - - Pacman + - pacman + - gpg dotfiles: - f_paru.conf - - f_user-dirs.dirs - f_gitconfig - f_foot.ini - - f_gpg-agent.conf - - f_gpg.conf Moria: include: - terminal - media - - Pacman + - pacman Gondor: include: - terminal - - Pacman + - pacman mko-laptop: include: - terminal - media + - gpg Edoras: include: - terminal - - Pacman + - pacman TakamakiPC: include: - terminal - - Pacman + - pacman localhost: include: - terminal diff --git a/home/.gnupg/scdaemon.conf b/home/.gnupg/scdaemon.conf new file mode 100644 index 00000000..eb818ddf --- /dev/null +++ b/home/.gnupg/scdaemon.conf @@ -0,0 +1 @@ +disable-ccid From 6c5e01ce23d6eeb3b16d61178008d575baa2647e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Oct 2021 10:59:23 +0300 Subject: [PATCH 0863/2667] Sway: disable gaps --- dotdrop | 2 +- home/.config/sway/conf.d/07-appearance.conf | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dotdrop b/dotdrop index 06e9cde0..4117cd01 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 06e9cde0be3afa4d59f4785bbcecbd3e9f9fd6ca +Subproject commit 4117cd01c4036ec17bb5020b355b31cde3a76105 diff --git a/home/.config/sway/conf.d/07-appearance.conf b/home/.config/sway/conf.d/07-appearance.conf index a558c60b..fb429778 100644 --- a/home/.config/sway/conf.d/07-appearance.conf +++ b/home/.config/sway/conf.d/07-appearance.conf @@ -1,8 +1,6 @@ # vim:ft=swayconfig default_border none -gaps inner 15 -gaps outer 15 # Hide cursor after 4 seconds of inactivity seat * hide_cursor 4000 From 945c76548addc3ff5e9db7ef1d03a09272c85022 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Oct 2021 10:59:23 +0300 Subject: [PATCH 0864/2667] Sway: disable gaps --- dotdrop | 2 +- home/.config/sway/conf.d/07-appearance.conf | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dotdrop b/dotdrop index 06e9cde0..4117cd01 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 06e9cde0be3afa4d59f4785bbcecbd3e9f9fd6ca +Subproject commit 4117cd01c4036ec17bb5020b355b31cde3a76105 diff --git a/home/.config/sway/conf.d/07-appearance.conf b/home/.config/sway/conf.d/07-appearance.conf index a558c60b..fb429778 100644 --- a/home/.config/sway/conf.d/07-appearance.conf +++ b/home/.config/sway/conf.d/07-appearance.conf @@ -1,8 +1,6 @@ # vim:ft=swayconfig default_border none -gaps inner 15 -gaps outer 15 # Hide cursor after 4 seconds of inactivity seat * hide_cursor 4000 From 7bac1e63874bb5cef7dc22761f0b210e17d1e766 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 Nov 2021 10:20:08 +0200 Subject: [PATCH 0865/2667] Use zdharma forks of deleted psprint repos --- home/.config/zsh/02-plugins.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh index f82c01c4..05a74997 100644 --- a/home/.config/zsh/02-plugins.zsh +++ b/home/.config/zsh/02-plugins.zsh @@ -1,7 +1,7 @@ # install zinit if it's not already installed if [ ! -f ~/.zinit/bin/zinit.zsh ]; then mkdir ~/.zinit - git clone https://github.com/zdharma/zinit.git ~/.zinit/bin + git clone https://github.com/zdharma-continuum/zinit.git ~/.zinit/bin fi source ~/.zinit/bin/zinit.zsh @@ -36,7 +36,7 @@ zinit snippet '$DOTREPO/dotdrop/completion/_dotdrop-completion.zsh' # syntax highlighting zinit ice lucid atinit'zpcompinit' -zinit light zdharma/fast-syntax-highlighting +zinit light zdharma-continuum/fast-syntax-highlighting # use skim with zsh {%@@ if profile == "mko-laptop" @@%} From 3b085c6187b9e1832013132f40b03a73ca57504d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 Nov 2021 10:20:08 +0200 Subject: [PATCH 0866/2667] Use zdharma forks of deleted psprint repos --- home/.config/zsh/02-plugins.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh index f82c01c4..05a74997 100644 --- a/home/.config/zsh/02-plugins.zsh +++ b/home/.config/zsh/02-plugins.zsh @@ -1,7 +1,7 @@ # install zinit if it's not already installed if [ ! -f ~/.zinit/bin/zinit.zsh ]; then mkdir ~/.zinit - git clone https://github.com/zdharma/zinit.git ~/.zinit/bin + git clone https://github.com/zdharma-continuum/zinit.git ~/.zinit/bin fi source ~/.zinit/bin/zinit.zsh @@ -36,7 +36,7 @@ zinit snippet '$DOTREPO/dotdrop/completion/_dotdrop-completion.zsh' # syntax highlighting zinit ice lucid atinit'zpcompinit' -zinit light zdharma/fast-syntax-highlighting +zinit light zdharma-continuum/fast-syntax-highlighting # use skim with zsh {%@@ if profile == "mko-laptop" @@%} From e60da2386e743954aba4d7c82f39adad0a91fe88 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 Nov 2021 10:20:28 +0200 Subject: [PATCH 0867/2667] Update mergetest git alias --- home/.gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.gitconfig b/home/.gitconfig index 64e110d5..ffa424f7 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -36,7 +36,7 @@ rebase = merges [alias] - mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 && git push + mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 [color] pager = no From 143a3c0e8513623d566c0bb5b86f7d54941fe950 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 Nov 2021 10:20:28 +0200 Subject: [PATCH 0868/2667] Update mergetest git alias --- home/.gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.gitconfig b/home/.gitconfig index 64e110d5..ffa424f7 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -36,7 +36,7 @@ rebase = merges [alias] - mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 && git push + mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 [color] pager = no From 598ac83188c2a1fd152fa0fee4ac551bc2adb4d8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 Nov 2021 10:25:05 +0200 Subject: [PATCH 0869/2667] Enable vulkan backend for sway --- home/.config/sway/conf.d/08-exec.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index d87e72e1..5a7f6452 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -15,7 +15,7 @@ exec { /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 mpDris2 swaymsg workspace 1 - dbus-update-activation-environment DISPLAY + dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway /usr/lib/geoclue-2.0/demos/agent gammastep-indicator } From 8782924ac5a8c89d3fc6c6a6f3b797ed095d3315 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 Nov 2021 10:25:05 +0200 Subject: [PATCH 0870/2667] Enable vulkan backend for sway --- home/.config/sway/conf.d/08-exec.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index d87e72e1..5a7f6452 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -15,7 +15,7 @@ exec { /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 mpDris2 swaymsg workspace 1 - dbus-update-activation-environment DISPLAY + dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway /usr/lib/geoclue-2.0/demos/agent gammastep-indicator } From ecb8a5644d21e8a79414a8cbb55560586ee90e8a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 Nov 2021 10:21:51 +0200 Subject: [PATCH 0871/2667] Remove missing /dev/dri from docker-compose confs --- docker/jellyfin/docker-compose.yaml | 2 -- docker/tvheadend/docker-compose.yaml | 1 - 2 files changed, 3 deletions(-) diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index ff34298d..8ead67ef 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -17,8 +17,6 @@ services: - /docker/jellyfin/cache:/cache - /mnt/Storage/Media:/media - /etc/localtime:/etc/localtime:ro - devices: - - /dev/dri:/dev/dri labels: - "traefik.enable=true" diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 091c7660..667fec7c 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -16,7 +16,6 @@ services: - 9981:9981 - 9982:9982 devices: - - /dev/dri:/dev/dri #hardware acceleration - /dev/dvb:/dev/dvb #tuner card restart: unless-stopped networks: From 42abc35be531a95f206cb2343fbd32ed9deec478 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 Nov 2021 10:21:51 +0200 Subject: [PATCH 0872/2667] Remove missing /dev/dri from docker-compose confs --- docker/jellyfin/docker-compose.yaml | 2 -- docker/tvheadend/docker-compose.yaml | 1 - 2 files changed, 3 deletions(-) diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index ff34298d..8ead67ef 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -17,8 +17,6 @@ services: - /docker/jellyfin/cache:/cache - /mnt/Storage/Media:/media - /etc/localtime:/etc/localtime:ro - devices: - - /dev/dri:/dev/dri labels: - "traefik.enable=true" diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 091c7660..667fec7c 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -16,7 +16,6 @@ services: - 9981:9981 - 9982:9982 devices: - - /dev/dri:/dev/dri #hardware acceleration - /dev/dvb:/dev/dvb #tuner card restart: unless-stopped networks: From f001a93cf20e785abdf4951065256da2fa5a4551 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Nov 2021 12:39:58 +0200 Subject: [PATCH 0873/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 4117cd01..171f3df7 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 4117cd01c4036ec17bb5020b355b31cde3a76105 +Subproject commit 171f3df7eba99497c0fc42e60a18d8f8c7de055d From 574807279abad3a2faaa0c08d43b633a856e6fe9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Nov 2021 12:39:58 +0200 Subject: [PATCH 0874/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 4117cd01..171f3df7 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 4117cd01c4036ec17bb5020b355b31cde3a76105 +Subproject commit 171f3df7eba99497c0fc42e60a18d8f8c7de055d From 5035123437418a53acd61aac73f5589820eca035 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Nov 2021 12:40:11 +0200 Subject: [PATCH 0875/2667] Fix alias completion, cleaner setup for grc and clean up some old zsh stuff --- home/.config/zsh/01-env.zsh | 16 ++++----- home/.config/zsh/03-aliases.zsh | 64 +-------------------------------- 2 files changed, 7 insertions(+), 73 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 6c787080..4f8be739 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -20,7 +20,7 @@ setopt INC_APPEND_HISTORY_TIME setopt EXTENDED_HISTORY # Enable completions for aliases -setopt complete_aliases +setopt no_complete_aliases # Variable to pass to sdotdrop to get current user export USRNAME=$USER @@ -39,23 +39,16 @@ export SKIM_DEFAULT_OPTIONS="$SKIM_DEFAULT_OPTS" # TODO make an issue/PR about t export SKIM_COMPLETION_TRIGGER='**' export SKIM_CTRL_T_COMMAND="$SKIM_DEFAULT_COMMAND" export SKIM_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' -# copy for fzf, incase I ever use it -export FZF_DEFAULT_COMMAND="$SKIM_DEFAULT_COMMAND" -export FZF_ALT_C_COMMAND="$SKIM_ALT_C_COMMAND" -export FZF_DEFAULT_OPTS="$SKIM_DEFAULT_OPTS" -export FZF_COMPLETION_TRIGGER="$SKIM_COMPLETION_TRIGGER" -export FZF_CTRL_T_COMMAND="$SKIM_DEFAULT_COMMAND" -export FZF_CTRL_T_OPTS="$SKIM_CTRL_T_OPTS" # dotfile repository location export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim -export PAGER="nvim -R" +export PAGER="$EDITOR -R" export PARU_PAGER="$PAGER -c 'set ft=PKGBUILD'" export AUR_PAGER=$PAGER -export MANPAGER="nvim +Man!" +export MANPAGER="$EDITOR +Man!" # Use GPG for SSH authentication export GPG_TTY="$(tty)" @@ -66,3 +59,6 @@ if [ "$SSH_CONNECTION" = "" ]; then #gpgconf --launch gpg-agent gpg-connect-agent updatestartuptty /bye >/dev/null fi + +# Enable grc colorization of supported commands +[[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 0e57d187..295a3581 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -1,11 +1,10 @@ # git shorthands alias gc='git commit' alias gac='ga && gc' +alias gs='git status' alias gpull='git pull' alias gpush='git push' -alias mutt='neomutt' - # make skim zsh plugin use fd _skim_compgen_dir() { fd -Ht d @@ -13,18 +12,10 @@ _skim_compgen_dir() { _skim_compgen_path() { fd -Ht f } -# same for fzf -_fzf_compgen_dir() { - _skim_compgen_dir -} -_fzf_compgen_path() { - _skim_compgen_path -} # Modern replacements for cat and ls alias cat='bat --paging=never' alias ls='exa' -compdef ls='exa' {%@@ if profile != "mko-laptop" @@%} # Command not found handler @@ -152,7 +143,6 @@ compdef _dotdrop-completion.zsh sdotdrop alias dotgit='git -C $DOTREPO' dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } - # sync password manager passync() { pass git pull && pass git push && updatesecrets } @@ -235,62 +225,10 @@ alias notify-send='notify-send --icon=alarm' # download archiso alias archiso='curl "http://mirror.rackspace.com/archlinux/iso/$(date +%Y.%m).01/archlinux-$(date +%Y.%m).01-x86_64.iso"' -# Update repository - - # encrypted tar's with zstd compression cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg } xgpgtar() { gpg -d $1 | tar x --zstd } -# colorise output -alias cvs='grc cvs' -alias df='grc df' -alias digg='grc digg' -alias gcc='grc gcc' -alias g++='grc g++' -alias ifconfig='grc ifconfig' -alias make='grc make' -alias mount='grc mount' -alias mtr='grc mtr' -alias netstat='grc mount' -alias ping='grc ping' -alias ps='grc ps' -alias tail='grc tail' -alias traceroute='grc traceroute' -alias wdiff='grc wdiff' -alias blkid='grc blkid' -alias du='grc du' -alias dnf='grc dnf' -alias docker='grc docker' -alias docker-machine='grc docker-machine' -alias env='grc env' -alias id='grc id' -alias ip='grc ip' -alias iostat='grc iostat' -alias last='grc last' -alias lsattr='grc lsattr' -alias lsblk='grc lsblk' -alias lspci='grc lspci' -alias lsmod='grc lsmod' -alias lsof='grc lsof' -alias getfacl='grc getfacl' -alias getsebool='grc getsebool' -alias ulimit='grc ulimit' -alias uptime='grc uptime' -alias nmap='grc nmap' -alias fdisk='grc fdisk' -alias findmnt='grc findmnt' -alias free='grc free' -alias semanage='grc semanage' -alias sar='grc sar' -alias ss='grc ss' -alias sysctl='grc sysctl' -alias systemctl='grc systemctl' -alias stat='grc stat' -alias showmount='grc showmount' -alias tune2fs='grc tune2fs' -alias tcpdum='grc tcpdum' - btw, () { echo " I use" echo " ▄ From 81a21eab7718315ff0b93e91fd359c214d794aea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Nov 2021 12:40:11 +0200 Subject: [PATCH 0876/2667] Fix alias completion, cleaner setup for grc and clean up some old zsh stuff --- home/.config/zsh/01-env.zsh | 16 ++++----- home/.config/zsh/03-aliases.zsh | 64 +-------------------------------- 2 files changed, 7 insertions(+), 73 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 6c787080..4f8be739 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -20,7 +20,7 @@ setopt INC_APPEND_HISTORY_TIME setopt EXTENDED_HISTORY # Enable completions for aliases -setopt complete_aliases +setopt no_complete_aliases # Variable to pass to sdotdrop to get current user export USRNAME=$USER @@ -39,23 +39,16 @@ export SKIM_DEFAULT_OPTIONS="$SKIM_DEFAULT_OPTS" # TODO make an issue/PR about t export SKIM_COMPLETION_TRIGGER='**' export SKIM_CTRL_T_COMMAND="$SKIM_DEFAULT_COMMAND" export SKIM_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' -# copy for fzf, incase I ever use it -export FZF_DEFAULT_COMMAND="$SKIM_DEFAULT_COMMAND" -export FZF_ALT_C_COMMAND="$SKIM_ALT_C_COMMAND" -export FZF_DEFAULT_OPTS="$SKIM_DEFAULT_OPTS" -export FZF_COMPLETION_TRIGGER="$SKIM_COMPLETION_TRIGGER" -export FZF_CTRL_T_COMMAND="$SKIM_DEFAULT_COMMAND" -export FZF_CTRL_T_OPTS="$SKIM_CTRL_T_OPTS" # dotfile repository location export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim -export PAGER="nvim -R" +export PAGER="$EDITOR -R" export PARU_PAGER="$PAGER -c 'set ft=PKGBUILD'" export AUR_PAGER=$PAGER -export MANPAGER="nvim +Man!" +export MANPAGER="$EDITOR +Man!" # Use GPG for SSH authentication export GPG_TTY="$(tty)" @@ -66,3 +59,6 @@ if [ "$SSH_CONNECTION" = "" ]; then #gpgconf --launch gpg-agent gpg-connect-agent updatestartuptty /bye >/dev/null fi + +# Enable grc colorization of supported commands +[[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 0e57d187..295a3581 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -1,11 +1,10 @@ # git shorthands alias gc='git commit' alias gac='ga && gc' +alias gs='git status' alias gpull='git pull' alias gpush='git push' -alias mutt='neomutt' - # make skim zsh plugin use fd _skim_compgen_dir() { fd -Ht d @@ -13,18 +12,10 @@ _skim_compgen_dir() { _skim_compgen_path() { fd -Ht f } -# same for fzf -_fzf_compgen_dir() { - _skim_compgen_dir -} -_fzf_compgen_path() { - _skim_compgen_path -} # Modern replacements for cat and ls alias cat='bat --paging=never' alias ls='exa' -compdef ls='exa' {%@@ if profile != "mko-laptop" @@%} # Command not found handler @@ -152,7 +143,6 @@ compdef _dotdrop-completion.zsh sdotdrop alias dotgit='git -C $DOTREPO' dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } - # sync password manager passync() { pass git pull && pass git push && updatesecrets } @@ -235,62 +225,10 @@ alias notify-send='notify-send --icon=alarm' # download archiso alias archiso='curl "http://mirror.rackspace.com/archlinux/iso/$(date +%Y.%m).01/archlinux-$(date +%Y.%m).01-x86_64.iso"' -# Update repository - - # encrypted tar's with zstd compression cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg } xgpgtar() { gpg -d $1 | tar x --zstd } -# colorise output -alias cvs='grc cvs' -alias df='grc df' -alias digg='grc digg' -alias gcc='grc gcc' -alias g++='grc g++' -alias ifconfig='grc ifconfig' -alias make='grc make' -alias mount='grc mount' -alias mtr='grc mtr' -alias netstat='grc mount' -alias ping='grc ping' -alias ps='grc ps' -alias tail='grc tail' -alias traceroute='grc traceroute' -alias wdiff='grc wdiff' -alias blkid='grc blkid' -alias du='grc du' -alias dnf='grc dnf' -alias docker='grc docker' -alias docker-machine='grc docker-machine' -alias env='grc env' -alias id='grc id' -alias ip='grc ip' -alias iostat='grc iostat' -alias last='grc last' -alias lsattr='grc lsattr' -alias lsblk='grc lsblk' -alias lspci='grc lspci' -alias lsmod='grc lsmod' -alias lsof='grc lsof' -alias getfacl='grc getfacl' -alias getsebool='grc getsebool' -alias ulimit='grc ulimit' -alias uptime='grc uptime' -alias nmap='grc nmap' -alias fdisk='grc fdisk' -alias findmnt='grc findmnt' -alias free='grc free' -alias semanage='grc semanage' -alias sar='grc sar' -alias ss='grc ss' -alias sysctl='grc sysctl' -alias systemctl='grc systemctl' -alias stat='grc stat' -alias showmount='grc showmount' -alias tune2fs='grc tune2fs' -alias tcpdum='grc tcpdum' - btw, () { echo " I use" echo " ▄ From 84c9d3354abc54291e6bdddeadc0426b21e0a7a7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Nov 2021 12:43:52 +0200 Subject: [PATCH 0877/2667] Don't install media profile on Moria --- config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config.yaml b/config.yaml index 1854167c..f93c3f87 100644 --- a/config.yaml +++ b/config.yaml @@ -256,7 +256,6 @@ profiles: Moria: include: - terminal - - media - pacman Gondor: include: From c2f4868930b3dc839c8389ba4aaa7854922ead8e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Nov 2021 12:43:52 +0200 Subject: [PATCH 0878/2667] Don't install media profile on Moria --- config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config.yaml b/config.yaml index 1854167c..f93c3f87 100644 --- a/config.yaml +++ b/config.yaml @@ -256,7 +256,6 @@ profiles: Moria: include: - terminal - - media - pacman Gondor: include: From 98178a74f27ad6d187f3b80f8404526fab45214e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Nov 2021 12:55:32 +0200 Subject: [PATCH 0879/2667] Remove unndeede options from gotify traefik config --- docker/homeautomation/docker-compose.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index 052d85fa..0cf097e9 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -118,8 +118,6 @@ services: - "traefik.http.routers.gotify.entrypoints=https" - "traefik.http.routers.gotify.rule=Host(`gotify.korhonen.cc`)" - - "traefik.http.routers.gotify.tls=true" - - "traefik.http.routers.gotify.tls.certresolver=http" - "traefik.http.routers.gotify.service=gotify" - "traefik.docker.network=proxy" - "traefik.http.services.gotify.loadbalancer.server.port=80" From 69b09d2604c435a3638f23394eb82bd7595b18fa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Nov 2021 12:55:32 +0200 Subject: [PATCH 0880/2667] Remove unndeede options from gotify traefik config --- docker/homeautomation/docker-compose.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index 052d85fa..0cf097e9 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -118,8 +118,6 @@ services: - "traefik.http.routers.gotify.entrypoints=https" - "traefik.http.routers.gotify.rule=Host(`gotify.korhonen.cc`)" - - "traefik.http.routers.gotify.tls=true" - - "traefik.http.routers.gotify.tls.certresolver=http" - "traefik.http.routers.gotify.service=gotify" - "traefik.docker.network=proxy" - "traefik.http.services.gotify.loadbalancer.server.port=80" From 6d92b744e170a995da1b7cf3f834e85db764a7c9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Nov 2021 13:07:50 +0200 Subject: [PATCH 0881/2667] Switch back to FZF from skim --- home/.config/zsh/01-env.zsh | 21 +++++++++++++-------- home/.config/zsh/02-plugins.zsh | 18 +++++++++--------- home/.config/zsh/03-aliases.zsh | 20 +++++--------------- 3 files changed, 27 insertions(+), 32 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 4f8be739..b9aab448 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -31,14 +31,19 @@ export PATH="/home/$USER/.bin:$PATH" # go path export GOPATH=~/.go -# skim settings -export SKIM_DEFAULT_COMMAND='fd -Ht f' -export SKIM_ALT_C_COMMAND='fd -Ht d' -export SKIM_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' -export SKIM_DEFAULT_OPTIONS="$SKIM_DEFAULT_OPTS" # TODO make an issue/PR about this difference -export SKIM_COMPLETION_TRIGGER='**' -export SKIM_CTRL_T_COMMAND="$SKIM_DEFAULT_COMMAND" -export SKIM_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' +# fzf settings +export FZF_DEFAULT_COMMAND='fd -Ht f' +export FZF_ALT_C_COMMAND='fd -Ht d' +export FZF_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' +export FZF_COMPLETION_TRIGGER='**' +export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" +export FZF_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' +_fzf_compgen_dir() { + fd -Ht d +} +_fzf_compgen_path() { + fd -Ht f +} # dotfile repository location export DOTREPO="$HOME/git/dotfiles" diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh index 05a74997..bd20e77d 100644 --- a/home/.config/zsh/02-plugins.zsh +++ b/home/.config/zsh/02-plugins.zsh @@ -10,7 +10,7 @@ source ~/.zinit/bin/zinit.zsh zinit ice load multisrc'{async,pure}.zsh' zinit light sindresorhus/pure -# skim as tab completion +# fzf as tab completion zinit ice lucid zinit light Aloxaf/fzf-tab @@ -18,7 +18,7 @@ zinit light Aloxaf/fzf-tab zinit ice lucid zinit light zsh-users/zsh-history-substring-search -# skim git awesomeness +# fzf git awesomeness zinit ice wait'1' lucid atload'source $HOME/.config/zsh/03-aliases.zsh' zinit light wfxr/forgit @@ -38,13 +38,13 @@ zinit snippet '$DOTREPO/dotdrop/completion/_dotdrop-completion.zsh' zinit ice lucid atinit'zpcompinit' zinit light zdharma-continuum/fast-syntax-highlighting -# use skim with zsh +# use fzf with zsh {%@@ if profile == "mko-laptop" @@%} -# Source from home directory since mko-laptop is ubuntu and it doesn't -# have skim in it's repositories -source ~/Software/skim/shell/key-bindings.zsh -source ~/Software/skim/shell/completion.zsh +# Source from home directory since mko-laptop is ubuntu and it has an +# old version of FZF in it's repositories +source ~/Software/fzf/shell/key-bindings.zsh +source ~/Software/fzf/shell/completion.zsh {%@@ else @@%} -source /usr/share/skim/key-bindings.zsh -source /usr/share/skim/completion.zsh +source /usr/share/fzf/key-bindings.zsh +source /usr/share/fzf/completion.zsh {%@@ endif @@%} diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 295a3581..20be0f3c 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -5,14 +5,6 @@ alias gs='git status' alias gpull='git pull' alias gpush='git push' -# make skim zsh plugin use fd -_skim_compgen_dir() { - fd -Ht d -} -_skim_compgen_path() { - fd -Ht f -} - # Modern replacements for cat and ls alias cat='bat --paging=never' alias ls='exa' @@ -47,19 +39,17 @@ function command_not_found_handler { } {%@@ endif @@%} -# search and install packages with skim +# search and install/remove packages with fzf pi() { - SELECTED_PKGS="$(paru -Slq | sk --header='Install packages' -m --preview 'paru -Si {1}')" + SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}')" if [ -n "$SELECTED_PKGS" ]; then # Append the expanded command to history print -s "paru -S $(echo $SELECTED_PKGS)" paru -S $(echo $SELECTED_PKGS) fi } - -# search and remove packages with skim pr() { - SELECTED_PKGS="$(paru -Qsq | sk --header='Remove packages' -m --preview 'paru -Si {1}')" + SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}')" if [ -n "$SELECTED_PKGS" ]; then # Append the expanded command to history print -s "paru -Rns $(echo $SELECTED_PKGS)" @@ -67,9 +57,9 @@ pr() { fi } -# find and open man pages with skim +# find and open man pages with fzf fman() { - man -k . | sk --prompt='Man> ' | awk '{print $1}' | xargs -r man + man -k . | fzf --prompt='Man> ' | awk '{print $1}' | xargs -r man } # I'm retarded so I need this From 662e63dfb37021d9c63f91052309bf501c63f72e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Nov 2021 13:07:50 +0200 Subject: [PATCH 0882/2667] Switch back to FZF from skim --- home/.config/zsh/01-env.zsh | 21 +++++++++++++-------- home/.config/zsh/02-plugins.zsh | 18 +++++++++--------- home/.config/zsh/03-aliases.zsh | 20 +++++--------------- 3 files changed, 27 insertions(+), 32 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 4f8be739..b9aab448 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -31,14 +31,19 @@ export PATH="/home/$USER/.bin:$PATH" # go path export GOPATH=~/.go -# skim settings -export SKIM_DEFAULT_COMMAND='fd -Ht f' -export SKIM_ALT_C_COMMAND='fd -Ht d' -export SKIM_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' -export SKIM_DEFAULT_OPTIONS="$SKIM_DEFAULT_OPTS" # TODO make an issue/PR about this difference -export SKIM_COMPLETION_TRIGGER='**' -export SKIM_CTRL_T_COMMAND="$SKIM_DEFAULT_COMMAND" -export SKIM_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' +# fzf settings +export FZF_DEFAULT_COMMAND='fd -Ht f' +export FZF_ALT_C_COMMAND='fd -Ht d' +export FZF_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' +export FZF_COMPLETION_TRIGGER='**' +export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" +export FZF_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' +_fzf_compgen_dir() { + fd -Ht d +} +_fzf_compgen_path() { + fd -Ht f +} # dotfile repository location export DOTREPO="$HOME/git/dotfiles" diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh index 05a74997..bd20e77d 100644 --- a/home/.config/zsh/02-plugins.zsh +++ b/home/.config/zsh/02-plugins.zsh @@ -10,7 +10,7 @@ source ~/.zinit/bin/zinit.zsh zinit ice load multisrc'{async,pure}.zsh' zinit light sindresorhus/pure -# skim as tab completion +# fzf as tab completion zinit ice lucid zinit light Aloxaf/fzf-tab @@ -18,7 +18,7 @@ zinit light Aloxaf/fzf-tab zinit ice lucid zinit light zsh-users/zsh-history-substring-search -# skim git awesomeness +# fzf git awesomeness zinit ice wait'1' lucid atload'source $HOME/.config/zsh/03-aliases.zsh' zinit light wfxr/forgit @@ -38,13 +38,13 @@ zinit snippet '$DOTREPO/dotdrop/completion/_dotdrop-completion.zsh' zinit ice lucid atinit'zpcompinit' zinit light zdharma-continuum/fast-syntax-highlighting -# use skim with zsh +# use fzf with zsh {%@@ if profile == "mko-laptop" @@%} -# Source from home directory since mko-laptop is ubuntu and it doesn't -# have skim in it's repositories -source ~/Software/skim/shell/key-bindings.zsh -source ~/Software/skim/shell/completion.zsh +# Source from home directory since mko-laptop is ubuntu and it has an +# old version of FZF in it's repositories +source ~/Software/fzf/shell/key-bindings.zsh +source ~/Software/fzf/shell/completion.zsh {%@@ else @@%} -source /usr/share/skim/key-bindings.zsh -source /usr/share/skim/completion.zsh +source /usr/share/fzf/key-bindings.zsh +source /usr/share/fzf/completion.zsh {%@@ endif @@%} diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 295a3581..20be0f3c 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -5,14 +5,6 @@ alias gs='git status' alias gpull='git pull' alias gpush='git push' -# make skim zsh plugin use fd -_skim_compgen_dir() { - fd -Ht d -} -_skim_compgen_path() { - fd -Ht f -} - # Modern replacements for cat and ls alias cat='bat --paging=never' alias ls='exa' @@ -47,19 +39,17 @@ function command_not_found_handler { } {%@@ endif @@%} -# search and install packages with skim +# search and install/remove packages with fzf pi() { - SELECTED_PKGS="$(paru -Slq | sk --header='Install packages' -m --preview 'paru -Si {1}')" + SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}')" if [ -n "$SELECTED_PKGS" ]; then # Append the expanded command to history print -s "paru -S $(echo $SELECTED_PKGS)" paru -S $(echo $SELECTED_PKGS) fi } - -# search and remove packages with skim pr() { - SELECTED_PKGS="$(paru -Qsq | sk --header='Remove packages' -m --preview 'paru -Si {1}')" + SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}')" if [ -n "$SELECTED_PKGS" ]; then # Append the expanded command to history print -s "paru -Rns $(echo $SELECTED_PKGS)" @@ -67,9 +57,9 @@ pr() { fi } -# find and open man pages with skim +# find and open man pages with fzf fman() { - man -k . | sk --prompt='Man> ' | awk '{print $1}' | xargs -r man + man -k . | fzf --prompt='Man> ' | awk '{print $1}' | xargs -r man } # I'm retarded so I need this From d45df6ebbc1508d3c1d554756577ed1e43f179af Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 19 Nov 2021 19:23:25 +0200 Subject: [PATCH 0883/2667] Updated dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 171f3df7..24b43522 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 171f3df7eba99497c0fc42e60a18d8f8c7de055d +Subproject commit 24b43522a4f7f4294d2b5e3df18586c81476a984 From 855b95e542a767c599f318f6905f30b58ab4452b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 19 Nov 2021 19:23:25 +0200 Subject: [PATCH 0884/2667] Updated dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 171f3df7..24b43522 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 171f3df7eba99497c0fc42e60a18d8f8c7de055d +Subproject commit 24b43522a4f7f4294d2b5e3df18586c81476a984 From be4d72552e23bd2d225135f53d064413b0d65155 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 12:12:58 +0200 Subject: [PATCH 0885/2667] Sway: remove gammastep (high CPU usage) --- home/.config/sway/conf.d/08-exec.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 5a7f6452..85a886cc 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -17,7 +17,6 @@ exec { swaymsg workspace 1 dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway /usr/lib/geoclue-2.0/demos/agent - gammastep-indicator } exec_always { From 1a8fbdccf7c8972f2d76bb794609332c37d3a8c8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 12:12:58 +0200 Subject: [PATCH 0886/2667] Sway: remove gammastep (high CPU usage) --- home/.config/sway/conf.d/08-exec.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 5a7f6452..85a886cc 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -17,7 +17,6 @@ exec { swaymsg workspace 1 dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway /usr/lib/geoclue-2.0/demos/agent - gammastep-indicator } exec_always { From b33ee4cfe7ec4636f80c20430ded2bd4f3d48ca3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 12:13:30 +0200 Subject: [PATCH 0887/2667] Update kernel cmd --- efistub/arch.efi | 2 +- efistub/lts.efi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/efistub/arch.efi b/efistub/arch.efi index 55640c6b..01a57c76 100755 --- a/efistub/arch.efi +++ b/efistub/arch.efi @@ -9,4 +9,4 @@ sudo efibootmgr \ --remove-dups \ --label "Arch Linux" \ --loader /vmlinuz-linux \ - --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo amdgpu.ppfeaturemask=0xffffffff' + --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff' diff --git a/efistub/lts.efi b/efistub/lts.efi index 9a9d0613..e2b91ebd 100755 --- a/efistub/lts.efi +++ b/efistub/lts.efi @@ -9,4 +9,4 @@ sudo efibootmgr \ --remove-dups \ --label "Arch Linux LTS" \ --loader /vmlinuz-linux-lts \ - --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux-lts.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' + --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux-lts.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff' From bb12b93d0903d223ae4717224ed71673918efd08 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 12:13:30 +0200 Subject: [PATCH 0888/2667] Update kernel cmd --- efistub/arch.efi | 2 +- efistub/lts.efi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/efistub/arch.efi b/efistub/arch.efi index 55640c6b..01a57c76 100755 --- a/efistub/arch.efi +++ b/efistub/arch.efi @@ -9,4 +9,4 @@ sudo efibootmgr \ --remove-dups \ --label "Arch Linux" \ --loader /vmlinuz-linux \ - --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo amdgpu.ppfeaturemask=0xffffffff' + --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff' diff --git a/efistub/lts.efi b/efistub/lts.efi index 9a9d0613..e2b91ebd 100755 --- a/efistub/lts.efi +++ b/efistub/lts.efi @@ -9,4 +9,4 @@ sudo efibootmgr \ --remove-dups \ --label "Arch Linux LTS" \ --loader /vmlinuz-linux-lts \ - --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux-lts.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' + --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux-lts.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff' From 43ecd1940816b870f96a7b69da2a69c5a499d8f0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 12:13:39 +0200 Subject: [PATCH 0889/2667] Neovim: add firenvim --- home/.config/nvim/lua/pluginmanager.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index bd53975f..5c072b09 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -95,6 +95,12 @@ require('packer').startup(function() rtp = 'contrib/vim/redact_pass.vim' } + -- Neovim inside Firefox + use { + 'glacambre/firenvim', + run = function() vim.fn['firenvim#install'](0) end + } + end) -- Install plugins if packer was not installed From 32a7755325c5d2e15aac19ff3b7f5496762b835d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 12:13:39 +0200 Subject: [PATCH 0890/2667] Neovim: add firenvim --- home/.config/nvim/lua/pluginmanager.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index bd53975f..5c072b09 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -95,6 +95,12 @@ require('packer').startup(function() rtp = 'contrib/vim/redact_pass.vim' } + -- Neovim inside Firefox + use { + 'glacambre/firenvim', + run = function() vim.fn['firenvim#install'](0) end + } + end) -- Install plugins if packer was not installed From a05c1b4188c2792dd981649a94cfd9847717dc74 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 12:13:59 +0200 Subject: [PATCH 0891/2667] Move from ZHA to Deconz --- docker/homeautomation/docker-compose.yaml | 24 +++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index 0cf097e9..1ab59d23 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -5,8 +5,6 @@ services: image: homeassistant/home-assistant environment: - TZ=Europe/Helsinki - devices: - - /dev/ttyACM0 volumes: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro @@ -19,6 +17,7 @@ services: - "8123:8123" - "8300:8300" depends_on: + - deconz - mosquitto labels: - "traefik.enable=true" @@ -34,6 +33,27 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.home-assistant.loadbalancer.server.port=8123" + deconz: + container_name: deconz + image: deconzcommunity/deconz + environment: + - TZ=Europe/Helsinki + - DECONZ_WEB_PORT=8083 + - DECONZ_WS_PORT=8084 + - DECONZ_UPNP=0 + - DECONZ_VNC_PORT=5901 + - DECONZ_VNC_MODE=1 + - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} + - DEBUG_OTAU=1 + network_mode: host + volumes: + - /docker/homeautomation/deconz/deconz:/opt/deCONZ + - /docker/homeautomation/deconz/otau:/root/otau + - /etc/localtime:/etc/localtime:ro + restart: unless-stopped + devices: + - /dev/ttyACM0 + mosquitto: container_name: mosquitto image: eclipse-mosquitto From f1719ac87a9ba99181d251d35eaae26d98a4ab81 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 12:13:59 +0200 Subject: [PATCH 0892/2667] Move from ZHA to Deconz --- docker/homeautomation/docker-compose.yaml | 24 +++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index 0cf097e9..1ab59d23 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -5,8 +5,6 @@ services: image: homeassistant/home-assistant environment: - TZ=Europe/Helsinki - devices: - - /dev/ttyACM0 volumes: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro @@ -19,6 +17,7 @@ services: - "8123:8123" - "8300:8300" depends_on: + - deconz - mosquitto labels: - "traefik.enable=true" @@ -34,6 +33,27 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.home-assistant.loadbalancer.server.port=8123" + deconz: + container_name: deconz + image: deconzcommunity/deconz + environment: + - TZ=Europe/Helsinki + - DECONZ_WEB_PORT=8083 + - DECONZ_WS_PORT=8084 + - DECONZ_UPNP=0 + - DECONZ_VNC_PORT=5901 + - DECONZ_VNC_MODE=1 + - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} + - DEBUG_OTAU=1 + network_mode: host + volumes: + - /docker/homeautomation/deconz/deconz:/opt/deCONZ + - /docker/homeautomation/deconz/otau:/root/otau + - /etc/localtime:/etc/localtime:ro + restart: unless-stopped + devices: + - /dev/ttyACM0 + mosquitto: container_name: mosquitto image: eclipse-mosquitto From 2f04b029eab0d25205c850c03d0669870c36f585 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 15:32:02 +0200 Subject: [PATCH 0893/2667] Revert "Move from ZHA to Deconz" This reverts commit 00b29949ea47a4109dd01ef96710a690e5faee59. --- docker/homeautomation/docker-compose.yaml | 24 ++--------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index 1ab59d23..0cf097e9 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -5,6 +5,8 @@ services: image: homeassistant/home-assistant environment: - TZ=Europe/Helsinki + devices: + - /dev/ttyACM0 volumes: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro @@ -17,7 +19,6 @@ services: - "8123:8123" - "8300:8300" depends_on: - - deconz - mosquitto labels: - "traefik.enable=true" @@ -33,27 +34,6 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.home-assistant.loadbalancer.server.port=8123" - deconz: - container_name: deconz - image: deconzcommunity/deconz - environment: - - TZ=Europe/Helsinki - - DECONZ_WEB_PORT=8083 - - DECONZ_WS_PORT=8084 - - DECONZ_UPNP=0 - - DECONZ_VNC_PORT=5901 - - DECONZ_VNC_MODE=1 - - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} - - DEBUG_OTAU=1 - network_mode: host - volumes: - - /docker/homeautomation/deconz/deconz:/opt/deCONZ - - /docker/homeautomation/deconz/otau:/root/otau - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped - devices: - - /dev/ttyACM0 - mosquitto: container_name: mosquitto image: eclipse-mosquitto From 82aff6d99c2f21106395a1b2fdc1522e321caf92 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 15:32:02 +0200 Subject: [PATCH 0894/2667] Revert "Move from ZHA to Deconz" This reverts commit 00b29949ea47a4109dd01ef96710a690e5faee59. --- docker/homeautomation/docker-compose.yaml | 24 ++--------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index 1ab59d23..0cf097e9 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -5,6 +5,8 @@ services: image: homeassistant/home-assistant environment: - TZ=Europe/Helsinki + devices: + - /dev/ttyACM0 volumes: - /docker/homeautomation/home-assistant:/config - /etc/localtime:/etc/localtime:ro @@ -17,7 +19,6 @@ services: - "8123:8123" - "8300:8300" depends_on: - - deconz - mosquitto labels: - "traefik.enable=true" @@ -33,27 +34,6 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.home-assistant.loadbalancer.server.port=8123" - deconz: - container_name: deconz - image: deconzcommunity/deconz - environment: - - TZ=Europe/Helsinki - - DECONZ_WEB_PORT=8083 - - DECONZ_WS_PORT=8084 - - DECONZ_UPNP=0 - - DECONZ_VNC_PORT=5901 - - DECONZ_VNC_MODE=1 - - DECONZ_VNC_PASSWORD=${DECONZ_VNC_PASSWORD} - - DEBUG_OTAU=1 - network_mode: host - volumes: - - /docker/homeautomation/deconz/deconz:/opt/deCONZ - - /docker/homeautomation/deconz/otau:/root/otau - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped - devices: - - /dev/ttyACM0 - mosquitto: container_name: mosquitto image: eclipse-mosquitto From 4b51c7ca5516ed8dfc2e5be0aa8def0675cf60f4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 15:33:27 +0200 Subject: [PATCH 0895/2667] Add openldap --- docker/auth/.gitignore | 2 ++ docker/auth/docker-compose.yaml | 44 +++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 docker/auth/.gitignore create mode 100644 docker/auth/docker-compose.yaml diff --git a/docker/auth/.gitignore b/docker/auth/.gitignore new file mode 100644 index 00000000..e1d30776 --- /dev/null +++ b/docker/auth/.gitignore @@ -0,0 +1,2 @@ +.ldap_admin_password_secret +.ldap_read_only_password_secret diff --git a/docker/auth/docker-compose.yaml b/docker/auth/docker-compose.yaml new file mode 100644 index 00000000..7e117348 --- /dev/null +++ b/docker/auth/docker-compose.yaml @@ -0,0 +1,44 @@ +version: "3.8" + +services: + openldap: + container_name: openldap + image: osixia/openldap:1.5.0 + restart: always + hostname: ldap.korhonen.cc + ports: + - "389:389" + - "636:636" + environment: + - LDAP_ORGANISATION=Korhonen + - LDAP_DOMAIN=korhonen.cc + - LDAP_ADMIN_PASSWORD_FILE=/run/secrets/ldap_admin_password + - LDAP_READ_ONLY_USER=true + - LDAP_READ_ONLY_USER_USERNAME=ldap-ro + - LDAP_READ_ONLY_USER_PASSWORD_FILE=/run/secrets/ldap_read_only_password + secrets: + - ldap_admin_password + - ldap_read_only_password + volumes: + - "/docker/auth/openldap/ldap:/var/lib/ldap" + - "/docker/auth/openldap/slapd.d/:/etc/ldap/slapd.d" + - "/docker/auth/openldap/lidf:/data/ldif" + + phpldapadmin: + container_name: phpldapadmin + image: osixia/phpldapadmin + environment: + - PHPLDAPADMIN_HTTPS=false + - PHPLDAPADMIN_HOSTS=openldap + ports: + - "4588:80" + +networks: + auth: + external: true + +secrets: + ldap_admin_password: + file: ./.ldap_admin_password_secret + ldap_read_only_password: + file: ./.ldap_read_only_password_secret From 8a92f7da5f3cea6963455a2ed9e4499354afd7de Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 15:33:27 +0200 Subject: [PATCH 0896/2667] Add openldap --- docker/auth/.gitignore | 2 ++ docker/auth/docker-compose.yaml | 44 +++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 docker/auth/.gitignore create mode 100644 docker/auth/docker-compose.yaml diff --git a/docker/auth/.gitignore b/docker/auth/.gitignore new file mode 100644 index 00000000..e1d30776 --- /dev/null +++ b/docker/auth/.gitignore @@ -0,0 +1,2 @@ +.ldap_admin_password_secret +.ldap_read_only_password_secret diff --git a/docker/auth/docker-compose.yaml b/docker/auth/docker-compose.yaml new file mode 100644 index 00000000..7e117348 --- /dev/null +++ b/docker/auth/docker-compose.yaml @@ -0,0 +1,44 @@ +version: "3.8" + +services: + openldap: + container_name: openldap + image: osixia/openldap:1.5.0 + restart: always + hostname: ldap.korhonen.cc + ports: + - "389:389" + - "636:636" + environment: + - LDAP_ORGANISATION=Korhonen + - LDAP_DOMAIN=korhonen.cc + - LDAP_ADMIN_PASSWORD_FILE=/run/secrets/ldap_admin_password + - LDAP_READ_ONLY_USER=true + - LDAP_READ_ONLY_USER_USERNAME=ldap-ro + - LDAP_READ_ONLY_USER_PASSWORD_FILE=/run/secrets/ldap_read_only_password + secrets: + - ldap_admin_password + - ldap_read_only_password + volumes: + - "/docker/auth/openldap/ldap:/var/lib/ldap" + - "/docker/auth/openldap/slapd.d/:/etc/ldap/slapd.d" + - "/docker/auth/openldap/lidf:/data/ldif" + + phpldapadmin: + container_name: phpldapadmin + image: osixia/phpldapadmin + environment: + - PHPLDAPADMIN_HTTPS=false + - PHPLDAPADMIN_HOSTS=openldap + ports: + - "4588:80" + +networks: + auth: + external: true + +secrets: + ldap_admin_password: + file: ./.ldap_admin_password_secret + ldap_read_only_password: + file: ./.ldap_read_only_password_secret From fd56cd763162519de4670c05489f58610a86879e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 17:09:32 +0200 Subject: [PATCH 0897/2667] Update all compose files to use the new compose spec (removing version statement) --- docker/freshrss/docker-compose.yaml | 1 - docker/gitea/docker-compose.yaml | 2 -- docker/homeautomation/docker-compose.yaml | 1 - docker/index.korhonen.cc/docker-compose.yaml | 2 -- docker/jellyfin/docker-compose.yaml | 1 - docker/mumble/docker-compose.yaml | 2 -- docker/nextcloud/docker-compose.yaml | 2 -- docker/pihole/docker-compose.yaml | 2 -- docker/postgres/docker-compose.yaml | 1 - docker/tftp/docker-compose.yaml | 2 -- docker/traefik/docker-compose.yaml | 2 -- docker/tvheadend/docker-compose.yaml | 1 - docker/wireguard/docker-compose.yaml | 1 - 13 files changed, 20 deletions(-) diff --git a/docker/freshrss/docker-compose.yaml b/docker/freshrss/docker-compose.yaml index 86862668..d04da176 100644 --- a/docker/freshrss/docker-compose.yaml +++ b/docker/freshrss/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "2.1" services: freshrss: image: linuxserver/freshrss diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 0b8b0bb5..0a3a3b5a 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -1,5 +1,3 @@ -version: "2" - services: gitea: container_name: gitea diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index 0cf097e9..76f354a0 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3" services: home-assistant: container_name: home-assistant diff --git a/docker/index.korhonen.cc/docker-compose.yaml b/docker/index.korhonen.cc/docker-compose.yaml index 2859a129..78fba3ef 100644 --- a/docker/index.korhonen.cc/docker-compose.yaml +++ b/docker/index.korhonen.cc/docker-compose.yaml @@ -1,5 +1,3 @@ -version: "3" - services: nginx: image: fraoustin/fancyindex diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 8ead67ef..655a622b 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "2.3" services: jellyfin: image: jellyfin/jellyfin diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml index aaebe2e1..570697e5 100644 --- a/docker/mumble/docker-compose.yaml +++ b/docker/mumble/docker-compose.yaml @@ -1,5 +1,3 @@ -version: "3" - services: mumble: container_name: mumble diff --git a/docker/nextcloud/docker-compose.yaml b/docker/nextcloud/docker-compose.yaml index d959a14a..ef28ba66 100644 --- a/docker/nextcloud/docker-compose.yaml +++ b/docker/nextcloud/docker-compose.yaml @@ -1,5 +1,3 @@ -version: "3" - services: nextcloud: image: nextcloud:apache diff --git a/docker/pihole/docker-compose.yaml b/docker/pihole/docker-compose.yaml index 65ca2f52..489ee62e 100644 --- a/docker/pihole/docker-compose.yaml +++ b/docker/pihole/docker-compose.yaml @@ -1,5 +1,3 @@ -version: "3" - services: pihole: container_name: pihole diff --git a/docker/postgres/docker-compose.yaml b/docker/postgres/docker-compose.yaml index 92942046..4355ba96 100644 --- a/docker/postgres/docker-compose.yaml +++ b/docker/postgres/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3" services: postgres: container_name: postgres diff --git a/docker/tftp/docker-compose.yaml b/docker/tftp/docker-compose.yaml index 1ce83b1c..47d6d3c0 100644 --- a/docker/tftp/docker-compose.yaml +++ b/docker/tftp/docker-compose.yaml @@ -1,5 +1,3 @@ -version: "2" - services: tftp: container_name: tftp diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml index ca5657ca..db649156 100644 --- a/docker/traefik/docker-compose.yaml +++ b/docker/traefik/docker-compose.yaml @@ -1,5 +1,3 @@ -version: '3' - services: traefik: image: traefik:latest diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 667fec7c..1e9a93dd 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "2" services: tvheadend: image: linuxserver/tvheadend diff --git a/docker/wireguard/docker-compose.yaml b/docker/wireguard/docker-compose.yaml index 41769138..0d3296de 100644 --- a/docker/wireguard/docker-compose.yaml +++ b/docker/wireguard/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "2.1" services: wireguard: image: linuxserver/wireguard From e5ae761829a7b0aae43de2ff0e182e53d07020b9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 17:09:32 +0200 Subject: [PATCH 0898/2667] Update all compose files to use the new compose spec (removing version statement) --- docker/freshrss/docker-compose.yaml | 1 - docker/gitea/docker-compose.yaml | 2 -- docker/homeautomation/docker-compose.yaml | 1 - docker/index.korhonen.cc/docker-compose.yaml | 2 -- docker/jellyfin/docker-compose.yaml | 1 - docker/mumble/docker-compose.yaml | 2 -- docker/nextcloud/docker-compose.yaml | 2 -- docker/pihole/docker-compose.yaml | 2 -- docker/postgres/docker-compose.yaml | 1 - docker/tftp/docker-compose.yaml | 2 -- docker/traefik/docker-compose.yaml | 2 -- docker/tvheadend/docker-compose.yaml | 1 - docker/wireguard/docker-compose.yaml | 1 - 13 files changed, 20 deletions(-) diff --git a/docker/freshrss/docker-compose.yaml b/docker/freshrss/docker-compose.yaml index 86862668..d04da176 100644 --- a/docker/freshrss/docker-compose.yaml +++ b/docker/freshrss/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "2.1" services: freshrss: image: linuxserver/freshrss diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 0b8b0bb5..0a3a3b5a 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -1,5 +1,3 @@ -version: "2" - services: gitea: container_name: gitea diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index 0cf097e9..76f354a0 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3" services: home-assistant: container_name: home-assistant diff --git a/docker/index.korhonen.cc/docker-compose.yaml b/docker/index.korhonen.cc/docker-compose.yaml index 2859a129..78fba3ef 100644 --- a/docker/index.korhonen.cc/docker-compose.yaml +++ b/docker/index.korhonen.cc/docker-compose.yaml @@ -1,5 +1,3 @@ -version: "3" - services: nginx: image: fraoustin/fancyindex diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 8ead67ef..655a622b 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "2.3" services: jellyfin: image: jellyfin/jellyfin diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml index aaebe2e1..570697e5 100644 --- a/docker/mumble/docker-compose.yaml +++ b/docker/mumble/docker-compose.yaml @@ -1,5 +1,3 @@ -version: "3" - services: mumble: container_name: mumble diff --git a/docker/nextcloud/docker-compose.yaml b/docker/nextcloud/docker-compose.yaml index d959a14a..ef28ba66 100644 --- a/docker/nextcloud/docker-compose.yaml +++ b/docker/nextcloud/docker-compose.yaml @@ -1,5 +1,3 @@ -version: "3" - services: nextcloud: image: nextcloud:apache diff --git a/docker/pihole/docker-compose.yaml b/docker/pihole/docker-compose.yaml index 65ca2f52..489ee62e 100644 --- a/docker/pihole/docker-compose.yaml +++ b/docker/pihole/docker-compose.yaml @@ -1,5 +1,3 @@ -version: "3" - services: pihole: container_name: pihole diff --git a/docker/postgres/docker-compose.yaml b/docker/postgres/docker-compose.yaml index 92942046..4355ba96 100644 --- a/docker/postgres/docker-compose.yaml +++ b/docker/postgres/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3" services: postgres: container_name: postgres diff --git a/docker/tftp/docker-compose.yaml b/docker/tftp/docker-compose.yaml index 1ce83b1c..47d6d3c0 100644 --- a/docker/tftp/docker-compose.yaml +++ b/docker/tftp/docker-compose.yaml @@ -1,5 +1,3 @@ -version: "2" - services: tftp: container_name: tftp diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml index ca5657ca..db649156 100644 --- a/docker/traefik/docker-compose.yaml +++ b/docker/traefik/docker-compose.yaml @@ -1,5 +1,3 @@ -version: '3' - services: traefik: image: traefik:latest diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 667fec7c..1e9a93dd 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "2" services: tvheadend: image: linuxserver/tvheadend diff --git a/docker/wireguard/docker-compose.yaml b/docker/wireguard/docker-compose.yaml index 41769138..0d3296de 100644 --- a/docker/wireguard/docker-compose.yaml +++ b/docker/wireguard/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "2.1" services: wireguard: image: linuxserver/wireguard From 899f83d60dcd0e68004c32c93e423be72b42085a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 18:43:09 +0200 Subject: [PATCH 0899/2667] Switch from openldap to authentik --- docker/auth/.gitignore | 2 - docker/auth/docker-compose.yaml | 44 --------------- docker/authentik/docker-compose.yaml | 84 ++++++++++++++++++++++++++++ dotdrop | 2 +- 4 files changed, 85 insertions(+), 47 deletions(-) delete mode 100644 docker/auth/.gitignore delete mode 100644 docker/auth/docker-compose.yaml create mode 100644 docker/authentik/docker-compose.yaml diff --git a/docker/auth/.gitignore b/docker/auth/.gitignore deleted file mode 100644 index e1d30776..00000000 --- a/docker/auth/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.ldap_admin_password_secret -.ldap_read_only_password_secret diff --git a/docker/auth/docker-compose.yaml b/docker/auth/docker-compose.yaml deleted file mode 100644 index 7e117348..00000000 --- a/docker/auth/docker-compose.yaml +++ /dev/null @@ -1,44 +0,0 @@ -version: "3.8" - -services: - openldap: - container_name: openldap - image: osixia/openldap:1.5.0 - restart: always - hostname: ldap.korhonen.cc - ports: - - "389:389" - - "636:636" - environment: - - LDAP_ORGANISATION=Korhonen - - LDAP_DOMAIN=korhonen.cc - - LDAP_ADMIN_PASSWORD_FILE=/run/secrets/ldap_admin_password - - LDAP_READ_ONLY_USER=true - - LDAP_READ_ONLY_USER_USERNAME=ldap-ro - - LDAP_READ_ONLY_USER_PASSWORD_FILE=/run/secrets/ldap_read_only_password - secrets: - - ldap_admin_password - - ldap_read_only_password - volumes: - - "/docker/auth/openldap/ldap:/var/lib/ldap" - - "/docker/auth/openldap/slapd.d/:/etc/ldap/slapd.d" - - "/docker/auth/openldap/lidf:/data/ldif" - - phpldapadmin: - container_name: phpldapadmin - image: osixia/phpldapadmin - environment: - - PHPLDAPADMIN_HTTPS=false - - PHPLDAPADMIN_HOSTS=openldap - ports: - - "4588:80" - -networks: - auth: - external: true - -secrets: - ldap_admin_password: - file: ./.ldap_admin_password_secret - ldap_read_only_password: - file: ./.ldap_read_only_password_secret diff --git a/docker/authentik/docker-compose.yaml b/docker/authentik/docker-compose.yaml new file mode 100644 index 00000000..fefbf77b --- /dev/null +++ b/docker/authentik/docker-compose.yaml @@ -0,0 +1,84 @@ +services: + + redis: + container_name: authentik-redis + image: redis:alpine + restart: unless-stopped + networks: + - authentik + + authentik: + container_name: authentik + image: ${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.10.4} + restart: unless-stopped + command: server + volumes: + - /docker/authentik/media:/media + - /docker/authentik/custom-templates:/templates + - /docker/authentik/geoip:/geoip + env_file: + - .env + networks: + - authentik + - postgres + - proxy + ports: + - 9000:9000 + labels: + - "traefik.enable=true" + + - "traefik.http.routers.authentik-redirect.entrypoints=http" + - "traefik.http.routers.authentik-redirect.rule=Host(`sso.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.authentik-redirect.middlewares=http2https" + + - "traefik.http.routers.authentik.entrypoints=https" + - "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)" + - "traefik.http.routers.authentik.service=authentik" + - "traefik.docker.network=proxy" + - "traefik.http.services.authentik.loadbalancer.server.port=9000" + + authentik-worker: + container_name: authentik-worker + image: ${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.10.4} + restart: unless-stopped + command: worker + networks: + - authentik + - postgres + user: root + volumes: + - /docker/authentik/backups:/backups + - /docker/authentik/media:/media + - /var/run/docker.sock:/var/run/docker.sock + - /docker/authentik/custom-templates:/templates + - /docker/authentik/geoip:/geoip + environment: + - AUTHENTIK_POSTGRESQL__HOST + - AUTHENTIK_POSTGRESQL__USER + - AUTHENTIK_POSTGRESQL__NAME + - AUTHENTIK_POSTGRESQL__PASSWORD + - AUTHENTIK_SECRET_KEY + env_file: + - .env + + geoipupdate: + container_name: authentik-geoip + image: "maxmindinc/geoipupdate:latest" + volumes: + - /docker/authentik/geoip:/usr/share/GeoIP + environment: + GEOIPUPDATE_EDITION_IDS: "GeoLite2-City" + GEOIPUPDATE_FREQUENCY: "8" + env_file: + - .env + networks: + - authentik + +networks: + authentik: + internal: true + postgres: + external: true + proxy: + external: true diff --git a/dotdrop b/dotdrop index 24b43522..171f3df7 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 24b43522a4f7f4294d2b5e3df18586c81476a984 +Subproject commit 171f3df7eba99497c0fc42e60a18d8f8c7de055d From 308b43adcdc2ed0028ccc63cf389234a4b8b1898 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 18:43:09 +0200 Subject: [PATCH 0900/2667] Switch from openldap to authentik --- docker/auth/.gitignore | 2 - docker/auth/docker-compose.yaml | 44 --------------- docker/authentik/docker-compose.yaml | 84 ++++++++++++++++++++++++++++ dotdrop | 2 +- 4 files changed, 85 insertions(+), 47 deletions(-) delete mode 100644 docker/auth/.gitignore delete mode 100644 docker/auth/docker-compose.yaml create mode 100644 docker/authentik/docker-compose.yaml diff --git a/docker/auth/.gitignore b/docker/auth/.gitignore deleted file mode 100644 index e1d30776..00000000 --- a/docker/auth/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.ldap_admin_password_secret -.ldap_read_only_password_secret diff --git a/docker/auth/docker-compose.yaml b/docker/auth/docker-compose.yaml deleted file mode 100644 index 7e117348..00000000 --- a/docker/auth/docker-compose.yaml +++ /dev/null @@ -1,44 +0,0 @@ -version: "3.8" - -services: - openldap: - container_name: openldap - image: osixia/openldap:1.5.0 - restart: always - hostname: ldap.korhonen.cc - ports: - - "389:389" - - "636:636" - environment: - - LDAP_ORGANISATION=Korhonen - - LDAP_DOMAIN=korhonen.cc - - LDAP_ADMIN_PASSWORD_FILE=/run/secrets/ldap_admin_password - - LDAP_READ_ONLY_USER=true - - LDAP_READ_ONLY_USER_USERNAME=ldap-ro - - LDAP_READ_ONLY_USER_PASSWORD_FILE=/run/secrets/ldap_read_only_password - secrets: - - ldap_admin_password - - ldap_read_only_password - volumes: - - "/docker/auth/openldap/ldap:/var/lib/ldap" - - "/docker/auth/openldap/slapd.d/:/etc/ldap/slapd.d" - - "/docker/auth/openldap/lidf:/data/ldif" - - phpldapadmin: - container_name: phpldapadmin - image: osixia/phpldapadmin - environment: - - PHPLDAPADMIN_HTTPS=false - - PHPLDAPADMIN_HOSTS=openldap - ports: - - "4588:80" - -networks: - auth: - external: true - -secrets: - ldap_admin_password: - file: ./.ldap_admin_password_secret - ldap_read_only_password: - file: ./.ldap_read_only_password_secret diff --git a/docker/authentik/docker-compose.yaml b/docker/authentik/docker-compose.yaml new file mode 100644 index 00000000..fefbf77b --- /dev/null +++ b/docker/authentik/docker-compose.yaml @@ -0,0 +1,84 @@ +services: + + redis: + container_name: authentik-redis + image: redis:alpine + restart: unless-stopped + networks: + - authentik + + authentik: + container_name: authentik + image: ${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.10.4} + restart: unless-stopped + command: server + volumes: + - /docker/authentik/media:/media + - /docker/authentik/custom-templates:/templates + - /docker/authentik/geoip:/geoip + env_file: + - .env + networks: + - authentik + - postgres + - proxy + ports: + - 9000:9000 + labels: + - "traefik.enable=true" + + - "traefik.http.routers.authentik-redirect.entrypoints=http" + - "traefik.http.routers.authentik-redirect.rule=Host(`sso.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.authentik-redirect.middlewares=http2https" + + - "traefik.http.routers.authentik.entrypoints=https" + - "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)" + - "traefik.http.routers.authentik.service=authentik" + - "traefik.docker.network=proxy" + - "traefik.http.services.authentik.loadbalancer.server.port=9000" + + authentik-worker: + container_name: authentik-worker + image: ${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.10.4} + restart: unless-stopped + command: worker + networks: + - authentik + - postgres + user: root + volumes: + - /docker/authentik/backups:/backups + - /docker/authentik/media:/media + - /var/run/docker.sock:/var/run/docker.sock + - /docker/authentik/custom-templates:/templates + - /docker/authentik/geoip:/geoip + environment: + - AUTHENTIK_POSTGRESQL__HOST + - AUTHENTIK_POSTGRESQL__USER + - AUTHENTIK_POSTGRESQL__NAME + - AUTHENTIK_POSTGRESQL__PASSWORD + - AUTHENTIK_SECRET_KEY + env_file: + - .env + + geoipupdate: + container_name: authentik-geoip + image: "maxmindinc/geoipupdate:latest" + volumes: + - /docker/authentik/geoip:/usr/share/GeoIP + environment: + GEOIPUPDATE_EDITION_IDS: "GeoLite2-City" + GEOIPUPDATE_FREQUENCY: "8" + env_file: + - .env + networks: + - authentik + +networks: + authentik: + internal: true + postgres: + external: true + proxy: + external: true diff --git a/dotdrop b/dotdrop index 24b43522..171f3df7 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 24b43522a4f7f4294d2b5e3df18586c81476a984 +Subproject commit 171f3df7eba99497c0fc42e60a18d8f8c7de055d From cb44a92506ff7c52722b18a7081835dfafc6f09d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 21 Nov 2021 19:49:27 +0200 Subject: [PATCH 0901/2667] Updated dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 171f3df7..24b43522 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 171f3df7eba99497c0fc42e60a18d8f8c7de055d +Subproject commit 24b43522a4f7f4294d2b5e3df18586c81476a984 From 3702e129860bd1de29edc018ea54ce348b5b78f4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 21 Nov 2021 19:49:27 +0200 Subject: [PATCH 0902/2667] Updated dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 171f3df7..24b43522 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 171f3df7eba99497c0fc42e60a18d8f8c7de055d +Subproject commit 24b43522a4f7f4294d2b5e3df18586c81476a984 From 8d73a1978be1ce1a0ca7c14a57e05c5db62c9809 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Nov 2021 17:18:15 +0200 Subject: [PATCH 0903/2667] Updates for authentik config --- docker/authentik/.gitignore | 1 + docker/authentik/docker-compose.yaml | 2 +- docker/jellyfin/docker-compose.yaml | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 docker/authentik/.gitignore diff --git a/docker/authentik/.gitignore b/docker/authentik/.gitignore new file mode 100644 index 00000000..4c49bd78 --- /dev/null +++ b/docker/authentik/.gitignore @@ -0,0 +1 @@ +.env diff --git a/docker/authentik/docker-compose.yaml b/docker/authentik/docker-compose.yaml index fefbf77b..a5ee58d3 100644 --- a/docker/authentik/docker-compose.yaml +++ b/docker/authentik/docker-compose.yaml @@ -77,7 +77,7 @@ services: networks: authentik: - internal: true + external: true postgres: external: true proxy: diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 655a622b..a4eb3eef 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -10,6 +10,7 @@ services: - "8096:8096" networks: - proxy + - authentik restart: unless-stopped volumes: - /docker/jellyfin/config:/config @@ -33,3 +34,5 @@ services: networks: proxy: external: true + authentik: + external: true From 5f84ac78a3d92345c65a67f4d7dabf07cac1292f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Nov 2021 17:18:15 +0200 Subject: [PATCH 0904/2667] Updates for authentik config --- docker/authentik/.gitignore | 1 + docker/authentik/docker-compose.yaml | 2 +- docker/jellyfin/docker-compose.yaml | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 docker/authentik/.gitignore diff --git a/docker/authentik/.gitignore b/docker/authentik/.gitignore new file mode 100644 index 00000000..4c49bd78 --- /dev/null +++ b/docker/authentik/.gitignore @@ -0,0 +1 @@ +.env diff --git a/docker/authentik/docker-compose.yaml b/docker/authentik/docker-compose.yaml index fefbf77b..a5ee58d3 100644 --- a/docker/authentik/docker-compose.yaml +++ b/docker/authentik/docker-compose.yaml @@ -77,7 +77,7 @@ services: networks: authentik: - internal: true + external: true postgres: external: true proxy: diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 655a622b..a4eb3eef 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -10,6 +10,7 @@ services: - "8096:8096" networks: - proxy + - authentik restart: unless-stopped volumes: - /docker/jellyfin/config:/config @@ -33,3 +34,5 @@ services: networks: proxy: external: true + authentik: + external: true From 4cd116d28d892e9c8b394aad5575e8b68a7dd98b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Nov 2021 17:19:23 +0200 Subject: [PATCH 0905/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 24b43522..6722dcb7 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 24b43522a4f7f4294d2b5e3df18586c81476a984 +Subproject commit 6722dcb7185c5d11366baf9ec84a558a8ec6b25d From 65c6c66dc84079fba0b0c1a6a037c57bfaa9cda7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Nov 2021 17:19:23 +0200 Subject: [PATCH 0906/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 24b43522..6722dcb7 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 24b43522a4f7f4294d2b5e3df18586c81476a984 +Subproject commit 6722dcb7185c5d11366baf9ec84a558a8ec6b25d From e86d81eb32cf98cd01c942fc3f6dcef9755ccf8d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Nov 2021 18:19:36 +0200 Subject: [PATCH 0907/2667] Neovim: switch from lspinstall to nvim-lsp-installer, coq_nvim to nvim-cmp --- home/.config/nvim/init.lua | 1 + home/.config/nvim/lua/autocmd.lua | 3 - .../nvim/lua/pluginconf/completion.lua | 53 +++++++ home/.config/nvim/lua/pluginconf/lsp.lua | 147 ++++-------------- home/.config/nvim/lua/pluginmanager.lua | 13 +- 5 files changed, 94 insertions(+), 123 deletions(-) create mode 100644 home/.config/nvim/lua/pluginconf/completion.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 37c7a232..c88614c2 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -7,6 +7,7 @@ require 'settings' require 'pluginconf.lualine' require 'pluginconf.bufferline' require 'pluginconf.lsp' +require 'pluginconf.completion' require 'pluginconf.treesitter' require 'pluginconf.telescope' -- require 'pluginconf.indent-blankline' diff --git a/home/.config/nvim/lua/autocmd.lua b/home/.config/nvim/lua/autocmd.lua index 8182a216..00a0940c 100644 --- a/home/.config/nvim/lua/autocmd.lua +++ b/home/.config/nvim/lua/autocmd.lua @@ -5,6 +5,3 @@ cmd('au TermOpen * tnoremap ') -- Fix YAML indentation cmd('au FileType yaml setlocal ts=2 sts=2 sw=2 expandtab') - --- Run coq.nvim on startup -cmd('au VimEnter * COQnow --shut-up') diff --git a/home/.config/nvim/lua/pluginconf/completion.lua b/home/.config/nvim/lua/pluginconf/completion.lua new file mode 100644 index 00000000..4885debe --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/completion.lua @@ -0,0 +1,53 @@ +-- Add additional capabilities supported by nvim-cmp +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) +-- +-- Set completeopt to have a better completion experience +vim.o.completeopt = 'menuone,noselect' + +-- luasnip setup +local luasnip = require 'luasnip' + +-- nvim-cmp setup +local cmp = require 'cmp' +cmp.setup { + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end, + }, + mapping = { + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.close(), + [''] = cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }, + [''] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, + [''] = function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, + }, + sources = { + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + }, +} diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 1f654b98..cbd3948c 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -1,120 +1,39 @@ --- keymaps -local on_attach = function(client, bufnr) - local function buf_set_keymap(...) - vim.api.nvim_buf_set_keymap(bufnr, ...) - end - local function buf_set_option(...) - vim.api.nvim_buf_set_option(bufnr, ...) - end +local lsp_installer = require("nvim-lsp-installer") - buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') +-- Register a handler that will be called for all installed servers. +-- Alternatively, you may also register handlers on specific server instances instead (see example below). +lsp_installer.on_server_ready(function(server) + local opts = {} + print(server.name) - -- Mappings. - local opts = {noremap = true, silent = true} - buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) - buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) - buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) - buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', - opts) - buf_set_keymap('n', 'wa', - 'lua vim.lsp.buf.add_workspace_folder()', opts) - buf_set_keymap('n', 'wr', - 'lua vim.lsp.buf.remove_workspace_folder()', opts) - buf_set_keymap('n', 'wl', - 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', - opts) - buf_set_keymap('n', 'D', - 'lua vim.lsp.buf.type_definition()', opts) - buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) - buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) - buf_set_keymap('n', 'e', - 'lua vim.lsp.diagnostic.show_line_diagnostics()', - opts) - buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', - opts) - buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', - opts) - buf_set_keymap('n', 'q', - 'lua vim.lsp.diagnostic.set_loclist()', opts) - - -- Set some keybinds conditional on server capabilities - if client.resolved_capabilities.document_formatting then - buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", - opts) - elseif client.resolved_capabilities.document_range_formatting then - buf_set_keymap("n", "f", - "lua vim.lsp.buf.range_formatting()", opts) - end - - -- Set autocommands conditional on server_capabilities - if client.resolved_capabilities.document_highlight then - vim.api.nvim_exec([[ - augroup lsp_document_highlight - autocmd! * - autocmd CursorHold lua vim.lsp.buf.document_highlight() - autocmd CursorMoved lua vim.lsp.buf.clear_references() - augroup END - ]], false) - end -end - --- Configure lua language server for neovim development -local lua_settings = { - Lua = { - runtime = { - -- LuaJIT in the case of Neovim - version = 'LuaJIT', - path = vim.split(package.path, ';') - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = {'vim'} - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = { - [vim.fn.expand('$VIMRUNTIME/lua')] = true, - [vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true + -- (optional) Customize the options passed to the server + if server.name == "sumneko_lua" then + local runtime_path = vim.split(package.path, ';') + opts = { + settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = 'LuaJIT', + -- Setup your lua path + path = runtime_path + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = {'vim'} + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file("", true) + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = {enable = false} + } } } - } -} - --- config that activates keymaps and enables snippet support -local function make_config() - local capabilities = vim.lsp.protocol.make_client_capabilities() - capabilities.textDocument.completion.completionItem.snippetSupport = true - return { - -- enable snippet support - capabilities = capabilities, - -- map buffer local keybindings when the language server attaches - on_attach = on_attach - } -end - --- lsp-install -local function setup_servers() - require'lspinstall'.setup() - - -- get all installed servers - local servers = require'lspinstall'.installed_servers() - - for _, server in pairs(servers) do - local config = make_config() - - -- language specific config - if server == "lua" then config.settings = lua_settings end - - require'lspconfig'[server].setup(config) - end -end -setup_servers() - --- Automatically reload after `:LspInstall ` so we don't have to restart neovim -require'lspinstall'.post_install_hook = function() - setup_servers() -- reload installed servers - vim.cmd("bufdo e") -- this triggers the FileType autocmd that starts the server -end + -- This setup() function is exactly the same as lspconfig's setup function. + -- Refer to https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md + server:setup(opts) +end) diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 5c072b09..eb9cbdd6 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -61,14 +61,15 @@ require('packer').startup(function() -- Configs for built-in LSP use 'neovim/nvim-lspconfig' - -- Install LSP executables - use 'kabouzeid/nvim-lspinstall' + -- Install LSP server executables + use 'williamboman/nvim-lsp-installer' -- Completion - use {'ms-jpq/coq_nvim', branch = 'coq'} - - -- Snippets for coq_nvim - use {'ms-jpq/coq.artifacts', branch = 'artifacts'} + use 'hrsh7th/nvim-cmp' -- Autocompletion plugin + use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp + use 'hrsh7th/cmp-path' -- Path source for nvim-cmp + use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp + use 'L3MON4D3/LuaSnip' -- Snippets plugin -- treesitter syntax highlight use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} From 91b671057e4a160df296a8938dae006949f95276 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Nov 2021 18:19:36 +0200 Subject: [PATCH 0908/2667] Neovim: switch from lspinstall to nvim-lsp-installer, coq_nvim to nvim-cmp --- home/.config/nvim/init.lua | 1 + home/.config/nvim/lua/autocmd.lua | 3 - .../nvim/lua/pluginconf/completion.lua | 53 +++++++ home/.config/nvim/lua/pluginconf/lsp.lua | 147 ++++-------------- home/.config/nvim/lua/pluginmanager.lua | 13 +- 5 files changed, 94 insertions(+), 123 deletions(-) create mode 100644 home/.config/nvim/lua/pluginconf/completion.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 37c7a232..c88614c2 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -7,6 +7,7 @@ require 'settings' require 'pluginconf.lualine' require 'pluginconf.bufferline' require 'pluginconf.lsp' +require 'pluginconf.completion' require 'pluginconf.treesitter' require 'pluginconf.telescope' -- require 'pluginconf.indent-blankline' diff --git a/home/.config/nvim/lua/autocmd.lua b/home/.config/nvim/lua/autocmd.lua index 8182a216..00a0940c 100644 --- a/home/.config/nvim/lua/autocmd.lua +++ b/home/.config/nvim/lua/autocmd.lua @@ -5,6 +5,3 @@ cmd('au TermOpen * tnoremap ') -- Fix YAML indentation cmd('au FileType yaml setlocal ts=2 sts=2 sw=2 expandtab') - --- Run coq.nvim on startup -cmd('au VimEnter * COQnow --shut-up') diff --git a/home/.config/nvim/lua/pluginconf/completion.lua b/home/.config/nvim/lua/pluginconf/completion.lua new file mode 100644 index 00000000..4885debe --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/completion.lua @@ -0,0 +1,53 @@ +-- Add additional capabilities supported by nvim-cmp +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) +-- +-- Set completeopt to have a better completion experience +vim.o.completeopt = 'menuone,noselect' + +-- luasnip setup +local luasnip = require 'luasnip' + +-- nvim-cmp setup +local cmp = require 'cmp' +cmp.setup { + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end, + }, + mapping = { + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.close(), + [''] = cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }, + [''] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, + [''] = function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, + }, + sources = { + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + }, +} diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 1f654b98..cbd3948c 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -1,120 +1,39 @@ --- keymaps -local on_attach = function(client, bufnr) - local function buf_set_keymap(...) - vim.api.nvim_buf_set_keymap(bufnr, ...) - end - local function buf_set_option(...) - vim.api.nvim_buf_set_option(bufnr, ...) - end +local lsp_installer = require("nvim-lsp-installer") - buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') +-- Register a handler that will be called for all installed servers. +-- Alternatively, you may also register handlers on specific server instances instead (see example below). +lsp_installer.on_server_ready(function(server) + local opts = {} + print(server.name) - -- Mappings. - local opts = {noremap = true, silent = true} - buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) - buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) - buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) - buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', - opts) - buf_set_keymap('n', 'wa', - 'lua vim.lsp.buf.add_workspace_folder()', opts) - buf_set_keymap('n', 'wr', - 'lua vim.lsp.buf.remove_workspace_folder()', opts) - buf_set_keymap('n', 'wl', - 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', - opts) - buf_set_keymap('n', 'D', - 'lua vim.lsp.buf.type_definition()', opts) - buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) - buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) - buf_set_keymap('n', 'e', - 'lua vim.lsp.diagnostic.show_line_diagnostics()', - opts) - buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', - opts) - buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', - opts) - buf_set_keymap('n', 'q', - 'lua vim.lsp.diagnostic.set_loclist()', opts) - - -- Set some keybinds conditional on server capabilities - if client.resolved_capabilities.document_formatting then - buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", - opts) - elseif client.resolved_capabilities.document_range_formatting then - buf_set_keymap("n", "f", - "lua vim.lsp.buf.range_formatting()", opts) - end - - -- Set autocommands conditional on server_capabilities - if client.resolved_capabilities.document_highlight then - vim.api.nvim_exec([[ - augroup lsp_document_highlight - autocmd! * - autocmd CursorHold lua vim.lsp.buf.document_highlight() - autocmd CursorMoved lua vim.lsp.buf.clear_references() - augroup END - ]], false) - end -end - --- Configure lua language server for neovim development -local lua_settings = { - Lua = { - runtime = { - -- LuaJIT in the case of Neovim - version = 'LuaJIT', - path = vim.split(package.path, ';') - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = {'vim'} - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = { - [vim.fn.expand('$VIMRUNTIME/lua')] = true, - [vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true + -- (optional) Customize the options passed to the server + if server.name == "sumneko_lua" then + local runtime_path = vim.split(package.path, ';') + opts = { + settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = 'LuaJIT', + -- Setup your lua path + path = runtime_path + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = {'vim'} + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file("", true) + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = {enable = false} + } } } - } -} - --- config that activates keymaps and enables snippet support -local function make_config() - local capabilities = vim.lsp.protocol.make_client_capabilities() - capabilities.textDocument.completion.completionItem.snippetSupport = true - return { - -- enable snippet support - capabilities = capabilities, - -- map buffer local keybindings when the language server attaches - on_attach = on_attach - } -end - --- lsp-install -local function setup_servers() - require'lspinstall'.setup() - - -- get all installed servers - local servers = require'lspinstall'.installed_servers() - - for _, server in pairs(servers) do - local config = make_config() - - -- language specific config - if server == "lua" then config.settings = lua_settings end - - require'lspconfig'[server].setup(config) - end -end -setup_servers() - --- Automatically reload after `:LspInstall ` so we don't have to restart neovim -require'lspinstall'.post_install_hook = function() - setup_servers() -- reload installed servers - vim.cmd("bufdo e") -- this triggers the FileType autocmd that starts the server -end + -- This setup() function is exactly the same as lspconfig's setup function. + -- Refer to https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md + server:setup(opts) +end) diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 5c072b09..eb9cbdd6 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -61,14 +61,15 @@ require('packer').startup(function() -- Configs for built-in LSP use 'neovim/nvim-lspconfig' - -- Install LSP executables - use 'kabouzeid/nvim-lspinstall' + -- Install LSP server executables + use 'williamboman/nvim-lsp-installer' -- Completion - use {'ms-jpq/coq_nvim', branch = 'coq'} - - -- Snippets for coq_nvim - use {'ms-jpq/coq.artifacts', branch = 'artifacts'} + use 'hrsh7th/nvim-cmp' -- Autocompletion plugin + use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp + use 'hrsh7th/cmp-path' -- Path source for nvim-cmp + use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp + use 'L3MON4D3/LuaSnip' -- Snippets plugin -- treesitter syntax highlight use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} From ea8debd6d9b5181ad264615754513cfc271aca64 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Nov 2021 10:25:59 +0200 Subject: [PATCH 0909/2667] Neovim add lsp keybindings --- home/.config/nvim/lua/pluginconf/lsp.lua | 93 +++++++++++++++++------- 1 file changed, 66 insertions(+), 27 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index cbd3948c..551f1be7 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -1,39 +1,78 @@ local lsp_installer = require("nvim-lsp-installer") +local buf_map_keys = function(server_name, bufnr) + local function buf_set_keymap(...) + vim.api.nvim_buf_set_keymap(bufnr, ...) + end + + local keymapOpts = {noremap = true, silent = true} + buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', + keymapOpts) + buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', + keymapOpts) + buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', keymapOpts) + buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', + keymapOpts) + buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', + keymapOpts) + buf_set_keymap('n', 'wa', + 'lua vim.lsp.buf.add_workspace_folder()', keymapOpts) + buf_set_keymap('n', 'wr', + 'lua vim.lsp.buf.remove_workspace_folder()', + keymapOpts) + buf_set_keymap('n', 'wl', + 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', + keymapOpts) + buf_set_keymap('n', 'D', + 'lua vim.lsp.buf.type_definition()', keymapOpts) + buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', + keymapOpts) + buf_set_keymap('n', 'ca', 'lua vim.lsp.buf.code_action()', + keymapOpts) + buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', + keymapOpts) + buf_set_keymap('n', 'e', + 'lua vim.lsp.diagnostic.show_line_diagnostics()', + keymapOpts) + buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', + keymapOpts) + buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', + keymapOpts) + buf_set_keymap('n', 'q', + 'lua vim.lsp.diagnostic.set_loclist()', keymapOpts) + buf_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', + keymapOpts) +end + -- Register a handler that will be called for all installed servers. -- Alternatively, you may also register handlers on specific server instances instead (see example below). lsp_installer.on_server_ready(function(server) local opts = {} - print(server.name) - -- (optional) Customize the options passed to the server - if server.name == "sumneko_lua" then + -- Lua specific settings + if server_name == "sumneko_lua" then local runtime_path = vim.split(package.path, ';') - opts = { - settings = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = 'LuaJIT', - -- Setup your lua path - path = runtime_path - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = {'vim'} - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file("", true) - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = {enable = false} - } + opts.settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = 'LuaJIT', + -- Setup your lua path + path = runtime_path + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = {'vim'} + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file("", true) + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = {enable = false} } } + opts.on_attach = buf_map_keys + server:setup(opts) end - - -- This setup() function is exactly the same as lspconfig's setup function. - -- Refer to https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md - server:setup(opts) end) From 68393225eeadf721c96edb7aa90c53f1ef73c64c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Nov 2021 10:25:59 +0200 Subject: [PATCH 0910/2667] Neovim add lsp keybindings --- home/.config/nvim/lua/pluginconf/lsp.lua | 93 +++++++++++++++++------- 1 file changed, 66 insertions(+), 27 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index cbd3948c..551f1be7 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -1,39 +1,78 @@ local lsp_installer = require("nvim-lsp-installer") +local buf_map_keys = function(server_name, bufnr) + local function buf_set_keymap(...) + vim.api.nvim_buf_set_keymap(bufnr, ...) + end + + local keymapOpts = {noremap = true, silent = true} + buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', + keymapOpts) + buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', + keymapOpts) + buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', keymapOpts) + buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', + keymapOpts) + buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', + keymapOpts) + buf_set_keymap('n', 'wa', + 'lua vim.lsp.buf.add_workspace_folder()', keymapOpts) + buf_set_keymap('n', 'wr', + 'lua vim.lsp.buf.remove_workspace_folder()', + keymapOpts) + buf_set_keymap('n', 'wl', + 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', + keymapOpts) + buf_set_keymap('n', 'D', + 'lua vim.lsp.buf.type_definition()', keymapOpts) + buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', + keymapOpts) + buf_set_keymap('n', 'ca', 'lua vim.lsp.buf.code_action()', + keymapOpts) + buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', + keymapOpts) + buf_set_keymap('n', 'e', + 'lua vim.lsp.diagnostic.show_line_diagnostics()', + keymapOpts) + buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', + keymapOpts) + buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', + keymapOpts) + buf_set_keymap('n', 'q', + 'lua vim.lsp.diagnostic.set_loclist()', keymapOpts) + buf_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', + keymapOpts) +end + -- Register a handler that will be called for all installed servers. -- Alternatively, you may also register handlers on specific server instances instead (see example below). lsp_installer.on_server_ready(function(server) local opts = {} - print(server.name) - -- (optional) Customize the options passed to the server - if server.name == "sumneko_lua" then + -- Lua specific settings + if server_name == "sumneko_lua" then local runtime_path = vim.split(package.path, ';') - opts = { - settings = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = 'LuaJIT', - -- Setup your lua path - path = runtime_path - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = {'vim'} - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file("", true) - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = {enable = false} - } + opts.settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = 'LuaJIT', + -- Setup your lua path + path = runtime_path + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = {'vim'} + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file("", true) + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = {enable = false} } } + opts.on_attach = buf_map_keys + server:setup(opts) end - - -- This setup() function is exactly the same as lspconfig's setup function. - -- Refer to https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md - server:setup(opts) end) From a718b84618c0c41e1ef6acb0939cc8305ce7247f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Nov 2021 10:27:32 +0200 Subject: [PATCH 0911/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 6722dcb7..8c97593c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 6722dcb7185c5d11366baf9ec84a558a8ec6b25d +Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa From 453efbd4ec23c2266ed3c3865dc77fbd2ede2d85 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Nov 2021 10:27:32 +0200 Subject: [PATCH 0912/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 6722dcb7..8c97593c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 6722dcb7185c5d11366baf9ec84a558a8ec6b25d +Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa From db8d59839a7873beab38ad3ddb2ffaa502647172 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Nov 2021 17:36:31 +0200 Subject: [PATCH 0913/2667] Delete wireguard docker. Will use on host instead --- docker/wireguard/docker-compose.yaml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 docker/wireguard/docker-compose.yaml diff --git a/docker/wireguard/docker-compose.yaml b/docker/wireguard/docker-compose.yaml deleted file mode 100644 index 0d3296de..00000000 --- a/docker/wireguard/docker-compose.yaml +++ /dev/null @@ -1,21 +0,0 @@ -services: - wireguard: - image: linuxserver/wireguard - container_name: wireguard - cap_add: - - NET_ADMIN - - SYS_MODULE - environment: - - TZ=Europe/Helsinki - - PEERS=4 - - SERVERURL=korhonen.cc - - SERVERPORT=48574 - - INTERNAL_SUBNET=10.200.200.0/24 - volumes: - - /docker/wireguard:/config - - /lib/modules:/lib/modules - ports: - - 48574:51820/udp - sysctls: - - net.ipv4.conf.all.src_valid_mark=1 - restart: unless-stopped From f44300cb33efb06f1e368af959a0c01e0225efc8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Nov 2021 17:36:31 +0200 Subject: [PATCH 0914/2667] Delete wireguard docker. Will use on host instead --- docker/wireguard/docker-compose.yaml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 docker/wireguard/docker-compose.yaml diff --git a/docker/wireguard/docker-compose.yaml b/docker/wireguard/docker-compose.yaml deleted file mode 100644 index 0d3296de..00000000 --- a/docker/wireguard/docker-compose.yaml +++ /dev/null @@ -1,21 +0,0 @@ -services: - wireguard: - image: linuxserver/wireguard - container_name: wireguard - cap_add: - - NET_ADMIN - - SYS_MODULE - environment: - - TZ=Europe/Helsinki - - PEERS=4 - - SERVERURL=korhonen.cc - - SERVERPORT=48574 - - INTERNAL_SUBNET=10.200.200.0/24 - volumes: - - /docker/wireguard:/config - - /lib/modules:/lib/modules - ports: - - 48574:51820/udp - sysctls: - - net.ipv4.conf.all.src_valid_mark=1 - restart: unless-stopped From bbb68080a4a6c24685e538a79c6b876485ef35da Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Nov 2021 17:37:16 +0200 Subject: [PATCH 0915/2667] Add thunderbird to sway exec --- home/.config/sway/conf.d/08-exec.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 85a886cc..73de4e06 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -17,6 +17,7 @@ exec { swaymsg workspace 1 dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway /usr/lib/geoclue-2.0/demos/agent + thunderbird } exec_always { From 70c2f6831873022707d8689a280bc127093fbab6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Nov 2021 17:37:16 +0200 Subject: [PATCH 0916/2667] Add thunderbird to sway exec --- home/.config/sway/conf.d/08-exec.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 85a886cc..73de4e06 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -17,6 +17,7 @@ exec { swaymsg workspace 1 dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway /usr/lib/geoclue-2.0/demos/agent + thunderbird } exec_always { From a468d2cdf2fced9eeb66abeeffdaffe64076961d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Nov 2021 17:37:31 +0200 Subject: [PATCH 0917/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 8c97593c..56911eb6 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa +Subproject commit 56911eb6fd028bc3a9f86b670825e035c5c92200 From 8b7a8f13e965ca7e9d53e90b65059e6792b8db3f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Nov 2021 17:37:31 +0200 Subject: [PATCH 0918/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 8c97593c..56911eb6 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa +Subproject commit 56911eb6fd028bc3a9f86b670825e035c5c92200 From 82364ebc051982c0fc9a6821317c0d7e85028714 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Nov 2021 16:19:53 +0200 Subject: [PATCH 0919/2667] Neovim: Fix LSP server startup --- home/.config/nvim/lua/pluginconf/lsp.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 551f1be7..51bfe6ef 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -72,7 +72,8 @@ lsp_installer.on_server_ready(function(server) telemetry = {enable = false} } } - opts.on_attach = buf_map_keys - server:setup(opts) end + + opts.on_attach = buf_map_keys + server:setup(opts) end) From c2ff13e6f70519dc794b307e4359f48cdc87c9c5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Nov 2021 16:19:53 +0200 Subject: [PATCH 0920/2667] Neovim: Fix LSP server startup --- home/.config/nvim/lua/pluginconf/lsp.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 551f1be7..51bfe6ef 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -72,7 +72,8 @@ lsp_installer.on_server_ready(function(server) telemetry = {enable = false} } } - opts.on_attach = buf_map_keys - server:setup(opts) end + + opts.on_attach = buf_map_keys + server:setup(opts) end) From 9f7c3e646641c231991cbd2f3ed5a95184f9b098 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 16:56:15 +0200 Subject: [PATCH 0921/2667] Git: don't keep backup when using mergetool --- home/.gitconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.gitconfig b/home/.gitconfig index ffa424f7..5e94d484 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -24,6 +24,7 @@ [mergetool "nvim-merge"] cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' + keepBackup = false [diff] prompt = false From 62e3e6d8583246678e4c6d7b7a6722ff0f303123 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 16:56:15 +0200 Subject: [PATCH 0922/2667] Git: don't keep backup when using mergetool --- home/.gitconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.gitconfig b/home/.gitconfig index ffa424f7..5e94d484 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -24,6 +24,7 @@ [mergetool "nvim-merge"] cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' + keepBackup = false [diff] prompt = false From 4b3709b242498a97992301a99da9a1b8dafc56d4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 17:36:07 +0200 Subject: [PATCH 0923/2667] Disable hass header auth --- docker/homeautomation/docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index 76f354a0..937924d4 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -75,6 +75,7 @@ services: - "1880:1880" networks: - homeautomation + - proxy volumes: - /docker/homeautomation/node-red:/data - /etc/localtime:/etc/localtime:ro From 1b669c06fc7ac6f085ca75f4c809337a19d2b911 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 17:36:07 +0200 Subject: [PATCH 0924/2667] Disable hass header auth --- docker/homeautomation/docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index 76f354a0..937924d4 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -75,6 +75,7 @@ services: - "1880:1880" networks: - homeautomation + - proxy volumes: - /docker/homeautomation/node-red:/data - /etc/localtime:/etc/localtime:ro From 71f871c8954a6c7d017b6c973e20c3d01c746b36 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 17:36:23 +0200 Subject: [PATCH 0925/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 56911eb6..8c97593c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 56911eb6fd028bc3a9f86b670825e035c5c92200 +Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa From 0931c0b2e48f5e4ff7a615bbef6b7874d25f2810 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 17:36:23 +0200 Subject: [PATCH 0926/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 56911eb6..8c97593c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 56911eb6fd028bc3a9f86b670825e035c5c92200 +Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa From 1e9227ca57592726701fc9073c07281da5754a37 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 17:36:37 +0200 Subject: [PATCH 0927/2667] Add remotely --- docker/remotely/docker-compose.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 docker/remotely/docker-compose.yaml diff --git a/docker/remotely/docker-compose.yaml b/docker/remotely/docker-compose.yaml new file mode 100644 index 00000000..fc3127a8 --- /dev/null +++ b/docker/remotely/docker-compose.yaml @@ -0,0 +1,25 @@ +services: + remotely: + image: translucency/remotely + container_name: remotely + networks: + - proxy + volumes: + - /docker/remotely:/remotely-data + labels: + - "traefik.enable=true" + + - "traefik.http.routers.remotely-redirect.entrypoints=http" + - "traefik.http.routers.remotely-redirect.rule=Host(`remotely.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.remotely-redirect.middlewares=http2https" + + - "traefik.http.routers.remotely.entrypoints=https" + - "traefik.http.routers.remotely.rule=Host(`remotely.korhonen.cc`)" + - "traefik.http.routers.remotely.service=remotely" + - "traefik.docker.network=proxy" + - "traefik.http.services.remotely.loadbalancer.server.port=5000" + +networks: + proxy: + external: true From f6c715be637e0f57cb30295f2fb9fa7f3a6afa0f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 17:36:37 +0200 Subject: [PATCH 0928/2667] Add remotely --- docker/remotely/docker-compose.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 docker/remotely/docker-compose.yaml diff --git a/docker/remotely/docker-compose.yaml b/docker/remotely/docker-compose.yaml new file mode 100644 index 00000000..fc3127a8 --- /dev/null +++ b/docker/remotely/docker-compose.yaml @@ -0,0 +1,25 @@ +services: + remotely: + image: translucency/remotely + container_name: remotely + networks: + - proxy + volumes: + - /docker/remotely:/remotely-data + labels: + - "traefik.enable=true" + + - "traefik.http.routers.remotely-redirect.entrypoints=http" + - "traefik.http.routers.remotely-redirect.rule=Host(`remotely.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.remotely-redirect.middlewares=http2https" + + - "traefik.http.routers.remotely.entrypoints=https" + - "traefik.http.routers.remotely.rule=Host(`remotely.korhonen.cc`)" + - "traefik.http.routers.remotely.service=remotely" + - "traefik.docker.network=proxy" + - "traefik.http.services.remotely.loadbalancer.server.port=5000" + +networks: + proxy: + external: true From cafb76d8358d4e10df7a9b7753810534189bc915 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 17:37:43 +0200 Subject: [PATCH 0929/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 8c97593c..56911eb6 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa +Subproject commit 56911eb6fd028bc3a9f86b670825e035c5c92200 From 67610fa7e8e6f9549fbc208b0849e08ce40a9049 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 17:37:43 +0200 Subject: [PATCH 0930/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 8c97593c..56911eb6 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa +Subproject commit 56911eb6fd028bc3a9f86b670825e035c5c92200 From 2be99922f483563dc3946e1d69356eb34c2e07a3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 17:38:54 +0200 Subject: [PATCH 0931/2667] Disable dotdrop autoupdate --- home/.config/zsh/01-env.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index b9aab448..55c9213d 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -67,3 +67,6 @@ fi # Enable grc colorization of supported commands [[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh + +# Disable dotdrop submodule auto update +DOTDROP_AUTOUPDATE=no From 6573316fba9a0067c6cd2a5153c67a50210e6afb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 17:38:54 +0200 Subject: [PATCH 0932/2667] Disable dotdrop autoupdate --- home/.config/zsh/01-env.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index b9aab448..55c9213d 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -67,3 +67,6 @@ fi # Enable grc colorization of supported commands [[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh + +# Disable dotdrop submodule auto update +DOTDROP_AUTOUPDATE=no From 5789851be936683159355cf1024652bc422d4367 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 3 Dec 2021 09:30:27 +0200 Subject: [PATCH 0933/2667] Neovim: Enable indent-blankline --- home/.config/nvim/init.lua | 2 +- .../nvim/lua/pluginconf/indent-blankline.lua | 22 +++++++------------ home/.config/nvim/lua/pluginmanager.lua | 2 +- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index c88614c2..d70a0eb8 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -10,4 +10,4 @@ require 'pluginconf.lsp' require 'pluginconf.completion' require 'pluginconf.treesitter' require 'pluginconf.telescope' --- require 'pluginconf.indent-blankline' +require 'pluginconf.indent-blankline' diff --git a/home/.config/nvim/lua/pluginconf/indent-blankline.lua b/home/.config/nvim/lua/pluginconf/indent-blankline.lua index b103c7ac..3691a00a 100644 --- a/home/.config/nvim/lua/pluginconf/indent-blankline.lua +++ b/home/.config/nvim/lua/pluginconf/indent-blankline.lua @@ -1,15 +1,9 @@ -require('indent_blankline').setup {char = " ", filetype_exclude = {'help', 'terminal'}} +vim.opt.list = true +vim.opt.listchars:append("space:⋅") +vim.opt.listchars:append("eol:↴") --- define the highlight groups with only background colors (or leave odd empty to just show the normal background) -vim.cmd [[highlight IndentOdd guifg=NONE guibg=NONE gui=nocombine]] -vim.cmd [[highlight IndentEven guifg=NONE guibg=#354254 gui=nocombine]] --- and then use the highlight groups -vim.g.indent_blankline_char_highlight_list = {"IndentOdd", "IndentEven"} -vim.g.indent_blankline_space_char_highlight_list = {"IndentOdd", "IndentEven"} - --- don't show any characters -vim.g.indent_blankline_char = " " -vim.g.indent_blankline_space_char = " " - --- when using background, the trailing indent is not needed / looks wrong -vim.g.indent_blankline_show_trailing_blankline_indent = false +require("indent_blankline").setup { + space_char_blankline = " ", + show_current_context = true, + show_current_context_start = true, +} diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index eb9cbdd6..a4a42e44 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -41,7 +41,7 @@ require('packer').startup(function() use 'tpope/vim-fugitive' -- Indent characters - -- use "lukas-reineke/indent-blankline.nvim" + use "lukas-reineke/indent-blankline.nvim" -- Tree explorer use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} From bf1c9234e2a0284489b7c6beffe6c34bcc3bef68 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 3 Dec 2021 09:30:27 +0200 Subject: [PATCH 0934/2667] Neovim: Enable indent-blankline --- home/.config/nvim/init.lua | 2 +- .../nvim/lua/pluginconf/indent-blankline.lua | 22 +++++++------------ home/.config/nvim/lua/pluginmanager.lua | 2 +- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index c88614c2..d70a0eb8 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -10,4 +10,4 @@ require 'pluginconf.lsp' require 'pluginconf.completion' require 'pluginconf.treesitter' require 'pluginconf.telescope' --- require 'pluginconf.indent-blankline' +require 'pluginconf.indent-blankline' diff --git a/home/.config/nvim/lua/pluginconf/indent-blankline.lua b/home/.config/nvim/lua/pluginconf/indent-blankline.lua index b103c7ac..3691a00a 100644 --- a/home/.config/nvim/lua/pluginconf/indent-blankline.lua +++ b/home/.config/nvim/lua/pluginconf/indent-blankline.lua @@ -1,15 +1,9 @@ -require('indent_blankline').setup {char = " ", filetype_exclude = {'help', 'terminal'}} +vim.opt.list = true +vim.opt.listchars:append("space:⋅") +vim.opt.listchars:append("eol:↴") --- define the highlight groups with only background colors (or leave odd empty to just show the normal background) -vim.cmd [[highlight IndentOdd guifg=NONE guibg=NONE gui=nocombine]] -vim.cmd [[highlight IndentEven guifg=NONE guibg=#354254 gui=nocombine]] --- and then use the highlight groups -vim.g.indent_blankline_char_highlight_list = {"IndentOdd", "IndentEven"} -vim.g.indent_blankline_space_char_highlight_list = {"IndentOdd", "IndentEven"} - --- don't show any characters -vim.g.indent_blankline_char = " " -vim.g.indent_blankline_space_char = " " - --- when using background, the trailing indent is not needed / looks wrong -vim.g.indent_blankline_show_trailing_blankline_indent = false +require("indent_blankline").setup { + space_char_blankline = " ", + show_current_context = true, + show_current_context_start = true, +} diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index eb9cbdd6..a4a42e44 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -41,7 +41,7 @@ require('packer').startup(function() use 'tpope/vim-fugitive' -- Indent characters - -- use "lukas-reineke/indent-blankline.nvim" + use "lukas-reineke/indent-blankline.nvim" -- Tree explorer use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} From f5bf1b9b0ef037bca6188e1b3e57d4d0d249dad5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 3 Dec 2021 09:32:42 +0200 Subject: [PATCH 0935/2667] Neovim indent-blankline disable space and eol characters --- home/.config/nvim/lua/pluginconf/indent-blankline.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/indent-blankline.lua b/home/.config/nvim/lua/pluginconf/indent-blankline.lua index 3691a00a..58c522bc 100644 --- a/home/.config/nvim/lua/pluginconf/indent-blankline.lua +++ b/home/.config/nvim/lua/pluginconf/indent-blankline.lua @@ -1,6 +1,4 @@ vim.opt.list = true -vim.opt.listchars:append("space:⋅") -vim.opt.listchars:append("eol:↴") require("indent_blankline").setup { space_char_blankline = " ", From f0b03ebd137e789afcebd8ec12ca22255a69fa7e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 3 Dec 2021 09:32:42 +0200 Subject: [PATCH 0936/2667] Neovim indent-blankline disable space and eol characters --- home/.config/nvim/lua/pluginconf/indent-blankline.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/indent-blankline.lua b/home/.config/nvim/lua/pluginconf/indent-blankline.lua index 3691a00a..58c522bc 100644 --- a/home/.config/nvim/lua/pluginconf/indent-blankline.lua +++ b/home/.config/nvim/lua/pluginconf/indent-blankline.lua @@ -1,6 +1,4 @@ vim.opt.list = true -vim.opt.listchars:append("space:⋅") -vim.opt.listchars:append("eol:↴") require("indent_blankline").setup { space_char_blankline = " ", From d78c0ae77d16dcdcc6525c125d8650fbdd2f1ffc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 3 Dec 2021 20:13:12 +0200 Subject: [PATCH 0937/2667] Nvim: enable nvim-tree --- home/.config/nvim/init.lua | 1 + home/.config/nvim/lua/pluginconf/nvim-tree.lua | 1 + 2 files changed, 2 insertions(+) create mode 100644 home/.config/nvim/lua/pluginconf/nvim-tree.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index d70a0eb8..80889247 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -11,3 +11,4 @@ require 'pluginconf.completion' require 'pluginconf.treesitter' require 'pluginconf.telescope' require 'pluginconf.indent-blankline' +require 'pluginconf.nvim-tree' diff --git a/home/.config/nvim/lua/pluginconf/nvim-tree.lua b/home/.config/nvim/lua/pluginconf/nvim-tree.lua new file mode 100644 index 00000000..81be0bf4 --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/nvim-tree.lua @@ -0,0 +1 @@ +require'nvim-tree'.setup {} From 4aeaf540b7c1d051a7a4a46104b4c0ac66a410c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 3 Dec 2021 20:13:12 +0200 Subject: [PATCH 0938/2667] Nvim: enable nvim-tree --- home/.config/nvim/init.lua | 1 + home/.config/nvim/lua/pluginconf/nvim-tree.lua | 1 + 2 files changed, 2 insertions(+) create mode 100644 home/.config/nvim/lua/pluginconf/nvim-tree.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index d70a0eb8..80889247 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -11,3 +11,4 @@ require 'pluginconf.completion' require 'pluginconf.treesitter' require 'pluginconf.telescope' require 'pluginconf.indent-blankline' +require 'pluginconf.nvim-tree' diff --git a/home/.config/nvim/lua/pluginconf/nvim-tree.lua b/home/.config/nvim/lua/pluginconf/nvim-tree.lua new file mode 100644 index 00000000..81be0bf4 --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/nvim-tree.lua @@ -0,0 +1 @@ +require'nvim-tree'.setup {} From 16cde14ddd96bd6f6d7be23cd9b81987e2c68575 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Dec 2021 11:43:26 +0200 Subject: [PATCH 0939/2667] Nvim: improve pager mode and other fixes --- home/.config/nvim/init.lua | 1 + home/.config/nvim/lua/common.lua | 5 +++++ home/.config/nvim/lua/keybinds.lua | 28 ++++++++++-------------- home/.config/nvim/lua/pager.lua | 5 +++++ home/.config/nvim/lua/pluginconf/lsp.lua | 2 +- home/.config/zsh/01-env.zsh | 5 +++-- 6 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 home/.config/nvim/lua/common.lua create mode 100644 home/.config/nvim/lua/pager.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 80889247..beecaa3b 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -2,6 +2,7 @@ require 'pluginmanager' require 'autocmd' require 'keybinds' require 'settings' +require 'common' -- Plugin configurations require 'pluginconf.lualine' diff --git a/home/.config/nvim/lua/common.lua b/home/.config/nvim/lua/common.lua new file mode 100644 index 00000000..6a974d57 --- /dev/null +++ b/home/.config/nvim/lua/common.lua @@ -0,0 +1,5 @@ +function MapKey(mode, keybind, command, opts) + local options = {noremap = true} + if opts then options = vim.tbl_extend('force', options, opts) end + vim.api.nvim_set_keymap(mode, keybind, command, options) +end diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index 198a667d..21f6d915 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -1,27 +1,23 @@ -local function map(mode, lhs, rhs, opts) - local options = {noremap = true} - if opts then options = vim.tbl_extend('force', options, opts) end - vim.api.nvim_set_keymap(mode, lhs, rhs, options) -end +require 'common' -- Open/close tree browser -map('n', '', 'NvimTreeToggle') +MapKey('n', '', 'NvimTreeToggle') -- Telescope -map('n', '', 'Telescope find_files find_command=fd,-Ht,f') -map('n', '', 'Telescope live_grep') +MapKey('n', '', 'Telescope find_files find_command=fd,-Ht,f') +MapKey('n', '', 'Telescope live_grep') -- Completion -- Navigate completions with tab and shift tab -map('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) -map('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) +MapKey('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) +MapKey('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) -- Navigate between buffers -map('n', '', ':bn', {silent = true}) -map('n', '', ':bp', {silent = true}) +MapKey('n', '', ':bn', {silent = true}) +MapKey('n', '', ':bp', {silent = true}) -- Navigate between splits -map('n', '', '') -map('n', '', '') -map('n', '', '') -map('n', '', '') +MapKey('n', '', '') +MapKey('n', '', '') +MapKey('n', '', '') +MapKey('n', '', '') diff --git a/home/.config/nvim/lua/pager.lua b/home/.config/nvim/lua/pager.lua new file mode 100644 index 00000000..1534a445 --- /dev/null +++ b/home/.config/nvim/lua/pager.lua @@ -0,0 +1,5 @@ +-- Settings for pager mode +require 'common' + +MapKey('n', 'q', 'q') +--vim.cmd('set nomodifiable') diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 51bfe6ef..3aef5424 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -50,7 +50,7 @@ lsp_installer.on_server_ready(function(server) local opts = {} -- Lua specific settings - if server_name == "sumneko_lua" then + if server.name == "sumneko_lua" then local runtime_path = vim.split(package.path, ';') opts.settings = { Lua = { diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 55c9213d..7092c729 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -50,10 +50,11 @@ export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim -export PAGER="$EDITOR -R" +export PAGER="$EDITOR -R +\"lua require 'pager'\"" +export GIT_PAGER="$EDITOR -R +\"lua require 'pager'\" \"Git log\"" export PARU_PAGER="$PAGER -c 'set ft=PKGBUILD'" export AUR_PAGER=$PAGER -export MANPAGER="$EDITOR +Man!" +export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" # Use GPG for SSH authentication export GPG_TTY="$(tty)" From 432ee57180fb6151eb13d51e4a11c150114df934 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Dec 2021 11:43:26 +0200 Subject: [PATCH 0940/2667] Nvim: improve pager mode and other fixes --- home/.config/nvim/init.lua | 1 + home/.config/nvim/lua/common.lua | 5 +++++ home/.config/nvim/lua/keybinds.lua | 28 ++++++++++-------------- home/.config/nvim/lua/pager.lua | 5 +++++ home/.config/nvim/lua/pluginconf/lsp.lua | 2 +- home/.config/zsh/01-env.zsh | 5 +++-- 6 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 home/.config/nvim/lua/common.lua create mode 100644 home/.config/nvim/lua/pager.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 80889247..beecaa3b 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -2,6 +2,7 @@ require 'pluginmanager' require 'autocmd' require 'keybinds' require 'settings' +require 'common' -- Plugin configurations require 'pluginconf.lualine' diff --git a/home/.config/nvim/lua/common.lua b/home/.config/nvim/lua/common.lua new file mode 100644 index 00000000..6a974d57 --- /dev/null +++ b/home/.config/nvim/lua/common.lua @@ -0,0 +1,5 @@ +function MapKey(mode, keybind, command, opts) + local options = {noremap = true} + if opts then options = vim.tbl_extend('force', options, opts) end + vim.api.nvim_set_keymap(mode, keybind, command, options) +end diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index 198a667d..21f6d915 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -1,27 +1,23 @@ -local function map(mode, lhs, rhs, opts) - local options = {noremap = true} - if opts then options = vim.tbl_extend('force', options, opts) end - vim.api.nvim_set_keymap(mode, lhs, rhs, options) -end +require 'common' -- Open/close tree browser -map('n', '', 'NvimTreeToggle') +MapKey('n', '', 'NvimTreeToggle') -- Telescope -map('n', '', 'Telescope find_files find_command=fd,-Ht,f') -map('n', '', 'Telescope live_grep') +MapKey('n', '', 'Telescope find_files find_command=fd,-Ht,f') +MapKey('n', '', 'Telescope live_grep') -- Completion -- Navigate completions with tab and shift tab -map('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) -map('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) +MapKey('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) +MapKey('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) -- Navigate between buffers -map('n', '', ':bn', {silent = true}) -map('n', '', ':bp', {silent = true}) +MapKey('n', '', ':bn', {silent = true}) +MapKey('n', '', ':bp', {silent = true}) -- Navigate between splits -map('n', '', '') -map('n', '', '') -map('n', '', '') -map('n', '', '') +MapKey('n', '', '') +MapKey('n', '', '') +MapKey('n', '', '') +MapKey('n', '', '') diff --git a/home/.config/nvim/lua/pager.lua b/home/.config/nvim/lua/pager.lua new file mode 100644 index 00000000..1534a445 --- /dev/null +++ b/home/.config/nvim/lua/pager.lua @@ -0,0 +1,5 @@ +-- Settings for pager mode +require 'common' + +MapKey('n', 'q', 'q') +--vim.cmd('set nomodifiable') diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 51bfe6ef..3aef5424 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -50,7 +50,7 @@ lsp_installer.on_server_ready(function(server) local opts = {} -- Lua specific settings - if server_name == "sumneko_lua" then + if server.name == "sumneko_lua" then local runtime_path = vim.split(package.path, ';') opts.settings = { Lua = { diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 55c9213d..7092c729 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -50,10 +50,11 @@ export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim -export PAGER="$EDITOR -R" +export PAGER="$EDITOR -R +\"lua require 'pager'\"" +export GIT_PAGER="$EDITOR -R +\"lua require 'pager'\" \"Git log\"" export PARU_PAGER="$PAGER -c 'set ft=PKGBUILD'" export AUR_PAGER=$PAGER -export MANPAGER="$EDITOR +Man!" +export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" # Use GPG for SSH authentication export GPG_TTY="$(tty)" From 7cf9f0f2266578812b7b79609672eba1af2bb0b9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Dec 2021 16:38:50 +0200 Subject: [PATCH 0941/2667] Switch from efistub to systemd-boot and mkinitcpio efistub generation --- config-root.yaml | 10 +++++++++- root/boot/loader/entries/arch-busybox.conf | 5 ----- root/boot/loader/entries/arch-systemd.conf | 5 ----- root/etc/kernel/cmdline | 1 + root/etc/mkinitcpio.d/linux-lts.preset | 13 +++++++++++++ root/etc/mkinitcpio.d/linux.preset | 13 +++++++++++++ 6 files changed, 36 insertions(+), 11 deletions(-) delete mode 100755 root/boot/loader/entries/arch-busybox.conf delete mode 100755 root/boot/loader/entries/arch-systemd.conf create mode 100644 root/etc/kernel/cmdline create mode 100644 root/etc/mkinitcpio.d/linux-lts.preset create mode 100644 root/etc/mkinitcpio.d/linux.preset diff --git a/config-root.yaml b/config-root.yaml index f4b22ec4..ec20ac82 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -104,6 +104,12 @@ dotfiles: f_pacserve.service.conf: src: etc/pacserve/pacserve.service.conf dst: /etc/pacserve/pacserve.service.conf + d_mkinitcpio.d: + src: etc/mkinitcpio.d + dst: /etc/mkinitcpio.d + f_cmdline: + src: etc/kernel/cmdline + dst: /etc/kernel/cmdline profiles: Network: dotfiles: @@ -138,6 +144,8 @@ profiles: - f_20-quiet-printk.conf - f_system.conf - f_cpupower + - d_mkinitcpio.d + - f_cmdline include: - Locale - Pacman @@ -165,4 +173,4 @@ profiles: - Pacman mko-laptop: dotfiles: - - f_cpupower + - f_cpupower diff --git a/root/boot/loader/entries/arch-busybox.conf b/root/boot/loader/entries/arch-busybox.conf deleted file mode 100755 index db073af3..00000000 --- a/root/boot/loader/entries/arch-busybox.conf +++ /dev/null @@ -1,5 +0,0 @@ -title Arch Linux -initrd /amd-ucode.img -initrd /initramfs-linux.img -linux /vmlinuz-linux -options cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo diff --git a/root/boot/loader/entries/arch-systemd.conf b/root/boot/loader/entries/arch-systemd.conf deleted file mode 100755 index 3592520f..00000000 --- a/root/boot/loader/entries/arch-systemd.conf +++ /dev/null @@ -1,5 +0,0 @@ -title Arch Linux -initrd /amd-ucode.img -initrd /initramfs-linux.img -linux /vmlinuz-linux -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline new file mode 100644 index 00000000..7a76f4e2 --- /dev/null +++ b/root/etc/kernel/cmdline @@ -0,0 +1 @@ +cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff bgrt_disable diff --git a/root/etc/mkinitcpio.d/linux-lts.preset b/root/etc/mkinitcpio.d/linux-lts.preset new file mode 100644 index 00000000..f053323c --- /dev/null +++ b/root/etc/mkinitcpio.d/linux-lts.preset @@ -0,0 +1,13 @@ +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux-lts" +ALL_microcode=(/boot/*-ucode.img) + +PRESETS=('default' 'fallback') + +default_image="/boot/initramfs-linux-lts.img" +default_efi_image="/boot/EFI/Linux/archlinux-linux-lts.efi" +default_options="--splash /usr/share/systemd/bootctl/splash-arch.bmp" + +fallback_image="/boot/initramfs-linux-lts-fallback.img" +fallback_efi_image="/boot/EFI/Linux/archlinux-linux-lts-fallback.efi" +fallback_options="-S autodetect --splash /usr/share/systemd/bootctl/splash-arch.bmp" diff --git a/root/etc/mkinitcpio.d/linux.preset b/root/etc/mkinitcpio.d/linux.preset new file mode 100644 index 00000000..4f1f69d9 --- /dev/null +++ b/root/etc/mkinitcpio.d/linux.preset @@ -0,0 +1,13 @@ +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux" +ALL_microcode=(/boot/*-ucode.img) + +PRESETS=('default' 'fallback') + +default_image="/boot/initramfs-linux.img" +default_efi_image="/boot/EFI/Linux/archlinux-linux.efi" +default_options="--splash /usr/share/systemd/bootctl/splash-arch.bmp" + +fallback_image="/boot/initramfs-linux-fallback.img" +fallback_efi_image="/boot/EFI/Linux/archlinux-linux-fallback.efi" +fallback_options="-S autodetect --splash /usr/share/systemd/bootctl/splash-arch.bmp" From eead44d29e448273b3916d423b9e2fab684b4e5f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Dec 2021 16:38:50 +0200 Subject: [PATCH 0942/2667] Switch from efistub to systemd-boot and mkinitcpio efistub generation --- config-root.yaml | 10 +++++++++- root/boot/loader/entries/arch-busybox.conf | 5 ----- root/boot/loader/entries/arch-systemd.conf | 5 ----- root/etc/kernel/cmdline | 1 + root/etc/mkinitcpio.d/linux-lts.preset | 13 +++++++++++++ root/etc/mkinitcpio.d/linux.preset | 13 +++++++++++++ 6 files changed, 36 insertions(+), 11 deletions(-) delete mode 100755 root/boot/loader/entries/arch-busybox.conf delete mode 100755 root/boot/loader/entries/arch-systemd.conf create mode 100644 root/etc/kernel/cmdline create mode 100644 root/etc/mkinitcpio.d/linux-lts.preset create mode 100644 root/etc/mkinitcpio.d/linux.preset diff --git a/config-root.yaml b/config-root.yaml index f4b22ec4..ec20ac82 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -104,6 +104,12 @@ dotfiles: f_pacserve.service.conf: src: etc/pacserve/pacserve.service.conf dst: /etc/pacserve/pacserve.service.conf + d_mkinitcpio.d: + src: etc/mkinitcpio.d + dst: /etc/mkinitcpio.d + f_cmdline: + src: etc/kernel/cmdline + dst: /etc/kernel/cmdline profiles: Network: dotfiles: @@ -138,6 +144,8 @@ profiles: - f_20-quiet-printk.conf - f_system.conf - f_cpupower + - d_mkinitcpio.d + - f_cmdline include: - Locale - Pacman @@ -165,4 +173,4 @@ profiles: - Pacman mko-laptop: dotfiles: - - f_cpupower + - f_cpupower diff --git a/root/boot/loader/entries/arch-busybox.conf b/root/boot/loader/entries/arch-busybox.conf deleted file mode 100755 index db073af3..00000000 --- a/root/boot/loader/entries/arch-busybox.conf +++ /dev/null @@ -1,5 +0,0 @@ -title Arch Linux -initrd /amd-ucode.img -initrd /initramfs-linux.img -linux /vmlinuz-linux -options cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo diff --git a/root/boot/loader/entries/arch-systemd.conf b/root/boot/loader/entries/arch-systemd.conf deleted file mode 100755 index 3592520f..00000000 --- a/root/boot/loader/entries/arch-systemd.conf +++ /dev/null @@ -1,5 +0,0 @@ -title Arch Linux -initrd /amd-ucode.img -initrd /initramfs-linux.img -linux /vmlinuz-linux -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline new file mode 100644 index 00000000..7a76f4e2 --- /dev/null +++ b/root/etc/kernel/cmdline @@ -0,0 +1 @@ +cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff bgrt_disable diff --git a/root/etc/mkinitcpio.d/linux-lts.preset b/root/etc/mkinitcpio.d/linux-lts.preset new file mode 100644 index 00000000..f053323c --- /dev/null +++ b/root/etc/mkinitcpio.d/linux-lts.preset @@ -0,0 +1,13 @@ +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux-lts" +ALL_microcode=(/boot/*-ucode.img) + +PRESETS=('default' 'fallback') + +default_image="/boot/initramfs-linux-lts.img" +default_efi_image="/boot/EFI/Linux/archlinux-linux-lts.efi" +default_options="--splash /usr/share/systemd/bootctl/splash-arch.bmp" + +fallback_image="/boot/initramfs-linux-lts-fallback.img" +fallback_efi_image="/boot/EFI/Linux/archlinux-linux-lts-fallback.efi" +fallback_options="-S autodetect --splash /usr/share/systemd/bootctl/splash-arch.bmp" diff --git a/root/etc/mkinitcpio.d/linux.preset b/root/etc/mkinitcpio.d/linux.preset new file mode 100644 index 00000000..4f1f69d9 --- /dev/null +++ b/root/etc/mkinitcpio.d/linux.preset @@ -0,0 +1,13 @@ +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux" +ALL_microcode=(/boot/*-ucode.img) + +PRESETS=('default' 'fallback') + +default_image="/boot/initramfs-linux.img" +default_efi_image="/boot/EFI/Linux/archlinux-linux.efi" +default_options="--splash /usr/share/systemd/bootctl/splash-arch.bmp" + +fallback_image="/boot/initramfs-linux-fallback.img" +fallback_efi_image="/boot/EFI/Linux/archlinux-linux-fallback.efi" +fallback_options="-S autodetect --splash /usr/share/systemd/bootctl/splash-arch.bmp" From 9d9acac6f8b7081e1b5854e4edd1d63c4549a536 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Dec 2021 16:43:56 +0200 Subject: [PATCH 0943/2667] Update systemd-boot config --- config-root.yaml | 4 ++++ root/boot/loader/loader.conf | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index ec20ac82..5d2229a4 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -110,6 +110,9 @@ dotfiles: f_cmdline: src: etc/kernel/cmdline dst: /etc/kernel/cmdline + f_loader.conf: + src: boot/loader/loader.conf + dst: /boot/loader/loader.conf profiles: Network: dotfiles: @@ -146,6 +149,7 @@ profiles: - f_cpupower - d_mkinitcpio.d - f_cmdline + - f_loader.conf include: - Locale - Pacman diff --git a/root/boot/loader/loader.conf b/root/boot/loader/loader.conf index 62bce553..9fe3fd7f 100755 --- a/root/boot/loader/loader.conf +++ b/root/boot/loader/loader.conf @@ -1,3 +1 @@ -default arch-busybox timeout 0 -editor 0 From 71582b9bdf17a457e44938a350335a15cfc56633 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Dec 2021 16:43:56 +0200 Subject: [PATCH 0944/2667] Update systemd-boot config --- config-root.yaml | 4 ++++ root/boot/loader/loader.conf | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config-root.yaml b/config-root.yaml index ec20ac82..5d2229a4 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -110,6 +110,9 @@ dotfiles: f_cmdline: src: etc/kernel/cmdline dst: /etc/kernel/cmdline + f_loader.conf: + src: boot/loader/loader.conf + dst: /boot/loader/loader.conf profiles: Network: dotfiles: @@ -146,6 +149,7 @@ profiles: - f_cpupower - d_mkinitcpio.d - f_cmdline + - f_loader.conf include: - Locale - Pacman diff --git a/root/boot/loader/loader.conf b/root/boot/loader/loader.conf index 62bce553..9fe3fd7f 100755 --- a/root/boot/loader/loader.conf +++ b/root/boot/loader/loader.conf @@ -1,3 +1 @@ -default arch-busybox timeout 0 -editor 0 From 2b0b1bd876ee9aa47f95687d16630044e6a14b7d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Dec 2021 00:12:24 +0200 Subject: [PATCH 0945/2667] Tmux: enable mouse support --- home/.tmux.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.tmux.conf b/home/.tmux.conf index 58b4a55a..e09db8d7 100644 --- a/home/.tmux.conf +++ b/home/.tmux.conf @@ -12,3 +12,6 @@ set-option -ga terminal-overrides ",*256col*:Tc" # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) run -b '~/.tmux/plugins/tpm/tpm' + +# Enable mouse +set -g mouse on From 2b20c0e4f76f4ef2a22b1f6caf1a8ce864e6a573 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Dec 2021 00:12:24 +0200 Subject: [PATCH 0946/2667] Tmux: enable mouse support --- home/.tmux.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.tmux.conf b/home/.tmux.conf index 58b4a55a..e09db8d7 100644 --- a/home/.tmux.conf +++ b/home/.tmux.conf @@ -12,3 +12,6 @@ set-option -ga terminal-overrides ",*256col*:Tc" # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) run -b '~/.tmux/plugins/tpm/tpm' + +# Enable mouse +set -g mouse on From 30580d3be9cecb440e7ff4f4c8d92fe83a4eccc0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Dec 2021 00:12:45 +0200 Subject: [PATCH 0947/2667] Remove bat --- home/.config/zsh/03-aliases.zsh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 20be0f3c..6fafb777 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -5,8 +5,7 @@ alias gs='git status' alias gpull='git pull' alias gpush='git push' -# Modern replacements for cat and ls -alias cat='bat --paging=never' +# Modern replacement for ls alias ls='exa' {%@@ if profile != "mko-laptop" @@%} From c7bdd8a74065bad87c88a0be5e92af30e22de505 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Dec 2021 00:12:45 +0200 Subject: [PATCH 0948/2667] Remove bat --- home/.config/zsh/03-aliases.zsh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 20be0f3c..6fafb777 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -5,8 +5,7 @@ alias gs='git status' alias gpull='git pull' alias gpush='git push' -# Modern replacements for cat and ls -alias cat='bat --paging=never' +# Modern replacement for ls alias ls='exa' {%@@ if profile != "mko-laptop" @@%} From 2f2124d055ca7cfcee254222d2b5e213c0acd507 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Dec 2021 00:13:32 +0200 Subject: [PATCH 0949/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 56911eb6..8c97593c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 56911eb6fd028bc3a9f86b670825e035c5c92200 +Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa From 0052ea28f8c5163b3ae6966403e9b6d908f8c957 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Dec 2021 00:13:32 +0200 Subject: [PATCH 0950/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 56911eb6..8c97593c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 56911eb6fd028bc3a9f86b670825e035c5c92200 +Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa From 10d7142b695966bb173d68fd284d060896242057 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Dec 2021 00:19:49 +0200 Subject: [PATCH 0951/2667] Change colorscheme --- home/.config/foot/foot.ini | 36 ++++++------ home/.config/nvim/init.lua | 1 + .../nvim/lua/pluginconf/colorscheme.lua | 56 +++++++++++++++++++ home/.config/nvim/lua/pluginconf/lualine.lua | 2 +- home/.config/nvim/lua/pluginmanager.lua | 12 ++-- home/.config/nvim/lua/settings.lua | 3 - 6 files changed, 82 insertions(+), 28 deletions(-) create mode 100644 home/.config/nvim/lua/pluginconf/colorscheme.lua diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini index 00ddce03..ca08a5bf 100644 --- a/home/.config/foot/foot.ini +++ b/home/.config/foot/foot.ini @@ -10,21 +10,21 @@ blink=yes hide-when-typing=yes [colors] -foreground=CDCECF -background=192330 -regular0=393B44 -regular1=C94F6D -regular2=81B29A -regular3=DBC074 -regular4=719CD6 -regular5=9D79D6 -regular6=63CDCF -regular7=DFDFE0 -bright0=7F8C98 -bright1=D6616B -bright2=58CD8B -bright3=FFE37E -bright4=84CEE4 -bright5=B8A1E3 -bright6=59F0FF -bright7=F2F2F2 +foreground = D7DAE0 +background = 1E1E28 +regular0 = 6E6C7C +regular1 = E28C8C +regular2 = B3E1A3 +regular3 = EADDA0 +regular4 = A4B9EF +regular5 = C6AAE8 +regular6 = F0AFE1 +regular7 = D7DAE0 +bright0 = 6E6C7C +bright1 = E28C8C +bright2 = B3E1A3 +bright3 = EADDA0 +bright4 = A4B9EF +bright5 = C6AAE8 +bright6 = F0AFE1 +bright7 = D7DAE0 diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index beecaa3b..f1cce2a0 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -13,3 +13,4 @@ require 'pluginconf.treesitter' require 'pluginconf.telescope' require 'pluginconf.indent-blankline' require 'pluginconf.nvim-tree' +require 'pluginconf.colorscheme' diff --git a/home/.config/nvim/lua/pluginconf/colorscheme.lua b/home/.config/nvim/lua/pluginconf/colorscheme.lua new file mode 100644 index 00000000..46056f78 --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/colorscheme.lua @@ -0,0 +1,56 @@ +require("catppuccin").setup( + { + transparent_background = false, + term_colors = false, + styles = { + comments = "italic", + functions = "italic", + keywords = "italic", + strings = "NONE", + variables = "NONE", + }, + integrations = { + treesitter = true, + native_lsp = { + enabled = true, + virtual_text = { + errors = "italic", + hints = "italic", + warnings = "italic", + information = "italic", + }, + underlines = { + errors = "underline", + hints = "underline", + warnings = "underline", + information = "underline", + }, + }, + lsp_trouble = false, + lsp_saga = false, + gitgutter = true, + gitsigns = false, + telescope = true, + nvimtree = { + enabled = false, + show_root = false, + }, + which_key = false, + indent_blankline = { + enabled = true, + colored_indent_levels = false, + }, + dashboard = false, + neogit = false, + vim_sneak = false, + fern = false, + barbar = false, + bufferline = false, + markdown = false, + lightspeed = false, + ts_rainbow = false, + hop = false, + }, + } +) +vim.cmd[[colorscheme catppuccin]] diff --git a/home/.config/nvim/lua/pluginconf/lualine.lua b/home/.config/nvim/lua/pluginconf/lualine.lua index 2479044b..205c0bbe 100644 --- a/home/.config/nvim/lua/pluginconf/lualine.lua +++ b/home/.config/nvim/lua/pluginconf/lualine.lua @@ -1,3 +1,3 @@ require'lualine'.setup { - options = {theme = 'onedark'}, + options = {theme = 'catppuccin'}, } diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index a4a42e44..5a2b07ff 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -20,7 +20,7 @@ require('packer').startup(function() use {'wbthomason/packer.nvim', opt = true} -- Colorscheme - use 'EdenEast/nightfox.nvim' + use({"catppuccin/nvim", as = "catppuccin"}) -- Git in signcolumn use 'airblade/vim-gitgutter' @@ -65,11 +65,11 @@ require('packer').startup(function() use 'williamboman/nvim-lsp-installer' -- Completion - use 'hrsh7th/nvim-cmp' -- Autocompletion plugin - use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp - use 'hrsh7th/cmp-path' -- Path source for nvim-cmp - use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp - use 'L3MON4D3/LuaSnip' -- Snippets plugin + use 'hrsh7th/nvim-cmp' -- Autocompletion plugin + use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp + use 'hrsh7th/cmp-path' -- Path source for nvim-cmp + use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp + use 'L3MON4D3/LuaSnip' -- Snippets plugin -- treesitter syntax highlight use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 57bd0d71..8ff34740 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -4,9 +4,6 @@ local cmd = vim.cmd ------ Appearance ------ --- Set colorscheme -require('nightfox').load() - -- True colors o.termguicolors = true From 5411c2f5e72f05076dcf176e1d0587a1b16a95d4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Dec 2021 00:19:49 +0200 Subject: [PATCH 0952/2667] Change colorscheme --- home/.config/foot/foot.ini | 36 ++++++------ home/.config/nvim/init.lua | 1 + .../nvim/lua/pluginconf/colorscheme.lua | 56 +++++++++++++++++++ home/.config/nvim/lua/pluginconf/lualine.lua | 2 +- home/.config/nvim/lua/pluginmanager.lua | 12 ++-- home/.config/nvim/lua/settings.lua | 3 - 6 files changed, 82 insertions(+), 28 deletions(-) create mode 100644 home/.config/nvim/lua/pluginconf/colorscheme.lua diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini index 00ddce03..ca08a5bf 100644 --- a/home/.config/foot/foot.ini +++ b/home/.config/foot/foot.ini @@ -10,21 +10,21 @@ blink=yes hide-when-typing=yes [colors] -foreground=CDCECF -background=192330 -regular0=393B44 -regular1=C94F6D -regular2=81B29A -regular3=DBC074 -regular4=719CD6 -regular5=9D79D6 -regular6=63CDCF -regular7=DFDFE0 -bright0=7F8C98 -bright1=D6616B -bright2=58CD8B -bright3=FFE37E -bright4=84CEE4 -bright5=B8A1E3 -bright6=59F0FF -bright7=F2F2F2 +foreground = D7DAE0 +background = 1E1E28 +regular0 = 6E6C7C +regular1 = E28C8C +regular2 = B3E1A3 +regular3 = EADDA0 +regular4 = A4B9EF +regular5 = C6AAE8 +regular6 = F0AFE1 +regular7 = D7DAE0 +bright0 = 6E6C7C +bright1 = E28C8C +bright2 = B3E1A3 +bright3 = EADDA0 +bright4 = A4B9EF +bright5 = C6AAE8 +bright6 = F0AFE1 +bright7 = D7DAE0 diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index beecaa3b..f1cce2a0 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -13,3 +13,4 @@ require 'pluginconf.treesitter' require 'pluginconf.telescope' require 'pluginconf.indent-blankline' require 'pluginconf.nvim-tree' +require 'pluginconf.colorscheme' diff --git a/home/.config/nvim/lua/pluginconf/colorscheme.lua b/home/.config/nvim/lua/pluginconf/colorscheme.lua new file mode 100644 index 00000000..46056f78 --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/colorscheme.lua @@ -0,0 +1,56 @@ +require("catppuccin").setup( + { + transparent_background = false, + term_colors = false, + styles = { + comments = "italic", + functions = "italic", + keywords = "italic", + strings = "NONE", + variables = "NONE", + }, + integrations = { + treesitter = true, + native_lsp = { + enabled = true, + virtual_text = { + errors = "italic", + hints = "italic", + warnings = "italic", + information = "italic", + }, + underlines = { + errors = "underline", + hints = "underline", + warnings = "underline", + information = "underline", + }, + }, + lsp_trouble = false, + lsp_saga = false, + gitgutter = true, + gitsigns = false, + telescope = true, + nvimtree = { + enabled = false, + show_root = false, + }, + which_key = false, + indent_blankline = { + enabled = true, + colored_indent_levels = false, + }, + dashboard = false, + neogit = false, + vim_sneak = false, + fern = false, + barbar = false, + bufferline = false, + markdown = false, + lightspeed = false, + ts_rainbow = false, + hop = false, + }, + } +) +vim.cmd[[colorscheme catppuccin]] diff --git a/home/.config/nvim/lua/pluginconf/lualine.lua b/home/.config/nvim/lua/pluginconf/lualine.lua index 2479044b..205c0bbe 100644 --- a/home/.config/nvim/lua/pluginconf/lualine.lua +++ b/home/.config/nvim/lua/pluginconf/lualine.lua @@ -1,3 +1,3 @@ require'lualine'.setup { - options = {theme = 'onedark'}, + options = {theme = 'catppuccin'}, } diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index a4a42e44..5a2b07ff 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -20,7 +20,7 @@ require('packer').startup(function() use {'wbthomason/packer.nvim', opt = true} -- Colorscheme - use 'EdenEast/nightfox.nvim' + use({"catppuccin/nvim", as = "catppuccin"}) -- Git in signcolumn use 'airblade/vim-gitgutter' @@ -65,11 +65,11 @@ require('packer').startup(function() use 'williamboman/nvim-lsp-installer' -- Completion - use 'hrsh7th/nvim-cmp' -- Autocompletion plugin - use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp - use 'hrsh7th/cmp-path' -- Path source for nvim-cmp - use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp - use 'L3MON4D3/LuaSnip' -- Snippets plugin + use 'hrsh7th/nvim-cmp' -- Autocompletion plugin + use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp + use 'hrsh7th/cmp-path' -- Path source for nvim-cmp + use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp + use 'L3MON4D3/LuaSnip' -- Snippets plugin -- treesitter syntax highlight use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 57bd0d71..8ff34740 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -4,9 +4,6 @@ local cmd = vim.cmd ------ Appearance ------ --- Set colorscheme -require('nightfox').load() - -- True colors o.termguicolors = true From 907e13f5796373edf5ec43a5402de54770132486 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 6 Jan 2022 12:47:07 +0200 Subject: [PATCH 0953/2667] Update some paths --- dotdrop | 2 +- home/.config/mpd/mpd.conf | 4 ++-- home/.config/sway/conf.d/01-vars.conf | 2 +- home/.config/user-dirs.dirs | 8 -------- 4 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 home/.config/user-dirs.dirs diff --git a/dotdrop b/dotdrop index 8c97593c..296c179f 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa +Subproject commit 296c179f626397e6e53da9ae51d5108e0f11cf59 diff --git a/home/.config/mpd/mpd.conf b/home/.config/mpd/mpd.conf index 0e05ab85..01504433 100644 --- a/home/.config/mpd/mpd.conf +++ b/home/.config/mpd/mpd.conf @@ -1,5 +1,5 @@ -music_directory "~/music" -playlist_directory "~/music/Playlists" +music_directory "~/Music" +playlist_directory "~/Music/Playlists" db_file "~/.mpd/database" log_file "~/.mpd/log" pid_file "~/.mpd/pid" diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index dade25d0..3cad05bf 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -3,5 +3,5 @@ set $mod Mod4 set $term footclient set $gnome-schema org.gnome.desktop.interface -set $wallpaper ~/pictures/Wallpapers/random/$(ls ~/pictures/Wallpapers/random | sort -R | tail -n 1) +set $wallpaper ~/Pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) set $scripts ~/.config/sway/scripts diff --git a/home/.config/user-dirs.dirs b/home/.config/user-dirs.dirs deleted file mode 100644 index 99266f46..00000000 --- a/home/.config/user-dirs.dirs +++ /dev/null @@ -1,8 +0,0 @@ -XDG_DESKTOP_DIR="$HOME/desktop" -XDG_DOWNLOAD_DIR="$HOME/downloads" -XDG_TEMPLATES_DIR="$HOME/templates" -XDG_PUBLICSHARE_DIR="$HOME/public" -XDG_DOCUMENTS_DIR="$HOME/documents" -XDG_MUSIC_DIR="$HOME/music" -XDG_PICTURES_DIR="$HOME/pictures" -XDG_VIDEOS_DIR="$HOME/videos" From 34e9c50de8f34cc642f0087b7e87db38af8f5401 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 6 Jan 2022 12:47:07 +0200 Subject: [PATCH 0954/2667] Update some paths --- dotdrop | 2 +- home/.config/mpd/mpd.conf | 4 ++-- home/.config/sway/conf.d/01-vars.conf | 2 +- home/.config/user-dirs.dirs | 8 -------- 4 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 home/.config/user-dirs.dirs diff --git a/dotdrop b/dotdrop index 8c97593c..296c179f 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa +Subproject commit 296c179f626397e6e53da9ae51d5108e0f11cf59 diff --git a/home/.config/mpd/mpd.conf b/home/.config/mpd/mpd.conf index 0e05ab85..01504433 100644 --- a/home/.config/mpd/mpd.conf +++ b/home/.config/mpd/mpd.conf @@ -1,5 +1,5 @@ -music_directory "~/music" -playlist_directory "~/music/Playlists" +music_directory "~/Music" +playlist_directory "~/Music/Playlists" db_file "~/.mpd/database" log_file "~/.mpd/log" pid_file "~/.mpd/pid" diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index dade25d0..3cad05bf 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -3,5 +3,5 @@ set $mod Mod4 set $term footclient set $gnome-schema org.gnome.desktop.interface -set $wallpaper ~/pictures/Wallpapers/random/$(ls ~/pictures/Wallpapers/random | sort -R | tail -n 1) +set $wallpaper ~/Pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) set $scripts ~/.config/sway/scripts diff --git a/home/.config/user-dirs.dirs b/home/.config/user-dirs.dirs deleted file mode 100644 index 99266f46..00000000 --- a/home/.config/user-dirs.dirs +++ /dev/null @@ -1,8 +0,0 @@ -XDG_DESKTOP_DIR="$HOME/desktop" -XDG_DOWNLOAD_DIR="$HOME/downloads" -XDG_TEMPLATES_DIR="$HOME/templates" -XDG_PUBLICSHARE_DIR="$HOME/public" -XDG_DOCUMENTS_DIR="$HOME/documents" -XDG_MUSIC_DIR="$HOME/music" -XDG_PICTURES_DIR="$HOME/pictures" -XDG_VIDEOS_DIR="$HOME/videos" From facd2b69a20001720815b94d8df3a232706fd9d4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 6 Jan 2022 12:53:18 +0200 Subject: [PATCH 0955/2667] Nvim: switch from telescope to fzf (I like the search algorithm better) --- home/.config/nvim/init.lua | 1 - .../.config/nvim/lua/pluginconf/telescope.lua | 36 ------------------- home/.config/nvim/lua/pluginmanager.lua | 7 ++-- 3 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 home/.config/nvim/lua/pluginconf/telescope.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index f1cce2a0..9c9d40ba 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -10,7 +10,6 @@ require 'pluginconf.bufferline' require 'pluginconf.lsp' require 'pluginconf.completion' require 'pluginconf.treesitter' -require 'pluginconf.telescope' require 'pluginconf.indent-blankline' require 'pluginconf.nvim-tree' require 'pluginconf.colorscheme' diff --git a/home/.config/nvim/lua/pluginconf/telescope.lua b/home/.config/nvim/lua/pluginconf/telescope.lua deleted file mode 100644 index e931d68a..00000000 --- a/home/.config/nvim/lua/pluginconf/telescope.lua +++ /dev/null @@ -1,36 +0,0 @@ -require('telescope').setup { - defaults = { - vimgrep_arguments = { - 'rg', '--hidden', '--color=never', '--no-heading', - '--with-filename', '--line-number', '--column', '--smart-case' - }, - prompt_prefix = "> ", - selection_caret = "> ", - entry_prefix = " ", - initial_mode = "insert", - selection_strategy = "reset", - sorting_strategy = "descending", - layout_strategy = "horizontal", - layout_config = { - horizontal = {mirror = false}, - vertical = {mirror = false} - }, - file_sorter = require'telescope.sorters'.get_fuzzy_file, - file_ignore_patterns = {}, - generic_sorter = require'telescope.sorters'.get_generic_fuzzy_sorter, - winblend = 0, - border = {}, - borderchars = {'─', '│', '─', '│', '╭', '╮', '╯', '╰'}, - color_devicons = true, - use_less = true, - path_display = {}, - set_env = {['COLORTERM'] = 'truecolor'}, -- default = nil, - file_previewer = require'telescope.previewers'.vim_buffer_cat.new, - grep_previewer = require'telescope.previewers'.vim_buffer_vimgrep.new, - qflist_previewer = require'telescope.previewers'.vim_buffer_qflist.new, - - -- Developer configurations: Not meant for general override - buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker - }, - pickers = {find_files = {find_command = {"fd", "-Ht", "f"}}} -} diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 5a2b07ff..0b3fca67 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -46,11 +46,8 @@ require('packer').startup(function() -- Tree explorer use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} - -- Telescope - use { - 'nvim-telescope/telescope.nvim', - requires = {{'nvim-lua/popup.nvim'}, {'nvim-lua/plenary.nvim'}} - } + -- FZF FTW + use 'junegunn/fzf.vim' -- Do stuff as sudo use 'lambdalisue/suda.vim' From 8427208a2aefd360bd4b0e81a6a16b051a8f8879 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 6 Jan 2022 12:53:18 +0200 Subject: [PATCH 0956/2667] Nvim: switch from telescope to fzf (I like the search algorithm better) --- home/.config/nvim/init.lua | 1 - .../.config/nvim/lua/pluginconf/telescope.lua | 36 ------------------- home/.config/nvim/lua/pluginmanager.lua | 7 ++-- 3 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 home/.config/nvim/lua/pluginconf/telescope.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index f1cce2a0..9c9d40ba 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -10,7 +10,6 @@ require 'pluginconf.bufferline' require 'pluginconf.lsp' require 'pluginconf.completion' require 'pluginconf.treesitter' -require 'pluginconf.telescope' require 'pluginconf.indent-blankline' require 'pluginconf.nvim-tree' require 'pluginconf.colorscheme' diff --git a/home/.config/nvim/lua/pluginconf/telescope.lua b/home/.config/nvim/lua/pluginconf/telescope.lua deleted file mode 100644 index e931d68a..00000000 --- a/home/.config/nvim/lua/pluginconf/telescope.lua +++ /dev/null @@ -1,36 +0,0 @@ -require('telescope').setup { - defaults = { - vimgrep_arguments = { - 'rg', '--hidden', '--color=never', '--no-heading', - '--with-filename', '--line-number', '--column', '--smart-case' - }, - prompt_prefix = "> ", - selection_caret = "> ", - entry_prefix = " ", - initial_mode = "insert", - selection_strategy = "reset", - sorting_strategy = "descending", - layout_strategy = "horizontal", - layout_config = { - horizontal = {mirror = false}, - vertical = {mirror = false} - }, - file_sorter = require'telescope.sorters'.get_fuzzy_file, - file_ignore_patterns = {}, - generic_sorter = require'telescope.sorters'.get_generic_fuzzy_sorter, - winblend = 0, - border = {}, - borderchars = {'─', '│', '─', '│', '╭', '╮', '╯', '╰'}, - color_devicons = true, - use_less = true, - path_display = {}, - set_env = {['COLORTERM'] = 'truecolor'}, -- default = nil, - file_previewer = require'telescope.previewers'.vim_buffer_cat.new, - grep_previewer = require'telescope.previewers'.vim_buffer_vimgrep.new, - qflist_previewer = require'telescope.previewers'.vim_buffer_qflist.new, - - -- Developer configurations: Not meant for general override - buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker - }, - pickers = {find_files = {find_command = {"fd", "-Ht", "f"}}} -} diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 5a2b07ff..0b3fca67 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -46,11 +46,8 @@ require('packer').startup(function() -- Tree explorer use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} - -- Telescope - use { - 'nvim-telescope/telescope.nvim', - requires = {{'nvim-lua/popup.nvim'}, {'nvim-lua/plenary.nvim'}} - } + -- FZF FTW + use 'junegunn/fzf.vim' -- Do stuff as sudo use 'lambdalisue/suda.vim' From cf224afe1e21820d6f8b914a5726717bd5a5436b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 15 Jan 2022 12:31:34 +0200 Subject: [PATCH 0957/2667] Traefik: move to toml configuration and common middlewares Also fixed nextcloud DAV resolution --- docker/authentik/docker-compose.yaml | 3 +-- docker/freshrss/docker-compose.yaml | 6 ++---- docker/gitea/docker-compose.yaml | 3 +-- docker/homeautomation/docker-compose.yaml | 9 +++------ docker/index.korhonen.cc/docker-compose.yaml | 3 +-- docker/jellyfin/docker-compose.yaml | 3 +-- docker/nextcloud/docker-compose.yaml | 6 +++--- docker/pihole/docker-compose.yaml | 3 +-- docker/remotely/docker-compose.yaml | 3 +-- docker/traefik/docker-compose.yaml | 7 ++++--- docker/tvheadend/docker-compose.yaml | 3 +-- dotdrop | 2 +- 12 files changed, 20 insertions(+), 31 deletions(-) diff --git a/docker/authentik/docker-compose.yaml b/docker/authentik/docker-compose.yaml index a5ee58d3..ec2161cd 100644 --- a/docker/authentik/docker-compose.yaml +++ b/docker/authentik/docker-compose.yaml @@ -29,8 +29,7 @@ services: - "traefik.http.routers.authentik-redirect.entrypoints=http" - "traefik.http.routers.authentik-redirect.rule=Host(`sso.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.authentik-redirect.middlewares=http2https" + - "traefik.http.routers.authentik-redirect.middlewares=http2https@file" - "traefik.http.routers.authentik.entrypoints=https" - "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)" diff --git a/docker/freshrss/docker-compose.yaml b/docker/freshrss/docker-compose.yaml index d04da176..b1bb806a 100644 --- a/docker/freshrss/docker-compose.yaml +++ b/docker/freshrss/docker-compose.yaml @@ -21,8 +21,7 @@ services: - "traefik.http.routers.freshrss-redirect.entrypoints=http" - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.freshrss-redirect.middlewares=http2https" + - "traefik.http.routers.freshrss-redirect.middlewares=http2https@file" - "traefik.http.routers.freshrss.entrypoints=https" - "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)" @@ -45,8 +44,7 @@ services: - "traefik.http.routers.bibliogram-redirect.entrypoints=http" - "traefik.http.routers.bibliogram-redirect.rule=Host(`bibliogram.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.bibliogram-redirect.middlewares=http2https" + - "traefik.http.routers.bibliogram-redirect.middlewares=http2https@file" - "traefik.http.routers.bibliogram.entrypoints=https" - "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)" diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 0a3a3b5a..1f1318ad 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -21,8 +21,7 @@ services: - "traefik.http.routers.gitea-redirect.entrypoints=http" - "traefik.http.routers.gitea-redirect.rule=Host(`git.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.gitea-redirect.middlewares=http2https" + - "traefik.http.routers.gitea-redirect.middlewares=http2https@file" - "traefik.http.routers.gitea.entrypoints=https" - "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)" diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index 937924d4..82b2ac88 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -24,8 +24,7 @@ services: - "traefik.http.routers.home-assistant-redirect.entrypoints=http" - "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.home-assistant-redirect.middlewares=http2https" + - "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file" - "traefik.http.routers.home-assistant.entrypoints=https" - "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)" @@ -87,8 +86,7 @@ services: - "traefik.http.routers.node-red-redirect.entrypoints=http" - "traefik.http.routers.node-red-redirect.rule=Host(`node.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.node-red-redirect.middlewares=http2https" + - "traefik.http.routers.node-red-redirect.middlewares=http2https@file" - "traefik.http.routers.node-red.entrypoints=https" - "traefik.http.routers.node-red.rule=Host(`node.korhonen.cc`)" @@ -113,8 +111,7 @@ services: - "traefik.http.routers.gotify-redirect.entrypoints=http" - "traefik.http.routers.gotify-redirect.rule=Host(`gotify.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.gotify-redirect.middlewares=http2https" + - "traefik.http.routers.gotify-redirect.middlewares=http2https@file" - "traefik.http.routers.gotify.entrypoints=https" - "traefik.http.routers.gotify.rule=Host(`gotify.korhonen.cc`)" diff --git a/docker/index.korhonen.cc/docker-compose.yaml b/docker/index.korhonen.cc/docker-compose.yaml index 78fba3ef..a14b852f 100644 --- a/docker/index.korhonen.cc/docker-compose.yaml +++ b/docker/index.korhonen.cc/docker-compose.yaml @@ -15,8 +15,7 @@ services: - "traefik.http.routers.index-redirect.entrypoints=http" - "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.index-redirect.middlewares=http2https" + - "traefik.http.routers.index-redirect.middlewares=http2https@file" - "traefik.http.routers.index.entrypoints=https" - "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)" diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index a4eb3eef..497c7abc 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -22,8 +22,7 @@ services: - "traefik.http.routers.jellyfin-redirect.entrypoints=http" - "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.jellyfin-redirect.middlewares=http2https" + - "traefik.http.routers.jellyfin-redirect.middlewares=http2https@file" - "traefik.http.routers.jellyfin.entrypoints=https" - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)" diff --git a/docker/nextcloud/docker-compose.yaml b/docker/nextcloud/docker-compose.yaml index ef28ba66..94b3e7ae 100644 --- a/docker/nextcloud/docker-compose.yaml +++ b/docker/nextcloud/docker-compose.yaml @@ -26,12 +26,12 @@ services: - "traefik.http.routers.nextcloud-redirect.entrypoints=http" - "traefik.http.routers.nextcloud-redirect.rule=Host(`cloud.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.nextcloud-redirect.middlewares=http2https" + - "traefik.http.routers.nextcloud-redirect.middlewares=http2https@file" - "traefik.http.routers.nextcloud.entrypoints=https" - "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)" - "traefik.http.routers.nextcloud.service=nextcloud" + - "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-dav@file" - "traefik.docker.network=proxy" - "traefik.http.services.nextcloud.loadbalancer.server.port=80" @@ -45,7 +45,7 @@ services: cron: image: nextcloud:apache - container_name: cron + container_name: nextcloud-cron restart: always volumes: - /docker/nextcloud:/var/www/html diff --git a/docker/pihole/docker-compose.yaml b/docker/pihole/docker-compose.yaml index 489ee62e..0a0f9c27 100644 --- a/docker/pihole/docker-compose.yaml +++ b/docker/pihole/docker-compose.yaml @@ -28,8 +28,7 @@ services: - "traefik.http.routers.pihole-redirect.entrypoints=http" - "traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.pihole-redirect.middlewares=http2https" + - "traefik.http.routers.pihole-redirect.middlewares=http2https@file" - "traefik.http.routers.pihole.entrypoints=https" - "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)" diff --git a/docker/remotely/docker-compose.yaml b/docker/remotely/docker-compose.yaml index fc3127a8..a7b41689 100644 --- a/docker/remotely/docker-compose.yaml +++ b/docker/remotely/docker-compose.yaml @@ -11,8 +11,7 @@ services: - "traefik.http.routers.remotely-redirect.entrypoints=http" - "traefik.http.routers.remotely-redirect.rule=Host(`remotely.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.remotely-redirect.middlewares=http2https" + - "traefik.http.routers.remotely-redirect.middlewares=http2https@file" - "traefik.http.routers.remotely.entrypoints=https" - "traefik.http.routers.remotely.rule=Host(`remotely.korhonen.cc`)" diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml index db649156..3eed22de 100644 --- a/docker/traefik/docker-compose.yaml +++ b/docker/traefik/docker-compose.yaml @@ -16,7 +16,8 @@ services: volumes: - /etc/localtime:/etc/localtime:ro - /var/run/docker.sock:/var/run/docker.sock:ro - - /docker/traefik/traefik/traefik.yml:/traefik.yml:ro + - /docker/traefik/traefik/traefik.toml:/traefik.toml:ro + - /docker/traefik/traefik/dynamic.toml:/dynamic.toml:ro - /docker/traefik/traefik/dashboard-users:/dashboard-users:ro - /docker/traefik/traefik/acme.json:/acme.json - /docker/traefik/traefik/log:/var/log @@ -25,14 +26,14 @@ services: - 'traefik.enable=true' - 'traefik.http.routers.redirect.entrypoints=http' - 'traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.redirect.middlewares=http2https' + - 'traefik.http.routers.redirect.middlewares=http2https@file' - 'traefik.http.routers.dashboard.entrypoints=https' - 'traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)' - 'traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users' - 'traefik.http.routers.dashboard.middlewares=dashboard-auth' - 'traefik.http.routers.dashboard.service=api@internal' + - 'traefik.docker.network=proxy' fail2ban: image: crazymax/fail2ban:latest diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 1e9a93dd..6c6dabc9 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -24,8 +24,7 @@ services: - "traefik.http.routers.tvheadend-redirect.entrypoints=http" - "traefik.http.routers.tvheadend-redirect.rule=Host(`tvheadend.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.tvheadend-redirect.middlewares=http2https" + - "traefik.http.routers.tvheadend-redirect.middlewares=http2https@file" - "traefik.http.routers.tvheadend.entrypoints=https" - "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)" diff --git a/dotdrop b/dotdrop index 296c179f..8c97593c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 296c179f626397e6e53da9ae51d5108e0f11cf59 +Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa From 02f546deb51d526fbd204274df54a1621cf84e59 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 15 Jan 2022 12:31:34 +0200 Subject: [PATCH 0958/2667] Traefik: move to toml configuration and common middlewares Also fixed nextcloud DAV resolution --- docker/authentik/docker-compose.yaml | 3 +-- docker/freshrss/docker-compose.yaml | 6 ++---- docker/gitea/docker-compose.yaml | 3 +-- docker/homeautomation/docker-compose.yaml | 9 +++------ docker/index.korhonen.cc/docker-compose.yaml | 3 +-- docker/jellyfin/docker-compose.yaml | 3 +-- docker/nextcloud/docker-compose.yaml | 6 +++--- docker/pihole/docker-compose.yaml | 3 +-- docker/remotely/docker-compose.yaml | 3 +-- docker/traefik/docker-compose.yaml | 7 ++++--- docker/tvheadend/docker-compose.yaml | 3 +-- dotdrop | 2 +- 12 files changed, 20 insertions(+), 31 deletions(-) diff --git a/docker/authentik/docker-compose.yaml b/docker/authentik/docker-compose.yaml index a5ee58d3..ec2161cd 100644 --- a/docker/authentik/docker-compose.yaml +++ b/docker/authentik/docker-compose.yaml @@ -29,8 +29,7 @@ services: - "traefik.http.routers.authentik-redirect.entrypoints=http" - "traefik.http.routers.authentik-redirect.rule=Host(`sso.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.authentik-redirect.middlewares=http2https" + - "traefik.http.routers.authentik-redirect.middlewares=http2https@file" - "traefik.http.routers.authentik.entrypoints=https" - "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)" diff --git a/docker/freshrss/docker-compose.yaml b/docker/freshrss/docker-compose.yaml index d04da176..b1bb806a 100644 --- a/docker/freshrss/docker-compose.yaml +++ b/docker/freshrss/docker-compose.yaml @@ -21,8 +21,7 @@ services: - "traefik.http.routers.freshrss-redirect.entrypoints=http" - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.freshrss-redirect.middlewares=http2https" + - "traefik.http.routers.freshrss-redirect.middlewares=http2https@file" - "traefik.http.routers.freshrss.entrypoints=https" - "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)" @@ -45,8 +44,7 @@ services: - "traefik.http.routers.bibliogram-redirect.entrypoints=http" - "traefik.http.routers.bibliogram-redirect.rule=Host(`bibliogram.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.bibliogram-redirect.middlewares=http2https" + - "traefik.http.routers.bibliogram-redirect.middlewares=http2https@file" - "traefik.http.routers.bibliogram.entrypoints=https" - "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)" diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 0a3a3b5a..1f1318ad 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -21,8 +21,7 @@ services: - "traefik.http.routers.gitea-redirect.entrypoints=http" - "traefik.http.routers.gitea-redirect.rule=Host(`git.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.gitea-redirect.middlewares=http2https" + - "traefik.http.routers.gitea-redirect.middlewares=http2https@file" - "traefik.http.routers.gitea.entrypoints=https" - "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)" diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index 937924d4..82b2ac88 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -24,8 +24,7 @@ services: - "traefik.http.routers.home-assistant-redirect.entrypoints=http" - "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.home-assistant-redirect.middlewares=http2https" + - "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file" - "traefik.http.routers.home-assistant.entrypoints=https" - "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)" @@ -87,8 +86,7 @@ services: - "traefik.http.routers.node-red-redirect.entrypoints=http" - "traefik.http.routers.node-red-redirect.rule=Host(`node.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.node-red-redirect.middlewares=http2https" + - "traefik.http.routers.node-red-redirect.middlewares=http2https@file" - "traefik.http.routers.node-red.entrypoints=https" - "traefik.http.routers.node-red.rule=Host(`node.korhonen.cc`)" @@ -113,8 +111,7 @@ services: - "traefik.http.routers.gotify-redirect.entrypoints=http" - "traefik.http.routers.gotify-redirect.rule=Host(`gotify.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.gotify-redirect.middlewares=http2https" + - "traefik.http.routers.gotify-redirect.middlewares=http2https@file" - "traefik.http.routers.gotify.entrypoints=https" - "traefik.http.routers.gotify.rule=Host(`gotify.korhonen.cc`)" diff --git a/docker/index.korhonen.cc/docker-compose.yaml b/docker/index.korhonen.cc/docker-compose.yaml index 78fba3ef..a14b852f 100644 --- a/docker/index.korhonen.cc/docker-compose.yaml +++ b/docker/index.korhonen.cc/docker-compose.yaml @@ -15,8 +15,7 @@ services: - "traefik.http.routers.index-redirect.entrypoints=http" - "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.index-redirect.middlewares=http2https" + - "traefik.http.routers.index-redirect.middlewares=http2https@file" - "traefik.http.routers.index.entrypoints=https" - "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)" diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index a4eb3eef..497c7abc 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -22,8 +22,7 @@ services: - "traefik.http.routers.jellyfin-redirect.entrypoints=http" - "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.jellyfin-redirect.middlewares=http2https" + - "traefik.http.routers.jellyfin-redirect.middlewares=http2https@file" - "traefik.http.routers.jellyfin.entrypoints=https" - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)" diff --git a/docker/nextcloud/docker-compose.yaml b/docker/nextcloud/docker-compose.yaml index ef28ba66..94b3e7ae 100644 --- a/docker/nextcloud/docker-compose.yaml +++ b/docker/nextcloud/docker-compose.yaml @@ -26,12 +26,12 @@ services: - "traefik.http.routers.nextcloud-redirect.entrypoints=http" - "traefik.http.routers.nextcloud-redirect.rule=Host(`cloud.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.nextcloud-redirect.middlewares=http2https" + - "traefik.http.routers.nextcloud-redirect.middlewares=http2https@file" - "traefik.http.routers.nextcloud.entrypoints=https" - "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)" - "traefik.http.routers.nextcloud.service=nextcloud" + - "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-dav@file" - "traefik.docker.network=proxy" - "traefik.http.services.nextcloud.loadbalancer.server.port=80" @@ -45,7 +45,7 @@ services: cron: image: nextcloud:apache - container_name: cron + container_name: nextcloud-cron restart: always volumes: - /docker/nextcloud:/var/www/html diff --git a/docker/pihole/docker-compose.yaml b/docker/pihole/docker-compose.yaml index 489ee62e..0a0f9c27 100644 --- a/docker/pihole/docker-compose.yaml +++ b/docker/pihole/docker-compose.yaml @@ -28,8 +28,7 @@ services: - "traefik.http.routers.pihole-redirect.entrypoints=http" - "traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.pihole-redirect.middlewares=http2https" + - "traefik.http.routers.pihole-redirect.middlewares=http2https@file" - "traefik.http.routers.pihole.entrypoints=https" - "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)" diff --git a/docker/remotely/docker-compose.yaml b/docker/remotely/docker-compose.yaml index fc3127a8..a7b41689 100644 --- a/docker/remotely/docker-compose.yaml +++ b/docker/remotely/docker-compose.yaml @@ -11,8 +11,7 @@ services: - "traefik.http.routers.remotely-redirect.entrypoints=http" - "traefik.http.routers.remotely-redirect.rule=Host(`remotely.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.remotely-redirect.middlewares=http2https" + - "traefik.http.routers.remotely-redirect.middlewares=http2https@file" - "traefik.http.routers.remotely.entrypoints=https" - "traefik.http.routers.remotely.rule=Host(`remotely.korhonen.cc`)" diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml index db649156..3eed22de 100644 --- a/docker/traefik/docker-compose.yaml +++ b/docker/traefik/docker-compose.yaml @@ -16,7 +16,8 @@ services: volumes: - /etc/localtime:/etc/localtime:ro - /var/run/docker.sock:/var/run/docker.sock:ro - - /docker/traefik/traefik/traefik.yml:/traefik.yml:ro + - /docker/traefik/traefik/traefik.toml:/traefik.toml:ro + - /docker/traefik/traefik/dynamic.toml:/dynamic.toml:ro - /docker/traefik/traefik/dashboard-users:/dashboard-users:ro - /docker/traefik/traefik/acme.json:/acme.json - /docker/traefik/traefik/log:/var/log @@ -25,14 +26,14 @@ services: - 'traefik.enable=true' - 'traefik.http.routers.redirect.entrypoints=http' - 'traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)' - - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https' - - 'traefik.http.routers.redirect.middlewares=http2https' + - 'traefik.http.routers.redirect.middlewares=http2https@file' - 'traefik.http.routers.dashboard.entrypoints=https' - 'traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)' - 'traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users' - 'traefik.http.routers.dashboard.middlewares=dashboard-auth' - 'traefik.http.routers.dashboard.service=api@internal' + - 'traefik.docker.network=proxy' fail2ban: image: crazymax/fail2ban:latest diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 1e9a93dd..6c6dabc9 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -24,8 +24,7 @@ services: - "traefik.http.routers.tvheadend-redirect.entrypoints=http" - "traefik.http.routers.tvheadend-redirect.rule=Host(`tvheadend.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.tvheadend-redirect.middlewares=http2https" + - "traefik.http.routers.tvheadend-redirect.middlewares=http2https@file" - "traefik.http.routers.tvheadend.entrypoints=https" - "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)" diff --git a/dotdrop b/dotdrop index 296c179f..8c97593c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 296c179f626397e6e53da9ae51d5108e0f11cf59 +Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa From c34c2e7b9e2e62f6b0065e22e7ab8381872bec70 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 15 Jan 2022 12:32:28 +0200 Subject: [PATCH 0959/2667] Nvim: add fzf keybind --- home/.config/nvim/lua/keybinds.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index 21f6d915..a81b55c5 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -21,3 +21,6 @@ MapKey('n', '', '') MapKey('n', '', '') MapKey('n', '', '') MapKey('n', '', '') + +-- FZF +MapKey('n', '', 'fzf#vim#complete#path(\'fd\'') From 6b79ec86f886769ea566ad01d0c7002d531f96c2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 15 Jan 2022 12:32:28 +0200 Subject: [PATCH 0960/2667] Nvim: add fzf keybind --- home/.config/nvim/lua/keybinds.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index 21f6d915..a81b55c5 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -21,3 +21,6 @@ MapKey('n', '', '') MapKey('n', '', '') MapKey('n', '', '') MapKey('n', '', '') + +-- FZF +MapKey('n', '', 'fzf#vim#complete#path(\'fd\'') From 3732cb5e5341c727944b32a8ca06e80c1234b6da Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 31 Jan 2022 14:37:56 +0200 Subject: [PATCH 0961/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 8c97593c..39d4bd23 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa +Subproject commit 39d4bd23ab94210f384025cb79f7df835a284dbe From fe04b45973b2748c7a3682d9edf3d163703cd235 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 31 Jan 2022 14:37:56 +0200 Subject: [PATCH 0962/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 8c97593c..39d4bd23 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa +Subproject commit 39d4bd23ab94210f384025cb79f7df835a284dbe From 090db6aa30a6449d49e19d6edd0d707b25ad3167 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 31 Jan 2022 14:38:02 +0200 Subject: [PATCH 0963/2667] Neovim: add Neoformat keybind --- home/.config/nvim/lua/keybinds.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index a81b55c5..036eaeae 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -24,3 +24,6 @@ MapKey('n', '', '') -- FZF MapKey('n', '', 'fzf#vim#complete#path(\'fd\'') + +-- Run Neoformat +MapKey('n', '', 'Neoformat') From b1007062bee1b77662400a7955fd4f070c83ccb2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 31 Jan 2022 14:38:02 +0200 Subject: [PATCH 0964/2667] Neovim: add Neoformat keybind --- home/.config/nvim/lua/keybinds.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index a81b55c5..036eaeae 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -24,3 +24,6 @@ MapKey('n', '', '') -- FZF MapKey('n', '', 'fzf#vim#complete#path(\'fd\'') + +-- Run Neoformat +MapKey('n', '', 'Neoformat') From 93e6086b3b3deab52dbc6421e9677ebc8435e444 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 1 Feb 2022 16:42:52 +0200 Subject: [PATCH 0965/2667] Add ESPhome --- docker/homeautomation/docker-compose.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index 82b2ac88..4390f5fe 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -32,6 +32,14 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.home-assistant.loadbalancer.server.port=8123" + esphome: + container_name: esphome + image: esphome/esphome + volumes: + - /docker/homeautomation/esphome:/config + restart: unless-stopped + network_mode: host + mosquitto: container_name: mosquitto image: eclipse-mosquitto From 8b0bc829a2bc8f4b343ce408025764121fc07108 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 1 Feb 2022 16:42:52 +0200 Subject: [PATCH 0966/2667] Add ESPhome --- docker/homeautomation/docker-compose.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index 82b2ac88..4390f5fe 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -32,6 +32,14 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.home-assistant.loadbalancer.server.port=8123" + esphome: + container_name: esphome + image: esphome/esphome + volumes: + - /docker/homeautomation/esphome:/config + restart: unless-stopped + network_mode: host + mosquitto: container_name: mosquitto image: eclipse-mosquitto From 2cb90acb6f45273b2f0e35bd2d271e6ba103c703 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 1 Feb 2022 16:43:13 +0200 Subject: [PATCH 0967/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 39d4bd23..8c97593c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 39d4bd23ab94210f384025cb79f7df835a284dbe +Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa From 495f8dd9190c24e70696c6cf2b7edea9138ca050 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 1 Feb 2022 16:43:13 +0200 Subject: [PATCH 0968/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 39d4bd23..8c97593c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 39d4bd23ab94210f384025cb79f7df835a284dbe +Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa From 3ba1f71742e0e2892e1687d0ac038493e99c8b2c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 3 Feb 2022 11:12:23 +0200 Subject: [PATCH 0969/2667] Neovim: fix nvimtree keybind --- dotdrop | 2 +- home/.config/nvim/lua/keybinds.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dotdrop b/dotdrop index 8c97593c..39d4bd23 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa +Subproject commit 39d4bd23ab94210f384025cb79f7df835a284dbe diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index 036eaeae..5e751f69 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -1,7 +1,7 @@ require 'common' -- Open/close tree browser -MapKey('n', '', 'NvimTreeToggle') +MapKey('n', '', 'NvimTreeToggle') -- Telescope MapKey('n', '', 'Telescope find_files find_command=fd,-Ht,f') From 0e97eb8fbdd242e33e7eed30509a3907b5ed7452 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 3 Feb 2022 11:12:23 +0200 Subject: [PATCH 0970/2667] Neovim: fix nvimtree keybind --- dotdrop | 2 +- home/.config/nvim/lua/keybinds.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dotdrop b/dotdrop index 8c97593c..39d4bd23 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa +Subproject commit 39d4bd23ab94210f384025cb79f7df835a284dbe diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index 036eaeae..5e751f69 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -1,7 +1,7 @@ require 'common' -- Open/close tree browser -MapKey('n', '', 'NvimTreeToggle') +MapKey('n', '', 'NvimTreeToggle') -- Telescope MapKey('n', '', 'Telescope find_files find_command=fd,-Ht,f') From 3f69a286c85e4292a16652dd38d6c01c437d6e47 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 3 Feb 2022 11:26:12 +0200 Subject: [PATCH 0971/2667] Fix FZF --- home/.config/nvim/lua/keybinds.lua | 2 +- home/.config/nvim/lua/pluginmanager.lua | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index 5e751f69..b61b16b2 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -23,7 +23,7 @@ MapKey('n', '', '') MapKey('n', '', '') -- FZF -MapKey('n', '', 'fzf#vim#complete#path(\'fd\'') +MapKey('n', '', "lua require('fzf-lua').files()") -- Run Neoformat MapKey('n', '', 'Neoformat') diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 0b3fca67..3b695f36 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -47,7 +47,10 @@ require('packer').startup(function() use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} -- FZF FTW - use 'junegunn/fzf.vim' + use { 'ibhagwan/fzf-lua', + -- optional for icon support + requires = { 'kyazdani42/nvim-web-devicons' } + } -- Do stuff as sudo use 'lambdalisue/suda.vim' From ca071c11d164812dff469a3e74bf1ddff9054ae9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 3 Feb 2022 11:26:12 +0200 Subject: [PATCH 0972/2667] Fix FZF --- home/.config/nvim/lua/keybinds.lua | 2 +- home/.config/nvim/lua/pluginmanager.lua | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index 5e751f69..b61b16b2 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -23,7 +23,7 @@ MapKey('n', '', '') MapKey('n', '', '') -- FZF -MapKey('n', '', 'fzf#vim#complete#path(\'fd\'') +MapKey('n', '', "lua require('fzf-lua').files()") -- Run Neoformat MapKey('n', '', 'Neoformat') diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 0b3fca67..3b695f36 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -47,7 +47,10 @@ require('packer').startup(function() use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} -- FZF FTW - use 'junegunn/fzf.vim' + use { 'ibhagwan/fzf-lua', + -- optional for icon support + requires = { 'kyazdani42/nvim-web-devicons' } + } -- Do stuff as sudo use 'lambdalisue/suda.vim' From b15253822b26bc9070c1a2c3267564baf907306e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Feb 2022 19:55:29 +0200 Subject: [PATCH 0973/2667] Jellyfin: Pass through new AMD card for hw acceleration, upgrade to 10.8.0 --- docker/jellyfin/docker-compose.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 497c7abc..b5464000 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -1,11 +1,9 @@ services: jellyfin: - image: jellyfin/jellyfin + image: jellyfin/jellyfin:10.8.0-alpha5 container_name: jellyfin environment: - TZ=Europe/Helsinki - - NVIDIA_DRIVER_CAPABILITIES=all - - NVIDIA_VISIBLE_DEVICES=all ports: - "8096:8096" networks: @@ -17,6 +15,9 @@ services: - /docker/jellyfin/cache:/cache - /mnt/Storage/Media:/media - /etc/localtime:/etc/localtime:ro + devices: + - /dev/dri/renderD128:/dev/dri/renderD128 + - /dev/dri/card0:/dev/dri/card0 labels: - "traefik.enable=true" From de043c126a087fe11a8cd2a519a88985d128070e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Feb 2022 19:55:29 +0200 Subject: [PATCH 0974/2667] Jellyfin: Pass through new AMD card for hw acceleration, upgrade to 10.8.0 --- docker/jellyfin/docker-compose.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index 497c7abc..b5464000 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -1,11 +1,9 @@ services: jellyfin: - image: jellyfin/jellyfin + image: jellyfin/jellyfin:10.8.0-alpha5 container_name: jellyfin environment: - TZ=Europe/Helsinki - - NVIDIA_DRIVER_CAPABILITIES=all - - NVIDIA_VISIBLE_DEVICES=all ports: - "8096:8096" networks: @@ -17,6 +15,9 @@ services: - /docker/jellyfin/cache:/cache - /mnt/Storage/Media:/media - /etc/localtime:/etc/localtime:ro + devices: + - /dev/dri/renderD128:/dev/dri/renderD128 + - /dev/dri/card0:/dev/dri/card0 labels: - "traefik.enable=true" From 02c5e0e8e4b2f7c2dfda220f2c2b0b9b4b0fdf24 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Feb 2022 19:56:33 +0200 Subject: [PATCH 0975/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 39d4bd23..8c97593c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 39d4bd23ab94210f384025cb79f7df835a284dbe +Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa From 64de63a92ab8b2da45e8cf5587cdc03d47213cc4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Feb 2022 19:56:33 +0200 Subject: [PATCH 0976/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 39d4bd23..8c97593c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 39d4bd23ab94210f384025cb79f7df835a284dbe +Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa From 173b6b4e064f5d469a6568062b82317542896318 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Feb 2022 19:56:50 +0200 Subject: [PATCH 0977/2667] Alacritty: remove deprecated options --- home/.config/alacritty/alacritty.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml index 8fa9eb14..c9b10cbe 100644 --- a/home/.config/alacritty/alacritty.yml +++ b/home/.config/alacritty/alacritty.yml @@ -1,4 +1,5 @@ window: + opacity: 1.0 dimensions: columns: 0 lines: 0 @@ -64,8 +65,6 @@ bell: duration: 0 color: "#ffffff" -background_opacity: 1.0 - mouse_bindings: - { mouse: Middle, action: PasteSelection } From 848d3899d9cc7c1f08618adbd986effc428044e3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Feb 2022 19:56:50 +0200 Subject: [PATCH 0978/2667] Alacritty: remove deprecated options --- home/.config/alacritty/alacritty.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml index 8fa9eb14..c9b10cbe 100644 --- a/home/.config/alacritty/alacritty.yml +++ b/home/.config/alacritty/alacritty.yml @@ -1,4 +1,5 @@ window: + opacity: 1.0 dimensions: columns: 0 lines: 0 @@ -64,8 +65,6 @@ bell: duration: 0 color: "#ffffff" -background_opacity: 1.0 - mouse_bindings: - { mouse: Middle, action: PasteSelection } From 3d61a23f12924108b2a1eb3abc83812d738155c5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Feb 2022 10:12:39 +0200 Subject: [PATCH 0979/2667] Update update alias --- home/.config/zsh/03-aliases.zsh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 6fafb777..81ed6882 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -144,16 +144,14 @@ update() { docker-update docker system prune --volumes {%@@ endif @@%} - sudo flatpak update - sudo awman-update } repo() { aur sync -Su --margs --noconfirm - firefox + update-firefox } - firefox() { + update-firefox() { aur sync -S --rebuild firefox-nightly --margs --noconfirm } From ee401aacb9c959ded749a526896a3849d3cece93 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Feb 2022 10:12:39 +0200 Subject: [PATCH 0980/2667] Update update alias --- home/.config/zsh/03-aliases.zsh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 6fafb777..81ed6882 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -144,16 +144,14 @@ update() { docker-update docker system prune --volumes {%@@ endif @@%} - sudo flatpak update - sudo awman-update } repo() { aur sync -Su --margs --noconfirm - firefox + update-firefox } - firefox() { + update-firefox() { aur sync -S --rebuild firefox-nightly --margs --noconfirm } From 00d8d65c49ab8c6bc4237a0f9a3dd7cbfef3f6e2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 15 Feb 2022 22:12:49 +0200 Subject: [PATCH 0981/2667] Update catppuccin for foot, add for mako and zathura --- config.yaml | 8 +++---- dotdrop | 2 +- home/.config/foot/foot.ini | 36 ++++++++++++++++---------------- home/.config/mako/config | 11 +++++++--- home/.config/zathura/catppuccin | 37 +++++++++++++++++++++++++++++++++ home/.config/zathura/zathurarc | 29 ++------------------------ 6 files changed, 70 insertions(+), 53 deletions(-) create mode 100644 home/.config/zathura/catppuccin diff --git a/config.yaml b/config.yaml index f93c3f87..f73a601e 100644 --- a/config.yaml +++ b/config.yaml @@ -120,9 +120,9 @@ dotfiles: f_youtube-dl_config: dst: ~/.config/youtube-dl/config src: .config/youtube-dl/config - f_zathurarc: - dst: ~/.config/zathura/zathurarc - src: .config/zathura/zathurarc + d_zathura: + dst: ~/.config/zathura + src: .config/zathura f_zprofile: dst: ~/.zprofile src: .zprofile @@ -223,7 +223,7 @@ profiles: - d_wofi - f_mako_config - f_redshift.conf - - f_zathurarc + - d_zathura - f_mimeo_associations.txt - f_tdesktop_lang.strings - f_fonts.conf diff --git a/dotdrop b/dotdrop index 8c97593c..39d4bd23 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa +Subproject commit 39d4bd23ab94210f384025cb79f7df835a284dbe diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini index ca08a5bf..9558280c 100644 --- a/home/.config/foot/foot.ini +++ b/home/.config/foot/foot.ini @@ -10,21 +10,21 @@ blink=yes hide-when-typing=yes [colors] -foreground = D7DAE0 -background = 1E1E28 -regular0 = 6E6C7C -regular1 = E28C8C -regular2 = B3E1A3 -regular3 = EADDA0 -regular4 = A4B9EF -regular5 = C6AAE8 -regular6 = F0AFE1 -regular7 = D7DAE0 -bright0 = 6E6C7C -bright1 = E28C8C -bright2 = B3E1A3 -bright3 = EADDA0 -bright4 = A4B9EF -bright5 = C6AAE8 -bright6 = F0AFE1 -bright7 = D7DAE0 +foreground = D9E0EE +background = 1E1D2F +regular0 = 6E6C7E +regular1 = F28FAD +regular2 = ABE9B3 +regular3 = FAE3B0 +regular4 = 96CDFB +regular5 = F5C2E7 +regular6 = 89DCEB +regular7 = D9E0EE +bright0 = 988BA2 +bright1 = F28FAD +bright2 = ABE9B3 +bright3 = FAE3B0 +bright4 = 96CDFB +bright5 = F5C2E7 +bright6 = 89DCEB +bright7 = D9E0EE diff --git a/home/.config/mako/config b/home/.config/mako/config index 791c9619..993dd074 100644 --- a/home/.config/mako/config +++ b/home/.config/mako/config @@ -1,7 +1,12 @@ -background-color=#282828 -text-color=#EBDBB2 -border-color=#D65D0E +background-color=#1E1D2F +text-color=#D9E0EE +border-color=#96CDFB +progress-color=over #302D41 + icons=1 default-timeout=5000 max-visible=6 layer=overlay + +[urgency=high] +border-color=#F8BD96 diff --git a/home/.config/zathura/catppuccin b/home/.config/zathura/catppuccin new file mode 100644 index 00000000..0ee25130 --- /dev/null +++ b/home/.config/zathura/catppuccin @@ -0,0 +1,37 @@ +set default-fg "#d9e0ee" +set default-bg "#1e1d2f" + +set completion-bg "#302d41" +set completion-fg "#d9e0ee" +set completion-highlight-bg "#575268" +set completion-highlight-fg "#d9e0ee" +set completion-group-bg "#302d41" +set completion-group-fg "#96cdfb" + +set statusbar-fg "#d9e0ee" +set statusbar-bg "#302d41" + +set notification-bg "#302d41" +set notification-fg "#d9e0ee" +set notification-error-bg "#302d41" +set notification-error-fg "#f28fad" +set notification-warning-bg "#302d41" +set notification-warning-fg "#fae3b0" + +set inputbar-fg "#d9e0ee" +set inputbar-bg "#302d41" + +set recolor-lightcolor "#1e1d2f" +set recolor-darkcolor "#d9e0ee" + +set index-fg "#d9e0ee" +set index-bg "#1e1d2f" +set index-active-fg "#d9e0ee" +set index-active-bg "#302d41" + +set render-loading-bg "#1e1d2f" +set render-loading-fg "#d9e0ee" + +set highlight-color "#575268" +set highlight-fg "#f5c2e7" +set highlight-active-color "#f5c2e7" diff --git a/home/.config/zathura/zathurarc b/home/.config/zathura/zathurarc index 3f06e2a8..c521644f 100644 --- a/home/.config/zathura/zathurarc +++ b/home/.config/zathura/zathurarc @@ -1,33 +1,8 @@ -set completion-bg "#282828" -set recolor-darkcolor "#EBDBB2" -set recolor-lightcolor "#282828" -set completion-fg "#EBDBB2" -set completion-group-bg "#282828" -set completion-group-fg "#1E6D8B" -set completion-highlight-bg "#EBDBB2" -set completion-highlight-fg "#282828" -set default-bg "#282828" -set default-fg "#EBDBB2" -set inputbar-bg "#282828" -set inputbar-fg "#EBDBB2" -set notification-bg "#282828" -set notification-fg "#EBDBB2" -set notification-error-bg "#EBAE79" -set notification-error-fg "#EBDBB2" -set notification-warning-bg "#EBAE79" -set notification-warning-fg "#EBDBB2" -set statusbar-bg "#282828" -set statusbar-fg "#EBDBB2" -set index-bg "#282828" -set index-fg "#EBDBB2" -set index-active-bg "#EBDBB2" -set index-active-fg "#282828" -set render-loading-bg "#282828" -set render-loading-fg "#EBDBB2" - set smooth-scroll true set window-title-home-tilde true set statusbar-basename true set selection-clipboard clipboard set recolor false set vertical-center true + +include catppuccin From efbc653977c3480ef045fc9e1d1a55941206aefc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 15 Feb 2022 22:12:49 +0200 Subject: [PATCH 0982/2667] Update catppuccin for foot, add for mako and zathura --- config.yaml | 8 +++---- dotdrop | 2 +- home/.config/foot/foot.ini | 36 ++++++++++++++++---------------- home/.config/mako/config | 11 +++++++--- home/.config/zathura/catppuccin | 37 +++++++++++++++++++++++++++++++++ home/.config/zathura/zathurarc | 29 ++------------------------ 6 files changed, 70 insertions(+), 53 deletions(-) create mode 100644 home/.config/zathura/catppuccin diff --git a/config.yaml b/config.yaml index f93c3f87..f73a601e 100644 --- a/config.yaml +++ b/config.yaml @@ -120,9 +120,9 @@ dotfiles: f_youtube-dl_config: dst: ~/.config/youtube-dl/config src: .config/youtube-dl/config - f_zathurarc: - dst: ~/.config/zathura/zathurarc - src: .config/zathura/zathurarc + d_zathura: + dst: ~/.config/zathura + src: .config/zathura f_zprofile: dst: ~/.zprofile src: .zprofile @@ -223,7 +223,7 @@ profiles: - d_wofi - f_mako_config - f_redshift.conf - - f_zathurarc + - d_zathura - f_mimeo_associations.txt - f_tdesktop_lang.strings - f_fonts.conf diff --git a/dotdrop b/dotdrop index 8c97593c..39d4bd23 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa +Subproject commit 39d4bd23ab94210f384025cb79f7df835a284dbe diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini index ca08a5bf..9558280c 100644 --- a/home/.config/foot/foot.ini +++ b/home/.config/foot/foot.ini @@ -10,21 +10,21 @@ blink=yes hide-when-typing=yes [colors] -foreground = D7DAE0 -background = 1E1E28 -regular0 = 6E6C7C -regular1 = E28C8C -regular2 = B3E1A3 -regular3 = EADDA0 -regular4 = A4B9EF -regular5 = C6AAE8 -regular6 = F0AFE1 -regular7 = D7DAE0 -bright0 = 6E6C7C -bright1 = E28C8C -bright2 = B3E1A3 -bright3 = EADDA0 -bright4 = A4B9EF -bright5 = C6AAE8 -bright6 = F0AFE1 -bright7 = D7DAE0 +foreground = D9E0EE +background = 1E1D2F +regular0 = 6E6C7E +regular1 = F28FAD +regular2 = ABE9B3 +regular3 = FAE3B0 +regular4 = 96CDFB +regular5 = F5C2E7 +regular6 = 89DCEB +regular7 = D9E0EE +bright0 = 988BA2 +bright1 = F28FAD +bright2 = ABE9B3 +bright3 = FAE3B0 +bright4 = 96CDFB +bright5 = F5C2E7 +bright6 = 89DCEB +bright7 = D9E0EE diff --git a/home/.config/mako/config b/home/.config/mako/config index 791c9619..993dd074 100644 --- a/home/.config/mako/config +++ b/home/.config/mako/config @@ -1,7 +1,12 @@ -background-color=#282828 -text-color=#EBDBB2 -border-color=#D65D0E +background-color=#1E1D2F +text-color=#D9E0EE +border-color=#96CDFB +progress-color=over #302D41 + icons=1 default-timeout=5000 max-visible=6 layer=overlay + +[urgency=high] +border-color=#F8BD96 diff --git a/home/.config/zathura/catppuccin b/home/.config/zathura/catppuccin new file mode 100644 index 00000000..0ee25130 --- /dev/null +++ b/home/.config/zathura/catppuccin @@ -0,0 +1,37 @@ +set default-fg "#d9e0ee" +set default-bg "#1e1d2f" + +set completion-bg "#302d41" +set completion-fg "#d9e0ee" +set completion-highlight-bg "#575268" +set completion-highlight-fg "#d9e0ee" +set completion-group-bg "#302d41" +set completion-group-fg "#96cdfb" + +set statusbar-fg "#d9e0ee" +set statusbar-bg "#302d41" + +set notification-bg "#302d41" +set notification-fg "#d9e0ee" +set notification-error-bg "#302d41" +set notification-error-fg "#f28fad" +set notification-warning-bg "#302d41" +set notification-warning-fg "#fae3b0" + +set inputbar-fg "#d9e0ee" +set inputbar-bg "#302d41" + +set recolor-lightcolor "#1e1d2f" +set recolor-darkcolor "#d9e0ee" + +set index-fg "#d9e0ee" +set index-bg "#1e1d2f" +set index-active-fg "#d9e0ee" +set index-active-bg "#302d41" + +set render-loading-bg "#1e1d2f" +set render-loading-fg "#d9e0ee" + +set highlight-color "#575268" +set highlight-fg "#f5c2e7" +set highlight-active-color "#f5c2e7" diff --git a/home/.config/zathura/zathurarc b/home/.config/zathura/zathurarc index 3f06e2a8..c521644f 100644 --- a/home/.config/zathura/zathurarc +++ b/home/.config/zathura/zathurarc @@ -1,33 +1,8 @@ -set completion-bg "#282828" -set recolor-darkcolor "#EBDBB2" -set recolor-lightcolor "#282828" -set completion-fg "#EBDBB2" -set completion-group-bg "#282828" -set completion-group-fg "#1E6D8B" -set completion-highlight-bg "#EBDBB2" -set completion-highlight-fg "#282828" -set default-bg "#282828" -set default-fg "#EBDBB2" -set inputbar-bg "#282828" -set inputbar-fg "#EBDBB2" -set notification-bg "#282828" -set notification-fg "#EBDBB2" -set notification-error-bg "#EBAE79" -set notification-error-fg "#EBDBB2" -set notification-warning-bg "#EBAE79" -set notification-warning-fg "#EBDBB2" -set statusbar-bg "#282828" -set statusbar-fg "#EBDBB2" -set index-bg "#282828" -set index-fg "#EBDBB2" -set index-active-bg "#EBDBB2" -set index-active-fg "#282828" -set render-loading-bg "#282828" -set render-loading-fg "#EBDBB2" - set smooth-scroll true set window-title-home-tilde true set statusbar-basename true set selection-clipboard clipboard set recolor false set vertical-center true + +include catppuccin From 312634e010ffb416e0e712bb07cc39e8d10f1f46 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Feb 2022 11:24:36 +0200 Subject: [PATCH 0983/2667] Neovim: add friendly-snippets --- home/.config/nvim/lua/pluginconf/completion.lua | 3 +++ home/.config/nvim/lua/pluginmanager.lua | 1 + 2 files changed, 4 insertions(+) diff --git a/home/.config/nvim/lua/pluginconf/completion.lua b/home/.config/nvim/lua/pluginconf/completion.lua index 4885debe..0d69c7e0 100644 --- a/home/.config/nvim/lua/pluginconf/completion.lua +++ b/home/.config/nvim/lua/pluginconf/completion.lua @@ -51,3 +51,6 @@ cmp.setup { { name = 'luasnip' }, }, } + +-- load friendly-snippets to luasnip +require("luasnip/loaders/from_vscode").lazy_load() diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 3b695f36..83cca4c0 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -70,6 +70,7 @@ require('packer').startup(function() use 'hrsh7th/cmp-path' -- Path source for nvim-cmp use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp use 'L3MON4D3/LuaSnip' -- Snippets plugin + use "rafamadriz/friendly-snippets" -- Snippets collection -- treesitter syntax highlight use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} From 4f2c3b5e7e1ca98f9333de3f6c2326fd474fc015 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Feb 2022 11:24:36 +0200 Subject: [PATCH 0984/2667] Neovim: add friendly-snippets --- home/.config/nvim/lua/pluginconf/completion.lua | 3 +++ home/.config/nvim/lua/pluginmanager.lua | 1 + 2 files changed, 4 insertions(+) diff --git a/home/.config/nvim/lua/pluginconf/completion.lua b/home/.config/nvim/lua/pluginconf/completion.lua index 4885debe..0d69c7e0 100644 --- a/home/.config/nvim/lua/pluginconf/completion.lua +++ b/home/.config/nvim/lua/pluginconf/completion.lua @@ -51,3 +51,6 @@ cmp.setup { { name = 'luasnip' }, }, } + +-- load friendly-snippets to luasnip +require("luasnip/loaders/from_vscode").lazy_load() diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 3b695f36..83cca4c0 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -70,6 +70,7 @@ require('packer').startup(function() use 'hrsh7th/cmp-path' -- Path source for nvim-cmp use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp use 'L3MON4D3/LuaSnip' -- Snippets plugin + use "rafamadriz/friendly-snippets" -- Snippets collection -- treesitter syntax highlight use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} From 75d4a64c101748df9b1212d6fa7273570c5c34dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Feb 2022 17:14:42 +0200 Subject: [PATCH 0985/2667] Nvim: enable filetype.lua --- home/.config/nvim/lua/settings.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 8ff34740..9a78309d 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -48,6 +48,10 @@ o.splitright = true o.ignorecase = true o.smartcase = true +-- Enable filetype.lua +g.do_filetype_lua = 1 +g.did_load_filetypes = 0 + -- Use mouse o.mouse = 'a' From de518419ce3dd9554ab259e944505cbebb30a89c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Feb 2022 17:14:42 +0200 Subject: [PATCH 0986/2667] Nvim: enable filetype.lua --- home/.config/nvim/lua/settings.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 8ff34740..9a78309d 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -48,6 +48,10 @@ o.splitright = true o.ignorecase = true o.smartcase = true +-- Enable filetype.lua +g.do_filetype_lua = 1 +g.did_load_filetypes = 0 + -- Use mouse o.mouse = 'a' From fcd2c47305bb68190db41b44331059033da6aedf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Feb 2022 17:27:30 +0200 Subject: [PATCH 0987/2667] Disable automatically started sway --- home/.zprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.zprofile b/home/.zprofile index 52c6cb96..4a9397e7 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1 +1 @@ -[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway-run +#[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway-run From c14bf488c4911f2805b8634d6cfe4318ac05119e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Feb 2022 17:27:30 +0200 Subject: [PATCH 0988/2667] Disable automatically started sway --- home/.zprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.zprofile b/home/.zprofile index 52c6cb96..4a9397e7 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1 +1 @@ -[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway-run +#[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway-run From b3f20969a78d4fa17b3f146096e55e489f75c840 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Feb 2022 17:27:49 +0200 Subject: [PATCH 0989/2667] Nvim: Setup LSP with additional capabilities supported by nvim-cmp --- home/.config/nvim/lua/pluginconf/lsp.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 3aef5424..9a56dbb3 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -44,6 +44,10 @@ local buf_map_keys = function(server_name, bufnr) keymapOpts) end +-- Add additional capabilities supported by nvim-cmp +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) + -- Register a handler that will be called for all installed servers. -- Alternatively, you may also register handlers on specific server instances instead (see example below). lsp_installer.on_server_ready(function(server) @@ -75,5 +79,6 @@ lsp_installer.on_server_ready(function(server) end opts.on_attach = buf_map_keys + opts.capabilities = capabilities server:setup(opts) end) From d695658146205c0f3b11f3c937390fd5bcd9f7b7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Feb 2022 17:27:49 +0200 Subject: [PATCH 0990/2667] Nvim: Setup LSP with additional capabilities supported by nvim-cmp --- home/.config/nvim/lua/pluginconf/lsp.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 3aef5424..9a56dbb3 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -44,6 +44,10 @@ local buf_map_keys = function(server_name, bufnr) keymapOpts) end +-- Add additional capabilities supported by nvim-cmp +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) + -- Register a handler that will be called for all installed servers. -- Alternatively, you may also register handlers on specific server instances instead (see example below). lsp_installer.on_server_ready(function(server) @@ -75,5 +79,6 @@ lsp_installer.on_server_ready(function(server) end opts.on_attach = buf_map_keys + opts.capabilities = capabilities server:setup(opts) end) From 58f9847e783d12d90c6b8d5d97f9632de38bfa6f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Feb 2022 18:08:59 +0200 Subject: [PATCH 0991/2667] =?UTF-8?q?Nvim:=20add=20jdtls=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.yaml | 6 +++++- home/.config/nvim/ftplugin/java.lua | 19 +++++++++++++++++++ home/.config/nvim/lua/pluginconf/lsp.lua | 6 ++++-- home/.config/nvim/lua/pluginmanager.lua | 3 +++ 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 home/.config/nvim/ftplugin/java.lua diff --git a/config.yaml b/config.yaml index f73a601e..4c276d58 100644 --- a/config.yaml +++ b/config.yaml @@ -33,6 +33,9 @@ dotfiles: - nvim-packer-sync dst: ~/.config/nvim/lua src: .config/nvim/lua + d_nvim_ftplugin: + dst: ~/.config/nvim/ftplugin + src: .config/nvim/ftplugin d_sway: dst: ~/.config/sway src: .config/sway @@ -193,8 +196,9 @@ profiles: - f_ranger.conf - f_ssh.conf - f_authorized_keys - - d_nvim_lua - f_nvim_init + - d_nvim_lua + - d_nvim_ftplugin - f_gitconfig - f_alacritty.yml email: diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua new file mode 100644 index 00000000..0ec274e1 --- /dev/null +++ b/home/.config/nvim/ftplugin/java.lua @@ -0,0 +1,19 @@ +local nvim_local_dir = vim.fn.expand('~/.local/share/nvim') + +local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ':p:h:t') +local workspace_dir = nvim_local_dir .. '/jdtls-workspaces/' .. project_name +require('jdtls').start_or_attach({ + cmd = { + 'java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', + '-Dosgi.bundles.defaultStartLevel=4', + '-Declipse.product=org.eclipse.jdt.ls.core.product', + '-Dlog.protocol=true', '-Dlog.level=ALL', '-Xms1g', + '--add-modules=ALL-SYSTEM', '--add-opens', + 'java.base/java.util=ALL-UNNAMED', '--add-opens', + 'java.base/java.lang=ALL-UNNAMED', -- 💀 + '-jar', nvim_local_dir .. + '/lsp_servers/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar', + '-configuration', nvim_local_dir .. '/lsp_servers/jdtls/config_linux', + '-data', workspace_dir + } +}) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 9a56dbb3..b75d372a 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -49,8 +49,10 @@ local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) -- Register a handler that will be called for all installed servers. --- Alternatively, you may also register handlers on specific server instances instead (see example below). lsp_installer.on_server_ready(function(server) + -- Don't setup jdtls here since it is done by nvim-jdtls + if server.name == "jdtls" then return end + local opts = {} -- Lua specific settings @@ -79,6 +81,6 @@ lsp_installer.on_server_ready(function(server) end opts.on_attach = buf_map_keys - opts.capabilities = capabilities + opts.capabilities = capabilities server:setup(opts) end) diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 83cca4c0..8c6bd285 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -64,6 +64,9 @@ require('packer').startup(function() -- Install LSP server executables use 'williamboman/nvim-lsp-installer' + -- Additional LSP features for Java + use 'mfussenegger/nvim-jdtls' + -- Completion use 'hrsh7th/nvim-cmp' -- Autocompletion plugin use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp From 9e0399fbedb6c31964e2f52463adfa36f22c461f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Feb 2022 18:08:59 +0200 Subject: [PATCH 0992/2667] =?UTF-8?q?Nvim:=20add=20jdtls=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.yaml | 6 +++++- home/.config/nvim/ftplugin/java.lua | 19 +++++++++++++++++++ home/.config/nvim/lua/pluginconf/lsp.lua | 6 ++++-- home/.config/nvim/lua/pluginmanager.lua | 3 +++ 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 home/.config/nvim/ftplugin/java.lua diff --git a/config.yaml b/config.yaml index f73a601e..4c276d58 100644 --- a/config.yaml +++ b/config.yaml @@ -33,6 +33,9 @@ dotfiles: - nvim-packer-sync dst: ~/.config/nvim/lua src: .config/nvim/lua + d_nvim_ftplugin: + dst: ~/.config/nvim/ftplugin + src: .config/nvim/ftplugin d_sway: dst: ~/.config/sway src: .config/sway @@ -193,8 +196,9 @@ profiles: - f_ranger.conf - f_ssh.conf - f_authorized_keys - - d_nvim_lua - f_nvim_init + - d_nvim_lua + - d_nvim_ftplugin - f_gitconfig - f_alacritty.yml email: diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua new file mode 100644 index 00000000..0ec274e1 --- /dev/null +++ b/home/.config/nvim/ftplugin/java.lua @@ -0,0 +1,19 @@ +local nvim_local_dir = vim.fn.expand('~/.local/share/nvim') + +local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ':p:h:t') +local workspace_dir = nvim_local_dir .. '/jdtls-workspaces/' .. project_name +require('jdtls').start_or_attach({ + cmd = { + 'java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', + '-Dosgi.bundles.defaultStartLevel=4', + '-Declipse.product=org.eclipse.jdt.ls.core.product', + '-Dlog.protocol=true', '-Dlog.level=ALL', '-Xms1g', + '--add-modules=ALL-SYSTEM', '--add-opens', + 'java.base/java.util=ALL-UNNAMED', '--add-opens', + 'java.base/java.lang=ALL-UNNAMED', -- 💀 + '-jar', nvim_local_dir .. + '/lsp_servers/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar', + '-configuration', nvim_local_dir .. '/lsp_servers/jdtls/config_linux', + '-data', workspace_dir + } +}) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 9a56dbb3..b75d372a 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -49,8 +49,10 @@ local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) -- Register a handler that will be called for all installed servers. --- Alternatively, you may also register handlers on specific server instances instead (see example below). lsp_installer.on_server_ready(function(server) + -- Don't setup jdtls here since it is done by nvim-jdtls + if server.name == "jdtls" then return end + local opts = {} -- Lua specific settings @@ -79,6 +81,6 @@ lsp_installer.on_server_ready(function(server) end opts.on_attach = buf_map_keys - opts.capabilities = capabilities + opts.capabilities = capabilities server:setup(opts) end) diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 83cca4c0..8c6bd285 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -64,6 +64,9 @@ require('packer').startup(function() -- Install LSP server executables use 'williamboman/nvim-lsp-installer' + -- Additional LSP features for Java + use 'mfussenegger/nvim-jdtls' + -- Completion use 'hrsh7th/nvim-cmp' -- Autocompletion plugin use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp From c0988a1f5aaf094033328ea8d7a3b19519e377df Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Feb 2022 18:10:37 +0200 Subject: [PATCH 0993/2667] Re-enable sway autostart --- home/.zprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.zprofile b/home/.zprofile index 4a9397e7..52c6cb96 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1 +1 @@ -#[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway-run +[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway-run From 347b6c1f50da50b6536d1258ce82d97c9ef35fff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Feb 2022 18:10:37 +0200 Subject: [PATCH 0994/2667] Re-enable sway autostart --- home/.zprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.zprofile b/home/.zprofile index 4a9397e7..52c6cb96 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1 +1 @@ -#[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway-run +[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway-run From 7ef82afb4b10dee533ea175fc18daa9d9ede4d95 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 11:30:35 +0200 Subject: [PATCH 0995/2667] Remove nvimpager since I'm not using it anymore --- home/.config/nvimpager/init.vim | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 home/.config/nvimpager/init.vim diff --git a/home/.config/nvimpager/init.vim b/home/.config/nvimpager/init.vim deleted file mode 100644 index 76dd80bb..00000000 --- a/home/.config/nvimpager/init.vim +++ /dev/null @@ -1,10 +0,0 @@ -" Source UI plugins -set runtimepath+=~/.config/nvim/plugged/vim-airline -set runtimepath+=~/.config/nvim/plugged/onedark.vim - -" Source syntax plugins -set runtimepath+=~/.config/nvim/plugged/vim-polyglot - -source ~/.config/nvim/conf.d/02-appearance.vim -source ~/.config/nvim/conf.d/03-keybinds.vim -source ~/.config/nvim/conf.d/06-misc.vim From c8c3cf39492112239520673b915e21e336ffe923 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 11:30:35 +0200 Subject: [PATCH 0996/2667] Remove nvimpager since I'm not using it anymore --- home/.config/nvimpager/init.vim | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 home/.config/nvimpager/init.vim diff --git a/home/.config/nvimpager/init.vim b/home/.config/nvimpager/init.vim deleted file mode 100644 index 76dd80bb..00000000 --- a/home/.config/nvimpager/init.vim +++ /dev/null @@ -1,10 +0,0 @@ -" Source UI plugins -set runtimepath+=~/.config/nvim/plugged/vim-airline -set runtimepath+=~/.config/nvim/plugged/onedark.vim - -" Source syntax plugins -set runtimepath+=~/.config/nvim/plugged/vim-polyglot - -source ~/.config/nvim/conf.d/02-appearance.vim -source ~/.config/nvim/conf.d/03-keybinds.vim -source ~/.config/nvim/conf.d/06-misc.vim From 997da6c771837025cc666fa4d27691aa844456ff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 11:31:38 +0200 Subject: [PATCH 0997/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 39d4bd23..b1b4839e 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 39d4bd23ab94210f384025cb79f7df835a284dbe +Subproject commit b1b4839ef391c1503bcaef03d89161348d074ac6 From 7ad76e5ba774153bfd95d14b0ea0fc148911fb62 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 11:31:38 +0200 Subject: [PATCH 0998/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 39d4bd23..b1b4839e 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 39d4bd23ab94210f384025cb79f7df835a284dbe +Subproject commit b1b4839ef391c1503bcaef03d89161348d074ac6 From d468473419ee661874104c0a7768a55f7955c0a5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 12:16:04 +0200 Subject: [PATCH 0999/2667] Convert home automation docker-compose config to toml --- docker/homeautomation/docker-compose.toml | 114 ++++++++++++++++++ docker/homeautomation/docker-compose.yaml | 136 ---------------------- 2 files changed, 114 insertions(+), 136 deletions(-) create mode 100644 docker/homeautomation/docker-compose.toml delete mode 100644 docker/homeautomation/docker-compose.yaml diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml new file mode 100644 index 00000000..ac3d20a8 --- /dev/null +++ b/docker/homeautomation/docker-compose.toml @@ -0,0 +1,114 @@ +[services] + +[services.home-assistant] +container_name = "home-assistant" +image = "homeassistant/home-assistant" +environment = ["TZ=Europe/Helsinki"] +devices = ["/dev/ttyACM0"] +volumes = [ + "/docker/homeautomation/home-assistant:/config", + "/etc/localtime:/etc/localtime:ro", +] +restart = "unless-stopped" +networks = ["homeautomation", "postgres", "proxy"] +ports = ["8123:8123", "8300:8300"] +depends_on = ["mosquitto"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.home-assistant-redirect.entrypoints=http", + "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)", + "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file", + "traefik.http.routers.home-assistant.entrypoints=https", + "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)", + "traefik.http.routers.home-assistant.service=home-assistant", + "traefik.docker.network=proxy", + "traefik.http.services.home-assistant.loadbalancer.server.port=8123", +] + +[services.esphome] +container_name = "esphome" +image = "esphome/esphome" +volumes = ["/docker/homeautomation/esphome:/config"] +restart = "unless-stopped" +network_mode = "host" + +[services.mosquitto] +container_name = "mosquitto" +image = "eclipse-mosquitto" +environment = ["TZ=Europe/Helsinki"] +ports = ["1883:1883"] +networks = ["homeautomation"] +volumes = [ + "/docker/homeautomation/mosquitto:/mosquitto", + "/etc/localtime:/etc/localtime:ro", +] +restart = "unless-stopped" + +[services.rhasspy] +container_name = "rhasspy" +image = "rhasspy/rhasspy" +command = "--profile en --user-profiles /profiles" +volumes = ["/docker/homeautomation/rhasspy:/profiles"] +environment = ["TZ=Europe/Helsinki"] +ports = ["12101:12101"] +networks = ["homeautomation"] +restart = "unless-stopped" +depends_on = ["home-assistant"] +devices = ["/dev/snd:/dev/snd"] + +[services.node-red] +container_name = "node-red" +image = "nodered/node-red" +environment = ["TZ=Europe/Helsinki", "proxy"] +ports = ["1880:1880"] +networks = ["homeautomation", "proxy"] +volumes = [ + "/docker/homeautomation/node-red:/data", + "/etc/localtime:/etc/localtime:ro", +] +restart = "unless-stopped" +depends_on = ["home-assistant"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.node-red-redirect.entrypoints=http", + "traefik.http.routers.node-red-redirect.rule=Host(`node.korhonen.cc`)", + "traefik.http.routers.node-red-redirect.middlewares=http2https@file", + "traefik.http.routers.node-red.entrypoints=https", + "traefik.http.routers.node-red.rule=Host(`node.korhonen.cc`)", + "traefik.http.routers.node-red.service=node-red", + "traefik.docker.network=proxy", + "traefik.http.services.node-red.loadbalancer.server.port=1880", +] + +[services.gotify] +image = "gotify/server" +container_name = "gotify" +volumes = ["/docker/homeautomation/gotify:/app/data"] +environment = [ + "GOTIFY_DATABASE_DIALECT=postgres", + "GOTIFY_DATABASE_CONNECTION=\"host=postgres port=5432 user=gotify dbname=gotify password=${GOTIFY_PGPASS} sslmode=disable\"", +] +networks = ["proxy", "postgres"] +restart = "unless-stopped" +labels = [ + "traefik.enable=true", + "traefik.http.routers.gotify-redirect.entrypoints=http", + "traefik.http.routers.gotify-redirect.rule=Host(`gotify.korhonen.cc`)", + "traefik.http.routers.gotify-redirect.middlewares=http2https@file", + "traefik.http.routers.gotify.entrypoints=https", + "traefik.http.routers.gotify.rule=Host(`gotify.korhonen.cc`)", + "traefik.http.routers.gotify.service=gotify", + "traefik.docker.network=proxy", + "traefik.http.services.gotify.loadbalancer.server.port=80", +] + +[networks] + +[networks.homeautomation] +external = false + +[networks.postgres] +external = true + +[networks.proxy] +external = true diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml deleted file mode 100644 index 4390f5fe..00000000 --- a/docker/homeautomation/docker-compose.yaml +++ /dev/null @@ -1,136 +0,0 @@ -services: - home-assistant: - container_name: home-assistant - image: homeassistant/home-assistant - environment: - - TZ=Europe/Helsinki - devices: - - /dev/ttyACM0 - volumes: - - /docker/homeautomation/home-assistant:/config - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped - networks: - - homeautomation - - postgres - - proxy - ports: - - "8123:8123" - - "8300:8300" - depends_on: - - mosquitto - labels: - - "traefik.enable=true" - - - "traefik.http.routers.home-assistant-redirect.entrypoints=http" - - "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)" - - "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file" - - - "traefik.http.routers.home-assistant.entrypoints=https" - - "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)" - - "traefik.http.routers.home-assistant.service=home-assistant" - - "traefik.docker.network=proxy" - - "traefik.http.services.home-assistant.loadbalancer.server.port=8123" - - esphome: - container_name: esphome - image: esphome/esphome - volumes: - - /docker/homeautomation/esphome:/config - restart: unless-stopped - network_mode: host - - mosquitto: - container_name: mosquitto - image: eclipse-mosquitto - environment: - - TZ=Europe/Helsinki - ports: - - "1883:1883" - networks: - - homeautomation - volumes: - - /docker/homeautomation/mosquitto:/mosquitto - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped - - rhasspy: - container_name: rhasspy - image: rhasspy/rhasspy - command: --profile en --user-profiles /profiles - volumes: - - /docker/homeautomation/rhasspy:/profiles - environment: - - TZ=Europe/Helsinki - ports: - - "12101:12101" - networks: - - homeautomation - restart: unless-stopped - depends_on: - - home-assistant - devices: - - "/dev/snd:/dev/snd" - - node-red: - container_name: node-red - image: nodered/node-red - environment: - - TZ=Europe/Helsinki - - proxy - ports: - - "1880:1880" - networks: - - homeautomation - - proxy - volumes: - - /docker/homeautomation/node-red:/data - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped - depends_on: - - home-assistant - labels: - - "traefik.enable=true" - - - "traefik.http.routers.node-red-redirect.entrypoints=http" - - "traefik.http.routers.node-red-redirect.rule=Host(`node.korhonen.cc`)" - - "traefik.http.routers.node-red-redirect.middlewares=http2https@file" - - - "traefik.http.routers.node-red.entrypoints=https" - - "traefik.http.routers.node-red.rule=Host(`node.korhonen.cc`)" - - "traefik.http.routers.node-red.service=node-red" - - "traefik.docker.network=proxy" - - "traefik.http.services.node-red.loadbalancer.server.port=1880" - - gotify: - image: gotify/server - container_name: gotify - volumes: - - /docker/homeautomation/gotify:/app/data - environment: - - GOTIFY_DATABASE_DIALECT=postgres - - GOTIFY_DATABASE_CONNECTION="host=postgres port=5432 user=gotify dbname=gotify password=${GOTIFY_PGPASS} sslmode=disable" - networks: - - proxy - - postgres - restart: unless-stopped - labels: - - "traefik.enable=true" - - - "traefik.http.routers.gotify-redirect.entrypoints=http" - - "traefik.http.routers.gotify-redirect.rule=Host(`gotify.korhonen.cc`)" - - "traefik.http.routers.gotify-redirect.middlewares=http2https@file" - - - "traefik.http.routers.gotify.entrypoints=https" - - "traefik.http.routers.gotify.rule=Host(`gotify.korhonen.cc`)" - - "traefik.http.routers.gotify.service=gotify" - - "traefik.docker.network=proxy" - - "traefik.http.services.gotify.loadbalancer.server.port=80" - -networks: - homeautomation: - external: false - postgres: - external: true - proxy: - external: true From e93b6a99fd3a16cbb85805936bcdf24d5d7b8b35 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 12:16:04 +0200 Subject: [PATCH 1000/2667] Convert home automation docker-compose config to toml --- docker/homeautomation/docker-compose.toml | 114 ++++++++++++++++++ docker/homeautomation/docker-compose.yaml | 136 ---------------------- 2 files changed, 114 insertions(+), 136 deletions(-) create mode 100644 docker/homeautomation/docker-compose.toml delete mode 100644 docker/homeautomation/docker-compose.yaml diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml new file mode 100644 index 00000000..ac3d20a8 --- /dev/null +++ b/docker/homeautomation/docker-compose.toml @@ -0,0 +1,114 @@ +[services] + +[services.home-assistant] +container_name = "home-assistant" +image = "homeassistant/home-assistant" +environment = ["TZ=Europe/Helsinki"] +devices = ["/dev/ttyACM0"] +volumes = [ + "/docker/homeautomation/home-assistant:/config", + "/etc/localtime:/etc/localtime:ro", +] +restart = "unless-stopped" +networks = ["homeautomation", "postgres", "proxy"] +ports = ["8123:8123", "8300:8300"] +depends_on = ["mosquitto"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.home-assistant-redirect.entrypoints=http", + "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)", + "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file", + "traefik.http.routers.home-assistant.entrypoints=https", + "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)", + "traefik.http.routers.home-assistant.service=home-assistant", + "traefik.docker.network=proxy", + "traefik.http.services.home-assistant.loadbalancer.server.port=8123", +] + +[services.esphome] +container_name = "esphome" +image = "esphome/esphome" +volumes = ["/docker/homeautomation/esphome:/config"] +restart = "unless-stopped" +network_mode = "host" + +[services.mosquitto] +container_name = "mosquitto" +image = "eclipse-mosquitto" +environment = ["TZ=Europe/Helsinki"] +ports = ["1883:1883"] +networks = ["homeautomation"] +volumes = [ + "/docker/homeautomation/mosquitto:/mosquitto", + "/etc/localtime:/etc/localtime:ro", +] +restart = "unless-stopped" + +[services.rhasspy] +container_name = "rhasspy" +image = "rhasspy/rhasspy" +command = "--profile en --user-profiles /profiles" +volumes = ["/docker/homeautomation/rhasspy:/profiles"] +environment = ["TZ=Europe/Helsinki"] +ports = ["12101:12101"] +networks = ["homeautomation"] +restart = "unless-stopped" +depends_on = ["home-assistant"] +devices = ["/dev/snd:/dev/snd"] + +[services.node-red] +container_name = "node-red" +image = "nodered/node-red" +environment = ["TZ=Europe/Helsinki", "proxy"] +ports = ["1880:1880"] +networks = ["homeautomation", "proxy"] +volumes = [ + "/docker/homeautomation/node-red:/data", + "/etc/localtime:/etc/localtime:ro", +] +restart = "unless-stopped" +depends_on = ["home-assistant"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.node-red-redirect.entrypoints=http", + "traefik.http.routers.node-red-redirect.rule=Host(`node.korhonen.cc`)", + "traefik.http.routers.node-red-redirect.middlewares=http2https@file", + "traefik.http.routers.node-red.entrypoints=https", + "traefik.http.routers.node-red.rule=Host(`node.korhonen.cc`)", + "traefik.http.routers.node-red.service=node-red", + "traefik.docker.network=proxy", + "traefik.http.services.node-red.loadbalancer.server.port=1880", +] + +[services.gotify] +image = "gotify/server" +container_name = "gotify" +volumes = ["/docker/homeautomation/gotify:/app/data"] +environment = [ + "GOTIFY_DATABASE_DIALECT=postgres", + "GOTIFY_DATABASE_CONNECTION=\"host=postgres port=5432 user=gotify dbname=gotify password=${GOTIFY_PGPASS} sslmode=disable\"", +] +networks = ["proxy", "postgres"] +restart = "unless-stopped" +labels = [ + "traefik.enable=true", + "traefik.http.routers.gotify-redirect.entrypoints=http", + "traefik.http.routers.gotify-redirect.rule=Host(`gotify.korhonen.cc`)", + "traefik.http.routers.gotify-redirect.middlewares=http2https@file", + "traefik.http.routers.gotify.entrypoints=https", + "traefik.http.routers.gotify.rule=Host(`gotify.korhonen.cc`)", + "traefik.http.routers.gotify.service=gotify", + "traefik.docker.network=proxy", + "traefik.http.services.gotify.loadbalancer.server.port=80", +] + +[networks] + +[networks.homeautomation] +external = false + +[networks.postgres] +external = true + +[networks.proxy] +external = true diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml deleted file mode 100644 index 4390f5fe..00000000 --- a/docker/homeautomation/docker-compose.yaml +++ /dev/null @@ -1,136 +0,0 @@ -services: - home-assistant: - container_name: home-assistant - image: homeassistant/home-assistant - environment: - - TZ=Europe/Helsinki - devices: - - /dev/ttyACM0 - volumes: - - /docker/homeautomation/home-assistant:/config - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped - networks: - - homeautomation - - postgres - - proxy - ports: - - "8123:8123" - - "8300:8300" - depends_on: - - mosquitto - labels: - - "traefik.enable=true" - - - "traefik.http.routers.home-assistant-redirect.entrypoints=http" - - "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)" - - "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file" - - - "traefik.http.routers.home-assistant.entrypoints=https" - - "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)" - - "traefik.http.routers.home-assistant.service=home-assistant" - - "traefik.docker.network=proxy" - - "traefik.http.services.home-assistant.loadbalancer.server.port=8123" - - esphome: - container_name: esphome - image: esphome/esphome - volumes: - - /docker/homeautomation/esphome:/config - restart: unless-stopped - network_mode: host - - mosquitto: - container_name: mosquitto - image: eclipse-mosquitto - environment: - - TZ=Europe/Helsinki - ports: - - "1883:1883" - networks: - - homeautomation - volumes: - - /docker/homeautomation/mosquitto:/mosquitto - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped - - rhasspy: - container_name: rhasspy - image: rhasspy/rhasspy - command: --profile en --user-profiles /profiles - volumes: - - /docker/homeautomation/rhasspy:/profiles - environment: - - TZ=Europe/Helsinki - ports: - - "12101:12101" - networks: - - homeautomation - restart: unless-stopped - depends_on: - - home-assistant - devices: - - "/dev/snd:/dev/snd" - - node-red: - container_name: node-red - image: nodered/node-red - environment: - - TZ=Europe/Helsinki - - proxy - ports: - - "1880:1880" - networks: - - homeautomation - - proxy - volumes: - - /docker/homeautomation/node-red:/data - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped - depends_on: - - home-assistant - labels: - - "traefik.enable=true" - - - "traefik.http.routers.node-red-redirect.entrypoints=http" - - "traefik.http.routers.node-red-redirect.rule=Host(`node.korhonen.cc`)" - - "traefik.http.routers.node-red-redirect.middlewares=http2https@file" - - - "traefik.http.routers.node-red.entrypoints=https" - - "traefik.http.routers.node-red.rule=Host(`node.korhonen.cc`)" - - "traefik.http.routers.node-red.service=node-red" - - "traefik.docker.network=proxy" - - "traefik.http.services.node-red.loadbalancer.server.port=1880" - - gotify: - image: gotify/server - container_name: gotify - volumes: - - /docker/homeautomation/gotify:/app/data - environment: - - GOTIFY_DATABASE_DIALECT=postgres - - GOTIFY_DATABASE_CONNECTION="host=postgres port=5432 user=gotify dbname=gotify password=${GOTIFY_PGPASS} sslmode=disable" - networks: - - proxy - - postgres - restart: unless-stopped - labels: - - "traefik.enable=true" - - - "traefik.http.routers.gotify-redirect.entrypoints=http" - - "traefik.http.routers.gotify-redirect.rule=Host(`gotify.korhonen.cc`)" - - "traefik.http.routers.gotify-redirect.middlewares=http2https@file" - - - "traefik.http.routers.gotify.entrypoints=https" - - "traefik.http.routers.gotify.rule=Host(`gotify.korhonen.cc`)" - - "traefik.http.routers.gotify.service=gotify" - - "traefik.docker.network=proxy" - - "traefik.http.services.gotify.loadbalancer.server.port=80" - -networks: - homeautomation: - external: false - postgres: - external: true - proxy: - external: true From 37529aa38a1933e0525897f069bcc2cb2fd890af Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 13:18:03 +0200 Subject: [PATCH 1001/2667] Add docker-compose TOML function --- dotdrop | 2 +- home/.config/zsh/03-aliases.zsh | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index b1b4839e..8c97593c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit b1b4839ef391c1503bcaef03d89161348d074ac6 +Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 81ed6882..6fc2d25a 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -238,3 +238,22 @@ btw, () { ▟███▀▘ ▝▀███▙ ▟▛▀ ▀▜▙" } + +# docker-compose with TOML +dct() { + local file_path=('./docker-compose.toml') + + zmodload zsh/zutil + zparseopts -D -K -- \ + f:=file_path || + return 1 + + file_path=${file_path[-1]} + + if [[ ! -a "$file_path" ]]; then + echo "File $file_path does not exist!" + return 1 + fi + + yj -ty < $file_path | docker-compose -f - $@ +} From 8aaa911e199c2cf579bc502d467abe59b8089cb5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 13:18:03 +0200 Subject: [PATCH 1002/2667] Add docker-compose TOML function --- dotdrop | 2 +- home/.config/zsh/03-aliases.zsh | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index b1b4839e..8c97593c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit b1b4839ef391c1503bcaef03d89161348d074ac6 +Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 81ed6882..6fc2d25a 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -238,3 +238,22 @@ btw, () { ▟███▀▘ ▝▀███▙ ▟▛▀ ▀▜▙" } + +# docker-compose with TOML +dct() { + local file_path=('./docker-compose.toml') + + zmodload zsh/zutil + zparseopts -D -K -- \ + f:=file_path || + return 1 + + file_path=${file_path[-1]} + + if [[ ! -a "$file_path" ]]; then + echo "File $file_path does not exist!" + return 1 + fi + + yj -ty < $file_path | docker-compose -f - $@ +} From d5d3f8a975139309b3fe6bfa6e02504223ec565c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 13:25:54 +0200 Subject: [PATCH 1003/2667] Convert rest of docker-compose files to TOML --- docker/authentik/docker-compose.toml | 77 ++++++++++++++++++ docker/authentik/docker-compose.yaml | 83 -------------------- docker/freshrss/docker-compose.toml | 56 +++++++++++++ docker/freshrss/docker-compose.yaml | 61 -------------- docker/gitea/docker-compose.toml | 29 +++++++ docker/gitea/docker-compose.yaml | 36 --------- docker/index.korhonen.cc/docker-compose.toml | 25 ++++++ docker/index.korhonen.cc/docker-compose.yaml | 28 ------- docker/jellyfin/docker-compose.toml | 38 +++++++++ docker/jellyfin/docker-compose.yaml | 38 --------- docker/mumble/docker-compose.toml | 10 +++ docker/mumble/docker-compose.yaml | 12 --- docker/nextcloud/docker-compose.toml | 76 ++++++++++++++++++ docker/nextcloud/docker-compose.yaml | 81 ------------------- docker/pihole/docker-compose.toml | 34 ++++++++ docker/pihole/docker-compose.yaml | 41 ---------- docker/postgres/docker-compose.toml | 18 +++++ docker/postgres/docker-compose.yaml | 19 ----- docker/remotely/docker-compose.toml | 23 ++++++ docker/remotely/docker-compose.yaml | 24 ------ docker/tftp/docker-compose.toml | 9 +++ docker/tftp/docker-compose.yaml | 12 --- docker/traefik/docker-compose.toml | 52 ++++++++++++ docker/traefik/docker-compose.yaml | 57 -------------- docker/tvheadend/docker-compose.toml | 32 ++++++++ docker/tvheadend/docker-compose.yaml | 37 --------- 26 files changed, 479 insertions(+), 529 deletions(-) create mode 100644 docker/authentik/docker-compose.toml delete mode 100644 docker/authentik/docker-compose.yaml create mode 100644 docker/freshrss/docker-compose.toml delete mode 100644 docker/freshrss/docker-compose.yaml create mode 100644 docker/gitea/docker-compose.toml delete mode 100644 docker/gitea/docker-compose.yaml create mode 100644 docker/index.korhonen.cc/docker-compose.toml delete mode 100644 docker/index.korhonen.cc/docker-compose.yaml create mode 100644 docker/jellyfin/docker-compose.toml delete mode 100644 docker/jellyfin/docker-compose.yaml create mode 100644 docker/mumble/docker-compose.toml delete mode 100644 docker/mumble/docker-compose.yaml create mode 100644 docker/nextcloud/docker-compose.toml delete mode 100644 docker/nextcloud/docker-compose.yaml create mode 100644 docker/pihole/docker-compose.toml delete mode 100644 docker/pihole/docker-compose.yaml create mode 100644 docker/postgres/docker-compose.toml delete mode 100644 docker/postgres/docker-compose.yaml create mode 100644 docker/remotely/docker-compose.toml delete mode 100644 docker/remotely/docker-compose.yaml create mode 100644 docker/tftp/docker-compose.toml delete mode 100644 docker/tftp/docker-compose.yaml create mode 100644 docker/traefik/docker-compose.toml delete mode 100644 docker/traefik/docker-compose.yaml create mode 100644 docker/tvheadend/docker-compose.toml delete mode 100644 docker/tvheadend/docker-compose.yaml diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml new file mode 100644 index 00000000..7fee304d --- /dev/null +++ b/docker/authentik/docker-compose.toml @@ -0,0 +1,77 @@ +[services] + +[services.redis] +container_name = "authentik-redis" +image = "redis:alpine" +restart = "unless-stopped" +networks = ["authentik"] + +[services.authentik] +container_name = "authentik" +image = "${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.10.4}" +restart = "unless-stopped" +command = "server" +volumes = [ + "/docker/authentik/media:/media", + "/docker/authentik/custom-templates:/templates", + "/docker/authentik/geoip:/geoip", +] +env_file = [".env"] +networks = ["authentik", "postgres", "proxy"] +ports = ["9000:9000"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.authentik-redirect.entrypoints=http", + "traefik.http.routers.authentik-redirect.rule=Host(`sso.korhonen.cc`)", + "traefik.http.routers.authentik-redirect.middlewares=http2https@file", + "traefik.http.routers.authentik.entrypoints=https", + "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)", + "traefik.http.routers.authentik.service=authentik", + "traefik.docker.network=proxy", + "traefik.http.services.authentik.loadbalancer.server.port=9000", +] + +[services.authentik-worker] +container_name = "authentik-worker" +image = "${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.10.4}" +restart = "unless-stopped" +command = "worker" +networks = ["authentik", "postgres"] +user = "root" +volumes = [ + "/docker/authentik/backups:/backups", + "/docker/authentik/media:/media", + "/var/run/docker.sock:/var/run/docker.sock", + "/docker/authentik/custom-templates:/templates", + "/docker/authentik/geoip:/geoip", +] +environment = [ + "AUTHENTIK_POSTGRESQL__HOST", + "AUTHENTIK_POSTGRESQL__USER", + "AUTHENTIK_POSTGRESQL__NAME", + "AUTHENTIK_POSTGRESQL__PASSWORD", + "AUTHENTIK_SECRET_KEY", +] +env_file = [".env"] + +[services.geoipupdate] +container_name = "authentik-geoip" +image = "maxmindinc/geoipupdate:latest" +volumes = ["/docker/authentik/geoip:/usr/share/GeoIP"] +env_file = [".env"] +networks = ["authentik"] + +[services.geoipupdate.environment] +GEOIPUPDATE_EDITION_IDS = "GeoLite2-City" +GEOIPUPDATE_FREQUENCY = "8" + +[networks] + +[networks.authentik] +external = true + +[networks.postgres] +external = true + +[networks.proxy] +external = true diff --git a/docker/authentik/docker-compose.yaml b/docker/authentik/docker-compose.yaml deleted file mode 100644 index ec2161cd..00000000 --- a/docker/authentik/docker-compose.yaml +++ /dev/null @@ -1,83 +0,0 @@ -services: - - redis: - container_name: authentik-redis - image: redis:alpine - restart: unless-stopped - networks: - - authentik - - authentik: - container_name: authentik - image: ${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.10.4} - restart: unless-stopped - command: server - volumes: - - /docker/authentik/media:/media - - /docker/authentik/custom-templates:/templates - - /docker/authentik/geoip:/geoip - env_file: - - .env - networks: - - authentik - - postgres - - proxy - ports: - - 9000:9000 - labels: - - "traefik.enable=true" - - - "traefik.http.routers.authentik-redirect.entrypoints=http" - - "traefik.http.routers.authentik-redirect.rule=Host(`sso.korhonen.cc`)" - - "traefik.http.routers.authentik-redirect.middlewares=http2https@file" - - - "traefik.http.routers.authentik.entrypoints=https" - - "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)" - - "traefik.http.routers.authentik.service=authentik" - - "traefik.docker.network=proxy" - - "traefik.http.services.authentik.loadbalancer.server.port=9000" - - authentik-worker: - container_name: authentik-worker - image: ${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.10.4} - restart: unless-stopped - command: worker - networks: - - authentik - - postgres - user: root - volumes: - - /docker/authentik/backups:/backups - - /docker/authentik/media:/media - - /var/run/docker.sock:/var/run/docker.sock - - /docker/authentik/custom-templates:/templates - - /docker/authentik/geoip:/geoip - environment: - - AUTHENTIK_POSTGRESQL__HOST - - AUTHENTIK_POSTGRESQL__USER - - AUTHENTIK_POSTGRESQL__NAME - - AUTHENTIK_POSTGRESQL__PASSWORD - - AUTHENTIK_SECRET_KEY - env_file: - - .env - - geoipupdate: - container_name: authentik-geoip - image: "maxmindinc/geoipupdate:latest" - volumes: - - /docker/authentik/geoip:/usr/share/GeoIP - environment: - GEOIPUPDATE_EDITION_IDS: "GeoLite2-City" - GEOIPUPDATE_FREQUENCY: "8" - env_file: - - .env - networks: - - authentik - -networks: - authentik: - external: true - postgres: - external: true - proxy: - external: true diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml new file mode 100644 index 00000000..538cb1f3 --- /dev/null +++ b/docker/freshrss/docker-compose.toml @@ -0,0 +1,56 @@ +[services] + +[services.freshrss] +image = "linuxserver/freshrss" +container_name = "freshrss" +restart = "unless-stopped" +networks = ["freshrss", "postgres", "proxy"] +environment = ["PUID=1000", "PGID=985", "TZ=Europe/Helsinki"] +depends_on = ["bibliogram"] +volumes = [ + "/docker/freshrss/freshrss:/config", + "/etc/localtime:/etc/localtime:ro", +] +labels = [ + "traefik.enable=true", + "traefik.http.routers.freshrss-redirect.entrypoints=http", + "traefik.http.routers.freshrss-redirect.rule=Host(`rss.korhonen.cc`)", + "traefik.http.routers.freshrss-redirect.middlewares=http2https@file", + "traefik.http.routers.freshrss.entrypoints=https", + "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)", + "traefik.http.routers.freshrss.service=freshrss", + "traefik.docker.network=proxy", + "traefik.http.services.freshrss.loadbalancer.server.port=80", +] + +[services.bibliogram] +image = "cloudrac3r/bibliogram" +container_name = "bibliogram" +restart = "unless-stopped" +volumes = [ + "/docker/freshrss/bibliogram/db:/app/db", + "/docker/freshrss/bibliogram/config.js:/app/config.js", +] +networks = ["freshrss", "proxy"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.bibliogram-redirect.entrypoints=http", + "traefik.http.routers.bibliogram-redirect.rule=Host(`bibliogram.korhonen.cc`)", + "traefik.http.routers.bibliogram-redirect.middlewares=http2https@file", + "traefik.http.routers.bibliogram.entrypoints=https", + "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)", + "traefik.http.routers.bibliogram.service=bibliogram", + "traefik.docker.network=proxy", + "traefik.http.services.bibliogram.loadbalancer.server.port=10407", +] + +[networks] + +[networks.freshrss] +external = false + +[networks.postgres] +external = true + +[networks.proxy] +external = true diff --git a/docker/freshrss/docker-compose.yaml b/docker/freshrss/docker-compose.yaml deleted file mode 100644 index b1bb806a..00000000 --- a/docker/freshrss/docker-compose.yaml +++ /dev/null @@ -1,61 +0,0 @@ -services: - freshrss: - image: linuxserver/freshrss - container_name: freshrss - restart: unless-stopped - networks: - - freshrss - - postgres - - proxy - environment: - - PUID=1000 - - PGID=985 - - TZ=Europe/Helsinki - depends_on: - - bibliogram - volumes: - - /docker/freshrss/freshrss:/config - - /etc/localtime:/etc/localtime:ro - labels: - - "traefik.enable=true" - - - "traefik.http.routers.freshrss-redirect.entrypoints=http" - - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.korhonen.cc`)" - - "traefik.http.routers.freshrss-redirect.middlewares=http2https@file" - - - "traefik.http.routers.freshrss.entrypoints=https" - - "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)" - - "traefik.http.routers.freshrss.service=freshrss" - - "traefik.docker.network=proxy" - - "traefik.http.services.freshrss.loadbalancer.server.port=80" - - bibliogram: - image: cloudrac3r/bibliogram - container_name: bibliogram - restart: unless-stopped - volumes: - - /docker/freshrss/bibliogram/db:/app/db - - /docker/freshrss/bibliogram/config.js:/app/config.js - networks: - - freshrss - - proxy - labels: - - "traefik.enable=true" - - - "traefik.http.routers.bibliogram-redirect.entrypoints=http" - - "traefik.http.routers.bibliogram-redirect.rule=Host(`bibliogram.korhonen.cc`)" - - "traefik.http.routers.bibliogram-redirect.middlewares=http2https@file" - - - "traefik.http.routers.bibliogram.entrypoints=https" - - "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)" - - "traefik.http.routers.bibliogram.service=bibliogram" - - "traefik.docker.network=proxy" - - "traefik.http.services.bibliogram.loadbalancer.server.port=10407" - -networks: - freshrss: - external: false - postgres: - external: true - proxy: - external: true diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml new file mode 100644 index 00000000..dc4c9220 --- /dev/null +++ b/docker/gitea/docker-compose.toml @@ -0,0 +1,29 @@ +[services] + +[services.gitea] +container_name = "gitea" +image = "gitea/gitea:1" +environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] +restart = "unless-stopped" +networks = ["postgres", "proxy"] +ports = ["3000:3000", "22:22"] +volumes = ["/docker/gitea:/data", "/etc/localtime:/etc/localtime:ro"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.gitea-redirect.entrypoints=http", + "traefik.http.routers.gitea-redirect.rule=Host(`git.korhonen.cc`)", + "traefik.http.routers.gitea-redirect.middlewares=http2https@file", + "traefik.http.routers.gitea.entrypoints=https", + "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)", + "traefik.http.routers.gitea.service=gitea", + "traefik.docker.network=proxy", + "traefik.http.services.gitea.loadbalancer.server.port=3000", +] + +[networks] + +[networks.postgres] +external = true + +[networks.proxy] +external = true diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml deleted file mode 100644 index 1f1318ad..00000000 --- a/docker/gitea/docker-compose.yaml +++ /dev/null @@ -1,36 +0,0 @@ -services: - gitea: - container_name: gitea - image: gitea/gitea:1 - environment: - - TZ=Europe/Helsinki - - USER_UID=1000 - - USER_GID=1000 - restart: unless-stopped - networks: - - postgres - - proxy - ports: - - "3000:3000" - - "22:22" - volumes: - - /docker/gitea:/data - - /etc/localtime:/etc/localtime:ro - labels: - - "traefik.enable=true" - - - "traefik.http.routers.gitea-redirect.entrypoints=http" - - "traefik.http.routers.gitea-redirect.rule=Host(`git.korhonen.cc`)" - - "traefik.http.routers.gitea-redirect.middlewares=http2https@file" - - - "traefik.http.routers.gitea.entrypoints=https" - - "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)" - - "traefik.http.routers.gitea.service=gitea" - - "traefik.docker.network=proxy" - - "traefik.http.services.gitea.loadbalancer.server.port=3000" - -networks: - postgres: - external: true - proxy: - external: true diff --git a/docker/index.korhonen.cc/docker-compose.toml b/docker/index.korhonen.cc/docker-compose.toml new file mode 100644 index 00000000..ea4eb287 --- /dev/null +++ b/docker/index.korhonen.cc/docker-compose.toml @@ -0,0 +1,25 @@ +[services] + +[services.nginx] +image = "fraoustin/fancyindex" +container_name = "index.korhonen.cc" +environment = ["DISABLE_AUTH=true", "CONTAINER_TIMEZONE=\"Europe/Helsinki\""] +volumes = ["/docker/index.korhonen.cc:/share"] +networks = ["proxy"] +restart = "unless-stopped" +labels = [ + "traefik.enable=true", + "traefik.http.routers.index-redirect.entrypoints=http", + "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)", + "traefik.http.routers.index-redirect.middlewares=http2https@file", + "traefik.http.routers.index.entrypoints=https", + "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)", + "traefik.http.routers.index.service=index", + "traefik.docker.network=proxy", + "traefik.http.services.index.loadbalancer.server.port=80", +] + +[networks] + +[networks.proxy] +external = true diff --git a/docker/index.korhonen.cc/docker-compose.yaml b/docker/index.korhonen.cc/docker-compose.yaml deleted file mode 100644 index a14b852f..00000000 --- a/docker/index.korhonen.cc/docker-compose.yaml +++ /dev/null @@ -1,28 +0,0 @@ -services: - nginx: - image: fraoustin/fancyindex - container_name: index.korhonen.cc - environment: - - DISABLE_AUTH=true - - CONTAINER_TIMEZONE="Europe/Helsinki" - volumes: - - /docker/index.korhonen.cc:/share - networks: - - proxy - restart: unless-stopped - labels: - - "traefik.enable=true" - - - "traefik.http.routers.index-redirect.entrypoints=http" - - "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)" - - "traefik.http.routers.index-redirect.middlewares=http2https@file" - - - "traefik.http.routers.index.entrypoints=https" - - "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)" - - "traefik.http.routers.index.service=index" - - "traefik.docker.network=proxy" - - "traefik.http.services.index.loadbalancer.server.port=80" - -networks: - proxy: - external: true diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml new file mode 100644 index 00000000..0ea17c77 --- /dev/null +++ b/docker/jellyfin/docker-compose.toml @@ -0,0 +1,38 @@ +[services] + +[services.jellyfin] +image = "jellyfin/jellyfin:10.8.0-alpha5" +container_name = "jellyfin" +environment = ["TZ=Europe/Helsinki"] +ports = ["8096:8096"] +networks = ["proxy", "authentik"] +restart = "unless-stopped" +volumes = [ + "/docker/jellyfin/config:/config", + "/docker/jellyfin/cache:/cache", + "/mnt/Storage/Media:/media", + "/etc/localtime:/etc/localtime:ro", +] +devices = [ + "/dev/dri/renderD128:/dev/dri/renderD128", + "/dev/dri/card0:/dev/dri/card0", +] +labels = [ + "traefik.enable=true", + "traefik.http.routers.jellyfin-redirect.entrypoints=http", + "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)", + "traefik.http.routers.jellyfin-redirect.middlewares=http2https@file", + "traefik.http.routers.jellyfin.entrypoints=https", + "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)", + "traefik.http.routers.jellyfin.service=jellyfin", + "traefik.docker.network=proxy", + "traefik.http.services.jellyfin.loadbalancer.server.port=8096", +] + +[networks] + +[networks.proxy] +external = true + +[networks.authentik] +external = true diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml deleted file mode 100644 index b5464000..00000000 --- a/docker/jellyfin/docker-compose.yaml +++ /dev/null @@ -1,38 +0,0 @@ -services: - jellyfin: - image: jellyfin/jellyfin:10.8.0-alpha5 - container_name: jellyfin - environment: - - TZ=Europe/Helsinki - ports: - - "8096:8096" - networks: - - proxy - - authentik - restart: unless-stopped - volumes: - - /docker/jellyfin/config:/config - - /docker/jellyfin/cache:/cache - - /mnt/Storage/Media:/media - - /etc/localtime:/etc/localtime:ro - devices: - - /dev/dri/renderD128:/dev/dri/renderD128 - - /dev/dri/card0:/dev/dri/card0 - labels: - - "traefik.enable=true" - - - "traefik.http.routers.jellyfin-redirect.entrypoints=http" - - "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)" - - "traefik.http.routers.jellyfin-redirect.middlewares=http2https@file" - - - "traefik.http.routers.jellyfin.entrypoints=https" - - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)" - - "traefik.http.routers.jellyfin.service=jellyfin" - - "traefik.docker.network=proxy" - - "traefik.http.services.jellyfin.loadbalancer.server.port=8096" - -networks: - proxy: - external: true - authentik: - external: true diff --git a/docker/mumble/docker-compose.toml b/docker/mumble/docker-compose.toml new file mode 100644 index 00000000..fa1afaa3 --- /dev/null +++ b/docker/mumble/docker-compose.toml @@ -0,0 +1,10 @@ +[services] + +[services.mumble] +container_name = "mumble" +image = "phlak/mumble" +user = "1000:985" +environment = ["TZ=Europe/Helsinki"] +network_mode = "host" +volumes = ["/docker/mumble:/etc/mumble", "/etc/localtime:/etc/localtime:ro"] +restart = "unless-stopped" diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml deleted file mode 100644 index 570697e5..00000000 --- a/docker/mumble/docker-compose.yaml +++ /dev/null @@ -1,12 +0,0 @@ -services: - mumble: - container_name: mumble - image: phlak/mumble - user: "1000:985" - environment: - - TZ=Europe/Helsinki - network_mode: host - volumes: - - /docker/mumble:/etc/mumble - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml new file mode 100644 index 00000000..75bd91e1 --- /dev/null +++ b/docker/nextcloud/docker-compose.toml @@ -0,0 +1,76 @@ +[services] + +[services.nextcloud] +image = "nextcloud:apache" +container_name = "nextcloud" +restart = "always" +ports = ["1869:80"] +networks = ["nextcloud", "postgres", "proxy"] +volumes = [ + "/docker/nextcloud:/var/www/html", + "/mnt/Storage/Nextcloud:/var/www/html/data", + "/mnt/Storage/Syncthing:/Syncthing", + "/mnt/Storage/Media/Music:/Music", + "/etc/localtime:/etc/localtime:ro", +] +environment = [ + "TZ=Europe/Helsinki", + "REDIS_HOST=redis", + "REDIS_HOST_PASSWORD=123", +] +depends_on = ["redis"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.nextcloud-redirect.entrypoints=http", + "traefik.http.routers.nextcloud-redirect.rule=Host(`cloud.korhonen.cc`)", + "traefik.http.routers.nextcloud-redirect.middlewares=http2https@file", + "traefik.http.routers.nextcloud.entrypoints=https", + "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)", + "traefik.http.routers.nextcloud.service=nextcloud", + "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-dav@file", + "traefik.docker.network=proxy", + "traefik.http.services.nextcloud.loadbalancer.server.port=80", +] + +[services.redis] +image = "redis:alpine" +container_name = "redis" +networks = ["nextcloud"] +restart = "always" +command = "redis-server --requirepass 123" + +[services.cron] +image = "nextcloud:apache" +container_name = "nextcloud-cron" +restart = "always" +volumes = ["/docker/nextcloud:/var/www/html"] +entrypoint = "/cron.sh" +depends_on = ["redis"] + +[services.coturn] +image = "instrumentisto/coturn" +container_name = "coturn" +restart = "unless-stopped" +env_file = ".env" +ports = ["3478:3478/tcp", "3478:3478/udp"] +networks = ["nextcloud"] +command = [ + "-n", + "--log-file=stdout", + "--min-port=49160", + "--max-port=49200", + "--realm=cloud.korhonen.cc", + "--use-auth-secret", + "--static-auth-secret=${STATIC_AUTH_SECRET}", +] + +[networks] + +[networks.nextcloud] +external = false + +[networks.postgres] +external = true + +[networks.proxy] +external = true diff --git a/docker/nextcloud/docker-compose.yaml b/docker/nextcloud/docker-compose.yaml deleted file mode 100644 index 94b3e7ae..00000000 --- a/docker/nextcloud/docker-compose.yaml +++ /dev/null @@ -1,81 +0,0 @@ -services: - nextcloud: - image: nextcloud:apache - container_name: nextcloud - restart: always - ports: - - "1869:80" - networks: - - nextcloud - - postgres - - proxy - volumes: - - /docker/nextcloud:/var/www/html - - /mnt/Storage/Nextcloud:/var/www/html/data - - /mnt/Storage/Syncthing:/Syncthing - - /mnt/Storage/Media/Music:/Music - - /etc/localtime:/etc/localtime:ro - environment: - - TZ=Europe/Helsinki - - REDIS_HOST=redis - - REDIS_HOST_PASSWORD=123 - depends_on: - - redis - labels: - - "traefik.enable=true" - - - "traefik.http.routers.nextcloud-redirect.entrypoints=http" - - "traefik.http.routers.nextcloud-redirect.rule=Host(`cloud.korhonen.cc`)" - - "traefik.http.routers.nextcloud-redirect.middlewares=http2https@file" - - - "traefik.http.routers.nextcloud.entrypoints=https" - - "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)" - - "traefik.http.routers.nextcloud.service=nextcloud" - - "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-dav@file" - - "traefik.docker.network=proxy" - - "traefik.http.services.nextcloud.loadbalancer.server.port=80" - - redis: - image: redis:alpine - container_name: redis - networks: - - nextcloud - restart: always - command: redis-server --requirepass 123 - - cron: - image: nextcloud:apache - container_name: nextcloud-cron - restart: always - volumes: - - /docker/nextcloud:/var/www/html - entrypoint: /cron.sh - depends_on: - - redis - - coturn: - image: instrumentisto/coturn - container_name: coturn - restart: unless-stopped - env_file: .env - ports: - - "3478:3478/tcp" - - "3478:3478/udp" - networks: - - nextcloud - command: - - -n - - --log-file=stdout - - --min-port=49160 - - --max-port=49200 - - --realm=cloud.korhonen.cc - - --use-auth-secret - - --static-auth-secret=${STATIC_AUTH_SECRET} - -networks: - nextcloud: - external: false - postgres: - external: true - proxy: - external: true diff --git a/docker/pihole/docker-compose.toml b/docker/pihole/docker-compose.toml new file mode 100644 index 00000000..27f4af69 --- /dev/null +++ b/docker/pihole/docker-compose.toml @@ -0,0 +1,34 @@ +[services] + +[services.pihole] +container_name = "pihole" +image = "pihole/pihole:latest" +ports = ["53:53/tcp", "53:53/udp", "67:67/udp", "8069:80/tcp"] +networks = ["proxy"] +volumes = [ + "/docker/pihole/pihole:/etc/pihole/", + "/docker/pihole/dnsmasq:/etc/dnsmasq.d/", +] +dns = ["127.0.0.1", "1.1.1.1"] +cap_add = ["NET_ADMIN"] +restart = "unless-stopped" +labels = [ + "traefik.enable=true", + "traefik.http.routers.pihole-redirect.entrypoints=http", + "traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)", + "traefik.http.routers.pihole-redirect.middlewares=http2https@file", + "traefik.http.routers.pihole.entrypoints=https", + "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)", + "traefik.http.routers.pihole.service=pihole", + "traefik.docker.network=proxy", + "traefik.http.services.pihole.loadbalancer.server.port=80", +] + +[services.pihole.environment] +TZ = "Europe/Helsinki" +WEBPASSWORD = "${WEBPASSWORD}" + +[networks] + +[networks.proxy] +external = true diff --git a/docker/pihole/docker-compose.yaml b/docker/pihole/docker-compose.yaml deleted file mode 100644 index 0a0f9c27..00000000 --- a/docker/pihole/docker-compose.yaml +++ /dev/null @@ -1,41 +0,0 @@ -services: - pihole: - container_name: pihole - image: pihole/pihole:latest - ports: - - "53:53/tcp" - - "53:53/udp" - - "67:67/udp" - - "8069:80/tcp" - networks: - - proxy - environment: - TZ: "Europe/Helsinki" - WEBPASSWORD: "${WEBPASSWORD}" - volumes: - - "/docker/pihole/pihole:/etc/pihole/" - - "/docker/pihole/dnsmasq:/etc/dnsmasq.d/" - dns: - - 127.0.0.1 - - 1.1.1.1 - # Recommended but not required (DHCP needs NET_ADMIN) - # https://github.com/pihole/docker-pihole#note-on-capabilities - cap_add: - - NET_ADMIN - restart: unless-stopped - labels: - - "traefik.enable=true" - - - "traefik.http.routers.pihole-redirect.entrypoints=http" - - "traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)" - - "traefik.http.routers.pihole-redirect.middlewares=http2https@file" - - - "traefik.http.routers.pihole.entrypoints=https" - - "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)" - - "traefik.http.routers.pihole.service=pihole" - - "traefik.docker.network=proxy" - - "traefik.http.services.pihole.loadbalancer.server.port=80" - -networks: - proxy: - external: true diff --git a/docker/postgres/docker-compose.toml b/docker/postgres/docker-compose.toml new file mode 100644 index 00000000..4c5049ae --- /dev/null +++ b/docker/postgres/docker-compose.toml @@ -0,0 +1,18 @@ +[services] + +[services.postgres] +container_name = "postgres" +image = "postgres:13" +environment = ["TZ=Europe/Helsinki", "POSTGRES_PASSWORD=12345"] +ports = ["5432:5432"] +networks = ["postgres"] +volumes = [ + "/docker/postgres:/var/lib/postgresql/data", + "/etc/localtime:/etc/localtime:ro", +] +restart = "unless-stopped" + +[networks] + +[networks.postgres] +external = true diff --git a/docker/postgres/docker-compose.yaml b/docker/postgres/docker-compose.yaml deleted file mode 100644 index 4355ba96..00000000 --- a/docker/postgres/docker-compose.yaml +++ /dev/null @@ -1,19 +0,0 @@ -services: - postgres: - container_name: postgres - image: postgres:13 - environment: - - TZ=Europe/Helsinki - - POSTGRES_PASSWORD=12345 - ports: - - 5432:5432 - networks: - - postgres - volumes: - - /docker/postgres:/var/lib/postgresql/data - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped - -networks: - postgres: - external: true diff --git a/docker/remotely/docker-compose.toml b/docker/remotely/docker-compose.toml new file mode 100644 index 00000000..88765848 --- /dev/null +++ b/docker/remotely/docker-compose.toml @@ -0,0 +1,23 @@ +[services] + +[services.remotely] +image = "translucency/remotely" +container_name = "remotely" +networks = ["proxy"] +volumes = ["/docker/remotely:/remotely-data"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.remotely-redirect.entrypoints=http", + "traefik.http.routers.remotely-redirect.rule=Host(`remotely.korhonen.cc`)", + "traefik.http.routers.remotely-redirect.middlewares=http2https@file", + "traefik.http.routers.remotely.entrypoints=https", + "traefik.http.routers.remotely.rule=Host(`remotely.korhonen.cc`)", + "traefik.http.routers.remotely.service=remotely", + "traefik.docker.network=proxy", + "traefik.http.services.remotely.loadbalancer.server.port=5000", +] + +[networks] + +[networks.proxy] +external = true diff --git a/docker/remotely/docker-compose.yaml b/docker/remotely/docker-compose.yaml deleted file mode 100644 index a7b41689..00000000 --- a/docker/remotely/docker-compose.yaml +++ /dev/null @@ -1,24 +0,0 @@ -services: - remotely: - image: translucency/remotely - container_name: remotely - networks: - - proxy - volumes: - - /docker/remotely:/remotely-data - labels: - - "traefik.enable=true" - - - "traefik.http.routers.remotely-redirect.entrypoints=http" - - "traefik.http.routers.remotely-redirect.rule=Host(`remotely.korhonen.cc`)" - - "traefik.http.routers.remotely-redirect.middlewares=http2https@file" - - - "traefik.http.routers.remotely.entrypoints=https" - - "traefik.http.routers.remotely.rule=Host(`remotely.korhonen.cc`)" - - "traefik.http.routers.remotely.service=remotely" - - "traefik.docker.network=proxy" - - "traefik.http.services.remotely.loadbalancer.server.port=5000" - -networks: - proxy: - external: true diff --git a/docker/tftp/docker-compose.toml b/docker/tftp/docker-compose.toml new file mode 100644 index 00000000..bdb6db47 --- /dev/null +++ b/docker/tftp/docker-compose.toml @@ -0,0 +1,9 @@ +[services] + +[services.tftp] +container_name = "tftp" +image = "pghalliday/tftp" +environment = ["TZ=Europe/Helsinki"] +restart = "unless-stopped" +ports = ["69:69/udp"] +volumes = ["/etc/localtime:/etc/localtime:ro", "/docker/tftp:/var/tftpboot"] diff --git a/docker/tftp/docker-compose.yaml b/docker/tftp/docker-compose.yaml deleted file mode 100644 index 47d6d3c0..00000000 --- a/docker/tftp/docker-compose.yaml +++ /dev/null @@ -1,12 +0,0 @@ -services: - tftp: - container_name: tftp - image: pghalliday/tftp - environment: - - TZ=Europe/Helsinki - restart: unless-stopped - ports: - - 69:69/udp - volumes: - - /etc/localtime:/etc/localtime:ro - - /docker/tftp:/var/tftpboot diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml new file mode 100644 index 00000000..828784d7 --- /dev/null +++ b/docker/traefik/docker-compose.toml @@ -0,0 +1,52 @@ +[services] + +[services.traefik] +image = "traefik:latest" +container_name = "traefik" +restart = "unless-stopped" +ports = ["80:80", "443:443/tcp", "443:443/udp"] +environment = ["TZ=Europe/Helsinki"] +security_opt = ["no-new-privileges:true"] +networks = ["proxy"] +volumes = [ + "/etc/localtime:/etc/localtime:ro", + "/var/run/docker.sock:/var/run/docker.sock:ro", + "/docker/traefik/traefik/traefik.toml:/traefik.toml:ro", + "/docker/traefik/traefik/dynamic.toml:/dynamic.toml:ro", + "/docker/traefik/traefik/dashboard-users:/dashboard-users:ro", + "/docker/traefik/traefik/acme.json:/acme.json", + "/docker/traefik/traefik/log:/var/log", +] +labels = [ + "traefik.enable=true", + "traefik.http.routers.redirect.entrypoints=http", + "traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)", + "traefik.http.routers.redirect.middlewares=http2https@file", + "traefik.http.routers.dashboard.entrypoints=https", + "traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)", + "traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users", + "traefik.http.routers.dashboard.middlewares=dashboard-auth", + "traefik.http.routers.dashboard.service=api@internal", + "traefik.docker.network=proxy", +] + +[services.fail2ban] +image = "crazymax/fail2ban:latest" +container_name = "fail2ban" +restart = "unless-stopped" +network_mode = "host" +cap_add = ["NET_ADMIN", "NET_RAW"] +environment = ["TZ=Europe/Helsinki"] +volumes = [ + "/etc/localtime:/etc/localtime:ro", + "/docker/traefik/traefik/log:/var/log/traefik:ro", + "/docker/traefik/fail2ban:/data", + "/docker/gitea/gitea/log/gitea.log:/var/log/gitea:ro", + "/docker/homeautomation/home-assistant/home-assistant.log:/var/log/hass", + "/mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro", +] + +[networks] + +[networks.proxy] +external = true diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml deleted file mode 100644 index 3eed22de..00000000 --- a/docker/traefik/docker-compose.yaml +++ /dev/null @@ -1,57 +0,0 @@ -services: - traefik: - image: traefik:latest - container_name: traefik - restart: unless-stopped - ports: - - '80:80' - - '443:443/tcp' - - '443:443/udp' - environment: - - TZ=Europe/Helsinki - security_opt: - - no-new-privileges:true - networks: - - proxy - volumes: - - /etc/localtime:/etc/localtime:ro - - /var/run/docker.sock:/var/run/docker.sock:ro - - /docker/traefik/traefik/traefik.toml:/traefik.toml:ro - - /docker/traefik/traefik/dynamic.toml:/dynamic.toml:ro - - /docker/traefik/traefik/dashboard-users:/dashboard-users:ro - - /docker/traefik/traefik/acme.json:/acme.json - - /docker/traefik/traefik/log:/var/log - labels: - # Serve dashboard - - 'traefik.enable=true' - - 'traefik.http.routers.redirect.entrypoints=http' - - 'traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)' - - 'traefik.http.routers.redirect.middlewares=http2https@file' - - - 'traefik.http.routers.dashboard.entrypoints=https' - - 'traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)' - - 'traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users' - - 'traefik.http.routers.dashboard.middlewares=dashboard-auth' - - 'traefik.http.routers.dashboard.service=api@internal' - - 'traefik.docker.network=proxy' - - fail2ban: - image: crazymax/fail2ban:latest - container_name: fail2ban - restart: unless-stopped - network_mode: "host" - cap_add: - - NET_ADMIN - - NET_RAW - environment: - - TZ=Europe/Helsinki - volumes: - - /etc/localtime:/etc/localtime:ro - - /docker/traefik/traefik/log:/var/log/traefik:ro - - /docker/traefik/fail2ban:/data - - /docker/gitea/gitea/log/gitea.log:/var/log/gitea:ro - - /docker/homeautomation/home-assistant/home-assistant.log:/var/log/hass - - /mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro -networks: - proxy: - external: true diff --git a/docker/tvheadend/docker-compose.toml b/docker/tvheadend/docker-compose.toml new file mode 100644 index 00000000..c3aef502 --- /dev/null +++ b/docker/tvheadend/docker-compose.toml @@ -0,0 +1,32 @@ +[services] + +[services.tvheadend] +image = "linuxserver/tvheadend" +container_name = "tvheadend" +environment = ["TZ=Europe/Helsinki", "PUID=1000", "PGID=985"] +volumes = [ + "/docker/tvheadend:/config", + "/mnt/Storage/Media/PVR:/recordings", + "/mnt/Storage/picons:/picons", + "/etc/localtime:/etc/localtime:ro", +] +ports = ["9981:9981", "9982:9982"] +devices = ["/dev/dvb:/dev/dvb"] +restart = "unless-stopped" +networks = ["proxy"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.tvheadend-redirect.entrypoints=http", + "traefik.http.routers.tvheadend-redirect.rule=Host(`tvheadend.korhonen.cc`)", + "traefik.http.routers.tvheadend-redirect.middlewares=http2https@file", + "traefik.http.routers.tvheadend.entrypoints=https", + "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)", + "traefik.http.routers.tvheadend.service=tvheadend", + "traefik.docker.network=proxy", + "traefik.http.services.tvheadend.loadbalancer.server.port=9981", +] + +[networks] + +[networks.proxy] +external = true diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml deleted file mode 100644 index 6c6dabc9..00000000 --- a/docker/tvheadend/docker-compose.yaml +++ /dev/null @@ -1,37 +0,0 @@ -services: - tvheadend: - image: linuxserver/tvheadend - container_name: tvheadend - environment: - - TZ=Europe/Helsinki - - PUID=1000 - - PGID=985 - volumes: - - /docker/tvheadend:/config - - /mnt/Storage/Media/PVR:/recordings - - /mnt/Storage/picons:/picons - - /etc/localtime:/etc/localtime:ro - ports: - - 9981:9981 - - 9982:9982 - devices: - - /dev/dvb:/dev/dvb #tuner card - restart: unless-stopped - networks: - - proxy - labels: - - "traefik.enable=true" - - - "traefik.http.routers.tvheadend-redirect.entrypoints=http" - - "traefik.http.routers.tvheadend-redirect.rule=Host(`tvheadend.korhonen.cc`)" - - "traefik.http.routers.tvheadend-redirect.middlewares=http2https@file" - - - "traefik.http.routers.tvheadend.entrypoints=https" - - "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)" - - "traefik.http.routers.tvheadend.service=tvheadend" - - "traefik.docker.network=proxy" - - "traefik.http.services.tvheadend.loadbalancer.server.port=9981" - -networks: - proxy: - external: true From d793734621f19f59f1348005e37697c01277823b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 13:25:54 +0200 Subject: [PATCH 1004/2667] Convert rest of docker-compose files to TOML --- docker/authentik/docker-compose.toml | 77 ++++++++++++++++++ docker/authentik/docker-compose.yaml | 83 -------------------- docker/freshrss/docker-compose.toml | 56 +++++++++++++ docker/freshrss/docker-compose.yaml | 61 -------------- docker/gitea/docker-compose.toml | 29 +++++++ docker/gitea/docker-compose.yaml | 36 --------- docker/index.korhonen.cc/docker-compose.toml | 25 ++++++ docker/index.korhonen.cc/docker-compose.yaml | 28 ------- docker/jellyfin/docker-compose.toml | 38 +++++++++ docker/jellyfin/docker-compose.yaml | 38 --------- docker/mumble/docker-compose.toml | 10 +++ docker/mumble/docker-compose.yaml | 12 --- docker/nextcloud/docker-compose.toml | 76 ++++++++++++++++++ docker/nextcloud/docker-compose.yaml | 81 ------------------- docker/pihole/docker-compose.toml | 34 ++++++++ docker/pihole/docker-compose.yaml | 41 ---------- docker/postgres/docker-compose.toml | 18 +++++ docker/postgres/docker-compose.yaml | 19 ----- docker/remotely/docker-compose.toml | 23 ++++++ docker/remotely/docker-compose.yaml | 24 ------ docker/tftp/docker-compose.toml | 9 +++ docker/tftp/docker-compose.yaml | 12 --- docker/traefik/docker-compose.toml | 52 ++++++++++++ docker/traefik/docker-compose.yaml | 57 -------------- docker/tvheadend/docker-compose.toml | 32 ++++++++ docker/tvheadend/docker-compose.yaml | 37 --------- 26 files changed, 479 insertions(+), 529 deletions(-) create mode 100644 docker/authentik/docker-compose.toml delete mode 100644 docker/authentik/docker-compose.yaml create mode 100644 docker/freshrss/docker-compose.toml delete mode 100644 docker/freshrss/docker-compose.yaml create mode 100644 docker/gitea/docker-compose.toml delete mode 100644 docker/gitea/docker-compose.yaml create mode 100644 docker/index.korhonen.cc/docker-compose.toml delete mode 100644 docker/index.korhonen.cc/docker-compose.yaml create mode 100644 docker/jellyfin/docker-compose.toml delete mode 100644 docker/jellyfin/docker-compose.yaml create mode 100644 docker/mumble/docker-compose.toml delete mode 100644 docker/mumble/docker-compose.yaml create mode 100644 docker/nextcloud/docker-compose.toml delete mode 100644 docker/nextcloud/docker-compose.yaml create mode 100644 docker/pihole/docker-compose.toml delete mode 100644 docker/pihole/docker-compose.yaml create mode 100644 docker/postgres/docker-compose.toml delete mode 100644 docker/postgres/docker-compose.yaml create mode 100644 docker/remotely/docker-compose.toml delete mode 100644 docker/remotely/docker-compose.yaml create mode 100644 docker/tftp/docker-compose.toml delete mode 100644 docker/tftp/docker-compose.yaml create mode 100644 docker/traefik/docker-compose.toml delete mode 100644 docker/traefik/docker-compose.yaml create mode 100644 docker/tvheadend/docker-compose.toml delete mode 100644 docker/tvheadend/docker-compose.yaml diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml new file mode 100644 index 00000000..7fee304d --- /dev/null +++ b/docker/authentik/docker-compose.toml @@ -0,0 +1,77 @@ +[services] + +[services.redis] +container_name = "authentik-redis" +image = "redis:alpine" +restart = "unless-stopped" +networks = ["authentik"] + +[services.authentik] +container_name = "authentik" +image = "${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.10.4}" +restart = "unless-stopped" +command = "server" +volumes = [ + "/docker/authentik/media:/media", + "/docker/authentik/custom-templates:/templates", + "/docker/authentik/geoip:/geoip", +] +env_file = [".env"] +networks = ["authentik", "postgres", "proxy"] +ports = ["9000:9000"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.authentik-redirect.entrypoints=http", + "traefik.http.routers.authentik-redirect.rule=Host(`sso.korhonen.cc`)", + "traefik.http.routers.authentik-redirect.middlewares=http2https@file", + "traefik.http.routers.authentik.entrypoints=https", + "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)", + "traefik.http.routers.authentik.service=authentik", + "traefik.docker.network=proxy", + "traefik.http.services.authentik.loadbalancer.server.port=9000", +] + +[services.authentik-worker] +container_name = "authentik-worker" +image = "${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.10.4}" +restart = "unless-stopped" +command = "worker" +networks = ["authentik", "postgres"] +user = "root" +volumes = [ + "/docker/authentik/backups:/backups", + "/docker/authentik/media:/media", + "/var/run/docker.sock:/var/run/docker.sock", + "/docker/authentik/custom-templates:/templates", + "/docker/authentik/geoip:/geoip", +] +environment = [ + "AUTHENTIK_POSTGRESQL__HOST", + "AUTHENTIK_POSTGRESQL__USER", + "AUTHENTIK_POSTGRESQL__NAME", + "AUTHENTIK_POSTGRESQL__PASSWORD", + "AUTHENTIK_SECRET_KEY", +] +env_file = [".env"] + +[services.geoipupdate] +container_name = "authentik-geoip" +image = "maxmindinc/geoipupdate:latest" +volumes = ["/docker/authentik/geoip:/usr/share/GeoIP"] +env_file = [".env"] +networks = ["authentik"] + +[services.geoipupdate.environment] +GEOIPUPDATE_EDITION_IDS = "GeoLite2-City" +GEOIPUPDATE_FREQUENCY = "8" + +[networks] + +[networks.authentik] +external = true + +[networks.postgres] +external = true + +[networks.proxy] +external = true diff --git a/docker/authentik/docker-compose.yaml b/docker/authentik/docker-compose.yaml deleted file mode 100644 index ec2161cd..00000000 --- a/docker/authentik/docker-compose.yaml +++ /dev/null @@ -1,83 +0,0 @@ -services: - - redis: - container_name: authentik-redis - image: redis:alpine - restart: unless-stopped - networks: - - authentik - - authentik: - container_name: authentik - image: ${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.10.4} - restart: unless-stopped - command: server - volumes: - - /docker/authentik/media:/media - - /docker/authentik/custom-templates:/templates - - /docker/authentik/geoip:/geoip - env_file: - - .env - networks: - - authentik - - postgres - - proxy - ports: - - 9000:9000 - labels: - - "traefik.enable=true" - - - "traefik.http.routers.authentik-redirect.entrypoints=http" - - "traefik.http.routers.authentik-redirect.rule=Host(`sso.korhonen.cc`)" - - "traefik.http.routers.authentik-redirect.middlewares=http2https@file" - - - "traefik.http.routers.authentik.entrypoints=https" - - "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)" - - "traefik.http.routers.authentik.service=authentik" - - "traefik.docker.network=proxy" - - "traefik.http.services.authentik.loadbalancer.server.port=9000" - - authentik-worker: - container_name: authentik-worker - image: ${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.10.4} - restart: unless-stopped - command: worker - networks: - - authentik - - postgres - user: root - volumes: - - /docker/authentik/backups:/backups - - /docker/authentik/media:/media - - /var/run/docker.sock:/var/run/docker.sock - - /docker/authentik/custom-templates:/templates - - /docker/authentik/geoip:/geoip - environment: - - AUTHENTIK_POSTGRESQL__HOST - - AUTHENTIK_POSTGRESQL__USER - - AUTHENTIK_POSTGRESQL__NAME - - AUTHENTIK_POSTGRESQL__PASSWORD - - AUTHENTIK_SECRET_KEY - env_file: - - .env - - geoipupdate: - container_name: authentik-geoip - image: "maxmindinc/geoipupdate:latest" - volumes: - - /docker/authentik/geoip:/usr/share/GeoIP - environment: - GEOIPUPDATE_EDITION_IDS: "GeoLite2-City" - GEOIPUPDATE_FREQUENCY: "8" - env_file: - - .env - networks: - - authentik - -networks: - authentik: - external: true - postgres: - external: true - proxy: - external: true diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml new file mode 100644 index 00000000..538cb1f3 --- /dev/null +++ b/docker/freshrss/docker-compose.toml @@ -0,0 +1,56 @@ +[services] + +[services.freshrss] +image = "linuxserver/freshrss" +container_name = "freshrss" +restart = "unless-stopped" +networks = ["freshrss", "postgres", "proxy"] +environment = ["PUID=1000", "PGID=985", "TZ=Europe/Helsinki"] +depends_on = ["bibliogram"] +volumes = [ + "/docker/freshrss/freshrss:/config", + "/etc/localtime:/etc/localtime:ro", +] +labels = [ + "traefik.enable=true", + "traefik.http.routers.freshrss-redirect.entrypoints=http", + "traefik.http.routers.freshrss-redirect.rule=Host(`rss.korhonen.cc`)", + "traefik.http.routers.freshrss-redirect.middlewares=http2https@file", + "traefik.http.routers.freshrss.entrypoints=https", + "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)", + "traefik.http.routers.freshrss.service=freshrss", + "traefik.docker.network=proxy", + "traefik.http.services.freshrss.loadbalancer.server.port=80", +] + +[services.bibliogram] +image = "cloudrac3r/bibliogram" +container_name = "bibliogram" +restart = "unless-stopped" +volumes = [ + "/docker/freshrss/bibliogram/db:/app/db", + "/docker/freshrss/bibliogram/config.js:/app/config.js", +] +networks = ["freshrss", "proxy"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.bibliogram-redirect.entrypoints=http", + "traefik.http.routers.bibliogram-redirect.rule=Host(`bibliogram.korhonen.cc`)", + "traefik.http.routers.bibliogram-redirect.middlewares=http2https@file", + "traefik.http.routers.bibliogram.entrypoints=https", + "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)", + "traefik.http.routers.bibliogram.service=bibliogram", + "traefik.docker.network=proxy", + "traefik.http.services.bibliogram.loadbalancer.server.port=10407", +] + +[networks] + +[networks.freshrss] +external = false + +[networks.postgres] +external = true + +[networks.proxy] +external = true diff --git a/docker/freshrss/docker-compose.yaml b/docker/freshrss/docker-compose.yaml deleted file mode 100644 index b1bb806a..00000000 --- a/docker/freshrss/docker-compose.yaml +++ /dev/null @@ -1,61 +0,0 @@ -services: - freshrss: - image: linuxserver/freshrss - container_name: freshrss - restart: unless-stopped - networks: - - freshrss - - postgres - - proxy - environment: - - PUID=1000 - - PGID=985 - - TZ=Europe/Helsinki - depends_on: - - bibliogram - volumes: - - /docker/freshrss/freshrss:/config - - /etc/localtime:/etc/localtime:ro - labels: - - "traefik.enable=true" - - - "traefik.http.routers.freshrss-redirect.entrypoints=http" - - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.korhonen.cc`)" - - "traefik.http.routers.freshrss-redirect.middlewares=http2https@file" - - - "traefik.http.routers.freshrss.entrypoints=https" - - "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)" - - "traefik.http.routers.freshrss.service=freshrss" - - "traefik.docker.network=proxy" - - "traefik.http.services.freshrss.loadbalancer.server.port=80" - - bibliogram: - image: cloudrac3r/bibliogram - container_name: bibliogram - restart: unless-stopped - volumes: - - /docker/freshrss/bibliogram/db:/app/db - - /docker/freshrss/bibliogram/config.js:/app/config.js - networks: - - freshrss - - proxy - labels: - - "traefik.enable=true" - - - "traefik.http.routers.bibliogram-redirect.entrypoints=http" - - "traefik.http.routers.bibliogram-redirect.rule=Host(`bibliogram.korhonen.cc`)" - - "traefik.http.routers.bibliogram-redirect.middlewares=http2https@file" - - - "traefik.http.routers.bibliogram.entrypoints=https" - - "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)" - - "traefik.http.routers.bibliogram.service=bibliogram" - - "traefik.docker.network=proxy" - - "traefik.http.services.bibliogram.loadbalancer.server.port=10407" - -networks: - freshrss: - external: false - postgres: - external: true - proxy: - external: true diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml new file mode 100644 index 00000000..dc4c9220 --- /dev/null +++ b/docker/gitea/docker-compose.toml @@ -0,0 +1,29 @@ +[services] + +[services.gitea] +container_name = "gitea" +image = "gitea/gitea:1" +environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] +restart = "unless-stopped" +networks = ["postgres", "proxy"] +ports = ["3000:3000", "22:22"] +volumes = ["/docker/gitea:/data", "/etc/localtime:/etc/localtime:ro"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.gitea-redirect.entrypoints=http", + "traefik.http.routers.gitea-redirect.rule=Host(`git.korhonen.cc`)", + "traefik.http.routers.gitea-redirect.middlewares=http2https@file", + "traefik.http.routers.gitea.entrypoints=https", + "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)", + "traefik.http.routers.gitea.service=gitea", + "traefik.docker.network=proxy", + "traefik.http.services.gitea.loadbalancer.server.port=3000", +] + +[networks] + +[networks.postgres] +external = true + +[networks.proxy] +external = true diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml deleted file mode 100644 index 1f1318ad..00000000 --- a/docker/gitea/docker-compose.yaml +++ /dev/null @@ -1,36 +0,0 @@ -services: - gitea: - container_name: gitea - image: gitea/gitea:1 - environment: - - TZ=Europe/Helsinki - - USER_UID=1000 - - USER_GID=1000 - restart: unless-stopped - networks: - - postgres - - proxy - ports: - - "3000:3000" - - "22:22" - volumes: - - /docker/gitea:/data - - /etc/localtime:/etc/localtime:ro - labels: - - "traefik.enable=true" - - - "traefik.http.routers.gitea-redirect.entrypoints=http" - - "traefik.http.routers.gitea-redirect.rule=Host(`git.korhonen.cc`)" - - "traefik.http.routers.gitea-redirect.middlewares=http2https@file" - - - "traefik.http.routers.gitea.entrypoints=https" - - "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)" - - "traefik.http.routers.gitea.service=gitea" - - "traefik.docker.network=proxy" - - "traefik.http.services.gitea.loadbalancer.server.port=3000" - -networks: - postgres: - external: true - proxy: - external: true diff --git a/docker/index.korhonen.cc/docker-compose.toml b/docker/index.korhonen.cc/docker-compose.toml new file mode 100644 index 00000000..ea4eb287 --- /dev/null +++ b/docker/index.korhonen.cc/docker-compose.toml @@ -0,0 +1,25 @@ +[services] + +[services.nginx] +image = "fraoustin/fancyindex" +container_name = "index.korhonen.cc" +environment = ["DISABLE_AUTH=true", "CONTAINER_TIMEZONE=\"Europe/Helsinki\""] +volumes = ["/docker/index.korhonen.cc:/share"] +networks = ["proxy"] +restart = "unless-stopped" +labels = [ + "traefik.enable=true", + "traefik.http.routers.index-redirect.entrypoints=http", + "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)", + "traefik.http.routers.index-redirect.middlewares=http2https@file", + "traefik.http.routers.index.entrypoints=https", + "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)", + "traefik.http.routers.index.service=index", + "traefik.docker.network=proxy", + "traefik.http.services.index.loadbalancer.server.port=80", +] + +[networks] + +[networks.proxy] +external = true diff --git a/docker/index.korhonen.cc/docker-compose.yaml b/docker/index.korhonen.cc/docker-compose.yaml deleted file mode 100644 index a14b852f..00000000 --- a/docker/index.korhonen.cc/docker-compose.yaml +++ /dev/null @@ -1,28 +0,0 @@ -services: - nginx: - image: fraoustin/fancyindex - container_name: index.korhonen.cc - environment: - - DISABLE_AUTH=true - - CONTAINER_TIMEZONE="Europe/Helsinki" - volumes: - - /docker/index.korhonen.cc:/share - networks: - - proxy - restart: unless-stopped - labels: - - "traefik.enable=true" - - - "traefik.http.routers.index-redirect.entrypoints=http" - - "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)" - - "traefik.http.routers.index-redirect.middlewares=http2https@file" - - - "traefik.http.routers.index.entrypoints=https" - - "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)" - - "traefik.http.routers.index.service=index" - - "traefik.docker.network=proxy" - - "traefik.http.services.index.loadbalancer.server.port=80" - -networks: - proxy: - external: true diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml new file mode 100644 index 00000000..0ea17c77 --- /dev/null +++ b/docker/jellyfin/docker-compose.toml @@ -0,0 +1,38 @@ +[services] + +[services.jellyfin] +image = "jellyfin/jellyfin:10.8.0-alpha5" +container_name = "jellyfin" +environment = ["TZ=Europe/Helsinki"] +ports = ["8096:8096"] +networks = ["proxy", "authentik"] +restart = "unless-stopped" +volumes = [ + "/docker/jellyfin/config:/config", + "/docker/jellyfin/cache:/cache", + "/mnt/Storage/Media:/media", + "/etc/localtime:/etc/localtime:ro", +] +devices = [ + "/dev/dri/renderD128:/dev/dri/renderD128", + "/dev/dri/card0:/dev/dri/card0", +] +labels = [ + "traefik.enable=true", + "traefik.http.routers.jellyfin-redirect.entrypoints=http", + "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)", + "traefik.http.routers.jellyfin-redirect.middlewares=http2https@file", + "traefik.http.routers.jellyfin.entrypoints=https", + "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)", + "traefik.http.routers.jellyfin.service=jellyfin", + "traefik.docker.network=proxy", + "traefik.http.services.jellyfin.loadbalancer.server.port=8096", +] + +[networks] + +[networks.proxy] +external = true + +[networks.authentik] +external = true diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml deleted file mode 100644 index b5464000..00000000 --- a/docker/jellyfin/docker-compose.yaml +++ /dev/null @@ -1,38 +0,0 @@ -services: - jellyfin: - image: jellyfin/jellyfin:10.8.0-alpha5 - container_name: jellyfin - environment: - - TZ=Europe/Helsinki - ports: - - "8096:8096" - networks: - - proxy - - authentik - restart: unless-stopped - volumes: - - /docker/jellyfin/config:/config - - /docker/jellyfin/cache:/cache - - /mnt/Storage/Media:/media - - /etc/localtime:/etc/localtime:ro - devices: - - /dev/dri/renderD128:/dev/dri/renderD128 - - /dev/dri/card0:/dev/dri/card0 - labels: - - "traefik.enable=true" - - - "traefik.http.routers.jellyfin-redirect.entrypoints=http" - - "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)" - - "traefik.http.routers.jellyfin-redirect.middlewares=http2https@file" - - - "traefik.http.routers.jellyfin.entrypoints=https" - - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)" - - "traefik.http.routers.jellyfin.service=jellyfin" - - "traefik.docker.network=proxy" - - "traefik.http.services.jellyfin.loadbalancer.server.port=8096" - -networks: - proxy: - external: true - authentik: - external: true diff --git a/docker/mumble/docker-compose.toml b/docker/mumble/docker-compose.toml new file mode 100644 index 00000000..fa1afaa3 --- /dev/null +++ b/docker/mumble/docker-compose.toml @@ -0,0 +1,10 @@ +[services] + +[services.mumble] +container_name = "mumble" +image = "phlak/mumble" +user = "1000:985" +environment = ["TZ=Europe/Helsinki"] +network_mode = "host" +volumes = ["/docker/mumble:/etc/mumble", "/etc/localtime:/etc/localtime:ro"] +restart = "unless-stopped" diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml deleted file mode 100644 index 570697e5..00000000 --- a/docker/mumble/docker-compose.yaml +++ /dev/null @@ -1,12 +0,0 @@ -services: - mumble: - container_name: mumble - image: phlak/mumble - user: "1000:985" - environment: - - TZ=Europe/Helsinki - network_mode: host - volumes: - - /docker/mumble:/etc/mumble - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml new file mode 100644 index 00000000..75bd91e1 --- /dev/null +++ b/docker/nextcloud/docker-compose.toml @@ -0,0 +1,76 @@ +[services] + +[services.nextcloud] +image = "nextcloud:apache" +container_name = "nextcloud" +restart = "always" +ports = ["1869:80"] +networks = ["nextcloud", "postgres", "proxy"] +volumes = [ + "/docker/nextcloud:/var/www/html", + "/mnt/Storage/Nextcloud:/var/www/html/data", + "/mnt/Storage/Syncthing:/Syncthing", + "/mnt/Storage/Media/Music:/Music", + "/etc/localtime:/etc/localtime:ro", +] +environment = [ + "TZ=Europe/Helsinki", + "REDIS_HOST=redis", + "REDIS_HOST_PASSWORD=123", +] +depends_on = ["redis"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.nextcloud-redirect.entrypoints=http", + "traefik.http.routers.nextcloud-redirect.rule=Host(`cloud.korhonen.cc`)", + "traefik.http.routers.nextcloud-redirect.middlewares=http2https@file", + "traefik.http.routers.nextcloud.entrypoints=https", + "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)", + "traefik.http.routers.nextcloud.service=nextcloud", + "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-dav@file", + "traefik.docker.network=proxy", + "traefik.http.services.nextcloud.loadbalancer.server.port=80", +] + +[services.redis] +image = "redis:alpine" +container_name = "redis" +networks = ["nextcloud"] +restart = "always" +command = "redis-server --requirepass 123" + +[services.cron] +image = "nextcloud:apache" +container_name = "nextcloud-cron" +restart = "always" +volumes = ["/docker/nextcloud:/var/www/html"] +entrypoint = "/cron.sh" +depends_on = ["redis"] + +[services.coturn] +image = "instrumentisto/coturn" +container_name = "coturn" +restart = "unless-stopped" +env_file = ".env" +ports = ["3478:3478/tcp", "3478:3478/udp"] +networks = ["nextcloud"] +command = [ + "-n", + "--log-file=stdout", + "--min-port=49160", + "--max-port=49200", + "--realm=cloud.korhonen.cc", + "--use-auth-secret", + "--static-auth-secret=${STATIC_AUTH_SECRET}", +] + +[networks] + +[networks.nextcloud] +external = false + +[networks.postgres] +external = true + +[networks.proxy] +external = true diff --git a/docker/nextcloud/docker-compose.yaml b/docker/nextcloud/docker-compose.yaml deleted file mode 100644 index 94b3e7ae..00000000 --- a/docker/nextcloud/docker-compose.yaml +++ /dev/null @@ -1,81 +0,0 @@ -services: - nextcloud: - image: nextcloud:apache - container_name: nextcloud - restart: always - ports: - - "1869:80" - networks: - - nextcloud - - postgres - - proxy - volumes: - - /docker/nextcloud:/var/www/html - - /mnt/Storage/Nextcloud:/var/www/html/data - - /mnt/Storage/Syncthing:/Syncthing - - /mnt/Storage/Media/Music:/Music - - /etc/localtime:/etc/localtime:ro - environment: - - TZ=Europe/Helsinki - - REDIS_HOST=redis - - REDIS_HOST_PASSWORD=123 - depends_on: - - redis - labels: - - "traefik.enable=true" - - - "traefik.http.routers.nextcloud-redirect.entrypoints=http" - - "traefik.http.routers.nextcloud-redirect.rule=Host(`cloud.korhonen.cc`)" - - "traefik.http.routers.nextcloud-redirect.middlewares=http2https@file" - - - "traefik.http.routers.nextcloud.entrypoints=https" - - "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)" - - "traefik.http.routers.nextcloud.service=nextcloud" - - "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-dav@file" - - "traefik.docker.network=proxy" - - "traefik.http.services.nextcloud.loadbalancer.server.port=80" - - redis: - image: redis:alpine - container_name: redis - networks: - - nextcloud - restart: always - command: redis-server --requirepass 123 - - cron: - image: nextcloud:apache - container_name: nextcloud-cron - restart: always - volumes: - - /docker/nextcloud:/var/www/html - entrypoint: /cron.sh - depends_on: - - redis - - coturn: - image: instrumentisto/coturn - container_name: coturn - restart: unless-stopped - env_file: .env - ports: - - "3478:3478/tcp" - - "3478:3478/udp" - networks: - - nextcloud - command: - - -n - - --log-file=stdout - - --min-port=49160 - - --max-port=49200 - - --realm=cloud.korhonen.cc - - --use-auth-secret - - --static-auth-secret=${STATIC_AUTH_SECRET} - -networks: - nextcloud: - external: false - postgres: - external: true - proxy: - external: true diff --git a/docker/pihole/docker-compose.toml b/docker/pihole/docker-compose.toml new file mode 100644 index 00000000..27f4af69 --- /dev/null +++ b/docker/pihole/docker-compose.toml @@ -0,0 +1,34 @@ +[services] + +[services.pihole] +container_name = "pihole" +image = "pihole/pihole:latest" +ports = ["53:53/tcp", "53:53/udp", "67:67/udp", "8069:80/tcp"] +networks = ["proxy"] +volumes = [ + "/docker/pihole/pihole:/etc/pihole/", + "/docker/pihole/dnsmasq:/etc/dnsmasq.d/", +] +dns = ["127.0.0.1", "1.1.1.1"] +cap_add = ["NET_ADMIN"] +restart = "unless-stopped" +labels = [ + "traefik.enable=true", + "traefik.http.routers.pihole-redirect.entrypoints=http", + "traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)", + "traefik.http.routers.pihole-redirect.middlewares=http2https@file", + "traefik.http.routers.pihole.entrypoints=https", + "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)", + "traefik.http.routers.pihole.service=pihole", + "traefik.docker.network=proxy", + "traefik.http.services.pihole.loadbalancer.server.port=80", +] + +[services.pihole.environment] +TZ = "Europe/Helsinki" +WEBPASSWORD = "${WEBPASSWORD}" + +[networks] + +[networks.proxy] +external = true diff --git a/docker/pihole/docker-compose.yaml b/docker/pihole/docker-compose.yaml deleted file mode 100644 index 0a0f9c27..00000000 --- a/docker/pihole/docker-compose.yaml +++ /dev/null @@ -1,41 +0,0 @@ -services: - pihole: - container_name: pihole - image: pihole/pihole:latest - ports: - - "53:53/tcp" - - "53:53/udp" - - "67:67/udp" - - "8069:80/tcp" - networks: - - proxy - environment: - TZ: "Europe/Helsinki" - WEBPASSWORD: "${WEBPASSWORD}" - volumes: - - "/docker/pihole/pihole:/etc/pihole/" - - "/docker/pihole/dnsmasq:/etc/dnsmasq.d/" - dns: - - 127.0.0.1 - - 1.1.1.1 - # Recommended but not required (DHCP needs NET_ADMIN) - # https://github.com/pihole/docker-pihole#note-on-capabilities - cap_add: - - NET_ADMIN - restart: unless-stopped - labels: - - "traefik.enable=true" - - - "traefik.http.routers.pihole-redirect.entrypoints=http" - - "traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)" - - "traefik.http.routers.pihole-redirect.middlewares=http2https@file" - - - "traefik.http.routers.pihole.entrypoints=https" - - "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)" - - "traefik.http.routers.pihole.service=pihole" - - "traefik.docker.network=proxy" - - "traefik.http.services.pihole.loadbalancer.server.port=80" - -networks: - proxy: - external: true diff --git a/docker/postgres/docker-compose.toml b/docker/postgres/docker-compose.toml new file mode 100644 index 00000000..4c5049ae --- /dev/null +++ b/docker/postgres/docker-compose.toml @@ -0,0 +1,18 @@ +[services] + +[services.postgres] +container_name = "postgres" +image = "postgres:13" +environment = ["TZ=Europe/Helsinki", "POSTGRES_PASSWORD=12345"] +ports = ["5432:5432"] +networks = ["postgres"] +volumes = [ + "/docker/postgres:/var/lib/postgresql/data", + "/etc/localtime:/etc/localtime:ro", +] +restart = "unless-stopped" + +[networks] + +[networks.postgres] +external = true diff --git a/docker/postgres/docker-compose.yaml b/docker/postgres/docker-compose.yaml deleted file mode 100644 index 4355ba96..00000000 --- a/docker/postgres/docker-compose.yaml +++ /dev/null @@ -1,19 +0,0 @@ -services: - postgres: - container_name: postgres - image: postgres:13 - environment: - - TZ=Europe/Helsinki - - POSTGRES_PASSWORD=12345 - ports: - - 5432:5432 - networks: - - postgres - volumes: - - /docker/postgres:/var/lib/postgresql/data - - /etc/localtime:/etc/localtime:ro - restart: unless-stopped - -networks: - postgres: - external: true diff --git a/docker/remotely/docker-compose.toml b/docker/remotely/docker-compose.toml new file mode 100644 index 00000000..88765848 --- /dev/null +++ b/docker/remotely/docker-compose.toml @@ -0,0 +1,23 @@ +[services] + +[services.remotely] +image = "translucency/remotely" +container_name = "remotely" +networks = ["proxy"] +volumes = ["/docker/remotely:/remotely-data"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.remotely-redirect.entrypoints=http", + "traefik.http.routers.remotely-redirect.rule=Host(`remotely.korhonen.cc`)", + "traefik.http.routers.remotely-redirect.middlewares=http2https@file", + "traefik.http.routers.remotely.entrypoints=https", + "traefik.http.routers.remotely.rule=Host(`remotely.korhonen.cc`)", + "traefik.http.routers.remotely.service=remotely", + "traefik.docker.network=proxy", + "traefik.http.services.remotely.loadbalancer.server.port=5000", +] + +[networks] + +[networks.proxy] +external = true diff --git a/docker/remotely/docker-compose.yaml b/docker/remotely/docker-compose.yaml deleted file mode 100644 index a7b41689..00000000 --- a/docker/remotely/docker-compose.yaml +++ /dev/null @@ -1,24 +0,0 @@ -services: - remotely: - image: translucency/remotely - container_name: remotely - networks: - - proxy - volumes: - - /docker/remotely:/remotely-data - labels: - - "traefik.enable=true" - - - "traefik.http.routers.remotely-redirect.entrypoints=http" - - "traefik.http.routers.remotely-redirect.rule=Host(`remotely.korhonen.cc`)" - - "traefik.http.routers.remotely-redirect.middlewares=http2https@file" - - - "traefik.http.routers.remotely.entrypoints=https" - - "traefik.http.routers.remotely.rule=Host(`remotely.korhonen.cc`)" - - "traefik.http.routers.remotely.service=remotely" - - "traefik.docker.network=proxy" - - "traefik.http.services.remotely.loadbalancer.server.port=5000" - -networks: - proxy: - external: true diff --git a/docker/tftp/docker-compose.toml b/docker/tftp/docker-compose.toml new file mode 100644 index 00000000..bdb6db47 --- /dev/null +++ b/docker/tftp/docker-compose.toml @@ -0,0 +1,9 @@ +[services] + +[services.tftp] +container_name = "tftp" +image = "pghalliday/tftp" +environment = ["TZ=Europe/Helsinki"] +restart = "unless-stopped" +ports = ["69:69/udp"] +volumes = ["/etc/localtime:/etc/localtime:ro", "/docker/tftp:/var/tftpboot"] diff --git a/docker/tftp/docker-compose.yaml b/docker/tftp/docker-compose.yaml deleted file mode 100644 index 47d6d3c0..00000000 --- a/docker/tftp/docker-compose.yaml +++ /dev/null @@ -1,12 +0,0 @@ -services: - tftp: - container_name: tftp - image: pghalliday/tftp - environment: - - TZ=Europe/Helsinki - restart: unless-stopped - ports: - - 69:69/udp - volumes: - - /etc/localtime:/etc/localtime:ro - - /docker/tftp:/var/tftpboot diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml new file mode 100644 index 00000000..828784d7 --- /dev/null +++ b/docker/traefik/docker-compose.toml @@ -0,0 +1,52 @@ +[services] + +[services.traefik] +image = "traefik:latest" +container_name = "traefik" +restart = "unless-stopped" +ports = ["80:80", "443:443/tcp", "443:443/udp"] +environment = ["TZ=Europe/Helsinki"] +security_opt = ["no-new-privileges:true"] +networks = ["proxy"] +volumes = [ + "/etc/localtime:/etc/localtime:ro", + "/var/run/docker.sock:/var/run/docker.sock:ro", + "/docker/traefik/traefik/traefik.toml:/traefik.toml:ro", + "/docker/traefik/traefik/dynamic.toml:/dynamic.toml:ro", + "/docker/traefik/traefik/dashboard-users:/dashboard-users:ro", + "/docker/traefik/traefik/acme.json:/acme.json", + "/docker/traefik/traefik/log:/var/log", +] +labels = [ + "traefik.enable=true", + "traefik.http.routers.redirect.entrypoints=http", + "traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)", + "traefik.http.routers.redirect.middlewares=http2https@file", + "traefik.http.routers.dashboard.entrypoints=https", + "traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)", + "traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users", + "traefik.http.routers.dashboard.middlewares=dashboard-auth", + "traefik.http.routers.dashboard.service=api@internal", + "traefik.docker.network=proxy", +] + +[services.fail2ban] +image = "crazymax/fail2ban:latest" +container_name = "fail2ban" +restart = "unless-stopped" +network_mode = "host" +cap_add = ["NET_ADMIN", "NET_RAW"] +environment = ["TZ=Europe/Helsinki"] +volumes = [ + "/etc/localtime:/etc/localtime:ro", + "/docker/traefik/traefik/log:/var/log/traefik:ro", + "/docker/traefik/fail2ban:/data", + "/docker/gitea/gitea/log/gitea.log:/var/log/gitea:ro", + "/docker/homeautomation/home-assistant/home-assistant.log:/var/log/hass", + "/mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro", +] + +[networks] + +[networks.proxy] +external = true diff --git a/docker/traefik/docker-compose.yaml b/docker/traefik/docker-compose.yaml deleted file mode 100644 index 3eed22de..00000000 --- a/docker/traefik/docker-compose.yaml +++ /dev/null @@ -1,57 +0,0 @@ -services: - traefik: - image: traefik:latest - container_name: traefik - restart: unless-stopped - ports: - - '80:80' - - '443:443/tcp' - - '443:443/udp' - environment: - - TZ=Europe/Helsinki - security_opt: - - no-new-privileges:true - networks: - - proxy - volumes: - - /etc/localtime:/etc/localtime:ro - - /var/run/docker.sock:/var/run/docker.sock:ro - - /docker/traefik/traefik/traefik.toml:/traefik.toml:ro - - /docker/traefik/traefik/dynamic.toml:/dynamic.toml:ro - - /docker/traefik/traefik/dashboard-users:/dashboard-users:ro - - /docker/traefik/traefik/acme.json:/acme.json - - /docker/traefik/traefik/log:/var/log - labels: - # Serve dashboard - - 'traefik.enable=true' - - 'traefik.http.routers.redirect.entrypoints=http' - - 'traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)' - - 'traefik.http.routers.redirect.middlewares=http2https@file' - - - 'traefik.http.routers.dashboard.entrypoints=https' - - 'traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)' - - 'traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users' - - 'traefik.http.routers.dashboard.middlewares=dashboard-auth' - - 'traefik.http.routers.dashboard.service=api@internal' - - 'traefik.docker.network=proxy' - - fail2ban: - image: crazymax/fail2ban:latest - container_name: fail2ban - restart: unless-stopped - network_mode: "host" - cap_add: - - NET_ADMIN - - NET_RAW - environment: - - TZ=Europe/Helsinki - volumes: - - /etc/localtime:/etc/localtime:ro - - /docker/traefik/traefik/log:/var/log/traefik:ro - - /docker/traefik/fail2ban:/data - - /docker/gitea/gitea/log/gitea.log:/var/log/gitea:ro - - /docker/homeautomation/home-assistant/home-assistant.log:/var/log/hass - - /mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro -networks: - proxy: - external: true diff --git a/docker/tvheadend/docker-compose.toml b/docker/tvheadend/docker-compose.toml new file mode 100644 index 00000000..c3aef502 --- /dev/null +++ b/docker/tvheadend/docker-compose.toml @@ -0,0 +1,32 @@ +[services] + +[services.tvheadend] +image = "linuxserver/tvheadend" +container_name = "tvheadend" +environment = ["TZ=Europe/Helsinki", "PUID=1000", "PGID=985"] +volumes = [ + "/docker/tvheadend:/config", + "/mnt/Storage/Media/PVR:/recordings", + "/mnt/Storage/picons:/picons", + "/etc/localtime:/etc/localtime:ro", +] +ports = ["9981:9981", "9982:9982"] +devices = ["/dev/dvb:/dev/dvb"] +restart = "unless-stopped" +networks = ["proxy"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.tvheadend-redirect.entrypoints=http", + "traefik.http.routers.tvheadend-redirect.rule=Host(`tvheadend.korhonen.cc`)", + "traefik.http.routers.tvheadend-redirect.middlewares=http2https@file", + "traefik.http.routers.tvheadend.entrypoints=https", + "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)", + "traefik.http.routers.tvheadend.service=tvheadend", + "traefik.docker.network=proxy", + "traefik.http.services.tvheadend.loadbalancer.server.port=9981", +] + +[networks] + +[networks.proxy] +external = true diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml deleted file mode 100644 index 6c6dabc9..00000000 --- a/docker/tvheadend/docker-compose.yaml +++ /dev/null @@ -1,37 +0,0 @@ -services: - tvheadend: - image: linuxserver/tvheadend - container_name: tvheadend - environment: - - TZ=Europe/Helsinki - - PUID=1000 - - PGID=985 - volumes: - - /docker/tvheadend:/config - - /mnt/Storage/Media/PVR:/recordings - - /mnt/Storage/picons:/picons - - /etc/localtime:/etc/localtime:ro - ports: - - 9981:9981 - - 9982:9982 - devices: - - /dev/dvb:/dev/dvb #tuner card - restart: unless-stopped - networks: - - proxy - labels: - - "traefik.enable=true" - - - "traefik.http.routers.tvheadend-redirect.entrypoints=http" - - "traefik.http.routers.tvheadend-redirect.rule=Host(`tvheadend.korhonen.cc`)" - - "traefik.http.routers.tvheadend-redirect.middlewares=http2https@file" - - - "traefik.http.routers.tvheadend.entrypoints=https" - - "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)" - - "traefik.http.routers.tvheadend.service=tvheadend" - - "traefik.docker.network=proxy" - - "traefik.http.services.tvheadend.loadbalancer.server.port=9981" - -networks: - proxy: - external: true From eff5448a2de4601d9656acd539e2239522e6ea32 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 13:51:51 +0200 Subject: [PATCH 1005/2667] Remove nvimpager from dotdrop config --- config.yaml | 4 ---- dotdrop | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/config.yaml b/config.yaml index 4c276d58..ce378fd4 100644 --- a/config.yaml +++ b/config.yaml @@ -141,9 +141,6 @@ dotfiles: f_ripgrep_ignore: src: .ignore dst: ~/.ignore - f_nvimpager: - src: .config/nvimpager/init.vim - dst: ~/.config/nvimpager/init.vim f_ncmpcpp.conf: src: .config/ncmpcpp/config dst: ~/.config/ncmpcpp/config @@ -184,7 +181,6 @@ profiles: - d_systemd terminal: dotfiles: - - f_nvimpager - f_hushlogin - f_ripgrep_ignore - f_ranger_commands.py diff --git a/dotdrop b/dotdrop index 8c97593c..b1b4839e 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa +Subproject commit b1b4839ef391c1503bcaef03d89161348d074ac6 From 853dbf724ab472dec199939d31399f4961ceb643 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 13:51:51 +0200 Subject: [PATCH 1006/2667] Remove nvimpager from dotdrop config --- config.yaml | 4 ---- dotdrop | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/config.yaml b/config.yaml index 4c276d58..ce378fd4 100644 --- a/config.yaml +++ b/config.yaml @@ -141,9 +141,6 @@ dotfiles: f_ripgrep_ignore: src: .ignore dst: ~/.ignore - f_nvimpager: - src: .config/nvimpager/init.vim - dst: ~/.config/nvimpager/init.vim f_ncmpcpp.conf: src: .config/ncmpcpp/config dst: ~/.config/ncmpcpp/config @@ -184,7 +181,6 @@ profiles: - d_systemd terminal: dotfiles: - - f_nvimpager - f_hushlogin - f_ripgrep_ignore - f_ranger_commands.py diff --git a/dotdrop b/dotdrop index 8c97593c..b1b4839e 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa +Subproject commit b1b4839ef391c1503bcaef03d89161348d074ac6 From 911f38b247e4f0f75f8806f168873294249c21b5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 14:00:39 +0200 Subject: [PATCH 1007/2667] Make update alias use new dct function --- home/.config/zsh/03-aliases.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 6fc2d25a..f9f9e412 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -165,8 +165,8 @@ update() { docker-update() { for dir in $HOME/git/dotfiles/docker/*; do cd $dir - docker compose pull - docker compose up -d + dct pull + dct up -d cd .. done } From 1745422371aab3d05b7c4b3b2d53a34814b2e3b5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 14:00:39 +0200 Subject: [PATCH 1008/2667] Make update alias use new dct function --- home/.config/zsh/03-aliases.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 6fc2d25a..f9f9e412 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -165,8 +165,8 @@ update() { docker-update() { for dir in $HOME/git/dotfiles/docker/*; do cd $dir - docker compose pull - docker compose up -d + dct pull + dct up -d cd .. done } From cb9b02eb55f16e055663295f4f72baaa42e6ae6d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 17:31:05 +0200 Subject: [PATCH 1009/2667] Fix nvim git pager --- home/.config/zsh/01-env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 7092c729..a058a5ec 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -51,7 +51,7 @@ export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim export PAGER="$EDITOR -R +\"lua require 'pager'\"" -export GIT_PAGER="$EDITOR -R +\"lua require 'pager'\" \"Git log\"" +export GIT_PAGER="$EDITOR -R +\"lua require 'pager'\"" export PARU_PAGER="$PAGER -c 'set ft=PKGBUILD'" export AUR_PAGER=$PAGER export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" From 034580ebdaf1ae9d7222dd051a714ebb51c1f042 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 17:31:05 +0200 Subject: [PATCH 1010/2667] Fix nvim git pager --- home/.config/zsh/01-env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 7092c729..a058a5ec 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -51,7 +51,7 @@ export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim export PAGER="$EDITOR -R +\"lua require 'pager'\"" -export GIT_PAGER="$EDITOR -R +\"lua require 'pager'\" \"Git log\"" +export GIT_PAGER="$EDITOR -R +\"lua require 'pager'\"" export PARU_PAGER="$PAGER -c 'set ft=PKGBUILD'" export AUR_PAGER=$PAGER export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" From 99a7044e8d684a9074f40ac65b77615502e02558 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 17:37:46 +0200 Subject: [PATCH 1011/2667] Remove gotify --- docker/homeautomation/docker-compose.toml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index ac3d20a8..65503e20 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -80,28 +80,6 @@ labels = [ "traefik.http.services.node-red.loadbalancer.server.port=1880", ] -[services.gotify] -image = "gotify/server" -container_name = "gotify" -volumes = ["/docker/homeautomation/gotify:/app/data"] -environment = [ - "GOTIFY_DATABASE_DIALECT=postgres", - "GOTIFY_DATABASE_CONNECTION=\"host=postgres port=5432 user=gotify dbname=gotify password=${GOTIFY_PGPASS} sslmode=disable\"", -] -networks = ["proxy", "postgres"] -restart = "unless-stopped" -labels = [ - "traefik.enable=true", - "traefik.http.routers.gotify-redirect.entrypoints=http", - "traefik.http.routers.gotify-redirect.rule=Host(`gotify.korhonen.cc`)", - "traefik.http.routers.gotify-redirect.middlewares=http2https@file", - "traefik.http.routers.gotify.entrypoints=https", - "traefik.http.routers.gotify.rule=Host(`gotify.korhonen.cc`)", - "traefik.http.routers.gotify.service=gotify", - "traefik.docker.network=proxy", - "traefik.http.services.gotify.loadbalancer.server.port=80", -] - [networks] [networks.homeautomation] From 901bccab0d0afc891ed3b69d375ac97116e2a814 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 17:37:46 +0200 Subject: [PATCH 1012/2667] Remove gotify --- docker/homeautomation/docker-compose.toml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index ac3d20a8..65503e20 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -80,28 +80,6 @@ labels = [ "traefik.http.services.node-red.loadbalancer.server.port=1880", ] -[services.gotify] -image = "gotify/server" -container_name = "gotify" -volumes = ["/docker/homeautomation/gotify:/app/data"] -environment = [ - "GOTIFY_DATABASE_DIALECT=postgres", - "GOTIFY_DATABASE_CONNECTION=\"host=postgres port=5432 user=gotify dbname=gotify password=${GOTIFY_PGPASS} sslmode=disable\"", -] -networks = ["proxy", "postgres"] -restart = "unless-stopped" -labels = [ - "traefik.enable=true", - "traefik.http.routers.gotify-redirect.entrypoints=http", - "traefik.http.routers.gotify-redirect.rule=Host(`gotify.korhonen.cc`)", - "traefik.http.routers.gotify-redirect.middlewares=http2https@file", - "traefik.http.routers.gotify.entrypoints=https", - "traefik.http.routers.gotify.rule=Host(`gotify.korhonen.cc`)", - "traefik.http.routers.gotify.service=gotify", - "traefik.docker.network=proxy", - "traefik.http.services.gotify.loadbalancer.server.port=80", -] - [networks] [networks.homeautomation] From d4ba7a72d95f7b9579865b8d5bbe10d884b09960 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 17:50:32 +0200 Subject: [PATCH 1013/2667] Nvim: add telescope --- home/.config/nvim/init.lua | 1 + home/.config/nvim/lua/keybinds.lua | 3 --- home/.config/nvim/lua/pluginconf/telescope.lua | 3 +++ home/.config/nvim/lua/pluginmanager.lua | 17 +++++++++-------- 4 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 home/.config/nvim/lua/pluginconf/telescope.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 9c9d40ba..107c41e6 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -13,3 +13,4 @@ require 'pluginconf.treesitter' require 'pluginconf.indent-blankline' require 'pluginconf.nvim-tree' require 'pluginconf.colorscheme' +require 'pluginconf.telescope' diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index b61b16b2..c4102123 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -22,8 +22,5 @@ MapKey('n', '', '') MapKey('n', '', '') MapKey('n', '', '') --- FZF -MapKey('n', '', "lua require('fzf-lua').files()") - -- Run Neoformat MapKey('n', '', 'Neoformat') diff --git a/home/.config/nvim/lua/pluginconf/telescope.lua b/home/.config/nvim/lua/pluginconf/telescope.lua new file mode 100644 index 00000000..843f568c --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/telescope.lua @@ -0,0 +1,3 @@ +local telescope = require('telescope') +telescope.setup {} +telescope.load_extension('fzf') diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 8c6bd285..cbfeecea 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -46,11 +46,12 @@ require('packer').startup(function() -- Tree explorer use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} - -- FZF FTW - use { 'ibhagwan/fzf-lua', - -- optional for icon support - requires = { 'kyazdani42/nvim-web-devicons' } - } + -- Telescope and fzf extension for it + use { + 'nvim-telescope/telescope.nvim', + requires = {{'nvim-lua/plenary.nvim'}} + } + use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'} -- Do stuff as sudo use 'lambdalisue/suda.vim' @@ -64,8 +65,8 @@ require('packer').startup(function() -- Install LSP server executables use 'williamboman/nvim-lsp-installer' - -- Additional LSP features for Java - use 'mfussenegger/nvim-jdtls' + -- Additional LSP features for Java + use 'mfussenegger/nvim-jdtls' -- Completion use 'hrsh7th/nvim-cmp' -- Autocompletion plugin @@ -73,7 +74,7 @@ require('packer').startup(function() use 'hrsh7th/cmp-path' -- Path source for nvim-cmp use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp use 'L3MON4D3/LuaSnip' -- Snippets plugin - use "rafamadriz/friendly-snippets" -- Snippets collection + use "rafamadriz/friendly-snippets" -- Snippets collection -- treesitter syntax highlight use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} From 7b13a37d2b5622dc39ecd4c59b1ebcb7a4ae4b4e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 17:50:32 +0200 Subject: [PATCH 1014/2667] Nvim: add telescope --- home/.config/nvim/init.lua | 1 + home/.config/nvim/lua/keybinds.lua | 3 --- home/.config/nvim/lua/pluginconf/telescope.lua | 3 +++ home/.config/nvim/lua/pluginmanager.lua | 17 +++++++++-------- 4 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 home/.config/nvim/lua/pluginconf/telescope.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 9c9d40ba..107c41e6 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -13,3 +13,4 @@ require 'pluginconf.treesitter' require 'pluginconf.indent-blankline' require 'pluginconf.nvim-tree' require 'pluginconf.colorscheme' +require 'pluginconf.telescope' diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index b61b16b2..c4102123 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -22,8 +22,5 @@ MapKey('n', '', '') MapKey('n', '', '') MapKey('n', '', '') --- FZF -MapKey('n', '', "lua require('fzf-lua').files()") - -- Run Neoformat MapKey('n', '', 'Neoformat') diff --git a/home/.config/nvim/lua/pluginconf/telescope.lua b/home/.config/nvim/lua/pluginconf/telescope.lua new file mode 100644 index 00000000..843f568c --- /dev/null +++ b/home/.config/nvim/lua/pluginconf/telescope.lua @@ -0,0 +1,3 @@ +local telescope = require('telescope') +telescope.setup {} +telescope.load_extension('fzf') diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 8c6bd285..cbfeecea 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -46,11 +46,12 @@ require('packer').startup(function() -- Tree explorer use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} - -- FZF FTW - use { 'ibhagwan/fzf-lua', - -- optional for icon support - requires = { 'kyazdani42/nvim-web-devicons' } - } + -- Telescope and fzf extension for it + use { + 'nvim-telescope/telescope.nvim', + requires = {{'nvim-lua/plenary.nvim'}} + } + use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'} -- Do stuff as sudo use 'lambdalisue/suda.vim' @@ -64,8 +65,8 @@ require('packer').startup(function() -- Install LSP server executables use 'williamboman/nvim-lsp-installer' - -- Additional LSP features for Java - use 'mfussenegger/nvim-jdtls' + -- Additional LSP features for Java + use 'mfussenegger/nvim-jdtls' -- Completion use 'hrsh7th/nvim-cmp' -- Autocompletion plugin @@ -73,7 +74,7 @@ require('packer').startup(function() use 'hrsh7th/cmp-path' -- Path source for nvim-cmp use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp use 'L3MON4D3/LuaSnip' -- Snippets plugin - use "rafamadriz/friendly-snippets" -- Snippets collection + use "rafamadriz/friendly-snippets" -- Snippets collection -- treesitter syntax highlight use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} From 8604de5ffeaf8723a37be518e74978e4ab31c2a4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 18:00:05 +0200 Subject: [PATCH 1015/2667] Nvim: add telescope-ui-select --- home/.config/nvim/lua/pluginconf/telescope.lua | 1 + home/.config/nvim/lua/pluginmanager.lua | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/telescope.lua b/home/.config/nvim/lua/pluginconf/telescope.lua index 843f568c..7124a2f6 100644 --- a/home/.config/nvim/lua/pluginconf/telescope.lua +++ b/home/.config/nvim/lua/pluginconf/telescope.lua @@ -1,3 +1,4 @@ local telescope = require('telescope') telescope.setup {} telescope.load_extension('fzf') +telescope.load_extension('ui-select') diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index cbfeecea..4afccbce 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -46,12 +46,13 @@ require('packer').startup(function() -- Tree explorer use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} - -- Telescope and fzf extension for it + -- Telescope use { 'nvim-telescope/telescope.nvim', requires = {{'nvim-lua/plenary.nvim'}} } - use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'} + use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'} -- Use fzf for fuzzy finder + use {'nvim-telescope/telescope-ui-select.nvim'} -- Replace vim built in select with telescope -- Do stuff as sudo use 'lambdalisue/suda.vim' From 57955894165980d5b97c89a9eee7d2c4190c620c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 18:00:05 +0200 Subject: [PATCH 1016/2667] Nvim: add telescope-ui-select --- home/.config/nvim/lua/pluginconf/telescope.lua | 1 + home/.config/nvim/lua/pluginmanager.lua | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/telescope.lua b/home/.config/nvim/lua/pluginconf/telescope.lua index 843f568c..7124a2f6 100644 --- a/home/.config/nvim/lua/pluginconf/telescope.lua +++ b/home/.config/nvim/lua/pluginconf/telescope.lua @@ -1,3 +1,4 @@ local telescope = require('telescope') telescope.setup {} telescope.load_extension('fzf') +telescope.load_extension('ui-select') diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index cbfeecea..4afccbce 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -46,12 +46,13 @@ require('packer').startup(function() -- Tree explorer use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} - -- Telescope and fzf extension for it + -- Telescope use { 'nvim-telescope/telescope.nvim', requires = {{'nvim-lua/plenary.nvim'}} } - use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'} + use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'} -- Use fzf for fuzzy finder + use {'nvim-telescope/telescope-ui-select.nvim'} -- Replace vim built in select with telescope -- Do stuff as sudo use 'lambdalisue/suda.vim' From 479ac72b835fbe60f9feb239897587eaa4045073 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 19:23:18 +0200 Subject: [PATCH 1017/2667] Nvim: update some deprecated lsp keybinds --- home/.config/nvim/lua/pluginconf/lsp.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index b75d372a..6c2b431a 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -34,12 +34,12 @@ local buf_map_keys = function(server_name, bufnr) buf_set_keymap('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', keymapOpts) - buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', + buf_set_keymap('n', '[d', 'lua vim.diagnostic.goto_prev()', keymapOpts) - buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', + buf_set_keymap('n', ']d', 'lua vim.diagnostic.goto_next()', + keymapOpts) + buf_set_keymap('n', 'q', 'lua vim.diagnostic.set_loclist()', keymapOpts) - buf_set_keymap('n', 'q', - 'lua vim.lsp.diagnostic.set_loclist()', keymapOpts) buf_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', keymapOpts) end From 277f6c0120f3096f2e1433d6103272930377350e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 19:23:18 +0200 Subject: [PATCH 1018/2667] Nvim: update some deprecated lsp keybinds --- home/.config/nvim/lua/pluginconf/lsp.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index b75d372a..6c2b431a 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -34,12 +34,12 @@ local buf_map_keys = function(server_name, bufnr) buf_set_keymap('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', keymapOpts) - buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', + buf_set_keymap('n', '[d', 'lua vim.diagnostic.goto_prev()', keymapOpts) - buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', + buf_set_keymap('n', ']d', 'lua vim.diagnostic.goto_next()', + keymapOpts) + buf_set_keymap('n', 'q', 'lua vim.diagnostic.set_loclist()', keymapOpts) - buf_set_keymap('n', 'q', - 'lua vim.lsp.diagnostic.set_loclist()', keymapOpts) buf_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', keymapOpts) end From 170fe31f6b0370632de123b92f0600104b387c6d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 19:54:45 +0200 Subject: [PATCH 1019/2667] Nvim: add path source to cmp --- home/.config/nvim/lua/pluginconf/completion.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/pluginconf/completion.lua b/home/.config/nvim/lua/pluginconf/completion.lua index 0d69c7e0..2684f592 100644 --- a/home/.config/nvim/lua/pluginconf/completion.lua +++ b/home/.config/nvim/lua/pluginconf/completion.lua @@ -49,6 +49,7 @@ cmp.setup { sources = { { name = 'nvim_lsp' }, { name = 'luasnip' }, + { name = 'path' }, }, } From 894ee7c2dd351e88309e717930c37c8771033fa5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 19:54:45 +0200 Subject: [PATCH 1020/2667] Nvim: add path source to cmp --- home/.config/nvim/lua/pluginconf/completion.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/pluginconf/completion.lua b/home/.config/nvim/lua/pluginconf/completion.lua index 0d69c7e0..2684f592 100644 --- a/home/.config/nvim/lua/pluginconf/completion.lua +++ b/home/.config/nvim/lua/pluginconf/completion.lua @@ -49,6 +49,7 @@ cmp.setup { sources = { { name = 'nvim_lsp' }, { name = 'luasnip' }, + { name = 'path' }, }, } From 8af3cdd256b7c23c196d9ba5db5df9b580f498d0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 20:19:11 +0200 Subject: [PATCH 1021/2667] WIP: Not working yet --- home/.config/nvim/ftplugin/java.lua | 7 +- home/.config/nvim/lua/pluginconf/lsp.lua | 78 +++++++++---------- .../src/main/java/com/example/Greeter.java | 0 3 files changed, 42 insertions(+), 43 deletions(-) create mode 100644 home/.config/nvim/src/main/java/com/example/Greeter.java diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 0ec274e1..57bbb398 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -1,7 +1,7 @@ local nvim_local_dir = vim.fn.expand('~/.local/share/nvim') - local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ':p:h:t') local workspace_dir = nvim_local_dir .. '/jdtls-workspaces/' .. project_name + require('jdtls').start_or_attach({ cmd = { 'java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', @@ -10,10 +10,11 @@ require('jdtls').start_or_attach({ '-Dlog.protocol=true', '-Dlog.level=ALL', '-Xms1g', '--add-modules=ALL-SYSTEM', '--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', - 'java.base/java.lang=ALL-UNNAMED', -- 💀 - '-jar', nvim_local_dir .. + 'java.base/java.lang=ALL-UNNAMED', '-jar', nvim_local_dir .. '/lsp_servers/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar', '-configuration', nvim_local_dir .. '/lsp_servers/jdtls/config_linux', '-data', workspace_dir } }) + +require('pluginconf.lsp').Lsp_map_keys('jdtls', nil) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 6c2b431a..82192fdb 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -1,47 +1,45 @@ local lsp_installer = require("nvim-lsp-installer") -local buf_map_keys = function(server_name, bufnr) - local function buf_set_keymap(...) - vim.api.nvim_buf_set_keymap(bufnr, ...) +Lsp_map_keys = function(server, bufnr) + print("Lsp_map_keys()") + local function map_key(...) + -- Map to buffer if buffer number is supplied, + -- globally otherwise + if bufnr == nil then + vim.api.nvim_set_keymap(...) + else + vim.api.nvim_buf_set_keymap(bufnr, ...) + end end local keymapOpts = {noremap = true, silent = true} - buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', - keymapOpts) - buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', - keymapOpts) - buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', keymapOpts) - buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', - keymapOpts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', - keymapOpts) - buf_set_keymap('n', 'wa', - 'lua vim.lsp.buf.add_workspace_folder()', keymapOpts) - buf_set_keymap('n', 'wr', - 'lua vim.lsp.buf.remove_workspace_folder()', - keymapOpts) - buf_set_keymap('n', 'wl', - 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', - keymapOpts) - buf_set_keymap('n', 'D', - 'lua vim.lsp.buf.type_definition()', keymapOpts) - buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', - keymapOpts) - buf_set_keymap('n', 'ca', 'lua vim.lsp.buf.code_action()', - keymapOpts) - buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', - keymapOpts) - buf_set_keymap('n', 'e', - 'lua vim.lsp.diagnostic.show_line_diagnostics()', - keymapOpts) - buf_set_keymap('n', '[d', 'lua vim.diagnostic.goto_prev()', - keymapOpts) - buf_set_keymap('n', ']d', 'lua vim.diagnostic.goto_next()', - keymapOpts) - buf_set_keymap('n', 'q', 'lua vim.diagnostic.set_loclist()', - keymapOpts) - buf_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', - keymapOpts) + map_key('n', 'gD', 'lua vim.lsp.buf.declaration()', keymapOpts) + map_key('n', 'gd', 'lua vim.lsp.buf.definition()', keymapOpts) + map_key('n', 'K', 'lua vim.lsp.buf.hover()', keymapOpts) + map_key('n', 'gi', 'lua vim.lsp.buf.implementation()', keymapOpts) + map_key('n', '', 'lua vim.lsp.buf.signature_help()', + keymapOpts) + map_key('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', + keymapOpts) + map_key('n', 'wr', + 'lua vim.lsp.buf.remove_workspace_folder()', keymapOpts) + map_key('n', 'wl', + 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', + keymapOpts) + map_key('n', 'D', 'lua vim.lsp.buf.type_definition()', + keymapOpts) + map_key('n', 'rn', 'lua vim.lsp.buf.rename()', keymapOpts) + map_key('n', 'ca', 'lua vim.lsp.buf.code_action()', + keymapOpts) + map_key('n', 'gr', 'lua vim.lsp.buf.references()', keymapOpts) + map_key('n', 'e', + 'lua vim.lsp.diagnostic.show_line_diagnostics()', + keymapOpts) + map_key('n', '[d', 'lua vim.diagnostic.goto_prev()', keymapOpts) + map_key('n', ']d', 'lua vim.diagnostic.goto_next()', keymapOpts) + map_key('n', 'q', 'lua vim.diagnostic.set_loclist()', + keymapOpts) + map_key('n', 'f', 'lua vim.lsp.buf.formatting()', keymapOpts) end -- Add additional capabilities supported by nvim-cmp @@ -80,7 +78,7 @@ lsp_installer.on_server_ready(function(server) } end - opts.on_attach = buf_map_keys + opts.on_attach = Lsp_map_keys opts.capabilities = capabilities server:setup(opts) end) diff --git a/home/.config/nvim/src/main/java/com/example/Greeter.java b/home/.config/nvim/src/main/java/com/example/Greeter.java new file mode 100644 index 00000000..e69de29b From 05fb156293eb00d3e5e9f015650cd009c10969f8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 20:19:11 +0200 Subject: [PATCH 1022/2667] WIP: Not working yet --- home/.config/nvim/ftplugin/java.lua | 7 +- home/.config/nvim/lua/pluginconf/lsp.lua | 78 +++++++++---------- .../src/main/java/com/example/Greeter.java | 0 3 files changed, 42 insertions(+), 43 deletions(-) create mode 100644 home/.config/nvim/src/main/java/com/example/Greeter.java diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 0ec274e1..57bbb398 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -1,7 +1,7 @@ local nvim_local_dir = vim.fn.expand('~/.local/share/nvim') - local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ':p:h:t') local workspace_dir = nvim_local_dir .. '/jdtls-workspaces/' .. project_name + require('jdtls').start_or_attach({ cmd = { 'java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', @@ -10,10 +10,11 @@ require('jdtls').start_or_attach({ '-Dlog.protocol=true', '-Dlog.level=ALL', '-Xms1g', '--add-modules=ALL-SYSTEM', '--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', - 'java.base/java.lang=ALL-UNNAMED', -- 💀 - '-jar', nvim_local_dir .. + 'java.base/java.lang=ALL-UNNAMED', '-jar', nvim_local_dir .. '/lsp_servers/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar', '-configuration', nvim_local_dir .. '/lsp_servers/jdtls/config_linux', '-data', workspace_dir } }) + +require('pluginconf.lsp').Lsp_map_keys('jdtls', nil) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 6c2b431a..82192fdb 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -1,47 +1,45 @@ local lsp_installer = require("nvim-lsp-installer") -local buf_map_keys = function(server_name, bufnr) - local function buf_set_keymap(...) - vim.api.nvim_buf_set_keymap(bufnr, ...) +Lsp_map_keys = function(server, bufnr) + print("Lsp_map_keys()") + local function map_key(...) + -- Map to buffer if buffer number is supplied, + -- globally otherwise + if bufnr == nil then + vim.api.nvim_set_keymap(...) + else + vim.api.nvim_buf_set_keymap(bufnr, ...) + end end local keymapOpts = {noremap = true, silent = true} - buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', - keymapOpts) - buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', - keymapOpts) - buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', keymapOpts) - buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', - keymapOpts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', - keymapOpts) - buf_set_keymap('n', 'wa', - 'lua vim.lsp.buf.add_workspace_folder()', keymapOpts) - buf_set_keymap('n', 'wr', - 'lua vim.lsp.buf.remove_workspace_folder()', - keymapOpts) - buf_set_keymap('n', 'wl', - 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', - keymapOpts) - buf_set_keymap('n', 'D', - 'lua vim.lsp.buf.type_definition()', keymapOpts) - buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', - keymapOpts) - buf_set_keymap('n', 'ca', 'lua vim.lsp.buf.code_action()', - keymapOpts) - buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', - keymapOpts) - buf_set_keymap('n', 'e', - 'lua vim.lsp.diagnostic.show_line_diagnostics()', - keymapOpts) - buf_set_keymap('n', '[d', 'lua vim.diagnostic.goto_prev()', - keymapOpts) - buf_set_keymap('n', ']d', 'lua vim.diagnostic.goto_next()', - keymapOpts) - buf_set_keymap('n', 'q', 'lua vim.diagnostic.set_loclist()', - keymapOpts) - buf_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', - keymapOpts) + map_key('n', 'gD', 'lua vim.lsp.buf.declaration()', keymapOpts) + map_key('n', 'gd', 'lua vim.lsp.buf.definition()', keymapOpts) + map_key('n', 'K', 'lua vim.lsp.buf.hover()', keymapOpts) + map_key('n', 'gi', 'lua vim.lsp.buf.implementation()', keymapOpts) + map_key('n', '', 'lua vim.lsp.buf.signature_help()', + keymapOpts) + map_key('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', + keymapOpts) + map_key('n', 'wr', + 'lua vim.lsp.buf.remove_workspace_folder()', keymapOpts) + map_key('n', 'wl', + 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', + keymapOpts) + map_key('n', 'D', 'lua vim.lsp.buf.type_definition()', + keymapOpts) + map_key('n', 'rn', 'lua vim.lsp.buf.rename()', keymapOpts) + map_key('n', 'ca', 'lua vim.lsp.buf.code_action()', + keymapOpts) + map_key('n', 'gr', 'lua vim.lsp.buf.references()', keymapOpts) + map_key('n', 'e', + 'lua vim.lsp.diagnostic.show_line_diagnostics()', + keymapOpts) + map_key('n', '[d', 'lua vim.diagnostic.goto_prev()', keymapOpts) + map_key('n', ']d', 'lua vim.diagnostic.goto_next()', keymapOpts) + map_key('n', 'q', 'lua vim.diagnostic.set_loclist()', + keymapOpts) + map_key('n', 'f', 'lua vim.lsp.buf.formatting()', keymapOpts) end -- Add additional capabilities supported by nvim-cmp @@ -80,7 +78,7 @@ lsp_installer.on_server_ready(function(server) } end - opts.on_attach = buf_map_keys + opts.on_attach = Lsp_map_keys opts.capabilities = capabilities server:setup(opts) end) diff --git a/home/.config/nvim/src/main/java/com/example/Greeter.java b/home/.config/nvim/src/main/java/com/example/Greeter.java new file mode 100644 index 00000000..e69de29b From 0dd0d7c9baeeae2f77d8caa0521db3f35a46ef44 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 23:15:00 +0200 Subject: [PATCH 1023/2667] nvim-jdtls: fix export/import --- home/.config/nvim/ftplugin/java.lua | 2 +- home/.config/nvim/lua/pluginconf/lsp.lua | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 57bbb398..227b83d2 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -17,4 +17,4 @@ require('jdtls').start_or_attach({ } }) -require('pluginconf.lsp').Lsp_map_keys('jdtls', nil) +require('pluginconf.lsp').lsp_map_keys('jdtls', nil) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 82192fdb..6e6da900 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -1,6 +1,8 @@ local lsp_installer = require("nvim-lsp-installer") -Lsp_map_keys = function(server, bufnr) +local M = {} + +M.lsp_map_keys = function(server, bufnr) print("Lsp_map_keys()") local function map_key(...) -- Map to buffer if buffer number is supplied, @@ -82,3 +84,5 @@ lsp_installer.on_server_ready(function(server) opts.capabilities = capabilities server:setup(opts) end) + +return M From 687e9942666c1739ffa035f0eb3e2954eda4be1e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 23:15:00 +0200 Subject: [PATCH 1024/2667] nvim-jdtls: fix export/import --- home/.config/nvim/ftplugin/java.lua | 2 +- home/.config/nvim/lua/pluginconf/lsp.lua | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 57bbb398..227b83d2 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -17,4 +17,4 @@ require('jdtls').start_or_attach({ } }) -require('pluginconf.lsp').Lsp_map_keys('jdtls', nil) +require('pluginconf.lsp').lsp_map_keys('jdtls', nil) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 82192fdb..6e6da900 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -1,6 +1,8 @@ local lsp_installer = require("nvim-lsp-installer") -Lsp_map_keys = function(server, bufnr) +local M = {} + +M.lsp_map_keys = function(server, bufnr) print("Lsp_map_keys()") local function map_key(...) -- Map to buffer if buffer number is supplied, @@ -82,3 +84,5 @@ lsp_installer.on_server_ready(function(server) opts.capabilities = capabilities server:setup(opts) end) + +return M From 4d9947dfa1745aed49d9ff678f471a5e0090b539 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 23:16:25 +0200 Subject: [PATCH 1025/2667] Fix reference to lsp_map_keys --- home/.config/nvim/lua/pluginconf/lsp.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 6e6da900..f1a6f7bb 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -3,7 +3,6 @@ local lsp_installer = require("nvim-lsp-installer") local M = {} M.lsp_map_keys = function(server, bufnr) - print("Lsp_map_keys()") local function map_key(...) -- Map to buffer if buffer number is supplied, -- globally otherwise @@ -80,7 +79,7 @@ lsp_installer.on_server_ready(function(server) } end - opts.on_attach = Lsp_map_keys + opts.on_attach = M.lsp_map_keys opts.capabilities = capabilities server:setup(opts) end) From 8f10c4cf0cd6a1da1b97de239a5b5db30614d16f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 23:16:25 +0200 Subject: [PATCH 1026/2667] Fix reference to lsp_map_keys --- home/.config/nvim/lua/pluginconf/lsp.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 6e6da900..f1a6f7bb 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -3,7 +3,6 @@ local lsp_installer = require("nvim-lsp-installer") local M = {} M.lsp_map_keys = function(server, bufnr) - print("Lsp_map_keys()") local function map_key(...) -- Map to buffer if buffer number is supplied, -- globally otherwise @@ -80,7 +79,7 @@ lsp_installer.on_server_ready(function(server) } end - opts.on_attach = Lsp_map_keys + opts.on_attach = M.lsp_map_keys opts.capabilities = capabilities server:setup(opts) end) From 4e5aebdcef5105ca80c069efab76bf907e973e7e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Mar 2022 08:38:19 +0200 Subject: [PATCH 1027/2667] Switch from firefox-nightly to stable --- home/.config/sway/conf.d/01-vars.conf | 1 + home/.config/sway/conf.d/06-keybinds.conf | 2 +- home/.config/zsh/03-aliases.zsh | 14 ++++---------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index 3cad05bf..308251aa 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -2,6 +2,7 @@ set $mod Mod4 set $term footclient +set $browser firefox set $gnome-schema org.gnome.desktop.interface set $wallpaper ~/Pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) set $scripts ~/.config/sway/scripts diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 3eed3076..6f006bb4 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -139,7 +139,7 @@ mode "resize" { bindsym $mod+r mode "resize" # start browser -bindsym $mod+b exec firefox-nightly +bindsym $mod+b exec $browser # media keys bindsym --locked XF86AudioRaiseVolume exec pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index f9f9e412..f24a6b32 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -137,22 +137,19 @@ passync() { pass git pull && pass git push && updatesecrets } update() { all() { - paru - plugins {%@@ if profile == "Moria" @@%} + paru -Pw repo docker-update docker system prune --volumes + {%@@ else @@%} + paru {%@@ endif @@%} + plugins } repo() { aur sync -Su --margs --noconfirm - update-firefox - } - - update-firefox() { - aur sync -S --rebuild firefox-nightly --margs --noconfirm } plugins() { @@ -188,9 +185,6 @@ update() { repo) repo ;; - firefox) - firefox - ;; *) paru ;; From c7ea081db8644b169e27c110226596f3594f907d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Mar 2022 08:38:19 +0200 Subject: [PATCH 1028/2667] Switch from firefox-nightly to stable --- home/.config/sway/conf.d/01-vars.conf | 1 + home/.config/sway/conf.d/06-keybinds.conf | 2 +- home/.config/zsh/03-aliases.zsh | 14 ++++---------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index 3cad05bf..308251aa 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -2,6 +2,7 @@ set $mod Mod4 set $term footclient +set $browser firefox set $gnome-schema org.gnome.desktop.interface set $wallpaper ~/Pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) set $scripts ~/.config/sway/scripts diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 3eed3076..6f006bb4 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -139,7 +139,7 @@ mode "resize" { bindsym $mod+r mode "resize" # start browser -bindsym $mod+b exec firefox-nightly +bindsym $mod+b exec $browser # media keys bindsym --locked XF86AudioRaiseVolume exec pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index f9f9e412..f24a6b32 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -137,22 +137,19 @@ passync() { pass git pull && pass git push && updatesecrets } update() { all() { - paru - plugins {%@@ if profile == "Moria" @@%} + paru -Pw repo docker-update docker system prune --volumes + {%@@ else @@%} + paru {%@@ endif @@%} + plugins } repo() { aur sync -Su --margs --noconfirm - update-firefox - } - - update-firefox() { - aur sync -S --rebuild firefox-nightly --margs --noconfirm } plugins() { @@ -188,9 +185,6 @@ update() { repo) repo ;; - firefox) - firefox - ;; *) paru ;; From 9c450abd0057b05748c7735fb5e4476e4a10cb36 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Mar 2022 18:13:34 +0200 Subject: [PATCH 1029/2667] Update postgres --- docker/postgres/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/postgres/docker-compose.toml b/docker/postgres/docker-compose.toml index 4c5049ae..57ddd292 100644 --- a/docker/postgres/docker-compose.toml +++ b/docker/postgres/docker-compose.toml @@ -2,7 +2,7 @@ [services.postgres] container_name = "postgres" -image = "postgres:13" +image = "postgres:14" environment = ["TZ=Europe/Helsinki", "POSTGRES_PASSWORD=12345"] ports = ["5432:5432"] networks = ["postgres"] From ea1a4a130a6d0a163827f522a1a3b7e1a4262f8a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Mar 2022 18:13:34 +0200 Subject: [PATCH 1030/2667] Update postgres --- docker/postgres/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/postgres/docker-compose.toml b/docker/postgres/docker-compose.toml index 4c5049ae..57ddd292 100644 --- a/docker/postgres/docker-compose.toml +++ b/docker/postgres/docker-compose.toml @@ -2,7 +2,7 @@ [services.postgres] container_name = "postgres" -image = "postgres:13" +image = "postgres:14" environment = ["TZ=Europe/Helsinki", "POSTGRES_PASSWORD=12345"] ports = ["5432:5432"] networks = ["postgres"] From 12e3660fc6ae4a716d54ee4d1dfdadb47b21387a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Mar 2022 18:14:02 +0200 Subject: [PATCH 1031/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index b1b4839e..8c97593c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit b1b4839ef391c1503bcaef03d89161348d074ac6 +Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa From b3841fec56ec3497f849c96418567aac170a95b1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Mar 2022 18:14:02 +0200 Subject: [PATCH 1032/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index b1b4839e..8c97593c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit b1b4839ef391c1503bcaef03d89161348d074ac6 +Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa From 47b871b76b89129a3469009fc3854b8da4bbb5a0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Mar 2022 18:14:21 +0200 Subject: [PATCH 1033/2667] Format zsh files --- home/.config/zsh/01-env.zsh | 10 +++++----- home/.config/zsh/02-plugins.zsh | 4 ++-- home/.config/zsh/05-misc.zsh | 2 +- home/.config/zsh/06-pacman.zsh | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index a058a5ec..db037d6b 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -39,10 +39,10 @@ export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" export FZF_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' _fzf_compgen_dir() { - fd -Ht d + fd -Ht d } _fzf_compgen_path() { - fd -Ht f + fd -Ht f } # dotfile repository location @@ -61,9 +61,9 @@ export GPG_TTY="$(tty)" # set SSH_AUTH_SOCK if not logging in over SSH if [ "$SSH_CONNECTION" = "" ]; then - export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - #gpgconf --launch gpg-agent - gpg-connect-agent updatestartuptty /bye >/dev/null + export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) + #gpgconf --launch gpg-agent + gpg-connect-agent updatestartuptty /bye >/dev/null fi # Enable grc colorization of supported commands diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh index bd20e77d..d8d5a65d 100644 --- a/home/.config/zsh/02-plugins.zsh +++ b/home/.config/zsh/02-plugins.zsh @@ -1,7 +1,7 @@ # install zinit if it's not already installed if [ ! -f ~/.zinit/bin/zinit.zsh ]; then - mkdir ~/.zinit - git clone https://github.com/zdharma-continuum/zinit.git ~/.zinit/bin + mkdir ~/.zinit + git clone https://github.com/zdharma-continuum/zinit.git ~/.zinit/bin fi source ~/.zinit/bin/zinit.zsh diff --git a/home/.config/zsh/05-misc.zsh b/home/.config/zsh/05-misc.zsh index 10ddf01d..5118b024 100644 --- a/home/.config/zsh/05-misc.zsh +++ b/home/.config/zsh/05-misc.zsh @@ -1,6 +1,6 @@ # Launch tmux if logging in over ssh if [[ -z "$TMUX" ]] && [ "$SSH_CONNECTION" != "" ]; then - tmux attach-session -t ssh_tmux || tmux new-session -s ssh_tmux + tmux attach-session -t ssh_tmux || tmux new-session -s ssh_tmux fi # share history between running zsh instances diff --git a/home/.config/zsh/06-pacman.zsh b/home/.config/zsh/06-pacman.zsh index 0398c378..d0e23701 100644 --- a/home/.config/zsh/06-pacman.zsh +++ b/home/.config/zsh/06-pacman.zsh @@ -5,13 +5,13 @@ zshcache_time="$(date +%s%N)" autoload -Uz add-zsh-hook rehash_precmd() { - if [[ -a /var/cache/zsh/pacman ]]; then - local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)" - if (( zshcache_time < paccache_time )); then - rehash - zshcache_time="$paccache_time" + if [[ -e /var/cache/zsh/pacman ]]; then + local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)" + if ((zshcache_time < paccache_time)); then + rehash + zshcache_time="$paccache_time" + fi fi - fi } add-zsh-hook -Uz precmd rehash_precmd From c19fab21b3b12a0036627ef771b199d6f8661374 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Mar 2022 18:14:21 +0200 Subject: [PATCH 1034/2667] Format zsh files --- home/.config/zsh/01-env.zsh | 10 +++++----- home/.config/zsh/02-plugins.zsh | 4 ++-- home/.config/zsh/05-misc.zsh | 2 +- home/.config/zsh/06-pacman.zsh | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index a058a5ec..db037d6b 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -39,10 +39,10 @@ export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" export FZF_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' _fzf_compgen_dir() { - fd -Ht d + fd -Ht d } _fzf_compgen_path() { - fd -Ht f + fd -Ht f } # dotfile repository location @@ -61,9 +61,9 @@ export GPG_TTY="$(tty)" # set SSH_AUTH_SOCK if not logging in over SSH if [ "$SSH_CONNECTION" = "" ]; then - export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - #gpgconf --launch gpg-agent - gpg-connect-agent updatestartuptty /bye >/dev/null + export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) + #gpgconf --launch gpg-agent + gpg-connect-agent updatestartuptty /bye >/dev/null fi # Enable grc colorization of supported commands diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh index bd20e77d..d8d5a65d 100644 --- a/home/.config/zsh/02-plugins.zsh +++ b/home/.config/zsh/02-plugins.zsh @@ -1,7 +1,7 @@ # install zinit if it's not already installed if [ ! -f ~/.zinit/bin/zinit.zsh ]; then - mkdir ~/.zinit - git clone https://github.com/zdharma-continuum/zinit.git ~/.zinit/bin + mkdir ~/.zinit + git clone https://github.com/zdharma-continuum/zinit.git ~/.zinit/bin fi source ~/.zinit/bin/zinit.zsh diff --git a/home/.config/zsh/05-misc.zsh b/home/.config/zsh/05-misc.zsh index 10ddf01d..5118b024 100644 --- a/home/.config/zsh/05-misc.zsh +++ b/home/.config/zsh/05-misc.zsh @@ -1,6 +1,6 @@ # Launch tmux if logging in over ssh if [[ -z "$TMUX" ]] && [ "$SSH_CONNECTION" != "" ]; then - tmux attach-session -t ssh_tmux || tmux new-session -s ssh_tmux + tmux attach-session -t ssh_tmux || tmux new-session -s ssh_tmux fi # share history between running zsh instances diff --git a/home/.config/zsh/06-pacman.zsh b/home/.config/zsh/06-pacman.zsh index 0398c378..d0e23701 100644 --- a/home/.config/zsh/06-pacman.zsh +++ b/home/.config/zsh/06-pacman.zsh @@ -5,13 +5,13 @@ zshcache_time="$(date +%s%N)" autoload -Uz add-zsh-hook rehash_precmd() { - if [[ -a /var/cache/zsh/pacman ]]; then - local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)" - if (( zshcache_time < paccache_time )); then - rehash - zshcache_time="$paccache_time" + if [[ -e /var/cache/zsh/pacman ]]; then + local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)" + if ((zshcache_time < paccache_time)); then + rehash + zshcache_time="$paccache_time" + fi fi - fi } add-zsh-hook -Uz precmd rehash_precmd From 029a7ebd073d8ea5f267135abc00597f5b25a831 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Mar 2022 18:40:44 +0200 Subject: [PATCH 1035/2667] Update authentik --- docker/authentik/docker-compose.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 7fee304d..dbeb58be 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -8,7 +8,7 @@ networks = ["authentik"] [services.authentik] container_name = "authentik" -image = "${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.10.4}" +image = "goauthentik.io/server:latest" restart = "unless-stopped" command = "server" volumes = [ @@ -18,7 +18,6 @@ volumes = [ ] env_file = [".env"] networks = ["authentik", "postgres", "proxy"] -ports = ["9000:9000"] labels = [ "traefik.enable=true", "traefik.http.routers.authentik-redirect.entrypoints=http", From 662491e11a3b14b673722a9d8fcde591c0cd88b3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Mar 2022 18:40:44 +0200 Subject: [PATCH 1036/2667] Update authentik --- docker/authentik/docker-compose.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 7fee304d..dbeb58be 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -8,7 +8,7 @@ networks = ["authentik"] [services.authentik] container_name = "authentik" -image = "${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.10.4}" +image = "goauthentik.io/server:latest" restart = "unless-stopped" command = "server" volumes = [ @@ -18,7 +18,6 @@ volumes = [ ] env_file = [".env"] networks = ["authentik", "postgres", "proxy"] -ports = ["9000:9000"] labels = [ "traefik.enable=true", "traefik.http.routers.authentik-redirect.entrypoints=http", From 961f60478e39b10cb715f15cd58a65fa03d18197 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Mar 2022 22:25:23 +0200 Subject: [PATCH 1037/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 8c97593c..37d2c7c6 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa +Subproject commit 37d2c7c684bc84660eb287d0dfaba946accf7dc9 From 0929a5d356fcf9f2df94f3a3e83227d5fd0bb201 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Mar 2022 22:25:23 +0200 Subject: [PATCH 1038/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 8c97593c..37d2c7c6 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 8c97593c45fc86ad7791707a3c8fab137180d4fa +Subproject commit 37d2c7c684bc84660eb287d0dfaba946accf7dc9 From 84a40b0c76a7f5655d11defcd0924a6f785d5bf6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Mar 2022 22:25:37 +0200 Subject: [PATCH 1039/2667] Add ssh host for unlocking the server cryptroot --- home/.ssh/config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index 637e7359..735e4e64 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -27,6 +27,11 @@ host moria ForwardAgent yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra +host moria-unlock + HostName korhonen.cc + port 221 + User root + host gondor hostname gondor.korhonen.cc port 22 From 6e1b1e6e1b609506438035989383bc0e6d81649c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Mar 2022 22:25:37 +0200 Subject: [PATCH 1040/2667] Add ssh host for unlocking the server cryptroot --- home/.ssh/config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index 637e7359..735e4e64 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -27,6 +27,11 @@ host moria ForwardAgent yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra +host moria-unlock + HostName korhonen.cc + port 221 + User root + host gondor hostname gondor.korhonen.cc port 22 From bcbe011a7904ce69d42fb61368c276f0ef60bba5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Mar 2022 08:23:53 +0200 Subject: [PATCH 1041/2667] Add timesyncd.conf --- root/etc/systemd/timesyncd.conf | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 root/etc/systemd/timesyncd.conf diff --git a/root/etc/systemd/timesyncd.conf b/root/etc/systemd/timesyncd.conf new file mode 100644 index 00000000..6a5a4391 --- /dev/null +++ b/root/etc/systemd/timesyncd.conf @@ -0,0 +1,3 @@ +[Time] +NTP=korhonen.cc +FallbackNTP=0.fi.pool.ntp.org From 3f6dfe393dfd1347fbebb552c70f24ef7ef0a7dd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Mar 2022 08:23:53 +0200 Subject: [PATCH 1042/2667] Add timesyncd.conf --- root/etc/systemd/timesyncd.conf | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 root/etc/systemd/timesyncd.conf diff --git a/root/etc/systemd/timesyncd.conf b/root/etc/systemd/timesyncd.conf new file mode 100644 index 00000000..6a5a4391 --- /dev/null +++ b/root/etc/systemd/timesyncd.conf @@ -0,0 +1,3 @@ +[Time] +NTP=korhonen.cc +FallbackNTP=0.fi.pool.ntp.org From 5e9c546248649666f8e2143a7ac627a65e87ed4b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Mar 2022 08:24:01 +0200 Subject: [PATCH 1043/2667] Clean up bluetooth conf --- root/etc/bluetooth/main.conf | 101 ----------------------------------- 1 file changed, 101 deletions(-) diff --git a/root/etc/bluetooth/main.conf b/root/etc/bluetooth/main.conf index ee4a1c5f..750103f8 100755 --- a/root/etc/bluetooth/main.conf +++ b/root/etc/bluetooth/main.conf @@ -1,107 +1,6 @@ [General] -# Default adapter name -# Defaults to 'BlueZ X.YZ' -#Name = BlueZ - -# Default device class. Only the major and minor device class bits are -# considered. Defaults to '0x000000'. -#Class = 0x000100 - -# How long to stay in discoverable mode before going back to non-discoverable -# The value is in seconds. Default is 180, i.e. 3 minutes. -# 0 = disable timer, i.e. stay discoverable forever -#DiscoverableTimeout = 0 - -# How long to stay in pairable mode before going back to non-discoverable -# The value is in seconds. Default is 0. -# 0 = disable timer, i.e. stay pairable forever -#PairableTimeout = 0 - -# Use vendor id source (assigner), vendor, product and version information for -# DID profile support. The values are separated by ":" and assigner, VID, PID -# and version. -# Possible vendor id source values: bluetooth, usb (defaults to usb) -#DeviceID = bluetooth:1234:5678:abcd - -# Do reverse service discovery for previously unknown devices that connect to -# us. This option is really only needed for qualification since the BITE tester -# doesn't like us doing reverse SDP for some test cases (though there could in -# theory be other useful purposes for this too). Defaults to 'true'. -#ReverseServiceDiscovery = true - -# Enable name resolving after inquiry. Set it to 'false' if you don't need -# remote devices name and want shorter discovery cycle. Defaults to 'true'. -#NameResolving = true - -# Enable runtime persistency of debug link keys. Default is false which -# makes debug link keys valid only for the duration of the connection -# that they were created for. -#DebugKeys = false - -# Restricts all controllers to the specified transport. Default value -# is "dual", i.e. both BR/EDR and LE enabled (when supported by the HW). -# Possible values: "dual", "bredr", "le" -#ControllerMode = dual - -# Enables Multi Profile Specification support. This allows to specify if -# system supports only Multiple Profiles Single Device (MPSD) configuration -# or both Multiple Profiles Single Device (MPSD) and Multiple Profiles Multiple -# Devices (MPMD) configurations. -# Possible values: "off", "single", "multiple" -#MultiProfile = off - -# Permanently enables the Fast Connectable setting for adapters that -# support it. When enabled other devices can connect faster to us, -# however the tradeoff is increased power consumptions. This feature -# will fully work only on kernel version 4.1 and newer. Defaults to -# 'false'. -#FastConnectable = false - -# Default privacy setting. -# Enables use of private address. -# Possible values: "off", "device", "network" -# "network" option not supported currently -# Defaults to "off" -# Privacy = off - [GATT] -# GATT attribute cache. -# Possible values: -# always: Always cache attributes even for devices not paired, this is -# recommended as it is best for interoperability, with more consistent -# reconnection times and enables proper tracking of notifications for all -# devices. -# yes: Only cache attributes of paired devices. -# no: Never cache attributes -# Default: always -#Cache = always - -# Minimum required Encryption Key Size for accessing secured characteristics. -# Possible values: 0 and 7-16. 0 means don't care. -# Defaults to 0 -# MinEncKeySize = 0 [Policy] -# -# The ReconnectUUIDs defines the set of remote services that should try -# to be reconnected to in case of a link loss (link supervision -# timeout). The policy plugin should contain a sane set of values by -# default, but this list can be overridden here. By setting the list to -# empty the reconnection feature gets disabled. -#ReconnectUUIDs=00001112-0000-1000-8000-00805f9b34fb,0000111f-0000-1000-8000-00805f9b34fb,0000110a-0000-1000-8000-00805f9b34fb - -# ReconnectAttempts define the number of attempts to reconnect after a link -# lost. Setting the value to 0 disables reconnecting feature. -#ReconnectAttempts=7 - -# ReconnectIntervals define the set of intervals in seconds to use in between -# attempts. -# If the number of attempts defined in ReconnectAttempts is bigger than the -# set of intervals the last interval is repeated until the last attempt. -#ReconnectIntervals=1,2,4,8,16,32,64 - -# AutoEnable defines option to enable all controllers when they are found. -# This includes adapters present on start as well as adapters that are plugged -# in later on. Defaults to 'false'. AutoEnable=true From b00c5cb72555e854d8800a26839658edc016e36b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Mar 2022 08:24:01 +0200 Subject: [PATCH 1044/2667] Clean up bluetooth conf --- root/etc/bluetooth/main.conf | 101 ----------------------------------- 1 file changed, 101 deletions(-) diff --git a/root/etc/bluetooth/main.conf b/root/etc/bluetooth/main.conf index ee4a1c5f..750103f8 100755 --- a/root/etc/bluetooth/main.conf +++ b/root/etc/bluetooth/main.conf @@ -1,107 +1,6 @@ [General] -# Default adapter name -# Defaults to 'BlueZ X.YZ' -#Name = BlueZ - -# Default device class. Only the major and minor device class bits are -# considered. Defaults to '0x000000'. -#Class = 0x000100 - -# How long to stay in discoverable mode before going back to non-discoverable -# The value is in seconds. Default is 180, i.e. 3 minutes. -# 0 = disable timer, i.e. stay discoverable forever -#DiscoverableTimeout = 0 - -# How long to stay in pairable mode before going back to non-discoverable -# The value is in seconds. Default is 0. -# 0 = disable timer, i.e. stay pairable forever -#PairableTimeout = 0 - -# Use vendor id source (assigner), vendor, product and version information for -# DID profile support. The values are separated by ":" and assigner, VID, PID -# and version. -# Possible vendor id source values: bluetooth, usb (defaults to usb) -#DeviceID = bluetooth:1234:5678:abcd - -# Do reverse service discovery for previously unknown devices that connect to -# us. This option is really only needed for qualification since the BITE tester -# doesn't like us doing reverse SDP for some test cases (though there could in -# theory be other useful purposes for this too). Defaults to 'true'. -#ReverseServiceDiscovery = true - -# Enable name resolving after inquiry. Set it to 'false' if you don't need -# remote devices name and want shorter discovery cycle. Defaults to 'true'. -#NameResolving = true - -# Enable runtime persistency of debug link keys. Default is false which -# makes debug link keys valid only for the duration of the connection -# that they were created for. -#DebugKeys = false - -# Restricts all controllers to the specified transport. Default value -# is "dual", i.e. both BR/EDR and LE enabled (when supported by the HW). -# Possible values: "dual", "bredr", "le" -#ControllerMode = dual - -# Enables Multi Profile Specification support. This allows to specify if -# system supports only Multiple Profiles Single Device (MPSD) configuration -# or both Multiple Profiles Single Device (MPSD) and Multiple Profiles Multiple -# Devices (MPMD) configurations. -# Possible values: "off", "single", "multiple" -#MultiProfile = off - -# Permanently enables the Fast Connectable setting for adapters that -# support it. When enabled other devices can connect faster to us, -# however the tradeoff is increased power consumptions. This feature -# will fully work only on kernel version 4.1 and newer. Defaults to -# 'false'. -#FastConnectable = false - -# Default privacy setting. -# Enables use of private address. -# Possible values: "off", "device", "network" -# "network" option not supported currently -# Defaults to "off" -# Privacy = off - [GATT] -# GATT attribute cache. -# Possible values: -# always: Always cache attributes even for devices not paired, this is -# recommended as it is best for interoperability, with more consistent -# reconnection times and enables proper tracking of notifications for all -# devices. -# yes: Only cache attributes of paired devices. -# no: Never cache attributes -# Default: always -#Cache = always - -# Minimum required Encryption Key Size for accessing secured characteristics. -# Possible values: 0 and 7-16. 0 means don't care. -# Defaults to 0 -# MinEncKeySize = 0 [Policy] -# -# The ReconnectUUIDs defines the set of remote services that should try -# to be reconnected to in case of a link loss (link supervision -# timeout). The policy plugin should contain a sane set of values by -# default, but this list can be overridden here. By setting the list to -# empty the reconnection feature gets disabled. -#ReconnectUUIDs=00001112-0000-1000-8000-00805f9b34fb,0000111f-0000-1000-8000-00805f9b34fb,0000110a-0000-1000-8000-00805f9b34fb - -# ReconnectAttempts define the number of attempts to reconnect after a link -# lost. Setting the value to 0 disables reconnecting feature. -#ReconnectAttempts=7 - -# ReconnectIntervals define the set of intervals in seconds to use in between -# attempts. -# If the number of attempts defined in ReconnectAttempts is bigger than the -# set of intervals the last interval is repeated until the last attempt. -#ReconnectIntervals=1,2,4,8,16,32,64 - -# AutoEnable defines option to enable all controllers when they are found. -# This includes adapters present on start as well as adapters that are plugged -# in later on. Defaults to 'false'. AutoEnable=true From 122a7cd504247d90e2b5070c8062dd6faa126289 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Mar 2022 08:24:15 +0200 Subject: [PATCH 1045/2667] Add timesyncd.conf --- config-root.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config-root.yaml b/config-root.yaml index 5d2229a4..0fe32678 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -113,6 +113,9 @@ dotfiles: f_loader.conf: src: boot/loader/loader.conf dst: /boot/loader/loader.conf + f_timesyncd.conf: + src: etc/systemd/timesyncd.conf + dst: /etc/systemd/timesyncd.conf profiles: Network: dotfiles: @@ -150,6 +153,7 @@ profiles: - d_mkinitcpio.d - f_cmdline - f_loader.conf + - f_timesyncd.conf include: - Locale - Pacman From befa0180f9706171a16cdc07ef645d2bf29f78f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Mar 2022 08:24:15 +0200 Subject: [PATCH 1046/2667] Add timesyncd.conf --- config-root.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config-root.yaml b/config-root.yaml index 5d2229a4..0fe32678 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -113,6 +113,9 @@ dotfiles: f_loader.conf: src: boot/loader/loader.conf dst: /boot/loader/loader.conf + f_timesyncd.conf: + src: etc/systemd/timesyncd.conf + dst: /etc/systemd/timesyncd.conf profiles: Network: dotfiles: @@ -150,6 +153,7 @@ profiles: - d_mkinitcpio.d - f_cmdline - f_loader.conf + - f_timesyncd.conf include: - Locale - Pacman From 99cdc64df932900f196e5bf1fcce20005aec4c78 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Mar 2022 08:26:29 +0200 Subject: [PATCH 1047/2667] Update mirkwood mkinitcpio hooks --- root/etc/mkinitcpio.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 54c22309..ce7a725e 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -4,7 +4,7 @@ FILES=() {%@@ if profile == "Mirkwood" @@%} BINARIES=("/usr/bin/btrfs") -HOOKS=(colors consolefont welcomemessage base udev autodetect modconf block filesystems btrfs keyboard encrypt fsck) +HOOKS=(colors consolefont welcomemessage base udev keyboard autodetect modconf block filesystems btrfs encrypt fsck) {%@@ else @@%} BINARIES=() From 2e58dde61012a6dfa20650a998c5e16b69d41f00 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Mar 2022 08:26:29 +0200 Subject: [PATCH 1048/2667] Update mirkwood mkinitcpio hooks --- root/etc/mkinitcpio.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 54c22309..ce7a725e 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -4,7 +4,7 @@ FILES=() {%@@ if profile == "Mirkwood" @@%} BINARIES=("/usr/bin/btrfs") -HOOKS=(colors consolefont welcomemessage base udev autodetect modconf block filesystems btrfs keyboard encrypt fsck) +HOOKS=(colors consolefont welcomemessage base udev keyboard autodetect modconf block filesystems btrfs encrypt fsck) {%@@ else @@%} BINARIES=() From 8a99809c0a2d77cec54aa1a0da3373be34012dcc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 23 Mar 2022 18:44:59 +0200 Subject: [PATCH 1049/2667] Add nginx for main website --- docker/korhonen.cc/docker-compose.toml | 24 ++++++++++++++++++++++++ docker/korhonen.cc/nginx.conf | 20 ++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 docker/korhonen.cc/docker-compose.toml create mode 100644 docker/korhonen.cc/nginx.conf diff --git a/docker/korhonen.cc/docker-compose.toml b/docker/korhonen.cc/docker-compose.toml new file mode 100644 index 00000000..dd7e144a --- /dev/null +++ b/docker/korhonen.cc/docker-compose.toml @@ -0,0 +1,24 @@ +[services] + +[services.nginx] +image = "nginx" +container_name = "korhonen.cc" +volumes = ["/docker/korhonen.cc:/korhonen.cc:ro", "./nginx.conf:/etc/nginx/conf.d/default.conf"] +networks = ["proxy"] +restart = "unless-stopped" +labels = [ + "traefik.enable=true", + "traefik.http.routers.korhonen-redirect.entrypoints=http", + "traefik.http.routers.korhonen-redirect.rule=Host(`korhonen.cc`)", + "traefik.http.routers.korhonen-redirect.middlewares=http2https@file", + "traefik.http.routers.korhonen.entrypoints=https", + "traefik.http.routers.korhonen.rule=Host(`korhonen.cc`)", + "traefik.http.routers.korhonen.service=korhonen", + "traefik.docker.network=proxy", + "traefik.http.services.korhonen.loadbalancer.server.port=80", +] + +[networks] + +[networks.proxy] +external = true diff --git a/docker/korhonen.cc/nginx.conf b/docker/korhonen.cc/nginx.conf new file mode 100644 index 00000000..4bda4c89 --- /dev/null +++ b/docker/korhonen.cc/nginx.conf @@ -0,0 +1,20 @@ +server { + listen 80; + listen [::]:80; + server_name localhost; + + location / { + root /korhonen.cc; + index index.html; + } + + # Use hugo 404 page + error_page 404 /404.html; + + # Redirect 5xx to standard error pages + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} + From b8e593b4660d458bb7ad3f3061de6efe98854678 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 23 Mar 2022 18:44:59 +0200 Subject: [PATCH 1050/2667] Add nginx for main website --- docker/korhonen.cc/docker-compose.toml | 24 ++++++++++++++++++++++++ docker/korhonen.cc/nginx.conf | 20 ++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 docker/korhonen.cc/docker-compose.toml create mode 100644 docker/korhonen.cc/nginx.conf diff --git a/docker/korhonen.cc/docker-compose.toml b/docker/korhonen.cc/docker-compose.toml new file mode 100644 index 00000000..dd7e144a --- /dev/null +++ b/docker/korhonen.cc/docker-compose.toml @@ -0,0 +1,24 @@ +[services] + +[services.nginx] +image = "nginx" +container_name = "korhonen.cc" +volumes = ["/docker/korhonen.cc:/korhonen.cc:ro", "./nginx.conf:/etc/nginx/conf.d/default.conf"] +networks = ["proxy"] +restart = "unless-stopped" +labels = [ + "traefik.enable=true", + "traefik.http.routers.korhonen-redirect.entrypoints=http", + "traefik.http.routers.korhonen-redirect.rule=Host(`korhonen.cc`)", + "traefik.http.routers.korhonen-redirect.middlewares=http2https@file", + "traefik.http.routers.korhonen.entrypoints=https", + "traefik.http.routers.korhonen.rule=Host(`korhonen.cc`)", + "traefik.http.routers.korhonen.service=korhonen", + "traefik.docker.network=proxy", + "traefik.http.services.korhonen.loadbalancer.server.port=80", +] + +[networks] + +[networks.proxy] +external = true diff --git a/docker/korhonen.cc/nginx.conf b/docker/korhonen.cc/nginx.conf new file mode 100644 index 00000000..4bda4c89 --- /dev/null +++ b/docker/korhonen.cc/nginx.conf @@ -0,0 +1,20 @@ +server { + listen 80; + listen [::]:80; + server_name localhost; + + location / { + root /korhonen.cc; + index index.html; + } + + # Use hugo 404 page + error_page 404 /404.html; + + # Redirect 5xx to standard error pages + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} + From e849d8d7cce8ff3c69aa4f37eab2300d1bb8044f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 23 Mar 2022 23:08:30 +0200 Subject: [PATCH 1051/2667] Add asciidoc renderer to gitea --- docker/gitea/Dockerfile | 3 +++ docker/gitea/docker-compose.toml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 docker/gitea/Dockerfile diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile new file mode 100644 index 00000000..c97f79bf --- /dev/null +++ b/docker/gitea/Dockerfile @@ -0,0 +1,3 @@ +FROM gitea/gitea:1 + +RUN apk --no-cache add asciidoctor diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml index dc4c9220..6fac0acf 100644 --- a/docker/gitea/docker-compose.toml +++ b/docker/gitea/docker-compose.toml @@ -2,7 +2,7 @@ [services.gitea] container_name = "gitea" -image = "gitea/gitea:1" +build = "." environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] restart = "unless-stopped" networks = ["postgres", "proxy"] From 687199810c27b0a0527bcea0e0440d9c029b8c63 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 23 Mar 2022 23:08:30 +0200 Subject: [PATCH 1052/2667] Add asciidoc renderer to gitea --- docker/gitea/Dockerfile | 3 +++ docker/gitea/docker-compose.toml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 docker/gitea/Dockerfile diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile new file mode 100644 index 00000000..c97f79bf --- /dev/null +++ b/docker/gitea/Dockerfile @@ -0,0 +1,3 @@ +FROM gitea/gitea:1 + +RUN apk --no-cache add asciidoctor diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml index dc4c9220..6fac0acf 100644 --- a/docker/gitea/docker-compose.toml +++ b/docker/gitea/docker-compose.toml @@ -2,7 +2,7 @@ [services.gitea] container_name = "gitea" -image = "gitea/gitea:1" +build = "." environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] restart = "unless-stopped" networks = ["postgres", "proxy"] From e0fef53231048c19f97d16af3c47d9e667ea1c37 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 10:26:23 +0200 Subject: [PATCH 1053/2667] Add HSTS headers for all pages --- docker/authentik/docker-compose.toml | 3 ++- docker/freshrss/docker-compose.toml | 6 ++++-- docker/gitea/docker-compose.toml | 3 ++- docker/homeautomation/docker-compose.toml | 6 ++++-- docker/index.korhonen.cc/docker-compose.toml | 3 ++- docker/jellyfin/docker-compose.toml | 3 ++- docker/korhonen.cc/docker-compose.toml | 8 ++++++-- docker/pihole/docker-compose.toml | 3 ++- docker/traefik/docker-compose.toml | 3 ++- docker/tvheadend/docker-compose.toml | 3 ++- 10 files changed, 28 insertions(+), 13 deletions(-) diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index dbeb58be..6ed612cb 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -20,13 +20,14 @@ env_file = [".env"] networks = ["authentik", "postgres", "proxy"] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.authentik-redirect.entrypoints=http", "traefik.http.routers.authentik-redirect.rule=Host(`sso.korhonen.cc`)", "traefik.http.routers.authentik-redirect.middlewares=http2https@file", "traefik.http.routers.authentik.entrypoints=https", + "traefik.http.routers.authentik.middlewares=secHeaders@file", "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)", "traefik.http.routers.authentik.service=authentik", - "traefik.docker.network=proxy", "traefik.http.services.authentik.loadbalancer.server.port=9000", ] diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml index 538cb1f3..30e28f6e 100644 --- a/docker/freshrss/docker-compose.toml +++ b/docker/freshrss/docker-compose.toml @@ -13,13 +13,14 @@ volumes = [ ] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.freshrss-redirect.entrypoints=http", "traefik.http.routers.freshrss-redirect.rule=Host(`rss.korhonen.cc`)", "traefik.http.routers.freshrss-redirect.middlewares=http2https@file", "traefik.http.routers.freshrss.entrypoints=https", + "traefik.http.routers.freshrss.middlewares=secHeaders@file", "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)", "traefik.http.routers.freshrss.service=freshrss", - "traefik.docker.network=proxy", "traefik.http.services.freshrss.loadbalancer.server.port=80", ] @@ -34,13 +35,14 @@ volumes = [ networks = ["freshrss", "proxy"] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.bibliogram-redirect.entrypoints=http", "traefik.http.routers.bibliogram-redirect.rule=Host(`bibliogram.korhonen.cc`)", "traefik.http.routers.bibliogram-redirect.middlewares=http2https@file", "traefik.http.routers.bibliogram.entrypoints=https", + "traefik.http.routers.bibliogram.middlewares=secHeaders@file", "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)", "traefik.http.routers.bibliogram.service=bibliogram", - "traefik.docker.network=proxy", "traefik.http.services.bibliogram.loadbalancer.server.port=10407", ] diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml index 6fac0acf..ca40968d 100644 --- a/docker/gitea/docker-compose.toml +++ b/docker/gitea/docker-compose.toml @@ -10,13 +10,14 @@ ports = ["3000:3000", "22:22"] volumes = ["/docker/gitea:/data", "/etc/localtime:/etc/localtime:ro"] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.gitea-redirect.entrypoints=http", "traefik.http.routers.gitea-redirect.rule=Host(`git.korhonen.cc`)", "traefik.http.routers.gitea-redirect.middlewares=http2https@file", "traefik.http.routers.gitea.entrypoints=https", + "traefik.http.routers.gitea.middlewares=secHeaders@file", "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)", "traefik.http.routers.gitea.service=gitea", - "traefik.docker.network=proxy", "traefik.http.services.gitea.loadbalancer.server.port=3000", ] diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 65503e20..5aedcb39 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -15,13 +15,14 @@ ports = ["8123:8123", "8300:8300"] depends_on = ["mosquitto"] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.home-assistant-redirect.entrypoints=http", "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)", "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file", "traefik.http.routers.home-assistant.entrypoints=https", + "traefik.http.routers.home-assistant.middlewares=secHeaders@file", "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)", "traefik.http.routers.home-assistant.service=home-assistant", - "traefik.docker.network=proxy", "traefik.http.services.home-assistant.loadbalancer.server.port=8123", ] @@ -70,13 +71,14 @@ restart = "unless-stopped" depends_on = ["home-assistant"] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.node-red-redirect.entrypoints=http", "traefik.http.routers.node-red-redirect.rule=Host(`node.korhonen.cc`)", "traefik.http.routers.node-red-redirect.middlewares=http2https@file", "traefik.http.routers.node-red.entrypoints=https", "traefik.http.routers.node-red.rule=Host(`node.korhonen.cc`)", + "traefik.http.routers.node-red.middlewares=secHeaders@file", "traefik.http.routers.node-red.service=node-red", - "traefik.docker.network=proxy", "traefik.http.services.node-red.loadbalancer.server.port=1880", ] diff --git a/docker/index.korhonen.cc/docker-compose.toml b/docker/index.korhonen.cc/docker-compose.toml index ea4eb287..9bbec60c 100644 --- a/docker/index.korhonen.cc/docker-compose.toml +++ b/docker/index.korhonen.cc/docker-compose.toml @@ -9,13 +9,14 @@ networks = ["proxy"] restart = "unless-stopped" labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.index-redirect.entrypoints=http", "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)", "traefik.http.routers.index-redirect.middlewares=http2https@file", "traefik.http.routers.index.entrypoints=https", + "traefik.http.routers.index.middlewares=secHeaders@file", "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)", "traefik.http.routers.index.service=index", - "traefik.docker.network=proxy", "traefik.http.services.index.loadbalancer.server.port=80", ] diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 0ea17c77..3e3a2f38 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -19,13 +19,14 @@ devices = [ ] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.jellyfin-redirect.entrypoints=http", "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)", "traefik.http.routers.jellyfin-redirect.middlewares=http2https@file", "traefik.http.routers.jellyfin.entrypoints=https", + "traefik.http.routers.gitea.middlewares=secHeaders@file", "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)", "traefik.http.routers.jellyfin.service=jellyfin", - "traefik.docker.network=proxy", "traefik.http.services.jellyfin.loadbalancer.server.port=8096", ] diff --git a/docker/korhonen.cc/docker-compose.toml b/docker/korhonen.cc/docker-compose.toml index dd7e144a..41ca73b4 100644 --- a/docker/korhonen.cc/docker-compose.toml +++ b/docker/korhonen.cc/docker-compose.toml @@ -3,18 +3,22 @@ [services.nginx] image = "nginx" container_name = "korhonen.cc" -volumes = ["/docker/korhonen.cc:/korhonen.cc:ro", "./nginx.conf:/etc/nginx/conf.d/default.conf"] +volumes = [ + "/docker/korhonen.cc:/korhonen.cc:ro", + "./nginx.conf:/etc/nginx/conf.d/default.conf", +] networks = ["proxy"] restart = "unless-stopped" labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.korhonen-redirect.entrypoints=http", "traefik.http.routers.korhonen-redirect.rule=Host(`korhonen.cc`)", "traefik.http.routers.korhonen-redirect.middlewares=http2https@file", "traefik.http.routers.korhonen.entrypoints=https", + "traefik.http.routers.korhonen.middlewares=secHeaders@file", "traefik.http.routers.korhonen.rule=Host(`korhonen.cc`)", "traefik.http.routers.korhonen.service=korhonen", - "traefik.docker.network=proxy", "traefik.http.services.korhonen.loadbalancer.server.port=80", ] diff --git a/docker/pihole/docker-compose.toml b/docker/pihole/docker-compose.toml index 27f4af69..4006a3dc 100644 --- a/docker/pihole/docker-compose.toml +++ b/docker/pihole/docker-compose.toml @@ -14,13 +14,14 @@ cap_add = ["NET_ADMIN"] restart = "unless-stopped" labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.pihole-redirect.entrypoints=http", "traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)", "traefik.http.routers.pihole-redirect.middlewares=http2https@file", "traefik.http.routers.pihole.entrypoints=https", + "traefik.http.routers.pihole.middlewares=secHeaders@file", "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)", "traefik.http.routers.pihole.service=pihole", - "traefik.docker.network=proxy", "traefik.http.services.pihole.loadbalancer.server.port=80", ] diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index 828784d7..d8b46f4e 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -19,15 +19,16 @@ volumes = [ ] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.redirect.entrypoints=http", "traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)", "traefik.http.routers.redirect.middlewares=http2https@file", "traefik.http.routers.dashboard.entrypoints=https", + "traefik.http.routers.dashboard.middlewares=secHeaders@file", "traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)", "traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users", "traefik.http.routers.dashboard.middlewares=dashboard-auth", "traefik.http.routers.dashboard.service=api@internal", - "traefik.docker.network=proxy", ] [services.fail2ban] diff --git a/docker/tvheadend/docker-compose.toml b/docker/tvheadend/docker-compose.toml index c3aef502..dd2f1c2c 100644 --- a/docker/tvheadend/docker-compose.toml +++ b/docker/tvheadend/docker-compose.toml @@ -16,13 +16,14 @@ restart = "unless-stopped" networks = ["proxy"] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.tvheadend-redirect.entrypoints=http", "traefik.http.routers.tvheadend-redirect.rule=Host(`tvheadend.korhonen.cc`)", "traefik.http.routers.tvheadend-redirect.middlewares=http2https@file", "traefik.http.routers.tvheadend.entrypoints=https", + "traefik.http.routers.tvheadend.middlewares=secHeaders@file", "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)", "traefik.http.routers.tvheadend.service=tvheadend", - "traefik.docker.network=proxy", "traefik.http.services.tvheadend.loadbalancer.server.port=9981", ] From d79a88870a832225865acc48c8d0740157daf2c4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 10:26:23 +0200 Subject: [PATCH 1054/2667] Add HSTS headers for all pages --- docker/authentik/docker-compose.toml | 3 ++- docker/freshrss/docker-compose.toml | 6 ++++-- docker/gitea/docker-compose.toml | 3 ++- docker/homeautomation/docker-compose.toml | 6 ++++-- docker/index.korhonen.cc/docker-compose.toml | 3 ++- docker/jellyfin/docker-compose.toml | 3 ++- docker/korhonen.cc/docker-compose.toml | 8 ++++++-- docker/pihole/docker-compose.toml | 3 ++- docker/traefik/docker-compose.toml | 3 ++- docker/tvheadend/docker-compose.toml | 3 ++- 10 files changed, 28 insertions(+), 13 deletions(-) diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index dbeb58be..6ed612cb 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -20,13 +20,14 @@ env_file = [".env"] networks = ["authentik", "postgres", "proxy"] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.authentik-redirect.entrypoints=http", "traefik.http.routers.authentik-redirect.rule=Host(`sso.korhonen.cc`)", "traefik.http.routers.authentik-redirect.middlewares=http2https@file", "traefik.http.routers.authentik.entrypoints=https", + "traefik.http.routers.authentik.middlewares=secHeaders@file", "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)", "traefik.http.routers.authentik.service=authentik", - "traefik.docker.network=proxy", "traefik.http.services.authentik.loadbalancer.server.port=9000", ] diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml index 538cb1f3..30e28f6e 100644 --- a/docker/freshrss/docker-compose.toml +++ b/docker/freshrss/docker-compose.toml @@ -13,13 +13,14 @@ volumes = [ ] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.freshrss-redirect.entrypoints=http", "traefik.http.routers.freshrss-redirect.rule=Host(`rss.korhonen.cc`)", "traefik.http.routers.freshrss-redirect.middlewares=http2https@file", "traefik.http.routers.freshrss.entrypoints=https", + "traefik.http.routers.freshrss.middlewares=secHeaders@file", "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)", "traefik.http.routers.freshrss.service=freshrss", - "traefik.docker.network=proxy", "traefik.http.services.freshrss.loadbalancer.server.port=80", ] @@ -34,13 +35,14 @@ volumes = [ networks = ["freshrss", "proxy"] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.bibliogram-redirect.entrypoints=http", "traefik.http.routers.bibliogram-redirect.rule=Host(`bibliogram.korhonen.cc`)", "traefik.http.routers.bibliogram-redirect.middlewares=http2https@file", "traefik.http.routers.bibliogram.entrypoints=https", + "traefik.http.routers.bibliogram.middlewares=secHeaders@file", "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)", "traefik.http.routers.bibliogram.service=bibliogram", - "traefik.docker.network=proxy", "traefik.http.services.bibliogram.loadbalancer.server.port=10407", ] diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml index 6fac0acf..ca40968d 100644 --- a/docker/gitea/docker-compose.toml +++ b/docker/gitea/docker-compose.toml @@ -10,13 +10,14 @@ ports = ["3000:3000", "22:22"] volumes = ["/docker/gitea:/data", "/etc/localtime:/etc/localtime:ro"] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.gitea-redirect.entrypoints=http", "traefik.http.routers.gitea-redirect.rule=Host(`git.korhonen.cc`)", "traefik.http.routers.gitea-redirect.middlewares=http2https@file", "traefik.http.routers.gitea.entrypoints=https", + "traefik.http.routers.gitea.middlewares=secHeaders@file", "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)", "traefik.http.routers.gitea.service=gitea", - "traefik.docker.network=proxy", "traefik.http.services.gitea.loadbalancer.server.port=3000", ] diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 65503e20..5aedcb39 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -15,13 +15,14 @@ ports = ["8123:8123", "8300:8300"] depends_on = ["mosquitto"] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.home-assistant-redirect.entrypoints=http", "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)", "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file", "traefik.http.routers.home-assistant.entrypoints=https", + "traefik.http.routers.home-assistant.middlewares=secHeaders@file", "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)", "traefik.http.routers.home-assistant.service=home-assistant", - "traefik.docker.network=proxy", "traefik.http.services.home-assistant.loadbalancer.server.port=8123", ] @@ -70,13 +71,14 @@ restart = "unless-stopped" depends_on = ["home-assistant"] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.node-red-redirect.entrypoints=http", "traefik.http.routers.node-red-redirect.rule=Host(`node.korhonen.cc`)", "traefik.http.routers.node-red-redirect.middlewares=http2https@file", "traefik.http.routers.node-red.entrypoints=https", "traefik.http.routers.node-red.rule=Host(`node.korhonen.cc`)", + "traefik.http.routers.node-red.middlewares=secHeaders@file", "traefik.http.routers.node-red.service=node-red", - "traefik.docker.network=proxy", "traefik.http.services.node-red.loadbalancer.server.port=1880", ] diff --git a/docker/index.korhonen.cc/docker-compose.toml b/docker/index.korhonen.cc/docker-compose.toml index ea4eb287..9bbec60c 100644 --- a/docker/index.korhonen.cc/docker-compose.toml +++ b/docker/index.korhonen.cc/docker-compose.toml @@ -9,13 +9,14 @@ networks = ["proxy"] restart = "unless-stopped" labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.index-redirect.entrypoints=http", "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)", "traefik.http.routers.index-redirect.middlewares=http2https@file", "traefik.http.routers.index.entrypoints=https", + "traefik.http.routers.index.middlewares=secHeaders@file", "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)", "traefik.http.routers.index.service=index", - "traefik.docker.network=proxy", "traefik.http.services.index.loadbalancer.server.port=80", ] diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 0ea17c77..3e3a2f38 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -19,13 +19,14 @@ devices = [ ] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.jellyfin-redirect.entrypoints=http", "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)", "traefik.http.routers.jellyfin-redirect.middlewares=http2https@file", "traefik.http.routers.jellyfin.entrypoints=https", + "traefik.http.routers.gitea.middlewares=secHeaders@file", "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)", "traefik.http.routers.jellyfin.service=jellyfin", - "traefik.docker.network=proxy", "traefik.http.services.jellyfin.loadbalancer.server.port=8096", ] diff --git a/docker/korhonen.cc/docker-compose.toml b/docker/korhonen.cc/docker-compose.toml index dd7e144a..41ca73b4 100644 --- a/docker/korhonen.cc/docker-compose.toml +++ b/docker/korhonen.cc/docker-compose.toml @@ -3,18 +3,22 @@ [services.nginx] image = "nginx" container_name = "korhonen.cc" -volumes = ["/docker/korhonen.cc:/korhonen.cc:ro", "./nginx.conf:/etc/nginx/conf.d/default.conf"] +volumes = [ + "/docker/korhonen.cc:/korhonen.cc:ro", + "./nginx.conf:/etc/nginx/conf.d/default.conf", +] networks = ["proxy"] restart = "unless-stopped" labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.korhonen-redirect.entrypoints=http", "traefik.http.routers.korhonen-redirect.rule=Host(`korhonen.cc`)", "traefik.http.routers.korhonen-redirect.middlewares=http2https@file", "traefik.http.routers.korhonen.entrypoints=https", + "traefik.http.routers.korhonen.middlewares=secHeaders@file", "traefik.http.routers.korhonen.rule=Host(`korhonen.cc`)", "traefik.http.routers.korhonen.service=korhonen", - "traefik.docker.network=proxy", "traefik.http.services.korhonen.loadbalancer.server.port=80", ] diff --git a/docker/pihole/docker-compose.toml b/docker/pihole/docker-compose.toml index 27f4af69..4006a3dc 100644 --- a/docker/pihole/docker-compose.toml +++ b/docker/pihole/docker-compose.toml @@ -14,13 +14,14 @@ cap_add = ["NET_ADMIN"] restart = "unless-stopped" labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.pihole-redirect.entrypoints=http", "traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)", "traefik.http.routers.pihole-redirect.middlewares=http2https@file", "traefik.http.routers.pihole.entrypoints=https", + "traefik.http.routers.pihole.middlewares=secHeaders@file", "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)", "traefik.http.routers.pihole.service=pihole", - "traefik.docker.network=proxy", "traefik.http.services.pihole.loadbalancer.server.port=80", ] diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index 828784d7..d8b46f4e 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -19,15 +19,16 @@ volumes = [ ] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.redirect.entrypoints=http", "traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)", "traefik.http.routers.redirect.middlewares=http2https@file", "traefik.http.routers.dashboard.entrypoints=https", + "traefik.http.routers.dashboard.middlewares=secHeaders@file", "traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)", "traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users", "traefik.http.routers.dashboard.middlewares=dashboard-auth", "traefik.http.routers.dashboard.service=api@internal", - "traefik.docker.network=proxy", ] [services.fail2ban] diff --git a/docker/tvheadend/docker-compose.toml b/docker/tvheadend/docker-compose.toml index c3aef502..dd2f1c2c 100644 --- a/docker/tvheadend/docker-compose.toml +++ b/docker/tvheadend/docker-compose.toml @@ -16,13 +16,14 @@ restart = "unless-stopped" networks = ["proxy"] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.tvheadend-redirect.entrypoints=http", "traefik.http.routers.tvheadend-redirect.rule=Host(`tvheadend.korhonen.cc`)", "traefik.http.routers.tvheadend-redirect.middlewares=http2https@file", "traefik.http.routers.tvheadend.entrypoints=https", + "traefik.http.routers.tvheadend.middlewares=secHeaders@file", "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)", "traefik.http.routers.tvheadend.service=tvheadend", - "traefik.docker.network=proxy", "traefik.http.services.tvheadend.loadbalancer.server.port=9981", ] From a4dca20f8cb405b9a11274c7945704c487d48ea8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 12:19:29 +0200 Subject: [PATCH 1055/2667] Add www to non-www redirect for korhonen.cc --- docker/jellyfin/docker-compose.toml | 2 +- docker/korhonen.cc/docker-compose.toml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 3e3a2f38..559d31d5 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -24,7 +24,7 @@ labels = [ "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)", "traefik.http.routers.jellyfin-redirect.middlewares=http2https@file", "traefik.http.routers.jellyfin.entrypoints=https", - "traefik.http.routers.gitea.middlewares=secHeaders@file", + "traefik.http.routers.jellyfin.middlewares=secHeaders@file", "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)", "traefik.http.routers.jellyfin.service=jellyfin", "traefik.http.services.jellyfin.loadbalancer.server.port=8096", diff --git a/docker/korhonen.cc/docker-compose.toml b/docker/korhonen.cc/docker-compose.toml index 41ca73b4..bec21842 100644 --- a/docker/korhonen.cc/docker-compose.toml +++ b/docker/korhonen.cc/docker-compose.toml @@ -13,11 +13,11 @@ labels = [ "traefik.enable=true", "traefik.docker.network=proxy", "traefik.http.routers.korhonen-redirect.entrypoints=http", - "traefik.http.routers.korhonen-redirect.rule=Host(`korhonen.cc`)", - "traefik.http.routers.korhonen-redirect.middlewares=http2https@file", + "traefik.http.routers.korhonen-redirect.rule=Host(`korhonen.cc`) || Host(`www.korhonen.cc`)", + "traefik.http.routers.korhonen-redirect.middlewares=www2non-www@file,http2https@file", "traefik.http.routers.korhonen.entrypoints=https", - "traefik.http.routers.korhonen.middlewares=secHeaders@file", - "traefik.http.routers.korhonen.rule=Host(`korhonen.cc`)", + "traefik.http.routers.korhonen.middlewares=secHeaders@file,www2non-www@file", + "traefik.http.routers.korhonen.rule=Host(`korhonen.cc`) || Host(`www.korhonen.cc`)", "traefik.http.routers.korhonen.service=korhonen", "traefik.http.services.korhonen.loadbalancer.server.port=80", ] From 2229cf8cf288bc0ab9a18eea879690fe8fbae8ae Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 12:19:29 +0200 Subject: [PATCH 1056/2667] Add www to non-www redirect for korhonen.cc --- docker/jellyfin/docker-compose.toml | 2 +- docker/korhonen.cc/docker-compose.toml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 3e3a2f38..559d31d5 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -24,7 +24,7 @@ labels = [ "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)", "traefik.http.routers.jellyfin-redirect.middlewares=http2https@file", "traefik.http.routers.jellyfin.entrypoints=https", - "traefik.http.routers.gitea.middlewares=secHeaders@file", + "traefik.http.routers.jellyfin.middlewares=secHeaders@file", "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)", "traefik.http.routers.jellyfin.service=jellyfin", "traefik.http.services.jellyfin.loadbalancer.server.port=8096", diff --git a/docker/korhonen.cc/docker-compose.toml b/docker/korhonen.cc/docker-compose.toml index 41ca73b4..bec21842 100644 --- a/docker/korhonen.cc/docker-compose.toml +++ b/docker/korhonen.cc/docker-compose.toml @@ -13,11 +13,11 @@ labels = [ "traefik.enable=true", "traefik.docker.network=proxy", "traefik.http.routers.korhonen-redirect.entrypoints=http", - "traefik.http.routers.korhonen-redirect.rule=Host(`korhonen.cc`)", - "traefik.http.routers.korhonen-redirect.middlewares=http2https@file", + "traefik.http.routers.korhonen-redirect.rule=Host(`korhonen.cc`) || Host(`www.korhonen.cc`)", + "traefik.http.routers.korhonen-redirect.middlewares=www2non-www@file,http2https@file", "traefik.http.routers.korhonen.entrypoints=https", - "traefik.http.routers.korhonen.middlewares=secHeaders@file", - "traefik.http.routers.korhonen.rule=Host(`korhonen.cc`)", + "traefik.http.routers.korhonen.middlewares=secHeaders@file,www2non-www@file", + "traefik.http.routers.korhonen.rule=Host(`korhonen.cc`) || Host(`www.korhonen.cc`)", "traefik.http.routers.korhonen.service=korhonen", "traefik.http.services.korhonen.loadbalancer.server.port=80", ] From 9a3e378a64f23f116cb7884ea4921728fd572a6a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 15:29:33 +0200 Subject: [PATCH 1057/2667] Convert README to asciidoc --- README.adoc | 24 ++++++++++++++++++++++++ README.md | 16 ---------------- 2 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 README.adoc delete mode 100644 README.md diff --git a/README.adoc b/README.adoc new file mode 100644 index 00000000..8fb4a3f5 --- /dev/null +++ b/README.adoc @@ -0,0 +1,24 @@ +== FunctionalHacker’s dotfiles + +image::https://i.imgur.com/lz1Q4Zz.png?raw=true%22[screenshot of my +setup] + +My personal dotfiles for my workstations, mostly for easy access for +myself but feel free to steal them for yourself! + +I’m using https://github.com/deadc0de6/dotdrop[dotdrop] to manage and +ease deployment of my dotfiles. + +=== Mirrors + +This repository lives at +https://git.korhonen.cc/FunctionalHacker/dotfiles[My git server], but it +is also mirrored to: - +https://gitlab.com/FunctionalHacker/dotfiles[GitLab] - +https://github.com/FunctionalHacker/dotfiles[GitHub] - +https://bitbucket.org/FunctionalHacker/dotfiles[Bitbucket] - +https://codeberg.org/FunctionalHacker/dotfiles[codeberg] + +If you have any ideas for improvements, questions or anything of this +sort, you can open an issue or a pull request in either my git server +(registrations open for anyone), or any of the mirrors. diff --git a/README.md b/README.md deleted file mode 100644 index 405eb8fc..00000000 --- a/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# FunctionalHacker's dotfiles -![screenshot of my setup](https://i.imgur.com/lz1Q4Zz.png?raw=true") - -My personal dotfiles for my workstations, mostly for easy access for myself -but feel free to steal them for yourself! - -I'm using [dotdrop](https://github.com/deadc0de6/dotdrop) to manage and ease deployment of my dotfiles. - -## Mirrors -This repository lives at [My git server](https://git.korhonen.cc/FunctionalHacker/dotfiles), but it is also mirrored to: -- [GitLab](https://gitlab.com/FunctionalHacker/dotfiles) -- [GitHub](https://github.com/FunctionalHacker/dotfiles) -- [Bitbucket](https://bitbucket.org/FunctionalHacker/dotfiles) -- [codeberg](https://codeberg.org/FunctionalHacker/dotfiles) - -If you have any ideas for improvements, questions or anything of this sort, you can open an issue or a pull request in either my git server (registrations open for anyone), or any of the mirrors. From cfc9ac3abebfd8004de121c5bdbdad391845c700 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 15:29:33 +0200 Subject: [PATCH 1058/2667] Convert README to asciidoc --- README.adoc | 24 ++++++++++++++++++++++++ README.md | 16 ---------------- 2 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 README.adoc delete mode 100644 README.md diff --git a/README.adoc b/README.adoc new file mode 100644 index 00000000..8fb4a3f5 --- /dev/null +++ b/README.adoc @@ -0,0 +1,24 @@ +== FunctionalHacker’s dotfiles + +image::https://i.imgur.com/lz1Q4Zz.png?raw=true%22[screenshot of my +setup] + +My personal dotfiles for my workstations, mostly for easy access for +myself but feel free to steal them for yourself! + +I’m using https://github.com/deadc0de6/dotdrop[dotdrop] to manage and +ease deployment of my dotfiles. + +=== Mirrors + +This repository lives at +https://git.korhonen.cc/FunctionalHacker/dotfiles[My git server], but it +is also mirrored to: - +https://gitlab.com/FunctionalHacker/dotfiles[GitLab] - +https://github.com/FunctionalHacker/dotfiles[GitHub] - +https://bitbucket.org/FunctionalHacker/dotfiles[Bitbucket] - +https://codeberg.org/FunctionalHacker/dotfiles[codeberg] + +If you have any ideas for improvements, questions or anything of this +sort, you can open an issue or a pull request in either my git server +(registrations open for anyone), or any of the mirrors. diff --git a/README.md b/README.md deleted file mode 100644 index 405eb8fc..00000000 --- a/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# FunctionalHacker's dotfiles -![screenshot of my setup](https://i.imgur.com/lz1Q4Zz.png?raw=true") - -My personal dotfiles for my workstations, mostly for easy access for myself -but feel free to steal them for yourself! - -I'm using [dotdrop](https://github.com/deadc0de6/dotdrop) to manage and ease deployment of my dotfiles. - -## Mirrors -This repository lives at [My git server](https://git.korhonen.cc/FunctionalHacker/dotfiles), but it is also mirrored to: -- [GitLab](https://gitlab.com/FunctionalHacker/dotfiles) -- [GitHub](https://github.com/FunctionalHacker/dotfiles) -- [Bitbucket](https://bitbucket.org/FunctionalHacker/dotfiles) -- [codeberg](https://codeberg.org/FunctionalHacker/dotfiles) - -If you have any ideas for improvements, questions or anything of this sort, you can open an issue or a pull request in either my git server (registrations open for anyone), or any of the mirrors. From e19ac5b59ed81705b7945036af1f9e2a1e96ec74 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 15:30:24 +0200 Subject: [PATCH 1059/2667] Fix image display (hopefully) --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 8fb4a3f5..a194fef5 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,6 @@ == FunctionalHacker’s dotfiles -image::https://i.imgur.com/lz1Q4Zz.png?raw=true%22[screenshot of my +image:https://i.imgur.com/lz1Q4Zz.png?raw=true%22[screenshot of my setup] My personal dotfiles for my workstations, mostly for easy access for From d5d5aeb8468ab6e3c6d525bdd13f48ac95c0a84e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 15:30:24 +0200 Subject: [PATCH 1060/2667] Fix image display (hopefully) --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 8fb4a3f5..a194fef5 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,6 @@ == FunctionalHacker’s dotfiles -image::https://i.imgur.com/lz1Q4Zz.png?raw=true%22[screenshot of my +image:https://i.imgur.com/lz1Q4Zz.png?raw=true%22[screenshot of my setup] My personal dotfiles for my workstations, mostly for easy access for From fdfa17ceb5b5e988e72cb12112bf55b3b233aae8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 15:32:02 +0200 Subject: [PATCH 1061/2667] Fix list in README --- README.adoc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/README.adoc b/README.adoc index a194fef5..c8bcdac3 100644 --- a/README.adoc +++ b/README.adoc @@ -11,13 +11,12 @@ ease deployment of my dotfiles. === Mirrors -This repository lives at -https://git.korhonen.cc/FunctionalHacker/dotfiles[My git server], but it -is also mirrored to: - -https://gitlab.com/FunctionalHacker/dotfiles[GitLab] - -https://github.com/FunctionalHacker/dotfiles[GitHub] - -https://bitbucket.org/FunctionalHacker/dotfiles[Bitbucket] - -https://codeberg.org/FunctionalHacker/dotfiles[codeberg] +This repository lives at https://git.korhonen.cc/FunctionalHacker/dotfiles[My git server], +but it is also mirrored to: +* https://gitlab.com/FunctionalHacker/dotfiles[GitLab] +* https://github.com/FunctionalHacker/dotfiles[GitHub] +* https://bitbucket.org/FunctionalHacker/dotfiles[Bitbucket] +* https://codeberg.org/FunctionalHacker/dotfiles[codeberg] If you have any ideas for improvements, questions or anything of this sort, you can open an issue or a pull request in either my git server From cf6f338737dd119cf73a69f9e21038a98ffc9974 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 15:32:02 +0200 Subject: [PATCH 1062/2667] Fix list in README --- README.adoc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/README.adoc b/README.adoc index a194fef5..c8bcdac3 100644 --- a/README.adoc +++ b/README.adoc @@ -11,13 +11,12 @@ ease deployment of my dotfiles. === Mirrors -This repository lives at -https://git.korhonen.cc/FunctionalHacker/dotfiles[My git server], but it -is also mirrored to: - -https://gitlab.com/FunctionalHacker/dotfiles[GitLab] - -https://github.com/FunctionalHacker/dotfiles[GitHub] - -https://bitbucket.org/FunctionalHacker/dotfiles[Bitbucket] - -https://codeberg.org/FunctionalHacker/dotfiles[codeberg] +This repository lives at https://git.korhonen.cc/FunctionalHacker/dotfiles[My git server], +but it is also mirrored to: +* https://gitlab.com/FunctionalHacker/dotfiles[GitLab] +* https://github.com/FunctionalHacker/dotfiles[GitHub] +* https://bitbucket.org/FunctionalHacker/dotfiles[Bitbucket] +* https://codeberg.org/FunctionalHacker/dotfiles[codeberg] If you have any ideas for improvements, questions or anything of this sort, you can open an issue or a pull request in either my git server From de7cb3ba78f1231475ef8035ac045798d4366748 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 15:33:22 +0200 Subject: [PATCH 1063/2667] Fix list again --- README.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/README.adoc b/README.adoc index c8bcdac3..9666c432 100644 --- a/README.adoc +++ b/README.adoc @@ -13,6 +13,7 @@ ease deployment of my dotfiles. This repository lives at https://git.korhonen.cc/FunctionalHacker/dotfiles[My git server], but it is also mirrored to: + * https://gitlab.com/FunctionalHacker/dotfiles[GitLab] * https://github.com/FunctionalHacker/dotfiles[GitHub] * https://bitbucket.org/FunctionalHacker/dotfiles[Bitbucket] From d9201743d92ef566c7df8269ee205ab144ff0766 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 15:33:22 +0200 Subject: [PATCH 1064/2667] Fix list again --- README.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/README.adoc b/README.adoc index c8bcdac3..9666c432 100644 --- a/README.adoc +++ b/README.adoc @@ -13,6 +13,7 @@ ease deployment of my dotfiles. This repository lives at https://git.korhonen.cc/FunctionalHacker/dotfiles[My git server], but it is also mirrored to: + * https://gitlab.com/FunctionalHacker/dotfiles[GitLab] * https://github.com/FunctionalHacker/dotfiles[GitHub] * https://bitbucket.org/FunctionalHacker/dotfiles[Bitbucket] From 3d306be44871de5115082fae769073ddd93655d4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 15:35:11 +0200 Subject: [PATCH 1065/2667] Make README headings one size bigger --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 9666c432..b799eb1e 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -== FunctionalHacker’s dotfiles += FunctionalHacker’s dotfiles image:https://i.imgur.com/lz1Q4Zz.png?raw=true%22[screenshot of my setup] @@ -9,7 +9,7 @@ myself but feel free to steal them for yourself! I’m using https://github.com/deadc0de6/dotdrop[dotdrop] to manage and ease deployment of my dotfiles. -=== Mirrors +== Mirrors This repository lives at https://git.korhonen.cc/FunctionalHacker/dotfiles[My git server], but it is also mirrored to: From bd6baa981318c591e714131c7f032cbf148570e4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 15:35:11 +0200 Subject: [PATCH 1066/2667] Make README headings one size bigger --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 9666c432..b799eb1e 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -== FunctionalHacker’s dotfiles += FunctionalHacker’s dotfiles image:https://i.imgur.com/lz1Q4Zz.png?raw=true%22[screenshot of my setup] @@ -9,7 +9,7 @@ myself but feel free to steal them for yourself! I’m using https://github.com/deadc0de6/dotdrop[dotdrop] to manage and ease deployment of my dotfiles. -=== Mirrors +== Mirrors This repository lives at https://git.korhonen.cc/FunctionalHacker/dotfiles[My git server], but it is also mirrored to: From 088bc31bbfae232168df3c9d0ab795377a41c7d0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 21:03:57 +0200 Subject: [PATCH 1067/2667] Enable gzip compression for all sites --- docker/authentik/docker-compose.toml | 2 +- docker/freshrss/docker-compose.toml | 4 ++-- docker/gitea/docker-compose.toml | 2 +- docker/homeautomation/docker-compose.toml | 2 +- docker/index.korhonen.cc/docker-compose.toml | 2 +- docker/jellyfin/docker-compose.toml | 2 +- docker/korhonen.cc/docker-compose.toml | 2 +- docker/nextcloud/docker-compose.toml | 2 +- docker/pihole/docker-compose.toml | 2 +- docker/remotely/docker-compose.toml | 3 ++- docker/traefik/docker-compose.toml | 2 +- docker/tvheadend/docker-compose.toml | 2 +- 12 files changed, 14 insertions(+), 13 deletions(-) diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 6ed612cb..48167a92 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -25,7 +25,7 @@ labels = [ "traefik.http.routers.authentik-redirect.rule=Host(`sso.korhonen.cc`)", "traefik.http.routers.authentik-redirect.middlewares=http2https@file", "traefik.http.routers.authentik.entrypoints=https", - "traefik.http.routers.authentik.middlewares=secHeaders@file", + "traefik.http.routers.authentik.middlewares=secHeaders@file,compress@file", "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)", "traefik.http.routers.authentik.service=authentik", "traefik.http.services.authentik.loadbalancer.server.port=9000", diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml index 30e28f6e..34334fe1 100644 --- a/docker/freshrss/docker-compose.toml +++ b/docker/freshrss/docker-compose.toml @@ -18,7 +18,7 @@ labels = [ "traefik.http.routers.freshrss-redirect.rule=Host(`rss.korhonen.cc`)", "traefik.http.routers.freshrss-redirect.middlewares=http2https@file", "traefik.http.routers.freshrss.entrypoints=https", - "traefik.http.routers.freshrss.middlewares=secHeaders@file", + "traefik.http.routers.freshrss.middlewares=secHeaders@file,compress@file", "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)", "traefik.http.routers.freshrss.service=freshrss", "traefik.http.services.freshrss.loadbalancer.server.port=80", @@ -40,7 +40,7 @@ labels = [ "traefik.http.routers.bibliogram-redirect.rule=Host(`bibliogram.korhonen.cc`)", "traefik.http.routers.bibliogram-redirect.middlewares=http2https@file", "traefik.http.routers.bibliogram.entrypoints=https", - "traefik.http.routers.bibliogram.middlewares=secHeaders@file", + "traefik.http.routers.bibliogram.middlewares=secHeaders@file,compress@file", "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)", "traefik.http.routers.bibliogram.service=bibliogram", "traefik.http.services.bibliogram.loadbalancer.server.port=10407", diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml index ca40968d..f7518688 100644 --- a/docker/gitea/docker-compose.toml +++ b/docker/gitea/docker-compose.toml @@ -15,7 +15,7 @@ labels = [ "traefik.http.routers.gitea-redirect.rule=Host(`git.korhonen.cc`)", "traefik.http.routers.gitea-redirect.middlewares=http2https@file", "traefik.http.routers.gitea.entrypoints=https", - "traefik.http.routers.gitea.middlewares=secHeaders@file", + "traefik.http.routers.gitea.middlewares=secHeaders@file,compress@file", "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)", "traefik.http.routers.gitea.service=gitea", "traefik.http.services.gitea.loadbalancer.server.port=3000", diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 5aedcb39..7cc2b787 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -20,7 +20,7 @@ labels = [ "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)", "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file", "traefik.http.routers.home-assistant.entrypoints=https", - "traefik.http.routers.home-assistant.middlewares=secHeaders@file", + "traefik.http.routers.home-assistant.middlewares=secHeaders@file,compress@file", "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)", "traefik.http.routers.home-assistant.service=home-assistant", "traefik.http.services.home-assistant.loadbalancer.server.port=8123", diff --git a/docker/index.korhonen.cc/docker-compose.toml b/docker/index.korhonen.cc/docker-compose.toml index 9bbec60c..856e6fc0 100644 --- a/docker/index.korhonen.cc/docker-compose.toml +++ b/docker/index.korhonen.cc/docker-compose.toml @@ -14,7 +14,7 @@ labels = [ "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)", "traefik.http.routers.index-redirect.middlewares=http2https@file", "traefik.http.routers.index.entrypoints=https", - "traefik.http.routers.index.middlewares=secHeaders@file", + "traefik.http.routers.index.middlewares=secHeaders@file,compress@file", "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)", "traefik.http.routers.index.service=index", "traefik.http.services.index.loadbalancer.server.port=80", diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 559d31d5..a844d2fb 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -24,7 +24,7 @@ labels = [ "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)", "traefik.http.routers.jellyfin-redirect.middlewares=http2https@file", "traefik.http.routers.jellyfin.entrypoints=https", - "traefik.http.routers.jellyfin.middlewares=secHeaders@file", + "traefik.http.routers.jellyfin.middlewares=secHeaders@file,compress@file", "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)", "traefik.http.routers.jellyfin.service=jellyfin", "traefik.http.services.jellyfin.loadbalancer.server.port=8096", diff --git a/docker/korhonen.cc/docker-compose.toml b/docker/korhonen.cc/docker-compose.toml index bec21842..634a0168 100644 --- a/docker/korhonen.cc/docker-compose.toml +++ b/docker/korhonen.cc/docker-compose.toml @@ -16,7 +16,7 @@ labels = [ "traefik.http.routers.korhonen-redirect.rule=Host(`korhonen.cc`) || Host(`www.korhonen.cc`)", "traefik.http.routers.korhonen-redirect.middlewares=www2non-www@file,http2https@file", "traefik.http.routers.korhonen.entrypoints=https", - "traefik.http.routers.korhonen.middlewares=secHeaders@file,www2non-www@file", + "traefik.http.routers.korhonen.middlewares=secHeaders@file,www2non-www@file,compress@file", "traefik.http.routers.korhonen.rule=Host(`korhonen.cc`) || Host(`www.korhonen.cc`)", "traefik.http.routers.korhonen.service=korhonen", "traefik.http.services.korhonen.loadbalancer.server.port=80", diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 75bd91e1..c6bc9171 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -27,7 +27,7 @@ labels = [ "traefik.http.routers.nextcloud.entrypoints=https", "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)", "traefik.http.routers.nextcloud.service=nextcloud", - "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-dav@file", + "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-dav@file,compress@file", "traefik.docker.network=proxy", "traefik.http.services.nextcloud.loadbalancer.server.port=80", ] diff --git a/docker/pihole/docker-compose.toml b/docker/pihole/docker-compose.toml index 4006a3dc..5eaff1c3 100644 --- a/docker/pihole/docker-compose.toml +++ b/docker/pihole/docker-compose.toml @@ -19,7 +19,7 @@ labels = [ "traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)", "traefik.http.routers.pihole-redirect.middlewares=http2https@file", "traefik.http.routers.pihole.entrypoints=https", - "traefik.http.routers.pihole.middlewares=secHeaders@file", + "traefik.http.routers.pihole.middlewares=secHeaders@file,compress@file", "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)", "traefik.http.routers.pihole.service=pihole", "traefik.http.services.pihole.loadbalancer.server.port=80", diff --git a/docker/remotely/docker-compose.toml b/docker/remotely/docker-compose.toml index 88765848..43ec6e68 100644 --- a/docker/remotely/docker-compose.toml +++ b/docker/remotely/docker-compose.toml @@ -7,13 +7,14 @@ networks = ["proxy"] volumes = ["/docker/remotely:/remotely-data"] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.remotely-redirect.entrypoints=http", "traefik.http.routers.remotely-redirect.rule=Host(`remotely.korhonen.cc`)", "traefik.http.routers.remotely-redirect.middlewares=http2https@file", "traefik.http.routers.remotely.entrypoints=https", + "traefik.http.routers.remotely.middlewares=secHeaders@file,compress@file", "traefik.http.routers.remotely.rule=Host(`remotely.korhonen.cc`)", "traefik.http.routers.remotely.service=remotely", - "traefik.docker.network=proxy", "traefik.http.services.remotely.loadbalancer.server.port=5000", ] diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index d8b46f4e..659e9185 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -24,7 +24,7 @@ labels = [ "traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)", "traefik.http.routers.redirect.middlewares=http2https@file", "traefik.http.routers.dashboard.entrypoints=https", - "traefik.http.routers.dashboard.middlewares=secHeaders@file", + "traefik.http.routers.dashboard.middlewares=secHeaders@file,compress@file", "traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)", "traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users", "traefik.http.routers.dashboard.middlewares=dashboard-auth", diff --git a/docker/tvheadend/docker-compose.toml b/docker/tvheadend/docker-compose.toml index dd2f1c2c..f4201682 100644 --- a/docker/tvheadend/docker-compose.toml +++ b/docker/tvheadend/docker-compose.toml @@ -21,7 +21,7 @@ labels = [ "traefik.http.routers.tvheadend-redirect.rule=Host(`tvheadend.korhonen.cc`)", "traefik.http.routers.tvheadend-redirect.middlewares=http2https@file", "traefik.http.routers.tvheadend.entrypoints=https", - "traefik.http.routers.tvheadend.middlewares=secHeaders@file", + "traefik.http.routers.tvheadend.middlewares=secHeaders@file,compress@file", "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)", "traefik.http.routers.tvheadend.service=tvheadend", "traefik.http.services.tvheadend.loadbalancer.server.port=9981", From 59399c376e827c224951a66028b7f8258f3cb4e1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 21:03:57 +0200 Subject: [PATCH 1068/2667] Enable gzip compression for all sites --- docker/authentik/docker-compose.toml | 2 +- docker/freshrss/docker-compose.toml | 4 ++-- docker/gitea/docker-compose.toml | 2 +- docker/homeautomation/docker-compose.toml | 2 +- docker/index.korhonen.cc/docker-compose.toml | 2 +- docker/jellyfin/docker-compose.toml | 2 +- docker/korhonen.cc/docker-compose.toml | 2 +- docker/nextcloud/docker-compose.toml | 2 +- docker/pihole/docker-compose.toml | 2 +- docker/remotely/docker-compose.toml | 3 ++- docker/traefik/docker-compose.toml | 2 +- docker/tvheadend/docker-compose.toml | 2 +- 12 files changed, 14 insertions(+), 13 deletions(-) diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 6ed612cb..48167a92 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -25,7 +25,7 @@ labels = [ "traefik.http.routers.authentik-redirect.rule=Host(`sso.korhonen.cc`)", "traefik.http.routers.authentik-redirect.middlewares=http2https@file", "traefik.http.routers.authentik.entrypoints=https", - "traefik.http.routers.authentik.middlewares=secHeaders@file", + "traefik.http.routers.authentik.middlewares=secHeaders@file,compress@file", "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)", "traefik.http.routers.authentik.service=authentik", "traefik.http.services.authentik.loadbalancer.server.port=9000", diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml index 30e28f6e..34334fe1 100644 --- a/docker/freshrss/docker-compose.toml +++ b/docker/freshrss/docker-compose.toml @@ -18,7 +18,7 @@ labels = [ "traefik.http.routers.freshrss-redirect.rule=Host(`rss.korhonen.cc`)", "traefik.http.routers.freshrss-redirect.middlewares=http2https@file", "traefik.http.routers.freshrss.entrypoints=https", - "traefik.http.routers.freshrss.middlewares=secHeaders@file", + "traefik.http.routers.freshrss.middlewares=secHeaders@file,compress@file", "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)", "traefik.http.routers.freshrss.service=freshrss", "traefik.http.services.freshrss.loadbalancer.server.port=80", @@ -40,7 +40,7 @@ labels = [ "traefik.http.routers.bibliogram-redirect.rule=Host(`bibliogram.korhonen.cc`)", "traefik.http.routers.bibliogram-redirect.middlewares=http2https@file", "traefik.http.routers.bibliogram.entrypoints=https", - "traefik.http.routers.bibliogram.middlewares=secHeaders@file", + "traefik.http.routers.bibliogram.middlewares=secHeaders@file,compress@file", "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)", "traefik.http.routers.bibliogram.service=bibliogram", "traefik.http.services.bibliogram.loadbalancer.server.port=10407", diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml index ca40968d..f7518688 100644 --- a/docker/gitea/docker-compose.toml +++ b/docker/gitea/docker-compose.toml @@ -15,7 +15,7 @@ labels = [ "traefik.http.routers.gitea-redirect.rule=Host(`git.korhonen.cc`)", "traefik.http.routers.gitea-redirect.middlewares=http2https@file", "traefik.http.routers.gitea.entrypoints=https", - "traefik.http.routers.gitea.middlewares=secHeaders@file", + "traefik.http.routers.gitea.middlewares=secHeaders@file,compress@file", "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)", "traefik.http.routers.gitea.service=gitea", "traefik.http.services.gitea.loadbalancer.server.port=3000", diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 5aedcb39..7cc2b787 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -20,7 +20,7 @@ labels = [ "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)", "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file", "traefik.http.routers.home-assistant.entrypoints=https", - "traefik.http.routers.home-assistant.middlewares=secHeaders@file", + "traefik.http.routers.home-assistant.middlewares=secHeaders@file,compress@file", "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)", "traefik.http.routers.home-assistant.service=home-assistant", "traefik.http.services.home-assistant.loadbalancer.server.port=8123", diff --git a/docker/index.korhonen.cc/docker-compose.toml b/docker/index.korhonen.cc/docker-compose.toml index 9bbec60c..856e6fc0 100644 --- a/docker/index.korhonen.cc/docker-compose.toml +++ b/docker/index.korhonen.cc/docker-compose.toml @@ -14,7 +14,7 @@ labels = [ "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)", "traefik.http.routers.index-redirect.middlewares=http2https@file", "traefik.http.routers.index.entrypoints=https", - "traefik.http.routers.index.middlewares=secHeaders@file", + "traefik.http.routers.index.middlewares=secHeaders@file,compress@file", "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)", "traefik.http.routers.index.service=index", "traefik.http.services.index.loadbalancer.server.port=80", diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 559d31d5..a844d2fb 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -24,7 +24,7 @@ labels = [ "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)", "traefik.http.routers.jellyfin-redirect.middlewares=http2https@file", "traefik.http.routers.jellyfin.entrypoints=https", - "traefik.http.routers.jellyfin.middlewares=secHeaders@file", + "traefik.http.routers.jellyfin.middlewares=secHeaders@file,compress@file", "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)", "traefik.http.routers.jellyfin.service=jellyfin", "traefik.http.services.jellyfin.loadbalancer.server.port=8096", diff --git a/docker/korhonen.cc/docker-compose.toml b/docker/korhonen.cc/docker-compose.toml index bec21842..634a0168 100644 --- a/docker/korhonen.cc/docker-compose.toml +++ b/docker/korhonen.cc/docker-compose.toml @@ -16,7 +16,7 @@ labels = [ "traefik.http.routers.korhonen-redirect.rule=Host(`korhonen.cc`) || Host(`www.korhonen.cc`)", "traefik.http.routers.korhonen-redirect.middlewares=www2non-www@file,http2https@file", "traefik.http.routers.korhonen.entrypoints=https", - "traefik.http.routers.korhonen.middlewares=secHeaders@file,www2non-www@file", + "traefik.http.routers.korhonen.middlewares=secHeaders@file,www2non-www@file,compress@file", "traefik.http.routers.korhonen.rule=Host(`korhonen.cc`) || Host(`www.korhonen.cc`)", "traefik.http.routers.korhonen.service=korhonen", "traefik.http.services.korhonen.loadbalancer.server.port=80", diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 75bd91e1..c6bc9171 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -27,7 +27,7 @@ labels = [ "traefik.http.routers.nextcloud.entrypoints=https", "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)", "traefik.http.routers.nextcloud.service=nextcloud", - "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-dav@file", + "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-dav@file,compress@file", "traefik.docker.network=proxy", "traefik.http.services.nextcloud.loadbalancer.server.port=80", ] diff --git a/docker/pihole/docker-compose.toml b/docker/pihole/docker-compose.toml index 4006a3dc..5eaff1c3 100644 --- a/docker/pihole/docker-compose.toml +++ b/docker/pihole/docker-compose.toml @@ -19,7 +19,7 @@ labels = [ "traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)", "traefik.http.routers.pihole-redirect.middlewares=http2https@file", "traefik.http.routers.pihole.entrypoints=https", - "traefik.http.routers.pihole.middlewares=secHeaders@file", + "traefik.http.routers.pihole.middlewares=secHeaders@file,compress@file", "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)", "traefik.http.routers.pihole.service=pihole", "traefik.http.services.pihole.loadbalancer.server.port=80", diff --git a/docker/remotely/docker-compose.toml b/docker/remotely/docker-compose.toml index 88765848..43ec6e68 100644 --- a/docker/remotely/docker-compose.toml +++ b/docker/remotely/docker-compose.toml @@ -7,13 +7,14 @@ networks = ["proxy"] volumes = ["/docker/remotely:/remotely-data"] labels = [ "traefik.enable=true", + "traefik.docker.network=proxy", "traefik.http.routers.remotely-redirect.entrypoints=http", "traefik.http.routers.remotely-redirect.rule=Host(`remotely.korhonen.cc`)", "traefik.http.routers.remotely-redirect.middlewares=http2https@file", "traefik.http.routers.remotely.entrypoints=https", + "traefik.http.routers.remotely.middlewares=secHeaders@file,compress@file", "traefik.http.routers.remotely.rule=Host(`remotely.korhonen.cc`)", "traefik.http.routers.remotely.service=remotely", - "traefik.docker.network=proxy", "traefik.http.services.remotely.loadbalancer.server.port=5000", ] diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index d8b46f4e..659e9185 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -24,7 +24,7 @@ labels = [ "traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)", "traefik.http.routers.redirect.middlewares=http2https@file", "traefik.http.routers.dashboard.entrypoints=https", - "traefik.http.routers.dashboard.middlewares=secHeaders@file", + "traefik.http.routers.dashboard.middlewares=secHeaders@file,compress@file", "traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)", "traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users", "traefik.http.routers.dashboard.middlewares=dashboard-auth", diff --git a/docker/tvheadend/docker-compose.toml b/docker/tvheadend/docker-compose.toml index dd2f1c2c..f4201682 100644 --- a/docker/tvheadend/docker-compose.toml +++ b/docker/tvheadend/docker-compose.toml @@ -21,7 +21,7 @@ labels = [ "traefik.http.routers.tvheadend-redirect.rule=Host(`tvheadend.korhonen.cc`)", "traefik.http.routers.tvheadend-redirect.middlewares=http2https@file", "traefik.http.routers.tvheadend.entrypoints=https", - "traefik.http.routers.tvheadend.middlewares=secHeaders@file", + "traefik.http.routers.tvheadend.middlewares=secHeaders@file,compress@file", "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)", "traefik.http.routers.tvheadend.service=tvheadend", "traefik.http.services.tvheadend.loadbalancer.server.port=9981", From 699cbbcc1616f2161877b5319c979b9144db7e08 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 22:14:12 +0200 Subject: [PATCH 1069/2667] Add cache header for main website static resources --- docker/korhonen.cc/nginx.conf | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/docker/korhonen.cc/nginx.conf b/docker/korhonen.cc/nginx.conf index 4bda4c89..d98043e3 100644 --- a/docker/korhonen.cc/nginx.conf +++ b/docker/korhonen.cc/nginx.conf @@ -3,10 +3,16 @@ server { listen [::]:80; server_name localhost; - location / { - root /korhonen.cc; - index index.html; - } + location / { + root /korhonen.cc; + index index.html; + + location ~* \.(?:css|js|jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ { + expires 1M; + access_log off; + add_header Cache-Control "public"; + } + } # Use hugo 404 page error_page 404 /404.html; From 9bc5c5c70fe155e1d06bc3ede0d7bac87596b1d7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 22:14:12 +0200 Subject: [PATCH 1070/2667] Add cache header for main website static resources --- docker/korhonen.cc/nginx.conf | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/docker/korhonen.cc/nginx.conf b/docker/korhonen.cc/nginx.conf index 4bda4c89..d98043e3 100644 --- a/docker/korhonen.cc/nginx.conf +++ b/docker/korhonen.cc/nginx.conf @@ -3,10 +3,16 @@ server { listen [::]:80; server_name localhost; - location / { - root /korhonen.cc; - index index.html; - } + location / { + root /korhonen.cc; + index index.html; + + location ~* \.(?:css|js|jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ { + expires 1M; + access_log off; + add_header Cache-Control "public"; + } + } # Use hugo 404 page error_page 404 /404.html; From 78b2170951767d5475389716d094ec4f240b29fd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Mar 2022 18:09:30 +0200 Subject: [PATCH 1071/2667] Add drone --- docker/gitea/docker-compose.toml | 52 ++++++++++++++++++++++++++ docker/korhonen.cc/docker-compose.toml | 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml index f7518688..33d4c984 100644 --- a/docker/gitea/docker-compose.toml +++ b/docker/gitea/docker-compose.toml @@ -21,6 +21,58 @@ labels = [ "traefik.http.services.gitea.loadbalancer.server.port=3000", ] +[services.drone] +image = "drone/drone:2" +container_name = "drone" +volumes = ["/docker/drone:/data"] +environment = [ + "DRONE_GITEA_SERVER=https://git.korhonen.cc", + "DRONE_GITEA_CLIENT_ID=${GITEA_CLIENT_ID}", + "DRONE_GITEA_CLIENT_SECRET=${GITEA_CLIENT_SECRET}", + "DRONE_RPC_SECRET=${DRONE_RPC_SECRET}", + "DRONE_SERVER_HOST=drone.korhonen.cc", + "DRONE_SERVER_PROTO=https", + "DRONE_USER_CREATE=username:FunctionalHacker,admin:true", +] +env_file = [".env"] +networks = ["proxy"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.drone-redirect.entrypoints=http", + "traefik.http.routers.drone-redirect.rule=Host(`drone.korhonen.cc`)", + "traefik.http.routers.drone-redirect.middlewares=http2https@file", + "traefik.http.routers.drone.entrypoints=https", + "traefik.http.routers.drone.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.drone.rule=Host(`drone.korhonen.cc`)", + "traefik.http.routers.drone.service=drone", + "traefik.http.services.drone.loadbalancer.server.port=80", +] + +[services.drone-runner] +image = "drone/drone-runner-docker:1" +container_name = "drone-runner" +volumes = ["/var/run/docker.sock:/var/run/docker.sock"] +environment = [ + "DRONE_RPC_HOST=drone.korhonen.cc", + "DRONE_RPC_PROTO=https", + "DRONE_RPC_SECRET=${DRONE_RPC_SECRET}", +] +env_file = [".env"] +networks = ["proxy"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.drone-runner-redirect.entrypoints=http", + "traefik.http.routers.drone-runner-redirect.rule=Host(`runner.drone.korhonen.cc`)", + "traefik.http.routers.drone-runner-redirect.middlewares=http2https@file", + "traefik.http.routers.drone-runner.entrypoints=https", + "traefik.http.routers.drone-runner.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.drone-runner.rule=Host(`runner.drone.korhonen.cc`)", + "traefik.http.routers.drone-runner.service=drone-runner", + "traefik.http.services.drone-runner.loadbalancer.server.port=3000", +] + [networks] [networks.postgres] diff --git a/docker/korhonen.cc/docker-compose.toml b/docker/korhonen.cc/docker-compose.toml index 634a0168..db895110 100644 --- a/docker/korhonen.cc/docker-compose.toml +++ b/docker/korhonen.cc/docker-compose.toml @@ -4,7 +4,7 @@ image = "nginx" container_name = "korhonen.cc" volumes = [ - "/docker/korhonen.cc:/korhonen.cc:ro", + "/var/www/korhonen.cc:/korhonen.cc:ro", "./nginx.conf:/etc/nginx/conf.d/default.conf", ] networks = ["proxy"] From fc3ca78d895d546cd51cd9b49e4d639e1d61c157 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Mar 2022 18:09:30 +0200 Subject: [PATCH 1072/2667] Add drone --- docker/gitea/docker-compose.toml | 52 ++++++++++++++++++++++++++ docker/korhonen.cc/docker-compose.toml | 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml index f7518688..33d4c984 100644 --- a/docker/gitea/docker-compose.toml +++ b/docker/gitea/docker-compose.toml @@ -21,6 +21,58 @@ labels = [ "traefik.http.services.gitea.loadbalancer.server.port=3000", ] +[services.drone] +image = "drone/drone:2" +container_name = "drone" +volumes = ["/docker/drone:/data"] +environment = [ + "DRONE_GITEA_SERVER=https://git.korhonen.cc", + "DRONE_GITEA_CLIENT_ID=${GITEA_CLIENT_ID}", + "DRONE_GITEA_CLIENT_SECRET=${GITEA_CLIENT_SECRET}", + "DRONE_RPC_SECRET=${DRONE_RPC_SECRET}", + "DRONE_SERVER_HOST=drone.korhonen.cc", + "DRONE_SERVER_PROTO=https", + "DRONE_USER_CREATE=username:FunctionalHacker,admin:true", +] +env_file = [".env"] +networks = ["proxy"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.drone-redirect.entrypoints=http", + "traefik.http.routers.drone-redirect.rule=Host(`drone.korhonen.cc`)", + "traefik.http.routers.drone-redirect.middlewares=http2https@file", + "traefik.http.routers.drone.entrypoints=https", + "traefik.http.routers.drone.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.drone.rule=Host(`drone.korhonen.cc`)", + "traefik.http.routers.drone.service=drone", + "traefik.http.services.drone.loadbalancer.server.port=80", +] + +[services.drone-runner] +image = "drone/drone-runner-docker:1" +container_name = "drone-runner" +volumes = ["/var/run/docker.sock:/var/run/docker.sock"] +environment = [ + "DRONE_RPC_HOST=drone.korhonen.cc", + "DRONE_RPC_PROTO=https", + "DRONE_RPC_SECRET=${DRONE_RPC_SECRET}", +] +env_file = [".env"] +networks = ["proxy"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.drone-runner-redirect.entrypoints=http", + "traefik.http.routers.drone-runner-redirect.rule=Host(`runner.drone.korhonen.cc`)", + "traefik.http.routers.drone-runner-redirect.middlewares=http2https@file", + "traefik.http.routers.drone-runner.entrypoints=https", + "traefik.http.routers.drone-runner.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.drone-runner.rule=Host(`runner.drone.korhonen.cc`)", + "traefik.http.routers.drone-runner.service=drone-runner", + "traefik.http.services.drone-runner.loadbalancer.server.port=3000", +] + [networks] [networks.postgres] diff --git a/docker/korhonen.cc/docker-compose.toml b/docker/korhonen.cc/docker-compose.toml index 634a0168..db895110 100644 --- a/docker/korhonen.cc/docker-compose.toml +++ b/docker/korhonen.cc/docker-compose.toml @@ -4,7 +4,7 @@ image = "nginx" container_name = "korhonen.cc" volumes = [ - "/docker/korhonen.cc:/korhonen.cc:ro", + "/var/www/korhonen.cc:/korhonen.cc:ro", "./nginx.conf:/etc/nginx/conf.d/default.conf", ] networks = ["proxy"] From 9142dc2751e1ef61d5cba1deb3a026513f4d0c0a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 28 Mar 2022 15:42:00 +0300 Subject: [PATCH 1073/2667] Update jellyfin --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index a844d2fb..d3276494 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -1,7 +1,7 @@ [services] [services.jellyfin] -image = "jellyfin/jellyfin:10.8.0-alpha5" +image = "jellyfin/jellyfin:10.8.0-beta1" container_name = "jellyfin" environment = ["TZ=Europe/Helsinki"] ports = ["8096:8096"] From d7bb322417ff876c30931d7f489fe25f832ef5ad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 28 Mar 2022 15:42:00 +0300 Subject: [PATCH 1074/2667] Update jellyfin --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index a844d2fb..d3276494 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -1,7 +1,7 @@ [services] [services.jellyfin] -image = "jellyfin/jellyfin:10.8.0-alpha5" +image = "jellyfin/jellyfin:10.8.0-beta1" container_name = "jellyfin" environment = ["TZ=Europe/Helsinki"] ports = ["8096:8096"] From 88a169292dac60de1e24a117854b98200f1678a7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 29 Mar 2022 23:00:50 +0300 Subject: [PATCH 1075/2667] Add alias to switch between yubikeys --- home/.config/zsh/03-aliases.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index f24a6b32..a4e5771c 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -210,6 +210,9 @@ alias archiso='curl "http://mirror.rackspace.com/archlinux/iso/$(date +%Y.%m).01 cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg } xgpgtar() { gpg -d $1 | tar x --zstd } +# Switch to different yubikey +gpg-learn-card='gpg-connect-agent "scd serialno" "learn --force" /bye' + btw, () { echo " I use" echo " ▄ From c141a867a94212d585aa3b3929e3a969ce144d21 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 29 Mar 2022 23:00:50 +0300 Subject: [PATCH 1076/2667] Add alias to switch between yubikeys --- home/.config/zsh/03-aliases.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index f24a6b32..a4e5771c 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -210,6 +210,9 @@ alias archiso='curl "http://mirror.rackspace.com/archlinux/iso/$(date +%Y.%m).01 cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg } xgpgtar() { gpg -d $1 | tar x --zstd } +# Switch to different yubikey +gpg-learn-card='gpg-connect-agent "scd serialno" "learn --force" /bye' + btw, () { echo " I use" echo " ▄ From f5d42129dd76521e69ff616babf2f4adb422898f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 29 Mar 2022 23:02:07 +0300 Subject: [PATCH 1077/2667] Fix yubikey alias --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index a4e5771c..77da1f9e 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -211,7 +211,7 @@ cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg } xgpgtar() { gpg -d $1 | tar x --zstd } # Switch to different yubikey -gpg-learn-card='gpg-connect-agent "scd serialno" "learn --force" /bye' +alias switch-yubikey='gpg-connect-agent "scd serialno" "learn --force" /bye' btw, () { echo " I use" From af41ce5fc99c80dbd1ae9d0735a429302155e61e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 29 Mar 2022 23:02:07 +0300 Subject: [PATCH 1078/2667] Fix yubikey alias --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index a4e5771c..77da1f9e 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -211,7 +211,7 @@ cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg } xgpgtar() { gpg -d $1 | tar x --zstd } # Switch to different yubikey -gpg-learn-card='gpg-connect-agent "scd serialno" "learn --force" /bye' +alias switch-yubikey='gpg-connect-agent "scd serialno" "learn --force" /bye' btw, () { echo " I use" From 1cc2a0fec894c6b6cdcbd41cb39c13ac34fec347 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 29 Mar 2022 23:05:30 +0300 Subject: [PATCH 1079/2667] Add restart param to drone --- docker/gitea/docker-compose.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml index 33d4c984..a83b2a08 100644 --- a/docker/gitea/docker-compose.toml +++ b/docker/gitea/docker-compose.toml @@ -24,6 +24,7 @@ labels = [ [services.drone] image = "drone/drone:2" container_name = "drone" +restart = "unless-stopped" volumes = ["/docker/drone:/data"] environment = [ "DRONE_GITEA_SERVER=https://git.korhonen.cc", @@ -52,6 +53,7 @@ labels = [ [services.drone-runner] image = "drone/drone-runner-docker:1" container_name = "drone-runner" +restart = "unless-stopped" volumes = ["/var/run/docker.sock:/var/run/docker.sock"] environment = [ "DRONE_RPC_HOST=drone.korhonen.cc", From e87aabba1ddbbded8e0739ba828cb06e47cbf256 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 29 Mar 2022 23:05:30 +0300 Subject: [PATCH 1080/2667] Add restart param to drone --- docker/gitea/docker-compose.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml index 33d4c984..a83b2a08 100644 --- a/docker/gitea/docker-compose.toml +++ b/docker/gitea/docker-compose.toml @@ -24,6 +24,7 @@ labels = [ [services.drone] image = "drone/drone:2" container_name = "drone" +restart = "unless-stopped" volumes = ["/docker/drone:/data"] environment = [ "DRONE_GITEA_SERVER=https://git.korhonen.cc", @@ -52,6 +53,7 @@ labels = [ [services.drone-runner] image = "drone/drone-runner-docker:1" container_name = "drone-runner" +restart = "unless-stopped" volumes = ["/var/run/docker.sock:/var/run/docker.sock"] environment = [ "DRONE_RPC_HOST=drone.korhonen.cc", From 97e082b1fa4a0effc002df6b25eca1c858a590cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 13:15:17 +0300 Subject: [PATCH 1081/2667] Add host connection to home automation docker stack --- docker/homeautomation/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 7cc2b787..7051edca 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -12,6 +12,7 @@ volumes = [ restart = "unless-stopped" networks = ["homeautomation", "postgres", "proxy"] ports = ["8123:8123", "8300:8300"] +extra_hosts = ["host.docker.internal:host-gateway"] depends_on = ["mosquitto"] labels = [ "traefik.enable=true", From db0c4ac401b3646ff73746627b6632b88e025da5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 13:15:17 +0300 Subject: [PATCH 1082/2667] Add host connection to home automation docker stack --- docker/homeautomation/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 7cc2b787..7051edca 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -12,6 +12,7 @@ volumes = [ restart = "unless-stopped" networks = ["homeautomation", "postgres", "proxy"] ports = ["8123:8123", "8300:8300"] +extra_hosts = ["host.docker.internal:host-gateway"] depends_on = ["mosquitto"] labels = [ "traefik.enable=true", From 8c5045548095872b806e1d6d4d77c59d56bc3184 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 13:15:40 +0300 Subject: [PATCH 1083/2667] Add systemd-editor to env.zsh --- home/.config/zsh/01-env.zsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index db037d6b..356a9432 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -55,6 +55,7 @@ export GIT_PAGER="$EDITOR -R +\"lua require 'pager'\"" export PARU_PAGER="$PAGER -c 'set ft=PKGBUILD'" export AUR_PAGER=$PAGER export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" +export SYSTEMD_EDITOR=$EDITOR # Use GPG for SSH authentication export GPG_TTY="$(tty)" @@ -70,4 +71,4 @@ fi [[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh # Disable dotdrop submodule auto update -DOTDROP_AUTOUPDATE=no +export DOTDROP_AUTOUPDATE=no From 55ca4721fb0184b8979a3774179d11148c5c42e9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 13:15:40 +0300 Subject: [PATCH 1084/2667] Add systemd-editor to env.zsh --- home/.config/zsh/01-env.zsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index db037d6b..356a9432 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -55,6 +55,7 @@ export GIT_PAGER="$EDITOR -R +\"lua require 'pager'\"" export PARU_PAGER="$PAGER -c 'set ft=PKGBUILD'" export AUR_PAGER=$PAGER export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" +export SYSTEMD_EDITOR=$EDITOR # Use GPG for SSH authentication export GPG_TTY="$(tty)" @@ -70,4 +71,4 @@ fi [[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh # Disable dotdrop submodule auto update -DOTDROP_AUTOUPDATE=no +export DOTDROP_AUTOUPDATE=no From 86f9acea7f4be27931f6a929bde9bb6a15be81e9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 13:16:45 +0300 Subject: [PATCH 1085/2667] Nvim: add asciidoctor plugin --- home/.config/nvim/lua/pluginmanager.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 4afccbce..742dd322 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -108,6 +108,9 @@ require('packer').startup(function() run = function() vim.fn['firenvim#install'](0) end } + -- Vim <3 Asciidoctor + use 'habamax/vim-asciidoctor' + end) -- Install plugins if packer was not installed From b6c3651c8c1fd8552bf8b470a9ccee8691d7f9e2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 13:16:45 +0300 Subject: [PATCH 1086/2667] Nvim: add asciidoctor plugin --- home/.config/nvim/lua/pluginmanager.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 4afccbce..742dd322 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -108,6 +108,9 @@ require('packer').startup(function() run = function() vim.fn['firenvim#install'](0) end } + -- Vim <3 Asciidoctor + use 'habamax/vim-asciidoctor' + end) -- Install plugins if packer was not installed From cbc359640910b3212a2637aea80e7e65c8e38bde Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 13:16:57 +0300 Subject: [PATCH 1087/2667] Sway: Change cursor theme --- home/.config/sway/conf.d/08-exec.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 73de4e06..0ac58ac5 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -23,7 +23,7 @@ exec { exec_always { gsettings set $gnome-schema gtk-theme 'Matcha-dark-azul' gsettings set $gnome-schema icon-theme 'Papirus-Dark' - gsettings set $gnome-schema cursor-theme 'Breeze' + gsettings set $gnome-schema cursor-theme 'Numix-Cursor' gsettings set $gnome-schema font-name 'Overpass 12' gsettings set $gnome-schema document-font-name 'Overpass 12' gsettings set $gnome-schema monospace-font-name 'Hack Nerd Font Mono 12' From 65f8f5f1dccd2ee88e3a9be69ae1a21e95420165 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 13:16:57 +0300 Subject: [PATCH 1088/2667] Sway: Change cursor theme --- home/.config/sway/conf.d/08-exec.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 73de4e06..0ac58ac5 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -23,7 +23,7 @@ exec { exec_always { gsettings set $gnome-schema gtk-theme 'Matcha-dark-azul' gsettings set $gnome-schema icon-theme 'Papirus-Dark' - gsettings set $gnome-schema cursor-theme 'Breeze' + gsettings set $gnome-schema cursor-theme 'Numix-Cursor' gsettings set $gnome-schema font-name 'Overpass 12' gsettings set $gnome-schema document-font-name 'Overpass 12' gsettings set $gnome-schema monospace-font-name 'Hack Nerd Font Mono 12' From 60a90807a86ef484e43fed3e191d7a560d73b024 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 13:28:26 +0300 Subject: [PATCH 1089/2667] Add functionality to disable docker stacks with zsh update function --- docker/.gitignore | 1 + home/.config/zsh/03-aliases.zsh | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docker/.gitignore b/docker/.gitignore index 934c1fb2..b5d7ad6f 100644 --- a/docker/.gitignore +++ b/docker/.gitignore @@ -1 +1,2 @@ */.env +*/DISABLED diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 77da1f9e..74833655 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -162,9 +162,13 @@ update() { docker-update() { for dir in $HOME/git/dotfiles/docker/*; do cd $dir - dct pull - dct up -d - cd .. + if [[ -f "DISABLED" ]]; then + echo "$dir stack is disabled, skipping..." + else + dct pull + dct up -d + cd .. + fi done } From 175d906fe1e359173f610eecf9f82fc062c8f4a7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 13:28:26 +0300 Subject: [PATCH 1090/2667] Add functionality to disable docker stacks with zsh update function --- docker/.gitignore | 1 + home/.config/zsh/03-aliases.zsh | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docker/.gitignore b/docker/.gitignore index 934c1fb2..b5d7ad6f 100644 --- a/docker/.gitignore +++ b/docker/.gitignore @@ -1 +1,2 @@ */.env +*/DISABLED diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 77da1f9e..74833655 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -162,9 +162,13 @@ update() { docker-update() { for dir in $HOME/git/dotfiles/docker/*; do cd $dir - dct pull - dct up -d - cd .. + if [[ -f "DISABLED" ]]; then + echo "$dir stack is disabled, skipping..." + else + dct pull + dct up -d + cd .. + fi done } From 51d25038bbdfdc69ca164553d506ec153a852420 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 14:21:26 +0300 Subject: [PATCH 1091/2667] Add moria gamescope/steam autostart zprofile --- config.yaml | 2 ++ home/.zprofile | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index ce378fd4..0a074a16 100644 --- a/config.yaml +++ b/config.yaml @@ -257,6 +257,8 @@ profiles: include: - terminal - pacman + dotfiles: + - f_zprofile Gondor: include: - terminal diff --git a/home/.zprofile b/home/.zprofile index 52c6cb96..1309b84b 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1 +1,7 @@ -[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway-run +if [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]]; then + LIBSEAT_BACKEND=logind gamescope \ + -e -f -U \ + -W 3840 -H 2160 \ + -w 1920 -h 1080 \ + -- steam -gamepadui -steamos +fi From f9798c3dae6f5f9d4998042620ef3d16a37d8f96 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 14:21:26 +0300 Subject: [PATCH 1092/2667] Add moria gamescope/steam autostart zprofile --- config.yaml | 2 ++ home/.zprofile | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index ce378fd4..0a074a16 100644 --- a/config.yaml +++ b/config.yaml @@ -257,6 +257,8 @@ profiles: include: - terminal - pacman + dotfiles: + - f_zprofile Gondor: include: - terminal diff --git a/home/.zprofile b/home/.zprofile index 52c6cb96..1309b84b 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1 +1,7 @@ -[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway-run +if [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]]; then + LIBSEAT_BACKEND=logind gamescope \ + -e -f -U \ + -W 3840 -H 2160 \ + -w 1920 -h 1080 \ + -- steam -gamepadui -steamos +fi From 6ea4b86431b9eb4e625ce407c3dc9b2c94e68797 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 14:23:59 +0300 Subject: [PATCH 1093/2667] Add templating to zprofile --- home/.zprofile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.zprofile b/home/.zprofile index 1309b84b..5e4eb012 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,7 +1,11 @@ if [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]]; then + {%@@ if profile == 'Moria' @@%} LIBSEAT_BACKEND=logind gamescope \ -e -f -U \ -W 3840 -H 2160 \ -w 1920 -h 1080 \ -- steam -gamepadui -steamos + {%@@ elif profile == 'Mirkwood' @@%} + sway-run + {%@@ endif @@%} fi From af64a8b08d54d4a197d31b9e71577f0cb14de84e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 14:23:59 +0300 Subject: [PATCH 1094/2667] Add templating to zprofile --- home/.zprofile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.zprofile b/home/.zprofile index 1309b84b..5e4eb012 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,7 +1,11 @@ if [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]]; then + {%@@ if profile == 'Moria' @@%} LIBSEAT_BACKEND=logind gamescope \ -e -f -U \ -W 3840 -H 2160 \ -w 1920 -h 1080 \ -- steam -gamepadui -steamos + {%@@ elif profile == 'Mirkwood' @@%} + sway-run + {%@@ endif @@%} fi From 17d48108054a7a60111efb73917ea3e06edd152a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Apr 2022 15:52:25 +0300 Subject: [PATCH 1095/2667] Fix docker update print output --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 74833655..774e65cd 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -163,7 +163,7 @@ update() { for dir in $HOME/git/dotfiles/docker/*; do cd $dir if [[ -f "DISABLED" ]]; then - echo "$dir stack is disabled, skipping..." + echo "$(basename $dir) stack is disabled, skipping..." else dct pull dct up -d From 294032a79a43d64b2f69a4b166907baf19f7fd9e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Apr 2022 15:52:25 +0300 Subject: [PATCH 1096/2667] Fix docker update print output --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 74833655..774e65cd 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -163,7 +163,7 @@ update() { for dir in $HOME/git/dotfiles/docker/*; do cd $dir if [[ -f "DISABLED" ]]; then - echo "$dir stack is disabled, skipping..." + echo "$(basename $dir) stack is disabled, skipping..." else dct pull dct up -d From ff676407f0814f225f821bb2e1071ca828c24bb7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 14 Apr 2022 10:57:51 +0300 Subject: [PATCH 1097/2667] Use less as SYSTEMD_PAGER --- home/.config/zsh/01-env.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 356a9432..6371d80b 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -56,6 +56,7 @@ export PARU_PAGER="$PAGER -c 'set ft=PKGBUILD'" export AUR_PAGER=$PAGER export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR +export SYSTEMD_PAGER=less # Use GPG for SSH authentication export GPG_TTY="$(tty)" From c96240e2690cf22853fff9e89f839d52ca66d48e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 14 Apr 2022 10:57:51 +0300 Subject: [PATCH 1098/2667] Use less as SYSTEMD_PAGER --- home/.config/zsh/01-env.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 356a9432..6371d80b 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -56,6 +56,7 @@ export PARU_PAGER="$PAGER -c 'set ft=PKGBUILD'" export AUR_PAGER=$PAGER export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR +export SYSTEMD_PAGER=less # Use GPG for SSH authentication export GPG_TTY="$(tty)" From 841a891ecf9dd71777505f1bf4c32d5b3783806b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Apr 2022 23:23:53 +0300 Subject: [PATCH 1099/2667] Nvim: Fix treesitter and bufferline --- home/.config/nvim/lua/pluginconf/treesitter.lua | 2 +- home/.config/nvim/lua/pluginmanager.lua | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua index 939303e9..3c7c6fe8 100644 --- a/home/.config/nvim/lua/pluginconf/treesitter.lua +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -1,5 +1,5 @@ require'nvim-treesitter.configs'.setup { - ensure_installed = 'maintained', + ensure_installed = 'all', highlight = {enable = true}, indent = {enable = true}, incremental_selection = {enable = true}, diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 742dd322..3f49f2ea 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -34,6 +34,7 @@ require('packer').startup(function() -- Tabline/bufferline use { 'akinsho/nvim-bufferline.lua', + tag = "*", requires = 'kyazdani42/nvim-web-devicons' } @@ -108,8 +109,8 @@ require('packer').startup(function() run = function() vim.fn['firenvim#install'](0) end } - -- Vim <3 Asciidoctor - use 'habamax/vim-asciidoctor' + -- Vim <3 Asciidoctor + use 'habamax/vim-asciidoctor' end) From f629ee960f309a3f0eb4f6b9f0db8510d1d870b1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Apr 2022 23:23:53 +0300 Subject: [PATCH 1100/2667] Nvim: Fix treesitter and bufferline --- home/.config/nvim/lua/pluginconf/treesitter.lua | 2 +- home/.config/nvim/lua/pluginmanager.lua | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua index 939303e9..3c7c6fe8 100644 --- a/home/.config/nvim/lua/pluginconf/treesitter.lua +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -1,5 +1,5 @@ require'nvim-treesitter.configs'.setup { - ensure_installed = 'maintained', + ensure_installed = 'all', highlight = {enable = true}, indent = {enable = true}, incremental_selection = {enable = true}, diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 742dd322..3f49f2ea 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -34,6 +34,7 @@ require('packer').startup(function() -- Tabline/bufferline use { 'akinsho/nvim-bufferline.lua', + tag = "*", requires = 'kyazdani42/nvim-web-devicons' } @@ -108,8 +109,8 @@ require('packer').startup(function() run = function() vim.fn['firenvim#install'](0) end } - -- Vim <3 Asciidoctor - use 'habamax/vim-asciidoctor' + -- Vim <3 Asciidoctor + use 'habamax/vim-asciidoctor' end) From 278a7f247894f998b31d8315ce724c1432d6df4a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Apr 2022 23:26:36 +0300 Subject: [PATCH 1101/2667] Nvim treesitter: remove ensure_installed --- home/.config/nvim/lua/pluginconf/treesitter.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua index 3c7c6fe8..4db32ef0 100644 --- a/home/.config/nvim/lua/pluginconf/treesitter.lua +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -1,5 +1,4 @@ require'nvim-treesitter.configs'.setup { - ensure_installed = 'all', highlight = {enable = true}, indent = {enable = true}, incremental_selection = {enable = true}, From 756041b63fbad8e79aa5fb942ceeaac1dc59b3c4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Apr 2022 23:26:36 +0300 Subject: [PATCH 1102/2667] Nvim treesitter: remove ensure_installed --- home/.config/nvim/lua/pluginconf/treesitter.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua index 3c7c6fe8..4db32ef0 100644 --- a/home/.config/nvim/lua/pluginconf/treesitter.lua +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -1,5 +1,4 @@ require'nvim-treesitter.configs'.setup { - ensure_installed = 'all', highlight = {enable = true}, indent = {enable = true}, incremental_selection = {enable = true}, From e31fd50b0848af676452b3be25323ea95750cd21 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Apr 2022 15:26:48 +0300 Subject: [PATCH 1103/2667] Switch to different bibliogram image --- docker/freshrss/docker-compose.toml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml index 34334fe1..e3650000 100644 --- a/docker/freshrss/docker-compose.toml +++ b/docker/freshrss/docker-compose.toml @@ -25,13 +25,9 @@ labels = [ ] [services.bibliogram] -image = "cloudrac3r/bibliogram" +image = "schklom/bibliogram" container_name = "bibliogram" restart = "unless-stopped" -volumes = [ - "/docker/freshrss/bibliogram/db:/app/db", - "/docker/freshrss/bibliogram/config.js:/app/config.js", -] networks = ["freshrss", "proxy"] labels = [ "traefik.enable=true", From cf60df7dddfee501056fdc6e74a9c793f4a31a48 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Apr 2022 15:26:48 +0300 Subject: [PATCH 1104/2667] Switch to different bibliogram image --- docker/freshrss/docker-compose.toml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml index 34334fe1..e3650000 100644 --- a/docker/freshrss/docker-compose.toml +++ b/docker/freshrss/docker-compose.toml @@ -25,13 +25,9 @@ labels = [ ] [services.bibliogram] -image = "cloudrac3r/bibliogram" +image = "schklom/bibliogram" container_name = "bibliogram" restart = "unless-stopped" -volumes = [ - "/docker/freshrss/bibliogram/db:/app/db", - "/docker/freshrss/bibliogram/config.js:/app/config.js", -] networks = ["freshrss", "proxy"] labels = [ "traefik.enable=true", From 5d0424b9b33cdb47d233f024ece63a665a63ca47 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Apr 2022 15:27:05 +0300 Subject: [PATCH 1105/2667] Update jellyfin --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index d3276494..3f3c31db 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -1,7 +1,7 @@ [services] [services.jellyfin] -image = "jellyfin/jellyfin:10.8.0-beta1" +image = "jellyfin/jellyfin:10.8.0-beta2" container_name = "jellyfin" environment = ["TZ=Europe/Helsinki"] ports = ["8096:8096"] From bcbda7ec987de3e3abaa19635c0c99ff52e480b3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Apr 2022 15:27:05 +0300 Subject: [PATCH 1106/2667] Update jellyfin --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index d3276494..3f3c31db 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -1,7 +1,7 @@ [services] [services.jellyfin] -image = "jellyfin/jellyfin:10.8.0-beta1" +image = "jellyfin/jellyfin:10.8.0-beta2" container_name = "jellyfin" environment = ["TZ=Europe/Helsinki"] ports = ["8096:8096"] From 7723c8e6b59385f772b3dcde6193b8193b7343ad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 21 Apr 2022 09:09:26 +0300 Subject: [PATCH 1107/2667] Mount config for bibliogram --- docker/freshrss/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml index e3650000..bd9fac93 100644 --- a/docker/freshrss/docker-compose.toml +++ b/docker/freshrss/docker-compose.toml @@ -29,6 +29,7 @@ image = "schklom/bibliogram" container_name = "bibliogram" restart = "unless-stopped" networks = ["freshrss", "proxy"] +volumes = ["/docker/freshrss/bibliogram/config.js:/app/config.js:ro"] labels = [ "traefik.enable=true", "traefik.docker.network=proxy", From 77c5a93d603dad0eb3866f209d511cf9483c7d9c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 21 Apr 2022 09:09:26 +0300 Subject: [PATCH 1108/2667] Mount config for bibliogram --- docker/freshrss/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml index e3650000..bd9fac93 100644 --- a/docker/freshrss/docker-compose.toml +++ b/docker/freshrss/docker-compose.toml @@ -29,6 +29,7 @@ image = "schklom/bibliogram" container_name = "bibliogram" restart = "unless-stopped" networks = ["freshrss", "proxy"] +volumes = ["/docker/freshrss/bibliogram/config.js:/app/config.js:ro"] labels = [ "traefik.enable=true", "traefik.docker.network=proxy", From b4c8ddcea065a03e5fcf2ddf64943d50fef23241 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 21 Apr 2022 09:09:43 +0300 Subject: [PATCH 1109/2667] Tweak update alias --- home/.config/zsh/03-aliases.zsh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 774e65cd..723c11ea 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -137,13 +137,11 @@ passync() { pass git pull && pass git push && updatesecrets } update() { all() { + paru {%@@ if profile == "Moria" @@%} - paru -Pw repo docker-update docker system prune --volumes - {%@@ else @@%} - paru {%@@ endif @@%} plugins } @@ -167,8 +165,8 @@ update() { else dct pull dct up -d - cd .. fi + cd .. done } From ca059fcb8cbd85df61971f6dbdb48d1839cb6f27 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 21 Apr 2022 09:09:43 +0300 Subject: [PATCH 1110/2667] Tweak update alias --- home/.config/zsh/03-aliases.zsh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 774e65cd..723c11ea 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -137,13 +137,11 @@ passync() { pass git pull && pass git push && updatesecrets } update() { all() { + paru {%@@ if profile == "Moria" @@%} - paru -Pw repo docker-update docker system prune --volumes - {%@@ else @@%} - paru {%@@ endif @@%} plugins } @@ -167,8 +165,8 @@ update() { else dct pull dct up -d - cd .. fi + cd .. done } From 9fb514c19346bf1c2b60418103c37b477da2097b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 22 Apr 2022 09:49:47 +0300 Subject: [PATCH 1111/2667] Rename grc alias for forgit since it collides with grc colorizer --- home/.config/zsh/03-aliases.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 723c11ea..055a91e9 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -5,6 +5,10 @@ alias gs='git status' alias gpull='git pull' alias gpush='git push' +# Rename grc alias from forgit since it +# collides with the grc colorizer +forgit_revert_commit=fgrc + # Modern replacement for ls alias ls='exa' From bcbd819cdb57e9013b99bd845d72299ae9cc37bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 22 Apr 2022 09:49:47 +0300 Subject: [PATCH 1112/2667] Rename grc alias for forgit since it collides with grc colorizer --- home/.config/zsh/03-aliases.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 723c11ea..055a91e9 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -5,6 +5,10 @@ alias gs='git status' alias gpull='git pull' alias gpush='git push' +# Rename grc alias from forgit since it +# collides with the grc colorizer +forgit_revert_commit=fgrc + # Modern replacement for ls alias ls='exa' From 34f9a46a504fb306c4fdf6fec910d4d680294695 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 22 Apr 2022 09:50:18 +0300 Subject: [PATCH 1113/2667] Nvim: add treesitter folding --- home/.config/nvim/lua/pluginconf/treesitter.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua index 4db32ef0..ac309c7f 100644 --- a/home/.config/nvim/lua/pluginconf/treesitter.lua +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -4,3 +4,10 @@ require'nvim-treesitter.configs'.setup { incremental_selection = {enable = true}, context_commentstring = {enable = true} } + +vim.wo.foldmethod = 'expr'; +vim.wo.foldexpr = 'nvim_treesitter#foldexpr()' +vim.wo.foldtext = [[substitute(getline(v:foldstart), '\\t' repeat('\ ',&tabstop),'g').'...'.trim(v:foldend)]] +vim.wo.fillchars = 'fold:\\' +vim.wo.foldnestmax = 3 +vim.wo.foldminlines = 1 From bf0c005444fd566833ecb33a69efc73782b5befd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 22 Apr 2022 09:50:18 +0300 Subject: [PATCH 1114/2667] Nvim: add treesitter folding --- home/.config/nvim/lua/pluginconf/treesitter.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua index 4db32ef0..ac309c7f 100644 --- a/home/.config/nvim/lua/pluginconf/treesitter.lua +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -4,3 +4,10 @@ require'nvim-treesitter.configs'.setup { incremental_selection = {enable = true}, context_commentstring = {enable = true} } + +vim.wo.foldmethod = 'expr'; +vim.wo.foldexpr = 'nvim_treesitter#foldexpr()' +vim.wo.foldtext = [[substitute(getline(v:foldstart), '\\t' repeat('\ ',&tabstop),'g').'...'.trim(v:foldend)]] +vim.wo.fillchars = 'fold:\\' +vim.wo.foldnestmax = 3 +vim.wo.foldminlines = 1 From 4a72542f7fe2e775ac52c7e58746291790e39052 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 25 Apr 2022 19:30:41 +0300 Subject: [PATCH 1115/2667] Nvim: add treesitter ensure_installed --- home/.config/nvim/lua/pluginconf/treesitter.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua index ac309c7f..41c17199 100644 --- a/home/.config/nvim/lua/pluginconf/treesitter.lua +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -1,13 +1,19 @@ require'nvim-treesitter.configs'.setup { + ensure_installed = { + "bash", "c", "css", "dockerfile", "html", "http", "java", "json", + "json5", "latex", "lua", "make", "markdown", "php", "python", "regex", + "rst", "scss", "toml", "tsx", "typescript", "javascript", "yaml" + }, highlight = {enable = true}, indent = {enable = true}, incremental_selection = {enable = true}, context_commentstring = {enable = true} } -vim.wo.foldmethod = 'expr'; +vim.wo.foldmethod = 'expr' vim.wo.foldexpr = 'nvim_treesitter#foldexpr()' -vim.wo.foldtext = [[substitute(getline(v:foldstart), '\\t' repeat('\ ',&tabstop),'g').'...'.trim(v:foldend)]] +vim.wo.foldtext = + [[substitute(getline(v:foldstart), '\\t' repeat('\ ',&tabstop),'g').'...'.trim(v:foldend)]] vim.wo.fillchars = 'fold:\\' vim.wo.foldnestmax = 3 vim.wo.foldminlines = 1 From ff359ffee9696bfdd0b71400b6aea7aacd7a1677 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 25 Apr 2022 19:30:41 +0300 Subject: [PATCH 1116/2667] Nvim: add treesitter ensure_installed --- home/.config/nvim/lua/pluginconf/treesitter.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua index ac309c7f..41c17199 100644 --- a/home/.config/nvim/lua/pluginconf/treesitter.lua +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -1,13 +1,19 @@ require'nvim-treesitter.configs'.setup { + ensure_installed = { + "bash", "c", "css", "dockerfile", "html", "http", "java", "json", + "json5", "latex", "lua", "make", "markdown", "php", "python", "regex", + "rst", "scss", "toml", "tsx", "typescript", "javascript", "yaml" + }, highlight = {enable = true}, indent = {enable = true}, incremental_selection = {enable = true}, context_commentstring = {enable = true} } -vim.wo.foldmethod = 'expr'; +vim.wo.foldmethod = 'expr' vim.wo.foldexpr = 'nvim_treesitter#foldexpr()' -vim.wo.foldtext = [[substitute(getline(v:foldstart), '\\t' repeat('\ ',&tabstop),'g').'...'.trim(v:foldend)]] +vim.wo.foldtext = + [[substitute(getline(v:foldstart), '\\t' repeat('\ ',&tabstop),'g').'...'.trim(v:foldend)]] vim.wo.fillchars = 'fold:\\' vim.wo.foldnestmax = 3 vim.wo.foldminlines = 1 From f6679102d8ad9de3737ff5ed7d7b4e23d37c935c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 26 Apr 2022 13:45:16 +0300 Subject: [PATCH 1117/2667] Git: add upstream alias --- home/.config/nvim/ftplugin/java.lua | 2 +- home/.gitconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 227b83d2..72bac9ac 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -4,7 +4,7 @@ local workspace_dir = nvim_local_dir .. '/jdtls-workspaces/' .. project_name require('jdtls').start_or_attach({ cmd = { - 'java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', + '/usr/lib/jvm/java-17-openjdk-amd64/bin/java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', '-Dosgi.bundles.defaultStartLevel=4', '-Declipse.product=org.eclipse.jdt.ls.core.product', '-Dlog.protocol=true', '-Dlog.level=ALL', '-Xms1g', diff --git a/home/.gitconfig b/home/.gitconfig index 5e94d484..1794bddd 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -38,6 +38,7 @@ [alias] mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 + upstream = !git push -u origin HEAD [color] pager = no From 785ab635d0d611af2834388ebf07a6d6681c4550 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 26 Apr 2022 13:45:16 +0300 Subject: [PATCH 1118/2667] Git: add upstream alias --- home/.config/nvim/ftplugin/java.lua | 2 +- home/.gitconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 227b83d2..72bac9ac 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -4,7 +4,7 @@ local workspace_dir = nvim_local_dir .. '/jdtls-workspaces/' .. project_name require('jdtls').start_or_attach({ cmd = { - 'java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', + '/usr/lib/jvm/java-17-openjdk-amd64/bin/java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', '-Dosgi.bundles.defaultStartLevel=4', '-Declipse.product=org.eclipse.jdt.ls.core.product', '-Dlog.protocol=true', '-Dlog.level=ALL', '-Xms1g', diff --git a/home/.gitconfig b/home/.gitconfig index 5e94d484..1794bddd 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -38,6 +38,7 @@ [alias] mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 + upstream = !git push -u origin HEAD [color] pager = no From c76a78459a921e31f394f05f3ae5a5afad803a1a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 6 May 2022 13:32:32 +0300 Subject: [PATCH 1119/2667] Nvim: simplify treesitter folding. Function name is displayed now --- home/.config/nvim/lua/pluginconf/treesitter.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua index 41c17199..f90b688b 100644 --- a/home/.config/nvim/lua/pluginconf/treesitter.lua +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -12,8 +12,3 @@ require'nvim-treesitter.configs'.setup { vim.wo.foldmethod = 'expr' vim.wo.foldexpr = 'nvim_treesitter#foldexpr()' -vim.wo.foldtext = - [[substitute(getline(v:foldstart), '\\t' repeat('\ ',&tabstop),'g').'...'.trim(v:foldend)]] -vim.wo.fillchars = 'fold:\\' -vim.wo.foldnestmax = 3 -vim.wo.foldminlines = 1 From df65e0b783a7e9780517aa688ad65cccefcb6577 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 6 May 2022 13:32:32 +0300 Subject: [PATCH 1120/2667] Nvim: simplify treesitter folding. Function name is displayed now --- home/.config/nvim/lua/pluginconf/treesitter.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua index 41c17199..f90b688b 100644 --- a/home/.config/nvim/lua/pluginconf/treesitter.lua +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -12,8 +12,3 @@ require'nvim-treesitter.configs'.setup { vim.wo.foldmethod = 'expr' vim.wo.foldexpr = 'nvim_treesitter#foldexpr()' -vim.wo.foldtext = - [[substitute(getline(v:foldstart), '\\t' repeat('\ ',&tabstop),'g').'...'.trim(v:foldend)]] -vim.wo.fillchars = 'fold:\\' -vim.wo.foldnestmax = 3 -vim.wo.foldminlines = 1 From 5eea1571d37c2e24279e4b0afe5d379749fb63f6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 May 2022 15:20:01 +0300 Subject: [PATCH 1121/2667] Update jellyfin --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 3f3c31db..48eb74dc 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -1,7 +1,7 @@ [services] [services.jellyfin] -image = "jellyfin/jellyfin:10.8.0-beta2" +image = "jellyfin/jellyfin:10.8.0-beta3" container_name = "jellyfin" environment = ["TZ=Europe/Helsinki"] ports = ["8096:8096"] From fcbeb8b7cfc9e646d729d55cf8a4985c5f597ed9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 May 2022 15:20:01 +0300 Subject: [PATCH 1122/2667] Update jellyfin --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 3f3c31db..48eb74dc 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -1,7 +1,7 @@ [services] [services.jellyfin] -image = "jellyfin/jellyfin:10.8.0-beta2" +image = "jellyfin/jellyfin:10.8.0-beta3" container_name = "jellyfin" environment = ["TZ=Europe/Helsinki"] ports = ["8096:8096"] From 174a84842973526dc81bb0ecb7d2003e89da77b3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 29 May 2022 09:57:26 +0300 Subject: [PATCH 1123/2667] Update beets config --- home/.config/beets/config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml index a3d863da..d8045100 100644 --- a/home/.config/beets/config.yaml +++ b/home/.config/beets/config.yaml @@ -1,5 +1,5 @@ -directory: ~/music -library: ~/music/beets.db +directory: ~/Music +library: ~/Music/beets.db plugins: - acousticbrainz - check @@ -38,7 +38,7 @@ replaygain: backend: gstreamer auto: yes musicbrainz: - user: ReekyMarko + user: FunctionalHacker pass: "{{@@ env['PASS_MUSICBRAINZ'] @@}}" mbcollection: auto: "yes" From b8460b5ae4a2693102de8b891bd1b3b49bb0ced6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 29 May 2022 09:57:26 +0300 Subject: [PATCH 1124/2667] Update beets config --- home/.config/beets/config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml index a3d863da..d8045100 100644 --- a/home/.config/beets/config.yaml +++ b/home/.config/beets/config.yaml @@ -1,5 +1,5 @@ -directory: ~/music -library: ~/music/beets.db +directory: ~/Music +library: ~/Music/beets.db plugins: - acousticbrainz - check @@ -38,7 +38,7 @@ replaygain: backend: gstreamer auto: yes musicbrainz: - user: ReekyMarko + user: FunctionalHacker pass: "{{@@ env['PASS_MUSICBRAINZ'] @@}}" mbcollection: auto: "yes" From 282427bb82332a3b448ccd4ef25ec61a1a7ecedf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 29 May 2022 10:39:22 +0300 Subject: [PATCH 1125/2667] Update mimeo associations --- home/.config/mimeo/associations.txt | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/home/.config/mimeo/associations.txt b/home/.config/mimeo/associations.txt index c15f4260..da50c637 100644 --- a/home/.config/mimeo/associations.txt +++ b/home/.config/mimeo/associations.txt @@ -17,7 +17,10 @@ mpvqueue %U ^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:mp4|mkv|webm|avi|3gp|gif|gifv) mpvqueue %U - ^https://www.facebook.com/watch/?v=.* + ^https?://www.facebook.com/watch/?v=.* + +mpvqueue %U + ^https?://www.facebook.com/.*/videos/.* mpvqueue %U ^https://fb.watch/.* @@ -31,12 +34,6 @@ mpvqueue %U mpvqueue %U ^https?://v.redd.it/.* -imgurviewer %U - ^https?://(www.)?imgur.com/a/ - -imgurviewer %U - ^https?://(www.)?imgur.com/gallery/ - imageviewer %U ^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:jpg|jpeg|png|svg) @@ -49,5 +46,5 @@ alacritty -e rtv "%U" alacritty -e rtv "%U" ^https?://redd.it.* -mpv "$(yle-dl --showurl %U)" +mpvqueue $(yle-dl --showurl %U) # TODO Command substition not working in mimeo ^https?://areena.yle.fi.* From 875f1cae6a924e3db83341a0609170953329e174 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 29 May 2022 10:39:22 +0300 Subject: [PATCH 1126/2667] Update mimeo associations --- home/.config/mimeo/associations.txt | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/home/.config/mimeo/associations.txt b/home/.config/mimeo/associations.txt index c15f4260..da50c637 100644 --- a/home/.config/mimeo/associations.txt +++ b/home/.config/mimeo/associations.txt @@ -17,7 +17,10 @@ mpvqueue %U ^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:mp4|mkv|webm|avi|3gp|gif|gifv) mpvqueue %U - ^https://www.facebook.com/watch/?v=.* + ^https?://www.facebook.com/watch/?v=.* + +mpvqueue %U + ^https?://www.facebook.com/.*/videos/.* mpvqueue %U ^https://fb.watch/.* @@ -31,12 +34,6 @@ mpvqueue %U mpvqueue %U ^https?://v.redd.it/.* -imgurviewer %U - ^https?://(www.)?imgur.com/a/ - -imgurviewer %U - ^https?://(www.)?imgur.com/gallery/ - imageviewer %U ^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:jpg|jpeg|png|svg) @@ -49,5 +46,5 @@ alacritty -e rtv "%U" alacritty -e rtv "%U" ^https?://redd.it.* -mpv "$(yle-dl --showurl %U)" +mpvqueue $(yle-dl --showurl %U) # TODO Command substition not working in mimeo ^https?://areena.yle.fi.* From 6a9ff37778c62e8edff290b4290f399e64455ff9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 May 2022 17:04:21 +0300 Subject: [PATCH 1127/2667] Convert nextcloud to nginx/fpm and fix cron --- docker/nextcloud/docker-compose.toml | 59 +++++---- docker/nextcloud/nginx.conf | 173 +++++++++++++++++++++++++++ 2 files changed, 206 insertions(+), 26 deletions(-) create mode 100644 docker/nextcloud/nginx.conf diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index c6bc9171..57e11e8d 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -1,24 +1,15 @@ [services] -[services.nextcloud] -image = "nextcloud:apache" -container_name = "nextcloud" -restart = "always" -ports = ["1869:80"] -networks = ["nextcloud", "postgres", "proxy"] +[services.nextcloud-web] +image = "nginx:alpine" +container_name = "nextcloud-web" +restart = "unless-stopped" +networks = ["nextcloud", "proxy"] volumes = [ - "/docker/nextcloud:/var/www/html", - "/mnt/Storage/Nextcloud:/var/www/html/data", - "/mnt/Storage/Syncthing:/Syncthing", - "/mnt/Storage/Media/Music:/Music", - "/etc/localtime:/etc/localtime:ro", + "./nginx.conf:/etc/nginx/nginx.conf", + "/docker/nextcloud:/var/www/html:ro", ] -environment = [ - "TZ=Europe/Helsinki", - "REDIS_HOST=redis", - "REDIS_HOST_PASSWORD=123", -] -depends_on = ["redis"] +depends_on = ["nextcloud"] labels = [ "traefik.enable=true", "traefik.http.routers.nextcloud-redirect.entrypoints=http", @@ -32,21 +23,37 @@ labels = [ "traefik.http.services.nextcloud.loadbalancer.server.port=80", ] +[services.nextcloud] +image = "nextcloud:fpm-alpine" +container_name = "nextcloud" +restart = "unless-stopped" +user = "33:33" +networks = ["nextcloud", "postgres", "proxy"] +volumes = [ + "/docker/nextcloud:/var/www/html", + "/mnt/Storage/Nextcloud:/var/www/html/data", + "/mnt/Storage/Syncthing:/Syncthing", + "/mnt/Storage/Media/Music:/Music", + "/etc/localtime:/etc/localtime:ro", +] +environment = [ + "TZ=Europe/Helsinki", + "REDIS_HOST=redis", + "REDIS_HOST_PASSWORD=123", + "TRUSTED_PROXIES=traefik", + "NEXTCLOUD_TRUSTED_DOMAINS=cloud.korhonen.cc", + "OVERWRITEHOST=cloud.korhonen.cc", + "OVERWRITEPROTOCOL=https", +] +depends_on = ["redis"] + [services.redis] image = "redis:alpine" container_name = "redis" networks = ["nextcloud"] -restart = "always" +restart = "unless-stopped" command = "redis-server --requirepass 123" -[services.cron] -image = "nextcloud:apache" -container_name = "nextcloud-cron" -restart = "always" -volumes = ["/docker/nextcloud:/var/www/html"] -entrypoint = "/cron.sh" -depends_on = ["redis"] - [services.coturn] image = "instrumentisto/coturn" container_name = "coturn" diff --git a/docker/nextcloud/nginx.conf b/docker/nextcloud/nginx.conf new file mode 100644 index 00000000..4e5fac98 --- /dev/null +++ b/docker/nextcloud/nginx.conf @@ -0,0 +1,173 @@ +worker_processes auto; + +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + # Prevent nginx HTTP Server Detection + server_tokens off; + + keepalive_timeout 65; + + #gzip on; + + upstream php-handler { + server nextcloud:9000; + } + + server { + listen 80; + + # HSTS settings + # WARNING: Only add the preload option once you read about + # the consequences in https://hstspreload.org/. This option + # will add the domain to a hardcoded list that is shipped + # in all major browsers and getting removed from this list + # could take several months. + #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always; + + # set max upload size + client_max_body_size 512M; + fastcgi_buffers 64 4K; + + # Enable gzip but do not remove ETag headers + gzip on; + gzip_vary on; + gzip_comp_level 4; + gzip_min_length 256; + gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; + gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; + + # Pagespeed is not supported by Nextcloud, so if your server is built + # with the `ngx_pagespeed` module, uncomment this line to disable it. + #pagespeed off; + + # HTTP response headers borrowed from Nextcloud `.htaccess` + add_header Referrer-Policy "no-referrer" always; + add_header X-Content-Type-Options "nosniff" always; + add_header X-Download-Options "noopen" always; + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Permitted-Cross-Domain-Policies "none" always; + add_header X-Robots-Tag "none" always; + add_header X-XSS-Protection "1; mode=block" always; + + # Remove X-Powered-By, which is an information leak + fastcgi_hide_header X-Powered-By; + + # Path to the root of your installation + root /var/www/html; + + # Specify how to handle directories -- specifying `/index.php$request_uri` + # here as the fallback means that Nginx always exhibits the desired behaviour + # when a client requests a path that corresponds to a directory that exists + # on the server. In particular, if that directory contains an index.php file, + # that file is correctly served; if it doesn't, then the request is passed to + # the front-end controller. This consistent behaviour means that we don't need + # to specify custom rules for certain paths (e.g. images and other assets, + # `/updater`, `/ocm-provider`, `/ocs-provider`), and thus + # `try_files $uri $uri/ /index.php$request_uri` + # always provides the desired behaviour. + index index.php index.html /index.php$request_uri; + + # Rule borrowed from `.htaccess` to handle Microsoft DAV clients + location = / { + if ( $http_user_agent ~ ^DavClnt ) { + return 302 /remote.php/webdav/$is_args$args; + } + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Make a regex exception for `/.well-known` so that clients can still + # access it despite the existence of the regex rule + # `location ~ /(\.|autotest|...)` which would otherwise handle requests + # for `/.well-known`. + location ^~ /.well-known { + # The rules in this block are an adaptation of the rules + # in `.htaccess` that concern `/.well-known`. + + location = /.well-known/carddav { return 301 /remote.php/dav/; } + location = /.well-known/caldav { return 301 /remote.php/dav/; } + + location /.well-known/acme-challenge { try_files $uri $uri/ =404; } + location /.well-known/pki-validation { try_files $uri $uri/ =404; } + + # Let Nextcloud's API for `/.well-known` URIs handle all other + # requests by passing them to the front-end controller. + return 301 /index.php$request_uri; + } + + # Rules borrowed from `.htaccess` to hide certain paths from clients + location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/) { return 404; } + location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) { return 404; } + + # Ensure this block, which passes PHP files to the PHP process, is above the blocks + # which handle static assets (as seen below). If this block is not declared first, + # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php` + # to the URI, resulting in a HTTP 500 error response. + location ~ \.php(?:$|/) { + # Required for legacy support + rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri; + + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + set $path_info $fastcgi_path_info; + + try_files $fastcgi_script_name =404; + + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $path_info; + #fastcgi_param HTTPS on; + + fastcgi_param modHeadersAvailable true; # Avoid sending the security headers twice + fastcgi_param front_controller_active true; # Enable pretty urls + fastcgi_pass php-handler; + + fastcgi_intercept_errors on; + fastcgi_request_buffering off; + } + + location ~ \.(?:css|js|svg|gif)$ { + try_files $uri /index.php$request_uri; + expires 6M; # Cache-Control policy borrowed from `.htaccess` + access_log off; # Optional: Don't log access to assets + } + + location ~ \.woff2?$ { + try_files $uri /index.php$request_uri; + expires 7d; # Cache-Control policy borrowed from `.htaccess` + access_log off; # Optional: Don't log access to assets + } + + # Rule borrowed from `.htaccess` + location /remote { + return 301 /remote.php$request_uri; + } + + location / { + try_files $uri $uri/ /index.php$request_uri; + } + } +} From ca56b6d9a12ad19dd56093cb1d269274462bba63 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 May 2022 17:04:21 +0300 Subject: [PATCH 1128/2667] Convert nextcloud to nginx/fpm and fix cron --- docker/nextcloud/docker-compose.toml | 59 +++++---- docker/nextcloud/nginx.conf | 173 +++++++++++++++++++++++++++ 2 files changed, 206 insertions(+), 26 deletions(-) create mode 100644 docker/nextcloud/nginx.conf diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index c6bc9171..57e11e8d 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -1,24 +1,15 @@ [services] -[services.nextcloud] -image = "nextcloud:apache" -container_name = "nextcloud" -restart = "always" -ports = ["1869:80"] -networks = ["nextcloud", "postgres", "proxy"] +[services.nextcloud-web] +image = "nginx:alpine" +container_name = "nextcloud-web" +restart = "unless-stopped" +networks = ["nextcloud", "proxy"] volumes = [ - "/docker/nextcloud:/var/www/html", - "/mnt/Storage/Nextcloud:/var/www/html/data", - "/mnt/Storage/Syncthing:/Syncthing", - "/mnt/Storage/Media/Music:/Music", - "/etc/localtime:/etc/localtime:ro", + "./nginx.conf:/etc/nginx/nginx.conf", + "/docker/nextcloud:/var/www/html:ro", ] -environment = [ - "TZ=Europe/Helsinki", - "REDIS_HOST=redis", - "REDIS_HOST_PASSWORD=123", -] -depends_on = ["redis"] +depends_on = ["nextcloud"] labels = [ "traefik.enable=true", "traefik.http.routers.nextcloud-redirect.entrypoints=http", @@ -32,21 +23,37 @@ labels = [ "traefik.http.services.nextcloud.loadbalancer.server.port=80", ] +[services.nextcloud] +image = "nextcloud:fpm-alpine" +container_name = "nextcloud" +restart = "unless-stopped" +user = "33:33" +networks = ["nextcloud", "postgres", "proxy"] +volumes = [ + "/docker/nextcloud:/var/www/html", + "/mnt/Storage/Nextcloud:/var/www/html/data", + "/mnt/Storage/Syncthing:/Syncthing", + "/mnt/Storage/Media/Music:/Music", + "/etc/localtime:/etc/localtime:ro", +] +environment = [ + "TZ=Europe/Helsinki", + "REDIS_HOST=redis", + "REDIS_HOST_PASSWORD=123", + "TRUSTED_PROXIES=traefik", + "NEXTCLOUD_TRUSTED_DOMAINS=cloud.korhonen.cc", + "OVERWRITEHOST=cloud.korhonen.cc", + "OVERWRITEPROTOCOL=https", +] +depends_on = ["redis"] + [services.redis] image = "redis:alpine" container_name = "redis" networks = ["nextcloud"] -restart = "always" +restart = "unless-stopped" command = "redis-server --requirepass 123" -[services.cron] -image = "nextcloud:apache" -container_name = "nextcloud-cron" -restart = "always" -volumes = ["/docker/nextcloud:/var/www/html"] -entrypoint = "/cron.sh" -depends_on = ["redis"] - [services.coturn] image = "instrumentisto/coturn" container_name = "coturn" diff --git a/docker/nextcloud/nginx.conf b/docker/nextcloud/nginx.conf new file mode 100644 index 00000000..4e5fac98 --- /dev/null +++ b/docker/nextcloud/nginx.conf @@ -0,0 +1,173 @@ +worker_processes auto; + +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + # Prevent nginx HTTP Server Detection + server_tokens off; + + keepalive_timeout 65; + + #gzip on; + + upstream php-handler { + server nextcloud:9000; + } + + server { + listen 80; + + # HSTS settings + # WARNING: Only add the preload option once you read about + # the consequences in https://hstspreload.org/. This option + # will add the domain to a hardcoded list that is shipped + # in all major browsers and getting removed from this list + # could take several months. + #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always; + + # set max upload size + client_max_body_size 512M; + fastcgi_buffers 64 4K; + + # Enable gzip but do not remove ETag headers + gzip on; + gzip_vary on; + gzip_comp_level 4; + gzip_min_length 256; + gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; + gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; + + # Pagespeed is not supported by Nextcloud, so if your server is built + # with the `ngx_pagespeed` module, uncomment this line to disable it. + #pagespeed off; + + # HTTP response headers borrowed from Nextcloud `.htaccess` + add_header Referrer-Policy "no-referrer" always; + add_header X-Content-Type-Options "nosniff" always; + add_header X-Download-Options "noopen" always; + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Permitted-Cross-Domain-Policies "none" always; + add_header X-Robots-Tag "none" always; + add_header X-XSS-Protection "1; mode=block" always; + + # Remove X-Powered-By, which is an information leak + fastcgi_hide_header X-Powered-By; + + # Path to the root of your installation + root /var/www/html; + + # Specify how to handle directories -- specifying `/index.php$request_uri` + # here as the fallback means that Nginx always exhibits the desired behaviour + # when a client requests a path that corresponds to a directory that exists + # on the server. In particular, if that directory contains an index.php file, + # that file is correctly served; if it doesn't, then the request is passed to + # the front-end controller. This consistent behaviour means that we don't need + # to specify custom rules for certain paths (e.g. images and other assets, + # `/updater`, `/ocm-provider`, `/ocs-provider`), and thus + # `try_files $uri $uri/ /index.php$request_uri` + # always provides the desired behaviour. + index index.php index.html /index.php$request_uri; + + # Rule borrowed from `.htaccess` to handle Microsoft DAV clients + location = / { + if ( $http_user_agent ~ ^DavClnt ) { + return 302 /remote.php/webdav/$is_args$args; + } + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Make a regex exception for `/.well-known` so that clients can still + # access it despite the existence of the regex rule + # `location ~ /(\.|autotest|...)` which would otherwise handle requests + # for `/.well-known`. + location ^~ /.well-known { + # The rules in this block are an adaptation of the rules + # in `.htaccess` that concern `/.well-known`. + + location = /.well-known/carddav { return 301 /remote.php/dav/; } + location = /.well-known/caldav { return 301 /remote.php/dav/; } + + location /.well-known/acme-challenge { try_files $uri $uri/ =404; } + location /.well-known/pki-validation { try_files $uri $uri/ =404; } + + # Let Nextcloud's API for `/.well-known` URIs handle all other + # requests by passing them to the front-end controller. + return 301 /index.php$request_uri; + } + + # Rules borrowed from `.htaccess` to hide certain paths from clients + location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/) { return 404; } + location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) { return 404; } + + # Ensure this block, which passes PHP files to the PHP process, is above the blocks + # which handle static assets (as seen below). If this block is not declared first, + # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php` + # to the URI, resulting in a HTTP 500 error response. + location ~ \.php(?:$|/) { + # Required for legacy support + rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri; + + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + set $path_info $fastcgi_path_info; + + try_files $fastcgi_script_name =404; + + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $path_info; + #fastcgi_param HTTPS on; + + fastcgi_param modHeadersAvailable true; # Avoid sending the security headers twice + fastcgi_param front_controller_active true; # Enable pretty urls + fastcgi_pass php-handler; + + fastcgi_intercept_errors on; + fastcgi_request_buffering off; + } + + location ~ \.(?:css|js|svg|gif)$ { + try_files $uri /index.php$request_uri; + expires 6M; # Cache-Control policy borrowed from `.htaccess` + access_log off; # Optional: Don't log access to assets + } + + location ~ \.woff2?$ { + try_files $uri /index.php$request_uri; + expires 7d; # Cache-Control policy borrowed from `.htaccess` + access_log off; # Optional: Don't log access to assets + } + + # Rule borrowed from `.htaccess` + location /remote { + return 301 /remote.php$request_uri; + } + + location / { + try_files $uri $uri/ /index.php$request_uri; + } + } +} From f0294e40d89df9e29e7453afc61cf7edda25d2fc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 May 2022 17:08:07 +0300 Subject: [PATCH 1129/2667] mpv: fix playing yle areena with plugin, update mimeo association --- home/.config/mimeo/associations.txt | 6 +- home/.config/mpv/scripts/yledl_hook.lua | 76 +++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 home/.config/mpv/scripts/yledl_hook.lua diff --git a/home/.config/mimeo/associations.txt b/home/.config/mimeo/associations.txt index da50c637..d9a37f2d 100644 --- a/home/.config/mimeo/associations.txt +++ b/home/.config/mimeo/associations.txt @@ -34,6 +34,9 @@ mpvqueue %U mpvqueue %U ^https?://v.redd.it/.* +mpvqueue %U + ^https?://areena.yle.fi.* + imageviewer %U ^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:jpg|jpeg|png|svg) @@ -45,6 +48,3 @@ alacritty -e rtv "%U" alacritty -e rtv "%U" ^https?://redd.it.* - -mpvqueue $(yle-dl --showurl %U) # TODO Command substition not working in mimeo - ^https?://areena.yle.fi.* diff --git a/home/.config/mpv/scripts/yledl_hook.lua b/home/.config/mpv/scripts/yledl_hook.lua new file mode 100644 index 00000000..1ff15ff1 --- /dev/null +++ b/home/.config/mpv/scripts/yledl_hook.lua @@ -0,0 +1,76 @@ +-- Copied from https://github.com/pekkarr/mpv-yledl +-- Copyright 2021 Pekka Ristola + +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . + +local msg = require 'mp.msg' +local utils = require 'mp.utils' + +local function add_series(data) + local playlist = { "#EXTM3U" } + for _, episode in pairs(data) do + table.insert(playlist, episode["webpage"]) + end + mp.set_property("stream-open-filename", "memory://" .. table.concat(playlist, "\n")) +end + +local function add_single_video(data) + local flavors = data["flavors"] + table.sort(flavors, function(a, b) return a["bitrate"] > b["bitrate"] end) + local best = flavors[1] + mp.set_property("stream-open-filename", best["url"]) + mp.set_property("file-local-options/force-media-title", data["title"]) + for _, sub in ipairs(data["subtitles"]) do + local lang = sub["language"] + msg.verbose("Adding subtitles for " .. lang) + mp.commandv("sub-add", sub["url"], "auto", sub["category"], lang) + end +end + +mp.add_hook("on_load", 9, function() + msg.verbose('yle-dl hook') + local url = mp.get_property("stream-open-filename", "") + if (url:find("https?://%a+%.yle%.fi/") == 1) or (url:find("https?://yle%.fi/") == 1) then + local start_time = os.clock() + local command = { "yle-dl", "--showmetadata", url } + msg.debug("Running: " .. table.concat(command, ' ')) + local ret = mp.command_native({name = "subprocess", + args = command, + capture_stdout = true, + capture_stderr = false}) + if ret.killed_by_us then + return + end + if (ret.status < 0) or (ret.stdout == nil) or (ret.stdout == "") then + msg.error("yle-dl failed to parse url") + return + end + + local json, err = utils.parse_json(ret.stdout) + if (json == nil) then + msg.error("failed to parse JSON: " .. err) + return + end + msg.verbose("yle-dl succeeded") + msg.debug("running yle-dl took " .. os.clock() - start_time .. " seconds") + + if #json == 1 then + add_single_video(json[1]) + else + add_series(json) + end + else + msg.verbose('not an areena url') + end +end) From fb9bb347da542972a409efcfc0bcce9f332349b3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 May 2022 17:08:07 +0300 Subject: [PATCH 1130/2667] mpv: fix playing yle areena with plugin, update mimeo association --- home/.config/mimeo/associations.txt | 6 +- home/.config/mpv/scripts/yledl_hook.lua | 76 +++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 home/.config/mpv/scripts/yledl_hook.lua diff --git a/home/.config/mimeo/associations.txt b/home/.config/mimeo/associations.txt index da50c637..d9a37f2d 100644 --- a/home/.config/mimeo/associations.txt +++ b/home/.config/mimeo/associations.txt @@ -34,6 +34,9 @@ mpvqueue %U mpvqueue %U ^https?://v.redd.it/.* +mpvqueue %U + ^https?://areena.yle.fi.* + imageviewer %U ^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:jpg|jpeg|png|svg) @@ -45,6 +48,3 @@ alacritty -e rtv "%U" alacritty -e rtv "%U" ^https?://redd.it.* - -mpvqueue $(yle-dl --showurl %U) # TODO Command substition not working in mimeo - ^https?://areena.yle.fi.* diff --git a/home/.config/mpv/scripts/yledl_hook.lua b/home/.config/mpv/scripts/yledl_hook.lua new file mode 100644 index 00000000..1ff15ff1 --- /dev/null +++ b/home/.config/mpv/scripts/yledl_hook.lua @@ -0,0 +1,76 @@ +-- Copied from https://github.com/pekkarr/mpv-yledl +-- Copyright 2021 Pekka Ristola + +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . + +local msg = require 'mp.msg' +local utils = require 'mp.utils' + +local function add_series(data) + local playlist = { "#EXTM3U" } + for _, episode in pairs(data) do + table.insert(playlist, episode["webpage"]) + end + mp.set_property("stream-open-filename", "memory://" .. table.concat(playlist, "\n")) +end + +local function add_single_video(data) + local flavors = data["flavors"] + table.sort(flavors, function(a, b) return a["bitrate"] > b["bitrate"] end) + local best = flavors[1] + mp.set_property("stream-open-filename", best["url"]) + mp.set_property("file-local-options/force-media-title", data["title"]) + for _, sub in ipairs(data["subtitles"]) do + local lang = sub["language"] + msg.verbose("Adding subtitles for " .. lang) + mp.commandv("sub-add", sub["url"], "auto", sub["category"], lang) + end +end + +mp.add_hook("on_load", 9, function() + msg.verbose('yle-dl hook') + local url = mp.get_property("stream-open-filename", "") + if (url:find("https?://%a+%.yle%.fi/") == 1) or (url:find("https?://yle%.fi/") == 1) then + local start_time = os.clock() + local command = { "yle-dl", "--showmetadata", url } + msg.debug("Running: " .. table.concat(command, ' ')) + local ret = mp.command_native({name = "subprocess", + args = command, + capture_stdout = true, + capture_stderr = false}) + if ret.killed_by_us then + return + end + if (ret.status < 0) or (ret.stdout == nil) or (ret.stdout == "") then + msg.error("yle-dl failed to parse url") + return + end + + local json, err = utils.parse_json(ret.stdout) + if (json == nil) then + msg.error("failed to parse JSON: " .. err) + return + end + msg.verbose("yle-dl succeeded") + msg.debug("running yle-dl took " .. os.clock() - start_time .. " seconds") + + if #json == 1 then + add_single_video(json[1]) + else + add_series(json) + end + else + msg.verbose('not an areena url') + end +end) From 1a95a4c055d6e1661eb17641c2c24a636a15c1b1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Jun 2022 15:55:45 +0300 Subject: [PATCH 1131/2667] Nvim: Disable folding --- home/.config/nvim/lua/pluginconf/treesitter.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua index f90b688b..6370d4f9 100644 --- a/home/.config/nvim/lua/pluginconf/treesitter.lua +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -10,5 +10,5 @@ require'nvim-treesitter.configs'.setup { context_commentstring = {enable = true} } -vim.wo.foldmethod = 'expr' -vim.wo.foldexpr = 'nvim_treesitter#foldexpr()' +--vim.wo.foldmethod = 'expr' +--im.wo.foldexpr = 'nvim_treesitter#foldexpr()' From 2fa242c8b1cdf967fd3ca390c19d9efaa5850cdc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Jun 2022 15:55:45 +0300 Subject: [PATCH 1132/2667] Nvim: Disable folding --- home/.config/nvim/lua/pluginconf/treesitter.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua index f90b688b..6370d4f9 100644 --- a/home/.config/nvim/lua/pluginconf/treesitter.lua +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -10,5 +10,5 @@ require'nvim-treesitter.configs'.setup { context_commentstring = {enable = true} } -vim.wo.foldmethod = 'expr' -vim.wo.foldexpr = 'nvim_treesitter#foldexpr()' +--vim.wo.foldmethod = 'expr' +--im.wo.foldexpr = 'nvim_treesitter#foldexpr()' From 287aae134ce02c127a26fe935f49a9fc0b28f895 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Jun 2022 22:25:44 +0300 Subject: [PATCH 1133/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 37d2c7c6..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 37d2c7c684bc84660eb287d0dfaba946accf7dc9 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From 06cb90d61356b9c2d607ac41ad72ee5d50e7ba94 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Jun 2022 22:25:44 +0300 Subject: [PATCH 1134/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 37d2c7c6..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 37d2c7c684bc84660eb287d0dfaba946accf7dc9 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From a845ca8f9d9074c04411ea365031372a027c73e5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Jun 2022 22:34:06 +0300 Subject: [PATCH 1135/2667] Migrate dotdrop from yaml config to toml --- config-root.toml | 209 ++++++++++++++++++++ config-root.yaml | 184 ------------------ config.toml | 327 ++++++++++++++++++++++++++++++++ config.yaml | 284 --------------------------- home/.config/zsh/03-aliases.zsh | 4 +- 5 files changed, 538 insertions(+), 470 deletions(-) create mode 100644 config-root.toml delete mode 100644 config-root.yaml create mode 100644 config.toml delete mode 100644 config.yaml diff --git a/config-root.toml b/config-root.toml new file mode 100644 index 00000000..80f8eada --- /dev/null +++ b/config-root.toml @@ -0,0 +1,209 @@ +[config] +backup = true +banner = true +create = true +dotpath = "root" +ignoreempty = false +keepdot = true +link_dotfile_default = "nolink" +link_on_import = "nolink" +longkey = false +showdiff = false +workdir = "~/.config/sdotdrop" + +[dotfiles] + +[dotfiles."f_60-uinput-permissions.rules"] +dst = "/etc/udev/rules.d/60-uinput-permissions.rules" +src = "etc/udev/rules.d/60-uinput-permissions.rules" + +[dotfiles.d_bin] +dst = "/usr/local/bin" +src = "usr/local/bin" + +[dotfiles.d_network] +src = "etc/systemd/network" +dst = "/etc/systemd/network" + +[dotfiles."f_networkd.conf"] +src = "etc/systemd/networkd.conf" +dst = "/etc/systemd/networkd.conf" + +[dotfiles."f_99-sysctl.conf"] +dst = "/etc/sysctl.d/99-sysctl.conf" +src = "etc/sysctl.d/99-sysctl.conf" + +[dotfiles."f_adb.service"] +dst = "/etc/systemd/system/adb.service" +src = "etc/systemd/system/adb.service" + +[dotfiles."f_clamd.conf"] +dst = "/etc/clamav/clamd.conf" +src = "etc/clamav/clamd.conf" + +[dotfiles.f_cryptissue] +dst = "/etc/cryptissue" +src = "etc/cryptissue" + +[dotfiles."f_detected.sh"] +dst = "/etc/clamav/detected.sh" +src = "etc/clamav/detected.sh" + +[dotfiles."f_freetype2.sh"] +dst = "/etc/profile.d/freetype2.sh" +src = "etc/profile.d/freetype2.sh" + +[dotfiles."f_fonts.conf"] +dst = "/etc/fonts/local.conf" +src = "etc/fonts/local.conf" + +[dotfiles."f_locale.conf"] +dst = "/etc/locale.conf" +src = "etc/locale.conf" + +[dotfiles."f_locale.gen"] +dst = "/etc/locale.gen" +src = "etc/locale.gen" + +[dotfiles."f_logind.conf"] +dst = "/etc/systemd/logind.conf" +src = "etc/systemd/logind.conf" + +[dotfiles."f_bluetooth.conf"] +dst = "/etc/bluetooth/main.conf" +src = "etc/bluetooth/main.conf" + +[dotfiles."f_pacman.conf"] +dst = "/etc/pacman.conf" +src = "etc/pacman.conf" + +[dotfiles.f_pacman_zsh_hook] +dst = "/etc/pacman.d/hooks/zsh.hook" +src = "etc/pacman.d/hooks/zsh.hook" + +[dotfiles.f_sshd_config] +dst = "/etc/ssh/sshd_config" +src = "etc/ssh/sshd_config" + +[dotfiles."f_welcomemessage.conf"] +dst = "/etc/welcomemessage.conf" +src = "etc/welcomemessage.conf" + +[dotfiles."f_getty.conf"] +src = "etc/systemd/system/getty@tty1.service.d/override.conf" +dst = "/etc/systemd/system/getty@tty1.service.d/override.conf" + +[dotfiles."f_99-conbee-usb-serial.rules"] +src = "etc/udev/rules.d/99-conbee-usb-serial.rules" +dst = "/etc/udev/rules.d/99-conbee-usb-serial.rules" + +[dotfiles."f_99-lowbat.rules"] +src = "etc/udev/rules.d/99-lowbat.rules" +dst = "/etc/udev/rules.d/99-lowbat.rules" + +[dotfiles."f_sleep.conf"] +src = "etc/systemd/sleep.conf" +dst = "/etc/systemd/sleep.conf" + +[dotfiles.f_fstab] +src = "etc/fstab" +dst = "/etc/fstab" + +[dotfiles.f_ignore] +src = ".ignore" +dst = "/.ignore" + +[dotfiles."f_mkinitcpio.conf"] +src = "etc/mkinitcpio.conf" +dst = "/etc/mkinitcpio.conf" + +[dotfiles."f_vconsole.conf"] +src = "etc/vconsole.conf" +dst = "/etc/vconsole.conf" + +[dotfiles."f_20-quiet-printk.conf"] +src = "etc/sysctl.d/20-quiet-printk.conf" +dst = "/etc/sysctl.d/20-quiet-printk.conf" + +[dotfiles."f_system.conf"] +src = "etc/systemd/system.conf" +dst = "/etc/systemd/system.conf" + +[dotfiles.f_cpupower] +src = "etc/default/cpupower" +dst = "/etc/default/cpupower" + +[dotfiles."f_pacserve.service.conf"] +src = "etc/pacserve/pacserve.service.conf" +dst = "/etc/pacserve/pacserve.service.conf" + +[dotfiles."d_mkinitcpio.d"] +src = "etc/mkinitcpio.d" +dst = "/etc/mkinitcpio.d" + +[dotfiles.f_cmdline] +src = "etc/kernel/cmdline" +dst = "/etc/kernel/cmdline" + +[dotfiles."f_loader.conf"] +src = "boot/loader/loader.conf" +dst = "/boot/loader/loader.conf" + +[dotfiles."f_timesyncd.conf"] +src = "etc/systemd/timesyncd.conf" +dst = "/etc/systemd/timesyncd.conf" + +[profiles] + +[profiles.Network] +dotfiles = ["d_network", "f_networkd.conf"] + +[profiles.Locale] +dotfiles = ["f_locale.conf", "f_locale.gen"] + +[profiles.Pacman] +dotfiles = ["f_pacman.conf", "f_pacman_zsh_hook", "f_pacserve.service.conf"] + +[profiles.Mirkwood] +dotfiles = [ + "f_getty.conf", + "f_cryptissue", + "f_welcomemessage.conf", + "d_bin", + "f_adb.service", + "f_bluetooth.conf", + "f_sshd_config", + "f_logind.conf", + "f_60-uinput-permissions.rules", + "f_freetype2.sh", + "f_fonts.conf", + "f_99-lowbat.rules", + "f_ignore", + "f_mkinitcpio.conf", + "f_vconsole.conf", + "f_20-quiet-printk.conf", + "f_system.conf", + "f_cpupower", + "d_mkinitcpio.d", + "f_cmdline", + "f_loader.conf", + "f_timesyncd.conf", +] +include = ["Locale", "Pacman", "Network"] + +[profiles.Moria] +include = ["Locale", "Pacman", "Network"] +dotfiles = ["f_sshd_config", "f_99-sysctl.conf", "f_cpupower"] + +[profiles.Gondor] +include = ["Locale", "Pacman"] +dotfiles = ["f_sshd_config"] + +[profiles.localhost] +include = ["Locale"] + +[profiles.Edoras] +include = ["Pacman"] + +[profiles.mko-laptop] +dotfiles = ["f_cpupower"] diff --git a/config-root.yaml b/config-root.yaml deleted file mode 100644 index 0fe32678..00000000 --- a/config-root.yaml +++ /dev/null @@ -1,184 +0,0 @@ -config: - backup: true - banner: true - create: true - dotpath: root - ignoreempty: false - keepdot: true - link_dotfile_default: nolink - link_on_import: nolink - longkey: false - showdiff: false - workdir: ~/.config/sdotdrop -dotfiles: - f_60-uinput-permissions.rules: - dst: /etc/udev/rules.d/60-uinput-permissions.rules - src: etc/udev/rules.d/60-uinput-permissions.rules - d_bin: - dst: /usr/local/bin - src: usr/local/bin - d_network: - src: etc/systemd/network - dst: /etc/systemd/network - f_networkd.conf: - src: etc/systemd/networkd.conf - dst: /etc/systemd/networkd.conf - f_99-sysctl.conf: - dst: /etc/sysctl.d/99-sysctl.conf - src: etc/sysctl.d/99-sysctl.conf - f_adb.service: - dst: /etc/systemd/system/adb.service - src: etc/systemd/system/adb.service - f_clamd.conf: - dst: /etc/clamav/clamd.conf - src: etc/clamav/clamd.conf - f_cryptissue: - dst: /etc/cryptissue - src: etc/cryptissue - f_detected.sh: - dst: /etc/clamav/detected.sh - src: etc/clamav/detected.sh - f_freetype2.sh: - dst: /etc/profile.d/freetype2.sh - src: etc/profile.d/freetype2.sh - f_fonts.conf: - dst: /etc/fonts/local.conf - src: etc/fonts/local.conf - f_locale.conf: - dst: /etc/locale.conf - src: etc/locale.conf - f_locale.gen: - dst: /etc/locale.gen - src: etc/locale.gen - f_logind.conf: - dst: /etc/systemd/logind.conf - src: etc/systemd/logind.conf - f_bluetooth.conf: - dst: /etc/bluetooth/main.conf - src: etc/bluetooth/main.conf - f_pacman.conf: - dst: /etc/pacman.conf - src: etc/pacman.conf - f_pacman_zsh_hook: - dst: /etc/pacman.d/hooks/zsh.hook - src: etc/pacman.d/hooks/zsh.hook - f_sshd_config: - dst: /etc/ssh/sshd_config - src: etc/ssh/sshd_config - f_welcomemessage.conf: - dst: /etc/welcomemessage.conf - src: etc/welcomemessage.conf - f_getty.conf: - src: etc/systemd/system/getty@tty1.service.d/override.conf - dst: /etc/systemd/system/getty@tty1.service.d/override.conf - f_99-conbee-usb-serial.rules: - src: etc/udev/rules.d/99-conbee-usb-serial.rules - dst: /etc/udev/rules.d/99-conbee-usb-serial.rules - f_99-lowbat.rules: - src: etc/udev/rules.d/99-lowbat.rules - dst: /etc/udev/rules.d/99-lowbat.rules - f_sleep.conf: - src: etc/systemd/sleep.conf - dst: /etc/systemd/sleep.conf - f_fstab: - src: etc/fstab - dst: /etc/fstab - f_ignore: - src: .ignore - dst: /.ignore - f_mkinitcpio.conf: - src: etc/mkinitcpio.conf - dst: /etc/mkinitcpio.conf - f_vconsole.conf: - src: etc/vconsole.conf - dst: /etc/vconsole.conf - f_20-quiet-printk.conf: - src: etc/sysctl.d/20-quiet-printk.conf - dst: /etc/sysctl.d/20-quiet-printk.conf - f_system.conf: - src: etc/systemd/system.conf - dst: /etc/systemd/system.conf - f_cpupower: - src: etc/default/cpupower - dst: /etc/default/cpupower - f_pacserve.service.conf: - src: etc/pacserve/pacserve.service.conf - dst: /etc/pacserve/pacserve.service.conf - d_mkinitcpio.d: - src: etc/mkinitcpio.d - dst: /etc/mkinitcpio.d - f_cmdline: - src: etc/kernel/cmdline - dst: /etc/kernel/cmdline - f_loader.conf: - src: boot/loader/loader.conf - dst: /boot/loader/loader.conf - f_timesyncd.conf: - src: etc/systemd/timesyncd.conf - dst: /etc/systemd/timesyncd.conf -profiles: - Network: - dotfiles: - - d_network - - f_networkd.conf - Locale: - dotfiles: - - f_locale.conf - - f_locale.gen - Pacman: - dotfiles: - - f_pacman.conf - - f_pacman_zsh_hook - - f_pacserve.service.conf - Mirkwood: - dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - f_adb.service - - f_bluetooth.conf - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_99-lowbat.rules - - f_ignore - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_cpupower - - d_mkinitcpio.d - - f_cmdline - - f_loader.conf - - f_timesyncd.conf - include: - - Locale - - Pacman - - Network - Moria: - include: - - Locale - - Pacman - - Network - dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_cpupower - Gondor: - include: - - Locale - - Pacman - dotfiles: - - f_sshd_config - localhost: - include: - - Locale - Edoras: - include: - - Pacman - mko-laptop: - dotfiles: - - f_cpupower diff --git a/config.toml b/config.toml new file mode 100644 index 00000000..9b22bccf --- /dev/null +++ b/config.toml @@ -0,0 +1,327 @@ +[actions] +nvim-packer-sync = "nvim +PackerSync" + +[config] +backup = true +banner = true +create = true +dotpath = "home" +ignoreempty = false +keepdot = true +link_dotfile_default = "nolink" +link_on_import = "nolink" +longkey = false +showdiff = false +workdir = "~/.config/dotdrop" + +[dotfiles] + +[dotfiles.d_systemd] +dst = "~/.config/systemd/user" +src = ".config/systemd/user" + +[dotfiles.d_mpv] +dst = "~/.config/mpv" +src = ".config/mpv" + +[dotfiles.d_neomutt] +dst = "~/.config/neomutt" +src = ".config/neomutt" + +[dotfiles.d_imapnotify] +dst = "~/.config/imapnotify" +src = ".config/imapnotify" + +[dotfiles.f_nvim_init] +dst = "~/.config/nvim/init.lua" +src = ".config/nvim/init.lua" + +[dotfiles.d_nvim_lua] +actions = ["nvim-packer-sync"] +dst = "~/.config/nvim/lua" +src = ".config/nvim/lua" + +[dotfiles.d_nvim_ftplugin] +dst = "~/.config/nvim/ftplugin" +src = ".config/nvim/ftplugin" + +[dotfiles.d_sway] +dst = "~/.config/sway" +src = ".config/sway" + +[dotfiles.d_waybar] +dst = "~/.config/waybar" +src = ".config/waybar" + +[dotfiles.d_wofi] +src = ".config/wofi" +dst = "~/.config/wofi" + +[dotfiles."f_abcde.conf"] +dst = "~/.abcde.conf" +src = ".abcde.conf" + +[dotfiles.f_mbsyncrc] +dst = "~/.mbsyncrc" +src = ".mbsyncrc" + +[dotfiles."f_alacritty.yml"] +dst = "~/.config/alacritty/alacritty.yml" +src = ".config/alacritty/alacritty.yml" + +[dotfiles.f_authorized_keys] +dst = "~/.ssh/authorized_keys" +src = ".ssh/authorized_keys" + +[dotfiles.f_beets_config] +dst = "~/.config/beets/config.yaml" +src = ".config/beets/config.yaml" + +[dotfiles.f_beets_whitelist] +dst = "~/.config/beets/whitelist" +src = ".config/beets/whitelist" + +[dotfiles.f_bspwmrc] +dst = "~/.config/bspwm/bspwmrc" +src = ".config/bspwm/bspwmrc" + +[dotfiles.f_gitconfig] +dst = "~/.gitconfig" +src = ".gitconfig" + +[dotfiles.f_libra_config] +dst = "~/.config/libra/config.toml" +src = ".config/libra/config.toml" + +[dotfiles.f_mailcap] +dst = "~/.mailcap" +src = ".mailcap" + +[dotfiles."f_makepkg.conf"] +dst = "~/.config/pacman/makepkg.conf" +src = ".config/pacman/makepkg.conf" + +[dotfiles.f_mako_config] +dst = "~/.config/mako/config" +src = ".config/mako/config" + +[dotfiles."f_mimeo_associations.txt"] +dst = "~/.config/mimeo/associations.txt" +src = ".config/mimeo/associations.txt" + +[dotfiles."f_mpd.conf"] +dst = "~/.config/mpd/mpd.conf" +src = ".config/mpd/mpd.conf" + +[dotfiles."f_mpdris2.conf"] +dst = "~/.config/mpDris2/mpDris2.conf" +src = ".config/mpDris2/mpDris2.conf" + +[dotfiles."f_mpdscribble.conf"] +dst = "~/.mpdscribble/mpdscribble.conf" +src = ".mpdscribble/mpdscribble.conf" + +[dotfiles.f_ncmpcpp_bindings] +dst = "~/.config/ncmpcpp/bindings" +src = ".config/ncmpcpp/bindings" + +[dotfiles."f_ranger.conf"] +dst = "~/.config/ranger/rc.conf" +src = ".config/ranger/rc.conf" + +[dotfiles."f_ranger_commands.py"] +dst = "~/.config/ranger/commands.py" +src = ".config/ranger/commands.py" + +[dotfiles."f_redshift.conf"] +dst = "~/.config/redshift/redshift.conf" +src = ".config/redshift/redshift.conf" + +[dotfiles."f_rtv.cfg"] +dst = "~/.config/rtv/rtv.cfg" +src = ".config/rtv/rtv.cfg" + +[dotfiles."f_ssh.conf"] +dst = "~/.ssh/config" +src = ".ssh/config" + +[dotfiles."f_steam-native.desktop"] +dst = "~/.local/share/applications/steam-native.desktop" +src = ".local/share/applications/steam-native.desktop" + +[dotfiles."f_tdesktop_lang.strings"] +dst = "~/.config/telegram-desktop/lang.strings" +src = ".config/telegram-desktop/lang.strings" + +[dotfiles."f_tmux.conf"] +dst = "~/.tmux.conf" +src = ".tmux.conf" + +[dotfiles.f_youtube-dl_config] +dst = "~/.config/youtube-dl/config" +src = ".config/youtube-dl/config" + +[dotfiles.d_zathura] +dst = "~/.config/zathura" +src = ".config/zathura" + +[dotfiles.f_zprofile] +dst = "~/.zprofile" +src = ".zprofile" + +[dotfiles.f_zshrc] +dst = "~/.zshrc" +src = ".zshrc" + +[dotfiles.d_zsh] +src = ".config/zsh" +dst = "~/.config/zsh" + +[dotfiles."f_fonts.conf"] +src = ".config/fontconfig/fonts.conf" +dst = "~/.config/fontconfig/fonts.conf" + +[dotfiles.f_ripgrep_ignore] +src = ".ignore" +dst = "~/.ignore" + +[dotfiles."f_ncmpcpp.conf"] +src = ".config/ncmpcpp/config" +dst = "~/.config/ncmpcpp/config" + +[dotfiles.f_hushlogin] +src = ".hushlogin" +dst = "~/.hushlogin" + +[dotfiles."f_paru.conf"] +src = ".config/paru/paru.conf" +dst = "~/.config/paru/paru.conf" + +[dotfiles.f_msmtp_config] +src = ".config/msmtp/config" +dst = "~/.config/msmtp/config" + +[dotfiles."f_foot.ini"] +src = ".config/foot/foot.ini" +dst = "~/.config/foot/foot.ini" + +[dotfiles."f_gpg-agent.conf"] +src = ".gnupg/gpg-agent.conf" +dst = "~/.gnupg/gpg-agent.conf" +chmod = "600" + +[dotfiles."f_gpg.conf"] +src = ".gnupg/gpg.conf" +dst = "~/.gnupg/gpg.conf" + +[dotfiles."f_gpg_scdaemon.conf"] +src = ".gnupg/scdaemon.conf" +dst = "~/.gnupg/scdaemon.conf" + +[dotfiles."f_electron-flags.conf"] +src = ".config/electron-flags.conf" +dst = "~/.config/electron-flags.conf" + +[dotfiles."f_electron12-flags.conf"] +src = ".config/electron12-flags.conf" +dst = "~/.config/electron12-flags.conf" + +[dotfiles.f_pam_environment] +src = ".pam_environment" +dst = "~/.pam_environment" + +[profiles] + +[profiles.base] +dotfiles = ["d_systemd"] + +[profiles.terminal] +dotfiles = [ + "f_hushlogin", + "f_ripgrep_ignore", + "f_ranger_commands.py", + "f_rtv.cfg", + "f_mailcap", + "d_zsh", + "f_zshrc", + "f_tmux.conf", + "f_ranger.conf", + "f_ssh.conf", + "f_authorized_keys", + "f_nvim_init", + "d_nvim_lua", + "d_nvim_ftplugin", + "f_gitconfig", + "f_alacritty.yml", +] + +[profiles.email] +dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] + +[profiles.media] +dotfiles = [ + "f_beets_config", + "f_beets_whitelist", + "f_abcde.conf", + "d_mpv", + "f_youtube-dl_config", + "f_mpd.conf", + "f_ncmpcpp_bindings", + "f_ncmpcpp.conf", + "f_libra_config", + "f_mpdscribble.conf", + "f_mpdris2.conf", +] + +[profiles.sway] +dotfiles = [ + "d_sway", + "d_waybar", + "d_wofi", + "f_mako_config", + "f_redshift.conf", + "d_zathura", + "f_mimeo_associations.txt", + "f_tdesktop_lang.strings", + "f_fonts.conf", + "f_zprofile", + "f_electron-flags.conf", + "f_electron12-flags.conf", +] + +[profiles.pacman] +dotfiles = ["f_makepkg.conf", "f_paru.conf"] + +[profiles.gpg] +dotfiles = [ + "f_gpg-agent.conf", + "f_gpg.conf", + "f_gpg_scdaemon.conf", + "f_pam_environment", +] + +[profiles.Mirkwood] +include = ["base", "terminal", "email", "media", "sway", "pacman", "gpg"] +dotfiles = ["f_paru.conf", "f_gitconfig", "f_foot.ini"] + +[profiles.Moria] +include = ["terminal", "pacman"] +dotfiles = ["f_zprofile"] + +[profiles.Gondor] +include = ["terminal", "pacman"] + +[profiles.mko-laptop] +include = ["terminal", "media", "gpg"] + +[profiles.Edoras] +include = ["terminal", "pacman"] + +[profiles.TakamakiPC] +include = ["terminal", "pacman"] + +[profiles.localhost] +include = ["terminal"] + +[profiles.ViiruJaTeippi] +include = ["terminal"] diff --git a/config.yaml b/config.yaml deleted file mode 100644 index 0a074a16..00000000 --- a/config.yaml +++ /dev/null @@ -1,284 +0,0 @@ -actions: - nvim-packer-sync: nvim +PackerSync -config: - backup: true - banner: true - create: true - dotpath: home - ignoreempty: false - keepdot: true - link_dotfile_default: nolink - link_on_import: nolink - longkey: false - showdiff: false - workdir: ~/.config/dotdrop -dotfiles: - d_systemd: - dst: ~/.config/systemd/user - src: .config/systemd/user - d_mpv: - dst: ~/.config/mpv - src: .config/mpv - d_neomutt: - dst: ~/.config/neomutt - src: .config/neomutt - d_imapnotify: - dst: ~/.config/imapnotify - src: .config/imapnotify - f_nvim_init: - dst: ~/.config/nvim/init.lua - src: .config/nvim/init.lua - d_nvim_lua: - actions: - - nvim-packer-sync - dst: ~/.config/nvim/lua - src: .config/nvim/lua - d_nvim_ftplugin: - dst: ~/.config/nvim/ftplugin - src: .config/nvim/ftplugin - d_sway: - dst: ~/.config/sway - src: .config/sway - d_waybar: - dst: ~/.config/waybar - src: .config/waybar - d_wofi: - src: .config/wofi - dst: ~/.config/wofi - f_abcde.conf: - dst: ~/.abcde.conf - src: .abcde.conf - f_mbsyncrc: - dst: ~/.mbsyncrc - src: .mbsyncrc - f_alacritty.yml: - dst: ~/.config/alacritty/alacritty.yml - src: .config/alacritty/alacritty.yml - f_authorized_keys: - dst: ~/.ssh/authorized_keys - src: .ssh/authorized_keys - f_beets_config: - dst: ~/.config/beets/config.yaml - src: .config/beets/config.yaml - f_beets_whitelist: - dst: ~/.config/beets/whitelist - src: .config/beets/whitelist - f_bspwmrc: - dst: ~/.config/bspwm/bspwmrc - src: .config/bspwm/bspwmrc - f_gitconfig: - dst: ~/.gitconfig - src: .gitconfig - f_libra_config: - dst: ~/.config/libra/config.toml - src: .config/libra/config.toml - f_mailcap: - dst: ~/.mailcap - src: .mailcap - f_makepkg.conf: - dst: ~/.config/pacman/makepkg.conf - src: .config/pacman/makepkg.conf - f_mako_config: - dst: ~/.config/mako/config - src: .config/mako/config - f_mimeo_associations.txt: - dst: ~/.config/mimeo/associations.txt - src: .config/mimeo/associations.txt - f_mpd.conf: - dst: ~/.config/mpd/mpd.conf - src: .config/mpd/mpd.conf - f_mpdris2.conf: - dst: ~/.config/mpDris2/mpDris2.conf - src: .config/mpDris2/mpDris2.conf - f_mpdscribble.conf: - dst: ~/.mpdscribble/mpdscribble.conf - src: .mpdscribble/mpdscribble.conf - f_ncmpcpp_bindings: - dst: ~/.config/ncmpcpp/bindings - src: .config/ncmpcpp/bindings - f_ranger.conf: - dst: ~/.config/ranger/rc.conf - src: .config/ranger/rc.conf - f_ranger_commands.py: - dst: ~/.config/ranger/commands.py - src: .config/ranger/commands.py - f_redshift.conf: - dst: ~/.config/redshift/redshift.conf - src: .config/redshift/redshift.conf - f_rtv.cfg: - dst: ~/.config/rtv/rtv.cfg - src: .config/rtv/rtv.cfg - f_ssh.conf: - dst: ~/.ssh/config - src: .ssh/config - f_steam-native.desktop: - dst: ~/.local/share/applications/steam-native.desktop - src: .local/share/applications/steam-native.desktop - f_tdesktop_lang.strings: - dst: ~/.config/telegram-desktop/lang.strings - src: .config/telegram-desktop/lang.strings - f_tmux.conf: - dst: ~/.tmux.conf - src: .tmux.conf - f_youtube-dl_config: - dst: ~/.config/youtube-dl/config - src: .config/youtube-dl/config - d_zathura: - dst: ~/.config/zathura - src: .config/zathura - f_zprofile: - dst: ~/.zprofile - src: .zprofile - f_zshrc: - dst: ~/.zshrc - src: .zshrc - d_zsh: - src: .config/zsh - dst: ~/.config/zsh - f_fonts.conf: - src: .config/fontconfig/fonts.conf - dst: ~/.config/fontconfig/fonts.conf - f_ripgrep_ignore: - src: .ignore - dst: ~/.ignore - f_ncmpcpp.conf: - src: .config/ncmpcpp/config - dst: ~/.config/ncmpcpp/config - f_hushlogin: - src: .hushlogin - dst: ~/.hushlogin - f_paru.conf: - src: .config/paru/paru.conf - dst: ~/.config/paru/paru.conf - f_msmtp_config: - src: .config/msmtp/config - dst: ~/.config/msmtp/config - f_foot.ini: - src: .config/foot/foot.ini - dst: ~/.config/foot/foot.ini - f_gpg-agent.conf: - src: .gnupg/gpg-agent.conf - dst: ~/.gnupg/gpg-agent.conf - chmod: '600' - f_gpg.conf: - src: .gnupg/gpg.conf - dst: ~/.gnupg/gpg.conf - f_gpg_scdaemon.conf: - src: .gnupg/scdaemon.conf - dst: ~/.gnupg/scdaemon.conf - f_electron-flags.conf: - src: .config/electron-flags.conf - dst: ~/.config/electron-flags.conf - f_electron12-flags.conf: - src: .config/electron12-flags.conf - dst: ~/.config/electron12-flags.conf - f_pam_environment: - src: .pam_environment - dst: ~/.pam_environment -profiles: - base: - dotfiles: - - d_systemd - terminal: - dotfiles: - - f_hushlogin - - f_ripgrep_ignore - - f_ranger_commands.py - - f_rtv.cfg - - f_mailcap - - d_zsh - - f_zshrc - - f_tmux.conf - - f_ranger.conf - - f_ssh.conf - - f_authorized_keys - - f_nvim_init - - d_nvim_lua - - d_nvim_ftplugin - - f_gitconfig - - f_alacritty.yml - email: - dotfiles: - - d_neomutt - - d_imapnotify - - f_mbsyncrc - - f_msmtp_config - media: - dotfiles: - - f_beets_config - - f_beets_whitelist - - f_abcde.conf - - d_mpv - - f_youtube-dl_config - - f_mpd.conf - - f_ncmpcpp_bindings - - f_ncmpcpp.conf - - f_libra_config - - f_mpdscribble.conf - - f_mpdris2.conf - sway: - dotfiles: - - d_sway - - d_waybar - - d_wofi - - f_mako_config - - f_redshift.conf - - d_zathura - - f_mimeo_associations.txt - - f_tdesktop_lang.strings - - f_fonts.conf - - f_zprofile - - f_electron-flags.conf - - f_electron12-flags.conf - pacman: - dotfiles: - - f_makepkg.conf - - f_paru.conf - gpg: - dotfiles: - - f_gpg-agent.conf - - f_gpg.conf - - f_gpg_scdaemon.conf - - f_pam_environment - Mirkwood: - include: - - base - - terminal - - email - - media - - sway - - pacman - - gpg - dotfiles: - - f_paru.conf - - f_gitconfig - - f_foot.ini - Moria: - include: - - terminal - - pacman - dotfiles: - - f_zprofile - Gondor: - include: - - terminal - - pacman - mko-laptop: - include: - - terminal - - media - - gpg - Edoras: - include: - - terminal - - pacman - TakamakiPC: - include: - - terminal - - pacman - localhost: - include: - - terminal - ViiruJaTeippi: - include: - - terminal diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 055a91e9..6f0f8527 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -130,8 +130,8 @@ cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } -dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop.sh $@ } -sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-root.yaml $@ } +dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config.toml $@ } +sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ } compdef _dotdrop-completion.zsh sdotdrop alias dotgit='git -C $DOTREPO' dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } From 3b6c015a0d19b058057ab8a7b8a164c6d40388a4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Jun 2022 22:34:06 +0300 Subject: [PATCH 1136/2667] Migrate dotdrop from yaml config to toml --- config-root.toml | 209 ++++++++++++++++++++ config-root.yaml | 184 ------------------ config.toml | 327 ++++++++++++++++++++++++++++++++ config.yaml | 284 --------------------------- home/.config/zsh/03-aliases.zsh | 4 +- 5 files changed, 538 insertions(+), 470 deletions(-) create mode 100644 config-root.toml delete mode 100644 config-root.yaml create mode 100644 config.toml delete mode 100644 config.yaml diff --git a/config-root.toml b/config-root.toml new file mode 100644 index 00000000..80f8eada --- /dev/null +++ b/config-root.toml @@ -0,0 +1,209 @@ +[config] +backup = true +banner = true +create = true +dotpath = "root" +ignoreempty = false +keepdot = true +link_dotfile_default = "nolink" +link_on_import = "nolink" +longkey = false +showdiff = false +workdir = "~/.config/sdotdrop" + +[dotfiles] + +[dotfiles."f_60-uinput-permissions.rules"] +dst = "/etc/udev/rules.d/60-uinput-permissions.rules" +src = "etc/udev/rules.d/60-uinput-permissions.rules" + +[dotfiles.d_bin] +dst = "/usr/local/bin" +src = "usr/local/bin" + +[dotfiles.d_network] +src = "etc/systemd/network" +dst = "/etc/systemd/network" + +[dotfiles."f_networkd.conf"] +src = "etc/systemd/networkd.conf" +dst = "/etc/systemd/networkd.conf" + +[dotfiles."f_99-sysctl.conf"] +dst = "/etc/sysctl.d/99-sysctl.conf" +src = "etc/sysctl.d/99-sysctl.conf" + +[dotfiles."f_adb.service"] +dst = "/etc/systemd/system/adb.service" +src = "etc/systemd/system/adb.service" + +[dotfiles."f_clamd.conf"] +dst = "/etc/clamav/clamd.conf" +src = "etc/clamav/clamd.conf" + +[dotfiles.f_cryptissue] +dst = "/etc/cryptissue" +src = "etc/cryptissue" + +[dotfiles."f_detected.sh"] +dst = "/etc/clamav/detected.sh" +src = "etc/clamav/detected.sh" + +[dotfiles."f_freetype2.sh"] +dst = "/etc/profile.d/freetype2.sh" +src = "etc/profile.d/freetype2.sh" + +[dotfiles."f_fonts.conf"] +dst = "/etc/fonts/local.conf" +src = "etc/fonts/local.conf" + +[dotfiles."f_locale.conf"] +dst = "/etc/locale.conf" +src = "etc/locale.conf" + +[dotfiles."f_locale.gen"] +dst = "/etc/locale.gen" +src = "etc/locale.gen" + +[dotfiles."f_logind.conf"] +dst = "/etc/systemd/logind.conf" +src = "etc/systemd/logind.conf" + +[dotfiles."f_bluetooth.conf"] +dst = "/etc/bluetooth/main.conf" +src = "etc/bluetooth/main.conf" + +[dotfiles."f_pacman.conf"] +dst = "/etc/pacman.conf" +src = "etc/pacman.conf" + +[dotfiles.f_pacman_zsh_hook] +dst = "/etc/pacman.d/hooks/zsh.hook" +src = "etc/pacman.d/hooks/zsh.hook" + +[dotfiles.f_sshd_config] +dst = "/etc/ssh/sshd_config" +src = "etc/ssh/sshd_config" + +[dotfiles."f_welcomemessage.conf"] +dst = "/etc/welcomemessage.conf" +src = "etc/welcomemessage.conf" + +[dotfiles."f_getty.conf"] +src = "etc/systemd/system/getty@tty1.service.d/override.conf" +dst = "/etc/systemd/system/getty@tty1.service.d/override.conf" + +[dotfiles."f_99-conbee-usb-serial.rules"] +src = "etc/udev/rules.d/99-conbee-usb-serial.rules" +dst = "/etc/udev/rules.d/99-conbee-usb-serial.rules" + +[dotfiles."f_99-lowbat.rules"] +src = "etc/udev/rules.d/99-lowbat.rules" +dst = "/etc/udev/rules.d/99-lowbat.rules" + +[dotfiles."f_sleep.conf"] +src = "etc/systemd/sleep.conf" +dst = "/etc/systemd/sleep.conf" + +[dotfiles.f_fstab] +src = "etc/fstab" +dst = "/etc/fstab" + +[dotfiles.f_ignore] +src = ".ignore" +dst = "/.ignore" + +[dotfiles."f_mkinitcpio.conf"] +src = "etc/mkinitcpio.conf" +dst = "/etc/mkinitcpio.conf" + +[dotfiles."f_vconsole.conf"] +src = "etc/vconsole.conf" +dst = "/etc/vconsole.conf" + +[dotfiles."f_20-quiet-printk.conf"] +src = "etc/sysctl.d/20-quiet-printk.conf" +dst = "/etc/sysctl.d/20-quiet-printk.conf" + +[dotfiles."f_system.conf"] +src = "etc/systemd/system.conf" +dst = "/etc/systemd/system.conf" + +[dotfiles.f_cpupower] +src = "etc/default/cpupower" +dst = "/etc/default/cpupower" + +[dotfiles."f_pacserve.service.conf"] +src = "etc/pacserve/pacserve.service.conf" +dst = "/etc/pacserve/pacserve.service.conf" + +[dotfiles."d_mkinitcpio.d"] +src = "etc/mkinitcpio.d" +dst = "/etc/mkinitcpio.d" + +[dotfiles.f_cmdline] +src = "etc/kernel/cmdline" +dst = "/etc/kernel/cmdline" + +[dotfiles."f_loader.conf"] +src = "boot/loader/loader.conf" +dst = "/boot/loader/loader.conf" + +[dotfiles."f_timesyncd.conf"] +src = "etc/systemd/timesyncd.conf" +dst = "/etc/systemd/timesyncd.conf" + +[profiles] + +[profiles.Network] +dotfiles = ["d_network", "f_networkd.conf"] + +[profiles.Locale] +dotfiles = ["f_locale.conf", "f_locale.gen"] + +[profiles.Pacman] +dotfiles = ["f_pacman.conf", "f_pacman_zsh_hook", "f_pacserve.service.conf"] + +[profiles.Mirkwood] +dotfiles = [ + "f_getty.conf", + "f_cryptissue", + "f_welcomemessage.conf", + "d_bin", + "f_adb.service", + "f_bluetooth.conf", + "f_sshd_config", + "f_logind.conf", + "f_60-uinput-permissions.rules", + "f_freetype2.sh", + "f_fonts.conf", + "f_99-lowbat.rules", + "f_ignore", + "f_mkinitcpio.conf", + "f_vconsole.conf", + "f_20-quiet-printk.conf", + "f_system.conf", + "f_cpupower", + "d_mkinitcpio.d", + "f_cmdline", + "f_loader.conf", + "f_timesyncd.conf", +] +include = ["Locale", "Pacman", "Network"] + +[profiles.Moria] +include = ["Locale", "Pacman", "Network"] +dotfiles = ["f_sshd_config", "f_99-sysctl.conf", "f_cpupower"] + +[profiles.Gondor] +include = ["Locale", "Pacman"] +dotfiles = ["f_sshd_config"] + +[profiles.localhost] +include = ["Locale"] + +[profiles.Edoras] +include = ["Pacman"] + +[profiles.mko-laptop] +dotfiles = ["f_cpupower"] diff --git a/config-root.yaml b/config-root.yaml deleted file mode 100644 index 0fe32678..00000000 --- a/config-root.yaml +++ /dev/null @@ -1,184 +0,0 @@ -config: - backup: true - banner: true - create: true - dotpath: root - ignoreempty: false - keepdot: true - link_dotfile_default: nolink - link_on_import: nolink - longkey: false - showdiff: false - workdir: ~/.config/sdotdrop -dotfiles: - f_60-uinput-permissions.rules: - dst: /etc/udev/rules.d/60-uinput-permissions.rules - src: etc/udev/rules.d/60-uinput-permissions.rules - d_bin: - dst: /usr/local/bin - src: usr/local/bin - d_network: - src: etc/systemd/network - dst: /etc/systemd/network - f_networkd.conf: - src: etc/systemd/networkd.conf - dst: /etc/systemd/networkd.conf - f_99-sysctl.conf: - dst: /etc/sysctl.d/99-sysctl.conf - src: etc/sysctl.d/99-sysctl.conf - f_adb.service: - dst: /etc/systemd/system/adb.service - src: etc/systemd/system/adb.service - f_clamd.conf: - dst: /etc/clamav/clamd.conf - src: etc/clamav/clamd.conf - f_cryptissue: - dst: /etc/cryptissue - src: etc/cryptissue - f_detected.sh: - dst: /etc/clamav/detected.sh - src: etc/clamav/detected.sh - f_freetype2.sh: - dst: /etc/profile.d/freetype2.sh - src: etc/profile.d/freetype2.sh - f_fonts.conf: - dst: /etc/fonts/local.conf - src: etc/fonts/local.conf - f_locale.conf: - dst: /etc/locale.conf - src: etc/locale.conf - f_locale.gen: - dst: /etc/locale.gen - src: etc/locale.gen - f_logind.conf: - dst: /etc/systemd/logind.conf - src: etc/systemd/logind.conf - f_bluetooth.conf: - dst: /etc/bluetooth/main.conf - src: etc/bluetooth/main.conf - f_pacman.conf: - dst: /etc/pacman.conf - src: etc/pacman.conf - f_pacman_zsh_hook: - dst: /etc/pacman.d/hooks/zsh.hook - src: etc/pacman.d/hooks/zsh.hook - f_sshd_config: - dst: /etc/ssh/sshd_config - src: etc/ssh/sshd_config - f_welcomemessage.conf: - dst: /etc/welcomemessage.conf - src: etc/welcomemessage.conf - f_getty.conf: - src: etc/systemd/system/getty@tty1.service.d/override.conf - dst: /etc/systemd/system/getty@tty1.service.d/override.conf - f_99-conbee-usb-serial.rules: - src: etc/udev/rules.d/99-conbee-usb-serial.rules - dst: /etc/udev/rules.d/99-conbee-usb-serial.rules - f_99-lowbat.rules: - src: etc/udev/rules.d/99-lowbat.rules - dst: /etc/udev/rules.d/99-lowbat.rules - f_sleep.conf: - src: etc/systemd/sleep.conf - dst: /etc/systemd/sleep.conf - f_fstab: - src: etc/fstab - dst: /etc/fstab - f_ignore: - src: .ignore - dst: /.ignore - f_mkinitcpio.conf: - src: etc/mkinitcpio.conf - dst: /etc/mkinitcpio.conf - f_vconsole.conf: - src: etc/vconsole.conf - dst: /etc/vconsole.conf - f_20-quiet-printk.conf: - src: etc/sysctl.d/20-quiet-printk.conf - dst: /etc/sysctl.d/20-quiet-printk.conf - f_system.conf: - src: etc/systemd/system.conf - dst: /etc/systemd/system.conf - f_cpupower: - src: etc/default/cpupower - dst: /etc/default/cpupower - f_pacserve.service.conf: - src: etc/pacserve/pacserve.service.conf - dst: /etc/pacserve/pacserve.service.conf - d_mkinitcpio.d: - src: etc/mkinitcpio.d - dst: /etc/mkinitcpio.d - f_cmdline: - src: etc/kernel/cmdline - dst: /etc/kernel/cmdline - f_loader.conf: - src: boot/loader/loader.conf - dst: /boot/loader/loader.conf - f_timesyncd.conf: - src: etc/systemd/timesyncd.conf - dst: /etc/systemd/timesyncd.conf -profiles: - Network: - dotfiles: - - d_network - - f_networkd.conf - Locale: - dotfiles: - - f_locale.conf - - f_locale.gen - Pacman: - dotfiles: - - f_pacman.conf - - f_pacman_zsh_hook - - f_pacserve.service.conf - Mirkwood: - dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - f_adb.service - - f_bluetooth.conf - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_99-lowbat.rules - - f_ignore - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_cpupower - - d_mkinitcpio.d - - f_cmdline - - f_loader.conf - - f_timesyncd.conf - include: - - Locale - - Pacman - - Network - Moria: - include: - - Locale - - Pacman - - Network - dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_cpupower - Gondor: - include: - - Locale - - Pacman - dotfiles: - - f_sshd_config - localhost: - include: - - Locale - Edoras: - include: - - Pacman - mko-laptop: - dotfiles: - - f_cpupower diff --git a/config.toml b/config.toml new file mode 100644 index 00000000..9b22bccf --- /dev/null +++ b/config.toml @@ -0,0 +1,327 @@ +[actions] +nvim-packer-sync = "nvim +PackerSync" + +[config] +backup = true +banner = true +create = true +dotpath = "home" +ignoreempty = false +keepdot = true +link_dotfile_default = "nolink" +link_on_import = "nolink" +longkey = false +showdiff = false +workdir = "~/.config/dotdrop" + +[dotfiles] + +[dotfiles.d_systemd] +dst = "~/.config/systemd/user" +src = ".config/systemd/user" + +[dotfiles.d_mpv] +dst = "~/.config/mpv" +src = ".config/mpv" + +[dotfiles.d_neomutt] +dst = "~/.config/neomutt" +src = ".config/neomutt" + +[dotfiles.d_imapnotify] +dst = "~/.config/imapnotify" +src = ".config/imapnotify" + +[dotfiles.f_nvim_init] +dst = "~/.config/nvim/init.lua" +src = ".config/nvim/init.lua" + +[dotfiles.d_nvim_lua] +actions = ["nvim-packer-sync"] +dst = "~/.config/nvim/lua" +src = ".config/nvim/lua" + +[dotfiles.d_nvim_ftplugin] +dst = "~/.config/nvim/ftplugin" +src = ".config/nvim/ftplugin" + +[dotfiles.d_sway] +dst = "~/.config/sway" +src = ".config/sway" + +[dotfiles.d_waybar] +dst = "~/.config/waybar" +src = ".config/waybar" + +[dotfiles.d_wofi] +src = ".config/wofi" +dst = "~/.config/wofi" + +[dotfiles."f_abcde.conf"] +dst = "~/.abcde.conf" +src = ".abcde.conf" + +[dotfiles.f_mbsyncrc] +dst = "~/.mbsyncrc" +src = ".mbsyncrc" + +[dotfiles."f_alacritty.yml"] +dst = "~/.config/alacritty/alacritty.yml" +src = ".config/alacritty/alacritty.yml" + +[dotfiles.f_authorized_keys] +dst = "~/.ssh/authorized_keys" +src = ".ssh/authorized_keys" + +[dotfiles.f_beets_config] +dst = "~/.config/beets/config.yaml" +src = ".config/beets/config.yaml" + +[dotfiles.f_beets_whitelist] +dst = "~/.config/beets/whitelist" +src = ".config/beets/whitelist" + +[dotfiles.f_bspwmrc] +dst = "~/.config/bspwm/bspwmrc" +src = ".config/bspwm/bspwmrc" + +[dotfiles.f_gitconfig] +dst = "~/.gitconfig" +src = ".gitconfig" + +[dotfiles.f_libra_config] +dst = "~/.config/libra/config.toml" +src = ".config/libra/config.toml" + +[dotfiles.f_mailcap] +dst = "~/.mailcap" +src = ".mailcap" + +[dotfiles."f_makepkg.conf"] +dst = "~/.config/pacman/makepkg.conf" +src = ".config/pacman/makepkg.conf" + +[dotfiles.f_mako_config] +dst = "~/.config/mako/config" +src = ".config/mako/config" + +[dotfiles."f_mimeo_associations.txt"] +dst = "~/.config/mimeo/associations.txt" +src = ".config/mimeo/associations.txt" + +[dotfiles."f_mpd.conf"] +dst = "~/.config/mpd/mpd.conf" +src = ".config/mpd/mpd.conf" + +[dotfiles."f_mpdris2.conf"] +dst = "~/.config/mpDris2/mpDris2.conf" +src = ".config/mpDris2/mpDris2.conf" + +[dotfiles."f_mpdscribble.conf"] +dst = "~/.mpdscribble/mpdscribble.conf" +src = ".mpdscribble/mpdscribble.conf" + +[dotfiles.f_ncmpcpp_bindings] +dst = "~/.config/ncmpcpp/bindings" +src = ".config/ncmpcpp/bindings" + +[dotfiles."f_ranger.conf"] +dst = "~/.config/ranger/rc.conf" +src = ".config/ranger/rc.conf" + +[dotfiles."f_ranger_commands.py"] +dst = "~/.config/ranger/commands.py" +src = ".config/ranger/commands.py" + +[dotfiles."f_redshift.conf"] +dst = "~/.config/redshift/redshift.conf" +src = ".config/redshift/redshift.conf" + +[dotfiles."f_rtv.cfg"] +dst = "~/.config/rtv/rtv.cfg" +src = ".config/rtv/rtv.cfg" + +[dotfiles."f_ssh.conf"] +dst = "~/.ssh/config" +src = ".ssh/config" + +[dotfiles."f_steam-native.desktop"] +dst = "~/.local/share/applications/steam-native.desktop" +src = ".local/share/applications/steam-native.desktop" + +[dotfiles."f_tdesktop_lang.strings"] +dst = "~/.config/telegram-desktop/lang.strings" +src = ".config/telegram-desktop/lang.strings" + +[dotfiles."f_tmux.conf"] +dst = "~/.tmux.conf" +src = ".tmux.conf" + +[dotfiles.f_youtube-dl_config] +dst = "~/.config/youtube-dl/config" +src = ".config/youtube-dl/config" + +[dotfiles.d_zathura] +dst = "~/.config/zathura" +src = ".config/zathura" + +[dotfiles.f_zprofile] +dst = "~/.zprofile" +src = ".zprofile" + +[dotfiles.f_zshrc] +dst = "~/.zshrc" +src = ".zshrc" + +[dotfiles.d_zsh] +src = ".config/zsh" +dst = "~/.config/zsh" + +[dotfiles."f_fonts.conf"] +src = ".config/fontconfig/fonts.conf" +dst = "~/.config/fontconfig/fonts.conf" + +[dotfiles.f_ripgrep_ignore] +src = ".ignore" +dst = "~/.ignore" + +[dotfiles."f_ncmpcpp.conf"] +src = ".config/ncmpcpp/config" +dst = "~/.config/ncmpcpp/config" + +[dotfiles.f_hushlogin] +src = ".hushlogin" +dst = "~/.hushlogin" + +[dotfiles."f_paru.conf"] +src = ".config/paru/paru.conf" +dst = "~/.config/paru/paru.conf" + +[dotfiles.f_msmtp_config] +src = ".config/msmtp/config" +dst = "~/.config/msmtp/config" + +[dotfiles."f_foot.ini"] +src = ".config/foot/foot.ini" +dst = "~/.config/foot/foot.ini" + +[dotfiles."f_gpg-agent.conf"] +src = ".gnupg/gpg-agent.conf" +dst = "~/.gnupg/gpg-agent.conf" +chmod = "600" + +[dotfiles."f_gpg.conf"] +src = ".gnupg/gpg.conf" +dst = "~/.gnupg/gpg.conf" + +[dotfiles."f_gpg_scdaemon.conf"] +src = ".gnupg/scdaemon.conf" +dst = "~/.gnupg/scdaemon.conf" + +[dotfiles."f_electron-flags.conf"] +src = ".config/electron-flags.conf" +dst = "~/.config/electron-flags.conf" + +[dotfiles."f_electron12-flags.conf"] +src = ".config/electron12-flags.conf" +dst = "~/.config/electron12-flags.conf" + +[dotfiles.f_pam_environment] +src = ".pam_environment" +dst = "~/.pam_environment" + +[profiles] + +[profiles.base] +dotfiles = ["d_systemd"] + +[profiles.terminal] +dotfiles = [ + "f_hushlogin", + "f_ripgrep_ignore", + "f_ranger_commands.py", + "f_rtv.cfg", + "f_mailcap", + "d_zsh", + "f_zshrc", + "f_tmux.conf", + "f_ranger.conf", + "f_ssh.conf", + "f_authorized_keys", + "f_nvim_init", + "d_nvim_lua", + "d_nvim_ftplugin", + "f_gitconfig", + "f_alacritty.yml", +] + +[profiles.email] +dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] + +[profiles.media] +dotfiles = [ + "f_beets_config", + "f_beets_whitelist", + "f_abcde.conf", + "d_mpv", + "f_youtube-dl_config", + "f_mpd.conf", + "f_ncmpcpp_bindings", + "f_ncmpcpp.conf", + "f_libra_config", + "f_mpdscribble.conf", + "f_mpdris2.conf", +] + +[profiles.sway] +dotfiles = [ + "d_sway", + "d_waybar", + "d_wofi", + "f_mako_config", + "f_redshift.conf", + "d_zathura", + "f_mimeo_associations.txt", + "f_tdesktop_lang.strings", + "f_fonts.conf", + "f_zprofile", + "f_electron-flags.conf", + "f_electron12-flags.conf", +] + +[profiles.pacman] +dotfiles = ["f_makepkg.conf", "f_paru.conf"] + +[profiles.gpg] +dotfiles = [ + "f_gpg-agent.conf", + "f_gpg.conf", + "f_gpg_scdaemon.conf", + "f_pam_environment", +] + +[profiles.Mirkwood] +include = ["base", "terminal", "email", "media", "sway", "pacman", "gpg"] +dotfiles = ["f_paru.conf", "f_gitconfig", "f_foot.ini"] + +[profiles.Moria] +include = ["terminal", "pacman"] +dotfiles = ["f_zprofile"] + +[profiles.Gondor] +include = ["terminal", "pacman"] + +[profiles.mko-laptop] +include = ["terminal", "media", "gpg"] + +[profiles.Edoras] +include = ["terminal", "pacman"] + +[profiles.TakamakiPC] +include = ["terminal", "pacman"] + +[profiles.localhost] +include = ["terminal"] + +[profiles.ViiruJaTeippi] +include = ["terminal"] diff --git a/config.yaml b/config.yaml deleted file mode 100644 index 0a074a16..00000000 --- a/config.yaml +++ /dev/null @@ -1,284 +0,0 @@ -actions: - nvim-packer-sync: nvim +PackerSync -config: - backup: true - banner: true - create: true - dotpath: home - ignoreempty: false - keepdot: true - link_dotfile_default: nolink - link_on_import: nolink - longkey: false - showdiff: false - workdir: ~/.config/dotdrop -dotfiles: - d_systemd: - dst: ~/.config/systemd/user - src: .config/systemd/user - d_mpv: - dst: ~/.config/mpv - src: .config/mpv - d_neomutt: - dst: ~/.config/neomutt - src: .config/neomutt - d_imapnotify: - dst: ~/.config/imapnotify - src: .config/imapnotify - f_nvim_init: - dst: ~/.config/nvim/init.lua - src: .config/nvim/init.lua - d_nvim_lua: - actions: - - nvim-packer-sync - dst: ~/.config/nvim/lua - src: .config/nvim/lua - d_nvim_ftplugin: - dst: ~/.config/nvim/ftplugin - src: .config/nvim/ftplugin - d_sway: - dst: ~/.config/sway - src: .config/sway - d_waybar: - dst: ~/.config/waybar - src: .config/waybar - d_wofi: - src: .config/wofi - dst: ~/.config/wofi - f_abcde.conf: - dst: ~/.abcde.conf - src: .abcde.conf - f_mbsyncrc: - dst: ~/.mbsyncrc - src: .mbsyncrc - f_alacritty.yml: - dst: ~/.config/alacritty/alacritty.yml - src: .config/alacritty/alacritty.yml - f_authorized_keys: - dst: ~/.ssh/authorized_keys - src: .ssh/authorized_keys - f_beets_config: - dst: ~/.config/beets/config.yaml - src: .config/beets/config.yaml - f_beets_whitelist: - dst: ~/.config/beets/whitelist - src: .config/beets/whitelist - f_bspwmrc: - dst: ~/.config/bspwm/bspwmrc - src: .config/bspwm/bspwmrc - f_gitconfig: - dst: ~/.gitconfig - src: .gitconfig - f_libra_config: - dst: ~/.config/libra/config.toml - src: .config/libra/config.toml - f_mailcap: - dst: ~/.mailcap - src: .mailcap - f_makepkg.conf: - dst: ~/.config/pacman/makepkg.conf - src: .config/pacman/makepkg.conf - f_mako_config: - dst: ~/.config/mako/config - src: .config/mako/config - f_mimeo_associations.txt: - dst: ~/.config/mimeo/associations.txt - src: .config/mimeo/associations.txt - f_mpd.conf: - dst: ~/.config/mpd/mpd.conf - src: .config/mpd/mpd.conf - f_mpdris2.conf: - dst: ~/.config/mpDris2/mpDris2.conf - src: .config/mpDris2/mpDris2.conf - f_mpdscribble.conf: - dst: ~/.mpdscribble/mpdscribble.conf - src: .mpdscribble/mpdscribble.conf - f_ncmpcpp_bindings: - dst: ~/.config/ncmpcpp/bindings - src: .config/ncmpcpp/bindings - f_ranger.conf: - dst: ~/.config/ranger/rc.conf - src: .config/ranger/rc.conf - f_ranger_commands.py: - dst: ~/.config/ranger/commands.py - src: .config/ranger/commands.py - f_redshift.conf: - dst: ~/.config/redshift/redshift.conf - src: .config/redshift/redshift.conf - f_rtv.cfg: - dst: ~/.config/rtv/rtv.cfg - src: .config/rtv/rtv.cfg - f_ssh.conf: - dst: ~/.ssh/config - src: .ssh/config - f_steam-native.desktop: - dst: ~/.local/share/applications/steam-native.desktop - src: .local/share/applications/steam-native.desktop - f_tdesktop_lang.strings: - dst: ~/.config/telegram-desktop/lang.strings - src: .config/telegram-desktop/lang.strings - f_tmux.conf: - dst: ~/.tmux.conf - src: .tmux.conf - f_youtube-dl_config: - dst: ~/.config/youtube-dl/config - src: .config/youtube-dl/config - d_zathura: - dst: ~/.config/zathura - src: .config/zathura - f_zprofile: - dst: ~/.zprofile - src: .zprofile - f_zshrc: - dst: ~/.zshrc - src: .zshrc - d_zsh: - src: .config/zsh - dst: ~/.config/zsh - f_fonts.conf: - src: .config/fontconfig/fonts.conf - dst: ~/.config/fontconfig/fonts.conf - f_ripgrep_ignore: - src: .ignore - dst: ~/.ignore - f_ncmpcpp.conf: - src: .config/ncmpcpp/config - dst: ~/.config/ncmpcpp/config - f_hushlogin: - src: .hushlogin - dst: ~/.hushlogin - f_paru.conf: - src: .config/paru/paru.conf - dst: ~/.config/paru/paru.conf - f_msmtp_config: - src: .config/msmtp/config - dst: ~/.config/msmtp/config - f_foot.ini: - src: .config/foot/foot.ini - dst: ~/.config/foot/foot.ini - f_gpg-agent.conf: - src: .gnupg/gpg-agent.conf - dst: ~/.gnupg/gpg-agent.conf - chmod: '600' - f_gpg.conf: - src: .gnupg/gpg.conf - dst: ~/.gnupg/gpg.conf - f_gpg_scdaemon.conf: - src: .gnupg/scdaemon.conf - dst: ~/.gnupg/scdaemon.conf - f_electron-flags.conf: - src: .config/electron-flags.conf - dst: ~/.config/electron-flags.conf - f_electron12-flags.conf: - src: .config/electron12-flags.conf - dst: ~/.config/electron12-flags.conf - f_pam_environment: - src: .pam_environment - dst: ~/.pam_environment -profiles: - base: - dotfiles: - - d_systemd - terminal: - dotfiles: - - f_hushlogin - - f_ripgrep_ignore - - f_ranger_commands.py - - f_rtv.cfg - - f_mailcap - - d_zsh - - f_zshrc - - f_tmux.conf - - f_ranger.conf - - f_ssh.conf - - f_authorized_keys - - f_nvim_init - - d_nvim_lua - - d_nvim_ftplugin - - f_gitconfig - - f_alacritty.yml - email: - dotfiles: - - d_neomutt - - d_imapnotify - - f_mbsyncrc - - f_msmtp_config - media: - dotfiles: - - f_beets_config - - f_beets_whitelist - - f_abcde.conf - - d_mpv - - f_youtube-dl_config - - f_mpd.conf - - f_ncmpcpp_bindings - - f_ncmpcpp.conf - - f_libra_config - - f_mpdscribble.conf - - f_mpdris2.conf - sway: - dotfiles: - - d_sway - - d_waybar - - d_wofi - - f_mako_config - - f_redshift.conf - - d_zathura - - f_mimeo_associations.txt - - f_tdesktop_lang.strings - - f_fonts.conf - - f_zprofile - - f_electron-flags.conf - - f_electron12-flags.conf - pacman: - dotfiles: - - f_makepkg.conf - - f_paru.conf - gpg: - dotfiles: - - f_gpg-agent.conf - - f_gpg.conf - - f_gpg_scdaemon.conf - - f_pam_environment - Mirkwood: - include: - - base - - terminal - - email - - media - - sway - - pacman - - gpg - dotfiles: - - f_paru.conf - - f_gitconfig - - f_foot.ini - Moria: - include: - - terminal - - pacman - dotfiles: - - f_zprofile - Gondor: - include: - - terminal - - pacman - mko-laptop: - include: - - terminal - - media - - gpg - Edoras: - include: - - terminal - - pacman - TakamakiPC: - include: - - terminal - - pacman - localhost: - include: - - terminal - ViiruJaTeippi: - include: - - terminal diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 055a91e9..6f0f8527 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -130,8 +130,8 @@ cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } -dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop.sh $@ } -sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-root.yaml $@ } +dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config.toml $@ } +sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ } compdef _dotdrop-completion.zsh sdotdrop alias dotgit='git -C $DOTREPO' dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } From 2d993d6fbd61335c64b14a93cca7f37e8372f054 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Jun 2022 22:34:35 +0300 Subject: [PATCH 1137/2667] Small changes to nextcloud setup --- docker/nextcloud/docker-compose.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 57e11e8d..556457fd 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -7,7 +7,7 @@ restart = "unless-stopped" networks = ["nextcloud", "proxy"] volumes = [ "./nginx.conf:/etc/nginx/nginx.conf", - "/docker/nextcloud:/var/www/html:ro", + "/docker/nextcloud:/var/www/html:z", ] depends_on = ["nextcloud"] labels = [ @@ -18,7 +18,7 @@ labels = [ "traefik.http.routers.nextcloud.entrypoints=https", "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)", "traefik.http.routers.nextcloud.service=nextcloud", - "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-dav@file,compress@file", + "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-dav@file,nextcloud-webfinger@file,compress@file", "traefik.docker.network=proxy", "traefik.http.services.nextcloud.loadbalancer.server.port=80", ] @@ -30,7 +30,7 @@ restart = "unless-stopped" user = "33:33" networks = ["nextcloud", "postgres", "proxy"] volumes = [ - "/docker/nextcloud:/var/www/html", + "/docker/nextcloud:/var/www/html:z", "/mnt/Storage/Nextcloud:/var/www/html/data", "/mnt/Storage/Syncthing:/Syncthing", "/mnt/Storage/Media/Music:/Music", From 4f67d03bee18ec5df6110e3068547ac432d309ba Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Jun 2022 22:34:35 +0300 Subject: [PATCH 1138/2667] Small changes to nextcloud setup --- docker/nextcloud/docker-compose.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 57e11e8d..556457fd 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -7,7 +7,7 @@ restart = "unless-stopped" networks = ["nextcloud", "proxy"] volumes = [ "./nginx.conf:/etc/nginx/nginx.conf", - "/docker/nextcloud:/var/www/html:ro", + "/docker/nextcloud:/var/www/html:z", ] depends_on = ["nextcloud"] labels = [ @@ -18,7 +18,7 @@ labels = [ "traefik.http.routers.nextcloud.entrypoints=https", "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)", "traefik.http.routers.nextcloud.service=nextcloud", - "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-dav@file,compress@file", + "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-dav@file,nextcloud-webfinger@file,compress@file", "traefik.docker.network=proxy", "traefik.http.services.nextcloud.loadbalancer.server.port=80", ] @@ -30,7 +30,7 @@ restart = "unless-stopped" user = "33:33" networks = ["nextcloud", "postgres", "proxy"] volumes = [ - "/docker/nextcloud:/var/www/html", + "/docker/nextcloud:/var/www/html:z", "/mnt/Storage/Nextcloud:/var/www/html/data", "/mnt/Storage/Syncthing:/Syncthing", "/mnt/Storage/Media/Music:/Music", From b7afca77a33777c052f21b9f292e44a235fbe1f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Jun 2022 10:29:43 +0300 Subject: [PATCH 1139/2667] Git: add sync alias --- home/.gitconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.gitconfig b/home/.gitconfig index 1794bddd..9d1e83fe 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -39,6 +39,7 @@ [alias] mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 upstream = !git push -u origin HEAD + sync = !git pull && git push [color] pager = no From 9cdd87fbd3520d50b44dad6acd43276a8cb9c571 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Jun 2022 10:29:43 +0300 Subject: [PATCH 1140/2667] Git: add sync alias --- home/.gitconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.gitconfig b/home/.gitconfig index 1794bddd..9d1e83fe 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -39,6 +39,7 @@ [alias] mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 upstream = !git push -u origin HEAD + sync = !git pull && git push [color] pager = no From 1d0c066aeb2398e5cbfbbb466e27e7852b6f8515 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Jun 2022 20:17:56 +0300 Subject: [PATCH 1141/2667] Use gitea-asciidoc image --- docker/gitea/Dockerfile | 3 --- docker/gitea/docker-compose.toml | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 docker/gitea/Dockerfile diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile deleted file mode 100644 index c97f79bf..00000000 --- a/docker/gitea/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM gitea/gitea:1 - -RUN apk --no-cache add asciidoctor diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml index a83b2a08..775ede6c 100644 --- a/docker/gitea/docker-compose.toml +++ b/docker/gitea/docker-compose.toml @@ -1,8 +1,8 @@ [services] [services.gitea] +image = "functionalhacker/gitea-asciidoc" container_name = "gitea" -build = "." environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] restart = "unless-stopped" networks = ["postgres", "proxy"] From a9ae55911557901b7ec0ec50513ce0d0c5b8cd1e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Jun 2022 20:17:56 +0300 Subject: [PATCH 1142/2667] Use gitea-asciidoc image --- docker/gitea/Dockerfile | 3 --- docker/gitea/docker-compose.toml | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 docker/gitea/Dockerfile diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile deleted file mode 100644 index c97f79bf..00000000 --- a/docker/gitea/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM gitea/gitea:1 - -RUN apk --no-cache add asciidoctor diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml index a83b2a08..775ede6c 100644 --- a/docker/gitea/docker-compose.toml +++ b/docker/gitea/docker-compose.toml @@ -1,8 +1,8 @@ [services] [services.gitea] +image = "functionalhacker/gitea-asciidoc" container_name = "gitea" -build = "." environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] restart = "unless-stopped" networks = ["postgres", "proxy"] From 8b90cc8cd3cd91fd80512a24b8a3c037a0fe7222 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jun 2022 19:13:05 +0300 Subject: [PATCH 1143/2667] Testing mirror --- testfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 testfile diff --git a/testfile b/testfile new file mode 100644 index 00000000..e69de29b From 772b9510cc640b87da5bf2eb1a44acc4cfae042e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jun 2022 19:13:05 +0300 Subject: [PATCH 1144/2667] Testing mirror --- testfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 testfile diff --git a/testfile b/testfile new file mode 100644 index 00000000..e69de29b From eb3639f0bad5f5d71a8c1acb0dacdc5c46df410f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jun 2022 19:14:35 +0300 Subject: [PATCH 1145/2667] Revert "Testing mirror" This reverts commit e548bde25ba24d348c3bf3157ea7078359ad4c8d. --- testfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 testfile diff --git a/testfile b/testfile deleted file mode 100644 index e69de29b..00000000 From b42171c2c2beb55dd955a5ea4c32572018e8d8d8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jun 2022 19:14:35 +0300 Subject: [PATCH 1146/2667] Revert "Testing mirror" This reverts commit e548bde25ba24d348c3bf3157ea7078359ad4c8d. --- testfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 testfile diff --git a/testfile b/testfile deleted file mode 100644 index e69de29b..00000000 From 330c757cdd52b27b0c776275e28abddc80befc50 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jun 2022 19:58:15 +0300 Subject: [PATCH 1147/2667] Update information about mirrors --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index b799eb1e..993928bf 100644 --- a/README.adoc +++ b/README.adoc @@ -20,5 +20,5 @@ but it is also mirrored to: * https://codeberg.org/FunctionalHacker/dotfiles[codeberg] If you have any ideas for improvements, questions or anything of this -sort, you can open an issue or a pull request in either my git server +sort, you can open an issue or a pull request at my git server (registrations open for anyone), or any of the mirrors. From dc353672e4543d8c19011ce855d67828c8b13d88 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jun 2022 19:58:15 +0300 Subject: [PATCH 1148/2667] Update information about mirrors --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index b799eb1e..993928bf 100644 --- a/README.adoc +++ b/README.adoc @@ -20,5 +20,5 @@ but it is also mirrored to: * https://codeberg.org/FunctionalHacker/dotfiles[codeberg] If you have any ideas for improvements, questions or anything of this -sort, you can open an issue or a pull request in either my git server +sort, you can open an issue or a pull request at my git server (registrations open for anyone), or any of the mirrors. From e8882ff92b49120c8e2e8fd5490c648fddb173ff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jun 2022 23:33:21 +0300 Subject: [PATCH 1149/2667] Git: change init default branch name to main --- home/.gitconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.gitconfig b/home/.gitconfig index 9d1e83fe..fee6329b 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -43,3 +43,6 @@ [color] pager = no + +[init] + defaultBranch = main From a8a86778c4aaf3835cd5cb5eb20c501c13013ff1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jun 2022 23:33:21 +0300 Subject: [PATCH 1150/2667] Git: change init default branch name to main --- home/.gitconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.gitconfig b/home/.gitconfig index 9d1e83fe..fee6329b 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -43,3 +43,6 @@ [color] pager = no + +[init] + defaultBranch = main From 7b324f56fe78ae5130294e10c3ae25f00eb1a741 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Jun 2022 18:27:37 +0300 Subject: [PATCH 1151/2667] Zathura: remove deprecated option smooth-scroll --- home/.config/zathura/zathurarc | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.config/zathura/zathurarc b/home/.config/zathura/zathurarc index c521644f..c5ed9997 100644 --- a/home/.config/zathura/zathurarc +++ b/home/.config/zathura/zathurarc @@ -1,4 +1,3 @@ -set smooth-scroll true set window-title-home-tilde true set statusbar-basename true set selection-clipboard clipboard From a1bbcd7da19fb08b257f86ae4cc1bd6d758f0754 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Jun 2022 18:27:37 +0300 Subject: [PATCH 1152/2667] Zathura: remove deprecated option smooth-scroll --- home/.config/zathura/zathurarc | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.config/zathura/zathurarc b/home/.config/zathura/zathurarc index c521644f..c5ed9997 100644 --- a/home/.config/zathura/zathurarc +++ b/home/.config/zathura/zathurarc @@ -1,4 +1,3 @@ -set smooth-scroll true set window-title-home-tilde true set statusbar-basename true set selection-clipboard clipboard From e42ec34bc66b9bac17d0321a27310c6df0740367 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Jun 2022 10:03:37 +0300 Subject: [PATCH 1153/2667] Switch back to stable jellyfin image --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 48eb74dc..0eb2e291 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -1,7 +1,7 @@ [services] [services.jellyfin] -image = "jellyfin/jellyfin:10.8.0-beta3" +image = "jellyfin/jellyfin" container_name = "jellyfin" environment = ["TZ=Europe/Helsinki"] ports = ["8096:8096"] From 7e8e8d4a4d66dbb2e48de5182cd640f6fd864057 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Jun 2022 10:03:37 +0300 Subject: [PATCH 1154/2667] Switch back to stable jellyfin image --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 48eb74dc..0eb2e291 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -1,7 +1,7 @@ [services] [services.jellyfin] -image = "jellyfin/jellyfin:10.8.0-beta3" +image = "jellyfin/jellyfin" container_name = "jellyfin" environment = ["TZ=Europe/Helsinki"] ports = ["8096:8096"] From 741186b4249e47d575d7848b3214810ea8cb3bc6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Jun 2022 09:07:26 +0300 Subject: [PATCH 1155/2667] Use $EDITOR instead of $PAGER for $AUR_PAGER (fixes some issues) --- home/.config/zsh/01-env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 6371d80b..26b1c1eb 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -53,7 +53,7 @@ export EDITOR=nvim export PAGER="$EDITOR -R +\"lua require 'pager'\"" export GIT_PAGER="$EDITOR -R +\"lua require 'pager'\"" export PARU_PAGER="$PAGER -c 'set ft=PKGBUILD'" -export AUR_PAGER=$PAGER +export AUR_PAGER=$EDITOR export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR export SYSTEMD_PAGER=less From 12215b5c0f97dfe06c9973f318c4089db361d4d1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Jun 2022 09:07:26 +0300 Subject: [PATCH 1156/2667] Use $EDITOR instead of $PAGER for $AUR_PAGER (fixes some issues) --- home/.config/zsh/01-env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 6371d80b..26b1c1eb 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -53,7 +53,7 @@ export EDITOR=nvim export PAGER="$EDITOR -R +\"lua require 'pager'\"" export GIT_PAGER="$EDITOR -R +\"lua require 'pager'\"" export PARU_PAGER="$PAGER -c 'set ft=PKGBUILD'" -export AUR_PAGER=$PAGER +export AUR_PAGER=$EDITOR export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR export SYSTEMD_PAGER=less From e2d17d276602e38c6d7bae7c497b30a2a1e9d7ab Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 30 Jun 2022 19:19:21 +0300 Subject: [PATCH 1157/2667] Update alias: remove all unused images, not just dangling ones --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 6f0f8527..7e9f1829 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -145,7 +145,7 @@ update() { {%@@ if profile == "Moria" @@%} repo docker-update - docker system prune --volumes + docker system prune --volumes -a {%@@ endif @@%} plugins } From 4275764c80dfd49ab0b930c3541f65b4fcd4d4b7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 30 Jun 2022 19:19:21 +0300 Subject: [PATCH 1158/2667] Update alias: remove all unused images, not just dangling ones --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 6f0f8527..7e9f1829 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -145,7 +145,7 @@ update() { {%@@ if profile == "Moria" @@%} repo docker-update - docker system prune --volumes + docker system prune --volumes -a {%@@ endif @@%} plugins } From 56d45cedaf89b4cbe002d4fc8ae2376c8f2f4606 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Jul 2022 22:37:35 +0300 Subject: [PATCH 1159/2667] Remove node-red --- docker/homeautomation/docker-compose.toml | 25 ----------------------- 1 file changed, 25 deletions(-) diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 7051edca..d85f6200 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -58,31 +58,6 @@ restart = "unless-stopped" depends_on = ["home-assistant"] devices = ["/dev/snd:/dev/snd"] -[services.node-red] -container_name = "node-red" -image = "nodered/node-red" -environment = ["TZ=Europe/Helsinki", "proxy"] -ports = ["1880:1880"] -networks = ["homeautomation", "proxy"] -volumes = [ - "/docker/homeautomation/node-red:/data", - "/etc/localtime:/etc/localtime:ro", -] -restart = "unless-stopped" -depends_on = ["home-assistant"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.node-red-redirect.entrypoints=http", - "traefik.http.routers.node-red-redirect.rule=Host(`node.korhonen.cc`)", - "traefik.http.routers.node-red-redirect.middlewares=http2https@file", - "traefik.http.routers.node-red.entrypoints=https", - "traefik.http.routers.node-red.rule=Host(`node.korhonen.cc`)", - "traefik.http.routers.node-red.middlewares=secHeaders@file", - "traefik.http.routers.node-red.service=node-red", - "traefik.http.services.node-red.loadbalancer.server.port=1880", -] - [networks] [networks.homeautomation] From 9264b9c3ef9c8468c7246433a4d1a2f02c5f2ee1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Jul 2022 22:37:35 +0300 Subject: [PATCH 1160/2667] Remove node-red --- docker/homeautomation/docker-compose.toml | 25 ----------------------- 1 file changed, 25 deletions(-) diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 7051edca..d85f6200 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -58,31 +58,6 @@ restart = "unless-stopped" depends_on = ["home-assistant"] devices = ["/dev/snd:/dev/snd"] -[services.node-red] -container_name = "node-red" -image = "nodered/node-red" -environment = ["TZ=Europe/Helsinki", "proxy"] -ports = ["1880:1880"] -networks = ["homeautomation", "proxy"] -volumes = [ - "/docker/homeautomation/node-red:/data", - "/etc/localtime:/etc/localtime:ro", -] -restart = "unless-stopped" -depends_on = ["home-assistant"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.node-red-redirect.entrypoints=http", - "traefik.http.routers.node-red-redirect.rule=Host(`node.korhonen.cc`)", - "traefik.http.routers.node-red-redirect.middlewares=http2https@file", - "traefik.http.routers.node-red.entrypoints=https", - "traefik.http.routers.node-red.rule=Host(`node.korhonen.cc`)", - "traefik.http.routers.node-red.middlewares=secHeaders@file", - "traefik.http.routers.node-red.service=node-red", - "traefik.http.services.node-red.loadbalancer.server.port=1880", -] - [networks] [networks.homeautomation] From 5a7fc0f8a6efcc28ff3d54885f04cc2606e8f032 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Jul 2022 22:37:56 +0300 Subject: [PATCH 1161/2667] Delete some old unneeded files, minor fixes to other files --- config.toml | 2 +- home/.config/mpv/mpv.conf | 12 +- home/.config/mvi/input.conf | 99 -- home/.config/mvi/mpv.conf | 46 - .../.config/mvi/script-opts/image_viewer.conf | 78 -- home/.config/mvi/scripts/image-viewer.lua | 953 ------------------ 6 files changed, 8 insertions(+), 1182 deletions(-) delete mode 100644 home/.config/mvi/input.conf delete mode 100644 home/.config/mvi/mpv.conf delete mode 100644 home/.config/mvi/script-opts/image_viewer.conf delete mode 100644 home/.config/mvi/scripts/image-viewer.lua diff --git a/config.toml b/config.toml index 9b22bccf..0f85192c 100644 --- a/config.toml +++ b/config.toml @@ -305,7 +305,7 @@ include = ["base", "terminal", "email", "media", "sway", "pacman", "gpg"] dotfiles = ["f_paru.conf", "f_gitconfig", "f_foot.ini"] [profiles.Moria] -include = ["terminal", "pacman"] +include = ["terminal", "pacman", "media"] dotfiles = ["f_zprofile"] [profiles.Gondor] diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index cc7cefba..a088b56d 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -7,11 +7,9 @@ vo=gpu hwdec=vaapi hwdec-codecs=all -{%@@ if profile == "Mirkwood" @@%} +{%@@ if profile == "Mirkwood" or profile == "Moria" @@%} gpu-context=wayland -{%@@ endif @@%} - -{%@@ if profile == "mko-laptop" @@%} +{%@@ elif profile == "mko-laptop" @@%} script=~/.lib/mpris.so {%@@ endif @@%} @@ -29,8 +27,12 @@ replaygain=track # Start ipc server input-ipc-server=/tmp/mpvsocket -# set youtube-dl max res to 1080 +# set youtube-dl max res +{%@@ if profile == "Moria" @@%} +ytdl-format=bestvideo[height<=2160]+bestaudio/best[height<=2160] +{%@@ else @@%} ytdl-format=bestvideo[height<=1080]+bestaudio/best[height<=1080] +{%@@ endif @@%} # continue watching save-position-on-quit diff --git a/home/.config/mvi/input.conf b/home/.config/mvi/input.conf deleted file mode 100644 index 416eb1c2..00000000 --- a/home/.config/mvi/input.conf +++ /dev/null @@ -1,99 +0,0 @@ -SPACE repeatable playlist-next -alt+SPACE repeatable playlist-prev - -UP ignore -DOWN ignore -LEFT repeatable playlist-prev -RIGHT repeatable playlist-next - -# simple reminder of default bindings -#1 add contrast -1 -#2 add contrast 1 -#3 add brightness -1 -#4 add brightness 1 -#5 add gamma -1 -#6 add gamma 1 -#7 add saturation -1 -#8 add saturation 1 - -# mouse-centric bindings -MBTN_RIGHT script-binding image_viewer/drag-to-pan -MBTN_LEFT script-binding image_viewer/pan-follows-cursor -WHEEL_UP script-message cursor-centric-zoom 0.1 -WHEEL_DOWN script-message cursor-centric-zoom -0.1 - -# panning with the keyboard: -# pan-image takes the following arguments -# pan-image AXIS AMOUNT ZOOM_INVARIANT IMAGE_CONSTRAINED -# ^ ^ ^ -# x or y | | -# | | -# if yes, will pan by the same if yes, stops panning if the image -# amount regardless of zoom would go outside of the window - -ctrl+down repeatable script-message pan-image y -0.1 yes yes -ctrl+up repeatable script-message pan-image y +0.1 yes yes -ctrl+right repeatable script-message pan-image x -0.1 yes yes -ctrl+left repeatable script-message pan-image x +0.1 yes yes - -# now with more precision -alt+down repeatable script-message pan-image y -0.01 yes yes -alt+up repeatable script-message pan-image y +0.01 yes yes -alt+right repeatable script-message pan-image x -0.01 yes yes -alt+left repeatable script-message pan-image x +0.01 yes yes - -# replace at will with h,j,k,l if you prefer vim-style bindings - -# on a trackpad you may want to use these -#WHEEL_UP repeatable script-message pan-image y -0.02 yes yes -#WHEEL_DOWN repeatable script-message pan-image y +0.02 yes yes -#WHEEL_LEFT repeatable script-message pan-image x -0.02 yes yes -#WHEEL_RIGHT repeatable script-message pan-image x +0.02 yes yes - -# align the border of the image to the border of the window -# align-border takes the following arguments: -# align-border ALIGN_X ALIGN_Y -# any value for ALIGN_* is accepted, -1 and 1 map to the border of the window -ctrl+shift+right script-message align-border -1 "" -ctrl+shift+left script-message align-border 1 "" -ctrl+shift+down script-message align-border "" -1 -ctrl+shift+up script-message align-border "" 1 - -# reset the image -ctrl+0 no-osd set video-pan-x 0; no-osd set video-pan-y 0; no-osd set video-zoom 0 - -+ add video-zoom 0.5 -- add video-zoom -0.5; script-message reset-pan-if-visible -= no-osd set video-zoom 0; script-message reset-pan-if-visible - -# sxiv compatibility -w no-osd set video-unscaled yes; keypress = -e no-osd set video-unscaled no; keypress = - -h no-osd vf toggle hflip; show-text "Horizontal flip" -v no-osd vf toggle vflip; show-text "Vertical flip" - -r script-message rotate-video 90; show-text "Clockwise rotation" -R script-message rotate-video -90; show-text "Counter-clockwise rotation" -alt+r no-osd set video-rotate 0; show-text "Reset rotation" - -d script-message ruler - -# Toggling between pixel-exact reproduction and interpolation -a cycle-values scale nearest ewa_lanczossharp - -# Toggle color management on or off -c cycle icc-profile-auto - -# Screenshot of the window output -S screenshot window - -# Toggle aspect ratio information on and off -A cycle-values video-aspect "-1" "no" - -p script-message force-print-filename - -# ADVANCED: you can define bindings that belong to a "section" (named "image-viewer" here) like so: -#alt+SPACE {image-viewer} repeatable playlist-prev -#SPACE {image-viewer} repeatable playlist-next -# to load them conditionally with a command. See scripts-opts/image_viewer.conf for how you can do this diff --git a/home/.config/mvi/mpv.conf b/home/.config/mvi/mpv.conf deleted file mode 100644 index 5c5dcfbb..00000000 --- a/home/.config/mvi/mpv.conf +++ /dev/null @@ -1,46 +0,0 @@ -## IMAGE -# classic opengl-hq parameter, change at will -scale=spline36 -cscale=spline36 -dscale=mitchell -dither-depth=auto -correct-downscaling -sigmoid-upscaling -# debanding seems rarely useful with images -#deband - -## MISC -mute=yes -# the osc is mostly useful for videos -osc=no -# don't try to autoload subtitles or audio files -sub-auto=no -audio-file-auto=no -# get rid of the useless V: 00:00:00 / 00:00:00 line -term-status-msg= - -# replace mpv with mvi in the window title -title="${?media-title:${media-title}}${!media-title:No file} - mvi" - -# don't slideshow by default -image-display-duration=inf -# loop files in case of webms or gifs -loop-file=inf -# and loop the whole playlist -loop-playlist=inf - -# you need this if you plan to use drag-to-pan or pan-follows-cursor with MOUSE_LEFT -window-dragging=no - -#according to haasn, aspect ratio info for PNG and JPG is "universally bust" -[extension.png] -video-aspect=no - -[extension.jpg] -video-aspect=no - -[extension.jpeg] -profile=extension.jpg - -[silent] -msg-level=all=no diff --git a/home/.config/mvi/script-opts/image_viewer.conf b/home/.config/mvi/script-opts/image_viewer.conf deleted file mode 100644 index 4fe886fa..00000000 --- a/home/.config/mvi/script-opts/image_viewer.conf +++ /dev/null @@ -1,78 +0,0 @@ -## MISC -# size of the margins with pan-follows-cursor -pan_follows_cursor_margin=50 -# whether pan-follows-cursor should pan when the entire image is visible -pan_follows_cursor_move_if_full_view=no - -## STATUS LINE -# whether to show a status line -status_line_enabled=yes -# its position, possible values: (bottom|top)_(left|right) -status_line_position=bottom_left -# its font size -status_line_size=36 -# the text to be expanded -# see property expansion: https://mpv.io/manual/master/#property-expansion -# \N can be used for line breaks -# you can also use ass tags, see here: http://docs.aegisub.org/3.2/ASS_Tags/ -status_line=${filename} [${playlist-pos-1}/${playlist-count}] - -## MINIMAP -# whether to show a minimap -minimap_enabled=yes -# the position of the center of the minimap, in percentage of the window (x, y) -minimap_center=92,92 -# the scale of the minimap (i.e. the view rectangle is scale / 100 times the size of the window) -minimap_scale=12 -# the cutoff size of the minimap (i.e. the image rectangle is clipped if it falls outside of the this zone) -minimap_max_size=16,16 -# opacity of the "image" (from 00=opaque to FF=transparent) -minimap_image_opacity=88 -# color of the "image" (#BBGGRR where each component rages from 00 to FF) -minimap_image_color=BBBBBB -# opacity of the "view" -minimap_view_opacity=BB -minimap_view_color=222222 -# whether the view should be drawn above the image -minimap_view_above_image=yes -# whether to show the minimap if the current image is fully visible -minimap_hide_when_full_image_in_view=yes - -## RULER -# whether to show the length of the lines between the two points -ruler_show_distance=yes -# whether to show the coordinates of the two points -ruler_show_coordinates=yes -# the coordinate space of the text shown. Can be "image", "window", "both" -ruler_coordinates_space=image -# can be "degrees", "radians", "both", or "no" -ruler_show_angles=degrees -ruler_line_width=2 -ruler_dots_radius=3 -ruler_font_size=36 -# ranges from 00 (black) to FF (white) -ruler_line_color=33 -# bindings used to set points. The binding to trigger ruler mode can also be used. Comma-separated list -ruler_confirm_bindings=MBTN_LEFT,ENTER -# bindings used to set points. The binding to trigger ruler mode can also be used. Comma-separated list -ruler_exit_bindings=ESC -# if yes, the first point will be immediately set at the cursor position when calling 'ruler' -ruler_set_first_point_on_begin=no -# if yes, the ruler overlay will be immediately cleared when setting the second point -ruler_clear_on_second_point_set=no - -## HOOKS -# commands to execute when a file detected as an image (1 frame, no audio) is loaded or unloaded -# an image was loaded, and the previous file was not an image (or there was no previous file) -command_on_first_image_loaded= -# an image was loaded (regardless of what the previous file was) -command_on_image_loaded= -# a non-image was loaded, and the previous file was an image -command_on_non_image_loaded= -# the purpose of these "hooks" is to let you change bindings, profiles, reset properties... -# see https://mpv.io/manual/master/#list-of-input-commands for general command information -# note that there is no such thing as "unloading a profile", to emulate this you must create an opposite profile and load that -# example possible values: -#command_on_first_image_loaded=apply-profile image; enable-section image-viewer; script-message enable-status-line -#command_on_image_loaded=no-osd set video-pan-x 0; script-message align-border "" -1 -#command_on_non_image_loaded=disable-section image-viewer; no-osd set video-pan-x 0; no-osd set video-pan-y 0; no-osd set video-zoom 0; script-message disable-status-line diff --git a/home/.config/mvi/scripts/image-viewer.lua b/home/.config/mvi/scripts/image-viewer.lua deleted file mode 100644 index 9e1ec11b..00000000 --- a/home/.config/mvi/scripts/image-viewer.lua +++ /dev/null @@ -1,953 +0,0 @@ -local opts = { - pan_follows_cursor_margin = 50, - pan_follows_cursor_move_if_full_view = false, - - status_line_enabled = false, - status_line_position = "bottom_left", - status_line_size = 36, - status_line = "${filename} [${playlist-pos-1}/${playlist-count}]", - - minimap_enabled = true, - minimap_center = "92,92", - minimap_scale = 12, - minimap_max_size = "16,16", - minimap_image_opacity = "88", - minimap_image_color = "BBBBBB", - minimap_view_opacity = "BB", - minimap_view_color = "222222", - minimap_view_above_image = true, - minimap_hide_when_full_image_in_view = true, - - ruler_show_distance=true, - ruler_show_coordinates=true, - ruler_coordinates_space="both", - ruler_show_angles="degrees", - ruler_line_width=2, - ruler_dots_radius=3, - ruler_font_size=36, - ruler_line_color="33", - ruler_confirm_bindings="MBTN_LEFT,ENTER", - ruler_exit_bindings="ESC", - ruler_set_first_point_on_begin=false, - ruler_clear_on_second_point_set=false, - - command_on_first_image_loaded="", - command_on_image_loaded="", - command_on_non_image_loaded="", -} -(require 'mp.options').read_options(opts) -function split(input) - local ret = {} - for str in string.gmatch(input, "([^,]+)") do - ret[#ret + 1] = str - end - return ret -end -function str_to_num(array) - local ret = {} - for _, v in ipairs(array) do - ret[#ret + 1] = tonumber(v) - end - return ret -end -opts.minimap_center=str_to_num(split(opts.minimap_center)) -opts.minimap_max_size=str_to_num(split(opts.minimap_max_size)) -opts.ruler_confirm_bindings=split(opts.ruler_confirm_bindings) -opts.ruler_exit_bindings=split(opts.ruler_exit_bindings) - -function clamp(value, low, high) - if value <= low then - return low - elseif value >= high then - return high - else - return value - end -end - -local msg = require 'mp.msg' -local assdraw = require 'mp.assdraw' - -local ass = { -- shared ass state - status_line = "", - minimap = "", - ruler = "", -} - -local cleanup = nil -- function set up by drag-to-pan/pan-follows cursor and must be called to clean lingering state -local mouse_move_callbacks = {} -- functions that are called when mouse_move is triggered -function add_mouse_move_callback(key, func) - if #mouse_move_callbacks == 0 then - mp.add_forced_key_binding("mouse_move", "image-viewer-internal", function() - for _, func in pairs(mouse_move_callbacks) do - func() - end - end) - end - mouse_move_callbacks[key] = func -end -function remove_mouse_move_callback(key) - mouse_move_callbacks[key] = nil - for _,_ in pairs(mouse_move_callbacks) do - return - end - mp.remove_key_binding("image-viewer-internal") -end - -video_dimensions_stale = true -function get_video_dimensions() - -- this function is very much ripped from video/out/aspect.c in mpv's source - if not video_dimensions_stale then return _video_dimensions end - local video_params = mp.get_property_native("video-out-params") - if not video_params then - _video_dimensions = nil - return nil - end - if not _timestamp then _timestamp = 0 end - _timestamp = _timestamp + 1 - _video_dimensions = { - timestamp = _timestamp, - top_left = {x = 0, y = 0}, - bottom_right = {x = 0, y = 0}, - size = {w = 0, h = 0}, - ratios = {w = 0, h = 0}, -- by how much the original video got scaled - } - local keep_aspect = mp.get_property_bool("keepaspect") - local w = video_params["w"] - local h = video_params["h"] - local dw = video_params["dw"] - local dh = video_params["dh"] - if mp.get_property_number("video-rotate") % 180 == 90 then - w, h = h,w - dw, dh = dh, dw - end - local window_w, window_h = mp.get_osd_size() - - if keep_aspect then - local unscaled = mp.get_property_native("video-unscaled") - local panscan = mp.get_property_number("panscan") - - local fwidth = window_w - local fheight = math.floor(window_w / dw * dh) - if fheight > window_h or fheight < h then - local tmpw = math.floor(window_h / dh * dw) - if tmpw <= window_w then - fheight = window_h - fwidth = tmpw - end - end - local vo_panscan_area = window_h - fheight - local f_w = fwidth / fheight - local f_h = 1 - if vo_panscan_area == 0 then - vo_panscan_area = window_h - fwidth - f_w = 1 - f_h = fheight / fwidth - end - if unscaled or unscaled == "downscale-big" then - vo_panscan_area = 0 - if unscaled or (dw <= window_w and dh <= window_h) then - fwidth = dw - fheight = dh - end - end - - local scaled_width = fwidth + math.floor(vo_panscan_area * panscan * f_w) - local scaled_height = fheight + math.floor(vo_panscan_area * panscan * f_h) - - local split_scaling = function (dst_size, scaled_src_size, zoom, align, pan) - scaled_src_size = math.floor(scaled_src_size * 2 ^ zoom) - align = (align + 1) / 2 - local dst_start = math.floor((dst_size - scaled_src_size) * align + pan * scaled_src_size) - if dst_start < 0 then - --account for C int cast truncating as opposed to flooring - dst_start = dst_start + 1 - end - local dst_end = dst_start + scaled_src_size; - if dst_start >= dst_end then - dst_start = 0 - dst_end = 1 - end - return dst_start, dst_end - end - local zoom = mp.get_property_number("video-zoom") - - local align_x = mp.get_property_number("video-align-x") - local pan_x = mp.get_property_number("video-pan-x") - _video_dimensions.top_left.x, _video_dimensions.bottom_right.x = split_scaling(window_w, scaled_width, zoom, align_x, pan_x) - - local align_y = mp.get_property_number("video-align-y") - local pan_y = mp.get_property_number("video-pan-y") - _video_dimensions.top_left.y, _video_dimensions.bottom_right.y = split_scaling(window_h, scaled_height, zoom, align_y, pan_y) - else - _video_dimensions.top_left.x = 0 - _video_dimensions.bottom_right.x = window_w - _video_dimensions.top_left.y = 0 - _video_dimensions.bottom_right.y = window_h - end - _video_dimensions.size.w = _video_dimensions.bottom_right.x - _video_dimensions.top_left.x - _video_dimensions.size.h = _video_dimensions.bottom_right.y - _video_dimensions.top_left.y - _video_dimensions.ratios.w = _video_dimensions.size.w / w - _video_dimensions.ratios.h = _video_dimensions.size.h / h - video_dimensions_stale = false - return _video_dimensions -end - -for _, p in ipairs({ - "keepaspect", - "video-out-params", - "video-unscaled", - "panscan", - "video-zoom", - "video-align-x", - "video-pan-x", - "video-align-y", - "video-pan-y", - "osd-width", - "osd-height", -}) do - mp.observe_property(p, "native", function() video_dimensions_stale = true end) -end - -function drag_to_pan_handler(table) - if cleanup then - cleanup() - cleanup = nil - end - if table["event"] == "down" then - local video_dimensions = get_video_dimensions() - if not video_dimensions then return end - local mouse_pos_origin, video_pan_origin = {}, {} - local moved = false - mouse_pos_origin.x, mouse_pos_origin.y = mp.get_mouse_pos() - video_pan_origin.x = mp.get_property("video-pan-x") - video_pan_origin.y = mp.get_property("video-pan-y") - local idle = function() - if moved then - local mX, mY = mp.get_mouse_pos() - local pX = video_pan_origin.x + (mX - mouse_pos_origin.x) / video_dimensions.size.w - local pY = video_pan_origin.y + (mY - mouse_pos_origin.y) / video_dimensions.size.h - mp.command("no-osd set video-pan-x " .. clamp(pX, -3, 3) .. "; no-osd set video-pan-y " .. clamp(pY, -3, 3)) - moved = false - end - end - mp.register_idle(idle) - add_mouse_move_callback("drag-to-pan", function() moved = true end) - cleanup = function() - remove_mouse_move_callback("drag-to-pan") - mp.unregister_idle(idle) - end - end -end - -function pan_follows_cursor_handler(table) - if cleanup then - cleanup() - cleanup = nil - end - if table["event"] == "down" then - local video_dimensions = get_video_dimensions() - if not video_dimensions then return end - local window_w, window_h = mp.get_osd_size() - local moved = true - local idle = function() - if moved then - local mX, mY = mp.get_mouse_pos() - local x = math.min(1, math.max(- 2 * mX / window_w + 1, -1)) - local y = math.min(1, math.max(- 2 * mY / window_h + 1, -1)) - local command = "" - local margin, move_full = opts.pan_follows_cursor_margin, opts.pan_follows_cursor_move_if_full_view - if (not move_full and window_w < video_dimensions.size.w) then - command = command .. "no-osd set video-pan-x " .. clamp(x * (video_dimensions.size.w - window_w + 2 * margin) / (2 * video_dimensions.size.w), -3, 3) .. ";" - elseif mp.get_property_number("video-pan-x") ~= 0 then - command = command .. "no-osd set video-pan-x " .. "0;" - end - if (not move_full and window_h < video_dimensions.size.h) then - command = command .. "no-osd set video-pan-y " .. clamp(y * (video_dimensions.size.h - window_h + 2 * margin) / (2 * video_dimensions.size.h), -3, 3) .. ";" - elseif mp.get_property_number("video-pan-y") ~= 0 then - command = command .. "no-osd set video-pan-y " .. "0;" - end - if command ~= "" then - mp.command(command) - end - moved = false - end - end - mp.register_idle(idle) - add_mouse_move_callback("pan-follows-cursor", function() moved = true end) - cleanup = function() - remove_mouse_move_callback("pan-follows-cursor") - mp.unregister_idle(idle) - end - end -end - -function cursor_centric_zoom_handler(amt) - local zoom_inc = tonumber(amt) - if not zoom_inc or zoom_inc == 0 then return end - local video_dimensions = get_video_dimensions() - if not video_dimensions then return end - local mouse_pos_origin, video_pan_origin = {}, {} - mouse_pos_origin.x, mouse_pos_origin.y = mp.get_mouse_pos() - video_pan_origin.x = mp.get_property("video-pan-x") - video_pan_origin.y = mp.get_property("video-pan-y") - local zoom_origin = mp.get_property("video-zoom") - -- how far the cursor is form the middle of the video (in percentage) - local rx = (video_dimensions.top_left.x + video_dimensions.size.w / 2 - mouse_pos_origin.x) / (video_dimensions.size.w / 2) - local ry = (video_dimensions.top_left.y + video_dimensions.size.h / 2 - mouse_pos_origin.y) / (video_dimensions.size.h / 2) - - -- the size in pixels of the (in|de)crement - local diffHeight = (2 ^ zoom_inc - 1) * video_dimensions.size.h - local diffWidth = (2 ^ zoom_inc - 1) * video_dimensions.size.w - local newPanX = (video_pan_origin.x * video_dimensions.size.w + rx * diffWidth / 2) / (video_dimensions.size.w + diffWidth) - local newPanY = (video_pan_origin.y * video_dimensions.size.h + ry * diffHeight / 2) / (video_dimensions.size.h + diffHeight) - mp.command("no-osd set video-zoom " .. zoom_origin + zoom_inc .. "; no-osd set video-pan-x " .. clamp(newPanX, -3, 3) .. "; no-osd set video-pan-y " .. clamp(newPanY, -3, 3)) -end - -function align_border(x, y) - local video_dimensions = get_video_dimensions() - if not video_dimensions then return end - local window_w, window_h = mp.get_osd_size() - local x, y = tonumber(x), tonumber(y) - local command = "" - if x then - command = command .. "no-osd set video-pan-x " .. clamp(x * (video_dimensions.size.w - window_w) / (2 * video_dimensions.size.w), -3, 3) .. ";" - end - if y then - command = command .. "no-osd set video-pan-y " .. clamp(y * (video_dimensions.size.h - window_h) / (2 * video_dimensions.size.h), -3, 3) .. ";" - end - if command ~= "" then - mp.command(command) - end -end - -function pan_image(axis, amount, zoom_invariant, image_constrained) - amount = tonumber(amount) - if not amount or amount == 0 or axis ~= "x" and axis ~= "y" then return end - if zoom_invariant == "yes" then - amount = amount / 2 ^ mp.get_property_number("video-zoom") - end - local prop = "video-pan-" .. axis - local old_pan = mp.get_property_number(prop) - if image_constrained == "yes" then - local video_dimensions = get_video_dimensions() - if not video_dimensions then return end - local measure = axis == "x" and "w" or "h" - local window = {} - window.w, window.h = mp.get_osd_size() - local pixels_moved = amount * video_dimensions.size[measure] - -- should somehow refactor this - if pixels_moved > 0 then - if window[measure] > video_dimensions.size[measure] then - if video_dimensions.bottom_right[axis] >= window[measure] then return end - if video_dimensions.bottom_right[axis] + pixels_moved > window[measure] then - amount = (window[measure] - video_dimensions.bottom_right[axis]) / video_dimensions.size[measure] - end - else - if video_dimensions.top_left[axis] >= 0 then return end - if video_dimensions.top_left[axis] + pixels_moved > 0 then - amount = (0 - video_dimensions.top_left[axis]) / video_dimensions.size[measure] - end - end - else - if window[measure] > video_dimensions.size[measure] then - if video_dimensions.top_left[axis] <= 0 then return end - if video_dimensions.top_left[axis] + pixels_moved < 0 then - amount = (0 - video_dimensions.top_left[axis]) / video_dimensions.size[measure] - end - else - if video_dimensions.bottom_right[axis] <= window[measure] then return end - if video_dimensions.bottom_right[axis] + pixels_moved < window[measure] then - amount = (window[measure] - video_dimensions.bottom_right[axis]) / video_dimensions.size[measure] - end - end - end - end - mp.set_property_number(prop, old_pan + amount) -end - -function rotate_video(amt) - local rot = mp.get_property_number("video-rotate") - rot = (rot + amt) % 360 - mp.set_property_number("video-rotate", rot) -end - -function reset_pan_if_visible() - local video_dimensions = get_video_dimensions() - if not video_dimensions then return end - local window_w, window_h = mp.get_osd_size() - local command = "" - if (window_w >= video_dimensions.size.w) then - command = command .. "no-osd set video-pan-x 0" .. ";" - end - if (window_h >= video_dimensions.size.h) then - command = command .. "no-osd set video-pan-y 0" .. ";" - end - if command ~= "" then - mp.command(command) - end -end - -function force_print_filename() - mp.set_property("msg-level", "cplayer=info") - mp.commandv("print-text", mp.get_property("path")) - mp.set_property("msg-level", "all=no") -end - -function draw_ass() - local ww, wh = mp.get_osd_size() - local merge = function(a, b) - return b ~= "" and (a .. "\n" .. b) or a - end - mp.set_osd_ass(ww, wh, merge(merge(ass.status_line, ass.minimap), ass.ruler)) -end - -local status_line_enabled = false -local status_line_stale = true - -function mark_status_line_stale() - status_line_stale = true -end - -function refresh_status_line() - if not status_line_stale then return end - status_line_stale = false - local path = mp.get_property("path") - if path == nil or path == "" then - ass.status_line = "" - draw_ass() - return - end - local expanded = mp.command_native({ "expand-text", opts.status_line }) - if not expanded then - msg.warn("Error expanding status line") - ass.status_line = "" - draw_ass() - return - end - local w,h = mp.get_osd_size() - local an, x, y - local margin = 10 - if opts.status_line_position == "top_left" then - x = margin - y = margin - an = 7 - elseif opts.status_line_position == "top_right" then - x = w-margin - y = margin - an = 9 - elseif opts.status_line_position == "bottom_right" then - x = w-margin - y = h-margin - an = 3 - else - x = margin - y = h-margin - an = 1 - end - local a = assdraw:ass_new() - a:new_event() - a:an(an) - a:pos(x,y) - a:append("{\\fs".. opts.status_line_size.. "}{\\bord1.0}") - a:append(expanded) - ass.status_line = a.text - draw_ass() -end - -function enable_status_line() - if status_line_enabled then return end - status_line_enabled = true - local start = 0 - while true do - local s, e, cap = string.find(opts.status_line, "%${[?!]?([%l%d-/]*)", start) - if not s then break end - mp.observe_property(cap, nil, mark_status_line_stale) - start = e - end - mp.observe_property("path", nil, mark_status_line_stale) - mp.observe_property("osd-width", nil, mark_status_line_stale) - mp.observe_property("osd-height", nil, mark_status_line_stale) - mp.register_idle(refresh_status_line) - mark_status_line_stale() -end - -function disable_status_line() - if not status_line_enabled then return end - status_line_enabled = false - mp.unobserve_property(mark_status_line_stale) - mp.unregister_idle(refresh_status_line) - ass.status_line = "" - draw_ass() -end - -if opts.status_line_enabled then - enable_status_line() -end - -if opts.command_on_image_loaded ~= "" or opts.command_on_non_image_loaded ~= "" then - local was_image = false - local frame_count = nil - local audio_tracks = nil - local out_params_ready = nil - local path = nil - - function state_changed() - function set_image(is_image) - if is_image and not was_image and opts.command_on_first_image_loaded ~= "" then - mp.command(opts.command_on_first_image_loaded) - end - if is_image and opts.command_on_image_loaded ~= "" then - mp.command(opts.command_on_image_loaded) - end - if not is_image and was_image and opts.command_on_non_image_loaded ~= "" then - mp.command(opts.command_on_non_image_loaded) - end - was_image = is_image - end - -- only do things when state is consistent - if path ~= nil and audio_tracks ~= nil then - if frame_count == nil and audio_tracks > 0 then - set_image(false) - elseif out_params_ready and frame_count ~= nil then - -- png have 0 frames, jpg 1 ¯\_(ツ)_/¯ - set_image((frame_count == 0 or frame_count == 1) and audio_tracks == 0) - end - end - end - - mp.observe_property("video-out-params/par", "number", function(_, val) - out_params_ready = (val ~= nil and val > 0) - state_changed() - end) - mp.observe_property("estimated-frame-count", "number", function(_, val) - frame_count = val - state_changed() - end) - mp.observe_property("path", "string", function(_, val) - if not val or val == "" then - path = nil - else - path = val - end - state_changed() - end) - mp.register_event("tracks-changed", function() - audio_tracks = 0 - local tracks = 0 - for _, track in ipairs(mp.get_property_native("track-list")) do - tracks = tracks + 1 - if track.type == "audio" then - audio_tracks = audio_tracks + 1 - end - end - if tracks == 0 then - audio_tracks = nil - end - state_changed() - end) -end - -function refresh_minimap() - local dim = get_video_dimensions() - if not dim then - ass.minimap = "" - draw_ass() - return - end - if _minimap_old_timestamp and dim.timestamp == _minimap_old_timestamp then return end - _minimap_old_timestamp = dim.timestamp - local ww, wh = mp.get_osd_size() - if opts.minimap_hide_when_full_image_in_view then - if dim.top_left.x >= 0 and - dim.top_left.y >= 0 and - dim.bottom_right.x <= ww and - dim.bottom_right.y <= wh - then - ass.minimap = "" - draw_ass() - return - end - end - local center = { - x=opts.minimap_center[1]/100*ww, - y=opts.minimap_center[2]/100*wh - } - local cutoff = { - x=opts.minimap_max_size[1]/100*ww/2, - y=opts.minimap_max_size[2]/100*wh/2 - } - local a = assdraw.ass_new() - local draw = function(x, y, w, h, opacity, color) - a:new_event() - a:pos(center.x, center.y) - a:append("{\\bord0}") - a:append("{\\shad0}") - a:append("{\\c&" .. color .. "&}") - a:append("{\\2a&HFF}") - a:append("{\\3a&HFF}") - a:append("{\\4a&HFF}") - a:append("{\\1a&H" .. opacity .. "}") - w=w/2 - h=h/2 - a:draw_start() - local rounded = {true,true,true,true} -- tl, tr, br, bl - local x0,y0,x1,y1 = x-w, y-h, x+w, y+h - if x0 < -cutoff.x then - x0 = -cutoff.x - rounded[4] = false - rounded[1] = false - end - if y0 < -cutoff.y then - y0 = -cutoff.y - rounded[1] = false - rounded[2] = false - end - if x1 > cutoff.x then - x1 = cutoff.x - rounded[2] = false - rounded[3] = false - end - if y1 > cutoff.y then - y1 = cutoff.y - rounded[3] = false - rounded[4] = false - end - - local r = 3 - local c = 0.551915024494 * r - if rounded[0] then - a:move_to(x0 + r, y0) - else - a:move_to(x0,y0) - end - if rounded[1] then - a:line_to(x1 - r, y0) - a:bezier_curve(x1 - r + c, y0, x1, y0 + r - c, x1, y0 + r) - else - a:line_to(x1, y0) - end - if rounded[2] then - a:line_to(x1, y1 - r) - a:bezier_curve(x1, y1 - r + c, x1 - r + c, y1, x1 - r, y1) - else - a:line_to(x1, y1) - end - if rounded[3] then - a:line_to(x0 + r, y1) - a:bezier_curve(x0 + r - c, y1, x0, y1 - r + c, x0, y1 - r) - else - a:line_to(x0, y1) - end - if rounded[4] then - a:line_to(x0, y0 + r) - a:bezier_curve(x0, y0 + r - c, x0 + r - c, y0, x0 + r, y0) - else - a:line_to(x0, y0) - end - a:draw_stop() - end - local image = function() - draw((dim.top_left.x + dim.size.w/2 - ww/2) / opts.minimap_scale, - (dim.top_left.y + dim.size.h/2 - wh/2) / opts.minimap_scale, - dim.size.w / opts.minimap_scale, - dim.size.h / opts.minimap_scale, - opts.minimap_image_opacity, - opts.minimap_image_color) - end - local view = function() - draw(0, - 0, - ww / opts.minimap_scale, - wh / opts.minimap_scale, - opts.minimap_view_opacity, - opts.minimap_view_color) - end - if opts.minimap_view_above_image then - image() - view() - else - view() - image() - end - ass.minimap = a.text - draw_ass() -end - -local minimap_enabled = false - -function enable_minimap() - if minimap_enabled then return end - minimap_enabled = true - mp.register_idle(refresh_minimap) -end - -function disable_minimap() - if not minimap_enabled then return end - minimap_enabled = false - ass.minimap = a.text - draw_ass() - mp.unregister_idle(refresh_minimap) -end - -if opts.minimap_enabled then - enable_minimap() -end - -local ruler_state = 0 -- {0,1,2,3} = {inactive,setting first point,setting second point,done} -local ruler_first_point = nil -- in video space coordinates -local ruler_second_point = nil -- in video space coordinates - -function cursor_video_space() - local dim = get_video_dimensions() - if not dim then return nil end - local mx, my = mp.get_mouse_pos() - local ret = {} - ret.x = (mx - dim.top_left.x) / dim.ratios.w - ret.y = (my - dim.top_left.y) / dim.ratios.h - return ret -end -function video_space_to_screen(point) - local dim = get_video_dimensions() - if not dim then return nil end - local ret = {} - ret.x = point.x * dim.ratios.w + dim.top_left.x - ret.y = point.y * dim.ratios.h + dim.top_left.y - return ret -end - -function refresh_ruler() - local dim = get_video_dimensions() - if not dim then - ass.ruler = "" - draw_ass() - return - end - - local line_start = {} - local line_end = {} - if ruler_second_point then - line_start.image = ruler_first_point - line_start.screen = video_space_to_screen(ruler_first_point) - line_end.image = ruler_second_point - line_end.screen = video_space_to_screen(ruler_second_point) - elseif ruler_first_point then - line_start.image = ruler_first_point - line_start.screen = video_space_to_screen(ruler_first_point) - line_end.image = cursor_video_space() - line_end.screen = {} - line_end.screen.x, line_end.screen.y = mp.get_mouse_pos() - else - local mx, my = mp.get_mouse_pos() - line_start.image = cursor_video_space() - line_start.screen = {} - line_start.screen.x, line_start.screen.y = mp.get_mouse_pos() - line_end = line_start - end - local distinct = (math.abs(line_start.screen.x - line_end.screen.x) >= 1 - or math.abs(line_start.screen.y - line_end.screen.y) >= 1) - - local a = assdraw:ass_new() - local draw_setup = function(bord) - a:new_event() - a:pos(0,0) - a:append("{\\bord" .. bord .. "}") - a:append("{\\shad0}") - local r = opts.ruler_line_color - a:append("{\\3c&H".. r .. r .. r .. "&}") - a:append("{\\1a&HFF}") - a:append("{\\2a&HFF}") - a:append("{\\3a&H00}") - a:append("{\\4a&HFF}") - a:draw_start() - end - local dot = function(pos, size) - draw_setup(size) - a:move_to(pos.x, pos.y-0.5) - a:line_to(pos.x, pos.y+0.5) - end - local line = function(from, to, size) - draw_setup(size) - a:move_to(from.x, from.y) - a:line_to(to.x, to.y) - end - if distinct then - dot(line_start.screen, opts.ruler_dots_radius) - line(line_start.screen, line_end.screen, opts.ruler_line_width) - dot(line_end.screen, opts.ruler_dots_radius) - else - dot(line_start.screen, opts.ruler_dots_radius) - end - - local line_info = function() - if not opts.ruler_show_distance then return end - a:new_event() - a:append("{\\fs36}{\\bord1}") - a:pos((line_start.screen.x + line_end.screen.x) / 2, (line_start.screen.y + line_end.screen.y) / 2) - local an = 1 - if line_start.image.x < line_end.image.x then an = an + 2 end - if line_start.image.y < line_end.image.y then an = an + 6 end - a:an(an) - local image = math.sqrt(math.pow(line_start.image.x - line_end.image.x, 2) + math.pow(line_start.image.y - line_end.image.y, 2)) - local screen = math.sqrt(math.pow(line_start.screen.x - line_end.screen.x, 2) + math.pow(line_start.screen.y - line_end.screen.y, 2)) - if opts.ruler_coordinates_space == "both" then - a:append(string.format("image: %.1f\\Nscreen: %.1f", image, screen)) - elseif opts.ruler_coordinates_space == "image" then - a:append(string.format("%.1f", image)) - elseif opts.ruler_coordinates_space == "window" then - a:append(string.format("%.1f", screen)) - end - end - local dot_info = function(pos, opposite) - if not opts.ruler_show_coordinates then return end - a:new_event() - a:append("{\\fs" .. opts.ruler_font_size .."}{\\bord1}") - a:pos(pos.screen.x, pos.screen.y) - local an - if distinct then - an = 1 - if line_start.image.x > line_end.image.x then an = an + 2 end - if line_start.image.y < line_end.image.y then an = an + 6 end - else - an = 7 - end - if opposite then - an = 9 + 1 - an - end - a:an(an) - if opts.ruler_coordinates_space == "both" then - a:append(string.format("image: %.1f, %.1f\\Nscreen: %i, %i", - pos.image.x, pos.image.y, pos.screen.x, pos.screen.y)) - elseif opts.ruler_coordinates_space == "image" then - a:append(string.format("%.1f, %.1f", pos.image.x, pos.image.y)) - elseif opts.ruler_coordinates_space == "window" then - a:append(string.format("%i, %i", pos.screen.x, pos.screen.y)) - end - end - dot_info(line_start, true) - if distinct then - line_info() - dot_info(line_end, false) - end - if distinct and opts.ruler_show_angles ~= "no" then - local dist = 50 - local pos_from_angle = function(mult, angle) - return { - x = line_start.screen.x + mult * dist * math.cos(angle), - y = line_start.screen.y + mult * dist * math.sin(angle) - } - end - local extended = {x=line_start.screen.x, y=line_start.screen.y} - if line_end.screen.x > line_start.screen.x then - extended.x = extended.x + dist - else - extended.x = extended.x - dist - end - line(line_start.screen, extended, math.max(0, opts.ruler_line_width-0.5)) - local angle = math.atan(math.abs(line_start.image.y - line_end.image.y) / math.abs(line_start.image.x - line_end.image.x)) - local fix_angle - local an - if line_end.image.y < line_start.image.y and line_end.image.x > line_start.image.x then - -- upper-right - an = 4 - fix_angle = function(angle) return - angle end - elseif line_end.image.y < line_start.image.y then - -- upper-left - an = 6 - fix_angle = function(angle) return math.pi + angle end - elseif line_end.image.x < line_start.image.x then - -- bottom-left - an = 6 - fix_angle = function(angle) return math.pi - angle end - else - -- bottom-right - an = 4 - fix_angle = function(angle) return angle end - end - -- should implement this https://math.stackexchange.com/questions/873224/calculate-control-points-of-cubic-bezier-curve-approximating-a-part-of-a-circle - local cp1 = pos_from_angle(1, fix_angle(angle*1/4)) - local cp2 = pos_from_angle(1, fix_angle(angle*3/4)) - local p2 = pos_from_angle(1, fix_angle(angle)) - a:bezier_curve(cp1.x, cp1.y, cp2.x, cp2.y, p2.x, p2.y) - - a:new_event() - a:append("{\\fs" .. opts.ruler_font_size .."}{\\bord1}") - local text_pos = pos_from_angle(1.1, fix_angle(angle*2/3)) -- you'd think /2 would make more sense, but *2/3 looks better - a:pos(text_pos.x, text_pos.y) - a:an(an) - if opts.ruler_show_angles == "both" then - a:append(string.format("%.2f\\N%.1f°", angle, angle / math.pi * 180)) - elseif opts.ruler_show_angles == "degrees" then - a:append(string.format("%.1f°", angle / math.pi * 180)) - elseif opts.ruler_show_angles == "radians" then - a:append(string.format("%.2f", angle)) - end - end - - ass.ruler = a.text - draw_ass() -end - -function ruler_next() - if ruler_state == 0 then - mp.register_idle(refresh_ruler) - add_mouse_move_callback("ruler", function() end) -- only used to get an idle event on mouse move - for _,key in ipairs(opts.ruler_confirm_bindings) do - mp.add_forced_key_binding(key, "ruler-next-" .. key, ruler_next) - end - for _,key in ipairs(opts.ruler_exit_bindings) do - mp.add_forced_key_binding(key, "ruler-stop-" .. key, ruler_stop) - end - ruler_state = 1 - if opts.ruler_set_first_point_on_begin then - ruler_next() - end - elseif ruler_state == 1 then - ruler_first_point = cursor_video_space() - ruler_state = 2 - elseif ruler_state == 2 then - ruler_state = 3 - ruler_second_point = cursor_video_space() - if opts.ruler_clear_on_second_point_set then - ruler_next() - end - else - ruler_stop() - end -end - -function ruler_stop() - if ruler_state == 0 then return end - mp.unregister_idle(refresh_ruler) - for _,key in ipairs(opts.ruler_confirm_bindings) do - mp.remove_key_binding("ruler-next-" .. key) - end - for _,key in ipairs(opts.ruler_exit_bindings) do - mp.remove_key_binding("ruler-stop-" .. key) - end - remove_mouse_move_callback("ruler") - ruler_state = 0 - ruler_first_point = nil - ruler_second_point = nil - ass.ruler = "" - draw_ass() -end - -mp.add_key_binding(nil, "drag-to-pan", drag_to_pan_handler, {complex = true}) -mp.add_key_binding(nil, "pan-follows-cursor", pan_follows_cursor_handler, {complex = true}) -mp.add_key_binding(nil, "cursor-centric-zoom", cursor_centric_zoom_handler) -mp.add_key_binding(nil, "align-border", align_border) -mp.add_key_binding(nil, "pan-image", pan_image) -mp.add_key_binding(nil, "rotate-video", rotate_video) -mp.add_key_binding(nil, "reset-pan-if-visible", reset_pan_if_visible) -mp.add_key_binding(nil, "force-print-filename", force_print_filename) - -mp.add_key_binding(nil, "ruler", ruler_next) - -mp.add_key_binding(nil, "enable-status-line", enable_status_line) -mp.add_key_binding(nil, "disable-status-line", disable_status_line) -mp.add_key_binding(nil, "toggle-status-line", function() if status_line_enabled then disable_status_line() else enable_status_line() end end) - -mp.add_key_binding(nil, "enable-minimap", enable_minimap) -mp.add_key_binding(nil, "disable-minimap", disable_minimap) -mp.add_key_binding(nil, "toggle-minimap", function() if minimap_enabled then disable_minimap() else enable_minimap() end end) From 053f4bb39a4b4392e3edae34f2bdeaaefa4c54f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Jul 2022 22:37:56 +0300 Subject: [PATCH 1162/2667] Delete some old unneeded files, minor fixes to other files --- config.toml | 2 +- home/.config/mpv/mpv.conf | 12 +- home/.config/mvi/input.conf | 99 -- home/.config/mvi/mpv.conf | 46 - .../.config/mvi/script-opts/image_viewer.conf | 78 -- home/.config/mvi/scripts/image-viewer.lua | 953 ------------------ 6 files changed, 8 insertions(+), 1182 deletions(-) delete mode 100644 home/.config/mvi/input.conf delete mode 100644 home/.config/mvi/mpv.conf delete mode 100644 home/.config/mvi/script-opts/image_viewer.conf delete mode 100644 home/.config/mvi/scripts/image-viewer.lua diff --git a/config.toml b/config.toml index 9b22bccf..0f85192c 100644 --- a/config.toml +++ b/config.toml @@ -305,7 +305,7 @@ include = ["base", "terminal", "email", "media", "sway", "pacman", "gpg"] dotfiles = ["f_paru.conf", "f_gitconfig", "f_foot.ini"] [profiles.Moria] -include = ["terminal", "pacman"] +include = ["terminal", "pacman", "media"] dotfiles = ["f_zprofile"] [profiles.Gondor] diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index cc7cefba..a088b56d 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -7,11 +7,9 @@ vo=gpu hwdec=vaapi hwdec-codecs=all -{%@@ if profile == "Mirkwood" @@%} +{%@@ if profile == "Mirkwood" or profile == "Moria" @@%} gpu-context=wayland -{%@@ endif @@%} - -{%@@ if profile == "mko-laptop" @@%} +{%@@ elif profile == "mko-laptop" @@%} script=~/.lib/mpris.so {%@@ endif @@%} @@ -29,8 +27,12 @@ replaygain=track # Start ipc server input-ipc-server=/tmp/mpvsocket -# set youtube-dl max res to 1080 +# set youtube-dl max res +{%@@ if profile == "Moria" @@%} +ytdl-format=bestvideo[height<=2160]+bestaudio/best[height<=2160] +{%@@ else @@%} ytdl-format=bestvideo[height<=1080]+bestaudio/best[height<=1080] +{%@@ endif @@%} # continue watching save-position-on-quit diff --git a/home/.config/mvi/input.conf b/home/.config/mvi/input.conf deleted file mode 100644 index 416eb1c2..00000000 --- a/home/.config/mvi/input.conf +++ /dev/null @@ -1,99 +0,0 @@ -SPACE repeatable playlist-next -alt+SPACE repeatable playlist-prev - -UP ignore -DOWN ignore -LEFT repeatable playlist-prev -RIGHT repeatable playlist-next - -# simple reminder of default bindings -#1 add contrast -1 -#2 add contrast 1 -#3 add brightness -1 -#4 add brightness 1 -#5 add gamma -1 -#6 add gamma 1 -#7 add saturation -1 -#8 add saturation 1 - -# mouse-centric bindings -MBTN_RIGHT script-binding image_viewer/drag-to-pan -MBTN_LEFT script-binding image_viewer/pan-follows-cursor -WHEEL_UP script-message cursor-centric-zoom 0.1 -WHEEL_DOWN script-message cursor-centric-zoom -0.1 - -# panning with the keyboard: -# pan-image takes the following arguments -# pan-image AXIS AMOUNT ZOOM_INVARIANT IMAGE_CONSTRAINED -# ^ ^ ^ -# x or y | | -# | | -# if yes, will pan by the same if yes, stops panning if the image -# amount regardless of zoom would go outside of the window - -ctrl+down repeatable script-message pan-image y -0.1 yes yes -ctrl+up repeatable script-message pan-image y +0.1 yes yes -ctrl+right repeatable script-message pan-image x -0.1 yes yes -ctrl+left repeatable script-message pan-image x +0.1 yes yes - -# now with more precision -alt+down repeatable script-message pan-image y -0.01 yes yes -alt+up repeatable script-message pan-image y +0.01 yes yes -alt+right repeatable script-message pan-image x -0.01 yes yes -alt+left repeatable script-message pan-image x +0.01 yes yes - -# replace at will with h,j,k,l if you prefer vim-style bindings - -# on a trackpad you may want to use these -#WHEEL_UP repeatable script-message pan-image y -0.02 yes yes -#WHEEL_DOWN repeatable script-message pan-image y +0.02 yes yes -#WHEEL_LEFT repeatable script-message pan-image x -0.02 yes yes -#WHEEL_RIGHT repeatable script-message pan-image x +0.02 yes yes - -# align the border of the image to the border of the window -# align-border takes the following arguments: -# align-border ALIGN_X ALIGN_Y -# any value for ALIGN_* is accepted, -1 and 1 map to the border of the window -ctrl+shift+right script-message align-border -1 "" -ctrl+shift+left script-message align-border 1 "" -ctrl+shift+down script-message align-border "" -1 -ctrl+shift+up script-message align-border "" 1 - -# reset the image -ctrl+0 no-osd set video-pan-x 0; no-osd set video-pan-y 0; no-osd set video-zoom 0 - -+ add video-zoom 0.5 -- add video-zoom -0.5; script-message reset-pan-if-visible -= no-osd set video-zoom 0; script-message reset-pan-if-visible - -# sxiv compatibility -w no-osd set video-unscaled yes; keypress = -e no-osd set video-unscaled no; keypress = - -h no-osd vf toggle hflip; show-text "Horizontal flip" -v no-osd vf toggle vflip; show-text "Vertical flip" - -r script-message rotate-video 90; show-text "Clockwise rotation" -R script-message rotate-video -90; show-text "Counter-clockwise rotation" -alt+r no-osd set video-rotate 0; show-text "Reset rotation" - -d script-message ruler - -# Toggling between pixel-exact reproduction and interpolation -a cycle-values scale nearest ewa_lanczossharp - -# Toggle color management on or off -c cycle icc-profile-auto - -# Screenshot of the window output -S screenshot window - -# Toggle aspect ratio information on and off -A cycle-values video-aspect "-1" "no" - -p script-message force-print-filename - -# ADVANCED: you can define bindings that belong to a "section" (named "image-viewer" here) like so: -#alt+SPACE {image-viewer} repeatable playlist-prev -#SPACE {image-viewer} repeatable playlist-next -# to load them conditionally with a command. See scripts-opts/image_viewer.conf for how you can do this diff --git a/home/.config/mvi/mpv.conf b/home/.config/mvi/mpv.conf deleted file mode 100644 index 5c5dcfbb..00000000 --- a/home/.config/mvi/mpv.conf +++ /dev/null @@ -1,46 +0,0 @@ -## IMAGE -# classic opengl-hq parameter, change at will -scale=spline36 -cscale=spline36 -dscale=mitchell -dither-depth=auto -correct-downscaling -sigmoid-upscaling -# debanding seems rarely useful with images -#deband - -## MISC -mute=yes -# the osc is mostly useful for videos -osc=no -# don't try to autoload subtitles or audio files -sub-auto=no -audio-file-auto=no -# get rid of the useless V: 00:00:00 / 00:00:00 line -term-status-msg= - -# replace mpv with mvi in the window title -title="${?media-title:${media-title}}${!media-title:No file} - mvi" - -# don't slideshow by default -image-display-duration=inf -# loop files in case of webms or gifs -loop-file=inf -# and loop the whole playlist -loop-playlist=inf - -# you need this if you plan to use drag-to-pan or pan-follows-cursor with MOUSE_LEFT -window-dragging=no - -#according to haasn, aspect ratio info for PNG and JPG is "universally bust" -[extension.png] -video-aspect=no - -[extension.jpg] -video-aspect=no - -[extension.jpeg] -profile=extension.jpg - -[silent] -msg-level=all=no diff --git a/home/.config/mvi/script-opts/image_viewer.conf b/home/.config/mvi/script-opts/image_viewer.conf deleted file mode 100644 index 4fe886fa..00000000 --- a/home/.config/mvi/script-opts/image_viewer.conf +++ /dev/null @@ -1,78 +0,0 @@ -## MISC -# size of the margins with pan-follows-cursor -pan_follows_cursor_margin=50 -# whether pan-follows-cursor should pan when the entire image is visible -pan_follows_cursor_move_if_full_view=no - -## STATUS LINE -# whether to show a status line -status_line_enabled=yes -# its position, possible values: (bottom|top)_(left|right) -status_line_position=bottom_left -# its font size -status_line_size=36 -# the text to be expanded -# see property expansion: https://mpv.io/manual/master/#property-expansion -# \N can be used for line breaks -# you can also use ass tags, see here: http://docs.aegisub.org/3.2/ASS_Tags/ -status_line=${filename} [${playlist-pos-1}/${playlist-count}] - -## MINIMAP -# whether to show a minimap -minimap_enabled=yes -# the position of the center of the minimap, in percentage of the window (x, y) -minimap_center=92,92 -# the scale of the minimap (i.e. the view rectangle is scale / 100 times the size of the window) -minimap_scale=12 -# the cutoff size of the minimap (i.e. the image rectangle is clipped if it falls outside of the this zone) -minimap_max_size=16,16 -# opacity of the "image" (from 00=opaque to FF=transparent) -minimap_image_opacity=88 -# color of the "image" (#BBGGRR where each component rages from 00 to FF) -minimap_image_color=BBBBBB -# opacity of the "view" -minimap_view_opacity=BB -minimap_view_color=222222 -# whether the view should be drawn above the image -minimap_view_above_image=yes -# whether to show the minimap if the current image is fully visible -minimap_hide_when_full_image_in_view=yes - -## RULER -# whether to show the length of the lines between the two points -ruler_show_distance=yes -# whether to show the coordinates of the two points -ruler_show_coordinates=yes -# the coordinate space of the text shown. Can be "image", "window", "both" -ruler_coordinates_space=image -# can be "degrees", "radians", "both", or "no" -ruler_show_angles=degrees -ruler_line_width=2 -ruler_dots_radius=3 -ruler_font_size=36 -# ranges from 00 (black) to FF (white) -ruler_line_color=33 -# bindings used to set points. The binding to trigger ruler mode can also be used. Comma-separated list -ruler_confirm_bindings=MBTN_LEFT,ENTER -# bindings used to set points. The binding to trigger ruler mode can also be used. Comma-separated list -ruler_exit_bindings=ESC -# if yes, the first point will be immediately set at the cursor position when calling 'ruler' -ruler_set_first_point_on_begin=no -# if yes, the ruler overlay will be immediately cleared when setting the second point -ruler_clear_on_second_point_set=no - -## HOOKS -# commands to execute when a file detected as an image (1 frame, no audio) is loaded or unloaded -# an image was loaded, and the previous file was not an image (or there was no previous file) -command_on_first_image_loaded= -# an image was loaded (regardless of what the previous file was) -command_on_image_loaded= -# a non-image was loaded, and the previous file was an image -command_on_non_image_loaded= -# the purpose of these "hooks" is to let you change bindings, profiles, reset properties... -# see https://mpv.io/manual/master/#list-of-input-commands for general command information -# note that there is no such thing as "unloading a profile", to emulate this you must create an opposite profile and load that -# example possible values: -#command_on_first_image_loaded=apply-profile image; enable-section image-viewer; script-message enable-status-line -#command_on_image_loaded=no-osd set video-pan-x 0; script-message align-border "" -1 -#command_on_non_image_loaded=disable-section image-viewer; no-osd set video-pan-x 0; no-osd set video-pan-y 0; no-osd set video-zoom 0; script-message disable-status-line diff --git a/home/.config/mvi/scripts/image-viewer.lua b/home/.config/mvi/scripts/image-viewer.lua deleted file mode 100644 index 9e1ec11b..00000000 --- a/home/.config/mvi/scripts/image-viewer.lua +++ /dev/null @@ -1,953 +0,0 @@ -local opts = { - pan_follows_cursor_margin = 50, - pan_follows_cursor_move_if_full_view = false, - - status_line_enabled = false, - status_line_position = "bottom_left", - status_line_size = 36, - status_line = "${filename} [${playlist-pos-1}/${playlist-count}]", - - minimap_enabled = true, - minimap_center = "92,92", - minimap_scale = 12, - minimap_max_size = "16,16", - minimap_image_opacity = "88", - minimap_image_color = "BBBBBB", - minimap_view_opacity = "BB", - minimap_view_color = "222222", - minimap_view_above_image = true, - minimap_hide_when_full_image_in_view = true, - - ruler_show_distance=true, - ruler_show_coordinates=true, - ruler_coordinates_space="both", - ruler_show_angles="degrees", - ruler_line_width=2, - ruler_dots_radius=3, - ruler_font_size=36, - ruler_line_color="33", - ruler_confirm_bindings="MBTN_LEFT,ENTER", - ruler_exit_bindings="ESC", - ruler_set_first_point_on_begin=false, - ruler_clear_on_second_point_set=false, - - command_on_first_image_loaded="", - command_on_image_loaded="", - command_on_non_image_loaded="", -} -(require 'mp.options').read_options(opts) -function split(input) - local ret = {} - for str in string.gmatch(input, "([^,]+)") do - ret[#ret + 1] = str - end - return ret -end -function str_to_num(array) - local ret = {} - for _, v in ipairs(array) do - ret[#ret + 1] = tonumber(v) - end - return ret -end -opts.minimap_center=str_to_num(split(opts.minimap_center)) -opts.minimap_max_size=str_to_num(split(opts.minimap_max_size)) -opts.ruler_confirm_bindings=split(opts.ruler_confirm_bindings) -opts.ruler_exit_bindings=split(opts.ruler_exit_bindings) - -function clamp(value, low, high) - if value <= low then - return low - elseif value >= high then - return high - else - return value - end -end - -local msg = require 'mp.msg' -local assdraw = require 'mp.assdraw' - -local ass = { -- shared ass state - status_line = "", - minimap = "", - ruler = "", -} - -local cleanup = nil -- function set up by drag-to-pan/pan-follows cursor and must be called to clean lingering state -local mouse_move_callbacks = {} -- functions that are called when mouse_move is triggered -function add_mouse_move_callback(key, func) - if #mouse_move_callbacks == 0 then - mp.add_forced_key_binding("mouse_move", "image-viewer-internal", function() - for _, func in pairs(mouse_move_callbacks) do - func() - end - end) - end - mouse_move_callbacks[key] = func -end -function remove_mouse_move_callback(key) - mouse_move_callbacks[key] = nil - for _,_ in pairs(mouse_move_callbacks) do - return - end - mp.remove_key_binding("image-viewer-internal") -end - -video_dimensions_stale = true -function get_video_dimensions() - -- this function is very much ripped from video/out/aspect.c in mpv's source - if not video_dimensions_stale then return _video_dimensions end - local video_params = mp.get_property_native("video-out-params") - if not video_params then - _video_dimensions = nil - return nil - end - if not _timestamp then _timestamp = 0 end - _timestamp = _timestamp + 1 - _video_dimensions = { - timestamp = _timestamp, - top_left = {x = 0, y = 0}, - bottom_right = {x = 0, y = 0}, - size = {w = 0, h = 0}, - ratios = {w = 0, h = 0}, -- by how much the original video got scaled - } - local keep_aspect = mp.get_property_bool("keepaspect") - local w = video_params["w"] - local h = video_params["h"] - local dw = video_params["dw"] - local dh = video_params["dh"] - if mp.get_property_number("video-rotate") % 180 == 90 then - w, h = h,w - dw, dh = dh, dw - end - local window_w, window_h = mp.get_osd_size() - - if keep_aspect then - local unscaled = mp.get_property_native("video-unscaled") - local panscan = mp.get_property_number("panscan") - - local fwidth = window_w - local fheight = math.floor(window_w / dw * dh) - if fheight > window_h or fheight < h then - local tmpw = math.floor(window_h / dh * dw) - if tmpw <= window_w then - fheight = window_h - fwidth = tmpw - end - end - local vo_panscan_area = window_h - fheight - local f_w = fwidth / fheight - local f_h = 1 - if vo_panscan_area == 0 then - vo_panscan_area = window_h - fwidth - f_w = 1 - f_h = fheight / fwidth - end - if unscaled or unscaled == "downscale-big" then - vo_panscan_area = 0 - if unscaled or (dw <= window_w and dh <= window_h) then - fwidth = dw - fheight = dh - end - end - - local scaled_width = fwidth + math.floor(vo_panscan_area * panscan * f_w) - local scaled_height = fheight + math.floor(vo_panscan_area * panscan * f_h) - - local split_scaling = function (dst_size, scaled_src_size, zoom, align, pan) - scaled_src_size = math.floor(scaled_src_size * 2 ^ zoom) - align = (align + 1) / 2 - local dst_start = math.floor((dst_size - scaled_src_size) * align + pan * scaled_src_size) - if dst_start < 0 then - --account for C int cast truncating as opposed to flooring - dst_start = dst_start + 1 - end - local dst_end = dst_start + scaled_src_size; - if dst_start >= dst_end then - dst_start = 0 - dst_end = 1 - end - return dst_start, dst_end - end - local zoom = mp.get_property_number("video-zoom") - - local align_x = mp.get_property_number("video-align-x") - local pan_x = mp.get_property_number("video-pan-x") - _video_dimensions.top_left.x, _video_dimensions.bottom_right.x = split_scaling(window_w, scaled_width, zoom, align_x, pan_x) - - local align_y = mp.get_property_number("video-align-y") - local pan_y = mp.get_property_number("video-pan-y") - _video_dimensions.top_left.y, _video_dimensions.bottom_right.y = split_scaling(window_h, scaled_height, zoom, align_y, pan_y) - else - _video_dimensions.top_left.x = 0 - _video_dimensions.bottom_right.x = window_w - _video_dimensions.top_left.y = 0 - _video_dimensions.bottom_right.y = window_h - end - _video_dimensions.size.w = _video_dimensions.bottom_right.x - _video_dimensions.top_left.x - _video_dimensions.size.h = _video_dimensions.bottom_right.y - _video_dimensions.top_left.y - _video_dimensions.ratios.w = _video_dimensions.size.w / w - _video_dimensions.ratios.h = _video_dimensions.size.h / h - video_dimensions_stale = false - return _video_dimensions -end - -for _, p in ipairs({ - "keepaspect", - "video-out-params", - "video-unscaled", - "panscan", - "video-zoom", - "video-align-x", - "video-pan-x", - "video-align-y", - "video-pan-y", - "osd-width", - "osd-height", -}) do - mp.observe_property(p, "native", function() video_dimensions_stale = true end) -end - -function drag_to_pan_handler(table) - if cleanup then - cleanup() - cleanup = nil - end - if table["event"] == "down" then - local video_dimensions = get_video_dimensions() - if not video_dimensions then return end - local mouse_pos_origin, video_pan_origin = {}, {} - local moved = false - mouse_pos_origin.x, mouse_pos_origin.y = mp.get_mouse_pos() - video_pan_origin.x = mp.get_property("video-pan-x") - video_pan_origin.y = mp.get_property("video-pan-y") - local idle = function() - if moved then - local mX, mY = mp.get_mouse_pos() - local pX = video_pan_origin.x + (mX - mouse_pos_origin.x) / video_dimensions.size.w - local pY = video_pan_origin.y + (mY - mouse_pos_origin.y) / video_dimensions.size.h - mp.command("no-osd set video-pan-x " .. clamp(pX, -3, 3) .. "; no-osd set video-pan-y " .. clamp(pY, -3, 3)) - moved = false - end - end - mp.register_idle(idle) - add_mouse_move_callback("drag-to-pan", function() moved = true end) - cleanup = function() - remove_mouse_move_callback("drag-to-pan") - mp.unregister_idle(idle) - end - end -end - -function pan_follows_cursor_handler(table) - if cleanup then - cleanup() - cleanup = nil - end - if table["event"] == "down" then - local video_dimensions = get_video_dimensions() - if not video_dimensions then return end - local window_w, window_h = mp.get_osd_size() - local moved = true - local idle = function() - if moved then - local mX, mY = mp.get_mouse_pos() - local x = math.min(1, math.max(- 2 * mX / window_w + 1, -1)) - local y = math.min(1, math.max(- 2 * mY / window_h + 1, -1)) - local command = "" - local margin, move_full = opts.pan_follows_cursor_margin, opts.pan_follows_cursor_move_if_full_view - if (not move_full and window_w < video_dimensions.size.w) then - command = command .. "no-osd set video-pan-x " .. clamp(x * (video_dimensions.size.w - window_w + 2 * margin) / (2 * video_dimensions.size.w), -3, 3) .. ";" - elseif mp.get_property_number("video-pan-x") ~= 0 then - command = command .. "no-osd set video-pan-x " .. "0;" - end - if (not move_full and window_h < video_dimensions.size.h) then - command = command .. "no-osd set video-pan-y " .. clamp(y * (video_dimensions.size.h - window_h + 2 * margin) / (2 * video_dimensions.size.h), -3, 3) .. ";" - elseif mp.get_property_number("video-pan-y") ~= 0 then - command = command .. "no-osd set video-pan-y " .. "0;" - end - if command ~= "" then - mp.command(command) - end - moved = false - end - end - mp.register_idle(idle) - add_mouse_move_callback("pan-follows-cursor", function() moved = true end) - cleanup = function() - remove_mouse_move_callback("pan-follows-cursor") - mp.unregister_idle(idle) - end - end -end - -function cursor_centric_zoom_handler(amt) - local zoom_inc = tonumber(amt) - if not zoom_inc or zoom_inc == 0 then return end - local video_dimensions = get_video_dimensions() - if not video_dimensions then return end - local mouse_pos_origin, video_pan_origin = {}, {} - mouse_pos_origin.x, mouse_pos_origin.y = mp.get_mouse_pos() - video_pan_origin.x = mp.get_property("video-pan-x") - video_pan_origin.y = mp.get_property("video-pan-y") - local zoom_origin = mp.get_property("video-zoom") - -- how far the cursor is form the middle of the video (in percentage) - local rx = (video_dimensions.top_left.x + video_dimensions.size.w / 2 - mouse_pos_origin.x) / (video_dimensions.size.w / 2) - local ry = (video_dimensions.top_left.y + video_dimensions.size.h / 2 - mouse_pos_origin.y) / (video_dimensions.size.h / 2) - - -- the size in pixels of the (in|de)crement - local diffHeight = (2 ^ zoom_inc - 1) * video_dimensions.size.h - local diffWidth = (2 ^ zoom_inc - 1) * video_dimensions.size.w - local newPanX = (video_pan_origin.x * video_dimensions.size.w + rx * diffWidth / 2) / (video_dimensions.size.w + diffWidth) - local newPanY = (video_pan_origin.y * video_dimensions.size.h + ry * diffHeight / 2) / (video_dimensions.size.h + diffHeight) - mp.command("no-osd set video-zoom " .. zoom_origin + zoom_inc .. "; no-osd set video-pan-x " .. clamp(newPanX, -3, 3) .. "; no-osd set video-pan-y " .. clamp(newPanY, -3, 3)) -end - -function align_border(x, y) - local video_dimensions = get_video_dimensions() - if not video_dimensions then return end - local window_w, window_h = mp.get_osd_size() - local x, y = tonumber(x), tonumber(y) - local command = "" - if x then - command = command .. "no-osd set video-pan-x " .. clamp(x * (video_dimensions.size.w - window_w) / (2 * video_dimensions.size.w), -3, 3) .. ";" - end - if y then - command = command .. "no-osd set video-pan-y " .. clamp(y * (video_dimensions.size.h - window_h) / (2 * video_dimensions.size.h), -3, 3) .. ";" - end - if command ~= "" then - mp.command(command) - end -end - -function pan_image(axis, amount, zoom_invariant, image_constrained) - amount = tonumber(amount) - if not amount or amount == 0 or axis ~= "x" and axis ~= "y" then return end - if zoom_invariant == "yes" then - amount = amount / 2 ^ mp.get_property_number("video-zoom") - end - local prop = "video-pan-" .. axis - local old_pan = mp.get_property_number(prop) - if image_constrained == "yes" then - local video_dimensions = get_video_dimensions() - if not video_dimensions then return end - local measure = axis == "x" and "w" or "h" - local window = {} - window.w, window.h = mp.get_osd_size() - local pixels_moved = amount * video_dimensions.size[measure] - -- should somehow refactor this - if pixels_moved > 0 then - if window[measure] > video_dimensions.size[measure] then - if video_dimensions.bottom_right[axis] >= window[measure] then return end - if video_dimensions.bottom_right[axis] + pixels_moved > window[measure] then - amount = (window[measure] - video_dimensions.bottom_right[axis]) / video_dimensions.size[measure] - end - else - if video_dimensions.top_left[axis] >= 0 then return end - if video_dimensions.top_left[axis] + pixels_moved > 0 then - amount = (0 - video_dimensions.top_left[axis]) / video_dimensions.size[measure] - end - end - else - if window[measure] > video_dimensions.size[measure] then - if video_dimensions.top_left[axis] <= 0 then return end - if video_dimensions.top_left[axis] + pixels_moved < 0 then - amount = (0 - video_dimensions.top_left[axis]) / video_dimensions.size[measure] - end - else - if video_dimensions.bottom_right[axis] <= window[measure] then return end - if video_dimensions.bottom_right[axis] + pixels_moved < window[measure] then - amount = (window[measure] - video_dimensions.bottom_right[axis]) / video_dimensions.size[measure] - end - end - end - end - mp.set_property_number(prop, old_pan + amount) -end - -function rotate_video(amt) - local rot = mp.get_property_number("video-rotate") - rot = (rot + amt) % 360 - mp.set_property_number("video-rotate", rot) -end - -function reset_pan_if_visible() - local video_dimensions = get_video_dimensions() - if not video_dimensions then return end - local window_w, window_h = mp.get_osd_size() - local command = "" - if (window_w >= video_dimensions.size.w) then - command = command .. "no-osd set video-pan-x 0" .. ";" - end - if (window_h >= video_dimensions.size.h) then - command = command .. "no-osd set video-pan-y 0" .. ";" - end - if command ~= "" then - mp.command(command) - end -end - -function force_print_filename() - mp.set_property("msg-level", "cplayer=info") - mp.commandv("print-text", mp.get_property("path")) - mp.set_property("msg-level", "all=no") -end - -function draw_ass() - local ww, wh = mp.get_osd_size() - local merge = function(a, b) - return b ~= "" and (a .. "\n" .. b) or a - end - mp.set_osd_ass(ww, wh, merge(merge(ass.status_line, ass.minimap), ass.ruler)) -end - -local status_line_enabled = false -local status_line_stale = true - -function mark_status_line_stale() - status_line_stale = true -end - -function refresh_status_line() - if not status_line_stale then return end - status_line_stale = false - local path = mp.get_property("path") - if path == nil or path == "" then - ass.status_line = "" - draw_ass() - return - end - local expanded = mp.command_native({ "expand-text", opts.status_line }) - if not expanded then - msg.warn("Error expanding status line") - ass.status_line = "" - draw_ass() - return - end - local w,h = mp.get_osd_size() - local an, x, y - local margin = 10 - if opts.status_line_position == "top_left" then - x = margin - y = margin - an = 7 - elseif opts.status_line_position == "top_right" then - x = w-margin - y = margin - an = 9 - elseif opts.status_line_position == "bottom_right" then - x = w-margin - y = h-margin - an = 3 - else - x = margin - y = h-margin - an = 1 - end - local a = assdraw:ass_new() - a:new_event() - a:an(an) - a:pos(x,y) - a:append("{\\fs".. opts.status_line_size.. "}{\\bord1.0}") - a:append(expanded) - ass.status_line = a.text - draw_ass() -end - -function enable_status_line() - if status_line_enabled then return end - status_line_enabled = true - local start = 0 - while true do - local s, e, cap = string.find(opts.status_line, "%${[?!]?([%l%d-/]*)", start) - if not s then break end - mp.observe_property(cap, nil, mark_status_line_stale) - start = e - end - mp.observe_property("path", nil, mark_status_line_stale) - mp.observe_property("osd-width", nil, mark_status_line_stale) - mp.observe_property("osd-height", nil, mark_status_line_stale) - mp.register_idle(refresh_status_line) - mark_status_line_stale() -end - -function disable_status_line() - if not status_line_enabled then return end - status_line_enabled = false - mp.unobserve_property(mark_status_line_stale) - mp.unregister_idle(refresh_status_line) - ass.status_line = "" - draw_ass() -end - -if opts.status_line_enabled then - enable_status_line() -end - -if opts.command_on_image_loaded ~= "" or opts.command_on_non_image_loaded ~= "" then - local was_image = false - local frame_count = nil - local audio_tracks = nil - local out_params_ready = nil - local path = nil - - function state_changed() - function set_image(is_image) - if is_image and not was_image and opts.command_on_first_image_loaded ~= "" then - mp.command(opts.command_on_first_image_loaded) - end - if is_image and opts.command_on_image_loaded ~= "" then - mp.command(opts.command_on_image_loaded) - end - if not is_image and was_image and opts.command_on_non_image_loaded ~= "" then - mp.command(opts.command_on_non_image_loaded) - end - was_image = is_image - end - -- only do things when state is consistent - if path ~= nil and audio_tracks ~= nil then - if frame_count == nil and audio_tracks > 0 then - set_image(false) - elseif out_params_ready and frame_count ~= nil then - -- png have 0 frames, jpg 1 ¯\_(ツ)_/¯ - set_image((frame_count == 0 or frame_count == 1) and audio_tracks == 0) - end - end - end - - mp.observe_property("video-out-params/par", "number", function(_, val) - out_params_ready = (val ~= nil and val > 0) - state_changed() - end) - mp.observe_property("estimated-frame-count", "number", function(_, val) - frame_count = val - state_changed() - end) - mp.observe_property("path", "string", function(_, val) - if not val or val == "" then - path = nil - else - path = val - end - state_changed() - end) - mp.register_event("tracks-changed", function() - audio_tracks = 0 - local tracks = 0 - for _, track in ipairs(mp.get_property_native("track-list")) do - tracks = tracks + 1 - if track.type == "audio" then - audio_tracks = audio_tracks + 1 - end - end - if tracks == 0 then - audio_tracks = nil - end - state_changed() - end) -end - -function refresh_minimap() - local dim = get_video_dimensions() - if not dim then - ass.minimap = "" - draw_ass() - return - end - if _minimap_old_timestamp and dim.timestamp == _minimap_old_timestamp then return end - _minimap_old_timestamp = dim.timestamp - local ww, wh = mp.get_osd_size() - if opts.minimap_hide_when_full_image_in_view then - if dim.top_left.x >= 0 and - dim.top_left.y >= 0 and - dim.bottom_right.x <= ww and - dim.bottom_right.y <= wh - then - ass.minimap = "" - draw_ass() - return - end - end - local center = { - x=opts.minimap_center[1]/100*ww, - y=opts.minimap_center[2]/100*wh - } - local cutoff = { - x=opts.minimap_max_size[1]/100*ww/2, - y=opts.minimap_max_size[2]/100*wh/2 - } - local a = assdraw.ass_new() - local draw = function(x, y, w, h, opacity, color) - a:new_event() - a:pos(center.x, center.y) - a:append("{\\bord0}") - a:append("{\\shad0}") - a:append("{\\c&" .. color .. "&}") - a:append("{\\2a&HFF}") - a:append("{\\3a&HFF}") - a:append("{\\4a&HFF}") - a:append("{\\1a&H" .. opacity .. "}") - w=w/2 - h=h/2 - a:draw_start() - local rounded = {true,true,true,true} -- tl, tr, br, bl - local x0,y0,x1,y1 = x-w, y-h, x+w, y+h - if x0 < -cutoff.x then - x0 = -cutoff.x - rounded[4] = false - rounded[1] = false - end - if y0 < -cutoff.y then - y0 = -cutoff.y - rounded[1] = false - rounded[2] = false - end - if x1 > cutoff.x then - x1 = cutoff.x - rounded[2] = false - rounded[3] = false - end - if y1 > cutoff.y then - y1 = cutoff.y - rounded[3] = false - rounded[4] = false - end - - local r = 3 - local c = 0.551915024494 * r - if rounded[0] then - a:move_to(x0 + r, y0) - else - a:move_to(x0,y0) - end - if rounded[1] then - a:line_to(x1 - r, y0) - a:bezier_curve(x1 - r + c, y0, x1, y0 + r - c, x1, y0 + r) - else - a:line_to(x1, y0) - end - if rounded[2] then - a:line_to(x1, y1 - r) - a:bezier_curve(x1, y1 - r + c, x1 - r + c, y1, x1 - r, y1) - else - a:line_to(x1, y1) - end - if rounded[3] then - a:line_to(x0 + r, y1) - a:bezier_curve(x0 + r - c, y1, x0, y1 - r + c, x0, y1 - r) - else - a:line_to(x0, y1) - end - if rounded[4] then - a:line_to(x0, y0 + r) - a:bezier_curve(x0, y0 + r - c, x0 + r - c, y0, x0 + r, y0) - else - a:line_to(x0, y0) - end - a:draw_stop() - end - local image = function() - draw((dim.top_left.x + dim.size.w/2 - ww/2) / opts.minimap_scale, - (dim.top_left.y + dim.size.h/2 - wh/2) / opts.minimap_scale, - dim.size.w / opts.minimap_scale, - dim.size.h / opts.minimap_scale, - opts.minimap_image_opacity, - opts.minimap_image_color) - end - local view = function() - draw(0, - 0, - ww / opts.minimap_scale, - wh / opts.minimap_scale, - opts.minimap_view_opacity, - opts.minimap_view_color) - end - if opts.minimap_view_above_image then - image() - view() - else - view() - image() - end - ass.minimap = a.text - draw_ass() -end - -local minimap_enabled = false - -function enable_minimap() - if minimap_enabled then return end - minimap_enabled = true - mp.register_idle(refresh_minimap) -end - -function disable_minimap() - if not minimap_enabled then return end - minimap_enabled = false - ass.minimap = a.text - draw_ass() - mp.unregister_idle(refresh_minimap) -end - -if opts.minimap_enabled then - enable_minimap() -end - -local ruler_state = 0 -- {0,1,2,3} = {inactive,setting first point,setting second point,done} -local ruler_first_point = nil -- in video space coordinates -local ruler_second_point = nil -- in video space coordinates - -function cursor_video_space() - local dim = get_video_dimensions() - if not dim then return nil end - local mx, my = mp.get_mouse_pos() - local ret = {} - ret.x = (mx - dim.top_left.x) / dim.ratios.w - ret.y = (my - dim.top_left.y) / dim.ratios.h - return ret -end -function video_space_to_screen(point) - local dim = get_video_dimensions() - if not dim then return nil end - local ret = {} - ret.x = point.x * dim.ratios.w + dim.top_left.x - ret.y = point.y * dim.ratios.h + dim.top_left.y - return ret -end - -function refresh_ruler() - local dim = get_video_dimensions() - if not dim then - ass.ruler = "" - draw_ass() - return - end - - local line_start = {} - local line_end = {} - if ruler_second_point then - line_start.image = ruler_first_point - line_start.screen = video_space_to_screen(ruler_first_point) - line_end.image = ruler_second_point - line_end.screen = video_space_to_screen(ruler_second_point) - elseif ruler_first_point then - line_start.image = ruler_first_point - line_start.screen = video_space_to_screen(ruler_first_point) - line_end.image = cursor_video_space() - line_end.screen = {} - line_end.screen.x, line_end.screen.y = mp.get_mouse_pos() - else - local mx, my = mp.get_mouse_pos() - line_start.image = cursor_video_space() - line_start.screen = {} - line_start.screen.x, line_start.screen.y = mp.get_mouse_pos() - line_end = line_start - end - local distinct = (math.abs(line_start.screen.x - line_end.screen.x) >= 1 - or math.abs(line_start.screen.y - line_end.screen.y) >= 1) - - local a = assdraw:ass_new() - local draw_setup = function(bord) - a:new_event() - a:pos(0,0) - a:append("{\\bord" .. bord .. "}") - a:append("{\\shad0}") - local r = opts.ruler_line_color - a:append("{\\3c&H".. r .. r .. r .. "&}") - a:append("{\\1a&HFF}") - a:append("{\\2a&HFF}") - a:append("{\\3a&H00}") - a:append("{\\4a&HFF}") - a:draw_start() - end - local dot = function(pos, size) - draw_setup(size) - a:move_to(pos.x, pos.y-0.5) - a:line_to(pos.x, pos.y+0.5) - end - local line = function(from, to, size) - draw_setup(size) - a:move_to(from.x, from.y) - a:line_to(to.x, to.y) - end - if distinct then - dot(line_start.screen, opts.ruler_dots_radius) - line(line_start.screen, line_end.screen, opts.ruler_line_width) - dot(line_end.screen, opts.ruler_dots_radius) - else - dot(line_start.screen, opts.ruler_dots_radius) - end - - local line_info = function() - if not opts.ruler_show_distance then return end - a:new_event() - a:append("{\\fs36}{\\bord1}") - a:pos((line_start.screen.x + line_end.screen.x) / 2, (line_start.screen.y + line_end.screen.y) / 2) - local an = 1 - if line_start.image.x < line_end.image.x then an = an + 2 end - if line_start.image.y < line_end.image.y then an = an + 6 end - a:an(an) - local image = math.sqrt(math.pow(line_start.image.x - line_end.image.x, 2) + math.pow(line_start.image.y - line_end.image.y, 2)) - local screen = math.sqrt(math.pow(line_start.screen.x - line_end.screen.x, 2) + math.pow(line_start.screen.y - line_end.screen.y, 2)) - if opts.ruler_coordinates_space == "both" then - a:append(string.format("image: %.1f\\Nscreen: %.1f", image, screen)) - elseif opts.ruler_coordinates_space == "image" then - a:append(string.format("%.1f", image)) - elseif opts.ruler_coordinates_space == "window" then - a:append(string.format("%.1f", screen)) - end - end - local dot_info = function(pos, opposite) - if not opts.ruler_show_coordinates then return end - a:new_event() - a:append("{\\fs" .. opts.ruler_font_size .."}{\\bord1}") - a:pos(pos.screen.x, pos.screen.y) - local an - if distinct then - an = 1 - if line_start.image.x > line_end.image.x then an = an + 2 end - if line_start.image.y < line_end.image.y then an = an + 6 end - else - an = 7 - end - if opposite then - an = 9 + 1 - an - end - a:an(an) - if opts.ruler_coordinates_space == "both" then - a:append(string.format("image: %.1f, %.1f\\Nscreen: %i, %i", - pos.image.x, pos.image.y, pos.screen.x, pos.screen.y)) - elseif opts.ruler_coordinates_space == "image" then - a:append(string.format("%.1f, %.1f", pos.image.x, pos.image.y)) - elseif opts.ruler_coordinates_space == "window" then - a:append(string.format("%i, %i", pos.screen.x, pos.screen.y)) - end - end - dot_info(line_start, true) - if distinct then - line_info() - dot_info(line_end, false) - end - if distinct and opts.ruler_show_angles ~= "no" then - local dist = 50 - local pos_from_angle = function(mult, angle) - return { - x = line_start.screen.x + mult * dist * math.cos(angle), - y = line_start.screen.y + mult * dist * math.sin(angle) - } - end - local extended = {x=line_start.screen.x, y=line_start.screen.y} - if line_end.screen.x > line_start.screen.x then - extended.x = extended.x + dist - else - extended.x = extended.x - dist - end - line(line_start.screen, extended, math.max(0, opts.ruler_line_width-0.5)) - local angle = math.atan(math.abs(line_start.image.y - line_end.image.y) / math.abs(line_start.image.x - line_end.image.x)) - local fix_angle - local an - if line_end.image.y < line_start.image.y and line_end.image.x > line_start.image.x then - -- upper-right - an = 4 - fix_angle = function(angle) return - angle end - elseif line_end.image.y < line_start.image.y then - -- upper-left - an = 6 - fix_angle = function(angle) return math.pi + angle end - elseif line_end.image.x < line_start.image.x then - -- bottom-left - an = 6 - fix_angle = function(angle) return math.pi - angle end - else - -- bottom-right - an = 4 - fix_angle = function(angle) return angle end - end - -- should implement this https://math.stackexchange.com/questions/873224/calculate-control-points-of-cubic-bezier-curve-approximating-a-part-of-a-circle - local cp1 = pos_from_angle(1, fix_angle(angle*1/4)) - local cp2 = pos_from_angle(1, fix_angle(angle*3/4)) - local p2 = pos_from_angle(1, fix_angle(angle)) - a:bezier_curve(cp1.x, cp1.y, cp2.x, cp2.y, p2.x, p2.y) - - a:new_event() - a:append("{\\fs" .. opts.ruler_font_size .."}{\\bord1}") - local text_pos = pos_from_angle(1.1, fix_angle(angle*2/3)) -- you'd think /2 would make more sense, but *2/3 looks better - a:pos(text_pos.x, text_pos.y) - a:an(an) - if opts.ruler_show_angles == "both" then - a:append(string.format("%.2f\\N%.1f°", angle, angle / math.pi * 180)) - elseif opts.ruler_show_angles == "degrees" then - a:append(string.format("%.1f°", angle / math.pi * 180)) - elseif opts.ruler_show_angles == "radians" then - a:append(string.format("%.2f", angle)) - end - end - - ass.ruler = a.text - draw_ass() -end - -function ruler_next() - if ruler_state == 0 then - mp.register_idle(refresh_ruler) - add_mouse_move_callback("ruler", function() end) -- only used to get an idle event on mouse move - for _,key in ipairs(opts.ruler_confirm_bindings) do - mp.add_forced_key_binding(key, "ruler-next-" .. key, ruler_next) - end - for _,key in ipairs(opts.ruler_exit_bindings) do - mp.add_forced_key_binding(key, "ruler-stop-" .. key, ruler_stop) - end - ruler_state = 1 - if opts.ruler_set_first_point_on_begin then - ruler_next() - end - elseif ruler_state == 1 then - ruler_first_point = cursor_video_space() - ruler_state = 2 - elseif ruler_state == 2 then - ruler_state = 3 - ruler_second_point = cursor_video_space() - if opts.ruler_clear_on_second_point_set then - ruler_next() - end - else - ruler_stop() - end -end - -function ruler_stop() - if ruler_state == 0 then return end - mp.unregister_idle(refresh_ruler) - for _,key in ipairs(opts.ruler_confirm_bindings) do - mp.remove_key_binding("ruler-next-" .. key) - end - for _,key in ipairs(opts.ruler_exit_bindings) do - mp.remove_key_binding("ruler-stop-" .. key) - end - remove_mouse_move_callback("ruler") - ruler_state = 0 - ruler_first_point = nil - ruler_second_point = nil - ass.ruler = "" - draw_ass() -end - -mp.add_key_binding(nil, "drag-to-pan", drag_to_pan_handler, {complex = true}) -mp.add_key_binding(nil, "pan-follows-cursor", pan_follows_cursor_handler, {complex = true}) -mp.add_key_binding(nil, "cursor-centric-zoom", cursor_centric_zoom_handler) -mp.add_key_binding(nil, "align-border", align_border) -mp.add_key_binding(nil, "pan-image", pan_image) -mp.add_key_binding(nil, "rotate-video", rotate_video) -mp.add_key_binding(nil, "reset-pan-if-visible", reset_pan_if_visible) -mp.add_key_binding(nil, "force-print-filename", force_print_filename) - -mp.add_key_binding(nil, "ruler", ruler_next) - -mp.add_key_binding(nil, "enable-status-line", enable_status_line) -mp.add_key_binding(nil, "disable-status-line", disable_status_line) -mp.add_key_binding(nil, "toggle-status-line", function() if status_line_enabled then disable_status_line() else enable_status_line() end end) - -mp.add_key_binding(nil, "enable-minimap", enable_minimap) -mp.add_key_binding(nil, "disable-minimap", disable_minimap) -mp.add_key_binding(nil, "toggle-minimap", function() if minimap_enabled then disable_minimap() else enable_minimap() end end) From 8f700627f7954c6660362644c334fba264a2147c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 25 Jul 2022 14:57:05 +0300 Subject: [PATCH 1163/2667] korhonen.cc: add finnish 404 page --- docker/korhonen.cc/nginx.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/korhonen.cc/nginx.conf b/docker/korhonen.cc/nginx.conf index d98043e3..18392922 100644 --- a/docker/korhonen.cc/nginx.conf +++ b/docker/korhonen.cc/nginx.conf @@ -12,6 +12,10 @@ server { access_log off; add_header Cache-Control "public"; } + + location /fi { + error_page 404 /fi/404.html; + } } # Use hugo 404 page From b8a89ed59e3651889c33496013aaf984b6762954 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 25 Jul 2022 14:57:05 +0300 Subject: [PATCH 1164/2667] korhonen.cc: add finnish 404 page --- docker/korhonen.cc/nginx.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/korhonen.cc/nginx.conf b/docker/korhonen.cc/nginx.conf index d98043e3..18392922 100644 --- a/docker/korhonen.cc/nginx.conf +++ b/docker/korhonen.cc/nginx.conf @@ -12,6 +12,10 @@ server { access_log off; add_header Cache-Control "public"; } + + location /fi { + error_page 404 /fi/404.html; + } } # Use hugo 404 page From 910c15fd429143fc06c68c89b9317f9b034b3842 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 25 Jul 2022 15:07:50 +0300 Subject: [PATCH 1165/2667] Neovim: Migrate catppuccin config according to instructions --- .../nvim/lua/pluginconf/colorscheme.lua | 105 ++++++++---------- 1 file changed, 49 insertions(+), 56 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/colorscheme.lua b/home/.config/nvim/lua/pluginconf/colorscheme.lua index 46056f78..f176fb17 100644 --- a/home/.config/nvim/lua/pluginconf/colorscheme.lua +++ b/home/.config/nvim/lua/pluginconf/colorscheme.lua @@ -1,56 +1,49 @@ -require("catppuccin").setup( - { - transparent_background = false, - term_colors = false, - styles = { - comments = "italic", - functions = "italic", - keywords = "italic", - strings = "NONE", - variables = "NONE", - }, - integrations = { - treesitter = true, - native_lsp = { - enabled = true, - virtual_text = { - errors = "italic", - hints = "italic", - warnings = "italic", - information = "italic", - }, - underlines = { - errors = "underline", - hints = "underline", - warnings = "underline", - information = "underline", - }, - }, - lsp_trouble = false, - lsp_saga = false, - gitgutter = true, - gitsigns = false, - telescope = true, - nvimtree = { - enabled = false, - show_root = false, - }, - which_key = false, - indent_blankline = { - enabled = true, - colored_indent_levels = false, - }, - dashboard = false, - neogit = false, - vim_sneak = false, - fern = false, - barbar = false, - bufferline = false, - markdown = false, - lightspeed = false, - ts_rainbow = false, - hop = false, - }, - } -) -vim.cmd[[colorscheme catppuccin]] +require("catppuccin").setup({ + transparent_background = false, + term_colors = false, + compile = {enabled = true, path = vim.fn.stdpath "cache" .. "/catppuccin"}, + styles = { + comments = {"italic"}, + functions = {"italic"}, + keywords = {"italic"}, + strings = {}, + variables = {} + }, + integrations = { + treesitter = true, + native_lsp = { + enabled = true, + virtual_text = { + errors = {"italic"}, + hints = {"italic"}, + warnings = {"italic"}, + information = {"italic"} + }, + underlines = { + errors = {"underline"}, + hints = {"underline"}, + warnings = {"underline"}, + information = {"underline"} + } + }, + lsp_trouble = false, + lsp_saga = false, + gitgutter = true, + gitsigns = false, + telescope = true, + nvimtree = {enabled = false, show_root = false}, + which_key = false, + indent_blankline = {enabled = true, colored_indent_levels = false}, + dashboard = false, + neogit = false, + vim_sneak = false, + fern = false, + barbar = false, + bufferline = false, + markdown = false, + lightspeed = false, + ts_rainbow = false, + hop = false + } +}) +vim.cmd [[colorscheme catppuccin]] From 0dd8c5c44de3dc32579cec261ca788d5aa02a657 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 25 Jul 2022 15:07:50 +0300 Subject: [PATCH 1166/2667] Neovim: Migrate catppuccin config according to instructions --- .../nvim/lua/pluginconf/colorscheme.lua | 105 ++++++++---------- 1 file changed, 49 insertions(+), 56 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/colorscheme.lua b/home/.config/nvim/lua/pluginconf/colorscheme.lua index 46056f78..f176fb17 100644 --- a/home/.config/nvim/lua/pluginconf/colorscheme.lua +++ b/home/.config/nvim/lua/pluginconf/colorscheme.lua @@ -1,56 +1,49 @@ -require("catppuccin").setup( - { - transparent_background = false, - term_colors = false, - styles = { - comments = "italic", - functions = "italic", - keywords = "italic", - strings = "NONE", - variables = "NONE", - }, - integrations = { - treesitter = true, - native_lsp = { - enabled = true, - virtual_text = { - errors = "italic", - hints = "italic", - warnings = "italic", - information = "italic", - }, - underlines = { - errors = "underline", - hints = "underline", - warnings = "underline", - information = "underline", - }, - }, - lsp_trouble = false, - lsp_saga = false, - gitgutter = true, - gitsigns = false, - telescope = true, - nvimtree = { - enabled = false, - show_root = false, - }, - which_key = false, - indent_blankline = { - enabled = true, - colored_indent_levels = false, - }, - dashboard = false, - neogit = false, - vim_sneak = false, - fern = false, - barbar = false, - bufferline = false, - markdown = false, - lightspeed = false, - ts_rainbow = false, - hop = false, - }, - } -) -vim.cmd[[colorscheme catppuccin]] +require("catppuccin").setup({ + transparent_background = false, + term_colors = false, + compile = {enabled = true, path = vim.fn.stdpath "cache" .. "/catppuccin"}, + styles = { + comments = {"italic"}, + functions = {"italic"}, + keywords = {"italic"}, + strings = {}, + variables = {} + }, + integrations = { + treesitter = true, + native_lsp = { + enabled = true, + virtual_text = { + errors = {"italic"}, + hints = {"italic"}, + warnings = {"italic"}, + information = {"italic"} + }, + underlines = { + errors = {"underline"}, + hints = {"underline"}, + warnings = {"underline"}, + information = {"underline"} + } + }, + lsp_trouble = false, + lsp_saga = false, + gitgutter = true, + gitsigns = false, + telescope = true, + nvimtree = {enabled = false, show_root = false}, + which_key = false, + indent_blankline = {enabled = true, colored_indent_levels = false}, + dashboard = false, + neogit = false, + vim_sneak = false, + fern = false, + barbar = false, + bufferline = false, + markdown = false, + lightspeed = false, + ts_rainbow = false, + hop = false + } +}) +vim.cmd [[colorscheme catppuccin]] From 565b902df15c5ec9161f6c0beca0a8d840064e7a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 25 Jul 2022 16:23:26 +0300 Subject: [PATCH 1167/2667] Use filetype.nvim for now instead of filetype.lua for now since it stopped working --- home/.config/nvim/lua/pluginmanager.lua | 3 +++ home/.config/nvim/lua/settings.lua | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 3f49f2ea..16825faa 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -112,6 +112,9 @@ require('packer').startup(function() -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' + -- Modern filetype.vim replacement + use("nathom/filetype.nvim") + end) -- Install plugins if packer was not installed diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 9a78309d..8ff34740 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -48,10 +48,6 @@ o.splitright = true o.ignorecase = true o.smartcase = true --- Enable filetype.lua -g.do_filetype_lua = 1 -g.did_load_filetypes = 0 - -- Use mouse o.mouse = 'a' From 99adba52d38345de8ab2f4b6af352cd02616271f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 25 Jul 2022 16:23:26 +0300 Subject: [PATCH 1168/2667] Use filetype.nvim for now instead of filetype.lua for now since it stopped working --- home/.config/nvim/lua/pluginmanager.lua | 3 +++ home/.config/nvim/lua/settings.lua | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 3f49f2ea..16825faa 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -112,6 +112,9 @@ require('packer').startup(function() -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' + -- Modern filetype.vim replacement + use("nathom/filetype.nvim") + end) -- Install plugins if packer was not installed diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 9a78309d..8ff34740 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -48,10 +48,6 @@ o.splitright = true o.ignorecase = true o.smartcase = true --- Enable filetype.lua -g.do_filetype_lua = 1 -g.did_load_filetypes = 0 - -- Use mouse o.mouse = 'a' From 523dc563b3d0097cea1be473b2f8cee745d3c1a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Aug 2022 11:15:30 +0300 Subject: [PATCH 1169/2667] Run docker prune every time docker updates --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 7e9f1829..8a3e493a 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -145,7 +145,6 @@ update() { {%@@ if profile == "Moria" @@%} repo docker-update - docker system prune --volumes -a {%@@ endif @@%} plugins } @@ -172,6 +171,7 @@ update() { fi cd .. done + docker system prune -af --volumes } if [ $# -eq 0 ]; then From 69cabe05e5ab9b6d3f3d0f64159d7e53a7a841b2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Aug 2022 11:15:30 +0300 Subject: [PATCH 1170/2667] Run docker prune every time docker updates --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 7e9f1829..8a3e493a 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -145,7 +145,6 @@ update() { {%@@ if profile == "Moria" @@%} repo docker-update - docker system prune --volumes -a {%@@ endif @@%} plugins } @@ -172,6 +171,7 @@ update() { fi cd .. done + docker system prune -af --volumes } if [ $# -eq 0 ]; then From 6ccbf70b572685cd4ef5531ec3153fd49dffe2d6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 Aug 2022 17:12:18 +0300 Subject: [PATCH 1171/2667] Move git config to standard xdg path out of home directory --- config.toml | 4 ++-- home/{.gitconfig => .config/git/config} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename home/{.gitconfig => .config/git/config} (100%) diff --git a/config.toml b/config.toml index 0f85192c..5bd3320c 100644 --- a/config.toml +++ b/config.toml @@ -86,8 +86,8 @@ dst = "~/.config/bspwm/bspwmrc" src = ".config/bspwm/bspwmrc" [dotfiles.f_gitconfig] -dst = "~/.gitconfig" -src = ".gitconfig" +dst = "~/.config/git/config" +src = ".config/git/config" [dotfiles.f_libra_config] dst = "~/.config/libra/config.toml" diff --git a/home/.gitconfig b/home/.config/git/config similarity index 100% rename from home/.gitconfig rename to home/.config/git/config From c0d8b72f0ef13561b51e7a08e551b6e9ddb01e47 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 Aug 2022 17:12:18 +0300 Subject: [PATCH 1172/2667] Move git config to standard xdg path out of home directory --- config.toml | 4 ++-- home/{.gitconfig => .config/git/config} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename home/{.gitconfig => .config/git/config} (100%) diff --git a/config.toml b/config.toml index 0f85192c..5bd3320c 100644 --- a/config.toml +++ b/config.toml @@ -86,8 +86,8 @@ dst = "~/.config/bspwm/bspwmrc" src = ".config/bspwm/bspwmrc" [dotfiles.f_gitconfig] -dst = "~/.gitconfig" -src = ".gitconfig" +dst = "~/.config/git/config" +src = ".config/git/config" [dotfiles.f_libra_config] dst = "~/.config/libra/config.toml" diff --git a/home/.gitconfig b/home/.config/git/config similarity index 100% rename from home/.gitconfig rename to home/.config/git/config From 5acb1dfb07505eb23c0a4235ab36a0472073fa85 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Aug 2022 09:41:20 +0300 Subject: [PATCH 1173/2667] Include work laptop configuration in update alias --- home/.config/zsh/03-aliases.zsh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 8a3e493a..a74e1d71 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -141,7 +141,12 @@ passync() { pass git pull && pass git push && updatesecrets } update() { all() { + {%@@ if profile == "Moria" or profile == 'Mirkwood' @@%} paru + {%@@ endif @@%} + {%@@ if profile == "mko-laptop" @@%} + apt + {%@@ endif @@%} {%@@ if profile == "Moria" @@%} repo docker-update @@ -174,8 +179,12 @@ update() { docker system prune -af --volumes } + apt() { + sudo apt update && sudo apt full-upgrade -y && sudo apt autoremove -y && sudo apt autoclean -y + } + if [ $# -eq 0 ]; then - 1=base + 1=all fi case "$1" in @@ -185,14 +194,21 @@ update() { plugins) plugins ;; + {%@@ if profile == "Moria" @@%} docker) docker-update ;; repo) repo ;; + {%@@ endif @@%} + {%@@ if profile == "mko-laptop" @@%} + apt) + apt + ;; + {%@@ endif @@%} *) - paru + all ;; esac } From 60375ed18a3d5417dceb33ace84635b8cee614d6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Aug 2022 09:41:20 +0300 Subject: [PATCH 1174/2667] Include work laptop configuration in update alias --- home/.config/zsh/03-aliases.zsh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 8a3e493a..a74e1d71 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -141,7 +141,12 @@ passync() { pass git pull && pass git push && updatesecrets } update() { all() { + {%@@ if profile == "Moria" or profile == 'Mirkwood' @@%} paru + {%@@ endif @@%} + {%@@ if profile == "mko-laptop" @@%} + apt + {%@@ endif @@%} {%@@ if profile == "Moria" @@%} repo docker-update @@ -174,8 +179,12 @@ update() { docker system prune -af --volumes } + apt() { + sudo apt update && sudo apt full-upgrade -y && sudo apt autoremove -y && sudo apt autoclean -y + } + if [ $# -eq 0 ]; then - 1=base + 1=all fi case "$1" in @@ -185,14 +194,21 @@ update() { plugins) plugins ;; + {%@@ if profile == "Moria" @@%} docker) docker-update ;; repo) repo ;; + {%@@ endif @@%} + {%@@ if profile == "mko-laptop" @@%} + apt) + apt + ;; + {%@@ endif @@%} *) - paru + all ;; esac } From efae4c58c065ba67248d61007e475d99e20672dd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Aug 2022 09:47:44 +0300 Subject: [PATCH 1175/2667] Refine update alias --- home/.config/zsh/03-aliases.zsh | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index a74e1d71..93a6db86 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -154,10 +154,6 @@ update() { plugins } - repo() { - aur sync -Su --margs --noconfirm - } - plugins() { nvim +PackerSync +TSUpdate zinit self-update @@ -165,6 +161,11 @@ update() { $HOME/.tmux/plugins/tpm/bin/update_plugins all } + {%@@ if profile == "Moria" @@%} + repo() { + aur sync -Su --margs --noconfirm + } + docker-update() { for dir in $HOME/git/dotfiles/docker/*; do cd $dir @@ -179,13 +180,12 @@ update() { docker system prune -af --volumes } - apt() { + {%@@ endif @@%} + {%@@ if profile == "mko-laptop" @@%} + apt-upd() { sudo apt update && sudo apt full-upgrade -y && sudo apt autoremove -y && sudo apt autoclean -y } - - if [ $# -eq 0 ]; then - 1=all - fi + {%@@ endif @@%} case "$1" in all) @@ -204,18 +204,20 @@ update() { {%@@ endif @@%} {%@@ if profile == "mko-laptop" @@%} apt) - apt + apt-upd ;; {%@@ endif @@%} *) - all + {%@@ if profile == "mko-laptop" @@%} + apt-upd ;; + {%@@ else @@%} + paru + ;; + {%@@ endif @@%} esac } -# remove unneeded packages -autoremove() { sudo pacman -Rns $(pacman -Qdtq) } - # turn on usb tethering on my android phone tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/null } From 8fe76f19c0aadfd864ae9de341cbb59a54c80425 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Aug 2022 09:47:44 +0300 Subject: [PATCH 1176/2667] Refine update alias --- home/.config/zsh/03-aliases.zsh | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index a74e1d71..93a6db86 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -154,10 +154,6 @@ update() { plugins } - repo() { - aur sync -Su --margs --noconfirm - } - plugins() { nvim +PackerSync +TSUpdate zinit self-update @@ -165,6 +161,11 @@ update() { $HOME/.tmux/plugins/tpm/bin/update_plugins all } + {%@@ if profile == "Moria" @@%} + repo() { + aur sync -Su --margs --noconfirm + } + docker-update() { for dir in $HOME/git/dotfiles/docker/*; do cd $dir @@ -179,13 +180,12 @@ update() { docker system prune -af --volumes } - apt() { + {%@@ endif @@%} + {%@@ if profile == "mko-laptop" @@%} + apt-upd() { sudo apt update && sudo apt full-upgrade -y && sudo apt autoremove -y && sudo apt autoclean -y } - - if [ $# -eq 0 ]; then - 1=all - fi + {%@@ endif @@%} case "$1" in all) @@ -204,18 +204,20 @@ update() { {%@@ endif @@%} {%@@ if profile == "mko-laptop" @@%} apt) - apt + apt-upd ;; {%@@ endif @@%} *) - all + {%@@ if profile == "mko-laptop" @@%} + apt-upd ;; + {%@@ else @@%} + paru + ;; + {%@@ endif @@%} esac } -# remove unneeded packages -autoremove() { sudo pacman -Rns $(pacman -Qdtq) } - # turn on usb tethering on my android phone tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/null } From bb6771e968762b2d63800ff566b77fb104eb38aa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 Aug 2022 09:37:38 +0300 Subject: [PATCH 1177/2667] Refine neovim updates --- config.toml | 2 +- home/.config/nvim/lua/pluginmanager.lua | 11 ++++++++--- home/.config/zsh/03-aliases.zsh | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/config.toml b/config.toml index 5bd3320c..ec0114fe 100644 --- a/config.toml +++ b/config.toml @@ -1,5 +1,5 @@ [actions] -nvim-packer-sync = "nvim +PackerSync" +nvim-packer-sync = "nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync'" [config] backup = true diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 16825faa..07fa44c0 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -79,7 +79,12 @@ require('packer').startup(function() use "rafamadriz/friendly-snippets" -- Snippets collection -- treesitter syntax highlight - use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} + use { + 'nvim-treesitter/nvim-treesitter', + run = function() + require('nvim-treesitter.install').update({with_sync = true}) + end + } -- treesitter plugin for commentstring use 'JoosepAlviste/nvim-ts-context-commentstring' @@ -112,8 +117,8 @@ require('packer').startup(function() -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' - -- Modern filetype.vim replacement - use("nathom/filetype.nvim") + -- Modern filetype.vim replacement + use("nathom/filetype.nvim") end) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 93a6db86..dedf1c3c 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -155,7 +155,7 @@ update() { } plugins() { - nvim +PackerSync +TSUpdate + nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync' zinit self-update zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all From 2a0b4dd306c78879c05cfa93b323b63e636201f1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 Aug 2022 09:37:38 +0300 Subject: [PATCH 1178/2667] Refine neovim updates --- config.toml | 2 +- home/.config/nvim/lua/pluginmanager.lua | 11 ++++++++--- home/.config/zsh/03-aliases.zsh | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/config.toml b/config.toml index 5bd3320c..ec0114fe 100644 --- a/config.toml +++ b/config.toml @@ -1,5 +1,5 @@ [actions] -nvim-packer-sync = "nvim +PackerSync" +nvim-packer-sync = "nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync'" [config] backup = true diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 16825faa..07fa44c0 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -79,7 +79,12 @@ require('packer').startup(function() use "rafamadriz/friendly-snippets" -- Snippets collection -- treesitter syntax highlight - use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} + use { + 'nvim-treesitter/nvim-treesitter', + run = function() + require('nvim-treesitter.install').update({with_sync = true}) + end + } -- treesitter plugin for commentstring use 'JoosepAlviste/nvim-ts-context-commentstring' @@ -112,8 +117,8 @@ require('packer').startup(function() -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' - -- Modern filetype.vim replacement - use("nathom/filetype.nvim") + -- Modern filetype.vim replacement + use("nathom/filetype.nvim") end) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 93a6db86..dedf1c3c 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -155,7 +155,7 @@ update() { } plugins() { - nvim +PackerSync +TSUpdate + nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync' zinit self-update zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all From 558fecd30bea11c8bc043ccf2238b425e4acda47 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 Aug 2022 09:38:06 +0300 Subject: [PATCH 1179/2667] Fix filetype in git pager --- home/.config/zsh/01-env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 26b1c1eb..b85aece4 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -51,7 +51,7 @@ export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim export PAGER="$EDITOR -R +\"lua require 'pager'\"" -export GIT_PAGER="$EDITOR -R +\"lua require 'pager'\"" +export GIT_PAGER="$EDITOR -c 'set ft=git' -R +\"lua require 'pager'\"" export PARU_PAGER="$PAGER -c 'set ft=PKGBUILD'" export AUR_PAGER=$EDITOR export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" From 5e277ce5602f7b8d3c8087c733cf0236ac9ceb62 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 Aug 2022 09:38:06 +0300 Subject: [PATCH 1180/2667] Fix filetype in git pager --- home/.config/zsh/01-env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 26b1c1eb..b85aece4 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -51,7 +51,7 @@ export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim export PAGER="$EDITOR -R +\"lua require 'pager'\"" -export GIT_PAGER="$EDITOR -R +\"lua require 'pager'\"" +export GIT_PAGER="$EDITOR -c 'set ft=git' -R +\"lua require 'pager'\"" export PARU_PAGER="$PAGER -c 'set ft=PKGBUILD'" export AUR_PAGER=$EDITOR export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" From 4a995cecc8d844585bd98fa00f705e4820933fb9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 6 Aug 2022 12:18:43 +0300 Subject: [PATCH 1181/2667] Remove some unused aliases and files --- dotdrop.sh | 37 --------------------------------- home/.config/zsh/03-aliases.zsh | 15 ++----------- 2 files changed, 2 insertions(+), 50 deletions(-) delete mode 100755 dotdrop.sh diff --git a/dotdrop.sh b/dotdrop.sh deleted file mode 100755 index 8c458a5f..00000000 --- a/dotdrop.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash -# author: deadc0de6 (https://github.com/deadc0de6) -# Copyright (c) 2017, deadc0de6 - -# check for readlink/realpath presence -# https://github.com/deadc0de6/dotdrop/issues/6 -rl="readlink -f" - -if ! ${rl} "${0}" >/dev/null 2>&1; then - rl="realpath" - - if ! hash ${rl}; then - echo "\"${rl}\" not found!" && exit 1 - fi -fi - -# setup variables -args=("$@") -cur=$(dirname "$(${rl} "${0}")") -opwd=$(pwd) -cfg="${cur}/config.yaml" -sub="dotdrop" - -# pivot -cd "${cur}" || { echo "Directory \"${cur}\" doesn't exist, aborting." && exit 1; } -# init/update the submodule -if [ "${DOTDROP_AUTOUPDATE-yes}" = yes ] ; then - git submodule update --init --recursive - git submodule update --remote dotdrop -fi -# launch dotdrop -PYTHONPATH=dotdrop python3 -m dotdrop.dotdrop "${args[@]}" -ret="$?" -# pivot back -cd "${opwd}" || { echo "Directory \"${opwd}\" doesn't exist, aborting." && exit 1; } -# exit with dotdrop exit code -exit ${ret} diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index dedf1c3c..755b078b 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -102,9 +102,6 @@ clean() { alias startvpn='sudo systemctl start wg-quick@wg0.service' alias stopvpn='sudo systemctl stop wg-quick@wg0.service' -# connect to metropolia vpn -alias metropoliavpn='sudo openconnect -u markoak --passwd-on-stdin vpn.metropolia.fi' - # read qrcode from selection qr() { grim -g "$(slurp -d)" - | zbarimg PNG:- } @@ -117,21 +114,13 @@ cpick() { grim -g "$(slurp -p)" -t ppm - | convert - -format "%[pixel:p{0,0}]" t #iwctl aliases alias i='iwctl station wlan0' -# change cpu power settings -gpulow() { - echo low | sudo tee /sys/class/drm/card0/device/power_dpm_force_performance_level -} -gpuauto() { - echo auto | sudo tee /sys/class/drm/card0/device/power_dpm_force_performance_level -} - # monitor cpu freq cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop +dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml $@ } +sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ } updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } -dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config.toml $@ } -sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ } compdef _dotdrop-completion.zsh sdotdrop alias dotgit='git -C $DOTREPO' dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } From b5e3c8097567480bf188d582e62e71ad1efbcf67 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 6 Aug 2022 12:18:43 +0300 Subject: [PATCH 1182/2667] Remove some unused aliases and files --- dotdrop.sh | 37 --------------------------------- home/.config/zsh/03-aliases.zsh | 15 ++----------- 2 files changed, 2 insertions(+), 50 deletions(-) delete mode 100755 dotdrop.sh diff --git a/dotdrop.sh b/dotdrop.sh deleted file mode 100755 index 8c458a5f..00000000 --- a/dotdrop.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash -# author: deadc0de6 (https://github.com/deadc0de6) -# Copyright (c) 2017, deadc0de6 - -# check for readlink/realpath presence -# https://github.com/deadc0de6/dotdrop/issues/6 -rl="readlink -f" - -if ! ${rl} "${0}" >/dev/null 2>&1; then - rl="realpath" - - if ! hash ${rl}; then - echo "\"${rl}\" not found!" && exit 1 - fi -fi - -# setup variables -args=("$@") -cur=$(dirname "$(${rl} "${0}")") -opwd=$(pwd) -cfg="${cur}/config.yaml" -sub="dotdrop" - -# pivot -cd "${cur}" || { echo "Directory \"${cur}\" doesn't exist, aborting." && exit 1; } -# init/update the submodule -if [ "${DOTDROP_AUTOUPDATE-yes}" = yes ] ; then - git submodule update --init --recursive - git submodule update --remote dotdrop -fi -# launch dotdrop -PYTHONPATH=dotdrop python3 -m dotdrop.dotdrop "${args[@]}" -ret="$?" -# pivot back -cd "${opwd}" || { echo "Directory \"${opwd}\" doesn't exist, aborting." && exit 1; } -# exit with dotdrop exit code -exit ${ret} diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index dedf1c3c..755b078b 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -102,9 +102,6 @@ clean() { alias startvpn='sudo systemctl start wg-quick@wg0.service' alias stopvpn='sudo systemctl stop wg-quick@wg0.service' -# connect to metropolia vpn -alias metropoliavpn='sudo openconnect -u markoak --passwd-on-stdin vpn.metropolia.fi' - # read qrcode from selection qr() { grim -g "$(slurp -d)" - | zbarimg PNG:- } @@ -117,21 +114,13 @@ cpick() { grim -g "$(slurp -p)" -t ppm - | convert - -format "%[pixel:p{0,0}]" t #iwctl aliases alias i='iwctl station wlan0' -# change cpu power settings -gpulow() { - echo low | sudo tee /sys/class/drm/card0/device/power_dpm_force_performance_level -} -gpuauto() { - echo auto | sudo tee /sys/class/drm/card0/device/power_dpm_force_performance_level -} - # monitor cpu freq cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop +dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml $@ } +sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ } updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } -dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config.toml $@ } -sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ } compdef _dotdrop-completion.zsh sdotdrop alias dotgit='git -C $DOTREPO' dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } From caba64f1e654956ca83b8bbbd4e511e5b0117c81 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 6 Aug 2022 12:19:48 +0300 Subject: [PATCH 1183/2667] Start kodi when moria boots --- home/.zprofile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/home/.zprofile b/home/.zprofile index 5e4eb012..7b7a6fab 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,10 +1,6 @@ if [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]]; then {%@@ if profile == 'Moria' @@%} - LIBSEAT_BACKEND=logind gamescope \ - -e -f -U \ - -W 3840 -H 2160 \ - -w 1920 -h 1080 \ - -- steam -gamepadui -steamos + systemctl --user mask pipewire.service pipewire-pulse.service && systemctl --user stop pipewire.service pipewire-pulse.service && kodi; systemctl --user unmask pipewire.service pipewire-pulse.service && systemctl --user start pipewire.service pipewire-pulse.service {%@@ elif profile == 'Mirkwood' @@%} sway-run {%@@ endif @@%} From a15643e686ab8c9ba6037268a95612f3ff45cfbd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 6 Aug 2022 12:19:48 +0300 Subject: [PATCH 1184/2667] Start kodi when moria boots --- home/.zprofile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/home/.zprofile b/home/.zprofile index 5e4eb012..7b7a6fab 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,10 +1,6 @@ if [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]]; then {%@@ if profile == 'Moria' @@%} - LIBSEAT_BACKEND=logind gamescope \ - -e -f -U \ - -W 3840 -H 2160 \ - -w 1920 -h 1080 \ - -- steam -gamepadui -steamos + systemctl --user mask pipewire.service pipewire-pulse.service && systemctl --user stop pipewire.service pipewire-pulse.service && kodi; systemctl --user unmask pipewire.service pipewire-pulse.service && systemctl --user start pipewire.service pipewire-pulse.service {%@@ elif profile == 'Mirkwood' @@%} sway-run {%@@ endif @@%} From 9744ea55efc2614508d5eb11c1a33cae106df5f9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 Aug 2022 14:32:07 +0300 Subject: [PATCH 1185/2667] Fix update alias apt function --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 755b078b..197076c8 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -134,7 +134,7 @@ update() { paru {%@@ endif @@%} {%@@ if profile == "mko-laptop" @@%} - apt + apt-upd {%@@ endif @@%} {%@@ if profile == "Moria" @@%} repo From cac76497fe0a9b88747e5febc9e1c92627511efa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 Aug 2022 14:32:07 +0300 Subject: [PATCH 1186/2667] Fix update alias apt function --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 755b078b..197076c8 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -134,7 +134,7 @@ update() { paru {%@@ endif @@%} {%@@ if profile == "mko-laptop" @@%} - apt + apt-upd {%@@ endif @@%} {%@@ if profile == "Moria" @@%} repo From e41f585e27c4aa54774ffbcbf7621c0cb8d71b22 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Aug 2022 23:53:18 +0300 Subject: [PATCH 1187/2667] Small fixes for nextcloud --- docker/nextcloud/docker-compose.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 556457fd..e6f8cb11 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -18,7 +18,7 @@ labels = [ "traefik.http.routers.nextcloud.entrypoints=https", "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)", "traefik.http.routers.nextcloud.service=nextcloud", - "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-dav@file,nextcloud-webfinger@file,compress@file", + "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-redirect-dav@file,nextcloud-redirect-extra@file,compress@file", "traefik.docker.network=proxy", "traefik.http.services.nextcloud.loadbalancer.server.port=80", ] @@ -27,7 +27,7 @@ labels = [ image = "nextcloud:fpm-alpine" container_name = "nextcloud" restart = "unless-stopped" -user = "33:33" +user = "82:82" networks = ["nextcloud", "postgres", "proxy"] volumes = [ "/docker/nextcloud:/var/www/html:z", From 0d1d7dc09d683fb3515f3c328624cd5b7690ac42 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Aug 2022 23:53:18 +0300 Subject: [PATCH 1188/2667] Small fixes for nextcloud --- docker/nextcloud/docker-compose.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 556457fd..e6f8cb11 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -18,7 +18,7 @@ labels = [ "traefik.http.routers.nextcloud.entrypoints=https", "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)", "traefik.http.routers.nextcloud.service=nextcloud", - "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-dav@file,nextcloud-webfinger@file,compress@file", + "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-redirect-dav@file,nextcloud-redirect-extra@file,compress@file", "traefik.docker.network=proxy", "traefik.http.services.nextcloud.loadbalancer.server.port=80", ] @@ -27,7 +27,7 @@ labels = [ image = "nextcloud:fpm-alpine" container_name = "nextcloud" restart = "unless-stopped" -user = "33:33" +user = "82:82" networks = ["nextcloud", "postgres", "proxy"] volumes = [ "/docker/nextcloud:/var/www/html:z", From a15a21b1a45a9fdd0c7f49d3d3d130aa713f3352 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 14 Aug 2022 00:36:32 +0300 Subject: [PATCH 1189/2667] Add searx --- docker/authentik/docker-compose.toml | 2 +- docker/nextcloud/docker-compose.toml | 2 +- docker/searx/docker-compose.toml | 46 ++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 docker/searx/docker-compose.toml diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 48167a92..1914e50d 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -1,7 +1,7 @@ [services] [services.redis] -container_name = "authentik-redis" +container_name = "redis-authentik" image = "redis:alpine" restart = "unless-stopped" networks = ["authentik"] diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index e6f8cb11..62362212 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -49,7 +49,7 @@ depends_on = ["redis"] [services.redis] image = "redis:alpine" -container_name = "redis" +container_name = "redis-nextcloud" networks = ["nextcloud"] restart = "unless-stopped" command = "redis-server --requirepass 123" diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml new file mode 100644 index 00000000..967f4bf1 --- /dev/null +++ b/docker/searx/docker-compose.toml @@ -0,0 +1,46 @@ +version = "3.7" + +[services] + +[services.searx] +container_name = "searx" +image = "searxng/searxng:latest" +networks = ["searx", "proxy"] +volumes = ["/docker/searx:/etc/searxng:rw"] +environment = ["SEARXNG_BASE_URL=https://searx.korhonen.cc/"] +cap_drop = ["ALL"] +cap_add = ["CHOWN", "SETGID", "SETUID", "DAC_OVERRIDE"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.searx-redirect.entrypoints=http", + "traefik.http.routers.searx-redirect.rule=Host(`searx.korhonen.cc`)", + "traefik.http.routers.searx-redirect.middlewares=http2https@file", + "traefik.http.routers.searx.entrypoints=https", + "traefik.http.routers.searx.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.searx.rule=Host(`searx.korhonen.cc`)", + "traefik.http.routers.searx.service=searx", + "traefik.http.services.searx.loadbalancer.server.port=8080", +] + +[services.searx.logging] +driver = "json-file" + +[services.searx.logging.options] +max-size = "1m" +max-file = "1" + +[services.redis] +container_name = "redis-searx" +image = "redis:alpine" +command = "redis-server --save \"\" --appendonly \"no\"" +networks = ["searx"] +tmpfs = ["/var/lib/redis"] +cap_drop = ["ALL"] +cap_add = ["SETGID", "SETUID", "DAC_OVERRIDE"] + +[networks.searx.ipam] +driver = "default" + +[networks.proxy] +external = true From 81639311835ffe1bac14d546ffcc3aa40e9c0265 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 14 Aug 2022 00:36:32 +0300 Subject: [PATCH 1190/2667] Add searx --- docker/authentik/docker-compose.toml | 2 +- docker/nextcloud/docker-compose.toml | 2 +- docker/searx/docker-compose.toml | 46 ++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 docker/searx/docker-compose.toml diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 48167a92..1914e50d 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -1,7 +1,7 @@ [services] [services.redis] -container_name = "authentik-redis" +container_name = "redis-authentik" image = "redis:alpine" restart = "unless-stopped" networks = ["authentik"] diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index e6f8cb11..62362212 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -49,7 +49,7 @@ depends_on = ["redis"] [services.redis] image = "redis:alpine" -container_name = "redis" +container_name = "redis-nextcloud" networks = ["nextcloud"] restart = "unless-stopped" command = "redis-server --requirepass 123" diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml new file mode 100644 index 00000000..967f4bf1 --- /dev/null +++ b/docker/searx/docker-compose.toml @@ -0,0 +1,46 @@ +version = "3.7" + +[services] + +[services.searx] +container_name = "searx" +image = "searxng/searxng:latest" +networks = ["searx", "proxy"] +volumes = ["/docker/searx:/etc/searxng:rw"] +environment = ["SEARXNG_BASE_URL=https://searx.korhonen.cc/"] +cap_drop = ["ALL"] +cap_add = ["CHOWN", "SETGID", "SETUID", "DAC_OVERRIDE"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.searx-redirect.entrypoints=http", + "traefik.http.routers.searx-redirect.rule=Host(`searx.korhonen.cc`)", + "traefik.http.routers.searx-redirect.middlewares=http2https@file", + "traefik.http.routers.searx.entrypoints=https", + "traefik.http.routers.searx.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.searx.rule=Host(`searx.korhonen.cc`)", + "traefik.http.routers.searx.service=searx", + "traefik.http.services.searx.loadbalancer.server.port=8080", +] + +[services.searx.logging] +driver = "json-file" + +[services.searx.logging.options] +max-size = "1m" +max-file = "1" + +[services.redis] +container_name = "redis-searx" +image = "redis:alpine" +command = "redis-server --save \"\" --appendonly \"no\"" +networks = ["searx"] +tmpfs = ["/var/lib/redis"] +cap_drop = ["ALL"] +cap_add = ["SETGID", "SETUID", "DAC_OVERRIDE"] + +[networks.searx.ipam] +driver = "default" + +[networks.proxy] +external = true From ae3b1f5db41041b33bef1ee2662e05fe47807f7d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 14 Aug 2022 19:41:22 +0300 Subject: [PATCH 1191/2667] SearX: Restart unless-stopped and change domain name --- docker/searx/docker-compose.toml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml index 967f4bf1..86c4d4cc 100644 --- a/docker/searx/docker-compose.toml +++ b/docker/searx/docker-compose.toml @@ -5,20 +5,21 @@ version = "3.7" [services.searx] container_name = "searx" image = "searxng/searxng:latest" +restart = "unless-stopped" networks = ["searx", "proxy"] volumes = ["/docker/searx:/etc/searxng:rw"] -environment = ["SEARXNG_BASE_URL=https://searx.korhonen.cc/"] +environment = ["SEARXNG_BASE_URL=https://search.korhonen.cc/"] cap_drop = ["ALL"] cap_add = ["CHOWN", "SETGID", "SETUID", "DAC_OVERRIDE"] labels = [ "traefik.enable=true", "traefik.docker.network=proxy", "traefik.http.routers.searx-redirect.entrypoints=http", - "traefik.http.routers.searx-redirect.rule=Host(`searx.korhonen.cc`)", + "traefik.http.routers.searx-redirect.rule=Host(`search.korhonen.cc`)", "traefik.http.routers.searx-redirect.middlewares=http2https@file", "traefik.http.routers.searx.entrypoints=https", "traefik.http.routers.searx.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.searx.rule=Host(`searx.korhonen.cc`)", + "traefik.http.routers.searx.rule=Host(`search.korhonen.cc`)", "traefik.http.routers.searx.service=searx", "traefik.http.services.searx.loadbalancer.server.port=8080", ] @@ -33,6 +34,7 @@ max-file = "1" [services.redis] container_name = "redis-searx" image = "redis:alpine" +restart = "unless-stopped" command = "redis-server --save \"\" --appendonly \"no\"" networks = ["searx"] tmpfs = ["/var/lib/redis"] From dcd00e7b9857fd6b3fb79378fce300bb25722f01 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 14 Aug 2022 19:41:22 +0300 Subject: [PATCH 1192/2667] SearX: Restart unless-stopped and change domain name --- docker/searx/docker-compose.toml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml index 967f4bf1..86c4d4cc 100644 --- a/docker/searx/docker-compose.toml +++ b/docker/searx/docker-compose.toml @@ -5,20 +5,21 @@ version = "3.7" [services.searx] container_name = "searx" image = "searxng/searxng:latest" +restart = "unless-stopped" networks = ["searx", "proxy"] volumes = ["/docker/searx:/etc/searxng:rw"] -environment = ["SEARXNG_BASE_URL=https://searx.korhonen.cc/"] +environment = ["SEARXNG_BASE_URL=https://search.korhonen.cc/"] cap_drop = ["ALL"] cap_add = ["CHOWN", "SETGID", "SETUID", "DAC_OVERRIDE"] labels = [ "traefik.enable=true", "traefik.docker.network=proxy", "traefik.http.routers.searx-redirect.entrypoints=http", - "traefik.http.routers.searx-redirect.rule=Host(`searx.korhonen.cc`)", + "traefik.http.routers.searx-redirect.rule=Host(`search.korhonen.cc`)", "traefik.http.routers.searx-redirect.middlewares=http2https@file", "traefik.http.routers.searx.entrypoints=https", "traefik.http.routers.searx.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.searx.rule=Host(`searx.korhonen.cc`)", + "traefik.http.routers.searx.rule=Host(`search.korhonen.cc`)", "traefik.http.routers.searx.service=searx", "traefik.http.services.searx.loadbalancer.server.port=8080", ] @@ -33,6 +34,7 @@ max-file = "1" [services.redis] container_name = "redis-searx" image = "redis:alpine" +restart = "unless-stopped" command = "redis-server --save \"\" --appendonly \"no\"" networks = ["searx"] tmpfs = ["/var/lib/redis"] From 3a918ea5fe45f1412b9a9c4943f2d4e47624fb04 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 14 Aug 2022 20:36:32 +0300 Subject: [PATCH 1193/2667] Neovim: add signature help plugin + make use of quotes consistent --- .../nvim/lua/pluginconf/bufferline.lua | 2 +- .../nvim/lua/pluginconf/colorscheme.lua | 26 +++++++++---------- .../nvim/lua/pluginconf/completion.lua | 2 +- .../nvim/lua/pluginconf/indent-blankline.lua | 4 +-- home/.config/nvim/lua/pluginconf/lsp.lua | 11 +++++--- .../nvim/lua/pluginconf/treesitter.lua | 6 ++--- home/.config/nvim/lua/pluginmanager.lua | 13 ++++++---- 7 files changed, 35 insertions(+), 29 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/bufferline.lua b/home/.config/nvim/lua/pluginconf/bufferline.lua index 1c295dc9..c8834f1c 100644 --- a/home/.config/nvim/lua/pluginconf/bufferline.lua +++ b/home/.config/nvim/lua/pluginconf/bufferline.lua @@ -1 +1 @@ -require("bufferline").setup{} +require('bufferline').setup{} diff --git a/home/.config/nvim/lua/pluginconf/colorscheme.lua b/home/.config/nvim/lua/pluginconf/colorscheme.lua index f176fb17..9dfe8d65 100644 --- a/home/.config/nvim/lua/pluginconf/colorscheme.lua +++ b/home/.config/nvim/lua/pluginconf/colorscheme.lua @@ -1,11 +1,11 @@ -require("catppuccin").setup({ +require('catppuccin').setup({ transparent_background = false, term_colors = false, - compile = {enabled = true, path = vim.fn.stdpath "cache" .. "/catppuccin"}, + compile = {enabled = true, path = vim.fn.stdpath 'cache' .. '/catppuccin'}, styles = { - comments = {"italic"}, - functions = {"italic"}, - keywords = {"italic"}, + comments = {'italic'}, + functions = {'italic'}, + keywords = {'italic'}, strings = {}, variables = {} }, @@ -14,16 +14,16 @@ require("catppuccin").setup({ native_lsp = { enabled = true, virtual_text = { - errors = {"italic"}, - hints = {"italic"}, - warnings = {"italic"}, - information = {"italic"} + errors = {'italic'}, + hints = {'italic'}, + warnings = {'italic'}, + information = {'italic'} }, underlines = { - errors = {"underline"}, - hints = {"underline"}, - warnings = {"underline"}, - information = {"underline"} + errors = {'underline'}, + hints = {'underline'}, + warnings = {'underline'}, + information = {'underline'} } }, lsp_trouble = false, diff --git a/home/.config/nvim/lua/pluginconf/completion.lua b/home/.config/nvim/lua/pluginconf/completion.lua index 2684f592..85605a31 100644 --- a/home/.config/nvim/lua/pluginconf/completion.lua +++ b/home/.config/nvim/lua/pluginconf/completion.lua @@ -54,4 +54,4 @@ cmp.setup { } -- load friendly-snippets to luasnip -require("luasnip/loaders/from_vscode").lazy_load() +require('luasnip/loaders/from_vscode').lazy_load() diff --git a/home/.config/nvim/lua/pluginconf/indent-blankline.lua b/home/.config/nvim/lua/pluginconf/indent-blankline.lua index 58c522bc..1adbce2d 100644 --- a/home/.config/nvim/lua/pluginconf/indent-blankline.lua +++ b/home/.config/nvim/lua/pluginconf/indent-blankline.lua @@ -1,7 +1,7 @@ vim.opt.list = true -require("indent_blankline").setup { - space_char_blankline = " ", +require('indent_blankline').setup { + space_char_blankline = ' ', show_current_context = true, show_current_context_start = true, } diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index f1a6f7bb..c7475b37 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -1,4 +1,4 @@ -local lsp_installer = require("nvim-lsp-installer") +local lsp_installer = require('nvim-lsp-installer') local M = {} @@ -47,15 +47,18 @@ end local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) +-- Setup LSP signature plugin +require('lsp_signature').setup() + -- Register a handler that will be called for all installed servers. lsp_installer.on_server_ready(function(server) -- Don't setup jdtls here since it is done by nvim-jdtls - if server.name == "jdtls" then return end + if server.name == 'jdtls' then return end local opts = {} -- Lua specific settings - if server.name == "sumneko_lua" then + if server.name == 'sumneko_lua' then local runtime_path = vim.split(package.path, ';') opts.settings = { Lua = { @@ -71,7 +74,7 @@ lsp_installer.on_server_ready(function(server) }, workspace = { -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file("", true) + library = vim.api.nvim_get_runtime_file('', true) }, -- Do not send telemetry data containing a randomized but unique identifier telemetry = {enable = false} diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua index 6370d4f9..b3abded7 100644 --- a/home/.config/nvim/lua/pluginconf/treesitter.lua +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -1,8 +1,8 @@ require'nvim-treesitter.configs'.setup { ensure_installed = { - "bash", "c", "css", "dockerfile", "html", "http", "java", "json", - "json5", "latex", "lua", "make", "markdown", "php", "python", "regex", - "rst", "scss", "toml", "tsx", "typescript", "javascript", "yaml" + 'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json', + 'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python', 'regex', + 'rst', 'scss', 'toml', 'tsx', 'typescript', 'javascript', 'yaml' }, highlight = {enable = true}, indent = {enable = true}, diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 07fa44c0..b34936be 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -20,7 +20,7 @@ require('packer').startup(function() use {'wbthomason/packer.nvim', opt = true} -- Colorscheme - use({"catppuccin/nvim", as = "catppuccin"}) + use({'catppuccin/nvim', as = 'catppuccin'}) -- Git in signcolumn use 'airblade/vim-gitgutter' @@ -34,7 +34,7 @@ require('packer').startup(function() -- Tabline/bufferline use { 'akinsho/nvim-bufferline.lua', - tag = "*", + tag = '*', requires = 'kyazdani42/nvim-web-devicons' } @@ -42,7 +42,7 @@ require('packer').startup(function() use 'tpope/vim-fugitive' -- Indent characters - use "lukas-reineke/indent-blankline.nvim" + use 'lukas-reineke/indent-blankline.nvim' -- Tree explorer use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} @@ -70,13 +70,16 @@ require('packer').startup(function() -- Additional LSP features for Java use 'mfussenegger/nvim-jdtls' + -- Display function signature + use {'ray-x/lsp_signature.nvim'} + -- Completion use 'hrsh7th/nvim-cmp' -- Autocompletion plugin use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp use 'hrsh7th/cmp-path' -- Path source for nvim-cmp use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp use 'L3MON4D3/LuaSnip' -- Snippets plugin - use "rafamadriz/friendly-snippets" -- Snippets collection + use 'rafamadriz/friendly-snippets' -- Snippets collection -- treesitter syntax highlight use { @@ -118,7 +121,7 @@ require('packer').startup(function() use 'habamax/vim-asciidoctor' -- Modern filetype.vim replacement - use("nathom/filetype.nvim") + use('nathom/filetype.nvim') end) From c578871998f9fc30e6e161c05f3a04b9fd7a33b0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 14 Aug 2022 20:36:32 +0300 Subject: [PATCH 1194/2667] Neovim: add signature help plugin + make use of quotes consistent --- .../nvim/lua/pluginconf/bufferline.lua | 2 +- .../nvim/lua/pluginconf/colorscheme.lua | 26 +++++++++---------- .../nvim/lua/pluginconf/completion.lua | 2 +- .../nvim/lua/pluginconf/indent-blankline.lua | 4 +-- home/.config/nvim/lua/pluginconf/lsp.lua | 11 +++++--- .../nvim/lua/pluginconf/treesitter.lua | 6 ++--- home/.config/nvim/lua/pluginmanager.lua | 13 ++++++---- 7 files changed, 35 insertions(+), 29 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/bufferline.lua b/home/.config/nvim/lua/pluginconf/bufferline.lua index 1c295dc9..c8834f1c 100644 --- a/home/.config/nvim/lua/pluginconf/bufferline.lua +++ b/home/.config/nvim/lua/pluginconf/bufferline.lua @@ -1 +1 @@ -require("bufferline").setup{} +require('bufferline').setup{} diff --git a/home/.config/nvim/lua/pluginconf/colorscheme.lua b/home/.config/nvim/lua/pluginconf/colorscheme.lua index f176fb17..9dfe8d65 100644 --- a/home/.config/nvim/lua/pluginconf/colorscheme.lua +++ b/home/.config/nvim/lua/pluginconf/colorscheme.lua @@ -1,11 +1,11 @@ -require("catppuccin").setup({ +require('catppuccin').setup({ transparent_background = false, term_colors = false, - compile = {enabled = true, path = vim.fn.stdpath "cache" .. "/catppuccin"}, + compile = {enabled = true, path = vim.fn.stdpath 'cache' .. '/catppuccin'}, styles = { - comments = {"italic"}, - functions = {"italic"}, - keywords = {"italic"}, + comments = {'italic'}, + functions = {'italic'}, + keywords = {'italic'}, strings = {}, variables = {} }, @@ -14,16 +14,16 @@ require("catppuccin").setup({ native_lsp = { enabled = true, virtual_text = { - errors = {"italic"}, - hints = {"italic"}, - warnings = {"italic"}, - information = {"italic"} + errors = {'italic'}, + hints = {'italic'}, + warnings = {'italic'}, + information = {'italic'} }, underlines = { - errors = {"underline"}, - hints = {"underline"}, - warnings = {"underline"}, - information = {"underline"} + errors = {'underline'}, + hints = {'underline'}, + warnings = {'underline'}, + information = {'underline'} } }, lsp_trouble = false, diff --git a/home/.config/nvim/lua/pluginconf/completion.lua b/home/.config/nvim/lua/pluginconf/completion.lua index 2684f592..85605a31 100644 --- a/home/.config/nvim/lua/pluginconf/completion.lua +++ b/home/.config/nvim/lua/pluginconf/completion.lua @@ -54,4 +54,4 @@ cmp.setup { } -- load friendly-snippets to luasnip -require("luasnip/loaders/from_vscode").lazy_load() +require('luasnip/loaders/from_vscode').lazy_load() diff --git a/home/.config/nvim/lua/pluginconf/indent-blankline.lua b/home/.config/nvim/lua/pluginconf/indent-blankline.lua index 58c522bc..1adbce2d 100644 --- a/home/.config/nvim/lua/pluginconf/indent-blankline.lua +++ b/home/.config/nvim/lua/pluginconf/indent-blankline.lua @@ -1,7 +1,7 @@ vim.opt.list = true -require("indent_blankline").setup { - space_char_blankline = " ", +require('indent_blankline').setup { + space_char_blankline = ' ', show_current_context = true, show_current_context_start = true, } diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index f1a6f7bb..c7475b37 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -1,4 +1,4 @@ -local lsp_installer = require("nvim-lsp-installer") +local lsp_installer = require('nvim-lsp-installer') local M = {} @@ -47,15 +47,18 @@ end local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) +-- Setup LSP signature plugin +require('lsp_signature').setup() + -- Register a handler that will be called for all installed servers. lsp_installer.on_server_ready(function(server) -- Don't setup jdtls here since it is done by nvim-jdtls - if server.name == "jdtls" then return end + if server.name == 'jdtls' then return end local opts = {} -- Lua specific settings - if server.name == "sumneko_lua" then + if server.name == 'sumneko_lua' then local runtime_path = vim.split(package.path, ';') opts.settings = { Lua = { @@ -71,7 +74,7 @@ lsp_installer.on_server_ready(function(server) }, workspace = { -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file("", true) + library = vim.api.nvim_get_runtime_file('', true) }, -- Do not send telemetry data containing a randomized but unique identifier telemetry = {enable = false} diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua index 6370d4f9..b3abded7 100644 --- a/home/.config/nvim/lua/pluginconf/treesitter.lua +++ b/home/.config/nvim/lua/pluginconf/treesitter.lua @@ -1,8 +1,8 @@ require'nvim-treesitter.configs'.setup { ensure_installed = { - "bash", "c", "css", "dockerfile", "html", "http", "java", "json", - "json5", "latex", "lua", "make", "markdown", "php", "python", "regex", - "rst", "scss", "toml", "tsx", "typescript", "javascript", "yaml" + 'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json', + 'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python', 'regex', + 'rst', 'scss', 'toml', 'tsx', 'typescript', 'javascript', 'yaml' }, highlight = {enable = true}, indent = {enable = true}, diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 07fa44c0..b34936be 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -20,7 +20,7 @@ require('packer').startup(function() use {'wbthomason/packer.nvim', opt = true} -- Colorscheme - use({"catppuccin/nvim", as = "catppuccin"}) + use({'catppuccin/nvim', as = 'catppuccin'}) -- Git in signcolumn use 'airblade/vim-gitgutter' @@ -34,7 +34,7 @@ require('packer').startup(function() -- Tabline/bufferline use { 'akinsho/nvim-bufferline.lua', - tag = "*", + tag = '*', requires = 'kyazdani42/nvim-web-devicons' } @@ -42,7 +42,7 @@ require('packer').startup(function() use 'tpope/vim-fugitive' -- Indent characters - use "lukas-reineke/indent-blankline.nvim" + use 'lukas-reineke/indent-blankline.nvim' -- Tree explorer use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} @@ -70,13 +70,16 @@ require('packer').startup(function() -- Additional LSP features for Java use 'mfussenegger/nvim-jdtls' + -- Display function signature + use {'ray-x/lsp_signature.nvim'} + -- Completion use 'hrsh7th/nvim-cmp' -- Autocompletion plugin use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp use 'hrsh7th/cmp-path' -- Path source for nvim-cmp use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp use 'L3MON4D3/LuaSnip' -- Snippets plugin - use "rafamadriz/friendly-snippets" -- Snippets collection + use 'rafamadriz/friendly-snippets' -- Snippets collection -- treesitter syntax highlight use { @@ -118,7 +121,7 @@ require('packer').startup(function() use 'habamax/vim-asciidoctor' -- Modern filetype.vim replacement - use("nathom/filetype.nvim") + use('nathom/filetype.nvim') end) From 581dbdb22c574ed60ec02322a559edc60b0b540c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 14 Aug 2022 20:38:38 +0300 Subject: [PATCH 1195/2667] Neovim: remove filetype.nvim --- home/.config/nvim/lua/pluginmanager.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index b34936be..ff403e4a 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -120,9 +120,6 @@ require('packer').startup(function() -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' - -- Modern filetype.vim replacement - use('nathom/filetype.nvim') - end) -- Install plugins if packer was not installed From e89683ff771345fe2b9d4fbb1f5b703c81488882 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 14 Aug 2022 20:38:38 +0300 Subject: [PATCH 1196/2667] Neovim: remove filetype.nvim --- home/.config/nvim/lua/pluginmanager.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index b34936be..ff403e4a 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -120,9 +120,6 @@ require('packer').startup(function() -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' - -- Modern filetype.vim replacement - use('nathom/filetype.nvim') - end) -- Install plugins if packer was not installed From 7c1b22e57f31ad6dd2b67c1b9c5960d5ba39144c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 15 Aug 2022 13:52:10 +0300 Subject: [PATCH 1197/2667] Add working redis for searx --- docker/redis/docker-compose.toml | 16 ++++++++++++++++ docker/searx/docker-compose.toml | 21 +++++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 docker/redis/docker-compose.toml diff --git a/docker/redis/docker-compose.toml b/docker/redis/docker-compose.toml new file mode 100644 index 00000000..c39b1a4f --- /dev/null +++ b/docker/redis/docker-compose.toml @@ -0,0 +1,16 @@ +[services.redis] +image = "redis:alpine" +container_name = "redis" +user = "root" +command = "redis-server /etc/redis.conf" +restart = "unless-stopped" +volumes = ["/docker/redis/redis.conf:/etc/redis.conf", "redis_temp:/tmp/redis"] + +[services.redis_temp] +image = "busybox" +container_name = "redis_temp" +command = "chmod -R 777 /tmp/redis" +volumes = ["redis_temp:/tmp/redis"] + +[volumes.redis_temp] +external = true diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml index 86c4d4cc..8e12694f 100644 --- a/docker/searx/docker-compose.toml +++ b/docker/searx/docker-compose.toml @@ -1,13 +1,13 @@ -version = "3.7" - -[services] - [services.searx] container_name = "searx" image = "searxng/searxng:latest" restart = "unless-stopped" networks = ["searx", "proxy"] -volumes = ["/docker/searx:/etc/searxng:rw"] +volumes = [ + "/docker/searx:/etc/searxng", + "redis_temp:/tmp/redis", + #"/docker/searx/logo.png:/usr/local/searxng/searx/static/themes/simple/img/searxng.png:ro" +] environment = ["SEARXNG_BASE_URL=https://search.korhonen.cc/"] cap_drop = ["ALL"] cap_add = ["CHOWN", "SETGID", "SETUID", "DAC_OVERRIDE"] @@ -31,15 +31,8 @@ driver = "json-file" max-size = "1m" max-file = "1" -[services.redis] -container_name = "redis-searx" -image = "redis:alpine" -restart = "unless-stopped" -command = "redis-server --save \"\" --appendonly \"no\"" -networks = ["searx"] -tmpfs = ["/var/lib/redis"] -cap_drop = ["ALL"] -cap_add = ["SETGID", "SETUID", "DAC_OVERRIDE"] +[volumes.redis_temp] +external = true [networks.searx.ipam] driver = "default" From 2a6196c2f7f499b2d275e7188f4ce517dfec1338 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 15 Aug 2022 13:52:10 +0300 Subject: [PATCH 1198/2667] Add working redis for searx --- docker/redis/docker-compose.toml | 16 ++++++++++++++++ docker/searx/docker-compose.toml | 21 +++++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 docker/redis/docker-compose.toml diff --git a/docker/redis/docker-compose.toml b/docker/redis/docker-compose.toml new file mode 100644 index 00000000..c39b1a4f --- /dev/null +++ b/docker/redis/docker-compose.toml @@ -0,0 +1,16 @@ +[services.redis] +image = "redis:alpine" +container_name = "redis" +user = "root" +command = "redis-server /etc/redis.conf" +restart = "unless-stopped" +volumes = ["/docker/redis/redis.conf:/etc/redis.conf", "redis_temp:/tmp/redis"] + +[services.redis_temp] +image = "busybox" +container_name = "redis_temp" +command = "chmod -R 777 /tmp/redis" +volumes = ["redis_temp:/tmp/redis"] + +[volumes.redis_temp] +external = true diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml index 86c4d4cc..8e12694f 100644 --- a/docker/searx/docker-compose.toml +++ b/docker/searx/docker-compose.toml @@ -1,13 +1,13 @@ -version = "3.7" - -[services] - [services.searx] container_name = "searx" image = "searxng/searxng:latest" restart = "unless-stopped" networks = ["searx", "proxy"] -volumes = ["/docker/searx:/etc/searxng:rw"] +volumes = [ + "/docker/searx:/etc/searxng", + "redis_temp:/tmp/redis", + #"/docker/searx/logo.png:/usr/local/searxng/searx/static/themes/simple/img/searxng.png:ro" +] environment = ["SEARXNG_BASE_URL=https://search.korhonen.cc/"] cap_drop = ["ALL"] cap_add = ["CHOWN", "SETGID", "SETUID", "DAC_OVERRIDE"] @@ -31,15 +31,8 @@ driver = "json-file" max-size = "1m" max-file = "1" -[services.redis] -container_name = "redis-searx" -image = "redis:alpine" -restart = "unless-stopped" -command = "redis-server --save \"\" --appendonly \"no\"" -networks = ["searx"] -tmpfs = ["/var/lib/redis"] -cap_drop = ["ALL"] -cap_add = ["SETGID", "SETUID", "DAC_OVERRIDE"] +[volumes.redis_temp] +external = true [networks.searx.ipam] driver = "default" From 6d30b1876f2eba55eb400be249f22f45eb8210cc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 16 Aug 2022 20:43:44 +0300 Subject: [PATCH 1199/2667] Add udev rule to lock screen when yubikey is unplugged --- config-root.toml | 7 ++++++- root/etc/udev/rules.d/20-yubikey.rules | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 root/etc/udev/rules.d/20-yubikey.rules diff --git a/config-root.toml b/config-root.toml index 80f8eada..3c52c220 100644 --- a/config-root.toml +++ b/config-root.toml @@ -17,6 +17,10 @@ workdir = "~/.config/sdotdrop" dst = "/etc/udev/rules.d/60-uinput-permissions.rules" src = "etc/udev/rules.d/60-uinput-permissions.rules" +[dotfiles."f_yubikey_udev.rules"] +dst = "/etc/udev/rules.d/20-yubikey.rules" +src = "etc/udev/rules.d/20-yubikey.rules" + [dotfiles.d_bin] dst = "/usr/local/bin" src = "usr/local/bin" @@ -175,6 +179,7 @@ dotfiles = [ "f_sshd_config", "f_logind.conf", "f_60-uinput-permissions.rules", + "f_yubikey_udev.rules", "f_freetype2.sh", "f_fonts.conf", "f_99-lowbat.rules", @@ -206,4 +211,4 @@ include = ["Locale"] include = ["Pacman"] [profiles.mko-laptop] -dotfiles = ["f_cpupower"] +dotfiles = ["f_cpupower", "f_yubikey_udev.rules"] diff --git a/root/etc/udev/rules.d/20-yubikey.rules b/root/etc/udev/rules.d/20-yubikey.rules new file mode 100644 index 00000000..92465054 --- /dev/null +++ b/root/etc/udev/rules.d/20-yubikey.rules @@ -0,0 +1 @@ +ACTION=="remove", ENV{ID_BUS}=="usb", ENV{ID_MODEL_ID}=="0407", ENV{ID_VENDOR_ID}=="1050", RUN+="/usr/bin/loginctl lock-sessions" From 27fb6f64a3892e41d6aefc2db853368f55af0ae2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 16 Aug 2022 20:43:44 +0300 Subject: [PATCH 1200/2667] Add udev rule to lock screen when yubikey is unplugged --- config-root.toml | 7 ++++++- root/etc/udev/rules.d/20-yubikey.rules | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 root/etc/udev/rules.d/20-yubikey.rules diff --git a/config-root.toml b/config-root.toml index 80f8eada..3c52c220 100644 --- a/config-root.toml +++ b/config-root.toml @@ -17,6 +17,10 @@ workdir = "~/.config/sdotdrop" dst = "/etc/udev/rules.d/60-uinput-permissions.rules" src = "etc/udev/rules.d/60-uinput-permissions.rules" +[dotfiles."f_yubikey_udev.rules"] +dst = "/etc/udev/rules.d/20-yubikey.rules" +src = "etc/udev/rules.d/20-yubikey.rules" + [dotfiles.d_bin] dst = "/usr/local/bin" src = "usr/local/bin" @@ -175,6 +179,7 @@ dotfiles = [ "f_sshd_config", "f_logind.conf", "f_60-uinput-permissions.rules", + "f_yubikey_udev.rules", "f_freetype2.sh", "f_fonts.conf", "f_99-lowbat.rules", @@ -206,4 +211,4 @@ include = ["Locale"] include = ["Pacman"] [profiles.mko-laptop] -dotfiles = ["f_cpupower"] +dotfiles = ["f_cpupower", "f_yubikey_udev.rules"] diff --git a/root/etc/udev/rules.d/20-yubikey.rules b/root/etc/udev/rules.d/20-yubikey.rules new file mode 100644 index 00000000..92465054 --- /dev/null +++ b/root/etc/udev/rules.d/20-yubikey.rules @@ -0,0 +1 @@ +ACTION=="remove", ENV{ID_BUS}=="usb", ENV{ID_MODEL_ID}=="0407", ENV{ID_VENDOR_ID}=="1050", RUN+="/usr/bin/loginctl lock-sessions" From 08f33e7c485dcf26d76b79a3182cb0a6cf40c9a5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 14:28:02 +0300 Subject: [PATCH 1201/2667] Use stable image of busybox for redis --- docker/redis/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/redis/docker-compose.toml b/docker/redis/docker-compose.toml index c39b1a4f..94ea7f99 100644 --- a/docker/redis/docker-compose.toml +++ b/docker/redis/docker-compose.toml @@ -7,7 +7,7 @@ restart = "unless-stopped" volumes = ["/docker/redis/redis.conf:/etc/redis.conf", "redis_temp:/tmp/redis"] [services.redis_temp] -image = "busybox" +image = "busybox:stable" container_name = "redis_temp" command = "chmod -R 777 /tmp/redis" volumes = ["redis_temp:/tmp/redis"] From 0a14b90d3dd55170b8120d314123976117b9b6a8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 14:28:02 +0300 Subject: [PATCH 1202/2667] Use stable image of busybox for redis --- docker/redis/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/redis/docker-compose.toml b/docker/redis/docker-compose.toml index c39b1a4f..94ea7f99 100644 --- a/docker/redis/docker-compose.toml +++ b/docker/redis/docker-compose.toml @@ -7,7 +7,7 @@ restart = "unless-stopped" volumes = ["/docker/redis/redis.conf:/etc/redis.conf", "redis_temp:/tmp/redis"] [services.redis_temp] -image = "busybox" +image = "busybox:stable" container_name = "redis_temp" command = "chmod -R 777 /tmp/redis" volumes = ["redis_temp:/tmp/redis"] From 270ac5b3ec3984774a5fdb3853bbdf7c77072b91 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 14:28:28 +0300 Subject: [PATCH 1203/2667] Refactor config profiles --- config.toml | 94 ++++++++++++++++++--------------- home/.config/zsh/03-aliases.zsh | 47 +++++++---------- 2 files changed, 71 insertions(+), 70 deletions(-) diff --git a/config.toml b/config.toml index ec0114fe..6dabc24a 100644 --- a/config.toml +++ b/config.toml @@ -14,8 +14,6 @@ longkey = false showdiff = false workdir = "~/.config/dotdrop" -[dotfiles] - [dotfiles.d_systemd] dst = "~/.config/systemd/user" src = ".config/systemd/user" @@ -181,7 +179,7 @@ dst = "~/.config/zsh" src = ".config/fontconfig/fonts.conf" dst = "~/.config/fontconfig/fonts.conf" -[dotfiles.f_ripgrep_ignore] +[dotfiles.f_ignore] src = ".ignore" dst = "~/.ignore" @@ -230,29 +228,43 @@ dst = "~/.config/electron12-flags.conf" src = ".pam_environment" dst = "~/.pam_environment" -[profiles] +[profiles.os_arch] +include = ["terminal"] +dotfiles = ["f_makepkg.conf", "f_paru.conf"] -[profiles.base] -dotfiles = ["d_systemd"] +[profiles.os_arch.variables] +os = "arch" + +[profiles.os_ubuntu] +include = ["terminal"] + +[profiles.os_ubuntu.variables] +os = "ubuntu" + +[profiles.os_termux] +include = ["terminal"] + +[profiles.os_termux.variables] +os = "termux" [profiles.terminal] dotfiles = [ + "d_nvim_ftplugin", + "d_nvim_lua", + "d_zsh", + "f_alacritty.yml", + "f_authorized_keys", + "f_gitconfig", "f_hushlogin", - "f_ripgrep_ignore", + "f_ignore", + "f_mailcap", + "f_nvim_init", + "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", - "f_mailcap", - "d_zsh", - "f_zshrc", - "f_tmux.conf", - "f_ranger.conf", "f_ssh.conf", - "f_authorized_keys", - "f_nvim_init", - "d_nvim_lua", - "d_nvim_ftplugin", - "f_gitconfig", - "f_alacritty.yml", + "f_tmux.conf", + "f_zshrc", ] [profiles.email] @@ -260,17 +272,17 @@ dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] [profiles.media] dotfiles = [ + "d_mpv", + "f_abcde.conf", "f_beets_config", "f_beets_whitelist", - "f_abcde.conf", - "d_mpv", - "f_youtube-dl_config", - "f_mpd.conf", - "f_ncmpcpp_bindings", - "f_ncmpcpp.conf", "f_libra_config", - "f_mpdscribble.conf", + "f_mpd.conf", "f_mpdris2.conf", + "f_mpdscribble.conf", + "f_ncmpcpp.conf", + "f_ncmpcpp_bindings", + "f_youtube-dl_config", ] [profiles.sway] @@ -278,20 +290,15 @@ dotfiles = [ "d_sway", "d_waybar", "d_wofi", - "f_mako_config", - "f_redshift.conf", "d_zathura", - "f_mimeo_associations.txt", - "f_tdesktop_lang.strings", - "f_fonts.conf", - "f_zprofile", "f_electron-flags.conf", "f_electron12-flags.conf", + "f_fonts.conf", + "f_foot.ini", + "f_mako_config", + "f_redshift.conf", ] -[profiles.pacman] -dotfiles = ["f_makepkg.conf", "f_paru.conf"] - [profiles.gpg] dotfiles = [ "f_gpg-agent.conf", @@ -301,27 +308,30 @@ dotfiles = [ ] [profiles.Mirkwood] -include = ["base", "terminal", "email", "media", "sway", "pacman", "gpg"] -dotfiles = ["f_paru.conf", "f_gitconfig", "f_foot.ini"] +include = ["os_arch", "email", "media", "sway", "gpg"] +dotfiles = ["d_systemd"] [profiles.Moria] -include = ["terminal", "pacman", "media"] +include = ["os_arch", "media", "gpg"] dotfiles = ["f_zprofile"] [profiles.Gondor] -include = ["terminal", "pacman"] +include = ["os_arch"] [profiles.mko-laptop] -include = ["terminal", "media", "gpg"] +include = ["os_ubuntu", "media", "gpg"] + +[profiles.Isengard] +include = ["os_termux"] [profiles.Edoras] -include = ["terminal", "pacman"] +include = ["os_arch"] [profiles.TakamakiPC] -include = ["terminal", "pacman"] +include = ["os_arch"] [profiles.localhost] -include = ["terminal"] +include = ["os_arch"] [profiles.ViiruJaTeippi] include = ["terminal"] diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 197076c8..aa414fa9 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -12,7 +12,7 @@ forgit_revert_commit=fgrc # Modern replacement for ls alias ls='exa' -{%@@ if profile != "mko-laptop" @@%} +{%@@ if os == "arch" @@%} # Command not found handler # source https://wiki.archlinux.org/title/Zsh#pacman_-F_%22command_not_found%22_handler function command_not_found_handler { @@ -40,7 +40,6 @@ function command_not_found_handler { done fi } -{%@@ endif @@%} # search and install/remove packages with fzf pi() { @@ -59,6 +58,7 @@ pr() { paru -Rns $(echo $SELECTED_PKGS) fi } +{%@@ endif @@%} # find and open man pages with fzf fman() { @@ -130,12 +130,7 @@ passync() { pass git pull && pass git push && updatesecrets } update() { all() { - {%@@ if profile == "Moria" or profile == 'Mirkwood' @@%} - paru - {%@@ endif @@%} - {%@@ if profile == "mko-laptop" @@%} - apt-upd - {%@@ endif @@%} + packages {%@@ if profile == "Moria" @@%} repo docker-update @@ -143,6 +138,16 @@ update() { plugins } + packages() { + {%@@ if os == "arch" @@%} + paru + {%@@ elif os == "ubuntu" @@%} + sudo apt update && sudo apt full-upgrade -y && sudo apt autoremove -y && sudo apt autoclean -y + {%@@ elif os == "termux" @@%} + pkg update + {%@@ endif @@%} + } + plugins() { nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync' zinit self-update @@ -156,26 +161,22 @@ update() { } docker-update() { + prevpwddocker=$PWD for dir in $HOME/git/dotfiles/docker/*; do cd $dir - if [[ -f "DISABLED" ]]; then + if [[ -f "$dir/DISABLED" ]]; then echo "$(basename $dir) stack is disabled, skipping..." else - dct pull - dct up -d + dct -f $dir/docker-compose.toml pull + dct -f $dir/docker-compose.toml up -d fi cd .. done + cd $prevpwddocker docker system prune -af --volumes } {%@@ endif @@%} - {%@@ if profile == "mko-laptop" @@%} - apt-upd() { - sudo apt update && sudo apt full-upgrade -y && sudo apt autoremove -y && sudo apt autoclean -y - } - {%@@ endif @@%} - case "$1" in all) all @@ -191,19 +192,9 @@ update() { repo ;; {%@@ endif @@%} - {%@@ if profile == "mko-laptop" @@%} - apt) - apt-upd - ;; - {%@@ endif @@%} *) - {%@@ if profile == "mko-laptop" @@%} - apt-upd + packages ;; - {%@@ else @@%} - paru - ;; - {%@@ endif @@%} esac } From 13a6ab2293ac1eb0d0e23162969143e19780b723 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 14:28:28 +0300 Subject: [PATCH 1204/2667] Refactor config profiles --- config.toml | 94 ++++++++++++++++++--------------- home/.config/zsh/03-aliases.zsh | 47 +++++++---------- 2 files changed, 71 insertions(+), 70 deletions(-) diff --git a/config.toml b/config.toml index ec0114fe..6dabc24a 100644 --- a/config.toml +++ b/config.toml @@ -14,8 +14,6 @@ longkey = false showdiff = false workdir = "~/.config/dotdrop" -[dotfiles] - [dotfiles.d_systemd] dst = "~/.config/systemd/user" src = ".config/systemd/user" @@ -181,7 +179,7 @@ dst = "~/.config/zsh" src = ".config/fontconfig/fonts.conf" dst = "~/.config/fontconfig/fonts.conf" -[dotfiles.f_ripgrep_ignore] +[dotfiles.f_ignore] src = ".ignore" dst = "~/.ignore" @@ -230,29 +228,43 @@ dst = "~/.config/electron12-flags.conf" src = ".pam_environment" dst = "~/.pam_environment" -[profiles] +[profiles.os_arch] +include = ["terminal"] +dotfiles = ["f_makepkg.conf", "f_paru.conf"] -[profiles.base] -dotfiles = ["d_systemd"] +[profiles.os_arch.variables] +os = "arch" + +[profiles.os_ubuntu] +include = ["terminal"] + +[profiles.os_ubuntu.variables] +os = "ubuntu" + +[profiles.os_termux] +include = ["terminal"] + +[profiles.os_termux.variables] +os = "termux" [profiles.terminal] dotfiles = [ + "d_nvim_ftplugin", + "d_nvim_lua", + "d_zsh", + "f_alacritty.yml", + "f_authorized_keys", + "f_gitconfig", "f_hushlogin", - "f_ripgrep_ignore", + "f_ignore", + "f_mailcap", + "f_nvim_init", + "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", - "f_mailcap", - "d_zsh", - "f_zshrc", - "f_tmux.conf", - "f_ranger.conf", "f_ssh.conf", - "f_authorized_keys", - "f_nvim_init", - "d_nvim_lua", - "d_nvim_ftplugin", - "f_gitconfig", - "f_alacritty.yml", + "f_tmux.conf", + "f_zshrc", ] [profiles.email] @@ -260,17 +272,17 @@ dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] [profiles.media] dotfiles = [ + "d_mpv", + "f_abcde.conf", "f_beets_config", "f_beets_whitelist", - "f_abcde.conf", - "d_mpv", - "f_youtube-dl_config", - "f_mpd.conf", - "f_ncmpcpp_bindings", - "f_ncmpcpp.conf", "f_libra_config", - "f_mpdscribble.conf", + "f_mpd.conf", "f_mpdris2.conf", + "f_mpdscribble.conf", + "f_ncmpcpp.conf", + "f_ncmpcpp_bindings", + "f_youtube-dl_config", ] [profiles.sway] @@ -278,20 +290,15 @@ dotfiles = [ "d_sway", "d_waybar", "d_wofi", - "f_mako_config", - "f_redshift.conf", "d_zathura", - "f_mimeo_associations.txt", - "f_tdesktop_lang.strings", - "f_fonts.conf", - "f_zprofile", "f_electron-flags.conf", "f_electron12-flags.conf", + "f_fonts.conf", + "f_foot.ini", + "f_mako_config", + "f_redshift.conf", ] -[profiles.pacman] -dotfiles = ["f_makepkg.conf", "f_paru.conf"] - [profiles.gpg] dotfiles = [ "f_gpg-agent.conf", @@ -301,27 +308,30 @@ dotfiles = [ ] [profiles.Mirkwood] -include = ["base", "terminal", "email", "media", "sway", "pacman", "gpg"] -dotfiles = ["f_paru.conf", "f_gitconfig", "f_foot.ini"] +include = ["os_arch", "email", "media", "sway", "gpg"] +dotfiles = ["d_systemd"] [profiles.Moria] -include = ["terminal", "pacman", "media"] +include = ["os_arch", "media", "gpg"] dotfiles = ["f_zprofile"] [profiles.Gondor] -include = ["terminal", "pacman"] +include = ["os_arch"] [profiles.mko-laptop] -include = ["terminal", "media", "gpg"] +include = ["os_ubuntu", "media", "gpg"] + +[profiles.Isengard] +include = ["os_termux"] [profiles.Edoras] -include = ["terminal", "pacman"] +include = ["os_arch"] [profiles.TakamakiPC] -include = ["terminal", "pacman"] +include = ["os_arch"] [profiles.localhost] -include = ["terminal"] +include = ["os_arch"] [profiles.ViiruJaTeippi] include = ["terminal"] diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 197076c8..aa414fa9 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -12,7 +12,7 @@ forgit_revert_commit=fgrc # Modern replacement for ls alias ls='exa' -{%@@ if profile != "mko-laptop" @@%} +{%@@ if os == "arch" @@%} # Command not found handler # source https://wiki.archlinux.org/title/Zsh#pacman_-F_%22command_not_found%22_handler function command_not_found_handler { @@ -40,7 +40,6 @@ function command_not_found_handler { done fi } -{%@@ endif @@%} # search and install/remove packages with fzf pi() { @@ -59,6 +58,7 @@ pr() { paru -Rns $(echo $SELECTED_PKGS) fi } +{%@@ endif @@%} # find and open man pages with fzf fman() { @@ -130,12 +130,7 @@ passync() { pass git pull && pass git push && updatesecrets } update() { all() { - {%@@ if profile == "Moria" or profile == 'Mirkwood' @@%} - paru - {%@@ endif @@%} - {%@@ if profile == "mko-laptop" @@%} - apt-upd - {%@@ endif @@%} + packages {%@@ if profile == "Moria" @@%} repo docker-update @@ -143,6 +138,16 @@ update() { plugins } + packages() { + {%@@ if os == "arch" @@%} + paru + {%@@ elif os == "ubuntu" @@%} + sudo apt update && sudo apt full-upgrade -y && sudo apt autoremove -y && sudo apt autoclean -y + {%@@ elif os == "termux" @@%} + pkg update + {%@@ endif @@%} + } + plugins() { nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync' zinit self-update @@ -156,26 +161,22 @@ update() { } docker-update() { + prevpwddocker=$PWD for dir in $HOME/git/dotfiles/docker/*; do cd $dir - if [[ -f "DISABLED" ]]; then + if [[ -f "$dir/DISABLED" ]]; then echo "$(basename $dir) stack is disabled, skipping..." else - dct pull - dct up -d + dct -f $dir/docker-compose.toml pull + dct -f $dir/docker-compose.toml up -d fi cd .. done + cd $prevpwddocker docker system prune -af --volumes } {%@@ endif @@%} - {%@@ if profile == "mko-laptop" @@%} - apt-upd() { - sudo apt update && sudo apt full-upgrade -y && sudo apt autoremove -y && sudo apt autoclean -y - } - {%@@ endif @@%} - case "$1" in all) all @@ -191,19 +192,9 @@ update() { repo ;; {%@@ endif @@%} - {%@@ if profile == "mko-laptop" @@%} - apt) - apt-upd - ;; - {%@@ endif @@%} *) - {%@@ if profile == "mko-laptop" @@%} - apt-upd + packages ;; - {%@@ else @@%} - paru - ;; - {%@@ endif @@%} esac } From 3024bf9400405f4b99fc5490ef67582997eeca05 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 14:36:26 +0300 Subject: [PATCH 1205/2667] Add email to cryptissue --- root/etc/cryptissue | 1 + secrets/env | 2 +- secrets/secrets.sh | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/root/etc/cryptissue b/root/etc/cryptissue index 3c9154a1..ff9f538e 100755 --- a/root/etc/cryptissue +++ b/root/etc/cryptissue @@ -47,3 +47,4 @@ Please return it to me! Below are my contact details Name: {{@@ env['ME_FULLNAME'] @@}} Address: {{@@ env['ME_ADDRESS'] @@}} Phone: {{@@ env['ME_PHONE'] @@}} +Email: {{@@ env['ME_EMAIL'] @@}} diff --git a/secrets/env b/secrets/env index 7b41c97b..ed6c52f1 100755 --- a/secrets/env +++ b/secrets/env @@ -6,7 +6,6 @@ export PASS_MUSPY="$(pass entertainment/muspy.com | head -1)" export PASS_ARIA2="$(pass linux/aria2 | head -1)" export PASS_MPD="$(pass linux/mpd | head -1)" export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -1)" -export PASS_IPMI="$(pass selfhosted/idrac | head -1)" export PASS_MQTT="$(pass selfhosted/mqtt.reekynet.com | head -1)" export PASS_EMAIL_HACKER="$(pass email/functionalhacker@korhonen.cc | head -1)" @@ -16,6 +15,7 @@ export PASS_EMAIL_ADMIN="$(pass email/admin@korhonen.cc | head -1)" export ME_FULLNAME="$(pass me | head -1)" export ME_ADDRESS="$(pass me | rg 'address' | cut -d' ' -f2-)" export ME_PHONE="$(pass me | rg 'phone' | cut -d' ' -f2-)" +export ME_email="$(pass me | rg 'email' | cut -d' ' -f2-)" export WIREGUARD_MIRKWOOD_PRIVKEY="$(pass selfhosted/wireguard/mirkwood | grep PrivateKey | cut -d' ' -f2-)" export WIREGUARD_MIRKWOOD_PUBKEY="$(pass selfhosted/wireguard/mirkwood | grep PublicKey | cut -d' ' -f2-)" diff --git a/secrets/secrets.sh b/secrets/secrets.sh index 349c03a6..43691bf9 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -20,6 +20,7 @@ export PASS_EMAIL_ADMIN="$PASS_EMAIL_ADMIN" export ME_FULLNAME="$ME_FULLNAME" export ME_ADDRESS="$ME_ADDRESS" export ME_PHONE="$ME_PHONE" +export ME_EMAIL="$ME_EMAIL" export WIREGUARD_MIRKWOOD_PRIVKEY="$WIREGUARD_MIRKWOOD_PRIVKEY" export WIREGUARD_MIRKWOOD_PUBKEY="$WIREGUARD_MIRKWOOD_PUBKEY" From eb93f02f6666dac5423645b9b1081bcd6df19e6c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 14:36:26 +0300 Subject: [PATCH 1206/2667] Add email to cryptissue --- root/etc/cryptissue | 1 + secrets/env | 2 +- secrets/secrets.sh | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/root/etc/cryptissue b/root/etc/cryptissue index 3c9154a1..ff9f538e 100755 --- a/root/etc/cryptissue +++ b/root/etc/cryptissue @@ -47,3 +47,4 @@ Please return it to me! Below are my contact details Name: {{@@ env['ME_FULLNAME'] @@}} Address: {{@@ env['ME_ADDRESS'] @@}} Phone: {{@@ env['ME_PHONE'] @@}} +Email: {{@@ env['ME_EMAIL'] @@}} diff --git a/secrets/env b/secrets/env index 7b41c97b..ed6c52f1 100755 --- a/secrets/env +++ b/secrets/env @@ -6,7 +6,6 @@ export PASS_MUSPY="$(pass entertainment/muspy.com | head -1)" export PASS_ARIA2="$(pass linux/aria2 | head -1)" export PASS_MPD="$(pass linux/mpd | head -1)" export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -1)" -export PASS_IPMI="$(pass selfhosted/idrac | head -1)" export PASS_MQTT="$(pass selfhosted/mqtt.reekynet.com | head -1)" export PASS_EMAIL_HACKER="$(pass email/functionalhacker@korhonen.cc | head -1)" @@ -16,6 +15,7 @@ export PASS_EMAIL_ADMIN="$(pass email/admin@korhonen.cc | head -1)" export ME_FULLNAME="$(pass me | head -1)" export ME_ADDRESS="$(pass me | rg 'address' | cut -d' ' -f2-)" export ME_PHONE="$(pass me | rg 'phone' | cut -d' ' -f2-)" +export ME_email="$(pass me | rg 'email' | cut -d' ' -f2-)" export WIREGUARD_MIRKWOOD_PRIVKEY="$(pass selfhosted/wireguard/mirkwood | grep PrivateKey | cut -d' ' -f2-)" export WIREGUARD_MIRKWOOD_PUBKEY="$(pass selfhosted/wireguard/mirkwood | grep PublicKey | cut -d' ' -f2-)" diff --git a/secrets/secrets.sh b/secrets/secrets.sh index 349c03a6..43691bf9 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -20,6 +20,7 @@ export PASS_EMAIL_ADMIN="$PASS_EMAIL_ADMIN" export ME_FULLNAME="$ME_FULLNAME" export ME_ADDRESS="$ME_ADDRESS" export ME_PHONE="$ME_PHONE" +export ME_EMAIL="$ME_EMAIL" export WIREGUARD_MIRKWOOD_PRIVKEY="$WIREGUARD_MIRKWOOD_PRIVKEY" export WIREGUARD_MIRKWOOD_PUBKEY="$WIREGUARD_MIRKWOOD_PUBKEY" From 22a0fd71c1ff4477018c07846ab5e4d089a0049c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 14:41:50 +0300 Subject: [PATCH 1207/2667] Fix env key --- secrets/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secrets/env b/secrets/env index ed6c52f1..aeb2ded3 100755 --- a/secrets/env +++ b/secrets/env @@ -15,7 +15,7 @@ export PASS_EMAIL_ADMIN="$(pass email/admin@korhonen.cc | head -1)" export ME_FULLNAME="$(pass me | head -1)" export ME_ADDRESS="$(pass me | rg 'address' | cut -d' ' -f2-)" export ME_PHONE="$(pass me | rg 'phone' | cut -d' ' -f2-)" -export ME_email="$(pass me | rg 'email' | cut -d' ' -f2-)" +export ME_EMAIL="$(pass me | rg 'email' | cut -d' ' -f2-)" export WIREGUARD_MIRKWOOD_PRIVKEY="$(pass selfhosted/wireguard/mirkwood | grep PrivateKey | cut -d' ' -f2-)" export WIREGUARD_MIRKWOOD_PUBKEY="$(pass selfhosted/wireguard/mirkwood | grep PublicKey | cut -d' ' -f2-)" From 914df5f4366e9bbeb0382287dc62c89381f651ee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 14:41:50 +0300 Subject: [PATCH 1208/2667] Fix env key --- secrets/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secrets/env b/secrets/env index ed6c52f1..aeb2ded3 100755 --- a/secrets/env +++ b/secrets/env @@ -15,7 +15,7 @@ export PASS_EMAIL_ADMIN="$(pass email/admin@korhonen.cc | head -1)" export ME_FULLNAME="$(pass me | head -1)" export ME_ADDRESS="$(pass me | rg 'address' | cut -d' ' -f2-)" export ME_PHONE="$(pass me | rg 'phone' | cut -d' ' -f2-)" -export ME_email="$(pass me | rg 'email' | cut -d' ' -f2-)" +export ME_EMAIL="$(pass me | rg 'email' | cut -d' ' -f2-)" export WIREGUARD_MIRKWOOD_PRIVKEY="$(pass selfhosted/wireguard/mirkwood | grep PrivateKey | cut -d' ' -f2-)" export WIREGUARD_MIRKWOOD_PUBKEY="$(pass selfhosted/wireguard/mirkwood | grep PublicKey | cut -d' ' -f2-)" From 73f9940a090795b9db612604695a6f08f8ee397f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:37:52 +0300 Subject: [PATCH 1209/2667] Add wayland variables and fix termux dotdrop profile --- config.toml | 12 ++++++++++++ home/.config/mpv/mpv.conf | 14 +++----------- home/.config/zsh/02-plugins.zsh | 10 +++++----- home/.config/zsh/03-aliases.zsh | 2 +- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/config.toml b/config.toml index 6dabc24a..e095540f 100644 --- a/config.toml +++ b/config.toml @@ -311,16 +311,25 @@ dotfiles = [ include = ["os_arch", "email", "media", "sway", "gpg"] dotfiles = ["d_systemd"] +[profiles.Mirkwood.variables] +wayland = true + [profiles.Moria] include = ["os_arch", "media", "gpg"] dotfiles = ["f_zprofile"] +[profiles.Moria.variables] +wayland = true + [profiles.Gondor] include = ["os_arch"] [profiles.mko-laptop] include = ["os_ubuntu", "media", "gpg"] +[profiles.mko-laptop.variables] +wayland = false + [profiles.Isengard] include = ["os_termux"] @@ -330,6 +339,9 @@ include = ["os_arch"] [profiles.TakamakiPC] include = ["os_arch"] +[profiles.TakamakiPC.variables] +wayland = false + [profiles.localhost] include = ["os_arch"] diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index a088b56d..2800d299 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -7,9 +7,10 @@ vo=gpu hwdec=vaapi hwdec-codecs=all -{%@@ if profile == "Mirkwood" or profile == "Moria" @@%} +{%@@ if wayland @@%} gpu-context=wayland -{%@@ elif profile == "mko-laptop" @@%} +{%@@ endif @@%} +{%@@ if profile == "mko-laptop" @@%} script=~/.lib/mpris.so {%@@ endif @@%} @@ -107,12 +108,3 @@ ytdl-format="bestvideo[height<=720]+bestaudio/best[height<=720]" ytdl-format="bestvideo[height<=2160]+bestaudio/best[height<=2160]" [best] ytdl-format="bestvideo+bestaudio" - - -{%@@ if profile == "Mirkwood" @@%} -# Vulkan hwdec profile -[vulkan] -gpu-api=vulkan -gpu-context=waylandvk -hwdec=vaapi-copy -{%@@ endif @@%} diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh index d8d5a65d..6e34d743 100644 --- a/home/.config/zsh/02-plugins.zsh +++ b/home/.config/zsh/02-plugins.zsh @@ -39,12 +39,12 @@ zinit ice lucid atinit'zpcompinit' zinit light zdharma-continuum/fast-syntax-highlighting # use fzf with zsh -{%@@ if profile == "mko-laptop" @@%} -# Source from home directory since mko-laptop is ubuntu and it has an +{%@@ if os == "arch" @@%} +source /usr/share/fzf/key-bindings.zsh +source /usr/share/fzf/completion.zsh +{%@@ elif os == "ubuntu" @@%} +# Source from home directory since ubuntu has # old version of FZF in it's repositories source ~/Software/fzf/shell/key-bindings.zsh source ~/Software/fzf/shell/completion.zsh -{%@@ else @@%} -source /usr/share/fzf/key-bindings.zsh -source /usr/share/fzf/completion.zsh {%@@ endif @@%} diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index aa414fa9..85ad022c 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -118,7 +118,7 @@ alias i='iwctl station wlan0' cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop -dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml $@ } +dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p isengard{%@@ endif @@%}$@ } sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ } updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } compdef _dotdrop-completion.zsh sdotdrop From 6523521f4827804601070c6041f5a59529820012 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:37:52 +0300 Subject: [PATCH 1210/2667] Add wayland variables and fix termux dotdrop profile --- config.toml | 12 ++++++++++++ home/.config/mpv/mpv.conf | 14 +++----------- home/.config/zsh/02-plugins.zsh | 10 +++++----- home/.config/zsh/03-aliases.zsh | 2 +- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/config.toml b/config.toml index 6dabc24a..e095540f 100644 --- a/config.toml +++ b/config.toml @@ -311,16 +311,25 @@ dotfiles = [ include = ["os_arch", "email", "media", "sway", "gpg"] dotfiles = ["d_systemd"] +[profiles.Mirkwood.variables] +wayland = true + [profiles.Moria] include = ["os_arch", "media", "gpg"] dotfiles = ["f_zprofile"] +[profiles.Moria.variables] +wayland = true + [profiles.Gondor] include = ["os_arch"] [profiles.mko-laptop] include = ["os_ubuntu", "media", "gpg"] +[profiles.mko-laptop.variables] +wayland = false + [profiles.Isengard] include = ["os_termux"] @@ -330,6 +339,9 @@ include = ["os_arch"] [profiles.TakamakiPC] include = ["os_arch"] +[profiles.TakamakiPC.variables] +wayland = false + [profiles.localhost] include = ["os_arch"] diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index a088b56d..2800d299 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -7,9 +7,10 @@ vo=gpu hwdec=vaapi hwdec-codecs=all -{%@@ if profile == "Mirkwood" or profile == "Moria" @@%} +{%@@ if wayland @@%} gpu-context=wayland -{%@@ elif profile == "mko-laptop" @@%} +{%@@ endif @@%} +{%@@ if profile == "mko-laptop" @@%} script=~/.lib/mpris.so {%@@ endif @@%} @@ -107,12 +108,3 @@ ytdl-format="bestvideo[height<=720]+bestaudio/best[height<=720]" ytdl-format="bestvideo[height<=2160]+bestaudio/best[height<=2160]" [best] ytdl-format="bestvideo+bestaudio" - - -{%@@ if profile == "Mirkwood" @@%} -# Vulkan hwdec profile -[vulkan] -gpu-api=vulkan -gpu-context=waylandvk -hwdec=vaapi-copy -{%@@ endif @@%} diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh index d8d5a65d..6e34d743 100644 --- a/home/.config/zsh/02-plugins.zsh +++ b/home/.config/zsh/02-plugins.zsh @@ -39,12 +39,12 @@ zinit ice lucid atinit'zpcompinit' zinit light zdharma-continuum/fast-syntax-highlighting # use fzf with zsh -{%@@ if profile == "mko-laptop" @@%} -# Source from home directory since mko-laptop is ubuntu and it has an +{%@@ if os == "arch" @@%} +source /usr/share/fzf/key-bindings.zsh +source /usr/share/fzf/completion.zsh +{%@@ elif os == "ubuntu" @@%} +# Source from home directory since ubuntu has # old version of FZF in it's repositories source ~/Software/fzf/shell/key-bindings.zsh source ~/Software/fzf/shell/completion.zsh -{%@@ else @@%} -source /usr/share/fzf/key-bindings.zsh -source /usr/share/fzf/completion.zsh {%@@ endif @@%} diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index aa414fa9..85ad022c 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -118,7 +118,7 @@ alias i='iwctl station wlan0' cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop -dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml $@ } +dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p isengard{%@@ endif @@%}$@ } sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ } updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } compdef _dotdrop-completion.zsh sdotdrop From 1b70982c43cff8dd26a2d90f33d54174060dc499 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:39:27 +0300 Subject: [PATCH 1211/2667] Fix missing space in alias --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 85ad022c..692f7bcd 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -118,7 +118,7 @@ alias i='iwctl station wlan0' cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop -dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p isengard{%@@ endif @@%}$@ } +dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p isengard{%@@ endif @@%} $@ } sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ } updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } compdef _dotdrop-completion.zsh sdotdrop From d4b172e203634600dd901c3f833f72ef96bd7462 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:39:27 +0300 Subject: [PATCH 1212/2667] Fix missing space in alias --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 85ad022c..692f7bcd 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -118,7 +118,7 @@ alias i='iwctl station wlan0' cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop -dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p isengard{%@@ endif @@%}$@ } +dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p isengard{%@@ endif @@%} $@ } sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ } updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } compdef _dotdrop-completion.zsh sdotdrop From 682218f113f7119cc65c2f29e492ef2de6cf59dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:41:14 +0300 Subject: [PATCH 1213/2667] Fix typo in profile name --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 692f7bcd..b8487592 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -118,7 +118,7 @@ alias i='iwctl station wlan0' cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop -dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p isengard{%@@ endif @@%} $@ } +dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p Isengard{%@@ endif @@%} $@ } sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ } updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } compdef _dotdrop-completion.zsh sdotdrop From 31ab7306c03897e10f979502582a14828e752a45 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:41:14 +0300 Subject: [PATCH 1214/2667] Fix typo in profile name --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 692f7bcd..b8487592 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -118,7 +118,7 @@ alias i='iwctl station wlan0' cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop -dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p isengard{%@@ endif @@%} $@ } +dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p Isengard{%@@ endif @@%} $@ } sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ } updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } compdef _dotdrop-completion.zsh sdotdrop From eff63293682dc430b85347355793ebc363ce7456 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:44:39 +0300 Subject: [PATCH 1215/2667] Add command not found handler for termux --- home/.config/zsh/03-aliases.zsh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index b8487592..67fce11f 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -40,6 +40,11 @@ function command_not_found_handler { done fi } +{%@@ if os == "termux" @@%} +function command_not_found_handler { + $PREFIX/libexec/termux/command-not-found $1 +} +{%@@ endif @@%} # search and install/remove packages with fzf pi() { From 8daff27305a4ea9fca1ed2b08bc7eeebe3916c9a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:44:39 +0300 Subject: [PATCH 1216/2667] Add command not found handler for termux --- home/.config/zsh/03-aliases.zsh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index b8487592..67fce11f 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -40,6 +40,11 @@ function command_not_found_handler { done fi } +{%@@ if os == "termux" @@%} +function command_not_found_handler { + $PREFIX/libexec/termux/command-not-found $1 +} +{%@@ endif @@%} # search and install/remove packages with fzf pi() { From ea6428143293143e1dae55bb17d21c6e45a6960a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:45:14 +0300 Subject: [PATCH 1217/2667] Add print for termux command not found handler --- home/.config/zsh/03-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 67fce11f..28e2989b 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -42,6 +42,7 @@ function command_not_found_handler { } {%@@ if os == "termux" @@%} function command_not_found_handler { + printf 'zsh: command not found: %s\n' "$1" $PREFIX/libexec/termux/command-not-found $1 } {%@@ endif @@%} From 481f32d82e45369810e64056298467310f6a7db0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:45:14 +0300 Subject: [PATCH 1218/2667] Add print for termux command not found handler --- home/.config/zsh/03-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 67fce11f..28e2989b 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -42,6 +42,7 @@ function command_not_found_handler { } {%@@ if os == "termux" @@%} function command_not_found_handler { + printf 'zsh: command not found: %s\n' "$1" $PREFIX/libexec/termux/command-not-found $1 } {%@@ endif @@%} From e87ef5f56d439d7a14fbceb8b03a18b6c32c340e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:46:24 +0300 Subject: [PATCH 1219/2667] Fix template elif --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 28e2989b..defd5def 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -40,7 +40,7 @@ function command_not_found_handler { done fi } -{%@@ if os == "termux" @@%} +{%@@ elif os == "termux" @@%} function command_not_found_handler { printf 'zsh: command not found: %s\n' "$1" $PREFIX/libexec/termux/command-not-found $1 From d4a8a624e891dc0790c17b9854c00911de38f775 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:46:24 +0300 Subject: [PATCH 1220/2667] Fix template elif --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 28e2989b..defd5def 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -40,7 +40,7 @@ function command_not_found_handler { done fi } -{%@@ if os == "termux" @@%} +{%@@ elif os == "termux" @@%} function command_not_found_handler { printf 'zsh: command not found: %s\n' "$1" $PREFIX/libexec/termux/command-not-found $1 From 33037ba06d77243033a50a157c494578dd1b11f6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:57:49 +0300 Subject: [PATCH 1221/2667] Use pkgfile command not found handler for arch --- home/.config/zsh/01-env.zsh | 5 +++++ home/.config/zsh/03-aliases.zsh | 31 +------------------------------ 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index b85aece4..18aa0e24 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -73,3 +73,8 @@ fi # Disable dotdrop submodule auto update export DOTDROP_AUTOUPDATE=no + +{%@@ if os == "arch" @@%} +# Enable pkgfile command not found handler +source /usr/share/doc/pkgfile/command-not-found.zsh +{%@@ endif @@%} diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index defd5def..846323ff 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -12,35 +12,7 @@ forgit_revert_commit=fgrc # Modern replacement for ls alias ls='exa' -{%@@ if os == "arch" @@%} -# Command not found handler -# source https://wiki.archlinux.org/title/Zsh#pacman_-F_%22command_not_found%22_handler -function command_not_found_handler { - local purple='\e[1;35m' bright='\e[0;1m' green='\e[1;32m' reset='\e[0m' - printf 'zsh: command not found: %s\n' "$1" - local entries=( - ${(f)"$(/usr/bin/pacman -F --machinereadable -- "/usr/bin/$1")"} - ) - if (( ${#entries[@]} )) - then - printf "${bright}$1${reset} may be found in the following packages:\n" - local pkg - for entry in "${entries[@]}" - do - # (repo package version file) - local fields=( - ${(0)entry} - ) - if [[ "$pkg" != "${fields[2]}" ]] - then - printf "${purple}%s/${bright}%s ${green}%s${reset}\n" "${fields[1]}" "${fields[2]}" "${fields[3]}" - fi - printf ' /%s\n' "${fields[4]}" - pkg="${fields[2]}" - done - fi -} -{%@@ elif os == "termux" @@%} +{%@@ if os == "termux" @@%} function command_not_found_handler { printf 'zsh: command not found: %s\n' "$1" $PREFIX/libexec/termux/command-not-found $1 @@ -64,7 +36,6 @@ pr() { paru -Rns $(echo $SELECTED_PKGS) fi } -{%@@ endif @@%} # find and open man pages with fzf fman() { From 95af23121009b8c5eca1b94b6e37b28fd7fb10b3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:57:49 +0300 Subject: [PATCH 1222/2667] Use pkgfile command not found handler for arch --- home/.config/zsh/01-env.zsh | 5 +++++ home/.config/zsh/03-aliases.zsh | 31 +------------------------------ 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index b85aece4..18aa0e24 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -73,3 +73,8 @@ fi # Disable dotdrop submodule auto update export DOTDROP_AUTOUPDATE=no + +{%@@ if os == "arch" @@%} +# Enable pkgfile command not found handler +source /usr/share/doc/pkgfile/command-not-found.zsh +{%@@ endif @@%} diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index defd5def..846323ff 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -12,35 +12,7 @@ forgit_revert_commit=fgrc # Modern replacement for ls alias ls='exa' -{%@@ if os == "arch" @@%} -# Command not found handler -# source https://wiki.archlinux.org/title/Zsh#pacman_-F_%22command_not_found%22_handler -function command_not_found_handler { - local purple='\e[1;35m' bright='\e[0;1m' green='\e[1;32m' reset='\e[0m' - printf 'zsh: command not found: %s\n' "$1" - local entries=( - ${(f)"$(/usr/bin/pacman -F --machinereadable -- "/usr/bin/$1")"} - ) - if (( ${#entries[@]} )) - then - printf "${bright}$1${reset} may be found in the following packages:\n" - local pkg - for entry in "${entries[@]}" - do - # (repo package version file) - local fields=( - ${(0)entry} - ) - if [[ "$pkg" != "${fields[2]}" ]] - then - printf "${purple}%s/${bright}%s ${green}%s${reset}\n" "${fields[1]}" "${fields[2]}" "${fields[3]}" - fi - printf ' /%s\n' "${fields[4]}" - pkg="${fields[2]}" - done - fi -} -{%@@ elif os == "termux" @@%} +{%@@ if os == "termux" @@%} function command_not_found_handler { printf 'zsh: command not found: %s\n' "$1" $PREFIX/libexec/termux/command-not-found $1 @@ -64,7 +36,6 @@ pr() { paru -Rns $(echo $SELECTED_PKGS) fi } -{%@@ endif @@%} # find and open man pages with fzf fman() { From dc8475f7bb4fb6f61fdcc78abcdf8ac222ef7ddc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 22:02:56 +0300 Subject: [PATCH 1223/2667] Enable ubuntu command not found handler --- home/.config/zsh/01-env.zsh | 5 ----- home/.config/zsh/03-aliases.zsh | 8 ++++++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 18aa0e24..b85aece4 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -73,8 +73,3 @@ fi # Disable dotdrop submodule auto update export DOTDROP_AUTOUPDATE=no - -{%@@ if os == "arch" @@%} -# Enable pkgfile command not found handler -source /usr/share/doc/pkgfile/command-not-found.zsh -{%@@ endif @@%} diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 846323ff..e588df87 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -12,9 +12,13 @@ forgit_revert_commit=fgrc # Modern replacement for ls alias ls='exa' -{%@@ if os == "termux" @@%} +# Enable command not found handler +{%@@ if os == "arch" @@%} +source /usr/share/doc/pkgfile/command-not-found.zsh +{%@@ elif os == "ubuntu" @@%} +source /etc/zsh_command_not_found +{%@@ elif os == "termux" @@%} function command_not_found_handler { - printf 'zsh: command not found: %s\n' "$1" $PREFIX/libexec/termux/command-not-found $1 } {%@@ endif @@%} From 0e39efb2cf22290a3a0f8610047bc0e3c770d975 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 22:02:56 +0300 Subject: [PATCH 1224/2667] Enable ubuntu command not found handler --- home/.config/zsh/01-env.zsh | 5 ----- home/.config/zsh/03-aliases.zsh | 8 ++++++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 18aa0e24..b85aece4 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -73,8 +73,3 @@ fi # Disable dotdrop submodule auto update export DOTDROP_AUTOUPDATE=no - -{%@@ if os == "arch" @@%} -# Enable pkgfile command not found handler -source /usr/share/doc/pkgfile/command-not-found.zsh -{%@@ endif @@%} diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 846323ff..e588df87 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -12,9 +12,13 @@ forgit_revert_commit=fgrc # Modern replacement for ls alias ls='exa' -{%@@ if os == "termux" @@%} +# Enable command not found handler +{%@@ if os == "arch" @@%} +source /usr/share/doc/pkgfile/command-not-found.zsh +{%@@ elif os == "ubuntu" @@%} +source /etc/zsh_command_not_found +{%@@ elif os == "termux" @@%} function command_not_found_handler { - printf 'zsh: command not found: %s\n' "$1" $PREFIX/libexec/termux/command-not-found $1 } {%@@ endif @@%} From c422a3aff3cb170abe32e427d24c036cadd289d1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Aug 2022 10:01:59 +0300 Subject: [PATCH 1225/2667] Enable pacman fzf functions only on arch --- home/.config/zsh/03-aliases.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index e588df87..dd210b54 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -23,6 +23,7 @@ function command_not_found_handler { } {%@@ endif @@%} +{%@@ if os == "arch" @@%} # search and install/remove packages with fzf pi() { SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}')" @@ -40,6 +41,7 @@ pr() { paru -Rns $(echo $SELECTED_PKGS) fi } +{%@@ endif @@%} # find and open man pages with fzf fman() { From fa625e50c90aedcacfd451722d042070fc9f8eb6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Aug 2022 10:01:59 +0300 Subject: [PATCH 1226/2667] Enable pacman fzf functions only on arch --- home/.config/zsh/03-aliases.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index e588df87..dd210b54 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -23,6 +23,7 @@ function command_not_found_handler { } {%@@ endif @@%} +{%@@ if os == "arch" @@%} # search and install/remove packages with fzf pi() { SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}')" @@ -40,6 +41,7 @@ pr() { paru -Rns $(echo $SELECTED_PKGS) fi } +{%@@ endif @@%} # find and open man pages with fzf fman() { From d2821f9ba8b08d6c432cd6b05399707e3a197f0c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Aug 2022 13:09:26 +0300 Subject: [PATCH 1227/2667] Add Treesitter update to update alias --- home/.config/zsh/03-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index dd210b54..3662bd65 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -133,6 +133,7 @@ update() { plugins() { nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync' + nvim --headless +TSUpdateSync +qa zinit self-update zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all From 23d573ea6dc0101d03b019267d60bf8c5af03b49 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Aug 2022 13:09:26 +0300 Subject: [PATCH 1228/2667] Add Treesitter update to update alias --- home/.config/zsh/03-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index dd210b54..3662bd65 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -133,6 +133,7 @@ update() { plugins() { nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync' + nvim --headless +TSUpdateSync +qa zinit self-update zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all From 9ef1115fa28691b5bde1fc9003b78b57928c2431 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 22 Aug 2022 14:34:12 +0300 Subject: [PATCH 1229/2667] Nvim: switch from nvim-lsp-installer to masonry.nvim --- home/.config/nvim/lua/pluginconf/lsp.lua | 66 +++++++++++------------- home/.config/nvim/lua/pluginmanager.lua | 2 +- 2 files changed, 32 insertions(+), 36 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index c7475b37..08678471 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -1,6 +1,5 @@ -local lsp_installer = require('nvim-lsp-installer') - local M = {} +local lspconfig = require('lspconfig'); M.lsp_map_keys = function(server, bufnr) local function map_key(...) @@ -50,41 +49,38 @@ capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) -- Setup LSP signature plugin require('lsp_signature').setup() --- Register a handler that will be called for all installed servers. -lsp_installer.on_server_ready(function(server) - -- Don't setup jdtls here since it is done by nvim-jdtls - if server.name == 'jdtls' then return end +-- Setup mason +require("mason").setup() +require("mason-lspconfig").setup({automatic_installation = true}) - local opts = {} +-- LSP servers setup +lspconfig.tsserver.setup {{}, on_attach = M.lsp_map_keys} +lspconfig.yamlls.setup {{}, on_attach = M.lsp_map_keys} +lspconfig.jsonls.setup {{}, on_attach = M.lsp_map_keys} - -- Lua specific settings - if server.name == 'sumneko_lua' then - local runtime_path = vim.split(package.path, ';') - opts.settings = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = 'LuaJIT', - -- Setup your lua path - path = runtime_path - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = {'vim'} - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file('', true) - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = {enable = false} - } +lspconfig.sumneko_lua.setup { + settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = 'LuaJIT', + -- Setup your lua path + path = vim.split(package.path, ';') + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = {'vim'} + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file('', true) + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = {enable = false} } - end - - opts.on_attach = M.lsp_map_keys - opts.capabilities = capabilities - server:setup(opts) -end) + }, + on_attach = M.lsp_map_keys, + capabilities = capabilities +} return M diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index ff403e4a..a806328b 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -65,7 +65,7 @@ require('packer').startup(function() use 'neovim/nvim-lspconfig' -- Install LSP server executables - use 'williamboman/nvim-lsp-installer' + use {"williamboman/mason.nvim", "williamboman/mason-lspconfig.nvim"} -- Additional LSP features for Java use 'mfussenegger/nvim-jdtls' From 3138316af809748ba23a0b83ec35880963a24a05 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 22 Aug 2022 14:34:12 +0300 Subject: [PATCH 1230/2667] Nvim: switch from nvim-lsp-installer to masonry.nvim --- home/.config/nvim/lua/pluginconf/lsp.lua | 66 +++++++++++------------- home/.config/nvim/lua/pluginmanager.lua | 2 +- 2 files changed, 32 insertions(+), 36 deletions(-) diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index c7475b37..08678471 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -1,6 +1,5 @@ -local lsp_installer = require('nvim-lsp-installer') - local M = {} +local lspconfig = require('lspconfig'); M.lsp_map_keys = function(server, bufnr) local function map_key(...) @@ -50,41 +49,38 @@ capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) -- Setup LSP signature plugin require('lsp_signature').setup() --- Register a handler that will be called for all installed servers. -lsp_installer.on_server_ready(function(server) - -- Don't setup jdtls here since it is done by nvim-jdtls - if server.name == 'jdtls' then return end +-- Setup mason +require("mason").setup() +require("mason-lspconfig").setup({automatic_installation = true}) - local opts = {} +-- LSP servers setup +lspconfig.tsserver.setup {{}, on_attach = M.lsp_map_keys} +lspconfig.yamlls.setup {{}, on_attach = M.lsp_map_keys} +lspconfig.jsonls.setup {{}, on_attach = M.lsp_map_keys} - -- Lua specific settings - if server.name == 'sumneko_lua' then - local runtime_path = vim.split(package.path, ';') - opts.settings = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = 'LuaJIT', - -- Setup your lua path - path = runtime_path - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = {'vim'} - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file('', true) - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = {enable = false} - } +lspconfig.sumneko_lua.setup { + settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = 'LuaJIT', + -- Setup your lua path + path = vim.split(package.path, ';') + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = {'vim'} + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file('', true) + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = {enable = false} } - end - - opts.on_attach = M.lsp_map_keys - opts.capabilities = capabilities - server:setup(opts) -end) + }, + on_attach = M.lsp_map_keys, + capabilities = capabilities +} return M diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index ff403e4a..a806328b 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -65,7 +65,7 @@ require('packer').startup(function() use 'neovim/nvim-lspconfig' -- Install LSP server executables - use 'williamboman/nvim-lsp-installer' + use {"williamboman/mason.nvim", "williamboman/mason-lspconfig.nvim"} -- Additional LSP features for Java use 'mfussenegger/nvim-jdtls' From 8643dd3b6bde9964e96ebc2cb72c2bd50c6e55c7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 22 Aug 2022 14:57:24 +0300 Subject: [PATCH 1231/2667] Refactor nvim packer configuration --- home/.config/nvim/init.lua | 13 +----- .../{pluginconf => plugins}/bufferline.lua | 0 .../{pluginconf => plugins}/colorscheme.lua | 0 .../{pluginconf => plugins}/completion.lua | 0 .../indent-blankline.lua | 0 .../{pluginmanager.lua => plugins/init.lua} | 41 +++++++++++++------ .../nvim/lua/{pluginconf => plugins}/lsp.lua | 1 + .../lua/{pluginconf => plugins}/lualine.lua | 0 .../lua/{pluginconf => plugins}/nvim-tree.lua | 0 .../lua/{pluginconf => plugins}/telescope.lua | 0 .../{pluginconf => plugins}/treesitter.lua | 0 11 files changed, 31 insertions(+), 24 deletions(-) rename home/.config/nvim/lua/{pluginconf => plugins}/bufferline.lua (100%) rename home/.config/nvim/lua/{pluginconf => plugins}/colorscheme.lua (100%) rename home/.config/nvim/lua/{pluginconf => plugins}/completion.lua (100%) rename home/.config/nvim/lua/{pluginconf => plugins}/indent-blankline.lua (100%) rename home/.config/nvim/lua/{pluginmanager.lua => plugins/init.lua} (76%) rename home/.config/nvim/lua/{pluginconf => plugins}/lsp.lua (99%) rename home/.config/nvim/lua/{pluginconf => plugins}/lualine.lua (100%) rename home/.config/nvim/lua/{pluginconf => plugins}/nvim-tree.lua (100%) rename home/.config/nvim/lua/{pluginconf => plugins}/telescope.lua (100%) rename home/.config/nvim/lua/{pluginconf => plugins}/treesitter.lua (100%) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 107c41e6..fee008a6 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,16 +1,5 @@ -require 'pluginmanager' +require 'plugins/init' require 'autocmd' require 'keybinds' require 'settings' require 'common' - --- Plugin configurations -require 'pluginconf.lualine' -require 'pluginconf.bufferline' -require 'pluginconf.lsp' -require 'pluginconf.completion' -require 'pluginconf.treesitter' -require 'pluginconf.indent-blankline' -require 'pluginconf.nvim-tree' -require 'pluginconf.colorscheme' -require 'pluginconf.telescope' diff --git a/home/.config/nvim/lua/pluginconf/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua similarity index 100% rename from home/.config/nvim/lua/pluginconf/bufferline.lua rename to home/.config/nvim/lua/plugins/bufferline.lua diff --git a/home/.config/nvim/lua/pluginconf/colorscheme.lua b/home/.config/nvim/lua/plugins/colorscheme.lua similarity index 100% rename from home/.config/nvim/lua/pluginconf/colorscheme.lua rename to home/.config/nvim/lua/plugins/colorscheme.lua diff --git a/home/.config/nvim/lua/pluginconf/completion.lua b/home/.config/nvim/lua/plugins/completion.lua similarity index 100% rename from home/.config/nvim/lua/pluginconf/completion.lua rename to home/.config/nvim/lua/plugins/completion.lua diff --git a/home/.config/nvim/lua/pluginconf/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua similarity index 100% rename from home/.config/nvim/lua/pluginconf/indent-blankline.lua rename to home/.config/nvim/lua/plugins/indent-blankline.lua diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/plugins/init.lua similarity index 76% rename from home/.config/nvim/lua/pluginmanager.lua rename to home/.config/nvim/lua/plugins/init.lua index a806328b..d01452e4 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -1,23 +1,25 @@ local fn = vim.fn -local cmd = vim.cmd -- Install packer if it's not yet installed local install_path = fn.stdpath('data') .. '/site/pack/packer/opt/packer.nvim' -local packer_not_installed = fn.empty(fn.glob(install_path)) - -if packer_not_installed > 0 then - print('Packer is not installed, cloning it now...') - cmd('silent !git clone https://github.com/wbthomason/packer.nvim ' .. - install_path) +if fn.empty(fn.glob(install_path)) > 0 then + print('installing packer') + Packer_bootstrap = fn.system({ + 'git', 'clone', '--depth', '1', + 'https://github.com/wbthomason/packer.nvim', install_path + }) + vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. + vim.o.runtimepath + print('installed packer') end -- Configure packer -cmd 'packadd packer.nvim' -local use = require('packer').use +vim.cmd [[packadd packer.nvim]] require('packer').startup(function() +local use = require('packer').use -- The plugin manager itself - use {'wbthomason/packer.nvim', opt = true} + use {'wbthomason/packer.nvim', opt=true} -- Colorscheme use({'catppuccin/nvim', as = 'catppuccin'}) @@ -120,7 +122,22 @@ require('packer').startup(function() -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' + -- Sync plugins if Packer was just + -- installed + if Packer_bootstrap then + print('syncing') + require('packer').sync() + print('synced') + end end) --- Install plugins if packer was not installed -if packer_not_installed > 0 then cmd 'PackerInstall' end +-- Source configurations +require 'plugins/lualine' +require 'plugins/bufferline' +require 'plugins/lsp' +require 'plugins/completion' +require 'plugins/treesitter' +require 'plugins/indent-blankline' +require 'plugins/nvim-tree' +require 'plugins/colorscheme' +require 'plugins/telescope' diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/plugins/lsp.lua similarity index 99% rename from home/.config/nvim/lua/pluginconf/lsp.lua rename to home/.config/nvim/lua/plugins/lsp.lua index 08678471..94dab6c1 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/plugins/lsp.lua @@ -1,5 +1,6 @@ local M = {} local lspconfig = require('lspconfig'); +-- M.lsp_map_keys = function(server, bufnr) local function map_key(...) diff --git a/home/.config/nvim/lua/pluginconf/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua similarity index 100% rename from home/.config/nvim/lua/pluginconf/lualine.lua rename to home/.config/nvim/lua/plugins/lualine.lua diff --git a/home/.config/nvim/lua/pluginconf/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua similarity index 100% rename from home/.config/nvim/lua/pluginconf/nvim-tree.lua rename to home/.config/nvim/lua/plugins/nvim-tree.lua diff --git a/home/.config/nvim/lua/pluginconf/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua similarity index 100% rename from home/.config/nvim/lua/pluginconf/telescope.lua rename to home/.config/nvim/lua/plugins/telescope.lua diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua similarity index 100% rename from home/.config/nvim/lua/pluginconf/treesitter.lua rename to home/.config/nvim/lua/plugins/treesitter.lua From 1b277bf8875acf0e16debbf40ecd8eb3ebd14bc0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 22 Aug 2022 14:57:24 +0300 Subject: [PATCH 1232/2667] Refactor nvim packer configuration --- home/.config/nvim/init.lua | 13 +----- .../{pluginconf => plugins}/bufferline.lua | 0 .../{pluginconf => plugins}/colorscheme.lua | 0 .../{pluginconf => plugins}/completion.lua | 0 .../indent-blankline.lua | 0 .../{pluginmanager.lua => plugins/init.lua} | 41 +++++++++++++------ .../nvim/lua/{pluginconf => plugins}/lsp.lua | 1 + .../lua/{pluginconf => plugins}/lualine.lua | 0 .../lua/{pluginconf => plugins}/nvim-tree.lua | 0 .../lua/{pluginconf => plugins}/telescope.lua | 0 .../{pluginconf => plugins}/treesitter.lua | 0 11 files changed, 31 insertions(+), 24 deletions(-) rename home/.config/nvim/lua/{pluginconf => plugins}/bufferline.lua (100%) rename home/.config/nvim/lua/{pluginconf => plugins}/colorscheme.lua (100%) rename home/.config/nvim/lua/{pluginconf => plugins}/completion.lua (100%) rename home/.config/nvim/lua/{pluginconf => plugins}/indent-blankline.lua (100%) rename home/.config/nvim/lua/{pluginmanager.lua => plugins/init.lua} (76%) rename home/.config/nvim/lua/{pluginconf => plugins}/lsp.lua (99%) rename home/.config/nvim/lua/{pluginconf => plugins}/lualine.lua (100%) rename home/.config/nvim/lua/{pluginconf => plugins}/nvim-tree.lua (100%) rename home/.config/nvim/lua/{pluginconf => plugins}/telescope.lua (100%) rename home/.config/nvim/lua/{pluginconf => plugins}/treesitter.lua (100%) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 107c41e6..fee008a6 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,16 +1,5 @@ -require 'pluginmanager' +require 'plugins/init' require 'autocmd' require 'keybinds' require 'settings' require 'common' - --- Plugin configurations -require 'pluginconf.lualine' -require 'pluginconf.bufferline' -require 'pluginconf.lsp' -require 'pluginconf.completion' -require 'pluginconf.treesitter' -require 'pluginconf.indent-blankline' -require 'pluginconf.nvim-tree' -require 'pluginconf.colorscheme' -require 'pluginconf.telescope' diff --git a/home/.config/nvim/lua/pluginconf/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua similarity index 100% rename from home/.config/nvim/lua/pluginconf/bufferline.lua rename to home/.config/nvim/lua/plugins/bufferline.lua diff --git a/home/.config/nvim/lua/pluginconf/colorscheme.lua b/home/.config/nvim/lua/plugins/colorscheme.lua similarity index 100% rename from home/.config/nvim/lua/pluginconf/colorscheme.lua rename to home/.config/nvim/lua/plugins/colorscheme.lua diff --git a/home/.config/nvim/lua/pluginconf/completion.lua b/home/.config/nvim/lua/plugins/completion.lua similarity index 100% rename from home/.config/nvim/lua/pluginconf/completion.lua rename to home/.config/nvim/lua/plugins/completion.lua diff --git a/home/.config/nvim/lua/pluginconf/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua similarity index 100% rename from home/.config/nvim/lua/pluginconf/indent-blankline.lua rename to home/.config/nvim/lua/plugins/indent-blankline.lua diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/plugins/init.lua similarity index 76% rename from home/.config/nvim/lua/pluginmanager.lua rename to home/.config/nvim/lua/plugins/init.lua index a806328b..d01452e4 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -1,23 +1,25 @@ local fn = vim.fn -local cmd = vim.cmd -- Install packer if it's not yet installed local install_path = fn.stdpath('data') .. '/site/pack/packer/opt/packer.nvim' -local packer_not_installed = fn.empty(fn.glob(install_path)) - -if packer_not_installed > 0 then - print('Packer is not installed, cloning it now...') - cmd('silent !git clone https://github.com/wbthomason/packer.nvim ' .. - install_path) +if fn.empty(fn.glob(install_path)) > 0 then + print('installing packer') + Packer_bootstrap = fn.system({ + 'git', 'clone', '--depth', '1', + 'https://github.com/wbthomason/packer.nvim', install_path + }) + vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. + vim.o.runtimepath + print('installed packer') end -- Configure packer -cmd 'packadd packer.nvim' -local use = require('packer').use +vim.cmd [[packadd packer.nvim]] require('packer').startup(function() +local use = require('packer').use -- The plugin manager itself - use {'wbthomason/packer.nvim', opt = true} + use {'wbthomason/packer.nvim', opt=true} -- Colorscheme use({'catppuccin/nvim', as = 'catppuccin'}) @@ -120,7 +122,22 @@ require('packer').startup(function() -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' + -- Sync plugins if Packer was just + -- installed + if Packer_bootstrap then + print('syncing') + require('packer').sync() + print('synced') + end end) --- Install plugins if packer was not installed -if packer_not_installed > 0 then cmd 'PackerInstall' end +-- Source configurations +require 'plugins/lualine' +require 'plugins/bufferline' +require 'plugins/lsp' +require 'plugins/completion' +require 'plugins/treesitter' +require 'plugins/indent-blankline' +require 'plugins/nvim-tree' +require 'plugins/colorscheme' +require 'plugins/telescope' diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/plugins/lsp.lua similarity index 99% rename from home/.config/nvim/lua/pluginconf/lsp.lua rename to home/.config/nvim/lua/plugins/lsp.lua index 08678471..94dab6c1 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/plugins/lsp.lua @@ -1,5 +1,6 @@ local M = {} local lspconfig = require('lspconfig'); +-- M.lsp_map_keys = function(server, bufnr) local function map_key(...) diff --git a/home/.config/nvim/lua/pluginconf/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua similarity index 100% rename from home/.config/nvim/lua/pluginconf/lualine.lua rename to home/.config/nvim/lua/plugins/lualine.lua diff --git a/home/.config/nvim/lua/pluginconf/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua similarity index 100% rename from home/.config/nvim/lua/pluginconf/nvim-tree.lua rename to home/.config/nvim/lua/plugins/nvim-tree.lua diff --git a/home/.config/nvim/lua/pluginconf/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua similarity index 100% rename from home/.config/nvim/lua/pluginconf/telescope.lua rename to home/.config/nvim/lua/plugins/telescope.lua diff --git a/home/.config/nvim/lua/pluginconf/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua similarity index 100% rename from home/.config/nvim/lua/pluginconf/treesitter.lua rename to home/.config/nvim/lua/plugins/treesitter.lua From f84f9b72f552b70b7ed7701bc229574d9338ef32 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 22 Aug 2022 15:01:18 +0300 Subject: [PATCH 1233/2667] Fix dotsync alias --- home/.config/nvim/lua/plugins/lsp.lua | 1 + home/.config/zsh/03-aliases.zsh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/lsp.lua b/home/.config/nvim/lua/plugins/lsp.lua index 94dab6c1..6e58be47 100644 --- a/home/.config/nvim/lua/plugins/lsp.lua +++ b/home/.config/nvim/lua/plugins/lsp.lua @@ -58,6 +58,7 @@ require("mason-lspconfig").setup({automatic_installation = true}) lspconfig.tsserver.setup {{}, on_attach = M.lsp_map_keys} lspconfig.yamlls.setup {{}, on_attach = M.lsp_map_keys} lspconfig.jsonls.setup {{}, on_attach = M.lsp_map_keys} +lspconfig.html.setup {{}, on_attach = M.lsp_map_keys} lspconfig.sumneko_lua.setup { settings = { diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 3662bd65..bddf1c63 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -106,7 +106,7 @@ sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } compdef _dotdrop-completion.zsh sdotdrop alias dotgit='git -C $DOTREPO' -dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } +dotsync() { cd $DOTREPO && gac && gpull && gpush && cd $OLDPWD } # sync password manager passync() { pass git pull && pass git push && updatesecrets } From 9e5df50795a98628d94b9ccab79fca438304f755 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 22 Aug 2022 15:01:18 +0300 Subject: [PATCH 1234/2667] Fix dotsync alias --- home/.config/nvim/lua/plugins/lsp.lua | 1 + home/.config/zsh/03-aliases.zsh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/lsp.lua b/home/.config/nvim/lua/plugins/lsp.lua index 94dab6c1..6e58be47 100644 --- a/home/.config/nvim/lua/plugins/lsp.lua +++ b/home/.config/nvim/lua/plugins/lsp.lua @@ -58,6 +58,7 @@ require("mason-lspconfig").setup({automatic_installation = true}) lspconfig.tsserver.setup {{}, on_attach = M.lsp_map_keys} lspconfig.yamlls.setup {{}, on_attach = M.lsp_map_keys} lspconfig.jsonls.setup {{}, on_attach = M.lsp_map_keys} +lspconfig.html.setup {{}, on_attach = M.lsp_map_keys} lspconfig.sumneko_lua.setup { settings = { diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 3662bd65..bddf1c63 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -106,7 +106,7 @@ sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } compdef _dotdrop-completion.zsh sdotdrop alias dotgit='git -C $DOTREPO' -dotsync() { cd $DOTREPO && gpull && ga && gc && gpush && cd $OLDPWD } +dotsync() { cd $DOTREPO && gac && gpull && gpush && cd $OLDPWD } # sync password manager passync() { pass git pull && pass git push && updatesecrets } From e35ccc8ae2973ac48e2bd105664be66b2439916a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 09:27:43 +0300 Subject: [PATCH 1235/2667] Nvim: Use default Java for LSP --- home/.config/nvim/ftplugin/java.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 72bac9ac..d193761d 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -4,7 +4,7 @@ local workspace_dir = nvim_local_dir .. '/jdtls-workspaces/' .. project_name require('jdtls').start_or_attach({ cmd = { - '/usr/lib/jvm/java-17-openjdk-amd64/bin/java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', + '/usr/bin/java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', '-Dosgi.bundles.defaultStartLevel=4', '-Declipse.product=org.eclipse.jdt.ls.core.product', '-Dlog.protocol=true', '-Dlog.level=ALL', '-Xms1g', @@ -17,4 +17,4 @@ require('jdtls').start_or_attach({ } }) -require('pluginconf.lsp').lsp_map_keys('jdtls', nil) +require('plugins.lsp').lsp_map_keys('jdtls', nil) From 6e52e8a4fb9187741f95fbdc52d518d56deea3cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 09:27:43 +0300 Subject: [PATCH 1236/2667] Nvim: Use default Java for LSP --- home/.config/nvim/ftplugin/java.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 72bac9ac..d193761d 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -4,7 +4,7 @@ local workspace_dir = nvim_local_dir .. '/jdtls-workspaces/' .. project_name require('jdtls').start_or_attach({ cmd = { - '/usr/lib/jvm/java-17-openjdk-amd64/bin/java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', + '/usr/bin/java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', '-Dosgi.bundles.defaultStartLevel=4', '-Declipse.product=org.eclipse.jdt.ls.core.product', '-Dlog.protocol=true', '-Dlog.level=ALL', '-Xms1g', @@ -17,4 +17,4 @@ require('jdtls').start_or_attach({ } }) -require('pluginconf.lsp').lsp_map_keys('jdtls', nil) +require('plugins.lsp').lsp_map_keys('jdtls', nil) From 6351093de0a9bae6d78ca1ed2906121a3e82a14f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 09:28:07 +0300 Subject: [PATCH 1237/2667] Refine packer update commands --- home/.config/nvim/lua/plugins/init.lua | 21 +++++++++++---------- home/.config/zsh/03-aliases.zsh | 4 +++- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index d01452e4..cdda323c 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -3,20 +3,20 @@ local fn = vim.fn -- Install packer if it's not yet installed local install_path = fn.stdpath('data') .. '/site/pack/packer/opt/packer.nvim' if fn.empty(fn.glob(install_path)) > 0 then - print('installing packer') + print('Installing Packer') Packer_bootstrap = fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path }) vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. vim.o.runtimepath - print('installed packer') + print('Installed Packer') end -- Configure packer vim.cmd [[packadd packer.nvim]] require('packer').startup(function() -local use = require('packer').use + local use = require('packer').use -- The plugin manager itself use {'wbthomason/packer.nvim', opt=true} @@ -122,15 +122,16 @@ local use = require('packer').use -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' - -- Sync plugins if Packer was just - -- installed - if Packer_bootstrap then - print('syncing') - require('packer').sync() - print('synced') - end end) +-- Sync plugins if Packer was just +-- installed +if Packer_bootstrap then + print('Syncing plugins') + require('packer').sync() + print('Synced') +end + -- Source configurations require 'plugins/lualine' require 'plugins/bufferline' diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index bddf1c63..1e14d292 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -132,7 +132,9 @@ update() { } plugins() { - nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync' + echo "Updating NeoVim plugins" + nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync' + echo "Updating NeoVim TreeSitter" nvim --headless +TSUpdateSync +qa zinit self-update zinit update -p From 64d984edb8184c77180d7e07b8eda0cf57457633 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 09:28:07 +0300 Subject: [PATCH 1238/2667] Refine packer update commands --- home/.config/nvim/lua/plugins/init.lua | 21 +++++++++++---------- home/.config/zsh/03-aliases.zsh | 4 +++- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index d01452e4..cdda323c 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -3,20 +3,20 @@ local fn = vim.fn -- Install packer if it's not yet installed local install_path = fn.stdpath('data') .. '/site/pack/packer/opt/packer.nvim' if fn.empty(fn.glob(install_path)) > 0 then - print('installing packer') + print('Installing Packer') Packer_bootstrap = fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path }) vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. vim.o.runtimepath - print('installed packer') + print('Installed Packer') end -- Configure packer vim.cmd [[packadd packer.nvim]] require('packer').startup(function() -local use = require('packer').use + local use = require('packer').use -- The plugin manager itself use {'wbthomason/packer.nvim', opt=true} @@ -122,15 +122,16 @@ local use = require('packer').use -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' - -- Sync plugins if Packer was just - -- installed - if Packer_bootstrap then - print('syncing') - require('packer').sync() - print('synced') - end end) +-- Sync plugins if Packer was just +-- installed +if Packer_bootstrap then + print('Syncing plugins') + require('packer').sync() + print('Synced') +end + -- Source configurations require 'plugins/lualine' require 'plugins/bufferline' diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index bddf1c63..1e14d292 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -132,7 +132,9 @@ update() { } plugins() { - nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync' + echo "Updating NeoVim plugins" + nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync' + echo "Updating NeoVim TreeSitter" nvim --headless +TSUpdateSync +qa zinit self-update zinit update -p From d70a628146174d704ca77459abca32f9156a593b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 09:41:00 +0300 Subject: [PATCH 1239/2667] Fix jdtls setup --- home/.config/nvim/ftplugin/java.lua | 6 +++--- home/.config/nvim/lua/plugins/init.lua | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index d193761d..d5528a10 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -4,15 +4,15 @@ local workspace_dir = nvim_local_dir .. '/jdtls-workspaces/' .. project_name require('jdtls').start_or_attach({ cmd = { - '/usr/bin/java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', + 'java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', '-Dosgi.bundles.defaultStartLevel=4', '-Declipse.product=org.eclipse.jdt.ls.core.product', '-Dlog.protocol=true', '-Dlog.level=ALL', '-Xms1g', '--add-modules=ALL-SYSTEM', '--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.lang=ALL-UNNAMED', '-jar', nvim_local_dir .. - '/lsp_servers/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar', - '-configuration', nvim_local_dir .. '/lsp_servers/jdtls/config_linux', + '/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar', + '-configuration', nvim_local_dir .. '/mason/packages/jdtls/config_linux', '-data', workspace_dir } }) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index cdda323c..d277e599 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -16,10 +16,10 @@ end -- Configure packer vim.cmd [[packadd packer.nvim]] require('packer').startup(function() - local use = require('packer').use + local use = require('packer').use -- The plugin manager itself - use {'wbthomason/packer.nvim', opt=true} + use {'wbthomason/packer.nvim', opt = true} -- Colorscheme use({'catppuccin/nvim', as = 'catppuccin'}) From d3665749894a1203ee0c364efd19fc59340b7647 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 09:41:00 +0300 Subject: [PATCH 1240/2667] Fix jdtls setup --- home/.config/nvim/ftplugin/java.lua | 6 +++--- home/.config/nvim/lua/plugins/init.lua | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index d193761d..d5528a10 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -4,15 +4,15 @@ local workspace_dir = nvim_local_dir .. '/jdtls-workspaces/' .. project_name require('jdtls').start_or_attach({ cmd = { - '/usr/bin/java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', + 'java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', '-Dosgi.bundles.defaultStartLevel=4', '-Declipse.product=org.eclipse.jdt.ls.core.product', '-Dlog.protocol=true', '-Dlog.level=ALL', '-Xms1g', '--add-modules=ALL-SYSTEM', '--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.lang=ALL-UNNAMED', '-jar', nvim_local_dir .. - '/lsp_servers/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar', - '-configuration', nvim_local_dir .. '/lsp_servers/jdtls/config_linux', + '/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar', + '-configuration', nvim_local_dir .. '/mason/packages/jdtls/config_linux', '-data', workspace_dir } }) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index cdda323c..d277e599 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -16,10 +16,10 @@ end -- Configure packer vim.cmd [[packadd packer.nvim]] require('packer').startup(function() - local use = require('packer').use + local use = require('packer').use -- The plugin manager itself - use {'wbthomason/packer.nvim', opt=true} + use {'wbthomason/packer.nvim', opt = true} -- Colorscheme use({'catppuccin/nvim', as = 'catppuccin'}) From 5629e07bf35d20275bb79571d6838ca5da75cc34 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 10:14:44 +0300 Subject: [PATCH 1241/2667] Add markdown lsp server --- home/.config/nvim/lua/plugins/lsp.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/lsp.lua b/home/.config/nvim/lua/plugins/lsp.lua index 6e58be47..631a53a8 100644 --- a/home/.config/nvim/lua/plugins/lsp.lua +++ b/home/.config/nvim/lua/plugins/lsp.lua @@ -59,6 +59,7 @@ lspconfig.tsserver.setup {{}, on_attach = M.lsp_map_keys} lspconfig.yamlls.setup {{}, on_attach = M.lsp_map_keys} lspconfig.jsonls.setup {{}, on_attach = M.lsp_map_keys} lspconfig.html.setup {{}, on_attach = M.lsp_map_keys} +lspconfig.marksman.setup {{}, on_attach = M.lsp_map_keys} lspconfig.sumneko_lua.setup { settings = { From 58b1563a8be6fcd21226329bedf6e76239f088fe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 10:14:44 +0300 Subject: [PATCH 1242/2667] Add markdown lsp server --- home/.config/nvim/lua/plugins/lsp.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/lsp.lua b/home/.config/nvim/lua/plugins/lsp.lua index 6e58be47..631a53a8 100644 --- a/home/.config/nvim/lua/plugins/lsp.lua +++ b/home/.config/nvim/lua/plugins/lsp.lua @@ -59,6 +59,7 @@ lspconfig.tsserver.setup {{}, on_attach = M.lsp_map_keys} lspconfig.yamlls.setup {{}, on_attach = M.lsp_map_keys} lspconfig.jsonls.setup {{}, on_attach = M.lsp_map_keys} lspconfig.html.setup {{}, on_attach = M.lsp_map_keys} +lspconfig.marksman.setup {{}, on_attach = M.lsp_map_keys} lspconfig.sumneko_lua.setup { settings = { From dab6db98f8a82411b6ae213df2a14b7ed23e0281 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 11:45:28 +0300 Subject: [PATCH 1243/2667] Enable nvim autopairs and some new completion sources --- home/.config/nvim/lua/plugins/completion.lua | 10 ++++++++++ home/.config/nvim/lua/plugins/init.lua | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/home/.config/nvim/lua/plugins/completion.lua b/home/.config/nvim/lua/plugins/completion.lua index 85605a31..06b01024 100644 --- a/home/.config/nvim/lua/plugins/completion.lua +++ b/home/.config/nvim/lua/plugins/completion.lua @@ -50,8 +50,18 @@ cmp.setup { { name = 'nvim_lsp' }, { name = 'luasnip' }, { name = 'path' }, + { name = 'git' }, + { name = 'buffer' }, }, } +-- Enable autopairs when enter is processed +-- on completion +local cmp_autopairs = require 'nvim-autopairs.completion.cmp' +cmp.event:on( + 'confirm_done', + cmp_autopairs.on_confirm_done() +) + -- load friendly-snippets to luasnip require('luasnip/loaders/from_vscode').lazy_load() diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index d277e599..8b3e17e9 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -79,9 +79,16 @@ require('packer').startup(function() use 'hrsh7th/nvim-cmp' -- Autocompletion plugin use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp use 'hrsh7th/cmp-path' -- Path source for nvim-cmp + use 'petertriho/cmp-git' -- Git source for nvim-cmp + use 'hrsh7th/cmp-buffer' -- Buffer source for nvim-cmp use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp use 'L3MON4D3/LuaSnip' -- Snippets plugin use 'rafamadriz/friendly-snippets' -- Snippets collection + -- Enable brackets for completions + use { + "windwp/nvim-autopairs", + config = function() require("nvim-autopairs").setup {} end + } -- treesitter syntax highlight use { From b945ce338eda479e6bc580f12c65cd59d1c0a444 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 11:45:28 +0300 Subject: [PATCH 1244/2667] Enable nvim autopairs and some new completion sources --- home/.config/nvim/lua/plugins/completion.lua | 10 ++++++++++ home/.config/nvim/lua/plugins/init.lua | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/home/.config/nvim/lua/plugins/completion.lua b/home/.config/nvim/lua/plugins/completion.lua index 85605a31..06b01024 100644 --- a/home/.config/nvim/lua/plugins/completion.lua +++ b/home/.config/nvim/lua/plugins/completion.lua @@ -50,8 +50,18 @@ cmp.setup { { name = 'nvim_lsp' }, { name = 'luasnip' }, { name = 'path' }, + { name = 'git' }, + { name = 'buffer' }, }, } +-- Enable autopairs when enter is processed +-- on completion +local cmp_autopairs = require 'nvim-autopairs.completion.cmp' +cmp.event:on( + 'confirm_done', + cmp_autopairs.on_confirm_done() +) + -- load friendly-snippets to luasnip require('luasnip/loaders/from_vscode').lazy_load() diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index d277e599..8b3e17e9 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -79,9 +79,16 @@ require('packer').startup(function() use 'hrsh7th/nvim-cmp' -- Autocompletion plugin use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp use 'hrsh7th/cmp-path' -- Path source for nvim-cmp + use 'petertriho/cmp-git' -- Git source for nvim-cmp + use 'hrsh7th/cmp-buffer' -- Buffer source for nvim-cmp use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp use 'L3MON4D3/LuaSnip' -- Snippets plugin use 'rafamadriz/friendly-snippets' -- Snippets collection + -- Enable brackets for completions + use { + "windwp/nvim-autopairs", + config = function() require("nvim-autopairs").setup {} end + } -- treesitter syntax highlight use { From 989ab0c42a3195f2632b147ae33b9c06f455e7bc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 12:17:21 +0300 Subject: [PATCH 1245/2667] Add which-key.nvim --- home/.config/nvim/lua/plugins/init.lua | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 8b3e17e9..1ef36a43 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -60,14 +60,22 @@ require('packer').startup(function() -- Do stuff as sudo use 'lambdalisue/suda.vim' - -- Read editorconfig settings - use 'editorconfig/editorconfig-vim' + -- Display possible keybinds + use { + 'folke/which-key.nvim', + config = function() + require('which-key').setup {} + end + } + + -- Read editorconfig settings + use 'editorconfig/editorconfig-vim' -- Configs for built-in LSP use 'neovim/nvim-lspconfig' -- Install LSP server executables - use {"williamboman/mason.nvim", "williamboman/mason-lspconfig.nvim"} + use {'williamboman/mason.nvim', 'williamboman/mason-lspconfig.nvim'} -- Additional LSP features for Java use 'mfussenegger/nvim-jdtls' @@ -86,8 +94,8 @@ require('packer').startup(function() use 'rafamadriz/friendly-snippets' -- Snippets collection -- Enable brackets for completions use { - "windwp/nvim-autopairs", - config = function() require("nvim-autopairs").setup {} end + 'windwp/nvim-autopairs', + config = function() require('nvim-autopairs').setup {} end } -- treesitter syntax highlight From 413a8fb1fb21249087c35c3ec3be08e21244c815 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 12:17:21 +0300 Subject: [PATCH 1246/2667] Add which-key.nvim --- home/.config/nvim/lua/plugins/init.lua | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 8b3e17e9..1ef36a43 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -60,14 +60,22 @@ require('packer').startup(function() -- Do stuff as sudo use 'lambdalisue/suda.vim' - -- Read editorconfig settings - use 'editorconfig/editorconfig-vim' + -- Display possible keybinds + use { + 'folke/which-key.nvim', + config = function() + require('which-key').setup {} + end + } + + -- Read editorconfig settings + use 'editorconfig/editorconfig-vim' -- Configs for built-in LSP use 'neovim/nvim-lspconfig' -- Install LSP server executables - use {"williamboman/mason.nvim", "williamboman/mason-lspconfig.nvim"} + use {'williamboman/mason.nvim', 'williamboman/mason-lspconfig.nvim'} -- Additional LSP features for Java use 'mfussenegger/nvim-jdtls' @@ -86,8 +94,8 @@ require('packer').startup(function() use 'rafamadriz/friendly-snippets' -- Snippets collection -- Enable brackets for completions use { - "windwp/nvim-autopairs", - config = function() require("nvim-autopairs").setup {} end + 'windwp/nvim-autopairs', + config = function() require('nvim-autopairs').setup {} end } -- treesitter syntax highlight From b985e8a28a4f39e1467a4e719b276bc9994870c1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 17:56:24 +0300 Subject: [PATCH 1247/2667] Refactor packer config to use packer config parameter instead of separate requires --- home/.config/nvim/ftplugin/java.lua | 2 +- home/.config/nvim/lua/plugins/bufferline.lua | 1 - home/.config/nvim/lua/plugins/cmp.lua | 68 +++++ home/.config/nvim/lua/plugins/colorscheme.lua | 100 +++---- home/.config/nvim/lua/plugins/completion.lua | 67 ----- .../nvim/lua/plugins/indent-blankline.lua | 15 +- home/.config/nvim/lua/plugins/init.lua | 250 ++++++++++-------- home/.config/nvim/lua/plugins/lsp.lua | 89 ------- home/.config/nvim/lua/plugins/lspconfig.lua | 103 ++++++++ home/.config/nvim/lua/plugins/nvim-tree.lua | 1 - .../cornerstone/CornerstoneServiceImpl.java | 0 home/.config/nvim/lua/plugins/telescope.lua | 10 +- home/.config/nvim/lua/plugins/treesitter.lua | 28 +- .../cornerstone/CornerstoneServiceImpl.java | 0 14 files changed, 390 insertions(+), 344 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/bufferline.lua create mode 100644 home/.config/nvim/lua/plugins/cmp.lua delete mode 100644 home/.config/nvim/lua/plugins/completion.lua delete mode 100644 home/.config/nvim/lua/plugins/lsp.lua create mode 100644 home/.config/nvim/lua/plugins/lspconfig.lua create mode 100644 home/.config/nvim/lua/plugins/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java create mode 100644 home/.config/nvim/lua/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index d5528a10..956c2cbc 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -17,4 +17,4 @@ require('jdtls').start_or_attach({ } }) -require('plugins.lsp').lsp_map_keys('jdtls', nil) +require('plugins.lspconfig').lsp_map_keys('jdtls', nil) diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua deleted file mode 100644 index c8834f1c..00000000 --- a/home/.config/nvim/lua/plugins/bufferline.lua +++ /dev/null @@ -1 +0,0 @@ -require('bufferline').setup{} diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua new file mode 100644 index 00000000..51a00cf5 --- /dev/null +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -0,0 +1,68 @@ +return function() + -- Setup git completion source + require("cmp_git").setup() + + -- Set completeopt to have a better completion experience + vim.o.completeopt = 'menuone,noselect' + + -- luasnip setup + local luasnip = require 'luasnip' + + -- nvim-cmp setup + local cmp = require 'cmp' + cmp.setup { + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end, + }, + mapping = { + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.close(), + [''] = cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }, + [''] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, + [''] = function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, + }, + sources = { + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + { name = 'path' }, + { name = 'git' }, + { name = 'buffer' }, + }, + } + + -- Enable autopairs when enter is processed + -- on completion + local cmp_autopairs = require 'nvim-autopairs.completion.cmp' + cmp.event:on( + 'confirm_done', + cmp_autopairs.on_confirm_done() + ) + + -- load friendly-snippets to luasnip + require('luasnip/loaders/from_vscode').lazy_load() +end diff --git a/home/.config/nvim/lua/plugins/colorscheme.lua b/home/.config/nvim/lua/plugins/colorscheme.lua index 9dfe8d65..3c098388 100644 --- a/home/.config/nvim/lua/plugins/colorscheme.lua +++ b/home/.config/nvim/lua/plugins/colorscheme.lua @@ -1,49 +1,51 @@ -require('catppuccin').setup({ - transparent_background = false, - term_colors = false, - compile = {enabled = true, path = vim.fn.stdpath 'cache' .. '/catppuccin'}, - styles = { - comments = {'italic'}, - functions = {'italic'}, - keywords = {'italic'}, - strings = {}, - variables = {} - }, - integrations = { - treesitter = true, - native_lsp = { - enabled = true, - virtual_text = { - errors = {'italic'}, - hints = {'italic'}, - warnings = {'italic'}, - information = {'italic'} - }, - underlines = { - errors = {'underline'}, - hints = {'underline'}, - warnings = {'underline'}, - information = {'underline'} - } - }, - lsp_trouble = false, - lsp_saga = false, - gitgutter = true, - gitsigns = false, - telescope = true, - nvimtree = {enabled = false, show_root = false}, - which_key = false, - indent_blankline = {enabled = true, colored_indent_levels = false}, - dashboard = false, - neogit = false, - vim_sneak = false, - fern = false, - barbar = false, - bufferline = false, - markdown = false, - lightspeed = false, - ts_rainbow = false, - hop = false - } -}) -vim.cmd [[colorscheme catppuccin]] +return function () + require('catppuccin').setup({ + transparent_background = false, + term_colors = false, + compile = {enabled = true, path = vim.fn.stdpath 'cache' .. '/catppuccin'}, + styles = { + comments = {'italic'}, + functions = {'italic'}, + keywords = {'italic'}, + strings = {}, + variables = {} + }, + integrations = { + treesitter = true, + native_lsp = { + enabled = true, + virtual_text = { + errors = {'italic'}, + hints = {'italic'}, + warnings = {'italic'}, + information = {'italic'} + }, + underlines = { + errors = {'underline'}, + hints = {'underline'}, + warnings = {'underline'}, + information = {'underline'} + } + }, + lsp_trouble = false, + lsp_saga = false, + gitgutter = true, + gitsigns = false, + telescope = true, + nvimtree = {enabled = false, show_root = false}, + which_key = false, + indent_blankline = {enabled = true, colored_indent_levels = false}, + dashboard = false, + neogit = false, + vim_sneak = false, + fern = false, + barbar = false, + bufferline = false, + markdown = false, + lightspeed = false, + ts_rainbow = false, + hop = false + } + }) + vim.cmd [[colorscheme catppuccin]] +end diff --git a/home/.config/nvim/lua/plugins/completion.lua b/home/.config/nvim/lua/plugins/completion.lua deleted file mode 100644 index 06b01024..00000000 --- a/home/.config/nvim/lua/plugins/completion.lua +++ /dev/null @@ -1,67 +0,0 @@ --- Add additional capabilities supported by nvim-cmp -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) --- --- Set completeopt to have a better completion experience -vim.o.completeopt = 'menuone,noselect' - --- luasnip setup -local luasnip = require 'luasnip' - --- nvim-cmp setup -local cmp = require 'cmp' -cmp.setup { - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end, - }, - mapping = { - [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.close(), - [''] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }, - [''] = function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, - [''] = function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, - }, - sources = { - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - { name = 'path' }, - { name = 'git' }, - { name = 'buffer' }, - }, -} - --- Enable autopairs when enter is processed --- on completion -local cmp_autopairs = require 'nvim-autopairs.completion.cmp' -cmp.event:on( - 'confirm_done', - cmp_autopairs.on_confirm_done() -) - --- load friendly-snippets to luasnip -require('luasnip/loaders/from_vscode').lazy_load() diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index 1adbce2d..1056ad02 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,7 +1,8 @@ -vim.opt.list = true - -require('indent_blankline').setup { - space_char_blankline = ' ', - show_current_context = true, - show_current_context_start = true, -} +return function () + vim.opt.list = true + require('indent_blankline').setup { + space_char_blankline = ' ', + show_current_context = true, + show_current_context_start = true, + } +end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 1ef36a43..b4622add 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -3,157 +3,183 @@ local fn = vim.fn -- Install packer if it's not yet installed local install_path = fn.stdpath('data') .. '/site/pack/packer/opt/packer.nvim' if fn.empty(fn.glob(install_path)) > 0 then - print('Installing Packer') - Packer_bootstrap = fn.system({ - 'git', 'clone', '--depth', '1', - 'https://github.com/wbthomason/packer.nvim', install_path - }) - vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. - vim.o.runtimepath - print('Installed Packer') + print('Installing Packer') + Packer_bootstrap = fn.system({ + 'git', 'clone', '--depth', '1', + 'https://github.com/wbthomason/packer.nvim', install_path + }) + vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. + vim.o.runtimepath + print('Installed Packer') end -- Configure packer vim.cmd [[packadd packer.nvim]] require('packer').startup(function() - local use = require('packer').use + local use = require('packer').use - -- The plugin manager itself - use {'wbthomason/packer.nvim', opt = true} + -- The plugin manager itself + use { 'wbthomason/packer.nvim', opt = true } - -- Colorscheme - use({'catppuccin/nvim', as = 'catppuccin'}) + -- Colorscheme + use { + 'catppuccin/nvim', + as = 'catppuccin', + config = require('plugins.colorscheme'), + } - -- Git in signcolumn - use 'airblade/vim-gitgutter' + -- Git in signcolumn + use 'airblade/vim-gitgutter' - -- Statusline - use { - 'hoob3rt/lualine.nvim', - requires = {'kyazdani42/nvim-web-devicons', opt = true} - } + -- Statusline + use { + 'hoob3rt/lualine.nvim', + requires = { 'kyazdani42/nvim-web-devicons', opt = true }, + config = function() + require('lualine').setup { + options = { theme = 'catppuccin' } + } + end, + } - -- Tabline/bufferline - use { - 'akinsho/nvim-bufferline.lua', - tag = '*', - requires = 'kyazdani42/nvim-web-devicons' - } + -- Tabline/bufferline + use { + 'akinsho/nvim-bufferline.lua', + tag = '*', + requires = 'kyazdani42/nvim-web-devicons', + config = function() require('bufferline').setup {} end + } - -- Git commands - use 'tpope/vim-fugitive' + -- Git commands + use 'tpope/vim-fugitive' - -- Indent characters - use 'lukas-reineke/indent-blankline.nvim' + -- Indent characters + use { + 'lukas-reineke/indent-blankline.nvim', + config = require('plugins.indent-blankline') + } - -- Tree explorer - use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} + -- Tree explorer + use { + 'kyazdani42/nvim-tree.lua', + requires = 'kyazdani42/nvim-web-devicons', + config = function() require('nvim-tree').setup {} end + } - -- Telescope - use { - 'nvim-telescope/telescope.nvim', - requires = {{'nvim-lua/plenary.nvim'}} - } - use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'} -- Use fzf for fuzzy finder - use {'nvim-telescope/telescope-ui-select.nvim'} -- Replace vim built in select with telescope + -- Telescope + use { + 'nvim-telescope/telescope.nvim', + config = require('plugins.telescope'), + requires = { + { 'nvim-lua/plenary.nvim' }, -- Internal dep for telescope + { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }, -- Use fzf for fuzzy finder + { 'nvim-telescope/telescope-ui-select.nvim' } -- Replace vim built in select with telescope + } + } - -- Do stuff as sudo - use 'lambdalisue/suda.vim' + -- Do stuff as sudo + use 'lambdalisue/suda.vim' -- Display possible keybinds use { 'folke/which-key.nvim', - config = function() - require('which-key').setup {} - end + config = function() require('which-key').setup {} end } -- Read editorconfig settings use 'editorconfig/editorconfig-vim' - -- Configs for built-in LSP - use 'neovim/nvim-lspconfig' - - -- Install LSP server executables - use {'williamboman/mason.nvim', 'williamboman/mason-lspconfig.nvim'} - - -- Additional LSP features for Java - use 'mfussenegger/nvim-jdtls' - - -- Display function signature - use {'ray-x/lsp_signature.nvim'} - - -- Completion - use 'hrsh7th/nvim-cmp' -- Autocompletion plugin - use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp - use 'hrsh7th/cmp-path' -- Path source for nvim-cmp - use 'petertriho/cmp-git' -- Git source for nvim-cmp - use 'hrsh7th/cmp-buffer' -- Buffer source for nvim-cmp - use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp - use 'L3MON4D3/LuaSnip' -- Snippets plugin - use 'rafamadriz/friendly-snippets' -- Snippets collection - -- Enable brackets for completions + -- Install LSP server executables use { - 'windwp/nvim-autopairs', - config = function() require('nvim-autopairs').setup {} end + 'williamboman/mason.nvim', + config = function() require('mason').setup {} end + } + use { + 'williamboman/mason-lspconfig.nvim', + config = function() + require('mason-lspconfig').setup { automatic_installation = true } + end } - -- treesitter syntax highlight - use { - 'nvim-treesitter/nvim-treesitter', - run = function() - require('nvim-treesitter.install').update({with_sync = true}) - end - } + -- Configs for built-in LSP + use { + 'neovim/nvim-lspconfig', + config = require('plugins.lspconfig').setup + } - -- treesitter plugin for commentstring - use 'JoosepAlviste/nvim-ts-context-commentstring' + -- Additional LSP features for Java + use 'mfussenegger/nvim-jdtls' - -- Additional plugins for formats not supported - -- by treesitter - use 'jamespeapen/swayconfig.vim' + -- Display function signature + use 'ray-x/lsp_signature.nvim' - -- mappings for commenting in code - use 'tpope/vim-commentary' + -- Completion + use { + 'hrsh7th/nvim-cmp', + requires = { + { 'hrsh7th/cmp-nvim-lsp' }, -- LSP source + { 'hrsh7th/cmp-path' }, -- Path source + { 'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim" }, -- Git source + { 'hrsh7th/cmp-buffer' }, -- Buffer source + { 'saadparwaiz1/cmp_luasnip' }, -- Snippets source + { 'L3MON4D3/LuaSnip' }, -- Snippets plugin + { 'rafamadriz/friendly-snippets' }, -- Snippets collection + }, + config = require('plugins.cmp'), + } - -- we all know this one - use 'tpope/vim-surround' + -- Automatic brackets + use { + 'windwp/nvim-autopairs', + config = function() require('nvim-autopairs').setup{} end + } - -- Formatter plugin - use 'sbdchd/neoformat' + -- treesitter + use { + 'nvim-treesitter/nvim-treesitter', + run = function() + require('nvim-treesitter.install').update({ with_sync = true }) + end, + config = require('plugins.treesitter') + } - -- Make editing passwords safer - use { - 'https://git.zx2c4.com/password-store', - rtp = 'contrib/vim/redact_pass.vim' - } + -- treesitter plugin for commentstring + use 'JoosepAlviste/nvim-ts-context-commentstring' - -- Neovim inside Firefox - use { - 'glacambre/firenvim', - run = function() vim.fn['firenvim#install'](0) end - } + -- Additional plugins for formats not supported + -- by treesitter + use 'jamespeapen/swayconfig.vim' - -- Vim <3 Asciidoctor - use 'habamax/vim-asciidoctor' + -- mappings for commenting in code + use 'tpope/vim-commentary' + + -- we all know this one + use 'tpope/vim-surround' + + -- Formatter plugin + use 'sbdchd/neoformat' + + -- Make editing passwords safer + use { + 'https://git.zx2c4.com/password-store', + rtp = 'contrib/vim/redact_pass.vim' + } + + -- Neovim inside Firefox + use { + 'glacambre/firenvim', + run = function() vim.fn['firenvim#install'](0) end + } + + -- Vim <3 Asciidoctor + use 'habamax/vim-asciidoctor' end) -- Sync plugins if Packer was just -- installed if Packer_bootstrap then - print('Syncing plugins') - require('packer').sync() - print('Synced') + print('Syncing plugins') + require('packer').sync() + print('Synced') end - --- Source configurations -require 'plugins/lualine' -require 'plugins/bufferline' -require 'plugins/lsp' -require 'plugins/completion' -require 'plugins/treesitter' -require 'plugins/indent-blankline' -require 'plugins/nvim-tree' -require 'plugins/colorscheme' -require 'plugins/telescope' diff --git a/home/.config/nvim/lua/plugins/lsp.lua b/home/.config/nvim/lua/plugins/lsp.lua deleted file mode 100644 index 631a53a8..00000000 --- a/home/.config/nvim/lua/plugins/lsp.lua +++ /dev/null @@ -1,89 +0,0 @@ -local M = {} -local lspconfig = require('lspconfig'); --- - -M.lsp_map_keys = function(server, bufnr) - local function map_key(...) - -- Map to buffer if buffer number is supplied, - -- globally otherwise - if bufnr == nil then - vim.api.nvim_set_keymap(...) - else - vim.api.nvim_buf_set_keymap(bufnr, ...) - end - end - - local keymapOpts = {noremap = true, silent = true} - map_key('n', 'gD', 'lua vim.lsp.buf.declaration()', keymapOpts) - map_key('n', 'gd', 'lua vim.lsp.buf.definition()', keymapOpts) - map_key('n', 'K', 'lua vim.lsp.buf.hover()', keymapOpts) - map_key('n', 'gi', 'lua vim.lsp.buf.implementation()', keymapOpts) - map_key('n', '', 'lua vim.lsp.buf.signature_help()', - keymapOpts) - map_key('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', - keymapOpts) - map_key('n', 'wr', - 'lua vim.lsp.buf.remove_workspace_folder()', keymapOpts) - map_key('n', 'wl', - 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', - keymapOpts) - map_key('n', 'D', 'lua vim.lsp.buf.type_definition()', - keymapOpts) - map_key('n', 'rn', 'lua vim.lsp.buf.rename()', keymapOpts) - map_key('n', 'ca', 'lua vim.lsp.buf.code_action()', - keymapOpts) - map_key('n', 'gr', 'lua vim.lsp.buf.references()', keymapOpts) - map_key('n', 'e', - 'lua vim.lsp.diagnostic.show_line_diagnostics()', - keymapOpts) - map_key('n', '[d', 'lua vim.diagnostic.goto_prev()', keymapOpts) - map_key('n', ']d', 'lua vim.diagnostic.goto_next()', keymapOpts) - map_key('n', 'q', 'lua vim.diagnostic.set_loclist()', - keymapOpts) - map_key('n', 'f', 'lua vim.lsp.buf.formatting()', keymapOpts) -end - --- Add additional capabilities supported by nvim-cmp -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) - --- Setup LSP signature plugin -require('lsp_signature').setup() - --- Setup mason -require("mason").setup() -require("mason-lspconfig").setup({automatic_installation = true}) - --- LSP servers setup -lspconfig.tsserver.setup {{}, on_attach = M.lsp_map_keys} -lspconfig.yamlls.setup {{}, on_attach = M.lsp_map_keys} -lspconfig.jsonls.setup {{}, on_attach = M.lsp_map_keys} -lspconfig.html.setup {{}, on_attach = M.lsp_map_keys} -lspconfig.marksman.setup {{}, on_attach = M.lsp_map_keys} - -lspconfig.sumneko_lua.setup { - settings = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = 'LuaJIT', - -- Setup your lua path - path = vim.split(package.path, ';') - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = {'vim'} - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file('', true) - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = {enable = false} - } - }, - on_attach = M.lsp_map_keys, - capabilities = capabilities -} - -return M diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua new file mode 100644 index 00000000..5d640197 --- /dev/null +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -0,0 +1,103 @@ +local M = {} + +function lsp_map_keys(server, bufnr) + print('lsp_map_keys') + local function map_key(...) + -- Map to buffer if buffer number is supplied, + -- globally otherwise + if bufnr == nil then + vim.api.nvim_set_keymap(...) + else + vim.api.nvim_buf_set_keymap(bufnr, ...) + end + end + + local keymapOpts = { noremap = true, silent = true } + map_key('n', 'gD', 'lua vim.lsp.buf.declaration()', keymapOpts) + map_key('n', 'gd', 'lua vim.lsp.buf.definition()', keymapOpts) + map_key('n', 'K', 'lua vim.lsp.buf.hover()', keymapOpts) + map_key('n', 'gi', 'lua vim.lsp.buf.implementation()', keymapOpts) + map_key('n', '', 'lua vim.lsp.buf.signature_help()', + keymapOpts) + map_key('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', + keymapOpts) + map_key('n', 'wr', + 'lua vim.lsp.buf.remove_workspace_folder()', keymapOpts) + map_key('n', 'wl', + 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', + keymapOpts) + map_key('n', 'D', 'lua vim.lsp.buf.type_definition()', + keymapOpts) + map_key('n', 'rn', 'lua vim.lsp.buf.rename()', keymapOpts) + map_key('n', 'ca', 'lua vim.lsp.buf.code_action()', + keymapOpts) + map_key('n', 'gr', 'lua vim.lsp.buf.references()', keymapOpts) + map_key('n', 'e', + 'lua vim.lsp.diagnostic.show_line_diagnostics()', + keymapOpts) + map_key('n', '[d', 'lua vim.diagnostic.goto_prev()', keymapOpts) + map_key('n', ']d', 'lua vim.diagnostic.goto_next()', keymapOpts) + map_key('n', 'q', 'lua vim.diagnostic.set_loclist()', + keymapOpts) + map_key('n', 'f', 'lua vim.lsp.buf.format()', keymapOpts) +end + +M.on_attach = function(server, bufnr) + print('on_attach') + -- Setup lsp signature plugin + require('lsp_signature').setup {} + + -- Setup keybinds + lsp_map_keys(server, bufnr) +end + + +function M.setup() + local lspconfig = require('lspconfig') + + local capabilities = vim.lsp.protocol.make_client_capabilities() + + -- Common settings for all servers + local lsp_defaults = { + on_attach = M.on_attach, -- Common on_attach + capabilities = capabilities -- Add additional capabilities supported by nvim-cmp + } + + -- Set default config for all servers + --lspconfig.util.default_config = vim.tbl_deep_extend('force', lspconfig.util.default_config, lsp_defaults) + + -- Register capabilities to cmp.nvim + --require('cmp_nvim_lsp').update_capabilities(capabilities) + + -- LSP servers setup + --lspconfig.tsserver.setup {} + --lspconfig.yamlls.setup {} + --lspconfig.jsonls.setup {} + --lspconfig.html.setup {} + --lspconfig.marksman.setup {} + + --lspconfig.sumneko_lua.setup { + -- settings = { + -- Lua = { + -- runtime = { + -- -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + -- version = 'LuaJIT', + -- -- Setup your lua path + -- path = vim.split(package.path, ';') + -- }, + -- diagnostics = { + -- -- Get the language server to recognize the `vim` global + -- globals = { 'vim' } + -- }, + -- workspace = { + -- -- Make the server aware of Neovim runtime files + -- library = vim.api.nvim_get_runtime_file('', true) + -- }, + -- -- Do not send telemetry data containing a randomized but unique identifier + -- telemetry = { enable = false } + -- } + -- } + --} +end + +return M diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index 81be0bf4..e69de29b 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -1 +0,0 @@ -require'nvim-tree'.setup {} diff --git a/home/.config/nvim/lua/plugins/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java b/home/.config/nvim/lua/plugins/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java new file mode 100644 index 00000000..e69de29b diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 7124a2f6..fc94b449 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,4 +1,6 @@ -local telescope = require('telescope') -telescope.setup {} -telescope.load_extension('fzf') -telescope.load_extension('ui-select') +return function () + local telescope = require('telescope') + telescope.setup {} + telescope.load_extension('fzf') + telescope.load_extension('ui-select') +end diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index b3abded7..daeff0f3 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -1,14 +1,16 @@ -require'nvim-treesitter.configs'.setup { - ensure_installed = { - 'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json', - 'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python', 'regex', - 'rst', 'scss', 'toml', 'tsx', 'typescript', 'javascript', 'yaml' - }, - highlight = {enable = true}, - indent = {enable = true}, - incremental_selection = {enable = true}, - context_commentstring = {enable = true} -} +return function () + require'nvim-treesitter.configs'.setup { + ensure_installed = { + 'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json', + 'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python', 'regex', + 'rst', 'scss', 'toml', 'tsx', 'typescript', 'javascript', 'yaml' + }, + highlight = {enable = true}, + indent = {enable = true}, + incremental_selection = {enable = true}, + context_commentstring = {enable = true} + } ---vim.wo.foldmethod = 'expr' ---im.wo.foldexpr = 'nvim_treesitter#foldexpr()' + --vim.wo.foldmethod = 'expr' + --im.wo.foldexpr = 'nvim_treesitter#foldexpr()' +end diff --git a/home/.config/nvim/lua/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java b/home/.config/nvim/lua/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java new file mode 100644 index 00000000..e69de29b From f4216ae0ba7972aa7cdb436c5d85067d62d697cd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 17:56:24 +0300 Subject: [PATCH 1248/2667] Refactor packer config to use packer config parameter instead of separate requires --- home/.config/nvim/ftplugin/java.lua | 2 +- home/.config/nvim/lua/plugins/bufferline.lua | 1 - home/.config/nvim/lua/plugins/cmp.lua | 68 +++++ home/.config/nvim/lua/plugins/colorscheme.lua | 100 +++---- home/.config/nvim/lua/plugins/completion.lua | 67 ----- .../nvim/lua/plugins/indent-blankline.lua | 15 +- home/.config/nvim/lua/plugins/init.lua | 250 ++++++++++-------- home/.config/nvim/lua/plugins/lsp.lua | 89 ------- home/.config/nvim/lua/plugins/lspconfig.lua | 103 ++++++++ home/.config/nvim/lua/plugins/nvim-tree.lua | 1 - .../cornerstone/CornerstoneServiceImpl.java | 0 home/.config/nvim/lua/plugins/telescope.lua | 10 +- home/.config/nvim/lua/plugins/treesitter.lua | 28 +- .../cornerstone/CornerstoneServiceImpl.java | 0 14 files changed, 390 insertions(+), 344 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/bufferline.lua create mode 100644 home/.config/nvim/lua/plugins/cmp.lua delete mode 100644 home/.config/nvim/lua/plugins/completion.lua delete mode 100644 home/.config/nvim/lua/plugins/lsp.lua create mode 100644 home/.config/nvim/lua/plugins/lspconfig.lua create mode 100644 home/.config/nvim/lua/plugins/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java create mode 100644 home/.config/nvim/lua/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index d5528a10..956c2cbc 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -17,4 +17,4 @@ require('jdtls').start_or_attach({ } }) -require('plugins.lsp').lsp_map_keys('jdtls', nil) +require('plugins.lspconfig').lsp_map_keys('jdtls', nil) diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua deleted file mode 100644 index c8834f1c..00000000 --- a/home/.config/nvim/lua/plugins/bufferline.lua +++ /dev/null @@ -1 +0,0 @@ -require('bufferline').setup{} diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua new file mode 100644 index 00000000..51a00cf5 --- /dev/null +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -0,0 +1,68 @@ +return function() + -- Setup git completion source + require("cmp_git").setup() + + -- Set completeopt to have a better completion experience + vim.o.completeopt = 'menuone,noselect' + + -- luasnip setup + local luasnip = require 'luasnip' + + -- nvim-cmp setup + local cmp = require 'cmp' + cmp.setup { + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end, + }, + mapping = { + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.close(), + [''] = cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }, + [''] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, + [''] = function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, + }, + sources = { + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + { name = 'path' }, + { name = 'git' }, + { name = 'buffer' }, + }, + } + + -- Enable autopairs when enter is processed + -- on completion + local cmp_autopairs = require 'nvim-autopairs.completion.cmp' + cmp.event:on( + 'confirm_done', + cmp_autopairs.on_confirm_done() + ) + + -- load friendly-snippets to luasnip + require('luasnip/loaders/from_vscode').lazy_load() +end diff --git a/home/.config/nvim/lua/plugins/colorscheme.lua b/home/.config/nvim/lua/plugins/colorscheme.lua index 9dfe8d65..3c098388 100644 --- a/home/.config/nvim/lua/plugins/colorscheme.lua +++ b/home/.config/nvim/lua/plugins/colorscheme.lua @@ -1,49 +1,51 @@ -require('catppuccin').setup({ - transparent_background = false, - term_colors = false, - compile = {enabled = true, path = vim.fn.stdpath 'cache' .. '/catppuccin'}, - styles = { - comments = {'italic'}, - functions = {'italic'}, - keywords = {'italic'}, - strings = {}, - variables = {} - }, - integrations = { - treesitter = true, - native_lsp = { - enabled = true, - virtual_text = { - errors = {'italic'}, - hints = {'italic'}, - warnings = {'italic'}, - information = {'italic'} - }, - underlines = { - errors = {'underline'}, - hints = {'underline'}, - warnings = {'underline'}, - information = {'underline'} - } - }, - lsp_trouble = false, - lsp_saga = false, - gitgutter = true, - gitsigns = false, - telescope = true, - nvimtree = {enabled = false, show_root = false}, - which_key = false, - indent_blankline = {enabled = true, colored_indent_levels = false}, - dashboard = false, - neogit = false, - vim_sneak = false, - fern = false, - barbar = false, - bufferline = false, - markdown = false, - lightspeed = false, - ts_rainbow = false, - hop = false - } -}) -vim.cmd [[colorscheme catppuccin]] +return function () + require('catppuccin').setup({ + transparent_background = false, + term_colors = false, + compile = {enabled = true, path = vim.fn.stdpath 'cache' .. '/catppuccin'}, + styles = { + comments = {'italic'}, + functions = {'italic'}, + keywords = {'italic'}, + strings = {}, + variables = {} + }, + integrations = { + treesitter = true, + native_lsp = { + enabled = true, + virtual_text = { + errors = {'italic'}, + hints = {'italic'}, + warnings = {'italic'}, + information = {'italic'} + }, + underlines = { + errors = {'underline'}, + hints = {'underline'}, + warnings = {'underline'}, + information = {'underline'} + } + }, + lsp_trouble = false, + lsp_saga = false, + gitgutter = true, + gitsigns = false, + telescope = true, + nvimtree = {enabled = false, show_root = false}, + which_key = false, + indent_blankline = {enabled = true, colored_indent_levels = false}, + dashboard = false, + neogit = false, + vim_sneak = false, + fern = false, + barbar = false, + bufferline = false, + markdown = false, + lightspeed = false, + ts_rainbow = false, + hop = false + } + }) + vim.cmd [[colorscheme catppuccin]] +end diff --git a/home/.config/nvim/lua/plugins/completion.lua b/home/.config/nvim/lua/plugins/completion.lua deleted file mode 100644 index 06b01024..00000000 --- a/home/.config/nvim/lua/plugins/completion.lua +++ /dev/null @@ -1,67 +0,0 @@ --- Add additional capabilities supported by nvim-cmp -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) --- --- Set completeopt to have a better completion experience -vim.o.completeopt = 'menuone,noselect' - --- luasnip setup -local luasnip = require 'luasnip' - --- nvim-cmp setup -local cmp = require 'cmp' -cmp.setup { - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end, - }, - mapping = { - [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.close(), - [''] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }, - [''] = function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, - [''] = function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, - }, - sources = { - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - { name = 'path' }, - { name = 'git' }, - { name = 'buffer' }, - }, -} - --- Enable autopairs when enter is processed --- on completion -local cmp_autopairs = require 'nvim-autopairs.completion.cmp' -cmp.event:on( - 'confirm_done', - cmp_autopairs.on_confirm_done() -) - --- load friendly-snippets to luasnip -require('luasnip/loaders/from_vscode').lazy_load() diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index 1adbce2d..1056ad02 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,7 +1,8 @@ -vim.opt.list = true - -require('indent_blankline').setup { - space_char_blankline = ' ', - show_current_context = true, - show_current_context_start = true, -} +return function () + vim.opt.list = true + require('indent_blankline').setup { + space_char_blankline = ' ', + show_current_context = true, + show_current_context_start = true, + } +end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 1ef36a43..b4622add 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -3,157 +3,183 @@ local fn = vim.fn -- Install packer if it's not yet installed local install_path = fn.stdpath('data') .. '/site/pack/packer/opt/packer.nvim' if fn.empty(fn.glob(install_path)) > 0 then - print('Installing Packer') - Packer_bootstrap = fn.system({ - 'git', 'clone', '--depth', '1', - 'https://github.com/wbthomason/packer.nvim', install_path - }) - vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. - vim.o.runtimepath - print('Installed Packer') + print('Installing Packer') + Packer_bootstrap = fn.system({ + 'git', 'clone', '--depth', '1', + 'https://github.com/wbthomason/packer.nvim', install_path + }) + vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. + vim.o.runtimepath + print('Installed Packer') end -- Configure packer vim.cmd [[packadd packer.nvim]] require('packer').startup(function() - local use = require('packer').use + local use = require('packer').use - -- The plugin manager itself - use {'wbthomason/packer.nvim', opt = true} + -- The plugin manager itself + use { 'wbthomason/packer.nvim', opt = true } - -- Colorscheme - use({'catppuccin/nvim', as = 'catppuccin'}) + -- Colorscheme + use { + 'catppuccin/nvim', + as = 'catppuccin', + config = require('plugins.colorscheme'), + } - -- Git in signcolumn - use 'airblade/vim-gitgutter' + -- Git in signcolumn + use 'airblade/vim-gitgutter' - -- Statusline - use { - 'hoob3rt/lualine.nvim', - requires = {'kyazdani42/nvim-web-devicons', opt = true} - } + -- Statusline + use { + 'hoob3rt/lualine.nvim', + requires = { 'kyazdani42/nvim-web-devicons', opt = true }, + config = function() + require('lualine').setup { + options = { theme = 'catppuccin' } + } + end, + } - -- Tabline/bufferline - use { - 'akinsho/nvim-bufferline.lua', - tag = '*', - requires = 'kyazdani42/nvim-web-devicons' - } + -- Tabline/bufferline + use { + 'akinsho/nvim-bufferline.lua', + tag = '*', + requires = 'kyazdani42/nvim-web-devicons', + config = function() require('bufferline').setup {} end + } - -- Git commands - use 'tpope/vim-fugitive' + -- Git commands + use 'tpope/vim-fugitive' - -- Indent characters - use 'lukas-reineke/indent-blankline.nvim' + -- Indent characters + use { + 'lukas-reineke/indent-blankline.nvim', + config = require('plugins.indent-blankline') + } - -- Tree explorer - use {'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons'} + -- Tree explorer + use { + 'kyazdani42/nvim-tree.lua', + requires = 'kyazdani42/nvim-web-devicons', + config = function() require('nvim-tree').setup {} end + } - -- Telescope - use { - 'nvim-telescope/telescope.nvim', - requires = {{'nvim-lua/plenary.nvim'}} - } - use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'} -- Use fzf for fuzzy finder - use {'nvim-telescope/telescope-ui-select.nvim'} -- Replace vim built in select with telescope + -- Telescope + use { + 'nvim-telescope/telescope.nvim', + config = require('plugins.telescope'), + requires = { + { 'nvim-lua/plenary.nvim' }, -- Internal dep for telescope + { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }, -- Use fzf for fuzzy finder + { 'nvim-telescope/telescope-ui-select.nvim' } -- Replace vim built in select with telescope + } + } - -- Do stuff as sudo - use 'lambdalisue/suda.vim' + -- Do stuff as sudo + use 'lambdalisue/suda.vim' -- Display possible keybinds use { 'folke/which-key.nvim', - config = function() - require('which-key').setup {} - end + config = function() require('which-key').setup {} end } -- Read editorconfig settings use 'editorconfig/editorconfig-vim' - -- Configs for built-in LSP - use 'neovim/nvim-lspconfig' - - -- Install LSP server executables - use {'williamboman/mason.nvim', 'williamboman/mason-lspconfig.nvim'} - - -- Additional LSP features for Java - use 'mfussenegger/nvim-jdtls' - - -- Display function signature - use {'ray-x/lsp_signature.nvim'} - - -- Completion - use 'hrsh7th/nvim-cmp' -- Autocompletion plugin - use 'hrsh7th/cmp-nvim-lsp' -- LSP source for nvim-cmp - use 'hrsh7th/cmp-path' -- Path source for nvim-cmp - use 'petertriho/cmp-git' -- Git source for nvim-cmp - use 'hrsh7th/cmp-buffer' -- Buffer source for nvim-cmp - use 'saadparwaiz1/cmp_luasnip' -- Snippets source for nvim-cmp - use 'L3MON4D3/LuaSnip' -- Snippets plugin - use 'rafamadriz/friendly-snippets' -- Snippets collection - -- Enable brackets for completions + -- Install LSP server executables use { - 'windwp/nvim-autopairs', - config = function() require('nvim-autopairs').setup {} end + 'williamboman/mason.nvim', + config = function() require('mason').setup {} end + } + use { + 'williamboman/mason-lspconfig.nvim', + config = function() + require('mason-lspconfig').setup { automatic_installation = true } + end } - -- treesitter syntax highlight - use { - 'nvim-treesitter/nvim-treesitter', - run = function() - require('nvim-treesitter.install').update({with_sync = true}) - end - } + -- Configs for built-in LSP + use { + 'neovim/nvim-lspconfig', + config = require('plugins.lspconfig').setup + } - -- treesitter plugin for commentstring - use 'JoosepAlviste/nvim-ts-context-commentstring' + -- Additional LSP features for Java + use 'mfussenegger/nvim-jdtls' - -- Additional plugins for formats not supported - -- by treesitter - use 'jamespeapen/swayconfig.vim' + -- Display function signature + use 'ray-x/lsp_signature.nvim' - -- mappings for commenting in code - use 'tpope/vim-commentary' + -- Completion + use { + 'hrsh7th/nvim-cmp', + requires = { + { 'hrsh7th/cmp-nvim-lsp' }, -- LSP source + { 'hrsh7th/cmp-path' }, -- Path source + { 'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim" }, -- Git source + { 'hrsh7th/cmp-buffer' }, -- Buffer source + { 'saadparwaiz1/cmp_luasnip' }, -- Snippets source + { 'L3MON4D3/LuaSnip' }, -- Snippets plugin + { 'rafamadriz/friendly-snippets' }, -- Snippets collection + }, + config = require('plugins.cmp'), + } - -- we all know this one - use 'tpope/vim-surround' + -- Automatic brackets + use { + 'windwp/nvim-autopairs', + config = function() require('nvim-autopairs').setup{} end + } - -- Formatter plugin - use 'sbdchd/neoformat' + -- treesitter + use { + 'nvim-treesitter/nvim-treesitter', + run = function() + require('nvim-treesitter.install').update({ with_sync = true }) + end, + config = require('plugins.treesitter') + } - -- Make editing passwords safer - use { - 'https://git.zx2c4.com/password-store', - rtp = 'contrib/vim/redact_pass.vim' - } + -- treesitter plugin for commentstring + use 'JoosepAlviste/nvim-ts-context-commentstring' - -- Neovim inside Firefox - use { - 'glacambre/firenvim', - run = function() vim.fn['firenvim#install'](0) end - } + -- Additional plugins for formats not supported + -- by treesitter + use 'jamespeapen/swayconfig.vim' - -- Vim <3 Asciidoctor - use 'habamax/vim-asciidoctor' + -- mappings for commenting in code + use 'tpope/vim-commentary' + + -- we all know this one + use 'tpope/vim-surround' + + -- Formatter plugin + use 'sbdchd/neoformat' + + -- Make editing passwords safer + use { + 'https://git.zx2c4.com/password-store', + rtp = 'contrib/vim/redact_pass.vim' + } + + -- Neovim inside Firefox + use { + 'glacambre/firenvim', + run = function() vim.fn['firenvim#install'](0) end + } + + -- Vim <3 Asciidoctor + use 'habamax/vim-asciidoctor' end) -- Sync plugins if Packer was just -- installed if Packer_bootstrap then - print('Syncing plugins') - require('packer').sync() - print('Synced') + print('Syncing plugins') + require('packer').sync() + print('Synced') end - --- Source configurations -require 'plugins/lualine' -require 'plugins/bufferline' -require 'plugins/lsp' -require 'plugins/completion' -require 'plugins/treesitter' -require 'plugins/indent-blankline' -require 'plugins/nvim-tree' -require 'plugins/colorscheme' -require 'plugins/telescope' diff --git a/home/.config/nvim/lua/plugins/lsp.lua b/home/.config/nvim/lua/plugins/lsp.lua deleted file mode 100644 index 631a53a8..00000000 --- a/home/.config/nvim/lua/plugins/lsp.lua +++ /dev/null @@ -1,89 +0,0 @@ -local M = {} -local lspconfig = require('lspconfig'); --- - -M.lsp_map_keys = function(server, bufnr) - local function map_key(...) - -- Map to buffer if buffer number is supplied, - -- globally otherwise - if bufnr == nil then - vim.api.nvim_set_keymap(...) - else - vim.api.nvim_buf_set_keymap(bufnr, ...) - end - end - - local keymapOpts = {noremap = true, silent = true} - map_key('n', 'gD', 'lua vim.lsp.buf.declaration()', keymapOpts) - map_key('n', 'gd', 'lua vim.lsp.buf.definition()', keymapOpts) - map_key('n', 'K', 'lua vim.lsp.buf.hover()', keymapOpts) - map_key('n', 'gi', 'lua vim.lsp.buf.implementation()', keymapOpts) - map_key('n', '', 'lua vim.lsp.buf.signature_help()', - keymapOpts) - map_key('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', - keymapOpts) - map_key('n', 'wr', - 'lua vim.lsp.buf.remove_workspace_folder()', keymapOpts) - map_key('n', 'wl', - 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', - keymapOpts) - map_key('n', 'D', 'lua vim.lsp.buf.type_definition()', - keymapOpts) - map_key('n', 'rn', 'lua vim.lsp.buf.rename()', keymapOpts) - map_key('n', 'ca', 'lua vim.lsp.buf.code_action()', - keymapOpts) - map_key('n', 'gr', 'lua vim.lsp.buf.references()', keymapOpts) - map_key('n', 'e', - 'lua vim.lsp.diagnostic.show_line_diagnostics()', - keymapOpts) - map_key('n', '[d', 'lua vim.diagnostic.goto_prev()', keymapOpts) - map_key('n', ']d', 'lua vim.diagnostic.goto_next()', keymapOpts) - map_key('n', 'q', 'lua vim.diagnostic.set_loclist()', - keymapOpts) - map_key('n', 'f', 'lua vim.lsp.buf.formatting()', keymapOpts) -end - --- Add additional capabilities supported by nvim-cmp -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) - --- Setup LSP signature plugin -require('lsp_signature').setup() - --- Setup mason -require("mason").setup() -require("mason-lspconfig").setup({automatic_installation = true}) - --- LSP servers setup -lspconfig.tsserver.setup {{}, on_attach = M.lsp_map_keys} -lspconfig.yamlls.setup {{}, on_attach = M.lsp_map_keys} -lspconfig.jsonls.setup {{}, on_attach = M.lsp_map_keys} -lspconfig.html.setup {{}, on_attach = M.lsp_map_keys} -lspconfig.marksman.setup {{}, on_attach = M.lsp_map_keys} - -lspconfig.sumneko_lua.setup { - settings = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = 'LuaJIT', - -- Setup your lua path - path = vim.split(package.path, ';') - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = {'vim'} - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file('', true) - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = {enable = false} - } - }, - on_attach = M.lsp_map_keys, - capabilities = capabilities -} - -return M diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua new file mode 100644 index 00000000..5d640197 --- /dev/null +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -0,0 +1,103 @@ +local M = {} + +function lsp_map_keys(server, bufnr) + print('lsp_map_keys') + local function map_key(...) + -- Map to buffer if buffer number is supplied, + -- globally otherwise + if bufnr == nil then + vim.api.nvim_set_keymap(...) + else + vim.api.nvim_buf_set_keymap(bufnr, ...) + end + end + + local keymapOpts = { noremap = true, silent = true } + map_key('n', 'gD', 'lua vim.lsp.buf.declaration()', keymapOpts) + map_key('n', 'gd', 'lua vim.lsp.buf.definition()', keymapOpts) + map_key('n', 'K', 'lua vim.lsp.buf.hover()', keymapOpts) + map_key('n', 'gi', 'lua vim.lsp.buf.implementation()', keymapOpts) + map_key('n', '', 'lua vim.lsp.buf.signature_help()', + keymapOpts) + map_key('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', + keymapOpts) + map_key('n', 'wr', + 'lua vim.lsp.buf.remove_workspace_folder()', keymapOpts) + map_key('n', 'wl', + 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', + keymapOpts) + map_key('n', 'D', 'lua vim.lsp.buf.type_definition()', + keymapOpts) + map_key('n', 'rn', 'lua vim.lsp.buf.rename()', keymapOpts) + map_key('n', 'ca', 'lua vim.lsp.buf.code_action()', + keymapOpts) + map_key('n', 'gr', 'lua vim.lsp.buf.references()', keymapOpts) + map_key('n', 'e', + 'lua vim.lsp.diagnostic.show_line_diagnostics()', + keymapOpts) + map_key('n', '[d', 'lua vim.diagnostic.goto_prev()', keymapOpts) + map_key('n', ']d', 'lua vim.diagnostic.goto_next()', keymapOpts) + map_key('n', 'q', 'lua vim.diagnostic.set_loclist()', + keymapOpts) + map_key('n', 'f', 'lua vim.lsp.buf.format()', keymapOpts) +end + +M.on_attach = function(server, bufnr) + print('on_attach') + -- Setup lsp signature plugin + require('lsp_signature').setup {} + + -- Setup keybinds + lsp_map_keys(server, bufnr) +end + + +function M.setup() + local lspconfig = require('lspconfig') + + local capabilities = vim.lsp.protocol.make_client_capabilities() + + -- Common settings for all servers + local lsp_defaults = { + on_attach = M.on_attach, -- Common on_attach + capabilities = capabilities -- Add additional capabilities supported by nvim-cmp + } + + -- Set default config for all servers + --lspconfig.util.default_config = vim.tbl_deep_extend('force', lspconfig.util.default_config, lsp_defaults) + + -- Register capabilities to cmp.nvim + --require('cmp_nvim_lsp').update_capabilities(capabilities) + + -- LSP servers setup + --lspconfig.tsserver.setup {} + --lspconfig.yamlls.setup {} + --lspconfig.jsonls.setup {} + --lspconfig.html.setup {} + --lspconfig.marksman.setup {} + + --lspconfig.sumneko_lua.setup { + -- settings = { + -- Lua = { + -- runtime = { + -- -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + -- version = 'LuaJIT', + -- -- Setup your lua path + -- path = vim.split(package.path, ';') + -- }, + -- diagnostics = { + -- -- Get the language server to recognize the `vim` global + -- globals = { 'vim' } + -- }, + -- workspace = { + -- -- Make the server aware of Neovim runtime files + -- library = vim.api.nvim_get_runtime_file('', true) + -- }, + -- -- Do not send telemetry data containing a randomized but unique identifier + -- telemetry = { enable = false } + -- } + -- } + --} +end + +return M diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index 81be0bf4..e69de29b 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -1 +0,0 @@ -require'nvim-tree'.setup {} diff --git a/home/.config/nvim/lua/plugins/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java b/home/.config/nvim/lua/plugins/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java new file mode 100644 index 00000000..e69de29b diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 7124a2f6..fc94b449 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,4 +1,6 @@ -local telescope = require('telescope') -telescope.setup {} -telescope.load_extension('fzf') -telescope.load_extension('ui-select') +return function () + local telescope = require('telescope') + telescope.setup {} + telescope.load_extension('fzf') + telescope.load_extension('ui-select') +end diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index b3abded7..daeff0f3 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -1,14 +1,16 @@ -require'nvim-treesitter.configs'.setup { - ensure_installed = { - 'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json', - 'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python', 'regex', - 'rst', 'scss', 'toml', 'tsx', 'typescript', 'javascript', 'yaml' - }, - highlight = {enable = true}, - indent = {enable = true}, - incremental_selection = {enable = true}, - context_commentstring = {enable = true} -} +return function () + require'nvim-treesitter.configs'.setup { + ensure_installed = { + 'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json', + 'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python', 'regex', + 'rst', 'scss', 'toml', 'tsx', 'typescript', 'javascript', 'yaml' + }, + highlight = {enable = true}, + indent = {enable = true}, + incremental_selection = {enable = true}, + context_commentstring = {enable = true} + } ---vim.wo.foldmethod = 'expr' ---im.wo.foldexpr = 'nvim_treesitter#foldexpr()' + --vim.wo.foldmethod = 'expr' + --im.wo.foldexpr = 'nvim_treesitter#foldexpr()' +end diff --git a/home/.config/nvim/lua/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java b/home/.config/nvim/lua/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java new file mode 100644 index 00000000..e69de29b From 0f738beb9b4dbec953afeed20c7fcb2d7bd54c87 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 19:14:09 +0300 Subject: [PATCH 1249/2667] Fix scope issues in lspconfig --- home/.config/nvim/ftplugin/java.lua | 2 +- home/.config/nvim/init.lua | 2 +- home/.config/nvim/lua/plugins/lspconfig.lua | 179 ++++++++++---------- 3 files changed, 89 insertions(+), 94 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 956c2cbc..3da13fa3 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -17,4 +17,4 @@ require('jdtls').start_or_attach({ } }) -require('plugins.lspconfig').lsp_map_keys('jdtls', nil) +require('plugins.lspconfig').map_keys('jdtls', nil) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index fee008a6..4d31e835 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,5 +1,5 @@ -require 'plugins/init' require 'autocmd' require 'keybinds' require 'settings' require 'common' +require 'plugins/init' diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 5d640197..684bfd80 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -1,103 +1,98 @@ -local M = {} +M = {} -function lsp_map_keys(server, bufnr) - print('lsp_map_keys') - local function map_key(...) - -- Map to buffer if buffer number is supplied, - -- globally otherwise - if bufnr == nil then - vim.api.nvim_set_keymap(...) - else - vim.api.nvim_buf_set_keymap(bufnr, ...) - end - end +function M.map_keys(server, bufnr) + local function map_key(...) + -- Map to buffer if buffer number is supplied, + -- globally otherwise + if bufnr == nil then + vim.api.nvim_set_keymap(...) + else + vim.api.nvim_buf_set_keymap(bufnr, ...) + end + end - local keymapOpts = { noremap = true, silent = true } - map_key('n', 'gD', 'lua vim.lsp.buf.declaration()', keymapOpts) - map_key('n', 'gd', 'lua vim.lsp.buf.definition()', keymapOpts) - map_key('n', 'K', 'lua vim.lsp.buf.hover()', keymapOpts) - map_key('n', 'gi', 'lua vim.lsp.buf.implementation()', keymapOpts) - map_key('n', '', 'lua vim.lsp.buf.signature_help()', - keymapOpts) - map_key('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', - keymapOpts) - map_key('n', 'wr', - 'lua vim.lsp.buf.remove_workspace_folder()', keymapOpts) - map_key('n', 'wl', - 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', - keymapOpts) - map_key('n', 'D', 'lua vim.lsp.buf.type_definition()', - keymapOpts) - map_key('n', 'rn', 'lua vim.lsp.buf.rename()', keymapOpts) - map_key('n', 'ca', 'lua vim.lsp.buf.code_action()', - keymapOpts) - map_key('n', 'gr', 'lua vim.lsp.buf.references()', keymapOpts) - map_key('n', 'e', - 'lua vim.lsp.diagnostic.show_line_diagnostics()', - keymapOpts) - map_key('n', '[d', 'lua vim.diagnostic.goto_prev()', keymapOpts) - map_key('n', ']d', 'lua vim.diagnostic.goto_next()', keymapOpts) - map_key('n', 'q', 'lua vim.diagnostic.set_loclist()', - keymapOpts) - map_key('n', 'f', 'lua vim.lsp.buf.format()', keymapOpts) + local keymapOpts = {noremap = true, silent = true} + map_key('n', 'gD', 'lua vim.lsp.buf.declaration()', keymapOpts) + map_key('n', 'gd', 'lua vim.lsp.buf.definition()', keymapOpts) + map_key('n', 'K', 'lua vim.lsp.buf.hover()', keymapOpts) + map_key('n', 'gi', 'lua vim.lsp.buf.implementation()', keymapOpts) + map_key('n', '', 'lua vim.lsp.buf.signature_help()', + keymapOpts) + map_key('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', + keymapOpts) + map_key('n', 'wr', + 'lua vim.lsp.buf.remove_workspace_folder()', keymapOpts) + map_key('n', 'wl', + 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', + keymapOpts) + map_key('n', 'D', 'lua vim.lsp.buf.type_definition()', + keymapOpts) + map_key('n', 'rn', 'lua vim.lsp.buf.rename()', keymapOpts) + map_key('n', 'ca', 'lua vim.lsp.buf.code_action()', + keymapOpts) + map_key('n', 'gr', 'lua vim.lsp.buf.references()', keymapOpts) + map_key('n', 'e', + 'lua vim.lsp.diagnostic.show_line_diagnostics()', + keymapOpts) + map_key('n', '[d', 'lua vim.diagnostic.goto_prev()', keymapOpts) + map_key('n', ']d', 'lua vim.diagnostic.goto_next()', keymapOpts) + map_key('n', 'q', 'lua vim.diagnostic.set_loclist()', + keymapOpts) + map_key('n', 'f', 'lua vim.lsp.buf.format()', keymapOpts) end -M.on_attach = function(server, bufnr) - print('on_attach') - -- Setup lsp signature plugin - require('lsp_signature').setup {} - - -- Setup keybinds - lsp_map_keys(server, bufnr) -end - - function M.setup() - local lspconfig = require('lspconfig') + -- Pairs of server name and settings. + -- This is iterated through and every + -- server is setup with lspconfig + local servers = { + html = {}, + jsonls = {}, + marksman = {}, + yamlls = {}, + tsserver = {}, + sumneko_lua = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = 'LuaJIT', + -- Setup your lua path + path = vim.split(package.path, ';') + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = {'vim'} + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file('', true) + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = {enable = false} + } + } + } - local capabilities = vim.lsp.protocol.make_client_capabilities() + local function on_attach(server, bufnr) + -- Setup lsp signature plugin + require('lsp_signature').setup {} - -- Common settings for all servers - local lsp_defaults = { - on_attach = M.on_attach, -- Common on_attach - capabilities = capabilities -- Add additional capabilities supported by nvim-cmp - } + -- Setup keybinds + M.map_keys(server, bufnr) + end - -- Set default config for all servers - --lspconfig.util.default_config = vim.tbl_deep_extend('force', lspconfig.util.default_config, lsp_defaults) - - -- Register capabilities to cmp.nvim - --require('cmp_nvim_lsp').update_capabilities(capabilities) - - -- LSP servers setup - --lspconfig.tsserver.setup {} - --lspconfig.yamlls.setup {} - --lspconfig.jsonls.setup {} - --lspconfig.html.setup {} - --lspconfig.marksman.setup {} - - --lspconfig.sumneko_lua.setup { - -- settings = { - -- Lua = { - -- runtime = { - -- -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - -- version = 'LuaJIT', - -- -- Setup your lua path - -- path = vim.split(package.path, ';') - -- }, - -- diagnostics = { - -- -- Get the language server to recognize the `vim` global - -- globals = { 'vim' } - -- }, - -- workspace = { - -- -- Make the server aware of Neovim runtime files - -- library = vim.api.nvim_get_runtime_file('', true) - -- }, - -- -- Do not send telemetry data containing a randomized but unique identifier - -- telemetry = { enable = false } - -- } - -- } - --} + -- Setup every defined server + for server, settings in pairs(servers) do + require('lspconfig')[server].setup { + on_attach = on_attach, + settings = settings, + -- Updates capabilities to cmp.nvim and + -- informs the server about the client capabilities + capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp + .protocol + .make_client_capabilities()) + } + end end return M From f4036b818d2d7e08c10218b44755bb9317443574 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 19:14:09 +0300 Subject: [PATCH 1250/2667] Fix scope issues in lspconfig --- home/.config/nvim/ftplugin/java.lua | 2 +- home/.config/nvim/init.lua | 2 +- home/.config/nvim/lua/plugins/lspconfig.lua | 179 ++++++++++---------- 3 files changed, 89 insertions(+), 94 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 956c2cbc..3da13fa3 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -17,4 +17,4 @@ require('jdtls').start_or_attach({ } }) -require('plugins.lspconfig').lsp_map_keys('jdtls', nil) +require('plugins.lspconfig').map_keys('jdtls', nil) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index fee008a6..4d31e835 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,5 +1,5 @@ -require 'plugins/init' require 'autocmd' require 'keybinds' require 'settings' require 'common' +require 'plugins/init' diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 5d640197..684bfd80 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -1,103 +1,98 @@ -local M = {} +M = {} -function lsp_map_keys(server, bufnr) - print('lsp_map_keys') - local function map_key(...) - -- Map to buffer if buffer number is supplied, - -- globally otherwise - if bufnr == nil then - vim.api.nvim_set_keymap(...) - else - vim.api.nvim_buf_set_keymap(bufnr, ...) - end - end +function M.map_keys(server, bufnr) + local function map_key(...) + -- Map to buffer if buffer number is supplied, + -- globally otherwise + if bufnr == nil then + vim.api.nvim_set_keymap(...) + else + vim.api.nvim_buf_set_keymap(bufnr, ...) + end + end - local keymapOpts = { noremap = true, silent = true } - map_key('n', 'gD', 'lua vim.lsp.buf.declaration()', keymapOpts) - map_key('n', 'gd', 'lua vim.lsp.buf.definition()', keymapOpts) - map_key('n', 'K', 'lua vim.lsp.buf.hover()', keymapOpts) - map_key('n', 'gi', 'lua vim.lsp.buf.implementation()', keymapOpts) - map_key('n', '', 'lua vim.lsp.buf.signature_help()', - keymapOpts) - map_key('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', - keymapOpts) - map_key('n', 'wr', - 'lua vim.lsp.buf.remove_workspace_folder()', keymapOpts) - map_key('n', 'wl', - 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', - keymapOpts) - map_key('n', 'D', 'lua vim.lsp.buf.type_definition()', - keymapOpts) - map_key('n', 'rn', 'lua vim.lsp.buf.rename()', keymapOpts) - map_key('n', 'ca', 'lua vim.lsp.buf.code_action()', - keymapOpts) - map_key('n', 'gr', 'lua vim.lsp.buf.references()', keymapOpts) - map_key('n', 'e', - 'lua vim.lsp.diagnostic.show_line_diagnostics()', - keymapOpts) - map_key('n', '[d', 'lua vim.diagnostic.goto_prev()', keymapOpts) - map_key('n', ']d', 'lua vim.diagnostic.goto_next()', keymapOpts) - map_key('n', 'q', 'lua vim.diagnostic.set_loclist()', - keymapOpts) - map_key('n', 'f', 'lua vim.lsp.buf.format()', keymapOpts) + local keymapOpts = {noremap = true, silent = true} + map_key('n', 'gD', 'lua vim.lsp.buf.declaration()', keymapOpts) + map_key('n', 'gd', 'lua vim.lsp.buf.definition()', keymapOpts) + map_key('n', 'K', 'lua vim.lsp.buf.hover()', keymapOpts) + map_key('n', 'gi', 'lua vim.lsp.buf.implementation()', keymapOpts) + map_key('n', '', 'lua vim.lsp.buf.signature_help()', + keymapOpts) + map_key('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', + keymapOpts) + map_key('n', 'wr', + 'lua vim.lsp.buf.remove_workspace_folder()', keymapOpts) + map_key('n', 'wl', + 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', + keymapOpts) + map_key('n', 'D', 'lua vim.lsp.buf.type_definition()', + keymapOpts) + map_key('n', 'rn', 'lua vim.lsp.buf.rename()', keymapOpts) + map_key('n', 'ca', 'lua vim.lsp.buf.code_action()', + keymapOpts) + map_key('n', 'gr', 'lua vim.lsp.buf.references()', keymapOpts) + map_key('n', 'e', + 'lua vim.lsp.diagnostic.show_line_diagnostics()', + keymapOpts) + map_key('n', '[d', 'lua vim.diagnostic.goto_prev()', keymapOpts) + map_key('n', ']d', 'lua vim.diagnostic.goto_next()', keymapOpts) + map_key('n', 'q', 'lua vim.diagnostic.set_loclist()', + keymapOpts) + map_key('n', 'f', 'lua vim.lsp.buf.format()', keymapOpts) end -M.on_attach = function(server, bufnr) - print('on_attach') - -- Setup lsp signature plugin - require('lsp_signature').setup {} - - -- Setup keybinds - lsp_map_keys(server, bufnr) -end - - function M.setup() - local lspconfig = require('lspconfig') + -- Pairs of server name and settings. + -- This is iterated through and every + -- server is setup with lspconfig + local servers = { + html = {}, + jsonls = {}, + marksman = {}, + yamlls = {}, + tsserver = {}, + sumneko_lua = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = 'LuaJIT', + -- Setup your lua path + path = vim.split(package.path, ';') + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = {'vim'} + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file('', true) + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = {enable = false} + } + } + } - local capabilities = vim.lsp.protocol.make_client_capabilities() + local function on_attach(server, bufnr) + -- Setup lsp signature plugin + require('lsp_signature').setup {} - -- Common settings for all servers - local lsp_defaults = { - on_attach = M.on_attach, -- Common on_attach - capabilities = capabilities -- Add additional capabilities supported by nvim-cmp - } + -- Setup keybinds + M.map_keys(server, bufnr) + end - -- Set default config for all servers - --lspconfig.util.default_config = vim.tbl_deep_extend('force', lspconfig.util.default_config, lsp_defaults) - - -- Register capabilities to cmp.nvim - --require('cmp_nvim_lsp').update_capabilities(capabilities) - - -- LSP servers setup - --lspconfig.tsserver.setup {} - --lspconfig.yamlls.setup {} - --lspconfig.jsonls.setup {} - --lspconfig.html.setup {} - --lspconfig.marksman.setup {} - - --lspconfig.sumneko_lua.setup { - -- settings = { - -- Lua = { - -- runtime = { - -- -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - -- version = 'LuaJIT', - -- -- Setup your lua path - -- path = vim.split(package.path, ';') - -- }, - -- diagnostics = { - -- -- Get the language server to recognize the `vim` global - -- globals = { 'vim' } - -- }, - -- workspace = { - -- -- Make the server aware of Neovim runtime files - -- library = vim.api.nvim_get_runtime_file('', true) - -- }, - -- -- Do not send telemetry data containing a randomized but unique identifier - -- telemetry = { enable = false } - -- } - -- } - --} + -- Setup every defined server + for server, settings in pairs(servers) do + require('lspconfig')[server].setup { + on_attach = on_attach, + settings = settings, + -- Updates capabilities to cmp.nvim and + -- informs the server about the client capabilities + capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp + .protocol + .make_client_capabilities()) + } + end end return M From 64cfd072e7df4065978fde58cf00911a99376337 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 19:21:38 +0300 Subject: [PATCH 1251/2667] Remove leftover file --- .../serviceportal/api/cornerstone/CornerstoneServiceImpl.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 home/.config/nvim/lua/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java diff --git a/home/.config/nvim/lua/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java b/home/.config/nvim/lua/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java deleted file mode 100644 index e69de29b..00000000 From 4ff89f6825ebf6a06c0b5e4237cb0cf49b1595bf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 19:21:38 +0300 Subject: [PATCH 1252/2667] Remove leftover file --- .../serviceportal/api/cornerstone/CornerstoneServiceImpl.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 home/.config/nvim/lua/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java diff --git a/home/.config/nvim/lua/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java b/home/.config/nvim/lua/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java deleted file mode 100644 index e69de29b..00000000 From dd7886205f325789dcba8560000682302f450829 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 19:22:35 +0300 Subject: [PATCH 1253/2667] Use global for lspconfig servers --- home/.config/nvim/lua/plugins/lspconfig.lua | 64 +++++++++++---------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 684bfd80..4bc854a8 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -1,3 +1,35 @@ +-- Pairs of server name and settings. +-- This is iterated through and every +-- server is setup with lspconfig +Servers = { + html = {}, + jsonls = {}, + lemminx = {}, + marksman = {}, + yamlls = {}, + tsserver = {}, + sumneko_lua = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = 'LuaJIT', + -- Setup your lua path + path = vim.split(package.path, ';') + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = {'vim'} + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file('', true) + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = {enable = false} + } + } +} + M = {} function M.map_keys(server, bufnr) @@ -42,36 +74,6 @@ function M.map_keys(server, bufnr) end function M.setup() - -- Pairs of server name and settings. - -- This is iterated through and every - -- server is setup with lspconfig - local servers = { - html = {}, - jsonls = {}, - marksman = {}, - yamlls = {}, - tsserver = {}, - sumneko_lua = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = 'LuaJIT', - -- Setup your lua path - path = vim.split(package.path, ';') - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = {'vim'} - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file('', true) - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = {enable = false} - } - } - } local function on_attach(server, bufnr) -- Setup lsp signature plugin @@ -82,7 +84,7 @@ function M.setup() end -- Setup every defined server - for server, settings in pairs(servers) do + for server, settings in pairs(Servers) do require('lspconfig')[server].setup { on_attach = on_attach, settings = settings, From 1f5ebafcb36c3151cb00ccdfc7f6f663636ae814 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 19:22:35 +0300 Subject: [PATCH 1254/2667] Use global for lspconfig servers --- home/.config/nvim/lua/plugins/lspconfig.lua | 64 +++++++++++---------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 684bfd80..4bc854a8 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -1,3 +1,35 @@ +-- Pairs of server name and settings. +-- This is iterated through and every +-- server is setup with lspconfig +Servers = { + html = {}, + jsonls = {}, + lemminx = {}, + marksman = {}, + yamlls = {}, + tsserver = {}, + sumneko_lua = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = 'LuaJIT', + -- Setup your lua path + path = vim.split(package.path, ';') + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = {'vim'} + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file('', true) + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = {enable = false} + } + } +} + M = {} function M.map_keys(server, bufnr) @@ -42,36 +74,6 @@ function M.map_keys(server, bufnr) end function M.setup() - -- Pairs of server name and settings. - -- This is iterated through and every - -- server is setup with lspconfig - local servers = { - html = {}, - jsonls = {}, - marksman = {}, - yamlls = {}, - tsserver = {}, - sumneko_lua = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = 'LuaJIT', - -- Setup your lua path - path = vim.split(package.path, ';') - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = {'vim'} - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file('', true) - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = {enable = false} - } - } - } local function on_attach(server, bufnr) -- Setup lsp signature plugin @@ -82,7 +84,7 @@ function M.setup() end -- Setup every defined server - for server, settings in pairs(servers) do + for server, settings in pairs(Servers) do require('lspconfig')[server].setup { on_attach = on_attach, settings = settings, From 15f6079e283eb84f1ce28de58e345abad4ec28f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 19:35:56 +0300 Subject: [PATCH 1255/2667] Sensify neovim output on init --- home/.config/nvim/lua/plugins/init.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index b4622add..e0dde74c 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -4,7 +4,7 @@ local fn = vim.fn local install_path = fn.stdpath('data') .. '/site/pack/packer/opt/packer.nvim' if fn.empty(fn.glob(install_path)) > 0 then print('Installing Packer') - Packer_bootstrap = fn.system({ + Packer_installed = fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path }) @@ -19,7 +19,7 @@ require('packer').startup(function() local use = require('packer').use -- The plugin manager itself - use { 'wbthomason/packer.nvim', opt = true } + use {'wbthomason/packer.nvim', opt=true} -- Colorscheme use { @@ -178,8 +178,7 @@ end) -- Sync plugins if Packer was just -- installed -if Packer_bootstrap then +if Packer_installed then print('Syncing plugins') require('packer').sync() - print('Synced') end From 9c69c01f36b60d9e429cd35e0acca40d7cb35341 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 19:35:56 +0300 Subject: [PATCH 1256/2667] Sensify neovim output on init --- home/.config/nvim/lua/plugins/init.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index b4622add..e0dde74c 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -4,7 +4,7 @@ local fn = vim.fn local install_path = fn.stdpath('data') .. '/site/pack/packer/opt/packer.nvim' if fn.empty(fn.glob(install_path)) > 0 then print('Installing Packer') - Packer_bootstrap = fn.system({ + Packer_installed = fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path }) @@ -19,7 +19,7 @@ require('packer').startup(function() local use = require('packer').use -- The plugin manager itself - use { 'wbthomason/packer.nvim', opt = true } + use {'wbthomason/packer.nvim', opt=true} -- Colorscheme use { @@ -178,8 +178,7 @@ end) -- Sync plugins if Packer was just -- installed -if Packer_bootstrap then +if Packer_installed then print('Syncing plugins') require('packer').sync() - print('Synced') end From 1df85d3a12f4dd34cf9231a0c76721c7dd795407 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 19:36:35 +0300 Subject: [PATCH 1257/2667] Remove leftover file --- .../serviceportal/api/cornerstone/CornerstoneServiceImpl.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java diff --git a/home/.config/nvim/lua/plugins/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java b/home/.config/nvim/lua/plugins/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java deleted file mode 100644 index e69de29b..00000000 From df03e639b7c93bf31d34f0d0e832e793ab5c1c5e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 19:36:35 +0300 Subject: [PATCH 1258/2667] Remove leftover file --- .../serviceportal/api/cornerstone/CornerstoneServiceImpl.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java diff --git a/home/.config/nvim/lua/plugins/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java b/home/.config/nvim/lua/plugins/src/main/java/fi/rossum/helen/serviceportal/api/cornerstone/CornerstoneServiceImpl.java deleted file mode 100644 index e69de29b..00000000 From fa8e0e7331c313ed0cf289b00876d0452dbdd4f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 22:12:01 +0300 Subject: [PATCH 1259/2667] Ran luaformat on all neovim files, removed unneeded files --- home/.config/nvim/ftplugin/java.lua | 5 +- home/.config/nvim/lua/pager.lua | 2 +- home/.config/nvim/lua/plugins/cmp.lua | 116 ++++---- home/.config/nvim/lua/plugins/colorscheme.lua | 103 +++---- .../nvim/lua/plugins/indent-blankline.lua | 14 +- home/.config/nvim/lua/plugins/init.lua | 277 +++++++++--------- home/.config/nvim/lua/plugins/lualine.lua | 4 +- home/.config/nvim/lua/plugins/nvim-tree.lua | 0 home/.config/nvim/lua/plugins/telescope.lua | 10 +- home/.config/nvim/lua/plugins/treesitter.lua | 29 +- home/.config/nvim/lua/settings.lua | 2 - 11 files changed, 277 insertions(+), 285 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/nvim-tree.lua diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 3da13fa3..4cbe0d6f 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -12,8 +12,9 @@ require('jdtls').start_or_attach({ 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.lang=ALL-UNNAMED', '-jar', nvim_local_dir .. '/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar', - '-configuration', nvim_local_dir .. '/mason/packages/jdtls/config_linux', - '-data', workspace_dir + '-configuration', + nvim_local_dir .. '/mason/packages/jdtls/config_linux', '-data', + workspace_dir } }) diff --git a/home/.config/nvim/lua/pager.lua b/home/.config/nvim/lua/pager.lua index 1534a445..1a8c91fb 100644 --- a/home/.config/nvim/lua/pager.lua +++ b/home/.config/nvim/lua/pager.lua @@ -2,4 +2,4 @@ require 'common' MapKey('n', 'q', 'q') ---vim.cmd('set nomodifiable') +-- vim.cmd('set nomodifiable') diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 51a00cf5..a4a17579 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -1,68 +1,62 @@ return function() - -- Setup git completion source - require("cmp_git").setup() + -- Setup git completion source + require("cmp_git").setup() - -- Set completeopt to have a better completion experience - vim.o.completeopt = 'menuone,noselect' + -- Set completeopt to have a better completion experience + vim.o.completeopt = 'menuone,noselect' - -- luasnip setup - local luasnip = require 'luasnip' + -- luasnip setup + local luasnip = require 'luasnip' - -- nvim-cmp setup - local cmp = require 'cmp' - cmp.setup { - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end, - }, - mapping = { - [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.close(), - [''] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }, - [''] = function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, - [''] = function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, - }, - sources = { - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - { name = 'path' }, - { name = 'git' }, - { name = 'buffer' }, - }, - } + -- nvim-cmp setup + local cmp = require 'cmp' + cmp.setup { + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end + }, + mapping = { + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.close(), + [''] = cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.Replace, + select = true + }, + [''] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, + [''] = function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end + }, + sources = { + {name = 'nvim_lsp'}, {name = 'luasnip'}, {name = 'path'}, + {name = 'git'}, {name = 'buffer'} + } + } - -- Enable autopairs when enter is processed - -- on completion - local cmp_autopairs = require 'nvim-autopairs.completion.cmp' - cmp.event:on( - 'confirm_done', - cmp_autopairs.on_confirm_done() - ) + -- Enable autopairs when enter is processed + -- on completion + local cmp_autopairs = require 'nvim-autopairs.completion.cmp' + cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) - -- load friendly-snippets to luasnip - require('luasnip/loaders/from_vscode').lazy_load() + -- load friendly-snippets to luasnip + require('luasnip/loaders/from_vscode').lazy_load() end diff --git a/home/.config/nvim/lua/plugins/colorscheme.lua b/home/.config/nvim/lua/plugins/colorscheme.lua index 3c098388..f28d9bdb 100644 --- a/home/.config/nvim/lua/plugins/colorscheme.lua +++ b/home/.config/nvim/lua/plugins/colorscheme.lua @@ -1,51 +1,54 @@ -return function () - require('catppuccin').setup({ - transparent_background = false, - term_colors = false, - compile = {enabled = true, path = vim.fn.stdpath 'cache' .. '/catppuccin'}, - styles = { - comments = {'italic'}, - functions = {'italic'}, - keywords = {'italic'}, - strings = {}, - variables = {} - }, - integrations = { - treesitter = true, - native_lsp = { - enabled = true, - virtual_text = { - errors = {'italic'}, - hints = {'italic'}, - warnings = {'italic'}, - information = {'italic'} - }, - underlines = { - errors = {'underline'}, - hints = {'underline'}, - warnings = {'underline'}, - information = {'underline'} - } - }, - lsp_trouble = false, - lsp_saga = false, - gitgutter = true, - gitsigns = false, - telescope = true, - nvimtree = {enabled = false, show_root = false}, - which_key = false, - indent_blankline = {enabled = true, colored_indent_levels = false}, - dashboard = false, - neogit = false, - vim_sneak = false, - fern = false, - barbar = false, - bufferline = false, - markdown = false, - lightspeed = false, - ts_rainbow = false, - hop = false - } - }) - vim.cmd [[colorscheme catppuccin]] +return function() + require('catppuccin').setup({ + transparent_background = false, + term_colors = false, + compile = { + enabled = true, + path = vim.fn.stdpath 'cache' .. '/catppuccin' + }, + styles = { + comments = {'italic'}, + functions = {'italic'}, + keywords = {'italic'}, + strings = {}, + variables = {} + }, + integrations = { + treesitter = true, + native_lsp = { + enabled = true, + virtual_text = { + errors = {'italic'}, + hints = {'italic'}, + warnings = {'italic'}, + information = {'italic'} + }, + underlines = { + errors = {'underline'}, + hints = {'underline'}, + warnings = {'underline'}, + information = {'underline'} + } + }, + lsp_trouble = false, + lsp_saga = false, + gitgutter = true, + gitsigns = false, + telescope = true, + nvimtree = {enabled = false, show_root = false}, + which_key = false, + indent_blankline = {enabled = true, colored_indent_levels = false}, + dashboard = false, + neogit = false, + vim_sneak = false, + fern = false, + barbar = false, + bufferline = false, + markdown = false, + lightspeed = false, + ts_rainbow = false, + hop = false + } + }) + vim.cmd [[colorscheme catppuccin]] end diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index 1056ad02..f48e612e 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,8 +1,8 @@ -return function () - vim.opt.list = true - require('indent_blankline').setup { - space_char_blankline = ' ', - show_current_context = true, - show_current_context_start = true, - } +return function() + vim.opt.list = true + require('indent_blankline').setup { + space_char_blankline = ' ', + show_current_context = true, + show_current_context_start = true + } end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index e0dde74c..449f0591 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -3,182 +3,179 @@ local fn = vim.fn -- Install packer if it's not yet installed local install_path = fn.stdpath('data') .. '/site/pack/packer/opt/packer.nvim' if fn.empty(fn.glob(install_path)) > 0 then - print('Installing Packer') - Packer_installed = fn.system({ - 'git', 'clone', '--depth', '1', - 'https://github.com/wbthomason/packer.nvim', install_path - }) - vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. - vim.o.runtimepath - print('Installed Packer') + print('Installing Packer') + Packer_installed = fn.system({ + 'git', 'clone', '--depth', '1', + 'https://github.com/wbthomason/packer.nvim', install_path + }) + vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. + vim.o.runtimepath + print('Installed Packer') end -- Configure packer vim.cmd [[packadd packer.nvim]] require('packer').startup(function() - local use = require('packer').use + local use = require('packer').use - -- The plugin manager itself - use {'wbthomason/packer.nvim', opt=true} + -- The plugin manager itself + use {'wbthomason/packer.nvim', opt = true} - -- Colorscheme - use { - 'catppuccin/nvim', - as = 'catppuccin', - config = require('plugins.colorscheme'), - } + -- Colorscheme + use { + 'catppuccin/nvim', + as = 'catppuccin', + config = require('plugins.colorscheme') + } - -- Git in signcolumn - use 'airblade/vim-gitgutter' + -- Git in signcolumn + use 'airblade/vim-gitgutter' - -- Statusline - use { - 'hoob3rt/lualine.nvim', - requires = { 'kyazdani42/nvim-web-devicons', opt = true }, - config = function() - require('lualine').setup { - options = { theme = 'catppuccin' } - } - end, - } + -- Statusline + use { + 'hoob3rt/lualine.nvim', + requires = {'kyazdani42/nvim-web-devicons', opt = true}, + config = function() + require('lualine').setup {options = {theme = 'catppuccin'}} + end + } - -- Tabline/bufferline - use { - 'akinsho/nvim-bufferline.lua', - tag = '*', - requires = 'kyazdani42/nvim-web-devicons', - config = function() require('bufferline').setup {} end - } + -- Tabline/bufferline + use { + 'akinsho/nvim-bufferline.lua', + tag = '*', + requires = 'kyazdani42/nvim-web-devicons', + config = function() require('bufferline').setup {} end + } - -- Git commands - use 'tpope/vim-fugitive' + -- Git commands + use 'tpope/vim-fugitive' - -- Indent characters - use { - 'lukas-reineke/indent-blankline.nvim', - config = require('plugins.indent-blankline') - } + -- Indent characters + use { + 'lukas-reineke/indent-blankline.nvim', + config = require('plugins.indent-blankline') + } - -- Tree explorer - use { - 'kyazdani42/nvim-tree.lua', - requires = 'kyazdani42/nvim-web-devicons', - config = function() require('nvim-tree').setup {} end - } + -- Tree explorer + use { + 'kyazdani42/nvim-tree.lua', + requires = 'kyazdani42/nvim-web-devicons', + config = function() require('nvim-tree').setup {} end + } - -- Telescope - use { - 'nvim-telescope/telescope.nvim', - config = require('plugins.telescope'), - requires = { - { 'nvim-lua/plenary.nvim' }, -- Internal dep for telescope - { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }, -- Use fzf for fuzzy finder - { 'nvim-telescope/telescope-ui-select.nvim' } -- Replace vim built in select with telescope - } - } + -- Telescope + use { + 'nvim-telescope/telescope.nvim', + config = require('plugins.telescope'), + requires = { + {'nvim-lua/plenary.nvim'}, -- Internal dep for telescope + {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'}, -- Use fzf for fuzzy finder + {'nvim-telescope/telescope-ui-select.nvim'} -- Replace vim built in select with telescope + } + } - -- Do stuff as sudo - use 'lambdalisue/suda.vim' + -- Do stuff as sudo + use 'lambdalisue/suda.vim' - -- Display possible keybinds - use { - 'folke/which-key.nvim', - config = function() require('which-key').setup {} end - } + -- Display possible keybinds + use { + 'folke/which-key.nvim', + config = function() + require('which-key').setup {spelling = {enabled = true}} + end + } - -- Read editorconfig settings - use 'editorconfig/editorconfig-vim' + -- Read editorconfig settings + use 'editorconfig/editorconfig-vim' - -- Install LSP server executables - use { - 'williamboman/mason.nvim', - config = function() require('mason').setup {} end - } - use { - 'williamboman/mason-lspconfig.nvim', - config = function() - require('mason-lspconfig').setup { automatic_installation = true } - end - } + -- Install LSP server executables + use { + 'williamboman/mason.nvim', + config = function() require('mason').setup {} end + } + use { + 'williamboman/mason-lspconfig.nvim', + config = function() + require('mason-lspconfig').setup {automatic_installation = true} + end + } - -- Configs for built-in LSP - use { - 'neovim/nvim-lspconfig', - config = require('plugins.lspconfig').setup - } + -- Configs for built-in LSP + use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup} - -- Additional LSP features for Java - use 'mfussenegger/nvim-jdtls' + -- Additional LSP features for Java + use 'mfussenegger/nvim-jdtls' - -- Display function signature - use 'ray-x/lsp_signature.nvim' + -- Display function signature + use 'ray-x/lsp_signature.nvim' - -- Completion - use { - 'hrsh7th/nvim-cmp', - requires = { - { 'hrsh7th/cmp-nvim-lsp' }, -- LSP source - { 'hrsh7th/cmp-path' }, -- Path source - { 'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim" }, -- Git source - { 'hrsh7th/cmp-buffer' }, -- Buffer source - { 'saadparwaiz1/cmp_luasnip' }, -- Snippets source - { 'L3MON4D3/LuaSnip' }, -- Snippets plugin - { 'rafamadriz/friendly-snippets' }, -- Snippets collection - }, - config = require('plugins.cmp'), - } + -- Completion + use { + 'hrsh7th/nvim-cmp', + requires = { + {'hrsh7th/cmp-nvim-lsp'}, -- LSP source + {'hrsh7th/cmp-path'}, -- Path source + {'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim"}, -- Git source + {'hrsh7th/cmp-buffer'}, -- Buffer source + {'saadparwaiz1/cmp_luasnip'}, -- Snippets source + {'L3MON4D3/LuaSnip'}, -- Snippets plugin + {'rafamadriz/friendly-snippets'} -- Snippets collection + }, + config = require('plugins.cmp') + } - -- Automatic brackets - use { - 'windwp/nvim-autopairs', - config = function() require('nvim-autopairs').setup{} end - } + -- Automatic brackets + use { + 'windwp/nvim-autopairs', + config = function() require('nvim-autopairs').setup {} end + } - -- treesitter - use { - 'nvim-treesitter/nvim-treesitter', - run = function() - require('nvim-treesitter.install').update({ with_sync = true }) - end, - config = require('plugins.treesitter') - } + -- treesitter + use { + 'nvim-treesitter/nvim-treesitter', + run = function() + require('nvim-treesitter.install').update({with_sync = true}) + end, + config = require('plugins.treesitter') + } - -- treesitter plugin for commentstring - use 'JoosepAlviste/nvim-ts-context-commentstring' + -- treesitter plugin for commentstring + use 'JoosepAlviste/nvim-ts-context-commentstring' - -- Additional plugins for formats not supported - -- by treesitter - use 'jamespeapen/swayconfig.vim' + -- Additional plugins for formats not supported + -- by treesitter + use 'jamespeapen/swayconfig.vim' - -- mappings for commenting in code - use 'tpope/vim-commentary' + -- mappings for commenting in code + use 'tpope/vim-commentary' - -- we all know this one - use 'tpope/vim-surround' + -- we all know this one + use 'tpope/vim-surround' - -- Formatter plugin - use 'sbdchd/neoformat' + -- Formatter plugin + use 'sbdchd/neoformat' - -- Make editing passwords safer - use { - 'https://git.zx2c4.com/password-store', - rtp = 'contrib/vim/redact_pass.vim' - } + -- Make editing passwords safer + use { + 'https://git.zx2c4.com/password-store', + rtp = 'contrib/vim/redact_pass.vim' + } - -- Neovim inside Firefox - use { - 'glacambre/firenvim', - run = function() vim.fn['firenvim#install'](0) end - } + -- Neovim inside Firefox + use { + 'glacambre/firenvim', + run = function() vim.fn['firenvim#install'](0) end + } - -- Vim <3 Asciidoctor - use 'habamax/vim-asciidoctor' + -- Vim <3 Asciidoctor + use 'habamax/vim-asciidoctor' end) -- Sync plugins if Packer was just -- installed if Packer_installed then - print('Syncing plugins') - require('packer').sync() + print('Syncing plugins') + require('packer').sync() end diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 205c0bbe..815d2d96 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1,3 +1 @@ -require'lualine'.setup { - options = {theme = 'catppuccin'}, -} +require'lualine'.setup {options = {theme = 'catppuccin'}} diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua deleted file mode 100644 index e69de29b..00000000 diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index fc94b449..3d889de5 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,6 +1,6 @@ -return function () - local telescope = require('telescope') - telescope.setup {} - telescope.load_extension('fzf') - telescope.load_extension('ui-select') +return function() + local telescope = require('telescope') + telescope.setup {} + telescope.load_extension('fzf') + telescope.load_extension('ui-select') end diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index daeff0f3..25c5cc9e 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -1,16 +1,17 @@ -return function () - require'nvim-treesitter.configs'.setup { - ensure_installed = { - 'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json', - 'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python', 'regex', - 'rst', 'scss', 'toml', 'tsx', 'typescript', 'javascript', 'yaml' - }, - highlight = {enable = true}, - indent = {enable = true}, - incremental_selection = {enable = true}, - context_commentstring = {enable = true} - } +return function() + require'nvim-treesitter.configs'.setup { + ensure_installed = { + 'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json', + 'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python', + 'regex', 'rst', 'scss', 'toml', 'tsx', 'typescript', 'javascript', + 'yaml' + }, + highlight = {enable = true}, + indent = {enable = true}, + incremental_selection = {enable = true}, + context_commentstring = {enable = true} + } - --vim.wo.foldmethod = 'expr' - --im.wo.foldexpr = 'nvim_treesitter#foldexpr()' + -- vim.wo.foldmethod = 'expr' + -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' end diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 8ff34740..3817c05a 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -38,12 +38,10 @@ cmd 'highlight SignColumn guibg=transparent' -- Use suda by default g.suda_smart_edit = 1 - -- Split direction o.splitbelow = true o.splitright = true - -- Case insensitive search o.ignorecase = true o.smartcase = true From 315f2a817f7346404b73f8e2df2647cf4e085289 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 22:12:01 +0300 Subject: [PATCH 1260/2667] Ran luaformat on all neovim files, removed unneeded files --- home/.config/nvim/ftplugin/java.lua | 5 +- home/.config/nvim/lua/pager.lua | 2 +- home/.config/nvim/lua/plugins/cmp.lua | 116 ++++---- home/.config/nvim/lua/plugins/colorscheme.lua | 103 +++---- .../nvim/lua/plugins/indent-blankline.lua | 14 +- home/.config/nvim/lua/plugins/init.lua | 277 +++++++++--------- home/.config/nvim/lua/plugins/lualine.lua | 4 +- home/.config/nvim/lua/plugins/nvim-tree.lua | 0 home/.config/nvim/lua/plugins/telescope.lua | 10 +- home/.config/nvim/lua/plugins/treesitter.lua | 29 +- home/.config/nvim/lua/settings.lua | 2 - 11 files changed, 277 insertions(+), 285 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/nvim-tree.lua diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 3da13fa3..4cbe0d6f 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -12,8 +12,9 @@ require('jdtls').start_or_attach({ 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.lang=ALL-UNNAMED', '-jar', nvim_local_dir .. '/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar', - '-configuration', nvim_local_dir .. '/mason/packages/jdtls/config_linux', - '-data', workspace_dir + '-configuration', + nvim_local_dir .. '/mason/packages/jdtls/config_linux', '-data', + workspace_dir } }) diff --git a/home/.config/nvim/lua/pager.lua b/home/.config/nvim/lua/pager.lua index 1534a445..1a8c91fb 100644 --- a/home/.config/nvim/lua/pager.lua +++ b/home/.config/nvim/lua/pager.lua @@ -2,4 +2,4 @@ require 'common' MapKey('n', 'q', 'q') ---vim.cmd('set nomodifiable') +-- vim.cmd('set nomodifiable') diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 51a00cf5..a4a17579 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -1,68 +1,62 @@ return function() - -- Setup git completion source - require("cmp_git").setup() + -- Setup git completion source + require("cmp_git").setup() - -- Set completeopt to have a better completion experience - vim.o.completeopt = 'menuone,noselect' + -- Set completeopt to have a better completion experience + vim.o.completeopt = 'menuone,noselect' - -- luasnip setup - local luasnip = require 'luasnip' + -- luasnip setup + local luasnip = require 'luasnip' - -- nvim-cmp setup - local cmp = require 'cmp' - cmp.setup { - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end, - }, - mapping = { - [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.close(), - [''] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }, - [''] = function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, - [''] = function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, - }, - sources = { - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - { name = 'path' }, - { name = 'git' }, - { name = 'buffer' }, - }, - } + -- nvim-cmp setup + local cmp = require 'cmp' + cmp.setup { + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end + }, + mapping = { + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.close(), + [''] = cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.Replace, + select = true + }, + [''] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, + [''] = function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end + }, + sources = { + {name = 'nvim_lsp'}, {name = 'luasnip'}, {name = 'path'}, + {name = 'git'}, {name = 'buffer'} + } + } - -- Enable autopairs when enter is processed - -- on completion - local cmp_autopairs = require 'nvim-autopairs.completion.cmp' - cmp.event:on( - 'confirm_done', - cmp_autopairs.on_confirm_done() - ) + -- Enable autopairs when enter is processed + -- on completion + local cmp_autopairs = require 'nvim-autopairs.completion.cmp' + cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) - -- load friendly-snippets to luasnip - require('luasnip/loaders/from_vscode').lazy_load() + -- load friendly-snippets to luasnip + require('luasnip/loaders/from_vscode').lazy_load() end diff --git a/home/.config/nvim/lua/plugins/colorscheme.lua b/home/.config/nvim/lua/plugins/colorscheme.lua index 3c098388..f28d9bdb 100644 --- a/home/.config/nvim/lua/plugins/colorscheme.lua +++ b/home/.config/nvim/lua/plugins/colorscheme.lua @@ -1,51 +1,54 @@ -return function () - require('catppuccin').setup({ - transparent_background = false, - term_colors = false, - compile = {enabled = true, path = vim.fn.stdpath 'cache' .. '/catppuccin'}, - styles = { - comments = {'italic'}, - functions = {'italic'}, - keywords = {'italic'}, - strings = {}, - variables = {} - }, - integrations = { - treesitter = true, - native_lsp = { - enabled = true, - virtual_text = { - errors = {'italic'}, - hints = {'italic'}, - warnings = {'italic'}, - information = {'italic'} - }, - underlines = { - errors = {'underline'}, - hints = {'underline'}, - warnings = {'underline'}, - information = {'underline'} - } - }, - lsp_trouble = false, - lsp_saga = false, - gitgutter = true, - gitsigns = false, - telescope = true, - nvimtree = {enabled = false, show_root = false}, - which_key = false, - indent_blankline = {enabled = true, colored_indent_levels = false}, - dashboard = false, - neogit = false, - vim_sneak = false, - fern = false, - barbar = false, - bufferline = false, - markdown = false, - lightspeed = false, - ts_rainbow = false, - hop = false - } - }) - vim.cmd [[colorscheme catppuccin]] +return function() + require('catppuccin').setup({ + transparent_background = false, + term_colors = false, + compile = { + enabled = true, + path = vim.fn.stdpath 'cache' .. '/catppuccin' + }, + styles = { + comments = {'italic'}, + functions = {'italic'}, + keywords = {'italic'}, + strings = {}, + variables = {} + }, + integrations = { + treesitter = true, + native_lsp = { + enabled = true, + virtual_text = { + errors = {'italic'}, + hints = {'italic'}, + warnings = {'italic'}, + information = {'italic'} + }, + underlines = { + errors = {'underline'}, + hints = {'underline'}, + warnings = {'underline'}, + information = {'underline'} + } + }, + lsp_trouble = false, + lsp_saga = false, + gitgutter = true, + gitsigns = false, + telescope = true, + nvimtree = {enabled = false, show_root = false}, + which_key = false, + indent_blankline = {enabled = true, colored_indent_levels = false}, + dashboard = false, + neogit = false, + vim_sneak = false, + fern = false, + barbar = false, + bufferline = false, + markdown = false, + lightspeed = false, + ts_rainbow = false, + hop = false + } + }) + vim.cmd [[colorscheme catppuccin]] end diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index 1056ad02..f48e612e 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,8 +1,8 @@ -return function () - vim.opt.list = true - require('indent_blankline').setup { - space_char_blankline = ' ', - show_current_context = true, - show_current_context_start = true, - } +return function() + vim.opt.list = true + require('indent_blankline').setup { + space_char_blankline = ' ', + show_current_context = true, + show_current_context_start = true + } end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index e0dde74c..449f0591 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -3,182 +3,179 @@ local fn = vim.fn -- Install packer if it's not yet installed local install_path = fn.stdpath('data') .. '/site/pack/packer/opt/packer.nvim' if fn.empty(fn.glob(install_path)) > 0 then - print('Installing Packer') - Packer_installed = fn.system({ - 'git', 'clone', '--depth', '1', - 'https://github.com/wbthomason/packer.nvim', install_path - }) - vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. - vim.o.runtimepath - print('Installed Packer') + print('Installing Packer') + Packer_installed = fn.system({ + 'git', 'clone', '--depth', '1', + 'https://github.com/wbthomason/packer.nvim', install_path + }) + vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. + vim.o.runtimepath + print('Installed Packer') end -- Configure packer vim.cmd [[packadd packer.nvim]] require('packer').startup(function() - local use = require('packer').use + local use = require('packer').use - -- The plugin manager itself - use {'wbthomason/packer.nvim', opt=true} + -- The plugin manager itself + use {'wbthomason/packer.nvim', opt = true} - -- Colorscheme - use { - 'catppuccin/nvim', - as = 'catppuccin', - config = require('plugins.colorscheme'), - } + -- Colorscheme + use { + 'catppuccin/nvim', + as = 'catppuccin', + config = require('plugins.colorscheme') + } - -- Git in signcolumn - use 'airblade/vim-gitgutter' + -- Git in signcolumn + use 'airblade/vim-gitgutter' - -- Statusline - use { - 'hoob3rt/lualine.nvim', - requires = { 'kyazdani42/nvim-web-devicons', opt = true }, - config = function() - require('lualine').setup { - options = { theme = 'catppuccin' } - } - end, - } + -- Statusline + use { + 'hoob3rt/lualine.nvim', + requires = {'kyazdani42/nvim-web-devicons', opt = true}, + config = function() + require('lualine').setup {options = {theme = 'catppuccin'}} + end + } - -- Tabline/bufferline - use { - 'akinsho/nvim-bufferline.lua', - tag = '*', - requires = 'kyazdani42/nvim-web-devicons', - config = function() require('bufferline').setup {} end - } + -- Tabline/bufferline + use { + 'akinsho/nvim-bufferline.lua', + tag = '*', + requires = 'kyazdani42/nvim-web-devicons', + config = function() require('bufferline').setup {} end + } - -- Git commands - use 'tpope/vim-fugitive' + -- Git commands + use 'tpope/vim-fugitive' - -- Indent characters - use { - 'lukas-reineke/indent-blankline.nvim', - config = require('plugins.indent-blankline') - } + -- Indent characters + use { + 'lukas-reineke/indent-blankline.nvim', + config = require('plugins.indent-blankline') + } - -- Tree explorer - use { - 'kyazdani42/nvim-tree.lua', - requires = 'kyazdani42/nvim-web-devicons', - config = function() require('nvim-tree').setup {} end - } + -- Tree explorer + use { + 'kyazdani42/nvim-tree.lua', + requires = 'kyazdani42/nvim-web-devicons', + config = function() require('nvim-tree').setup {} end + } - -- Telescope - use { - 'nvim-telescope/telescope.nvim', - config = require('plugins.telescope'), - requires = { - { 'nvim-lua/plenary.nvim' }, -- Internal dep for telescope - { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }, -- Use fzf for fuzzy finder - { 'nvim-telescope/telescope-ui-select.nvim' } -- Replace vim built in select with telescope - } - } + -- Telescope + use { + 'nvim-telescope/telescope.nvim', + config = require('plugins.telescope'), + requires = { + {'nvim-lua/plenary.nvim'}, -- Internal dep for telescope + {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'}, -- Use fzf for fuzzy finder + {'nvim-telescope/telescope-ui-select.nvim'} -- Replace vim built in select with telescope + } + } - -- Do stuff as sudo - use 'lambdalisue/suda.vim' + -- Do stuff as sudo + use 'lambdalisue/suda.vim' - -- Display possible keybinds - use { - 'folke/which-key.nvim', - config = function() require('which-key').setup {} end - } + -- Display possible keybinds + use { + 'folke/which-key.nvim', + config = function() + require('which-key').setup {spelling = {enabled = true}} + end + } - -- Read editorconfig settings - use 'editorconfig/editorconfig-vim' + -- Read editorconfig settings + use 'editorconfig/editorconfig-vim' - -- Install LSP server executables - use { - 'williamboman/mason.nvim', - config = function() require('mason').setup {} end - } - use { - 'williamboman/mason-lspconfig.nvim', - config = function() - require('mason-lspconfig').setup { automatic_installation = true } - end - } + -- Install LSP server executables + use { + 'williamboman/mason.nvim', + config = function() require('mason').setup {} end + } + use { + 'williamboman/mason-lspconfig.nvim', + config = function() + require('mason-lspconfig').setup {automatic_installation = true} + end + } - -- Configs for built-in LSP - use { - 'neovim/nvim-lspconfig', - config = require('plugins.lspconfig').setup - } + -- Configs for built-in LSP + use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup} - -- Additional LSP features for Java - use 'mfussenegger/nvim-jdtls' + -- Additional LSP features for Java + use 'mfussenegger/nvim-jdtls' - -- Display function signature - use 'ray-x/lsp_signature.nvim' + -- Display function signature + use 'ray-x/lsp_signature.nvim' - -- Completion - use { - 'hrsh7th/nvim-cmp', - requires = { - { 'hrsh7th/cmp-nvim-lsp' }, -- LSP source - { 'hrsh7th/cmp-path' }, -- Path source - { 'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim" }, -- Git source - { 'hrsh7th/cmp-buffer' }, -- Buffer source - { 'saadparwaiz1/cmp_luasnip' }, -- Snippets source - { 'L3MON4D3/LuaSnip' }, -- Snippets plugin - { 'rafamadriz/friendly-snippets' }, -- Snippets collection - }, - config = require('plugins.cmp'), - } + -- Completion + use { + 'hrsh7th/nvim-cmp', + requires = { + {'hrsh7th/cmp-nvim-lsp'}, -- LSP source + {'hrsh7th/cmp-path'}, -- Path source + {'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim"}, -- Git source + {'hrsh7th/cmp-buffer'}, -- Buffer source + {'saadparwaiz1/cmp_luasnip'}, -- Snippets source + {'L3MON4D3/LuaSnip'}, -- Snippets plugin + {'rafamadriz/friendly-snippets'} -- Snippets collection + }, + config = require('plugins.cmp') + } - -- Automatic brackets - use { - 'windwp/nvim-autopairs', - config = function() require('nvim-autopairs').setup{} end - } + -- Automatic brackets + use { + 'windwp/nvim-autopairs', + config = function() require('nvim-autopairs').setup {} end + } - -- treesitter - use { - 'nvim-treesitter/nvim-treesitter', - run = function() - require('nvim-treesitter.install').update({ with_sync = true }) - end, - config = require('plugins.treesitter') - } + -- treesitter + use { + 'nvim-treesitter/nvim-treesitter', + run = function() + require('nvim-treesitter.install').update({with_sync = true}) + end, + config = require('plugins.treesitter') + } - -- treesitter plugin for commentstring - use 'JoosepAlviste/nvim-ts-context-commentstring' + -- treesitter plugin for commentstring + use 'JoosepAlviste/nvim-ts-context-commentstring' - -- Additional plugins for formats not supported - -- by treesitter - use 'jamespeapen/swayconfig.vim' + -- Additional plugins for formats not supported + -- by treesitter + use 'jamespeapen/swayconfig.vim' - -- mappings for commenting in code - use 'tpope/vim-commentary' + -- mappings for commenting in code + use 'tpope/vim-commentary' - -- we all know this one - use 'tpope/vim-surround' + -- we all know this one + use 'tpope/vim-surround' - -- Formatter plugin - use 'sbdchd/neoformat' + -- Formatter plugin + use 'sbdchd/neoformat' - -- Make editing passwords safer - use { - 'https://git.zx2c4.com/password-store', - rtp = 'contrib/vim/redact_pass.vim' - } + -- Make editing passwords safer + use { + 'https://git.zx2c4.com/password-store', + rtp = 'contrib/vim/redact_pass.vim' + } - -- Neovim inside Firefox - use { - 'glacambre/firenvim', - run = function() vim.fn['firenvim#install'](0) end - } + -- Neovim inside Firefox + use { + 'glacambre/firenvim', + run = function() vim.fn['firenvim#install'](0) end + } - -- Vim <3 Asciidoctor - use 'habamax/vim-asciidoctor' + -- Vim <3 Asciidoctor + use 'habamax/vim-asciidoctor' end) -- Sync plugins if Packer was just -- installed if Packer_installed then - print('Syncing plugins') - require('packer').sync() + print('Syncing plugins') + require('packer').sync() end diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 205c0bbe..815d2d96 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1,3 +1 @@ -require'lualine'.setup { - options = {theme = 'catppuccin'}, -} +require'lualine'.setup {options = {theme = 'catppuccin'}} diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua deleted file mode 100644 index e69de29b..00000000 diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index fc94b449..3d889de5 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,6 +1,6 @@ -return function () - local telescope = require('telescope') - telescope.setup {} - telescope.load_extension('fzf') - telescope.load_extension('ui-select') +return function() + local telescope = require('telescope') + telescope.setup {} + telescope.load_extension('fzf') + telescope.load_extension('ui-select') end diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index daeff0f3..25c5cc9e 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -1,16 +1,17 @@ -return function () - require'nvim-treesitter.configs'.setup { - ensure_installed = { - 'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json', - 'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python', 'regex', - 'rst', 'scss', 'toml', 'tsx', 'typescript', 'javascript', 'yaml' - }, - highlight = {enable = true}, - indent = {enable = true}, - incremental_selection = {enable = true}, - context_commentstring = {enable = true} - } +return function() + require'nvim-treesitter.configs'.setup { + ensure_installed = { + 'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json', + 'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python', + 'regex', 'rst', 'scss', 'toml', 'tsx', 'typescript', 'javascript', + 'yaml' + }, + highlight = {enable = true}, + indent = {enable = true}, + incremental_selection = {enable = true}, + context_commentstring = {enable = true} + } - --vim.wo.foldmethod = 'expr' - --im.wo.foldexpr = 'nvim_treesitter#foldexpr()' + -- vim.wo.foldmethod = 'expr' + -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' end diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 8ff34740..3817c05a 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -38,12 +38,10 @@ cmd 'highlight SignColumn guibg=transparent' -- Use suda by default g.suda_smart_edit = 1 - -- Split direction o.splitbelow = true o.splitright = true - -- Case insensitive search o.ignorecase = true o.smartcase = true From bce2d6d6b1c913e0e0737015cda5365005ff8e20 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 22:15:18 +0300 Subject: [PATCH 1261/2667] Fix git difftool --- home/.config/git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/git/config b/home/.config/git/config index fee6329b..adbfcaf3 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -31,7 +31,7 @@ tool = nvim-diff [difftool "nvim-diff"] - cmd = nvim -d -R + cmd = nvim -d $LOCAL $REMOTE [pull] rebase = merges From a3fab5a6bbafe0d1a85832dae5c242415e1176b7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 22:15:18 +0300 Subject: [PATCH 1262/2667] Fix git difftool --- home/.config/git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/git/config b/home/.config/git/config index fee6329b..adbfcaf3 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -31,7 +31,7 @@ tool = nvim-diff [difftool "nvim-diff"] - cmd = nvim -d -R + cmd = nvim -d $LOCAL $REMOTE [pull] rebase = merges From 221aa4b42ec05d46217e7b85ac0e22cea5ac51a4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 22:18:57 +0300 Subject: [PATCH 1263/2667] Nvim: use space as leader --- home/.config/nvim/lua/plugins/lspconfig.lua | 18 +++++++++--------- home/.config/nvim/lua/settings.lua | 3 +++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 4bc854a8..22732f25 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -50,27 +50,27 @@ function M.map_keys(server, bufnr) map_key('n', 'gi', 'lua vim.lsp.buf.implementation()', keymapOpts) map_key('n', '', 'lua vim.lsp.buf.signature_help()', keymapOpts) - map_key('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', + map_key('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', keymapOpts) - map_key('n', 'wr', + map_key('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', keymapOpts) - map_key('n', 'wl', + map_key('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', keymapOpts) - map_key('n', 'D', 'lua vim.lsp.buf.type_definition()', + map_key('n', 'D', 'lua vim.lsp.buf.type_definition()', keymapOpts) - map_key('n', 'rn', 'lua vim.lsp.buf.rename()', keymapOpts) - map_key('n', 'ca', 'lua vim.lsp.buf.code_action()', + map_key('n', 'rn', 'lua vim.lsp.buf.rename()', keymapOpts) + map_key('n', 'ca', 'lua vim.lsp.buf.code_action()', keymapOpts) map_key('n', 'gr', 'lua vim.lsp.buf.references()', keymapOpts) - map_key('n', 'e', + map_key('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', keymapOpts) map_key('n', '[d', 'lua vim.diagnostic.goto_prev()', keymapOpts) map_key('n', ']d', 'lua vim.diagnostic.goto_next()', keymapOpts) - map_key('n', 'q', 'lua vim.diagnostic.set_loclist()', + map_key('n', 'q', 'lua vim.diagnostic.set_loclist()', keymapOpts) - map_key('n', 'f', 'lua vim.lsp.buf.format()', keymapOpts) + map_key('n', 'f', 'lua vim.lsp.buf.format()', keymapOpts) end function M.setup() diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 3817c05a..461ada03 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -63,3 +63,6 @@ cmd 'filetype plugin indent on' -- Disable auto commenting o.formatoptions = 'cro' + +-- Set leader +g.mapleader = " " From 322128cc83d9cd77fa90f1bc2d0e8f02f6cfdc02 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 22:18:57 +0300 Subject: [PATCH 1264/2667] Nvim: use space as leader --- home/.config/nvim/lua/plugins/lspconfig.lua | 18 +++++++++--------- home/.config/nvim/lua/settings.lua | 3 +++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 4bc854a8..22732f25 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -50,27 +50,27 @@ function M.map_keys(server, bufnr) map_key('n', 'gi', 'lua vim.lsp.buf.implementation()', keymapOpts) map_key('n', '', 'lua vim.lsp.buf.signature_help()', keymapOpts) - map_key('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', + map_key('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', keymapOpts) - map_key('n', 'wr', + map_key('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', keymapOpts) - map_key('n', 'wl', + map_key('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', keymapOpts) - map_key('n', 'D', 'lua vim.lsp.buf.type_definition()', + map_key('n', 'D', 'lua vim.lsp.buf.type_definition()', keymapOpts) - map_key('n', 'rn', 'lua vim.lsp.buf.rename()', keymapOpts) - map_key('n', 'ca', 'lua vim.lsp.buf.code_action()', + map_key('n', 'rn', 'lua vim.lsp.buf.rename()', keymapOpts) + map_key('n', 'ca', 'lua vim.lsp.buf.code_action()', keymapOpts) map_key('n', 'gr', 'lua vim.lsp.buf.references()', keymapOpts) - map_key('n', 'e', + map_key('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', keymapOpts) map_key('n', '[d', 'lua vim.diagnostic.goto_prev()', keymapOpts) map_key('n', ']d', 'lua vim.diagnostic.goto_next()', keymapOpts) - map_key('n', 'q', 'lua vim.diagnostic.set_loclist()', + map_key('n', 'q', 'lua vim.diagnostic.set_loclist()', keymapOpts) - map_key('n', 'f', 'lua vim.lsp.buf.format()', keymapOpts) + map_key('n', 'f', 'lua vim.lsp.buf.format()', keymapOpts) end function M.setup() diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 3817c05a..461ada03 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -63,3 +63,6 @@ cmd 'filetype plugin indent on' -- Disable auto commenting o.formatoptions = 'cro' + +-- Set leader +g.mapleader = " " From 131e4608e778478961706d7d80f4d808ce7f4a42 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 22:38:49 +0300 Subject: [PATCH 1265/2667] Remove leftover files --- home/.config/nvim/src/main/java/com/example/Greeter.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 home/.config/nvim/src/main/java/com/example/Greeter.java diff --git a/home/.config/nvim/src/main/java/com/example/Greeter.java b/home/.config/nvim/src/main/java/com/example/Greeter.java deleted file mode 100644 index e69de29b..00000000 From c2d846dd29957535a7889ddccd905945e6d7a3c5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 22:38:49 +0300 Subject: [PATCH 1266/2667] Remove leftover files --- home/.config/nvim/src/main/java/com/example/Greeter.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 home/.config/nvim/src/main/java/com/example/Greeter.java diff --git a/home/.config/nvim/src/main/java/com/example/Greeter.java b/home/.config/nvim/src/main/java/com/example/Greeter.java deleted file mode 100644 index e69de29b..00000000 From 4d94052d7086105b5f745540618c9f6e4a7c38db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 00:01:06 +0300 Subject: [PATCH 1267/2667] Nvim: convert keymaps to vim.keymap.set and/or which-key.register --- home/.config/nvim/init.lua | 1 - home/.config/nvim/lua/common.lua | 5 -- home/.config/nvim/lua/keybinds.lua | 26 +++--- home/.config/nvim/lua/pager.lua | 5 +- home/.config/nvim/lua/plugins/lspconfig.lua | 92 ++++++++++----------- 5 files changed, 58 insertions(+), 71 deletions(-) delete mode 100644 home/.config/nvim/lua/common.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 4d31e835..d72504f4 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,5 +1,4 @@ require 'autocmd' require 'keybinds' require 'settings' -require 'common' require 'plugins/init' diff --git a/home/.config/nvim/lua/common.lua b/home/.config/nvim/lua/common.lua deleted file mode 100644 index 6a974d57..00000000 --- a/home/.config/nvim/lua/common.lua +++ /dev/null @@ -1,5 +0,0 @@ -function MapKey(mode, keybind, command, opts) - local options = {noremap = true} - if opts then options = vim.tbl_extend('force', options, opts) end - vim.api.nvim_set_keymap(mode, keybind, command, options) -end diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index c4102123..44332336 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -1,26 +1,26 @@ -require 'common' +local map = vim.keymap.set -- Open/close tree browser -MapKey('n', '', 'NvimTreeToggle') +map('n', '', 'NvimTreeToggle') -- Telescope -MapKey('n', '', 'Telescope find_files find_command=fd,-Ht,f') -MapKey('n', '', 'Telescope live_grep') +map('n', '', 'Telescope find_files find_command=fd,-Ht,f') +map('n', '', 'Telescope live_grep') -- Completion -- Navigate completions with tab and shift tab -MapKey('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) -MapKey('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) +map('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) +map('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) -- Navigate between buffers -MapKey('n', '', ':bn', {silent = true}) -MapKey('n', '', ':bp', {silent = true}) +map('n', '', ':bn', {silent = true}) +map('n', '', ':bp', {silent = true}) -- Navigate between splits -MapKey('n', '', '') -MapKey('n', '', '') -MapKey('n', '', '') -MapKey('n', '', '') +map('n', '', '') +map('n', '', '') +map('n', '', '') +map('n', '', '') -- Run Neoformat -MapKey('n', '', 'Neoformat') +map('n', '', 'Neoformat') diff --git a/home/.config/nvim/lua/pager.lua b/home/.config/nvim/lua/pager.lua index 1a8c91fb..56417452 100644 --- a/home/.config/nvim/lua/pager.lua +++ b/home/.config/nvim/lua/pager.lua @@ -1,5 +1,2 @@ -- Settings for pager mode -require 'common' - -MapKey('n', 'q', 'q') --- vim.cmd('set nomodifiable') +vim.keymap.set('n', 'q', vim.cmd.q) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 22732f25..afda4142 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -12,9 +12,7 @@ Servers = { Lua = { runtime = { -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = 'LuaJIT', - -- Setup your lua path - path = vim.split(package.path, ';') + version = 'LuaJIT' }, diagnostics = { -- Get the language server to recognize the `vim` global @@ -32,67 +30,65 @@ Servers = { M = {} -function M.map_keys(server, bufnr) - local function map_key(...) - -- Map to buffer if buffer number is supplied, - -- globally otherwise - if bufnr == nil then - vim.api.nvim_set_keymap(...) - else - vim.api.nvim_buf_set_keymap(bufnr, ...) - end - end +function M.map_keys() + -- Register keybindings via which-key + -- to get documentation in which-key + local wk = require('which-key') + wk.register({ + g = { + name = "Go to", + d = {vim.lsp.buf.definition, "Definition"}, + D = {vim.lsp.buf.declaration, "Declaration"}, + i = {vim.lsp.buf.implementation, "Implementation"}, + r = {vim.lsp.buf.references, "References"} + }, + [''] = { + name = "Leader", + w = { + name = "Workspace", + a = {vim.lsp.buf.add_workspace_folder, "Add folder"}, + r = {vim.lsp.buf.remove_workspace_folder, "Remove folder"}, + l = { + function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, "List folders" + } + }, + D = {vim.lsp.buf.type_definition, "Type definition"}, + rn = {vim.lsp.buf.rename, "Rename symbol"}, + ca = {vim.lsp.buf.code_action, "Code action"}, + e = {vim.diagnostic.open_float, "Open diagnostics"}, + f = {vim.lsp.buf.format, "Format"} + }, + K = {vim.lsp.buf.hover, "Hover"}, + ['['] = {d = {vim.diagnostic.goto_prev, "Previous diagnostic"}}, + [']'] = {d = {vim.diagnostic.goto_next, "Next diagnostic"}} - local keymapOpts = {noremap = true, silent = true} - map_key('n', 'gD', 'lua vim.lsp.buf.declaration()', keymapOpts) - map_key('n', 'gd', 'lua vim.lsp.buf.definition()', keymapOpts) - map_key('n', 'K', 'lua vim.lsp.buf.hover()', keymapOpts) - map_key('n', 'gi', 'lua vim.lsp.buf.implementation()', keymapOpts) - map_key('n', '', 'lua vim.lsp.buf.signature_help()', - keymapOpts) - map_key('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', - keymapOpts) - map_key('n', 'wr', - 'lua vim.lsp.buf.remove_workspace_folder()', keymapOpts) - map_key('n', 'wl', - 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', - keymapOpts) - map_key('n', 'D', 'lua vim.lsp.buf.type_definition()', - keymapOpts) - map_key('n', 'rn', 'lua vim.lsp.buf.rename()', keymapOpts) - map_key('n', 'ca', 'lua vim.lsp.buf.code_action()', - keymapOpts) - map_key('n', 'gr', 'lua vim.lsp.buf.references()', keymapOpts) - map_key('n', 'e', - 'lua vim.lsp.diagnostic.show_line_diagnostics()', - keymapOpts) - map_key('n', '[d', 'lua vim.diagnostic.goto_prev()', keymapOpts) - map_key('n', ']d', 'lua vim.diagnostic.goto_next()', keymapOpts) - map_key('n', 'q', 'lua vim.diagnostic.set_loclist()', - keymapOpts) - map_key('n', 'f', 'lua vim.lsp.buf.format()', keymapOpts) + }) end function M.setup() - local function on_attach(server, bufnr) + local function on_attach() -- Setup lsp signature plugin require('lsp_signature').setup {} -- Setup keybinds - M.map_keys(server, bufnr) + M.map_keys() end + -- Update capabilities + local capabilities = vim.lsp.protocol.make_client_capabilities() + capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) + -- Setup every defined server for server, settings in pairs(Servers) do require('lspconfig')[server].setup { on_attach = on_attach, settings = settings, - -- Updates capabilities to cmp.nvim and - -- informs the server about the client capabilities - capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp - .protocol - .make_client_capabilities()) + -- Inform lsp server about client + -- capabilities + capabilities = capabilities } end end From 493660374d69f3ead6523fc1ff866a55b243e562 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 00:01:06 +0300 Subject: [PATCH 1268/2667] Nvim: convert keymaps to vim.keymap.set and/or which-key.register --- home/.config/nvim/init.lua | 1 - home/.config/nvim/lua/common.lua | 5 -- home/.config/nvim/lua/keybinds.lua | 26 +++--- home/.config/nvim/lua/pager.lua | 5 +- home/.config/nvim/lua/plugins/lspconfig.lua | 92 ++++++++++----------- 5 files changed, 58 insertions(+), 71 deletions(-) delete mode 100644 home/.config/nvim/lua/common.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 4d31e835..d72504f4 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,5 +1,4 @@ require 'autocmd' require 'keybinds' require 'settings' -require 'common' require 'plugins/init' diff --git a/home/.config/nvim/lua/common.lua b/home/.config/nvim/lua/common.lua deleted file mode 100644 index 6a974d57..00000000 --- a/home/.config/nvim/lua/common.lua +++ /dev/null @@ -1,5 +0,0 @@ -function MapKey(mode, keybind, command, opts) - local options = {noremap = true} - if opts then options = vim.tbl_extend('force', options, opts) end - vim.api.nvim_set_keymap(mode, keybind, command, options) -end diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index c4102123..44332336 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -1,26 +1,26 @@ -require 'common' +local map = vim.keymap.set -- Open/close tree browser -MapKey('n', '', 'NvimTreeToggle') +map('n', '', 'NvimTreeToggle') -- Telescope -MapKey('n', '', 'Telescope find_files find_command=fd,-Ht,f') -MapKey('n', '', 'Telescope live_grep') +map('n', '', 'Telescope find_files find_command=fd,-Ht,f') +map('n', '', 'Telescope live_grep') -- Completion -- Navigate completions with tab and shift tab -MapKey('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) -MapKey('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) +map('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) +map('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) -- Navigate between buffers -MapKey('n', '', ':bn', {silent = true}) -MapKey('n', '', ':bp', {silent = true}) +map('n', '', ':bn', {silent = true}) +map('n', '', ':bp', {silent = true}) -- Navigate between splits -MapKey('n', '', '') -MapKey('n', '', '') -MapKey('n', '', '') -MapKey('n', '', '') +map('n', '', '') +map('n', '', '') +map('n', '', '') +map('n', '', '') -- Run Neoformat -MapKey('n', '', 'Neoformat') +map('n', '', 'Neoformat') diff --git a/home/.config/nvim/lua/pager.lua b/home/.config/nvim/lua/pager.lua index 1a8c91fb..56417452 100644 --- a/home/.config/nvim/lua/pager.lua +++ b/home/.config/nvim/lua/pager.lua @@ -1,5 +1,2 @@ -- Settings for pager mode -require 'common' - -MapKey('n', 'q', 'q') --- vim.cmd('set nomodifiable') +vim.keymap.set('n', 'q', vim.cmd.q) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 22732f25..afda4142 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -12,9 +12,7 @@ Servers = { Lua = { runtime = { -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = 'LuaJIT', - -- Setup your lua path - path = vim.split(package.path, ';') + version = 'LuaJIT' }, diagnostics = { -- Get the language server to recognize the `vim` global @@ -32,67 +30,65 @@ Servers = { M = {} -function M.map_keys(server, bufnr) - local function map_key(...) - -- Map to buffer if buffer number is supplied, - -- globally otherwise - if bufnr == nil then - vim.api.nvim_set_keymap(...) - else - vim.api.nvim_buf_set_keymap(bufnr, ...) - end - end +function M.map_keys() + -- Register keybindings via which-key + -- to get documentation in which-key + local wk = require('which-key') + wk.register({ + g = { + name = "Go to", + d = {vim.lsp.buf.definition, "Definition"}, + D = {vim.lsp.buf.declaration, "Declaration"}, + i = {vim.lsp.buf.implementation, "Implementation"}, + r = {vim.lsp.buf.references, "References"} + }, + [''] = { + name = "Leader", + w = { + name = "Workspace", + a = {vim.lsp.buf.add_workspace_folder, "Add folder"}, + r = {vim.lsp.buf.remove_workspace_folder, "Remove folder"}, + l = { + function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, "List folders" + } + }, + D = {vim.lsp.buf.type_definition, "Type definition"}, + rn = {vim.lsp.buf.rename, "Rename symbol"}, + ca = {vim.lsp.buf.code_action, "Code action"}, + e = {vim.diagnostic.open_float, "Open diagnostics"}, + f = {vim.lsp.buf.format, "Format"} + }, + K = {vim.lsp.buf.hover, "Hover"}, + ['['] = {d = {vim.diagnostic.goto_prev, "Previous diagnostic"}}, + [']'] = {d = {vim.diagnostic.goto_next, "Next diagnostic"}} - local keymapOpts = {noremap = true, silent = true} - map_key('n', 'gD', 'lua vim.lsp.buf.declaration()', keymapOpts) - map_key('n', 'gd', 'lua vim.lsp.buf.definition()', keymapOpts) - map_key('n', 'K', 'lua vim.lsp.buf.hover()', keymapOpts) - map_key('n', 'gi', 'lua vim.lsp.buf.implementation()', keymapOpts) - map_key('n', '', 'lua vim.lsp.buf.signature_help()', - keymapOpts) - map_key('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', - keymapOpts) - map_key('n', 'wr', - 'lua vim.lsp.buf.remove_workspace_folder()', keymapOpts) - map_key('n', 'wl', - 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', - keymapOpts) - map_key('n', 'D', 'lua vim.lsp.buf.type_definition()', - keymapOpts) - map_key('n', 'rn', 'lua vim.lsp.buf.rename()', keymapOpts) - map_key('n', 'ca', 'lua vim.lsp.buf.code_action()', - keymapOpts) - map_key('n', 'gr', 'lua vim.lsp.buf.references()', keymapOpts) - map_key('n', 'e', - 'lua vim.lsp.diagnostic.show_line_diagnostics()', - keymapOpts) - map_key('n', '[d', 'lua vim.diagnostic.goto_prev()', keymapOpts) - map_key('n', ']d', 'lua vim.diagnostic.goto_next()', keymapOpts) - map_key('n', 'q', 'lua vim.diagnostic.set_loclist()', - keymapOpts) - map_key('n', 'f', 'lua vim.lsp.buf.format()', keymapOpts) + }) end function M.setup() - local function on_attach(server, bufnr) + local function on_attach() -- Setup lsp signature plugin require('lsp_signature').setup {} -- Setup keybinds - M.map_keys(server, bufnr) + M.map_keys() end + -- Update capabilities + local capabilities = vim.lsp.protocol.make_client_capabilities() + capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) + -- Setup every defined server for server, settings in pairs(Servers) do require('lspconfig')[server].setup { on_attach = on_attach, settings = settings, - -- Updates capabilities to cmp.nvim and - -- informs the server about the client capabilities - capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp - .protocol - .make_client_capabilities()) + -- Inform lsp server about client + -- capabilities + capabilities = capabilities } end end From 21284ab10d41f3064dcce3a0568acf531172d161 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 00:38:10 +0300 Subject: [PATCH 1269/2667] Refine some more keybinds to new format and rework Telescope config --- home/.config/nvim/init.lua | 1 - home/.config/nvim/lua/autocmd.lua | 7 ------- home/.config/nvim/lua/keybinds.lua | 21 ++++++++------------- home/.config/nvim/lua/plugins/telescope.lua | 12 +++++++++++- 4 files changed, 19 insertions(+), 22 deletions(-) delete mode 100644 home/.config/nvim/lua/autocmd.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index d72504f4..71af250d 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,4 +1,3 @@ -require 'autocmd' require 'keybinds' require 'settings' require 'plugins/init' diff --git a/home/.config/nvim/lua/autocmd.lua b/home/.config/nvim/lua/autocmd.lua deleted file mode 100644 index 00a0940c..00000000 --- a/home/.config/nvim/lua/autocmd.lua +++ /dev/null @@ -1,7 +0,0 @@ -local cmd = vim.cmd - --- Remap exit terminal mode to esc -cmd('au TermOpen * tnoremap ') - --- Fix YAML indentation -cmd('au FileType yaml setlocal ts=2 sts=2 sw=2 expandtab') diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index 44332336..db8f9066 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -1,20 +1,12 @@ local map = vim.keymap.set --- Open/close tree browser -map('n', '', 'NvimTreeToggle') - -- Telescope -map('n', '', 'Telescope find_files find_command=fd,-Ht,f') -map('n', '', 'Telescope live_grep') - --- Completion --- Navigate completions with tab and shift tab -map('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) -map('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) +--map('n', '', 'Telescope find_files find_command=fd,-Ht,f') +--map('n', '', 'Telescope live_grep') -- Navigate between buffers -map('n', '', ':bn', {silent = true}) -map('n', '', ':bp', {silent = true}) +map('n', '', vim.cmd.bn, {silent = true}) +map('n', '', vim.cmd.bp, {silent = true}) -- Navigate between splits map('n', '', '') @@ -23,4 +15,7 @@ map('n', '', '') map('n', '', '') -- Run Neoformat -map('n', '', 'Neoformat') +map('n', '', vim.cmd.Neoformat) + +-- Exit terminal insert mode with esc +map('t', '', '') diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 3d889de5..8eb39a13 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,6 +1,16 @@ return function() local telescope = require('telescope') - telescope.setup {} + local builtin = require('telescope.builtin') + + telescope.setup { + pickers = {find_files = {find_command = {"fd", "-Ht", "f"}}} + } + telescope.load_extension('fzf') telescope.load_extension('ui-select') + + -- Keybinds + vim.keymap.set('n', '', vim.cmd.Telescope) + vim.keymap.set('n', '', builtin.find_files) + vim.keymap.set('n', '', builtin.live_grep) end From 09e109164a605eec3d0bdcba2b9817db00383f71 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 00:38:10 +0300 Subject: [PATCH 1270/2667] Refine some more keybinds to new format and rework Telescope config --- home/.config/nvim/init.lua | 1 - home/.config/nvim/lua/autocmd.lua | 7 ------- home/.config/nvim/lua/keybinds.lua | 21 ++++++++------------- home/.config/nvim/lua/plugins/telescope.lua | 12 +++++++++++- 4 files changed, 19 insertions(+), 22 deletions(-) delete mode 100644 home/.config/nvim/lua/autocmd.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index d72504f4..71af250d 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,4 +1,3 @@ -require 'autocmd' require 'keybinds' require 'settings' require 'plugins/init' diff --git a/home/.config/nvim/lua/autocmd.lua b/home/.config/nvim/lua/autocmd.lua deleted file mode 100644 index 00a0940c..00000000 --- a/home/.config/nvim/lua/autocmd.lua +++ /dev/null @@ -1,7 +0,0 @@ -local cmd = vim.cmd - --- Remap exit terminal mode to esc -cmd('au TermOpen * tnoremap ') - --- Fix YAML indentation -cmd('au FileType yaml setlocal ts=2 sts=2 sw=2 expandtab') diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index 44332336..db8f9066 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -1,20 +1,12 @@ local map = vim.keymap.set --- Open/close tree browser -map('n', '', 'NvimTreeToggle') - -- Telescope -map('n', '', 'Telescope find_files find_command=fd,-Ht,f') -map('n', '', 'Telescope live_grep') - --- Completion --- Navigate completions with tab and shift tab -map('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) -map('i', '', 'pumvisible() ? "\\" : "\\"', {expr = true}) +--map('n', '', 'Telescope find_files find_command=fd,-Ht,f') +--map('n', '', 'Telescope live_grep') -- Navigate between buffers -map('n', '', ':bn', {silent = true}) -map('n', '', ':bp', {silent = true}) +map('n', '', vim.cmd.bn, {silent = true}) +map('n', '', vim.cmd.bp, {silent = true}) -- Navigate between splits map('n', '', '') @@ -23,4 +15,7 @@ map('n', '', '') map('n', '', '') -- Run Neoformat -map('n', '', 'Neoformat') +map('n', '', vim.cmd.Neoformat) + +-- Exit terminal insert mode with esc +map('t', '', '') diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 3d889de5..8eb39a13 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,6 +1,16 @@ return function() local telescope = require('telescope') - telescope.setup {} + local builtin = require('telescope.builtin') + + telescope.setup { + pickers = {find_files = {find_command = {"fd", "-Ht", "f"}}} + } + telescope.load_extension('fzf') telescope.load_extension('ui-select') + + -- Keybinds + vim.keymap.set('n', '', vim.cmd.Telescope) + vim.keymap.set('n', '', builtin.find_files) + vim.keymap.set('n', '', builtin.live_grep) end From c707c17f4b6f5d70cba9ca54689fcbc6d5288770 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 12:07:21 +0300 Subject: [PATCH 1271/2667] Add nvimtree configuration --- home/.config/nvim/lua/plugins/init.lua | 2 +- home/.config/nvim/lua/plugins/nvim-tree.lua | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 home/.config/nvim/lua/plugins/nvim-tree.lua diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 449f0591..f8cfe1d7 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -61,7 +61,7 @@ require('packer').startup(function() use { 'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons', - config = function() require('nvim-tree').setup {} end + config = require('plugins.nvim-tree') } -- Telescope diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua new file mode 100644 index 00000000..a3826292 --- /dev/null +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -0,0 +1,13 @@ +return function() + require("nvim-tree").setup { -- BEGIN_DEFAULT_OPTS + diagnostics = { + enable = true, + show_on_dirs = true, + }, + renderer = { + highlight_git = true + } + } + -- Open/close with alt-o + vim.keymap.set('n', '', vim.cmd.NvimTreeToggle) +end From 8d9d84eb7f5502032d6041c1db9c8d51c705464d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 12:07:21 +0300 Subject: [PATCH 1272/2667] Add nvimtree configuration --- home/.config/nvim/lua/plugins/init.lua | 2 +- home/.config/nvim/lua/plugins/nvim-tree.lua | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 home/.config/nvim/lua/plugins/nvim-tree.lua diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 449f0591..f8cfe1d7 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -61,7 +61,7 @@ require('packer').startup(function() use { 'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons', - config = function() require('nvim-tree').setup {} end + config = require('plugins.nvim-tree') } -- Telescope diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua new file mode 100644 index 00000000..a3826292 --- /dev/null +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -0,0 +1,13 @@ +return function() + require("nvim-tree").setup { -- BEGIN_DEFAULT_OPTS + diagnostics = { + enable = true, + show_on_dirs = true, + }, + renderer = { + highlight_git = true + } + } + -- Open/close with alt-o + vim.keymap.set('n', '', vim.cmd.NvimTreeToggle) +end From be298427f60362023c1b959176fb4d734000537b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 12:09:31 +0300 Subject: [PATCH 1273/2667] Format beets config --- home/.config/beets/config.yaml | 38 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml index d8045100..ce34ff6e 100644 --- a/home/.config/beets/config.yaml +++ b/home/.config/beets/config.yaml @@ -1,21 +1,21 @@ directory: ~/Music library: ~/Music/beets.db -plugins: -- acousticbrainz -- check -- edit -- fetchart -- follow -- fuzzy -- info -- lastgenre -- lyrics -- mbcollection -- mpdupdate -- play -- replaygain -- thumbnails -- web +plugins: + - acousticbrainz + - check + - edit + - fetchart + - follow + - fuzzy + - info + - lastgenre + - lyrics + - mbcollection + - mpdupdate + - play + - replaygain + - thumbnails + - web import: copy: no move: yes @@ -23,12 +23,12 @@ import: lastgenre: whitelist: ~/.config/beets/whitelist lyrics: - fallback: '' + fallback: "" play: command: mpv mpd: - host: localhost - port: 6600 + host: localhost + port: 6600 follow: email: reekymarko@reekynet.com password: "{{@@ env['PASS_MUSPY'] @@}}" From bb0aab93bab5406d7b5b21eaa379501baed292e7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 12:09:31 +0300 Subject: [PATCH 1274/2667] Format beets config --- home/.config/beets/config.yaml | 38 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml index d8045100..ce34ff6e 100644 --- a/home/.config/beets/config.yaml +++ b/home/.config/beets/config.yaml @@ -1,21 +1,21 @@ directory: ~/Music library: ~/Music/beets.db -plugins: -- acousticbrainz -- check -- edit -- fetchart -- follow -- fuzzy -- info -- lastgenre -- lyrics -- mbcollection -- mpdupdate -- play -- replaygain -- thumbnails -- web +plugins: + - acousticbrainz + - check + - edit + - fetchart + - follow + - fuzzy + - info + - lastgenre + - lyrics + - mbcollection + - mpdupdate + - play + - replaygain + - thumbnails + - web import: copy: no move: yes @@ -23,12 +23,12 @@ import: lastgenre: whitelist: ~/.config/beets/whitelist lyrics: - fallback: '' + fallback: "" play: command: mpv mpd: - host: localhost - port: 6600 + host: localhost + port: 6600 follow: email: reekymarko@reekynet.com password: "{{@@ env['PASS_MUSPY'] @@}}" From 02d7ce5a94d19221327d5f2dbddff749b14adba5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 12:09:50 +0300 Subject: [PATCH 1275/2667] Add nvim dashboard --- home/.config/nvim/lua/plugins/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index f8cfe1d7..d1b0837d 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -28,6 +28,9 @@ require('packer').startup(function() config = require('plugins.colorscheme') } + -- Startup screen/dashboard + use 'glepnir/dashboard-nvim' + -- Git in signcolumn use 'airblade/vim-gitgutter' From 96d05236ed67ab5f4ccae86028e1dc7afa0328c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 12:09:50 +0300 Subject: [PATCH 1276/2667] Add nvim dashboard --- home/.config/nvim/lua/plugins/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index f8cfe1d7..d1b0837d 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -28,6 +28,9 @@ require('packer').startup(function() config = require('plugins.colorscheme') } + -- Startup screen/dashboard + use 'glepnir/dashboard-nvim' + -- Git in signcolumn use 'airblade/vim-gitgutter' From 3841481c7967a6d8573bef25f34e8e130676f156 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 12:09:59 +0300 Subject: [PATCH 1277/2667] Fix jdtls map_keys call --- home/.config/nvim/ftplugin/java.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 4cbe0d6f..6e1cb17d 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -18,4 +18,4 @@ require('jdtls').start_or_attach({ } }) -require('plugins.lspconfig').map_keys('jdtls', nil) +require('plugins.lspconfig').map_keys() From 302d6ba9203080b1da89f317af84a2dc34d7ef5e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 12:09:59 +0300 Subject: [PATCH 1278/2667] Fix jdtls map_keys call --- home/.config/nvim/ftplugin/java.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 4cbe0d6f..6e1cb17d 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -18,4 +18,4 @@ require('jdtls').start_or_attach({ } }) -require('plugins.lspconfig').map_keys('jdtls', nil) +require('plugins.lspconfig').map_keys() From 9e8435ba990a278034257f617efa162c5781f5b8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Aug 2022 10:42:06 +0300 Subject: [PATCH 1279/2667] Nvim: improve packer setup --- home/.config/nvim/lua/plugins/init.lua | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index d1b0837d..73506773 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -1,25 +1,23 @@ local fn = vim.fn -- Install packer if it's not yet installed -local install_path = fn.stdpath('data') .. '/site/pack/packer/opt/packer.nvim' +local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim' if fn.empty(fn.glob(install_path)) > 0 then print('Installing Packer') - Packer_installed = fn.system({ + Packer_bootstrap = fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path }) - vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. - vim.o.runtimepath + vim.cmd [[packadd packer.nvim]] print('Installed Packer') end -- Configure packer -vim.cmd [[packadd packer.nvim]] require('packer').startup(function() local use = require('packer').use -- The plugin manager itself - use {'wbthomason/packer.nvim', opt = true} + use {'wbthomason/packer.nvim'} -- Colorscheme use { @@ -174,6 +172,12 @@ require('packer').startup(function() -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' + -- If Packer was just installed, + -- sync plugins + if Packer_bootstrap then + require('packer').sync() + end + end) -- Sync plugins if Packer was just From 797755d32370005c292bdeb106d10c74c55f9e3f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Aug 2022 10:42:06 +0300 Subject: [PATCH 1280/2667] Nvim: improve packer setup --- home/.config/nvim/lua/plugins/init.lua | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index d1b0837d..73506773 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -1,25 +1,23 @@ local fn = vim.fn -- Install packer if it's not yet installed -local install_path = fn.stdpath('data') .. '/site/pack/packer/opt/packer.nvim' +local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim' if fn.empty(fn.glob(install_path)) > 0 then print('Installing Packer') - Packer_installed = fn.system({ + Packer_bootstrap = fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path }) - vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. - vim.o.runtimepath + vim.cmd [[packadd packer.nvim]] print('Installed Packer') end -- Configure packer -vim.cmd [[packadd packer.nvim]] require('packer').startup(function() local use = require('packer').use -- The plugin manager itself - use {'wbthomason/packer.nvim', opt = true} + use {'wbthomason/packer.nvim'} -- Colorscheme use { @@ -174,6 +172,12 @@ require('packer').startup(function() -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' + -- If Packer was just installed, + -- sync plugins + if Packer_bootstrap then + require('packer').sync() + end + end) -- Sync plugins if Packer was just From 471e12b5aca60331ccbc414930e75c902f5a1848 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Aug 2022 21:36:22 +0300 Subject: [PATCH 1281/2667] Dotdrop: Use single directory for neovim config --- config.toml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/config.toml b/config.toml index e095540f..7a6c171b 100644 --- a/config.toml +++ b/config.toml @@ -30,19 +30,11 @@ src = ".config/neomutt" dst = "~/.config/imapnotify" src = ".config/imapnotify" -[dotfiles.f_nvim_init] -dst = "~/.config/nvim/init.lua" -src = ".config/nvim/init.lua" - -[dotfiles.d_nvim_lua] +[dotfiles.d_nvim] actions = ["nvim-packer-sync"] -dst = "~/.config/nvim/lua" +dst = "~/.config/nvim" src = ".config/nvim/lua" -[dotfiles.d_nvim_ftplugin] -dst = "~/.config/nvim/ftplugin" -src = ".config/nvim/ftplugin" - [dotfiles.d_sway] dst = "~/.config/sway" src = ".config/sway" @@ -249,8 +241,7 @@ os = "termux" [profiles.terminal] dotfiles = [ - "d_nvim_ftplugin", - "d_nvim_lua", + "d_nvim", "d_zsh", "f_alacritty.yml", "f_authorized_keys", @@ -258,7 +249,6 @@ dotfiles = [ "f_hushlogin", "f_ignore", "f_mailcap", - "f_nvim_init", "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", From 9897f2c331b510a6195ae60f95c1b82bd51f35f4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Aug 2022 21:36:22 +0300 Subject: [PATCH 1282/2667] Dotdrop: Use single directory for neovim config --- config.toml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/config.toml b/config.toml index e095540f..7a6c171b 100644 --- a/config.toml +++ b/config.toml @@ -30,19 +30,11 @@ src = ".config/neomutt" dst = "~/.config/imapnotify" src = ".config/imapnotify" -[dotfiles.f_nvim_init] -dst = "~/.config/nvim/init.lua" -src = ".config/nvim/init.lua" - -[dotfiles.d_nvim_lua] +[dotfiles.d_nvim] actions = ["nvim-packer-sync"] -dst = "~/.config/nvim/lua" +dst = "~/.config/nvim" src = ".config/nvim/lua" -[dotfiles.d_nvim_ftplugin] -dst = "~/.config/nvim/ftplugin" -src = ".config/nvim/ftplugin" - [dotfiles.d_sway] dst = "~/.config/sway" src = ".config/sway" @@ -249,8 +241,7 @@ os = "termux" [profiles.terminal] dotfiles = [ - "d_nvim_ftplugin", - "d_nvim_lua", + "d_nvim", "d_zsh", "f_alacritty.yml", "f_authorized_keys", @@ -258,7 +249,6 @@ dotfiles = [ "f_hushlogin", "f_ignore", "f_mailcap", - "f_nvim_init", "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", From d31a750c98a1138d17b5168d923d8b8113c2811e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Aug 2022 13:09:51 +0300 Subject: [PATCH 1283/2667] Fix plugin load order with LSP plugins --- home/.config/nvim/lua/plugins/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 73506773..8d1ffbda 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -96,14 +96,14 @@ require('packer').startup(function() config = function() require('mason').setup {} end } use { - 'williamboman/mason-lspconfig.nvim', + 'williamboman/mason-lspconfig.nvim', after = 'mason', config = function() require('mason-lspconfig').setup {automatic_installation = true} end } -- Configs for built-in LSP - use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup} + use {'neovim/nvim-lspconfig', after = 'mason-lspconfig', config = require('plugins.lspconfig').setup} -- Additional LSP features for Java use 'mfussenegger/nvim-jdtls' From a21f410dcd6a6d237e2b838370c309a4e3a85491 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Aug 2022 13:09:51 +0300 Subject: [PATCH 1284/2667] Fix plugin load order with LSP plugins --- home/.config/nvim/lua/plugins/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 73506773..8d1ffbda 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -96,14 +96,14 @@ require('packer').startup(function() config = function() require('mason').setup {} end } use { - 'williamboman/mason-lspconfig.nvim', + 'williamboman/mason-lspconfig.nvim', after = 'mason', config = function() require('mason-lspconfig').setup {automatic_installation = true} end } -- Configs for built-in LSP - use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup} + use {'neovim/nvim-lspconfig', after = 'mason-lspconfig', config = require('plugins.lspconfig').setup} -- Additional LSP features for Java use 'mfussenegger/nvim-jdtls' From 646604d44de7ae600ff45e49e8bcff4190a8136c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Aug 2022 13:10:03 +0300 Subject: [PATCH 1285/2667] Add taplo LSP --- home/.config/nvim/lua/plugins/lspconfig.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index afda4142..54937ca3 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -7,6 +7,7 @@ Servers = { lemminx = {}, marksman = {}, yamlls = {}, + taplo = {}, tsserver = {}, sumneko_lua = { Lua = { From 20bc67ba4f8718bff2a6819f00a45955fe85a6de Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Aug 2022 13:10:03 +0300 Subject: [PATCH 1286/2667] Add taplo LSP --- home/.config/nvim/lua/plugins/lspconfig.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index afda4142..54937ca3 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -7,6 +7,7 @@ Servers = { lemminx = {}, marksman = {}, yamlls = {}, + taplo = {}, tsserver = {}, sumneko_lua = { Lua = { From b6839e69b9714d916b031dc436fe3615ecccc606 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Aug 2022 13:21:42 +0300 Subject: [PATCH 1287/2667] Revert "Fix plugin load order with LSP plugins" This reverts commit d31a750c98a1138d17b5168d923d8b8113c2811e. --- home/.config/nvim/lua/plugins/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 8d1ffbda..73506773 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -96,14 +96,14 @@ require('packer').startup(function() config = function() require('mason').setup {} end } use { - 'williamboman/mason-lspconfig.nvim', after = 'mason', + 'williamboman/mason-lspconfig.nvim', config = function() require('mason-lspconfig').setup {automatic_installation = true} end } -- Configs for built-in LSP - use {'neovim/nvim-lspconfig', after = 'mason-lspconfig', config = require('plugins.lspconfig').setup} + use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup} -- Additional LSP features for Java use 'mfussenegger/nvim-jdtls' From 3e8a76600da50fb38d36ab89c82fb644c29df2d2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Aug 2022 13:21:42 +0300 Subject: [PATCH 1288/2667] Revert "Fix plugin load order with LSP plugins" This reverts commit a21f410dcd6a6d237e2b838370c309a4e3a85491. --- home/.config/nvim/lua/plugins/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 8d1ffbda..73506773 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -96,14 +96,14 @@ require('packer').startup(function() config = function() require('mason').setup {} end } use { - 'williamboman/mason-lspconfig.nvim', after = 'mason', + 'williamboman/mason-lspconfig.nvim', config = function() require('mason-lspconfig').setup {automatic_installation = true} end } -- Configs for built-in LSP - use {'neovim/nvim-lspconfig', after = 'mason-lspconfig', config = require('plugins.lspconfig').setup} + use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup} -- Additional LSP features for Java use 'mfussenegger/nvim-jdtls' From 85044c2b684e666a62b012a2e091a808b1479501 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Aug 2022 13:23:27 +0300 Subject: [PATCH 1289/2667] Fix nvim config path --- config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.toml b/config.toml index 7a6c171b..893dfee1 100644 --- a/config.toml +++ b/config.toml @@ -33,7 +33,7 @@ src = ".config/imapnotify" [dotfiles.d_nvim] actions = ["nvim-packer-sync"] dst = "~/.config/nvim" -src = ".config/nvim/lua" +src = ".config/nvim" [dotfiles.d_sway] dst = "~/.config/sway" From 5d8b849ee2cda3c67719600a4a59c0b0d1f79e6e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Aug 2022 13:23:27 +0300 Subject: [PATCH 1290/2667] Fix nvim config path --- config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.toml b/config.toml index 7a6c171b..893dfee1 100644 --- a/config.toml +++ b/config.toml @@ -33,7 +33,7 @@ src = ".config/imapnotify" [dotfiles.d_nvim] actions = ["nvim-packer-sync"] dst = "~/.config/nvim" -src = ".config/nvim/lua" +src = ".config/nvim" [dotfiles.d_sway] dst = "~/.config/sway" From 76e22783492601ce518ff4915bfe002826029adc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Aug 2022 19:28:03 +0300 Subject: [PATCH 1291/2667] Update git config to new GPG key --- home/.config/git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/git/config b/home/.config/git/config index adbfcaf3..dc38079b 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -5,7 +5,7 @@ email = marko@korhonen.cc {%@@ endif @@%} name = Marko Korhonen - signingkey = C514037F1EFF4FA6 + signingkey = F2B9F713E7ED627336DD85E444FA3F28CD931BB0 [commit] signoff = true From 7bc12404545cb57e70849cabea92c8f6d30abb93 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Aug 2022 19:28:03 +0300 Subject: [PATCH 1292/2667] Update git config to new GPG key --- home/.config/git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/git/config b/home/.config/git/config index adbfcaf3..dc38079b 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -5,7 +5,7 @@ email = marko@korhonen.cc {%@@ endif @@%} name = Marko Korhonen - signingkey = C514037F1EFF4FA6 + signingkey = F2B9F713E7ED627336DD85E444FA3F28CD931BB0 [commit] signoff = true From b8b2713df4102f2565d4d4397b46b36056a33ef6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Aug 2022 19:34:43 +0300 Subject: [PATCH 1293/2667] Update SSH key to new GPG key --- home/.ssh/authorized_keys | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.ssh/authorized_keys b/home/.ssh/authorized_keys index 03dfb898..a0c28ee9 100644 --- a/home/.ssh/authorized_keys +++ b/home/.ssh/authorized_keys @@ -1,2 +1,2 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDPIoTVXJ2gljf+Tpk7GdwAihhAlnyoblOWYiwFenKeomcYizLt8arEXNT+1Hr+jit7+Fg2Izv31ovo9M1ePyhzuO1jcuCOZkIPvcaN0c6XIH83ZiA04Ysd/HIGv1r7tDTxNnXeKfl55tWpd+F2A0BF3D3dIDBqDfX2Z2odXIjKXHoFBgETATl45bm0txpjTjbpjIiPbaRHg6+lcSnWm3f5p8lCzXs5MIGCdXcBxMhVVxszAI3CD/cEBmnweCam1Ji3J1qYna4BOrIyW5Z3HzS6vAkajxZd2wPU47gpoc3/2sXBwJeE/iOACECC+34rYqadZThprihpYc7D8gIDr7IDN16rvFfEcxE8SFvsPmM1Qbo7uH/F2TFF6mb0FzGQuTcdR4bqcms5jMsgqPGfEs6Rd1pkOXTcxwKOtbH27VYhSs/ow5TEbVHrbLwTU35ohIfZRqlKbrMv3CGgTNzj9MlN339x6G3//lnKR36i/W+Z4FPjT/KayhwbsNR1B5Mfdlr7tbmvFcI2KxvyD7Rr5XuouVTx98s3nlc2MJpII/Q/oX2tWPnYAK/myJC7ucY7G4Y/3uoCv2GYTi2flpEFJITSDPqzwrX19yYK2ooYyvg40Cd2mt4xu9sj4SyEMUu98CIfECT7dsaKVPfcjQqaRZb2Spr4tPfMrcUZYiZgJBPxWQ== cardno:000610127408 -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvsd9UtWtqfG+vmx9ByEwQwKJlcelWwZlN4b4WG0al3 reekymarko@reekynet.com +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHLUrf0LpumX6XEkPW6Z105sgJMWWOllWy7sxB+lgdUw Marko YubiKey +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvsd9UtWtqfG+vmx9ByEwQwKJlcelWwZlN4b4WG0al3 backup From a0fd25e2001b6e4bd6a02df9c17a9312d5c1ac30 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Aug 2022 19:34:43 +0300 Subject: [PATCH 1294/2667] Update SSH key to new GPG key --- home/.ssh/authorized_keys | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.ssh/authorized_keys b/home/.ssh/authorized_keys index 03dfb898..a0c28ee9 100644 --- a/home/.ssh/authorized_keys +++ b/home/.ssh/authorized_keys @@ -1,2 +1,2 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDPIoTVXJ2gljf+Tpk7GdwAihhAlnyoblOWYiwFenKeomcYizLt8arEXNT+1Hr+jit7+Fg2Izv31ovo9M1ePyhzuO1jcuCOZkIPvcaN0c6XIH83ZiA04Ysd/HIGv1r7tDTxNnXeKfl55tWpd+F2A0BF3D3dIDBqDfX2Z2odXIjKXHoFBgETATl45bm0txpjTjbpjIiPbaRHg6+lcSnWm3f5p8lCzXs5MIGCdXcBxMhVVxszAI3CD/cEBmnweCam1Ji3J1qYna4BOrIyW5Z3HzS6vAkajxZd2wPU47gpoc3/2sXBwJeE/iOACECC+34rYqadZThprihpYc7D8gIDr7IDN16rvFfEcxE8SFvsPmM1Qbo7uH/F2TFF6mb0FzGQuTcdR4bqcms5jMsgqPGfEs6Rd1pkOXTcxwKOtbH27VYhSs/ow5TEbVHrbLwTU35ohIfZRqlKbrMv3CGgTNzj9MlN339x6G3//lnKR36i/W+Z4FPjT/KayhwbsNR1B5Mfdlr7tbmvFcI2KxvyD7Rr5XuouVTx98s3nlc2MJpII/Q/oX2tWPnYAK/myJC7ucY7G4Y/3uoCv2GYTi2flpEFJITSDPqzwrX19yYK2ooYyvg40Cd2mt4xu9sj4SyEMUu98CIfECT7dsaKVPfcjQqaRZb2Spr4tPfMrcUZYiZgJBPxWQ== cardno:000610127408 -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvsd9UtWtqfG+vmx9ByEwQwKJlcelWwZlN4b4WG0al3 reekymarko@reekynet.com +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHLUrf0LpumX6XEkPW6Z105sgJMWWOllWy7sxB+lgdUw Marko YubiKey +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvsd9UtWtqfG+vmx9ByEwQwKJlcelWwZlN4b4WG0al3 backup From a761e7ccb6c767a17aa03d949d4dfbdf38cc16ab Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Aug 2022 23:49:27 +0300 Subject: [PATCH 1295/2667] Updated dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 From 1d22f518dafff378bb72a259817ae788ebc20747 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Aug 2022 23:49:27 +0300 Subject: [PATCH 1296/2667] Updated dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 From 3be401822259a7422f59244832dda2d701227f6e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Aug 2022 23:58:31 +0300 Subject: [PATCH 1297/2667] Add okc-ssh-agent for termux --- home/.config/zsh/01-env.zsh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index b85aece4..532af029 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -61,12 +61,18 @@ export SYSTEMD_PAGER=less # Use GPG for SSH authentication export GPG_TTY="$(tty)" +{%@@ if os == "arch" @@%} # set SSH_AUTH_SOCK if not logging in over SSH if [ "$SSH_CONNECTION" = "" ]; then export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) #gpgconf --launch gpg-agent gpg-connect-agent updatestartuptty /bye >/dev/null fi +{%@@ elif os == "termux" @@%} +if ! pgrep okc-ssh-agent > /dev/null; then + okc-ssh-agent > "$PREFIX/tmp/okc-ssh-agent.env" +fi +{%@@ endif @@%} # Enable grc colorization of supported commands [[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh From c473cb5d9a6a51f2bcc8d98d49880af61e49b525 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Aug 2022 23:58:31 +0300 Subject: [PATCH 1298/2667] Add okc-ssh-agent for termux --- home/.config/zsh/01-env.zsh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index b85aece4..532af029 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -61,12 +61,18 @@ export SYSTEMD_PAGER=less # Use GPG for SSH authentication export GPG_TTY="$(tty)" +{%@@ if os == "arch" @@%} # set SSH_AUTH_SOCK if not logging in over SSH if [ "$SSH_CONNECTION" = "" ]; then export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) #gpgconf --launch gpg-agent gpg-connect-agent updatestartuptty /bye >/dev/null fi +{%@@ elif os == "termux" @@%} +if ! pgrep okc-ssh-agent > /dev/null; then + okc-ssh-agent > "$PREFIX/tmp/okc-ssh-agent.env" +fi +{%@@ endif @@%} # Enable grc colorization of supported commands [[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh From 3a6725ae09047a289a03e069cb28b4a9020c4f97 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 00:03:04 +0300 Subject: [PATCH 1299/2667] Termux: alias okc-gpg to gpg --- home/.config/zsh/03-aliases.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 1e14d292..35f123a9 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -43,6 +43,10 @@ pr() { } {%@@ endif @@%} +{%@@ if os == "termux" @@%} +alias okc-gpg='gpg' +{%@@ endif @@%} + # find and open man pages with fzf fman() { man -k . | fzf --prompt='Man> ' | awk '{print $1}' | xargs -r man From ae89052aefdf8f87a5a84e971ad14b326b257391 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 00:03:04 +0300 Subject: [PATCH 1300/2667] Termux: alias okc-gpg to gpg --- home/.config/zsh/03-aliases.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 1e14d292..35f123a9 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -43,6 +43,10 @@ pr() { } {%@@ endif @@%} +{%@@ if os == "termux" @@%} +alias okc-gpg='gpg' +{%@@ endif @@%} + # find and open man pages with fzf fman() { man -k . | fzf --prompt='Man> ' | awk '{print $1}' | xargs -r man From 29df7d4b94b46bbc99716ba6111dc1379e89d244 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 00:10:06 +0300 Subject: [PATCH 1301/2667] Fix alias and okc ssh agent setup --- home/.config/zsh/01-env.zsh | 4 +--- home/.config/zsh/03-aliases.zsh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 532af029..43adace8 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -69,9 +69,7 @@ if [ "$SSH_CONNECTION" = "" ]; then gpg-connect-agent updatestartuptty /bye >/dev/null fi {%@@ elif os == "termux" @@%} -if ! pgrep okc-ssh-agent > /dev/null; then - okc-ssh-agent > "$PREFIX/tmp/okc-ssh-agent.env" -fi +eval $(okc-ssh-agent) {%@@ endif @@%} # Enable grc colorization of supported commands diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 35f123a9..1b9b79c6 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -44,7 +44,7 @@ pr() { {%@@ endif @@%} {%@@ if os == "termux" @@%} -alias okc-gpg='gpg' +alias gp='okc-gpg' {%@@ endif @@%} # find and open man pages with fzf From fcf8969b0169745188e498b8f7c2181b3b58c992 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 00:10:06 +0300 Subject: [PATCH 1302/2667] Fix alias and okc ssh agent setup --- home/.config/zsh/01-env.zsh | 4 +--- home/.config/zsh/03-aliases.zsh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 532af029..43adace8 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -69,9 +69,7 @@ if [ "$SSH_CONNECTION" = "" ]; then gpg-connect-agent updatestartuptty /bye >/dev/null fi {%@@ elif os == "termux" @@%} -if ! pgrep okc-ssh-agent > /dev/null; then - okc-ssh-agent > "$PREFIX/tmp/okc-ssh-agent.env" -fi +eval $(okc-ssh-agent) {%@@ endif @@%} # Enable grc colorization of supported commands diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 35f123a9..1b9b79c6 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -44,7 +44,7 @@ pr() { {%@@ endif @@%} {%@@ if os == "termux" @@%} -alias okc-gpg='gpg' +alias gp='okc-gpg' {%@@ endif @@%} # find and open man pages with fzf From 060450b9f55d875fa71da17165dee5caff0c657f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 09:55:51 +0300 Subject: [PATCH 1303/2667] Nvim: Add GPG plugin --- dotdrop | 2 +- home/.config/nvim/lua/plugins/init.lua | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 73506773..ca13a686 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -171,6 +171,9 @@ require('packer').startup(function() -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' + + -- Edit GPG encrypted files transparently + use 'jamessan/vim-gnupg' -- If Packer was just installed, -- sync plugins From 6bf637f964dc65cd3c8f800b727cdda0408558e1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 09:55:51 +0300 Subject: [PATCH 1304/2667] Nvim: Add GPG plugin --- dotdrop | 2 +- home/.config/nvim/lua/plugins/init.lua | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 73506773..ca13a686 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -171,6 +171,9 @@ require('packer').startup(function() -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' + + -- Edit GPG encrypted files transparently + use 'jamessan/vim-gnupg' -- If Packer was just installed, -- sync plugins From 3bb8c381ce3c8d183bf3c5d24f3e2c6cca1ebae9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 11:57:49 +0300 Subject: [PATCH 1305/2667] Fix gondor ssh setup --- home/.ssh/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.ssh/config b/home/.ssh/config index 735e4e64..bfff623a 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -33,9 +33,10 @@ host moria-unlock User root host gondor - hostname gondor.korhonen.cc + hostname tolkku.net port 22 User reekymarko + ForwardAgent yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host anitta From d9f852bed8ef9af775f7099f6c0cba52b1dfed84 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 11:57:49 +0300 Subject: [PATCH 1306/2667] Fix gondor ssh setup --- home/.ssh/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.ssh/config b/home/.ssh/config index 735e4e64..bfff623a 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -33,9 +33,10 @@ host moria-unlock User root host gondor - hostname gondor.korhonen.cc + hostname tolkku.net port 22 User reekymarko + ForwardAgent yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host anitta From 4adc5b02eea750bf3ace3ae07086117ea05ace03 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 11:59:49 +0300 Subject: [PATCH 1307/2667] Fix SSH/GPG forwarding --- home/.ssh/config | 2 -- 1 file changed, 2 deletions(-) diff --git a/home/.ssh/config b/home/.ssh/config index bfff623a..42af6361 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -24,7 +24,6 @@ host moria HostName korhonen.cc port 221 User balrog - ForwardAgent yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host moria-unlock @@ -36,7 +35,6 @@ host gondor hostname tolkku.net port 22 User reekymarko - ForwardAgent yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host anitta From 95bb42aa72e1464205de62465bfc2dc9be69715b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 11:59:49 +0300 Subject: [PATCH 1308/2667] Fix SSH/GPG forwarding --- home/.ssh/config | 2 -- 1 file changed, 2 deletions(-) diff --git a/home/.ssh/config b/home/.ssh/config index bfff623a..42af6361 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -24,7 +24,6 @@ host moria HostName korhonen.cc port 221 User balrog - ForwardAgent yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host moria-unlock @@ -36,7 +35,6 @@ host gondor hostname tolkku.net port 22 User reekymarko - ForwardAgent yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host anitta From fd56fcbdda21fa7a9cb3541ae5ad0af85ed96ca8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 12:06:07 +0300 Subject: [PATCH 1309/2667] Add StreamLocalBindUnLink option to ssh config --- home/.ssh/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index 42af6361..8d759296 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -24,6 +24,7 @@ host moria HostName korhonen.cc port 221 User balrog + StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host moria-unlock @@ -35,6 +36,7 @@ host gondor hostname tolkku.net port 22 User reekymarko + StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host anitta From e3f197456bee27e766d016bf5a6e656feb2970c9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 12:06:07 +0300 Subject: [PATCH 1310/2667] Add StreamLocalBindUnLink option to ssh config --- home/.ssh/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index 42af6361..8d759296 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -24,6 +24,7 @@ host moria HostName korhonen.cc port 221 User balrog + StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host moria-unlock @@ -35,6 +36,7 @@ host gondor hostname tolkku.net port 22 User reekymarko + StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host anitta From 5fcd8553f0255248eb30123fe220bd155df248d6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 20:33:59 +0300 Subject: [PATCH 1311/2667] Setup SSH MasterSocker and other small improvements --- config.toml | 9 ++++----- home/.config/zsh/01-env.zsh | 15 ++++++--------- home/.ssh/authorized_keys | 1 - home/.ssh/config | 7 +++++++ home/.ssh/id_ed25519_yubikey.pub | 1 + 5 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 home/.ssh/id_ed25519_yubikey.pub diff --git a/config.toml b/config.toml index 893dfee1..a8f6a11e 100644 --- a/config.toml +++ b/config.toml @@ -59,9 +59,9 @@ src = ".mbsyncrc" dst = "~/.config/alacritty/alacritty.yml" src = ".config/alacritty/alacritty.yml" -[dotfiles.f_authorized_keys] -dst = "~/.ssh/authorized_keys" -src = ".ssh/authorized_keys" +[dotfiles.d_ssh] +dst = "~/.ssh" +src = ".ssh" [dotfiles.f_beets_config] dst = "~/.config/beets/config.yaml" @@ -242,9 +242,9 @@ os = "termux" [profiles.terminal] dotfiles = [ "d_nvim", + "d_ssh", "d_zsh", "f_alacritty.yml", - "f_authorized_keys", "f_gitconfig", "f_hushlogin", "f_ignore", @@ -252,7 +252,6 @@ dotfiles = [ "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", - "f_ssh.conf", "f_tmux.conf", "f_zshrc", ] diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 43adace8..1de682b9 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -58,19 +58,16 @@ export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR export SYSTEMD_PAGER=less -# Use GPG for SSH authentication -export GPG_TTY="$(tty)" - -{%@@ if os == "arch" @@%} -# set SSH_AUTH_SOCK if not logging in over SSH if [ "$SSH_CONNECTION" = "" ]; then +{%@@ if os == "arch" or os == "ubuntu" @@%} + # set SSH_AUTH_SOCK if not logging in over SSH + export GPG_TTY="$(tty)" export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - #gpgconf --launch gpg-agent - gpg-connect-agent updatestartuptty /bye >/dev/null -fi + gpgconf --launch gpg-agent {%@@ elif os == "termux" @@%} -eval $(okc-ssh-agent) + eval $(okc-ssh-agent) {%@@ endif @@%} +fi # Enable grc colorization of supported commands [[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh diff --git a/home/.ssh/authorized_keys b/home/.ssh/authorized_keys index a0c28ee9..9bd02835 100644 --- a/home/.ssh/authorized_keys +++ b/home/.ssh/authorized_keys @@ -1,2 +1 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHLUrf0LpumX6XEkPW6Z105sgJMWWOllWy7sxB+lgdUw Marko YubiKey -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvsd9UtWtqfG+vmx9ByEwQwKJlcelWwZlN4b4WG0al3 backup diff --git a/home/.ssh/config b/home/.ssh/config index 8d759296..d275a29e 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -1,5 +1,12 @@ Include ~/.ssh/rossum_hosts +host * + IdentitiesOnly yes + IdentityFile ~/.ssh/id_ed25519_yubikey.pub + ControlMaster auto + ControlPersist 10m + ControlPath ~/.ssh/%r@%h:%p.socket + host gitea HostName korhonen.cc user git diff --git a/home/.ssh/id_ed25519_yubikey.pub b/home/.ssh/id_ed25519_yubikey.pub new file mode 100644 index 00000000..9bd02835 --- /dev/null +++ b/home/.ssh/id_ed25519_yubikey.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHLUrf0LpumX6XEkPW6Z105sgJMWWOllWy7sxB+lgdUw Marko YubiKey From 929e4a0bfc2757220d63bb7878c734a267faa95c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 20:33:59 +0300 Subject: [PATCH 1312/2667] Setup SSH MasterSocker and other small improvements --- config.toml | 9 ++++----- home/.config/zsh/01-env.zsh | 15 ++++++--------- home/.ssh/authorized_keys | 1 - home/.ssh/config | 7 +++++++ home/.ssh/id_ed25519_yubikey.pub | 1 + 5 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 home/.ssh/id_ed25519_yubikey.pub diff --git a/config.toml b/config.toml index 893dfee1..a8f6a11e 100644 --- a/config.toml +++ b/config.toml @@ -59,9 +59,9 @@ src = ".mbsyncrc" dst = "~/.config/alacritty/alacritty.yml" src = ".config/alacritty/alacritty.yml" -[dotfiles.f_authorized_keys] -dst = "~/.ssh/authorized_keys" -src = ".ssh/authorized_keys" +[dotfiles.d_ssh] +dst = "~/.ssh" +src = ".ssh" [dotfiles.f_beets_config] dst = "~/.config/beets/config.yaml" @@ -242,9 +242,9 @@ os = "termux" [profiles.terminal] dotfiles = [ "d_nvim", + "d_ssh", "d_zsh", "f_alacritty.yml", - "f_authorized_keys", "f_gitconfig", "f_hushlogin", "f_ignore", @@ -252,7 +252,6 @@ dotfiles = [ "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", - "f_ssh.conf", "f_tmux.conf", "f_zshrc", ] diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 43adace8..1de682b9 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -58,19 +58,16 @@ export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR export SYSTEMD_PAGER=less -# Use GPG for SSH authentication -export GPG_TTY="$(tty)" - -{%@@ if os == "arch" @@%} -# set SSH_AUTH_SOCK if not logging in over SSH if [ "$SSH_CONNECTION" = "" ]; then +{%@@ if os == "arch" or os == "ubuntu" @@%} + # set SSH_AUTH_SOCK if not logging in over SSH + export GPG_TTY="$(tty)" export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - #gpgconf --launch gpg-agent - gpg-connect-agent updatestartuptty /bye >/dev/null -fi + gpgconf --launch gpg-agent {%@@ elif os == "termux" @@%} -eval $(okc-ssh-agent) + eval $(okc-ssh-agent) {%@@ endif @@%} +fi # Enable grc colorization of supported commands [[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh diff --git a/home/.ssh/authorized_keys b/home/.ssh/authorized_keys index a0c28ee9..9bd02835 100644 --- a/home/.ssh/authorized_keys +++ b/home/.ssh/authorized_keys @@ -1,2 +1 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHLUrf0LpumX6XEkPW6Z105sgJMWWOllWy7sxB+lgdUw Marko YubiKey -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvsd9UtWtqfG+vmx9ByEwQwKJlcelWwZlN4b4WG0al3 backup diff --git a/home/.ssh/config b/home/.ssh/config index 8d759296..d275a29e 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -1,5 +1,12 @@ Include ~/.ssh/rossum_hosts +host * + IdentitiesOnly yes + IdentityFile ~/.ssh/id_ed25519_yubikey.pub + ControlMaster auto + ControlPersist 10m + ControlPath ~/.ssh/%r@%h:%p.socket + host gitea HostName korhonen.cc user git diff --git a/home/.ssh/id_ed25519_yubikey.pub b/home/.ssh/id_ed25519_yubikey.pub new file mode 100644 index 00000000..9bd02835 --- /dev/null +++ b/home/.ssh/id_ed25519_yubikey.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHLUrf0LpumX6XEkPW6Z105sgJMWWOllWy7sxB+lgdUw Marko YubiKey From a9581ae2b02d36b6ea8e804a881d8ee55e94b08d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 20:34:19 +0300 Subject: [PATCH 1313/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 From e6bd26af9c7e7bc0b2c85f3547f96cd8b60bc489 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 20:34:19 +0300 Subject: [PATCH 1314/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 From 78a01f8a446293b8c8fcd8c396e8912d45bf77d7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 20:45:07 +0300 Subject: [PATCH 1315/2667] Use gpg-agent setup from the manpage --- home/.config/zsh/01-env.zsh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 1de682b9..899359af 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -58,16 +58,14 @@ export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR export SYSTEMD_PAGER=less -if [ "$SSH_CONNECTION" = "" ]; then {%@@ if os == "arch" or os == "ubuntu" @@%} - # set SSH_AUTH_SOCK if not logging in over SSH - export GPG_TTY="$(tty)" - export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - gpgconf --launch gpg-agent -{%@@ elif os == "termux" @@%} - eval $(okc-ssh-agent) -{%@@ endif @@%} +if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then + export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" fi +gpgconf --launch gpg-agent +{%@@ elif os == "termux" @@%} +eval $(okc-ssh-agent) +{%@@ endif @@%} # Enable grc colorization of supported commands [[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh From 0ed3009e7add53f5aa1e8d6e7a6e809231e50459 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 20:45:07 +0300 Subject: [PATCH 1316/2667] Use gpg-agent setup from the manpage --- home/.config/zsh/01-env.zsh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 1de682b9..899359af 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -58,16 +58,14 @@ export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR export SYSTEMD_PAGER=less -if [ "$SSH_CONNECTION" = "" ]; then {%@@ if os == "arch" or os == "ubuntu" @@%} - # set SSH_AUTH_SOCK if not logging in over SSH - export GPG_TTY="$(tty)" - export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - gpgconf --launch gpg-agent -{%@@ elif os == "termux" @@%} - eval $(okc-ssh-agent) -{%@@ endif @@%} +if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then + export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" fi +gpgconf --launch gpg-agent +{%@@ elif os == "termux" @@%} +eval $(okc-ssh-agent) +{%@@ endif @@%} # Enable grc colorization of supported commands [[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh From 5341406b2e2b73d33ce3dc80eae254a1c3e880cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 31 Aug 2022 10:09:34 +0300 Subject: [PATCH 1317/2667] Fix fzf completion with relative paths --- home/.config/zsh/01-env.zsh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 899359af..f60d3c32 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -32,17 +32,20 @@ export PATH="/home/$USER/.bin:$PATH" export GOPATH=~/.go # fzf settings -export FZF_DEFAULT_COMMAND='fd -Ht f' -export FZF_ALT_C_COMMAND='fd -Ht d' +export FD_COMMAND='fd -HLt' +export FZF_DEFAULT_COMMAND="$FD_COMMAND f" +export FZF_ALT_C_COMMAND="$FD_COMMAND d" export FZF_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" export FZF_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' -_fzf_compgen_dir() { - fd -Ht d -} _fzf_compgen_path() { - fd -Ht f + resultcmd="$FZF_DEFAULT_COMMAND . $1" + eval ${resultcmd} +} +_fzf_compgen_dir() { + resultcmd="$FZF_ALT_C_COMMAND . $1" + eval ${resultcmd} } # dotfile repository location From 46cc7da21b1748a1acc01f28a93bbd638a8869a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 31 Aug 2022 10:09:34 +0300 Subject: [PATCH 1318/2667] Fix fzf completion with relative paths --- home/.config/zsh/01-env.zsh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 899359af..f60d3c32 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -32,17 +32,20 @@ export PATH="/home/$USER/.bin:$PATH" export GOPATH=~/.go # fzf settings -export FZF_DEFAULT_COMMAND='fd -Ht f' -export FZF_ALT_C_COMMAND='fd -Ht d' +export FD_COMMAND='fd -HLt' +export FZF_DEFAULT_COMMAND="$FD_COMMAND f" +export FZF_ALT_C_COMMAND="$FD_COMMAND d" export FZF_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" export FZF_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' -_fzf_compgen_dir() { - fd -Ht d -} _fzf_compgen_path() { - fd -Ht f + resultcmd="$FZF_DEFAULT_COMMAND . $1" + eval ${resultcmd} +} +_fzf_compgen_dir() { + resultcmd="$FZF_ALT_C_COMMAND . $1" + eval ${resultcmd} } # dotfile repository location From c5a6896eab99549434cbfbf5dfc13a10577fc2cb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 31 Aug 2022 10:09:50 +0300 Subject: [PATCH 1319/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From 2aeb6e5bc0f16525f6ef0c802031b0f5650c44c3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 31 Aug 2022 10:09:50 +0300 Subject: [PATCH 1320/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From 3a5ddd0108275ccacc27872084749a64fb40074c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 1 Sep 2022 18:04:00 +0300 Subject: [PATCH 1321/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 From a3138355094f11ac17a05f0c3bb880acac69267c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 1 Sep 2022 18:04:00 +0300 Subject: [PATCH 1322/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 From f717e2abd01312ac4b7129a0a2d589fee50b52dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 2 Sep 2022 08:58:00 +0300 Subject: [PATCH 1323/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From db2ef6e4347ae44bb14617d073eefae37f34341e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 2 Sep 2022 08:58:00 +0300 Subject: [PATCH 1324/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From a097eb15bec985c5a5025d0d65d722a4d1357988 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 2 Sep 2022 23:48:41 +0300 Subject: [PATCH 1325/2667] Remove some redundant keymappings F.ex to original keymapping j to switch to left window --- home/.config/nvim/lua/keybinds.lua | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index db8f9066..1aa69c2f 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -1,21 +1,11 @@ local map = vim.keymap.set --- Telescope ---map('n', '', 'Telescope find_files find_command=fd,-Ht,f') ---map('n', '', 'Telescope live_grep') - -- Navigate between buffers map('n', '', vim.cmd.bn, {silent = true}) map('n', '', vim.cmd.bp, {silent = true}) --- Navigate between splits -map('n', '', '') -map('n', '', '') -map('n', '', '') -map('n', '', '') - -- Run Neoformat -map('n', '', vim.cmd.Neoformat) +map('n', '', vim.cmd.Neoformat, {}) -- Exit terminal insert mode with esc -map('t', '', '') +map('t', '', '', {}) From dab1d82be28e93e77988404964f8c49b244b5083 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 2 Sep 2022 23:48:41 +0300 Subject: [PATCH 1326/2667] Remove some redundant keymappings F.ex to original keymapping j to switch to left window --- home/.config/nvim/lua/keybinds.lua | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index db8f9066..1aa69c2f 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -1,21 +1,11 @@ local map = vim.keymap.set --- Telescope ---map('n', '', 'Telescope find_files find_command=fd,-Ht,f') ---map('n', '', 'Telescope live_grep') - -- Navigate between buffers map('n', '', vim.cmd.bn, {silent = true}) map('n', '', vim.cmd.bp, {silent = true}) --- Navigate between splits -map('n', '', '') -map('n', '', '') -map('n', '', '') -map('n', '', '') - -- Run Neoformat -map('n', '', vim.cmd.Neoformat) +map('n', '', vim.cmd.Neoformat, {}) -- Exit terminal insert mode with esc -map('t', '', '') +map('t', '', '', {}) From 6751e7b356e353158aa2a2fa66eecbdce05b3259 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 2 Sep 2022 23:49:56 +0300 Subject: [PATCH 1327/2667] Refactor settings.lua - Remove all options that matched the defaults in NeoVim - Remove clipboard=unnamedplus and learded to use registers :) - set some modern NeoVim settings, f.ex laststatus=3 and cmdheight=0 --- home/.config/nvim/lua/settings.lua | 46 ++++++------------------------ 1 file changed, 9 insertions(+), 37 deletions(-) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 461ada03..e2637e3c 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -1,6 +1,5 @@ local o = vim.o local g = vim.g -local cmd = vim.cmd ------ Appearance ------ @@ -10,59 +9,32 @@ o.termguicolors = true -- Floating window transparency o.winblend = 10 --- Remove extra line -o.cmdheight = 1 - --- Always show signcolumn -o.signcolumn = 'yes' - -- Diff settings -cmd 'set diffopt=filler,internal,algorithm:histogram,indent-heuristic' +o.diffopt = 'filler,internal,algorithm:histogram,indent-heuristic' -- Allow switching buffers with unsaved changes -cmd 'set hidden' +o.hidden = true -- Show line numbers -cmd 'set number' +o.number = true -- Blinking cursor -cmd 'set guicursor=i:ver1' -cmd 'set guicursor+=a:blinkon1' +o.guicursor = 'a:blinkon1' --- Gutter and cursoline bg transparent -cmd 'highlight CursorLineNr guibg=transparent' -cmd 'highlight SignColumn guibg=transparent' +-- Enable global statusline +o.laststatus = 3 + +-- Hide cmdline +o.cmdheight = 0 ------ Misc ------- -- Use suda by default g.suda_smart_edit = 1 --- Split direction -o.splitbelow = true -o.splitright = true - -- Case insensitive search o.ignorecase = true o.smartcase = true --- Use mouse -o.mouse = 'a' - --- Use system clipboard -o.clipboard = 'unnamedplus' - --- Autoindent and syntax higlight -o.autoindent = true -o.smartindent = true -o.tabstop = 4 -o.shiftwidth = 4 -cmd 'syntax on' -cmd 'filetype on' -cmd 'filetype plugin indent on' - --- Disable auto commenting -o.formatoptions = 'cro' - -- Set leader g.mapleader = " " From 2d5fb0d4dcf71f82f3fec1f0c0204499f4257935 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 2 Sep 2022 23:49:56 +0300 Subject: [PATCH 1328/2667] Refactor settings.lua - Remove all options that matched the defaults in NeoVim - Remove clipboard=unnamedplus and learded to use registers :) - set some modern NeoVim settings, f.ex laststatus=3 and cmdheight=0 --- home/.config/nvim/lua/settings.lua | 46 ++++++------------------------ 1 file changed, 9 insertions(+), 37 deletions(-) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 461ada03..e2637e3c 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -1,6 +1,5 @@ local o = vim.o local g = vim.g -local cmd = vim.cmd ------ Appearance ------ @@ -10,59 +9,32 @@ o.termguicolors = true -- Floating window transparency o.winblend = 10 --- Remove extra line -o.cmdheight = 1 - --- Always show signcolumn -o.signcolumn = 'yes' - -- Diff settings -cmd 'set diffopt=filler,internal,algorithm:histogram,indent-heuristic' +o.diffopt = 'filler,internal,algorithm:histogram,indent-heuristic' -- Allow switching buffers with unsaved changes -cmd 'set hidden' +o.hidden = true -- Show line numbers -cmd 'set number' +o.number = true -- Blinking cursor -cmd 'set guicursor=i:ver1' -cmd 'set guicursor+=a:blinkon1' +o.guicursor = 'a:blinkon1' --- Gutter and cursoline bg transparent -cmd 'highlight CursorLineNr guibg=transparent' -cmd 'highlight SignColumn guibg=transparent' +-- Enable global statusline +o.laststatus = 3 + +-- Hide cmdline +o.cmdheight = 0 ------ Misc ------- -- Use suda by default g.suda_smart_edit = 1 --- Split direction -o.splitbelow = true -o.splitright = true - -- Case insensitive search o.ignorecase = true o.smartcase = true --- Use mouse -o.mouse = 'a' - --- Use system clipboard -o.clipboard = 'unnamedplus' - --- Autoindent and syntax higlight -o.autoindent = true -o.smartindent = true -o.tabstop = 4 -o.shiftwidth = 4 -cmd 'syntax on' -cmd 'filetype on' -cmd 'filetype plugin indent on' - --- Disable auto commenting -o.formatoptions = 'cro' - -- Set leader g.mapleader = " " From da3831dd0bef08723eb08900bebac7d3c5437f9a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 2 Sep 2022 23:59:51 +0300 Subject: [PATCH 1329/2667] Add patch for which-key and cmdheight=0 problem --- home/.config/nvim/lua/plugins/which-key.lua | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 home/.config/nvim/lua/plugins/which-key.lua diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua new file mode 100644 index 00000000..17b7703c --- /dev/null +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -0,0 +1,19 @@ +return function() + require('which-key').setup {spelling = {enabled = true}} + ---PATCH from https://github.com/folke/which-key.nvim/pull/305 + local wk_view = require 'which-key.view' + wk_view.hide = function() + vim.api.nvim_echo({{""}}, false, {}) + vim.cmd 'redraw' + wk_view.hide_cursor() + if wk_view.buf and vim.api.nvim_buf_is_valid(wk_view.buf) then + vim.api.nvim_buf_delete(wk_view.buf, {force = true}) + wk_view.buf = nil + end + if wk_view.win and vim.api.nvim_win_is_valid(wk_view.win) then + vim.api.nvim_win_close(wk_view.win, {force = true}) + wk_view.win = nil + end + end + ---ENDPATCH +end From 38c985ebfa13ed466ff3695a2a91b5f65c883ee6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 2 Sep 2022 23:59:51 +0300 Subject: [PATCH 1330/2667] Add patch for which-key and cmdheight=0 problem --- home/.config/nvim/lua/plugins/which-key.lua | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 home/.config/nvim/lua/plugins/which-key.lua diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua new file mode 100644 index 00000000..17b7703c --- /dev/null +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -0,0 +1,19 @@ +return function() + require('which-key').setup {spelling = {enabled = true}} + ---PATCH from https://github.com/folke/which-key.nvim/pull/305 + local wk_view = require 'which-key.view' + wk_view.hide = function() + vim.api.nvim_echo({{""}}, false, {}) + vim.cmd 'redraw' + wk_view.hide_cursor() + if wk_view.buf and vim.api.nvim_buf_is_valid(wk_view.buf) then + vim.api.nvim_buf_delete(wk_view.buf, {force = true}) + wk_view.buf = nil + end + if wk_view.win and vim.api.nvim_win_is_valid(wk_view.win) then + vim.api.nvim_win_close(wk_view.win, {force = true}) + wk_view.win = nil + end + end + ---ENDPATCH +end From 0e126d2153446dd090cd7e8117d6d4ecd792845a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:01:15 +0300 Subject: [PATCH 1331/2667] Nvim: Change colorscheme to kanagawa and some other minor tweaks --- home/.config/nvim/lua/plugins/cmp.lua | 4 +- home/.config/nvim/lua/plugins/colorscheme.lua | 55 +----------------- home/.config/nvim/lua/plugins/init.lua | 56 ++++++++----------- home/.config/nvim/lua/plugins/lualine.lua | 2 +- 4 files changed, 28 insertions(+), 89 deletions(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index a4a17579..45ffa55b 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -47,8 +47,8 @@ return function() end }, sources = { - {name = 'nvim_lsp'}, {name = 'luasnip'}, {name = 'path'}, - {name = 'git'}, {name = 'buffer'} + {name = 'buffer'}, {name = 'git'}, {name = 'luasnip'}, + {name = 'nvim_lsp'}, {name = 'nvim_lua'}, {name = 'path'} } } diff --git a/home/.config/nvim/lua/plugins/colorscheme.lua b/home/.config/nvim/lua/plugins/colorscheme.lua index f28d9bdb..a7a407bf 100644 --- a/home/.config/nvim/lua/plugins/colorscheme.lua +++ b/home/.config/nvim/lua/plugins/colorscheme.lua @@ -1,54 +1 @@ -return function() - require('catppuccin').setup({ - transparent_background = false, - term_colors = false, - compile = { - enabled = true, - path = vim.fn.stdpath 'cache' .. '/catppuccin' - }, - styles = { - comments = {'italic'}, - functions = {'italic'}, - keywords = {'italic'}, - strings = {}, - variables = {} - }, - integrations = { - treesitter = true, - native_lsp = { - enabled = true, - virtual_text = { - errors = {'italic'}, - hints = {'italic'}, - warnings = {'italic'}, - information = {'italic'} - }, - underlines = { - errors = {'underline'}, - hints = {'underline'}, - warnings = {'underline'}, - information = {'underline'} - } - }, - lsp_trouble = false, - lsp_saga = false, - gitgutter = true, - gitsigns = false, - telescope = true, - nvimtree = {enabled = false, show_root = false}, - which_key = false, - indent_blankline = {enabled = true, colored_indent_levels = false}, - dashboard = false, - neogit = false, - vim_sneak = false, - fern = false, - barbar = false, - bufferline = false, - markdown = false, - lightspeed = false, - ts_rainbow = false, - hop = false - } - }) - vim.cmd [[colorscheme catppuccin]] -end +return function() vim.cmd("colorscheme kanagawa") end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index ca13a686..7f02d7d1 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -8,7 +8,7 @@ if fn.empty(fn.glob(install_path)) > 0 then 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path }) - vim.cmd [[packadd packer.nvim]] + vim.cmd [[packadd packer.nvim]] print('Installed Packer') end @@ -20,27 +20,21 @@ require('packer').startup(function() use {'wbthomason/packer.nvim'} -- Colorscheme - use { - 'catppuccin/nvim', - as = 'catppuccin', - config = require('plugins.colorscheme') - } - - -- Startup screen/dashboard - use 'glepnir/dashboard-nvim' - - -- Git in signcolumn - use 'airblade/vim-gitgutter' + use {'rebelot/kanagawa.nvim', config = require('plugins.colorscheme')} -- Statusline use { - 'hoob3rt/lualine.nvim', + 'nvim-lualine/lualine.nvim', requires = {'kyazdani42/nvim-web-devicons', opt = true}, - config = function() - require('lualine').setup {options = {theme = 'catppuccin'}} - end + config = require('plugins.lualine') } + -- Startup screen/dashboard + use 'glepnir/dashboard-nvim' + + -- Git in signcolumn + use 'airblade/vim-gitgutter' + -- Tabline/bufferline use { 'akinsho/nvim-bufferline.lua', @@ -82,9 +76,7 @@ require('packer').startup(function() -- Display possible keybinds use { 'folke/which-key.nvim', - config = function() - require('which-key').setup {spelling = {enabled = true}} - end + config = require('plugins.which-key') } -- Read editorconfig settings @@ -97,6 +89,7 @@ require('packer').startup(function() } use { 'williamboman/mason-lspconfig.nvim', + requires = {'ii14/emmylua-nvim'}, -- vim api documentation for lua lsp config = function() require('mason-lspconfig').setup {automatic_installation = true} end @@ -115,13 +108,14 @@ require('packer').startup(function() use { 'hrsh7th/nvim-cmp', requires = { - {'hrsh7th/cmp-nvim-lsp'}, -- LSP source - {'hrsh7th/cmp-path'}, -- Path source - {'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim"}, -- Git source {'hrsh7th/cmp-buffer'}, -- Buffer source - {'saadparwaiz1/cmp_luasnip'}, -- Snippets source + {'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim"}, -- Git source {'L3MON4D3/LuaSnip'}, -- Snippets plugin - {'rafamadriz/friendly-snippets'} -- Snippets collection + {'hrsh7th/cmp-nvim-lsp'}, -- LSP source + {'hrsh7th/cmp-nvim-lua'}, -- Neovim Lua API documentation + {'hrsh7th/cmp-path'}, -- Path source + {'rafamadriz/friendly-snippets'}, -- Snippets collection + {'saadparwaiz1/cmp_luasnip'} -- Snippets source }, config = require('plugins.cmp') } @@ -171,15 +165,13 @@ require('packer').startup(function() -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' - - -- Edit GPG encrypted files transparently - use 'jamessan/vim-gnupg' - -- If Packer was just installed, - -- sync plugins - if Packer_bootstrap then - require('packer').sync() - end + -- Edit GPG encrypted files transparently + use 'jamessan/vim-gnupg' + + -- If Packer was just installed, + -- sync plugins + if Packer_bootstrap then require('packer').sync() end end) diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 815d2d96..de86f563 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1 +1 @@ -require'lualine'.setup {options = {theme = 'catppuccin'}} +return function() require('lualine').setup() end From 78c8196daa95ad449cc8dae142c9bf681c7ffc53 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:01:15 +0300 Subject: [PATCH 1332/2667] Nvim: Change colorscheme to kanagawa and some other minor tweaks --- home/.config/nvim/lua/plugins/cmp.lua | 4 +- home/.config/nvim/lua/plugins/colorscheme.lua | 55 +----------------- home/.config/nvim/lua/plugins/init.lua | 56 ++++++++----------- home/.config/nvim/lua/plugins/lualine.lua | 2 +- 4 files changed, 28 insertions(+), 89 deletions(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index a4a17579..45ffa55b 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -47,8 +47,8 @@ return function() end }, sources = { - {name = 'nvim_lsp'}, {name = 'luasnip'}, {name = 'path'}, - {name = 'git'}, {name = 'buffer'} + {name = 'buffer'}, {name = 'git'}, {name = 'luasnip'}, + {name = 'nvim_lsp'}, {name = 'nvim_lua'}, {name = 'path'} } } diff --git a/home/.config/nvim/lua/plugins/colorscheme.lua b/home/.config/nvim/lua/plugins/colorscheme.lua index f28d9bdb..a7a407bf 100644 --- a/home/.config/nvim/lua/plugins/colorscheme.lua +++ b/home/.config/nvim/lua/plugins/colorscheme.lua @@ -1,54 +1 @@ -return function() - require('catppuccin').setup({ - transparent_background = false, - term_colors = false, - compile = { - enabled = true, - path = vim.fn.stdpath 'cache' .. '/catppuccin' - }, - styles = { - comments = {'italic'}, - functions = {'italic'}, - keywords = {'italic'}, - strings = {}, - variables = {} - }, - integrations = { - treesitter = true, - native_lsp = { - enabled = true, - virtual_text = { - errors = {'italic'}, - hints = {'italic'}, - warnings = {'italic'}, - information = {'italic'} - }, - underlines = { - errors = {'underline'}, - hints = {'underline'}, - warnings = {'underline'}, - information = {'underline'} - } - }, - lsp_trouble = false, - lsp_saga = false, - gitgutter = true, - gitsigns = false, - telescope = true, - nvimtree = {enabled = false, show_root = false}, - which_key = false, - indent_blankline = {enabled = true, colored_indent_levels = false}, - dashboard = false, - neogit = false, - vim_sneak = false, - fern = false, - barbar = false, - bufferline = false, - markdown = false, - lightspeed = false, - ts_rainbow = false, - hop = false - } - }) - vim.cmd [[colorscheme catppuccin]] -end +return function() vim.cmd("colorscheme kanagawa") end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index ca13a686..7f02d7d1 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -8,7 +8,7 @@ if fn.empty(fn.glob(install_path)) > 0 then 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path }) - vim.cmd [[packadd packer.nvim]] + vim.cmd [[packadd packer.nvim]] print('Installed Packer') end @@ -20,27 +20,21 @@ require('packer').startup(function() use {'wbthomason/packer.nvim'} -- Colorscheme - use { - 'catppuccin/nvim', - as = 'catppuccin', - config = require('plugins.colorscheme') - } - - -- Startup screen/dashboard - use 'glepnir/dashboard-nvim' - - -- Git in signcolumn - use 'airblade/vim-gitgutter' + use {'rebelot/kanagawa.nvim', config = require('plugins.colorscheme')} -- Statusline use { - 'hoob3rt/lualine.nvim', + 'nvim-lualine/lualine.nvim', requires = {'kyazdani42/nvim-web-devicons', opt = true}, - config = function() - require('lualine').setup {options = {theme = 'catppuccin'}} - end + config = require('plugins.lualine') } + -- Startup screen/dashboard + use 'glepnir/dashboard-nvim' + + -- Git in signcolumn + use 'airblade/vim-gitgutter' + -- Tabline/bufferline use { 'akinsho/nvim-bufferline.lua', @@ -82,9 +76,7 @@ require('packer').startup(function() -- Display possible keybinds use { 'folke/which-key.nvim', - config = function() - require('which-key').setup {spelling = {enabled = true}} - end + config = require('plugins.which-key') } -- Read editorconfig settings @@ -97,6 +89,7 @@ require('packer').startup(function() } use { 'williamboman/mason-lspconfig.nvim', + requires = {'ii14/emmylua-nvim'}, -- vim api documentation for lua lsp config = function() require('mason-lspconfig').setup {automatic_installation = true} end @@ -115,13 +108,14 @@ require('packer').startup(function() use { 'hrsh7th/nvim-cmp', requires = { - {'hrsh7th/cmp-nvim-lsp'}, -- LSP source - {'hrsh7th/cmp-path'}, -- Path source - {'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim"}, -- Git source {'hrsh7th/cmp-buffer'}, -- Buffer source - {'saadparwaiz1/cmp_luasnip'}, -- Snippets source + {'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim"}, -- Git source {'L3MON4D3/LuaSnip'}, -- Snippets plugin - {'rafamadriz/friendly-snippets'} -- Snippets collection + {'hrsh7th/cmp-nvim-lsp'}, -- LSP source + {'hrsh7th/cmp-nvim-lua'}, -- Neovim Lua API documentation + {'hrsh7th/cmp-path'}, -- Path source + {'rafamadriz/friendly-snippets'}, -- Snippets collection + {'saadparwaiz1/cmp_luasnip'} -- Snippets source }, config = require('plugins.cmp') } @@ -171,15 +165,13 @@ require('packer').startup(function() -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' - - -- Edit GPG encrypted files transparently - use 'jamessan/vim-gnupg' - -- If Packer was just installed, - -- sync plugins - if Packer_bootstrap then - require('packer').sync() - end + -- Edit GPG encrypted files transparently + use 'jamessan/vim-gnupg' + + -- If Packer was just installed, + -- sync plugins + if Packer_bootstrap then require('packer').sync() end end) diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 815d2d96..de86f563 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1 +1 @@ -require'lualine'.setup {options = {theme = 'catppuccin'}} +return function() require('lualine').setup() end From 92ea8e57e4ddd392525bf8ace693412d77190c9e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:01:50 +0300 Subject: [PATCH 1333/2667] Reduce footerm padding --- home/.config/foot/foot.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini index 9558280c..1868aef7 100644 --- a/home/.config/foot/foot.ini +++ b/home/.config/foot/foot.ini @@ -1,4 +1,4 @@ -pad=20x20 +pad=10x0 [scrollback] lines=1000 From 3d74bd9a2afb9a0f9a69f533e1e05eb58e4cd5d9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:01:50 +0300 Subject: [PATCH 1334/2667] Reduce footerm padding --- home/.config/foot/foot.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini index 9558280c..1868aef7 100644 --- a/home/.config/foot/foot.ini +++ b/home/.config/foot/foot.ini @@ -1,4 +1,4 @@ -pad=20x20 +pad=10x0 [scrollback] lines=1000 From d483cbe2ed6e2b2e55fe6eb1024de8bff61b0533 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:02:04 +0300 Subject: [PATCH 1335/2667] Change mirkwood default cpu governor --- root/etc/default/cpupower | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/default/cpupower b/root/etc/default/cpupower index 08af34fe..7786ac77 100644 --- a/root/etc/default/cpupower +++ b/root/etc/default/cpupower @@ -1,6 +1,6 @@ # vim:set ts=2 sw=2 ft=sh et: {%@@ if profile == "Mirkwood" @@%} -governor='powersave' +governor='schedutil' {%@@ else @@%} governor='performance' {%@@ endif @@%} From 3d64f03d95cd19f68ad0c6a14a890fae8bd1f4c9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:02:04 +0300 Subject: [PATCH 1336/2667] Change mirkwood default cpu governor --- root/etc/default/cpupower | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/default/cpupower b/root/etc/default/cpupower index 08af34fe..7786ac77 100644 --- a/root/etc/default/cpupower +++ b/root/etc/default/cpupower @@ -1,6 +1,6 @@ # vim:set ts=2 sw=2 ft=sh et: {%@@ if profile == "Mirkwood" @@%} -governor='powersave' +governor='schedutil' {%@@ else @@%} governor='performance' {%@@ endif @@%} From 830dd01a300c645cf5f0ecaf26e5657e4d6debdb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:11:25 +0300 Subject: [PATCH 1337/2667] Neovim: remove unneeded comments from settings.lua --- home/.config/nvim/lua/settings.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index e2637e3c..207c21e4 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -1,8 +1,6 @@ local o = vim.o local g = vim.g ------- Appearance ------ - -- True colors o.termguicolors = true @@ -27,8 +25,6 @@ o.laststatus = 3 -- Hide cmdline o.cmdheight = 0 ------- Misc ------- - -- Use suda by default g.suda_smart_edit = 1 From 9ded15386151fecde6beb1832010b8787d3594c7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:11:25 +0300 Subject: [PATCH 1338/2667] Neovim: remove unneeded comments from settings.lua --- home/.config/nvim/lua/settings.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index e2637e3c..207c21e4 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -1,8 +1,6 @@ local o = vim.o local g = vim.g ------- Appearance ------ - -- True colors o.termguicolors = true @@ -27,8 +25,6 @@ o.laststatus = 3 -- Hide cmdline o.cmdheight = 0 ------- Misc ------- - -- Use suda by default g.suda_smart_edit = 1 From 31a250b50a3d3c3eabf58580f50456a8ebbcb94d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:11:56 +0300 Subject: [PATCH 1339/2667] Neovim: format plugins/init.lua --- home/.config/nvim/lua/plugins/init.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 7f02d7d1..3d5d5842 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -74,10 +74,7 @@ require('packer').startup(function() use 'lambdalisue/suda.vim' -- Display possible keybinds - use { - 'folke/which-key.nvim', - config = require('plugins.which-key') - } + use {'folke/which-key.nvim', config = require('plugins.which-key')} -- Read editorconfig settings use 'editorconfig/editorconfig-vim' From ebed5b1f998f7651a609c5904698fb9adcdc7640 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:11:56 +0300 Subject: [PATCH 1340/2667] Neovim: format plugins/init.lua --- home/.config/nvim/lua/plugins/init.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 7f02d7d1..3d5d5842 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -74,10 +74,7 @@ require('packer').startup(function() use 'lambdalisue/suda.vim' -- Display possible keybinds - use { - 'folke/which-key.nvim', - config = require('plugins.which-key') - } + use {'folke/which-key.nvim', config = require('plugins.which-key')} -- Read editorconfig settings use 'editorconfig/editorconfig-vim' From 7f357be296f6ada3bd842fc1610d28fd997a7ed0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:33:55 +0300 Subject: [PATCH 1341/2667] Nvim: Added intentation settings --- home/.config/nvim/lua/settings.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 207c21e4..3bfe499b 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -34,3 +34,8 @@ o.smartcase = true -- Set leader g.mapleader = " " + +-- Indentation settings +o.tabstop = 4 +o.shiftwidth = 4 +o.smartindent = true From 09bdc5b94b929f8514ab1a585773d59aedbcf00b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:33:55 +0300 Subject: [PATCH 1342/2667] Nvim: Added intentation settings --- home/.config/nvim/lua/settings.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 207c21e4..3bfe499b 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -34,3 +34,8 @@ o.smartcase = true -- Set leader g.mapleader = " " + +-- Indentation settings +o.tabstop = 4 +o.shiftwidth = 4 +o.smartindent = true From fc76d8c0996b6c1c4b7d1444fdc7b1fe74f02061 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:55:10 +0300 Subject: [PATCH 1343/2667] Neovim: add mappings for snippet navigation --- home/.config/nvim/lua/plugins/cmp.lua | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 45ffa55b..04cc4ddf 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -10,12 +10,10 @@ return function() -- nvim-cmp setup local cmp = require 'cmp' + if not cmp then return end + cmp.setup { - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end - }, + snippet = {expand = function(args) luasnip.lsp_expand(args.body) end}, mapping = { [''] = cmp.mapping.select_prev_item(), [''] = cmp.mapping.select_next_item(), @@ -59,4 +57,14 @@ return function() -- load friendly-snippets to luasnip require('luasnip/loaders/from_vscode').lazy_load() + + -- Register snippet parameter navigation keybindings + local mappings = { + [''] = {luasnip.jump(1)}, + [''] = {luasnip.jump(-1)} + } + + local wk = require('which-key') + wk.register(mappings, {mode = "n"}) + wk.register(mappings, {mode = "s"}) end From ac0cdcf839af4a598df0d180ec579c52a106e911 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:55:10 +0300 Subject: [PATCH 1344/2667] Neovim: add mappings for snippet navigation --- home/.config/nvim/lua/plugins/cmp.lua | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 45ffa55b..04cc4ddf 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -10,12 +10,10 @@ return function() -- nvim-cmp setup local cmp = require 'cmp' + if not cmp then return end + cmp.setup { - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end - }, + snippet = {expand = function(args) luasnip.lsp_expand(args.body) end}, mapping = { [''] = cmp.mapping.select_prev_item(), [''] = cmp.mapping.select_next_item(), @@ -59,4 +57,14 @@ return function() -- load friendly-snippets to luasnip require('luasnip/loaders/from_vscode').lazy_load() + + -- Register snippet parameter navigation keybindings + local mappings = { + [''] = {luasnip.jump(1)}, + [''] = {luasnip.jump(-1)} + } + + local wk = require('which-key') + wk.register(mappings, {mode = "n"}) + wk.register(mappings, {mode = "s"}) end From 7fe8f0b9e2831b3c7848104f7ac10243a9998f39 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:56:46 +0300 Subject: [PATCH 1345/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 From f781e4b0c90e0cef512888a8e837413c40e596d8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:56:46 +0300 Subject: [PATCH 1346/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 From 44d1ccc82d2f3adb996eb032abd8affe73284044 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 12:24:59 +0300 Subject: [PATCH 1347/2667] Use exec to replace current shell with tmux instead of forking --- home/.config/zsh/05-misc.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/05-misc.zsh b/home/.config/zsh/05-misc.zsh index 5118b024..9a31d42e 100644 --- a/home/.config/zsh/05-misc.zsh +++ b/home/.config/zsh/05-misc.zsh @@ -1,6 +1,6 @@ # Launch tmux if logging in over ssh if [[ -z "$TMUX" ]] && [ "$SSH_CONNECTION" != "" ]; then - tmux attach-session -t ssh_tmux || tmux new-session -s ssh_tmux + exec tmux attach-session -t ssh_tmux || exec tmux new-session -s ssh_tmux fi # share history between running zsh instances From 76b50dbe6fd965d831cf91638a99c347c48c032e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 12:24:59 +0300 Subject: [PATCH 1348/2667] Use exec to replace current shell with tmux instead of forking --- home/.config/zsh/05-misc.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/05-misc.zsh b/home/.config/zsh/05-misc.zsh index 5118b024..9a31d42e 100644 --- a/home/.config/zsh/05-misc.zsh +++ b/home/.config/zsh/05-misc.zsh @@ -1,6 +1,6 @@ # Launch tmux if logging in over ssh if [[ -z "$TMUX" ]] && [ "$SSH_CONNECTION" != "" ]; then - tmux attach-session -t ssh_tmux || tmux new-session -s ssh_tmux + exec tmux attach-session -t ssh_tmux || exec tmux new-session -s ssh_tmux fi # share history between running zsh instances From 4df4bc914ff7cee2784a5ef1e647eab5d2877a2a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 12:31:38 +0300 Subject: [PATCH 1349/2667] Fix tmux autostart --- home/.config/zsh/05-misc.zsh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/05-misc.zsh b/home/.config/zsh/05-misc.zsh index 9a31d42e..68b0658a 100644 --- a/home/.config/zsh/05-misc.zsh +++ b/home/.config/zsh/05-misc.zsh @@ -1,6 +1,10 @@ # Launch tmux if logging in over ssh if [[ -z "$TMUX" ]] && [ "$SSH_CONNECTION" != "" ]; then - exec tmux attach-session -t ssh_tmux || exec tmux new-session -s ssh_tmux + if tmux has-session &2>/dev/null; then + exec tmux attach-session -t ssh_tmux + else + exec tmux new-session -s ssh_tmux + fi fi # share history between running zsh instances From ffba40b027dec34d3bf48097e4b4deb1e5bb174b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 12:31:38 +0300 Subject: [PATCH 1350/2667] Fix tmux autostart --- home/.config/zsh/05-misc.zsh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/05-misc.zsh b/home/.config/zsh/05-misc.zsh index 9a31d42e..68b0658a 100644 --- a/home/.config/zsh/05-misc.zsh +++ b/home/.config/zsh/05-misc.zsh @@ -1,6 +1,10 @@ # Launch tmux if logging in over ssh if [[ -z "$TMUX" ]] && [ "$SSH_CONNECTION" != "" ]; then - exec tmux attach-session -t ssh_tmux || exec tmux new-session -s ssh_tmux + if tmux has-session &2>/dev/null; then + exec tmux attach-session -t ssh_tmux + else + exec tmux new-session -s ssh_tmux + fi fi # share history between running zsh instances From 18402321941117cabfab3f259365d73b2594992b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:05:25 +0300 Subject: [PATCH 1351/2667] Nvim: add bashls --- home/.config/nvim/lua/plugins/lspconfig.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 54937ca3..f5f71e51 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -2,6 +2,7 @@ -- This is iterated through and every -- server is setup with lspconfig Servers = { + bashls = {}, html = {}, jsonls = {}, lemminx = {}, From 1b394b23f77db52902e0cc57b3fbb7367ce1b863 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:05:25 +0300 Subject: [PATCH 1352/2667] Nvim: add bashls --- home/.config/nvim/lua/plugins/lspconfig.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 54937ca3..f5f71e51 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -2,6 +2,7 @@ -- This is iterated through and every -- server is setup with lspconfig Servers = { + bashls = {}, html = {}, jsonls = {}, lemminx = {}, From c284adf73693fbb8fefd1a854f1e57736d5b06cd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:05:40 +0300 Subject: [PATCH 1353/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From c134cdce6cae834f8702741fdb94ccb58d46f063 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:05:40 +0300 Subject: [PATCH 1354/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From 44a63ba8a47359418f6fd6d68144b086190f9d6d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:11:09 +0300 Subject: [PATCH 1355/2667] Zsh: move tmux lauch to it's own configuration file and make it the first one executed --- home/.config/zsh/01-tmux.zsh | 8 ++++++++ home/.config/zsh/{01-env.zsh => 02-env.zsh} | 0 .../.config/zsh/{02-plugins.zsh => 03-plugins.zsh} | 0 .../.config/zsh/{03-aliases.zsh => 04-aliases.zsh} | 0 home/.config/zsh/05-misc.zsh | 14 -------------- .../zsh/{04-keybinds.zsh => 06-keybinds.zsh} | 0 home/.config/zsh/07-misc.zsh | 5 +++++ home/.config/zsh/{06-pacman.zsh => 08-pacman.zsh} | 0 8 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 home/.config/zsh/01-tmux.zsh rename home/.config/zsh/{01-env.zsh => 02-env.zsh} (100%) rename home/.config/zsh/{02-plugins.zsh => 03-plugins.zsh} (100%) rename home/.config/zsh/{03-aliases.zsh => 04-aliases.zsh} (100%) delete mode 100644 home/.config/zsh/05-misc.zsh rename home/.config/zsh/{04-keybinds.zsh => 06-keybinds.zsh} (100%) create mode 100644 home/.config/zsh/07-misc.zsh rename home/.config/zsh/{06-pacman.zsh => 08-pacman.zsh} (100%) diff --git a/home/.config/zsh/01-tmux.zsh b/home/.config/zsh/01-tmux.zsh new file mode 100644 index 00000000..3e329c82 --- /dev/null +++ b/home/.config/zsh/01-tmux.zsh @@ -0,0 +1,8 @@ +# Launch tmux if logging in over ssh +if [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then + if tmux has-session -t ssh_tmux &2>/dev/null; then + exec tmux -2 attach-session -t ssh_tmux + else + exec tmux -2 new-session -s ssh_tmux + fi +fi diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/02-env.zsh similarity index 100% rename from home/.config/zsh/01-env.zsh rename to home/.config/zsh/02-env.zsh diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/03-plugins.zsh similarity index 100% rename from home/.config/zsh/02-plugins.zsh rename to home/.config/zsh/03-plugins.zsh diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/04-aliases.zsh similarity index 100% rename from home/.config/zsh/03-aliases.zsh rename to home/.config/zsh/04-aliases.zsh diff --git a/home/.config/zsh/05-misc.zsh b/home/.config/zsh/05-misc.zsh deleted file mode 100644 index 68b0658a..00000000 --- a/home/.config/zsh/05-misc.zsh +++ /dev/null @@ -1,14 +0,0 @@ -# Launch tmux if logging in over ssh -if [[ -z "$TMUX" ]] && [ "$SSH_CONNECTION" != "" ]; then - if tmux has-session &2>/dev/null; then - exec tmux attach-session -t ssh_tmux - else - exec tmux new-session -s ssh_tmux - fi -fi - -# share history between running zsh instances -setopt share_history - -# ignore commands with leading space from history -setopt histignorespace diff --git a/home/.config/zsh/04-keybinds.zsh b/home/.config/zsh/06-keybinds.zsh similarity index 100% rename from home/.config/zsh/04-keybinds.zsh rename to home/.config/zsh/06-keybinds.zsh diff --git a/home/.config/zsh/07-misc.zsh b/home/.config/zsh/07-misc.zsh new file mode 100644 index 00000000..7f84ba4d --- /dev/null +++ b/home/.config/zsh/07-misc.zsh @@ -0,0 +1,5 @@ +# share history between running zsh instances +setopt share_history + +# ignore commands with leading space from history +setopt histignorespace diff --git a/home/.config/zsh/06-pacman.zsh b/home/.config/zsh/08-pacman.zsh similarity index 100% rename from home/.config/zsh/06-pacman.zsh rename to home/.config/zsh/08-pacman.zsh From 1ae2219d8aa6051f86028a1ae076cb5f0a4d3a70 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:11:09 +0300 Subject: [PATCH 1356/2667] Zsh: move tmux lauch to it's own configuration file and make it the first one executed --- home/.config/zsh/01-tmux.zsh | 8 ++++++++ home/.config/zsh/{01-env.zsh => 02-env.zsh} | 0 .../.config/zsh/{02-plugins.zsh => 03-plugins.zsh} | 0 .../.config/zsh/{03-aliases.zsh => 04-aliases.zsh} | 0 home/.config/zsh/05-misc.zsh | 14 -------------- .../zsh/{04-keybinds.zsh => 06-keybinds.zsh} | 0 home/.config/zsh/07-misc.zsh | 5 +++++ home/.config/zsh/{06-pacman.zsh => 08-pacman.zsh} | 0 8 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 home/.config/zsh/01-tmux.zsh rename home/.config/zsh/{01-env.zsh => 02-env.zsh} (100%) rename home/.config/zsh/{02-plugins.zsh => 03-plugins.zsh} (100%) rename home/.config/zsh/{03-aliases.zsh => 04-aliases.zsh} (100%) delete mode 100644 home/.config/zsh/05-misc.zsh rename home/.config/zsh/{04-keybinds.zsh => 06-keybinds.zsh} (100%) create mode 100644 home/.config/zsh/07-misc.zsh rename home/.config/zsh/{06-pacman.zsh => 08-pacman.zsh} (100%) diff --git a/home/.config/zsh/01-tmux.zsh b/home/.config/zsh/01-tmux.zsh new file mode 100644 index 00000000..3e329c82 --- /dev/null +++ b/home/.config/zsh/01-tmux.zsh @@ -0,0 +1,8 @@ +# Launch tmux if logging in over ssh +if [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then + if tmux has-session -t ssh_tmux &2>/dev/null; then + exec tmux -2 attach-session -t ssh_tmux + else + exec tmux -2 new-session -s ssh_tmux + fi +fi diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/02-env.zsh similarity index 100% rename from home/.config/zsh/01-env.zsh rename to home/.config/zsh/02-env.zsh diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/03-plugins.zsh similarity index 100% rename from home/.config/zsh/02-plugins.zsh rename to home/.config/zsh/03-plugins.zsh diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/04-aliases.zsh similarity index 100% rename from home/.config/zsh/03-aliases.zsh rename to home/.config/zsh/04-aliases.zsh diff --git a/home/.config/zsh/05-misc.zsh b/home/.config/zsh/05-misc.zsh deleted file mode 100644 index 68b0658a..00000000 --- a/home/.config/zsh/05-misc.zsh +++ /dev/null @@ -1,14 +0,0 @@ -# Launch tmux if logging in over ssh -if [[ -z "$TMUX" ]] && [ "$SSH_CONNECTION" != "" ]; then - if tmux has-session &2>/dev/null; then - exec tmux attach-session -t ssh_tmux - else - exec tmux new-session -s ssh_tmux - fi -fi - -# share history between running zsh instances -setopt share_history - -# ignore commands with leading space from history -setopt histignorespace diff --git a/home/.config/zsh/04-keybinds.zsh b/home/.config/zsh/06-keybinds.zsh similarity index 100% rename from home/.config/zsh/04-keybinds.zsh rename to home/.config/zsh/06-keybinds.zsh diff --git a/home/.config/zsh/07-misc.zsh b/home/.config/zsh/07-misc.zsh new file mode 100644 index 00000000..7f84ba4d --- /dev/null +++ b/home/.config/zsh/07-misc.zsh @@ -0,0 +1,5 @@ +# share history between running zsh instances +setopt share_history + +# ignore commands with leading space from history +setopt histignorespace diff --git a/home/.config/zsh/06-pacman.zsh b/home/.config/zsh/08-pacman.zsh similarity index 100% rename from home/.config/zsh/06-pacman.zsh rename to home/.config/zsh/08-pacman.zsh From b231f89993619e51830b632eb98262101acc8a1d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:11:53 +0300 Subject: [PATCH 1357/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 From 71a0d125cc2ea7b03e88e1ab31c1ee2884d16245 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:11:53 +0300 Subject: [PATCH 1358/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 From 79e3859ec628d2fde5230e551040bf805f32422c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:15:05 +0300 Subject: [PATCH 1359/2667] Zsh: fix reference to aliases configuration file --- home/.config/zsh/03-plugins.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 6e34d743..259fdb98 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -19,7 +19,7 @@ zinit ice lucid zinit light zsh-users/zsh-history-substring-search # fzf git awesomeness -zinit ice wait'1' lucid atload'source $HOME/.config/zsh/03-aliases.zsh' +zinit ice wait'1' lucid atload'source $HOME/.config/zsh/04-aliases.zsh' zinit light wfxr/forgit # lots of completions From cc98aec0f7806b74e2e8830f1500e9c52b85002c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:15:05 +0300 Subject: [PATCH 1360/2667] Zsh: fix reference to aliases configuration file --- home/.config/zsh/03-plugins.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 6e34d743..259fdb98 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -19,7 +19,7 @@ zinit ice lucid zinit light zsh-users/zsh-history-substring-search # fzf git awesomeness -zinit ice wait'1' lucid atload'source $HOME/.config/zsh/03-aliases.zsh' +zinit ice wait'1' lucid atload'source $HOME/.config/zsh/04-aliases.zsh' zinit light wfxr/forgit # lots of completions From 820b5d13774e46ac3db74c924c1e4bdf77f3f266 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:41:13 +0300 Subject: [PATCH 1361/2667] Neovim: make cursor vertical in insert mode --- home/.config/nvim/lua/settings.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 3bfe499b..283d676e 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -16,8 +16,10 @@ o.hidden = true -- Show line numbers o.number = true --- Blinking cursor -o.guicursor = 'a:blinkon1' +o.guicursor = table.concat({ + 'i:ver1', -- Vertical bar cursor in insert mode + 'a:blinkon1' -- Blinking cursor in all modes +}, ',') -- Enable global statusline o.laststatus = 3 From 08c6d7694fec1c2a6e3b9eb91910fb9c7555658d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:41:13 +0300 Subject: [PATCH 1362/2667] Neovim: make cursor vertical in insert mode --- home/.config/nvim/lua/settings.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 3bfe499b..283d676e 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -16,8 +16,10 @@ o.hidden = true -- Show line numbers o.number = true --- Blinking cursor -o.guicursor = 'a:blinkon1' +o.guicursor = table.concat({ + 'i:ver1', -- Vertical bar cursor in insert mode + 'a:blinkon1' -- Blinking cursor in all modes +}, ',') -- Enable global statusline o.laststatus = 3 From 17d116f41132f1d0e623193f3e0cb2d70fe386b8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 15:07:54 +0300 Subject: [PATCH 1363/2667] Fix snippet navigation mappings (hopefully) --- home/.config/nvim/lua/plugins/cmp.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 04cc4ddf..77c85167 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -59,12 +59,12 @@ return function() require('luasnip/loaders/from_vscode').lazy_load() -- Register snippet parameter navigation keybindings - local mappings = { + local snippet_mappings = { [''] = {luasnip.jump(1)}, [''] = {luasnip.jump(-1)} } local wk = require('which-key') - wk.register(mappings, {mode = "n"}) - wk.register(mappings, {mode = "s"}) + wk.register(snippet_mappings, {mode = "i"}) + wk.register(snippet_mappings, {mode = "s"}) end From 884c678e43c71a73123f50854c390b43de0f2475 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 15:07:54 +0300 Subject: [PATCH 1364/2667] Fix snippet navigation mappings (hopefully) --- home/.config/nvim/lua/plugins/cmp.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 04cc4ddf..77c85167 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -59,12 +59,12 @@ return function() require('luasnip/loaders/from_vscode').lazy_load() -- Register snippet parameter navigation keybindings - local mappings = { + local snippet_mappings = { [''] = {luasnip.jump(1)}, [''] = {luasnip.jump(-1)} } local wk = require('which-key') - wk.register(mappings, {mode = "n"}) - wk.register(mappings, {mode = "s"}) + wk.register(snippet_mappings, {mode = "i"}) + wk.register(snippet_mappings, {mode = "s"}) end From 2630f0a26f2ddcbc43fbf0de6612b7ba9540b8c8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 15:42:34 +0300 Subject: [PATCH 1365/2667] Nvim: separate cmp and luasnip configs --- home/.config/nvim/lua/plugins/cmp.lua | 26 ++++++----------------- home/.config/nvim/lua/plugins/init.lua | 19 +++++++++++------ home/.config/nvim/lua/plugins/luasnip.lua | 15 +++++++++++++ 3 files changed, 34 insertions(+), 26 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/luasnip.lua diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 77c85167..414d4f89 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -1,17 +1,15 @@ return function() + local cmp = require('cmp') + local luasnip = require('luasnip') + + if not cmp then return end + -- Setup git completion source require("cmp_git").setup() -- Set completeopt to have a better completion experience vim.o.completeopt = 'menuone,noselect' - -- luasnip setup - local luasnip = require 'luasnip' - - -- nvim-cmp setup - local cmp = require 'cmp' - if not cmp then return end - cmp.setup { snippet = {expand = function(args) luasnip.lsp_expand(args.body) end}, mapping = { @@ -52,19 +50,7 @@ return function() -- Enable autopairs when enter is processed -- on completion - local cmp_autopairs = require 'nvim-autopairs.completion.cmp' + local cmp_autopairs = require('nvim-autopairs.completion.cmp') cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) - -- load friendly-snippets to luasnip - require('luasnip/loaders/from_vscode').lazy_load() - - -- Register snippet parameter navigation keybindings - local snippet_mappings = { - [''] = {luasnip.jump(1)}, - [''] = {luasnip.jump(-1)} - } - - local wk = require('which-key') - wk.register(snippet_mappings, {mode = "i"}) - wk.register(snippet_mappings, {mode = "s"}) end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 3d5d5842..0685119e 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -86,7 +86,6 @@ require('packer').startup(function() } use { 'williamboman/mason-lspconfig.nvim', - requires = {'ii14/emmylua-nvim'}, -- vim api documentation for lua lsp config = function() require('mason-lspconfig').setup {automatic_installation = true} end @@ -101,20 +100,28 @@ require('packer').startup(function() -- Display function signature use 'ray-x/lsp_signature.nvim' + -- Snippets plugin + use { + 'L3MON4D3/LuaSnip', + requires = {'rafamadriz/friendly-snippets'}, -- Snippets collection + config = require('plugins.luasnip') + } + + -- vim api documentation for lua lsp + use {'ii14/emmylua-nvim'} + -- Completion use { 'hrsh7th/nvim-cmp', requires = { {'hrsh7th/cmp-buffer'}, -- Buffer source {'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim"}, -- Git source - {'L3MON4D3/LuaSnip'}, -- Snippets plugin {'hrsh7th/cmp-nvim-lsp'}, -- LSP source - {'hrsh7th/cmp-nvim-lua'}, -- Neovim Lua API documentation + {'hrsh7th/cmp-nvim-lua'}, -- Neovim Lua API documentation source {'hrsh7th/cmp-path'}, -- Path source - {'rafamadriz/friendly-snippets'}, -- Snippets collection {'saadparwaiz1/cmp_luasnip'} -- Snippets source }, - config = require('plugins.cmp') + config = require('plugins.cmp'), } -- Automatic brackets @@ -174,7 +181,7 @@ end) -- Sync plugins if Packer was just -- installed -if Packer_installed then +if Packer_bootstrap then print('Syncing plugins') require('packer').sync() end diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua new file mode 100644 index 00000000..8a6137d5 --- /dev/null +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -0,0 +1,15 @@ +return function() + local luasnip = require('luasnip') + local wk = require('which-key') + + -- load friendly-snippets to luasnip + require('luasnip/loaders/from_vscode').lazy_load() + + -- Register snippet navigation keybindings + local snippet_mappings = { + [''] = {luasnip.jump(1)}, + [''] = {luasnip.jump(-1)} + } + wk.register(snippet_mappings, {mode = "i"}) + wk.register(snippet_mappings, {mode = "s"}) +end From 65f2fd46a2516858d6e7bd28d9e5fa2c492a4a3e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 15:42:34 +0300 Subject: [PATCH 1366/2667] Nvim: separate cmp and luasnip configs --- home/.config/nvim/lua/plugins/cmp.lua | 26 ++++++----------------- home/.config/nvim/lua/plugins/init.lua | 19 +++++++++++------ home/.config/nvim/lua/plugins/luasnip.lua | 15 +++++++++++++ 3 files changed, 34 insertions(+), 26 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/luasnip.lua diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 77c85167..414d4f89 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -1,17 +1,15 @@ return function() + local cmp = require('cmp') + local luasnip = require('luasnip') + + if not cmp then return end + -- Setup git completion source require("cmp_git").setup() -- Set completeopt to have a better completion experience vim.o.completeopt = 'menuone,noselect' - -- luasnip setup - local luasnip = require 'luasnip' - - -- nvim-cmp setup - local cmp = require 'cmp' - if not cmp then return end - cmp.setup { snippet = {expand = function(args) luasnip.lsp_expand(args.body) end}, mapping = { @@ -52,19 +50,7 @@ return function() -- Enable autopairs when enter is processed -- on completion - local cmp_autopairs = require 'nvim-autopairs.completion.cmp' + local cmp_autopairs = require('nvim-autopairs.completion.cmp') cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) - -- load friendly-snippets to luasnip - require('luasnip/loaders/from_vscode').lazy_load() - - -- Register snippet parameter navigation keybindings - local snippet_mappings = { - [''] = {luasnip.jump(1)}, - [''] = {luasnip.jump(-1)} - } - - local wk = require('which-key') - wk.register(snippet_mappings, {mode = "i"}) - wk.register(snippet_mappings, {mode = "s"}) end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 3d5d5842..0685119e 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -86,7 +86,6 @@ require('packer').startup(function() } use { 'williamboman/mason-lspconfig.nvim', - requires = {'ii14/emmylua-nvim'}, -- vim api documentation for lua lsp config = function() require('mason-lspconfig').setup {automatic_installation = true} end @@ -101,20 +100,28 @@ require('packer').startup(function() -- Display function signature use 'ray-x/lsp_signature.nvim' + -- Snippets plugin + use { + 'L3MON4D3/LuaSnip', + requires = {'rafamadriz/friendly-snippets'}, -- Snippets collection + config = require('plugins.luasnip') + } + + -- vim api documentation for lua lsp + use {'ii14/emmylua-nvim'} + -- Completion use { 'hrsh7th/nvim-cmp', requires = { {'hrsh7th/cmp-buffer'}, -- Buffer source {'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim"}, -- Git source - {'L3MON4D3/LuaSnip'}, -- Snippets plugin {'hrsh7th/cmp-nvim-lsp'}, -- LSP source - {'hrsh7th/cmp-nvim-lua'}, -- Neovim Lua API documentation + {'hrsh7th/cmp-nvim-lua'}, -- Neovim Lua API documentation source {'hrsh7th/cmp-path'}, -- Path source - {'rafamadriz/friendly-snippets'}, -- Snippets collection {'saadparwaiz1/cmp_luasnip'} -- Snippets source }, - config = require('plugins.cmp') + config = require('plugins.cmp'), } -- Automatic brackets @@ -174,7 +181,7 @@ end) -- Sync plugins if Packer was just -- installed -if Packer_installed then +if Packer_bootstrap then print('Syncing plugins') require('packer').sync() end diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua new file mode 100644 index 00000000..8a6137d5 --- /dev/null +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -0,0 +1,15 @@ +return function() + local luasnip = require('luasnip') + local wk = require('which-key') + + -- load friendly-snippets to luasnip + require('luasnip/loaders/from_vscode').lazy_load() + + -- Register snippet navigation keybindings + local snippet_mappings = { + [''] = {luasnip.jump(1)}, + [''] = {luasnip.jump(-1)} + } + wk.register(snippet_mappings, {mode = "i"}) + wk.register(snippet_mappings, {mode = "s"}) +end From a1bb9b97f4ef3e4d40bb294491f627110488d050 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 15:51:09 +0300 Subject: [PATCH 1367/2667] Split Mason config to own file --- home/.config/nvim/lua/plugins/init.lua | 19 ++++++++++++------- home/.config/nvim/lua/plugins/mason.lua | 10 ++++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/mason.lua diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 0685119e..458d6040 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -79,20 +79,25 @@ require('packer').startup(function() -- Read editorconfig settings use 'editorconfig/editorconfig-vim' - -- Install LSP server executables + -- Package manager for LSP servers, DAP servers etc. use { 'williamboman/mason.nvim', - config = function() require('mason').setup {} end + config = require('plugins.mason').setup } + + -- Install LSP server executables with Mason use { 'williamboman/mason-lspconfig.nvim', - config = function() - require('mason-lspconfig').setup {automatic_installation = true} - end + after = 'mason', + config = require('plugins.mason').lspconfig_setup } -- Configs for built-in LSP - use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup} + use { + 'neovim/nvim-lspconfig', + after = 'mason-lspconfig', + config = require('plugins.lspconfig').setup + } -- Additional LSP features for Java use 'mfussenegger/nvim-jdtls' @@ -121,7 +126,7 @@ require('packer').startup(function() {'hrsh7th/cmp-path'}, -- Path source {'saadparwaiz1/cmp_luasnip'} -- Snippets source }, - config = require('plugins.cmp'), + config = require('plugins.cmp') } -- Automatic brackets diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua new file mode 100644 index 00000000..5a3f4a9c --- /dev/null +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -0,0 +1,10 @@ +local M = {} + +local opts = {mason = {}, lspconfig = {automatic_installation = true}} + +M.setup = function() require('mason').setup(opts.mason) end + +M.lspconfig_setup = + function() require('mason-lspconfig').setup(opts.lspconfig) end + +return M From fe2ee02badec2c9ac82100667c49919271880e0b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 15:51:09 +0300 Subject: [PATCH 1368/2667] Split Mason config to own file --- home/.config/nvim/lua/plugins/init.lua | 19 ++++++++++++------- home/.config/nvim/lua/plugins/mason.lua | 10 ++++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/mason.lua diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 0685119e..458d6040 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -79,20 +79,25 @@ require('packer').startup(function() -- Read editorconfig settings use 'editorconfig/editorconfig-vim' - -- Install LSP server executables + -- Package manager for LSP servers, DAP servers etc. use { 'williamboman/mason.nvim', - config = function() require('mason').setup {} end + config = require('plugins.mason').setup } + + -- Install LSP server executables with Mason use { 'williamboman/mason-lspconfig.nvim', - config = function() - require('mason-lspconfig').setup {automatic_installation = true} - end + after = 'mason', + config = require('plugins.mason').lspconfig_setup } -- Configs for built-in LSP - use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup} + use { + 'neovim/nvim-lspconfig', + after = 'mason-lspconfig', + config = require('plugins.lspconfig').setup + } -- Additional LSP features for Java use 'mfussenegger/nvim-jdtls' @@ -121,7 +126,7 @@ require('packer').startup(function() {'hrsh7th/cmp-path'}, -- Path source {'saadparwaiz1/cmp_luasnip'} -- Snippets source }, - config = require('plugins.cmp'), + config = require('plugins.cmp') } -- Automatic brackets diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua new file mode 100644 index 00000000..5a3f4a9c --- /dev/null +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -0,0 +1,10 @@ +local M = {} + +local opts = {mason = {}, lspconfig = {automatic_installation = true}} + +M.setup = function() require('mason').setup(opts.mason) end + +M.lspconfig_setup = + function() require('mason-lspconfig').setup(opts.lspconfig) end + +return M From 38aadc3eaab2751e08d033c612ec8dc5a241936f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 16:19:22 +0300 Subject: [PATCH 1369/2667] Fix formatting in nvim init.lua --- home/.config/nvim/init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 71af250d..3763bcdc 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,3 +1,3 @@ -require 'keybinds' -require 'settings' -require 'plugins/init' +require('keybinds') +require('settings') +require('plugins.init') From f3953befe33921c2eaaef637f78ecc3abdc91a13 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 16:19:22 +0300 Subject: [PATCH 1370/2667] Fix formatting in nvim init.lua --- home/.config/nvim/init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 71af250d..3763bcdc 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,3 +1,3 @@ -require 'keybinds' -require 'settings' -require 'plugins/init' +require('keybinds') +require('settings') +require('plugins.init') From 3f8b9e8c83cd70cd36ede795be9560c6c4f4d3b3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 16:19:47 +0300 Subject: [PATCH 1371/2667] Fix variable scope in mason configuration --- home/.config/nvim/lua/plugins/mason.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 5a3f4a9c..f774b81f 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -1,10 +1,10 @@ local M = {} -local opts = {mason = {}, lspconfig = {automatic_installation = true}} +Opts = {mason = {}, lspconfig = {automatic_installation = true}} -M.setup = function() require('mason').setup(opts.mason) end +M.setup = function() require('mason').setup(Opts.mason) end M.lspconfig_setup = - function() require('mason-lspconfig').setup(opts.lspconfig) end + function() require('mason-lspconfig').setup(Opts.lspconfig) end return M From 1151b87fadf970a0399afe4a74a68f7478034a1c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 16:19:47 +0300 Subject: [PATCH 1372/2667] Fix variable scope in mason configuration --- home/.config/nvim/lua/plugins/mason.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 5a3f4a9c..f774b81f 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -1,10 +1,10 @@ local M = {} -local opts = {mason = {}, lspconfig = {automatic_installation = true}} +Opts = {mason = {}, lspconfig = {automatic_installation = true}} -M.setup = function() require('mason').setup(opts.mason) end +M.setup = function() require('mason').setup(Opts.mason) end M.lspconfig_setup = - function() require('mason-lspconfig').setup(opts.lspconfig) end + function() require('mason-lspconfig').setup(Opts.lspconfig) end return M From 7e3aa27aee7799204a306f8aa3343ca31bc57940 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 16:21:02 +0300 Subject: [PATCH 1373/2667] Nvim: remove packer after options, they seem to break everything --- home/.config/nvim/lua/plugins/init.lua | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 458d6040..dd26d9e8 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -80,22 +80,17 @@ require('packer').startup(function() use 'editorconfig/editorconfig-vim' -- Package manager for LSP servers, DAP servers etc. - use { - 'williamboman/mason.nvim', - config = require('plugins.mason').setup - } + use {'williamboman/mason.nvim', config = require('plugins.mason').setup} -- Install LSP server executables with Mason use { 'williamboman/mason-lspconfig.nvim', - after = 'mason', config = require('plugins.mason').lspconfig_setup } -- Configs for built-in LSP use { 'neovim/nvim-lspconfig', - after = 'mason-lspconfig', config = require('plugins.lspconfig').setup } From 8b9aa920a627185af0c95192427b9d9bae9c1b13 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 16:21:02 +0300 Subject: [PATCH 1374/2667] Nvim: remove packer after options, they seem to break everything --- home/.config/nvim/lua/plugins/init.lua | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 458d6040..dd26d9e8 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -80,22 +80,17 @@ require('packer').startup(function() use 'editorconfig/editorconfig-vim' -- Package manager for LSP servers, DAP servers etc. - use { - 'williamboman/mason.nvim', - config = require('plugins.mason').setup - } + use {'williamboman/mason.nvim', config = require('plugins.mason').setup} -- Install LSP server executables with Mason use { 'williamboman/mason-lspconfig.nvim', - after = 'mason', config = require('plugins.mason').lspconfig_setup } -- Configs for built-in LSP use { 'neovim/nvim-lspconfig', - after = 'mason-lspconfig', config = require('plugins.lspconfig').setup } From 928509ed9a4196442d329a4968bd8e3d8a8f30fa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 4 Sep 2022 13:00:01 +0300 Subject: [PATCH 1375/2667] Fix tmux startup --- home/.config/zsh/01-tmux.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/01-tmux.zsh b/home/.config/zsh/01-tmux.zsh index 3e329c82..f909becd 100644 --- a/home/.config/zsh/01-tmux.zsh +++ b/home/.config/zsh/01-tmux.zsh @@ -1,6 +1,6 @@ # Launch tmux if logging in over ssh if [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then - if tmux has-session -t ssh_tmux &2>/dev/null; then + if tmux has-session -t ssh_tmux 2>/dev/null; then exec tmux -2 attach-session -t ssh_tmux else exec tmux -2 new-session -s ssh_tmux From 2d7890154e504dba0c3d20d11d52227f041caf41 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 4 Sep 2022 13:00:01 +0300 Subject: [PATCH 1376/2667] Fix tmux startup --- home/.config/zsh/01-tmux.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/01-tmux.zsh b/home/.config/zsh/01-tmux.zsh index 3e329c82..f909becd 100644 --- a/home/.config/zsh/01-tmux.zsh +++ b/home/.config/zsh/01-tmux.zsh @@ -1,6 +1,6 @@ # Launch tmux if logging in over ssh if [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then - if tmux has-session -t ssh_tmux &2>/dev/null; then + if tmux has-session -t ssh_tmux 2>/dev/null; then exec tmux -2 attach-session -t ssh_tmux else exec tmux -2 new-session -s ssh_tmux From a0549dcb8c8b0577f37ef8ac262c0337c91c63a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 5 Sep 2022 15:56:08 +0300 Subject: [PATCH 1377/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From fe679061ba2047302b48cdc395d882552ba9c892 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 5 Sep 2022 15:56:08 +0300 Subject: [PATCH 1378/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From 1e3e8ca84d824305bf6bdb1bf8ebebb833459097 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 11:31:10 +0300 Subject: [PATCH 1379/2667] Add pass-git-helper configuration --- home/.config/pass-git-helper/git-pass-mapping.ini | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 home/.config/pass-git-helper/git-pass-mapping.ini diff --git a/home/.config/pass-git-helper/git-pass-mapping.ini b/home/.config/pass-git-helper/git-pass-mapping.ini new file mode 100644 index 00000000..aeb49ee9 --- /dev/null +++ b/home/.config/pass-git-helper/git-pass-mapping.ini @@ -0,0 +1,9 @@ +[DEFAULT] +username_extractor=regex_search +regex_username=^username: (.*)$ + +[git.rossum.fi*] +target=work/ldap.rossum.fi + +[git.korhonen.cc*] +target=git/git.korhonen.cc From ca2412143fbb3fc4d159bdc3b35cf30336537bb1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 11:31:10 +0300 Subject: [PATCH 1380/2667] Add pass-git-helper configuration --- home/.config/pass-git-helper/git-pass-mapping.ini | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 home/.config/pass-git-helper/git-pass-mapping.ini diff --git a/home/.config/pass-git-helper/git-pass-mapping.ini b/home/.config/pass-git-helper/git-pass-mapping.ini new file mode 100644 index 00000000..aeb49ee9 --- /dev/null +++ b/home/.config/pass-git-helper/git-pass-mapping.ini @@ -0,0 +1,9 @@ +[DEFAULT] +username_extractor=regex_search +regex_username=^username: (.*)$ + +[git.rossum.fi*] +target=work/ldap.rossum.fi + +[git.korhonen.cc*] +target=git/git.korhonen.cc From 1542a1a73a521710c068660403a9d3d369ddb26f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 11:38:00 +0300 Subject: [PATCH 1381/2667] Add git credential helpers --- home/.config/git/config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/git/config b/home/.config/git/config index dc38079b..80168b19 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -46,3 +46,7 @@ [init] defaultBranch = main + +[credential] + helper = cache --timeout=600 + helper = !pass-git-helper $@ From 5c6d81c7ffad7f6a562d109200bcf3323a2b201f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 11:38:00 +0300 Subject: [PATCH 1382/2667] Add git credential helpers --- home/.config/git/config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/git/config b/home/.config/git/config index dc38079b..80168b19 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -46,3 +46,7 @@ [init] defaultBranch = main + +[credential] + helper = cache --timeout=600 + helper = !pass-git-helper $@ From 391c1d0e5a3e4770e3b8546ba957b4e79ec2d340 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 16:37:50 +0300 Subject: [PATCH 1383/2667] Neovim: set cmdheight = 1 --- dotdrop | 2 +- home/.config/nvim/lua/settings.lua | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 283d676e..37ab5ff1 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -24,8 +24,7 @@ o.guicursor = table.concat({ -- Enable global statusline o.laststatus = 3 --- Hide cmdline -o.cmdheight = 0 +o.cmdheight = 1 -- Use suda by default g.suda_smart_edit = 1 From 19fbc933dfacdc476fcd3e3ad029b7b39aa5aa4a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 16:37:50 +0300 Subject: [PATCH 1384/2667] Neovim: set cmdheight = 1 --- dotdrop | 2 +- home/.config/nvim/lua/settings.lua | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 283d676e..37ab5ff1 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -24,8 +24,7 @@ o.guicursor = table.concat({ -- Enable global statusline o.laststatus = 3 --- Hide cmdline -o.cmdheight = 0 +o.cmdheight = 1 -- Use suda by default g.suda_smart_edit = 1 From 119f40ef6c5f00827d9aeadd9aa95747c20de5a2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 16:58:43 +0300 Subject: [PATCH 1385/2667] Fix for zprofile --- home/.zprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.zprofile b/home/.zprofile index 7b7a6fab..edcd6beb 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,4 +1,4 @@ -if [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]]; then +if [[ -z $DISPLAY && $XDG_VTNR -eq 1 && -z "$SSH_CONNECTION" ]]; then {%@@ if profile == 'Moria' @@%} systemctl --user mask pipewire.service pipewire-pulse.service && systemctl --user stop pipewire.service pipewire-pulse.service && kodi; systemctl --user unmask pipewire.service pipewire-pulse.service && systemctl --user start pipewire.service pipewire-pulse.service {%@@ elif profile == 'Mirkwood' @@%} From a96a438dda45935337b6dfa220df0a4d2e3f2bf0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 16:58:43 +0300 Subject: [PATCH 1386/2667] Fix for zprofile --- home/.zprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.zprofile b/home/.zprofile index 7b7a6fab..edcd6beb 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,4 +1,4 @@ -if [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]]; then +if [[ -z $DISPLAY && $XDG_VTNR -eq 1 && -z "$SSH_CONNECTION" ]]; then {%@@ if profile == 'Moria' @@%} systemctl --user mask pipewire.service pipewire-pulse.service && systemctl --user stop pipewire.service pipewire-pulse.service && kodi; systemctl --user unmask pipewire.service pipewire-pulse.service && systemctl --user start pipewire.service pipewire-pulse.service {%@@ elif profile == 'Mirkwood' @@%} From 1a57701746913868053de4206cd112106f5194ef Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 19:00:07 +0300 Subject: [PATCH 1387/2667] Remove unneeded options from ssh config and gpg-agent config --- home/.gnupg/gpg-agent.conf | 3 --- home/.ssh/config | 1 - 2 files changed, 4 deletions(-) diff --git a/home/.gnupg/gpg-agent.conf b/home/.gnupg/gpg-agent.conf index a2009825..9e025a01 100644 --- a/home/.gnupg/gpg-agent.conf +++ b/home/.gnupg/gpg-agent.conf @@ -1,5 +1,2 @@ enable-ssh-support pinentry-program /usr/bin/pinentry-gnome3 -default-cache-ttl 60 -max-cache-ttl 120 -extra-socket /run/user/1000/gnupg/S.gpg-agent.extra diff --git a/home/.ssh/config b/home/.ssh/config index d275a29e..f6058f8e 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -31,7 +31,6 @@ host moria HostName korhonen.cc port 221 User balrog - StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host moria-unlock From 6eee824bdd3fc03dd284284656eda4cc32059680 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 19:00:07 +0300 Subject: [PATCH 1388/2667] Remove unneeded options from ssh config and gpg-agent config --- home/.gnupg/gpg-agent.conf | 3 --- home/.ssh/config | 1 - 2 files changed, 4 deletions(-) diff --git a/home/.gnupg/gpg-agent.conf b/home/.gnupg/gpg-agent.conf index a2009825..9e025a01 100644 --- a/home/.gnupg/gpg-agent.conf +++ b/home/.gnupg/gpg-agent.conf @@ -1,5 +1,2 @@ enable-ssh-support pinentry-program /usr/bin/pinentry-gnome3 -default-cache-ttl 60 -max-cache-ttl 120 -extra-socket /run/user/1000/gnupg/S.gpg-agent.extra diff --git a/home/.ssh/config b/home/.ssh/config index d275a29e..f6058f8e 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -31,7 +31,6 @@ host moria HostName korhonen.cc port 221 User balrog - StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host moria-unlock From 2ad579435fdd0ab91c4c496116b59cc57bccf606 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 20:00:11 +0300 Subject: [PATCH 1389/2667] Fix ssh agent forwarding for Moria --- home/.ssh/config | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/home/.ssh/config b/home/.ssh/config index f6058f8e..25e376ee 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -7,6 +7,15 @@ host * ControlPersist 10m ControlPath ~/.ssh/%r@%h:%p.socket +host moria + HostName korhonen.cc + port 221 + User balrog + # Forward GPG agent + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra + # Forward SSH agent + RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/1000/gnupg/S.gpg-agent.ssh + host gitea HostName korhonen.cc user git @@ -27,12 +36,6 @@ Host aur HostName aur.archlinux.org User aur -host moria - HostName korhonen.cc - port 221 - User balrog - RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra - host moria-unlock HostName korhonen.cc port 221 From ac829e286a68270620c20bd9ed89bcf169ebdb20 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 20:00:11 +0300 Subject: [PATCH 1390/2667] Fix ssh agent forwarding for Moria --- home/.ssh/config | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/home/.ssh/config b/home/.ssh/config index f6058f8e..25e376ee 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -7,6 +7,15 @@ host * ControlPersist 10m ControlPath ~/.ssh/%r@%h:%p.socket +host moria + HostName korhonen.cc + port 221 + User balrog + # Forward GPG agent + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra + # Forward SSH agent + RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/1000/gnupg/S.gpg-agent.ssh + host gitea HostName korhonen.cc user git @@ -27,12 +36,6 @@ Host aur HostName aur.archlinux.org User aur -host moria - HostName korhonen.cc - port 221 - User balrog - RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra - host moria-unlock HostName korhonen.cc port 221 From 99e97617834798875546643d2671c1d9c9b423e2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 20:03:48 +0300 Subject: [PATCH 1391/2667] Enable SSH agent forwarding for termux --- home/.config/zsh/02-env.zsh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index f60d3c32..bcfaf715 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -61,12 +61,11 @@ export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR export SYSTEMD_PAGER=less -{%@@ if os == "arch" or os == "ubuntu" @@%} if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" fi -gpgconf --launch gpg-agent -{%@@ elif os == "termux" @@%} +{%@@ if os == "termux" @@%} + eval $(okc-ssh-agent) {%@@ endif @@%} From 0deb2e37e0737549e923ace337bf76cd8dc7f848 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 20:03:48 +0300 Subject: [PATCH 1392/2667] Enable SSH agent forwarding for termux --- home/.config/zsh/02-env.zsh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index f60d3c32..bcfaf715 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -61,12 +61,11 @@ export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR export SYSTEMD_PAGER=less -{%@@ if os == "arch" or os == "ubuntu" @@%} if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" fi -gpgconf --launch gpg-agent -{%@@ elif os == "termux" @@%} +{%@@ if os == "termux" @@%} + eval $(okc-ssh-agent) {%@@ endif @@%} From dd6311f2f166af386cfc5791e237b9d1716d311f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 20:10:49 +0300 Subject: [PATCH 1393/2667] Revert "Enable SSH agent forwarding for termux" This reverts commit 99e97617834798875546643d2671c1d9c9b423e2. --- home/.config/zsh/02-env.zsh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index bcfaf715..f60d3c32 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -61,11 +61,12 @@ export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR export SYSTEMD_PAGER=less +{%@@ if os == "arch" or os == "ubuntu" @@%} if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" fi -{%@@ if os == "termux" @@%} - +gpgconf --launch gpg-agent +{%@@ elif os == "termux" @@%} eval $(okc-ssh-agent) {%@@ endif @@%} From 939c0c14da863496de69859363857526688902cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 20:10:49 +0300 Subject: [PATCH 1394/2667] Revert "Enable SSH agent forwarding for termux" This reverts commit 0deb2e37e0737549e923ace337bf76cd8dc7f848. --- home/.config/zsh/02-env.zsh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index bcfaf715..f60d3c32 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -61,11 +61,12 @@ export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR export SYSTEMD_PAGER=less +{%@@ if os == "arch" or os == "ubuntu" @@%} if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" fi -{%@@ if os == "termux" @@%} - +gpgconf --launch gpg-agent +{%@@ elif os == "termux" @@%} eval $(okc-ssh-agent) {%@@ endif @@%} From 0330d0e9a1512c2e90066d0a400e5b2254b56f1a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 20:51:34 +0300 Subject: [PATCH 1395/2667] Switch to librewolf --- home/.config/sway/conf.d/01-vars.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index 308251aa..f5efaca2 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -2,7 +2,7 @@ set $mod Mod4 set $term footclient -set $browser firefox +set $browser librewolf set $gnome-schema org.gnome.desktop.interface set $wallpaper ~/Pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) set $scripts ~/.config/sway/scripts From 3cd3b232a1d9680e6545341c62ea034dbd102993 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 20:51:34 +0300 Subject: [PATCH 1396/2667] Switch to librewolf --- home/.config/sway/conf.d/01-vars.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index 308251aa..f5efaca2 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -2,7 +2,7 @@ set $mod Mod4 set $term footclient -set $browser firefox +set $browser librewolf set $gnome-schema org.gnome.desktop.interface set $wallpaper ~/Pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) set $scripts ~/.config/sway/scripts From 428789cb90238be221632eed52211337195926de Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:22:33 +0300 Subject: [PATCH 1397/2667] Nvim: add colorizer plugin --- home/.config/nvim/lua/plugins/init.lua | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index dd26d9e8..7690d1e1 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -89,10 +89,7 @@ require('packer').startup(function() } -- Configs for built-in LSP - use { - 'neovim/nvim-lspconfig', - config = require('plugins.lspconfig').setup - } + use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup} -- Additional LSP features for Java use 'mfussenegger/nvim-jdtls' @@ -173,6 +170,12 @@ require('packer').startup(function() -- Edit GPG encrypted files transparently use 'jamessan/vim-gnupg' + -- High performance color highlighter + use { + 'norcalli/nvim-colorizer.lua', + config = function() require('colorizer').setup() end + } + -- If Packer was just installed, -- sync plugins if Packer_bootstrap then require('packer').sync() end From 17032b95d0b1860a1b6ff4e13a3fff525e070a8e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:22:33 +0300 Subject: [PATCH 1398/2667] Nvim: add colorizer plugin --- home/.config/nvim/lua/plugins/init.lua | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index dd26d9e8..7690d1e1 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -89,10 +89,7 @@ require('packer').startup(function() } -- Configs for built-in LSP - use { - 'neovim/nvim-lspconfig', - config = require('plugins.lspconfig').setup - } + use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup} -- Additional LSP features for Java use 'mfussenegger/nvim-jdtls' @@ -173,6 +170,12 @@ require('packer').startup(function() -- Edit GPG encrypted files transparently use 'jamessan/vim-gnupg' + -- High performance color highlighter + use { + 'norcalli/nvim-colorizer.lua', + config = function() require('colorizer').setup() end + } + -- If Packer was just installed, -- sync plugins if Packer_bootstrap then require('packer').sync() end From 348a90f3ad3170b27bfcc3dcd12784166f90972a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:23:51 +0300 Subject: [PATCH 1399/2667] Update rofi config --- home/.config/rofi/config | 9 -- home/.config/rofi/config.rasi | 150 ++++++++++++++++++++++ home/.config/rofi/gruvbox-common.inc.rasi | 127 ------------------ home/.config/rofi/gruvbox-dark.rasi | 61 --------- home/.config/rofi/nord.rasi | 150 ---------------------- 5 files changed, 150 insertions(+), 347 deletions(-) delete mode 100644 home/.config/rofi/config create mode 100644 home/.config/rofi/config.rasi delete mode 100644 home/.config/rofi/gruvbox-common.inc.rasi delete mode 100644 home/.config/rofi/gruvbox-dark.rasi delete mode 100644 home/.config/rofi/nord.rasi diff --git a/home/.config/rofi/config b/home/.config/rofi/config deleted file mode 100644 index d12d19db..00000000 --- a/home/.config/rofi/config +++ /dev/null @@ -1,9 +0,0 @@ -rofi.lines: 5 -rofi.eh: 2 -rofi.padding: 50 -rofi.fullscreen: false -rofi.bw: 0 -rofi.separator-style: none -rofi.hide-scrollbar: true -rofi.font: Overpass 22 -rofi.theme: ~/.config/rofi/gruvbox-dark.rasi diff --git a/home/.config/rofi/config.rasi b/home/.config/rofi/config.rasi new file mode 100644 index 00000000..502769e7 --- /dev/null +++ b/home/.config/rofi/config.rasi @@ -0,0 +1,150 @@ +// vim: ft=rasi + +configuration { + font: "Overpass 10"; + show-icons: true; + terminal: "foot"; + // modi: "run,ssh"; + // location: 0; + // yoffset: 0; + // xoffset: 0; + // fixed-num-lines: true; + // ssh-client: "ssh"; + // ssh-command: "{terminal} -e {ssh-client} {host} [-p {port}]"; + // run-command: "{cmd}"; + // run-list-command: ""; + // run-shell-command: "{terminal} -e {cmd}"; + // window-command: "wmctrl -i -R {window}"; + // window-match-fields: "all"; + // icon-theme: "Papirus-Dark"; + // drun-match-fields: "name,generic,exec,categories,keywords"; + // drun-categories: ; + // drun-show-actions: false; + // drun-display-format: "{name}"; + // drun-url-launcher: "xdg-open"; + // disable-history: false; + // ignored-prefixes: ""; + // sort: false; + // sorting-method: "normal"; + // case-sensitive: false; + // cycle: true; + // sidebar-mode: false; + // hover-select: false; + // eh: 1; + // auto-select: false; + // parse-hosts: false; + // parse-known-hosts: true; + // combi-modi: "window,run"; + // matching: "normal"; + // tokenize: true; + // m: "-5"; + // filter: ; + // dpi: -1; + // threads: 0; + // scroll-method: 0; + // window-format: "{w} {c} {t}"; + // click-to-exit: true; + // max-history-size: 25; + // combi-hide-mode-prefix: false; + // combi-display-format: "{mode} {text}"; + // matching-negate-char: '-' unsupported ; + // cache-dir: ; + // window-thumbnail: false; + // drun-use-desktop-cache: false; + // drun-reload-desktop-cache: false; + // normalize-match: false; + // steal-focus: false; + // application-fallback-icon: ; + // pid: "/run/user/1000/rofi.pid"; + // display-run: ; + // display-ssh: ; + // display-drun: ""; + // display-combi: ; + // display-keys: ; + // display-filebrowser: ; + // kb-primary-paste: "Control+V,Shift+Insert"; + // kb-secondary-paste: "Control+v,Insert"; + // kb-clear-line: "Control+w"; + // kb-move-front: "Control+a"; + // kb-move-end: "Control+e"; + // kb-move-word-back: "Alt+b,Control+Left"; + // kb-move-word-forward: "Alt+f,Control+Right"; + // kb-move-char-back: "Left,Control+b"; + // kb-move-char-forward: "Right,Control+f"; + // kb-remove-word-back: "Control+Alt+h,Control+BackSpace"; + // kb-remove-word-forward: "Control+Alt+d"; + // kb-remove-char-forward: "Delete,Control+d"; + // kb-remove-char-back: "BackSpace,Shift+BackSpace,Control+h"; + // kb-remove-to-eol: "Control+k"; + // kb-remove-to-sol: "Control+u"; + // kb-accept-entry: "Control+j,Control+m,Return,KP_Enter"; + // kb-accept-custom: "Control+Return"; + // kb-accept-custom-alt: "Control+Shift+Return"; + // kb-accept-alt: "Shift+Return"; + // kb-delete-entry: "Shift+Delete"; + // kb-mode-next: "Shift+Right,Control+Tab"; + // kb-mode-previous: "Shift+Left,Control+ISO_Left_Tab"; + // kb-mode-complete: "Control+l"; + // kb-row-left: "Control+Page_Up"; + // kb-row-right: "Control+Page_Down"; + // kb-row-up: "Up,Control+p,ISO_Left_Tab"; + // kb-row-down: "Down,Control+n"; + // kb-row-tab: "Tab"; + // kb-page-prev: "Page_Up"; + // kb-page-next: "Page_Down"; + // kb-row-first: "Home,KP_Home"; + // kb-row-last: "End,KP_End"; + // kb-row-select: "Control+space"; + // kb-screenshot: "Alt+S"; + // kb-ellipsize: "Alt+period"; + // kb-toggle-case-sensitivity: "grave,dead_grave"; + // kb-toggle-sort: "Alt+grave"; + // kb-cancel: "Escape,Control+g,Control+bracketleft"; + // kb-custom-1: "Alt+1"; + // kb-custom-2: "Alt+2"; + // kb-custom-3: "Alt+3"; + // kb-custom-4: "Alt+4"; + // kb-custom-5: "Alt+5"; + // kb-custom-6: "Alt+6"; + // kb-custom-7: "Alt+7"; + // kb-custom-8: "Alt+8"; + // kb-custom-9: "Alt+9"; + // kb-custom-10: "Alt+0"; + // kb-custom-11: "Alt+exclam"; + // kb-custom-12: "Alt+at"; + // kb-custom-13: "Alt+numbersign"; + // kb-custom-14: "Alt+dollar"; + // kb-custom-15: "Alt+percent"; + // kb-custom-16: "Alt+dead_circumflex"; + // kb-custom-17: "Alt+ampersand"; + // kb-custom-18: "Alt+asterisk"; + // kb-custom-19: "Alt+parenleft"; + // kb-select-1: "Super+1"; + // kb-select-2: "Super+2"; + // kb-select-3: "Super+3"; + // kb-select-4: "Super+4"; + // kb-select-5: "Super+5"; + // kb-select-6: "Super+6"; + // kb-select-7: "Super+7"; + // kb-select-8: "Super+8"; + // kb-select-9: "Super+9"; + // kb-select-10: "Super+0"; + // ml-row-left: "ScrollLeft"; + // ml-row-right: "ScrollRight"; + // ml-row-up: "ScrollUp"; + // ml-row-down: "ScrollDown"; + // me-select-entry: "MousePrimary"; + // me-accept-entry: "MouseDPrimary"; + // me-accept-custom: "Control+MouseDPrimary"; + /* +timeout { +action: "kb-cancel"; +delay: 0; +} +filebrowser { +directories-first: true; +sorting-method: "name"; +} + */ +} +@theme "~/.cache/wal/colors-rofi-dark" diff --git a/home/.config/rofi/gruvbox-common.inc.rasi b/home/.config/rofi/gruvbox-common.inc.rasi deleted file mode 100644 index f7a168d9..00000000 --- a/home/.config/rofi/gruvbox-common.inc.rasi +++ /dev/null @@ -1,127 +0,0 @@ -/* ========================================================================== - File: gruvbox-common.rasi - Desc: Shared rules between all gruvbox themes - Author: bardisty - Source: https://github.com/bardisty/gruvbox-rofi - Modified: Mon Feb 12 2018 06:06:47 PST -0800 - ========================================================================== */ - -window { - background-color: @background; - border: 2; - padding: 2; -} - -mainbox { - border: 0; - padding: 0; -} - -message { - border: 2px 0 0; - border-color: @separatorcolor; - padding: 1px; -} - -textbox { - highlight: @highlight; - text-color: @foreground; -} - -listview { - border: 2px solid 0 0; - padding: 2px 0 0; - border-color: @separatorcolor; - spacing: 2px; - scrollbar: @scrollbar; -} - -element { - border: 0; - padding: 2px; -} - -element.normal.normal { - background-color: @normal-background; - text-color: @normal-foreground; -} - -element.normal.urgent { - background-color: @urgent-background; - text-color: @urgent-foreground; -} - -element.normal.active { - background-color: @active-background; - text-color: @active-foreground; -} - -element.selected.normal { - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -} - -element.selected.urgent { - background-color: @selected-urgent-background; - text-color: @selected-urgent-foreground; -} - -element.selected.active { - background-color: @selected-active-background; - text-color: @selected-active-foreground; -} - -element.alternate.normal { - background-color: @alternate-normal-background; - text-color: @alternate-normal-foreground; -} - -element.alternate.urgent { - background-color: @alternate-urgent-background; - text-color: @alternate-urgent-foreground; -} - -element.alternate.active { - background-color: @alternate-active-background; - text-color: @alternate-active-foreground; -} - -scrollbar { - width: 4px; - border: 0; - handle-color: @scrollbar-handle; - handle-width: 8px; - padding: 0; -} - -sidebar { - border: 2px 0 0; - border-color: @separatorcolor; -} - -inputbar { - spacing: 0; - text-color: @normal-foreground; - padding: 2px; - children: [ prompt, textbox-prompt-sep, entry, case-indicator ]; -} - -case-indicator, -entry, -prompt, -button { - spacing: 0; - text-color: @normal-foreground; -} - -button.selected { - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -} - -textbox-prompt-sep { - expand: false; - str: ":"; - text-color: @normal-foreground; - margin: 0 0.3em 0 0; -} diff --git a/home/.config/rofi/gruvbox-dark.rasi b/home/.config/rofi/gruvbox-dark.rasi deleted file mode 100644 index 8a4969d9..00000000 --- a/home/.config/rofi/gruvbox-dark.rasi +++ /dev/null @@ -1,61 +0,0 @@ -/* ========================================================================== - Rofi color theme - - Based on the Gruvbox color scheme for Vim by morhetz - https://github.com/morhetz/gruvbox - - File: gruvbox-dark-soft.rasi - Desc: Gruvbox dark (soft contrast) color theme for Rofi - Author: bardisty - Source: https://github.com/bardisty/gruvbox-rofi - Modified: Mon Feb 12 2018 06:04:37 PST -0800 - ========================================================================== */ - -* { - /* Theme settings */ - highlight: bold italic; - scrollbar: true; - - /* Gruvbox dark colors */ - gruvbox-dark-bg0-soft: #32302f; - gruvbox-dark-bg1: #3c3836; - gruvbox-dark-bg3: #665c54; - gruvbox-dark-fg0: #fbf1c7; - gruvbox-dark-fg1: #ebdbb2; - gruvbox-dark-red-dark: #cc241d; - gruvbox-dark-red-light: #fb4934; - gruvbox-dark-yellow-dark: #d79921; - gruvbox-dark-yellow-light: #fabd2f; - gruvbox-dark-gray: #a89984; - - /* Theme colors */ - background: @gruvbox-dark-bg0-soft; - background-color: @background; - foreground: @gruvbox-dark-fg1; - border-color: @gruvbox-dark-gray; - separatorcolor: @border-color; - scrollbar-handle: @border-color; - - normal-background: @background; - normal-foreground: @foreground; - alternate-normal-background: @background; - alternate-normal-foreground: @foreground; - selected-normal-background: @gruvbox-dark-bg3; - selected-normal-foreground: @gruvbox-dark-fg0; - - active-background: @gruvbox-dark-yellow-dark; - active-foreground: @background; - alternate-active-background: @active-background; - alternate-active-foreground: @active-foreground; - selected-active-background: @gruvbox-dark-yellow-light; - selected-active-foreground: @active-foreground; - - urgent-background: @gruvbox-dark-red-dark; - urgent-foreground: @background; - alternate-urgent-background: @urgent-background; - alternate-urgent-foreground: @urgent-foreground; - selected-urgent-background: @gruvbox-dark-red-light; - selected-urgent-foreground: @urgent-foreground; -} - -@import "gruvbox-common.inc" diff --git a/home/.config/rofi/nord.rasi b/home/.config/rofi/nord.rasi deleted file mode 100644 index fdf4de4c..00000000 --- a/home/.config/rofi/nord.rasi +++ /dev/null @@ -1,150 +0,0 @@ -* { - nord0: #2E3440; - nord1: #3B4252; - nord2: #434C5E; - nord3: #4C566A; - nord4: #D8DEE9; - nord5: #E5E9F0; - nord6: #ECEFF4; - nord7: #8FBCBB; - nord8: #88C0D0; - nord9: #81A1C1; - nord10: #5E81AC; - nord11: #BF616A; - nord12: #D08770; - nord13: #EBCB8B; - nord14: #A3BE8C; - nord15: #B48EAD; - background: @nord0; - foreground: @nord4; - selected-normal-foreground: @nord4; - normal-foreground: @foreground; - alternate-normal-background: @nord0; - selected-urgent-foreground: @nord4; - urgent-foreground: @foreground; - alternate-urgent-background: @nord0; - active-foreground: @foreground; - selected-active-foreground: @foreground; - alternate-active-background: @nord0; - bordercolor: @nord10; - alternate-normal-foreground: @foreground; - normal-background: @background; - selected-normal-background: @nord3; - border-color: @nord10; - spacing: 2; - separatorcolor: @blue; - urgent-background: @background; - selected-urgent-background: @nord3; - alternate-urgent-foreground: @urgent-foreground; - background-color: @background; - alternate-active-foreground: @active-foreground; - active-background: @background; - selected-active-background: @nord3; -} - -//---------------------- -// Style -//---------------------- - -#window { - background-color: @background; -} - -#mainbox { - border: 2; - padding: 10; -} - -#message { - border: 2px 2px 2px ; - border-color: @separatorcolor; - padding: 10 ; -} - -#textbox { - text-color: @foreground; -} - -#listview { - fixed-height: 0; - padding: 5 0 0; - spacing: 5px ; -} - -#element { - border: 0; - padding: 5px ; -} - -#element.normal.normal { - background-color: @normal-background; - text-color: @normal-foreground; -} - -#element.normal.urgent { - background-color: @urgent-background; - text-color: @urgent-foreground; -} - -#element.normal.active { - background-color: @active-background; - text-color: @active-foreground; -} - -#element.selected.normal { - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -} - -#element.selected.urgent { - background-color: @selected-urgent-background; - text-color: @selected-urgent-foreground; -} - -#element.selected.active { - background-color: @selected-active-background; - text-color: @selected-active-foreground; -} - -#element.alternate.normal { - background-color: @alternate-normal-background; - text-color: @alternate-normal-foreground; -} - -#element.alternate.urgent { - background-color: @alternate-urgent-background; - text-color: @alternate-urgent-foreground; -} - -#element.alternate.active { - background-color: @alternate-active-background; - text-color: @alternate-active-foreground; -} - -#button.selected { - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -} - -#inputbar { - spacing: 5; - text-color: @normal-foreground; - padding: 5px ; - border: 0 0 1; - border-color: @separatorcolor; -} - -#case-indicator { - spacing: 0; - text-color: @normal-foreground; -} - -#entry { - spacing: 0; - text-color: @normal-foreground; -} - -#prompt { - spacing: 0; - text-color: @normal-foreground; -} From 389c24e9394d5b37ca284cc65e31823407495f4c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:23:51 +0300 Subject: [PATCH 1400/2667] Update rofi config --- home/.config/rofi/config | 9 -- home/.config/rofi/config.rasi | 150 ++++++++++++++++++++++ home/.config/rofi/gruvbox-common.inc.rasi | 127 ------------------ home/.config/rofi/gruvbox-dark.rasi | 61 --------- home/.config/rofi/nord.rasi | 150 ---------------------- 5 files changed, 150 insertions(+), 347 deletions(-) delete mode 100644 home/.config/rofi/config create mode 100644 home/.config/rofi/config.rasi delete mode 100644 home/.config/rofi/gruvbox-common.inc.rasi delete mode 100644 home/.config/rofi/gruvbox-dark.rasi delete mode 100644 home/.config/rofi/nord.rasi diff --git a/home/.config/rofi/config b/home/.config/rofi/config deleted file mode 100644 index d12d19db..00000000 --- a/home/.config/rofi/config +++ /dev/null @@ -1,9 +0,0 @@ -rofi.lines: 5 -rofi.eh: 2 -rofi.padding: 50 -rofi.fullscreen: false -rofi.bw: 0 -rofi.separator-style: none -rofi.hide-scrollbar: true -rofi.font: Overpass 22 -rofi.theme: ~/.config/rofi/gruvbox-dark.rasi diff --git a/home/.config/rofi/config.rasi b/home/.config/rofi/config.rasi new file mode 100644 index 00000000..502769e7 --- /dev/null +++ b/home/.config/rofi/config.rasi @@ -0,0 +1,150 @@ +// vim: ft=rasi + +configuration { + font: "Overpass 10"; + show-icons: true; + terminal: "foot"; + // modi: "run,ssh"; + // location: 0; + // yoffset: 0; + // xoffset: 0; + // fixed-num-lines: true; + // ssh-client: "ssh"; + // ssh-command: "{terminal} -e {ssh-client} {host} [-p {port}]"; + // run-command: "{cmd}"; + // run-list-command: ""; + // run-shell-command: "{terminal} -e {cmd}"; + // window-command: "wmctrl -i -R {window}"; + // window-match-fields: "all"; + // icon-theme: "Papirus-Dark"; + // drun-match-fields: "name,generic,exec,categories,keywords"; + // drun-categories: ; + // drun-show-actions: false; + // drun-display-format: "{name}"; + // drun-url-launcher: "xdg-open"; + // disable-history: false; + // ignored-prefixes: ""; + // sort: false; + // sorting-method: "normal"; + // case-sensitive: false; + // cycle: true; + // sidebar-mode: false; + // hover-select: false; + // eh: 1; + // auto-select: false; + // parse-hosts: false; + // parse-known-hosts: true; + // combi-modi: "window,run"; + // matching: "normal"; + // tokenize: true; + // m: "-5"; + // filter: ; + // dpi: -1; + // threads: 0; + // scroll-method: 0; + // window-format: "{w} {c} {t}"; + // click-to-exit: true; + // max-history-size: 25; + // combi-hide-mode-prefix: false; + // combi-display-format: "{mode} {text}"; + // matching-negate-char: '-' unsupported ; + // cache-dir: ; + // window-thumbnail: false; + // drun-use-desktop-cache: false; + // drun-reload-desktop-cache: false; + // normalize-match: false; + // steal-focus: false; + // application-fallback-icon: ; + // pid: "/run/user/1000/rofi.pid"; + // display-run: ; + // display-ssh: ; + // display-drun: ""; + // display-combi: ; + // display-keys: ; + // display-filebrowser: ; + // kb-primary-paste: "Control+V,Shift+Insert"; + // kb-secondary-paste: "Control+v,Insert"; + // kb-clear-line: "Control+w"; + // kb-move-front: "Control+a"; + // kb-move-end: "Control+e"; + // kb-move-word-back: "Alt+b,Control+Left"; + // kb-move-word-forward: "Alt+f,Control+Right"; + // kb-move-char-back: "Left,Control+b"; + // kb-move-char-forward: "Right,Control+f"; + // kb-remove-word-back: "Control+Alt+h,Control+BackSpace"; + // kb-remove-word-forward: "Control+Alt+d"; + // kb-remove-char-forward: "Delete,Control+d"; + // kb-remove-char-back: "BackSpace,Shift+BackSpace,Control+h"; + // kb-remove-to-eol: "Control+k"; + // kb-remove-to-sol: "Control+u"; + // kb-accept-entry: "Control+j,Control+m,Return,KP_Enter"; + // kb-accept-custom: "Control+Return"; + // kb-accept-custom-alt: "Control+Shift+Return"; + // kb-accept-alt: "Shift+Return"; + // kb-delete-entry: "Shift+Delete"; + // kb-mode-next: "Shift+Right,Control+Tab"; + // kb-mode-previous: "Shift+Left,Control+ISO_Left_Tab"; + // kb-mode-complete: "Control+l"; + // kb-row-left: "Control+Page_Up"; + // kb-row-right: "Control+Page_Down"; + // kb-row-up: "Up,Control+p,ISO_Left_Tab"; + // kb-row-down: "Down,Control+n"; + // kb-row-tab: "Tab"; + // kb-page-prev: "Page_Up"; + // kb-page-next: "Page_Down"; + // kb-row-first: "Home,KP_Home"; + // kb-row-last: "End,KP_End"; + // kb-row-select: "Control+space"; + // kb-screenshot: "Alt+S"; + // kb-ellipsize: "Alt+period"; + // kb-toggle-case-sensitivity: "grave,dead_grave"; + // kb-toggle-sort: "Alt+grave"; + // kb-cancel: "Escape,Control+g,Control+bracketleft"; + // kb-custom-1: "Alt+1"; + // kb-custom-2: "Alt+2"; + // kb-custom-3: "Alt+3"; + // kb-custom-4: "Alt+4"; + // kb-custom-5: "Alt+5"; + // kb-custom-6: "Alt+6"; + // kb-custom-7: "Alt+7"; + // kb-custom-8: "Alt+8"; + // kb-custom-9: "Alt+9"; + // kb-custom-10: "Alt+0"; + // kb-custom-11: "Alt+exclam"; + // kb-custom-12: "Alt+at"; + // kb-custom-13: "Alt+numbersign"; + // kb-custom-14: "Alt+dollar"; + // kb-custom-15: "Alt+percent"; + // kb-custom-16: "Alt+dead_circumflex"; + // kb-custom-17: "Alt+ampersand"; + // kb-custom-18: "Alt+asterisk"; + // kb-custom-19: "Alt+parenleft"; + // kb-select-1: "Super+1"; + // kb-select-2: "Super+2"; + // kb-select-3: "Super+3"; + // kb-select-4: "Super+4"; + // kb-select-5: "Super+5"; + // kb-select-6: "Super+6"; + // kb-select-7: "Super+7"; + // kb-select-8: "Super+8"; + // kb-select-9: "Super+9"; + // kb-select-10: "Super+0"; + // ml-row-left: "ScrollLeft"; + // ml-row-right: "ScrollRight"; + // ml-row-up: "ScrollUp"; + // ml-row-down: "ScrollDown"; + // me-select-entry: "MousePrimary"; + // me-accept-entry: "MouseDPrimary"; + // me-accept-custom: "Control+MouseDPrimary"; + /* +timeout { +action: "kb-cancel"; +delay: 0; +} +filebrowser { +directories-first: true; +sorting-method: "name"; +} + */ +} +@theme "~/.cache/wal/colors-rofi-dark" diff --git a/home/.config/rofi/gruvbox-common.inc.rasi b/home/.config/rofi/gruvbox-common.inc.rasi deleted file mode 100644 index f7a168d9..00000000 --- a/home/.config/rofi/gruvbox-common.inc.rasi +++ /dev/null @@ -1,127 +0,0 @@ -/* ========================================================================== - File: gruvbox-common.rasi - Desc: Shared rules between all gruvbox themes - Author: bardisty - Source: https://github.com/bardisty/gruvbox-rofi - Modified: Mon Feb 12 2018 06:06:47 PST -0800 - ========================================================================== */ - -window { - background-color: @background; - border: 2; - padding: 2; -} - -mainbox { - border: 0; - padding: 0; -} - -message { - border: 2px 0 0; - border-color: @separatorcolor; - padding: 1px; -} - -textbox { - highlight: @highlight; - text-color: @foreground; -} - -listview { - border: 2px solid 0 0; - padding: 2px 0 0; - border-color: @separatorcolor; - spacing: 2px; - scrollbar: @scrollbar; -} - -element { - border: 0; - padding: 2px; -} - -element.normal.normal { - background-color: @normal-background; - text-color: @normal-foreground; -} - -element.normal.urgent { - background-color: @urgent-background; - text-color: @urgent-foreground; -} - -element.normal.active { - background-color: @active-background; - text-color: @active-foreground; -} - -element.selected.normal { - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -} - -element.selected.urgent { - background-color: @selected-urgent-background; - text-color: @selected-urgent-foreground; -} - -element.selected.active { - background-color: @selected-active-background; - text-color: @selected-active-foreground; -} - -element.alternate.normal { - background-color: @alternate-normal-background; - text-color: @alternate-normal-foreground; -} - -element.alternate.urgent { - background-color: @alternate-urgent-background; - text-color: @alternate-urgent-foreground; -} - -element.alternate.active { - background-color: @alternate-active-background; - text-color: @alternate-active-foreground; -} - -scrollbar { - width: 4px; - border: 0; - handle-color: @scrollbar-handle; - handle-width: 8px; - padding: 0; -} - -sidebar { - border: 2px 0 0; - border-color: @separatorcolor; -} - -inputbar { - spacing: 0; - text-color: @normal-foreground; - padding: 2px; - children: [ prompt, textbox-prompt-sep, entry, case-indicator ]; -} - -case-indicator, -entry, -prompt, -button { - spacing: 0; - text-color: @normal-foreground; -} - -button.selected { - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -} - -textbox-prompt-sep { - expand: false; - str: ":"; - text-color: @normal-foreground; - margin: 0 0.3em 0 0; -} diff --git a/home/.config/rofi/gruvbox-dark.rasi b/home/.config/rofi/gruvbox-dark.rasi deleted file mode 100644 index 8a4969d9..00000000 --- a/home/.config/rofi/gruvbox-dark.rasi +++ /dev/null @@ -1,61 +0,0 @@ -/* ========================================================================== - Rofi color theme - - Based on the Gruvbox color scheme for Vim by morhetz - https://github.com/morhetz/gruvbox - - File: gruvbox-dark-soft.rasi - Desc: Gruvbox dark (soft contrast) color theme for Rofi - Author: bardisty - Source: https://github.com/bardisty/gruvbox-rofi - Modified: Mon Feb 12 2018 06:04:37 PST -0800 - ========================================================================== */ - -* { - /* Theme settings */ - highlight: bold italic; - scrollbar: true; - - /* Gruvbox dark colors */ - gruvbox-dark-bg0-soft: #32302f; - gruvbox-dark-bg1: #3c3836; - gruvbox-dark-bg3: #665c54; - gruvbox-dark-fg0: #fbf1c7; - gruvbox-dark-fg1: #ebdbb2; - gruvbox-dark-red-dark: #cc241d; - gruvbox-dark-red-light: #fb4934; - gruvbox-dark-yellow-dark: #d79921; - gruvbox-dark-yellow-light: #fabd2f; - gruvbox-dark-gray: #a89984; - - /* Theme colors */ - background: @gruvbox-dark-bg0-soft; - background-color: @background; - foreground: @gruvbox-dark-fg1; - border-color: @gruvbox-dark-gray; - separatorcolor: @border-color; - scrollbar-handle: @border-color; - - normal-background: @background; - normal-foreground: @foreground; - alternate-normal-background: @background; - alternate-normal-foreground: @foreground; - selected-normal-background: @gruvbox-dark-bg3; - selected-normal-foreground: @gruvbox-dark-fg0; - - active-background: @gruvbox-dark-yellow-dark; - active-foreground: @background; - alternate-active-background: @active-background; - alternate-active-foreground: @active-foreground; - selected-active-background: @gruvbox-dark-yellow-light; - selected-active-foreground: @active-foreground; - - urgent-background: @gruvbox-dark-red-dark; - urgent-foreground: @background; - alternate-urgent-background: @urgent-background; - alternate-urgent-foreground: @urgent-foreground; - selected-urgent-background: @gruvbox-dark-red-light; - selected-urgent-foreground: @urgent-foreground; -} - -@import "gruvbox-common.inc" diff --git a/home/.config/rofi/nord.rasi b/home/.config/rofi/nord.rasi deleted file mode 100644 index fdf4de4c..00000000 --- a/home/.config/rofi/nord.rasi +++ /dev/null @@ -1,150 +0,0 @@ -* { - nord0: #2E3440; - nord1: #3B4252; - nord2: #434C5E; - nord3: #4C566A; - nord4: #D8DEE9; - nord5: #E5E9F0; - nord6: #ECEFF4; - nord7: #8FBCBB; - nord8: #88C0D0; - nord9: #81A1C1; - nord10: #5E81AC; - nord11: #BF616A; - nord12: #D08770; - nord13: #EBCB8B; - nord14: #A3BE8C; - nord15: #B48EAD; - background: @nord0; - foreground: @nord4; - selected-normal-foreground: @nord4; - normal-foreground: @foreground; - alternate-normal-background: @nord0; - selected-urgent-foreground: @nord4; - urgent-foreground: @foreground; - alternate-urgent-background: @nord0; - active-foreground: @foreground; - selected-active-foreground: @foreground; - alternate-active-background: @nord0; - bordercolor: @nord10; - alternate-normal-foreground: @foreground; - normal-background: @background; - selected-normal-background: @nord3; - border-color: @nord10; - spacing: 2; - separatorcolor: @blue; - urgent-background: @background; - selected-urgent-background: @nord3; - alternate-urgent-foreground: @urgent-foreground; - background-color: @background; - alternate-active-foreground: @active-foreground; - active-background: @background; - selected-active-background: @nord3; -} - -//---------------------- -// Style -//---------------------- - -#window { - background-color: @background; -} - -#mainbox { - border: 2; - padding: 10; -} - -#message { - border: 2px 2px 2px ; - border-color: @separatorcolor; - padding: 10 ; -} - -#textbox { - text-color: @foreground; -} - -#listview { - fixed-height: 0; - padding: 5 0 0; - spacing: 5px ; -} - -#element { - border: 0; - padding: 5px ; -} - -#element.normal.normal { - background-color: @normal-background; - text-color: @normal-foreground; -} - -#element.normal.urgent { - background-color: @urgent-background; - text-color: @urgent-foreground; -} - -#element.normal.active { - background-color: @active-background; - text-color: @active-foreground; -} - -#element.selected.normal { - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -} - -#element.selected.urgent { - background-color: @selected-urgent-background; - text-color: @selected-urgent-foreground; -} - -#element.selected.active { - background-color: @selected-active-background; - text-color: @selected-active-foreground; -} - -#element.alternate.normal { - background-color: @alternate-normal-background; - text-color: @alternate-normal-foreground; -} - -#element.alternate.urgent { - background-color: @alternate-urgent-background; - text-color: @alternate-urgent-foreground; -} - -#element.alternate.active { - background-color: @alternate-active-background; - text-color: @alternate-active-foreground; -} - -#button.selected { - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -} - -#inputbar { - spacing: 5; - text-color: @normal-foreground; - padding: 5px ; - border: 0 0 1; - border-color: @separatorcolor; -} - -#case-indicator { - spacing: 0; - text-color: @normal-foreground; -} - -#entry { - spacing: 0; - text-color: @normal-foreground; -} - -#prompt { - spacing: 0; - text-color: @normal-foreground; -} From ba39ac850ec5acdbafdfad5371f939b4fa974a42 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:24:21 +0300 Subject: [PATCH 1401/2667] Add pywal config --- config.toml | 156 +++++++----------- .../wal/colorschemes/dark/kanagawa.json | 27 +++ 2 files changed, 88 insertions(+), 95 deletions(-) create mode 100644 home/.config/wal/colorschemes/dark/kanagawa.json diff --git a/config.toml b/config.toml index a8f6a11e..5888924e 100644 --- a/config.toml +++ b/config.toml @@ -31,10 +31,14 @@ dst = "~/.config/imapnotify" src = ".config/imapnotify" [dotfiles.d_nvim] -actions = ["nvim-packer-sync"] +actions = [ "nvim-packer-sync",] dst = "~/.config/nvim" src = ".config/nvim" +[dotfiles.d_rofi] +dst = "~/.config/rofi" +src = ".config/rofi" + [dotfiles.d_sway] dst = "~/.config/sway" src = ".config/sway" @@ -220,119 +224,81 @@ dst = "~/.config/electron12-flags.conf" src = ".pam_environment" dst = "~/.pam_environment" +[dotfiles.d_wal] +src = ".config/wal" +dst = "~/.config/wal" + [profiles.os_arch] -include = ["terminal"] -dotfiles = ["f_makepkg.conf", "f_paru.conf"] +include = [ "terminal",] +dotfiles = [ "f_makepkg.conf", "f_paru.conf",] + +[profiles.os_ubuntu] +include = [ "terminal",] + +[profiles.os_termux] +include = [ "terminal",] + +[profiles.terminal] +dotfiles = [ "d_nvim", "d_ssh", "d_zsh", "f_alacritty.yml", "f_gitconfig", "f_hushlogin", "f_ignore", "f_mailcap", "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", "f_tmux.conf", "f_zshrc",] + +[profiles.email] +dotfiles = [ "d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config",] + +[profiles.media] +dotfiles = [ "d_mpv", "f_abcde.conf", "f_beets_config", "f_beets_whitelist", "f_libra_config", "f_mpd.conf", "f_mpdris2.conf", "f_mpdscribble.conf", "f_ncmpcpp.conf", "f_ncmpcpp_bindings", "f_youtube-dl_config",] + +[profiles.sway] +dotfiles = [ "d_sway", "d_waybar", "d_wofi", "d_zathura", "f_electron-flags.conf", "f_electron12-flags.conf", "f_fonts.conf", "f_foot.ini", "f_mako_config", "f_redshift.conf",] + +[profiles.gpg] +dotfiles = [ "f_gpg-agent.conf", "f_gpg.conf", "f_gpg_scdaemon.conf", "f_pam_environment",] + +[profiles.Mirkwood] +include = [ "os_arch", "email", "media", "sway", "gpg",] +dotfiles = [ "d_systemd", "d_rofi", "d_wal",] + +[profiles.Moria] +include = [ "os_arch", "media", "gpg",] +dotfiles = [ "f_zprofile",] + +[profiles.Gondor] +include = [ "os_arch",] + +[profiles.mko-laptop] +include = [ "os_ubuntu", "media", "gpg",] + +[profiles.Isengard] +include = [ "os_termux",] + +[profiles.Edoras] +include = [ "os_arch",] + +[profiles.TakamakiPC] +include = [ "os_arch",] + +[profiles.localhost] +include = [ "os_arch",] + +[profiles.ViiruJaTeippi] +include = [ "terminal",] [profiles.os_arch.variables] os = "arch" -[profiles.os_ubuntu] -include = ["terminal"] - [profiles.os_ubuntu.variables] os = "ubuntu" -[profiles.os_termux] -include = ["terminal"] - [profiles.os_termux.variables] os = "termux" -[profiles.terminal] -dotfiles = [ - "d_nvim", - "d_ssh", - "d_zsh", - "f_alacritty.yml", - "f_gitconfig", - "f_hushlogin", - "f_ignore", - "f_mailcap", - "f_ranger.conf", - "f_ranger_commands.py", - "f_rtv.cfg", - "f_tmux.conf", - "f_zshrc", -] - -[profiles.email] -dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] - -[profiles.media] -dotfiles = [ - "d_mpv", - "f_abcde.conf", - "f_beets_config", - "f_beets_whitelist", - "f_libra_config", - "f_mpd.conf", - "f_mpdris2.conf", - "f_mpdscribble.conf", - "f_ncmpcpp.conf", - "f_ncmpcpp_bindings", - "f_youtube-dl_config", -] - -[profiles.sway] -dotfiles = [ - "d_sway", - "d_waybar", - "d_wofi", - "d_zathura", - "f_electron-flags.conf", - "f_electron12-flags.conf", - "f_fonts.conf", - "f_foot.ini", - "f_mako_config", - "f_redshift.conf", -] - -[profiles.gpg] -dotfiles = [ - "f_gpg-agent.conf", - "f_gpg.conf", - "f_gpg_scdaemon.conf", - "f_pam_environment", -] - -[profiles.Mirkwood] -include = ["os_arch", "email", "media", "sway", "gpg"] -dotfiles = ["d_systemd"] - [profiles.Mirkwood.variables] wayland = true -[profiles.Moria] -include = ["os_arch", "media", "gpg"] -dotfiles = ["f_zprofile"] - [profiles.Moria.variables] wayland = true -[profiles.Gondor] -include = ["os_arch"] - -[profiles.mko-laptop] -include = ["os_ubuntu", "media", "gpg"] - [profiles.mko-laptop.variables] wayland = false -[profiles.Isengard] -include = ["os_termux"] - -[profiles.Edoras] -include = ["os_arch"] - -[profiles.TakamakiPC] -include = ["os_arch"] - [profiles.TakamakiPC.variables] wayland = false - -[profiles.localhost] -include = ["os_arch"] - -[profiles.ViiruJaTeippi] -include = ["terminal"] diff --git a/home/.config/wal/colorschemes/dark/kanagawa.json b/home/.config/wal/colorschemes/dark/kanagawa.json new file mode 100644 index 00000000..edc46c46 --- /dev/null +++ b/home/.config/wal/colorschemes/dark/kanagawa.json @@ -0,0 +1,27 @@ +{ + "colors": { + "color0": "#090618", + "color1": "#C34043", + "color2": "#76946A", + "color3": "#C0A36E", + "color4": "#7E9CD8", + "color5": "#957FB8", + "color6": "#6A9589", + "color7": "#C8C093", + "color8": "#727169", + "color9": "#E82424", + "color10": "#98BB6C", + "color11": "#E6C384", + "color12": "#7FB4CA", + "color13": "#938AA9", + "color14": "#7AA89F", + "color15": "#DCD7BA", + "color16": "#FFA066", + "color17": "#FF5D62" + }, + "special": { + "foreground": "#DCD7BA", + "background": "#1F1F28", + "cursor": "#C8C093" + } +} From 7ae2f501495e4bc7a5a8d4b51593963e54a301e5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:24:21 +0300 Subject: [PATCH 1402/2667] Add pywal config --- config.toml | 156 +++++++----------- .../wal/colorschemes/dark/kanagawa.json | 27 +++ 2 files changed, 88 insertions(+), 95 deletions(-) create mode 100644 home/.config/wal/colorschemes/dark/kanagawa.json diff --git a/config.toml b/config.toml index a8f6a11e..5888924e 100644 --- a/config.toml +++ b/config.toml @@ -31,10 +31,14 @@ dst = "~/.config/imapnotify" src = ".config/imapnotify" [dotfiles.d_nvim] -actions = ["nvim-packer-sync"] +actions = [ "nvim-packer-sync",] dst = "~/.config/nvim" src = ".config/nvim" +[dotfiles.d_rofi] +dst = "~/.config/rofi" +src = ".config/rofi" + [dotfiles.d_sway] dst = "~/.config/sway" src = ".config/sway" @@ -220,119 +224,81 @@ dst = "~/.config/electron12-flags.conf" src = ".pam_environment" dst = "~/.pam_environment" +[dotfiles.d_wal] +src = ".config/wal" +dst = "~/.config/wal" + [profiles.os_arch] -include = ["terminal"] -dotfiles = ["f_makepkg.conf", "f_paru.conf"] +include = [ "terminal",] +dotfiles = [ "f_makepkg.conf", "f_paru.conf",] + +[profiles.os_ubuntu] +include = [ "terminal",] + +[profiles.os_termux] +include = [ "terminal",] + +[profiles.terminal] +dotfiles = [ "d_nvim", "d_ssh", "d_zsh", "f_alacritty.yml", "f_gitconfig", "f_hushlogin", "f_ignore", "f_mailcap", "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", "f_tmux.conf", "f_zshrc",] + +[profiles.email] +dotfiles = [ "d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config",] + +[profiles.media] +dotfiles = [ "d_mpv", "f_abcde.conf", "f_beets_config", "f_beets_whitelist", "f_libra_config", "f_mpd.conf", "f_mpdris2.conf", "f_mpdscribble.conf", "f_ncmpcpp.conf", "f_ncmpcpp_bindings", "f_youtube-dl_config",] + +[profiles.sway] +dotfiles = [ "d_sway", "d_waybar", "d_wofi", "d_zathura", "f_electron-flags.conf", "f_electron12-flags.conf", "f_fonts.conf", "f_foot.ini", "f_mako_config", "f_redshift.conf",] + +[profiles.gpg] +dotfiles = [ "f_gpg-agent.conf", "f_gpg.conf", "f_gpg_scdaemon.conf", "f_pam_environment",] + +[profiles.Mirkwood] +include = [ "os_arch", "email", "media", "sway", "gpg",] +dotfiles = [ "d_systemd", "d_rofi", "d_wal",] + +[profiles.Moria] +include = [ "os_arch", "media", "gpg",] +dotfiles = [ "f_zprofile",] + +[profiles.Gondor] +include = [ "os_arch",] + +[profiles.mko-laptop] +include = [ "os_ubuntu", "media", "gpg",] + +[profiles.Isengard] +include = [ "os_termux",] + +[profiles.Edoras] +include = [ "os_arch",] + +[profiles.TakamakiPC] +include = [ "os_arch",] + +[profiles.localhost] +include = [ "os_arch",] + +[profiles.ViiruJaTeippi] +include = [ "terminal",] [profiles.os_arch.variables] os = "arch" -[profiles.os_ubuntu] -include = ["terminal"] - [profiles.os_ubuntu.variables] os = "ubuntu" -[profiles.os_termux] -include = ["terminal"] - [profiles.os_termux.variables] os = "termux" -[profiles.terminal] -dotfiles = [ - "d_nvim", - "d_ssh", - "d_zsh", - "f_alacritty.yml", - "f_gitconfig", - "f_hushlogin", - "f_ignore", - "f_mailcap", - "f_ranger.conf", - "f_ranger_commands.py", - "f_rtv.cfg", - "f_tmux.conf", - "f_zshrc", -] - -[profiles.email] -dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] - -[profiles.media] -dotfiles = [ - "d_mpv", - "f_abcde.conf", - "f_beets_config", - "f_beets_whitelist", - "f_libra_config", - "f_mpd.conf", - "f_mpdris2.conf", - "f_mpdscribble.conf", - "f_ncmpcpp.conf", - "f_ncmpcpp_bindings", - "f_youtube-dl_config", -] - -[profiles.sway] -dotfiles = [ - "d_sway", - "d_waybar", - "d_wofi", - "d_zathura", - "f_electron-flags.conf", - "f_electron12-flags.conf", - "f_fonts.conf", - "f_foot.ini", - "f_mako_config", - "f_redshift.conf", -] - -[profiles.gpg] -dotfiles = [ - "f_gpg-agent.conf", - "f_gpg.conf", - "f_gpg_scdaemon.conf", - "f_pam_environment", -] - -[profiles.Mirkwood] -include = ["os_arch", "email", "media", "sway", "gpg"] -dotfiles = ["d_systemd"] - [profiles.Mirkwood.variables] wayland = true -[profiles.Moria] -include = ["os_arch", "media", "gpg"] -dotfiles = ["f_zprofile"] - [profiles.Moria.variables] wayland = true -[profiles.Gondor] -include = ["os_arch"] - -[profiles.mko-laptop] -include = ["os_ubuntu", "media", "gpg"] - [profiles.mko-laptop.variables] wayland = false -[profiles.Isengard] -include = ["os_termux"] - -[profiles.Edoras] -include = ["os_arch"] - -[profiles.TakamakiPC] -include = ["os_arch"] - [profiles.TakamakiPC.variables] wayland = false - -[profiles.localhost] -include = ["os_arch"] - -[profiles.ViiruJaTeippi] -include = ["terminal"] diff --git a/home/.config/wal/colorschemes/dark/kanagawa.json b/home/.config/wal/colorschemes/dark/kanagawa.json new file mode 100644 index 00000000..edc46c46 --- /dev/null +++ b/home/.config/wal/colorschemes/dark/kanagawa.json @@ -0,0 +1,27 @@ +{ + "colors": { + "color0": "#090618", + "color1": "#C34043", + "color2": "#76946A", + "color3": "#C0A36E", + "color4": "#7E9CD8", + "color5": "#957FB8", + "color6": "#6A9589", + "color7": "#C8C093", + "color8": "#727169", + "color9": "#E82424", + "color10": "#98BB6C", + "color11": "#E6C384", + "color12": "#7FB4CA", + "color13": "#938AA9", + "color14": "#7AA89F", + "color15": "#DCD7BA", + "color16": "#FFA066", + "color17": "#FF5D62" + }, + "special": { + "foreground": "#DCD7BA", + "background": "#1F1F28", + "cursor": "#C8C093" + } +} From cd841e168513532d2b3a912f53fd2c44b9db988b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:24:32 +0300 Subject: [PATCH 1403/2667] Sway: change from wofi to rofi --- home/.config/sway/conf.d/06-keybinds.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 6f006bb4..cb43ca64 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -55,8 +55,8 @@ bindsym --locked XF86Search output eDP-1 toggle bindsym $mod+Shift+e exec $term --app-id fzf-launcher --login-shell /bin/sh -c "$scripts/exit.sh" # launch a program -bindsym $mod+d exec wofi -bindsym $mod+Shift+d exec wofi --show run +bindsym $mod+d exec rofi -show drun +bindsym $mod+Shift+d exec rofi -show run # manage clipboard bindsym $mod+c exec clipman pick -t wofi From f2251e87da24f617aeccad50cc9a6eae57f86e0c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:24:32 +0300 Subject: [PATCH 1404/2667] Sway: change from wofi to rofi --- home/.config/sway/conf.d/06-keybinds.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 6f006bb4..cb43ca64 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -55,8 +55,8 @@ bindsym --locked XF86Search output eDP-1 toggle bindsym $mod+Shift+e exec $term --app-id fzf-launcher --login-shell /bin/sh -c "$scripts/exit.sh" # launch a program -bindsym $mod+d exec wofi -bindsym $mod+Shift+d exec wofi --show run +bindsym $mod+d exec rofi -show drun +bindsym $mod+Shift+d exec rofi -show run # manage clipboard bindsym $mod+c exec clipman pick -t wofi From 59435389fef426d1d8848bea14498e11f681d177 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:24:47 +0300 Subject: [PATCH 1405/2667] Nvim: add rofi config (.rasi) treesitter grammar --- home/.config/nvim/lua/plugins/treesitter.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index 25c5cc9e..ffef72a1 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -3,8 +3,8 @@ return function() ensure_installed = { 'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json', 'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python', - 'regex', 'rst', 'scss', 'toml', 'tsx', 'typescript', 'javascript', - 'yaml' + 'regex', 'rasi', 'rst', 'scss', 'toml', 'tsx', 'typescript', + 'javascript', 'yaml' }, highlight = {enable = true}, indent = {enable = true}, From 40ba3664039bc2e50982af40e927269affbb7eb3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:24:47 +0300 Subject: [PATCH 1406/2667] Nvim: add rofi config (.rasi) treesitter grammar --- home/.config/nvim/lua/plugins/treesitter.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index 25c5cc9e..ffef72a1 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -3,8 +3,8 @@ return function() ensure_installed = { 'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json', 'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python', - 'regex', 'rst', 'scss', 'toml', 'tsx', 'typescript', 'javascript', - 'yaml' + 'regex', 'rasi', 'rst', 'scss', 'toml', 'tsx', 'typescript', + 'javascript', 'yaml' }, highlight = {enable = true}, indent = {enable = true}, From 9b617b6f8bbb88a9fa45c0da5010522c0c0a3819 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:26:55 +0300 Subject: [PATCH 1407/2667] Use rofi pinentry on Mirkwood --- home/.gnupg/gpg-agent.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.gnupg/gpg-agent.conf b/home/.gnupg/gpg-agent.conf index 9e025a01..68fad143 100644 --- a/home/.gnupg/gpg-agent.conf +++ b/home/.gnupg/gpg-agent.conf @@ -1,2 +1,6 @@ enable-ssh-support +{%@ if profile == 'Mirkwood' @%} +pinentry-program /usr/bin/pinentry-rofi +{%@ else @%} pinentry-program /usr/bin/pinentry-gnome3 +{%@ endif @%} From c47d4ea4daaa0b9bed612cbedc4e58378e62f389 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:26:55 +0300 Subject: [PATCH 1408/2667] Use rofi pinentry on Mirkwood --- home/.gnupg/gpg-agent.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.gnupg/gpg-agent.conf b/home/.gnupg/gpg-agent.conf index 9e025a01..68fad143 100644 --- a/home/.gnupg/gpg-agent.conf +++ b/home/.gnupg/gpg-agent.conf @@ -1,2 +1,6 @@ enable-ssh-support +{%@ if profile == 'Mirkwood' @%} +pinentry-program /usr/bin/pinentry-rofi +{%@ else @%} pinentry-program /usr/bin/pinentry-gnome3 +{%@ endif @%} From 384f2752ab403ed26fb2d71acbd83c4cce7ab116 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 23:12:49 +0300 Subject: [PATCH 1409/2667] Neovim: change to pywal colorscheme --- home/.config/nvim/lua/plugins/colorscheme.lua | 1 - home/.config/nvim/lua/plugins/init.lua | 5 ++++- home/.config/nvim/lua/plugins/lualine.lua | 8 +++++++- 3 files changed, 11 insertions(+), 3 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/colorscheme.lua diff --git a/home/.config/nvim/lua/plugins/colorscheme.lua b/home/.config/nvim/lua/plugins/colorscheme.lua deleted file mode 100644 index a7a407bf..00000000 --- a/home/.config/nvim/lua/plugins/colorscheme.lua +++ /dev/null @@ -1 +0,0 @@ -return function() vim.cmd("colorscheme kanagawa") end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 7690d1e1..3491a13b 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -20,7 +20,10 @@ require('packer').startup(function() use {'wbthomason/packer.nvim'} -- Colorscheme - use {'rebelot/kanagawa.nvim', config = require('plugins.colorscheme')} + use { + 'FunctionalHacker/pywal.nvim', + config = function() require('pywal').setup() end + } -- Statusline use { diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index de86f563..b0ab3631 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1 +1,7 @@ -return function() require('lualine').setup() end +return function() + require('lualine').setup { + options = { + theme = 'pywal-nvim' + } + } +end From 1a54986d53f25f01c1b5fee50a5de482e3b3e26c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 23:12:49 +0300 Subject: [PATCH 1410/2667] Neovim: change to pywal colorscheme --- home/.config/nvim/lua/plugins/colorscheme.lua | 1 - home/.config/nvim/lua/plugins/init.lua | 5 ++++- home/.config/nvim/lua/plugins/lualine.lua | 8 +++++++- 3 files changed, 11 insertions(+), 3 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/colorscheme.lua diff --git a/home/.config/nvim/lua/plugins/colorscheme.lua b/home/.config/nvim/lua/plugins/colorscheme.lua deleted file mode 100644 index a7a407bf..00000000 --- a/home/.config/nvim/lua/plugins/colorscheme.lua +++ /dev/null @@ -1 +0,0 @@ -return function() vim.cmd("colorscheme kanagawa") end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 7690d1e1..3491a13b 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -20,7 +20,10 @@ require('packer').startup(function() use {'wbthomason/packer.nvim'} -- Colorscheme - use {'rebelot/kanagawa.nvim', config = require('plugins.colorscheme')} + use { + 'FunctionalHacker/pywal.nvim', + config = function() require('pywal').setup() end + } -- Statusline use { diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index de86f563..b0ab3631 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1 +1,7 @@ -return function() require('lualine').setup() end +return function() + require('lualine').setup { + options = { + theme = 'pywal-nvim' + } + } +end From f1a4543dc6cbcfc7e52c2ebb0eac4a4a521c98e8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 23:13:20 +0300 Subject: [PATCH 1411/2667] Add pywal colors to foot --- home/.config/foot/foot.ini | 22 ++------------------ home/.config/wal/templates/colors-foot.ini | 24 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 home/.config/wal/templates/colors-foot.ini diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini index 1868aef7..c34e5606 100644 --- a/home/.config/foot/foot.ini +++ b/home/.config/foot/foot.ini @@ -1,3 +1,5 @@ +include=~/.cache/wal/colors-foot.ini + pad=10x0 [scrollback] @@ -8,23 +10,3 @@ blink=yes [mouse] hide-when-typing=yes - -[colors] -foreground = D9E0EE -background = 1E1D2F -regular0 = 6E6C7E -regular1 = F28FAD -regular2 = ABE9B3 -regular3 = FAE3B0 -regular4 = 96CDFB -regular5 = F5C2E7 -regular6 = 89DCEB -regular7 = D9E0EE -bright0 = 988BA2 -bright1 = F28FAD -bright2 = ABE9B3 -bright3 = FAE3B0 -bright4 = 96CDFB -bright5 = F5C2E7 -bright6 = 89DCEB -bright7 = D9E0EE diff --git a/home/.config/wal/templates/colors-foot.ini b/home/.config/wal/templates/colors-foot.ini new file mode 100644 index 00000000..835bb948 --- /dev/null +++ b/home/.config/wal/templates/colors-foot.ini @@ -0,0 +1,24 @@ +[colors] +foreground = {foreground.strip} +background = {background.strip} +alpha = {background.alpha_dec} + +regular0 = {color0.strip} +regular1 = {color1.strip} +regular2 = {color2.strip} +regular3 = {color3.strip} +regular4 = {color4.strip} +regular5 = {color5.strip} +regular6 = {color6.strip} +regular7 = {color7.strip} +bright0 = {color8.strip} +bright1 = {color9.strip} +bright2 = {color10.strip} +bright3 = {color11.strip} +bright4 = {color12.strip} +bright5 = {color13.strip} +bright6 = {color14.strip} +bright7 = {color15.strip} + +[cursor] +color = {foreground.strip} {cursor.strip} From b7051903a28c27f0b3117db170ee61ccea6c8db7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 23:13:20 +0300 Subject: [PATCH 1412/2667] Add pywal colors to foot --- home/.config/foot/foot.ini | 22 ++------------------ home/.config/wal/templates/colors-foot.ini | 24 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 home/.config/wal/templates/colors-foot.ini diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini index 1868aef7..c34e5606 100644 --- a/home/.config/foot/foot.ini +++ b/home/.config/foot/foot.ini @@ -1,3 +1,5 @@ +include=~/.cache/wal/colors-foot.ini + pad=10x0 [scrollback] @@ -8,23 +10,3 @@ blink=yes [mouse] hide-when-typing=yes - -[colors] -foreground = D9E0EE -background = 1E1D2F -regular0 = 6E6C7E -regular1 = F28FAD -regular2 = ABE9B3 -regular3 = FAE3B0 -regular4 = 96CDFB -regular5 = F5C2E7 -regular6 = 89DCEB -regular7 = D9E0EE -bright0 = 988BA2 -bright1 = F28FAD -bright2 = ABE9B3 -bright3 = FAE3B0 -bright4 = 96CDFB -bright5 = F5C2E7 -bright6 = 89DCEB -bright7 = D9E0EE diff --git a/home/.config/wal/templates/colors-foot.ini b/home/.config/wal/templates/colors-foot.ini new file mode 100644 index 00000000..835bb948 --- /dev/null +++ b/home/.config/wal/templates/colors-foot.ini @@ -0,0 +1,24 @@ +[colors] +foreground = {foreground.strip} +background = {background.strip} +alpha = {background.alpha_dec} + +regular0 = {color0.strip} +regular1 = {color1.strip} +regular2 = {color2.strip} +regular3 = {color3.strip} +regular4 = {color4.strip} +regular5 = {color5.strip} +regular6 = {color6.strip} +regular7 = {color7.strip} +bright0 = {color8.strip} +bright1 = {color9.strip} +bright2 = {color10.strip} +bright3 = {color11.strip} +bright4 = {color12.strip} +bright5 = {color13.strip} +bright6 = {color14.strip} +bright7 = {color15.strip} + +[cursor] +color = {foreground.strip} {cursor.strip} From abad686976819b6677120b6eb66a68afd8b5428a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 23:16:53 +0300 Subject: [PATCH 1413/2667] Add d_wal to terminal profile, format config.toml --- config.toml | 85 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 64 insertions(+), 21 deletions(-) diff --git a/config.toml b/config.toml index 5888924e..ea1353d1 100644 --- a/config.toml +++ b/config.toml @@ -31,7 +31,7 @@ dst = "~/.config/imapnotify" src = ".config/imapnotify" [dotfiles.d_nvim] -actions = [ "nvim-packer-sync",] +actions = ["nvim-packer-sync"] dst = "~/.config/nvim" src = ".config/nvim" @@ -229,58 +229,101 @@ src = ".config/wal" dst = "~/.config/wal" [profiles.os_arch] -include = [ "terminal",] -dotfiles = [ "f_makepkg.conf", "f_paru.conf",] +include = ["terminal"] +dotfiles = ["f_makepkg.conf", "f_paru.conf"] [profiles.os_ubuntu] -include = [ "terminal",] +include = ["terminal"] [profiles.os_termux] -include = [ "terminal",] +include = ["terminal"] [profiles.terminal] -dotfiles = [ "d_nvim", "d_ssh", "d_zsh", "f_alacritty.yml", "f_gitconfig", "f_hushlogin", "f_ignore", "f_mailcap", "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", "f_tmux.conf", "f_zshrc",] +dotfiles = [ + "d_wal", + "d_nvim", + "d_ssh", + "d_zsh", + "f_alacritty.yml", + "f_gitconfig", + "f_hushlogin", + "f_ignore", + "f_mailcap", + "f_ranger.conf", + "f_ranger_commands.py", + "f_rtv.cfg", + "f_tmux.conf", + "f_zshrc", +] [profiles.email] -dotfiles = [ "d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config",] +dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] [profiles.media] -dotfiles = [ "d_mpv", "f_abcde.conf", "f_beets_config", "f_beets_whitelist", "f_libra_config", "f_mpd.conf", "f_mpdris2.conf", "f_mpdscribble.conf", "f_ncmpcpp.conf", "f_ncmpcpp_bindings", "f_youtube-dl_config",] +dotfiles = [ + "d_mpv", + "f_abcde.conf", + "f_beets_config", + "f_beets_whitelist", + "f_libra_config", + "f_mpd.conf", + "f_mpdris2.conf", + "f_mpdscribble.conf", + "f_ncmpcpp.conf", + "f_ncmpcpp_bindings", + "f_youtube-dl_config", +] [profiles.sway] -dotfiles = [ "d_sway", "d_waybar", "d_wofi", "d_zathura", "f_electron-flags.conf", "f_electron12-flags.conf", "f_fonts.conf", "f_foot.ini", "f_mako_config", "f_redshift.conf",] +dotfiles = [ + "d_sway", + "d_waybar", + "d_wofi", + "d_zathura", + "f_electron-flags.conf", + "f_electron12-flags.conf", + "f_fonts.conf", + "f_foot.ini", + "f_mako_config", + "f_redshift.conf", +] [profiles.gpg] -dotfiles = [ "f_gpg-agent.conf", "f_gpg.conf", "f_gpg_scdaemon.conf", "f_pam_environment",] +dotfiles = [ + "f_gpg-agent.conf", + "f_gpg.conf", + "f_gpg_scdaemon.conf", + "f_pam_environment", +] [profiles.Mirkwood] -include = [ "os_arch", "email", "media", "sway", "gpg",] -dotfiles = [ "d_systemd", "d_rofi", "d_wal",] +include = ["os_arch", "email", "media", "sway", "gpg"] +dotfiles = ["d_systemd", "d_rofi"] [profiles.Moria] -include = [ "os_arch", "media", "gpg",] -dotfiles = [ "f_zprofile",] +include = ["os_arch", "media", "gpg"] +dotfiles = ["f_zprofile"] [profiles.Gondor] -include = [ "os_arch",] +include = ["os_arch"] [profiles.mko-laptop] -include = [ "os_ubuntu", "media", "gpg",] +include = ["os_ubuntu", "media", "gpg"] [profiles.Isengard] -include = [ "os_termux",] +include = ["os_termux"] [profiles.Edoras] -include = [ "os_arch",] +include = ["os_arch"] [profiles.TakamakiPC] -include = [ "os_arch",] +include = ["os_arch"] [profiles.localhost] -include = [ "os_arch",] +include = ["os_arch"] [profiles.ViiruJaTeippi] -include = [ "terminal",] +include = ["terminal"] [profiles.os_arch.variables] os = "arch" From b853a896356cd297dca7f912e2c9d1b440d6e68c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 23:16:53 +0300 Subject: [PATCH 1414/2667] Add d_wal to terminal profile, format config.toml --- config.toml | 85 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 64 insertions(+), 21 deletions(-) diff --git a/config.toml b/config.toml index 5888924e..ea1353d1 100644 --- a/config.toml +++ b/config.toml @@ -31,7 +31,7 @@ dst = "~/.config/imapnotify" src = ".config/imapnotify" [dotfiles.d_nvim] -actions = [ "nvim-packer-sync",] +actions = ["nvim-packer-sync"] dst = "~/.config/nvim" src = ".config/nvim" @@ -229,58 +229,101 @@ src = ".config/wal" dst = "~/.config/wal" [profiles.os_arch] -include = [ "terminal",] -dotfiles = [ "f_makepkg.conf", "f_paru.conf",] +include = ["terminal"] +dotfiles = ["f_makepkg.conf", "f_paru.conf"] [profiles.os_ubuntu] -include = [ "terminal",] +include = ["terminal"] [profiles.os_termux] -include = [ "terminal",] +include = ["terminal"] [profiles.terminal] -dotfiles = [ "d_nvim", "d_ssh", "d_zsh", "f_alacritty.yml", "f_gitconfig", "f_hushlogin", "f_ignore", "f_mailcap", "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", "f_tmux.conf", "f_zshrc",] +dotfiles = [ + "d_wal", + "d_nvim", + "d_ssh", + "d_zsh", + "f_alacritty.yml", + "f_gitconfig", + "f_hushlogin", + "f_ignore", + "f_mailcap", + "f_ranger.conf", + "f_ranger_commands.py", + "f_rtv.cfg", + "f_tmux.conf", + "f_zshrc", +] [profiles.email] -dotfiles = [ "d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config",] +dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] [profiles.media] -dotfiles = [ "d_mpv", "f_abcde.conf", "f_beets_config", "f_beets_whitelist", "f_libra_config", "f_mpd.conf", "f_mpdris2.conf", "f_mpdscribble.conf", "f_ncmpcpp.conf", "f_ncmpcpp_bindings", "f_youtube-dl_config",] +dotfiles = [ + "d_mpv", + "f_abcde.conf", + "f_beets_config", + "f_beets_whitelist", + "f_libra_config", + "f_mpd.conf", + "f_mpdris2.conf", + "f_mpdscribble.conf", + "f_ncmpcpp.conf", + "f_ncmpcpp_bindings", + "f_youtube-dl_config", +] [profiles.sway] -dotfiles = [ "d_sway", "d_waybar", "d_wofi", "d_zathura", "f_electron-flags.conf", "f_electron12-flags.conf", "f_fonts.conf", "f_foot.ini", "f_mako_config", "f_redshift.conf",] +dotfiles = [ + "d_sway", + "d_waybar", + "d_wofi", + "d_zathura", + "f_electron-flags.conf", + "f_electron12-flags.conf", + "f_fonts.conf", + "f_foot.ini", + "f_mako_config", + "f_redshift.conf", +] [profiles.gpg] -dotfiles = [ "f_gpg-agent.conf", "f_gpg.conf", "f_gpg_scdaemon.conf", "f_pam_environment",] +dotfiles = [ + "f_gpg-agent.conf", + "f_gpg.conf", + "f_gpg_scdaemon.conf", + "f_pam_environment", +] [profiles.Mirkwood] -include = [ "os_arch", "email", "media", "sway", "gpg",] -dotfiles = [ "d_systemd", "d_rofi", "d_wal",] +include = ["os_arch", "email", "media", "sway", "gpg"] +dotfiles = ["d_systemd", "d_rofi"] [profiles.Moria] -include = [ "os_arch", "media", "gpg",] -dotfiles = [ "f_zprofile",] +include = ["os_arch", "media", "gpg"] +dotfiles = ["f_zprofile"] [profiles.Gondor] -include = [ "os_arch",] +include = ["os_arch"] [profiles.mko-laptop] -include = [ "os_ubuntu", "media", "gpg",] +include = ["os_ubuntu", "media", "gpg"] [profiles.Isengard] -include = [ "os_termux",] +include = ["os_termux"] [profiles.Edoras] -include = [ "os_arch",] +include = ["os_arch"] [profiles.TakamakiPC] -include = [ "os_arch",] +include = ["os_arch"] [profiles.localhost] -include = [ "os_arch",] +include = ["os_arch"] [profiles.ViiruJaTeippi] -include = [ "terminal",] +include = ["terminal"] [profiles.os_arch.variables] os = "arch" From ed91d7841a5bd1636258493fe181adcf89a903ea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 9 Sep 2022 11:05:36 +0300 Subject: [PATCH 1415/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From 68b3fefc670654f3e7e1add56177f20fc0c6f360 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 9 Sep 2022 11:05:36 +0300 Subject: [PATCH 1416/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From a0e363ff263c97f0a855f6c3499cb75d62f6c8e5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 9 Sep 2022 13:34:58 +0300 Subject: [PATCH 1417/2667] Add librewolf overrides --- config.toml | 8 +++-- home/.librewolf/librewolf.overrides.cfg | 48 +++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 home/.librewolf/librewolf.overrides.cfg diff --git a/config.toml b/config.toml index ea1353d1..31ba8fce 100644 --- a/config.toml +++ b/config.toml @@ -87,6 +87,10 @@ src = ".config/git/config" dst = "~/.config/libra/config.toml" src = ".config/libra/config.toml" +[dotfiles.f_librewolf_overrides] +dst = "~/.librewolf/librewolf.overrides.cfg" +src = ".librewolf/librewolf.overrides.cfg" + [dotfiles.f_mailcap] dst = "~/.mailcap" src = ".mailcap" @@ -298,11 +302,11 @@ dotfiles = [ [profiles.Mirkwood] include = ["os_arch", "email", "media", "sway", "gpg"] -dotfiles = ["d_systemd", "d_rofi"] +dotfiles = ["d_systemd", "d_rofi", "f_librewolf_overrides"] [profiles.Moria] include = ["os_arch", "media", "gpg"] -dotfiles = ["f_zprofile"] +dotfiles = ["f_zprofile", "f_librewolf_overrides"] [profiles.Gondor] include = ["os_arch"] diff --git a/home/.librewolf/librewolf.overrides.cfg b/home/.librewolf/librewolf.overrides.cfg new file mode 100644 index 00000000..11d4ccd9 --- /dev/null +++ b/home/.librewolf/librewolf.overrides.cfg @@ -0,0 +1,48 @@ +// vim:ft=javascript + +// Enable Google safe browsing +pref("browser.safebrowsing.malware.enabled", true); +pref("browser.safebrowsing.phishing.enabled", true); +pref("browser.safebrowsing.blockedURIs.enabled", true); +pref( + "browser.safebrowsing.provider.google4.gethashURL", + "https://safebrowsing.googleapis.com/v4/fullHashes:find?$ct=application/x-protobuf&key=%GOOGLE_SAFEBROWSING_API_KEY%&$httpMethod=POST" +); +pref( + "browser.safebrowsing.provider.google4.updateURL", + "https://safebrowsing.googleapis.com/v4/threatListUpdates:fetch?$ct=application/x-protobuf&key=%GOOGLE_SAFEBROWSING_API_KEY%&$httpMethod=POST" +); +pref( + "browser.safebrowsing.provider.google.gethashURL", + "https://safebrowsing.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2" +); +pref( + "browser.safebrowsing.provider.google.updateURL", + "https://safebrowsing.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2&key=%GOOGLE_SAFEBROWSING_API_KEY%" +); + +// Disable letterboxing +pref("privacy.resistFingerprinting.letterboxing", false); + +/* +* Disable RFP because I want automatic dark mode on websites +* that support it +*/ +pref("privacy.resistFingerprinting", false); + +pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", false); + +// Scan downloads for suspicious files +pref("browser.safebrowsing.downloads.enabled", true); + +// Disable WebGL +pref("webgl.disabled", true); + +// Enable Firefox Sync +pref("identity.fxaccounts.enabled", true); + +// Don't clear browsing history on shutdown +pref("privacy.clearOnShutdown.history", false); + +// Clear download history on shutdown +pref("privacy.clearOnShutdown.downloads", true); From b29bf53fa191bac40a36bc79b6f3a8cc70510a10 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 9 Sep 2022 13:34:58 +0300 Subject: [PATCH 1418/2667] Add librewolf overrides --- config.toml | 8 +++-- home/.librewolf/librewolf.overrides.cfg | 48 +++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 home/.librewolf/librewolf.overrides.cfg diff --git a/config.toml b/config.toml index ea1353d1..31ba8fce 100644 --- a/config.toml +++ b/config.toml @@ -87,6 +87,10 @@ src = ".config/git/config" dst = "~/.config/libra/config.toml" src = ".config/libra/config.toml" +[dotfiles.f_librewolf_overrides] +dst = "~/.librewolf/librewolf.overrides.cfg" +src = ".librewolf/librewolf.overrides.cfg" + [dotfiles.f_mailcap] dst = "~/.mailcap" src = ".mailcap" @@ -298,11 +302,11 @@ dotfiles = [ [profiles.Mirkwood] include = ["os_arch", "email", "media", "sway", "gpg"] -dotfiles = ["d_systemd", "d_rofi"] +dotfiles = ["d_systemd", "d_rofi", "f_librewolf_overrides"] [profiles.Moria] include = ["os_arch", "media", "gpg"] -dotfiles = ["f_zprofile"] +dotfiles = ["f_zprofile", "f_librewolf_overrides"] [profiles.Gondor] include = ["os_arch"] diff --git a/home/.librewolf/librewolf.overrides.cfg b/home/.librewolf/librewolf.overrides.cfg new file mode 100644 index 00000000..11d4ccd9 --- /dev/null +++ b/home/.librewolf/librewolf.overrides.cfg @@ -0,0 +1,48 @@ +// vim:ft=javascript + +// Enable Google safe browsing +pref("browser.safebrowsing.malware.enabled", true); +pref("browser.safebrowsing.phishing.enabled", true); +pref("browser.safebrowsing.blockedURIs.enabled", true); +pref( + "browser.safebrowsing.provider.google4.gethashURL", + "https://safebrowsing.googleapis.com/v4/fullHashes:find?$ct=application/x-protobuf&key=%GOOGLE_SAFEBROWSING_API_KEY%&$httpMethod=POST" +); +pref( + "browser.safebrowsing.provider.google4.updateURL", + "https://safebrowsing.googleapis.com/v4/threatListUpdates:fetch?$ct=application/x-protobuf&key=%GOOGLE_SAFEBROWSING_API_KEY%&$httpMethod=POST" +); +pref( + "browser.safebrowsing.provider.google.gethashURL", + "https://safebrowsing.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2" +); +pref( + "browser.safebrowsing.provider.google.updateURL", + "https://safebrowsing.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2&key=%GOOGLE_SAFEBROWSING_API_KEY%" +); + +// Disable letterboxing +pref("privacy.resistFingerprinting.letterboxing", false); + +/* +* Disable RFP because I want automatic dark mode on websites +* that support it +*/ +pref("privacy.resistFingerprinting", false); + +pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", false); + +// Scan downloads for suspicious files +pref("browser.safebrowsing.downloads.enabled", true); + +// Disable WebGL +pref("webgl.disabled", true); + +// Enable Firefox Sync +pref("identity.fxaccounts.enabled", true); + +// Don't clear browsing history on shutdown +pref("privacy.clearOnShutdown.history", false); + +// Clear download history on shutdown +pref("privacy.clearOnShutdown.downloads", true); From 1be4803c5de1d41d666c042f10a8e25468e0fbb7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 11 Sep 2022 12:49:31 +0300 Subject: [PATCH 1419/2667] Use pywal in sway --- home/.config/sway/conf.d/01-vars.conf | 1 - home/.config/sway/config | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index f5efaca2..76837cf4 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -4,5 +4,4 @@ set $mod Mod4 set $term footclient set $browser librewolf set $gnome-schema org.gnome.desktop.interface -set $wallpaper ~/Pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) set $scripts ~/.config/sway/scripts diff --git a/home/.config/sway/config b/home/.config/sway/config index afde203c..2d43f1ae 100644 --- a/home/.config/sway/config +++ b/home/.config/sway/config @@ -1,3 +1,4 @@ # vim:ft=i3config +include ~/.cache/wal/colors-sway include ~/.config/sway/conf.d/*.conf From 3f2c88998514a762775909ef37bd33f602bf3d1b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 11 Sep 2022 12:49:31 +0300 Subject: [PATCH 1420/2667] Use pywal in sway --- home/.config/sway/conf.d/01-vars.conf | 1 - home/.config/sway/config | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index f5efaca2..76837cf4 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -4,5 +4,4 @@ set $mod Mod4 set $term footclient set $browser librewolf set $gnome-schema org.gnome.desktop.interface -set $wallpaper ~/Pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) set $scripts ~/.config/sway/scripts diff --git a/home/.config/sway/config b/home/.config/sway/config index afde203c..2d43f1ae 100644 --- a/home/.config/sway/config +++ b/home/.config/sway/config @@ -1,3 +1,4 @@ # vim:ft=i3config +include ~/.cache/wal/colors-sway include ~/.config/sway/conf.d/*.conf From bcae859e252a972e2cd544240ff9a68851d0b6d1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 11 Sep 2022 12:49:49 +0300 Subject: [PATCH 1421/2667] Fix gpg-agent.conf template --- home/.gnupg/gpg-agent.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.gnupg/gpg-agent.conf b/home/.gnupg/gpg-agent.conf index 68fad143..2bbd0eb3 100644 --- a/home/.gnupg/gpg-agent.conf +++ b/home/.gnupg/gpg-agent.conf @@ -1,6 +1,6 @@ enable-ssh-support -{%@ if profile == 'Mirkwood' @%} +{%@@ if profile == 'Mirkwood' @@%} pinentry-program /usr/bin/pinentry-rofi -{%@ else @%} +{%@@ else @@%} pinentry-program /usr/bin/pinentry-gnome3 -{%@ endif @%} +{%@@ endif @@%} From 116621e4cce5478e56eae904eba1118cb9220058 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 11 Sep 2022 12:49:49 +0300 Subject: [PATCH 1422/2667] Fix gpg-agent.conf template --- home/.gnupg/gpg-agent.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.gnupg/gpg-agent.conf b/home/.gnupg/gpg-agent.conf index 68fad143..2bbd0eb3 100644 --- a/home/.gnupg/gpg-agent.conf +++ b/home/.gnupg/gpg-agent.conf @@ -1,6 +1,6 @@ enable-ssh-support -{%@ if profile == 'Mirkwood' @%} +{%@@ if profile == 'Mirkwood' @@%} pinentry-program /usr/bin/pinentry-rofi -{%@ else @%} +{%@@ else @@%} pinentry-program /usr/bin/pinentry-gnome3 -{%@ endif @%} +{%@@ endif @@%} From 4b81cf8a8db44644faf63d02043a7946c8b97ab5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 11 Sep 2022 12:50:00 +0300 Subject: [PATCH 1423/2667] Make rofi font bigger --- home/.config/rofi/config.rasi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/rofi/config.rasi b/home/.config/rofi/config.rasi index 502769e7..be258cd5 100644 --- a/home/.config/rofi/config.rasi +++ b/home/.config/rofi/config.rasi @@ -1,7 +1,7 @@ // vim: ft=rasi configuration { - font: "Overpass 10"; + font: "Overpass 15"; show-icons: true; terminal: "foot"; // modi: "run,ssh"; From 33b9d9930f3e3976d159a887b1cbad1802da15a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 11 Sep 2022 12:50:00 +0300 Subject: [PATCH 1424/2667] Make rofi font bigger --- home/.config/rofi/config.rasi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/rofi/config.rasi b/home/.config/rofi/config.rasi index 502769e7..be258cd5 100644 --- a/home/.config/rofi/config.rasi +++ b/home/.config/rofi/config.rasi @@ -1,7 +1,7 @@ // vim: ft=rasi configuration { - font: "Overpass 10"; + font: "Overpass 15"; show-icons: true; terminal: "foot"; // modi: "run,ssh"; From 00424621899807d048614122ffce3ee93bdd3561 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 11 Sep 2022 12:50:14 +0300 Subject: [PATCH 1425/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 From 489e8dcfe23883c7cebdd37c2a5d66e8535d2ebf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 11 Sep 2022 12:50:14 +0300 Subject: [PATCH 1426/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 From 1095e16475d765109c8d65e820f9cac9a8484008 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 12 Sep 2022 12:50:16 +0300 Subject: [PATCH 1427/2667] Remove bibliogram because it has been discontinued --- docker/freshrss/docker-compose.toml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml index bd9fac93..e249c3c4 100644 --- a/docker/freshrss/docker-compose.toml +++ b/docker/freshrss/docker-compose.toml @@ -6,7 +6,6 @@ container_name = "freshrss" restart = "unless-stopped" networks = ["freshrss", "postgres", "proxy"] environment = ["PUID=1000", "PGID=985", "TZ=Europe/Helsinki"] -depends_on = ["bibliogram"] volumes = [ "/docker/freshrss/freshrss:/config", "/etc/localtime:/etc/localtime:ro", @@ -24,25 +23,6 @@ labels = [ "traefik.http.services.freshrss.loadbalancer.server.port=80", ] -[services.bibliogram] -image = "schklom/bibliogram" -container_name = "bibliogram" -restart = "unless-stopped" -networks = ["freshrss", "proxy"] -volumes = ["/docker/freshrss/bibliogram/config.js:/app/config.js:ro"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.bibliogram-redirect.entrypoints=http", - "traefik.http.routers.bibliogram-redirect.rule=Host(`bibliogram.korhonen.cc`)", - "traefik.http.routers.bibliogram-redirect.middlewares=http2https@file", - "traefik.http.routers.bibliogram.entrypoints=https", - "traefik.http.routers.bibliogram.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)", - "traefik.http.routers.bibliogram.service=bibliogram", - "traefik.http.services.bibliogram.loadbalancer.server.port=10407", -] - [networks] [networks.freshrss] From 968ce1b1702e07ddfbeae5c19711510515432f42 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 12 Sep 2022 12:50:16 +0300 Subject: [PATCH 1428/2667] Remove bibliogram because it has been discontinued --- docker/freshrss/docker-compose.toml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml index bd9fac93..e249c3c4 100644 --- a/docker/freshrss/docker-compose.toml +++ b/docker/freshrss/docker-compose.toml @@ -6,7 +6,6 @@ container_name = "freshrss" restart = "unless-stopped" networks = ["freshrss", "postgres", "proxy"] environment = ["PUID=1000", "PGID=985", "TZ=Europe/Helsinki"] -depends_on = ["bibliogram"] volumes = [ "/docker/freshrss/freshrss:/config", "/etc/localtime:/etc/localtime:ro", @@ -24,25 +23,6 @@ labels = [ "traefik.http.services.freshrss.loadbalancer.server.port=80", ] -[services.bibliogram] -image = "schklom/bibliogram" -container_name = "bibliogram" -restart = "unless-stopped" -networks = ["freshrss", "proxy"] -volumes = ["/docker/freshrss/bibliogram/config.js:/app/config.js:ro"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.bibliogram-redirect.entrypoints=http", - "traefik.http.routers.bibliogram-redirect.rule=Host(`bibliogram.korhonen.cc`)", - "traefik.http.routers.bibliogram-redirect.middlewares=http2https@file", - "traefik.http.routers.bibliogram.entrypoints=https", - "traefik.http.routers.bibliogram.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)", - "traefik.http.routers.bibliogram.service=bibliogram", - "traefik.http.services.bibliogram.loadbalancer.server.port=10407", -] - [networks] [networks.freshrss] From 54c018b40ada66a062bb4502253b3101d60e70b7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 12 Sep 2022 12:52:15 +0300 Subject: [PATCH 1429/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From 3f487ee0f3bf33582c8861137a96fb7cafcb5fd4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 12 Sep 2022 12:52:15 +0300 Subject: [PATCH 1430/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From ad1e2c0df163c28248bd971d24f12671ea8998c0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 14:54:13 +0300 Subject: [PATCH 1431/2667] Fix config.toml --- config.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.toml b/config.toml index 31ba8fce..f247c09d 100644 --- a/config.toml +++ b/config.toml @@ -306,13 +306,14 @@ dotfiles = ["d_systemd", "d_rofi", "f_librewolf_overrides"] [profiles.Moria] include = ["os_arch", "media", "gpg"] -dotfiles = ["f_zprofile", "f_librewolf_overrides"] +dotfiles = ["f_zprofile", "f_librewolf_overrides"] [profiles.Gondor] include = ["os_arch"] [profiles.mko-laptop] include = ["os_ubuntu", "media", "gpg"] +dotfiles = ["f_librewolf_overrides"] [profiles.Isengard] include = ["os_termux"] From 1e54c2dd73cadc12cbf256e02e041171070ff6e6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 14:54:13 +0300 Subject: [PATCH 1432/2667] Fix config.toml --- config.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.toml b/config.toml index 31ba8fce..f247c09d 100644 --- a/config.toml +++ b/config.toml @@ -306,13 +306,14 @@ dotfiles = ["d_systemd", "d_rofi", "f_librewolf_overrides"] [profiles.Moria] include = ["os_arch", "media", "gpg"] -dotfiles = ["f_zprofile", "f_librewolf_overrides"] +dotfiles = ["f_zprofile", "f_librewolf_overrides"] [profiles.Gondor] include = ["os_arch"] [profiles.mko-laptop] include = ["os_ubuntu", "media", "gpg"] +dotfiles = ["f_librewolf_overrides"] [profiles.Isengard] include = ["os_termux"] From 2b8d17fc245e7f1fa28fad4dec4188b607512fbd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 14:54:23 +0300 Subject: [PATCH 1433/2667] Use specific java version for jdtls --- home/.config/nvim/ftplugin/java.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 6e1cb17d..d1368e02 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -4,7 +4,7 @@ local workspace_dir = nvim_local_dir .. '/jdtls-workspaces/' .. project_name require('jdtls').start_or_attach({ cmd = { - 'java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', + '/usr/lib/jvm/java-17-openjdk-amd64/bin/java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', '-Dosgi.bundles.defaultStartLevel=4', '-Declipse.product=org.eclipse.jdt.ls.core.product', '-Dlog.protocol=true', '-Dlog.level=ALL', '-Xms1g', From b436745bf1c4a58e2e150bd7870d3ab5d95738a3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 14:54:23 +0300 Subject: [PATCH 1434/2667] Use specific java version for jdtls --- home/.config/nvim/ftplugin/java.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 6e1cb17d..d1368e02 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -4,7 +4,7 @@ local workspace_dir = nvim_local_dir .. '/jdtls-workspaces/' .. project_name require('jdtls').start_or_attach({ cmd = { - 'java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', + '/usr/lib/jvm/java-17-openjdk-amd64/bin/java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', '-Dosgi.bundles.defaultStartLevel=4', '-Declipse.product=org.eclipse.jdt.ls.core.product', '-Dlog.protocol=true', '-Dlog.level=ALL', '-Xms1g', From 8a52dcfcd8860e9b40511a865f445ae3369cdbe3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 17:54:23 +0300 Subject: [PATCH 1435/2667] Traefik: remove unneeded lines from docker-compose --- docker/traefik/docker-compose.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index 659e9185..e6dc1e78 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -1,5 +1,3 @@ -[services] - [services.traefik] image = "traefik:latest" container_name = "traefik" @@ -47,7 +45,5 @@ volumes = [ "/mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro", ] -[networks] - [networks.proxy] external = true From 573236400f5116077706530d7b7e14d5bd17215b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 17:54:23 +0300 Subject: [PATCH 1436/2667] Traefik: remove unneeded lines from docker-compose --- docker/traefik/docker-compose.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index 659e9185..e6dc1e78 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -1,5 +1,3 @@ -[services] - [services.traefik] image = "traefik:latest" container_name = "traefik" @@ -47,7 +45,5 @@ volumes = [ "/mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro", ] -[networks] - [networks.proxy] external = true From e4d5dcc55766d28c1d648f02b5558e9d8e75ba4c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 17:54:55 +0300 Subject: [PATCH 1437/2667] Add umami --- docker/umami/docker-compose.toml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 docker/umami/docker-compose.toml diff --git a/docker/umami/docker-compose.toml b/docker/umami/docker-compose.toml new file mode 100644 index 00000000..12a8779a --- /dev/null +++ b/docker/umami/docker-compose.toml @@ -0,0 +1,29 @@ +[services.umami] +image = "docker.umami.is/umami-software/umami:postgresql-latest" +container_name = "umami" +restart = "unless-stopped" +networks = ["postgres", "proxy"] +env_file = ".env" +environment = { DATABASE_URL = "postgresql://umami:${POSTGRES_PASS}@postgres:5432/umami", HASH_SALT = "${HASH_SALT}" } +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.umami-redirect.entrypoints=http", + "traefik.http.routers.umami-redirect.rule=Host(`umami.korhonen.cc`)", + "traefik.http.routers.umami-redirect.middlewares=http2https@file", + "traefik.http.routers.umami.entrypoints=https", + "traefik.http.routers.umami.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.umami.rule=Host(`umami.korhonen.cc`)", + "traefik.http.routers.umami.service=umami", + "traefik.http.services.umami.loadbalancer.server.port=3000", +] + +[services.umami.logging.options] +max-size = "10m" +max-file = "10" + +[networks.postgres] +external = true + +[networks.proxy] +external = true From 1398574bb2941cf72cd3706a6c0db391493565ea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 17:54:55 +0300 Subject: [PATCH 1438/2667] Add umami --- docker/umami/docker-compose.toml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 docker/umami/docker-compose.toml diff --git a/docker/umami/docker-compose.toml b/docker/umami/docker-compose.toml new file mode 100644 index 00000000..12a8779a --- /dev/null +++ b/docker/umami/docker-compose.toml @@ -0,0 +1,29 @@ +[services.umami] +image = "docker.umami.is/umami-software/umami:postgresql-latest" +container_name = "umami" +restart = "unless-stopped" +networks = ["postgres", "proxy"] +env_file = ".env" +environment = { DATABASE_URL = "postgresql://umami:${POSTGRES_PASS}@postgres:5432/umami", HASH_SALT = "${HASH_SALT}" } +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.umami-redirect.entrypoints=http", + "traefik.http.routers.umami-redirect.rule=Host(`umami.korhonen.cc`)", + "traefik.http.routers.umami-redirect.middlewares=http2https@file", + "traefik.http.routers.umami.entrypoints=https", + "traefik.http.routers.umami.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.umami.rule=Host(`umami.korhonen.cc`)", + "traefik.http.routers.umami.service=umami", + "traefik.http.services.umami.loadbalancer.server.port=3000", +] + +[services.umami.logging.options] +max-size = "10m" +max-file = "10" + +[networks.postgres] +external = true + +[networks.proxy] +external = true From 130b7a36dc693fbec99cc4ba358a1c0b6b0d217d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 17:58:48 +0300 Subject: [PATCH 1439/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 From ba28bba03a918d5496fa4a6ddba5e96558e02a19 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 17:58:48 +0300 Subject: [PATCH 1440/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 From 9f41ba8e19e53e6f9fbea066d1119ed656e1d521 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 19:37:16 +0300 Subject: [PATCH 1441/2667] Change umami tracker script name to circumvent ublock --- docker/umami/docker-compose.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docker/umami/docker-compose.toml b/docker/umami/docker-compose.toml index 12a8779a..f23ea303 100644 --- a/docker/umami/docker-compose.toml +++ b/docker/umami/docker-compose.toml @@ -4,7 +4,6 @@ container_name = "umami" restart = "unless-stopped" networks = ["postgres", "proxy"] env_file = ".env" -environment = { DATABASE_URL = "postgresql://umami:${POSTGRES_PASS}@postgres:5432/umami", HASH_SALT = "${HASH_SALT}" } labels = [ "traefik.enable=true", "traefik.docker.network=proxy", @@ -18,6 +17,11 @@ labels = [ "traefik.http.services.umami.loadbalancer.server.port=3000", ] +[services.umami.environment] +DATABASE_URL = "postgresql://umami:${POSTGRES_PASS}@postgres:5432/umami" +HASH_SALT = "${HASH_SALT}" +TRACKER_SCRIPT_NAME = "ua9quuaW.js" + [services.umami.logging.options] max-size = "10m" max-file = "10" From a97f68aeb5b3684c11d1523d283b68916c183034 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 19:37:16 +0300 Subject: [PATCH 1442/2667] Change umami tracker script name to circumvent ublock --- docker/umami/docker-compose.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docker/umami/docker-compose.toml b/docker/umami/docker-compose.toml index 12a8779a..f23ea303 100644 --- a/docker/umami/docker-compose.toml +++ b/docker/umami/docker-compose.toml @@ -4,7 +4,6 @@ container_name = "umami" restart = "unless-stopped" networks = ["postgres", "proxy"] env_file = ".env" -environment = { DATABASE_URL = "postgresql://umami:${POSTGRES_PASS}@postgres:5432/umami", HASH_SALT = "${HASH_SALT}" } labels = [ "traefik.enable=true", "traefik.docker.network=proxy", @@ -18,6 +17,11 @@ labels = [ "traefik.http.services.umami.loadbalancer.server.port=3000", ] +[services.umami.environment] +DATABASE_URL = "postgresql://umami:${POSTGRES_PASS}@postgres:5432/umami" +HASH_SALT = "${HASH_SALT}" +TRACKER_SCRIPT_NAME = "ua9quuaW.js" + [services.umami.logging.options] max-size = "10m" max-file = "10" From 049ce6e36008a34ddc3cb23c8655104a6dea1dbf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 19:39:53 +0300 Subject: [PATCH 1443/2667] Umami: drop .js from tracker script name --- docker/umami/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/umami/docker-compose.toml b/docker/umami/docker-compose.toml index f23ea303..3c2553a1 100644 --- a/docker/umami/docker-compose.toml +++ b/docker/umami/docker-compose.toml @@ -20,7 +20,7 @@ labels = [ [services.umami.environment] DATABASE_URL = "postgresql://umami:${POSTGRES_PASS}@postgres:5432/umami" HASH_SALT = "${HASH_SALT}" -TRACKER_SCRIPT_NAME = "ua9quuaW.js" +TRACKER_SCRIPT_NAME = "ua9quuaW" [services.umami.logging.options] max-size = "10m" From 8ab864c3838edf3d74b7e1662d140b45120fcab5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 19:39:53 +0300 Subject: [PATCH 1444/2667] Umami: drop .js from tracker script name --- docker/umami/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/umami/docker-compose.toml b/docker/umami/docker-compose.toml index f23ea303..3c2553a1 100644 --- a/docker/umami/docker-compose.toml +++ b/docker/umami/docker-compose.toml @@ -20,7 +20,7 @@ labels = [ [services.umami.environment] DATABASE_URL = "postgresql://umami:${POSTGRES_PASS}@postgres:5432/umami" HASH_SALT = "${HASH_SALT}" -TRACKER_SCRIPT_NAME = "ua9quuaW.js" +TRACKER_SCRIPT_NAME = "ua9quuaW" [services.umami.logging.options] max-size = "10m" From 40c78757797e1805a83af4c353112d08c5daf5bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 16:53:16 +0300 Subject: [PATCH 1445/2667] Add markdown preview plugin --- home/.config/nvim/lua/plugins/init.lua | 290 +++++++++++++------------ 1 file changed, 147 insertions(+), 143 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 3491a13b..39a1a6c8 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -3,191 +3,195 @@ local fn = vim.fn -- Install packer if it's not yet installed local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim' if fn.empty(fn.glob(install_path)) > 0 then - print('Installing Packer') - Packer_bootstrap = fn.system({ - 'git', 'clone', '--depth', '1', - 'https://github.com/wbthomason/packer.nvim', install_path - }) - vim.cmd [[packadd packer.nvim]] - print('Installed Packer') + print('Installing Packer') + Packer_bootstrap = fn.system({ + 'git', 'clone', '--depth', '1', + 'https://github.com/wbthomason/packer.nvim', install_path + }) + vim.cmd [[packadd packer.nvim]] + print('Installed Packer') end -- Configure packer require('packer').startup(function() - local use = require('packer').use + local use = require('packer').use - -- The plugin manager itself - use {'wbthomason/packer.nvim'} + -- The plugin manager itself + use { 'wbthomason/packer.nvim' } - -- Colorscheme - use { - 'FunctionalHacker/pywal.nvim', - config = function() require('pywal').setup() end - } + -- Colorscheme + use { + 'FunctionalHacker/pywal.nvim', + config = function() require('pywal').setup() end + } - -- Statusline - use { - 'nvim-lualine/lualine.nvim', - requires = {'kyazdani42/nvim-web-devicons', opt = true}, - config = require('plugins.lualine') - } + -- Statusline + use { + 'nvim-lualine/lualine.nvim', + requires = { 'kyazdani42/nvim-web-devicons', opt = true }, + config = require('plugins.lualine') + } - -- Startup screen/dashboard - use 'glepnir/dashboard-nvim' + -- Startup screen/dashboard + use 'glepnir/dashboard-nvim' - -- Git in signcolumn - use 'airblade/vim-gitgutter' + -- Git in signcolumn + use 'airblade/vim-gitgutter' - -- Tabline/bufferline - use { - 'akinsho/nvim-bufferline.lua', - tag = '*', - requires = 'kyazdani42/nvim-web-devicons', - config = function() require('bufferline').setup {} end - } + -- Tabline/bufferline + use { + 'akinsho/nvim-bufferline.lua', + tag = '*', + requires = 'kyazdani42/nvim-web-devicons', + config = function() require('bufferline').setup {} end + } - -- Git commands - use 'tpope/vim-fugitive' + -- Git commands + use 'tpope/vim-fugitive' - -- Indent characters - use { - 'lukas-reineke/indent-blankline.nvim', - config = require('plugins.indent-blankline') - } + -- Indent characters + use { + 'lukas-reineke/indent-blankline.nvim', + config = require('plugins.indent-blankline') + } - -- Tree explorer - use { - 'kyazdani42/nvim-tree.lua', - requires = 'kyazdani42/nvim-web-devicons', - config = require('plugins.nvim-tree') - } + -- Tree explorer + use { + 'kyazdani42/nvim-tree.lua', + requires = 'kyazdani42/nvim-web-devicons', + config = require('plugins.nvim-tree') + } - -- Telescope - use { - 'nvim-telescope/telescope.nvim', - config = require('plugins.telescope'), - requires = { - {'nvim-lua/plenary.nvim'}, -- Internal dep for telescope - {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'}, -- Use fzf for fuzzy finder - {'nvim-telescope/telescope-ui-select.nvim'} -- Replace vim built in select with telescope - } - } + -- Telescope + use { + 'nvim-telescope/telescope.nvim', + config = require('plugins.telescope'), + requires = { + { 'nvim-lua/plenary.nvim' }, -- Internal dep for telescope + { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }, -- Use fzf for fuzzy finder + { 'nvim-telescope/telescope-ui-select.nvim' } -- Replace vim built in select with telescope + } + } - -- Do stuff as sudo - use 'lambdalisue/suda.vim' + -- Do stuff as sudo + use 'lambdalisue/suda.vim' - -- Display possible keybinds - use {'folke/which-key.nvim', config = require('plugins.which-key')} + -- Display possible keybinds + use { 'folke/which-key.nvim', config = require('plugins.which-key') } - -- Read editorconfig settings - use 'editorconfig/editorconfig-vim' + -- Read editorconfig settings + use 'editorconfig/editorconfig-vim' - -- Package manager for LSP servers, DAP servers etc. - use {'williamboman/mason.nvim', config = require('plugins.mason').setup} + -- Package manager for LSP servers, DAP servers etc. + use { 'williamboman/mason.nvim', config = require('plugins.mason').setup } - -- Install LSP server executables with Mason - use { - 'williamboman/mason-lspconfig.nvim', - config = require('plugins.mason').lspconfig_setup - } + -- Install LSP server executables with Mason + use { + 'williamboman/mason-lspconfig.nvim', + config = require('plugins.mason').lspconfig_setup + } - -- Configs for built-in LSP - use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup} + -- Configs for built-in LSP + use { 'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup } - -- Additional LSP features for Java - use 'mfussenegger/nvim-jdtls' + -- Additional LSP features for Java + use 'mfussenegger/nvim-jdtls' - -- Display function signature - use 'ray-x/lsp_signature.nvim' + -- Display function signature + use 'ray-x/lsp_signature.nvim' - -- Snippets plugin - use { - 'L3MON4D3/LuaSnip', - requires = {'rafamadriz/friendly-snippets'}, -- Snippets collection - config = require('plugins.luasnip') - } + -- Snippets plugin + use { + 'L3MON4D3/LuaSnip', + requires = { 'rafamadriz/friendly-snippets' }, -- Snippets collection + config = require('plugins.luasnip') + } - -- vim api documentation for lua lsp - use {'ii14/emmylua-nvim'} + -- vim api documentation for lua lsp + use { 'ii14/emmylua-nvim' } - -- Completion - use { - 'hrsh7th/nvim-cmp', - requires = { - {'hrsh7th/cmp-buffer'}, -- Buffer source - {'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim"}, -- Git source - {'hrsh7th/cmp-nvim-lsp'}, -- LSP source - {'hrsh7th/cmp-nvim-lua'}, -- Neovim Lua API documentation source - {'hrsh7th/cmp-path'}, -- Path source - {'saadparwaiz1/cmp_luasnip'} -- Snippets source - }, - config = require('plugins.cmp') - } + -- Completion + use { + 'hrsh7th/nvim-cmp', + requires = { + { 'hrsh7th/cmp-buffer' }, -- Buffer source + { 'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim" }, -- Git source + { 'hrsh7th/cmp-nvim-lsp' }, -- LSP source + { 'hrsh7th/cmp-nvim-lua' }, -- Neovim Lua API documentation source + { 'hrsh7th/cmp-path' }, -- Path source + { 'saadparwaiz1/cmp_luasnip' } -- Snippets source + }, + config = require('plugins.cmp') + } - -- Automatic brackets - use { - 'windwp/nvim-autopairs', - config = function() require('nvim-autopairs').setup {} end - } + -- Automatic brackets + use { + 'windwp/nvim-autopairs', + config = function() require('nvim-autopairs').setup {} end + } - -- treesitter - use { - 'nvim-treesitter/nvim-treesitter', - run = function() - require('nvim-treesitter.install').update({with_sync = true}) - end, - config = require('plugins.treesitter') - } + -- treesitter + use { + 'nvim-treesitter/nvim-treesitter', + run = function() + require('nvim-treesitter.install').update({ with_sync = true }) + end, + config = require('plugins.treesitter') + } - -- treesitter plugin for commentstring - use 'JoosepAlviste/nvim-ts-context-commentstring' + -- treesitter plugin for commentstring + use 'JoosepAlviste/nvim-ts-context-commentstring' - -- Additional plugins for formats not supported - -- by treesitter - use 'jamespeapen/swayconfig.vim' + -- Additional plugins for formats not supported + -- by treesitter + use 'jamespeapen/swayconfig.vim' - -- mappings for commenting in code - use 'tpope/vim-commentary' + -- mappings for commenting in code + use 'tpope/vim-commentary' - -- we all know this one - use 'tpope/vim-surround' + -- we all know this one + use 'tpope/vim-surround' - -- Formatter plugin - use 'sbdchd/neoformat' + -- Formatter plugin + use 'sbdchd/neoformat' - -- Make editing passwords safer - use { - 'https://git.zx2c4.com/password-store', - rtp = 'contrib/vim/redact_pass.vim' - } + -- Make editing passwords safer + use { + 'https://git.zx2c4.com/password-store', + rtp = 'contrib/vim/redact_pass.vim' + } - -- Neovim inside Firefox - use { - 'glacambre/firenvim', - run = function() vim.fn['firenvim#install'](0) end - } + -- Neovim inside Firefox + use { + 'glacambre/firenvim', + run = function() vim.fn['firenvim#install'](0) end + } - -- Vim <3 Asciidoctor - use 'habamax/vim-asciidoctor' + -- Vim <3 Asciidoctor + use 'habamax/vim-asciidoctor' - -- Edit GPG encrypted files transparently - use 'jamessan/vim-gnupg' + -- Markdown preview plugin + use({ "iamcco/markdown-preview.nvim", run = "cd app && npm install", + setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, }) - -- High performance color highlighter - use { - 'norcalli/nvim-colorizer.lua', - config = function() require('colorizer').setup() end - } + -- Edit GPG encrypted files transparently + use 'jamessan/vim-gnupg' - -- If Packer was just installed, - -- sync plugins - if Packer_bootstrap then require('packer').sync() end + -- High performance color highlighter + use { + 'norcalli/nvim-colorizer.lua', + config = function() require('colorizer').setup() end + } + + -- If Packer was just installed, + -- sync plugins + if Packer_bootstrap then require('packer').sync() end end) -- Sync plugins if Packer was just -- installed if Packer_bootstrap then - print('Syncing plugins') - require('packer').sync() + print('Syncing plugins') + require('packer').sync() end From e0e8c5ccaf85a91774c7e3e55fa53e0020bdbc60 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 16:53:16 +0300 Subject: [PATCH 1446/2667] Add markdown preview plugin --- home/.config/nvim/lua/plugins/init.lua | 290 +++++++++++++------------ 1 file changed, 147 insertions(+), 143 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 3491a13b..39a1a6c8 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -3,191 +3,195 @@ local fn = vim.fn -- Install packer if it's not yet installed local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim' if fn.empty(fn.glob(install_path)) > 0 then - print('Installing Packer') - Packer_bootstrap = fn.system({ - 'git', 'clone', '--depth', '1', - 'https://github.com/wbthomason/packer.nvim', install_path - }) - vim.cmd [[packadd packer.nvim]] - print('Installed Packer') + print('Installing Packer') + Packer_bootstrap = fn.system({ + 'git', 'clone', '--depth', '1', + 'https://github.com/wbthomason/packer.nvim', install_path + }) + vim.cmd [[packadd packer.nvim]] + print('Installed Packer') end -- Configure packer require('packer').startup(function() - local use = require('packer').use + local use = require('packer').use - -- The plugin manager itself - use {'wbthomason/packer.nvim'} + -- The plugin manager itself + use { 'wbthomason/packer.nvim' } - -- Colorscheme - use { - 'FunctionalHacker/pywal.nvim', - config = function() require('pywal').setup() end - } + -- Colorscheme + use { + 'FunctionalHacker/pywal.nvim', + config = function() require('pywal').setup() end + } - -- Statusline - use { - 'nvim-lualine/lualine.nvim', - requires = {'kyazdani42/nvim-web-devicons', opt = true}, - config = require('plugins.lualine') - } + -- Statusline + use { + 'nvim-lualine/lualine.nvim', + requires = { 'kyazdani42/nvim-web-devicons', opt = true }, + config = require('plugins.lualine') + } - -- Startup screen/dashboard - use 'glepnir/dashboard-nvim' + -- Startup screen/dashboard + use 'glepnir/dashboard-nvim' - -- Git in signcolumn - use 'airblade/vim-gitgutter' + -- Git in signcolumn + use 'airblade/vim-gitgutter' - -- Tabline/bufferline - use { - 'akinsho/nvim-bufferline.lua', - tag = '*', - requires = 'kyazdani42/nvim-web-devicons', - config = function() require('bufferline').setup {} end - } + -- Tabline/bufferline + use { + 'akinsho/nvim-bufferline.lua', + tag = '*', + requires = 'kyazdani42/nvim-web-devicons', + config = function() require('bufferline').setup {} end + } - -- Git commands - use 'tpope/vim-fugitive' + -- Git commands + use 'tpope/vim-fugitive' - -- Indent characters - use { - 'lukas-reineke/indent-blankline.nvim', - config = require('plugins.indent-blankline') - } + -- Indent characters + use { + 'lukas-reineke/indent-blankline.nvim', + config = require('plugins.indent-blankline') + } - -- Tree explorer - use { - 'kyazdani42/nvim-tree.lua', - requires = 'kyazdani42/nvim-web-devicons', - config = require('plugins.nvim-tree') - } + -- Tree explorer + use { + 'kyazdani42/nvim-tree.lua', + requires = 'kyazdani42/nvim-web-devicons', + config = require('plugins.nvim-tree') + } - -- Telescope - use { - 'nvim-telescope/telescope.nvim', - config = require('plugins.telescope'), - requires = { - {'nvim-lua/plenary.nvim'}, -- Internal dep for telescope - {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'}, -- Use fzf for fuzzy finder - {'nvim-telescope/telescope-ui-select.nvim'} -- Replace vim built in select with telescope - } - } + -- Telescope + use { + 'nvim-telescope/telescope.nvim', + config = require('plugins.telescope'), + requires = { + { 'nvim-lua/plenary.nvim' }, -- Internal dep for telescope + { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }, -- Use fzf for fuzzy finder + { 'nvim-telescope/telescope-ui-select.nvim' } -- Replace vim built in select with telescope + } + } - -- Do stuff as sudo - use 'lambdalisue/suda.vim' + -- Do stuff as sudo + use 'lambdalisue/suda.vim' - -- Display possible keybinds - use {'folke/which-key.nvim', config = require('plugins.which-key')} + -- Display possible keybinds + use { 'folke/which-key.nvim', config = require('plugins.which-key') } - -- Read editorconfig settings - use 'editorconfig/editorconfig-vim' + -- Read editorconfig settings + use 'editorconfig/editorconfig-vim' - -- Package manager for LSP servers, DAP servers etc. - use {'williamboman/mason.nvim', config = require('plugins.mason').setup} + -- Package manager for LSP servers, DAP servers etc. + use { 'williamboman/mason.nvim', config = require('plugins.mason').setup } - -- Install LSP server executables with Mason - use { - 'williamboman/mason-lspconfig.nvim', - config = require('plugins.mason').lspconfig_setup - } + -- Install LSP server executables with Mason + use { + 'williamboman/mason-lspconfig.nvim', + config = require('plugins.mason').lspconfig_setup + } - -- Configs for built-in LSP - use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup} + -- Configs for built-in LSP + use { 'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup } - -- Additional LSP features for Java - use 'mfussenegger/nvim-jdtls' + -- Additional LSP features for Java + use 'mfussenegger/nvim-jdtls' - -- Display function signature - use 'ray-x/lsp_signature.nvim' + -- Display function signature + use 'ray-x/lsp_signature.nvim' - -- Snippets plugin - use { - 'L3MON4D3/LuaSnip', - requires = {'rafamadriz/friendly-snippets'}, -- Snippets collection - config = require('plugins.luasnip') - } + -- Snippets plugin + use { + 'L3MON4D3/LuaSnip', + requires = { 'rafamadriz/friendly-snippets' }, -- Snippets collection + config = require('plugins.luasnip') + } - -- vim api documentation for lua lsp - use {'ii14/emmylua-nvim'} + -- vim api documentation for lua lsp + use { 'ii14/emmylua-nvim' } - -- Completion - use { - 'hrsh7th/nvim-cmp', - requires = { - {'hrsh7th/cmp-buffer'}, -- Buffer source - {'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim"}, -- Git source - {'hrsh7th/cmp-nvim-lsp'}, -- LSP source - {'hrsh7th/cmp-nvim-lua'}, -- Neovim Lua API documentation source - {'hrsh7th/cmp-path'}, -- Path source - {'saadparwaiz1/cmp_luasnip'} -- Snippets source - }, - config = require('plugins.cmp') - } + -- Completion + use { + 'hrsh7th/nvim-cmp', + requires = { + { 'hrsh7th/cmp-buffer' }, -- Buffer source + { 'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim" }, -- Git source + { 'hrsh7th/cmp-nvim-lsp' }, -- LSP source + { 'hrsh7th/cmp-nvim-lua' }, -- Neovim Lua API documentation source + { 'hrsh7th/cmp-path' }, -- Path source + { 'saadparwaiz1/cmp_luasnip' } -- Snippets source + }, + config = require('plugins.cmp') + } - -- Automatic brackets - use { - 'windwp/nvim-autopairs', - config = function() require('nvim-autopairs').setup {} end - } + -- Automatic brackets + use { + 'windwp/nvim-autopairs', + config = function() require('nvim-autopairs').setup {} end + } - -- treesitter - use { - 'nvim-treesitter/nvim-treesitter', - run = function() - require('nvim-treesitter.install').update({with_sync = true}) - end, - config = require('plugins.treesitter') - } + -- treesitter + use { + 'nvim-treesitter/nvim-treesitter', + run = function() + require('nvim-treesitter.install').update({ with_sync = true }) + end, + config = require('plugins.treesitter') + } - -- treesitter plugin for commentstring - use 'JoosepAlviste/nvim-ts-context-commentstring' + -- treesitter plugin for commentstring + use 'JoosepAlviste/nvim-ts-context-commentstring' - -- Additional plugins for formats not supported - -- by treesitter - use 'jamespeapen/swayconfig.vim' + -- Additional plugins for formats not supported + -- by treesitter + use 'jamespeapen/swayconfig.vim' - -- mappings for commenting in code - use 'tpope/vim-commentary' + -- mappings for commenting in code + use 'tpope/vim-commentary' - -- we all know this one - use 'tpope/vim-surround' + -- we all know this one + use 'tpope/vim-surround' - -- Formatter plugin - use 'sbdchd/neoformat' + -- Formatter plugin + use 'sbdchd/neoformat' - -- Make editing passwords safer - use { - 'https://git.zx2c4.com/password-store', - rtp = 'contrib/vim/redact_pass.vim' - } + -- Make editing passwords safer + use { + 'https://git.zx2c4.com/password-store', + rtp = 'contrib/vim/redact_pass.vim' + } - -- Neovim inside Firefox - use { - 'glacambre/firenvim', - run = function() vim.fn['firenvim#install'](0) end - } + -- Neovim inside Firefox + use { + 'glacambre/firenvim', + run = function() vim.fn['firenvim#install'](0) end + } - -- Vim <3 Asciidoctor - use 'habamax/vim-asciidoctor' + -- Vim <3 Asciidoctor + use 'habamax/vim-asciidoctor' - -- Edit GPG encrypted files transparently - use 'jamessan/vim-gnupg' + -- Markdown preview plugin + use({ "iamcco/markdown-preview.nvim", run = "cd app && npm install", + setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, }) - -- High performance color highlighter - use { - 'norcalli/nvim-colorizer.lua', - config = function() require('colorizer').setup() end - } + -- Edit GPG encrypted files transparently + use 'jamessan/vim-gnupg' - -- If Packer was just installed, - -- sync plugins - if Packer_bootstrap then require('packer').sync() end + -- High performance color highlighter + use { + 'norcalli/nvim-colorizer.lua', + config = function() require('colorizer').setup() end + } + + -- If Packer was just installed, + -- sync plugins + if Packer_bootstrap then require('packer').sync() end end) -- Sync plugins if Packer was just -- installed if Packer_bootstrap then - print('Syncing plugins') - require('packer').sync() + print('Syncing plugins') + require('packer').sync() end From f8ceedfd0101ba482ddae2aab461430f187bb2bb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 16:53:43 +0300 Subject: [PATCH 1447/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From 018b96f03aad345ff4c15f8a5ebfcbc609af873d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 16:53:43 +0300 Subject: [PATCH 1448/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From 2a9a3e5a2a93c583df97a635d673d674cab11597 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 19:21:54 +0300 Subject: [PATCH 1449/2667] Add pre-commit hook to format files --- .editorconfig | 9 + .gitignore | 1 + .husky/pre-commit | 39 ++ .prettierignore | 1 + .prettierrc.toml | 4 + dotdrop | 2 +- home/.config/nvim/lua/plugins/init.lua | 296 ++++----- package-lock.json | 803 +++++++++++++++++++++++++ package.json | 23 + 9 files changed, 1031 insertions(+), 147 deletions(-) create mode 100644 .editorconfig create mode 100644 .gitignore create mode 100755 .husky/pre-commit create mode 100644 .prettierignore create mode 100644 .prettierrc.toml create mode 100644 package-lock.json create mode 100644 package.json diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..b2dadf30 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true +indent_style = space +indent_size = 2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c2658d7d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules/ diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100755 index 00000000..80df2dcf --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,39 @@ +#!/bin/sh + +# Exit on error +set -e + +# Source husky +# shellcheck disable=SC1091 +. "$(dirname -- "$0")/_/husky.sh" + +echo "FunctionalHacker's dotfile pre-commit hook start" +printf "Using shell: %s \n" "$(readlink /proc/$$/exe)" + +# All staged files +staged_files=$(git diff --name-only --cached) + +# Run taplo on staged TOML files +staged_toml=$(echo "$staged_files" | grep ".toml$" || true) +num_staged_toml=$(echo "$staged_toml" | grep -vce '^$') +if [ "$num_staged_toml" -ne "0" ]; then + printf '\nFormatting %s staged TOML files with taplo\n' "$num_staged_toml" + taplo format "$staged_toml" + printf "Re-staging\n" + git add "$staged_toml" +fi + +# Run lua-format on staged Lua files +staged_lua=$(echo "$staged_files" | grep ".lua$" || true) +num_staged_lua=$(echo "$staged_lua" | grep -vce '^$') +if [ "$num_staged_lua" -ne "0" ]; then + printf '\nFormatting %s staged Lua files with lua-format\n' "$num_staged_lua" + lua-format -i "$staged_lua" + printf "Re-staging\n\n" + git add "$staged_lua" +fi + +# Run prettier on all other staged files +# that are supported +echo "Running prettier on all supported files" +npx pretty-quick --staged diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000..d8b83df9 --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +package-lock.json diff --git a/.prettierrc.toml b/.prettierrc.toml new file mode 100644 index 00000000..30508e6c --- /dev/null +++ b/.prettierrc.toml @@ -0,0 +1,4 @@ +"$schema" = "https://json.schemastore.org/prettierrc.json" +trailingComma = "es5" +singleQuote = true +tabWidth = 2 diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 39a1a6c8..b204f9d1 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -3,195 +3,199 @@ local fn = vim.fn -- Install packer if it's not yet installed local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim' if fn.empty(fn.glob(install_path)) > 0 then - print('Installing Packer') - Packer_bootstrap = fn.system({ - 'git', 'clone', '--depth', '1', - 'https://github.com/wbthomason/packer.nvim', install_path - }) - vim.cmd [[packadd packer.nvim]] - print('Installed Packer') + print('Installing Packer') + Packer_bootstrap = fn.system({ + 'git', 'clone', '--depth', '1', + 'https://github.com/wbthomason/packer.nvim', install_path + }) + vim.cmd [[packadd packer.nvim]] + print('Installed Packer') end -- Configure packer require('packer').startup(function() - local use = require('packer').use + local use = require('packer').use - -- The plugin manager itself - use { 'wbthomason/packer.nvim' } + -- The plugin manager itself + use {'wbthomason/packer.nvim'} - -- Colorscheme - use { - 'FunctionalHacker/pywal.nvim', - config = function() require('pywal').setup() end - } + -- Colorscheme + use { + 'FunctionalHacker/pywal.nvim', + config = function() require('pywal').setup() end + } - -- Statusline - use { - 'nvim-lualine/lualine.nvim', - requires = { 'kyazdani42/nvim-web-devicons', opt = true }, - config = require('plugins.lualine') - } + -- Statusline + use { + 'nvim-lualine/lualine.nvim', + requires = {'kyazdani42/nvim-web-devicons', opt = true}, + config = require('plugins.lualine') + } - -- Startup screen/dashboard - use 'glepnir/dashboard-nvim' + -- Startup screen/dashboard + use 'glepnir/dashboard-nvim' - -- Git in signcolumn - use 'airblade/vim-gitgutter' + -- Git in signcolumn + use 'airblade/vim-gitgutter' - -- Tabline/bufferline - use { - 'akinsho/nvim-bufferline.lua', - tag = '*', - requires = 'kyazdani42/nvim-web-devicons', - config = function() require('bufferline').setup {} end - } + -- Tabline/bufferline + use { + 'akinsho/nvim-bufferline.lua', + tag = '*', + requires = 'kyazdani42/nvim-web-devicons', + config = function() require('bufferline').setup {} end + } - -- Git commands - use 'tpope/vim-fugitive' + -- Git commands + use 'tpope/vim-fugitive' - -- Indent characters - use { - 'lukas-reineke/indent-blankline.nvim', - config = require('plugins.indent-blankline') - } + -- Indent characters + use { + 'lukas-reineke/indent-blankline.nvim', + config = require('plugins.indent-blankline') + } - -- Tree explorer - use { - 'kyazdani42/nvim-tree.lua', - requires = 'kyazdani42/nvim-web-devicons', - config = require('plugins.nvim-tree') - } + -- Tree explorer + use { + 'kyazdani42/nvim-tree.lua', + requires = 'kyazdani42/nvim-web-devicons', + config = require('plugins.nvim-tree') + } - -- Telescope - use { - 'nvim-telescope/telescope.nvim', - config = require('plugins.telescope'), - requires = { - { 'nvim-lua/plenary.nvim' }, -- Internal dep for telescope - { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }, -- Use fzf for fuzzy finder - { 'nvim-telescope/telescope-ui-select.nvim' } -- Replace vim built in select with telescope - } - } + -- Telescope + use { + 'nvim-telescope/telescope.nvim', + config = require('plugins.telescope'), + requires = { + {'nvim-lua/plenary.nvim'}, -- Internal dep for telescope + {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'}, -- Use fzf for fuzzy finder + {'nvim-telescope/telescope-ui-select.nvim'} -- Replace vim built in select with telescope + } + } - -- Do stuff as sudo - use 'lambdalisue/suda.vim' + -- Do stuff as sudo + use 'lambdalisue/suda.vim' - -- Display possible keybinds - use { 'folke/which-key.nvim', config = require('plugins.which-key') } + -- Display possible keybinds + use {'folke/which-key.nvim', config = require('plugins.which-key')} - -- Read editorconfig settings - use 'editorconfig/editorconfig-vim' + -- Read editorconfig settings + use 'editorconfig/editorconfig-vim' - -- Package manager for LSP servers, DAP servers etc. - use { 'williamboman/mason.nvim', config = require('plugins.mason').setup } + -- Package manager for LSP servers, DAP servers etc. + use {'williamboman/mason.nvim', config = require('plugins.mason').setup} - -- Install LSP server executables with Mason - use { - 'williamboman/mason-lspconfig.nvim', - config = require('plugins.mason').lspconfig_setup - } + -- Install LSP server executables with Mason + use { + 'williamboman/mason-lspconfig.nvim', + config = require('plugins.mason').lspconfig_setup + } - -- Configs for built-in LSP - use { 'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup } + -- Configs for built-in LSP + use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup} - -- Additional LSP features for Java - use 'mfussenegger/nvim-jdtls' + -- Additional LSP features for Java + use 'mfussenegger/nvim-jdtls' - -- Display function signature - use 'ray-x/lsp_signature.nvim' + -- Display function signature + use 'ray-x/lsp_signature.nvim' - -- Snippets plugin - use { - 'L3MON4D3/LuaSnip', - requires = { 'rafamadriz/friendly-snippets' }, -- Snippets collection - config = require('plugins.luasnip') - } + -- Snippets plugin + use { + 'L3MON4D3/LuaSnip', + requires = {'rafamadriz/friendly-snippets'}, -- Snippets collection + config = require('plugins.luasnip') + } - -- vim api documentation for lua lsp - use { 'ii14/emmylua-nvim' } + -- vim api documentation for lua lsp + use {'ii14/emmylua-nvim'} - -- Completion - use { - 'hrsh7th/nvim-cmp', - requires = { - { 'hrsh7th/cmp-buffer' }, -- Buffer source - { 'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim" }, -- Git source - { 'hrsh7th/cmp-nvim-lsp' }, -- LSP source - { 'hrsh7th/cmp-nvim-lua' }, -- Neovim Lua API documentation source - { 'hrsh7th/cmp-path' }, -- Path source - { 'saadparwaiz1/cmp_luasnip' } -- Snippets source - }, - config = require('plugins.cmp') - } + -- Completion + use { + 'hrsh7th/nvim-cmp', + requires = { + {'hrsh7th/cmp-buffer'}, -- Buffer source + {'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim"}, -- Git source + {'hrsh7th/cmp-nvim-lsp'}, -- LSP source + {'hrsh7th/cmp-nvim-lua'}, -- Neovim Lua API documentation source + {'hrsh7th/cmp-path'}, -- Path source + {'saadparwaiz1/cmp_luasnip'} -- Snippets source + }, + config = require('plugins.cmp') + } - -- Automatic brackets - use { - 'windwp/nvim-autopairs', - config = function() require('nvim-autopairs').setup {} end - } + -- Automatic brackets + use { + 'windwp/nvim-autopairs', + config = function() require('nvim-autopairs').setup {} end + } - -- treesitter - use { - 'nvim-treesitter/nvim-treesitter', - run = function() - require('nvim-treesitter.install').update({ with_sync = true }) - end, - config = require('plugins.treesitter') - } + -- treesitter + use { + 'nvim-treesitter/nvim-treesitter', + run = function() + require('nvim-treesitter.install').update({with_sync = true}) + end, + config = require('plugins.treesitter') + } - -- treesitter plugin for commentstring - use 'JoosepAlviste/nvim-ts-context-commentstring' + -- treesitter plugin for commentstring + use 'JoosepAlviste/nvim-ts-context-commentstring' - -- Additional plugins for formats not supported - -- by treesitter - use 'jamespeapen/swayconfig.vim' + -- Additional plugins for formats not supported + -- by treesitter + use 'jamespeapen/swayconfig.vim' - -- mappings for commenting in code - use 'tpope/vim-commentary' + -- mappings for commenting in code + use 'tpope/vim-commentary' - -- we all know this one - use 'tpope/vim-surround' + -- we all know this one + use 'tpope/vim-surround' - -- Formatter plugin - use 'sbdchd/neoformat' + -- Formatter plugin + use 'sbdchd/neoformat' - -- Make editing passwords safer - use { - 'https://git.zx2c4.com/password-store', - rtp = 'contrib/vim/redact_pass.vim' - } + -- Make editing passwords safer + use { + 'https://git.zx2c4.com/password-store', + rtp = 'contrib/vim/redact_pass.vim' + } - -- Neovim inside Firefox - use { - 'glacambre/firenvim', - run = function() vim.fn['firenvim#install'](0) end - } + -- Neovim inside Firefox + use { + 'glacambre/firenvim', + run = function() vim.fn['firenvim#install'](0) end + } - -- Vim <3 Asciidoctor - use 'habamax/vim-asciidoctor' + -- Vim <3 Asciidoctor + use 'habamax/vim-asciidoctor' - -- Markdown preview plugin - use({ "iamcco/markdown-preview.nvim", run = "cd app && npm install", - setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, }) + -- Markdown preview plugin + use({ + "iamcco/markdown-preview.nvim", + run = "cd app && npm install", + setup = function() vim.g.mkdp_filetypes = {"markdown"} end, + ft = {"markdown"} + }) - -- Edit GPG encrypted files transparently - use 'jamessan/vim-gnupg' + -- Edit GPG encrypted files transparently + use 'jamessan/vim-gnupg' - -- High performance color highlighter - use { - 'norcalli/nvim-colorizer.lua', - config = function() require('colorizer').setup() end - } + -- High performance color highlighter + use { + 'norcalli/nvim-colorizer.lua', + config = function() require('colorizer').setup() end + } - -- If Packer was just installed, - -- sync plugins - if Packer_bootstrap then require('packer').sync() end + -- If Packer was just installed, + -- sync plugins + if Packer_bootstrap then require('packer').sync() end end) -- Sync plugins if Packer was just -- installed if Packer_bootstrap then - print('Syncing plugins') - require('packer').sync() + print('Syncing plugins') + require('packer').sync() end diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..36e7515e --- /dev/null +++ b/package-lock.json @@ -0,0 +1,803 @@ +{ + "name": "dotfiles", + "version": "1.0.0", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "dotfiles", + "version": "1.0.0", + "license": "MIT", + "dependencies": { + "prettier": "^2.7.1", + "pretty-quick": "^3.1.3" + }, + "devDependencies": { + "husky": "^8.0.0" + } + }, + "node_modules/@types/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==" + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/array-differ": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", + "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "engines": { + "node": ">=8" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/execa": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", + "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", + "dependencies": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/human-signals": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", + "engines": { + "node": ">=8.12.0" + } + }, + "node_modules/husky": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz", + "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==", + "dev": true, + "bin": { + "husky": "lib/bin.js" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/typicode" + } + }, + "node_modules/ignore": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", + "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "engines": { + "node": ">= 4" + } + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/mri": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", + "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", + "engines": { + "node": ">=4" + } + }, + "node_modules/multimatch": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz", + "integrity": "sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==", + "dependencies": { + "@types/minimatch": "^3.0.3", + "array-differ": "^3.0.0", + "array-union": "^2.1.0", + "arrify": "^2.0.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "engines": { + "node": ">=6" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/prettier": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/pretty-quick": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.1.3.tgz", + "integrity": "sha512-kOCi2FJabvuh1as9enxYmrnBC6tVMoVOenMaBqRfsvBHB0cbpYHjdQEpSglpASDFEXVwplpcGR4CLEaisYAFcA==", + "dependencies": { + "chalk": "^3.0.0", + "execa": "^4.0.0", + "find-up": "^4.1.0", + "ignore": "^5.1.4", + "mri": "^1.1.5", + "multimatch": "^4.0.0" + }, + "bin": { + "pretty-quick": "bin/pretty-quick.js" + }, + "engines": { + "node": ">=10.13" + }, + "peerDependencies": { + "prettier": ">=2.0.0" + } + }, + "node_modules/pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "engines": { + "node": ">=6" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + } + }, + "dependencies": { + "@types/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==" + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "array-differ": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", + "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==" + }, + "array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==" + }, + "arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==" + }, + "balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "requires": { + "once": "^1.4.0" + } + }, + "execa": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", + "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", + "requires": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "requires": { + "pump": "^3.0.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "human-signals": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==" + }, + "husky": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz", + "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==", + "dev": true + }, + "ignore": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", + "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==" + }, + "is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "requires": { + "p-locate": "^4.1.0" + } + }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "mri": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", + "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==" + }, + "multimatch": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz", + "integrity": "sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==", + "requires": { + "@types/minimatch": "^3.0.3", + "array-differ": "^3.0.0", + "array-union": "^2.1.0", + "arrify": "^2.0.1", + "minimatch": "^3.0.4" + } + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "requires": { + "path-key": "^3.0.0" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "requires": { + "wrappy": "1" + } + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "requires": { + "p-limit": "^2.2.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "prettier": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==" + }, + "pretty-quick": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.1.3.tgz", + "integrity": "sha512-kOCi2FJabvuh1as9enxYmrnBC6tVMoVOenMaBqRfsvBHB0cbpYHjdQEpSglpASDFEXVwplpcGR4CLEaisYAFcA==", + "requires": { + "chalk": "^3.0.0", + "execa": "^4.0.0", + "find-up": "^4.1.0", + "ignore": "^5.1.4", + "mri": "^1.1.5", + "multimatch": "^4.0.0" + } + }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, + "signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + }, + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 00000000..1f3818dd --- /dev/null +++ b/package.json @@ -0,0 +1,23 @@ +{ + "$schema": "https://json.schemastore.org/package.json", + "name": "dotfiles", + "version": "1.0.0", + "private": false, + "description": "FunctionalHacker’s dotfiles", + "scripts": { + "prepare": "husky install" + }, + "repository": { + "type": "git", + "url": "gitea:/FunctionalHacker/dotfiles" + }, + "author": "", + "license": "MIT", + "devDependencies": { + "husky": "^8.0.0" + }, + "dependencies": { + "prettier": "^2.7.1", + "pretty-quick": "^3.1.3" + } +} From 97b3866db277f926320bf5cb382207569d1ad3e3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 19:21:54 +0300 Subject: [PATCH 1450/2667] Add pre-commit hook to format files --- .editorconfig | 9 + .gitignore | 1 + .husky/pre-commit | 39 ++ .prettierignore | 1 + .prettierrc.toml | 4 + dotdrop | 2 +- home/.config/nvim/lua/plugins/init.lua | 296 ++++----- package-lock.json | 803 +++++++++++++++++++++++++ package.json | 23 + 9 files changed, 1031 insertions(+), 147 deletions(-) create mode 100644 .editorconfig create mode 100644 .gitignore create mode 100755 .husky/pre-commit create mode 100644 .prettierignore create mode 100644 .prettierrc.toml create mode 100644 package-lock.json create mode 100644 package.json diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..b2dadf30 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true +indent_style = space +indent_size = 2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c2658d7d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules/ diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100755 index 00000000..80df2dcf --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,39 @@ +#!/bin/sh + +# Exit on error +set -e + +# Source husky +# shellcheck disable=SC1091 +. "$(dirname -- "$0")/_/husky.sh" + +echo "FunctionalHacker's dotfile pre-commit hook start" +printf "Using shell: %s \n" "$(readlink /proc/$$/exe)" + +# All staged files +staged_files=$(git diff --name-only --cached) + +# Run taplo on staged TOML files +staged_toml=$(echo "$staged_files" | grep ".toml$" || true) +num_staged_toml=$(echo "$staged_toml" | grep -vce '^$') +if [ "$num_staged_toml" -ne "0" ]; then + printf '\nFormatting %s staged TOML files with taplo\n' "$num_staged_toml" + taplo format "$staged_toml" + printf "Re-staging\n" + git add "$staged_toml" +fi + +# Run lua-format on staged Lua files +staged_lua=$(echo "$staged_files" | grep ".lua$" || true) +num_staged_lua=$(echo "$staged_lua" | grep -vce '^$') +if [ "$num_staged_lua" -ne "0" ]; then + printf '\nFormatting %s staged Lua files with lua-format\n' "$num_staged_lua" + lua-format -i "$staged_lua" + printf "Re-staging\n\n" + git add "$staged_lua" +fi + +# Run prettier on all other staged files +# that are supported +echo "Running prettier on all supported files" +npx pretty-quick --staged diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000..d8b83df9 --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +package-lock.json diff --git a/.prettierrc.toml b/.prettierrc.toml new file mode 100644 index 00000000..30508e6c --- /dev/null +++ b/.prettierrc.toml @@ -0,0 +1,4 @@ +"$schema" = "https://json.schemastore.org/prettierrc.json" +trailingComma = "es5" +singleQuote = true +tabWidth = 2 diff --git a/dotdrop b/dotdrop index 910482f8..1bf01247 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 39a1a6c8..b204f9d1 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -3,195 +3,199 @@ local fn = vim.fn -- Install packer if it's not yet installed local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim' if fn.empty(fn.glob(install_path)) > 0 then - print('Installing Packer') - Packer_bootstrap = fn.system({ - 'git', 'clone', '--depth', '1', - 'https://github.com/wbthomason/packer.nvim', install_path - }) - vim.cmd [[packadd packer.nvim]] - print('Installed Packer') + print('Installing Packer') + Packer_bootstrap = fn.system({ + 'git', 'clone', '--depth', '1', + 'https://github.com/wbthomason/packer.nvim', install_path + }) + vim.cmd [[packadd packer.nvim]] + print('Installed Packer') end -- Configure packer require('packer').startup(function() - local use = require('packer').use + local use = require('packer').use - -- The plugin manager itself - use { 'wbthomason/packer.nvim' } + -- The plugin manager itself + use {'wbthomason/packer.nvim'} - -- Colorscheme - use { - 'FunctionalHacker/pywal.nvim', - config = function() require('pywal').setup() end - } + -- Colorscheme + use { + 'FunctionalHacker/pywal.nvim', + config = function() require('pywal').setup() end + } - -- Statusline - use { - 'nvim-lualine/lualine.nvim', - requires = { 'kyazdani42/nvim-web-devicons', opt = true }, - config = require('plugins.lualine') - } + -- Statusline + use { + 'nvim-lualine/lualine.nvim', + requires = {'kyazdani42/nvim-web-devicons', opt = true}, + config = require('plugins.lualine') + } - -- Startup screen/dashboard - use 'glepnir/dashboard-nvim' + -- Startup screen/dashboard + use 'glepnir/dashboard-nvim' - -- Git in signcolumn - use 'airblade/vim-gitgutter' + -- Git in signcolumn + use 'airblade/vim-gitgutter' - -- Tabline/bufferline - use { - 'akinsho/nvim-bufferline.lua', - tag = '*', - requires = 'kyazdani42/nvim-web-devicons', - config = function() require('bufferline').setup {} end - } + -- Tabline/bufferline + use { + 'akinsho/nvim-bufferline.lua', + tag = '*', + requires = 'kyazdani42/nvim-web-devicons', + config = function() require('bufferline').setup {} end + } - -- Git commands - use 'tpope/vim-fugitive' + -- Git commands + use 'tpope/vim-fugitive' - -- Indent characters - use { - 'lukas-reineke/indent-blankline.nvim', - config = require('plugins.indent-blankline') - } + -- Indent characters + use { + 'lukas-reineke/indent-blankline.nvim', + config = require('plugins.indent-blankline') + } - -- Tree explorer - use { - 'kyazdani42/nvim-tree.lua', - requires = 'kyazdani42/nvim-web-devicons', - config = require('plugins.nvim-tree') - } + -- Tree explorer + use { + 'kyazdani42/nvim-tree.lua', + requires = 'kyazdani42/nvim-web-devicons', + config = require('plugins.nvim-tree') + } - -- Telescope - use { - 'nvim-telescope/telescope.nvim', - config = require('plugins.telescope'), - requires = { - { 'nvim-lua/plenary.nvim' }, -- Internal dep for telescope - { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }, -- Use fzf for fuzzy finder - { 'nvim-telescope/telescope-ui-select.nvim' } -- Replace vim built in select with telescope - } - } + -- Telescope + use { + 'nvim-telescope/telescope.nvim', + config = require('plugins.telescope'), + requires = { + {'nvim-lua/plenary.nvim'}, -- Internal dep for telescope + {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'}, -- Use fzf for fuzzy finder + {'nvim-telescope/telescope-ui-select.nvim'} -- Replace vim built in select with telescope + } + } - -- Do stuff as sudo - use 'lambdalisue/suda.vim' + -- Do stuff as sudo + use 'lambdalisue/suda.vim' - -- Display possible keybinds - use { 'folke/which-key.nvim', config = require('plugins.which-key') } + -- Display possible keybinds + use {'folke/which-key.nvim', config = require('plugins.which-key')} - -- Read editorconfig settings - use 'editorconfig/editorconfig-vim' + -- Read editorconfig settings + use 'editorconfig/editorconfig-vim' - -- Package manager for LSP servers, DAP servers etc. - use { 'williamboman/mason.nvim', config = require('plugins.mason').setup } + -- Package manager for LSP servers, DAP servers etc. + use {'williamboman/mason.nvim', config = require('plugins.mason').setup} - -- Install LSP server executables with Mason - use { - 'williamboman/mason-lspconfig.nvim', - config = require('plugins.mason').lspconfig_setup - } + -- Install LSP server executables with Mason + use { + 'williamboman/mason-lspconfig.nvim', + config = require('plugins.mason').lspconfig_setup + } - -- Configs for built-in LSP - use { 'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup } + -- Configs for built-in LSP + use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup} - -- Additional LSP features for Java - use 'mfussenegger/nvim-jdtls' + -- Additional LSP features for Java + use 'mfussenegger/nvim-jdtls' - -- Display function signature - use 'ray-x/lsp_signature.nvim' + -- Display function signature + use 'ray-x/lsp_signature.nvim' - -- Snippets plugin - use { - 'L3MON4D3/LuaSnip', - requires = { 'rafamadriz/friendly-snippets' }, -- Snippets collection - config = require('plugins.luasnip') - } + -- Snippets plugin + use { + 'L3MON4D3/LuaSnip', + requires = {'rafamadriz/friendly-snippets'}, -- Snippets collection + config = require('plugins.luasnip') + } - -- vim api documentation for lua lsp - use { 'ii14/emmylua-nvim' } + -- vim api documentation for lua lsp + use {'ii14/emmylua-nvim'} - -- Completion - use { - 'hrsh7th/nvim-cmp', - requires = { - { 'hrsh7th/cmp-buffer' }, -- Buffer source - { 'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim" }, -- Git source - { 'hrsh7th/cmp-nvim-lsp' }, -- LSP source - { 'hrsh7th/cmp-nvim-lua' }, -- Neovim Lua API documentation source - { 'hrsh7th/cmp-path' }, -- Path source - { 'saadparwaiz1/cmp_luasnip' } -- Snippets source - }, - config = require('plugins.cmp') - } + -- Completion + use { + 'hrsh7th/nvim-cmp', + requires = { + {'hrsh7th/cmp-buffer'}, -- Buffer source + {'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim"}, -- Git source + {'hrsh7th/cmp-nvim-lsp'}, -- LSP source + {'hrsh7th/cmp-nvim-lua'}, -- Neovim Lua API documentation source + {'hrsh7th/cmp-path'}, -- Path source + {'saadparwaiz1/cmp_luasnip'} -- Snippets source + }, + config = require('plugins.cmp') + } - -- Automatic brackets - use { - 'windwp/nvim-autopairs', - config = function() require('nvim-autopairs').setup {} end - } + -- Automatic brackets + use { + 'windwp/nvim-autopairs', + config = function() require('nvim-autopairs').setup {} end + } - -- treesitter - use { - 'nvim-treesitter/nvim-treesitter', - run = function() - require('nvim-treesitter.install').update({ with_sync = true }) - end, - config = require('plugins.treesitter') - } + -- treesitter + use { + 'nvim-treesitter/nvim-treesitter', + run = function() + require('nvim-treesitter.install').update({with_sync = true}) + end, + config = require('plugins.treesitter') + } - -- treesitter plugin for commentstring - use 'JoosepAlviste/nvim-ts-context-commentstring' + -- treesitter plugin for commentstring + use 'JoosepAlviste/nvim-ts-context-commentstring' - -- Additional plugins for formats not supported - -- by treesitter - use 'jamespeapen/swayconfig.vim' + -- Additional plugins for formats not supported + -- by treesitter + use 'jamespeapen/swayconfig.vim' - -- mappings for commenting in code - use 'tpope/vim-commentary' + -- mappings for commenting in code + use 'tpope/vim-commentary' - -- we all know this one - use 'tpope/vim-surround' + -- we all know this one + use 'tpope/vim-surround' - -- Formatter plugin - use 'sbdchd/neoformat' + -- Formatter plugin + use 'sbdchd/neoformat' - -- Make editing passwords safer - use { - 'https://git.zx2c4.com/password-store', - rtp = 'contrib/vim/redact_pass.vim' - } + -- Make editing passwords safer + use { + 'https://git.zx2c4.com/password-store', + rtp = 'contrib/vim/redact_pass.vim' + } - -- Neovim inside Firefox - use { - 'glacambre/firenvim', - run = function() vim.fn['firenvim#install'](0) end - } + -- Neovim inside Firefox + use { + 'glacambre/firenvim', + run = function() vim.fn['firenvim#install'](0) end + } - -- Vim <3 Asciidoctor - use 'habamax/vim-asciidoctor' + -- Vim <3 Asciidoctor + use 'habamax/vim-asciidoctor' - -- Markdown preview plugin - use({ "iamcco/markdown-preview.nvim", run = "cd app && npm install", - setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, }) + -- Markdown preview plugin + use({ + "iamcco/markdown-preview.nvim", + run = "cd app && npm install", + setup = function() vim.g.mkdp_filetypes = {"markdown"} end, + ft = {"markdown"} + }) - -- Edit GPG encrypted files transparently - use 'jamessan/vim-gnupg' + -- Edit GPG encrypted files transparently + use 'jamessan/vim-gnupg' - -- High performance color highlighter - use { - 'norcalli/nvim-colorizer.lua', - config = function() require('colorizer').setup() end - } + -- High performance color highlighter + use { + 'norcalli/nvim-colorizer.lua', + config = function() require('colorizer').setup() end + } - -- If Packer was just installed, - -- sync plugins - if Packer_bootstrap then require('packer').sync() end + -- If Packer was just installed, + -- sync plugins + if Packer_bootstrap then require('packer').sync() end end) -- Sync plugins if Packer was just -- installed if Packer_bootstrap then - print('Syncing plugins') - require('packer').sync() + print('Syncing plugins') + require('packer').sync() end diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..36e7515e --- /dev/null +++ b/package-lock.json @@ -0,0 +1,803 @@ +{ + "name": "dotfiles", + "version": "1.0.0", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "dotfiles", + "version": "1.0.0", + "license": "MIT", + "dependencies": { + "prettier": "^2.7.1", + "pretty-quick": "^3.1.3" + }, + "devDependencies": { + "husky": "^8.0.0" + } + }, + "node_modules/@types/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==" + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/array-differ": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", + "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "engines": { + "node": ">=8" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/execa": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", + "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", + "dependencies": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/human-signals": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", + "engines": { + "node": ">=8.12.0" + } + }, + "node_modules/husky": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz", + "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==", + "dev": true, + "bin": { + "husky": "lib/bin.js" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/typicode" + } + }, + "node_modules/ignore": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", + "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "engines": { + "node": ">= 4" + } + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/mri": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", + "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", + "engines": { + "node": ">=4" + } + }, + "node_modules/multimatch": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz", + "integrity": "sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==", + "dependencies": { + "@types/minimatch": "^3.0.3", + "array-differ": "^3.0.0", + "array-union": "^2.1.0", + "arrify": "^2.0.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "engines": { + "node": ">=6" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/prettier": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/pretty-quick": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.1.3.tgz", + "integrity": "sha512-kOCi2FJabvuh1as9enxYmrnBC6tVMoVOenMaBqRfsvBHB0cbpYHjdQEpSglpASDFEXVwplpcGR4CLEaisYAFcA==", + "dependencies": { + "chalk": "^3.0.0", + "execa": "^4.0.0", + "find-up": "^4.1.0", + "ignore": "^5.1.4", + "mri": "^1.1.5", + "multimatch": "^4.0.0" + }, + "bin": { + "pretty-quick": "bin/pretty-quick.js" + }, + "engines": { + "node": ">=10.13" + }, + "peerDependencies": { + "prettier": ">=2.0.0" + } + }, + "node_modules/pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "engines": { + "node": ">=6" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + } + }, + "dependencies": { + "@types/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==" + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "array-differ": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", + "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==" + }, + "array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==" + }, + "arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==" + }, + "balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "requires": { + "once": "^1.4.0" + } + }, + "execa": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", + "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", + "requires": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "requires": { + "pump": "^3.0.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "human-signals": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==" + }, + "husky": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz", + "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==", + "dev": true + }, + "ignore": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", + "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==" + }, + "is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "requires": { + "p-locate": "^4.1.0" + } + }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "mri": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", + "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==" + }, + "multimatch": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz", + "integrity": "sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==", + "requires": { + "@types/minimatch": "^3.0.3", + "array-differ": "^3.0.0", + "array-union": "^2.1.0", + "arrify": "^2.0.1", + "minimatch": "^3.0.4" + } + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "requires": { + "path-key": "^3.0.0" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "requires": { + "wrappy": "1" + } + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "requires": { + "p-limit": "^2.2.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "prettier": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==" + }, + "pretty-quick": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.1.3.tgz", + "integrity": "sha512-kOCi2FJabvuh1as9enxYmrnBC6tVMoVOenMaBqRfsvBHB0cbpYHjdQEpSglpASDFEXVwplpcGR4CLEaisYAFcA==", + "requires": { + "chalk": "^3.0.0", + "execa": "^4.0.0", + "find-up": "^4.1.0", + "ignore": "^5.1.4", + "mri": "^1.1.5", + "multimatch": "^4.0.0" + } + }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, + "signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + }, + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 00000000..1f3818dd --- /dev/null +++ b/package.json @@ -0,0 +1,23 @@ +{ + "$schema": "https://json.schemastore.org/package.json", + "name": "dotfiles", + "version": "1.0.0", + "private": false, + "description": "FunctionalHacker’s dotfiles", + "scripts": { + "prepare": "husky install" + }, + "repository": { + "type": "git", + "url": "gitea:/FunctionalHacker/dotfiles" + }, + "author": "", + "license": "MIT", + "devDependencies": { + "husky": "^8.0.0" + }, + "dependencies": { + "prettier": "^2.7.1", + "pretty-quick": "^3.1.3" + } +} From 895cf7706b303c030f289587739243e803792ccb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 19:45:32 +0300 Subject: [PATCH 1451/2667] Add support for shfmt in git pre-commit hook --- .husky/pre-commit | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 80df2dcf..25bf9214 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,8 +1,5 @@ #!/bin/sh -# Exit on error -set -e - # Source husky # shellcheck disable=SC1091 . "$(dirname -- "$0")/_/husky.sh" @@ -14,9 +11,9 @@ printf "Using shell: %s \n" "$(readlink /proc/$$/exe)" staged_files=$(git diff --name-only --cached) # Run taplo on staged TOML files -staged_toml=$(echo "$staged_files" | grep ".toml$" || true) -num_staged_toml=$(echo "$staged_toml" | grep -vce '^$') -if [ "$num_staged_toml" -ne "0" ]; then +staged_toml=$(echo "$staged_files" | grep '.toml$' || true) +num_staged_toml=$(echo "$staged_toml" | grep -vce '^$' || true) +if [ "$num_staged_toml" -gt 0 ]; then printf '\nFormatting %s staged TOML files with taplo\n' "$num_staged_toml" taplo format "$staged_toml" printf "Re-staging\n" @@ -24,16 +21,26 @@ if [ "$num_staged_toml" -ne "0" ]; then fi # Run lua-format on staged Lua files -staged_lua=$(echo "$staged_files" | grep ".lua$" || true) -num_staged_lua=$(echo "$staged_lua" | grep -vce '^$') -if [ "$num_staged_lua" -ne "0" ]; then +staged_lua=$(echo "$staged_files" | grep '.lua$' || true) +num_staged_lua=$(echo "$staged_lua" | grep -vce '^$' || true) +if [ "$num_staged_lua" -gt 0 ]; then printf '\nFormatting %s staged Lua files with lua-format\n' "$num_staged_lua" lua-format -i "$staged_lua" printf "Re-staging\n\n" git add "$staged_lua" fi +# Run shfmt on staged shell scripts +staged_sh=$(echo "$staged_files" | grep -E '(.sh$|pre-commit)' || true) +num_staged_sh=$(echo "$staged_sh" | grep -vce '^$' || true) +if [ "$num_staged_sh" -gt 0 ]; then + printf '\nFormatting %s staged shell scripts with shfmt\n' "$num_staged_sh" + shfmt -w "$staged_sh" + printf "Re-staging\n\n" + git add "$staged_sh" +fi + # Run prettier on all other staged files # that are supported -echo "Running prettier on all supported files" +printf "\nRunning prettier on all supported files\n" npx pretty-quick --staged From cc06f5743d6118ead3ef2cef58bf684986ebfe3f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 19:45:32 +0300 Subject: [PATCH 1452/2667] Add support for shfmt in git pre-commit hook --- .husky/pre-commit | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 80df2dcf..25bf9214 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,8 +1,5 @@ #!/bin/sh -# Exit on error -set -e - # Source husky # shellcheck disable=SC1091 . "$(dirname -- "$0")/_/husky.sh" @@ -14,9 +11,9 @@ printf "Using shell: %s \n" "$(readlink /proc/$$/exe)" staged_files=$(git diff --name-only --cached) # Run taplo on staged TOML files -staged_toml=$(echo "$staged_files" | grep ".toml$" || true) -num_staged_toml=$(echo "$staged_toml" | grep -vce '^$') -if [ "$num_staged_toml" -ne "0" ]; then +staged_toml=$(echo "$staged_files" | grep '.toml$' || true) +num_staged_toml=$(echo "$staged_toml" | grep -vce '^$' || true) +if [ "$num_staged_toml" -gt 0 ]; then printf '\nFormatting %s staged TOML files with taplo\n' "$num_staged_toml" taplo format "$staged_toml" printf "Re-staging\n" @@ -24,16 +21,26 @@ if [ "$num_staged_toml" -ne "0" ]; then fi # Run lua-format on staged Lua files -staged_lua=$(echo "$staged_files" | grep ".lua$" || true) -num_staged_lua=$(echo "$staged_lua" | grep -vce '^$') -if [ "$num_staged_lua" -ne "0" ]; then +staged_lua=$(echo "$staged_files" | grep '.lua$' || true) +num_staged_lua=$(echo "$staged_lua" | grep -vce '^$' || true) +if [ "$num_staged_lua" -gt 0 ]; then printf '\nFormatting %s staged Lua files with lua-format\n' "$num_staged_lua" lua-format -i "$staged_lua" printf "Re-staging\n\n" git add "$staged_lua" fi +# Run shfmt on staged shell scripts +staged_sh=$(echo "$staged_files" | grep -E '(.sh$|pre-commit)' || true) +num_staged_sh=$(echo "$staged_sh" | grep -vce '^$' || true) +if [ "$num_staged_sh" -gt 0 ]; then + printf '\nFormatting %s staged shell scripts with shfmt\n' "$num_staged_sh" + shfmt -w "$staged_sh" + printf "Re-staging\n\n" + git add "$staged_sh" +fi + # Run prettier on all other staged files # that are supported -echo "Running prettier on all supported files" +printf "\nRunning prettier on all supported files\n" npx pretty-quick --staged From 86ba9538de0cb81e83891ea71665467631c0c35c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:01:31 +0300 Subject: [PATCH 1453/2667] Format all files with prettier, remove udiskie config --- .prettierignore | 1 + home/.config/alacritty/alacritty.yml | 42 +++--- home/.config/beets/config.yaml | 6 +- home/.config/gtk-3.0/gtk.css | 5 +- home/.config/imapnotify/admin@korhonen.cc.js | 12 +- .../functionalhacker@korhonen.cc.js | 12 +- home/.config/imapnotify/marko@korhonen.cc.js | 12 +- home/.config/udiskie/config.yml | 5 - .../wal/colorschemes/dark/kanagawa.json | 50 +++---- home/.config/waybar/style.css | 129 ++++++++++-------- 10 files changed, 141 insertions(+), 133 deletions(-) delete mode 100644 home/.config/udiskie/config.yml diff --git a/.prettierignore b/.prettierignore index d8b83df9..de59e4f6 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1 +1,2 @@ package-lock.json +dotdrop/ diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml index c9b10cbe..39b80d7e 100644 --- a/home/.config/alacritty/alacritty.yml +++ b/home/.config/alacritty/alacritty.yml @@ -30,40 +30,40 @@ font: colors: # Default colors primary: - background: "0x282c34" - foreground: "0xabb2bf" + background: '0x282c34' + foreground: '0xabb2bf' # Cursor colors cursor: - text: "0x282c34" - cursor: "0xabb2bf" + text: '0x282c34' + cursor: '0xabb2bf' # Normal colors normal: - black: "0x282c34" - red: "0xe06c75" - green: "0x98c379" - yellow: "0xe5c07b" - blue: "0x61afef" - magenta: "0xc678dd" - cyan: "0x56b6c2" - white: "0xabb2bf" + black: '0x282c34' + red: '0xe06c75' + green: '0x98c379' + yellow: '0xe5c07b' + blue: '0x61afef' + magenta: '0xc678dd' + cyan: '0x56b6c2' + white: '0xabb2bf' # Bright colors bright: - black: "0x3e4452" - red: "0xbe5046" - green: "0x98c379" - yellow: "0xd19a66" - blue: "0x61afef" - magenta: "0xc678dd" - cyan: "0x56b6c2" - white: "0x5c6370" + black: '0x3e4452' + red: '0xbe5046' + green: '0x98c379' + yellow: '0xd19a66' + blue: '0x61afef' + magenta: '0xc678dd' + cyan: '0x56b6c2' + white: '0x5c6370' bell: animation: EaseOutExpo duration: 0 - color: "#ffffff" + color: '#ffffff' mouse_bindings: - { mouse: Middle, action: PasteSelection } diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml index ce34ff6e..203dad0c 100644 --- a/home/.config/beets/config.yaml +++ b/home/.config/beets/config.yaml @@ -23,7 +23,7 @@ import: lastgenre: whitelist: ~/.config/beets/whitelist lyrics: - fallback: "" + fallback: '' play: command: mpv mpd: @@ -41,5 +41,5 @@ musicbrainz: user: FunctionalHacker pass: "{{@@ env['PASS_MUSICBRAINZ'] @@}}" mbcollection: - auto: "yes" - collection: "a4955b5c-db7f-4e27-9887-f77f820bad34" + auto: 'yes' + collection: 'a4955b5c-db7f-4e27-9887-f77f820bad34' diff --git a/home/.config/gtk-3.0/gtk.css b/home/.config/gtk-3.0/gtk.css index 97052376..da7a019d 100644 --- a/home/.config/gtk-3.0/gtk.css +++ b/home/.config/gtk-3.0/gtk.css @@ -1,3 +1,4 @@ -VteTerminal, vte-terminal { - padding: 40px; +VteTerminal, +vte-terminal { + padding: 40px; } diff --git a/home/.config/imapnotify/admin@korhonen.cc.js b/home/.config/imapnotify/admin@korhonen.cc.js index de3e0a53..40d02d17 100644 --- a/home/.config/imapnotify/admin@korhonen.cc.js +++ b/home/.config/imapnotify/admin@korhonen.cc.js @@ -1,19 +1,19 @@ -var child_process = require("child_process"); +var child_process = require('child_process'); function getStdout(cmd) { var stdout = child_process.execSync(cmd); return stdout.toString().trim(); } -exports.host = "imap.migadu.com"; +exports.host = 'imap.migadu.com'; exports.port = 993; exports.tls = true; exports.tlsOptions = { rejectUnauthorized: true, }; -exports.username = "admin@korhonen.cc"; +exports.username = 'admin@korhonen.cc'; exports.password = "{{@@ env['PASS_EMAIL_ADMIN'] @@}}"; -exports.onNewMail = "mbsync admin@korhonen.cc"; +exports.onNewMail = 'mbsync admin@korhonen.cc'; exports.onNewMailPost = - "~/git/dotfiles/scripts/mail/notify-new-mail.sh admin@korhonen.cc"; -exports.boxes = ["INBOX"]; + '~/git/dotfiles/scripts/mail/notify-new-mail.sh admin@korhonen.cc'; +exports.boxes = ['INBOX']; diff --git a/home/.config/imapnotify/functionalhacker@korhonen.cc.js b/home/.config/imapnotify/functionalhacker@korhonen.cc.js index 1ca0937d..50746dfd 100644 --- a/home/.config/imapnotify/functionalhacker@korhonen.cc.js +++ b/home/.config/imapnotify/functionalhacker@korhonen.cc.js @@ -1,19 +1,19 @@ -var child_process = require("child_process"); +var child_process = require('child_process'); function getStdout(cmd) { var stdout = child_process.execSync(cmd); return stdout.toString().trim(); } -exports.host = "imap.migadu.com"; +exports.host = 'imap.migadu.com'; exports.port = 993; exports.tls = true; exports.tlsOptions = { rejectUnauthorized: true, }; -exports.username = "functionalhacker@korhonen.cc"; +exports.username = 'functionalhacker@korhonen.cc'; exports.password = "{{@@ env['PASS_EMAIL_HACKER'] @@}}"; -exports.onNewMail = "mbsync functionalhacker@korhonen.cc"; +exports.onNewMail = 'mbsync functionalhacker@korhonen.cc'; exports.onNewMailPost = - "~/git/dotfiles/scripts/mail/notify-new-mail.sh functionalhacker@korhonen.cc"; -exports.boxes = ["INBOX"]; + '~/git/dotfiles/scripts/mail/notify-new-mail.sh functionalhacker@korhonen.cc'; +exports.boxes = ['INBOX']; diff --git a/home/.config/imapnotify/marko@korhonen.cc.js b/home/.config/imapnotify/marko@korhonen.cc.js index f86cca94..afac7b4c 100644 --- a/home/.config/imapnotify/marko@korhonen.cc.js +++ b/home/.config/imapnotify/marko@korhonen.cc.js @@ -1,19 +1,19 @@ -var child_process = require("child_process"); +var child_process = require('child_process'); function getStdout(cmd) { var stdout = child_process.execSync(cmd); return stdout.toString().trim(); } -exports.host = "imap.migadu.com"; +exports.host = 'imap.migadu.com'; exports.port = 993; exports.tls = true; exports.tlsOptions = { rejectUnauthorized: true, }; -exports.username = "marko@korhonen.cc"; +exports.username = 'marko@korhonen.cc'; exports.password = "{{@@ env['PASS_EMAIL_MARKO'] @@}}"; -exports.onNewMail = "mbsync marko@korhonen.cc"; +exports.onNewMail = 'mbsync marko@korhonen.cc'; exports.onNewMailPost = - "~/git/dotfiles/scripts/mail/notify-new-mail.sh marko@korhonen.cc"; -exports.boxes = ["INBOX"]; + '~/git/dotfiles/scripts/mail/notify-new-mail.sh marko@korhonen.cc'; +exports.boxes = ['INBOX']; diff --git a/home/.config/udiskie/config.yml b/home/.config/udiskie/config.yml deleted file mode 100644 index 9e6a80cf..00000000 --- a/home/.config/udiskie/config.yml +++ /dev/null @@ -1,5 +0,0 @@ -{%@@ if profile == "ReekyPC" @@%} -device_config: - - id_uuid: 10879044936567925003 - ignore:true -{%@@ endif @@%} diff --git a/home/.config/wal/colorschemes/dark/kanagawa.json b/home/.config/wal/colorschemes/dark/kanagawa.json index edc46c46..af39e5a9 100644 --- a/home/.config/wal/colorschemes/dark/kanagawa.json +++ b/home/.config/wal/colorschemes/dark/kanagawa.json @@ -1,27 +1,27 @@ { - "colors": { - "color0": "#090618", - "color1": "#C34043", - "color2": "#76946A", - "color3": "#C0A36E", - "color4": "#7E9CD8", - "color5": "#957FB8", - "color6": "#6A9589", - "color7": "#C8C093", - "color8": "#727169", - "color9": "#E82424", - "color10": "#98BB6C", - "color11": "#E6C384", - "color12": "#7FB4CA", - "color13": "#938AA9", - "color14": "#7AA89F", - "color15": "#DCD7BA", - "color16": "#FFA066", - "color17": "#FF5D62" - }, - "special": { - "foreground": "#DCD7BA", - "background": "#1F1F28", - "cursor": "#C8C093" - } + "colors": { + "color0": "#090618", + "color1": "#C34043", + "color2": "#76946A", + "color3": "#C0A36E", + "color4": "#7E9CD8", + "color5": "#957FB8", + "color6": "#6A9589", + "color7": "#C8C093", + "color8": "#727169", + "color9": "#E82424", + "color10": "#98BB6C", + "color11": "#E6C384", + "color12": "#7FB4CA", + "color13": "#938AA9", + "color14": "#7AA89F", + "color15": "#DCD7BA", + "color16": "#FFA066", + "color17": "#FF5D62" + }, + "special": { + "foreground": "#DCD7BA", + "background": "#1F1F28", + "cursor": "#C8C093" + } } diff --git a/home/.config/waybar/style.css b/home/.config/waybar/style.css index 7610afcd..e5b38cdf 100644 --- a/home/.config/waybar/style.css +++ b/home/.config/waybar/style.css @@ -1,130 +1,141 @@ * { - border: none; - border-radius: 0; - font-family: "Noto Sans Display", "Font Awesome 5 Free"; - font-size: 13px; - min-height: 0; + border: none; + border-radius: 0; + font-family: 'Noto Sans Display', 'Font Awesome 5 Free'; + font-size: 13px; + min-height: 0; } window#waybar { - background: #292D3E; - color: white; + background: #292d3e; + color: white; } /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ #workspaces button { - padding: 0 5px; - background: transparent; - color: white; + padding: 0 5px; + background: transparent; + color: white; } #workspaces button.focused { - background: #64727D; + background: #64727d; } #mode { - background: #64727D; + background: #64727d; } -#clock, #battery, #cpu, #temperature, #memory, #backlight, #network, #pulseaudio, #custom-media, #custom-yay, #tray, #mode, #idle_inhibitor { - padding: 0 10px; - margin: 0 5px; +#clock, +#battery, +#cpu, +#temperature, +#memory, +#backlight, +#network, +#pulseaudio, +#custom-media, +#custom-yay, +#tray, +#mode, +#idle_inhibitor { + padding: 0 10px; + margin: 0 5px; } #clock { - background-color: #64727D; + background-color: #64727d; } #battery { - background-color: #ffffff; - color: black; + background-color: #ffffff; + color: black; } #battery.charging { - color: black; - background-color: #a3be8c; + color: black; + background-color: #a3be8c; } @keyframes blink { - to { - background-color: #ffffff; - color: black; - } + to { + background-color: #ffffff; + color: black; + } } #battery.critical:not(.charging) { - background: #bf616a; - color: white; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; + background: #bf616a; + color: white; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; } #temperature { - background: #97B084; - color: black; + background: #97b084; + color: black; } #temperature.critical { - background: #bf616a; - color: white; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; + background: #bf616a; + color: white; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; } #cpu { - background: #BD9B5D; - color: #000000; + background: #bd9b5d; + color: #000000; } #memory { - color: black; - background: #b48ead; + color: black; + background: #b48ead; } #backlight { - background: #90b1b1; + background: #90b1b1; } #network { - color: black; - background: #81a1c1; + color: black; + background: #81a1c1; } #network.disconnected { - background: #f53c3c; + background: #f53c3c; } #pulseaudio { - background: #88c0d0; - color: black; + background: #88c0d0; + color: black; } #pulseaudio.muted { - background: #90b1b1; - color: #2a5c45; + background: #90b1b1; + color: #2a5c45; } #custom-media { - background: #97B084; - color: black; + background: #97b084; + color: black; } #custom-yay { - background-color: #64727D; + background-color: #64727d; } #tray { - background-color: #282828; + background-color: #282828; } #idle_inhibitor { - background-color: #8fbcbb; - color: #000000; + background-color: #8fbcbb; + color: #000000; } - From e45086afaeeb4d79836d10ff674793df634019db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:01:31 +0300 Subject: [PATCH 1454/2667] Format all files with prettier, remove udiskie config --- .prettierignore | 1 + home/.config/alacritty/alacritty.yml | 42 +++--- home/.config/beets/config.yaml | 6 +- home/.config/gtk-3.0/gtk.css | 5 +- home/.config/imapnotify/admin@korhonen.cc.js | 12 +- .../functionalhacker@korhonen.cc.js | 12 +- home/.config/imapnotify/marko@korhonen.cc.js | 12 +- home/.config/udiskie/config.yml | 5 - .../wal/colorschemes/dark/kanagawa.json | 50 +++---- home/.config/waybar/style.css | 129 ++++++++++-------- 10 files changed, 141 insertions(+), 133 deletions(-) delete mode 100644 home/.config/udiskie/config.yml diff --git a/.prettierignore b/.prettierignore index d8b83df9..de59e4f6 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1 +1,2 @@ package-lock.json +dotdrop/ diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml index c9b10cbe..39b80d7e 100644 --- a/home/.config/alacritty/alacritty.yml +++ b/home/.config/alacritty/alacritty.yml @@ -30,40 +30,40 @@ font: colors: # Default colors primary: - background: "0x282c34" - foreground: "0xabb2bf" + background: '0x282c34' + foreground: '0xabb2bf' # Cursor colors cursor: - text: "0x282c34" - cursor: "0xabb2bf" + text: '0x282c34' + cursor: '0xabb2bf' # Normal colors normal: - black: "0x282c34" - red: "0xe06c75" - green: "0x98c379" - yellow: "0xe5c07b" - blue: "0x61afef" - magenta: "0xc678dd" - cyan: "0x56b6c2" - white: "0xabb2bf" + black: '0x282c34' + red: '0xe06c75' + green: '0x98c379' + yellow: '0xe5c07b' + blue: '0x61afef' + magenta: '0xc678dd' + cyan: '0x56b6c2' + white: '0xabb2bf' # Bright colors bright: - black: "0x3e4452" - red: "0xbe5046" - green: "0x98c379" - yellow: "0xd19a66" - blue: "0x61afef" - magenta: "0xc678dd" - cyan: "0x56b6c2" - white: "0x5c6370" + black: '0x3e4452' + red: '0xbe5046' + green: '0x98c379' + yellow: '0xd19a66' + blue: '0x61afef' + magenta: '0xc678dd' + cyan: '0x56b6c2' + white: '0x5c6370' bell: animation: EaseOutExpo duration: 0 - color: "#ffffff" + color: '#ffffff' mouse_bindings: - { mouse: Middle, action: PasteSelection } diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml index ce34ff6e..203dad0c 100644 --- a/home/.config/beets/config.yaml +++ b/home/.config/beets/config.yaml @@ -23,7 +23,7 @@ import: lastgenre: whitelist: ~/.config/beets/whitelist lyrics: - fallback: "" + fallback: '' play: command: mpv mpd: @@ -41,5 +41,5 @@ musicbrainz: user: FunctionalHacker pass: "{{@@ env['PASS_MUSICBRAINZ'] @@}}" mbcollection: - auto: "yes" - collection: "a4955b5c-db7f-4e27-9887-f77f820bad34" + auto: 'yes' + collection: 'a4955b5c-db7f-4e27-9887-f77f820bad34' diff --git a/home/.config/gtk-3.0/gtk.css b/home/.config/gtk-3.0/gtk.css index 97052376..da7a019d 100644 --- a/home/.config/gtk-3.0/gtk.css +++ b/home/.config/gtk-3.0/gtk.css @@ -1,3 +1,4 @@ -VteTerminal, vte-terminal { - padding: 40px; +VteTerminal, +vte-terminal { + padding: 40px; } diff --git a/home/.config/imapnotify/admin@korhonen.cc.js b/home/.config/imapnotify/admin@korhonen.cc.js index de3e0a53..40d02d17 100644 --- a/home/.config/imapnotify/admin@korhonen.cc.js +++ b/home/.config/imapnotify/admin@korhonen.cc.js @@ -1,19 +1,19 @@ -var child_process = require("child_process"); +var child_process = require('child_process'); function getStdout(cmd) { var stdout = child_process.execSync(cmd); return stdout.toString().trim(); } -exports.host = "imap.migadu.com"; +exports.host = 'imap.migadu.com'; exports.port = 993; exports.tls = true; exports.tlsOptions = { rejectUnauthorized: true, }; -exports.username = "admin@korhonen.cc"; +exports.username = 'admin@korhonen.cc'; exports.password = "{{@@ env['PASS_EMAIL_ADMIN'] @@}}"; -exports.onNewMail = "mbsync admin@korhonen.cc"; +exports.onNewMail = 'mbsync admin@korhonen.cc'; exports.onNewMailPost = - "~/git/dotfiles/scripts/mail/notify-new-mail.sh admin@korhonen.cc"; -exports.boxes = ["INBOX"]; + '~/git/dotfiles/scripts/mail/notify-new-mail.sh admin@korhonen.cc'; +exports.boxes = ['INBOX']; diff --git a/home/.config/imapnotify/functionalhacker@korhonen.cc.js b/home/.config/imapnotify/functionalhacker@korhonen.cc.js index 1ca0937d..50746dfd 100644 --- a/home/.config/imapnotify/functionalhacker@korhonen.cc.js +++ b/home/.config/imapnotify/functionalhacker@korhonen.cc.js @@ -1,19 +1,19 @@ -var child_process = require("child_process"); +var child_process = require('child_process'); function getStdout(cmd) { var stdout = child_process.execSync(cmd); return stdout.toString().trim(); } -exports.host = "imap.migadu.com"; +exports.host = 'imap.migadu.com'; exports.port = 993; exports.tls = true; exports.tlsOptions = { rejectUnauthorized: true, }; -exports.username = "functionalhacker@korhonen.cc"; +exports.username = 'functionalhacker@korhonen.cc'; exports.password = "{{@@ env['PASS_EMAIL_HACKER'] @@}}"; -exports.onNewMail = "mbsync functionalhacker@korhonen.cc"; +exports.onNewMail = 'mbsync functionalhacker@korhonen.cc'; exports.onNewMailPost = - "~/git/dotfiles/scripts/mail/notify-new-mail.sh functionalhacker@korhonen.cc"; -exports.boxes = ["INBOX"]; + '~/git/dotfiles/scripts/mail/notify-new-mail.sh functionalhacker@korhonen.cc'; +exports.boxes = ['INBOX']; diff --git a/home/.config/imapnotify/marko@korhonen.cc.js b/home/.config/imapnotify/marko@korhonen.cc.js index f86cca94..afac7b4c 100644 --- a/home/.config/imapnotify/marko@korhonen.cc.js +++ b/home/.config/imapnotify/marko@korhonen.cc.js @@ -1,19 +1,19 @@ -var child_process = require("child_process"); +var child_process = require('child_process'); function getStdout(cmd) { var stdout = child_process.execSync(cmd); return stdout.toString().trim(); } -exports.host = "imap.migadu.com"; +exports.host = 'imap.migadu.com'; exports.port = 993; exports.tls = true; exports.tlsOptions = { rejectUnauthorized: true, }; -exports.username = "marko@korhonen.cc"; +exports.username = 'marko@korhonen.cc'; exports.password = "{{@@ env['PASS_EMAIL_MARKO'] @@}}"; -exports.onNewMail = "mbsync marko@korhonen.cc"; +exports.onNewMail = 'mbsync marko@korhonen.cc'; exports.onNewMailPost = - "~/git/dotfiles/scripts/mail/notify-new-mail.sh marko@korhonen.cc"; -exports.boxes = ["INBOX"]; + '~/git/dotfiles/scripts/mail/notify-new-mail.sh marko@korhonen.cc'; +exports.boxes = ['INBOX']; diff --git a/home/.config/udiskie/config.yml b/home/.config/udiskie/config.yml deleted file mode 100644 index 9e6a80cf..00000000 --- a/home/.config/udiskie/config.yml +++ /dev/null @@ -1,5 +0,0 @@ -{%@@ if profile == "ReekyPC" @@%} -device_config: - - id_uuid: 10879044936567925003 - ignore:true -{%@@ endif @@%} diff --git a/home/.config/wal/colorschemes/dark/kanagawa.json b/home/.config/wal/colorschemes/dark/kanagawa.json index edc46c46..af39e5a9 100644 --- a/home/.config/wal/colorschemes/dark/kanagawa.json +++ b/home/.config/wal/colorschemes/dark/kanagawa.json @@ -1,27 +1,27 @@ { - "colors": { - "color0": "#090618", - "color1": "#C34043", - "color2": "#76946A", - "color3": "#C0A36E", - "color4": "#7E9CD8", - "color5": "#957FB8", - "color6": "#6A9589", - "color7": "#C8C093", - "color8": "#727169", - "color9": "#E82424", - "color10": "#98BB6C", - "color11": "#E6C384", - "color12": "#7FB4CA", - "color13": "#938AA9", - "color14": "#7AA89F", - "color15": "#DCD7BA", - "color16": "#FFA066", - "color17": "#FF5D62" - }, - "special": { - "foreground": "#DCD7BA", - "background": "#1F1F28", - "cursor": "#C8C093" - } + "colors": { + "color0": "#090618", + "color1": "#C34043", + "color2": "#76946A", + "color3": "#C0A36E", + "color4": "#7E9CD8", + "color5": "#957FB8", + "color6": "#6A9589", + "color7": "#C8C093", + "color8": "#727169", + "color9": "#E82424", + "color10": "#98BB6C", + "color11": "#E6C384", + "color12": "#7FB4CA", + "color13": "#938AA9", + "color14": "#7AA89F", + "color15": "#DCD7BA", + "color16": "#FFA066", + "color17": "#FF5D62" + }, + "special": { + "foreground": "#DCD7BA", + "background": "#1F1F28", + "cursor": "#C8C093" + } } diff --git a/home/.config/waybar/style.css b/home/.config/waybar/style.css index 7610afcd..e5b38cdf 100644 --- a/home/.config/waybar/style.css +++ b/home/.config/waybar/style.css @@ -1,130 +1,141 @@ * { - border: none; - border-radius: 0; - font-family: "Noto Sans Display", "Font Awesome 5 Free"; - font-size: 13px; - min-height: 0; + border: none; + border-radius: 0; + font-family: 'Noto Sans Display', 'Font Awesome 5 Free'; + font-size: 13px; + min-height: 0; } window#waybar { - background: #292D3E; - color: white; + background: #292d3e; + color: white; } /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ #workspaces button { - padding: 0 5px; - background: transparent; - color: white; + padding: 0 5px; + background: transparent; + color: white; } #workspaces button.focused { - background: #64727D; + background: #64727d; } #mode { - background: #64727D; + background: #64727d; } -#clock, #battery, #cpu, #temperature, #memory, #backlight, #network, #pulseaudio, #custom-media, #custom-yay, #tray, #mode, #idle_inhibitor { - padding: 0 10px; - margin: 0 5px; +#clock, +#battery, +#cpu, +#temperature, +#memory, +#backlight, +#network, +#pulseaudio, +#custom-media, +#custom-yay, +#tray, +#mode, +#idle_inhibitor { + padding: 0 10px; + margin: 0 5px; } #clock { - background-color: #64727D; + background-color: #64727d; } #battery { - background-color: #ffffff; - color: black; + background-color: #ffffff; + color: black; } #battery.charging { - color: black; - background-color: #a3be8c; + color: black; + background-color: #a3be8c; } @keyframes blink { - to { - background-color: #ffffff; - color: black; - } + to { + background-color: #ffffff; + color: black; + } } #battery.critical:not(.charging) { - background: #bf616a; - color: white; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; + background: #bf616a; + color: white; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; } #temperature { - background: #97B084; - color: black; + background: #97b084; + color: black; } #temperature.critical { - background: #bf616a; - color: white; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; + background: #bf616a; + color: white; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; } #cpu { - background: #BD9B5D; - color: #000000; + background: #bd9b5d; + color: #000000; } #memory { - color: black; - background: #b48ead; + color: black; + background: #b48ead; } #backlight { - background: #90b1b1; + background: #90b1b1; } #network { - color: black; - background: #81a1c1; + color: black; + background: #81a1c1; } #network.disconnected { - background: #f53c3c; + background: #f53c3c; } #pulseaudio { - background: #88c0d0; - color: black; + background: #88c0d0; + color: black; } #pulseaudio.muted { - background: #90b1b1; - color: #2a5c45; + background: #90b1b1; + color: #2a5c45; } #custom-media { - background: #97B084; - color: black; + background: #97b084; + color: black; } #custom-yay { - background-color: #64727D; + background-color: #64727d; } #tray { - background-color: #282828; + background-color: #282828; } #idle_inhibitor { - background-color: #8fbcbb; - color: #000000; + background-color: #8fbcbb; + color: #000000; } - From 7e48c8f75a6d1caa313b19883fc749e925412117 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:08:03 +0300 Subject: [PATCH 1455/2667] Removed some old/unneeded shell scripts and formatted the rest --- .husky/pre-commit | 16 +-- efistub/update.sh | 4 +- root/etc/clamav/detected.sh | 24 ++-- scripts/autorotate.sh | 32 ++--- scripts/confgen/termite.conf.gen.sh | 26 ---- scripts/confgen/zathura.conf.gen.sh | 40 ------ scripts/hibernate-lowbattery.sh | 10 +- scripts/ipmi/auto.sh | 9 -- scripts/ipmi/fans.sh | 17 --- scripts/ipmi/full.sh | 10 -- scripts/ipmi/static.sh | 10 -- scripts/ipmi/temp.sh | 19 --- scripts/mail/notify-new-mail.sh | 15 ++- scripts/open_with_linux.py | 186 ---------------------------- secrets/secrets.sh | 2 +- 15 files changed, 51 insertions(+), 369 deletions(-) delete mode 100755 scripts/confgen/termite.conf.gen.sh delete mode 100755 scripts/confgen/zathura.conf.gen.sh delete mode 100755 scripts/ipmi/auto.sh delete mode 100755 scripts/ipmi/fans.sh delete mode 100755 scripts/ipmi/full.sh delete mode 100755 scripts/ipmi/static.sh delete mode 100755 scripts/ipmi/temp.sh delete mode 100755 scripts/open_with_linux.py diff --git a/.husky/pre-commit b/.husky/pre-commit index 25bf9214..13224a43 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -31,14 +31,14 @@ if [ "$num_staged_lua" -gt 0 ]; then fi # Run shfmt on staged shell scripts -staged_sh=$(echo "$staged_files" | grep -E '(.sh$|pre-commit)' || true) -num_staged_sh=$(echo "$staged_sh" | grep -vce '^$' || true) -if [ "$num_staged_sh" -gt 0 ]; then - printf '\nFormatting %s staged shell scripts with shfmt\n' "$num_staged_sh" - shfmt -w "$staged_sh" - printf "Re-staging\n\n" - git add "$staged_sh" -fi +#staged_sh=$(echo "$staged_files" | grep -E '(.sh$|pre-commit)' || true) +#num_staged_sh=$(echo "$staged_sh" | grep -vce '^$' || true) +#if [ "$num_staged_sh" -gt 0 ]; then +# printf '\nFormatting %s staged shell scripts with shfmt\n' "$num_staged_sh" +# shfmt -w "$staged_sh" +# printf "Re-staging\n\n" +# git add "$staged_sh" +#fi # Run prettier on all other staged files # that are supported diff --git a/efistub/update.sh b/efistub/update.sh index 19a17d85..448eefdd 100755 --- a/efistub/update.sh +++ b/efistub/update.sh @@ -2,12 +2,12 @@ # remove old entries for bootentry in $(efibootmgr | head -n 3 | tail -n 1 | cut -d' ' -f2- | sed 's/,/\n/g'); do - sudo efibootmgr -qBb $bootentry + sudo efibootmgr -qBb $bootentry done # add all entries back for bootscript in *.efi; do - ./$bootscript + ./$bootscript done # set bootorder diff --git a/root/etc/clamav/detected.sh b/root/etc/clamav/detected.sh index 6f3f1f9c..4d15efce 100755 --- a/root/etc/clamav/detected.sh +++ b/root/etc/clamav/detected.sh @@ -5,22 +5,22 @@ alert="Signature detected: $CLAM_VIRUSEVENT_VIRUSNAME in $CLAM_VIRUSEVENT_FILENA # Send the alert to systemd logger if exist, othewise to /var/log if [[ -z $(command -v systemd-cat) ]]; then - echo "$(date) - $alert" >> /var/log/clamav/infected.log + echo "$(date) - $alert" >>/var/log/clamav/infected.log else - # as "emerg", this could cause your DE to show a visual alert. Happen in Plasma. but the next visual alert is much nicer - echo "$alert" | /usr/bin/systemd-cat -t clamav -p emerg + # as "emerg", this could cause your DE to show a visual alert. Happen in Plasma. but the next visual alert is much nicer + echo "$alert" | /usr/bin/systemd-cat -t clamav -p emerg fi #send an alrt to all graphical user -XUSERS=($(who|awk '{print $1}'|sort -u)) +XUSERS=($(who | awk '{print $1}' | sort -u)) for XUSER in $XUSERS; do - NAME=(${XUSER/(/ }) - DISPLAY=${NAME[1]/)/} - DBUS_ADDRESS=unix:path=/run/user/$(id -u ${NAME[0]})/bus - echo "run $NAME - $DISPLAY - $DBUS_ADDRESS -" >> /tmp/testlog - /usr/bin/sudo -u ${NAME[0]} DISPLAY=${DISPLAY} \ - DBUS_SESSION_BUS_ADDRESS=${DBUS_ADDRESS} \ - PATH=${PATH} \ - /usr/bin/notify-send -i dialog-warning "clamAV" "$alert" + NAME=(${XUSER/(/ }) + DISPLAY=${NAME[1]/)/} + DBUS_ADDRESS=unix:path=/run/user/$(id -u ${NAME[0]})/bus + echo "run $NAME - $DISPLAY - $DBUS_ADDRESS -" >>/tmp/testlog + /usr/bin/sudo -u ${NAME[0]} DISPLAY=${DISPLAY} \ + DBUS_SESSION_BUS_ADDRESS=${DBUS_ADDRESS} \ + PATH=${PATH} \ + /usr/bin/notify-send -i dialog-warning "clamAV" "$alert" done diff --git a/scripts/autorotate.sh b/scripts/autorotate.sh index 97cb94b8..c4f6f674 100755 --- a/scripts/autorotate.sh +++ b/scripts/autorotate.sh @@ -1,22 +1,22 @@ #!/bin/bash function rotate_ms { - case $1 in - "normal") - swaymsg output eDP-1 transform 0 - ;; - "right-up") - swaymsg output eDP-1 transform 90 - ;; - "bottom-up") - swaymsg output eDP-1 transform 180 - ;; - "left-up") - swaymsg output eDP-1 transform 270 - ;; - esac + case $1 in + "normal") + swaymsg output eDP-1 transform 0 + ;; + "right-up") + swaymsg output eDP-1 transform 90 + ;; + "bottom-up") + swaymsg output eDP-1 transform 180 + ;; + "left-up") + swaymsg output eDP-1 transform 270 + ;; + esac } while IFS='$\n' read -r line; do - rotation="$(echo $line | sed -En "s/^.*orientation changed: (.*)/\1/p")" - [[ ! -z $rotation ]] && rotate_ms $rotation + rotation="$(echo $line | sed -En "s/^.*orientation changed: (.*)/\1/p")" + [[ ! -z $rotation ]] && rotate_ms $rotation done < <(stdbuf -oL monitor-sensor) diff --git a/scripts/confgen/termite.conf.gen.sh b/scripts/confgen/termite.conf.gen.sh deleted file mode 100755 index 415d887d..00000000 --- a/scripts/confgen/termite.conf.gen.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash -source ~/.cache/wal/colors.sh -echo "[colors] -foreground = $foreground -background = $background -color0 = $color0 -color1 = $color1 -color2 = $color2 -color3 = $color3 -color4 = $color4 -color5 = $color5 -color6 = $color6 -color7 = $color7 -color8 = $color8 -color9 = $color9 -color10 = $color10 -color11 = $color11 -color12 = $color12 -color13 = $color13 -color14 = $color14 -color15 = $color15 - -[options] -font = Noto Color Emoji 12 -font = Material Design Icons 12 -font = Hack Nerd Font 12" > ~/.config/termite/config diff --git a/scripts/confgen/zathura.conf.gen.sh b/scripts/confgen/zathura.conf.gen.sh deleted file mode 100755 index 68b15848..00000000 --- a/scripts/confgen/zathura.conf.gen.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -# Generates zathura configuration file with pywal colors - -. $HOME/.cache/wal/colors.sh - -cat < ~/.config/zathura/zathurarc -set completion-bg "$background" -set recolor-darkcolor "$foreground" -set recolor-lightcolor "$background" -set completion-fg "$foreground" -set completion-group-bg "$background" -set completion-group-fg "$color2" -set completion-highlight-bg "$foreground" -set completion-highlight-fg "$background" -set default-bg "$background" -set default-fg "$foreground" -set inputbar-bg "$background" -set inputbar-fg "$foreground" -set notification-bg "$background" -set notification-fg "$foreground" -set notification-error-bg "$color1" -set notification-error-fg "$foreground" -set notification-warning-bg "$color1" -set notification-warning-fg "$foreground" -set statusbar-bg "$background" -set statusbar-fg "$foreground" -set index-bg "$background" -set index-fg "$foreground" -set index-active-bg "$foreground" -set index-active-fg "$background" -set render-loading-bg "$background" -set render-loading-fg "$foreground" - -set smooth-scroll true -set window-title-home-tilde true -set statusbar-basename true -set selection-clipboard clipboard -set recolor false -CONF diff --git a/scripts/hibernate-lowbattery.sh b/scripts/hibernate-lowbattery.sh index d98df476..71fb0d16 100755 --- a/scripts/hibernate-lowbattery.sh +++ b/scripts/hibernate-lowbattery.sh @@ -1,9 +1,9 @@ #!/bin/sh acpi -b | awk -F'[,:%]' '{print $2, $3}' | { - read -r status capacity + read -r status capacity - if [ "$status" = Discharging -a "$capacity" -lt 5 ]; then - logger "Critical battery threshold" - systemctl hibernate - fi + if [ "$status" = Discharging -a "$capacity" -lt 5 ]; then + logger "Critical battery threshold" + systemctl hibernate + fi } diff --git a/scripts/ipmi/auto.sh b/scripts/ipmi/auto.sh deleted file mode 100755 index 60b75181..00000000 --- a/scripts/ipmi/auto.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -IPMIHOST=10.0.0.82 -IPMIUSER=ReekyMarko -IPMIPW={{@@ env['PASS_IPMI'] @@}} -IPMIEK=0000000000000000000000000000000000000000 - -printf "Activating dynamic fan control." -ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x01 diff --git a/scripts/ipmi/fans.sh b/scripts/ipmi/fans.sh deleted file mode 100755 index c23b4a6b..00000000 --- a/scripts/ipmi/fans.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -IPMIHOST=10.0.0.82 -IPMIUSER=ReekyMarko -IPMIPW={{@@ env['PASS_IPMI'] @@}} -IPMIEK=0000000000000000000000000000000000000000 - -DATA=`ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr get "FAN 1 RPM" "FAN 2 RPM" "FAN 3 RPM" "FAN 4 RPM" "FAN 5 RPM" "FAN 6 RPM" | grep "Sensor Reading" | awk '{ print $4 }'` - -echo "$DATA" - -mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan1" -m "$(echo "$DATA" | head -1 | tail -1)" -mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan2" -m "$(echo "$DATA" | head -2 | tail -1)" -mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan3" -m "$(echo "$DATA" | head -3 | tail -1)" -mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan4" -m "$(echo "$DATA" | head -4 | tail -1)" -mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan5" -m "$(echo "$DATA" | head -5 | tail -1)" -mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan6" -m "$(echo "$DATA" | head -6 | tail -1)" diff --git a/scripts/ipmi/full.sh b/scripts/ipmi/full.sh deleted file mode 100755 index 8218be99..00000000 --- a/scripts/ipmi/full.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -IPMIHOST=10.0.0.82 -IPMIUSER=ReekyMarko -IPMIPW={{@@ env['PASS_IPMI'] @@}} -IPMIEK=0000000000000000000000000000000000000000 - -printf "speeeed!" -ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x00 -ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x02 0xff 0x64 diff --git a/scripts/ipmi/static.sh b/scripts/ipmi/static.sh deleted file mode 100755 index cc4bc509..00000000 --- a/scripts/ipmi/static.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -IPMIHOST=10.0.0.82 -IPMIUSER=ReekyMarko -IPMIPW={{@@ env['PASS_IPMI'] @@}} -IPMIEK=0000000000000000000000000000000000000000 - -printf "Activating manual fan speeds! (2160 RPM)" -ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x00 -ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x02 0xff 0x10 diff --git a/scripts/ipmi/temp.sh b/scripts/ipmi/temp.sh deleted file mode 100755 index b468b766..00000000 --- a/scripts/ipmi/temp.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -IPMIHOST=10.0.0.82 -IPMIUSER=ReekyMarko -IPMIPW={{@@ env['PASS_IPMI'] @@}} -IPMIEK=0000000000000000000000000000000000000000 -MAXTEMP=27 -TEMP=$(ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr type temperature |grep Ambient |grep degrees |grep -Po '\d{2}' | tail -1) - -mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/temp" -m "$TEMP" - - -if [[ $TEMP > $MAXTEMP ]]; - then - printf "Warning: Temperature is too high! Activating dynamic fan control! ($TEMP C)" - ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x01 - else - printf "Temperature is OK ($TEMP C)" -fi diff --git a/scripts/mail/notify-new-mail.sh b/scripts/mail/notify-new-mail.sh index 298d6b35..a4d2f302 100755 --- a/scripts/mail/notify-new-mail.sh +++ b/scripts/mail/notify-new-mail.sh @@ -5,20 +5,19 @@ COUNT=$(ls $NEWMAILDIR | wc -l) ICON=/usr/share/icons/Papirus-Dark/64x64/apps/email.svg SOUND=/usr/share/sounds/Oxygen-Im-Message-In.ogg - if [ $COUNT -ne 0 ]; then - mpv $SOUND & + mpv $SOUND & fi if [ $COUNT -gt 1 ]; then - fromaddress=$(cat $NEWMAILDIR/$(ls $NEWMAILDIR | sort -R | tail -1) | formail -x From | tail -1) - notify-send.sh -i $ICON "$COUNT new messages in $1" "From $fromaddress and others" + fromaddress=$(cat $NEWMAILDIR/$(ls $NEWMAILDIR | sort -R | tail -1) | formail -x From | tail -1) + notify-send.sh -i $ICON "$COUNT new messages in $1" "From $fromaddress and others" elif [ $COUNT -eq 1 ]; then - mailsubject=$(cat $NEWMAILDIR/* | formail -x Subject) - fromaddress=$(cat $NEWMAILDIR/* | formail -x From | tail -1) + mailsubject=$(cat $NEWMAILDIR/* | formail -x Subject) + fromaddress=$(cat $NEWMAILDIR/* | formail -x From | tail -1) - notify-send.sh -i $ICON "New message in $1" "$fromaddress $mailsubject" + notify-send.sh -i $ICON "New message in $1" "$fromaddress $mailsubject" else - echo "No new mail" + echo "No new mail" fi diff --git a/scripts/open_with_linux.py b/scripts/open_with_linux.py deleted file mode 100755 index 6a4f9799..00000000 --- a/scripts/open_with_linux.py +++ /dev/null @@ -1,186 +0,0 @@ -#!/usr/bin/env python -from __future__ import print_function - -import os -import sys -import json -import struct -import subprocess - -VERSION = '7.2.2' - -try: - sys.stdin.buffer - - # Python 3.x version - # Read a message from stdin and decode it. - def getMessage(): - rawLength = sys.stdin.buffer.read(4) - if len(rawLength) == 0: - sys.exit(0) - messageLength = struct.unpack('@I', rawLength)[0] - message = sys.stdin.buffer.read(messageLength).decode('utf-8') - return json.loads(message) - - # Send an encoded message to stdout - def sendMessage(messageContent): - encodedContent = json.dumps(messageContent).encode('utf-8') - encodedLength = struct.pack('@I', len(encodedContent)) - - sys.stdout.buffer.write(encodedLength) - sys.stdout.buffer.write(encodedContent) - sys.stdout.buffer.flush() - -except AttributeError: - # Python 2.x version (if sys.stdin.buffer is not defined) - # Read a message from stdin and decode it. - def getMessage(): - rawLength = sys.stdin.read(4) - if len(rawLength) == 0: - sys.exit(0) - messageLength = struct.unpack('@I', rawLength)[0] - message = sys.stdin.read(messageLength) - return json.loads(message) - - # Send an encoded message to stdout - def sendMessage(messageContent): - encodedContent = json.dumps(messageContent) - encodedLength = struct.pack('@I', len(encodedContent)) - - sys.stdout.write(encodedLength) - sys.stdout.write(encodedContent) - sys.stdout.flush() - - -def install(): - home_path = os.getenv('HOME') - - manifest = { - 'name': 'open_with', - 'description': 'Open With native host', - 'path': os.path.realpath(__file__), - 'type': 'stdio', - } - locations = { - 'chrome': os.path.join(home_path, '.config', 'google-chrome', 'NativeMessagingHosts'), - 'chrome-beta': os.path.join(home_path, '.config', 'google-chrome-beta', 'NativeMessagingHosts'), - 'chrome-unstable': os.path.join(home_path, '.config', 'google-chrome-unstable', 'NativeMessagingHosts'), - 'chromium': os.path.join(home_path, '.config', 'chromium', 'NativeMessagingHosts'), - 'firefox': os.path.join(home_path, '.mozilla', 'native-messaging-hosts'), - } - filename = 'open_with.json' - - for browser, location in locations.items(): - if os.path.exists(os.path.dirname(location)): - if not os.path.exists(location): - os.mkdir(location) - - browser_manifest = manifest.copy() - if browser == 'firefox': - browser_manifest['allowed_extensions'] = ['openwith@darktrojan.net'] - else: - browser_manifest['allowed_origins'] = [ - 'chrome-extension://cogjlncmljjnjpbgppagklanlcbchlno/', # Chrome - 'chrome-extension://fbmcaggceafhobjkhnaakhgfmdaadhhg/', # Opera - ] - - with open(os.path.join(location, filename), 'w') as file: - file.write( - json.dumps(browser_manifest, indent=2, separators=(',', ': '), sort_keys=True).replace(' ', '\t') + '\n' - ) - - -def _read_desktop_file(path): - with open(path, 'r') as desktop_file: - current_section = None - name = None - command = None - for line in desktop_file: - if line[0] == '[': - current_section = line[1:-2] - if current_section != 'Desktop Entry': - continue - - if line.startswith('Name='): - name = line[5:].strip() - elif line.startswith('Exec='): - command = line[5:].strip() - - return { - 'name': name, - 'command': command - } - - -def find_browsers(): - apps = [ - 'Chrome', - 'Chromium', - 'chromium-browser', - 'firefox', - 'Firefox', - 'Google Chrome', - 'google-chrome', - 'opera', - 'Opera', - 'SeaMonkey', - 'seamonkey', - ] - paths = [ - os.path.join(os.getenv('HOME'), '.local/share/applications'), - '/usr/local/share/applications', - '/usr/share/applications' - ] - suffix = '.desktop' - - results = [] - for p in paths: - for a in apps: - fp = os.path.join(p, a) + suffix - if os.path.exists(fp): - results.append(_read_desktop_file(fp)) - return results - - -def listen(): - receivedMessage = getMessage() - if receivedMessage == 'ping': - sendMessage({ - 'version': VERSION, - 'file': os.path.realpath(__file__) - }) - elif receivedMessage == 'find': - sendMessage(find_browsers()) - else: - for k, v in os.environ.items(): - if k.startswith('MOZ_'): - try: - os.unsetenv(k) - except: - os.environ[k] = '' - - devnull = open(os.devnull, 'w') - subprocess.Popen(receivedMessage, stdout=devnull, stderr=devnull) - sendMessage(None) - - -if __name__ == '__main__': - if len(sys.argv) == 2: - if sys.argv[1] == 'install': - install() - sys.exit(0) - elif sys.argv[1] == 'find_browsers': - print(find_browsers()) - sys.exit(0) - - allowed_extensions = [ - 'openwith@darktrojan.net', - 'chrome-extension://cogjlncmljjnjpbgppagklanlcbchlno/', - 'chrome-extension://fbmcaggceafhobjkhnaakhgfmdaadhhg/', - ] - for ae in allowed_extensions: - if ae in sys.argv: - listen() - sys.exit(0) - - print('Open With native helper, version %s.' % VERSION) diff --git a/secrets/secrets.sh b/secrets/secrets.sh index 43691bf9..2232d5e4 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -2,7 +2,7 @@ source $DOTREPO/secrets/env -cat < $DOTREPO/secrets/secrets +cat <$DOTREPO/secrets/secrets export PASS_LIBREFM="$PASS_LIBREFM" export PASS_MUSICBRAINZ="$PASS_MUSICBRAINZ" export PASS_LISTENBRAINZ="$PASS_LISTENBRAINZ" From 4d323544d7922d6a9c484322af5767a628ff4b5a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:08:03 +0300 Subject: [PATCH 1456/2667] Removed some old/unneeded shell scripts and formatted the rest --- .husky/pre-commit | 16 +-- efistub/update.sh | 4 +- root/etc/clamav/detected.sh | 24 ++-- scripts/autorotate.sh | 32 ++--- scripts/confgen/termite.conf.gen.sh | 26 ---- scripts/confgen/zathura.conf.gen.sh | 40 ------ scripts/hibernate-lowbattery.sh | 10 +- scripts/ipmi/auto.sh | 9 -- scripts/ipmi/fans.sh | 17 --- scripts/ipmi/full.sh | 10 -- scripts/ipmi/static.sh | 10 -- scripts/ipmi/temp.sh | 19 --- scripts/mail/notify-new-mail.sh | 15 ++- scripts/open_with_linux.py | 186 ---------------------------- secrets/secrets.sh | 2 +- 15 files changed, 51 insertions(+), 369 deletions(-) delete mode 100755 scripts/confgen/termite.conf.gen.sh delete mode 100755 scripts/confgen/zathura.conf.gen.sh delete mode 100755 scripts/ipmi/auto.sh delete mode 100755 scripts/ipmi/fans.sh delete mode 100755 scripts/ipmi/full.sh delete mode 100755 scripts/ipmi/static.sh delete mode 100755 scripts/ipmi/temp.sh delete mode 100755 scripts/open_with_linux.py diff --git a/.husky/pre-commit b/.husky/pre-commit index 25bf9214..13224a43 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -31,14 +31,14 @@ if [ "$num_staged_lua" -gt 0 ]; then fi # Run shfmt on staged shell scripts -staged_sh=$(echo "$staged_files" | grep -E '(.sh$|pre-commit)' || true) -num_staged_sh=$(echo "$staged_sh" | grep -vce '^$' || true) -if [ "$num_staged_sh" -gt 0 ]; then - printf '\nFormatting %s staged shell scripts with shfmt\n' "$num_staged_sh" - shfmt -w "$staged_sh" - printf "Re-staging\n\n" - git add "$staged_sh" -fi +#staged_sh=$(echo "$staged_files" | grep -E '(.sh$|pre-commit)' || true) +#num_staged_sh=$(echo "$staged_sh" | grep -vce '^$' || true) +#if [ "$num_staged_sh" -gt 0 ]; then +# printf '\nFormatting %s staged shell scripts with shfmt\n' "$num_staged_sh" +# shfmt -w "$staged_sh" +# printf "Re-staging\n\n" +# git add "$staged_sh" +#fi # Run prettier on all other staged files # that are supported diff --git a/efistub/update.sh b/efistub/update.sh index 19a17d85..448eefdd 100755 --- a/efistub/update.sh +++ b/efistub/update.sh @@ -2,12 +2,12 @@ # remove old entries for bootentry in $(efibootmgr | head -n 3 | tail -n 1 | cut -d' ' -f2- | sed 's/,/\n/g'); do - sudo efibootmgr -qBb $bootentry + sudo efibootmgr -qBb $bootentry done # add all entries back for bootscript in *.efi; do - ./$bootscript + ./$bootscript done # set bootorder diff --git a/root/etc/clamav/detected.sh b/root/etc/clamav/detected.sh index 6f3f1f9c..4d15efce 100755 --- a/root/etc/clamav/detected.sh +++ b/root/etc/clamav/detected.sh @@ -5,22 +5,22 @@ alert="Signature detected: $CLAM_VIRUSEVENT_VIRUSNAME in $CLAM_VIRUSEVENT_FILENA # Send the alert to systemd logger if exist, othewise to /var/log if [[ -z $(command -v systemd-cat) ]]; then - echo "$(date) - $alert" >> /var/log/clamav/infected.log + echo "$(date) - $alert" >>/var/log/clamav/infected.log else - # as "emerg", this could cause your DE to show a visual alert. Happen in Plasma. but the next visual alert is much nicer - echo "$alert" | /usr/bin/systemd-cat -t clamav -p emerg + # as "emerg", this could cause your DE to show a visual alert. Happen in Plasma. but the next visual alert is much nicer + echo "$alert" | /usr/bin/systemd-cat -t clamav -p emerg fi #send an alrt to all graphical user -XUSERS=($(who|awk '{print $1}'|sort -u)) +XUSERS=($(who | awk '{print $1}' | sort -u)) for XUSER in $XUSERS; do - NAME=(${XUSER/(/ }) - DISPLAY=${NAME[1]/)/} - DBUS_ADDRESS=unix:path=/run/user/$(id -u ${NAME[0]})/bus - echo "run $NAME - $DISPLAY - $DBUS_ADDRESS -" >> /tmp/testlog - /usr/bin/sudo -u ${NAME[0]} DISPLAY=${DISPLAY} \ - DBUS_SESSION_BUS_ADDRESS=${DBUS_ADDRESS} \ - PATH=${PATH} \ - /usr/bin/notify-send -i dialog-warning "clamAV" "$alert" + NAME=(${XUSER/(/ }) + DISPLAY=${NAME[1]/)/} + DBUS_ADDRESS=unix:path=/run/user/$(id -u ${NAME[0]})/bus + echo "run $NAME - $DISPLAY - $DBUS_ADDRESS -" >>/tmp/testlog + /usr/bin/sudo -u ${NAME[0]} DISPLAY=${DISPLAY} \ + DBUS_SESSION_BUS_ADDRESS=${DBUS_ADDRESS} \ + PATH=${PATH} \ + /usr/bin/notify-send -i dialog-warning "clamAV" "$alert" done diff --git a/scripts/autorotate.sh b/scripts/autorotate.sh index 97cb94b8..c4f6f674 100755 --- a/scripts/autorotate.sh +++ b/scripts/autorotate.sh @@ -1,22 +1,22 @@ #!/bin/bash function rotate_ms { - case $1 in - "normal") - swaymsg output eDP-1 transform 0 - ;; - "right-up") - swaymsg output eDP-1 transform 90 - ;; - "bottom-up") - swaymsg output eDP-1 transform 180 - ;; - "left-up") - swaymsg output eDP-1 transform 270 - ;; - esac + case $1 in + "normal") + swaymsg output eDP-1 transform 0 + ;; + "right-up") + swaymsg output eDP-1 transform 90 + ;; + "bottom-up") + swaymsg output eDP-1 transform 180 + ;; + "left-up") + swaymsg output eDP-1 transform 270 + ;; + esac } while IFS='$\n' read -r line; do - rotation="$(echo $line | sed -En "s/^.*orientation changed: (.*)/\1/p")" - [[ ! -z $rotation ]] && rotate_ms $rotation + rotation="$(echo $line | sed -En "s/^.*orientation changed: (.*)/\1/p")" + [[ ! -z $rotation ]] && rotate_ms $rotation done < <(stdbuf -oL monitor-sensor) diff --git a/scripts/confgen/termite.conf.gen.sh b/scripts/confgen/termite.conf.gen.sh deleted file mode 100755 index 415d887d..00000000 --- a/scripts/confgen/termite.conf.gen.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash -source ~/.cache/wal/colors.sh -echo "[colors] -foreground = $foreground -background = $background -color0 = $color0 -color1 = $color1 -color2 = $color2 -color3 = $color3 -color4 = $color4 -color5 = $color5 -color6 = $color6 -color7 = $color7 -color8 = $color8 -color9 = $color9 -color10 = $color10 -color11 = $color11 -color12 = $color12 -color13 = $color13 -color14 = $color14 -color15 = $color15 - -[options] -font = Noto Color Emoji 12 -font = Material Design Icons 12 -font = Hack Nerd Font 12" > ~/.config/termite/config diff --git a/scripts/confgen/zathura.conf.gen.sh b/scripts/confgen/zathura.conf.gen.sh deleted file mode 100755 index 68b15848..00000000 --- a/scripts/confgen/zathura.conf.gen.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -# Generates zathura configuration file with pywal colors - -. $HOME/.cache/wal/colors.sh - -cat < ~/.config/zathura/zathurarc -set completion-bg "$background" -set recolor-darkcolor "$foreground" -set recolor-lightcolor "$background" -set completion-fg "$foreground" -set completion-group-bg "$background" -set completion-group-fg "$color2" -set completion-highlight-bg "$foreground" -set completion-highlight-fg "$background" -set default-bg "$background" -set default-fg "$foreground" -set inputbar-bg "$background" -set inputbar-fg "$foreground" -set notification-bg "$background" -set notification-fg "$foreground" -set notification-error-bg "$color1" -set notification-error-fg "$foreground" -set notification-warning-bg "$color1" -set notification-warning-fg "$foreground" -set statusbar-bg "$background" -set statusbar-fg "$foreground" -set index-bg "$background" -set index-fg "$foreground" -set index-active-bg "$foreground" -set index-active-fg "$background" -set render-loading-bg "$background" -set render-loading-fg "$foreground" - -set smooth-scroll true -set window-title-home-tilde true -set statusbar-basename true -set selection-clipboard clipboard -set recolor false -CONF diff --git a/scripts/hibernate-lowbattery.sh b/scripts/hibernate-lowbattery.sh index d98df476..71fb0d16 100755 --- a/scripts/hibernate-lowbattery.sh +++ b/scripts/hibernate-lowbattery.sh @@ -1,9 +1,9 @@ #!/bin/sh acpi -b | awk -F'[,:%]' '{print $2, $3}' | { - read -r status capacity + read -r status capacity - if [ "$status" = Discharging -a "$capacity" -lt 5 ]; then - logger "Critical battery threshold" - systemctl hibernate - fi + if [ "$status" = Discharging -a "$capacity" -lt 5 ]; then + logger "Critical battery threshold" + systemctl hibernate + fi } diff --git a/scripts/ipmi/auto.sh b/scripts/ipmi/auto.sh deleted file mode 100755 index 60b75181..00000000 --- a/scripts/ipmi/auto.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -IPMIHOST=10.0.0.82 -IPMIUSER=ReekyMarko -IPMIPW={{@@ env['PASS_IPMI'] @@}} -IPMIEK=0000000000000000000000000000000000000000 - -printf "Activating dynamic fan control." -ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x01 diff --git a/scripts/ipmi/fans.sh b/scripts/ipmi/fans.sh deleted file mode 100755 index c23b4a6b..00000000 --- a/scripts/ipmi/fans.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -IPMIHOST=10.0.0.82 -IPMIUSER=ReekyMarko -IPMIPW={{@@ env['PASS_IPMI'] @@}} -IPMIEK=0000000000000000000000000000000000000000 - -DATA=`ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr get "FAN 1 RPM" "FAN 2 RPM" "FAN 3 RPM" "FAN 4 RPM" "FAN 5 RPM" "FAN 6 RPM" | grep "Sensor Reading" | awk '{ print $4 }'` - -echo "$DATA" - -mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan1" -m "$(echo "$DATA" | head -1 | tail -1)" -mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan2" -m "$(echo "$DATA" | head -2 | tail -1)" -mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan3" -m "$(echo "$DATA" | head -3 | tail -1)" -mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan4" -m "$(echo "$DATA" | head -4 | tail -1)" -mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan5" -m "$(echo "$DATA" | head -5 | tail -1)" -mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/fan6" -m "$(echo "$DATA" | head -6 | tail -1)" diff --git a/scripts/ipmi/full.sh b/scripts/ipmi/full.sh deleted file mode 100755 index 8218be99..00000000 --- a/scripts/ipmi/full.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -IPMIHOST=10.0.0.82 -IPMIUSER=ReekyMarko -IPMIPW={{@@ env['PASS_IPMI'] @@}} -IPMIEK=0000000000000000000000000000000000000000 - -printf "speeeed!" -ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x00 -ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x02 0xff 0x64 diff --git a/scripts/ipmi/static.sh b/scripts/ipmi/static.sh deleted file mode 100755 index cc4bc509..00000000 --- a/scripts/ipmi/static.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -IPMIHOST=10.0.0.82 -IPMIUSER=ReekyMarko -IPMIPW={{@@ env['PASS_IPMI'] @@}} -IPMIEK=0000000000000000000000000000000000000000 - -printf "Activating manual fan speeds! (2160 RPM)" -ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x00 -ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x02 0xff 0x10 diff --git a/scripts/ipmi/temp.sh b/scripts/ipmi/temp.sh deleted file mode 100755 index b468b766..00000000 --- a/scripts/ipmi/temp.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -IPMIHOST=10.0.0.82 -IPMIUSER=ReekyMarko -IPMIPW={{@@ env['PASS_IPMI'] @@}} -IPMIEK=0000000000000000000000000000000000000000 -MAXTEMP=27 -TEMP=$(ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK sdr type temperature |grep Ambient |grep degrees |grep -Po '\d{2}' | tail -1) - -mosquitto_pub -u reekynet -P {{@@ env['PASS_MQTT'] @@}} -t "ipmi/temp" -m "$TEMP" - - -if [[ $TEMP > $MAXTEMP ]]; - then - printf "Warning: Temperature is too high! Activating dynamic fan control! ($TEMP C)" - ipmitool -I lanplus -H $IPMIHOST -U $IPMIUSER -P $IPMIPW -y $IPMIEK raw 0x30 0x30 0x01 0x01 - else - printf "Temperature is OK ($TEMP C)" -fi diff --git a/scripts/mail/notify-new-mail.sh b/scripts/mail/notify-new-mail.sh index 298d6b35..a4d2f302 100755 --- a/scripts/mail/notify-new-mail.sh +++ b/scripts/mail/notify-new-mail.sh @@ -5,20 +5,19 @@ COUNT=$(ls $NEWMAILDIR | wc -l) ICON=/usr/share/icons/Papirus-Dark/64x64/apps/email.svg SOUND=/usr/share/sounds/Oxygen-Im-Message-In.ogg - if [ $COUNT -ne 0 ]; then - mpv $SOUND & + mpv $SOUND & fi if [ $COUNT -gt 1 ]; then - fromaddress=$(cat $NEWMAILDIR/$(ls $NEWMAILDIR | sort -R | tail -1) | formail -x From | tail -1) - notify-send.sh -i $ICON "$COUNT new messages in $1" "From $fromaddress and others" + fromaddress=$(cat $NEWMAILDIR/$(ls $NEWMAILDIR | sort -R | tail -1) | formail -x From | tail -1) + notify-send.sh -i $ICON "$COUNT new messages in $1" "From $fromaddress and others" elif [ $COUNT -eq 1 ]; then - mailsubject=$(cat $NEWMAILDIR/* | formail -x Subject) - fromaddress=$(cat $NEWMAILDIR/* | formail -x From | tail -1) + mailsubject=$(cat $NEWMAILDIR/* | formail -x Subject) + fromaddress=$(cat $NEWMAILDIR/* | formail -x From | tail -1) - notify-send.sh -i $ICON "New message in $1" "$fromaddress $mailsubject" + notify-send.sh -i $ICON "New message in $1" "$fromaddress $mailsubject" else - echo "No new mail" + echo "No new mail" fi diff --git a/scripts/open_with_linux.py b/scripts/open_with_linux.py deleted file mode 100755 index 6a4f9799..00000000 --- a/scripts/open_with_linux.py +++ /dev/null @@ -1,186 +0,0 @@ -#!/usr/bin/env python -from __future__ import print_function - -import os -import sys -import json -import struct -import subprocess - -VERSION = '7.2.2' - -try: - sys.stdin.buffer - - # Python 3.x version - # Read a message from stdin and decode it. - def getMessage(): - rawLength = sys.stdin.buffer.read(4) - if len(rawLength) == 0: - sys.exit(0) - messageLength = struct.unpack('@I', rawLength)[0] - message = sys.stdin.buffer.read(messageLength).decode('utf-8') - return json.loads(message) - - # Send an encoded message to stdout - def sendMessage(messageContent): - encodedContent = json.dumps(messageContent).encode('utf-8') - encodedLength = struct.pack('@I', len(encodedContent)) - - sys.stdout.buffer.write(encodedLength) - sys.stdout.buffer.write(encodedContent) - sys.stdout.buffer.flush() - -except AttributeError: - # Python 2.x version (if sys.stdin.buffer is not defined) - # Read a message from stdin and decode it. - def getMessage(): - rawLength = sys.stdin.read(4) - if len(rawLength) == 0: - sys.exit(0) - messageLength = struct.unpack('@I', rawLength)[0] - message = sys.stdin.read(messageLength) - return json.loads(message) - - # Send an encoded message to stdout - def sendMessage(messageContent): - encodedContent = json.dumps(messageContent) - encodedLength = struct.pack('@I', len(encodedContent)) - - sys.stdout.write(encodedLength) - sys.stdout.write(encodedContent) - sys.stdout.flush() - - -def install(): - home_path = os.getenv('HOME') - - manifest = { - 'name': 'open_with', - 'description': 'Open With native host', - 'path': os.path.realpath(__file__), - 'type': 'stdio', - } - locations = { - 'chrome': os.path.join(home_path, '.config', 'google-chrome', 'NativeMessagingHosts'), - 'chrome-beta': os.path.join(home_path, '.config', 'google-chrome-beta', 'NativeMessagingHosts'), - 'chrome-unstable': os.path.join(home_path, '.config', 'google-chrome-unstable', 'NativeMessagingHosts'), - 'chromium': os.path.join(home_path, '.config', 'chromium', 'NativeMessagingHosts'), - 'firefox': os.path.join(home_path, '.mozilla', 'native-messaging-hosts'), - } - filename = 'open_with.json' - - for browser, location in locations.items(): - if os.path.exists(os.path.dirname(location)): - if not os.path.exists(location): - os.mkdir(location) - - browser_manifest = manifest.copy() - if browser == 'firefox': - browser_manifest['allowed_extensions'] = ['openwith@darktrojan.net'] - else: - browser_manifest['allowed_origins'] = [ - 'chrome-extension://cogjlncmljjnjpbgppagklanlcbchlno/', # Chrome - 'chrome-extension://fbmcaggceafhobjkhnaakhgfmdaadhhg/', # Opera - ] - - with open(os.path.join(location, filename), 'w') as file: - file.write( - json.dumps(browser_manifest, indent=2, separators=(',', ': '), sort_keys=True).replace(' ', '\t') + '\n' - ) - - -def _read_desktop_file(path): - with open(path, 'r') as desktop_file: - current_section = None - name = None - command = None - for line in desktop_file: - if line[0] == '[': - current_section = line[1:-2] - if current_section != 'Desktop Entry': - continue - - if line.startswith('Name='): - name = line[5:].strip() - elif line.startswith('Exec='): - command = line[5:].strip() - - return { - 'name': name, - 'command': command - } - - -def find_browsers(): - apps = [ - 'Chrome', - 'Chromium', - 'chromium-browser', - 'firefox', - 'Firefox', - 'Google Chrome', - 'google-chrome', - 'opera', - 'Opera', - 'SeaMonkey', - 'seamonkey', - ] - paths = [ - os.path.join(os.getenv('HOME'), '.local/share/applications'), - '/usr/local/share/applications', - '/usr/share/applications' - ] - suffix = '.desktop' - - results = [] - for p in paths: - for a in apps: - fp = os.path.join(p, a) + suffix - if os.path.exists(fp): - results.append(_read_desktop_file(fp)) - return results - - -def listen(): - receivedMessage = getMessage() - if receivedMessage == 'ping': - sendMessage({ - 'version': VERSION, - 'file': os.path.realpath(__file__) - }) - elif receivedMessage == 'find': - sendMessage(find_browsers()) - else: - for k, v in os.environ.items(): - if k.startswith('MOZ_'): - try: - os.unsetenv(k) - except: - os.environ[k] = '' - - devnull = open(os.devnull, 'w') - subprocess.Popen(receivedMessage, stdout=devnull, stderr=devnull) - sendMessage(None) - - -if __name__ == '__main__': - if len(sys.argv) == 2: - if sys.argv[1] == 'install': - install() - sys.exit(0) - elif sys.argv[1] == 'find_browsers': - print(find_browsers()) - sys.exit(0) - - allowed_extensions = [ - 'openwith@darktrojan.net', - 'chrome-extension://cogjlncmljjnjpbgppagklanlcbchlno/', - 'chrome-extension://fbmcaggceafhobjkhnaakhgfmdaadhhg/', - ] - for ae in allowed_extensions: - if ae in sys.argv: - listen() - sys.exit(0) - - print('Open With native helper, version %s.' % VERSION) diff --git a/secrets/secrets.sh b/secrets/secrets.sh index 43691bf9..2232d5e4 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -2,7 +2,7 @@ source $DOTREPO/secrets/env -cat < $DOTREPO/secrets/secrets +cat <$DOTREPO/secrets/secrets export PASS_LIBREFM="$PASS_LIBREFM" export PASS_MUSICBRAINZ="$PASS_MUSICBRAINZ" export PASS_LISTENBRAINZ="$PASS_LISTENBRAINZ" From 4255c7eba0dea2efb91a09489ac495bec1bd2d5b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:08:42 +0300 Subject: [PATCH 1457/2667] Re-enable shfmt in pre-commit hook --- .husky/pre-commit | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 13224a43..25bf9214 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -31,14 +31,14 @@ if [ "$num_staged_lua" -gt 0 ]; then fi # Run shfmt on staged shell scripts -#staged_sh=$(echo "$staged_files" | grep -E '(.sh$|pre-commit)' || true) -#num_staged_sh=$(echo "$staged_sh" | grep -vce '^$' || true) -#if [ "$num_staged_sh" -gt 0 ]; then -# printf '\nFormatting %s staged shell scripts with shfmt\n' "$num_staged_sh" -# shfmt -w "$staged_sh" -# printf "Re-staging\n\n" -# git add "$staged_sh" -#fi +staged_sh=$(echo "$staged_files" | grep -E '(.sh$|pre-commit)' || true) +num_staged_sh=$(echo "$staged_sh" | grep -vce '^$' || true) +if [ "$num_staged_sh" -gt 0 ]; then + printf '\nFormatting %s staged shell scripts with shfmt\n' "$num_staged_sh" + shfmt -w "$staged_sh" + printf "Re-staging\n\n" + git add "$staged_sh" +fi # Run prettier on all other staged files # that are supported From 12f36722c4826b98f982fd3b1080110356998bcd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:08:42 +0300 Subject: [PATCH 1458/2667] Re-enable shfmt in pre-commit hook --- .husky/pre-commit | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 13224a43..25bf9214 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -31,14 +31,14 @@ if [ "$num_staged_lua" -gt 0 ]; then fi # Run shfmt on staged shell scripts -#staged_sh=$(echo "$staged_files" | grep -E '(.sh$|pre-commit)' || true) -#num_staged_sh=$(echo "$staged_sh" | grep -vce '^$' || true) -#if [ "$num_staged_sh" -gt 0 ]; then -# printf '\nFormatting %s staged shell scripts with shfmt\n' "$num_staged_sh" -# shfmt -w "$staged_sh" -# printf "Re-staging\n\n" -# git add "$staged_sh" -#fi +staged_sh=$(echo "$staged_files" | grep -E '(.sh$|pre-commit)' || true) +num_staged_sh=$(echo "$staged_sh" | grep -vce '^$' || true) +if [ "$num_staged_sh" -gt 0 ]; then + printf '\nFormatting %s staged shell scripts with shfmt\n' "$num_staged_sh" + shfmt -w "$staged_sh" + printf "Re-staging\n\n" + git add "$staged_sh" +fi # Run prettier on all other staged files # that are supported From d1dff202c9fa1179e334c6cc3d1458e376b38c78 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:12:04 +0300 Subject: [PATCH 1459/2667] Remove umpv, rename sway-run to sway-run.sh --- root/usr/local/bin/{sway-run => sway-run.sh} | 0 root/usr/local/bin/umpv | 84 -------------------- 2 files changed, 84 deletions(-) rename root/usr/local/bin/{sway-run => sway-run.sh} (100%) delete mode 100755 root/usr/local/bin/umpv diff --git a/root/usr/local/bin/sway-run b/root/usr/local/bin/sway-run.sh similarity index 100% rename from root/usr/local/bin/sway-run rename to root/usr/local/bin/sway-run.sh diff --git a/root/usr/local/bin/umpv b/root/usr/local/bin/umpv deleted file mode 100755 index 37a00a6e..00000000 --- a/root/usr/local/bin/umpv +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/env python3 - -""" -This script emulates "unique application" functionality on Linux. When starting -playback with this script, it will try to reuse an already running instance of -mpv (but only if that was started with umpv). Other mpv instances (not started -by umpv) are ignored, and the script doesn't know about them. -This only takes filenames as arguments. Custom options can't be used; the script -interprets them as filenames. If mpv is already running, the files passed to -umpv are appended to mpv's internal playlist. If a file does not exist or is -otherwise not playable, mpv will skip the playlist entry when attempting to -play it (from the GUI perspective, it's silently ignored). -If mpv isn't running yet, this script will start mpv and let it control the -current terminal. It will not write output to stdout/stderr, because this -will typically just fill ~/.xsession-errors with garbage. -mpv will terminate if there are no more files to play, and running the umpv -script after that will start a new mpv instance. -Note: you can supply custom mpv path and options with the MPV environment - variable. The environment variable will be split on whitespace, and the - first item is used as path to mpv binary and the rest is passed as options - _if_ the script starts mpv. If mpv is not started by the script (i.e. mpv - is already running), this will be ignored. -""" - -import sys -import os -import socket -import errno -import subprocess -import fcntl -import stat -import string - -files = sys.argv[1:] - -# this is the same method mpv uses to decide this -def is_url(filename): - parts = filename.split("://", 1) - if len(parts) < 2: - return False - # protocol prefix has no special characters => it's an URL - allowed_symbols = string.ascii_letters + string.digits + '_' - prefix = parts[0] - return all(map(lambda c: c in allowed_symbols, prefix)) - -# make them absolute; also makes them safe against interpretation as options -def make_abs(filename): - if not is_url(filename): - return os.path.abspath(filename) - return filename -files = [make_abs(f) for f in files] - -SOCK = os.path.join(os.getenv("HOME"), ".umpv_socket") - -sock = None -try: - sock = socket.socket(socket.AF_UNIX) - sock.connect(SOCK) -except socket.error as e: - if e.errno == errno.ECONNREFUSED: - sock = None - pass # abandoned socket - elif e.errno == errno.ENOENT: - sock = None - pass # doesn't exist - else: - raise e - -if sock: - # Unhandled race condition: what if mpv is terminating right now? - for f in files: - # escape: \ \n " - f = f.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n") - f = "\"" + f + "\"" - sock.send(("raw loadfile " + f + " append\n").encode("utf-8")) -else: - # Let mpv recreate socket if it doesn't already exist. - - opts = (os.getenv("MPV") or "mpv").split() - opts.extend(["--no-terminal", "--force-window", "--input-ipc-server=" + SOCK, - "--"]) - opts.extend(files) - - subprocess.check_call(opts) From 72fd1108344b446623b543a41e4320fd5e104eec Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:12:04 +0300 Subject: [PATCH 1460/2667] Remove umpv, rename sway-run to sway-run.sh --- root/usr/local/bin/{sway-run => sway-run.sh} | 0 root/usr/local/bin/umpv | 84 -------------------- 2 files changed, 84 deletions(-) rename root/usr/local/bin/{sway-run => sway-run.sh} (100%) delete mode 100755 root/usr/local/bin/umpv diff --git a/root/usr/local/bin/sway-run b/root/usr/local/bin/sway-run.sh similarity index 100% rename from root/usr/local/bin/sway-run rename to root/usr/local/bin/sway-run.sh diff --git a/root/usr/local/bin/umpv b/root/usr/local/bin/umpv deleted file mode 100755 index 37a00a6e..00000000 --- a/root/usr/local/bin/umpv +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/env python3 - -""" -This script emulates "unique application" functionality on Linux. When starting -playback with this script, it will try to reuse an already running instance of -mpv (but only if that was started with umpv). Other mpv instances (not started -by umpv) are ignored, and the script doesn't know about them. -This only takes filenames as arguments. Custom options can't be used; the script -interprets them as filenames. If mpv is already running, the files passed to -umpv are appended to mpv's internal playlist. If a file does not exist or is -otherwise not playable, mpv will skip the playlist entry when attempting to -play it (from the GUI perspective, it's silently ignored). -If mpv isn't running yet, this script will start mpv and let it control the -current terminal. It will not write output to stdout/stderr, because this -will typically just fill ~/.xsession-errors with garbage. -mpv will terminate if there are no more files to play, and running the umpv -script after that will start a new mpv instance. -Note: you can supply custom mpv path and options with the MPV environment - variable. The environment variable will be split on whitespace, and the - first item is used as path to mpv binary and the rest is passed as options - _if_ the script starts mpv. If mpv is not started by the script (i.e. mpv - is already running), this will be ignored. -""" - -import sys -import os -import socket -import errno -import subprocess -import fcntl -import stat -import string - -files = sys.argv[1:] - -# this is the same method mpv uses to decide this -def is_url(filename): - parts = filename.split("://", 1) - if len(parts) < 2: - return False - # protocol prefix has no special characters => it's an URL - allowed_symbols = string.ascii_letters + string.digits + '_' - prefix = parts[0] - return all(map(lambda c: c in allowed_symbols, prefix)) - -# make them absolute; also makes them safe against interpretation as options -def make_abs(filename): - if not is_url(filename): - return os.path.abspath(filename) - return filename -files = [make_abs(f) for f in files] - -SOCK = os.path.join(os.getenv("HOME"), ".umpv_socket") - -sock = None -try: - sock = socket.socket(socket.AF_UNIX) - sock.connect(SOCK) -except socket.error as e: - if e.errno == errno.ECONNREFUSED: - sock = None - pass # abandoned socket - elif e.errno == errno.ENOENT: - sock = None - pass # doesn't exist - else: - raise e - -if sock: - # Unhandled race condition: what if mpv is terminating right now? - for f in files: - # escape: \ \n " - f = f.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n") - f = "\"" + f + "\"" - sock.send(("raw loadfile " + f + " append\n").encode("utf-8")) -else: - # Let mpv recreate socket if it doesn't already exist. - - opts = (os.getenv("MPV") or "mpv").split() - opts.extend(["--no-terminal", "--force-window", "--input-ipc-server=" + SOCK, - "--"]) - opts.extend(files) - - subprocess.check_call(opts) From 9b8581051e8930b4be0ff7724c37a4f27e8f43db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:12:25 +0300 Subject: [PATCH 1461/2667] Ignore deleted files in pre-commit hook --- .husky/pre-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 25bf9214..fc94b13d 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -8,7 +8,7 @@ echo "FunctionalHacker's dotfile pre-commit hook start" printf "Using shell: %s \n" "$(readlink /proc/$$/exe)" # All staged files -staged_files=$(git diff --name-only --cached) +staged_files=$(git diff --name-only --cached --diff-filter=d) # Run taplo on staged TOML files staged_toml=$(echo "$staged_files" | grep '.toml$' || true) From 0bedb49cf668f6d562dd9befb7e999d80d178dc6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:12:25 +0300 Subject: [PATCH 1462/2667] Ignore deleted files in pre-commit hook --- .husky/pre-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 25bf9214..fc94b13d 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -8,7 +8,7 @@ echo "FunctionalHacker's dotfile pre-commit hook start" printf "Using shell: %s \n" "$(readlink /proc/$$/exe)" # All staged files -staged_files=$(git diff --name-only --cached) +staged_files=$(git diff --name-only --cached --diff-filter=d) # Run taplo on staged TOML files staged_toml=$(echo "$staged_files" | grep '.toml$' || true) From dbd67777a270f6a73233eafe3d588b3d6bc9ef5d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:14:04 +0300 Subject: [PATCH 1463/2667] Fix sway-run.sh reference in zprofile --- home/.zprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.zprofile b/home/.zprofile index edcd6beb..f2729c2c 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -2,6 +2,6 @@ if [[ -z $DISPLAY && $XDG_VTNR -eq 1 && -z "$SSH_CONNECTION" ]]; then {%@@ if profile == 'Moria' @@%} systemctl --user mask pipewire.service pipewire-pulse.service && systemctl --user stop pipewire.service pipewire-pulse.service && kodi; systemctl --user unmask pipewire.service pipewire-pulse.service && systemctl --user start pipewire.service pipewire-pulse.service {%@@ elif profile == 'Mirkwood' @@%} - sway-run + sway-run.sh {%@@ endif @@%} fi From 973fe13743545acb836727c26f3490bf7729592d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:14:04 +0300 Subject: [PATCH 1464/2667] Fix sway-run.sh reference in zprofile --- home/.zprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.zprofile b/home/.zprofile index edcd6beb..f2729c2c 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -2,6 +2,6 @@ if [[ -z $DISPLAY && $XDG_VTNR -eq 1 && -z "$SSH_CONNECTION" ]]; then {%@@ if profile == 'Moria' @@%} systemctl --user mask pipewire.service pipewire-pulse.service && systemctl --user stop pipewire.service pipewire-pulse.service && kodi; systemctl --user unmask pipewire.service pipewire-pulse.service && systemctl --user start pipewire.service pipewire-pulse.service {%@@ elif profile == 'Mirkwood' @@%} - sway-run + sway-run.sh {%@@ endif @@%} fi From 67e7fb26907aa9aea9308e060c53431397d2516e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:18:56 +0300 Subject: [PATCH 1465/2667] Add .ignore file for the root of the repo to ignore the dotdrop submodule in fd, rg etc --- .ignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .ignore diff --git a/.ignore b/.ignore new file mode 100644 index 00000000..6c41465d --- /dev/null +++ b/.ignore @@ -0,0 +1 @@ +dotdrop/ From 8d6ee01d96d601109acf9d88eb2df95bfd3b752a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:18:56 +0300 Subject: [PATCH 1466/2667] Add .ignore file for the root of the repo to ignore the dotdrop submodule in fd, rg etc --- .ignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .ignore diff --git a/.ignore b/.ignore new file mode 100644 index 00000000..6c41465d --- /dev/null +++ b/.ignore @@ -0,0 +1 @@ +dotdrop/ From 7d18622a3b2a42138b104d71d8c8a35620a014fc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:35:58 +0300 Subject: [PATCH 1467/2667] Remove more unneeded and old files --- deploy.sh | 73 -------- efistub/arch.efi | 12 -- efistub/lts.efi | 12 -- efistub/update.sh | 14 -- pkglist | 187 -------------------- root/boot/loader/{README.md => README.adoc} | 5 +- 6 files changed, 3 insertions(+), 300 deletions(-) delete mode 100755 deploy.sh delete mode 100755 efistub/arch.efi delete mode 100755 efistub/lts.efi delete mode 100755 efistub/update.sh delete mode 100644 pkglist rename root/boot/loader/{README.md => README.adoc} (51%) diff --git a/deploy.sh b/deploy.sh deleted file mode 100755 index 2c63408e..00000000 --- a/deploy.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/zsh - -# This is a script that should be ran once -# on a new system. Dotdrop will take it from there. -# It is higly tailored to my own needs and -# you (the random person on the internet) should probably not run it - -export DOTREPO="$HOME/git/dotfiles" -DISTRO="$(lsb_release -ds | sed 's/"//g')" - -PKGLIST="python-ruamel-yaml python-magic-git python-jinja python-docopt" - -if [ -d $DOTREPO ]; then - print "Dotfile repository already exists, exiting..." - exit 1 -fi - -if [ "$DISTRO" -ne "Arch Linux" ]; then - print "Not running on Arch Linux" - print "Other distros not supported, exiting..." - exit 1 -fi - -# install neovim if not installed -if ! [ -x "$(command -v nvim)" ]; then - read -p "Install neovim? [Y/n] " -i "y" INVIM - if [ "$(tr '[:upper:]' ':lower:' $INVIM)" -eq "y" ]; then - print "Installing neovim" - PKGLIST=$PKGLIST + " neovim neovim-dropin" - fi -fi - -# install zsh if not installed -if ! [ -x "$(command -v zsh)" ]; then - read -p "Install zsh? [Y/n] " -i "y" IZSH - if [ "$(tr '[:upper:]' ':lower:' $INVIM)" -eq "y" ]; then - print "Installing zsh" - PKGLIST=$PKGLIST + " zsh" - fi -fi - -# install paru if not installed -if ! [ -x "$(command -v paru)" ]; then - read -p "Install paru? [Y/n] " -i "y" IYAY - if [ "$(tr '[:upper:]' ':lower:' $IYAY)" -eq "y" ]; then - print "Installing paru" - sudo pacman -Syu --needed --noconfirm git wget base-devel - cd - wget https://aur.archlinux.org/cgit/aur.git/snapshot/paru-bin.tar.gz - tar xfv paru-bin.tar.gz - cd paru-bin - makepkg -si --noconfirm - cd .. - rm -r paru* - fi -fi - -if [ $PKGLIST -ne "" ] - if ! [ -x "$(command -v paru)" ]; then - print "Can't continue without paru" - - paru -S $PKGLIST - fi -fi - -mkdir ~/git -git clone https://git.korhonen.cc/ReekyMarko/dotfiles.git $DOTREPO -cd ~/git/dotfiles -git submodule init -git submodule update -$DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-home.yaml install -chsh -s /bin/zsh -zsh -c "source ~/.zshrc; sdotdrop install" diff --git a/efistub/arch.efi b/efistub/arch.efi deleted file mode 100755 index 01a57c76..00000000 --- a/efistub/arch.efi +++ /dev/null @@ -1,12 +0,0 @@ -#/bin/bash -# vim:ft=sh - -sudo efibootmgr \ - --disk /dev/sda \ - --part 1 \ - --create \ - --quiet \ - --remove-dups \ - --label "Arch Linux" \ - --loader /vmlinuz-linux \ - --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff' diff --git a/efistub/lts.efi b/efistub/lts.efi deleted file mode 100755 index e2b91ebd..00000000 --- a/efistub/lts.efi +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# vim:ft=sh - -sudo efibootmgr \ - --disk /dev/sda \ - --part 1 \ - --create \ - --quiet \ - --remove-dups \ - --label "Arch Linux LTS" \ - --loader /vmlinuz-linux-lts \ - --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux-lts.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff' diff --git a/efistub/update.sh b/efistub/update.sh deleted file mode 100755 index 448eefdd..00000000 --- a/efistub/update.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# remove old entries -for bootentry in $(efibootmgr | head -n 3 | tail -n 1 | cut -d' ' -f2- | sed 's/,/\n/g'); do - sudo efibootmgr -qBb $bootentry -done - -# add all entries back -for bootscript in *.efi; do - ./$bootscript -done - -# set bootorder -sudo efibootmgr --bootorder 0000,0001 diff --git a/pkglist b/pkglist deleted file mode 100644 index 054861e7..00000000 --- a/pkglist +++ /dev/null @@ -1,187 +0,0 @@ -aic94xx-firmware -alacritty -alacritty-terminfo -alsa-utils -amd-ucode -asciiquarium -autoconf -automake -bash -bash-language-server -binutils -bison -blueberry -bluez-utils -bzip2 -ccid -chromium -clipman -clutter -coreutils -cpupower -cryptsetup -device-mapper -dhcpcd -diffutils -discord -dmenu -dolphin -drill-search-cli -e2fsprogs -evolution -evolution-decsync -fakeroot -ffmpeg-amd-full-git -file -file-roller -filesystem -findutils -firefox-nightly -fmui-git -fzf -gawk -gcc -gcc-libs -gettext -git -glibc -gnome-keyring -gotop-bin -grep -grim -gzip -imv -inetutils -iproute2 -iputils -iwd -jfsutils -kdeconnect -kdenlive -kodi-wayland -less -lib32-libva-mesa-driver -lib32-mesa -lib32-vulkan-radeon -libva-mesa-driver -licenses -light -linux -linux-firmware -locale-en_xx -logrotate -ls_extended -lvm2 -lxappearance -make -mako -man-db -man-pages -matcha-gtk-theme -mdadm -mimeo -mkinitcpio-welcomemessage -mpd -mpdris2-py3-git -mpdscribble -mpv-acestream -mpv-amd-full-git -mpv-mpris -mumble -nano -nautilus -ncmpcpp -neofetch -neovim -netctl -nodejs -noto-fonts -numix-icon-theme-git -opensc -openssh -otf-overpass -pacman -pacserve -pass-otp -pass-wl-clipboard -passdmenu -patch -pavucontrol -pciutils -perl -pkgconf -playerctl -polkit-gnome -powertop -procps-ng -psmisc -pulseaudio-ctl -python-docopt -python-jinja -python-ruamel-yaml -qt5-styleplugins -qt5-wayland -qt5ct -ranger -redshift-wlr-gamma-control -reflector -reiserfsprogs -ripgrep -rofi-pass -rtv -ryzenadj-git -s-nail -sed -shadow -sl -slurp -socat -steam -steam-native-runtime -sudo -sway -swaybg -swayidle -swaylock-effects-git -syncthing -syncthing-gtk -sysfsutils -systemd-boot-pacman-hook -systemd-resolvconf -systemd-sysvcompat -tar -telegram-desktop -texinfo -thefuck -tlp -tmux -trash-cli -ttf-dejavu -ttf-font-awesome -ttf-mac-fonts -ttf-nerd-fonts-hack-complete-git -usbutils -util-linux -vi -vulkan-radeon -w3m -waybar-git -wayland -wd719x-firmware -wf-recorder-git -wget -which -wl-clipboard-git -wl-clipboard-x11 -xcursor-breeze -xdg-utils-mimeo -xf86-video-amdgpu -xfsprogs -xorg-server-xwayland -xorg-xeyes -yarn -yay-bin -ydotool-git -youtube-dl -zathura-pdf-mupdf -zsh diff --git a/root/boot/loader/README.md b/root/boot/loader/README.adoc similarity index 51% rename from root/boot/loader/README.md rename to root/boot/loader/README.adoc index f0138427..6db6b4a1 100644 --- a/root/boot/loader/README.md +++ b/root/boot/loader/README.adoc @@ -1,2 +1,3 @@ -I don't use systemd-boot on my main system anymore but this is here for reference -when I'm setting up new systems. += Notice +I don't use systemd-boot on my main system anymore but this is here for +reference when I'm setting up new systems. From f18dba6fa6ad52499cda3dbc6f63e4adaa50b3d4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:35:58 +0300 Subject: [PATCH 1468/2667] Remove more unneeded and old files --- deploy.sh | 73 -------- efistub/arch.efi | 12 -- efistub/lts.efi | 12 -- efistub/update.sh | 14 -- pkglist | 187 -------------------- root/boot/loader/{README.md => README.adoc} | 5 +- 6 files changed, 3 insertions(+), 300 deletions(-) delete mode 100755 deploy.sh delete mode 100755 efistub/arch.efi delete mode 100755 efistub/lts.efi delete mode 100755 efistub/update.sh delete mode 100644 pkglist rename root/boot/loader/{README.md => README.adoc} (51%) diff --git a/deploy.sh b/deploy.sh deleted file mode 100755 index 2c63408e..00000000 --- a/deploy.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/zsh - -# This is a script that should be ran once -# on a new system. Dotdrop will take it from there. -# It is higly tailored to my own needs and -# you (the random person on the internet) should probably not run it - -export DOTREPO="$HOME/git/dotfiles" -DISTRO="$(lsb_release -ds | sed 's/"//g')" - -PKGLIST="python-ruamel-yaml python-magic-git python-jinja python-docopt" - -if [ -d $DOTREPO ]; then - print "Dotfile repository already exists, exiting..." - exit 1 -fi - -if [ "$DISTRO" -ne "Arch Linux" ]; then - print "Not running on Arch Linux" - print "Other distros not supported, exiting..." - exit 1 -fi - -# install neovim if not installed -if ! [ -x "$(command -v nvim)" ]; then - read -p "Install neovim? [Y/n] " -i "y" INVIM - if [ "$(tr '[:upper:]' ':lower:' $INVIM)" -eq "y" ]; then - print "Installing neovim" - PKGLIST=$PKGLIST + " neovim neovim-dropin" - fi -fi - -# install zsh if not installed -if ! [ -x "$(command -v zsh)" ]; then - read -p "Install zsh? [Y/n] " -i "y" IZSH - if [ "$(tr '[:upper:]' ':lower:' $INVIM)" -eq "y" ]; then - print "Installing zsh" - PKGLIST=$PKGLIST + " zsh" - fi -fi - -# install paru if not installed -if ! [ -x "$(command -v paru)" ]; then - read -p "Install paru? [Y/n] " -i "y" IYAY - if [ "$(tr '[:upper:]' ':lower:' $IYAY)" -eq "y" ]; then - print "Installing paru" - sudo pacman -Syu --needed --noconfirm git wget base-devel - cd - wget https://aur.archlinux.org/cgit/aur.git/snapshot/paru-bin.tar.gz - tar xfv paru-bin.tar.gz - cd paru-bin - makepkg -si --noconfirm - cd .. - rm -r paru* - fi -fi - -if [ $PKGLIST -ne "" ] - if ! [ -x "$(command -v paru)" ]; then - print "Can't continue without paru" - - paru -S $PKGLIST - fi -fi - -mkdir ~/git -git clone https://git.korhonen.cc/ReekyMarko/dotfiles.git $DOTREPO -cd ~/git/dotfiles -git submodule init -git submodule update -$DOTREPO/dotdrop.sh --cfg=$DOTREPO/config-home.yaml install -chsh -s /bin/zsh -zsh -c "source ~/.zshrc; sdotdrop install" diff --git a/efistub/arch.efi b/efistub/arch.efi deleted file mode 100755 index 01a57c76..00000000 --- a/efistub/arch.efi +++ /dev/null @@ -1,12 +0,0 @@ -#/bin/bash -# vim:ft=sh - -sudo efibootmgr \ - --disk /dev/sda \ - --part 1 \ - --create \ - --quiet \ - --remove-dups \ - --label "Arch Linux" \ - --loader /vmlinuz-linux \ - --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff' diff --git a/efistub/lts.efi b/efistub/lts.efi deleted file mode 100755 index e2b91ebd..00000000 --- a/efistub/lts.efi +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# vim:ft=sh - -sudo efibootmgr \ - --disk /dev/sda \ - --part 1 \ - --create \ - --quiet \ - --remove-dups \ - --label "Arch Linux LTS" \ - --loader /vmlinuz-linux-lts \ - --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux-lts.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff' diff --git a/efistub/update.sh b/efistub/update.sh deleted file mode 100755 index 448eefdd..00000000 --- a/efistub/update.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# remove old entries -for bootentry in $(efibootmgr | head -n 3 | tail -n 1 | cut -d' ' -f2- | sed 's/,/\n/g'); do - sudo efibootmgr -qBb $bootentry -done - -# add all entries back -for bootscript in *.efi; do - ./$bootscript -done - -# set bootorder -sudo efibootmgr --bootorder 0000,0001 diff --git a/pkglist b/pkglist deleted file mode 100644 index 054861e7..00000000 --- a/pkglist +++ /dev/null @@ -1,187 +0,0 @@ -aic94xx-firmware -alacritty -alacritty-terminfo -alsa-utils -amd-ucode -asciiquarium -autoconf -automake -bash -bash-language-server -binutils -bison -blueberry -bluez-utils -bzip2 -ccid -chromium -clipman -clutter -coreutils -cpupower -cryptsetup -device-mapper -dhcpcd -diffutils -discord -dmenu -dolphin -drill-search-cli -e2fsprogs -evolution -evolution-decsync -fakeroot -ffmpeg-amd-full-git -file -file-roller -filesystem -findutils -firefox-nightly -fmui-git -fzf -gawk -gcc -gcc-libs -gettext -git -glibc -gnome-keyring -gotop-bin -grep -grim -gzip -imv -inetutils -iproute2 -iputils -iwd -jfsutils -kdeconnect -kdenlive -kodi-wayland -less -lib32-libva-mesa-driver -lib32-mesa -lib32-vulkan-radeon -libva-mesa-driver -licenses -light -linux -linux-firmware -locale-en_xx -logrotate -ls_extended -lvm2 -lxappearance -make -mako -man-db -man-pages -matcha-gtk-theme -mdadm -mimeo -mkinitcpio-welcomemessage -mpd -mpdris2-py3-git -mpdscribble -mpv-acestream -mpv-amd-full-git -mpv-mpris -mumble -nano -nautilus -ncmpcpp -neofetch -neovim -netctl -nodejs -noto-fonts -numix-icon-theme-git -opensc -openssh -otf-overpass -pacman -pacserve -pass-otp -pass-wl-clipboard -passdmenu -patch -pavucontrol -pciutils -perl -pkgconf -playerctl -polkit-gnome -powertop -procps-ng -psmisc -pulseaudio-ctl -python-docopt -python-jinja -python-ruamel-yaml -qt5-styleplugins -qt5-wayland -qt5ct -ranger -redshift-wlr-gamma-control -reflector -reiserfsprogs -ripgrep -rofi-pass -rtv -ryzenadj-git -s-nail -sed -shadow -sl -slurp -socat -steam -steam-native-runtime -sudo -sway -swaybg -swayidle -swaylock-effects-git -syncthing -syncthing-gtk -sysfsutils -systemd-boot-pacman-hook -systemd-resolvconf -systemd-sysvcompat -tar -telegram-desktop -texinfo -thefuck -tlp -tmux -trash-cli -ttf-dejavu -ttf-font-awesome -ttf-mac-fonts -ttf-nerd-fonts-hack-complete-git -usbutils -util-linux -vi -vulkan-radeon -w3m -waybar-git -wayland -wd719x-firmware -wf-recorder-git -wget -which -wl-clipboard-git -wl-clipboard-x11 -xcursor-breeze -xdg-utils-mimeo -xf86-video-amdgpu -xfsprogs -xorg-server-xwayland -xorg-xeyes -yarn -yay-bin -ydotool-git -youtube-dl -zathura-pdf-mupdf -zsh diff --git a/root/boot/loader/README.md b/root/boot/loader/README.adoc similarity index 51% rename from root/boot/loader/README.md rename to root/boot/loader/README.adoc index f0138427..6db6b4a1 100644 --- a/root/boot/loader/README.md +++ b/root/boot/loader/README.adoc @@ -1,2 +1,3 @@ -I don't use systemd-boot on my main system anymore but this is here for reference -when I'm setting up new systems. += Notice +I don't use systemd-boot on my main system anymore but this is here for +reference when I'm setting up new systems. From 5551416ca53a6290517a93d1e90729b0a6ec7d1f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:36:54 +0300 Subject: [PATCH 1469/2667] Fix adoc --- root/boot/loader/README.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/root/boot/loader/README.adoc b/root/boot/loader/README.adoc index 6db6b4a1..93e76b8d 100644 --- a/root/boot/loader/README.adoc +++ b/root/boot/loader/README.adoc @@ -1,3 +1,4 @@ = Notice + I don't use systemd-boot on my main system anymore but this is here for reference when I'm setting up new systems. From 20421fa466efeb3d3177b9d50ac75e9fb0e8e291 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:36:54 +0300 Subject: [PATCH 1470/2667] Fix adoc --- root/boot/loader/README.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/root/boot/loader/README.adoc b/root/boot/loader/README.adoc index 6db6b4a1..93e76b8d 100644 --- a/root/boot/loader/README.adoc +++ b/root/boot/loader/README.adoc @@ -1,3 +1,4 @@ = Notice + I don't use systemd-boot on my main system anymore but this is here for reference when I'm setting up new systems. From 38ebc33ec11011c2ee8a71683b90735df586f9b8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:37:39 +0300 Subject: [PATCH 1471/2667] Remove systemd-boot configuration --- root/boot/loader/README.adoc | 4 ---- root/boot/loader/loader.conf | 1 - 2 files changed, 5 deletions(-) delete mode 100644 root/boot/loader/README.adoc delete mode 100755 root/boot/loader/loader.conf diff --git a/root/boot/loader/README.adoc b/root/boot/loader/README.adoc deleted file mode 100644 index 93e76b8d..00000000 --- a/root/boot/loader/README.adoc +++ /dev/null @@ -1,4 +0,0 @@ -= Notice - -I don't use systemd-boot on my main system anymore but this is here for -reference when I'm setting up new systems. diff --git a/root/boot/loader/loader.conf b/root/boot/loader/loader.conf deleted file mode 100755 index 9fe3fd7f..00000000 --- a/root/boot/loader/loader.conf +++ /dev/null @@ -1 +0,0 @@ -timeout 0 From 085523998b7408832e4e2e0883c12d81bdd86701 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:37:39 +0300 Subject: [PATCH 1472/2667] Remove systemd-boot configuration --- root/boot/loader/README.adoc | 4 ---- root/boot/loader/loader.conf | 1 - 2 files changed, 5 deletions(-) delete mode 100644 root/boot/loader/README.adoc delete mode 100755 root/boot/loader/loader.conf diff --git a/root/boot/loader/README.adoc b/root/boot/loader/README.adoc deleted file mode 100644 index 93e76b8d..00000000 --- a/root/boot/loader/README.adoc +++ /dev/null @@ -1,4 +0,0 @@ -= Notice - -I don't use systemd-boot on my main system anymore but this is here for -reference when I'm setting up new systems. diff --git a/root/boot/loader/loader.conf b/root/boot/loader/loader.conf deleted file mode 100755 index 9fe3fd7f..00000000 --- a/root/boot/loader/loader.conf +++ /dev/null @@ -1 +0,0 @@ -timeout 0 From 2690e96fdad836480dc9cd1640f325da163c137c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 09:26:57 +0300 Subject: [PATCH 1473/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From bb4d4691624f9bddf3bf2ce6eef11bb79eea6e1c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 09:26:57 +0300 Subject: [PATCH 1474/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 1bf01247..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 1bf0124779f753a74f269ded5f47a2aae25fd114 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From fdff3a9ce78cdd6444b81e3d1a4221b0d133c751 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 17:38:40 +0300 Subject: [PATCH 1475/2667] Add os information to viirujateippi --- config.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.toml b/config.toml index f247c09d..5cf46255 100644 --- a/config.toml +++ b/config.toml @@ -328,6 +328,7 @@ include = ["os_arch"] include = ["os_arch"] [profiles.ViiruJaTeippi] +os = "ubuntu" include = ["terminal"] [profiles.os_arch.variables] From 48a51d9756db3be787a5172de8fecf96963fce8e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 17:38:40 +0300 Subject: [PATCH 1476/2667] Add os information to viirujateippi --- config.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.toml b/config.toml index f247c09d..5cf46255 100644 --- a/config.toml +++ b/config.toml @@ -328,6 +328,7 @@ include = ["os_arch"] include = ["os_arch"] [profiles.ViiruJaTeippi] +os = "ubuntu" include = ["terminal"] [profiles.os_arch.variables] From a5f5141dd1c7386b4eacdc442f80e985fa52bcb2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 17:41:56 +0300 Subject: [PATCH 1477/2667] Fix viirujateippi profile --- config.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config.toml b/config.toml index 5cf46255..9cb79cbd 100644 --- a/config.toml +++ b/config.toml @@ -328,8 +328,7 @@ include = ["os_arch"] include = ["os_arch"] [profiles.ViiruJaTeippi] -os = "ubuntu" -include = ["terminal"] +include = ["terminal", "os_ubuntu"] [profiles.os_arch.variables] os = "arch" From 1105f2fab04728aa67c0e427166cd260d6b8ef1f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 17:41:56 +0300 Subject: [PATCH 1478/2667] Fix viirujateippi profile --- config.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config.toml b/config.toml index 5cf46255..9cb79cbd 100644 --- a/config.toml +++ b/config.toml @@ -328,8 +328,7 @@ include = ["os_arch"] include = ["os_arch"] [profiles.ViiruJaTeippi] -os = "ubuntu" -include = ["terminal"] +include = ["terminal", "os_ubuntu"] [profiles.os_arch.variables] os = "arch" From f0cb81093d8d0be171b6b609cc884f6b79b3b8f1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 17:54:30 +0300 Subject: [PATCH 1479/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..aa3defd1 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit aa3defd11752247909e03eaf14da197a6eda90f7 From 1911c404273eb797435645a2315eb9ae9ca2fad5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 17:54:30 +0300 Subject: [PATCH 1480/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..aa3defd1 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit aa3defd11752247909e03eaf14da197a6eda90f7 From 34d347addc3aa5753d7adce84c63331c9f331425 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 17:56:55 +0300 Subject: [PATCH 1481/2667] Switch to using dotdrop's automatic distro_id variable --- config.toml | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/config.toml b/config.toml index 9cb79cbd..10e10f14 100644 --- a/config.toml +++ b/config.toml @@ -232,16 +232,9 @@ dst = "~/.pam_environment" src = ".config/wal" dst = "~/.config/wal" -[profiles.os_arch] -include = ["terminal"] +[profiles.pacman] dotfiles = ["f_makepkg.conf", "f_paru.conf"] -[profiles.os_ubuntu] -include = ["terminal"] - -[profiles.os_termux] -include = ["terminal"] - [profiles.terminal] dotfiles = [ "d_wal", @@ -301,43 +294,34 @@ dotfiles = [ ] [profiles.Mirkwood] -include = ["os_arch", "email", "media", "sway", "gpg"] +include = ["pacman", "terminal", "email", "media", "sway", "gpg"] dotfiles = ["d_systemd", "d_rofi", "f_librewolf_overrides"] [profiles.Moria] -include = ["os_arch", "media", "gpg"] +include = ["pacman", "terminal", "media", "gpg"] dotfiles = ["f_zprofile", "f_librewolf_overrides"] [profiles.Gondor] -include = ["os_arch"] +include = ["pacman", "terminal"] [profiles.mko-laptop] -include = ["os_ubuntu", "media", "gpg"] +include = ["terminal", "media", "gpg"] dotfiles = ["f_librewolf_overrides"] [profiles.Isengard] -include = ["os_termux"] +include = ["terminal"] [profiles.Edoras] -include = ["os_arch"] +include = ["terminal"] [profiles.TakamakiPC] -include = ["os_arch"] +include = ["terminal"] [profiles.localhost] -include = ["os_arch"] +include = ["terminal"] [profiles.ViiruJaTeippi] -include = ["terminal", "os_ubuntu"] - -[profiles.os_arch.variables] -os = "arch" - -[profiles.os_ubuntu.variables] -os = "ubuntu" - -[profiles.os_termux.variables] -os = "termux" +include = ["terminal"] [profiles.Mirkwood.variables] wayland = true @@ -346,7 +330,7 @@ wayland = true wayland = true [profiles.mko-laptop.variables] -wayland = false +wayland = true [profiles.TakamakiPC.variables] wayland = false From 5c2f6821f9b0988dd450ab1964c2e2490e7a0c89 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 17:56:55 +0300 Subject: [PATCH 1482/2667] Switch to using dotdrop's automatic distro_id variable --- config.toml | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/config.toml b/config.toml index 9cb79cbd..10e10f14 100644 --- a/config.toml +++ b/config.toml @@ -232,16 +232,9 @@ dst = "~/.pam_environment" src = ".config/wal" dst = "~/.config/wal" -[profiles.os_arch] -include = ["terminal"] +[profiles.pacman] dotfiles = ["f_makepkg.conf", "f_paru.conf"] -[profiles.os_ubuntu] -include = ["terminal"] - -[profiles.os_termux] -include = ["terminal"] - [profiles.terminal] dotfiles = [ "d_wal", @@ -301,43 +294,34 @@ dotfiles = [ ] [profiles.Mirkwood] -include = ["os_arch", "email", "media", "sway", "gpg"] +include = ["pacman", "terminal", "email", "media", "sway", "gpg"] dotfiles = ["d_systemd", "d_rofi", "f_librewolf_overrides"] [profiles.Moria] -include = ["os_arch", "media", "gpg"] +include = ["pacman", "terminal", "media", "gpg"] dotfiles = ["f_zprofile", "f_librewolf_overrides"] [profiles.Gondor] -include = ["os_arch"] +include = ["pacman", "terminal"] [profiles.mko-laptop] -include = ["os_ubuntu", "media", "gpg"] +include = ["terminal", "media", "gpg"] dotfiles = ["f_librewolf_overrides"] [profiles.Isengard] -include = ["os_termux"] +include = ["terminal"] [profiles.Edoras] -include = ["os_arch"] +include = ["terminal"] [profiles.TakamakiPC] -include = ["os_arch"] +include = ["terminal"] [profiles.localhost] -include = ["os_arch"] +include = ["terminal"] [profiles.ViiruJaTeippi] -include = ["terminal", "os_ubuntu"] - -[profiles.os_arch.variables] -os = "arch" - -[profiles.os_ubuntu.variables] -os = "ubuntu" - -[profiles.os_termux.variables] -os = "termux" +include = ["terminal"] [profiles.Mirkwood.variables] wayland = true @@ -346,7 +330,7 @@ wayland = true wayland = true [profiles.mko-laptop.variables] -wayland = false +wayland = true [profiles.TakamakiPC.variables] wayland = false From 2219344e1080ec6e6b488181986c1bad8eafdbae Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 18:00:46 +0300 Subject: [PATCH 1483/2667] Add file for testing dotdrop distro_id --- config.toml | 7 ++++++- home/.distro | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 home/.distro diff --git a/config.toml b/config.toml index 10e10f14..5ada0d3c 100644 --- a/config.toml +++ b/config.toml @@ -228,6 +228,10 @@ dst = "~/.config/electron12-flags.conf" src = ".pam_environment" dst = "~/.pam_environment" +[dotfiles.f_distro] +src = ".distro" +dst = "~/.distro" + [dotfiles.d_wal] src = ".config/wal" dst = "~/.config/wal" @@ -295,7 +299,7 @@ dotfiles = [ [profiles.Mirkwood] include = ["pacman", "terminal", "email", "media", "sway", "gpg"] -dotfiles = ["d_systemd", "d_rofi", "f_librewolf_overrides"] +dotfiles = ["d_systemd", "d_rofi", "f_librewolf_overrides", "f_distro"] [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] @@ -322,6 +326,7 @@ include = ["terminal"] [profiles.ViiruJaTeippi] include = ["terminal"] +dotfiles = ["f_distro"] [profiles.Mirkwood.variables] wayland = true diff --git a/home/.distro b/home/.distro new file mode 100644 index 00000000..a69af21f --- /dev/null +++ b/home/.distro @@ -0,0 +1,2 @@ +Just a file for testing dotdrop distro_id +{@@ distro_id @@} From 15ade99b4ad945f478c1ad49712c962afc3286bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 18:00:46 +0300 Subject: [PATCH 1484/2667] Add file for testing dotdrop distro_id --- config.toml | 7 ++++++- home/.distro | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 home/.distro diff --git a/config.toml b/config.toml index 10e10f14..5ada0d3c 100644 --- a/config.toml +++ b/config.toml @@ -228,6 +228,10 @@ dst = "~/.config/electron12-flags.conf" src = ".pam_environment" dst = "~/.pam_environment" +[dotfiles.f_distro] +src = ".distro" +dst = "~/.distro" + [dotfiles.d_wal] src = ".config/wal" dst = "~/.config/wal" @@ -295,7 +299,7 @@ dotfiles = [ [profiles.Mirkwood] include = ["pacman", "terminal", "email", "media", "sway", "gpg"] -dotfiles = ["d_systemd", "d_rofi", "f_librewolf_overrides"] +dotfiles = ["d_systemd", "d_rofi", "f_librewolf_overrides", "f_distro"] [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] @@ -322,6 +326,7 @@ include = ["terminal"] [profiles.ViiruJaTeippi] include = ["terminal"] +dotfiles = ["f_distro"] [profiles.Mirkwood.variables] wayland = true diff --git a/home/.distro b/home/.distro new file mode 100644 index 00000000..a69af21f --- /dev/null +++ b/home/.distro @@ -0,0 +1,2 @@ +Just a file for testing dotdrop distro_id +{@@ distro_id @@} From f616bcb60e4189cd339f4d95a51ddce97d540768 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 18:01:26 +0300 Subject: [PATCH 1485/2667] Fix template --- home/.distro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.distro b/home/.distro index a69af21f..87530073 100644 --- a/home/.distro +++ b/home/.distro @@ -1,2 +1,2 @@ Just a file for testing dotdrop distro_id -{@@ distro_id @@} +{{@@ distro_id @@}} From 31e61e368992fe0da2a4bc93538a97e2effe06dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 18:01:26 +0300 Subject: [PATCH 1486/2667] Fix template --- home/.distro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.distro b/home/.distro index a69af21f..87530073 100644 --- a/home/.distro +++ b/home/.distro @@ -1,2 +1,2 @@ Just a file for testing dotdrop distro_id -{@@ distro_id @@} +{{@@ distro_id @@}} From b61e35da169ea2cf694c709c1643e7dc9844776c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 18:04:16 +0300 Subject: [PATCH 1487/2667] Update templates from os to distro_id --- home/.config/zsh/02-env.zsh | 4 ++-- home/.config/zsh/03-plugins.zsh | 4 ++-- home/.config/zsh/04-aliases.zsh | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index f60d3c32..5ed9d88e 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -61,12 +61,12 @@ export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR export SYSTEMD_PAGER=less -{%@@ if os == "arch" or os == "ubuntu" @@%} +{%@@ if distro_id == "arch" or distro_id == "ubuntu" @@%} if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" fi gpgconf --launch gpg-agent -{%@@ elif os == "termux" @@%} +{%@@ elif distro_id == "termux" @@%} eval $(okc-ssh-agent) {%@@ endif @@%} diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 259fdb98..ed760627 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -39,10 +39,10 @@ zinit ice lucid atinit'zpcompinit' zinit light zdharma-continuum/fast-syntax-highlighting # use fzf with zsh -{%@@ if os == "arch" @@%} +{%@@ if distro_id == "arch" @@%} source /usr/share/fzf/key-bindings.zsh source /usr/share/fzf/completion.zsh -{%@@ elif os == "ubuntu" @@%} +{%@@ elif distro_id == "ubuntu" @@%} # Source from home directory since ubuntu has # old version of FZF in it's repositories source ~/Software/fzf/shell/key-bindings.zsh diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 1b9b79c6..e2266028 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -13,19 +13,19 @@ forgit_revert_commit=fgrc alias ls='exa' # Enable command not found handler -{%@@ if os == "arch" @@%} +{%@@ if distro_id == "arch" @@%} source /usr/share/doc/pkgfile/command-not-found.zsh -{%@@ elif os == "ubuntu" @@%} +{%@@ elif distro_id == "ubuntu" @@%} source /etc/zsh_command_not_found -{%@@ elif os == "termux" @@%} +{%@@ elif distro_id == "termux" @@%} function command_not_found_handler { $PREFIX/libexec/termux/command-not-found $1 } {%@@ endif @@%} -{%@@ if os == "arch" @@%} +{%@@ if distro_id == "arch" @@%} # search and install/remove packages with fzf -pi() { +pi() { SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}')" if [ -n "$SELECTED_PKGS" ]; then # Append the expanded command to history @@ -33,7 +33,7 @@ pi() { paru -S $(echo $SELECTED_PKGS) fi } -pr() { +pr() { SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}')" if [ -n "$SELECTED_PKGS" ]; then # Append the expanded command to history @@ -43,7 +43,7 @@ pr() { } {%@@ endif @@%} -{%@@ if os == "termux" @@%} +{%@@ if distro_id == "termux" @@%} alias gp='okc-gpg' {%@@ endif @@%} @@ -126,11 +126,11 @@ update() { } packages() { - {%@@ if os == "arch" @@%} + {%@@ if distro_id == "arch" @@%} paru - {%@@ elif os == "ubuntu" @@%} + {%@@ elif distro_id == "ubuntu" @@%} sudo apt update && sudo apt full-upgrade -y && sudo apt autoremove -y && sudo apt autoclean -y - {%@@ elif os == "termux" @@%} + {%@@ elif distro_id == "termux" @@%} pkg update {%@@ endif @@%} } From eee41cbbcd4cd0b7ba0dcfb9998dd2617cbe09d5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 18:04:16 +0300 Subject: [PATCH 1488/2667] Update templates from os to distro_id --- home/.config/zsh/02-env.zsh | 4 ++-- home/.config/zsh/03-plugins.zsh | 4 ++-- home/.config/zsh/04-aliases.zsh | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index f60d3c32..5ed9d88e 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -61,12 +61,12 @@ export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR export SYSTEMD_PAGER=less -{%@@ if os == "arch" or os == "ubuntu" @@%} +{%@@ if distro_id == "arch" or distro_id == "ubuntu" @@%} if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" fi gpgconf --launch gpg-agent -{%@@ elif os == "termux" @@%} +{%@@ elif distro_id == "termux" @@%} eval $(okc-ssh-agent) {%@@ endif @@%} diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 259fdb98..ed760627 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -39,10 +39,10 @@ zinit ice lucid atinit'zpcompinit' zinit light zdharma-continuum/fast-syntax-highlighting # use fzf with zsh -{%@@ if os == "arch" @@%} +{%@@ if distro_id == "arch" @@%} source /usr/share/fzf/key-bindings.zsh source /usr/share/fzf/completion.zsh -{%@@ elif os == "ubuntu" @@%} +{%@@ elif distro_id == "ubuntu" @@%} # Source from home directory since ubuntu has # old version of FZF in it's repositories source ~/Software/fzf/shell/key-bindings.zsh diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 1b9b79c6..e2266028 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -13,19 +13,19 @@ forgit_revert_commit=fgrc alias ls='exa' # Enable command not found handler -{%@@ if os == "arch" @@%} +{%@@ if distro_id == "arch" @@%} source /usr/share/doc/pkgfile/command-not-found.zsh -{%@@ elif os == "ubuntu" @@%} +{%@@ elif distro_id == "ubuntu" @@%} source /etc/zsh_command_not_found -{%@@ elif os == "termux" @@%} +{%@@ elif distro_id == "termux" @@%} function command_not_found_handler { $PREFIX/libexec/termux/command-not-found $1 } {%@@ endif @@%} -{%@@ if os == "arch" @@%} +{%@@ if distro_id == "arch" @@%} # search and install/remove packages with fzf -pi() { +pi() { SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}')" if [ -n "$SELECTED_PKGS" ]; then # Append the expanded command to history @@ -33,7 +33,7 @@ pi() { paru -S $(echo $SELECTED_PKGS) fi } -pr() { +pr() { SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}')" if [ -n "$SELECTED_PKGS" ]; then # Append the expanded command to history @@ -43,7 +43,7 @@ pr() { } {%@@ endif @@%} -{%@@ if os == "termux" @@%} +{%@@ if distro_id == "termux" @@%} alias gp='okc-gpg' {%@@ endif @@%} @@ -126,11 +126,11 @@ update() { } packages() { - {%@@ if os == "arch" @@%} + {%@@ if distro_id == "arch" @@%} paru - {%@@ elif os == "ubuntu" @@%} + {%@@ elif distro_id == "ubuntu" @@%} sudo apt update && sudo apt full-upgrade -y && sudo apt autoremove -y && sudo apt autoclean -y - {%@@ elif os == "termux" @@%} + {%@@ elif distro_id == "termux" @@%} pkg update {%@@ endif @@%} } From fc9cf0dd9c7daa1a8a3cd905d3309dc7c6ba4120 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 19:20:11 +0300 Subject: [PATCH 1489/2667] Zsh: Add ~/.cargo/bin to path --- home/.config/zsh/02-env.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 5ed9d88e..d0947396 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -28,6 +28,9 @@ export USRNAME=$USER # Add ~/.bin to path export PATH="/home/$USER/.bin:$PATH" +# Add ~/.cargo/bin to path +export PATH="/home/$USER/.cargo/bin:$PATH" + # go path export GOPATH=~/.go From b2ee402d048bea574204120cb255d1f3061410bb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 19:20:11 +0300 Subject: [PATCH 1490/2667] Zsh: Add ~/.cargo/bin to path --- home/.config/zsh/02-env.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 5ed9d88e..d0947396 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -28,6 +28,9 @@ export USRNAME=$USER # Add ~/.bin to path export PATH="/home/$USER/.bin:$PATH" +# Add ~/.cargo/bin to path +export PATH="/home/$USER/.cargo/bin:$PATH" + # go path export GOPATH=~/.go From e95ad97abab2d87468c8228d4a8860b28564717f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 19:25:08 +0300 Subject: [PATCH 1491/2667] Nvim: change colorscheme to kanagawa --- home/.config/nvim/lua/plugins/init.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index b204f9d1..0191f5b6 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -20,10 +20,7 @@ require('packer').startup(function() use {'wbthomason/packer.nvim'} -- Colorscheme - use { - 'FunctionalHacker/pywal.nvim', - config = function() require('pywal').setup() end - } + use 'rebelot/kanagawa.nvim' -- Statusline use { From 0105b275edd9f3c9b855babb4f9890eb3422c084 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 19:25:08 +0300 Subject: [PATCH 1492/2667] Nvim: change colorscheme to kanagawa --- home/.config/nvim/lua/plugins/init.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index b204f9d1..0191f5b6 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -20,10 +20,7 @@ require('packer').startup(function() use {'wbthomason/packer.nvim'} -- Colorscheme - use { - 'FunctionalHacker/pywal.nvim', - config = function() require('pywal').setup() end - } + use 'rebelot/kanagawa.nvim' -- Statusline use { From b0609b26187526f6b60ab4f53f6fbff3ad0a9be1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 19:29:13 +0300 Subject: [PATCH 1493/2667] Nvim: fix colorscheme --- home/.config/nvim/lua/plugins/init.lua | 5 ++++- home/.config/nvim/lua/plugins/lualine.lua | 8 +------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 0191f5b6..dcb36c78 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -20,7 +20,10 @@ require('packer').startup(function() use {'wbthomason/packer.nvim'} -- Colorscheme - use 'rebelot/kanagawa.nvim' + use { + 'rebelot/kanagawa.nvim', + config = function() vim.cmd('colorscheme kanagawa') end + } -- Statusline use { diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index b0ab3631..861aa738 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1,7 +1 @@ -return function() - require('lualine').setup { - options = { - theme = 'pywal-nvim' - } - } -end +return function() require('lualine').setup {} end From b77d2e2a678cbec390394264cb50ce7f11e86de1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 19:29:13 +0300 Subject: [PATCH 1494/2667] Nvim: fix colorscheme --- home/.config/nvim/lua/plugins/init.lua | 5 ++++- home/.config/nvim/lua/plugins/lualine.lua | 8 +------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 0191f5b6..dcb36c78 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -20,7 +20,10 @@ require('packer').startup(function() use {'wbthomason/packer.nvim'} -- Colorscheme - use 'rebelot/kanagawa.nvim' + use { + 'rebelot/kanagawa.nvim', + config = function() vim.cmd('colorscheme kanagawa') end + } -- Statusline use { diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index b0ab3631..861aa738 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1,7 +1 @@ -return function() - require('lualine').setup { - options = { - theme = 'pywal-nvim' - } - } -end +return function() require('lualine').setup {} end From 8033e8bbb632abcd86174383eb5cffb57e4c2805 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 19:45:07 +0300 Subject: [PATCH 1495/2667] Use docker compose API instead of docker-compose in dct alias --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index e2266028..66825cfc 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -246,5 +246,5 @@ dct() { return 1 fi - yj -ty < $file_path | docker-compose -f - $@ + yj -ty < $file_path | docker compose -f - $@ } From 49593b02b089dfc10463fcda020ad493c5293d0e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 19:45:07 +0300 Subject: [PATCH 1496/2667] Use docker compose API instead of docker-compose in dct alias --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index e2266028..66825cfc 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -246,5 +246,5 @@ dct() { return 1 fi - yj -ty < $file_path | docker-compose -f - $@ + yj -ty < $file_path | docker compose -f - $@ } From 0d3211e575278cb97c5eb1839b729caa88156a66 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 22:55:09 +0300 Subject: [PATCH 1497/2667] ZSH: Enable thefuck --- home/.config/zsh/04-aliases.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 66825cfc..b87e8f61 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -248,3 +248,6 @@ dct() { yj -ty < $file_path | docker compose -f - $@ } + +# enable https://github.com/nvbn/thefuck +eval $(thefuck --alias) From 527dace26c62addecb0feeab834ca25af0f9a11f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 22:55:09 +0300 Subject: [PATCH 1498/2667] ZSH: Enable thefuck --- home/.config/zsh/04-aliases.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 66825cfc..b87e8f61 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -248,3 +248,6 @@ dct() { yj -ty < $file_path | docker compose -f - $@ } + +# enable https://github.com/nvbn/thefuck +eval $(thefuck --alias) From 69917f148a6603f8b178e1dd166a3ab591c3a7fa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:00:09 +0300 Subject: [PATCH 1499/2667] FZF: fd strip cwd prefix --- home/.config/zsh/02-env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index d0947396..191482d1 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -35,7 +35,7 @@ export PATH="/home/$USER/.cargo/bin:$PATH" export GOPATH=~/.go # fzf settings -export FD_COMMAND='fd -HLt' +export FD_COMMAND='fd --strip-cwd-prefix -HLt' export FZF_DEFAULT_COMMAND="$FD_COMMAND f" export FZF_ALT_C_COMMAND="$FD_COMMAND d" export FZF_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' From 9fd82c7fbfb108119e055098ad64ff82e7d80740 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:00:09 +0300 Subject: [PATCH 1500/2667] FZF: fd strip cwd prefix --- home/.config/zsh/02-env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index d0947396..191482d1 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -35,7 +35,7 @@ export PATH="/home/$USER/.cargo/bin:$PATH" export GOPATH=~/.go # fzf settings -export FD_COMMAND='fd -HLt' +export FD_COMMAND='fd --strip-cwd-prefix -HLt' export FZF_DEFAULT_COMMAND="$FD_COMMAND f" export FZF_ALT_C_COMMAND="$FD_COMMAND d" export FZF_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' From f869d15f7b6d946efa56f7e9752300b733e04e48 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:03:42 +0300 Subject: [PATCH 1501/2667] Zsh: move thefuck to plugins.zsh and fix sourcing fzf on ubuntu --- home/.config/zsh/03-plugins.zsh | 10 +++------- home/.config/zsh/04-aliases.zsh | 3 --- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index ed760627..091e4fee 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -39,12 +39,8 @@ zinit ice lucid atinit'zpcompinit' zinit light zdharma-continuum/fast-syntax-highlighting # use fzf with zsh -{%@@ if distro_id == "arch" @@%} source /usr/share/fzf/key-bindings.zsh source /usr/share/fzf/completion.zsh -{%@@ elif distro_id == "ubuntu" @@%} -# Source from home directory since ubuntu has -# old version of FZF in it's repositories -source ~/Software/fzf/shell/key-bindings.zsh -source ~/Software/fzf/shell/completion.zsh -{%@@ endif @@%} + +# enable https://github.com/nvbn/thefuck +eval $(thefuck --alias) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index b87e8f61..66825cfc 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -248,6 +248,3 @@ dct() { yj -ty < $file_path | docker compose -f - $@ } - -# enable https://github.com/nvbn/thefuck -eval $(thefuck --alias) From 729a914fbd72ae08c741694a339f84a056b84064 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:03:42 +0300 Subject: [PATCH 1502/2667] Zsh: move thefuck to plugins.zsh and fix sourcing fzf on ubuntu --- home/.config/zsh/03-plugins.zsh | 10 +++------- home/.config/zsh/04-aliases.zsh | 3 --- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index ed760627..091e4fee 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -39,12 +39,8 @@ zinit ice lucid atinit'zpcompinit' zinit light zdharma-continuum/fast-syntax-highlighting # use fzf with zsh -{%@@ if distro_id == "arch" @@%} source /usr/share/fzf/key-bindings.zsh source /usr/share/fzf/completion.zsh -{%@@ elif distro_id == "ubuntu" @@%} -# Source from home directory since ubuntu has -# old version of FZF in it's repositories -source ~/Software/fzf/shell/key-bindings.zsh -source ~/Software/fzf/shell/completion.zsh -{%@@ endif @@%} + +# enable https://github.com/nvbn/thefuck +eval $(thefuck --alias) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index b87e8f61..66825cfc 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -248,6 +248,3 @@ dct() { yj -ty < $file_path | docker compose -f - $@ } - -# enable https://github.com/nvbn/thefuck -eval $(thefuck --alias) From 0303678c40305613365be50d02e0fa3f82453677 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:32:21 +0300 Subject: [PATCH 1503/2667] ZSH: Add support for pi alias No gpg signature this time, yubikey is refusing to work --- home/.config/zsh/04-aliases.zsh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 66825cfc..fddbbb5c 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -23,14 +23,25 @@ function command_not_found_handler { } {%@@ endif @@%} -{%@@ if distro_id == "arch" @@%} # search and install/remove packages with fzf pi() { + {%@@ if distro_id == "arch" @@%} SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}')" + {%@@ else @@%} + SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show {1}')" + {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then + {%@@ if distro_id == "arch" @@%} + cmd="paru -S $(echo $SELECTED_PKGS)" + {%@@ else @@%} + cmd="sudo apt install $(echo $SELECTED_PKGS)" + {%@@ endif @@%} + # Append the expanded command to history - print -s "paru -S $(echo $SELECTED_PKGS)" - paru -S $(echo $SELECTED_PKGS) + print -s "$cmd" + + # Finally, excecute the command + eval "$cmd" fi } pr() { @@ -41,7 +52,6 @@ pr() { paru -Rns $(echo $SELECTED_PKGS) fi } -{%@@ endif @@%} {%@@ if distro_id == "termux" @@%} alias gp='okc-gpg' From 2c7dd4af6fbef2a18a92c1629d2298e8b725fb0c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:32:21 +0300 Subject: [PATCH 1504/2667] ZSH: Add support for pi alias No gpg signature this time, yubikey is refusing to work --- home/.config/zsh/04-aliases.zsh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 66825cfc..fddbbb5c 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -23,14 +23,25 @@ function command_not_found_handler { } {%@@ endif @@%} -{%@@ if distro_id == "arch" @@%} # search and install/remove packages with fzf pi() { + {%@@ if distro_id == "arch" @@%} SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}')" + {%@@ else @@%} + SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show {1}')" + {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then + {%@@ if distro_id == "arch" @@%} + cmd="paru -S $(echo $SELECTED_PKGS)" + {%@@ else @@%} + cmd="sudo apt install $(echo $SELECTED_PKGS)" + {%@@ endif @@%} + # Append the expanded command to history - print -s "paru -S $(echo $SELECTED_PKGS)" - paru -S $(echo $SELECTED_PKGS) + print -s "$cmd" + + # Finally, excecute the command + eval "$cmd" fi } pr() { @@ -41,7 +52,6 @@ pr() { paru -Rns $(echo $SELECTED_PKGS) fi } -{%@@ endif @@%} {%@@ if distro_id == "termux" @@%} alias gp='okc-gpg' From e6b93e432d46e607b18282d78115f085dfd42876 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:34:44 +0300 Subject: [PATCH 1505/2667] Stop apt complaining --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index fddbbb5c..614e9471 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -28,7 +28,7 @@ pi() { {%@@ if distro_id == "arch" @@%} SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}')" {%@@ else @@%} - SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show {1}')" + SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show 2>/dev/null {1}')" {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} From d11e82217c6a4ea5acbb65c253927e08de762bce Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:34:44 +0300 Subject: [PATCH 1506/2667] Stop apt complaining --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index fddbbb5c..614e9471 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -28,7 +28,7 @@ pi() { {%@@ if distro_id == "arch" @@%} SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}')" {%@@ else @@%} - SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show {1}')" + SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show 2>/dev/null {1}')" {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} From 1c3421e5726b781abfbfd8af9292b128f667194e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:37:20 +0300 Subject: [PATCH 1507/2667] ZSH: Add apt support for pr alias --- home/.config/zsh/04-aliases.zsh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 614e9471..c638ab49 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -44,12 +44,25 @@ pi() { eval "$cmd" fi } + pr() { + {%@@ if distro_id == "arch" @@%} SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}')" + {%@@ else @@%} + SELECTED_PKGS="$(apt list --installed 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Remove packages' -m --preview 'apt show 2>/dev/null {1}')" + {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then + {%@@ if distro_id == "arch" @@%} + cmd="paru -Rns $(echo $SELECTED_PKGS)" + {%@@ else @@%} + cmd="sudo apt remove $(echo $SELECTED_PKGS)" + {%@@ endif @@%} + # Append the expanded command to history - print -s "paru -Rns $(echo $SELECTED_PKGS)" - paru -Rns $(echo $SELECTED_PKGS) + print -s "$cmd" + + # Finally, excecute the command + eval "$cmd" fi } From 14da0fcf23cf0b743733a1ca2264b2945bb27638 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:37:20 +0300 Subject: [PATCH 1508/2667] ZSH: Add apt support for pr alias --- home/.config/zsh/04-aliases.zsh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 614e9471..c638ab49 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -44,12 +44,25 @@ pi() { eval "$cmd" fi } + pr() { + {%@@ if distro_id == "arch" @@%} SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}')" + {%@@ else @@%} + SELECTED_PKGS="$(apt list --installed 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Remove packages' -m --preview 'apt show 2>/dev/null {1}')" + {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then + {%@@ if distro_id == "arch" @@%} + cmd="paru -Rns $(echo $SELECTED_PKGS)" + {%@@ else @@%} + cmd="sudo apt remove $(echo $SELECTED_PKGS)" + {%@@ endif @@%} + # Append the expanded command to history - print -s "paru -Rns $(echo $SELECTED_PKGS)" - paru -Rns $(echo $SELECTED_PKGS) + print -s "$cmd" + + # Finally, excecute the command + eval "$cmd" fi } From 3b3a0216d688c06fba48915279d5667c54daf21c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:47:47 +0300 Subject: [PATCH 1509/2667] ZSH: Strip newline in pi/pr alias --- home/.config/zsh/04-aliases.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index c638ab49..c2a2e115 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -26,7 +26,7 @@ function command_not_found_handler { # search and install/remove packages with fzf pi() { {%@@ if distro_id == "arch" @@%} - SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}')" + SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" {%@@ else @@%} SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show 2>/dev/null {1}')" {%@@ endif @@%} @@ -47,7 +47,7 @@ pi() { pr() { {%@@ if distro_id == "arch" @@%} - SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}')" + SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" {%@@ else @@%} SELECTED_PKGS="$(apt list --installed 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Remove packages' -m --preview 'apt show 2>/dev/null {1}')" {%@@ endif @@%} From 6cc2fa1152689773d5cbbdb0659d90966d7419ae Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:47:47 +0300 Subject: [PATCH 1510/2667] ZSH: Strip newline in pi/pr alias --- home/.config/zsh/04-aliases.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index c638ab49..c2a2e115 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -26,7 +26,7 @@ function command_not_found_handler { # search and install/remove packages with fzf pi() { {%@@ if distro_id == "arch" @@%} - SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}')" + SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" {%@@ else @@%} SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show 2>/dev/null {1}')" {%@@ endif @@%} @@ -47,7 +47,7 @@ pi() { pr() { {%@@ if distro_id == "arch" @@%} - SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}')" + SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" {%@@ else @@%} SELECTED_PKGS="$(apt list --installed 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Remove packages' -m --preview 'apt show 2>/dev/null {1}')" {%@@ endif @@%} From 0b8141f909e5d21f21171df89c068047025a2bde Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:49:40 +0300 Subject: [PATCH 1511/2667] ZSH: Strip newline in pi/pr alias in apt too --- home/.config/zsh/04-aliases.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index c2a2e115..8945bc43 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -28,7 +28,7 @@ pi() { {%@@ if distro_id == "arch" @@%} SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" {%@@ else @@%} - SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show 2>/dev/null {1}')" + SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show 2>/dev/null {1}' | tr '\n' ' ')" {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} @@ -49,7 +49,7 @@ pr() { {%@@ if distro_id == "arch" @@%} SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" {%@@ else @@%} - SELECTED_PKGS="$(apt list --installed 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Remove packages' -m --preview 'apt show 2>/dev/null {1}')" + SELECTED_PKGS="$(apt list --installed 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Remove packages' -m --preview 'apt show 2>/dev/null {1}' | tr '\n' ' ')" {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} From 2743c68c726715789d6f74e3a7e252e68e65c1c7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:49:40 +0300 Subject: [PATCH 1512/2667] ZSH: Strip newline in pi/pr alias in apt too --- home/.config/zsh/04-aliases.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index c2a2e115..8945bc43 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -28,7 +28,7 @@ pi() { {%@@ if distro_id == "arch" @@%} SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" {%@@ else @@%} - SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show 2>/dev/null {1}')" + SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show 2>/dev/null {1}' | tr '\n' ' ')" {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} @@ -49,7 +49,7 @@ pr() { {%@@ if distro_id == "arch" @@%} SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" {%@@ else @@%} - SELECTED_PKGS="$(apt list --installed 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Remove packages' -m --preview 'apt show 2>/dev/null {1}')" + SELECTED_PKGS="$(apt list --installed 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Remove packages' -m --preview 'apt show 2>/dev/null {1}' | tr '\n' ' ')" {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} From 54f42de28355f41d9ca226ced724de7ab665b8eb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:56:18 +0300 Subject: [PATCH 1513/2667] Use ~/.local/bin instead of ~/.bin as local bin directory --- home/.config/zsh/02-env.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 191482d1..62a3c99b 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -25,8 +25,8 @@ setopt no_complete_aliases # Variable to pass to sdotdrop to get current user export USRNAME=$USER -# Add ~/.bin to path -export PATH="/home/$USER/.bin:$PATH" +# Add ~/.local/bin to path +export PATH="/home/$USER/.local/bin:$PATH" # Add ~/.cargo/bin to path export PATH="/home/$USER/.cargo/bin:$PATH" From cd5e783ccfd46e2f555fbd08b7a203be9553a844 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:56:18 +0300 Subject: [PATCH 1514/2667] Use ~/.local/bin instead of ~/.bin as local bin directory --- home/.config/zsh/02-env.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 191482d1..62a3c99b 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -25,8 +25,8 @@ setopt no_complete_aliases # Variable to pass to sdotdrop to get current user export USRNAME=$USER -# Add ~/.bin to path -export PATH="/home/$USER/.bin:$PATH" +# Add ~/.local/bin to path +export PATH="/home/$USER/.local/bin:$PATH" # Add ~/.cargo/bin to path export PATH="/home/$USER/.cargo/bin:$PATH" From 2d102a105de5f1c4475c1c4f1e7bae632b505b5c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:04:09 +0300 Subject: [PATCH 1515/2667] Fix $PATH --- home/.config/zsh/02-env.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 62a3c99b..5fca2d9b 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -26,10 +26,10 @@ setopt no_complete_aliases export USRNAME=$USER # Add ~/.local/bin to path -export PATH="/home/$USER/.local/bin:$PATH" +export PATH="$HOME/.local/bin:$PATH" # Add ~/.cargo/bin to path -export PATH="/home/$USER/.cargo/bin:$PATH" +export PATH="$HOME/.cargo/bin:$PATH" # go path export GOPATH=~/.go From 185260c0b887adae8c6626e987fa2d7e4ecc5fda Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:04:09 +0300 Subject: [PATCH 1516/2667] Fix $PATH --- home/.config/zsh/02-env.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 62a3c99b..5fca2d9b 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -26,10 +26,10 @@ setopt no_complete_aliases export USRNAME=$USER # Add ~/.local/bin to path -export PATH="/home/$USER/.local/bin:$PATH" +export PATH="$HOME/.local/bin:$PATH" # Add ~/.cargo/bin to path -export PATH="/home/$USER/.cargo/bin:$PATH" +export PATH="$HOME/.cargo/bin:$PATH" # go path export GOPATH=~/.go From 1075a60db1b42c4b8698ccf7d608f349f243d2c0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:08:44 +0300 Subject: [PATCH 1517/2667] Fixes for termux --- config.toml | 3 +++ home/.config/zsh/04-aliases.zsh | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/config.toml b/config.toml index 5ada0d3c..ab7d739b 100644 --- a/config.toml +++ b/config.toml @@ -328,6 +328,9 @@ include = ["terminal"] include = ["terminal"] dotfiles = ["f_distro"] +[profiles.Isengard.variables] +distro_id = "termux" + [profiles.Mirkwood.variables] wayland = true diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 8945bc43..ef1c0c97 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -33,8 +33,10 @@ pi() { if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} cmd="paru -S $(echo $SELECTED_PKGS)" - {%@@ else @@%} + {%@@ elif distro_id == "ubuntu" @@%} cmd="sudo apt install $(echo $SELECTED_PKGS)" + {%@@ elif distro_id == "termux" @@%} + cmd="apt install $(echo $SELECTED_PKGS)" {%@@ endif @@%} # Append the expanded command to history @@ -54,8 +56,10 @@ pr() { if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} cmd="paru -Rns $(echo $SELECTED_PKGS)" - {%@@ else @@%} + {%@@ elif distro_id == "ubuntu" @@%} cmd="sudo apt remove $(echo $SELECTED_PKGS)" + {%@@ elif distro_id == "termux" @@%} + cmd="apt remove $(echo $SELECTED_PKGS)" {%@@ endif @@%} # Append the expanded command to history From d9e491c38208514869ea0c5cbd96b9f82fd3d366 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:08:44 +0300 Subject: [PATCH 1518/2667] Fixes for termux --- config.toml | 3 +++ home/.config/zsh/04-aliases.zsh | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/config.toml b/config.toml index 5ada0d3c..ab7d739b 100644 --- a/config.toml +++ b/config.toml @@ -328,6 +328,9 @@ include = ["terminal"] include = ["terminal"] dotfiles = ["f_distro"] +[profiles.Isengard.variables] +distro_id = "termux" + [profiles.Mirkwood.variables] wayland = true diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 8945bc43..ef1c0c97 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -33,8 +33,10 @@ pi() { if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} cmd="paru -S $(echo $SELECTED_PKGS)" - {%@@ else @@%} + {%@@ elif distro_id == "ubuntu" @@%} cmd="sudo apt install $(echo $SELECTED_PKGS)" + {%@@ elif distro_id == "termux" @@%} + cmd="apt install $(echo $SELECTED_PKGS)" {%@@ endif @@%} # Append the expanded command to history @@ -54,8 +56,10 @@ pr() { if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} cmd="paru -Rns $(echo $SELECTED_PKGS)" - {%@@ else @@%} + {%@@ elif distro_id == "ubuntu" @@%} cmd="sudo apt remove $(echo $SELECTED_PKGS)" + {%@@ elif distro_id == "termux" @@%} + cmd="apt remove $(echo $SELECTED_PKGS)" {%@@ endif @@%} # Append the expanded command to history From 319835e5c45056699dcd38d199b48a4467006eef Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:18:06 +0300 Subject: [PATCH 1519/2667] Debugging --- config.toml | 1 + home/distro | 1 + 2 files changed, 2 insertions(+) create mode 100644 home/distro diff --git a/config.toml b/config.toml index ab7d739b..e12cc733 100644 --- a/config.toml +++ b/config.toml @@ -314,6 +314,7 @@ dotfiles = ["f_librewolf_overrides"] [profiles.Isengard] include = ["terminal"] +dotfiles = ["f_distro"] [profiles.Edoras] include = ["terminal"] diff --git a/home/distro b/home/distro new file mode 100644 index 00000000..2312f54e --- /dev/null +++ b/home/distro @@ -0,0 +1 @@ +{{@@ distro_id @@}} From 0f468a7af8944f1efa338b95416dc55bb12fcb0a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:18:06 +0300 Subject: [PATCH 1520/2667] Debugging --- config.toml | 1 + home/distro | 1 + 2 files changed, 2 insertions(+) create mode 100644 home/distro diff --git a/config.toml b/config.toml index ab7d739b..e12cc733 100644 --- a/config.toml +++ b/config.toml @@ -314,6 +314,7 @@ dotfiles = ["f_librewolf_overrides"] [profiles.Isengard] include = ["terminal"] +dotfiles = ["f_distro"] [profiles.Edoras] include = ["terminal"] diff --git a/home/distro b/home/distro new file mode 100644 index 00000000..2312f54e --- /dev/null +++ b/home/distro @@ -0,0 +1 @@ +{{@@ distro_id @@}} From 46fae1061ec9e6ded95a239ae454197b7aaacff1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:18:52 +0300 Subject: [PATCH 1521/2667] Remove unneeded file --- home/distro | 1 - 1 file changed, 1 deletion(-) delete mode 100644 home/distro diff --git a/home/distro b/home/distro deleted file mode 100644 index 2312f54e..00000000 --- a/home/distro +++ /dev/null @@ -1 +0,0 @@ -{{@@ distro_id @@}} From 5b847d75ee971965dcf678b1ef6672aeb1752af9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:18:52 +0300 Subject: [PATCH 1522/2667] Remove unneeded file --- home/distro | 1 - 1 file changed, 1 deletion(-) delete mode 100644 home/distro diff --git a/home/distro b/home/distro deleted file mode 100644 index 2312f54e..00000000 --- a/home/distro +++ /dev/null @@ -1 +0,0 @@ -{{@@ distro_id @@}} From 18b365205d6f862e558d2187030442c4a1739c42 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:23:08 +0300 Subject: [PATCH 1523/2667] Add fzf zsh plugins for termux --- home/.config/zsh/03-plugins.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 091e4fee..a380cac4 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -39,6 +39,10 @@ zinit ice lucid atinit'zpcompinit' zinit light zdharma-continuum/fast-syntax-highlighting # use fzf with zsh +{%@@ if distro_id == "termux" @@%} +source $PREFIX/share/fzf/key-bindings.zsh +source $PREFIX/share/fzf/completion.zsh +{%@@ else @@%} source /usr/share/fzf/key-bindings.zsh source /usr/share/fzf/completion.zsh From 795489715250d8d92348b6d34c26dfd5405a78c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:23:08 +0300 Subject: [PATCH 1524/2667] Add fzf zsh plugins for termux --- home/.config/zsh/03-plugins.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 091e4fee..a380cac4 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -39,6 +39,10 @@ zinit ice lucid atinit'zpcompinit' zinit light zdharma-continuum/fast-syntax-highlighting # use fzf with zsh +{%@@ if distro_id == "termux" @@%} +source $PREFIX/share/fzf/key-bindings.zsh +source $PREFIX/share/fzf/completion.zsh +{%@@ else @@%} source /usr/share/fzf/key-bindings.zsh source /usr/share/fzf/completion.zsh From ac6de141bead89a128c08cc53ac33d79cf7f4547 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:24:02 +0300 Subject: [PATCH 1525/2667] Add missing endif to template --- home/.config/zsh/03-plugins.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index a380cac4..9493817f 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -45,6 +45,7 @@ source $PREFIX/share/fzf/completion.zsh {%@@ else @@%} source /usr/share/fzf/key-bindings.zsh source /usr/share/fzf/completion.zsh +{%@@ endif @@%} # enable https://github.com/nvbn/thefuck eval $(thefuck --alias) From 59adfdd89e3fb9e67b1d58468baab4094e6e8b0d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:24:02 +0300 Subject: [PATCH 1526/2667] Add missing endif to template --- home/.config/zsh/03-plugins.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index a380cac4..9493817f 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -45,6 +45,7 @@ source $PREFIX/share/fzf/completion.zsh {%@@ else @@%} source /usr/share/fzf/key-bindings.zsh source /usr/share/fzf/completion.zsh +{%@@ endif @@%} # enable https://github.com/nvbn/thefuck eval $(thefuck --alias) From d45ad5bbab61f99add75c9a8e5a923fd76439541 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 10:05:39 +0300 Subject: [PATCH 1527/2667] FZF: only use fd --strip-cwd-prefix for files --- home/.config/zsh/02-env.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 5fca2d9b..8bd226e5 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -35,8 +35,8 @@ export PATH="$HOME/.cargo/bin:$PATH" export GOPATH=~/.go # fzf settings -export FD_COMMAND='fd --strip-cwd-prefix -HLt' -export FZF_DEFAULT_COMMAND="$FD_COMMAND f" +export FD_COMMAND='fd -HLt' +export FZF_DEFAULT_COMMAND="$FD_COMMAND f --strip-cwd-prefix" export FZF_ALT_C_COMMAND="$FD_COMMAND d" export FZF_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' From f3f2931d57d782df18fd61d61b05106466edf064 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 10:05:39 +0300 Subject: [PATCH 1528/2667] FZF: only use fd --strip-cwd-prefix for files --- home/.config/zsh/02-env.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 5fca2d9b..8bd226e5 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -35,8 +35,8 @@ export PATH="$HOME/.cargo/bin:$PATH" export GOPATH=~/.go # fzf settings -export FD_COMMAND='fd --strip-cwd-prefix -HLt' -export FZF_DEFAULT_COMMAND="$FD_COMMAND f" +export FD_COMMAND='fd -HLt' +export FZF_DEFAULT_COMMAND="$FD_COMMAND f --strip-cwd-prefix" export FZF_ALT_C_COMMAND="$FD_COMMAND d" export FZF_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' From d22d15e38aba67102dda48618f5eb9b730283348 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Sep 2022 18:07:59 +0300 Subject: [PATCH 1529/2667] FZF/fd: use --strip-cwd-prefix only on ctrl+t command --- home/.config/zsh/02-env.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 8bd226e5..aceb5750 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -36,11 +36,11 @@ export GOPATH=~/.go # fzf settings export FD_COMMAND='fd -HLt' -export FZF_DEFAULT_COMMAND="$FD_COMMAND f --strip-cwd-prefix" +export FZF_DEFAULT_COMMAND="$FD_COMMAND f" export FZF_ALT_C_COMMAND="$FD_COMMAND d" export FZF_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' -export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" +export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND --strip-cwd-prefix" export FZF_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' _fzf_compgen_path() { resultcmd="$FZF_DEFAULT_COMMAND . $1" From d3f661c5790dce1d50d1b113fd98dbb709bde83b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Sep 2022 18:07:59 +0300 Subject: [PATCH 1530/2667] FZF/fd: use --strip-cwd-prefix only on ctrl+t command --- home/.config/zsh/02-env.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 8bd226e5..aceb5750 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -36,11 +36,11 @@ export GOPATH=~/.go # fzf settings export FD_COMMAND='fd -HLt' -export FZF_DEFAULT_COMMAND="$FD_COMMAND f --strip-cwd-prefix" +export FZF_DEFAULT_COMMAND="$FD_COMMAND f" export FZF_ALT_C_COMMAND="$FD_COMMAND d" export FZF_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' -export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" +export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND --strip-cwd-prefix" export FZF_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' _fzf_compgen_path() { resultcmd="$FZF_DEFAULT_COMMAND . $1" From 02038543c783fa462a8a9f599a865c342e48be90 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Sep 2022 18:15:18 +0300 Subject: [PATCH 1531/2667] Pacserve: enable avahi --- root/etc/pacserve/pacserve.service.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/pacserve/pacserve.service.conf b/root/etc/pacserve/pacserve.service.conf index 262805ff..a983b4c5 100755 --- a/root/etc/pacserve/pacserve.service.conf +++ b/root/etc/pacserve/pacserve.service.conf @@ -1 +1 @@ -PACSERVE_ARGS="--multicast" +PACSERVE_ARGS="--multicast --avahi" From f390a33dd8d9ec2b72b7bc935f08e22ef4036b67 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Sep 2022 18:15:18 +0300 Subject: [PATCH 1532/2667] Pacserve: enable avahi --- root/etc/pacserve/pacserve.service.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/pacserve/pacserve.service.conf b/root/etc/pacserve/pacserve.service.conf index 262805ff..a983b4c5 100755 --- a/root/etc/pacserve/pacserve.service.conf +++ b/root/etc/pacserve/pacserve.service.conf @@ -1 +1 @@ -PACSERVE_ARGS="--multicast" +PACSERVE_ARGS="--multicast --avahi" From 8f30a5bf4d413e9f2301be68618719798c9c329f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Sep 2022 18:16:49 +0300 Subject: [PATCH 1533/2667] Remove obsolete files from config-root --- config-root.toml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config-root.toml b/config-root.toml index 3c52c220..867775aa 100644 --- a/config-root.toml +++ b/config-root.toml @@ -149,10 +149,6 @@ dst = "/etc/mkinitcpio.d" src = "etc/kernel/cmdline" dst = "/etc/kernel/cmdline" -[dotfiles."f_loader.conf"] -src = "boot/loader/loader.conf" -dst = "/boot/loader/loader.conf" - [dotfiles."f_timesyncd.conf"] src = "etc/systemd/timesyncd.conf" dst = "/etc/systemd/timesyncd.conf" @@ -191,7 +187,6 @@ dotfiles = [ "f_cpupower", "d_mkinitcpio.d", "f_cmdline", - "f_loader.conf", "f_timesyncd.conf", ] include = ["Locale", "Pacman", "Network"] From 381e0af92d26034e38a6808607e85b6d90571c34 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Sep 2022 18:16:49 +0300 Subject: [PATCH 1534/2667] Remove obsolete files from config-root --- config-root.toml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config-root.toml b/config-root.toml index 3c52c220..867775aa 100644 --- a/config-root.toml +++ b/config-root.toml @@ -149,10 +149,6 @@ dst = "/etc/mkinitcpio.d" src = "etc/kernel/cmdline" dst = "/etc/kernel/cmdline" -[dotfiles."f_loader.conf"] -src = "boot/loader/loader.conf" -dst = "/boot/loader/loader.conf" - [dotfiles."f_timesyncd.conf"] src = "etc/systemd/timesyncd.conf" dst = "/etc/systemd/timesyncd.conf" @@ -191,7 +187,6 @@ dotfiles = [ "f_cpupower", "d_mkinitcpio.d", "f_cmdline", - "f_loader.conf", "f_timesyncd.conf", ] include = ["Locale", "Pacman", "Network"] From 59fbdada8f198c36b23c08e59a1c72b243c6dc14 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Sep 2022 13:14:33 +0300 Subject: [PATCH 1535/2667] Librewolf: enable WebGL --- home/.librewolf/librewolf.overrides.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.librewolf/librewolf.overrides.cfg b/home/.librewolf/librewolf.overrides.cfg index 11d4ccd9..b05aac1e 100644 --- a/home/.librewolf/librewolf.overrides.cfg +++ b/home/.librewolf/librewolf.overrides.cfg @@ -36,7 +36,7 @@ pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", false); pref("browser.safebrowsing.downloads.enabled", true); // Disable WebGL -pref("webgl.disabled", true); +pref("webgl.disabled", false); // Enable Firefox Sync pref("identity.fxaccounts.enabled", true); From a6db0941d39f512ff14d1041c7f50391682e87de Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Sep 2022 13:14:33 +0300 Subject: [PATCH 1536/2667] Librewolf: enable WebGL --- home/.librewolf/librewolf.overrides.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.librewolf/librewolf.overrides.cfg b/home/.librewolf/librewolf.overrides.cfg index 11d4ccd9..b05aac1e 100644 --- a/home/.librewolf/librewolf.overrides.cfg +++ b/home/.librewolf/librewolf.overrides.cfg @@ -36,7 +36,7 @@ pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", false); pref("browser.safebrowsing.downloads.enabled", true); // Disable WebGL -pref("webgl.disabled", true); +pref("webgl.disabled", false); // Enable Firefox Sync pref("identity.fxaccounts.enabled", true); From 001216f9151763da4480f872bad07d27a4f435b8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Sep 2022 17:01:18 +0300 Subject: [PATCH 1537/2667] Remove syncthing from nextcloud --- docker/nextcloud/docker-compose.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 62362212..f9c6ec61 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -32,7 +32,6 @@ networks = ["nextcloud", "postgres", "proxy"] volumes = [ "/docker/nextcloud:/var/www/html:z", "/mnt/Storage/Nextcloud:/var/www/html/data", - "/mnt/Storage/Syncthing:/Syncthing", "/mnt/Storage/Media/Music:/Music", "/etc/localtime:/etc/localtime:ro", ] From f24dfb6f2d204531f242a61d728e4f20f44e3648 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Sep 2022 17:01:18 +0300 Subject: [PATCH 1538/2667] Remove syncthing from nextcloud --- docker/nextcloud/docker-compose.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 62362212..f9c6ec61 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -32,7 +32,6 @@ networks = ["nextcloud", "postgres", "proxy"] volumes = [ "/docker/nextcloud:/var/www/html:z", "/mnt/Storage/Nextcloud:/var/www/html/data", - "/mnt/Storage/Syncthing:/Syncthing", "/mnt/Storage/Media/Music:/Music", "/etc/localtime:/etc/localtime:ro", ] From 55ccf7a11157fa56a6221c504d36a32ddbee01fe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Sep 2022 17:04:54 +0300 Subject: [PATCH 1539/2667] Remove music mount from Nextcloud --- docker/nextcloud/docker-compose.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index f9c6ec61..9e42c560 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -32,7 +32,6 @@ networks = ["nextcloud", "postgres", "proxy"] volumes = [ "/docker/nextcloud:/var/www/html:z", "/mnt/Storage/Nextcloud:/var/www/html/data", - "/mnt/Storage/Media/Music:/Music", "/etc/localtime:/etc/localtime:ro", ] environment = [ From caa7848cb3fe514a55cc51fd597f006272db41e6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Sep 2022 17:04:54 +0300 Subject: [PATCH 1540/2667] Remove music mount from Nextcloud --- docker/nextcloud/docker-compose.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index f9c6ec61..9e42c560 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -32,7 +32,6 @@ networks = ["nextcloud", "postgres", "proxy"] volumes = [ "/docker/nextcloud:/var/www/html:z", "/mnt/Storage/Nextcloud:/var/www/html/data", - "/mnt/Storage/Media/Music:/Music", "/etc/localtime:/etc/localtime:ro", ] environment = [ From f4a9b4fa925c781f4a3c6825212bc9acd784387f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 18:10:59 +0300 Subject: [PATCH 1541/2667] Add jellyfin mount for Music --- docker/jellyfin/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 0eb2e291..0b5a10c4 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -11,6 +11,7 @@ volumes = [ "/docker/jellyfin/config:/config", "/docker/jellyfin/cache:/cache", "/mnt/Storage/Media:/media", + "/mnt/Storage/Nextcloud/FunctionalHacker/files/Media/Music:/media/Music", "/etc/localtime:/etc/localtime:ro", ] devices = [ From 1635e9fc36bab329f55840841b6e6067cb0ab632 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 18:10:59 +0300 Subject: [PATCH 1542/2667] Add jellyfin mount for Music --- docker/jellyfin/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 0eb2e291..0b5a10c4 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -11,6 +11,7 @@ volumes = [ "/docker/jellyfin/config:/config", "/docker/jellyfin/cache:/cache", "/mnt/Storage/Media:/media", + "/mnt/Storage/Nextcloud/FunctionalHacker/files/Media/Music:/media/Music", "/etc/localtime:/etc/localtime:ro", ] devices = [ From 9f348fb7c581c491bf28fb4457bb2754f855ef7d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:04:41 +0300 Subject: [PATCH 1543/2667] Add collabora for nextcloud --- docker/nextcloud/docker-compose.toml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 9e42c560..70addc83 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -69,7 +69,29 @@ command = [ "--static-auth-secret=${STATIC_AUTH_SECRET}", ] -[networks] +[services.collabora] +image = "collabora/code" +restart = "unless-stopped" +env_file = ".env" +environment = [ + "password=${COLLABORA_PASSWORD}", + "username=${COLLABORA_USERNAME}", + "domain=collabora.korhonen.cc", + "DONT_GEN_SSL_CERT=yes", +] +networks = ["proxy"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.collabora-redirect.entrypoints=http", + "traefik.http.routers.collabora-redirect.rule=Host(`collabora.korhonen.cc`)", + "traefik.http.routers.collabora-redirect.middlewares=http2https@file", + "traefik.http.routers.collabora.entrypoints=https", + "traefik.http.routers.collabora.rule=Host(`collabora.korhonen.cc`)", + "traefik.http.routers.collabora.service=collabora", + "traefik.http.routers.collabora.middlewares=secHeaders@file,compress@file", + "traefik.docker.network=proxy", + "traefik.http.services.collabora.loadbalancer.server.port=9980", +] [networks.nextcloud] external = false From 60303b00495da7a7195fd5a42f7aeeb07d3d6a67 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:04:41 +0300 Subject: [PATCH 1544/2667] Add collabora for nextcloud --- docker/nextcloud/docker-compose.toml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 9e42c560..70addc83 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -69,7 +69,29 @@ command = [ "--static-auth-secret=${STATIC_AUTH_SECRET}", ] -[networks] +[services.collabora] +image = "collabora/code" +restart = "unless-stopped" +env_file = ".env" +environment = [ + "password=${COLLABORA_PASSWORD}", + "username=${COLLABORA_USERNAME}", + "domain=collabora.korhonen.cc", + "DONT_GEN_SSL_CERT=yes", +] +networks = ["proxy"] +labels = [ + "traefik.enable=true", + "traefik.http.routers.collabora-redirect.entrypoints=http", + "traefik.http.routers.collabora-redirect.rule=Host(`collabora.korhonen.cc`)", + "traefik.http.routers.collabora-redirect.middlewares=http2https@file", + "traefik.http.routers.collabora.entrypoints=https", + "traefik.http.routers.collabora.rule=Host(`collabora.korhonen.cc`)", + "traefik.http.routers.collabora.service=collabora", + "traefik.http.routers.collabora.middlewares=secHeaders@file,compress@file", + "traefik.docker.network=proxy", + "traefik.http.services.collabora.loadbalancer.server.port=9980", +] [networks.nextcloud] external = false From 00668c6d52b06cc64baa56fcb6ba70f2576da551 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:07:23 +0300 Subject: [PATCH 1545/2667] Remove unneeded environment variable from collabora --- docker/nextcloud/docker-compose.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 70addc83..2efd847c 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -77,7 +77,6 @@ environment = [ "password=${COLLABORA_PASSWORD}", "username=${COLLABORA_USERNAME}", "domain=collabora.korhonen.cc", - "DONT_GEN_SSL_CERT=yes", ] networks = ["proxy"] labels = [ From 1f8221ff5b20704abea3455df2e20b56d27458fd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:07:23 +0300 Subject: [PATCH 1546/2667] Remove unneeded environment variable from collabora --- docker/nextcloud/docker-compose.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 70addc83..2efd847c 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -77,7 +77,6 @@ environment = [ "password=${COLLABORA_PASSWORD}", "username=${COLLABORA_USERNAME}", "domain=collabora.korhonen.cc", - "DONT_GEN_SSL_CERT=yes", ] networks = ["proxy"] labels = [ From b5d1364db7dddf42ad883efdc463af65ab69f3cc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:08:07 +0300 Subject: [PATCH 1547/2667] Set collabora container name --- docker/nextcloud/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 2efd847c..4fe38e65 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -71,6 +71,7 @@ command = [ [services.collabora] image = "collabora/code" +container_name = "collabora" restart = "unless-stopped" env_file = ".env" environment = [ From 4c5b190584257bb29a8d9b8e93e4417f5aa49d90 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:08:07 +0300 Subject: [PATCH 1548/2667] Set collabora container name --- docker/nextcloud/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 2efd847c..4fe38e65 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -71,6 +71,7 @@ command = [ [services.collabora] image = "collabora/code" +container_name = "collabora" restart = "unless-stopped" env_file = ".env" environment = [ From b1c632293764831239b0a4f70e49dc527554a479 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:31:03 +0300 Subject: [PATCH 1549/2667] Small fix for collabora --- docker/nextcloud/docker-compose.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 4fe38e65..c9fc22f7 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -75,9 +75,10 @@ container_name = "collabora" restart = "unless-stopped" env_file = ".env" environment = [ - "password=${COLLABORA_PASSWORD}", "username=${COLLABORA_USERNAME}", + "password=${COLLABORA_PASSWORD}", "domain=collabora.korhonen.cc", + 'extra\_params=--o:ssl.enable=false --o:ssl.termination=true --o:net.post\_allow.host\[0\]=cloud.korhonen.cc', ] networks = ["proxy"] labels = [ From 498a63aef4b8f5937a57b3e9efa64012d79e3b9d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:31:03 +0300 Subject: [PATCH 1550/2667] Small fix for collabora --- docker/nextcloud/docker-compose.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 4fe38e65..c9fc22f7 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -75,9 +75,10 @@ container_name = "collabora" restart = "unless-stopped" env_file = ".env" environment = [ - "password=${COLLABORA_PASSWORD}", "username=${COLLABORA_USERNAME}", + "password=${COLLABORA_PASSWORD}", "domain=collabora.korhonen.cc", + 'extra\_params=--o:ssl.enable=false --o:ssl.termination=true --o:net.post\_allow.host\[0\]=cloud.korhonen.cc', ] networks = ["proxy"] labels = [ From 2b107c2bba242425e9f9068f1ec891db5bd918ff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:40:32 +0300 Subject: [PATCH 1551/2667] Remove unneeded escape character (collabora) --- docker/nextcloud/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index c9fc22f7..a0f127ca 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -78,7 +78,7 @@ environment = [ "username=${COLLABORA_USERNAME}", "password=${COLLABORA_PASSWORD}", "domain=collabora.korhonen.cc", - 'extra\_params=--o:ssl.enable=false --o:ssl.termination=true --o:net.post\_allow.host\[0\]=cloud.korhonen.cc', + 'extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:net.post\_allow.host\[0\]=cloud.korhonen.cc', ] networks = ["proxy"] labels = [ From 6afdc9564c6f4b13b158d987342192c2598b63f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:40:32 +0300 Subject: [PATCH 1552/2667] Remove unneeded escape character (collabora) --- docker/nextcloud/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index c9fc22f7..a0f127ca 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -78,7 +78,7 @@ environment = [ "username=${COLLABORA_USERNAME}", "password=${COLLABORA_PASSWORD}", "domain=collabora.korhonen.cc", - 'extra\_params=--o:ssl.enable=false --o:ssl.termination=true --o:net.post\_allow.host\[0\]=cloud.korhonen.cc', + 'extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:net.post\_allow.host\[0\]=cloud.korhonen.cc', ] networks = ["proxy"] labels = [ From c81dce80a0a7deb415e681a1abae7c29615935da Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:46:45 +0300 Subject: [PATCH 1553/2667] Fix collabora domain --- docker/nextcloud/docker-compose.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index a0f127ca..15c5d3ce 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -77,8 +77,8 @@ env_file = ".env" environment = [ "username=${COLLABORA_USERNAME}", "password=${COLLABORA_PASSWORD}", - "domain=collabora.korhonen.cc", - 'extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:net.post\_allow.host\[0\]=cloud.korhonen.cc', + "domain=cloud.korhonen.cc", + 'extra_params=--o:ssl.enable=false --o:ssl.termination=true', ] networks = ["proxy"] labels = [ From 7a4bf336e8ce61370c34daf38699a80da9f6c542 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:46:45 +0300 Subject: [PATCH 1554/2667] Fix collabora domain --- docker/nextcloud/docker-compose.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index a0f127ca..15c5d3ce 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -77,8 +77,8 @@ env_file = ".env" environment = [ "username=${COLLABORA_USERNAME}", "password=${COLLABORA_PASSWORD}", - "domain=collabora.korhonen.cc", - 'extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:net.post\_allow.host\[0\]=cloud.korhonen.cc', + "domain=cloud.korhonen.cc", + 'extra_params=--o:ssl.enable=false --o:ssl.termination=true', ] networks = ["proxy"] labels = [ From 8049d07e09c95231cbddbbd984bbedbcf6fd29cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Sep 2022 10:39:26 +0300 Subject: [PATCH 1555/2667] Fix TF on termux --- home/.config/zsh/03-plugins.zsh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 9493817f..c86e0fb6 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -1,7 +1,7 @@ # install zinit if it's not already installed if [ ! -f ~/.zinit/bin/zinit.zsh ]; then - mkdir ~/.zinit - git clone https://github.com/zdharma-continuum/zinit.git ~/.zinit/bin + mkdir ~/.zinit + git clone https://github.com/zdharma-continuum/zinit.git ~/.zinit/bin fi source ~/.zinit/bin/zinit.zsh @@ -48,4 +48,7 @@ source /usr/share/fzf/completion.zsh {%@@ endif @@%} # enable https://github.com/nvbn/thefuck +{%@@ if distro_id == "termux" @@%} +eval $(TF_SHELL=zsh thefuck --alias) +{%@@ else @@%} eval $(thefuck --alias) From 79656e86ef7942da1493265e7070b9f38a70afaa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Sep 2022 10:39:26 +0300 Subject: [PATCH 1556/2667] Fix TF on termux --- home/.config/zsh/03-plugins.zsh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 9493817f..c86e0fb6 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -1,7 +1,7 @@ # install zinit if it's not already installed if [ ! -f ~/.zinit/bin/zinit.zsh ]; then - mkdir ~/.zinit - git clone https://github.com/zdharma-continuum/zinit.git ~/.zinit/bin + mkdir ~/.zinit + git clone https://github.com/zdharma-continuum/zinit.git ~/.zinit/bin fi source ~/.zinit/bin/zinit.zsh @@ -48,4 +48,7 @@ source /usr/share/fzf/completion.zsh {%@@ endif @@%} # enable https://github.com/nvbn/thefuck +{%@@ if distro_id == "termux" @@%} +eval $(TF_SHELL=zsh thefuck --alias) +{%@@ else @@%} eval $(thefuck --alias) From 406c23021082df29eec880fb02d0a59b000b1c23 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Sep 2022 10:40:37 +0300 Subject: [PATCH 1557/2667] Add missing endif to template --- home/.config/zsh/03-plugins.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index c86e0fb6..2e7f65a5 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -52,3 +52,4 @@ source /usr/share/fzf/completion.zsh eval $(TF_SHELL=zsh thefuck --alias) {%@@ else @@%} eval $(thefuck --alias) +{%@@ endif @@%} From dc18277b4dcaeaca1c5c153183968c86dc948fb9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Sep 2022 10:40:37 +0300 Subject: [PATCH 1558/2667] Add missing endif to template --- home/.config/zsh/03-plugins.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index c86e0fb6..2e7f65a5 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -52,3 +52,4 @@ source /usr/share/fzf/completion.zsh eval $(TF_SHELL=zsh thefuck --alias) {%@@ else @@%} eval $(thefuck --alias) +{%@@ endif @@%} From 59973a3a83946daa1624c2a0504d1958ae0bdcc1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Sep 2022 10:41:50 +0300 Subject: [PATCH 1559/2667] Remove unneeded template --- home/.config/zsh/03-plugins.zsh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 2e7f65a5..7377af62 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -48,8 +48,4 @@ source /usr/share/fzf/completion.zsh {%@@ endif @@%} # enable https://github.com/nvbn/thefuck -{%@@ if distro_id == "termux" @@%} eval $(TF_SHELL=zsh thefuck --alias) -{%@@ else @@%} -eval $(thefuck --alias) -{%@@ endif @@%} From f3da5785d64e195d0eb4a714e26a13ab205d6dd8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Sep 2022 10:41:50 +0300 Subject: [PATCH 1560/2667] Remove unneeded template --- home/.config/zsh/03-plugins.zsh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 2e7f65a5..7377af62 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -48,8 +48,4 @@ source /usr/share/fzf/completion.zsh {%@@ endif @@%} # enable https://github.com/nvbn/thefuck -{%@@ if distro_id == "termux" @@%} eval $(TF_SHELL=zsh thefuck --alias) -{%@@ else @@%} -eval $(thefuck --alias) -{%@@ endif @@%} From b316f72cc41682d80bb7d41085a1d620d8d7b254 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 3 Oct 2022 10:52:21 +0300 Subject: [PATCH 1561/2667] Remove authentic geoipupdate container --- docker/authentik/docker-compose.toml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 1914e50d..912a319e 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -14,7 +14,6 @@ command = "server" volumes = [ "/docker/authentik/media:/media", "/docker/authentik/custom-templates:/templates", - "/docker/authentik/geoip:/geoip", ] env_file = [".env"] networks = ["authentik", "postgres", "proxy"] @@ -43,7 +42,6 @@ volumes = [ "/docker/authentik/media:/media", "/var/run/docker.sock:/var/run/docker.sock", "/docker/authentik/custom-templates:/templates", - "/docker/authentik/geoip:/geoip", ] environment = [ "AUTHENTIK_POSTGRESQL__HOST", @@ -54,17 +52,6 @@ environment = [ ] env_file = [".env"] -[services.geoipupdate] -container_name = "authentik-geoip" -image = "maxmindinc/geoipupdate:latest" -volumes = ["/docker/authentik/geoip:/usr/share/GeoIP"] -env_file = [".env"] -networks = ["authentik"] - -[services.geoipupdate.environment] -GEOIPUPDATE_EDITION_IDS = "GeoLite2-City" -GEOIPUPDATE_FREQUENCY = "8" - [networks] [networks.authentik] From 62558887c1afa4a57afdc060fc7c18c674999f60 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 3 Oct 2022 10:52:21 +0300 Subject: [PATCH 1562/2667] Remove authentic geoipupdate container --- docker/authentik/docker-compose.toml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 1914e50d..912a319e 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -14,7 +14,6 @@ command = "server" volumes = [ "/docker/authentik/media:/media", "/docker/authentik/custom-templates:/templates", - "/docker/authentik/geoip:/geoip", ] env_file = [".env"] networks = ["authentik", "postgres", "proxy"] @@ -43,7 +42,6 @@ volumes = [ "/docker/authentik/media:/media", "/var/run/docker.sock:/var/run/docker.sock", "/docker/authentik/custom-templates:/templates", - "/docker/authentik/geoip:/geoip", ] environment = [ "AUTHENTIK_POSTGRESQL__HOST", @@ -54,17 +52,6 @@ environment = [ ] env_file = [".env"] -[services.geoipupdate] -container_name = "authentik-geoip" -image = "maxmindinc/geoipupdate:latest" -volumes = ["/docker/authentik/geoip:/usr/share/GeoIP"] -env_file = [".env"] -networks = ["authentik"] - -[services.geoipupdate.environment] -GEOIPUPDATE_EDITION_IDS = "GeoLite2-City" -GEOIPUPDATE_FREQUENCY = "8" - [networks] [networks.authentik] From 357392b9dc89af3fe162f9cbad8f2ec935f38b33 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 5 Oct 2022 14:05:43 +0300 Subject: [PATCH 1563/2667] Unify quotes to single quote in neovim plugin configuration --- home/.config/nvim/lua/plugins/init.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index dcb36c78..7f7128bc 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -115,7 +115,7 @@ require('packer').startup(function() 'hrsh7th/nvim-cmp', requires = { {'hrsh7th/cmp-buffer'}, -- Buffer source - {'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim"}, -- Git source + {'petertriho/cmp-git', requires = 'nvim-lua/plenary.nvim'}, -- Git source {'hrsh7th/cmp-nvim-lsp'}, -- LSP source {'hrsh7th/cmp-nvim-lua'}, -- Neovim Lua API documentation source {'hrsh7th/cmp-path'}, -- Path source @@ -170,12 +170,12 @@ require('packer').startup(function() -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' - -- Markdown preview plugin + -- Markdown preview use({ - "iamcco/markdown-preview.nvim", - run = "cd app && npm install", - setup = function() vim.g.mkdp_filetypes = {"markdown"} end, - ft = {"markdown"} + 'iamcco/markdown-preview.nvim', + run = 'cd app && npm install', + setup = function() vim.g.mkdp_filetypes = {'markdown'} end, + ft = {'markdown'} }) -- Edit GPG encrypted files transparently From b3283de502711d7c8056b9f5f1b1f938f7c9bf44 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 5 Oct 2022 14:05:43 +0300 Subject: [PATCH 1564/2667] Unify quotes to single quote in neovim plugin configuration --- home/.config/nvim/lua/plugins/init.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index dcb36c78..7f7128bc 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -115,7 +115,7 @@ require('packer').startup(function() 'hrsh7th/nvim-cmp', requires = { {'hrsh7th/cmp-buffer'}, -- Buffer source - {'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim"}, -- Git source + {'petertriho/cmp-git', requires = 'nvim-lua/plenary.nvim'}, -- Git source {'hrsh7th/cmp-nvim-lsp'}, -- LSP source {'hrsh7th/cmp-nvim-lua'}, -- Neovim Lua API documentation source {'hrsh7th/cmp-path'}, -- Path source @@ -170,12 +170,12 @@ require('packer').startup(function() -- Vim <3 Asciidoctor use 'habamax/vim-asciidoctor' - -- Markdown preview plugin + -- Markdown preview use({ - "iamcco/markdown-preview.nvim", - run = "cd app && npm install", - setup = function() vim.g.mkdp_filetypes = {"markdown"} end, - ft = {"markdown"} + 'iamcco/markdown-preview.nvim', + run = 'cd app && npm install', + setup = function() vim.g.mkdp_filetypes = {'markdown'} end, + ft = {'markdown'} }) -- Edit GPG encrypted files transparently From 7bbbd7cbfec67225aa98676a27c007d18d0d5bb5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 7 Oct 2022 17:46:04 +0300 Subject: [PATCH 1565/2667] Add sudo config for pacman without password --- config-root.toml | 13 +++++++++---- root/etc/sudoers.d/pacman | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 root/etc/sudoers.d/pacman diff --git a/config-root.toml b/config-root.toml index 867775aa..71f07368 100644 --- a/config-root.toml +++ b/config-root.toml @@ -11,8 +11,6 @@ longkey = false showdiff = false workdir = "~/.config/sdotdrop" -[dotfiles] - [dotfiles."f_60-uinput-permissions.rules"] dst = "/etc/udev/rules.d/60-uinput-permissions.rules" src = "etc/udev/rules.d/60-uinput-permissions.rules" @@ -153,7 +151,9 @@ dst = "/etc/kernel/cmdline" src = "etc/systemd/timesyncd.conf" dst = "/etc/systemd/timesyncd.conf" -[profiles] +[dotfiles.f_sudoers_pacman] +src = "etc/sudoers.d/pacman" +dst = "/etc/sudoers.d/pacman" [profiles.Network] dotfiles = ["d_network", "f_networkd.conf"] @@ -162,7 +162,12 @@ dotfiles = ["d_network", "f_networkd.conf"] dotfiles = ["f_locale.conf", "f_locale.gen"] [profiles.Pacman] -dotfiles = ["f_pacman.conf", "f_pacman_zsh_hook", "f_pacserve.service.conf"] +dotfiles = [ + "f_pacman.conf", + "f_pacman_zsh_hook", + "f_pacserve.service.conf", + "f_sudoers_pacman", +] [profiles.Mirkwood] dotfiles = [ diff --git a/root/etc/sudoers.d/pacman b/root/etc/sudoers.d/pacman new file mode 100644 index 00000000..12be60e1 --- /dev/null +++ b/root/etc/sudoers.d/pacman @@ -0,0 +1 @@ +%wheel ALL = (root) NOPASSWD: /usr/bin/pacman From e83a031b1bdf7e2b32344c9228b4922f3c33089b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 7 Oct 2022 17:46:04 +0300 Subject: [PATCH 1566/2667] Add sudo config for pacman without password --- config-root.toml | 13 +++++++++---- root/etc/sudoers.d/pacman | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 root/etc/sudoers.d/pacman diff --git a/config-root.toml b/config-root.toml index 867775aa..71f07368 100644 --- a/config-root.toml +++ b/config-root.toml @@ -11,8 +11,6 @@ longkey = false showdiff = false workdir = "~/.config/sdotdrop" -[dotfiles] - [dotfiles."f_60-uinput-permissions.rules"] dst = "/etc/udev/rules.d/60-uinput-permissions.rules" src = "etc/udev/rules.d/60-uinput-permissions.rules" @@ -153,7 +151,9 @@ dst = "/etc/kernel/cmdline" src = "etc/systemd/timesyncd.conf" dst = "/etc/systemd/timesyncd.conf" -[profiles] +[dotfiles.f_sudoers_pacman] +src = "etc/sudoers.d/pacman" +dst = "/etc/sudoers.d/pacman" [profiles.Network] dotfiles = ["d_network", "f_networkd.conf"] @@ -162,7 +162,12 @@ dotfiles = ["d_network", "f_networkd.conf"] dotfiles = ["f_locale.conf", "f_locale.gen"] [profiles.Pacman] -dotfiles = ["f_pacman.conf", "f_pacman_zsh_hook", "f_pacserve.service.conf"] +dotfiles = [ + "f_pacman.conf", + "f_pacman_zsh_hook", + "f_pacserve.service.conf", + "f_sudoers_pacman", +] [profiles.Mirkwood] dotfiles = [ diff --git a/root/etc/sudoers.d/pacman b/root/etc/sudoers.d/pacman new file mode 100644 index 00000000..12be60e1 --- /dev/null +++ b/root/etc/sudoers.d/pacman @@ -0,0 +1 @@ +%wheel ALL = (root) NOPASSWD: /usr/bin/pacman From 16a8c30360ac9e375f22bbd3615746c91ea464be Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 7 Oct 2022 18:01:43 +0300 Subject: [PATCH 1567/2667] Add doas config --- config-root.toml | 41 +++++++++++++++++++++++------------------ root/etc/doas.conf | 2 ++ 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 root/etc/doas.conf diff --git a/config-root.toml b/config-root.toml index 71f07368..4885d44a 100644 --- a/config-root.toml +++ b/config-root.toml @@ -155,6 +155,10 @@ dst = "/etc/systemd/timesyncd.conf" src = "etc/sudoers.d/pacman" dst = "/etc/sudoers.d/pacman" +[dotfiles."f_doas.conf"] +src = "etc/doas.conf" +dst = "/etc/doas.conf" + [profiles.Network] dotfiles = ["d_network", "f_networkd.conf"] @@ -171,34 +175,35 @@ dotfiles = [ [profiles.Mirkwood] dotfiles = [ - "f_getty.conf", - "f_cryptissue", - "f_welcomemessage.conf", "d_bin", + "d_mkinitcpio.d", + "f_20-quiet-printk.conf", + "f_60-uinput-permissions.rules", + "f_99-lowbat.rules", "f_adb.service", "f_bluetooth.conf", - "f_sshd_config", - "f_logind.conf", - "f_60-uinput-permissions.rules", - "f_yubikey_udev.rules", - "f_freetype2.sh", - "f_fonts.conf", - "f_99-lowbat.rules", - "f_ignore", - "f_mkinitcpio.conf", - "f_vconsole.conf", - "f_20-quiet-printk.conf", - "f_system.conf", - "f_cpupower", - "d_mkinitcpio.d", "f_cmdline", + "f_cpupower", + "f_cryptissue", + "f_doas.conf", + "f_fonts.conf", + "f_freetype2.sh", + "f_getty.conf", + "f_ignore", + "f_logind.conf", + "f_mkinitcpio.conf", + "f_sshd_config", + "f_system.conf", "f_timesyncd.conf", + "f_vconsole.conf", + "f_welcomemessage.conf", + "f_yubikey_udev.rules", ] include = ["Locale", "Pacman", "Network"] [profiles.Moria] include = ["Locale", "Pacman", "Network"] -dotfiles = ["f_sshd_config", "f_99-sysctl.conf", "f_cpupower"] +dotfiles = ["f_99-sysctl.conf", "f_cpupower", "f_doas.conf", "f_sshd_config"] [profiles.Gondor] include = ["Locale", "Pacman"] diff --git a/root/etc/doas.conf b/root/etc/doas.conf new file mode 100644 index 00000000..761aa651 --- /dev/null +++ b/root/etc/doas.conf @@ -0,0 +1,2 @@ +permit persist :wheel +permit nopass :wheel as root cmd pacman From 4faffcaa73830523d6d89b482e89ab7aadd09de4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 7 Oct 2022 18:01:43 +0300 Subject: [PATCH 1568/2667] Add doas config --- config-root.toml | 41 +++++++++++++++++++++++------------------ root/etc/doas.conf | 2 ++ 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 root/etc/doas.conf diff --git a/config-root.toml b/config-root.toml index 71f07368..4885d44a 100644 --- a/config-root.toml +++ b/config-root.toml @@ -155,6 +155,10 @@ dst = "/etc/systemd/timesyncd.conf" src = "etc/sudoers.d/pacman" dst = "/etc/sudoers.d/pacman" +[dotfiles."f_doas.conf"] +src = "etc/doas.conf" +dst = "/etc/doas.conf" + [profiles.Network] dotfiles = ["d_network", "f_networkd.conf"] @@ -171,34 +175,35 @@ dotfiles = [ [profiles.Mirkwood] dotfiles = [ - "f_getty.conf", - "f_cryptissue", - "f_welcomemessage.conf", "d_bin", + "d_mkinitcpio.d", + "f_20-quiet-printk.conf", + "f_60-uinput-permissions.rules", + "f_99-lowbat.rules", "f_adb.service", "f_bluetooth.conf", - "f_sshd_config", - "f_logind.conf", - "f_60-uinput-permissions.rules", - "f_yubikey_udev.rules", - "f_freetype2.sh", - "f_fonts.conf", - "f_99-lowbat.rules", - "f_ignore", - "f_mkinitcpio.conf", - "f_vconsole.conf", - "f_20-quiet-printk.conf", - "f_system.conf", - "f_cpupower", - "d_mkinitcpio.d", "f_cmdline", + "f_cpupower", + "f_cryptissue", + "f_doas.conf", + "f_fonts.conf", + "f_freetype2.sh", + "f_getty.conf", + "f_ignore", + "f_logind.conf", + "f_mkinitcpio.conf", + "f_sshd_config", + "f_system.conf", "f_timesyncd.conf", + "f_vconsole.conf", + "f_welcomemessage.conf", + "f_yubikey_udev.rules", ] include = ["Locale", "Pacman", "Network"] [profiles.Moria] include = ["Locale", "Pacman", "Network"] -dotfiles = ["f_sshd_config", "f_99-sysctl.conf", "f_cpupower"] +dotfiles = ["f_99-sysctl.conf", "f_cpupower", "f_doas.conf", "f_sshd_config"] [profiles.Gondor] include = ["Locale", "Pacman"] diff --git a/root/etc/doas.conf b/root/etc/doas.conf new file mode 100644 index 00000000..761aa651 --- /dev/null +++ b/root/etc/doas.conf @@ -0,0 +1,2 @@ +permit persist :wheel +permit nopass :wheel as root cmd pacman From 29aeaa6e179b2afb2d27fa49cf2e5f6add63718d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 9 Oct 2022 11:43:40 +0300 Subject: [PATCH 1569/2667] Use doas with paru --- home/.config/paru/paru.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/paru/paru.conf b/home/.config/paru/paru.conf index 1a8d3038..238bd370 100644 --- a/home/.config/paru/paru.conf +++ b/home/.config/paru/paru.conf @@ -1,2 +1,5 @@ [options] NewsOnUpgrade + +[bin] +Sudo = doas From 5e9d4d65e6ae306008a9ab7fb55b1eda6dbd3e95 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 9 Oct 2022 11:43:40 +0300 Subject: [PATCH 1570/2667] Use doas with paru --- home/.config/paru/paru.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/paru/paru.conf b/home/.config/paru/paru.conf index 1a8d3038..238bd370 100644 --- a/home/.config/paru/paru.conf +++ b/home/.config/paru/paru.conf @@ -1,2 +1,5 @@ [options] NewsOnUpgrade + +[bin] +Sudo = doas From 1212f1de359ef6f798b9ada0d340a2221042d1f1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 9 Oct 2022 11:45:58 +0300 Subject: [PATCH 1571/2667] Add doas.conf for gondor --- config-root.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-root.toml b/config-root.toml index 4885d44a..c80c4c55 100644 --- a/config-root.toml +++ b/config-root.toml @@ -207,7 +207,7 @@ dotfiles = ["f_99-sysctl.conf", "f_cpupower", "f_doas.conf", "f_sshd_config"] [profiles.Gondor] include = ["Locale", "Pacman"] -dotfiles = ["f_sshd_config"] +dotfiles = ["f_doas.conf", "f_sshd_config"] [profiles.localhost] include = ["Locale"] From 447c7e11199f05fbc72616378d059f34a4e9b2bf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 9 Oct 2022 11:45:58 +0300 Subject: [PATCH 1572/2667] Add doas.conf for gondor --- config-root.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-root.toml b/config-root.toml index 4885d44a..c80c4c55 100644 --- a/config-root.toml +++ b/config-root.toml @@ -207,7 +207,7 @@ dotfiles = ["f_99-sysctl.conf", "f_cpupower", "f_doas.conf", "f_sshd_config"] [profiles.Gondor] include = ["Locale", "Pacman"] -dotfiles = ["f_sshd_config"] +dotfiles = ["f_doas.conf", "f_sshd_config"] [profiles.localhost] include = ["Locale"] From 8a9985e3a0e84b313f1a6d3ec8a43d0626f1625f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Oct 2022 11:25:20 +0300 Subject: [PATCH 1573/2667] Setup doas for ubuntu --- config-root.toml | 2 +- home/.config/zsh/04-aliases.zsh | 14 +++++++------- root/etc/doas.conf | 5 +++++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/config-root.toml b/config-root.toml index c80c4c55..88115c1f 100644 --- a/config-root.toml +++ b/config-root.toml @@ -216,4 +216,4 @@ include = ["Locale"] include = ["Pacman"] [profiles.mko-laptop] -dotfiles = ["f_cpupower", "f_yubikey_udev.rules"] +dotfiles = ["f_cpupower", "f_yubikey_udev.rules", "f_doas.conf"] diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index ef1c0c97..dea45339 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -34,7 +34,7 @@ pi() { {%@@ if distro_id == "arch" @@%} cmd="paru -S $(echo $SELECTED_PKGS)" {%@@ elif distro_id == "ubuntu" @@%} - cmd="sudo apt install $(echo $SELECTED_PKGS)" + cmd="doas apt install $(echo $SELECTED_PKGS)" {%@@ elif distro_id == "termux" @@%} cmd="apt install $(echo $SELECTED_PKGS)" {%@@ endif @@%} @@ -57,7 +57,7 @@ pr() { {%@@ if distro_id == "arch" @@%} cmd="paru -Rns $(echo $SELECTED_PKGS)" {%@@ elif distro_id == "ubuntu" @@%} - cmd="sudo apt remove $(echo $SELECTED_PKGS)" + cmd="doas apt remove $(echo $SELECTED_PKGS)" {%@@ elif distro_id == "termux" @@%} cmd="apt remove $(echo $SELECTED_PKGS)" {%@@ endif @@%} @@ -106,15 +106,15 @@ clean() { DFCMD="df -h / | tail -n 1 | cut -d' ' -f8- | cut -d' ' -f1 | sed 's/[^0-9]*//g'" SPACEBEFORE=$(eval "$DFCMD") trash-empty 10 - sudo journalctl --vacuum-size=500M + doas journalctl --vacuum-size=500M paru -Sc SPACEAFTER=$(eval "$DFCMD") echo "Saved $(calc $SPACEAFTER - $SPACEBEFORE)G of space" } # connect to wireguard -alias startvpn='sudo systemctl start wg-quick@wg0.service' -alias stopvpn='sudo systemctl stop wg-quick@wg0.service' +alias startvpn='doas systemctl start wg-quick@wg0.service' +alias stopvpn='doas systemctl stop wg-quick@wg0.service' # read qrcode from selection qr() { grim -g "$(slurp -d)" - | zbarimg PNG:- } @@ -156,7 +156,7 @@ update() { {%@@ if distro_id == "arch" @@%} paru {%@@ elif distro_id == "ubuntu" @@%} - sudo apt update && sudo apt full-upgrade -y && sudo apt autoremove -y && sudo apt autoclean -y + doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} pkg update {%@@ endif @@%} @@ -219,7 +219,7 @@ update() { tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/null } # update arch mirrorlist -alias reflect='sudo reflector --latest 200 --threads 8 --verbose --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist' +alias reflect='doas reflector --latest 200 --threads 8 --verbose --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist' # default icon for notify-send alias notify-send='notify-send --icon=alarm' diff --git a/root/etc/doas.conf b/root/etc/doas.conf index 761aa651..cb547a49 100644 --- a/root/etc/doas.conf +++ b/root/etc/doas.conf @@ -1,2 +1,7 @@ +{%@@ if distro_id == "arch" @@%} permit persist :wheel permit nopass :wheel as root cmd pacman +{%@@ else @@%} +permit persist :sudo +permit nopass :sudo as root cmd apt +{%@@ endif @@%} From ccdd60a353df5f6f7b252d03041e3108cb7a3006 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Oct 2022 11:25:20 +0300 Subject: [PATCH 1574/2667] Setup doas for ubuntu --- config-root.toml | 2 +- home/.config/zsh/04-aliases.zsh | 14 +++++++------- root/etc/doas.conf | 5 +++++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/config-root.toml b/config-root.toml index c80c4c55..88115c1f 100644 --- a/config-root.toml +++ b/config-root.toml @@ -216,4 +216,4 @@ include = ["Locale"] include = ["Pacman"] [profiles.mko-laptop] -dotfiles = ["f_cpupower", "f_yubikey_udev.rules"] +dotfiles = ["f_cpupower", "f_yubikey_udev.rules", "f_doas.conf"] diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index ef1c0c97..dea45339 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -34,7 +34,7 @@ pi() { {%@@ if distro_id == "arch" @@%} cmd="paru -S $(echo $SELECTED_PKGS)" {%@@ elif distro_id == "ubuntu" @@%} - cmd="sudo apt install $(echo $SELECTED_PKGS)" + cmd="doas apt install $(echo $SELECTED_PKGS)" {%@@ elif distro_id == "termux" @@%} cmd="apt install $(echo $SELECTED_PKGS)" {%@@ endif @@%} @@ -57,7 +57,7 @@ pr() { {%@@ if distro_id == "arch" @@%} cmd="paru -Rns $(echo $SELECTED_PKGS)" {%@@ elif distro_id == "ubuntu" @@%} - cmd="sudo apt remove $(echo $SELECTED_PKGS)" + cmd="doas apt remove $(echo $SELECTED_PKGS)" {%@@ elif distro_id == "termux" @@%} cmd="apt remove $(echo $SELECTED_PKGS)" {%@@ endif @@%} @@ -106,15 +106,15 @@ clean() { DFCMD="df -h / | tail -n 1 | cut -d' ' -f8- | cut -d' ' -f1 | sed 's/[^0-9]*//g'" SPACEBEFORE=$(eval "$DFCMD") trash-empty 10 - sudo journalctl --vacuum-size=500M + doas journalctl --vacuum-size=500M paru -Sc SPACEAFTER=$(eval "$DFCMD") echo "Saved $(calc $SPACEAFTER - $SPACEBEFORE)G of space" } # connect to wireguard -alias startvpn='sudo systemctl start wg-quick@wg0.service' -alias stopvpn='sudo systemctl stop wg-quick@wg0.service' +alias startvpn='doas systemctl start wg-quick@wg0.service' +alias stopvpn='doas systemctl stop wg-quick@wg0.service' # read qrcode from selection qr() { grim -g "$(slurp -d)" - | zbarimg PNG:- } @@ -156,7 +156,7 @@ update() { {%@@ if distro_id == "arch" @@%} paru {%@@ elif distro_id == "ubuntu" @@%} - sudo apt update && sudo apt full-upgrade -y && sudo apt autoremove -y && sudo apt autoclean -y + doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} pkg update {%@@ endif @@%} @@ -219,7 +219,7 @@ update() { tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/null } # update arch mirrorlist -alias reflect='sudo reflector --latest 200 --threads 8 --verbose --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist' +alias reflect='doas reflector --latest 200 --threads 8 --verbose --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist' # default icon for notify-send alias notify-send='notify-send --icon=alarm' diff --git a/root/etc/doas.conf b/root/etc/doas.conf index 761aa651..cb547a49 100644 --- a/root/etc/doas.conf +++ b/root/etc/doas.conf @@ -1,2 +1,7 @@ +{%@@ if distro_id == "arch" @@%} permit persist :wheel permit nopass :wheel as root cmd pacman +{%@@ else @@%} +permit persist :sudo +permit nopass :sudo as root cmd apt +{%@@ endif @@%} From 5527f6ad054e75fc20a7702c389bfc64680d7c05 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Oct 2022 11:28:39 +0300 Subject: [PATCH 1575/2667] Set tmux default shell --- home/.tmux.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.tmux.conf b/home/.tmux.conf index e09db8d7..585da95a 100644 --- a/home/.tmux.conf +++ b/home/.tmux.conf @@ -1,3 +1,6 @@ +# set shell +set -g default-shell /bin/zsh + # Change prefix to ctrl+a unbind C-b set -g prefix C-a From 2388de891f4be59722028d0d55cc96b8c40d2f29 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Oct 2022 11:28:39 +0300 Subject: [PATCH 1576/2667] Set tmux default shell --- home/.tmux.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.tmux.conf b/home/.tmux.conf index e09db8d7..585da95a 100644 --- a/home/.tmux.conf +++ b/home/.tmux.conf @@ -1,3 +1,6 @@ +# set shell +set -g default-shell /bin/zsh + # Change prefix to ctrl+a unbind C-b set -g prefix C-a From 88a12c6df00ba3ecb00db28fda91c24c4b23b8f9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Oct 2022 11:29:25 +0300 Subject: [PATCH 1577/2667] Only update tmux on Moria --- home/.config/zsh/04-aliases.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index dea45339..cc26afe5 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -169,7 +169,9 @@ update() { nvim --headless +TSUpdateSync +qa zinit self-update zinit update -p + {%@@ if profile == "Moria" @@%} $HOME/.tmux/plugins/tpm/bin/update_plugins all + {%@@ endif @@%} } {%@@ if profile == "Moria" @@%} From 23d23a27c93d02bb329e4f4739bb45554fc879be Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Oct 2022 11:29:25 +0300 Subject: [PATCH 1578/2667] Only update tmux on Moria --- home/.config/zsh/04-aliases.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index dea45339..cc26afe5 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -169,7 +169,9 @@ update() { nvim --headless +TSUpdateSync +qa zinit self-update zinit update -p + {%@@ if profile == "Moria" @@%} $HOME/.tmux/plugins/tpm/bin/update_plugins all + {%@@ endif @@%} } {%@@ if profile == "Moria" @@%} From 0a8d079bb705ef7b903a15b9292ff09a2beb09a0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Oct 2022 20:32:50 +0300 Subject: [PATCH 1579/2667] Fix termux update --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index cc26afe5..efd42aaf 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -158,7 +158,7 @@ update() { {%@@ elif distro_id == "ubuntu" @@%} doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} - pkg update + pkg update && pkg upgrade {%@@ endif @@%} } From 923a1c73400f679898d7150e411ec360c054f76c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Oct 2022 20:32:50 +0300 Subject: [PATCH 1580/2667] Fix termux update --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index cc26afe5..efd42aaf 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -158,7 +158,7 @@ update() { {%@@ elif distro_id == "ubuntu" @@%} doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} - pkg update + pkg update && pkg upgrade {%@@ endif @@%} } From 682bd9b3bcf0aee90ea36960b8e8d8268b98e71d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Oct 2022 20:35:19 +0300 Subject: [PATCH 1581/2667] Skip confirmation in termux upgrade --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index efd42aaf..5a1c65d2 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -158,7 +158,7 @@ update() { {%@@ elif distro_id == "ubuntu" @@%} doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} - pkg update && pkg upgrade + pkg update && pkg upgrade --yes {%@@ endif @@%} } From ceb50baf835759de4dbe385a82b01fbc167848e3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Oct 2022 20:35:19 +0300 Subject: [PATCH 1582/2667] Skip confirmation in termux upgrade --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index efd42aaf..5a1c65d2 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -158,7 +158,7 @@ update() { {%@@ elif distro_id == "ubuntu" @@%} doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} - pkg update && pkg upgrade + pkg update && pkg upgrade --yes {%@@ endif @@%} } From 5eff5ecf254c41ff6b92b271e997ad285239d33d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Oct 2022 14:39:10 +0300 Subject: [PATCH 1583/2667] Neovim: update capabilities setup for cmp --- home/.config/nvim/lua/plugins/lspconfig.lua | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index f5f71e51..65e3a7c9 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -8,7 +8,7 @@ Servers = { lemminx = {}, marksman = {}, yamlls = {}, - taplo = {}, + taplo = {}, tsserver = {}, sumneko_lua = { Lua = { @@ -79,9 +79,7 @@ function M.setup() M.map_keys() end - -- Update capabilities - local capabilities = vim.lsp.protocol.make_client_capabilities() - capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) + local capabilities = require('cmp_nvim_lsp').default_capabilities() -- Setup every defined server for server, settings in pairs(Servers) do From ef4d6d4650ce6c5fb4477a5d3a8bf4a90f333b07 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Oct 2022 14:39:10 +0300 Subject: [PATCH 1584/2667] Neovim: update capabilities setup for cmp --- home/.config/nvim/lua/plugins/lspconfig.lua | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index f5f71e51..65e3a7c9 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -8,7 +8,7 @@ Servers = { lemminx = {}, marksman = {}, yamlls = {}, - taplo = {}, + taplo = {}, tsserver = {}, sumneko_lua = { Lua = { @@ -79,9 +79,7 @@ function M.setup() M.map_keys() end - -- Update capabilities - local capabilities = vim.lsp.protocol.make_client_capabilities() - capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) + local capabilities = require('cmp_nvim_lsp').default_capabilities() -- Setup every defined server for server, settings in pairs(Servers) do From 41fe4725317cef8b5b6965660f5e7ec08288199c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 19 Oct 2022 10:27:35 +0300 Subject: [PATCH 1585/2667] Disable d_systemd for mirkwood --- config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.toml b/config.toml index e12cc733..4db46bbd 100644 --- a/config.toml +++ b/config.toml @@ -299,7 +299,7 @@ dotfiles = [ [profiles.Mirkwood] include = ["pacman", "terminal", "email", "media", "sway", "gpg"] -dotfiles = ["d_systemd", "d_rofi", "f_librewolf_overrides", "f_distro"] +dotfiles = ["d_rofi", "f_librewolf_overrides", "f_distro"] [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] From 7e6a410b86b5bf3747a1e4c1e49644556efd846f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 19 Oct 2022 10:27:35 +0300 Subject: [PATCH 1586/2667] Disable d_systemd for mirkwood --- config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.toml b/config.toml index e12cc733..4db46bbd 100644 --- a/config.toml +++ b/config.toml @@ -299,7 +299,7 @@ dotfiles = [ [profiles.Mirkwood] include = ["pacman", "terminal", "email", "media", "sway", "gpg"] -dotfiles = ["d_systemd", "d_rofi", "f_librewolf_overrides", "f_distro"] +dotfiles = ["d_rofi", "f_librewolf_overrides", "f_distro"] [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] From b35110ba5a89a24bd821d1017f6c0e361e783eba Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 20 Oct 2022 11:24:54 +0300 Subject: [PATCH 1587/2667] Add settings for nvim gui and install telescope cder plugin --- home/.config/nvim/lua/plugins/init.lua | 5 +++-- home/.config/nvim/lua/plugins/telescope.lua | 1 + home/.config/nvim/lua/settings.lua | 7 +++++++ home/.config/zsh/02-env.zsh | 3 +++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 7f7128bc..aa949b33 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -33,7 +33,7 @@ require('packer').startup(function() } -- Startup screen/dashboard - use 'glepnir/dashboard-nvim' + --use 'glepnir/dashboard-nvim' -- Git in signcolumn use 'airblade/vim-gitgutter' @@ -69,7 +69,8 @@ require('packer').startup(function() requires = { {'nvim-lua/plenary.nvim'}, -- Internal dep for telescope {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'}, -- Use fzf for fuzzy finder - {'nvim-telescope/telescope-ui-select.nvim'} -- Replace vim built in select with telescope + {'nvim-telescope/telescope-ui-select.nvim'}, -- Replace vim built in select with telescope + {'zane-/cder.nvim'}, -- cd plugin for telescope } } diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 8eb39a13..a4a13baa 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -8,6 +8,7 @@ return function() telescope.load_extension('fzf') telescope.load_extension('ui-select') + telescope.load_extension('cder') -- Keybinds vim.keymap.set('n', '', vim.cmd.Telescope) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 37ab5ff1..e3956297 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -4,9 +4,16 @@ local g = vim.g -- True colors o.termguicolors = true +-- Font for nvim GUI's +o.guifont = 'Fira Code:h14' + -- Floating window transparency o.winblend = 10 +-- Set window title +o.title = true +o.titlestring = 'NeoVim: ' .. vim.fn.getcwd() + -- Diff settings o.diffopt = 'filler,internal,algorithm:histogram,indent-heuristic' diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index aceb5750..fb7c0907 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -64,6 +64,9 @@ export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR export SYSTEMD_PAGER=less +# Enable multigrid for neovide +export NEOVIDE_MULTIGRID=1 + {%@@ if distro_id == "arch" or distro_id == "ubuntu" @@%} if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" From a5e1613b0736689e0278059107bc0bf3b56923e5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 20 Oct 2022 11:24:54 +0300 Subject: [PATCH 1588/2667] Add settings for nvim gui and install telescope cder plugin --- home/.config/nvim/lua/plugins/init.lua | 5 +++-- home/.config/nvim/lua/plugins/telescope.lua | 1 + home/.config/nvim/lua/settings.lua | 7 +++++++ home/.config/zsh/02-env.zsh | 3 +++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 7f7128bc..aa949b33 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -33,7 +33,7 @@ require('packer').startup(function() } -- Startup screen/dashboard - use 'glepnir/dashboard-nvim' + --use 'glepnir/dashboard-nvim' -- Git in signcolumn use 'airblade/vim-gitgutter' @@ -69,7 +69,8 @@ require('packer').startup(function() requires = { {'nvim-lua/plenary.nvim'}, -- Internal dep for telescope {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'}, -- Use fzf for fuzzy finder - {'nvim-telescope/telescope-ui-select.nvim'} -- Replace vim built in select with telescope + {'nvim-telescope/telescope-ui-select.nvim'}, -- Replace vim built in select with telescope + {'zane-/cder.nvim'}, -- cd plugin for telescope } } diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 8eb39a13..a4a13baa 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -8,6 +8,7 @@ return function() telescope.load_extension('fzf') telescope.load_extension('ui-select') + telescope.load_extension('cder') -- Keybinds vim.keymap.set('n', '', vim.cmd.Telescope) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 37ab5ff1..e3956297 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -4,9 +4,16 @@ local g = vim.g -- True colors o.termguicolors = true +-- Font for nvim GUI's +o.guifont = 'Fira Code:h14' + -- Floating window transparency o.winblend = 10 +-- Set window title +o.title = true +o.titlestring = 'NeoVim: ' .. vim.fn.getcwd() + -- Diff settings o.diffopt = 'filler,internal,algorithm:histogram,indent-heuristic' diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index aceb5750..fb7c0907 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -64,6 +64,9 @@ export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR export SYSTEMD_PAGER=less +# Enable multigrid for neovide +export NEOVIDE_MULTIGRID=1 + {%@@ if distro_id == "arch" or distro_id == "ubuntu" @@%} if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" From 5628321f31d526a1fff7fb4f39b376a79825cf99 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Oct 2022 13:19:48 +0300 Subject: [PATCH 1589/2667] Nvim: remove unneeded patch from which-key --- home/.config/nvim/lua/plugins/which-key.lua | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 17b7703c..a1eab54b 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -1,19 +1,3 @@ return function() require('which-key').setup {spelling = {enabled = true}} - ---PATCH from https://github.com/folke/which-key.nvim/pull/305 - local wk_view = require 'which-key.view' - wk_view.hide = function() - vim.api.nvim_echo({{""}}, false, {}) - vim.cmd 'redraw' - wk_view.hide_cursor() - if wk_view.buf and vim.api.nvim_buf_is_valid(wk_view.buf) then - vim.api.nvim_buf_delete(wk_view.buf, {force = true}) - wk_view.buf = nil - end - if wk_view.win and vim.api.nvim_win_is_valid(wk_view.win) then - vim.api.nvim_win_close(wk_view.win, {force = true}) - wk_view.win = nil - end - end - ---ENDPATCH end From 0aa8b5dd4662cb7e5136772e12ccf772ab67756f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Oct 2022 13:19:48 +0300 Subject: [PATCH 1590/2667] Nvim: remove unneeded patch from which-key --- home/.config/nvim/lua/plugins/which-key.lua | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 17b7703c..a1eab54b 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -1,19 +1,3 @@ return function() require('which-key').setup {spelling = {enabled = true}} - ---PATCH from https://github.com/folke/which-key.nvim/pull/305 - local wk_view = require 'which-key.view' - wk_view.hide = function() - vim.api.nvim_echo({{""}}, false, {}) - vim.cmd 'redraw' - wk_view.hide_cursor() - if wk_view.buf and vim.api.nvim_buf_is_valid(wk_view.buf) then - vim.api.nvim_buf_delete(wk_view.buf, {force = true}) - wk_view.buf = nil - end - if wk_view.win and vim.api.nvim_win_is_valid(wk_view.win) then - vim.api.nvim_win_close(wk_view.win, {force = true}) - wk_view.win = nil - end - end - ---ENDPATCH end From bab68a120918040f7eea9448571efdbb9ff132c7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Oct 2022 13:23:10 +0300 Subject: [PATCH 1591/2667] Nvim: comment out which-key configuration which causes error Will inspect later --- home/.config/nvim/lua/plugins/luasnip.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index 8a6137d5..37ed4903 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -6,10 +6,10 @@ return function() require('luasnip/loaders/from_vscode').lazy_load() -- Register snippet navigation keybindings - local snippet_mappings = { - [''] = {luasnip.jump(1)}, - [''] = {luasnip.jump(-1)} - } - wk.register(snippet_mappings, {mode = "i"}) - wk.register(snippet_mappings, {mode = "s"}) + --local snippet_mappings = { + -- [''] = {luasnip.jump(1)}, + -- [''] = {luasnip.jump(-1)} + --} + --wk.register(snippet_mappings, {mode = "i"}) + --wk.register(snippet_mappings, {mode = "s"}) end From c9c0f55d3170c085d3b0f63915c0246236f7bcc3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Oct 2022 13:23:10 +0300 Subject: [PATCH 1592/2667] Nvim: comment out which-key configuration which causes error Will inspect later --- home/.config/nvim/lua/plugins/luasnip.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index 8a6137d5..37ed4903 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -6,10 +6,10 @@ return function() require('luasnip/loaders/from_vscode').lazy_load() -- Register snippet navigation keybindings - local snippet_mappings = { - [''] = {luasnip.jump(1)}, - [''] = {luasnip.jump(-1)} - } - wk.register(snippet_mappings, {mode = "i"}) - wk.register(snippet_mappings, {mode = "s"}) + --local snippet_mappings = { + -- [''] = {luasnip.jump(1)}, + -- [''] = {luasnip.jump(-1)} + --} + --wk.register(snippet_mappings, {mode = "i"}) + --wk.register(snippet_mappings, {mode = "s"}) end From d6e5b68741b2387fa994d8be95663fa5e671d578 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Oct 2022 15:40:53 +0300 Subject: [PATCH 1593/2667] Neovim: fix luasnip mappings --- home/.config/nvim/lua/plugins/luasnip.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index 37ed4903..d6b92b1a 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -6,10 +6,10 @@ return function() require('luasnip/loaders/from_vscode').lazy_load() -- Register snippet navigation keybindings - --local snippet_mappings = { - -- [''] = {luasnip.jump(1)}, - -- [''] = {luasnip.jump(-1)} - --} - --wk.register(snippet_mappings, {mode = "i"}) - --wk.register(snippet_mappings, {mode = "s"}) + local snippet_mappings = { + [''] = {function() luasnip.jump(1) end}, + [''] = {function() luasnip.jump(-1) end} + } + wk.register(snippet_mappings, {mode = "i"}) + wk.register(snippet_mappings, {mode = "s"}) end From 1acfbf40cae731899e25966cf4af1283c0b517f1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Oct 2022 15:40:53 +0300 Subject: [PATCH 1594/2667] Neovim: fix luasnip mappings --- home/.config/nvim/lua/plugins/luasnip.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index 37ed4903..d6b92b1a 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -6,10 +6,10 @@ return function() require('luasnip/loaders/from_vscode').lazy_load() -- Register snippet navigation keybindings - --local snippet_mappings = { - -- [''] = {luasnip.jump(1)}, - -- [''] = {luasnip.jump(-1)} - --} - --wk.register(snippet_mappings, {mode = "i"}) - --wk.register(snippet_mappings, {mode = "s"}) + local snippet_mappings = { + [''] = {function() luasnip.jump(1) end}, + [''] = {function() luasnip.jump(-1) end} + } + wk.register(snippet_mappings, {mode = "i"}) + wk.register(snippet_mappings, {mode = "s"}) end From 29e11149782e3e068d1a7bf60bab37c252fb7525 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Oct 2022 16:04:25 +0300 Subject: [PATCH 1595/2667] Neovim: disable luasnip mappings again Will inspect later --- home/.config/nvim/lua/plugins/luasnip.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index d6b92b1a..730f7a19 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -7,9 +7,9 @@ return function() -- Register snippet navigation keybindings local snippet_mappings = { - [''] = {function() luasnip.jump(1) end}, + [''] = {function()luasnip.jump(1) end}, [''] = {function() luasnip.jump(-1) end} } - wk.register(snippet_mappings, {mode = "i"}) - wk.register(snippet_mappings, {mode = "s"}) + --wk.register(snippet_mappings, {mode = "i"}) + --wk.register(snippet_mappings, {mode = "s"}) end From 4093651f86a26aa8bbe981ba5cdc28c6e3c7ceea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Oct 2022 16:04:25 +0300 Subject: [PATCH 1596/2667] Neovim: disable luasnip mappings again Will inspect later --- home/.config/nvim/lua/plugins/luasnip.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index d6b92b1a..730f7a19 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -7,9 +7,9 @@ return function() -- Register snippet navigation keybindings local snippet_mappings = { - [''] = {function() luasnip.jump(1) end}, + [''] = {function()luasnip.jump(1) end}, [''] = {function() luasnip.jump(-1) end} } - wk.register(snippet_mappings, {mode = "i"}) - wk.register(snippet_mappings, {mode = "s"}) + --wk.register(snippet_mappings, {mode = "i"}) + --wk.register(snippet_mappings, {mode = "s"}) end From 4aeb226b7084fc12d3ba062b30fec7bcc49b6491 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Oct 2022 13:46:43 +0300 Subject: [PATCH 1597/2667] Add mason installed binaries to path --- home/.config/zsh/02-env.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index fb7c0907..55c4f7c6 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -31,6 +31,9 @@ export PATH="$HOME/.local/bin:$PATH" # Add ~/.cargo/bin to path export PATH="$HOME/.cargo/bin:$PATH" +# Add ~/.local/share/nvim/mason/bin to path +export PATH="$HOME/.local/share/nvim/mason/bin:$PATH" + # go path export GOPATH=~/.go From 58eb8443067afeb991fdec19f4c4739b3391c8ad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Oct 2022 13:46:43 +0300 Subject: [PATCH 1598/2667] Add mason installed binaries to path --- home/.config/zsh/02-env.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index fb7c0907..55c4f7c6 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -31,6 +31,9 @@ export PATH="$HOME/.local/bin:$PATH" # Add ~/.cargo/bin to path export PATH="$HOME/.cargo/bin:$PATH" +# Add ~/.local/share/nvim/mason/bin to path +export PATH="$HOME/.local/share/nvim/mason/bin:$PATH" + # go path export GOPATH=~/.go From d69a00df7e139b6eda2e87e87f0bd9000d237274 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Oct 2022 13:49:04 +0300 Subject: [PATCH 1599/2667] Change precommit hook lua formatter to stylua --- .husky/pre-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index fc94b13d..fda453f1 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -25,7 +25,7 @@ staged_lua=$(echo "$staged_files" | grep '.lua$' || true) num_staged_lua=$(echo "$staged_lua" | grep -vce '^$' || true) if [ "$num_staged_lua" -gt 0 ]; then printf '\nFormatting %s staged Lua files with lua-format\n' "$num_staged_lua" - lua-format -i "$staged_lua" + stylua "$staged_lua" printf "Re-staging\n\n" git add "$staged_lua" fi From 2fb929728160ce1829cbcf43ffd790ebcdd5e182 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Oct 2022 13:49:04 +0300 Subject: [PATCH 1600/2667] Change precommit hook lua formatter to stylua --- .husky/pre-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index fc94b13d..fda453f1 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -25,7 +25,7 @@ staged_lua=$(echo "$staged_files" | grep '.lua$' || true) num_staged_lua=$(echo "$staged_lua" | grep -vce '^$' || true) if [ "$num_staged_lua" -gt 0 ]; then printf '\nFormatting %s staged Lua files with lua-format\n' "$num_staged_lua" - lua-format -i "$staged_lua" + stylua "$staged_lua" printf "Re-staging\n\n" git add "$staged_lua" fi From bddcb64be8862a335a3696354b8f5d37794d8420 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Oct 2022 14:08:20 +0300 Subject: [PATCH 1601/2667] Reformat all neovim configuration files with stylua --- .husky/pre-commit | 10 +- home/.config/nvim/init.lua | 6 +- home/.config/nvim/lua/keybinds.lua | 8 +- home/.config/nvim/lua/pager.lua | 2 +- home/.config/nvim/lua/plugins/cmp.lua | 107 +++--- .../nvim/lua/plugins/indent-blankline.lua | 12 +- home/.config/nvim/lua/plugins/init.lua | 325 +++++++++--------- home/.config/nvim/lua/plugins/lspconfig.lua | 155 +++++---- home/.config/nvim/lua/plugins/lualine.lua | 4 +- home/.config/nvim/lua/plugins/luasnip.lua | 30 +- home/.config/nvim/lua/plugins/mason.lua | 11 +- home/.config/nvim/lua/plugins/nvim-tree.lua | 10 +- home/.config/nvim/lua/plugins/telescope.lua | 24 +- home/.config/nvim/lua/plugins/treesitter.lua | 48 ++- home/.config/nvim/lua/plugins/which-key.lua | 2 +- home/.config/nvim/lua/settings.lua | 12 +- 16 files changed, 414 insertions(+), 352 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index fda453f1..b214b95b 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -24,10 +24,14 @@ fi staged_lua=$(echo "$staged_files" | grep '.lua$' || true) num_staged_lua=$(echo "$staged_lua" | grep -vce '^$' || true) if [ "$num_staged_lua" -gt 0 ]; then - printf '\nFormatting %s staged Lua files with lua-format\n' "$num_staged_lua" - stylua "$staged_lua" + printf '\nFormatting %s staged Lua files with stylua\n' "$num_staged_lua" + + for file in $staged_lua;do + stylua "$file" + done + printf "Re-staging\n\n" - git add "$staged_lua" + git add $staged_lua fi # Run shfmt on staged shell scripts diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 3763bcdc..29c6b90a 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,3 +1,3 @@ -require('keybinds') -require('settings') -require('plugins.init') +require("keybinds") +require("settings") +require("plugins.init") diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index 1aa69c2f..07bc29de 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -1,11 +1,11 @@ local map = vim.keymap.set -- Navigate between buffers -map('n', '', vim.cmd.bn, {silent = true}) -map('n', '', vim.cmd.bp, {silent = true}) +map("n", "", vim.cmd.bn, { silent = true }) +map("n", "", vim.cmd.bp, { silent = true }) -- Run Neoformat -map('n', '', vim.cmd.Neoformat, {}) +map("n", "", vim.cmd.Neoformat, {}) -- Exit terminal insert mode with esc -map('t', '', '', {}) +map("t", "", "", {}) diff --git a/home/.config/nvim/lua/pager.lua b/home/.config/nvim/lua/pager.lua index 56417452..aea0b8d7 100644 --- a/home/.config/nvim/lua/pager.lua +++ b/home/.config/nvim/lua/pager.lua @@ -1,2 +1,2 @@ -- Settings for pager mode -vim.keymap.set('n', 'q', vim.cmd.q) +vim.keymap.set("n", "q", vim.cmd.q) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 414d4f89..146f206e 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -1,56 +1,65 @@ return function() - local cmp = require('cmp') - local luasnip = require('luasnip') + local cmp = require("cmp") + local luasnip = require("luasnip") - if not cmp then return end + if not cmp then + return + end - -- Setup git completion source - require("cmp_git").setup() + -- Setup git completion source + require("cmp_git").setup() - -- Set completeopt to have a better completion experience - vim.o.completeopt = 'menuone,noselect' + -- Set completeopt to have a better completion experience + vim.o.completeopt = "menuone,noselect" - cmp.setup { - snippet = {expand = function(args) luasnip.lsp_expand(args.body) end}, - mapping = { - [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.close(), - [''] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Replace, - select = true - }, - [''] = function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, - [''] = function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end - }, - sources = { - {name = 'buffer'}, {name = 'git'}, {name = 'luasnip'}, - {name = 'nvim_lsp'}, {name = 'nvim_lua'}, {name = 'path'} - } - } - - -- Enable autopairs when enter is processed - -- on completion - local cmp_autopairs = require('nvim-autopairs.completion.cmp') - cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) + cmp.setup({ + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + mapping = { + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.close(), + [""] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }), + [""] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, + [""] = function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, + }, + sources = { + { name = "buffer" }, + { name = "git" }, + { name = "luasnip" }, + { name = "nvim_lsp" }, + { name = "nvim_lua" }, + { name = "path" }, + }, + }) + -- Enable autopairs when enter is processed + -- on completion + local cmp_autopairs = require("nvim-autopairs.completion.cmp") + cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) end diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index f48e612e..ca8dbf4f 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,8 +1,8 @@ return function() - vim.opt.list = true - require('indent_blankline').setup { - space_char_blankline = ' ', - show_current_context = true, - show_current_context_start = true - } + vim.opt.list = true + require("indent_blankline").setup({ + space_char_blankline = " ", + show_current_context = true, + show_current_context_start = true, + }) end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index aa949b33..de36bce9 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -1,202 +1,219 @@ local fn = vim.fn -- Install packer if it's not yet installed -local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim' +local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" if fn.empty(fn.glob(install_path)) > 0 then - print('Installing Packer') - Packer_bootstrap = fn.system({ - 'git', 'clone', '--depth', '1', - 'https://github.com/wbthomason/packer.nvim', install_path - }) - vim.cmd [[packadd packer.nvim]] - print('Installed Packer') + print("Installing Packer") + Packer_bootstrap = fn.system({ + "git", + "clone", + "--depth", + "1", + "https://github.com/wbthomason/packer.nvim", + install_path, + }) + vim.cmd([[packadd packer.nvim]]) + print("Installed Packer") end -- Configure packer -require('packer').startup(function() - local use = require('packer').use +require("packer").startup(function() + local use = require("packer").use - -- The plugin manager itself - use {'wbthomason/packer.nvim'} + -- The plugin manager itself + use({ "wbthomason/packer.nvim" }) - -- Colorscheme - use { - 'rebelot/kanagawa.nvim', - config = function() vim.cmd('colorscheme kanagawa') end - } + -- Colorscheme + use({ + "rebelot/kanagawa.nvim", + config = function() + vim.cmd("colorscheme kanagawa") + end, + }) - -- Statusline - use { - 'nvim-lualine/lualine.nvim', - requires = {'kyazdani42/nvim-web-devicons', opt = true}, - config = require('plugins.lualine') - } + -- Statusline + use({ + "nvim-lualine/lualine.nvim", + requires = { "kyazdani42/nvim-web-devicons", opt = true }, + config = require("plugins.lualine"), + }) - -- Startup screen/dashboard - --use 'glepnir/dashboard-nvim' + -- Startup screen/dashboard + --use 'glepnir/dashboard-nvim' - -- Git in signcolumn - use 'airblade/vim-gitgutter' + -- Git in signcolumn + use("airblade/vim-gitgutter") - -- Tabline/bufferline - use { - 'akinsho/nvim-bufferline.lua', - tag = '*', - requires = 'kyazdani42/nvim-web-devicons', - config = function() require('bufferline').setup {} end - } + -- Tabline/bufferline + use({ + "akinsho/nvim-bufferline.lua", + tag = "*", + requires = "kyazdani42/nvim-web-devicons", + config = function() + require("bufferline").setup({}) + end, + }) - -- Git commands - use 'tpope/vim-fugitive' + -- Git commands + use("tpope/vim-fugitive") - -- Indent characters - use { - 'lukas-reineke/indent-blankline.nvim', - config = require('plugins.indent-blankline') - } + -- Indent characters + use({ + "lukas-reineke/indent-blankline.nvim", + config = require("plugins.indent-blankline"), + }) - -- Tree explorer - use { - 'kyazdani42/nvim-tree.lua', - requires = 'kyazdani42/nvim-web-devicons', - config = require('plugins.nvim-tree') - } + -- Tree explorer + use({ + "kyazdani42/nvim-tree.lua", + requires = "kyazdani42/nvim-web-devicons", + config = require("plugins.nvim-tree"), + }) - -- Telescope - use { - 'nvim-telescope/telescope.nvim', - config = require('plugins.telescope'), - requires = { - {'nvim-lua/plenary.nvim'}, -- Internal dep for telescope - {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'}, -- Use fzf for fuzzy finder - {'nvim-telescope/telescope-ui-select.nvim'}, -- Replace vim built in select with telescope - {'zane-/cder.nvim'}, -- cd plugin for telescope - } - } + -- Telescope + use({ + "nvim-telescope/telescope.nvim", + config = require("plugins.telescope"), + requires = { + { "nvim-lua/plenary.nvim" }, -- Internal dep for telescope + { "nvim-telescope/telescope-fzf-native.nvim", run = "make" }, -- Use fzf for fuzzy finder + { "nvim-telescope/telescope-ui-select.nvim" }, -- Replace vim built in select with telescope + { "zane-/cder.nvim" }, -- cd plugin for telescope + }, + }) - -- Do stuff as sudo - use 'lambdalisue/suda.vim' + -- Do stuff as sudo + use("lambdalisue/suda.vim") - -- Display possible keybinds - use {'folke/which-key.nvim', config = require('plugins.which-key')} + -- Display possible keybinds + use({ "folke/which-key.nvim", config = require("plugins.which-key") }) - -- Read editorconfig settings - use 'editorconfig/editorconfig-vim' + -- Read editorconfig settings + use("editorconfig/editorconfig-vim") - -- Package manager for LSP servers, DAP servers etc. - use {'williamboman/mason.nvim', config = require('plugins.mason').setup} + -- Package manager for LSP servers, DAP servers etc. + use({ "williamboman/mason.nvim", config = require("plugins.mason").setup }) - -- Install LSP server executables with Mason - use { - 'williamboman/mason-lspconfig.nvim', - config = require('plugins.mason').lspconfig_setup - } + -- Install LSP server executables with Mason + use({ + "williamboman/mason-lspconfig.nvim", + config = require("plugins.mason").lspconfig_setup, + }) - -- Configs for built-in LSP - use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup} + -- Configs for built-in LSP + use({ "neovim/nvim-lspconfig", config = require("plugins.lspconfig").setup }) - -- Additional LSP features for Java - use 'mfussenegger/nvim-jdtls' + -- Additional LSP features for Java + use("mfussenegger/nvim-jdtls") - -- Display function signature - use 'ray-x/lsp_signature.nvim' + -- Display function signature + use("ray-x/lsp_signature.nvim") - -- Snippets plugin - use { - 'L3MON4D3/LuaSnip', - requires = {'rafamadriz/friendly-snippets'}, -- Snippets collection - config = require('plugins.luasnip') - } + -- Snippets plugin + use({ + "L3MON4D3/LuaSnip", + requires = { "rafamadriz/friendly-snippets" }, -- Snippets collection + config = require("plugins.luasnip"), + }) - -- vim api documentation for lua lsp - use {'ii14/emmylua-nvim'} + -- vim api documentation for lua lsp + use({ "ii14/emmylua-nvim" }) - -- Completion - use { - 'hrsh7th/nvim-cmp', - requires = { - {'hrsh7th/cmp-buffer'}, -- Buffer source - {'petertriho/cmp-git', requires = 'nvim-lua/plenary.nvim'}, -- Git source - {'hrsh7th/cmp-nvim-lsp'}, -- LSP source - {'hrsh7th/cmp-nvim-lua'}, -- Neovim Lua API documentation source - {'hrsh7th/cmp-path'}, -- Path source - {'saadparwaiz1/cmp_luasnip'} -- Snippets source - }, - config = require('plugins.cmp') - } + -- Completion + use({ + "hrsh7th/nvim-cmp", + requires = { + { "hrsh7th/cmp-buffer" }, -- Buffer source + { "petertriho/cmp-git", requires = "nvim-lua/plenary.nvim" }, -- Git source + { "hrsh7th/cmp-nvim-lsp" }, -- LSP source + { "hrsh7th/cmp-nvim-lua" }, -- Neovim Lua API documentation source + { "hrsh7th/cmp-path" }, -- Path source + { "saadparwaiz1/cmp_luasnip" }, -- Snippets source + }, + config = require("plugins.cmp"), + }) - -- Automatic brackets - use { - 'windwp/nvim-autopairs', - config = function() require('nvim-autopairs').setup {} end - } + -- Automatic brackets + use({ + "windwp/nvim-autopairs", + config = function() + require("nvim-autopairs").setup({}) + end, + }) - -- treesitter - use { - 'nvim-treesitter/nvim-treesitter', - run = function() - require('nvim-treesitter.install').update({with_sync = true}) - end, - config = require('plugins.treesitter') - } + -- treesitter + use({ + "nvim-treesitter/nvim-treesitter", + run = function() + require("nvim-treesitter.install").update({ with_sync = true }) + end, + config = require("plugins.treesitter"), + }) - -- treesitter plugin for commentstring - use 'JoosepAlviste/nvim-ts-context-commentstring' + -- treesitter plugin for commentstring + use("JoosepAlviste/nvim-ts-context-commentstring") - -- Additional plugins for formats not supported - -- by treesitter - use 'jamespeapen/swayconfig.vim' + -- Additional plugins for formats not supported + -- by treesitter + use("jamespeapen/swayconfig.vim") - -- mappings for commenting in code - use 'tpope/vim-commentary' + -- mappings for commenting in code + use("tpope/vim-commentary") - -- we all know this one - use 'tpope/vim-surround' + -- we all know this one + use("tpope/vim-surround") - -- Formatter plugin - use 'sbdchd/neoformat' + -- Formatter plugin + use("sbdchd/neoformat") - -- Make editing passwords safer - use { - 'https://git.zx2c4.com/password-store', - rtp = 'contrib/vim/redact_pass.vim' - } + -- Make editing passwords safer + use({ + "https://git.zx2c4.com/password-store", + rtp = "contrib/vim/redact_pass.vim", + }) - -- Neovim inside Firefox - use { - 'glacambre/firenvim', - run = function() vim.fn['firenvim#install'](0) end - } + -- Neovim inside Firefox + use({ + "glacambre/firenvim", + run = function() + vim.fn["firenvim#install"](0) + end, + }) - -- Vim <3 Asciidoctor - use 'habamax/vim-asciidoctor' + -- Vim <3 Asciidoctor + use("habamax/vim-asciidoctor") - -- Markdown preview - use({ - 'iamcco/markdown-preview.nvim', - run = 'cd app && npm install', - setup = function() vim.g.mkdp_filetypes = {'markdown'} end, - ft = {'markdown'} - }) + -- Markdown preview + use({ + "iamcco/markdown-preview.nvim", + run = "cd app && npm install", + setup = function() + vim.g.mkdp_filetypes = { "markdown" } + end, + ft = { "markdown" }, + }) - -- Edit GPG encrypted files transparently - use 'jamessan/vim-gnupg' + -- Edit GPG encrypted files transparently + use("jamessan/vim-gnupg") - -- High performance color highlighter - use { - 'norcalli/nvim-colorizer.lua', - config = function() require('colorizer').setup() end - } - - -- If Packer was just installed, - -- sync plugins - if Packer_bootstrap then require('packer').sync() end + -- High performance color highlighter + use({ + "norcalli/nvim-colorizer.lua", + config = function() + require("colorizer").setup() + end, + }) + -- If Packer was just installed, + -- sync plugins + if Packer_bootstrap then + require("packer").sync() + end end) -- Sync plugins if Packer was just -- installed if Packer_bootstrap then - print('Syncing plugins') - require('packer').sync() + print("Syncing plugins") + require("packer").sync() end diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 65e3a7c9..6dc0e36e 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -2,95 +2,94 @@ -- This is iterated through and every -- server is setup with lspconfig Servers = { - bashls = {}, - html = {}, - jsonls = {}, - lemminx = {}, - marksman = {}, - yamlls = {}, - taplo = {}, - tsserver = {}, - sumneko_lua = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = 'LuaJIT' - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = {'vim'} - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file('', true) - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = {enable = false} - } - } + bashls = {}, + html = {}, + jsonls = {}, + lemminx = {}, + marksman = {}, + yamlls = {}, + taplo = {}, + tsserver = {}, + sumneko_lua = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = "LuaJIT", + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = { "vim" }, + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file("", true), + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = { enable = false }, + }, + }, } M = {} function M.map_keys() - -- Register keybindings via which-key - -- to get documentation in which-key - local wk = require('which-key') - wk.register({ - g = { - name = "Go to", - d = {vim.lsp.buf.definition, "Definition"}, - D = {vim.lsp.buf.declaration, "Declaration"}, - i = {vim.lsp.buf.implementation, "Implementation"}, - r = {vim.lsp.buf.references, "References"} - }, - [''] = { - name = "Leader", - w = { - name = "Workspace", - a = {vim.lsp.buf.add_workspace_folder, "Add folder"}, - r = {vim.lsp.buf.remove_workspace_folder, "Remove folder"}, - l = { - function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, "List folders" - } - }, - D = {vim.lsp.buf.type_definition, "Type definition"}, - rn = {vim.lsp.buf.rename, "Rename symbol"}, - ca = {vim.lsp.buf.code_action, "Code action"}, - e = {vim.diagnostic.open_float, "Open diagnostics"}, - f = {vim.lsp.buf.format, "Format"} - }, - K = {vim.lsp.buf.hover, "Hover"}, - ['['] = {d = {vim.diagnostic.goto_prev, "Previous diagnostic"}}, - [']'] = {d = {vim.diagnostic.goto_next, "Next diagnostic"}} - - }) + -- Register keybindings via which-key + -- to get documentation in which-key + local wk = require("which-key") + wk.register({ + g = { + name = "Go to", + d = { vim.lsp.buf.definition, "Definition" }, + D = { vim.lsp.buf.declaration, "Declaration" }, + i = { vim.lsp.buf.implementation, "Implementation" }, + r = { vim.lsp.buf.references, "References" }, + }, + [""] = { + name = "Leader", + w = { + name = "Workspace", + a = { vim.lsp.buf.add_workspace_folder, "Add folder" }, + r = { vim.lsp.buf.remove_workspace_folder, "Remove folder" }, + l = { + function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, + "List folders", + }, + }, + D = { vim.lsp.buf.type_definition, "Type definition" }, + rn = { vim.lsp.buf.rename, "Rename symbol" }, + ca = { vim.lsp.buf.code_action, "Code action" }, + e = { vim.diagnostic.open_float, "Open diagnostics" }, + f = { vim.lsp.buf.format, "Format" }, + }, + K = { vim.lsp.buf.hover, "Hover" }, + ["["] = { d = { vim.diagnostic.goto_prev, "Previous diagnostic" } }, + ["]"] = { d = { vim.diagnostic.goto_next, "Next diagnostic" } }, + }) end function M.setup() + local function on_attach() + -- Setup lsp signature plugin + require("lsp_signature").setup({}) - local function on_attach() - -- Setup lsp signature plugin - require('lsp_signature').setup {} + -- Setup keybinds + M.map_keys() + end - -- Setup keybinds - M.map_keys() - end + local capabilities = require("cmp_nvim_lsp").default_capabilities() - local capabilities = require('cmp_nvim_lsp').default_capabilities() - - -- Setup every defined server - for server, settings in pairs(Servers) do - require('lspconfig')[server].setup { - on_attach = on_attach, - settings = settings, - -- Inform lsp server about client - -- capabilities - capabilities = capabilities - } - end + -- Setup every defined server + for server, settings in pairs(Servers) do + require("lspconfig")[server].setup({ + on_attach = on_attach, + settings = settings, + -- Inform lsp server about client + -- capabilities + capabilities = capabilities, + }) + end end return M diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 861aa738..18c9a012 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1 +1,3 @@ -return function() require('lualine').setup {} end +return function() + require("lualine").setup({}) +end diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index 730f7a19..41422738 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -1,15 +1,23 @@ return function() - local luasnip = require('luasnip') - local wk = require('which-key') + local luasnip = require("luasnip") + local wk = require("which-key") - -- load friendly-snippets to luasnip - require('luasnip/loaders/from_vscode').lazy_load() + -- load friendly-snippets to luasnip + require("luasnip/loaders/from_vscode").lazy_load() - -- Register snippet navigation keybindings - local snippet_mappings = { - [''] = {function()luasnip.jump(1) end}, - [''] = {function() luasnip.jump(-1) end} - } - --wk.register(snippet_mappings, {mode = "i"}) - --wk.register(snippet_mappings, {mode = "s"}) + -- Register snippet navigation keybindings + local snippet_mappings = { + [""] = { + function() + luasnip.jump(1) + end, + }, + [""] = { + function() + luasnip.jump(-1) + end, + }, + } + --wk.register(snippet_mappings, {mode = "i"}) + --wk.register(snippet_mappings, {mode = "s"}) end diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index f774b81f..225d50fb 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -1,10 +1,13 @@ local M = {} -Opts = {mason = {}, lspconfig = {automatic_installation = true}} +Opts = { mason = {}, lspconfig = { automatic_installation = true } } -M.setup = function() require('mason').setup(Opts.mason) end +M.setup = function() + require("mason").setup(Opts.mason) +end -M.lspconfig_setup = - function() require('mason-lspconfig').setup(Opts.lspconfig) end +M.lspconfig_setup = function() + require("mason-lspconfig").setup(Opts.lspconfig) +end return M diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index a3826292..7f86f960 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -1,13 +1,13 @@ return function() - require("nvim-tree").setup { -- BEGIN_DEFAULT_OPTS + require("nvim-tree").setup({ -- BEGIN_DEFAULT_OPTS diagnostics = { enable = true, show_on_dirs = true, }, renderer = { - highlight_git = true - } - } + highlight_git = true, + }, + }) -- Open/close with alt-o - vim.keymap.set('n', '', vim.cmd.NvimTreeToggle) + vim.keymap.set("n", "", vim.cmd.NvimTreeToggle) end diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index a4a13baa..c647c413 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,17 +1,17 @@ return function() - local telescope = require('telescope') - local builtin = require('telescope.builtin') + local telescope = require("telescope") + local builtin = require("telescope.builtin") - telescope.setup { - pickers = {find_files = {find_command = {"fd", "-Ht", "f"}}} - } + telescope.setup({ + pickers = { find_files = { find_command = { "fd", "-Ht", "f" } } }, + }) - telescope.load_extension('fzf') - telescope.load_extension('ui-select') - telescope.load_extension('cder') + telescope.load_extension("fzf") + telescope.load_extension("ui-select") + telescope.load_extension("cder") - -- Keybinds - vim.keymap.set('n', '', vim.cmd.Telescope) - vim.keymap.set('n', '', builtin.find_files) - vim.keymap.set('n', '', builtin.live_grep) + -- Keybinds + vim.keymap.set("n", "", vim.cmd.Telescope) + vim.keymap.set("n", "", builtin.find_files) + vim.keymap.set("n", "", builtin.live_grep) end diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index ffef72a1..64fea67e 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -1,17 +1,37 @@ return function() - require'nvim-treesitter.configs'.setup { - ensure_installed = { - 'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json', - 'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python', - 'regex', 'rasi', 'rst', 'scss', 'toml', 'tsx', 'typescript', - 'javascript', 'yaml' - }, - highlight = {enable = true}, - indent = {enable = true}, - incremental_selection = {enable = true}, - context_commentstring = {enable = true} - } + require("nvim-treesitter.configs").setup({ + ensure_installed = { + "bash", + "c", + "css", + "dockerfile", + "html", + "http", + "java", + "json", + "json5", + "latex", + "lua", + "make", + "markdown", + "php", + "python", + "regex", + "rasi", + "rst", + "scss", + "toml", + "tsx", + "typescript", + "javascript", + "yaml", + }, + highlight = { enable = true }, + indent = { enable = true }, + incremental_selection = { enable = true }, + context_commentstring = { enable = true }, + }) - -- vim.wo.foldmethod = 'expr' - -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' + -- vim.wo.foldmethod = 'expr' + -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' end diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index a1eab54b..405773bc 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -1,3 +1,3 @@ return function() - require('which-key').setup {spelling = {enabled = true}} + require("which-key").setup({ spelling = { enabled = true } }) end diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index e3956297..acfaf76f 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -5,17 +5,17 @@ local g = vim.g o.termguicolors = true -- Font for nvim GUI's -o.guifont = 'Fira Code:h14' +o.guifont = "Fira Code:h14" -- Floating window transparency o.winblend = 10 -- Set window title o.title = true -o.titlestring = 'NeoVim: ' .. vim.fn.getcwd() +o.titlestring = "NeoVim: " .. vim.fn.getcwd() -- Diff settings -o.diffopt = 'filler,internal,algorithm:histogram,indent-heuristic' +o.diffopt = "filler,internal,algorithm:histogram,indent-heuristic" -- Allow switching buffers with unsaved changes o.hidden = true @@ -24,9 +24,9 @@ o.hidden = true o.number = true o.guicursor = table.concat({ - 'i:ver1', -- Vertical bar cursor in insert mode - 'a:blinkon1' -- Blinking cursor in all modes -}, ',') + "i:ver1", -- Vertical bar cursor in insert mode + "a:blinkon1", -- Blinking cursor in all modes +}, ",") -- Enable global statusline o.laststatus = 3 From 16e59402c738d279b2fc8bb877806a007f5f8e3f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Oct 2022 14:08:20 +0300 Subject: [PATCH 1602/2667] Reformat all neovim configuration files with stylua --- .husky/pre-commit | 10 +- home/.config/nvim/init.lua | 6 +- home/.config/nvim/lua/keybinds.lua | 8 +- home/.config/nvim/lua/pager.lua | 2 +- home/.config/nvim/lua/plugins/cmp.lua | 107 +++--- .../nvim/lua/plugins/indent-blankline.lua | 12 +- home/.config/nvim/lua/plugins/init.lua | 325 +++++++++--------- home/.config/nvim/lua/plugins/lspconfig.lua | 155 +++++---- home/.config/nvim/lua/plugins/lualine.lua | 4 +- home/.config/nvim/lua/plugins/luasnip.lua | 30 +- home/.config/nvim/lua/plugins/mason.lua | 11 +- home/.config/nvim/lua/plugins/nvim-tree.lua | 10 +- home/.config/nvim/lua/plugins/telescope.lua | 24 +- home/.config/nvim/lua/plugins/treesitter.lua | 48 ++- home/.config/nvim/lua/plugins/which-key.lua | 2 +- home/.config/nvim/lua/settings.lua | 12 +- 16 files changed, 414 insertions(+), 352 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index fda453f1..b214b95b 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -24,10 +24,14 @@ fi staged_lua=$(echo "$staged_files" | grep '.lua$' || true) num_staged_lua=$(echo "$staged_lua" | grep -vce '^$' || true) if [ "$num_staged_lua" -gt 0 ]; then - printf '\nFormatting %s staged Lua files with lua-format\n' "$num_staged_lua" - stylua "$staged_lua" + printf '\nFormatting %s staged Lua files with stylua\n' "$num_staged_lua" + + for file in $staged_lua;do + stylua "$file" + done + printf "Re-staging\n\n" - git add "$staged_lua" + git add $staged_lua fi # Run shfmt on staged shell scripts diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 3763bcdc..29c6b90a 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,3 +1,3 @@ -require('keybinds') -require('settings') -require('plugins.init') +require("keybinds") +require("settings") +require("plugins.init") diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index 1aa69c2f..07bc29de 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -1,11 +1,11 @@ local map = vim.keymap.set -- Navigate between buffers -map('n', '', vim.cmd.bn, {silent = true}) -map('n', '', vim.cmd.bp, {silent = true}) +map("n", "", vim.cmd.bn, { silent = true }) +map("n", "", vim.cmd.bp, { silent = true }) -- Run Neoformat -map('n', '', vim.cmd.Neoformat, {}) +map("n", "", vim.cmd.Neoformat, {}) -- Exit terminal insert mode with esc -map('t', '', '', {}) +map("t", "", "", {}) diff --git a/home/.config/nvim/lua/pager.lua b/home/.config/nvim/lua/pager.lua index 56417452..aea0b8d7 100644 --- a/home/.config/nvim/lua/pager.lua +++ b/home/.config/nvim/lua/pager.lua @@ -1,2 +1,2 @@ -- Settings for pager mode -vim.keymap.set('n', 'q', vim.cmd.q) +vim.keymap.set("n", "q", vim.cmd.q) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 414d4f89..146f206e 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -1,56 +1,65 @@ return function() - local cmp = require('cmp') - local luasnip = require('luasnip') + local cmp = require("cmp") + local luasnip = require("luasnip") - if not cmp then return end + if not cmp then + return + end - -- Setup git completion source - require("cmp_git").setup() + -- Setup git completion source + require("cmp_git").setup() - -- Set completeopt to have a better completion experience - vim.o.completeopt = 'menuone,noselect' + -- Set completeopt to have a better completion experience + vim.o.completeopt = "menuone,noselect" - cmp.setup { - snippet = {expand = function(args) luasnip.lsp_expand(args.body) end}, - mapping = { - [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.close(), - [''] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Replace, - select = true - }, - [''] = function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, - [''] = function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end - }, - sources = { - {name = 'buffer'}, {name = 'git'}, {name = 'luasnip'}, - {name = 'nvim_lsp'}, {name = 'nvim_lua'}, {name = 'path'} - } - } - - -- Enable autopairs when enter is processed - -- on completion - local cmp_autopairs = require('nvim-autopairs.completion.cmp') - cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) + cmp.setup({ + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + mapping = { + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.close(), + [""] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }), + [""] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, + [""] = function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, + }, + sources = { + { name = "buffer" }, + { name = "git" }, + { name = "luasnip" }, + { name = "nvim_lsp" }, + { name = "nvim_lua" }, + { name = "path" }, + }, + }) + -- Enable autopairs when enter is processed + -- on completion + local cmp_autopairs = require("nvim-autopairs.completion.cmp") + cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) end diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index f48e612e..ca8dbf4f 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,8 +1,8 @@ return function() - vim.opt.list = true - require('indent_blankline').setup { - space_char_blankline = ' ', - show_current_context = true, - show_current_context_start = true - } + vim.opt.list = true + require("indent_blankline").setup({ + space_char_blankline = " ", + show_current_context = true, + show_current_context_start = true, + }) end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index aa949b33..de36bce9 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -1,202 +1,219 @@ local fn = vim.fn -- Install packer if it's not yet installed -local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim' +local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" if fn.empty(fn.glob(install_path)) > 0 then - print('Installing Packer') - Packer_bootstrap = fn.system({ - 'git', 'clone', '--depth', '1', - 'https://github.com/wbthomason/packer.nvim', install_path - }) - vim.cmd [[packadd packer.nvim]] - print('Installed Packer') + print("Installing Packer") + Packer_bootstrap = fn.system({ + "git", + "clone", + "--depth", + "1", + "https://github.com/wbthomason/packer.nvim", + install_path, + }) + vim.cmd([[packadd packer.nvim]]) + print("Installed Packer") end -- Configure packer -require('packer').startup(function() - local use = require('packer').use +require("packer").startup(function() + local use = require("packer").use - -- The plugin manager itself - use {'wbthomason/packer.nvim'} + -- The plugin manager itself + use({ "wbthomason/packer.nvim" }) - -- Colorscheme - use { - 'rebelot/kanagawa.nvim', - config = function() vim.cmd('colorscheme kanagawa') end - } + -- Colorscheme + use({ + "rebelot/kanagawa.nvim", + config = function() + vim.cmd("colorscheme kanagawa") + end, + }) - -- Statusline - use { - 'nvim-lualine/lualine.nvim', - requires = {'kyazdani42/nvim-web-devicons', opt = true}, - config = require('plugins.lualine') - } + -- Statusline + use({ + "nvim-lualine/lualine.nvim", + requires = { "kyazdani42/nvim-web-devicons", opt = true }, + config = require("plugins.lualine"), + }) - -- Startup screen/dashboard - --use 'glepnir/dashboard-nvim' + -- Startup screen/dashboard + --use 'glepnir/dashboard-nvim' - -- Git in signcolumn - use 'airblade/vim-gitgutter' + -- Git in signcolumn + use("airblade/vim-gitgutter") - -- Tabline/bufferline - use { - 'akinsho/nvim-bufferline.lua', - tag = '*', - requires = 'kyazdani42/nvim-web-devicons', - config = function() require('bufferline').setup {} end - } + -- Tabline/bufferline + use({ + "akinsho/nvim-bufferline.lua", + tag = "*", + requires = "kyazdani42/nvim-web-devicons", + config = function() + require("bufferline").setup({}) + end, + }) - -- Git commands - use 'tpope/vim-fugitive' + -- Git commands + use("tpope/vim-fugitive") - -- Indent characters - use { - 'lukas-reineke/indent-blankline.nvim', - config = require('plugins.indent-blankline') - } + -- Indent characters + use({ + "lukas-reineke/indent-blankline.nvim", + config = require("plugins.indent-blankline"), + }) - -- Tree explorer - use { - 'kyazdani42/nvim-tree.lua', - requires = 'kyazdani42/nvim-web-devicons', - config = require('plugins.nvim-tree') - } + -- Tree explorer + use({ + "kyazdani42/nvim-tree.lua", + requires = "kyazdani42/nvim-web-devicons", + config = require("plugins.nvim-tree"), + }) - -- Telescope - use { - 'nvim-telescope/telescope.nvim', - config = require('plugins.telescope'), - requires = { - {'nvim-lua/plenary.nvim'}, -- Internal dep for telescope - {'nvim-telescope/telescope-fzf-native.nvim', run = 'make'}, -- Use fzf for fuzzy finder - {'nvim-telescope/telescope-ui-select.nvim'}, -- Replace vim built in select with telescope - {'zane-/cder.nvim'}, -- cd plugin for telescope - } - } + -- Telescope + use({ + "nvim-telescope/telescope.nvim", + config = require("plugins.telescope"), + requires = { + { "nvim-lua/plenary.nvim" }, -- Internal dep for telescope + { "nvim-telescope/telescope-fzf-native.nvim", run = "make" }, -- Use fzf for fuzzy finder + { "nvim-telescope/telescope-ui-select.nvim" }, -- Replace vim built in select with telescope + { "zane-/cder.nvim" }, -- cd plugin for telescope + }, + }) - -- Do stuff as sudo - use 'lambdalisue/suda.vim' + -- Do stuff as sudo + use("lambdalisue/suda.vim") - -- Display possible keybinds - use {'folke/which-key.nvim', config = require('plugins.which-key')} + -- Display possible keybinds + use({ "folke/which-key.nvim", config = require("plugins.which-key") }) - -- Read editorconfig settings - use 'editorconfig/editorconfig-vim' + -- Read editorconfig settings + use("editorconfig/editorconfig-vim") - -- Package manager for LSP servers, DAP servers etc. - use {'williamboman/mason.nvim', config = require('plugins.mason').setup} + -- Package manager for LSP servers, DAP servers etc. + use({ "williamboman/mason.nvim", config = require("plugins.mason").setup }) - -- Install LSP server executables with Mason - use { - 'williamboman/mason-lspconfig.nvim', - config = require('plugins.mason').lspconfig_setup - } + -- Install LSP server executables with Mason + use({ + "williamboman/mason-lspconfig.nvim", + config = require("plugins.mason").lspconfig_setup, + }) - -- Configs for built-in LSP - use {'neovim/nvim-lspconfig', config = require('plugins.lspconfig').setup} + -- Configs for built-in LSP + use({ "neovim/nvim-lspconfig", config = require("plugins.lspconfig").setup }) - -- Additional LSP features for Java - use 'mfussenegger/nvim-jdtls' + -- Additional LSP features for Java + use("mfussenegger/nvim-jdtls") - -- Display function signature - use 'ray-x/lsp_signature.nvim' + -- Display function signature + use("ray-x/lsp_signature.nvim") - -- Snippets plugin - use { - 'L3MON4D3/LuaSnip', - requires = {'rafamadriz/friendly-snippets'}, -- Snippets collection - config = require('plugins.luasnip') - } + -- Snippets plugin + use({ + "L3MON4D3/LuaSnip", + requires = { "rafamadriz/friendly-snippets" }, -- Snippets collection + config = require("plugins.luasnip"), + }) - -- vim api documentation for lua lsp - use {'ii14/emmylua-nvim'} + -- vim api documentation for lua lsp + use({ "ii14/emmylua-nvim" }) - -- Completion - use { - 'hrsh7th/nvim-cmp', - requires = { - {'hrsh7th/cmp-buffer'}, -- Buffer source - {'petertriho/cmp-git', requires = 'nvim-lua/plenary.nvim'}, -- Git source - {'hrsh7th/cmp-nvim-lsp'}, -- LSP source - {'hrsh7th/cmp-nvim-lua'}, -- Neovim Lua API documentation source - {'hrsh7th/cmp-path'}, -- Path source - {'saadparwaiz1/cmp_luasnip'} -- Snippets source - }, - config = require('plugins.cmp') - } + -- Completion + use({ + "hrsh7th/nvim-cmp", + requires = { + { "hrsh7th/cmp-buffer" }, -- Buffer source + { "petertriho/cmp-git", requires = "nvim-lua/plenary.nvim" }, -- Git source + { "hrsh7th/cmp-nvim-lsp" }, -- LSP source + { "hrsh7th/cmp-nvim-lua" }, -- Neovim Lua API documentation source + { "hrsh7th/cmp-path" }, -- Path source + { "saadparwaiz1/cmp_luasnip" }, -- Snippets source + }, + config = require("plugins.cmp"), + }) - -- Automatic brackets - use { - 'windwp/nvim-autopairs', - config = function() require('nvim-autopairs').setup {} end - } + -- Automatic brackets + use({ + "windwp/nvim-autopairs", + config = function() + require("nvim-autopairs").setup({}) + end, + }) - -- treesitter - use { - 'nvim-treesitter/nvim-treesitter', - run = function() - require('nvim-treesitter.install').update({with_sync = true}) - end, - config = require('plugins.treesitter') - } + -- treesitter + use({ + "nvim-treesitter/nvim-treesitter", + run = function() + require("nvim-treesitter.install").update({ with_sync = true }) + end, + config = require("plugins.treesitter"), + }) - -- treesitter plugin for commentstring - use 'JoosepAlviste/nvim-ts-context-commentstring' + -- treesitter plugin for commentstring + use("JoosepAlviste/nvim-ts-context-commentstring") - -- Additional plugins for formats not supported - -- by treesitter - use 'jamespeapen/swayconfig.vim' + -- Additional plugins for formats not supported + -- by treesitter + use("jamespeapen/swayconfig.vim") - -- mappings for commenting in code - use 'tpope/vim-commentary' + -- mappings for commenting in code + use("tpope/vim-commentary") - -- we all know this one - use 'tpope/vim-surround' + -- we all know this one + use("tpope/vim-surround") - -- Formatter plugin - use 'sbdchd/neoformat' + -- Formatter plugin + use("sbdchd/neoformat") - -- Make editing passwords safer - use { - 'https://git.zx2c4.com/password-store', - rtp = 'contrib/vim/redact_pass.vim' - } + -- Make editing passwords safer + use({ + "https://git.zx2c4.com/password-store", + rtp = "contrib/vim/redact_pass.vim", + }) - -- Neovim inside Firefox - use { - 'glacambre/firenvim', - run = function() vim.fn['firenvim#install'](0) end - } + -- Neovim inside Firefox + use({ + "glacambre/firenvim", + run = function() + vim.fn["firenvim#install"](0) + end, + }) - -- Vim <3 Asciidoctor - use 'habamax/vim-asciidoctor' + -- Vim <3 Asciidoctor + use("habamax/vim-asciidoctor") - -- Markdown preview - use({ - 'iamcco/markdown-preview.nvim', - run = 'cd app && npm install', - setup = function() vim.g.mkdp_filetypes = {'markdown'} end, - ft = {'markdown'} - }) + -- Markdown preview + use({ + "iamcco/markdown-preview.nvim", + run = "cd app && npm install", + setup = function() + vim.g.mkdp_filetypes = { "markdown" } + end, + ft = { "markdown" }, + }) - -- Edit GPG encrypted files transparently - use 'jamessan/vim-gnupg' + -- Edit GPG encrypted files transparently + use("jamessan/vim-gnupg") - -- High performance color highlighter - use { - 'norcalli/nvim-colorizer.lua', - config = function() require('colorizer').setup() end - } - - -- If Packer was just installed, - -- sync plugins - if Packer_bootstrap then require('packer').sync() end + -- High performance color highlighter + use({ + "norcalli/nvim-colorizer.lua", + config = function() + require("colorizer").setup() + end, + }) + -- If Packer was just installed, + -- sync plugins + if Packer_bootstrap then + require("packer").sync() + end end) -- Sync plugins if Packer was just -- installed if Packer_bootstrap then - print('Syncing plugins') - require('packer').sync() + print("Syncing plugins") + require("packer").sync() end diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 65e3a7c9..6dc0e36e 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -2,95 +2,94 @@ -- This is iterated through and every -- server is setup with lspconfig Servers = { - bashls = {}, - html = {}, - jsonls = {}, - lemminx = {}, - marksman = {}, - yamlls = {}, - taplo = {}, - tsserver = {}, - sumneko_lua = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = 'LuaJIT' - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = {'vim'} - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file('', true) - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = {enable = false} - } - } + bashls = {}, + html = {}, + jsonls = {}, + lemminx = {}, + marksman = {}, + yamlls = {}, + taplo = {}, + tsserver = {}, + sumneko_lua = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = "LuaJIT", + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = { "vim" }, + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file("", true), + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = { enable = false }, + }, + }, } M = {} function M.map_keys() - -- Register keybindings via which-key - -- to get documentation in which-key - local wk = require('which-key') - wk.register({ - g = { - name = "Go to", - d = {vim.lsp.buf.definition, "Definition"}, - D = {vim.lsp.buf.declaration, "Declaration"}, - i = {vim.lsp.buf.implementation, "Implementation"}, - r = {vim.lsp.buf.references, "References"} - }, - [''] = { - name = "Leader", - w = { - name = "Workspace", - a = {vim.lsp.buf.add_workspace_folder, "Add folder"}, - r = {vim.lsp.buf.remove_workspace_folder, "Remove folder"}, - l = { - function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, "List folders" - } - }, - D = {vim.lsp.buf.type_definition, "Type definition"}, - rn = {vim.lsp.buf.rename, "Rename symbol"}, - ca = {vim.lsp.buf.code_action, "Code action"}, - e = {vim.diagnostic.open_float, "Open diagnostics"}, - f = {vim.lsp.buf.format, "Format"} - }, - K = {vim.lsp.buf.hover, "Hover"}, - ['['] = {d = {vim.diagnostic.goto_prev, "Previous diagnostic"}}, - [']'] = {d = {vim.diagnostic.goto_next, "Next diagnostic"}} - - }) + -- Register keybindings via which-key + -- to get documentation in which-key + local wk = require("which-key") + wk.register({ + g = { + name = "Go to", + d = { vim.lsp.buf.definition, "Definition" }, + D = { vim.lsp.buf.declaration, "Declaration" }, + i = { vim.lsp.buf.implementation, "Implementation" }, + r = { vim.lsp.buf.references, "References" }, + }, + [""] = { + name = "Leader", + w = { + name = "Workspace", + a = { vim.lsp.buf.add_workspace_folder, "Add folder" }, + r = { vim.lsp.buf.remove_workspace_folder, "Remove folder" }, + l = { + function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, + "List folders", + }, + }, + D = { vim.lsp.buf.type_definition, "Type definition" }, + rn = { vim.lsp.buf.rename, "Rename symbol" }, + ca = { vim.lsp.buf.code_action, "Code action" }, + e = { vim.diagnostic.open_float, "Open diagnostics" }, + f = { vim.lsp.buf.format, "Format" }, + }, + K = { vim.lsp.buf.hover, "Hover" }, + ["["] = { d = { vim.diagnostic.goto_prev, "Previous diagnostic" } }, + ["]"] = { d = { vim.diagnostic.goto_next, "Next diagnostic" } }, + }) end function M.setup() + local function on_attach() + -- Setup lsp signature plugin + require("lsp_signature").setup({}) - local function on_attach() - -- Setup lsp signature plugin - require('lsp_signature').setup {} + -- Setup keybinds + M.map_keys() + end - -- Setup keybinds - M.map_keys() - end + local capabilities = require("cmp_nvim_lsp").default_capabilities() - local capabilities = require('cmp_nvim_lsp').default_capabilities() - - -- Setup every defined server - for server, settings in pairs(Servers) do - require('lspconfig')[server].setup { - on_attach = on_attach, - settings = settings, - -- Inform lsp server about client - -- capabilities - capabilities = capabilities - } - end + -- Setup every defined server + for server, settings in pairs(Servers) do + require("lspconfig")[server].setup({ + on_attach = on_attach, + settings = settings, + -- Inform lsp server about client + -- capabilities + capabilities = capabilities, + }) + end end return M diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 861aa738..18c9a012 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1 +1,3 @@ -return function() require('lualine').setup {} end +return function() + require("lualine").setup({}) +end diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index 730f7a19..41422738 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -1,15 +1,23 @@ return function() - local luasnip = require('luasnip') - local wk = require('which-key') + local luasnip = require("luasnip") + local wk = require("which-key") - -- load friendly-snippets to luasnip - require('luasnip/loaders/from_vscode').lazy_load() + -- load friendly-snippets to luasnip + require("luasnip/loaders/from_vscode").lazy_load() - -- Register snippet navigation keybindings - local snippet_mappings = { - [''] = {function()luasnip.jump(1) end}, - [''] = {function() luasnip.jump(-1) end} - } - --wk.register(snippet_mappings, {mode = "i"}) - --wk.register(snippet_mappings, {mode = "s"}) + -- Register snippet navigation keybindings + local snippet_mappings = { + [""] = { + function() + luasnip.jump(1) + end, + }, + [""] = { + function() + luasnip.jump(-1) + end, + }, + } + --wk.register(snippet_mappings, {mode = "i"}) + --wk.register(snippet_mappings, {mode = "s"}) end diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index f774b81f..225d50fb 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -1,10 +1,13 @@ local M = {} -Opts = {mason = {}, lspconfig = {automatic_installation = true}} +Opts = { mason = {}, lspconfig = { automatic_installation = true } } -M.setup = function() require('mason').setup(Opts.mason) end +M.setup = function() + require("mason").setup(Opts.mason) +end -M.lspconfig_setup = - function() require('mason-lspconfig').setup(Opts.lspconfig) end +M.lspconfig_setup = function() + require("mason-lspconfig").setup(Opts.lspconfig) +end return M diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index a3826292..7f86f960 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -1,13 +1,13 @@ return function() - require("nvim-tree").setup { -- BEGIN_DEFAULT_OPTS + require("nvim-tree").setup({ -- BEGIN_DEFAULT_OPTS diagnostics = { enable = true, show_on_dirs = true, }, renderer = { - highlight_git = true - } - } + highlight_git = true, + }, + }) -- Open/close with alt-o - vim.keymap.set('n', '', vim.cmd.NvimTreeToggle) + vim.keymap.set("n", "", vim.cmd.NvimTreeToggle) end diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index a4a13baa..c647c413 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,17 +1,17 @@ return function() - local telescope = require('telescope') - local builtin = require('telescope.builtin') + local telescope = require("telescope") + local builtin = require("telescope.builtin") - telescope.setup { - pickers = {find_files = {find_command = {"fd", "-Ht", "f"}}} - } + telescope.setup({ + pickers = { find_files = { find_command = { "fd", "-Ht", "f" } } }, + }) - telescope.load_extension('fzf') - telescope.load_extension('ui-select') - telescope.load_extension('cder') + telescope.load_extension("fzf") + telescope.load_extension("ui-select") + telescope.load_extension("cder") - -- Keybinds - vim.keymap.set('n', '', vim.cmd.Telescope) - vim.keymap.set('n', '', builtin.find_files) - vim.keymap.set('n', '', builtin.live_grep) + -- Keybinds + vim.keymap.set("n", "", vim.cmd.Telescope) + vim.keymap.set("n", "", builtin.find_files) + vim.keymap.set("n", "", builtin.live_grep) end diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index ffef72a1..64fea67e 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -1,17 +1,37 @@ return function() - require'nvim-treesitter.configs'.setup { - ensure_installed = { - 'bash', 'c', 'css', 'dockerfile', 'html', 'http', 'java', 'json', - 'json5', 'latex', 'lua', 'make', 'markdown', 'php', 'python', - 'regex', 'rasi', 'rst', 'scss', 'toml', 'tsx', 'typescript', - 'javascript', 'yaml' - }, - highlight = {enable = true}, - indent = {enable = true}, - incremental_selection = {enable = true}, - context_commentstring = {enable = true} - } + require("nvim-treesitter.configs").setup({ + ensure_installed = { + "bash", + "c", + "css", + "dockerfile", + "html", + "http", + "java", + "json", + "json5", + "latex", + "lua", + "make", + "markdown", + "php", + "python", + "regex", + "rasi", + "rst", + "scss", + "toml", + "tsx", + "typescript", + "javascript", + "yaml", + }, + highlight = { enable = true }, + indent = { enable = true }, + incremental_selection = { enable = true }, + context_commentstring = { enable = true }, + }) - -- vim.wo.foldmethod = 'expr' - -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' + -- vim.wo.foldmethod = 'expr' + -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' end diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index a1eab54b..405773bc 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -1,3 +1,3 @@ return function() - require('which-key').setup {spelling = {enabled = true}} + require("which-key").setup({ spelling = { enabled = true } }) end diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index e3956297..acfaf76f 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -5,17 +5,17 @@ local g = vim.g o.termguicolors = true -- Font for nvim GUI's -o.guifont = 'Fira Code:h14' +o.guifont = "Fira Code:h14" -- Floating window transparency o.winblend = 10 -- Set window title o.title = true -o.titlestring = 'NeoVim: ' .. vim.fn.getcwd() +o.titlestring = "NeoVim: " .. vim.fn.getcwd() -- Diff settings -o.diffopt = 'filler,internal,algorithm:histogram,indent-heuristic' +o.diffopt = "filler,internal,algorithm:histogram,indent-heuristic" -- Allow switching buffers with unsaved changes o.hidden = true @@ -24,9 +24,9 @@ o.hidden = true o.number = true o.guicursor = table.concat({ - 'i:ver1', -- Vertical bar cursor in insert mode - 'a:blinkon1' -- Blinking cursor in all modes -}, ',') + "i:ver1", -- Vertical bar cursor in insert mode + "a:blinkon1", -- Blinking cursor in all modes +}, ",") -- Enable global statusline o.laststatus = 3 From 3614b66354d3c419ca849bdcc3b437c045bcb027 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Oct 2022 14:09:50 +0300 Subject: [PATCH 1603/2667] Reformat precommit hook with shfmt --- .husky/pre-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index b214b95b..7bcd1824 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -26,7 +26,7 @@ num_staged_lua=$(echo "$staged_lua" | grep -vce '^$' || true) if [ "$num_staged_lua" -gt 0 ]; then printf '\nFormatting %s staged Lua files with stylua\n' "$num_staged_lua" - for file in $staged_lua;do + for file in $staged_lua; do stylua "$file" done From b114f1851e2b2913453e9e6f275fa56d949f34e1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Oct 2022 14:09:50 +0300 Subject: [PATCH 1604/2667] Reformat precommit hook with shfmt --- .husky/pre-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index b214b95b..7bcd1824 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -26,7 +26,7 @@ num_staged_lua=$(echo "$staged_lua" | grep -vce '^$' || true) if [ "$num_staged_lua" -gt 0 ]; then printf '\nFormatting %s staged Lua files with stylua\n' "$num_staged_lua" - for file in $staged_lua;do + for file in $staged_lua; do stylua "$file" done From e85469a11bb0152d38b31cfb8667234e0f63a324 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Oct 2022 14:13:15 +0300 Subject: [PATCH 1605/2667] Fixes to precommit hook and reformat some zsh files --- .husky/pre-commit | 6 +++--- home/.config/zsh/01-tmux.zsh | 10 +++++----- home/.config/zsh/02-env.zsh | 10 +++++----- home/.config/zsh/08-pacman.zsh | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 7bcd1824..79df10e4 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -17,7 +17,7 @@ if [ "$num_staged_toml" -gt 0 ]; then printf '\nFormatting %s staged TOML files with taplo\n' "$num_staged_toml" taplo format "$staged_toml" printf "Re-staging\n" - git add "$staged_toml" + git add $staged_toml fi # Run lua-format on staged Lua files @@ -39,9 +39,9 @@ staged_sh=$(echo "$staged_files" | grep -E '(.sh$|pre-commit)' || true) num_staged_sh=$(echo "$staged_sh" | grep -vce '^$' || true) if [ "$num_staged_sh" -gt 0 ]; then printf '\nFormatting %s staged shell scripts with shfmt\n' "$num_staged_sh" - shfmt -w "$staged_sh" + shfmt -w $staged_sh printf "Re-staging\n\n" - git add "$staged_sh" + git add $staged_sh fi # Run prettier on all other staged files diff --git a/home/.config/zsh/01-tmux.zsh b/home/.config/zsh/01-tmux.zsh index f909becd..55d3f0c7 100644 --- a/home/.config/zsh/01-tmux.zsh +++ b/home/.config/zsh/01-tmux.zsh @@ -1,8 +1,8 @@ # Launch tmux if logging in over ssh if [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then - if tmux has-session -t ssh_tmux 2>/dev/null; then - exec tmux -2 attach-session -t ssh_tmux - else - exec tmux -2 new-session -s ssh_tmux - fi + if tmux has-session -t ssh_tmux 2>/dev/null; then + exec tmux -2 attach-session -t ssh_tmux + else + exec tmux -2 new-session -s ssh_tmux + fi fi diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 55c4f7c6..fda7c3a1 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -46,12 +46,12 @@ export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND --strip-cwd-prefix" export FZF_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' _fzf_compgen_path() { - resultcmd="$FZF_DEFAULT_COMMAND . $1" - eval ${resultcmd} + resultcmd="$FZF_DEFAULT_COMMAND . $1" + eval ${resultcmd} } _fzf_compgen_dir() { - resultcmd="$FZF_ALT_C_COMMAND . $1" - eval ${resultcmd} + resultcmd="$FZF_ALT_C_COMMAND . $1" + eval ${resultcmd} } # dotfile repository location @@ -72,7 +72,7 @@ export NEOVIDE_MULTIGRID=1 {%@@ if distro_id == "arch" or distro_id == "ubuntu" @@%} if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then - export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" + export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" fi gpgconf --launch gpg-agent {%@@ elif distro_id == "termux" @@%} diff --git a/home/.config/zsh/08-pacman.zsh b/home/.config/zsh/08-pacman.zsh index d0e23701..72077edd 100644 --- a/home/.config/zsh/08-pacman.zsh +++ b/home/.config/zsh/08-pacman.zsh @@ -5,13 +5,13 @@ zshcache_time="$(date +%s%N)" autoload -Uz add-zsh-hook rehash_precmd() { - if [[ -e /var/cache/zsh/pacman ]]; then - local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)" - if ((zshcache_time < paccache_time)); then - rehash - zshcache_time="$paccache_time" - fi + if [[ -e /var/cache/zsh/pacman ]]; then + local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)" + if ((zshcache_time < paccache_time)); then + rehash + zshcache_time="$paccache_time" fi + fi } add-zsh-hook -Uz precmd rehash_precmd From e6aa45333bfe89836f03d1fe5131a9d27d26a457 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Oct 2022 14:13:15 +0300 Subject: [PATCH 1606/2667] Fixes to precommit hook and reformat some zsh files --- .husky/pre-commit | 6 +++--- home/.config/zsh/01-tmux.zsh | 10 +++++----- home/.config/zsh/02-env.zsh | 10 +++++----- home/.config/zsh/08-pacman.zsh | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 7bcd1824..79df10e4 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -17,7 +17,7 @@ if [ "$num_staged_toml" -gt 0 ]; then printf '\nFormatting %s staged TOML files with taplo\n' "$num_staged_toml" taplo format "$staged_toml" printf "Re-staging\n" - git add "$staged_toml" + git add $staged_toml fi # Run lua-format on staged Lua files @@ -39,9 +39,9 @@ staged_sh=$(echo "$staged_files" | grep -E '(.sh$|pre-commit)' || true) num_staged_sh=$(echo "$staged_sh" | grep -vce '^$' || true) if [ "$num_staged_sh" -gt 0 ]; then printf '\nFormatting %s staged shell scripts with shfmt\n' "$num_staged_sh" - shfmt -w "$staged_sh" + shfmt -w $staged_sh printf "Re-staging\n\n" - git add "$staged_sh" + git add $staged_sh fi # Run prettier on all other staged files diff --git a/home/.config/zsh/01-tmux.zsh b/home/.config/zsh/01-tmux.zsh index f909becd..55d3f0c7 100644 --- a/home/.config/zsh/01-tmux.zsh +++ b/home/.config/zsh/01-tmux.zsh @@ -1,8 +1,8 @@ # Launch tmux if logging in over ssh if [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then - if tmux has-session -t ssh_tmux 2>/dev/null; then - exec tmux -2 attach-session -t ssh_tmux - else - exec tmux -2 new-session -s ssh_tmux - fi + if tmux has-session -t ssh_tmux 2>/dev/null; then + exec tmux -2 attach-session -t ssh_tmux + else + exec tmux -2 new-session -s ssh_tmux + fi fi diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 55c4f7c6..fda7c3a1 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -46,12 +46,12 @@ export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND --strip-cwd-prefix" export FZF_CTRL_T_OPTS='--preview "bat --color=always --style=numbers --line-range=:500 {}"' _fzf_compgen_path() { - resultcmd="$FZF_DEFAULT_COMMAND . $1" - eval ${resultcmd} + resultcmd="$FZF_DEFAULT_COMMAND . $1" + eval ${resultcmd} } _fzf_compgen_dir() { - resultcmd="$FZF_ALT_C_COMMAND . $1" - eval ${resultcmd} + resultcmd="$FZF_ALT_C_COMMAND . $1" + eval ${resultcmd} } # dotfile repository location @@ -72,7 +72,7 @@ export NEOVIDE_MULTIGRID=1 {%@@ if distro_id == "arch" or distro_id == "ubuntu" @@%} if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then - export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" + export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" fi gpgconf --launch gpg-agent {%@@ elif distro_id == "termux" @@%} diff --git a/home/.config/zsh/08-pacman.zsh b/home/.config/zsh/08-pacman.zsh index d0e23701..72077edd 100644 --- a/home/.config/zsh/08-pacman.zsh +++ b/home/.config/zsh/08-pacman.zsh @@ -5,13 +5,13 @@ zshcache_time="$(date +%s%N)" autoload -Uz add-zsh-hook rehash_precmd() { - if [[ -e /var/cache/zsh/pacman ]]; then - local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)" - if ((zshcache_time < paccache_time)); then - rehash - zshcache_time="$paccache_time" - fi + if [[ -e /var/cache/zsh/pacman ]]; then + local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)" + if ((zshcache_time < paccache_time)); then + rehash + zshcache_time="$paccache_time" fi + fi } add-zsh-hook -Uz precmd rehash_precmd From f1d41f74ae6e2850853695223187a62e287c27a8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 31 Oct 2022 09:28:22 +0200 Subject: [PATCH 1607/2667] Update umami image name --- docker/umami/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/umami/docker-compose.toml b/docker/umami/docker-compose.toml index 3c2553a1..d4cbd228 100644 --- a/docker/umami/docker-compose.toml +++ b/docker/umami/docker-compose.toml @@ -1,5 +1,5 @@ [services.umami] -image = "docker.umami.is/umami-software/umami:postgresql-latest" +image = "ghcr.io/umami-software/umami:postgresql-latest" container_name = "umami" restart = "unless-stopped" networks = ["postgres", "proxy"] From 12c6ce7ef065cdf32c382fdb53e5709fe1cc660b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 31 Oct 2022 09:28:22 +0200 Subject: [PATCH 1608/2667] Update umami image name --- docker/umami/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/umami/docker-compose.toml b/docker/umami/docker-compose.toml index 3c2553a1..d4cbd228 100644 --- a/docker/umami/docker-compose.toml +++ b/docker/umami/docker-compose.toml @@ -1,5 +1,5 @@ [services.umami] -image = "docker.umami.is/umami-software/umami:postgresql-latest" +image = "ghcr.io/umami-software/umami:postgresql-latest" container_name = "umami" restart = "unless-stopped" networks = ["postgres", "proxy"] From 187988ed4cdd58efd15748615e1705b7e55fdba1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 31 Oct 2022 09:28:41 +0200 Subject: [PATCH 1609/2667] Add Moria cmdline to dotfiles --- config-root.toml | 8 +++++++- root/etc/kernel/cmdline | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/config-root.toml b/config-root.toml index 88115c1f..59bfb0c7 100644 --- a/config-root.toml +++ b/config-root.toml @@ -203,7 +203,13 @@ include = ["Locale", "Pacman", "Network"] [profiles.Moria] include = ["Locale", "Pacman", "Network"] -dotfiles = ["f_99-sysctl.conf", "f_cpupower", "f_doas.conf", "f_sshd_config"] +dotfiles = [ + "f_99-sysctl.conf", + "f_cpupower", + "f_doas.conf", + "f_sshd_config", + "f_cmdline", +] [profiles.Gondor] include = ["Locale", "Pacman"] diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index 7a76f4e2..c906db11 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -1 +1,5 @@ +{%@@ if profile == "Mirkwood" @@%} cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff bgrt_disable +{%@@ elif profile == "Moria" @@%} +cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vga=current bgrt_disable +{%@@ endif @@%} From 6c72a3677350ff68a028e041e12ebbe2aabd5124 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 31 Oct 2022 09:28:41 +0200 Subject: [PATCH 1610/2667] Add Moria cmdline to dotfiles --- config-root.toml | 8 +++++++- root/etc/kernel/cmdline | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/config-root.toml b/config-root.toml index 88115c1f..59bfb0c7 100644 --- a/config-root.toml +++ b/config-root.toml @@ -203,7 +203,13 @@ include = ["Locale", "Pacman", "Network"] [profiles.Moria] include = ["Locale", "Pacman", "Network"] -dotfiles = ["f_99-sysctl.conf", "f_cpupower", "f_doas.conf", "f_sshd_config"] +dotfiles = [ + "f_99-sysctl.conf", + "f_cpupower", + "f_doas.conf", + "f_sshd_config", + "f_cmdline", +] [profiles.Gondor] include = ["Locale", "Pacman"] diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index 7a76f4e2..c906db11 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -1 +1,5 @@ +{%@@ if profile == "Mirkwood" @@%} cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff bgrt_disable +{%@@ elif profile == "Moria" @@%} +cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vga=current bgrt_disable +{%@@ endif @@%} From 1ce44580f707bc8290a7c4c8bcf6462c6eaaf528 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 1 Nov 2022 11:00:36 +0200 Subject: [PATCH 1611/2667] Disable intel hd graphics video output on moria --- root/etc/kernel/cmdline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index c906db11..31a5a75e 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -1,5 +1,5 @@ {%@@ if profile == "Mirkwood" @@%} cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff bgrt_disable {%@@ elif profile == "Moria" @@%} -cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vga=current bgrt_disable +cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vga=current bgrt_disable video=HDMI-A-2:d video=HDMI-A-3:d {%@@ endif @@%} From 2856c8f1ceff1809d71d26b57eee45bbb310712c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 1 Nov 2022 11:00:36 +0200 Subject: [PATCH 1612/2667] Disable intel hd graphics video output on moria --- root/etc/kernel/cmdline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index c906db11..31a5a75e 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -1,5 +1,5 @@ {%@@ if profile == "Mirkwood" @@%} cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff bgrt_disable {%@@ elif profile == "Moria" @@%} -cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vga=current bgrt_disable +cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vga=current bgrt_disable video=HDMI-A-2:d video=HDMI-A-3:d {%@@ endif @@%} From 865dad1de36dcbcc512bac43c97c0c9d7395d7b9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:07:33 +0200 Subject: [PATCH 1613/2667] Configure gdm and plymouth --- config-root.toml | 1 - home/etc/plymouth/plymouthd.conf | 4 ++++ root/etc/kernel/cmdline | 2 +- root/etc/mkinitcpio.conf | 2 +- root/etc/mkinitcpio.d/linux-lts.preset | 1 - root/etc/mkinitcpio.d/linux.preset | 1 - 6 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 home/etc/plymouth/plymouthd.conf diff --git a/config-root.toml b/config-root.toml index 59bfb0c7..698f0cec 100644 --- a/config-root.toml +++ b/config-root.toml @@ -188,7 +188,6 @@ dotfiles = [ "f_doas.conf", "f_fonts.conf", "f_freetype2.sh", - "f_getty.conf", "f_ignore", "f_logind.conf", "f_mkinitcpio.conf", diff --git a/home/etc/plymouth/plymouthd.conf b/home/etc/plymouth/plymouthd.conf new file mode 100644 index 00000000..328ce5b5 --- /dev/null +++ b/home/etc/plymouth/plymouthd.conf @@ -0,0 +1,4 @@ +[Daemon] +Theme=arch-logo-gnomish +ShowDelay=0 +DeviceTimeout=8 diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index 31a5a75e..012af40d 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -1,5 +1,5 @@ {%@@ if profile == "Mirkwood" @@%} -cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff bgrt_disable +cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait amdgpu.ppfeaturemask=0xffffffff quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Moria" @@%} cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vga=current bgrt_disable video=HDMI-A-2:d video=HDMI-A-3:d {%@@ endif @@%} diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index ce7a725e..a4fe8484 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -4,7 +4,7 @@ FILES=() {%@@ if profile == "Mirkwood" @@%} BINARIES=("/usr/bin/btrfs") -HOOKS=(colors consolefont welcomemessage base udev keyboard autodetect modconf block filesystems btrfs encrypt fsck) +HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) {%@@ else @@%} BINARIES=() diff --git a/root/etc/mkinitcpio.d/linux-lts.preset b/root/etc/mkinitcpio.d/linux-lts.preset index f053323c..5f686d2a 100644 --- a/root/etc/mkinitcpio.d/linux-lts.preset +++ b/root/etc/mkinitcpio.d/linux-lts.preset @@ -6,7 +6,6 @@ PRESETS=('default' 'fallback') default_image="/boot/initramfs-linux-lts.img" default_efi_image="/boot/EFI/Linux/archlinux-linux-lts.efi" -default_options="--splash /usr/share/systemd/bootctl/splash-arch.bmp" fallback_image="/boot/initramfs-linux-lts-fallback.img" fallback_efi_image="/boot/EFI/Linux/archlinux-linux-lts-fallback.efi" diff --git a/root/etc/mkinitcpio.d/linux.preset b/root/etc/mkinitcpio.d/linux.preset index 4f1f69d9..4533ef75 100644 --- a/root/etc/mkinitcpio.d/linux.preset +++ b/root/etc/mkinitcpio.d/linux.preset @@ -6,7 +6,6 @@ PRESETS=('default' 'fallback') default_image="/boot/initramfs-linux.img" default_efi_image="/boot/EFI/Linux/archlinux-linux.efi" -default_options="--splash /usr/share/systemd/bootctl/splash-arch.bmp" fallback_image="/boot/initramfs-linux-fallback.img" fallback_efi_image="/boot/EFI/Linux/archlinux-linux-fallback.efi" From cc3e47611a666fe411e810f2b15711e9b7a5f436 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:07:33 +0200 Subject: [PATCH 1614/2667] Configure gdm and plymouth --- config-root.toml | 1 - home/etc/plymouth/plymouthd.conf | 4 ++++ root/etc/kernel/cmdline | 2 +- root/etc/mkinitcpio.conf | 2 +- root/etc/mkinitcpio.d/linux-lts.preset | 1 - root/etc/mkinitcpio.d/linux.preset | 1 - 6 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 home/etc/plymouth/plymouthd.conf diff --git a/config-root.toml b/config-root.toml index 59bfb0c7..698f0cec 100644 --- a/config-root.toml +++ b/config-root.toml @@ -188,7 +188,6 @@ dotfiles = [ "f_doas.conf", "f_fonts.conf", "f_freetype2.sh", - "f_getty.conf", "f_ignore", "f_logind.conf", "f_mkinitcpio.conf", diff --git a/home/etc/plymouth/plymouthd.conf b/home/etc/plymouth/plymouthd.conf new file mode 100644 index 00000000..328ce5b5 --- /dev/null +++ b/home/etc/plymouth/plymouthd.conf @@ -0,0 +1,4 @@ +[Daemon] +Theme=arch-logo-gnomish +ShowDelay=0 +DeviceTimeout=8 diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index 31a5a75e..012af40d 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -1,5 +1,5 @@ {%@@ if profile == "Mirkwood" @@%} -cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff bgrt_disable +cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait amdgpu.ppfeaturemask=0xffffffff quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Moria" @@%} cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vga=current bgrt_disable video=HDMI-A-2:d video=HDMI-A-3:d {%@@ endif @@%} diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index ce7a725e..a4fe8484 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -4,7 +4,7 @@ FILES=() {%@@ if profile == "Mirkwood" @@%} BINARIES=("/usr/bin/btrfs") -HOOKS=(colors consolefont welcomemessage base udev keyboard autodetect modconf block filesystems btrfs encrypt fsck) +HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) {%@@ else @@%} BINARIES=() diff --git a/root/etc/mkinitcpio.d/linux-lts.preset b/root/etc/mkinitcpio.d/linux-lts.preset index f053323c..5f686d2a 100644 --- a/root/etc/mkinitcpio.d/linux-lts.preset +++ b/root/etc/mkinitcpio.d/linux-lts.preset @@ -6,7 +6,6 @@ PRESETS=('default' 'fallback') default_image="/boot/initramfs-linux-lts.img" default_efi_image="/boot/EFI/Linux/archlinux-linux-lts.efi" -default_options="--splash /usr/share/systemd/bootctl/splash-arch.bmp" fallback_image="/boot/initramfs-linux-lts-fallback.img" fallback_efi_image="/boot/EFI/Linux/archlinux-linux-lts-fallback.efi" diff --git a/root/etc/mkinitcpio.d/linux.preset b/root/etc/mkinitcpio.d/linux.preset index 4f1f69d9..4533ef75 100644 --- a/root/etc/mkinitcpio.d/linux.preset +++ b/root/etc/mkinitcpio.d/linux.preset @@ -6,7 +6,6 @@ PRESETS=('default' 'fallback') default_image="/boot/initramfs-linux.img" default_efi_image="/boot/EFI/Linux/archlinux-linux.efi" -default_options="--splash /usr/share/systemd/bootctl/splash-arch.bmp" fallback_image="/boot/initramfs-linux-fallback.img" fallback_efi_image="/boot/EFI/Linux/archlinux-linux-fallback.efi" From 545dc976dd9b596860e283f757181b79a45bedca Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:03:02 +0200 Subject: [PATCH 1615/2667] Use gnome pinentry for gpg --- home/.gnupg/gpg-agent.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home/.gnupg/gpg-agent.conf b/home/.gnupg/gpg-agent.conf index 2bbd0eb3..9e025a01 100644 --- a/home/.gnupg/gpg-agent.conf +++ b/home/.gnupg/gpg-agent.conf @@ -1,6 +1,2 @@ enable-ssh-support -{%@@ if profile == 'Mirkwood' @@%} -pinentry-program /usr/bin/pinentry-rofi -{%@@ else @@%} pinentry-program /usr/bin/pinentry-gnome3 -{%@@ endif @@%} From 8f2acf184f0cd95842748151471c71295bb8a87f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:03:02 +0200 Subject: [PATCH 1616/2667] Use gnome pinentry for gpg --- home/.gnupg/gpg-agent.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home/.gnupg/gpg-agent.conf b/home/.gnupg/gpg-agent.conf index 2bbd0eb3..9e025a01 100644 --- a/home/.gnupg/gpg-agent.conf +++ b/home/.gnupg/gpg-agent.conf @@ -1,6 +1,2 @@ enable-ssh-support -{%@@ if profile == 'Mirkwood' @@%} -pinentry-program /usr/bin/pinentry-rofi -{%@@ else @@%} pinentry-program /usr/bin/pinentry-gnome3 -{%@@ endif @@%} From ab98cbf2fef1527b3a47327cc94ba1555a11e2ea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:03:54 +0200 Subject: [PATCH 1617/2667] Add neovide keybind to sway --- home/.config/sway/conf.d/06-keybinds.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index cb43ca64..252050b4 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -3,12 +3,15 @@ # start terminal bindsym $mod+Return exec $term +# start neovide +bindsym $mod+n exec neovide + # kill focused window bindsym $mod+w kill # Modes for controlling gaps set $mode_gaps Gaps: (o) outer, (i) inner -set $mode_gaps_outer Outer Gaps: j|k|0|r|i +set $mode_gaps_outer Outer Gaps: j|k|0|r|i set $mode_gaps_inner Inner Gaps: j|k|0|r|o bindsym $mod+g mode "$mode_gaps" @@ -173,7 +176,7 @@ bindsym XF86Calculator exec alacritty -e calc # Switch to urgent workspace bindsym $mod+u [urgent=latest] focus -# Switch to workspace +# Switch to workspace bindsym $mod+1 workspace 1 bindsym $mod+2 workspace 2 bindsym $mod+3 workspace 3 From 50399dfd649903e90600246538fdefa95780acfe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:03:54 +0200 Subject: [PATCH 1618/2667] Add neovide keybind to sway --- home/.config/sway/conf.d/06-keybinds.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index cb43ca64..252050b4 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -3,12 +3,15 @@ # start terminal bindsym $mod+Return exec $term +# start neovide +bindsym $mod+n exec neovide + # kill focused window bindsym $mod+w kill # Modes for controlling gaps set $mode_gaps Gaps: (o) outer, (i) inner -set $mode_gaps_outer Outer Gaps: j|k|0|r|i +set $mode_gaps_outer Outer Gaps: j|k|0|r|i set $mode_gaps_inner Inner Gaps: j|k|0|r|o bindsym $mod+g mode "$mode_gaps" @@ -173,7 +176,7 @@ bindsym XF86Calculator exec alacritty -e calc # Switch to urgent workspace bindsym $mod+u [urgent=latest] focus -# Switch to workspace +# Switch to workspace bindsym $mod+1 workspace 1 bindsym $mod+2 workspace 2 bindsym $mod+3 workspace 3 From aa43e958dfa2c3eb153009edfc7de67876a142ba Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:04:11 +0200 Subject: [PATCH 1619/2667] Add neovide settings to neovim --- home/.config/nvim/lua/settings.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index acfaf76f..a1668674 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -7,6 +7,12 @@ o.termguicolors = true -- Font for nvim GUI's o.guifont = "Fira Code:h14" +-- Hide mouse when typing in neovide +g.neovide_hide_mouse_when_typing = true + +-- Enable cursor particles in neovide +g.neovide_cursor_vfx_mode = 'railgun' + -- Floating window transparency o.winblend = 10 From c5437fcfbdae9409bb2512ff9e947e6b471d7315 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:04:11 +0200 Subject: [PATCH 1620/2667] Add neovide settings to neovim --- home/.config/nvim/lua/settings.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index acfaf76f..a1668674 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -7,6 +7,12 @@ o.termguicolors = true -- Font for nvim GUI's o.guifont = "Fira Code:h14" +-- Hide mouse when typing in neovide +g.neovide_hide_mouse_when_typing = true + +-- Enable cursor particles in neovide +g.neovide_cursor_vfx_mode = 'railgun' + -- Floating window transparency o.winblend = 10 From 93c3611b55f02b2c54f46455ea1cbee9fff1e62a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:04:49 +0200 Subject: [PATCH 1621/2667] Update config.toml --- config.toml | 95 ++++++++++++++++------------------------------------- 1 file changed, 28 insertions(+), 67 deletions(-) diff --git a/config.toml b/config.toml index 4db46bbd..e10129e5 100644 --- a/config.toml +++ b/config.toml @@ -31,7 +31,7 @@ dst = "~/.config/imapnotify" src = ".config/imapnotify" [dotfiles.d_nvim] -actions = ["nvim-packer-sync"] +actions = [ "nvim-packer-sync",] dst = "~/.config/nvim" src = ".config/nvim" @@ -236,101 +236,59 @@ dst = "~/.distro" src = ".config/wal" dst = "~/.config/wal" +[dotfiles."f_plymouthd.conf"] +src = "etc/plymouth/plymouthd.conf" +dst = "/etc/plymouth/plymouthd.conf" + [profiles.pacman] -dotfiles = ["f_makepkg.conf", "f_paru.conf"] +dotfiles = [ "f_makepkg.conf", "f_paru.conf",] [profiles.terminal] -dotfiles = [ - "d_wal", - "d_nvim", - "d_ssh", - "d_zsh", - "f_alacritty.yml", - "f_gitconfig", - "f_hushlogin", - "f_ignore", - "f_mailcap", - "f_ranger.conf", - "f_ranger_commands.py", - "f_rtv.cfg", - "f_tmux.conf", - "f_zshrc", -] +dotfiles = [ "d_wal", "d_nvim", "d_ssh", "d_zsh", "f_alacritty.yml", "f_gitconfig", "f_hushlogin", "f_ignore", "f_mailcap", "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", "f_tmux.conf", "f_zshrc",] [profiles.email] -dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] +dotfiles = [ "d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config",] [profiles.media] -dotfiles = [ - "d_mpv", - "f_abcde.conf", - "f_beets_config", - "f_beets_whitelist", - "f_libra_config", - "f_mpd.conf", - "f_mpdris2.conf", - "f_mpdscribble.conf", - "f_ncmpcpp.conf", - "f_ncmpcpp_bindings", - "f_youtube-dl_config", -] +dotfiles = [ "d_mpv", "f_abcde.conf", "f_beets_config", "f_beets_whitelist", "f_libra_config", "f_mpd.conf", "f_mpdris2.conf", "f_mpdscribble.conf", "f_ncmpcpp.conf", "f_ncmpcpp_bindings", "f_youtube-dl_config",] [profiles.sway] -dotfiles = [ - "d_sway", - "d_waybar", - "d_wofi", - "d_zathura", - "f_electron-flags.conf", - "f_electron12-flags.conf", - "f_fonts.conf", - "f_foot.ini", - "f_mako_config", - "f_redshift.conf", -] +dotfiles = [ "d_sway", "d_waybar", "d_wofi", "d_zathura", "f_electron-flags.conf", "f_electron12-flags.conf", "f_fonts.conf", "f_foot.ini", "f_mako_config", "f_redshift.conf",] [profiles.gpg] -dotfiles = [ - "f_gpg-agent.conf", - "f_gpg.conf", - "f_gpg_scdaemon.conf", - "f_pam_environment", -] +dotfiles = [ "f_gpg-agent.conf", "f_gpg.conf", "f_gpg_scdaemon.conf", "f_pam_environment",] [profiles.Mirkwood] -include = ["pacman", "terminal", "email", "media", "sway", "gpg"] -dotfiles = ["d_rofi", "f_librewolf_overrides", "f_distro"] +include = [ "pacman", "terminal", "email", "media", "sway", "gpg",] +dotfiles = [ "d_rofi", "f_librewolf_overrides", "f_distro", "f_plymouthd.conf",] [profiles.Moria] -include = ["pacman", "terminal", "media", "gpg"] -dotfiles = ["f_zprofile", "f_librewolf_overrides"] +include = [ "pacman", "terminal", "media", "gpg",] +dotfiles = [ "f_zprofile", "f_librewolf_overrides",] [profiles.Gondor] -include = ["pacman", "terminal"] +include = [ "pacman", "terminal",] [profiles.mko-laptop] -include = ["terminal", "media", "gpg"] -dotfiles = ["f_librewolf_overrides"] +include = [ "terminal", "media", "gpg",] +dotfiles = [ "f_librewolf_overrides",] [profiles.Isengard] -include = ["terminal"] -dotfiles = ["f_distro"] +include = [ "terminal",] +dotfiles = [ "f_distro",] [profiles.Edoras] -include = ["terminal"] +include = [ "terminal",] [profiles.TakamakiPC] -include = ["terminal"] +include = [ "terminal",] [profiles.localhost] -include = ["terminal"] +include = [ "terminal",] [profiles.ViiruJaTeippi] -include = ["terminal"] -dotfiles = ["f_distro"] - -[profiles.Isengard.variables] -distro_id = "termux" +include = [ "terminal",] +dotfiles = [ "f_distro",] [profiles.Mirkwood.variables] wayland = true @@ -341,5 +299,8 @@ wayland = true [profiles.mko-laptop.variables] wayland = true +[profiles.Isengard.variables] +distro_id = "termux" + [profiles.TakamakiPC.variables] wayland = false From b1bd55f0a6b265e1109983b73785cd73ffe2c061 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:04:49 +0200 Subject: [PATCH 1622/2667] Update config.toml --- config.toml | 95 ++++++++++++++++------------------------------------- 1 file changed, 28 insertions(+), 67 deletions(-) diff --git a/config.toml b/config.toml index 4db46bbd..e10129e5 100644 --- a/config.toml +++ b/config.toml @@ -31,7 +31,7 @@ dst = "~/.config/imapnotify" src = ".config/imapnotify" [dotfiles.d_nvim] -actions = ["nvim-packer-sync"] +actions = [ "nvim-packer-sync",] dst = "~/.config/nvim" src = ".config/nvim" @@ -236,101 +236,59 @@ dst = "~/.distro" src = ".config/wal" dst = "~/.config/wal" +[dotfiles."f_plymouthd.conf"] +src = "etc/plymouth/plymouthd.conf" +dst = "/etc/plymouth/plymouthd.conf" + [profiles.pacman] -dotfiles = ["f_makepkg.conf", "f_paru.conf"] +dotfiles = [ "f_makepkg.conf", "f_paru.conf",] [profiles.terminal] -dotfiles = [ - "d_wal", - "d_nvim", - "d_ssh", - "d_zsh", - "f_alacritty.yml", - "f_gitconfig", - "f_hushlogin", - "f_ignore", - "f_mailcap", - "f_ranger.conf", - "f_ranger_commands.py", - "f_rtv.cfg", - "f_tmux.conf", - "f_zshrc", -] +dotfiles = [ "d_wal", "d_nvim", "d_ssh", "d_zsh", "f_alacritty.yml", "f_gitconfig", "f_hushlogin", "f_ignore", "f_mailcap", "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", "f_tmux.conf", "f_zshrc",] [profiles.email] -dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] +dotfiles = [ "d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config",] [profiles.media] -dotfiles = [ - "d_mpv", - "f_abcde.conf", - "f_beets_config", - "f_beets_whitelist", - "f_libra_config", - "f_mpd.conf", - "f_mpdris2.conf", - "f_mpdscribble.conf", - "f_ncmpcpp.conf", - "f_ncmpcpp_bindings", - "f_youtube-dl_config", -] +dotfiles = [ "d_mpv", "f_abcde.conf", "f_beets_config", "f_beets_whitelist", "f_libra_config", "f_mpd.conf", "f_mpdris2.conf", "f_mpdscribble.conf", "f_ncmpcpp.conf", "f_ncmpcpp_bindings", "f_youtube-dl_config",] [profiles.sway] -dotfiles = [ - "d_sway", - "d_waybar", - "d_wofi", - "d_zathura", - "f_electron-flags.conf", - "f_electron12-flags.conf", - "f_fonts.conf", - "f_foot.ini", - "f_mako_config", - "f_redshift.conf", -] +dotfiles = [ "d_sway", "d_waybar", "d_wofi", "d_zathura", "f_electron-flags.conf", "f_electron12-flags.conf", "f_fonts.conf", "f_foot.ini", "f_mako_config", "f_redshift.conf",] [profiles.gpg] -dotfiles = [ - "f_gpg-agent.conf", - "f_gpg.conf", - "f_gpg_scdaemon.conf", - "f_pam_environment", -] +dotfiles = [ "f_gpg-agent.conf", "f_gpg.conf", "f_gpg_scdaemon.conf", "f_pam_environment",] [profiles.Mirkwood] -include = ["pacman", "terminal", "email", "media", "sway", "gpg"] -dotfiles = ["d_rofi", "f_librewolf_overrides", "f_distro"] +include = [ "pacman", "terminal", "email", "media", "sway", "gpg",] +dotfiles = [ "d_rofi", "f_librewolf_overrides", "f_distro", "f_plymouthd.conf",] [profiles.Moria] -include = ["pacman", "terminal", "media", "gpg"] -dotfiles = ["f_zprofile", "f_librewolf_overrides"] +include = [ "pacman", "terminal", "media", "gpg",] +dotfiles = [ "f_zprofile", "f_librewolf_overrides",] [profiles.Gondor] -include = ["pacman", "terminal"] +include = [ "pacman", "terminal",] [profiles.mko-laptop] -include = ["terminal", "media", "gpg"] -dotfiles = ["f_librewolf_overrides"] +include = [ "terminal", "media", "gpg",] +dotfiles = [ "f_librewolf_overrides",] [profiles.Isengard] -include = ["terminal"] -dotfiles = ["f_distro"] +include = [ "terminal",] +dotfiles = [ "f_distro",] [profiles.Edoras] -include = ["terminal"] +include = [ "terminal",] [profiles.TakamakiPC] -include = ["terminal"] +include = [ "terminal",] [profiles.localhost] -include = ["terminal"] +include = [ "terminal",] [profiles.ViiruJaTeippi] -include = ["terminal"] -dotfiles = ["f_distro"] - -[profiles.Isengard.variables] -distro_id = "termux" +include = [ "terminal",] +dotfiles = [ "f_distro",] [profiles.Mirkwood.variables] wayland = true @@ -341,5 +299,8 @@ wayland = true [profiles.mko-laptop.variables] wayland = true +[profiles.Isengard.variables] +distro_id = "termux" + [profiles.TakamakiPC.variables] wayland = false From a1c9ca5be9175408980a576ecd10e5d4edd7df1a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:13:01 +0200 Subject: [PATCH 1623/2667] Reformat config.toml, remove unused dotfiles --- config.toml | 89 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 25 deletions(-) diff --git a/config.toml b/config.toml index e10129e5..26677915 100644 --- a/config.toml +++ b/config.toml @@ -31,7 +31,7 @@ dst = "~/.config/imapnotify" src = ".config/imapnotify" [dotfiles.d_nvim] -actions = [ "nvim-packer-sync",] +actions = ["nvim-packer-sync"] dst = "~/.config/nvim" src = ".config/nvim" @@ -236,59 +236,98 @@ dst = "~/.distro" src = ".config/wal" dst = "~/.config/wal" -[dotfiles."f_plymouthd.conf"] -src = "etc/plymouth/plymouthd.conf" -dst = "/etc/plymouth/plymouthd.conf" - [profiles.pacman] -dotfiles = [ "f_makepkg.conf", "f_paru.conf",] +dotfiles = ["f_makepkg.conf", "f_paru.conf"] [profiles.terminal] -dotfiles = [ "d_wal", "d_nvim", "d_ssh", "d_zsh", "f_alacritty.yml", "f_gitconfig", "f_hushlogin", "f_ignore", "f_mailcap", "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", "f_tmux.conf", "f_zshrc",] +dotfiles = [ + "d_wal", + "d_nvim", + "d_ssh", + "d_zsh", + "f_alacritty.yml", + "f_gitconfig", + "f_hushlogin", + "f_ignore", + "f_mailcap", + "f_ranger.conf", + "f_ranger_commands.py", + "f_rtv.cfg", + "f_tmux.conf", + "f_zshrc", +] [profiles.email] -dotfiles = [ "d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config",] +dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] [profiles.media] -dotfiles = [ "d_mpv", "f_abcde.conf", "f_beets_config", "f_beets_whitelist", "f_libra_config", "f_mpd.conf", "f_mpdris2.conf", "f_mpdscribble.conf", "f_ncmpcpp.conf", "f_ncmpcpp_bindings", "f_youtube-dl_config",] +dotfiles = [ + "d_mpv", + "f_abcde.conf", + "f_beets_config", + "f_beets_whitelist", + "f_libra_config", + "f_mpd.conf", + "f_mpdris2.conf", + "f_mpdscribble.conf", + "f_ncmpcpp.conf", + "f_ncmpcpp_bindings", + "f_youtube-dl_config", +] [profiles.sway] -dotfiles = [ "d_sway", "d_waybar", "d_wofi", "d_zathura", "f_electron-flags.conf", "f_electron12-flags.conf", "f_fonts.conf", "f_foot.ini", "f_mako_config", "f_redshift.conf",] +dotfiles = [ + "d_sway", + "d_waybar", + "d_wofi", + "d_zathura", + "f_electron-flags.conf", + "f_electron12-flags.conf", + "f_fonts.conf", + "f_foot.ini", + "f_mako_config", + "f_redshift.conf", +] [profiles.gpg] -dotfiles = [ "f_gpg-agent.conf", "f_gpg.conf", "f_gpg_scdaemon.conf", "f_pam_environment",] +dotfiles = [ + "f_gpg-agent.conf", + "f_gpg.conf", + "f_gpg_scdaemon.conf", + "f_pam_environment", +] [profiles.Mirkwood] -include = [ "pacman", "terminal", "email", "media", "sway", "gpg",] -dotfiles = [ "d_rofi", "f_librewolf_overrides", "f_distro", "f_plymouthd.conf",] +include = ["pacman", "terminal", "email", "media", "sway", "gpg"] +dotfiles = ["d_rofi", "f_librewolf_overrides", "f_distro"] [profiles.Moria] -include = [ "pacman", "terminal", "media", "gpg",] -dotfiles = [ "f_zprofile", "f_librewolf_overrides",] +include = ["pacman", "terminal", "media", "gpg"] +dotfiles = ["f_zprofile", "f_librewolf_overrides"] [profiles.Gondor] -include = [ "pacman", "terminal",] +include = ["pacman", "terminal"] [profiles.mko-laptop] -include = [ "terminal", "media", "gpg",] -dotfiles = [ "f_librewolf_overrides",] +include = ["terminal", "media", "gpg"] +dotfiles = ["f_librewolf_overrides"] [profiles.Isengard] -include = [ "terminal",] -dotfiles = [ "f_distro",] +include = ["terminal"] +dotfiles = ["f_distro"] [profiles.Edoras] -include = [ "terminal",] +include = ["terminal"] [profiles.TakamakiPC] -include = [ "terminal",] +include = ["terminal"] [profiles.localhost] -include = [ "terminal",] +include = ["terminal"] [profiles.ViiruJaTeippi] -include = [ "terminal",] -dotfiles = [ "f_distro",] +include = ["terminal"] +dotfiles = ["f_distro"] [profiles.Mirkwood.variables] wayland = true From 5c952d7c8cc5dc42f5175757408096c1326dc93f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:13:01 +0200 Subject: [PATCH 1624/2667] Reformat config.toml, remove unused dotfiles --- config.toml | 89 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 25 deletions(-) diff --git a/config.toml b/config.toml index e10129e5..26677915 100644 --- a/config.toml +++ b/config.toml @@ -31,7 +31,7 @@ dst = "~/.config/imapnotify" src = ".config/imapnotify" [dotfiles.d_nvim] -actions = [ "nvim-packer-sync",] +actions = ["nvim-packer-sync"] dst = "~/.config/nvim" src = ".config/nvim" @@ -236,59 +236,98 @@ dst = "~/.distro" src = ".config/wal" dst = "~/.config/wal" -[dotfiles."f_plymouthd.conf"] -src = "etc/plymouth/plymouthd.conf" -dst = "/etc/plymouth/plymouthd.conf" - [profiles.pacman] -dotfiles = [ "f_makepkg.conf", "f_paru.conf",] +dotfiles = ["f_makepkg.conf", "f_paru.conf"] [profiles.terminal] -dotfiles = [ "d_wal", "d_nvim", "d_ssh", "d_zsh", "f_alacritty.yml", "f_gitconfig", "f_hushlogin", "f_ignore", "f_mailcap", "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", "f_tmux.conf", "f_zshrc",] +dotfiles = [ + "d_wal", + "d_nvim", + "d_ssh", + "d_zsh", + "f_alacritty.yml", + "f_gitconfig", + "f_hushlogin", + "f_ignore", + "f_mailcap", + "f_ranger.conf", + "f_ranger_commands.py", + "f_rtv.cfg", + "f_tmux.conf", + "f_zshrc", +] [profiles.email] -dotfiles = [ "d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config",] +dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] [profiles.media] -dotfiles = [ "d_mpv", "f_abcde.conf", "f_beets_config", "f_beets_whitelist", "f_libra_config", "f_mpd.conf", "f_mpdris2.conf", "f_mpdscribble.conf", "f_ncmpcpp.conf", "f_ncmpcpp_bindings", "f_youtube-dl_config",] +dotfiles = [ + "d_mpv", + "f_abcde.conf", + "f_beets_config", + "f_beets_whitelist", + "f_libra_config", + "f_mpd.conf", + "f_mpdris2.conf", + "f_mpdscribble.conf", + "f_ncmpcpp.conf", + "f_ncmpcpp_bindings", + "f_youtube-dl_config", +] [profiles.sway] -dotfiles = [ "d_sway", "d_waybar", "d_wofi", "d_zathura", "f_electron-flags.conf", "f_electron12-flags.conf", "f_fonts.conf", "f_foot.ini", "f_mako_config", "f_redshift.conf",] +dotfiles = [ + "d_sway", + "d_waybar", + "d_wofi", + "d_zathura", + "f_electron-flags.conf", + "f_electron12-flags.conf", + "f_fonts.conf", + "f_foot.ini", + "f_mako_config", + "f_redshift.conf", +] [profiles.gpg] -dotfiles = [ "f_gpg-agent.conf", "f_gpg.conf", "f_gpg_scdaemon.conf", "f_pam_environment",] +dotfiles = [ + "f_gpg-agent.conf", + "f_gpg.conf", + "f_gpg_scdaemon.conf", + "f_pam_environment", +] [profiles.Mirkwood] -include = [ "pacman", "terminal", "email", "media", "sway", "gpg",] -dotfiles = [ "d_rofi", "f_librewolf_overrides", "f_distro", "f_plymouthd.conf",] +include = ["pacman", "terminal", "email", "media", "sway", "gpg"] +dotfiles = ["d_rofi", "f_librewolf_overrides", "f_distro"] [profiles.Moria] -include = [ "pacman", "terminal", "media", "gpg",] -dotfiles = [ "f_zprofile", "f_librewolf_overrides",] +include = ["pacman", "terminal", "media", "gpg"] +dotfiles = ["f_zprofile", "f_librewolf_overrides"] [profiles.Gondor] -include = [ "pacman", "terminal",] +include = ["pacman", "terminal"] [profiles.mko-laptop] -include = [ "terminal", "media", "gpg",] -dotfiles = [ "f_librewolf_overrides",] +include = ["terminal", "media", "gpg"] +dotfiles = ["f_librewolf_overrides"] [profiles.Isengard] -include = [ "terminal",] -dotfiles = [ "f_distro",] +include = ["terminal"] +dotfiles = ["f_distro"] [profiles.Edoras] -include = [ "terminal",] +include = ["terminal"] [profiles.TakamakiPC] -include = [ "terminal",] +include = ["terminal"] [profiles.localhost] -include = [ "terminal",] +include = ["terminal"] [profiles.ViiruJaTeippi] -include = [ "terminal",] -dotfiles = [ "f_distro",] +include = ["terminal"] +dotfiles = ["f_distro"] [profiles.Mirkwood.variables] wayland = true From c0f5daeb7229f663df56502cb0f1fb7781873954 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:13:16 +0200 Subject: [PATCH 1625/2667] Refactor config-root.toml, add plymouth conf --- config-root.toml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/config-root.toml b/config-root.toml index 698f0cec..53619ed5 100644 --- a/config-root.toml +++ b/config-root.toml @@ -83,6 +83,10 @@ src = "etc/pacman.conf" dst = "/etc/pacman.d/hooks/zsh.hook" src = "etc/pacman.d/hooks/zsh.hook" +[dotfiles."f_plymouthd.conf"] +src = "etc/plymouth/plymouthd.conf" +dst = "/etc/plymouth/plymouthd.conf" + [dotfiles.f_sshd_config] dst = "/etc/ssh/sshd_config" src = "etc/ssh/sshd_config" @@ -191,10 +195,10 @@ dotfiles = [ "f_ignore", "f_logind.conf", "f_mkinitcpio.conf", + "f_plymouthd", "f_sshd_config", "f_system.conf", "f_timesyncd.conf", - "f_vconsole.conf", "f_welcomemessage.conf", "f_yubikey_udev.rules", ] @@ -204,10 +208,12 @@ include = ["Locale", "Pacman", "Network"] include = ["Locale", "Pacman", "Network"] dotfiles = [ "f_99-sysctl.conf", + "f_cmdline", "f_cpupower", "f_doas.conf", + "f_mkinitcpio.conf", + "f_plymouthd", "f_sshd_config", - "f_cmdline", ] [profiles.Gondor] From 9498a29f0a0e3abe1e73afa6dcf04fc9220f6af8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:13:16 +0200 Subject: [PATCH 1626/2667] Refactor config-root.toml, add plymouth conf --- config-root.toml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/config-root.toml b/config-root.toml index 698f0cec..53619ed5 100644 --- a/config-root.toml +++ b/config-root.toml @@ -83,6 +83,10 @@ src = "etc/pacman.conf" dst = "/etc/pacman.d/hooks/zsh.hook" src = "etc/pacman.d/hooks/zsh.hook" +[dotfiles."f_plymouthd.conf"] +src = "etc/plymouth/plymouthd.conf" +dst = "/etc/plymouth/plymouthd.conf" + [dotfiles.f_sshd_config] dst = "/etc/ssh/sshd_config" src = "etc/ssh/sshd_config" @@ -191,10 +195,10 @@ dotfiles = [ "f_ignore", "f_logind.conf", "f_mkinitcpio.conf", + "f_plymouthd", "f_sshd_config", "f_system.conf", "f_timesyncd.conf", - "f_vconsole.conf", "f_welcomemessage.conf", "f_yubikey_udev.rules", ] @@ -204,10 +208,12 @@ include = ["Locale", "Pacman", "Network"] include = ["Locale", "Pacman", "Network"] dotfiles = [ "f_99-sysctl.conf", + "f_cmdline", "f_cpupower", "f_doas.conf", + "f_mkinitcpio.conf", + "f_plymouthd", "f_sshd_config", - "f_cmdline", ] [profiles.Gondor] From be49f971eaaaa87b56ec16e9aa4a2cd40ed0f6f1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:15:09 +0200 Subject: [PATCH 1627/2667] Fix plymouth conf name --- config-root.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config-root.toml b/config-root.toml index 53619ed5..ff00a600 100644 --- a/config-root.toml +++ b/config-root.toml @@ -195,7 +195,7 @@ dotfiles = [ "f_ignore", "f_logind.conf", "f_mkinitcpio.conf", - "f_plymouthd", + "f_plymouthd.conf", "f_sshd_config", "f_system.conf", "f_timesyncd.conf", @@ -212,7 +212,7 @@ dotfiles = [ "f_cpupower", "f_doas.conf", "f_mkinitcpio.conf", - "f_plymouthd", + "f_plymouthd.conf", "f_sshd_config", ] From b73c8f07a6192048b42ea73ac8cf6519f3b03b14 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:15:09 +0200 Subject: [PATCH 1628/2667] Fix plymouth conf name --- config-root.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config-root.toml b/config-root.toml index 53619ed5..ff00a600 100644 --- a/config-root.toml +++ b/config-root.toml @@ -195,7 +195,7 @@ dotfiles = [ "f_ignore", "f_logind.conf", "f_mkinitcpio.conf", - "f_plymouthd", + "f_plymouthd.conf", "f_sshd_config", "f_system.conf", "f_timesyncd.conf", @@ -212,7 +212,7 @@ dotfiles = [ "f_cpupower", "f_doas.conf", "f_mkinitcpio.conf", - "f_plymouthd", + "f_plymouthd.conf", "f_sshd_config", ] From c80485c36e41638708ff8df87893feffeb08f065 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:15:43 +0200 Subject: [PATCH 1629/2667] Fix plymouth path --- {home => root}/etc/plymouth/plymouthd.conf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {home => root}/etc/plymouth/plymouthd.conf (100%) diff --git a/home/etc/plymouth/plymouthd.conf b/root/etc/plymouth/plymouthd.conf similarity index 100% rename from home/etc/plymouth/plymouthd.conf rename to root/etc/plymouth/plymouthd.conf From b04b5665e26d1bc22aaaa2e04f8c54f4cec6ae35 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:15:43 +0200 Subject: [PATCH 1630/2667] Fix plymouth path --- {home => root}/etc/plymouth/plymouthd.conf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {home => root}/etc/plymouth/plymouthd.conf (100%) diff --git a/home/etc/plymouth/plymouthd.conf b/root/etc/plymouth/plymouthd.conf similarity index 100% rename from home/etc/plymouth/plymouthd.conf rename to root/etc/plymouth/plymouthd.conf From cb28cd8bafead69d5ad60ee34e9017adbcbb17e1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:33:05 +0200 Subject: [PATCH 1631/2667] Add plymouth to moria --- root/etc/mkinitcpio.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index a4fe8484..31560d43 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -1,12 +1,12 @@ COMPRESSION="zstd" MODULES=(amdgpu) +BINARIES=("/usr/bin/btrfs") FILES=() -{%@@ if profile == "Mirkwood" @@%} -BINARIES=("/usr/bin/btrfs") +{%@@ if profile == "Mirkwood" or profile == "Moria" @@%} HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) -{%@@ else @@%} -BINARIES=() -HOOKS=(colors consolefont base udev autodetect modconf block filesystems keyboard fsck) +{%@@ elif profile === 'Moria' @@%} +HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) +#HOOKS=(base udev keyboard autodetect modconf block netconf dropbear encryptssh filesystems btrfs fsck) {%@@ endif @@%} From a1c475da50ca28ac7a6486f093ed654278f8b8e4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:33:05 +0200 Subject: [PATCH 1632/2667] Add plymouth to moria --- root/etc/mkinitcpio.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index a4fe8484..31560d43 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -1,12 +1,12 @@ COMPRESSION="zstd" MODULES=(amdgpu) +BINARIES=("/usr/bin/btrfs") FILES=() -{%@@ if profile == "Mirkwood" @@%} -BINARIES=("/usr/bin/btrfs") +{%@@ if profile == "Mirkwood" or profile == "Moria" @@%} HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) -{%@@ else @@%} -BINARIES=() -HOOKS=(colors consolefont base udev autodetect modconf block filesystems keyboard fsck) +{%@@ elif profile === 'Moria' @@%} +HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) +#HOOKS=(base udev keyboard autodetect modconf block netconf dropbear encryptssh filesystems btrfs fsck) {%@@ endif @@%} From 5e3bbc487bbe4c755fa6e05deecb3c5e7215a876 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:34:04 +0200 Subject: [PATCH 1633/2667] Fix mkinitcpio.conf template syntax --- root/etc/mkinitcpio.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 31560d43..3082c7de 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -5,8 +5,7 @@ FILES=() {%@@ if profile == "Mirkwood" or profile == "Moria" @@%} HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) - -{%@@ elif profile === 'Moria' @@%} +{%@@ elif profile == 'Moria' @@%} HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) #HOOKS=(base udev keyboard autodetect modconf block netconf dropbear encryptssh filesystems btrfs fsck) {%@@ endif @@%} From 4bdff7d07c19029bc832826a4b0d4d524de38712 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:34:04 +0200 Subject: [PATCH 1634/2667] Fix mkinitcpio.conf template syntax --- root/etc/mkinitcpio.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 31560d43..3082c7de 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -5,8 +5,7 @@ FILES=() {%@@ if profile == "Mirkwood" or profile == "Moria" @@%} HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) - -{%@@ elif profile === 'Moria' @@%} +{%@@ elif profile == 'Moria' @@%} HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) #HOOKS=(base udev keyboard autodetect modconf block netconf dropbear encryptssh filesystems btrfs fsck) {%@@ endif @@%} From 8983127f3e270a1dd245d5e78d376ab5ed5364b3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:38:53 +0200 Subject: [PATCH 1635/2667] Add mkinitcpio.d to moria --- config-root.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config-root.toml b/config-root.toml index ff00a600..d878f57d 100644 --- a/config-root.toml +++ b/config-root.toml @@ -207,6 +207,7 @@ include = ["Locale", "Pacman", "Network"] [profiles.Moria] include = ["Locale", "Pacman", "Network"] dotfiles = [ + "d_mkinitcpio.d", "f_99-sysctl.conf", "f_cmdline", "f_cpupower", From 5430b88cadf873227261658af69292388b0d12c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:38:53 +0200 Subject: [PATCH 1636/2667] Add mkinitcpio.d to moria --- config-root.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config-root.toml b/config-root.toml index ff00a600..d878f57d 100644 --- a/config-root.toml +++ b/config-root.toml @@ -207,6 +207,7 @@ include = ["Locale", "Pacman", "Network"] [profiles.Moria] include = ["Locale", "Pacman", "Network"] dotfiles = [ + "d_mkinitcpio.d", "f_99-sysctl.conf", "f_cmdline", "f_cpupower", From 1962505d8ee77e202b321b4e2671c5b9fd7c7cc3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 4 Nov 2022 12:49:22 +0200 Subject: [PATCH 1637/2667] Git: enable rerere and diff3 mode --- home/.config/git/config | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home/.config/git/config b/home/.config/git/config index 80168b19..ff052d53 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -20,10 +20,11 @@ [merge] prompt = false + conflictstyle = diff3 tool = nvim-merge [mergetool "nvim-merge"] - cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' + cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' keepBackup = false [diff] @@ -50,3 +51,6 @@ [credential] helper = cache --timeout=600 helper = !pass-git-helper $@ + +[rerere] + enabled = true From 1206df05ccd4b1ee4d735d7e29a1bfda572caa7e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 4 Nov 2022 12:49:22 +0200 Subject: [PATCH 1638/2667] Git: enable rerere and diff3 mode --- home/.config/git/config | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home/.config/git/config b/home/.config/git/config index 80168b19..ff052d53 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -20,10 +20,11 @@ [merge] prompt = false + conflictstyle = diff3 tool = nvim-merge [mergetool "nvim-merge"] - cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' + cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' keepBackup = false [diff] @@ -50,3 +51,6 @@ [credential] helper = cache --timeout=600 helper = !pass-git-helper $@ + +[rerere] + enabled = true From c2ea91bca09af73d82dc090887cb9d3aa8739ef0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 4 Nov 2022 13:39:43 +0200 Subject: [PATCH 1639/2667] Git: change order of windows in neovim mergetool --- home/.config/git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/git/config b/home/.config/git/config index ff052d53..dc51040f 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -24,7 +24,7 @@ tool = nvim-merge [mergetool "nvim-merge"] - cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' + cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' keepBackup = false [diff] From 0ad3a4eb1e6e950780026dc33a260ff433a43b38 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 4 Nov 2022 13:39:43 +0200 Subject: [PATCH 1640/2667] Git: change order of windows in neovim mergetool --- home/.config/git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/git/config b/home/.config/git/config index ff052d53..dc51040f 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -24,7 +24,7 @@ tool = nvim-merge [mergetool "nvim-merge"] - cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' + cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' keepBackup = false [diff] From a2ecbae4ca393326b1a45f5c37fee5e693a40548 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 4 Nov 2022 13:43:07 +0200 Subject: [PATCH 1641/2667] Nvim: switch from gitgutter to gitsigns plugin --- home/.config/nvim/lua/plugins/init.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index de36bce9..614a08c2 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -41,8 +41,13 @@ require("packer").startup(function() -- Startup screen/dashboard --use 'glepnir/dashboard-nvim' - -- Git in signcolumn - use("airblade/vim-gitgutter") + -- Git status in signcolumn + use({ + "lewis6991/gitsigns.nvim", + config = function() + require("gitsigns").setup() + end, + }) -- Tabline/bufferline use({ From 393c619e2baba0b3bf513619323209fba1719fe7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 4 Nov 2022 13:43:07 +0200 Subject: [PATCH 1642/2667] Nvim: switch from gitgutter to gitsigns plugin --- home/.config/nvim/lua/plugins/init.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index de36bce9..614a08c2 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -41,8 +41,13 @@ require("packer").startup(function() -- Startup screen/dashboard --use 'glepnir/dashboard-nvim' - -- Git in signcolumn - use("airblade/vim-gitgutter") + -- Git status in signcolumn + use({ + "lewis6991/gitsigns.nvim", + config = function() + require("gitsigns").setup() + end, + }) -- Tabline/bufferline use({ From 87b1d5961ab341918285b67ef3b62801a556a691 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 09:43:20 +0200 Subject: [PATCH 1643/2667] Add dslr webcam alias --- home/.config/zsh/04-aliases.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 5a1c65d2..8dbb3855 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -277,3 +277,5 @@ dct() { yj -ty < $file_path | docker compose -f - $@ } + +alias dslr-webcam='pkill -f gphoto2; gphoto2 --stdout --capture-movie | ffmpeg -i - -vcodec rawvideo -pix_fmt yuv420p -threads 0 -f v4l2 /dev/video0' From ca12d94a3ece1d38e6d21ea41c54a11401880bed Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 09:43:20 +0200 Subject: [PATCH 1644/2667] Add dslr webcam alias --- home/.config/zsh/04-aliases.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 5a1c65d2..8dbb3855 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -277,3 +277,5 @@ dct() { yj -ty < $file_path | docker compose -f - $@ } + +alias dslr-webcam='pkill -f gphoto2; gphoto2 --stdout --capture-movie | ffmpeg -i - -vcodec rawvideo -pix_fmt yuv420p -threads 0 -f v4l2 /dev/video0' From f00a280aaf3adb50d4a978402318705cc7605491 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 09:44:02 +0200 Subject: [PATCH 1645/2667] Misc changes --- config.toml | 2 +- home/.ssh/authorized_keys | 3 +++ root/etc/kernel/cmdline | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config.toml b/config.toml index 26677915..2479bda6 100644 --- a/config.toml +++ b/config.toml @@ -303,7 +303,7 @@ dotfiles = ["d_rofi", "f_librewolf_overrides", "f_distro"] [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] -dotfiles = ["f_zprofile", "f_librewolf_overrides"] +dotfiles = ["f_librewolf_overrides"] [profiles.Gondor] include = ["pacman", "terminal"] diff --git a/home/.ssh/authorized_keys b/home/.ssh/authorized_keys index 9bd02835..d0086bca 100644 --- a/home/.ssh/authorized_keys +++ b/home/.ssh/authorized_keys @@ -1 +1,4 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHLUrf0LpumX6XEkPW6Z105sgJMWWOllWy7sxB+lgdUw Marko YubiKey +{%@@ if profile == 'Moria' @@%} +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICg484CTSIr8wZQ3g5rPfe2VHIcSmmxOjz7mTCkvfR+x Home Assistant key +{%@@ endif @@%} diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index 012af40d..7a75728c 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -1,5 +1,5 @@ {%@@ if profile == "Mirkwood" @@%} cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait amdgpu.ppfeaturemask=0xffffffff quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Moria" @@%} -cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vga=current bgrt_disable video=HDMI-A-2:d video=HDMI-A-3:d +cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ endif @@%} From fa37e929ea80d1dcdfd44f613f434ec68e92df07 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 09:44:02 +0200 Subject: [PATCH 1646/2667] Misc changes --- config.toml | 2 +- home/.ssh/authorized_keys | 3 +++ root/etc/kernel/cmdline | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config.toml b/config.toml index 26677915..2479bda6 100644 --- a/config.toml +++ b/config.toml @@ -303,7 +303,7 @@ dotfiles = ["d_rofi", "f_librewolf_overrides", "f_distro"] [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] -dotfiles = ["f_zprofile", "f_librewolf_overrides"] +dotfiles = ["f_librewolf_overrides"] [profiles.Gondor] include = ["pacman", "terminal"] diff --git a/home/.ssh/authorized_keys b/home/.ssh/authorized_keys index 9bd02835..d0086bca 100644 --- a/home/.ssh/authorized_keys +++ b/home/.ssh/authorized_keys @@ -1 +1,4 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHLUrf0LpumX6XEkPW6Z105sgJMWWOllWy7sxB+lgdUw Marko YubiKey +{%@@ if profile == 'Moria' @@%} +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICg484CTSIr8wZQ3g5rPfe2VHIcSmmxOjz7mTCkvfR+x Home Assistant key +{%@@ endif @@%} diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index 012af40d..7a75728c 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -1,5 +1,5 @@ {%@@ if profile == "Mirkwood" @@%} cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait amdgpu.ppfeaturemask=0xffffffff quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Moria" @@%} -cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vga=current bgrt_disable video=HDMI-A-2:d video=HDMI-A-3:d +cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ endif @@%} From ba84bd1e7344ab5363dfda94d6b602a2eb09174a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 13:25:11 +0200 Subject: [PATCH 1647/2667] Add scaling for plymouth in Moria --- root/etc/plymouth/plymouthd.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/root/etc/plymouth/plymouthd.conf b/root/etc/plymouth/plymouthd.conf index 328ce5b5..7765710e 100644 --- a/root/etc/plymouth/plymouthd.conf +++ b/root/etc/plymouth/plymouthd.conf @@ -2,3 +2,6 @@ Theme=arch-logo-gnomish ShowDelay=0 DeviceTimeout=8 +{%@@ if profile == "Moria" @@%} +DeviceScale=2 +{%@@ endif @@%} From 204c4542b4d26eb43d5593c4b3f093bec2b02eb8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 13:25:11 +0200 Subject: [PATCH 1648/2667] Add scaling for plymouth in Moria --- root/etc/plymouth/plymouthd.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/root/etc/plymouth/plymouthd.conf b/root/etc/plymouth/plymouthd.conf index 328ce5b5..7765710e 100644 --- a/root/etc/plymouth/plymouthd.conf +++ b/root/etc/plymouth/plymouthd.conf @@ -2,3 +2,6 @@ Theme=arch-logo-gnomish ShowDelay=0 DeviceTimeout=8 +{%@@ if profile == "Moria" @@%} +DeviceScale=2 +{%@@ endif @@%} From 9e1acf890a41e93c87ab173d5bea5722c81ddacb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 17:37:00 +0200 Subject: [PATCH 1649/2667] Remove deprecated settings from MPD and switch to PipeWire output --- home/.config/mpd/mpd.conf | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/home/.config/mpd/mpd.conf b/home/.config/mpd/mpd.conf index 01504433..eca1f410 100644 --- a/home/.config/mpd/mpd.conf +++ b/home/.config/mpd/mpd.conf @@ -1,25 +1,24 @@ -music_directory "~/Music" -playlist_directory "~/Music/Playlists" -db_file "~/.mpd/database" -log_file "~/.mpd/log" -pid_file "~/.mpd/pid" -state_file "~/.mpd/state" -sticker_file "~/.mpd/sticker.sql" +music_directory "~/Music" +playlist_directory "~/Music/Playlists" +db_file "~/.mpd/database" +log_file "~/.mpd/log" +state_file "~/.mpd/state" +sticker_file "~/.mpd/sticker.sql" -replaygain "track" +replaygain "track" -default_permissions "read" -password "{{@@ env['PASS_MPD'] @@}}@read,add,control" -password "{{@@ env['PASS_MPD_ADMIN'] @@}}@read,add,control,admin" +default_permissions "read" +password "{{@@ env['PASS_MPD'] @@}}@read,add,control" +password "{{@@ env['PASS_MPD_ADMIN'] @@}}@read,add,control,admin" audio_output { - type "fifo" - name "Visualizer" - path "/tmp/mpd.fifo" - format "44100:16:2" + type "fifo" + name "Visualizer" + path "/tmp/mpd.fifo" + format "44100:16:2" } audio_output { - type "pulse" - name "MPD PulseAudio" + type "pipewire" + name "MPD PipeWire" } From 6d092a001ac7c7c0f3b1e2a2abf69afb4e2e4779 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 17:37:00 +0200 Subject: [PATCH 1650/2667] Remove deprecated settings from MPD and switch to PipeWire output --- home/.config/mpd/mpd.conf | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/home/.config/mpd/mpd.conf b/home/.config/mpd/mpd.conf index 01504433..eca1f410 100644 --- a/home/.config/mpd/mpd.conf +++ b/home/.config/mpd/mpd.conf @@ -1,25 +1,24 @@ -music_directory "~/Music" -playlist_directory "~/Music/Playlists" -db_file "~/.mpd/database" -log_file "~/.mpd/log" -pid_file "~/.mpd/pid" -state_file "~/.mpd/state" -sticker_file "~/.mpd/sticker.sql" +music_directory "~/Music" +playlist_directory "~/Music/Playlists" +db_file "~/.mpd/database" +log_file "~/.mpd/log" +state_file "~/.mpd/state" +sticker_file "~/.mpd/sticker.sql" -replaygain "track" +replaygain "track" -default_permissions "read" -password "{{@@ env['PASS_MPD'] @@}}@read,add,control" -password "{{@@ env['PASS_MPD_ADMIN'] @@}}@read,add,control,admin" +default_permissions "read" +password "{{@@ env['PASS_MPD'] @@}}@read,add,control" +password "{{@@ env['PASS_MPD_ADMIN'] @@}}@read,add,control,admin" audio_output { - type "fifo" - name "Visualizer" - path "/tmp/mpd.fifo" - format "44100:16:2" + type "fifo" + name "Visualizer" + path "/tmp/mpd.fifo" + format "44100:16:2" } audio_output { - type "pulse" - name "MPD PulseAudio" + type "pipewire" + name "MPD PipeWire" } From 7c43f75e27668767a116eeb46993e371c5b94090 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 17:37:16 +0200 Subject: [PATCH 1651/2667] Add dconf settings and remove distro test file --- config.toml | 18 +++++----- home/.config/dconf.ini | 80 ++++++++++++++++++++++++++++++++++++++++++ home/.distro | 2 -- 3 files changed, 90 insertions(+), 10 deletions(-) create mode 100644 home/.config/dconf.ini delete mode 100644 home/.distro diff --git a/config.toml b/config.toml index 2479bda6..491bea31 100644 --- a/config.toml +++ b/config.toml @@ -1,5 +1,6 @@ [actions] nvim-packer-sync = "nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync'" +dconf-load = "dconf load / < ~/.config/dconf.ini" [config] backup = true @@ -228,14 +229,15 @@ dst = "~/.config/electron12-flags.conf" src = ".pam_environment" dst = "~/.pam_environment" -[dotfiles.f_distro] -src = ".distro" -dst = "~/.distro" - [dotfiles.d_wal] src = ".config/wal" dst = "~/.config/wal" +[dotfiles."f_dconf.ini"] +src = ".config/dconf.ini" +dst = "~/.config/dconf.ini" +actions = ["dconf-load"] + [profiles.pacman] dotfiles = ["f_makepkg.conf", "f_paru.conf"] @@ -299,11 +301,11 @@ dotfiles = [ [profiles.Mirkwood] include = ["pacman", "terminal", "email", "media", "sway", "gpg"] -dotfiles = ["d_rofi", "f_librewolf_overrides", "f_distro"] +dotfiles = ["d_rofi", "f_librewolf_overrides", "f_dconf.ini"] [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] -dotfiles = ["f_librewolf_overrides"] +dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] [profiles.Gondor] include = ["pacman", "terminal"] @@ -314,7 +316,7 @@ dotfiles = ["f_librewolf_overrides"] [profiles.Isengard] include = ["terminal"] -dotfiles = ["f_distro"] +dotfiles = [] [profiles.Edoras] include = ["terminal"] @@ -327,7 +329,7 @@ include = ["terminal"] [profiles.ViiruJaTeippi] include = ["terminal"] -dotfiles = ["f_distro"] +dotfiles = [] [profiles.Mirkwood.variables] wayland = true diff --git a/home/.config/dconf.ini b/home/.config/dconf.ini new file mode 100644 index 00000000..25e69900 --- /dev/null +++ b/home/.config/dconf.ini @@ -0,0 +1,80 @@ +[io/github/celluloid-player/celluloid] +dark-theme-enable=false +mpv-config-enable=true +mpv-config-file='file:///home/{{@@ env['USER'] @@}}/.config/mpv/mpv.conf' +mpv-input-config-enable=true +mpv-input-config-file='file:///home/{{@@ env['USER'] @@}}/.config/mpv/input.conf' +settings-migrated=true + +[org/gnome/Connections] +first-run=false + +[org/gnome/shell/weather] +automatic-location=false +locations=[<(uint32 2, <('Lappeenranta', 'EFLP', false, [(1.0654507804726074, 0.49128594181309354)], @a(dd) [])>)>] + +[org/gnome/shell/world-clocks] +locations=[<(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>] + +[org/gnome/desktop/a11y/mouse] +dwell-click-enabled=false +dwell-threshold=10 +dwell-time=1.2 +secondary-click-enabled=false +secondary-click-time=1.2 + +[org/gnome/desktop/calendar] +show-weekdate=true + +[org/gnome/desktop/input-sources] +show-all-sources=true +sources=[('xkb', 'eu'), ('xkb', 'fi')] +xkb-options=['lv3:ralt_switch'] + +[org/gnome/desktop/peripherals/touchpad] +tap-to-click=true +two-finger-scrolling-enabled=true + +[org/gnome/desktop/privacy] +disable-microphone=false +old-files-age=uint32 14 +recent-files-max-age=-1 +remove-old-temp-files=true +remove-old-trash-files=true + +[org/gnome/desktop/wm/keybindings] +close=['w'] +toggle-fullscreen=['f'] +move-to-workspace-left=['h'] +move-to-workspace-down=['j'] +move-to-workspace-up=['k'] +move-to-workspace-right=['l'] +switch-to-workspace-left=['h'] +switch-to-workspace-down=['j'] +switch-to-workspace-up=['k'] +switch-to-workspace-right=['l'] + +[org/gnome/settings-daemon/plugins/media-keys] +custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/'] +screensaver=['BackSpace'] +www=['b'] + +[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0] +binding='Return' +command='kgx' +name='Open terminal' + +[org/gnome/file-roller/dialogs/new] +default-extension='.tar.zst' + +[org/gnome/software] +check-timestamp=int64 1667730233 +download-updates=true +download-updates-notify=true +first-run=false + +[org/gnome/system/location] +enabled=true + +[org/gnome/tweaks] +show-extensions-notice=false diff --git a/home/.distro b/home/.distro deleted file mode 100644 index 87530073..00000000 --- a/home/.distro +++ /dev/null @@ -1,2 +0,0 @@ -Just a file for testing dotdrop distro_id -{{@@ distro_id @@}} From 14ea0031d6efef18fc09f281a76797b5044b5cc7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 17:37:16 +0200 Subject: [PATCH 1652/2667] Add dconf settings and remove distro test file --- config.toml | 18 +++++----- home/.config/dconf.ini | 80 ++++++++++++++++++++++++++++++++++++++++++ home/.distro | 2 -- 3 files changed, 90 insertions(+), 10 deletions(-) create mode 100644 home/.config/dconf.ini delete mode 100644 home/.distro diff --git a/config.toml b/config.toml index 2479bda6..491bea31 100644 --- a/config.toml +++ b/config.toml @@ -1,5 +1,6 @@ [actions] nvim-packer-sync = "nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync'" +dconf-load = "dconf load / < ~/.config/dconf.ini" [config] backup = true @@ -228,14 +229,15 @@ dst = "~/.config/electron12-flags.conf" src = ".pam_environment" dst = "~/.pam_environment" -[dotfiles.f_distro] -src = ".distro" -dst = "~/.distro" - [dotfiles.d_wal] src = ".config/wal" dst = "~/.config/wal" +[dotfiles."f_dconf.ini"] +src = ".config/dconf.ini" +dst = "~/.config/dconf.ini" +actions = ["dconf-load"] + [profiles.pacman] dotfiles = ["f_makepkg.conf", "f_paru.conf"] @@ -299,11 +301,11 @@ dotfiles = [ [profiles.Mirkwood] include = ["pacman", "terminal", "email", "media", "sway", "gpg"] -dotfiles = ["d_rofi", "f_librewolf_overrides", "f_distro"] +dotfiles = ["d_rofi", "f_librewolf_overrides", "f_dconf.ini"] [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] -dotfiles = ["f_librewolf_overrides"] +dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] [profiles.Gondor] include = ["pacman", "terminal"] @@ -314,7 +316,7 @@ dotfiles = ["f_librewolf_overrides"] [profiles.Isengard] include = ["terminal"] -dotfiles = ["f_distro"] +dotfiles = [] [profiles.Edoras] include = ["terminal"] @@ -327,7 +329,7 @@ include = ["terminal"] [profiles.ViiruJaTeippi] include = ["terminal"] -dotfiles = ["f_distro"] +dotfiles = [] [profiles.Mirkwood.variables] wayland = true diff --git a/home/.config/dconf.ini b/home/.config/dconf.ini new file mode 100644 index 00000000..25e69900 --- /dev/null +++ b/home/.config/dconf.ini @@ -0,0 +1,80 @@ +[io/github/celluloid-player/celluloid] +dark-theme-enable=false +mpv-config-enable=true +mpv-config-file='file:///home/{{@@ env['USER'] @@}}/.config/mpv/mpv.conf' +mpv-input-config-enable=true +mpv-input-config-file='file:///home/{{@@ env['USER'] @@}}/.config/mpv/input.conf' +settings-migrated=true + +[org/gnome/Connections] +first-run=false + +[org/gnome/shell/weather] +automatic-location=false +locations=[<(uint32 2, <('Lappeenranta', 'EFLP', false, [(1.0654507804726074, 0.49128594181309354)], @a(dd) [])>)>] + +[org/gnome/shell/world-clocks] +locations=[<(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>] + +[org/gnome/desktop/a11y/mouse] +dwell-click-enabled=false +dwell-threshold=10 +dwell-time=1.2 +secondary-click-enabled=false +secondary-click-time=1.2 + +[org/gnome/desktop/calendar] +show-weekdate=true + +[org/gnome/desktop/input-sources] +show-all-sources=true +sources=[('xkb', 'eu'), ('xkb', 'fi')] +xkb-options=['lv3:ralt_switch'] + +[org/gnome/desktop/peripherals/touchpad] +tap-to-click=true +two-finger-scrolling-enabled=true + +[org/gnome/desktop/privacy] +disable-microphone=false +old-files-age=uint32 14 +recent-files-max-age=-1 +remove-old-temp-files=true +remove-old-trash-files=true + +[org/gnome/desktop/wm/keybindings] +close=['w'] +toggle-fullscreen=['f'] +move-to-workspace-left=['h'] +move-to-workspace-down=['j'] +move-to-workspace-up=['k'] +move-to-workspace-right=['l'] +switch-to-workspace-left=['h'] +switch-to-workspace-down=['j'] +switch-to-workspace-up=['k'] +switch-to-workspace-right=['l'] + +[org/gnome/settings-daemon/plugins/media-keys] +custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/'] +screensaver=['BackSpace'] +www=['b'] + +[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0] +binding='Return' +command='kgx' +name='Open terminal' + +[org/gnome/file-roller/dialogs/new] +default-extension='.tar.zst' + +[org/gnome/software] +check-timestamp=int64 1667730233 +download-updates=true +download-updates-notify=true +first-run=false + +[org/gnome/system/location] +enabled=true + +[org/gnome/tweaks] +show-extensions-notice=false diff --git a/home/.distro b/home/.distro deleted file mode 100644 index 87530073..00000000 --- a/home/.distro +++ /dev/null @@ -1,2 +0,0 @@ -Just a file for testing dotdrop distro_id -{{@@ distro_id @@}} From 09cfb33688bea32d3de5d6e51eb4754500bc72ba Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 17:49:52 +0200 Subject: [PATCH 1653/2667] Add dconf configurations for gnome clock and weather --- home/.config/dconf.ini | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.config/dconf.ini b/home/.config/dconf.ini index 25e69900..675b4023 100644 --- a/home/.config/dconf.ini +++ b/home/.config/dconf.ini @@ -13,9 +13,15 @@ first-run=false automatic-location=false locations=[<(uint32 2, <('Lappeenranta', 'EFLP', false, [(1.0654507804726074, 0.49128594181309354)], @a(dd) [])>)>] +[org/gnome/Weather] +locations=[<(uint32 2, <('Lappeenranta', 'EFLP', false, [(1.0654507804726074, 0.49128594181309354)], @a(dd) [])>)>] + [org/gnome/shell/world-clocks] locations=[<(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>] +[org/gnome/shell/world-clocks] +world-clocks=[{'location': <(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>}] + [org/gnome/desktop/a11y/mouse] dwell-click-enabled=false dwell-threshold=10 From dcc4b2b06d062146e8a9e4feb3d8a9cf34400d5f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 17:49:52 +0200 Subject: [PATCH 1654/2667] Add dconf configurations for gnome clock and weather --- home/.config/dconf.ini | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.config/dconf.ini b/home/.config/dconf.ini index 25e69900..675b4023 100644 --- a/home/.config/dconf.ini +++ b/home/.config/dconf.ini @@ -13,9 +13,15 @@ first-run=false automatic-location=false locations=[<(uint32 2, <('Lappeenranta', 'EFLP', false, [(1.0654507804726074, 0.49128594181309354)], @a(dd) [])>)>] +[org/gnome/Weather] +locations=[<(uint32 2, <('Lappeenranta', 'EFLP', false, [(1.0654507804726074, 0.49128594181309354)], @a(dd) [])>)>] + [org/gnome/shell/world-clocks] locations=[<(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>] +[org/gnome/shell/world-clocks] +world-clocks=[{'location': <(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>}] + [org/gnome/desktop/a11y/mouse] dwell-click-enabled=false dwell-threshold=10 From e6a329830ac112584a40b3f95763cca7f6dfba30 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 17:52:02 +0200 Subject: [PATCH 1655/2667] Fix gnome clocks dconf path --- home/.config/dconf.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/dconf.ini b/home/.config/dconf.ini index 675b4023..043060ab 100644 --- a/home/.config/dconf.ini +++ b/home/.config/dconf.ini @@ -19,7 +19,7 @@ locations=[<(uint32 2, <('Lappeenranta', 'EFLP', false, [(1.0654507804726074, 0. [org/gnome/shell/world-clocks] locations=[<(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>] -[org/gnome/shell/world-clocks] +[org/gnome/clocks] world-clocks=[{'location': <(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>}] [org/gnome/desktop/a11y/mouse] From 4c9593bcb693f36c4c424a2e42a932a05b05f957 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 17:52:02 +0200 Subject: [PATCH 1656/2667] Fix gnome clocks dconf path --- home/.config/dconf.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/dconf.ini b/home/.config/dconf.ini index 675b4023..043060ab 100644 --- a/home/.config/dconf.ini +++ b/home/.config/dconf.ini @@ -19,7 +19,7 @@ locations=[<(uint32 2, <('Lappeenranta', 'EFLP', false, [(1.0654507804726074, 0. [org/gnome/shell/world-clocks] locations=[<(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>] -[org/gnome/shell/world-clocks] +[org/gnome/clocks] world-clocks=[{'location': <(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>}] [org/gnome/desktop/a11y/mouse] From 4b7d69473141cd2f69512ecd438a71c3f28d3f70 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 9 Nov 2022 09:01:45 +0200 Subject: [PATCH 1657/2667] Nvim: add highlight on yank --- home/.config/nvim/init.lua | 1 + home/.config/nvim/lua/highlight_yank.lua | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 home/.config/nvim/lua/highlight_yank.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 29c6b90a..96fed540 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,3 +1,4 @@ require("keybinds") require("settings") +require("highlight_yank") require("plugins.init") diff --git a/home/.config/nvim/lua/highlight_yank.lua b/home/.config/nvim/lua/highlight_yank.lua new file mode 100644 index 00000000..649506bb --- /dev/null +++ b/home/.config/nvim/lua/highlight_yank.lua @@ -0,0 +1,12 @@ +-- Highlight yanked text + +local ag = vim.api.nvim_create_augroup +local au = vim.api.nvim_create_autocmd + +au('TextYankPost', { + group = ag('yank_highlight', {}), + pattern = '*', + callback = function() + vim.highlight.on_yank { higroup='IncSearch', timeout=300 } + end, +}) From 72ab88d55de39ef904c716640010b0d48f4e4bce Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 9 Nov 2022 09:01:45 +0200 Subject: [PATCH 1658/2667] Nvim: add highlight on yank --- home/.config/nvim/init.lua | 1 + home/.config/nvim/lua/highlight_yank.lua | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 home/.config/nvim/lua/highlight_yank.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 29c6b90a..96fed540 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,3 +1,4 @@ require("keybinds") require("settings") +require("highlight_yank") require("plugins.init") diff --git a/home/.config/nvim/lua/highlight_yank.lua b/home/.config/nvim/lua/highlight_yank.lua new file mode 100644 index 00000000..649506bb --- /dev/null +++ b/home/.config/nvim/lua/highlight_yank.lua @@ -0,0 +1,12 @@ +-- Highlight yanked text + +local ag = vim.api.nvim_create_augroup +local au = vim.api.nvim_create_autocmd + +au('TextYankPost', { + group = ag('yank_highlight', {}), + pattern = '*', + callback = function() + vim.highlight.on_yank { higroup='IncSearch', timeout=300 } + end, +}) From ebc50056d5e9c4b364405f87fcfa9762abfe3bf1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 9 Nov 2022 15:52:53 +0200 Subject: [PATCH 1659/2667] Add dconf to mko-laptop --- config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.toml b/config.toml index 491bea31..ab9a0ff9 100644 --- a/config.toml +++ b/config.toml @@ -312,7 +312,7 @@ include = ["pacman", "terminal"] [profiles.mko-laptop] include = ["terminal", "media", "gpg"] -dotfiles = ["f_librewolf_overrides"] +dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] [profiles.Isengard] include = ["terminal"] From aaec8e6067c95c2f8cd7c3e289e8d58cf87efc33 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 9 Nov 2022 15:52:53 +0200 Subject: [PATCH 1660/2667] Add dconf to mko-laptop --- config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.toml b/config.toml index 491bea31..ab9a0ff9 100644 --- a/config.toml +++ b/config.toml @@ -312,7 +312,7 @@ include = ["pacman", "terminal"] [profiles.mko-laptop] include = ["terminal", "media", "gpg"] -dotfiles = ["f_librewolf_overrides"] +dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] [profiles.Isengard] include = ["terminal"] From a4f4bf0377b30ec5dd2a83835f5cface69f97e22 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 9 Nov 2022 15:27:34 +0200 Subject: [PATCH 1661/2667] Dconf enable secondary click --- home/.config/dconf.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/dconf.ini b/home/.config/dconf.ini index 043060ab..3bc8e27f 100644 --- a/home/.config/dconf.ini +++ b/home/.config/dconf.ini @@ -26,7 +26,7 @@ world-clocks=[{'location': <(uint32 2, <('Bangkok', 'VTBD', true, [(0.2428916600 dwell-click-enabled=false dwell-threshold=10 dwell-time=1.2 -secondary-click-enabled=false +secondary-click-enabled=true secondary-click-time=1.2 [org/gnome/desktop/calendar] From 4b4707a84e8eebec15f59fb4f366a69694773ccc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 9 Nov 2022 15:27:34 +0200 Subject: [PATCH 1662/2667] Dconf enable secondary click --- home/.config/dconf.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/dconf.ini b/home/.config/dconf.ini index 043060ab..3bc8e27f 100644 --- a/home/.config/dconf.ini +++ b/home/.config/dconf.ini @@ -26,7 +26,7 @@ world-clocks=[{'location': <(uint32 2, <('Bangkok', 'VTBD', true, [(0.2428916600 dwell-click-enabled=false dwell-threshold=10 dwell-time=1.2 -secondary-click-enabled=false +secondary-click-enabled=true secondary-click-time=1.2 [org/gnome/desktop/calendar] From d342f8f73fca81b229c12353be9d5a682d8c5f3e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 9 Nov 2022 15:45:24 +0200 Subject: [PATCH 1663/2667] Upgrade postgres to 15 --- docker/postgres/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/postgres/docker-compose.toml b/docker/postgres/docker-compose.toml index 57ddd292..e8a9ec85 100644 --- a/docker/postgres/docker-compose.toml +++ b/docker/postgres/docker-compose.toml @@ -2,7 +2,7 @@ [services.postgres] container_name = "postgres" -image = "postgres:14" +image = "postgres:15" environment = ["TZ=Europe/Helsinki", "POSTGRES_PASSWORD=12345"] ports = ["5432:5432"] networks = ["postgres"] From 775ea90211f86ec321a136fe20ac94901224f6bc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 9 Nov 2022 15:45:24 +0200 Subject: [PATCH 1664/2667] Upgrade postgres to 15 --- docker/postgres/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/postgres/docker-compose.toml b/docker/postgres/docker-compose.toml index 57ddd292..e8a9ec85 100644 --- a/docker/postgres/docker-compose.toml +++ b/docker/postgres/docker-compose.toml @@ -2,7 +2,7 @@ [services.postgres] container_name = "postgres" -image = "postgres:14" +image = "postgres:15" environment = ["TZ=Europe/Helsinki", "POSTGRES_PASSWORD=12345"] ports = ["5432:5432"] networks = ["postgres"] From c99a2279e1e6929aa1fc35d291b0fe7e613a07eb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Nov 2022 18:29:22 +0200 Subject: [PATCH 1665/2667] Docker: Add watchtower --- docker/watchtower/docker-compose.toml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 docker/watchtower/docker-compose.toml diff --git a/docker/watchtower/docker-compose.toml b/docker/watchtower/docker-compose.toml new file mode 100644 index 00000000..cc3a5a84 --- /dev/null +++ b/docker/watchtower/docker-compose.toml @@ -0,0 +1,19 @@ +[services.watchtower] +image = "containrrr/watchtower" +container_name = "watchtower" +restart = "unless-stopped" +environment = [ + "WATCHTOWER_CLEANUP=true", + "WATCHTOWER_NOTIFICATION_EMAIL_FROM=watchtower@korhonen.cc", + "WATCHTOWER_NOTIFICATION_EMAIL_TO=admin@korhonen.cc", + "WATCHTOWER_NOTIFICATION_EMAIL_SERVER=smtp.migadu.com", + "WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=587", + "WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER}", + "WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD}", + "WATCHTOWER_NOTIFICATION_EMAIL_DELAY=30", + "WATCHTOWER_NOTIFICATIONS=email", +] +volumes = [ + "/var/run/docker.sock:/var/run/docker.sock", + "/etc/localtime:/etc/localtime:ro", +] From 82227b7dee2cdbb00d0eced4ad2ae20141c83b69 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Nov 2022 18:29:22 +0200 Subject: [PATCH 1666/2667] Docker: Add watchtower --- docker/watchtower/docker-compose.toml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 docker/watchtower/docker-compose.toml diff --git a/docker/watchtower/docker-compose.toml b/docker/watchtower/docker-compose.toml new file mode 100644 index 00000000..cc3a5a84 --- /dev/null +++ b/docker/watchtower/docker-compose.toml @@ -0,0 +1,19 @@ +[services.watchtower] +image = "containrrr/watchtower" +container_name = "watchtower" +restart = "unless-stopped" +environment = [ + "WATCHTOWER_CLEANUP=true", + "WATCHTOWER_NOTIFICATION_EMAIL_FROM=watchtower@korhonen.cc", + "WATCHTOWER_NOTIFICATION_EMAIL_TO=admin@korhonen.cc", + "WATCHTOWER_NOTIFICATION_EMAIL_SERVER=smtp.migadu.com", + "WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=587", + "WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER}", + "WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD}", + "WATCHTOWER_NOTIFICATION_EMAIL_DELAY=30", + "WATCHTOWER_NOTIFICATIONS=email", +] +volumes = [ + "/var/run/docker.sock:/var/run/docker.sock", + "/etc/localtime:/etc/localtime:ro", +] From 8c1a1dbdc8731cb7001827370c067b95a6db1a9a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 15 Nov 2022 22:06:06 +0200 Subject: [PATCH 1667/2667] Refactor authentik setup and enable it on more services --- docker/authentik/authentik.toml | 64 +++++++++++++++++++++ docker/authentik/docker-compose.toml | 69 +++++++++++++++++------ docker/homeautomation/docker-compose.toml | 9 +-- docker/traefik/docker-compose.toml | 4 +- 4 files changed, 121 insertions(+), 25 deletions(-) create mode 100644 docker/authentik/authentik.toml diff --git a/docker/authentik/authentik.toml b/docker/authentik/authentik.toml new file mode 100644 index 00000000..4bba2c6e --- /dev/null +++ b/docker/authentik/authentik.toml @@ -0,0 +1,64 @@ +[services.redis] +image = "docker.io/library/redis:alpine" +command = "--save 60 1 --loglevel warning" +restart = "unless-stopped" +volumes = ["redis:/data"] + +[services.redis.healthcheck] +test = ["CMD-SHELL", "redis-cli ping | grep PONG"] +start_period = "20s" +interval = "30s" +retries = 5 +timeout = "3s" + +[services.server] +image = "${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.10.1}" +restart = "unless-stopped" +command = "server" +volumes = [ + "/docker/authentik/media:/media", + "/docker/authentik/custom-templates:/templates", + "/docker/authentik/geoip:/geoip", +] +env_file = [".env"] +ports = [ + "0.0.0.0:${AUTHENTIK_PORT_HTTP:-9000}:9000", + "0.0.0.0:${AUTHENTIK_PORT_HTTPS:-9443}:9443", +] + +[services.server.environment] +AUTHENTIK_REDIS__HOST = "redis" +AUTHENTIK_POSTGRESQL__HOST = "postgresql" +AUTHENTIK_POSTGRESQL__USER = "${PG_USER:-authentik}" +AUTHENTIK_POSTGRESQL__NAME = "${PG_DB:-authentik}" +AUTHENTIK_POSTGRESQL__PASSWORD = "${PG_PASS}" + +[services.worker] +image = "${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.10.1}" +restart = "unless-stopped" +command = "worker" +user = "root" +volumes = [ + "./media:/media", + "./certs:/certs", + "/var/run/docker.sock:/var/run/docker.sock", + "./custom-templates:/templates", + "geoip:/geoip", +] +env_file = [".env"] + +[services.worker.environment] +AUTHENTIK_REDIS__HOST = "redis" +AUTHENTIK_POSTGRESQL__HOST = "postgresql" +AUTHENTIK_POSTGRESQL__USER = "${PG_USER:-authentik}" +AUTHENTIK_POSTGRESQL__NAME = "${PG_DB:-authentik}" +AUTHENTIK_POSTGRESQL__PASSWORD = "${PG_PASS}" + +[services.geoipupdate] +image = "maxmindinc/geoipupdate:latest" +volumes = ["geoip:/usr/share/GeoIP"] +env_file = [".env"] + +[services.geoipupdate.environment] +GEOIPUPDATE_EDITION_IDS = "GeoLite2-City" +GEOIPUPDATE_FREQUENCY = "8" diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 912a319e..e8999e7c 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -1,19 +1,26 @@ -[services] - [services.redis] -container_name = "redis-authentik" image = "redis:alpine" -restart = "unless-stopped" +container_name = "authentik-redis" networks = ["authentik"] +restart = "unless-stopped" +volumes = ["/docker/authentik/redis:/data"] -[services.authentik] +[services.redis.healthcheck] +test = ["CMD-SHELL", "redis-cli ping | grep PONG"] +start_period = "20s" +interval = "30s" +retries = 5 +timeout = "3s" + +[services.server] +image = "ghcr.io/goauthentik/server:latest" container_name = "authentik" -image = "goauthentik.io/server:latest" restart = "unless-stopped" command = "server" volumes = [ "/docker/authentik/media:/media", "/docker/authentik/custom-templates:/templates", + "/docker/authentik/geoip:/geoip", ] env_file = [".env"] networks = ["authentik", "postgres", "proxy"] @@ -25,34 +32,60 @@ labels = [ "traefik.http.routers.authentik-redirect.middlewares=http2https@file", "traefik.http.routers.authentik.entrypoints=https", "traefik.http.routers.authentik.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.authentik-rtr-outpost.rule=HostRegexp(`{subdomain:[a-z0-9-]+}.korhonen.cc`) && PathPrefix(`/outpost.goauthentik.io/`)", "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)", "traefik.http.routers.authentik.service=authentik", "traefik.http.services.authentik.loadbalancer.server.port=9000", ] -[services.authentik-worker] +[services.worker] +image = "ghcr.io/goauthentik/server:latest" container_name = "authentik-worker" -image = "${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.10.4}" restart = "unless-stopped" command = "worker" -networks = ["authentik", "postgres"] user = "root" volumes = [ "/docker/authentik/backups:/backups", + "/docker/authentik/custom-templates:/templates", + "/docker/authentik/geoip:/geoip", "/docker/authentik/media:/media", "/var/run/docker.sock:/var/run/docker.sock", - "/docker/authentik/custom-templates:/templates", -] -environment = [ - "AUTHENTIK_POSTGRESQL__HOST", - "AUTHENTIK_POSTGRESQL__USER", - "AUTHENTIK_POSTGRESQL__NAME", - "AUTHENTIK_POSTGRESQL__PASSWORD", - "AUTHENTIK_SECRET_KEY", ] env_file = [".env"] +networks = ["authentik", "postgres"] + +[services.geoipupdate] +image = "maxmindinc/geoipupdate:latest" +container_name = "authentik-geoipupdate" +restart = "unless-stopped" +networks = ["authentik"] +volumes = ["/docker/authentik/geoip:/usr/share/GeoIP"] +env_file = [".env"] + +[services.geoipupdate.environment] +GEOIPUPDATE_EDITION_IDS = "GeoLite2-City" +GEOIPUPDATE_FREQUENCY = "8" + +[services.whoami-test] +image = "traefik/whoami" +container_name = "whoami-test" +restart = "unless-stopped" +security_opt = ["no-new-privileges:true"] +networks = ["proxy"] +environment = ["TZ"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.whoami-test-redirect.entrypoints=http", + "traefik.http.routers.whoami-test-redirect.rule=Host(`whoami-test.korhonen.cc`)", + "traefik.http.routers.whoami-test-redirect.middlewares=http2https@file", + "traefik.http.routers.whoami-test.entrypoints=https", + "traefik.http.routers.whoami-test.middlewares=secHeaders@file,compress@file,authentik@file", + "traefik.http.routers.whoami-test.rule=Host(`whoami-test.korhonen.cc`)", + "traefik.http.routers.whoami-test.service=whoami-test", + "traefik.http.services.whoami-test.loadbalancer.server.port=80", +] -[networks] [networks.authentik] external = true diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index d85f6200..6f124c3c 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -1,5 +1,3 @@ -[services] - [services.home-assistant] container_name = "home-assistant" image = "homeassistant/home-assistant" @@ -10,7 +8,7 @@ volumes = [ "/etc/localtime:/etc/localtime:ro", ] restart = "unless-stopped" -networks = ["homeautomation", "postgres", "proxy"] +networks = ["homeautomation", "postgres", "proxy", "authentik"] ports = ["8123:8123", "8300:8300"] extra_hosts = ["host.docker.internal:host-gateway"] depends_on = ["mosquitto"] @@ -21,7 +19,7 @@ labels = [ "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)", "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file", "traefik.http.routers.home-assistant.entrypoints=https", - "traefik.http.routers.home-assistant.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.home-assistant.middlewares=secHeaders@file,compress@file,authentik@file", "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)", "traefik.http.routers.home-assistant.service=home-assistant", "traefik.http.services.home-assistant.loadbalancer.server.port=8123", @@ -68,3 +66,6 @@ external = true [networks.proxy] external = true + +[networks.authentik] +external = true diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index e6dc1e78..08bfdf99 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -22,10 +22,8 @@ labels = [ "traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)", "traefik.http.routers.redirect.middlewares=http2https@file", "traefik.http.routers.dashboard.entrypoints=https", - "traefik.http.routers.dashboard.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.dashboard.middlewares=secHeaders@file,compress@file,authentik@file", "traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)", - "traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users", - "traefik.http.routers.dashboard.middlewares=dashboard-auth", "traefik.http.routers.dashboard.service=api@internal", ] From 1d8142dae2788b3cb6b3f5305e4ada8888d51392 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 15 Nov 2022 22:06:06 +0200 Subject: [PATCH 1668/2667] Refactor authentik setup and enable it on more services --- docker/authentik/authentik.toml | 64 +++++++++++++++++++++ docker/authentik/docker-compose.toml | 69 +++++++++++++++++------ docker/homeautomation/docker-compose.toml | 9 +-- docker/traefik/docker-compose.toml | 4 +- 4 files changed, 121 insertions(+), 25 deletions(-) create mode 100644 docker/authentik/authentik.toml diff --git a/docker/authentik/authentik.toml b/docker/authentik/authentik.toml new file mode 100644 index 00000000..4bba2c6e --- /dev/null +++ b/docker/authentik/authentik.toml @@ -0,0 +1,64 @@ +[services.redis] +image = "docker.io/library/redis:alpine" +command = "--save 60 1 --loglevel warning" +restart = "unless-stopped" +volumes = ["redis:/data"] + +[services.redis.healthcheck] +test = ["CMD-SHELL", "redis-cli ping | grep PONG"] +start_period = "20s" +interval = "30s" +retries = 5 +timeout = "3s" + +[services.server] +image = "${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.10.1}" +restart = "unless-stopped" +command = "server" +volumes = [ + "/docker/authentik/media:/media", + "/docker/authentik/custom-templates:/templates", + "/docker/authentik/geoip:/geoip", +] +env_file = [".env"] +ports = [ + "0.0.0.0:${AUTHENTIK_PORT_HTTP:-9000}:9000", + "0.0.0.0:${AUTHENTIK_PORT_HTTPS:-9443}:9443", +] + +[services.server.environment] +AUTHENTIK_REDIS__HOST = "redis" +AUTHENTIK_POSTGRESQL__HOST = "postgresql" +AUTHENTIK_POSTGRESQL__USER = "${PG_USER:-authentik}" +AUTHENTIK_POSTGRESQL__NAME = "${PG_DB:-authentik}" +AUTHENTIK_POSTGRESQL__PASSWORD = "${PG_PASS}" + +[services.worker] +image = "${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.10.1}" +restart = "unless-stopped" +command = "worker" +user = "root" +volumes = [ + "./media:/media", + "./certs:/certs", + "/var/run/docker.sock:/var/run/docker.sock", + "./custom-templates:/templates", + "geoip:/geoip", +] +env_file = [".env"] + +[services.worker.environment] +AUTHENTIK_REDIS__HOST = "redis" +AUTHENTIK_POSTGRESQL__HOST = "postgresql" +AUTHENTIK_POSTGRESQL__USER = "${PG_USER:-authentik}" +AUTHENTIK_POSTGRESQL__NAME = "${PG_DB:-authentik}" +AUTHENTIK_POSTGRESQL__PASSWORD = "${PG_PASS}" + +[services.geoipupdate] +image = "maxmindinc/geoipupdate:latest" +volumes = ["geoip:/usr/share/GeoIP"] +env_file = [".env"] + +[services.geoipupdate.environment] +GEOIPUPDATE_EDITION_IDS = "GeoLite2-City" +GEOIPUPDATE_FREQUENCY = "8" diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 912a319e..e8999e7c 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -1,19 +1,26 @@ -[services] - [services.redis] -container_name = "redis-authentik" image = "redis:alpine" -restart = "unless-stopped" +container_name = "authentik-redis" networks = ["authentik"] +restart = "unless-stopped" +volumes = ["/docker/authentik/redis:/data"] -[services.authentik] +[services.redis.healthcheck] +test = ["CMD-SHELL", "redis-cli ping | grep PONG"] +start_period = "20s" +interval = "30s" +retries = 5 +timeout = "3s" + +[services.server] +image = "ghcr.io/goauthentik/server:latest" container_name = "authentik" -image = "goauthentik.io/server:latest" restart = "unless-stopped" command = "server" volumes = [ "/docker/authentik/media:/media", "/docker/authentik/custom-templates:/templates", + "/docker/authentik/geoip:/geoip", ] env_file = [".env"] networks = ["authentik", "postgres", "proxy"] @@ -25,34 +32,60 @@ labels = [ "traefik.http.routers.authentik-redirect.middlewares=http2https@file", "traefik.http.routers.authentik.entrypoints=https", "traefik.http.routers.authentik.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.authentik-rtr-outpost.rule=HostRegexp(`{subdomain:[a-z0-9-]+}.korhonen.cc`) && PathPrefix(`/outpost.goauthentik.io/`)", "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)", "traefik.http.routers.authentik.service=authentik", "traefik.http.services.authentik.loadbalancer.server.port=9000", ] -[services.authentik-worker] +[services.worker] +image = "ghcr.io/goauthentik/server:latest" container_name = "authentik-worker" -image = "${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.10.4}" restart = "unless-stopped" command = "worker" -networks = ["authentik", "postgres"] user = "root" volumes = [ "/docker/authentik/backups:/backups", + "/docker/authentik/custom-templates:/templates", + "/docker/authentik/geoip:/geoip", "/docker/authentik/media:/media", "/var/run/docker.sock:/var/run/docker.sock", - "/docker/authentik/custom-templates:/templates", -] -environment = [ - "AUTHENTIK_POSTGRESQL__HOST", - "AUTHENTIK_POSTGRESQL__USER", - "AUTHENTIK_POSTGRESQL__NAME", - "AUTHENTIK_POSTGRESQL__PASSWORD", - "AUTHENTIK_SECRET_KEY", ] env_file = [".env"] +networks = ["authentik", "postgres"] + +[services.geoipupdate] +image = "maxmindinc/geoipupdate:latest" +container_name = "authentik-geoipupdate" +restart = "unless-stopped" +networks = ["authentik"] +volumes = ["/docker/authentik/geoip:/usr/share/GeoIP"] +env_file = [".env"] + +[services.geoipupdate.environment] +GEOIPUPDATE_EDITION_IDS = "GeoLite2-City" +GEOIPUPDATE_FREQUENCY = "8" + +[services.whoami-test] +image = "traefik/whoami" +container_name = "whoami-test" +restart = "unless-stopped" +security_opt = ["no-new-privileges:true"] +networks = ["proxy"] +environment = ["TZ"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.whoami-test-redirect.entrypoints=http", + "traefik.http.routers.whoami-test-redirect.rule=Host(`whoami-test.korhonen.cc`)", + "traefik.http.routers.whoami-test-redirect.middlewares=http2https@file", + "traefik.http.routers.whoami-test.entrypoints=https", + "traefik.http.routers.whoami-test.middlewares=secHeaders@file,compress@file,authentik@file", + "traefik.http.routers.whoami-test.rule=Host(`whoami-test.korhonen.cc`)", + "traefik.http.routers.whoami-test.service=whoami-test", + "traefik.http.services.whoami-test.loadbalancer.server.port=80", +] -[networks] [networks.authentik] external = true diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index d85f6200..6f124c3c 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -1,5 +1,3 @@ -[services] - [services.home-assistant] container_name = "home-assistant" image = "homeassistant/home-assistant" @@ -10,7 +8,7 @@ volumes = [ "/etc/localtime:/etc/localtime:ro", ] restart = "unless-stopped" -networks = ["homeautomation", "postgres", "proxy"] +networks = ["homeautomation", "postgres", "proxy", "authentik"] ports = ["8123:8123", "8300:8300"] extra_hosts = ["host.docker.internal:host-gateway"] depends_on = ["mosquitto"] @@ -21,7 +19,7 @@ labels = [ "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)", "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file", "traefik.http.routers.home-assistant.entrypoints=https", - "traefik.http.routers.home-assistant.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.home-assistant.middlewares=secHeaders@file,compress@file,authentik@file", "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)", "traefik.http.routers.home-assistant.service=home-assistant", "traefik.http.services.home-assistant.loadbalancer.server.port=8123", @@ -68,3 +66,6 @@ external = true [networks.proxy] external = true + +[networks.authentik] +external = true diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index e6dc1e78..08bfdf99 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -22,10 +22,8 @@ labels = [ "traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)", "traefik.http.routers.redirect.middlewares=http2https@file", "traefik.http.routers.dashboard.entrypoints=https", - "traefik.http.routers.dashboard.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.dashboard.middlewares=secHeaders@file,compress@file,authentik@file", "traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)", - "traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users", - "traefik.http.routers.dashboard.middlewares=dashboard-auth", "traefik.http.routers.dashboard.service=api@internal", ] From e3e6552b93b3df580b764a8cbd4136c9a55cf3b7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 15 Nov 2022 23:49:30 +0200 Subject: [PATCH 1669/2667] Use wildcard cert with traefik --- docker/traefik/docker-compose.toml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index 08bfdf99..a97cda01 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -3,7 +3,13 @@ image = "traefik:latest" container_name = "traefik" restart = "unless-stopped" ports = ["80:80", "443:443/tcp", "443:443/udp"] -environment = ["TZ=Europe/Helsinki"] +environment = [ + "TZ=Europe/Helsinki", + "CF_API_EMAIL", + "CF_API_KEY", + "CF_ZONE_API_TOKEN", + "CF_DNS_API_TOKEN", +] security_opt = ["no-new-privileges:true"] networks = ["proxy"] volumes = [ From 7c9c9f0f22b4be240970f2835592c504f03a103c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 15 Nov 2022 23:49:30 +0200 Subject: [PATCH 1670/2667] Use wildcard cert with traefik --- docker/traefik/docker-compose.toml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index 08bfdf99..a97cda01 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -3,7 +3,13 @@ image = "traefik:latest" container_name = "traefik" restart = "unless-stopped" ports = ["80:80", "443:443/tcp", "443:443/udp"] -environment = ["TZ=Europe/Helsinki"] +environment = [ + "TZ=Europe/Helsinki", + "CF_API_EMAIL", + "CF_API_KEY", + "CF_ZONE_API_TOKEN", + "CF_DNS_API_TOKEN", +] security_opt = ["no-new-privileges:true"] networks = ["proxy"] volumes = [ From c2b1c9116316fc675ebdfabfb9545e9d1b419931 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 00:10:27 +0200 Subject: [PATCH 1671/2667] Add traefik configuration under version control --- docker/traefik/docker-compose.toml | 7 ++- docker/traefik/dynamic.toml | 80 ++++++++++++++++++++++++++++++ docker/traefik/traefik.toml | 41 +++++++++++++++ 3 files changed, 124 insertions(+), 4 deletions(-) create mode 100644 docker/traefik/dynamic.toml create mode 100644 docker/traefik/traefik.toml diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index a97cda01..19402fd7 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -5,7 +5,7 @@ restart = "unless-stopped" ports = ["80:80", "443:443/tcp", "443:443/udp"] environment = [ "TZ=Europe/Helsinki", - "CF_API_EMAIL", + "CF_API_EMAIL=${ADMIN_EMAIL}", "CF_API_KEY", "CF_ZONE_API_TOKEN", "CF_DNS_API_TOKEN", @@ -15,9 +15,8 @@ networks = ["proxy"] volumes = [ "/etc/localtime:/etc/localtime:ro", "/var/run/docker.sock:/var/run/docker.sock:ro", - "/docker/traefik/traefik/traefik.toml:/traefik.toml:ro", - "/docker/traefik/traefik/dynamic.toml:/dynamic.toml:ro", - "/docker/traefik/traefik/dashboard-users:/dashboard-users:ro", + "./traefik.toml:/traefik.toml:ro", + "./dynamic.toml:/dynamic.toml:ro", "/docker/traefik/traefik/acme.json:/acme.json", "/docker/traefik/traefik/log:/var/log", ] diff --git a/docker/traefik/dynamic.toml b/docker/traefik/dynamic.toml new file mode 100644 index 00000000..c22acb69 --- /dev/null +++ b/docker/traefik/dynamic.toml @@ -0,0 +1,80 @@ +[http.middlewares.authentik.forwardAuth] +address = "http://authentik:9000/outpost.goauthentik.io/auth/traefik" +trustForwardHeader = true +authResponseHeaders = [ + "X-authentik-username", + "X-authentik-groups", + "X-authentik-email", + "X-authentik-name", + "X-authentik-uid", + "X-authentik-jwt", + "X-authentik-meta-jwks", + "X-authentik-meta-outpost", + "X-authentik-meta-provider", + "X-authentik-meta-app", + "X-authentik-meta-version", +] + +[http.middlewares.compress.compress] + +[http.middlewares.http2https.redirectScheme] +scheme = "https" +permanent = true + +[http.middlewares.secHeaders.headers] +browserXssFilter = true +contentTypeNosniff = true +frameDeny = true +sslRedirect = true +stsIncludeSubdomains = true +stsPreload = true +stsSeconds = 31_536_000 +customFrameOptionsValue = "SAMEORIGIN" +referrerPolicy = "strict-origin-when-cross-origin" +accesscontrolAllowMethods = ["GET", "OPTIONS", "POST"] +accesscontrolAllowOriginList = ["https://korhonen.cc"] +accessControlAllowHeaders = [ + "Accept", + "Accept-Encoding", + "Accept-Language", + "Access-Control-Request-Headers", + "Access-Control-Request-Method", + "Connection", + "Content-Type", + "DNT", + "Host", + "Origin", + "Referer", + "Sec-Fetch-Dest", + "Sec-Fetch-Mode", + "Sec-Fetch-Site", + "User-Agent", +] +accesscontrolMaxAge = 100 +addVaryHeader = true + +[http.middlewares.nextcloud-redirect-dav.redirectRegex] +permanent = true +regex = "https://(.*)/.well-known/(card|cal)dav" +replacement = "https://${1}/remote.php/dav/" + +[http.middlewares.nextcloud-redirect-extra.redirectRegex] +permanent = true +regex = "https://(.*)/.well-known/(webfinger|nodeinfo)" +replacement = "https://${1}/index.php/.well-known/${2}" + +[http.middlewares.www2non-www.redirectregex] +permanent = true +regex = "^https?://www\\.(.+)" +replacement = "https://${1}" + +[tls.options.default] +minVersion = "VersionTLS12" +cipherSuites = [ + "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", + "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", + "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305", +] + +[tls.options.mintls13] +minVersion = "VersionTLS13" diff --git a/docker/traefik/traefik.toml b/docker/traefik/traefik.toml new file mode 100644 index 00000000..0e77454c --- /dev/null +++ b/docker/traefik/traefik.toml @@ -0,0 +1,41 @@ +[experimental] +http3 = true + +[api] +dashboard = true + +[entryPoints.http] +address = ":80" + +[entryPoints.https] +address = ":443" + +[entryPoints.https.http3] + +[entryPoints.https.http.tls] +options = "default" +certResolver = "letsEncrypt" + +[[entryPoints.https.http.tls.domains]] +main = "korhonen.cc" +sans = ["*.korhonen.cc"] + +[providers.docker] +endpoint = "unix:///var/run/docker.sock" +exposedByDefault = false + +[providers.file] +filename = "/dynamic.toml" + +[certificatesResolvers.letsEncrypt.acme] +email = "{{env 'ADMIN_EMAIL'}}" +storage = "acme.json" + +[certificatesResolvers.letsEncrypt.acme.dnsChallenge] +provider = "cloudflare" + +[accessLog] +filePath = "/var/log/access.log" + +[accessLog.filters] +statusCodes = ["400-499"] From 40e2908af4de973394096c009c0aa049d557a103 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 00:10:27 +0200 Subject: [PATCH 1672/2667] Add traefik configuration under version control --- docker/traefik/docker-compose.toml | 7 ++- docker/traefik/dynamic.toml | 80 ++++++++++++++++++++++++++++++ docker/traefik/traefik.toml | 41 +++++++++++++++ 3 files changed, 124 insertions(+), 4 deletions(-) create mode 100644 docker/traefik/dynamic.toml create mode 100644 docker/traefik/traefik.toml diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index a97cda01..19402fd7 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -5,7 +5,7 @@ restart = "unless-stopped" ports = ["80:80", "443:443/tcp", "443:443/udp"] environment = [ "TZ=Europe/Helsinki", - "CF_API_EMAIL", + "CF_API_EMAIL=${ADMIN_EMAIL}", "CF_API_KEY", "CF_ZONE_API_TOKEN", "CF_DNS_API_TOKEN", @@ -15,9 +15,8 @@ networks = ["proxy"] volumes = [ "/etc/localtime:/etc/localtime:ro", "/var/run/docker.sock:/var/run/docker.sock:ro", - "/docker/traefik/traefik/traefik.toml:/traefik.toml:ro", - "/docker/traefik/traefik/dynamic.toml:/dynamic.toml:ro", - "/docker/traefik/traefik/dashboard-users:/dashboard-users:ro", + "./traefik.toml:/traefik.toml:ro", + "./dynamic.toml:/dynamic.toml:ro", "/docker/traefik/traefik/acme.json:/acme.json", "/docker/traefik/traefik/log:/var/log", ] diff --git a/docker/traefik/dynamic.toml b/docker/traefik/dynamic.toml new file mode 100644 index 00000000..c22acb69 --- /dev/null +++ b/docker/traefik/dynamic.toml @@ -0,0 +1,80 @@ +[http.middlewares.authentik.forwardAuth] +address = "http://authentik:9000/outpost.goauthentik.io/auth/traefik" +trustForwardHeader = true +authResponseHeaders = [ + "X-authentik-username", + "X-authentik-groups", + "X-authentik-email", + "X-authentik-name", + "X-authentik-uid", + "X-authentik-jwt", + "X-authentik-meta-jwks", + "X-authentik-meta-outpost", + "X-authentik-meta-provider", + "X-authentik-meta-app", + "X-authentik-meta-version", +] + +[http.middlewares.compress.compress] + +[http.middlewares.http2https.redirectScheme] +scheme = "https" +permanent = true + +[http.middlewares.secHeaders.headers] +browserXssFilter = true +contentTypeNosniff = true +frameDeny = true +sslRedirect = true +stsIncludeSubdomains = true +stsPreload = true +stsSeconds = 31_536_000 +customFrameOptionsValue = "SAMEORIGIN" +referrerPolicy = "strict-origin-when-cross-origin" +accesscontrolAllowMethods = ["GET", "OPTIONS", "POST"] +accesscontrolAllowOriginList = ["https://korhonen.cc"] +accessControlAllowHeaders = [ + "Accept", + "Accept-Encoding", + "Accept-Language", + "Access-Control-Request-Headers", + "Access-Control-Request-Method", + "Connection", + "Content-Type", + "DNT", + "Host", + "Origin", + "Referer", + "Sec-Fetch-Dest", + "Sec-Fetch-Mode", + "Sec-Fetch-Site", + "User-Agent", +] +accesscontrolMaxAge = 100 +addVaryHeader = true + +[http.middlewares.nextcloud-redirect-dav.redirectRegex] +permanent = true +regex = "https://(.*)/.well-known/(card|cal)dav" +replacement = "https://${1}/remote.php/dav/" + +[http.middlewares.nextcloud-redirect-extra.redirectRegex] +permanent = true +regex = "https://(.*)/.well-known/(webfinger|nodeinfo)" +replacement = "https://${1}/index.php/.well-known/${2}" + +[http.middlewares.www2non-www.redirectregex] +permanent = true +regex = "^https?://www\\.(.+)" +replacement = "https://${1}" + +[tls.options.default] +minVersion = "VersionTLS12" +cipherSuites = [ + "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", + "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", + "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305", +] + +[tls.options.mintls13] +minVersion = "VersionTLS13" diff --git a/docker/traefik/traefik.toml b/docker/traefik/traefik.toml new file mode 100644 index 00000000..0e77454c --- /dev/null +++ b/docker/traefik/traefik.toml @@ -0,0 +1,41 @@ +[experimental] +http3 = true + +[api] +dashboard = true + +[entryPoints.http] +address = ":80" + +[entryPoints.https] +address = ":443" + +[entryPoints.https.http3] + +[entryPoints.https.http.tls] +options = "default" +certResolver = "letsEncrypt" + +[[entryPoints.https.http.tls.domains]] +main = "korhonen.cc" +sans = ["*.korhonen.cc"] + +[providers.docker] +endpoint = "unix:///var/run/docker.sock" +exposedByDefault = false + +[providers.file] +filename = "/dynamic.toml" + +[certificatesResolvers.letsEncrypt.acme] +email = "{{env 'ADMIN_EMAIL'}}" +storage = "acme.json" + +[certificatesResolvers.letsEncrypt.acme.dnsChallenge] +provider = "cloudflare" + +[accessLog] +filePath = "/var/log/access.log" + +[accessLog.filters] +statusCodes = ["400-499"] From 94a7a38a8f24a3fec8bacef3b3254d2f367fe366 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 00:11:52 +0200 Subject: [PATCH 1673/2667] Pass ADMIN_EMAIL to traefik --- docker/traefik/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index 19402fd7..98b996be 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -5,6 +5,7 @@ restart = "unless-stopped" ports = ["80:80", "443:443/tcp", "443:443/udp"] environment = [ "TZ=Europe/Helsinki", + "ADMIN_EMAIL", "CF_API_EMAIL=${ADMIN_EMAIL}", "CF_API_KEY", "CF_ZONE_API_TOKEN", From d332eaa6f56927ce337ae84aed247806ca0a7f00 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 00:11:52 +0200 Subject: [PATCH 1674/2667] Pass ADMIN_EMAIL to traefik --- docker/traefik/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index 19402fd7..98b996be 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -5,6 +5,7 @@ restart = "unless-stopped" ports = ["80:80", "443:443/tcp", "443:443/udp"] environment = [ "TZ=Europe/Helsinki", + "ADMIN_EMAIL", "CF_API_EMAIL=${ADMIN_EMAIL}", "CF_API_KEY", "CF_ZONE_API_TOKEN", From 0b416fb5375cb26afc14ceed56720b9f3cd6e0fb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 08:38:58 +0200 Subject: [PATCH 1675/2667] Remove unneeded key from traefik configuration --- docker/traefik/traefik.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/traefik/traefik.toml b/docker/traefik/traefik.toml index 0e77454c..ba15871d 100644 --- a/docker/traefik/traefik.toml +++ b/docker/traefik/traefik.toml @@ -28,7 +28,6 @@ exposedByDefault = false filename = "/dynamic.toml" [certificatesResolvers.letsEncrypt.acme] -email = "{{env 'ADMIN_EMAIL'}}" storage = "acme.json" [certificatesResolvers.letsEncrypt.acme.dnsChallenge] From 93ce353b0056b2ea9b28c24a46a1114c1c3cbc1e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 08:38:58 +0200 Subject: [PATCH 1676/2667] Remove unneeded key from traefik configuration --- docker/traefik/traefik.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/traefik/traefik.toml b/docker/traefik/traefik.toml index 0e77454c..ba15871d 100644 --- a/docker/traefik/traefik.toml +++ b/docker/traefik/traefik.toml @@ -28,7 +28,6 @@ exposedByDefault = false filename = "/dynamic.toml" [certificatesResolvers.letsEncrypt.acme] -email = "{{env 'ADMIN_EMAIL'}}" storage = "acme.json" [certificatesResolvers.letsEncrypt.acme.dnsChallenge] From aa461f98a4416f3ad20c77acd4c2cf76323a32b6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 08:51:22 +0200 Subject: [PATCH 1677/2667] Refactor traefik.toml --- docker/traefik/traefik.toml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/docker/traefik/traefik.toml b/docker/traefik/traefik.toml index ba15871d..21d60236 100644 --- a/docker/traefik/traefik.toml +++ b/docker/traefik/traefik.toml @@ -20,14 +20,8 @@ certResolver = "letsEncrypt" main = "korhonen.cc" sans = ["*.korhonen.cc"] -[providers.docker] -endpoint = "unix:///var/run/docker.sock" -exposedByDefault = false - -[providers.file] -filename = "/dynamic.toml" - [certificatesResolvers.letsEncrypt.acme] +email = "admin@korhonen.cc" storage = "acme.json" [certificatesResolvers.letsEncrypt.acme.dnsChallenge] @@ -38,3 +32,10 @@ filePath = "/var/log/access.log" [accessLog.filters] statusCodes = ["400-499"] + +[providers.docker] +endpoint = "unix:///var/run/docker.sock" +exposedByDefault = false + +[providers.file] +filename = "/dynamic.toml" From 491577d1a1dd65666718ce452c70b9983d276ec8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 08:51:22 +0200 Subject: [PATCH 1678/2667] Refactor traefik.toml --- docker/traefik/traefik.toml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/docker/traefik/traefik.toml b/docker/traefik/traefik.toml index ba15871d..21d60236 100644 --- a/docker/traefik/traefik.toml +++ b/docker/traefik/traefik.toml @@ -20,14 +20,8 @@ certResolver = "letsEncrypt" main = "korhonen.cc" sans = ["*.korhonen.cc"] -[providers.docker] -endpoint = "unix:///var/run/docker.sock" -exposedByDefault = false - -[providers.file] -filename = "/dynamic.toml" - [certificatesResolvers.letsEncrypt.acme] +email = "admin@korhonen.cc" storage = "acme.json" [certificatesResolvers.letsEncrypt.acme.dnsChallenge] @@ -38,3 +32,10 @@ filePath = "/var/log/access.log" [accessLog.filters] statusCodes = ["400-499"] + +[providers.docker] +endpoint = "unix:///var/run/docker.sock" +exposedByDefault = false + +[providers.file] +filename = "/dynamic.toml" From b68630e567b13544accd6ac85d726fc5d9744a47 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 16:30:23 +0200 Subject: [PATCH 1679/2667] Add exa (ls) preview for FZF alt-c command --- home/.config/zsh/02-env.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index fda7c3a1..881877ff 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -41,6 +41,7 @@ export GOPATH=~/.go export FD_COMMAND='fd -HLt' export FZF_DEFAULT_COMMAND="$FD_COMMAND f" export FZF_ALT_C_COMMAND="$FD_COMMAND d" +export FZF_ALT_C_OPTS="--preview 'exa {}'" export FZF_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND --strip-cwd-prefix" From 6182b1b2b8a6e87701269e3bf2bd2fefab9215e9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 16:30:23 +0200 Subject: [PATCH 1680/2667] Add exa (ls) preview for FZF alt-c command --- home/.config/zsh/02-env.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index fda7c3a1..881877ff 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -41,6 +41,7 @@ export GOPATH=~/.go export FD_COMMAND='fd -HLt' export FZF_DEFAULT_COMMAND="$FD_COMMAND f" export FZF_ALT_C_COMMAND="$FD_COMMAND d" +export FZF_ALT_C_OPTS="--preview 'exa {}'" export FZF_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND --strip-cwd-prefix" From 2481671803cade84b617ea43f0f9cdf45b671280 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 16:31:43 +0200 Subject: [PATCH 1681/2667] Add `-l` to FZF alt-c preview command --- home/.config/zsh/02-env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 881877ff..05995854 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -41,7 +41,7 @@ export GOPATH=~/.go export FD_COMMAND='fd -HLt' export FZF_DEFAULT_COMMAND="$FD_COMMAND f" export FZF_ALT_C_COMMAND="$FD_COMMAND d" -export FZF_ALT_C_OPTS="--preview 'exa {}'" +export FZF_ALT_C_OPTS="--preview 'exa -l {}'" export FZF_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND --strip-cwd-prefix" From 429010d85af6f931e6a265d6891f95cb0a71cf86 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 16:31:43 +0200 Subject: [PATCH 1682/2667] Add `-l` to FZF alt-c preview command --- home/.config/zsh/02-env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 881877ff..05995854 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -41,7 +41,7 @@ export GOPATH=~/.go export FD_COMMAND='fd -HLt' export FZF_DEFAULT_COMMAND="$FD_COMMAND f" export FZF_ALT_C_COMMAND="$FD_COMMAND d" -export FZF_ALT_C_OPTS="--preview 'exa {}'" +export FZF_ALT_C_OPTS="--preview 'exa -l {}'" export FZF_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND --strip-cwd-prefix" From 6a91c7b2cea26dec690525d16e9ff65f89968f0d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Nov 2022 09:18:56 +0200 Subject: [PATCH 1683/2667] Neovim: fix clipboard on wayland --- home/.config/nvim/lua/settings.lua | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index a1668674..df96b511 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -11,7 +11,7 @@ o.guifont = "Fira Code:h14" g.neovide_hide_mouse_when_typing = true -- Enable cursor particles in neovide -g.neovide_cursor_vfx_mode = 'railgun' +g.neovide_cursor_vfx_mode = "railgun" -- Floating window transparency o.winblend = 10 @@ -53,3 +53,22 @@ g.mapleader = " " o.tabstop = 4 o.shiftwidth = 4 o.smartindent = true + +-- Wayland clipboard provider that strips carriage returns (GTK3 issue). +-- This is needed because currently there's an issue where GTK3 applications on +-- Wayland contain carriage returns at the end of the lines (this is a root +-- issue that needs to be fixed). +vim.cmd([[ +let g:clipboard = { + \ 'name': 'wayland-strip-carriage', + \ 'copy': { + \ '+': 'wl-copy --foreground --type text/plain', + \ '*': 'wl-copy --foreground --type text/plain --primary', + \ }, + \ 'paste': { + \ '+': {-> systemlist('wl-paste --no-newline | tr -d "\r"')}, + \ '*': {-> systemlist('wl-paste --no-newline --primary | tr -d "\r"')}, + \ }, + \ 'cache_enabled': 1, + \ } +]]) From 6fea7df990d6fca1c67415631bf831d3b9ea8e0f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Nov 2022 09:18:56 +0200 Subject: [PATCH 1684/2667] Neovim: fix clipboard on wayland --- home/.config/nvim/lua/settings.lua | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index a1668674..df96b511 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -11,7 +11,7 @@ o.guifont = "Fira Code:h14" g.neovide_hide_mouse_when_typing = true -- Enable cursor particles in neovide -g.neovide_cursor_vfx_mode = 'railgun' +g.neovide_cursor_vfx_mode = "railgun" -- Floating window transparency o.winblend = 10 @@ -53,3 +53,22 @@ g.mapleader = " " o.tabstop = 4 o.shiftwidth = 4 o.smartindent = true + +-- Wayland clipboard provider that strips carriage returns (GTK3 issue). +-- This is needed because currently there's an issue where GTK3 applications on +-- Wayland contain carriage returns at the end of the lines (this is a root +-- issue that needs to be fixed). +vim.cmd([[ +let g:clipboard = { + \ 'name': 'wayland-strip-carriage', + \ 'copy': { + \ '+': 'wl-copy --foreground --type text/plain', + \ '*': 'wl-copy --foreground --type text/plain --primary', + \ }, + \ 'paste': { + \ '+': {-> systemlist('wl-paste --no-newline | tr -d "\r"')}, + \ '*': {-> systemlist('wl-paste --no-newline --primary | tr -d "\r"')}, + \ }, + \ 'cache_enabled': 1, + \ } +]]) From 9f02493b0a5750d0a0cbabe0a058bb38e040a65f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Nov 2022 20:31:52 +0200 Subject: [PATCH 1685/2667] Remove proxy auth from Home Assistant --- docker/homeautomation/docker-compose.toml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 6f124c3c..53187d2b 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -8,7 +8,7 @@ volumes = [ "/etc/localtime:/etc/localtime:ro", ] restart = "unless-stopped" -networks = ["homeautomation", "postgres", "proxy", "authentik"] +networks = ["homeautomation", "postgres", "proxy"] ports = ["8123:8123", "8300:8300"] extra_hosts = ["host.docker.internal:host-gateway"] depends_on = ["mosquitto"] @@ -19,7 +19,7 @@ labels = [ "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)", "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file", "traefik.http.routers.home-assistant.entrypoints=https", - "traefik.http.routers.home-assistant.middlewares=secHeaders@file,compress@file,authentik@file", + "traefik.http.routers.home-assistant.middlewares=secHeaders@file,compress@file", "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)", "traefik.http.routers.home-assistant.service=home-assistant", "traefik.http.services.home-assistant.loadbalancer.server.port=8123", @@ -66,6 +66,3 @@ external = true [networks.proxy] external = true - -[networks.authentik] -external = true From 41751154a91ce0be80cafdc782dde03f683ba014 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Nov 2022 20:31:52 +0200 Subject: [PATCH 1686/2667] Remove proxy auth from Home Assistant --- docker/homeautomation/docker-compose.toml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 6f124c3c..53187d2b 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -8,7 +8,7 @@ volumes = [ "/etc/localtime:/etc/localtime:ro", ] restart = "unless-stopped" -networks = ["homeautomation", "postgres", "proxy", "authentik"] +networks = ["homeautomation", "postgres", "proxy"] ports = ["8123:8123", "8300:8300"] extra_hosts = ["host.docker.internal:host-gateway"] depends_on = ["mosquitto"] @@ -19,7 +19,7 @@ labels = [ "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)", "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file", "traefik.http.routers.home-assistant.entrypoints=https", - "traefik.http.routers.home-assistant.middlewares=secHeaders@file,compress@file,authentik@file", + "traefik.http.routers.home-assistant.middlewares=secHeaders@file,compress@file", "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)", "traefik.http.routers.home-assistant.service=home-assistant", "traefik.http.services.home-assistant.loadbalancer.server.port=8123", @@ -66,6 +66,3 @@ external = true [networks.proxy] external = true - -[networks.authentik] -external = true From fdd1df7d2438513a75b279d1778db63e22183423 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Nov 2022 20:37:42 +0200 Subject: [PATCH 1687/2667] Docker: remove all latest tags (it is the default tag when none specified) --- docker/authentik/authentik.toml | 64 ---------------------------- docker/authentik/docker-compose.toml | 6 +-- docker/pihole/docker-compose.toml | 2 +- docker/searx/docker-compose.toml | 2 +- docker/traefik/docker-compose.toml | 4 +- 5 files changed, 7 insertions(+), 71 deletions(-) delete mode 100644 docker/authentik/authentik.toml diff --git a/docker/authentik/authentik.toml b/docker/authentik/authentik.toml deleted file mode 100644 index 4bba2c6e..00000000 --- a/docker/authentik/authentik.toml +++ /dev/null @@ -1,64 +0,0 @@ -[services.redis] -image = "docker.io/library/redis:alpine" -command = "--save 60 1 --loglevel warning" -restart = "unless-stopped" -volumes = ["redis:/data"] - -[services.redis.healthcheck] -test = ["CMD-SHELL", "redis-cli ping | grep PONG"] -start_period = "20s" -interval = "30s" -retries = 5 -timeout = "3s" - -[services.server] -image = "${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.10.1}" -restart = "unless-stopped" -command = "server" -volumes = [ - "/docker/authentik/media:/media", - "/docker/authentik/custom-templates:/templates", - "/docker/authentik/geoip:/geoip", -] -env_file = [".env"] -ports = [ - "0.0.0.0:${AUTHENTIK_PORT_HTTP:-9000}:9000", - "0.0.0.0:${AUTHENTIK_PORT_HTTPS:-9443}:9443", -] - -[services.server.environment] -AUTHENTIK_REDIS__HOST = "redis" -AUTHENTIK_POSTGRESQL__HOST = "postgresql" -AUTHENTIK_POSTGRESQL__USER = "${PG_USER:-authentik}" -AUTHENTIK_POSTGRESQL__NAME = "${PG_DB:-authentik}" -AUTHENTIK_POSTGRESQL__PASSWORD = "${PG_PASS}" - -[services.worker] -image = "${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.10.1}" -restart = "unless-stopped" -command = "worker" -user = "root" -volumes = [ - "./media:/media", - "./certs:/certs", - "/var/run/docker.sock:/var/run/docker.sock", - "./custom-templates:/templates", - "geoip:/geoip", -] -env_file = [".env"] - -[services.worker.environment] -AUTHENTIK_REDIS__HOST = "redis" -AUTHENTIK_POSTGRESQL__HOST = "postgresql" -AUTHENTIK_POSTGRESQL__USER = "${PG_USER:-authentik}" -AUTHENTIK_POSTGRESQL__NAME = "${PG_DB:-authentik}" -AUTHENTIK_POSTGRESQL__PASSWORD = "${PG_PASS}" - -[services.geoipupdate] -image = "maxmindinc/geoipupdate:latest" -volumes = ["geoip:/usr/share/GeoIP"] -env_file = [".env"] - -[services.geoipupdate.environment] -GEOIPUPDATE_EDITION_IDS = "GeoLite2-City" -GEOIPUPDATE_FREQUENCY = "8" diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index e8999e7c..11642ada 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -13,7 +13,7 @@ retries = 5 timeout = "3s" [services.server] -image = "ghcr.io/goauthentik/server:latest" +image = "ghcr.io/goauthentik/server" container_name = "authentik" restart = "unless-stopped" command = "server" @@ -39,7 +39,7 @@ labels = [ ] [services.worker] -image = "ghcr.io/goauthentik/server:latest" +image = "ghcr.io/goauthentik/server" container_name = "authentik-worker" restart = "unless-stopped" command = "worker" @@ -55,7 +55,7 @@ env_file = [".env"] networks = ["authentik", "postgres"] [services.geoipupdate] -image = "maxmindinc/geoipupdate:latest" +image = "maxmindinc/geoipupdate" container_name = "authentik-geoipupdate" restart = "unless-stopped" networks = ["authentik"] diff --git a/docker/pihole/docker-compose.toml b/docker/pihole/docker-compose.toml index 5eaff1c3..a578112e 100644 --- a/docker/pihole/docker-compose.toml +++ b/docker/pihole/docker-compose.toml @@ -2,7 +2,7 @@ [services.pihole] container_name = "pihole" -image = "pihole/pihole:latest" +image = "pihole/pihole" ports = ["53:53/tcp", "53:53/udp", "67:67/udp", "8069:80/tcp"] networks = ["proxy"] volumes = [ diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml index 8e12694f..d181ab1c 100644 --- a/docker/searx/docker-compose.toml +++ b/docker/searx/docker-compose.toml @@ -1,6 +1,6 @@ [services.searx] container_name = "searx" -image = "searxng/searxng:latest" +image = "searxng/searxng" restart = "unless-stopped" networks = ["searx", "proxy"] volumes = [ diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index 98b996be..3d0d7aee 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -1,5 +1,5 @@ [services.traefik] -image = "traefik:latest" +image = "traefik" container_name = "traefik" restart = "unless-stopped" ports = ["80:80", "443:443/tcp", "443:443/udp"] @@ -34,7 +34,7 @@ labels = [ ] [services.fail2ban] -image = "crazymax/fail2ban:latest" +image = "crazymax/fail2ban" container_name = "fail2ban" restart = "unless-stopped" network_mode = "host" From 842e6b1c9fc105b37ba2a01ab1f50ef9fbcba203 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Nov 2022 20:37:42 +0200 Subject: [PATCH 1688/2667] Docker: remove all latest tags (it is the default tag when none specified) --- docker/authentik/authentik.toml | 64 ---------------------------- docker/authentik/docker-compose.toml | 6 +-- docker/pihole/docker-compose.toml | 2 +- docker/searx/docker-compose.toml | 2 +- docker/traefik/docker-compose.toml | 4 +- 5 files changed, 7 insertions(+), 71 deletions(-) delete mode 100644 docker/authentik/authentik.toml diff --git a/docker/authentik/authentik.toml b/docker/authentik/authentik.toml deleted file mode 100644 index 4bba2c6e..00000000 --- a/docker/authentik/authentik.toml +++ /dev/null @@ -1,64 +0,0 @@ -[services.redis] -image = "docker.io/library/redis:alpine" -command = "--save 60 1 --loglevel warning" -restart = "unless-stopped" -volumes = ["redis:/data"] - -[services.redis.healthcheck] -test = ["CMD-SHELL", "redis-cli ping | grep PONG"] -start_period = "20s" -interval = "30s" -retries = 5 -timeout = "3s" - -[services.server] -image = "${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.10.1}" -restart = "unless-stopped" -command = "server" -volumes = [ - "/docker/authentik/media:/media", - "/docker/authentik/custom-templates:/templates", - "/docker/authentik/geoip:/geoip", -] -env_file = [".env"] -ports = [ - "0.0.0.0:${AUTHENTIK_PORT_HTTP:-9000}:9000", - "0.0.0.0:${AUTHENTIK_PORT_HTTPS:-9443}:9443", -] - -[services.server.environment] -AUTHENTIK_REDIS__HOST = "redis" -AUTHENTIK_POSTGRESQL__HOST = "postgresql" -AUTHENTIK_POSTGRESQL__USER = "${PG_USER:-authentik}" -AUTHENTIK_POSTGRESQL__NAME = "${PG_DB:-authentik}" -AUTHENTIK_POSTGRESQL__PASSWORD = "${PG_PASS}" - -[services.worker] -image = "${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.10.1}" -restart = "unless-stopped" -command = "worker" -user = "root" -volumes = [ - "./media:/media", - "./certs:/certs", - "/var/run/docker.sock:/var/run/docker.sock", - "./custom-templates:/templates", - "geoip:/geoip", -] -env_file = [".env"] - -[services.worker.environment] -AUTHENTIK_REDIS__HOST = "redis" -AUTHENTIK_POSTGRESQL__HOST = "postgresql" -AUTHENTIK_POSTGRESQL__USER = "${PG_USER:-authentik}" -AUTHENTIK_POSTGRESQL__NAME = "${PG_DB:-authentik}" -AUTHENTIK_POSTGRESQL__PASSWORD = "${PG_PASS}" - -[services.geoipupdate] -image = "maxmindinc/geoipupdate:latest" -volumes = ["geoip:/usr/share/GeoIP"] -env_file = [".env"] - -[services.geoipupdate.environment] -GEOIPUPDATE_EDITION_IDS = "GeoLite2-City" -GEOIPUPDATE_FREQUENCY = "8" diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index e8999e7c..11642ada 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -13,7 +13,7 @@ retries = 5 timeout = "3s" [services.server] -image = "ghcr.io/goauthentik/server:latest" +image = "ghcr.io/goauthentik/server" container_name = "authentik" restart = "unless-stopped" command = "server" @@ -39,7 +39,7 @@ labels = [ ] [services.worker] -image = "ghcr.io/goauthentik/server:latest" +image = "ghcr.io/goauthentik/server" container_name = "authentik-worker" restart = "unless-stopped" command = "worker" @@ -55,7 +55,7 @@ env_file = [".env"] networks = ["authentik", "postgres"] [services.geoipupdate] -image = "maxmindinc/geoipupdate:latest" +image = "maxmindinc/geoipupdate" container_name = "authentik-geoipupdate" restart = "unless-stopped" networks = ["authentik"] diff --git a/docker/pihole/docker-compose.toml b/docker/pihole/docker-compose.toml index 5eaff1c3..a578112e 100644 --- a/docker/pihole/docker-compose.toml +++ b/docker/pihole/docker-compose.toml @@ -2,7 +2,7 @@ [services.pihole] container_name = "pihole" -image = "pihole/pihole:latest" +image = "pihole/pihole" ports = ["53:53/tcp", "53:53/udp", "67:67/udp", "8069:80/tcp"] networks = ["proxy"] volumes = [ diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml index 8e12694f..d181ab1c 100644 --- a/docker/searx/docker-compose.toml +++ b/docker/searx/docker-compose.toml @@ -1,6 +1,6 @@ [services.searx] container_name = "searx" -image = "searxng/searxng:latest" +image = "searxng/searxng" restart = "unless-stopped" networks = ["searx", "proxy"] volumes = [ diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index 98b996be..3d0d7aee 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -1,5 +1,5 @@ [services.traefik] -image = "traefik:latest" +image = "traefik" container_name = "traefik" restart = "unless-stopped" ports = ["80:80", "443:443/tcp", "443:443/udp"] @@ -34,7 +34,7 @@ labels = [ ] [services.fail2ban] -image = "crazymax/fail2ban:latest" +image = "crazymax/fail2ban" container_name = "fail2ban" restart = "unless-stopped" network_mode = "host" From c48528802a26261ded251f64393e3f2e9eaa1357 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Nov 2022 21:47:09 +0200 Subject: [PATCH 1689/2667] Docker: add ofelia scheduler for nextcloud --- docker/nextcloud/docker-compose.toml | 6 ++++++ docker/ofelia/docker-compose.toml | 9 +++++++++ 2 files changed, 15 insertions(+) create mode 100644 docker/ofelia/docker-compose.toml diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 15c5d3ce..25a73af4 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -44,6 +44,12 @@ environment = [ "OVERWRITEPROTOCOL=https", ] depends_on = ["redis"] +labels = [ + "ofelia.enabled=true", + "ofelia.job-exec.nextcloud.schedule=0 */5 * * * *", + "ofelia.job-exec.nextcloud.command=php /var/www/html/cron.php", + "ofelia.job-exec.nextcloud.user=www-data", +] [services.redis] image = "redis:alpine" diff --git a/docker/ofelia/docker-compose.toml b/docker/ofelia/docker-compose.toml new file mode 100644 index 00000000..0f9352ba --- /dev/null +++ b/docker/ofelia/docker-compose.toml @@ -0,0 +1,9 @@ +[services.ofelia] +image = "mcuadros/ofelia" +container_name = "ofelia" +volumes = [ + "/etc/localtime:/etc/localtime:ro", + "/var/run/docker.sock:/var/run/docker.sock:ro" +] +network_mode = "none" +command = "daemon --docker" From ed2b649164c634a2a177a80cd909329111c450fe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Nov 2022 21:47:09 +0200 Subject: [PATCH 1690/2667] Docker: add ofelia scheduler for nextcloud --- docker/nextcloud/docker-compose.toml | 6 ++++++ docker/ofelia/docker-compose.toml | 9 +++++++++ 2 files changed, 15 insertions(+) create mode 100644 docker/ofelia/docker-compose.toml diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 15c5d3ce..25a73af4 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -44,6 +44,12 @@ environment = [ "OVERWRITEPROTOCOL=https", ] depends_on = ["redis"] +labels = [ + "ofelia.enabled=true", + "ofelia.job-exec.nextcloud.schedule=0 */5 * * * *", + "ofelia.job-exec.nextcloud.command=php /var/www/html/cron.php", + "ofelia.job-exec.nextcloud.user=www-data", +] [services.redis] image = "redis:alpine" diff --git a/docker/ofelia/docker-compose.toml b/docker/ofelia/docker-compose.toml new file mode 100644 index 00000000..0f9352ba --- /dev/null +++ b/docker/ofelia/docker-compose.toml @@ -0,0 +1,9 @@ +[services.ofelia] +image = "mcuadros/ofelia" +container_name = "ofelia" +volumes = [ + "/etc/localtime:/etc/localtime:ro", + "/var/run/docker.sock:/var/run/docker.sock:ro" +] +network_mode = "none" +command = "daemon --docker" From 789ff576b24f91af42b0d023849b1a95156dc2ac Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Nov 2022 22:20:46 +0200 Subject: [PATCH 1691/2667] Ofelia: enable error mail notifications for nextcloud --- docker/nextcloud/docker-compose.toml | 7 +++++++ docker/ofelia/docker-compose.toml | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 25a73af4..113b3f32 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -49,6 +49,13 @@ labels = [ "ofelia.job-exec.nextcloud.schedule=0 */5 * * * *", "ofelia.job-exec.nextcloud.command=php /var/www/html/cron.php", "ofelia.job-exec.nextcloud.user=www-data", + "ofelia.smtp-host=${SMTP_HOST}", + "ofelia.smtp-port=${SMTP_PORT}", + "ofelia.smtp-user=${SMTP_USER}", + "ofelia.smtp-password=${SMTP_PASSWORD}", + "ofelia.email-to=${EMAIL_TO}", + "ofelia.email-from=${EMAIL_FROM}", + "ofelia.mail-only-on-error", ] [services.redis] diff --git a/docker/ofelia/docker-compose.toml b/docker/ofelia/docker-compose.toml index 0f9352ba..434a1b5c 100644 --- a/docker/ofelia/docker-compose.toml +++ b/docker/ofelia/docker-compose.toml @@ -3,7 +3,6 @@ image = "mcuadros/ofelia" container_name = "ofelia" volumes = [ "/etc/localtime:/etc/localtime:ro", - "/var/run/docker.sock:/var/run/docker.sock:ro" + "/var/run/docker.sock:/var/run/docker.sock:ro", ] -network_mode = "none" command = "daemon --docker" From ee1f973c41f1bf672768e06a7602a0403b02816e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Nov 2022 22:20:46 +0200 Subject: [PATCH 1692/2667] Ofelia: enable error mail notifications for nextcloud --- docker/nextcloud/docker-compose.toml | 7 +++++++ docker/ofelia/docker-compose.toml | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 25a73af4..113b3f32 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -49,6 +49,13 @@ labels = [ "ofelia.job-exec.nextcloud.schedule=0 */5 * * * *", "ofelia.job-exec.nextcloud.command=php /var/www/html/cron.php", "ofelia.job-exec.nextcloud.user=www-data", + "ofelia.smtp-host=${SMTP_HOST}", + "ofelia.smtp-port=${SMTP_PORT}", + "ofelia.smtp-user=${SMTP_USER}", + "ofelia.smtp-password=${SMTP_PASSWORD}", + "ofelia.email-to=${EMAIL_TO}", + "ofelia.email-from=${EMAIL_FROM}", + "ofelia.mail-only-on-error", ] [services.redis] diff --git a/docker/ofelia/docker-compose.toml b/docker/ofelia/docker-compose.toml index 0f9352ba..434a1b5c 100644 --- a/docker/ofelia/docker-compose.toml +++ b/docker/ofelia/docker-compose.toml @@ -3,7 +3,6 @@ image = "mcuadros/ofelia" container_name = "ofelia" volumes = [ "/etc/localtime:/etc/localtime:ro", - "/var/run/docker.sock:/var/run/docker.sock:ro" + "/var/run/docker.sock:/var/run/docker.sock:ro", ] -network_mode = "none" command = "daemon --docker" From 13ca0e4a0615b5d0979ac39aa3d842b9b0197b5b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 1 Dec 2022 21:56:56 +0200 Subject: [PATCH 1693/2667] Add checkupdates script --- scripts/checkupdates.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 scripts/checkupdates.sh diff --git a/scripts/checkupdates.sh b/scripts/checkupdates.sh new file mode 100755 index 00000000..27bd1464 --- /dev/null +++ b/scripts/checkupdates.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +checkupdates -d + +CODE=$? + +if [ $CODE -eq 2 ]; then + echo "No updates available" + exit 0 +fi + +exit $CODE From 19a35842cea4620320192ee0b68c863100c18a45 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 1 Dec 2022 21:56:56 +0200 Subject: [PATCH 1694/2667] Add checkupdates script --- scripts/checkupdates.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 scripts/checkupdates.sh diff --git a/scripts/checkupdates.sh b/scripts/checkupdates.sh new file mode 100755 index 00000000..27bd1464 --- /dev/null +++ b/scripts/checkupdates.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +checkupdates -d + +CODE=$? + +if [ $CODE -eq 2 ]; then + echo "No updates available" + exit 0 +fi + +exit $CODE From 8805bf2dc34719de261ea3a5d82e615a674fe9cc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 1 Dec 2022 21:57:06 +0200 Subject: [PATCH 1695/2667] Add restart policy for ofelia --- docker/ofelia/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/ofelia/docker-compose.toml b/docker/ofelia/docker-compose.toml index 434a1b5c..e9e5ea0b 100644 --- a/docker/ofelia/docker-compose.toml +++ b/docker/ofelia/docker-compose.toml @@ -1,6 +1,7 @@ [services.ofelia] image = "mcuadros/ofelia" container_name = "ofelia" +restart = "unless-stopped" volumes = [ "/etc/localtime:/etc/localtime:ro", "/var/run/docker.sock:/var/run/docker.sock:ro", From 147731f693dcc70f446d5b7334868ba341eefb1c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 1 Dec 2022 21:57:06 +0200 Subject: [PATCH 1696/2667] Add restart policy for ofelia --- docker/ofelia/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/ofelia/docker-compose.toml b/docker/ofelia/docker-compose.toml index 434a1b5c..e9e5ea0b 100644 --- a/docker/ofelia/docker-compose.toml +++ b/docker/ofelia/docker-compose.toml @@ -1,6 +1,7 @@ [services.ofelia] image = "mcuadros/ofelia" container_name = "ofelia" +restart = "unless-stopped" volumes = [ "/etc/localtime:/etc/localtime:ro", "/var/run/docker.sock:/var/run/docker.sock:ro", From 03ab3c278d18c9e613e018e405dd370e122546b5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 9 Dec 2022 13:40:49 +0200 Subject: [PATCH 1697/2667] Use yt-dlp with mpv --- home/.config/mpv/mpv.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index 2800d299..fc3dff87 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -77,7 +77,7 @@ osd-bar-w=60 # width of " " " osd-shadow-color="#11000000" osd-fractions -# Protocol specific configuration +# Protocol specific configuration [protocol.https] cache=yes user-agent='Mozilla/5.0 (X11; Linux x86_64; rv:72.0) Gecko/20100101 Firefox/72.0' @@ -108,3 +108,5 @@ ytdl-format="bestvideo[height<=720]+bestaudio/best[height<=720]" ytdl-format="bestvideo[height<=2160]+bestaudio/best[height<=2160]" [best] ytdl-format="bestvideo+bestaudio" + +script-opts-append=ytdl_hook-ytdl_path=yt-dlp From 9cfc894c862689cd6044c2d2394b89f201c4d301 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 9 Dec 2022 13:40:49 +0200 Subject: [PATCH 1698/2667] Use yt-dlp with mpv --- home/.config/mpv/mpv.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index 2800d299..fc3dff87 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -77,7 +77,7 @@ osd-bar-w=60 # width of " " " osd-shadow-color="#11000000" osd-fractions -# Protocol specific configuration +# Protocol specific configuration [protocol.https] cache=yes user-agent='Mozilla/5.0 (X11; Linux x86_64; rv:72.0) Gecko/20100101 Firefox/72.0' @@ -108,3 +108,5 @@ ytdl-format="bestvideo[height<=720]+bestaudio/best[height<=720]" ytdl-format="bestvideo[height<=2160]+bestaudio/best[height<=2160]" [best] ytdl-format="bestvideo+bestaudio" + +script-opts-append=ytdl_hook-ytdl_path=yt-dlp From 1d5f1b7b78294722960d754a6b28b1a26c717546 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 7 Dec 2022 10:37:21 +0200 Subject: [PATCH 1699/2667] Add linux-zen mkinitcpio preset and disable fallback initramfs generation --- root/etc/mkinitcpio.d/linux-lts.preset | 12 ------------ root/etc/mkinitcpio.d/linux-zen.preset | 8 ++++++++ root/etc/mkinitcpio.d/linux.preset | 8 ++------ 3 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 root/etc/mkinitcpio.d/linux-lts.preset create mode 100644 root/etc/mkinitcpio.d/linux-zen.preset diff --git a/root/etc/mkinitcpio.d/linux-lts.preset b/root/etc/mkinitcpio.d/linux-lts.preset deleted file mode 100644 index 5f686d2a..00000000 --- a/root/etc/mkinitcpio.d/linux-lts.preset +++ /dev/null @@ -1,12 +0,0 @@ -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuz-linux-lts" -ALL_microcode=(/boot/*-ucode.img) - -PRESETS=('default' 'fallback') - -default_image="/boot/initramfs-linux-lts.img" -default_efi_image="/boot/EFI/Linux/archlinux-linux-lts.efi" - -fallback_image="/boot/initramfs-linux-lts-fallback.img" -fallback_efi_image="/boot/EFI/Linux/archlinux-linux-lts-fallback.efi" -fallback_options="-S autodetect --splash /usr/share/systemd/bootctl/splash-arch.bmp" diff --git a/root/etc/mkinitcpio.d/linux-zen.preset b/root/etc/mkinitcpio.d/linux-zen.preset new file mode 100644 index 00000000..82ed3f2e --- /dev/null +++ b/root/etc/mkinitcpio.d/linux-zen.preset @@ -0,0 +1,8 @@ +PRESETS=('default') + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux-zen" +ALL_microcode=(/boot/*-ucode.img) + +default_image="/boot/initramfs-linux-zen.img" +default_efi_image="/boot/EFI/Linux/archlinux-linux-zen.efi" diff --git a/root/etc/mkinitcpio.d/linux.preset b/root/etc/mkinitcpio.d/linux.preset index 4533ef75..600f2dbc 100644 --- a/root/etc/mkinitcpio.d/linux.preset +++ b/root/etc/mkinitcpio.d/linux.preset @@ -1,12 +1,8 @@ +PRESETS=('default') + ALL_config="/etc/mkinitcpio.conf" ALL_kver="/boot/vmlinuz-linux" ALL_microcode=(/boot/*-ucode.img) -PRESETS=('default' 'fallback') - default_image="/boot/initramfs-linux.img" default_efi_image="/boot/EFI/Linux/archlinux-linux.efi" - -fallback_image="/boot/initramfs-linux-fallback.img" -fallback_efi_image="/boot/EFI/Linux/archlinux-linux-fallback.efi" -fallback_options="-S autodetect --splash /usr/share/systemd/bootctl/splash-arch.bmp" From 46400e280120959eb949142306f3c7468b2a8912 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 7 Dec 2022 10:37:21 +0200 Subject: [PATCH 1700/2667] Add linux-zen mkinitcpio preset and disable fallback initramfs generation --- root/etc/mkinitcpio.d/linux-lts.preset | 12 ------------ root/etc/mkinitcpio.d/linux-zen.preset | 8 ++++++++ root/etc/mkinitcpio.d/linux.preset | 8 ++------ 3 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 root/etc/mkinitcpio.d/linux-lts.preset create mode 100644 root/etc/mkinitcpio.d/linux-zen.preset diff --git a/root/etc/mkinitcpio.d/linux-lts.preset b/root/etc/mkinitcpio.d/linux-lts.preset deleted file mode 100644 index 5f686d2a..00000000 --- a/root/etc/mkinitcpio.d/linux-lts.preset +++ /dev/null @@ -1,12 +0,0 @@ -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuz-linux-lts" -ALL_microcode=(/boot/*-ucode.img) - -PRESETS=('default' 'fallback') - -default_image="/boot/initramfs-linux-lts.img" -default_efi_image="/boot/EFI/Linux/archlinux-linux-lts.efi" - -fallback_image="/boot/initramfs-linux-lts-fallback.img" -fallback_efi_image="/boot/EFI/Linux/archlinux-linux-lts-fallback.efi" -fallback_options="-S autodetect --splash /usr/share/systemd/bootctl/splash-arch.bmp" diff --git a/root/etc/mkinitcpio.d/linux-zen.preset b/root/etc/mkinitcpio.d/linux-zen.preset new file mode 100644 index 00000000..82ed3f2e --- /dev/null +++ b/root/etc/mkinitcpio.d/linux-zen.preset @@ -0,0 +1,8 @@ +PRESETS=('default') + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux-zen" +ALL_microcode=(/boot/*-ucode.img) + +default_image="/boot/initramfs-linux-zen.img" +default_efi_image="/boot/EFI/Linux/archlinux-linux-zen.efi" diff --git a/root/etc/mkinitcpio.d/linux.preset b/root/etc/mkinitcpio.d/linux.preset index 4533ef75..600f2dbc 100644 --- a/root/etc/mkinitcpio.d/linux.preset +++ b/root/etc/mkinitcpio.d/linux.preset @@ -1,12 +1,8 @@ +PRESETS=('default') + ALL_config="/etc/mkinitcpio.conf" ALL_kver="/boot/vmlinuz-linux" ALL_microcode=(/boot/*-ucode.img) -PRESETS=('default' 'fallback') - default_image="/boot/initramfs-linux.img" default_efi_image="/boot/EFI/Linux/archlinux-linux.efi" - -fallback_image="/boot/initramfs-linux-fallback.img" -fallback_efi_image="/boot/EFI/Linux/archlinux-linux-fallback.efi" -fallback_options="-S autodetect --splash /usr/share/systemd/bootctl/splash-arch.bmp" From c3710ccfb45be2a71260e2b894722bbcdd8c05f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 7 Dec 2022 10:37:48 +0200 Subject: [PATCH 1701/2667] Disable plymouth and enable remove luks decrypt on Moria --- root/etc/mkinitcpio.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 3082c7de..9b5d4dc4 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -3,9 +3,9 @@ MODULES=(amdgpu) BINARIES=("/usr/bin/btrfs") FILES=() -{%@@ if profile == "Mirkwood" or profile == "Moria" @@%} +{%@@ if profile == "Mirkwood" @@%} HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) {%@@ elif profile == 'Moria' @@%} -HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) -#HOOKS=(base udev keyboard autodetect modconf block netconf dropbear encryptssh filesystems btrfs fsck) +#HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) +HOOKS=(base udev kms keyboard autodetect modconf block netconf dropbear encryptssh filesystems btrfs fsck) {%@@ endif @@%} From 35a2a782f003552bf4e0ff3862a1da1b685c90c9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 7 Dec 2022 10:37:48 +0200 Subject: [PATCH 1702/2667] Disable plymouth and enable remove luks decrypt on Moria --- root/etc/mkinitcpio.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 3082c7de..9b5d4dc4 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -3,9 +3,9 @@ MODULES=(amdgpu) BINARIES=("/usr/bin/btrfs") FILES=() -{%@@ if profile == "Mirkwood" or profile == "Moria" @@%} +{%@@ if profile == "Mirkwood" @@%} HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) {%@@ elif profile == 'Moria' @@%} -HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) -#HOOKS=(base udev keyboard autodetect modconf block netconf dropbear encryptssh filesystems btrfs fsck) +#HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) +HOOKS=(base udev kms keyboard autodetect modconf block netconf dropbear encryptssh filesystems btrfs fsck) {%@@ endif @@%} From 778e410a709a27e0c3977bc9d6207f2b6055e427 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Dec 2022 23:43:38 +0200 Subject: [PATCH 1703/2667] Fix title in README --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 993928bf..a83478dc 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -= FunctionalHacker’s dotfiles += FunctionalHacker's dotfiles image:https://i.imgur.com/lz1Q4Zz.png?raw=true%22[screenshot of my setup] From 717c562eecc1d3254e95cb596619e9834f347cda Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Dec 2022 23:43:38 +0200 Subject: [PATCH 1704/2667] Fix title in README --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 993928bf..a83478dc 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -= FunctionalHacker’s dotfiles += FunctionalHacker's dotfiles image:https://i.imgur.com/lz1Q4Zz.png?raw=true%22[screenshot of my setup] From 93d1f827e3b20fcd523b8a0cd80b3660e19482f9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 13:17:15 +0200 Subject: [PATCH 1705/2667] Switch from Drone CI to Woodpecker CI --- docker/gitea/docker-compose.toml | 58 --------------------------- docker/woodpecker/docker-compose.toml | 58 +++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 docker/woodpecker/docker-compose.toml diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml index 775ede6c..9ed72689 100644 --- a/docker/gitea/docker-compose.toml +++ b/docker/gitea/docker-compose.toml @@ -1,5 +1,3 @@ -[services] - [services.gitea] image = "functionalhacker/gitea-asciidoc" container_name = "gitea" @@ -21,62 +19,6 @@ labels = [ "traefik.http.services.gitea.loadbalancer.server.port=3000", ] -[services.drone] -image = "drone/drone:2" -container_name = "drone" -restart = "unless-stopped" -volumes = ["/docker/drone:/data"] -environment = [ - "DRONE_GITEA_SERVER=https://git.korhonen.cc", - "DRONE_GITEA_CLIENT_ID=${GITEA_CLIENT_ID}", - "DRONE_GITEA_CLIENT_SECRET=${GITEA_CLIENT_SECRET}", - "DRONE_RPC_SECRET=${DRONE_RPC_SECRET}", - "DRONE_SERVER_HOST=drone.korhonen.cc", - "DRONE_SERVER_PROTO=https", - "DRONE_USER_CREATE=username:FunctionalHacker,admin:true", -] -env_file = [".env"] -networks = ["proxy"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.drone-redirect.entrypoints=http", - "traefik.http.routers.drone-redirect.rule=Host(`drone.korhonen.cc`)", - "traefik.http.routers.drone-redirect.middlewares=http2https@file", - "traefik.http.routers.drone.entrypoints=https", - "traefik.http.routers.drone.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.drone.rule=Host(`drone.korhonen.cc`)", - "traefik.http.routers.drone.service=drone", - "traefik.http.services.drone.loadbalancer.server.port=80", -] - -[services.drone-runner] -image = "drone/drone-runner-docker:1" -container_name = "drone-runner" -restart = "unless-stopped" -volumes = ["/var/run/docker.sock:/var/run/docker.sock"] -environment = [ - "DRONE_RPC_HOST=drone.korhonen.cc", - "DRONE_RPC_PROTO=https", - "DRONE_RPC_SECRET=${DRONE_RPC_SECRET}", -] -env_file = [".env"] -networks = ["proxy"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.drone-runner-redirect.entrypoints=http", - "traefik.http.routers.drone-runner-redirect.rule=Host(`runner.drone.korhonen.cc`)", - "traefik.http.routers.drone-runner-redirect.middlewares=http2https@file", - "traefik.http.routers.drone-runner.entrypoints=https", - "traefik.http.routers.drone-runner.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.drone-runner.rule=Host(`runner.drone.korhonen.cc`)", - "traefik.http.routers.drone-runner.service=drone-runner", - "traefik.http.services.drone-runner.loadbalancer.server.port=3000", -] - -[networks] - [networks.postgres] external = true diff --git a/docker/woodpecker/docker-compose.toml b/docker/woodpecker/docker-compose.toml new file mode 100644 index 00000000..2cdc0b92 --- /dev/null +++ b/docker/woodpecker/docker-compose.toml @@ -0,0 +1,58 @@ +[services.woodpecker] +image = "woodpeckerci/woodpecker-server" +container_name = "woodpecker" +restart = "unless-stopped" +volumes = ["/docker/woodpecker/:/var/lib/woodpecker/"] +env_file = [".env"] +environment = [ + "WOODPECKER_OPEN=true", + "WOODPECKER_GITEA=true", + "WOODPECKER_GITEA_URL=https://git.korhonen.cc", + "WOODPECKER_GITEA_CLIENT", + "WOODPECKER_GITEA_SECRET", + "WOODPECKER_AGENT_SECRET", + "WOODPECKER_HOST=https://ci.korhonen.cc", + "WOODPECKER_ADMIN=FunctionalHacker", +] +networks = ["proxy"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.woodpecker-redirect.entrypoints=http", + "traefik.http.routers.woodpecker-redirect.rule=Host(`ci.korhonen.cc`)", + "traefik.http.routers.woodpecker-redirect.middlewares=http2https@file", + "traefik.http.routers.woodpecker.entrypoints=https", + "traefik.http.routers.woodpecker.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.woodpecker.rule=Host(`ci.korhonen.cc`)", + "traefik.http.routers.woodpecker.service=woodpecker", + "traefik.http.services.woodpecker.loadbalancer.server.port=8000", +] + +[services.woodpecker-agent] +image = "woodpeckerci/woodpecker-agent" +container_name = "woodpecker-agent" +command = "agent" +restart = "unless-stopped" +depends_on = ["woodpecker"] +volumes = ["/var/run/docker.sock:/var/run/docker.sock"] +env_file = [".env"] +environment = [ + "WOODPECKER_SERVER=woodpecker:9000", + "WOODPECKER_AGENT_SECRET", +] +networks = ["proxy"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.woodpecker-agent-redirect.entrypoints=http", + "traefik.http.routers.woodpecker-agent-redirect.rule=Host(`agent.ci.korhonen.cc`)", + "traefik.http.routers.woodpecker-agent-redirect.middlewares=http2https@file", + "traefik.http.routers.woodpecker-agent.entrypoints=https", + "traefik.http.routers.woodpecker-agent.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.woodpecker-agent.rule=Host(`agent.ci.korhonen.cc`)", + "traefik.http.routers.woodpecker-agent.service=woodpecker-agent", + "traefik.http.services.woodpecker-agent.loadbalancer.server.port=3000", +] + +[networks.proxy] +external = true From 0ecf1e8479c7245ed3cdad1c91083042177352c0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 13:17:15 +0200 Subject: [PATCH 1706/2667] Switch from Drone CI to Woodpecker CI --- docker/gitea/docker-compose.toml | 58 --------------------------- docker/woodpecker/docker-compose.toml | 58 +++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 docker/woodpecker/docker-compose.toml diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml index 775ede6c..9ed72689 100644 --- a/docker/gitea/docker-compose.toml +++ b/docker/gitea/docker-compose.toml @@ -1,5 +1,3 @@ -[services] - [services.gitea] image = "functionalhacker/gitea-asciidoc" container_name = "gitea" @@ -21,62 +19,6 @@ labels = [ "traefik.http.services.gitea.loadbalancer.server.port=3000", ] -[services.drone] -image = "drone/drone:2" -container_name = "drone" -restart = "unless-stopped" -volumes = ["/docker/drone:/data"] -environment = [ - "DRONE_GITEA_SERVER=https://git.korhonen.cc", - "DRONE_GITEA_CLIENT_ID=${GITEA_CLIENT_ID}", - "DRONE_GITEA_CLIENT_SECRET=${GITEA_CLIENT_SECRET}", - "DRONE_RPC_SECRET=${DRONE_RPC_SECRET}", - "DRONE_SERVER_HOST=drone.korhonen.cc", - "DRONE_SERVER_PROTO=https", - "DRONE_USER_CREATE=username:FunctionalHacker,admin:true", -] -env_file = [".env"] -networks = ["proxy"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.drone-redirect.entrypoints=http", - "traefik.http.routers.drone-redirect.rule=Host(`drone.korhonen.cc`)", - "traefik.http.routers.drone-redirect.middlewares=http2https@file", - "traefik.http.routers.drone.entrypoints=https", - "traefik.http.routers.drone.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.drone.rule=Host(`drone.korhonen.cc`)", - "traefik.http.routers.drone.service=drone", - "traefik.http.services.drone.loadbalancer.server.port=80", -] - -[services.drone-runner] -image = "drone/drone-runner-docker:1" -container_name = "drone-runner" -restart = "unless-stopped" -volumes = ["/var/run/docker.sock:/var/run/docker.sock"] -environment = [ - "DRONE_RPC_HOST=drone.korhonen.cc", - "DRONE_RPC_PROTO=https", - "DRONE_RPC_SECRET=${DRONE_RPC_SECRET}", -] -env_file = [".env"] -networks = ["proxy"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.drone-runner-redirect.entrypoints=http", - "traefik.http.routers.drone-runner-redirect.rule=Host(`runner.drone.korhonen.cc`)", - "traefik.http.routers.drone-runner-redirect.middlewares=http2https@file", - "traefik.http.routers.drone-runner.entrypoints=https", - "traefik.http.routers.drone-runner.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.drone-runner.rule=Host(`runner.drone.korhonen.cc`)", - "traefik.http.routers.drone-runner.service=drone-runner", - "traefik.http.services.drone-runner.loadbalancer.server.port=3000", -] - -[networks] - [networks.postgres] external = true diff --git a/docker/woodpecker/docker-compose.toml b/docker/woodpecker/docker-compose.toml new file mode 100644 index 00000000..2cdc0b92 --- /dev/null +++ b/docker/woodpecker/docker-compose.toml @@ -0,0 +1,58 @@ +[services.woodpecker] +image = "woodpeckerci/woodpecker-server" +container_name = "woodpecker" +restart = "unless-stopped" +volumes = ["/docker/woodpecker/:/var/lib/woodpecker/"] +env_file = [".env"] +environment = [ + "WOODPECKER_OPEN=true", + "WOODPECKER_GITEA=true", + "WOODPECKER_GITEA_URL=https://git.korhonen.cc", + "WOODPECKER_GITEA_CLIENT", + "WOODPECKER_GITEA_SECRET", + "WOODPECKER_AGENT_SECRET", + "WOODPECKER_HOST=https://ci.korhonen.cc", + "WOODPECKER_ADMIN=FunctionalHacker", +] +networks = ["proxy"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.woodpecker-redirect.entrypoints=http", + "traefik.http.routers.woodpecker-redirect.rule=Host(`ci.korhonen.cc`)", + "traefik.http.routers.woodpecker-redirect.middlewares=http2https@file", + "traefik.http.routers.woodpecker.entrypoints=https", + "traefik.http.routers.woodpecker.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.woodpecker.rule=Host(`ci.korhonen.cc`)", + "traefik.http.routers.woodpecker.service=woodpecker", + "traefik.http.services.woodpecker.loadbalancer.server.port=8000", +] + +[services.woodpecker-agent] +image = "woodpeckerci/woodpecker-agent" +container_name = "woodpecker-agent" +command = "agent" +restart = "unless-stopped" +depends_on = ["woodpecker"] +volumes = ["/var/run/docker.sock:/var/run/docker.sock"] +env_file = [".env"] +environment = [ + "WOODPECKER_SERVER=woodpecker:9000", + "WOODPECKER_AGENT_SECRET", +] +networks = ["proxy"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.woodpecker-agent-redirect.entrypoints=http", + "traefik.http.routers.woodpecker-agent-redirect.rule=Host(`agent.ci.korhonen.cc`)", + "traefik.http.routers.woodpecker-agent-redirect.middlewares=http2https@file", + "traefik.http.routers.woodpecker-agent.entrypoints=https", + "traefik.http.routers.woodpecker-agent.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.woodpecker-agent.rule=Host(`agent.ci.korhonen.cc`)", + "traefik.http.routers.woodpecker-agent.service=woodpecker-agent", + "traefik.http.services.woodpecker-agent.loadbalancer.server.port=3000", +] + +[networks.proxy] +external = true From d0c9b85b0b9e1d80d7ca5ed999a4045184846e43 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 14:46:53 +0200 Subject: [PATCH 1707/2667] Switch from Gitea to Forgejo --- docker/forgejo/docker-compose.toml | 26 ++++++++++++++++++++++++++ docker/gitea/docker-compose.toml | 26 -------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) create mode 100644 docker/forgejo/docker-compose.toml delete mode 100644 docker/gitea/docker-compose.toml diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml new file mode 100644 index 00000000..61d461a6 --- /dev/null +++ b/docker/forgejo/docker-compose.toml @@ -0,0 +1,26 @@ +[services.forgejo] +image = "codeberg.org/forgejo/forgejo:1.18.0-rc1-1" +container_name = "forgejo" +environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] +restart = "unless-stopped" +networks = ["postgres", "proxy"] +ports = ["3000:3000", "22:22"] +volumes = ["/docker/forgejo:/data", "/etc/localtime:/etc/localtime:ro"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.forgejo-redirect.entrypoints=http", + "traefik.http.routers.forgejo-redirect.rule=Host(`git.korhonen.cc`)", + "traefik.http.routers.forgejo-redirect.middlewares=http2https@file", + "traefik.http.routers.forgejo.entrypoints=https", + "traefik.http.routers.forgejo.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.forgejo.rule=Host(`git.korhonen.cc`)", + "traefik.http.routers.forgejo.service=forgejo", + "traefik.http.services.forgejo.loadbalancer.server.port=3000", +] + +[networks.postgres] +external = true + +[networks.proxy] +external = true diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml deleted file mode 100644 index 9ed72689..00000000 --- a/docker/gitea/docker-compose.toml +++ /dev/null @@ -1,26 +0,0 @@ -[services.gitea] -image = "functionalhacker/gitea-asciidoc" -container_name = "gitea" -environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] -restart = "unless-stopped" -networks = ["postgres", "proxy"] -ports = ["3000:3000", "22:22"] -volumes = ["/docker/gitea:/data", "/etc/localtime:/etc/localtime:ro"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.gitea-redirect.entrypoints=http", - "traefik.http.routers.gitea-redirect.rule=Host(`git.korhonen.cc`)", - "traefik.http.routers.gitea-redirect.middlewares=http2https@file", - "traefik.http.routers.gitea.entrypoints=https", - "traefik.http.routers.gitea.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)", - "traefik.http.routers.gitea.service=gitea", - "traefik.http.services.gitea.loadbalancer.server.port=3000", -] - -[networks.postgres] -external = true - -[networks.proxy] -external = true From 305666192f9e0d39a5902f56cfc0c305bc00d0ee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 14:46:53 +0200 Subject: [PATCH 1708/2667] Switch from Gitea to Forgejo --- docker/forgejo/docker-compose.toml | 26 ++++++++++++++++++++++++++ docker/gitea/docker-compose.toml | 26 -------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) create mode 100644 docker/forgejo/docker-compose.toml delete mode 100644 docker/gitea/docker-compose.toml diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml new file mode 100644 index 00000000..61d461a6 --- /dev/null +++ b/docker/forgejo/docker-compose.toml @@ -0,0 +1,26 @@ +[services.forgejo] +image = "codeberg.org/forgejo/forgejo:1.18.0-rc1-1" +container_name = "forgejo" +environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] +restart = "unless-stopped" +networks = ["postgres", "proxy"] +ports = ["3000:3000", "22:22"] +volumes = ["/docker/forgejo:/data", "/etc/localtime:/etc/localtime:ro"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.forgejo-redirect.entrypoints=http", + "traefik.http.routers.forgejo-redirect.rule=Host(`git.korhonen.cc`)", + "traefik.http.routers.forgejo-redirect.middlewares=http2https@file", + "traefik.http.routers.forgejo.entrypoints=https", + "traefik.http.routers.forgejo.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.forgejo.rule=Host(`git.korhonen.cc`)", + "traefik.http.routers.forgejo.service=forgejo", + "traefik.http.services.forgejo.loadbalancer.server.port=3000", +] + +[networks.postgres] +external = true + +[networks.proxy] +external = true diff --git a/docker/gitea/docker-compose.toml b/docker/gitea/docker-compose.toml deleted file mode 100644 index 9ed72689..00000000 --- a/docker/gitea/docker-compose.toml +++ /dev/null @@ -1,26 +0,0 @@ -[services.gitea] -image = "functionalhacker/gitea-asciidoc" -container_name = "gitea" -environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] -restart = "unless-stopped" -networks = ["postgres", "proxy"] -ports = ["3000:3000", "22:22"] -volumes = ["/docker/gitea:/data", "/etc/localtime:/etc/localtime:ro"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.gitea-redirect.entrypoints=http", - "traefik.http.routers.gitea-redirect.rule=Host(`git.korhonen.cc`)", - "traefik.http.routers.gitea-redirect.middlewares=http2https@file", - "traefik.http.routers.gitea.entrypoints=https", - "traefik.http.routers.gitea.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)", - "traefik.http.routers.gitea.service=gitea", - "traefik.http.services.gitea.loadbalancer.server.port=3000", -] - -[networks.postgres] -external = true - -[networks.proxy] -external = true From aabf896b6fe0bf2a5646be08c6825cccb259787e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 15:05:22 +0200 Subject: [PATCH 1709/2667] Switch forgejo to asciidoc image --- docker/forgejo/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index 61d461a6..001661fd 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -1,5 +1,5 @@ [services.forgejo] -image = "codeberg.org/forgejo/forgejo:1.18.0-rc1-1" +image = "git.korhonen.cc/functionalhacker/forgejo-asciidoc" container_name = "forgejo" environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] restart = "unless-stopped" From c1c1b425eca582c622ab7690f0ae44ad672da568 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 15:05:22 +0200 Subject: [PATCH 1710/2667] Switch forgejo to asciidoc image --- docker/forgejo/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index 61d461a6..001661fd 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -1,5 +1,5 @@ [services.forgejo] -image = "codeberg.org/forgejo/forgejo:1.18.0-rc1-1" +image = "git.korhonen.cc/functionalhacker/forgejo-asciidoc" container_name = "forgejo" environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] restart = "unless-stopped" From 34c0487ab1f6a4a59ee2a59a3d55485fc93fbbb0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 15:38:48 +0200 Subject: [PATCH 1711/2667] Remove traefik configuration from woodpecker-agent --- docker/woodpecker/docker-compose.toml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/docker/woodpecker/docker-compose.toml b/docker/woodpecker/docker-compose.toml index 2cdc0b92..3d5cc46a 100644 --- a/docker/woodpecker/docker-compose.toml +++ b/docker/woodpecker/docker-compose.toml @@ -40,19 +40,6 @@ environment = [ "WOODPECKER_SERVER=woodpecker:9000", "WOODPECKER_AGENT_SECRET", ] -networks = ["proxy"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.woodpecker-agent-redirect.entrypoints=http", - "traefik.http.routers.woodpecker-agent-redirect.rule=Host(`agent.ci.korhonen.cc`)", - "traefik.http.routers.woodpecker-agent-redirect.middlewares=http2https@file", - "traefik.http.routers.woodpecker-agent.entrypoints=https", - "traefik.http.routers.woodpecker-agent.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.woodpecker-agent.rule=Host(`agent.ci.korhonen.cc`)", - "traefik.http.routers.woodpecker-agent.service=woodpecker-agent", - "traefik.http.services.woodpecker-agent.loadbalancer.server.port=3000", -] [networks.proxy] external = true From dba955406965b0118a7ba258784720280f870bc4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 15:38:48 +0200 Subject: [PATCH 1712/2667] Remove traefik configuration from woodpecker-agent --- docker/woodpecker/docker-compose.toml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/docker/woodpecker/docker-compose.toml b/docker/woodpecker/docker-compose.toml index 2cdc0b92..3d5cc46a 100644 --- a/docker/woodpecker/docker-compose.toml +++ b/docker/woodpecker/docker-compose.toml @@ -40,19 +40,6 @@ environment = [ "WOODPECKER_SERVER=woodpecker:9000", "WOODPECKER_AGENT_SECRET", ] -networks = ["proxy"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.woodpecker-agent-redirect.entrypoints=http", - "traefik.http.routers.woodpecker-agent-redirect.rule=Host(`agent.ci.korhonen.cc`)", - "traefik.http.routers.woodpecker-agent-redirect.middlewares=http2https@file", - "traefik.http.routers.woodpecker-agent.entrypoints=https", - "traefik.http.routers.woodpecker-agent.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.woodpecker-agent.rule=Host(`agent.ci.korhonen.cc`)", - "traefik.http.routers.woodpecker-agent.service=woodpecker-agent", - "traefik.http.services.woodpecker-agent.loadbalancer.server.port=3000", -] [networks.proxy] external = true From 72919da6332cd505befdb8c260ea6a2c643b7935 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 15:41:45 +0200 Subject: [PATCH 1713/2667] Add docker pass helper configuration --- config.toml | 14 +++++++++++--- home/.docker/config.json | 3 +++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 home/.docker/config.json diff --git a/config.toml b/config.toml index ab9a0ff9..9d9e8f71 100644 --- a/config.toml +++ b/config.toml @@ -238,6 +238,11 @@ src = ".config/dconf.ini" dst = "~/.config/dconf.ini" actions = ["dconf-load"] +[dotfiles."f_docker-config.json"] +src = ".docker/config.json" +dst = "~/.docker/config.json" +chmod = "600" + [profiles.pacman] dotfiles = ["f_makepkg.conf", "f_paru.conf"] @@ -301,7 +306,12 @@ dotfiles = [ [profiles.Mirkwood] include = ["pacman", "terminal", "email", "media", "sway", "gpg"] -dotfiles = ["d_rofi", "f_librewolf_overrides", "f_dconf.ini"] +dotfiles = [ + "d_rofi", + "f_librewolf_overrides", + "f_dconf.ini", + "f_docker-config.json", +] [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] @@ -316,7 +326,6 @@ dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] [profiles.Isengard] include = ["terminal"] -dotfiles = [] [profiles.Edoras] include = ["terminal"] @@ -329,7 +338,6 @@ include = ["terminal"] [profiles.ViiruJaTeippi] include = ["terminal"] -dotfiles = [] [profiles.Mirkwood.variables] wayland = true diff --git a/home/.docker/config.json b/home/.docker/config.json new file mode 100644 index 00000000..113ba69f --- /dev/null +++ b/home/.docker/config.json @@ -0,0 +1,3 @@ +{ + "credsStore": "pass" +} From 41cf3a573517807247cecf298053fd2d64405d2e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 15:41:45 +0200 Subject: [PATCH 1714/2667] Add docker pass helper configuration --- config.toml | 14 +++++++++++--- home/.docker/config.json | 3 +++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 home/.docker/config.json diff --git a/config.toml b/config.toml index ab9a0ff9..9d9e8f71 100644 --- a/config.toml +++ b/config.toml @@ -238,6 +238,11 @@ src = ".config/dconf.ini" dst = "~/.config/dconf.ini" actions = ["dconf-load"] +[dotfiles."f_docker-config.json"] +src = ".docker/config.json" +dst = "~/.docker/config.json" +chmod = "600" + [profiles.pacman] dotfiles = ["f_makepkg.conf", "f_paru.conf"] @@ -301,7 +306,12 @@ dotfiles = [ [profiles.Mirkwood] include = ["pacman", "terminal", "email", "media", "sway", "gpg"] -dotfiles = ["d_rofi", "f_librewolf_overrides", "f_dconf.ini"] +dotfiles = [ + "d_rofi", + "f_librewolf_overrides", + "f_dconf.ini", + "f_docker-config.json", +] [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] @@ -316,7 +326,6 @@ dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] [profiles.Isengard] include = ["terminal"] -dotfiles = [] [profiles.Edoras] include = ["terminal"] @@ -329,7 +338,6 @@ include = ["terminal"] [profiles.ViiruJaTeippi] include = ["terminal"] -dotfiles = [] [profiles.Mirkwood.variables] wayland = true diff --git a/home/.docker/config.json b/home/.docker/config.json new file mode 100644 index 00000000..113ba69f --- /dev/null +++ b/home/.docker/config.json @@ -0,0 +1,3 @@ +{ + "credsStore": "pass" +} From 9b93993912b8c20849693f0d9b0b08001a2f2e00 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 22:15:41 +0200 Subject: [PATCH 1715/2667] Add default network for woodpecker --- docker/woodpecker/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/woodpecker/docker-compose.toml b/docker/woodpecker/docker-compose.toml index 3d5cc46a..551bb545 100644 --- a/docker/woodpecker/docker-compose.toml +++ b/docker/woodpecker/docker-compose.toml @@ -14,7 +14,7 @@ environment = [ "WOODPECKER_HOST=https://ci.korhonen.cc", "WOODPECKER_ADMIN=FunctionalHacker", ] -networks = ["proxy"] +networks = ["proxy", "default"] labels = [ "traefik.enable=true", "traefik.docker.network=proxy", From 5c622bed80f27d312ce8a5ee85040033aa1dee19 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 22:15:41 +0200 Subject: [PATCH 1716/2667] Add default network for woodpecker --- docker/woodpecker/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/woodpecker/docker-compose.toml b/docker/woodpecker/docker-compose.toml index 3d5cc46a..551bb545 100644 --- a/docker/woodpecker/docker-compose.toml +++ b/docker/woodpecker/docker-compose.toml @@ -14,7 +14,7 @@ environment = [ "WOODPECKER_HOST=https://ci.korhonen.cc", "WOODPECKER_ADMIN=FunctionalHacker", ] -networks = ["proxy"] +networks = ["proxy", "default"] labels = [ "traefik.enable=true", "traefik.docker.network=proxy", From 3d5d91052059bc1b045d4b11722ea82a7c026e81 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 00:21:21 +0200 Subject: [PATCH 1717/2667] Add mastodon --- docker/mastodon/docker-compose.toml | 86 +++++++++++++++++++++++++++++ docker/traefik/dynamic.toml | 3 + 2 files changed, 89 insertions(+) create mode 100644 docker/mastodon/docker-compose.toml diff --git a/docker/mastodon/docker-compose.toml b/docker/mastodon/docker-compose.toml new file mode 100644 index 00000000..6f483733 --- /dev/null +++ b/docker/mastodon/docker-compose.toml @@ -0,0 +1,86 @@ +[services.mastodon] +image = "lscr.io/linuxserver/mastodon:latest" +container_name = "mastodon" +restart = "unless-stopped" +env_file = ".env" +environment = [ + "PUID=1000", + "PGID=985", + "TZ=Europe/Helsinki", + "LOCAL_DOMAIN=korhonen.cc", + "WEB_DOMAIN=social.korhonen.cc", + "REDIS_HOST=redis", + "REDIS_PORT=6379", + "DB_HOST=postgres", + "DB_PORT=5432", + "DB_NAME=mastodon", + "DB_USER=mastodon", + "DB_PASS", + "VAPID_PRIVATE_KEY", + "VAPID_PUBLIC_KEY", + "SECRET_KEY_BASE", + "OTP_SECRET", + "SMTP_SERVER=smtp.migadu.com", + "SMTP_PORT=465", + "SMTP_TLS=true", + "SMTP_ENABLE_STARTTLS_AUTO=false", + "SMTP_AUTH_METHOD=plain", + "SMTP_LOGIN", + "SMTP_PASSWORD", + "SMTP_FROM_ADDRESS=social@korhonen.cc", + "S3_ENABLED=false", + "ES_ENABLED=true", + "ES_HOST=elasticsearch", + "ES_PORT=9200", + "ES_USER=elastic", + "ES_PASS=changeme", +] +networks = ["mastodon", "proxy", "postgres"] +volumes = ["/docker/mastodon:/config"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.mastodon-redirect.entrypoints=http", + "traefik.http.routers.mastodon-redirect.rule=Host(`social.korhonen.cc`)", + "traefik.http.routers.mastodon-redirect.middlewares=http2https@file", + "traefik.http.routers.mastodon.entrypoints=https", + "traefik.http.routers.mastodon.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.mastodon.rule=Host(`social.korhonen.cc`)", + "traefik.http.routers.mastodon.service=mastodon", + "traefik.http.services.mastodon.loadbalancer.server.port=443", + "traefik.http.services.mastodon.loadbalancer.server.scheme=https", + "traefik.http.services.mastodon.loadbalancer.serverstransport=ignorecert@file", +] + +[services.elasticsearch] +image = "docker.elastic.co/elasticsearch/elasticsearch:8.5.3" +container_name = "mastodon-elasticsearch" +restart = "unless-stopped" +volumes = ["/docker/mastodon/elasticsearch:/usr/share/elasticsearch/data"] +networks = ["mastodon"] +environment = [ + "cluster.name=mastodon-es-cluster", + "node.name=mastodon-node", + "discovery.type=single-node", + "bootstrap.memory_lock=true", + "ES_JAVA_OPTS=-Xms200m -Xmx200m", +] +[services.elasticsearch.ulimits.memlock] +soft = -1 +hard = -1 + +[services.redis] +image = "redis:alpine" +container_name = "mastodon-redis" +networks = ["mastodon"] +restart = "unless-stopped" + + +[networks.mastodon] +external = false + +[networks.proxy] +external = true + +[networks.postgres] +external = true diff --git a/docker/traefik/dynamic.toml b/docker/traefik/dynamic.toml index c22acb69..d2f46eea 100644 --- a/docker/traefik/dynamic.toml +++ b/docker/traefik/dynamic.toml @@ -68,6 +68,9 @@ permanent = true regex = "^https?://www\\.(.+)" replacement = "https://${1}" +[http.serversTransports.ignorecert] +insecureSkipVerify = true + [tls.options.default] minVersion = "VersionTLS12" cipherSuites = [ From 565b730bf1dfe27d0eea5ca732026572b26d1c87 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 00:21:21 +0200 Subject: [PATCH 1718/2667] Add mastodon --- docker/mastodon/docker-compose.toml | 86 +++++++++++++++++++++++++++++ docker/traefik/dynamic.toml | 3 + 2 files changed, 89 insertions(+) create mode 100644 docker/mastodon/docker-compose.toml diff --git a/docker/mastodon/docker-compose.toml b/docker/mastodon/docker-compose.toml new file mode 100644 index 00000000..6f483733 --- /dev/null +++ b/docker/mastodon/docker-compose.toml @@ -0,0 +1,86 @@ +[services.mastodon] +image = "lscr.io/linuxserver/mastodon:latest" +container_name = "mastodon" +restart = "unless-stopped" +env_file = ".env" +environment = [ + "PUID=1000", + "PGID=985", + "TZ=Europe/Helsinki", + "LOCAL_DOMAIN=korhonen.cc", + "WEB_DOMAIN=social.korhonen.cc", + "REDIS_HOST=redis", + "REDIS_PORT=6379", + "DB_HOST=postgres", + "DB_PORT=5432", + "DB_NAME=mastodon", + "DB_USER=mastodon", + "DB_PASS", + "VAPID_PRIVATE_KEY", + "VAPID_PUBLIC_KEY", + "SECRET_KEY_BASE", + "OTP_SECRET", + "SMTP_SERVER=smtp.migadu.com", + "SMTP_PORT=465", + "SMTP_TLS=true", + "SMTP_ENABLE_STARTTLS_AUTO=false", + "SMTP_AUTH_METHOD=plain", + "SMTP_LOGIN", + "SMTP_PASSWORD", + "SMTP_FROM_ADDRESS=social@korhonen.cc", + "S3_ENABLED=false", + "ES_ENABLED=true", + "ES_HOST=elasticsearch", + "ES_PORT=9200", + "ES_USER=elastic", + "ES_PASS=changeme", +] +networks = ["mastodon", "proxy", "postgres"] +volumes = ["/docker/mastodon:/config"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.mastodon-redirect.entrypoints=http", + "traefik.http.routers.mastodon-redirect.rule=Host(`social.korhonen.cc`)", + "traefik.http.routers.mastodon-redirect.middlewares=http2https@file", + "traefik.http.routers.mastodon.entrypoints=https", + "traefik.http.routers.mastodon.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.mastodon.rule=Host(`social.korhonen.cc`)", + "traefik.http.routers.mastodon.service=mastodon", + "traefik.http.services.mastodon.loadbalancer.server.port=443", + "traefik.http.services.mastodon.loadbalancer.server.scheme=https", + "traefik.http.services.mastodon.loadbalancer.serverstransport=ignorecert@file", +] + +[services.elasticsearch] +image = "docker.elastic.co/elasticsearch/elasticsearch:8.5.3" +container_name = "mastodon-elasticsearch" +restart = "unless-stopped" +volumes = ["/docker/mastodon/elasticsearch:/usr/share/elasticsearch/data"] +networks = ["mastodon"] +environment = [ + "cluster.name=mastodon-es-cluster", + "node.name=mastodon-node", + "discovery.type=single-node", + "bootstrap.memory_lock=true", + "ES_JAVA_OPTS=-Xms200m -Xmx200m", +] +[services.elasticsearch.ulimits.memlock] +soft = -1 +hard = -1 + +[services.redis] +image = "redis:alpine" +container_name = "mastodon-redis" +networks = ["mastodon"] +restart = "unless-stopped" + + +[networks.mastodon] +external = false + +[networks.proxy] +external = true + +[networks.postgres] +external = true diff --git a/docker/traefik/dynamic.toml b/docker/traefik/dynamic.toml index c22acb69..d2f46eea 100644 --- a/docker/traefik/dynamic.toml +++ b/docker/traefik/dynamic.toml @@ -68,6 +68,9 @@ permanent = true regex = "^https?://www\\.(.+)" replacement = "https://${1}" +[http.serversTransports.ignorecert] +insecureSkipVerify = true + [tls.options.default] minVersion = "VersionTLS12" cipherSuites = [ From 839c3467773cb2381e38f2244b0bf835552e2f37 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 01:14:59 +0200 Subject: [PATCH 1719/2667] Mastodon: enable OIDC and disable elasticsearch (doesn't work for now) --- docker/mastodon/docker-compose.toml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docker/mastodon/docker-compose.toml b/docker/mastodon/docker-compose.toml index 6f483733..e4ef79e0 100644 --- a/docker/mastodon/docker-compose.toml +++ b/docker/mastodon/docker-compose.toml @@ -29,11 +29,22 @@ environment = [ "SMTP_PASSWORD", "SMTP_FROM_ADDRESS=social@korhonen.cc", "S3_ENABLED=false", - "ES_ENABLED=true", + "ES_ENABLED=false", "ES_HOST=elasticsearch", "ES_PORT=9200", "ES_USER=elastic", "ES_PASS=changeme", + "OIDC_ENABLED=true", + "OMNIAUTH_ONLY=true", + "OIDC_DISPLAY_NAME=Korhonen SSO", + "OIDC_DISCOVERY=true", + "OIDC_AUTH_ENDPOINT=https://sso.korhonen.cc/application/o/mastodon/.well-known/openid-configuration", + "OIDC_ISSUER=https://sso.korhonen.cc/application/o/mastodon/", + "OIDC_SCOPE=openid,profile,email", + "OIDC_UID_FIELD=preferred_username", + "OIDC_CLIENT_ID", + "OIDC_CLIENT_SECRET", + "OIDC_REDIRECT_URI=https://social.korhonen.cc/auth/auth/openid_connect/callback", ] networks = ["mastodon", "proxy", "postgres"] volumes = ["/docker/mastodon:/config"] From 7f54f26daa4369003a7a006a78dff0a602b509af Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 01:14:59 +0200 Subject: [PATCH 1720/2667] Mastodon: enable OIDC and disable elasticsearch (doesn't work for now) --- docker/mastodon/docker-compose.toml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docker/mastodon/docker-compose.toml b/docker/mastodon/docker-compose.toml index 6f483733..e4ef79e0 100644 --- a/docker/mastodon/docker-compose.toml +++ b/docker/mastodon/docker-compose.toml @@ -29,11 +29,22 @@ environment = [ "SMTP_PASSWORD", "SMTP_FROM_ADDRESS=social@korhonen.cc", "S3_ENABLED=false", - "ES_ENABLED=true", + "ES_ENABLED=false", "ES_HOST=elasticsearch", "ES_PORT=9200", "ES_USER=elastic", "ES_PASS=changeme", + "OIDC_ENABLED=true", + "OMNIAUTH_ONLY=true", + "OIDC_DISPLAY_NAME=Korhonen SSO", + "OIDC_DISCOVERY=true", + "OIDC_AUTH_ENDPOINT=https://sso.korhonen.cc/application/o/mastodon/.well-known/openid-configuration", + "OIDC_ISSUER=https://sso.korhonen.cc/application/o/mastodon/", + "OIDC_SCOPE=openid,profile,email", + "OIDC_UID_FIELD=preferred_username", + "OIDC_CLIENT_ID", + "OIDC_CLIENT_SECRET", + "OIDC_REDIRECT_URI=https://social.korhonen.cc/auth/auth/openid_connect/callback", ] networks = ["mastodon", "proxy", "postgres"] volumes = ["/docker/mastodon:/config"] From f7f82b701b4f758a14f31f20d09d75d5ee39493f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 01:16:20 +0200 Subject: [PATCH 1721/2667] Mastodon: add OIDC_SECURITY_ASSUME_EMAIL_IS_VERIFIED=true --- docker/mastodon/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/mastodon/docker-compose.toml b/docker/mastodon/docker-compose.toml index e4ef79e0..1a9067d5 100644 --- a/docker/mastodon/docker-compose.toml +++ b/docker/mastodon/docker-compose.toml @@ -45,6 +45,7 @@ environment = [ "OIDC_CLIENT_ID", "OIDC_CLIENT_SECRET", "OIDC_REDIRECT_URI=https://social.korhonen.cc/auth/auth/openid_connect/callback", + "OIDC_SECURITY_ASSUME_EMAIL_IS_VERIFIED=true", ] networks = ["mastodon", "proxy", "postgres"] volumes = ["/docker/mastodon:/config"] From 8f739a907c397da904d04161d581f2c36a2f68b4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 01:16:20 +0200 Subject: [PATCH 1722/2667] Mastodon: add OIDC_SECURITY_ASSUME_EMAIL_IS_VERIFIED=true --- docker/mastodon/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/mastodon/docker-compose.toml b/docker/mastodon/docker-compose.toml index e4ef79e0..1a9067d5 100644 --- a/docker/mastodon/docker-compose.toml +++ b/docker/mastodon/docker-compose.toml @@ -45,6 +45,7 @@ environment = [ "OIDC_CLIENT_ID", "OIDC_CLIENT_SECRET", "OIDC_REDIRECT_URI=https://social.korhonen.cc/auth/auth/openid_connect/callback", + "OIDC_SECURITY_ASSUME_EMAIL_IS_VERIFIED=true", ] networks = ["mastodon", "proxy", "postgres"] volumes = ["/docker/mastodon:/config"] From 4c2cd632afc04c5b530d3b97b4632cbd8315ef87 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 16:47:20 +0200 Subject: [PATCH 1723/2667] Switch from Mastodon to Misskey --- docker/mastodon/docker-compose.toml | 98 ----------------------------- docker/misskey/docker-compose.toml | 39 ++++++++++++ 2 files changed, 39 insertions(+), 98 deletions(-) delete mode 100644 docker/mastodon/docker-compose.toml create mode 100644 docker/misskey/docker-compose.toml diff --git a/docker/mastodon/docker-compose.toml b/docker/mastodon/docker-compose.toml deleted file mode 100644 index 1a9067d5..00000000 --- a/docker/mastodon/docker-compose.toml +++ /dev/null @@ -1,98 +0,0 @@ -[services.mastodon] -image = "lscr.io/linuxserver/mastodon:latest" -container_name = "mastodon" -restart = "unless-stopped" -env_file = ".env" -environment = [ - "PUID=1000", - "PGID=985", - "TZ=Europe/Helsinki", - "LOCAL_DOMAIN=korhonen.cc", - "WEB_DOMAIN=social.korhonen.cc", - "REDIS_HOST=redis", - "REDIS_PORT=6379", - "DB_HOST=postgres", - "DB_PORT=5432", - "DB_NAME=mastodon", - "DB_USER=mastodon", - "DB_PASS", - "VAPID_PRIVATE_KEY", - "VAPID_PUBLIC_KEY", - "SECRET_KEY_BASE", - "OTP_SECRET", - "SMTP_SERVER=smtp.migadu.com", - "SMTP_PORT=465", - "SMTP_TLS=true", - "SMTP_ENABLE_STARTTLS_AUTO=false", - "SMTP_AUTH_METHOD=plain", - "SMTP_LOGIN", - "SMTP_PASSWORD", - "SMTP_FROM_ADDRESS=social@korhonen.cc", - "S3_ENABLED=false", - "ES_ENABLED=false", - "ES_HOST=elasticsearch", - "ES_PORT=9200", - "ES_USER=elastic", - "ES_PASS=changeme", - "OIDC_ENABLED=true", - "OMNIAUTH_ONLY=true", - "OIDC_DISPLAY_NAME=Korhonen SSO", - "OIDC_DISCOVERY=true", - "OIDC_AUTH_ENDPOINT=https://sso.korhonen.cc/application/o/mastodon/.well-known/openid-configuration", - "OIDC_ISSUER=https://sso.korhonen.cc/application/o/mastodon/", - "OIDC_SCOPE=openid,profile,email", - "OIDC_UID_FIELD=preferred_username", - "OIDC_CLIENT_ID", - "OIDC_CLIENT_SECRET", - "OIDC_REDIRECT_URI=https://social.korhonen.cc/auth/auth/openid_connect/callback", - "OIDC_SECURITY_ASSUME_EMAIL_IS_VERIFIED=true", -] -networks = ["mastodon", "proxy", "postgres"] -volumes = ["/docker/mastodon:/config"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.mastodon-redirect.entrypoints=http", - "traefik.http.routers.mastodon-redirect.rule=Host(`social.korhonen.cc`)", - "traefik.http.routers.mastodon-redirect.middlewares=http2https@file", - "traefik.http.routers.mastodon.entrypoints=https", - "traefik.http.routers.mastodon.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.mastodon.rule=Host(`social.korhonen.cc`)", - "traefik.http.routers.mastodon.service=mastodon", - "traefik.http.services.mastodon.loadbalancer.server.port=443", - "traefik.http.services.mastodon.loadbalancer.server.scheme=https", - "traefik.http.services.mastodon.loadbalancer.serverstransport=ignorecert@file", -] - -[services.elasticsearch] -image = "docker.elastic.co/elasticsearch/elasticsearch:8.5.3" -container_name = "mastodon-elasticsearch" -restart = "unless-stopped" -volumes = ["/docker/mastodon/elasticsearch:/usr/share/elasticsearch/data"] -networks = ["mastodon"] -environment = [ - "cluster.name=mastodon-es-cluster", - "node.name=mastodon-node", - "discovery.type=single-node", - "bootstrap.memory_lock=true", - "ES_JAVA_OPTS=-Xms200m -Xmx200m", -] -[services.elasticsearch.ulimits.memlock] -soft = -1 -hard = -1 - -[services.redis] -image = "redis:alpine" -container_name = "mastodon-redis" -networks = ["mastodon"] -restart = "unless-stopped" - - -[networks.mastodon] -external = false - -[networks.proxy] -external = true - -[networks.postgres] -external = true diff --git a/docker/misskey/docker-compose.toml b/docker/misskey/docker-compose.toml new file mode 100644 index 00000000..3458d57f --- /dev/null +++ b/docker/misskey/docker-compose.toml @@ -0,0 +1,39 @@ +[services.misskey] +image = "misskey/misskey" +container_name = "misskey" +restart = "unless-stopped" +depends_on = ["redis"] +ports = ["3082:3000"] +networks = ["misskey", "proxy", "postgres"] +volumes = [ + "/docker/misskey/files:/misskey/files", + "/docker/misskey/config:/misskey/.config:ro", +] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.misskey-redirect.entrypoints=http", + "traefik.http.routers.misskey-redirect.rule=Host(`social.korhonen.cc`)", + "traefik.http.routers.misskey-redirect.middlewares=http2https@file", + "traefik.http.routers.misskey.entrypoints=https", + "traefik.http.routers.misskey.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.misskey.rule=Host(`social.korhonen.cc`)", + "traefik.http.routers.misskey.service=misskey", + "traefik.http.services.misskey.loadbalancer.server.port=3000", +] + +[services.redis] +image = "redis" +container_name = "misskey-redis" +restart = "unless-stopped" +networks = ["misskey"] +volumes = ["/docker/misskey/redis:/data"] + +[networks.misskey] +internal = true + +[networks.proxy] +external = true + +[networks.postgres] +external = true From d4796ef581d2294a9c1ce3501105d7982af05676 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 16:47:20 +0200 Subject: [PATCH 1724/2667] Switch from Mastodon to Misskey --- docker/mastodon/docker-compose.toml | 98 ----------------------------- docker/misskey/docker-compose.toml | 39 ++++++++++++ 2 files changed, 39 insertions(+), 98 deletions(-) delete mode 100644 docker/mastodon/docker-compose.toml create mode 100644 docker/misskey/docker-compose.toml diff --git a/docker/mastodon/docker-compose.toml b/docker/mastodon/docker-compose.toml deleted file mode 100644 index 1a9067d5..00000000 --- a/docker/mastodon/docker-compose.toml +++ /dev/null @@ -1,98 +0,0 @@ -[services.mastodon] -image = "lscr.io/linuxserver/mastodon:latest" -container_name = "mastodon" -restart = "unless-stopped" -env_file = ".env" -environment = [ - "PUID=1000", - "PGID=985", - "TZ=Europe/Helsinki", - "LOCAL_DOMAIN=korhonen.cc", - "WEB_DOMAIN=social.korhonen.cc", - "REDIS_HOST=redis", - "REDIS_PORT=6379", - "DB_HOST=postgres", - "DB_PORT=5432", - "DB_NAME=mastodon", - "DB_USER=mastodon", - "DB_PASS", - "VAPID_PRIVATE_KEY", - "VAPID_PUBLIC_KEY", - "SECRET_KEY_BASE", - "OTP_SECRET", - "SMTP_SERVER=smtp.migadu.com", - "SMTP_PORT=465", - "SMTP_TLS=true", - "SMTP_ENABLE_STARTTLS_AUTO=false", - "SMTP_AUTH_METHOD=plain", - "SMTP_LOGIN", - "SMTP_PASSWORD", - "SMTP_FROM_ADDRESS=social@korhonen.cc", - "S3_ENABLED=false", - "ES_ENABLED=false", - "ES_HOST=elasticsearch", - "ES_PORT=9200", - "ES_USER=elastic", - "ES_PASS=changeme", - "OIDC_ENABLED=true", - "OMNIAUTH_ONLY=true", - "OIDC_DISPLAY_NAME=Korhonen SSO", - "OIDC_DISCOVERY=true", - "OIDC_AUTH_ENDPOINT=https://sso.korhonen.cc/application/o/mastodon/.well-known/openid-configuration", - "OIDC_ISSUER=https://sso.korhonen.cc/application/o/mastodon/", - "OIDC_SCOPE=openid,profile,email", - "OIDC_UID_FIELD=preferred_username", - "OIDC_CLIENT_ID", - "OIDC_CLIENT_SECRET", - "OIDC_REDIRECT_URI=https://social.korhonen.cc/auth/auth/openid_connect/callback", - "OIDC_SECURITY_ASSUME_EMAIL_IS_VERIFIED=true", -] -networks = ["mastodon", "proxy", "postgres"] -volumes = ["/docker/mastodon:/config"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.mastodon-redirect.entrypoints=http", - "traefik.http.routers.mastodon-redirect.rule=Host(`social.korhonen.cc`)", - "traefik.http.routers.mastodon-redirect.middlewares=http2https@file", - "traefik.http.routers.mastodon.entrypoints=https", - "traefik.http.routers.mastodon.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.mastodon.rule=Host(`social.korhonen.cc`)", - "traefik.http.routers.mastodon.service=mastodon", - "traefik.http.services.mastodon.loadbalancer.server.port=443", - "traefik.http.services.mastodon.loadbalancer.server.scheme=https", - "traefik.http.services.mastodon.loadbalancer.serverstransport=ignorecert@file", -] - -[services.elasticsearch] -image = "docker.elastic.co/elasticsearch/elasticsearch:8.5.3" -container_name = "mastodon-elasticsearch" -restart = "unless-stopped" -volumes = ["/docker/mastodon/elasticsearch:/usr/share/elasticsearch/data"] -networks = ["mastodon"] -environment = [ - "cluster.name=mastodon-es-cluster", - "node.name=mastodon-node", - "discovery.type=single-node", - "bootstrap.memory_lock=true", - "ES_JAVA_OPTS=-Xms200m -Xmx200m", -] -[services.elasticsearch.ulimits.memlock] -soft = -1 -hard = -1 - -[services.redis] -image = "redis:alpine" -container_name = "mastodon-redis" -networks = ["mastodon"] -restart = "unless-stopped" - - -[networks.mastodon] -external = false - -[networks.proxy] -external = true - -[networks.postgres] -external = true diff --git a/docker/misskey/docker-compose.toml b/docker/misskey/docker-compose.toml new file mode 100644 index 00000000..3458d57f --- /dev/null +++ b/docker/misskey/docker-compose.toml @@ -0,0 +1,39 @@ +[services.misskey] +image = "misskey/misskey" +container_name = "misskey" +restart = "unless-stopped" +depends_on = ["redis"] +ports = ["3082:3000"] +networks = ["misskey", "proxy", "postgres"] +volumes = [ + "/docker/misskey/files:/misskey/files", + "/docker/misskey/config:/misskey/.config:ro", +] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.misskey-redirect.entrypoints=http", + "traefik.http.routers.misskey-redirect.rule=Host(`social.korhonen.cc`)", + "traefik.http.routers.misskey-redirect.middlewares=http2https@file", + "traefik.http.routers.misskey.entrypoints=https", + "traefik.http.routers.misskey.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.misskey.rule=Host(`social.korhonen.cc`)", + "traefik.http.routers.misskey.service=misskey", + "traefik.http.services.misskey.loadbalancer.server.port=3000", +] + +[services.redis] +image = "redis" +container_name = "misskey-redis" +restart = "unless-stopped" +networks = ["misskey"] +volumes = ["/docker/misskey/redis:/data"] + +[networks.misskey] +internal = true + +[networks.proxy] +external = true + +[networks.postgres] +external = true From b7159f7057997184916be14a971b22d9fcfe15dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 18:28:15 +0200 Subject: [PATCH 1725/2667] Add elasticsearch to misskey --- docker/misskey/docker-compose.toml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docker/misskey/docker-compose.toml b/docker/misskey/docker-compose.toml index 3458d57f..08cc90d5 100644 --- a/docker/misskey/docker-compose.toml +++ b/docker/misskey/docker-compose.toml @@ -22,6 +22,23 @@ labels = [ "traefik.http.services.misskey.loadbalancer.server.port=3000", ] +[services.elasticsearch] +image = "docker.elastic.co/elasticsearch/elasticsearch:8.5.3" +container_name = "misskey-elasticsearch" +restart = "unless-stopped" +volumes = ["/docker/misskey/elasticsearch:/usr/share/elasticsearch/data"] +networks = ["misskey"] +environment = [ + "cluster.name=misskey-es-cluster", + "node.name=misskey-node", + "discovery.type=single-node", + "bootstrap.memory_lock=true", + "ES_JAVA_OPTS=-Xms200m -Xmx200m", +] +[services.elasticsearch.ulimits.memlock] +soft = -1 +hard = -1 + [services.redis] image = "redis" container_name = "misskey-redis" From 5f0fd57cb32d7a24e0eb05b4f7e076d6270f4a63 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 18:28:15 +0200 Subject: [PATCH 1726/2667] Add elasticsearch to misskey --- docker/misskey/docker-compose.toml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docker/misskey/docker-compose.toml b/docker/misskey/docker-compose.toml index 3458d57f..08cc90d5 100644 --- a/docker/misskey/docker-compose.toml +++ b/docker/misskey/docker-compose.toml @@ -22,6 +22,23 @@ labels = [ "traefik.http.services.misskey.loadbalancer.server.port=3000", ] +[services.elasticsearch] +image = "docker.elastic.co/elasticsearch/elasticsearch:8.5.3" +container_name = "misskey-elasticsearch" +restart = "unless-stopped" +volumes = ["/docker/misskey/elasticsearch:/usr/share/elasticsearch/data"] +networks = ["misskey"] +environment = [ + "cluster.name=misskey-es-cluster", + "node.name=misskey-node", + "discovery.type=single-node", + "bootstrap.memory_lock=true", + "ES_JAVA_OPTS=-Xms200m -Xmx200m", +] +[services.elasticsearch.ulimits.memlock] +soft = -1 +hard = -1 + [services.redis] image = "redis" container_name = "misskey-redis" From 0039ef7d86d0a0726d6b8a3bc870702dd48506b9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 18:55:10 +0200 Subject: [PATCH 1727/2667] Use lower version of elasticsearch form misskey to fix ssl errors --- docker/misskey/docker-compose.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/misskey/docker-compose.toml b/docker/misskey/docker-compose.toml index 08cc90d5..face484e 100644 --- a/docker/misskey/docker-compose.toml +++ b/docker/misskey/docker-compose.toml @@ -23,10 +23,10 @@ labels = [ ] [services.elasticsearch] -image = "docker.elastic.co/elasticsearch/elasticsearch:8.5.3" +image = "docker.elastic.co/elasticsearch/elasticsearch:7.17.8" container_name = "misskey-elasticsearch" restart = "unless-stopped" -volumes = ["/docker/misskey/elasticsearch:/usr/share/elasticsearch/data"] +volumes = ["/docker/misskey/elasticsearch/:/usr/share/elasticsearch/data"] networks = ["misskey"] environment = [ "cluster.name=misskey-es-cluster", From 23ede601ef7551ec1badbfa9a555d17d205b1b6e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 18:55:10 +0200 Subject: [PATCH 1728/2667] Use lower version of elasticsearch form misskey to fix ssl errors --- docker/misskey/docker-compose.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/misskey/docker-compose.toml b/docker/misskey/docker-compose.toml index 08cc90d5..face484e 100644 --- a/docker/misskey/docker-compose.toml +++ b/docker/misskey/docker-compose.toml @@ -23,10 +23,10 @@ labels = [ ] [services.elasticsearch] -image = "docker.elastic.co/elasticsearch/elasticsearch:8.5.3" +image = "docker.elastic.co/elasticsearch/elasticsearch:7.17.8" container_name = "misskey-elasticsearch" restart = "unless-stopped" -volumes = ["/docker/misskey/elasticsearch:/usr/share/elasticsearch/data"] +volumes = ["/docker/misskey/elasticsearch/:/usr/share/elasticsearch/data"] networks = ["misskey"] environment = [ "cluster.name=misskey-es-cluster", From 302aeb40b98deb19801f65a48f2ddaf05f818e0e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Dec 2022 22:22:12 +0200 Subject: [PATCH 1729/2667] Add wkd service --- docker/wkd/docker-compose.toml | 21 +++++++++++++++++++++ docker/wkd/nginx.conf | 10 ++++++++++ 2 files changed, 31 insertions(+) create mode 100644 docker/wkd/docker-compose.toml create mode 100644 docker/wkd/nginx.conf diff --git a/docker/wkd/docker-compose.toml b/docker/wkd/docker-compose.toml new file mode 100644 index 00000000..7e3a707e --- /dev/null +++ b/docker/wkd/docker-compose.toml @@ -0,0 +1,21 @@ +[services.wkd] +image = "nginx" +container_name = "wkd" +volumes = [ + "/var/www/wkd:/wkd:ro", + "./nginx.conf:/etc/nginx/conf.d/default.conf", +] +networks = ["proxy"] +restart = "unless-stopped" +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.wkd.entrypoints=https", + "traefik.http.routers.wkd.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.wkd.rule=Host(`openpgpkey.korhonen.cc`)", + "traefik.http.routers.wkd.service=wkd", + "traefik.http.services.wkd.loadbalancer.server.port=80", +] + +[networks.proxy] +external = true diff --git a/docker/wkd/nginx.conf b/docker/wkd/nginx.conf new file mode 100644 index 00000000..bab4f165 --- /dev/null +++ b/docker/wkd/nginx.conf @@ -0,0 +1,10 @@ +server { + listen 80; + listen [::]:80; + + location /.well-known/openpgpkey/hu/ { + default_type "application/octet-stream"; + add_header Access-Control-Allow-Origin * always; + } +} + From cd4096e3c0e623bd7dedc9b67c8304ea3342142b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Dec 2022 22:22:12 +0200 Subject: [PATCH 1730/2667] Add wkd service --- docker/wkd/docker-compose.toml | 21 +++++++++++++++++++++ docker/wkd/nginx.conf | 10 ++++++++++ 2 files changed, 31 insertions(+) create mode 100644 docker/wkd/docker-compose.toml create mode 100644 docker/wkd/nginx.conf diff --git a/docker/wkd/docker-compose.toml b/docker/wkd/docker-compose.toml new file mode 100644 index 00000000..7e3a707e --- /dev/null +++ b/docker/wkd/docker-compose.toml @@ -0,0 +1,21 @@ +[services.wkd] +image = "nginx" +container_name = "wkd" +volumes = [ + "/var/www/wkd:/wkd:ro", + "./nginx.conf:/etc/nginx/conf.d/default.conf", +] +networks = ["proxy"] +restart = "unless-stopped" +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.wkd.entrypoints=https", + "traefik.http.routers.wkd.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.wkd.rule=Host(`openpgpkey.korhonen.cc`)", + "traefik.http.routers.wkd.service=wkd", + "traefik.http.services.wkd.loadbalancer.server.port=80", +] + +[networks.proxy] +external = true diff --git a/docker/wkd/nginx.conf b/docker/wkd/nginx.conf new file mode 100644 index 00000000..bab4f165 --- /dev/null +++ b/docker/wkd/nginx.conf @@ -0,0 +1,10 @@ +server { + listen 80; + listen [::]:80; + + location /.well-known/openpgpkey/hu/ { + default_type "application/octet-stream"; + add_header Access-Control-Allow-Origin * always; + } +} + From c6c659c6f73208433bc5a6fce008deeb1e9acce4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Dec 2022 22:25:13 +0200 Subject: [PATCH 1731/2667] Add root directive to wkd --- docker/wkd/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/wkd/nginx.conf b/docker/wkd/nginx.conf index bab4f165..f52c733a 100644 --- a/docker/wkd/nginx.conf +++ b/docker/wkd/nginx.conf @@ -1,6 +1,7 @@ server { listen 80; listen [::]:80; + root /wkd location /.well-known/openpgpkey/hu/ { default_type "application/octet-stream"; From 6a7afb20d2f1fe48108fe9e97c72448212482f01 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Dec 2022 22:25:13 +0200 Subject: [PATCH 1732/2667] Add root directive to wkd --- docker/wkd/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/wkd/nginx.conf b/docker/wkd/nginx.conf index bab4f165..f52c733a 100644 --- a/docker/wkd/nginx.conf +++ b/docker/wkd/nginx.conf @@ -1,6 +1,7 @@ server { listen 80; listen [::]:80; + root /wkd location /.well-known/openpgpkey/hu/ { default_type "application/octet-stream"; From afc83ce7dc8329d222d74c8cd5aa3211d8e267d5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Dec 2022 22:45:00 +0200 Subject: [PATCH 1733/2667] Fix wkd nginx conf and add root redirect to my keyoxide profile --- docker/wkd/nginx.conf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docker/wkd/nginx.conf b/docker/wkd/nginx.conf index f52c733a..e4ebdac9 100644 --- a/docker/wkd/nginx.conf +++ b/docker/wkd/nginx.conf @@ -1,11 +1,15 @@ server { listen 80; listen [::]:80; - root /wkd + root /wkd; - location /.well-known/openpgpkey/hu/ { + location /.well-known/openpgpkey/korhonen.cc/hu/ { default_type "application/octet-stream"; add_header Access-Control-Allow-Origin * always; } + + location / { + return 301 https://keyoxide.org/wkd/marko%40korhonen.cc; + } } From 3a0e4314571b8baee37fbc65f3cfc52fc7428a8e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Dec 2022 22:45:00 +0200 Subject: [PATCH 1734/2667] Fix wkd nginx conf and add root redirect to my keyoxide profile --- docker/wkd/nginx.conf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docker/wkd/nginx.conf b/docker/wkd/nginx.conf index f52c733a..e4ebdac9 100644 --- a/docker/wkd/nginx.conf +++ b/docker/wkd/nginx.conf @@ -1,11 +1,15 @@ server { listen 80; listen [::]:80; - root /wkd + root /wkd; - location /.well-known/openpgpkey/hu/ { + location /.well-known/openpgpkey/korhonen.cc/hu/ { default_type "application/octet-stream"; add_header Access-Control-Allow-Origin * always; } + + location / { + return 301 https://keyoxide.org/wkd/marko%40korhonen.cc; + } } From ce45ae465c01af8c0669a8b55ef8a16e3ef0633a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Dec 2022 09:31:16 +0200 Subject: [PATCH 1735/2667] Update mkinitcpio setting name --- root/etc/mkinitcpio.d/linux-zen.preset | 2 +- root/etc/mkinitcpio.d/linux.preset | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/mkinitcpio.d/linux-zen.preset b/root/etc/mkinitcpio.d/linux-zen.preset index 82ed3f2e..f46cff31 100644 --- a/root/etc/mkinitcpio.d/linux-zen.preset +++ b/root/etc/mkinitcpio.d/linux-zen.preset @@ -5,4 +5,4 @@ ALL_kver="/boot/vmlinuz-linux-zen" ALL_microcode=(/boot/*-ucode.img) default_image="/boot/initramfs-linux-zen.img" -default_efi_image="/boot/EFI/Linux/archlinux-linux-zen.efi" +default_uki="/boot/EFI/Linux/archlinux-linux-zen.efi" diff --git a/root/etc/mkinitcpio.d/linux.preset b/root/etc/mkinitcpio.d/linux.preset index 600f2dbc..6c83b24f 100644 --- a/root/etc/mkinitcpio.d/linux.preset +++ b/root/etc/mkinitcpio.d/linux.preset @@ -5,4 +5,4 @@ ALL_kver="/boot/vmlinuz-linux" ALL_microcode=(/boot/*-ucode.img) default_image="/boot/initramfs-linux.img" -default_efi_image="/boot/EFI/Linux/archlinux-linux.efi" +default_uki="/boot/EFI/Linux/archlinux-linux.efi" From 924c957472e6533cd835c7b9caad6c7b7027b515 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Dec 2022 09:31:16 +0200 Subject: [PATCH 1736/2667] Update mkinitcpio setting name --- root/etc/mkinitcpio.d/linux-zen.preset | 2 +- root/etc/mkinitcpio.d/linux.preset | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/mkinitcpio.d/linux-zen.preset b/root/etc/mkinitcpio.d/linux-zen.preset index 82ed3f2e..f46cff31 100644 --- a/root/etc/mkinitcpio.d/linux-zen.preset +++ b/root/etc/mkinitcpio.d/linux-zen.preset @@ -5,4 +5,4 @@ ALL_kver="/boot/vmlinuz-linux-zen" ALL_microcode=(/boot/*-ucode.img) default_image="/boot/initramfs-linux-zen.img" -default_efi_image="/boot/EFI/Linux/archlinux-linux-zen.efi" +default_uki="/boot/EFI/Linux/archlinux-linux-zen.efi" diff --git a/root/etc/mkinitcpio.d/linux.preset b/root/etc/mkinitcpio.d/linux.preset index 600f2dbc..6c83b24f 100644 --- a/root/etc/mkinitcpio.d/linux.preset +++ b/root/etc/mkinitcpio.d/linux.preset @@ -5,4 +5,4 @@ ALL_kver="/boot/vmlinuz-linux" ALL_microcode=(/boot/*-ucode.img) default_image="/boot/initramfs-linux.img" -default_efi_image="/boot/EFI/Linux/archlinux-linux.efi" +default_uki="/boot/EFI/Linux/archlinux-linux.efi" From a5e0572f18c5e0e314f8806d2a38e2a947d49531 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 9 Jan 2023 09:10:16 +0200 Subject: [PATCH 1737/2667] nvim: add cmp cmdline and firenvim settings --- home/.config/nvim/lua/plugins/cmp.lua | 22 ++++++++++++++++++++++ home/.config/nvim/lua/plugins/firenvim.lua | 7 +++++++ home/.config/nvim/lua/plugins/init.lua | 4 ++++ 3 files changed, 33 insertions(+) create mode 100644 home/.config/nvim/lua/plugins/firenvim.lua diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 146f206e..e60fc0f5 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -62,4 +62,26 @@ return function() -- on completion local cmp_autopairs = require("nvim-autopairs.completion.cmp") cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) + + -- `/` cmdline setup. + cmp.setup.cmdline("/", { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = "buffer" }, + }, + }) + -- `:` cmdline setup. + cmp.setup.cmdline(":", { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = "path" }, + }, { + { + name = "cmdline", + option = { + ignore_cmds = { "Man", "!" }, + }, + }, + }), + }) end diff --git a/home/.config/nvim/lua/plugins/firenvim.lua b/home/.config/nvim/lua/plugins/firenvim.lua new file mode 100644 index 00000000..7c316a24 --- /dev/null +++ b/home/.config/nvim/lua/plugins/firenvim.lua @@ -0,0 +1,7 @@ +vim.g.firenvim_config = { + localSettings = { + [".*"] = { + takeOver = "never", + }, + }, +} diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 614a08c2..cce90e28 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -133,6 +133,7 @@ require("packer").startup(function() { "hrsh7th/cmp-nvim-lsp" }, -- LSP source { "hrsh7th/cmp-nvim-lua" }, -- Neovim Lua API documentation source { "hrsh7th/cmp-path" }, -- Path source + { "hrsh7th/cmp-cmdline" }, -- cmdline source { "saadparwaiz1/cmp_luasnip" }, -- Snippets source }, config = require("plugins.cmp"), @@ -183,6 +184,9 @@ require("packer").startup(function() run = function() vim.fn["firenvim#install"](0) end, + setup = function() + require("plugins/firenvim") + end, }) -- Vim <3 Asciidoctor From 7c8aba1a0646eb1d78c1af6c7a186bf55fa20c1d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 9 Jan 2023 09:10:16 +0200 Subject: [PATCH 1738/2667] nvim: add cmp cmdline and firenvim settings --- home/.config/nvim/lua/plugins/cmp.lua | 22 ++++++++++++++++++++++ home/.config/nvim/lua/plugins/firenvim.lua | 7 +++++++ home/.config/nvim/lua/plugins/init.lua | 4 ++++ 3 files changed, 33 insertions(+) create mode 100644 home/.config/nvim/lua/plugins/firenvim.lua diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 146f206e..e60fc0f5 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -62,4 +62,26 @@ return function() -- on completion local cmp_autopairs = require("nvim-autopairs.completion.cmp") cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) + + -- `/` cmdline setup. + cmp.setup.cmdline("/", { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = "buffer" }, + }, + }) + -- `:` cmdline setup. + cmp.setup.cmdline(":", { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = "path" }, + }, { + { + name = "cmdline", + option = { + ignore_cmds = { "Man", "!" }, + }, + }, + }), + }) end diff --git a/home/.config/nvim/lua/plugins/firenvim.lua b/home/.config/nvim/lua/plugins/firenvim.lua new file mode 100644 index 00000000..7c316a24 --- /dev/null +++ b/home/.config/nvim/lua/plugins/firenvim.lua @@ -0,0 +1,7 @@ +vim.g.firenvim_config = { + localSettings = { + [".*"] = { + takeOver = "never", + }, + }, +} diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 614a08c2..cce90e28 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -133,6 +133,7 @@ require("packer").startup(function() { "hrsh7th/cmp-nvim-lsp" }, -- LSP source { "hrsh7th/cmp-nvim-lua" }, -- Neovim Lua API documentation source { "hrsh7th/cmp-path" }, -- Path source + { "hrsh7th/cmp-cmdline" }, -- cmdline source { "saadparwaiz1/cmp_luasnip" }, -- Snippets source }, config = require("plugins.cmp"), @@ -183,6 +184,9 @@ require("packer").startup(function() run = function() vim.fn["firenvim#install"](0) end, + setup = function() + require("plugins/firenvim") + end, }) -- Vim <3 Asciidoctor From 99afafc73e38af7d8ea00c42a2ecd1e8b733ba6c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 27 Jan 2023 20:40:27 +0200 Subject: [PATCH 1739/2667] Remove plymouth from mirkwood --- root/etc/mkinitcpio.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 9b5d4dc4..56b0307a 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -4,7 +4,8 @@ BINARIES=("/usr/bin/btrfs") FILES=() {%@@ if profile == "Mirkwood" @@%} -HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) +#HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) +HOOKS=(base udev kms keyboard autodetect modconf block filesystems btrfs encrypt fsck) {%@@ elif profile == 'Moria' @@%} #HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) HOOKS=(base udev kms keyboard autodetect modconf block netconf dropbear encryptssh filesystems btrfs fsck) From a1542cd5e2ed816e1724b103ed04500712496b8c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 27 Jan 2023 20:40:27 +0200 Subject: [PATCH 1740/2667] Remove plymouth from mirkwood --- root/etc/mkinitcpio.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 9b5d4dc4..56b0307a 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -4,7 +4,8 @@ BINARIES=("/usr/bin/btrfs") FILES=() {%@@ if profile == "Mirkwood" @@%} -HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) +#HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) +HOOKS=(base udev kms keyboard autodetect modconf block filesystems btrfs encrypt fsck) {%@@ elif profile == 'Moria' @@%} #HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) HOOKS=(base udev kms keyboard autodetect modconf block netconf dropbear encryptssh filesystems btrfs fsck) From c98e079f20db1514cb713782f758e0cbc98611f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 27 Jan 2023 20:41:23 +0200 Subject: [PATCH 1741/2667] Change gitea host name to forgejo in ssh config --- home/.ssh/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.ssh/config b/home/.ssh/config index 25e376ee..3ddaaa78 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -16,7 +16,7 @@ host moria # Forward SSH agent RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/1000/gnupg/S.gpg-agent.ssh -host gitea +host forgejo HostName korhonen.cc user git From 31cb691feb1e2044c631623640f7eb21e873ff44 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 27 Jan 2023 20:41:23 +0200 Subject: [PATCH 1742/2667] Change gitea host name to forgejo in ssh config --- home/.ssh/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.ssh/config b/home/.ssh/config index 25e376ee..3ddaaa78 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -16,7 +16,7 @@ host moria # Forward SSH agent RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/1000/gnupg/S.gpg-agent.ssh -host gitea +host forgejo HostName korhonen.cc user git From 5dcfd727abae7668f01027836e352cf7e16b1dc4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 27 Jan 2023 20:57:02 +0200 Subject: [PATCH 1743/2667] Disable yubikey auto lock on mirkwood --- config-root.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/config-root.toml b/config-root.toml index d878f57d..23226572 100644 --- a/config-root.toml +++ b/config-root.toml @@ -200,7 +200,6 @@ dotfiles = [ "f_system.conf", "f_timesyncd.conf", "f_welcomemessage.conf", - "f_yubikey_udev.rules", ] include = ["Locale", "Pacman", "Network"] From 8ec669e136109b428fa6b04cf8887855636a43c0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 27 Jan 2023 20:57:02 +0200 Subject: [PATCH 1744/2667] Disable yubikey auto lock on mirkwood --- config-root.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/config-root.toml b/config-root.toml index d878f57d..23226572 100644 --- a/config-root.toml +++ b/config-root.toml @@ -200,7 +200,6 @@ dotfiles = [ "f_system.conf", "f_timesyncd.conf", "f_welcomemessage.conf", - "f_yubikey_udev.rules", ] include = ["Locale", "Pacman", "Network"] From 9cb6ad7008d0f048691a46559486623bc8325474 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Jan 2023 12:34:26 +0200 Subject: [PATCH 1745/2667] Fix forgejo log path for fail2ban --- docker/traefik/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index 3d0d7aee..4f10a200 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -44,7 +44,7 @@ volumes = [ "/etc/localtime:/etc/localtime:ro", "/docker/traefik/traefik/log:/var/log/traefik:ro", "/docker/traefik/fail2ban:/data", - "/docker/gitea/gitea/log/gitea.log:/var/log/gitea:ro", + "/docker/forgejo/gitea/log/gitea.log:/var/log/forgejo:ro", "/docker/homeautomation/home-assistant/home-assistant.log:/var/log/hass", "/mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro", ] From 80c970ae7c90a6747055e6fe6004e64d86040dff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Jan 2023 12:34:26 +0200 Subject: [PATCH 1746/2667] Fix forgejo log path for fail2ban --- docker/traefik/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml index 3d0d7aee..4f10a200 100644 --- a/docker/traefik/docker-compose.toml +++ b/docker/traefik/docker-compose.toml @@ -44,7 +44,7 @@ volumes = [ "/etc/localtime:/etc/localtime:ro", "/docker/traefik/traefik/log:/var/log/traefik:ro", "/docker/traefik/fail2ban:/data", - "/docker/gitea/gitea/log/gitea.log:/var/log/gitea:ro", + "/docker/forgejo/gitea/log/gitea.log:/var/log/forgejo:ro", "/docker/homeautomation/home-assistant/home-assistant.log:/var/log/hass", "/mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro", ] From 9b569a2266cef5f9811751a56606fe50989d9ae0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Jan 2023 22:38:14 +0200 Subject: [PATCH 1747/2667] Remove wayland clipboard workaround --- home/.config/nvim/lua/settings.lua | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index df96b511..213fa747 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -53,22 +53,3 @@ g.mapleader = " " o.tabstop = 4 o.shiftwidth = 4 o.smartindent = true - --- Wayland clipboard provider that strips carriage returns (GTK3 issue). --- This is needed because currently there's an issue where GTK3 applications on --- Wayland contain carriage returns at the end of the lines (this is a root --- issue that needs to be fixed). -vim.cmd([[ -let g:clipboard = { - \ 'name': 'wayland-strip-carriage', - \ 'copy': { - \ '+': 'wl-copy --foreground --type text/plain', - \ '*': 'wl-copy --foreground --type text/plain --primary', - \ }, - \ 'paste': { - \ '+': {-> systemlist('wl-paste --no-newline | tr -d "\r"')}, - \ '*': {-> systemlist('wl-paste --no-newline --primary | tr -d "\r"')}, - \ }, - \ 'cache_enabled': 1, - \ } -]]) From b8d84d1e4b7827f667325acd70af356f843be8a4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Jan 2023 22:38:14 +0200 Subject: [PATCH 1748/2667] Remove wayland clipboard workaround --- home/.config/nvim/lua/settings.lua | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index df96b511..213fa747 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -53,22 +53,3 @@ g.mapleader = " " o.tabstop = 4 o.shiftwidth = 4 o.smartindent = true - --- Wayland clipboard provider that strips carriage returns (GTK3 issue). --- This is needed because currently there's an issue where GTK3 applications on --- Wayland contain carriage returns at the end of the lines (this is a root --- issue that needs to be fixed). -vim.cmd([[ -let g:clipboard = { - \ 'name': 'wayland-strip-carriage', - \ 'copy': { - \ '+': 'wl-copy --foreground --type text/plain', - \ '*': 'wl-copy --foreground --type text/plain --primary', - \ }, - \ 'paste': { - \ '+': {-> systemlist('wl-paste --no-newline | tr -d "\r"')}, - \ '*': {-> systemlist('wl-paste --no-newline --primary | tr -d "\r"')}, - \ }, - \ 'cache_enabled': 1, - \ } -]]) From 75a7cf6d0746704aae163523f5507587ce21e30d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Jan 2023 22:43:39 +0200 Subject: [PATCH 1749/2667] Nvim: Use relative line numbers --- home/.config/nvim/lua/settings.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 213fa747..e4c094e4 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -1,6 +1,9 @@ local o = vim.o local g = vim.g +-- Relative line numbers +o.relativenumber = true + -- True colors o.termguicolors = true From 08bb0e0296c3439ebf7d9a15995d9c494c90a9be Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Jan 2023 22:43:39 +0200 Subject: [PATCH 1750/2667] Nvim: Use relative line numbers --- home/.config/nvim/lua/settings.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 213fa747..e4c094e4 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -1,6 +1,9 @@ local o = vim.o local g = vim.g +-- Relative line numbers +o.relativenumber = true + -- True colors o.termguicolors = true From d2f47aa2f9c16757b94e95b8ec1c617142d4cdc8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 19 Feb 2023 20:03:22 +0200 Subject: [PATCH 1751/2667] Neovim: change sumneko to lua_ls --- home/.config/nvim/lua/plugins/lspconfig.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 6dc0e36e..a694e260 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -10,7 +10,7 @@ Servers = { yamlls = {}, taplo = {}, tsserver = {}, - sumneko_lua = { + lua_ls = { Lua = { runtime = { -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) From 47233b088f197b40edc13455cdfdc862c518546b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 19 Feb 2023 20:03:22 +0200 Subject: [PATCH 1752/2667] Neovim: change sumneko to lua_ls --- home/.config/nvim/lua/plugins/lspconfig.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 6dc0e36e..a694e260 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -10,7 +10,7 @@ Servers = { yamlls = {}, taplo = {}, tsserver = {}, - sumneko_lua = { + lua_ls = { Lua = { runtime = { -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) From d08f08d572b9734238a7356143f7032d2874003a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Feb 2023 16:10:32 +0200 Subject: [PATCH 1753/2667] Neovim: add cmp-spell source --- home/.config/nvim/lua/plugins/cmp.lua | 1 + home/.config/nvim/lua/plugins/init.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index e60fc0f5..a4e7d085 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -55,6 +55,7 @@ return function() { name = "nvim_lsp" }, { name = "nvim_lua" }, { name = "path" }, + { name = "spell" }, }, }) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index cce90e28..5bf40e0a 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -135,6 +135,7 @@ require("packer").startup(function() { "hrsh7th/cmp-path" }, -- Path source { "hrsh7th/cmp-cmdline" }, -- cmdline source { "saadparwaiz1/cmp_luasnip" }, -- Snippets source + { "f3fora/cmp-spell" }, -- Spell check source }, config = require("plugins.cmp"), }) From 13ad1b7e88fefbec4a429c8466cc2126d336ff64 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Feb 2023 16:10:32 +0200 Subject: [PATCH 1754/2667] Neovim: add cmp-spell source --- home/.config/nvim/lua/plugins/cmp.lua | 1 + home/.config/nvim/lua/plugins/init.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index e60fc0f5..a4e7d085 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -55,6 +55,7 @@ return function() { name = "nvim_lsp" }, { name = "nvim_lua" }, { name = "path" }, + { name = "spell" }, }, }) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index cce90e28..5bf40e0a 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -135,6 +135,7 @@ require("packer").startup(function() { "hrsh7th/cmp-path" }, -- Path source { "hrsh7th/cmp-cmdline" }, -- cmdline source { "saadparwaiz1/cmp_luasnip" }, -- Snippets source + { "f3fora/cmp-spell" }, -- Spell check source }, config = require("plugins.cmp"), }) From da72520c7bd26446f165d90d3f20a4c524f6a44d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Feb 2023 11:31:20 +0200 Subject: [PATCH 1755/2667] Add neovim config luarc --- home/.config/nvim/lua/.luarc.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 home/.config/nvim/lua/.luarc.json diff --git a/home/.config/nvim/lua/.luarc.json b/home/.config/nvim/lua/.luarc.json new file mode 100644 index 00000000..23b9ee27 --- /dev/null +++ b/home/.config/nvim/lua/.luarc.json @@ -0,0 +1,3 @@ +{ + "workspace.checkThirdParty": false +} \ No newline at end of file From 8f74a04d5d82d6f02bf3a487dfa86ad24a531d84 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Feb 2023 11:31:20 +0200 Subject: [PATCH 1756/2667] Add neovim config luarc --- home/.config/nvim/lua/.luarc.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 home/.config/nvim/lua/.luarc.json diff --git a/home/.config/nvim/lua/.luarc.json b/home/.config/nvim/lua/.luarc.json new file mode 100644 index 00000000..23b9ee27 --- /dev/null +++ b/home/.config/nvim/lua/.luarc.json @@ -0,0 +1,3 @@ +{ + "workspace.checkThirdParty": false +} \ No newline at end of file From 884e29d6f2382df0609fa6aeaace37d9774c1b01 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Feb 2023 11:33:35 +0200 Subject: [PATCH 1757/2667] Neovim: add schema for luarc --- home/.config/nvim/lua/.luarc.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/.luarc.json b/home/.config/nvim/lua/.luarc.json index 23b9ee27..03c8166d 100644 --- a/home/.config/nvim/lua/.luarc.json +++ b/home/.config/nvim/lua/.luarc.json @@ -1,3 +1,4 @@ { - "workspace.checkThirdParty": false -} \ No newline at end of file + "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json", + "workspace.checkThirdParty": false +} From a8211ed1d8bd88539d7003cf5e12476ff3fe3f41 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Feb 2023 11:33:35 +0200 Subject: [PATCH 1758/2667] Neovim: add schema for luarc --- home/.config/nvim/lua/.luarc.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/.luarc.json b/home/.config/nvim/lua/.luarc.json index 23b9ee27..03c8166d 100644 --- a/home/.config/nvim/lua/.luarc.json +++ b/home/.config/nvim/lua/.luarc.json @@ -1,3 +1,4 @@ { - "workspace.checkThirdParty": false -} \ No newline at end of file + "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json", + "workspace.checkThirdParty": false +} From 409ae40b9e4d1e7086d71cd808e134621b25879a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Feb 2023 14:45:30 +0200 Subject: [PATCH 1759/2667] Nvim: change package manager from packer to lazy --- config.toml | 2 - home/.config/nvim/lua/plugins/firenvim.lua | 7 - home/.config/nvim/lua/plugins/init.lua | 211 +++++++++------------ home/.config/nvim/lua/settings.lua | 9 + home/.config/zsh/04-aliases.zsh | 2 +- 5 files changed, 102 insertions(+), 129 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/firenvim.lua diff --git a/config.toml b/config.toml index 9d9e8f71..80ff672c 100644 --- a/config.toml +++ b/config.toml @@ -1,5 +1,4 @@ [actions] -nvim-packer-sync = "nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync'" dconf-load = "dconf load / < ~/.config/dconf.ini" [config] @@ -32,7 +31,6 @@ dst = "~/.config/imapnotify" src = ".config/imapnotify" [dotfiles.d_nvim] -actions = ["nvim-packer-sync"] dst = "~/.config/nvim" src = ".config/nvim" diff --git a/home/.config/nvim/lua/plugins/firenvim.lua b/home/.config/nvim/lua/plugins/firenvim.lua deleted file mode 100644 index 7c316a24..00000000 --- a/home/.config/nvim/lua/plugins/firenvim.lua +++ /dev/null @@ -1,7 +0,0 @@ -vim.g.firenvim_config = { - localSettings = { - [".*"] = { - takeOver = "never", - }, - }, -} diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 5bf40e0a..a5c11ac9 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -1,229 +1,202 @@ -local fn = vim.fn - --- Install packer if it's not yet installed -local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" -if fn.empty(fn.glob(install_path)) > 0 then - print("Installing Packer") - Packer_bootstrap = fn.system({ +-- Install lazy if it's not yet installed +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ "git", "clone", - "--depth", - "1", - "https://github.com/wbthomason/packer.nvim", - install_path, + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, }) - vim.cmd([[packadd packer.nvim]]) - print("Installed Packer") end +vim.opt.rtp:prepend(lazypath) --- Configure packer -require("packer").startup(function() - local use = require("packer").use - - -- The plugin manager itself - use({ "wbthomason/packer.nvim" }) - +-- Configure lazy +local plugins = { -- Colorscheme - use({ + { "rebelot/kanagawa.nvim", config = function() vim.cmd("colorscheme kanagawa") end, - }) + }, -- Statusline - use({ + { "nvim-lualine/lualine.nvim", - requires = { "kyazdani42/nvim-web-devicons", opt = true }, + dependencies = { "kyazdani42/nvim-web-devicons" }, config = require("plugins.lualine"), - }) - - -- Startup screen/dashboard - --use 'glepnir/dashboard-nvim' + }, -- Git status in signcolumn - use({ + { "lewis6991/gitsigns.nvim", - config = function() - require("gitsigns").setup() - end, - }) + config = true, + }, -- Tabline/bufferline - use({ - "akinsho/nvim-bufferline.lua", - tag = "*", - requires = "kyazdani42/nvim-web-devicons", - config = function() - require("bufferline").setup({}) - end, - }) + { + "akinsho/bufferline.nvim", + version = "v3.*", + dependencies = { "kyazdani42/nvim-web-devicons" }, + config = true, + }, -- Git commands - use("tpope/vim-fugitive") + "tpope/vim-fugitive", -- Indent characters - use({ + { "lukas-reineke/indent-blankline.nvim", config = require("plugins.indent-blankline"), - }) + }, -- Tree explorer - use({ + { "kyazdani42/nvim-tree.lua", - requires = "kyazdani42/nvim-web-devicons", + dependencies = { "kyazdani42/nvim-web-devicons" }, config = require("plugins.nvim-tree"), - }) + }, -- Telescope - use({ + { "nvim-telescope/telescope.nvim", config = require("plugins.telescope"), - requires = { - { "nvim-lua/plenary.nvim" }, -- Internal dep for telescope - { "nvim-telescope/telescope-fzf-native.nvim", run = "make" }, -- Use fzf for fuzzy finder - { "nvim-telescope/telescope-ui-select.nvim" }, -- Replace vim built in select with telescope - { "zane-/cder.nvim" }, -- cd plugin for telescope + dependencies = { + "nvim-lua/plenary.nvim", -- Internal dep for telescope + -- Use fzf for fuzzy finder + { + "nvim-telescope/telescope-fzf-native.nvim", + build = "make", + }, + "nvim-telescope/telescope-ui-select.nvim", -- Replace vim built in select with telescope + "zane-/cder.nvim", -- cd plugin for telescope }, - }) - + }, -- Do stuff as sudo - use("lambdalisue/suda.vim") + "lambdalisue/suda.vim", -- Display possible keybinds - use({ "folke/which-key.nvim", config = require("plugins.which-key") }) + { "folke/which-key.nvim", config = require("plugins.which-key") }, -- Read editorconfig settings - use("editorconfig/editorconfig-vim") + "editorconfig/editorconfig-vim", -- Package manager for LSP servers, DAP servers etc. - use({ "williamboman/mason.nvim", config = require("plugins.mason").setup }) + { "williamboman/mason.nvim", config = require("plugins.mason").setup }, -- Install LSP server executables with Mason - use({ + { "williamboman/mason-lspconfig.nvim", config = require("plugins.mason").lspconfig_setup, - }) + }, -- Configs for built-in LSP - use({ "neovim/nvim-lspconfig", config = require("plugins.lspconfig").setup }) + { "neovim/nvim-lspconfig", config = require("plugins.lspconfig").setup }, -- Additional LSP features for Java - use("mfussenegger/nvim-jdtls") + "mfussenegger/nvim-jdtls", -- Display function signature - use("ray-x/lsp_signature.nvim") + "ray-x/lsp_signature.nvim", -- Snippets plugin - use({ + { "L3MON4D3/LuaSnip", - requires = { "rafamadriz/friendly-snippets" }, -- Snippets collection + dependencies = { "rafamadriz/friendly-snippets" }, -- Snippets collection config = require("plugins.luasnip"), - }) + }, -- vim api documentation for lua lsp - use({ "ii14/emmylua-nvim" }) + { "ii14/emmylua-nvim" }, -- Completion - use({ + { "hrsh7th/nvim-cmp", - requires = { - { "hrsh7th/cmp-buffer" }, -- Buffer source - { "petertriho/cmp-git", requires = "nvim-lua/plenary.nvim" }, -- Git source - { "hrsh7th/cmp-nvim-lsp" }, -- LSP source - { "hrsh7th/cmp-nvim-lua" }, -- Neovim Lua API documentation source - { "hrsh7th/cmp-path" }, -- Path source - { "hrsh7th/cmp-cmdline" }, -- cmdline source - { "saadparwaiz1/cmp_luasnip" }, -- Snippets source - { "f3fora/cmp-spell" }, -- Spell check source + dependencies = { + "hrsh7th/cmp-buffer", -- Buffer source + { "petertriho/cmp-git", dependencies = { "nvim-lua/plenary.nvim" } }, -- Git source + "hrsh7th/cmp-nvim-lsp", -- LSP source + "hrsh7th/cmp-nvim-lua", -- Neovim Lua API documentation source + "hrsh7th/cmp-path", -- Path source + "hrsh7th/cmp-cmdline", -- cmdline source + "saadparwaiz1/cmp_luasnip", -- Snippets source + "f3fora/cmp-spell", -- Spell check source }, config = require("plugins.cmp"), - }) + }, -- Automatic brackets - use({ + { "windwp/nvim-autopairs", - config = function() - require("nvim-autopairs").setup({}) - end, - }) + config = true, + }, -- treesitter - use({ + { "nvim-treesitter/nvim-treesitter", - run = function() + build = function() require("nvim-treesitter.install").update({ with_sync = true }) end, config = require("plugins.treesitter"), - }) + }, -- treesitter plugin for commentstring - use("JoosepAlviste/nvim-ts-context-commentstring") + "JoosepAlviste/nvim-ts-context-commentstring", -- Additional plugins for formats not supported -- by treesitter - use("jamespeapen/swayconfig.vim") + "jamespeapen/swayconfig.vim", -- mappings for commenting in code - use("tpope/vim-commentary") + "tpope/vim-commentary", -- we all know this one - use("tpope/vim-surround") + "tpope/vim-surround", -- Formatter plugin - use("sbdchd/neoformat") + "sbdchd/neoformat", -- Make editing passwords safer - use({ + { "https://git.zx2c4.com/password-store", rtp = "contrib/vim/redact_pass.vim", - }) + }, -- Neovim inside Firefox - use({ + { "glacambre/firenvim", - run = function() + build = function() vim.fn["firenvim#install"](0) end, - setup = function() - require("plugins/firenvim") - end, - }) + }, -- Vim <3 Asciidoctor - use("habamax/vim-asciidoctor") + "habamax/vim-asciidoctor", -- Markdown preview - use({ + { "iamcco/markdown-preview.nvim", - run = "cd app && npm install", + build = "cd app && npm install", setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, - }) + }, -- Edit GPG encrypted files transparently - use("jamessan/vim-gnupg") + "jamessan/vim-gnupg", -- High performance color highlighter - use({ + { "norcalli/nvim-colorizer.lua", config = function() require("colorizer").setup() end, - }) + }, +} - -- If Packer was just installed, - -- sync plugins - if Packer_bootstrap then - require("packer").sync() - end -end) +local lazy_opts = {} --- Sync plugins if Packer was just --- installed -if Packer_bootstrap then - print("Syncing plugins") - require("packer").sync() -end +require("lazy").setup(plugins, lazy_opts) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index e4c094e4..7716719c 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -56,3 +56,12 @@ g.mapleader = " " o.tabstop = 4 o.shiftwidth = 4 o.smartindent = true + +-- Firenvim settings +vim.g.firenvim_config = { + localSettings = { + [".*"] = { + takeOver = "never", + }, + }, +} diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 8dbb3855..51371667 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -164,7 +164,7 @@ update() { plugins() { echo "Updating NeoVim plugins" - nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync' + nvim --headless "+Lazy! sync" +qa echo "Updating NeoVim TreeSitter" nvim --headless +TSUpdateSync +qa zinit self-update From 12564939a7731586d42768504b90e1ed75ae762a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Feb 2023 14:45:30 +0200 Subject: [PATCH 1760/2667] Nvim: change package manager from packer to lazy --- config.toml | 2 - home/.config/nvim/lua/plugins/firenvim.lua | 7 - home/.config/nvim/lua/plugins/init.lua | 211 +++++++++------------ home/.config/nvim/lua/settings.lua | 9 + home/.config/zsh/04-aliases.zsh | 2 +- 5 files changed, 102 insertions(+), 129 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/firenvim.lua diff --git a/config.toml b/config.toml index 9d9e8f71..80ff672c 100644 --- a/config.toml +++ b/config.toml @@ -1,5 +1,4 @@ [actions] -nvim-packer-sync = "nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync'" dconf-load = "dconf load / < ~/.config/dconf.ini" [config] @@ -32,7 +31,6 @@ dst = "~/.config/imapnotify" src = ".config/imapnotify" [dotfiles.d_nvim] -actions = ["nvim-packer-sync"] dst = "~/.config/nvim" src = ".config/nvim" diff --git a/home/.config/nvim/lua/plugins/firenvim.lua b/home/.config/nvim/lua/plugins/firenvim.lua deleted file mode 100644 index 7c316a24..00000000 --- a/home/.config/nvim/lua/plugins/firenvim.lua +++ /dev/null @@ -1,7 +0,0 @@ -vim.g.firenvim_config = { - localSettings = { - [".*"] = { - takeOver = "never", - }, - }, -} diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 5bf40e0a..a5c11ac9 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -1,229 +1,202 @@ -local fn = vim.fn - --- Install packer if it's not yet installed -local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" -if fn.empty(fn.glob(install_path)) > 0 then - print("Installing Packer") - Packer_bootstrap = fn.system({ +-- Install lazy if it's not yet installed +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ "git", "clone", - "--depth", - "1", - "https://github.com/wbthomason/packer.nvim", - install_path, + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, }) - vim.cmd([[packadd packer.nvim]]) - print("Installed Packer") end +vim.opt.rtp:prepend(lazypath) --- Configure packer -require("packer").startup(function() - local use = require("packer").use - - -- The plugin manager itself - use({ "wbthomason/packer.nvim" }) - +-- Configure lazy +local plugins = { -- Colorscheme - use({ + { "rebelot/kanagawa.nvim", config = function() vim.cmd("colorscheme kanagawa") end, - }) + }, -- Statusline - use({ + { "nvim-lualine/lualine.nvim", - requires = { "kyazdani42/nvim-web-devicons", opt = true }, + dependencies = { "kyazdani42/nvim-web-devicons" }, config = require("plugins.lualine"), - }) - - -- Startup screen/dashboard - --use 'glepnir/dashboard-nvim' + }, -- Git status in signcolumn - use({ + { "lewis6991/gitsigns.nvim", - config = function() - require("gitsigns").setup() - end, - }) + config = true, + }, -- Tabline/bufferline - use({ - "akinsho/nvim-bufferline.lua", - tag = "*", - requires = "kyazdani42/nvim-web-devicons", - config = function() - require("bufferline").setup({}) - end, - }) + { + "akinsho/bufferline.nvim", + version = "v3.*", + dependencies = { "kyazdani42/nvim-web-devicons" }, + config = true, + }, -- Git commands - use("tpope/vim-fugitive") + "tpope/vim-fugitive", -- Indent characters - use({ + { "lukas-reineke/indent-blankline.nvim", config = require("plugins.indent-blankline"), - }) + }, -- Tree explorer - use({ + { "kyazdani42/nvim-tree.lua", - requires = "kyazdani42/nvim-web-devicons", + dependencies = { "kyazdani42/nvim-web-devicons" }, config = require("plugins.nvim-tree"), - }) + }, -- Telescope - use({ + { "nvim-telescope/telescope.nvim", config = require("plugins.telescope"), - requires = { - { "nvim-lua/plenary.nvim" }, -- Internal dep for telescope - { "nvim-telescope/telescope-fzf-native.nvim", run = "make" }, -- Use fzf for fuzzy finder - { "nvim-telescope/telescope-ui-select.nvim" }, -- Replace vim built in select with telescope - { "zane-/cder.nvim" }, -- cd plugin for telescope + dependencies = { + "nvim-lua/plenary.nvim", -- Internal dep for telescope + -- Use fzf for fuzzy finder + { + "nvim-telescope/telescope-fzf-native.nvim", + build = "make", + }, + "nvim-telescope/telescope-ui-select.nvim", -- Replace vim built in select with telescope + "zane-/cder.nvim", -- cd plugin for telescope }, - }) - + }, -- Do stuff as sudo - use("lambdalisue/suda.vim") + "lambdalisue/suda.vim", -- Display possible keybinds - use({ "folke/which-key.nvim", config = require("plugins.which-key") }) + { "folke/which-key.nvim", config = require("plugins.which-key") }, -- Read editorconfig settings - use("editorconfig/editorconfig-vim") + "editorconfig/editorconfig-vim", -- Package manager for LSP servers, DAP servers etc. - use({ "williamboman/mason.nvim", config = require("plugins.mason").setup }) + { "williamboman/mason.nvim", config = require("plugins.mason").setup }, -- Install LSP server executables with Mason - use({ + { "williamboman/mason-lspconfig.nvim", config = require("plugins.mason").lspconfig_setup, - }) + }, -- Configs for built-in LSP - use({ "neovim/nvim-lspconfig", config = require("plugins.lspconfig").setup }) + { "neovim/nvim-lspconfig", config = require("plugins.lspconfig").setup }, -- Additional LSP features for Java - use("mfussenegger/nvim-jdtls") + "mfussenegger/nvim-jdtls", -- Display function signature - use("ray-x/lsp_signature.nvim") + "ray-x/lsp_signature.nvim", -- Snippets plugin - use({ + { "L3MON4D3/LuaSnip", - requires = { "rafamadriz/friendly-snippets" }, -- Snippets collection + dependencies = { "rafamadriz/friendly-snippets" }, -- Snippets collection config = require("plugins.luasnip"), - }) + }, -- vim api documentation for lua lsp - use({ "ii14/emmylua-nvim" }) + { "ii14/emmylua-nvim" }, -- Completion - use({ + { "hrsh7th/nvim-cmp", - requires = { - { "hrsh7th/cmp-buffer" }, -- Buffer source - { "petertriho/cmp-git", requires = "nvim-lua/plenary.nvim" }, -- Git source - { "hrsh7th/cmp-nvim-lsp" }, -- LSP source - { "hrsh7th/cmp-nvim-lua" }, -- Neovim Lua API documentation source - { "hrsh7th/cmp-path" }, -- Path source - { "hrsh7th/cmp-cmdline" }, -- cmdline source - { "saadparwaiz1/cmp_luasnip" }, -- Snippets source - { "f3fora/cmp-spell" }, -- Spell check source + dependencies = { + "hrsh7th/cmp-buffer", -- Buffer source + { "petertriho/cmp-git", dependencies = { "nvim-lua/plenary.nvim" } }, -- Git source + "hrsh7th/cmp-nvim-lsp", -- LSP source + "hrsh7th/cmp-nvim-lua", -- Neovim Lua API documentation source + "hrsh7th/cmp-path", -- Path source + "hrsh7th/cmp-cmdline", -- cmdline source + "saadparwaiz1/cmp_luasnip", -- Snippets source + "f3fora/cmp-spell", -- Spell check source }, config = require("plugins.cmp"), - }) + }, -- Automatic brackets - use({ + { "windwp/nvim-autopairs", - config = function() - require("nvim-autopairs").setup({}) - end, - }) + config = true, + }, -- treesitter - use({ + { "nvim-treesitter/nvim-treesitter", - run = function() + build = function() require("nvim-treesitter.install").update({ with_sync = true }) end, config = require("plugins.treesitter"), - }) + }, -- treesitter plugin for commentstring - use("JoosepAlviste/nvim-ts-context-commentstring") + "JoosepAlviste/nvim-ts-context-commentstring", -- Additional plugins for formats not supported -- by treesitter - use("jamespeapen/swayconfig.vim") + "jamespeapen/swayconfig.vim", -- mappings for commenting in code - use("tpope/vim-commentary") + "tpope/vim-commentary", -- we all know this one - use("tpope/vim-surround") + "tpope/vim-surround", -- Formatter plugin - use("sbdchd/neoformat") + "sbdchd/neoformat", -- Make editing passwords safer - use({ + { "https://git.zx2c4.com/password-store", rtp = "contrib/vim/redact_pass.vim", - }) + }, -- Neovim inside Firefox - use({ + { "glacambre/firenvim", - run = function() + build = function() vim.fn["firenvim#install"](0) end, - setup = function() - require("plugins/firenvim") - end, - }) + }, -- Vim <3 Asciidoctor - use("habamax/vim-asciidoctor") + "habamax/vim-asciidoctor", -- Markdown preview - use({ + { "iamcco/markdown-preview.nvim", - run = "cd app && npm install", + build = "cd app && npm install", setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, - }) + }, -- Edit GPG encrypted files transparently - use("jamessan/vim-gnupg") + "jamessan/vim-gnupg", -- High performance color highlighter - use({ + { "norcalli/nvim-colorizer.lua", config = function() require("colorizer").setup() end, - }) + }, +} - -- If Packer was just installed, - -- sync plugins - if Packer_bootstrap then - require("packer").sync() - end -end) +local lazy_opts = {} --- Sync plugins if Packer was just --- installed -if Packer_bootstrap then - print("Syncing plugins") - require("packer").sync() -end +require("lazy").setup(plugins, lazy_opts) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index e4c094e4..7716719c 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -56,3 +56,12 @@ g.mapleader = " " o.tabstop = 4 o.shiftwidth = 4 o.smartindent = true + +-- Firenvim settings +vim.g.firenvim_config = { + localSettings = { + [".*"] = { + takeOver = "never", + }, + }, +} diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 8dbb3855..51371667 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -164,7 +164,7 @@ update() { plugins() { echo "Updating NeoVim plugins" - nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync' + nvim --headless "+Lazy! sync" +qa echo "Updating NeoVim TreeSitter" nvim --headless +TSUpdateSync +qa zinit self-update From 8f16f4c2846bd769ffd67b823fcc53f54aa73c93 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Feb 2023 17:54:39 +0200 Subject: [PATCH 1761/2667] Nvim: add dap --- home/.config/nvim/lua/plugins/dap.lua | 31 ++++++++++++++++++++++++++ home/.config/nvim/lua/plugins/init.lua | 4 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 home/.config/nvim/lua/plugins/dap.lua diff --git a/home/.config/nvim/lua/plugins/dap.lua b/home/.config/nvim/lua/plugins/dap.lua new file mode 100644 index 00000000..a279e7ac --- /dev/null +++ b/home/.config/nvim/lua/plugins/dap.lua @@ -0,0 +1,31 @@ +return function() + local dap = require("dap") + + dap.adapters.bashdb = { + type = "executable", + command = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/bash-debug-adapter", + name = "bashdb", + } + + dap.configurations.sh = { + { + type = "bashdb", + request = "launch", + name = "Launch file", + showDebugOutput = true, + pathBashdb = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir/bashdb", + pathBashdbLib = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir", + trace = true, + file = "${file}", + program = "${file}", + cwd = "${workspaceFolder}", + pathCat = "cat", + pathBash = "/bin/bash", + pathMkfifo = "mkfifo", + pathPkill = "pkill", + args = {}, + env = {}, + terminalKind = "integrated", + }, + } +end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index a5c11ac9..efc2b757 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -83,7 +83,7 @@ local plugins = { -- Read editorconfig settings "editorconfig/editorconfig-vim", - -- Package manager for LSP servers, DAP servers etc. + -- Package manager for LSP servers, DAP adapters etc. { "williamboman/mason.nvim", config = require("plugins.mason").setup }, -- Install LSP server executables with Mason @@ -98,6 +98,8 @@ local plugins = { -- Additional LSP features for Java "mfussenegger/nvim-jdtls", + { "mfussenegger/nvim-dap", config = require("plugins.dap") }, + -- Display function signature "ray-x/lsp_signature.nvim", From f0750a1ad87f16fd4f96f455f2a6164edeb04503 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Feb 2023 17:54:39 +0200 Subject: [PATCH 1762/2667] Nvim: add dap --- home/.config/nvim/lua/plugins/dap.lua | 31 ++++++++++++++++++++++++++ home/.config/nvim/lua/plugins/init.lua | 4 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 home/.config/nvim/lua/plugins/dap.lua diff --git a/home/.config/nvim/lua/plugins/dap.lua b/home/.config/nvim/lua/plugins/dap.lua new file mode 100644 index 00000000..a279e7ac --- /dev/null +++ b/home/.config/nvim/lua/plugins/dap.lua @@ -0,0 +1,31 @@ +return function() + local dap = require("dap") + + dap.adapters.bashdb = { + type = "executable", + command = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/bash-debug-adapter", + name = "bashdb", + } + + dap.configurations.sh = { + { + type = "bashdb", + request = "launch", + name = "Launch file", + showDebugOutput = true, + pathBashdb = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir/bashdb", + pathBashdbLib = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir", + trace = true, + file = "${file}", + program = "${file}", + cwd = "${workspaceFolder}", + pathCat = "cat", + pathBash = "/bin/bash", + pathMkfifo = "mkfifo", + pathPkill = "pkill", + args = {}, + env = {}, + terminalKind = "integrated", + }, + } +end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index a5c11ac9..efc2b757 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -83,7 +83,7 @@ local plugins = { -- Read editorconfig settings "editorconfig/editorconfig-vim", - -- Package manager for LSP servers, DAP servers etc. + -- Package manager for LSP servers, DAP adapters etc. { "williamboman/mason.nvim", config = require("plugins.mason").setup }, -- Install LSP server executables with Mason @@ -98,6 +98,8 @@ local plugins = { -- Additional LSP features for Java "mfussenegger/nvim-jdtls", + { "mfussenegger/nvim-dap", config = require("plugins.dap") }, + -- Display function signature "ray-x/lsp_signature.nvim", From ebf0dab03c4224dc032d55c4bfc7d67e074e5df0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Feb 2023 17:58:05 +0200 Subject: [PATCH 1763/2667] Fix issues after migrating to lazy package manager --- home/.config/nvim/lua/plugins/init.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index efc2b757..4d7adfbb 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -163,7 +163,9 @@ local plugins = { -- Make editing passwords safer { "https://git.zx2c4.com/password-store", - rtp = "contrib/vim/redact_pass.vim", + config = function(plugin) + vim.opt.rtp:append(plugin.dir .. "contrib/vim/redact_pass.vim") + end, }, -- Neovim inside Firefox @@ -181,7 +183,7 @@ local plugins = { { "iamcco/markdown-preview.nvim", build = "cd app && npm install", - setup = function() + config = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, From 13c59cab47ad901ce22933c33bbc9651b6cca5d4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Feb 2023 17:58:05 +0200 Subject: [PATCH 1764/2667] Fix issues after migrating to lazy package manager --- home/.config/nvim/lua/plugins/init.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index efc2b757..4d7adfbb 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -163,7 +163,9 @@ local plugins = { -- Make editing passwords safer { "https://git.zx2c4.com/password-store", - rtp = "contrib/vim/redact_pass.vim", + config = function(plugin) + vim.opt.rtp:append(plugin.dir .. "contrib/vim/redact_pass.vim") + end, }, -- Neovim inside Firefox @@ -181,7 +183,7 @@ local plugins = { { "iamcco/markdown-preview.nvim", build = "cd app && npm install", - setup = function() + config = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, From 9472088711286368e7cd144d773d0bab300ca3b7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Feb 2023 18:29:01 +0200 Subject: [PATCH 1765/2667] Neovim: Clean up configuration --- home/.config/nvim/lua/plugins/init.lua | 16 ++++++++-------- home/.config/nvim/lua/plugins/lspconfig.lua | 14 +++++++------- home/.config/nvim/lua/plugins/lualine.lua | 3 --- home/.config/nvim/lua/plugins/mason.lua | 13 ------------- home/.config/nvim/lua/plugins/which-key.lua | 3 --- 5 files changed, 15 insertions(+), 34 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/lualine.lua delete mode 100644 home/.config/nvim/lua/plugins/mason.lua delete mode 100644 home/.config/nvim/lua/plugins/which-key.lua diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 4d7adfbb..5764d7f6 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -26,7 +26,7 @@ local plugins = { { "nvim-lualine/lualine.nvim", dependencies = { "kyazdani42/nvim-web-devicons" }, - config = require("plugins.lualine"), + config = true, }, -- Git status in signcolumn @@ -74,22 +74,23 @@ local plugins = { "zane-/cder.nvim", -- cd plugin for telescope }, }, + -- Do stuff as sudo "lambdalisue/suda.vim", -- Display possible keybinds - { "folke/which-key.nvim", config = require("plugins.which-key") }, + { "folke/which-key.nvim", config = true }, -- Read editorconfig settings "editorconfig/editorconfig-vim", -- Package manager for LSP servers, DAP adapters etc. - { "williamboman/mason.nvim", config = require("plugins.mason").setup }, + { "williamboman/mason.nvim", config = true }, -- Install LSP server executables with Mason { "williamboman/mason-lspconfig.nvim", - config = require("plugins.mason").lspconfig_setup, + config = true, }, -- Configs for built-in LSP @@ -98,6 +99,7 @@ local plugins = { -- Additional LSP features for Java "mfussenegger/nvim-jdtls", + -- DAP plugin { "mfussenegger/nvim-dap", config = require("plugins.dap") }, -- Display function signature @@ -111,7 +113,7 @@ local plugins = { }, -- vim api documentation for lua lsp - { "ii14/emmylua-nvim" }, + "ii14/emmylua-nvim", -- Completion { @@ -195,9 +197,7 @@ local plugins = { -- High performance color highlighter { "norcalli/nvim-colorizer.lua", - config = function() - require("colorizer").setup() - end, + config = true, }, } diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index a694e260..3d6e5fb8 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -1,7 +1,7 @@ -- Pairs of server name and settings. -- This is iterated through and every -- server is setup with lspconfig -Servers = { +local servers = { bashls = {}, html = {}, jsonls = {}, @@ -30,9 +30,9 @@ Servers = { }, } -M = {} +local m = {} -function M.map_keys() +function m.map_keys() -- Register keybindings via which-key -- to get documentation in which-key local wk = require("which-key") @@ -69,19 +69,19 @@ function M.map_keys() }) end -function M.setup() +function m.setup() local function on_attach() -- Setup lsp signature plugin require("lsp_signature").setup({}) -- Setup keybinds - M.map_keys() + m.map_keys() end local capabilities = require("cmp_nvim_lsp").default_capabilities() -- Setup every defined server - for server, settings in pairs(Servers) do + for server, settings in pairs(servers) do require("lspconfig")[server].setup({ on_attach = on_attach, settings = settings, @@ -92,4 +92,4 @@ function M.setup() end end -return M +return m diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua deleted file mode 100644 index 18c9a012..00000000 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ /dev/null @@ -1,3 +0,0 @@ -return function() - require("lualine").setup({}) -end diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua deleted file mode 100644 index 225d50fb..00000000 --- a/home/.config/nvim/lua/plugins/mason.lua +++ /dev/null @@ -1,13 +0,0 @@ -local M = {} - -Opts = { mason = {}, lspconfig = { automatic_installation = true } } - -M.setup = function() - require("mason").setup(Opts.mason) -end - -M.lspconfig_setup = function() - require("mason-lspconfig").setup(Opts.lspconfig) -end - -return M diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua deleted file mode 100644 index 405773bc..00000000 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ /dev/null @@ -1,3 +0,0 @@ -return function() - require("which-key").setup({ spelling = { enabled = true } }) -end From 49d5c6c92b288ecf39032cbb0a9303f7f2bb1704 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Feb 2023 18:29:01 +0200 Subject: [PATCH 1766/2667] Neovim: Clean up configuration --- home/.config/nvim/lua/plugins/init.lua | 16 ++++++++-------- home/.config/nvim/lua/plugins/lspconfig.lua | 14 +++++++------- home/.config/nvim/lua/plugins/lualine.lua | 3 --- home/.config/nvim/lua/plugins/mason.lua | 13 ------------- home/.config/nvim/lua/plugins/which-key.lua | 3 --- 5 files changed, 15 insertions(+), 34 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/lualine.lua delete mode 100644 home/.config/nvim/lua/plugins/mason.lua delete mode 100644 home/.config/nvim/lua/plugins/which-key.lua diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 4d7adfbb..5764d7f6 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -26,7 +26,7 @@ local plugins = { { "nvim-lualine/lualine.nvim", dependencies = { "kyazdani42/nvim-web-devicons" }, - config = require("plugins.lualine"), + config = true, }, -- Git status in signcolumn @@ -74,22 +74,23 @@ local plugins = { "zane-/cder.nvim", -- cd plugin for telescope }, }, + -- Do stuff as sudo "lambdalisue/suda.vim", -- Display possible keybinds - { "folke/which-key.nvim", config = require("plugins.which-key") }, + { "folke/which-key.nvim", config = true }, -- Read editorconfig settings "editorconfig/editorconfig-vim", -- Package manager for LSP servers, DAP adapters etc. - { "williamboman/mason.nvim", config = require("plugins.mason").setup }, + { "williamboman/mason.nvim", config = true }, -- Install LSP server executables with Mason { "williamboman/mason-lspconfig.nvim", - config = require("plugins.mason").lspconfig_setup, + config = true, }, -- Configs for built-in LSP @@ -98,6 +99,7 @@ local plugins = { -- Additional LSP features for Java "mfussenegger/nvim-jdtls", + -- DAP plugin { "mfussenegger/nvim-dap", config = require("plugins.dap") }, -- Display function signature @@ -111,7 +113,7 @@ local plugins = { }, -- vim api documentation for lua lsp - { "ii14/emmylua-nvim" }, + "ii14/emmylua-nvim", -- Completion { @@ -195,9 +197,7 @@ local plugins = { -- High performance color highlighter { "norcalli/nvim-colorizer.lua", - config = function() - require("colorizer").setup() - end, + config = true, }, } diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index a694e260..3d6e5fb8 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -1,7 +1,7 @@ -- Pairs of server name and settings. -- This is iterated through and every -- server is setup with lspconfig -Servers = { +local servers = { bashls = {}, html = {}, jsonls = {}, @@ -30,9 +30,9 @@ Servers = { }, } -M = {} +local m = {} -function M.map_keys() +function m.map_keys() -- Register keybindings via which-key -- to get documentation in which-key local wk = require("which-key") @@ -69,19 +69,19 @@ function M.map_keys() }) end -function M.setup() +function m.setup() local function on_attach() -- Setup lsp signature plugin require("lsp_signature").setup({}) -- Setup keybinds - M.map_keys() + m.map_keys() end local capabilities = require("cmp_nvim_lsp").default_capabilities() -- Setup every defined server - for server, settings in pairs(Servers) do + for server, settings in pairs(servers) do require("lspconfig")[server].setup({ on_attach = on_attach, settings = settings, @@ -92,4 +92,4 @@ function M.setup() end end -return M +return m diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua deleted file mode 100644 index 18c9a012..00000000 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ /dev/null @@ -1,3 +0,0 @@ -return function() - require("lualine").setup({}) -end diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua deleted file mode 100644 index 225d50fb..00000000 --- a/home/.config/nvim/lua/plugins/mason.lua +++ /dev/null @@ -1,13 +0,0 @@ -local M = {} - -Opts = { mason = {}, lspconfig = { automatic_installation = true } } - -M.setup = function() - require("mason").setup(Opts.mason) -end - -M.lspconfig_setup = function() - require("mason-lspconfig").setup(Opts.lspconfig) -end - -return M diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua deleted file mode 100644 index 405773bc..00000000 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ /dev/null @@ -1,3 +0,0 @@ -return function() - require("which-key").setup({ spelling = { enabled = true } }) -end From 7aa0bf9c2dec3ea779b996bdde3a1af990e81b18 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 23 Feb 2023 09:15:32 +0200 Subject: [PATCH 1767/2667] Nvim: remove swayconfig plugin --- home/.config/nvim/lua/plugins/init.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 5764d7f6..8933063d 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -149,10 +149,6 @@ local plugins = { -- treesitter plugin for commentstring "JoosepAlviste/nvim-ts-context-commentstring", - -- Additional plugins for formats not supported - -- by treesitter - "jamespeapen/swayconfig.vim", - -- mappings for commenting in code "tpope/vim-commentary", From ced2b22fb42dbace17525e72bf8103d7a3d1dbca Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 23 Feb 2023 09:15:32 +0200 Subject: [PATCH 1768/2667] Nvim: remove swayconfig plugin --- home/.config/nvim/lua/plugins/init.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 5764d7f6..8933063d 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -149,10 +149,6 @@ local plugins = { -- treesitter plugin for commentstring "JoosepAlviste/nvim-ts-context-commentstring", - -- Additional plugins for formats not supported - -- by treesitter - "jamespeapen/swayconfig.vim", - -- mappings for commenting in code "tpope/vim-commentary", From 6ee8661357f8c9cc255a3f521b3800bb082e9fda Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Mar 2023 09:29:51 +0200 Subject: [PATCH 1769/2667] Update moria cmdline (new root disk) --- root/etc/kernel/cmdline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index 7a75728c..d6eee16f 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -1,5 +1,5 @@ {%@@ if profile == "Mirkwood" @@%} cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait amdgpu.ppfeaturemask=0xffffffff quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Moria" @@%} -cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 +cryptdevice=UUID=51115cf2-6a44-4f8c-8aa2-ff9d834953d8:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ endif @@%} From 5e04976abae9eecf215b3eda636273dc8ca5ddff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Mar 2023 09:29:51 +0200 Subject: [PATCH 1770/2667] Update moria cmdline (new root disk) --- root/etc/kernel/cmdline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index 7a75728c..d6eee16f 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -1,5 +1,5 @@ {%@@ if profile == "Mirkwood" @@%} cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait amdgpu.ppfeaturemask=0xffffffff quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Moria" @@%} -cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 +cryptdevice=UUID=51115cf2-6a44-4f8c-8aa2-ff9d834953d8:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ endif @@%} From 59e18a6a5af340850190b886da6c0e70b8ea7c85 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Mar 2023 09:30:05 +0200 Subject: [PATCH 1771/2667] Fix whitespace in sshd_config --- root/etc/ssh/sshd_config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/ssh/sshd_config b/root/etc/ssh/sshd_config index 5c681a2a..9cecff1e 100644 --- a/root/etc/ssh/sshd_config +++ b/root/etc/ssh/sshd_config @@ -5,10 +5,10 @@ StreamLocalBindUnlink yes Port 221 {%@@ endif @@%} X11Forwarding yes -AuthorizedKeysFile .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys PasswordAuthentication no PermitRootLogin no ChallengeResponseAuthentication no UsePAM yes PrintMotd no # pam does that -Subsystem sftp /usr/lib/ssh/sftp-server +Subsystem sftp /usr/lib/ssh/sftp-server From 6e466cae8d1ff9248fcd39721b0e7dc0c9f5476c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Mar 2023 09:30:05 +0200 Subject: [PATCH 1772/2667] Fix whitespace in sshd_config --- root/etc/ssh/sshd_config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/ssh/sshd_config b/root/etc/ssh/sshd_config index 5c681a2a..9cecff1e 100644 --- a/root/etc/ssh/sshd_config +++ b/root/etc/ssh/sshd_config @@ -5,10 +5,10 @@ StreamLocalBindUnlink yes Port 221 {%@@ endif @@%} X11Forwarding yes -AuthorizedKeysFile .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys PasswordAuthentication no PermitRootLogin no ChallengeResponseAuthentication no UsePAM yes PrintMotd no # pam does that -Subsystem sftp /usr/lib/ssh/sftp-server +Subsystem sftp /usr/lib/ssh/sftp-server From b5768525aef996011fbb8f957aa7bb8ad7cbcd6d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Mar 2023 21:54:56 +0200 Subject: [PATCH 1773/2667] Paru: disable bat because it causes unreadable PKGBUILD in neovim --- home/.config/paru/paru.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/paru/paru.conf b/home/.config/paru/paru.conf index 238bd370..98eeaf95 100644 --- a/home/.config/paru/paru.conf +++ b/home/.config/paru/paru.conf @@ -3,3 +3,4 @@ NewsOnUpgrade [bin] Sudo = doas +Bat = /dev/null From 6a7cf99da80dbc552be9d4f50e3a37107c7ee29b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Mar 2023 21:54:56 +0200 Subject: [PATCH 1774/2667] Paru: disable bat because it causes unreadable PKGBUILD in neovim --- home/.config/paru/paru.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/paru/paru.conf b/home/.config/paru/paru.conf index 238bd370..98eeaf95 100644 --- a/home/.config/paru/paru.conf +++ b/home/.config/paru/paru.conf @@ -3,3 +3,4 @@ NewsOnUpgrade [bin] Sudo = doas +Bat = /dev/null From a7a890f267c43150ae1f1a1fd5f8bbc6c00a3e75 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Mar 2023 22:24:07 +0200 Subject: [PATCH 1775/2667] Nvim: add rust_analyzer --- home/.config/nvim/lua/plugins/lspconfig.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 3d6e5fb8..9c1e511b 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -10,6 +10,7 @@ local servers = { yamlls = {}, taplo = {}, tsserver = {}, + rust_analyzer = {}, lua_ls = { Lua = { runtime = { From e642a294c5746aa7591b7605541e04968578c9d9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Mar 2023 22:24:07 +0200 Subject: [PATCH 1776/2667] Nvim: add rust_analyzer --- home/.config/nvim/lua/plugins/lspconfig.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 3d6e5fb8..9c1e511b 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -10,6 +10,7 @@ local servers = { yamlls = {}, taplo = {}, tsserver = {}, + rust_analyzer = {}, lua_ls = { Lua = { runtime = { From 9eeda25af6cd068671832ecec15b5ad3516fa448 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Mar 2023 12:58:36 +0200 Subject: [PATCH 1777/2667] Add ddns service --- docker/ddns/docker-compose.toml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 docker/ddns/docker-compose.toml diff --git a/docker/ddns/docker-compose.toml b/docker/ddns/docker-compose.toml new file mode 100644 index 00000000..7bf009ea --- /dev/null +++ b/docker/ddns/docker-compose.toml @@ -0,0 +1,8 @@ +[services.cloudflare-ddns] +image = "timothyjmiller/cloudflare-ddns" +container_name = "cloudflare-ddns" +security_opt = ["no-new-privileges:true"] +network_mode = "host" +environment = ["PUID=1000", "PGID=1000"] +volumes = ["/docker/ddns/config.json:/config.json"] +restart = "unless-stopped" From 81e7d2631d7ec834539d482ee9b16f9f5ceba828 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Mar 2023 12:58:36 +0200 Subject: [PATCH 1778/2667] Add ddns service --- docker/ddns/docker-compose.toml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 docker/ddns/docker-compose.toml diff --git a/docker/ddns/docker-compose.toml b/docker/ddns/docker-compose.toml new file mode 100644 index 00000000..7bf009ea --- /dev/null +++ b/docker/ddns/docker-compose.toml @@ -0,0 +1,8 @@ +[services.cloudflare-ddns] +image = "timothyjmiller/cloudflare-ddns" +container_name = "cloudflare-ddns" +security_opt = ["no-new-privileges:true"] +network_mode = "host" +environment = ["PUID=1000", "PGID=1000"] +volumes = ["/docker/ddns/config.json:/config.json"] +restart = "unless-stopped" From 6c566c35c50573cfa85150394023084d32f6c7ad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 6 Mar 2023 21:47:51 +0200 Subject: [PATCH 1779/2667] Add alias to add packages to repo with fzf Also removed useless echos --- home/.config/zsh/04-aliases.zsh | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 51371667..b031d720 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -32,11 +32,11 @@ pi() { {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} - cmd="paru -S $(echo $SELECTED_PKGS)" + cmd="paru -S $SELECTED_PKGS" {%@@ elif distro_id == "ubuntu" @@%} - cmd="doas apt install $(echo $SELECTED_PKGS)" + cmd="doas apt install $SELECTED_PKGS" {%@@ elif distro_id == "termux" @@%} - cmd="apt install $(echo $SELECTED_PKGS)" + cmd="apt install $SELECTED_PKGS" {%@@ endif @@%} # Append the expanded command to history @@ -55,11 +55,11 @@ pr() { {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} - cmd="paru -Rns $(echo $SELECTED_PKGS)" + cmd="paru -Rns $SELECTED_PKGS" {%@@ elif distro_id == "ubuntu" @@%} - cmd="doas apt remove $(echo $SELECTED_PKGS)" + cmd="doas apt remove $SELECTED_PKGS" {%@@ elif distro_id == "termux" @@%} - cmd="apt remove $(echo $SELECTED_PKGS)" + cmd="apt remove $SELECTED_PKGS" {%@@ endif @@%} # Append the expanded command to history @@ -70,6 +70,22 @@ pr() { fi } +{%@@ if profile == "Moria" @@%} +# Add packages to repo with fzf +ra() { + SELECTED_PKGS="$(paru -Slqa | fzf --header='Add packages to repo' -m --preview 'paru -Si {1}' | tr '\n' ' ')" + if [ -n "$SELECTED_PKGS" ]; then + cmd="aur -S $SELECTED_PKGS" + + # Append the expanded command to history + print -s "$cmd" + + # Finally, excecute the command + eval "$cmd" + fi +} +{%@@ endif @@%} + {%@@ if distro_id == "termux" @@%} alias gp='okc-gpg' {%@@ endif @@%} From b75bbba4930e799548e339308ca8042decfe0853 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 6 Mar 2023 21:47:51 +0200 Subject: [PATCH 1780/2667] Add alias to add packages to repo with fzf Also removed useless echos --- home/.config/zsh/04-aliases.zsh | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 51371667..b031d720 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -32,11 +32,11 @@ pi() { {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} - cmd="paru -S $(echo $SELECTED_PKGS)" + cmd="paru -S $SELECTED_PKGS" {%@@ elif distro_id == "ubuntu" @@%} - cmd="doas apt install $(echo $SELECTED_PKGS)" + cmd="doas apt install $SELECTED_PKGS" {%@@ elif distro_id == "termux" @@%} - cmd="apt install $(echo $SELECTED_PKGS)" + cmd="apt install $SELECTED_PKGS" {%@@ endif @@%} # Append the expanded command to history @@ -55,11 +55,11 @@ pr() { {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} - cmd="paru -Rns $(echo $SELECTED_PKGS)" + cmd="paru -Rns $SELECTED_PKGS" {%@@ elif distro_id == "ubuntu" @@%} - cmd="doas apt remove $(echo $SELECTED_PKGS)" + cmd="doas apt remove $SELECTED_PKGS" {%@@ elif distro_id == "termux" @@%} - cmd="apt remove $(echo $SELECTED_PKGS)" + cmd="apt remove $SELECTED_PKGS" {%@@ endif @@%} # Append the expanded command to history @@ -70,6 +70,22 @@ pr() { fi } +{%@@ if profile == "Moria" @@%} +# Add packages to repo with fzf +ra() { + SELECTED_PKGS="$(paru -Slqa | fzf --header='Add packages to repo' -m --preview 'paru -Si {1}' | tr '\n' ' ')" + if [ -n "$SELECTED_PKGS" ]; then + cmd="aur -S $SELECTED_PKGS" + + # Append the expanded command to history + print -s "$cmd" + + # Finally, excecute the command + eval "$cmd" + fi +} +{%@@ endif @@%} + {%@@ if distro_id == "termux" @@%} alias gp='okc-gpg' {%@@ endif @@%} From 3a5f747004a8ce8ba5f6c71d13c2af50a19b0732 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 8 Mar 2023 16:35:53 +0200 Subject: [PATCH 1781/2667] Neovim: add eslint lsp --- home/.config/nvim/lua/plugins/lspconfig.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 9c1e511b..6b324a46 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -10,7 +10,8 @@ local servers = { yamlls = {}, taplo = {}, tsserver = {}, - rust_analyzer = {}, + eslint = {}, + rust_analyzer = {}, lua_ls = { Lua = { runtime = { From 5a11d0c79e1b0d924b02c612ff0c20df6b57b432 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 8 Mar 2023 16:35:53 +0200 Subject: [PATCH 1782/2667] Neovim: add eslint lsp --- home/.config/nvim/lua/plugins/lspconfig.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua index 9c1e511b..6b324a46 100644 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ b/home/.config/nvim/lua/plugins/lspconfig.lua @@ -10,7 +10,8 @@ local servers = { yamlls = {}, taplo = {}, tsserver = {}, - rust_analyzer = {}, + eslint = {}, + rust_analyzer = {}, lua_ls = { Lua = { runtime = { From 011062fdc955a20eb38bcf45a26363d256ba0d74 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Mar 2023 10:27:45 +0200 Subject: [PATCH 1783/2667] Add kodi autostart on tty6 for moria --- config-root.toml | 7 ++++--- config.toml | 2 +- home/.zprofile | 12 ++++++------ .../override.conf | 0 4 files changed, 11 insertions(+), 10 deletions(-) rename root/etc/systemd/system/{getty@tty1.service.d => getty@tty6.service.d}/override.conf (100%) diff --git a/config-root.toml b/config-root.toml index 23226572..7a661ce6 100644 --- a/config-root.toml +++ b/config-root.toml @@ -95,9 +95,9 @@ src = "etc/ssh/sshd_config" dst = "/etc/welcomemessage.conf" src = "etc/welcomemessage.conf" -[dotfiles."f_getty.conf"] -src = "etc/systemd/system/getty@tty1.service.d/override.conf" -dst = "/etc/systemd/system/getty@tty1.service.d/override.conf" +[dotfiles."f_getty6conf"] +src = "etc/systemd/system/getty@tty6.service.d/override.conf" +dst = "/etc/systemd/system/getty@tty6.service.d/override.conf" [dotfiles."f_99-conbee-usb-serial.rules"] src = "etc/udev/rules.d/99-conbee-usb-serial.rules" @@ -214,6 +214,7 @@ dotfiles = [ "f_mkinitcpio.conf", "f_plymouthd.conf", "f_sshd_config", + "f_getty6conf", ] [profiles.Gondor] diff --git a/config.toml b/config.toml index 80ff672c..d93fa921 100644 --- a/config.toml +++ b/config.toml @@ -313,7 +313,7 @@ dotfiles = [ [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] -dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] +dotfiles = ["f_librewolf_overrides", "f_dconf.ini", "f_zprofile"] [profiles.Gondor] include = ["pacman", "terminal"] diff --git a/home/.zprofile b/home/.zprofile index f2729c2c..b3f2d03a 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,7 +1,7 @@ -if [[ -z $DISPLAY && $XDG_VTNR -eq 1 && -z "$SSH_CONNECTION" ]]; then - {%@@ if profile == 'Moria' @@%} - systemctl --user mask pipewire.service pipewire-pulse.service && systemctl --user stop pipewire.service pipewire-pulse.service && kodi; systemctl --user unmask pipewire.service pipewire-pulse.service && systemctl --user start pipewire.service pipewire-pulse.service - {%@@ elif profile == 'Mirkwood' @@%} - sway-run.sh - {%@@ endif @@%} +if [[ -z $DISPLAY && $XDG_VTNR -eq 6 ]]; then + systemctl --user mask pipewire.service pipewire-pulse.service + systemctl --user stop pipewire.service pipewire-pulse.service + kodi --standalone + systemctl --user unmask pipewire.service pipewire-pulse.service + exit fi diff --git a/root/etc/systemd/system/getty@tty1.service.d/override.conf b/root/etc/systemd/system/getty@tty6.service.d/override.conf similarity index 100% rename from root/etc/systemd/system/getty@tty1.service.d/override.conf rename to root/etc/systemd/system/getty@tty6.service.d/override.conf From e653ee7d18d794719235cfb2eed8e145787d8bc3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Mar 2023 10:27:45 +0200 Subject: [PATCH 1784/2667] Add kodi autostart on tty6 for moria --- config-root.toml | 7 ++++--- config.toml | 2 +- home/.zprofile | 12 ++++++------ .../override.conf | 0 4 files changed, 11 insertions(+), 10 deletions(-) rename root/etc/systemd/system/{getty@tty1.service.d => getty@tty6.service.d}/override.conf (100%) diff --git a/config-root.toml b/config-root.toml index 23226572..7a661ce6 100644 --- a/config-root.toml +++ b/config-root.toml @@ -95,9 +95,9 @@ src = "etc/ssh/sshd_config" dst = "/etc/welcomemessage.conf" src = "etc/welcomemessage.conf" -[dotfiles."f_getty.conf"] -src = "etc/systemd/system/getty@tty1.service.d/override.conf" -dst = "/etc/systemd/system/getty@tty1.service.d/override.conf" +[dotfiles."f_getty6conf"] +src = "etc/systemd/system/getty@tty6.service.d/override.conf" +dst = "/etc/systemd/system/getty@tty6.service.d/override.conf" [dotfiles."f_99-conbee-usb-serial.rules"] src = "etc/udev/rules.d/99-conbee-usb-serial.rules" @@ -214,6 +214,7 @@ dotfiles = [ "f_mkinitcpio.conf", "f_plymouthd.conf", "f_sshd_config", + "f_getty6conf", ] [profiles.Gondor] diff --git a/config.toml b/config.toml index 80ff672c..d93fa921 100644 --- a/config.toml +++ b/config.toml @@ -313,7 +313,7 @@ dotfiles = [ [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] -dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] +dotfiles = ["f_librewolf_overrides", "f_dconf.ini", "f_zprofile"] [profiles.Gondor] include = ["pacman", "terminal"] diff --git a/home/.zprofile b/home/.zprofile index f2729c2c..b3f2d03a 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,7 +1,7 @@ -if [[ -z $DISPLAY && $XDG_VTNR -eq 1 && -z "$SSH_CONNECTION" ]]; then - {%@@ if profile == 'Moria' @@%} - systemctl --user mask pipewire.service pipewire-pulse.service && systemctl --user stop pipewire.service pipewire-pulse.service && kodi; systemctl --user unmask pipewire.service pipewire-pulse.service && systemctl --user start pipewire.service pipewire-pulse.service - {%@@ elif profile == 'Mirkwood' @@%} - sway-run.sh - {%@@ endif @@%} +if [[ -z $DISPLAY && $XDG_VTNR -eq 6 ]]; then + systemctl --user mask pipewire.service pipewire-pulse.service + systemctl --user stop pipewire.service pipewire-pulse.service + kodi --standalone + systemctl --user unmask pipewire.service pipewire-pulse.service + exit fi diff --git a/root/etc/systemd/system/getty@tty1.service.d/override.conf b/root/etc/systemd/system/getty@tty6.service.d/override.conf similarity index 100% rename from root/etc/systemd/system/getty@tty1.service.d/override.conf rename to root/etc/systemd/system/getty@tty6.service.d/override.conf From 5c246e1fc78a1c5ffea7dea8bc9ae6d102499338 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Mar 2023 10:28:00 +0200 Subject: [PATCH 1785/2667] Add headscale --- docker/headscale/docker-compose.toml | 43 ++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 docker/headscale/docker-compose.toml diff --git a/docker/headscale/docker-compose.toml b/docker/headscale/docker-compose.toml new file mode 100644 index 00000000..40fad9ea --- /dev/null +++ b/docker/headscale/docker-compose.toml @@ -0,0 +1,43 @@ +[services.headscale] +image = "headscale/headscale" +container_name = "headscale" +volumes = [ + "/docker/headscale/config:/etc/headscale/", + "/docker/headscale/data:/var/lib/headscale", +] +ports = ["3478:3478/udp"] +command = "headscale serve" +restart = "unless-stopped" +networks = ["postgres"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.headscale-redirect.entrypoints=http", + "traefik.http.routers.headscale-redirect.rule=PathPrefix(`/`)&&Host(`headscale.korhonen.cc`)", + "traefik.http.routers.headscale-redirect.middlewares=http2https@file", + "traefik.http.routers.headscale.entrypoints=https", + "traefik.http.routers.headscale.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.headscale.rule=PathPrefix(`/`) && Host(`headscale.korhonen.cc`)", + "traefik.http.routers.headscale.service=headscale", + "traefik.http.services.headscale.loadbalancer.server.port=8080", +] + +[services.headscale-ui] +image = "ghcr.io/gurucomputing/headscale-ui" +container_name = "headscale-ui" +restart = "unless-stopped" +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.headscale-ui-redirect.entrypoints=http", + "traefik.http.routers.headscale-ui-redirect.rule=PathPrefix(`/web`)&&Host(`headscale.korhonen.cc`)", + "traefik.http.routers.headscale-ui-redirect.middlewares=http2https@file", + "traefik.http.routers.headscale-ui.entrypoints=https", + "traefik.http.routers.headscale-ui.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.headscale-ui.rule=PathPrefix(`/web`)&&Host(`headscale.korhonen.cc`)", + "traefik.http.routers.headscale-ui.service=headscale-ui", + "traefik.http.services.headscale-ui.loadbalancer.server.port=80", +] + +[networks.postgres] +external = true From fc0493d99ec9eaf9bb03f18cef367a5d75fe6de9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Mar 2023 10:28:00 +0200 Subject: [PATCH 1786/2667] Add headscale --- docker/headscale/docker-compose.toml | 43 ++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 docker/headscale/docker-compose.toml diff --git a/docker/headscale/docker-compose.toml b/docker/headscale/docker-compose.toml new file mode 100644 index 00000000..40fad9ea --- /dev/null +++ b/docker/headscale/docker-compose.toml @@ -0,0 +1,43 @@ +[services.headscale] +image = "headscale/headscale" +container_name = "headscale" +volumes = [ + "/docker/headscale/config:/etc/headscale/", + "/docker/headscale/data:/var/lib/headscale", +] +ports = ["3478:3478/udp"] +command = "headscale serve" +restart = "unless-stopped" +networks = ["postgres"] +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.headscale-redirect.entrypoints=http", + "traefik.http.routers.headscale-redirect.rule=PathPrefix(`/`)&&Host(`headscale.korhonen.cc`)", + "traefik.http.routers.headscale-redirect.middlewares=http2https@file", + "traefik.http.routers.headscale.entrypoints=https", + "traefik.http.routers.headscale.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.headscale.rule=PathPrefix(`/`) && Host(`headscale.korhonen.cc`)", + "traefik.http.routers.headscale.service=headscale", + "traefik.http.services.headscale.loadbalancer.server.port=8080", +] + +[services.headscale-ui] +image = "ghcr.io/gurucomputing/headscale-ui" +container_name = "headscale-ui" +restart = "unless-stopped" +labels = [ + "traefik.enable=true", + "traefik.docker.network=proxy", + "traefik.http.routers.headscale-ui-redirect.entrypoints=http", + "traefik.http.routers.headscale-ui-redirect.rule=PathPrefix(`/web`)&&Host(`headscale.korhonen.cc`)", + "traefik.http.routers.headscale-ui-redirect.middlewares=http2https@file", + "traefik.http.routers.headscale-ui.entrypoints=https", + "traefik.http.routers.headscale-ui.middlewares=secHeaders@file,compress@file", + "traefik.http.routers.headscale-ui.rule=PathPrefix(`/web`)&&Host(`headscale.korhonen.cc`)", + "traefik.http.routers.headscale-ui.service=headscale-ui", + "traefik.http.services.headscale-ui.loadbalancer.server.port=80", +] + +[networks.postgres] +external = true From 19461430f76e283d56c8386d74e7b65d700025a0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 Mar 2023 13:22:34 +0200 Subject: [PATCH 1787/2667] Fix repo add alias --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index b031d720..98244c4b 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -75,7 +75,7 @@ pr() { ra() { SELECTED_PKGS="$(paru -Slqa | fzf --header='Add packages to repo' -m --preview 'paru -Si {1}' | tr '\n' ' ')" if [ -n "$SELECTED_PKGS" ]; then - cmd="aur -S $SELECTED_PKGS" + cmd="aur sync -S $SELECTED_PKGS" # Append the expanded command to history print -s "$cmd" From c47a85b539260170fdb2cbc5b1646a42d33451a8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 Mar 2023 13:22:34 +0200 Subject: [PATCH 1788/2667] Fix repo add alias --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index b031d720..98244c4b 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -75,7 +75,7 @@ pr() { ra() { SELECTED_PKGS="$(paru -Slqa | fzf --header='Add packages to repo' -m --preview 'paru -Si {1}' | tr '\n' ' ')" if [ -n "$SELECTED_PKGS" ]; then - cmd="aur -S $SELECTED_PKGS" + cmd="aur sync -S $SELECTED_PKGS" # Append the expanded command to history print -s "$cmd" From 74f5f1e3cb1e78b34838e83021534c47ef9673d9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Mar 2023 18:30:47 +0200 Subject: [PATCH 1789/2667] Moria: don't logout after kodi exits --- home/.zprofile | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.zprofile b/home/.zprofile index b3f2d03a..d5b3d058 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -3,5 +3,4 @@ if [[ -z $DISPLAY && $XDG_VTNR -eq 6 ]]; then systemctl --user stop pipewire.service pipewire-pulse.service kodi --standalone systemctl --user unmask pipewire.service pipewire-pulse.service - exit fi From 702fdec58490fc6134e538209caadac192b615ef Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Mar 2023 18:30:47 +0200 Subject: [PATCH 1790/2667] Moria: don't logout after kodi exits --- home/.zprofile | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.zprofile b/home/.zprofile index b3f2d03a..d5b3d058 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -3,5 +3,4 @@ if [[ -z $DISPLAY && $XDG_VTNR -eq 6 ]]; then systemctl --user stop pipewire.service pipewire-pulse.service kodi --standalone systemctl --user unmask pipewire.service pipewire-pulse.service - exit fi From 654e0917ca945b11e74f3e789ca8ead70a833277 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Mar 2023 13:26:22 +0200 Subject: [PATCH 1791/2667] Nvim: order completion sources for better priority --- home/.config/nvim/lua/plugins/cmp.lua | 160 +++++++++++++------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index a4e7d085..c4a18bbf 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -1,88 +1,88 @@ return function() - local cmp = require("cmp") - local luasnip = require("luasnip") + local cmp = require("cmp") + local luasnip = require("luasnip") - if not cmp then - return - end + if not cmp then + return + end - -- Setup git completion source - require("cmp_git").setup() + -- Setup git completion source + require("cmp_git").setup() - -- Set completeopt to have a better completion experience - vim.o.completeopt = "menuone,noselect" + -- Set completeopt to have a better completion experience + vim.o.completeopt = "menuone,noselect" - cmp.setup({ - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - mapping = { - [""] = cmp.mapping.select_prev_item(), - [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.close(), - [""] = cmp.mapping.confirm({ - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }), - [""] = function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, - [""] = function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, - }, - sources = { - { name = "buffer" }, - { name = "git" }, - { name = "luasnip" }, - { name = "nvim_lsp" }, - { name = "nvim_lua" }, - { name = "path" }, - { name = "spell" }, - }, - }) + cmp.setup({ + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + mapping = { + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.close(), + [""] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }), + [""] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, + [""] = function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, + }, + sources = { + { name = "nvim_lsp" }, + { name = "nvim_lua" }, + { name = "luasnip" }, + { name = "git" }, + { name = "buffer" }, + { name = "spell" }, + { name = "path" }, + }, + }) - -- Enable autopairs when enter is processed - -- on completion - local cmp_autopairs = require("nvim-autopairs.completion.cmp") - cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) + -- Enable autopairs when enter is processed + -- on completion + local cmp_autopairs = require("nvim-autopairs.completion.cmp") + cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) - -- `/` cmdline setup. - cmp.setup.cmdline("/", { - mapping = cmp.mapping.preset.cmdline(), - sources = { - { name = "buffer" }, - }, - }) - -- `:` cmdline setup. - cmp.setup.cmdline(":", { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ - { name = "path" }, - }, { - { - name = "cmdline", - option = { - ignore_cmds = { "Man", "!" }, - }, - }, - }), - }) + -- `/` cmdline setup. + cmp.setup.cmdline("/", { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = "buffer" }, + }, + }) + -- `:` cmdline setup. + cmp.setup.cmdline(":", { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = "path" }, + }, { + { + name = "cmdline", + option = { + ignore_cmds = { "Man", "!" }, + }, + }, + }), + }) end From 9ec2a8eb9bf67552d993a58162d23d131c29a675 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Mar 2023 13:26:22 +0200 Subject: [PATCH 1792/2667] Nvim: order completion sources for better priority --- home/.config/nvim/lua/plugins/cmp.lua | 160 +++++++++++++------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index a4e7d085..c4a18bbf 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -1,88 +1,88 @@ return function() - local cmp = require("cmp") - local luasnip = require("luasnip") + local cmp = require("cmp") + local luasnip = require("luasnip") - if not cmp then - return - end + if not cmp then + return + end - -- Setup git completion source - require("cmp_git").setup() + -- Setup git completion source + require("cmp_git").setup() - -- Set completeopt to have a better completion experience - vim.o.completeopt = "menuone,noselect" + -- Set completeopt to have a better completion experience + vim.o.completeopt = "menuone,noselect" - cmp.setup({ - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - mapping = { - [""] = cmp.mapping.select_prev_item(), - [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.close(), - [""] = cmp.mapping.confirm({ - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }), - [""] = function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, - [""] = function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, - }, - sources = { - { name = "buffer" }, - { name = "git" }, - { name = "luasnip" }, - { name = "nvim_lsp" }, - { name = "nvim_lua" }, - { name = "path" }, - { name = "spell" }, - }, - }) + cmp.setup({ + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + mapping = { + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.close(), + [""] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }), + [""] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, + [""] = function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, + }, + sources = { + { name = "nvim_lsp" }, + { name = "nvim_lua" }, + { name = "luasnip" }, + { name = "git" }, + { name = "buffer" }, + { name = "spell" }, + { name = "path" }, + }, + }) - -- Enable autopairs when enter is processed - -- on completion - local cmp_autopairs = require("nvim-autopairs.completion.cmp") - cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) + -- Enable autopairs when enter is processed + -- on completion + local cmp_autopairs = require("nvim-autopairs.completion.cmp") + cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) - -- `/` cmdline setup. - cmp.setup.cmdline("/", { - mapping = cmp.mapping.preset.cmdline(), - sources = { - { name = "buffer" }, - }, - }) - -- `:` cmdline setup. - cmp.setup.cmdline(":", { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ - { name = "path" }, - }, { - { - name = "cmdline", - option = { - ignore_cmds = { "Man", "!" }, - }, - }, - }), - }) + -- `/` cmdline setup. + cmp.setup.cmdline("/", { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = "buffer" }, + }, + }) + -- `:` cmdline setup. + cmp.setup.cmdline(":", { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = "path" }, + }, { + { + name = "cmdline", + option = { + ignore_cmds = { "Man", "!" }, + }, + }, + }), + }) end From 7ec5fb36fa09035bb07a91722b9e08a083ffd028 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Mar 2023 18:36:42 +0200 Subject: [PATCH 1793/2667] Add plymouth to Mirkwood --- root/etc/mkinitcpio.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 56b0307a..9b5d4dc4 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -4,8 +4,7 @@ BINARIES=("/usr/bin/btrfs") FILES=() {%@@ if profile == "Mirkwood" @@%} -#HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) -HOOKS=(base udev kms keyboard autodetect modconf block filesystems btrfs encrypt fsck) +HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) {%@@ elif profile == 'Moria' @@%} #HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) HOOKS=(base udev kms keyboard autodetect modconf block netconf dropbear encryptssh filesystems btrfs fsck) From 3da0c390143da10cea9c89ed04b1bfcfb094f337 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Mar 2023 18:36:42 +0200 Subject: [PATCH 1794/2667] Add plymouth to Mirkwood --- root/etc/mkinitcpio.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 56b0307a..9b5d4dc4 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -4,8 +4,7 @@ BINARIES=("/usr/bin/btrfs") FILES=() {%@@ if profile == "Mirkwood" @@%} -#HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) -HOOKS=(base udev kms keyboard autodetect modconf block filesystems btrfs encrypt fsck) +HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) {%@@ elif profile == 'Moria' @@%} #HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) HOOKS=(base udev kms keyboard autodetect modconf block netconf dropbear encryptssh filesystems btrfs fsck) From da129188d12b504a17f4c7e60968bac675954233 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Mar 2023 18:36:59 +0200 Subject: [PATCH 1795/2667] Beets: disable follow plugin Causes errors and does not seem to be maintained anymore --- home/.config/beets/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml index 203dad0c..166d3b4f 100644 --- a/home/.config/beets/config.yaml +++ b/home/.config/beets/config.yaml @@ -5,7 +5,7 @@ plugins: - check - edit - fetchart - - follow + # - follow - fuzzy - info - lastgenre From 8065b2dab0a97a87640cd3d1f30dee6f0e6abce4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Mar 2023 18:36:59 +0200 Subject: [PATCH 1796/2667] Beets: disable follow plugin Causes errors and does not seem to be maintained anymore --- home/.config/beets/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml index 203dad0c..166d3b4f 100644 --- a/home/.config/beets/config.yaml +++ b/home/.config/beets/config.yaml @@ -5,7 +5,7 @@ plugins: - check - edit - fetchart - - follow + # - follow - fuzzy - info - lastgenre From df1a1e45cf1819e845f556462ba8819424f09259 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Mar 2023 19:11:26 +0200 Subject: [PATCH 1797/2667] Mpv: add shuffle keybind --- home/.config/mpv/input.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/mpv/input.conf b/home/.config/mpv/input.conf index 4dc916fa..28f13934 100644 --- a/home/.config/mpv/input.conf +++ b/home/.config/mpv/input.conf @@ -22,3 +22,5 @@ MUTE cycle ao-mute = add audio-delay 0.100 - add audio-delay -0.100 + +s playlist-shuffle From 94b70310e40b4daf15d38283bfd9a06ad47f1e44 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Mar 2023 19:11:26 +0200 Subject: [PATCH 1798/2667] Mpv: add shuffle keybind --- home/.config/mpv/input.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/mpv/input.conf b/home/.config/mpv/input.conf index 4dc916fa..28f13934 100644 --- a/home/.config/mpv/input.conf +++ b/home/.config/mpv/input.conf @@ -22,3 +22,5 @@ MUTE cycle ao-mute = add audio-delay 0.100 - add audio-delay -0.100 + +s playlist-shuffle From 1a60a2aed4f4c67dd210ccd1b9a8c9e44b261ae1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Mar 2023 19:11:41 +0200 Subject: [PATCH 1799/2667] Beets: add mpv and mpd options --- home/.config/beets/config.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml index 166d3b4f..7a328b3a 100644 --- a/home/.config/beets/config.yaml +++ b/home/.config/beets/config.yaml @@ -25,10 +25,11 @@ lastgenre: lyrics: fallback: '' play: - command: mpv + command: mpv --no-vid --no-resume-playback mpd: host: localhost port: 6600 + password: "{{@@ env['PASS_MPD_ADMIN'] @@}}" follow: email: reekymarko@reekynet.com password: "{{@@ env['PASS_MUSPY'] @@}}" From 8bb500ac4ba5e1087162438973fa64dc8c5284c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Mar 2023 19:11:41 +0200 Subject: [PATCH 1800/2667] Beets: add mpv and mpd options --- home/.config/beets/config.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml index 166d3b4f..7a328b3a 100644 --- a/home/.config/beets/config.yaml +++ b/home/.config/beets/config.yaml @@ -25,10 +25,11 @@ lastgenre: lyrics: fallback: '' play: - command: mpv + command: mpv --no-vid --no-resume-playback mpd: host: localhost port: 6600 + password: "{{@@ env['PASS_MPD_ADMIN'] @@}}" follow: email: reekymarko@reekynet.com password: "{{@@ env['PASS_MUSPY'] @@}}" From 8354fcefb6d22dcc6ad0cace6cf9706d453bc208 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 Mar 2023 18:31:07 +0200 Subject: [PATCH 1801/2667] Change plymouth theme --- root/etc/plymouth/plymouthd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/plymouth/plymouthd.conf b/root/etc/plymouth/plymouthd.conf index 7765710e..dffebeca 100644 --- a/root/etc/plymouth/plymouthd.conf +++ b/root/etc/plymouth/plymouthd.conf @@ -1,5 +1,5 @@ [Daemon] -Theme=arch-logo-gnomish +Theme=arch-charge-gdm-spinner ShowDelay=0 DeviceTimeout=8 {%@@ if profile == "Moria" @@%} From 1529ae20c74311bc2f4c6d1202ca4d31ea6c8fd8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 Mar 2023 18:31:07 +0200 Subject: [PATCH 1802/2667] Change plymouth theme --- root/etc/plymouth/plymouthd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/plymouth/plymouthd.conf b/root/etc/plymouth/plymouthd.conf index 7765710e..dffebeca 100644 --- a/root/etc/plymouth/plymouthd.conf +++ b/root/etc/plymouth/plymouthd.conf @@ -1,5 +1,5 @@ [Daemon] -Theme=arch-logo-gnomish +Theme=arch-charge-gdm-spinner ShowDelay=0 DeviceTimeout=8 {%@@ if profile == "Moria" @@%} From 9cb79c97ba9860a58525576fa90a260da4afd9db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 Mar 2023 18:32:07 +0200 Subject: [PATCH 1803/2667] Add cachyos repos and kernel --- config-root.toml | 20 +++++++++++++++----- root/etc/mkinitcpio.d/linux-cachyos.preset | 8 ++++++++ root/etc/pacman.conf | 8 ++++++++ 3 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 root/etc/mkinitcpio.d/linux-cachyos.preset diff --git a/config-root.toml b/config-root.toml index 7a661ce6..85934aad 100644 --- a/config-root.toml +++ b/config-root.toml @@ -143,9 +143,17 @@ dst = "/etc/default/cpupower" src = "etc/pacserve/pacserve.service.conf" dst = "/etc/pacserve/pacserve.service.conf" -[dotfiles."d_mkinitcpio.d"] -src = "etc/mkinitcpio.d" -dst = "/etc/mkinitcpio.d" +[dotfiles."f_mkinitcpio_linux.preset"] +src = "etc/mkinitcpio.d/linux.preset" +dst = "/etc/mkinitcpio.d/linux.preset" + +[dotfiles."f_mkinitcpio_linux-cachyos.preset"] +src = "etc/mkinitcpio.d/linux-cachyos.preset" +dst = "/etc/mkinitcpio.d/linux-cachyos.preset" + +[dotfiles."f_mkinitcpio_linux-zen.preset"] +src = "etc/mkinitcpio.d/linux-zen.preset" +dst = "/etc/mkinitcpio.d/linux-zen.preset" [dotfiles.f_cmdline] src = "etc/kernel/cmdline" @@ -180,7 +188,6 @@ dotfiles = [ [profiles.Mirkwood] dotfiles = [ "d_bin", - "d_mkinitcpio.d", "f_20-quiet-printk.conf", "f_60-uinput-permissions.rules", "f_99-lowbat.rules", @@ -195,6 +202,8 @@ dotfiles = [ "f_ignore", "f_logind.conf", "f_mkinitcpio.conf", + "f_mkinitcpio_linux.preset", + "f_mkinitcpio_linux-cachyos.preset", "f_plymouthd.conf", "f_sshd_config", "f_system.conf", @@ -206,12 +215,13 @@ include = ["Locale", "Pacman", "Network"] [profiles.Moria] include = ["Locale", "Pacman", "Network"] dotfiles = [ - "d_mkinitcpio.d", "f_99-sysctl.conf", "f_cmdline", "f_cpupower", "f_doas.conf", "f_mkinitcpio.conf", + "f_mkinitcpio_linux.preset", + "f_mkinitcpio_linux-cachyos.preset", "f_plymouthd.conf", "f_sshd_config", "f_getty6conf", diff --git a/root/etc/mkinitcpio.d/linux-cachyos.preset b/root/etc/mkinitcpio.d/linux-cachyos.preset new file mode 100644 index 00000000..392ff60a --- /dev/null +++ b/root/etc/mkinitcpio.d/linux-cachyos.preset @@ -0,0 +1,8 @@ +PRESETS=('default') + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux-cachyos" +ALL_microcode=(/boot/*-ucode.img) + +default_image="/boot/initramfs-linux-cachyos.img" +default_uki="/boot/EFI/Linux/archlinux-linux-cachyos.efi" diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 97733f89..aa238542 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -13,6 +13,14 @@ CleanMethod=KeepCurrent CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} +[cachyos-v3] +Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/cachyos-v3-mirrorlist + +[cachyos] +Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/cachyos-mirrorlist + [korhonen_aur] {%@@ if profile == "Moria" @@%} Server = file:///docker/index.korhonen.cc/repo/arch_linux/$repo/$arch From 9256c0352c88feeca4770b6348f16fca9701d00c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 Mar 2023 18:32:07 +0200 Subject: [PATCH 1804/2667] Add cachyos repos and kernel --- config-root.toml | 20 +++++++++++++++----- root/etc/mkinitcpio.d/linux-cachyos.preset | 8 ++++++++ root/etc/pacman.conf | 8 ++++++++ 3 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 root/etc/mkinitcpio.d/linux-cachyos.preset diff --git a/config-root.toml b/config-root.toml index 7a661ce6..85934aad 100644 --- a/config-root.toml +++ b/config-root.toml @@ -143,9 +143,17 @@ dst = "/etc/default/cpupower" src = "etc/pacserve/pacserve.service.conf" dst = "/etc/pacserve/pacserve.service.conf" -[dotfiles."d_mkinitcpio.d"] -src = "etc/mkinitcpio.d" -dst = "/etc/mkinitcpio.d" +[dotfiles."f_mkinitcpio_linux.preset"] +src = "etc/mkinitcpio.d/linux.preset" +dst = "/etc/mkinitcpio.d/linux.preset" + +[dotfiles."f_mkinitcpio_linux-cachyos.preset"] +src = "etc/mkinitcpio.d/linux-cachyos.preset" +dst = "/etc/mkinitcpio.d/linux-cachyos.preset" + +[dotfiles."f_mkinitcpio_linux-zen.preset"] +src = "etc/mkinitcpio.d/linux-zen.preset" +dst = "/etc/mkinitcpio.d/linux-zen.preset" [dotfiles.f_cmdline] src = "etc/kernel/cmdline" @@ -180,7 +188,6 @@ dotfiles = [ [profiles.Mirkwood] dotfiles = [ "d_bin", - "d_mkinitcpio.d", "f_20-quiet-printk.conf", "f_60-uinput-permissions.rules", "f_99-lowbat.rules", @@ -195,6 +202,8 @@ dotfiles = [ "f_ignore", "f_logind.conf", "f_mkinitcpio.conf", + "f_mkinitcpio_linux.preset", + "f_mkinitcpio_linux-cachyos.preset", "f_plymouthd.conf", "f_sshd_config", "f_system.conf", @@ -206,12 +215,13 @@ include = ["Locale", "Pacman", "Network"] [profiles.Moria] include = ["Locale", "Pacman", "Network"] dotfiles = [ - "d_mkinitcpio.d", "f_99-sysctl.conf", "f_cmdline", "f_cpupower", "f_doas.conf", "f_mkinitcpio.conf", + "f_mkinitcpio_linux.preset", + "f_mkinitcpio_linux-cachyos.preset", "f_plymouthd.conf", "f_sshd_config", "f_getty6conf", diff --git a/root/etc/mkinitcpio.d/linux-cachyos.preset b/root/etc/mkinitcpio.d/linux-cachyos.preset new file mode 100644 index 00000000..392ff60a --- /dev/null +++ b/root/etc/mkinitcpio.d/linux-cachyos.preset @@ -0,0 +1,8 @@ +PRESETS=('default') + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux-cachyos" +ALL_microcode=(/boot/*-ucode.img) + +default_image="/boot/initramfs-linux-cachyos.img" +default_uki="/boot/EFI/Linux/archlinux-linux-cachyos.efi" diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 97733f89..aa238542 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -13,6 +13,14 @@ CleanMethod=KeepCurrent CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} +[cachyos-v3] +Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/cachyos-v3-mirrorlist + +[cachyos] +Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/cachyos-mirrorlist + [korhonen_aur] {%@@ if profile == "Moria" @@%} Server = file:///docker/index.korhonen.cc/repo/arch_linux/$repo/$arch From da6807e50f84f5f0d0359396fe6a5cef2eb65660 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 Mar 2023 18:59:41 +0200 Subject: [PATCH 1805/2667] Move korhonen_aur to be the last repo This allows to upgrade packages that have been moved to community etc --- root/etc/pacman.conf | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index aa238542..0d193a16 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -21,14 +21,6 @@ Include = /etc/pacman.d/cachyos-v3-mirrorlist Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/cachyos-mirrorlist -[korhonen_aur] -{%@@ if profile == "Moria" @@%} -Server = file:///docker/index.korhonen.cc/repo/arch_linux/$repo/$arch -{%@@ else @@%} -Include = /etc/pacman.d/pacserve -Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch -{%@@ endif @@%} - [core] Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist @@ -44,3 +36,12 @@ Include = /etc/pacman.d/mirrorlist [multilib] Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist + +[korhonen_aur] +{%@@ if profile == "Moria" @@%} +Server = file:///docker/index.korhonen.cc/repo/arch_linux/$repo/$arch +{%@@ else @@%} +Include = /etc/pacman.d/pacserve +Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch +{%@@ endif @@%} + From 64f63eb156a7ea283f6e5a69892c53e0592a4152 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 Mar 2023 18:59:41 +0200 Subject: [PATCH 1806/2667] Move korhonen_aur to be the last repo This allows to upgrade packages that have been moved to community etc --- root/etc/pacman.conf | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index aa238542..0d193a16 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -21,14 +21,6 @@ Include = /etc/pacman.d/cachyos-v3-mirrorlist Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/cachyos-mirrorlist -[korhonen_aur] -{%@@ if profile == "Moria" @@%} -Server = file:///docker/index.korhonen.cc/repo/arch_linux/$repo/$arch -{%@@ else @@%} -Include = /etc/pacman.d/pacserve -Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch -{%@@ endif @@%} - [core] Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist @@ -44,3 +36,12 @@ Include = /etc/pacman.d/mirrorlist [multilib] Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist + +[korhonen_aur] +{%@@ if profile == "Moria" @@%} +Server = file:///docker/index.korhonen.cc/repo/arch_linux/$repo/$arch +{%@@ else @@%} +Include = /etc/pacman.d/pacserve +Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch +{%@@ endif @@%} + From 6d0c8ac6d7ace792c5ae8542eb7b522ee89d1b1a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Mar 2023 08:48:37 +0200 Subject: [PATCH 1807/2667] Add cachyos community repo --- root/etc/pacman.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 0d193a16..40f2939b 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -17,6 +17,9 @@ CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/cachyos-v3-mirrorlist +[cachyos-community-v3] +Include = /etc/pacman.d/cachyos-v3-mirrorlist + [cachyos] Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/cachyos-mirrorlist From 432328a8b43637635006347b14309c1e38572f0f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Mar 2023 08:48:37 +0200 Subject: [PATCH 1808/2667] Add cachyos community repo --- root/etc/pacman.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 0d193a16..40f2939b 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -17,6 +17,9 @@ CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/cachyos-v3-mirrorlist +[cachyos-community-v3] +Include = /etc/pacman.d/cachyos-v3-mirrorlist + [cachyos] Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/cachyos-mirrorlist From bb0330912e261f31d41a0b26b6732452c3285b50 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Mar 2023 08:50:12 +0200 Subject: [PATCH 1809/2667] Enable pacserve on cachyos community --- root/etc/pacman.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 40f2939b..2256bea2 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -18,6 +18,7 @@ Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/cachyos-v3-mirrorlist [cachyos-community-v3] +Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/cachyos-v3-mirrorlist [cachyos] From 690743f6d0bf162b94e69cf2cc5c3f7a531a7d1d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Mar 2023 08:50:12 +0200 Subject: [PATCH 1810/2667] Enable pacserve on cachyos community --- root/etc/pacman.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 40f2939b..2256bea2 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -18,6 +18,7 @@ Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/cachyos-v3-mirrorlist [cachyos-community-v3] +Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/cachyos-v3-mirrorlist [cachyos] From 97267f948cc5621605219df67309a93005ccf6f4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Mar 2023 21:18:29 +0200 Subject: [PATCH 1811/2667] Nvim: Add ASCIIDoc preview plugin --- home/.config/nvim/lua/plugins/init.lua | 319 +++++++++++++------------ 1 file changed, 161 insertions(+), 158 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 8933063d..7d16e4e4 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -1,200 +1,203 @@ -- Install lazy if it's not yet installed local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) end vim.opt.rtp:prepend(lazypath) -- Configure lazy local plugins = { - -- Colorscheme - { - "rebelot/kanagawa.nvim", - config = function() - vim.cmd("colorscheme kanagawa") - end, - }, + -- Colorscheme + { + "rebelot/kanagawa.nvim", + config = function() + vim.cmd("colorscheme kanagawa") + end, + }, - -- Statusline - { - "nvim-lualine/lualine.nvim", - dependencies = { "kyazdani42/nvim-web-devicons" }, - config = true, - }, + -- Statusline + { + "nvim-lualine/lualine.nvim", + dependencies = { "kyazdani42/nvim-web-devicons" }, + config = true, + }, - -- Git status in signcolumn - { - "lewis6991/gitsigns.nvim", - config = true, - }, + -- Git status in signcolumn + { + "lewis6991/gitsigns.nvim", + config = true, + }, - -- Tabline/bufferline - { - "akinsho/bufferline.nvim", - version = "v3.*", - dependencies = { "kyazdani42/nvim-web-devicons" }, - config = true, - }, + -- Tabline/bufferline + { + "akinsho/bufferline.nvim", + version = "v3.*", + dependencies = { "kyazdani42/nvim-web-devicons" }, + config = true, + }, - -- Git commands - "tpope/vim-fugitive", + -- Git commands + "tpope/vim-fugitive", - -- Indent characters - { - "lukas-reineke/indent-blankline.nvim", - config = require("plugins.indent-blankline"), - }, + -- Indent characters + { + "lukas-reineke/indent-blankline.nvim", + config = require("plugins.indent-blankline"), + }, - -- Tree explorer - { - "kyazdani42/nvim-tree.lua", - dependencies = { "kyazdani42/nvim-web-devicons" }, - config = require("plugins.nvim-tree"), - }, + -- Tree explorer + { + "kyazdani42/nvim-tree.lua", + dependencies = { "kyazdani42/nvim-web-devicons" }, + config = require("plugins.nvim-tree"), + }, - -- Telescope - { - "nvim-telescope/telescope.nvim", - config = require("plugins.telescope"), - dependencies = { - "nvim-lua/plenary.nvim", -- Internal dep for telescope - -- Use fzf for fuzzy finder - { - "nvim-telescope/telescope-fzf-native.nvim", - build = "make", - }, - "nvim-telescope/telescope-ui-select.nvim", -- Replace vim built in select with telescope - "zane-/cder.nvim", -- cd plugin for telescope - }, - }, + -- Telescope + { + "nvim-telescope/telescope.nvim", + config = require("plugins.telescope"), + dependencies = { + "nvim-lua/plenary.nvim", -- Internal dep for telescope + -- Use fzf for fuzzy finder + { + "nvim-telescope/telescope-fzf-native.nvim", + build = "make", + }, + "nvim-telescope/telescope-ui-select.nvim", -- Replace vim built in select with telescope + "zane-/cder.nvim", -- cd plugin for telescope + }, + }, - -- Do stuff as sudo - "lambdalisue/suda.vim", + -- Do stuff as sudo + "lambdalisue/suda.vim", - -- Display possible keybinds - { "folke/which-key.nvim", config = true }, + -- Display possible keybinds + { "folke/which-key.nvim", config = true }, - -- Read editorconfig settings - "editorconfig/editorconfig-vim", + -- Read editorconfig settings + "editorconfig/editorconfig-vim", - -- Package manager for LSP servers, DAP adapters etc. - { "williamboman/mason.nvim", config = true }, + -- Package manager for LSP servers, DAP adapters etc. + { "williamboman/mason.nvim", config = true }, - -- Install LSP server executables with Mason - { - "williamboman/mason-lspconfig.nvim", - config = true, - }, + -- Install LSP server executables with Mason + { + "williamboman/mason-lspconfig.nvim", + config = true, + }, - -- Configs for built-in LSP - { "neovim/nvim-lspconfig", config = require("plugins.lspconfig").setup }, + -- Configs for built-in LSP + { "neovim/nvim-lspconfig", config = require("plugins.lspconfig").setup }, - -- Additional LSP features for Java - "mfussenegger/nvim-jdtls", + -- Additional LSP features for Java + "mfussenegger/nvim-jdtls", - -- DAP plugin - { "mfussenegger/nvim-dap", config = require("plugins.dap") }, + -- DAP plugin + { "mfussenegger/nvim-dap", config = require("plugins.dap") }, - -- Display function signature - "ray-x/lsp_signature.nvim", + -- Display function signature + "ray-x/lsp_signature.nvim", - -- Snippets plugin - { - "L3MON4D3/LuaSnip", - dependencies = { "rafamadriz/friendly-snippets" }, -- Snippets collection - config = require("plugins.luasnip"), - }, + -- Snippets plugin + { + "L3MON4D3/LuaSnip", + dependencies = { "rafamadriz/friendly-snippets" }, -- Snippets collection + config = require("plugins.luasnip"), + }, - -- vim api documentation for lua lsp - "ii14/emmylua-nvim", + -- vim api documentation for lua lsp + "ii14/emmylua-nvim", - -- Completion - { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-buffer", -- Buffer source - { "petertriho/cmp-git", dependencies = { "nvim-lua/plenary.nvim" } }, -- Git source - "hrsh7th/cmp-nvim-lsp", -- LSP source - "hrsh7th/cmp-nvim-lua", -- Neovim Lua API documentation source - "hrsh7th/cmp-path", -- Path source - "hrsh7th/cmp-cmdline", -- cmdline source - "saadparwaiz1/cmp_luasnip", -- Snippets source - "f3fora/cmp-spell", -- Spell check source - }, - config = require("plugins.cmp"), - }, + -- Completion + { + "hrsh7th/nvim-cmp", + dependencies = { + "hrsh7th/cmp-buffer", -- Buffer source + { "petertriho/cmp-git", dependencies = { "nvim-lua/plenary.nvim" } }, -- Git source + "hrsh7th/cmp-nvim-lsp", -- LSP source + "hrsh7th/cmp-nvim-lua", -- Neovim Lua API documentation source + "hrsh7th/cmp-path", -- Path source + "hrsh7th/cmp-cmdline", -- cmdline source + "saadparwaiz1/cmp_luasnip", -- Snippets source + "f3fora/cmp-spell", -- Spell check source + }, + config = require("plugins.cmp"), + }, - -- Automatic brackets - { - "windwp/nvim-autopairs", - config = true, - }, + -- Automatic brackets + { + "windwp/nvim-autopairs", + config = true, + }, - -- treesitter - { - "nvim-treesitter/nvim-treesitter", - build = function() - require("nvim-treesitter.install").update({ with_sync = true }) - end, - config = require("plugins.treesitter"), - }, + -- treesitter + { + "nvim-treesitter/nvim-treesitter", + build = function() + require("nvim-treesitter.install").update({ with_sync = true }) + end, + config = require("plugins.treesitter"), + }, - -- treesitter plugin for commentstring - "JoosepAlviste/nvim-ts-context-commentstring", + -- treesitter plugin for commentstring + "JoosepAlviste/nvim-ts-context-commentstring", - -- mappings for commenting in code - "tpope/vim-commentary", + -- mappings for commenting in code + "tpope/vim-commentary", - -- we all know this one - "tpope/vim-surround", + -- we all know this one + "tpope/vim-surround", - -- Formatter plugin - "sbdchd/neoformat", + -- Formatter plugin + "sbdchd/neoformat", - -- Make editing passwords safer - { - "https://git.zx2c4.com/password-store", - config = function(plugin) - vim.opt.rtp:append(plugin.dir .. "contrib/vim/redact_pass.vim") - end, - }, + -- Make editing passwords safer + { + "https://git.zx2c4.com/password-store", + config = function(plugin) + vim.opt.rtp:append(plugin.dir .. "contrib/vim/redact_pass.vim") + end, + }, - -- Neovim inside Firefox - { - "glacambre/firenvim", - build = function() - vim.fn["firenvim#install"](0) - end, - }, + -- Neovim inside Firefox + { + "glacambre/firenvim", + build = function() + vim.fn["firenvim#install"](0) + end, + }, - -- Vim <3 Asciidoctor - "habamax/vim-asciidoctor", + -- Vim <3 Asciidoctor + "habamax/vim-asciidoctor", - -- Markdown preview - { - "iamcco/markdown-preview.nvim", - build = "cd app && npm install", - config = function() - vim.g.mkdp_filetypes = { "markdown" } - end, - ft = { "markdown" }, - }, + -- Asciidoc preview + { "tigion/nvim-asciidoc-preview", ft = { "asciidoctor" } }, - -- Edit GPG encrypted files transparently - "jamessan/vim-gnupg", + -- Markdown preview + { + "iamcco/markdown-preview.nvim", + build = "cd app && npm install", + config = function() + vim.g.mkdp_filetypes = { "markdown" } + end, + ft = { "markdown" }, + }, - -- High performance color highlighter - { - "norcalli/nvim-colorizer.lua", - config = true, - }, + -- Edit GPG encrypted files transparently + "jamessan/vim-gnupg", + + -- High performance color highlighter + { + "norcalli/nvim-colorizer.lua", + config = true, + }, } local lazy_opts = {} From 0f6382bfc80aed2991ae5e533c344e6243cb6dd7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Mar 2023 21:18:29 +0200 Subject: [PATCH 1812/2667] Nvim: Add ASCIIDoc preview plugin --- home/.config/nvim/lua/plugins/init.lua | 319 +++++++++++++------------ 1 file changed, 161 insertions(+), 158 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 8933063d..7d16e4e4 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -1,200 +1,203 @@ -- Install lazy if it's not yet installed local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) end vim.opt.rtp:prepend(lazypath) -- Configure lazy local plugins = { - -- Colorscheme - { - "rebelot/kanagawa.nvim", - config = function() - vim.cmd("colorscheme kanagawa") - end, - }, + -- Colorscheme + { + "rebelot/kanagawa.nvim", + config = function() + vim.cmd("colorscheme kanagawa") + end, + }, - -- Statusline - { - "nvim-lualine/lualine.nvim", - dependencies = { "kyazdani42/nvim-web-devicons" }, - config = true, - }, + -- Statusline + { + "nvim-lualine/lualine.nvim", + dependencies = { "kyazdani42/nvim-web-devicons" }, + config = true, + }, - -- Git status in signcolumn - { - "lewis6991/gitsigns.nvim", - config = true, - }, + -- Git status in signcolumn + { + "lewis6991/gitsigns.nvim", + config = true, + }, - -- Tabline/bufferline - { - "akinsho/bufferline.nvim", - version = "v3.*", - dependencies = { "kyazdani42/nvim-web-devicons" }, - config = true, - }, + -- Tabline/bufferline + { + "akinsho/bufferline.nvim", + version = "v3.*", + dependencies = { "kyazdani42/nvim-web-devicons" }, + config = true, + }, - -- Git commands - "tpope/vim-fugitive", + -- Git commands + "tpope/vim-fugitive", - -- Indent characters - { - "lukas-reineke/indent-blankline.nvim", - config = require("plugins.indent-blankline"), - }, + -- Indent characters + { + "lukas-reineke/indent-blankline.nvim", + config = require("plugins.indent-blankline"), + }, - -- Tree explorer - { - "kyazdani42/nvim-tree.lua", - dependencies = { "kyazdani42/nvim-web-devicons" }, - config = require("plugins.nvim-tree"), - }, + -- Tree explorer + { + "kyazdani42/nvim-tree.lua", + dependencies = { "kyazdani42/nvim-web-devicons" }, + config = require("plugins.nvim-tree"), + }, - -- Telescope - { - "nvim-telescope/telescope.nvim", - config = require("plugins.telescope"), - dependencies = { - "nvim-lua/plenary.nvim", -- Internal dep for telescope - -- Use fzf for fuzzy finder - { - "nvim-telescope/telescope-fzf-native.nvim", - build = "make", - }, - "nvim-telescope/telescope-ui-select.nvim", -- Replace vim built in select with telescope - "zane-/cder.nvim", -- cd plugin for telescope - }, - }, + -- Telescope + { + "nvim-telescope/telescope.nvim", + config = require("plugins.telescope"), + dependencies = { + "nvim-lua/plenary.nvim", -- Internal dep for telescope + -- Use fzf for fuzzy finder + { + "nvim-telescope/telescope-fzf-native.nvim", + build = "make", + }, + "nvim-telescope/telescope-ui-select.nvim", -- Replace vim built in select with telescope + "zane-/cder.nvim", -- cd plugin for telescope + }, + }, - -- Do stuff as sudo - "lambdalisue/suda.vim", + -- Do stuff as sudo + "lambdalisue/suda.vim", - -- Display possible keybinds - { "folke/which-key.nvim", config = true }, + -- Display possible keybinds + { "folke/which-key.nvim", config = true }, - -- Read editorconfig settings - "editorconfig/editorconfig-vim", + -- Read editorconfig settings + "editorconfig/editorconfig-vim", - -- Package manager for LSP servers, DAP adapters etc. - { "williamboman/mason.nvim", config = true }, + -- Package manager for LSP servers, DAP adapters etc. + { "williamboman/mason.nvim", config = true }, - -- Install LSP server executables with Mason - { - "williamboman/mason-lspconfig.nvim", - config = true, - }, + -- Install LSP server executables with Mason + { + "williamboman/mason-lspconfig.nvim", + config = true, + }, - -- Configs for built-in LSP - { "neovim/nvim-lspconfig", config = require("plugins.lspconfig").setup }, + -- Configs for built-in LSP + { "neovim/nvim-lspconfig", config = require("plugins.lspconfig").setup }, - -- Additional LSP features for Java - "mfussenegger/nvim-jdtls", + -- Additional LSP features for Java + "mfussenegger/nvim-jdtls", - -- DAP plugin - { "mfussenegger/nvim-dap", config = require("plugins.dap") }, + -- DAP plugin + { "mfussenegger/nvim-dap", config = require("plugins.dap") }, - -- Display function signature - "ray-x/lsp_signature.nvim", + -- Display function signature + "ray-x/lsp_signature.nvim", - -- Snippets plugin - { - "L3MON4D3/LuaSnip", - dependencies = { "rafamadriz/friendly-snippets" }, -- Snippets collection - config = require("plugins.luasnip"), - }, + -- Snippets plugin + { + "L3MON4D3/LuaSnip", + dependencies = { "rafamadriz/friendly-snippets" }, -- Snippets collection + config = require("plugins.luasnip"), + }, - -- vim api documentation for lua lsp - "ii14/emmylua-nvim", + -- vim api documentation for lua lsp + "ii14/emmylua-nvim", - -- Completion - { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-buffer", -- Buffer source - { "petertriho/cmp-git", dependencies = { "nvim-lua/plenary.nvim" } }, -- Git source - "hrsh7th/cmp-nvim-lsp", -- LSP source - "hrsh7th/cmp-nvim-lua", -- Neovim Lua API documentation source - "hrsh7th/cmp-path", -- Path source - "hrsh7th/cmp-cmdline", -- cmdline source - "saadparwaiz1/cmp_luasnip", -- Snippets source - "f3fora/cmp-spell", -- Spell check source - }, - config = require("plugins.cmp"), - }, + -- Completion + { + "hrsh7th/nvim-cmp", + dependencies = { + "hrsh7th/cmp-buffer", -- Buffer source + { "petertriho/cmp-git", dependencies = { "nvim-lua/plenary.nvim" } }, -- Git source + "hrsh7th/cmp-nvim-lsp", -- LSP source + "hrsh7th/cmp-nvim-lua", -- Neovim Lua API documentation source + "hrsh7th/cmp-path", -- Path source + "hrsh7th/cmp-cmdline", -- cmdline source + "saadparwaiz1/cmp_luasnip", -- Snippets source + "f3fora/cmp-spell", -- Spell check source + }, + config = require("plugins.cmp"), + }, - -- Automatic brackets - { - "windwp/nvim-autopairs", - config = true, - }, + -- Automatic brackets + { + "windwp/nvim-autopairs", + config = true, + }, - -- treesitter - { - "nvim-treesitter/nvim-treesitter", - build = function() - require("nvim-treesitter.install").update({ with_sync = true }) - end, - config = require("plugins.treesitter"), - }, + -- treesitter + { + "nvim-treesitter/nvim-treesitter", + build = function() + require("nvim-treesitter.install").update({ with_sync = true }) + end, + config = require("plugins.treesitter"), + }, - -- treesitter plugin for commentstring - "JoosepAlviste/nvim-ts-context-commentstring", + -- treesitter plugin for commentstring + "JoosepAlviste/nvim-ts-context-commentstring", - -- mappings for commenting in code - "tpope/vim-commentary", + -- mappings for commenting in code + "tpope/vim-commentary", - -- we all know this one - "tpope/vim-surround", + -- we all know this one + "tpope/vim-surround", - -- Formatter plugin - "sbdchd/neoformat", + -- Formatter plugin + "sbdchd/neoformat", - -- Make editing passwords safer - { - "https://git.zx2c4.com/password-store", - config = function(plugin) - vim.opt.rtp:append(plugin.dir .. "contrib/vim/redact_pass.vim") - end, - }, + -- Make editing passwords safer + { + "https://git.zx2c4.com/password-store", + config = function(plugin) + vim.opt.rtp:append(plugin.dir .. "contrib/vim/redact_pass.vim") + end, + }, - -- Neovim inside Firefox - { - "glacambre/firenvim", - build = function() - vim.fn["firenvim#install"](0) - end, - }, + -- Neovim inside Firefox + { + "glacambre/firenvim", + build = function() + vim.fn["firenvim#install"](0) + end, + }, - -- Vim <3 Asciidoctor - "habamax/vim-asciidoctor", + -- Vim <3 Asciidoctor + "habamax/vim-asciidoctor", - -- Markdown preview - { - "iamcco/markdown-preview.nvim", - build = "cd app && npm install", - config = function() - vim.g.mkdp_filetypes = { "markdown" } - end, - ft = { "markdown" }, - }, + -- Asciidoc preview + { "tigion/nvim-asciidoc-preview", ft = { "asciidoctor" } }, - -- Edit GPG encrypted files transparently - "jamessan/vim-gnupg", + -- Markdown preview + { + "iamcco/markdown-preview.nvim", + build = "cd app && npm install", + config = function() + vim.g.mkdp_filetypes = { "markdown" } + end, + ft = { "markdown" }, + }, - -- High performance color highlighter - { - "norcalli/nvim-colorizer.lua", - config = true, - }, + -- Edit GPG encrypted files transparently + "jamessan/vim-gnupg", + + -- High performance color highlighter + { + "norcalli/nvim-colorizer.lua", + config = true, + }, } local lazy_opts = {} From a51c46a1f933a6adaec9eac00112fb02837dba00 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Mar 2023 23:02:55 +0200 Subject: [PATCH 1813/2667] Update gnome keybinds --- home/.config/dconf.ini | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/home/.config/dconf.ini b/home/.config/dconf.ini index 3bc8e27f..958dfdd8 100644 --- a/home/.config/dconf.ini +++ b/home/.config/dconf.ini @@ -50,15 +50,16 @@ remove-old-trash-files=true [org/gnome/desktop/wm/keybindings] close=['w'] -toggle-fullscreen=['f'] -move-to-workspace-left=['h'] move-to-workspace-down=['j'] -move-to-workspace-up=['k'] +move-to-workspace-left=['h'] move-to-workspace-right=['l'] -switch-to-workspace-left=['h'] +move-to-workspace-up=['k'] switch-to-workspace-down=['j'] -switch-to-workspace-up=['k'] +switch-to-workspace-left=['h'] switch-to-workspace-right=['l'] +switch-to-workspace-up=['k'] +toggle-fullscreen=@as [] +toggle-maximized=['f'] [org/gnome/settings-daemon/plugins/media-keys] custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/'] From bed90cc635f6d0cdab344f38525ff4e7a29caa6f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Mar 2023 23:02:55 +0200 Subject: [PATCH 1814/2667] Update gnome keybinds --- home/.config/dconf.ini | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/home/.config/dconf.ini b/home/.config/dconf.ini index 3bc8e27f..958dfdd8 100644 --- a/home/.config/dconf.ini +++ b/home/.config/dconf.ini @@ -50,15 +50,16 @@ remove-old-trash-files=true [org/gnome/desktop/wm/keybindings] close=['w'] -toggle-fullscreen=['f'] -move-to-workspace-left=['h'] move-to-workspace-down=['j'] -move-to-workspace-up=['k'] +move-to-workspace-left=['h'] move-to-workspace-right=['l'] -switch-to-workspace-left=['h'] +move-to-workspace-up=['k'] switch-to-workspace-down=['j'] -switch-to-workspace-up=['k'] +switch-to-workspace-left=['h'] switch-to-workspace-right=['l'] +switch-to-workspace-up=['k'] +toggle-fullscreen=@as [] +toggle-maximized=['f'] [org/gnome/settings-daemon/plugins/media-keys] custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/'] From 47afcdc50e7a9f761c9a6f586f369be780b3bad6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 23 Mar 2023 11:08:41 +0200 Subject: [PATCH 1815/2667] Add X-Robots header to nextcloud --- docker/nextcloud/docker-compose.toml | 2 +- docker/traefik/dynamic.toml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 113b3f32..24d58518 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -18,7 +18,7 @@ labels = [ "traefik.http.routers.nextcloud.entrypoints=https", "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)", "traefik.http.routers.nextcloud.service=nextcloud", - "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-redirect-dav@file,nextcloud-redirect-extra@file,compress@file", + "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-security-headers@file,nextcloud-redirect-dav@file,nextcloud-redirect-extra@file,compress@file", "traefik.docker.network=proxy", "traefik.http.services.nextcloud.loadbalancer.server.port=80", ] diff --git a/docker/traefik/dynamic.toml b/docker/traefik/dynamic.toml index d2f46eea..22dfe112 100644 --- a/docker/traefik/dynamic.toml +++ b/docker/traefik/dynamic.toml @@ -63,6 +63,9 @@ permanent = true regex = "https://(.*)/.well-known/(webfinger|nodeinfo)" replacement = "https://${1}/index.php/.well-known/${2}" +[http.middlewares.nextcloud-security-headers.headers.customResponseHeaders] +X-Robots-Tag = "noindex,nofollow" + [http.middlewares.www2non-www.redirectregex] permanent = true regex = "^https?://www\\.(.+)" From f3aff4c4e8cdf9d1ab1feece5675061f4c4eb06e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 23 Mar 2023 11:08:41 +0200 Subject: [PATCH 1816/2667] Add X-Robots header to nextcloud --- docker/nextcloud/docker-compose.toml | 2 +- docker/traefik/dynamic.toml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 113b3f32..24d58518 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -18,7 +18,7 @@ labels = [ "traefik.http.routers.nextcloud.entrypoints=https", "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)", "traefik.http.routers.nextcloud.service=nextcloud", - "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-redirect-dav@file,nextcloud-redirect-extra@file,compress@file", + "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-security-headers@file,nextcloud-redirect-dav@file,nextcloud-redirect-extra@file,compress@file", "traefik.docker.network=proxy", "traefik.http.services.nextcloud.loadbalancer.server.port=80", ] diff --git a/docker/traefik/dynamic.toml b/docker/traefik/dynamic.toml index d2f46eea..22dfe112 100644 --- a/docker/traefik/dynamic.toml +++ b/docker/traefik/dynamic.toml @@ -63,6 +63,9 @@ permanent = true regex = "https://(.*)/.well-known/(webfinger|nodeinfo)" replacement = "https://${1}/index.php/.well-known/${2}" +[http.middlewares.nextcloud-security-headers.headers.customResponseHeaders] +X-Robots-Tag = "noindex,nofollow" + [http.middlewares.www2non-www.redirectregex] permanent = true regex = "^https?://www\\.(.+)" From ebbb6e5cdd7b835d73df44c579751622ba94e331 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 23 Mar 2023 11:16:28 +0200 Subject: [PATCH 1817/2667] Fix nextcloud redirects --- docker/traefik/dynamic.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/traefik/dynamic.toml b/docker/traefik/dynamic.toml index 22dfe112..ab822cad 100644 --- a/docker/traefik/dynamic.toml +++ b/docker/traefik/dynamic.toml @@ -55,13 +55,13 @@ addVaryHeader = true [http.middlewares.nextcloud-redirect-dav.redirectRegex] permanent = true -regex = "https://(.*)/.well-known/(card|cal)dav" -replacement = "https://${1}/remote.php/dav/" +regex = "https://cloud.korhonen.cc/.well-known/(card|cal)dav" +replacement = "https://cloud.korhonen.cc/remote.php/dav/" [http.middlewares.nextcloud-redirect-extra.redirectRegex] permanent = true -regex = "https://(.*)/.well-known/(webfinger|nodeinfo)" -replacement = "https://${1}/index.php/.well-known/${2}" +regex = "https://korhonen.cc/.well-known/(webfinger|nodeinfo)" +replacement = "https://korhonen.cc/index.php/.well-known/${2}" [http.middlewares.nextcloud-security-headers.headers.customResponseHeaders] X-Robots-Tag = "noindex,nofollow" From 848186de59d3e90673f75ff829d90c4f27a00ab5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 23 Mar 2023 11:16:28 +0200 Subject: [PATCH 1818/2667] Fix nextcloud redirects --- docker/traefik/dynamic.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/traefik/dynamic.toml b/docker/traefik/dynamic.toml index 22dfe112..ab822cad 100644 --- a/docker/traefik/dynamic.toml +++ b/docker/traefik/dynamic.toml @@ -55,13 +55,13 @@ addVaryHeader = true [http.middlewares.nextcloud-redirect-dav.redirectRegex] permanent = true -regex = "https://(.*)/.well-known/(card|cal)dav" -replacement = "https://${1}/remote.php/dav/" +regex = "https://cloud.korhonen.cc/.well-known/(card|cal)dav" +replacement = "https://cloud.korhonen.cc/remote.php/dav/" [http.middlewares.nextcloud-redirect-extra.redirectRegex] permanent = true -regex = "https://(.*)/.well-known/(webfinger|nodeinfo)" -replacement = "https://${1}/index.php/.well-known/${2}" +regex = "https://korhonen.cc/.well-known/(webfinger|nodeinfo)" +replacement = "https://korhonen.cc/index.php/.well-known/${2}" [http.middlewares.nextcloud-security-headers.headers.customResponseHeaders] X-Robots-Tag = "noindex,nofollow" From 61cdce3ac660b4151ba07edccd40cc0aa24cf860 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 23 Mar 2023 11:26:43 +0200 Subject: [PATCH 1819/2667] Fix nextcloud redirects --- docker/traefik/dynamic.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/traefik/dynamic.toml b/docker/traefik/dynamic.toml index ab822cad..e19fe3d6 100644 --- a/docker/traefik/dynamic.toml +++ b/docker/traefik/dynamic.toml @@ -60,8 +60,8 @@ replacement = "https://cloud.korhonen.cc/remote.php/dav/" [http.middlewares.nextcloud-redirect-extra.redirectRegex] permanent = true -regex = "https://korhonen.cc/.well-known/(webfinger|nodeinfo)" -replacement = "https://korhonen.cc/index.php/.well-known/${2}" +regex = "https://cloud.korhonen.cc/.well-known/(.*)" +replacement = "https://cloud.korhonen.cc/index.php/.well-known/${1}" [http.middlewares.nextcloud-security-headers.headers.customResponseHeaders] X-Robots-Tag = "noindex,nofollow" From 395e18df52678cdc9a2d6220a91be4675a603fc7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 23 Mar 2023 11:26:43 +0200 Subject: [PATCH 1820/2667] Fix nextcloud redirects --- docker/traefik/dynamic.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/traefik/dynamic.toml b/docker/traefik/dynamic.toml index ab822cad..e19fe3d6 100644 --- a/docker/traefik/dynamic.toml +++ b/docker/traefik/dynamic.toml @@ -60,8 +60,8 @@ replacement = "https://cloud.korhonen.cc/remote.php/dav/" [http.middlewares.nextcloud-redirect-extra.redirectRegex] permanent = true -regex = "https://korhonen.cc/.well-known/(webfinger|nodeinfo)" -replacement = "https://korhonen.cc/index.php/.well-known/${2}" +regex = "https://cloud.korhonen.cc/.well-known/(.*)" +replacement = "https://cloud.korhonen.cc/index.php/.well-known/${1}" [http.middlewares.nextcloud-security-headers.headers.customResponseHeaders] X-Robots-Tag = "noindex,nofollow" From 98a01af1a6d7dcf89b6e40859d7db60e6b384c20 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 12:27:05 +0200 Subject: [PATCH 1821/2667] Switch from tmux to zellij --- home/.config/zsh/01-tmux.zsh | 8 -------- home/.config/zsh/01-zellij.zsh | 4 ++++ 2 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 home/.config/zsh/01-tmux.zsh create mode 100644 home/.config/zsh/01-zellij.zsh diff --git a/home/.config/zsh/01-tmux.zsh b/home/.config/zsh/01-tmux.zsh deleted file mode 100644 index 55d3f0c7..00000000 --- a/home/.config/zsh/01-tmux.zsh +++ /dev/null @@ -1,8 +0,0 @@ -# Launch tmux if logging in over ssh -if [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then - if tmux has-session -t ssh_tmux 2>/dev/null; then - exec tmux -2 attach-session -t ssh_tmux - else - exec tmux -2 new-session -s ssh_tmux - fi -fi diff --git a/home/.config/zsh/01-zellij.zsh b/home/.config/zsh/01-zellij.zsh new file mode 100644 index 00000000..9ad94d17 --- /dev/null +++ b/home/.config/zsh/01-zellij.zsh @@ -0,0 +1,4 @@ +# Launch zellij if logging in over SSH +if [[ -z "$ZELLIJ" && -n "$SSH_CONNECTION" ]]; then + exec zellij attach -cs ssh +fi From f197eccac30678b2793a829df435363a6b585868 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 12:27:05 +0200 Subject: [PATCH 1822/2667] Switch from tmux to zellij --- home/.config/zsh/01-tmux.zsh | 8 -------- home/.config/zsh/01-zellij.zsh | 4 ++++ 2 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 home/.config/zsh/01-tmux.zsh create mode 100644 home/.config/zsh/01-zellij.zsh diff --git a/home/.config/zsh/01-tmux.zsh b/home/.config/zsh/01-tmux.zsh deleted file mode 100644 index 55d3f0c7..00000000 --- a/home/.config/zsh/01-tmux.zsh +++ /dev/null @@ -1,8 +0,0 @@ -# Launch tmux if logging in over ssh -if [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then - if tmux has-session -t ssh_tmux 2>/dev/null; then - exec tmux -2 attach-session -t ssh_tmux - else - exec tmux -2 new-session -s ssh_tmux - fi -fi diff --git a/home/.config/zsh/01-zellij.zsh b/home/.config/zsh/01-zellij.zsh new file mode 100644 index 00000000..9ad94d17 --- /dev/null +++ b/home/.config/zsh/01-zellij.zsh @@ -0,0 +1,4 @@ +# Launch zellij if logging in over SSH +if [[ -z "$ZELLIJ" && -n "$SSH_CONNECTION" ]]; then + exec zellij attach -cs ssh +fi From b24cdcc60cfec0e87f767491581d7c821269797d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 12:27:18 +0200 Subject: [PATCH 1823/2667] Update mirkwood kernel cmdline --- root/etc/kernel/cmdline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index d6eee16f..86a43e09 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -1,5 +1,5 @@ {%@@ if profile == "Mirkwood" @@%} -cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait amdgpu.ppfeaturemask=0xffffffff quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 +cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait acpi_osi=Linux quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Moria" @@%} cryptdevice=UUID=51115cf2-6a44-4f8c-8aa2-ff9d834953d8:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ endif @@%} From a500dd37b7a6e6d5637dbe121e11441c4995fb7e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 12:27:18 +0200 Subject: [PATCH 1824/2667] Update mirkwood kernel cmdline --- root/etc/kernel/cmdline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index d6eee16f..86a43e09 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -1,5 +1,5 @@ {%@@ if profile == "Mirkwood" @@%} -cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait amdgpu.ppfeaturemask=0xffffffff quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 +cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait acpi_osi=Linux quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Moria" @@%} cryptdevice=UUID=51115cf2-6a44-4f8c-8aa2-ff9d834953d8:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ endif @@%} From bb86b21d9eae23ed0ab6512010eaa1fcf1cb9973 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 12:30:32 +0200 Subject: [PATCH 1825/2667] Fix zellij autostart --- home/.config/zsh/01-zellij.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/01-zellij.zsh b/home/.config/zsh/01-zellij.zsh index 9ad94d17..6dc53321 100644 --- a/home/.config/zsh/01-zellij.zsh +++ b/home/.config/zsh/01-zellij.zsh @@ -1,4 +1,4 @@ # Launch zellij if logging in over SSH if [[ -z "$ZELLIJ" && -n "$SSH_CONNECTION" ]]; then - exec zellij attach -cs ssh + exec zellij attach -c ssh fi From 9169ee5b8cdbc449967494c8efb4a778fb712eb0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 12:30:32 +0200 Subject: [PATCH 1826/2667] Fix zellij autostart --- home/.config/zsh/01-zellij.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/01-zellij.zsh b/home/.config/zsh/01-zellij.zsh index 9ad94d17..6dc53321 100644 --- a/home/.config/zsh/01-zellij.zsh +++ b/home/.config/zsh/01-zellij.zsh @@ -1,4 +1,4 @@ # Launch zellij if logging in over SSH if [[ -z "$ZELLIJ" && -n "$SSH_CONNECTION" ]]; then - exec zellij attach -cs ssh + exec zellij attach -c ssh fi From b8223b88dadb6234064591c2c6f39b97cef71c93 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 20:21:00 +0200 Subject: [PATCH 1827/2667] Remove dedicated redis and give searx it's own redis --- docker/redis/docker-compose.toml | 16 ---------------- docker/searx/docker-compose.toml | 11 ++++++++--- 2 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 docker/redis/docker-compose.toml diff --git a/docker/redis/docker-compose.toml b/docker/redis/docker-compose.toml deleted file mode 100644 index 94ea7f99..00000000 --- a/docker/redis/docker-compose.toml +++ /dev/null @@ -1,16 +0,0 @@ -[services.redis] -image = "redis:alpine" -container_name = "redis" -user = "root" -command = "redis-server /etc/redis.conf" -restart = "unless-stopped" -volumes = ["/docker/redis/redis.conf:/etc/redis.conf", "redis_temp:/tmp/redis"] - -[services.redis_temp] -image = "busybox:stable" -container_name = "redis_temp" -command = "chmod -R 777 /tmp/redis" -volumes = ["redis_temp:/tmp/redis"] - -[volumes.redis_temp] -external = true diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml index d181ab1c..9617520e 100644 --- a/docker/searx/docker-compose.toml +++ b/docker/searx/docker-compose.toml @@ -5,7 +5,6 @@ restart = "unless-stopped" networks = ["searx", "proxy"] volumes = [ "/docker/searx:/etc/searxng", - "redis_temp:/tmp/redis", #"/docker/searx/logo.png:/usr/local/searxng/searx/static/themes/simple/img/searxng.png:ro" ] environment = ["SEARXNG_BASE_URL=https://search.korhonen.cc/"] @@ -31,8 +30,14 @@ driver = "json-file" max-size = "1m" max-file = "1" -[volumes.redis_temp] -external = true +[services.redis] +container_name = "redis-searx" +image = "redis:alpine" +command = "redis-server --save \"\" --appendonly \"no\"" +networks = ["searx"] +tmpfs = ["/var/lib/redis"] +cap_drop = ["ALL"] +cap_add = ["SETGID", "SETUID", "DAC_OVERRIDE"] [networks.searx.ipam] driver = "default" From 98846fc48ba857aeee4e6b0e627647784d44a96e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 20:21:00 +0200 Subject: [PATCH 1828/2667] Remove dedicated redis and give searx it's own redis --- docker/redis/docker-compose.toml | 16 ---------------- docker/searx/docker-compose.toml | 11 ++++++++--- 2 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 docker/redis/docker-compose.toml diff --git a/docker/redis/docker-compose.toml b/docker/redis/docker-compose.toml deleted file mode 100644 index 94ea7f99..00000000 --- a/docker/redis/docker-compose.toml +++ /dev/null @@ -1,16 +0,0 @@ -[services.redis] -image = "redis:alpine" -container_name = "redis" -user = "root" -command = "redis-server /etc/redis.conf" -restart = "unless-stopped" -volumes = ["/docker/redis/redis.conf:/etc/redis.conf", "redis_temp:/tmp/redis"] - -[services.redis_temp] -image = "busybox:stable" -container_name = "redis_temp" -command = "chmod -R 777 /tmp/redis" -volumes = ["redis_temp:/tmp/redis"] - -[volumes.redis_temp] -external = true diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml index d181ab1c..9617520e 100644 --- a/docker/searx/docker-compose.toml +++ b/docker/searx/docker-compose.toml @@ -5,7 +5,6 @@ restart = "unless-stopped" networks = ["searx", "proxy"] volumes = [ "/docker/searx:/etc/searxng", - "redis_temp:/tmp/redis", #"/docker/searx/logo.png:/usr/local/searxng/searx/static/themes/simple/img/searxng.png:ro" ] environment = ["SEARXNG_BASE_URL=https://search.korhonen.cc/"] @@ -31,8 +30,14 @@ driver = "json-file" max-size = "1m" max-file = "1" -[volumes.redis_temp] -external = true +[services.redis] +container_name = "redis-searx" +image = "redis:alpine" +command = "redis-server --save \"\" --appendonly \"no\"" +networks = ["searx"] +tmpfs = ["/var/lib/redis"] +cap_drop = ["ALL"] +cap_add = ["SETGID", "SETUID", "DAC_OVERRIDE"] [networks.searx.ipam] driver = "default" From ba0eebbc37a04ee224423c58cd25af151b02d09f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 20:23:08 +0200 Subject: [PATCH 1829/2667] Unify redis container names --- docker/authentik/docker-compose.toml | 2 +- docker/misskey/docker-compose.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 11642ada..329c6d35 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -1,6 +1,6 @@ [services.redis] image = "redis:alpine" -container_name = "authentik-redis" +container_name = "redis-authentik" networks = ["authentik"] restart = "unless-stopped" volumes = ["/docker/authentik/redis:/data"] diff --git a/docker/misskey/docker-compose.toml b/docker/misskey/docker-compose.toml index face484e..30039f61 100644 --- a/docker/misskey/docker-compose.toml +++ b/docker/misskey/docker-compose.toml @@ -41,7 +41,7 @@ hard = -1 [services.redis] image = "redis" -container_name = "misskey-redis" +container_name = "redis-misskey" restart = "unless-stopped" networks = ["misskey"] volumes = ["/docker/misskey/redis:/data"] From 785990b7554b0b8a77e8128ce246cbe22e2b0ba6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 20:23:08 +0200 Subject: [PATCH 1830/2667] Unify redis container names --- docker/authentik/docker-compose.toml | 2 +- docker/misskey/docker-compose.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 11642ada..329c6d35 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -1,6 +1,6 @@ [services.redis] image = "redis:alpine" -container_name = "authentik-redis" +container_name = "redis-authentik" networks = ["authentik"] restart = "unless-stopped" volumes = ["/docker/authentik/redis:/data"] diff --git a/docker/misskey/docker-compose.toml b/docker/misskey/docker-compose.toml index face484e..30039f61 100644 --- a/docker/misskey/docker-compose.toml +++ b/docker/misskey/docker-compose.toml @@ -41,7 +41,7 @@ hard = -1 [services.redis] image = "redis" -container_name = "misskey-redis" +container_name = "redis-misskey" restart = "unless-stopped" networks = ["misskey"] volumes = ["/docker/misskey/redis:/data"] From bfe4055932a52d187944b4da9a3a0f02be395cb6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 22:10:12 +0200 Subject: [PATCH 1831/2667] Rename authentik redis container back Authentik was having problems finding the container --- docker/authentik/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 329c6d35..11642ada 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -1,6 +1,6 @@ [services.redis] image = "redis:alpine" -container_name = "redis-authentik" +container_name = "authentik-redis" networks = ["authentik"] restart = "unless-stopped" volumes = ["/docker/authentik/redis:/data"] From 87ff7ed523279bfd38389dbd2f499ee8ceabd39c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 22:10:12 +0200 Subject: [PATCH 1832/2667] Rename authentik redis container back Authentik was having problems finding the container --- docker/authentik/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 329c6d35..11642ada 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -1,6 +1,6 @@ [services.redis] image = "redis:alpine" -container_name = "redis-authentik" +container_name = "authentik-redis" networks = ["authentik"] restart = "unless-stopped" volumes = ["/docker/authentik/redis:/data"] From 665f07bee6015c07a8189447338c6666c929c5fa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 30 Mar 2023 09:01:39 +0300 Subject: [PATCH 1833/2667] Add Mason tool installer --- home/.config/nvim/lua/plugins/init.lua | 5 +++++ home/.config/zsh/04-aliases.zsh | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 7d16e4e4..c53fdf76 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -93,6 +93,11 @@ local plugins = { config = true, }, + { + "WhoIsSethDaniel/mason-tool-installer.nvim", + config = true, + }, + -- Configs for built-in LSP { "neovim/nvim-lspconfig", config = require("plugins.lspconfig").setup }, diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 98244c4b..3957bd5f 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -180,9 +180,7 @@ update() { plugins() { echo "Updating NeoVim plugins" - nvim --headless "+Lazy! sync" +qa - echo "Updating NeoVim TreeSitter" - nvim --headless +TSUpdateSync +qa + nvim --headless -c "Lazy! sync" -c 'TSUpdateSync' -c 'MasonToolsUpdate' -c 'qa' zinit self-update zinit update -p {%@@ if profile == "Moria" @@%} From 20e48f14d105a2b9e70493983eb579a9b9316a2f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 30 Mar 2023 09:01:39 +0300 Subject: [PATCH 1834/2667] Add Mason tool installer --- home/.config/nvim/lua/plugins/init.lua | 5 +++++ home/.config/zsh/04-aliases.zsh | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 7d16e4e4..c53fdf76 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -93,6 +93,11 @@ local plugins = { config = true, }, + { + "WhoIsSethDaniel/mason-tool-installer.nvim", + config = true, + }, + -- Configs for built-in LSP { "neovim/nvim-lspconfig", config = require("plugins.lspconfig").setup }, diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 98244c4b..3957bd5f 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -180,9 +180,7 @@ update() { plugins() { echo "Updating NeoVim plugins" - nvim --headless "+Lazy! sync" +qa - echo "Updating NeoVim TreeSitter" - nvim --headless +TSUpdateSync +qa + nvim --headless -c "Lazy! sync" -c 'TSUpdateSync' -c 'MasonToolsUpdate' -c 'qa' zinit self-update zinit update -p {%@@ if profile == "Moria" @@%} From 2a9517822d854cd5e288f8b63b2a920f7cc90082 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 3 Apr 2023 14:10:24 +0300 Subject: [PATCH 1835/2667] ZSH: disable vim exit aliases --- home/.config/zsh/04-aliases.zsh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 3957bd5f..f82a3c5b 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -95,9 +95,7 @@ fman() { man -k . | fzf --prompt='Man> ' | awk '{print $1}' | xargs -r man } -# I'm retarded so I need this -alias :q='exit' -alias :wq='exit' +alias :q='cowsay "You are not in vim anymore"' alias reboot-kodi='systemctl reboot --boot-loader-entry=kodi.conf' From c0da6c96f4db3fe10cc003963cfe47f0aff2ffc3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 3 Apr 2023 14:10:24 +0300 Subject: [PATCH 1836/2667] ZSH: disable vim exit aliases --- home/.config/zsh/04-aliases.zsh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 3957bd5f..f82a3c5b 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -95,9 +95,7 @@ fman() { man -k . | fzf --prompt='Man> ' | awk '{print $1}' | xargs -r man } -# I'm retarded so I need this -alias :q='exit' -alias :wq='exit' +alias :q='cowsay "You are not in vim anymore"' alias reboot-kodi='systemctl reboot --boot-loader-entry=kodi.conf' From 219d5c7633a1e683dfbd4f3bd7193197819996a3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 3 Apr 2023 23:20:36 +0300 Subject: [PATCH 1837/2667] Switch from traefik to caddy --- docker/caddy/Caddyfile | 74 +++++++++++++++++ docker/caddy/docker-compose.toml | 18 ++++ docker/forgejo/docker-compose.toml | 14 +--- docker/index.korhonen.cc/docker-compose.toml | 26 ------ docker/jellyfin/docker-compose.toml | 17 ---- docker/misskey/docker-compose.toml | 12 --- docker/pihole/docker-compose.toml | 12 --- docker/traefik/docker-compose.toml | 53 ------------ docker/traefik/dynamic.toml | 86 -------------------- docker/traefik/traefik.toml | 41 ---------- docker/tvheadend/docker-compose.toml | 16 ---- docker/umami/docker-compose.toml | 12 --- home/.config/nvim/lua/plugins/init.lua | 3 + root/etc/pacman.conf | 4 +- 14 files changed, 98 insertions(+), 290 deletions(-) create mode 100644 docker/caddy/Caddyfile create mode 100644 docker/caddy/docker-compose.toml delete mode 100644 docker/index.korhonen.cc/docker-compose.toml delete mode 100644 docker/traefik/docker-compose.toml delete mode 100644 docker/traefik/dynamic.toml delete mode 100644 docker/traefik/traefik.toml diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile new file mode 100644 index 00000000..1ac51545 --- /dev/null +++ b/docker/caddy/Caddyfile @@ -0,0 +1,74 @@ +korhonen.cc, *.korhonen.cc { + tls {$CLOUDFLARE_EMAIL} { + dns cloudflare {$CLOUDFLARE_API_TOKEN} + resolvers 1.1.1.1 + } + + @homepage host korhonen.cc + handle @homepage { + root * /var/www/korhonen.cc + file_server + } + + @wkd host openpgpkey.korhonen.cc + handle @wkd { + root * /var/www/wkd + file_server browse + } + + @index host index.korhonen.cc + handle @index { + root * /docker/index.korhonen.cc + file_server browse + } + + @home-assistant host home.korhonen.cc + handle @home-assistant { + reverse_proxy home-assistant:8123 + } + + @authentik host sso.korhonen.cc + handle @authentik { + reverse_proxy authentik:9000 + } + + @forgejo host git.korhonen.cc + handle @forgejo { + reverse_proxy forgejo:3000 + } + + @searx host search.korhonen.cc + handle @searx { + reverse_proxy searx:8080 + } + + @freshrss host rss.korhonen.cc + handle @freshrss { + reverse_proxy freshrss + } + + @jellyfin host jellyfin.korhonen.cc + handle @jellyfin { + reverse_proxy jellyfin:8096 + } + + @misskey host social.korhonen.cc + handle @misskey { + reverse_proxy misskey:3000 + } + + @pihole host pihole.korhonen.cc + handle @pihole { + reverse_proxy pihole + } + + @umami host umami.korhonen.cc + handle @umami { + reverse_proxy umami:3000 + } + + # Fallback for unhandled domains + handle { + redir https://korhonen.cc/404.html + } +} diff --git a/docker/caddy/docker-compose.toml b/docker/caddy/docker-compose.toml new file mode 100644 index 00000000..e335ee2e --- /dev/null +++ b/docker/caddy/docker-compose.toml @@ -0,0 +1,18 @@ +[services.caddy] +image = "slothcroissant/caddy-cloudflaredns" +container_name = "caddy" +restart = "unless-stopped" +ports = ["80:80", "443:443/tcp", "443:443/udp"] +networks = ["proxy"] +volumes = [ + "/docker/caddy/data:/data", + "/docker/caddy/config:/config", + "/var/www/korhonen.cc:/var/www/korhonen.cc", + "/var/www/wkd:/var/www/wkd", + "/var/www/index.korhonen.cc:/var/www/index.korhonen.cc", + "./Caddyfile:/etc/caddy/Caddyfile", +] +environment = ["CLOUDFLARE_EMAIL", "CLOUDFLARE_API_TOKEN", "ACME_AGREE=true"] + +[networks.proxy] +external = true diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index 001661fd..a6dc63d6 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -4,20 +4,8 @@ container_name = "forgejo" environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] restart = "unless-stopped" networks = ["postgres", "proxy"] -ports = ["3000:3000", "22:22"] +ports = ["22:22"] volumes = ["/docker/forgejo:/data", "/etc/localtime:/etc/localtime:ro"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.forgejo-redirect.entrypoints=http", - "traefik.http.routers.forgejo-redirect.rule=Host(`git.korhonen.cc`)", - "traefik.http.routers.forgejo-redirect.middlewares=http2https@file", - "traefik.http.routers.forgejo.entrypoints=https", - "traefik.http.routers.forgejo.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.forgejo.rule=Host(`git.korhonen.cc`)", - "traefik.http.routers.forgejo.service=forgejo", - "traefik.http.services.forgejo.loadbalancer.server.port=3000", -] [networks.postgres] external = true diff --git a/docker/index.korhonen.cc/docker-compose.toml b/docker/index.korhonen.cc/docker-compose.toml deleted file mode 100644 index 856e6fc0..00000000 --- a/docker/index.korhonen.cc/docker-compose.toml +++ /dev/null @@ -1,26 +0,0 @@ -[services] - -[services.nginx] -image = "fraoustin/fancyindex" -container_name = "index.korhonen.cc" -environment = ["DISABLE_AUTH=true", "CONTAINER_TIMEZONE=\"Europe/Helsinki\""] -volumes = ["/docker/index.korhonen.cc:/share"] -networks = ["proxy"] -restart = "unless-stopped" -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.index-redirect.entrypoints=http", - "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)", - "traefik.http.routers.index-redirect.middlewares=http2https@file", - "traefik.http.routers.index.entrypoints=https", - "traefik.http.routers.index.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)", - "traefik.http.routers.index.service=index", - "traefik.http.services.index.loadbalancer.server.port=80", -] - -[networks] - -[networks.proxy] -external = true diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 0b5a10c4..f69335b9 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -1,10 +1,7 @@ -[services] - [services.jellyfin] image = "jellyfin/jellyfin" container_name = "jellyfin" environment = ["TZ=Europe/Helsinki"] -ports = ["8096:8096"] networks = ["proxy", "authentik"] restart = "unless-stopped" volumes = [ @@ -18,20 +15,6 @@ devices = [ "/dev/dri/renderD128:/dev/dri/renderD128", "/dev/dri/card0:/dev/dri/card0", ] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.jellyfin-redirect.entrypoints=http", - "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)", - "traefik.http.routers.jellyfin-redirect.middlewares=http2https@file", - "traefik.http.routers.jellyfin.entrypoints=https", - "traefik.http.routers.jellyfin.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)", - "traefik.http.routers.jellyfin.service=jellyfin", - "traefik.http.services.jellyfin.loadbalancer.server.port=8096", -] - -[networks] [networks.proxy] external = true diff --git a/docker/misskey/docker-compose.toml b/docker/misskey/docker-compose.toml index 30039f61..01ca5b28 100644 --- a/docker/misskey/docker-compose.toml +++ b/docker/misskey/docker-compose.toml @@ -9,18 +9,6 @@ volumes = [ "/docker/misskey/files:/misskey/files", "/docker/misskey/config:/misskey/.config:ro", ] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.misskey-redirect.entrypoints=http", - "traefik.http.routers.misskey-redirect.rule=Host(`social.korhonen.cc`)", - "traefik.http.routers.misskey-redirect.middlewares=http2https@file", - "traefik.http.routers.misskey.entrypoints=https", - "traefik.http.routers.misskey.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.misskey.rule=Host(`social.korhonen.cc`)", - "traefik.http.routers.misskey.service=misskey", - "traefik.http.services.misskey.loadbalancer.server.port=3000", -] [services.elasticsearch] image = "docker.elastic.co/elasticsearch/elasticsearch:7.17.8" diff --git a/docker/pihole/docker-compose.toml b/docker/pihole/docker-compose.toml index a578112e..9f328196 100644 --- a/docker/pihole/docker-compose.toml +++ b/docker/pihole/docker-compose.toml @@ -12,18 +12,6 @@ volumes = [ dns = ["127.0.0.1", "1.1.1.1"] cap_add = ["NET_ADMIN"] restart = "unless-stopped" -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.pihole-redirect.entrypoints=http", - "traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)", - "traefik.http.routers.pihole-redirect.middlewares=http2https@file", - "traefik.http.routers.pihole.entrypoints=https", - "traefik.http.routers.pihole.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)", - "traefik.http.routers.pihole.service=pihole", - "traefik.http.services.pihole.loadbalancer.server.port=80", -] [services.pihole.environment] TZ = "Europe/Helsinki" diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml deleted file mode 100644 index 4f10a200..00000000 --- a/docker/traefik/docker-compose.toml +++ /dev/null @@ -1,53 +0,0 @@ -[services.traefik] -image = "traefik" -container_name = "traefik" -restart = "unless-stopped" -ports = ["80:80", "443:443/tcp", "443:443/udp"] -environment = [ - "TZ=Europe/Helsinki", - "ADMIN_EMAIL", - "CF_API_EMAIL=${ADMIN_EMAIL}", - "CF_API_KEY", - "CF_ZONE_API_TOKEN", - "CF_DNS_API_TOKEN", -] -security_opt = ["no-new-privileges:true"] -networks = ["proxy"] -volumes = [ - "/etc/localtime:/etc/localtime:ro", - "/var/run/docker.sock:/var/run/docker.sock:ro", - "./traefik.toml:/traefik.toml:ro", - "./dynamic.toml:/dynamic.toml:ro", - "/docker/traefik/traefik/acme.json:/acme.json", - "/docker/traefik/traefik/log:/var/log", -] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.redirect.entrypoints=http", - "traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)", - "traefik.http.routers.redirect.middlewares=http2https@file", - "traefik.http.routers.dashboard.entrypoints=https", - "traefik.http.routers.dashboard.middlewares=secHeaders@file,compress@file,authentik@file", - "traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)", - "traefik.http.routers.dashboard.service=api@internal", -] - -[services.fail2ban] -image = "crazymax/fail2ban" -container_name = "fail2ban" -restart = "unless-stopped" -network_mode = "host" -cap_add = ["NET_ADMIN", "NET_RAW"] -environment = ["TZ=Europe/Helsinki"] -volumes = [ - "/etc/localtime:/etc/localtime:ro", - "/docker/traefik/traefik/log:/var/log/traefik:ro", - "/docker/traefik/fail2ban:/data", - "/docker/forgejo/gitea/log/gitea.log:/var/log/forgejo:ro", - "/docker/homeautomation/home-assistant/home-assistant.log:/var/log/hass", - "/mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro", -] - -[networks.proxy] -external = true diff --git a/docker/traefik/dynamic.toml b/docker/traefik/dynamic.toml deleted file mode 100644 index e19fe3d6..00000000 --- a/docker/traefik/dynamic.toml +++ /dev/null @@ -1,86 +0,0 @@ -[http.middlewares.authentik.forwardAuth] -address = "http://authentik:9000/outpost.goauthentik.io/auth/traefik" -trustForwardHeader = true -authResponseHeaders = [ - "X-authentik-username", - "X-authentik-groups", - "X-authentik-email", - "X-authentik-name", - "X-authentik-uid", - "X-authentik-jwt", - "X-authentik-meta-jwks", - "X-authentik-meta-outpost", - "X-authentik-meta-provider", - "X-authentik-meta-app", - "X-authentik-meta-version", -] - -[http.middlewares.compress.compress] - -[http.middlewares.http2https.redirectScheme] -scheme = "https" -permanent = true - -[http.middlewares.secHeaders.headers] -browserXssFilter = true -contentTypeNosniff = true -frameDeny = true -sslRedirect = true -stsIncludeSubdomains = true -stsPreload = true -stsSeconds = 31_536_000 -customFrameOptionsValue = "SAMEORIGIN" -referrerPolicy = "strict-origin-when-cross-origin" -accesscontrolAllowMethods = ["GET", "OPTIONS", "POST"] -accesscontrolAllowOriginList = ["https://korhonen.cc"] -accessControlAllowHeaders = [ - "Accept", - "Accept-Encoding", - "Accept-Language", - "Access-Control-Request-Headers", - "Access-Control-Request-Method", - "Connection", - "Content-Type", - "DNT", - "Host", - "Origin", - "Referer", - "Sec-Fetch-Dest", - "Sec-Fetch-Mode", - "Sec-Fetch-Site", - "User-Agent", -] -accesscontrolMaxAge = 100 -addVaryHeader = true - -[http.middlewares.nextcloud-redirect-dav.redirectRegex] -permanent = true -regex = "https://cloud.korhonen.cc/.well-known/(card|cal)dav" -replacement = "https://cloud.korhonen.cc/remote.php/dav/" - -[http.middlewares.nextcloud-redirect-extra.redirectRegex] -permanent = true -regex = "https://cloud.korhonen.cc/.well-known/(.*)" -replacement = "https://cloud.korhonen.cc/index.php/.well-known/${1}" - -[http.middlewares.nextcloud-security-headers.headers.customResponseHeaders] -X-Robots-Tag = "noindex,nofollow" - -[http.middlewares.www2non-www.redirectregex] -permanent = true -regex = "^https?://www\\.(.+)" -replacement = "https://${1}" - -[http.serversTransports.ignorecert] -insecureSkipVerify = true - -[tls.options.default] -minVersion = "VersionTLS12" -cipherSuites = [ - "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", - "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", - "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305", -] - -[tls.options.mintls13] -minVersion = "VersionTLS13" diff --git a/docker/traefik/traefik.toml b/docker/traefik/traefik.toml deleted file mode 100644 index 21d60236..00000000 --- a/docker/traefik/traefik.toml +++ /dev/null @@ -1,41 +0,0 @@ -[experimental] -http3 = true - -[api] -dashboard = true - -[entryPoints.http] -address = ":80" - -[entryPoints.https] -address = ":443" - -[entryPoints.https.http3] - -[entryPoints.https.http.tls] -options = "default" -certResolver = "letsEncrypt" - -[[entryPoints.https.http.tls.domains]] -main = "korhonen.cc" -sans = ["*.korhonen.cc"] - -[certificatesResolvers.letsEncrypt.acme] -email = "admin@korhonen.cc" -storage = "acme.json" - -[certificatesResolvers.letsEncrypt.acme.dnsChallenge] -provider = "cloudflare" - -[accessLog] -filePath = "/var/log/access.log" - -[accessLog.filters] -statusCodes = ["400-499"] - -[providers.docker] -endpoint = "unix:///var/run/docker.sock" -exposedByDefault = false - -[providers.file] -filename = "/dynamic.toml" diff --git a/docker/tvheadend/docker-compose.toml b/docker/tvheadend/docker-compose.toml index f4201682..cdbff58c 100644 --- a/docker/tvheadend/docker-compose.toml +++ b/docker/tvheadend/docker-compose.toml @@ -1,5 +1,3 @@ -[services] - [services.tvheadend] image = "linuxserver/tvheadend" container_name = "tvheadend" @@ -14,20 +12,6 @@ ports = ["9981:9981", "9982:9982"] devices = ["/dev/dvb:/dev/dvb"] restart = "unless-stopped" networks = ["proxy"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.tvheadend-redirect.entrypoints=http", - "traefik.http.routers.tvheadend-redirect.rule=Host(`tvheadend.korhonen.cc`)", - "traefik.http.routers.tvheadend-redirect.middlewares=http2https@file", - "traefik.http.routers.tvheadend.entrypoints=https", - "traefik.http.routers.tvheadend.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)", - "traefik.http.routers.tvheadend.service=tvheadend", - "traefik.http.services.tvheadend.loadbalancer.server.port=9981", -] - -[networks] [networks.proxy] external = true diff --git a/docker/umami/docker-compose.toml b/docker/umami/docker-compose.toml index d4cbd228..3d5a92da 100644 --- a/docker/umami/docker-compose.toml +++ b/docker/umami/docker-compose.toml @@ -4,18 +4,6 @@ container_name = "umami" restart = "unless-stopped" networks = ["postgres", "proxy"] env_file = ".env" -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.umami-redirect.entrypoints=http", - "traefik.http.routers.umami-redirect.rule=Host(`umami.korhonen.cc`)", - "traefik.http.routers.umami-redirect.middlewares=http2https@file", - "traefik.http.routers.umami.entrypoints=https", - "traefik.http.routers.umami.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.umami.rule=Host(`umami.korhonen.cc`)", - "traefik.http.routers.umami.service=umami", - "traefik.http.services.umami.loadbalancer.server.port=3000", -] [services.umami.environment] DATABASE_URL = "postgresql://umami:${POSTGRES_PASS}@postgres:5432/umami" diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index c53fdf76..46b5b6f0 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -203,6 +203,9 @@ local plugins = { "norcalli/nvim-colorizer.lua", config = true, }, + + -- Caddyfile syntax support + "isobit/vim-caddyfile", } local lazy_opts = {} diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 2256bea2..aff3bcd5 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -10,7 +10,7 @@ LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg {%@@ if profile == "Moria" @@%} CleanMethod=KeepCurrent -CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 +CacheDir=/var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} [cachyos-v3] @@ -43,7 +43,7 @@ Include = /etc/pacman.d/mirrorlist [korhonen_aur] {%@@ if profile == "Moria" @@%} -Server = file:///docker/index.korhonen.cc/repo/arch_linux/$repo/$arch +Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ else @@%} Include = /etc/pacman.d/pacserve Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch From ae2ea3f9a6d4256d6e78a40d41c356778b6bad1c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 3 Apr 2023 23:20:36 +0300 Subject: [PATCH 1838/2667] Switch from traefik to caddy --- docker/caddy/Caddyfile | 74 +++++++++++++++++ docker/caddy/docker-compose.toml | 18 ++++ docker/forgejo/docker-compose.toml | 14 +--- docker/index.korhonen.cc/docker-compose.toml | 26 ------ docker/jellyfin/docker-compose.toml | 17 ---- docker/misskey/docker-compose.toml | 12 --- docker/pihole/docker-compose.toml | 12 --- docker/traefik/docker-compose.toml | 53 ------------ docker/traefik/dynamic.toml | 86 -------------------- docker/traefik/traefik.toml | 41 ---------- docker/tvheadend/docker-compose.toml | 16 ---- docker/umami/docker-compose.toml | 12 --- home/.config/nvim/lua/plugins/init.lua | 3 + root/etc/pacman.conf | 4 +- 14 files changed, 98 insertions(+), 290 deletions(-) create mode 100644 docker/caddy/Caddyfile create mode 100644 docker/caddy/docker-compose.toml delete mode 100644 docker/index.korhonen.cc/docker-compose.toml delete mode 100644 docker/traefik/docker-compose.toml delete mode 100644 docker/traefik/dynamic.toml delete mode 100644 docker/traefik/traefik.toml diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile new file mode 100644 index 00000000..1ac51545 --- /dev/null +++ b/docker/caddy/Caddyfile @@ -0,0 +1,74 @@ +korhonen.cc, *.korhonen.cc { + tls {$CLOUDFLARE_EMAIL} { + dns cloudflare {$CLOUDFLARE_API_TOKEN} + resolvers 1.1.1.1 + } + + @homepage host korhonen.cc + handle @homepage { + root * /var/www/korhonen.cc + file_server + } + + @wkd host openpgpkey.korhonen.cc + handle @wkd { + root * /var/www/wkd + file_server browse + } + + @index host index.korhonen.cc + handle @index { + root * /docker/index.korhonen.cc + file_server browse + } + + @home-assistant host home.korhonen.cc + handle @home-assistant { + reverse_proxy home-assistant:8123 + } + + @authentik host sso.korhonen.cc + handle @authentik { + reverse_proxy authentik:9000 + } + + @forgejo host git.korhonen.cc + handle @forgejo { + reverse_proxy forgejo:3000 + } + + @searx host search.korhonen.cc + handle @searx { + reverse_proxy searx:8080 + } + + @freshrss host rss.korhonen.cc + handle @freshrss { + reverse_proxy freshrss + } + + @jellyfin host jellyfin.korhonen.cc + handle @jellyfin { + reverse_proxy jellyfin:8096 + } + + @misskey host social.korhonen.cc + handle @misskey { + reverse_proxy misskey:3000 + } + + @pihole host pihole.korhonen.cc + handle @pihole { + reverse_proxy pihole + } + + @umami host umami.korhonen.cc + handle @umami { + reverse_proxy umami:3000 + } + + # Fallback for unhandled domains + handle { + redir https://korhonen.cc/404.html + } +} diff --git a/docker/caddy/docker-compose.toml b/docker/caddy/docker-compose.toml new file mode 100644 index 00000000..e335ee2e --- /dev/null +++ b/docker/caddy/docker-compose.toml @@ -0,0 +1,18 @@ +[services.caddy] +image = "slothcroissant/caddy-cloudflaredns" +container_name = "caddy" +restart = "unless-stopped" +ports = ["80:80", "443:443/tcp", "443:443/udp"] +networks = ["proxy"] +volumes = [ + "/docker/caddy/data:/data", + "/docker/caddy/config:/config", + "/var/www/korhonen.cc:/var/www/korhonen.cc", + "/var/www/wkd:/var/www/wkd", + "/var/www/index.korhonen.cc:/var/www/index.korhonen.cc", + "./Caddyfile:/etc/caddy/Caddyfile", +] +environment = ["CLOUDFLARE_EMAIL", "CLOUDFLARE_API_TOKEN", "ACME_AGREE=true"] + +[networks.proxy] +external = true diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index 001661fd..a6dc63d6 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -4,20 +4,8 @@ container_name = "forgejo" environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] restart = "unless-stopped" networks = ["postgres", "proxy"] -ports = ["3000:3000", "22:22"] +ports = ["22:22"] volumes = ["/docker/forgejo:/data", "/etc/localtime:/etc/localtime:ro"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.forgejo-redirect.entrypoints=http", - "traefik.http.routers.forgejo-redirect.rule=Host(`git.korhonen.cc`)", - "traefik.http.routers.forgejo-redirect.middlewares=http2https@file", - "traefik.http.routers.forgejo.entrypoints=https", - "traefik.http.routers.forgejo.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.forgejo.rule=Host(`git.korhonen.cc`)", - "traefik.http.routers.forgejo.service=forgejo", - "traefik.http.services.forgejo.loadbalancer.server.port=3000", -] [networks.postgres] external = true diff --git a/docker/index.korhonen.cc/docker-compose.toml b/docker/index.korhonen.cc/docker-compose.toml deleted file mode 100644 index 856e6fc0..00000000 --- a/docker/index.korhonen.cc/docker-compose.toml +++ /dev/null @@ -1,26 +0,0 @@ -[services] - -[services.nginx] -image = "fraoustin/fancyindex" -container_name = "index.korhonen.cc" -environment = ["DISABLE_AUTH=true", "CONTAINER_TIMEZONE=\"Europe/Helsinki\""] -volumes = ["/docker/index.korhonen.cc:/share"] -networks = ["proxy"] -restart = "unless-stopped" -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.index-redirect.entrypoints=http", - "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)", - "traefik.http.routers.index-redirect.middlewares=http2https@file", - "traefik.http.routers.index.entrypoints=https", - "traefik.http.routers.index.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)", - "traefik.http.routers.index.service=index", - "traefik.http.services.index.loadbalancer.server.port=80", -] - -[networks] - -[networks.proxy] -external = true diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 0b5a10c4..f69335b9 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -1,10 +1,7 @@ -[services] - [services.jellyfin] image = "jellyfin/jellyfin" container_name = "jellyfin" environment = ["TZ=Europe/Helsinki"] -ports = ["8096:8096"] networks = ["proxy", "authentik"] restart = "unless-stopped" volumes = [ @@ -18,20 +15,6 @@ devices = [ "/dev/dri/renderD128:/dev/dri/renderD128", "/dev/dri/card0:/dev/dri/card0", ] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.jellyfin-redirect.entrypoints=http", - "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)", - "traefik.http.routers.jellyfin-redirect.middlewares=http2https@file", - "traefik.http.routers.jellyfin.entrypoints=https", - "traefik.http.routers.jellyfin.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)", - "traefik.http.routers.jellyfin.service=jellyfin", - "traefik.http.services.jellyfin.loadbalancer.server.port=8096", -] - -[networks] [networks.proxy] external = true diff --git a/docker/misskey/docker-compose.toml b/docker/misskey/docker-compose.toml index 30039f61..01ca5b28 100644 --- a/docker/misskey/docker-compose.toml +++ b/docker/misskey/docker-compose.toml @@ -9,18 +9,6 @@ volumes = [ "/docker/misskey/files:/misskey/files", "/docker/misskey/config:/misskey/.config:ro", ] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.misskey-redirect.entrypoints=http", - "traefik.http.routers.misskey-redirect.rule=Host(`social.korhonen.cc`)", - "traefik.http.routers.misskey-redirect.middlewares=http2https@file", - "traefik.http.routers.misskey.entrypoints=https", - "traefik.http.routers.misskey.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.misskey.rule=Host(`social.korhonen.cc`)", - "traefik.http.routers.misskey.service=misskey", - "traefik.http.services.misskey.loadbalancer.server.port=3000", -] [services.elasticsearch] image = "docker.elastic.co/elasticsearch/elasticsearch:7.17.8" diff --git a/docker/pihole/docker-compose.toml b/docker/pihole/docker-compose.toml index a578112e..9f328196 100644 --- a/docker/pihole/docker-compose.toml +++ b/docker/pihole/docker-compose.toml @@ -12,18 +12,6 @@ volumes = [ dns = ["127.0.0.1", "1.1.1.1"] cap_add = ["NET_ADMIN"] restart = "unless-stopped" -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.pihole-redirect.entrypoints=http", - "traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)", - "traefik.http.routers.pihole-redirect.middlewares=http2https@file", - "traefik.http.routers.pihole.entrypoints=https", - "traefik.http.routers.pihole.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)", - "traefik.http.routers.pihole.service=pihole", - "traefik.http.services.pihole.loadbalancer.server.port=80", -] [services.pihole.environment] TZ = "Europe/Helsinki" diff --git a/docker/traefik/docker-compose.toml b/docker/traefik/docker-compose.toml deleted file mode 100644 index 4f10a200..00000000 --- a/docker/traefik/docker-compose.toml +++ /dev/null @@ -1,53 +0,0 @@ -[services.traefik] -image = "traefik" -container_name = "traefik" -restart = "unless-stopped" -ports = ["80:80", "443:443/tcp", "443:443/udp"] -environment = [ - "TZ=Europe/Helsinki", - "ADMIN_EMAIL", - "CF_API_EMAIL=${ADMIN_EMAIL}", - "CF_API_KEY", - "CF_ZONE_API_TOKEN", - "CF_DNS_API_TOKEN", -] -security_opt = ["no-new-privileges:true"] -networks = ["proxy"] -volumes = [ - "/etc/localtime:/etc/localtime:ro", - "/var/run/docker.sock:/var/run/docker.sock:ro", - "./traefik.toml:/traefik.toml:ro", - "./dynamic.toml:/dynamic.toml:ro", - "/docker/traefik/traefik/acme.json:/acme.json", - "/docker/traefik/traefik/log:/var/log", -] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.redirect.entrypoints=http", - "traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)", - "traefik.http.routers.redirect.middlewares=http2https@file", - "traefik.http.routers.dashboard.entrypoints=https", - "traefik.http.routers.dashboard.middlewares=secHeaders@file,compress@file,authentik@file", - "traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)", - "traefik.http.routers.dashboard.service=api@internal", -] - -[services.fail2ban] -image = "crazymax/fail2ban" -container_name = "fail2ban" -restart = "unless-stopped" -network_mode = "host" -cap_add = ["NET_ADMIN", "NET_RAW"] -environment = ["TZ=Europe/Helsinki"] -volumes = [ - "/etc/localtime:/etc/localtime:ro", - "/docker/traefik/traefik/log:/var/log/traefik:ro", - "/docker/traefik/fail2ban:/data", - "/docker/forgejo/gitea/log/gitea.log:/var/log/forgejo:ro", - "/docker/homeautomation/home-assistant/home-assistant.log:/var/log/hass", - "/mnt/Storage/Nextcloud/nextcloud.log:/var/log/nextcloud:ro", -] - -[networks.proxy] -external = true diff --git a/docker/traefik/dynamic.toml b/docker/traefik/dynamic.toml deleted file mode 100644 index e19fe3d6..00000000 --- a/docker/traefik/dynamic.toml +++ /dev/null @@ -1,86 +0,0 @@ -[http.middlewares.authentik.forwardAuth] -address = "http://authentik:9000/outpost.goauthentik.io/auth/traefik" -trustForwardHeader = true -authResponseHeaders = [ - "X-authentik-username", - "X-authentik-groups", - "X-authentik-email", - "X-authentik-name", - "X-authentik-uid", - "X-authentik-jwt", - "X-authentik-meta-jwks", - "X-authentik-meta-outpost", - "X-authentik-meta-provider", - "X-authentik-meta-app", - "X-authentik-meta-version", -] - -[http.middlewares.compress.compress] - -[http.middlewares.http2https.redirectScheme] -scheme = "https" -permanent = true - -[http.middlewares.secHeaders.headers] -browserXssFilter = true -contentTypeNosniff = true -frameDeny = true -sslRedirect = true -stsIncludeSubdomains = true -stsPreload = true -stsSeconds = 31_536_000 -customFrameOptionsValue = "SAMEORIGIN" -referrerPolicy = "strict-origin-when-cross-origin" -accesscontrolAllowMethods = ["GET", "OPTIONS", "POST"] -accesscontrolAllowOriginList = ["https://korhonen.cc"] -accessControlAllowHeaders = [ - "Accept", - "Accept-Encoding", - "Accept-Language", - "Access-Control-Request-Headers", - "Access-Control-Request-Method", - "Connection", - "Content-Type", - "DNT", - "Host", - "Origin", - "Referer", - "Sec-Fetch-Dest", - "Sec-Fetch-Mode", - "Sec-Fetch-Site", - "User-Agent", -] -accesscontrolMaxAge = 100 -addVaryHeader = true - -[http.middlewares.nextcloud-redirect-dav.redirectRegex] -permanent = true -regex = "https://cloud.korhonen.cc/.well-known/(card|cal)dav" -replacement = "https://cloud.korhonen.cc/remote.php/dav/" - -[http.middlewares.nextcloud-redirect-extra.redirectRegex] -permanent = true -regex = "https://cloud.korhonen.cc/.well-known/(.*)" -replacement = "https://cloud.korhonen.cc/index.php/.well-known/${1}" - -[http.middlewares.nextcloud-security-headers.headers.customResponseHeaders] -X-Robots-Tag = "noindex,nofollow" - -[http.middlewares.www2non-www.redirectregex] -permanent = true -regex = "^https?://www\\.(.+)" -replacement = "https://${1}" - -[http.serversTransports.ignorecert] -insecureSkipVerify = true - -[tls.options.default] -minVersion = "VersionTLS12" -cipherSuites = [ - "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", - "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", - "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305", -] - -[tls.options.mintls13] -minVersion = "VersionTLS13" diff --git a/docker/traefik/traefik.toml b/docker/traefik/traefik.toml deleted file mode 100644 index 21d60236..00000000 --- a/docker/traefik/traefik.toml +++ /dev/null @@ -1,41 +0,0 @@ -[experimental] -http3 = true - -[api] -dashboard = true - -[entryPoints.http] -address = ":80" - -[entryPoints.https] -address = ":443" - -[entryPoints.https.http3] - -[entryPoints.https.http.tls] -options = "default" -certResolver = "letsEncrypt" - -[[entryPoints.https.http.tls.domains]] -main = "korhonen.cc" -sans = ["*.korhonen.cc"] - -[certificatesResolvers.letsEncrypt.acme] -email = "admin@korhonen.cc" -storage = "acme.json" - -[certificatesResolvers.letsEncrypt.acme.dnsChallenge] -provider = "cloudflare" - -[accessLog] -filePath = "/var/log/access.log" - -[accessLog.filters] -statusCodes = ["400-499"] - -[providers.docker] -endpoint = "unix:///var/run/docker.sock" -exposedByDefault = false - -[providers.file] -filename = "/dynamic.toml" diff --git a/docker/tvheadend/docker-compose.toml b/docker/tvheadend/docker-compose.toml index f4201682..cdbff58c 100644 --- a/docker/tvheadend/docker-compose.toml +++ b/docker/tvheadend/docker-compose.toml @@ -1,5 +1,3 @@ -[services] - [services.tvheadend] image = "linuxserver/tvheadend" container_name = "tvheadend" @@ -14,20 +12,6 @@ ports = ["9981:9981", "9982:9982"] devices = ["/dev/dvb:/dev/dvb"] restart = "unless-stopped" networks = ["proxy"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.tvheadend-redirect.entrypoints=http", - "traefik.http.routers.tvheadend-redirect.rule=Host(`tvheadend.korhonen.cc`)", - "traefik.http.routers.tvheadend-redirect.middlewares=http2https@file", - "traefik.http.routers.tvheadend.entrypoints=https", - "traefik.http.routers.tvheadend.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)", - "traefik.http.routers.tvheadend.service=tvheadend", - "traefik.http.services.tvheadend.loadbalancer.server.port=9981", -] - -[networks] [networks.proxy] external = true diff --git a/docker/umami/docker-compose.toml b/docker/umami/docker-compose.toml index d4cbd228..3d5a92da 100644 --- a/docker/umami/docker-compose.toml +++ b/docker/umami/docker-compose.toml @@ -4,18 +4,6 @@ container_name = "umami" restart = "unless-stopped" networks = ["postgres", "proxy"] env_file = ".env" -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.umami-redirect.entrypoints=http", - "traefik.http.routers.umami-redirect.rule=Host(`umami.korhonen.cc`)", - "traefik.http.routers.umami-redirect.middlewares=http2https@file", - "traefik.http.routers.umami.entrypoints=https", - "traefik.http.routers.umami.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.umami.rule=Host(`umami.korhonen.cc`)", - "traefik.http.routers.umami.service=umami", - "traefik.http.services.umami.loadbalancer.server.port=3000", -] [services.umami.environment] DATABASE_URL = "postgresql://umami:${POSTGRES_PASS}@postgres:5432/umami" diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index c53fdf76..46b5b6f0 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -203,6 +203,9 @@ local plugins = { "norcalli/nvim-colorizer.lua", config = true, }, + + -- Caddyfile syntax support + "isobit/vim-caddyfile", } local lazy_opts = {} diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 2256bea2..aff3bcd5 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -10,7 +10,7 @@ LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg {%@@ if profile == "Moria" @@%} CleanMethod=KeepCurrent -CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 +CacheDir=/var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} [cachyos-v3] @@ -43,7 +43,7 @@ Include = /etc/pacman.d/mirrorlist [korhonen_aur] {%@@ if profile == "Moria" @@%} -Server = file:///docker/index.korhonen.cc/repo/arch_linux/$repo/$arch +Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ else @@%} Include = /etc/pacman.d/pacserve Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch From cacf7523859e373dbfc866fb379d5d88f49ac87e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 3 Apr 2023 23:24:39 +0300 Subject: [PATCH 1839/2667] Fix path to index.korhonen.cc --- docker/caddy/Caddyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 1ac51545..c9856e02 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -18,7 +18,7 @@ korhonen.cc, *.korhonen.cc { @index host index.korhonen.cc handle @index { - root * /docker/index.korhonen.cc + root * /var/www/index.korhonen.cc file_server browse } From aa00c1d36e66e41ec82312078782625ee283fb62 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 3 Apr 2023 23:24:39 +0300 Subject: [PATCH 1840/2667] Fix path to index.korhonen.cc --- docker/caddy/Caddyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 1ac51545..c9856e02 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -18,7 +18,7 @@ korhonen.cc, *.korhonen.cc { @index host index.korhonen.cc handle @index { - root * /docker/index.korhonen.cc + root * /var/www/index.korhonen.cc file_server browse } From eb1321303c6be4785a1a900b6b7230af502b7c73 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 3 Apr 2023 23:29:30 +0300 Subject: [PATCH 1841/2667] Remove unneeded labels and containers after moving to traefik --- docker/authentik/docker-compose.toml | 26 -------------------- docker/caddy/Caddyfile | 5 ++++ docker/freshrss/docker-compose.toml | 16 ------------ docker/headscale/docker-compose.toml | 24 ------------------ docker/homeautomation/docker-compose.toml | 12 --------- docker/korhonen.cc/docker-compose.toml | 28 --------------------- docker/korhonen.cc/nginx.conf | 30 ----------------------- docker/remotely/docker-compose.toml | 24 ------------------ docker/searx/docker-compose.toml | 12 --------- docker/wkd/docker-compose.toml | 21 ---------------- docker/wkd/nginx.conf | 15 ------------ docker/woodpecker/docker-compose.toml | 12 --------- 12 files changed, 5 insertions(+), 220 deletions(-) delete mode 100644 docker/korhonen.cc/docker-compose.toml delete mode 100644 docker/korhonen.cc/nginx.conf delete mode 100644 docker/remotely/docker-compose.toml delete mode 100644 docker/wkd/docker-compose.toml delete mode 100644 docker/wkd/nginx.conf diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 11642ada..24904d98 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -24,19 +24,6 @@ volumes = [ ] env_file = [".env"] networks = ["authentik", "postgres", "proxy"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.authentik-redirect.entrypoints=http", - "traefik.http.routers.authentik-redirect.rule=Host(`sso.korhonen.cc`)", - "traefik.http.routers.authentik-redirect.middlewares=http2https@file", - "traefik.http.routers.authentik.entrypoints=https", - "traefik.http.routers.authentik.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.authentik-rtr-outpost.rule=HostRegexp(`{subdomain:[a-z0-9-]+}.korhonen.cc`) && PathPrefix(`/outpost.goauthentik.io/`)", - "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)", - "traefik.http.routers.authentik.service=authentik", - "traefik.http.services.authentik.loadbalancer.server.port=9000", -] [services.worker] image = "ghcr.io/goauthentik/server" @@ -73,19 +60,6 @@ restart = "unless-stopped" security_opt = ["no-new-privileges:true"] networks = ["proxy"] environment = ["TZ"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.whoami-test-redirect.entrypoints=http", - "traefik.http.routers.whoami-test-redirect.rule=Host(`whoami-test.korhonen.cc`)", - "traefik.http.routers.whoami-test-redirect.middlewares=http2https@file", - "traefik.http.routers.whoami-test.entrypoints=https", - "traefik.http.routers.whoami-test.middlewares=secHeaders@file,compress@file,authentik@file", - "traefik.http.routers.whoami-test.rule=Host(`whoami-test.korhonen.cc`)", - "traefik.http.routers.whoami-test.service=whoami-test", - "traefik.http.services.whoami-test.loadbalancer.server.port=80", -] - [networks.authentik] external = true diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index c9856e02..d428c4a6 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -37,6 +37,11 @@ korhonen.cc, *.korhonen.cc { reverse_proxy forgejo:3000 } + @woodpecker host ci.korhonen.cc + handle @woodpecker { + reverse_proxy woodpecker:8000 + } + @searx host search.korhonen.cc handle @searx { reverse_proxy searx:8080 diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml index e249c3c4..cfd76b99 100644 --- a/docker/freshrss/docker-compose.toml +++ b/docker/freshrss/docker-compose.toml @@ -1,5 +1,3 @@ -[services] - [services.freshrss] image = "linuxserver/freshrss" container_name = "freshrss" @@ -10,20 +8,6 @@ volumes = [ "/docker/freshrss/freshrss:/config", "/etc/localtime:/etc/localtime:ro", ] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.freshrss-redirect.entrypoints=http", - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.korhonen.cc`)", - "traefik.http.routers.freshrss-redirect.middlewares=http2https@file", - "traefik.http.routers.freshrss.entrypoints=https", - "traefik.http.routers.freshrss.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)", - "traefik.http.routers.freshrss.service=freshrss", - "traefik.http.services.freshrss.loadbalancer.server.port=80", -] - -[networks] [networks.freshrss] external = false diff --git a/docker/headscale/docker-compose.toml b/docker/headscale/docker-compose.toml index 40fad9ea..fff546bf 100644 --- a/docker/headscale/docker-compose.toml +++ b/docker/headscale/docker-compose.toml @@ -9,35 +9,11 @@ ports = ["3478:3478/udp"] command = "headscale serve" restart = "unless-stopped" networks = ["postgres"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.headscale-redirect.entrypoints=http", - "traefik.http.routers.headscale-redirect.rule=PathPrefix(`/`)&&Host(`headscale.korhonen.cc`)", - "traefik.http.routers.headscale-redirect.middlewares=http2https@file", - "traefik.http.routers.headscale.entrypoints=https", - "traefik.http.routers.headscale.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.headscale.rule=PathPrefix(`/`) && Host(`headscale.korhonen.cc`)", - "traefik.http.routers.headscale.service=headscale", - "traefik.http.services.headscale.loadbalancer.server.port=8080", -] [services.headscale-ui] image = "ghcr.io/gurucomputing/headscale-ui" container_name = "headscale-ui" restart = "unless-stopped" -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.headscale-ui-redirect.entrypoints=http", - "traefik.http.routers.headscale-ui-redirect.rule=PathPrefix(`/web`)&&Host(`headscale.korhonen.cc`)", - "traefik.http.routers.headscale-ui-redirect.middlewares=http2https@file", - "traefik.http.routers.headscale-ui.entrypoints=https", - "traefik.http.routers.headscale-ui.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.headscale-ui.rule=PathPrefix(`/web`)&&Host(`headscale.korhonen.cc`)", - "traefik.http.routers.headscale-ui.service=headscale-ui", - "traefik.http.services.headscale-ui.loadbalancer.server.port=80", -] [networks.postgres] external = true diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 53187d2b..6f1eac57 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -12,18 +12,6 @@ networks = ["homeautomation", "postgres", "proxy"] ports = ["8123:8123", "8300:8300"] extra_hosts = ["host.docker.internal:host-gateway"] depends_on = ["mosquitto"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.home-assistant-redirect.entrypoints=http", - "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)", - "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file", - "traefik.http.routers.home-assistant.entrypoints=https", - "traefik.http.routers.home-assistant.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)", - "traefik.http.routers.home-assistant.service=home-assistant", - "traefik.http.services.home-assistant.loadbalancer.server.port=8123", -] [services.esphome] container_name = "esphome" diff --git a/docker/korhonen.cc/docker-compose.toml b/docker/korhonen.cc/docker-compose.toml deleted file mode 100644 index db895110..00000000 --- a/docker/korhonen.cc/docker-compose.toml +++ /dev/null @@ -1,28 +0,0 @@ -[services] - -[services.nginx] -image = "nginx" -container_name = "korhonen.cc" -volumes = [ - "/var/www/korhonen.cc:/korhonen.cc:ro", - "./nginx.conf:/etc/nginx/conf.d/default.conf", -] -networks = ["proxy"] -restart = "unless-stopped" -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.korhonen-redirect.entrypoints=http", - "traefik.http.routers.korhonen-redirect.rule=Host(`korhonen.cc`) || Host(`www.korhonen.cc`)", - "traefik.http.routers.korhonen-redirect.middlewares=www2non-www@file,http2https@file", - "traefik.http.routers.korhonen.entrypoints=https", - "traefik.http.routers.korhonen.middlewares=secHeaders@file,www2non-www@file,compress@file", - "traefik.http.routers.korhonen.rule=Host(`korhonen.cc`) || Host(`www.korhonen.cc`)", - "traefik.http.routers.korhonen.service=korhonen", - "traefik.http.services.korhonen.loadbalancer.server.port=80", -] - -[networks] - -[networks.proxy] -external = true diff --git a/docker/korhonen.cc/nginx.conf b/docker/korhonen.cc/nginx.conf deleted file mode 100644 index 18392922..00000000 --- a/docker/korhonen.cc/nginx.conf +++ /dev/null @@ -1,30 +0,0 @@ -server { - listen 80; - listen [::]:80; - server_name localhost; - - location / { - root /korhonen.cc; - index index.html; - - location ~* \.(?:css|js|jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ { - expires 1M; - access_log off; - add_header Cache-Control "public"; - } - - location /fi { - error_page 404 /fi/404.html; - } - } - - # Use hugo 404 page - error_page 404 /404.html; - - # Redirect 5xx to standard error pages - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } -} - diff --git a/docker/remotely/docker-compose.toml b/docker/remotely/docker-compose.toml deleted file mode 100644 index 43ec6e68..00000000 --- a/docker/remotely/docker-compose.toml +++ /dev/null @@ -1,24 +0,0 @@ -[services] - -[services.remotely] -image = "translucency/remotely" -container_name = "remotely" -networks = ["proxy"] -volumes = ["/docker/remotely:/remotely-data"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.remotely-redirect.entrypoints=http", - "traefik.http.routers.remotely-redirect.rule=Host(`remotely.korhonen.cc`)", - "traefik.http.routers.remotely-redirect.middlewares=http2https@file", - "traefik.http.routers.remotely.entrypoints=https", - "traefik.http.routers.remotely.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.remotely.rule=Host(`remotely.korhonen.cc`)", - "traefik.http.routers.remotely.service=remotely", - "traefik.http.services.remotely.loadbalancer.server.port=5000", -] - -[networks] - -[networks.proxy] -external = true diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml index 9617520e..f2c1dd72 100644 --- a/docker/searx/docker-compose.toml +++ b/docker/searx/docker-compose.toml @@ -10,18 +10,6 @@ volumes = [ environment = ["SEARXNG_BASE_URL=https://search.korhonen.cc/"] cap_drop = ["ALL"] cap_add = ["CHOWN", "SETGID", "SETUID", "DAC_OVERRIDE"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.searx-redirect.entrypoints=http", - "traefik.http.routers.searx-redirect.rule=Host(`search.korhonen.cc`)", - "traefik.http.routers.searx-redirect.middlewares=http2https@file", - "traefik.http.routers.searx.entrypoints=https", - "traefik.http.routers.searx.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.searx.rule=Host(`search.korhonen.cc`)", - "traefik.http.routers.searx.service=searx", - "traefik.http.services.searx.loadbalancer.server.port=8080", -] [services.searx.logging] driver = "json-file" diff --git a/docker/wkd/docker-compose.toml b/docker/wkd/docker-compose.toml deleted file mode 100644 index 7e3a707e..00000000 --- a/docker/wkd/docker-compose.toml +++ /dev/null @@ -1,21 +0,0 @@ -[services.wkd] -image = "nginx" -container_name = "wkd" -volumes = [ - "/var/www/wkd:/wkd:ro", - "./nginx.conf:/etc/nginx/conf.d/default.conf", -] -networks = ["proxy"] -restart = "unless-stopped" -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.wkd.entrypoints=https", - "traefik.http.routers.wkd.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.wkd.rule=Host(`openpgpkey.korhonen.cc`)", - "traefik.http.routers.wkd.service=wkd", - "traefik.http.services.wkd.loadbalancer.server.port=80", -] - -[networks.proxy] -external = true diff --git a/docker/wkd/nginx.conf b/docker/wkd/nginx.conf deleted file mode 100644 index e4ebdac9..00000000 --- a/docker/wkd/nginx.conf +++ /dev/null @@ -1,15 +0,0 @@ -server { - listen 80; - listen [::]:80; - root /wkd; - - location /.well-known/openpgpkey/korhonen.cc/hu/ { - default_type "application/octet-stream"; - add_header Access-Control-Allow-Origin * always; - } - - location / { - return 301 https://keyoxide.org/wkd/marko%40korhonen.cc; - } -} - diff --git a/docker/woodpecker/docker-compose.toml b/docker/woodpecker/docker-compose.toml index 551bb545..7a4c823e 100644 --- a/docker/woodpecker/docker-compose.toml +++ b/docker/woodpecker/docker-compose.toml @@ -15,18 +15,6 @@ environment = [ "WOODPECKER_ADMIN=FunctionalHacker", ] networks = ["proxy", "default"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.woodpecker-redirect.entrypoints=http", - "traefik.http.routers.woodpecker-redirect.rule=Host(`ci.korhonen.cc`)", - "traefik.http.routers.woodpecker-redirect.middlewares=http2https@file", - "traefik.http.routers.woodpecker.entrypoints=https", - "traefik.http.routers.woodpecker.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.woodpecker.rule=Host(`ci.korhonen.cc`)", - "traefik.http.routers.woodpecker.service=woodpecker", - "traefik.http.services.woodpecker.loadbalancer.server.port=8000", -] [services.woodpecker-agent] image = "woodpeckerci/woodpecker-agent" From f469555599a717951ae783740b3c2ee0888fcde4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 3 Apr 2023 23:29:30 +0300 Subject: [PATCH 1842/2667] Remove unneeded labels and containers after moving to traefik --- docker/authentik/docker-compose.toml | 26 -------------------- docker/caddy/Caddyfile | 5 ++++ docker/freshrss/docker-compose.toml | 16 ------------ docker/headscale/docker-compose.toml | 24 ------------------ docker/homeautomation/docker-compose.toml | 12 --------- docker/korhonen.cc/docker-compose.toml | 28 --------------------- docker/korhonen.cc/nginx.conf | 30 ----------------------- docker/remotely/docker-compose.toml | 24 ------------------ docker/searx/docker-compose.toml | 12 --------- docker/wkd/docker-compose.toml | 21 ---------------- docker/wkd/nginx.conf | 15 ------------ docker/woodpecker/docker-compose.toml | 12 --------- 12 files changed, 5 insertions(+), 220 deletions(-) delete mode 100644 docker/korhonen.cc/docker-compose.toml delete mode 100644 docker/korhonen.cc/nginx.conf delete mode 100644 docker/remotely/docker-compose.toml delete mode 100644 docker/wkd/docker-compose.toml delete mode 100644 docker/wkd/nginx.conf diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 11642ada..24904d98 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -24,19 +24,6 @@ volumes = [ ] env_file = [".env"] networks = ["authentik", "postgres", "proxy"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.authentik-redirect.entrypoints=http", - "traefik.http.routers.authentik-redirect.rule=Host(`sso.korhonen.cc`)", - "traefik.http.routers.authentik-redirect.middlewares=http2https@file", - "traefik.http.routers.authentik.entrypoints=https", - "traefik.http.routers.authentik.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.authentik-rtr-outpost.rule=HostRegexp(`{subdomain:[a-z0-9-]+}.korhonen.cc`) && PathPrefix(`/outpost.goauthentik.io/`)", - "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)", - "traefik.http.routers.authentik.service=authentik", - "traefik.http.services.authentik.loadbalancer.server.port=9000", -] [services.worker] image = "ghcr.io/goauthentik/server" @@ -73,19 +60,6 @@ restart = "unless-stopped" security_opt = ["no-new-privileges:true"] networks = ["proxy"] environment = ["TZ"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.whoami-test-redirect.entrypoints=http", - "traefik.http.routers.whoami-test-redirect.rule=Host(`whoami-test.korhonen.cc`)", - "traefik.http.routers.whoami-test-redirect.middlewares=http2https@file", - "traefik.http.routers.whoami-test.entrypoints=https", - "traefik.http.routers.whoami-test.middlewares=secHeaders@file,compress@file,authentik@file", - "traefik.http.routers.whoami-test.rule=Host(`whoami-test.korhonen.cc`)", - "traefik.http.routers.whoami-test.service=whoami-test", - "traefik.http.services.whoami-test.loadbalancer.server.port=80", -] - [networks.authentik] external = true diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index c9856e02..d428c4a6 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -37,6 +37,11 @@ korhonen.cc, *.korhonen.cc { reverse_proxy forgejo:3000 } + @woodpecker host ci.korhonen.cc + handle @woodpecker { + reverse_proxy woodpecker:8000 + } + @searx host search.korhonen.cc handle @searx { reverse_proxy searx:8080 diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml index e249c3c4..cfd76b99 100644 --- a/docker/freshrss/docker-compose.toml +++ b/docker/freshrss/docker-compose.toml @@ -1,5 +1,3 @@ -[services] - [services.freshrss] image = "linuxserver/freshrss" container_name = "freshrss" @@ -10,20 +8,6 @@ volumes = [ "/docker/freshrss/freshrss:/config", "/etc/localtime:/etc/localtime:ro", ] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.freshrss-redirect.entrypoints=http", - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.korhonen.cc`)", - "traefik.http.routers.freshrss-redirect.middlewares=http2https@file", - "traefik.http.routers.freshrss.entrypoints=https", - "traefik.http.routers.freshrss.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)", - "traefik.http.routers.freshrss.service=freshrss", - "traefik.http.services.freshrss.loadbalancer.server.port=80", -] - -[networks] [networks.freshrss] external = false diff --git a/docker/headscale/docker-compose.toml b/docker/headscale/docker-compose.toml index 40fad9ea..fff546bf 100644 --- a/docker/headscale/docker-compose.toml +++ b/docker/headscale/docker-compose.toml @@ -9,35 +9,11 @@ ports = ["3478:3478/udp"] command = "headscale serve" restart = "unless-stopped" networks = ["postgres"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.headscale-redirect.entrypoints=http", - "traefik.http.routers.headscale-redirect.rule=PathPrefix(`/`)&&Host(`headscale.korhonen.cc`)", - "traefik.http.routers.headscale-redirect.middlewares=http2https@file", - "traefik.http.routers.headscale.entrypoints=https", - "traefik.http.routers.headscale.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.headscale.rule=PathPrefix(`/`) && Host(`headscale.korhonen.cc`)", - "traefik.http.routers.headscale.service=headscale", - "traefik.http.services.headscale.loadbalancer.server.port=8080", -] [services.headscale-ui] image = "ghcr.io/gurucomputing/headscale-ui" container_name = "headscale-ui" restart = "unless-stopped" -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.headscale-ui-redirect.entrypoints=http", - "traefik.http.routers.headscale-ui-redirect.rule=PathPrefix(`/web`)&&Host(`headscale.korhonen.cc`)", - "traefik.http.routers.headscale-ui-redirect.middlewares=http2https@file", - "traefik.http.routers.headscale-ui.entrypoints=https", - "traefik.http.routers.headscale-ui.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.headscale-ui.rule=PathPrefix(`/web`)&&Host(`headscale.korhonen.cc`)", - "traefik.http.routers.headscale-ui.service=headscale-ui", - "traefik.http.services.headscale-ui.loadbalancer.server.port=80", -] [networks.postgres] external = true diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 53187d2b..6f1eac57 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -12,18 +12,6 @@ networks = ["homeautomation", "postgres", "proxy"] ports = ["8123:8123", "8300:8300"] extra_hosts = ["host.docker.internal:host-gateway"] depends_on = ["mosquitto"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.home-assistant-redirect.entrypoints=http", - "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)", - "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file", - "traefik.http.routers.home-assistant.entrypoints=https", - "traefik.http.routers.home-assistant.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)", - "traefik.http.routers.home-assistant.service=home-assistant", - "traefik.http.services.home-assistant.loadbalancer.server.port=8123", -] [services.esphome] container_name = "esphome" diff --git a/docker/korhonen.cc/docker-compose.toml b/docker/korhonen.cc/docker-compose.toml deleted file mode 100644 index db895110..00000000 --- a/docker/korhonen.cc/docker-compose.toml +++ /dev/null @@ -1,28 +0,0 @@ -[services] - -[services.nginx] -image = "nginx" -container_name = "korhonen.cc" -volumes = [ - "/var/www/korhonen.cc:/korhonen.cc:ro", - "./nginx.conf:/etc/nginx/conf.d/default.conf", -] -networks = ["proxy"] -restart = "unless-stopped" -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.korhonen-redirect.entrypoints=http", - "traefik.http.routers.korhonen-redirect.rule=Host(`korhonen.cc`) || Host(`www.korhonen.cc`)", - "traefik.http.routers.korhonen-redirect.middlewares=www2non-www@file,http2https@file", - "traefik.http.routers.korhonen.entrypoints=https", - "traefik.http.routers.korhonen.middlewares=secHeaders@file,www2non-www@file,compress@file", - "traefik.http.routers.korhonen.rule=Host(`korhonen.cc`) || Host(`www.korhonen.cc`)", - "traefik.http.routers.korhonen.service=korhonen", - "traefik.http.services.korhonen.loadbalancer.server.port=80", -] - -[networks] - -[networks.proxy] -external = true diff --git a/docker/korhonen.cc/nginx.conf b/docker/korhonen.cc/nginx.conf deleted file mode 100644 index 18392922..00000000 --- a/docker/korhonen.cc/nginx.conf +++ /dev/null @@ -1,30 +0,0 @@ -server { - listen 80; - listen [::]:80; - server_name localhost; - - location / { - root /korhonen.cc; - index index.html; - - location ~* \.(?:css|js|jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ { - expires 1M; - access_log off; - add_header Cache-Control "public"; - } - - location /fi { - error_page 404 /fi/404.html; - } - } - - # Use hugo 404 page - error_page 404 /404.html; - - # Redirect 5xx to standard error pages - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } -} - diff --git a/docker/remotely/docker-compose.toml b/docker/remotely/docker-compose.toml deleted file mode 100644 index 43ec6e68..00000000 --- a/docker/remotely/docker-compose.toml +++ /dev/null @@ -1,24 +0,0 @@ -[services] - -[services.remotely] -image = "translucency/remotely" -container_name = "remotely" -networks = ["proxy"] -volumes = ["/docker/remotely:/remotely-data"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.remotely-redirect.entrypoints=http", - "traefik.http.routers.remotely-redirect.rule=Host(`remotely.korhonen.cc`)", - "traefik.http.routers.remotely-redirect.middlewares=http2https@file", - "traefik.http.routers.remotely.entrypoints=https", - "traefik.http.routers.remotely.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.remotely.rule=Host(`remotely.korhonen.cc`)", - "traefik.http.routers.remotely.service=remotely", - "traefik.http.services.remotely.loadbalancer.server.port=5000", -] - -[networks] - -[networks.proxy] -external = true diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml index 9617520e..f2c1dd72 100644 --- a/docker/searx/docker-compose.toml +++ b/docker/searx/docker-compose.toml @@ -10,18 +10,6 @@ volumes = [ environment = ["SEARXNG_BASE_URL=https://search.korhonen.cc/"] cap_drop = ["ALL"] cap_add = ["CHOWN", "SETGID", "SETUID", "DAC_OVERRIDE"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.searx-redirect.entrypoints=http", - "traefik.http.routers.searx-redirect.rule=Host(`search.korhonen.cc`)", - "traefik.http.routers.searx-redirect.middlewares=http2https@file", - "traefik.http.routers.searx.entrypoints=https", - "traefik.http.routers.searx.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.searx.rule=Host(`search.korhonen.cc`)", - "traefik.http.routers.searx.service=searx", - "traefik.http.services.searx.loadbalancer.server.port=8080", -] [services.searx.logging] driver = "json-file" diff --git a/docker/wkd/docker-compose.toml b/docker/wkd/docker-compose.toml deleted file mode 100644 index 7e3a707e..00000000 --- a/docker/wkd/docker-compose.toml +++ /dev/null @@ -1,21 +0,0 @@ -[services.wkd] -image = "nginx" -container_name = "wkd" -volumes = [ - "/var/www/wkd:/wkd:ro", - "./nginx.conf:/etc/nginx/conf.d/default.conf", -] -networks = ["proxy"] -restart = "unless-stopped" -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.wkd.entrypoints=https", - "traefik.http.routers.wkd.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.wkd.rule=Host(`openpgpkey.korhonen.cc`)", - "traefik.http.routers.wkd.service=wkd", - "traefik.http.services.wkd.loadbalancer.server.port=80", -] - -[networks.proxy] -external = true diff --git a/docker/wkd/nginx.conf b/docker/wkd/nginx.conf deleted file mode 100644 index e4ebdac9..00000000 --- a/docker/wkd/nginx.conf +++ /dev/null @@ -1,15 +0,0 @@ -server { - listen 80; - listen [::]:80; - root /wkd; - - location /.well-known/openpgpkey/korhonen.cc/hu/ { - default_type "application/octet-stream"; - add_header Access-Control-Allow-Origin * always; - } - - location / { - return 301 https://keyoxide.org/wkd/marko%40korhonen.cc; - } -} - diff --git a/docker/woodpecker/docker-compose.toml b/docker/woodpecker/docker-compose.toml index 551bb545..7a4c823e 100644 --- a/docker/woodpecker/docker-compose.toml +++ b/docker/woodpecker/docker-compose.toml @@ -15,18 +15,6 @@ environment = [ "WOODPECKER_ADMIN=FunctionalHacker", ] networks = ["proxy", "default"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.woodpecker-redirect.entrypoints=http", - "traefik.http.routers.woodpecker-redirect.rule=Host(`ci.korhonen.cc`)", - "traefik.http.routers.woodpecker-redirect.middlewares=http2https@file", - "traefik.http.routers.woodpecker.entrypoints=https", - "traefik.http.routers.woodpecker.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.woodpecker.rule=Host(`ci.korhonen.cc`)", - "traefik.http.routers.woodpecker.service=woodpecker", - "traefik.http.services.woodpecker.loadbalancer.server.port=8000", -] [services.woodpecker-agent] image = "woodpeckerci/woodpecker-agent" From 4c1f264e2a12cd81630adc6b4dd74c31203133a9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 00:44:54 +0300 Subject: [PATCH 1843/2667] Add nextcloud to caddy --- docker/caddy/Caddyfile | 44 ++++++++++++++++++++++++++-- docker/caddy/docker-compose.toml | 2 ++ docker/nextcloud/docker-compose.toml | 25 ---------------- 3 files changed, 43 insertions(+), 28 deletions(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index d428c4a6..7c4b632d 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -4,8 +4,12 @@ korhonen.cc, *.korhonen.cc { resolvers 1.1.1.1 } + header { + Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" + } + @homepage host korhonen.cc - handle @homepage { + handle @homepage { root * /var/www/korhonen.cc file_server } @@ -69,11 +73,45 @@ korhonen.cc, *.korhonen.cc { @umami host umami.korhonen.cc handle @umami { - reverse_proxy umami:3000 + reverse_proxy umami:3000 + } + + @nextcloud host cloud.korhonen.cc + handle @nextcloud { + encode gzip + + # .htaccess / data / config / ... shouldn't be accessible from outside + @forbidden { + path /.htaccess + path /data/* + path /config/* + path /db_structure + path /.xml + path /README + path /3rdparty/* + path /lib/* + path /templates/* + path /occ + path /console.php + } + handle @forbidden { + respond 404 + } + + redir /.well-known/carddav /remote.php/dav 301 + redir /.well-known/caldav /remote.php/dav 301 + + root * /var/www/nextcloud + php_fastcgi nextcloud:9000 { + root /var/www/html + # Tells nextcloud to remove /index.php from URLs in links + env front_controller_active true + } + file_server browse } # Fallback for unhandled domains handle { - redir https://korhonen.cc/404.html + redir https://korhonen.cc/404.html 301 } } diff --git a/docker/caddy/docker-compose.toml b/docker/caddy/docker-compose.toml index e335ee2e..7a51f6fe 100644 --- a/docker/caddy/docker-compose.toml +++ b/docker/caddy/docker-compose.toml @@ -2,11 +2,13 @@ image = "slothcroissant/caddy-cloudflaredns" container_name = "caddy" restart = "unless-stopped" +user = "82:82" ports = ["80:80", "443:443/tcp", "443:443/udp"] networks = ["proxy"] volumes = [ "/docker/caddy/data:/data", "/docker/caddy/config:/config", + "/docker/nextcloud:/var/www/nextcloud", "/var/www/korhonen.cc:/var/www/korhonen.cc", "/var/www/wkd:/var/www/wkd", "/var/www/index.korhonen.cc:/var/www/index.korhonen.cc", diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 24d58518..c6f588c8 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -1,28 +1,3 @@ -[services] - -[services.nextcloud-web] -image = "nginx:alpine" -container_name = "nextcloud-web" -restart = "unless-stopped" -networks = ["nextcloud", "proxy"] -volumes = [ - "./nginx.conf:/etc/nginx/nginx.conf", - "/docker/nextcloud:/var/www/html:z", -] -depends_on = ["nextcloud"] -labels = [ - "traefik.enable=true", - "traefik.http.routers.nextcloud-redirect.entrypoints=http", - "traefik.http.routers.nextcloud-redirect.rule=Host(`cloud.korhonen.cc`)", - "traefik.http.routers.nextcloud-redirect.middlewares=http2https@file", - "traefik.http.routers.nextcloud.entrypoints=https", - "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)", - "traefik.http.routers.nextcloud.service=nextcloud", - "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-security-headers@file,nextcloud-redirect-dav@file,nextcloud-redirect-extra@file,compress@file", - "traefik.docker.network=proxy", - "traefik.http.services.nextcloud.loadbalancer.server.port=80", -] - [services.nextcloud] image = "nextcloud:fpm-alpine" container_name = "nextcloud" From 3b1dcf4709598fc8ab0ff8a34c96056239953fb4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 00:44:54 +0300 Subject: [PATCH 1844/2667] Add nextcloud to caddy --- docker/caddy/Caddyfile | 44 ++++++++++++++++++++++++++-- docker/caddy/docker-compose.toml | 2 ++ docker/nextcloud/docker-compose.toml | 25 ---------------- 3 files changed, 43 insertions(+), 28 deletions(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index d428c4a6..7c4b632d 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -4,8 +4,12 @@ korhonen.cc, *.korhonen.cc { resolvers 1.1.1.1 } + header { + Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" + } + @homepage host korhonen.cc - handle @homepage { + handle @homepage { root * /var/www/korhonen.cc file_server } @@ -69,11 +73,45 @@ korhonen.cc, *.korhonen.cc { @umami host umami.korhonen.cc handle @umami { - reverse_proxy umami:3000 + reverse_proxy umami:3000 + } + + @nextcloud host cloud.korhonen.cc + handle @nextcloud { + encode gzip + + # .htaccess / data / config / ... shouldn't be accessible from outside + @forbidden { + path /.htaccess + path /data/* + path /config/* + path /db_structure + path /.xml + path /README + path /3rdparty/* + path /lib/* + path /templates/* + path /occ + path /console.php + } + handle @forbidden { + respond 404 + } + + redir /.well-known/carddav /remote.php/dav 301 + redir /.well-known/caldav /remote.php/dav 301 + + root * /var/www/nextcloud + php_fastcgi nextcloud:9000 { + root /var/www/html + # Tells nextcloud to remove /index.php from URLs in links + env front_controller_active true + } + file_server browse } # Fallback for unhandled domains handle { - redir https://korhonen.cc/404.html + redir https://korhonen.cc/404.html 301 } } diff --git a/docker/caddy/docker-compose.toml b/docker/caddy/docker-compose.toml index e335ee2e..7a51f6fe 100644 --- a/docker/caddy/docker-compose.toml +++ b/docker/caddy/docker-compose.toml @@ -2,11 +2,13 @@ image = "slothcroissant/caddy-cloudflaredns" container_name = "caddy" restart = "unless-stopped" +user = "82:82" ports = ["80:80", "443:443/tcp", "443:443/udp"] networks = ["proxy"] volumes = [ "/docker/caddy/data:/data", "/docker/caddy/config:/config", + "/docker/nextcloud:/var/www/nextcloud", "/var/www/korhonen.cc:/var/www/korhonen.cc", "/var/www/wkd:/var/www/wkd", "/var/www/index.korhonen.cc:/var/www/index.korhonen.cc", diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 24d58518..c6f588c8 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -1,28 +1,3 @@ -[services] - -[services.nextcloud-web] -image = "nginx:alpine" -container_name = "nextcloud-web" -restart = "unless-stopped" -networks = ["nextcloud", "proxy"] -volumes = [ - "./nginx.conf:/etc/nginx/nginx.conf", - "/docker/nextcloud:/var/www/html:z", -] -depends_on = ["nextcloud"] -labels = [ - "traefik.enable=true", - "traefik.http.routers.nextcloud-redirect.entrypoints=http", - "traefik.http.routers.nextcloud-redirect.rule=Host(`cloud.korhonen.cc`)", - "traefik.http.routers.nextcloud-redirect.middlewares=http2https@file", - "traefik.http.routers.nextcloud.entrypoints=https", - "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)", - "traefik.http.routers.nextcloud.service=nextcloud", - "traefik.http.routers.nextcloud.middlewares=secHeaders@file,nextcloud-security-headers@file,nextcloud-redirect-dav@file,nextcloud-redirect-extra@file,compress@file", - "traefik.docker.network=proxy", - "traefik.http.services.nextcloud.loadbalancer.server.port=80", -] - [services.nextcloud] image = "nextcloud:fpm-alpine" container_name = "nextcloud" From f795a4972033674f8a627fe2cefd8fc91018ba0e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 01:00:48 +0300 Subject: [PATCH 1845/2667] Add some common security headers for all sites --- docker/caddy/Caddyfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 7c4b632d..fa9cde86 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -5,7 +5,11 @@ korhonen.cc, *.korhonen.cc { } header { - Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" + Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" + X-Frame-Options DENY + X-XSS-Protection 0 + X-Content-Type-Options nosniff + Referrer-Policy strict-origin-when-cross-origin } @homepage host korhonen.cc From acc7aa6848076c9b0f9a01ec32dc8807b6b76af7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 01:00:48 +0300 Subject: [PATCH 1846/2667] Add some common security headers for all sites --- docker/caddy/Caddyfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 7c4b632d..fa9cde86 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -5,7 +5,11 @@ korhonen.cc, *.korhonen.cc { } header { - Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" + Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" + X-Frame-Options DENY + X-XSS-Protection 0 + X-Content-Type-Options nosniff + Referrer-Policy strict-origin-when-cross-origin } @homepage host korhonen.cc From 1bb484443be287946ae71d509d1002df748ce4ef Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 01:03:39 +0300 Subject: [PATCH 1847/2667] Add redirect from www.korhonen.cc to korhonen.cc --- docker/caddy/Caddyfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index fa9cde86..9c7bea2a 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -12,6 +12,11 @@ korhonen.cc, *.korhonen.cc { Referrer-Policy strict-origin-when-cross-origin } + @homepage-redir host www.korhonen.cc + handle @homepage-redir { + redir https://korhonen.cc + } + @homepage host korhonen.cc handle @homepage { root * /var/www/korhonen.cc From f4a2f1bb36c6ff3eb71a8776098997b2cb3f2c7e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 01:03:39 +0300 Subject: [PATCH 1848/2667] Add redirect from www.korhonen.cc to korhonen.cc --- docker/caddy/Caddyfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index fa9cde86..9c7bea2a 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -12,6 +12,11 @@ korhonen.cc, *.korhonen.cc { Referrer-Policy strict-origin-when-cross-origin } + @homepage-redir host www.korhonen.cc + handle @homepage-redir { + redir https://korhonen.cc + } + @homepage host korhonen.cc handle @homepage { root * /var/www/korhonen.cc From 3b20556fb7cc33d36dd214314ef51d10564b58d2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 01:12:13 +0300 Subject: [PATCH 1849/2667] Add tvheadend to caddy --- docker/caddy/Caddyfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 9c7bea2a..43315044 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -119,6 +119,11 @@ korhonen.cc, *.korhonen.cc { file_server browse } + @tvheadend host tvheadend.korhonen.cc + handle @tvheadend { + reverse_proxy tvheadend:9981 + } + # Fallback for unhandled domains handle { redir https://korhonen.cc/404.html 301 From 7290ecac2e4f3d45795a93e70e4df4ed0a03409b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 01:12:13 +0300 Subject: [PATCH 1850/2667] Add tvheadend to caddy --- docker/caddy/Caddyfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 9c7bea2a..43315044 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -119,6 +119,11 @@ korhonen.cc, *.korhonen.cc { file_server browse } + @tvheadend host tvheadend.korhonen.cc + handle @tvheadend { + reverse_proxy tvheadend:9981 + } + # Fallback for unhandled domains handle { redir https://korhonen.cc/404.html 301 From 4af284427f5e7ddf1ceffc868fa673d78fc9ff3f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 01:15:18 +0300 Subject: [PATCH 1851/2667] Add collabora to caddy --- docker/caddy/Caddyfile | 7 ++++++- docker/nextcloud/docker-compose.toml | 12 ------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 43315044..64475793 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -116,7 +116,7 @@ korhonen.cc, *.korhonen.cc { # Tells nextcloud to remove /index.php from URLs in links env front_controller_active true } - file_server browse + file_server } @tvheadend host tvheadend.korhonen.cc @@ -124,6 +124,11 @@ korhonen.cc, *.korhonen.cc { reverse_proxy tvheadend:9981 } + @collabora host collabora.korhonen.cc + handle @collabora { + reverse_proxy collabora:9980 + } + # Fallback for unhandled domains handle { redir https://korhonen.cc/404.html 301 diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index c6f588c8..1bf978cc 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -69,18 +69,6 @@ environment = [ 'extra_params=--o:ssl.enable=false --o:ssl.termination=true', ] networks = ["proxy"] -labels = [ - "traefik.enable=true", - "traefik.http.routers.collabora-redirect.entrypoints=http", - "traefik.http.routers.collabora-redirect.rule=Host(`collabora.korhonen.cc`)", - "traefik.http.routers.collabora-redirect.middlewares=http2https@file", - "traefik.http.routers.collabora.entrypoints=https", - "traefik.http.routers.collabora.rule=Host(`collabora.korhonen.cc`)", - "traefik.http.routers.collabora.service=collabora", - "traefik.http.routers.collabora.middlewares=secHeaders@file,compress@file", - "traefik.docker.network=proxy", - "traefik.http.services.collabora.loadbalancer.server.port=9980", -] [networks.nextcloud] external = false From 1df1c2c97076bf50d9a5ffb35f6bb0ecf8689421 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 01:15:18 +0300 Subject: [PATCH 1852/2667] Add collabora to caddy --- docker/caddy/Caddyfile | 7 ++++++- docker/nextcloud/docker-compose.toml | 12 ------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 43315044..64475793 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -116,7 +116,7 @@ korhonen.cc, *.korhonen.cc { # Tells nextcloud to remove /index.php from URLs in links env front_controller_active true } - file_server browse + file_server } @tvheadend host tvheadend.korhonen.cc @@ -124,6 +124,11 @@ korhonen.cc, *.korhonen.cc { reverse_proxy tvheadend:9981 } + @collabora host collabora.korhonen.cc + handle @collabora { + reverse_proxy collabora:9980 + } + # Fallback for unhandled domains handle { redir https://korhonen.cc/404.html 301 diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index c6f588c8..1bf978cc 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -69,18 +69,6 @@ environment = [ 'extra_params=--o:ssl.enable=false --o:ssl.termination=true', ] networks = ["proxy"] -labels = [ - "traefik.enable=true", - "traefik.http.routers.collabora-redirect.entrypoints=http", - "traefik.http.routers.collabora-redirect.rule=Host(`collabora.korhonen.cc`)", - "traefik.http.routers.collabora-redirect.middlewares=http2https@file", - "traefik.http.routers.collabora.entrypoints=https", - "traefik.http.routers.collabora.rule=Host(`collabora.korhonen.cc`)", - "traefik.http.routers.collabora.service=collabora", - "traefik.http.routers.collabora.middlewares=secHeaders@file,compress@file", - "traefik.docker.network=proxy", - "traefik.http.services.collabora.loadbalancer.server.port=9980", -] [networks.nextcloud] external = false From 7051045942bf35209fc20a6a6c1f030d7c7bada8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 01:28:00 +0300 Subject: [PATCH 1853/2667] Remove unneeded security headers (these are set by default in caddy) --- docker/caddy/Caddyfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 64475793..09e32008 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -6,10 +6,6 @@ korhonen.cc, *.korhonen.cc { header { Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" - X-Frame-Options DENY - X-XSS-Protection 0 - X-Content-Type-Options nosniff - Referrer-Policy strict-origin-when-cross-origin } @homepage-redir host www.korhonen.cc From 73f430bea21c99e538190bd792a3abe9ddefc923 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 01:28:00 +0300 Subject: [PATCH 1854/2667] Remove unneeded security headers (these are set by default in caddy) --- docker/caddy/Caddyfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 64475793..09e32008 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -6,10 +6,6 @@ korhonen.cc, *.korhonen.cc { header { Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" - X-Frame-Options DENY - X-XSS-Protection 0 - X-Content-Type-Options nosniff - Referrer-Policy strict-origin-when-cross-origin } @homepage-redir host www.korhonen.cc From 902fe31a7ffbc7339052dea9e6c5470565820b25 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 16:31:31 +0300 Subject: [PATCH 1855/2667] Caddy: enable compression on all sites --- docker/caddy/Caddyfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 09e32008..57fa6ef3 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -4,6 +4,8 @@ korhonen.cc, *.korhonen.cc { resolvers 1.1.1.1 } + encode zstd gzip + header { Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" } @@ -83,8 +85,6 @@ korhonen.cc, *.korhonen.cc { @nextcloud host cloud.korhonen.cc handle @nextcloud { - encode gzip - # .htaccess / data / config / ... shouldn't be accessible from outside @forbidden { path /.htaccess From e101ea9de609ac2e4eadfdad874acf23b1a07793 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 16:31:31 +0300 Subject: [PATCH 1856/2667] Caddy: enable compression on all sites --- docker/caddy/Caddyfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 09e32008..57fa6ef3 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -4,6 +4,8 @@ korhonen.cc, *.korhonen.cc { resolvers 1.1.1.1 } + encode zstd gzip + header { Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" } @@ -83,8 +85,6 @@ korhonen.cc, *.korhonen.cc { @nextcloud host cloud.korhonen.cc handle @nextcloud { - encode gzip - # .htaccess / data / config / ... shouldn't be accessible from outside @forbidden { path /.htaccess From 4e6d402070aadde37d6af89914a5b28989027925 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 8 Apr 2023 13:05:50 +0300 Subject: [PATCH 1857/2667] Switch from plymouth-encrypt hook to encrypt Plymouth functionality is apparently merged to the regular encrypt hook --- root/etc/mkinitcpio.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 9b5d4dc4..c9d91593 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -4,8 +4,8 @@ BINARIES=("/usr/bin/btrfs") FILES=() {%@@ if profile == "Mirkwood" @@%} -HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) +HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs encrypt fsck) {%@@ elif profile == 'Moria' @@%} -#HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) +#HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs encrypt fsck) HOOKS=(base udev kms keyboard autodetect modconf block netconf dropbear encryptssh filesystems btrfs fsck) {%@@ endif @@%} From feeb513f21d986f8227d192213d8f9b2e1279672 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 8 Apr 2023 13:05:50 +0300 Subject: [PATCH 1858/2667] Switch from plymouth-encrypt hook to encrypt Plymouth functionality is apparently merged to the regular encrypt hook --- root/etc/mkinitcpio.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 9b5d4dc4..c9d91593 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -4,8 +4,8 @@ BINARIES=("/usr/bin/btrfs") FILES=() {%@@ if profile == "Mirkwood" @@%} -HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) +HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs encrypt fsck) {%@@ elif profile == 'Moria' @@%} -#HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck) +#HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs encrypt fsck) HOOKS=(base udev kms keyboard autodetect modconf block netconf dropbear encryptssh filesystems btrfs fsck) {%@@ endif @@%} From 17c1d739c2f9ccc2c1fce417372f429544fc5b40 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 8 Apr 2023 13:06:56 +0300 Subject: [PATCH 1859/2667] Add grafana --- docker/caddy/Caddyfile | 5 +++++ docker/stats/docker-compose.toml | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 docker/stats/docker-compose.toml diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 57fa6ef3..716ea767 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -125,6 +125,11 @@ korhonen.cc, *.korhonen.cc { reverse_proxy collabora:9980 } + @grafana host grafana.korhonen.cc + handle @grafana { + reverse_proxy grafana:3000 + } + # Fallback for unhandled domains handle { redir https://korhonen.cc/404.html 301 diff --git a/docker/stats/docker-compose.toml b/docker/stats/docker-compose.toml new file mode 100644 index 00000000..ff0e0846 --- /dev/null +++ b/docker/stats/docker-compose.toml @@ -0,0 +1,27 @@ +[services.grafana] +image = "grafana/grafana" +container_name = "grafana" +volumes = ["/docker/stats/grafana:/var/lib/grafana"] +networks = ["stats", "proxy"] +user = "1000:984" +env_file = [".env"] +environment = [ + "GF_AUTH_GENERIC_OAUTH_CLIENT_ID", + "GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET", + "GF_AUTH_GENERIC_OAUTH_ENABLED=true", + "GF_AUTH_GENERIC_OAUTH_NAME=authentik", + "GF_AUTH_GENERIC_OAUTH_SCOPES=openid profile email", + "GF_AUTH_GENERIC_OAUTH_AUTH_URL=https://sso.korhonen.cc/application/o/authorize/", + "GF_AUTH_GENERIC_OAUTH_TOKEN_URL=https://sso.korhonen.cc/application/o/token/", + "GF_AUTH_GENERIC_OAUTH_API_URL=https://sso.korhonen.cc/application/o/userinfo/", + "GF_AUTH_SIGNOUT_REDIRECT_URL=https://sso.korhonen.cc/application/o/grafana/end-session/", + "GF_AUTH_OAUTH_AUTO_LOGIN=true", + "GF_SERVER_ROOT_URL=https://grafana.korhonen.cc", + "GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_PATH=contains(groups[*], 'Administrators') && 'Admin' || 'Viewer'", +] + +[networks.stats] +external = false + +[networks.proxy] +external = true From 45c13be6b0914a79670dbc63152f7ca1cf2b205a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 8 Apr 2023 13:06:56 +0300 Subject: [PATCH 1860/2667] Add grafana --- docker/caddy/Caddyfile | 5 +++++ docker/stats/docker-compose.toml | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 docker/stats/docker-compose.toml diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 57fa6ef3..716ea767 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -125,6 +125,11 @@ korhonen.cc, *.korhonen.cc { reverse_proxy collabora:9980 } + @grafana host grafana.korhonen.cc + handle @grafana { + reverse_proxy grafana:3000 + } + # Fallback for unhandled domains handle { redir https://korhonen.cc/404.html 301 diff --git a/docker/stats/docker-compose.toml b/docker/stats/docker-compose.toml new file mode 100644 index 00000000..ff0e0846 --- /dev/null +++ b/docker/stats/docker-compose.toml @@ -0,0 +1,27 @@ +[services.grafana] +image = "grafana/grafana" +container_name = "grafana" +volumes = ["/docker/stats/grafana:/var/lib/grafana"] +networks = ["stats", "proxy"] +user = "1000:984" +env_file = [".env"] +environment = [ + "GF_AUTH_GENERIC_OAUTH_CLIENT_ID", + "GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET", + "GF_AUTH_GENERIC_OAUTH_ENABLED=true", + "GF_AUTH_GENERIC_OAUTH_NAME=authentik", + "GF_AUTH_GENERIC_OAUTH_SCOPES=openid profile email", + "GF_AUTH_GENERIC_OAUTH_AUTH_URL=https://sso.korhonen.cc/application/o/authorize/", + "GF_AUTH_GENERIC_OAUTH_TOKEN_URL=https://sso.korhonen.cc/application/o/token/", + "GF_AUTH_GENERIC_OAUTH_API_URL=https://sso.korhonen.cc/application/o/userinfo/", + "GF_AUTH_SIGNOUT_REDIRECT_URL=https://sso.korhonen.cc/application/o/grafana/end-session/", + "GF_AUTH_OAUTH_AUTO_LOGIN=true", + "GF_SERVER_ROOT_URL=https://grafana.korhonen.cc", + "GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_PATH=contains(groups[*], 'Administrators') && 'Admin' || 'Viewer'", +] + +[networks.stats] +external = false + +[networks.proxy] +external = true From b362cc511bf7753ca4e36cf5cdac146bfe7f8182 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Apr 2023 09:03:28 +0300 Subject: [PATCH 1861/2667] Editorconfig is built-in to vim now --- home/.config/nvim/lua/plugins/init.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 46b5b6f0..65e97aa7 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -81,9 +81,6 @@ local plugins = { -- Display possible keybinds { "folke/which-key.nvim", config = true }, - -- Read editorconfig settings - "editorconfig/editorconfig-vim", - -- Package manager for LSP servers, DAP adapters etc. { "williamboman/mason.nvim", config = true }, From 1702543f0f575a61320ece37884c67abedf6cac9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Apr 2023 09:03:28 +0300 Subject: [PATCH 1862/2667] Editorconfig is built-in to vim now --- home/.config/nvim/lua/plugins/init.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 46b5b6f0..65e97aa7 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -81,9 +81,6 @@ local plugins = { -- Display possible keybinds { "folke/which-key.nvim", config = true }, - -- Read editorconfig settings - "editorconfig/editorconfig-vim", - -- Package manager for LSP servers, DAP adapters etc. { "williamboman/mason.nvim", config = true }, From fc93090a36157051274ee7ff9b234a5508572754 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Apr 2023 09:05:20 +0300 Subject: [PATCH 1863/2667] Open jellyfin port --- docker/jellyfin/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index f69335b9..c2eef2ac 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -2,6 +2,7 @@ image = "jellyfin/jellyfin" container_name = "jellyfin" environment = ["TZ=Europe/Helsinki"] +ports = ["8096:8096"] networks = ["proxy", "authentik"] restart = "unless-stopped" volumes = [ From 9730ee75c244b5b59501236598e80128e29534cc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Apr 2023 09:05:20 +0300 Subject: [PATCH 1864/2667] Open jellyfin port --- docker/jellyfin/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index f69335b9..c2eef2ac 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -2,6 +2,7 @@ image = "jellyfin/jellyfin" container_name = "jellyfin" environment = ["TZ=Europe/Helsinki"] +ports = ["8096:8096"] networks = ["proxy", "authentik"] restart = "unless-stopped" volumes = [ From 431cfeacb46829b394d405a39e059d282604e122 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Apr 2023 09:05:35 +0300 Subject: [PATCH 1865/2667] Remove nginx conf --- docker/nextcloud/nginx.conf | 173 ------------------------------------ 1 file changed, 173 deletions(-) delete mode 100644 docker/nextcloud/nginx.conf diff --git a/docker/nextcloud/nginx.conf b/docker/nextcloud/nginx.conf deleted file mode 100644 index 4e5fac98..00000000 --- a/docker/nextcloud/nginx.conf +++ /dev/null @@ -1,173 +0,0 @@ -worker_processes auto; - -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - #tcp_nopush on; - - # Prevent nginx HTTP Server Detection - server_tokens off; - - keepalive_timeout 65; - - #gzip on; - - upstream php-handler { - server nextcloud:9000; - } - - server { - listen 80; - - # HSTS settings - # WARNING: Only add the preload option once you read about - # the consequences in https://hstspreload.org/. This option - # will add the domain to a hardcoded list that is shipped - # in all major browsers and getting removed from this list - # could take several months. - #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always; - - # set max upload size - client_max_body_size 512M; - fastcgi_buffers 64 4K; - - # Enable gzip but do not remove ETag headers - gzip on; - gzip_vary on; - gzip_comp_level 4; - gzip_min_length 256; - gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; - gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; - - # Pagespeed is not supported by Nextcloud, so if your server is built - # with the `ngx_pagespeed` module, uncomment this line to disable it. - #pagespeed off; - - # HTTP response headers borrowed from Nextcloud `.htaccess` - add_header Referrer-Policy "no-referrer" always; - add_header X-Content-Type-Options "nosniff" always; - add_header X-Download-Options "noopen" always; - add_header X-Frame-Options "SAMEORIGIN" always; - add_header X-Permitted-Cross-Domain-Policies "none" always; - add_header X-Robots-Tag "none" always; - add_header X-XSS-Protection "1; mode=block" always; - - # Remove X-Powered-By, which is an information leak - fastcgi_hide_header X-Powered-By; - - # Path to the root of your installation - root /var/www/html; - - # Specify how to handle directories -- specifying `/index.php$request_uri` - # here as the fallback means that Nginx always exhibits the desired behaviour - # when a client requests a path that corresponds to a directory that exists - # on the server. In particular, if that directory contains an index.php file, - # that file is correctly served; if it doesn't, then the request is passed to - # the front-end controller. This consistent behaviour means that we don't need - # to specify custom rules for certain paths (e.g. images and other assets, - # `/updater`, `/ocm-provider`, `/ocs-provider`), and thus - # `try_files $uri $uri/ /index.php$request_uri` - # always provides the desired behaviour. - index index.php index.html /index.php$request_uri; - - # Rule borrowed from `.htaccess` to handle Microsoft DAV clients - location = / { - if ( $http_user_agent ~ ^DavClnt ) { - return 302 /remote.php/webdav/$is_args$args; - } - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # Make a regex exception for `/.well-known` so that clients can still - # access it despite the existence of the regex rule - # `location ~ /(\.|autotest|...)` which would otherwise handle requests - # for `/.well-known`. - location ^~ /.well-known { - # The rules in this block are an adaptation of the rules - # in `.htaccess` that concern `/.well-known`. - - location = /.well-known/carddav { return 301 /remote.php/dav/; } - location = /.well-known/caldav { return 301 /remote.php/dav/; } - - location /.well-known/acme-challenge { try_files $uri $uri/ =404; } - location /.well-known/pki-validation { try_files $uri $uri/ =404; } - - # Let Nextcloud's API for `/.well-known` URIs handle all other - # requests by passing them to the front-end controller. - return 301 /index.php$request_uri; - } - - # Rules borrowed from `.htaccess` to hide certain paths from clients - location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/) { return 404; } - location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) { return 404; } - - # Ensure this block, which passes PHP files to the PHP process, is above the blocks - # which handle static assets (as seen below). If this block is not declared first, - # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php` - # to the URI, resulting in a HTTP 500 error response. - location ~ \.php(?:$|/) { - # Required for legacy support - rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri; - - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - set $path_info $fastcgi_path_info; - - try_files $fastcgi_script_name =404; - - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $path_info; - #fastcgi_param HTTPS on; - - fastcgi_param modHeadersAvailable true; # Avoid sending the security headers twice - fastcgi_param front_controller_active true; # Enable pretty urls - fastcgi_pass php-handler; - - fastcgi_intercept_errors on; - fastcgi_request_buffering off; - } - - location ~ \.(?:css|js|svg|gif)$ { - try_files $uri /index.php$request_uri; - expires 6M; # Cache-Control policy borrowed from `.htaccess` - access_log off; # Optional: Don't log access to assets - } - - location ~ \.woff2?$ { - try_files $uri /index.php$request_uri; - expires 7d; # Cache-Control policy borrowed from `.htaccess` - access_log off; # Optional: Don't log access to assets - } - - # Rule borrowed from `.htaccess` - location /remote { - return 301 /remote.php$request_uri; - } - - location / { - try_files $uri $uri/ /index.php$request_uri; - } - } -} From a9c8c5c775e86a689843a7dd670df78bb24d8d20 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Apr 2023 09:05:35 +0300 Subject: [PATCH 1866/2667] Remove nginx conf --- docker/nextcloud/nginx.conf | 173 ------------------------------------ 1 file changed, 173 deletions(-) delete mode 100644 docker/nextcloud/nginx.conf diff --git a/docker/nextcloud/nginx.conf b/docker/nextcloud/nginx.conf deleted file mode 100644 index 4e5fac98..00000000 --- a/docker/nextcloud/nginx.conf +++ /dev/null @@ -1,173 +0,0 @@ -worker_processes auto; - -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - #tcp_nopush on; - - # Prevent nginx HTTP Server Detection - server_tokens off; - - keepalive_timeout 65; - - #gzip on; - - upstream php-handler { - server nextcloud:9000; - } - - server { - listen 80; - - # HSTS settings - # WARNING: Only add the preload option once you read about - # the consequences in https://hstspreload.org/. This option - # will add the domain to a hardcoded list that is shipped - # in all major browsers and getting removed from this list - # could take several months. - #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always; - - # set max upload size - client_max_body_size 512M; - fastcgi_buffers 64 4K; - - # Enable gzip but do not remove ETag headers - gzip on; - gzip_vary on; - gzip_comp_level 4; - gzip_min_length 256; - gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; - gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; - - # Pagespeed is not supported by Nextcloud, so if your server is built - # with the `ngx_pagespeed` module, uncomment this line to disable it. - #pagespeed off; - - # HTTP response headers borrowed from Nextcloud `.htaccess` - add_header Referrer-Policy "no-referrer" always; - add_header X-Content-Type-Options "nosniff" always; - add_header X-Download-Options "noopen" always; - add_header X-Frame-Options "SAMEORIGIN" always; - add_header X-Permitted-Cross-Domain-Policies "none" always; - add_header X-Robots-Tag "none" always; - add_header X-XSS-Protection "1; mode=block" always; - - # Remove X-Powered-By, which is an information leak - fastcgi_hide_header X-Powered-By; - - # Path to the root of your installation - root /var/www/html; - - # Specify how to handle directories -- specifying `/index.php$request_uri` - # here as the fallback means that Nginx always exhibits the desired behaviour - # when a client requests a path that corresponds to a directory that exists - # on the server. In particular, if that directory contains an index.php file, - # that file is correctly served; if it doesn't, then the request is passed to - # the front-end controller. This consistent behaviour means that we don't need - # to specify custom rules for certain paths (e.g. images and other assets, - # `/updater`, `/ocm-provider`, `/ocs-provider`), and thus - # `try_files $uri $uri/ /index.php$request_uri` - # always provides the desired behaviour. - index index.php index.html /index.php$request_uri; - - # Rule borrowed from `.htaccess` to handle Microsoft DAV clients - location = / { - if ( $http_user_agent ~ ^DavClnt ) { - return 302 /remote.php/webdav/$is_args$args; - } - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # Make a regex exception for `/.well-known` so that clients can still - # access it despite the existence of the regex rule - # `location ~ /(\.|autotest|...)` which would otherwise handle requests - # for `/.well-known`. - location ^~ /.well-known { - # The rules in this block are an adaptation of the rules - # in `.htaccess` that concern `/.well-known`. - - location = /.well-known/carddav { return 301 /remote.php/dav/; } - location = /.well-known/caldav { return 301 /remote.php/dav/; } - - location /.well-known/acme-challenge { try_files $uri $uri/ =404; } - location /.well-known/pki-validation { try_files $uri $uri/ =404; } - - # Let Nextcloud's API for `/.well-known` URIs handle all other - # requests by passing them to the front-end controller. - return 301 /index.php$request_uri; - } - - # Rules borrowed from `.htaccess` to hide certain paths from clients - location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/) { return 404; } - location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) { return 404; } - - # Ensure this block, which passes PHP files to the PHP process, is above the blocks - # which handle static assets (as seen below). If this block is not declared first, - # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php` - # to the URI, resulting in a HTTP 500 error response. - location ~ \.php(?:$|/) { - # Required for legacy support - rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri; - - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - set $path_info $fastcgi_path_info; - - try_files $fastcgi_script_name =404; - - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $path_info; - #fastcgi_param HTTPS on; - - fastcgi_param modHeadersAvailable true; # Avoid sending the security headers twice - fastcgi_param front_controller_active true; # Enable pretty urls - fastcgi_pass php-handler; - - fastcgi_intercept_errors on; - fastcgi_request_buffering off; - } - - location ~ \.(?:css|js|svg|gif)$ { - try_files $uri /index.php$request_uri; - expires 6M; # Cache-Control policy borrowed from `.htaccess` - access_log off; # Optional: Don't log access to assets - } - - location ~ \.woff2?$ { - try_files $uri /index.php$request_uri; - expires 7d; # Cache-Control policy borrowed from `.htaccess` - access_log off; # Optional: Don't log access to assets - } - - # Rule borrowed from `.htaccess` - location /remote { - return 301 /remote.php$request_uri; - } - - location / { - try_files $uri $uri/ /index.php$request_uri; - } - } -} From ac671aabf084834b32e17ff0de8bbe6fc6ca09ac Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Apr 2023 00:02:58 +0300 Subject: [PATCH 1867/2667] Neovim: add dashboard --- home/.config/nvim/lua/plugins/dashboard.lua | 22 +++++++++++++++++++++ home/.config/nvim/lua/plugins/init.lua | 8 ++++++++ 2 files changed, 30 insertions(+) create mode 100644 home/.config/nvim/lua/plugins/dashboard.lua diff --git a/home/.config/nvim/lua/plugins/dashboard.lua b/home/.config/nvim/lua/plugins/dashboard.lua new file mode 100644 index 00000000..6d3881ba --- /dev/null +++ b/home/.config/nvim/lua/plugins/dashboard.lua @@ -0,0 +1,22 @@ +return function() + require("dashboard").setup({ + theme = "hyper", + config = { + week_header = { + enable = true, + }, + shortcut = { + { desc = " Update", group = "@property", action = "Lazy update", key = "u" }, + { + icon = " ", + icon_hl = "@variable", + desc = "Files", + group = "Label", + action = "Telescope find_files", + key = "f", + }, + { desc = "Quit", action = "q", key = "q" }, + }, + }, + }) +end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 65e97aa7..ffde7111 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -203,6 +203,14 @@ local plugins = { -- Caddyfile syntax support "isobit/vim-caddyfile", + + -- Startup dashboard + { + "glepnir/dashboard-nvim", + event = "VimEnter", + config = require("plugins.dashboard"), + dependencies = { { "kyazdani42/nvim-web-devicons" } }, + }, } local lazy_opts = {} From 70bf63b61ad2f35bae007097a15736e8262aa8c7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Apr 2023 00:02:58 +0300 Subject: [PATCH 1868/2667] Neovim: add dashboard --- home/.config/nvim/lua/plugins/dashboard.lua | 22 +++++++++++++++++++++ home/.config/nvim/lua/plugins/init.lua | 8 ++++++++ 2 files changed, 30 insertions(+) create mode 100644 home/.config/nvim/lua/plugins/dashboard.lua diff --git a/home/.config/nvim/lua/plugins/dashboard.lua b/home/.config/nvim/lua/plugins/dashboard.lua new file mode 100644 index 00000000..6d3881ba --- /dev/null +++ b/home/.config/nvim/lua/plugins/dashboard.lua @@ -0,0 +1,22 @@ +return function() + require("dashboard").setup({ + theme = "hyper", + config = { + week_header = { + enable = true, + }, + shortcut = { + { desc = " Update", group = "@property", action = "Lazy update", key = "u" }, + { + icon = " ", + icon_hl = "@variable", + desc = "Files", + group = "Label", + action = "Telescope find_files", + key = "f", + }, + { desc = "Quit", action = "q", key = "q" }, + }, + }, + }) +end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 65e97aa7..ffde7111 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -203,6 +203,14 @@ local plugins = { -- Caddyfile syntax support "isobit/vim-caddyfile", + + -- Startup dashboard + { + "glepnir/dashboard-nvim", + event = "VimEnter", + config = require("plugins.dashboard"), + dependencies = { { "kyazdani42/nvim-web-devicons" } }, + }, } local lazy_opts = {} From b2cd7e23dce9f9fd46de3189cbe1f6de9356026d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Apr 2023 00:14:27 +0300 Subject: [PATCH 1869/2667] Update nvim dashboard icons --- home/.config/nvim/lua/plugins/dashboard.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/dashboard.lua b/home/.config/nvim/lua/plugins/dashboard.lua index 6d3881ba..736abe90 100644 --- a/home/.config/nvim/lua/plugins/dashboard.lua +++ b/home/.config/nvim/lua/plugins/dashboard.lua @@ -6,16 +6,16 @@ return function() enable = true, }, shortcut = { - { desc = " Update", group = "@property", action = "Lazy update", key = "u" }, + { icon = "🧲 ", desc = "Update", group = "@property", action = "Lazy update", key = "u" }, { - icon = " ", + icon = "🖹 ", icon_hl = "@variable", desc = "Files", group = "Label", action = "Telescope find_files", key = "f", }, - { desc = "Quit", action = "q", key = "q" }, + { icon = "❌ ", desc = "Quit", action = "q", key = "q" }, }, }, }) From 348ab63f9992ac83cb93bd454db9b3d7ce52b7f4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Apr 2023 00:14:27 +0300 Subject: [PATCH 1870/2667] Update nvim dashboard icons --- home/.config/nvim/lua/plugins/dashboard.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/dashboard.lua b/home/.config/nvim/lua/plugins/dashboard.lua index 6d3881ba..736abe90 100644 --- a/home/.config/nvim/lua/plugins/dashboard.lua +++ b/home/.config/nvim/lua/plugins/dashboard.lua @@ -6,16 +6,16 @@ return function() enable = true, }, shortcut = { - { desc = " Update", group = "@property", action = "Lazy update", key = "u" }, + { icon = "🧲 ", desc = "Update", group = "@property", action = "Lazy update", key = "u" }, { - icon = " ", + icon = "🖹 ", icon_hl = "@variable", desc = "Files", group = "Label", action = "Telescope find_files", key = "f", }, - { desc = "Quit", action = "q", key = "q" }, + { icon = "❌ ", desc = "Quit", action = "q", key = "q" }, }, }, }) From fdc9eb668d1e6911ef6f081e73c05984633a3508 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Apr 2023 12:50:05 +0300 Subject: [PATCH 1871/2667] Remove TZ env variable from nextcloud Seems to cause the server time to be set as UTC --- docker/nextcloud/docker-compose.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 1bf978cc..7dd2d0a2 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -10,7 +10,6 @@ volumes = [ "/etc/localtime:/etc/localtime:ro", ] environment = [ - "TZ=Europe/Helsinki", "REDIS_HOST=redis", "REDIS_HOST_PASSWORD=123", "TRUSTED_PROXIES=traefik", From e147459f1e71fd7cc8f64620411389b07b506ac8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Apr 2023 12:50:05 +0300 Subject: [PATCH 1872/2667] Remove TZ env variable from nextcloud Seems to cause the server time to be set as UTC --- docker/nextcloud/docker-compose.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 1bf978cc..7dd2d0a2 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -10,7 +10,6 @@ volumes = [ "/etc/localtime:/etc/localtime:ro", ] environment = [ - "TZ=Europe/Helsinki", "REDIS_HOST=redis", "REDIS_HOST_PASSWORD=123", "TRUSTED_PROXIES=traefik", From 05120e4507b1cab4142888d61f8ce13ec13d84d6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Apr 2023 11:47:11 +0300 Subject: [PATCH 1873/2667] SSH: disable ControlMaster --- home/.ssh/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.ssh/config b/home/.ssh/config index 3ddaaa78..5abc93b9 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -3,9 +3,9 @@ Include ~/.ssh/rossum_hosts host * IdentitiesOnly yes IdentityFile ~/.ssh/id_ed25519_yubikey.pub - ControlMaster auto - ControlPersist 10m - ControlPath ~/.ssh/%r@%h:%p.socket + #ControlMaster auto + #ControlPersist 10m + #ControlPath ~/.ssh/%r@%h:%p.socket host moria HostName korhonen.cc From c15ec5ec3e1c9544f840a4647f1427bd8018c068 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Apr 2023 11:47:11 +0300 Subject: [PATCH 1874/2667] SSH: disable ControlMaster --- home/.ssh/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.ssh/config b/home/.ssh/config index 3ddaaa78..5abc93b9 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -3,9 +3,9 @@ Include ~/.ssh/rossum_hosts host * IdentitiesOnly yes IdentityFile ~/.ssh/id_ed25519_yubikey.pub - ControlMaster auto - ControlPersist 10m - ControlPath ~/.ssh/%r@%h:%p.socket + #ControlMaster auto + #ControlPersist 10m + #ControlPath ~/.ssh/%r@%h:%p.socket host moria HostName korhonen.cc From dab116c936644c5e3ce835c75d6c81a81885ef8f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 21 Apr 2023 18:08:48 +0300 Subject: [PATCH 1875/2667] Remove tty6 autologin from Moria Kodi will be used on a separate box from now on --- config-root.toml | 5 ----- home/.zprofile | 6 ------ 2 files changed, 11 deletions(-) diff --git a/config-root.toml b/config-root.toml index 85934aad..5d67c185 100644 --- a/config-root.toml +++ b/config-root.toml @@ -95,10 +95,6 @@ src = "etc/ssh/sshd_config" dst = "/etc/welcomemessage.conf" src = "etc/welcomemessage.conf" -[dotfiles."f_getty6conf"] -src = "etc/systemd/system/getty@tty6.service.d/override.conf" -dst = "/etc/systemd/system/getty@tty6.service.d/override.conf" - [dotfiles."f_99-conbee-usb-serial.rules"] src = "etc/udev/rules.d/99-conbee-usb-serial.rules" dst = "/etc/udev/rules.d/99-conbee-usb-serial.rules" @@ -224,7 +220,6 @@ dotfiles = [ "f_mkinitcpio_linux-cachyos.preset", "f_plymouthd.conf", "f_sshd_config", - "f_getty6conf", ] [profiles.Gondor] diff --git a/home/.zprofile b/home/.zprofile index d5b3d058..e69de29b 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,6 +0,0 @@ -if [[ -z $DISPLAY && $XDG_VTNR -eq 6 ]]; then - systemctl --user mask pipewire.service pipewire-pulse.service - systemctl --user stop pipewire.service pipewire-pulse.service - kodi --standalone - systemctl --user unmask pipewire.service pipewire-pulse.service -fi From ed15c8fcb7462c70ee2c5a07d73cc94e104c2477 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 21 Apr 2023 18:08:48 +0300 Subject: [PATCH 1876/2667] Remove tty6 autologin from Moria Kodi will be used on a separate box from now on --- config-root.toml | 5 ----- home/.zprofile | 6 ------ 2 files changed, 11 deletions(-) diff --git a/config-root.toml b/config-root.toml index 85934aad..5d67c185 100644 --- a/config-root.toml +++ b/config-root.toml @@ -95,10 +95,6 @@ src = "etc/ssh/sshd_config" dst = "/etc/welcomemessage.conf" src = "etc/welcomemessage.conf" -[dotfiles."f_getty6conf"] -src = "etc/systemd/system/getty@tty6.service.d/override.conf" -dst = "/etc/systemd/system/getty@tty6.service.d/override.conf" - [dotfiles."f_99-conbee-usb-serial.rules"] src = "etc/udev/rules.d/99-conbee-usb-serial.rules" dst = "/etc/udev/rules.d/99-conbee-usb-serial.rules" @@ -224,7 +220,6 @@ dotfiles = [ "f_mkinitcpio_linux-cachyos.preset", "f_plymouthd.conf", "f_sshd_config", - "f_getty6conf", ] [profiles.Gondor] diff --git a/home/.zprofile b/home/.zprofile index d5b3d058..e69de29b 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,6 +0,0 @@ -if [[ -z $DISPLAY && $XDG_VTNR -eq 6 ]]; then - systemctl --user mask pipewire.service pipewire-pulse.service - systemctl --user stop pipewire.service pipewire-pulse.service - kodi --standalone - systemctl --user unmask pipewire.service pipewire-pulse.service -fi From fa7b53d41fb1a26509d29df9849d817d27126f80 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Apr 2023 17:42:03 +0300 Subject: [PATCH 1877/2667] Remove cachyos repos --- config-root.toml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/config-root.toml b/config-root.toml index 5d67c185..5fba743f 100644 --- a/config-root.toml +++ b/config-root.toml @@ -143,13 +143,9 @@ dst = "/etc/pacserve/pacserve.service.conf" src = "etc/mkinitcpio.d/linux.preset" dst = "/etc/mkinitcpio.d/linux.preset" -[dotfiles."f_mkinitcpio_linux-cachyos.preset"] -src = "etc/mkinitcpio.d/linux-cachyos.preset" -dst = "/etc/mkinitcpio.d/linux-cachyos.preset" - -[dotfiles."f_mkinitcpio_linux-zen.preset"] -src = "etc/mkinitcpio.d/linux-zen.preset" -dst = "/etc/mkinitcpio.d/linux-zen.preset" +[dotfiles."f_mkinitcpio_linux-lts.preset"] +src = "etc/mkinitcpio.d/linux-lts.preset" +dst = "/etc/mkinitcpio.d/linux-lts.preset" [dotfiles.f_cmdline] src = "etc/kernel/cmdline" @@ -199,7 +195,7 @@ dotfiles = [ "f_logind.conf", "f_mkinitcpio.conf", "f_mkinitcpio_linux.preset", - "f_mkinitcpio_linux-cachyos.preset", + "f_mkinitcpio_linux-lts.preset", "f_plymouthd.conf", "f_sshd_config", "f_system.conf", @@ -217,7 +213,7 @@ dotfiles = [ "f_doas.conf", "f_mkinitcpio.conf", "f_mkinitcpio_linux.preset", - "f_mkinitcpio_linux-cachyos.preset", + "f_mkinitcpio_linux-lts.preset", "f_plymouthd.conf", "f_sshd_config", ] From 0e1ae7608a1df07fe359c9fa162809fd03348ebe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Apr 2023 17:42:03 +0300 Subject: [PATCH 1878/2667] Remove cachyos repos --- config-root.toml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/config-root.toml b/config-root.toml index 5d67c185..5fba743f 100644 --- a/config-root.toml +++ b/config-root.toml @@ -143,13 +143,9 @@ dst = "/etc/pacserve/pacserve.service.conf" src = "etc/mkinitcpio.d/linux.preset" dst = "/etc/mkinitcpio.d/linux.preset" -[dotfiles."f_mkinitcpio_linux-cachyos.preset"] -src = "etc/mkinitcpio.d/linux-cachyos.preset" -dst = "/etc/mkinitcpio.d/linux-cachyos.preset" - -[dotfiles."f_mkinitcpio_linux-zen.preset"] -src = "etc/mkinitcpio.d/linux-zen.preset" -dst = "/etc/mkinitcpio.d/linux-zen.preset" +[dotfiles."f_mkinitcpio_linux-lts.preset"] +src = "etc/mkinitcpio.d/linux-lts.preset" +dst = "/etc/mkinitcpio.d/linux-lts.preset" [dotfiles.f_cmdline] src = "etc/kernel/cmdline" @@ -199,7 +195,7 @@ dotfiles = [ "f_logind.conf", "f_mkinitcpio.conf", "f_mkinitcpio_linux.preset", - "f_mkinitcpio_linux-cachyos.preset", + "f_mkinitcpio_linux-lts.preset", "f_plymouthd.conf", "f_sshd_config", "f_system.conf", @@ -217,7 +213,7 @@ dotfiles = [ "f_doas.conf", "f_mkinitcpio.conf", "f_mkinitcpio_linux.preset", - "f_mkinitcpio_linux-cachyos.preset", + "f_mkinitcpio_linux-lts.preset", "f_plymouthd.conf", "f_sshd_config", ] From 972043dcae85317bb8bf7046d8df5c361a2da2fb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Apr 2023 17:46:32 +0300 Subject: [PATCH 1879/2667] Remove linux-cachyos and zen presets, add lts --- root/etc/mkinitcpio.d/linux-cachyos.preset | 8 -------- root/etc/mkinitcpio.d/linux-lts.preset | 8 ++++++++ root/etc/mkinitcpio.d/linux-zen.preset | 8 -------- root/etc/pacman.conf | 12 ------------ 4 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 root/etc/mkinitcpio.d/linux-cachyos.preset create mode 100644 root/etc/mkinitcpio.d/linux-lts.preset delete mode 100644 root/etc/mkinitcpio.d/linux-zen.preset diff --git a/root/etc/mkinitcpio.d/linux-cachyos.preset b/root/etc/mkinitcpio.d/linux-cachyos.preset deleted file mode 100644 index 392ff60a..00000000 --- a/root/etc/mkinitcpio.d/linux-cachyos.preset +++ /dev/null @@ -1,8 +0,0 @@ -PRESETS=('default') - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuz-linux-cachyos" -ALL_microcode=(/boot/*-ucode.img) - -default_image="/boot/initramfs-linux-cachyos.img" -default_uki="/boot/EFI/Linux/archlinux-linux-cachyos.efi" diff --git a/root/etc/mkinitcpio.d/linux-lts.preset b/root/etc/mkinitcpio.d/linux-lts.preset new file mode 100644 index 00000000..c769f93c --- /dev/null +++ b/root/etc/mkinitcpio.d/linux-lts.preset @@ -0,0 +1,8 @@ +PRESETS=('default') + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux-lts" +ALL_microcode=(/boot/*-ucode.img) + +default_image="/boot/initramfs-linux-lts.img" +default_uki="/boot/EFI/Linux/archlinux-linux-lts.efi" diff --git a/root/etc/mkinitcpio.d/linux-zen.preset b/root/etc/mkinitcpio.d/linux-zen.preset deleted file mode 100644 index f46cff31..00000000 --- a/root/etc/mkinitcpio.d/linux-zen.preset +++ /dev/null @@ -1,8 +0,0 @@ -PRESETS=('default') - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuz-linux-zen" -ALL_microcode=(/boot/*-ucode.img) - -default_image="/boot/initramfs-linux-zen.img" -default_uki="/boot/EFI/Linux/archlinux-linux-zen.efi" diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index aff3bcd5..93809dca 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -13,18 +13,6 @@ CleanMethod=KeepCurrent CacheDir=/var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} -[cachyos-v3] -Include = /etc/pacman.d/pacserve -Include = /etc/pacman.d/cachyos-v3-mirrorlist - -[cachyos-community-v3] -Include = /etc/pacman.d/pacserve -Include = /etc/pacman.d/cachyos-v3-mirrorlist - -[cachyos] -Include = /etc/pacman.d/pacserve -Include = /etc/pacman.d/cachyos-mirrorlist - [core] Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist From b151067a21fcc32c4912b39b1dc2104bf0a63108 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Apr 2023 17:46:32 +0300 Subject: [PATCH 1880/2667] Remove linux-cachyos and zen presets, add lts --- root/etc/mkinitcpio.d/linux-cachyos.preset | 8 -------- root/etc/mkinitcpio.d/linux-lts.preset | 8 ++++++++ root/etc/mkinitcpio.d/linux-zen.preset | 8 -------- root/etc/pacman.conf | 12 ------------ 4 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 root/etc/mkinitcpio.d/linux-cachyos.preset create mode 100644 root/etc/mkinitcpio.d/linux-lts.preset delete mode 100644 root/etc/mkinitcpio.d/linux-zen.preset diff --git a/root/etc/mkinitcpio.d/linux-cachyos.preset b/root/etc/mkinitcpio.d/linux-cachyos.preset deleted file mode 100644 index 392ff60a..00000000 --- a/root/etc/mkinitcpio.d/linux-cachyos.preset +++ /dev/null @@ -1,8 +0,0 @@ -PRESETS=('default') - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuz-linux-cachyos" -ALL_microcode=(/boot/*-ucode.img) - -default_image="/boot/initramfs-linux-cachyos.img" -default_uki="/boot/EFI/Linux/archlinux-linux-cachyos.efi" diff --git a/root/etc/mkinitcpio.d/linux-lts.preset b/root/etc/mkinitcpio.d/linux-lts.preset new file mode 100644 index 00000000..c769f93c --- /dev/null +++ b/root/etc/mkinitcpio.d/linux-lts.preset @@ -0,0 +1,8 @@ +PRESETS=('default') + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux-lts" +ALL_microcode=(/boot/*-ucode.img) + +default_image="/boot/initramfs-linux-lts.img" +default_uki="/boot/EFI/Linux/archlinux-linux-lts.efi" diff --git a/root/etc/mkinitcpio.d/linux-zen.preset b/root/etc/mkinitcpio.d/linux-zen.preset deleted file mode 100644 index f46cff31..00000000 --- a/root/etc/mkinitcpio.d/linux-zen.preset +++ /dev/null @@ -1,8 +0,0 @@ -PRESETS=('default') - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuz-linux-zen" -ALL_microcode=(/boot/*-ucode.img) - -default_image="/boot/initramfs-linux-zen.img" -default_uki="/boot/EFI/Linux/archlinux-linux-zen.efi" diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index aff3bcd5..93809dca 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -13,18 +13,6 @@ CleanMethod=KeepCurrent CacheDir=/var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} -[cachyos-v3] -Include = /etc/pacman.d/pacserve -Include = /etc/pacman.d/cachyos-v3-mirrorlist - -[cachyos-community-v3] -Include = /etc/pacman.d/pacserve -Include = /etc/pacman.d/cachyos-v3-mirrorlist - -[cachyos] -Include = /etc/pacman.d/pacserve -Include = /etc/pacman.d/cachyos-mirrorlist - [core] Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist From 8804b5a2bf13660741b775a5bc3fa6c307a18fee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Apr 2023 21:41:28 +0300 Subject: [PATCH 1881/2667] Neovim: switch lsp to use mason automatic setup --- home/.config/nvim/ftplugin/java.lua | 43 +++++---- home/.config/nvim/lua/plugins/init.lua | 20 ++--- home/.config/nvim/lua/plugins/lspconfig.lua | 97 --------------------- home/.config/nvim/lua/plugins/mason.lua | 91 +++++++++++++++++++ 4 files changed, 123 insertions(+), 128 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/lspconfig.lua create mode 100644 home/.config/nvim/lua/plugins/mason.lua diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index d1368e02..4a899986 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -1,21 +1,28 @@ -local nvim_local_dir = vim.fn.expand('~/.local/share/nvim') -local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ':p:h:t') -local workspace_dir = nvim_local_dir .. '/jdtls-workspaces/' .. project_name +local nvim_local_dir = vim.fn.expand("~/.local/share/nvim") +local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") +local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name -require('jdtls').start_or_attach({ - cmd = { - '/usr/lib/jvm/java-17-openjdk-amd64/bin/java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', - '-Dosgi.bundles.defaultStartLevel=4', - '-Declipse.product=org.eclipse.jdt.ls.core.product', - '-Dlog.protocol=true', '-Dlog.level=ALL', '-Xms1g', - '--add-modules=ALL-SYSTEM', '--add-opens', - 'java.base/java.util=ALL-UNNAMED', '--add-opens', - 'java.base/java.lang=ALL-UNNAMED', '-jar', nvim_local_dir .. - '/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar', - '-configuration', - nvim_local_dir .. '/mason/packages/jdtls/config_linux', '-data', - workspace_dir - } +require("jdtls").start_or_attach({ + cmd = { + "/usr/lib/jvm/java-17-openjdk-amd64/bin/java", + "-Declipse.application=org.eclipse.jdt.ls.core.id1", + "-Dosgi.bundles.defaultStartLevel=4", + "-Declipse.product=org.eclipse.jdt.ls.core.product", + "-Dlog.protocol=true", + "-Dlog.level=ALL", + "-Xms1g", + "--add-modules=ALL-SYSTEM", + "--add-opens", + "java.base/java.util=ALL-UNNAMED", + "--add-opens", + "java.base/java.lang=ALL-UNNAMED", + "-jar", + nvim_local_dir .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar", + "-configuration", + nvim_local_dir .. "/mason/packages/jdtls/config_linux", + "-data", + workspace_dir, + }, }) -require('plugins.lspconfig').map_keys() +require("plugins.mason").map_keys() diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index ffde7111..1c923fd2 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -82,22 +82,16 @@ local plugins = { { "folke/which-key.nvim", config = true }, -- Package manager for LSP servers, DAP adapters etc. - { "williamboman/mason.nvim", config = true }, - - -- Install LSP server executables with Mason { - "williamboman/mason-lspconfig.nvim", - config = true, + "williamboman/mason.nvim", + config = require("plugins.mason").setup, + dependencies = { + "neovim/nvim-lspconfig", + "williamboman/mason-lspconfig.nvim", + "WhoIsSethDaniel/mason-tool-installer.nvim", + }, }, - { - "WhoIsSethDaniel/mason-tool-installer.nvim", - config = true, - }, - - -- Configs for built-in LSP - { "neovim/nvim-lspconfig", config = require("plugins.lspconfig").setup }, - -- Additional LSP features for Java "mfussenegger/nvim-jdtls", diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua deleted file mode 100644 index 6b324a46..00000000 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ /dev/null @@ -1,97 +0,0 @@ --- Pairs of server name and settings. --- This is iterated through and every --- server is setup with lspconfig -local servers = { - bashls = {}, - html = {}, - jsonls = {}, - lemminx = {}, - marksman = {}, - yamlls = {}, - taplo = {}, - tsserver = {}, - eslint = {}, - rust_analyzer = {}, - lua_ls = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = "LuaJIT", - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = { "vim" }, - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file("", true), - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = { enable = false }, - }, - }, -} - -local m = {} - -function m.map_keys() - -- Register keybindings via which-key - -- to get documentation in which-key - local wk = require("which-key") - wk.register({ - g = { - name = "Go to", - d = { vim.lsp.buf.definition, "Definition" }, - D = { vim.lsp.buf.declaration, "Declaration" }, - i = { vim.lsp.buf.implementation, "Implementation" }, - r = { vim.lsp.buf.references, "References" }, - }, - [""] = { - name = "Leader", - w = { - name = "Workspace", - a = { vim.lsp.buf.add_workspace_folder, "Add folder" }, - r = { vim.lsp.buf.remove_workspace_folder, "Remove folder" }, - l = { - function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, - "List folders", - }, - }, - D = { vim.lsp.buf.type_definition, "Type definition" }, - rn = { vim.lsp.buf.rename, "Rename symbol" }, - ca = { vim.lsp.buf.code_action, "Code action" }, - e = { vim.diagnostic.open_float, "Open diagnostics" }, - f = { vim.lsp.buf.format, "Format" }, - }, - K = { vim.lsp.buf.hover, "Hover" }, - ["["] = { d = { vim.diagnostic.goto_prev, "Previous diagnostic" } }, - ["]"] = { d = { vim.diagnostic.goto_next, "Next diagnostic" } }, - }) -end - -function m.setup() - local function on_attach() - -- Setup lsp signature plugin - require("lsp_signature").setup({}) - - -- Setup keybinds - m.map_keys() - end - - local capabilities = require("cmp_nvim_lsp").default_capabilities() - - -- Setup every defined server - for server, settings in pairs(servers) do - require("lspconfig")[server].setup({ - on_attach = on_attach, - settings = settings, - -- Inform lsp server about client - -- capabilities - capabilities = capabilities, - }) - end -end - -return m diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua new file mode 100644 index 00000000..064b827c --- /dev/null +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -0,0 +1,91 @@ +local m = {} + +function m.setup() + local function on_attach() + -- Setup lsp signature plugin + require("lsp_signature").setup({}) + + -- Setup keybinds + m.map_keys() + end + + -- Inform lsp about completion capabilities from cmp + local capabilities = require("cmp_nvim_lsp").default_capabilities() + + require("mason").setup() + local mason_lsp = require("mason-lspconfig") + mason_lsp.setup() + + mason_lsp.setup_handlers({ + -- Default handler + function(server_name) + require("lspconfig")[server_name].setup({ + on_attach = on_attach, + capabilities = capabilities, + }) + end, + + -- Override lua_ls settings + ["lua_ls"] = function() + require("lspconfig").lua_ls.setup({ + on_attach = on_attach, + capabilities = capabilities, + settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = "LuaJIT", + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = { "vim" }, + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file("", true), + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = { enable = false }, + }, + }, + }) + end, + }) +end + +function m.map_keys() + local wk = require("which-key") + wk.register({ + g = { + name = "Go to", + d = { vim.lsp.buf.definition, "Definition" }, + D = { vim.lsp.buf.declaration, "Declaration" }, + i = { vim.lsp.buf.implementation, "Implementation" }, + r = { vim.lsp.buf.references, "References" }, + }, + [""] = { + name = "Leader", + w = { + name = "Workspace", + a = { vim.lsp.buf.add_workspace_folder, "Add folder" }, + r = { vim.lsp.buf.remove_workspace_folder, "Remove folder" }, + l = { + function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, + "List folders", + }, + }, + D = { vim.lsp.buf.type_definition, "Type definition" }, + rn = { vim.lsp.buf.rename, "Rename symbol" }, + ca = { vim.lsp.buf.code_action, "Code action" }, + e = { vim.diagnostic.open_float, "Open diagnostics" }, + f = { vim.lsp.buf.format, "Format" }, + }, + K = { vim.lsp.buf.hover, "Hover" }, + ["["] = { d = { vim.diagnostic.goto_prev, "Previous diagnostic" } }, + ["]"] = { d = { vim.diagnostic.goto_next, "Next diagnostic" } }, + }) +end + +return m From d19e5a8b6a79c77076b7c48027e4400c198a9f48 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Apr 2023 21:41:28 +0300 Subject: [PATCH 1882/2667] Neovim: switch lsp to use mason automatic setup --- home/.config/nvim/ftplugin/java.lua | 43 +++++---- home/.config/nvim/lua/plugins/init.lua | 20 ++--- home/.config/nvim/lua/plugins/lspconfig.lua | 97 --------------------- home/.config/nvim/lua/plugins/mason.lua | 91 +++++++++++++++++++ 4 files changed, 123 insertions(+), 128 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/lspconfig.lua create mode 100644 home/.config/nvim/lua/plugins/mason.lua diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index d1368e02..4a899986 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -1,21 +1,28 @@ -local nvim_local_dir = vim.fn.expand('~/.local/share/nvim') -local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ':p:h:t') -local workspace_dir = nvim_local_dir .. '/jdtls-workspaces/' .. project_name +local nvim_local_dir = vim.fn.expand("~/.local/share/nvim") +local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") +local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name -require('jdtls').start_or_attach({ - cmd = { - '/usr/lib/jvm/java-17-openjdk-amd64/bin/java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', - '-Dosgi.bundles.defaultStartLevel=4', - '-Declipse.product=org.eclipse.jdt.ls.core.product', - '-Dlog.protocol=true', '-Dlog.level=ALL', '-Xms1g', - '--add-modules=ALL-SYSTEM', '--add-opens', - 'java.base/java.util=ALL-UNNAMED', '--add-opens', - 'java.base/java.lang=ALL-UNNAMED', '-jar', nvim_local_dir .. - '/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar', - '-configuration', - nvim_local_dir .. '/mason/packages/jdtls/config_linux', '-data', - workspace_dir - } +require("jdtls").start_or_attach({ + cmd = { + "/usr/lib/jvm/java-17-openjdk-amd64/bin/java", + "-Declipse.application=org.eclipse.jdt.ls.core.id1", + "-Dosgi.bundles.defaultStartLevel=4", + "-Declipse.product=org.eclipse.jdt.ls.core.product", + "-Dlog.protocol=true", + "-Dlog.level=ALL", + "-Xms1g", + "--add-modules=ALL-SYSTEM", + "--add-opens", + "java.base/java.util=ALL-UNNAMED", + "--add-opens", + "java.base/java.lang=ALL-UNNAMED", + "-jar", + nvim_local_dir .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar", + "-configuration", + nvim_local_dir .. "/mason/packages/jdtls/config_linux", + "-data", + workspace_dir, + }, }) -require('plugins.lspconfig').map_keys() +require("plugins.mason").map_keys() diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index ffde7111..1c923fd2 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -82,22 +82,16 @@ local plugins = { { "folke/which-key.nvim", config = true }, -- Package manager for LSP servers, DAP adapters etc. - { "williamboman/mason.nvim", config = true }, - - -- Install LSP server executables with Mason { - "williamboman/mason-lspconfig.nvim", - config = true, + "williamboman/mason.nvim", + config = require("plugins.mason").setup, + dependencies = { + "neovim/nvim-lspconfig", + "williamboman/mason-lspconfig.nvim", + "WhoIsSethDaniel/mason-tool-installer.nvim", + }, }, - { - "WhoIsSethDaniel/mason-tool-installer.nvim", - config = true, - }, - - -- Configs for built-in LSP - { "neovim/nvim-lspconfig", config = require("plugins.lspconfig").setup }, - -- Additional LSP features for Java "mfussenegger/nvim-jdtls", diff --git a/home/.config/nvim/lua/plugins/lspconfig.lua b/home/.config/nvim/lua/plugins/lspconfig.lua deleted file mode 100644 index 6b324a46..00000000 --- a/home/.config/nvim/lua/plugins/lspconfig.lua +++ /dev/null @@ -1,97 +0,0 @@ --- Pairs of server name and settings. --- This is iterated through and every --- server is setup with lspconfig -local servers = { - bashls = {}, - html = {}, - jsonls = {}, - lemminx = {}, - marksman = {}, - yamlls = {}, - taplo = {}, - tsserver = {}, - eslint = {}, - rust_analyzer = {}, - lua_ls = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = "LuaJIT", - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = { "vim" }, - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file("", true), - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = { enable = false }, - }, - }, -} - -local m = {} - -function m.map_keys() - -- Register keybindings via which-key - -- to get documentation in which-key - local wk = require("which-key") - wk.register({ - g = { - name = "Go to", - d = { vim.lsp.buf.definition, "Definition" }, - D = { vim.lsp.buf.declaration, "Declaration" }, - i = { vim.lsp.buf.implementation, "Implementation" }, - r = { vim.lsp.buf.references, "References" }, - }, - [""] = { - name = "Leader", - w = { - name = "Workspace", - a = { vim.lsp.buf.add_workspace_folder, "Add folder" }, - r = { vim.lsp.buf.remove_workspace_folder, "Remove folder" }, - l = { - function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, - "List folders", - }, - }, - D = { vim.lsp.buf.type_definition, "Type definition" }, - rn = { vim.lsp.buf.rename, "Rename symbol" }, - ca = { vim.lsp.buf.code_action, "Code action" }, - e = { vim.diagnostic.open_float, "Open diagnostics" }, - f = { vim.lsp.buf.format, "Format" }, - }, - K = { vim.lsp.buf.hover, "Hover" }, - ["["] = { d = { vim.diagnostic.goto_prev, "Previous diagnostic" } }, - ["]"] = { d = { vim.diagnostic.goto_next, "Next diagnostic" } }, - }) -end - -function m.setup() - local function on_attach() - -- Setup lsp signature plugin - require("lsp_signature").setup({}) - - -- Setup keybinds - m.map_keys() - end - - local capabilities = require("cmp_nvim_lsp").default_capabilities() - - -- Setup every defined server - for server, settings in pairs(servers) do - require("lspconfig")[server].setup({ - on_attach = on_attach, - settings = settings, - -- Inform lsp server about client - -- capabilities - capabilities = capabilities, - }) - end -end - -return m diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua new file mode 100644 index 00000000..064b827c --- /dev/null +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -0,0 +1,91 @@ +local m = {} + +function m.setup() + local function on_attach() + -- Setup lsp signature plugin + require("lsp_signature").setup({}) + + -- Setup keybinds + m.map_keys() + end + + -- Inform lsp about completion capabilities from cmp + local capabilities = require("cmp_nvim_lsp").default_capabilities() + + require("mason").setup() + local mason_lsp = require("mason-lspconfig") + mason_lsp.setup() + + mason_lsp.setup_handlers({ + -- Default handler + function(server_name) + require("lspconfig")[server_name].setup({ + on_attach = on_attach, + capabilities = capabilities, + }) + end, + + -- Override lua_ls settings + ["lua_ls"] = function() + require("lspconfig").lua_ls.setup({ + on_attach = on_attach, + capabilities = capabilities, + settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = "LuaJIT", + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = { "vim" }, + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file("", true), + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = { enable = false }, + }, + }, + }) + end, + }) +end + +function m.map_keys() + local wk = require("which-key") + wk.register({ + g = { + name = "Go to", + d = { vim.lsp.buf.definition, "Definition" }, + D = { vim.lsp.buf.declaration, "Declaration" }, + i = { vim.lsp.buf.implementation, "Implementation" }, + r = { vim.lsp.buf.references, "References" }, + }, + [""] = { + name = "Leader", + w = { + name = "Workspace", + a = { vim.lsp.buf.add_workspace_folder, "Add folder" }, + r = { vim.lsp.buf.remove_workspace_folder, "Remove folder" }, + l = { + function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, + "List folders", + }, + }, + D = { vim.lsp.buf.type_definition, "Type definition" }, + rn = { vim.lsp.buf.rename, "Rename symbol" }, + ca = { vim.lsp.buf.code_action, "Code action" }, + e = { vim.diagnostic.open_float, "Open diagnostics" }, + f = { vim.lsp.buf.format, "Format" }, + }, + K = { vim.lsp.buf.hover, "Hover" }, + ["["] = { d = { vim.diagnostic.goto_prev, "Previous diagnostic" } }, + ["]"] = { d = { vim.diagnostic.goto_next, "Next diagnostic" } }, + }) +end + +return m From 8982e0c43909756569fdd2beebab32dd79dd8135 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Apr 2023 16:02:27 +0300 Subject: [PATCH 1883/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index aa3defd1..25d48954 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit aa3defd11752247909e03eaf14da197a6eda90f7 +Subproject commit 25d48954b403126dcd71d59889bcb7bfa0715821 From ac221a9f9f67b8d613f1ee2647b0a7504b3504f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Apr 2023 16:02:27 +0300 Subject: [PATCH 1884/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index aa3defd1..25d48954 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit aa3defd11752247909e03eaf14da197a6eda90f7 +Subproject commit 25d48954b403126dcd71d59889bcb7bfa0715821 From 4b8c40073ebde54ff69952dfd69acb05bfa6c362 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 May 2023 09:24:46 +0300 Subject: [PATCH 1885/2667] nvim: add dashboard to indent-blankline ignore filetype --- .../nvim/lua/plugins/indent-blankline.lua | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index ca8dbf4f..995d2061 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,8 +1,17 @@ return function() - vim.opt.list = true - require("indent_blankline").setup({ - space_char_blankline = " ", - show_current_context = true, - show_current_context_start = true, - }) + vim.opt.list = true + require("indent_blankline").setup({ + space_char_blankline = " ", + show_current_context = true, + show_current_context_start = true, + }) + vim.g.indent_blankline_filetype_exclude = { + "", + "checkhealth", + "dashboard", + "help", + "lspinfo", + "man", + "lazy", + } end From afe64f98bc2cb0ccff1dcfbe00ff8a78afd8c7c4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 May 2023 09:24:46 +0300 Subject: [PATCH 1886/2667] nvim: add dashboard to indent-blankline ignore filetype --- .../nvim/lua/plugins/indent-blankline.lua | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index ca8dbf4f..995d2061 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,8 +1,17 @@ return function() - vim.opt.list = true - require("indent_blankline").setup({ - space_char_blankline = " ", - show_current_context = true, - show_current_context_start = true, - }) + vim.opt.list = true + require("indent_blankline").setup({ + space_char_blankline = " ", + show_current_context = true, + show_current_context_start = true, + }) + vim.g.indent_blankline_filetype_exclude = { + "", + "checkhealth", + "dashboard", + "help", + "lspinfo", + "man", + "lazy", + } end From bc9ef5a1cd2675454ac6dd3313820d0ba2fc07e0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 May 2023 10:17:44 +0300 Subject: [PATCH 1887/2667] Nvim: Use Java 19 with jdtls --- home/.config/nvim/ftplugin/java.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 4a899986..a799e52e 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -4,7 +4,7 @@ local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name require("jdtls").start_or_attach({ cmd = { - "/usr/lib/jvm/java-17-openjdk-amd64/bin/java", + "/usr/lib/jvm/java-19-openjdk-amd64/bin/java", "-Declipse.application=org.eclipse.jdt.ls.core.id1", "-Dosgi.bundles.defaultStartLevel=4", "-Declipse.product=org.eclipse.jdt.ls.core.product", From d747f64d6383be442b0071465041e2da195468e8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 May 2023 10:17:44 +0300 Subject: [PATCH 1888/2667] Nvim: Use Java 19 with jdtls --- home/.config/nvim/ftplugin/java.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 4a899986..a799e52e 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -4,7 +4,7 @@ local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name require("jdtls").start_or_attach({ cmd = { - "/usr/lib/jvm/java-17-openjdk-amd64/bin/java", + "/usr/lib/jvm/java-19-openjdk-amd64/bin/java", "-Declipse.application=org.eclipse.jdt.ls.core.id1", "-Dosgi.bundles.defaultStartLevel=4", "-Declipse.product=org.eclipse.jdt.ls.core.product", From 1bb97d06a623d6552e513a0571659a561a53cf43 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 May 2023 10:17:55 +0300 Subject: [PATCH 1889/2667] Nvim: don't auto setup jdtls --- home/.config/nvim/lua/plugins/mason.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 064b827c..95d5b475 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -50,6 +50,9 @@ function m.setup() }, }) end, + + -- Don't set up jdtls, it is set up by nvim-jdtls + ["jdtls"] = function() end, }) end From 6c65550c697d04282020fbebbb21c6abafa026ef Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 May 2023 10:17:55 +0300 Subject: [PATCH 1890/2667] Nvim: don't auto setup jdtls --- home/.config/nvim/lua/plugins/mason.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 064b827c..95d5b475 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -50,6 +50,9 @@ function m.setup() }, }) end, + + -- Don't set up jdtls, it is set up by nvim-jdtls + ["jdtls"] = function() end, }) end From b28bef4c898cadaf6425541c8fcee3384da1a63b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 May 2023 11:22:05 +0300 Subject: [PATCH 1891/2667] ZSH: Add clock alias --- home/.config/zsh/04-aliases.zsh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index f82a3c5b..937fdeb6 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -291,3 +291,9 @@ dct() { } alias dslr-webcam='pkill -f gphoto2; gphoto2 --stdout --capture-movie | ffmpeg -i - -vcodec rawvideo -pix_fmt yuv420p -threads 0 -f v4l2 /dev/video0' + +clock() { + while true; do + printf '%s\r' "$(date)" + done +} From 9d7f734d50410c8273eb0a211270ce3bc86b1010 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 May 2023 11:22:05 +0300 Subject: [PATCH 1892/2667] ZSH: Add clock alias --- home/.config/zsh/04-aliases.zsh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index f82a3c5b..937fdeb6 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -291,3 +291,9 @@ dct() { } alias dslr-webcam='pkill -f gphoto2; gphoto2 --stdout --capture-movie | ffmpeg -i - -vcodec rawvideo -pix_fmt yuv420p -threads 0 -f v4l2 /dev/video0' + +clock() { + while true; do + printf '%s\r' "$(date)" + done +} From a3d4442aeb607ab277d1a263bbba47f0d9f60705 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 May 2023 11:26:52 +0300 Subject: [PATCH 1893/2667] Improve cpu usage of clock alias with sleep --- home/.config/zsh/04-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 937fdeb6..e59ad836 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -295,5 +295,6 @@ alias dslr-webcam='pkill -f gphoto2; gphoto2 --stdout --capture-movie | ffmpeg - clock() { while true; do printf '%s\r' "$(date)" + sleep 0.1 done } From 83996be539cac6c386e7a36914819ecef8326536 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 May 2023 11:26:52 +0300 Subject: [PATCH 1894/2667] Improve cpu usage of clock alias with sleep --- home/.config/zsh/04-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 937fdeb6..e59ad836 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -295,5 +295,6 @@ alias dslr-webcam='pkill -f gphoto2; gphoto2 --stdout --capture-movie | ffmpeg - clock() { while true; do printf '%s\r' "$(date)" + sleep 0.1 done } From 9513b9c0090faf7b094f7dfba3c7f3e885ce6157 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 May 2023 17:59:45 +0300 Subject: [PATCH 1895/2667] Switch from pacserve to flexo --- config-root.toml | 11 +---------- root/etc/pacman.conf | 5 ----- root/etc/pacserve/pacserve.service.conf | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) delete mode 100755 root/etc/pacserve/pacserve.service.conf diff --git a/config-root.toml b/config-root.toml index 5fba743f..7020392f 100644 --- a/config-root.toml +++ b/config-root.toml @@ -135,10 +135,6 @@ dst = "/etc/systemd/system.conf" src = "etc/default/cpupower" dst = "/etc/default/cpupower" -[dotfiles."f_pacserve.service.conf"] -src = "etc/pacserve/pacserve.service.conf" -dst = "/etc/pacserve/pacserve.service.conf" - [dotfiles."f_mkinitcpio_linux.preset"] src = "etc/mkinitcpio.d/linux.preset" dst = "/etc/mkinitcpio.d/linux.preset" @@ -170,12 +166,7 @@ dotfiles = ["d_network", "f_networkd.conf"] dotfiles = ["f_locale.conf", "f_locale.gen"] [profiles.Pacman] -dotfiles = [ - "f_pacman.conf", - "f_pacman_zsh_hook", - "f_pacserve.service.conf", - "f_sudoers_pacman", -] +dotfiles = ["f_pacman.conf", "f_pacman_zsh_hook", "f_sudoers_pacman"] [profiles.Mirkwood] dotfiles = [ diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 93809dca..b959ce78 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -14,26 +14,21 @@ CacheDir=/var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} [core] -Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [extra] -Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [community] -Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [multilib] -Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [korhonen_aur] {%@@ if profile == "Moria" @@%} Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ else @@%} -Include = /etc/pacman.d/pacserve Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ endif @@%} diff --git a/root/etc/pacserve/pacserve.service.conf b/root/etc/pacserve/pacserve.service.conf deleted file mode 100755 index a983b4c5..00000000 --- a/root/etc/pacserve/pacserve.service.conf +++ /dev/null @@ -1 +0,0 @@ -PACSERVE_ARGS="--multicast --avahi" From 7c2e4a67a7fcf41d2bc0bc438e44d11e55e0bab5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 May 2023 17:59:45 +0300 Subject: [PATCH 1896/2667] Switch from pacserve to flexo --- config-root.toml | 11 +---------- root/etc/pacman.conf | 5 ----- root/etc/pacserve/pacserve.service.conf | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) delete mode 100755 root/etc/pacserve/pacserve.service.conf diff --git a/config-root.toml b/config-root.toml index 5fba743f..7020392f 100644 --- a/config-root.toml +++ b/config-root.toml @@ -135,10 +135,6 @@ dst = "/etc/systemd/system.conf" src = "etc/default/cpupower" dst = "/etc/default/cpupower" -[dotfiles."f_pacserve.service.conf"] -src = "etc/pacserve/pacserve.service.conf" -dst = "/etc/pacserve/pacserve.service.conf" - [dotfiles."f_mkinitcpio_linux.preset"] src = "etc/mkinitcpio.d/linux.preset" dst = "/etc/mkinitcpio.d/linux.preset" @@ -170,12 +166,7 @@ dotfiles = ["d_network", "f_networkd.conf"] dotfiles = ["f_locale.conf", "f_locale.gen"] [profiles.Pacman] -dotfiles = [ - "f_pacman.conf", - "f_pacman_zsh_hook", - "f_pacserve.service.conf", - "f_sudoers_pacman", -] +dotfiles = ["f_pacman.conf", "f_pacman_zsh_hook", "f_sudoers_pacman"] [profiles.Mirkwood] dotfiles = [ diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 93809dca..b959ce78 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -14,26 +14,21 @@ CacheDir=/var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} [core] -Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [extra] -Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [community] -Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [multilib] -Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [korhonen_aur] {%@@ if profile == "Moria" @@%} Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ else @@%} -Include = /etc/pacman.d/pacserve Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ endif @@%} diff --git a/root/etc/pacserve/pacserve.service.conf b/root/etc/pacserve/pacserve.service.conf deleted file mode 100755 index a983b4c5..00000000 --- a/root/etc/pacserve/pacserve.service.conf +++ /dev/null @@ -1 +0,0 @@ -PACSERVE_ARGS="--multicast --avahi" From 208688e0926ac84dc0283dbcb680334458e04510 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 May 2023 18:00:04 +0300 Subject: [PATCH 1897/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 25d48954..aa3defd1 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 25d48954b403126dcd71d59889bcb7bfa0715821 +Subproject commit aa3defd11752247909e03eaf14da197a6eda90f7 From 0a21e02625b04e408cfc03cbf99d8ad09806e4b4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 May 2023 18:00:04 +0300 Subject: [PATCH 1898/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 25d48954..aa3defd1 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 25d48954b403126dcd71d59889bcb7bfa0715821 +Subproject commit aa3defd11752247909e03eaf14da197a6eda90f7 From 4b0cafdc0418621e32532946c11e55e210bd1985 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 May 2023 18:06:57 +0300 Subject: [PATCH 1899/2667] Add flexo configuration --- config-root.toml | 6 ++++++ root/etc/flexo/flexo.toml | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 root/etc/flexo/flexo.toml diff --git a/config-root.toml b/config-root.toml index 7020392f..defe48b9 100644 --- a/config-root.toml +++ b/config-root.toml @@ -159,6 +159,10 @@ dst = "/etc/sudoers.d/pacman" src = "etc/doas.conf" dst = "/etc/doas.conf" +[dotfiles."f_flexo.toml"] +src = "etc/flexo/flexo.toml" +dst = "/etc/flexo/flexo.toml" + [profiles.Network] dotfiles = ["d_network", "f_networkd.conf"] @@ -192,6 +196,7 @@ dotfiles = [ "f_system.conf", "f_timesyncd.conf", "f_welcomemessage.conf", + "f_flexo.toml", ] include = ["Locale", "Pacman", "Network"] @@ -207,6 +212,7 @@ dotfiles = [ "f_mkinitcpio_linux-lts.preset", "f_plymouthd.conf", "f_sshd_config", + "f_flexo.toml", ] [profiles.Gondor] diff --git a/root/etc/flexo/flexo.toml b/root/etc/flexo/flexo.toml new file mode 100644 index 00000000..07ec1138 --- /dev/null +++ b/root/etc/flexo/flexo.toml @@ -0,0 +1,26 @@ +cache_directory = "/var/cache/flexo/pkg" +connect_timeout = 3000 +mirrorlist_fallback_file = "/var/cache/flexo/state/mirrorlist" +mirrorlist_latency_test_results_file = "/var/cache/flexo/state/latency_test_results.json" +listen_ip_address = "0.0.0.0" +port = 7878 +mirror_selection_method = "auto" +mirrors_predefined = [] +num_versions_retain = 3 + +[mirrors_auto] + +mirrors_status_json_endpoint = "https://archlinux.org/mirrors/status/json/" +mirrors_status_json_endpoint_fallbacks = [ + "https://raw.githubusercontent.com/nroi/archlinux-mirrors-status-fallback/main/mirrorlist.json", +] +mirrors_blacklist = [] +https_required = true +ipv4 = true +ipv6 = false +max_score = 2.5 +num_mirrors = 8 +mirrors_random_or_sort = "sort" +timeout = 350 +refresh_latency_tests_after = "8 days" +allowed_countries = [] From 955020d9f41f24c585d459dd87a527b867373fac Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 May 2023 18:06:57 +0300 Subject: [PATCH 1900/2667] Add flexo configuration --- config-root.toml | 6 ++++++ root/etc/flexo/flexo.toml | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 root/etc/flexo/flexo.toml diff --git a/config-root.toml b/config-root.toml index 7020392f..defe48b9 100644 --- a/config-root.toml +++ b/config-root.toml @@ -159,6 +159,10 @@ dst = "/etc/sudoers.d/pacman" src = "etc/doas.conf" dst = "/etc/doas.conf" +[dotfiles."f_flexo.toml"] +src = "etc/flexo/flexo.toml" +dst = "/etc/flexo/flexo.toml" + [profiles.Network] dotfiles = ["d_network", "f_networkd.conf"] @@ -192,6 +196,7 @@ dotfiles = [ "f_system.conf", "f_timesyncd.conf", "f_welcomemessage.conf", + "f_flexo.toml", ] include = ["Locale", "Pacman", "Network"] @@ -207,6 +212,7 @@ dotfiles = [ "f_mkinitcpio_linux-lts.preset", "f_plymouthd.conf", "f_sshd_config", + "f_flexo.toml", ] [profiles.Gondor] diff --git a/root/etc/flexo/flexo.toml b/root/etc/flexo/flexo.toml new file mode 100644 index 00000000..07ec1138 --- /dev/null +++ b/root/etc/flexo/flexo.toml @@ -0,0 +1,26 @@ +cache_directory = "/var/cache/flexo/pkg" +connect_timeout = 3000 +mirrorlist_fallback_file = "/var/cache/flexo/state/mirrorlist" +mirrorlist_latency_test_results_file = "/var/cache/flexo/state/latency_test_results.json" +listen_ip_address = "0.0.0.0" +port = 7878 +mirror_selection_method = "auto" +mirrors_predefined = [] +num_versions_retain = 3 + +[mirrors_auto] + +mirrors_status_json_endpoint = "https://archlinux.org/mirrors/status/json/" +mirrors_status_json_endpoint_fallbacks = [ + "https://raw.githubusercontent.com/nroi/archlinux-mirrors-status-fallback/main/mirrorlist.json", +] +mirrors_blacklist = [] +https_required = true +ipv4 = true +ipv6 = false +max_score = 2.5 +num_mirrors = 8 +mirrors_random_or_sort = "sort" +timeout = 350 +refresh_latency_tests_after = "8 days" +allowed_countries = [] From 55a9462ad06287662766d2f8898c6fa0360744d9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 9 May 2023 08:58:21 +0300 Subject: [PATCH 1901/2667] Disable atuff that doesn't work in termux --- home/.config/zsh/03-plugins.zsh | 2 ++ home/.config/zsh/04-aliases.zsh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 7377af62..0aae9f40 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -47,5 +47,7 @@ source /usr/share/fzf/key-bindings.zsh source /usr/share/fzf/completion.zsh {%@@ endif @@%} +{%@@ if distro_id != "termux" @@%} # enable https://github.com/nvbn/thefuck eval $(TF_SHELL=zsh thefuck --alias) +{%@@ endif @@%} diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index e59ad836..16d4dfe4 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -112,8 +112,10 @@ alias jcu='journalctl --user' # switch to desktop mode alias dock='swaymsg output eDP-1 disable' +{%@@ if distro_id != "termux" @@%} # move to trash instead of remove alias rm='trash' +{%@@ endif @@%} # clean stuff clean() { From 310f8aa45c43c364519f8600d597c1c593bcc6c7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 9 May 2023 08:58:21 +0300 Subject: [PATCH 1902/2667] Disable atuff that doesn't work in termux --- home/.config/zsh/03-plugins.zsh | 2 ++ home/.config/zsh/04-aliases.zsh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 7377af62..0aae9f40 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -47,5 +47,7 @@ source /usr/share/fzf/key-bindings.zsh source /usr/share/fzf/completion.zsh {%@@ endif @@%} +{%@@ if distro_id != "termux" @@%} # enable https://github.com/nvbn/thefuck eval $(TF_SHELL=zsh thefuck --alias) +{%@@ endif @@%} diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index e59ad836..16d4dfe4 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -112,8 +112,10 @@ alias jcu='journalctl --user' # switch to desktop mode alias dock='swaymsg output eDP-1 disable' +{%@@ if distro_id != "termux" @@%} # move to trash instead of remove alias rm='trash' +{%@@ endif @@%} # clean stuff clean() { From 3ea12285b76f72977f79776e11185649fd5080db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 15 May 2023 15:11:22 +0300 Subject: [PATCH 1903/2667] Supress okc-agent output on shell start --- home/.config/zsh/02-env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 05995854..83f62c83 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -77,7 +77,7 @@ if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then fi gpgconf --launch gpg-agent {%@@ elif distro_id == "termux" @@%} -eval $(okc-ssh-agent) +eval $(okc-ssh-agent) > /dev/null {%@@ endif @@%} # Enable grc colorization of supported commands From 639a58a437728708d8600969370e1c1b8996f2f6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 15 May 2023 15:11:22 +0300 Subject: [PATCH 1904/2667] Supress okc-agent output on shell start --- home/.config/zsh/02-env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 05995854..83f62c83 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -77,7 +77,7 @@ if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then fi gpgconf --launch gpg-agent {%@@ elif distro_id == "termux" @@%} -eval $(okc-ssh-agent) +eval $(okc-ssh-agent) > /dev/null {%@@ endif @@%} # Enable grc colorization of supported commands From cda6ed58351d55007d52bbafa5a4cfb539edf78b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 22 May 2023 08:57:16 +0300 Subject: [PATCH 1905/2667] Pacman: remove community --- root/etc/pacman.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index b959ce78..fe23a751 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -19,9 +19,6 @@ Include = /etc/pacman.d/mirrorlist [extra] Include = /etc/pacman.d/mirrorlist -[community] -Include = /etc/pacman.d/mirrorlist - [multilib] Include = /etc/pacman.d/mirrorlist From 788e3b6e40f539705ee6dfc875e24d73a00eb02a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 22 May 2023 08:57:16 +0300 Subject: [PATCH 1906/2667] Pacman: remove community --- root/etc/pacman.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index b959ce78..fe23a751 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -19,9 +19,6 @@ Include = /etc/pacman.d/mirrorlist [extra] Include = /etc/pacman.d/mirrorlist -[community] -Include = /etc/pacman.d/mirrorlist - [multilib] Include = /etc/pacman.d/mirrorlist From 7a1dc197e18bba662109225c692daff3aca34c40 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 May 2023 21:38:07 +0300 Subject: [PATCH 1907/2667] Revert "Switch from pacserve to flexo" This reverts commit 9513b9c0090faf7b094f7dfba3c7f3e885ce6157. --- config-root.toml | 11 ++++++++++- root/etc/pacman.conf | 4 ++++ root/etc/pacserve/pacserve.service.conf | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100755 root/etc/pacserve/pacserve.service.conf diff --git a/config-root.toml b/config-root.toml index defe48b9..311d9eb9 100644 --- a/config-root.toml +++ b/config-root.toml @@ -135,6 +135,10 @@ dst = "/etc/systemd/system.conf" src = "etc/default/cpupower" dst = "/etc/default/cpupower" +[dotfiles."f_pacserve.service.conf"] +src = "etc/pacserve/pacserve.service.conf" +dst = "/etc/pacserve/pacserve.service.conf" + [dotfiles."f_mkinitcpio_linux.preset"] src = "etc/mkinitcpio.d/linux.preset" dst = "/etc/mkinitcpio.d/linux.preset" @@ -170,7 +174,12 @@ dotfiles = ["d_network", "f_networkd.conf"] dotfiles = ["f_locale.conf", "f_locale.gen"] [profiles.Pacman] -dotfiles = ["f_pacman.conf", "f_pacman_zsh_hook", "f_sudoers_pacman"] +dotfiles = [ + "f_pacman.conf", + "f_pacman_zsh_hook", + "f_pacserve.service.conf", + "f_sudoers_pacman", +] [profiles.Mirkwood] dotfiles = [ diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index fe23a751..2e567467 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -14,18 +14,22 @@ CacheDir=/var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} [core] +Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [extra] +Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [multilib] +Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [korhonen_aur] {%@@ if profile == "Moria" @@%} Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ else @@%} +Include = /etc/pacman.d/pacserve Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ endif @@%} diff --git a/root/etc/pacserve/pacserve.service.conf b/root/etc/pacserve/pacserve.service.conf new file mode 100755 index 00000000..a983b4c5 --- /dev/null +++ b/root/etc/pacserve/pacserve.service.conf @@ -0,0 +1 @@ +PACSERVE_ARGS="--multicast --avahi" From 677b16789cf93b786d4d862de4ec60036211d37b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 May 2023 21:38:07 +0300 Subject: [PATCH 1908/2667] Revert "Switch from pacserve to flexo" This reverts commit 7c2e4a67a7fcf41d2bc0bc438e44d11e55e0bab5. --- config-root.toml | 11 ++++++++++- root/etc/pacman.conf | 4 ++++ root/etc/pacserve/pacserve.service.conf | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100755 root/etc/pacserve/pacserve.service.conf diff --git a/config-root.toml b/config-root.toml index defe48b9..311d9eb9 100644 --- a/config-root.toml +++ b/config-root.toml @@ -135,6 +135,10 @@ dst = "/etc/systemd/system.conf" src = "etc/default/cpupower" dst = "/etc/default/cpupower" +[dotfiles."f_pacserve.service.conf"] +src = "etc/pacserve/pacserve.service.conf" +dst = "/etc/pacserve/pacserve.service.conf" + [dotfiles."f_mkinitcpio_linux.preset"] src = "etc/mkinitcpio.d/linux.preset" dst = "/etc/mkinitcpio.d/linux.preset" @@ -170,7 +174,12 @@ dotfiles = ["d_network", "f_networkd.conf"] dotfiles = ["f_locale.conf", "f_locale.gen"] [profiles.Pacman] -dotfiles = ["f_pacman.conf", "f_pacman_zsh_hook", "f_sudoers_pacman"] +dotfiles = [ + "f_pacman.conf", + "f_pacman_zsh_hook", + "f_pacserve.service.conf", + "f_sudoers_pacman", +] [profiles.Mirkwood] dotfiles = [ diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index fe23a751..2e567467 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -14,18 +14,22 @@ CacheDir=/var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} [core] +Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [extra] +Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [multilib] +Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist [korhonen_aur] {%@@ if profile == "Moria" @@%} Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ else @@%} +Include = /etc/pacman.d/pacserve Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ endif @@%} diff --git a/root/etc/pacserve/pacserve.service.conf b/root/etc/pacserve/pacserve.service.conf new file mode 100755 index 00000000..a983b4c5 --- /dev/null +++ b/root/etc/pacserve/pacserve.service.conf @@ -0,0 +1 @@ +PACSERVE_ARGS="--multicast --avahi" From 6e7520280edd3a26b150e166c812ed455dfff1d0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 May 2023 22:04:02 +0300 Subject: [PATCH 1909/2667] Nvim: Add git to disabled filetypes of indent-blankline --- home/.config/nvim/lua/plugins/indent-blankline.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index 995d2061..af840c1c 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -13,5 +13,6 @@ return function() "lspinfo", "man", "lazy", + "git", } end From d5973ea4e3f2ac19e7d327f803f0659739cc74ff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 May 2023 22:04:02 +0300 Subject: [PATCH 1910/2667] Nvim: Add git to disabled filetypes of indent-blankline --- home/.config/nvim/lua/plugins/indent-blankline.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index 995d2061..af840c1c 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -13,5 +13,6 @@ return function() "lspinfo", "man", "lazy", + "git", } end From 4e59e69155194cc62013f6be9dcc2458c541a1c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 May 2023 22:04:32 +0300 Subject: [PATCH 1911/2667] Add meld as git (merge|diff)tool --- home/.config/git/config | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/home/.config/git/config b/home/.config/git/config index dc51040f..00409637 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -21,19 +21,30 @@ [merge] prompt = false conflictstyle = diff3 - tool = nvim-merge + tool = meld -[mergetool "nvim-merge"] - cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' +[mergetool] keepBackup = false + prompt = false + +[mergetool "nvim"] + cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' + +[mergetool "meld"] + cmd = meld --diff $LOCAL $MERGED $REMOTE --diff $BASE $LOCAL --diff $BASE $REMOTE [diff] - prompt = false - tool = nvim-diff + tool = meld -[difftool "nvim-diff"] +[difftool] + prompt = false + +[difftool "nvim"] cmd = nvim -d $LOCAL $REMOTE +[difftool "meld"] + cmd = meld --diff $LOCAL $REMOTE + [pull] rebase = merges From 747a44d61ebd199f5022b6f7c5d490a4ccc6fea6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 May 2023 22:04:32 +0300 Subject: [PATCH 1912/2667] Add meld as git (merge|diff)tool --- home/.config/git/config | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/home/.config/git/config b/home/.config/git/config index dc51040f..00409637 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -21,19 +21,30 @@ [merge] prompt = false conflictstyle = diff3 - tool = nvim-merge + tool = meld -[mergetool "nvim-merge"] - cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' +[mergetool] keepBackup = false + prompt = false + +[mergetool "nvim"] + cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' + +[mergetool "meld"] + cmd = meld --diff $LOCAL $MERGED $REMOTE --diff $BASE $LOCAL --diff $BASE $REMOTE [diff] - prompt = false - tool = nvim-diff + tool = meld -[difftool "nvim-diff"] +[difftool] + prompt = false + +[difftool "nvim"] cmd = nvim -d $LOCAL $REMOTE +[difftool "meld"] + cmd = meld --diff $LOCAL $REMOTE + [pull] rebase = merges From e2eb38516bd65231f76bfbf06bc6fd9980785623 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 May 2023 22:20:27 +0300 Subject: [PATCH 1913/2667] Git: remove unneeded configuration for meld diff/mergetools --- home/.config/git/config | 9 --------- 1 file changed, 9 deletions(-) diff --git a/home/.config/git/config b/home/.config/git/config index 00409637..522fca2e 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -30,21 +30,12 @@ [mergetool "nvim"] cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -[mergetool "meld"] - cmd = meld --diff $LOCAL $MERGED $REMOTE --diff $BASE $LOCAL --diff $BASE $REMOTE - -[diff] - tool = meld - [difftool] prompt = false [difftool "nvim"] cmd = nvim -d $LOCAL $REMOTE -[difftool "meld"] - cmd = meld --diff $LOCAL $REMOTE - [pull] rebase = merges From aac4c7b2667726e09d1666502d9b730c24f02422 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 May 2023 22:20:27 +0300 Subject: [PATCH 1914/2667] Git: remove unneeded configuration for meld diff/mergetools --- home/.config/git/config | 9 --------- 1 file changed, 9 deletions(-) diff --git a/home/.config/git/config b/home/.config/git/config index 00409637..522fca2e 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -30,21 +30,12 @@ [mergetool "nvim"] cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -[mergetool "meld"] - cmd = meld --diff $LOCAL $MERGED $REMOTE --diff $BASE $LOCAL --diff $BASE $REMOTE - -[diff] - tool = meld - [difftool] prompt = false [difftool "nvim"] cmd = nvim -d $LOCAL $REMOTE -[difftool "meld"] - cmd = meld --diff $LOCAL $REMOTE - [pull] rebase = merges From 5a4174e2d0714b9cf440c98e85ee32757e3d980b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 May 2023 09:16:29 +0300 Subject: [PATCH 1915/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index aa3defd1..25d48954 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit aa3defd11752247909e03eaf14da197a6eda90f7 +Subproject commit 25d48954b403126dcd71d59889bcb7bfa0715821 From fae5908673ae8962e641ec9105cb2de9e662c6fa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 May 2023 09:16:29 +0300 Subject: [PATCH 1916/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index aa3defd1..25d48954 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit aa3defd11752247909e03eaf14da197a6eda90f7 +Subproject commit 25d48954b403126dcd71d59889bcb7bfa0715821 From 82d7b1fbca6ca699c35070d8a662f60033b773b3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 May 2023 08:41:18 +0300 Subject: [PATCH 1917/2667] Git: Switch back to nvim for diff and mergetool --- home/.config/git/config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home/.config/git/config b/home/.config/git/config index 522fca2e..3da38a64 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -21,7 +21,7 @@ [merge] prompt = false conflictstyle = diff3 - tool = meld + tool = nvim [mergetool] keepBackup = false @@ -30,6 +30,9 @@ [mergetool "nvim"] cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' +[diff] + tool = nvim + [difftool] prompt = false From 80b724faf9779f2b1376a4e01a158129a3e04087 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 May 2023 08:41:18 +0300 Subject: [PATCH 1918/2667] Git: Switch back to nvim for diff and mergetool --- home/.config/git/config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home/.config/git/config b/home/.config/git/config index 522fca2e..3da38a64 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -21,7 +21,7 @@ [merge] prompt = false conflictstyle = diff3 - tool = meld + tool = nvim [mergetool] keepBackup = false @@ -30,6 +30,9 @@ [mergetool "nvim"] cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' +[diff] + tool = nvim + [difftool] prompt = false From 2f9bc0ae5f6bcd1f4d759dbea8e374e8ca5ce5a4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 May 2023 08:44:50 +0300 Subject: [PATCH 1919/2667] Git: Remove all whitespace at the beginning of lines The whitespace is not needed and makes the file more TOML like (more readable) --- home/.config/git/config | 60 ++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/home/.config/git/config b/home/.config/git/config index 3da38a64..81caa661 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -1,61 +1,61 @@ [user] - {%@@ if profile == "mko-laptop" @@%} - email = marko.korhonen@rossum.fi - {%@@ else @@%} - email = marko@korhonen.cc - {%@@ endif @@%} - name = Marko Korhonen - signingkey = F2B9F713E7ED627336DD85E444FA3F28CD931BB0 +{%@@ if profile == "mko-laptop" @@%} +email = marko.korhonen@rossum.fi +{%@@ else @@%} +email = marko@korhonen.cc +{%@@ endif @@%} +name = Marko Korhonen +signingkey = F2B9F713E7ED627336DD85E444FA3F28CD931BB0 [commit] - signoff = true - gpgsign = true +signoff = true +gpgsign = true [tag] - gpgSign = true - signoff = true +gpgSign = true +signoff = true [format] - signoff = true +signoff = true [merge] - prompt = false - conflictstyle = diff3 - tool = nvim +prompt = false +conflictstyle = diff3 +tool = nvim [mergetool] - keepBackup = false - prompt = false +keepBackup = false +prompt = false [mergetool "nvim"] - cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' +cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' [diff] - tool = nvim +tool = nvim [difftool] - prompt = false +prompt = false [difftool "nvim"] - cmd = nvim -d $LOCAL $REMOTE +cmd = nvim -d $LOCAL $REMOTE [pull] - rebase = merges +rebase = merges [alias] - mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 - upstream = !git push -u origin HEAD - sync = !git pull && git push +mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 +upstream = !git push -u origin HEAD +sync = !git pull && git push [color] - pager = no +pager = no [init] - defaultBranch = main +defaultBranch = main [credential] - helper = cache --timeout=600 - helper = !pass-git-helper $@ +helper = cache --timeout=600 +helper = !pass-git-helper $@ [rerere] - enabled = true +enabled = true From 96db564b83665bd56e99e7c13c54751e549dfb10 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 May 2023 08:44:50 +0300 Subject: [PATCH 1920/2667] Git: Remove all whitespace at the beginning of lines The whitespace is not needed and makes the file more TOML like (more readable) --- home/.config/git/config | 60 ++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/home/.config/git/config b/home/.config/git/config index 3da38a64..81caa661 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -1,61 +1,61 @@ [user] - {%@@ if profile == "mko-laptop" @@%} - email = marko.korhonen@rossum.fi - {%@@ else @@%} - email = marko@korhonen.cc - {%@@ endif @@%} - name = Marko Korhonen - signingkey = F2B9F713E7ED627336DD85E444FA3F28CD931BB0 +{%@@ if profile == "mko-laptop" @@%} +email = marko.korhonen@rossum.fi +{%@@ else @@%} +email = marko@korhonen.cc +{%@@ endif @@%} +name = Marko Korhonen +signingkey = F2B9F713E7ED627336DD85E444FA3F28CD931BB0 [commit] - signoff = true - gpgsign = true +signoff = true +gpgsign = true [tag] - gpgSign = true - signoff = true +gpgSign = true +signoff = true [format] - signoff = true +signoff = true [merge] - prompt = false - conflictstyle = diff3 - tool = nvim +prompt = false +conflictstyle = diff3 +tool = nvim [mergetool] - keepBackup = false - prompt = false +keepBackup = false +prompt = false [mergetool "nvim"] - cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' +cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' [diff] - tool = nvim +tool = nvim [difftool] - prompt = false +prompt = false [difftool "nvim"] - cmd = nvim -d $LOCAL $REMOTE +cmd = nvim -d $LOCAL $REMOTE [pull] - rebase = merges +rebase = merges [alias] - mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 - upstream = !git push -u origin HEAD - sync = !git pull && git push +mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 +upstream = !git push -u origin HEAD +sync = !git pull && git push [color] - pager = no +pager = no [init] - defaultBranch = main +defaultBranch = main [credential] - helper = cache --timeout=600 - helper = !pass-git-helper $@ +helper = cache --timeout=600 +helper = !pass-git-helper $@ [rerere] - enabled = true +enabled = true From 7c5f21daba99871bca8099bd98d09d551f7c700b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 May 2023 22:08:02 +0300 Subject: [PATCH 1921/2667] Disable misskey elasticsearch --- docker/misskey/docker-compose.toml | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docker/misskey/docker-compose.toml b/docker/misskey/docker-compose.toml index 01ca5b28..27430f84 100644 --- a/docker/misskey/docker-compose.toml +++ b/docker/misskey/docker-compose.toml @@ -10,22 +10,22 @@ volumes = [ "/docker/misskey/config:/misskey/.config:ro", ] -[services.elasticsearch] -image = "docker.elastic.co/elasticsearch/elasticsearch:7.17.8" -container_name = "misskey-elasticsearch" -restart = "unless-stopped" -volumes = ["/docker/misskey/elasticsearch/:/usr/share/elasticsearch/data"] -networks = ["misskey"] -environment = [ - "cluster.name=misskey-es-cluster", - "node.name=misskey-node", - "discovery.type=single-node", - "bootstrap.memory_lock=true", - "ES_JAVA_OPTS=-Xms200m -Xmx200m", -] -[services.elasticsearch.ulimits.memlock] -soft = -1 -hard = -1 +#[services.elasticsearch] +#image = "docker.elastic.co/elasticsearch/elasticsearch:7.17.8" +#container_name = "misskey-elasticsearch" +#restart = "unless-stopped" +#volumes = ["/docker/misskey/elasticsearch/:/usr/share/elasticsearch/data"] +#networks = ["misskey"] +#environment = [ +# "cluster.name=misskey-es-cluster", +# "node.name=misskey-node", +# "discovery.type=single-node", +# "bootstrap.memory_lock=true", +# "ES_JAVA_OPTS=-Xms200m -Xmx200m", +#] +#[services.elasticsearch.ulimits.memlock] +#soft = -1 +#hard = -1 [services.redis] image = "redis" From a7eb1024e157ee1880a21ecd101e9dc3fd9df0aa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 May 2023 22:08:02 +0300 Subject: [PATCH 1922/2667] Disable misskey elasticsearch --- docker/misskey/docker-compose.toml | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docker/misskey/docker-compose.toml b/docker/misskey/docker-compose.toml index 01ca5b28..27430f84 100644 --- a/docker/misskey/docker-compose.toml +++ b/docker/misskey/docker-compose.toml @@ -10,22 +10,22 @@ volumes = [ "/docker/misskey/config:/misskey/.config:ro", ] -[services.elasticsearch] -image = "docker.elastic.co/elasticsearch/elasticsearch:7.17.8" -container_name = "misskey-elasticsearch" -restart = "unless-stopped" -volumes = ["/docker/misskey/elasticsearch/:/usr/share/elasticsearch/data"] -networks = ["misskey"] -environment = [ - "cluster.name=misskey-es-cluster", - "node.name=misskey-node", - "discovery.type=single-node", - "bootstrap.memory_lock=true", - "ES_JAVA_OPTS=-Xms200m -Xmx200m", -] -[services.elasticsearch.ulimits.memlock] -soft = -1 -hard = -1 +#[services.elasticsearch] +#image = "docker.elastic.co/elasticsearch/elasticsearch:7.17.8" +#container_name = "misskey-elasticsearch" +#restart = "unless-stopped" +#volumes = ["/docker/misskey/elasticsearch/:/usr/share/elasticsearch/data"] +#networks = ["misskey"] +#environment = [ +# "cluster.name=misskey-es-cluster", +# "node.name=misskey-node", +# "discovery.type=single-node", +# "bootstrap.memory_lock=true", +# "ES_JAVA_OPTS=-Xms200m -Xmx200m", +#] +#[services.elasticsearch.ulimits.memlock] +#soft = -1 +#hard = -1 [services.redis] image = "redis" From 52d76d6be5449313d1eafe0b6b4da9a5fd533010 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 9 Jun 2023 09:06:55 +0300 Subject: [PATCH 1923/2667] Revert "Switch from tmux to zellij" This reverts commit 98a01af1a6d7dcf89b6e40859d7db60e6b384c20. --- home/.config/zsh/01-tmux.zsh | 8 ++++++++ home/.config/zsh/01-zellij.zsh | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 home/.config/zsh/01-tmux.zsh delete mode 100644 home/.config/zsh/01-zellij.zsh diff --git a/home/.config/zsh/01-tmux.zsh b/home/.config/zsh/01-tmux.zsh new file mode 100644 index 00000000..55d3f0c7 --- /dev/null +++ b/home/.config/zsh/01-tmux.zsh @@ -0,0 +1,8 @@ +# Launch tmux if logging in over ssh +if [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then + if tmux has-session -t ssh_tmux 2>/dev/null; then + exec tmux -2 attach-session -t ssh_tmux + else + exec tmux -2 new-session -s ssh_tmux + fi +fi diff --git a/home/.config/zsh/01-zellij.zsh b/home/.config/zsh/01-zellij.zsh deleted file mode 100644 index 6dc53321..00000000 --- a/home/.config/zsh/01-zellij.zsh +++ /dev/null @@ -1,4 +0,0 @@ -# Launch zellij if logging in over SSH -if [[ -z "$ZELLIJ" && -n "$SSH_CONNECTION" ]]; then - exec zellij attach -c ssh -fi From 718ecfa54eda20f0a053c36dc449fd610d5fe73e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 9 Jun 2023 09:06:55 +0300 Subject: [PATCH 1924/2667] Revert "Switch from tmux to zellij" This reverts commit f197eccac30678b2793a829df435363a6b585868. --- home/.config/zsh/01-tmux.zsh | 8 ++++++++ home/.config/zsh/01-zellij.zsh | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 home/.config/zsh/01-tmux.zsh delete mode 100644 home/.config/zsh/01-zellij.zsh diff --git a/home/.config/zsh/01-tmux.zsh b/home/.config/zsh/01-tmux.zsh new file mode 100644 index 00000000..55d3f0c7 --- /dev/null +++ b/home/.config/zsh/01-tmux.zsh @@ -0,0 +1,8 @@ +# Launch tmux if logging in over ssh +if [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then + if tmux has-session -t ssh_tmux 2>/dev/null; then + exec tmux -2 attach-session -t ssh_tmux + else + exec tmux -2 new-session -s ssh_tmux + fi +fi diff --git a/home/.config/zsh/01-zellij.zsh b/home/.config/zsh/01-zellij.zsh deleted file mode 100644 index 6dc53321..00000000 --- a/home/.config/zsh/01-zellij.zsh +++ /dev/null @@ -1,4 +0,0 @@ -# Launch zellij if logging in over SSH -if [[ -z "$ZELLIJ" && -n "$SSH_CONNECTION" ]]; then - exec zellij attach -c ssh -fi From c5b4cd5ff4b033c87a2c8054108cd37c7185f2bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Jun 2023 14:35:24 +0300 Subject: [PATCH 1925/2667] Separate neovide settings to it's own file in nvim config --- home/.config/nvim/init.lua | 1 + home/.config/nvim/lua/neovide.lua | 19 +++++++++++++++++++ home/.config/nvim/lua/settings.lua | 23 +++++++---------------- 3 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 home/.config/nvim/lua/neovide.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 96fed540..4c3c6e3f 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,4 +1,5 @@ require("keybinds") require("settings") +require("neovide") require("highlight_yank") require("plugins.init") diff --git a/home/.config/nvim/lua/neovide.lua b/home/.config/nvim/lua/neovide.lua new file mode 100644 index 00000000..314dbd70 --- /dev/null +++ b/home/.config/nvim/lua/neovide.lua @@ -0,0 +1,19 @@ +local g = vim.g + +-- Change scale factor with C= and C- +g.neovide_scale_factor = 1.0 +local change_scale_factor = function(delta) + g.neovide_scale_factor = g.neovide_scale_factor * delta +end +vim.keymap.set("n", "", function() + change_scale_factor(1.25) +end) +vim.keymap.set("n", "", function() + change_scale_factor(1 / 1.25) +end) + +-- Hide mouse when typing in neovide +g.neovide_hide_mouse_when_typing = true + +-- Enable cursor particles in neovide +g.neovide_cursor_vfx_mode = "railgun" diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 7716719c..87293e5e 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -7,15 +7,6 @@ o.relativenumber = true -- True colors o.termguicolors = true --- Font for nvim GUI's -o.guifont = "Fira Code:h14" - --- Hide mouse when typing in neovide -g.neovide_hide_mouse_when_typing = true - --- Enable cursor particles in neovide -g.neovide_cursor_vfx_mode = "railgun" - -- Floating window transparency o.winblend = 10 @@ -33,8 +24,8 @@ o.hidden = true o.number = true o.guicursor = table.concat({ - "i:ver1", -- Vertical bar cursor in insert mode - "a:blinkon1", -- Blinking cursor in all modes + "i:ver1", -- Vertical bar cursor in insert mode + "a:blinkon1", -- Blinking cursor in all modes }, ",") -- Enable global statusline @@ -59,9 +50,9 @@ o.smartindent = true -- Firenvim settings vim.g.firenvim_config = { - localSettings = { - [".*"] = { - takeOver = "never", - }, - }, + localSettings = { + [".*"] = { + takeOver = "never", + }, + }, } From 3e1d80c56c82e312d52189d046888acd3fe17bf3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Jun 2023 14:35:24 +0300 Subject: [PATCH 1926/2667] Separate neovide settings to it's own file in nvim config --- home/.config/nvim/init.lua | 1 + home/.config/nvim/lua/neovide.lua | 19 +++++++++++++++++++ home/.config/nvim/lua/settings.lua | 23 +++++++---------------- 3 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 home/.config/nvim/lua/neovide.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 96fed540..4c3c6e3f 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,4 +1,5 @@ require("keybinds") require("settings") +require("neovide") require("highlight_yank") require("plugins.init") diff --git a/home/.config/nvim/lua/neovide.lua b/home/.config/nvim/lua/neovide.lua new file mode 100644 index 00000000..314dbd70 --- /dev/null +++ b/home/.config/nvim/lua/neovide.lua @@ -0,0 +1,19 @@ +local g = vim.g + +-- Change scale factor with C= and C- +g.neovide_scale_factor = 1.0 +local change_scale_factor = function(delta) + g.neovide_scale_factor = g.neovide_scale_factor * delta +end +vim.keymap.set("n", "", function() + change_scale_factor(1.25) +end) +vim.keymap.set("n", "", function() + change_scale_factor(1 / 1.25) +end) + +-- Hide mouse when typing in neovide +g.neovide_hide_mouse_when_typing = true + +-- Enable cursor particles in neovide +g.neovide_cursor_vfx_mode = "railgun" diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 7716719c..87293e5e 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -7,15 +7,6 @@ o.relativenumber = true -- True colors o.termguicolors = true --- Font for nvim GUI's -o.guifont = "Fira Code:h14" - --- Hide mouse when typing in neovide -g.neovide_hide_mouse_when_typing = true - --- Enable cursor particles in neovide -g.neovide_cursor_vfx_mode = "railgun" - -- Floating window transparency o.winblend = 10 @@ -33,8 +24,8 @@ o.hidden = true o.number = true o.guicursor = table.concat({ - "i:ver1", -- Vertical bar cursor in insert mode - "a:blinkon1", -- Blinking cursor in all modes + "i:ver1", -- Vertical bar cursor in insert mode + "a:blinkon1", -- Blinking cursor in all modes }, ",") -- Enable global statusline @@ -59,9 +50,9 @@ o.smartindent = true -- Firenvim settings vim.g.firenvim_config = { - localSettings = { - [".*"] = { - takeOver = "never", - }, - }, + localSettings = { + [".*"] = { + takeOver = "never", + }, + }, } From 465841dc254b5762d357cd4148faf4739c6af333 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Jun 2023 14:44:09 +0300 Subject: [PATCH 1927/2667] Testing rouge highlighting in forgejo --- README.adoc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.adoc b/README.adoc index a83478dc..bfe80acc 100644 --- a/README.adoc +++ b/README.adoc @@ -22,3 +22,14 @@ but it is also mirrored to: If you have any ideas for improvements, questions or anything of this sort, you can open an issue or a pull request at my git server (registrations open for anyone), or any of the mirrors. + +== Testing rouge syntax highlighter with AsciiDoc + +.My ZSH aliases +[%collapsible] +==== +[source,zsh] +---- +include::home/.config/zsh/04-aliases.zsh[] +---- +==== From 764f2ea7f0ac7a1f35159d1f50df34fd8ce5504c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Jun 2023 14:44:09 +0300 Subject: [PATCH 1928/2667] Testing rouge highlighting in forgejo --- README.adoc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.adoc b/README.adoc index a83478dc..bfe80acc 100644 --- a/README.adoc +++ b/README.adoc @@ -22,3 +22,14 @@ but it is also mirrored to: If you have any ideas for improvements, questions or anything of this sort, you can open an issue or a pull request at my git server (registrations open for anyone), or any of the mirrors. + +== Testing rouge syntax highlighter with AsciiDoc + +.My ZSH aliases +[%collapsible] +==== +[source,zsh] +---- +include::home/.config/zsh/04-aliases.zsh[] +---- +==== From dbd364d9c63c1437e67f414e12f42f866e6519b4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Jun 2023 14:44:52 +0300 Subject: [PATCH 1929/2667] Fix path --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index bfe80acc..fd30524e 100644 --- a/README.adoc +++ b/README.adoc @@ -30,6 +30,6 @@ sort, you can open an issue or a pull request at my git server ==== [source,zsh] ---- -include::home/.config/zsh/04-aliases.zsh[] +include::./home/.config/zsh/04-aliases.zsh[] ---- ==== From c0f87b2b42139ba533dd44d625106e8707e69d6d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Jun 2023 14:44:52 +0300 Subject: [PATCH 1930/2667] Fix path --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index bfe80acc..fd30524e 100644 --- a/README.adoc +++ b/README.adoc @@ -30,6 +30,6 @@ sort, you can open an issue or a pull request at my git server ==== [source,zsh] ---- -include::home/.config/zsh/04-aliases.zsh[] +include::./home/.config/zsh/04-aliases.zsh[] ---- ==== From d4dedd038f7e6c0a2d7c886d645df38cd26c6ece Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Jun 2023 14:49:08 +0300 Subject: [PATCH 1931/2667] Include file from URI instead --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index fd30524e..1d663440 100644 --- a/README.adoc +++ b/README.adoc @@ -30,6 +30,6 @@ sort, you can open an issue or a pull request at my git server ==== [source,zsh] ---- -include::./home/.config/zsh/04-aliases.zsh[] +include::https://git.korhonen.cc/FunctionalHacker/dotfiles/raw/branch/main/home/.config/zsh/04-aliases.zsh[] ---- ==== From 89d4ea3737dff4af337f72fd3ac6483b7a331877 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Jun 2023 14:49:08 +0300 Subject: [PATCH 1932/2667] Include file from URI instead --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index fd30524e..1d663440 100644 --- a/README.adoc +++ b/README.adoc @@ -30,6 +30,6 @@ sort, you can open an issue or a pull request at my git server ==== [source,zsh] ---- -include::./home/.config/zsh/04-aliases.zsh[] +include::https://git.korhonen.cc/FunctionalHacker/dotfiles/raw/branch/main/home/.config/zsh/04-aliases.zsh[] ---- ==== From ac829ff2a02d66ad18924af0ba6a9bad14a5f2a9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 27 Jun 2023 12:39:51 +0300 Subject: [PATCH 1933/2667] Nvim: Move some keybinds to which-key --- home/.config/nvim/init.lua | 1 - home/.config/nvim/lua/keybinds.lua | 11 ----------- home/.config/nvim/lua/plugins/init.lua | 2 +- home/.config/nvim/lua/plugins/mason.lua | 2 +- home/.config/nvim/lua/plugins/which-key.lua | 17 +++++++++++++++++ 5 files changed, 19 insertions(+), 14 deletions(-) delete mode 100644 home/.config/nvim/lua/keybinds.lua create mode 100644 home/.config/nvim/lua/plugins/which-key.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 4c3c6e3f..33c92035 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,4 +1,3 @@ -require("keybinds") require("settings") require("neovide") require("highlight_yank") diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua deleted file mode 100644 index 07bc29de..00000000 --- a/home/.config/nvim/lua/keybinds.lua +++ /dev/null @@ -1,11 +0,0 @@ -local map = vim.keymap.set - --- Navigate between buffers -map("n", "", vim.cmd.bn, { silent = true }) -map("n", "", vim.cmd.bp, { silent = true }) - --- Run Neoformat -map("n", "", vim.cmd.Neoformat, {}) - --- Exit terminal insert mode with esc -map("t", "", "", {}) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 1c923fd2..479e6a03 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -79,7 +79,7 @@ local plugins = { "lambdalisue/suda.vim", -- Display possible keybinds - { "folke/which-key.nvim", config = true }, + { "folke/which-key.nvim", config = require("plugins.which-key") }, -- Package manager for LSP servers, DAP adapters etc. { diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 95d5b475..0249773e 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -83,7 +83,7 @@ function m.map_keys() rn = { vim.lsp.buf.rename, "Rename symbol" }, ca = { vim.lsp.buf.code_action, "Code action" }, e = { vim.diagnostic.open_float, "Open diagnostics" }, - f = { vim.lsp.buf.format, "Format" }, + F = { vim.lsp.buf.format, "Format with LSP" }, }, K = { vim.lsp.buf.hover, "Hover" }, ["["] = { d = { vim.diagnostic.goto_prev, "Previous diagnostic" } }, diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua new file mode 100644 index 00000000..0d4bfe6b --- /dev/null +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -0,0 +1,17 @@ +return function() + local wk = require("which-key") + wk.setup({}) + + wk.register({ + f = { "Neoformat", "Format with Neoformat" }, + h = { "nohlsearch", "Turn off search highlight" }, + }, { prefix = "" }) + + wk.register({ + [""] = { "bnext", "Next buffer" }, + [""] = { "bprevious", "Previous buffer" }, + }) + + -- Exit terminal insert mode with esc + vim.keymap.set("t", "", "", {}) +end From e141efbbe4f6ceeff555b7198f81380571693df3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 27 Jun 2023 12:39:51 +0300 Subject: [PATCH 1934/2667] Nvim: Move some keybinds to which-key --- home/.config/nvim/init.lua | 1 - home/.config/nvim/lua/keybinds.lua | 11 ----------- home/.config/nvim/lua/plugins/init.lua | 2 +- home/.config/nvim/lua/plugins/mason.lua | 2 +- home/.config/nvim/lua/plugins/which-key.lua | 17 +++++++++++++++++ 5 files changed, 19 insertions(+), 14 deletions(-) delete mode 100644 home/.config/nvim/lua/keybinds.lua create mode 100644 home/.config/nvim/lua/plugins/which-key.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 4c3c6e3f..33c92035 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,4 +1,3 @@ -require("keybinds") require("settings") require("neovide") require("highlight_yank") diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua deleted file mode 100644 index 07bc29de..00000000 --- a/home/.config/nvim/lua/keybinds.lua +++ /dev/null @@ -1,11 +0,0 @@ -local map = vim.keymap.set - --- Navigate between buffers -map("n", "", vim.cmd.bn, { silent = true }) -map("n", "", vim.cmd.bp, { silent = true }) - --- Run Neoformat -map("n", "", vim.cmd.Neoformat, {}) - --- Exit terminal insert mode with esc -map("t", "", "", {}) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 1c923fd2..479e6a03 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -79,7 +79,7 @@ local plugins = { "lambdalisue/suda.vim", -- Display possible keybinds - { "folke/which-key.nvim", config = true }, + { "folke/which-key.nvim", config = require("plugins.which-key") }, -- Package manager for LSP servers, DAP adapters etc. { diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 95d5b475..0249773e 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -83,7 +83,7 @@ function m.map_keys() rn = { vim.lsp.buf.rename, "Rename symbol" }, ca = { vim.lsp.buf.code_action, "Code action" }, e = { vim.diagnostic.open_float, "Open diagnostics" }, - f = { vim.lsp.buf.format, "Format" }, + F = { vim.lsp.buf.format, "Format with LSP" }, }, K = { vim.lsp.buf.hover, "Hover" }, ["["] = { d = { vim.diagnostic.goto_prev, "Previous diagnostic" } }, diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua new file mode 100644 index 00000000..0d4bfe6b --- /dev/null +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -0,0 +1,17 @@ +return function() + local wk = require("which-key") + wk.setup({}) + + wk.register({ + f = { "Neoformat", "Format with Neoformat" }, + h = { "nohlsearch", "Turn off search highlight" }, + }, { prefix = "" }) + + wk.register({ + [""] = { "bnext", "Next buffer" }, + [""] = { "bprevious", "Previous buffer" }, + }) + + -- Exit terminal insert mode with esc + vim.keymap.set("t", "", "", {}) +end From 3a8a2e2d768a92499d0e29f40428348bd1f47595 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 27 Jun 2023 12:50:11 +0300 Subject: [PATCH 1935/2667] Remove asciidoc test --- README.adoc | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/README.adoc b/README.adoc index 1d663440..a83478dc 100644 --- a/README.adoc +++ b/README.adoc @@ -22,14 +22,3 @@ but it is also mirrored to: If you have any ideas for improvements, questions or anything of this sort, you can open an issue or a pull request at my git server (registrations open for anyone), or any of the mirrors. - -== Testing rouge syntax highlighter with AsciiDoc - -.My ZSH aliases -[%collapsible] -==== -[source,zsh] ----- -include::https://git.korhonen.cc/FunctionalHacker/dotfiles/raw/branch/main/home/.config/zsh/04-aliases.zsh[] ----- -==== From 4b3fde70d76805bcf6e5e70fd15995559d4d2143 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 27 Jun 2023 12:50:11 +0300 Subject: [PATCH 1936/2667] Remove asciidoc test --- README.adoc | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/README.adoc b/README.adoc index 1d663440..a83478dc 100644 --- a/README.adoc +++ b/README.adoc @@ -22,14 +22,3 @@ but it is also mirrored to: If you have any ideas for improvements, questions or anything of this sort, you can open an issue or a pull request at my git server (registrations open for anyone), or any of the mirrors. - -== Testing rouge syntax highlighter with AsciiDoc - -.My ZSH aliases -[%collapsible] -==== -[source,zsh] ----- -include::https://git.korhonen.cc/FunctionalHacker/dotfiles/raw/branch/main/home/.config/zsh/04-aliases.zsh[] ----- -==== From e156b288436fd4c00adc297c4b8ab3200c4c41aa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 5 Jul 2023 09:35:10 +0300 Subject: [PATCH 1937/2667] Nvim: Update jdtls version --- home/.config/nvim/ftplugin/java.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index a799e52e..17755e77 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -17,7 +17,7 @@ require("jdtls").start_or_attach({ "--add-opens", "java.base/java.lang=ALL-UNNAMED", "-jar", - nvim_local_dir .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar", + nvim_local_dir .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.500.v20230622-2056.jar", "-configuration", nvim_local_dir .. "/mason/packages/jdtls/config_linux", "-data", From 37b5dd3bd528f200dec7a8da19f02f4cb0f76938 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 5 Jul 2023 09:35:10 +0300 Subject: [PATCH 1938/2667] Nvim: Update jdtls version --- home/.config/nvim/ftplugin/java.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index a799e52e..17755e77 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -17,7 +17,7 @@ require("jdtls").start_or_attach({ "--add-opens", "java.base/java.lang=ALL-UNNAMED", "-jar", - nvim_local_dir .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar", + nvim_local_dir .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.500.v20230622-2056.jar", "-configuration", nvim_local_dir .. "/mason/packages/jdtls/config_linux", "-data", From db136a7313ee7d9c8fc1c14bc1428f3ea1b63f37 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 11 Jul 2023 10:39:32 +0300 Subject: [PATCH 1939/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 25d48954..64276265 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 25d48954b403126dcd71d59889bcb7bfa0715821 +Subproject commit 6427626539cc00b3c312c19a34d4fdf3eb7805e5 From c56c2473a6d01770bcc0ef95b9d39f3d5eeda362 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 11 Jul 2023 10:39:32 +0300 Subject: [PATCH 1940/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 25d48954..64276265 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 25d48954b403126dcd71d59889bcb7bfa0715821 +Subproject commit 6427626539cc00b3c312c19a34d4fdf3eb7805e5 From e0a026afb32fbe544ef9ae6823a57c8999b3f9e6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 11 Jul 2023 14:23:13 +0300 Subject: [PATCH 1941/2667] Add chext zsh function --- home/.config/asd | 0 home/.config/zsh/04-aliases.zsh | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 home/.config/asd diff --git a/home/.config/asd b/home/.config/asd new file mode 100644 index 00000000..e69de29b diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 16d4dfe4..7ec5d723 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -300,3 +300,32 @@ clock() { sleep 0.1 done } + +# Change file extension made easy +chext() { + file="$1" + new_ext="$2" + dest="${file%.*}.$new_ext" + + help() { + printf "Change file extension\nUsage: chext file new_extension\nFor example: chext my_script.sh zsh" + } + + if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then + help + return + fi + + if [ $# -lt 2 ]; then + help + return 1 + fi + + if [ ! -e "$1" ]; then + echo "$file: no such file or directory" + help + return 1 + fi + + mv "$file" "$dest" +} From 4d5a0b8f6ee6618624a83e1016e952e1474babe0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 11 Jul 2023 14:23:13 +0300 Subject: [PATCH 1942/2667] Add chext zsh function --- home/.config/asd | 0 home/.config/zsh/04-aliases.zsh | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 home/.config/asd diff --git a/home/.config/asd b/home/.config/asd new file mode 100644 index 00000000..e69de29b diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 16d4dfe4..7ec5d723 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -300,3 +300,32 @@ clock() { sleep 0.1 done } + +# Change file extension made easy +chext() { + file="$1" + new_ext="$2" + dest="${file%.*}.$new_ext" + + help() { + printf "Change file extension\nUsage: chext file new_extension\nFor example: chext my_script.sh zsh" + } + + if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then + help + return + fi + + if [ $# -lt 2 ]; then + help + return 1 + fi + + if [ ! -e "$1" ]; then + echo "$file: no such file or directory" + help + return 1 + fi + + mv "$file" "$dest" +} From 4f655af6daf36eac1d6577806e87d00bf25365de Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Jul 2023 13:46:51 +0300 Subject: [PATCH 1943/2667] Add caddy handler for korhonen.social --- docker/caddy/Caddyfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 716ea767..30b2ef7d 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -135,3 +135,7 @@ korhonen.cc, *.korhonen.cc { redir https://korhonen.cc/404.html 301 } } + +korhonen.social { + respond "Kbin instance coming soon" +} From 28b9999f3993092b1af6a62fcb36eacacd8660dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Jul 2023 13:46:51 +0300 Subject: [PATCH 1944/2667] Add caddy handler for korhonen.social --- docker/caddy/Caddyfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 716ea767..30b2ef7d 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -135,3 +135,7 @@ korhonen.cc, *.korhonen.cc { redir https://korhonen.cc/404.html 301 } } + +korhonen.social { + respond "Kbin instance coming soon" +} From 300da07721f446d3597e522c46b00616a6531d6c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Jul 2023 13:47:14 +0300 Subject: [PATCH 1945/2667] Add snapdrop --- docker/caddy/Caddyfile | 5 +++++ docker/snapdrop/docker-compose.toml | 8 ++++++++ 2 files changed, 13 insertions(+) create mode 100644 docker/snapdrop/docker-compose.toml diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 30b2ef7d..68f971a5 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -130,6 +130,11 @@ korhonen.cc, *.korhonen.cc { reverse_proxy grafana:3000 } + @snapdrop host snapdrop.korhonen.cc + handle @snapdrop { + reverse_proxy snapdrop + } + # Fallback for unhandled domains handle { redir https://korhonen.cc/404.html 301 diff --git a/docker/snapdrop/docker-compose.toml b/docker/snapdrop/docker-compose.toml new file mode 100644 index 00000000..3a61e977 --- /dev/null +++ b/docker/snapdrop/docker-compose.toml @@ -0,0 +1,8 @@ +[services.snapdrop] +image = "linuxserver/snapdrop" +container_name = "snapdrop" +restart = "unless-stopped" +networks = ["proxy"] + +[networks.proxy] +external = true From 33ce1106e74e3988eee1bc53a1bf2b062e085549 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Jul 2023 13:47:14 +0300 Subject: [PATCH 1946/2667] Add snapdrop --- docker/caddy/Caddyfile | 5 +++++ docker/snapdrop/docker-compose.toml | 8 ++++++++ 2 files changed, 13 insertions(+) create mode 100644 docker/snapdrop/docker-compose.toml diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 30b2ef7d..68f971a5 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -130,6 +130,11 @@ korhonen.cc, *.korhonen.cc { reverse_proxy grafana:3000 } + @snapdrop host snapdrop.korhonen.cc + handle @snapdrop { + reverse_proxy snapdrop + } + # Fallback for unhandled domains handle { redir https://korhonen.cc/404.html 301 diff --git a/docker/snapdrop/docker-compose.toml b/docker/snapdrop/docker-compose.toml new file mode 100644 index 00000000..3a61e977 --- /dev/null +++ b/docker/snapdrop/docker-compose.toml @@ -0,0 +1,8 @@ +[services.snapdrop] +image = "linuxserver/snapdrop" +container_name = "snapdrop" +restart = "unless-stopped" +networks = ["proxy"] + +[networks.proxy] +external = true From 67ddd73085a9bc5ebc0f9f0ac03d8e94384e4345 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 14 Aug 2023 14:17:22 +0300 Subject: [PATCH 1947/2667] Nvim: update jdtls version --- home/.config/nvim/ftplugin/java.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 17755e77..aa133fb1 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -17,7 +17,7 @@ require("jdtls").start_or_attach({ "--add-opens", "java.base/java.lang=ALL-UNNAMED", "-jar", - nvim_local_dir .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.500.v20230622-2056.jar", + nvim_local_dir .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar", "-configuration", nvim_local_dir .. "/mason/packages/jdtls/config_linux", "-data", From fd625a1d8fda5a2c374c5bed7d066bdbd7018af9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 14 Aug 2023 14:17:22 +0300 Subject: [PATCH 1948/2667] Nvim: update jdtls version --- home/.config/nvim/ftplugin/java.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 17755e77..aa133fb1 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -17,7 +17,7 @@ require("jdtls").start_or_attach({ "--add-opens", "java.base/java.lang=ALL-UNNAMED", "-jar", - nvim_local_dir .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.500.v20230622-2056.jar", + nvim_local_dir .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar", "-configuration", nvim_local_dir .. "/mason/packages/jdtls/config_linux", "-data", From 81b0abe8d13b4b55badf0b28161139050e39669f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 21 Aug 2023 13:20:16 +0300 Subject: [PATCH 1949/2667] Change from snapdrop to pairdrop --- docker/caddy/Caddyfile | 6 +++--- docker/drop/docker-compose.toml | 9 +++++++++ docker/snapdrop/docker-compose.toml | 8 -------- 3 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 docker/drop/docker-compose.toml delete mode 100644 docker/snapdrop/docker-compose.toml diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 68f971a5..ca515933 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -130,9 +130,9 @@ korhonen.cc, *.korhonen.cc { reverse_proxy grafana:3000 } - @snapdrop host snapdrop.korhonen.cc - handle @snapdrop { - reverse_proxy snapdrop + @drop host drop.korhonen.cc + handle @drop { + reverse_proxy drop:3000 } # Fallback for unhandled domains diff --git a/docker/drop/docker-compose.toml b/docker/drop/docker-compose.toml new file mode 100644 index 00000000..6d316a1a --- /dev/null +++ b/docker/drop/docker-compose.toml @@ -0,0 +1,9 @@ +[services.drop] +image = "lscr.io/linuxserver/pairdrop" +container_name = "drop" +restart = "unless-stopped" +networks = ["proxy"] +environment = ["TZ=Europe/Helsinki"] + +[networks.proxy] +external = true diff --git a/docker/snapdrop/docker-compose.toml b/docker/snapdrop/docker-compose.toml deleted file mode 100644 index 3a61e977..00000000 --- a/docker/snapdrop/docker-compose.toml +++ /dev/null @@ -1,8 +0,0 @@ -[services.snapdrop] -image = "linuxserver/snapdrop" -container_name = "snapdrop" -restart = "unless-stopped" -networks = ["proxy"] - -[networks.proxy] -external = true From 2df8cd814875f451ec30f9146cb26361a1726cdd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 21 Aug 2023 13:20:16 +0300 Subject: [PATCH 1950/2667] Change from snapdrop to pairdrop --- docker/caddy/Caddyfile | 6 +++--- docker/drop/docker-compose.toml | 9 +++++++++ docker/snapdrop/docker-compose.toml | 8 -------- 3 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 docker/drop/docker-compose.toml delete mode 100644 docker/snapdrop/docker-compose.toml diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 68f971a5..ca515933 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -130,9 +130,9 @@ korhonen.cc, *.korhonen.cc { reverse_proxy grafana:3000 } - @snapdrop host snapdrop.korhonen.cc - handle @snapdrop { - reverse_proxy snapdrop + @drop host drop.korhonen.cc + handle @drop { + reverse_proxy drop:3000 } # Fallback for unhandled domains diff --git a/docker/drop/docker-compose.toml b/docker/drop/docker-compose.toml new file mode 100644 index 00000000..6d316a1a --- /dev/null +++ b/docker/drop/docker-compose.toml @@ -0,0 +1,9 @@ +[services.drop] +image = "lscr.io/linuxserver/pairdrop" +container_name = "drop" +restart = "unless-stopped" +networks = ["proxy"] +environment = ["TZ=Europe/Helsinki"] + +[networks.proxy] +external = true diff --git a/docker/snapdrop/docker-compose.toml b/docker/snapdrop/docker-compose.toml deleted file mode 100644 index 3a61e977..00000000 --- a/docker/snapdrop/docker-compose.toml +++ /dev/null @@ -1,8 +0,0 @@ -[services.snapdrop] -image = "linuxserver/snapdrop" -container_name = "snapdrop" -restart = "unless-stopped" -networks = ["proxy"] - -[networks.proxy] -external = true From 97438e63cb0bc378c52d79efb9cd4e34c1133cc9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 21 Aug 2023 13:20:31 +0300 Subject: [PATCH 1951/2667] Fix jellyfin hw transcoding --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index c2eef2ac..db635394 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -14,7 +14,7 @@ volumes = [ ] devices = [ "/dev/dri/renderD128:/dev/dri/renderD128", - "/dev/dri/card0:/dev/dri/card0", + "/dev/dri/card1:/dev/dri/card0", ] [networks.proxy] From 525031bd0a29f2c229485d2feef3aaa5dc17b72b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 21 Aug 2023 13:20:31 +0300 Subject: [PATCH 1952/2667] Fix jellyfin hw transcoding --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index c2eef2ac..db635394 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -14,7 +14,7 @@ volumes = [ ] devices = [ "/dev/dri/renderD128:/dev/dri/renderD128", - "/dev/dri/card0:/dev/dri/card0", + "/dev/dri/card1:/dev/dri/card0", ] [networks.proxy] From 0e8d8d3160db97b1faac3d76fe4de59227222746 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 21 Aug 2023 15:26:33 +0300 Subject: [PATCH 1953/2667] Nvim: add keybinds to move to next/prev hunk --- home/.config/nvim/lua/plugins/which-key.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 0d4bfe6b..62ad276c 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -1,5 +1,6 @@ return function() local wk = require("which-key") + local gitsigns = require("gitsigns") wk.setup({}) wk.register({ @@ -10,6 +11,8 @@ return function() wk.register({ [""] = { "bnext", "Next buffer" }, [""] = { "bprevious", "Previous buffer" }, + ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } }, + ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, }) -- Exit terminal insert mode with esc From b8818d5439eebe9ba6cac5d08a9a2f07d283e2a2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 21 Aug 2023 15:26:33 +0300 Subject: [PATCH 1954/2667] Nvim: add keybinds to move to next/prev hunk --- home/.config/nvim/lua/plugins/which-key.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 0d4bfe6b..62ad276c 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -1,5 +1,6 @@ return function() local wk = require("which-key") + local gitsigns = require("gitsigns") wk.setup({}) wk.register({ @@ -10,6 +11,8 @@ return function() wk.register({ [""] = { "bnext", "Next buffer" }, [""] = { "bprevious", "Previous buffer" }, + ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } }, + ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, }) -- Exit terminal insert mode with esc From a489d13bf05fca194879020e854628b2179aaf13 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 21 Aug 2023 16:58:18 +0300 Subject: [PATCH 1955/2667] Git: add recommit alias --- home/.config/git/config | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/git/config b/home/.config/git/config index 81caa661..7ed9473b 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -46,6 +46,7 @@ rebase = merges mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 upstream = !git push -u origin HEAD sync = !git pull && git push +recommit = !git commit -eF $(git rev-parse --git-dir)/COMMIT_EDITMSG [color] pager = no From 09b1a3a47a2381c0995547f1476d97ad0efdbbac Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 21 Aug 2023 16:58:18 +0300 Subject: [PATCH 1956/2667] Git: add recommit alias --- home/.config/git/config | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/git/config b/home/.config/git/config index 81caa661..7ed9473b 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -46,6 +46,7 @@ rebase = merges mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 upstream = !git push -u origin HEAD sync = !git pull && git push +recommit = !git commit -eF $(git rev-parse --git-dir)/COMMIT_EDITMSG [color] pager = no From e6b348bda0db9b0d0da7eabedda6c2bd6c272b15 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 5 Sep 2023 10:22:09 +0300 Subject: [PATCH 1957/2667] Nvim: fixes to jdtls setup Added runtimes and fixed lsp signature plugin --- home/.config/nvim/ftplugin/java.lua | 16 ++++++++++++++++ home/.config/nvim/lua/plugins/init.lua | 9 ++++++++- home/.config/nvim/lua/plugins/mason.lua | 4 ++-- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index aa133fb1..698e54e2 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -23,6 +23,22 @@ require("jdtls").start_or_attach({ "-data", workspace_dir, }, + settings = { java = { signatureHelp = { enabled = true } } }, + completion = { favoriteStaticMembers = { "java.text.MessageFormat.format" } }, + runtimes = { + { + name = "JavaSE-1.8", + path = "/usr/lib/jvm/java-8-openjdk-amd64/", + }, + { + name = "JavaSE-11", + path = "/usr/lib/jvm/java-11-openjdk-amd64/", + }, + { + name = "JavaSE-19", + path = "/usr/lib/jvm/java-19-openjdk-amd64/", + }, + }, }) require("plugins.mason").map_keys() diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 479e6a03..96484bc7 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -99,7 +99,14 @@ local plugins = { { "mfussenegger/nvim-dap", config = require("plugins.dap") }, -- Display function signature - "ray-x/lsp_signature.nvim", + { + "ray-x/lsp_signature.nvim", + event = "VeryLazy", + opts = { always_trigger = true }, + config = function(_, opts) + require("lsp_signature").setup(opts) + end, + }, -- Snippets plugin { diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 0249773e..feded49a 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -57,8 +57,7 @@ function m.setup() end function m.map_keys() - local wk = require("which-key") - wk.register({ + require("which-key").register({ g = { name = "Go to", d = { vim.lsp.buf.definition, "Definition" }, @@ -79,6 +78,7 @@ function m.map_keys() "List folders", }, }, + k = { vim.lsp.buf.signature_help, "Signature help" }, D = { vim.lsp.buf.type_definition, "Type definition" }, rn = { vim.lsp.buf.rename, "Rename symbol" }, ca = { vim.lsp.buf.code_action, "Code action" }, From a6e95a47196c2a23e0ea19b8620aa6a0f475d329 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 5 Sep 2023 10:22:09 +0300 Subject: [PATCH 1958/2667] Nvim: fixes to jdtls setup Added runtimes and fixed lsp signature plugin --- home/.config/nvim/ftplugin/java.lua | 16 ++++++++++++++++ home/.config/nvim/lua/plugins/init.lua | 9 ++++++++- home/.config/nvim/lua/plugins/mason.lua | 4 ++-- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index aa133fb1..698e54e2 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -23,6 +23,22 @@ require("jdtls").start_or_attach({ "-data", workspace_dir, }, + settings = { java = { signatureHelp = { enabled = true } } }, + completion = { favoriteStaticMembers = { "java.text.MessageFormat.format" } }, + runtimes = { + { + name = "JavaSE-1.8", + path = "/usr/lib/jvm/java-8-openjdk-amd64/", + }, + { + name = "JavaSE-11", + path = "/usr/lib/jvm/java-11-openjdk-amd64/", + }, + { + name = "JavaSE-19", + path = "/usr/lib/jvm/java-19-openjdk-amd64/", + }, + }, }) require("plugins.mason").map_keys() diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 479e6a03..96484bc7 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -99,7 +99,14 @@ local plugins = { { "mfussenegger/nvim-dap", config = require("plugins.dap") }, -- Display function signature - "ray-x/lsp_signature.nvim", + { + "ray-x/lsp_signature.nvim", + event = "VeryLazy", + opts = { always_trigger = true }, + config = function(_, opts) + require("lsp_signature").setup(opts) + end, + }, -- Snippets plugin { diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 0249773e..feded49a 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -57,8 +57,7 @@ function m.setup() end function m.map_keys() - local wk = require("which-key") - wk.register({ + require("which-key").register({ g = { name = "Go to", d = { vim.lsp.buf.definition, "Definition" }, @@ -79,6 +78,7 @@ function m.map_keys() "List folders", }, }, + k = { vim.lsp.buf.signature_help, "Signature help" }, D = { vim.lsp.buf.type_definition, "Type definition" }, rn = { vim.lsp.buf.rename, "Rename symbol" }, ca = { vim.lsp.buf.code_action, "Code action" }, From 42c79e8d656b93e0d2d9e236ef595fe0855c7b56 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Sep 2023 12:15:41 +0300 Subject: [PATCH 1959/2667] Switch from exa to eza (active fork) and enable git,icons --- home/.config/zsh/02-env.zsh | 4 ++-- home/.config/zsh/04-aliases.zsh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 83f62c83..2222ab78 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -41,7 +41,7 @@ export GOPATH=~/.go export FD_COMMAND='fd -HLt' export FZF_DEFAULT_COMMAND="$FD_COMMAND f" export FZF_ALT_C_COMMAND="$FD_COMMAND d" -export FZF_ALT_C_OPTS="--preview 'exa -l {}'" +export FZF_ALT_C_OPTS="--preview 'eza -l {}'" export FZF_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND --strip-cwd-prefix" @@ -77,7 +77,7 @@ if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then fi gpgconf --launch gpg-agent {%@@ elif distro_id == "termux" @@%} -eval $(okc-ssh-agent) > /dev/null +eval $(okc-ssh-agent) >/dev/null {%@@ endif @@%} # Enable grc colorization of supported commands diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 7ec5d723..78ef99ea 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -10,7 +10,7 @@ alias gpush='git push' forgit_revert_commit=fgrc # Modern replacement for ls -alias ls='exa' +alias ls='eza --icons --git' # Enable command not found handler {%@@ if distro_id == "arch" @@%} From b1da4472cd60d4088b022eb57d0c9559625c58c0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Sep 2023 12:15:41 +0300 Subject: [PATCH 1960/2667] Switch from exa to eza (active fork) and enable git,icons --- home/.config/zsh/02-env.zsh | 4 ++-- home/.config/zsh/04-aliases.zsh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 83f62c83..2222ab78 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -41,7 +41,7 @@ export GOPATH=~/.go export FD_COMMAND='fd -HLt' export FZF_DEFAULT_COMMAND="$FD_COMMAND f" export FZF_ALT_C_COMMAND="$FD_COMMAND d" -export FZF_ALT_C_OPTS="--preview 'exa -l {}'" +export FZF_ALT_C_OPTS="--preview 'eza -l {}'" export FZF_DEFAULT_OPTS='-m --ansi --bind ctrl-a:toggle-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND --strip-cwd-prefix" @@ -77,7 +77,7 @@ if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then fi gpgconf --launch gpg-agent {%@@ elif distro_id == "termux" @@%} -eval $(okc-ssh-agent) > /dev/null +eval $(okc-ssh-agent) >/dev/null {%@@ endif @@%} # Enable grc colorization of supported commands diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 7ec5d723..78ef99ea 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -10,7 +10,7 @@ alias gpush='git push' forgit_revert_commit=fgrc # Modern replacement for ls -alias ls='exa' +alias ls='eza --icons --git' # Enable command not found handler {%@@ if distro_id == "arch" @@%} From 958178ca85f75f37236c76c1eb71b7688547cbce Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Sep 2023 15:19:15 +0300 Subject: [PATCH 1961/2667] Fix repository URL in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1f3818dd..a75bf0a9 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "gitea:/FunctionalHacker/dotfiles" + "url": "https://git.korhonen.cc/FunctionalHacker/dotfiles" }, "author": "", "license": "MIT", From c06876a990600325fb930f68174babb9c3ac7b3e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Sep 2023 15:19:15 +0300 Subject: [PATCH 1962/2667] Fix repository URL in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1f3818dd..a75bf0a9 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "gitea:/FunctionalHacker/dotfiles" + "url": "https://git.korhonen.cc/FunctionalHacker/dotfiles" }, "author": "", "license": "MIT", From 8cf22d17f8a68a2c02d7a7bc0f7e61c1507a0a1e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Sep 2023 15:19:57 +0300 Subject: [PATCH 1963/2667] Add update dotfiles alias --- home/.config/zsh/04-aliases.zsh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 78ef99ea..39c7849f 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -166,6 +166,7 @@ update() { docker-update {%@@ endif @@%} plugins + dotfiles } packages() { @@ -209,6 +210,11 @@ update() { docker system prune -af --volumes } + dotfiles() { + dotgit pull + dotdrop install + } + {%@@ endif @@%} case "$1" in all) From a8eed9e9855798484c2e83cb75f79390e30c3f6f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Sep 2023 15:19:57 +0300 Subject: [PATCH 1964/2667] Add update dotfiles alias --- home/.config/zsh/04-aliases.zsh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 78ef99ea..39c7849f 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -166,6 +166,7 @@ update() { docker-update {%@@ endif @@%} plugins + dotfiles } packages() { @@ -209,6 +210,11 @@ update() { docker system prune -af --volumes } + dotfiles() { + dotgit pull + dotdrop install + } + {%@@ endif @@%} case "$1" in all) From 85203e781107493cd2116b05dafe7daf39db20eb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Sep 2023 15:21:19 +0300 Subject: [PATCH 1965/2667] Fix update dotfiles alias --- home/.config/zsh/04-aliases.zsh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 39c7849f..abc69a66 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -209,17 +209,20 @@ update() { cd $prevpwddocker docker system prune -af --volumes } + {%@@ endif @@%} dotfiles() { dotgit pull dotdrop install } - {%@@ endif @@%} case "$1" in all) all ;; + dotfiles) + dotfiles + ;; plugins) plugins ;; From be68ab02c141b5d188ed93805f977eb2f29a8046 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Sep 2023 15:21:19 +0300 Subject: [PATCH 1966/2667] Fix update dotfiles alias --- home/.config/zsh/04-aliases.zsh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 39c7849f..abc69a66 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -209,17 +209,20 @@ update() { cd $prevpwddocker docker system prune -af --volumes } + {%@@ endif @@%} dotfiles() { dotgit pull dotdrop install } - {%@@ endif @@%} case "$1" in all) all ;; + dotfiles) + dotfiles + ;; plugins) plugins ;; From 1b53619a4790e2d10747dcfc918fdf9605cf2bf7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Sep 2023 15:33:01 +0300 Subject: [PATCH 1967/2667] Add completions for ZSH update alias --- home/.config/zsh/04-aliases.zsh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index abc69a66..0ee8c835 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -240,6 +240,29 @@ update() { esac } +_update() { + local commands=( + "all:Update everything" + "dotfiles:Update dotfiles" + "plugins:Update plugins for NeoVim and ZSH" + {%@@ if profile == "Moria" @@%} + "repo:Update packages in Korhonen AUR repository" + "docker:Update all Docker containers" + {%@@ endif @@%} + ) + + _arguments \ + '1: :->command' \ + '*:: :->args' + + case "$state" in + (command) + _describe -t commands 'available commands' commands + ;; + esac +} +compdef _update update + # turn on usb tethering on my android phone tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/null } From ae5fd10a44673206f2a5ecedb3fe4becd5f49bec Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Sep 2023 15:33:01 +0300 Subject: [PATCH 1968/2667] Add completions for ZSH update alias --- home/.config/zsh/04-aliases.zsh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index abc69a66..0ee8c835 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -240,6 +240,29 @@ update() { esac } +_update() { + local commands=( + "all:Update everything" + "dotfiles:Update dotfiles" + "plugins:Update plugins for NeoVim and ZSH" + {%@@ if profile == "Moria" @@%} + "repo:Update packages in Korhonen AUR repository" + "docker:Update all Docker containers" + {%@@ endif @@%} + ) + + _arguments \ + '1: :->command' \ + '*:: :->args' + + case "$state" in + (command) + _describe -t commands 'available commands' commands + ;; + esac +} +compdef _update update + # turn on usb tethering on my android phone tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/null } From fae3572178a74851c54c79870b633ad5a11f0d8d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Sep 2023 15:35:20 +0300 Subject: [PATCH 1969/2667] Update alias: return error if unknown option provided --- home/.config/zsh/04-aliases.zsh | 49 ++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 0ee8c835..b3d76f82 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -216,28 +216,33 @@ update() { dotdrop install } - case "$1" in - all) - all - ;; - dotfiles) - dotfiles - ;; - plugins) - plugins - ;; - {%@@ if profile == "Moria" @@%} - docker) - docker-update - ;; - repo) - repo - ;; - {%@@ endif @@%} - *) - packages - ;; - esac + if [ $# -eq 0 ]; then + packages # Update only packages if no option was provided + else + case "$1" in + all) + all + ;; + dotfiles) + dotfiles + ;; + plugins) + plugins + ;; + {%@@ if profile == "Moria" @@%} + docker) + docker-update + ;; + repo) + repo + ;; + {%@@ endif @@%} + *) + echo "Unknown option: $1" + return 1 + ;; + esac + fi } _update() { From 4f3234d98afc264482f666f31c632e6e15e193a7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Sep 2023 15:35:20 +0300 Subject: [PATCH 1970/2667] Update alias: return error if unknown option provided --- home/.config/zsh/04-aliases.zsh | 49 ++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 0ee8c835..b3d76f82 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -216,28 +216,33 @@ update() { dotdrop install } - case "$1" in - all) - all - ;; - dotfiles) - dotfiles - ;; - plugins) - plugins - ;; - {%@@ if profile == "Moria" @@%} - docker) - docker-update - ;; - repo) - repo - ;; - {%@@ endif @@%} - *) - packages - ;; - esac + if [ $# -eq 0 ]; then + packages # Update only packages if no option was provided + else + case "$1" in + all) + all + ;; + dotfiles) + dotfiles + ;; + plugins) + plugins + ;; + {%@@ if profile == "Moria" @@%} + docker) + docker-update + ;; + repo) + repo + ;; + {%@@ endif @@%} + *) + echo "Unknown option: $1" + return 1 + ;; + esac + fi } _update() { From 098f21d4bacbf61c8ceb7e2088fe5b8e524b7e4e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 15 Sep 2023 09:54:36 +0300 Subject: [PATCH 1971/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 64276265..58318fd1 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 6427626539cc00b3c312c19a34d4fdf3eb7805e5 +Subproject commit 58318fd13c6c631de9a9604422fa00529bb8dd3d From 27e7e2458efff207aab68ab72977afec15cb0d2f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 15 Sep 2023 09:54:36 +0300 Subject: [PATCH 1972/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 64276265..58318fd1 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 6427626539cc00b3c312c19a34d4fdf3eb7805e5 +Subproject commit 58318fd13c6c631de9a9604422fa00529bb8dd3d From c9f95761bbf17e6bbd9855da8ae3c090cc1beb1b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Sep 2023 12:54:49 +0300 Subject: [PATCH 1973/2667] Nvim: turn on smart path for telescope --- home/.config/nvim/lua/plugins/telescope.lua | 25 +++++++++++---------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index c647c413..1e806c0e 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,17 +1,18 @@ return function() - local telescope = require("telescope") - local builtin = require("telescope.builtin") + local telescope = require("telescope") + local builtin = require("telescope.builtin") - telescope.setup({ - pickers = { find_files = { find_command = { "fd", "-Ht", "f" } } }, - }) + telescope.setup({ + defaults = { path_display = { "smart" } }, + pickers = { find_files = { find_command = { "fd", "-Ht", "f" } } }, + }) - telescope.load_extension("fzf") - telescope.load_extension("ui-select") - telescope.load_extension("cder") + telescope.load_extension("fzf") + telescope.load_extension("ui-select") + telescope.load_extension("cder") - -- Keybinds - vim.keymap.set("n", "", vim.cmd.Telescope) - vim.keymap.set("n", "", builtin.find_files) - vim.keymap.set("n", "", builtin.live_grep) + -- Keybinds + vim.keymap.set("n", "", vim.cmd.Telescope) + vim.keymap.set("n", "", builtin.find_files) + vim.keymap.set("n", "", builtin.live_grep) end From 370ae38846cbe93b50a326e9696f50333e79b878 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Sep 2023 12:54:49 +0300 Subject: [PATCH 1974/2667] Nvim: turn on smart path for telescope --- home/.config/nvim/lua/plugins/telescope.lua | 25 +++++++++++---------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index c647c413..1e806c0e 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,17 +1,18 @@ return function() - local telescope = require("telescope") - local builtin = require("telescope.builtin") + local telescope = require("telescope") + local builtin = require("telescope.builtin") - telescope.setup({ - pickers = { find_files = { find_command = { "fd", "-Ht", "f" } } }, - }) + telescope.setup({ + defaults = { path_display = { "smart" } }, + pickers = { find_files = { find_command = { "fd", "-Ht", "f" } } }, + }) - telescope.load_extension("fzf") - telescope.load_extension("ui-select") - telescope.load_extension("cder") + telescope.load_extension("fzf") + telescope.load_extension("ui-select") + telescope.load_extension("cder") - -- Keybinds - vim.keymap.set("n", "", vim.cmd.Telescope) - vim.keymap.set("n", "", builtin.find_files) - vim.keymap.set("n", "", builtin.live_grep) + -- Keybinds + vim.keymap.set("n", "", vim.cmd.Telescope) + vim.keymap.set("n", "", builtin.find_files) + vim.keymap.set("n", "", builtin.live_grep) end From 5d998c8138bd10ffe2585c0714b38fd0fa70b0c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Sep 2023 13:01:41 +0300 Subject: [PATCH 1975/2667] Nvim: disable show line in telescope lsp_references --- home/.config/nvim/lua/plugins/telescope.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 1e806c0e..89309321 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -4,7 +4,7 @@ return function() telescope.setup({ defaults = { path_display = { "smart" } }, - pickers = { find_files = { find_command = { "fd", "-Ht", "f" } } }, + pickers = { find_files = { find_command = { "fd", "-Ht", "f" } }, lsp_references = { show_line = false } }, }) telescope.load_extension("fzf") From 78bff95587ff3b836ba55465c4d3837f69ca09b1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Sep 2023 13:01:41 +0300 Subject: [PATCH 1976/2667] Nvim: disable show line in telescope lsp_references --- home/.config/nvim/lua/plugins/telescope.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 1e806c0e..89309321 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -4,7 +4,7 @@ return function() telescope.setup({ defaults = { path_display = { "smart" } }, - pickers = { find_files = { find_command = { "fd", "-Ht", "f" } } }, + pickers = { find_files = { find_command = { "fd", "-Ht", "f" } }, lsp_references = { show_line = false } }, }) telescope.load_extension("fzf") From f3dc5ebd34cbd29baa5f9f6e1dd2d3706088273e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Sep 2023 16:47:46 +0300 Subject: [PATCH 1977/2667] Nvim: use telescope pickers for more lsp stuff --- home/.config/nvim/lua/plugins/mason.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index feded49a..f6848f8a 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -57,13 +57,14 @@ function m.setup() end function m.map_keys() + local telescope_builtin = require("telescope.builtin") require("which-key").register({ g = { name = "Go to", d = { vim.lsp.buf.definition, "Definition" }, D = { vim.lsp.buf.declaration, "Declaration" }, - i = { vim.lsp.buf.implementation, "Implementation" }, - r = { vim.lsp.buf.references, "References" }, + i = { telescope_builtin.lsp_implementations, "Implementation" }, + r = { telescope_builtin.lsp_references, "References" }, }, [""] = { name = "Leader", From 949319f1a9ae7255349d7c4a6bd29b613f2ead0f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Sep 2023 16:47:46 +0300 Subject: [PATCH 1978/2667] Nvim: use telescope pickers for more lsp stuff --- home/.config/nvim/lua/plugins/mason.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index feded49a..f6848f8a 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -57,13 +57,14 @@ function m.setup() end function m.map_keys() + local telescope_builtin = require("telescope.builtin") require("which-key").register({ g = { name = "Go to", d = { vim.lsp.buf.definition, "Definition" }, D = { vim.lsp.buf.declaration, "Declaration" }, - i = { vim.lsp.buf.implementation, "Implementation" }, - r = { vim.lsp.buf.references, "References" }, + i = { telescope_builtin.lsp_implementations, "Implementation" }, + r = { telescope_builtin.lsp_references, "References" }, }, [""] = { name = "Leader", From 794e1b9d5c0d013af6c7ab09b0a2d61eb81c6505 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Sep 2023 16:48:04 +0300 Subject: [PATCH 1979/2667] Nvim: use default path in telescope --- home/.config/nvim/lua/plugins/telescope.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 89309321..9f0f5b64 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -3,8 +3,10 @@ return function() local builtin = require("telescope.builtin") telescope.setup({ - defaults = { path_display = { "smart" } }, - pickers = { find_files = { find_command = { "fd", "-Ht", "f" } }, lsp_references = { show_line = false } }, + pickers = { + find_files = { find_command = { "fd", "-Ht", "f" } }, + lsp_references = { show_line = false }, + }, }) telescope.load_extension("fzf") From c255a9ea7f930db33d734e05f23b63e96f054e70 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Sep 2023 16:48:04 +0300 Subject: [PATCH 1980/2667] Nvim: use default path in telescope --- home/.config/nvim/lua/plugins/telescope.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 89309321..9f0f5b64 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -3,8 +3,10 @@ return function() local builtin = require("telescope.builtin") telescope.setup({ - defaults = { path_display = { "smart" } }, - pickers = { find_files = { find_command = { "fd", "-Ht", "f" } }, lsp_references = { show_line = false } }, + pickers = { + find_files = { find_command = { "fd", "-Ht", "f" } }, + lsp_references = { show_line = false }, + }, }) telescope.load_extension("fzf") From bf072046bfadf0adb6b4e174693e245410bfb3a1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 16:23:27 +0300 Subject: [PATCH 1981/2667] Add mkcd alias --- home/.config/zsh/04-aliases.zsh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index b3d76f82..8c5b7bb5 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -47,6 +47,11 @@ pi() { fi } +mkcd() { + mkdir -p $1 + cd $1 +} + pr() { {%@@ if distro_id == "arch" @@%} SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" From 7895e73ce683049e90b5b88ac80f1226cdc714d3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 16:23:27 +0300 Subject: [PATCH 1982/2667] Add mkcd alias --- home/.config/zsh/04-aliases.zsh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index b3d76f82..8c5b7bb5 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -47,6 +47,11 @@ pi() { fi } +mkcd() { + mkdir -p $1 + cd $1 +} + pr() { {%@@ if distro_id == "arch" @@%} SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" From af6c34baaae8335639337d1824b9d8653ffa468c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 16:23:52 +0300 Subject: [PATCH 1983/2667] Nvim: add ufo fold plugin --- home/.config/nvim/lua/plugins/init.lua | 7 +++++++ home/.config/nvim/lua/plugins/mason.lua | 7 +++++++ home/.config/nvim/lua/plugins/ufo.lua | 7 +++++++ home/.config/nvim/lua/plugins/which-key.lua | 4 ++++ home/.config/nvim/lua/settings.lua | 8 +++++++- 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 home/.config/nvim/lua/plugins/ufo.lua diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 96484bc7..7c817931 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -212,6 +212,13 @@ local plugins = { config = require("plugins.dashboard"), dependencies = { { "kyazdani42/nvim-web-devicons" } }, }, + + -- Better folds + { + "kevinhwang91/nvim-ufo", + dependencies = { "kevinhwang91/promise-async" }, + config = require("plugins.ufo"), + }, } local lazy_opts = {} diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index f6848f8a..df9a76cd 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -12,6 +12,13 @@ function m.setup() -- Inform lsp about completion capabilities from cmp local capabilities = require("cmp_nvim_lsp").default_capabilities() + -- Neovim hasn't added foldingRange to default capabilities, users must add it manually + -- for ufo + capabilities.textDocument.foldingRange = { + dynamicRegistration = false, + lineFoldingOnly = true, + } + require("mason").setup() local mason_lsp = require("mason-lspconfig") mason_lsp.setup() diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua new file mode 100644 index 00000000..dbdce244 --- /dev/null +++ b/home/.config/nvim/lua/plugins/ufo.lua @@ -0,0 +1,7 @@ +return function() + require("ufo").setup({ + close_fold_kinds = { + "imports", + }, + }) +end diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 62ad276c..e7e9fad8 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -17,4 +17,8 @@ return function() -- Exit terminal insert mode with esc vim.keymap.set("t", "", "", {}) + + -- Using ufo, need to remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself + vim.keymap.set("n", "zR", require("ufo").openAllFolds) + vim.keymap.set("n", "zM", require("ufo").closeAllFolds) end diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 87293e5e..06c984a0 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -49,10 +49,16 @@ o.shiftwidth = 4 o.smartindent = true -- Firenvim settings -vim.g.firenvim_config = { +g.firenvim_config = { localSettings = { [".*"] = { takeOver = "never", }, }, } + +-- Fold settings (for ufo) +o.foldcolumn = "1" +o.foldlevel = 99 +o.foldlevelstart = 99 +o.foldenable = true From 7330cf920ba41ea47a9749c46c688025bbf798d2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 16:23:52 +0300 Subject: [PATCH 1984/2667] Nvim: add ufo fold plugin --- home/.config/nvim/lua/plugins/init.lua | 7 +++++++ home/.config/nvim/lua/plugins/mason.lua | 7 +++++++ home/.config/nvim/lua/plugins/ufo.lua | 7 +++++++ home/.config/nvim/lua/plugins/which-key.lua | 4 ++++ home/.config/nvim/lua/settings.lua | 8 +++++++- 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 home/.config/nvim/lua/plugins/ufo.lua diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 96484bc7..7c817931 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -212,6 +212,13 @@ local plugins = { config = require("plugins.dashboard"), dependencies = { { "kyazdani42/nvim-web-devicons" } }, }, + + -- Better folds + { + "kevinhwang91/nvim-ufo", + dependencies = { "kevinhwang91/promise-async" }, + config = require("plugins.ufo"), + }, } local lazy_opts = {} diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index f6848f8a..df9a76cd 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -12,6 +12,13 @@ function m.setup() -- Inform lsp about completion capabilities from cmp local capabilities = require("cmp_nvim_lsp").default_capabilities() + -- Neovim hasn't added foldingRange to default capabilities, users must add it manually + -- for ufo + capabilities.textDocument.foldingRange = { + dynamicRegistration = false, + lineFoldingOnly = true, + } + require("mason").setup() local mason_lsp = require("mason-lspconfig") mason_lsp.setup() diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua new file mode 100644 index 00000000..dbdce244 --- /dev/null +++ b/home/.config/nvim/lua/plugins/ufo.lua @@ -0,0 +1,7 @@ +return function() + require("ufo").setup({ + close_fold_kinds = { + "imports", + }, + }) +end diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 62ad276c..e7e9fad8 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -17,4 +17,8 @@ return function() -- Exit terminal insert mode with esc vim.keymap.set("t", "", "", {}) + + -- Using ufo, need to remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself + vim.keymap.set("n", "zR", require("ufo").openAllFolds) + vim.keymap.set("n", "zM", require("ufo").closeAllFolds) end diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 87293e5e..06c984a0 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -49,10 +49,16 @@ o.shiftwidth = 4 o.smartindent = true -- Firenvim settings -vim.g.firenvim_config = { +g.firenvim_config = { localSettings = { [".*"] = { takeOver = "never", }, }, } + +-- Fold settings (for ufo) +o.foldcolumn = "1" +o.foldlevel = 99 +o.foldlevelstart = 99 +o.foldenable = true From 243f8caaab9a9b00dfd46ecaf8cddcd61135ac4a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 16:52:06 +0300 Subject: [PATCH 1985/2667] Nvim: change telescope keybind ctrl-t is used by default with tagstack --- home/.config/nvim/lua/plugins/telescope.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 9f0f5b64..3dac263c 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -14,7 +14,7 @@ return function() telescope.load_extension("cder") -- Keybinds - vim.keymap.set("n", "", vim.cmd.Telescope) + vim.keymap.set("n", "", vim.cmd.Telescope) vim.keymap.set("n", "", builtin.find_files) vim.keymap.set("n", "", builtin.live_grep) end From 72a86c007a059b18e41976babf7c9df3c438ae3d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 16:52:06 +0300 Subject: [PATCH 1986/2667] Nvim: change telescope keybind ctrl-t is used by default with tagstack --- home/.config/nvim/lua/plugins/telescope.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 9f0f5b64..3dac263c 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -14,7 +14,7 @@ return function() telescope.load_extension("cder") -- Keybinds - vim.keymap.set("n", "", vim.cmd.Telescope) + vim.keymap.set("n", "", vim.cmd.Telescope) vim.keymap.set("n", "", builtin.find_files) vim.keymap.set("n", "", builtin.live_grep) end From 96873e1bd7d0d3e4469ec60ab14afae0a954201f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 20:58:25 +0300 Subject: [PATCH 1987/2667] Fix trusted proxy --- docker/nextcloud/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 7dd2d0a2..26cef007 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -12,7 +12,7 @@ volumes = [ environment = [ "REDIS_HOST=redis", "REDIS_HOST_PASSWORD=123", - "TRUSTED_PROXIES=traefik", + "TRUSTED_PROXIES=caddy", "NEXTCLOUD_TRUSTED_DOMAINS=cloud.korhonen.cc", "OVERWRITEHOST=cloud.korhonen.cc", "OVERWRITEPROTOCOL=https", From dd2e8c1db21e5d85c29574db822dff0f5fa843c0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 20:58:25 +0300 Subject: [PATCH 1988/2667] Fix trusted proxy --- docker/nextcloud/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 7dd2d0a2..26cef007 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -12,7 +12,7 @@ volumes = [ environment = [ "REDIS_HOST=redis", "REDIS_HOST_PASSWORD=123", - "TRUSTED_PROXIES=traefik", + "TRUSTED_PROXIES=caddy", "NEXTCLOUD_TRUSTED_DOMAINS=cloud.korhonen.cc", "OVERWRITEHOST=cloud.korhonen.cc", "OVERWRITEPROTOCOL=https", From f6197e8eca228846c1080e94d7453d9de2777202 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 20:58:43 +0300 Subject: [PATCH 1989/2667] Add correct header for wkd --- docker/caddy/Caddyfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index ca515933..615cbc64 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -25,6 +25,7 @@ korhonen.cc, *.korhonen.cc { handle @wkd { root * /var/www/wkd file_server browse + header Access-Control-Allow-Origin "*" } @index host index.korhonen.cc From 58736a27d46ba47abcd8211f8c76653c28adbe4a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 20:58:43 +0300 Subject: [PATCH 1990/2667] Add correct header for wkd --- docker/caddy/Caddyfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index ca515933..615cbc64 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -25,6 +25,7 @@ korhonen.cc, *.korhonen.cc { handle @wkd { root * /var/www/wkd file_server browse + header Access-Control-Allow-Origin "*" } @index host index.korhonen.cc From b3fcfdb3e81842c7ed516f1ec70011c30002df9b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 21:07:52 +0300 Subject: [PATCH 1991/2667] Fix custom umami tracker script name --- docker/caddy/Caddyfile | 1 + docker/umami/docker-compose.toml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 615cbc64..3149a812 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -82,6 +82,7 @@ korhonen.cc, *.korhonen.cc { @umami host umami.korhonen.cc handle @umami { reverse_proxy umami:3000 + rewrite /ua9quuaW.js /script.js } @nextcloud host cloud.korhonen.cc diff --git a/docker/umami/docker-compose.toml b/docker/umami/docker-compose.toml index 3d5a92da..adfb9642 100644 --- a/docker/umami/docker-compose.toml +++ b/docker/umami/docker-compose.toml @@ -8,7 +8,6 @@ env_file = ".env" [services.umami.environment] DATABASE_URL = "postgresql://umami:${POSTGRES_PASS}@postgres:5432/umami" HASH_SALT = "${HASH_SALT}" -TRACKER_SCRIPT_NAME = "ua9quuaW" [services.umami.logging.options] max-size = "10m" From 8a924d17c5c354af6c0e1ac330948f47b4b8de42 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 21:07:52 +0300 Subject: [PATCH 1992/2667] Fix custom umami tracker script name --- docker/caddy/Caddyfile | 1 + docker/umami/docker-compose.toml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 615cbc64..3149a812 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -82,6 +82,7 @@ korhonen.cc, *.korhonen.cc { @umami host umami.korhonen.cc handle @umami { reverse_proxy umami:3000 + rewrite /ua9quuaW.js /script.js } @nextcloud host cloud.korhonen.cc diff --git a/docker/umami/docker-compose.toml b/docker/umami/docker-compose.toml index 3d5a92da..adfb9642 100644 --- a/docker/umami/docker-compose.toml +++ b/docker/umami/docker-compose.toml @@ -8,7 +8,6 @@ env_file = ".env" [services.umami.environment] DATABASE_URL = "postgresql://umami:${POSTGRES_PASS}@postgres:5432/umami" HASH_SALT = "${HASH_SALT}" -TRACKER_SCRIPT_NAME = "ua9quuaW" [services.umami.logging.options] max-size = "10m" From 1cf475d7ee9034007396ba6183c64396bb237f02 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 21 Sep 2023 15:39:04 +0300 Subject: [PATCH 1993/2667] Nvim treesitter: add missing configuration parameters --- home/.config/nvim/lua/plugins/treesitter.lua | 70 ++++++++++---------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index 64fea67e..317f527c 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -1,37 +1,39 @@ return function() - require("nvim-treesitter.configs").setup({ - ensure_installed = { - "bash", - "c", - "css", - "dockerfile", - "html", - "http", - "java", - "json", - "json5", - "latex", - "lua", - "make", - "markdown", - "php", - "python", - "regex", - "rasi", - "rst", - "scss", - "toml", - "tsx", - "typescript", - "javascript", - "yaml", - }, - highlight = { enable = true }, - indent = { enable = true }, - incremental_selection = { enable = true }, - context_commentstring = { enable = true }, - }) + require("nvim-treesitter.configs").setup({ + ensure_installed = { + "bash", + "css", + "dockerfile", + "html", + "http", + "java", + "javascript", + "json", + "json5", + "latex", + "lua", + "make", + "markdown", + "php", + "python", + "rasi", + "regex", + "rst", + "scss", + "toml", + "tsx", + "typescript", + "yaml", + }, + highlight = { enable = true }, + indent = { enable = true }, + incremental_selection = { enable = true }, + context_commentstring = { enable = true }, + sync_install = true, + ignore_install = {}, + auto_install = true, + }) - -- vim.wo.foldmethod = 'expr' - -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' + -- vim.wo.foldmethod = 'expr' + -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' end From 82eab3ff946426818b30772e83725ac3b90842a0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 21 Sep 2023 15:39:04 +0300 Subject: [PATCH 1994/2667] Nvim treesitter: add missing configuration parameters --- home/.config/nvim/lua/plugins/treesitter.lua | 70 ++++++++++---------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index 64fea67e..317f527c 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -1,37 +1,39 @@ return function() - require("nvim-treesitter.configs").setup({ - ensure_installed = { - "bash", - "c", - "css", - "dockerfile", - "html", - "http", - "java", - "json", - "json5", - "latex", - "lua", - "make", - "markdown", - "php", - "python", - "regex", - "rasi", - "rst", - "scss", - "toml", - "tsx", - "typescript", - "javascript", - "yaml", - }, - highlight = { enable = true }, - indent = { enable = true }, - incremental_selection = { enable = true }, - context_commentstring = { enable = true }, - }) + require("nvim-treesitter.configs").setup({ + ensure_installed = { + "bash", + "css", + "dockerfile", + "html", + "http", + "java", + "javascript", + "json", + "json5", + "latex", + "lua", + "make", + "markdown", + "php", + "python", + "rasi", + "regex", + "rst", + "scss", + "toml", + "tsx", + "typescript", + "yaml", + }, + highlight = { enable = true }, + indent = { enable = true }, + incremental_selection = { enable = true }, + context_commentstring = { enable = true }, + sync_install = true, + ignore_install = {}, + auto_install = true, + }) - -- vim.wo.foldmethod = 'expr' - -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' + -- vim.wo.foldmethod = 'expr' + -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' end From 03918c79cd4de72354678820f8196bb28d0b7a5c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 21 Sep 2023 15:39:25 +0300 Subject: [PATCH 1995/2667] Add zsh-completion-generator plugin --- home/.config/zsh/03-plugins.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 0aae9f40..db27bd1a 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -51,3 +51,7 @@ source /usr/share/fzf/completion.zsh # enable https://github.com/nvbn/thefuck eval $(TF_SHELL=zsh thefuck --alias) {%@@ endif @@%} + +# Generate completions at runtime +zinit ice lucid +zinit light RobSis/zsh-completion-generator From aa42d6ab3917fffb1008504402f3af8c0be53cfc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 21 Sep 2023 15:39:25 +0300 Subject: [PATCH 1996/2667] Add zsh-completion-generator plugin --- home/.config/zsh/03-plugins.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 0aae9f40..db27bd1a 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -51,3 +51,7 @@ source /usr/share/fzf/completion.zsh # enable https://github.com/nvbn/thefuck eval $(TF_SHELL=zsh thefuck --alias) {%@@ endif @@%} + +# Generate completions at runtime +zinit ice lucid +zinit light RobSis/zsh-completion-generator From 39b2a945bb0deb53784093cea92dc2682ce450e7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 22 Sep 2023 09:37:58 +0300 Subject: [PATCH 1997/2667] Nvim: add keybind to show document symbols --- home/.config/nvim/lua/plugins/mason.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index df9a76cd..b7c07b5e 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -72,6 +72,7 @@ function m.map_keys() D = { vim.lsp.buf.declaration, "Declaration" }, i = { telescope_builtin.lsp_implementations, "Implementation" }, r = { telescope_builtin.lsp_references, "References" }, + s = { telescope_builtin.lsp_document_symbols, "Symbols" }, }, [""] = { name = "Leader", From 488b3e5bf4f7d0bf0ee9b3b528195cc84695af01 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 22 Sep 2023 09:37:58 +0300 Subject: [PATCH 1998/2667] Nvim: add keybind to show document symbols --- home/.config/nvim/lua/plugins/mason.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index df9a76cd..b7c07b5e 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -72,6 +72,7 @@ function m.map_keys() D = { vim.lsp.buf.declaration, "Declaration" }, i = { telescope_builtin.lsp_implementations, "Implementation" }, r = { telescope_builtin.lsp_references, "References" }, + s = { telescope_builtin.lsp_document_symbols, "Symbols" }, }, [""] = { name = "Leader", From a3d930033ce62e8986148302f64e397ffcba2e93 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 22 Sep 2023 20:17:42 +0300 Subject: [PATCH 1999/2667] Update pip packages on termux --- home/.config/zsh/04-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 8c5b7bb5..607c4e6b 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -181,6 +181,7 @@ update() { doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} pkg update && pkg upgrade --yes + pip install --upgrade $(pip list --outdated | tail -n +3 | awk '{print $1}') {%@@ endif @@%} } From 67f4a173d968484faa6a88ebd36f136d8ee899db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 22 Sep 2023 20:17:42 +0300 Subject: [PATCH 2000/2667] Update pip packages on termux --- home/.config/zsh/04-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 8c5b7bb5..607c4e6b 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -181,6 +181,7 @@ update() { doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} pkg update && pkg upgrade --yes + pip install --upgrade $(pip list --outdated | tail -n +3 | awk '{print $1}') {%@@ endif @@%} } From 8ceed71fb1cc544ad394124df943a4e21ccd16cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 22 Sep 2023 20:20:32 +0300 Subject: [PATCH 2001/2667] Update cargo packages on termux --- home/.config/zsh/04-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 607c4e6b..42304796 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -182,6 +182,7 @@ update() { {%@@ elif distro_id == "termux" @@%} pkg update && pkg upgrade --yes pip install --upgrade $(pip list --outdated | tail -n +3 | awk '{print $1}') + cargo install-update -a {%@@ endif @@%} } From b8f62fd19beed57f3f2dcba998ece0c69fe12c9e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 22 Sep 2023 20:20:32 +0300 Subject: [PATCH 2002/2667] Update cargo packages on termux --- home/.config/zsh/04-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 607c4e6b..42304796 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -182,6 +182,7 @@ update() { {%@@ elif distro_id == "termux" @@%} pkg update && pkg upgrade --yes pip install --upgrade $(pip list --outdated | tail -n +3 | awk '{print $1}') + cargo install-update -a {%@@ endif @@%} } From 3adda7b51359415405a40ab4d1de9ebc5037a22f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 27 Sep 2023 10:16:35 +0300 Subject: [PATCH 2003/2667] Zsh: lazy load generator plugin --- home/.config/zsh/03-plugins.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index db27bd1a..42313973 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -53,5 +53,5 @@ eval $(TF_SHELL=zsh thefuck --alias) {%@@ endif @@%} # Generate completions at runtime -zinit ice lucid +zinit ice wait'2' lucid zinit light RobSis/zsh-completion-generator From 44b04cd35bc43680f02ce06dfca8aecd3fa24af1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 27 Sep 2023 10:16:35 +0300 Subject: [PATCH 2004/2667] Zsh: lazy load generator plugin --- home/.config/zsh/03-plugins.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index db27bd1a..42313973 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -53,5 +53,5 @@ eval $(TF_SHELL=zsh thefuck --alias) {%@@ endif @@%} # Generate completions at runtime -zinit ice lucid +zinit ice wait'2' lucid zinit light RobSis/zsh-completion-generator From d630e712a396ef4770c69ffc744981e60aa86ce5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 27 Sep 2023 10:16:46 +0300 Subject: [PATCH 2005/2667] Neovim: add function to run java code --- home/.config/nvim/ftplugin/java.lua | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 698e54e2..2c143c9e 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -42,3 +42,45 @@ require("jdtls").start_or_attach({ }) require("plugins.mason").map_keys() + +function RunJava() + local function show_output(output) + vim.cmd("split") + vim.cmd("enew") + vim.fn.append(0, output) + --vim.cmd("1d") -- Remove the empty first line + vim.bo[0].modifiable = false + end + + local filename = vim.fn.expand("%") -- Get the current file name + local class_name = vim.fn.fnamemodify(filename, ":r") -- Extract the class name + local compile_cmd = "javac " .. filename + local run_cmd = "java " .. class_name + + -- Create a temporary file to capture the compile output + local temp_file = vim.fn.tempname() + + -- Run the compilation command and save the output to the temporary file + local compile_exit_code = vim.fn.system(compile_cmd .. " > " .. temp_file .. " 2>&1") + + -- Check the exit code of the compile command + if compile_exit_code == 0 then + -- Compilation was successful, run the Java program + show_output(vim.fn.systemlist(run_cmd)) + else + -- Compilation failed, display the error output from the temporary file + show_output(vim.fn.readfile(temp_file)) + end + + -- Clean up the temporary file and class file + vim.fn.delete(temp_file) + vim.fn.delete(vim.fn.expand("%:p:h") .. "/" .. class_name .. ".class") +end + +-- Define a VimScript command to execute the Lua function +vim.api.nvim_exec( + [[ + command! RunJava lua RunJava() +]], + false +) From 9b4a1e15988b7482e4739e395ef9fee67cb3c101 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 27 Sep 2023 10:16:46 +0300 Subject: [PATCH 2006/2667] Neovim: add function to run java code --- home/.config/nvim/ftplugin/java.lua | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 698e54e2..2c143c9e 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -42,3 +42,45 @@ require("jdtls").start_or_attach({ }) require("plugins.mason").map_keys() + +function RunJava() + local function show_output(output) + vim.cmd("split") + vim.cmd("enew") + vim.fn.append(0, output) + --vim.cmd("1d") -- Remove the empty first line + vim.bo[0].modifiable = false + end + + local filename = vim.fn.expand("%") -- Get the current file name + local class_name = vim.fn.fnamemodify(filename, ":r") -- Extract the class name + local compile_cmd = "javac " .. filename + local run_cmd = "java " .. class_name + + -- Create a temporary file to capture the compile output + local temp_file = vim.fn.tempname() + + -- Run the compilation command and save the output to the temporary file + local compile_exit_code = vim.fn.system(compile_cmd .. " > " .. temp_file .. " 2>&1") + + -- Check the exit code of the compile command + if compile_exit_code == 0 then + -- Compilation was successful, run the Java program + show_output(vim.fn.systemlist(run_cmd)) + else + -- Compilation failed, display the error output from the temporary file + show_output(vim.fn.readfile(temp_file)) + end + + -- Clean up the temporary file and class file + vim.fn.delete(temp_file) + vim.fn.delete(vim.fn.expand("%:p:h") .. "/" .. class_name .. ".class") +end + +-- Define a VimScript command to execute the Lua function +vim.api.nvim_exec( + [[ + command! RunJava lua RunJava() +]], + false +) From 71b2b12a3f6725b338f2f792d1b48c5b6dc9d1cc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 27 Sep 2023 15:06:50 +0300 Subject: [PATCH 2007/2667] Neovim: add copilot --- home/.config/nvim/lua/plugins/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 7c817931..cb980419 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -219,6 +219,7 @@ local plugins = { dependencies = { "kevinhwang91/promise-async" }, config = require("plugins.ufo"), }, + "github/copilot.vim", } local lazy_opts = {} From 68ca9c6ab63876995f1f8571ca53fd3ef700eb9f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 27 Sep 2023 15:06:50 +0300 Subject: [PATCH 2008/2667] Neovim: add copilot --- home/.config/nvim/lua/plugins/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 7c817931..cb980419 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -219,6 +219,7 @@ local plugins = { dependencies = { "kevinhwang91/promise-async" }, config = require("plugins.ufo"), }, + "github/copilot.vim", } local lazy_opts = {} From 2cd94ee65f3d8913a822d8f19c8fb834bfab243c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 29 Sep 2023 09:03:03 +0300 Subject: [PATCH 2009/2667] Nvim: migrate indent-blankline to v3 --- .../nvim/lua/plugins/indent-blankline.lua | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index af840c1c..5d6b4c37 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,18 +1,19 @@ return function() - vim.opt.list = true - require("indent_blankline").setup({ - space_char_blankline = " ", - show_current_context = true, - show_current_context_start = true, + require("ibl").setup({ + exclude = { + filetypes = { + "", + "checkhealth", + "dashboard", + "git", + "gitcommit", + "TelescopePrompt", + "TelescopeResults", + "help", + "lazy", + "lspinfo", + "man", + }, + }, }) - vim.g.indent_blankline_filetype_exclude = { - "", - "checkhealth", - "dashboard", - "help", - "lspinfo", - "man", - "lazy", - "git", - } end From b170d0182aae5c7b6f1587be4f94823646d7be05 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 29 Sep 2023 09:03:03 +0300 Subject: [PATCH 2010/2667] Nvim: migrate indent-blankline to v3 --- .../nvim/lua/plugins/indent-blankline.lua | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index af840c1c..5d6b4c37 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,18 +1,19 @@ return function() - vim.opt.list = true - require("indent_blankline").setup({ - space_char_blankline = " ", - show_current_context = true, - show_current_context_start = true, + require("ibl").setup({ + exclude = { + filetypes = { + "", + "checkhealth", + "dashboard", + "git", + "gitcommit", + "TelescopePrompt", + "TelescopeResults", + "help", + "lazy", + "lspinfo", + "man", + }, + }, }) - vim.g.indent_blankline_filetype_exclude = { - "", - "checkhealth", - "dashboard", - "help", - "lspinfo", - "man", - "lazy", - "git", - } end From 38097407cdfa94bdcd29d7aabcf3bdee9f0b1f63 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 29 Sep 2023 09:03:17 +0300 Subject: [PATCH 2011/2667] Nvim: use telescope for lsp definitions --- home/.config/nvim/lua/plugins/mason.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index b7c07b5e..cccc8625 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -68,7 +68,7 @@ function m.map_keys() require("which-key").register({ g = { name = "Go to", - d = { vim.lsp.buf.definition, "Definition" }, + d = { telescope_builtin.lsp_definitions, "Definition" }, D = { vim.lsp.buf.declaration, "Declaration" }, i = { telescope_builtin.lsp_implementations, "Implementation" }, r = { telescope_builtin.lsp_references, "References" }, From 97bbcfd517331fb195259908d327e979a675ac36 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 29 Sep 2023 09:03:17 +0300 Subject: [PATCH 2012/2667] Nvim: use telescope for lsp definitions --- home/.config/nvim/lua/plugins/mason.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index b7c07b5e..cccc8625 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -68,7 +68,7 @@ function m.map_keys() require("which-key").register({ g = { name = "Go to", - d = { vim.lsp.buf.definition, "Definition" }, + d = { telescope_builtin.lsp_definitions, "Definition" }, D = { vim.lsp.buf.declaration, "Declaration" }, i = { telescope_builtin.lsp_implementations, "Implementation" }, r = { telescope_builtin.lsp_references, "References" }, From bd7c5020f94d0b856af827e26f16ad45f7b7db45 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Oct 2023 10:40:06 +0300 Subject: [PATCH 2013/2667] Update pip and cargo on ubuntu and termux --- home/.config/zsh/04-aliases.zsh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 42304796..acece61e 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -181,8 +181,10 @@ update() { doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} pkg update && pkg upgrade --yes - pip install --upgrade $(pip list --outdated | tail -n +3 | awk '{print $1}') - cargo install-update -a + {%@@ endif @@%} + {%@@ if distro_id == "termux" or distro_id == "ubuntu" @@%} + pip-update-installed + cargo-update-installed {%@@ endif @@%} } @@ -196,6 +198,14 @@ update() { {%@@ endif @@%} } + pip-update-installed() { + pip install --upgrade $(pip list --outdated | tail -n +3 | awk '{print $1}') + } + + cargo-update-installed() { + cargo install-update -a + } + {%@@ if profile == "Moria" @@%} repo() { aur sync -Su --margs --noconfirm From 33258e3bf35acfea9ee13faf3256c2f577431c75 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Oct 2023 10:40:06 +0300 Subject: [PATCH 2014/2667] Update pip and cargo on ubuntu and termux --- home/.config/zsh/04-aliases.zsh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 42304796..acece61e 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -181,8 +181,10 @@ update() { doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} pkg update && pkg upgrade --yes - pip install --upgrade $(pip list --outdated | tail -n +3 | awk '{print $1}') - cargo install-update -a + {%@@ endif @@%} + {%@@ if distro_id == "termux" or distro_id == "ubuntu" @@%} + pip-update-installed + cargo-update-installed {%@@ endif @@%} } @@ -196,6 +198,14 @@ update() { {%@@ endif @@%} } + pip-update-installed() { + pip install --upgrade $(pip list --outdated | tail -n +3 | awk '{print $1}') + } + + cargo-update-installed() { + cargo install-update -a + } + {%@@ if profile == "Moria" @@%} repo() { aur sync -Su --margs --noconfirm From b7c627490bf8190ebc804ca78f8dd1d371b4a48c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Oct 2023 10:27:17 +0300 Subject: [PATCH 2015/2667] Nvim: switch to copilot.lua --- home/.config/nvim/lua/plugins/init.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index cb980419..be142294 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -219,7 +219,9 @@ local plugins = { dependencies = { "kevinhwang91/promise-async" }, config = require("plugins.ufo"), }, - "github/copilot.vim", + + -- GitHub Copilot + { "zbirenbaum/copilot.lua", config = true }, } local lazy_opts = {} From 0997a179d4352eabaa0944d06ea2613da092eec1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Oct 2023 10:27:17 +0300 Subject: [PATCH 2016/2667] Nvim: switch to copilot.lua --- home/.config/nvim/lua/plugins/init.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index cb980419..be142294 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -219,7 +219,9 @@ local plugins = { dependencies = { "kevinhwang91/promise-async" }, config = require("plugins.ufo"), }, - "github/copilot.vim", + + -- GitHub Copilot + { "zbirenbaum/copilot.lua", config = true }, } local lazy_opts = {} From 2a6e453156875bc9dad561190c4edf1d79554ed0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Oct 2023 10:29:05 +0300 Subject: [PATCH 2017/2667] Update script: don't verify on arch --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index acece61e..21c9229d 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -176,7 +176,7 @@ update() { packages() { {%@@ if distro_id == "arch" @@%} - paru + paru -Syu --noconfirm {%@@ elif distro_id == "ubuntu" @@%} doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} From 7d07bbfaa6a7122553f0086ff233d7e4c7740d53 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Oct 2023 10:29:05 +0300 Subject: [PATCH 2018/2667] Update script: don't verify on arch --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index acece61e..21c9229d 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -176,7 +176,7 @@ update() { packages() { {%@@ if distro_id == "arch" @@%} - paru + paru -Syu --noconfirm {%@@ elif distro_id == "ubuntu" @@%} doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} From b36e9f53933b8134fe527a03d9f208b5ca6c6e94 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Oct 2023 11:01:08 +0300 Subject: [PATCH 2019/2667] Nvim: setup cmp for copilot --- home/.config/nvim/lua/plugins/cmp.lua | 4 ++++ home/.config/nvim/lua/plugins/init.lua | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index c4a18bbf..bc7acd71 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -8,6 +8,9 @@ return function() -- Setup git completion source require("cmp_git").setup() + -- + -- Setup copilot source + require("copilot_cmp").setup() -- Set completeopt to have a better completion experience vim.o.completeopt = "menuone,noselect" @@ -49,6 +52,7 @@ return function() end, }, sources = { + { name = "copilot" }, { name = "nvim_lsp" }, { name = "nvim_lua" }, { name = "luasnip" }, diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index be142294..6d828e03 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -130,6 +130,7 @@ local plugins = { "hrsh7th/cmp-cmdline", -- cmdline source "saadparwaiz1/cmp_luasnip", -- Snippets source "f3fora/cmp-spell", -- Spell check source + "zbirenbaum/copilot-cmp", -- Copilot source }, config = require("plugins.cmp"), }, @@ -221,7 +222,15 @@ local plugins = { }, -- GitHub Copilot - { "zbirenbaum/copilot.lua", config = true }, + { + "zbirenbaum/copilot.lua", + config = function() + require("copilot").setup({ + suggestion = { enabled = false }, + panel = { enabled = false }, + }) + end, + }, } local lazy_opts = {} From 976b2d04fbdb026cbcf4c63d56c29b114c421cea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Oct 2023 11:01:08 +0300 Subject: [PATCH 2020/2667] Nvim: setup cmp for copilot --- home/.config/nvim/lua/plugins/cmp.lua | 4 ++++ home/.config/nvim/lua/plugins/init.lua | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index c4a18bbf..bc7acd71 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -8,6 +8,9 @@ return function() -- Setup git completion source require("cmp_git").setup() + -- + -- Setup copilot source + require("copilot_cmp").setup() -- Set completeopt to have a better completion experience vim.o.completeopt = "menuone,noselect" @@ -49,6 +52,7 @@ return function() end, }, sources = { + { name = "copilot" }, { name = "nvim_lsp" }, { name = "nvim_lua" }, { name = "luasnip" }, diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index be142294..6d828e03 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -130,6 +130,7 @@ local plugins = { "hrsh7th/cmp-cmdline", -- cmdline source "saadparwaiz1/cmp_luasnip", -- Snippets source "f3fora/cmp-spell", -- Spell check source + "zbirenbaum/copilot-cmp", -- Copilot source }, config = require("plugins.cmp"), }, @@ -221,7 +222,15 @@ local plugins = { }, -- GitHub Copilot - { "zbirenbaum/copilot.lua", config = true }, + { + "zbirenbaum/copilot.lua", + config = function() + require("copilot").setup({ + suggestion = { enabled = false }, + panel = { enabled = false }, + }) + end, + }, } local lazy_opts = {} From 747b4b8990eac221c2abd908195e00abeb06a20e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Oct 2023 11:04:29 +0300 Subject: [PATCH 2021/2667] Fix pairs with copilot --- home/.config/nvim/lua/plugins/cmp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index bc7acd71..12fb381f 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -10,7 +10,7 @@ return function() require("cmp_git").setup() -- -- Setup copilot source - require("copilot_cmp").setup() + require("copilot_cmp").setup({ fix_pairs = true }) -- Set completeopt to have a better completion experience vim.o.completeopt = "menuone,noselect" From 5d9708d5356510fad340994f3c6a68e384eebd21 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Oct 2023 11:04:29 +0300 Subject: [PATCH 2022/2667] Fix pairs with copilot --- home/.config/nvim/lua/plugins/cmp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index bc7acd71..12fb381f 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -10,7 +10,7 @@ return function() require("cmp_git").setup() -- -- Setup copilot source - require("copilot_cmp").setup() + require("copilot_cmp").setup({ fix_pairs = true }) -- Set completeopt to have a better completion experience vim.o.completeopt = "menuone,noselect" From 8a3fb3ad45ef1225ddf6976a0b7a0b25901be0e1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Oct 2023 13:17:43 +0300 Subject: [PATCH 2023/2667] Nvim: fix luasnip keymappings --- home/.config/nvim/lua/plugins/cmp.lua | 8 ++++---- home/.config/nvim/lua/plugins/luasnip.lua | 23 ++--------------------- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 12fb381f..b3d12409 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -32,7 +32,7 @@ return function() behavior = cmp.ConfirmBehavior.Replace, select = true, }), - [""] = function(fallback) + [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() elseif luasnip.expand_or_jumpable() then @@ -40,8 +40,8 @@ return function() else fallback() end - end, - [""] = function(fallback) + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() elseif luasnip.jumpable(-1) then @@ -49,7 +49,7 @@ return function() else fallback() end - end, + end, { "i", "s" }), }, sources = { { name = "copilot" }, diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index 41422738..e89b9ac4 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -1,23 +1,4 @@ return function() - local luasnip = require("luasnip") - local wk = require("which-key") - - -- load friendly-snippets to luasnip - require("luasnip/loaders/from_vscode").lazy_load() - - -- Register snippet navigation keybindings - local snippet_mappings = { - [""] = { - function() - luasnip.jump(1) - end, - }, - [""] = { - function() - luasnip.jump(-1) - end, - }, - } - --wk.register(snippet_mappings, {mode = "i"}) - --wk.register(snippet_mappings, {mode = "s"}) + -- load friendly-snippets to luasnip + require("luasnip/loaders/from_vscode").lazy_load() end From aef2e0a750df93d40c5d02a19b6663cb9fe121b7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Oct 2023 13:17:43 +0300 Subject: [PATCH 2024/2667] Nvim: fix luasnip keymappings --- home/.config/nvim/lua/plugins/cmp.lua | 8 ++++---- home/.config/nvim/lua/plugins/luasnip.lua | 23 ++--------------------- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 12fb381f..b3d12409 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -32,7 +32,7 @@ return function() behavior = cmp.ConfirmBehavior.Replace, select = true, }), - [""] = function(fallback) + [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() elseif luasnip.expand_or_jumpable() then @@ -40,8 +40,8 @@ return function() else fallback() end - end, - [""] = function(fallback) + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() elseif luasnip.jumpable(-1) then @@ -49,7 +49,7 @@ return function() else fallback() end - end, + end, { "i", "s" }), }, sources = { { name = "copilot" }, diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index 41422738..e89b9ac4 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -1,23 +1,4 @@ return function() - local luasnip = require("luasnip") - local wk = require("which-key") - - -- load friendly-snippets to luasnip - require("luasnip/loaders/from_vscode").lazy_load() - - -- Register snippet navigation keybindings - local snippet_mappings = { - [""] = { - function() - luasnip.jump(1) - end, - }, - [""] = { - function() - luasnip.jump(-1) - end, - }, - } - --wk.register(snippet_mappings, {mode = "i"}) - --wk.register(snippet_mappings, {mode = "s"}) + -- load friendly-snippets to luasnip + require("luasnip/loaders/from_vscode").lazy_load() end From 3a556610f7c47aaa4279af4f83847521d6d71a14 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 9 Oct 2023 09:13:32 +0300 Subject: [PATCH 2025/2667] Nvim: cmp: rank snippets higher --- home/.config/nvim/lua/plugins/cmp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index b3d12409..a740ae64 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -52,10 +52,10 @@ return function() end, { "i", "s" }), }, sources = { + { name = "luasnip" }, { name = "copilot" }, { name = "nvim_lsp" }, { name = "nvim_lua" }, - { name = "luasnip" }, { name = "git" }, { name = "buffer" }, { name = "spell" }, From 67d4a408e26fd537a49049b83a3d00aaa4936244 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 9 Oct 2023 09:13:32 +0300 Subject: [PATCH 2026/2667] Nvim: cmp: rank snippets higher --- home/.config/nvim/lua/plugins/cmp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index b3d12409..a740ae64 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -52,10 +52,10 @@ return function() end, { "i", "s" }), }, sources = { + { name = "luasnip" }, { name = "copilot" }, { name = "nvim_lsp" }, { name = "nvim_lua" }, - { name = "luasnip" }, { name = "git" }, { name = "buffer" }, { name = "spell" }, From 140991b8ae293893a0b9a3786223f48a029aa1d1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 9 Oct 2023 10:05:44 +0300 Subject: [PATCH 2027/2667] Gnome: volume step 1 for media keys --- home/.config/dconf.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/dconf.ini b/home/.config/dconf.ini index 958dfdd8..15d59d20 100644 --- a/home/.config/dconf.ini +++ b/home/.config/dconf.ini @@ -65,6 +65,7 @@ toggle-maximized=['f'] custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/'] screensaver=['BackSpace'] www=['b'] +volume-step=1 [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0] binding='Return' From bbb67058e7a569e45a15b315ec8f94a76363472e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 9 Oct 2023 10:05:44 +0300 Subject: [PATCH 2028/2667] Gnome: volume step 1 for media keys --- home/.config/dconf.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/dconf.ini b/home/.config/dconf.ini index 958dfdd8..15d59d20 100644 --- a/home/.config/dconf.ini +++ b/home/.config/dconf.ini @@ -65,6 +65,7 @@ toggle-maximized=['f'] custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/'] screensaver=['BackSpace'] www=['b'] +volume-step=1 [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0] binding='Return' From d0691c78b1bb512ac9929f650e648a968dff2be8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 11 Oct 2023 10:44:36 +0300 Subject: [PATCH 2029/2667] Nvim: fix markdown preview plugin update --- home/.config/nvim/lua/plugins/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 6d828e03..27c99074 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -187,7 +187,7 @@ local plugins = { -- Markdown preview { "iamcco/markdown-preview.nvim", - build = "cd app && npm install", + build = "cd app && yarn install", config = function() vim.g.mkdp_filetypes = { "markdown" } end, From 557fba419bcf2c480b791c5432d5f7fd82118894 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 11 Oct 2023 10:44:36 +0300 Subject: [PATCH 2030/2667] Nvim: fix markdown preview plugin update --- home/.config/nvim/lua/plugins/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 6d828e03..27c99074 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -187,7 +187,7 @@ local plugins = { -- Markdown preview { "iamcco/markdown-preview.nvim", - build = "cd app && npm install", + build = "cd app && yarn install", config = function() vim.g.mkdp_filetypes = { "markdown" } end, From 72e68f8af9ef52afb5fed65b6042eb699056de8f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 13 Oct 2023 13:02:03 +0300 Subject: [PATCH 2031/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 58318fd1..58745e92 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 58318fd13c6c631de9a9604422fa00529bb8dd3d +Subproject commit 58745e92d4992d2c6efc49d0d54423259f1d0351 From 82e23cd6b220364de0fbb74b63ed6e55ad93ec28 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 13 Oct 2023 13:02:03 +0300 Subject: [PATCH 2032/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 58318fd1..58745e92 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 58318fd13c6c631de9a9604422fa00529bb8dd3d +Subproject commit 58745e92d4992d2c6efc49d0d54423259f1d0351 From 74551651389877fb50d23645f5427d6ee9f52ecb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Oct 2023 09:16:26 +0300 Subject: [PATCH 2033/2667] Update nextcloud on moria with update script --- home/.config/zsh/04-aliases.zsh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 21c9229d..b29df908 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -211,7 +211,7 @@ update() { aur sync -Su --margs --noconfirm } - docker-update() { + local docker-update() { prevpwddocker=$PWD for dir in $HOME/git/dotfiles/docker/*; do cd $dir @@ -225,6 +225,10 @@ update() { done cd $prevpwddocker docker system prune -af --volumes + + occ upgrade + occ app:update --all + occ db:add-missing-indices } {%@@ endif @@%} From 12535c2ae00cf8d07f552e662b8a8d37f64be520 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Oct 2023 09:16:26 +0300 Subject: [PATCH 2034/2667] Update nextcloud on moria with update script --- home/.config/zsh/04-aliases.zsh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 21c9229d..b29df908 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -211,7 +211,7 @@ update() { aur sync -Su --margs --noconfirm } - docker-update() { + local docker-update() { prevpwddocker=$PWD for dir in $HOME/git/dotfiles/docker/*; do cd $dir @@ -225,6 +225,10 @@ update() { done cd $prevpwddocker docker system prune -af --volumes + + occ upgrade + occ app:update --all + occ db:add-missing-indices } {%@@ endif @@%} From b33b409336255fd440e66e433cc436bad7762858 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Oct 2023 21:00:51 +0300 Subject: [PATCH 2035/2667] Format fonts.conf --- home/.config/fontconfig/fonts.conf | 40 ++++++++++++++---------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/home/.config/fontconfig/fonts.conf b/home/.config/fontconfig/fonts.conf index 6118c70b..f00c9381 100644 --- a/home/.config/fontconfig/fonts.conf +++ b/home/.config/fontconfig/fonts.conf @@ -1,26 +1,22 @@ - - - sans-serif - - Overpass - - - - - serif - - Overpass - - - - - monospace - - Hack Nerd Font Mono - - - + + sans-serif + + Overpass + + + + serif + + Overpass + + + + monospace + + Hack Nerd Font Mono + + From be766e97bca87df8644b54dc1cb4afd4e35680ba Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Oct 2023 21:00:51 +0300 Subject: [PATCH 2036/2667] Format fonts.conf --- home/.config/fontconfig/fonts.conf | 40 ++++++++++++++---------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/home/.config/fontconfig/fonts.conf b/home/.config/fontconfig/fonts.conf index 6118c70b..f00c9381 100644 --- a/home/.config/fontconfig/fonts.conf +++ b/home/.config/fontconfig/fonts.conf @@ -1,26 +1,22 @@ - - - sans-serif - - Overpass - - - - - serif - - Overpass - - - - - monospace - - Hack Nerd Font Mono - - - + + sans-serif + + Overpass + + + + serif + + Overpass + + + + monospace + + Hack Nerd Font Mono + + From 69ff724b5a1c11869800a7822ba14eaa32b67645 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Oct 2023 21:04:51 +0300 Subject: [PATCH 2037/2667] Remove obsolete sway profile, add fonts.conf to Moria --- config.toml | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/config.toml b/config.toml index d93fa921..8a3e0d61 100644 --- a/config.toml +++ b/config.toml @@ -280,20 +280,6 @@ dotfiles = [ "f_youtube-dl_config", ] -[profiles.sway] -dotfiles = [ - "d_sway", - "d_waybar", - "d_wofi", - "d_zathura", - "f_electron-flags.conf", - "f_electron12-flags.conf", - "f_fonts.conf", - "f_foot.ini", - "f_mako_config", - "f_redshift.conf", -] - [profiles.gpg] dotfiles = [ "f_gpg-agent.conf", @@ -303,17 +289,23 @@ dotfiles = [ ] [profiles.Mirkwood] -include = ["pacman", "terminal", "email", "media", "sway", "gpg"] +include = ["pacman", "terminal", "email", "media", "gpg"] dotfiles = [ "d_rofi", "f_librewolf_overrides", "f_dconf.ini", "f_docker-config.json", + "f_fonts.conf", ] [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] -dotfiles = ["f_librewolf_overrides", "f_dconf.ini", "f_zprofile"] +dotfiles = [ + "f_librewolf_overrides", + "f_dconf.ini", + "f_zprofile", + "f_fonts.conf", +] [profiles.Gondor] include = ["pacman", "terminal"] From 88bb9f641272c540b4dcaaa88bc8d1cbedecc7c3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Oct 2023 21:04:51 +0300 Subject: [PATCH 2038/2667] Remove obsolete sway profile, add fonts.conf to Moria --- config.toml | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/config.toml b/config.toml index d93fa921..8a3e0d61 100644 --- a/config.toml +++ b/config.toml @@ -280,20 +280,6 @@ dotfiles = [ "f_youtube-dl_config", ] -[profiles.sway] -dotfiles = [ - "d_sway", - "d_waybar", - "d_wofi", - "d_zathura", - "f_electron-flags.conf", - "f_electron12-flags.conf", - "f_fonts.conf", - "f_foot.ini", - "f_mako_config", - "f_redshift.conf", -] - [profiles.gpg] dotfiles = [ "f_gpg-agent.conf", @@ -303,17 +289,23 @@ dotfiles = [ ] [profiles.Mirkwood] -include = ["pacman", "terminal", "email", "media", "sway", "gpg"] +include = ["pacman", "terminal", "email", "media", "gpg"] dotfiles = [ "d_rofi", "f_librewolf_overrides", "f_dconf.ini", "f_docker-config.json", + "f_fonts.conf", ] [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] -dotfiles = ["f_librewolf_overrides", "f_dconf.ini", "f_zprofile"] +dotfiles = [ + "f_librewolf_overrides", + "f_dconf.ini", + "f_zprofile", + "f_fonts.conf", +] [profiles.Gondor] include = ["pacman", "terminal"] From 23d21a6c8b3646463f7d7c1ab51a96ec81bf1093 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Oct 2023 22:44:36 +0200 Subject: [PATCH 2039/2667] Add tirion --- config.toml | 3 +++ home/.ssh/config | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/config.toml b/config.toml index 8a3e0d61..c22c860e 100644 --- a/config.toml +++ b/config.toml @@ -307,6 +307,9 @@ dotfiles = [ "f_fonts.conf", ] +[profiles.Tirion] +include = ["terminal", "gpg"] + [profiles.Gondor] include = ["pacman", "terminal"] diff --git a/home/.ssh/config b/home/.ssh/config index 5abc93b9..47d3c6c0 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -16,6 +16,15 @@ host moria # Forward SSH agent RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/1000/gnupg/S.gpg-agent.ssh +host tirion + HostName tirion.korhonen.cc + port 22 + User gandalf + # Forward GPG agent + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra + # Forward SSH agent + RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/1000/gnupg/S.gpg-agent.ssh + host forgejo HostName korhonen.cc user git From 718070963aa204332ec44ec292e1895be670548a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Oct 2023 22:44:36 +0200 Subject: [PATCH 2040/2667] Add tirion --- config.toml | 3 +++ home/.ssh/config | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/config.toml b/config.toml index 8a3e0d61..c22c860e 100644 --- a/config.toml +++ b/config.toml @@ -307,6 +307,9 @@ dotfiles = [ "f_fonts.conf", ] +[profiles.Tirion] +include = ["terminal", "gpg"] + [profiles.Gondor] include = ["pacman", "terminal"] diff --git a/home/.ssh/config b/home/.ssh/config index 5abc93b9..47d3c6c0 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -16,6 +16,15 @@ host moria # Forward SSH agent RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/1000/gnupg/S.gpg-agent.ssh +host tirion + HostName tirion.korhonen.cc + port 22 + User gandalf + # Forward GPG agent + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra + # Forward SSH agent + RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/1000/gnupg/S.gpg-agent.ssh + host forgejo HostName korhonen.cc user git From 6a5f536b132323aa2d8502114c5a44e2269674e9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Oct 2023 22:53:42 +0200 Subject: [PATCH 2041/2667] Add root dotfiles to Tirion --- config-root.toml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config-root.toml b/config-root.toml index 311d9eb9..3f3f11bf 100644 --- a/config-root.toml +++ b/config-root.toml @@ -224,6 +224,13 @@ dotfiles = [ "f_flexo.toml", ] +[profiles.Tirion] +dotfiles = [ + "f_doas.conf", + "f_ignore", + "f_sshd_config", +] + [profiles.Gondor] include = ["Locale", "Pacman"] dotfiles = ["f_doas.conf", "f_sshd_config"] From 91eca4d282c4ec4d98c54f71a05697a646faa175 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Oct 2023 22:53:42 +0200 Subject: [PATCH 2042/2667] Add root dotfiles to Tirion --- config-root.toml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config-root.toml b/config-root.toml index 311d9eb9..3f3f11bf 100644 --- a/config-root.toml +++ b/config-root.toml @@ -224,6 +224,13 @@ dotfiles = [ "f_flexo.toml", ] +[profiles.Tirion] +dotfiles = [ + "f_doas.conf", + "f_ignore", + "f_sshd_config", +] + [profiles.Gondor] include = ["Locale", "Pacman"] dotfiles = ["f_doas.conf", "f_sshd_config"] From 49f03b0e0612248bce5b7909c98e90d6a8e2e16e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Oct 2023 23:03:13 +0200 Subject: [PATCH 2043/2667] Add debian to zsh aliases --- home/.config/zsh/04-aliases.zsh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index b29df908..501552e3 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -33,7 +33,7 @@ pi() { if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} cmd="paru -S $SELECTED_PKGS" - {%@@ elif distro_id == "ubuntu" @@%} + {%@@ elif distro_id == "ubuntu" or distro_id == "debian" @@%} cmd="doas apt install $SELECTED_PKGS" {%@@ elif distro_id == "termux" @@%} cmd="apt install $SELECTED_PKGS" @@ -61,7 +61,7 @@ pr() { if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} cmd="paru -Rns $SELECTED_PKGS" - {%@@ elif distro_id == "ubuntu" @@%} + {%@@ elif distro_id == "ubuntu" or distro_id == "debian" @@%} cmd="doas apt remove $SELECTED_PKGS" {%@@ elif distro_id == "termux" @@%} cmd="apt remove $SELECTED_PKGS" @@ -177,12 +177,12 @@ update() { packages() { {%@@ if distro_id == "arch" @@%} paru -Syu --noconfirm - {%@@ elif distro_id == "ubuntu" @@%} + {%@@ elif distro_id == "ubuntu" or distro_id == "debian" @@%} doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} pkg update && pkg upgrade --yes {%@@ endif @@%} - {%@@ if distro_id == "termux" or distro_id == "ubuntu" @@%} + {%@@ if distro_id == "termux" or distro_id == "ubuntu" or distro_id == "debian" @@%} pip-update-installed cargo-update-installed {%@@ endif @@%} From 3a3869dd775e27ec46704deaf64528eb44b29477 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Oct 2023 23:03:13 +0200 Subject: [PATCH 2044/2667] Add debian to zsh aliases --- home/.config/zsh/04-aliases.zsh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index b29df908..501552e3 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -33,7 +33,7 @@ pi() { if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} cmd="paru -S $SELECTED_PKGS" - {%@@ elif distro_id == "ubuntu" @@%} + {%@@ elif distro_id == "ubuntu" or distro_id == "debian" @@%} cmd="doas apt install $SELECTED_PKGS" {%@@ elif distro_id == "termux" @@%} cmd="apt install $SELECTED_PKGS" @@ -61,7 +61,7 @@ pr() { if [ -n "$SELECTED_PKGS" ]; then {%@@ if distro_id == "arch" @@%} cmd="paru -Rns $SELECTED_PKGS" - {%@@ elif distro_id == "ubuntu" @@%} + {%@@ elif distro_id == "ubuntu" or distro_id == "debian" @@%} cmd="doas apt remove $SELECTED_PKGS" {%@@ elif distro_id == "termux" @@%} cmd="apt remove $SELECTED_PKGS" @@ -177,12 +177,12 @@ update() { packages() { {%@@ if distro_id == "arch" @@%} paru -Syu --noconfirm - {%@@ elif distro_id == "ubuntu" @@%} + {%@@ elif distro_id == "ubuntu" or distro_id == "debian" @@%} doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} pkg update && pkg upgrade --yes {%@@ endif @@%} - {%@@ if distro_id == "termux" or distro_id == "ubuntu" @@%} + {%@@ if distro_id == "termux" or distro_id == "ubuntu" or distro_id == "debian" @@%} pip-update-installed cargo-update-installed {%@@ endif @@%} From 1ae405e85d00308861897ba43fd47fced7c1779d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Oct 2023 23:09:55 +0200 Subject: [PATCH 2045/2667] Fix debian fzf zsh plugin --- home/.config/zsh/03-plugins.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 42313973..479a6d42 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -42,6 +42,9 @@ zinit light zdharma-continuum/fast-syntax-highlighting {%@@ if distro_id == "termux" @@%} source $PREFIX/share/fzf/key-bindings.zsh source $PREFIX/share/fzf/completion.zsh +{%@@ elif distro_id == "debian" @@%} +source /usr/share/doc/fzf/examples/key-bindings.zsh +source /usr/share/doc/fzf/examples/completion.zsh {%@@ else @@%} source /usr/share/fzf/key-bindings.zsh source /usr/share/fzf/completion.zsh From 4b6f9b19d9709e02d80e9cbfed31da62cffa0795 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Oct 2023 23:09:55 +0200 Subject: [PATCH 2046/2667] Fix debian fzf zsh plugin --- home/.config/zsh/03-plugins.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 42313973..479a6d42 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -42,6 +42,9 @@ zinit light zdharma-continuum/fast-syntax-highlighting {%@@ if distro_id == "termux" @@%} source $PREFIX/share/fzf/key-bindings.zsh source $PREFIX/share/fzf/completion.zsh +{%@@ elif distro_id == "debian" @@%} +source /usr/share/doc/fzf/examples/key-bindings.zsh +source /usr/share/doc/fzf/examples/completion.zsh {%@@ else @@%} source /usr/share/fzf/key-bindings.zsh source /usr/share/fzf/completion.zsh From f633456d024534f308270374d213aec82db101f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Oct 2023 13:49:38 +0200 Subject: [PATCH 2047/2667] Nvim: enable lombok --- home/.config/nvim/ftplugin/java.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 2c143c9e..605b47c9 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -11,6 +11,8 @@ require("jdtls").start_or_attach({ "-Dlog.protocol=true", "-Dlog.level=ALL", "-Xms1g", + "-javaagent:" .. nvim_local_dir .. "/mason/share/jdtls/lombok.jar", + "-Xbootclasspath/a:" .. nvim_local_dir .. "/mason/share/jdtls/lombok.jar", "--add-modules=ALL-SYSTEM", "--add-opens", "java.base/java.util=ALL-UNNAMED", From 8a7c780bf3d5292f015cb02011ab1c6d8b51aee6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Oct 2023 13:49:38 +0200 Subject: [PATCH 2048/2667] Nvim: enable lombok --- home/.config/nvim/ftplugin/java.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 2c143c9e..605b47c9 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -11,6 +11,8 @@ require("jdtls").start_or_attach({ "-Dlog.protocol=true", "-Dlog.level=ALL", "-Xms1g", + "-javaagent:" .. nvim_local_dir .. "/mason/share/jdtls/lombok.jar", + "-Xbootclasspath/a:" .. nvim_local_dir .. "/mason/share/jdtls/lombok.jar", "--add-modules=ALL-SYSTEM", "--add-opens", "java.base/java.util=ALL-UNNAMED", From 1e693490d2d48b317b79274c5201c093ed1093bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Nov 2023 16:35:23 +0200 Subject: [PATCH 2049/2667] Fix sudo not expanding aliases --- home/.config/zsh/04-aliases.zsh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 501552e3..4a5a1516 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -1,3 +1,8 @@ +# Fix sudo and doas not expanding aliases +# see: https://unix.stackexchange.com/questions/148545/why-does-sudo-ignore-aliases +alias sudo='sudo ' +alias doas='doas ' + # git shorthands alias gc='git commit' alias gac='ga && gc' From 5c65dd9cb9de569e586e48db9c3b772a734fb67a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Nov 2023 16:35:23 +0200 Subject: [PATCH 2050/2667] Fix sudo not expanding aliases --- home/.config/zsh/04-aliases.zsh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 501552e3..4a5a1516 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -1,3 +1,8 @@ +# Fix sudo and doas not expanding aliases +# see: https://unix.stackexchange.com/questions/148545/why-does-sudo-ignore-aliases +alias sudo='sudo ' +alias doas='doas ' + # git shorthands alias gc='git commit' alias gac='ga && gc' From a2565ab5a80151c7c3c164763bfa4dc9f8b725ca Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Nov 2023 16:35:55 +0200 Subject: [PATCH 2051/2667] Nvim: small tweaks to jdtls arguments --- home/.config/nvim/ftplugin/java.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 605b47c9..43b03f0b 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -1,4 +1,5 @@ local nvim_local_dir = vim.fn.expand("~/.local/share/nvim") +local lombok_jar = nvim_local_dir .. "/mason/packages/jdtls/lombok.jar" local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name @@ -11,13 +12,13 @@ require("jdtls").start_or_attach({ "-Dlog.protocol=true", "-Dlog.level=ALL", "-Xms1g", - "-javaagent:" .. nvim_local_dir .. "/mason/share/jdtls/lombok.jar", - "-Xbootclasspath/a:" .. nvim_local_dir .. "/mason/share/jdtls/lombok.jar", "--add-modules=ALL-SYSTEM", "--add-opens", "java.base/java.util=ALL-UNNAMED", "--add-opens", "java.base/java.lang=ALL-UNNAMED", + "-javaagent:" .. lombok_jar, + "-Xbootclasspath/a:" .. lombok_jar, "-jar", nvim_local_dir .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar", "-configuration", From 858a3cd1542e2da5592995790a7c98e1d98415cd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Nov 2023 16:35:55 +0200 Subject: [PATCH 2052/2667] Nvim: small tweaks to jdtls arguments --- home/.config/nvim/ftplugin/java.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 605b47c9..43b03f0b 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -1,4 +1,5 @@ local nvim_local_dir = vim.fn.expand("~/.local/share/nvim") +local lombok_jar = nvim_local_dir .. "/mason/packages/jdtls/lombok.jar" local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name @@ -11,13 +12,13 @@ require("jdtls").start_or_attach({ "-Dlog.protocol=true", "-Dlog.level=ALL", "-Xms1g", - "-javaagent:" .. nvim_local_dir .. "/mason/share/jdtls/lombok.jar", - "-Xbootclasspath/a:" .. nvim_local_dir .. "/mason/share/jdtls/lombok.jar", "--add-modules=ALL-SYSTEM", "--add-opens", "java.base/java.util=ALL-UNNAMED", "--add-opens", "java.base/java.lang=ALL-UNNAMED", + "-javaagent:" .. lombok_jar, + "-Xbootclasspath/a:" .. lombok_jar, "-jar", nvim_local_dir .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar", "-configuration", From 070b0a706f6df86c25417e8faa65f233155ea44b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 2 Nov 2023 11:52:40 +0200 Subject: [PATCH 2053/2667] Nvim: remove xboot option from jdtls This is not needed and causes options on recent java versions --- home/.config/nvim/ftplugin/java.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 43b03f0b..77267311 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -18,7 +18,6 @@ require("jdtls").start_or_attach({ "--add-opens", "java.base/java.lang=ALL-UNNAMED", "-javaagent:" .. lombok_jar, - "-Xbootclasspath/a:" .. lombok_jar, "-jar", nvim_local_dir .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar", "-configuration", From f387868de1abdadd9a4cfe7958b2f96d9b2d16e2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 2 Nov 2023 11:52:40 +0200 Subject: [PATCH 2054/2667] Nvim: remove xboot option from jdtls This is not needed and causes options on recent java versions --- home/.config/nvim/ftplugin/java.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 43b03f0b..77267311 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -18,7 +18,6 @@ require("jdtls").start_or_attach({ "--add-opens", "java.base/java.lang=ALL-UNNAMED", "-javaagent:" .. lombok_jar, - "-Xbootclasspath/a:" .. lombok_jar, "-jar", nvim_local_dir .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar", "-configuration", From a67ad971ea54c73a5c5d790164cb478a533e1c75 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Nov 2023 14:07:52 +0200 Subject: [PATCH 2055/2667] Git: enable automatic update of submodules --- home/.config/git/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/git/config b/home/.config/git/config index 7ed9473b..a116abf3 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -60,3 +60,6 @@ helper = !pass-git-helper $@ [rerere] enabled = true + +[submodule] +recurse = true From 48a1f9901f077cf5a85a3ba0352176c1ec1ac11f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Nov 2023 14:07:52 +0200 Subject: [PATCH 2056/2667] Git: enable automatic update of submodules --- home/.config/git/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/git/config b/home/.config/git/config index 7ed9473b..a116abf3 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -60,3 +60,6 @@ helper = !pass-git-helper $@ [rerere] enabled = true + +[submodule] +recurse = true From 8929c69dd8b75b9efcdf059a756525198eafea36 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Nov 2023 14:16:03 +0200 Subject: [PATCH 2057/2667] Git: enable submodule check on push --- home/.config/git/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/git/config b/home/.config/git/config index a116abf3..25e6c42d 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -63,3 +63,6 @@ enabled = true [submodule] recurse = true + +[push] +recurseSubmodules = check From 2bf1f47b2ff2b7996c8b78eb42b5ade822855dc2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Nov 2023 14:16:03 +0200 Subject: [PATCH 2058/2667] Git: enable submodule check on push --- home/.config/git/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/git/config b/home/.config/git/config index a116abf3..25e6c42d 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -63,3 +63,6 @@ enabled = true [submodule] recurse = true + +[push] +recurseSubmodules = check From 7fccc551519011ace3892158516a7da9af21028b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Nov 2023 10:40:27 +0200 Subject: [PATCH 2059/2667] Revert pacman on termux Caused too many issues to solve, using apt instead --- docker/nextcloud/docker-compose.toml | 26 +-- home/.config/mpv/mpv.conf | 3 - home/.config/nvim/lazy-lock.json | 218 +++++++++++++++++++++++++ home/.config/nvim/lua/plugins/init.lua | 4 +- home/.config/zsh/04-aliases.zsh | 21 ++- 5 files changed, 245 insertions(+), 27 deletions(-) create mode 100644 home/.config/nvim/lazy-lock.json diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 26cef007..818d07f0 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -18,19 +18,19 @@ environment = [ "OVERWRITEPROTOCOL=https", ] depends_on = ["redis"] -labels = [ - "ofelia.enabled=true", - "ofelia.job-exec.nextcloud.schedule=0 */5 * * * *", - "ofelia.job-exec.nextcloud.command=php /var/www/html/cron.php", - "ofelia.job-exec.nextcloud.user=www-data", - "ofelia.smtp-host=${SMTP_HOST}", - "ofelia.smtp-port=${SMTP_PORT}", - "ofelia.smtp-user=${SMTP_USER}", - "ofelia.smtp-password=${SMTP_PASSWORD}", - "ofelia.email-to=${EMAIL_TO}", - "ofelia.email-from=${EMAIL_FROM}", - "ofelia.mail-only-on-error", -] + +[services.nextcloud.labels] +"ofelia.enabled" = true +"ofelia.job-exec.nextcloud.schedule" = "0 */5 * * * *" +"ofelia.job-exec.nextcloud.command" = "php /var/www/html/cron.php" +"ofelia.job-exec.nextcloud.user" = "www-data" +"ofelia.smtp-host" = "${SMTP_HOST}" +"ofelia.smtp-port" = "${SMTP_PORT}" +"ofelia.smtp-user" = "${SMTP_USER}" +"ofelia.smtp-password" = "${SMTP_PASSWORD}" +"ofelia.email-to" = "${EMAIL_TO}" +"ofelia.email-from" = "${EMAIL_FROM}" +"ofelia.mail-only-on-error" = true [services.redis] image = "redis:alpine" diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index fc3dff87..28e7c939 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -10,9 +10,6 @@ hwdec-codecs=all {%@@ if wayland @@%} gpu-context=wayland {%@@ endif @@%} -{%@@ if profile == "mko-laptop" @@%} -script=~/.lib/mpris.so -{%@@ endif @@%} ############# # Audio # diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json new file mode 100644 index 00000000..4b100fd7 --- /dev/null +++ b/home/.config/nvim/lazy-lock.json @@ -0,0 +1,218 @@ +{ + "LuaSnip": { + "branch": "master", + "commit": "a4de64570b9620875c8ea04175cd07ed8e32ac99" + }, + "bufferline.nvim": { + "branch": "main", + "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" + }, + "cder.nvim": { + "branch": "main", + "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" + }, + "cmp-buffer": { + "branch": "main", + "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" + }, + "cmp-cmdline": { + "branch": "main", + "commit": "8ee981b4a91f536f52add291594e89fb6645e451" + }, + "cmp-git": { + "branch": "main", + "commit": "f900a4cf117300fdc3ba31d26f8b6223ccd9c574" + }, + "cmp-nvim-lsp": { + "branch": "main", + "commit": "44b16d11215dce86f253ce0c30949813c0a90765" + }, + "cmp-nvim-lua": { + "branch": "main", + "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" + }, + "cmp-path": { + "branch": "main", + "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" + }, + "cmp-spell": { + "branch": "master", + "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" + }, + "cmp_luasnip": { + "branch": "master", + "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" + }, + "copilot-cmp": { + "branch": "master", + "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" + }, + "copilot.lua": { + "branch": "master", + "commit": "73047082d72fcfdde1f73b7f17ad495cffcbafaa" + }, + "dashboard-nvim": { + "branch": "master", + "commit": "c71cab740e2add248c54c458b5ca9d6e77c30fa6" + }, + "emmylua-nvim": { + "branch": "master", + "commit": "58f94b43b4d6fc4c6806598d7b3ed29a6fb2b877" + }, + "firenvim": { + "branch": "master", + "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" + }, + "friendly-snippets": { + "branch": "main", + "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" + }, + "gitsigns.nvim": { + "branch": "main", + "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" + }, + "indent-blankline.nvim": { + "branch": "master", + "commit": "29be0919b91fb59eca9e90690d76014233392bef" + }, + "kanagawa.nvim": { + "branch": "master", + "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" + }, + "lazy.nvim": { + "branch": "main", + "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" + }, + "lsp_signature.nvim": { + "branch": "master", + "commit": "9ed85616b772a07f8db56c26e8fff2d962f1f211" + }, + "lualine.nvim": { + "branch": "master", + "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" + }, + "markdown-preview.nvim": { + "branch": "master", + "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" + }, + "mason-lspconfig.nvim": { + "branch": "main", + "commit": "6eb8cae80f2e4322ec82cd9f8fa423f6d1eb02c3" + }, + "mason-tool-installer.nvim": { + "branch": "main", + "commit": "e4f34741daa9cf95de68a603d3e7a6844a69fdf0" + }, + "mason.nvim": { + "branch": "main", + "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" + }, + "neoformat": { + "branch": "master", + "commit": "51f0eef4c47f4a677ce6272c103d4ac74acb3b8f" + }, + "nvim-asciidoc-preview": { + "branch": "main", + "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" + }, + "nvim-autopairs": { + "branch": "master", + "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" + }, + "nvim-cmp": { + "branch": "main", + "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" + }, + "nvim-colorizer.lua": { + "branch": "master", + "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" + }, + "nvim-dap": { + "branch": "master", + "commit": "9d81c11fd185a131f81841e64941859305f6c42d" + }, + "nvim-jdtls": { + "branch": "master", + "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" + }, + "nvim-lspconfig": { + "branch": "master", + "commit": "36e4ffec0a9e373ac9dbf7949d3567c8f04ca3df" + }, + "nvim-tree.lua": { + "branch": "master", + "commit": "a2aaf8b430c11af36b869cf1c0ad2f7c8ceeaf2c" + }, + "nvim-treesitter": { + "branch": "master", + "commit": "8996612bfbebe1657e1bb55a95201c96cab945c6" + }, + "nvim-ts-context-commentstring": { + "branch": "main", + "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" + }, + "nvim-ufo": { + "branch": "main", + "commit": "ebbab711d909d5f675e38ad489765bd22bd2c6b3" + }, + "nvim-web-devicons": { + "branch": "master", + "commit": "47103b80c38c59f7a1b5408c232b92bf5d018651" + }, + "password-store": { + "branch": "master", + "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" + }, + "plenary.nvim": { + "branch": "master", + "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" + }, + "promise-async": { + "branch": "main", + "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" + }, + "suda.vim": { + "branch": "master", + "commit": "8b0fc3711760195aba104e2d190cff9af8267052" + }, + "telescope-fzf-native.nvim": { + "branch": "main", + "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" + }, + "telescope-ui-select.nvim": { + "branch": "master", + "commit": "0fc69ebbf178631b8ab76745459fade062156ec5" + }, + "telescope.nvim": { + "branch": "master", + "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" + }, + "vim-asciidoctor": { + "branch": "master", + "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" + }, + "vim-caddyfile": { + "branch": "master", + "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" + }, + "vim-commentary": { + "branch": "master", + "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" + }, + "vim-fugitive": { + "branch": "master", + "commit": "46eaf8918b347906789df296143117774e827616" + }, + "vim-gnupg": { + "branch": "main", + "commit": "f9b608f29003dfde6450931dc0f495a912973a88" + }, + "vim-surround": { + "branch": "master", + "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" + }, + "which-key.nvim": { + "branch": "main", + "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" + } +} diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 27c99074..9a3da45e 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -233,6 +233,4 @@ local plugins = { }, } -local lazy_opts = {} - -require("lazy").setup(plugins, lazy_opts) +require("lazy").setup(plugins, { lockfile = "~/git/dotfiles/home/.config/nvim/lazy-lock.json" }) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 4a5a1516..fde351c0 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -30,18 +30,23 @@ function command_not_found_handler { # search and install/remove packages with fzf pi() { - {%@@ if distro_id == "arch" @@%} - SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" + {%@@ if distro_id == "arch" or distro_id == "termux" @@%} + local pkgmanager='pacman' + if command -v paru &> /dev/null; then + pkgmanager='paru' + fi + SELECTED_PKGS="$($pkgmanager -Slq | fzf --header='Install packages' -m --preview "$pkgmanager -Si {1}" | tr '\n' ' ')" {%@@ else @@%} SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show 2>/dev/null {1}' | tr '\n' ' ')" {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then - {%@@ if distro_id == "arch" @@%} - cmd="paru -S $SELECTED_PKGS" + {%@@ if distro_id == "arch" or distro_id == "termux" @@%} + if [ pkgmanager -eq 'pacman' ] && [ distro_id -ne "termux" ]; then + pkgmanager="doas pacman" + fi + cmd="$pkgmanager -S $SELECTED_PKGS" {%@@ elif distro_id == "ubuntu" or distro_id == "debian" @@%} cmd="doas apt install $SELECTED_PKGS" - {%@@ elif distro_id == "termux" @@%} - cmd="apt install $SELECTED_PKGS" {%@@ endif @@%} # Append the expanded command to history @@ -185,9 +190,9 @@ update() { {%@@ elif distro_id == "ubuntu" or distro_id == "debian" @@%} doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} - pkg update && pkg upgrade --yes + pacman -Syu --noconfirm {%@@ endif @@%} - {%@@ if distro_id == "termux" or distro_id == "ubuntu" or distro_id == "debian" @@%} + {%@@ if distro_id == "ubuntu" or distro_id == "debian" @@%} pip-update-installed cargo-update-installed {%@@ endif @@%} From ed43d0f48f9f07ffae70b8bbce67be0b57ba0b01 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Nov 2023 10:40:27 +0200 Subject: [PATCH 2060/2667] Revert pacman on termux Caused too many issues to solve, using apt instead --- docker/nextcloud/docker-compose.toml | 26 +-- home/.config/mpv/mpv.conf | 3 - home/.config/nvim/lazy-lock.json | 218 +++++++++++++++++++++++++ home/.config/nvim/lua/plugins/init.lua | 4 +- home/.config/zsh/04-aliases.zsh | 21 ++- 5 files changed, 245 insertions(+), 27 deletions(-) create mode 100644 home/.config/nvim/lazy-lock.json diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 26cef007..818d07f0 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -18,19 +18,19 @@ environment = [ "OVERWRITEPROTOCOL=https", ] depends_on = ["redis"] -labels = [ - "ofelia.enabled=true", - "ofelia.job-exec.nextcloud.schedule=0 */5 * * * *", - "ofelia.job-exec.nextcloud.command=php /var/www/html/cron.php", - "ofelia.job-exec.nextcloud.user=www-data", - "ofelia.smtp-host=${SMTP_HOST}", - "ofelia.smtp-port=${SMTP_PORT}", - "ofelia.smtp-user=${SMTP_USER}", - "ofelia.smtp-password=${SMTP_PASSWORD}", - "ofelia.email-to=${EMAIL_TO}", - "ofelia.email-from=${EMAIL_FROM}", - "ofelia.mail-only-on-error", -] + +[services.nextcloud.labels] +"ofelia.enabled" = true +"ofelia.job-exec.nextcloud.schedule" = "0 */5 * * * *" +"ofelia.job-exec.nextcloud.command" = "php /var/www/html/cron.php" +"ofelia.job-exec.nextcloud.user" = "www-data" +"ofelia.smtp-host" = "${SMTP_HOST}" +"ofelia.smtp-port" = "${SMTP_PORT}" +"ofelia.smtp-user" = "${SMTP_USER}" +"ofelia.smtp-password" = "${SMTP_PASSWORD}" +"ofelia.email-to" = "${EMAIL_TO}" +"ofelia.email-from" = "${EMAIL_FROM}" +"ofelia.mail-only-on-error" = true [services.redis] image = "redis:alpine" diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index fc3dff87..28e7c939 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -10,9 +10,6 @@ hwdec-codecs=all {%@@ if wayland @@%} gpu-context=wayland {%@@ endif @@%} -{%@@ if profile == "mko-laptop" @@%} -script=~/.lib/mpris.so -{%@@ endif @@%} ############# # Audio # diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json new file mode 100644 index 00000000..4b100fd7 --- /dev/null +++ b/home/.config/nvim/lazy-lock.json @@ -0,0 +1,218 @@ +{ + "LuaSnip": { + "branch": "master", + "commit": "a4de64570b9620875c8ea04175cd07ed8e32ac99" + }, + "bufferline.nvim": { + "branch": "main", + "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" + }, + "cder.nvim": { + "branch": "main", + "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" + }, + "cmp-buffer": { + "branch": "main", + "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" + }, + "cmp-cmdline": { + "branch": "main", + "commit": "8ee981b4a91f536f52add291594e89fb6645e451" + }, + "cmp-git": { + "branch": "main", + "commit": "f900a4cf117300fdc3ba31d26f8b6223ccd9c574" + }, + "cmp-nvim-lsp": { + "branch": "main", + "commit": "44b16d11215dce86f253ce0c30949813c0a90765" + }, + "cmp-nvim-lua": { + "branch": "main", + "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" + }, + "cmp-path": { + "branch": "main", + "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" + }, + "cmp-spell": { + "branch": "master", + "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" + }, + "cmp_luasnip": { + "branch": "master", + "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" + }, + "copilot-cmp": { + "branch": "master", + "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" + }, + "copilot.lua": { + "branch": "master", + "commit": "73047082d72fcfdde1f73b7f17ad495cffcbafaa" + }, + "dashboard-nvim": { + "branch": "master", + "commit": "c71cab740e2add248c54c458b5ca9d6e77c30fa6" + }, + "emmylua-nvim": { + "branch": "master", + "commit": "58f94b43b4d6fc4c6806598d7b3ed29a6fb2b877" + }, + "firenvim": { + "branch": "master", + "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" + }, + "friendly-snippets": { + "branch": "main", + "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" + }, + "gitsigns.nvim": { + "branch": "main", + "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" + }, + "indent-blankline.nvim": { + "branch": "master", + "commit": "29be0919b91fb59eca9e90690d76014233392bef" + }, + "kanagawa.nvim": { + "branch": "master", + "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" + }, + "lazy.nvim": { + "branch": "main", + "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" + }, + "lsp_signature.nvim": { + "branch": "master", + "commit": "9ed85616b772a07f8db56c26e8fff2d962f1f211" + }, + "lualine.nvim": { + "branch": "master", + "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" + }, + "markdown-preview.nvim": { + "branch": "master", + "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" + }, + "mason-lspconfig.nvim": { + "branch": "main", + "commit": "6eb8cae80f2e4322ec82cd9f8fa423f6d1eb02c3" + }, + "mason-tool-installer.nvim": { + "branch": "main", + "commit": "e4f34741daa9cf95de68a603d3e7a6844a69fdf0" + }, + "mason.nvim": { + "branch": "main", + "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" + }, + "neoformat": { + "branch": "master", + "commit": "51f0eef4c47f4a677ce6272c103d4ac74acb3b8f" + }, + "nvim-asciidoc-preview": { + "branch": "main", + "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" + }, + "nvim-autopairs": { + "branch": "master", + "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" + }, + "nvim-cmp": { + "branch": "main", + "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" + }, + "nvim-colorizer.lua": { + "branch": "master", + "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" + }, + "nvim-dap": { + "branch": "master", + "commit": "9d81c11fd185a131f81841e64941859305f6c42d" + }, + "nvim-jdtls": { + "branch": "master", + "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" + }, + "nvim-lspconfig": { + "branch": "master", + "commit": "36e4ffec0a9e373ac9dbf7949d3567c8f04ca3df" + }, + "nvim-tree.lua": { + "branch": "master", + "commit": "a2aaf8b430c11af36b869cf1c0ad2f7c8ceeaf2c" + }, + "nvim-treesitter": { + "branch": "master", + "commit": "8996612bfbebe1657e1bb55a95201c96cab945c6" + }, + "nvim-ts-context-commentstring": { + "branch": "main", + "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" + }, + "nvim-ufo": { + "branch": "main", + "commit": "ebbab711d909d5f675e38ad489765bd22bd2c6b3" + }, + "nvim-web-devicons": { + "branch": "master", + "commit": "47103b80c38c59f7a1b5408c232b92bf5d018651" + }, + "password-store": { + "branch": "master", + "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" + }, + "plenary.nvim": { + "branch": "master", + "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" + }, + "promise-async": { + "branch": "main", + "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" + }, + "suda.vim": { + "branch": "master", + "commit": "8b0fc3711760195aba104e2d190cff9af8267052" + }, + "telescope-fzf-native.nvim": { + "branch": "main", + "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" + }, + "telescope-ui-select.nvim": { + "branch": "master", + "commit": "0fc69ebbf178631b8ab76745459fade062156ec5" + }, + "telescope.nvim": { + "branch": "master", + "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" + }, + "vim-asciidoctor": { + "branch": "master", + "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" + }, + "vim-caddyfile": { + "branch": "master", + "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" + }, + "vim-commentary": { + "branch": "master", + "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" + }, + "vim-fugitive": { + "branch": "master", + "commit": "46eaf8918b347906789df296143117774e827616" + }, + "vim-gnupg": { + "branch": "main", + "commit": "f9b608f29003dfde6450931dc0f495a912973a88" + }, + "vim-surround": { + "branch": "master", + "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" + }, + "which-key.nvim": { + "branch": "main", + "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" + } +} diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 27c99074..9a3da45e 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -233,6 +233,4 @@ local plugins = { }, } -local lazy_opts = {} - -require("lazy").setup(plugins, lazy_opts) +require("lazy").setup(plugins, { lockfile = "~/git/dotfiles/home/.config/nvim/lazy-lock.json" }) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 4a5a1516..fde351c0 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -30,18 +30,23 @@ function command_not_found_handler { # search and install/remove packages with fzf pi() { - {%@@ if distro_id == "arch" @@%} - SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" + {%@@ if distro_id == "arch" or distro_id == "termux" @@%} + local pkgmanager='pacman' + if command -v paru &> /dev/null; then + pkgmanager='paru' + fi + SELECTED_PKGS="$($pkgmanager -Slq | fzf --header='Install packages' -m --preview "$pkgmanager -Si {1}" | tr '\n' ' ')" {%@@ else @@%} SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show 2>/dev/null {1}' | tr '\n' ' ')" {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then - {%@@ if distro_id == "arch" @@%} - cmd="paru -S $SELECTED_PKGS" + {%@@ if distro_id == "arch" or distro_id == "termux" @@%} + if [ pkgmanager -eq 'pacman' ] && [ distro_id -ne "termux" ]; then + pkgmanager="doas pacman" + fi + cmd="$pkgmanager -S $SELECTED_PKGS" {%@@ elif distro_id == "ubuntu" or distro_id == "debian" @@%} cmd="doas apt install $SELECTED_PKGS" - {%@@ elif distro_id == "termux" @@%} - cmd="apt install $SELECTED_PKGS" {%@@ endif @@%} # Append the expanded command to history @@ -185,9 +190,9 @@ update() { {%@@ elif distro_id == "ubuntu" or distro_id == "debian" @@%} doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} - pkg update && pkg upgrade --yes + pacman -Syu --noconfirm {%@@ endif @@%} - {%@@ if distro_id == "termux" or distro_id == "ubuntu" or distro_id == "debian" @@%} + {%@@ if distro_id == "ubuntu" or distro_id == "debian" @@%} pip-update-installed cargo-update-installed {%@@ endif @@%} From e8667d3c982daac178094facdbc7aa7552eed679 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Nov 2023 10:51:56 +0200 Subject: [PATCH 2061/2667] Revert more termux stuff related to previous commit --- home/.config/zsh/04-aliases.zsh | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index fde351c0..4a5a1516 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -30,23 +30,18 @@ function command_not_found_handler { # search and install/remove packages with fzf pi() { - {%@@ if distro_id == "arch" or distro_id == "termux" @@%} - local pkgmanager='pacman' - if command -v paru &> /dev/null; then - pkgmanager='paru' - fi - SELECTED_PKGS="$($pkgmanager -Slq | fzf --header='Install packages' -m --preview "$pkgmanager -Si {1}" | tr '\n' ' ')" + {%@@ if distro_id == "arch" @@%} + SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" {%@@ else @@%} SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show 2>/dev/null {1}' | tr '\n' ' ')" {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then - {%@@ if distro_id == "arch" or distro_id == "termux" @@%} - if [ pkgmanager -eq 'pacman' ] && [ distro_id -ne "termux" ]; then - pkgmanager="doas pacman" - fi - cmd="$pkgmanager -S $SELECTED_PKGS" + {%@@ if distro_id == "arch" @@%} + cmd="paru -S $SELECTED_PKGS" {%@@ elif distro_id == "ubuntu" or distro_id == "debian" @@%} cmd="doas apt install $SELECTED_PKGS" + {%@@ elif distro_id == "termux" @@%} + cmd="apt install $SELECTED_PKGS" {%@@ endif @@%} # Append the expanded command to history @@ -190,9 +185,9 @@ update() { {%@@ elif distro_id == "ubuntu" or distro_id == "debian" @@%} doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} - pacman -Syu --noconfirm + pkg update && pkg upgrade --yes {%@@ endif @@%} - {%@@ if distro_id == "ubuntu" or distro_id == "debian" @@%} + {%@@ if distro_id == "termux" or distro_id == "ubuntu" or distro_id == "debian" @@%} pip-update-installed cargo-update-installed {%@@ endif @@%} From a13b7829ea2ab125a11fe743096563962ed36590 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Nov 2023 10:51:56 +0200 Subject: [PATCH 2062/2667] Revert more termux stuff related to previous commit --- home/.config/zsh/04-aliases.zsh | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index fde351c0..4a5a1516 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -30,23 +30,18 @@ function command_not_found_handler { # search and install/remove packages with fzf pi() { - {%@@ if distro_id == "arch" or distro_id == "termux" @@%} - local pkgmanager='pacman' - if command -v paru &> /dev/null; then - pkgmanager='paru' - fi - SELECTED_PKGS="$($pkgmanager -Slq | fzf --header='Install packages' -m --preview "$pkgmanager -Si {1}" | tr '\n' ' ')" + {%@@ if distro_id == "arch" @@%} + SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" {%@@ else @@%} SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show 2>/dev/null {1}' | tr '\n' ' ')" {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then - {%@@ if distro_id == "arch" or distro_id == "termux" @@%} - if [ pkgmanager -eq 'pacman' ] && [ distro_id -ne "termux" ]; then - pkgmanager="doas pacman" - fi - cmd="$pkgmanager -S $SELECTED_PKGS" + {%@@ if distro_id == "arch" @@%} + cmd="paru -S $SELECTED_PKGS" {%@@ elif distro_id == "ubuntu" or distro_id == "debian" @@%} cmd="doas apt install $SELECTED_PKGS" + {%@@ elif distro_id == "termux" @@%} + cmd="apt install $SELECTED_PKGS" {%@@ endif @@%} # Append the expanded command to history @@ -190,9 +185,9 @@ update() { {%@@ elif distro_id == "ubuntu" or distro_id == "debian" @@%} doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} - pacman -Syu --noconfirm + pkg update && pkg upgrade --yes {%@@ endif @@%} - {%@@ if distro_id == "ubuntu" or distro_id == "debian" @@%} + {%@@ if distro_id == "termux" or distro_id == "ubuntu" or distro_id == "debian" @@%} pip-update-installed cargo-update-installed {%@@ endif @@%} From dda94cb79330c3c97dd62476e188d53d43e2368b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Nov 2023 15:17:00 +0200 Subject: [PATCH 2063/2667] Don't format lazy-lock.json --- .prettierignore | 1 + home/.config/nvim/lazy-lock.json | 272 +++++++------------------------ 2 files changed, 56 insertions(+), 217 deletions(-) diff --git a/.prettierignore b/.prettierignore index de59e4f6..2fd7d0d7 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,2 +1,3 @@ package-lock.json +lazy-lock.json dotdrop/ diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 4b100fd7..a34105e1 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,218 +1,56 @@ { - "LuaSnip": { - "branch": "master", - "commit": "a4de64570b9620875c8ea04175cd07ed8e32ac99" - }, - "bufferline.nvim": { - "branch": "main", - "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" - }, - "cder.nvim": { - "branch": "main", - "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" - }, - "cmp-buffer": { - "branch": "main", - "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" - }, - "cmp-cmdline": { - "branch": "main", - "commit": "8ee981b4a91f536f52add291594e89fb6645e451" - }, - "cmp-git": { - "branch": "main", - "commit": "f900a4cf117300fdc3ba31d26f8b6223ccd9c574" - }, - "cmp-nvim-lsp": { - "branch": "main", - "commit": "44b16d11215dce86f253ce0c30949813c0a90765" - }, - "cmp-nvim-lua": { - "branch": "main", - "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" - }, - "cmp-path": { - "branch": "main", - "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" - }, - "cmp-spell": { - "branch": "master", - "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" - }, - "cmp_luasnip": { - "branch": "master", - "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" - }, - "copilot-cmp": { - "branch": "master", - "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" - }, - "copilot.lua": { - "branch": "master", - "commit": "73047082d72fcfdde1f73b7f17ad495cffcbafaa" - }, - "dashboard-nvim": { - "branch": "master", - "commit": "c71cab740e2add248c54c458b5ca9d6e77c30fa6" - }, - "emmylua-nvim": { - "branch": "master", - "commit": "58f94b43b4d6fc4c6806598d7b3ed29a6fb2b877" - }, - "firenvim": { - "branch": "master", - "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" - }, - "friendly-snippets": { - "branch": "main", - "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" - }, - "gitsigns.nvim": { - "branch": "main", - "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" - }, - "indent-blankline.nvim": { - "branch": "master", - "commit": "29be0919b91fb59eca9e90690d76014233392bef" - }, - "kanagawa.nvim": { - "branch": "master", - "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" - }, - "lazy.nvim": { - "branch": "main", - "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" - }, - "lsp_signature.nvim": { - "branch": "master", - "commit": "9ed85616b772a07f8db56c26e8fff2d962f1f211" - }, - "lualine.nvim": { - "branch": "master", - "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" - }, - "markdown-preview.nvim": { - "branch": "master", - "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" - }, - "mason-lspconfig.nvim": { - "branch": "main", - "commit": "6eb8cae80f2e4322ec82cd9f8fa423f6d1eb02c3" - }, - "mason-tool-installer.nvim": { - "branch": "main", - "commit": "e4f34741daa9cf95de68a603d3e7a6844a69fdf0" - }, - "mason.nvim": { - "branch": "main", - "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" - }, - "neoformat": { - "branch": "master", - "commit": "51f0eef4c47f4a677ce6272c103d4ac74acb3b8f" - }, - "nvim-asciidoc-preview": { - "branch": "main", - "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" - }, - "nvim-autopairs": { - "branch": "master", - "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" - }, - "nvim-cmp": { - "branch": "main", - "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" - }, - "nvim-colorizer.lua": { - "branch": "master", - "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" - }, - "nvim-dap": { - "branch": "master", - "commit": "9d81c11fd185a131f81841e64941859305f6c42d" - }, - "nvim-jdtls": { - "branch": "master", - "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" - }, - "nvim-lspconfig": { - "branch": "master", - "commit": "36e4ffec0a9e373ac9dbf7949d3567c8f04ca3df" - }, - "nvim-tree.lua": { - "branch": "master", - "commit": "a2aaf8b430c11af36b869cf1c0ad2f7c8ceeaf2c" - }, - "nvim-treesitter": { - "branch": "master", - "commit": "8996612bfbebe1657e1bb55a95201c96cab945c6" - }, - "nvim-ts-context-commentstring": { - "branch": "main", - "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" - }, - "nvim-ufo": { - "branch": "main", - "commit": "ebbab711d909d5f675e38ad489765bd22bd2c6b3" - }, - "nvim-web-devicons": { - "branch": "master", - "commit": "47103b80c38c59f7a1b5408c232b92bf5d018651" - }, - "password-store": { - "branch": "master", - "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" - }, - "plenary.nvim": { - "branch": "master", - "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" - }, - "promise-async": { - "branch": "main", - "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" - }, - "suda.vim": { - "branch": "master", - "commit": "8b0fc3711760195aba104e2d190cff9af8267052" - }, - "telescope-fzf-native.nvim": { - "branch": "main", - "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" - }, - "telescope-ui-select.nvim": { - "branch": "master", - "commit": "0fc69ebbf178631b8ab76745459fade062156ec5" - }, - "telescope.nvim": { - "branch": "master", - "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" - }, - "vim-asciidoctor": { - "branch": "master", - "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" - }, - "vim-caddyfile": { - "branch": "master", - "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" - }, - "vim-commentary": { - "branch": "master", - "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" - }, - "vim-fugitive": { - "branch": "master", - "commit": "46eaf8918b347906789df296143117774e827616" - }, - "vim-gnupg": { - "branch": "main", - "commit": "f9b608f29003dfde6450931dc0f495a912973a88" - }, - "vim-surround": { - "branch": "master", - "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" - }, - "which-key.nvim": { - "branch": "main", - "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" - } -} + "LuaSnip": { "branch": "master", "commit": "46c91e814732c1630b8a8b50d04acbf54b8320fa" }, + "bufferline.nvim": { "branch": "main", "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" }, + "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, + "cmp-git": { "branch": "main", "commit": "f900a4cf117300fdc3ba31d26f8b6223ccd9c574" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, + "copilot.lua": { "branch": "master", "commit": "73047082d72fcfdde1f73b7f17ad495cffcbafaa" }, + "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, + "emmylua-nvim": { "branch": "master", "commit": "e19405a13fa267f6e7500843240d735a3a0745aa" }, + "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, + "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, + "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" }, + "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, + "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, + "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, + "lsp_signature.nvim": { "branch": "master", "commit": "9ed85616b772a07f8db56c26e8fff2d962f1f211" }, + "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "6eb8cae80f2e4322ec82cd9f8fa423f6d1eb02c3" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "e4f34741daa9cf95de68a603d3e7a6844a69fdf0" }, + "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, + "neoformat": { "branch": "master", "commit": "e5fe7e8f7c3dd071b90f19af0e8c7cfa56cdedc7" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, + "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, + "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, + "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, + "nvim-jdtls": { "branch": "master", "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" }, + "nvim-lspconfig": { "branch": "master", "commit": "b0852218bc5fa6514a71a9da6d5cfa63a263c83d" }, + "nvim-tree.lua": { "branch": "master", "commit": "a2aaf8b430c11af36b869cf1c0ad2f7c8ceeaf2c" }, + "nvim-treesitter": { "branch": "master", "commit": "075a64addc33390028ea124a1046a43497f05cd1" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" }, + "nvim-ufo": { "branch": "main", "commit": "ebbab711d909d5f675e38ad489765bd22bd2c6b3" }, + "nvim-web-devicons": { "branch": "master", "commit": "47103b80c38c59f7a1b5408c232b92bf5d018651" }, + "password-store": { "branch": "master", "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" }, + "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "0fc69ebbf178631b8ab76745459fade062156ec5" }, + "telescope.nvim": { "branch": "master", "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" }, + "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, + "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, + "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" }, + "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" }, + "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, + "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } +} \ No newline at end of file From 39ff6b0eb626aa37658fef5375cfbea2b816c77b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Nov 2023 15:17:00 +0200 Subject: [PATCH 2064/2667] Don't format lazy-lock.json --- .prettierignore | 1 + home/.config/nvim/lazy-lock.json | 272 +++++++------------------------ 2 files changed, 56 insertions(+), 217 deletions(-) diff --git a/.prettierignore b/.prettierignore index de59e4f6..2fd7d0d7 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,2 +1,3 @@ package-lock.json +lazy-lock.json dotdrop/ diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 4b100fd7..a34105e1 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,218 +1,56 @@ { - "LuaSnip": { - "branch": "master", - "commit": "a4de64570b9620875c8ea04175cd07ed8e32ac99" - }, - "bufferline.nvim": { - "branch": "main", - "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" - }, - "cder.nvim": { - "branch": "main", - "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" - }, - "cmp-buffer": { - "branch": "main", - "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" - }, - "cmp-cmdline": { - "branch": "main", - "commit": "8ee981b4a91f536f52add291594e89fb6645e451" - }, - "cmp-git": { - "branch": "main", - "commit": "f900a4cf117300fdc3ba31d26f8b6223ccd9c574" - }, - "cmp-nvim-lsp": { - "branch": "main", - "commit": "44b16d11215dce86f253ce0c30949813c0a90765" - }, - "cmp-nvim-lua": { - "branch": "main", - "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" - }, - "cmp-path": { - "branch": "main", - "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" - }, - "cmp-spell": { - "branch": "master", - "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" - }, - "cmp_luasnip": { - "branch": "master", - "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" - }, - "copilot-cmp": { - "branch": "master", - "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" - }, - "copilot.lua": { - "branch": "master", - "commit": "73047082d72fcfdde1f73b7f17ad495cffcbafaa" - }, - "dashboard-nvim": { - "branch": "master", - "commit": "c71cab740e2add248c54c458b5ca9d6e77c30fa6" - }, - "emmylua-nvim": { - "branch": "master", - "commit": "58f94b43b4d6fc4c6806598d7b3ed29a6fb2b877" - }, - "firenvim": { - "branch": "master", - "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" - }, - "friendly-snippets": { - "branch": "main", - "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" - }, - "gitsigns.nvim": { - "branch": "main", - "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" - }, - "indent-blankline.nvim": { - "branch": "master", - "commit": "29be0919b91fb59eca9e90690d76014233392bef" - }, - "kanagawa.nvim": { - "branch": "master", - "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" - }, - "lazy.nvim": { - "branch": "main", - "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" - }, - "lsp_signature.nvim": { - "branch": "master", - "commit": "9ed85616b772a07f8db56c26e8fff2d962f1f211" - }, - "lualine.nvim": { - "branch": "master", - "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" - }, - "markdown-preview.nvim": { - "branch": "master", - "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" - }, - "mason-lspconfig.nvim": { - "branch": "main", - "commit": "6eb8cae80f2e4322ec82cd9f8fa423f6d1eb02c3" - }, - "mason-tool-installer.nvim": { - "branch": "main", - "commit": "e4f34741daa9cf95de68a603d3e7a6844a69fdf0" - }, - "mason.nvim": { - "branch": "main", - "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" - }, - "neoformat": { - "branch": "master", - "commit": "51f0eef4c47f4a677ce6272c103d4ac74acb3b8f" - }, - "nvim-asciidoc-preview": { - "branch": "main", - "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" - }, - "nvim-autopairs": { - "branch": "master", - "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" - }, - "nvim-cmp": { - "branch": "main", - "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" - }, - "nvim-colorizer.lua": { - "branch": "master", - "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" - }, - "nvim-dap": { - "branch": "master", - "commit": "9d81c11fd185a131f81841e64941859305f6c42d" - }, - "nvim-jdtls": { - "branch": "master", - "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" - }, - "nvim-lspconfig": { - "branch": "master", - "commit": "36e4ffec0a9e373ac9dbf7949d3567c8f04ca3df" - }, - "nvim-tree.lua": { - "branch": "master", - "commit": "a2aaf8b430c11af36b869cf1c0ad2f7c8ceeaf2c" - }, - "nvim-treesitter": { - "branch": "master", - "commit": "8996612bfbebe1657e1bb55a95201c96cab945c6" - }, - "nvim-ts-context-commentstring": { - "branch": "main", - "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" - }, - "nvim-ufo": { - "branch": "main", - "commit": "ebbab711d909d5f675e38ad489765bd22bd2c6b3" - }, - "nvim-web-devicons": { - "branch": "master", - "commit": "47103b80c38c59f7a1b5408c232b92bf5d018651" - }, - "password-store": { - "branch": "master", - "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" - }, - "plenary.nvim": { - "branch": "master", - "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" - }, - "promise-async": { - "branch": "main", - "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" - }, - "suda.vim": { - "branch": "master", - "commit": "8b0fc3711760195aba104e2d190cff9af8267052" - }, - "telescope-fzf-native.nvim": { - "branch": "main", - "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" - }, - "telescope-ui-select.nvim": { - "branch": "master", - "commit": "0fc69ebbf178631b8ab76745459fade062156ec5" - }, - "telescope.nvim": { - "branch": "master", - "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" - }, - "vim-asciidoctor": { - "branch": "master", - "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" - }, - "vim-caddyfile": { - "branch": "master", - "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" - }, - "vim-commentary": { - "branch": "master", - "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" - }, - "vim-fugitive": { - "branch": "master", - "commit": "46eaf8918b347906789df296143117774e827616" - }, - "vim-gnupg": { - "branch": "main", - "commit": "f9b608f29003dfde6450931dc0f495a912973a88" - }, - "vim-surround": { - "branch": "master", - "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" - }, - "which-key.nvim": { - "branch": "main", - "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" - } -} + "LuaSnip": { "branch": "master", "commit": "46c91e814732c1630b8a8b50d04acbf54b8320fa" }, + "bufferline.nvim": { "branch": "main", "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" }, + "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, + "cmp-git": { "branch": "main", "commit": "f900a4cf117300fdc3ba31d26f8b6223ccd9c574" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, + "copilot.lua": { "branch": "master", "commit": "73047082d72fcfdde1f73b7f17ad495cffcbafaa" }, + "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, + "emmylua-nvim": { "branch": "master", "commit": "e19405a13fa267f6e7500843240d735a3a0745aa" }, + "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, + "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, + "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" }, + "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, + "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, + "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, + "lsp_signature.nvim": { "branch": "master", "commit": "9ed85616b772a07f8db56c26e8fff2d962f1f211" }, + "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "6eb8cae80f2e4322ec82cd9f8fa423f6d1eb02c3" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "e4f34741daa9cf95de68a603d3e7a6844a69fdf0" }, + "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, + "neoformat": { "branch": "master", "commit": "e5fe7e8f7c3dd071b90f19af0e8c7cfa56cdedc7" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, + "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, + "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, + "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, + "nvim-jdtls": { "branch": "master", "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" }, + "nvim-lspconfig": { "branch": "master", "commit": "b0852218bc5fa6514a71a9da6d5cfa63a263c83d" }, + "nvim-tree.lua": { "branch": "master", "commit": "a2aaf8b430c11af36b869cf1c0ad2f7c8ceeaf2c" }, + "nvim-treesitter": { "branch": "master", "commit": "075a64addc33390028ea124a1046a43497f05cd1" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" }, + "nvim-ufo": { "branch": "main", "commit": "ebbab711d909d5f675e38ad489765bd22bd2c6b3" }, + "nvim-web-devicons": { "branch": "master", "commit": "47103b80c38c59f7a1b5408c232b92bf5d018651" }, + "password-store": { "branch": "master", "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" }, + "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "0fc69ebbf178631b8ab76745459fade062156ec5" }, + "telescope.nvim": { "branch": "master", "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" }, + "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, + "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, + "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" }, + "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" }, + "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, + "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } +} \ No newline at end of file From 0e71bad9d2f7192db0efe414a00f76880ea11103 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Nov 2023 18:02:12 +0200 Subject: [PATCH 2065/2667] Configure npm global packages to path --- config.toml | 192 +++++++++++++++++++++++------------- home/.config/zsh/02-env.zsh | 3 + home/.npmrc | 1 + 3 files changed, 125 insertions(+), 71 deletions(-) create mode 100644 home/.npmrc diff --git a/config.toml b/config.toml index c22c860e..b64c3f1e 100644 --- a/config.toml +++ b/config.toml @@ -234,115 +234,165 @@ dst = "~/.config/wal" [dotfiles."f_dconf.ini"] src = ".config/dconf.ini" dst = "~/.config/dconf.ini" -actions = ["dconf-load"] +actions = [ + "dconf-load", +] [dotfiles."f_docker-config.json"] src = ".docker/config.json" dst = "~/.docker/config.json" chmod = "600" +[dotfiles.f_npmrc] +src = ".npmrc" +dst = "~/.npmrc" +chmod = "600" + [profiles.pacman] -dotfiles = ["f_makepkg.conf", "f_paru.conf"] +dotfiles = [ + "f_makepkg.conf", + "f_paru.conf", +] [profiles.terminal] dotfiles = [ - "d_wal", - "d_nvim", - "d_ssh", - "d_zsh", - "f_alacritty.yml", - "f_gitconfig", - "f_hushlogin", - "f_ignore", - "f_mailcap", - "f_ranger.conf", - "f_ranger_commands.py", - "f_rtv.cfg", - "f_tmux.conf", - "f_zshrc", + "d_wal", + "d_nvim", + "d_ssh", + "d_zsh", + "f_alacritty.yml", + "f_gitconfig", + "f_hushlogin", + "f_ignore", + "f_mailcap", + "f_ranger.conf", + "f_ranger_commands.py", + "f_rtv.cfg", + "f_tmux.conf", + "f_zshrc", ] [profiles.email] -dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] +dotfiles = [ + "d_neomutt", + "d_imapnotify", + "f_mbsyncrc", + "f_msmtp_config", +] [profiles.media] dotfiles = [ - "d_mpv", - "f_abcde.conf", - "f_beets_config", - "f_beets_whitelist", - "f_libra_config", - "f_mpd.conf", - "f_mpdris2.conf", - "f_mpdscribble.conf", - "f_ncmpcpp.conf", - "f_ncmpcpp_bindings", - "f_youtube-dl_config", + "d_mpv", + "f_abcde.conf", + "f_beets_config", + "f_beets_whitelist", + "f_libra_config", + "f_mpd.conf", + "f_mpdris2.conf", + "f_mpdscribble.conf", + "f_ncmpcpp.conf", + "f_ncmpcpp_bindings", + "f_youtube-dl_config", ] [profiles.gpg] dotfiles = [ - "f_gpg-agent.conf", - "f_gpg.conf", - "f_gpg_scdaemon.conf", - "f_pam_environment", + "f_gpg-agent.conf", + "f_gpg.conf", + "f_gpg_scdaemon.conf", + "f_pam_environment", ] [profiles.Mirkwood] -include = ["pacman", "terminal", "email", "media", "gpg"] -dotfiles = [ - "d_rofi", - "f_librewolf_overrides", - "f_dconf.ini", - "f_docker-config.json", - "f_fonts.conf", +include = [ + "pacman", + "terminal", + "email", + "media", + "gpg", ] - -[profiles.Moria] -include = ["pacman", "terminal", "media", "gpg"] dotfiles = [ - "f_librewolf_overrides", - "f_dconf.ini", - "f_zprofile", - "f_fonts.conf", + "d_rofi", + "f_librewolf_overrides", + "f_dconf.ini", + "f_docker-config.json", + "f_fonts.conf", + "f_npmrc", ] -[profiles.Tirion] -include = ["terminal", "gpg"] - -[profiles.Gondor] -include = ["pacman", "terminal"] - -[profiles.mko-laptop] -include = ["terminal", "media", "gpg"] -dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] - -[profiles.Isengard] -include = ["terminal"] - -[profiles.Edoras] -include = ["terminal"] - -[profiles.TakamakiPC] -include = ["terminal"] - -[profiles.localhost] -include = ["terminal"] - -[profiles.ViiruJaTeippi] -include = ["terminal"] - [profiles.Mirkwood.variables] wayland = true +[profiles.Moria] +include = [ + "pacman", + "terminal", + "media", + "gpg", +] +dotfiles = [ + "f_librewolf_overrides", + "f_dconf.ini", + "f_zprofile", + "f_fonts.conf", +] + [profiles.Moria.variables] wayland = true +[profiles.Tirion] +include = [ + "terminal", + "gpg", +] + +[profiles.Gondor] +include = [ + "pacman", + "terminal", +] + +[profiles.mko-laptop] +include = [ + "terminal", + "media", + "gpg", +] +dotfiles = [ + "f_librewolf_overrides", + "f_dconf.ini", +] + [profiles.mko-laptop.variables] wayland = true +[profiles.Isengard] +include = [ + "terminal", +] + [profiles.Isengard.variables] distro_id = "termux" +[profiles.Edoras] +include = [ + "terminal", +] + +[profiles.TakamakiPC] +include = [ + "terminal", +] + [profiles.TakamakiPC.variables] wayland = false + +[profiles.localhost] +include = [ + "terminal", +] + +[profiles.ViiruJaTeippi] +include = [ + "terminal", +] diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 2222ab78..7e904699 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -27,6 +27,9 @@ export USRNAME=$USER # Add ~/.local/bin to path export PATH="$HOME/.local/bin:$PATH" +# +# Add locally installed npm binaries to path +export PATH="$HOME/.local/share/npm/bin:$PATH" # Add ~/.cargo/bin to path export PATH="$HOME/.cargo/bin:$PATH" diff --git a/home/.npmrc b/home/.npmrc new file mode 100644 index 00000000..256f89fc --- /dev/null +++ b/home/.npmrc @@ -0,0 +1 @@ +prefix=~/.local/share/npm From 690deb51c0c23bede7cdf2e5baad77ef94b3f4ae Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Nov 2023 18:02:12 +0200 Subject: [PATCH 2066/2667] Configure npm global packages to path --- config.toml | 192 +++++++++++++++++++++++------------- home/.config/zsh/02-env.zsh | 3 + home/.npmrc | 1 + 3 files changed, 125 insertions(+), 71 deletions(-) create mode 100644 home/.npmrc diff --git a/config.toml b/config.toml index c22c860e..b64c3f1e 100644 --- a/config.toml +++ b/config.toml @@ -234,115 +234,165 @@ dst = "~/.config/wal" [dotfiles."f_dconf.ini"] src = ".config/dconf.ini" dst = "~/.config/dconf.ini" -actions = ["dconf-load"] +actions = [ + "dconf-load", +] [dotfiles."f_docker-config.json"] src = ".docker/config.json" dst = "~/.docker/config.json" chmod = "600" +[dotfiles.f_npmrc] +src = ".npmrc" +dst = "~/.npmrc" +chmod = "600" + [profiles.pacman] -dotfiles = ["f_makepkg.conf", "f_paru.conf"] +dotfiles = [ + "f_makepkg.conf", + "f_paru.conf", +] [profiles.terminal] dotfiles = [ - "d_wal", - "d_nvim", - "d_ssh", - "d_zsh", - "f_alacritty.yml", - "f_gitconfig", - "f_hushlogin", - "f_ignore", - "f_mailcap", - "f_ranger.conf", - "f_ranger_commands.py", - "f_rtv.cfg", - "f_tmux.conf", - "f_zshrc", + "d_wal", + "d_nvim", + "d_ssh", + "d_zsh", + "f_alacritty.yml", + "f_gitconfig", + "f_hushlogin", + "f_ignore", + "f_mailcap", + "f_ranger.conf", + "f_ranger_commands.py", + "f_rtv.cfg", + "f_tmux.conf", + "f_zshrc", ] [profiles.email] -dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] +dotfiles = [ + "d_neomutt", + "d_imapnotify", + "f_mbsyncrc", + "f_msmtp_config", +] [profiles.media] dotfiles = [ - "d_mpv", - "f_abcde.conf", - "f_beets_config", - "f_beets_whitelist", - "f_libra_config", - "f_mpd.conf", - "f_mpdris2.conf", - "f_mpdscribble.conf", - "f_ncmpcpp.conf", - "f_ncmpcpp_bindings", - "f_youtube-dl_config", + "d_mpv", + "f_abcde.conf", + "f_beets_config", + "f_beets_whitelist", + "f_libra_config", + "f_mpd.conf", + "f_mpdris2.conf", + "f_mpdscribble.conf", + "f_ncmpcpp.conf", + "f_ncmpcpp_bindings", + "f_youtube-dl_config", ] [profiles.gpg] dotfiles = [ - "f_gpg-agent.conf", - "f_gpg.conf", - "f_gpg_scdaemon.conf", - "f_pam_environment", + "f_gpg-agent.conf", + "f_gpg.conf", + "f_gpg_scdaemon.conf", + "f_pam_environment", ] [profiles.Mirkwood] -include = ["pacman", "terminal", "email", "media", "gpg"] -dotfiles = [ - "d_rofi", - "f_librewolf_overrides", - "f_dconf.ini", - "f_docker-config.json", - "f_fonts.conf", +include = [ + "pacman", + "terminal", + "email", + "media", + "gpg", ] - -[profiles.Moria] -include = ["pacman", "terminal", "media", "gpg"] dotfiles = [ - "f_librewolf_overrides", - "f_dconf.ini", - "f_zprofile", - "f_fonts.conf", + "d_rofi", + "f_librewolf_overrides", + "f_dconf.ini", + "f_docker-config.json", + "f_fonts.conf", + "f_npmrc", ] -[profiles.Tirion] -include = ["terminal", "gpg"] - -[profiles.Gondor] -include = ["pacman", "terminal"] - -[profiles.mko-laptop] -include = ["terminal", "media", "gpg"] -dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] - -[profiles.Isengard] -include = ["terminal"] - -[profiles.Edoras] -include = ["terminal"] - -[profiles.TakamakiPC] -include = ["terminal"] - -[profiles.localhost] -include = ["terminal"] - -[profiles.ViiruJaTeippi] -include = ["terminal"] - [profiles.Mirkwood.variables] wayland = true +[profiles.Moria] +include = [ + "pacman", + "terminal", + "media", + "gpg", +] +dotfiles = [ + "f_librewolf_overrides", + "f_dconf.ini", + "f_zprofile", + "f_fonts.conf", +] + [profiles.Moria.variables] wayland = true +[profiles.Tirion] +include = [ + "terminal", + "gpg", +] + +[profiles.Gondor] +include = [ + "pacman", + "terminal", +] + +[profiles.mko-laptop] +include = [ + "terminal", + "media", + "gpg", +] +dotfiles = [ + "f_librewolf_overrides", + "f_dconf.ini", +] + [profiles.mko-laptop.variables] wayland = true +[profiles.Isengard] +include = [ + "terminal", +] + [profiles.Isengard.variables] distro_id = "termux" +[profiles.Edoras] +include = [ + "terminal", +] + +[profiles.TakamakiPC] +include = [ + "terminal", +] + [profiles.TakamakiPC.variables] wayland = false + +[profiles.localhost] +include = [ + "terminal", +] + +[profiles.ViiruJaTeippi] +include = [ + "terminal", +] diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 2222ab78..7e904699 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -27,6 +27,9 @@ export USRNAME=$USER # Add ~/.local/bin to path export PATH="$HOME/.local/bin:$PATH" +# +# Add locally installed npm binaries to path +export PATH="$HOME/.local/share/npm/bin:$PATH" # Add ~/.cargo/bin to path export PATH="$HOME/.cargo/bin:$PATH" diff --git a/home/.npmrc b/home/.npmrc new file mode 100644 index 00000000..256f89fc --- /dev/null +++ b/home/.npmrc @@ -0,0 +1 @@ +prefix=~/.local/share/npm From 8174254bc0837c33807a204d7c240d32914e94dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Nov 2023 18:03:11 +0200 Subject: [PATCH 2067/2667] Move npmrc to terminal profile --- config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.toml b/config.toml index b64c3f1e..dca9ec53 100644 --- a/config.toml +++ b/config.toml @@ -270,6 +270,7 @@ dotfiles = [ "f_rtv.cfg", "f_tmux.conf", "f_zshrc", + "f_npmrc", ] [profiles.email] @@ -317,7 +318,6 @@ dotfiles = [ "f_dconf.ini", "f_docker-config.json", "f_fonts.conf", - "f_npmrc", ] [profiles.Mirkwood.variables] From 016f11b42ddf8da0c5ca3560d66c0a2b79d020da Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Nov 2023 18:03:11 +0200 Subject: [PATCH 2068/2667] Move npmrc to terminal profile --- config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.toml b/config.toml index b64c3f1e..dca9ec53 100644 --- a/config.toml +++ b/config.toml @@ -270,6 +270,7 @@ dotfiles = [ "f_rtv.cfg", "f_tmux.conf", "f_zshrc", + "f_npmrc", ] [profiles.email] @@ -317,7 +318,6 @@ dotfiles = [ "f_dconf.ini", "f_docker-config.json", "f_fonts.conf", - "f_npmrc", ] [profiles.Mirkwood.variables] From 312d75574007d2137d5250d3cd1dc47265d0810a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Nov 2023 18:03:28 +0200 Subject: [PATCH 2069/2667] Format config.toml with taplo --- config-root.toml | 6 +- config.toml | 150 +++++++++++++++++------------------------------ 2 files changed, 54 insertions(+), 102 deletions(-) diff --git a/config-root.toml b/config-root.toml index 3f3f11bf..55263fbe 100644 --- a/config-root.toml +++ b/config-root.toml @@ -225,11 +225,7 @@ dotfiles = [ ] [profiles.Tirion] -dotfiles = [ - "f_doas.conf", - "f_ignore", - "f_sshd_config", -] +dotfiles = ["f_doas.conf", "f_ignore", "f_sshd_config"] [profiles.Gondor] include = ["Locale", "Pacman"] diff --git a/config.toml b/config.toml index dca9ec53..9c7f89ec 100644 --- a/config.toml +++ b/config.toml @@ -234,9 +234,7 @@ dst = "~/.config/wal" [dotfiles."f_dconf.ini"] src = ".config/dconf.ini" dst = "~/.config/dconf.ini" -actions = [ - "dconf-load", -] +actions = ["dconf-load"] [dotfiles."f_docker-config.json"] src = ".docker/config.json" @@ -249,150 +247,108 @@ dst = "~/.npmrc" chmod = "600" [profiles.pacman] -dotfiles = [ - "f_makepkg.conf", - "f_paru.conf", -] +dotfiles = ["f_makepkg.conf", "f_paru.conf"] [profiles.terminal] dotfiles = [ - "d_wal", - "d_nvim", - "d_ssh", - "d_zsh", - "f_alacritty.yml", - "f_gitconfig", - "f_hushlogin", - "f_ignore", - "f_mailcap", - "f_ranger.conf", - "f_ranger_commands.py", - "f_rtv.cfg", - "f_tmux.conf", - "f_zshrc", - "f_npmrc", + "d_wal", + "d_nvim", + "d_ssh", + "d_zsh", + "f_alacritty.yml", + "f_gitconfig", + "f_hushlogin", + "f_ignore", + "f_mailcap", + "f_ranger.conf", + "f_ranger_commands.py", + "f_rtv.cfg", + "f_tmux.conf", + "f_zshrc", + "f_npmrc", ] [profiles.email] -dotfiles = [ - "d_neomutt", - "d_imapnotify", - "f_mbsyncrc", - "f_msmtp_config", -] +dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] [profiles.media] dotfiles = [ - "d_mpv", - "f_abcde.conf", - "f_beets_config", - "f_beets_whitelist", - "f_libra_config", - "f_mpd.conf", - "f_mpdris2.conf", - "f_mpdscribble.conf", - "f_ncmpcpp.conf", - "f_ncmpcpp_bindings", - "f_youtube-dl_config", + "d_mpv", + "f_abcde.conf", + "f_beets_config", + "f_beets_whitelist", + "f_libra_config", + "f_mpd.conf", + "f_mpdris2.conf", + "f_mpdscribble.conf", + "f_ncmpcpp.conf", + "f_ncmpcpp_bindings", + "f_youtube-dl_config", ] [profiles.gpg] dotfiles = [ - "f_gpg-agent.conf", - "f_gpg.conf", - "f_gpg_scdaemon.conf", - "f_pam_environment", + "f_gpg-agent.conf", + "f_gpg.conf", + "f_gpg_scdaemon.conf", + "f_pam_environment", ] [profiles.Mirkwood] -include = [ - "pacman", - "terminal", - "email", - "media", - "gpg", -] +include = ["pacman", "terminal", "email", "media", "gpg"] dotfiles = [ - "d_rofi", - "f_librewolf_overrides", - "f_dconf.ini", - "f_docker-config.json", - "f_fonts.conf", + "d_rofi", + "f_librewolf_overrides", + "f_dconf.ini", + "f_docker-config.json", + "f_fonts.conf", ] [profiles.Mirkwood.variables] wayland = true [profiles.Moria] -include = [ - "pacman", - "terminal", - "media", - "gpg", -] +include = ["pacman", "terminal", "media", "gpg"] dotfiles = [ - "f_librewolf_overrides", - "f_dconf.ini", - "f_zprofile", - "f_fonts.conf", + "f_librewolf_overrides", + "f_dconf.ini", + "f_zprofile", + "f_fonts.conf", ] [profiles.Moria.variables] wayland = true [profiles.Tirion] -include = [ - "terminal", - "gpg", -] +include = ["terminal", "gpg"] [profiles.Gondor] -include = [ - "pacman", - "terminal", -] +include = ["pacman", "terminal"] [profiles.mko-laptop] -include = [ - "terminal", - "media", - "gpg", -] -dotfiles = [ - "f_librewolf_overrides", - "f_dconf.ini", -] +include = ["terminal", "media", "gpg"] +dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] [profiles.mko-laptop.variables] wayland = true [profiles.Isengard] -include = [ - "terminal", -] +include = ["terminal"] [profiles.Isengard.variables] distro_id = "termux" [profiles.Edoras] -include = [ - "terminal", -] +include = ["terminal"] [profiles.TakamakiPC] -include = [ - "terminal", -] +include = ["terminal"] [profiles.TakamakiPC.variables] wayland = false [profiles.localhost] -include = [ - "terminal", -] +include = ["terminal"] [profiles.ViiruJaTeippi] -include = [ - "terminal", -] +include = ["terminal"] From b740475b5868c526cb6436599cff4f624ae3dde1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Nov 2023 18:03:28 +0200 Subject: [PATCH 2070/2667] Format config.toml with taplo --- config-root.toml | 6 +- config.toml | 150 +++++++++++++++++------------------------------ 2 files changed, 54 insertions(+), 102 deletions(-) diff --git a/config-root.toml b/config-root.toml index 3f3f11bf..55263fbe 100644 --- a/config-root.toml +++ b/config-root.toml @@ -225,11 +225,7 @@ dotfiles = [ ] [profiles.Tirion] -dotfiles = [ - "f_doas.conf", - "f_ignore", - "f_sshd_config", -] +dotfiles = ["f_doas.conf", "f_ignore", "f_sshd_config"] [profiles.Gondor] include = ["Locale", "Pacman"] diff --git a/config.toml b/config.toml index dca9ec53..9c7f89ec 100644 --- a/config.toml +++ b/config.toml @@ -234,9 +234,7 @@ dst = "~/.config/wal" [dotfiles."f_dconf.ini"] src = ".config/dconf.ini" dst = "~/.config/dconf.ini" -actions = [ - "dconf-load", -] +actions = ["dconf-load"] [dotfiles."f_docker-config.json"] src = ".docker/config.json" @@ -249,150 +247,108 @@ dst = "~/.npmrc" chmod = "600" [profiles.pacman] -dotfiles = [ - "f_makepkg.conf", - "f_paru.conf", -] +dotfiles = ["f_makepkg.conf", "f_paru.conf"] [profiles.terminal] dotfiles = [ - "d_wal", - "d_nvim", - "d_ssh", - "d_zsh", - "f_alacritty.yml", - "f_gitconfig", - "f_hushlogin", - "f_ignore", - "f_mailcap", - "f_ranger.conf", - "f_ranger_commands.py", - "f_rtv.cfg", - "f_tmux.conf", - "f_zshrc", - "f_npmrc", + "d_wal", + "d_nvim", + "d_ssh", + "d_zsh", + "f_alacritty.yml", + "f_gitconfig", + "f_hushlogin", + "f_ignore", + "f_mailcap", + "f_ranger.conf", + "f_ranger_commands.py", + "f_rtv.cfg", + "f_tmux.conf", + "f_zshrc", + "f_npmrc", ] [profiles.email] -dotfiles = [ - "d_neomutt", - "d_imapnotify", - "f_mbsyncrc", - "f_msmtp_config", -] +dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] [profiles.media] dotfiles = [ - "d_mpv", - "f_abcde.conf", - "f_beets_config", - "f_beets_whitelist", - "f_libra_config", - "f_mpd.conf", - "f_mpdris2.conf", - "f_mpdscribble.conf", - "f_ncmpcpp.conf", - "f_ncmpcpp_bindings", - "f_youtube-dl_config", + "d_mpv", + "f_abcde.conf", + "f_beets_config", + "f_beets_whitelist", + "f_libra_config", + "f_mpd.conf", + "f_mpdris2.conf", + "f_mpdscribble.conf", + "f_ncmpcpp.conf", + "f_ncmpcpp_bindings", + "f_youtube-dl_config", ] [profiles.gpg] dotfiles = [ - "f_gpg-agent.conf", - "f_gpg.conf", - "f_gpg_scdaemon.conf", - "f_pam_environment", + "f_gpg-agent.conf", + "f_gpg.conf", + "f_gpg_scdaemon.conf", + "f_pam_environment", ] [profiles.Mirkwood] -include = [ - "pacman", - "terminal", - "email", - "media", - "gpg", -] +include = ["pacman", "terminal", "email", "media", "gpg"] dotfiles = [ - "d_rofi", - "f_librewolf_overrides", - "f_dconf.ini", - "f_docker-config.json", - "f_fonts.conf", + "d_rofi", + "f_librewolf_overrides", + "f_dconf.ini", + "f_docker-config.json", + "f_fonts.conf", ] [profiles.Mirkwood.variables] wayland = true [profiles.Moria] -include = [ - "pacman", - "terminal", - "media", - "gpg", -] +include = ["pacman", "terminal", "media", "gpg"] dotfiles = [ - "f_librewolf_overrides", - "f_dconf.ini", - "f_zprofile", - "f_fonts.conf", + "f_librewolf_overrides", + "f_dconf.ini", + "f_zprofile", + "f_fonts.conf", ] [profiles.Moria.variables] wayland = true [profiles.Tirion] -include = [ - "terminal", - "gpg", -] +include = ["terminal", "gpg"] [profiles.Gondor] -include = [ - "pacman", - "terminal", -] +include = ["pacman", "terminal"] [profiles.mko-laptop] -include = [ - "terminal", - "media", - "gpg", -] -dotfiles = [ - "f_librewolf_overrides", - "f_dconf.ini", -] +include = ["terminal", "media", "gpg"] +dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] [profiles.mko-laptop.variables] wayland = true [profiles.Isengard] -include = [ - "terminal", -] +include = ["terminal"] [profiles.Isengard.variables] distro_id = "termux" [profiles.Edoras] -include = [ - "terminal", -] +include = ["terminal"] [profiles.TakamakiPC] -include = [ - "terminal", -] +include = ["terminal"] [profiles.TakamakiPC.variables] wayland = false [profiles.localhost] -include = [ - "terminal", -] +include = ["terminal"] [profiles.ViiruJaTeippi] -include = [ - "terminal", -] +include = ["terminal"] From 4442252c659179d860d71982a6b705dcecc54ea6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Nov 2023 19:04:46 +0200 Subject: [PATCH 2071/2667] Remove unneeded comment character --- home/.config/zsh/02-env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 7e904699..cd54499d 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -27,7 +27,7 @@ export USRNAME=$USER # Add ~/.local/bin to path export PATH="$HOME/.local/bin:$PATH" -# + # Add locally installed npm binaries to path export PATH="$HOME/.local/share/npm/bin:$PATH" From 5326fe37b3d77f029901be37b435c2119e5d1780 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Nov 2023 19:04:46 +0200 Subject: [PATCH 2072/2667] Remove unneeded comment character --- home/.config/zsh/02-env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index 7e904699..cd54499d 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -27,7 +27,7 @@ export USRNAME=$USER # Add ~/.local/bin to path export PATH="$HOME/.local/bin:$PATH" -# + # Add locally installed npm binaries to path export PATH="$HOME/.local/share/npm/bin:$PATH" From 455a008f062adccd3bb759d5026544b286ac7cc8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 Nov 2023 09:44:07 +0200 Subject: [PATCH 2073/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index a34105e1..b25bc2b3 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "46c91e814732c1630b8a8b50d04acbf54b8320fa" }, + "LuaSnip": { "branch": "master", "commit": "1f4ad8bb72bdeb60975e98652636b991a9b7475d" }, "bufferline.nvim": { "branch": "main", "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -13,17 +13,17 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "73047082d72fcfdde1f73b7f17ad495cffcbafaa" }, "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, - "emmylua-nvim": { "branch": "master", "commit": "e19405a13fa267f6e7500843240d735a3a0745aa" }, + "emmylua-nvim": { "branch": "master", "commit": "50b2eead8af6499fbba708553148ee8156d6612e" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" }, "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lsp_signature.nvim": { "branch": "master", "commit": "9ed85616b772a07f8db56c26e8fff2d962f1f211" }, + "lsp_signature.nvim": { "branch": "master", "commit": "1fba8f477b8c65add5e07cda0504cf7f81a9a4ab" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "6eb8cae80f2e4322ec82cd9f8fa423f6d1eb02c3" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "faeb361507aa1ef1b0e5645781e2aa0d36a4aa84" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "e4f34741daa9cf95de68a603d3e7a6844a69fdf0" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "neoformat": { "branch": "master", "commit": "e5fe7e8f7c3dd071b90f19af0e8c7cfa56cdedc7" }, @@ -33,19 +33,19 @@ "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, "nvim-jdtls": { "branch": "master", "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" }, - "nvim-lspconfig": { "branch": "master", "commit": "b0852218bc5fa6514a71a9da6d5cfa63a263c83d" }, - "nvim-tree.lua": { "branch": "master", "commit": "a2aaf8b430c11af36b869cf1c0ad2f7c8ceeaf2c" }, - "nvim-treesitter": { "branch": "master", "commit": "075a64addc33390028ea124a1046a43497f05cd1" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" }, - "nvim-ufo": { "branch": "main", "commit": "ebbab711d909d5f675e38ad489765bd22bd2c6b3" }, - "nvim-web-devicons": { "branch": "master", "commit": "47103b80c38c59f7a1b5408c232b92bf5d018651" }, + "nvim-lspconfig": { "branch": "master", "commit": "d5d7412ff267b92a11a94e6559d5507c43670a52" }, + "nvim-tree.lua": { "branch": "master", "commit": "80cfeadf179d5cba76f0f502c71dbcff1b515cd8" }, + "nvim-treesitter": { "branch": "master", "commit": "8b9f99660294dcd11d42572c84ee33a1e284f70d" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "6c30f3c8915d7b31c3decdfe6c7672432da1809d" }, + "nvim-ufo": { "branch": "main", "commit": "a6132d058f23d15686f07b8e1ca252e060a0e0ce" }, + "nvim-web-devicons": { "branch": "master", "commit": "11eb26fc166742db8d1e8a6f5a7de9df37b09aae" }, "password-store": { "branch": "master", "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "0fc69ebbf178631b8ab76745459fade062156ec5" }, - "telescope.nvim": { "branch": "master", "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" }, + "telescope.nvim": { "branch": "master", "commit": "18774ec7929c8a8003a91e9e1f69f6c32258bbfe" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" }, From 42c81d20ddb6a8f742f5ac0d413595b573df6d00 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 Nov 2023 09:44:07 +0200 Subject: [PATCH 2074/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index a34105e1..b25bc2b3 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "46c91e814732c1630b8a8b50d04acbf54b8320fa" }, + "LuaSnip": { "branch": "master", "commit": "1f4ad8bb72bdeb60975e98652636b991a9b7475d" }, "bufferline.nvim": { "branch": "main", "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -13,17 +13,17 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "73047082d72fcfdde1f73b7f17ad495cffcbafaa" }, "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, - "emmylua-nvim": { "branch": "master", "commit": "e19405a13fa267f6e7500843240d735a3a0745aa" }, + "emmylua-nvim": { "branch": "master", "commit": "50b2eead8af6499fbba708553148ee8156d6612e" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" }, "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lsp_signature.nvim": { "branch": "master", "commit": "9ed85616b772a07f8db56c26e8fff2d962f1f211" }, + "lsp_signature.nvim": { "branch": "master", "commit": "1fba8f477b8c65add5e07cda0504cf7f81a9a4ab" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "6eb8cae80f2e4322ec82cd9f8fa423f6d1eb02c3" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "faeb361507aa1ef1b0e5645781e2aa0d36a4aa84" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "e4f34741daa9cf95de68a603d3e7a6844a69fdf0" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "neoformat": { "branch": "master", "commit": "e5fe7e8f7c3dd071b90f19af0e8c7cfa56cdedc7" }, @@ -33,19 +33,19 @@ "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, "nvim-jdtls": { "branch": "master", "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" }, - "nvim-lspconfig": { "branch": "master", "commit": "b0852218bc5fa6514a71a9da6d5cfa63a263c83d" }, - "nvim-tree.lua": { "branch": "master", "commit": "a2aaf8b430c11af36b869cf1c0ad2f7c8ceeaf2c" }, - "nvim-treesitter": { "branch": "master", "commit": "075a64addc33390028ea124a1046a43497f05cd1" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" }, - "nvim-ufo": { "branch": "main", "commit": "ebbab711d909d5f675e38ad489765bd22bd2c6b3" }, - "nvim-web-devicons": { "branch": "master", "commit": "47103b80c38c59f7a1b5408c232b92bf5d018651" }, + "nvim-lspconfig": { "branch": "master", "commit": "d5d7412ff267b92a11a94e6559d5507c43670a52" }, + "nvim-tree.lua": { "branch": "master", "commit": "80cfeadf179d5cba76f0f502c71dbcff1b515cd8" }, + "nvim-treesitter": { "branch": "master", "commit": "8b9f99660294dcd11d42572c84ee33a1e284f70d" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "6c30f3c8915d7b31c3decdfe6c7672432da1809d" }, + "nvim-ufo": { "branch": "main", "commit": "a6132d058f23d15686f07b8e1ca252e060a0e0ce" }, + "nvim-web-devicons": { "branch": "master", "commit": "11eb26fc166742db8d1e8a6f5a7de9df37b09aae" }, "password-store": { "branch": "master", "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "0fc69ebbf178631b8ab76745459fade062156ec5" }, - "telescope.nvim": { "branch": "master", "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" }, + "telescope.nvim": { "branch": "master", "commit": "18774ec7929c8a8003a91e9e1f69f6c32258bbfe" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" }, From ad3d734adcf1b0a94bef28bb522b337bbf8d4daf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 Nov 2023 09:44:43 +0200 Subject: [PATCH 2075/2667] Remove esphome --- docker/homeautomation/docker-compose.toml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 6f1eac57..17952ba4 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -13,13 +13,6 @@ ports = ["8123:8123", "8300:8300"] extra_hosts = ["host.docker.internal:host-gateway"] depends_on = ["mosquitto"] -[services.esphome] -container_name = "esphome" -image = "esphome/esphome" -volumes = ["/docker/homeautomation/esphome:/config"] -restart = "unless-stopped" -network_mode = "host" - [services.mosquitto] container_name = "mosquitto" image = "eclipse-mosquitto" From aa1af14bfd31443edc8642a4db1efce09585e7f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 Nov 2023 09:44:43 +0200 Subject: [PATCH 2076/2667] Remove esphome --- docker/homeautomation/docker-compose.toml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 6f1eac57..17952ba4 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -13,13 +13,6 @@ ports = ["8123:8123", "8300:8300"] extra_hosts = ["host.docker.internal:host-gateway"] depends_on = ["mosquitto"] -[services.esphome] -container_name = "esphome" -image = "esphome/esphome" -volumes = ["/docker/homeautomation/esphome:/config"] -restart = "unless-stopped" -network_mode = "host" - [services.mosquitto] container_name = "mosquitto" image = "eclipse-mosquitto" From c99903e78e885d78ef172e1e742ad49d0c21e224 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 08:01:52 +0200 Subject: [PATCH 2077/2667] Tweak neovim config - Add noice, navic - Tweak theme configuration - Tweak cder configuration - Update .ignore file --- config.toml | 6 ++ home/.config/nvim/lazy-lock.json | 7 +- home/.config/nvim/lua/neovide.lua | 9 ++- home/.config/nvim/lua/plugins/cmp.lua | 9 +++ home/.config/nvim/lua/plugins/colorscheme.lua | 48 +++++++++++++ home/.config/nvim/lua/plugins/init.lua | 72 ++++++++++--------- home/.config/nvim/lua/plugins/lualine.lua | 17 +++++ home/.config/nvim/lua/plugins/mason.lua | 7 +- home/.config/nvim/lua/plugins/noice.lua | 18 +++++ home/.config/nvim/lua/plugins/telescope.lua | 23 ++++++ home/.config/nvim/lua/plugins/treesitter.lua | 7 ++ home/.config/nvim/lua/plugins/ufo.lua | 15 +++- home/.config/nvim/lua/plugins/which-key.lua | 11 ++- home/.config/nvim/lua/settings.lua | 21 +----- home/.ignore | 4 ++ 15 files changed, 211 insertions(+), 63 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/colorscheme.lua create mode 100644 home/.config/nvim/lua/plugins/lualine.lua create mode 100644 home/.config/nvim/lua/plugins/noice.lua diff --git a/config.toml b/config.toml index 9c7f89ec..56a966e7 100644 --- a/config.toml +++ b/config.toml @@ -1,5 +1,8 @@ +#:schema ../../dotdrop-config-schema.json + [actions] dconf-load = "dconf load / < ~/.config/dconf.ini" +kanagawa-compile = "vim +KanagawaCompile +qa" [config] backup = true @@ -33,6 +36,8 @@ src = ".config/imapnotify" [dotfiles.d_nvim] dst = "~/.config/nvim" src = ".config/nvim" +instignore = [""] +actions = ["kanagawa-compile"] [dotfiles.d_rofi] dst = "~/.config/rofi" @@ -331,6 +336,7 @@ dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] [profiles.mko-laptop.variables] wayland = true +scale_factor = 1.5 [profiles.Isengard] include = ["terminal"] diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index b25bc2b3..accd6c8b 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -20,13 +20,14 @@ "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lsp_signature.nvim": { "branch": "master", "commit": "1fba8f477b8c65add5e07cda0504cf7f81a9a4ab" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "faeb361507aa1ef1b0e5645781e2aa0d36a4aa84" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "e4f34741daa9cf95de68a603d3e7a6844a69fdf0" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "neoformat": { "branch": "master", "commit": "e5fe7e8f7c3dd071b90f19af0e8c7cfa56cdedc7" }, + "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, @@ -34,11 +35,13 @@ "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, "nvim-jdtls": { "branch": "master", "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" }, "nvim-lspconfig": { "branch": "master", "commit": "d5d7412ff267b92a11a94e6559d5507c43670a52" }, + "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" }, + "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, "nvim-tree.lua": { "branch": "master", "commit": "80cfeadf179d5cba76f0f502c71dbcff1b515cd8" }, "nvim-treesitter": { "branch": "master", "commit": "8b9f99660294dcd11d42572c84ee33a1e284f70d" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "6c30f3c8915d7b31c3decdfe6c7672432da1809d" }, "nvim-ufo": { "branch": "main", "commit": "a6132d058f23d15686f07b8e1ca252e060a0e0ce" }, - "nvim-web-devicons": { "branch": "master", "commit": "11eb26fc166742db8d1e8a6f5a7de9df37b09aae" }, + "nvim-web-devicons": { "branch": "master", "commit": "3523d6e6d40ab11fd66c1b2732b3d6b60affa951" }, "password-store": { "branch": "master", "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" }, diff --git a/home/.config/nvim/lua/neovide.lua b/home/.config/nvim/lua/neovide.lua index 314dbd70..d2c9d6ab 100644 --- a/home/.config/nvim/lua/neovide.lua +++ b/home/.config/nvim/lua/neovide.lua @@ -1,7 +1,8 @@ local g = vim.g +local o = vim.o -- Change scale factor with C= and C- -g.neovide_scale_factor = 1.0 +g.neovide_scale_factor = {{@@ scale_factor|default(1.0) @@}} local change_scale_factor = function(delta) g.neovide_scale_factor = g.neovide_scale_factor * delta end @@ -17,3 +18,9 @@ g.neovide_hide_mouse_when_typing = true -- Enable cursor particles in neovide g.neovide_cursor_vfx_mode = "railgun" + +-- Enable dark/light theme detection +g.neovide_theme = "auto" + +-- Set font +--o.guifont = "Hack Nerd Font Mono:h15" diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index a740ae64..020c371d 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -61,6 +61,15 @@ return function() { name = "spell" }, { name = "path" }, }, + -- window = { + -- completion = { + -- winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:Visual,Search:None", + -- }, + + -- documentation = { + -- winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:Visual,Search:None", + -- }, + -- }, }) -- Enable autopairs when enter is processed diff --git a/home/.config/nvim/lua/plugins/colorscheme.lua b/home/.config/nvim/lua/plugins/colorscheme.lua new file mode 100644 index 00000000..ca26060b --- /dev/null +++ b/home/.config/nvim/lua/plugins/colorscheme.lua @@ -0,0 +1,48 @@ +return function() + require("kanagawa").setup({ + compile = true, + dimInactive = true, + colors = { + theme = { + all = { + ui = { + bg_gutter = "none", -- Hide gutter background + }, + }, + }, + }, + background = { + dark = "wave", + light = "lotus", + }, + overrides = function(colors) + local theme = colors.theme + return { + -- Transparent floating windows + NormalFloat = { bg = "none" }, + FloatBorder = { bg = "none" }, + FloatTitle = { bg = "none" }, + NormalDark = { fg = theme.ui.fg_dim, bg = theme.ui.bg_m3 }, + LazyNormal = { bg = theme.ui.bg_m3, fg = theme.ui.fg_dim }, + MasonNormal = { bg = theme.ui.bg_m3, fg = theme.ui.fg_dim }, + + -- Block-like modern Telescope UI + TelescopeTitle = { fg = theme.ui.special, bold = true }, + TelescopePromptNormal = { bg = theme.ui.bg_p1 }, + TelescopePromptBorder = { fg = theme.ui.bg_p1, bg = theme.ui.bg_p1 }, + TelescopeResultsNormal = { fg = theme.ui.fg_dim, bg = theme.ui.bg_m1 }, + TelescopeResultsBorder = { fg = theme.ui.bg_m1, bg = theme.ui.bg_m1 }, + TelescopePreviewNormal = { bg = theme.ui.bg_dim }, + TelescopePreviewBorder = { bg = theme.ui.bg_dim, fg = theme.ui.bg_dim }, + + -- More uniform look for the popup menu + Pmenu = { fg = theme.ui.shade0, bg = theme.ui.bg_p1, blend = vim.o.pumblend }, + PmenuSel = { fg = "NONE", bg = theme.ui.bg_p2 }, + PmenuSbar = { bg = theme.ui.bg_m1 }, + PmenuThumb = { bg = theme.ui.bg_p2 }, + } + end, + }) + + vim.cmd("colorscheme kanagawa") +end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 9a3da45e..0018004e 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -17,40 +17,36 @@ local plugins = { -- Colorscheme { "rebelot/kanagawa.nvim", - config = function() - vim.cmd("colorscheme kanagawa") - end, + config = require("plugins.colorscheme"), + }, + + -- Replace much of neovim's default UI + -- with a modern replacement + { + "folke/noice.nvim", + event = "VeryLazy", + dependencies = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify" }, + opts = require("plugins.noice"), }, -- Statusline { "nvim-lualine/lualine.nvim", dependencies = { "kyazdani42/nvim-web-devicons" }, - config = true, - }, - - -- Git status in signcolumn - { - "lewis6991/gitsigns.nvim", - config = true, + config = require("plugins.lualine"), }, -- Tabline/bufferline - { - "akinsho/bufferline.nvim", - version = "v3.*", - dependencies = { "kyazdani42/nvim-web-devicons" }, - config = true, - }, + { "akinsho/bufferline.nvim", version = "v3.*", dependencies = { "kyazdani42/nvim-web-devicons" }, config = true }, + + -- Git status in signcolumn + { "lewis6991/gitsigns.nvim", config = true }, -- Git commands "tpope/vim-fugitive", -- Indent characters - { - "lukas-reineke/indent-blankline.nvim", - config = require("plugins.indent-blankline"), - }, + { "lukas-reineke/indent-blankline.nvim", config = require("plugins.indent-blankline") }, -- Tree explorer { @@ -64,14 +60,19 @@ local plugins = { "nvim-telescope/telescope.nvim", config = require("plugins.telescope"), dependencies = { - "nvim-lua/plenary.nvim", -- Internal dep for telescope + -- Internal dependency for telescope + "nvim-lua/plenary.nvim", + -- Use fzf for fuzzy finder { "nvim-telescope/telescope-fzf-native.nvim", build = "make", }, - "nvim-telescope/telescope-ui-select.nvim", -- Replace vim built in select with telescope - "zane-/cder.nvim", -- cd plugin for telescope + -- Replace vim built in select with telescope + "nvim-telescope/telescope-ui-select.nvim", + + -- cd plugin for telescope + "zane-/cder.nvim", }, }, @@ -95,19 +96,12 @@ local plugins = { -- Additional LSP features for Java "mfussenegger/nvim-jdtls", + -- Show code LSP context in winbar + { "SmiteshP/nvim-navic", config = true, opts = { mouse = true } }, + -- DAP plugin { "mfussenegger/nvim-dap", config = require("plugins.dap") }, - -- Display function signature - { - "ray-x/lsp_signature.nvim", - event = "VeryLazy", - opts = { always_trigger = true }, - config = function(_, opts) - require("lsp_signature").setup(opts) - end, - }, - -- Snippets plugin { "L3MON4D3/LuaSnip", @@ -176,9 +170,18 @@ local plugins = { build = function() vim.fn["firenvim#install"](0) end, + config = function() + vim.g.firenvim_config = { + localSettings = { + [".*"] = { + takeOver = "never", + }, + }, + } + end, }, - -- Vim <3 Asciidoctor + -- Vim ♥️ Asciidoctor "habamax/vim-asciidoctor", -- Asciidoc preview @@ -216,6 +219,7 @@ local plugins = { -- Better folds { + enabled = false, "kevinhwang91/nvim-ufo", dependencies = { "kevinhwang91/promise-async" }, config = require("plugins.ufo"), diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua new file mode 100644 index 00000000..37c8065f --- /dev/null +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -0,0 +1,17 @@ +return function() + require("lualine").setup({ + sections = { + lualine_y = {}, + lualine_z = {}, + }, + winbar = { + lualine_a = { "progress" }, + lualine_c = { + "navic", + color_correction = nil, + navic_opts = nil, + }, + lualine_z = { "location" }, + }, + }) +end diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index cccc8625..7d84e0fd 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -1,9 +1,10 @@ local m = {} function m.setup() - local function on_attach() - -- Setup lsp signature plugin - require("lsp_signature").setup({}) + local function on_attach(client, bufnr) + + -- Attach navic + require("nvim-navic").attach(client, bufnr) -- Setup keybinds m.map_keys() diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua new file mode 100644 index 00000000..83cb3d98 --- /dev/null +++ b/home/.config/nvim/lua/plugins/noice.lua @@ -0,0 +1,18 @@ +return { + lsp = { + -- override markdown rendering so that **cmp** and other plugins use **Treesitter** + override = { + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, + ["cmp.entry.get_documentation"] = true, + }, + }, + -- you can enable a preset for easier configuration + presets = { + bottom_search = true, -- use a classic bottom cmdline for search + command_palette = true, -- position the cmdline and popupmenu together + long_message_to_split = true, -- long messages will be sent to a split + inc_rename = false, -- enables an input dialog for inc-rename.nvim + lsp_doc_border = false, -- add a border to hover docs and signature help + }, +} diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 3dac263c..5a30c1af 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -6,6 +6,29 @@ return function() pickers = { find_files = { find_command = { "fd", "-Ht", "f" } }, lsp_references = { show_line = false }, + live_grep = { + additional_args = function(opts) + return { "--hidden" } + end, + }, + }, + extensions = { + cder = { + previewer_command = "eza " + .. "-a " + .. "--color=always " + .. "-T " + .. "--level=3 " + .. "--icons " + .. "--git-ignore " + .. "--long " + .. "--no-permissions " + .. "--no-user " + .. "--no-filesize " + .. "--git " + .. "--ignore-glob=.git", + dir_command = { "fd", "-Ht", "d", ".", os.getenv("HOME") }, + }, }, }) diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index 317f527c..ca53a23f 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -4,6 +4,11 @@ return function() "bash", "css", "dockerfile", + "git_config", + "git_rebase", + "gitattributes", + "gitcommit", + "gitignore", "html", "http", "java", @@ -14,6 +19,7 @@ return function() "lua", "make", "markdown", + "markdown_inline", "php", "python", "rasi", @@ -23,6 +29,7 @@ return function() "toml", "tsx", "typescript", + "vim", "yaml", }, highlight = { enable = true }, diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua index dbdce244..d7582244 100644 --- a/home/.config/nvim/lua/plugins/ufo.lua +++ b/home/.config/nvim/lua/plugins/ufo.lua @@ -1,7 +1,20 @@ return function() - require("ufo").setup({ + local keymap = vim.keymap + local o = vim.o + local ufo = require("ufo") + ufo.setup({ close_fold_kinds = { "imports", }, }) + + -- Using ufo, need to remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself + keymap.set("n", "zR", ufo.openAllFolds) + keymap.set("n", "zM", ufo.closeAllFolds) + + -- Fold settings + o.foldcolumn = "1" + o.foldlevel = 99 + o.foldlevelstart = 99 + o.foldenable = true end diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index e7e9fad8..7c1cbf8b 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -15,10 +15,15 @@ return function() ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, }) + -- Open cder + wk.register({ cd = { + function() + vim.cmd("Telescope cder") + end, + "Change directories", + } }) + -- Exit terminal insert mode with esc vim.keymap.set("t", "", "", {}) - -- Using ufo, need to remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself - vim.keymap.set("n", "zR", require("ufo").openAllFolds) - vim.keymap.set("n", "zM", require("ufo").closeAllFolds) end diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 06c984a0..aad296fd 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -1,7 +1,9 @@ local o = vim.o local g = vim.g +o.pumblend = 10 -- Relative line numbers +o.number = true o.relativenumber = true -- True colors @@ -20,8 +22,6 @@ o.diffopt = "filler,internal,algorithm:histogram,indent-heuristic" -- Allow switching buffers with unsaved changes o.hidden = true --- Show line numbers -o.number = true o.guicursor = table.concat({ "i:ver1", -- Vertical bar cursor in insert mode @@ -31,8 +31,6 @@ o.guicursor = table.concat({ -- Enable global statusline o.laststatus = 3 -o.cmdheight = 1 - -- Use suda by default g.suda_smart_edit = 1 @@ -47,18 +45,3 @@ g.mapleader = " " o.tabstop = 4 o.shiftwidth = 4 o.smartindent = true - --- Firenvim settings -g.firenvim_config = { - localSettings = { - [".*"] = { - takeOver = "never", - }, - }, -} - --- Fold settings (for ufo) -o.foldcolumn = "1" -o.foldlevel = 99 -o.foldlevelstart = 99 -o.foldenable = true diff --git a/home/.ignore b/home/.ignore index 2dc5ae47..d1402308 100644 --- a/home/.ignore +++ b/home/.ignore @@ -16,3 +16,7 @@ .android/ .audacity-data/ .zcompdump* +.var/ +.npm/ +.vscode-oss/ +.git/ From 8336ec5048715dd504bebedc727b234290954324 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 08:01:52 +0200 Subject: [PATCH 2078/2667] Tweak neovim config - Add noice, navic - Tweak theme configuration - Tweak cder configuration - Update .ignore file --- config.toml | 6 ++ home/.config/nvim/lazy-lock.json | 7 +- home/.config/nvim/lua/neovide.lua | 9 ++- home/.config/nvim/lua/plugins/cmp.lua | 9 +++ home/.config/nvim/lua/plugins/colorscheme.lua | 48 +++++++++++++ home/.config/nvim/lua/plugins/init.lua | 72 ++++++++++--------- home/.config/nvim/lua/plugins/lualine.lua | 17 +++++ home/.config/nvim/lua/plugins/mason.lua | 7 +- home/.config/nvim/lua/plugins/noice.lua | 18 +++++ home/.config/nvim/lua/plugins/telescope.lua | 23 ++++++ home/.config/nvim/lua/plugins/treesitter.lua | 7 ++ home/.config/nvim/lua/plugins/ufo.lua | 15 +++- home/.config/nvim/lua/plugins/which-key.lua | 11 ++- home/.config/nvim/lua/settings.lua | 21 +----- home/.ignore | 4 ++ 15 files changed, 211 insertions(+), 63 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/colorscheme.lua create mode 100644 home/.config/nvim/lua/plugins/lualine.lua create mode 100644 home/.config/nvim/lua/plugins/noice.lua diff --git a/config.toml b/config.toml index 9c7f89ec..56a966e7 100644 --- a/config.toml +++ b/config.toml @@ -1,5 +1,8 @@ +#:schema ../../dotdrop-config-schema.json + [actions] dconf-load = "dconf load / < ~/.config/dconf.ini" +kanagawa-compile = "vim +KanagawaCompile +qa" [config] backup = true @@ -33,6 +36,8 @@ src = ".config/imapnotify" [dotfiles.d_nvim] dst = "~/.config/nvim" src = ".config/nvim" +instignore = [""] +actions = ["kanagawa-compile"] [dotfiles.d_rofi] dst = "~/.config/rofi" @@ -331,6 +336,7 @@ dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] [profiles.mko-laptop.variables] wayland = true +scale_factor = 1.5 [profiles.Isengard] include = ["terminal"] diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index b25bc2b3..accd6c8b 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -20,13 +20,14 @@ "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lsp_signature.nvim": { "branch": "master", "commit": "1fba8f477b8c65add5e07cda0504cf7f81a9a4ab" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "faeb361507aa1ef1b0e5645781e2aa0d36a4aa84" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "e4f34741daa9cf95de68a603d3e7a6844a69fdf0" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "neoformat": { "branch": "master", "commit": "e5fe7e8f7c3dd071b90f19af0e8c7cfa56cdedc7" }, + "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, @@ -34,11 +35,13 @@ "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, "nvim-jdtls": { "branch": "master", "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" }, "nvim-lspconfig": { "branch": "master", "commit": "d5d7412ff267b92a11a94e6559d5507c43670a52" }, + "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" }, + "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, "nvim-tree.lua": { "branch": "master", "commit": "80cfeadf179d5cba76f0f502c71dbcff1b515cd8" }, "nvim-treesitter": { "branch": "master", "commit": "8b9f99660294dcd11d42572c84ee33a1e284f70d" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "6c30f3c8915d7b31c3decdfe6c7672432da1809d" }, "nvim-ufo": { "branch": "main", "commit": "a6132d058f23d15686f07b8e1ca252e060a0e0ce" }, - "nvim-web-devicons": { "branch": "master", "commit": "11eb26fc166742db8d1e8a6f5a7de9df37b09aae" }, + "nvim-web-devicons": { "branch": "master", "commit": "3523d6e6d40ab11fd66c1b2732b3d6b60affa951" }, "password-store": { "branch": "master", "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" }, diff --git a/home/.config/nvim/lua/neovide.lua b/home/.config/nvim/lua/neovide.lua index 314dbd70..d2c9d6ab 100644 --- a/home/.config/nvim/lua/neovide.lua +++ b/home/.config/nvim/lua/neovide.lua @@ -1,7 +1,8 @@ local g = vim.g +local o = vim.o -- Change scale factor with C= and C- -g.neovide_scale_factor = 1.0 +g.neovide_scale_factor = {{@@ scale_factor|default(1.0) @@}} local change_scale_factor = function(delta) g.neovide_scale_factor = g.neovide_scale_factor * delta end @@ -17,3 +18,9 @@ g.neovide_hide_mouse_when_typing = true -- Enable cursor particles in neovide g.neovide_cursor_vfx_mode = "railgun" + +-- Enable dark/light theme detection +g.neovide_theme = "auto" + +-- Set font +--o.guifont = "Hack Nerd Font Mono:h15" diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index a740ae64..020c371d 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -61,6 +61,15 @@ return function() { name = "spell" }, { name = "path" }, }, + -- window = { + -- completion = { + -- winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:Visual,Search:None", + -- }, + + -- documentation = { + -- winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:Visual,Search:None", + -- }, + -- }, }) -- Enable autopairs when enter is processed diff --git a/home/.config/nvim/lua/plugins/colorscheme.lua b/home/.config/nvim/lua/plugins/colorscheme.lua new file mode 100644 index 00000000..ca26060b --- /dev/null +++ b/home/.config/nvim/lua/plugins/colorscheme.lua @@ -0,0 +1,48 @@ +return function() + require("kanagawa").setup({ + compile = true, + dimInactive = true, + colors = { + theme = { + all = { + ui = { + bg_gutter = "none", -- Hide gutter background + }, + }, + }, + }, + background = { + dark = "wave", + light = "lotus", + }, + overrides = function(colors) + local theme = colors.theme + return { + -- Transparent floating windows + NormalFloat = { bg = "none" }, + FloatBorder = { bg = "none" }, + FloatTitle = { bg = "none" }, + NormalDark = { fg = theme.ui.fg_dim, bg = theme.ui.bg_m3 }, + LazyNormal = { bg = theme.ui.bg_m3, fg = theme.ui.fg_dim }, + MasonNormal = { bg = theme.ui.bg_m3, fg = theme.ui.fg_dim }, + + -- Block-like modern Telescope UI + TelescopeTitle = { fg = theme.ui.special, bold = true }, + TelescopePromptNormal = { bg = theme.ui.bg_p1 }, + TelescopePromptBorder = { fg = theme.ui.bg_p1, bg = theme.ui.bg_p1 }, + TelescopeResultsNormal = { fg = theme.ui.fg_dim, bg = theme.ui.bg_m1 }, + TelescopeResultsBorder = { fg = theme.ui.bg_m1, bg = theme.ui.bg_m1 }, + TelescopePreviewNormal = { bg = theme.ui.bg_dim }, + TelescopePreviewBorder = { bg = theme.ui.bg_dim, fg = theme.ui.bg_dim }, + + -- More uniform look for the popup menu + Pmenu = { fg = theme.ui.shade0, bg = theme.ui.bg_p1, blend = vim.o.pumblend }, + PmenuSel = { fg = "NONE", bg = theme.ui.bg_p2 }, + PmenuSbar = { bg = theme.ui.bg_m1 }, + PmenuThumb = { bg = theme.ui.bg_p2 }, + } + end, + }) + + vim.cmd("colorscheme kanagawa") +end diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 9a3da45e..0018004e 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -17,40 +17,36 @@ local plugins = { -- Colorscheme { "rebelot/kanagawa.nvim", - config = function() - vim.cmd("colorscheme kanagawa") - end, + config = require("plugins.colorscheme"), + }, + + -- Replace much of neovim's default UI + -- with a modern replacement + { + "folke/noice.nvim", + event = "VeryLazy", + dependencies = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify" }, + opts = require("plugins.noice"), }, -- Statusline { "nvim-lualine/lualine.nvim", dependencies = { "kyazdani42/nvim-web-devicons" }, - config = true, - }, - - -- Git status in signcolumn - { - "lewis6991/gitsigns.nvim", - config = true, + config = require("plugins.lualine"), }, -- Tabline/bufferline - { - "akinsho/bufferline.nvim", - version = "v3.*", - dependencies = { "kyazdani42/nvim-web-devicons" }, - config = true, - }, + { "akinsho/bufferline.nvim", version = "v3.*", dependencies = { "kyazdani42/nvim-web-devicons" }, config = true }, + + -- Git status in signcolumn + { "lewis6991/gitsigns.nvim", config = true }, -- Git commands "tpope/vim-fugitive", -- Indent characters - { - "lukas-reineke/indent-blankline.nvim", - config = require("plugins.indent-blankline"), - }, + { "lukas-reineke/indent-blankline.nvim", config = require("plugins.indent-blankline") }, -- Tree explorer { @@ -64,14 +60,19 @@ local plugins = { "nvim-telescope/telescope.nvim", config = require("plugins.telescope"), dependencies = { - "nvim-lua/plenary.nvim", -- Internal dep for telescope + -- Internal dependency for telescope + "nvim-lua/plenary.nvim", + -- Use fzf for fuzzy finder { "nvim-telescope/telescope-fzf-native.nvim", build = "make", }, - "nvim-telescope/telescope-ui-select.nvim", -- Replace vim built in select with telescope - "zane-/cder.nvim", -- cd plugin for telescope + -- Replace vim built in select with telescope + "nvim-telescope/telescope-ui-select.nvim", + + -- cd plugin for telescope + "zane-/cder.nvim", }, }, @@ -95,19 +96,12 @@ local plugins = { -- Additional LSP features for Java "mfussenegger/nvim-jdtls", + -- Show code LSP context in winbar + { "SmiteshP/nvim-navic", config = true, opts = { mouse = true } }, + -- DAP plugin { "mfussenegger/nvim-dap", config = require("plugins.dap") }, - -- Display function signature - { - "ray-x/lsp_signature.nvim", - event = "VeryLazy", - opts = { always_trigger = true }, - config = function(_, opts) - require("lsp_signature").setup(opts) - end, - }, - -- Snippets plugin { "L3MON4D3/LuaSnip", @@ -176,9 +170,18 @@ local plugins = { build = function() vim.fn["firenvim#install"](0) end, + config = function() + vim.g.firenvim_config = { + localSettings = { + [".*"] = { + takeOver = "never", + }, + }, + } + end, }, - -- Vim <3 Asciidoctor + -- Vim ♥️ Asciidoctor "habamax/vim-asciidoctor", -- Asciidoc preview @@ -216,6 +219,7 @@ local plugins = { -- Better folds { + enabled = false, "kevinhwang91/nvim-ufo", dependencies = { "kevinhwang91/promise-async" }, config = require("plugins.ufo"), diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua new file mode 100644 index 00000000..37c8065f --- /dev/null +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -0,0 +1,17 @@ +return function() + require("lualine").setup({ + sections = { + lualine_y = {}, + lualine_z = {}, + }, + winbar = { + lualine_a = { "progress" }, + lualine_c = { + "navic", + color_correction = nil, + navic_opts = nil, + }, + lualine_z = { "location" }, + }, + }) +end diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index cccc8625..7d84e0fd 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -1,9 +1,10 @@ local m = {} function m.setup() - local function on_attach() - -- Setup lsp signature plugin - require("lsp_signature").setup({}) + local function on_attach(client, bufnr) + + -- Attach navic + require("nvim-navic").attach(client, bufnr) -- Setup keybinds m.map_keys() diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua new file mode 100644 index 00000000..83cb3d98 --- /dev/null +++ b/home/.config/nvim/lua/plugins/noice.lua @@ -0,0 +1,18 @@ +return { + lsp = { + -- override markdown rendering so that **cmp** and other plugins use **Treesitter** + override = { + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, + ["cmp.entry.get_documentation"] = true, + }, + }, + -- you can enable a preset for easier configuration + presets = { + bottom_search = true, -- use a classic bottom cmdline for search + command_palette = true, -- position the cmdline and popupmenu together + long_message_to_split = true, -- long messages will be sent to a split + inc_rename = false, -- enables an input dialog for inc-rename.nvim + lsp_doc_border = false, -- add a border to hover docs and signature help + }, +} diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 3dac263c..5a30c1af 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -6,6 +6,29 @@ return function() pickers = { find_files = { find_command = { "fd", "-Ht", "f" } }, lsp_references = { show_line = false }, + live_grep = { + additional_args = function(opts) + return { "--hidden" } + end, + }, + }, + extensions = { + cder = { + previewer_command = "eza " + .. "-a " + .. "--color=always " + .. "-T " + .. "--level=3 " + .. "--icons " + .. "--git-ignore " + .. "--long " + .. "--no-permissions " + .. "--no-user " + .. "--no-filesize " + .. "--git " + .. "--ignore-glob=.git", + dir_command = { "fd", "-Ht", "d", ".", os.getenv("HOME") }, + }, }, }) diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index 317f527c..ca53a23f 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -4,6 +4,11 @@ return function() "bash", "css", "dockerfile", + "git_config", + "git_rebase", + "gitattributes", + "gitcommit", + "gitignore", "html", "http", "java", @@ -14,6 +19,7 @@ return function() "lua", "make", "markdown", + "markdown_inline", "php", "python", "rasi", @@ -23,6 +29,7 @@ return function() "toml", "tsx", "typescript", + "vim", "yaml", }, highlight = { enable = true }, diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua index dbdce244..d7582244 100644 --- a/home/.config/nvim/lua/plugins/ufo.lua +++ b/home/.config/nvim/lua/plugins/ufo.lua @@ -1,7 +1,20 @@ return function() - require("ufo").setup({ + local keymap = vim.keymap + local o = vim.o + local ufo = require("ufo") + ufo.setup({ close_fold_kinds = { "imports", }, }) + + -- Using ufo, need to remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself + keymap.set("n", "zR", ufo.openAllFolds) + keymap.set("n", "zM", ufo.closeAllFolds) + + -- Fold settings + o.foldcolumn = "1" + o.foldlevel = 99 + o.foldlevelstart = 99 + o.foldenable = true end diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index e7e9fad8..7c1cbf8b 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -15,10 +15,15 @@ return function() ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, }) + -- Open cder + wk.register({ cd = { + function() + vim.cmd("Telescope cder") + end, + "Change directories", + } }) + -- Exit terminal insert mode with esc vim.keymap.set("t", "", "", {}) - -- Using ufo, need to remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself - vim.keymap.set("n", "zR", require("ufo").openAllFolds) - vim.keymap.set("n", "zM", require("ufo").closeAllFolds) end diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 06c984a0..aad296fd 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -1,7 +1,9 @@ local o = vim.o local g = vim.g +o.pumblend = 10 -- Relative line numbers +o.number = true o.relativenumber = true -- True colors @@ -20,8 +22,6 @@ o.diffopt = "filler,internal,algorithm:histogram,indent-heuristic" -- Allow switching buffers with unsaved changes o.hidden = true --- Show line numbers -o.number = true o.guicursor = table.concat({ "i:ver1", -- Vertical bar cursor in insert mode @@ -31,8 +31,6 @@ o.guicursor = table.concat({ -- Enable global statusline o.laststatus = 3 -o.cmdheight = 1 - -- Use suda by default g.suda_smart_edit = 1 @@ -47,18 +45,3 @@ g.mapleader = " " o.tabstop = 4 o.shiftwidth = 4 o.smartindent = true - --- Firenvim settings -g.firenvim_config = { - localSettings = { - [".*"] = { - takeOver = "never", - }, - }, -} - --- Fold settings (for ufo) -o.foldcolumn = "1" -o.foldlevel = 99 -o.foldlevelstart = 99 -o.foldenable = true diff --git a/home/.ignore b/home/.ignore index 2dc5ae47..d1402308 100644 --- a/home/.ignore +++ b/home/.ignore @@ -16,3 +16,7 @@ .android/ .audacity-data/ .zcompdump* +.var/ +.npm/ +.vscode-oss/ +.git/ From 6489b1094e68918cda170ac23199321fa17aebb5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 08:09:40 +0200 Subject: [PATCH 2079/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index accd6c8b..51fed8cd 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -16,7 +16,7 @@ "emmylua-nvim": { "branch": "master", "commit": "50b2eead8af6499fbba708553148ee8156d6612e" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, - "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" }, + "gitsigns.nvim": { "branch": "main", "commit": "37d26d718f8120a8c5c107c580c8c98cf89fdf1f" }, "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, @@ -34,17 +34,15 @@ "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, "nvim-jdtls": { "branch": "master", "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" }, - "nvim-lspconfig": { "branch": "master", "commit": "d5d7412ff267b92a11a94e6559d5507c43670a52" }, + "nvim-lspconfig": { "branch": "master", "commit": "29939f6f07bc0f3b9fc563fbfbee06ac88c8c439" }, "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" }, "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, "nvim-tree.lua": { "branch": "master", "commit": "80cfeadf179d5cba76f0f502c71dbcff1b515cd8" }, - "nvim-treesitter": { "branch": "master", "commit": "8b9f99660294dcd11d42572c84ee33a1e284f70d" }, + "nvim-treesitter": { "branch": "master", "commit": "73287b794d428843f20f9ae004bef2ce67ab3dbc" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "6c30f3c8915d7b31c3decdfe6c7672432da1809d" }, - "nvim-ufo": { "branch": "main", "commit": "a6132d058f23d15686f07b8e1ca252e060a0e0ce" }, "nvim-web-devicons": { "branch": "master", "commit": "3523d6e6d40ab11fd66c1b2732b3d6b60affa951" }, "password-store": { "branch": "master", "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, - "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "0fc69ebbf178631b8ab76745459fade062156ec5" }, From 8d2e52ec5ed6e4b39bb025f42e486a2fa7a40ee2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 08:09:40 +0200 Subject: [PATCH 2080/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index accd6c8b..51fed8cd 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -16,7 +16,7 @@ "emmylua-nvim": { "branch": "master", "commit": "50b2eead8af6499fbba708553148ee8156d6612e" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, - "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" }, + "gitsigns.nvim": { "branch": "main", "commit": "37d26d718f8120a8c5c107c580c8c98cf89fdf1f" }, "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, @@ -34,17 +34,15 @@ "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, "nvim-jdtls": { "branch": "master", "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" }, - "nvim-lspconfig": { "branch": "master", "commit": "d5d7412ff267b92a11a94e6559d5507c43670a52" }, + "nvim-lspconfig": { "branch": "master", "commit": "29939f6f07bc0f3b9fc563fbfbee06ac88c8c439" }, "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" }, "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, "nvim-tree.lua": { "branch": "master", "commit": "80cfeadf179d5cba76f0f502c71dbcff1b515cd8" }, - "nvim-treesitter": { "branch": "master", "commit": "8b9f99660294dcd11d42572c84ee33a1e284f70d" }, + "nvim-treesitter": { "branch": "master", "commit": "73287b794d428843f20f9ae004bef2ce67ab3dbc" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "6c30f3c8915d7b31c3decdfe6c7672432da1809d" }, - "nvim-ufo": { "branch": "main", "commit": "a6132d058f23d15686f07b8e1ca252e060a0e0ce" }, "nvim-web-devicons": { "branch": "master", "commit": "3523d6e6d40ab11fd66c1b2732b3d6b60affa951" }, "password-store": { "branch": "master", "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, - "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "0fc69ebbf178631b8ab76745459fade062156ec5" }, From 92ab50ddfcbf8657f593bf9c0143e143c426b319 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 16:48:09 +0200 Subject: [PATCH 2081/2667] Neovim: move navic to statusbar --- home/.config/nvim/lua/plugins/lualine.lua | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 37c8065f..5edaf3ba 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1,17 +1,7 @@ return function() require("lualine").setup({ sections = { - lualine_y = {}, - lualine_z = {}, - }, - winbar = { - lualine_a = { "progress" }, - lualine_c = { - "navic", - color_correction = nil, - navic_opts = nil, - }, - lualine_z = { "location" }, + lualine_c = { "navic" }, }, }) end From 0a9d36d1119a3fa141df7cf5e3bb1b27154fb2f4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 16:48:09 +0200 Subject: [PATCH 2082/2667] Neovim: move navic to statusbar --- home/.config/nvim/lua/plugins/lualine.lua | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 37c8065f..5edaf3ba 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1,17 +1,7 @@ return function() require("lualine").setup({ sections = { - lualine_y = {}, - lualine_z = {}, - }, - winbar = { - lualine_a = { "progress" }, - lualine_c = { - "navic", - color_correction = nil, - navic_opts = nil, - }, - lualine_z = { "location" }, + lualine_c = { "navic" }, }, }) end From 6c6ce53837d3db6e06094f0f3408e38bab4f01b7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 16:48:28 +0200 Subject: [PATCH 2083/2667] Nvim: jdtl: use on_attach from mason module --- home/.config/nvim/ftplugin/java.lua | 8 +++- home/.config/nvim/lua/plugins/mason.lua | 51 +++++++++++++++---------- 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 77267311..cd0e2267 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -2,6 +2,7 @@ local nvim_local_dir = vim.fn.expand("~/.local/share/nvim") local lombok_jar = nvim_local_dir .. "/mason/packages/jdtls/lombok.jar" local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name +local mason = require("plugins.mason") require("jdtls").start_or_attach({ cmd = { @@ -41,10 +42,13 @@ require("jdtls").start_or_attach({ path = "/usr/lib/jvm/java-19-openjdk-amd64/", }, }, + handlers = { + ["language/status"] = function() end, + }, + capabilities = mason.get_capabilities(), + on_attach = mason.on_attach, }) -require("plugins.mason").map_keys() - function RunJava() local function show_output(output) vim.cmd("split") diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 7d84e0fd..62e14876 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -1,34 +1,16 @@ local m = {} function m.setup() - local function on_attach(client, bufnr) - - -- Attach navic - require("nvim-navic").attach(client, bufnr) - - -- Setup keybinds - m.map_keys() - end - - -- Inform lsp about completion capabilities from cmp - local capabilities = require("cmp_nvim_lsp").default_capabilities() - - -- Neovim hasn't added foldingRange to default capabilities, users must add it manually - -- for ufo - capabilities.textDocument.foldingRange = { - dynamicRegistration = false, - lineFoldingOnly = true, - } - require("mason").setup() local mason_lsp = require("mason-lspconfig") mason_lsp.setup() + local capabilities = m.get_capabilities() mason_lsp.setup_handlers({ -- Default handler function(server_name) require("lspconfig")[server_name].setup({ - on_attach = on_attach, + on_attach = m.on_attach, capabilities = capabilities, }) end, @@ -36,7 +18,7 @@ function m.setup() -- Override lua_ls settings ["lua_ls"] = function() require("lspconfig").lua_ls.setup({ - on_attach = on_attach, + on_attach = m.on_attach, capabilities = capabilities, settings = { Lua = { @@ -101,4 +83,31 @@ function m.map_keys() }) end +function m.on_attach(client, bufnr) + -- Attach navic if document symbols are available + if client.server_capabilities.documentSymbolProvider then + require("nvim-navic").attach(client, bufnr) + end + + -- Setup keybinds + m.map_keys() +end + +function m.get_capabilities() + -- Combine built-in LSP and cmp cabaibilities + local capabilities = vim.tbl_deep_extend( + "force", + vim.lsp.protocol.make_client_capabilities(), + require("cmp_nvim_lsp").default_capabilities() + ) + + -- Neovim hasn't added foldingRange to default capabilities, users must add it manually + -- for ufo + --capabilities.textDocument.foldingRange = { + -- dynamicRegistration = false, + -- lineFoldingOnly = true, + --} + return capabilities +end + return m From e7829af03c10081bb0e6f48fc4516143d986a278 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 16:48:28 +0200 Subject: [PATCH 2084/2667] Nvim: jdtl: use on_attach from mason module --- home/.config/nvim/ftplugin/java.lua | 8 +++- home/.config/nvim/lua/plugins/mason.lua | 51 +++++++++++++++---------- 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 77267311..cd0e2267 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -2,6 +2,7 @@ local nvim_local_dir = vim.fn.expand("~/.local/share/nvim") local lombok_jar = nvim_local_dir .. "/mason/packages/jdtls/lombok.jar" local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name +local mason = require("plugins.mason") require("jdtls").start_or_attach({ cmd = { @@ -41,10 +42,13 @@ require("jdtls").start_or_attach({ path = "/usr/lib/jvm/java-19-openjdk-amd64/", }, }, + handlers = { + ["language/status"] = function() end, + }, + capabilities = mason.get_capabilities(), + on_attach = mason.on_attach, }) -require("plugins.mason").map_keys() - function RunJava() local function show_output(output) vim.cmd("split") diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 7d84e0fd..62e14876 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -1,34 +1,16 @@ local m = {} function m.setup() - local function on_attach(client, bufnr) - - -- Attach navic - require("nvim-navic").attach(client, bufnr) - - -- Setup keybinds - m.map_keys() - end - - -- Inform lsp about completion capabilities from cmp - local capabilities = require("cmp_nvim_lsp").default_capabilities() - - -- Neovim hasn't added foldingRange to default capabilities, users must add it manually - -- for ufo - capabilities.textDocument.foldingRange = { - dynamicRegistration = false, - lineFoldingOnly = true, - } - require("mason").setup() local mason_lsp = require("mason-lspconfig") mason_lsp.setup() + local capabilities = m.get_capabilities() mason_lsp.setup_handlers({ -- Default handler function(server_name) require("lspconfig")[server_name].setup({ - on_attach = on_attach, + on_attach = m.on_attach, capabilities = capabilities, }) end, @@ -36,7 +18,7 @@ function m.setup() -- Override lua_ls settings ["lua_ls"] = function() require("lspconfig").lua_ls.setup({ - on_attach = on_attach, + on_attach = m.on_attach, capabilities = capabilities, settings = { Lua = { @@ -101,4 +83,31 @@ function m.map_keys() }) end +function m.on_attach(client, bufnr) + -- Attach navic if document symbols are available + if client.server_capabilities.documentSymbolProvider then + require("nvim-navic").attach(client, bufnr) + end + + -- Setup keybinds + m.map_keys() +end + +function m.get_capabilities() + -- Combine built-in LSP and cmp cabaibilities + local capabilities = vim.tbl_deep_extend( + "force", + vim.lsp.protocol.make_client_capabilities(), + require("cmp_nvim_lsp").default_capabilities() + ) + + -- Neovim hasn't added foldingRange to default capabilities, users must add it manually + -- for ufo + --capabilities.textDocument.foldingRange = { + -- dynamicRegistration = false, + -- lineFoldingOnly = true, + --} + return capabilities +end + return m From 88da85e3682d61a1e5e1ecece165508305e08121 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 16:53:58 +0200 Subject: [PATCH 2085/2667] Rename mason module to lsp, packages/init.lua to lazy.lua Better describes their usage --- home/.config/nvim/ftplugin/java.lua | 6 +++--- home/.config/nvim/init.lua | 2 +- home/.config/nvim/lua/plugins/{init.lua => lazy.lua} | 2 +- home/.config/nvim/lua/plugins/{mason.lua => lsp.lua} | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename home/.config/nvim/lua/plugins/{init.lua => lazy.lua} (99%) rename home/.config/nvim/lua/plugins/{mason.lua => lsp.lua} (100%) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index cd0e2267..fc929f22 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -2,7 +2,7 @@ local nvim_local_dir = vim.fn.expand("~/.local/share/nvim") local lombok_jar = nvim_local_dir .. "/mason/packages/jdtls/lombok.jar" local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name -local mason = require("plugins.mason") +local lsp = require("plugins.lsp") require("jdtls").start_or_attach({ cmd = { @@ -45,8 +45,8 @@ require("jdtls").start_or_attach({ handlers = { ["language/status"] = function() end, }, - capabilities = mason.get_capabilities(), - on_attach = mason.on_attach, + capabilities = lsp.get_capabilities(), + on_attach = lsp.on_attach, }) function RunJava() diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 33c92035..14ec44aa 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,4 +1,4 @@ require("settings") require("neovide") require("highlight_yank") -require("plugins.init") +require("plugins.lazy") diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/lazy.lua similarity index 99% rename from home/.config/nvim/lua/plugins/init.lua rename to home/.config/nvim/lua/plugins/lazy.lua index 0018004e..54cd7eb6 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/lazy.lua @@ -85,7 +85,7 @@ local plugins = { -- Package manager for LSP servers, DAP adapters etc. { "williamboman/mason.nvim", - config = require("plugins.mason").setup, + config = require("plugins.lsp").setup, dependencies = { "neovim/nvim-lspconfig", "williamboman/mason-lspconfig.nvim", diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/lsp.lua similarity index 100% rename from home/.config/nvim/lua/plugins/mason.lua rename to home/.config/nvim/lua/plugins/lsp.lua From e18faebc50ea2b1a7ce19ef62c765deb1ff8fcc9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 16:53:58 +0200 Subject: [PATCH 2086/2667] Rename mason module to lsp, packages/init.lua to lazy.lua Better describes their usage --- home/.config/nvim/ftplugin/java.lua | 6 +++--- home/.config/nvim/init.lua | 2 +- home/.config/nvim/lua/plugins/{init.lua => lazy.lua} | 2 +- home/.config/nvim/lua/plugins/{mason.lua => lsp.lua} | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename home/.config/nvim/lua/plugins/{init.lua => lazy.lua} (99%) rename home/.config/nvim/lua/plugins/{mason.lua => lsp.lua} (100%) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index cd0e2267..fc929f22 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -2,7 +2,7 @@ local nvim_local_dir = vim.fn.expand("~/.local/share/nvim") local lombok_jar = nvim_local_dir .. "/mason/packages/jdtls/lombok.jar" local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name -local mason = require("plugins.mason") +local lsp = require("plugins.lsp") require("jdtls").start_or_attach({ cmd = { @@ -45,8 +45,8 @@ require("jdtls").start_or_attach({ handlers = { ["language/status"] = function() end, }, - capabilities = mason.get_capabilities(), - on_attach = mason.on_attach, + capabilities = lsp.get_capabilities(), + on_attach = lsp.on_attach, }) function RunJava() diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 33c92035..14ec44aa 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,4 +1,4 @@ require("settings") require("neovide") require("highlight_yank") -require("plugins.init") +require("plugins.lazy") diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/lazy.lua similarity index 99% rename from home/.config/nvim/lua/plugins/init.lua rename to home/.config/nvim/lua/plugins/lazy.lua index 0018004e..54cd7eb6 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/lazy.lua @@ -85,7 +85,7 @@ local plugins = { -- Package manager for LSP servers, DAP adapters etc. { "williamboman/mason.nvim", - config = require("plugins.mason").setup, + config = require("plugins.lsp").setup, dependencies = { "neovim/nvim-lspconfig", "williamboman/mason-lspconfig.nvim", diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/lsp.lua similarity index 100% rename from home/.config/nvim/lua/plugins/mason.lua rename to home/.config/nvim/lua/plugins/lsp.lua From d07aa82cdaef14bc4b29588f1317fd090a945fcc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 22:03:18 +0200 Subject: [PATCH 2087/2667] Nvim: limit some plugins to only load on specific filetypes --- home/.config/nvim/lua/plugins/lazy.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home/.config/nvim/lua/plugins/lazy.lua b/home/.config/nvim/lua/plugins/lazy.lua index 54cd7eb6..7ae457d9 100644 --- a/home/.config/nvim/lua/plugins/lazy.lua +++ b/home/.config/nvim/lua/plugins/lazy.lua @@ -110,7 +110,7 @@ local plugins = { }, -- vim api documentation for lua lsp - "ii14/emmylua-nvim", + { "ii14/emmylua-nvim", ft = { "lua" } }, -- Completion { @@ -182,10 +182,10 @@ local plugins = { }, -- Vim ♥️ Asciidoctor - "habamax/vim-asciidoctor", + { "habamax/vim-asciidoctor", ft = { "asciidoctor", "asciidoc" } }, -- Asciidoc preview - { "tigion/nvim-asciidoc-preview", ft = { "asciidoctor" } }, + { "tigion/nvim-asciidoc-preview", ft = { "asciidoctor", "asciidoc" } }, -- Markdown preview { @@ -198,7 +198,7 @@ local plugins = { }, -- Edit GPG encrypted files transparently - "jamessan/vim-gnupg", + { "jamessan/vim-gnupg", ft = { "gpg" } }, -- High performance color highlighter { @@ -207,7 +207,7 @@ local plugins = { }, -- Caddyfile syntax support - "isobit/vim-caddyfile", + { "isobit/vim-caddyfile", ft = "caddyfile" }, -- Startup dashboard { From 69174838ad8eb40ad9f399bed08053a0189023be Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 22:03:18 +0200 Subject: [PATCH 2088/2667] Nvim: limit some plugins to only load on specific filetypes --- home/.config/nvim/lua/plugins/lazy.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home/.config/nvim/lua/plugins/lazy.lua b/home/.config/nvim/lua/plugins/lazy.lua index 54cd7eb6..7ae457d9 100644 --- a/home/.config/nvim/lua/plugins/lazy.lua +++ b/home/.config/nvim/lua/plugins/lazy.lua @@ -110,7 +110,7 @@ local plugins = { }, -- vim api documentation for lua lsp - "ii14/emmylua-nvim", + { "ii14/emmylua-nvim", ft = { "lua" } }, -- Completion { @@ -182,10 +182,10 @@ local plugins = { }, -- Vim ♥️ Asciidoctor - "habamax/vim-asciidoctor", + { "habamax/vim-asciidoctor", ft = { "asciidoctor", "asciidoc" } }, -- Asciidoc preview - { "tigion/nvim-asciidoc-preview", ft = { "asciidoctor" } }, + { "tigion/nvim-asciidoc-preview", ft = { "asciidoctor", "asciidoc" } }, -- Markdown preview { @@ -198,7 +198,7 @@ local plugins = { }, -- Edit GPG encrypted files transparently - "jamessan/vim-gnupg", + { "jamessan/vim-gnupg", ft = { "gpg" } }, -- High performance color highlighter { @@ -207,7 +207,7 @@ local plugins = { }, -- Caddyfile syntax support - "isobit/vim-caddyfile", + { "isobit/vim-caddyfile", ft = "caddyfile" }, -- Startup dashboard { From 4c256d4b37ba8e8dafd9f05cc556115640b73e2c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 23:28:48 +0200 Subject: [PATCH 2089/2667] Nvim: enable cursorline --- home/.config/nvim/lua/settings.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index aad296fd..a58a8273 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -9,6 +9,9 @@ o.relativenumber = true -- True colors o.termguicolors = true +-- Enable cursorline highlighting +o.cursorline = true + -- Floating window transparency o.winblend = 10 From c6391d5557b2da79c9e79dc91a6b2aef548c19b7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 23:28:48 +0200 Subject: [PATCH 2090/2667] Nvim: enable cursorline --- home/.config/nvim/lua/settings.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index aad296fd..a58a8273 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -9,6 +9,9 @@ o.relativenumber = true -- True colors o.termguicolors = true +-- Enable cursorline highlighting +o.cursorline = true + -- Floating window transparency o.winblend = 10 From 902c397e8bbb8f527604506c797952b9181fbb98 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 00:21:28 +0200 Subject: [PATCH 2091/2667] Fix bufferline theming --- home/.config/nvim/lua/plugins/lazy.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/lazy.lua b/home/.config/nvim/lua/plugins/lazy.lua index 7ae457d9..2199ce45 100644 --- a/home/.config/nvim/lua/plugins/lazy.lua +++ b/home/.config/nvim/lua/plugins/lazy.lua @@ -36,8 +36,14 @@ local plugins = { config = require("plugins.lualine"), }, - -- Tabline/bufferline - { "akinsho/bufferline.nvim", version = "v3.*", dependencies = { "kyazdani42/nvim-web-devicons" }, config = true }, + -- bufferline + { + "akinsho/bufferline.nvim", + version = "v3.*", + dependencies = { "kyazdani42/nvim-web-devicons" }, + config = true, + opts = { options = { themeable = true } }, + }, -- Git status in signcolumn { "lewis6991/gitsigns.nvim", config = true }, From 94244ca95cdc6b77d52e55bf1d8cbd65135f8cda Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 00:21:28 +0200 Subject: [PATCH 2092/2667] Fix bufferline theming --- home/.config/nvim/lua/plugins/lazy.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/lazy.lua b/home/.config/nvim/lua/plugins/lazy.lua index 7ae457d9..2199ce45 100644 --- a/home/.config/nvim/lua/plugins/lazy.lua +++ b/home/.config/nvim/lua/plugins/lazy.lua @@ -36,8 +36,14 @@ local plugins = { config = require("plugins.lualine"), }, - -- Tabline/bufferline - { "akinsho/bufferline.nvim", version = "v3.*", dependencies = { "kyazdani42/nvim-web-devicons" }, config = true }, + -- bufferline + { + "akinsho/bufferline.nvim", + version = "v3.*", + dependencies = { "kyazdani42/nvim-web-devicons" }, + config = true, + opts = { options = { themeable = true } }, + }, -- Git status in signcolumn { "lewis6991/gitsigns.nvim", config = true }, From 0ced314c90b8052e73a49175c7adc971597330f0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 02:27:14 +0200 Subject: [PATCH 2093/2667] Refactor neovim config file structure All plugins are now in their own files with their lazy specifications and configurations. Also moved lazy initialization to init.lua because it is very compact now --- home/.config/nvim/init.lua | 16 +- home/.config/nvim/lazy-lock.json | 9 +- .../lua/{plugins/lsp.lua => lsp_utils.lua} | 51 +--- home/.config/nvim/lua/plugins/asciidoc.lua | 13 + home/.config/nvim/lua/plugins/autopairs.lua | 2 + home/.config/nvim/lua/plugins/bufferline.lua | 7 + home/.config/nvim/lua/plugins/caddyfile.lua | 2 + home/.config/nvim/lua/plugins/cmp.lua | 198 +++++++------- .../nvim/lua/plugins/commentstring.lua | 5 + home/.config/nvim/lua/plugins/copilot.lua | 9 + home/.config/nvim/lua/plugins/dap.lua | 61 ++--- home/.config/nvim/lua/plugins/dashboard.lua | 12 +- home/.config/nvim/lua/plugins/emmylua.lua | 2 + home/.config/nvim/lua/plugins/firenvim.lua | 16 ++ home/.config/nvim/lua/plugins/fugitive.lua | 2 + home/.config/nvim/lua/plugins/gitsigns.lua | 15 ++ home/.config/nvim/lua/plugins/gnupg.lua | 2 + .../nvim/lua/plugins/indent-blankline.lua | 40 +-- .../plugins/{colorscheme.lua => kanagawa.lua} | 15 +- home/.config/nvim/lua/plugins/lazy.lua | 246 ------------------ home/.config/nvim/lua/plugins/lualine.lua | 11 +- home/.config/nvim/lua/plugins/luasnip.lua | 13 +- .../nvim/lua/plugins/markdown-preview.lua | 9 + home/.config/nvim/lua/plugins/mason.lua | 57 ++++ home/.config/nvim/lua/plugins/navic.lua | 2 + home/.config/nvim/lua/plugins/neoformat.lua | 10 + home/.config/nvim/lua/plugins/noice.lua | 35 ++- .../nvim/lua/plugins/nvim-colorizer.lua | 4 + home/.config/nvim/lua/plugins/nvim-tree.lua | 33 ++- home/.config/nvim/lua/plugins/redact_pass.lua | 7 + home/.config/nvim/lua/plugins/suda.lua | 2 + home/.config/nvim/lua/plugins/telescope.lua | 46 +++- home/.config/nvim/lua/plugins/treesitter.lua | 96 +++---- home/.config/nvim/lua/plugins/ufo.lua | 38 +-- .../.config/nvim/lua/plugins/vim-surround.lua | 2 + home/.config/nvim/lua/plugins/which-key.lua | 50 ++-- 36 files changed, 554 insertions(+), 584 deletions(-) rename home/.config/nvim/lua/{plugins/lsp.lua => lsp_utils.lua} (61%) create mode 100644 home/.config/nvim/lua/plugins/asciidoc.lua create mode 100644 home/.config/nvim/lua/plugins/autopairs.lua create mode 100644 home/.config/nvim/lua/plugins/bufferline.lua create mode 100644 home/.config/nvim/lua/plugins/caddyfile.lua create mode 100644 home/.config/nvim/lua/plugins/commentstring.lua create mode 100644 home/.config/nvim/lua/plugins/copilot.lua create mode 100644 home/.config/nvim/lua/plugins/emmylua.lua create mode 100644 home/.config/nvim/lua/plugins/firenvim.lua create mode 100644 home/.config/nvim/lua/plugins/fugitive.lua create mode 100644 home/.config/nvim/lua/plugins/gitsigns.lua create mode 100644 home/.config/nvim/lua/plugins/gnupg.lua rename home/.config/nvim/lua/plugins/{colorscheme.lua => kanagawa.lua} (92%) delete mode 100644 home/.config/nvim/lua/plugins/lazy.lua create mode 100644 home/.config/nvim/lua/plugins/markdown-preview.lua create mode 100644 home/.config/nvim/lua/plugins/mason.lua create mode 100644 home/.config/nvim/lua/plugins/navic.lua create mode 100644 home/.config/nvim/lua/plugins/neoformat.lua create mode 100644 home/.config/nvim/lua/plugins/nvim-colorizer.lua create mode 100644 home/.config/nvim/lua/plugins/redact_pass.lua create mode 100644 home/.config/nvim/lua/plugins/suda.lua create mode 100644 home/.config/nvim/lua/plugins/vim-surround.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 14ec44aa..7d445664 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,4 +1,18 @@ +-- Install lazy if it's not yet installed +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + require("settings") require("neovide") require("highlight_yank") -require("plugins.lazy") +require("lazy").setup("plugins") diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 51fed8cd..49de6968 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -11,7 +11,6 @@ "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "73047082d72fcfdde1f73b7f17ad495cffcbafaa" }, "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, "emmylua-nvim": { "branch": "master", "commit": "50b2eead8af6499fbba708553148ee8156d6612e" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, @@ -22,7 +21,7 @@ "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "faeb361507aa1ef1b0e5645781e2aa0d36a4aa84" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "ab640b38ca9fa50d25d2d249b6606b9456b628d5" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "e4f34741daa9cf95de68a603d3e7a6844a69fdf0" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "neoformat": { "branch": "master", "commit": "e5fe7e8f7c3dd071b90f19af0e8c7cfa56cdedc7" }, @@ -32,13 +31,13 @@ "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, + "nvim-dap": { "branch": "master", "commit": "e154fdb6d70b3765d71f296e718b29d8b7026a63" }, "nvim-jdtls": { "branch": "master", "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" }, - "nvim-lspconfig": { "branch": "master", "commit": "29939f6f07bc0f3b9fc563fbfbee06ac88c8c439" }, + "nvim-lspconfig": { "branch": "master", "commit": "48347089666d5b77d054088aa72e4e0b58026e6e" }, "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" }, "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, "nvim-tree.lua": { "branch": "master", "commit": "80cfeadf179d5cba76f0f502c71dbcff1b515cd8" }, - "nvim-treesitter": { "branch": "master", "commit": "73287b794d428843f20f9ae004bef2ce67ab3dbc" }, + "nvim-treesitter": { "branch": "master", "commit": "557561fbc17269cdd4e9e88ef0ca1a9ff0bbf7e6" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "6c30f3c8915d7b31c3decdfe6c7672432da1809d" }, "nvim-web-devicons": { "branch": "master", "commit": "3523d6e6d40ab11fd66c1b2732b3d6b60affa951" }, "password-store": { "branch": "master", "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" }, diff --git a/home/.config/nvim/lua/plugins/lsp.lua b/home/.config/nvim/lua/lsp_utils.lua similarity index 61% rename from home/.config/nvim/lua/plugins/lsp.lua rename to home/.config/nvim/lua/lsp_utils.lua index 62e14876..614ac5ad 100644 --- a/home/.config/nvim/lua/plugins/lsp.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -1,51 +1,9 @@ +-- This module contains lsp related +-- reusable functions local m = {} -function m.setup() - require("mason").setup() - local mason_lsp = require("mason-lspconfig") - mason_lsp.setup() - local capabilities = m.get_capabilities() - - mason_lsp.setup_handlers({ - -- Default handler - function(server_name) - require("lspconfig")[server_name].setup({ - on_attach = m.on_attach, - capabilities = capabilities, - }) - end, - - -- Override lua_ls settings - ["lua_ls"] = function() - require("lspconfig").lua_ls.setup({ - on_attach = m.on_attach, - capabilities = capabilities, - settings = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = "LuaJIT", - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = { "vim" }, - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file("", true), - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = { enable = false }, - }, - }, - }) - end, - - -- Don't set up jdtls, it is set up by nvim-jdtls - ["jdtls"] = function() end, - }) -end - +-- Map LSP specific keybinds. +-- This makes them only available when LSP is running function m.map_keys() local telescope_builtin = require("telescope.builtin") require("which-key").register({ @@ -83,6 +41,7 @@ function m.map_keys() }) end + function m.on_attach(client, bufnr) -- Attach navic if document symbols are available if client.server_capabilities.documentSymbolProvider then diff --git a/home/.config/nvim/lua/plugins/asciidoc.lua b/home/.config/nvim/lua/plugins/asciidoc.lua new file mode 100644 index 00000000..7e4a139d --- /dev/null +++ b/home/.config/nvim/lua/plugins/asciidoc.lua @@ -0,0 +1,13 @@ +-- AsciiDoc plugins are grouped together here +return { + -- Vim ♥️ Asciidoctor + { + "habamax/vim-asciidoctor", + ft = { "asciidoctor", "asciidoc" }, + }, + -- AsciiDoc preview + { + "tigion/nvim-asciidoc-preview", + ft = { "asciidoctor", "asciidoc" }, + }, +} diff --git a/home/.config/nvim/lua/plugins/autopairs.lua b/home/.config/nvim/lua/plugins/autopairs.lua new file mode 100644 index 00000000..79e2f492 --- /dev/null +++ b/home/.config/nvim/lua/plugins/autopairs.lua @@ -0,0 +1,2 @@ +-- Automatic brackets +return { "windwp/nvim-autopairs" } diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua new file mode 100644 index 00000000..027fcb02 --- /dev/null +++ b/home/.config/nvim/lua/plugins/bufferline.lua @@ -0,0 +1,7 @@ +return { + "akinsho/bufferline.nvim", + version = "*", + dependencies = { "kyazdani42/nvim-web-devicons" }, + config = true, + --opts = { options = { themeable = true } }, +} diff --git a/home/.config/nvim/lua/plugins/caddyfile.lua b/home/.config/nvim/lua/plugins/caddyfile.lua new file mode 100644 index 00000000..b419a597 --- /dev/null +++ b/home/.config/nvim/lua/plugins/caddyfile.lua @@ -0,0 +1,2 @@ +-- Caddyfile syntax support +return { "isobit/vim-caddyfile", ft = "caddyfile" } diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 020c371d..129c4c62 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -1,101 +1,107 @@ -return function() - local cmp = require("cmp") - local luasnip = require("luasnip") +-- Autoompletion +return { + "hrsh7th/nvim-cmp", + dependencies = { + "hrsh7th/cmp-buffer", -- Buffer source + { "petertriho/cmp-git", dependencies = { "nvim-lua/plenary.nvim" } }, -- Git source + "hrsh7th/cmp-nvim-lsp", -- LSP source + "hrsh7th/cmp-nvim-lua", -- Neovim Lua API documentation source + "hrsh7th/cmp-path", -- Path source + "hrsh7th/cmp-cmdline", -- cmdline source + "saadparwaiz1/cmp_luasnip", -- Snippets source + "f3fora/cmp-spell", -- Spell check source + "zbirenbaum/copilot-cmp", -- Copilot source + }, + config = function() + local cmp = require("cmp") + local luasnip = require("luasnip") - if not cmp then - return - end + if not cmp then + return + end - -- Setup git completion source - require("cmp_git").setup() - -- - -- Setup copilot source - require("copilot_cmp").setup({ fix_pairs = true }) + -- Setup git completion source + require("cmp_git").setup() + -- + -- Setup copilot source + require("copilot_cmp").setup({ fix_pairs = true }) - -- Set completeopt to have a better completion experience - vim.o.completeopt = "menuone,noselect" + -- Set completeopt to have a better completion experience + vim.o.completeopt = "menuone,noselect" - cmp.setup({ - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - mapping = { - [""] = cmp.mapping.select_prev_item(), - [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.close(), - [""] = cmp.mapping.confirm({ - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - }, - sources = { - { name = "luasnip" }, - { name = "copilot" }, - { name = "nvim_lsp" }, - { name = "nvim_lua" }, - { name = "git" }, - { name = "buffer" }, - { name = "spell" }, - { name = "path" }, - }, - -- window = { - -- completion = { - -- winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:Visual,Search:None", - -- }, - - -- documentation = { - -- winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:Visual,Search:None", - -- }, - -- }, - }) - - -- Enable autopairs when enter is processed - -- on completion - local cmp_autopairs = require("nvim-autopairs.completion.cmp") - cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) - - -- `/` cmdline setup. - cmp.setup.cmdline("/", { - mapping = cmp.mapping.preset.cmdline(), - sources = { - { name = "buffer" }, - }, - }) - -- `:` cmdline setup. - cmp.setup.cmdline(":", { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ - { name = "path" }, - }, { - { - name = "cmdline", - option = { - ignore_cmds = { "Man", "!" }, - }, + cmp.setup({ + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, }, - }), - }) -end + mapping = { + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.close(), + [""] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), + }, + sources = { + { name = "luasnip" }, + { name = "copilot" }, + { name = "nvim_lsp" }, + { name = "nvim_lua" }, + { name = "git" }, + { name = "buffer" }, + { name = "spell" }, + { name = "path" }, + }, + }) + + -- Enable autopairs when enter is processed + -- on completion + local cmp_autopairs = require("nvim-autopairs.completion.cmp") + cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) + + -- `/` cmdline setup. + cmp.setup.cmdline("/", { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = "buffer" }, + }, + }) + -- `:` cmdline setup. + cmp.setup.cmdline(":", { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = "path" }, + }, { + { + name = "cmdline", + option = { + ignore_cmds = { "Man", "!" }, + }, + }, + }), + }) + end, +} diff --git a/home/.config/nvim/lua/plugins/commentstring.lua b/home/.config/nvim/lua/plugins/commentstring.lua new file mode 100644 index 00000000..f5e5692f --- /dev/null +++ b/home/.config/nvim/lua/plugins/commentstring.lua @@ -0,0 +1,5 @@ +-- treesitter plugin for commentstring +return { + "JoosepAlviste/nvim-ts-context-commentstring", + dependencies = { "tpope/vim-commentary" }, +} diff --git a/home/.config/nvim/lua/plugins/copilot.lua b/home/.config/nvim/lua/plugins/copilot.lua new file mode 100644 index 00000000..16b97d1f --- /dev/null +++ b/home/.config/nvim/lua/plugins/copilot.lua @@ -0,0 +1,9 @@ +-- GitHub Copilot +return { + "zbirenbaum/copilot.lua", + config = true, + opts = { + suggestion = { enabled = false }, + panel = { enabled = false }, + }, +} diff --git a/home/.config/nvim/lua/plugins/dap.lua b/home/.config/nvim/lua/plugins/dap.lua index a279e7ac..9e2fce70 100644 --- a/home/.config/nvim/lua/plugins/dap.lua +++ b/home/.config/nvim/lua/plugins/dap.lua @@ -1,31 +1,34 @@ -return function() - local dap = require("dap") +return { + "mfussenegger/nvim-dap", + config = function() + local dap = require("dap") - dap.adapters.bashdb = { - type = "executable", - command = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/bash-debug-adapter", - name = "bashdb", - } + dap.adapters.bashdb = { + type = "executable", + command = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/bash-debug-adapter", + name = "bashdb", + } - dap.configurations.sh = { - { - type = "bashdb", - request = "launch", - name = "Launch file", - showDebugOutput = true, - pathBashdb = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir/bashdb", - pathBashdbLib = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir", - trace = true, - file = "${file}", - program = "${file}", - cwd = "${workspaceFolder}", - pathCat = "cat", - pathBash = "/bin/bash", - pathMkfifo = "mkfifo", - pathPkill = "pkill", - args = {}, - env = {}, - terminalKind = "integrated", - }, - } -end + dap.configurations.sh = { + { + type = "bashdb", + request = "launch", + name = "Launch file", + showDebugOutput = true, + pathBashdb = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir/bashdb", + pathBashdbLib = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir", + trace = true, + file = "${file}", + program = "${file}", + cwd = "${workspaceFolder}", + pathCat = "cat", + pathBash = "/bin/bash", + pathMkfifo = "mkfifo", + pathPkill = "pkill", + args = {}, + env = {}, + terminalKind = "integrated", + }, + } + end, +} diff --git a/home/.config/nvim/lua/plugins/dashboard.lua b/home/.config/nvim/lua/plugins/dashboard.lua index 736abe90..cc526715 100644 --- a/home/.config/nvim/lua/plugins/dashboard.lua +++ b/home/.config/nvim/lua/plugins/dashboard.lua @@ -1,5 +1,9 @@ -return function() - require("dashboard").setup({ +-- Startup dashboard +return { + "glepnir/dashboard-nvim", + event = "VimEnter", + dependencies = { { "kyazdani42/nvim-web-devicons" } }, + opts = { theme = "hyper", config = { week_header = { @@ -18,5 +22,5 @@ return function() { icon = "❌ ", desc = "Quit", action = "q", key = "q" }, }, }, - }) -end + }, +} diff --git a/home/.config/nvim/lua/plugins/emmylua.lua b/home/.config/nvim/lua/plugins/emmylua.lua new file mode 100644 index 00000000..11105cf1 --- /dev/null +++ b/home/.config/nvim/lua/plugins/emmylua.lua @@ -0,0 +1,2 @@ +-- vim api documentation for lua lsp +return { "ii14/emmylua-nvim", ft = { "lua" } } diff --git a/home/.config/nvim/lua/plugins/firenvim.lua b/home/.config/nvim/lua/plugins/firenvim.lua new file mode 100644 index 00000000..507031e8 --- /dev/null +++ b/home/.config/nvim/lua/plugins/firenvim.lua @@ -0,0 +1,16 @@ +-- Neovim inside Firefox +return { + "glacambre/firenvim", + build = function() + vim.fn["firenvim#install"](0) + end, + config = function() + vim.g.firenvim_config = { + localSettings = { + [".*"] = { + takeOver = "never", + }, + }, + } + end, +} diff --git a/home/.config/nvim/lua/plugins/fugitive.lua b/home/.config/nvim/lua/plugins/fugitive.lua new file mode 100644 index 00000000..58030d28 --- /dev/null +++ b/home/.config/nvim/lua/plugins/fugitive.lua @@ -0,0 +1,2 @@ +-- Git commands +return { "tpope/vim-fugitive" } diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua new file mode 100644 index 00000000..7287de5a --- /dev/null +++ b/home/.config/nvim/lua/plugins/gitsigns.lua @@ -0,0 +1,15 @@ +-- Git status in signcolumn +return { + "lewis6991/gitsigns.nvim", + config = function() + local gitsigns = require("gitsigns") + gitsigns.setup() + + local wk = require("which-key") + wk.register({ + ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } }, + ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, + }, { prefix = "" }) + + end, +} diff --git a/home/.config/nvim/lua/plugins/gnupg.lua b/home/.config/nvim/lua/plugins/gnupg.lua new file mode 100644 index 00000000..22c3b584 --- /dev/null +++ b/home/.config/nvim/lua/plugins/gnupg.lua @@ -0,0 +1,2 @@ +-- Edit GPG encrypted files transparently +return { "jamessan/vim-gnupg", ft = { "gpg" } } diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index 5d6b4c37..f5743fec 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,19 +1,23 @@ -return function() - require("ibl").setup({ - exclude = { - filetypes = { - "", - "checkhealth", - "dashboard", - "git", - "gitcommit", - "TelescopePrompt", - "TelescopeResults", - "help", - "lazy", - "lspinfo", - "man", +-- Indent characters +return { + "lukas-reineke/indent-blankline.nvim", + config = function() + require("ibl").setup({ + exclude = { + filetypes = { + "", + "checkhealth", + "dashboard", + "git", + "gitcommit", + "TelescopePrompt", + "TelescopeResults", + "help", + "lazy", + "lspinfo", + "man", + }, }, - }, - }) -end + }) + end, +} diff --git a/home/.config/nvim/lua/plugins/colorscheme.lua b/home/.config/nvim/lua/plugins/kanagawa.lua similarity index 92% rename from home/.config/nvim/lua/plugins/colorscheme.lua rename to home/.config/nvim/lua/plugins/kanagawa.lua index ca26060b..bd7a0abb 100644 --- a/home/.config/nvim/lua/plugins/colorscheme.lua +++ b/home/.config/nvim/lua/plugins/kanagawa.lua @@ -1,5 +1,7 @@ -return function() - require("kanagawa").setup({ +-- Colorscheme +return { + "rebelot/kanagawa.nvim", + opts = { compile = true, dimInactive = true, colors = { @@ -42,7 +44,8 @@ return function() PmenuThumb = { bg = theme.ui.bg_p2 }, } end, - }) - - vim.cmd("colorscheme kanagawa") -end + }, + config = function() + vim.cmd("colorscheme kanagawa") + end, +} diff --git a/home/.config/nvim/lua/plugins/lazy.lua b/home/.config/nvim/lua/plugins/lazy.lua deleted file mode 100644 index 2199ce45..00000000 --- a/home/.config/nvim/lua/plugins/lazy.lua +++ /dev/null @@ -1,246 +0,0 @@ --- Install lazy if it's not yet installed -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) -end -vim.opt.rtp:prepend(lazypath) - --- Configure lazy -local plugins = { - -- Colorscheme - { - "rebelot/kanagawa.nvim", - config = require("plugins.colorscheme"), - }, - - -- Replace much of neovim's default UI - -- with a modern replacement - { - "folke/noice.nvim", - event = "VeryLazy", - dependencies = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify" }, - opts = require("plugins.noice"), - }, - - -- Statusline - { - "nvim-lualine/lualine.nvim", - dependencies = { "kyazdani42/nvim-web-devicons" }, - config = require("plugins.lualine"), - }, - - -- bufferline - { - "akinsho/bufferline.nvim", - version = "v3.*", - dependencies = { "kyazdani42/nvim-web-devicons" }, - config = true, - opts = { options = { themeable = true } }, - }, - - -- Git status in signcolumn - { "lewis6991/gitsigns.nvim", config = true }, - - -- Git commands - "tpope/vim-fugitive", - - -- Indent characters - { "lukas-reineke/indent-blankline.nvim", config = require("plugins.indent-blankline") }, - - -- Tree explorer - { - "kyazdani42/nvim-tree.lua", - dependencies = { "kyazdani42/nvim-web-devicons" }, - config = require("plugins.nvim-tree"), - }, - - -- Telescope - { - "nvim-telescope/telescope.nvim", - config = require("plugins.telescope"), - dependencies = { - -- Internal dependency for telescope - "nvim-lua/plenary.nvim", - - -- Use fzf for fuzzy finder - { - "nvim-telescope/telescope-fzf-native.nvim", - build = "make", - }, - -- Replace vim built in select with telescope - "nvim-telescope/telescope-ui-select.nvim", - - -- cd plugin for telescope - "zane-/cder.nvim", - }, - }, - - -- Do stuff as sudo - "lambdalisue/suda.vim", - - -- Display possible keybinds - { "folke/which-key.nvim", config = require("plugins.which-key") }, - - -- Package manager for LSP servers, DAP adapters etc. - { - "williamboman/mason.nvim", - config = require("plugins.lsp").setup, - dependencies = { - "neovim/nvim-lspconfig", - "williamboman/mason-lspconfig.nvim", - "WhoIsSethDaniel/mason-tool-installer.nvim", - }, - }, - - -- Additional LSP features for Java - "mfussenegger/nvim-jdtls", - - -- Show code LSP context in winbar - { "SmiteshP/nvim-navic", config = true, opts = { mouse = true } }, - - -- DAP plugin - { "mfussenegger/nvim-dap", config = require("plugins.dap") }, - - -- Snippets plugin - { - "L3MON4D3/LuaSnip", - dependencies = { "rafamadriz/friendly-snippets" }, -- Snippets collection - config = require("plugins.luasnip"), - }, - - -- vim api documentation for lua lsp - { "ii14/emmylua-nvim", ft = { "lua" } }, - - -- Completion - { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-buffer", -- Buffer source - { "petertriho/cmp-git", dependencies = { "nvim-lua/plenary.nvim" } }, -- Git source - "hrsh7th/cmp-nvim-lsp", -- LSP source - "hrsh7th/cmp-nvim-lua", -- Neovim Lua API documentation source - "hrsh7th/cmp-path", -- Path source - "hrsh7th/cmp-cmdline", -- cmdline source - "saadparwaiz1/cmp_luasnip", -- Snippets source - "f3fora/cmp-spell", -- Spell check source - "zbirenbaum/copilot-cmp", -- Copilot source - }, - config = require("plugins.cmp"), - }, - - -- Automatic brackets - { - "windwp/nvim-autopairs", - config = true, - }, - - -- treesitter - { - "nvim-treesitter/nvim-treesitter", - build = function() - require("nvim-treesitter.install").update({ with_sync = true }) - end, - config = require("plugins.treesitter"), - }, - - -- treesitter plugin for commentstring - "JoosepAlviste/nvim-ts-context-commentstring", - - -- mappings for commenting in code - "tpope/vim-commentary", - - -- we all know this one - "tpope/vim-surround", - - -- Formatter plugin - "sbdchd/neoformat", - - -- Make editing passwords safer - { - "https://git.zx2c4.com/password-store", - config = function(plugin) - vim.opt.rtp:append(plugin.dir .. "contrib/vim/redact_pass.vim") - end, - }, - - -- Neovim inside Firefox - { - "glacambre/firenvim", - build = function() - vim.fn["firenvim#install"](0) - end, - config = function() - vim.g.firenvim_config = { - localSettings = { - [".*"] = { - takeOver = "never", - }, - }, - } - end, - }, - - -- Vim ♥️ Asciidoctor - { "habamax/vim-asciidoctor", ft = { "asciidoctor", "asciidoc" } }, - - -- Asciidoc preview - { "tigion/nvim-asciidoc-preview", ft = { "asciidoctor", "asciidoc" } }, - - -- Markdown preview - { - "iamcco/markdown-preview.nvim", - build = "cd app && yarn install", - config = function() - vim.g.mkdp_filetypes = { "markdown" } - end, - ft = { "markdown" }, - }, - - -- Edit GPG encrypted files transparently - { "jamessan/vim-gnupg", ft = { "gpg" } }, - - -- High performance color highlighter - { - "norcalli/nvim-colorizer.lua", - config = true, - }, - - -- Caddyfile syntax support - { "isobit/vim-caddyfile", ft = "caddyfile" }, - - -- Startup dashboard - { - "glepnir/dashboard-nvim", - event = "VimEnter", - config = require("plugins.dashboard"), - dependencies = { { "kyazdani42/nvim-web-devicons" } }, - }, - - -- Better folds - { - enabled = false, - "kevinhwang91/nvim-ufo", - dependencies = { "kevinhwang91/promise-async" }, - config = require("plugins.ufo"), - }, - - -- GitHub Copilot - { - "zbirenbaum/copilot.lua", - config = function() - require("copilot").setup({ - suggestion = { enabled = false }, - panel = { enabled = false }, - }) - end, - }, -} - -require("lazy").setup(plugins, { lockfile = "~/git/dotfiles/home/.config/nvim/lazy-lock.json" }) diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 5edaf3ba..55759ee6 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1,7 +1,10 @@ -return function() - require("lualine").setup({ +-- Statusline +return { + "nvim-lualine/lualine.nvim", + dependencies = { "kyazdani42/nvim-web-devicons" }, + opts = { sections = { lualine_c = { "navic" }, }, - }) -end + }, +} diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index e89b9ac4..d420c8cd 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -1,4 +1,9 @@ -return function() - -- load friendly-snippets to luasnip - require("luasnip/loaders/from_vscode").lazy_load() -end +-- Snippets plugin +return { + "L3MON4D3/LuaSnip", + dependencies = { "rafamadriz/friendly-snippets" }, -- Snippets collection + config = function() + -- load friendly-snippets to luasnip + require("luasnip/loaders/from_vscode").lazy_load() + end, +} diff --git a/home/.config/nvim/lua/plugins/markdown-preview.lua b/home/.config/nvim/lua/plugins/markdown-preview.lua new file mode 100644 index 00000000..2350979d --- /dev/null +++ b/home/.config/nvim/lua/plugins/markdown-preview.lua @@ -0,0 +1,9 @@ +-- Markdown preview +return { + "iamcco/markdown-preview.nvim", + build = "cd app && yarn install", + config = function() + vim.g.mkdp_filetypes = { "markdown" } + end, + ft = { "markdown" }, +} diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua new file mode 100644 index 00000000..af5dcc47 --- /dev/null +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -0,0 +1,57 @@ +-- Package manager for LSP servers, DAP adapters etc. +return { + "williamboman/mason.nvim", + dependencies = { + "neovim/nvim-lspconfig", + "williamboman/mason-lspconfig.nvim", + "WhoIsSethDaniel/mason-tool-installer.nvim", + "mfussenegger/nvim-jdtls", + }, + config = function() + require("mason").setup() + + local mason_lsp = require("mason-lspconfig") + local lsp_utils = require('lsp_utils') + local capabilities = lsp_utils.get_capabilities() + mason_lsp.setup() + + mason_lsp.setup_handlers({ + -- Default handler + function(server_name) + require("lspconfig")[server_name].setup({ + on_attach = lsp_utils.on_attach, + capabilities = capabilities, + }) + end, + + -- Override lua_ls settings + ["lua_ls"] = function() + require("lspconfig").lua_ls.setup({ + on_attach = lsp_utils.on_attach, + capabilities = capabilities, + settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = "LuaJIT", + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = { "vim" }, + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file("", true), + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = { enable = false }, + }, + }, + }) + end, + + -- Don't set up jdtls, it is set up by nvim-jdtls + ["jdtls"] = function() end, + }) + end, +} diff --git a/home/.config/nvim/lua/plugins/navic.lua b/home/.config/nvim/lua/plugins/navic.lua new file mode 100644 index 00000000..de3d7dcd --- /dev/null +++ b/home/.config/nvim/lua/plugins/navic.lua @@ -0,0 +1,2 @@ +-- Show code LSP context in winbar +return { "SmiteshP/nvim-navic" } diff --git a/home/.config/nvim/lua/plugins/neoformat.lua b/home/.config/nvim/lua/plugins/neoformat.lua new file mode 100644 index 00000000..2abef6e4 --- /dev/null +++ b/home/.config/nvim/lua/plugins/neoformat.lua @@ -0,0 +1,10 @@ +-- Formatter plugin +return { + "sbdchd/neoformat", + config = function() + local wk = require("which-key") + wk.register({ + f = { "Neoformat", "Format with Neoformat" }, + }, { prefix = "" }) + end, +} diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua index 83cb3d98..01fb80c6 100644 --- a/home/.config/nvim/lua/plugins/noice.lua +++ b/home/.config/nvim/lua/plugins/noice.lua @@ -1,18 +1,25 @@ +-- Replace much of neovim's default UI +-- with a modern replacement return { - lsp = { - -- override markdown rendering so that **cmp** and other plugins use **Treesitter** - override = { - ["vim.lsp.util.convert_input_to_markdown_lines"] = true, - ["vim.lsp.util.stylize_markdown"] = true, - ["cmp.entry.get_documentation"] = true, + "folke/noice.nvim", + event = "VeryLazy", + dependencies = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify" }, + opts = { + lsp = { + -- override markdown rendering so that **cmp** and other plugins use **Treesitter** + override = { + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, + ["cmp.entry.get_documentation"] = true, + }, + }, + -- you can enable a preset for easier configuration + presets = { + bottom_search = true, -- use a classic bottom cmdline for search + command_palette = true, -- position the cmdline and popupmenu together + long_message_to_split = true, -- long messages will be sent to a split + inc_rename = false, -- enables an input dialog for inc-rename.nvim + lsp_doc_border = false, -- add a border to hover docs and signature help }, }, - -- you can enable a preset for easier configuration - presets = { - bottom_search = true, -- use a classic bottom cmdline for search - command_palette = true, -- position the cmdline and popupmenu together - long_message_to_split = true, -- long messages will be sent to a split - inc_rename = false, -- enables an input dialog for inc-rename.nvim - lsp_doc_border = false, -- add a border to hover docs and signature help - }, } diff --git a/home/.config/nvim/lua/plugins/nvim-colorizer.lua b/home/.config/nvim/lua/plugins/nvim-colorizer.lua new file mode 100644 index 00000000..089885de --- /dev/null +++ b/home/.config/nvim/lua/plugins/nvim-colorizer.lua @@ -0,0 +1,4 @@ +-- High performance color highlighter +return { + "norcalli/nvim-colorizer.lua", +} diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index 7f86f960..b15b0f0d 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -1,13 +1,20 @@ -return function() - require("nvim-tree").setup({ -- BEGIN_DEFAULT_OPTS - diagnostics = { - enable = true, - show_on_dirs = true, - }, - renderer = { - highlight_git = true, - }, - }) - -- Open/close with alt-o - vim.keymap.set("n", "", vim.cmd.NvimTreeToggle) -end +-- Tree explorer +return { + "kyazdani42/nvim-tree.lua", + dependencies = { "kyazdani42/nvim-web-devicons" }, + opts = { + diagnostics = { + enable = true, + show_on_dirs = true, + }, + renderer = { + highlight_git = true, + }, + }, + config = function(spec) + require("nvim-tree").setup(spec.opts) + + -- Open/close with alt-o + vim.keymap.set("n", "", vim.cmd.NvimTreeToggle) + end, +} diff --git a/home/.config/nvim/lua/plugins/redact_pass.lua b/home/.config/nvim/lua/plugins/redact_pass.lua new file mode 100644 index 00000000..3ac5d314 --- /dev/null +++ b/home/.config/nvim/lua/plugins/redact_pass.lua @@ -0,0 +1,7 @@ +-- Make editing passwords safer +return { + "https://git.zx2c4.com/password-store", + config = function(plugin) + vim.opt.rtp:append(plugin.dir .. "contrib/vim/redact_pass.vim") + end, +} diff --git a/home/.config/nvim/lua/plugins/suda.lua b/home/.config/nvim/lua/plugins/suda.lua new file mode 100644 index 00000000..cb7a4b50 --- /dev/null +++ b/home/.config/nvim/lua/plugins/suda.lua @@ -0,0 +1,2 @@ +-- Do stuff as sudo +return { "lambdalisue/suda.vim" } diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 5a30c1af..c2414c62 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,8 +1,22 @@ -return function() - local telescope = require("telescope") - local builtin = require("telescope.builtin") +return { + "nvim-telescope/telescope.nvim", + dependencies = { + -- Internal dependency for telescope + "nvim-lua/plenary.nvim", - telescope.setup({ + -- Use fzf for fuzzy finder + { + "nvim-telescope/telescope-fzf-native.nvim", + build = "make", + }, + + -- Replace vim built in select with telescope + "nvim-telescope/telescope-ui-select.nvim", + + -- cd plugin for telescope + "zane-/cder.nvim", + }, + opts = { pickers = { find_files = { find_command = { "fd", "-Ht", "f" } }, lsp_references = { show_line = false }, @@ -30,14 +44,20 @@ return function() dir_command = { "fd", "-Ht", "d", ".", os.getenv("HOME") }, }, }, - }) + }, + config = function(spec) + local telescope = require("telescope") + local builtin = require("telescope.builtin") - telescope.load_extension("fzf") - telescope.load_extension("ui-select") - telescope.load_extension("cder") + telescope.setup(spec.opts) - -- Keybinds - vim.keymap.set("n", "", vim.cmd.Telescope) - vim.keymap.set("n", "", builtin.find_files) - vim.keymap.set("n", "", builtin.live_grep) -end + telescope.load_extension("fzf") + telescope.load_extension("ui-select") + telescope.load_extension("cder") + + -- Keybinds + vim.keymap.set("n", "", vim.cmd.Telescope) + vim.keymap.set("n", "", builtin.find_files) + vim.keymap.set("n", "", builtin.live_grep) + end, +} diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index ca53a23f..f181aea3 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -1,46 +1,52 @@ -return function() - require("nvim-treesitter.configs").setup({ - ensure_installed = { - "bash", - "css", - "dockerfile", - "git_config", - "git_rebase", - "gitattributes", - "gitcommit", - "gitignore", - "html", - "http", - "java", - "javascript", - "json", - "json5", - "latex", - "lua", - "make", - "markdown", - "markdown_inline", - "php", - "python", - "rasi", - "regex", - "rst", - "scss", - "toml", - "tsx", - "typescript", - "vim", - "yaml", - }, - highlight = { enable = true }, - indent = { enable = true }, - incremental_selection = { enable = true }, - context_commentstring = { enable = true }, - sync_install = true, - ignore_install = {}, - auto_install = true, - }) +return { + "nvim-treesitter/nvim-treesitter", + build = function() + require("nvim-treesitter.install").update({ with_sync = true }) + end, + config = function() + require("nvim-treesitter.configs").setup({ + ensure_installed = { + "bash", + "css", + "dockerfile", + "git_config", + "git_rebase", + "gitattributes", + "gitcommit", + "gitignore", + "html", + "http", + "java", + "javascript", + "json", + "json5", + "latex", + "lua", + "make", + "markdown", + "markdown_inline", + "php", + "python", + "rasi", + "regex", + "rst", + "scss", + "toml", + "tsx", + "typescript", + "vim", + "yaml", + }, + highlight = { enable = true }, + indent = { enable = true }, + incremental_selection = { enable = true }, + context_commentstring = { enable = true }, + sync_install = true, + ignore_install = {}, + auto_install = true, + }) - -- vim.wo.foldmethod = 'expr' - -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' -end + -- vim.wo.foldmethod = 'expr' + -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' + end, +} diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua index d7582244..13c82532 100644 --- a/home/.config/nvim/lua/plugins/ufo.lua +++ b/home/.config/nvim/lua/plugins/ufo.lua @@ -1,20 +1,28 @@ -return function() - local keymap = vim.keymap - local o = vim.o - local ufo = require("ufo") - ufo.setup({ +-- Better folds +-- Disabled for now because it causes weird artifacts +return { + enabled = false, + "kevinhwang91/nvim-ufo", + dependencies = { "kevinhwang91/promise-async" }, + opts = { close_fold_kinds = { "imports", }, - }) + }, + config = function(spec) + local ufo = require("ufo") + ufo.setup(spec.opts) - -- Using ufo, need to remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself - keymap.set("n", "zR", ufo.openAllFolds) - keymap.set("n", "zM", ufo.closeAllFolds) + -- Using ufo, need to remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself + local keymap = vim.keymap + keymap.set("n", "zR", ufo.openAllFolds) + keymap.set("n", "zM", ufo.closeAllFolds) - -- Fold settings - o.foldcolumn = "1" - o.foldlevel = 99 - o.foldlevelstart = 99 - o.foldenable = true -end + -- Fold settings + local o = vim.o + o.foldcolumn = "1" + o.foldlevel = 99 + o.foldlevelstart = 99 + o.foldenable = true + end, +} diff --git a/home/.config/nvim/lua/plugins/vim-surround.lua b/home/.config/nvim/lua/plugins/vim-surround.lua new file mode 100644 index 00000000..904b9c8d --- /dev/null +++ b/home/.config/nvim/lua/plugins/vim-surround.lua @@ -0,0 +1,2 @@ +-- we all know this one +return { "tpope/vim-surround" } diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 7c1cbf8b..e85e51ac 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -1,29 +1,29 @@ -return function() - local wk = require("which-key") - local gitsigns = require("gitsigns") - wk.setup({}) +-- Display possible keybinds +-- Plugin specific keybinds are set up in plugin configuration file +return { + "folke/which-key.nvim", + config = function() + local wk = require("which-key") + wk.setup({}) - wk.register({ - f = { "Neoformat", "Format with Neoformat" }, - h = { "nohlsearch", "Turn off search highlight" }, - }, { prefix = "" }) + wk.register({ + h = { "nohlsearch", "Turn off search highlight" }, + }, { prefix = "" }) - wk.register({ - [""] = { "bnext", "Next buffer" }, - [""] = { "bprevious", "Previous buffer" }, - ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } }, - ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, - }) + wk.register({ + [""] = { "bnext", "Next buffer" }, + [""] = { "bprevious", "Previous buffer" }, + }) - -- Open cder - wk.register({ cd = { - function() - vim.cmd("Telescope cder") - end, - "Change directories", - } }) + -- Open cder + wk.register({ cd = { + function() + vim.cmd("Telescope cder") + end, + "Change directories", + } }) - -- Exit terminal insert mode with esc - vim.keymap.set("t", "", "", {}) - -end + -- Exit terminal insert mode with esc + vim.keymap.set("t", "", "", {}) + end, +} From f44e0b3274646e1b70ea7c6b033884d150da4460 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 02:27:14 +0200 Subject: [PATCH 2094/2667] Refactor neovim config file structure All plugins are now in their own files with their lazy specifications and configurations. Also moved lazy initialization to init.lua because it is very compact now --- home/.config/nvim/init.lua | 16 +- home/.config/nvim/lazy-lock.json | 9 +- .../lua/{plugins/lsp.lua => lsp_utils.lua} | 51 +--- home/.config/nvim/lua/plugins/asciidoc.lua | 13 + home/.config/nvim/lua/plugins/autopairs.lua | 2 + home/.config/nvim/lua/plugins/bufferline.lua | 7 + home/.config/nvim/lua/plugins/caddyfile.lua | 2 + home/.config/nvim/lua/plugins/cmp.lua | 198 +++++++------- .../nvim/lua/plugins/commentstring.lua | 5 + home/.config/nvim/lua/plugins/copilot.lua | 9 + home/.config/nvim/lua/plugins/dap.lua | 61 ++--- home/.config/nvim/lua/plugins/dashboard.lua | 12 +- home/.config/nvim/lua/plugins/emmylua.lua | 2 + home/.config/nvim/lua/plugins/firenvim.lua | 16 ++ home/.config/nvim/lua/plugins/fugitive.lua | 2 + home/.config/nvim/lua/plugins/gitsigns.lua | 15 ++ home/.config/nvim/lua/plugins/gnupg.lua | 2 + .../nvim/lua/plugins/indent-blankline.lua | 40 +-- .../plugins/{colorscheme.lua => kanagawa.lua} | 15 +- home/.config/nvim/lua/plugins/lazy.lua | 246 ------------------ home/.config/nvim/lua/plugins/lualine.lua | 11 +- home/.config/nvim/lua/plugins/luasnip.lua | 13 +- .../nvim/lua/plugins/markdown-preview.lua | 9 + home/.config/nvim/lua/plugins/mason.lua | 57 ++++ home/.config/nvim/lua/plugins/navic.lua | 2 + home/.config/nvim/lua/plugins/neoformat.lua | 10 + home/.config/nvim/lua/plugins/noice.lua | 35 ++- .../nvim/lua/plugins/nvim-colorizer.lua | 4 + home/.config/nvim/lua/plugins/nvim-tree.lua | 33 ++- home/.config/nvim/lua/plugins/redact_pass.lua | 7 + home/.config/nvim/lua/plugins/suda.lua | 2 + home/.config/nvim/lua/plugins/telescope.lua | 46 +++- home/.config/nvim/lua/plugins/treesitter.lua | 96 +++---- home/.config/nvim/lua/plugins/ufo.lua | 38 +-- .../.config/nvim/lua/plugins/vim-surround.lua | 2 + home/.config/nvim/lua/plugins/which-key.lua | 50 ++-- 36 files changed, 554 insertions(+), 584 deletions(-) rename home/.config/nvim/lua/{plugins/lsp.lua => lsp_utils.lua} (61%) create mode 100644 home/.config/nvim/lua/plugins/asciidoc.lua create mode 100644 home/.config/nvim/lua/plugins/autopairs.lua create mode 100644 home/.config/nvim/lua/plugins/bufferline.lua create mode 100644 home/.config/nvim/lua/plugins/caddyfile.lua create mode 100644 home/.config/nvim/lua/plugins/commentstring.lua create mode 100644 home/.config/nvim/lua/plugins/copilot.lua create mode 100644 home/.config/nvim/lua/plugins/emmylua.lua create mode 100644 home/.config/nvim/lua/plugins/firenvim.lua create mode 100644 home/.config/nvim/lua/plugins/fugitive.lua create mode 100644 home/.config/nvim/lua/plugins/gitsigns.lua create mode 100644 home/.config/nvim/lua/plugins/gnupg.lua rename home/.config/nvim/lua/plugins/{colorscheme.lua => kanagawa.lua} (92%) delete mode 100644 home/.config/nvim/lua/plugins/lazy.lua create mode 100644 home/.config/nvim/lua/plugins/markdown-preview.lua create mode 100644 home/.config/nvim/lua/plugins/mason.lua create mode 100644 home/.config/nvim/lua/plugins/navic.lua create mode 100644 home/.config/nvim/lua/plugins/neoformat.lua create mode 100644 home/.config/nvim/lua/plugins/nvim-colorizer.lua create mode 100644 home/.config/nvim/lua/plugins/redact_pass.lua create mode 100644 home/.config/nvim/lua/plugins/suda.lua create mode 100644 home/.config/nvim/lua/plugins/vim-surround.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 14ec44aa..7d445664 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,4 +1,18 @@ +-- Install lazy if it's not yet installed +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + require("settings") require("neovide") require("highlight_yank") -require("plugins.lazy") +require("lazy").setup("plugins") diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 51fed8cd..49de6968 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -11,7 +11,6 @@ "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "73047082d72fcfdde1f73b7f17ad495cffcbafaa" }, "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, "emmylua-nvim": { "branch": "master", "commit": "50b2eead8af6499fbba708553148ee8156d6612e" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, @@ -22,7 +21,7 @@ "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "faeb361507aa1ef1b0e5645781e2aa0d36a4aa84" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "ab640b38ca9fa50d25d2d249b6606b9456b628d5" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "e4f34741daa9cf95de68a603d3e7a6844a69fdf0" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "neoformat": { "branch": "master", "commit": "e5fe7e8f7c3dd071b90f19af0e8c7cfa56cdedc7" }, @@ -32,13 +31,13 @@ "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, + "nvim-dap": { "branch": "master", "commit": "e154fdb6d70b3765d71f296e718b29d8b7026a63" }, "nvim-jdtls": { "branch": "master", "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" }, - "nvim-lspconfig": { "branch": "master", "commit": "29939f6f07bc0f3b9fc563fbfbee06ac88c8c439" }, + "nvim-lspconfig": { "branch": "master", "commit": "48347089666d5b77d054088aa72e4e0b58026e6e" }, "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" }, "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, "nvim-tree.lua": { "branch": "master", "commit": "80cfeadf179d5cba76f0f502c71dbcff1b515cd8" }, - "nvim-treesitter": { "branch": "master", "commit": "73287b794d428843f20f9ae004bef2ce67ab3dbc" }, + "nvim-treesitter": { "branch": "master", "commit": "557561fbc17269cdd4e9e88ef0ca1a9ff0bbf7e6" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "6c30f3c8915d7b31c3decdfe6c7672432da1809d" }, "nvim-web-devicons": { "branch": "master", "commit": "3523d6e6d40ab11fd66c1b2732b3d6b60affa951" }, "password-store": { "branch": "master", "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" }, diff --git a/home/.config/nvim/lua/plugins/lsp.lua b/home/.config/nvim/lua/lsp_utils.lua similarity index 61% rename from home/.config/nvim/lua/plugins/lsp.lua rename to home/.config/nvim/lua/lsp_utils.lua index 62e14876..614ac5ad 100644 --- a/home/.config/nvim/lua/plugins/lsp.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -1,51 +1,9 @@ +-- This module contains lsp related +-- reusable functions local m = {} -function m.setup() - require("mason").setup() - local mason_lsp = require("mason-lspconfig") - mason_lsp.setup() - local capabilities = m.get_capabilities() - - mason_lsp.setup_handlers({ - -- Default handler - function(server_name) - require("lspconfig")[server_name].setup({ - on_attach = m.on_attach, - capabilities = capabilities, - }) - end, - - -- Override lua_ls settings - ["lua_ls"] = function() - require("lspconfig").lua_ls.setup({ - on_attach = m.on_attach, - capabilities = capabilities, - settings = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = "LuaJIT", - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = { "vim" }, - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file("", true), - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = { enable = false }, - }, - }, - }) - end, - - -- Don't set up jdtls, it is set up by nvim-jdtls - ["jdtls"] = function() end, - }) -end - +-- Map LSP specific keybinds. +-- This makes them only available when LSP is running function m.map_keys() local telescope_builtin = require("telescope.builtin") require("which-key").register({ @@ -83,6 +41,7 @@ function m.map_keys() }) end + function m.on_attach(client, bufnr) -- Attach navic if document symbols are available if client.server_capabilities.documentSymbolProvider then diff --git a/home/.config/nvim/lua/plugins/asciidoc.lua b/home/.config/nvim/lua/plugins/asciidoc.lua new file mode 100644 index 00000000..7e4a139d --- /dev/null +++ b/home/.config/nvim/lua/plugins/asciidoc.lua @@ -0,0 +1,13 @@ +-- AsciiDoc plugins are grouped together here +return { + -- Vim ♥️ Asciidoctor + { + "habamax/vim-asciidoctor", + ft = { "asciidoctor", "asciidoc" }, + }, + -- AsciiDoc preview + { + "tigion/nvim-asciidoc-preview", + ft = { "asciidoctor", "asciidoc" }, + }, +} diff --git a/home/.config/nvim/lua/plugins/autopairs.lua b/home/.config/nvim/lua/plugins/autopairs.lua new file mode 100644 index 00000000..79e2f492 --- /dev/null +++ b/home/.config/nvim/lua/plugins/autopairs.lua @@ -0,0 +1,2 @@ +-- Automatic brackets +return { "windwp/nvim-autopairs" } diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua new file mode 100644 index 00000000..027fcb02 --- /dev/null +++ b/home/.config/nvim/lua/plugins/bufferline.lua @@ -0,0 +1,7 @@ +return { + "akinsho/bufferline.nvim", + version = "*", + dependencies = { "kyazdani42/nvim-web-devicons" }, + config = true, + --opts = { options = { themeable = true } }, +} diff --git a/home/.config/nvim/lua/plugins/caddyfile.lua b/home/.config/nvim/lua/plugins/caddyfile.lua new file mode 100644 index 00000000..b419a597 --- /dev/null +++ b/home/.config/nvim/lua/plugins/caddyfile.lua @@ -0,0 +1,2 @@ +-- Caddyfile syntax support +return { "isobit/vim-caddyfile", ft = "caddyfile" } diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 020c371d..129c4c62 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -1,101 +1,107 @@ -return function() - local cmp = require("cmp") - local luasnip = require("luasnip") +-- Autoompletion +return { + "hrsh7th/nvim-cmp", + dependencies = { + "hrsh7th/cmp-buffer", -- Buffer source + { "petertriho/cmp-git", dependencies = { "nvim-lua/plenary.nvim" } }, -- Git source + "hrsh7th/cmp-nvim-lsp", -- LSP source + "hrsh7th/cmp-nvim-lua", -- Neovim Lua API documentation source + "hrsh7th/cmp-path", -- Path source + "hrsh7th/cmp-cmdline", -- cmdline source + "saadparwaiz1/cmp_luasnip", -- Snippets source + "f3fora/cmp-spell", -- Spell check source + "zbirenbaum/copilot-cmp", -- Copilot source + }, + config = function() + local cmp = require("cmp") + local luasnip = require("luasnip") - if not cmp then - return - end + if not cmp then + return + end - -- Setup git completion source - require("cmp_git").setup() - -- - -- Setup copilot source - require("copilot_cmp").setup({ fix_pairs = true }) + -- Setup git completion source + require("cmp_git").setup() + -- + -- Setup copilot source + require("copilot_cmp").setup({ fix_pairs = true }) - -- Set completeopt to have a better completion experience - vim.o.completeopt = "menuone,noselect" + -- Set completeopt to have a better completion experience + vim.o.completeopt = "menuone,noselect" - cmp.setup({ - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - mapping = { - [""] = cmp.mapping.select_prev_item(), - [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.close(), - [""] = cmp.mapping.confirm({ - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - }, - sources = { - { name = "luasnip" }, - { name = "copilot" }, - { name = "nvim_lsp" }, - { name = "nvim_lua" }, - { name = "git" }, - { name = "buffer" }, - { name = "spell" }, - { name = "path" }, - }, - -- window = { - -- completion = { - -- winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:Visual,Search:None", - -- }, - - -- documentation = { - -- winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:Visual,Search:None", - -- }, - -- }, - }) - - -- Enable autopairs when enter is processed - -- on completion - local cmp_autopairs = require("nvim-autopairs.completion.cmp") - cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) - - -- `/` cmdline setup. - cmp.setup.cmdline("/", { - mapping = cmp.mapping.preset.cmdline(), - sources = { - { name = "buffer" }, - }, - }) - -- `:` cmdline setup. - cmp.setup.cmdline(":", { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ - { name = "path" }, - }, { - { - name = "cmdline", - option = { - ignore_cmds = { "Man", "!" }, - }, + cmp.setup({ + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, }, - }), - }) -end + mapping = { + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.close(), + [""] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), + }, + sources = { + { name = "luasnip" }, + { name = "copilot" }, + { name = "nvim_lsp" }, + { name = "nvim_lua" }, + { name = "git" }, + { name = "buffer" }, + { name = "spell" }, + { name = "path" }, + }, + }) + + -- Enable autopairs when enter is processed + -- on completion + local cmp_autopairs = require("nvim-autopairs.completion.cmp") + cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) + + -- `/` cmdline setup. + cmp.setup.cmdline("/", { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = "buffer" }, + }, + }) + -- `:` cmdline setup. + cmp.setup.cmdline(":", { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = "path" }, + }, { + { + name = "cmdline", + option = { + ignore_cmds = { "Man", "!" }, + }, + }, + }), + }) + end, +} diff --git a/home/.config/nvim/lua/plugins/commentstring.lua b/home/.config/nvim/lua/plugins/commentstring.lua new file mode 100644 index 00000000..f5e5692f --- /dev/null +++ b/home/.config/nvim/lua/plugins/commentstring.lua @@ -0,0 +1,5 @@ +-- treesitter plugin for commentstring +return { + "JoosepAlviste/nvim-ts-context-commentstring", + dependencies = { "tpope/vim-commentary" }, +} diff --git a/home/.config/nvim/lua/plugins/copilot.lua b/home/.config/nvim/lua/plugins/copilot.lua new file mode 100644 index 00000000..16b97d1f --- /dev/null +++ b/home/.config/nvim/lua/plugins/copilot.lua @@ -0,0 +1,9 @@ +-- GitHub Copilot +return { + "zbirenbaum/copilot.lua", + config = true, + opts = { + suggestion = { enabled = false }, + panel = { enabled = false }, + }, +} diff --git a/home/.config/nvim/lua/plugins/dap.lua b/home/.config/nvim/lua/plugins/dap.lua index a279e7ac..9e2fce70 100644 --- a/home/.config/nvim/lua/plugins/dap.lua +++ b/home/.config/nvim/lua/plugins/dap.lua @@ -1,31 +1,34 @@ -return function() - local dap = require("dap") +return { + "mfussenegger/nvim-dap", + config = function() + local dap = require("dap") - dap.adapters.bashdb = { - type = "executable", - command = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/bash-debug-adapter", - name = "bashdb", - } + dap.adapters.bashdb = { + type = "executable", + command = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/bash-debug-adapter", + name = "bashdb", + } - dap.configurations.sh = { - { - type = "bashdb", - request = "launch", - name = "Launch file", - showDebugOutput = true, - pathBashdb = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir/bashdb", - pathBashdbLib = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir", - trace = true, - file = "${file}", - program = "${file}", - cwd = "${workspaceFolder}", - pathCat = "cat", - pathBash = "/bin/bash", - pathMkfifo = "mkfifo", - pathPkill = "pkill", - args = {}, - env = {}, - terminalKind = "integrated", - }, - } -end + dap.configurations.sh = { + { + type = "bashdb", + request = "launch", + name = "Launch file", + showDebugOutput = true, + pathBashdb = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir/bashdb", + pathBashdbLib = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir", + trace = true, + file = "${file}", + program = "${file}", + cwd = "${workspaceFolder}", + pathCat = "cat", + pathBash = "/bin/bash", + pathMkfifo = "mkfifo", + pathPkill = "pkill", + args = {}, + env = {}, + terminalKind = "integrated", + }, + } + end, +} diff --git a/home/.config/nvim/lua/plugins/dashboard.lua b/home/.config/nvim/lua/plugins/dashboard.lua index 736abe90..cc526715 100644 --- a/home/.config/nvim/lua/plugins/dashboard.lua +++ b/home/.config/nvim/lua/plugins/dashboard.lua @@ -1,5 +1,9 @@ -return function() - require("dashboard").setup({ +-- Startup dashboard +return { + "glepnir/dashboard-nvim", + event = "VimEnter", + dependencies = { { "kyazdani42/nvim-web-devicons" } }, + opts = { theme = "hyper", config = { week_header = { @@ -18,5 +22,5 @@ return function() { icon = "❌ ", desc = "Quit", action = "q", key = "q" }, }, }, - }) -end + }, +} diff --git a/home/.config/nvim/lua/plugins/emmylua.lua b/home/.config/nvim/lua/plugins/emmylua.lua new file mode 100644 index 00000000..11105cf1 --- /dev/null +++ b/home/.config/nvim/lua/plugins/emmylua.lua @@ -0,0 +1,2 @@ +-- vim api documentation for lua lsp +return { "ii14/emmylua-nvim", ft = { "lua" } } diff --git a/home/.config/nvim/lua/plugins/firenvim.lua b/home/.config/nvim/lua/plugins/firenvim.lua new file mode 100644 index 00000000..507031e8 --- /dev/null +++ b/home/.config/nvim/lua/plugins/firenvim.lua @@ -0,0 +1,16 @@ +-- Neovim inside Firefox +return { + "glacambre/firenvim", + build = function() + vim.fn["firenvim#install"](0) + end, + config = function() + vim.g.firenvim_config = { + localSettings = { + [".*"] = { + takeOver = "never", + }, + }, + } + end, +} diff --git a/home/.config/nvim/lua/plugins/fugitive.lua b/home/.config/nvim/lua/plugins/fugitive.lua new file mode 100644 index 00000000..58030d28 --- /dev/null +++ b/home/.config/nvim/lua/plugins/fugitive.lua @@ -0,0 +1,2 @@ +-- Git commands +return { "tpope/vim-fugitive" } diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua new file mode 100644 index 00000000..7287de5a --- /dev/null +++ b/home/.config/nvim/lua/plugins/gitsigns.lua @@ -0,0 +1,15 @@ +-- Git status in signcolumn +return { + "lewis6991/gitsigns.nvim", + config = function() + local gitsigns = require("gitsigns") + gitsigns.setup() + + local wk = require("which-key") + wk.register({ + ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } }, + ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, + }, { prefix = "" }) + + end, +} diff --git a/home/.config/nvim/lua/plugins/gnupg.lua b/home/.config/nvim/lua/plugins/gnupg.lua new file mode 100644 index 00000000..22c3b584 --- /dev/null +++ b/home/.config/nvim/lua/plugins/gnupg.lua @@ -0,0 +1,2 @@ +-- Edit GPG encrypted files transparently +return { "jamessan/vim-gnupg", ft = { "gpg" } } diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index 5d6b4c37..f5743fec 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,19 +1,23 @@ -return function() - require("ibl").setup({ - exclude = { - filetypes = { - "", - "checkhealth", - "dashboard", - "git", - "gitcommit", - "TelescopePrompt", - "TelescopeResults", - "help", - "lazy", - "lspinfo", - "man", +-- Indent characters +return { + "lukas-reineke/indent-blankline.nvim", + config = function() + require("ibl").setup({ + exclude = { + filetypes = { + "", + "checkhealth", + "dashboard", + "git", + "gitcommit", + "TelescopePrompt", + "TelescopeResults", + "help", + "lazy", + "lspinfo", + "man", + }, }, - }, - }) -end + }) + end, +} diff --git a/home/.config/nvim/lua/plugins/colorscheme.lua b/home/.config/nvim/lua/plugins/kanagawa.lua similarity index 92% rename from home/.config/nvim/lua/plugins/colorscheme.lua rename to home/.config/nvim/lua/plugins/kanagawa.lua index ca26060b..bd7a0abb 100644 --- a/home/.config/nvim/lua/plugins/colorscheme.lua +++ b/home/.config/nvim/lua/plugins/kanagawa.lua @@ -1,5 +1,7 @@ -return function() - require("kanagawa").setup({ +-- Colorscheme +return { + "rebelot/kanagawa.nvim", + opts = { compile = true, dimInactive = true, colors = { @@ -42,7 +44,8 @@ return function() PmenuThumb = { bg = theme.ui.bg_p2 }, } end, - }) - - vim.cmd("colorscheme kanagawa") -end + }, + config = function() + vim.cmd("colorscheme kanagawa") + end, +} diff --git a/home/.config/nvim/lua/plugins/lazy.lua b/home/.config/nvim/lua/plugins/lazy.lua deleted file mode 100644 index 2199ce45..00000000 --- a/home/.config/nvim/lua/plugins/lazy.lua +++ /dev/null @@ -1,246 +0,0 @@ --- Install lazy if it's not yet installed -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) -end -vim.opt.rtp:prepend(lazypath) - --- Configure lazy -local plugins = { - -- Colorscheme - { - "rebelot/kanagawa.nvim", - config = require("plugins.colorscheme"), - }, - - -- Replace much of neovim's default UI - -- with a modern replacement - { - "folke/noice.nvim", - event = "VeryLazy", - dependencies = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify" }, - opts = require("plugins.noice"), - }, - - -- Statusline - { - "nvim-lualine/lualine.nvim", - dependencies = { "kyazdani42/nvim-web-devicons" }, - config = require("plugins.lualine"), - }, - - -- bufferline - { - "akinsho/bufferline.nvim", - version = "v3.*", - dependencies = { "kyazdani42/nvim-web-devicons" }, - config = true, - opts = { options = { themeable = true } }, - }, - - -- Git status in signcolumn - { "lewis6991/gitsigns.nvim", config = true }, - - -- Git commands - "tpope/vim-fugitive", - - -- Indent characters - { "lukas-reineke/indent-blankline.nvim", config = require("plugins.indent-blankline") }, - - -- Tree explorer - { - "kyazdani42/nvim-tree.lua", - dependencies = { "kyazdani42/nvim-web-devicons" }, - config = require("plugins.nvim-tree"), - }, - - -- Telescope - { - "nvim-telescope/telescope.nvim", - config = require("plugins.telescope"), - dependencies = { - -- Internal dependency for telescope - "nvim-lua/plenary.nvim", - - -- Use fzf for fuzzy finder - { - "nvim-telescope/telescope-fzf-native.nvim", - build = "make", - }, - -- Replace vim built in select with telescope - "nvim-telescope/telescope-ui-select.nvim", - - -- cd plugin for telescope - "zane-/cder.nvim", - }, - }, - - -- Do stuff as sudo - "lambdalisue/suda.vim", - - -- Display possible keybinds - { "folke/which-key.nvim", config = require("plugins.which-key") }, - - -- Package manager for LSP servers, DAP adapters etc. - { - "williamboman/mason.nvim", - config = require("plugins.lsp").setup, - dependencies = { - "neovim/nvim-lspconfig", - "williamboman/mason-lspconfig.nvim", - "WhoIsSethDaniel/mason-tool-installer.nvim", - }, - }, - - -- Additional LSP features for Java - "mfussenegger/nvim-jdtls", - - -- Show code LSP context in winbar - { "SmiteshP/nvim-navic", config = true, opts = { mouse = true } }, - - -- DAP plugin - { "mfussenegger/nvim-dap", config = require("plugins.dap") }, - - -- Snippets plugin - { - "L3MON4D3/LuaSnip", - dependencies = { "rafamadriz/friendly-snippets" }, -- Snippets collection - config = require("plugins.luasnip"), - }, - - -- vim api documentation for lua lsp - { "ii14/emmylua-nvim", ft = { "lua" } }, - - -- Completion - { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-buffer", -- Buffer source - { "petertriho/cmp-git", dependencies = { "nvim-lua/plenary.nvim" } }, -- Git source - "hrsh7th/cmp-nvim-lsp", -- LSP source - "hrsh7th/cmp-nvim-lua", -- Neovim Lua API documentation source - "hrsh7th/cmp-path", -- Path source - "hrsh7th/cmp-cmdline", -- cmdline source - "saadparwaiz1/cmp_luasnip", -- Snippets source - "f3fora/cmp-spell", -- Spell check source - "zbirenbaum/copilot-cmp", -- Copilot source - }, - config = require("plugins.cmp"), - }, - - -- Automatic brackets - { - "windwp/nvim-autopairs", - config = true, - }, - - -- treesitter - { - "nvim-treesitter/nvim-treesitter", - build = function() - require("nvim-treesitter.install").update({ with_sync = true }) - end, - config = require("plugins.treesitter"), - }, - - -- treesitter plugin for commentstring - "JoosepAlviste/nvim-ts-context-commentstring", - - -- mappings for commenting in code - "tpope/vim-commentary", - - -- we all know this one - "tpope/vim-surround", - - -- Formatter plugin - "sbdchd/neoformat", - - -- Make editing passwords safer - { - "https://git.zx2c4.com/password-store", - config = function(plugin) - vim.opt.rtp:append(plugin.dir .. "contrib/vim/redact_pass.vim") - end, - }, - - -- Neovim inside Firefox - { - "glacambre/firenvim", - build = function() - vim.fn["firenvim#install"](0) - end, - config = function() - vim.g.firenvim_config = { - localSettings = { - [".*"] = { - takeOver = "never", - }, - }, - } - end, - }, - - -- Vim ♥️ Asciidoctor - { "habamax/vim-asciidoctor", ft = { "asciidoctor", "asciidoc" } }, - - -- Asciidoc preview - { "tigion/nvim-asciidoc-preview", ft = { "asciidoctor", "asciidoc" } }, - - -- Markdown preview - { - "iamcco/markdown-preview.nvim", - build = "cd app && yarn install", - config = function() - vim.g.mkdp_filetypes = { "markdown" } - end, - ft = { "markdown" }, - }, - - -- Edit GPG encrypted files transparently - { "jamessan/vim-gnupg", ft = { "gpg" } }, - - -- High performance color highlighter - { - "norcalli/nvim-colorizer.lua", - config = true, - }, - - -- Caddyfile syntax support - { "isobit/vim-caddyfile", ft = "caddyfile" }, - - -- Startup dashboard - { - "glepnir/dashboard-nvim", - event = "VimEnter", - config = require("plugins.dashboard"), - dependencies = { { "kyazdani42/nvim-web-devicons" } }, - }, - - -- Better folds - { - enabled = false, - "kevinhwang91/nvim-ufo", - dependencies = { "kevinhwang91/promise-async" }, - config = require("plugins.ufo"), - }, - - -- GitHub Copilot - { - "zbirenbaum/copilot.lua", - config = function() - require("copilot").setup({ - suggestion = { enabled = false }, - panel = { enabled = false }, - }) - end, - }, -} - -require("lazy").setup(plugins, { lockfile = "~/git/dotfiles/home/.config/nvim/lazy-lock.json" }) diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 5edaf3ba..55759ee6 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1,7 +1,10 @@ -return function() - require("lualine").setup({ +-- Statusline +return { + "nvim-lualine/lualine.nvim", + dependencies = { "kyazdani42/nvim-web-devicons" }, + opts = { sections = { lualine_c = { "navic" }, }, - }) -end + }, +} diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index e89b9ac4..d420c8cd 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -1,4 +1,9 @@ -return function() - -- load friendly-snippets to luasnip - require("luasnip/loaders/from_vscode").lazy_load() -end +-- Snippets plugin +return { + "L3MON4D3/LuaSnip", + dependencies = { "rafamadriz/friendly-snippets" }, -- Snippets collection + config = function() + -- load friendly-snippets to luasnip + require("luasnip/loaders/from_vscode").lazy_load() + end, +} diff --git a/home/.config/nvim/lua/plugins/markdown-preview.lua b/home/.config/nvim/lua/plugins/markdown-preview.lua new file mode 100644 index 00000000..2350979d --- /dev/null +++ b/home/.config/nvim/lua/plugins/markdown-preview.lua @@ -0,0 +1,9 @@ +-- Markdown preview +return { + "iamcco/markdown-preview.nvim", + build = "cd app && yarn install", + config = function() + vim.g.mkdp_filetypes = { "markdown" } + end, + ft = { "markdown" }, +} diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua new file mode 100644 index 00000000..af5dcc47 --- /dev/null +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -0,0 +1,57 @@ +-- Package manager for LSP servers, DAP adapters etc. +return { + "williamboman/mason.nvim", + dependencies = { + "neovim/nvim-lspconfig", + "williamboman/mason-lspconfig.nvim", + "WhoIsSethDaniel/mason-tool-installer.nvim", + "mfussenegger/nvim-jdtls", + }, + config = function() + require("mason").setup() + + local mason_lsp = require("mason-lspconfig") + local lsp_utils = require('lsp_utils') + local capabilities = lsp_utils.get_capabilities() + mason_lsp.setup() + + mason_lsp.setup_handlers({ + -- Default handler + function(server_name) + require("lspconfig")[server_name].setup({ + on_attach = lsp_utils.on_attach, + capabilities = capabilities, + }) + end, + + -- Override lua_ls settings + ["lua_ls"] = function() + require("lspconfig").lua_ls.setup({ + on_attach = lsp_utils.on_attach, + capabilities = capabilities, + settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = "LuaJIT", + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = { "vim" }, + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file("", true), + }, + -- Do not send telemetry data containing a randomized but unique identifier + telemetry = { enable = false }, + }, + }, + }) + end, + + -- Don't set up jdtls, it is set up by nvim-jdtls + ["jdtls"] = function() end, + }) + end, +} diff --git a/home/.config/nvim/lua/plugins/navic.lua b/home/.config/nvim/lua/plugins/navic.lua new file mode 100644 index 00000000..de3d7dcd --- /dev/null +++ b/home/.config/nvim/lua/plugins/navic.lua @@ -0,0 +1,2 @@ +-- Show code LSP context in winbar +return { "SmiteshP/nvim-navic" } diff --git a/home/.config/nvim/lua/plugins/neoformat.lua b/home/.config/nvim/lua/plugins/neoformat.lua new file mode 100644 index 00000000..2abef6e4 --- /dev/null +++ b/home/.config/nvim/lua/plugins/neoformat.lua @@ -0,0 +1,10 @@ +-- Formatter plugin +return { + "sbdchd/neoformat", + config = function() + local wk = require("which-key") + wk.register({ + f = { "Neoformat", "Format with Neoformat" }, + }, { prefix = "" }) + end, +} diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua index 83cb3d98..01fb80c6 100644 --- a/home/.config/nvim/lua/plugins/noice.lua +++ b/home/.config/nvim/lua/plugins/noice.lua @@ -1,18 +1,25 @@ +-- Replace much of neovim's default UI +-- with a modern replacement return { - lsp = { - -- override markdown rendering so that **cmp** and other plugins use **Treesitter** - override = { - ["vim.lsp.util.convert_input_to_markdown_lines"] = true, - ["vim.lsp.util.stylize_markdown"] = true, - ["cmp.entry.get_documentation"] = true, + "folke/noice.nvim", + event = "VeryLazy", + dependencies = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify" }, + opts = { + lsp = { + -- override markdown rendering so that **cmp** and other plugins use **Treesitter** + override = { + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, + ["cmp.entry.get_documentation"] = true, + }, + }, + -- you can enable a preset for easier configuration + presets = { + bottom_search = true, -- use a classic bottom cmdline for search + command_palette = true, -- position the cmdline and popupmenu together + long_message_to_split = true, -- long messages will be sent to a split + inc_rename = false, -- enables an input dialog for inc-rename.nvim + lsp_doc_border = false, -- add a border to hover docs and signature help }, }, - -- you can enable a preset for easier configuration - presets = { - bottom_search = true, -- use a classic bottom cmdline for search - command_palette = true, -- position the cmdline and popupmenu together - long_message_to_split = true, -- long messages will be sent to a split - inc_rename = false, -- enables an input dialog for inc-rename.nvim - lsp_doc_border = false, -- add a border to hover docs and signature help - }, } diff --git a/home/.config/nvim/lua/plugins/nvim-colorizer.lua b/home/.config/nvim/lua/plugins/nvim-colorizer.lua new file mode 100644 index 00000000..089885de --- /dev/null +++ b/home/.config/nvim/lua/plugins/nvim-colorizer.lua @@ -0,0 +1,4 @@ +-- High performance color highlighter +return { + "norcalli/nvim-colorizer.lua", +} diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index 7f86f960..b15b0f0d 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -1,13 +1,20 @@ -return function() - require("nvim-tree").setup({ -- BEGIN_DEFAULT_OPTS - diagnostics = { - enable = true, - show_on_dirs = true, - }, - renderer = { - highlight_git = true, - }, - }) - -- Open/close with alt-o - vim.keymap.set("n", "", vim.cmd.NvimTreeToggle) -end +-- Tree explorer +return { + "kyazdani42/nvim-tree.lua", + dependencies = { "kyazdani42/nvim-web-devicons" }, + opts = { + diagnostics = { + enable = true, + show_on_dirs = true, + }, + renderer = { + highlight_git = true, + }, + }, + config = function(spec) + require("nvim-tree").setup(spec.opts) + + -- Open/close with alt-o + vim.keymap.set("n", "", vim.cmd.NvimTreeToggle) + end, +} diff --git a/home/.config/nvim/lua/plugins/redact_pass.lua b/home/.config/nvim/lua/plugins/redact_pass.lua new file mode 100644 index 00000000..3ac5d314 --- /dev/null +++ b/home/.config/nvim/lua/plugins/redact_pass.lua @@ -0,0 +1,7 @@ +-- Make editing passwords safer +return { + "https://git.zx2c4.com/password-store", + config = function(plugin) + vim.opt.rtp:append(plugin.dir .. "contrib/vim/redact_pass.vim") + end, +} diff --git a/home/.config/nvim/lua/plugins/suda.lua b/home/.config/nvim/lua/plugins/suda.lua new file mode 100644 index 00000000..cb7a4b50 --- /dev/null +++ b/home/.config/nvim/lua/plugins/suda.lua @@ -0,0 +1,2 @@ +-- Do stuff as sudo +return { "lambdalisue/suda.vim" } diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 5a30c1af..c2414c62 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,8 +1,22 @@ -return function() - local telescope = require("telescope") - local builtin = require("telescope.builtin") +return { + "nvim-telescope/telescope.nvim", + dependencies = { + -- Internal dependency for telescope + "nvim-lua/plenary.nvim", - telescope.setup({ + -- Use fzf for fuzzy finder + { + "nvim-telescope/telescope-fzf-native.nvim", + build = "make", + }, + + -- Replace vim built in select with telescope + "nvim-telescope/telescope-ui-select.nvim", + + -- cd plugin for telescope + "zane-/cder.nvim", + }, + opts = { pickers = { find_files = { find_command = { "fd", "-Ht", "f" } }, lsp_references = { show_line = false }, @@ -30,14 +44,20 @@ return function() dir_command = { "fd", "-Ht", "d", ".", os.getenv("HOME") }, }, }, - }) + }, + config = function(spec) + local telescope = require("telescope") + local builtin = require("telescope.builtin") - telescope.load_extension("fzf") - telescope.load_extension("ui-select") - telescope.load_extension("cder") + telescope.setup(spec.opts) - -- Keybinds - vim.keymap.set("n", "", vim.cmd.Telescope) - vim.keymap.set("n", "", builtin.find_files) - vim.keymap.set("n", "", builtin.live_grep) -end + telescope.load_extension("fzf") + telescope.load_extension("ui-select") + telescope.load_extension("cder") + + -- Keybinds + vim.keymap.set("n", "", vim.cmd.Telescope) + vim.keymap.set("n", "", builtin.find_files) + vim.keymap.set("n", "", builtin.live_grep) + end, +} diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index ca53a23f..f181aea3 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -1,46 +1,52 @@ -return function() - require("nvim-treesitter.configs").setup({ - ensure_installed = { - "bash", - "css", - "dockerfile", - "git_config", - "git_rebase", - "gitattributes", - "gitcommit", - "gitignore", - "html", - "http", - "java", - "javascript", - "json", - "json5", - "latex", - "lua", - "make", - "markdown", - "markdown_inline", - "php", - "python", - "rasi", - "regex", - "rst", - "scss", - "toml", - "tsx", - "typescript", - "vim", - "yaml", - }, - highlight = { enable = true }, - indent = { enable = true }, - incremental_selection = { enable = true }, - context_commentstring = { enable = true }, - sync_install = true, - ignore_install = {}, - auto_install = true, - }) +return { + "nvim-treesitter/nvim-treesitter", + build = function() + require("nvim-treesitter.install").update({ with_sync = true }) + end, + config = function() + require("nvim-treesitter.configs").setup({ + ensure_installed = { + "bash", + "css", + "dockerfile", + "git_config", + "git_rebase", + "gitattributes", + "gitcommit", + "gitignore", + "html", + "http", + "java", + "javascript", + "json", + "json5", + "latex", + "lua", + "make", + "markdown", + "markdown_inline", + "php", + "python", + "rasi", + "regex", + "rst", + "scss", + "toml", + "tsx", + "typescript", + "vim", + "yaml", + }, + highlight = { enable = true }, + indent = { enable = true }, + incremental_selection = { enable = true }, + context_commentstring = { enable = true }, + sync_install = true, + ignore_install = {}, + auto_install = true, + }) - -- vim.wo.foldmethod = 'expr' - -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' -end + -- vim.wo.foldmethod = 'expr' + -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' + end, +} diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua index d7582244..13c82532 100644 --- a/home/.config/nvim/lua/plugins/ufo.lua +++ b/home/.config/nvim/lua/plugins/ufo.lua @@ -1,20 +1,28 @@ -return function() - local keymap = vim.keymap - local o = vim.o - local ufo = require("ufo") - ufo.setup({ +-- Better folds +-- Disabled for now because it causes weird artifacts +return { + enabled = false, + "kevinhwang91/nvim-ufo", + dependencies = { "kevinhwang91/promise-async" }, + opts = { close_fold_kinds = { "imports", }, - }) + }, + config = function(spec) + local ufo = require("ufo") + ufo.setup(spec.opts) - -- Using ufo, need to remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself - keymap.set("n", "zR", ufo.openAllFolds) - keymap.set("n", "zM", ufo.closeAllFolds) + -- Using ufo, need to remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself + local keymap = vim.keymap + keymap.set("n", "zR", ufo.openAllFolds) + keymap.set("n", "zM", ufo.closeAllFolds) - -- Fold settings - o.foldcolumn = "1" - o.foldlevel = 99 - o.foldlevelstart = 99 - o.foldenable = true -end + -- Fold settings + local o = vim.o + o.foldcolumn = "1" + o.foldlevel = 99 + o.foldlevelstart = 99 + o.foldenable = true + end, +} diff --git a/home/.config/nvim/lua/plugins/vim-surround.lua b/home/.config/nvim/lua/plugins/vim-surround.lua new file mode 100644 index 00000000..904b9c8d --- /dev/null +++ b/home/.config/nvim/lua/plugins/vim-surround.lua @@ -0,0 +1,2 @@ +-- we all know this one +return { "tpope/vim-surround" } diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 7c1cbf8b..e85e51ac 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -1,29 +1,29 @@ -return function() - local wk = require("which-key") - local gitsigns = require("gitsigns") - wk.setup({}) +-- Display possible keybinds +-- Plugin specific keybinds are set up in plugin configuration file +return { + "folke/which-key.nvim", + config = function() + local wk = require("which-key") + wk.setup({}) - wk.register({ - f = { "Neoformat", "Format with Neoformat" }, - h = { "nohlsearch", "Turn off search highlight" }, - }, { prefix = "" }) + wk.register({ + h = { "nohlsearch", "Turn off search highlight" }, + }, { prefix = "" }) - wk.register({ - [""] = { "bnext", "Next buffer" }, - [""] = { "bprevious", "Previous buffer" }, - ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } }, - ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, - }) + wk.register({ + [""] = { "bnext", "Next buffer" }, + [""] = { "bprevious", "Previous buffer" }, + }) - -- Open cder - wk.register({ cd = { - function() - vim.cmd("Telescope cder") - end, - "Change directories", - } }) + -- Open cder + wk.register({ cd = { + function() + vim.cmd("Telescope cder") + end, + "Change directories", + } }) - -- Exit terminal insert mode with esc - vim.keymap.set("t", "", "", {}) - -end + -- Exit terminal insert mode with esc + vim.keymap.set("t", "", "", {}) + end, +} From 4004dc5df67a3f0ef169b55d7416db15d2758692 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 02:54:35 +0200 Subject: [PATCH 2095/2667] Make plugin specs more uniform --- home/.config/nvim/lua/plugins/autopairs.lua | 5 ++- home/.config/nvim/lua/plugins/bufferline.lua | 2 -- home/.config/nvim/lua/plugins/caddyfile.lua | 5 ++- home/.config/nvim/lua/plugins/cmp.lua | 19 +++++----- home/.config/nvim/lua/plugins/copilot.lua | 1 - home/.config/nvim/lua/plugins/emmylua.lua | 5 ++- home/.config/nvim/lua/plugins/gnupg.lua | 5 ++- .../nvim/lua/plugins/indent-blankline.lua | 35 +++++++++---------- home/.config/nvim/lua/plugins/kanagawa.lua | 3 +- .../nvim/lua/plugins/nvim-colorizer.lua | 3 ++ home/.config/nvim/lua/plugins/nvim-tree.lua | 4 +-- home/.config/nvim/lua/plugins/telescope.lua | 4 +-- home/.config/nvim/lua/plugins/ufo.lua | 4 +-- 13 files changed, 55 insertions(+), 40 deletions(-) diff --git a/home/.config/nvim/lua/plugins/autopairs.lua b/home/.config/nvim/lua/plugins/autopairs.lua index 79e2f492..f9886b56 100644 --- a/home/.config/nvim/lua/plugins/autopairs.lua +++ b/home/.config/nvim/lua/plugins/autopairs.lua @@ -1,2 +1,5 @@ -- Automatic brackets -return { "windwp/nvim-autopairs" } +return { + "windwp/nvim-autopairs", + config = true +} diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua index 027fcb02..c1359e43 100644 --- a/home/.config/nvim/lua/plugins/bufferline.lua +++ b/home/.config/nvim/lua/plugins/bufferline.lua @@ -2,6 +2,4 @@ return { "akinsho/bufferline.nvim", version = "*", dependencies = { "kyazdani42/nvim-web-devicons" }, - config = true, - --opts = { options = { themeable = true } }, } diff --git a/home/.config/nvim/lua/plugins/caddyfile.lua b/home/.config/nvim/lua/plugins/caddyfile.lua index b419a597..89db6b59 100644 --- a/home/.config/nvim/lua/plugins/caddyfile.lua +++ b/home/.config/nvim/lua/plugins/caddyfile.lua @@ -1,2 +1,5 @@ -- Caddyfile syntax support -return { "isobit/vim-caddyfile", ft = "caddyfile" } +return { + "isobit/vim-caddyfile", + ft = "caddyfile", +} diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 129c4c62..5b177028 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -3,14 +3,23 @@ return { "hrsh7th/nvim-cmp", dependencies = { "hrsh7th/cmp-buffer", -- Buffer source - { "petertriho/cmp-git", dependencies = { "nvim-lua/plenary.nvim" } }, -- Git source + -- Git source + { + "petertriho/cmp-git", + dependencies = { "nvim-lua/plenary.nvim" }, + config = true, + }, "hrsh7th/cmp-nvim-lsp", -- LSP source "hrsh7th/cmp-nvim-lua", -- Neovim Lua API documentation source "hrsh7th/cmp-path", -- Path source "hrsh7th/cmp-cmdline", -- cmdline source "saadparwaiz1/cmp_luasnip", -- Snippets source "f3fora/cmp-spell", -- Spell check source - "zbirenbaum/copilot-cmp", -- Copilot source + -- Copilot source + { + "zbirenbaum/copilot-cmp", + opts = { fix_pairs = true }, + }, }, config = function() local cmp = require("cmp") @@ -20,12 +29,6 @@ return { return end - -- Setup git completion source - require("cmp_git").setup() - -- - -- Setup copilot source - require("copilot_cmp").setup({ fix_pairs = true }) - -- Set completeopt to have a better completion experience vim.o.completeopt = "menuone,noselect" diff --git a/home/.config/nvim/lua/plugins/copilot.lua b/home/.config/nvim/lua/plugins/copilot.lua index 16b97d1f..e933120b 100644 --- a/home/.config/nvim/lua/plugins/copilot.lua +++ b/home/.config/nvim/lua/plugins/copilot.lua @@ -1,7 +1,6 @@ -- GitHub Copilot return { "zbirenbaum/copilot.lua", - config = true, opts = { suggestion = { enabled = false }, panel = { enabled = false }, diff --git a/home/.config/nvim/lua/plugins/emmylua.lua b/home/.config/nvim/lua/plugins/emmylua.lua index 11105cf1..8e4dc1ca 100644 --- a/home/.config/nvim/lua/plugins/emmylua.lua +++ b/home/.config/nvim/lua/plugins/emmylua.lua @@ -1,2 +1,5 @@ -- vim api documentation for lua lsp -return { "ii14/emmylua-nvim", ft = { "lua" } } +return { + "ii14/emmylua-nvim", + ft = { "lua" }, +} diff --git a/home/.config/nvim/lua/plugins/gnupg.lua b/home/.config/nvim/lua/plugins/gnupg.lua index 22c3b584..ec6d6346 100644 --- a/home/.config/nvim/lua/plugins/gnupg.lua +++ b/home/.config/nvim/lua/plugins/gnupg.lua @@ -1,2 +1,5 @@ -- Edit GPG encrypted files transparently -return { "jamessan/vim-gnupg", ft = { "gpg" } } +return { + "jamessan/vim-gnupg", + ft = { "gpg" }, +} diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index f5743fec..75681f72 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,23 +1,22 @@ -- Indent characters return { "lukas-reineke/indent-blankline.nvim", - config = function() - require("ibl").setup({ - exclude = { - filetypes = { - "", - "checkhealth", - "dashboard", - "git", - "gitcommit", - "TelescopePrompt", - "TelescopeResults", - "help", - "lazy", - "lspinfo", - "man", - }, + opts = { + exclude = { + filetypes = { + "", + "checkhealth", + "dashboard", + "git", + "gitcommit", + "TelescopePrompt", + "TelescopeResults", + "help", + "lazy", + "lspinfo", + "man", }, - }) - end, + }, + }, + main = "ibl", } diff --git a/home/.config/nvim/lua/plugins/kanagawa.lua b/home/.config/nvim/lua/plugins/kanagawa.lua index bd7a0abb..b0c47d06 100644 --- a/home/.config/nvim/lua/plugins/kanagawa.lua +++ b/home/.config/nvim/lua/plugins/kanagawa.lua @@ -45,7 +45,8 @@ return { } end, }, - config = function() + config = function(spec) + require("kanagawa").setup(spec.opts) vim.cmd("colorscheme kanagawa") end, } diff --git a/home/.config/nvim/lua/plugins/nvim-colorizer.lua b/home/.config/nvim/lua/plugins/nvim-colorizer.lua index 089885de..c316742b 100644 --- a/home/.config/nvim/lua/plugins/nvim-colorizer.lua +++ b/home/.config/nvim/lua/plugins/nvim-colorizer.lua @@ -1,4 +1,7 @@ -- High performance color highlighter return { "norcalli/nvim-colorizer.lua", + config = function() + require("colorizer").setup() + end, } diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index b15b0f0d..ec9f895b 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -11,8 +11,8 @@ return { highlight_git = true, }, }, - config = function(spec) - require("nvim-tree").setup(spec.opts) + config = function(_, opts) + require("nvim-tree").setup(opts) -- Open/close with alt-o vim.keymap.set("n", "", vim.cmd.NvimTreeToggle) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index c2414c62..32a69dd4 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -45,11 +45,11 @@ return { }, }, }, - config = function(spec) + config = function(_, opts) local telescope = require("telescope") local builtin = require("telescope.builtin") - telescope.setup(spec.opts) + telescope.setup(opts) telescope.load_extension("fzf") telescope.load_extension("ui-select") diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua index 13c82532..acd7c478 100644 --- a/home/.config/nvim/lua/plugins/ufo.lua +++ b/home/.config/nvim/lua/plugins/ufo.lua @@ -9,9 +9,9 @@ return { "imports", }, }, - config = function(spec) + config = function(_, opts) local ufo = require("ufo") - ufo.setup(spec.opts) + ufo.setup(opts) -- Using ufo, need to remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself local keymap = vim.keymap From e8102344308da1d139185a12436465cca4af14d2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 02:54:35 +0200 Subject: [PATCH 2096/2667] Make plugin specs more uniform --- home/.config/nvim/lua/plugins/autopairs.lua | 5 ++- home/.config/nvim/lua/plugins/bufferline.lua | 2 -- home/.config/nvim/lua/plugins/caddyfile.lua | 5 ++- home/.config/nvim/lua/plugins/cmp.lua | 19 +++++----- home/.config/nvim/lua/plugins/copilot.lua | 1 - home/.config/nvim/lua/plugins/emmylua.lua | 5 ++- home/.config/nvim/lua/plugins/gnupg.lua | 5 ++- .../nvim/lua/plugins/indent-blankline.lua | 35 +++++++++---------- home/.config/nvim/lua/plugins/kanagawa.lua | 3 +- .../nvim/lua/plugins/nvim-colorizer.lua | 3 ++ home/.config/nvim/lua/plugins/nvim-tree.lua | 4 +-- home/.config/nvim/lua/plugins/telescope.lua | 4 +-- home/.config/nvim/lua/plugins/ufo.lua | 4 +-- 13 files changed, 55 insertions(+), 40 deletions(-) diff --git a/home/.config/nvim/lua/plugins/autopairs.lua b/home/.config/nvim/lua/plugins/autopairs.lua index 79e2f492..f9886b56 100644 --- a/home/.config/nvim/lua/plugins/autopairs.lua +++ b/home/.config/nvim/lua/plugins/autopairs.lua @@ -1,2 +1,5 @@ -- Automatic brackets -return { "windwp/nvim-autopairs" } +return { + "windwp/nvim-autopairs", + config = true +} diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua index 027fcb02..c1359e43 100644 --- a/home/.config/nvim/lua/plugins/bufferline.lua +++ b/home/.config/nvim/lua/plugins/bufferline.lua @@ -2,6 +2,4 @@ return { "akinsho/bufferline.nvim", version = "*", dependencies = { "kyazdani42/nvim-web-devicons" }, - config = true, - --opts = { options = { themeable = true } }, } diff --git a/home/.config/nvim/lua/plugins/caddyfile.lua b/home/.config/nvim/lua/plugins/caddyfile.lua index b419a597..89db6b59 100644 --- a/home/.config/nvim/lua/plugins/caddyfile.lua +++ b/home/.config/nvim/lua/plugins/caddyfile.lua @@ -1,2 +1,5 @@ -- Caddyfile syntax support -return { "isobit/vim-caddyfile", ft = "caddyfile" } +return { + "isobit/vim-caddyfile", + ft = "caddyfile", +} diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 129c4c62..5b177028 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -3,14 +3,23 @@ return { "hrsh7th/nvim-cmp", dependencies = { "hrsh7th/cmp-buffer", -- Buffer source - { "petertriho/cmp-git", dependencies = { "nvim-lua/plenary.nvim" } }, -- Git source + -- Git source + { + "petertriho/cmp-git", + dependencies = { "nvim-lua/plenary.nvim" }, + config = true, + }, "hrsh7th/cmp-nvim-lsp", -- LSP source "hrsh7th/cmp-nvim-lua", -- Neovim Lua API documentation source "hrsh7th/cmp-path", -- Path source "hrsh7th/cmp-cmdline", -- cmdline source "saadparwaiz1/cmp_luasnip", -- Snippets source "f3fora/cmp-spell", -- Spell check source - "zbirenbaum/copilot-cmp", -- Copilot source + -- Copilot source + { + "zbirenbaum/copilot-cmp", + opts = { fix_pairs = true }, + }, }, config = function() local cmp = require("cmp") @@ -20,12 +29,6 @@ return { return end - -- Setup git completion source - require("cmp_git").setup() - -- - -- Setup copilot source - require("copilot_cmp").setup({ fix_pairs = true }) - -- Set completeopt to have a better completion experience vim.o.completeopt = "menuone,noselect" diff --git a/home/.config/nvim/lua/plugins/copilot.lua b/home/.config/nvim/lua/plugins/copilot.lua index 16b97d1f..e933120b 100644 --- a/home/.config/nvim/lua/plugins/copilot.lua +++ b/home/.config/nvim/lua/plugins/copilot.lua @@ -1,7 +1,6 @@ -- GitHub Copilot return { "zbirenbaum/copilot.lua", - config = true, opts = { suggestion = { enabled = false }, panel = { enabled = false }, diff --git a/home/.config/nvim/lua/plugins/emmylua.lua b/home/.config/nvim/lua/plugins/emmylua.lua index 11105cf1..8e4dc1ca 100644 --- a/home/.config/nvim/lua/plugins/emmylua.lua +++ b/home/.config/nvim/lua/plugins/emmylua.lua @@ -1,2 +1,5 @@ -- vim api documentation for lua lsp -return { "ii14/emmylua-nvim", ft = { "lua" } } +return { + "ii14/emmylua-nvim", + ft = { "lua" }, +} diff --git a/home/.config/nvim/lua/plugins/gnupg.lua b/home/.config/nvim/lua/plugins/gnupg.lua index 22c3b584..ec6d6346 100644 --- a/home/.config/nvim/lua/plugins/gnupg.lua +++ b/home/.config/nvim/lua/plugins/gnupg.lua @@ -1,2 +1,5 @@ -- Edit GPG encrypted files transparently -return { "jamessan/vim-gnupg", ft = { "gpg" } } +return { + "jamessan/vim-gnupg", + ft = { "gpg" }, +} diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index f5743fec..75681f72 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,23 +1,22 @@ -- Indent characters return { "lukas-reineke/indent-blankline.nvim", - config = function() - require("ibl").setup({ - exclude = { - filetypes = { - "", - "checkhealth", - "dashboard", - "git", - "gitcommit", - "TelescopePrompt", - "TelescopeResults", - "help", - "lazy", - "lspinfo", - "man", - }, + opts = { + exclude = { + filetypes = { + "", + "checkhealth", + "dashboard", + "git", + "gitcommit", + "TelescopePrompt", + "TelescopeResults", + "help", + "lazy", + "lspinfo", + "man", }, - }) - end, + }, + }, + main = "ibl", } diff --git a/home/.config/nvim/lua/plugins/kanagawa.lua b/home/.config/nvim/lua/plugins/kanagawa.lua index bd7a0abb..b0c47d06 100644 --- a/home/.config/nvim/lua/plugins/kanagawa.lua +++ b/home/.config/nvim/lua/plugins/kanagawa.lua @@ -45,7 +45,8 @@ return { } end, }, - config = function() + config = function(spec) + require("kanagawa").setup(spec.opts) vim.cmd("colorscheme kanagawa") end, } diff --git a/home/.config/nvim/lua/plugins/nvim-colorizer.lua b/home/.config/nvim/lua/plugins/nvim-colorizer.lua index 089885de..c316742b 100644 --- a/home/.config/nvim/lua/plugins/nvim-colorizer.lua +++ b/home/.config/nvim/lua/plugins/nvim-colorizer.lua @@ -1,4 +1,7 @@ -- High performance color highlighter return { "norcalli/nvim-colorizer.lua", + config = function() + require("colorizer").setup() + end, } diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index b15b0f0d..ec9f895b 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -11,8 +11,8 @@ return { highlight_git = true, }, }, - config = function(spec) - require("nvim-tree").setup(spec.opts) + config = function(_, opts) + require("nvim-tree").setup(opts) -- Open/close with alt-o vim.keymap.set("n", "", vim.cmd.NvimTreeToggle) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index c2414c62..32a69dd4 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -45,11 +45,11 @@ return { }, }, }, - config = function(spec) + config = function(_, opts) local telescope = require("telescope") local builtin = require("telescope.builtin") - telescope.setup(spec.opts) + telescope.setup(opts) telescope.load_extension("fzf") telescope.load_extension("ui-select") diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua index 13c82532..acd7c478 100644 --- a/home/.config/nvim/lua/plugins/ufo.lua +++ b/home/.config/nvim/lua/plugins/ufo.lua @@ -9,9 +9,9 @@ return { "imports", }, }, - config = function(spec) + config = function(_, opts) local ufo = require("ufo") - ufo.setup(spec.opts) + ufo.setup(opts) -- Using ufo, need to remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself local keymap = vim.keymap From 8b3cf79112012d197393132cd1fa64c0604dd859 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 10:09:47 +0200 Subject: [PATCH 2097/2667] Fix jdtls --- home/.config/nvim/ftplugin/java.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index fc929f22..43fcd84d 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -2,7 +2,7 @@ local nvim_local_dir = vim.fn.expand("~/.local/share/nvim") local lombok_jar = nvim_local_dir .. "/mason/packages/jdtls/lombok.jar" local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name -local lsp = require("plugins.lsp") +local lsp_utils = require("lsp_utils") require("jdtls").start_or_attach({ cmd = { @@ -45,8 +45,8 @@ require("jdtls").start_or_attach({ handlers = { ["language/status"] = function() end, }, - capabilities = lsp.get_capabilities(), - on_attach = lsp.on_attach, + capabilities = lsp_utils.get_capabilities(), + on_attach = lsp_utils.on_attach, }) function RunJava() From b1461d75e025c3161ba0f7a550d7e21de8cfa74e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 10:09:47 +0200 Subject: [PATCH 2098/2667] Fix jdtls --- home/.config/nvim/ftplugin/java.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index fc929f22..43fcd84d 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -2,7 +2,7 @@ local nvim_local_dir = vim.fn.expand("~/.local/share/nvim") local lombok_jar = nvim_local_dir .. "/mason/packages/jdtls/lombok.jar" local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name -local lsp = require("plugins.lsp") +local lsp_utils = require("lsp_utils") require("jdtls").start_or_attach({ cmd = { @@ -45,8 +45,8 @@ require("jdtls").start_or_attach({ handlers = { ["language/status"] = function() end, }, - capabilities = lsp.get_capabilities(), - on_attach = lsp.on_attach, + capabilities = lsp_utils.get_capabilities(), + on_attach = lsp_utils.on_attach, }) function RunJava() From 168742d1096b4f1dbca98313535135e683ee6aa3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 21:41:50 +0200 Subject: [PATCH 2099/2667] Nvim: fix some keybinds, organize code --- home/.config/nvim/lua/plugins/gitsigns.lua | 3 +-- home/.config/nvim/lua/plugins/kanagawa.lua | 4 ++-- home/.config/nvim/lua/plugins/luasnip.lua | 3 ++- home/.config/nvim/lua/plugins/telescope.lua | 14 +++++++++++--- home/.config/nvim/lua/plugins/which-key.lua | 8 -------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua index 7287de5a..825a414a 100644 --- a/home/.config/nvim/lua/plugins/gitsigns.lua +++ b/home/.config/nvim/lua/plugins/gitsigns.lua @@ -9,7 +9,6 @@ return { wk.register({ ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } }, ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, - }, { prefix = "" }) - + }) end, } diff --git a/home/.config/nvim/lua/plugins/kanagawa.lua b/home/.config/nvim/lua/plugins/kanagawa.lua index b0c47d06..d35ae0c4 100644 --- a/home/.config/nvim/lua/plugins/kanagawa.lua +++ b/home/.config/nvim/lua/plugins/kanagawa.lua @@ -45,8 +45,8 @@ return { } end, }, - config = function(spec) - require("kanagawa").setup(spec.opts) + config = function(_, opts) + require("kanagawa").setup(opts) vim.cmd("colorscheme kanagawa") end, } diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index d420c8cd..ad186108 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -1,7 +1,8 @@ -- Snippets plugin return { "L3MON4D3/LuaSnip", - dependencies = { "rafamadriz/friendly-snippets" }, -- Snippets collection + -- Snippets collection + dependencies = { "rafamadriz/friendly-snippets" }, config = function() -- load friendly-snippets to luasnip require("luasnip/loaders/from_vscode").lazy_load() diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 32a69dd4..eef42428 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -56,8 +56,16 @@ return { telescope.load_extension("cder") -- Keybinds - vim.keymap.set("n", "", vim.cmd.Telescope) - vim.keymap.set("n", "", builtin.find_files) - vim.keymap.set("n", "", builtin.live_grep) + require("which-key").register({ + cd = { + function() + vim.cmd("Telescope cder") + end, + "Change directories", + }, + [""] = { vim.cmd.Telescope, "Open Telescope" }, + [""] = { builtin.find_files, "Telescope find files" }, + [""] = { builtin.live_grep, "Telescope live grep" }, + }) end, } diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index e85e51ac..cae24ffd 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -15,14 +15,6 @@ return { [""] = { "bprevious", "Previous buffer" }, }) - -- Open cder - wk.register({ cd = { - function() - vim.cmd("Telescope cder") - end, - "Change directories", - } }) - -- Exit terminal insert mode with esc vim.keymap.set("t", "", "", {}) end, From ad580cc29f71e0b011b5db8521399687a7f326e5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 21:41:50 +0200 Subject: [PATCH 2100/2667] Nvim: fix some keybinds, organize code --- home/.config/nvim/lua/plugins/gitsigns.lua | 3 +-- home/.config/nvim/lua/plugins/kanagawa.lua | 4 ++-- home/.config/nvim/lua/plugins/luasnip.lua | 3 ++- home/.config/nvim/lua/plugins/telescope.lua | 14 +++++++++++--- home/.config/nvim/lua/plugins/which-key.lua | 8 -------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua index 7287de5a..825a414a 100644 --- a/home/.config/nvim/lua/plugins/gitsigns.lua +++ b/home/.config/nvim/lua/plugins/gitsigns.lua @@ -9,7 +9,6 @@ return { wk.register({ ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } }, ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, - }, { prefix = "" }) - + }) end, } diff --git a/home/.config/nvim/lua/plugins/kanagawa.lua b/home/.config/nvim/lua/plugins/kanagawa.lua index b0c47d06..d35ae0c4 100644 --- a/home/.config/nvim/lua/plugins/kanagawa.lua +++ b/home/.config/nvim/lua/plugins/kanagawa.lua @@ -45,8 +45,8 @@ return { } end, }, - config = function(spec) - require("kanagawa").setup(spec.opts) + config = function(_, opts) + require("kanagawa").setup(opts) vim.cmd("colorscheme kanagawa") end, } diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index d420c8cd..ad186108 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -1,7 +1,8 @@ -- Snippets plugin return { "L3MON4D3/LuaSnip", - dependencies = { "rafamadriz/friendly-snippets" }, -- Snippets collection + -- Snippets collection + dependencies = { "rafamadriz/friendly-snippets" }, config = function() -- load friendly-snippets to luasnip require("luasnip/loaders/from_vscode").lazy_load() diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 32a69dd4..eef42428 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -56,8 +56,16 @@ return { telescope.load_extension("cder") -- Keybinds - vim.keymap.set("n", "", vim.cmd.Telescope) - vim.keymap.set("n", "", builtin.find_files) - vim.keymap.set("n", "", builtin.live_grep) + require("which-key").register({ + cd = { + function() + vim.cmd("Telescope cder") + end, + "Change directories", + }, + [""] = { vim.cmd.Telescope, "Open Telescope" }, + [""] = { builtin.find_files, "Telescope find files" }, + [""] = { builtin.live_grep, "Telescope live grep" }, + }) end, } diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index e85e51ac..cae24ffd 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -15,14 +15,6 @@ return { [""] = { "bprevious", "Previous buffer" }, }) - -- Open cder - wk.register({ cd = { - function() - vim.cmd("Telescope cder") - end, - "Change directories", - } }) - -- Exit terminal insert mode with esc vim.keymap.set("t", "", "", {}) end, From 769fcf82ef1fd22cdf0c82d5cc45e7f109b8d19c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 22:31:15 +0200 Subject: [PATCH 2101/2667] Fix lua_ls setup, add some documentation --- home/.config/nvim/lua/.luarc.json | 4 --- home/.config/nvim/lua/lsp_utils.lua | 8 +++-- home/.config/nvim/lua/plugins/mason.lua | 40 ++++++++----------------- home/.config/nvim/lua/settings.lua | 1 - 4 files changed, 18 insertions(+), 35 deletions(-) delete mode 100644 home/.config/nvim/lua/.luarc.json diff --git a/home/.config/nvim/lua/.luarc.json b/home/.config/nvim/lua/.luarc.json deleted file mode 100644 index 03c8166d..00000000 --- a/home/.config/nvim/lua/.luarc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json", - "workspace.checkThirdParty": false -} diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua index 614ac5ad..f8e46802 100644 --- a/home/.config/nvim/lua/lsp_utils.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -2,7 +2,7 @@ -- reusable functions local m = {} --- Map LSP specific keybinds. +-- Maps LSP specific keybinds. -- This makes them only available when LSP is running function m.map_keys() local telescope_builtin = require("telescope.builtin") @@ -41,7 +41,8 @@ function m.map_keys() }) end - +-- Maps keys and does other needed actions +-- when client attatches function m.on_attach(client, bufnr) -- Attach navic if document symbols are available if client.server_capabilities.documentSymbolProvider then @@ -52,8 +53,9 @@ function m.on_attach(client, bufnr) m.map_keys() end +-- Combine built-in LSP and cmp cabaibilities +-- and additional capabilities from other plugins function m.get_capabilities() - -- Combine built-in LSP and cmp cabaibilities local capabilities = vim.tbl_deep_extend( "force", vim.lsp.protocol.make_client_capabilities(), diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index af5dcc47..a10d8550 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -1,17 +1,29 @@ -- Package manager for LSP servers, DAP adapters etc. +-- It also handles starting all of my LSP servers return { "williamboman/mason.nvim", dependencies = { "neovim/nvim-lspconfig", "williamboman/mason-lspconfig.nvim", "WhoIsSethDaniel/mason-tool-installer.nvim", + -- Extended functionality for jdtls "mfussenegger/nvim-jdtls", + -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. + { + "folke/neodev.nvim", + opts = { + override = function(root_dir, library) + library.enabled = true + library.plugins = true + end, + }, + }, }, config = function() require("mason").setup() local mason_lsp = require("mason-lspconfig") - local lsp_utils = require('lsp_utils') + local lsp_utils = require("lsp_utils") local capabilities = lsp_utils.get_capabilities() mason_lsp.setup() @@ -24,32 +36,6 @@ return { }) end, - -- Override lua_ls settings - ["lua_ls"] = function() - require("lspconfig").lua_ls.setup({ - on_attach = lsp_utils.on_attach, - capabilities = capabilities, - settings = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = "LuaJIT", - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = { "vim" }, - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file("", true), - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = { enable = false }, - }, - }, - }) - end, - -- Don't set up jdtls, it is set up by nvim-jdtls ["jdtls"] = function() end, }) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index a58a8273..21578300 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -25,7 +25,6 @@ o.diffopt = "filler,internal,algorithm:histogram,indent-heuristic" -- Allow switching buffers with unsaved changes o.hidden = true - o.guicursor = table.concat({ "i:ver1", -- Vertical bar cursor in insert mode "a:blinkon1", -- Blinking cursor in all modes From 0df316b4fb0033a66c9ed86b89798f658ff769b2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 22:31:15 +0200 Subject: [PATCH 2102/2667] Fix lua_ls setup, add some documentation --- home/.config/nvim/lua/.luarc.json | 4 --- home/.config/nvim/lua/lsp_utils.lua | 8 +++-- home/.config/nvim/lua/plugins/mason.lua | 40 ++++++++----------------- home/.config/nvim/lua/settings.lua | 1 - 4 files changed, 18 insertions(+), 35 deletions(-) delete mode 100644 home/.config/nvim/lua/.luarc.json diff --git a/home/.config/nvim/lua/.luarc.json b/home/.config/nvim/lua/.luarc.json deleted file mode 100644 index 03c8166d..00000000 --- a/home/.config/nvim/lua/.luarc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json", - "workspace.checkThirdParty": false -} diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua index 614ac5ad..f8e46802 100644 --- a/home/.config/nvim/lua/lsp_utils.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -2,7 +2,7 @@ -- reusable functions local m = {} --- Map LSP specific keybinds. +-- Maps LSP specific keybinds. -- This makes them only available when LSP is running function m.map_keys() local telescope_builtin = require("telescope.builtin") @@ -41,7 +41,8 @@ function m.map_keys() }) end - +-- Maps keys and does other needed actions +-- when client attatches function m.on_attach(client, bufnr) -- Attach navic if document symbols are available if client.server_capabilities.documentSymbolProvider then @@ -52,8 +53,9 @@ function m.on_attach(client, bufnr) m.map_keys() end +-- Combine built-in LSP and cmp cabaibilities +-- and additional capabilities from other plugins function m.get_capabilities() - -- Combine built-in LSP and cmp cabaibilities local capabilities = vim.tbl_deep_extend( "force", vim.lsp.protocol.make_client_capabilities(), diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index af5dcc47..a10d8550 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -1,17 +1,29 @@ -- Package manager for LSP servers, DAP adapters etc. +-- It also handles starting all of my LSP servers return { "williamboman/mason.nvim", dependencies = { "neovim/nvim-lspconfig", "williamboman/mason-lspconfig.nvim", "WhoIsSethDaniel/mason-tool-installer.nvim", + -- Extended functionality for jdtls "mfussenegger/nvim-jdtls", + -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. + { + "folke/neodev.nvim", + opts = { + override = function(root_dir, library) + library.enabled = true + library.plugins = true + end, + }, + }, }, config = function() require("mason").setup() local mason_lsp = require("mason-lspconfig") - local lsp_utils = require('lsp_utils') + local lsp_utils = require("lsp_utils") local capabilities = lsp_utils.get_capabilities() mason_lsp.setup() @@ -24,32 +36,6 @@ return { }) end, - -- Override lua_ls settings - ["lua_ls"] = function() - require("lspconfig").lua_ls.setup({ - on_attach = lsp_utils.on_attach, - capabilities = capabilities, - settings = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = "LuaJIT", - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = { "vim" }, - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file("", true), - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = { enable = false }, - }, - }, - }) - end, - -- Don't set up jdtls, it is set up by nvim-jdtls ["jdtls"] = function() end, }) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index a58a8273..21578300 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -25,7 +25,6 @@ o.diffopt = "filler,internal,algorithm:histogram,indent-heuristic" -- Allow switching buffers with unsaved changes o.hidden = true - o.guicursor = table.concat({ "i:ver1", -- Vertical bar cursor in insert mode "a:blinkon1", -- Blinking cursor in all modes From 61577153beaa98a2eb6f897b83cdeab72eb080bf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 22:31:29 +0200 Subject: [PATCH 2103/2667] Add diagnostics to bufferline --- home/.config/nvim/lua/plugins/bufferline.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua index c1359e43..bf800fd3 100644 --- a/home/.config/nvim/lua/plugins/bufferline.lua +++ b/home/.config/nvim/lua/plugins/bufferline.lua @@ -2,4 +2,13 @@ return { "akinsho/bufferline.nvim", version = "*", dependencies = { "kyazdani42/nvim-web-devicons" }, + opts = { + options = { + diagnostics = "nvim_lsp", + diagnostics_indicator = function(count, level) + local icon = level:match("error") and " " or " " + return " " .. icon .. count + end, + }, + }, } From 43d1cf31d85fa92626806c3b59e3a2532b380e02 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 22:31:29 +0200 Subject: [PATCH 2104/2667] Add diagnostics to bufferline --- home/.config/nvim/lua/plugins/bufferline.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua index c1359e43..bf800fd3 100644 --- a/home/.config/nvim/lua/plugins/bufferline.lua +++ b/home/.config/nvim/lua/plugins/bufferline.lua @@ -2,4 +2,13 @@ return { "akinsho/bufferline.nvim", version = "*", dependencies = { "kyazdani42/nvim-web-devicons" }, + opts = { + options = { + diagnostics = "nvim_lsp", + diagnostics_indicator = function(count, level) + local icon = level:match("error") and " " or " " + return " " .. icon .. count + end, + }, + }, } From a650d003b1a83a298a0a79332e57a9bbb26f6152 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 22:44:34 +0200 Subject: [PATCH 2105/2667] Nvim: small tweaks --- home/.config/nvim/lua/plugins/mason.lua | 2 +- home/.config/nvim/lua/plugins/noice.lua | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index a10d8550..20715cac 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -12,7 +12,7 @@ return { { "folke/neodev.nvim", opts = { - override = function(root_dir, library) + override = function(_, library) library.enabled = true library.plugins = true end, diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua index 01fb80c6..ad653a56 100644 --- a/home/.config/nvim/lua/plugins/noice.lua +++ b/home/.config/nvim/lua/plugins/noice.lua @@ -13,13 +13,9 @@ return { ["cmp.entry.get_documentation"] = true, }, }, - -- you can enable a preset for easier configuration presets = { - bottom_search = true, -- use a classic bottom cmdline for search - command_palette = true, -- position the cmdline and popupmenu together - long_message_to_split = true, -- long messages will be sent to a split - inc_rename = false, -- enables an input dialog for inc-rename.nvim - lsp_doc_border = false, -- add a border to hover docs and signature help + -- add a border to hover docs and signature help + lsp_doc_border = true, }, }, } From 2277d4d1700d6f1743ff9ed470cc547f16312d45 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 22:44:34 +0200 Subject: [PATCH 2106/2667] Nvim: small tweaks --- home/.config/nvim/lua/plugins/mason.lua | 2 +- home/.config/nvim/lua/plugins/noice.lua | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index a10d8550..20715cac 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -12,7 +12,7 @@ return { { "folke/neodev.nvim", opts = { - override = function(root_dir, library) + override = function(_, library) library.enabled = true library.plugins = true end, diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua index 01fb80c6..ad653a56 100644 --- a/home/.config/nvim/lua/plugins/noice.lua +++ b/home/.config/nvim/lua/plugins/noice.lua @@ -13,13 +13,9 @@ return { ["cmp.entry.get_documentation"] = true, }, }, - -- you can enable a preset for easier configuration presets = { - bottom_search = true, -- use a classic bottom cmdline for search - command_palette = true, -- position the cmdline and popupmenu together - long_message_to_split = true, -- long messages will be sent to a split - inc_rename = false, -- enables an input dialog for inc-rename.nvim - lsp_doc_border = false, -- add a border to hover docs and signature help + -- add a border to hover docs and signature help + lsp_doc_border = true, }, }, } From bcd1f2553e54eeecf511e9cd8e383b108e636d40 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 23:04:55 +0200 Subject: [PATCH 2107/2667] Change from vim-surround to mini.surround --- home/.config/nvim/lua/plugins/mini.lua | 8 ++++++++ home/.config/nvim/lua/plugins/vim-surround.lua | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/mini.lua delete mode 100644 home/.config/nvim/lua/plugins/vim-surround.lua diff --git a/home/.config/nvim/lua/plugins/mini.lua b/home/.config/nvim/lua/plugins/mini.lua new file mode 100644 index 00000000..11f5b9cc --- /dev/null +++ b/home/.config/nvim/lua/plugins/mini.lua @@ -0,0 +1,8 @@ +-- Library of 30+ independent Lua modules improving overall Neovim +return { + "echasnovski/mini.nvim", + version = "*", + config = function() + require("mini.surround").setup() + end, +} diff --git a/home/.config/nvim/lua/plugins/vim-surround.lua b/home/.config/nvim/lua/plugins/vim-surround.lua deleted file mode 100644 index 904b9c8d..00000000 --- a/home/.config/nvim/lua/plugins/vim-surround.lua +++ /dev/null @@ -1,2 +0,0 @@ --- we all know this one -return { "tpope/vim-surround" } From 0207ba10647d963089c3337b656c428e2a9fc0ea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 23:04:55 +0200 Subject: [PATCH 2108/2667] Change from vim-surround to mini.surround --- home/.config/nvim/lua/plugins/mini.lua | 8 ++++++++ home/.config/nvim/lua/plugins/vim-surround.lua | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/mini.lua delete mode 100644 home/.config/nvim/lua/plugins/vim-surround.lua diff --git a/home/.config/nvim/lua/plugins/mini.lua b/home/.config/nvim/lua/plugins/mini.lua new file mode 100644 index 00000000..11f5b9cc --- /dev/null +++ b/home/.config/nvim/lua/plugins/mini.lua @@ -0,0 +1,8 @@ +-- Library of 30+ independent Lua modules improving overall Neovim +return { + "echasnovski/mini.nvim", + version = "*", + config = function() + require("mini.surround").setup() + end, +} diff --git a/home/.config/nvim/lua/plugins/vim-surround.lua b/home/.config/nvim/lua/plugins/vim-surround.lua deleted file mode 100644 index 904b9c8d..00000000 --- a/home/.config/nvim/lua/plugins/vim-surround.lua +++ /dev/null @@ -1,2 +0,0 @@ --- we all know this one -return { "tpope/vim-surround" } From 5024f14d82fab295b7d916201431cdc0101e928f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 23:08:00 +0200 Subject: [PATCH 2109/2667] Switch from commentstring to mini.comment --- home/.config/nvim/lua/plugins/commentstring.lua | 5 ----- home/.config/nvim/lua/plugins/mini.lua | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/commentstring.lua diff --git a/home/.config/nvim/lua/plugins/commentstring.lua b/home/.config/nvim/lua/plugins/commentstring.lua deleted file mode 100644 index f5e5692f..00000000 --- a/home/.config/nvim/lua/plugins/commentstring.lua +++ /dev/null @@ -1,5 +0,0 @@ --- treesitter plugin for commentstring -return { - "JoosepAlviste/nvim-ts-context-commentstring", - dependencies = { "tpope/vim-commentary" }, -} diff --git a/home/.config/nvim/lua/plugins/mini.lua b/home/.config/nvim/lua/plugins/mini.lua index 11f5b9cc..6484a365 100644 --- a/home/.config/nvim/lua/plugins/mini.lua +++ b/home/.config/nvim/lua/plugins/mini.lua @@ -4,5 +4,6 @@ return { version = "*", config = function() require("mini.surround").setup() + require("mini.comment").setup() end, } From 36a9af78dcb2bb5161a6e7dab7795d870fb4d5a9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 23:08:00 +0200 Subject: [PATCH 2110/2667] Switch from commentstring to mini.comment --- home/.config/nvim/lua/plugins/commentstring.lua | 5 ----- home/.config/nvim/lua/plugins/mini.lua | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/commentstring.lua diff --git a/home/.config/nvim/lua/plugins/commentstring.lua b/home/.config/nvim/lua/plugins/commentstring.lua deleted file mode 100644 index f5e5692f..00000000 --- a/home/.config/nvim/lua/plugins/commentstring.lua +++ /dev/null @@ -1,5 +0,0 @@ --- treesitter plugin for commentstring -return { - "JoosepAlviste/nvim-ts-context-commentstring", - dependencies = { "tpope/vim-commentary" }, -} diff --git a/home/.config/nvim/lua/plugins/mini.lua b/home/.config/nvim/lua/plugins/mini.lua index 11f5b9cc..6484a365 100644 --- a/home/.config/nvim/lua/plugins/mini.lua +++ b/home/.config/nvim/lua/plugins/mini.lua @@ -4,5 +4,6 @@ return { version = "*", config = function() require("mini.surround").setup() + require("mini.comment").setup() end, } From cbee7ac98596f56bdb24e8f072b54c8a8dda6910 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 23:11:45 +0200 Subject: [PATCH 2111/2667] Add mini.files --- home/.config/nvim/lua/plugins/mini.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/mini.lua b/home/.config/nvim/lua/plugins/mini.lua index 6484a365..616caba0 100644 --- a/home/.config/nvim/lua/plugins/mini.lua +++ b/home/.config/nvim/lua/plugins/mini.lua @@ -5,5 +5,6 @@ return { config = function() require("mini.surround").setup() require("mini.comment").setup() + require("mini.files").setup() end, } From 5ef4529512010d5321b80adc75a28f7211fe74cd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 23:11:45 +0200 Subject: [PATCH 2112/2667] Add mini.files --- home/.config/nvim/lua/plugins/mini.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/mini.lua b/home/.config/nvim/lua/plugins/mini.lua index 6484a365..616caba0 100644 --- a/home/.config/nvim/lua/plugins/mini.lua +++ b/home/.config/nvim/lua/plugins/mini.lua @@ -5,5 +5,6 @@ return { config = function() require("mini.surround").setup() require("mini.comment").setup() + require("mini.files").setup() end, } From 7882ab1922401e5d5cef8e0f51ff3ce5c800e4ce Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 23:23:39 +0200 Subject: [PATCH 2113/2667] Nvim: change telescope layout to vertical --- home/.config/nvim/lua/plugins/telescope.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index eef42428..de099f7d 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -17,6 +17,14 @@ return { "zane-/cder.nvim", }, opts = { + defaults = { + layout_strategy = "vertical", + layout_defaults = { + vertical = { + preview_height = 0.5, + }, + }, + }, pickers = { find_files = { find_command = { "fd", "-Ht", "f" } }, lsp_references = { show_line = false }, From bbce000bcd0a5571656ce6cb1575c35c8684d1b5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 23:23:39 +0200 Subject: [PATCH 2114/2667] Nvim: change telescope layout to vertical --- home/.config/nvim/lua/plugins/telescope.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index eef42428..de099f7d 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -17,6 +17,14 @@ return { "zane-/cder.nvim", }, opts = { + defaults = { + layout_strategy = "vertical", + layout_defaults = { + vertical = { + preview_height = 0.5, + }, + }, + }, pickers = { find_files = { find_command = { "fd", "-Ht", "f" } }, lsp_references = { show_line = false }, From eefc9c4a6066abc085ec6db36afb39d37ef75cb7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Nov 2023 15:20:25 +0200 Subject: [PATCH 2115/2667] Nvim: jdtls disable autobuild --- home/.config/nvim/ftplugin/java.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 43fcd84d..33388087 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -26,7 +26,12 @@ require("jdtls").start_or_attach({ "-data", workspace_dir, }, - settings = { java = { signatureHelp = { enabled = true } } }, + settings = { + java = { + signatureHelp = { enabled = true }, + autobuild = { enabled = false }, + }, + }, completion = { favoriteStaticMembers = { "java.text.MessageFormat.format" } }, runtimes = { { From f5e338529147a77b94b49b56250376c106e5f918 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Nov 2023 15:20:25 +0200 Subject: [PATCH 2116/2667] Nvim: jdtls disable autobuild --- home/.config/nvim/ftplugin/java.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 43fcd84d..33388087 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -26,7 +26,12 @@ require("jdtls").start_or_attach({ "-data", workspace_dir, }, - settings = { java = { signatureHelp = { enabled = true } } }, + settings = { + java = { + signatureHelp = { enabled = true }, + autobuild = { enabled = false }, + }, + }, completion = { favoriteStaticMembers = { "java.text.MessageFormat.format" } }, runtimes = { { From fc50b07d4e0be8ebc1046b47654061101f6b65b0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Nov 2023 16:15:45 +0200 Subject: [PATCH 2117/2667] Disable non-working beets plugins --- home/.config/beets/config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml index 7a328b3a..8782a1d0 100644 --- a/home/.config/beets/config.yaml +++ b/home/.config/beets/config.yaml @@ -2,7 +2,7 @@ directory: ~/Music library: ~/Music/beets.db plugins: - acousticbrainz - - check + # - check - edit - fetchart # - follow @@ -10,8 +10,8 @@ plugins: - info - lastgenre - lyrics - - mbcollection - - mpdupdate + #- mbcollection + #- mpdupdate - play - replaygain - thumbnails From 53a52fb737aece7610cdcfb169e9ba832bf9d0be Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Nov 2023 16:15:45 +0200 Subject: [PATCH 2118/2667] Disable non-working beets plugins --- home/.config/beets/config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml index 7a328b3a..8782a1d0 100644 --- a/home/.config/beets/config.yaml +++ b/home/.config/beets/config.yaml @@ -2,7 +2,7 @@ directory: ~/Music library: ~/Music/beets.db plugins: - acousticbrainz - - check + # - check - edit - fetchart # - follow @@ -10,8 +10,8 @@ plugins: - info - lastgenre - lyrics - - mbcollection - - mpdupdate + #- mbcollection + #- mpdupdate - play - replaygain - thumbnails From 9c2f5dee4c0d3baad60e973784e5b0441afb0a34 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Nov 2023 21:14:45 +0200 Subject: [PATCH 2119/2667] Nvim: small tweaks and organizing config --- home/.config/nvim/lua/lsp_utils.lua | 9 ++++----- home/.config/nvim/lua/plugins/emmylua.lua | 5 ----- home/.config/nvim/lua/plugins/gitsigns.lua | 3 +-- home/.config/nvim/lua/plugins/noice.lua | 13 +++++++++++++ 4 files changed, 18 insertions(+), 12 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/emmylua.lua diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua index f8e46802..4eb1e5cb 100644 --- a/home/.config/nvim/lua/lsp_utils.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -4,7 +4,7 @@ local m = {} -- Maps LSP specific keybinds. -- This makes them only available when LSP is running -function m.map_keys() +local function map_keys() local telescope_builtin = require("telescope.builtin") require("which-key").register({ g = { @@ -42,7 +42,7 @@ function m.map_keys() end -- Maps keys and does other needed actions --- when client attatches +-- when client attaches function m.on_attach(client, bufnr) -- Attach navic if document symbols are available if client.server_capabilities.documentSymbolProvider then @@ -50,7 +50,7 @@ function m.on_attach(client, bufnr) end -- Setup keybinds - m.map_keys() + map_keys() end -- Combine built-in LSP and cmp cabaibilities @@ -62,8 +62,7 @@ function m.get_capabilities() require("cmp_nvim_lsp").default_capabilities() ) - -- Neovim hasn't added foldingRange to default capabilities, users must add it manually - -- for ufo + -- Neovim hasn't added foldingRange to default capabilities, users must add it manually for ufo --capabilities.textDocument.foldingRange = { -- dynamicRegistration = false, -- lineFoldingOnly = true, diff --git a/home/.config/nvim/lua/plugins/emmylua.lua b/home/.config/nvim/lua/plugins/emmylua.lua deleted file mode 100644 index 8e4dc1ca..00000000 --- a/home/.config/nvim/lua/plugins/emmylua.lua +++ /dev/null @@ -1,5 +0,0 @@ --- vim api documentation for lua lsp -return { - "ii14/emmylua-nvim", - ft = { "lua" }, -} diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua index 825a414a..557c23bc 100644 --- a/home/.config/nvim/lua/plugins/gitsigns.lua +++ b/home/.config/nvim/lua/plugins/gitsigns.lua @@ -5,8 +5,7 @@ return { local gitsigns = require("gitsigns") gitsigns.setup() - local wk = require("which-key") - wk.register({ + require("which-key").register({ ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } }, ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, }) diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua index ad653a56..9ef7a91d 100644 --- a/home/.config/nvim/lua/plugins/noice.lua +++ b/home/.config/nvim/lua/plugins/noice.lua @@ -18,4 +18,17 @@ return { lsp_doc_border = true, }, }, + config = function(_, opts) + local noice = require("noice") + noice.setup(opts) + + require("which-key").register({ + d = { + function() + vim.cmd("NoiceDismiss") + end, + "Dismiss notifications", + }, + }, { prefix = "" }) + end, } From 6fbba8bf3d8f284eed4e4fcea8fe72d0bb7e7352 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Nov 2023 21:14:45 +0200 Subject: [PATCH 2120/2667] Nvim: small tweaks and organizing config --- home/.config/nvim/lua/lsp_utils.lua | 9 ++++----- home/.config/nvim/lua/plugins/emmylua.lua | 5 ----- home/.config/nvim/lua/plugins/gitsigns.lua | 3 +-- home/.config/nvim/lua/plugins/noice.lua | 13 +++++++++++++ 4 files changed, 18 insertions(+), 12 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/emmylua.lua diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua index f8e46802..4eb1e5cb 100644 --- a/home/.config/nvim/lua/lsp_utils.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -4,7 +4,7 @@ local m = {} -- Maps LSP specific keybinds. -- This makes them only available when LSP is running -function m.map_keys() +local function map_keys() local telescope_builtin = require("telescope.builtin") require("which-key").register({ g = { @@ -42,7 +42,7 @@ function m.map_keys() end -- Maps keys and does other needed actions --- when client attatches +-- when client attaches function m.on_attach(client, bufnr) -- Attach navic if document symbols are available if client.server_capabilities.documentSymbolProvider then @@ -50,7 +50,7 @@ function m.on_attach(client, bufnr) end -- Setup keybinds - m.map_keys() + map_keys() end -- Combine built-in LSP and cmp cabaibilities @@ -62,8 +62,7 @@ function m.get_capabilities() require("cmp_nvim_lsp").default_capabilities() ) - -- Neovim hasn't added foldingRange to default capabilities, users must add it manually - -- for ufo + -- Neovim hasn't added foldingRange to default capabilities, users must add it manually for ufo --capabilities.textDocument.foldingRange = { -- dynamicRegistration = false, -- lineFoldingOnly = true, diff --git a/home/.config/nvim/lua/plugins/emmylua.lua b/home/.config/nvim/lua/plugins/emmylua.lua deleted file mode 100644 index 8e4dc1ca..00000000 --- a/home/.config/nvim/lua/plugins/emmylua.lua +++ /dev/null @@ -1,5 +0,0 @@ --- vim api documentation for lua lsp -return { - "ii14/emmylua-nvim", - ft = { "lua" }, -} diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua index 825a414a..557c23bc 100644 --- a/home/.config/nvim/lua/plugins/gitsigns.lua +++ b/home/.config/nvim/lua/plugins/gitsigns.lua @@ -5,8 +5,7 @@ return { local gitsigns = require("gitsigns") gitsigns.setup() - local wk = require("which-key") - wk.register({ + require("which-key").register({ ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } }, ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, }) diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua index ad653a56..9ef7a91d 100644 --- a/home/.config/nvim/lua/plugins/noice.lua +++ b/home/.config/nvim/lua/plugins/noice.lua @@ -18,4 +18,17 @@ return { lsp_doc_border = true, }, }, + config = function(_, opts) + local noice = require("noice") + noice.setup(opts) + + require("which-key").register({ + d = { + function() + vim.cmd("NoiceDismiss") + end, + "Dismiss notifications", + }, + }, { prefix = "" }) + end, } From c6876f5f9ae72ca8391e8447934202ae4ccea4f8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Nov 2023 22:08:46 +0200 Subject: [PATCH 2121/2667] Nvim: some docs to config, minor tweaks --- home/.config/nvim/lua/plugins/telescope.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index de099f7d..b1f877e5 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -17,6 +17,7 @@ return { "zane-/cder.nvim", }, opts = { + -- Set layout to vertical defaults = { layout_strategy = "vertical", layout_defaults = { @@ -29,7 +30,7 @@ return { find_files = { find_command = { "fd", "-Ht", "f" } }, lsp_references = { show_line = false }, live_grep = { - additional_args = function(opts) + additional_args = function() return { "--hidden" } end, }, @@ -55,15 +56,15 @@ return { }, config = function(_, opts) local telescope = require("telescope") - local builtin = require("telescope.builtin") - telescope.setup(opts) + -- Add extensions telescope.load_extension("fzf") telescope.load_extension("ui-select") telescope.load_extension("cder") -- Keybinds + local builtin = require("telescope.builtin") require("which-key").register({ cd = { function() From 2a0d70174629ede61d9dbd0f8fbabe7b8e86b6e6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Nov 2023 22:08:46 +0200 Subject: [PATCH 2122/2667] Nvim: some docs to config, minor tweaks --- home/.config/nvim/lua/plugins/telescope.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index de099f7d..b1f877e5 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -17,6 +17,7 @@ return { "zane-/cder.nvim", }, opts = { + -- Set layout to vertical defaults = { layout_strategy = "vertical", layout_defaults = { @@ -29,7 +30,7 @@ return { find_files = { find_command = { "fd", "-Ht", "f" } }, lsp_references = { show_line = false }, live_grep = { - additional_args = function(opts) + additional_args = function() return { "--hidden" } end, }, @@ -55,15 +56,15 @@ return { }, config = function(_, opts) local telescope = require("telescope") - local builtin = require("telescope.builtin") - telescope.setup(opts) + -- Add extensions telescope.load_extension("fzf") telescope.load_extension("ui-select") telescope.load_extension("cder") -- Keybinds + local builtin = require("telescope.builtin") require("which-key").register({ cd = { function() From b3ebda5b51a055c71cda10f14ee9a0a3c0652422 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Nov 2023 07:52:05 +0200 Subject: [PATCH 2123/2667] Nvim: enable ufo --- home/.config/nvim/lua/lsp_utils.lua | 8 ++++---- home/.config/nvim/lua/plugins/ufo.lua | 11 ++++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua index 4eb1e5cb..5603b0af 100644 --- a/home/.config/nvim/lua/lsp_utils.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -63,10 +63,10 @@ function m.get_capabilities() ) -- Neovim hasn't added foldingRange to default capabilities, users must add it manually for ufo - --capabilities.textDocument.foldingRange = { - -- dynamicRegistration = false, - -- lineFoldingOnly = true, - --} + capabilities.textDocument.foldingRange = { + dynamicRegistration = false, + lineFoldingOnly = true, + } return capabilities end diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua index acd7c478..780c7255 100644 --- a/home/.config/nvim/lua/plugins/ufo.lua +++ b/home/.config/nvim/lua/plugins/ufo.lua @@ -1,7 +1,5 @@ -- Better folds --- Disabled for now because it causes weird artifacts return { - enabled = false, "kevinhwang91/nvim-ufo", dependencies = { "kevinhwang91/promise-async" }, opts = { @@ -13,14 +11,13 @@ return { local ufo = require("ufo") ufo.setup(opts) - -- Using ufo, need to remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself - local keymap = vim.keymap - keymap.set("n", "zR", ufo.openAllFolds) - keymap.set("n", "zM", ufo.closeAllFolds) + -- Using ufo, we need to remap `zR` and `zM` + vim.keymap.set("n", "zR", ufo.openAllFolds) + vim.keymap.set("n", "zM", ufo.closeAllFolds) -- Fold settings local o = vim.o - o.foldcolumn = "1" + o.foldcolumn = "0" o.foldlevel = 99 o.foldlevelstart = 99 o.foldenable = true From 26d0dae2fca83b9b2a534f90b452baf451738565 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Nov 2023 07:52:05 +0200 Subject: [PATCH 2124/2667] Nvim: enable ufo --- home/.config/nvim/lua/lsp_utils.lua | 8 ++++---- home/.config/nvim/lua/plugins/ufo.lua | 11 ++++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua index 4eb1e5cb..5603b0af 100644 --- a/home/.config/nvim/lua/lsp_utils.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -63,10 +63,10 @@ function m.get_capabilities() ) -- Neovim hasn't added foldingRange to default capabilities, users must add it manually for ufo - --capabilities.textDocument.foldingRange = { - -- dynamicRegistration = false, - -- lineFoldingOnly = true, - --} + capabilities.textDocument.foldingRange = { + dynamicRegistration = false, + lineFoldingOnly = true, + } return capabilities end diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua index acd7c478..780c7255 100644 --- a/home/.config/nvim/lua/plugins/ufo.lua +++ b/home/.config/nvim/lua/plugins/ufo.lua @@ -1,7 +1,5 @@ -- Better folds --- Disabled for now because it causes weird artifacts return { - enabled = false, "kevinhwang91/nvim-ufo", dependencies = { "kevinhwang91/promise-async" }, opts = { @@ -13,14 +11,13 @@ return { local ufo = require("ufo") ufo.setup(opts) - -- Using ufo, need to remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself - local keymap = vim.keymap - keymap.set("n", "zR", ufo.openAllFolds) - keymap.set("n", "zM", ufo.closeAllFolds) + -- Using ufo, we need to remap `zR` and `zM` + vim.keymap.set("n", "zR", ufo.openAllFolds) + vim.keymap.set("n", "zM", ufo.closeAllFolds) -- Fold settings local o = vim.o - o.foldcolumn = "1" + o.foldcolumn = "0" o.foldlevel = 99 o.foldlevelstart = 99 o.foldenable = true From 83cd0a7540d1e2760980d2cd37a090bf188bf8bb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Nov 2023 22:28:54 +0200 Subject: [PATCH 2125/2667] Nvim: add type annotations to plugin opts --- home/.config/nvim/lua/plugins/bufferline.lua | 1 + home/.config/nvim/lua/plugins/cmp.lua | 4 - .../nvim/lua/plugins/indent-blankline.lua | 1 + home/.config/nvim/lua/plugins/kanagawa.lua | 1 + home/.config/nvim/lua/plugins/neoformat.lua | 3 +- home/.config/nvim/lua/plugins/noice.lua | 4 +- .../nvim/lua/plugins/nvim-colorizer.lua | 4 +- home/.config/nvim/lua/plugins/treesitter.lua | 88 +++++++++---------- home/.config/nvim/lua/plugins/which-key.lua | 2 +- 9 files changed, 50 insertions(+), 58 deletions(-) diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua index bf800fd3..f6b42c4c 100644 --- a/home/.config/nvim/lua/plugins/bufferline.lua +++ b/home/.config/nvim/lua/plugins/bufferline.lua @@ -2,6 +2,7 @@ return { "akinsho/bufferline.nvim", version = "*", dependencies = { "kyazdani42/nvim-web-devicons" }, + ---@type BufferlineConfig opts = { options = { diagnostics = "nvim_lsp", diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 5b177028..2eaf53b5 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -25,10 +25,6 @@ return { local cmp = require("cmp") local luasnip = require("luasnip") - if not cmp then - return - end - -- Set completeopt to have a better completion experience vim.o.completeopt = "menuone,noselect" diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index 75681f72..9aca163f 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,6 +1,7 @@ -- Indent characters return { "lukas-reineke/indent-blankline.nvim", + ---@type ibl.config opts = { exclude = { filetypes = { diff --git a/home/.config/nvim/lua/plugins/kanagawa.lua b/home/.config/nvim/lua/plugins/kanagawa.lua index d35ae0c4..cba20994 100644 --- a/home/.config/nvim/lua/plugins/kanagawa.lua +++ b/home/.config/nvim/lua/plugins/kanagawa.lua @@ -1,6 +1,7 @@ -- Colorscheme return { "rebelot/kanagawa.nvim", + ---@type KanagawaConfig opts = { compile = true, dimInactive = true, diff --git a/home/.config/nvim/lua/plugins/neoformat.lua b/home/.config/nvim/lua/plugins/neoformat.lua index 2abef6e4..988eef3d 100644 --- a/home/.config/nvim/lua/plugins/neoformat.lua +++ b/home/.config/nvim/lua/plugins/neoformat.lua @@ -2,8 +2,7 @@ return { "sbdchd/neoformat", config = function() - local wk = require("which-key") - wk.register({ + require("which-key").register({ f = { "Neoformat", "Format with Neoformat" }, }, { prefix = "" }) end, diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua index 9ef7a91d..d4dbcaff 100644 --- a/home/.config/nvim/lua/plugins/noice.lua +++ b/home/.config/nvim/lua/plugins/noice.lua @@ -4,6 +4,7 @@ return { "folke/noice.nvim", event = "VeryLazy", dependencies = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify" }, + ---@type NoiceConfig opts = { lsp = { -- override markdown rendering so that **cmp** and other plugins use **Treesitter** @@ -19,8 +20,7 @@ return { }, }, config = function(_, opts) - local noice = require("noice") - noice.setup(opts) + require("noice").setup(opts) require("which-key").register({ d = { diff --git a/home/.config/nvim/lua/plugins/nvim-colorizer.lua b/home/.config/nvim/lua/plugins/nvim-colorizer.lua index c316742b..05ac1448 100644 --- a/home/.config/nvim/lua/plugins/nvim-colorizer.lua +++ b/home/.config/nvim/lua/plugins/nvim-colorizer.lua @@ -1,7 +1,5 @@ -- High performance color highlighter return { "norcalli/nvim-colorizer.lua", - config = function() - require("colorizer").setup() - end, + config = true, } diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index f181aea3..7a04584e 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -3,50 +3,46 @@ return { build = function() require("nvim-treesitter.install").update({ with_sync = true }) end, - config = function() - require("nvim-treesitter.configs").setup({ - ensure_installed = { - "bash", - "css", - "dockerfile", - "git_config", - "git_rebase", - "gitattributes", - "gitcommit", - "gitignore", - "html", - "http", - "java", - "javascript", - "json", - "json5", - "latex", - "lua", - "make", - "markdown", - "markdown_inline", - "php", - "python", - "rasi", - "regex", - "rst", - "scss", - "toml", - "tsx", - "typescript", - "vim", - "yaml", - }, - highlight = { enable = true }, - indent = { enable = true }, - incremental_selection = { enable = true }, - context_commentstring = { enable = true }, - sync_install = true, - ignore_install = {}, - auto_install = true, - }) - - -- vim.wo.foldmethod = 'expr' - -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' - end, + ---@type TSConfig + opts = { + ensure_installed = { + "bash", + "css", + "dockerfile", + "git_config", + "git_rebase", + "gitattributes", + "gitcommit", + "gitignore", + "html", + "http", + "java", + "javascript", + "json", + "json5", + "latex", + "lua", + "make", + "markdown", + "markdown_inline", + "php", + "python", + "rasi", + "regex", + "rst", + "scss", + "toml", + "tsx", + "typescript", + "vim", + "yaml", + }, + highlight = { enable = true }, + indent = { enable = true }, + incremental_selection = { enable = true }, + context_commentstring = { enable = true }, + sync_install = true, + ignore_install = {}, + auto_install = true, + }, } diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index cae24ffd..643b2c75 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -4,7 +4,7 @@ return { "folke/which-key.nvim", config = function() local wk = require("which-key") - wk.setup({}) + wk.setup() wk.register({ h = { "nohlsearch", "Turn off search highlight" }, From b5498c671d9ff6efa10a83ea5df8b23c22d7cff4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Nov 2023 22:28:54 +0200 Subject: [PATCH 2126/2667] Nvim: add type annotations to plugin opts --- home/.config/nvim/lua/plugins/bufferline.lua | 1 + home/.config/nvim/lua/plugins/cmp.lua | 4 - .../nvim/lua/plugins/indent-blankline.lua | 1 + home/.config/nvim/lua/plugins/kanagawa.lua | 1 + home/.config/nvim/lua/plugins/neoformat.lua | 3 +- home/.config/nvim/lua/plugins/noice.lua | 4 +- .../nvim/lua/plugins/nvim-colorizer.lua | 4 +- home/.config/nvim/lua/plugins/treesitter.lua | 88 +++++++++---------- home/.config/nvim/lua/plugins/which-key.lua | 2 +- 9 files changed, 50 insertions(+), 58 deletions(-) diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua index bf800fd3..f6b42c4c 100644 --- a/home/.config/nvim/lua/plugins/bufferline.lua +++ b/home/.config/nvim/lua/plugins/bufferline.lua @@ -2,6 +2,7 @@ return { "akinsho/bufferline.nvim", version = "*", dependencies = { "kyazdani42/nvim-web-devicons" }, + ---@type BufferlineConfig opts = { options = { diagnostics = "nvim_lsp", diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 5b177028..2eaf53b5 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -25,10 +25,6 @@ return { local cmp = require("cmp") local luasnip = require("luasnip") - if not cmp then - return - end - -- Set completeopt to have a better completion experience vim.o.completeopt = "menuone,noselect" diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index 75681f72..9aca163f 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,6 +1,7 @@ -- Indent characters return { "lukas-reineke/indent-blankline.nvim", + ---@type ibl.config opts = { exclude = { filetypes = { diff --git a/home/.config/nvim/lua/plugins/kanagawa.lua b/home/.config/nvim/lua/plugins/kanagawa.lua index d35ae0c4..cba20994 100644 --- a/home/.config/nvim/lua/plugins/kanagawa.lua +++ b/home/.config/nvim/lua/plugins/kanagawa.lua @@ -1,6 +1,7 @@ -- Colorscheme return { "rebelot/kanagawa.nvim", + ---@type KanagawaConfig opts = { compile = true, dimInactive = true, diff --git a/home/.config/nvim/lua/plugins/neoformat.lua b/home/.config/nvim/lua/plugins/neoformat.lua index 2abef6e4..988eef3d 100644 --- a/home/.config/nvim/lua/plugins/neoformat.lua +++ b/home/.config/nvim/lua/plugins/neoformat.lua @@ -2,8 +2,7 @@ return { "sbdchd/neoformat", config = function() - local wk = require("which-key") - wk.register({ + require("which-key").register({ f = { "Neoformat", "Format with Neoformat" }, }, { prefix = "" }) end, diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua index 9ef7a91d..d4dbcaff 100644 --- a/home/.config/nvim/lua/plugins/noice.lua +++ b/home/.config/nvim/lua/plugins/noice.lua @@ -4,6 +4,7 @@ return { "folke/noice.nvim", event = "VeryLazy", dependencies = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify" }, + ---@type NoiceConfig opts = { lsp = { -- override markdown rendering so that **cmp** and other plugins use **Treesitter** @@ -19,8 +20,7 @@ return { }, }, config = function(_, opts) - local noice = require("noice") - noice.setup(opts) + require("noice").setup(opts) require("which-key").register({ d = { diff --git a/home/.config/nvim/lua/plugins/nvim-colorizer.lua b/home/.config/nvim/lua/plugins/nvim-colorizer.lua index c316742b..05ac1448 100644 --- a/home/.config/nvim/lua/plugins/nvim-colorizer.lua +++ b/home/.config/nvim/lua/plugins/nvim-colorizer.lua @@ -1,7 +1,5 @@ -- High performance color highlighter return { "norcalli/nvim-colorizer.lua", - config = function() - require("colorizer").setup() - end, + config = true, } diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index f181aea3..7a04584e 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -3,50 +3,46 @@ return { build = function() require("nvim-treesitter.install").update({ with_sync = true }) end, - config = function() - require("nvim-treesitter.configs").setup({ - ensure_installed = { - "bash", - "css", - "dockerfile", - "git_config", - "git_rebase", - "gitattributes", - "gitcommit", - "gitignore", - "html", - "http", - "java", - "javascript", - "json", - "json5", - "latex", - "lua", - "make", - "markdown", - "markdown_inline", - "php", - "python", - "rasi", - "regex", - "rst", - "scss", - "toml", - "tsx", - "typescript", - "vim", - "yaml", - }, - highlight = { enable = true }, - indent = { enable = true }, - incremental_selection = { enable = true }, - context_commentstring = { enable = true }, - sync_install = true, - ignore_install = {}, - auto_install = true, - }) - - -- vim.wo.foldmethod = 'expr' - -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' - end, + ---@type TSConfig + opts = { + ensure_installed = { + "bash", + "css", + "dockerfile", + "git_config", + "git_rebase", + "gitattributes", + "gitcommit", + "gitignore", + "html", + "http", + "java", + "javascript", + "json", + "json5", + "latex", + "lua", + "make", + "markdown", + "markdown_inline", + "php", + "python", + "rasi", + "regex", + "rst", + "scss", + "toml", + "tsx", + "typescript", + "vim", + "yaml", + }, + highlight = { enable = true }, + indent = { enable = true }, + incremental_selection = { enable = true }, + context_commentstring = { enable = true }, + sync_install = true, + ignore_install = {}, + auto_install = true, + }, } diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index cae24ffd..643b2c75 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -4,7 +4,7 @@ return { "folke/which-key.nvim", config = function() local wk = require("which-key") - wk.setup({}) + wk.setup() wk.register({ h = { "nohlsearch", "Turn off search highlight" }, From e838e78ad8ab02a045d01f299fe6a7da3663b60c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Nov 2023 22:29:51 +0200 Subject: [PATCH 2127/2667] Nvim: switch navic to dropbar --- home/.config/nvim/lua/lsp_utils.lua | 5 ----- home/.config/nvim/lua/plugins/dropbar.lua | 3 +++ home/.config/nvim/lua/plugins/lualine.lua | 6 +----- home/.config/nvim/lua/plugins/navic.lua | 2 -- 4 files changed, 4 insertions(+), 12 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/dropbar.lua delete mode 100644 home/.config/nvim/lua/plugins/navic.lua diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua index 5603b0af..6fbb3004 100644 --- a/home/.config/nvim/lua/lsp_utils.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -44,11 +44,6 @@ end -- Maps keys and does other needed actions -- when client attaches function m.on_attach(client, bufnr) - -- Attach navic if document symbols are available - if client.server_capabilities.documentSymbolProvider then - require("nvim-navic").attach(client, bufnr) - end - -- Setup keybinds map_keys() end diff --git a/home/.config/nvim/lua/plugins/dropbar.lua b/home/.config/nvim/lua/plugins/dropbar.lua new file mode 100644 index 00000000..72a95171 --- /dev/null +++ b/home/.config/nvim/lua/plugins/dropbar.lua @@ -0,0 +1,3 @@ +return { + "Bekaboo/dropbar.nvim", +} diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 55759ee6..735d7938 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -2,9 +2,5 @@ return { "nvim-lualine/lualine.nvim", dependencies = { "kyazdani42/nvim-web-devicons" }, - opts = { - sections = { - lualine_c = { "navic" }, - }, - }, + config = true, } diff --git a/home/.config/nvim/lua/plugins/navic.lua b/home/.config/nvim/lua/plugins/navic.lua deleted file mode 100644 index de3d7dcd..00000000 --- a/home/.config/nvim/lua/plugins/navic.lua +++ /dev/null @@ -1,2 +0,0 @@ --- Show code LSP context in winbar -return { "SmiteshP/nvim-navic" } From 03ffc98988379ff96b1dd8e172dbbd4c59e26a86 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Nov 2023 22:29:51 +0200 Subject: [PATCH 2128/2667] Nvim: switch navic to dropbar --- home/.config/nvim/lua/lsp_utils.lua | 5 ----- home/.config/nvim/lua/plugins/dropbar.lua | 3 +++ home/.config/nvim/lua/plugins/lualine.lua | 6 +----- home/.config/nvim/lua/plugins/navic.lua | 2 -- 4 files changed, 4 insertions(+), 12 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/dropbar.lua delete mode 100644 home/.config/nvim/lua/plugins/navic.lua diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua index 5603b0af..6fbb3004 100644 --- a/home/.config/nvim/lua/lsp_utils.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -44,11 +44,6 @@ end -- Maps keys and does other needed actions -- when client attaches function m.on_attach(client, bufnr) - -- Attach navic if document symbols are available - if client.server_capabilities.documentSymbolProvider then - require("nvim-navic").attach(client, bufnr) - end - -- Setup keybinds map_keys() end diff --git a/home/.config/nvim/lua/plugins/dropbar.lua b/home/.config/nvim/lua/plugins/dropbar.lua new file mode 100644 index 00000000..72a95171 --- /dev/null +++ b/home/.config/nvim/lua/plugins/dropbar.lua @@ -0,0 +1,3 @@ +return { + "Bekaboo/dropbar.nvim", +} diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 55759ee6..735d7938 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -2,9 +2,5 @@ return { "nvim-lualine/lualine.nvim", dependencies = { "kyazdani42/nvim-web-devicons" }, - opts = { - sections = { - lualine_c = { "navic" }, - }, - }, + config = true, } diff --git a/home/.config/nvim/lua/plugins/navic.lua b/home/.config/nvim/lua/plugins/navic.lua deleted file mode 100644 index de3d7dcd..00000000 --- a/home/.config/nvim/lua/plugins/navic.lua +++ /dev/null @@ -1,2 +0,0 @@ --- Show code LSP context in winbar -return { "SmiteshP/nvim-navic" } From d9372d30bb6efcfc38486f052bc567f6ff61db00 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Nov 2023 22:31:07 +0200 Subject: [PATCH 2129/2667] Refine neodev config --- home/.config/nvim/lua/plugins/mason.lua | 10 ---------- home/.config/nvim/lua/plugins/neodev.lua | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/neodev.lua diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 20715cac..037851aa 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -8,16 +8,6 @@ return { "WhoIsSethDaniel/mason-tool-installer.nvim", -- Extended functionality for jdtls "mfussenegger/nvim-jdtls", - -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. - { - "folke/neodev.nvim", - opts = { - override = function(_, library) - library.enabled = true - library.plugins = true - end, - }, - }, }, config = function() require("mason").setup() diff --git a/home/.config/nvim/lua/plugins/neodev.lua b/home/.config/nvim/lua/plugins/neodev.lua new file mode 100644 index 00000000..e6532e8c --- /dev/null +++ b/home/.config/nvim/lua/plugins/neodev.lua @@ -0,0 +1,14 @@ +return { + -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. + "folke/neodev.nvim", + ---@type LuaDevOptions + opts = { + override = function(root_dir, library) + local dotfiles_path = tostring(vim.fn.expand("~/git/dotfiles")) + if string.find(root_dir, dotfiles_path, 1, true) then + library.enabled = true + library.plugins = true + end + end, + }, +} From d89cc0c05336d7a6be5d85bbc7609e0dfd4e9bae Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Nov 2023 22:31:07 +0200 Subject: [PATCH 2130/2667] Refine neodev config --- home/.config/nvim/lua/plugins/mason.lua | 10 ---------- home/.config/nvim/lua/plugins/neodev.lua | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/neodev.lua diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 20715cac..037851aa 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -8,16 +8,6 @@ return { "WhoIsSethDaniel/mason-tool-installer.nvim", -- Extended functionality for jdtls "mfussenegger/nvim-jdtls", - -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. - { - "folke/neodev.nvim", - opts = { - override = function(_, library) - library.enabled = true - library.plugins = true - end, - }, - }, }, config = function() require("mason").setup() diff --git a/home/.config/nvim/lua/plugins/neodev.lua b/home/.config/nvim/lua/plugins/neodev.lua new file mode 100644 index 00000000..e6532e8c --- /dev/null +++ b/home/.config/nvim/lua/plugins/neodev.lua @@ -0,0 +1,14 @@ +return { + -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. + "folke/neodev.nvim", + ---@type LuaDevOptions + opts = { + override = function(root_dir, library) + local dotfiles_path = tostring(vim.fn.expand("~/git/dotfiles")) + if string.find(root_dir, dotfiles_path, 1, true) then + library.enabled = true + library.plugins = true + end + end, + }, +} From 2b038e4b0d9bc7a90102deb827acae3df530a3eb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Nov 2023 22:32:32 +0200 Subject: [PATCH 2131/2667] Nvim: add signcol plugin, change gitsigns keybinds --- home/.config/nvim/lua/plugins/gitsigns.lua | 13 ----------- home/.config/nvim/lua/plugins/statuscol.lua | 26 +++++++++++++++++++++ home/.config/nvim/lua/plugins/ufo.lua | 3 ++- 3 files changed, 28 insertions(+), 14 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/gitsigns.lua create mode 100644 home/.config/nvim/lua/plugins/statuscol.lua diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua deleted file mode 100644 index 557c23bc..00000000 --- a/home/.config/nvim/lua/plugins/gitsigns.lua +++ /dev/null @@ -1,13 +0,0 @@ --- Git status in signcolumn -return { - "lewis6991/gitsigns.nvim", - config = function() - local gitsigns = require("gitsigns") - gitsigns.setup() - - require("which-key").register({ - ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } }, - ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, - }) - end, -} diff --git a/home/.config/nvim/lua/plugins/statuscol.lua b/home/.config/nvim/lua/plugins/statuscol.lua new file mode 100644 index 00000000..1391671a --- /dev/null +++ b/home/.config/nvim/lua/plugins/statuscol.lua @@ -0,0 +1,26 @@ +return { + "luukvbaal/statuscol.nvim", + dependencies = { + { + "lewis6991/gitsigns.nvim", + opts = {}, + }, + }, + config = function() + local gitsigns = require("gitsigns") + require("which-key").register({ + ["["] = { c = { gitsigns.prev_hunk, "Previous hunk" } }, + ["]"] = { c = { gitsigns.next_hunk, "Next hunk" } }, + }) + + local builtin = require("statuscol.builtin") + require("statuscol").setup({ + relculright = true, + segments = { + { text = { builtin.foldfunc }, click = "v:lua.ScFa" }, + { text = { "%s" }, click = "v:lua.ScSa" }, + { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" }, + }, + }) + end, +} diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua index 780c7255..89eab7d1 100644 --- a/home/.config/nvim/lua/plugins/ufo.lua +++ b/home/.config/nvim/lua/plugins/ufo.lua @@ -2,6 +2,7 @@ return { "kevinhwang91/nvim-ufo", dependencies = { "kevinhwang91/promise-async" }, + ---@type UfoConfig opts = { close_fold_kinds = { "imports", @@ -17,7 +18,7 @@ return { -- Fold settings local o = vim.o - o.foldcolumn = "0" + o.foldcolumn = "1" o.foldlevel = 99 o.foldlevelstart = 99 o.foldenable = true From 7f30c278c6b9a5c2b289695a157b9260b674e3ee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Nov 2023 22:32:32 +0200 Subject: [PATCH 2132/2667] Nvim: add signcol plugin, change gitsigns keybinds --- home/.config/nvim/lua/plugins/gitsigns.lua | 13 ----------- home/.config/nvim/lua/plugins/statuscol.lua | 26 +++++++++++++++++++++ home/.config/nvim/lua/plugins/ufo.lua | 3 ++- 3 files changed, 28 insertions(+), 14 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/gitsigns.lua create mode 100644 home/.config/nvim/lua/plugins/statuscol.lua diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua deleted file mode 100644 index 557c23bc..00000000 --- a/home/.config/nvim/lua/plugins/gitsigns.lua +++ /dev/null @@ -1,13 +0,0 @@ --- Git status in signcolumn -return { - "lewis6991/gitsigns.nvim", - config = function() - local gitsigns = require("gitsigns") - gitsigns.setup() - - require("which-key").register({ - ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } }, - ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, - }) - end, -} diff --git a/home/.config/nvim/lua/plugins/statuscol.lua b/home/.config/nvim/lua/plugins/statuscol.lua new file mode 100644 index 00000000..1391671a --- /dev/null +++ b/home/.config/nvim/lua/plugins/statuscol.lua @@ -0,0 +1,26 @@ +return { + "luukvbaal/statuscol.nvim", + dependencies = { + { + "lewis6991/gitsigns.nvim", + opts = {}, + }, + }, + config = function() + local gitsigns = require("gitsigns") + require("which-key").register({ + ["["] = { c = { gitsigns.prev_hunk, "Previous hunk" } }, + ["]"] = { c = { gitsigns.next_hunk, "Next hunk" } }, + }) + + local builtin = require("statuscol.builtin") + require("statuscol").setup({ + relculright = true, + segments = { + { text = { builtin.foldfunc }, click = "v:lua.ScFa" }, + { text = { "%s" }, click = "v:lua.ScSa" }, + { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" }, + }, + }) + end, +} diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua index 780c7255..89eab7d1 100644 --- a/home/.config/nvim/lua/plugins/ufo.lua +++ b/home/.config/nvim/lua/plugins/ufo.lua @@ -2,6 +2,7 @@ return { "kevinhwang91/nvim-ufo", dependencies = { "kevinhwang91/promise-async" }, + ---@type UfoConfig opts = { close_fold_kinds = { "imports", @@ -17,7 +18,7 @@ return { -- Fold settings local o = vim.o - o.foldcolumn = "0" + o.foldcolumn = "1" o.foldlevel = 99 o.foldlevelstart = 99 o.foldenable = true From 6de4b65ab89e1e08427dc13524687224d5b5b4c2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Nov 2023 08:20:24 +0200 Subject: [PATCH 2133/2667] Don't install lazy-lock file --- config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.toml b/config.toml index 56a966e7..ad41ec03 100644 --- a/config.toml +++ b/config.toml @@ -36,7 +36,7 @@ src = ".config/imapnotify" [dotfiles.d_nvim] dst = "~/.config/nvim" src = ".config/nvim" -instignore = [""] +instignore = ["*/lazy-lock.json"] actions = ["kanagawa-compile"] [dotfiles.d_rofi] From 7b4f647d0a49e1ba6b4de9f63d4798586f029121 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Nov 2023 08:20:24 +0200 Subject: [PATCH 2134/2667] Don't install lazy-lock file --- config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.toml b/config.toml index 56a966e7..ad41ec03 100644 --- a/config.toml +++ b/config.toml @@ -36,7 +36,7 @@ src = ".config/imapnotify" [dotfiles.d_nvim] dst = "~/.config/nvim" src = ".config/nvim" -instignore = [""] +instignore = ["*/lazy-lock.json"] actions = ["kanagawa-compile"] [dotfiles.d_rofi] From f4c7e18482a2952ce56f5a0f6c4cab915d196e69 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Nov 2023 16:18:01 +0200 Subject: [PATCH 2135/2667] Nvim: confirm quit --- home/.config/nvim/lua/neovide.lua | 3 +++ home/.config/nvim/lua/plugins/confirm-quit.lua | 5 +++++ home/.config/nvim/lua/plugins/dashboard.lua | 1 - 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 home/.config/nvim/lua/plugins/confirm-quit.lua diff --git a/home/.config/nvim/lua/neovide.lua b/home/.config/nvim/lua/neovide.lua index d2c9d6ab..64ecc604 100644 --- a/home/.config/nvim/lua/neovide.lua +++ b/home/.config/nvim/lua/neovide.lua @@ -22,5 +22,8 @@ g.neovide_cursor_vfx_mode = "railgun" -- Enable dark/light theme detection g.neovide_theme = "auto" +-- Confirm quit +g.neovide_confirm_quit = true + -- Set font --o.guifont = "Hack Nerd Font Mono:h15" diff --git a/home/.config/nvim/lua/plugins/confirm-quit.lua b/home/.config/nvim/lua/plugins/confirm-quit.lua new file mode 100644 index 00000000..92173333 --- /dev/null +++ b/home/.config/nvim/lua/plugins/confirm-quit.lua @@ -0,0 +1,5 @@ +return { + "yutkat/confirm-quit.nvim", + event = "CmdlineEnter", + config = true, +} diff --git a/home/.config/nvim/lua/plugins/dashboard.lua b/home/.config/nvim/lua/plugins/dashboard.lua index cc526715..dab56e17 100644 --- a/home/.config/nvim/lua/plugins/dashboard.lua +++ b/home/.config/nvim/lua/plugins/dashboard.lua @@ -19,7 +19,6 @@ return { action = "Telescope find_files", key = "f", }, - { icon = "❌ ", desc = "Quit", action = "q", key = "q" }, }, }, }, From 825b49ad0609b674b021aba9e525673a43a9dba3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Nov 2023 16:18:01 +0200 Subject: [PATCH 2136/2667] Nvim: confirm quit --- home/.config/nvim/lua/neovide.lua | 3 +++ home/.config/nvim/lua/plugins/confirm-quit.lua | 5 +++++ home/.config/nvim/lua/plugins/dashboard.lua | 1 - 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 home/.config/nvim/lua/plugins/confirm-quit.lua diff --git a/home/.config/nvim/lua/neovide.lua b/home/.config/nvim/lua/neovide.lua index d2c9d6ab..64ecc604 100644 --- a/home/.config/nvim/lua/neovide.lua +++ b/home/.config/nvim/lua/neovide.lua @@ -22,5 +22,8 @@ g.neovide_cursor_vfx_mode = "railgun" -- Enable dark/light theme detection g.neovide_theme = "auto" +-- Confirm quit +g.neovide_confirm_quit = true + -- Set font --o.guifont = "Hack Nerd Font Mono:h15" diff --git a/home/.config/nvim/lua/plugins/confirm-quit.lua b/home/.config/nvim/lua/plugins/confirm-quit.lua new file mode 100644 index 00000000..92173333 --- /dev/null +++ b/home/.config/nvim/lua/plugins/confirm-quit.lua @@ -0,0 +1,5 @@ +return { + "yutkat/confirm-quit.nvim", + event = "CmdlineEnter", + config = true, +} diff --git a/home/.config/nvim/lua/plugins/dashboard.lua b/home/.config/nvim/lua/plugins/dashboard.lua index cc526715..dab56e17 100644 --- a/home/.config/nvim/lua/plugins/dashboard.lua +++ b/home/.config/nvim/lua/plugins/dashboard.lua @@ -19,7 +19,6 @@ return { action = "Telescope find_files", key = "f", }, - { icon = "❌ ", desc = "Quit", action = "q", key = "q" }, }, }, }, From 5d47465266882856e9b312ab9d1605ca27b1a6ac Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 23 Nov 2023 20:15:16 +0200 Subject: [PATCH 2137/2667] Nvim: add treesitter text objects --- home/.config/nvim/lua/plugins/statuscol.lua | 4 +- home/.config/nvim/lua/plugins/treesitter.lua | 160 ++++++++++++++----- 2 files changed, 118 insertions(+), 46 deletions(-) diff --git a/home/.config/nvim/lua/plugins/statuscol.lua b/home/.config/nvim/lua/plugins/statuscol.lua index 1391671a..8e0c947c 100644 --- a/home/.config/nvim/lua/plugins/statuscol.lua +++ b/home/.config/nvim/lua/plugins/statuscol.lua @@ -9,8 +9,8 @@ return { config = function() local gitsigns = require("gitsigns") require("which-key").register({ - ["["] = { c = { gitsigns.prev_hunk, "Previous hunk" } }, - ["]"] = { c = { gitsigns.next_hunk, "Next hunk" } }, + ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } }, + ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, }) local builtin = require("statuscol.builtin") diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index 7a04584e..35fc5328 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -1,48 +1,120 @@ return { - "nvim-treesitter/nvim-treesitter", - build = function() - require("nvim-treesitter.install").update({ with_sync = true }) - end, - ---@type TSConfig - opts = { - ensure_installed = { - "bash", - "css", - "dockerfile", - "git_config", - "git_rebase", - "gitattributes", - "gitcommit", - "gitignore", - "html", - "http", - "java", - "javascript", - "json", - "json5", - "latex", - "lua", - "make", - "markdown", - "markdown_inline", - "php", - "python", - "rasi", - "regex", - "rst", - "scss", - "toml", - "tsx", - "typescript", - "vim", - "yaml", + { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + init = function(plugin) + require("nvim-treesitter.install").update({ with_sync = true }) + end, + ---@type TSConfig + ---@diagnostic disable-next-line: missing-fields + opts = { + highlight = { enable = true }, + indent = { enable = true }, + ensure_installed = { + "bash", + "css", + "diff", + "dockerfile", + "git_config", + "git_rebase", + "gitattributes", + "gitcommit", + "gitignore", + "html", + "http", + "java", + "javascript", + "jsdoc", + "json", + "json5", + "jsonc", + "latex", + "lua", + "luadoc", + "luap", + "make", + "markdown", + "markdown_inline", + "php", + "python", + "query", + "rasi", + "regex", + "rst", + "scss", + "toml", + "tsx", + "typescript", + "vim", + "vimdoc", + "yaml", + }, + incremental_selection = { + enable = true, + keymaps = { + init_selection = "", + node_incremental = "", + scope_incremental = false, + node_decremental = "", + }, + }, + textobjects = { + move = { + enable = true, + goto_next_start = { ["]f"] = "@function.outer", ["]c"] = "@class.outer" }, + goto_next_end = { ["]F"] = "@function.outer", ["]C"] = "@class.outer" }, + goto_previous_start = { ["[f"] = "@function.outer", ["[c"] = "@class.outer" }, + goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer" }, + }, + }, }, - highlight = { enable = true }, - indent = { enable = true }, - incremental_selection = { enable = true }, - context_commentstring = { enable = true }, - sync_install = true, - ignore_install = {}, - auto_install = true, + ---@param opts TSConfig + config = function(_, opts) + if type(opts.ensure_installed) == "table" then + ---@type table + local added = {} + opts.ensure_installed = vim.tbl_filter(function(lang) + if added[lang] then + return false + end + added[lang] = true + return true + end, opts.ensure_installed) + end + require("nvim-treesitter.configs").setup(opts) + end, + dependencies = { + { + "nvim-treesitter/nvim-treesitter-textobjects", + config = function() + -- When in diff mode, we want to use the default + -- vim text objects c & C instead of the treesitter ones. + local move = require("nvim-treesitter.textobjects.move") ---@type table + local configs = require("nvim-treesitter.configs") + for name, fn in pairs(move) do + if name:find("goto") == 1 then + move[name] = function(q, ...) + if vim.wo.diff then + local config = configs.get_module("textobjects.move")[name] ---@type table + for key, query in pairs(config or {}) do + if q == query and key:find("[%]%[][cC]") then + vim.cmd("normal! " .. key) + return + end + end + end + return fn(q, ...) + end + end + end + end, + }, + }, + }, + + -- Automatically add closing tags for HTML and JSX + { + "windwp/nvim-ts-autotag", + opts = {}, }, } From 5a6cdb43d630eb31b74ef8f1295000711dc4e6e9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 23 Nov 2023 20:15:16 +0200 Subject: [PATCH 2138/2667] Nvim: add treesitter text objects --- home/.config/nvim/lua/plugins/statuscol.lua | 4 +- home/.config/nvim/lua/plugins/treesitter.lua | 160 ++++++++++++++----- 2 files changed, 118 insertions(+), 46 deletions(-) diff --git a/home/.config/nvim/lua/plugins/statuscol.lua b/home/.config/nvim/lua/plugins/statuscol.lua index 1391671a..8e0c947c 100644 --- a/home/.config/nvim/lua/plugins/statuscol.lua +++ b/home/.config/nvim/lua/plugins/statuscol.lua @@ -9,8 +9,8 @@ return { config = function() local gitsigns = require("gitsigns") require("which-key").register({ - ["["] = { c = { gitsigns.prev_hunk, "Previous hunk" } }, - ["]"] = { c = { gitsigns.next_hunk, "Next hunk" } }, + ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } }, + ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, }) local builtin = require("statuscol.builtin") diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index 7a04584e..35fc5328 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -1,48 +1,120 @@ return { - "nvim-treesitter/nvim-treesitter", - build = function() - require("nvim-treesitter.install").update({ with_sync = true }) - end, - ---@type TSConfig - opts = { - ensure_installed = { - "bash", - "css", - "dockerfile", - "git_config", - "git_rebase", - "gitattributes", - "gitcommit", - "gitignore", - "html", - "http", - "java", - "javascript", - "json", - "json5", - "latex", - "lua", - "make", - "markdown", - "markdown_inline", - "php", - "python", - "rasi", - "regex", - "rst", - "scss", - "toml", - "tsx", - "typescript", - "vim", - "yaml", + { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + init = function(plugin) + require("nvim-treesitter.install").update({ with_sync = true }) + end, + ---@type TSConfig + ---@diagnostic disable-next-line: missing-fields + opts = { + highlight = { enable = true }, + indent = { enable = true }, + ensure_installed = { + "bash", + "css", + "diff", + "dockerfile", + "git_config", + "git_rebase", + "gitattributes", + "gitcommit", + "gitignore", + "html", + "http", + "java", + "javascript", + "jsdoc", + "json", + "json5", + "jsonc", + "latex", + "lua", + "luadoc", + "luap", + "make", + "markdown", + "markdown_inline", + "php", + "python", + "query", + "rasi", + "regex", + "rst", + "scss", + "toml", + "tsx", + "typescript", + "vim", + "vimdoc", + "yaml", + }, + incremental_selection = { + enable = true, + keymaps = { + init_selection = "", + node_incremental = "", + scope_incremental = false, + node_decremental = "", + }, + }, + textobjects = { + move = { + enable = true, + goto_next_start = { ["]f"] = "@function.outer", ["]c"] = "@class.outer" }, + goto_next_end = { ["]F"] = "@function.outer", ["]C"] = "@class.outer" }, + goto_previous_start = { ["[f"] = "@function.outer", ["[c"] = "@class.outer" }, + goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer" }, + }, + }, }, - highlight = { enable = true }, - indent = { enable = true }, - incremental_selection = { enable = true }, - context_commentstring = { enable = true }, - sync_install = true, - ignore_install = {}, - auto_install = true, + ---@param opts TSConfig + config = function(_, opts) + if type(opts.ensure_installed) == "table" then + ---@type table + local added = {} + opts.ensure_installed = vim.tbl_filter(function(lang) + if added[lang] then + return false + end + added[lang] = true + return true + end, opts.ensure_installed) + end + require("nvim-treesitter.configs").setup(opts) + end, + dependencies = { + { + "nvim-treesitter/nvim-treesitter-textobjects", + config = function() + -- When in diff mode, we want to use the default + -- vim text objects c & C instead of the treesitter ones. + local move = require("nvim-treesitter.textobjects.move") ---@type table + local configs = require("nvim-treesitter.configs") + for name, fn in pairs(move) do + if name:find("goto") == 1 then + move[name] = function(q, ...) + if vim.wo.diff then + local config = configs.get_module("textobjects.move")[name] ---@type table + for key, query in pairs(config or {}) do + if q == query and key:find("[%]%[][cC]") then + vim.cmd("normal! " .. key) + return + end + end + end + return fn(q, ...) + end + end + end + end, + }, + }, + }, + + -- Automatically add closing tags for HTML and JSX + { + "windwp/nvim-ts-autotag", + opts = {}, }, } From 4c63f9ac60e2fa5184ceec7d5d96f5a4be42cb13 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 24 Nov 2023 21:52:58 +0200 Subject: [PATCH 2139/2667] Change neovide scale keybind to match terminal, CTRL+ and CTRL- --- home/.config/nvim/lua/neovide.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/neovide.lua b/home/.config/nvim/lua/neovide.lua index 64ecc604..df7970fb 100644 --- a/home/.config/nvim/lua/neovide.lua +++ b/home/.config/nvim/lua/neovide.lua @@ -1,12 +1,12 @@ local g = vim.g local o = vim.o --- Change scale factor with C= and C- +-- Change scale factor with C+ and C- g.neovide_scale_factor = {{@@ scale_factor|default(1.0) @@}} local change_scale_factor = function(delta) g.neovide_scale_factor = g.neovide_scale_factor * delta end -vim.keymap.set("n", "", function() +vim.keymap.set("n", "", function() change_scale_factor(1.25) end) vim.keymap.set("n", "", function() From c41260c67560143b71f6bdcc1693a057baed39cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 24 Nov 2023 21:52:58 +0200 Subject: [PATCH 2140/2667] Change neovide scale keybind to match terminal, CTRL+ and CTRL- --- home/.config/nvim/lua/neovide.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/neovide.lua b/home/.config/nvim/lua/neovide.lua index 64ecc604..df7970fb 100644 --- a/home/.config/nvim/lua/neovide.lua +++ b/home/.config/nvim/lua/neovide.lua @@ -1,12 +1,12 @@ local g = vim.g local o = vim.o --- Change scale factor with C= and C- +-- Change scale factor with C+ and C- g.neovide_scale_factor = {{@@ scale_factor|default(1.0) @@}} local change_scale_factor = function(delta) g.neovide_scale_factor = g.neovide_scale_factor * delta end -vim.keymap.set("n", "", function() +vim.keymap.set("n", "", function() change_scale_factor(1.25) end) vim.keymap.set("n", "", function() From cfb08c8ebd0cc45f2d1e72ea70113989076f74b0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 12:22:04 +0200 Subject: [PATCH 2141/2667] nvim-tree: follow opened files --- home/.config/nvim/lua/plugins/nvim-tree.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index ec9f895b..487a1def 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -10,6 +10,9 @@ return { renderer = { highlight_git = true, }, + update_focused_file = { + enable = true, + }, }, config = function(_, opts) require("nvim-tree").setup(opts) From 81f95c723119318e6692d31d1d16ce60eda8a521 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 12:22:04 +0200 Subject: [PATCH 2142/2667] nvim-tree: follow opened files --- home/.config/nvim/lua/plugins/nvim-tree.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index ec9f895b..487a1def 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -10,6 +10,9 @@ return { renderer = { highlight_git = true, }, + update_focused_file = { + enable = true, + }, }, config = function(_, opts) require("nvim-tree").setup(opts) From d90a73ab5aca0cb10c4ff515407fc46548c4b578 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:24:17 +0200 Subject: [PATCH 2143/2667] Nvim-tree: disable netrw as recommended and rework keymap --- home/.config/nvim/init.lua | 7 ++++++- home/.config/nvim/lua/plugins/nvim-tree.lua | 14 ++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 7d445664..005a91a3 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -15,4 +15,9 @@ vim.opt.rtp:prepend(lazypath) require("settings") require("neovide") require("highlight_yank") -require("lazy").setup("plugins") +require("lazy").setup({ + import = "plugins", + performance = { + disabled_plugins = { "netrwPlugin" }, + }, +}) diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index 487a1def..760c96f2 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -1,6 +1,7 @@ -- Tree explorer return { "kyazdani42/nvim-tree.lua", + lazy = false, dependencies = { "kyazdani42/nvim-web-devicons" }, opts = { diagnostics = { @@ -14,10 +15,11 @@ return { enable = true, }, }, - config = function(_, opts) - require("nvim-tree").setup(opts) - - -- Open/close with alt-o - vim.keymap.set("n", "", vim.cmd.NvimTreeToggle) - end, + keys = { + { + "o", + "NvimTreeToggle", + desc = "Open/close nvim-tree", + }, + }, } From abf58e5fbb5f064250aa72e8d70dc56e2c012c45 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:24:17 +0200 Subject: [PATCH 2144/2667] Nvim-tree: disable netrw as recommended and rework keymap --- home/.config/nvim/init.lua | 7 ++++++- home/.config/nvim/lua/plugins/nvim-tree.lua | 14 ++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 7d445664..005a91a3 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -15,4 +15,9 @@ vim.opt.rtp:prepend(lazypath) require("settings") require("neovide") require("highlight_yank") -require("lazy").setup("plugins") +require("lazy").setup({ + import = "plugins", + performance = { + disabled_plugins = { "netrwPlugin" }, + }, +}) diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index 487a1def..760c96f2 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -1,6 +1,7 @@ -- Tree explorer return { "kyazdani42/nvim-tree.lua", + lazy = false, dependencies = { "kyazdani42/nvim-web-devicons" }, opts = { diagnostics = { @@ -14,10 +15,11 @@ return { enable = true, }, }, - config = function(_, opts) - require("nvim-tree").setup(opts) - - -- Open/close with alt-o - vim.keymap.set("n", "", vim.cmd.NvimTreeToggle) - end, + keys = { + { + "o", + "NvimTreeToggle", + desc = "Open/close nvim-tree", + }, + }, } From 406e8e2bbc9f0ce7113deb6a696aacbc1b3bd205 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:24:48 +0200 Subject: [PATCH 2145/2667] Add LSP file operations plugin --- home/.config/nvim/lua/plugins/mason.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 037851aa..8624cea5 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -8,6 +8,8 @@ return { "WhoIsSethDaniel/mason-tool-installer.nvim", -- Extended functionality for jdtls "mfussenegger/nvim-jdtls", + -- Add support for LSP file operations + { "antosha417/nvim-lsp-file-operations", config = true }, }, config = function() require("mason").setup() From 6d53b138513ba942a47d5218a6544d83be6e9f98 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:24:48 +0200 Subject: [PATCH 2146/2667] Add LSP file operations plugin --- home/.config/nvim/lua/plugins/mason.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 037851aa..8624cea5 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -8,6 +8,8 @@ return { "WhoIsSethDaniel/mason-tool-installer.nvim", -- Extended functionality for jdtls "mfussenegger/nvim-jdtls", + -- Add support for LSP file operations + { "antosha417/nvim-lsp-file-operations", config = true }, }, config = function() require("mason").setup() From ef0c42e610c18269a90338e927424791e6cc1ae4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:31:24 +0200 Subject: [PATCH 2147/2667] Remove unused plugin --- home/.config/nvim/lua/plugins/mini.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/mini.lua b/home/.config/nvim/lua/plugins/mini.lua index 616caba0..6484a365 100644 --- a/home/.config/nvim/lua/plugins/mini.lua +++ b/home/.config/nvim/lua/plugins/mini.lua @@ -5,6 +5,5 @@ return { config = function() require("mini.surround").setup() require("mini.comment").setup() - require("mini.files").setup() end, } From 448a5657528cac87b8df0f65a7f9a4a7b0fb4a95 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:31:24 +0200 Subject: [PATCH 2148/2667] Remove unused plugin --- home/.config/nvim/lua/plugins/mini.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/mini.lua b/home/.config/nvim/lua/plugins/mini.lua index 616caba0..6484a365 100644 --- a/home/.config/nvim/lua/plugins/mini.lua +++ b/home/.config/nvim/lua/plugins/mini.lua @@ -5,6 +5,5 @@ return { config = function() require("mini.surround").setup() require("mini.comment").setup() - require("mini.files").setup() end, } From 024fad6bafa0521ac48c91f4954199a08716e4c3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:32:42 +0200 Subject: [PATCH 2149/2667] Nvim: mason config cleanup --- home/.config/nvim/lua/plugins/mason.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 8624cea5..a0df4b2c 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -16,7 +16,6 @@ return { local mason_lsp = require("mason-lspconfig") local lsp_utils = require("lsp_utils") - local capabilities = lsp_utils.get_capabilities() mason_lsp.setup() mason_lsp.setup_handlers({ @@ -24,7 +23,7 @@ return { function(server_name) require("lspconfig")[server_name].setup({ on_attach = lsp_utils.on_attach, - capabilities = capabilities, + capabilities = lsp_utils.get_capabilities(), }) end, From a88e6d2a8af39d5d31edc9edd01e207a99ccead7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:32:42 +0200 Subject: [PATCH 2150/2667] Nvim: mason config cleanup --- home/.config/nvim/lua/plugins/mason.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 8624cea5..a0df4b2c 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -16,7 +16,6 @@ return { local mason_lsp = require("mason-lspconfig") local lsp_utils = require("lsp_utils") - local capabilities = lsp_utils.get_capabilities() mason_lsp.setup() mason_lsp.setup_handlers({ @@ -24,7 +23,7 @@ return { function(server_name) require("lspconfig")[server_name].setup({ on_attach = lsp_utils.on_attach, - capabilities = capabilities, + capabilities = lsp_utils.get_capabilities(), }) end, From 71cfebbf64cf3d28bd67bc4955becd6d56b5e516 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:44:23 +0200 Subject: [PATCH 2151/2667] Nvim: Remap type definition --- home/.config/nvim/lua/lsp_utils.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua index 6fbb3004..0cc18f8f 100644 --- a/home/.config/nvim/lua/lsp_utils.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -11,6 +11,7 @@ local function map_keys() name = "Go to", d = { telescope_builtin.lsp_definitions, "Definition" }, D = { vim.lsp.buf.declaration, "Declaration" }, + t = { vim.lsp.buf.type_definition, "Type definition" }, i = { telescope_builtin.lsp_implementations, "Implementation" }, r = { telescope_builtin.lsp_references, "References" }, s = { telescope_builtin.lsp_document_symbols, "Symbols" }, @@ -29,7 +30,6 @@ local function map_keys() }, }, k = { vim.lsp.buf.signature_help, "Signature help" }, - D = { vim.lsp.buf.type_definition, "Type definition" }, rn = { vim.lsp.buf.rename, "Rename symbol" }, ca = { vim.lsp.buf.code_action, "Code action" }, e = { vim.diagnostic.open_float, "Open diagnostics" }, From 527ee2093fc04f1d698873728585d9039e4edb18 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:44:23 +0200 Subject: [PATCH 2152/2667] Nvim: Remap type definition --- home/.config/nvim/lua/lsp_utils.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua index 6fbb3004..0cc18f8f 100644 --- a/home/.config/nvim/lua/lsp_utils.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -11,6 +11,7 @@ local function map_keys() name = "Go to", d = { telescope_builtin.lsp_definitions, "Definition" }, D = { vim.lsp.buf.declaration, "Declaration" }, + t = { vim.lsp.buf.type_definition, "Type definition" }, i = { telescope_builtin.lsp_implementations, "Implementation" }, r = { telescope_builtin.lsp_references, "References" }, s = { telescope_builtin.lsp_document_symbols, "Symbols" }, @@ -29,7 +30,6 @@ local function map_keys() }, }, k = { vim.lsp.buf.signature_help, "Signature help" }, - D = { vim.lsp.buf.type_definition, "Type definition" }, rn = { vim.lsp.buf.rename, "Rename symbol" }, ca = { vim.lsp.buf.code_action, "Code action" }, e = { vim.diagnostic.open_float, "Open diagnostics" }, From 68a73c417e6255434cd3dee47cf7b14da704d4d1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:53:48 +0200 Subject: [PATCH 2153/2667] Move neodev to be mason's dependency This resolves neodev sometimes not working --- home/.config/nvim/lua/plugins/mason.lua | 14 ++++++++++++++ home/.config/nvim/lua/plugins/neodev.lua | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/neodev.lua diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index a0df4b2c..6e1cedf2 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -10,6 +10,20 @@ return { "mfussenegger/nvim-jdtls", -- Add support for LSP file operations { "antosha417/nvim-lsp-file-operations", config = true }, + -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. + { + "folke/neodev.nvim", + ---@type LuaDevOptions + opts = { + override = function(root_dir, library) + local dotfiles_path = tostring(vim.fn.expand("~/git/dotfiles")) + if string.find(root_dir, dotfiles_path, 1, true) then + library.enabled = true + library.plugins = true + end + end, + }, + }, }, config = function() require("mason").setup() diff --git a/home/.config/nvim/lua/plugins/neodev.lua b/home/.config/nvim/lua/plugins/neodev.lua deleted file mode 100644 index e6532e8c..00000000 --- a/home/.config/nvim/lua/plugins/neodev.lua +++ /dev/null @@ -1,14 +0,0 @@ -return { - -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. - "folke/neodev.nvim", - ---@type LuaDevOptions - opts = { - override = function(root_dir, library) - local dotfiles_path = tostring(vim.fn.expand("~/git/dotfiles")) - if string.find(root_dir, dotfiles_path, 1, true) then - library.enabled = true - library.plugins = true - end - end, - }, -} From aedf8972559abd1fd0c6447c483bd3b48bf1b732 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:53:48 +0200 Subject: [PATCH 2154/2667] Move neodev to be mason's dependency This resolves neodev sometimes not working --- home/.config/nvim/lua/plugins/mason.lua | 14 ++++++++++++++ home/.config/nvim/lua/plugins/neodev.lua | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/neodev.lua diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index a0df4b2c..6e1cedf2 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -10,6 +10,20 @@ return { "mfussenegger/nvim-jdtls", -- Add support for LSP file operations { "antosha417/nvim-lsp-file-operations", config = true }, + -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. + { + "folke/neodev.nvim", + ---@type LuaDevOptions + opts = { + override = function(root_dir, library) + local dotfiles_path = tostring(vim.fn.expand("~/git/dotfiles")) + if string.find(root_dir, dotfiles_path, 1, true) then + library.enabled = true + library.plugins = true + end + end, + }, + }, }, config = function() require("mason").setup() diff --git a/home/.config/nvim/lua/plugins/neodev.lua b/home/.config/nvim/lua/plugins/neodev.lua deleted file mode 100644 index e6532e8c..00000000 --- a/home/.config/nvim/lua/plugins/neodev.lua +++ /dev/null @@ -1,14 +0,0 @@ -return { - -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. - "folke/neodev.nvim", - ---@type LuaDevOptions - opts = { - override = function(root_dir, library) - local dotfiles_path = tostring(vim.fn.expand("~/git/dotfiles")) - if string.find(root_dir, dotfiles_path, 1, true) then - library.enabled = true - library.plugins = true - end - end, - }, -} From 0982ebf3349f62e060954f3ae4c9a880a7e4e17b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 14:13:26 +0200 Subject: [PATCH 2155/2667] Move plugin keymaps to lazy keys option --- home/.config/nvim/lua/plugins/neoformat.lua | 12 ++++--- home/.config/nvim/lua/plugins/noice.lua | 19 ++++------ home/.config/nvim/lua/plugins/nvim-tree.lua | 2 +- home/.config/nvim/lua/plugins/statuscol.lua | 2 +- home/.config/nvim/lua/plugins/telescope.lua | 38 ++++++++++++-------- home/.config/nvim/lua/plugins/treesitter.lua | 4 ++- home/.config/nvim/lua/plugins/which-key.lua | 7 ++-- 7 files changed, 46 insertions(+), 38 deletions(-) diff --git a/home/.config/nvim/lua/plugins/neoformat.lua b/home/.config/nvim/lua/plugins/neoformat.lua index 988eef3d..cc63e231 100644 --- a/home/.config/nvim/lua/plugins/neoformat.lua +++ b/home/.config/nvim/lua/plugins/neoformat.lua @@ -1,9 +1,11 @@ -- Formatter plugin return { "sbdchd/neoformat", - config = function() - require("which-key").register({ - f = { "Neoformat", "Format with Neoformat" }, - }, { prefix = "" }) - end, + keys = { + { + desc = "Format with Neoformat", + "f", + "Neoformat", + }, + }, } diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua index d4dbcaff..cf869a84 100644 --- a/home/.config/nvim/lua/plugins/noice.lua +++ b/home/.config/nvim/lua/plugins/noice.lua @@ -19,16 +19,11 @@ return { lsp_doc_border = true, }, }, - config = function(_, opts) - require("noice").setup(opts) - - require("which-key").register({ - d = { - function() - vim.cmd("NoiceDismiss") - end, - "Dismiss notifications", - }, - }, { prefix = "" }) - end, + keys = { + { + desc = "Dismiss notifications", + "d", + "NoiceDismiss", + }, + }, } diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index 760c96f2..8646ec40 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -17,9 +17,9 @@ return { }, keys = { { + desc = "Open/close nvim-tree", "o", "NvimTreeToggle", - desc = "Open/close nvim-tree", }, }, } diff --git a/home/.config/nvim/lua/plugins/statuscol.lua b/home/.config/nvim/lua/plugins/statuscol.lua index 8e0c947c..05d010c2 100644 --- a/home/.config/nvim/lua/plugins/statuscol.lua +++ b/home/.config/nvim/lua/plugins/statuscol.lua @@ -3,7 +3,7 @@ return { dependencies = { { "lewis6991/gitsigns.nvim", - opts = {}, + config = true, }, }, config = function() diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index b1f877e5..70d4dd67 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -54,27 +54,35 @@ return { }, }, }, + keys = { + { + desc = "Open Telescope", + "", + "Telescope", + }, + { + desc = "Change directories", + "cd", + "Telescope cder", + }, + { + desc = "Find files", + "", + "Telescope find_files", + }, + { + desc = "Grep files", + "", + "Telescope live_grep", + }, + }, config = function(_, opts) local telescope = require("telescope") telescope.setup(opts) - -- Add extensions + -- Load extensions telescope.load_extension("fzf") telescope.load_extension("ui-select") telescope.load_extension("cder") - - -- Keybinds - local builtin = require("telescope.builtin") - require("which-key").register({ - cd = { - function() - vim.cmd("Telescope cder") - end, - "Change directories", - }, - [""] = { vim.cmd.Telescope, "Open Telescope" }, - [""] = { builtin.find_files, "Telescope find files" }, - [""] = { builtin.live_grep, "Telescope live grep" }, - }) end, } diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index 35fc5328..71c5d00a 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -3,7 +3,9 @@ return { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", init = function(plugin) - require("nvim-treesitter.install").update({ with_sync = true }) + require("nvim-treesitter.install").update({ + with_sync = true, + }) end, ---@type TSConfig ---@diagnostic disable-next-line: missing-fields diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 643b2c75..51c22265 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -1,4 +1,5 @@ -- Display possible keybinds +-- Here I have also defined some generic keybinds -- Plugin specific keybinds are set up in plugin configuration file return { "folke/which-key.nvim", @@ -7,12 +8,12 @@ return { wk.setup() wk.register({ - h = { "nohlsearch", "Turn off search highlight" }, + h = { "nohlsearch", "Turn off search highlight" }, }, { prefix = "" }) wk.register({ - [""] = { "bnext", "Next buffer" }, - [""] = { "bprevious", "Previous buffer" }, + [""] = { "bnext", "Next buffer" }, + [""] = { "bprevious", "Previous buffer" }, }) -- Exit terminal insert mode with esc From fac0494df89be4dfd795c9e72b48f274cf2f75fe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 14:13:26 +0200 Subject: [PATCH 2156/2667] Move plugin keymaps to lazy keys option --- home/.config/nvim/lua/plugins/neoformat.lua | 12 ++++--- home/.config/nvim/lua/plugins/noice.lua | 19 ++++------ home/.config/nvim/lua/plugins/nvim-tree.lua | 2 +- home/.config/nvim/lua/plugins/statuscol.lua | 2 +- home/.config/nvim/lua/plugins/telescope.lua | 38 ++++++++++++-------- home/.config/nvim/lua/plugins/treesitter.lua | 4 ++- home/.config/nvim/lua/plugins/which-key.lua | 7 ++-- 7 files changed, 46 insertions(+), 38 deletions(-) diff --git a/home/.config/nvim/lua/plugins/neoformat.lua b/home/.config/nvim/lua/plugins/neoformat.lua index 988eef3d..cc63e231 100644 --- a/home/.config/nvim/lua/plugins/neoformat.lua +++ b/home/.config/nvim/lua/plugins/neoformat.lua @@ -1,9 +1,11 @@ -- Formatter plugin return { "sbdchd/neoformat", - config = function() - require("which-key").register({ - f = { "Neoformat", "Format with Neoformat" }, - }, { prefix = "" }) - end, + keys = { + { + desc = "Format with Neoformat", + "f", + "Neoformat", + }, + }, } diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua index d4dbcaff..cf869a84 100644 --- a/home/.config/nvim/lua/plugins/noice.lua +++ b/home/.config/nvim/lua/plugins/noice.lua @@ -19,16 +19,11 @@ return { lsp_doc_border = true, }, }, - config = function(_, opts) - require("noice").setup(opts) - - require("which-key").register({ - d = { - function() - vim.cmd("NoiceDismiss") - end, - "Dismiss notifications", - }, - }, { prefix = "" }) - end, + keys = { + { + desc = "Dismiss notifications", + "d", + "NoiceDismiss", + }, + }, } diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index 760c96f2..8646ec40 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -17,9 +17,9 @@ return { }, keys = { { + desc = "Open/close nvim-tree", "o", "NvimTreeToggle", - desc = "Open/close nvim-tree", }, }, } diff --git a/home/.config/nvim/lua/plugins/statuscol.lua b/home/.config/nvim/lua/plugins/statuscol.lua index 8e0c947c..05d010c2 100644 --- a/home/.config/nvim/lua/plugins/statuscol.lua +++ b/home/.config/nvim/lua/plugins/statuscol.lua @@ -3,7 +3,7 @@ return { dependencies = { { "lewis6991/gitsigns.nvim", - opts = {}, + config = true, }, }, config = function() diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index b1f877e5..70d4dd67 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -54,27 +54,35 @@ return { }, }, }, + keys = { + { + desc = "Open Telescope", + "", + "Telescope", + }, + { + desc = "Change directories", + "cd", + "Telescope cder", + }, + { + desc = "Find files", + "", + "Telescope find_files", + }, + { + desc = "Grep files", + "", + "Telescope live_grep", + }, + }, config = function(_, opts) local telescope = require("telescope") telescope.setup(opts) - -- Add extensions + -- Load extensions telescope.load_extension("fzf") telescope.load_extension("ui-select") telescope.load_extension("cder") - - -- Keybinds - local builtin = require("telescope.builtin") - require("which-key").register({ - cd = { - function() - vim.cmd("Telescope cder") - end, - "Change directories", - }, - [""] = { vim.cmd.Telescope, "Open Telescope" }, - [""] = { builtin.find_files, "Telescope find files" }, - [""] = { builtin.live_grep, "Telescope live grep" }, - }) end, } diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index 35fc5328..71c5d00a 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -3,7 +3,9 @@ return { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", init = function(plugin) - require("nvim-treesitter.install").update({ with_sync = true }) + require("nvim-treesitter.install").update({ + with_sync = true, + }) end, ---@type TSConfig ---@diagnostic disable-next-line: missing-fields diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 643b2c75..51c22265 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -1,4 +1,5 @@ -- Display possible keybinds +-- Here I have also defined some generic keybinds -- Plugin specific keybinds are set up in plugin configuration file return { "folke/which-key.nvim", @@ -7,12 +8,12 @@ return { wk.setup() wk.register({ - h = { "nohlsearch", "Turn off search highlight" }, + h = { "nohlsearch", "Turn off search highlight" }, }, { prefix = "" }) wk.register({ - [""] = { "bnext", "Next buffer" }, - [""] = { "bprevious", "Previous buffer" }, + [""] = { "bnext", "Next buffer" }, + [""] = { "bprevious", "Previous buffer" }, }) -- Exit terminal insert mode with esc From d2112451a7fc3478b3139a913a58a2fc209d8364 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 14:17:43 +0200 Subject: [PATCH 2157/2667] Rename dap config --- home/.config/nvim/lua/plugins/{dap.lua => nvim-dap.lua} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename home/.config/nvim/lua/plugins/{dap.lua => nvim-dap.lua} (100%) diff --git a/home/.config/nvim/lua/plugins/dap.lua b/home/.config/nvim/lua/plugins/nvim-dap.lua similarity index 100% rename from home/.config/nvim/lua/plugins/dap.lua rename to home/.config/nvim/lua/plugins/nvim-dap.lua From 7bd4c6e93e376afae3a752453a20cc280d312219 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 14:17:43 +0200 Subject: [PATCH 2158/2667] Rename dap config --- home/.config/nvim/lua/plugins/{dap.lua => nvim-dap.lua} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename home/.config/nvim/lua/plugins/{dap.lua => nvim-dap.lua} (100%) diff --git a/home/.config/nvim/lua/plugins/dap.lua b/home/.config/nvim/lua/plugins/nvim-dap.lua similarity index 100% rename from home/.config/nvim/lua/plugins/dap.lua rename to home/.config/nvim/lua/plugins/nvim-dap.lua From 9e591464ce09b45b460039a77b5a36eda28027a9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 14:37:36 +0200 Subject: [PATCH 2159/2667] Add type annotations to plugin specs --- home/.config/nvim/lua/plugins/asciidoc.lua | 2 ++ home/.config/nvim/lua/plugins/autopairs.lua | 1 + home/.config/nvim/lua/plugins/bufferline.lua | 4 +++- home/.config/nvim/lua/plugins/caddyfile.lua | 1 + home/.config/nvim/lua/plugins/cmp.lua | 1 + .../.config/nvim/lua/plugins/confirm-quit.lua | 2 ++ home/.config/nvim/lua/plugins/copilot.lua | 1 + home/.config/nvim/lua/plugins/dashboard.lua | 1 + home/.config/nvim/lua/plugins/dropbar.lua | 2 ++ home/.config/nvim/lua/plugins/firenvim.lua | 1 + home/.config/nvim/lua/plugins/fugitive.lua | 1 + home/.config/nvim/lua/plugins/gnupg.lua | 1 + .../nvim/lua/plugins/indent-blankline.lua | 3 ++- home/.config/nvim/lua/plugins/kanagawa.lua | 4 +++- home/.config/nvim/lua/plugins/lualine.lua | 1 + home/.config/nvim/lua/plugins/luasnip.lua | 1 + .../nvim/lua/plugins/markdown-preview.lua | 1 + home/.config/nvim/lua/plugins/mason.lua | 3 ++- home/.config/nvim/lua/plugins/mini.lua | 1 + home/.config/nvim/lua/plugins/neoformat.lua | 1 + home/.config/nvim/lua/plugins/noice.lua | 3 ++- .../nvim/lua/plugins/nvim-colorizer.lua | 1 + home/.config/nvim/lua/plugins/nvim-dap.lua | 2 ++ home/.config/nvim/lua/plugins/nvim-tree.lua | 1 + home/.config/nvim/lua/plugins/redact_pass.lua | 1 + home/.config/nvim/lua/plugins/statuscol.lua | 2 ++ home/.config/nvim/lua/plugins/suda.lua | 1 + home/.config/nvim/lua/plugins/telescope.lua | 1 + home/.config/nvim/lua/plugins/treesitter.lua | 20 +++++++++++-------- home/.config/nvim/lua/plugins/ufo.lua | 4 +++- home/.config/nvim/lua/plugins/which-key.lua | 1 + 31 files changed, 56 insertions(+), 14 deletions(-) diff --git a/home/.config/nvim/lua/plugins/asciidoc.lua b/home/.config/nvim/lua/plugins/asciidoc.lua index 7e4a139d..d723b3fc 100644 --- a/home/.config/nvim/lua/plugins/asciidoc.lua +++ b/home/.config/nvim/lua/plugins/asciidoc.lua @@ -1,11 +1,13 @@ -- AsciiDoc plugins are grouped together here return { -- Vim ♥️ Asciidoctor + --- @type LazyPluginSpec { "habamax/vim-asciidoctor", ft = { "asciidoctor", "asciidoc" }, }, -- AsciiDoc preview + --- @type LazyPluginSpec { "tigion/nvim-asciidoc-preview", ft = { "asciidoctor", "asciidoc" }, diff --git a/home/.config/nvim/lua/plugins/autopairs.lua b/home/.config/nvim/lua/plugins/autopairs.lua index f9886b56..cde6d85c 100644 --- a/home/.config/nvim/lua/plugins/autopairs.lua +++ b/home/.config/nvim/lua/plugins/autopairs.lua @@ -1,4 +1,5 @@ -- Automatic brackets +--- @type LazyPluginSpec return { "windwp/nvim-autopairs", config = true diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua index f6b42c4c..815f79c3 100644 --- a/home/.config/nvim/lua/plugins/bufferline.lua +++ b/home/.config/nvim/lua/plugins/bufferline.lua @@ -1,8 +1,10 @@ +-- Bufferline +--- @type LazyPluginSpec return { "akinsho/bufferline.nvim", version = "*", dependencies = { "kyazdani42/nvim-web-devicons" }, - ---@type BufferlineConfig + --- @type BufferlineConfig opts = { options = { diagnostics = "nvim_lsp", diff --git a/home/.config/nvim/lua/plugins/caddyfile.lua b/home/.config/nvim/lua/plugins/caddyfile.lua index 89db6b59..ec4c5273 100644 --- a/home/.config/nvim/lua/plugins/caddyfile.lua +++ b/home/.config/nvim/lua/plugins/caddyfile.lua @@ -1,4 +1,5 @@ -- Caddyfile syntax support +--- @type LazyPluginSpec return { "isobit/vim-caddyfile", ft = "caddyfile", diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 2eaf53b5..cfa81823 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -1,4 +1,5 @@ -- Autoompletion +--- @type LazyPluginSpec return { "hrsh7th/nvim-cmp", dependencies = { diff --git a/home/.config/nvim/lua/plugins/confirm-quit.lua b/home/.config/nvim/lua/plugins/confirm-quit.lua index 92173333..0c6302f7 100644 --- a/home/.config/nvim/lua/plugins/confirm-quit.lua +++ b/home/.config/nvim/lua/plugins/confirm-quit.lua @@ -1,3 +1,5 @@ +-- Confirm before quit +--- @type LazyPluginSpec return { "yutkat/confirm-quit.nvim", event = "CmdlineEnter", diff --git a/home/.config/nvim/lua/plugins/copilot.lua b/home/.config/nvim/lua/plugins/copilot.lua index e933120b..c1b6a3ed 100644 --- a/home/.config/nvim/lua/plugins/copilot.lua +++ b/home/.config/nvim/lua/plugins/copilot.lua @@ -1,4 +1,5 @@ -- GitHub Copilot +--- @type LazyPluginSpec return { "zbirenbaum/copilot.lua", opts = { diff --git a/home/.config/nvim/lua/plugins/dashboard.lua b/home/.config/nvim/lua/plugins/dashboard.lua index dab56e17..5aa8583b 100644 --- a/home/.config/nvim/lua/plugins/dashboard.lua +++ b/home/.config/nvim/lua/plugins/dashboard.lua @@ -1,4 +1,5 @@ -- Startup dashboard +--- @type LazyPluginSpec return { "glepnir/dashboard-nvim", event = "VimEnter", diff --git a/home/.config/nvim/lua/plugins/dropbar.lua b/home/.config/nvim/lua/plugins/dropbar.lua index 72a95171..228a2619 100644 --- a/home/.config/nvim/lua/plugins/dropbar.lua +++ b/home/.config/nvim/lua/plugins/dropbar.lua @@ -1,3 +1,5 @@ +-- Show the current LSP context in winbar +--- @type LazyPluginSpec return { "Bekaboo/dropbar.nvim", } diff --git a/home/.config/nvim/lua/plugins/firenvim.lua b/home/.config/nvim/lua/plugins/firenvim.lua index 507031e8..dba55753 100644 --- a/home/.config/nvim/lua/plugins/firenvim.lua +++ b/home/.config/nvim/lua/plugins/firenvim.lua @@ -1,4 +1,5 @@ -- Neovim inside Firefox +--- @type LazyPluginSpec return { "glacambre/firenvim", build = function() diff --git a/home/.config/nvim/lua/plugins/fugitive.lua b/home/.config/nvim/lua/plugins/fugitive.lua index 58030d28..24d58a49 100644 --- a/home/.config/nvim/lua/plugins/fugitive.lua +++ b/home/.config/nvim/lua/plugins/fugitive.lua @@ -1,2 +1,3 @@ -- Git commands +--- @type LazyPluginSpec return { "tpope/vim-fugitive" } diff --git a/home/.config/nvim/lua/plugins/gnupg.lua b/home/.config/nvim/lua/plugins/gnupg.lua index ec6d6346..4da3d9d8 100644 --- a/home/.config/nvim/lua/plugins/gnupg.lua +++ b/home/.config/nvim/lua/plugins/gnupg.lua @@ -1,4 +1,5 @@ -- Edit GPG encrypted files transparently +--- @type LazyPluginSpec return { "jamessan/vim-gnupg", ft = { "gpg" }, diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index 9aca163f..c9c0d2ad 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,7 +1,8 @@ -- Indent characters +--- @type LazyPluginSpec return { "lukas-reineke/indent-blankline.nvim", - ---@type ibl.config + --- @type ibl.config opts = { exclude = { filetypes = { diff --git a/home/.config/nvim/lua/plugins/kanagawa.lua b/home/.config/nvim/lua/plugins/kanagawa.lua index cba20994..1cc595ab 100644 --- a/home/.config/nvim/lua/plugins/kanagawa.lua +++ b/home/.config/nvim/lua/plugins/kanagawa.lua @@ -1,7 +1,8 @@ -- Colorscheme +--- @type LazyPluginSpec return { "rebelot/kanagawa.nvim", - ---@type KanagawaConfig + --- @type KanagawaConfig opts = { compile = true, dimInactive = true, @@ -46,6 +47,7 @@ return { } end, }, + --- @param opts KanagawaConfig config = function(_, opts) require("kanagawa").setup(opts) vim.cmd("colorscheme kanagawa") diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 735d7938..895b9e87 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1,4 +1,5 @@ -- Statusline +--- @type LazyPluginSpec return { "nvim-lualine/lualine.nvim", dependencies = { "kyazdani42/nvim-web-devicons" }, diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index ad186108..ade105cd 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -1,4 +1,5 @@ -- Snippets plugin +--- @type LazyPluginSpec return { "L3MON4D3/LuaSnip", -- Snippets collection diff --git a/home/.config/nvim/lua/plugins/markdown-preview.lua b/home/.config/nvim/lua/plugins/markdown-preview.lua index 2350979d..731496ab 100644 --- a/home/.config/nvim/lua/plugins/markdown-preview.lua +++ b/home/.config/nvim/lua/plugins/markdown-preview.lua @@ -1,4 +1,5 @@ -- Markdown preview +--- @type LazyPluginSpec return { "iamcco/markdown-preview.nvim", build = "cd app && yarn install", diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 6e1cedf2..6ab9028b 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -1,5 +1,6 @@ -- Package manager for LSP servers, DAP adapters etc. -- It also handles starting all of my LSP servers +--- @type LazyPluginSpec return { "williamboman/mason.nvim", dependencies = { @@ -13,7 +14,7 @@ return { -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. { "folke/neodev.nvim", - ---@type LuaDevOptions + --- @type LuaDevOptions opts = { override = function(root_dir, library) local dotfiles_path = tostring(vim.fn.expand("~/git/dotfiles")) diff --git a/home/.config/nvim/lua/plugins/mini.lua b/home/.config/nvim/lua/plugins/mini.lua index 6484a365..7482c037 100644 --- a/home/.config/nvim/lua/plugins/mini.lua +++ b/home/.config/nvim/lua/plugins/mini.lua @@ -1,4 +1,5 @@ -- Library of 30+ independent Lua modules improving overall Neovim +--- @type LazyPluginSpec return { "echasnovski/mini.nvim", version = "*", diff --git a/home/.config/nvim/lua/plugins/neoformat.lua b/home/.config/nvim/lua/plugins/neoformat.lua index cc63e231..1bdc479a 100644 --- a/home/.config/nvim/lua/plugins/neoformat.lua +++ b/home/.config/nvim/lua/plugins/neoformat.lua @@ -1,4 +1,5 @@ -- Formatter plugin +--- @type LazyPluginSpec return { "sbdchd/neoformat", keys = { diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua index cf869a84..1de8aae2 100644 --- a/home/.config/nvim/lua/plugins/noice.lua +++ b/home/.config/nvim/lua/plugins/noice.lua @@ -1,10 +1,11 @@ -- Replace much of neovim's default UI -- with a modern replacement +--- @type LazyPluginSpec return { "folke/noice.nvim", event = "VeryLazy", dependencies = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify" }, - ---@type NoiceConfig + --- @type NoiceConfig opts = { lsp = { -- override markdown rendering so that **cmp** and other plugins use **Treesitter** diff --git a/home/.config/nvim/lua/plugins/nvim-colorizer.lua b/home/.config/nvim/lua/plugins/nvim-colorizer.lua index 05ac1448..ce3131d5 100644 --- a/home/.config/nvim/lua/plugins/nvim-colorizer.lua +++ b/home/.config/nvim/lua/plugins/nvim-colorizer.lua @@ -1,4 +1,5 @@ -- High performance color highlighter +--- @type LazyPluginSpec return { "norcalli/nvim-colorizer.lua", config = true, diff --git a/home/.config/nvim/lua/plugins/nvim-dap.lua b/home/.config/nvim/lua/plugins/nvim-dap.lua index 9e2fce70..04b8ec6b 100644 --- a/home/.config/nvim/lua/plugins/nvim-dap.lua +++ b/home/.config/nvim/lua/plugins/nvim-dap.lua @@ -1,3 +1,5 @@ +-- Debug adapter for NeoVim +--- @type LazyPluginSpec return { "mfussenegger/nvim-dap", config = function() diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index 8646ec40..bacd3a97 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -1,4 +1,5 @@ -- Tree explorer +--- @type LazyPluginSpec return { "kyazdani42/nvim-tree.lua", lazy = false, diff --git a/home/.config/nvim/lua/plugins/redact_pass.lua b/home/.config/nvim/lua/plugins/redact_pass.lua index 3ac5d314..984de136 100644 --- a/home/.config/nvim/lua/plugins/redact_pass.lua +++ b/home/.config/nvim/lua/plugins/redact_pass.lua @@ -1,4 +1,5 @@ -- Make editing passwords safer +--- @type LazyPluginSpec return { "https://git.zx2c4.com/password-store", config = function(plugin) diff --git a/home/.config/nvim/lua/plugins/statuscol.lua b/home/.config/nvim/lua/plugins/statuscol.lua index 05d010c2..38a75a5a 100644 --- a/home/.config/nvim/lua/plugins/statuscol.lua +++ b/home/.config/nvim/lua/plugins/statuscol.lua @@ -1,3 +1,5 @@ +-- Customize statuscolumn +--- @type LazyPluginSpec return { "luukvbaal/statuscol.nvim", dependencies = { diff --git a/home/.config/nvim/lua/plugins/suda.lua b/home/.config/nvim/lua/plugins/suda.lua index cb7a4b50..e02bd3ae 100644 --- a/home/.config/nvim/lua/plugins/suda.lua +++ b/home/.config/nvim/lua/plugins/suda.lua @@ -1,2 +1,3 @@ -- Do stuff as sudo +--- @type LazyPluginSpec return { "lambdalisue/suda.vim" } diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 70d4dd67..bb55e171 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,3 +1,4 @@ +--- @type LazyPluginSpec return { "nvim-telescope/telescope.nvim", dependencies = { diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index 71c5d00a..9ce270d6 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -1,14 +1,15 @@ return { + -- Improved syntax highlighting, text objects and more + --- @type LazyPluginSpec { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", - init = function(plugin) + init = function() require("nvim-treesitter.install").update({ with_sync = true, }) end, - ---@type TSConfig - ---@diagnostic disable-next-line: missing-fields + --- @type TSConfig opts = { highlight = { enable = true }, indent = { enable = true }, @@ -70,10 +71,10 @@ return { }, }, }, - ---@param opts TSConfig + --- @param opts TSConfig config = function(_, opts) if type(opts.ensure_installed) == "table" then - ---@type table + --- @type table local added = {} opts.ensure_installed = vim.tbl_filter(function(lang) if added[lang] then @@ -91,13 +92,15 @@ return { config = function() -- When in diff mode, we want to use the default -- vim text objects c & C instead of the treesitter ones. - local move = require("nvim-treesitter.textobjects.move") ---@type table + --- @type table + local move = require("nvim-treesitter.textobjects.move") local configs = require("nvim-treesitter.configs") for name, fn in pairs(move) do if name:find("goto") == 1 then move[name] = function(q, ...) if vim.wo.diff then - local config = configs.get_module("textobjects.move")[name] ---@type table + --- @type table + local config = configs.get_module("textobjects.move")[name] for key, query in pairs(config or {}) do if q == query and key:find("[%]%[][cC]") then vim.cmd("normal! " .. key) @@ -115,8 +118,9 @@ return { }, -- Automatically add closing tags for HTML and JSX + --- @type LazyPluginSpec { "windwp/nvim-ts-autotag", - opts = {}, + config = true, }, } diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua index 89eab7d1..eb756c63 100644 --- a/home/.config/nvim/lua/plugins/ufo.lua +++ b/home/.config/nvim/lua/plugins/ufo.lua @@ -1,13 +1,15 @@ -- Better folds +--- @type LazyPluginSpec return { "kevinhwang91/nvim-ufo", dependencies = { "kevinhwang91/promise-async" }, - ---@type UfoConfig + --- @type UfoConfig opts = { close_fold_kinds = { "imports", }, }, + --- @param opts UfoConfig config = function(_, opts) local ufo = require("ufo") ufo.setup(opts) diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 51c22265..a3a5b9f6 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -1,6 +1,7 @@ -- Display possible keybinds -- Here I have also defined some generic keybinds -- Plugin specific keybinds are set up in plugin configuration file +--- @type LazyPluginSpec return { "folke/which-key.nvim", config = function() From efcdb566b84dfc36af7cff3afd19d23ba7125b82 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 14:37:36 +0200 Subject: [PATCH 2160/2667] Add type annotations to plugin specs --- home/.config/nvim/lua/plugins/asciidoc.lua | 2 ++ home/.config/nvim/lua/plugins/autopairs.lua | 1 + home/.config/nvim/lua/plugins/bufferline.lua | 4 +++- home/.config/nvim/lua/plugins/caddyfile.lua | 1 + home/.config/nvim/lua/plugins/cmp.lua | 1 + .../.config/nvim/lua/plugins/confirm-quit.lua | 2 ++ home/.config/nvim/lua/plugins/copilot.lua | 1 + home/.config/nvim/lua/plugins/dashboard.lua | 1 + home/.config/nvim/lua/plugins/dropbar.lua | 2 ++ home/.config/nvim/lua/plugins/firenvim.lua | 1 + home/.config/nvim/lua/plugins/fugitive.lua | 1 + home/.config/nvim/lua/plugins/gnupg.lua | 1 + .../nvim/lua/plugins/indent-blankline.lua | 3 ++- home/.config/nvim/lua/plugins/kanagawa.lua | 4 +++- home/.config/nvim/lua/plugins/lualine.lua | 1 + home/.config/nvim/lua/plugins/luasnip.lua | 1 + .../nvim/lua/plugins/markdown-preview.lua | 1 + home/.config/nvim/lua/plugins/mason.lua | 3 ++- home/.config/nvim/lua/plugins/mini.lua | 1 + home/.config/nvim/lua/plugins/neoformat.lua | 1 + home/.config/nvim/lua/plugins/noice.lua | 3 ++- .../nvim/lua/plugins/nvim-colorizer.lua | 1 + home/.config/nvim/lua/plugins/nvim-dap.lua | 2 ++ home/.config/nvim/lua/plugins/nvim-tree.lua | 1 + home/.config/nvim/lua/plugins/redact_pass.lua | 1 + home/.config/nvim/lua/plugins/statuscol.lua | 2 ++ home/.config/nvim/lua/plugins/suda.lua | 1 + home/.config/nvim/lua/plugins/telescope.lua | 1 + home/.config/nvim/lua/plugins/treesitter.lua | 20 +++++++++++-------- home/.config/nvim/lua/plugins/ufo.lua | 4 +++- home/.config/nvim/lua/plugins/which-key.lua | 1 + 31 files changed, 56 insertions(+), 14 deletions(-) diff --git a/home/.config/nvim/lua/plugins/asciidoc.lua b/home/.config/nvim/lua/plugins/asciidoc.lua index 7e4a139d..d723b3fc 100644 --- a/home/.config/nvim/lua/plugins/asciidoc.lua +++ b/home/.config/nvim/lua/plugins/asciidoc.lua @@ -1,11 +1,13 @@ -- AsciiDoc plugins are grouped together here return { -- Vim ♥️ Asciidoctor + --- @type LazyPluginSpec { "habamax/vim-asciidoctor", ft = { "asciidoctor", "asciidoc" }, }, -- AsciiDoc preview + --- @type LazyPluginSpec { "tigion/nvim-asciidoc-preview", ft = { "asciidoctor", "asciidoc" }, diff --git a/home/.config/nvim/lua/plugins/autopairs.lua b/home/.config/nvim/lua/plugins/autopairs.lua index f9886b56..cde6d85c 100644 --- a/home/.config/nvim/lua/plugins/autopairs.lua +++ b/home/.config/nvim/lua/plugins/autopairs.lua @@ -1,4 +1,5 @@ -- Automatic brackets +--- @type LazyPluginSpec return { "windwp/nvim-autopairs", config = true diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua index f6b42c4c..815f79c3 100644 --- a/home/.config/nvim/lua/plugins/bufferline.lua +++ b/home/.config/nvim/lua/plugins/bufferline.lua @@ -1,8 +1,10 @@ +-- Bufferline +--- @type LazyPluginSpec return { "akinsho/bufferline.nvim", version = "*", dependencies = { "kyazdani42/nvim-web-devicons" }, - ---@type BufferlineConfig + --- @type BufferlineConfig opts = { options = { diagnostics = "nvim_lsp", diff --git a/home/.config/nvim/lua/plugins/caddyfile.lua b/home/.config/nvim/lua/plugins/caddyfile.lua index 89db6b59..ec4c5273 100644 --- a/home/.config/nvim/lua/plugins/caddyfile.lua +++ b/home/.config/nvim/lua/plugins/caddyfile.lua @@ -1,4 +1,5 @@ -- Caddyfile syntax support +--- @type LazyPluginSpec return { "isobit/vim-caddyfile", ft = "caddyfile", diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 2eaf53b5..cfa81823 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -1,4 +1,5 @@ -- Autoompletion +--- @type LazyPluginSpec return { "hrsh7th/nvim-cmp", dependencies = { diff --git a/home/.config/nvim/lua/plugins/confirm-quit.lua b/home/.config/nvim/lua/plugins/confirm-quit.lua index 92173333..0c6302f7 100644 --- a/home/.config/nvim/lua/plugins/confirm-quit.lua +++ b/home/.config/nvim/lua/plugins/confirm-quit.lua @@ -1,3 +1,5 @@ +-- Confirm before quit +--- @type LazyPluginSpec return { "yutkat/confirm-quit.nvim", event = "CmdlineEnter", diff --git a/home/.config/nvim/lua/plugins/copilot.lua b/home/.config/nvim/lua/plugins/copilot.lua index e933120b..c1b6a3ed 100644 --- a/home/.config/nvim/lua/plugins/copilot.lua +++ b/home/.config/nvim/lua/plugins/copilot.lua @@ -1,4 +1,5 @@ -- GitHub Copilot +--- @type LazyPluginSpec return { "zbirenbaum/copilot.lua", opts = { diff --git a/home/.config/nvim/lua/plugins/dashboard.lua b/home/.config/nvim/lua/plugins/dashboard.lua index dab56e17..5aa8583b 100644 --- a/home/.config/nvim/lua/plugins/dashboard.lua +++ b/home/.config/nvim/lua/plugins/dashboard.lua @@ -1,4 +1,5 @@ -- Startup dashboard +--- @type LazyPluginSpec return { "glepnir/dashboard-nvim", event = "VimEnter", diff --git a/home/.config/nvim/lua/plugins/dropbar.lua b/home/.config/nvim/lua/plugins/dropbar.lua index 72a95171..228a2619 100644 --- a/home/.config/nvim/lua/plugins/dropbar.lua +++ b/home/.config/nvim/lua/plugins/dropbar.lua @@ -1,3 +1,5 @@ +-- Show the current LSP context in winbar +--- @type LazyPluginSpec return { "Bekaboo/dropbar.nvim", } diff --git a/home/.config/nvim/lua/plugins/firenvim.lua b/home/.config/nvim/lua/plugins/firenvim.lua index 507031e8..dba55753 100644 --- a/home/.config/nvim/lua/plugins/firenvim.lua +++ b/home/.config/nvim/lua/plugins/firenvim.lua @@ -1,4 +1,5 @@ -- Neovim inside Firefox +--- @type LazyPluginSpec return { "glacambre/firenvim", build = function() diff --git a/home/.config/nvim/lua/plugins/fugitive.lua b/home/.config/nvim/lua/plugins/fugitive.lua index 58030d28..24d58a49 100644 --- a/home/.config/nvim/lua/plugins/fugitive.lua +++ b/home/.config/nvim/lua/plugins/fugitive.lua @@ -1,2 +1,3 @@ -- Git commands +--- @type LazyPluginSpec return { "tpope/vim-fugitive" } diff --git a/home/.config/nvim/lua/plugins/gnupg.lua b/home/.config/nvim/lua/plugins/gnupg.lua index ec6d6346..4da3d9d8 100644 --- a/home/.config/nvim/lua/plugins/gnupg.lua +++ b/home/.config/nvim/lua/plugins/gnupg.lua @@ -1,4 +1,5 @@ -- Edit GPG encrypted files transparently +--- @type LazyPluginSpec return { "jamessan/vim-gnupg", ft = { "gpg" }, diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index 9aca163f..c9c0d2ad 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,7 +1,8 @@ -- Indent characters +--- @type LazyPluginSpec return { "lukas-reineke/indent-blankline.nvim", - ---@type ibl.config + --- @type ibl.config opts = { exclude = { filetypes = { diff --git a/home/.config/nvim/lua/plugins/kanagawa.lua b/home/.config/nvim/lua/plugins/kanagawa.lua index cba20994..1cc595ab 100644 --- a/home/.config/nvim/lua/plugins/kanagawa.lua +++ b/home/.config/nvim/lua/plugins/kanagawa.lua @@ -1,7 +1,8 @@ -- Colorscheme +--- @type LazyPluginSpec return { "rebelot/kanagawa.nvim", - ---@type KanagawaConfig + --- @type KanagawaConfig opts = { compile = true, dimInactive = true, @@ -46,6 +47,7 @@ return { } end, }, + --- @param opts KanagawaConfig config = function(_, opts) require("kanagawa").setup(opts) vim.cmd("colorscheme kanagawa") diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 735d7938..895b9e87 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1,4 +1,5 @@ -- Statusline +--- @type LazyPluginSpec return { "nvim-lualine/lualine.nvim", dependencies = { "kyazdani42/nvim-web-devicons" }, diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index ad186108..ade105cd 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -1,4 +1,5 @@ -- Snippets plugin +--- @type LazyPluginSpec return { "L3MON4D3/LuaSnip", -- Snippets collection diff --git a/home/.config/nvim/lua/plugins/markdown-preview.lua b/home/.config/nvim/lua/plugins/markdown-preview.lua index 2350979d..731496ab 100644 --- a/home/.config/nvim/lua/plugins/markdown-preview.lua +++ b/home/.config/nvim/lua/plugins/markdown-preview.lua @@ -1,4 +1,5 @@ -- Markdown preview +--- @type LazyPluginSpec return { "iamcco/markdown-preview.nvim", build = "cd app && yarn install", diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 6e1cedf2..6ab9028b 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -1,5 +1,6 @@ -- Package manager for LSP servers, DAP adapters etc. -- It also handles starting all of my LSP servers +--- @type LazyPluginSpec return { "williamboman/mason.nvim", dependencies = { @@ -13,7 +14,7 @@ return { -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. { "folke/neodev.nvim", - ---@type LuaDevOptions + --- @type LuaDevOptions opts = { override = function(root_dir, library) local dotfiles_path = tostring(vim.fn.expand("~/git/dotfiles")) diff --git a/home/.config/nvim/lua/plugins/mini.lua b/home/.config/nvim/lua/plugins/mini.lua index 6484a365..7482c037 100644 --- a/home/.config/nvim/lua/plugins/mini.lua +++ b/home/.config/nvim/lua/plugins/mini.lua @@ -1,4 +1,5 @@ -- Library of 30+ independent Lua modules improving overall Neovim +--- @type LazyPluginSpec return { "echasnovski/mini.nvim", version = "*", diff --git a/home/.config/nvim/lua/plugins/neoformat.lua b/home/.config/nvim/lua/plugins/neoformat.lua index cc63e231..1bdc479a 100644 --- a/home/.config/nvim/lua/plugins/neoformat.lua +++ b/home/.config/nvim/lua/plugins/neoformat.lua @@ -1,4 +1,5 @@ -- Formatter plugin +--- @type LazyPluginSpec return { "sbdchd/neoformat", keys = { diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua index cf869a84..1de8aae2 100644 --- a/home/.config/nvim/lua/plugins/noice.lua +++ b/home/.config/nvim/lua/plugins/noice.lua @@ -1,10 +1,11 @@ -- Replace much of neovim's default UI -- with a modern replacement +--- @type LazyPluginSpec return { "folke/noice.nvim", event = "VeryLazy", dependencies = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify" }, - ---@type NoiceConfig + --- @type NoiceConfig opts = { lsp = { -- override markdown rendering so that **cmp** and other plugins use **Treesitter** diff --git a/home/.config/nvim/lua/plugins/nvim-colorizer.lua b/home/.config/nvim/lua/plugins/nvim-colorizer.lua index 05ac1448..ce3131d5 100644 --- a/home/.config/nvim/lua/plugins/nvim-colorizer.lua +++ b/home/.config/nvim/lua/plugins/nvim-colorizer.lua @@ -1,4 +1,5 @@ -- High performance color highlighter +--- @type LazyPluginSpec return { "norcalli/nvim-colorizer.lua", config = true, diff --git a/home/.config/nvim/lua/plugins/nvim-dap.lua b/home/.config/nvim/lua/plugins/nvim-dap.lua index 9e2fce70..04b8ec6b 100644 --- a/home/.config/nvim/lua/plugins/nvim-dap.lua +++ b/home/.config/nvim/lua/plugins/nvim-dap.lua @@ -1,3 +1,5 @@ +-- Debug adapter for NeoVim +--- @type LazyPluginSpec return { "mfussenegger/nvim-dap", config = function() diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index 8646ec40..bacd3a97 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -1,4 +1,5 @@ -- Tree explorer +--- @type LazyPluginSpec return { "kyazdani42/nvim-tree.lua", lazy = false, diff --git a/home/.config/nvim/lua/plugins/redact_pass.lua b/home/.config/nvim/lua/plugins/redact_pass.lua index 3ac5d314..984de136 100644 --- a/home/.config/nvim/lua/plugins/redact_pass.lua +++ b/home/.config/nvim/lua/plugins/redact_pass.lua @@ -1,4 +1,5 @@ -- Make editing passwords safer +--- @type LazyPluginSpec return { "https://git.zx2c4.com/password-store", config = function(plugin) diff --git a/home/.config/nvim/lua/plugins/statuscol.lua b/home/.config/nvim/lua/plugins/statuscol.lua index 05d010c2..38a75a5a 100644 --- a/home/.config/nvim/lua/plugins/statuscol.lua +++ b/home/.config/nvim/lua/plugins/statuscol.lua @@ -1,3 +1,5 @@ +-- Customize statuscolumn +--- @type LazyPluginSpec return { "luukvbaal/statuscol.nvim", dependencies = { diff --git a/home/.config/nvim/lua/plugins/suda.lua b/home/.config/nvim/lua/plugins/suda.lua index cb7a4b50..e02bd3ae 100644 --- a/home/.config/nvim/lua/plugins/suda.lua +++ b/home/.config/nvim/lua/plugins/suda.lua @@ -1,2 +1,3 @@ -- Do stuff as sudo +--- @type LazyPluginSpec return { "lambdalisue/suda.vim" } diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 70d4dd67..bb55e171 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,3 +1,4 @@ +--- @type LazyPluginSpec return { "nvim-telescope/telescope.nvim", dependencies = { diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index 71c5d00a..9ce270d6 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -1,14 +1,15 @@ return { + -- Improved syntax highlighting, text objects and more + --- @type LazyPluginSpec { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", - init = function(plugin) + init = function() require("nvim-treesitter.install").update({ with_sync = true, }) end, - ---@type TSConfig - ---@diagnostic disable-next-line: missing-fields + --- @type TSConfig opts = { highlight = { enable = true }, indent = { enable = true }, @@ -70,10 +71,10 @@ return { }, }, }, - ---@param opts TSConfig + --- @param opts TSConfig config = function(_, opts) if type(opts.ensure_installed) == "table" then - ---@type table + --- @type table local added = {} opts.ensure_installed = vim.tbl_filter(function(lang) if added[lang] then @@ -91,13 +92,15 @@ return { config = function() -- When in diff mode, we want to use the default -- vim text objects c & C instead of the treesitter ones. - local move = require("nvim-treesitter.textobjects.move") ---@type table + --- @type table + local move = require("nvim-treesitter.textobjects.move") local configs = require("nvim-treesitter.configs") for name, fn in pairs(move) do if name:find("goto") == 1 then move[name] = function(q, ...) if vim.wo.diff then - local config = configs.get_module("textobjects.move")[name] ---@type table + --- @type table + local config = configs.get_module("textobjects.move")[name] for key, query in pairs(config or {}) do if q == query and key:find("[%]%[][cC]") then vim.cmd("normal! " .. key) @@ -115,8 +118,9 @@ return { }, -- Automatically add closing tags for HTML and JSX + --- @type LazyPluginSpec { "windwp/nvim-ts-autotag", - opts = {}, + config = true, }, } diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua index 89eab7d1..eb756c63 100644 --- a/home/.config/nvim/lua/plugins/ufo.lua +++ b/home/.config/nvim/lua/plugins/ufo.lua @@ -1,13 +1,15 @@ -- Better folds +--- @type LazyPluginSpec return { "kevinhwang91/nvim-ufo", dependencies = { "kevinhwang91/promise-async" }, - ---@type UfoConfig + --- @type UfoConfig opts = { close_fold_kinds = { "imports", }, }, + --- @param opts UfoConfig config = function(_, opts) local ufo = require("ufo") ufo.setup(opts) diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 51c22265..a3a5b9f6 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -1,6 +1,7 @@ -- Display possible keybinds -- Here I have also defined some generic keybinds -- Plugin specific keybinds are set up in plugin configuration file +--- @type LazyPluginSpec return { "folke/which-key.nvim", config = function() From b570b8a0750af6041d7311f0d851ab71fd266eed Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 14:58:52 +0200 Subject: [PATCH 2161/2667] Nvim: fix dashboard projects not working after lazy loading telescope --- home/.config/nvim/lua/plugins/dashboard.lua | 23 ++++++++++++++------- home/.config/nvim/lua/plugins/telescope.lua | 1 + 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/home/.config/nvim/lua/plugins/dashboard.lua b/home/.config/nvim/lua/plugins/dashboard.lua index 5aa8583b..63901a58 100644 --- a/home/.config/nvim/lua/plugins/dashboard.lua +++ b/home/.config/nvim/lua/plugins/dashboard.lua @@ -3,7 +3,7 @@ return { "glepnir/dashboard-nvim", event = "VimEnter", - dependencies = { { "kyazdani42/nvim-web-devicons" } }, + dependencies = { "kyazdani42/nvim-web-devicons" }, opts = { theme = "hyper", config = { @@ -11,16 +11,23 @@ return { enable = true, }, shortcut = { - { icon = "🧲 ", desc = "Update", group = "@property", action = "Lazy update", key = "u" }, { - icon = "🖹 ", - icon_hl = "@variable", - desc = "Files", - group = "Label", - action = "Telescope find_files", - key = "f", + icon = "🧲 ", + desc = "Update", + group = "@property", + action = "Lazy update", + key = "u", }, }, + project = { + enable = true, + limit = 8, + label = "Projects", + action = function(path) + -- "Telescope find_files cwd=" + require("telescope.builtin").find_files({ cwd = path }) + end, + }, }, }, } diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index bb55e171..42d9ad5a 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,6 +1,7 @@ --- @type LazyPluginSpec return { "nvim-telescope/telescope.nvim", + lazy = false, dependencies = { -- Internal dependency for telescope "nvim-lua/plenary.nvim", From d2f19f1cff0d6d3ffcee921a9c6642c51aeec80f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 14:58:52 +0200 Subject: [PATCH 2162/2667] Nvim: fix dashboard projects not working after lazy loading telescope --- home/.config/nvim/lua/plugins/dashboard.lua | 23 ++++++++++++++------- home/.config/nvim/lua/plugins/telescope.lua | 1 + 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/home/.config/nvim/lua/plugins/dashboard.lua b/home/.config/nvim/lua/plugins/dashboard.lua index 5aa8583b..63901a58 100644 --- a/home/.config/nvim/lua/plugins/dashboard.lua +++ b/home/.config/nvim/lua/plugins/dashboard.lua @@ -3,7 +3,7 @@ return { "glepnir/dashboard-nvim", event = "VimEnter", - dependencies = { { "kyazdani42/nvim-web-devicons" } }, + dependencies = { "kyazdani42/nvim-web-devicons" }, opts = { theme = "hyper", config = { @@ -11,16 +11,23 @@ return { enable = true, }, shortcut = { - { icon = "🧲 ", desc = "Update", group = "@property", action = "Lazy update", key = "u" }, { - icon = "🖹 ", - icon_hl = "@variable", - desc = "Files", - group = "Label", - action = "Telescope find_files", - key = "f", + icon = "🧲 ", + desc = "Update", + group = "@property", + action = "Lazy update", + key = "u", }, }, + project = { + enable = true, + limit = 8, + label = "Projects", + action = function(path) + -- "Telescope find_files cwd=" + require("telescope.builtin").find_files({ cwd = path }) + end, + }, }, }, } diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index bb55e171..42d9ad5a 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,6 +1,7 @@ --- @type LazyPluginSpec return { "nvim-telescope/telescope.nvim", + lazy = false, dependencies = { -- Internal dependency for telescope "nvim-lua/plenary.nvim", From 1ce80c1347ce620b2e8cd1955c34e4fde6292211 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 15:01:50 +0200 Subject: [PATCH 2163/2667] Remove comment --- home/.config/nvim/lua/plugins/dashboard.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/dashboard.lua b/home/.config/nvim/lua/plugins/dashboard.lua index 63901a58..7a6b23a2 100644 --- a/home/.config/nvim/lua/plugins/dashboard.lua +++ b/home/.config/nvim/lua/plugins/dashboard.lua @@ -24,7 +24,6 @@ return { limit = 8, label = "Projects", action = function(path) - -- "Telescope find_files cwd=" require("telescope.builtin").find_files({ cwd = path }) end, }, From 6afe158c3638ded7e50823897a99400512d2cc84 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 15:01:50 +0200 Subject: [PATCH 2164/2667] Remove comment --- home/.config/nvim/lua/plugins/dashboard.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/dashboard.lua b/home/.config/nvim/lua/plugins/dashboard.lua index 63901a58..7a6b23a2 100644 --- a/home/.config/nvim/lua/plugins/dashboard.lua +++ b/home/.config/nvim/lua/plugins/dashboard.lua @@ -24,7 +24,6 @@ return { limit = 8, label = "Projects", action = function(path) - -- "Telescope find_files cwd=" require("telescope.builtin").find_files({ cwd = path }) end, }, From e6b6534c8d4e134004423f23222d1f654266039e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 15:58:35 +0200 Subject: [PATCH 2165/2667] Switch from dashboard to alpha, add project.nvim telescope plugin --- home/.config/nvim/lua/plugins/alpha.lua | 10 ++++++ home/.config/nvim/lua/plugins/dashboard.lua | 32 ------------------- .../nvim/lua/plugins/indent-blankline.lua | 2 +- home/.config/nvim/lua/plugins/telescope.lua | 13 ++++++++ 4 files changed, 24 insertions(+), 33 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/alpha.lua delete mode 100644 home/.config/nvim/lua/plugins/dashboard.lua diff --git a/home/.config/nvim/lua/plugins/alpha.lua b/home/.config/nvim/lua/plugins/alpha.lua new file mode 100644 index 00000000..d92563e7 --- /dev/null +++ b/home/.config/nvim/lua/plugins/alpha.lua @@ -0,0 +1,10 @@ +-- Startup dashboard +--- @type LazyPluginSpec +return { + "goolord/alpha-nvim", + config = function() + local alpha = require("alpha") + local theta = require("alpha.themes.theta") + alpha.setup(theta.config) + end, +} diff --git a/home/.config/nvim/lua/plugins/dashboard.lua b/home/.config/nvim/lua/plugins/dashboard.lua deleted file mode 100644 index 7a6b23a2..00000000 --- a/home/.config/nvim/lua/plugins/dashboard.lua +++ /dev/null @@ -1,32 +0,0 @@ --- Startup dashboard ---- @type LazyPluginSpec -return { - "glepnir/dashboard-nvim", - event = "VimEnter", - dependencies = { "kyazdani42/nvim-web-devicons" }, - opts = { - theme = "hyper", - config = { - week_header = { - enable = true, - }, - shortcut = { - { - icon = "🧲 ", - desc = "Update", - group = "@property", - action = "Lazy update", - key = "u", - }, - }, - project = { - enable = true, - limit = 8, - label = "Projects", - action = function(path) - require("telescope.builtin").find_files({ cwd = path }) - end, - }, - }, - }, -} diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index c9c0d2ad..8ddab8c7 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -8,7 +8,7 @@ return { filetypes = { "", "checkhealth", - "dashboard", + "alpha", "git", "gitcommit", "TelescopePrompt", diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 42d9ad5a..bc9ce9e4 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -17,6 +17,13 @@ return { -- cd plugin for telescope "zane-/cder.nvim", + + -- Switch to a project + { + "ahmedkhalf/project.nvim", + main = "project_nvim", + config = true, + }, }, opts = { -- Set layout to vertical @@ -77,6 +84,11 @@ return { "", "Telescope live_grep", }, + { + desc = "Change to a project", + "", + "Telescope projects", + }, }, config = function(_, opts) local telescope = require("telescope") @@ -86,5 +98,6 @@ return { telescope.load_extension("fzf") telescope.load_extension("ui-select") telescope.load_extension("cder") + telescope.load_extension("projects") end, } From e2cc5c3094cc5a044a19d2e30d338158b6b64021 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 15:58:35 +0200 Subject: [PATCH 2166/2667] Switch from dashboard to alpha, add project.nvim telescope plugin --- home/.config/nvim/lua/plugins/alpha.lua | 10 ++++++ home/.config/nvim/lua/plugins/dashboard.lua | 32 ------------------- .../nvim/lua/plugins/indent-blankline.lua | 2 +- home/.config/nvim/lua/plugins/telescope.lua | 13 ++++++++ 4 files changed, 24 insertions(+), 33 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/alpha.lua delete mode 100644 home/.config/nvim/lua/plugins/dashboard.lua diff --git a/home/.config/nvim/lua/plugins/alpha.lua b/home/.config/nvim/lua/plugins/alpha.lua new file mode 100644 index 00000000..d92563e7 --- /dev/null +++ b/home/.config/nvim/lua/plugins/alpha.lua @@ -0,0 +1,10 @@ +-- Startup dashboard +--- @type LazyPluginSpec +return { + "goolord/alpha-nvim", + config = function() + local alpha = require("alpha") + local theta = require("alpha.themes.theta") + alpha.setup(theta.config) + end, +} diff --git a/home/.config/nvim/lua/plugins/dashboard.lua b/home/.config/nvim/lua/plugins/dashboard.lua deleted file mode 100644 index 7a6b23a2..00000000 --- a/home/.config/nvim/lua/plugins/dashboard.lua +++ /dev/null @@ -1,32 +0,0 @@ --- Startup dashboard ---- @type LazyPluginSpec -return { - "glepnir/dashboard-nvim", - event = "VimEnter", - dependencies = { "kyazdani42/nvim-web-devicons" }, - opts = { - theme = "hyper", - config = { - week_header = { - enable = true, - }, - shortcut = { - { - icon = "🧲 ", - desc = "Update", - group = "@property", - action = "Lazy update", - key = "u", - }, - }, - project = { - enable = true, - limit = 8, - label = "Projects", - action = function(path) - require("telescope.builtin").find_files({ cwd = path }) - end, - }, - }, - }, -} diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index c9c0d2ad..8ddab8c7 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -8,7 +8,7 @@ return { filetypes = { "", "checkhealth", - "dashboard", + "alpha", "git", "gitcommit", "TelescopePrompt", diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 42d9ad5a..bc9ce9e4 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -17,6 +17,13 @@ return { -- cd plugin for telescope "zane-/cder.nvim", + + -- Switch to a project + { + "ahmedkhalf/project.nvim", + main = "project_nvim", + config = true, + }, }, opts = { -- Set layout to vertical @@ -77,6 +84,11 @@ return { "", "Telescope live_grep", }, + { + desc = "Change to a project", + "", + "Telescope projects", + }, }, config = function(_, opts) local telescope = require("telescope") @@ -86,5 +98,6 @@ return { telescope.load_extension("fzf") telescope.load_extension("ui-select") telescope.load_extension("cder") + telescope.load_extension("projects") end, } From fa8e7df59d4969eb4b6add567cbc6f99c73d56c0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 17:08:33 +0200 Subject: [PATCH 2167/2667] Add README to neovim config --- home/.config/nvim/README.adoc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 home/.config/nvim/README.adoc diff --git a/home/.config/nvim/README.adoc b/home/.config/nvim/README.adoc new file mode 100644 index 00000000..caabc08f --- /dev/null +++ b/home/.config/nvim/README.adoc @@ -0,0 +1,16 @@ += FunctionalHacker's NeoVim configuration + +This is my personal NeoVim configuration I use for all text editing in my free +time and at my day job. I mostly code in Java, TypeScript and ReactJS, with +a bit of Rust and Python once in a blue moon. + +The configuration is quite minimal but still fully featured. Some highlights +include + +* LSP support with neovim's built in LSP client +** LSP servers are easily installed and auto-configured with Mason +* Treesitter +** Code folding +** Code highlighting +** Text objects +* Lazy plugin manager for fast startup times From aa9160047e9bbc82ca5f1d6505a15aa861db10af Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 17:08:33 +0200 Subject: [PATCH 2168/2667] Add README to neovim config --- home/.config/nvim/README.adoc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 home/.config/nvim/README.adoc diff --git a/home/.config/nvim/README.adoc b/home/.config/nvim/README.adoc new file mode 100644 index 00000000..caabc08f --- /dev/null +++ b/home/.config/nvim/README.adoc @@ -0,0 +1,16 @@ += FunctionalHacker's NeoVim configuration + +This is my personal NeoVim configuration I use for all text editing in my free +time and at my day job. I mostly code in Java, TypeScript and ReactJS, with +a bit of Rust and Python once in a blue moon. + +The configuration is quite minimal but still fully featured. Some highlights +include + +* LSP support with neovim's built in LSP client +** LSP servers are easily installed and auto-configured with Mason +* Treesitter +** Code folding +** Code highlighting +** Text objects +* Lazy plugin manager for fast startup times From c6fedc99f0480948668a800975ae1c45d7190f9b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 21:25:23 +0200 Subject: [PATCH 2169/2667] Add nvim-dap-ui --- home/.config/nvim/lua/plugins/nvim-dap.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/plugins/nvim-dap.lua b/home/.config/nvim/lua/plugins/nvim-dap.lua index 04b8ec6b..d2e8b95b 100644 --- a/home/.config/nvim/lua/plugins/nvim-dap.lua +++ b/home/.config/nvim/lua/plugins/nvim-dap.lua @@ -2,6 +2,9 @@ --- @type LazyPluginSpec return { "mfussenegger/nvim-dap", + dependencies = { + { "rcarriga/nvim-dap-ui", config = true }, + }, config = function() local dap = require("dap") From a1f02beaab0274ae2172eb4cd13278060db76f90 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 21:25:23 +0200 Subject: [PATCH 2170/2667] Add nvim-dap-ui --- home/.config/nvim/lua/plugins/nvim-dap.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/nvim/lua/plugins/nvim-dap.lua b/home/.config/nvim/lua/plugins/nvim-dap.lua index 04b8ec6b..d2e8b95b 100644 --- a/home/.config/nvim/lua/plugins/nvim-dap.lua +++ b/home/.config/nvim/lua/plugins/nvim-dap.lua @@ -2,6 +2,9 @@ --- @type LazyPluginSpec return { "mfussenegger/nvim-dap", + dependencies = { + { "rcarriga/nvim-dap-ui", config = true }, + }, config = function() local dap = require("dap") From 54487584a4478966ea8fb78f70dca7418190c0da Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 28 Nov 2023 15:28:20 +0200 Subject: [PATCH 2171/2667] nvim-project: only show git folders --- home/.config/nvim/lua/plugins/telescope.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index bc9ce9e4..15fd534e 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -22,7 +22,9 @@ return { { "ahmedkhalf/project.nvim", main = "project_nvim", - config = true, + opts = { + patterns = { ".git" }, + }, }, }, opts = { From e746ffb6864cf8e0c2f01b7933c2e210394a0c3e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 28 Nov 2023 15:28:20 +0200 Subject: [PATCH 2172/2667] nvim-project: only show git folders --- home/.config/nvim/lua/plugins/telescope.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index bc9ce9e4..15fd534e 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -22,7 +22,9 @@ return { { "ahmedkhalf/project.nvim", main = "project_nvim", - config = true, + opts = { + patterns = { ".git" }, + }, }, }, opts = { From 7e33569675a35372bd835eeb6023e5b62a2bbb38 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Nov 2023 21:28:06 +0200 Subject: [PATCH 2173/2667] Rework beets config for git version Removed deprecated plugins etc --- home/.config/beets/config.yaml | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml index 8782a1d0..cea0277d 100644 --- a/home/.config/beets/config.yaml +++ b/home/.config/beets/config.yaml @@ -1,25 +1,21 @@ directory: ~/Music library: ~/Music/beets.db plugins: - - acousticbrainz - # - check - edit - fetchart - # - follow - fuzzy - info - lastgenre - lyrics - #- mbcollection - #- mpdupdate + # - mbcollection + - mpdupdate - play - replaygain - thumbnails - web import: - copy: no - move: yes - link: no + write: yes + copy: yes lastgenre: whitelist: ~/.config/beets/whitelist lyrics: @@ -38,9 +34,6 @@ follow: replaygain: backend: gstreamer auto: yes -musicbrainz: - user: FunctionalHacker - pass: "{{@@ env['PASS_MUSICBRAINZ'] @@}}" -mbcollection: - auto: 'yes' - collection: 'a4955b5c-db7f-4e27-9887-f77f820bad34' +#mbcollection: +# auto: 'yes' +# collection: 'a4955b5c-db7f-4e27-9887-f77f820bad34' From 7c9c49a223e82e0f8c9ea45ee5fdee02da7ff8f7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Nov 2023 21:28:06 +0200 Subject: [PATCH 2174/2667] Rework beets config for git version Removed deprecated plugins etc --- home/.config/beets/config.yaml | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml index 8782a1d0..cea0277d 100644 --- a/home/.config/beets/config.yaml +++ b/home/.config/beets/config.yaml @@ -1,25 +1,21 @@ directory: ~/Music library: ~/Music/beets.db plugins: - - acousticbrainz - # - check - edit - fetchart - # - follow - fuzzy - info - lastgenre - lyrics - #- mbcollection - #- mpdupdate + # - mbcollection + - mpdupdate - play - replaygain - thumbnails - web import: - copy: no - move: yes - link: no + write: yes + copy: yes lastgenre: whitelist: ~/.config/beets/whitelist lyrics: @@ -38,9 +34,6 @@ follow: replaygain: backend: gstreamer auto: yes -musicbrainz: - user: FunctionalHacker - pass: "{{@@ env['PASS_MUSICBRAINZ'] @@}}" -mbcollection: - auto: 'yes' - collection: 'a4955b5c-db7f-4e27-9887-f77f820bad34' +#mbcollection: +# auto: 'yes' +# collection: 'a4955b5c-db7f-4e27-9887-f77f820bad34' From 917491744b484b43c434229b71d88933eb63d814 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Nov 2023 21:30:21 +0200 Subject: [PATCH 2175/2667] Nvim: add dap configurations for Java/JavaScript/TypeScript --- home/.config/nvim/lua/plugins/nvim-dap.lua | 114 ++++++++++++++++++--- 1 file changed, 97 insertions(+), 17 deletions(-) diff --git a/home/.config/nvim/lua/plugins/nvim-dap.lua b/home/.config/nvim/lua/plugins/nvim-dap.lua index d2e8b95b..b1357aee 100644 --- a/home/.config/nvim/lua/plugins/nvim-dap.lua +++ b/home/.config/nvim/lua/plugins/nvim-dap.lua @@ -1,4 +1,6 @@ -- Debug adapter for NeoVim + +local masonPkg = vim.fn.stdpath("data") .. "/mason/packages" --- @type LazyPluginSpec return { "mfussenegger/nvim-dap", @@ -7,32 +9,110 @@ return { }, config = function() local dap = require("dap") + local configurations = dap.configurations + local adapters = dap.adapters + local pick_process = require("dap.utils").pick_process - dap.adapters.bashdb = { + -- Applies all given configurations to the given filetypes + --- @param filetypes string[] + --- @param configs Configuration[] + local function dapConfigure(filetypes, configs) + for _, ft in ipairs(filetypes) do + configurations[ft] = configs + end + end + + -- Bash/sh + local bashAdapter = masonPkg .. "/bash-debug-adapter" + local bashExtension = bashAdapter .. "/extension" + adapters.bashdb = { type = "executable", - command = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/bash-debug-adapter", + command = bashAdapter .. "/bash-debug-adapter", name = "bashdb", } + configurations.sh = { + name = "Debug with bashdb", + type = "bashdb", + request = "launch", + showDebugOutput = true, + trace = true, + pathBashdbLib = bashExtension .. "/bashdb_dir", + pathBashdb = bashExtension .. "/bashdb_dir/bashdb", + file = "${file}", + program = "${file}", + cwd = "${workspaceFolder}", + pathCat = "cat", + pathBash = "/bin/bash", + pathMkfifo = "mkfifo", + pathPkill = "pkill", + args = {}, + env = {}, + terminalKind = "integrated", + } - dap.configurations.sh = { + -- JavaScript/TypeScript in Firefox/Chrome/Node + adapters.libreWolf = { + type = "executable", + command = "node", + args = { masonPkg .. "/firefox-debug-adapter/dist/adapter.bundle.js" }, + } + adapters["pwa-node"] = { + type = "server", + host = "localhost", + port = "${port}", + executable = { + command = "node", + args = { masonPkg .. "/js-debug-adapter/js-debug/src/dapDebugServer.js", "8123" }, + }, + } + + --- @type Configuration[] + local browserConfigs = { { - type = "bashdb", + name = "LibreWolf attach", + type = "libreWolf", + request = "attach", + url = "http://localhost:4000", + webRoot = "${workspaceFolder}", + }, + { + name = "Chrome attach", + type = "pwa-chrome", + request = "attach", + cwd = "${workspaceFolder}", + }, + } + + --- @type Configuration[] + local nodeConfigs = { + { + name = "Node attach", + type = "pwa-node", + request = "attach", + processId = pick_process, + cwd = "${workspaceFolder}", + }, + { + name = "Node launch", + type = "pwa-node", request = "launch", - name = "Launch file", - showDebugOutput = true, - pathBashdb = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir/bashdb", - pathBashdbLib = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir", - trace = true, - file = "${file}", program = "${file}", cwd = "${workspaceFolder}", - pathCat = "cat", - pathBash = "/bin/bash", - pathMkfifo = "mkfifo", - pathPkill = "pkill", - args = {}, - env = {}, - terminalKind = "integrated", + port = "8123", + }, + } + + dapConfigure({ "typescriptreact", "javascriptreact" }, browserConfigs) + dapConfigure({ "typescript", "javascript" }, vim.tbl_extend("force", browserConfigs, nodeConfigs)) + + -- Java + configurations.java = { + { + name = "Debug (Attach) - Remote", + type = "java", + request = "attach", + hostName = "127.0.0.1", + port = 9009, }, } end, From 2da1aaa4237e0b2f67c0a9f070155e020f42e338 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Nov 2023 21:30:21 +0200 Subject: [PATCH 2176/2667] Nvim: add dap configurations for Java/JavaScript/TypeScript --- home/.config/nvim/lua/plugins/nvim-dap.lua | 114 ++++++++++++++++++--- 1 file changed, 97 insertions(+), 17 deletions(-) diff --git a/home/.config/nvim/lua/plugins/nvim-dap.lua b/home/.config/nvim/lua/plugins/nvim-dap.lua index d2e8b95b..b1357aee 100644 --- a/home/.config/nvim/lua/plugins/nvim-dap.lua +++ b/home/.config/nvim/lua/plugins/nvim-dap.lua @@ -1,4 +1,6 @@ -- Debug adapter for NeoVim + +local masonPkg = vim.fn.stdpath("data") .. "/mason/packages" --- @type LazyPluginSpec return { "mfussenegger/nvim-dap", @@ -7,32 +9,110 @@ return { }, config = function() local dap = require("dap") + local configurations = dap.configurations + local adapters = dap.adapters + local pick_process = require("dap.utils").pick_process - dap.adapters.bashdb = { + -- Applies all given configurations to the given filetypes + --- @param filetypes string[] + --- @param configs Configuration[] + local function dapConfigure(filetypes, configs) + for _, ft in ipairs(filetypes) do + configurations[ft] = configs + end + end + + -- Bash/sh + local bashAdapter = masonPkg .. "/bash-debug-adapter" + local bashExtension = bashAdapter .. "/extension" + adapters.bashdb = { type = "executable", - command = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/bash-debug-adapter", + command = bashAdapter .. "/bash-debug-adapter", name = "bashdb", } + configurations.sh = { + name = "Debug with bashdb", + type = "bashdb", + request = "launch", + showDebugOutput = true, + trace = true, + pathBashdbLib = bashExtension .. "/bashdb_dir", + pathBashdb = bashExtension .. "/bashdb_dir/bashdb", + file = "${file}", + program = "${file}", + cwd = "${workspaceFolder}", + pathCat = "cat", + pathBash = "/bin/bash", + pathMkfifo = "mkfifo", + pathPkill = "pkill", + args = {}, + env = {}, + terminalKind = "integrated", + } - dap.configurations.sh = { + -- JavaScript/TypeScript in Firefox/Chrome/Node + adapters.libreWolf = { + type = "executable", + command = "node", + args = { masonPkg .. "/firefox-debug-adapter/dist/adapter.bundle.js" }, + } + adapters["pwa-node"] = { + type = "server", + host = "localhost", + port = "${port}", + executable = { + command = "node", + args = { masonPkg .. "/js-debug-adapter/js-debug/src/dapDebugServer.js", "8123" }, + }, + } + + --- @type Configuration[] + local browserConfigs = { { - type = "bashdb", + name = "LibreWolf attach", + type = "libreWolf", + request = "attach", + url = "http://localhost:4000", + webRoot = "${workspaceFolder}", + }, + { + name = "Chrome attach", + type = "pwa-chrome", + request = "attach", + cwd = "${workspaceFolder}", + }, + } + + --- @type Configuration[] + local nodeConfigs = { + { + name = "Node attach", + type = "pwa-node", + request = "attach", + processId = pick_process, + cwd = "${workspaceFolder}", + }, + { + name = "Node launch", + type = "pwa-node", request = "launch", - name = "Launch file", - showDebugOutput = true, - pathBashdb = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir/bashdb", - pathBashdbLib = vim.fn.stdpath("data") .. "/mason/packages/bash-debug-adapter/extension/bashdb_dir", - trace = true, - file = "${file}", program = "${file}", cwd = "${workspaceFolder}", - pathCat = "cat", - pathBash = "/bin/bash", - pathMkfifo = "mkfifo", - pathPkill = "pkill", - args = {}, - env = {}, - terminalKind = "integrated", + port = "8123", + }, + } + + dapConfigure({ "typescriptreact", "javascriptreact" }, browserConfigs) + dapConfigure({ "typescript", "javascript" }, vim.tbl_extend("force", browserConfigs, nodeConfigs)) + + -- Java + configurations.java = { + { + name = "Debug (Attach) - Remote", + type = "java", + request = "attach", + hostName = "127.0.0.1", + port = 9009, }, } end, From c5d835612a17be84f022d7167050b31c3012b3ad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Nov 2023 21:40:47 +0200 Subject: [PATCH 2177/2667] Allow mpd control by default --- home/.config/mpd/mpd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/mpd/mpd.conf b/home/.config/mpd/mpd.conf index eca1f410..38a2a616 100644 --- a/home/.config/mpd/mpd.conf +++ b/home/.config/mpd/mpd.conf @@ -7,7 +7,7 @@ sticker_file "~/.mpd/sticker.sql" replaygain "track" -default_permissions "read" +default_permissions "read,add,control" password "{{@@ env['PASS_MPD'] @@}}@read,add,control" password "{{@@ env['PASS_MPD_ADMIN'] @@}}@read,add,control,admin" From 01289bfca15bb2f2ae2bf73b5ff750eb14cd2b5a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Nov 2023 21:40:47 +0200 Subject: [PATCH 2178/2667] Allow mpd control by default --- home/.config/mpd/mpd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/mpd/mpd.conf b/home/.config/mpd/mpd.conf index eca1f410..38a2a616 100644 --- a/home/.config/mpd/mpd.conf +++ b/home/.config/mpd/mpd.conf @@ -7,7 +7,7 @@ sticker_file "~/.mpd/sticker.sql" replaygain "track" -default_permissions "read" +default_permissions "read,add,control" password "{{@@ env['PASS_MPD'] @@}}@read,add,control" password "{{@@ env['PASS_MPD_ADMIN'] @@}}@read,add,control,admin" From f390929f7a5d6e22491349424b9dbebeaf1ce950 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Dec 2023 13:12:38 +0200 Subject: [PATCH 2179/2667] Neovide: disable hide mouse --- home/.config/nvim/lua/neovide.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/neovide.lua b/home/.config/nvim/lua/neovide.lua index df7970fb..e0037efb 100644 --- a/home/.config/nvim/lua/neovide.lua +++ b/home/.config/nvim/lua/neovide.lua @@ -13,8 +13,8 @@ vim.keymap.set("n", "", function() change_scale_factor(1 / 1.25) end) --- Hide mouse when typing in neovide -g.neovide_hide_mouse_when_typing = true +-- Hide mouse when typing in neovide (disabled) +g.neovide_hide_mouse_when_typing = false -- Enable cursor particles in neovide g.neovide_cursor_vfx_mode = "railgun" From 0e86371aa65e3afb10c771c6e6f1ef6724a514f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Dec 2023 13:12:38 +0200 Subject: [PATCH 2180/2667] Neovide: disable hide mouse --- home/.config/nvim/lua/neovide.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/neovide.lua b/home/.config/nvim/lua/neovide.lua index df7970fb..e0037efb 100644 --- a/home/.config/nvim/lua/neovide.lua +++ b/home/.config/nvim/lua/neovide.lua @@ -13,8 +13,8 @@ vim.keymap.set("n", "", function() change_scale_factor(1 / 1.25) end) --- Hide mouse when typing in neovide -g.neovide_hide_mouse_when_typing = true +-- Hide mouse when typing in neovide (disabled) +g.neovide_hide_mouse_when_typing = false -- Enable cursor particles in neovide g.neovide_cursor_vfx_mode = "railgun" From 8eed2f76b598355a8eaebbc5b59d7a4bb8fe84b4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 4 Dec 2023 10:12:33 +0200 Subject: [PATCH 2181/2667] Nvim: add back lazy lockfile, update plugins --- home/.config/nvim/init.lua | 3 +- home/.config/nvim/lazy-lock.json | 58 ++++++++++++++++++-------------- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 005a91a3..6ada43db 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -16,7 +16,8 @@ require("settings") require("neovide") require("highlight_yank") require("lazy").setup({ - import = "plugins", + spec = { import = "plugins" }, + lockfile = "~/git/dotfiles/home/.config/nvim/lazy-lock.json", performance = { disabled_plugins = { "netrwPlugin" }, }, diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 49de6968..897a19aa 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,6 +1,7 @@ { - "LuaSnip": { "branch": "master", "commit": "1f4ad8bb72bdeb60975e98652636b991a9b7475d" }, - "bufferline.nvim": { "branch": "main", "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" }, + "LuaSnip": { "branch": "master", "commit": "f03089854a8e15594a01562fa7192d0009a6fbe7" }, + "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, + "bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -10,47 +11,54 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "confirm-quit.nvim": { "branch": "main", "commit": "1095c5056b12d5a8aa16817546bc9ab8518e2faf" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, - "emmylua-nvim": { "branch": "master", "commit": "50b2eead8af6499fbba708553148ee8156d6612e" }, + "copilot.lua": { "branch": "master", "commit": "38a41d0d78f8823cc144c99784528b9a68bdd608" }, + "dropbar.nvim": { "branch": "master", "commit": "2b7c2d53363cb3d93376904dac3ea6d52dd900c5" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, - "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, - "gitsigns.nvim": { "branch": "main", "commit": "37d26d718f8120a8c5c107c580c8c98cf89fdf1f" }, - "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, + "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, + "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, + "indent-blankline.nvim": { "branch": "master", "commit": "dbd90bb689ff10d21fee6792eb8928f0584b5860" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "ab640b38ca9fa50d25d2d249b6606b9456b628d5" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "e4f34741daa9cf95de68a603d3e7a6844a69fdf0" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "4eb8e15e3c0757303d4c6dea64d2981fc679e990" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, - "neoformat": { "branch": "master", "commit": "e5fe7e8f7c3dd071b90f19af0e8c7cfa56cdedc7" }, + "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, + "neodev.nvim": { "branch": "main", "commit": "1676d2c24186fc30005317e0306d20c639b2351b" }, + "neoformat": { "branch": "master", "commit": "afbc055587e88554b1fd11408cfab859d0cd40d3" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, + "nui.nvim": { "branch": "main", "commit": "1d044afde83e73c56de8e176615a4a6e7c8cf0e3" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "e154fdb6d70b3765d71f296e718b29d8b7026a63" }, - "nvim-jdtls": { "branch": "master", "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" }, - "nvim-lspconfig": { "branch": "master", "commit": "48347089666d5b77d054088aa72e4e0b58026e6e" }, - "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" }, + "nvim-dap": { "branch": "master", "commit": "d7749eb3d9933a75d2244820308ce442f646c7ae" }, + "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, + "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "1e0ffa0acc92f88f9f2b68df47ccbe1917653a42" }, + "nvim-lspconfig": { "branch": "master", "commit": "694aaec65733e2d54d393abf80e526f86726c988" }, "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, - "nvim-tree.lua": { "branch": "master", "commit": "80cfeadf179d5cba76f0f502c71dbcff1b515cd8" }, - "nvim-treesitter": { "branch": "master", "commit": "557561fbc17269cdd4e9e88ef0ca1a9ff0bbf7e6" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "6c30f3c8915d7b31c3decdfe6c7672432da1809d" }, - "nvim-web-devicons": { "branch": "master", "commit": "3523d6e6d40ab11fd66c1b2732b3d6b60affa951" }, - "password-store": { "branch": "master", "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "nvim-tree.lua": { "branch": "master", "commit": "7e5c6731804bd892ace56692784290d2fc5a0f74" }, + "nvim-treesitter": { "branch": "master", "commit": "67536f4057e4901e37805708bcfdd3d9abacfd26" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" }, + "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, + "nvim-ufo": { "branch": "main", "commit": "9fa77fb7e4365a053a5303b773aaf5eaf806d1f4" }, + "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" }, + "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, + "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, + "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, + "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, + "statuscol.nvim": { "branch": "main", "commit": "98d02fc90ebd7c4674ec935074d1d09443d49318" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, - "telescope-ui-select.nvim": { "branch": "master", "commit": "0fc69ebbf178631b8ab76745459fade062156ec5" }, - "telescope.nvim": { "branch": "master", "commit": "18774ec7929c8a8003a91e9e1f69f6c32258bbfe" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "c261d903a78c2cda47a5e44488621f10f9dd7fcf" }, + "telescope.nvim": { "branch": "master", "commit": "3f5f165447d797576206e3b9bd555ea8db85b6f2" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" }, "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From 91339aacf125b4529d49106287193c013cdf0689 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 4 Dec 2023 10:12:33 +0200 Subject: [PATCH 2182/2667] Nvim: add back lazy lockfile, update plugins --- home/.config/nvim/init.lua | 3 +- home/.config/nvim/lazy-lock.json | 58 ++++++++++++++++++-------------- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 005a91a3..6ada43db 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -16,7 +16,8 @@ require("settings") require("neovide") require("highlight_yank") require("lazy").setup({ - import = "plugins", + spec = { import = "plugins" }, + lockfile = "~/git/dotfiles/home/.config/nvim/lazy-lock.json", performance = { disabled_plugins = { "netrwPlugin" }, }, diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 49de6968..897a19aa 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,6 +1,7 @@ { - "LuaSnip": { "branch": "master", "commit": "1f4ad8bb72bdeb60975e98652636b991a9b7475d" }, - "bufferline.nvim": { "branch": "main", "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" }, + "LuaSnip": { "branch": "master", "commit": "f03089854a8e15594a01562fa7192d0009a6fbe7" }, + "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, + "bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -10,47 +11,54 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "confirm-quit.nvim": { "branch": "main", "commit": "1095c5056b12d5a8aa16817546bc9ab8518e2faf" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, - "emmylua-nvim": { "branch": "master", "commit": "50b2eead8af6499fbba708553148ee8156d6612e" }, + "copilot.lua": { "branch": "master", "commit": "38a41d0d78f8823cc144c99784528b9a68bdd608" }, + "dropbar.nvim": { "branch": "master", "commit": "2b7c2d53363cb3d93376904dac3ea6d52dd900c5" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, - "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, - "gitsigns.nvim": { "branch": "main", "commit": "37d26d718f8120a8c5c107c580c8c98cf89fdf1f" }, - "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, + "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, + "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, + "indent-blankline.nvim": { "branch": "master", "commit": "dbd90bb689ff10d21fee6792eb8928f0584b5860" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "ab640b38ca9fa50d25d2d249b6606b9456b628d5" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "e4f34741daa9cf95de68a603d3e7a6844a69fdf0" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "4eb8e15e3c0757303d4c6dea64d2981fc679e990" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, - "neoformat": { "branch": "master", "commit": "e5fe7e8f7c3dd071b90f19af0e8c7cfa56cdedc7" }, + "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, + "neodev.nvim": { "branch": "main", "commit": "1676d2c24186fc30005317e0306d20c639b2351b" }, + "neoformat": { "branch": "master", "commit": "afbc055587e88554b1fd11408cfab859d0cd40d3" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, + "nui.nvim": { "branch": "main", "commit": "1d044afde83e73c56de8e176615a4a6e7c8cf0e3" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "e154fdb6d70b3765d71f296e718b29d8b7026a63" }, - "nvim-jdtls": { "branch": "master", "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" }, - "nvim-lspconfig": { "branch": "master", "commit": "48347089666d5b77d054088aa72e4e0b58026e6e" }, - "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" }, + "nvim-dap": { "branch": "master", "commit": "d7749eb3d9933a75d2244820308ce442f646c7ae" }, + "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, + "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "1e0ffa0acc92f88f9f2b68df47ccbe1917653a42" }, + "nvim-lspconfig": { "branch": "master", "commit": "694aaec65733e2d54d393abf80e526f86726c988" }, "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, - "nvim-tree.lua": { "branch": "master", "commit": "80cfeadf179d5cba76f0f502c71dbcff1b515cd8" }, - "nvim-treesitter": { "branch": "master", "commit": "557561fbc17269cdd4e9e88ef0ca1a9ff0bbf7e6" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "6c30f3c8915d7b31c3decdfe6c7672432da1809d" }, - "nvim-web-devicons": { "branch": "master", "commit": "3523d6e6d40ab11fd66c1b2732b3d6b60affa951" }, - "password-store": { "branch": "master", "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "nvim-tree.lua": { "branch": "master", "commit": "7e5c6731804bd892ace56692784290d2fc5a0f74" }, + "nvim-treesitter": { "branch": "master", "commit": "67536f4057e4901e37805708bcfdd3d9abacfd26" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" }, + "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, + "nvim-ufo": { "branch": "main", "commit": "9fa77fb7e4365a053a5303b773aaf5eaf806d1f4" }, + "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" }, + "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, + "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, + "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, + "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, + "statuscol.nvim": { "branch": "main", "commit": "98d02fc90ebd7c4674ec935074d1d09443d49318" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, - "telescope-ui-select.nvim": { "branch": "master", "commit": "0fc69ebbf178631b8ab76745459fade062156ec5" }, - "telescope.nvim": { "branch": "master", "commit": "18774ec7929c8a8003a91e9e1f69f6c32258bbfe" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "c261d903a78c2cda47a5e44488621f10f9dd7fcf" }, + "telescope.nvim": { "branch": "master", "commit": "3f5f165447d797576206e3b9bd555ea8db85b6f2" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" }, "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From 468cc65e273ce0140270227a988e0934197c872a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 4 Dec 2023 10:14:51 +0200 Subject: [PATCH 2183/2667] Update all: update dotfiles first, use lazy restore instead of sync --- home/.config/zsh/04-aliases.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 4a5a1516..d9ea72e3 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -170,13 +170,13 @@ passync() { pass git pull && pass git push && updatesecrets } update() { all() { + dotfiles packages {%@@ if profile == "Moria" @@%} repo docker-update {%@@ endif @@%} plugins - dotfiles } packages() { @@ -195,7 +195,7 @@ update() { plugins() { echo "Updating NeoVim plugins" - nvim --headless -c "Lazy! sync" -c 'TSUpdateSync' -c 'MasonToolsUpdate' -c 'qa' + nvim --headless -c "Lazy! restore" -c 'TSUpdateSync' -c 'MasonToolsUpdate' -c 'qa' zinit self-update zinit update -p {%@@ if profile == "Moria" @@%} From 21855752931edd9cac20f6272b2647e082054047 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 4 Dec 2023 10:14:51 +0200 Subject: [PATCH 2184/2667] Update all: update dotfiles first, use lazy restore instead of sync --- home/.config/zsh/04-aliases.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 4a5a1516..d9ea72e3 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -170,13 +170,13 @@ passync() { pass git pull && pass git push && updatesecrets } update() { all() { + dotfiles packages {%@@ if profile == "Moria" @@%} repo docker-update {%@@ endif @@%} plugins - dotfiles } packages() { @@ -195,7 +195,7 @@ update() { plugins() { echo "Updating NeoVim plugins" - nvim --headless -c "Lazy! sync" -c 'TSUpdateSync' -c 'MasonToolsUpdate' -c 'qa' + nvim --headless -c "Lazy! restore" -c 'TSUpdateSync' -c 'MasonToolsUpdate' -c 'qa' zinit self-update zinit update -p {%@@ if profile == "Moria" @@%} From 726ab946b03d57cf49b49b3d306389a3881b85a5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 4 Dec 2023 12:59:09 +0200 Subject: [PATCH 2185/2667] Nvim: enable java debugging for jdtls --- home/.config/nvim/ftplugin/java.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 33388087..258dbc7a 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -1,5 +1,6 @@ local nvim_local_dir = vim.fn.expand("~/.local/share/nvim") -local lombok_jar = nvim_local_dir .. "/mason/packages/jdtls/lombok.jar" +local mason_packages = nvim_local_dir .. "/mason/packages" +local lombok_jar = mason_packages .. "/jdtls/lombok.jar" local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name local lsp_utils = require("lsp_utils") @@ -50,6 +51,11 @@ require("jdtls").start_or_attach({ handlers = { ["language/status"] = function() end, }, + init_options = { + bundles = { + vim.fn.glob(mason_packages .. "/java-debug-adapter/extension/server/com.microsoft.java.debug.plugin-*.jar"), + }, + }, capabilities = lsp_utils.get_capabilities(), on_attach = lsp_utils.on_attach, }) From a3c027d3f1cb0d9022dde4e196adc3720360b740 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 4 Dec 2023 12:59:09 +0200 Subject: [PATCH 2186/2667] Nvim: enable java debugging for jdtls --- home/.config/nvim/ftplugin/java.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 33388087..258dbc7a 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -1,5 +1,6 @@ local nvim_local_dir = vim.fn.expand("~/.local/share/nvim") -local lombok_jar = nvim_local_dir .. "/mason/packages/jdtls/lombok.jar" +local mason_packages = nvim_local_dir .. "/mason/packages" +local lombok_jar = mason_packages .. "/jdtls/lombok.jar" local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name local lsp_utils = require("lsp_utils") @@ -50,6 +51,11 @@ require("jdtls").start_or_attach({ handlers = { ["language/status"] = function() end, }, + init_options = { + bundles = { + vim.fn.glob(mason_packages .. "/java-debug-adapter/extension/server/com.microsoft.java.debug.plugin-*.jar"), + }, + }, capabilities = lsp_utils.get_capabilities(), on_attach = lsp_utils.on_attach, }) From c5b2c6e24a54c35f7eeb4aeeb5725174c52d9029 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Dec 2023 20:20:20 +0200 Subject: [PATCH 2187/2667] Nvim: make copilot lower in the completions list --- home/.config/nvim/lua/plugins/cmp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index cfa81823..3891206f 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -67,10 +67,10 @@ return { }, sources = { { name = "luasnip" }, - { name = "copilot" }, { name = "nvim_lsp" }, { name = "nvim_lua" }, { name = "git" }, + { name = "copilot" }, { name = "buffer" }, { name = "spell" }, { name = "path" }, From d23c84d2f7ac00040c6f7ab1260f27ffd15ff98b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Dec 2023 20:20:20 +0200 Subject: [PATCH 2188/2667] Nvim: make copilot lower in the completions list --- home/.config/nvim/lua/plugins/cmp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index cfa81823..3891206f 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -67,10 +67,10 @@ return { }, sources = { { name = "luasnip" }, - { name = "copilot" }, { name = "nvim_lsp" }, { name = "nvim_lua" }, { name = "git" }, + { name = "copilot" }, { name = "buffer" }, { name = "spell" }, { name = "path" }, From 25d531a401cd3e30b0b9d49ebbe22a98ea77e3a5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Dec 2023 20:21:40 +0200 Subject: [PATCH 2189/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 50 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 897a19aa..f87d79d2 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,64 +1,64 @@ { - "LuaSnip": { "branch": "master", "commit": "f03089854a8e15594a01562fa7192d0009a6fbe7" }, + "LuaSnip": { "branch": "master", "commit": "57c9f5c31b3d712376c704673eac8e948c82e9c1" }, "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, - "bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" }, + "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-git": { "branch": "main", "commit": "f900a4cf117300fdc3ba31d26f8b6223ccd9c574" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "confirm-quit.nvim": { "branch": "main", "commit": "1095c5056b12d5a8aa16817546bc9ab8518e2faf" }, + "confirm-quit.nvim": { "branch": "main", "commit": "78a1ba1c5e307c85f102d1dba398bcc13464a820" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "38a41d0d78f8823cc144c99784528b9a68bdd608" }, - "dropbar.nvim": { "branch": "master", "commit": "2b7c2d53363cb3d93376904dac3ea6d52dd900c5" }, + "copilot.lua": { "branch": "master", "commit": "dcaaed5b58e6c2d395bca18d25d34e6384856722" }, + "dropbar.nvim": { "branch": "master", "commit": "e218e882a8e993e267b727859d8688f84e91ef1a" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, - "indent-blankline.nvim": { "branch": "master", "commit": "dbd90bb689ff10d21fee6792eb8928f0584b5860" }, + "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, + "indent-blankline.nvim": { "branch": "master", "commit": "d4c718467d35bc93714425a7102d82e7e5065280" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "4eb8e15e3c0757303d4c6dea64d2981fc679e990" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "1676d2c24186fc30005317e0306d20c639b2351b" }, - "neoformat": { "branch": "master", "commit": "afbc055587e88554b1fd11408cfab859d0cd40d3" }, + "neodev.nvim": { "branch": "main", "commit": "be6bf4f5d2d3b173c9291f074130a3d29e1af78a" }, + "neoformat": { "branch": "master", "commit": "cd45ca8309d5261e8e76557c11a22b2f1ffc710b" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "1d044afde83e73c56de8e176615a4a6e7c8cf0e3" }, + "nui.nvim": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, - "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, + "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "d7749eb3d9933a75d2244820308ce442f646c7ae" }, + "nvim-dap": { "branch": "master", "commit": "e64ebf3309154b578a03c76229ebf51c37898118" }, "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "1e0ffa0acc92f88f9f2b68df47ccbe1917653a42" }, - "nvim-lspconfig": { "branch": "master", "commit": "694aaec65733e2d54d393abf80e526f86726c988" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, + "nvim-lspconfig": { "branch": "master", "commit": "e50a8fcd6267cb9b2d2a880dcf3a8ac113b75abc" }, "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, - "nvim-tree.lua": { "branch": "master", "commit": "7e5c6731804bd892ace56692784290d2fc5a0f74" }, - "nvim-treesitter": { "branch": "master", "commit": "67536f4057e4901e37805708bcfdd3d9abacfd26" }, + "nvim-tree.lua": { "branch": "master", "commit": "141c0f97c35f274031294267808ada59bb5fb08e" }, + "nvim-treesitter": { "branch": "master", "commit": "25ddfde8d7167d7d81403d6809242439037d2b68" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" }, - "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, - "nvim-ufo": { "branch": "main", "commit": "9fa77fb7e4365a053a5303b773aaf5eaf806d1f4" }, - "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, + "nvim-ufo": { "branch": "main", "commit": "a15944ff8e3d570f504f743d55209275ed1169c4" }, + "nvim-web-devicons": { "branch": "master", "commit": "a1425903ab52a0a0460622519e827f224e5b4fee" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, - "statuscol.nvim": { "branch": "main", "commit": "98d02fc90ebd7c4674ec935074d1d09443d49318" }, + "statuscol.nvim": { "branch": "main", "commit": "7d593a285d83c1a865219e4e7e1e5aedf4e0dd9c" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, - "telescope-ui-select.nvim": { "branch": "master", "commit": "c261d903a78c2cda47a5e44488621f10f9dd7fcf" }, - "telescope.nvim": { "branch": "master", "commit": "3f5f165447d797576206e3b9bd555ea8db85b6f2" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, + "telescope.nvim": { "branch": "master", "commit": "6213322ab56eb27356fdc09a5078e41e3ea7f3bc" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" }, + "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From 2c96ee40eba8eb662203045ecf10cfb6069b9a6c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Dec 2023 20:21:40 +0200 Subject: [PATCH 2190/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 50 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 897a19aa..f87d79d2 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,64 +1,64 @@ { - "LuaSnip": { "branch": "master", "commit": "f03089854a8e15594a01562fa7192d0009a6fbe7" }, + "LuaSnip": { "branch": "master", "commit": "57c9f5c31b3d712376c704673eac8e948c82e9c1" }, "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, - "bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" }, + "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-git": { "branch": "main", "commit": "f900a4cf117300fdc3ba31d26f8b6223ccd9c574" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "confirm-quit.nvim": { "branch": "main", "commit": "1095c5056b12d5a8aa16817546bc9ab8518e2faf" }, + "confirm-quit.nvim": { "branch": "main", "commit": "78a1ba1c5e307c85f102d1dba398bcc13464a820" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "38a41d0d78f8823cc144c99784528b9a68bdd608" }, - "dropbar.nvim": { "branch": "master", "commit": "2b7c2d53363cb3d93376904dac3ea6d52dd900c5" }, + "copilot.lua": { "branch": "master", "commit": "dcaaed5b58e6c2d395bca18d25d34e6384856722" }, + "dropbar.nvim": { "branch": "master", "commit": "e218e882a8e993e267b727859d8688f84e91ef1a" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, - "indent-blankline.nvim": { "branch": "master", "commit": "dbd90bb689ff10d21fee6792eb8928f0584b5860" }, + "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, + "indent-blankline.nvim": { "branch": "master", "commit": "d4c718467d35bc93714425a7102d82e7e5065280" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "4eb8e15e3c0757303d4c6dea64d2981fc679e990" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "1676d2c24186fc30005317e0306d20c639b2351b" }, - "neoformat": { "branch": "master", "commit": "afbc055587e88554b1fd11408cfab859d0cd40d3" }, + "neodev.nvim": { "branch": "main", "commit": "be6bf4f5d2d3b173c9291f074130a3d29e1af78a" }, + "neoformat": { "branch": "master", "commit": "cd45ca8309d5261e8e76557c11a22b2f1ffc710b" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "1d044afde83e73c56de8e176615a4a6e7c8cf0e3" }, + "nui.nvim": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, - "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, + "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "d7749eb3d9933a75d2244820308ce442f646c7ae" }, + "nvim-dap": { "branch": "master", "commit": "e64ebf3309154b578a03c76229ebf51c37898118" }, "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "1e0ffa0acc92f88f9f2b68df47ccbe1917653a42" }, - "nvim-lspconfig": { "branch": "master", "commit": "694aaec65733e2d54d393abf80e526f86726c988" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, + "nvim-lspconfig": { "branch": "master", "commit": "e50a8fcd6267cb9b2d2a880dcf3a8ac113b75abc" }, "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, - "nvim-tree.lua": { "branch": "master", "commit": "7e5c6731804bd892ace56692784290d2fc5a0f74" }, - "nvim-treesitter": { "branch": "master", "commit": "67536f4057e4901e37805708bcfdd3d9abacfd26" }, + "nvim-tree.lua": { "branch": "master", "commit": "141c0f97c35f274031294267808ada59bb5fb08e" }, + "nvim-treesitter": { "branch": "master", "commit": "25ddfde8d7167d7d81403d6809242439037d2b68" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" }, - "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, - "nvim-ufo": { "branch": "main", "commit": "9fa77fb7e4365a053a5303b773aaf5eaf806d1f4" }, - "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, + "nvim-ufo": { "branch": "main", "commit": "a15944ff8e3d570f504f743d55209275ed1169c4" }, + "nvim-web-devicons": { "branch": "master", "commit": "a1425903ab52a0a0460622519e827f224e5b4fee" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, - "statuscol.nvim": { "branch": "main", "commit": "98d02fc90ebd7c4674ec935074d1d09443d49318" }, + "statuscol.nvim": { "branch": "main", "commit": "7d593a285d83c1a865219e4e7e1e5aedf4e0dd9c" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, - "telescope-ui-select.nvim": { "branch": "master", "commit": "c261d903a78c2cda47a5e44488621f10f9dd7fcf" }, - "telescope.nvim": { "branch": "master", "commit": "3f5f165447d797576206e3b9bd555ea8db85b6f2" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, + "telescope.nvim": { "branch": "master", "commit": "6213322ab56eb27356fdc09a5078e41e3ea7f3bc" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" }, + "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From 59cac7665731c3cd3fa90c62c5b5d02ca75c8378 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Dec 2023 15:41:04 +0200 Subject: [PATCH 2191/2667] Nvim: fix jdtls plugin path Now it is not version specific anymore --- home/.config/nvim/ftplugin/java.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 258dbc7a..a878e56c 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -21,7 +21,7 @@ require("jdtls").start_or_attach({ "java.base/java.lang=ALL-UNNAMED", "-javaagent:" .. lombok_jar, "-jar", - nvim_local_dir .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar", + vim.fn.glob(mason_packages .. "/jdtls/plugins/org.eclipse.equinox.launcher_*.jar"), "-configuration", nvim_local_dir .. "/mason/packages/jdtls/config_linux", "-data", From 29c8f2dbd4256261566786cce0613469acedefdb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Dec 2023 15:41:04 +0200 Subject: [PATCH 2192/2667] Nvim: fix jdtls plugin path Now it is not version specific anymore --- home/.config/nvim/ftplugin/java.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 258dbc7a..a878e56c 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -21,7 +21,7 @@ require("jdtls").start_or_attach({ "java.base/java.lang=ALL-UNNAMED", "-javaagent:" .. lombok_jar, "-jar", - nvim_local_dir .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar", + vim.fn.glob(mason_packages .. "/jdtls/plugins/org.eclipse.equinox.launcher_*.jar"), "-configuration", nvim_local_dir .. "/mason/packages/jdtls/config_linux", "-data", From be0452583cc8d0ddccc8b77676013d65c98100e0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 27 Dec 2023 10:02:55 +0200 Subject: [PATCH 2193/2667] Nvim: enable text objects for functions and classes --- home/.config/nvim/lua/plugins/treesitter.lua | 27 ++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index 9ce270d6..1c8d78c9 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -69,6 +69,33 @@ return { goto_previous_start = { ["[f"] = "@function.outer", ["[c"] = "@class.outer" }, goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer" }, }, + select = { + enable = true, + lookahead = true, + keymaps = { + ["af"] = { + query = "@function.outer", + desc = "Select outer part of a function", + }, + ["if"] = { + query = "@function.inner", + desc = "Select inner part of a function", + }, + ["ac"] = { + query = "@class.outer", + desc = "Select outer part of a class", + }, + ["ic"] = { + query = "@class.inner", + desc = "Select inner part of a class", + }, + ["as"] = { + query = "@scope", + query_group = "locals", + desc = "Select language scope", + }, + }, + }, }, }, --- @param opts TSConfig From 4f63196ec09d3ecbd82d971a69a4e52af11a7460 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 27 Dec 2023 10:02:55 +0200 Subject: [PATCH 2194/2667] Nvim: enable text objects for functions and classes --- home/.config/nvim/lua/plugins/treesitter.lua | 27 ++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index 9ce270d6..1c8d78c9 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -69,6 +69,33 @@ return { goto_previous_start = { ["[f"] = "@function.outer", ["[c"] = "@class.outer" }, goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer" }, }, + select = { + enable = true, + lookahead = true, + keymaps = { + ["af"] = { + query = "@function.outer", + desc = "Select outer part of a function", + }, + ["if"] = { + query = "@function.inner", + desc = "Select inner part of a function", + }, + ["ac"] = { + query = "@class.outer", + desc = "Select outer part of a class", + }, + ["ic"] = { + query = "@class.inner", + desc = "Select inner part of a class", + }, + ["as"] = { + query = "@scope", + query_group = "locals", + desc = "Select language scope", + }, + }, + }, }, }, --- @param opts TSConfig From 8ba0dded9baf916943281295ec555a43abe3afc2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 27 Dec 2023 14:50:20 +0200 Subject: [PATCH 2195/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index f87d79d2..55010fda 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "57c9f5c31b3d712376c704673eac8e948c82e9c1" }, + "LuaSnip": { "branch": "master", "commit": "07f5d974203a5d957e7b464020261a657f59556d" }, "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, @@ -13,49 +13,49 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "78a1ba1c5e307c85f102d1dba398bcc13464a820" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "dcaaed5b58e6c2d395bca18d25d34e6384856722" }, - "dropbar.nvim": { "branch": "master", "commit": "e218e882a8e993e267b727859d8688f84e91ef1a" }, + "copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" }, + "dropbar.nvim": { "branch": "master", "commit": "ee3a356254ab494c0e280b809969a7a3a7e38fb7" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d4c718467d35bc93714425a7102d82e7e5065280" }, + "indent-blankline.nvim": { "branch": "master", "commit": "5da5546947f3125dfd6aa85ab21074dc83f776d5" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, + "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "be6bf4f5d2d3b173c9291f074130a3d29e1af78a" }, + "neodev.nvim": { "branch": "main", "commit": "029899ea32d3dc8ed8c910ceca2ee5d16e566c11" }, "neoformat": { "branch": "master", "commit": "cd45ca8309d5261e8e76557c11a22b2f1ffc710b" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "nui.nvim": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, - "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, + "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "e64ebf3309154b578a03c76229ebf51c37898118" }, + "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, - "nvim-lspconfig": { "branch": "master", "commit": "e50a8fcd6267cb9b2d2a880dcf3a8ac113b75abc" }, - "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, - "nvim-tree.lua": { "branch": "master", "commit": "141c0f97c35f274031294267808ada59bb5fb08e" }, - "nvim-treesitter": { "branch": "master", "commit": "25ddfde8d7167d7d81403d6809242439037d2b68" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" }, + "nvim-lspconfig": { "branch": "master", "commit": "9099871a7c7e1c16122e00d70208a2cd02078d80" }, + "nvim-notify": { "branch": "master", "commit": "27a6649ba6b22828ccc67c913f95a5407a2d8bec" }, + "nvim-tree.lua": { "branch": "master", "commit": "50f30bcd8c62ac4a83d133d738f268279f2c2ce2" }, + "nvim-treesitter": { "branch": "master", "commit": "27f68c0b6a87cbad900b3d016425450af8268026" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "0e2d5bd4cbe75849a013901555d436a48c6680cb" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ufo": { "branch": "main", "commit": "a15944ff8e3d570f504f743d55209275ed1169c4" }, - "nvim-web-devicons": { "branch": "master", "commit": "a1425903ab52a0a0460622519e827f224e5b4fee" }, + "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" }, + "nvim-web-devicons": { "branch": "master", "commit": "43aa2ddf476012a2155f5f969ee55ab17174da7a" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, - "statuscol.nvim": { "branch": "main", "commit": "7d593a285d83c1a865219e4e7e1e5aedf4e0dd9c" }, + "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "6213322ab56eb27356fdc09a5078e41e3ea7f3bc" }, + "telescope.nvim": { "branch": "master", "commit": "aacaa9cd031da83ce08d8fa5f19083d731f7f62c" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, From f8f8687fb5acb580f6d9ee3fefdcacc729e10ecb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 27 Dec 2023 14:50:20 +0200 Subject: [PATCH 2196/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index f87d79d2..55010fda 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "57c9f5c31b3d712376c704673eac8e948c82e9c1" }, + "LuaSnip": { "branch": "master", "commit": "07f5d974203a5d957e7b464020261a657f59556d" }, "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, @@ -13,49 +13,49 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "78a1ba1c5e307c85f102d1dba398bcc13464a820" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "dcaaed5b58e6c2d395bca18d25d34e6384856722" }, - "dropbar.nvim": { "branch": "master", "commit": "e218e882a8e993e267b727859d8688f84e91ef1a" }, + "copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" }, + "dropbar.nvim": { "branch": "master", "commit": "ee3a356254ab494c0e280b809969a7a3a7e38fb7" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d4c718467d35bc93714425a7102d82e7e5065280" }, + "indent-blankline.nvim": { "branch": "master", "commit": "5da5546947f3125dfd6aa85ab21074dc83f776d5" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, + "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "be6bf4f5d2d3b173c9291f074130a3d29e1af78a" }, + "neodev.nvim": { "branch": "main", "commit": "029899ea32d3dc8ed8c910ceca2ee5d16e566c11" }, "neoformat": { "branch": "master", "commit": "cd45ca8309d5261e8e76557c11a22b2f1ffc710b" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "nui.nvim": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, - "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, + "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "e64ebf3309154b578a03c76229ebf51c37898118" }, + "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, - "nvim-lspconfig": { "branch": "master", "commit": "e50a8fcd6267cb9b2d2a880dcf3a8ac113b75abc" }, - "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, - "nvim-tree.lua": { "branch": "master", "commit": "141c0f97c35f274031294267808ada59bb5fb08e" }, - "nvim-treesitter": { "branch": "master", "commit": "25ddfde8d7167d7d81403d6809242439037d2b68" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" }, + "nvim-lspconfig": { "branch": "master", "commit": "9099871a7c7e1c16122e00d70208a2cd02078d80" }, + "nvim-notify": { "branch": "master", "commit": "27a6649ba6b22828ccc67c913f95a5407a2d8bec" }, + "nvim-tree.lua": { "branch": "master", "commit": "50f30bcd8c62ac4a83d133d738f268279f2c2ce2" }, + "nvim-treesitter": { "branch": "master", "commit": "27f68c0b6a87cbad900b3d016425450af8268026" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "0e2d5bd4cbe75849a013901555d436a48c6680cb" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ufo": { "branch": "main", "commit": "a15944ff8e3d570f504f743d55209275ed1169c4" }, - "nvim-web-devicons": { "branch": "master", "commit": "a1425903ab52a0a0460622519e827f224e5b4fee" }, + "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" }, + "nvim-web-devicons": { "branch": "master", "commit": "43aa2ddf476012a2155f5f969ee55ab17174da7a" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, - "statuscol.nvim": { "branch": "main", "commit": "7d593a285d83c1a865219e4e7e1e5aedf4e0dd9c" }, + "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "6213322ab56eb27356fdc09a5078e41e3ea7f3bc" }, + "telescope.nvim": { "branch": "master", "commit": "aacaa9cd031da83ce08d8fa5f19083d731f7f62c" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, From 8c533276a191dee13b562ce700c5e229c715e27d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 29 Dec 2023 19:29:56 +0200 Subject: [PATCH 2197/2667] Migrate from misskey to firefish --- docker/caddy/Caddyfile | 44 +++++++++++++++++++++-------- docker/firefish/docker-compose.toml | 41 +++++++++++++++++++++++++++ docker/misskey/docker-compose.toml | 44 ----------------------------- docker/postgres/docker-compose.toml | 2 +- 4 files changed, 74 insertions(+), 57 deletions(-) create mode 100644 docker/firefish/docker-compose.toml delete mode 100644 docker/misskey/docker-compose.toml diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 3149a812..dd9680b6 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -10,8 +10,8 @@ korhonen.cc, *.korhonen.cc { Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" } - @homepage-redir host www.korhonen.cc - handle @homepage-redir { + @homepage-www-redir host www.korhonen.cc + handle @homepage-www-redir { redir https://korhonen.cc } @@ -25,7 +25,7 @@ korhonen.cc, *.korhonen.cc { handle @wkd { root * /var/www/wkd file_server browse - header Access-Control-Allow-Origin "*" + header Access-Control-Allow-Origin "*" } @index host index.korhonen.cc @@ -69,11 +69,6 @@ korhonen.cc, *.korhonen.cc { reverse_proxy jellyfin:8096 } - @misskey host social.korhonen.cc - handle @misskey { - reverse_proxy misskey:3000 - } - @pihole host pihole.korhonen.cc handle @pihole { reverse_proxy pihole @@ -82,7 +77,7 @@ korhonen.cc, *.korhonen.cc { @umami host umami.korhonen.cc handle @umami { reverse_proxy umami:3000 - rewrite /ua9quuaW.js /script.js + rewrite /ua9quuaW.js /script.js } @nextcloud host cloud.korhonen.cc @@ -134,7 +129,13 @@ korhonen.cc, *.korhonen.cc { @drop host drop.korhonen.cc handle @drop { - reverse_proxy drop:3000 + reverse_proxy drop:3000 + } + + # Redirect to new fediverse host + @misskey host social.korhonen.cc + handle @misskey { + redir https://korhonen.social } # Fallback for unhandled domains @@ -143,6 +144,25 @@ korhonen.cc, *.korhonen.cc { } } -korhonen.social { - respond "Kbin instance coming soon" +korhonen.social, *.korhonen.social { + tls {$CLOUDFLARE_EMAIL} { + dns cloudflare {$CLOUDFLARE_API_TOKEN} + resolvers 1.1.1.1 + } + + encode zstd gzip + + header { + Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" + } + + @firefish-www-redir host www.korhonen.social + handle @firefish-www-redir { + redir https://korhonen.social + } + + @firefish host korhonen.social + handle @firefish { + reverse_proxy firefish:3000 + } } diff --git a/docker/firefish/docker-compose.toml b/docker/firefish/docker-compose.toml new file mode 100644 index 00000000..25f28504 --- /dev/null +++ b/docker/firefish/docker-compose.toml @@ -0,0 +1,41 @@ +#:schema https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json + +[services.firefish] +image = "registry.joinfirefish.org/firefish/firefish:beta-amd64" +container_name = "firefish" +restart = "unless-stopped" +depends_on = ["redis"] +ports = ["3083:3000"] +networks = ["firefish", "proxy", "postgres"] +environment = { NODE_ENV = "production" } +volumes = [ + "/docker/firefish/files:/firefish/files", + "/docker/firefish/config:/firefish/.config:ro", +] + +[services.redis] +image = "redis" +container_name = "redis-firefish" +restart = "unless-stopped" +networks = ["firefish"] +volumes = ["/docker/firefish/redis:/data"] + +[services.sonic] +image = "valeriansaliou/sonic:v1.4.0" +container_name = "sonic-firefish" +logging = { driver = "none" } +networks = ["firefish"] +volumes = [ + "/docker/firefish/sonic:/var/lib/sonic/store", + "/docker/firefish/sonic/config.cfg:/etc/sonic.cfg", +] +env_file = ".env" + +[networks.firefish] +internal = true + +[networks.proxy] +external = true + +[networks.postgres] +external = true diff --git a/docker/misskey/docker-compose.toml b/docker/misskey/docker-compose.toml deleted file mode 100644 index 27430f84..00000000 --- a/docker/misskey/docker-compose.toml +++ /dev/null @@ -1,44 +0,0 @@ -[services.misskey] -image = "misskey/misskey" -container_name = "misskey" -restart = "unless-stopped" -depends_on = ["redis"] -ports = ["3082:3000"] -networks = ["misskey", "proxy", "postgres"] -volumes = [ - "/docker/misskey/files:/misskey/files", - "/docker/misskey/config:/misskey/.config:ro", -] - -#[services.elasticsearch] -#image = "docker.elastic.co/elasticsearch/elasticsearch:7.17.8" -#container_name = "misskey-elasticsearch" -#restart = "unless-stopped" -#volumes = ["/docker/misskey/elasticsearch/:/usr/share/elasticsearch/data"] -#networks = ["misskey"] -#environment = [ -# "cluster.name=misskey-es-cluster", -# "node.name=misskey-node", -# "discovery.type=single-node", -# "bootstrap.memory_lock=true", -# "ES_JAVA_OPTS=-Xms200m -Xmx200m", -#] -#[services.elasticsearch.ulimits.memlock] -#soft = -1 -#hard = -1 - -[services.redis] -image = "redis" -container_name = "redis-misskey" -restart = "unless-stopped" -networks = ["misskey"] -volumes = ["/docker/misskey/redis:/data"] - -[networks.misskey] -internal = true - -[networks.proxy] -external = true - -[networks.postgres] -external = true diff --git a/docker/postgres/docker-compose.toml b/docker/postgres/docker-compose.toml index e8a9ec85..6e9f04f1 100644 --- a/docker/postgres/docker-compose.toml +++ b/docker/postgres/docker-compose.toml @@ -2,7 +2,7 @@ [services.postgres] container_name = "postgres" -image = "postgres:15" +image = "postgres:16" environment = ["TZ=Europe/Helsinki", "POSTGRES_PASSWORD=12345"] ports = ["5432:5432"] networks = ["postgres"] From e67dfedbe5c4f2758680cd9d40e5ae67be2fd738 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 29 Dec 2023 19:29:56 +0200 Subject: [PATCH 2198/2667] Migrate from misskey to firefish --- docker/caddy/Caddyfile | 44 +++++++++++++++++++++-------- docker/firefish/docker-compose.toml | 41 +++++++++++++++++++++++++++ docker/misskey/docker-compose.toml | 44 ----------------------------- docker/postgres/docker-compose.toml | 2 +- 4 files changed, 74 insertions(+), 57 deletions(-) create mode 100644 docker/firefish/docker-compose.toml delete mode 100644 docker/misskey/docker-compose.toml diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 3149a812..dd9680b6 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -10,8 +10,8 @@ korhonen.cc, *.korhonen.cc { Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" } - @homepage-redir host www.korhonen.cc - handle @homepage-redir { + @homepage-www-redir host www.korhonen.cc + handle @homepage-www-redir { redir https://korhonen.cc } @@ -25,7 +25,7 @@ korhonen.cc, *.korhonen.cc { handle @wkd { root * /var/www/wkd file_server browse - header Access-Control-Allow-Origin "*" + header Access-Control-Allow-Origin "*" } @index host index.korhonen.cc @@ -69,11 +69,6 @@ korhonen.cc, *.korhonen.cc { reverse_proxy jellyfin:8096 } - @misskey host social.korhonen.cc - handle @misskey { - reverse_proxy misskey:3000 - } - @pihole host pihole.korhonen.cc handle @pihole { reverse_proxy pihole @@ -82,7 +77,7 @@ korhonen.cc, *.korhonen.cc { @umami host umami.korhonen.cc handle @umami { reverse_proxy umami:3000 - rewrite /ua9quuaW.js /script.js + rewrite /ua9quuaW.js /script.js } @nextcloud host cloud.korhonen.cc @@ -134,7 +129,13 @@ korhonen.cc, *.korhonen.cc { @drop host drop.korhonen.cc handle @drop { - reverse_proxy drop:3000 + reverse_proxy drop:3000 + } + + # Redirect to new fediverse host + @misskey host social.korhonen.cc + handle @misskey { + redir https://korhonen.social } # Fallback for unhandled domains @@ -143,6 +144,25 @@ korhonen.cc, *.korhonen.cc { } } -korhonen.social { - respond "Kbin instance coming soon" +korhonen.social, *.korhonen.social { + tls {$CLOUDFLARE_EMAIL} { + dns cloudflare {$CLOUDFLARE_API_TOKEN} + resolvers 1.1.1.1 + } + + encode zstd gzip + + header { + Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" + } + + @firefish-www-redir host www.korhonen.social + handle @firefish-www-redir { + redir https://korhonen.social + } + + @firefish host korhonen.social + handle @firefish { + reverse_proxy firefish:3000 + } } diff --git a/docker/firefish/docker-compose.toml b/docker/firefish/docker-compose.toml new file mode 100644 index 00000000..25f28504 --- /dev/null +++ b/docker/firefish/docker-compose.toml @@ -0,0 +1,41 @@ +#:schema https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json + +[services.firefish] +image = "registry.joinfirefish.org/firefish/firefish:beta-amd64" +container_name = "firefish" +restart = "unless-stopped" +depends_on = ["redis"] +ports = ["3083:3000"] +networks = ["firefish", "proxy", "postgres"] +environment = { NODE_ENV = "production" } +volumes = [ + "/docker/firefish/files:/firefish/files", + "/docker/firefish/config:/firefish/.config:ro", +] + +[services.redis] +image = "redis" +container_name = "redis-firefish" +restart = "unless-stopped" +networks = ["firefish"] +volumes = ["/docker/firefish/redis:/data"] + +[services.sonic] +image = "valeriansaliou/sonic:v1.4.0" +container_name = "sonic-firefish" +logging = { driver = "none" } +networks = ["firefish"] +volumes = [ + "/docker/firefish/sonic:/var/lib/sonic/store", + "/docker/firefish/sonic/config.cfg:/etc/sonic.cfg", +] +env_file = ".env" + +[networks.firefish] +internal = true + +[networks.proxy] +external = true + +[networks.postgres] +external = true diff --git a/docker/misskey/docker-compose.toml b/docker/misskey/docker-compose.toml deleted file mode 100644 index 27430f84..00000000 --- a/docker/misskey/docker-compose.toml +++ /dev/null @@ -1,44 +0,0 @@ -[services.misskey] -image = "misskey/misskey" -container_name = "misskey" -restart = "unless-stopped" -depends_on = ["redis"] -ports = ["3082:3000"] -networks = ["misskey", "proxy", "postgres"] -volumes = [ - "/docker/misskey/files:/misskey/files", - "/docker/misskey/config:/misskey/.config:ro", -] - -#[services.elasticsearch] -#image = "docker.elastic.co/elasticsearch/elasticsearch:7.17.8" -#container_name = "misskey-elasticsearch" -#restart = "unless-stopped" -#volumes = ["/docker/misskey/elasticsearch/:/usr/share/elasticsearch/data"] -#networks = ["misskey"] -#environment = [ -# "cluster.name=misskey-es-cluster", -# "node.name=misskey-node", -# "discovery.type=single-node", -# "bootstrap.memory_lock=true", -# "ES_JAVA_OPTS=-Xms200m -Xmx200m", -#] -#[services.elasticsearch.ulimits.memlock] -#soft = -1 -#hard = -1 - -[services.redis] -image = "redis" -container_name = "redis-misskey" -restart = "unless-stopped" -networks = ["misskey"] -volumes = ["/docker/misskey/redis:/data"] - -[networks.misskey] -internal = true - -[networks.proxy] -external = true - -[networks.postgres] -external = true diff --git a/docker/postgres/docker-compose.toml b/docker/postgres/docker-compose.toml index e8a9ec85..6e9f04f1 100644 --- a/docker/postgres/docker-compose.toml +++ b/docker/postgres/docker-compose.toml @@ -2,7 +2,7 @@ [services.postgres] container_name = "postgres" -image = "postgres:15" +image = "postgres:16" environment = ["TZ=Europe/Helsinki", "POSTGRES_PASSWORD=12345"] ports = ["5432:5432"] networks = ["postgres"] From 2998b2d33608d3a98426b9af5da884380260bf96 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 29 Dec 2023 19:30:08 +0200 Subject: [PATCH 2199/2667] Home assistant: add port for emulated hue bridge --- docker/homeautomation/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 17952ba4..65608d59 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -17,7 +17,7 @@ depends_on = ["mosquitto"] container_name = "mosquitto" image = "eclipse-mosquitto" environment = ["TZ=Europe/Helsinki"] -ports = ["1883:1883"] +ports = ["1883:1883", "8866:8866"] networks = ["homeautomation"] volumes = [ "/docker/homeautomation/mosquitto:/mosquitto", From 81dcb8771bb7914819fc2a380c7fe339306bcc35 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 29 Dec 2023 19:30:08 +0200 Subject: [PATCH 2200/2667] Home assistant: add port for emulated hue bridge --- docker/homeautomation/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 17952ba4..65608d59 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -17,7 +17,7 @@ depends_on = ["mosquitto"] container_name = "mosquitto" image = "eclipse-mosquitto" environment = ["TZ=Europe/Helsinki"] -ports = ["1883:1883"] +ports = ["1883:1883", "8866:8866"] networks = ["homeautomation"] volumes = [ "/docker/homeautomation/mosquitto:/mosquitto", From 1ef87cba6c697e9b876b0a674edf794d5aaa1246 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 Jan 2024 14:06:45 +0200 Subject: [PATCH 2201/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 55010fda..21fe162e 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,11 +1,11 @@ { - "LuaSnip": { "branch": "master", "commit": "07f5d974203a5d957e7b464020261a657f59556d" }, + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, - "cmp-git": { "branch": "main", "commit": "f900a4cf117300fdc3ba31d26f8b6223ccd9c574" }, + "cmp-git": { "branch": "main", "commit": "8d8993680d627c8f13bd85094eba84604107dbdd" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -17,36 +17,36 @@ "dropbar.nvim": { "branch": "master", "commit": "ee3a356254ab494c0e280b809969a7a3a7e38fb7" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, - "indent-blankline.nvim": { "branch": "master", "commit": "5da5546947f3125dfd6aa85ab21074dc83f776d5" }, + "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, - "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, + "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "029899ea32d3dc8ed8c910ceca2ee5d16e566c11" }, - "neoformat": { "branch": "master", "commit": "cd45ca8309d5261e8e76557c11a22b2f1ffc710b" }, + "neodev.nvim": { "branch": "main", "commit": "be8d4d4cab6c13c6a572269c9d6a63774baba9a0" }, + "neoformat": { "branch": "master", "commit": "dd12a541254246d4b0abfb1c7a5989773c4f0359" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" }, + "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, - "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, + "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" }, "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, - "nvim-lspconfig": { "branch": "master", "commit": "9099871a7c7e1c16122e00d70208a2cd02078d80" }, - "nvim-notify": { "branch": "master", "commit": "27a6649ba6b22828ccc67c913f95a5407a2d8bec" }, - "nvim-tree.lua": { "branch": "master", "commit": "50f30bcd8c62ac4a83d133d738f268279f2c2ce2" }, - "nvim-treesitter": { "branch": "master", "commit": "27f68c0b6a87cbad900b3d016425450af8268026" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "0e2d5bd4cbe75849a013901555d436a48c6680cb" }, + "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, + "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, + "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, + "nvim-treesitter": { "branch": "master", "commit": "9288d9b5059e6b409b5077399dc0b377a112d9f2" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" }, - "nvim-web-devicons": { "branch": "master", "commit": "43aa2ddf476012a2155f5f969ee55ab17174da7a" }, + "nvim-web-devicons": { "branch": "master", "commit": "3e24abe1ae66532135cec911562f553fe247cb56" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, @@ -55,7 +55,7 @@ "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "aacaa9cd031da83ce08d8fa5f19083d731f7f62c" }, + "telescope.nvim": { "branch": "master", "commit": "87e92ea31b2b61d45ad044cf7b2d9b66dad2a618" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, From 24a65922dd79a0a6f3599625c811056431239619 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 Jan 2024 14:06:45 +0200 Subject: [PATCH 2202/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 55010fda..21fe162e 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,11 +1,11 @@ { - "LuaSnip": { "branch": "master", "commit": "07f5d974203a5d957e7b464020261a657f59556d" }, + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, - "cmp-git": { "branch": "main", "commit": "f900a4cf117300fdc3ba31d26f8b6223ccd9c574" }, + "cmp-git": { "branch": "main", "commit": "8d8993680d627c8f13bd85094eba84604107dbdd" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -17,36 +17,36 @@ "dropbar.nvim": { "branch": "master", "commit": "ee3a356254ab494c0e280b809969a7a3a7e38fb7" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, - "indent-blankline.nvim": { "branch": "master", "commit": "5da5546947f3125dfd6aa85ab21074dc83f776d5" }, + "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, - "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, + "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "029899ea32d3dc8ed8c910ceca2ee5d16e566c11" }, - "neoformat": { "branch": "master", "commit": "cd45ca8309d5261e8e76557c11a22b2f1ffc710b" }, + "neodev.nvim": { "branch": "main", "commit": "be8d4d4cab6c13c6a572269c9d6a63774baba9a0" }, + "neoformat": { "branch": "master", "commit": "dd12a541254246d4b0abfb1c7a5989773c4f0359" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" }, + "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, - "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, + "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" }, "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, - "nvim-lspconfig": { "branch": "master", "commit": "9099871a7c7e1c16122e00d70208a2cd02078d80" }, - "nvim-notify": { "branch": "master", "commit": "27a6649ba6b22828ccc67c913f95a5407a2d8bec" }, - "nvim-tree.lua": { "branch": "master", "commit": "50f30bcd8c62ac4a83d133d738f268279f2c2ce2" }, - "nvim-treesitter": { "branch": "master", "commit": "27f68c0b6a87cbad900b3d016425450af8268026" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "0e2d5bd4cbe75849a013901555d436a48c6680cb" }, + "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, + "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, + "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, + "nvim-treesitter": { "branch": "master", "commit": "9288d9b5059e6b409b5077399dc0b377a112d9f2" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" }, - "nvim-web-devicons": { "branch": "master", "commit": "43aa2ddf476012a2155f5f969ee55ab17174da7a" }, + "nvim-web-devicons": { "branch": "master", "commit": "3e24abe1ae66532135cec911562f553fe247cb56" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, @@ -55,7 +55,7 @@ "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "aacaa9cd031da83ce08d8fa5f19083d731f7f62c" }, + "telescope.nvim": { "branch": "master", "commit": "87e92ea31b2b61d45ad044cf7b2d9b66dad2a618" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, From bf5ee22cbbb5cc1f1bfb5bee8fe4b14b325788ba Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 Jan 2024 14:06:52 +0200 Subject: [PATCH 2203/2667] Change neovide scale factor on work laptop --- config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.toml b/config.toml index ad41ec03..2a267429 100644 --- a/config.toml +++ b/config.toml @@ -336,7 +336,7 @@ dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] [profiles.mko-laptop.variables] wayland = true -scale_factor = 1.5 +scale_factor = 1.25 [profiles.Isengard] include = ["terminal"] From ed0abc6dbe3e730b227775d5e4057d4c69f9dddb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 Jan 2024 14:06:52 +0200 Subject: [PATCH 2204/2667] Change neovide scale factor on work laptop --- config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.toml b/config.toml index ad41ec03..2a267429 100644 --- a/config.toml +++ b/config.toml @@ -336,7 +336,7 @@ dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] [profiles.mko-laptop.variables] wayland = true -scale_factor = 1.5 +scale_factor = 1.25 [profiles.Isengard] include = ["terminal"] From e6531057d5b165905eb32880670b89bac5641c92 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 11 Jan 2024 10:09:10 +0200 Subject: [PATCH 2205/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 58745e92..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 58745e92d4992d2c6efc49d0d54423259f1d0351 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From a39971efe0966e26b68a1079dffddc1fa3558c22 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 11 Jan 2024 10:09:10 +0200 Subject: [PATCH 2206/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 58745e92..910482f8 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 58745e92d4992d2c6efc49d0d54423259f1d0351 +Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 From 8397e9b693a06191b3f2298bc9c00473c1f9e782 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 12 Jan 2024 11:41:13 +0200 Subject: [PATCH 2207/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 21fe162e..26991f88 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, + "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" }, "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, @@ -13,40 +13,40 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "78a1ba1c5e307c85f102d1dba398bcc13464a820" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" }, - "dropbar.nvim": { "branch": "master", "commit": "ee3a356254ab494c0e280b809969a7a3a7e38fb7" }, + "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, + "dropbar.nvim": { "branch": "master", "commit": "bfba257774f78de384cca898d88cc1bb14c5a228" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, - "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, + "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" }, "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, - "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, + "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "be8d4d4cab6c13c6a572269c9d6a63774baba9a0" }, - "neoformat": { "branch": "master", "commit": "dd12a541254246d4b0abfb1c7a5989773c4f0359" }, + "neodev.nvim": { "branch": "main", "commit": "dde00106b9094f101980b364fae02fd85d357306" }, + "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, + "nvim-dap": { "branch": "master", "commit": "aad46274f09ba29933e4cef2257cdda5ec19cf7a" }, "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" }, "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, - "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, + "nvim-lspconfig": { "branch": "master", "commit": "f5dab1398b12f1c96c5b185f802e3065f355b4a8" }, "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, - "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, - "nvim-treesitter": { "branch": "master", "commit": "9288d9b5059e6b409b5077399dc0b377a112d9f2" }, + "nvim-tree.lua": { "branch": "master", "commit": "b8c3a23e76f861d5f0ff3f6714b9b56388984d0b" }, + "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" }, - "nvim-web-devicons": { "branch": "master", "commit": "3e24abe1ae66532135cec911562f553fe247cb56" }, + "nvim-ufo": { "branch": "main", "commit": "35089d4bf300943f1ab04c631d9b8a44ebbfc174" }, + "nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, @@ -55,7 +55,7 @@ "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "87e92ea31b2b61d45ad044cf7b2d9b66dad2a618" }, + "telescope.nvim": { "branch": "master", "commit": "da8b3d485975a8727bea127518b65c980521ae22" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, From fb152b40c8b8fc1d5bba16f5f383a5a2dbca8dc3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 12 Jan 2024 11:41:13 +0200 Subject: [PATCH 2208/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 21fe162e..26991f88 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, + "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" }, "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, @@ -13,40 +13,40 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "78a1ba1c5e307c85f102d1dba398bcc13464a820" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" }, - "dropbar.nvim": { "branch": "master", "commit": "ee3a356254ab494c0e280b809969a7a3a7e38fb7" }, + "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, + "dropbar.nvim": { "branch": "master", "commit": "bfba257774f78de384cca898d88cc1bb14c5a228" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, - "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, + "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" }, "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, - "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, + "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "be8d4d4cab6c13c6a572269c9d6a63774baba9a0" }, - "neoformat": { "branch": "master", "commit": "dd12a541254246d4b0abfb1c7a5989773c4f0359" }, + "neodev.nvim": { "branch": "main", "commit": "dde00106b9094f101980b364fae02fd85d357306" }, + "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, + "nvim-dap": { "branch": "master", "commit": "aad46274f09ba29933e4cef2257cdda5ec19cf7a" }, "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" }, "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, - "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, + "nvim-lspconfig": { "branch": "master", "commit": "f5dab1398b12f1c96c5b185f802e3065f355b4a8" }, "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, - "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, - "nvim-treesitter": { "branch": "master", "commit": "9288d9b5059e6b409b5077399dc0b377a112d9f2" }, + "nvim-tree.lua": { "branch": "master", "commit": "b8c3a23e76f861d5f0ff3f6714b9b56388984d0b" }, + "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" }, - "nvim-web-devicons": { "branch": "master", "commit": "3e24abe1ae66532135cec911562f553fe247cb56" }, + "nvim-ufo": { "branch": "main", "commit": "35089d4bf300943f1ab04c631d9b8a44ebbfc174" }, + "nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, @@ -55,7 +55,7 @@ "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "87e92ea31b2b61d45ad044cf7b2d9b66dad2a618" }, + "telescope.nvim": { "branch": "master", "commit": "da8b3d485975a8727bea127518b65c980521ae22" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, From 66fede355dad09866d2c21859d42443368ed5a72 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 12 Jan 2024 11:51:01 +0200 Subject: [PATCH 2209/2667] Nvim: run jdtls with java 21 --- home/.config/nvim/ftplugin/java.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index a878e56c..b40bee10 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -4,10 +4,11 @@ local lombok_jar = mason_packages .. "/jdtls/lombok.jar" local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name local lsp_utils = require("lsp_utils") +local java_version = 21 require("jdtls").start_or_attach({ cmd = { - "/usr/lib/jvm/java-19-openjdk-amd64/bin/java", + "/usr/lib/jvm/java-" .. java_version .. "-openjdk-amd64/bin/java", "-Declipse.application=org.eclipse.jdt.ls.core.id1", "-Dosgi.bundles.defaultStartLevel=4", "-Declipse.product=org.eclipse.jdt.ls.core.product", From bbf9d29e21ec273fd6c5ec7cd5ec95b68e9632f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 12 Jan 2024 11:51:01 +0200 Subject: [PATCH 2210/2667] Nvim: run jdtls with java 21 --- home/.config/nvim/ftplugin/java.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index a878e56c..b40bee10 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -4,10 +4,11 @@ local lombok_jar = mason_packages .. "/jdtls/lombok.jar" local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name local lsp_utils = require("lsp_utils") +local java_version = 21 require("jdtls").start_or_attach({ cmd = { - "/usr/lib/jvm/java-19-openjdk-amd64/bin/java", + "/usr/lib/jvm/java-" .. java_version .. "-openjdk-amd64/bin/java", "-Declipse.application=org.eclipse.jdt.ls.core.id1", "-Dosgi.bundles.defaultStartLevel=4", "-Declipse.product=org.eclipse.jdt.ls.core.product", From 30110372aae1b089d01fd6e3dd14e9994552cb07 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 12 Jan 2024 12:00:52 +0200 Subject: [PATCH 2211/2667] Revert "Update nvim plugins" This reverts commit 8397e9b693a06191b3f2298bc9c00473c1f9e782. Caused completion selection with tab not to work --- home/.config/nvim/lazy-lock.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 26991f88..21fe162e 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" }, + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, @@ -13,40 +13,40 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "78a1ba1c5e307c85f102d1dba398bcc13464a820" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, - "dropbar.nvim": { "branch": "master", "commit": "bfba257774f78de384cca898d88cc1bb14c5a228" }, + "copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" }, + "dropbar.nvim": { "branch": "master", "commit": "ee3a356254ab494c0e280b809969a7a3a7e38fb7" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, - "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" }, + "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" }, - "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, - "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, + "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "dde00106b9094f101980b364fae02fd85d357306" }, - "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, + "neodev.nvim": { "branch": "main", "commit": "be8d4d4cab6c13c6a572269c9d6a63774baba9a0" }, + "neoformat": { "branch": "master", "commit": "dd12a541254246d4b0abfb1c7a5989773c4f0359" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "aad46274f09ba29933e4cef2257cdda5ec19cf7a" }, + "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" }, "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, - "nvim-lspconfig": { "branch": "master", "commit": "f5dab1398b12f1c96c5b185f802e3065f355b4a8" }, + "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, - "nvim-tree.lua": { "branch": "master", "commit": "b8c3a23e76f861d5f0ff3f6714b9b56388984d0b" }, - "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" }, + "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, + "nvim-treesitter": { "branch": "master", "commit": "9288d9b5059e6b409b5077399dc0b377a112d9f2" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ufo": { "branch": "main", "commit": "35089d4bf300943f1ab04c631d9b8a44ebbfc174" }, - "nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" }, + "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" }, + "nvim-web-devicons": { "branch": "master", "commit": "3e24abe1ae66532135cec911562f553fe247cb56" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, @@ -55,7 +55,7 @@ "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "da8b3d485975a8727bea127518b65c980521ae22" }, + "telescope.nvim": { "branch": "master", "commit": "87e92ea31b2b61d45ad044cf7b2d9b66dad2a618" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, From d36fd68030340cc3080a35996bc24ed74901ec74 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 12 Jan 2024 12:00:52 +0200 Subject: [PATCH 2212/2667] Revert "Update nvim plugins" This reverts commit fb152b40c8b8fc1d5bba16f5f383a5a2dbca8dc3. Caused completion selection with tab not to work --- home/.config/nvim/lazy-lock.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 26991f88..21fe162e 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" }, + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, @@ -13,40 +13,40 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "78a1ba1c5e307c85f102d1dba398bcc13464a820" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, - "dropbar.nvim": { "branch": "master", "commit": "bfba257774f78de384cca898d88cc1bb14c5a228" }, + "copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" }, + "dropbar.nvim": { "branch": "master", "commit": "ee3a356254ab494c0e280b809969a7a3a7e38fb7" }, "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, - "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" }, + "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" }, - "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, - "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, + "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "dde00106b9094f101980b364fae02fd85d357306" }, - "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, + "neodev.nvim": { "branch": "main", "commit": "be8d4d4cab6c13c6a572269c9d6a63774baba9a0" }, + "neoformat": { "branch": "master", "commit": "dd12a541254246d4b0abfb1c7a5989773c4f0359" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "aad46274f09ba29933e4cef2257cdda5ec19cf7a" }, + "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" }, "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, - "nvim-lspconfig": { "branch": "master", "commit": "f5dab1398b12f1c96c5b185f802e3065f355b4a8" }, + "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, - "nvim-tree.lua": { "branch": "master", "commit": "b8c3a23e76f861d5f0ff3f6714b9b56388984d0b" }, - "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" }, + "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, + "nvim-treesitter": { "branch": "master", "commit": "9288d9b5059e6b409b5077399dc0b377a112d9f2" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ufo": { "branch": "main", "commit": "35089d4bf300943f1ab04c631d9b8a44ebbfc174" }, - "nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" }, + "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" }, + "nvim-web-devicons": { "branch": "master", "commit": "3e24abe1ae66532135cec911562f553fe247cb56" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, @@ -55,7 +55,7 @@ "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "da8b3d485975a8727bea127518b65c980521ae22" }, + "telescope.nvim": { "branch": "master", "commit": "87e92ea31b2b61d45ad044cf7b2d9b66dad2a618" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, From 66c7fe059e69de927ef0adac29d70dcecaeb5c59 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 22 Jan 2024 10:52:45 +0200 Subject: [PATCH 2213/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..d2a785fd 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit d2a785fd2fbcedf063b97795c284c2932ff8aa6a From 3c7ff8b7fbdd8855ab28316e77cb34393783c9fd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 22 Jan 2024 10:52:45 +0200 Subject: [PATCH 2214/2667] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 910482f8..d2a785fd 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 910482f8c8ba25234e0eb208419f39c06985aab3 +Subproject commit d2a785fd2fbcedf063b97795c284c2932ff8aa6a From 08aa9907c767e0612cf44c60576a5391919b6845 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Jan 2024 09:21:25 +0200 Subject: [PATCH 2215/2667] Nvim: only enable confirm quit plugin in neovide --- home/.config/nvim/lua/plugins/confirm-quit.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/confirm-quit.lua b/home/.config/nvim/lua/plugins/confirm-quit.lua index 0c6302f7..bcfac070 100644 --- a/home/.config/nvim/lua/plugins/confirm-quit.lua +++ b/home/.config/nvim/lua/plugins/confirm-quit.lua @@ -1,6 +1,7 @@ -- Confirm before quit --- @type LazyPluginSpec return { + enabled = vim.g.neovide == not nil, "yutkat/confirm-quit.nvim", event = "CmdlineEnter", config = true, From 4994c68d83965545519ebbf69ed7914917301d06 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Jan 2024 09:21:25 +0200 Subject: [PATCH 2216/2667] Nvim: only enable confirm quit plugin in neovide --- home/.config/nvim/lua/plugins/confirm-quit.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/confirm-quit.lua b/home/.config/nvim/lua/plugins/confirm-quit.lua index 0c6302f7..bcfac070 100644 --- a/home/.config/nvim/lua/plugins/confirm-quit.lua +++ b/home/.config/nvim/lua/plugins/confirm-quit.lua @@ -1,6 +1,7 @@ -- Confirm before quit --- @type LazyPluginSpec return { + enabled = vim.g.neovide == not nil, "yutkat/confirm-quit.nvim", event = "CmdlineEnter", config = true, From db73442b8badfe9f1390de0b144ad485e4860b5c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 09:59:37 +0200 Subject: [PATCH 2217/2667] Nvim: only enable dropbar if has nvim 0.10 --- home/.config/nvim/lua/plugins/dropbar.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/dropbar.lua b/home/.config/nvim/lua/plugins/dropbar.lua index 228a2619..30ef6fff 100644 --- a/home/.config/nvim/lua/plugins/dropbar.lua +++ b/home/.config/nvim/lua/plugins/dropbar.lua @@ -1,5 +1,6 @@ -- Show the current LSP context in winbar --- @type LazyPluginSpec return { + enabled = vim.fn.has("nvim-0.10") == 1, "Bekaboo/dropbar.nvim", } From c8ff860c421ca62c5165dd324de783a2a3856083 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 09:59:37 +0200 Subject: [PATCH 2218/2667] Nvim: only enable dropbar if has nvim 0.10 --- home/.config/nvim/lua/plugins/dropbar.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/dropbar.lua b/home/.config/nvim/lua/plugins/dropbar.lua index 228a2619..30ef6fff 100644 --- a/home/.config/nvim/lua/plugins/dropbar.lua +++ b/home/.config/nvim/lua/plugins/dropbar.lua @@ -1,5 +1,6 @@ -- Show the current LSP context in winbar --- @type LazyPluginSpec return { + enabled = vim.fn.has("nvim-0.10") == 1, "Bekaboo/dropbar.nvim", } From d09821e86347a3563d4c0f5c797279982d6caa76 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 09:59:52 +0200 Subject: [PATCH 2219/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 56 ++++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 21fe162e..9c5be477 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, - "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -13,52 +13,52 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "78a1ba1c5e307c85f102d1dba398bcc13464a820" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" }, - "dropbar.nvim": { "branch": "master", "commit": "ee3a356254ab494c0e280b809969a7a3a7e38fb7" }, - "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, - "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" }, + "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, + "dropbar.nvim": { "branch": "master", "commit": "0c3b4f6b64af8e24c115f5f4fd7b35c978ee43db" }, + "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, + "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" }, + "gitsigns.nvim": { "branch": "main", "commit": "c5ff7628e19a47ec14d3657294cc074ecae27b99" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, + "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, - "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "3ba1b92b771f33256b4969d696b82c8ae7075364" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, + "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "be8d4d4cab6c13c6a572269c9d6a63774baba9a0" }, - "neoformat": { "branch": "master", "commit": "dd12a541254246d4b0abfb1c7a5989773c4f0359" }, - "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "neodev.nvim": { "branch": "main", "commit": "3941036e3da9b0dc09244036d20c590b6d752175" }, + "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, + "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, - "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, + "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, - "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" }, + "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, + "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, - "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, - "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, - "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, - "nvim-treesitter": { "branch": "master", "commit": "9288d9b5059e6b409b5077399dc0b377a112d9f2" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" }, + "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, + "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, + "nvim-tree.lua": { "branch": "master", "commit": "7bdb220d0fe604a77361e92cdbc7af1b8a412126" }, + "nvim-treesitter": { "branch": "master", "commit": "ab2346439333653b31672daa0b7d29184ff4493b" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" }, - "nvim-web-devicons": { "branch": "master", "commit": "3e24abe1ae66532135cec911562f553fe247cb56" }, + "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, + "nvim-web-devicons": { "branch": "master", "commit": "140edfcf25093e8b321d13e154cbce89ee868ca0" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, + "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "87e92ea31b2b61d45ad044cf7b2d9b66dad2a618" }, + "telescope.nvim": { "branch": "master", "commit": "36dce6261ae3660bb57ba942361067b2028aec31" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, + "vim-fugitive": { "branch": "master", "commit": "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From bbfd741c95cfc69082e96ea12985f66f3d56254f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 09:59:52 +0200 Subject: [PATCH 2220/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 56 ++++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 21fe162e..9c5be477 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, - "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -13,52 +13,52 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "78a1ba1c5e307c85f102d1dba398bcc13464a820" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" }, - "dropbar.nvim": { "branch": "master", "commit": "ee3a356254ab494c0e280b809969a7a3a7e38fb7" }, - "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, - "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" }, + "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, + "dropbar.nvim": { "branch": "master", "commit": "0c3b4f6b64af8e24c115f5f4fd7b35c978ee43db" }, + "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, + "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" }, + "gitsigns.nvim": { "branch": "main", "commit": "c5ff7628e19a47ec14d3657294cc074ecae27b99" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, + "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, - "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "3ba1b92b771f33256b4969d696b82c8ae7075364" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, + "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "be8d4d4cab6c13c6a572269c9d6a63774baba9a0" }, - "neoformat": { "branch": "master", "commit": "dd12a541254246d4b0abfb1c7a5989773c4f0359" }, - "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "neodev.nvim": { "branch": "main", "commit": "3941036e3da9b0dc09244036d20c590b6d752175" }, + "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, + "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, - "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, + "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, - "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" }, + "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, + "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, - "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, - "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, - "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, - "nvim-treesitter": { "branch": "master", "commit": "9288d9b5059e6b409b5077399dc0b377a112d9f2" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" }, + "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, + "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, + "nvim-tree.lua": { "branch": "master", "commit": "7bdb220d0fe604a77361e92cdbc7af1b8a412126" }, + "nvim-treesitter": { "branch": "master", "commit": "ab2346439333653b31672daa0b7d29184ff4493b" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" }, - "nvim-web-devicons": { "branch": "master", "commit": "3e24abe1ae66532135cec911562f553fe247cb56" }, + "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, + "nvim-web-devicons": { "branch": "master", "commit": "140edfcf25093e8b321d13e154cbce89ee868ca0" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, + "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "87e92ea31b2b61d45ad044cf7b2d9b66dad2a618" }, + "telescope.nvim": { "branch": "master", "commit": "36dce6261ae3660bb57ba942361067b2028aec31" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, + "vim-fugitive": { "branch": "master", "commit": "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From f9b7a93570a860638266bd4cf980cc8b72c5213e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 10:06:34 +0200 Subject: [PATCH 2221/2667] Add nvim headless systemd user service --- home/.config/systemd/user/nvim-headless.service | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 home/.config/systemd/user/nvim-headless.service diff --git a/home/.config/systemd/user/nvim-headless.service b/home/.config/systemd/user/nvim-headless.service new file mode 100644 index 00000000..9c408839 --- /dev/null +++ b/home/.config/systemd/user/nvim-headless.service @@ -0,0 +1,11 @@ +[Unit] +Description=Neovim headless server + +[Service] +Type=simple +ExecStart=/bin/bash --login -c 'nvim --headless --listen %h/.var/nvim.socket' +Restart=always +RestartSec=1 + +[Install] +WantedBy=default.target From 6997121c4ec27cea9dad2e7a0295928c01073a20 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 10:06:34 +0200 Subject: [PATCH 2222/2667] Add nvim headless systemd user service --- home/.config/systemd/user/nvim-headless.service | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 home/.config/systemd/user/nvim-headless.service diff --git a/home/.config/systemd/user/nvim-headless.service b/home/.config/systemd/user/nvim-headless.service new file mode 100644 index 00000000..9c408839 --- /dev/null +++ b/home/.config/systemd/user/nvim-headless.service @@ -0,0 +1,11 @@ +[Unit] +Description=Neovim headless server + +[Service] +Type=simple +ExecStart=/bin/bash --login -c 'nvim --headless --listen %h/.var/nvim.socket' +Restart=always +RestartSec=1 + +[Install] +WantedBy=default.target From 845f4024dfd3e73d37a3cc3a37a1054e7c4f03b0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 13:51:39 +0200 Subject: [PATCH 2223/2667] Nvim: add diffview plugin --- home/.config/git/config | 4 ++-- home/.config/nvim/lua/plugins/confirm-quit.lua | 4 +++- home/.config/nvim/lua/plugins/diffview.lua | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/diffview.lua diff --git a/home/.config/git/config b/home/.config/git/config index 25e6c42d..d3b78fbf 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -28,7 +28,7 @@ keepBackup = false prompt = false [mergetool "nvim"] -cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' +cmd = nvim +DiffviewOpen [diff] tool = nvim @@ -37,7 +37,7 @@ tool = nvim prompt = false [difftool "nvim"] -cmd = nvim -d $LOCAL $REMOTE +cmd = nvim +DiffviewOpen [pull] rebase = merges diff --git a/home/.config/nvim/lua/plugins/confirm-quit.lua b/home/.config/nvim/lua/plugins/confirm-quit.lua index bcfac070..08d85558 100644 --- a/home/.config/nvim/lua/plugins/confirm-quit.lua +++ b/home/.config/nvim/lua/plugins/confirm-quit.lua @@ -4,5 +4,7 @@ return { enabled = vim.g.neovide == not nil, "yutkat/confirm-quit.nvim", event = "CmdlineEnter", - config = true, + opts = { + quit_message = "You are in Neovide, are you sure you want to quit?", + }, } diff --git a/home/.config/nvim/lua/plugins/diffview.lua b/home/.config/nvim/lua/plugins/diffview.lua new file mode 100644 index 00000000..aa17c163 --- /dev/null +++ b/home/.config/nvim/lua/plugins/diffview.lua @@ -0,0 +1,3 @@ +-- Improved diffs +--- @type LazyPluginSpec +return { "sindrets/diffview.nvim" } From bb75584fa2bb5a2b9878e7499fdb98d08dd598bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 13:51:39 +0200 Subject: [PATCH 2224/2667] Nvim: add diffview plugin --- home/.config/git/config | 4 ++-- home/.config/nvim/lua/plugins/confirm-quit.lua | 4 +++- home/.config/nvim/lua/plugins/diffview.lua | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/diffview.lua diff --git a/home/.config/git/config b/home/.config/git/config index 25e6c42d..d3b78fbf 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -28,7 +28,7 @@ keepBackup = false prompt = false [mergetool "nvim"] -cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' +cmd = nvim +DiffviewOpen [diff] tool = nvim @@ -37,7 +37,7 @@ tool = nvim prompt = false [difftool "nvim"] -cmd = nvim -d $LOCAL $REMOTE +cmd = nvim +DiffviewOpen [pull] rebase = merges diff --git a/home/.config/nvim/lua/plugins/confirm-quit.lua b/home/.config/nvim/lua/plugins/confirm-quit.lua index bcfac070..08d85558 100644 --- a/home/.config/nvim/lua/plugins/confirm-quit.lua +++ b/home/.config/nvim/lua/plugins/confirm-quit.lua @@ -4,5 +4,7 @@ return { enabled = vim.g.neovide == not nil, "yutkat/confirm-quit.nvim", event = "CmdlineEnter", - config = true, + opts = { + quit_message = "You are in Neovide, are you sure you want to quit?", + }, } diff --git a/home/.config/nvim/lua/plugins/diffview.lua b/home/.config/nvim/lua/plugins/diffview.lua new file mode 100644 index 00000000..aa17c163 --- /dev/null +++ b/home/.config/nvim/lua/plugins/diffview.lua @@ -0,0 +1,3 @@ +-- Improved diffs +--- @type LazyPluginSpec +return { "sindrets/diffview.nvim" } From ff12fbbe55dd69c64150acb149c380595edb83ef Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 13:52:46 +0200 Subject: [PATCH 2225/2667] WIP remote nvim --- config.toml | 2 +- home/.config/nvim/lazy-lock.json | 57 +++++++++---------- .../systemd/user/nvim-remote-ssh@.service | 13 +++++ 3 files changed, 42 insertions(+), 30 deletions(-) create mode 100644 home/.config/systemd/user/nvim-remote-ssh@.service diff --git a/config.toml b/config.toml index 2a267429..bbde1e9e 100644 --- a/config.toml +++ b/config.toml @@ -332,7 +332,7 @@ include = ["pacman", "terminal"] [profiles.mko-laptop] include = ["terminal", "media", "gpg"] -dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] +dotfiles = ["f_librewolf_overrides", "f_dconf.ini", "d_systemd"] [profiles.mko-laptop.variables] wayland = true diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 9c5be477..f7025127 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { - "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, - "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, + "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -11,54 +11,53 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "confirm-quit.nvim": { "branch": "main", "commit": "78a1ba1c5e307c85f102d1dba398bcc13464a820" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, - "dropbar.nvim": { "branch": "master", "commit": "0c3b4f6b64af8e24c115f5f4fd7b35c978ee43db" }, - "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, - "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" }, - "gitsigns.nvim": { "branch": "main", "commit": "c5ff7628e19a47ec14d3657294cc074ecae27b99" }, - "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, + "copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" }, + "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, + "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, + "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, + "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "3ba1b92b771f33256b4969d696b82c8ae7075364" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, - "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, + "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "3941036e3da9b0dc09244036d20c590b6d752175" }, - "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, - "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, + "neodev.nvim": { "branch": "main", "commit": "be8d4d4cab6c13c6a572269c9d6a63774baba9a0" }, + "neoformat": { "branch": "master", "commit": "dd12a541254246d4b0abfb1c7a5989773c4f0359" }, + "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, - "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, + "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, - "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, + "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, + "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" }, "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, - "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, - "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, - "nvim-tree.lua": { "branch": "master", "commit": "7bdb220d0fe604a77361e92cdbc7af1b8a412126" }, - "nvim-treesitter": { "branch": "master", "commit": "ab2346439333653b31672daa0b7d29184ff4493b" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, + "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, + "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, + "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, + "nvim-treesitter": { "branch": "master", "commit": "9288d9b5059e6b409b5077399dc0b377a112d9f2" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, - "nvim-web-devicons": { "branch": "master", "commit": "140edfcf25093e8b321d13e154cbce89ee868ca0" }, + "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" }, + "nvim-web-devicons": { "branch": "master", "commit": "3e24abe1ae66532135cec911562f553fe247cb56" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, + "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "36dce6261ae3660bb57ba942361067b2028aec31" }, + "telescope.nvim": { "branch": "master", "commit": "87e92ea31b2b61d45ad044cf7b2d9b66dad2a618" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b" }, + "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/home/.config/systemd/user/nvim-remote-ssh@.service b/home/.config/systemd/user/nvim-remote-ssh@.service new file mode 100644 index 00000000..e4658306 --- /dev/null +++ b/home/.config/systemd/user/nvim-remote-ssh@.service @@ -0,0 +1,13 @@ +[Unit] +Description=Neovim remote SSH socket + +# Pass arguments https://superuser.com/a/1282178 +[Service] +Type=simple +Environment="SCRIPT_ARGS=%I" +ExecStart=%h/.local/bin/nvim-remote-ssh $SCRIPT_ARGS +Restart=on-failure +RestartSec=1 + +[Install] +WantedBy=default.target From 8912fed29c3c3e11609f313f2dd0c67b3fe6add9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 13:52:46 +0200 Subject: [PATCH 2226/2667] WIP remote nvim --- config.toml | 2 +- home/.config/nvim/lazy-lock.json | 57 +++++++++---------- .../systemd/user/nvim-remote-ssh@.service | 13 +++++ 3 files changed, 42 insertions(+), 30 deletions(-) create mode 100644 home/.config/systemd/user/nvim-remote-ssh@.service diff --git a/config.toml b/config.toml index 2a267429..bbde1e9e 100644 --- a/config.toml +++ b/config.toml @@ -332,7 +332,7 @@ include = ["pacman", "terminal"] [profiles.mko-laptop] include = ["terminal", "media", "gpg"] -dotfiles = ["f_librewolf_overrides", "f_dconf.ini"] +dotfiles = ["f_librewolf_overrides", "f_dconf.ini", "d_systemd"] [profiles.mko-laptop.variables] wayland = true diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 9c5be477..f7025127 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { - "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, - "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, + "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -11,54 +11,53 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "confirm-quit.nvim": { "branch": "main", "commit": "78a1ba1c5e307c85f102d1dba398bcc13464a820" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, - "dropbar.nvim": { "branch": "master", "commit": "0c3b4f6b64af8e24c115f5f4fd7b35c978ee43db" }, - "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, - "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" }, - "gitsigns.nvim": { "branch": "main", "commit": "c5ff7628e19a47ec14d3657294cc074ecae27b99" }, - "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, + "copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" }, + "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, + "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, + "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, + "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "3ba1b92b771f33256b4969d696b82c8ae7075364" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, - "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, + "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "3941036e3da9b0dc09244036d20c590b6d752175" }, - "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, - "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, + "neodev.nvim": { "branch": "main", "commit": "be8d4d4cab6c13c6a572269c9d6a63774baba9a0" }, + "neoformat": { "branch": "master", "commit": "dd12a541254246d4b0abfb1c7a5989773c4f0359" }, + "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, - "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, + "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, - "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, + "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, + "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" }, "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, - "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, - "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, - "nvim-tree.lua": { "branch": "master", "commit": "7bdb220d0fe604a77361e92cdbc7af1b8a412126" }, - "nvim-treesitter": { "branch": "master", "commit": "ab2346439333653b31672daa0b7d29184ff4493b" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, + "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, + "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, + "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, + "nvim-treesitter": { "branch": "master", "commit": "9288d9b5059e6b409b5077399dc0b377a112d9f2" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, - "nvim-web-devicons": { "branch": "master", "commit": "140edfcf25093e8b321d13e154cbce89ee868ca0" }, + "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" }, + "nvim-web-devicons": { "branch": "master", "commit": "3e24abe1ae66532135cec911562f553fe247cb56" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, + "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "36dce6261ae3660bb57ba942361067b2028aec31" }, + "telescope.nvim": { "branch": "master", "commit": "87e92ea31b2b61d45ad044cf7b2d9b66dad2a618" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b" }, + "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/home/.config/systemd/user/nvim-remote-ssh@.service b/home/.config/systemd/user/nvim-remote-ssh@.service new file mode 100644 index 00000000..e4658306 --- /dev/null +++ b/home/.config/systemd/user/nvim-remote-ssh@.service @@ -0,0 +1,13 @@ +[Unit] +Description=Neovim remote SSH socket + +# Pass arguments https://superuser.com/a/1282178 +[Service] +Type=simple +Environment="SCRIPT_ARGS=%I" +ExecStart=%h/.local/bin/nvim-remote-ssh $SCRIPT_ARGS +Restart=on-failure +RestartSec=1 + +[Install] +WantedBy=default.target From 22a4aad249853ef4f2c1b28189b1ddf130609ee7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 22:20:34 +0200 Subject: [PATCH 2227/2667] Neovim: use stable versions of plugins if available --- home/.config/nvim/init.lua | 3 + home/.config/nvim/lazy-lock.json | 58 ++++++++++---------- home/.config/nvim/lua/plugins/bufferline.lua | 1 - home/.config/nvim/lua/plugins/mason.lua | 2 +- home/.config/nvim/lua/plugins/mini.lua | 1 - 5 files changed, 34 insertions(+), 31 deletions(-) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 6ada43db..937e9e54 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -21,4 +21,7 @@ require("lazy").setup({ performance = { disabled_plugins = { "netrwPlugin" }, }, + defaults = { + version = "*", + }, }) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index f7025127..93d44ff3 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, - "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -11,53 +11,55 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" }, + "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, - "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" }, + "dropbar.nvim": { "branch": "master", "commit": "51c364728dd27f7cefe74173853e674c44efefc5" }, + "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, + "friendly-snippets": { "branch": "main", "commit": "aced40b66b7bae9bc2c37fd7b11841d54727a7b0" }, + "gitsigns.nvim": { "branch": "main", "commit": "300a306da9973e81c2c06460f71fd7a079df1f36" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, + "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, - "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, + "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "be8d4d4cab6c13c6a572269c9d6a63774baba9a0" }, - "neoformat": { "branch": "master", "commit": "dd12a541254246d4b0abfb1c7a5989773c4f0359" }, - "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "neodev.nvim": { "branch": "main", "commit": "e7ca4a2ea0da5e39a639c08c3edb352b9355f09e" }, + "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, + "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, - "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, + "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, - "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" }, + "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, + "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, - "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, - "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, - "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, - "nvim-treesitter": { "branch": "master", "commit": "9288d9b5059e6b409b5077399dc0b377a112d9f2" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "4c67b566ef8bb513692c1f26637ff3356ab02f43" }, + "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, + "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, + "nvim-tree.lua": { "branch": "master", "commit": "7bdb220d0fe604a77361e92cdbc7af1b8a412126" }, + "nvim-treesitter": { "branch": "master", "commit": "1bee80469d3d1569de47a62dd59824d9f9af0866" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" }, - "nvim-web-devicons": { "branch": "master", "commit": "3e24abe1ae66532135cec911562f553fe247cb56" }, + "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, + "nvim-web-devicons": { "branch": "master", "commit": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, + "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "87e92ea31b2b61d45ad044cf7b2d9b66dad2a618" }, + "telescope.nvim": { "branch": "master", "commit": "301505da4bb72d11ffeee47ad45e0b677f70abe5" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, + "vim-fugitive": { "branch": "master", "commit": "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua index 815f79c3..e4c85983 100644 --- a/home/.config/nvim/lua/plugins/bufferline.lua +++ b/home/.config/nvim/lua/plugins/bufferline.lua @@ -2,7 +2,6 @@ --- @type LazyPluginSpec return { "akinsho/bufferline.nvim", - version = "*", dependencies = { "kyazdani42/nvim-web-devicons" }, --- @type BufferlineConfig opts = { diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 6ab9028b..618ea21d 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -11,7 +11,7 @@ return { "mfussenegger/nvim-jdtls", -- Add support for LSP file operations { "antosha417/nvim-lsp-file-operations", config = true }, - -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. + -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. { "folke/neodev.nvim", --- @type LuaDevOptions diff --git a/home/.config/nvim/lua/plugins/mini.lua b/home/.config/nvim/lua/plugins/mini.lua index 7482c037..cc4f78ac 100644 --- a/home/.config/nvim/lua/plugins/mini.lua +++ b/home/.config/nvim/lua/plugins/mini.lua @@ -2,7 +2,6 @@ --- @type LazyPluginSpec return { "echasnovski/mini.nvim", - version = "*", config = function() require("mini.surround").setup() require("mini.comment").setup() From 5654fd6beee23a643c6b8bc8cf0cdb58569d39a7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 22:20:34 +0200 Subject: [PATCH 2228/2667] Neovim: use stable versions of plugins if available --- home/.config/nvim/init.lua | 3 + home/.config/nvim/lazy-lock.json | 58 ++++++++++---------- home/.config/nvim/lua/plugins/bufferline.lua | 1 - home/.config/nvim/lua/plugins/mason.lua | 2 +- home/.config/nvim/lua/plugins/mini.lua | 1 - 5 files changed, 34 insertions(+), 31 deletions(-) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 6ada43db..937e9e54 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -21,4 +21,7 @@ require("lazy").setup({ performance = { disabled_plugins = { "netrwPlugin" }, }, + defaults = { + version = "*", + }, }) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index f7025127..93d44ff3 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, - "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -11,53 +11,55 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" }, + "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" }, - "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" }, + "dropbar.nvim": { "branch": "master", "commit": "51c364728dd27f7cefe74173853e674c44efefc5" }, + "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, + "friendly-snippets": { "branch": "main", "commit": "aced40b66b7bae9bc2c37fd7b11841d54727a7b0" }, + "gitsigns.nvim": { "branch": "main", "commit": "300a306da9973e81c2c06460f71fd7a079df1f36" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, + "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, - "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, + "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "be8d4d4cab6c13c6a572269c9d6a63774baba9a0" }, - "neoformat": { "branch": "master", "commit": "dd12a541254246d4b0abfb1c7a5989773c4f0359" }, - "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "neodev.nvim": { "branch": "main", "commit": "e7ca4a2ea0da5e39a639c08c3edb352b9355f09e" }, + "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, + "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, - "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, + "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, - "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" }, + "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, + "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, - "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, - "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, - "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, - "nvim-treesitter": { "branch": "master", "commit": "9288d9b5059e6b409b5077399dc0b377a112d9f2" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "4c67b566ef8bb513692c1f26637ff3356ab02f43" }, + "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, + "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, + "nvim-tree.lua": { "branch": "master", "commit": "7bdb220d0fe604a77361e92cdbc7af1b8a412126" }, + "nvim-treesitter": { "branch": "master", "commit": "1bee80469d3d1569de47a62dd59824d9f9af0866" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" }, - "nvim-web-devicons": { "branch": "master", "commit": "3e24abe1ae66532135cec911562f553fe247cb56" }, + "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, + "nvim-web-devicons": { "branch": "master", "commit": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, + "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "87e92ea31b2b61d45ad044cf7b2d9b66dad2a618" }, + "telescope.nvim": { "branch": "master", "commit": "301505da4bb72d11ffeee47ad45e0b677f70abe5" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, + "vim-fugitive": { "branch": "master", "commit": "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua index 815f79c3..e4c85983 100644 --- a/home/.config/nvim/lua/plugins/bufferline.lua +++ b/home/.config/nvim/lua/plugins/bufferline.lua @@ -2,7 +2,6 @@ --- @type LazyPluginSpec return { "akinsho/bufferline.nvim", - version = "*", dependencies = { "kyazdani42/nvim-web-devicons" }, --- @type BufferlineConfig opts = { diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 6ab9028b..618ea21d 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -11,7 +11,7 @@ return { "mfussenegger/nvim-jdtls", -- Add support for LSP file operations { "antosha417/nvim-lsp-file-operations", config = true }, - -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. + -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. { "folke/neodev.nvim", --- @type LuaDevOptions diff --git a/home/.config/nvim/lua/plugins/mini.lua b/home/.config/nvim/lua/plugins/mini.lua index 7482c037..cc4f78ac 100644 --- a/home/.config/nvim/lua/plugins/mini.lua +++ b/home/.config/nvim/lua/plugins/mini.lua @@ -2,7 +2,6 @@ --- @type LazyPluginSpec return { "echasnovski/mini.nvim", - version = "*", config = function() require("mini.surround").setup() require("mini.comment").setup() From e3e9848d0efeeb5cff81e2baf9c448d2c574e146 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 22:48:11 +0200 Subject: [PATCH 2229/2667] Remove git mergetool and difftool, use zsh diffview alias instead This is because as a git tool, it wants to open each file separately. Neovim and diffview plugin provide a handy UI to manage multiple files in diff and merge --- home/.config/git/config | 9 --------- home/.config/zsh/04-aliases.zsh | 5 +++++ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/home/.config/git/config b/home/.config/git/config index d3b78fbf..3f4d7fe3 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -30,15 +30,6 @@ prompt = false [mergetool "nvim"] cmd = nvim +DiffviewOpen -[diff] -tool = nvim - -[difftool] -prompt = false - -[difftool "nvim"] -cmd = nvim +DiffviewOpen - [pull] rebase = merges diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index d9ea72e3..c93efc6a 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -10,6 +10,11 @@ alias gs='git status' alias gpull='git pull' alias gpush='git push' +# Open nvim with diffview +# Handy plugin for viewing git diffs +# and handling merges +alias diffview='nvim +DiffviewOpen' + # Rename grc alias from forgit since it # collides with the grc colorizer forgit_revert_commit=fgrc From 26bcca97ba94501de73d5fc6f1ca4c4e40204912 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 22:48:11 +0200 Subject: [PATCH 2230/2667] Remove git mergetool and difftool, use zsh diffview alias instead This is because as a git tool, it wants to open each file separately. Neovim and diffview plugin provide a handy UI to manage multiple files in diff and merge --- home/.config/git/config | 9 --------- home/.config/zsh/04-aliases.zsh | 5 +++++ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/home/.config/git/config b/home/.config/git/config index d3b78fbf..3f4d7fe3 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -30,15 +30,6 @@ prompt = false [mergetool "nvim"] cmd = nvim +DiffviewOpen -[diff] -tool = nvim - -[difftool] -prompt = false - -[difftool "nvim"] -cmd = nvim +DiffviewOpen - [pull] rebase = merges diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index d9ea72e3..c93efc6a 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -10,6 +10,11 @@ alias gs='git status' alias gpull='git pull' alias gpush='git push' +# Open nvim with diffview +# Handy plugin for viewing git diffs +# and handling merges +alias diffview='nvim +DiffviewOpen' + # Rename grc alias from forgit since it # collides with the grc colorizer forgit_revert_commit=fgrc From 80d983447cd20322fcef5c285dee53709ab8b611 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jan 2024 08:36:38 +0200 Subject: [PATCH 2231/2667] Shorten diffview alias --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index c93efc6a..4ac4aa18 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -13,7 +13,7 @@ alias gpush='git push' # Open nvim with diffview # Handy plugin for viewing git diffs # and handling merges -alias diffview='nvim +DiffviewOpen' +alias dv='nvim +DiffviewOpen' # Rename grc alias from forgit since it # collides with the grc colorizer From f85a6425d1d3ab8ac069ef141be6f143959430f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jan 2024 08:36:38 +0200 Subject: [PATCH 2232/2667] Shorten diffview alias --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index c93efc6a..4ac4aa18 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -13,7 +13,7 @@ alias gpush='git push' # Open nvim with diffview # Handy plugin for viewing git diffs # and handling merges -alias diffview='nvim +DiffviewOpen' +alias dv='nvim +DiffviewOpen' # Rename grc alias from forgit since it # collides with the grc colorizer From d764006143c671476b53fbda83c1b0c68153cdb4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jan 2024 15:30:12 +0200 Subject: [PATCH 2233/2667] Nvim: add ability to switch between dark and light theme --- home/.config/nvim/lazy-lock.json | 3 ++- home/.config/nvim/lua/plugins/kanagawa.lua | 1 + home/.config/nvim/lua/plugins/which-key.lua | 11 +++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 93d44ff3..b8724141 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,6 +1,7 @@ { "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -62,4 +63,4 @@ "vim-fugitive": { "branch": "master", "commit": "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } -} \ No newline at end of file +} diff --git a/home/.config/nvim/lua/plugins/kanagawa.lua b/home/.config/nvim/lua/plugins/kanagawa.lua index 1cc595ab..3cd3beac 100644 --- a/home/.config/nvim/lua/plugins/kanagawa.lua +++ b/home/.config/nvim/lua/plugins/kanagawa.lua @@ -2,6 +2,7 @@ --- @type LazyPluginSpec return { "rebelot/kanagawa.nvim", + dependencies = { { "f-person/auto-dark-mode.nvim", config = true } }, --- @type KanagawaConfig opts = { compile = true, diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index a3a5b9f6..608d1047 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -1,6 +1,16 @@ -- Display possible keybinds -- Here I have also defined some generic keybinds -- Plugin specific keybinds are set up in plugin configuration file + +local function toggle_theme() + local current_theme = vim.fn.eval("&background") + if current_theme == "dark" then + vim.cmd("set background=light") + else + vim.cmd("set background=dark") + end +end + --- @type LazyPluginSpec return { "folke/which-key.nvim", @@ -10,6 +20,7 @@ return { wk.register({ h = { "nohlsearch", "Turn off search highlight" }, + b = { toggle_theme, "Toggle background between dark and light" }, }, { prefix = "" }) wk.register({ From 48f8b06521ed2a88b153053d24d848126bb6d6fd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jan 2024 15:30:12 +0200 Subject: [PATCH 2234/2667] Nvim: add ability to switch between dark and light theme --- home/.config/nvim/lazy-lock.json | 3 ++- home/.config/nvim/lua/plugins/kanagawa.lua | 1 + home/.config/nvim/lua/plugins/which-key.lua | 11 +++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 93d44ff3..b8724141 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,6 +1,7 @@ { "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -62,4 +63,4 @@ "vim-fugitive": { "branch": "master", "commit": "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } -} \ No newline at end of file +} diff --git a/home/.config/nvim/lua/plugins/kanagawa.lua b/home/.config/nvim/lua/plugins/kanagawa.lua index 1cc595ab..3cd3beac 100644 --- a/home/.config/nvim/lua/plugins/kanagawa.lua +++ b/home/.config/nvim/lua/plugins/kanagawa.lua @@ -2,6 +2,7 @@ --- @type LazyPluginSpec return { "rebelot/kanagawa.nvim", + dependencies = { { "f-person/auto-dark-mode.nvim", config = true } }, --- @type KanagawaConfig opts = { compile = true, diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index a3a5b9f6..608d1047 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -1,6 +1,16 @@ -- Display possible keybinds -- Here I have also defined some generic keybinds -- Plugin specific keybinds are set up in plugin configuration file + +local function toggle_theme() + local current_theme = vim.fn.eval("&background") + if current_theme == "dark" then + vim.cmd("set background=light") + else + vim.cmd("set background=dark") + end +end + --- @type LazyPluginSpec return { "folke/which-key.nvim", @@ -10,6 +20,7 @@ return { wk.register({ h = { "nohlsearch", "Turn off search highlight" }, + b = { toggle_theme, "Toggle background between dark and light" }, }, { prefix = "" }) wk.register({ From 49da6bd829c8db7b7d17480db68fd1ad4d0a308e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Jan 2024 16:47:55 +0200 Subject: [PATCH 2235/2667] Nvim: update plugins and restructure plugin configs a bit --- home/.config/nvim/lazy-lock.json | 68 ++++++++++++------------ home/.config/nvim/lua/lsp_utils.lua | 50 ++++++++--------- home/.config/nvim/lua/plugins/mason.lua | 22 ++------ home/.config/nvim/lua/plugins/neodev.lua | 14 +++++ 4 files changed, 75 insertions(+), 79 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/neodev.lua diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index b8724141..c800e213 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, - "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, + "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -16,51 +16,51 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "51c364728dd27f7cefe74173853e674c44efefc5" }, - "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, + "dropbar.nvim": { "branch": "master", "commit": "4516fdf6bf64f7d5719665b4d446cc49d656bd96" }, + "firenvim": { "branch": "master", "commit": "1acdf0270bdd9b83a876a15c99dca3c9b40fbaa5" }, "friendly-snippets": { "branch": "main", "commit": "aced40b66b7bae9bc2c37fd7b11841d54727a7b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "300a306da9973e81c2c06460f71fd7a079df1f36" }, + "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, - "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, - "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, + "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, - "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" }, + "mason.nvim": { "branch": "main", "commit": "baf99d94c3380640d19af9c70c0541bd6e7cd0cb" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "e7ca4a2ea0da5e39a639c08c3edb352b9355f09e" }, - "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, - "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, + "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" }, + "neoformat": { "branch": "master", "commit": "fe6ef62dda0118a98bebb7a6c576e9b23b8a701b" }, + "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, + "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, - "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, - "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "4c67b566ef8bb513692c1f26637ff3356ab02f43" }, - "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, - "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, - "nvim-tree.lua": { "branch": "master", "commit": "7bdb220d0fe604a77361e92cdbc7af1b8a412126" }, - "nvim-treesitter": { "branch": "master", "commit": "1bee80469d3d1569de47a62dd59824d9f9af0866" }, + "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, + "nvim-dap-ui": { "branch": "master", "commit": "0b4816e5ad5f3219e8e3ec9cce07f61b770c1974" }, + "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, + "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, + "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, + "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, + "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, - "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, - "nvim-web-devicons": { "branch": "master", "commit": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc" }, - "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, + "nvim-ufo": { "branch": "main", "commit": "95a148d9b3c02facce59c2050fd20fa6e8eb2cb6" }, + "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, + "password-store": { "branch": "master", "commit": "1078f2514d579178d5df7042c6a790e9c9b731ad" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, + "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "301505da4bb72d11ffeee47ad45e0b677f70abe5" }, + "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b" }, - "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } -} + "vim-fugitive": { "branch": "master", "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" }, + "vim-gnupg": { "branch": "main", "commit": "6d106fa49df3d8c1e63fac8eb64b4a0174f7e83f" }, + "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } +} \ No newline at end of file diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua index 0cc18f8f..b99e5011 100644 --- a/home/.config/nvim/lua/lsp_utils.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -2,58 +2,54 @@ -- reusable functions local m = {} +local lsp = vim.lsp +local diagnostic = vim.diagnostic + -- Maps LSP specific keybinds. -- This makes them only available when LSP is running -local function map_keys() - local telescope_builtin = require("telescope.builtin") +function m.map_keys() + local builtin = require("telescope.builtin") require("which-key").register({ g = { name = "Go to", - d = { telescope_builtin.lsp_definitions, "Definition" }, - D = { vim.lsp.buf.declaration, "Declaration" }, - t = { vim.lsp.buf.type_definition, "Type definition" }, - i = { telescope_builtin.lsp_implementations, "Implementation" }, - r = { telescope_builtin.lsp_references, "References" }, - s = { telescope_builtin.lsp_document_symbols, "Symbols" }, + d = { builtin.lsp_definitions, "Definition" }, + D = { lsp.buf.declaration, "Declaration" }, + t = { lsp.buf.type_definition, "Type definition" }, + i = { builtin.lsp_implementations, "Implementation" }, + r = { builtin.lsp_references, "References" }, + s = { builtin.lsp_document_symbols, "Symbols" }, }, [""] = { name = "Leader", w = { name = "Workspace", - a = { vim.lsp.buf.add_workspace_folder, "Add folder" }, - r = { vim.lsp.buf.remove_workspace_folder, "Remove folder" }, + a = { lsp.buf.add_workspace_folder, "Add folder" }, + r = { lsp.buf.remove_workspace_folder, "Remove folder" }, l = { function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + print(vim.inspect(lsp.buf.list_workspace_folders())) end, "List folders", }, }, - k = { vim.lsp.buf.signature_help, "Signature help" }, - rn = { vim.lsp.buf.rename, "Rename symbol" }, - ca = { vim.lsp.buf.code_action, "Code action" }, - e = { vim.diagnostic.open_float, "Open diagnostics" }, - F = { vim.lsp.buf.format, "Format with LSP" }, + k = { lsp.buf.signature_help, "Signature help" }, + rn = { lsp.buf.rename, "Rename symbol" }, + ca = { lsp.buf.code_action, "Code action" }, + e = { diagnostic.open_float, "Open diagnostics" }, + F = { lsp.buf.format, "Format with LSP" }, }, - K = { vim.lsp.buf.hover, "Hover" }, - ["["] = { d = { vim.diagnostic.goto_prev, "Previous diagnostic" } }, - ["]"] = { d = { vim.diagnostic.goto_next, "Next diagnostic" } }, + K = { lsp.buf.hover, "Hover" }, + ["["] = { d = { diagnostic.goto_prev, "Previous diagnostic" } }, + ["]"] = { d = { diagnostic.goto_next, "Next diagnostic" } }, }) end --- Maps keys and does other needed actions --- when client attaches -function m.on_attach(client, bufnr) - -- Setup keybinds - map_keys() -end - -- Combine built-in LSP and cmp cabaibilities -- and additional capabilities from other plugins function m.get_capabilities() local capabilities = vim.tbl_deep_extend( "force", - vim.lsp.protocol.make_client_capabilities(), + lsp.protocol.make_client_capabilities(), require("cmp_nvim_lsp").default_capabilities() ) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 618ea21d..df0e181d 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -11,33 +11,19 @@ return { "mfussenegger/nvim-jdtls", -- Add support for LSP file operations { "antosha417/nvim-lsp-file-operations", config = true }, - -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. - { - "folke/neodev.nvim", - --- @type LuaDevOptions - opts = { - override = function(root_dir, library) - local dotfiles_path = tostring(vim.fn.expand("~/git/dotfiles")) - if string.find(root_dir, dotfiles_path, 1, true) then - library.enabled = true - library.plugins = true - end - end, - }, - }, }, config = function() require("mason").setup() - local mason_lsp = require("mason-lspconfig") + local mlspc = require("mason-lspconfig") local lsp_utils = require("lsp_utils") - mason_lsp.setup() - mason_lsp.setup_handlers({ + mlspc.setup() + mlspc.setup_handlers({ -- Default handler function(server_name) require("lspconfig")[server_name].setup({ - on_attach = lsp_utils.on_attach, + on_attach = lsp_utils.map_keys, capabilities = lsp_utils.get_capabilities(), }) end, diff --git a/home/.config/nvim/lua/plugins/neodev.lua b/home/.config/nvim/lua/plugins/neodev.lua new file mode 100644 index 00000000..4a33ca15 --- /dev/null +++ b/home/.config/nvim/lua/plugins/neodev.lua @@ -0,0 +1,14 @@ +-- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. +return { + "folke/neodev.nvim", + --- @type LuaDevOptions + opts = { + override = function(root_dir, library) + local dotfiles_path = tostring(vim.fn.expand("~/git/dotfiles")) + if string.find(root_dir, dotfiles_path, 1, true) then + library.enabled = true + library.plugins = true + end + end, + }, +} From 1cac49f5aa8d26c6d06af6d1d01558001c99a240 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Jan 2024 16:47:55 +0200 Subject: [PATCH 2236/2667] Nvim: update plugins and restructure plugin configs a bit --- home/.config/nvim/lazy-lock.json | 68 ++++++++++++------------ home/.config/nvim/lua/lsp_utils.lua | 50 ++++++++--------- home/.config/nvim/lua/plugins/mason.lua | 22 ++------ home/.config/nvim/lua/plugins/neodev.lua | 14 +++++ 4 files changed, 75 insertions(+), 79 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/neodev.lua diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index b8724141..c800e213 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, - "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, + "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -16,51 +16,51 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "51c364728dd27f7cefe74173853e674c44efefc5" }, - "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, + "dropbar.nvim": { "branch": "master", "commit": "4516fdf6bf64f7d5719665b4d446cc49d656bd96" }, + "firenvim": { "branch": "master", "commit": "1acdf0270bdd9b83a876a15c99dca3c9b40fbaa5" }, "friendly-snippets": { "branch": "main", "commit": "aced40b66b7bae9bc2c37fd7b11841d54727a7b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "300a306da9973e81c2c06460f71fd7a079df1f36" }, + "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, - "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, - "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, + "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, - "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" }, + "mason.nvim": { "branch": "main", "commit": "baf99d94c3380640d19af9c70c0541bd6e7cd0cb" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "e7ca4a2ea0da5e39a639c08c3edb352b9355f09e" }, - "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, - "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, + "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" }, + "neoformat": { "branch": "master", "commit": "fe6ef62dda0118a98bebb7a6c576e9b23b8a701b" }, + "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, + "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, - "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, - "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "4c67b566ef8bb513692c1f26637ff3356ab02f43" }, - "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, - "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, - "nvim-tree.lua": { "branch": "master", "commit": "7bdb220d0fe604a77361e92cdbc7af1b8a412126" }, - "nvim-treesitter": { "branch": "master", "commit": "1bee80469d3d1569de47a62dd59824d9f9af0866" }, + "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, + "nvim-dap-ui": { "branch": "master", "commit": "0b4816e5ad5f3219e8e3ec9cce07f61b770c1974" }, + "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, + "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, + "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, + "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, + "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, - "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, - "nvim-web-devicons": { "branch": "master", "commit": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc" }, - "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, + "nvim-ufo": { "branch": "main", "commit": "95a148d9b3c02facce59c2050fd20fa6e8eb2cb6" }, + "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, + "password-store": { "branch": "master", "commit": "1078f2514d579178d5df7042c6a790e9c9b731ad" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, + "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "301505da4bb72d11ffeee47ad45e0b677f70abe5" }, + "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b" }, - "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } -} + "vim-fugitive": { "branch": "master", "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" }, + "vim-gnupg": { "branch": "main", "commit": "6d106fa49df3d8c1e63fac8eb64b4a0174f7e83f" }, + "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } +} \ No newline at end of file diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua index 0cc18f8f..b99e5011 100644 --- a/home/.config/nvim/lua/lsp_utils.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -2,58 +2,54 @@ -- reusable functions local m = {} +local lsp = vim.lsp +local diagnostic = vim.diagnostic + -- Maps LSP specific keybinds. -- This makes them only available when LSP is running -local function map_keys() - local telescope_builtin = require("telescope.builtin") +function m.map_keys() + local builtin = require("telescope.builtin") require("which-key").register({ g = { name = "Go to", - d = { telescope_builtin.lsp_definitions, "Definition" }, - D = { vim.lsp.buf.declaration, "Declaration" }, - t = { vim.lsp.buf.type_definition, "Type definition" }, - i = { telescope_builtin.lsp_implementations, "Implementation" }, - r = { telescope_builtin.lsp_references, "References" }, - s = { telescope_builtin.lsp_document_symbols, "Symbols" }, + d = { builtin.lsp_definitions, "Definition" }, + D = { lsp.buf.declaration, "Declaration" }, + t = { lsp.buf.type_definition, "Type definition" }, + i = { builtin.lsp_implementations, "Implementation" }, + r = { builtin.lsp_references, "References" }, + s = { builtin.lsp_document_symbols, "Symbols" }, }, [""] = { name = "Leader", w = { name = "Workspace", - a = { vim.lsp.buf.add_workspace_folder, "Add folder" }, - r = { vim.lsp.buf.remove_workspace_folder, "Remove folder" }, + a = { lsp.buf.add_workspace_folder, "Add folder" }, + r = { lsp.buf.remove_workspace_folder, "Remove folder" }, l = { function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + print(vim.inspect(lsp.buf.list_workspace_folders())) end, "List folders", }, }, - k = { vim.lsp.buf.signature_help, "Signature help" }, - rn = { vim.lsp.buf.rename, "Rename symbol" }, - ca = { vim.lsp.buf.code_action, "Code action" }, - e = { vim.diagnostic.open_float, "Open diagnostics" }, - F = { vim.lsp.buf.format, "Format with LSP" }, + k = { lsp.buf.signature_help, "Signature help" }, + rn = { lsp.buf.rename, "Rename symbol" }, + ca = { lsp.buf.code_action, "Code action" }, + e = { diagnostic.open_float, "Open diagnostics" }, + F = { lsp.buf.format, "Format with LSP" }, }, - K = { vim.lsp.buf.hover, "Hover" }, - ["["] = { d = { vim.diagnostic.goto_prev, "Previous diagnostic" } }, - ["]"] = { d = { vim.diagnostic.goto_next, "Next diagnostic" } }, + K = { lsp.buf.hover, "Hover" }, + ["["] = { d = { diagnostic.goto_prev, "Previous diagnostic" } }, + ["]"] = { d = { diagnostic.goto_next, "Next diagnostic" } }, }) end --- Maps keys and does other needed actions --- when client attaches -function m.on_attach(client, bufnr) - -- Setup keybinds - map_keys() -end - -- Combine built-in LSP and cmp cabaibilities -- and additional capabilities from other plugins function m.get_capabilities() local capabilities = vim.tbl_deep_extend( "force", - vim.lsp.protocol.make_client_capabilities(), + lsp.protocol.make_client_capabilities(), require("cmp_nvim_lsp").default_capabilities() ) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 618ea21d..df0e181d 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -11,33 +11,19 @@ return { "mfussenegger/nvim-jdtls", -- Add support for LSP file operations { "antosha417/nvim-lsp-file-operations", config = true }, - -- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. - { - "folke/neodev.nvim", - --- @type LuaDevOptions - opts = { - override = function(root_dir, library) - local dotfiles_path = tostring(vim.fn.expand("~/git/dotfiles")) - if string.find(root_dir, dotfiles_path, 1, true) then - library.enabled = true - library.plugins = true - end - end, - }, - }, }, config = function() require("mason").setup() - local mason_lsp = require("mason-lspconfig") + local mlspc = require("mason-lspconfig") local lsp_utils = require("lsp_utils") - mason_lsp.setup() - mason_lsp.setup_handlers({ + mlspc.setup() + mlspc.setup_handlers({ -- Default handler function(server_name) require("lspconfig")[server_name].setup({ - on_attach = lsp_utils.on_attach, + on_attach = lsp_utils.map_keys, capabilities = lsp_utils.get_capabilities(), }) end, diff --git a/home/.config/nvim/lua/plugins/neodev.lua b/home/.config/nvim/lua/plugins/neodev.lua new file mode 100644 index 00000000..4a33ca15 --- /dev/null +++ b/home/.config/nvim/lua/plugins/neodev.lua @@ -0,0 +1,14 @@ +-- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. +return { + "folke/neodev.nvim", + --- @type LuaDevOptions + opts = { + override = function(root_dir, library) + local dotfiles_path = tostring(vim.fn.expand("~/git/dotfiles")) + if string.find(root_dir, dotfiles_path, 1, true) then + library.enabled = true + library.plugins = true + end + end, + }, +} From e54c621cda2fa194178941af579abf34b0c1e529 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jan 2024 19:12:57 +0200 Subject: [PATCH 2237/2667] Fix gpg agent forwarding --- home/.ssh/config | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/home/.ssh/config b/home/.ssh/config index 47d3c6c0..8c1d2a7a 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -11,19 +11,20 @@ host moria HostName korhonen.cc port 221 User balrog - # Forward GPG agent - RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra - # Forward SSH agent - RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/1000/gnupg/S.gpg-agent.ssh + StreamLocalBindUnlink yes + # Forward GPG agent + StreamLocalBindUnlink yes + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra + RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh host tirion HostName tirion.korhonen.cc port 22 User gandalf - # Forward GPG agent - RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra - # Forward SSH agent - RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/1000/gnupg/S.gpg-agent.ssh + # Forward GPG agent + StreamLocalBindUnlink yes + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra + RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh host forgejo HostName korhonen.cc @@ -55,7 +56,10 @@ host gondor port 22 User reekymarko StreamLocalBindUnlink yes - RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra + # Forward GPG agent + StreamLocalBindUnlink yes + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra + RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh host anitta HostName 10.200.200.4 From 24ac9700ea3c8b15df1340074dd4d1281f82e5a3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jan 2024 19:12:57 +0200 Subject: [PATCH 2238/2667] Fix gpg agent forwarding --- home/.ssh/config | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/home/.ssh/config b/home/.ssh/config index 47d3c6c0..8c1d2a7a 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -11,19 +11,20 @@ host moria HostName korhonen.cc port 221 User balrog - # Forward GPG agent - RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra - # Forward SSH agent - RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/1000/gnupg/S.gpg-agent.ssh + StreamLocalBindUnlink yes + # Forward GPG agent + StreamLocalBindUnlink yes + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra + RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh host tirion HostName tirion.korhonen.cc port 22 User gandalf - # Forward GPG agent - RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra - # Forward SSH agent - RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/1000/gnupg/S.gpg-agent.ssh + # Forward GPG agent + StreamLocalBindUnlink yes + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra + RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh host forgejo HostName korhonen.cc @@ -55,7 +56,10 @@ host gondor port 22 User reekymarko StreamLocalBindUnlink yes - RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra + # Forward GPG agent + StreamLocalBindUnlink yes + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra + RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh host anitta HostName 10.200.200.4 From 6d5a7a3ee0ab95f9f5c6fece5f087491c945830b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jan 2024 19:13:17 +0200 Subject: [PATCH 2239/2667] Add xdg-open alias --- home/.config/zsh/04-aliases.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 4ac4aa18..b80ab844 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -10,6 +10,8 @@ alias gs='git status' alias gpull='git pull' alias gpush='git push' +alias o='xdg-open' + # Open nvim with diffview # Handy plugin for viewing git diffs # and handling merges From 4aabd574ff36e09f9ebf9b21c80f417a92a0c2ca Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jan 2024 19:13:17 +0200 Subject: [PATCH 2240/2667] Add xdg-open alias --- home/.config/zsh/04-aliases.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 4ac4aa18..b80ab844 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -10,6 +10,8 @@ alias gs='git status' alias gpull='git pull' alias gpush='git push' +alias o='xdg-open' + # Open nvim with diffview # Handy plugin for viewing git diffs # and handling merges From 544fcbfdf482da8f65b4f10654421c8772ac9a6e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jan 2024 19:13:56 +0200 Subject: [PATCH 2241/2667] Add caching to caddy --- docker/caddy/Caddyfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index dd9680b6..832c0d73 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -6,6 +6,11 @@ korhonen.cc, *.korhonen.cc { encode zstd gzip + @static { + file + path *.ico *.css *.js *.gif *.webp *.avif *.jpg *.jpeg *.png *.svg *.woff *.woff2 *.pdf *.webmanifest + } + header { Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" } @@ -17,6 +22,7 @@ korhonen.cc, *.korhonen.cc { @homepage host korhonen.cc handle @homepage { + header @static Cache-Control max-age=5184000 root * /var/www/korhonen.cc file_server } From 9e23c13bc4eeb7d5f6cf7a1743c331db44a4f1a0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jan 2024 19:13:56 +0200 Subject: [PATCH 2242/2667] Add caching to caddy --- docker/caddy/Caddyfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index dd9680b6..832c0d73 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -6,6 +6,11 @@ korhonen.cc, *.korhonen.cc { encode zstd gzip + @static { + file + path *.ico *.css *.js *.gif *.webp *.avif *.jpg *.jpeg *.png *.svg *.woff *.woff2 *.pdf *.webmanifest + } + header { Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" } @@ -17,6 +22,7 @@ korhonen.cc, *.korhonen.cc { @homepage host korhonen.cc handle @homepage { + header @static Cache-Control max-age=5184000 root * /var/www/korhonen.cc file_server } From 67c89f349e2e345d267c62c84b955ca8f241dca8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jan 2024 19:14:11 +0200 Subject: [PATCH 2243/2667] Add d_systemd to be installed on moria --- config.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.toml b/config.toml index bbde1e9e..9a585b6f 100644 --- a/config.toml +++ b/config.toml @@ -319,6 +319,7 @@ dotfiles = [ "f_dconf.ini", "f_zprofile", "f_fonts.conf", + "d_systemd", ] [profiles.Moria.variables] From 90ff510799a5d0ddfa11987b705bce8c268d9cbd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jan 2024 19:14:11 +0200 Subject: [PATCH 2244/2667] Add d_systemd to be installed on moria --- config.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.toml b/config.toml index bbde1e9e..9a585b6f 100644 --- a/config.toml +++ b/config.toml @@ -319,6 +319,7 @@ dotfiles = [ "f_dconf.ini", "f_zprofile", "f_fonts.conf", + "d_systemd", ] [profiles.Moria.variables] From 5126176e6b7b27402d22bdf2828f80b994137049 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 12:46:50 +0200 Subject: [PATCH 2245/2667] Nvim: Downgrade packages to 67c89f349e2e345d267c62c84b955ca8f241dca8 Neoformat stopped working --- home/.config/nvim/lazy-lock.json | 68 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index c800e213..b8724141 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, - "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" }, + "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -16,51 +16,51 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "4516fdf6bf64f7d5719665b4d446cc49d656bd96" }, - "firenvim": { "branch": "master", "commit": "1acdf0270bdd9b83a876a15c99dca3c9b40fbaa5" }, + "dropbar.nvim": { "branch": "master", "commit": "51c364728dd27f7cefe74173853e674c44efefc5" }, + "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, "friendly-snippets": { "branch": "main", "commit": "aced40b66b7bae9bc2c37fd7b11841d54727a7b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, + "gitsigns.nvim": { "branch": "main", "commit": "300a306da9973e81c2c06460f71fd7a079df1f36" }, "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, - "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, + "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, - "mason.nvim": { "branch": "main", "commit": "baf99d94c3380640d19af9c70c0541bd6e7cd0cb" }, + "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" }, - "neoformat": { "branch": "master", "commit": "fe6ef62dda0118a98bebb7a6c576e9b23b8a701b" }, - "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, + "neodev.nvim": { "branch": "main", "commit": "e7ca4a2ea0da5e39a639c08c3edb352b9355f09e" }, + "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, + "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, + "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, - "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, + "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, - "nvim-dap-ui": { "branch": "master", "commit": "0b4816e5ad5f3219e8e3ec9cce07f61b770c1974" }, - "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, - "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, - "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, - "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, + "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, + "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, + "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "4c67b566ef8bb513692c1f26637ff3356ab02f43" }, + "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, + "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, + "nvim-tree.lua": { "branch": "master", "commit": "7bdb220d0fe604a77361e92cdbc7af1b8a412126" }, + "nvim-treesitter": { "branch": "master", "commit": "1bee80469d3d1569de47a62dd59824d9f9af0866" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, - "nvim-ufo": { "branch": "main", "commit": "95a148d9b3c02facce59c2050fd20fa6e8eb2cb6" }, - "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, - "password-store": { "branch": "master", "commit": "1078f2514d579178d5df7042c6a790e9c9b731ad" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, + "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, + "nvim-web-devicons": { "branch": "master", "commit": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc" }, + "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, + "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, + "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "telescope.nvim": { "branch": "master", "commit": "301505da4bb72d11ffeee47ad45e0b677f70abe5" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" }, - "vim-gnupg": { "branch": "main", "commit": "6d106fa49df3d8c1e63fac8eb64b4a0174f7e83f" }, - "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } -} \ No newline at end of file + "vim-fugitive": { "branch": "master", "commit": "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b" }, + "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } +} From e4a20edda935870d95567e21452e5e01a92aa5d7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 12:46:50 +0200 Subject: [PATCH 2246/2667] Nvim: Downgrade packages to 90ff510799a5d0ddfa11987b705bce8c268d9cbd Neoformat stopped working --- home/.config/nvim/lazy-lock.json | 68 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index c800e213..b8724141 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, - "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" }, + "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -16,51 +16,51 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "4516fdf6bf64f7d5719665b4d446cc49d656bd96" }, - "firenvim": { "branch": "master", "commit": "1acdf0270bdd9b83a876a15c99dca3c9b40fbaa5" }, + "dropbar.nvim": { "branch": "master", "commit": "51c364728dd27f7cefe74173853e674c44efefc5" }, + "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, "friendly-snippets": { "branch": "main", "commit": "aced40b66b7bae9bc2c37fd7b11841d54727a7b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, + "gitsigns.nvim": { "branch": "main", "commit": "300a306da9973e81c2c06460f71fd7a079df1f36" }, "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, - "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, + "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, - "mason.nvim": { "branch": "main", "commit": "baf99d94c3380640d19af9c70c0541bd6e7cd0cb" }, + "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" }, - "neoformat": { "branch": "master", "commit": "fe6ef62dda0118a98bebb7a6c576e9b23b8a701b" }, - "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, + "neodev.nvim": { "branch": "main", "commit": "e7ca4a2ea0da5e39a639c08c3edb352b9355f09e" }, + "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, + "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, + "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, - "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, + "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, - "nvim-dap-ui": { "branch": "master", "commit": "0b4816e5ad5f3219e8e3ec9cce07f61b770c1974" }, - "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, - "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, - "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, - "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, + "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, + "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, + "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "4c67b566ef8bb513692c1f26637ff3356ab02f43" }, + "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, + "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, + "nvim-tree.lua": { "branch": "master", "commit": "7bdb220d0fe604a77361e92cdbc7af1b8a412126" }, + "nvim-treesitter": { "branch": "master", "commit": "1bee80469d3d1569de47a62dd59824d9f9af0866" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, - "nvim-ufo": { "branch": "main", "commit": "95a148d9b3c02facce59c2050fd20fa6e8eb2cb6" }, - "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, - "password-store": { "branch": "master", "commit": "1078f2514d579178d5df7042c6a790e9c9b731ad" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, + "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, + "nvim-web-devicons": { "branch": "master", "commit": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc" }, + "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, + "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, + "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "telescope.nvim": { "branch": "master", "commit": "301505da4bb72d11ffeee47ad45e0b677f70abe5" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" }, - "vim-gnupg": { "branch": "main", "commit": "6d106fa49df3d8c1e63fac8eb64b4a0174f7e83f" }, - "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } -} \ No newline at end of file + "vim-fugitive": { "branch": "master", "commit": "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b" }, + "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } +} From 81ddde9555bab3484dadce14422b7443abe39dd2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 12:47:13 +0200 Subject: [PATCH 2247/2667] Reformat ssh config --- home/.ssh/config | 72 ++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/home/.ssh/config b/home/.ssh/config index 8c1d2a7a..6354d319 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -1,19 +1,19 @@ Include ~/.ssh/rossum_hosts host * - IdentitiesOnly yes - IdentityFile ~/.ssh/id_ed25519_yubikey.pub + IdentitiesOnly yes + IdentityFile ~/.ssh/id_ed25519_yubikey.pub #ControlMaster auto - #ControlPersist 10m - #ControlPath ~/.ssh/%r@%h:%p.socket + #ControlPersist 10m + #ControlPath ~/.ssh/%r@%h:%p.socket host moria - HostName korhonen.cc - port 221 - User balrog + HostName korhonen.cc + port 221 + User balrog StreamLocalBindUnlink yes # Forward GPG agent - StreamLocalBindUnlink yes + StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh @@ -22,56 +22,56 @@ host tirion port 22 User gandalf # Forward GPG agent - StreamLocalBindUnlink yes + StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh host forgejo - HostName korhonen.cc - user git + HostName korhonen.cc + user git host gitlab - HostName gitlab.com - User git + HostName gitlab.com + User git host github - HostName github.com - User git + HostName github.com + User git host bitbucket - HostName bitbucket.org - User git + HostName bitbucket.org + User git Host aur - HostName aur.archlinux.org - User aur + HostName aur.archlinux.org + User aur host moria-unlock - HostName korhonen.cc - port 221 - User root + HostName korhonen.cc + port 221 + User root host gondor - hostname tolkku.net - port 22 - User reekymarko - StreamLocalBindUnlink yes + hostname tolkku.net + port 22 + User reekymarko + StreamLocalBindUnlink yes # Forward GPG agent - StreamLocalBindUnlink yes + StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh host anitta - HostName 10.200.200.4 - port 22 - user reekymarko + HostName 10.200.200.4 + port 22 + user reekymarko host takamaki - HostName 10.200.200.5 - port 22 - user reekymarko + HostName 10.200.200.5 + port 22 + user reekymarko host viirujateippi - HostName viirujateippi.fi - port 22 - user functionalhacker + HostName viirujateippi.fi + port 22 + user functionalhacker From 48d0871acad0e9550996800befebe58e84afb8bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 12:47:13 +0200 Subject: [PATCH 2248/2667] Reformat ssh config --- home/.ssh/config | 72 ++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/home/.ssh/config b/home/.ssh/config index 8c1d2a7a..6354d319 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -1,19 +1,19 @@ Include ~/.ssh/rossum_hosts host * - IdentitiesOnly yes - IdentityFile ~/.ssh/id_ed25519_yubikey.pub + IdentitiesOnly yes + IdentityFile ~/.ssh/id_ed25519_yubikey.pub #ControlMaster auto - #ControlPersist 10m - #ControlPath ~/.ssh/%r@%h:%p.socket + #ControlPersist 10m + #ControlPath ~/.ssh/%r@%h:%p.socket host moria - HostName korhonen.cc - port 221 - User balrog + HostName korhonen.cc + port 221 + User balrog StreamLocalBindUnlink yes # Forward GPG agent - StreamLocalBindUnlink yes + StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh @@ -22,56 +22,56 @@ host tirion port 22 User gandalf # Forward GPG agent - StreamLocalBindUnlink yes + StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh host forgejo - HostName korhonen.cc - user git + HostName korhonen.cc + user git host gitlab - HostName gitlab.com - User git + HostName gitlab.com + User git host github - HostName github.com - User git + HostName github.com + User git host bitbucket - HostName bitbucket.org - User git + HostName bitbucket.org + User git Host aur - HostName aur.archlinux.org - User aur + HostName aur.archlinux.org + User aur host moria-unlock - HostName korhonen.cc - port 221 - User root + HostName korhonen.cc + port 221 + User root host gondor - hostname tolkku.net - port 22 - User reekymarko - StreamLocalBindUnlink yes + hostname tolkku.net + port 22 + User reekymarko + StreamLocalBindUnlink yes # Forward GPG agent - StreamLocalBindUnlink yes + StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh host anitta - HostName 10.200.200.4 - port 22 - user reekymarko + HostName 10.200.200.4 + port 22 + user reekymarko host takamaki - HostName 10.200.200.5 - port 22 - user reekymarko + HostName 10.200.200.5 + port 22 + user reekymarko host viirujateippi - HostName viirujateippi.fi - port 22 - user functionalhacker + HostName viirujateippi.fi + port 22 + user functionalhacker From 0e72be4d93c32470e7c9f3c8aafea725ad65c3af Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 12:47:24 +0200 Subject: [PATCH 2249/2667] Nvim: fix jdtls keybinds initialization --- home/.config/nvim/ftplugin/java.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index b40bee10..3389dc9c 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -58,7 +58,7 @@ require("jdtls").start_or_attach({ }, }, capabilities = lsp_utils.get_capabilities(), - on_attach = lsp_utils.on_attach, + on_attach = lsp_utils.map_keys, }) function RunJava() From 4e4975039f53035cb3ce0b20a0e1ca55de0f601d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 12:47:24 +0200 Subject: [PATCH 2250/2667] Nvim: fix jdtls keybinds initialization --- home/.config/nvim/ftplugin/java.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index b40bee10..3389dc9c 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -58,7 +58,7 @@ require("jdtls").start_or_attach({ }, }, capabilities = lsp_utils.get_capabilities(), - on_attach = lsp_utils.on_attach, + on_attach = lsp_utils.map_keys, }) function RunJava() From 0db7729c53cb88121f38134c7d4b899865a545b3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 13:22:32 +0200 Subject: [PATCH 2251/2667] Fix dotdrop alias --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index b80ab844..02a058e5 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -165,7 +165,7 @@ alias i='iwctl station wlan0' cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop -dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p Isengard{%@@ endif @@%} $@ } +dotdrop() { source $DOTREPO/secrets/secrets && UID=$(id -u) $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p Isengard{%@@ endif @@%} $@ } sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ } updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } compdef _dotdrop-completion.zsh sdotdrop From 91e2671ddd48ad06878ca184b8732509a064d570 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 13:22:32 +0200 Subject: [PATCH 2252/2667] Fix dotdrop alias --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index b80ab844..02a058e5 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -165,7 +165,7 @@ alias i='iwctl station wlan0' cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop -dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p Isengard{%@@ endif @@%} $@ } +dotdrop() { source $DOTREPO/secrets/secrets && UID=$(id -u) $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p Isengard{%@@ endif @@%} $@ } sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ } updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } compdef _dotdrop-completion.zsh sdotdrop From 8b6dbcf1c8cde7186d0d494f1284f17f19ab0326 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 13:25:15 +0200 Subject: [PATCH 2253/2667] Nvim: don't use lazy lockfile directly from repo --- config.toml | 1 - home/.config/nvim/init.lua | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/config.toml b/config.toml index 9a585b6f..951c7e91 100644 --- a/config.toml +++ b/config.toml @@ -36,7 +36,6 @@ src = ".config/imapnotify" [dotfiles.d_nvim] dst = "~/.config/nvim" src = ".config/nvim" -instignore = ["*/lazy-lock.json"] actions = ["kanagawa-compile"] [dotfiles.d_rofi] diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 937e9e54..34ae3a89 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -17,7 +17,7 @@ require("neovide") require("highlight_yank") require("lazy").setup({ spec = { import = "plugins" }, - lockfile = "~/git/dotfiles/home/.config/nvim/lazy-lock.json", + lockfile = "~/.confing/nvim/lazy-lock.json", performance = { disabled_plugins = { "netrwPlugin" }, }, From 126b72166f5b367090f22e2cfeb9530f0b79f769 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 13:25:15 +0200 Subject: [PATCH 2254/2667] Nvim: don't use lazy lockfile directly from repo --- config.toml | 1 - home/.config/nvim/init.lua | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/config.toml b/config.toml index 9a585b6f..951c7e91 100644 --- a/config.toml +++ b/config.toml @@ -36,7 +36,6 @@ src = ".config/imapnotify" [dotfiles.d_nvim] dst = "~/.config/nvim" src = ".config/nvim" -instignore = ["*/lazy-lock.json"] actions = ["kanagawa-compile"] [dotfiles.d_rofi] diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 937e9e54..34ae3a89 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -17,7 +17,7 @@ require("neovide") require("highlight_yank") require("lazy").setup({ spec = { import = "plugins" }, - lockfile = "~/git/dotfiles/home/.config/nvim/lazy-lock.json", + lockfile = "~/.confing/nvim/lazy-lock.json", performance = { disabled_plugins = { "netrwPlugin" }, }, From ab262abe667bd5395c37a65f16468585d775535b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 13:36:36 +0200 Subject: [PATCH 2255/2667] Neovi: update plugins and fix neoformat version --- home/.config/nvim/lazy-lock.json | 70 ++++++++++----------- home/.config/nvim/lua/plugins/neoformat.lua | 1 + 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index b8724141..10bd9284 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, - "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, + "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -16,51 +16,51 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "51c364728dd27f7cefe74173853e674c44efefc5" }, - "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, - "friendly-snippets": { "branch": "main", "commit": "aced40b66b7bae9bc2c37fd7b11841d54727a7b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "300a306da9973e81c2c06460f71fd7a079df1f36" }, + "dropbar.nvim": { "branch": "master", "commit": "4516fdf6bf64f7d5719665b4d446cc49d656bd96" }, + "firenvim": { "branch": "master", "commit": "1acdf0270bdd9b83a876a15c99dca3c9b40fbaa5" }, + "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, + "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, - "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, - "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, + "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, - "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" }, + "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "e7ca4a2ea0da5e39a639c08c3edb352b9355f09e" }, - "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, - "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, + "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" }, + "neoformat": { "branch": "master", "commit": "fe6ef62dda0118a98bebb7a6c576e9b23b8a701b" }, + "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, + "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, - "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, - "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "4c67b566ef8bb513692c1f26637ff3356ab02f43" }, - "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, - "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, - "nvim-tree.lua": { "branch": "master", "commit": "7bdb220d0fe604a77361e92cdbc7af1b8a412126" }, - "nvim-treesitter": { "branch": "master", "commit": "1bee80469d3d1569de47a62dd59824d9f9af0866" }, + "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, + "nvim-dap-ui": { "branch": "master", "commit": "0b4816e5ad5f3219e8e3ec9cce07f61b770c1974" }, + "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, + "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, + "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, + "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, + "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, - "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, - "nvim-web-devicons": { "branch": "master", "commit": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc" }, - "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, + "nvim-ufo": { "branch": "main", "commit": "95a148d9b3c02facce59c2050fd20fa6e8eb2cb6" }, + "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, + "password-store": { "branch": "master", "commit": "1078f2514d579178d5df7042c6a790e9c9b731ad" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, + "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "301505da4bb72d11ffeee47ad45e0b677f70abe5" }, + "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b" }, - "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } -} + "vim-fugitive": { "branch": "master", "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" }, + "vim-gnupg": { "branch": "main", "commit": "6d106fa49df3d8c1e63fac8eb64b4a0174f7e83f" }, + "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } +} \ No newline at end of file diff --git a/home/.config/nvim/lua/plugins/neoformat.lua b/home/.config/nvim/lua/plugins/neoformat.lua index 1bdc479a..ef6bd349 100644 --- a/home/.config/nvim/lua/plugins/neoformat.lua +++ b/home/.config/nvim/lua/plugins/neoformat.lua @@ -2,6 +2,7 @@ --- @type LazyPluginSpec return { "sbdchd/neoformat", + branch = "master", keys = { { desc = "Format with Neoformat", From 3000d8bbfb23b8907e905b6162e586659c03ab9f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 13:36:36 +0200 Subject: [PATCH 2256/2667] Neovi: update plugins and fix neoformat version --- home/.config/nvim/lazy-lock.json | 70 ++++++++++----------- home/.config/nvim/lua/plugins/neoformat.lua | 1 + 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index b8724141..10bd9284 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, - "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, + "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -16,51 +16,51 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "51c364728dd27f7cefe74173853e674c44efefc5" }, - "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, - "friendly-snippets": { "branch": "main", "commit": "aced40b66b7bae9bc2c37fd7b11841d54727a7b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "300a306da9973e81c2c06460f71fd7a079df1f36" }, + "dropbar.nvim": { "branch": "master", "commit": "4516fdf6bf64f7d5719665b4d446cc49d656bd96" }, + "firenvim": { "branch": "master", "commit": "1acdf0270bdd9b83a876a15c99dca3c9b40fbaa5" }, + "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, + "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, - "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, - "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, + "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, - "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" }, + "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "e7ca4a2ea0da5e39a639c08c3edb352b9355f09e" }, - "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, - "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, + "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" }, + "neoformat": { "branch": "master", "commit": "fe6ef62dda0118a98bebb7a6c576e9b23b8a701b" }, + "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, + "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, - "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, - "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "4c67b566ef8bb513692c1f26637ff3356ab02f43" }, - "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, - "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, - "nvim-tree.lua": { "branch": "master", "commit": "7bdb220d0fe604a77361e92cdbc7af1b8a412126" }, - "nvim-treesitter": { "branch": "master", "commit": "1bee80469d3d1569de47a62dd59824d9f9af0866" }, + "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, + "nvim-dap-ui": { "branch": "master", "commit": "0b4816e5ad5f3219e8e3ec9cce07f61b770c1974" }, + "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, + "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, + "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, + "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, + "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, - "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, - "nvim-web-devicons": { "branch": "master", "commit": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc" }, - "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, + "nvim-ufo": { "branch": "main", "commit": "95a148d9b3c02facce59c2050fd20fa6e8eb2cb6" }, + "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, + "password-store": { "branch": "master", "commit": "1078f2514d579178d5df7042c6a790e9c9b731ad" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, + "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "301505da4bb72d11ffeee47ad45e0b677f70abe5" }, + "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b" }, - "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } -} + "vim-fugitive": { "branch": "master", "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" }, + "vim-gnupg": { "branch": "main", "commit": "6d106fa49df3d8c1e63fac8eb64b4a0174f7e83f" }, + "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } +} \ No newline at end of file diff --git a/home/.config/nvim/lua/plugins/neoformat.lua b/home/.config/nvim/lua/plugins/neoformat.lua index 1bdc479a..ef6bd349 100644 --- a/home/.config/nvim/lua/plugins/neoformat.lua +++ b/home/.config/nvim/lua/plugins/neoformat.lua @@ -2,6 +2,7 @@ --- @type LazyPluginSpec return { "sbdchd/neoformat", + branch = "master", keys = { { desc = "Format with Neoformat", From 3a1d38a693d99929edbcee44a1b16f1c77c2df28 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 13:55:54 +0200 Subject: [PATCH 2257/2667] Fix typo --- home/.config/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 34ae3a89..9d9c9268 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -17,7 +17,7 @@ require("neovide") require("highlight_yank") require("lazy").setup({ spec = { import = "plugins" }, - lockfile = "~/.confing/nvim/lazy-lock.json", + lockfile = "~/.config/nvim/lazy-lock.json", performance = { disabled_plugins = { "netrwPlugin" }, }, From 1d34f2128853fc52ec2824f367d72fb4744bc4a5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 13:55:54 +0200 Subject: [PATCH 2258/2667] Fix typo --- home/.config/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 34ae3a89..9d9c9268 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -17,7 +17,7 @@ require("neovide") require("highlight_yank") require("lazy").setup({ spec = { import = "plugins" }, - lockfile = "~/.confing/nvim/lazy-lock.json", + lockfile = "~/.config/nvim/lazy-lock.json", performance = { disabled_plugins = { "netrwPlugin" }, }, From 610ec4c6979f14c047481186f905467f89e8bcbf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 14:06:13 +0200 Subject: [PATCH 2259/2667] Nvim: downgrade telescope --- home/.config/nvim/lazy-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 10bd9284..5364ff1c 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -30,7 +30,7 @@ "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" }, - "neoformat": { "branch": "master", "commit": "fe6ef62dda0118a98bebb7a6c576e9b23b8a701b" }, + "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, @@ -57,10 +57,10 @@ "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "telescope.nvim": { "branch": "master", "commit": "301505da4bb72d11ffeee47ad45e0b677f70abe5" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" }, "vim-gnupg": { "branch": "main", "commit": "6d106fa49df3d8c1e63fac8eb64b4a0174f7e83f" }, "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } -} \ No newline at end of file +} From 63abd4e9cd428ffd38d0d9ee49b8be8b42d43949 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 14:06:13 +0200 Subject: [PATCH 2260/2667] Nvim: downgrade telescope --- home/.config/nvim/lazy-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 10bd9284..5364ff1c 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -30,7 +30,7 @@ "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" }, - "neoformat": { "branch": "master", "commit": "fe6ef62dda0118a98bebb7a6c576e9b23b8a701b" }, + "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, @@ -57,10 +57,10 @@ "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "telescope.nvim": { "branch": "master", "commit": "301505da4bb72d11ffeee47ad45e0b677f70abe5" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" }, "vim-gnupg": { "branch": "main", "commit": "6d106fa49df3d8c1e63fac8eb64b4a0174f7e83f" }, "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } -} \ No newline at end of file +} From cebd82df87decaffb414e15c0ff50c34f2acb376 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Feb 2024 19:37:08 +0200 Subject: [PATCH 2261/2667] Add kanagawa colors for foot --- config.toml | 1 + home/.config/foot/foot-light.ini | 45 ++++++++++++++++++++++++++++++++ home/.config/foot/foot.ini | 36 +++++++++++++++++++++++-- 3 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 home/.config/foot/foot-light.ini diff --git a/config.toml b/config.toml index 951c7e91..a3f87bf7 100644 --- a/config.toml +++ b/config.toml @@ -306,6 +306,7 @@ dotfiles = [ "f_dconf.ini", "f_docker-config.json", "f_fonts.conf", + "f_foot.ini", ] [profiles.Mirkwood.variables] diff --git a/home/.config/foot/foot-light.ini b/home/.config/foot/foot-light.ini new file mode 100644 index 00000000..47cc25dd --- /dev/null +++ b/home/.config/foot/foot-light.ini @@ -0,0 +1,45 @@ +pad=10x0 +dpi-aware=yes + +[scrollback] +lines=1000 + +[cursor] +blink=yes + +[mouse] +hide-when-typing=yes + +[colors] +foreground = 545464 +background = f2ecbc + +selection-foreground = 43436c +selection-background = c9cbd1 + +regular0 = 1F1F28 +regular1 = c84053 +regular2 = 6f894e +regular3 = 77713f +regular4 = 4d699b +regular5 = b35b79 +regular6 = 597b75 +regular7 = 545464 + +bright0 = 8a8980 +bright1 = d7474b +bright2 = 6e915f +bright3 = 836f4a +bright4 = 6693bf +bright5 = 624c83 +bright6 = 5e857a +bright7 = 43436c + + +16 = cc6d00 +17 = e82424 + +[csd] +color = fff2ecbc +button-color = ff545464 +hide-when-maximized = yes diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini index c34e5606..eb9fd24c 100644 --- a/home/.config/foot/foot.ini +++ b/home/.config/foot/foot.ini @@ -1,6 +1,5 @@ -include=~/.cache/wal/colors-foot.ini - pad=10x0 +dpi-aware=yes [scrollback] lines=1000 @@ -10,3 +9,36 @@ blink=yes [mouse] hide-when-typing=yes + +[colors] +foreground = dcd7ba +background = 1f1f28 + +selection-foreground = c8c093 +selection-background = 2d4f67 + +regular0 = 090618 +regular1 = c34043 +regular2 = 76946a +regular3 = c0a36e +regular4 = 7e9cd8 +regular5 = 957fb8 +regular6 = 6a9589 +regular7 = c8c093 + +bright0 = 727169 +bright1 = e82424 +bright2 = 98bb6c +bright3 = e6c384 +bright4 = 7fb4ca +bright5 = 938aa9 +bright6 = 7aa89f +bright7 = dcd7ba + +16 = ffa066 +17 = ff5d62 + +[csd] +color = ff1f1f28 +button-color = ffdcd7ba +hide-when-maximized = yes From df45dea14325fbf89856e44003ca77fcdd975c8c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Feb 2024 19:37:08 +0200 Subject: [PATCH 2262/2667] Add kanagawa colors for foot --- config.toml | 1 + home/.config/foot/foot-light.ini | 45 ++++++++++++++++++++++++++++++++ home/.config/foot/foot.ini | 36 +++++++++++++++++++++++-- 3 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 home/.config/foot/foot-light.ini diff --git a/config.toml b/config.toml index 951c7e91..a3f87bf7 100644 --- a/config.toml +++ b/config.toml @@ -306,6 +306,7 @@ dotfiles = [ "f_dconf.ini", "f_docker-config.json", "f_fonts.conf", + "f_foot.ini", ] [profiles.Mirkwood.variables] diff --git a/home/.config/foot/foot-light.ini b/home/.config/foot/foot-light.ini new file mode 100644 index 00000000..47cc25dd --- /dev/null +++ b/home/.config/foot/foot-light.ini @@ -0,0 +1,45 @@ +pad=10x0 +dpi-aware=yes + +[scrollback] +lines=1000 + +[cursor] +blink=yes + +[mouse] +hide-when-typing=yes + +[colors] +foreground = 545464 +background = f2ecbc + +selection-foreground = 43436c +selection-background = c9cbd1 + +regular0 = 1F1F28 +regular1 = c84053 +regular2 = 6f894e +regular3 = 77713f +regular4 = 4d699b +regular5 = b35b79 +regular6 = 597b75 +regular7 = 545464 + +bright0 = 8a8980 +bright1 = d7474b +bright2 = 6e915f +bright3 = 836f4a +bright4 = 6693bf +bright5 = 624c83 +bright6 = 5e857a +bright7 = 43436c + + +16 = cc6d00 +17 = e82424 + +[csd] +color = fff2ecbc +button-color = ff545464 +hide-when-maximized = yes diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini index c34e5606..eb9fd24c 100644 --- a/home/.config/foot/foot.ini +++ b/home/.config/foot/foot.ini @@ -1,6 +1,5 @@ -include=~/.cache/wal/colors-foot.ini - pad=10x0 +dpi-aware=yes [scrollback] lines=1000 @@ -10,3 +9,36 @@ blink=yes [mouse] hide-when-typing=yes + +[colors] +foreground = dcd7ba +background = 1f1f28 + +selection-foreground = c8c093 +selection-background = 2d4f67 + +regular0 = 090618 +regular1 = c34043 +regular2 = 76946a +regular3 = c0a36e +regular4 = 7e9cd8 +regular5 = 957fb8 +regular6 = 6a9589 +regular7 = c8c093 + +bright0 = 727169 +bright1 = e82424 +bright2 = 98bb6c +bright3 = e6c384 +bright4 = 7fb4ca +bright5 = 938aa9 +bright6 = 7aa89f +bright7 = dcd7ba + +16 = ffa066 +17 = ff5d62 + +[csd] +color = ff1f1f28 +button-color = ffdcd7ba +hide-when-maximized = yes From 5561023ea8a6dc39412b2353adb749afc4dfdd37 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 4 Feb 2024 10:15:36 +0200 Subject: [PATCH 2263/2667] Switch from tmux to zellij Also remapped some nvim and zsh keybinds to not conflict with zellij --- config.toml | 10 +++++----- home/.config/nvim/lua/plugins/telescope.lua | 4 ++-- home/.config/nvim/lua/plugins/which-key.lua | 4 ++-- home/.config/zellij/config.kdl | 11 +++++++++++ home/.config/zellij/themes/kanagawa.kdl | 15 +++++++++++++++ home/.config/zsh/01-tmux.zsh | 8 -------- home/.config/zsh/01-zellij.zsh | 9 +++++++++ home/.config/zsh/06-keybinds.zsh | 4 ++++ 8 files changed, 48 insertions(+), 17 deletions(-) create mode 100644 home/.config/zellij/config.kdl create mode 100644 home/.config/zellij/themes/kanagawa.kdl delete mode 100644 home/.config/zsh/01-tmux.zsh create mode 100644 home/.config/zsh/01-zellij.zsh diff --git a/config.toml b/config.toml index a3f87bf7..ab90a418 100644 --- a/config.toml +++ b/config.toml @@ -154,10 +154,6 @@ src = ".local/share/applications/steam-native.desktop" dst = "~/.config/telegram-desktop/lang.strings" src = ".config/telegram-desktop/lang.strings" -[dotfiles."f_tmux.conf"] -dst = "~/.tmux.conf" -src = ".tmux.conf" - [dotfiles.f_youtube-dl_config] dst = "~/.config/youtube-dl/config" src = ".config/youtube-dl/config" @@ -250,6 +246,10 @@ src = ".npmrc" dst = "~/.npmrc" chmod = "600" +[dotfiles.d_zellij] +src = ".config/zellij" +dst = "~/.config/zellij" + [profiles.pacman] dotfiles = ["f_makepkg.conf", "f_paru.conf"] @@ -267,7 +267,7 @@ dotfiles = [ "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", - "f_tmux.conf", + "d_zellij", "f_zshrc", "f_npmrc", ] diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 15fd534e..c0842a3d 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -68,7 +68,7 @@ return { keys = { { desc = "Open Telescope", - "", + "t", "Telescope", }, { @@ -88,7 +88,7 @@ return { }, { desc = "Change to a project", - "", + "p", "Telescope projects", }, }, diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 608d1047..0a65beac 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -24,8 +24,8 @@ return { }, { prefix = "" }) wk.register({ - [""] = { "bnext", "Next buffer" }, - [""] = { "bprevious", "Previous buffer" }, + [""] = { "bnext", "Next buffer" }, + [""] = { "bprevious", "Previous buffer" }, }) -- Exit terminal insert mode with esc diff --git a/home/.config/zellij/config.kdl b/home/.config/zellij/config.kdl new file mode 100644 index 00000000..d3a0e53f --- /dev/null +++ b/home/.config/zellij/config.kdl @@ -0,0 +1,11 @@ +theme "kanagawa" + +keybinds { + unbind "Ctrl g" + locked { + bind "Ctrl l" { SwitchToMode "Normal"; } + } + shared_except "locked" { + bind "Ctrl l" { SwitchToMode "Locked"; } + } +} diff --git a/home/.config/zellij/themes/kanagawa.kdl b/home/.config/zellij/themes/kanagawa.kdl new file mode 100644 index 00000000..b85c184b --- /dev/null +++ b/home/.config/zellij/themes/kanagawa.kdl @@ -0,0 +1,15 @@ +themes { + kanagawa { + fg "#dcd7ba" + bg "#1f1f28" + black "#090618" + red "#c34043" + green "#76946a" + yellow "#c0a36e" + blue "#7e9cd8" + magenta "#957fb8" + cyan "#6a9589" + white "#c8c093" + orange "#ffa066" + } +} diff --git a/home/.config/zsh/01-tmux.zsh b/home/.config/zsh/01-tmux.zsh deleted file mode 100644 index 55d3f0c7..00000000 --- a/home/.config/zsh/01-tmux.zsh +++ /dev/null @@ -1,8 +0,0 @@ -# Launch tmux if logging in over ssh -if [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then - if tmux has-session -t ssh_tmux 2>/dev/null; then - exec tmux -2 attach-session -t ssh_tmux - else - exec tmux -2 new-session -s ssh_tmux - fi -fi diff --git a/home/.config/zsh/01-zellij.zsh b/home/.config/zsh/01-zellij.zsh new file mode 100644 index 00000000..2b68601c --- /dev/null +++ b/home/.config/zsh/01-zellij.zsh @@ -0,0 +1,9 @@ +if [[ -z "$ZELLIJ" ]]; then + # Launch or attach to existing session if logging in over ssh + if [[ -n "$SSH_CONNECTION" ]]; then + exec zellij attach -s SSH + # Launch a new local session otherwise + else + exec zellij + fi +fi diff --git a/home/.config/zsh/06-keybinds.zsh b/home/.config/zsh/06-keybinds.zsh index 7f0c95d2..bea3d85a 100644 --- a/home/.config/zsh/06-keybinds.zsh +++ b/home/.config/zsh/06-keybinds.zsh @@ -44,3 +44,7 @@ bindkey -M vicmd e edit-command-line # bind delete in normal mode bindkey -M vicmd '^[[3~' delete-char + +# Rebind fzf to ctrl+f +bindkey '^F' fzf-file-widget +bindkey '^T' transpose-chars From 7136b447f94cc84e41aa683296aaaae7aadf097c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 4 Feb 2024 10:15:36 +0200 Subject: [PATCH 2264/2667] Switch from tmux to zellij Also remapped some nvim and zsh keybinds to not conflict with zellij --- config.toml | 10 +++++----- home/.config/nvim/lua/plugins/telescope.lua | 4 ++-- home/.config/nvim/lua/plugins/which-key.lua | 4 ++-- home/.config/zellij/config.kdl | 11 +++++++++++ home/.config/zellij/themes/kanagawa.kdl | 15 +++++++++++++++ home/.config/zsh/01-tmux.zsh | 8 -------- home/.config/zsh/01-zellij.zsh | 9 +++++++++ home/.config/zsh/06-keybinds.zsh | 4 ++++ 8 files changed, 48 insertions(+), 17 deletions(-) create mode 100644 home/.config/zellij/config.kdl create mode 100644 home/.config/zellij/themes/kanagawa.kdl delete mode 100644 home/.config/zsh/01-tmux.zsh create mode 100644 home/.config/zsh/01-zellij.zsh diff --git a/config.toml b/config.toml index a3f87bf7..ab90a418 100644 --- a/config.toml +++ b/config.toml @@ -154,10 +154,6 @@ src = ".local/share/applications/steam-native.desktop" dst = "~/.config/telegram-desktop/lang.strings" src = ".config/telegram-desktop/lang.strings" -[dotfiles."f_tmux.conf"] -dst = "~/.tmux.conf" -src = ".tmux.conf" - [dotfiles.f_youtube-dl_config] dst = "~/.config/youtube-dl/config" src = ".config/youtube-dl/config" @@ -250,6 +246,10 @@ src = ".npmrc" dst = "~/.npmrc" chmod = "600" +[dotfiles.d_zellij] +src = ".config/zellij" +dst = "~/.config/zellij" + [profiles.pacman] dotfiles = ["f_makepkg.conf", "f_paru.conf"] @@ -267,7 +267,7 @@ dotfiles = [ "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", - "f_tmux.conf", + "d_zellij", "f_zshrc", "f_npmrc", ] diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 15fd534e..c0842a3d 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -68,7 +68,7 @@ return { keys = { { desc = "Open Telescope", - "", + "t", "Telescope", }, { @@ -88,7 +88,7 @@ return { }, { desc = "Change to a project", - "", + "p", "Telescope projects", }, }, diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 608d1047..0a65beac 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -24,8 +24,8 @@ return { }, { prefix = "" }) wk.register({ - [""] = { "bnext", "Next buffer" }, - [""] = { "bprevious", "Previous buffer" }, + [""] = { "bnext", "Next buffer" }, + [""] = { "bprevious", "Previous buffer" }, }) -- Exit terminal insert mode with esc diff --git a/home/.config/zellij/config.kdl b/home/.config/zellij/config.kdl new file mode 100644 index 00000000..d3a0e53f --- /dev/null +++ b/home/.config/zellij/config.kdl @@ -0,0 +1,11 @@ +theme "kanagawa" + +keybinds { + unbind "Ctrl g" + locked { + bind "Ctrl l" { SwitchToMode "Normal"; } + } + shared_except "locked" { + bind "Ctrl l" { SwitchToMode "Locked"; } + } +} diff --git a/home/.config/zellij/themes/kanagawa.kdl b/home/.config/zellij/themes/kanagawa.kdl new file mode 100644 index 00000000..b85c184b --- /dev/null +++ b/home/.config/zellij/themes/kanagawa.kdl @@ -0,0 +1,15 @@ +themes { + kanagawa { + fg "#dcd7ba" + bg "#1f1f28" + black "#090618" + red "#c34043" + green "#76946a" + yellow "#c0a36e" + blue "#7e9cd8" + magenta "#957fb8" + cyan "#6a9589" + white "#c8c093" + orange "#ffa066" + } +} diff --git a/home/.config/zsh/01-tmux.zsh b/home/.config/zsh/01-tmux.zsh deleted file mode 100644 index 55d3f0c7..00000000 --- a/home/.config/zsh/01-tmux.zsh +++ /dev/null @@ -1,8 +0,0 @@ -# Launch tmux if logging in over ssh -if [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then - if tmux has-session -t ssh_tmux 2>/dev/null; then - exec tmux -2 attach-session -t ssh_tmux - else - exec tmux -2 new-session -s ssh_tmux - fi -fi diff --git a/home/.config/zsh/01-zellij.zsh b/home/.config/zsh/01-zellij.zsh new file mode 100644 index 00000000..2b68601c --- /dev/null +++ b/home/.config/zsh/01-zellij.zsh @@ -0,0 +1,9 @@ +if [[ -z "$ZELLIJ" ]]; then + # Launch or attach to existing session if logging in over ssh + if [[ -n "$SSH_CONNECTION" ]]; then + exec zellij attach -s SSH + # Launch a new local session otherwise + else + exec zellij + fi +fi diff --git a/home/.config/zsh/06-keybinds.zsh b/home/.config/zsh/06-keybinds.zsh index 7f0c95d2..bea3d85a 100644 --- a/home/.config/zsh/06-keybinds.zsh +++ b/home/.config/zsh/06-keybinds.zsh @@ -44,3 +44,7 @@ bindkey -M vicmd e edit-command-line # bind delete in normal mode bindkey -M vicmd '^[[3~' delete-char + +# Rebind fzf to ctrl+f +bindkey '^F' fzf-file-widget +bindkey '^T' transpose-chars From 634634ea27405a39d96dc4311bc36fdba2884061 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 4 Feb 2024 10:27:08 +0200 Subject: [PATCH 2265/2667] Fix zellij SSH attach --- home/.config/zsh/01-zellij.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/01-zellij.zsh b/home/.config/zsh/01-zellij.zsh index 2b68601c..f3d76ee4 100644 --- a/home/.config/zsh/01-zellij.zsh +++ b/home/.config/zsh/01-zellij.zsh @@ -1,7 +1,7 @@ if [[ -z "$ZELLIJ" ]]; then # Launch or attach to existing session if logging in over ssh if [[ -n "$SSH_CONNECTION" ]]; then - exec zellij attach -s SSH + exec zellij attach -c SSH # Launch a new local session otherwise else exec zellij From ea273128c60a97dad1b8af671d7b55390cb6e9b1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 4 Feb 2024 10:27:08 +0200 Subject: [PATCH 2266/2667] Fix zellij SSH attach --- home/.config/zsh/01-zellij.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/01-zellij.zsh b/home/.config/zsh/01-zellij.zsh index 2b68601c..f3d76ee4 100644 --- a/home/.config/zsh/01-zellij.zsh +++ b/home/.config/zsh/01-zellij.zsh @@ -1,7 +1,7 @@ if [[ -z "$ZELLIJ" ]]; then # Launch or attach to existing session if logging in over ssh if [[ -n "$SSH_CONNECTION" ]]; then - exec zellij attach -s SSH + exec zellij attach -c SSH # Launch a new local session otherwise else exec zellij From 29e38f72843a8916f93cc54c4dc30f96808641c7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 4 Feb 2024 10:56:03 +0200 Subject: [PATCH 2267/2667] Kanagawa theme is already included in zellij --- config.toml | 8 ++++---- home/.config/zellij/themes/kanagawa.kdl | 15 --------------- 2 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 home/.config/zellij/themes/kanagawa.kdl diff --git a/config.toml b/config.toml index ab90a418..0ad64c13 100644 --- a/config.toml +++ b/config.toml @@ -246,9 +246,9 @@ src = ".npmrc" dst = "~/.npmrc" chmod = "600" -[dotfiles.d_zellij] -src = ".config/zellij" -dst = "~/.config/zellij" +[dotfiles.f_zellij] +src = ".config/zellij/config.kdl" +dst = "~/.config/zellij/config.kdl" [profiles.pacman] dotfiles = ["f_makepkg.conf", "f_paru.conf"] @@ -267,7 +267,7 @@ dotfiles = [ "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", - "d_zellij", + "f_zellij", "f_zshrc", "f_npmrc", ] diff --git a/home/.config/zellij/themes/kanagawa.kdl b/home/.config/zellij/themes/kanagawa.kdl deleted file mode 100644 index b85c184b..00000000 --- a/home/.config/zellij/themes/kanagawa.kdl +++ /dev/null @@ -1,15 +0,0 @@ -themes { - kanagawa { - fg "#dcd7ba" - bg "#1f1f28" - black "#090618" - red "#c34043" - green "#76946a" - yellow "#c0a36e" - blue "#7e9cd8" - magenta "#957fb8" - cyan "#6a9589" - white "#c8c093" - orange "#ffa066" - } -} From 06b5e11bb500d20c94c809ef2529885b513a2963 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 4 Feb 2024 10:56:03 +0200 Subject: [PATCH 2268/2667] Kanagawa theme is already included in zellij --- config.toml | 8 ++++---- home/.config/zellij/themes/kanagawa.kdl | 15 --------------- 2 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 home/.config/zellij/themes/kanagawa.kdl diff --git a/config.toml b/config.toml index ab90a418..0ad64c13 100644 --- a/config.toml +++ b/config.toml @@ -246,9 +246,9 @@ src = ".npmrc" dst = "~/.npmrc" chmod = "600" -[dotfiles.d_zellij] -src = ".config/zellij" -dst = "~/.config/zellij" +[dotfiles.f_zellij] +src = ".config/zellij/config.kdl" +dst = "~/.config/zellij/config.kdl" [profiles.pacman] dotfiles = ["f_makepkg.conf", "f_paru.conf"] @@ -267,7 +267,7 @@ dotfiles = [ "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", - "d_zellij", + "f_zellij", "f_zshrc", "f_npmrc", ] diff --git a/home/.config/zellij/themes/kanagawa.kdl b/home/.config/zellij/themes/kanagawa.kdl deleted file mode 100644 index b85c184b..00000000 --- a/home/.config/zellij/themes/kanagawa.kdl +++ /dev/null @@ -1,15 +0,0 @@ -themes { - kanagawa { - fg "#dcd7ba" - bg "#1f1f28" - black "#090618" - red "#c34043" - green "#76946a" - yellow "#c0a36e" - blue "#7e9cd8" - magenta "#957fb8" - cyan "#6a9589" - white "#c8c093" - orange "#ffa066" - } -} From 21d6a1c3f618f3dd1ae5d71ccb4ef16955a34a34 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 5 Feb 2024 13:02:04 +0200 Subject: [PATCH 2269/2667] Nvim: install latest versions of plugins instead of stable The stable versions were causing a lot of issues --- home/.config/nvim/init.lua | 2 +- home/.config/nvim/lua/plugins/neoformat.lua | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 9d9c9268..a8e93aa0 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -22,6 +22,6 @@ require("lazy").setup({ disabled_plugins = { "netrwPlugin" }, }, defaults = { - version = "*", + -- version = "*", -- Disabled for now }, }) diff --git a/home/.config/nvim/lua/plugins/neoformat.lua b/home/.config/nvim/lua/plugins/neoformat.lua index ef6bd349..1bdc479a 100644 --- a/home/.config/nvim/lua/plugins/neoformat.lua +++ b/home/.config/nvim/lua/plugins/neoformat.lua @@ -2,7 +2,6 @@ --- @type LazyPluginSpec return { "sbdchd/neoformat", - branch = "master", keys = { { desc = "Format with Neoformat", From 86e1caceade0b05cf886af8852fee672b5be836c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 5 Feb 2024 13:02:04 +0200 Subject: [PATCH 2270/2667] Nvim: install latest versions of plugins instead of stable The stable versions were causing a lot of issues --- home/.config/nvim/init.lua | 2 +- home/.config/nvim/lua/plugins/neoformat.lua | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 9d9c9268..a8e93aa0 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -22,6 +22,6 @@ require("lazy").setup({ disabled_plugins = { "netrwPlugin" }, }, defaults = { - version = "*", + -- version = "*", -- Disabled for now }, }) diff --git a/home/.config/nvim/lua/plugins/neoformat.lua b/home/.config/nvim/lua/plugins/neoformat.lua index ef6bd349..1bdc479a 100644 --- a/home/.config/nvim/lua/plugins/neoformat.lua +++ b/home/.config/nvim/lua/plugins/neoformat.lua @@ -2,7 +2,6 @@ --- @type LazyPluginSpec return { "sbdchd/neoformat", - branch = "master", keys = { { desc = "Format with Neoformat", From 85ff12a696966e33ec9c831bd18e34ebe3cc0a88 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 5 Feb 2024 13:04:10 +0200 Subject: [PATCH 2271/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 68 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 5364ff1c..491fa978 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, - "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, - "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" }, + "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -14,53 +14,53 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, + "copilot.lua": { "branch": "master", "commit": "03f825956ec49e550d07875d867ea6e7c4dc8c00" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "4516fdf6bf64f7d5719665b4d446cc49d656bd96" }, - "firenvim": { "branch": "master", "commit": "1acdf0270bdd9b83a876a15c99dca3c9b40fbaa5" }, + "dropbar.nvim": { "branch": "master", "commit": "e4fd98274f3fed310d0085c16353e7e7b3ce86a1" }, + "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, - "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, + "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" }, - "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, - "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, + "mini.nvim": { "branch": "main", "commit": "9adc2eeec07f3ee65d54f7ceb791ad8fead49c92" }, + "neodev.nvim": { "branch": "main", "commit": "0ee95ecefc8ea45898a0383364f736e098c8703f" }, + "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, + "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, + "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, - "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, - "nvim-dap-ui": { "branch": "master", "commit": "0b4816e5ad5f3219e8e3ec9cce07f61b770c1974" }, - "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, + "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, + "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, + "nvim-jdtls": { "branch": "master", "commit": "4f4de4d80e1df43d58e5e21677fca4c63676664d" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, - "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, - "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, - "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, + "nvim-lspconfig": { "branch": "master", "commit": "d12140c5687a1186b95b3f42dbc6cc769df0cf0d" }, + "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, + "nvim-tree.lua": { "branch": "master", "commit": "8cbb1db8e90b62fc56f379992e622e9f919792ce" }, + "nvim-treesitter": { "branch": "master", "commit": "4fbf150a1621d52f17b099506e1a32f107079210" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" }, "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, - "nvim-ufo": { "branch": "main", "commit": "95a148d9b3c02facce59c2050fd20fa6e8eb2cb6" }, - "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, - "password-store": { "branch": "master", "commit": "1078f2514d579178d5df7042c6a790e9c9b731ad" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, + "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" }, + "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, + "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, + "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "301505da4bb72d11ffeee47ad45e0b677f70abe5" }, + "telescope.nvim": { "branch": "master", "commit": "236083884cfe6c874e03e6cb4e7cb08809c1333c" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" }, - "vim-gnupg": { "branch": "main", "commit": "6d106fa49df3d8c1e63fac8eb64b4a0174f7e83f" }, - "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } -} + "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" }, + "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } +} \ No newline at end of file From f935e4583d9cefa79edeab68e253f7cbf2c0dcc4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 5 Feb 2024 13:04:10 +0200 Subject: [PATCH 2272/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 68 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 5364ff1c..491fa978 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, - "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, - "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" }, + "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -14,53 +14,53 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, + "copilot.lua": { "branch": "master", "commit": "03f825956ec49e550d07875d867ea6e7c4dc8c00" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "4516fdf6bf64f7d5719665b4d446cc49d656bd96" }, - "firenvim": { "branch": "master", "commit": "1acdf0270bdd9b83a876a15c99dca3c9b40fbaa5" }, + "dropbar.nvim": { "branch": "master", "commit": "e4fd98274f3fed310d0085c16353e7e7b3ce86a1" }, + "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, - "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, + "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" }, - "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, - "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, + "mini.nvim": { "branch": "main", "commit": "9adc2eeec07f3ee65d54f7ceb791ad8fead49c92" }, + "neodev.nvim": { "branch": "main", "commit": "0ee95ecefc8ea45898a0383364f736e098c8703f" }, + "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, + "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, + "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, - "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, - "nvim-dap-ui": { "branch": "master", "commit": "0b4816e5ad5f3219e8e3ec9cce07f61b770c1974" }, - "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, + "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, + "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, + "nvim-jdtls": { "branch": "master", "commit": "4f4de4d80e1df43d58e5e21677fca4c63676664d" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, - "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, - "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, - "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, + "nvim-lspconfig": { "branch": "master", "commit": "d12140c5687a1186b95b3f42dbc6cc769df0cf0d" }, + "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, + "nvim-tree.lua": { "branch": "master", "commit": "8cbb1db8e90b62fc56f379992e622e9f919792ce" }, + "nvim-treesitter": { "branch": "master", "commit": "4fbf150a1621d52f17b099506e1a32f107079210" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" }, "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, - "nvim-ufo": { "branch": "main", "commit": "95a148d9b3c02facce59c2050fd20fa6e8eb2cb6" }, - "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, - "password-store": { "branch": "master", "commit": "1078f2514d579178d5df7042c6a790e9c9b731ad" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, + "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" }, + "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, + "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, + "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "301505da4bb72d11ffeee47ad45e0b677f70abe5" }, + "telescope.nvim": { "branch": "master", "commit": "236083884cfe6c874e03e6cb4e7cb08809c1333c" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" }, - "vim-gnupg": { "branch": "main", "commit": "6d106fa49df3d8c1e63fac8eb64b4a0174f7e83f" }, - "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } -} + "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" }, + "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } +} \ No newline at end of file From 1217ee010b2e243130b8833cb91c48c41dfe035d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Feb 2024 20:51:10 +0200 Subject: [PATCH 2273/2667] Fix ntp server address --- root/etc/systemd/timesyncd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/systemd/timesyncd.conf b/root/etc/systemd/timesyncd.conf index 6a5a4391..3b117f76 100644 --- a/root/etc/systemd/timesyncd.conf +++ b/root/etc/systemd/timesyncd.conf @@ -1,3 +1,3 @@ [Time] -NTP=korhonen.cc +NTP=ntp.korhonen.cc FallbackNTP=0.fi.pool.ntp.org From abed8becf4e35abba01c7e311249aa4ccba7c8dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Feb 2024 20:51:10 +0200 Subject: [PATCH 2274/2667] Fix ntp server address --- root/etc/systemd/timesyncd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/systemd/timesyncd.conf b/root/etc/systemd/timesyncd.conf index 6a5a4391..3b117f76 100644 --- a/root/etc/systemd/timesyncd.conf +++ b/root/etc/systemd/timesyncd.conf @@ -1,3 +1,3 @@ [Time] -NTP=korhonen.cc +NTP=ntp.korhonen.cc FallbackNTP=0.fi.pool.ntp.org From 9662b7aba6bcedcd1f5bf3e784253083643d0199 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Feb 2024 20:52:51 +0200 Subject: [PATCH 2275/2667] Fix forgejo address --- home/.ssh/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.ssh/config b/home/.ssh/config index 6354d319..4cb27394 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -27,7 +27,7 @@ host tirion RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh host forgejo - HostName korhonen.cc + HostName git.korhonen.cc user git host gitlab From 9e11157642e5aebc2ea1c2300fcb29d9e1926b6d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Feb 2024 20:52:51 +0200 Subject: [PATCH 2276/2667] Fix forgejo address --- home/.ssh/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.ssh/config b/home/.ssh/config index 6354d319..4cb27394 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -27,7 +27,7 @@ host tirion RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh host forgejo - HostName korhonen.cc + HostName git.korhonen.cc user git host gitlab From 10387603f34199476ce1f254a566341ef68526f8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Feb 2024 21:22:24 +0200 Subject: [PATCH 2277/2667] Fix firefish image --- docker/firefish/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/firefish/docker-compose.toml b/docker/firefish/docker-compose.toml index 25f28504..01ce34a4 100644 --- a/docker/firefish/docker-compose.toml +++ b/docker/firefish/docker-compose.toml @@ -1,7 +1,7 @@ #:schema https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json [services.firefish] -image = "registry.joinfirefish.org/firefish/firefish:beta-amd64" +image = "registry.firefish.dev/firefish/firefish" container_name = "firefish" restart = "unless-stopped" depends_on = ["redis"] From c8e751a77502054410f931e7f88d36e893692a62 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Feb 2024 21:22:24 +0200 Subject: [PATCH 2278/2667] Fix firefish image --- docker/firefish/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/firefish/docker-compose.toml b/docker/firefish/docker-compose.toml index 25f28504..01ce34a4 100644 --- a/docker/firefish/docker-compose.toml +++ b/docker/firefish/docker-compose.toml @@ -1,7 +1,7 @@ #:schema https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json [services.firefish] -image = "registry.joinfirefish.org/firefish/firefish:beta-amd64" +image = "registry.firefish.dev/firefish/firefish" container_name = "firefish" restart = "unless-stopped" depends_on = ["redis"] From 292fc39d06a2dfe3fa1d7ce052c84b7d058d2152 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Feb 2024 21:22:57 +0200 Subject: [PATCH 2279/2667] Add nextcloud coturn ports --- docker/nextcloud/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 818d07f0..cad8c2a6 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -44,7 +44,7 @@ image = "instrumentisto/coturn" container_name = "coturn" restart = "unless-stopped" env_file = ".env" -ports = ["3478:3478/tcp", "3478:3478/udp"] +ports = ["3478:3478/tcp", "3478:3478/udp", "49160-49200:49160-49200/udp"] networks = ["nextcloud"] command = [ "-n", From 2cf82bbec9edb8c196b12e83f12cd047bdf93372 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Feb 2024 21:22:57 +0200 Subject: [PATCH 2280/2667] Add nextcloud coturn ports --- docker/nextcloud/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 818d07f0..cad8c2a6 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -44,7 +44,7 @@ image = "instrumentisto/coturn" container_name = "coturn" restart = "unless-stopped" env_file = ".env" -ports = ["3478:3478/tcp", "3478:3478/udp"] +ports = ["3478:3478/tcp", "3478:3478/udp", "49160-49200:49160-49200/udp"] networks = ["nextcloud"] command = [ "-n", From b4bab1801938f9000d7aa7f86d090d8ddd9b510d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Feb 2024 09:49:02 +0200 Subject: [PATCH 2281/2667] Nvim: add java 21 runtime, small config cleanup --- home/.config/nvim/ftplugin/java.lua | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 3389dc9c..8f91682e 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -4,11 +4,12 @@ local lombok_jar = mason_packages .. "/jdtls/lombok.jar" local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name local lsp_utils = require("lsp_utils") +local jvm = "/usr/lib/jvm" local java_version = 21 require("jdtls").start_or_attach({ cmd = { - "/usr/lib/jvm/java-" .. java_version .. "-openjdk-amd64/bin/java", + jvm .. "/java-" .. java_version .. "-openjdk-amd64/bin/java", "-Declipse.application=org.eclipse.jdt.ls.core.id1", "-Dosgi.bundles.defaultStartLevel=4", "-Declipse.product=org.eclipse.jdt.ls.core.product", @@ -38,15 +39,19 @@ require("jdtls").start_or_attach({ runtimes = { { name = "JavaSE-1.8", - path = "/usr/lib/jvm/java-8-openjdk-amd64/", + path = jvm .. "/java-8-openjdk-amd64/", }, { name = "JavaSE-11", - path = "/usr/lib/jvm/java-11-openjdk-amd64/", + path = jvm .. "/java-11-openjdk-amd64/", }, { - name = "JavaSE-19", - path = "/usr/lib/jvm/java-19-openjdk-amd64/", + name = "JavaSE-17", + path = jvm .. "/java-17-openjdk-amd64/", + }, + { + name = "JavaSE-21", + path = jvm .. "/java-21-openjdk-amd64/", }, }, handlers = { From 3795a4910971cfd2eb83525eb473e34d100ee654 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Feb 2024 09:49:02 +0200 Subject: [PATCH 2282/2667] Nvim: add java 21 runtime, small config cleanup --- home/.config/nvim/ftplugin/java.lua | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 3389dc9c..8f91682e 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -4,11 +4,12 @@ local lombok_jar = mason_packages .. "/jdtls/lombok.jar" local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name local lsp_utils = require("lsp_utils") +local jvm = "/usr/lib/jvm" local java_version = 21 require("jdtls").start_or_attach({ cmd = { - "/usr/lib/jvm/java-" .. java_version .. "-openjdk-amd64/bin/java", + jvm .. "/java-" .. java_version .. "-openjdk-amd64/bin/java", "-Declipse.application=org.eclipse.jdt.ls.core.id1", "-Dosgi.bundles.defaultStartLevel=4", "-Declipse.product=org.eclipse.jdt.ls.core.product", @@ -38,15 +39,19 @@ require("jdtls").start_or_attach({ runtimes = { { name = "JavaSE-1.8", - path = "/usr/lib/jvm/java-8-openjdk-amd64/", + path = jvm .. "/java-8-openjdk-amd64/", }, { name = "JavaSE-11", - path = "/usr/lib/jvm/java-11-openjdk-amd64/", + path = jvm .. "/java-11-openjdk-amd64/", }, { - name = "JavaSE-19", - path = "/usr/lib/jvm/java-19-openjdk-amd64/", + name = "JavaSE-17", + path = jvm .. "/java-17-openjdk-amd64/", + }, + { + name = "JavaSE-21", + path = jvm .. "/java-21-openjdk-amd64/", }, }, handlers = { From 6e62a73c1f6cb72e56013f0684a088eada218c1a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Feb 2024 09:55:03 +0200 Subject: [PATCH 2283/2667] Add timesyncd configuration to mko-laptop --- config-root.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-root.toml b/config-root.toml index 55263fbe..987d318a 100644 --- a/config-root.toml +++ b/config-root.toml @@ -238,4 +238,4 @@ include = ["Locale"] include = ["Pacman"] [profiles.mko-laptop] -dotfiles = ["f_cpupower", "f_yubikey_udev.rules", "f_doas.conf"] +dotfiles = ["f_cpupower", "f_doas.conf", "f_timesyncd.conf"] From 91b071865a37a3ce9a0d835fcbb09d89285db067 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Feb 2024 09:55:03 +0200 Subject: [PATCH 2284/2667] Add timesyncd configuration to mko-laptop --- config-root.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-root.toml b/config-root.toml index 55263fbe..987d318a 100644 --- a/config-root.toml +++ b/config-root.toml @@ -238,4 +238,4 @@ include = ["Locale"] include = ["Pacman"] [profiles.mko-laptop] -dotfiles = ["f_cpupower", "f_yubikey_udev.rules", "f_doas.conf"] +dotfiles = ["f_cpupower", "f_doas.conf", "f_timesyncd.conf"] From f738678bd545530ceab58331360057cca1c34bb7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Feb 2024 14:53:12 +0200 Subject: [PATCH 2285/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 50 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 491fa978..0a11bbe6 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" }, "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, @@ -16,51 +16,51 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "03f825956ec49e550d07875d867ea6e7c4dc8c00" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "e4fd98274f3fed310d0085c16353e7e7b3ce86a1" }, + "dropbar.nvim": { "branch": "master", "commit": "9960fd71f17362e145ae55d2960afb18c45bc71e" }, "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, - "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, + "friendly-snippets": { "branch": "main", "commit": "dbd45e9ba76d535e4cba88afa1b7aa43bb765336" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, - "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, - "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, + "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, + "kanagawa.nvim": { "branch": "master", "commit": "ab41956c4559c3eb21e713fcdf54cda1cb6d5f40" }, "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "fe4cce44dec93c69be17dad79b21de867dde118a" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "mini.nvim": { "branch": "main", "commit": "9adc2eeec07f3ee65d54f7ceb791ad8fead49c92" }, - "neodev.nvim": { "branch": "main", "commit": "0ee95ecefc8ea45898a0383364f736e098c8703f" }, + "mini.nvim": { "branch": "main", "commit": "be7c6b5282ab15117dc8ef7ab19394925cf16a25" }, + "neodev.nvim": { "branch": "main", "commit": "bbe17de89345ce40725e721d347c596dc4a02b32" }, "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, + "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, - "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, + "nvim-autopairs": { "branch": "master", "commit": "2e8a10c5fc0dcaf8296a5f1a7077efcd37065cc8" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, - "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, - "nvim-jdtls": { "branch": "master", "commit": "4f4de4d80e1df43d58e5e21677fca4c63676664d" }, + "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" }, + "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, + "nvim-jdtls": { "branch": "master", "commit": "81ead309b9cb5603d84836cef19a8ca9f849a847" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "d12140c5687a1186b95b3f42dbc6cc769df0cf0d" }, - "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, - "nvim-tree.lua": { "branch": "master", "commit": "8cbb1db8e90b62fc56f379992e622e9f919792ce" }, - "nvim-treesitter": { "branch": "master", "commit": "4fbf150a1621d52f17b099506e1a32f107079210" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, - "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, - "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" }, + "nvim-lspconfig": { "branch": "master", "commit": "d1bab4cf4b69e49d6058028fd933d8ef5e74e680" }, + "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, + "nvim-tree.lua": { "branch": "master", "commit": "d35a8d5ec6358ada4b058431b367b32360737466" }, + "nvim-treesitter": { "branch": "master", "commit": "b3e53e94232d2bc6d70516efbd932bcce3ba8e1e" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" }, + "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, + "nvim-ufo": { "branch": "main", "commit": "553d8a9c611caa9f020556d4a26b760698e5b81b" }, + "nvim-web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, - "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, + "statuscol.nvim": { "branch": "main", "commit": "eca428c8df8549fe7a480dd0da0ccc1634f16a4b" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "236083884cfe6c874e03e6cb4e7cb08809c1333c" }, + "telescope.nvim": { "branch": "master", "commit": "b744cf59752aaa01561afb4223006de26f3836fd" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" }, + "vim-fugitive": { "branch": "master", "commit": "011cf4fcb93a9649ffc6dcdff56ef948f5d0f7cc" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From 41d821d0867feece5fcf9cb2313f384c64dba4dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Feb 2024 14:53:12 +0200 Subject: [PATCH 2286/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 50 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 491fa978..0a11bbe6 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" }, "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, @@ -16,51 +16,51 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "03f825956ec49e550d07875d867ea6e7c4dc8c00" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "e4fd98274f3fed310d0085c16353e7e7b3ce86a1" }, + "dropbar.nvim": { "branch": "master", "commit": "9960fd71f17362e145ae55d2960afb18c45bc71e" }, "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, - "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, + "friendly-snippets": { "branch": "main", "commit": "dbd45e9ba76d535e4cba88afa1b7aa43bb765336" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, - "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, - "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, + "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, + "kanagawa.nvim": { "branch": "master", "commit": "ab41956c4559c3eb21e713fcdf54cda1cb6d5f40" }, "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "fe4cce44dec93c69be17dad79b21de867dde118a" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "mini.nvim": { "branch": "main", "commit": "9adc2eeec07f3ee65d54f7ceb791ad8fead49c92" }, - "neodev.nvim": { "branch": "main", "commit": "0ee95ecefc8ea45898a0383364f736e098c8703f" }, + "mini.nvim": { "branch": "main", "commit": "be7c6b5282ab15117dc8ef7ab19394925cf16a25" }, + "neodev.nvim": { "branch": "main", "commit": "bbe17de89345ce40725e721d347c596dc4a02b32" }, "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, + "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, - "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, + "nvim-autopairs": { "branch": "master", "commit": "2e8a10c5fc0dcaf8296a5f1a7077efcd37065cc8" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, - "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, - "nvim-jdtls": { "branch": "master", "commit": "4f4de4d80e1df43d58e5e21677fca4c63676664d" }, + "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" }, + "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, + "nvim-jdtls": { "branch": "master", "commit": "81ead309b9cb5603d84836cef19a8ca9f849a847" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "d12140c5687a1186b95b3f42dbc6cc769df0cf0d" }, - "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, - "nvim-tree.lua": { "branch": "master", "commit": "8cbb1db8e90b62fc56f379992e622e9f919792ce" }, - "nvim-treesitter": { "branch": "master", "commit": "4fbf150a1621d52f17b099506e1a32f107079210" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, - "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, - "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" }, + "nvim-lspconfig": { "branch": "master", "commit": "d1bab4cf4b69e49d6058028fd933d8ef5e74e680" }, + "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, + "nvim-tree.lua": { "branch": "master", "commit": "d35a8d5ec6358ada4b058431b367b32360737466" }, + "nvim-treesitter": { "branch": "master", "commit": "b3e53e94232d2bc6d70516efbd932bcce3ba8e1e" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" }, + "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, + "nvim-ufo": { "branch": "main", "commit": "553d8a9c611caa9f020556d4a26b760698e5b81b" }, + "nvim-web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, - "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, + "statuscol.nvim": { "branch": "main", "commit": "eca428c8df8549fe7a480dd0da0ccc1634f16a4b" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "236083884cfe6c874e03e6cb4e7cb08809c1333c" }, + "telescope.nvim": { "branch": "master", "commit": "b744cf59752aaa01561afb4223006de26f3836fd" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" }, + "vim-fugitive": { "branch": "master", "commit": "011cf4fcb93a9649ffc6dcdff56ef948f5d0f7cc" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From 19b5407a9aeef7596c022e55b6f9a1d732e982ed Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Feb 2024 11:15:11 +0200 Subject: [PATCH 2287/2667] Nvim: fix jdtls runtime configuration --- home/.config/nvim/ftplugin/java.lua | 38 +++++++++++++++-------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 8f91682e..58e0b620 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -33,27 +33,29 @@ require("jdtls").start_or_attach({ java = { signatureHelp = { enabled = true }, autobuild = { enabled = false }, + configuration = { + runtimes = { + { + name = "JavaSE-1.8", + path = jvm .. "/java-8-openjdk-amd64/", + }, + { + name = "JavaSE-11", + path = jvm .. "/java-11-openjdk-amd64/", + }, + { + name = "JavaSE-17", + path = jvm .. "/java-17-openjdk-amd64/", + }, + { + name = "JavaSE-21", + path = jvm .. "/java-21-openjdk-amd64/", + }, + }, + }, }, }, completion = { favoriteStaticMembers = { "java.text.MessageFormat.format" } }, - runtimes = { - { - name = "JavaSE-1.8", - path = jvm .. "/java-8-openjdk-amd64/", - }, - { - name = "JavaSE-11", - path = jvm .. "/java-11-openjdk-amd64/", - }, - { - name = "JavaSE-17", - path = jvm .. "/java-17-openjdk-amd64/", - }, - { - name = "JavaSE-21", - path = jvm .. "/java-21-openjdk-amd64/", - }, - }, handlers = { ["language/status"] = function() end, }, From 3b7133a9979baca63c996ef0a51654117e413351 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Feb 2024 11:15:11 +0200 Subject: [PATCH 2288/2667] Nvim: fix jdtls runtime configuration --- home/.config/nvim/ftplugin/java.lua | 38 +++++++++++++++-------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index 8f91682e..58e0b620 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -33,27 +33,29 @@ require("jdtls").start_or_attach({ java = { signatureHelp = { enabled = true }, autobuild = { enabled = false }, + configuration = { + runtimes = { + { + name = "JavaSE-1.8", + path = jvm .. "/java-8-openjdk-amd64/", + }, + { + name = "JavaSE-11", + path = jvm .. "/java-11-openjdk-amd64/", + }, + { + name = "JavaSE-17", + path = jvm .. "/java-17-openjdk-amd64/", + }, + { + name = "JavaSE-21", + path = jvm .. "/java-21-openjdk-amd64/", + }, + }, + }, }, }, completion = { favoriteStaticMembers = { "java.text.MessageFormat.format" } }, - runtimes = { - { - name = "JavaSE-1.8", - path = jvm .. "/java-8-openjdk-amd64/", - }, - { - name = "JavaSE-11", - path = jvm .. "/java-11-openjdk-amd64/", - }, - { - name = "JavaSE-17", - path = jvm .. "/java-17-openjdk-amd64/", - }, - { - name = "JavaSE-21", - path = jvm .. "/java-21-openjdk-amd64/", - }, - }, handlers = { ["language/status"] = function() end, }, From c1ff9d997bd5693650f5293b1f46f4125080adaa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Feb 2024 11:15:26 +0200 Subject: [PATCH 2289/2667] Nvim: Disable tsserver duplicate diagnostics with ESLint --- home/.config/nvim/lua/plugins/mason.lua | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index df0e181d..68d3b736 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -18,14 +18,30 @@ return { local mlspc = require("mason-lspconfig") local lsp_utils = require("lsp_utils") + local commonLspConfigArgs = { + on_attach = lsp_utils.map_keys, + capabilities = lsp_utils.get_capabilities(), + } + mlspc.setup() mlspc.setup_handlers({ -- Default handler function(server_name) - require("lspconfig")[server_name].setup({ - on_attach = lsp_utils.map_keys, - capabilities = lsp_utils.get_capabilities(), - }) + require("lspconfig")[server_name].setup(commonLspConfigArgs) + end, + + -- Disable tsserver diagnostics diagnostics + -- that come from ESLint + ["tsserver"] = function() + require("lspconfig").tsserver.setup(vim.tbl_extend("force", commonLspConfigArgs, { + settings = { + diagnostics = { + ignoredCodes = { + 6133, -- Unused variable + }, + }, + }, + })) end, -- Don't set up jdtls, it is set up by nvim-jdtls From b7f54f8dc001739c868a2eedcf1510bc6812db0a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Feb 2024 11:15:26 +0200 Subject: [PATCH 2290/2667] Nvim: Disable tsserver duplicate diagnostics with ESLint --- home/.config/nvim/lua/plugins/mason.lua | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index df0e181d..68d3b736 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -18,14 +18,30 @@ return { local mlspc = require("mason-lspconfig") local lsp_utils = require("lsp_utils") + local commonLspConfigArgs = { + on_attach = lsp_utils.map_keys, + capabilities = lsp_utils.get_capabilities(), + } + mlspc.setup() mlspc.setup_handlers({ -- Default handler function(server_name) - require("lspconfig")[server_name].setup({ - on_attach = lsp_utils.map_keys, - capabilities = lsp_utils.get_capabilities(), - }) + require("lspconfig")[server_name].setup(commonLspConfigArgs) + end, + + -- Disable tsserver diagnostics diagnostics + -- that come from ESLint + ["tsserver"] = function() + require("lspconfig").tsserver.setup(vim.tbl_extend("force", commonLspConfigArgs, { + settings = { + diagnostics = { + ignoredCodes = { + 6133, -- Unused variable + }, + }, + }, + })) end, -- Don't set up jdtls, it is set up by nvim-jdtls From ee97d8a5903ffd7daed7d40f09f274db0a55880b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Feb 2024 20:17:30 +0200 Subject: [PATCH 2291/2667] Clean up postgres compose --- docker/postgres/docker-compose.toml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/docker/postgres/docker-compose.toml b/docker/postgres/docker-compose.toml index 6e9f04f1..b826ee3a 100644 --- a/docker/postgres/docker-compose.toml +++ b/docker/postgres/docker-compose.toml @@ -1,10 +1,8 @@ -[services] - [services.postgres] container_name = "postgres" image = "postgres:16" -environment = ["TZ=Europe/Helsinki", "POSTGRES_PASSWORD=12345"] -ports = ["5432:5432"] +environment = ["TZ=Europe/Helsinki"] +ports = ["127.0.0.1:5432:5432"] networks = ["postgres"] volumes = [ "/docker/postgres:/var/lib/postgresql/data", @@ -12,7 +10,5 @@ volumes = [ ] restart = "unless-stopped" -[networks] - [networks.postgres] external = true From 8b39e5912b78f931903a59a40977e307bcdea1d7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Feb 2024 20:17:30 +0200 Subject: [PATCH 2292/2667] Clean up postgres compose --- docker/postgres/docker-compose.toml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/docker/postgres/docker-compose.toml b/docker/postgres/docker-compose.toml index 6e9f04f1..b826ee3a 100644 --- a/docker/postgres/docker-compose.toml +++ b/docker/postgres/docker-compose.toml @@ -1,10 +1,8 @@ -[services] - [services.postgres] container_name = "postgres" image = "postgres:16" -environment = ["TZ=Europe/Helsinki", "POSTGRES_PASSWORD=12345"] -ports = ["5432:5432"] +environment = ["TZ=Europe/Helsinki"] +ports = ["127.0.0.1:5432:5432"] networks = ["postgres"] volumes = [ "/docker/postgres:/var/lib/postgresql/data", @@ -12,7 +10,5 @@ volumes = [ ] restart = "unless-stopped" -[networks] - [networks.postgres] external = true From 944de98b4a01ca08ae6d3f292044d6aeffe5fbf3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Feb 2024 00:39:27 +0200 Subject: [PATCH 2293/2667] Docker: migrate from bind mounts to named volumes --- docker/authentik/docker-compose.toml | 25 ++++++++++------- docker/caddy/docker-compose.toml | 14 +++++++--- docker/ddns/docker-compose.toml | 2 +- docker/firefish/docker-compose.toml | 16 ++++++----- docker/forgejo/docker-compose.toml | 7 +++-- docker/freshrss/docker-compose.toml | 8 +++--- docker/headscale/docker-compose.toml | 11 ++++---- docker/homeautomation/docker-compose.toml | 14 +++++----- docker/jellyfin/docker-compose.toml | 18 ++++++++++--- docker/jellyfin/docker-compose.yaml | 33 +++++++++++++++++++++++ docker/mumble/docker-compose.toml | 6 ++--- docker/nextcloud/docker-compose.toml | 11 +++++--- docker/pihole/docker-compose.toml | 10 +++---- docker/postgres/docker-compose.toml | 5 +++- docker/searx/docker-compose.toml | 5 +++- docker/stats/docker-compose.toml | 2 +- docker/tvheadend/docker-compose.toml | 8 ++++-- docker/woodpecker/docker-compose.toml | 10 +++---- 18 files changed, 143 insertions(+), 62 deletions(-) create mode 100644 docker/jellyfin/docker-compose.yaml diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 24904d98..9339e9c7 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -1,9 +1,16 @@ +[volumes] +redis = {} +media = {} +custom_templates = {} +geoip = {} +backups = {} + [services.redis] image = "redis:alpine" container_name = "authentik-redis" networks = ["authentik"] restart = "unless-stopped" -volumes = ["/docker/authentik/redis:/data"] +volumes = ["redis:/data"] [services.redis.healthcheck] test = ["CMD-SHELL", "redis-cli ping | grep PONG"] @@ -18,9 +25,9 @@ container_name = "authentik" restart = "unless-stopped" command = "server" volumes = [ - "/docker/authentik/media:/media", - "/docker/authentik/custom-templates:/templates", - "/docker/authentik/geoip:/geoip", + "media:/media", + "custom_templates:/templates", + "geoip:/geoip", ] env_file = [".env"] networks = ["authentik", "postgres", "proxy"] @@ -32,10 +39,10 @@ restart = "unless-stopped" command = "worker" user = "root" volumes = [ - "/docker/authentik/backups:/backups", - "/docker/authentik/custom-templates:/templates", - "/docker/authentik/geoip:/geoip", - "/docker/authentik/media:/media", + "backups:/backups", + "custom_templates:/templates", + "geoip:/geoip", + "media:/media", "/var/run/docker.sock:/var/run/docker.sock", ] env_file = [".env"] @@ -46,7 +53,7 @@ image = "maxmindinc/geoipupdate" container_name = "authentik-geoipupdate" restart = "unless-stopped" networks = ["authentik"] -volumes = ["/docker/authentik/geoip:/usr/share/GeoIP"] +volumes = ["geoip:/usr/share/GeoIP"] env_file = [".env"] [services.geoipupdate.environment] diff --git a/docker/caddy/docker-compose.toml b/docker/caddy/docker-compose.toml index 7a51f6fe..9fe8cbd8 100644 --- a/docker/caddy/docker-compose.toml +++ b/docker/caddy/docker-compose.toml @@ -1,14 +1,20 @@ +[volumes] +data = {} +config = {} + +[volumes.nextcloud_config] +external = true + [services.caddy] image = "slothcroissant/caddy-cloudflaredns" container_name = "caddy" restart = "unless-stopped" -user = "82:82" ports = ["80:80", "443:443/tcp", "443:443/udp"] networks = ["proxy"] volumes = [ - "/docker/caddy/data:/data", - "/docker/caddy/config:/config", - "/docker/nextcloud:/var/www/nextcloud", + "data:/data", + "config:/config", + "nextcloud_config:/var/www/nextcloud", "/var/www/korhonen.cc:/var/www/korhonen.cc", "/var/www/wkd:/var/www/wkd", "/var/www/index.korhonen.cc:/var/www/index.korhonen.cc", diff --git a/docker/ddns/docker-compose.toml b/docker/ddns/docker-compose.toml index 7bf009ea..b87582c8 100644 --- a/docker/ddns/docker-compose.toml +++ b/docker/ddns/docker-compose.toml @@ -4,5 +4,5 @@ container_name = "cloudflare-ddns" security_opt = ["no-new-privileges:true"] network_mode = "host" environment = ["PUID=1000", "PGID=1000"] -volumes = ["/docker/ddns/config.json:/config.json"] +volumes = ["/mnt/Storage/docker/ddns/config.json:/config.json"] restart = "unless-stopped" diff --git a/docker/firefish/docker-compose.toml b/docker/firefish/docker-compose.toml index 01ce34a4..a9e9f788 100644 --- a/docker/firefish/docker-compose.toml +++ b/docker/firefish/docker-compose.toml @@ -1,4 +1,8 @@ -#:schema https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json +[volumes] +files = {} +config = {} +redis = {} +sonic = {} [services.firefish] image = "registry.firefish.dev/firefish/firefish" @@ -9,8 +13,8 @@ ports = ["3083:3000"] networks = ["firefish", "proxy", "postgres"] environment = { NODE_ENV = "production" } volumes = [ - "/docker/firefish/files:/firefish/files", - "/docker/firefish/config:/firefish/.config:ro", + "files:/firefish/files", + "config:/firefish/.config:ro", ] [services.redis] @@ -18,7 +22,7 @@ image = "redis" container_name = "redis-firefish" restart = "unless-stopped" networks = ["firefish"] -volumes = ["/docker/firefish/redis:/data"] +volumes = ["redis:/data"] [services.sonic] image = "valeriansaliou/sonic:v1.4.0" @@ -26,8 +30,8 @@ container_name = "sonic-firefish" logging = { driver = "none" } networks = ["firefish"] volumes = [ - "/docker/firefish/sonic:/var/lib/sonic/store", - "/docker/firefish/sonic/config.cfg:/etc/sonic.cfg", + "sonic:/var/lib/sonic/store", + "/mnt/Storage/docker/firefish-sonic/config.cfg:/etc/sonic.cfg", ] env_file = ".env" diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index a6dc63d6..602fc2ea 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -1,11 +1,14 @@ +[volumes] +data = {} + [services.forgejo] image = "git.korhonen.cc/functionalhacker/forgejo-asciidoc" container_name = "forgejo" -environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] +environment = ["TZ=Europe/Helsinki"] restart = "unless-stopped" networks = ["postgres", "proxy"] ports = ["22:22"] -volumes = ["/docker/forgejo:/data", "/etc/localtime:/etc/localtime:ro"] +volumes = ["data:/data", "/etc/localtime:/etc/localtime:ro"] [networks.postgres] external = true diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml index cfd76b99..cfbbb212 100644 --- a/docker/freshrss/docker-compose.toml +++ b/docker/freshrss/docker-compose.toml @@ -1,13 +1,13 @@ +[volumes] +config = {} + [services.freshrss] image = "linuxserver/freshrss" container_name = "freshrss" restart = "unless-stopped" networks = ["freshrss", "postgres", "proxy"] environment = ["PUID=1000", "PGID=985", "TZ=Europe/Helsinki"] -volumes = [ - "/docker/freshrss/freshrss:/config", - "/etc/localtime:/etc/localtime:ro", -] +volumes = ["config:/config", "/etc/localtime:/etc/localtime:ro"] [networks.freshrss] external = false diff --git a/docker/headscale/docker-compose.toml b/docker/headscale/docker-compose.toml index fff546bf..b2c79d00 100644 --- a/docker/headscale/docker-compose.toml +++ b/docker/headscale/docker-compose.toml @@ -1,10 +1,11 @@ +[volumes] +config = {} +data = {} + [services.headscale] -image = "headscale/headscale" +image = "headscale/headscale:0" container_name = "headscale" -volumes = [ - "/docker/headscale/config:/etc/headscale/", - "/docker/headscale/data:/var/lib/headscale", -] +volumes = ["config:/etc/headscale", "data:/var/lib/headscale"] ports = ["3478:3478/udp"] command = "headscale serve" restart = "unless-stopped" diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 65608d59..185f4ea7 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -1,12 +1,14 @@ +[volumes] +hass = {} +rhasspy = {} +mosquitto = {} + [services.home-assistant] container_name = "home-assistant" image = "homeassistant/home-assistant" environment = ["TZ=Europe/Helsinki"] devices = ["/dev/ttyACM0"] -volumes = [ - "/docker/homeautomation/home-assistant:/config", - "/etc/localtime:/etc/localtime:ro", -] +volumes = ["hass:/config", "/etc/localtime:/etc/localtime:ro"] restart = "unless-stopped" networks = ["homeautomation", "postgres", "proxy"] ports = ["8123:8123", "8300:8300"] @@ -20,7 +22,7 @@ environment = ["TZ=Europe/Helsinki"] ports = ["1883:1883", "8866:8866"] networks = ["homeautomation"] volumes = [ - "/docker/homeautomation/mosquitto:/mosquitto", + "mosquitto:/mosquitto", "/etc/localtime:/etc/localtime:ro", ] restart = "unless-stopped" @@ -29,7 +31,7 @@ restart = "unless-stopped" container_name = "rhasspy" image = "rhasspy/rhasspy" command = "--profile en --user-profiles /profiles" -volumes = ["/docker/homeautomation/rhasspy:/profiles"] +volumes = ["rhasspy:/profiles"] environment = ["TZ=Europe/Helsinki"] ports = ["12101:12101"] networks = ["homeautomation"] diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index db635394..d3d65a58 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -1,3 +1,13 @@ +[volumes] +config = {} +cache = {} + +[volumes.media] +external = true + +[volumes.nextcloud_data] +external = true + [services.jellyfin] image = "jellyfin/jellyfin" container_name = "jellyfin" @@ -6,10 +16,10 @@ ports = ["8096:8096"] networks = ["proxy", "authentik"] restart = "unless-stopped" volumes = [ - "/docker/jellyfin/config:/config", - "/docker/jellyfin/cache:/cache", - "/mnt/Storage/Media:/media", - "/mnt/Storage/Nextcloud/FunctionalHacker/files/Media/Music:/media/Music", + "config:/config", + "cache:/cache", + "media:/media", + "/mnt/Storage/docker/volumes/nextcloud_data/FunctionalHacker/files/Media/Music:/media/Music", "/etc/localtime:/etc/localtime:ro", ] devices = [ diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml new file mode 100644 index 00000000..772748f1 --- /dev/null +++ b/docker/jellyfin/docker-compose.yaml @@ -0,0 +1,33 @@ +volumes: + config: {} + cache: {} + media: + external: true + nextcloud_data: + external: true +services: + jellyfin: + image: jellyfin/jellyfin + container_name: jellyfin + environment: + - TZ=Europe/Helsinki + ports: + - 8096:8096 + networks: + - proxy + - authentik + restart: unless-stopped + volumes: + - config:/config + - cache:/cache + - media:/media + - /mnt/Storage/docker/nextcloud_data/FunctionalHacker/files/Media/Music:/media/Music + - /etc/localtime:/etc/localtime:ro + devices: + - /dev/dri/renderD128:/dev/dri/renderD128 + - /dev/dri/card1:/dev/dri/card0 +networks: + proxy: + external: true + authentik: + external: true diff --git a/docker/mumble/docker-compose.toml b/docker/mumble/docker-compose.toml index fa1afaa3..de0b7d26 100644 --- a/docker/mumble/docker-compose.toml +++ b/docker/mumble/docker-compose.toml @@ -1,10 +1,10 @@ -[services] +[volumes] +config = {} [services.mumble] container_name = "mumble" image = "phlak/mumble" -user = "1000:985" environment = ["TZ=Europe/Helsinki"] network_mode = "host" -volumes = ["/docker/mumble:/etc/mumble", "/etc/localtime:/etc/localtime:ro"] +volumes = ["config:/etc/mumble", "/etc/localtime:/etc/localtime:ro"] restart = "unless-stopped" diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index cad8c2a6..cec2461c 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -1,12 +1,17 @@ +[volumes.nextcloud_config] +external = true + +[volumes.nextcloud_data] +external = true + [services.nextcloud] image = "nextcloud:fpm-alpine" container_name = "nextcloud" restart = "unless-stopped" -user = "82:82" networks = ["nextcloud", "postgres", "proxy"] volumes = [ - "/docker/nextcloud:/var/www/html:z", - "/mnt/Storage/Nextcloud:/var/www/html/data", + "nextcloud_config:/var/www/html", + "nextcloud_data:/var/www/html/data", "/etc/localtime:/etc/localtime:ro", ] environment = [ diff --git a/docker/pihole/docker-compose.toml b/docker/pihole/docker-compose.toml index 9f328196..b9fccf3a 100644 --- a/docker/pihole/docker-compose.toml +++ b/docker/pihole/docker-compose.toml @@ -1,4 +1,6 @@ -[services] +[volumes] +config = {} +dnsmasq = {} [services.pihole] container_name = "pihole" @@ -6,8 +8,8 @@ image = "pihole/pihole" ports = ["53:53/tcp", "53:53/udp", "67:67/udp", "8069:80/tcp"] networks = ["proxy"] volumes = [ - "/docker/pihole/pihole:/etc/pihole/", - "/docker/pihole/dnsmasq:/etc/dnsmasq.d/", + "config:/etc/pihole/", + "dnsmasq:/etc/dnsmasq.d/", ] dns = ["127.0.0.1", "1.1.1.1"] cap_add = ["NET_ADMIN"] @@ -17,7 +19,5 @@ restart = "unless-stopped" TZ = "Europe/Helsinki" WEBPASSWORD = "${WEBPASSWORD}" -[networks] - [networks.proxy] external = true diff --git a/docker/postgres/docker-compose.toml b/docker/postgres/docker-compose.toml index b826ee3a..c9e76182 100644 --- a/docker/postgres/docker-compose.toml +++ b/docker/postgres/docker-compose.toml @@ -1,3 +1,6 @@ +[volumes] +data = {} + [services.postgres] container_name = "postgres" image = "postgres:16" @@ -5,7 +8,7 @@ environment = ["TZ=Europe/Helsinki"] ports = ["127.0.0.1:5432:5432"] networks = ["postgres"] volumes = [ - "/docker/postgres:/var/lib/postgresql/data", + "data:/var/lib/postgresql/data", "/etc/localtime:/etc/localtime:ro", ] restart = "unless-stopped" diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml index f2c1dd72..53f082b8 100644 --- a/docker/searx/docker-compose.toml +++ b/docker/searx/docker-compose.toml @@ -1,10 +1,13 @@ +[volumes] +config = {} + [services.searx] container_name = "searx" image = "searxng/searxng" restart = "unless-stopped" networks = ["searx", "proxy"] volumes = [ - "/docker/searx:/etc/searxng", + "config:/etc/searxng", #"/docker/searx/logo.png:/usr/local/searxng/searx/static/themes/simple/img/searxng.png:ro" ] environment = ["SEARXNG_BASE_URL=https://search.korhonen.cc/"] diff --git a/docker/stats/docker-compose.toml b/docker/stats/docker-compose.toml index ff0e0846..15e5141d 100644 --- a/docker/stats/docker-compose.toml +++ b/docker/stats/docker-compose.toml @@ -1,7 +1,7 @@ [services.grafana] image = "grafana/grafana" container_name = "grafana" -volumes = ["/docker/stats/grafana:/var/lib/grafana"] +volumes = ["grafana:/var/lib/grafana"] networks = ["stats", "proxy"] user = "1000:984" env_file = [".env"] diff --git a/docker/tvheadend/docker-compose.toml b/docker/tvheadend/docker-compose.toml index cdbff58c..d1a3d97b 100644 --- a/docker/tvheadend/docker-compose.toml +++ b/docker/tvheadend/docker-compose.toml @@ -1,11 +1,15 @@ +[volumes] +config = {} +picons = {} + [services.tvheadend] image = "linuxserver/tvheadend" container_name = "tvheadend" environment = ["TZ=Europe/Helsinki", "PUID=1000", "PGID=985"] volumes = [ - "/docker/tvheadend:/config", + "config:/config", + "picons:/picons", "/mnt/Storage/Media/PVR:/recordings", - "/mnt/Storage/picons:/picons", "/etc/localtime:/etc/localtime:ro", ] ports = ["9981:9981", "9982:9982"] diff --git a/docker/woodpecker/docker-compose.toml b/docker/woodpecker/docker-compose.toml index 7a4c823e..e98eb4bc 100644 --- a/docker/woodpecker/docker-compose.toml +++ b/docker/woodpecker/docker-compose.toml @@ -1,8 +1,11 @@ +[volumes] +data = {} + [services.woodpecker] image = "woodpeckerci/woodpecker-server" container_name = "woodpecker" restart = "unless-stopped" -volumes = ["/docker/woodpecker/:/var/lib/woodpecker/"] +volumes = ["data:/var/lib/woodpecker"] env_file = [".env"] environment = [ "WOODPECKER_OPEN=true", @@ -24,10 +27,7 @@ restart = "unless-stopped" depends_on = ["woodpecker"] volumes = ["/var/run/docker.sock:/var/run/docker.sock"] env_file = [".env"] -environment = [ - "WOODPECKER_SERVER=woodpecker:9000", - "WOODPECKER_AGENT_SECRET", -] +environment = ["WOODPECKER_SERVER=woodpecker:9000", "WOODPECKER_AGENT_SECRET"] [networks.proxy] external = true From 37366f5652a370279c69f2a98a608cdbfc90f09d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Feb 2024 00:39:27 +0200 Subject: [PATCH 2294/2667] Docker: migrate from bind mounts to named volumes --- docker/authentik/docker-compose.toml | 25 ++++++++++------- docker/caddy/docker-compose.toml | 14 +++++++--- docker/ddns/docker-compose.toml | 2 +- docker/firefish/docker-compose.toml | 16 ++++++----- docker/forgejo/docker-compose.toml | 7 +++-- docker/freshrss/docker-compose.toml | 8 +++--- docker/headscale/docker-compose.toml | 11 ++++---- docker/homeautomation/docker-compose.toml | 14 +++++----- docker/jellyfin/docker-compose.toml | 18 ++++++++++--- docker/jellyfin/docker-compose.yaml | 33 +++++++++++++++++++++++ docker/mumble/docker-compose.toml | 6 ++--- docker/nextcloud/docker-compose.toml | 11 +++++--- docker/pihole/docker-compose.toml | 10 +++---- docker/postgres/docker-compose.toml | 5 +++- docker/searx/docker-compose.toml | 5 +++- docker/stats/docker-compose.toml | 2 +- docker/tvheadend/docker-compose.toml | 8 ++++-- docker/woodpecker/docker-compose.toml | 10 +++---- 18 files changed, 143 insertions(+), 62 deletions(-) create mode 100644 docker/jellyfin/docker-compose.yaml diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 24904d98..9339e9c7 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -1,9 +1,16 @@ +[volumes] +redis = {} +media = {} +custom_templates = {} +geoip = {} +backups = {} + [services.redis] image = "redis:alpine" container_name = "authentik-redis" networks = ["authentik"] restart = "unless-stopped" -volumes = ["/docker/authentik/redis:/data"] +volumes = ["redis:/data"] [services.redis.healthcheck] test = ["CMD-SHELL", "redis-cli ping | grep PONG"] @@ -18,9 +25,9 @@ container_name = "authentik" restart = "unless-stopped" command = "server" volumes = [ - "/docker/authentik/media:/media", - "/docker/authentik/custom-templates:/templates", - "/docker/authentik/geoip:/geoip", + "media:/media", + "custom_templates:/templates", + "geoip:/geoip", ] env_file = [".env"] networks = ["authentik", "postgres", "proxy"] @@ -32,10 +39,10 @@ restart = "unless-stopped" command = "worker" user = "root" volumes = [ - "/docker/authentik/backups:/backups", - "/docker/authentik/custom-templates:/templates", - "/docker/authentik/geoip:/geoip", - "/docker/authentik/media:/media", + "backups:/backups", + "custom_templates:/templates", + "geoip:/geoip", + "media:/media", "/var/run/docker.sock:/var/run/docker.sock", ] env_file = [".env"] @@ -46,7 +53,7 @@ image = "maxmindinc/geoipupdate" container_name = "authentik-geoipupdate" restart = "unless-stopped" networks = ["authentik"] -volumes = ["/docker/authentik/geoip:/usr/share/GeoIP"] +volumes = ["geoip:/usr/share/GeoIP"] env_file = [".env"] [services.geoipupdate.environment] diff --git a/docker/caddy/docker-compose.toml b/docker/caddy/docker-compose.toml index 7a51f6fe..9fe8cbd8 100644 --- a/docker/caddy/docker-compose.toml +++ b/docker/caddy/docker-compose.toml @@ -1,14 +1,20 @@ +[volumes] +data = {} +config = {} + +[volumes.nextcloud_config] +external = true + [services.caddy] image = "slothcroissant/caddy-cloudflaredns" container_name = "caddy" restart = "unless-stopped" -user = "82:82" ports = ["80:80", "443:443/tcp", "443:443/udp"] networks = ["proxy"] volumes = [ - "/docker/caddy/data:/data", - "/docker/caddy/config:/config", - "/docker/nextcloud:/var/www/nextcloud", + "data:/data", + "config:/config", + "nextcloud_config:/var/www/nextcloud", "/var/www/korhonen.cc:/var/www/korhonen.cc", "/var/www/wkd:/var/www/wkd", "/var/www/index.korhonen.cc:/var/www/index.korhonen.cc", diff --git a/docker/ddns/docker-compose.toml b/docker/ddns/docker-compose.toml index 7bf009ea..b87582c8 100644 --- a/docker/ddns/docker-compose.toml +++ b/docker/ddns/docker-compose.toml @@ -4,5 +4,5 @@ container_name = "cloudflare-ddns" security_opt = ["no-new-privileges:true"] network_mode = "host" environment = ["PUID=1000", "PGID=1000"] -volumes = ["/docker/ddns/config.json:/config.json"] +volumes = ["/mnt/Storage/docker/ddns/config.json:/config.json"] restart = "unless-stopped" diff --git a/docker/firefish/docker-compose.toml b/docker/firefish/docker-compose.toml index 01ce34a4..a9e9f788 100644 --- a/docker/firefish/docker-compose.toml +++ b/docker/firefish/docker-compose.toml @@ -1,4 +1,8 @@ -#:schema https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json +[volumes] +files = {} +config = {} +redis = {} +sonic = {} [services.firefish] image = "registry.firefish.dev/firefish/firefish" @@ -9,8 +13,8 @@ ports = ["3083:3000"] networks = ["firefish", "proxy", "postgres"] environment = { NODE_ENV = "production" } volumes = [ - "/docker/firefish/files:/firefish/files", - "/docker/firefish/config:/firefish/.config:ro", + "files:/firefish/files", + "config:/firefish/.config:ro", ] [services.redis] @@ -18,7 +22,7 @@ image = "redis" container_name = "redis-firefish" restart = "unless-stopped" networks = ["firefish"] -volumes = ["/docker/firefish/redis:/data"] +volumes = ["redis:/data"] [services.sonic] image = "valeriansaliou/sonic:v1.4.0" @@ -26,8 +30,8 @@ container_name = "sonic-firefish" logging = { driver = "none" } networks = ["firefish"] volumes = [ - "/docker/firefish/sonic:/var/lib/sonic/store", - "/docker/firefish/sonic/config.cfg:/etc/sonic.cfg", + "sonic:/var/lib/sonic/store", + "/mnt/Storage/docker/firefish-sonic/config.cfg:/etc/sonic.cfg", ] env_file = ".env" diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index a6dc63d6..602fc2ea 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -1,11 +1,14 @@ +[volumes] +data = {} + [services.forgejo] image = "git.korhonen.cc/functionalhacker/forgejo-asciidoc" container_name = "forgejo" -environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] +environment = ["TZ=Europe/Helsinki"] restart = "unless-stopped" networks = ["postgres", "proxy"] ports = ["22:22"] -volumes = ["/docker/forgejo:/data", "/etc/localtime:/etc/localtime:ro"] +volumes = ["data:/data", "/etc/localtime:/etc/localtime:ro"] [networks.postgres] external = true diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml index cfd76b99..cfbbb212 100644 --- a/docker/freshrss/docker-compose.toml +++ b/docker/freshrss/docker-compose.toml @@ -1,13 +1,13 @@ +[volumes] +config = {} + [services.freshrss] image = "linuxserver/freshrss" container_name = "freshrss" restart = "unless-stopped" networks = ["freshrss", "postgres", "proxy"] environment = ["PUID=1000", "PGID=985", "TZ=Europe/Helsinki"] -volumes = [ - "/docker/freshrss/freshrss:/config", - "/etc/localtime:/etc/localtime:ro", -] +volumes = ["config:/config", "/etc/localtime:/etc/localtime:ro"] [networks.freshrss] external = false diff --git a/docker/headscale/docker-compose.toml b/docker/headscale/docker-compose.toml index fff546bf..b2c79d00 100644 --- a/docker/headscale/docker-compose.toml +++ b/docker/headscale/docker-compose.toml @@ -1,10 +1,11 @@ +[volumes] +config = {} +data = {} + [services.headscale] -image = "headscale/headscale" +image = "headscale/headscale:0" container_name = "headscale" -volumes = [ - "/docker/headscale/config:/etc/headscale/", - "/docker/headscale/data:/var/lib/headscale", -] +volumes = ["config:/etc/headscale", "data:/var/lib/headscale"] ports = ["3478:3478/udp"] command = "headscale serve" restart = "unless-stopped" diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 65608d59..185f4ea7 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -1,12 +1,14 @@ +[volumes] +hass = {} +rhasspy = {} +mosquitto = {} + [services.home-assistant] container_name = "home-assistant" image = "homeassistant/home-assistant" environment = ["TZ=Europe/Helsinki"] devices = ["/dev/ttyACM0"] -volumes = [ - "/docker/homeautomation/home-assistant:/config", - "/etc/localtime:/etc/localtime:ro", -] +volumes = ["hass:/config", "/etc/localtime:/etc/localtime:ro"] restart = "unless-stopped" networks = ["homeautomation", "postgres", "proxy"] ports = ["8123:8123", "8300:8300"] @@ -20,7 +22,7 @@ environment = ["TZ=Europe/Helsinki"] ports = ["1883:1883", "8866:8866"] networks = ["homeautomation"] volumes = [ - "/docker/homeautomation/mosquitto:/mosquitto", + "mosquitto:/mosquitto", "/etc/localtime:/etc/localtime:ro", ] restart = "unless-stopped" @@ -29,7 +31,7 @@ restart = "unless-stopped" container_name = "rhasspy" image = "rhasspy/rhasspy" command = "--profile en --user-profiles /profiles" -volumes = ["/docker/homeautomation/rhasspy:/profiles"] +volumes = ["rhasspy:/profiles"] environment = ["TZ=Europe/Helsinki"] ports = ["12101:12101"] networks = ["homeautomation"] diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index db635394..d3d65a58 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -1,3 +1,13 @@ +[volumes] +config = {} +cache = {} + +[volumes.media] +external = true + +[volumes.nextcloud_data] +external = true + [services.jellyfin] image = "jellyfin/jellyfin" container_name = "jellyfin" @@ -6,10 +16,10 @@ ports = ["8096:8096"] networks = ["proxy", "authentik"] restart = "unless-stopped" volumes = [ - "/docker/jellyfin/config:/config", - "/docker/jellyfin/cache:/cache", - "/mnt/Storage/Media:/media", - "/mnt/Storage/Nextcloud/FunctionalHacker/files/Media/Music:/media/Music", + "config:/config", + "cache:/cache", + "media:/media", + "/mnt/Storage/docker/volumes/nextcloud_data/FunctionalHacker/files/Media/Music:/media/Music", "/etc/localtime:/etc/localtime:ro", ] devices = [ diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml new file mode 100644 index 00000000..772748f1 --- /dev/null +++ b/docker/jellyfin/docker-compose.yaml @@ -0,0 +1,33 @@ +volumes: + config: {} + cache: {} + media: + external: true + nextcloud_data: + external: true +services: + jellyfin: + image: jellyfin/jellyfin + container_name: jellyfin + environment: + - TZ=Europe/Helsinki + ports: + - 8096:8096 + networks: + - proxy + - authentik + restart: unless-stopped + volumes: + - config:/config + - cache:/cache + - media:/media + - /mnt/Storage/docker/nextcloud_data/FunctionalHacker/files/Media/Music:/media/Music + - /etc/localtime:/etc/localtime:ro + devices: + - /dev/dri/renderD128:/dev/dri/renderD128 + - /dev/dri/card1:/dev/dri/card0 +networks: + proxy: + external: true + authentik: + external: true diff --git a/docker/mumble/docker-compose.toml b/docker/mumble/docker-compose.toml index fa1afaa3..de0b7d26 100644 --- a/docker/mumble/docker-compose.toml +++ b/docker/mumble/docker-compose.toml @@ -1,10 +1,10 @@ -[services] +[volumes] +config = {} [services.mumble] container_name = "mumble" image = "phlak/mumble" -user = "1000:985" environment = ["TZ=Europe/Helsinki"] network_mode = "host" -volumes = ["/docker/mumble:/etc/mumble", "/etc/localtime:/etc/localtime:ro"] +volumes = ["config:/etc/mumble", "/etc/localtime:/etc/localtime:ro"] restart = "unless-stopped" diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index cad8c2a6..cec2461c 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -1,12 +1,17 @@ +[volumes.nextcloud_config] +external = true + +[volumes.nextcloud_data] +external = true + [services.nextcloud] image = "nextcloud:fpm-alpine" container_name = "nextcloud" restart = "unless-stopped" -user = "82:82" networks = ["nextcloud", "postgres", "proxy"] volumes = [ - "/docker/nextcloud:/var/www/html:z", - "/mnt/Storage/Nextcloud:/var/www/html/data", + "nextcloud_config:/var/www/html", + "nextcloud_data:/var/www/html/data", "/etc/localtime:/etc/localtime:ro", ] environment = [ diff --git a/docker/pihole/docker-compose.toml b/docker/pihole/docker-compose.toml index 9f328196..b9fccf3a 100644 --- a/docker/pihole/docker-compose.toml +++ b/docker/pihole/docker-compose.toml @@ -1,4 +1,6 @@ -[services] +[volumes] +config = {} +dnsmasq = {} [services.pihole] container_name = "pihole" @@ -6,8 +8,8 @@ image = "pihole/pihole" ports = ["53:53/tcp", "53:53/udp", "67:67/udp", "8069:80/tcp"] networks = ["proxy"] volumes = [ - "/docker/pihole/pihole:/etc/pihole/", - "/docker/pihole/dnsmasq:/etc/dnsmasq.d/", + "config:/etc/pihole/", + "dnsmasq:/etc/dnsmasq.d/", ] dns = ["127.0.0.1", "1.1.1.1"] cap_add = ["NET_ADMIN"] @@ -17,7 +19,5 @@ restart = "unless-stopped" TZ = "Europe/Helsinki" WEBPASSWORD = "${WEBPASSWORD}" -[networks] - [networks.proxy] external = true diff --git a/docker/postgres/docker-compose.toml b/docker/postgres/docker-compose.toml index b826ee3a..c9e76182 100644 --- a/docker/postgres/docker-compose.toml +++ b/docker/postgres/docker-compose.toml @@ -1,3 +1,6 @@ +[volumes] +data = {} + [services.postgres] container_name = "postgres" image = "postgres:16" @@ -5,7 +8,7 @@ environment = ["TZ=Europe/Helsinki"] ports = ["127.0.0.1:5432:5432"] networks = ["postgres"] volumes = [ - "/docker/postgres:/var/lib/postgresql/data", + "data:/var/lib/postgresql/data", "/etc/localtime:/etc/localtime:ro", ] restart = "unless-stopped" diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml index f2c1dd72..53f082b8 100644 --- a/docker/searx/docker-compose.toml +++ b/docker/searx/docker-compose.toml @@ -1,10 +1,13 @@ +[volumes] +config = {} + [services.searx] container_name = "searx" image = "searxng/searxng" restart = "unless-stopped" networks = ["searx", "proxy"] volumes = [ - "/docker/searx:/etc/searxng", + "config:/etc/searxng", #"/docker/searx/logo.png:/usr/local/searxng/searx/static/themes/simple/img/searxng.png:ro" ] environment = ["SEARXNG_BASE_URL=https://search.korhonen.cc/"] diff --git a/docker/stats/docker-compose.toml b/docker/stats/docker-compose.toml index ff0e0846..15e5141d 100644 --- a/docker/stats/docker-compose.toml +++ b/docker/stats/docker-compose.toml @@ -1,7 +1,7 @@ [services.grafana] image = "grafana/grafana" container_name = "grafana" -volumes = ["/docker/stats/grafana:/var/lib/grafana"] +volumes = ["grafana:/var/lib/grafana"] networks = ["stats", "proxy"] user = "1000:984" env_file = [".env"] diff --git a/docker/tvheadend/docker-compose.toml b/docker/tvheadend/docker-compose.toml index cdbff58c..d1a3d97b 100644 --- a/docker/tvheadend/docker-compose.toml +++ b/docker/tvheadend/docker-compose.toml @@ -1,11 +1,15 @@ +[volumes] +config = {} +picons = {} + [services.tvheadend] image = "linuxserver/tvheadend" container_name = "tvheadend" environment = ["TZ=Europe/Helsinki", "PUID=1000", "PGID=985"] volumes = [ - "/docker/tvheadend:/config", + "config:/config", + "picons:/picons", "/mnt/Storage/Media/PVR:/recordings", - "/mnt/Storage/picons:/picons", "/etc/localtime:/etc/localtime:ro", ] ports = ["9981:9981", "9982:9982"] diff --git a/docker/woodpecker/docker-compose.toml b/docker/woodpecker/docker-compose.toml index 7a4c823e..e98eb4bc 100644 --- a/docker/woodpecker/docker-compose.toml +++ b/docker/woodpecker/docker-compose.toml @@ -1,8 +1,11 @@ +[volumes] +data = {} + [services.woodpecker] image = "woodpeckerci/woodpecker-server" container_name = "woodpecker" restart = "unless-stopped" -volumes = ["/docker/woodpecker/:/var/lib/woodpecker/"] +volumes = ["data:/var/lib/woodpecker"] env_file = [".env"] environment = [ "WOODPECKER_OPEN=true", @@ -24,10 +27,7 @@ restart = "unless-stopped" depends_on = ["woodpecker"] volumes = ["/var/run/docker.sock:/var/run/docker.sock"] env_file = [".env"] -environment = [ - "WOODPECKER_SERVER=woodpecker:9000", - "WOODPECKER_AGENT_SECRET", -] +environment = ["WOODPECKER_SERVER=woodpecker:9000", "WOODPECKER_AGENT_SECRET"] [networks.proxy] external = true From 064c285fcfba43a09f1874b764374c9853b584d0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Feb 2024 01:03:40 +0200 Subject: [PATCH 2295/2667] Docker: migrate repo, index and website to docker volumes --- config-root.toml | 7 ++----- docker/caddy/docker-compose.toml | 11 +++++++---- root/etc/pacman.conf | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config-root.toml b/config-root.toml index 987d318a..1a8d209a 100644 --- a/config-root.toml +++ b/config-root.toml @@ -167,9 +167,6 @@ dst = "/etc/doas.conf" src = "etc/flexo/flexo.toml" dst = "/etc/flexo/flexo.toml" -[profiles.Network] -dotfiles = ["d_network", "f_networkd.conf"] - [profiles.Locale] dotfiles = ["f_locale.conf", "f_locale.gen"] @@ -207,10 +204,10 @@ dotfiles = [ "f_welcomemessage.conf", "f_flexo.toml", ] -include = ["Locale", "Pacman", "Network"] +include = ["Locale", "Pacman"] [profiles.Moria] -include = ["Locale", "Pacman", "Network"] +include = ["Locale", "Pacman"] dotfiles = [ "f_99-sysctl.conf", "f_cmdline", diff --git a/docker/caddy/docker-compose.toml b/docker/caddy/docker-compose.toml index 9fe8cbd8..7e2995cd 100644 --- a/docker/caddy/docker-compose.toml +++ b/docker/caddy/docker-compose.toml @@ -1,6 +1,9 @@ [volumes] data = {} config = {} +wkd = {} +korhonen_cc = {} +index = {} [volumes.nextcloud_config] external = true @@ -12,13 +15,13 @@ restart = "unless-stopped" ports = ["80:80", "443:443/tcp", "443:443/udp"] networks = ["proxy"] volumes = [ + "./Caddyfile:/etc/caddy/Caddyfile", "data:/data", "config:/config", + "wkd:/var/www/wkd", + "korhonen_cc:/var/www/korhonen.cc", + "index:/var/www/index.korhonen.cc", "nextcloud_config:/var/www/nextcloud", - "/var/www/korhonen.cc:/var/www/korhonen.cc", - "/var/www/wkd:/var/www/wkd", - "/var/www/index.korhonen.cc:/var/www/index.korhonen.cc", - "./Caddyfile:/etc/caddy/Caddyfile", ] environment = ["CLOUDFLARE_EMAIL", "CLOUDFLARE_API_TOKEN", "ACME_AGREE=true"] diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 2e567467..b3807098 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -10,7 +10,7 @@ LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg {%@@ if profile == "Moria" @@%} CleanMethod=KeepCurrent -CacheDir=/var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 +CacheDir= /var/lib/docker/volumes/caddy_index/_data/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} [core] @@ -27,7 +27,7 @@ Include = /etc/pacman.d/mirrorlist [korhonen_aur] {%@@ if profile == "Moria" @@%} -Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch +Server = file:///var/lib/docker/volumes/caddy_index/_data/repo/arch_linux/$repo/$arch {%@@ else @@%} Include = /etc/pacman.d/pacserve Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch From eae8a1dfe1792239c15ae44c023a7d90bf0df738 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Feb 2024 01:03:40 +0200 Subject: [PATCH 2296/2667] Docker: migrate repo, index and website to docker volumes --- config-root.toml | 7 ++----- docker/caddy/docker-compose.toml | 11 +++++++---- root/etc/pacman.conf | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config-root.toml b/config-root.toml index 987d318a..1a8d209a 100644 --- a/config-root.toml +++ b/config-root.toml @@ -167,9 +167,6 @@ dst = "/etc/doas.conf" src = "etc/flexo/flexo.toml" dst = "/etc/flexo/flexo.toml" -[profiles.Network] -dotfiles = ["d_network", "f_networkd.conf"] - [profiles.Locale] dotfiles = ["f_locale.conf", "f_locale.gen"] @@ -207,10 +204,10 @@ dotfiles = [ "f_welcomemessage.conf", "f_flexo.toml", ] -include = ["Locale", "Pacman", "Network"] +include = ["Locale", "Pacman"] [profiles.Moria] -include = ["Locale", "Pacman", "Network"] +include = ["Locale", "Pacman"] dotfiles = [ "f_99-sysctl.conf", "f_cmdline", diff --git a/docker/caddy/docker-compose.toml b/docker/caddy/docker-compose.toml index 9fe8cbd8..7e2995cd 100644 --- a/docker/caddy/docker-compose.toml +++ b/docker/caddy/docker-compose.toml @@ -1,6 +1,9 @@ [volumes] data = {} config = {} +wkd = {} +korhonen_cc = {} +index = {} [volumes.nextcloud_config] external = true @@ -12,13 +15,13 @@ restart = "unless-stopped" ports = ["80:80", "443:443/tcp", "443:443/udp"] networks = ["proxy"] volumes = [ + "./Caddyfile:/etc/caddy/Caddyfile", "data:/data", "config:/config", + "wkd:/var/www/wkd", + "korhonen_cc:/var/www/korhonen.cc", + "index:/var/www/index.korhonen.cc", "nextcloud_config:/var/www/nextcloud", - "/var/www/korhonen.cc:/var/www/korhonen.cc", - "/var/www/wkd:/var/www/wkd", - "/var/www/index.korhonen.cc:/var/www/index.korhonen.cc", - "./Caddyfile:/etc/caddy/Caddyfile", ] environment = ["CLOUDFLARE_EMAIL", "CLOUDFLARE_API_TOKEN", "ACME_AGREE=true"] diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 2e567467..b3807098 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -10,7 +10,7 @@ LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg {%@@ if profile == "Moria" @@%} CleanMethod=KeepCurrent -CacheDir=/var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 +CacheDir= /var/lib/docker/volumes/caddy_index/_data/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} [core] @@ -27,7 +27,7 @@ Include = /etc/pacman.d/mirrorlist [korhonen_aur] {%@@ if profile == "Moria" @@%} -Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch +Server = file:///var/lib/docker/volumes/caddy_index/_data/repo/arch_linux/$repo/$arch {%@@ else @@%} Include = /etc/pacman.d/pacserve Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch From ff57f88c5b86255844e043b16e56ab7bc4a2959d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Feb 2024 14:29:55 +0200 Subject: [PATCH 2297/2667] Migrate from woodpecker to Forgejo Actions --- docker/forgejo/docker-compose.toml | 16 ++++++++++++- docker/woodpecker/docker-compose.toml | 33 --------------------------- 2 files changed, 15 insertions(+), 34 deletions(-) delete mode 100644 docker/woodpecker/docker-compose.toml diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index 602fc2ea..6fa66347 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -1,15 +1,29 @@ [volumes] data = {} +runner = {} [services.forgejo] image = "git.korhonen.cc/functionalhacker/forgejo-asciidoc" container_name = "forgejo" -environment = ["TZ=Europe/Helsinki"] +environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] restart = "unless-stopped" networks = ["postgres", "proxy"] ports = ["22:22"] volumes = ["data:/data", "/etc/localtime:/etc/localtime:ro"] +[services.runner] +image = "code.forgejo.org/forgejo/runner:3.3.0" +container_name = "forgejo-runner" +user = "root:root" +volumes = [ + "runner:/data", + "/var/run/docker.sock:/var/run/docker.sock", + "/etc/localtime:/etc/localtime:ro", +] +environment = ["SOCKFILE=/var/run/docker.sock"] +restart = "unless-stopped" +command = "forgejo-runner daemon -c /data/config.yaml" + [networks.postgres] external = true diff --git a/docker/woodpecker/docker-compose.toml b/docker/woodpecker/docker-compose.toml deleted file mode 100644 index e98eb4bc..00000000 --- a/docker/woodpecker/docker-compose.toml +++ /dev/null @@ -1,33 +0,0 @@ -[volumes] -data = {} - -[services.woodpecker] -image = "woodpeckerci/woodpecker-server" -container_name = "woodpecker" -restart = "unless-stopped" -volumes = ["data:/var/lib/woodpecker"] -env_file = [".env"] -environment = [ - "WOODPECKER_OPEN=true", - "WOODPECKER_GITEA=true", - "WOODPECKER_GITEA_URL=https://git.korhonen.cc", - "WOODPECKER_GITEA_CLIENT", - "WOODPECKER_GITEA_SECRET", - "WOODPECKER_AGENT_SECRET", - "WOODPECKER_HOST=https://ci.korhonen.cc", - "WOODPECKER_ADMIN=FunctionalHacker", -] -networks = ["proxy", "default"] - -[services.woodpecker-agent] -image = "woodpeckerci/woodpecker-agent" -container_name = "woodpecker-agent" -command = "agent" -restart = "unless-stopped" -depends_on = ["woodpecker"] -volumes = ["/var/run/docker.sock:/var/run/docker.sock"] -env_file = [".env"] -environment = ["WOODPECKER_SERVER=woodpecker:9000", "WOODPECKER_AGENT_SECRET"] - -[networks.proxy] -external = true From 68ac24e29f69ed60f2abdd4355abb78cbbbd04db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Feb 2024 14:29:55 +0200 Subject: [PATCH 2298/2667] Migrate from woodpecker to Forgejo Actions --- docker/forgejo/docker-compose.toml | 16 ++++++++++++- docker/woodpecker/docker-compose.toml | 33 --------------------------- 2 files changed, 15 insertions(+), 34 deletions(-) delete mode 100644 docker/woodpecker/docker-compose.toml diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index 602fc2ea..6fa66347 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -1,15 +1,29 @@ [volumes] data = {} +runner = {} [services.forgejo] image = "git.korhonen.cc/functionalhacker/forgejo-asciidoc" container_name = "forgejo" -environment = ["TZ=Europe/Helsinki"] +environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] restart = "unless-stopped" networks = ["postgres", "proxy"] ports = ["22:22"] volumes = ["data:/data", "/etc/localtime:/etc/localtime:ro"] +[services.runner] +image = "code.forgejo.org/forgejo/runner:3.3.0" +container_name = "forgejo-runner" +user = "root:root" +volumes = [ + "runner:/data", + "/var/run/docker.sock:/var/run/docker.sock", + "/etc/localtime:/etc/localtime:ro", +] +environment = ["SOCKFILE=/var/run/docker.sock"] +restart = "unless-stopped" +command = "forgejo-runner daemon -c /data/config.yaml" + [networks.postgres] external = true diff --git a/docker/woodpecker/docker-compose.toml b/docker/woodpecker/docker-compose.toml deleted file mode 100644 index e98eb4bc..00000000 --- a/docker/woodpecker/docker-compose.toml +++ /dev/null @@ -1,33 +0,0 @@ -[volumes] -data = {} - -[services.woodpecker] -image = "woodpeckerci/woodpecker-server" -container_name = "woodpecker" -restart = "unless-stopped" -volumes = ["data:/var/lib/woodpecker"] -env_file = [".env"] -environment = [ - "WOODPECKER_OPEN=true", - "WOODPECKER_GITEA=true", - "WOODPECKER_GITEA_URL=https://git.korhonen.cc", - "WOODPECKER_GITEA_CLIENT", - "WOODPECKER_GITEA_SECRET", - "WOODPECKER_AGENT_SECRET", - "WOODPECKER_HOST=https://ci.korhonen.cc", - "WOODPECKER_ADMIN=FunctionalHacker", -] -networks = ["proxy", "default"] - -[services.woodpecker-agent] -image = "woodpeckerci/woodpecker-agent" -container_name = "woodpecker-agent" -command = "agent" -restart = "unless-stopped" -depends_on = ["woodpecker"] -volumes = ["/var/run/docker.sock:/var/run/docker.sock"] -env_file = [".env"] -environment = ["WOODPECKER_SERVER=woodpecker:9000", "WOODPECKER_AGENT_SECRET"] - -[networks.proxy] -external = true From 557eeb705dea77e6576753d24647fe6c83fdba43 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Feb 2024 11:24:18 +0200 Subject: [PATCH 2299/2667] Move runner configuration to git repo --- docker/forgejo/docker-compose.toml | 1 + docker/forgejo/runner.yaml | 34 ++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 docker/forgejo/runner.yaml diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index 6fa66347..5ed358c4 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -17,6 +17,7 @@ container_name = "forgejo-runner" user = "root:root" volumes = [ "runner:/data", + "./runner.yaml:/data/config.yaml", "/var/run/docker.sock:/var/run/docker.sock", "/etc/localtime:/etc/localtime:ro", ] diff --git a/docker/forgejo/runner.yaml b/docker/forgejo/runner.yaml new file mode 100644 index 00000000..2691c298 --- /dev/null +++ b/docker/forgejo/runner.yaml @@ -0,0 +1,34 @@ +log: + level: info + +runner: + file: .runner + capacity: 2 + env_file: .env + timeout: 3h + insecure: false + fetch_timeout: 5s + fetch_interval: 2s + labels: + - 'docker:docker://git.korhonen.cc/functionalhacker/ubuntu-act:22.04' + +cache: + enabled: true + dir: '' + host: '' + port: 0 + external_server: '' + +container: + network: '' + enable_ipv6: false + privileged: false + options: + workdir_parent: + valid_volumes: + - 'caddy_korhonen_cc' + docker_host: '' + force_pull: false + +host: + workdir_parent: From 2b6a1b6fafd5cde8a35c02ae20f829b7c7cf1fd9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Feb 2024 11:24:18 +0200 Subject: [PATCH 2300/2667] Move runner configuration to git repo --- docker/forgejo/docker-compose.toml | 1 + docker/forgejo/runner.yaml | 34 ++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 docker/forgejo/runner.yaml diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index 6fa66347..5ed358c4 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -17,6 +17,7 @@ container_name = "forgejo-runner" user = "root:root" volumes = [ "runner:/data", + "./runner.yaml:/data/config.yaml", "/var/run/docker.sock:/var/run/docker.sock", "/etc/localtime:/etc/localtime:ro", ] diff --git a/docker/forgejo/runner.yaml b/docker/forgejo/runner.yaml new file mode 100644 index 00000000..2691c298 --- /dev/null +++ b/docker/forgejo/runner.yaml @@ -0,0 +1,34 @@ +log: + level: info + +runner: + file: .runner + capacity: 2 + env_file: .env + timeout: 3h + insecure: false + fetch_timeout: 5s + fetch_interval: 2s + labels: + - 'docker:docker://git.korhonen.cc/functionalhacker/ubuntu-act:22.04' + +cache: + enabled: true + dir: '' + host: '' + port: 0 + external_server: '' + +container: + network: '' + enable_ipv6: false + privileged: false + options: + workdir_parent: + valid_volumes: + - 'caddy_korhonen_cc' + docker_host: '' + force_pull: false + +host: + workdir_parent: From 382bfad14c395529ad23611a7b7e1edf1a003835 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Feb 2024 12:57:44 +0200 Subject: [PATCH 2301/2667] Use bind mount for arch repo. Couldn't find another way past permission issues --- docker/caddy/docker-compose.toml | 3 +-- root/etc/pacman.conf | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docker/caddy/docker-compose.toml b/docker/caddy/docker-compose.toml index 7e2995cd..f5431591 100644 --- a/docker/caddy/docker-compose.toml +++ b/docker/caddy/docker-compose.toml @@ -3,7 +3,6 @@ data = {} config = {} wkd = {} korhonen_cc = {} -index = {} [volumes.nextcloud_config] external = true @@ -20,8 +19,8 @@ volumes = [ "config:/config", "wkd:/var/www/wkd", "korhonen_cc:/var/www/korhonen.cc", - "index:/var/www/index.korhonen.cc", "nextcloud_config:/var/www/nextcloud", + "/var/www/index.korhonen.cc:/var/www/index.korhonen.cc", ] environment = ["CLOUDFLARE_EMAIL", "CLOUDFLARE_API_TOKEN", "ACME_AGREE=true"] diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index b3807098..249cd2a9 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -10,7 +10,7 @@ LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg {%@@ if profile == "Moria" @@%} CleanMethod=KeepCurrent -CacheDir= /var/lib/docker/volumes/caddy_index/_data/repo/arch_linux/korhonen_aur/x86_64 +CacheDir= /var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} [core] @@ -27,7 +27,7 @@ Include = /etc/pacman.d/mirrorlist [korhonen_aur] {%@@ if profile == "Moria" @@%} -Server = file:///var/lib/docker/volumes/caddy_index/_data/repo/arch_linux/$repo/$arch +Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ else @@%} Include = /etc/pacman.d/pacserve Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch From 6c86c4a87e7a5db3d2a8cbcf7cfc4f957244d957 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Feb 2024 12:57:44 +0200 Subject: [PATCH 2302/2667] Use bind mount for arch repo. Couldn't find another way past permission issues --- docker/caddy/docker-compose.toml | 3 +-- root/etc/pacman.conf | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docker/caddy/docker-compose.toml b/docker/caddy/docker-compose.toml index 7e2995cd..f5431591 100644 --- a/docker/caddy/docker-compose.toml +++ b/docker/caddy/docker-compose.toml @@ -3,7 +3,6 @@ data = {} config = {} wkd = {} korhonen_cc = {} -index = {} [volumes.nextcloud_config] external = true @@ -20,8 +19,8 @@ volumes = [ "config:/config", "wkd:/var/www/wkd", "korhonen_cc:/var/www/korhonen.cc", - "index:/var/www/index.korhonen.cc", "nextcloud_config:/var/www/nextcloud", + "/var/www/index.korhonen.cc:/var/www/index.korhonen.cc", ] environment = ["CLOUDFLARE_EMAIL", "CLOUDFLARE_API_TOKEN", "ACME_AGREE=true"] diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index b3807098..249cd2a9 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -10,7 +10,7 @@ LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg {%@@ if profile == "Moria" @@%} CleanMethod=KeepCurrent -CacheDir= /var/lib/docker/volumes/caddy_index/_data/repo/arch_linux/korhonen_aur/x86_64 +CacheDir= /var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} [core] @@ -27,7 +27,7 @@ Include = /etc/pacman.d/mirrorlist [korhonen_aur] {%@@ if profile == "Moria" @@%} -Server = file:///var/lib/docker/volumes/caddy_index/_data/repo/arch_linux/$repo/$arch +Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ else @@%} Include = /etc/pacman.d/pacserve Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch From 269ce725ea799c30b1071ebe5c2b3e6b889ea5f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Feb 2024 13:18:37 +0200 Subject: [PATCH 2303/2667] Add docker volume backup service --- docker/backup/docker-compose.toml | 36 +++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 docker/backup/docker-compose.toml diff --git a/docker/backup/docker-compose.toml b/docker/backup/docker-compose.toml new file mode 100644 index 00000000..9d44aaa6 --- /dev/null +++ b/docker/backup/docker-compose.toml @@ -0,0 +1,36 @@ +[volumes.caddy_data] +external = true + +[volumes.caddy_config] +external = true + +[volumes.caddy_wkd] +external = true + +[volumes.homeautomation_hass] +external = true + +[services.backup] +image = "offen/docker-volume-backup:v2" +container_name = "volume-backup" +environment = [ + "AWS_ENDPOINT", + "AWS_S3_BUCKET_NAME", + "AWS_ACCESS_KEY_ID", + "AWS_SECRET_ACCESS_KEY", + "GPG_PASSPHRASE", + "EMAIL_SMTP_HOST", + "EMAIL_SMTP_PASSWORD", + "EMAIL_SMTP_USERNAME", + "EMAIL_SMTP_PORT", + "BACKUP_COMPRESSION=zst", + "BACKUP_RETENTION_DAYS=7", +] +volumes = [ + "/var/run/docker.sock:/var/run/docker.sock:ro", + "/etc/localtime:/etc/localtime:ro", + "caddy_data:/backup/caddy_data:ro", + "caddy_config:/backup/caddy_config:ro", + "caddy_wkd:/backup/caddy_wkd:ro", + "homeautomation_hass:/backup/homeautomation_hass:ro", +] From d76a6d292b8a526e2f7dd5d7fc4935968810799b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Feb 2024 13:18:37 +0200 Subject: [PATCH 2304/2667] Add docker volume backup service --- docker/backup/docker-compose.toml | 36 +++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 docker/backup/docker-compose.toml diff --git a/docker/backup/docker-compose.toml b/docker/backup/docker-compose.toml new file mode 100644 index 00000000..9d44aaa6 --- /dev/null +++ b/docker/backup/docker-compose.toml @@ -0,0 +1,36 @@ +[volumes.caddy_data] +external = true + +[volumes.caddy_config] +external = true + +[volumes.caddy_wkd] +external = true + +[volumes.homeautomation_hass] +external = true + +[services.backup] +image = "offen/docker-volume-backup:v2" +container_name = "volume-backup" +environment = [ + "AWS_ENDPOINT", + "AWS_S3_BUCKET_NAME", + "AWS_ACCESS_KEY_ID", + "AWS_SECRET_ACCESS_KEY", + "GPG_PASSPHRASE", + "EMAIL_SMTP_HOST", + "EMAIL_SMTP_PASSWORD", + "EMAIL_SMTP_USERNAME", + "EMAIL_SMTP_PORT", + "BACKUP_COMPRESSION=zst", + "BACKUP_RETENTION_DAYS=7", +] +volumes = [ + "/var/run/docker.sock:/var/run/docker.sock:ro", + "/etc/localtime:/etc/localtime:ro", + "caddy_data:/backup/caddy_data:ro", + "caddy_config:/backup/caddy_config:ro", + "caddy_wkd:/backup/caddy_wkd:ro", + "homeautomation_hass:/backup/homeautomation_hass:ro", +] From 5a17f8b9ecd8e0296650eb068d3b8aac0f34af07 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Feb 2024 14:35:51 +0200 Subject: [PATCH 2305/2667] Zellij disable session serialization --- home/.config/zellij/config.kdl | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zellij/config.kdl b/home/.config/zellij/config.kdl index d3a0e53f..88d64342 100644 --- a/home/.config/zellij/config.kdl +++ b/home/.config/zellij/config.kdl @@ -1,3 +1,4 @@ +session_serialization false theme "kanagawa" keybinds { From f47ae0ddee721cb42c66b9bbf8195f85fd3e599f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Feb 2024 14:35:51 +0200 Subject: [PATCH 2306/2667] Zellij disable session serialization --- home/.config/zellij/config.kdl | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zellij/config.kdl b/home/.config/zellij/config.kdl index d3a0e53f..88d64342 100644 --- a/home/.config/zellij/config.kdl +++ b/home/.config/zellij/config.kdl @@ -1,3 +1,4 @@ +session_serialization false theme "kanagawa" keybinds { From 34f995747da540a5f09c8dee5fa79b6eade918f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Feb 2024 18:26:49 +0200 Subject: [PATCH 2307/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 0a11bbe6..9f47f8c4 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" }, - "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, + "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, @@ -16,51 +16,51 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "03f825956ec49e550d07875d867ea6e7c4dc8c00" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "9960fd71f17362e145ae55d2960afb18c45bc71e" }, + "dropbar.nvim": { "branch": "master", "commit": "a133a7deed7431496d8e87e8e4cc9c09a9d78945" }, "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, - "friendly-snippets": { "branch": "main", "commit": "dbd45e9ba76d535e4cba88afa1b7aa43bb765336" }, + "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, "kanagawa.nvim": { "branch": "master", "commit": "ab41956c4559c3eb21e713fcdf54cda1cb6d5f40" }, "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "fe4cce44dec93c69be17dad79b21de867dde118a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" }, - "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "mini.nvim": { "branch": "main", "commit": "be7c6b5282ab15117dc8ef7ab19394925cf16a25" }, - "neodev.nvim": { "branch": "main", "commit": "bbe17de89345ce40725e721d347c596dc4a02b32" }, + "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, + "mini.nvim": { "branch": "main", "commit": "b7403ad0c2a4dab777244171ca1b7e8c89696584" }, + "neodev.nvim": { "branch": "main", "commit": "3157f2e876fd6223d36cfa76bee4709247d62fa5" }, "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, - "nvim-autopairs": { "branch": "master", "commit": "2e8a10c5fc0dcaf8296a5f1a7077efcd37065cc8" }, + "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" }, "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, - "nvim-jdtls": { "branch": "master", "commit": "81ead309b9cb5603d84836cef19a8ca9f849a847" }, + "nvim-jdtls": { "branch": "master", "commit": "382b9f625861f47d95876bcfb4c261f3b96077cb" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "d1bab4cf4b69e49d6058028fd933d8ef5e74e680" }, + "nvim-lspconfig": { "branch": "master", "commit": "ec7d51a619049c7c597f469f81ea199db6794651" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "d35a8d5ec6358ada4b058431b367b32360737466" }, - "nvim-treesitter": { "branch": "master", "commit": "b3e53e94232d2bc6d70516efbd932bcce3ba8e1e" }, + "nvim-tree.lua": { "branch": "master", "commit": "d52fdeb0a300ac42b9cfa65ae0600a299f8e8677" }, + "nvim-treesitter": { "branch": "master", "commit": "18aa5ae3fd7245137bc41b5348102fe254405509" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "553d8a9c611caa9f020556d4a26b760698e5b81b" }, - "nvim-web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" }, + "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, - "statuscol.nvim": { "branch": "main", "commit": "eca428c8df8549fe7a480dd0da0ccc1634f16a4b" }, + "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "b744cf59752aaa01561afb4223006de26f3836fd" }, + "telescope.nvim": { "branch": "master", "commit": "2e1e382df42467029b493c143c2e727028140214" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "011cf4fcb93a9649ffc6dcdff56ef948f5d0f7cc" }, + "vim-fugitive": { "branch": "master", "commit": "2e88f14a585c014691904ba8fe39e6ea851c9422" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From 032a7614ee6c05edce97c13db26f7ec765e92fea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Feb 2024 18:26:49 +0200 Subject: [PATCH 2308/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 0a11bbe6..9f47f8c4 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" }, - "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, + "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, @@ -16,51 +16,51 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "03f825956ec49e550d07875d867ea6e7c4dc8c00" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "9960fd71f17362e145ae55d2960afb18c45bc71e" }, + "dropbar.nvim": { "branch": "master", "commit": "a133a7deed7431496d8e87e8e4cc9c09a9d78945" }, "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, - "friendly-snippets": { "branch": "main", "commit": "dbd45e9ba76d535e4cba88afa1b7aa43bb765336" }, + "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, "kanagawa.nvim": { "branch": "master", "commit": "ab41956c4559c3eb21e713fcdf54cda1cb6d5f40" }, "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "fe4cce44dec93c69be17dad79b21de867dde118a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" }, - "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "mini.nvim": { "branch": "main", "commit": "be7c6b5282ab15117dc8ef7ab19394925cf16a25" }, - "neodev.nvim": { "branch": "main", "commit": "bbe17de89345ce40725e721d347c596dc4a02b32" }, + "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, + "mini.nvim": { "branch": "main", "commit": "b7403ad0c2a4dab777244171ca1b7e8c89696584" }, + "neodev.nvim": { "branch": "main", "commit": "3157f2e876fd6223d36cfa76bee4709247d62fa5" }, "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, - "nvim-autopairs": { "branch": "master", "commit": "2e8a10c5fc0dcaf8296a5f1a7077efcd37065cc8" }, + "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" }, "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, - "nvim-jdtls": { "branch": "master", "commit": "81ead309b9cb5603d84836cef19a8ca9f849a847" }, + "nvim-jdtls": { "branch": "master", "commit": "382b9f625861f47d95876bcfb4c261f3b96077cb" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "d1bab4cf4b69e49d6058028fd933d8ef5e74e680" }, + "nvim-lspconfig": { "branch": "master", "commit": "ec7d51a619049c7c597f469f81ea199db6794651" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "d35a8d5ec6358ada4b058431b367b32360737466" }, - "nvim-treesitter": { "branch": "master", "commit": "b3e53e94232d2bc6d70516efbd932bcce3ba8e1e" }, + "nvim-tree.lua": { "branch": "master", "commit": "d52fdeb0a300ac42b9cfa65ae0600a299f8e8677" }, + "nvim-treesitter": { "branch": "master", "commit": "18aa5ae3fd7245137bc41b5348102fe254405509" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "553d8a9c611caa9f020556d4a26b760698e5b81b" }, - "nvim-web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" }, + "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, - "statuscol.nvim": { "branch": "main", "commit": "eca428c8df8549fe7a480dd0da0ccc1634f16a4b" }, + "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "b744cf59752aaa01561afb4223006de26f3836fd" }, + "telescope.nvim": { "branch": "master", "commit": "2e1e382df42467029b493c143c2e727028140214" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "011cf4fcb93a9649ffc6dcdff56ef948f5d0f7cc" }, + "vim-fugitive": { "branch": "master", "commit": "2e88f14a585c014691904ba8fe39e6ea851c9422" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From a6c9da019f0f0bb52602aec07b68469f7c09bcd8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Feb 2024 18:26:59 +0200 Subject: [PATCH 2309/2667] Add custom snippets to LuaSnip --- home/.config/nvim/lua/plugins/luasnip.lua | 11 +++++++++-- home/.config/nvim/snippets/java.json | 14 ++++++++++++++ home/.config/nvim/snippets/package.json | 14 ++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 home/.config/nvim/snippets/java.json create mode 100644 home/.config/nvim/snippets/package.json diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index ade105cd..88d922e0 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -5,7 +5,14 @@ return { -- Snippets collection dependencies = { "rafamadriz/friendly-snippets" }, config = function() - -- load friendly-snippets to luasnip - require("luasnip/loaders/from_vscode").lazy_load() + local vsCodeLoader = require("luasnip/loaders/from_vscode") + + -- Load friendly-snippets + vsCodeLoader.lazy_load() + + -- Load my custom snippets + vsCodeLoader.lazy_load({ + paths = { "./snippets" }, + }) end, } diff --git a/home/.config/nvim/snippets/java.json b/home/.config/nvim/snippets/java.json new file mode 100644 index 00000000..b6392431 --- /dev/null +++ b/home/.config/nvim/snippets/java.json @@ -0,0 +1,14 @@ +{ + "queryListFromModel": { + "scope": "java", + "description": "Create a method to get a List from the database (Rossum JpaBaseDAO)", + "prefix": "queryListFromModel", + "body": [ + "public List<$1> $2() {", + " return queryFromModelObject()", + " .where((cb, root) -> $0)", + " .results();", + "}" + ] + } +} diff --git a/home/.config/nvim/snippets/package.json b/home/.config/nvim/snippets/package.json new file mode 100644 index 00000000..70b1949d --- /dev/null +++ b/home/.config/nvim/snippets/package.json @@ -0,0 +1,14 @@ +{ + "name": "functionalhacker-snippets", + "engines": { + "vscode": "^1.11.0" + }, + "contributes": { + "snippets": [ + { + "language": "java", + "path": "./java.json" + } + ] + } +} From 5775a8a3ba887b08b94e4e32dfe08fb598f8fbbc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Feb 2024 18:26:59 +0200 Subject: [PATCH 2310/2667] Add custom snippets to LuaSnip --- home/.config/nvim/lua/plugins/luasnip.lua | 11 +++++++++-- home/.config/nvim/snippets/java.json | 14 ++++++++++++++ home/.config/nvim/snippets/package.json | 14 ++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 home/.config/nvim/snippets/java.json create mode 100644 home/.config/nvim/snippets/package.json diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index ade105cd..88d922e0 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -5,7 +5,14 @@ return { -- Snippets collection dependencies = { "rafamadriz/friendly-snippets" }, config = function() - -- load friendly-snippets to luasnip - require("luasnip/loaders/from_vscode").lazy_load() + local vsCodeLoader = require("luasnip/loaders/from_vscode") + + -- Load friendly-snippets + vsCodeLoader.lazy_load() + + -- Load my custom snippets + vsCodeLoader.lazy_load({ + paths = { "./snippets" }, + }) end, } diff --git a/home/.config/nvim/snippets/java.json b/home/.config/nvim/snippets/java.json new file mode 100644 index 00000000..b6392431 --- /dev/null +++ b/home/.config/nvim/snippets/java.json @@ -0,0 +1,14 @@ +{ + "queryListFromModel": { + "scope": "java", + "description": "Create a method to get a List from the database (Rossum JpaBaseDAO)", + "prefix": "queryListFromModel", + "body": [ + "public List<$1> $2() {", + " return queryFromModelObject()", + " .where((cb, root) -> $0)", + " .results();", + "}" + ] + } +} diff --git a/home/.config/nvim/snippets/package.json b/home/.config/nvim/snippets/package.json new file mode 100644 index 00000000..70b1949d --- /dev/null +++ b/home/.config/nvim/snippets/package.json @@ -0,0 +1,14 @@ +{ + "name": "functionalhacker-snippets", + "engines": { + "vscode": "^1.11.0" + }, + "contributes": { + "snippets": [ + { + "language": "java", + "path": "./java.json" + } + ] + } +} From 4bbfa49d6fb7502bec0eeda79581e4fdca5631e9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 28 Feb 2024 09:04:56 +0200 Subject: [PATCH 2311/2667] Nvim: Improve luasnip keymappings --- home/.config/nvim/lua/plugins/cmp.lua | 44 ++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 3891206f..8af73485 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -26,6 +26,12 @@ return { local cmp = require("cmp") local luasnip = require("luasnip") + local has_words_before = function() + unpack = unpack or table.unpack + local line, col = unpack(vim.api.nvim_win_get_cursor(0)) + return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil + end + -- Set completeopt to have a better completion experience vim.o.completeopt = "menuone,noselect" @@ -46,20 +52,44 @@ return { behavior = cmp.ConfirmBehavior.Replace, select = true, }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() + -- Snippet placeholder forward + [""] = cmp.mapping(function(fallback) + if luasnip.jumpable(1) then + luasnip.jump(1) else fallback() end end, { "i", "s" }), + -- Snippet placeholder backward + [""] = cmp.mapping(function(fallback) + if luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), + -- Completion menu forward + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + -- If only one entry, select it + if #cmp.get_entries() == 1 then + cmp.confirm({ select = true }) + else + cmp.select_next_item() + end + elseif has_words_before() then + cmp.complete() + if #cmp.get_entries() == 1 then + cmp.confirm({ select = true }) + end + else + fallback() + end + end, { "i", "s" }), + -- Completion menu backward [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) else fallback() end From 443da724f657cd2ee6464da4c545534baf6189b1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 28 Feb 2024 09:04:56 +0200 Subject: [PATCH 2312/2667] Nvim: Improve luasnip keymappings --- home/.config/nvim/lua/plugins/cmp.lua | 44 ++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 3891206f..8af73485 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -26,6 +26,12 @@ return { local cmp = require("cmp") local luasnip = require("luasnip") + local has_words_before = function() + unpack = unpack or table.unpack + local line, col = unpack(vim.api.nvim_win_get_cursor(0)) + return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil + end + -- Set completeopt to have a better completion experience vim.o.completeopt = "menuone,noselect" @@ -46,20 +52,44 @@ return { behavior = cmp.ConfirmBehavior.Replace, select = true, }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() + -- Snippet placeholder forward + [""] = cmp.mapping(function(fallback) + if luasnip.jumpable(1) then + luasnip.jump(1) else fallback() end end, { "i", "s" }), + -- Snippet placeholder backward + [""] = cmp.mapping(function(fallback) + if luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), + -- Completion menu forward + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + -- If only one entry, select it + if #cmp.get_entries() == 1 then + cmp.confirm({ select = true }) + else + cmp.select_next_item() + end + elseif has_words_before() then + cmp.complete() + if #cmp.get_entries() == 1 then + cmp.confirm({ select = true }) + end + else + fallback() + end + end, { "i", "s" }), + -- Completion menu backward [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) else fallback() end From 13b51fbbb68cae8d9f12ca866e4dacd37f56f6ae Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Mar 2024 16:00:21 +0200 Subject: [PATCH 2313/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 9f47f8c4..70820043 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -14,26 +14,26 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "03f825956ec49e550d07875d867ea6e7c4dc8c00" }, + "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dropbar.nvim": { "branch": "master", "commit": "a133a7deed7431496d8e87e8e4cc9c09a9d78945" }, "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, - "kanagawa.nvim": { "branch": "master", "commit": "ab41956c4559c3eb21e713fcdf54cda1cb6d5f40" }, + "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" }, "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, - "mini.nvim": { "branch": "main", "commit": "b7403ad0c2a4dab777244171ca1b7e8c89696584" }, - "neodev.nvim": { "branch": "main", "commit": "3157f2e876fd6223d36cfa76bee4709247d62fa5" }, + "mini.nvim": { "branch": "main", "commit": "f24747266a047617d06605a2316aa6c071662fa2" }, + "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "c1ee08053439f6b9ded71a0a44c6275da3bdf109" }, "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, @@ -41,23 +41,23 @@ "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, "nvim-jdtls": { "branch": "master", "commit": "382b9f625861f47d95876bcfb4c261f3b96077cb" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "ec7d51a619049c7c597f469f81ea199db6794651" }, + "nvim-lspconfig": { "branch": "master", "commit": "9553725789be682ecd945a527ec552e489ea8534" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-tree.lua": { "branch": "master", "commit": "d52fdeb0a300ac42b9cfa65ae0600a299f8e8677" }, - "nvim-treesitter": { "branch": "master", "commit": "18aa5ae3fd7245137bc41b5348102fe254405509" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" }, + "nvim-treesitter": { "branch": "master", "commit": "c2a265156d5799adbd9f9e7d5385735fa5d21776" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "95933e762e28f9d38b572d65e7e4da9d2f4d90cb" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-ufo": { "branch": "main", "commit": "553d8a9c611caa9f020556d4a26b760698e5b81b" }, + "nvim-ufo": { "branch": "main", "commit": "239ae620d818ffa1319ca3056546df71906d4bfb" }, "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, + "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "2e1e382df42467029b493c143c2e727028140214" }, + "telescope.nvim": { "branch": "master", "commit": "5f5fc3aa75e9fc824d4fbbb5de31f172b43f620d" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "2e88f14a585c014691904ba8fe39e6ea851c9422" }, From 61b2e7aff25ad25d2a95d171f54391c4a8afda7e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Mar 2024 16:00:21 +0200 Subject: [PATCH 2314/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 9f47f8c4..70820043 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -14,26 +14,26 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "03f825956ec49e550d07875d867ea6e7c4dc8c00" }, + "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dropbar.nvim": { "branch": "master", "commit": "a133a7deed7431496d8e87e8e4cc9c09a9d78945" }, "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, - "kanagawa.nvim": { "branch": "master", "commit": "ab41956c4559c3eb21e713fcdf54cda1cb6d5f40" }, + "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" }, "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, - "mini.nvim": { "branch": "main", "commit": "b7403ad0c2a4dab777244171ca1b7e8c89696584" }, - "neodev.nvim": { "branch": "main", "commit": "3157f2e876fd6223d36cfa76bee4709247d62fa5" }, + "mini.nvim": { "branch": "main", "commit": "f24747266a047617d06605a2316aa6c071662fa2" }, + "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "c1ee08053439f6b9ded71a0a44c6275da3bdf109" }, "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, @@ -41,23 +41,23 @@ "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, "nvim-jdtls": { "branch": "master", "commit": "382b9f625861f47d95876bcfb4c261f3b96077cb" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "ec7d51a619049c7c597f469f81ea199db6794651" }, + "nvim-lspconfig": { "branch": "master", "commit": "9553725789be682ecd945a527ec552e489ea8534" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-tree.lua": { "branch": "master", "commit": "d52fdeb0a300ac42b9cfa65ae0600a299f8e8677" }, - "nvim-treesitter": { "branch": "master", "commit": "18aa5ae3fd7245137bc41b5348102fe254405509" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" }, + "nvim-treesitter": { "branch": "master", "commit": "c2a265156d5799adbd9f9e7d5385735fa5d21776" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "95933e762e28f9d38b572d65e7e4da9d2f4d90cb" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-ufo": { "branch": "main", "commit": "553d8a9c611caa9f020556d4a26b760698e5b81b" }, + "nvim-ufo": { "branch": "main", "commit": "239ae620d818ffa1319ca3056546df71906d4bfb" }, "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, + "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "2e1e382df42467029b493c143c2e727028140214" }, + "telescope.nvim": { "branch": "master", "commit": "5f5fc3aa75e9fc824d4fbbb5de31f172b43f620d" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "2e88f14a585c014691904ba8fe39e6ea851c9422" }, From ee3f96238688184bb927e67ef6bc09ef834e879c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Mar 2024 17:33:06 +0200 Subject: [PATCH 2315/2667] Add adb service to moria --- config-root.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config-root.toml b/config-root.toml index 1a8d209a..c345beec 100644 --- a/config-root.toml +++ b/config-root.toml @@ -213,6 +213,7 @@ dotfiles = [ "f_cmdline", "f_cpupower", "f_doas.conf", + "f_adb.service", "f_mkinitcpio.conf", "f_mkinitcpio_linux.preset", "f_mkinitcpio_linux-lts.preset", From fc27e459a21005dab0bc4bc99663d9506cc523fe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Mar 2024 17:33:06 +0200 Subject: [PATCH 2316/2667] Add adb service to moria --- config-root.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config-root.toml b/config-root.toml index 1a8d209a..c345beec 100644 --- a/config-root.toml +++ b/config-root.toml @@ -213,6 +213,7 @@ dotfiles = [ "f_cmdline", "f_cpupower", "f_doas.conf", + "f_adb.service", "f_mkinitcpio.conf", "f_mkinitcpio_linux.preset", "f_mkinitcpio_linux-lts.preset", From b5c1a1399b7f4c9adda3b257bbc846a6c1906d58 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 3 Mar 2024 09:52:53 +0200 Subject: [PATCH 2317/2667] Only launch zellij in SSH --- home/.config/zsh/01-zellij.zsh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/home/.config/zsh/01-zellij.zsh b/home/.config/zsh/01-zellij.zsh index f3d76ee4..d8dfb94b 100644 --- a/home/.config/zsh/01-zellij.zsh +++ b/home/.config/zsh/01-zellij.zsh @@ -1,9 +1,4 @@ -if [[ -z "$ZELLIJ" ]]; then - # Launch or attach to existing session if logging in over ssh - if [[ -n "$SSH_CONNECTION" ]]; then - exec zellij attach -c SSH - # Launch a new local session otherwise - else - exec zellij - fi + # Launch or attach zellij to existing session if logging in over ssh +if [[ -z "$ZELLIJ" && -n "$SSH_CONNECTION" ]]; then + exec zellij attach -c SSH fi From 4f2f79407203f10366ee9bc4c419dedf527f7854 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 3 Mar 2024 09:52:53 +0200 Subject: [PATCH 2318/2667] Only launch zellij in SSH --- home/.config/zsh/01-zellij.zsh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/home/.config/zsh/01-zellij.zsh b/home/.config/zsh/01-zellij.zsh index f3d76ee4..d8dfb94b 100644 --- a/home/.config/zsh/01-zellij.zsh +++ b/home/.config/zsh/01-zellij.zsh @@ -1,9 +1,4 @@ -if [[ -z "$ZELLIJ" ]]; then - # Launch or attach to existing session if logging in over ssh - if [[ -n "$SSH_CONNECTION" ]]; then - exec zellij attach -c SSH - # Launch a new local session otherwise - else - exec zellij - fi + # Launch or attach zellij to existing session if logging in over ssh +if [[ -z "$ZELLIJ" && -n "$SSH_CONNECTION" ]]; then + exec zellij attach -c SSH fi From 617f59dbd57054d7e56abad0c890310de7ab60bb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 3 Mar 2024 09:53:37 +0200 Subject: [PATCH 2319/2667] Use locally installed dotdrop instead of submodule --- .gitmodules | 3 --- dotdrop | 1 - home/.config/zsh/04-aliases.zsh | 13 ++++++++++--- 3 files changed, 10 insertions(+), 7 deletions(-) delete mode 100644 .gitmodules delete mode 160000 dotdrop diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 674e4c51..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "dotdrop"] - path = dotdrop - url = https://github.com/deadc0de6/dotdrop.git diff --git a/dotdrop b/dotdrop deleted file mode 160000 index d2a785fd..00000000 --- a/dotdrop +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d2a785fd2fbcedf063b97795c284c2932ff8aa6a diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 02a058e5..f246bb98 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -165,10 +165,17 @@ alias i='iwctl station wlan0' cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop -dotdrop() { source $DOTREPO/secrets/secrets && UID=$(id -u) $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p Isengard{%@@ endif @@%} $@ } -sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ } -updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } +alias dotdrop="source $DOTREPO/secrets/secrets && UID=$(id -u) dotdrop --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p Isengard{%@@ endif @@%}" + + +alias sdotdrop="source $DOTREPO/secrets/secrets && sudo -E dotdrop --cfg=$DOTREPO/config-root.toml" compdef _dotdrop-completion.zsh sdotdrop + +updatesecrets() { + bash $DOTREPO/secrets/secrets.sh + chmod 600 $DOTREPO/secrets/secrets +} + alias dotgit='git -C $DOTREPO' dotsync() { cd $DOTREPO && gac && gpull && gpush && cd $OLDPWD } From 8d2612203fa22e444e066a34d21ff76a719225aa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 3 Mar 2024 09:53:37 +0200 Subject: [PATCH 2320/2667] Use locally installed dotdrop instead of submodule --- .gitmodules | 3 --- dotdrop | 1 - home/.config/zsh/04-aliases.zsh | 13 ++++++++++--- 3 files changed, 10 insertions(+), 7 deletions(-) delete mode 100644 .gitmodules delete mode 160000 dotdrop diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 674e4c51..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "dotdrop"] - path = dotdrop - url = https://github.com/deadc0de6/dotdrop.git diff --git a/dotdrop b/dotdrop deleted file mode 160000 index d2a785fd..00000000 --- a/dotdrop +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d2a785fd2fbcedf063b97795c284c2932ff8aa6a diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 02a058e5..f246bb98 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -165,10 +165,17 @@ alias i='iwctl station wlan0' cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop -dotdrop() { source $DOTREPO/secrets/secrets && UID=$(id -u) $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p Isengard{%@@ endif @@%} $@ } -sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ } -updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets } +alias dotdrop="source $DOTREPO/secrets/secrets && UID=$(id -u) dotdrop --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p Isengard{%@@ endif @@%}" + + +alias sdotdrop="source $DOTREPO/secrets/secrets && sudo -E dotdrop --cfg=$DOTREPO/config-root.toml" compdef _dotdrop-completion.zsh sdotdrop + +updatesecrets() { + bash $DOTREPO/secrets/secrets.sh + chmod 600 $DOTREPO/secrets/secrets +} + alias dotgit='git -C $DOTREPO' dotsync() { cd $DOTREPO && gac && gpull && gpush && cd $OLDPWD } From 33816bdea57dda89133fb907b65196b9aa11df34 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Mar 2024 17:28:44 +0200 Subject: [PATCH 2321/2667] Remove dotdrop completion --- home/.config/zsh/03-plugins.zsh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 479a6d42..71655894 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -30,10 +30,6 @@ zinit light zsh-users/zsh-completions zinit ice wait'1' lucid as'completion' zinit snippet https://gist.githubusercontent.com/RPigott/a3efdc08fa4d5fd7df38d091ab5e8532/raw/867ac1884d97d1bd1e5d4037d4eefdf4a004e72b/_swaymsg -# dotdrop completion -zinit ice wait'1' lucid as'completion' -zinit snippet '$DOTREPO/dotdrop/completion/_dotdrop-completion.zsh' - # syntax highlighting zinit ice lucid atinit'zpcompinit' zinit light zdharma-continuum/fast-syntax-highlighting From 5339a3f7ba57b47af2558c74fab463b898845811 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Mar 2024 17:28:44 +0200 Subject: [PATCH 2322/2667] Remove dotdrop completion --- home/.config/zsh/03-plugins.zsh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 479a6d42..71655894 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -30,10 +30,6 @@ zinit light zsh-users/zsh-completions zinit ice wait'1' lucid as'completion' zinit snippet https://gist.githubusercontent.com/RPigott/a3efdc08fa4d5fd7df38d091ab5e8532/raw/867ac1884d97d1bd1e5d4037d4eefdf4a004e72b/_swaymsg -# dotdrop completion -zinit ice wait'1' lucid as'completion' -zinit snippet '$DOTREPO/dotdrop/completion/_dotdrop-completion.zsh' - # syntax highlighting zinit ice lucid atinit'zpcompinit' zinit light zdharma-continuum/fast-syntax-highlighting From 0882106bc5dcc0ec829e93aadb6c321109e1d0f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Mar 2024 17:32:53 +0200 Subject: [PATCH 2323/2667] Migrate to new mkinitcpio microcode setting --- root/etc/mkinitcpio.conf | 4 ++-- root/etc/mkinitcpio.d/linux-lts.preset | 1 - root/etc/mkinitcpio.d/linux.preset | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index c9d91593..e45462ef 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -4,8 +4,8 @@ BINARIES=("/usr/bin/btrfs") FILES=() {%@@ if profile == "Mirkwood" @@%} -HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs encrypt fsck) +HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesystems btrfs encrypt fsck) {%@@ elif profile == 'Moria' @@%} #HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs encrypt fsck) -HOOKS=(base udev kms keyboard autodetect modconf block netconf dropbear encryptssh filesystems btrfs fsck) +HOOKS=(base udev kms keyboard autodetect microcode modconf block netconf dropbear encryptssh filesystems btrfs fsck) {%@@ endif @@%} diff --git a/root/etc/mkinitcpio.d/linux-lts.preset b/root/etc/mkinitcpio.d/linux-lts.preset index c769f93c..3957588c 100644 --- a/root/etc/mkinitcpio.d/linux-lts.preset +++ b/root/etc/mkinitcpio.d/linux-lts.preset @@ -2,7 +2,6 @@ PRESETS=('default') ALL_config="/etc/mkinitcpio.conf" ALL_kver="/boot/vmlinuz-linux-lts" -ALL_microcode=(/boot/*-ucode.img) default_image="/boot/initramfs-linux-lts.img" default_uki="/boot/EFI/Linux/archlinux-linux-lts.efi" diff --git a/root/etc/mkinitcpio.d/linux.preset b/root/etc/mkinitcpio.d/linux.preset index 6c83b24f..f7b29ac9 100644 --- a/root/etc/mkinitcpio.d/linux.preset +++ b/root/etc/mkinitcpio.d/linux.preset @@ -2,7 +2,6 @@ PRESETS=('default') ALL_config="/etc/mkinitcpio.conf" ALL_kver="/boot/vmlinuz-linux" -ALL_microcode=(/boot/*-ucode.img) default_image="/boot/initramfs-linux.img" default_uki="/boot/EFI/Linux/archlinux-linux.efi" From bcfc37b2db33067eccd6228ee1dcbc0a5dbc36f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Mar 2024 17:32:53 +0200 Subject: [PATCH 2324/2667] Migrate to new mkinitcpio microcode setting --- root/etc/mkinitcpio.conf | 4 ++-- root/etc/mkinitcpio.d/linux-lts.preset | 1 - root/etc/mkinitcpio.d/linux.preset | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index c9d91593..e45462ef 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -4,8 +4,8 @@ BINARIES=("/usr/bin/btrfs") FILES=() {%@@ if profile == "Mirkwood" @@%} -HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs encrypt fsck) +HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesystems btrfs encrypt fsck) {%@@ elif profile == 'Moria' @@%} #HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs encrypt fsck) -HOOKS=(base udev kms keyboard autodetect modconf block netconf dropbear encryptssh filesystems btrfs fsck) +HOOKS=(base udev kms keyboard autodetect microcode modconf block netconf dropbear encryptssh filesystems btrfs fsck) {%@@ endif @@%} diff --git a/root/etc/mkinitcpio.d/linux-lts.preset b/root/etc/mkinitcpio.d/linux-lts.preset index c769f93c..3957588c 100644 --- a/root/etc/mkinitcpio.d/linux-lts.preset +++ b/root/etc/mkinitcpio.d/linux-lts.preset @@ -2,7 +2,6 @@ PRESETS=('default') ALL_config="/etc/mkinitcpio.conf" ALL_kver="/boot/vmlinuz-linux-lts" -ALL_microcode=(/boot/*-ucode.img) default_image="/boot/initramfs-linux-lts.img" default_uki="/boot/EFI/Linux/archlinux-linux-lts.efi" diff --git a/root/etc/mkinitcpio.d/linux.preset b/root/etc/mkinitcpio.d/linux.preset index 6c83b24f..f7b29ac9 100644 --- a/root/etc/mkinitcpio.d/linux.preset +++ b/root/etc/mkinitcpio.d/linux.preset @@ -2,7 +2,6 @@ PRESETS=('default') ALL_config="/etc/mkinitcpio.conf" ALL_kver="/boot/vmlinuz-linux" -ALL_microcode=(/boot/*-ucode.img) default_image="/boot/initramfs-linux.img" default_uki="/boot/EFI/Linux/archlinux-linux.efi" From b433d22bfe2511a6a0ed5ee2b62555f4483f8dee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Mar 2024 17:36:08 +0200 Subject: [PATCH 2325/2667] Add new locales --- root/etc/locale.gen | 2 ++ 1 file changed, 2 insertions(+) diff --git a/root/etc/locale.gen b/root/etc/locale.gen index 91085b8d..062fc4cf 100755 --- a/root/etc/locale.gen +++ b/root/etc/locale.gen @@ -1,2 +1,4 @@ en_US.UTF-8 UTF-8 en_XX.UTF-8@POSIX UTF-8 +fi_FI.UTF-8 UTF-8 +th_TH.UTF-8 UTF-8 From 40a8b3b9f115a25f1fd5161c3b97c3ac299048c8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Mar 2024 17:36:08 +0200 Subject: [PATCH 2326/2667] Add new locales --- root/etc/locale.gen | 2 ++ 1 file changed, 2 insertions(+) diff --git a/root/etc/locale.gen b/root/etc/locale.gen index 91085b8d..062fc4cf 100755 --- a/root/etc/locale.gen +++ b/root/etc/locale.gen @@ -1,2 +1,4 @@ en_US.UTF-8 UTF-8 en_XX.UTF-8@POSIX UTF-8 +fi_FI.UTF-8 UTF-8 +th_TH.UTF-8 UTF-8 From fd1103f45bc6e920d7a0079678416614ea13a0e9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 8 Mar 2024 16:12:47 +0200 Subject: [PATCH 2327/2667] Nvim: update tab settings --- home/.config/nvim/lua/settings.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 21578300..c4953c1e 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -45,5 +45,7 @@ g.mapleader = " " -- Indentation settings o.tabstop = 4 +o.softtabstop = -1 +o.expandtab = true o.shiftwidth = 4 o.smartindent = true From 4ac75462029d57c6172e6899a462725c4b26549e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 8 Mar 2024 16:12:47 +0200 Subject: [PATCH 2328/2667] Nvim: update tab settings --- home/.config/nvim/lua/settings.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 21578300..c4953c1e 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -45,5 +45,7 @@ g.mapleader = " " -- Indentation settings o.tabstop = 4 +o.softtabstop = -1 +o.expandtab = true o.shiftwidth = 4 o.smartindent = true From e53d504a94332478c5f4fe8b58983e3f1522116b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 8 Mar 2024 16:12:58 +0200 Subject: [PATCH 2329/2667] Nvim: Ignore unused import in tsserver --- home/.config/nvim/lua/plugins/mason.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 68d3b736..b44ff6e3 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -38,6 +38,7 @@ return { diagnostics = { ignoredCodes = { 6133, -- Unused variable + 6192, -- Unused import }, }, }, From ae2bfbbe3147e40d9056de8a17da8f6244d7f91f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 8 Mar 2024 16:12:58 +0200 Subject: [PATCH 2330/2667] Nvim: Ignore unused import in tsserver --- home/.config/nvim/lua/plugins/mason.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 68d3b736..b44ff6e3 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -38,6 +38,7 @@ return { diagnostics = { ignoredCodes = { 6133, -- Unused variable + 6192, -- Unused import }, }, }, From 3e13fb2b6765941b441f88b0279fd370765d60b0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 8 Mar 2024 16:19:33 +0200 Subject: [PATCH 2331/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 40 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 70820043..1e657f14 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" }, + "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, - "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, + "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -16,51 +16,51 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "a133a7deed7431496d8e87e8e4cc9c09a9d78945" }, - "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, + "dropbar.nvim": { "branch": "master", "commit": "c32ce3f1d9c7a011df0013ccea1ed0e3396df6a5" }, + "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, - "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, - "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, + "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" }, "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, - "mini.nvim": { "branch": "main", "commit": "f24747266a047617d06605a2316aa6c071662fa2" }, + "mini.nvim": { "branch": "main", "commit": "455bb7d9298690dd9546191afd5b7e380d5e8009" }, "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "c1ee08053439f6b9ded71a0a44c6275da3bdf109" }, + "nui.nvim": { "branch": "main", "commit": "756c59f46057cd2d43619cd3a6d4e01b2aa60295" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "0d1d123339205e5a0bd51191ebd37afee464a34d" }, "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" }, "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, - "nvim-jdtls": { "branch": "master", "commit": "382b9f625861f47d95876bcfb4c261f3b96077cb" }, + "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "9553725789be682ecd945a527ec552e489ea8534" }, + "nvim-lspconfig": { "branch": "master", "commit": "94cf4adb81158817520e18d2174963d8e1424df9" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "d52fdeb0a300ac42b9cfa65ae0600a299f8e8677" }, - "nvim-treesitter": { "branch": "master", "commit": "c2a265156d5799adbd9f9e7d5385735fa5d21776" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "95933e762e28f9d38b572d65e7e4da9d2f4d90cb" }, + "nvim-tree.lua": { "branch": "master", "commit": "efafd73efa9bc8c26282aed563ba0f01c7465b06" }, + "nvim-treesitter": { "branch": "master", "commit": "57205313dda0ac82ac69e21d5e2a80f3297c14cc" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "b7a0bfa3e93697ca5b61b15df633404bf8f45883" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "239ae620d818ffa1319ca3056546df71906d4bfb" }, - "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" }, + "nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, + "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "5f5fc3aa75e9fc824d4fbbb5de31f172b43f620d" }, + "telescope.nvim": { "branch": "master", "commit": "7472420f8734c710bd7009081cef9b97f08a3821" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "2e88f14a585c014691904ba8fe39e6ea851c9422" }, + "vim-fugitive": { "branch": "master", "commit": "41beedabc7e948c787ea5696e04c3544c3674e23" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From ec9d9e373be5c9cc9dbcd0daed3a1c4017ddb481 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 8 Mar 2024 16:19:33 +0200 Subject: [PATCH 2332/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 40 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 70820043..1e657f14 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" }, + "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, - "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, + "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -16,51 +16,51 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "a133a7deed7431496d8e87e8e4cc9c09a9d78945" }, - "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, + "dropbar.nvim": { "branch": "master", "commit": "c32ce3f1d9c7a011df0013ccea1ed0e3396df6a5" }, + "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, - "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, - "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, + "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" }, "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, - "mini.nvim": { "branch": "main", "commit": "f24747266a047617d06605a2316aa6c071662fa2" }, + "mini.nvim": { "branch": "main", "commit": "455bb7d9298690dd9546191afd5b7e380d5e8009" }, "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "c1ee08053439f6b9ded71a0a44c6275da3bdf109" }, + "nui.nvim": { "branch": "main", "commit": "756c59f46057cd2d43619cd3a6d4e01b2aa60295" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "0d1d123339205e5a0bd51191ebd37afee464a34d" }, "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" }, "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, - "nvim-jdtls": { "branch": "master", "commit": "382b9f625861f47d95876bcfb4c261f3b96077cb" }, + "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "9553725789be682ecd945a527ec552e489ea8534" }, + "nvim-lspconfig": { "branch": "master", "commit": "94cf4adb81158817520e18d2174963d8e1424df9" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "d52fdeb0a300ac42b9cfa65ae0600a299f8e8677" }, - "nvim-treesitter": { "branch": "master", "commit": "c2a265156d5799adbd9f9e7d5385735fa5d21776" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "95933e762e28f9d38b572d65e7e4da9d2f4d90cb" }, + "nvim-tree.lua": { "branch": "master", "commit": "efafd73efa9bc8c26282aed563ba0f01c7465b06" }, + "nvim-treesitter": { "branch": "master", "commit": "57205313dda0ac82ac69e21d5e2a80f3297c14cc" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "b7a0bfa3e93697ca5b61b15df633404bf8f45883" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "239ae620d818ffa1319ca3056546df71906d4bfb" }, - "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" }, + "nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, + "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "5f5fc3aa75e9fc824d4fbbb5de31f172b43f620d" }, + "telescope.nvim": { "branch": "master", "commit": "7472420f8734c710bd7009081cef9b97f08a3821" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "2e88f14a585c014691904ba8fe39e6ea851c9422" }, + "vim-fugitive": { "branch": "master", "commit": "41beedabc7e948c787ea5696e04c3544c3674e23" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From c5ae7d9063f1db40fdf14b79f6f0dd25d9fab06f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 09:47:21 +0200 Subject: [PATCH 2333/2667] nvim: add MasonUpdateAll and lockfile --- home/.config/nvim/lazy-lock.json | 92 ++++++++++++------------- home/.config/nvim/lua/plugins/mason.lua | 10 ++- home/.config/nvim/mason-lock.json | 5 ++ home/.config/zsh/04-aliases.zsh | 2 +- 4 files changed, 61 insertions(+), 48 deletions(-) create mode 100644 home/.config/nvim/mason-lock.json diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 1e657f14..00054e85 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" }, - "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, - "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, + "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, + "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -12,55 +12,55 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, + "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "c32ce3f1d9c7a011df0013ccea1ed0e3396df6a5" }, - "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, - "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, - "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, - "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, - "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, - "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, - "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" }, - "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" }, - "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, - "mini.nvim": { "branch": "main", "commit": "455bb7d9298690dd9546191afd5b7e380d5e8009" }, - "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, - "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, - "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "756c59f46057cd2d43619cd3a6d4e01b2aa60295" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "0d1d123339205e5a0bd51191ebd37afee464a34d" }, - "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, - "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, + "dropbar.nvim": { "branch": "master", "commit": "4516fdf6bf64f7d5719665b4d446cc49d656bd96" }, + "firenvim": { "branch": "master", "commit": "1acdf0270bdd9b83a876a15c99dca3c9b40fbaa5" }, + "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, + "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, + "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, + "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" }, + "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, + "mason-lock.nvim": { "branch": "main", "commit": "4fb91ae8cbd85b7c6fa56f823231edfded07f17a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, + "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, + "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" }, + "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, + "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, + "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, + "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" }, - "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, - "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, + "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, + "nvim-dap-ui": { "branch": "master", "commit": "0b4816e5ad5f3219e8e3ec9cce07f61b770c1974" }, + "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "94cf4adb81158817520e18d2174963d8e1424df9" }, - "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "efafd73efa9bc8c26282aed563ba0f01c7465b06" }, - "nvim-treesitter": { "branch": "master", "commit": "57205313dda0ac82ac69e21d5e2a80f3297c14cc" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "b7a0bfa3e93697ca5b61b15df633404bf8f45883" }, - "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-ufo": { "branch": "main", "commit": "239ae620d818ffa1319ca3056546df71906d4bfb" }, - "nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" }, - "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, + "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, + "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, + "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, + "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, + "nvim-ufo": { "branch": "main", "commit": "95a148d9b3c02facce59c2050fd20fa6e8eb2cb6" }, + "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, + "password-store": { "branch": "master", "commit": "1078f2514d579178d5df7042c6a790e9c9b731ad" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, - "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, + "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, + "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "7472420f8734c710bd7009081cef9b97f08a3821" }, + "telescope.nvim": { "branch": "master", "commit": "e54fbf4ab2b64640b639b75c006c23b4bc51c86f" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "41beedabc7e948c787ea5696e04c3544c3674e23" }, - "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } + "vim-fugitive": { "branch": "master", "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" }, + "vim-gnupg": { "branch": "main", "commit": "6d106fa49df3d8c1e63fac8eb64b4a0174f7e83f" }, + "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } } \ No newline at end of file diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index b44ff6e3..d54895e0 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -6,7 +6,15 @@ return { dependencies = { "neovim/nvim-lspconfig", "williamboman/mason-lspconfig.nvim", - "WhoIsSethDaniel/mason-tool-installer.nvim", + -- Add MasonUpdateAll + { "Zeioth/mason-extra-cmds", config = true }, + -- Add lockfile support + { + "zapling/mason-lock.nvim", + opts = { + lockfile_path = vim.fn.expand("~/.config/nvim/mason-lock.json"), + }, + }, -- Extended functionality for jdtls "mfussenegger/nvim-jdtls", -- Add support for LSP file operations diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json new file mode 100644 index 00000000..3f1d9406 --- /dev/null +++ b/home/.config/nvim/mason-lock.json @@ -0,0 +1,5 @@ +{ + "dockerfile-language-server": "0.11.0", + "lua-language-server": "3.7.4", + "stylua": "v0.20.0" +} \ No newline at end of file diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index f246bb98..7a427ef4 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -209,7 +209,7 @@ update() { plugins() { echo "Updating NeoVim plugins" - nvim --headless -c "Lazy! restore" -c 'TSUpdateSync' -c 'MasonToolsUpdate' -c 'qa' + nvim --headless -c "Lazy! restore" -c 'TSUpdateSync' -c 'MasonUpdateAll' -c 'qa' zinit self-update zinit update -p {%@@ if profile == "Moria" @@%} From f7fb8685dd442c80b1cbc9306660b78a7c8b0cee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 09:47:21 +0200 Subject: [PATCH 2334/2667] nvim: add MasonUpdateAll and lockfile --- home/.config/nvim/lazy-lock.json | 92 ++++++++++++------------- home/.config/nvim/lua/plugins/mason.lua | 10 ++- home/.config/nvim/mason-lock.json | 5 ++ home/.config/zsh/04-aliases.zsh | 2 +- 4 files changed, 61 insertions(+), 48 deletions(-) create mode 100644 home/.config/nvim/mason-lock.json diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 1e657f14..00054e85 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" }, - "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, - "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, + "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, + "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -12,55 +12,55 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, + "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "c32ce3f1d9c7a011df0013ccea1ed0e3396df6a5" }, - "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, - "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, - "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, - "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, - "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, - "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, - "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" }, - "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" }, - "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, - "mini.nvim": { "branch": "main", "commit": "455bb7d9298690dd9546191afd5b7e380d5e8009" }, - "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, - "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, - "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "756c59f46057cd2d43619cd3a6d4e01b2aa60295" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "0d1d123339205e5a0bd51191ebd37afee464a34d" }, - "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, - "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, + "dropbar.nvim": { "branch": "master", "commit": "4516fdf6bf64f7d5719665b4d446cc49d656bd96" }, + "firenvim": { "branch": "master", "commit": "1acdf0270bdd9b83a876a15c99dca3c9b40fbaa5" }, + "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, + "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, + "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, + "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" }, + "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, + "mason-lock.nvim": { "branch": "main", "commit": "4fb91ae8cbd85b7c6fa56f823231edfded07f17a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, + "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, + "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" }, + "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, + "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, + "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, + "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" }, - "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, - "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, + "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, + "nvim-dap-ui": { "branch": "master", "commit": "0b4816e5ad5f3219e8e3ec9cce07f61b770c1974" }, + "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "94cf4adb81158817520e18d2174963d8e1424df9" }, - "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "efafd73efa9bc8c26282aed563ba0f01c7465b06" }, - "nvim-treesitter": { "branch": "master", "commit": "57205313dda0ac82ac69e21d5e2a80f3297c14cc" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "b7a0bfa3e93697ca5b61b15df633404bf8f45883" }, - "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-ufo": { "branch": "main", "commit": "239ae620d818ffa1319ca3056546df71906d4bfb" }, - "nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" }, - "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, + "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, + "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, + "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, + "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, + "nvim-ufo": { "branch": "main", "commit": "95a148d9b3c02facce59c2050fd20fa6e8eb2cb6" }, + "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, + "password-store": { "branch": "master", "commit": "1078f2514d579178d5df7042c6a790e9c9b731ad" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, - "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, + "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, + "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "7472420f8734c710bd7009081cef9b97f08a3821" }, + "telescope.nvim": { "branch": "master", "commit": "e54fbf4ab2b64640b639b75c006c23b4bc51c86f" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "41beedabc7e948c787ea5696e04c3544c3674e23" }, - "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } + "vim-fugitive": { "branch": "master", "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" }, + "vim-gnupg": { "branch": "main", "commit": "6d106fa49df3d8c1e63fac8eb64b4a0174f7e83f" }, + "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } } \ No newline at end of file diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index b44ff6e3..d54895e0 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -6,7 +6,15 @@ return { dependencies = { "neovim/nvim-lspconfig", "williamboman/mason-lspconfig.nvim", - "WhoIsSethDaniel/mason-tool-installer.nvim", + -- Add MasonUpdateAll + { "Zeioth/mason-extra-cmds", config = true }, + -- Add lockfile support + { + "zapling/mason-lock.nvim", + opts = { + lockfile_path = vim.fn.expand("~/.config/nvim/mason-lock.json"), + }, + }, -- Extended functionality for jdtls "mfussenegger/nvim-jdtls", -- Add support for LSP file operations diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json new file mode 100644 index 00000000..3f1d9406 --- /dev/null +++ b/home/.config/nvim/mason-lock.json @@ -0,0 +1,5 @@ +{ + "dockerfile-language-server": "0.11.0", + "lua-language-server": "3.7.4", + "stylua": "v0.20.0" +} \ No newline at end of file diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index f246bb98..7a427ef4 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -209,7 +209,7 @@ update() { plugins() { echo "Updating NeoVim plugins" - nvim --headless -c "Lazy! restore" -c 'TSUpdateSync' -c 'MasonToolsUpdate' -c 'qa' + nvim --headless -c "Lazy! restore" -c 'TSUpdateSync' -c 'MasonUpdateAll' -c 'qa' zinit self-update zinit update -p {%@@ if profile == "Moria" @@%} From 46530854fe0b68a1e80f5f34657014f1bb75b89b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 09:53:38 +0200 Subject: [PATCH 2335/2667] nvim: read lockfiles directly from dotfile repo --- config.toml | 1 + home/.config/nvim/init.lua | 2 +- home/.config/nvim/lua/plugins/mason.lua | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config.toml b/config.toml index 0ad64c13..2f007d3a 100644 --- a/config.toml +++ b/config.toml @@ -37,6 +37,7 @@ src = ".config/imapnotify" dst = "~/.config/nvim" src = ".config/nvim" actions = ["kanagawa-compile"] +instignore = ["*-lock.json"] [dotfiles.d_rofi] dst = "~/.config/rofi" diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index a8e93aa0..ff8ce68f 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -17,7 +17,7 @@ require("neovide") require("highlight_yank") require("lazy").setup({ spec = { import = "plugins" }, - lockfile = "~/.config/nvim/lazy-lock.json", + lockfile = "~/git/dotfiles/home/.config/nvim/lazy-lock.json", performance = { disabled_plugins = { "netrwPlugin" }, }, diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index d54895e0..8e8c6693 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -12,7 +12,7 @@ return { { "zapling/mason-lock.nvim", opts = { - lockfile_path = vim.fn.expand("~/.config/nvim/mason-lock.json"), + lockfile_path = vim.fn.expand("~/git/dotfiles/home/.config/nvim/mason-lock.json"), }, }, -- Extended functionality for jdtls From 7ba056c4624491c41e0a3dce52d2efdb5ff456e8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 09:53:38 +0200 Subject: [PATCH 2336/2667] nvim: read lockfiles directly from dotfile repo --- config.toml | 1 + home/.config/nvim/init.lua | 2 +- home/.config/nvim/lua/plugins/mason.lua | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config.toml b/config.toml index 0ad64c13..2f007d3a 100644 --- a/config.toml +++ b/config.toml @@ -37,6 +37,7 @@ src = ".config/imapnotify" dst = "~/.config/nvim" src = ".config/nvim" actions = ["kanagawa-compile"] +instignore = ["*-lock.json"] [dotfiles.d_rofi] dst = "~/.config/rofi" diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index a8e93aa0..ff8ce68f 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -17,7 +17,7 @@ require("neovide") require("highlight_yank") require("lazy").setup({ spec = { import = "plugins" }, - lockfile = "~/.config/nvim/lazy-lock.json", + lockfile = "~/git/dotfiles/home/.config/nvim/lazy-lock.json", performance = { disabled_plugins = { "netrwPlugin" }, }, diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index d54895e0..8e8c6693 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -12,7 +12,7 @@ return { { "zapling/mason-lock.nvim", opts = { - lockfile_path = vim.fn.expand("~/.config/nvim/mason-lock.json"), + lockfile_path = vim.fn.expand("~/git/dotfiles/home/.config/nvim/mason-lock.json"), }, }, -- Extended functionality for jdtls From 80f862dcb9160e01fcdec5f450387f9e6c4f8218 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 09:54:32 +0200 Subject: [PATCH 2337/2667] nvim: update instead of restore --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 7a427ef4..dc993979 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -209,7 +209,7 @@ update() { plugins() { echo "Updating NeoVim plugins" - nvim --headless -c "Lazy! restore" -c 'TSUpdateSync' -c 'MasonUpdateAll' -c 'qa' + nvim --headless -c "Lazy! update" -c 'TSUpdateSync' -c 'MasonUpdateAll' -c 'qa' zinit self-update zinit update -p {%@@ if profile == "Moria" @@%} From 90053ea7a486d19dcb7628af394d179802a950c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 09:54:32 +0200 Subject: [PATCH 2338/2667] nvim: update instead of restore --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 7a427ef4..dc993979 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -209,7 +209,7 @@ update() { plugins() { echo "Updating NeoVim plugins" - nvim --headless -c "Lazy! restore" -c 'TSUpdateSync' -c 'MasonUpdateAll' -c 'qa' + nvim --headless -c "Lazy! update" -c 'TSUpdateSync' -c 'MasonUpdateAll' -c 'qa' zinit self-update zinit update -p {%@@ if profile == "Moria" @@%} From 7b0fc6c2d09aee2a86e9e29a2755510552ca38eb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:06:59 +0200 Subject: [PATCH 2339/2667] Remove unused dotfiles from config --- config.toml | 95 +---------------------------------------------------- 1 file changed, 1 insertion(+), 94 deletions(-) diff --git a/config.toml b/config.toml index 2f007d3a..554372fa 100644 --- a/config.toml +++ b/config.toml @@ -25,48 +25,16 @@ src = ".config/systemd/user" dst = "~/.config/mpv" src = ".config/mpv" -[dotfiles.d_neomutt] -dst = "~/.config/neomutt" -src = ".config/neomutt" - -[dotfiles.d_imapnotify] -dst = "~/.config/imapnotify" -src = ".config/imapnotify" - [dotfiles.d_nvim] dst = "~/.config/nvim" src = ".config/nvim" actions = ["kanagawa-compile"] instignore = ["*-lock.json"] -[dotfiles.d_rofi] -dst = "~/.config/rofi" -src = ".config/rofi" - -[dotfiles.d_sway] -dst = "~/.config/sway" -src = ".config/sway" - -[dotfiles.d_waybar] -dst = "~/.config/waybar" -src = ".config/waybar" - -[dotfiles.d_wofi] -src = ".config/wofi" -dst = "~/.config/wofi" - [dotfiles."f_abcde.conf"] dst = "~/.abcde.conf" src = ".abcde.conf" -[dotfiles.f_mbsyncrc] -dst = "~/.mbsyncrc" -src = ".mbsyncrc" - -[dotfiles."f_alacritty.yml"] -dst = "~/.config/alacritty/alacritty.yml" -src = ".config/alacritty/alacritty.yml" - [dotfiles.d_ssh] dst = "~/.ssh" src = ".ssh" @@ -79,38 +47,18 @@ src = ".config/beets/config.yaml" dst = "~/.config/beets/whitelist" src = ".config/beets/whitelist" -[dotfiles.f_bspwmrc] -dst = "~/.config/bspwm/bspwmrc" -src = ".config/bspwm/bspwmrc" - [dotfiles.f_gitconfig] dst = "~/.config/git/config" src = ".config/git/config" -[dotfiles.f_libra_config] -dst = "~/.config/libra/config.toml" -src = ".config/libra/config.toml" - [dotfiles.f_librewolf_overrides] dst = "~/.librewolf/librewolf.overrides.cfg" src = ".librewolf/librewolf.overrides.cfg" -[dotfiles.f_mailcap] -dst = "~/.mailcap" -src = ".mailcap" - [dotfiles."f_makepkg.conf"] dst = "~/.config/pacman/makepkg.conf" src = ".config/pacman/makepkg.conf" -[dotfiles.f_mako_config] -dst = "~/.config/mako/config" -src = ".config/mako/config" - -[dotfiles."f_mimeo_associations.txt"] -dst = "~/.config/mimeo/associations.txt" -src = ".config/mimeo/associations.txt" - [dotfiles."f_mpd.conf"] dst = "~/.config/mpd/mpd.conf" src = ".config/mpd/mpd.conf" @@ -119,10 +67,6 @@ src = ".config/mpd/mpd.conf" dst = "~/.config/mpDris2/mpDris2.conf" src = ".config/mpDris2/mpDris2.conf" -[dotfiles."f_mpdscribble.conf"] -dst = "~/.mpdscribble/mpdscribble.conf" -src = ".mpdscribble/mpdscribble.conf" - [dotfiles.f_ncmpcpp_bindings] dst = "~/.config/ncmpcpp/bindings" src = ".config/ncmpcpp/bindings" @@ -135,34 +79,10 @@ src = ".config/ranger/rc.conf" dst = "~/.config/ranger/commands.py" src = ".config/ranger/commands.py" -[dotfiles."f_redshift.conf"] -dst = "~/.config/redshift/redshift.conf" -src = ".config/redshift/redshift.conf" - -[dotfiles."f_rtv.cfg"] -dst = "~/.config/rtv/rtv.cfg" -src = ".config/rtv/rtv.cfg" - [dotfiles."f_ssh.conf"] dst = "~/.ssh/config" src = ".ssh/config" -[dotfiles."f_steam-native.desktop"] -dst = "~/.local/share/applications/steam-native.desktop" -src = ".local/share/applications/steam-native.desktop" - -[dotfiles."f_tdesktop_lang.strings"] -dst = "~/.config/telegram-desktop/lang.strings" -src = ".config/telegram-desktop/lang.strings" - -[dotfiles.f_youtube-dl_config] -dst = "~/.config/youtube-dl/config" -src = ".config/youtube-dl/config" - -[dotfiles.d_zathura] -dst = "~/.config/zathura" -src = ".config/zathura" - [dotfiles.f_zprofile] dst = "~/.zprofile" src = ".zprofile" @@ -195,10 +115,6 @@ dst = "~/.hushlogin" src = ".config/paru/paru.conf" dst = "~/.config/paru/paru.conf" -[dotfiles.f_msmtp_config] -src = ".config/msmtp/config" -dst = "~/.config/msmtp/config" - [dotfiles."f_foot.ini"] src = ".config/foot/foot.ini" dst = "~/.config/foot/foot.ini" @@ -228,10 +144,6 @@ dst = "~/.config/electron12-flags.conf" src = ".pam_environment" dst = "~/.pam_environment" -[dotfiles.d_wal] -src = ".config/wal" -dst = "~/.config/wal" - [dotfiles."f_dconf.ini"] src = ".config/dconf.ini" dst = "~/.config/dconf.ini" @@ -264,7 +176,6 @@ dotfiles = [ "f_gitconfig", "f_hushlogin", "f_ignore", - "f_mailcap", "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", @@ -273,9 +184,6 @@ dotfiles = [ "f_npmrc", ] -[profiles.email] -dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] - [profiles.media] dotfiles = [ "d_mpv", @@ -288,7 +196,6 @@ dotfiles = [ "f_mpdscribble.conf", "f_ncmpcpp.conf", "f_ncmpcpp_bindings", - "f_youtube-dl_config", ] [profiles.gpg] @@ -300,7 +207,7 @@ dotfiles = [ ] [profiles.Mirkwood] -include = ["pacman", "terminal", "email", "media", "gpg"] +include = ["pacman", "terminal", "media", "gpg"] dotfiles = [ "d_rofi", "f_librewolf_overrides", From 0102e10ef33104e2249970518da93727db408aa7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:06:59 +0200 Subject: [PATCH 2340/2667] Remove unused dotfiles from config --- config.toml | 95 +---------------------------------------------------- 1 file changed, 1 insertion(+), 94 deletions(-) diff --git a/config.toml b/config.toml index 2f007d3a..554372fa 100644 --- a/config.toml +++ b/config.toml @@ -25,48 +25,16 @@ src = ".config/systemd/user" dst = "~/.config/mpv" src = ".config/mpv" -[dotfiles.d_neomutt] -dst = "~/.config/neomutt" -src = ".config/neomutt" - -[dotfiles.d_imapnotify] -dst = "~/.config/imapnotify" -src = ".config/imapnotify" - [dotfiles.d_nvim] dst = "~/.config/nvim" src = ".config/nvim" actions = ["kanagawa-compile"] instignore = ["*-lock.json"] -[dotfiles.d_rofi] -dst = "~/.config/rofi" -src = ".config/rofi" - -[dotfiles.d_sway] -dst = "~/.config/sway" -src = ".config/sway" - -[dotfiles.d_waybar] -dst = "~/.config/waybar" -src = ".config/waybar" - -[dotfiles.d_wofi] -src = ".config/wofi" -dst = "~/.config/wofi" - [dotfiles."f_abcde.conf"] dst = "~/.abcde.conf" src = ".abcde.conf" -[dotfiles.f_mbsyncrc] -dst = "~/.mbsyncrc" -src = ".mbsyncrc" - -[dotfiles."f_alacritty.yml"] -dst = "~/.config/alacritty/alacritty.yml" -src = ".config/alacritty/alacritty.yml" - [dotfiles.d_ssh] dst = "~/.ssh" src = ".ssh" @@ -79,38 +47,18 @@ src = ".config/beets/config.yaml" dst = "~/.config/beets/whitelist" src = ".config/beets/whitelist" -[dotfiles.f_bspwmrc] -dst = "~/.config/bspwm/bspwmrc" -src = ".config/bspwm/bspwmrc" - [dotfiles.f_gitconfig] dst = "~/.config/git/config" src = ".config/git/config" -[dotfiles.f_libra_config] -dst = "~/.config/libra/config.toml" -src = ".config/libra/config.toml" - [dotfiles.f_librewolf_overrides] dst = "~/.librewolf/librewolf.overrides.cfg" src = ".librewolf/librewolf.overrides.cfg" -[dotfiles.f_mailcap] -dst = "~/.mailcap" -src = ".mailcap" - [dotfiles."f_makepkg.conf"] dst = "~/.config/pacman/makepkg.conf" src = ".config/pacman/makepkg.conf" -[dotfiles.f_mako_config] -dst = "~/.config/mako/config" -src = ".config/mako/config" - -[dotfiles."f_mimeo_associations.txt"] -dst = "~/.config/mimeo/associations.txt" -src = ".config/mimeo/associations.txt" - [dotfiles."f_mpd.conf"] dst = "~/.config/mpd/mpd.conf" src = ".config/mpd/mpd.conf" @@ -119,10 +67,6 @@ src = ".config/mpd/mpd.conf" dst = "~/.config/mpDris2/mpDris2.conf" src = ".config/mpDris2/mpDris2.conf" -[dotfiles."f_mpdscribble.conf"] -dst = "~/.mpdscribble/mpdscribble.conf" -src = ".mpdscribble/mpdscribble.conf" - [dotfiles.f_ncmpcpp_bindings] dst = "~/.config/ncmpcpp/bindings" src = ".config/ncmpcpp/bindings" @@ -135,34 +79,10 @@ src = ".config/ranger/rc.conf" dst = "~/.config/ranger/commands.py" src = ".config/ranger/commands.py" -[dotfiles."f_redshift.conf"] -dst = "~/.config/redshift/redshift.conf" -src = ".config/redshift/redshift.conf" - -[dotfiles."f_rtv.cfg"] -dst = "~/.config/rtv/rtv.cfg" -src = ".config/rtv/rtv.cfg" - [dotfiles."f_ssh.conf"] dst = "~/.ssh/config" src = ".ssh/config" -[dotfiles."f_steam-native.desktop"] -dst = "~/.local/share/applications/steam-native.desktop" -src = ".local/share/applications/steam-native.desktop" - -[dotfiles."f_tdesktop_lang.strings"] -dst = "~/.config/telegram-desktop/lang.strings" -src = ".config/telegram-desktop/lang.strings" - -[dotfiles.f_youtube-dl_config] -dst = "~/.config/youtube-dl/config" -src = ".config/youtube-dl/config" - -[dotfiles.d_zathura] -dst = "~/.config/zathura" -src = ".config/zathura" - [dotfiles.f_zprofile] dst = "~/.zprofile" src = ".zprofile" @@ -195,10 +115,6 @@ dst = "~/.hushlogin" src = ".config/paru/paru.conf" dst = "~/.config/paru/paru.conf" -[dotfiles.f_msmtp_config] -src = ".config/msmtp/config" -dst = "~/.config/msmtp/config" - [dotfiles."f_foot.ini"] src = ".config/foot/foot.ini" dst = "~/.config/foot/foot.ini" @@ -228,10 +144,6 @@ dst = "~/.config/electron12-flags.conf" src = ".pam_environment" dst = "~/.pam_environment" -[dotfiles.d_wal] -src = ".config/wal" -dst = "~/.config/wal" - [dotfiles."f_dconf.ini"] src = ".config/dconf.ini" dst = "~/.config/dconf.ini" @@ -264,7 +176,6 @@ dotfiles = [ "f_gitconfig", "f_hushlogin", "f_ignore", - "f_mailcap", "f_ranger.conf", "f_ranger_commands.py", "f_rtv.cfg", @@ -273,9 +184,6 @@ dotfiles = [ "f_npmrc", ] -[profiles.email] -dotfiles = ["d_neomutt", "d_imapnotify", "f_mbsyncrc", "f_msmtp_config"] - [profiles.media] dotfiles = [ "d_mpv", @@ -288,7 +196,6 @@ dotfiles = [ "f_mpdscribble.conf", "f_ncmpcpp.conf", "f_ncmpcpp_bindings", - "f_youtube-dl_config", ] [profiles.gpg] @@ -300,7 +207,7 @@ dotfiles = [ ] [profiles.Mirkwood] -include = ["pacman", "terminal", "email", "media", "gpg"] +include = ["pacman", "terminal", "media", "gpg"] dotfiles = [ "d_rofi", "f_librewolf_overrides", From 734f5a5d5ae35bedc0d4808a335a9ece7b8cdddd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:49:08 +0200 Subject: [PATCH 2341/2667] Add cachyos repos and kernel --- config-root.toml | 10 +++++----- root/etc/mkinitcpio.d/linux-cachyos.preset | 7 +++++++ root/etc/pacman.conf | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 root/etc/mkinitcpio.d/linux-cachyos.preset diff --git a/config-root.toml b/config-root.toml index c345beec..9c273580 100644 --- a/config-root.toml +++ b/config-root.toml @@ -143,9 +143,9 @@ dst = "/etc/pacserve/pacserve.service.conf" src = "etc/mkinitcpio.d/linux.preset" dst = "/etc/mkinitcpio.d/linux.preset" -[dotfiles."f_mkinitcpio_linux-lts.preset"] -src = "etc/mkinitcpio.d/linux-lts.preset" -dst = "/etc/mkinitcpio.d/linux-lts.preset" +[dotfiles."f_mkinitcpio_linux-cachyos.preset"] +src = "etc/mkinitcpio.d/linux-cachyos.preset" +dst = "/etc/mkinitcpio.d/linux-cachyos.preset" [dotfiles.f_cmdline] src = "etc/kernel/cmdline" @@ -196,7 +196,7 @@ dotfiles = [ "f_logind.conf", "f_mkinitcpio.conf", "f_mkinitcpio_linux.preset", - "f_mkinitcpio_linux-lts.preset", + "f_mkinitcpio_linux-cachyos.preset", "f_plymouthd.conf", "f_sshd_config", "f_system.conf", @@ -216,7 +216,7 @@ dotfiles = [ "f_adb.service", "f_mkinitcpio.conf", "f_mkinitcpio_linux.preset", - "f_mkinitcpio_linux-lts.preset", + "f_mkinitcpio_linux-cachyos.preset", "f_plymouthd.conf", "f_sshd_config", "f_flexo.toml", diff --git a/root/etc/mkinitcpio.d/linux-cachyos.preset b/root/etc/mkinitcpio.d/linux-cachyos.preset new file mode 100644 index 00000000..a5aaab2d --- /dev/null +++ b/root/etc/mkinitcpio.d/linux-cachyos.preset @@ -0,0 +1,7 @@ +PRESETS=('default') + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux-cachyos" + +default_image="/boot/initramfs-linux-cachyos.img" +default_uki="/boot/EFI/Linux/archlinux-linux-cachyos.efi" diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 249cd2a9..569afd7c 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -13,6 +13,22 @@ CleanMethod=KeepCurrent CacheDir= /var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} +[cachyos-v3] +Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/cachyos-v3-mirrorlist + +[cachyos-core-v3] +Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/cachyos-v3-mirrorlist + +[cachyos-extra-v3] +Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/cachyos-v3-mirrorlist + +[cachyos] +Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/cachyos-mirrorlist + [core] Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist From b682fe72aa339bb507f445b07104369b123e8710 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:49:08 +0200 Subject: [PATCH 2342/2667] Add cachyos repos and kernel --- config-root.toml | 10 +++++----- root/etc/mkinitcpio.d/linux-cachyos.preset | 7 +++++++ root/etc/pacman.conf | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 root/etc/mkinitcpio.d/linux-cachyos.preset diff --git a/config-root.toml b/config-root.toml index c345beec..9c273580 100644 --- a/config-root.toml +++ b/config-root.toml @@ -143,9 +143,9 @@ dst = "/etc/pacserve/pacserve.service.conf" src = "etc/mkinitcpio.d/linux.preset" dst = "/etc/mkinitcpio.d/linux.preset" -[dotfiles."f_mkinitcpio_linux-lts.preset"] -src = "etc/mkinitcpio.d/linux-lts.preset" -dst = "/etc/mkinitcpio.d/linux-lts.preset" +[dotfiles."f_mkinitcpio_linux-cachyos.preset"] +src = "etc/mkinitcpio.d/linux-cachyos.preset" +dst = "/etc/mkinitcpio.d/linux-cachyos.preset" [dotfiles.f_cmdline] src = "etc/kernel/cmdline" @@ -196,7 +196,7 @@ dotfiles = [ "f_logind.conf", "f_mkinitcpio.conf", "f_mkinitcpio_linux.preset", - "f_mkinitcpio_linux-lts.preset", + "f_mkinitcpio_linux-cachyos.preset", "f_plymouthd.conf", "f_sshd_config", "f_system.conf", @@ -216,7 +216,7 @@ dotfiles = [ "f_adb.service", "f_mkinitcpio.conf", "f_mkinitcpio_linux.preset", - "f_mkinitcpio_linux-lts.preset", + "f_mkinitcpio_linux-cachyos.preset", "f_plymouthd.conf", "f_sshd_config", "f_flexo.toml", diff --git a/root/etc/mkinitcpio.d/linux-cachyos.preset b/root/etc/mkinitcpio.d/linux-cachyos.preset new file mode 100644 index 00000000..a5aaab2d --- /dev/null +++ b/root/etc/mkinitcpio.d/linux-cachyos.preset @@ -0,0 +1,7 @@ +PRESETS=('default') + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux-cachyos" + +default_image="/boot/initramfs-linux-cachyos.img" +default_uki="/boot/EFI/Linux/archlinux-linux-cachyos.efi" diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 249cd2a9..569afd7c 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -13,6 +13,22 @@ CleanMethod=KeepCurrent CacheDir= /var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} +[cachyos-v3] +Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/cachyos-v3-mirrorlist + +[cachyos-core-v3] +Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/cachyos-v3-mirrorlist + +[cachyos-extra-v3] +Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/cachyos-v3-mirrorlist + +[cachyos] +Include = /etc/pacman.d/pacserve +Include = /etc/pacman.d/cachyos-mirrorlist + [core] Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist From 4a57c108a22724076e14ae2fc0026f24c15a1a8a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:49:28 +0200 Subject: [PATCH 2343/2667] Nvim: update plugins --- home/.config/nvim/lazy-lock.json | 90 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 3 +- 2 files changed, 47 insertions(+), 46 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 00054e85..a92e2deb 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, - "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, - "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" }, + "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" }, + "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, + "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -13,54 +13,54 @@ "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, + "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "4516fdf6bf64f7d5719665b4d446cc49d656bd96" }, - "firenvim": { "branch": "master", "commit": "1acdf0270bdd9b83a876a15c99dca3c9b40fbaa5" }, - "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, - "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, - "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, - "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, - "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" }, + "dropbar.nvim": { "branch": "master", "commit": "f1034cfe852cf62a0ebb12ae583f1477ea07e060" }, + "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, + "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, + "gitsigns.nvim": { "branch": "main", "commit": "4e348641b8206c3b8d23080999e3ddbe4ca90efc" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, + "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, + "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, + "lualine.nvim": { "branch": "master", "commit": "af4c3cf17206810880d2a93562e0a4c0d901c684" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "4fb91ae8cbd85b7c6fa56f823231edfded07f17a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, - "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" }, - "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, - "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, - "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, - "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "82c7cb08ddb836ad938b2708e50085f12a8825d2" }, + "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, + "mini.nvim": { "branch": "main", "commit": "9968f6e221ae7bdac57a910c5bf2026186aa023c" }, + "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, + "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, + "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, + "nui.nvim": { "branch": "main", "commit": "3dc46d725f7b94bee5117c0a699b57b1902b5d65" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "b42f326af4718cade583d8bd60af22010224d91e" }, + "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, - "nvim-dap-ui": { "branch": "master", "commit": "0b4816e5ad5f3219e8e3ec9cce07f61b770c1974" }, - "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, + "nvim-dap": { "branch": "master", "commit": "c43c2473ecb482a9d91f32c1d4c0098fffad3c7d" }, + "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, + "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, - "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, - "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, - "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, - "nvim-ufo": { "branch": "main", "commit": "95a148d9b3c02facce59c2050fd20fa6e8eb2cb6" }, - "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, - "password-store": { "branch": "master", "commit": "1078f2514d579178d5df7042c6a790e9c9b731ad" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "nvim-lspconfig": { "branch": "master", "commit": "1f3ef31d1bb967050c81420ca921a1a2ade10e77" }, + "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, + "nvim-tree.lua": { "branch": "master", "commit": "f7c09bd72e50e1795bd3afb9e2a2b157b4bfb3c3" }, + "nvim-treesitter": { "branch": "master", "commit": "143ca5ce17ae21233101246b5785b90d53aa8329" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" }, + "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, + "nvim-ufo": { "branch": "main", "commit": "2296dbb8939c4050c222f4eb24889540ef8acd76" }, + "nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" }, + "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, + "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, - "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, - "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, + "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, + "suda.vim": { "branch": "master", "commit": "66727b416837836712975e748bc8a19fb6cf4ec3" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "e54fbf4ab2b64640b639b75c006c23b4bc51c86f" }, + "telescope.nvim": { "branch": "master", "commit": "e9e01d699843af530ef4ad2c8679a7e273bb3dd1" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" }, - "vim-gnupg": { "branch": "main", "commit": "6d106fa49df3d8c1e63fac8eb64b4a0174f7e83f" }, - "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } + "vim-fugitive": { "branch": "master", "commit": "8d4e8d45385c63a0bf735fe1164772116bf0da0d" }, + "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 3f1d9406..be20bf39 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,5 +1,6 @@ { "dockerfile-language-server": "0.11.0", "lua-language-server": "3.7.4", - "stylua": "v0.20.0" + "stylua": "v0.20.0", + "taplo": "0.8.1" } \ No newline at end of file From a31b8a77b1c7fb8130f989dad2e329bc39248db0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:49:28 +0200 Subject: [PATCH 2344/2667] Nvim: update plugins --- home/.config/nvim/lazy-lock.json | 90 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 3 +- 2 files changed, 47 insertions(+), 46 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 00054e85..a92e2deb 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, - "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" }, - "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" }, + "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" }, + "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, + "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -13,54 +13,54 @@ "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, + "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "4516fdf6bf64f7d5719665b4d446cc49d656bd96" }, - "firenvim": { "branch": "master", "commit": "1acdf0270bdd9b83a876a15c99dca3c9b40fbaa5" }, - "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, - "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, - "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, - "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, - "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" }, + "dropbar.nvim": { "branch": "master", "commit": "f1034cfe852cf62a0ebb12ae583f1477ea07e060" }, + "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, + "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, + "gitsigns.nvim": { "branch": "main", "commit": "4e348641b8206c3b8d23080999e3ddbe4ca90efc" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, + "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, + "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, + "lualine.nvim": { "branch": "master", "commit": "af4c3cf17206810880d2a93562e0a4c0d901c684" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "4fb91ae8cbd85b7c6fa56f823231edfded07f17a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, - "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" }, - "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" }, - "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" }, - "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, - "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "82c7cb08ddb836ad938b2708e50085f12a8825d2" }, + "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, + "mini.nvim": { "branch": "main", "commit": "9968f6e221ae7bdac57a910c5bf2026186aa023c" }, + "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, + "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, + "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, + "nui.nvim": { "branch": "main", "commit": "3dc46d725f7b94bee5117c0a699b57b1902b5d65" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "b42f326af4718cade583d8bd60af22010224d91e" }, + "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, - "nvim-dap-ui": { "branch": "master", "commit": "0b4816e5ad5f3219e8e3ec9cce07f61b770c1974" }, - "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, + "nvim-dap": { "branch": "master", "commit": "c43c2473ecb482a9d91f32c1d4c0098fffad3c7d" }, + "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, + "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, - "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, - "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, - "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, - "nvim-ufo": { "branch": "main", "commit": "95a148d9b3c02facce59c2050fd20fa6e8eb2cb6" }, - "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, - "password-store": { "branch": "master", "commit": "1078f2514d579178d5df7042c6a790e9c9b731ad" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "nvim-lspconfig": { "branch": "master", "commit": "1f3ef31d1bb967050c81420ca921a1a2ade10e77" }, + "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, + "nvim-tree.lua": { "branch": "master", "commit": "f7c09bd72e50e1795bd3afb9e2a2b157b4bfb3c3" }, + "nvim-treesitter": { "branch": "master", "commit": "143ca5ce17ae21233101246b5785b90d53aa8329" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" }, + "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, + "nvim-ufo": { "branch": "main", "commit": "2296dbb8939c4050c222f4eb24889540ef8acd76" }, + "nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" }, + "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, + "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, - "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" }, - "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, + "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, + "suda.vim": { "branch": "master", "commit": "66727b416837836712975e748bc8a19fb6cf4ec3" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "e54fbf4ab2b64640b639b75c006c23b4bc51c86f" }, + "telescope.nvim": { "branch": "master", "commit": "e9e01d699843af530ef4ad2c8679a7e273bb3dd1" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" }, - "vim-gnupg": { "branch": "main", "commit": "6d106fa49df3d8c1e63fac8eb64b4a0174f7e83f" }, - "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } + "vim-fugitive": { "branch": "master", "commit": "8d4e8d45385c63a0bf735fe1164772116bf0da0d" }, + "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 3f1d9406..be20bf39 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,5 +1,6 @@ { "dockerfile-language-server": "0.11.0", "lua-language-server": "3.7.4", - "stylua": "v0.20.0" + "stylua": "v0.20.0", + "taplo": "0.8.1" } \ No newline at end of file From 5746b48fd2ed14078d8ce36c436463b5f94e18d2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:49:42 +0200 Subject: [PATCH 2345/2667] Home Assistant: add voice assist --- docker/homeautomation/docker-compose.toml | 98 ++++++++++++++++++----- 1 file changed, 79 insertions(+), 19 deletions(-) diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 185f4ea7..6c50f9c4 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -1,45 +1,105 @@ [volumes] hass = {} -rhasspy = {} mosquitto = {} +piper_english = {} +whisper_english = {} +openwakeword_english = {} [services.home-assistant] container_name = "home-assistant" image = "homeassistant/home-assistant" +restart = "unless-stopped" environment = ["TZ=Europe/Helsinki"] devices = ["/dev/ttyACM0"] volumes = ["hass:/config", "/etc/localtime:/etc/localtime:ro"] -restart = "unless-stopped" networks = ["homeautomation", "postgres", "proxy"] ports = ["8123:8123", "8300:8300"] extra_hosts = ["host.docker.internal:host-gateway"] -depends_on = ["mosquitto"] [services.mosquitto] container_name = "mosquitto" image = "eclipse-mosquitto" +restart = "unless-stopped" environment = ["TZ=Europe/Helsinki"] +networks = ["homeautomation"] ports = ["1883:1883", "8866:8866"] -networks = ["homeautomation"] -volumes = [ - "mosquitto:/mosquitto", - "/etc/localtime:/etc/localtime:ro", -] -restart = "unless-stopped" +volumes = ["mosquitto:/mosquitto", "/etc/localtime:/etc/localtime:ro"] -[services.rhasspy] -container_name = "rhasspy" -image = "rhasspy/rhasspy" -command = "--profile en --user-profiles /profiles" -volumes = ["rhasspy:/profiles"] +[services.piper_english] +container_name = "piper_english" +image = "rhasspy/wyoming-piper" +restart = "unless-stopped" environment = ["TZ=Europe/Helsinki"] -ports = ["12101:12101"] +ports = ["10200:10200"] networks = ["homeautomation"] -restart = "unless-stopped" -depends_on = ["home-assistant"] -devices = ["/dev/snd:/dev/snd"] +command = ["--voice", "en_US-hfc_male-medium"] +volumes = ["piper_english:/data", "/etc/localtime:/etc/localtime:ro"] -[networks] +[services.whisper_english] +container_name = "whisper_english" +image = "rhasspy/wyoming-whisper" +restart = "unless-stopped" +environment = ["TZ=Europe/Helsinki"] +ports = ["10300:10300"] +networks = ["homeautomation"] +depends_on = ["home-assistant"] +command = ["--model", "tiny-int8", "--language", "en"] +volumes = ["whisper_english:/data", "/etc/localtime:/etc/localtime:ro"] + +[services.openwakeword_english] +container_name = "openwakeword_english" +image = "rhasspy/wyoming-openwakeword" +restart = "unless-stopped" +environment = ["TZ=Europe/Helsinki"] +networks = ["homeautomation"] +command = ["--preload-model", "ok_nabu"] +depends_on = ["home-assistant"] +volumes = ["openwakeword_english:/data", "/etc/localtime:/etc/localtime:ro"] + +[services.microphone] +build = "https://github.com/rhasspy/wyoming-mic-external.git" +image = "rhasspy/wyoming-mic-external" +container_name = "microphone" +restart = "unless-stopped" +devices = ["/dev/snd:/dev/snd"] +ports = ["10600:10600"] +group_add = ["audio"] +networks = ["homeautomation"] +command = ["--device", "plughw:CARD=USB,DEV=0", "--debug"] +volumes = ["/etc/localtime:/etc/localtime:ro"] + +[services.speaker] +build = "https://github.com/rhasspy/wyoming-snd-external.git" +image = "rhasspy/wyoming-snd-external" +container_name = "speaker" +restart = "unless-stopped" +devices = ["/dev/snd:/dev/snd"] +ports = ["10601:10601"] +group_add = ["audio"] +networks = ["homeautomation"] +command = ["--device", "iec958:CARD=USB,DEV=0", "--debug"] +volumes = ["/etc/localtime:/etc/localtime:ro"] + +[services.satellite] +build = "https://github.com/rhasspy/wyoming-satellite.git" +image = "rhasspy/wyoming-satellite" +container_name = "satellite" +restart = "unless-stopped" +ports = ["10700:10700"] +networks = ["homeautomation"] +depends_on = ["speaker", "microphone", "whisper_english"] +command = [ + "--name", + "ha-server-satellite", + "--mic-uri", + "tcp://microphone:10600", + "--snd-uri", + "tcp://speaker:10601", + "--wake-uri", + "tcp://openwakeword_english:10400", + "--debug", +] +volumes = ["/etc/localtime:/etc/localtime:ro"] [networks.homeautomation] external = false From 6da6d02aa1ce17d8e4cef7f2c8886be45801cb37 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:49:42 +0200 Subject: [PATCH 2346/2667] Home Assistant: add voice assist --- docker/homeautomation/docker-compose.toml | 98 ++++++++++++++++++----- 1 file changed, 79 insertions(+), 19 deletions(-) diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 185f4ea7..6c50f9c4 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -1,45 +1,105 @@ [volumes] hass = {} -rhasspy = {} mosquitto = {} +piper_english = {} +whisper_english = {} +openwakeword_english = {} [services.home-assistant] container_name = "home-assistant" image = "homeassistant/home-assistant" +restart = "unless-stopped" environment = ["TZ=Europe/Helsinki"] devices = ["/dev/ttyACM0"] volumes = ["hass:/config", "/etc/localtime:/etc/localtime:ro"] -restart = "unless-stopped" networks = ["homeautomation", "postgres", "proxy"] ports = ["8123:8123", "8300:8300"] extra_hosts = ["host.docker.internal:host-gateway"] -depends_on = ["mosquitto"] [services.mosquitto] container_name = "mosquitto" image = "eclipse-mosquitto" +restart = "unless-stopped" environment = ["TZ=Europe/Helsinki"] +networks = ["homeautomation"] ports = ["1883:1883", "8866:8866"] -networks = ["homeautomation"] -volumes = [ - "mosquitto:/mosquitto", - "/etc/localtime:/etc/localtime:ro", -] -restart = "unless-stopped" +volumes = ["mosquitto:/mosquitto", "/etc/localtime:/etc/localtime:ro"] -[services.rhasspy] -container_name = "rhasspy" -image = "rhasspy/rhasspy" -command = "--profile en --user-profiles /profiles" -volumes = ["rhasspy:/profiles"] +[services.piper_english] +container_name = "piper_english" +image = "rhasspy/wyoming-piper" +restart = "unless-stopped" environment = ["TZ=Europe/Helsinki"] -ports = ["12101:12101"] +ports = ["10200:10200"] networks = ["homeautomation"] -restart = "unless-stopped" -depends_on = ["home-assistant"] -devices = ["/dev/snd:/dev/snd"] +command = ["--voice", "en_US-hfc_male-medium"] +volumes = ["piper_english:/data", "/etc/localtime:/etc/localtime:ro"] -[networks] +[services.whisper_english] +container_name = "whisper_english" +image = "rhasspy/wyoming-whisper" +restart = "unless-stopped" +environment = ["TZ=Europe/Helsinki"] +ports = ["10300:10300"] +networks = ["homeautomation"] +depends_on = ["home-assistant"] +command = ["--model", "tiny-int8", "--language", "en"] +volumes = ["whisper_english:/data", "/etc/localtime:/etc/localtime:ro"] + +[services.openwakeword_english] +container_name = "openwakeword_english" +image = "rhasspy/wyoming-openwakeword" +restart = "unless-stopped" +environment = ["TZ=Europe/Helsinki"] +networks = ["homeautomation"] +command = ["--preload-model", "ok_nabu"] +depends_on = ["home-assistant"] +volumes = ["openwakeword_english:/data", "/etc/localtime:/etc/localtime:ro"] + +[services.microphone] +build = "https://github.com/rhasspy/wyoming-mic-external.git" +image = "rhasspy/wyoming-mic-external" +container_name = "microphone" +restart = "unless-stopped" +devices = ["/dev/snd:/dev/snd"] +ports = ["10600:10600"] +group_add = ["audio"] +networks = ["homeautomation"] +command = ["--device", "plughw:CARD=USB,DEV=0", "--debug"] +volumes = ["/etc/localtime:/etc/localtime:ro"] + +[services.speaker] +build = "https://github.com/rhasspy/wyoming-snd-external.git" +image = "rhasspy/wyoming-snd-external" +container_name = "speaker" +restart = "unless-stopped" +devices = ["/dev/snd:/dev/snd"] +ports = ["10601:10601"] +group_add = ["audio"] +networks = ["homeautomation"] +command = ["--device", "iec958:CARD=USB,DEV=0", "--debug"] +volumes = ["/etc/localtime:/etc/localtime:ro"] + +[services.satellite] +build = "https://github.com/rhasspy/wyoming-satellite.git" +image = "rhasspy/wyoming-satellite" +container_name = "satellite" +restart = "unless-stopped" +ports = ["10700:10700"] +networks = ["homeautomation"] +depends_on = ["speaker", "microphone", "whisper_english"] +command = [ + "--name", + "ha-server-satellite", + "--mic-uri", + "tcp://microphone:10600", + "--snd-uri", + "tcp://speaker:10601", + "--wake-uri", + "tcp://openwakeword_english:10400", + "--debug", +] +volumes = ["/etc/localtime:/etc/localtime:ro"] [networks.homeautomation] external = false From 4c680ddd88ad67c8dda569913045e15a9114bb4e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:56:50 +0200 Subject: [PATCH 2347/2667] Nvim: update ufo config --- home/.config/nvim/lua/plugins/ufo.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua index eb756c63..9615f83c 100644 --- a/home/.config/nvim/lua/plugins/ufo.lua +++ b/home/.config/nvim/lua/plugins/ufo.lua @@ -5,8 +5,8 @@ return { dependencies = { "kevinhwang91/promise-async" }, --- @type UfoConfig opts = { - close_fold_kinds = { - "imports", + close_fold_kinds_for_ft = { + default = { "imports" }, }, }, --- @param opts UfoConfig From e987265041a48e5e47fdeecb59547aed085b230c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:56:50 +0200 Subject: [PATCH 2348/2667] Nvim: update ufo config --- home/.config/nvim/lua/plugins/ufo.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua index eb756c63..9615f83c 100644 --- a/home/.config/nvim/lua/plugins/ufo.lua +++ b/home/.config/nvim/lua/plugins/ufo.lua @@ -5,8 +5,8 @@ return { dependencies = { "kevinhwang91/promise-async" }, --- @type UfoConfig opts = { - close_fold_kinds = { - "imports", + close_fold_kinds_for_ft = { + default = { "imports" }, }, }, --- @param opts UfoConfig From 300a7fd4501b4d3a6e92a951bc9af77e59aab2cc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:57:29 +0200 Subject: [PATCH 2349/2667] Remove unused config --- config.toml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config.toml b/config.toml index 554372fa..b6b2c7b5 100644 --- a/config.toml +++ b/config.toml @@ -168,17 +168,14 @@ dotfiles = ["f_makepkg.conf", "f_paru.conf"] [profiles.terminal] dotfiles = [ - "d_wal", "d_nvim", "d_ssh", "d_zsh", - "f_alacritty.yml", "f_gitconfig", "f_hushlogin", "f_ignore", "f_ranger.conf", "f_ranger_commands.py", - "f_rtv.cfg", "f_zellij", "f_zshrc", "f_npmrc", @@ -190,10 +187,8 @@ dotfiles = [ "f_abcde.conf", "f_beets_config", "f_beets_whitelist", - "f_libra_config", "f_mpd.conf", "f_mpdris2.conf", - "f_mpdscribble.conf", "f_ncmpcpp.conf", "f_ncmpcpp_bindings", ] @@ -209,7 +204,6 @@ dotfiles = [ [profiles.Mirkwood] include = ["pacman", "terminal", "media", "gpg"] dotfiles = [ - "d_rofi", "f_librewolf_overrides", "f_dconf.ini", "f_docker-config.json", From 96cfeadd7db43488dfc6acee946a872cdfa26804 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:57:29 +0200 Subject: [PATCH 2350/2667] Remove unused config --- config.toml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config.toml b/config.toml index 554372fa..b6b2c7b5 100644 --- a/config.toml +++ b/config.toml @@ -168,17 +168,14 @@ dotfiles = ["f_makepkg.conf", "f_paru.conf"] [profiles.terminal] dotfiles = [ - "d_wal", "d_nvim", "d_ssh", "d_zsh", - "f_alacritty.yml", "f_gitconfig", "f_hushlogin", "f_ignore", "f_ranger.conf", "f_ranger_commands.py", - "f_rtv.cfg", "f_zellij", "f_zshrc", "f_npmrc", @@ -190,10 +187,8 @@ dotfiles = [ "f_abcde.conf", "f_beets_config", "f_beets_whitelist", - "f_libra_config", "f_mpd.conf", "f_mpdris2.conf", - "f_mpdscribble.conf", "f_ncmpcpp.conf", "f_ncmpcpp_bindings", ] @@ -209,7 +204,6 @@ dotfiles = [ [profiles.Mirkwood] include = ["pacman", "terminal", "media", "gpg"] dotfiles = [ - "d_rofi", "f_librewolf_overrides", "f_dconf.ini", "f_docker-config.json", From 5813fc3d54b261e05c0a5f7c21b845ef5ff075d2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 11:02:57 +0200 Subject: [PATCH 2351/2667] Nvim: add packages to mason-lock --- home/.config/nvim/mason-lock.json | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index be20bf39..99ae74c4 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,6 +1,19 @@ { + "bash-language-server": "5.1.2", + "css-lsp": "4.8.0", + "docker-compose-language-service": "0.2.0", "dockerfile-language-server": "0.11.0", + "eslint-lsp": "4.8.0", + "html-lsp": "4.8.0", + "java-debug-adapter": "0.55.0", + "jdtls": "v1.33.0", + "json-lsp": "4.8.0", + "lemminx": "0.26.1", "lua-language-server": "3.7.4", + "prettier": "3.2.5", + "prettierd": "0.25.2", "stylua": "v0.20.0", - "taplo": "0.8.1" -} \ No newline at end of file + "taplo": "0.8.1", + "typescript-language-server": "4.3.3", + "yaml-language-server": "1.14.0" +} From 03b262f7146cc1683cca2468b3b0eaf327096ad7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 11:02:57 +0200 Subject: [PATCH 2352/2667] Nvim: add packages to mason-lock --- home/.config/nvim/mason-lock.json | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index be20bf39..99ae74c4 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,6 +1,19 @@ { + "bash-language-server": "5.1.2", + "css-lsp": "4.8.0", + "docker-compose-language-service": "0.2.0", "dockerfile-language-server": "0.11.0", + "eslint-lsp": "4.8.0", + "html-lsp": "4.8.0", + "java-debug-adapter": "0.55.0", + "jdtls": "v1.33.0", + "json-lsp": "4.8.0", + "lemminx": "0.26.1", "lua-language-server": "3.7.4", + "prettier": "3.2.5", + "prettierd": "0.25.2", "stylua": "v0.20.0", - "taplo": "0.8.1" -} \ No newline at end of file + "taplo": "0.8.1", + "typescript-language-server": "4.3.3", + "yaml-language-server": "1.14.0" +} From 388d23663c0b7d0a0a0b18b6cf5de3d895e6f6f7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 19 Mar 2024 21:14:20 +0200 Subject: [PATCH 2353/2667] Nvim: add new dep for dapui, update plugins --- home/.config/nvim/lazy-lock.json | 20 +++++++++++--------- home/.config/nvim/lua/plugins/nvim-dap.lua | 6 +++++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index a92e2deb..9c65880e 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -12,13 +12,14 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dropbar.nvim": { "branch": "master", "commit": "f1034cfe852cf62a0ebb12ae583f1477ea07e060" }, "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, - "gitsigns.nvim": { "branch": "main", "commit": "4e348641b8206c3b8d23080999e3ddbe4ca90efc" }, + "gitsigns.nvim": { "branch": "main", "commit": "078041e9d060a386b0c9d3a8c7a7b019a35d3fb0" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, @@ -32,22 +33,23 @@ "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "3dc46d725f7b94bee5117c0a699b57b1902b5d65" }, + "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b42f326af4718cade583d8bd60af22010224d91e" }, - "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, + "nvim-autopairs": { "branch": "master", "commit": "797260ff31e8bdd9db0f0c352659a35aba335b0b" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "c43c2473ecb482a9d91f32c1d4c0098fffad3c7d" }, - "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, + "nvim-dap": { "branch": "master", "commit": "c1695e500c7d552a0a19953a9aefcc89178fb1af" }, + "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "1f3ef31d1bb967050c81420ca921a1a2ade10e77" }, + "nvim-lspconfig": { "branch": "master", "commit": "eb012f03bb3b4aca9e875d146008b923d0e07e65" }, + "nvim-nio": { "branch": "master", "commit": "ed70af8ad9d4dafdb55539ed2b4454aac2a2a0c3" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-tree.lua": { "branch": "master", "commit": "f7c09bd72e50e1795bd3afb9e2a2b157b4bfb3c3" }, - "nvim-treesitter": { "branch": "master", "commit": "143ca5ce17ae21233101246b5785b90d53aa8329" }, + "nvim-treesitter": { "branch": "master", "commit": "567a76780cd4f982dae1ec57e3dad6174bef3680" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-ufo": { "branch": "main", "commit": "2296dbb8939c4050c222f4eb24889540ef8acd76" }, + "nvim-ufo": { "branch": "main", "commit": "c1e8102e4e954e1c46f46cda2587769238e24f16" }, "nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, @@ -57,7 +59,7 @@ "suda.vim": { "branch": "master", "commit": "66727b416837836712975e748bc8a19fb6cf4ec3" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "e9e01d699843af530ef4ad2c8679a7e273bb3dd1" }, + "telescope.nvim": { "branch": "master", "commit": "c816406bd50ade6ec754474f08974154487d417c" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "8d4e8d45385c63a0bf735fe1164772116bf0da0d" }, diff --git a/home/.config/nvim/lua/plugins/nvim-dap.lua b/home/.config/nvim/lua/plugins/nvim-dap.lua index b1357aee..7eb63a51 100644 --- a/home/.config/nvim/lua/plugins/nvim-dap.lua +++ b/home/.config/nvim/lua/plugins/nvim-dap.lua @@ -5,7 +5,11 @@ local masonPkg = vim.fn.stdpath("data") .. "/mason/packages" return { "mfussenegger/nvim-dap", dependencies = { - { "rcarriga/nvim-dap-ui", config = true }, + { + "rcarriga/nvim-dap-ui", + dependencies = { "nvim-neotest/nvim-nio" }, + config = true, + }, }, config = function() local dap = require("dap") From 3b486b15d99c319c4987cf2b29fe90e000b81659 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 19 Mar 2024 21:14:20 +0200 Subject: [PATCH 2354/2667] Nvim: add new dep for dapui, update plugins --- home/.config/nvim/lazy-lock.json | 20 +++++++++++--------- home/.config/nvim/lua/plugins/nvim-dap.lua | 6 +++++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index a92e2deb..9c65880e 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -12,13 +12,14 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dropbar.nvim": { "branch": "master", "commit": "f1034cfe852cf62a0ebb12ae583f1477ea07e060" }, "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, - "gitsigns.nvim": { "branch": "main", "commit": "4e348641b8206c3b8d23080999e3ddbe4ca90efc" }, + "gitsigns.nvim": { "branch": "main", "commit": "078041e9d060a386b0c9d3a8c7a7b019a35d3fb0" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, @@ -32,22 +33,23 @@ "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "3dc46d725f7b94bee5117c0a699b57b1902b5d65" }, + "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "b42f326af4718cade583d8bd60af22010224d91e" }, - "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, + "nvim-autopairs": { "branch": "master", "commit": "797260ff31e8bdd9db0f0c352659a35aba335b0b" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "c43c2473ecb482a9d91f32c1d4c0098fffad3c7d" }, - "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, + "nvim-dap": { "branch": "master", "commit": "c1695e500c7d552a0a19953a9aefcc89178fb1af" }, + "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "1f3ef31d1bb967050c81420ca921a1a2ade10e77" }, + "nvim-lspconfig": { "branch": "master", "commit": "eb012f03bb3b4aca9e875d146008b923d0e07e65" }, + "nvim-nio": { "branch": "master", "commit": "ed70af8ad9d4dafdb55539ed2b4454aac2a2a0c3" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-tree.lua": { "branch": "master", "commit": "f7c09bd72e50e1795bd3afb9e2a2b157b4bfb3c3" }, - "nvim-treesitter": { "branch": "master", "commit": "143ca5ce17ae21233101246b5785b90d53aa8329" }, + "nvim-treesitter": { "branch": "master", "commit": "567a76780cd4f982dae1ec57e3dad6174bef3680" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-ufo": { "branch": "main", "commit": "2296dbb8939c4050c222f4eb24889540ef8acd76" }, + "nvim-ufo": { "branch": "main", "commit": "c1e8102e4e954e1c46f46cda2587769238e24f16" }, "nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, @@ -57,7 +59,7 @@ "suda.vim": { "branch": "master", "commit": "66727b416837836712975e748bc8a19fb6cf4ec3" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "e9e01d699843af530ef4ad2c8679a7e273bb3dd1" }, + "telescope.nvim": { "branch": "master", "commit": "c816406bd50ade6ec754474f08974154487d417c" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "8d4e8d45385c63a0bf735fe1164772116bf0da0d" }, diff --git a/home/.config/nvim/lua/plugins/nvim-dap.lua b/home/.config/nvim/lua/plugins/nvim-dap.lua index b1357aee..7eb63a51 100644 --- a/home/.config/nvim/lua/plugins/nvim-dap.lua +++ b/home/.config/nvim/lua/plugins/nvim-dap.lua @@ -5,7 +5,11 @@ local masonPkg = vim.fn.stdpath("data") .. "/mason/packages" return { "mfussenegger/nvim-dap", dependencies = { - { "rcarriga/nvim-dap-ui", config = true }, + { + "rcarriga/nvim-dap-ui", + dependencies = { "nvim-neotest/nvim-nio" }, + config = true, + }, }, config = function() local dap = require("dap") From 1c47bedc93f2c0f30e6375521b6b691330a89a43 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 19 Mar 2024 21:19:31 +0200 Subject: [PATCH 2355/2667] Nvim: enable nvim-dap plugin for neodev --- home/.config/nvim/lua/plugins/neodev.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/neodev.lua b/home/.config/nvim/lua/plugins/neodev.lua index 4a33ca15..c925081e 100644 --- a/home/.config/nvim/lua/plugins/neodev.lua +++ b/home/.config/nvim/lua/plugins/neodev.lua @@ -7,7 +7,7 @@ return { local dotfiles_path = tostring(vim.fn.expand("~/git/dotfiles")) if string.find(root_dir, dotfiles_path, 1, true) then library.enabled = true - library.plugins = true + library.plugins = { "nvim-dap-ui" } end end, }, From 046fb6f7e88acabfe60770dea1d32d6dcf66763c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 19 Mar 2024 21:19:31 +0200 Subject: [PATCH 2356/2667] Nvim: enable nvim-dap plugin for neodev --- home/.config/nvim/lua/plugins/neodev.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/neodev.lua b/home/.config/nvim/lua/plugins/neodev.lua index 4a33ca15..c925081e 100644 --- a/home/.config/nvim/lua/plugins/neodev.lua +++ b/home/.config/nvim/lua/plugins/neodev.lua @@ -7,7 +7,7 @@ return { local dotfiles_path = tostring(vim.fn.expand("~/git/dotfiles")) if string.find(root_dir, dotfiles_path, 1, true) then library.enabled = true - library.plugins = true + library.plugins = { "nvim-dap-ui" } end end, }, From c2cb934522ffeba7509ee20c2d110e9b3b9feefa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 19 Mar 2024 21:49:21 +0200 Subject: [PATCH 2357/2667] Nvim: Redesign alpha dashboard --- home/.config/nvim/lua/plugins/alpha.lua | 28 +++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/alpha.lua b/home/.config/nvim/lua/plugins/alpha.lua index d92563e7..64cb66c5 100644 --- a/home/.config/nvim/lua/plugins/alpha.lua +++ b/home/.config/nvim/lua/plugins/alpha.lua @@ -4,7 +4,31 @@ return { "goolord/alpha-nvim", config = function() local alpha = require("alpha") - local theta = require("alpha.themes.theta") - alpha.setup(theta.config) + local dashboard = require("alpha.themes.dashboard") + dashboard.section.header.val = { + [[ __ ]], + [[ ___ ___ ___ __ __ /\_\ ___ ___ ]], + [[ / _ `\ / __`\ / __`\/\ \/\ \\/\ \ / __` __`\ ]], + [[/\ \/\ \/\ __//\ \_\ \ \ \_/ |\ \ \/\ \/\ \/\ \ ]], + [[\ \_\ \_\ \____\ \____/\ \___/ \ \_\ \_\ \_\ \_\]], + [[ \/_/\/_/\/____/\/___/ \/__/ \/_/\/_/\/_/\/_/]], + } + dashboard.section.buttons.val = { + dashboard.button("e", " New file", ":ene startinsert "), + dashboard.button("", "🔍 Find file", "Telescope find_files"), + dashboard.button("", "𑪢 Grep files", "Telescope live_grep"), + dashboard.button("l", "🛋 Lazy", ":Lazy"), + dashboard.button("m", "📦 Mason", ":Mason"), + dashboard.button("q", "ꭙ Quit NeoVim", ":qa"), + } + + -- Fortune in footer + dashboard.section.footer.val = require("alpha.fortune")() + + dashboard.config.opts.noautocmd = true + + vim.cmd([[autocmd User AlphaReady echo 'ready']]) + + alpha.setup(dashboard.config) end, } From d74947de33780891c1df452e056ef40da44b1589 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 19 Mar 2024 21:49:21 +0200 Subject: [PATCH 2358/2667] Nvim: Redesign alpha dashboard --- home/.config/nvim/lua/plugins/alpha.lua | 28 +++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/home/.config/nvim/lua/plugins/alpha.lua b/home/.config/nvim/lua/plugins/alpha.lua index d92563e7..64cb66c5 100644 --- a/home/.config/nvim/lua/plugins/alpha.lua +++ b/home/.config/nvim/lua/plugins/alpha.lua @@ -4,7 +4,31 @@ return { "goolord/alpha-nvim", config = function() local alpha = require("alpha") - local theta = require("alpha.themes.theta") - alpha.setup(theta.config) + local dashboard = require("alpha.themes.dashboard") + dashboard.section.header.val = { + [[ __ ]], + [[ ___ ___ ___ __ __ /\_\ ___ ___ ]], + [[ / _ `\ / __`\ / __`\/\ \/\ \\/\ \ / __` __`\ ]], + [[/\ \/\ \/\ __//\ \_\ \ \ \_/ |\ \ \/\ \/\ \/\ \ ]], + [[\ \_\ \_\ \____\ \____/\ \___/ \ \_\ \_\ \_\ \_\]], + [[ \/_/\/_/\/____/\/___/ \/__/ \/_/\/_/\/_/\/_/]], + } + dashboard.section.buttons.val = { + dashboard.button("e", " New file", ":ene startinsert "), + dashboard.button("", "🔍 Find file", "Telescope find_files"), + dashboard.button("", "𑪢 Grep files", "Telescope live_grep"), + dashboard.button("l", "🛋 Lazy", ":Lazy"), + dashboard.button("m", "📦 Mason", ":Mason"), + dashboard.button("q", "ꭙ Quit NeoVim", ":qa"), + } + + -- Fortune in footer + dashboard.section.footer.val = require("alpha.fortune")() + + dashboard.config.opts.noautocmd = true + + vim.cmd([[autocmd User AlphaReady echo 'ready']]) + + alpha.setup(dashboard.config) end, } From b548817e9fc2238ab1464ed1d3e51307f30c9db9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Apr 2024 15:27:32 +0300 Subject: [PATCH 2359/2667] Fix jellyfin gpu --- docker/jellyfin/docker-compose.toml | 2 +- docker/jellyfin/docker-compose.yaml | 33 ----------------------------- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 docker/jellyfin/docker-compose.yaml diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index d3d65a58..48fa49c5 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -24,7 +24,7 @@ volumes = [ ] devices = [ "/dev/dri/renderD128:/dev/dri/renderD128", - "/dev/dri/card1:/dev/dri/card0", + "/dev/dri/card0:/dev/dri/card0", ] [networks.proxy] diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml deleted file mode 100644 index 772748f1..00000000 --- a/docker/jellyfin/docker-compose.yaml +++ /dev/null @@ -1,33 +0,0 @@ -volumes: - config: {} - cache: {} - media: - external: true - nextcloud_data: - external: true -services: - jellyfin: - image: jellyfin/jellyfin - container_name: jellyfin - environment: - - TZ=Europe/Helsinki - ports: - - 8096:8096 - networks: - - proxy - - authentik - restart: unless-stopped - volumes: - - config:/config - - cache:/cache - - media:/media - - /mnt/Storage/docker/nextcloud_data/FunctionalHacker/files/Media/Music:/media/Music - - /etc/localtime:/etc/localtime:ro - devices: - - /dev/dri/renderD128:/dev/dri/renderD128 - - /dev/dri/card1:/dev/dri/card0 -networks: - proxy: - external: true - authentik: - external: true From 9e14c21524765480c08bd16b17743a5da94a694f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Apr 2024 15:27:32 +0300 Subject: [PATCH 2360/2667] Fix jellyfin gpu --- docker/jellyfin/docker-compose.toml | 2 +- docker/jellyfin/docker-compose.yaml | 33 ----------------------------- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 docker/jellyfin/docker-compose.yaml diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index d3d65a58..48fa49c5 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -24,7 +24,7 @@ volumes = [ ] devices = [ "/dev/dri/renderD128:/dev/dri/renderD128", - "/dev/dri/card1:/dev/dri/card0", + "/dev/dri/card0:/dev/dri/card0", ] [networks.proxy] diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml deleted file mode 100644 index 772748f1..00000000 --- a/docker/jellyfin/docker-compose.yaml +++ /dev/null @@ -1,33 +0,0 @@ -volumes: - config: {} - cache: {} - media: - external: true - nextcloud_data: - external: true -services: - jellyfin: - image: jellyfin/jellyfin - container_name: jellyfin - environment: - - TZ=Europe/Helsinki - ports: - - 8096:8096 - networks: - - proxy - - authentik - restart: unless-stopped - volumes: - - config:/config - - cache:/cache - - media:/media - - /mnt/Storage/docker/nextcloud_data/FunctionalHacker/files/Media/Music:/media/Music - - /etc/localtime:/etc/localtime:ro - devices: - - /dev/dri/renderD128:/dev/dri/renderD128 - - /dev/dri/card1:/dev/dri/card0 -networks: - proxy: - external: true - authentik: - external: true From 442bee9014217d676a3e76d70bd9e58944e9126a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Apr 2024 15:27:51 +0300 Subject: [PATCH 2361/2667] Fix firefish --- docker/firefish/docker-compose.toml | 33 ++++++++++++----------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/docker/firefish/docker-compose.toml b/docker/firefish/docker-compose.toml index a9e9f788..6e6fb812 100644 --- a/docker/firefish/docker-compose.toml +++ b/docker/firefish/docker-compose.toml @@ -2,20 +2,17 @@ files = {} config = {} redis = {} -sonic = {} +db = {} [services.firefish] image = "registry.firefish.dev/firefish/firefish" container_name = "firefish" restart = "unless-stopped" depends_on = ["redis"] -ports = ["3083:3000"] -networks = ["firefish", "proxy", "postgres"] +ports = ["3084:3000"] +networks = ["firefish", "proxy"] environment = { NODE_ENV = "production" } -volumes = [ - "files:/firefish/files", - "config:/firefish/.config:ro", -] +volumes = ["files:/firefish/files", "config:/firefish/.config:ro"] [services.redis] image = "redis" @@ -24,22 +21,20 @@ restart = "unless-stopped" networks = ["firefish"] volumes = ["redis:/data"] -[services.sonic] -image = "valeriansaliou/sonic:v1.4.0" -container_name = "sonic-firefish" -logging = { driver = "none" } +[services.db] +image = "groonga/pgroonga:3.1.8-alpine-16-slim" +container_name = "firefish-db" networks = ["firefish"] -volumes = [ - "sonic:/var/lib/sonic/store", - "/mnt/Storage/docker/firefish-sonic/config.cfg:/etc/sonic.cfg", -] -env_file = ".env" +volumes = ["db:/var/lib/postgresql/data"] + +[services.db.healthcheck] +test = "pg_isready --user=\"firefish\" --dbname=\"firefish\"" +interval = "5s" +timeout = "5s" +retries = 5 [networks.firefish] internal = true [networks.proxy] external = true - -[networks.postgres] -external = true From 9fd6ff013e7d34dd6fa4b1268312ba65350c09a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Apr 2024 15:27:51 +0300 Subject: [PATCH 2362/2667] Fix firefish --- docker/firefish/docker-compose.toml | 33 ++++++++++++----------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/docker/firefish/docker-compose.toml b/docker/firefish/docker-compose.toml index a9e9f788..6e6fb812 100644 --- a/docker/firefish/docker-compose.toml +++ b/docker/firefish/docker-compose.toml @@ -2,20 +2,17 @@ files = {} config = {} redis = {} -sonic = {} +db = {} [services.firefish] image = "registry.firefish.dev/firefish/firefish" container_name = "firefish" restart = "unless-stopped" depends_on = ["redis"] -ports = ["3083:3000"] -networks = ["firefish", "proxy", "postgres"] +ports = ["3084:3000"] +networks = ["firefish", "proxy"] environment = { NODE_ENV = "production" } -volumes = [ - "files:/firefish/files", - "config:/firefish/.config:ro", -] +volumes = ["files:/firefish/files", "config:/firefish/.config:ro"] [services.redis] image = "redis" @@ -24,22 +21,20 @@ restart = "unless-stopped" networks = ["firefish"] volumes = ["redis:/data"] -[services.sonic] -image = "valeriansaliou/sonic:v1.4.0" -container_name = "sonic-firefish" -logging = { driver = "none" } +[services.db] +image = "groonga/pgroonga:3.1.8-alpine-16-slim" +container_name = "firefish-db" networks = ["firefish"] -volumes = [ - "sonic:/var/lib/sonic/store", - "/mnt/Storage/docker/firefish-sonic/config.cfg:/etc/sonic.cfg", -] -env_file = ".env" +volumes = ["db:/var/lib/postgresql/data"] + +[services.db.healthcheck] +test = "pg_isready --user=\"firefish\" --dbname=\"firefish\"" +interval = "5s" +timeout = "5s" +retries = 5 [networks.firefish] internal = true [networks.proxy] external = true - -[networks.postgres] -external = true From b7a0e83e5ab2a2ba3d5cc6271b9274444eb26592 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Apr 2024 16:30:36 +0300 Subject: [PATCH 2363/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 50 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 9c65880e..954f247f 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -5,7 +5,7 @@ "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, + "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-git": { "branch": "main", "commit": "8d8993680d627c8f13bd85094eba84604107dbdd" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, @@ -16,53 +16,53 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "f1034cfe852cf62a0ebb12ae583f1477ea07e060" }, + "dropbar.nvim": { "branch": "master", "commit": "fe299f1b1d7580ebe0b2b108843e4538e2a2ff46" }, "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, - "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, - "gitsigns.nvim": { "branch": "main", "commit": "078041e9d060a386b0c9d3a8c7a7b019a35d3fb0" }, + "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, + "gitsigns.nvim": { "branch": "main", "commit": "70584ff9aae8078b64430c574079d79620b8f06d" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, - "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, - "lualine.nvim": { "branch": "master", "commit": "af4c3cf17206810880d2a93562e0a4c0d901c684" }, + "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, + "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "4fb91ae8cbd85b7c6fa56f823231edfded07f17a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "82c7cb08ddb836ad938b2708e50085f12a8825d2" }, - "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, - "mini.nvim": { "branch": "main", "commit": "9968f6e221ae7bdac57a910c5bf2026186aa023c" }, - "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, - "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, - "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" }, + "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, + "mini.nvim": { "branch": "main", "commit": "efa0eb3dc97398e0510372f61bcf625127ab7a24" }, + "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, + "neoformat": { "branch": "master", "commit": "29e8d9c1e1da985e363d8f87c417adfdd50a5a75" }, + "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "b42f326af4718cade583d8bd60af22010224d91e" }, - "nvim-autopairs": { "branch": "master", "commit": "797260ff31e8bdd9db0f0c352659a35aba335b0b" }, - "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "860e56be3883c84835c611401b44e2011c597219" }, + "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" }, + "nvim-cmp": { "branch": "main", "commit": "2fb2a3cf78bbc1b0bea030e8c8728985af1cf302" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "c1695e500c7d552a0a19953a9aefcc89178fb1af" }, + "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" }, "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "eb012f03bb3b4aca9e875d146008b923d0e07e65" }, - "nvim-nio": { "branch": "master", "commit": "ed70af8ad9d4dafdb55539ed2b4454aac2a2a0c3" }, + "nvim-lspconfig": { "branch": "master", "commit": "f4619ab31fc4676001ea05ae8200846e6e7700c7" }, + "nvim-nio": { "branch": "master", "commit": "33c62b3eadd8154169e42144de16ba4db6784bec" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "f7c09bd72e50e1795bd3afb9e2a2b157b4bfb3c3" }, - "nvim-treesitter": { "branch": "master", "commit": "567a76780cd4f982dae1ec57e3dad6174bef3680" }, + "nvim-tree.lua": { "branch": "master", "commit": "d8d3a1590a05b2d8b5eb26e2ed1c6052b1b47a77" }, + "nvim-treesitter": { "branch": "master", "commit": "c51d50386867c2e04f3b420439985aac985dd8d4" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-ufo": { "branch": "main", "commit": "c1e8102e4e954e1c46f46cda2587769238e24f16" }, - "nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" }, + "nvim-ufo": { "branch": "main", "commit": "458aa4451b98614cfab6b3d7beddc8caff5e3052" }, + "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, + "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, "suda.vim": { "branch": "master", "commit": "66727b416837836712975e748bc8a19fb6cf4ec3" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "c816406bd50ade6ec754474f08974154487d417c" }, + "telescope.nvim": { "branch": "master", "commit": "1bb28df3cfc241b961331f00dcb8d5b45fe3e4f0" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "8d4e8d45385c63a0bf735fe1164772116bf0da0d" }, + "vim-fugitive": { "branch": "master", "commit": "c0b03f1cac242d96837326d300f42a660306fc1a" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From 9e83832681a455e631988c4b9974ba0298036bb2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Apr 2024 16:30:36 +0300 Subject: [PATCH 2364/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 50 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 9c65880e..954f247f 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -5,7 +5,7 @@ "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, + "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-git": { "branch": "main", "commit": "8d8993680d627c8f13bd85094eba84604107dbdd" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, @@ -16,53 +16,53 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "f1034cfe852cf62a0ebb12ae583f1477ea07e060" }, + "dropbar.nvim": { "branch": "master", "commit": "fe299f1b1d7580ebe0b2b108843e4538e2a2ff46" }, "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, - "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, - "gitsigns.nvim": { "branch": "main", "commit": "078041e9d060a386b0c9d3a8c7a7b019a35d3fb0" }, + "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, + "gitsigns.nvim": { "branch": "main", "commit": "70584ff9aae8078b64430c574079d79620b8f06d" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, - "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, - "lualine.nvim": { "branch": "master", "commit": "af4c3cf17206810880d2a93562e0a4c0d901c684" }, + "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, + "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "4fb91ae8cbd85b7c6fa56f823231edfded07f17a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "82c7cb08ddb836ad938b2708e50085f12a8825d2" }, - "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, - "mini.nvim": { "branch": "main", "commit": "9968f6e221ae7bdac57a910c5bf2026186aa023c" }, - "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, - "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" }, - "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" }, + "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, + "mini.nvim": { "branch": "main", "commit": "efa0eb3dc97398e0510372f61bcf625127ab7a24" }, + "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, + "neoformat": { "branch": "master", "commit": "29e8d9c1e1da985e363d8f87c417adfdd50a5a75" }, + "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "b42f326af4718cade583d8bd60af22010224d91e" }, - "nvim-autopairs": { "branch": "master", "commit": "797260ff31e8bdd9db0f0c352659a35aba335b0b" }, - "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "860e56be3883c84835c611401b44e2011c597219" }, + "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" }, + "nvim-cmp": { "branch": "main", "commit": "2fb2a3cf78bbc1b0bea030e8c8728985af1cf302" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "c1695e500c7d552a0a19953a9aefcc89178fb1af" }, + "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" }, "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "eb012f03bb3b4aca9e875d146008b923d0e07e65" }, - "nvim-nio": { "branch": "master", "commit": "ed70af8ad9d4dafdb55539ed2b4454aac2a2a0c3" }, + "nvim-lspconfig": { "branch": "master", "commit": "f4619ab31fc4676001ea05ae8200846e6e7700c7" }, + "nvim-nio": { "branch": "master", "commit": "33c62b3eadd8154169e42144de16ba4db6784bec" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "f7c09bd72e50e1795bd3afb9e2a2b157b4bfb3c3" }, - "nvim-treesitter": { "branch": "master", "commit": "567a76780cd4f982dae1ec57e3dad6174bef3680" }, + "nvim-tree.lua": { "branch": "master", "commit": "d8d3a1590a05b2d8b5eb26e2ed1c6052b1b47a77" }, + "nvim-treesitter": { "branch": "master", "commit": "c51d50386867c2e04f3b420439985aac985dd8d4" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-ufo": { "branch": "main", "commit": "c1e8102e4e954e1c46f46cda2587769238e24f16" }, - "nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" }, + "nvim-ufo": { "branch": "main", "commit": "458aa4451b98614cfab6b3d7beddc8caff5e3052" }, + "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, + "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, "suda.vim": { "branch": "master", "commit": "66727b416837836712975e748bc8a19fb6cf4ec3" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "c816406bd50ade6ec754474f08974154487d417c" }, + "telescope.nvim": { "branch": "master", "commit": "1bb28df3cfc241b961331f00dcb8d5b45fe3e4f0" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "8d4e8d45385c63a0bf735fe1164772116bf0da0d" }, + "vim-fugitive": { "branch": "master", "commit": "c0b03f1cac242d96837326d300f42a660306fc1a" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From 879cfda68e2ee3f1ec85a12fb354dc5add59dee0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Apr 2024 16:30:41 +0300 Subject: [PATCH 2365/2667] Redirect forgejo login page to authentik --- docker/caddy/Caddyfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 832c0d73..d36bd295 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -52,6 +52,7 @@ korhonen.cc, *.korhonen.cc { @forgejo host git.korhonen.cc handle @forgejo { + rewrite /user/login /user/oauth2/authentik reverse_proxy forgejo:3000 } From 989fe4b507341f1c96312761e2a12051b3afea13 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Apr 2024 16:30:41 +0300 Subject: [PATCH 2366/2667] Redirect forgejo login page to authentik --- docker/caddy/Caddyfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 832c0d73..d36bd295 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -52,6 +52,7 @@ korhonen.cc, *.korhonen.cc { @forgejo host git.korhonen.cc handle @forgejo { + rewrite /user/login /user/oauth2/authentik reverse_proxy forgejo:3000 } From a919e656c8b2262be7da194b22ba79b60d26a01e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 4 Apr 2024 19:39:02 +0300 Subject: [PATCH 2367/2667] Automatically redirect nextcloud login page to authentik --- docker/caddy/Caddyfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index d36bd295..7f93afdd 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -89,6 +89,9 @@ korhonen.cc, *.korhonen.cc { @nextcloud host cloud.korhonen.cc handle @nextcloud { + # Redirect login page to Authentik + redir /login /apps/sociallogin/custom_oidc/korhonen-sso 301 + # .htaccess / data / config / ... shouldn't be accessible from outside @forbidden { path /.htaccess From b86c9ba8d0ffb4bce2180c4dafcd08fb21792fd9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 4 Apr 2024 19:39:02 +0300 Subject: [PATCH 2368/2667] Automatically redirect nextcloud login page to authentik --- docker/caddy/Caddyfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index d36bd295..7f93afdd 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -89,6 +89,9 @@ korhonen.cc, *.korhonen.cc { @nextcloud host cloud.korhonen.cc handle @nextcloud { + # Redirect login page to Authentik + redir /login /apps/sociallogin/custom_oidc/korhonen-sso 301 + # .htaccess / data / config / ... shouldn't be accessible from outside @forbidden { path /.htaccess From dab59d2f70679e1786201cdaa620e5a24cae0333 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 15 Apr 2024 10:56:58 +0300 Subject: [PATCH 2369/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 40 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 954f247f..a11f0d6e 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" }, + "LuaSnip": { "branch": "master", "commit": "be7be2ca7f55bb881a7ffc16b2efa5af034ab06b" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, @@ -16,53 +16,53 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "fe299f1b1d7580ebe0b2b108843e4538e2a2ff46" }, + "dropbar.nvim": { "branch": "master", "commit": "26173fd5347bddc28fdc645d7020abd860754a73" }, "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, - "gitsigns.nvim": { "branch": "main", "commit": "70584ff9aae8078b64430c574079d79620b8f06d" }, + "gitsigns.nvim": { "branch": "main", "commit": "d96ef3bbff0bdbc3916a220f5c74a04c4db033f2" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, - "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, + "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "4fb91ae8cbd85b7c6fa56f823231edfded07f17a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.nvim": { "branch": "main", "commit": "efa0eb3dc97398e0510372f61bcf625127ab7a24" }, + "mini.nvim": { "branch": "main", "commit": "e3d13e2c89a9dfda51c69c825360d1fe5be0e322" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, - "neoformat": { "branch": "master", "commit": "29e8d9c1e1da985e363d8f87c417adfdd50a5a75" }, + "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "860e56be3883c84835c611401b44e2011c597219" }, - "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" }, - "nvim-cmp": { "branch": "main", "commit": "2fb2a3cf78bbc1b0bea030e8c8728985af1cf302" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "34130cf1fd8171bf5252afb85ed5e10103fd4c44" }, + "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, + "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" }, "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "f4619ab31fc4676001ea05ae8200846e6e7700c7" }, - "nvim-nio": { "branch": "master", "commit": "33c62b3eadd8154169e42144de16ba4db6784bec" }, + "nvim-lspconfig": { "branch": "master", "commit": "da0b236ef3c7fdac8aec758fa88b028cd9358495" }, + "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "d8d3a1590a05b2d8b5eb26e2ed1c6052b1b47a77" }, - "nvim-treesitter": { "branch": "master", "commit": "c51d50386867c2e04f3b420439985aac985dd8d4" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" }, + "nvim-tree.lua": { "branch": "master", "commit": "81eb8d519233c105f30dc0a278607e62b20502fd" }, + "nvim-treesitter": { "branch": "master", "commit": "1ba86026f7d4650d98fb9d4c0f2ab409c428ae41" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "6e9bb569a510bdfab6095c217a2f714af7a3d116" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-ufo": { "branch": "main", "commit": "458aa4451b98614cfab6b3d7beddc8caff5e3052" }, - "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" }, + "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, + "nvim-web-devicons": { "branch": "master", "commit": "b3468391470034353f0e5110c70babb5c62967d3" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, - "suda.vim": { "branch": "master", "commit": "66727b416837836712975e748bc8a19fb6cf4ec3" }, + "suda.vim": { "branch": "master", "commit": "d0ccc1a5172f6a26182238767e60e08b931d11fa" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "1bb28df3cfc241b961331f00dcb8d5b45fe3e4f0" }, + "telescope.nvim": { "branch": "master", "commit": "4d4ade7f2b8f403e8816ca50c05ed16e259b21fb" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "c0b03f1cac242d96837326d300f42a660306fc1a" }, + "vim-fugitive": { "branch": "master", "commit": "dac8e5c2d85926df92672bf2afb4fc48656d96c7" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 99ae74c4..80aeb68c 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -11,7 +11,7 @@ "lemminx": "0.26.1", "lua-language-server": "3.7.4", "prettier": "3.2.5", - "prettierd": "0.25.2", + "prettierd": "0.25.3", "stylua": "v0.20.0", "taplo": "0.8.1", "typescript-language-server": "4.3.3", From 3a059aff2f805ecfd08b95d61f6bf9293b08e1de Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 15 Apr 2024 10:56:58 +0300 Subject: [PATCH 2370/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 40 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 954f247f..a11f0d6e 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" }, + "LuaSnip": { "branch": "master", "commit": "be7be2ca7f55bb881a7ffc16b2efa5af034ab06b" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, @@ -16,53 +16,53 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "fe299f1b1d7580ebe0b2b108843e4538e2a2ff46" }, + "dropbar.nvim": { "branch": "master", "commit": "26173fd5347bddc28fdc645d7020abd860754a73" }, "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, - "gitsigns.nvim": { "branch": "main", "commit": "70584ff9aae8078b64430c574079d79620b8f06d" }, + "gitsigns.nvim": { "branch": "main", "commit": "d96ef3bbff0bdbc3916a220f5c74a04c4db033f2" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, - "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, + "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "4fb91ae8cbd85b7c6fa56f823231edfded07f17a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.nvim": { "branch": "main", "commit": "efa0eb3dc97398e0510372f61bcf625127ab7a24" }, + "mini.nvim": { "branch": "main", "commit": "e3d13e2c89a9dfda51c69c825360d1fe5be0e322" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, - "neoformat": { "branch": "master", "commit": "29e8d9c1e1da985e363d8f87c417adfdd50a5a75" }, + "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "860e56be3883c84835c611401b44e2011c597219" }, - "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" }, - "nvim-cmp": { "branch": "main", "commit": "2fb2a3cf78bbc1b0bea030e8c8728985af1cf302" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "34130cf1fd8171bf5252afb85ed5e10103fd4c44" }, + "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, + "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" }, "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "f4619ab31fc4676001ea05ae8200846e6e7700c7" }, - "nvim-nio": { "branch": "master", "commit": "33c62b3eadd8154169e42144de16ba4db6784bec" }, + "nvim-lspconfig": { "branch": "master", "commit": "da0b236ef3c7fdac8aec758fa88b028cd9358495" }, + "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "d8d3a1590a05b2d8b5eb26e2ed1c6052b1b47a77" }, - "nvim-treesitter": { "branch": "master", "commit": "c51d50386867c2e04f3b420439985aac985dd8d4" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" }, + "nvim-tree.lua": { "branch": "master", "commit": "81eb8d519233c105f30dc0a278607e62b20502fd" }, + "nvim-treesitter": { "branch": "master", "commit": "1ba86026f7d4650d98fb9d4c0f2ab409c428ae41" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "6e9bb569a510bdfab6095c217a2f714af7a3d116" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-ufo": { "branch": "main", "commit": "458aa4451b98614cfab6b3d7beddc8caff5e3052" }, - "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" }, + "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, + "nvim-web-devicons": { "branch": "master", "commit": "b3468391470034353f0e5110c70babb5c62967d3" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, - "suda.vim": { "branch": "master", "commit": "66727b416837836712975e748bc8a19fb6cf4ec3" }, + "suda.vim": { "branch": "master", "commit": "d0ccc1a5172f6a26182238767e60e08b931d11fa" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "1bb28df3cfc241b961331f00dcb8d5b45fe3e4f0" }, + "telescope.nvim": { "branch": "master", "commit": "4d4ade7f2b8f403e8816ca50c05ed16e259b21fb" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "c0b03f1cac242d96837326d300f42a660306fc1a" }, + "vim-fugitive": { "branch": "master", "commit": "dac8e5c2d85926df92672bf2afb4fc48656d96c7" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 99ae74c4..80aeb68c 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -11,7 +11,7 @@ "lemminx": "0.26.1", "lua-language-server": "3.7.4", "prettier": "3.2.5", - "prettierd": "0.25.2", + "prettierd": "0.25.3", "stylua": "v0.20.0", "taplo": "0.8.1", "typescript-language-server": "4.3.3", From a148d7b2304f00646e9355a4dea7ab8b83b97369 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Apr 2024 10:42:57 +0300 Subject: [PATCH 2371/2667] Fix QR alias --- home/.config/zsh/04-aliases.zsh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index dc993979..84206b8f 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -150,7 +150,9 @@ alias startvpn='doas systemctl start wg-quick@wg0.service' alias stopvpn='doas systemctl stop wg-quick@wg0.service' # read qrcode from selection -qr() { grim -g "$(slurp -d)" - | zbarimg PNG:- } +qr() { + gdbus call --session --dest org.gnome.Shell --object-path /org/gnome/Shell --method org.gnome.Shell.Eval 'Main.screenshotUI.open();' 2>&1 > /dev/null && wl-paste | zbarimg -q --raw PNG:- +} # generate qr code in terminal alias qrencode='qrencode -t ansiutf8' From 152e05db1165c38f928964360870609b8518935f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Apr 2024 10:42:57 +0300 Subject: [PATCH 2372/2667] Fix QR alias --- home/.config/zsh/04-aliases.zsh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index dc993979..84206b8f 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -150,7 +150,9 @@ alias startvpn='doas systemctl start wg-quick@wg0.service' alias stopvpn='doas systemctl stop wg-quick@wg0.service' # read qrcode from selection -qr() { grim -g "$(slurp -d)" - | zbarimg PNG:- } +qr() { + gdbus call --session --dest org.gnome.Shell --object-path /org/gnome/Shell --method org.gnome.Shell.Eval 'Main.screenshotUI.open();' 2>&1 > /dev/null && wl-paste | zbarimg -q --raw PNG:- +} # generate qr code in terminal alias qrencode='qrencode -t ansiutf8' From 5dc717534c1943fd92a4a7688b4d2ef230d82e9e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 21 Apr 2024 10:25:01 +0300 Subject: [PATCH 2373/2667] Fix jellyfin volume --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 48fa49c5..80c0fd9b 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -19,7 +19,7 @@ volumes = [ "config:/config", "cache:/cache", "media:/media", - "/mnt/Storage/docker/volumes/nextcloud_data/FunctionalHacker/files/Media/Music:/media/Music", + "nextcloud_data:/nextcloud_data", "/etc/localtime:/etc/localtime:ro", ] devices = [ From 669365befd3485060ad6fc36519b333666c7949a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 21 Apr 2024 10:25:01 +0300 Subject: [PATCH 2374/2667] Fix jellyfin volume --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 48fa49c5..80c0fd9b 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -19,7 +19,7 @@ volumes = [ "config:/config", "cache:/cache", "media:/media", - "/mnt/Storage/docker/volumes/nextcloud_data/FunctionalHacker/files/Media/Music:/media/Music", + "nextcloud_data:/nextcloud_data", "/etc/localtime:/etc/localtime:ro", ] devices = [ From 647293c28c091fa5463ef9b6db438e4a51a74dce Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 21 Apr 2024 19:41:55 +0300 Subject: [PATCH 2375/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 30 +++++++++++++++--------------- home/.config/nvim/mason-lock.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index a11f0d6e..4499fc71 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,12 +1,12 @@ { - "LuaSnip": { "branch": "master", "commit": "be7be2ca7f55bb881a7ffc16b2efa5af034ab06b" }, + "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, - "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, + "bufferline.nvim": { "branch": "main", "commit": "f6f00d9ac1a51483ac78418f9e63126119a70709" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-git": { "branch": "main", "commit": "8d8993680d627c8f13bd85094eba84604107dbdd" }, + "cmp-git": { "branch": "main", "commit": "b9603f18496bc3ca07e6bd474607081af709e750" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -16,10 +16,10 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "26173fd5347bddc28fdc645d7020abd860754a73" }, + "dropbar.nvim": { "branch": "master", "commit": "e3c7de9f733587373959b220d5a1970c476a3d9f" }, "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, - "gitsigns.nvim": { "branch": "main", "commit": "d96ef3bbff0bdbc3916a220f5c74a04c4db033f2" }, + "gitsigns.nvim": { "branch": "main", "commit": "035da036e68e509ed158414416c827d022d914bd" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, @@ -29,7 +29,7 @@ "mason-lock.nvim": { "branch": "main", "commit": "4fb91ae8cbd85b7c6fa56f823231edfded07f17a" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.nvim": { "branch": "main", "commit": "e3d13e2c89a9dfda51c69c825360d1fe5be0e322" }, + "mini.nvim": { "branch": "main", "commit": "e623d29561746637b49d30d6434338f88f44e856" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, @@ -38,28 +38,28 @@ "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" }, + "nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" }, "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "da0b236ef3c7fdac8aec758fa88b028cd9358495" }, + "nvim-lspconfig": { "branch": "master", "commit": "ed8b8a15acc441aec669f97d75f2c1f2ac8c8aa5" }, "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "81eb8d519233c105f30dc0a278607e62b20502fd" }, - "nvim-treesitter": { "branch": "master", "commit": "1ba86026f7d4650d98fb9d4c0f2ab409c428ae41" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "6e9bb569a510bdfab6095c217a2f714af7a3d116" }, + "nvim-tree.lua": { "branch": "master", "commit": "ae8e46e8fabb32fa3ae5319383ea2c8763f14caa" }, + "nvim-treesitter": { "branch": "master", "commit": "ea4f6d5175812a3f48302d638a766bc18fcbb04a" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, - "nvim-web-devicons": { "branch": "master", "commit": "b3468391470034353f0e5110c70babb5c62967d3" }, + "nvim-web-devicons": { "branch": "master", "commit": "beb6367ab8496c9e43f22e0252735fdadae1872d" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, - "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, - "suda.vim": { "branch": "master", "commit": "d0ccc1a5172f6a26182238767e60e08b931d11fa" }, + "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, + "suda.vim": { "branch": "master", "commit": "04469d855e36fffcda6be036eb7ff005f64fa0d6" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "4d4ade7f2b8f403e8816ca50c05ed16e259b21fb" }, + "telescope.nvim": { "branch": "master", "commit": "7d1698f3d88b448e0639974248cc17f49b7b8acf" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "dac8e5c2d85926df92672bf2afb4fc48656d96c7" }, diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 80aeb68c..05c7fa81 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -16,4 +16,4 @@ "taplo": "0.8.1", "typescript-language-server": "4.3.3", "yaml-language-server": "1.14.0" -} +} \ No newline at end of file From 6ff6de2dc4720f810f5f59848cf89489ddea36a3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 21 Apr 2024 19:41:55 +0300 Subject: [PATCH 2376/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 30 +++++++++++++++--------------- home/.config/nvim/mason-lock.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index a11f0d6e..4499fc71 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,12 +1,12 @@ { - "LuaSnip": { "branch": "master", "commit": "be7be2ca7f55bb881a7ffc16b2efa5af034ab06b" }, + "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, - "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, + "bufferline.nvim": { "branch": "main", "commit": "f6f00d9ac1a51483ac78418f9e63126119a70709" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-git": { "branch": "main", "commit": "8d8993680d627c8f13bd85094eba84604107dbdd" }, + "cmp-git": { "branch": "main", "commit": "b9603f18496bc3ca07e6bd474607081af709e750" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -16,10 +16,10 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "26173fd5347bddc28fdc645d7020abd860754a73" }, + "dropbar.nvim": { "branch": "master", "commit": "e3c7de9f733587373959b220d5a1970c476a3d9f" }, "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, - "gitsigns.nvim": { "branch": "main", "commit": "d96ef3bbff0bdbc3916a220f5c74a04c4db033f2" }, + "gitsigns.nvim": { "branch": "main", "commit": "035da036e68e509ed158414416c827d022d914bd" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, @@ -29,7 +29,7 @@ "mason-lock.nvim": { "branch": "main", "commit": "4fb91ae8cbd85b7c6fa56f823231edfded07f17a" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.nvim": { "branch": "main", "commit": "e3d13e2c89a9dfda51c69c825360d1fe5be0e322" }, + "mini.nvim": { "branch": "main", "commit": "e623d29561746637b49d30d6434338f88f44e856" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, @@ -38,28 +38,28 @@ "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" }, + "nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" }, "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "da0b236ef3c7fdac8aec758fa88b028cd9358495" }, + "nvim-lspconfig": { "branch": "master", "commit": "ed8b8a15acc441aec669f97d75f2c1f2ac8c8aa5" }, "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "81eb8d519233c105f30dc0a278607e62b20502fd" }, - "nvim-treesitter": { "branch": "master", "commit": "1ba86026f7d4650d98fb9d4c0f2ab409c428ae41" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "6e9bb569a510bdfab6095c217a2f714af7a3d116" }, + "nvim-tree.lua": { "branch": "master", "commit": "ae8e46e8fabb32fa3ae5319383ea2c8763f14caa" }, + "nvim-treesitter": { "branch": "master", "commit": "ea4f6d5175812a3f48302d638a766bc18fcbb04a" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, - "nvim-web-devicons": { "branch": "master", "commit": "b3468391470034353f0e5110c70babb5c62967d3" }, + "nvim-web-devicons": { "branch": "master", "commit": "beb6367ab8496c9e43f22e0252735fdadae1872d" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, - "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, - "suda.vim": { "branch": "master", "commit": "d0ccc1a5172f6a26182238767e60e08b931d11fa" }, + "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, + "suda.vim": { "branch": "master", "commit": "04469d855e36fffcda6be036eb7ff005f64fa0d6" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "4d4ade7f2b8f403e8816ca50c05ed16e259b21fb" }, + "telescope.nvim": { "branch": "master", "commit": "7d1698f3d88b448e0639974248cc17f49b7b8acf" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "dac8e5c2d85926df92672bf2afb4fc48656d96c7" }, diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 80aeb68c..05c7fa81 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -16,4 +16,4 @@ "taplo": "0.8.1", "typescript-language-server": "4.3.3", "yaml-language-server": "1.14.0" -} +} \ No newline at end of file From 9e076ed63ab160f23a6a1f5db366f2b690c18a5e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Apr 2024 10:48:26 +0300 Subject: [PATCH 2377/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 20 ++++++++++---------- home/.config/nvim/mason-lock.json | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 4499fc71..fa66f523 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, + "LuaSnip": { "branch": "master", "commit": "72eea98b1900013e0cb214f29b898c8d91564930" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, - "bufferline.nvim": { "branch": "main", "commit": "f6f00d9ac1a51483ac78418f9e63126119a70709" }, + "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -17,42 +17,42 @@ "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dropbar.nvim": { "branch": "master", "commit": "e3c7de9f733587373959b220d5a1970c476a3d9f" }, - "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, + "firenvim": { "branch": "master", "commit": "e99aa603f5311a850be1d02759b0ec62ce3990a3" }, "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, "gitsigns.nvim": { "branch": "main", "commit": "035da036e68e509ed158414416c827d022d914bd" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, - "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, + "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "4fb91ae8cbd85b7c6fa56f823231edfded07f17a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a14770dc8c7cb29643870ac79788eec6f7ce1f8" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.nvim": { "branch": "main", "commit": "e623d29561746637b49d30d6434338f88f44e856" }, + "mini.nvim": { "branch": "main", "commit": "04f8d6e0acd5a52d01ec1c392e3947135dbfd8ef" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "34130cf1fd8171bf5252afb85ed5e10103fd4c44" }, "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, - "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, + "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" }, "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "ed8b8a15acc441aec669f97d75f2c1f2ac8c8aa5" }, + "nvim-lspconfig": { "branch": "master", "commit": "cfa386fc4027e847156ee16141ea1f4c0bc2f0a4" }, "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-tree.lua": { "branch": "master", "commit": "ae8e46e8fabb32fa3ae5319383ea2c8763f14caa" }, - "nvim-treesitter": { "branch": "master", "commit": "ea4f6d5175812a3f48302d638a766bc18fcbb04a" }, + "nvim-treesitter": { "branch": "master", "commit": "b04ccbd0e041bb05f3eef271124da02497d9d10c" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, "nvim-web-devicons": { "branch": "master", "commit": "beb6367ab8496c9e43f22e0252735fdadae1872d" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, + "plenary.nvim": { "branch": "master", "commit": "5129a3693c482fcbc5ab99a7706ffc4360b995a0" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 05c7fa81..690fdce1 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,12 +1,12 @@ { - "bash-language-server": "5.1.2", + "bash-language-server": "5.2.0", "css-lsp": "4.8.0", "docker-compose-language-service": "0.2.0", "dockerfile-language-server": "0.11.0", "eslint-lsp": "4.8.0", "html-lsp": "4.8.0", "java-debug-adapter": "0.55.0", - "jdtls": "v1.33.0", + "jdtls": "v1.34.0", "json-lsp": "4.8.0", "lemminx": "0.26.1", "lua-language-server": "3.7.4", @@ -16,4 +16,4 @@ "taplo": "0.8.1", "typescript-language-server": "4.3.3", "yaml-language-server": "1.14.0" -} \ No newline at end of file +} From a4db9345c943ef5e82ac6505a4ae31779c1cff9c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Apr 2024 10:48:26 +0300 Subject: [PATCH 2378/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 20 ++++++++++---------- home/.config/nvim/mason-lock.json | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 4499fc71..fa66f523 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, + "LuaSnip": { "branch": "master", "commit": "72eea98b1900013e0cb214f29b898c8d91564930" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, - "bufferline.nvim": { "branch": "main", "commit": "f6f00d9ac1a51483ac78418f9e63126119a70709" }, + "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -17,42 +17,42 @@ "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dropbar.nvim": { "branch": "master", "commit": "e3c7de9f733587373959b220d5a1970c476a3d9f" }, - "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" }, + "firenvim": { "branch": "master", "commit": "e99aa603f5311a850be1d02759b0ec62ce3990a3" }, "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, "gitsigns.nvim": { "branch": "main", "commit": "035da036e68e509ed158414416c827d022d914bd" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, - "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, + "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "4fb91ae8cbd85b7c6fa56f823231edfded07f17a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a14770dc8c7cb29643870ac79788eec6f7ce1f8" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.nvim": { "branch": "main", "commit": "e623d29561746637b49d30d6434338f88f44e856" }, + "mini.nvim": { "branch": "main", "commit": "04f8d6e0acd5a52d01ec1c392e3947135dbfd8ef" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "34130cf1fd8171bf5252afb85ed5e10103fd4c44" }, "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, - "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, + "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" }, "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "ed8b8a15acc441aec669f97d75f2c1f2ac8c8aa5" }, + "nvim-lspconfig": { "branch": "master", "commit": "cfa386fc4027e847156ee16141ea1f4c0bc2f0a4" }, "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-tree.lua": { "branch": "master", "commit": "ae8e46e8fabb32fa3ae5319383ea2c8763f14caa" }, - "nvim-treesitter": { "branch": "master", "commit": "ea4f6d5175812a3f48302d638a766bc18fcbb04a" }, + "nvim-treesitter": { "branch": "master", "commit": "b04ccbd0e041bb05f3eef271124da02497d9d10c" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, "nvim-web-devicons": { "branch": "master", "commit": "beb6367ab8496c9e43f22e0252735fdadae1872d" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, + "plenary.nvim": { "branch": "master", "commit": "5129a3693c482fcbc5ab99a7706ffc4360b995a0" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 05c7fa81..690fdce1 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,12 +1,12 @@ { - "bash-language-server": "5.1.2", + "bash-language-server": "5.2.0", "css-lsp": "4.8.0", "docker-compose-language-service": "0.2.0", "dockerfile-language-server": "0.11.0", "eslint-lsp": "4.8.0", "html-lsp": "4.8.0", "java-debug-adapter": "0.55.0", - "jdtls": "v1.33.0", + "jdtls": "v1.34.0", "json-lsp": "4.8.0", "lemminx": "0.26.1", "lua-language-server": "3.7.4", @@ -16,4 +16,4 @@ "taplo": "0.8.1", "typescript-language-server": "4.3.3", "yaml-language-server": "1.14.0" -} \ No newline at end of file +} From 56c1cdd3c1c469995ba48bdb39c42408221c0925 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Apr 2024 12:46:19 +0300 Subject: [PATCH 2379/2667] Update forgejo runner --- docker/forgejo/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index 5ed358c4..1d2e0176 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -12,7 +12,7 @@ ports = ["22:22"] volumes = ["data:/data", "/etc/localtime:/etc/localtime:ro"] [services.runner] -image = "code.forgejo.org/forgejo/runner:3.3.0" +image = "code.forgejo.org/forgejo/runner:3.4.1" container_name = "forgejo-runner" user = "root:root" volumes = [ From 227624d0976456dc6caec2930abe24704f1d767f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Apr 2024 12:46:19 +0300 Subject: [PATCH 2380/2667] Update forgejo runner --- docker/forgejo/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index 5ed358c4..1d2e0176 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -12,7 +12,7 @@ ports = ["22:22"] volumes = ["data:/data", "/etc/localtime:/etc/localtime:ro"] [services.runner] -image = "code.forgejo.org/forgejo/runner:3.3.0" +image = "code.forgejo.org/forgejo/runner:3.4.1" container_name = "forgejo-runner" user = "root:root" volumes = [ From 5aa759126b60f6121ab7e2607b882d5659fe62ad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 6 May 2024 09:59:44 +0300 Subject: [PATCH 2381/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 46 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index fa66f523..ec8863e6 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "72eea98b1900013e0cb214f29b898c8d91564930" }, + "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" }, @@ -16,53 +16,53 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "e3c7de9f733587373959b220d5a1970c476a3d9f" }, - "firenvim": { "branch": "master", "commit": "e99aa603f5311a850be1d02759b0ec62ce3990a3" }, - "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, - "gitsigns.nvim": { "branch": "main", "commit": "035da036e68e509ed158414416c827d022d914bd" }, + "dropbar.nvim": { "branch": "master", "commit": "3dd8edba9f9eeb129db269dd57ef6c0427b7ad9d" }, + "firenvim": { "branch": "master", "commit": "03ba12a5a92a02d171005775a8150998c4060a74" }, + "friendly-snippets": { "branch": "main", "commit": "fa36367422da5a38560892e3db6d090a635d9d41" }, + "gitsigns.nvim": { "branch": "main", "commit": "bc933d24a669608968ff4791b14d2d9554813a65" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, - "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" }, + "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" }, + "lazy.nvim": { "branch": "main", "commit": "d3974346b6cef2116c8e7b08423256a834cb7cbc" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, - "mason-lock.nvim": { "branch": "main", "commit": "4fb91ae8cbd85b7c6fa56f823231edfded07f17a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1a14770dc8c7cb29643870ac79788eec6f7ce1f8" }, + "mason-lock.nvim": { "branch": "main", "commit": "2f18cab30f3d621002c58c725d9319a1563414e5" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "05744f0f1967b5757bd05c08df4271ab8ec990aa" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.nvim": { "branch": "main", "commit": "04f8d6e0acd5a52d01ec1c392e3947135dbfd8ef" }, + "mini.nvim": { "branch": "main", "commit": "fb4df45edec418443e4801719f1cb98e89697724" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, - "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, - "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, + "noice.nvim": { "branch": "main", "commit": "f4decbc7a80229ccc9f86026b74bdcf0c39e38a7" }, + "nui.nvim": { "branch": "main", "commit": "274fa89a9b4bed746647c2917091902f882509ec" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "34130cf1fd8171bf5252afb85ed5e10103fd4c44" }, - "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, + "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" }, - "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, + "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "cfa386fc4027e847156ee16141ea1f4c0bc2f0a4" }, - "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" }, + "nvim-lspconfig": { "branch": "master", "commit": "7383bacd57abd6d86e51765b80d7adf5707ab30d" }, + "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "ae8e46e8fabb32fa3ae5319383ea2c8763f14caa" }, - "nvim-treesitter": { "branch": "master", "commit": "b04ccbd0e041bb05f3eef271124da02497d9d10c" }, + "nvim-tree.lua": { "branch": "master", "commit": "64f61e4c913047a045ff90bd188dd3b54ee443cf" }, + "nvim-treesitter": { "branch": "master", "commit": "fc7657a071ad7be0616d7c66a74991a3c1b1dbcd" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, - "nvim-web-devicons": { "branch": "master", "commit": "beb6367ab8496c9e43f22e0252735fdadae1872d" }, + "nvim-web-devicons": { "branch": "master", "commit": "475fbcfcb6ee7c35aa33a6b6207ebd4032791d87" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "5129a3693c482fcbc5ab99a7706ffc4360b995a0" }, + "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, - "suda.vim": { "branch": "master", "commit": "04469d855e36fffcda6be036eb7ff005f64fa0d6" }, + "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "7d1698f3d88b448e0639974248cc17f49b7b8acf" }, + "telescope.nvim": { "branch": "master", "commit": "fac83a556e7b710dc31433dec727361ca062dbe9" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "dac8e5c2d85926df92672bf2afb4fc48656d96c7" }, + "vim-fugitive": { "branch": "master", "commit": "ce882460cf3db12e99f8bf579cbf99e331f6dd4f" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 690fdce1..e1caafa4 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -9,7 +9,7 @@ "jdtls": "v1.34.0", "json-lsp": "4.8.0", "lemminx": "0.26.1", - "lua-language-server": "3.7.4", + "lua-language-server": "3.8.3", "prettier": "3.2.5", "prettierd": "0.25.3", "stylua": "v0.20.0", From 4de757b465f9b3a89dc9fda953c5b02daed9c0fc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 6 May 2024 09:59:44 +0300 Subject: [PATCH 2382/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 46 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index fa66f523..ec8863e6 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "72eea98b1900013e0cb214f29b898c8d91564930" }, + "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" }, @@ -16,53 +16,53 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "e3c7de9f733587373959b220d5a1970c476a3d9f" }, - "firenvim": { "branch": "master", "commit": "e99aa603f5311a850be1d02759b0ec62ce3990a3" }, - "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, - "gitsigns.nvim": { "branch": "main", "commit": "035da036e68e509ed158414416c827d022d914bd" }, + "dropbar.nvim": { "branch": "master", "commit": "3dd8edba9f9eeb129db269dd57ef6c0427b7ad9d" }, + "firenvim": { "branch": "master", "commit": "03ba12a5a92a02d171005775a8150998c4060a74" }, + "friendly-snippets": { "branch": "main", "commit": "fa36367422da5a38560892e3db6d090a635d9d41" }, + "gitsigns.nvim": { "branch": "main", "commit": "bc933d24a669608968ff4791b14d2d9554813a65" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, - "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" }, + "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" }, + "lazy.nvim": { "branch": "main", "commit": "d3974346b6cef2116c8e7b08423256a834cb7cbc" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, - "mason-lock.nvim": { "branch": "main", "commit": "4fb91ae8cbd85b7c6fa56f823231edfded07f17a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1a14770dc8c7cb29643870ac79788eec6f7ce1f8" }, + "mason-lock.nvim": { "branch": "main", "commit": "2f18cab30f3d621002c58c725d9319a1563414e5" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "05744f0f1967b5757bd05c08df4271ab8ec990aa" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.nvim": { "branch": "main", "commit": "04f8d6e0acd5a52d01ec1c392e3947135dbfd8ef" }, + "mini.nvim": { "branch": "main", "commit": "fb4df45edec418443e4801719f1cb98e89697724" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, - "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, - "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, + "noice.nvim": { "branch": "main", "commit": "f4decbc7a80229ccc9f86026b74bdcf0c39e38a7" }, + "nui.nvim": { "branch": "main", "commit": "274fa89a9b4bed746647c2917091902f882509ec" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "34130cf1fd8171bf5252afb85ed5e10103fd4c44" }, - "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, + "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" }, - "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, + "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "cfa386fc4027e847156ee16141ea1f4c0bc2f0a4" }, - "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" }, + "nvim-lspconfig": { "branch": "master", "commit": "7383bacd57abd6d86e51765b80d7adf5707ab30d" }, + "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "ae8e46e8fabb32fa3ae5319383ea2c8763f14caa" }, - "nvim-treesitter": { "branch": "master", "commit": "b04ccbd0e041bb05f3eef271124da02497d9d10c" }, + "nvim-tree.lua": { "branch": "master", "commit": "64f61e4c913047a045ff90bd188dd3b54ee443cf" }, + "nvim-treesitter": { "branch": "master", "commit": "fc7657a071ad7be0616d7c66a74991a3c1b1dbcd" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, - "nvim-web-devicons": { "branch": "master", "commit": "beb6367ab8496c9e43f22e0252735fdadae1872d" }, + "nvim-web-devicons": { "branch": "master", "commit": "475fbcfcb6ee7c35aa33a6b6207ebd4032791d87" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "5129a3693c482fcbc5ab99a7706ffc4360b995a0" }, + "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, - "suda.vim": { "branch": "master", "commit": "04469d855e36fffcda6be036eb7ff005f64fa0d6" }, + "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "7d1698f3d88b448e0639974248cc17f49b7b8acf" }, + "telescope.nvim": { "branch": "master", "commit": "fac83a556e7b710dc31433dec727361ca062dbe9" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "dac8e5c2d85926df92672bf2afb4fc48656d96c7" }, + "vim-fugitive": { "branch": "master", "commit": "ce882460cf3db12e99f8bf579cbf99e331f6dd4f" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 690fdce1..e1caafa4 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -9,7 +9,7 @@ "jdtls": "v1.34.0", "json-lsp": "4.8.0", "lemminx": "0.26.1", - "lua-language-server": "3.7.4", + "lua-language-server": "3.8.3", "prettier": "3.2.5", "prettierd": "0.25.3", "stylua": "v0.20.0", From 46bfe474942ad0be0e42d4efc5656de85c8d6692 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 6 May 2024 10:00:05 +0300 Subject: [PATCH 2383/2667] Firefish: add restart policy --- docker/firefish/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/firefish/docker-compose.toml b/docker/firefish/docker-compose.toml index 6e6fb812..cafcc0ce 100644 --- a/docker/firefish/docker-compose.toml +++ b/docker/firefish/docker-compose.toml @@ -24,6 +24,7 @@ volumes = ["redis:/data"] [services.db] image = "groonga/pgroonga:3.1.8-alpine-16-slim" container_name = "firefish-db" +restart = "unless-stopped" networks = ["firefish"] volumes = ["db:/var/lib/postgresql/data"] From 659f4337c71c682e67cfa0af42f8dd2d21d3f22e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 6 May 2024 10:00:05 +0300 Subject: [PATCH 2384/2667] Firefish: add restart policy --- docker/firefish/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/firefish/docker-compose.toml b/docker/firefish/docker-compose.toml index 6e6fb812..cafcc0ce 100644 --- a/docker/firefish/docker-compose.toml +++ b/docker/firefish/docker-compose.toml @@ -24,6 +24,7 @@ volumes = ["redis:/data"] [services.db] image = "groonga/pgroonga:3.1.8-alpine-16-slim" container_name = "firefish-db" +restart = "unless-stopped" networks = ["firefish"] volumes = ["db:/var/lib/postgresql/data"] From 2d005a7ecc5fbd5a900b8b517573f94143f52d0a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 8 May 2024 09:03:22 +0300 Subject: [PATCH 2385/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 16 ++++++++-------- home/.config/nvim/mason-lock.json | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index ec8863e6..b8d1be53 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -10,7 +10,7 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, + "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, @@ -18,8 +18,8 @@ "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dropbar.nvim": { "branch": "master", "commit": "3dd8edba9f9eeb129db269dd57ef6c0427b7ad9d" }, "firenvim": { "branch": "master", "commit": "03ba12a5a92a02d171005775a8150998c4060a74" }, - "friendly-snippets": { "branch": "main", "commit": "fa36367422da5a38560892e3db6d090a635d9d41" }, - "gitsigns.nvim": { "branch": "main", "commit": "bc933d24a669608968ff4791b14d2d9554813a65" }, + "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" }, + "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" }, "lazy.nvim": { "branch": "main", "commit": "d3974346b6cef2116c8e7b08423256a834cb7cbc" }, @@ -29,11 +29,11 @@ "mason-lock.nvim": { "branch": "main", "commit": "2f18cab30f3d621002c58c725d9319a1563414e5" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "05744f0f1967b5757bd05c08df4271ab8ec990aa" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.nvim": { "branch": "main", "commit": "fb4df45edec418443e4801719f1cb98e89697724" }, + "mini.nvim": { "branch": "main", "commit": "5df3155218807fb6049779bb488f48f77fdd9dcb" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, "noice.nvim": { "branch": "main", "commit": "f4decbc7a80229ccc9f86026b74bdcf0c39e38a7" }, - "nui.nvim": { "branch": "main", "commit": "274fa89a9b4bed746647c2917091902f882509ec" }, + "nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "34130cf1fd8171bf5252afb85ed5e10103fd4c44" }, "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, @@ -42,15 +42,15 @@ "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "7383bacd57abd6d86e51765b80d7adf5707ab30d" }, + "nvim-lspconfig": { "branch": "master", "commit": "ba34c39459052c4bdc538d093368e5bf725595b8" }, "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-tree.lua": { "branch": "master", "commit": "64f61e4c913047a045ff90bd188dd3b54ee443cf" }, - "nvim-treesitter": { "branch": "master", "commit": "fc7657a071ad7be0616d7c66a74991a3c1b1dbcd" }, + "nvim-treesitter": { "branch": "master", "commit": "acefffae27b5105a717b213e19c5975bf7a4ba68" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, - "nvim-web-devicons": { "branch": "master", "commit": "475fbcfcb6ee7c35aa33a6b6207ebd4032791d87" }, + "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index e1caafa4..d8cce6f5 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,13 +1,13 @@ { "bash-language-server": "5.2.0", - "css-lsp": "4.8.0", + "css-lsp": "4.10.0", "docker-compose-language-service": "0.2.0", "dockerfile-language-server": "0.11.0", - "eslint-lsp": "4.8.0", - "html-lsp": "4.8.0", + "eslint-lsp": "4.10.0", + "html-lsp": "4.10.0", "java-debug-adapter": "0.55.0", "jdtls": "v1.34.0", - "json-lsp": "4.8.0", + "json-lsp": "4.10.0", "lemminx": "0.26.1", "lua-language-server": "3.8.3", "prettier": "3.2.5", From 598ed7b7b3fa8bd698cbad11966e02e76d2807b1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 8 May 2024 09:03:22 +0300 Subject: [PATCH 2386/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 16 ++++++++-------- home/.config/nvim/mason-lock.json | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index ec8863e6..b8d1be53 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -10,7 +10,7 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, + "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, @@ -18,8 +18,8 @@ "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dropbar.nvim": { "branch": "master", "commit": "3dd8edba9f9eeb129db269dd57ef6c0427b7ad9d" }, "firenvim": { "branch": "master", "commit": "03ba12a5a92a02d171005775a8150998c4060a74" }, - "friendly-snippets": { "branch": "main", "commit": "fa36367422da5a38560892e3db6d090a635d9d41" }, - "gitsigns.nvim": { "branch": "main", "commit": "bc933d24a669608968ff4791b14d2d9554813a65" }, + "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" }, + "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" }, "lazy.nvim": { "branch": "main", "commit": "d3974346b6cef2116c8e7b08423256a834cb7cbc" }, @@ -29,11 +29,11 @@ "mason-lock.nvim": { "branch": "main", "commit": "2f18cab30f3d621002c58c725d9319a1563414e5" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "05744f0f1967b5757bd05c08df4271ab8ec990aa" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.nvim": { "branch": "main", "commit": "fb4df45edec418443e4801719f1cb98e89697724" }, + "mini.nvim": { "branch": "main", "commit": "5df3155218807fb6049779bb488f48f77fdd9dcb" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, "noice.nvim": { "branch": "main", "commit": "f4decbc7a80229ccc9f86026b74bdcf0c39e38a7" }, - "nui.nvim": { "branch": "main", "commit": "274fa89a9b4bed746647c2917091902f882509ec" }, + "nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "34130cf1fd8171bf5252afb85ed5e10103fd4c44" }, "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, @@ -42,15 +42,15 @@ "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "7383bacd57abd6d86e51765b80d7adf5707ab30d" }, + "nvim-lspconfig": { "branch": "master", "commit": "ba34c39459052c4bdc538d093368e5bf725595b8" }, "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-tree.lua": { "branch": "master", "commit": "64f61e4c913047a045ff90bd188dd3b54ee443cf" }, - "nvim-treesitter": { "branch": "master", "commit": "fc7657a071ad7be0616d7c66a74991a3c1b1dbcd" }, + "nvim-treesitter": { "branch": "master", "commit": "acefffae27b5105a717b213e19c5975bf7a4ba68" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, - "nvim-web-devicons": { "branch": "master", "commit": "475fbcfcb6ee7c35aa33a6b6207ebd4032791d87" }, + "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index e1caafa4..d8cce6f5 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,13 +1,13 @@ { "bash-language-server": "5.2.0", - "css-lsp": "4.8.0", + "css-lsp": "4.10.0", "docker-compose-language-service": "0.2.0", "dockerfile-language-server": "0.11.0", - "eslint-lsp": "4.8.0", - "html-lsp": "4.8.0", + "eslint-lsp": "4.10.0", + "html-lsp": "4.10.0", "java-debug-adapter": "0.55.0", "jdtls": "v1.34.0", - "json-lsp": "4.8.0", + "json-lsp": "4.10.0", "lemminx": "0.26.1", "lua-language-server": "3.8.3", "prettier": "3.2.5", From 903814b4b2dad49f9ae059933ee71debfc008e3b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 May 2024 21:27:20 +0300 Subject: [PATCH 2387/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index b8d1be53..2baf17b1 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -27,27 +27,27 @@ "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "2f18cab30f3d621002c58c725d9319a1563414e5" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "05744f0f1967b5757bd05c08df4271ab8ec990aa" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "c3168b2a6a09722d4567ef4a37364b9b30bf7f20" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.nvim": { "branch": "main", "commit": "5df3155218807fb6049779bb488f48f77fdd9dcb" }, + "mini.nvim": { "branch": "main", "commit": "2d0f10540efdbb1f5c480ebe19ce4de451936a5d" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, - "noice.nvim": { "branch": "main", "commit": "f4decbc7a80229ccc9f86026b74bdcf0c39e38a7" }, + "noice.nvim": { "branch": "main", "commit": "09102ca2e9a3e9302119fdaf7a059a034e4a626d" }, "nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "34130cf1fd8171bf5252afb85ed5e10103fd4c44" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "e354bd84fed978e31501396aea6154bd97087e07" }, "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, - "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" }, + "nvim-cmp": { "branch": "main", "commit": "cd2cf0c124d3de577fb5449746568ee8e601afc8" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, + "nvim-dap": { "branch": "master", "commit": "615a1b2046e1eaf7995e0ba8e8a65f344201349d" }, "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "ba34c39459052c4bdc538d093368e5bf725595b8" }, + "nvim-lspconfig": { "branch": "master", "commit": "a3d9395455f2b2e3b50a0b0f37b8b4c23683f44a" }, "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-tree.lua": { "branch": "master", "commit": "64f61e4c913047a045ff90bd188dd3b54ee443cf" }, - "nvim-treesitter": { "branch": "master", "commit": "acefffae27b5105a717b213e19c5975bf7a4ba68" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" }, + "nvim-treesitter": { "branch": "master", "commit": "d6dcfe888724d271dcbaa6f2c80f9f706b39cd2a" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "dfa4178c0cadb44f687603d72ad0908474c28dd9" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, From 9165c4775006afae6e6b1cda0ab4ed5d5a324a63 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 May 2024 21:27:20 +0300 Subject: [PATCH 2388/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index b8d1be53..2baf17b1 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -27,27 +27,27 @@ "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "2f18cab30f3d621002c58c725d9319a1563414e5" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "05744f0f1967b5757bd05c08df4271ab8ec990aa" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "c3168b2a6a09722d4567ef4a37364b9b30bf7f20" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.nvim": { "branch": "main", "commit": "5df3155218807fb6049779bb488f48f77fdd9dcb" }, + "mini.nvim": { "branch": "main", "commit": "2d0f10540efdbb1f5c480ebe19ce4de451936a5d" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, - "noice.nvim": { "branch": "main", "commit": "f4decbc7a80229ccc9f86026b74bdcf0c39e38a7" }, + "noice.nvim": { "branch": "main", "commit": "09102ca2e9a3e9302119fdaf7a059a034e4a626d" }, "nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "34130cf1fd8171bf5252afb85ed5e10103fd4c44" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "e354bd84fed978e31501396aea6154bd97087e07" }, "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, - "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" }, + "nvim-cmp": { "branch": "main", "commit": "cd2cf0c124d3de577fb5449746568ee8e601afc8" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, + "nvim-dap": { "branch": "master", "commit": "615a1b2046e1eaf7995e0ba8e8a65f344201349d" }, "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "ba34c39459052c4bdc538d093368e5bf725595b8" }, + "nvim-lspconfig": { "branch": "master", "commit": "a3d9395455f2b2e3b50a0b0f37b8b4c23683f44a" }, "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-tree.lua": { "branch": "master", "commit": "64f61e4c913047a045ff90bd188dd3b54ee443cf" }, - "nvim-treesitter": { "branch": "master", "commit": "acefffae27b5105a717b213e19c5975bf7a4ba68" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" }, + "nvim-treesitter": { "branch": "master", "commit": "d6dcfe888724d271dcbaa6f2c80f9f706b39cd2a" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "dfa4178c0cadb44f687603d72ad0908474c28dd9" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, From 826190284cff8d20635861e9b501f56246d90d85 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 May 2024 21:28:53 +0300 Subject: [PATCH 2389/2667] Update license Converted to AsciiDoc --- LICENSE | 21 --------------------- LICENSE.adoc | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 21 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE.adoc diff --git a/LICENSE b/LICENSE deleted file mode 100644 index a5efa078..00000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2019 Marko Korhonen - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/LICENSE.adoc b/LICENSE.adoc new file mode 100644 index 00000000..276f8d35 --- /dev/null +++ b/LICENSE.adoc @@ -0,0 +1,14 @@ +== The MIT License (MIT) + +Copyright (c) {localyear} Marko Korhonen + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), +to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From 3e698a0edf3e00e7b6a87d8ee8622595697ac8bb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 May 2024 21:28:53 +0300 Subject: [PATCH 2390/2667] Update license Converted to AsciiDoc --- LICENSE | 21 --------------------- LICENSE.adoc | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 21 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE.adoc diff --git a/LICENSE b/LICENSE deleted file mode 100644 index a5efa078..00000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2019 Marko Korhonen - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/LICENSE.adoc b/LICENSE.adoc new file mode 100644 index 00000000..276f8d35 --- /dev/null +++ b/LICENSE.adoc @@ -0,0 +1,14 @@ +== The MIT License (MIT) + +Copyright (c) {localyear} Marko Korhonen + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), +to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From 62b3656bd98d0cf08a9a786994028bad5e4e2c17 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 May 2024 17:19:16 +0300 Subject: [PATCH 2391/2667] Change order of zsh config --- home/.config/zsh/{02-env.zsh => 01-env.sh} | 0 home/.config/zsh/{01-zellij.zsh => 02-zellij.zsh} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename home/.config/zsh/{02-env.zsh => 01-env.sh} (100%) rename home/.config/zsh/{01-zellij.zsh => 02-zellij.zsh} (100%) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/01-env.sh similarity index 100% rename from home/.config/zsh/02-env.zsh rename to home/.config/zsh/01-env.sh diff --git a/home/.config/zsh/01-zellij.zsh b/home/.config/zsh/02-zellij.zsh similarity index 100% rename from home/.config/zsh/01-zellij.zsh rename to home/.config/zsh/02-zellij.zsh From 8963a40485f6b8a4ca4519c97ec759d1a8b9971d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 May 2024 17:19:16 +0300 Subject: [PATCH 2392/2667] Change order of zsh config --- home/.config/zsh/{02-env.zsh => 01-env.sh} | 0 home/.config/zsh/{01-zellij.zsh => 02-zellij.zsh} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename home/.config/zsh/{02-env.zsh => 01-env.sh} (100%) rename home/.config/zsh/{01-zellij.zsh => 02-zellij.zsh} (100%) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/01-env.sh similarity index 100% rename from home/.config/zsh/02-env.zsh rename to home/.config/zsh/01-env.sh diff --git a/home/.config/zsh/01-zellij.zsh b/home/.config/zsh/02-zellij.zsh similarity index 100% rename from home/.config/zsh/01-zellij.zsh rename to home/.config/zsh/02-zellij.zsh From 81f884a3765439d6810bd94f58210ad9a24c8af2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 10:05:44 +0300 Subject: [PATCH 2393/2667] Change caddy image --- docker/caddy/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/caddy/docker-compose.toml b/docker/caddy/docker-compose.toml index f5431591..fc58c819 100644 --- a/docker/caddy/docker-compose.toml +++ b/docker/caddy/docker-compose.toml @@ -8,7 +8,7 @@ korhonen_cc = {} external = true [services.caddy] -image = "slothcroissant/caddy-cloudflaredns" +image = "git.korhonen.cc/functionalhacker/caddy" container_name = "caddy" restart = "unless-stopped" ports = ["80:80", "443:443/tcp", "443:443/udp"] From 5e6e8d5f545be3c4ba72331825bafe1965f2c201 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 10:05:44 +0300 Subject: [PATCH 2394/2667] Change caddy image --- docker/caddy/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/caddy/docker-compose.toml b/docker/caddy/docker-compose.toml index f5431591..fc58c819 100644 --- a/docker/caddy/docker-compose.toml +++ b/docker/caddy/docker-compose.toml @@ -8,7 +8,7 @@ korhonen_cc = {} external = true [services.caddy] -image = "slothcroissant/caddy-cloudflaredns" +image = "git.korhonen.cc/functionalhacker/caddy" container_name = "caddy" restart = "unless-stopped" ports = ["80:80", "443:443/tcp", "443:443/udp"] From 4bbafb42ffe030838e4e8d854a0c05f02175ccbf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 10:06:10 +0300 Subject: [PATCH 2395/2667] Caddy: add NET_ADMIN as suggested in the documentation --- docker/caddy/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/caddy/docker-compose.toml b/docker/caddy/docker-compose.toml index fc58c819..d1d109f0 100644 --- a/docker/caddy/docker-compose.toml +++ b/docker/caddy/docker-compose.toml @@ -23,6 +23,7 @@ volumes = [ "/var/www/index.korhonen.cc:/var/www/index.korhonen.cc", ] environment = ["CLOUDFLARE_EMAIL", "CLOUDFLARE_API_TOKEN", "ACME_AGREE=true"] +cap_add = ["NET_ADMIN"] [networks.proxy] external = true From f74ec7c4c4258540b43d58db6cfe69e4ea1b823e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 10:06:10 +0300 Subject: [PATCH 2396/2667] Caddy: add NET_ADMIN as suggested in the documentation --- docker/caddy/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/caddy/docker-compose.toml b/docker/caddy/docker-compose.toml index fc58c819..d1d109f0 100644 --- a/docker/caddy/docker-compose.toml +++ b/docker/caddy/docker-compose.toml @@ -23,6 +23,7 @@ volumes = [ "/var/www/index.korhonen.cc:/var/www/index.korhonen.cc", ] environment = ["CLOUDFLARE_EMAIL", "CLOUDFLARE_API_TOKEN", "ACME_AGREE=true"] +cap_add = ["NET_ADMIN"] [networks.proxy] external = true From 9760f03c00c3cd38931ec1f042dc2fb8eab48c57 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 12:54:38 +0300 Subject: [PATCH 2397/2667] Revert "Change order of zsh config" This reverts commit 62b3656bd98d0cf08a9a786994028bad5e4e2c17. --- home/.config/zsh/{02-zellij.zsh => 01-zellij.zsh} | 0 home/.config/zsh/{01-env.sh => 02-env.zsh} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename home/.config/zsh/{02-zellij.zsh => 01-zellij.zsh} (100%) rename home/.config/zsh/{01-env.sh => 02-env.zsh} (100%) diff --git a/home/.config/zsh/02-zellij.zsh b/home/.config/zsh/01-zellij.zsh similarity index 100% rename from home/.config/zsh/02-zellij.zsh rename to home/.config/zsh/01-zellij.zsh diff --git a/home/.config/zsh/01-env.sh b/home/.config/zsh/02-env.zsh similarity index 100% rename from home/.config/zsh/01-env.sh rename to home/.config/zsh/02-env.zsh From 3ba31fa6e7afedc0bde3527d8e342ff62a495dd2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 12:54:38 +0300 Subject: [PATCH 2398/2667] Revert "Change order of zsh config" This reverts commit 8963a40485f6b8a4ca4519c97ec759d1a8b9971d. --- home/.config/zsh/{02-zellij.zsh => 01-zellij.zsh} | 0 home/.config/zsh/{01-env.sh => 02-env.zsh} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename home/.config/zsh/{02-zellij.zsh => 01-zellij.zsh} (100%) rename home/.config/zsh/{01-env.sh => 02-env.zsh} (100%) diff --git a/home/.config/zsh/02-zellij.zsh b/home/.config/zsh/01-zellij.zsh similarity index 100% rename from home/.config/zsh/02-zellij.zsh rename to home/.config/zsh/01-zellij.zsh diff --git a/home/.config/zsh/01-env.sh b/home/.config/zsh/02-env.zsh similarity index 100% rename from home/.config/zsh/01-env.sh rename to home/.config/zsh/02-env.zsh From ff510d3b02bd5e1f469f20eb075c20380fe09a90 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 16:31:44 +0300 Subject: [PATCH 2399/2667] Caddy: improve error handling and start working on language redirect for homepage --- docker/caddy/Caddyfile | 45 ++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 7f93afdd..8dda9ef5 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -22,6 +22,16 @@ korhonen.cc, *.korhonen.cc { @homepage host korhonen.cc handle @homepage { + # Redirect finnish WIP + # @redirFinnish { + # header Accept-Language *fi-FI* + # not path *.js *.css *.png *.jpg *.jpeg *.svg + # not path /en* /fi* + # } + # redir @redirFinnish /fi{uri} + # + # uri strip_prefix /en + header @static Cache-Control max-age=5184000 root * /var/www/korhonen.cc file_server @@ -52,7 +62,7 @@ korhonen.cc, *.korhonen.cc { @forgejo host git.korhonen.cc handle @forgejo { - rewrite /user/login /user/oauth2/authentik + rewrite /user/login /user/oauth2/authentik reverse_proxy forgejo:3000 } @@ -89,8 +99,8 @@ korhonen.cc, *.korhonen.cc { @nextcloud host cloud.korhonen.cc handle @nextcloud { - # Redirect login page to Authentik - redir /login /apps/sociallogin/custom_oidc/korhonen-sso 301 + # Redirect login page to Authentik + redir /login /apps/sociallogin/custom_oidc/korhonen-sso 301 # .htaccess / data / config / ... shouldn't be accessible from outside @forbidden { @@ -142,15 +152,22 @@ korhonen.cc, *.korhonen.cc { reverse_proxy drop:3000 } - # Redirect to new fediverse host - @misskey host social.korhonen.cc - handle @misskey { - redir https://korhonen.social + handle { + respond "404 Not Found" 404 } - # Fallback for unhandled domains - handle { - redir https://korhonen.cc/404.html 301 + handle_errors { + @homepage_404 { + expression {http.error.status_code} == 404 + host korhonen.cc + } + handle @homepage_404 { + root * /var/www/korhonen.cc + rewrite * /404.html + file_server + } + + respond "{err.status_code} {err.status_text}" } } @@ -175,4 +192,12 @@ korhonen.social, *.korhonen.social { handle @firefish { reverse_proxy firefish:3000 } + + handle { + respond "404 Not Found" 404 + } + + handle_errors { + respond "{err.status_code} {err.status_text}" + } } From 483cca53598e37bfb78fce94922b5e5f45e3b9d6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 16:31:44 +0300 Subject: [PATCH 2400/2667] Caddy: improve error handling and start working on language redirect for homepage --- docker/caddy/Caddyfile | 45 ++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 7f93afdd..8dda9ef5 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -22,6 +22,16 @@ korhonen.cc, *.korhonen.cc { @homepage host korhonen.cc handle @homepage { + # Redirect finnish WIP + # @redirFinnish { + # header Accept-Language *fi-FI* + # not path *.js *.css *.png *.jpg *.jpeg *.svg + # not path /en* /fi* + # } + # redir @redirFinnish /fi{uri} + # + # uri strip_prefix /en + header @static Cache-Control max-age=5184000 root * /var/www/korhonen.cc file_server @@ -52,7 +62,7 @@ korhonen.cc, *.korhonen.cc { @forgejo host git.korhonen.cc handle @forgejo { - rewrite /user/login /user/oauth2/authentik + rewrite /user/login /user/oauth2/authentik reverse_proxy forgejo:3000 } @@ -89,8 +99,8 @@ korhonen.cc, *.korhonen.cc { @nextcloud host cloud.korhonen.cc handle @nextcloud { - # Redirect login page to Authentik - redir /login /apps/sociallogin/custom_oidc/korhonen-sso 301 + # Redirect login page to Authentik + redir /login /apps/sociallogin/custom_oidc/korhonen-sso 301 # .htaccess / data / config / ... shouldn't be accessible from outside @forbidden { @@ -142,15 +152,22 @@ korhonen.cc, *.korhonen.cc { reverse_proxy drop:3000 } - # Redirect to new fediverse host - @misskey host social.korhonen.cc - handle @misskey { - redir https://korhonen.social + handle { + respond "404 Not Found" 404 } - # Fallback for unhandled domains - handle { - redir https://korhonen.cc/404.html 301 + handle_errors { + @homepage_404 { + expression {http.error.status_code} == 404 + host korhonen.cc + } + handle @homepage_404 { + root * /var/www/korhonen.cc + rewrite * /404.html + file_server + } + + respond "{err.status_code} {err.status_text}" } } @@ -175,4 +192,12 @@ korhonen.social, *.korhonen.social { handle @firefish { reverse_proxy firefish:3000 } + + handle { + respond "404 Not Found" 404 + } + + handle_errors { + respond "{err.status_code} {err.status_text}" + } } From 40030e646c0dee4bad5f10dfd9414f8b6d3998de Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 21:55:02 +0300 Subject: [PATCH 2401/2667] Add beleriand and esgaroth to ssh config --- home/.ssh/config | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index 4cb27394..158ae712 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -17,6 +17,14 @@ host moria RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh +host beleriand + HostName beleriand.korhonen.lan + User root + +host esgaroth + HostName esgaroth.korhonen.lan + User root + host tirion HostName tirion.korhonen.cc port 22 From 0c8284badc7a4fb5915cff089dca356c2bb1535f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 21:55:02 +0300 Subject: [PATCH 2402/2667] Add beleriand and esgaroth to ssh config --- home/.ssh/config | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index 4cb27394..158ae712 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -17,6 +17,14 @@ host moria RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh +host beleriand + HostName beleriand.korhonen.lan + User root + +host esgaroth + HostName esgaroth.korhonen.lan + User root + host tirion HostName tirion.korhonen.cc port 22 From 876cb45c37d7d17dd5c6bb83a2092784bc4614bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 22:13:17 +0300 Subject: [PATCH 2403/2667] Jellyfin: fix card path --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 80c0fd9b..661d0d2d 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -24,7 +24,7 @@ volumes = [ ] devices = [ "/dev/dri/renderD128:/dev/dri/renderD128", - "/dev/dri/card0:/dev/dri/card0", + "/dev/dri/card1:/dev/dri/card0", ] [networks.proxy] From 123104740ecc59c94375a918da5bc413b871469f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 22:13:17 +0300 Subject: [PATCH 2404/2667] Jellyfin: fix card path --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 80c0fd9b..661d0d2d 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -24,7 +24,7 @@ volumes = [ ] devices = [ "/dev/dri/renderD128:/dev/dri/renderD128", - "/dev/dri/card0:/dev/dri/card0", + "/dev/dri/card1:/dev/dri/card0", ] [networks.proxy] From e709911b6ac0c6746e2c1d7458c1ed098c4046fa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 13 May 2024 10:45:07 +0300 Subject: [PATCH 2405/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 2baf17b1..f01c90ee 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -17,36 +17,36 @@ "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dropbar.nvim": { "branch": "master", "commit": "3dd8edba9f9eeb129db269dd57ef6c0427b7ad9d" }, - "firenvim": { "branch": "master", "commit": "03ba12a5a92a02d171005775a8150998c4060a74" }, + "firenvim": { "branch": "master", "commit": "fc72687977e1c34259c42f0e408655cf2638760d" }, "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" }, "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" }, - "lazy.nvim": { "branch": "main", "commit": "d3974346b6cef2116c8e7b08423256a834cb7cbc" }, + "lazy.nvim": { "branch": "main", "commit": "e44636a43376e8a1e851958f7e9cbe996751d59f" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "2f18cab30f3d621002c58c725d9319a1563414e5" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "c3168b2a6a09722d4567ef4a37364b9b30bf7f20" }, - "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.nvim": { "branch": "main", "commit": "2d0f10540efdbb1f5c480ebe19ce4de451936a5d" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" }, + "mason.nvim": { "branch": "main", "commit": "1b3d60405d1d720b2c4927f19672e9479703b00f" }, + "mini.nvim": { "branch": "main", "commit": "c333187fcc76d7e772dac32c2a440a949fe34be4" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, "noice.nvim": { "branch": "main", "commit": "09102ca2e9a3e9302119fdaf7a059a034e4a626d" }, "nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "e354bd84fed978e31501396aea6154bd97087e07" }, "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, - "nvim-cmp": { "branch": "main", "commit": "cd2cf0c124d3de577fb5449746568ee8e601afc8" }, + "nvim-cmp": { "branch": "main", "commit": "24122371810089d390847d8ba66325c1f1aa64c0" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-dap": { "branch": "master", "commit": "615a1b2046e1eaf7995e0ba8e8a65f344201349d" }, "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "a3d9395455f2b2e3b50a0b0f37b8b4c23683f44a" }, + "nvim-lspconfig": { "branch": "master", "commit": "94513a5b246cf32a8f87ca714af50911df63351c" }, "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "64f61e4c913047a045ff90bd188dd3b54ee443cf" }, - "nvim-treesitter": { "branch": "master", "commit": "d6dcfe888724d271dcbaa6f2c80f9f706b39cd2a" }, + "nvim-tree.lua": { "branch": "master", "commit": "78c4c083ed5d47e7fab7627d78ce33d3bcfb88f0" }, + "nvim-treesitter": { "branch": "master", "commit": "d5a1c2b0c8ec5bb377a41c1c414b315d6b3e9432" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "dfa4178c0cadb44f687603d72ad0908474c28dd9" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, @@ -59,7 +59,7 @@ "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "fac83a556e7b710dc31433dec727361ca062dbe9" }, + "telescope.nvim": { "branch": "master", "commit": "02a60a83961cf9c80e471599171982a31d1cc853" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "ce882460cf3db12e99f8bf579cbf99e331f6dd4f" }, From 9809d5cd32b2631b1eba8007332fb8484e7ef1e5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 13 May 2024 10:45:07 +0300 Subject: [PATCH 2406/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 2baf17b1..f01c90ee 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -17,36 +17,36 @@ "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dropbar.nvim": { "branch": "master", "commit": "3dd8edba9f9eeb129db269dd57ef6c0427b7ad9d" }, - "firenvim": { "branch": "master", "commit": "03ba12a5a92a02d171005775a8150998c4060a74" }, + "firenvim": { "branch": "master", "commit": "fc72687977e1c34259c42f0e408655cf2638760d" }, "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" }, "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" }, - "lazy.nvim": { "branch": "main", "commit": "d3974346b6cef2116c8e7b08423256a834cb7cbc" }, + "lazy.nvim": { "branch": "main", "commit": "e44636a43376e8a1e851958f7e9cbe996751d59f" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "2f18cab30f3d621002c58c725d9319a1563414e5" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "c3168b2a6a09722d4567ef4a37364b9b30bf7f20" }, - "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.nvim": { "branch": "main", "commit": "2d0f10540efdbb1f5c480ebe19ce4de451936a5d" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" }, + "mason.nvim": { "branch": "main", "commit": "1b3d60405d1d720b2c4927f19672e9479703b00f" }, + "mini.nvim": { "branch": "main", "commit": "c333187fcc76d7e772dac32c2a440a949fe34be4" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, "noice.nvim": { "branch": "main", "commit": "09102ca2e9a3e9302119fdaf7a059a034e4a626d" }, "nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "e354bd84fed978e31501396aea6154bd97087e07" }, "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, - "nvim-cmp": { "branch": "main", "commit": "cd2cf0c124d3de577fb5449746568ee8e601afc8" }, + "nvim-cmp": { "branch": "main", "commit": "24122371810089d390847d8ba66325c1f1aa64c0" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-dap": { "branch": "master", "commit": "615a1b2046e1eaf7995e0ba8e8a65f344201349d" }, "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "a3d9395455f2b2e3b50a0b0f37b8b4c23683f44a" }, + "nvim-lspconfig": { "branch": "master", "commit": "94513a5b246cf32a8f87ca714af50911df63351c" }, "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "64f61e4c913047a045ff90bd188dd3b54ee443cf" }, - "nvim-treesitter": { "branch": "master", "commit": "d6dcfe888724d271dcbaa6f2c80f9f706b39cd2a" }, + "nvim-tree.lua": { "branch": "master", "commit": "78c4c083ed5d47e7fab7627d78ce33d3bcfb88f0" }, + "nvim-treesitter": { "branch": "master", "commit": "d5a1c2b0c8ec5bb377a41c1c414b315d6b3e9432" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "dfa4178c0cadb44f687603d72ad0908474c28dd9" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, @@ -59,7 +59,7 @@ "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "fac83a556e7b710dc31433dec727361ca062dbe9" }, + "telescope.nvim": { "branch": "master", "commit": "02a60a83961cf9c80e471599171982a31d1cc853" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "ce882460cf3db12e99f8bf579cbf99e331f6dd4f" }, From b5e1c7c2d13b4aeeed573e5b6372bf4e6e1889ee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 May 2024 15:19:09 +0300 Subject: [PATCH 2407/2667] Fix GPU number again --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 661d0d2d..80c0fd9b 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -24,7 +24,7 @@ volumes = [ ] devices = [ "/dev/dri/renderD128:/dev/dri/renderD128", - "/dev/dri/card1:/dev/dri/card0", + "/dev/dri/card0:/dev/dri/card0", ] [networks.proxy] From 39d9a343784ecab549315c23fecc1244b57dad2e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 May 2024 15:19:09 +0300 Subject: [PATCH 2408/2667] Fix GPU number again --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 661d0d2d..80c0fd9b 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -24,7 +24,7 @@ volumes = [ ] devices = [ "/dev/dri/renderD128:/dev/dri/renderD128", - "/dev/dri/card1:/dev/dri/card0", + "/dev/dri/card0:/dev/dri/card0", ] [networks.proxy] From becfcc4968c19998f2dc778be8f64f77f5054311 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 May 2024 17:25:09 +0300 Subject: [PATCH 2409/2667] Add rivendell ssh host --- home/.ssh/config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index 158ae712..7aefad33 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -25,6 +25,10 @@ host esgaroth HostName esgaroth.korhonen.lan User root +host rivendell + HostName rivendell.korhonen.lan + User root + host tirion HostName tirion.korhonen.cc port 22 From 8e1723e3e1c96c8132ef6b64b58a9bf6abcb4e73 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 May 2024 17:25:09 +0300 Subject: [PATCH 2410/2667] Add rivendell ssh host --- home/.ssh/config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index 158ae712..7aefad33 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -25,6 +25,10 @@ host esgaroth HostName esgaroth.korhonen.lan User root +host rivendell + HostName rivendell.korhonen.lan + User root + host tirion HostName tirion.korhonen.cc port 22 From 0610df9908c3cf67921aba86918d10a51638ffff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 May 2024 17:58:27 +0300 Subject: [PATCH 2411/2667] Add ipv6 and ipv4 test sites --- docker/caddy/Caddyfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 8dda9ef5..d93c1589 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -152,6 +152,11 @@ korhonen.cc, *.korhonen.cc { reverse_proxy drop:3000 } + @ipvX host ipv6.korhonen.cc ipv4.korhonen.cc + handle @ipvX { + respond {remote_host} + } + handle { respond "404 Not Found" 404 } From aaa9cc67b94bd5fb86fa071fac06c304fff27be7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 May 2024 17:58:27 +0300 Subject: [PATCH 2412/2667] Add ipv6 and ipv4 test sites --- docker/caddy/Caddyfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 8dda9ef5..d93c1589 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -152,6 +152,11 @@ korhonen.cc, *.korhonen.cc { reverse_proxy drop:3000 } + @ipvX host ipv6.korhonen.cc ipv4.korhonen.cc + handle @ipvX { + respond {remote_host} + } + handle { respond "404 Not Found" 404 } From f73a509ae3d0b40f2f8023aed8556be2082e7287 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 May 2024 09:05:02 +0300 Subject: [PATCH 2413/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 28 ++++++++++++++-------------- home/.config/nvim/mason-lock.json | 7 ++++--- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index f01c90ee..cf615caa 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" }, + "LuaSnip": { "branch": "master", "commit": "7b1dda0dfdefc10b2501295eba5e463dbd7c338f" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" }, @@ -18,7 +18,7 @@ "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dropbar.nvim": { "branch": "master", "commit": "3dd8edba9f9eeb129db269dd57ef6c0427b7ad9d" }, "firenvim": { "branch": "master", "commit": "fc72687977e1c34259c42f0e408655cf2638760d" }, - "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" }, + "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" }, @@ -28,29 +28,29 @@ "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "2f18cab30f3d621002c58c725d9319a1563414e5" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" }, - "mason.nvim": { "branch": "main", "commit": "1b3d60405d1d720b2c4927f19672e9479703b00f" }, + "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, "mini.nvim": { "branch": "main", "commit": "c333187fcc76d7e772dac32c2a440a949fe34be4" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, - "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, - "noice.nvim": { "branch": "main", "commit": "09102ca2e9a3e9302119fdaf7a059a034e4a626d" }, + "neoformat": { "branch": "master", "commit": "34d4d89fea22645b16f69f818dcb7b6b682b0c1a" }, + "noice.nvim": { "branch": "main", "commit": "61947de3d5904375ea94e0c13db2537488ad9829" }, "nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "e354bd84fed978e31501396aea6154bd97087e07" }, - "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, + "nvim-autopairs": { "branch": "master", "commit": "b0b79e42a28f09719a7da9534c3731fa37319d9b" }, "nvim-cmp": { "branch": "main", "commit": "24122371810089d390847d8ba66325c1f1aa64c0" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "615a1b2046e1eaf7995e0ba8e8a65f344201349d" }, + "nvim-dap": { "branch": "master", "commit": "559d0bbdbc4be4c7e774423061263771be1dbde8" }, "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "94513a5b246cf32a8f87ca714af50911df63351c" }, + "nvim-lspconfig": { "branch": "master", "commit": "b24e96a660d665f3a2d27941e8da0d0c433813d9" }, "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "78c4c083ed5d47e7fab7627d78ce33d3bcfb88f0" }, - "nvim-treesitter": { "branch": "master", "commit": "d5a1c2b0c8ec5bb377a41c1c414b315d6b3e9432" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "dfa4178c0cadb44f687603d72ad0908474c28dd9" }, + "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" }, + "nvim-treesitter": { "branch": "master", "commit": "aa0c7dd29631ee8c2df738d99bd33b762b3a6e22" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "84cc9ed772f1fee2f47c1e076f518829583d8347" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, - "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, + "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, @@ -59,10 +59,10 @@ "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "02a60a83961cf9c80e471599171982a31d1cc853" }, + "telescope.nvim": { "branch": "master", "commit": "52f500110bcf9190b44b4d8640162adc86772ec4" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "ce882460cf3db12e99f8bf579cbf99e331f6dd4f" }, + "vim-fugitive": { "branch": "master", "commit": "19ca61c78c86a2ce6a425aee9b1c6664e5149ea6" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index d8cce6f5..371f3c35 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,15 +1,16 @@ { - "bash-language-server": "5.2.0", + "bash-language-server": "5.3.3", "css-lsp": "4.10.0", "docker-compose-language-service": "0.2.0", "dockerfile-language-server": "0.11.0", "eslint-lsp": "4.10.0", + "google-java-format": "v1.22.0", "html-lsp": "4.10.0", "java-debug-adapter": "0.55.0", - "jdtls": "v1.34.0", + "jdtls": "v1.35.0", "json-lsp": "4.10.0", "lemminx": "0.26.1", - "lua-language-server": "3.8.3", + "lua-language-server": "3.9.1", "prettier": "3.2.5", "prettierd": "0.25.3", "stylua": "v0.20.0", From 66748571b89d000ff2c30dd05532c06fd45f7144 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 May 2024 09:05:02 +0300 Subject: [PATCH 2414/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 28 ++++++++++++++-------------- home/.config/nvim/mason-lock.json | 7 ++++--- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index f01c90ee..cf615caa 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" }, + "LuaSnip": { "branch": "master", "commit": "7b1dda0dfdefc10b2501295eba5e463dbd7c338f" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" }, @@ -18,7 +18,7 @@ "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dropbar.nvim": { "branch": "master", "commit": "3dd8edba9f9eeb129db269dd57ef6c0427b7ad9d" }, "firenvim": { "branch": "master", "commit": "fc72687977e1c34259c42f0e408655cf2638760d" }, - "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" }, + "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" }, @@ -28,29 +28,29 @@ "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "2f18cab30f3d621002c58c725d9319a1563414e5" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" }, - "mason.nvim": { "branch": "main", "commit": "1b3d60405d1d720b2c4927f19672e9479703b00f" }, + "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, "mini.nvim": { "branch": "main", "commit": "c333187fcc76d7e772dac32c2a440a949fe34be4" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, - "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, - "noice.nvim": { "branch": "main", "commit": "09102ca2e9a3e9302119fdaf7a059a034e4a626d" }, + "neoformat": { "branch": "master", "commit": "34d4d89fea22645b16f69f818dcb7b6b682b0c1a" }, + "noice.nvim": { "branch": "main", "commit": "61947de3d5904375ea94e0c13db2537488ad9829" }, "nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "e354bd84fed978e31501396aea6154bd97087e07" }, - "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, + "nvim-autopairs": { "branch": "master", "commit": "b0b79e42a28f09719a7da9534c3731fa37319d9b" }, "nvim-cmp": { "branch": "main", "commit": "24122371810089d390847d8ba66325c1f1aa64c0" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "615a1b2046e1eaf7995e0ba8e8a65f344201349d" }, + "nvim-dap": { "branch": "master", "commit": "559d0bbdbc4be4c7e774423061263771be1dbde8" }, "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "94513a5b246cf32a8f87ca714af50911df63351c" }, + "nvim-lspconfig": { "branch": "master", "commit": "b24e96a660d665f3a2d27941e8da0d0c433813d9" }, "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "78c4c083ed5d47e7fab7627d78ce33d3bcfb88f0" }, - "nvim-treesitter": { "branch": "master", "commit": "d5a1c2b0c8ec5bb377a41c1c414b315d6b3e9432" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "dfa4178c0cadb44f687603d72ad0908474c28dd9" }, + "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" }, + "nvim-treesitter": { "branch": "master", "commit": "aa0c7dd29631ee8c2df738d99bd33b762b3a6e22" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "84cc9ed772f1fee2f47c1e076f518829583d8347" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, - "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, + "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, @@ -59,10 +59,10 @@ "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "02a60a83961cf9c80e471599171982a31d1cc853" }, + "telescope.nvim": { "branch": "master", "commit": "52f500110bcf9190b44b4d8640162adc86772ec4" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "ce882460cf3db12e99f8bf579cbf99e331f6dd4f" }, + "vim-fugitive": { "branch": "master", "commit": "19ca61c78c86a2ce6a425aee9b1c6664e5149ea6" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index d8cce6f5..371f3c35 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,15 +1,16 @@ { - "bash-language-server": "5.2.0", + "bash-language-server": "5.3.3", "css-lsp": "4.10.0", "docker-compose-language-service": "0.2.0", "dockerfile-language-server": "0.11.0", "eslint-lsp": "4.10.0", + "google-java-format": "v1.22.0", "html-lsp": "4.10.0", "java-debug-adapter": "0.55.0", - "jdtls": "v1.34.0", + "jdtls": "v1.35.0", "json-lsp": "4.10.0", "lemminx": "0.26.1", - "lua-language-server": "3.8.3", + "lua-language-server": "3.9.1", "prettier": "3.2.5", "prettierd": "0.25.3", "stylua": "v0.20.0", From 4bade978321c03b0ad5aa03a422f4f47d845a2b1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 May 2024 19:50:59 +0300 Subject: [PATCH 2415/2667] Change forgejo SSH port New ISP seems to be blocking 22 --- docker/forgejo/docker-compose.toml | 2 +- home/.ssh/config | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index 1d2e0176..aa1c48b9 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -8,7 +8,7 @@ container_name = "forgejo" environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] restart = "unless-stopped" networks = ["postgres", "proxy"] -ports = ["22:22"] +ports = ["2882:2882"] volumes = ["data:/data", "/etc/localtime:/etc/localtime:ro"] [services.runner] diff --git a/home/.ssh/config b/home/.ssh/config index 7aefad33..0a97b703 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -40,6 +40,7 @@ host tirion host forgejo HostName git.korhonen.cc + port 2882 user git host gitlab From 8920dd7657d002987698989351bd6ee0b6273643 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 May 2024 19:50:59 +0300 Subject: [PATCH 2416/2667] Change forgejo SSH port New ISP seems to be blocking 22 --- docker/forgejo/docker-compose.toml | 2 +- home/.ssh/config | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index 1d2e0176..aa1c48b9 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -8,7 +8,7 @@ container_name = "forgejo" environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] restart = "unless-stopped" networks = ["postgres", "proxy"] -ports = ["22:22"] +ports = ["2882:2882"] volumes = ["data:/data", "/etc/localtime:/etc/localtime:ro"] [services.runner] diff --git a/home/.ssh/config b/home/.ssh/config index 7aefad33..0a97b703 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -40,6 +40,7 @@ host tirion host forgejo HostName git.korhonen.cc + port 2882 user git host gitlab From 0f215d106c2791ddb0812634a0f658fa0fdc4a51 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 May 2024 20:00:53 +0300 Subject: [PATCH 2417/2667] Fix forgejo internal ssh port --- docker/forgejo/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index aa1c48b9..ffbaf049 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -8,7 +8,7 @@ container_name = "forgejo" environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] restart = "unless-stopped" networks = ["postgres", "proxy"] -ports = ["2882:2882"] +ports = ["2882:22"] volumes = ["data:/data", "/etc/localtime:/etc/localtime:ro"] [services.runner] From c195635235aa2309c9eafc1b3a6cf1e56966ae21 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 May 2024 20:00:53 +0300 Subject: [PATCH 2418/2667] Fix forgejo internal ssh port --- docker/forgejo/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index aa1c48b9..ffbaf049 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -8,7 +8,7 @@ container_name = "forgejo" environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] restart = "unless-stopped" networks = ["postgres", "proxy"] -ports = ["2882:2882"] +ports = ["2882:22"] volumes = ["data:/data", "/etc/localtime:/etc/localtime:ro"] [services.runner] From 3655087f6319a5e3bad892efc2db1cbcf9c39ab6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 May 2024 09:31:58 +0300 Subject: [PATCH 2419/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 50 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index cf615caa..2f0728dd 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,13 +1,13 @@ { - "LuaSnip": { "branch": "master", "commit": "7b1dda0dfdefc10b2501295eba5e463dbd7c338f" }, + "LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, - "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, + "bufferline.nvim": { "branch": "main", "commit": "9ae49d71c84b42b91795f7b7cead223c6346e774" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-git": { "branch": "main", "commit": "b9603f18496bc3ca07e6bd474607081af709e750" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, @@ -15,54 +15,54 @@ "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, - "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "3dd8edba9f9eeb129db269dd57ef6c0427b7ad9d" }, + "diffview.nvim": { "branch": "main", "commit": "9bdd5537575c2ea7925b71ae06585b934beea13d" }, + "dropbar.nvim": { "branch": "master", "commit": "9fc10fa1a34ec3e55b470962e4e94644611bd209" }, "firenvim": { "branch": "master", "commit": "fc72687977e1c34259c42f0e408655cf2638760d" }, "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, + "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" }, "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" }, - "lazy.nvim": { "branch": "main", "commit": "e44636a43376e8a1e851958f7e9cbe996751d59f" }, + "lazy.nvim": { "branch": "main", "commit": "0de782a6b0ffba599dbd332a4019d852564bf28c" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "2f18cab30f3d621002c58c725d9319a1563414e5" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, - "mini.nvim": { "branch": "main", "commit": "c333187fcc76d7e772dac32c2a440a949fe34be4" }, + "mini.nvim": { "branch": "main", "commit": "cd3a08fbf987dabcfded35ebb612e82f8000f92a" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "34d4d89fea22645b16f69f818dcb7b6b682b0c1a" }, - "noice.nvim": { "branch": "main", "commit": "61947de3d5904375ea94e0c13db2537488ad9829" }, - "nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" }, + "noice.nvim": { "branch": "main", "commit": "9f6f6ba74f8bfbf7e43d6302cf86b070362f6203" }, + "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "e354bd84fed978e31501396aea6154bd97087e07" }, - "nvim-autopairs": { "branch": "master", "commit": "b0b79e42a28f09719a7da9534c3731fa37319d9b" }, - "nvim-cmp": { "branch": "main", "commit": "24122371810089d390847d8ba66325c1f1aa64c0" }, + "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, + "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "559d0bbdbc4be4c7e774423061263771be1dbde8" }, + "nvim-dap": { "branch": "master", "commit": "5a2f7121869394502521c52b2bc581ab22c69447" }, "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" }, - "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, + "nvim-jdtls": { "branch": "master", "commit": "29255ea26dfb51ef0213f7572bff410f1afb002d" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "b24e96a660d665f3a2d27941e8da0d0c433813d9" }, + "nvim-lspconfig": { "branch": "master", "commit": "9bda20fb967075355f253911bc066a8b5a03c77e" }, "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, - "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, + "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" }, - "nvim-treesitter": { "branch": "master", "commit": "aa0c7dd29631ee8c2df738d99bd33b762b3a6e22" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "84cc9ed772f1fee2f47c1e076f518829583d8347" }, - "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, + "nvim-treesitter": { "branch": "master", "commit": "d184407e33084f4a57302bc1adf991997ccdd1da" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" }, + "nvim-ts-autotag": { "branch": "main", "commit": "cb57b07803476ee902c89412aeff219a9a58be13" }, + "nvim-ufo": { "branch": "main", "commit": "4b4077850d1b3af09f4957b67144943cf3da401a" }, "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, + "plenary.nvim": { "branch": "master", "commit": "b5c8de02a44ffeabff678090edd6a132ff8ab77d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "52f500110bcf9190b44b4d8640162adc86772ec4" }, + "telescope.nvim": { "branch": "master", "commit": "0c12735d5aff6a48ffd8111bf144dc2ff44e5975" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "19ca61c78c86a2ce6a425aee9b1c6664e5149ea6" }, + "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From aadfb243a0c799c54f86f41d77576018ae748491 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 May 2024 09:31:58 +0300 Subject: [PATCH 2420/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 50 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index cf615caa..2f0728dd 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,13 +1,13 @@ { - "LuaSnip": { "branch": "master", "commit": "7b1dda0dfdefc10b2501295eba5e463dbd7c338f" }, + "LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, - "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, + "bufferline.nvim": { "branch": "main", "commit": "9ae49d71c84b42b91795f7b7cead223c6346e774" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-git": { "branch": "main", "commit": "b9603f18496bc3ca07e6bd474607081af709e750" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, @@ -15,54 +15,54 @@ "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, - "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dropbar.nvim": { "branch": "master", "commit": "3dd8edba9f9eeb129db269dd57ef6c0427b7ad9d" }, + "diffview.nvim": { "branch": "main", "commit": "9bdd5537575c2ea7925b71ae06585b934beea13d" }, + "dropbar.nvim": { "branch": "master", "commit": "9fc10fa1a34ec3e55b470962e4e94644611bd209" }, "firenvim": { "branch": "master", "commit": "fc72687977e1c34259c42f0e408655cf2638760d" }, "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, + "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" }, "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" }, - "lazy.nvim": { "branch": "main", "commit": "e44636a43376e8a1e851958f7e9cbe996751d59f" }, + "lazy.nvim": { "branch": "main", "commit": "0de782a6b0ffba599dbd332a4019d852564bf28c" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "2f18cab30f3d621002c58c725d9319a1563414e5" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, - "mini.nvim": { "branch": "main", "commit": "c333187fcc76d7e772dac32c2a440a949fe34be4" }, + "mini.nvim": { "branch": "main", "commit": "cd3a08fbf987dabcfded35ebb612e82f8000f92a" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "34d4d89fea22645b16f69f818dcb7b6b682b0c1a" }, - "noice.nvim": { "branch": "main", "commit": "61947de3d5904375ea94e0c13db2537488ad9829" }, - "nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" }, + "noice.nvim": { "branch": "main", "commit": "9f6f6ba74f8bfbf7e43d6302cf86b070362f6203" }, + "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "e354bd84fed978e31501396aea6154bd97087e07" }, - "nvim-autopairs": { "branch": "master", "commit": "b0b79e42a28f09719a7da9534c3731fa37319d9b" }, - "nvim-cmp": { "branch": "main", "commit": "24122371810089d390847d8ba66325c1f1aa64c0" }, + "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, + "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "559d0bbdbc4be4c7e774423061263771be1dbde8" }, + "nvim-dap": { "branch": "master", "commit": "5a2f7121869394502521c52b2bc581ab22c69447" }, "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" }, - "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, + "nvim-jdtls": { "branch": "master", "commit": "29255ea26dfb51ef0213f7572bff410f1afb002d" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "b24e96a660d665f3a2d27941e8da0d0c433813d9" }, + "nvim-lspconfig": { "branch": "master", "commit": "9bda20fb967075355f253911bc066a8b5a03c77e" }, "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, - "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, + "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" }, - "nvim-treesitter": { "branch": "master", "commit": "aa0c7dd29631ee8c2df738d99bd33b762b3a6e22" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "84cc9ed772f1fee2f47c1e076f518829583d8347" }, - "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, + "nvim-treesitter": { "branch": "master", "commit": "d184407e33084f4a57302bc1adf991997ccdd1da" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" }, + "nvim-ts-autotag": { "branch": "main", "commit": "cb57b07803476ee902c89412aeff219a9a58be13" }, + "nvim-ufo": { "branch": "main", "commit": "4b4077850d1b3af09f4957b67144943cf3da401a" }, "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, + "plenary.nvim": { "branch": "master", "commit": "b5c8de02a44ffeabff678090edd6a132ff8ab77d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "52f500110bcf9190b44b4d8640162adc86772ec4" }, + "telescope.nvim": { "branch": "master", "commit": "0c12735d5aff6a48ffd8111bf144dc2ff44e5975" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "19ca61c78c86a2ce6a425aee9b1c6664e5149ea6" }, + "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From f4a9b01114ccd5115498d1ce5f59c1ca251559f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 May 2024 10:02:02 +0300 Subject: [PATCH 2421/2667] Add neovide fork setting --- home/.config/zsh/02-env.zsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index cd54499d..8fef18a9 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -71,8 +71,9 @@ export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR export SYSTEMD_PAGER=less -# Enable multigrid for neovide +# neovide settings export NEOVIDE_MULTIGRID=1 +export NEOVIDE_FORK=1 {%@@ if distro_id == "arch" or distro_id == "ubuntu" @@%} if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then From e4b8977f6b0645c85b8048dab8bd45e8c7794888 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 May 2024 10:02:02 +0300 Subject: [PATCH 2422/2667] Add neovide fork setting --- home/.config/zsh/02-env.zsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/02-env.zsh b/home/.config/zsh/02-env.zsh index cd54499d..8fef18a9 100644 --- a/home/.config/zsh/02-env.zsh +++ b/home/.config/zsh/02-env.zsh @@ -71,8 +71,9 @@ export MANPAGER="$EDITOR +\"lua require 'pager'\" +Man!" export SYSTEMD_EDITOR=$EDITOR export SYSTEMD_PAGER=less -# Enable multigrid for neovide +# neovide settings export NEOVIDE_MULTIGRID=1 +export NEOVIDE_FORK=1 {%@@ if distro_id == "arch" or distro_id == "ubuntu" @@%} if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then From 6711038e535a15ee8d000c980f62d0d7483ef743 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 May 2024 17:11:44 +0300 Subject: [PATCH 2423/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 22 ++++++++++----------- home/.config/nvim/lua/plugins/telescope.lua | 3 ++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 2f0728dd..69800814 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -2,7 +2,7 @@ "LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, - "bufferline.nvim": { "branch": "main", "commit": "9ae49d71c84b42b91795f7b7cead223c6346e774" }, + "bufferline.nvim": { "branch": "main", "commit": "0dfc19b7a15a3bc47b975fcffde03859c46dd097" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -15,21 +15,21 @@ "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, - "diffview.nvim": { "branch": "main", "commit": "9bdd5537575c2ea7925b71ae06585b934beea13d" }, + "diffview.nvim": { "branch": "main", "commit": "ad03c42b2899117ff039d84ac24860a77116204b" }, "dropbar.nvim": { "branch": "master", "commit": "9fc10fa1a34ec3e55b470962e4e94644611bd209" }, "firenvim": { "branch": "master", "commit": "fc72687977e1c34259c42f0e408655cf2638760d" }, "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" }, "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" }, - "lazy.nvim": { "branch": "main", "commit": "0de782a6b0ffba599dbd332a4019d852564bf28c" }, + "lazy.nvim": { "branch": "main", "commit": "9895337d1f4c0cea1186d92148e3d80f6551eda8" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "2f18cab30f3d621002c58c725d9319a1563414e5" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, - "mini.nvim": { "branch": "main", "commit": "cd3a08fbf987dabcfded35ebb612e82f8000f92a" }, + "mini.nvim": { "branch": "main", "commit": "eb2dd6d187e1ab5fefec66f0d37b1a3dc8633d17" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "34d4d89fea22645b16f69f818dcb7b6b682b0c1a" }, "noice.nvim": { "branch": "main", "commit": "9f6f6ba74f8bfbf7e43d6302cf86b070362f6203" }, @@ -39,27 +39,27 @@ "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-dap": { "branch": "master", "commit": "5a2f7121869394502521c52b2bc581ab22c69447" }, - "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" }, + "nvim-dap-ui": { "branch": "master", "commit": "334cf3038c4756e6ab999cbac67c847fb654c190" }, "nvim-jdtls": { "branch": "master", "commit": "29255ea26dfb51ef0213f7572bff410f1afb002d" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "9bda20fb967075355f253911bc066a8b5a03c77e" }, + "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" }, - "nvim-treesitter": { "branch": "master", "commit": "d184407e33084f4a57302bc1adf991997ccdd1da" }, + "nvim-treesitter": { "branch": "master", "commit": "73fb37ed77b18ac357ca8e6e35835a8db6602332" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" }, "nvim-ts-autotag": { "branch": "main", "commit": "cb57b07803476ee902c89412aeff219a9a58be13" }, - "nvim-ufo": { "branch": "main", "commit": "4b4077850d1b3af09f4957b67144943cf3da401a" }, + "nvim-ufo": { "branch": "main", "commit": "65dda6360879f6ffe0278163b9192a573a0d2a08" }, "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "b5c8de02a44ffeabff678090edd6a132ff8ab77d" }, - "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "project.nvim": { "branch": "fix-get_clients", "commit": "7c0575ce2400769e2c4c9c2aefa2e745ce9a9674" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "0c12735d5aff6a48ffd8111bf144dc2ff44e5975" }, + "telescope.nvim": { "branch": "master", "commit": "4aed63995a69e343b068c7469491a8d1592c339f" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }, diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index c0842a3d..ab87eb27 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -20,7 +20,8 @@ return { -- Switch to a project { - "ahmedkhalf/project.nvim", + "LennyPhoenix/project.nvim", + branch = "fix-get_clients", main = "project_nvim", opts = { patterns = { ".git" }, From b52287e25a24226583dd480d95de86237ead2b79 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 May 2024 17:11:44 +0300 Subject: [PATCH 2424/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 22 ++++++++++----------- home/.config/nvim/lua/plugins/telescope.lua | 3 ++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 2f0728dd..69800814 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -2,7 +2,7 @@ "LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, - "bufferline.nvim": { "branch": "main", "commit": "9ae49d71c84b42b91795f7b7cead223c6346e774" }, + "bufferline.nvim": { "branch": "main", "commit": "0dfc19b7a15a3bc47b975fcffde03859c46dd097" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -15,21 +15,21 @@ "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, - "diffview.nvim": { "branch": "main", "commit": "9bdd5537575c2ea7925b71ae06585b934beea13d" }, + "diffview.nvim": { "branch": "main", "commit": "ad03c42b2899117ff039d84ac24860a77116204b" }, "dropbar.nvim": { "branch": "master", "commit": "9fc10fa1a34ec3e55b470962e4e94644611bd209" }, "firenvim": { "branch": "master", "commit": "fc72687977e1c34259c42f0e408655cf2638760d" }, "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" }, "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" }, - "lazy.nvim": { "branch": "main", "commit": "0de782a6b0ffba599dbd332a4019d852564bf28c" }, + "lazy.nvim": { "branch": "main", "commit": "9895337d1f4c0cea1186d92148e3d80f6551eda8" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, "mason-lock.nvim": { "branch": "main", "commit": "2f18cab30f3d621002c58c725d9319a1563414e5" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, - "mini.nvim": { "branch": "main", "commit": "cd3a08fbf987dabcfded35ebb612e82f8000f92a" }, + "mini.nvim": { "branch": "main", "commit": "eb2dd6d187e1ab5fefec66f0d37b1a3dc8633d17" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "34d4d89fea22645b16f69f818dcb7b6b682b0c1a" }, "noice.nvim": { "branch": "main", "commit": "9f6f6ba74f8bfbf7e43d6302cf86b070362f6203" }, @@ -39,27 +39,27 @@ "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-dap": { "branch": "master", "commit": "5a2f7121869394502521c52b2bc581ab22c69447" }, - "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" }, + "nvim-dap-ui": { "branch": "master", "commit": "334cf3038c4756e6ab999cbac67c847fb654c190" }, "nvim-jdtls": { "branch": "master", "commit": "29255ea26dfb51ef0213f7572bff410f1afb002d" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "9bda20fb967075355f253911bc066a8b5a03c77e" }, + "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" }, - "nvim-treesitter": { "branch": "master", "commit": "d184407e33084f4a57302bc1adf991997ccdd1da" }, + "nvim-treesitter": { "branch": "master", "commit": "73fb37ed77b18ac357ca8e6e35835a8db6602332" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" }, "nvim-ts-autotag": { "branch": "main", "commit": "cb57b07803476ee902c89412aeff219a9a58be13" }, - "nvim-ufo": { "branch": "main", "commit": "4b4077850d1b3af09f4957b67144943cf3da401a" }, + "nvim-ufo": { "branch": "main", "commit": "65dda6360879f6ffe0278163b9192a573a0d2a08" }, "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "b5c8de02a44ffeabff678090edd6a132ff8ab77d" }, - "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "project.nvim": { "branch": "fix-get_clients", "commit": "7c0575ce2400769e2c4c9c2aefa2e745ce9a9674" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "0c12735d5aff6a48ffd8111bf144dc2ff44e5975" }, + "telescope.nvim": { "branch": "master", "commit": "4aed63995a69e343b068c7469491a8d1592c339f" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }, diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index c0842a3d..ab87eb27 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -20,7 +20,8 @@ return { -- Switch to a project { - "ahmedkhalf/project.nvim", + "LennyPhoenix/project.nvim", + branch = "fix-get_clients", main = "project_nvim", opts = { patterns = { ".git" }, From f697324821c83e1daa4ae96dd85da54b1f447856 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 May 2024 18:38:43 +0300 Subject: [PATCH 2425/2667] Fix broken dotdrop install on termux --- home/.config/zsh/04-aliases.zsh | 2 +- home/.ssh/config | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 84206b8f..30fd7680 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -167,7 +167,7 @@ alias i='iwctl station wlan0' cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop -alias dotdrop="source $DOTREPO/secrets/secrets && UID=$(id -u) dotdrop --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p Isengard{%@@ endif @@%}" +alias dotdrop="source $DOTREPO/secrets/secrets && {%@@ if distro_id != "termux" @@%} UID=$(id -u) {%@@ endif @@%} dotdrop --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p Isengard{%@@ endif @@%}" alias sdotdrop="source $DOTREPO/secrets/secrets && sudo -E dotdrop --cfg=$DOTREPO/config-root.toml" diff --git a/home/.ssh/config b/home/.ssh/config index 0a97b703..27720693 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -11,11 +11,12 @@ host moria HostName korhonen.cc port 221 User balrog - StreamLocalBindUnlink yes + {%@@ if distro_id != "termux" @@%} # Forward GPG agent StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh + {%@@ endif @@%} host beleriand HostName beleriand.korhonen.lan @@ -29,15 +30,6 @@ host rivendell HostName rivendell.korhonen.lan User root -host tirion - HostName tirion.korhonen.cc - port 22 - User gandalf - # Forward GPG agent - StreamLocalBindUnlink yes - RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra - RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh - host forgejo HostName git.korhonen.cc port 2882 @@ -68,11 +60,12 @@ host gondor hostname tolkku.net port 22 User reekymarko - StreamLocalBindUnlink yes + {%@@ if distro_id != "termux" @@%} # Forward GPG agent StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh + {%@@ endif @@%} host anitta HostName 10.200.200.4 From 2c550dae6705ec964dff4121e2c25cbb8a2320f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 May 2024 18:38:43 +0300 Subject: [PATCH 2426/2667] Fix broken dotdrop install on termux --- home/.config/zsh/04-aliases.zsh | 2 +- home/.ssh/config | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 84206b8f..30fd7680 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -167,7 +167,7 @@ alias i='iwctl station wlan0' cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop -alias dotdrop="source $DOTREPO/secrets/secrets && UID=$(id -u) dotdrop --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p Isengard{%@@ endif @@%}" +alias dotdrop="source $DOTREPO/secrets/secrets && {%@@ if distro_id != "termux" @@%} UID=$(id -u) {%@@ endif @@%} dotdrop --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p Isengard{%@@ endif @@%}" alias sdotdrop="source $DOTREPO/secrets/secrets && sudo -E dotdrop --cfg=$DOTREPO/config-root.toml" diff --git a/home/.ssh/config b/home/.ssh/config index 0a97b703..27720693 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -11,11 +11,12 @@ host moria HostName korhonen.cc port 221 User balrog - StreamLocalBindUnlink yes + {%@@ if distro_id != "termux" @@%} # Forward GPG agent StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh + {%@@ endif @@%} host beleriand HostName beleriand.korhonen.lan @@ -29,15 +30,6 @@ host rivendell HostName rivendell.korhonen.lan User root -host tirion - HostName tirion.korhonen.cc - port 22 - User gandalf - # Forward GPG agent - StreamLocalBindUnlink yes - RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra - RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh - host forgejo HostName git.korhonen.cc port 2882 @@ -68,11 +60,12 @@ host gondor hostname tolkku.net port 22 User reekymarko - StreamLocalBindUnlink yes + {%@@ if distro_id != "termux" @@%} # Forward GPG agent StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh + {%@@ endif @@%} host anitta HostName 10.200.200.4 From 9059c6327f00ba0aab97032900d137b93f8fa578 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 May 2024 13:20:40 +0300 Subject: [PATCH 2427/2667] Remove unneeded entry from authorized_keys --- home/.ssh/authorized_keys | 3 --- 1 file changed, 3 deletions(-) diff --git a/home/.ssh/authorized_keys b/home/.ssh/authorized_keys index d0086bca..9bd02835 100644 --- a/home/.ssh/authorized_keys +++ b/home/.ssh/authorized_keys @@ -1,4 +1 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHLUrf0LpumX6XEkPW6Z105sgJMWWOllWy7sxB+lgdUw Marko YubiKey -{%@@ if profile == 'Moria' @@%} -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICg484CTSIr8wZQ3g5rPfe2VHIcSmmxOjz7mTCkvfR+x Home Assistant key -{%@@ endif @@%} From 15c03997e00e3a2e04662e47c0ec4473e61fee4f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 May 2024 13:20:40 +0300 Subject: [PATCH 2428/2667] Remove unneeded entry from authorized_keys --- home/.ssh/authorized_keys | 3 --- 1 file changed, 3 deletions(-) diff --git a/home/.ssh/authorized_keys b/home/.ssh/authorized_keys index d0086bca..9bd02835 100644 --- a/home/.ssh/authorized_keys +++ b/home/.ssh/authorized_keys @@ -1,4 +1 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHLUrf0LpumX6XEkPW6Z105sgJMWWOllWy7sxB+lgdUw Marko YubiKey -{%@@ if profile == 'Moria' @@%} -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICg484CTSIr8wZQ3g5rPfe2VHIcSmmxOjz7mTCkvfR+x Home Assistant key -{%@@ endif @@%} From 617065707610d231023f4e2c5c6067c76b0231d4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 May 2024 13:21:38 +0300 Subject: [PATCH 2429/2667] Backup container: add restart policy --- docker/backup/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/backup/docker-compose.toml b/docker/backup/docker-compose.toml index 9d44aaa6..b79bfab3 100644 --- a/docker/backup/docker-compose.toml +++ b/docker/backup/docker-compose.toml @@ -13,6 +13,7 @@ external = true [services.backup] image = "offen/docker-volume-backup:v2" container_name = "volume-backup" +restart = "unless-stopped" environment = [ "AWS_ENDPOINT", "AWS_S3_BUCKET_NAME", From 52e3e5f37d02ca4225bf0903b7f6792a462a2bf9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 May 2024 13:21:38 +0300 Subject: [PATCH 2430/2667] Backup container: add restart policy --- docker/backup/docker-compose.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/backup/docker-compose.toml b/docker/backup/docker-compose.toml index 9d44aaa6..b79bfab3 100644 --- a/docker/backup/docker-compose.toml +++ b/docker/backup/docker-compose.toml @@ -13,6 +13,7 @@ external = true [services.backup] image = "offen/docker-volume-backup:v2" container_name = "volume-backup" +restart = "unless-stopped" environment = [ "AWS_ENDPOINT", "AWS_S3_BUCKET_NAME", From 8ae9eddeb4e6627719fc896c43b370266d1c4cf7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 27 May 2024 11:51:59 +0300 Subject: [PATCH 2431/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 48 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 69800814..f010d773 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" }, + "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, - "bufferline.nvim": { "branch": "main", "commit": "0dfc19b7a15a3bc47b975fcffde03859c46dd097" }, + "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -15,51 +15,51 @@ "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, - "diffview.nvim": { "branch": "main", "commit": "ad03c42b2899117ff039d84ac24860a77116204b" }, - "dropbar.nvim": { "branch": "master", "commit": "9fc10fa1a34ec3e55b470962e4e94644611bd209" }, - "firenvim": { "branch": "master", "commit": "fc72687977e1c34259c42f0e408655cf2638760d" }, + "diffview.nvim": { "branch": "main", "commit": "1ec7b56b959dab18f7030f541c33ae60e18a6f88" }, + "dropbar.nvim": { "branch": "master", "commit": "2b546383bdf4daa254ac70c760ee1e5524bc60b1" }, + "firenvim": { "branch": "master", "commit": "cf4ff99033640b5ec33890bcdc892ddc436ed8e5" }, "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, - "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, - "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" }, - "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" }, - "lazy.nvim": { "branch": "main", "commit": "9895337d1f4c0cea1186d92148e3d80f6551eda8" }, + "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" }, + "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, + "kanagawa.nvim": { "branch": "master", "commit": "08ed29989834f5f2606cb1ef9d5b24c5ea7b8fa5" }, + "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, - "mason-lock.nvim": { "branch": "main", "commit": "2f18cab30f3d621002c58c725d9319a1563414e5" }, + "mason-extra-cmds": { "branch": "main", "commit": "0f0f2b4c6c4a0bd05e89be605cf6db6b05a56e52" }, + "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, - "mini.nvim": { "branch": "main", "commit": "eb2dd6d187e1ab5fefec66f0d37b1a3dc8633d17" }, + "mini.nvim": { "branch": "main", "commit": "b0b435873375c4341f2ecbcb95e9e645abe0d679" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "34d4d89fea22645b16f69f818dcb7b6b682b0c1a" }, - "noice.nvim": { "branch": "main", "commit": "9f6f6ba74f8bfbf7e43d6302cf86b070362f6203" }, + "noice.nvim": { "branch": "main", "commit": "f119045f38792ad5311e5f9be7a879e4c1a95fe0" }, "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "e354bd84fed978e31501396aea6154bd97087e07" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "5a2f7121869394502521c52b2bc581ab22c69447" }, + "nvim-dap": { "branch": "master", "commit": "922ebc75c2fa9305e36402fbd8c984c8638770a0" }, "nvim-dap-ui": { "branch": "master", "commit": "334cf3038c4756e6ab999cbac67c847fb654c190" }, - "nvim-jdtls": { "branch": "master", "commit": "29255ea26dfb51ef0213f7572bff410f1afb002d" }, + "nvim-jdtls": { "branch": "master", "commit": "10691312d51c5485c656a71258b55d3798d3fb3e" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, - "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, + "nvim-lspconfig": { "branch": "master", "commit": "d70633830acf605ec03d9728698d9e7232442eb4" }, + "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" }, - "nvim-treesitter": { "branch": "master", "commit": "73fb37ed77b18ac357ca8e6e35835a8db6602332" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" }, - "nvim-ts-autotag": { "branch": "main", "commit": "cb57b07803476ee902c89412aeff219a9a58be13" }, + "nvim-tree.lua": { "branch": "master", "commit": "517e4fbb9ef3c0986da7047f44b4b91a2400f93c" }, + "nvim-treesitter": { "branch": "master", "commit": "aa02427dfeaead86fae038024ae7b29299f08b8c" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8ae54b90e36ef1fc5267214b30c2cbff71525fe4" }, "nvim-ufo": { "branch": "main", "commit": "65dda6360879f6ffe0278163b9192a573a0d2a08" }, - "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, + "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "project.nvim": { "branch": "fix-get_clients", "commit": "7c0575ce2400769e2c4c9c2aefa2e745ce9a9674" }, + "project.nvim": { "branch": "fix-get_clients", "commit": "6f1937d134515adb7302e3847981063842a65c8b" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "4aed63995a69e343b068c7469491a8d1592c339f" }, + "telescope.nvim": { "branch": "master", "commit": "4c96370cf93e2ba287548da12d673442d0ffecc3" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }, diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 371f3c35..cbf7b930 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -2,7 +2,7 @@ "bash-language-server": "5.3.3", "css-lsp": "4.10.0", "docker-compose-language-service": "0.2.0", - "dockerfile-language-server": "0.11.0", + "dockerfile-language-server": "0.12.0", "eslint-lsp": "4.10.0", "google-java-format": "v1.22.0", "html-lsp": "4.10.0", From 5f586411bc46db9d88b19c705fe0b2182f5194a9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 27 May 2024 11:51:59 +0300 Subject: [PATCH 2432/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 48 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 69800814..f010d773 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" }, + "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, - "bufferline.nvim": { "branch": "main", "commit": "0dfc19b7a15a3bc47b975fcffde03859c46dd097" }, + "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -15,51 +15,51 @@ "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, - "diffview.nvim": { "branch": "main", "commit": "ad03c42b2899117ff039d84ac24860a77116204b" }, - "dropbar.nvim": { "branch": "master", "commit": "9fc10fa1a34ec3e55b470962e4e94644611bd209" }, - "firenvim": { "branch": "master", "commit": "fc72687977e1c34259c42f0e408655cf2638760d" }, + "diffview.nvim": { "branch": "main", "commit": "1ec7b56b959dab18f7030f541c33ae60e18a6f88" }, + "dropbar.nvim": { "branch": "master", "commit": "2b546383bdf4daa254ac70c760ee1e5524bc60b1" }, + "firenvim": { "branch": "master", "commit": "cf4ff99033640b5ec33890bcdc892ddc436ed8e5" }, "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, - "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, - "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" }, - "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" }, - "lazy.nvim": { "branch": "main", "commit": "9895337d1f4c0cea1186d92148e3d80f6551eda8" }, + "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" }, + "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, + "kanagawa.nvim": { "branch": "master", "commit": "08ed29989834f5f2606cb1ef9d5b24c5ea7b8fa5" }, + "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" }, - "mason-lock.nvim": { "branch": "main", "commit": "2f18cab30f3d621002c58c725d9319a1563414e5" }, + "mason-extra-cmds": { "branch": "main", "commit": "0f0f2b4c6c4a0bd05e89be605cf6db6b05a56e52" }, + "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, - "mini.nvim": { "branch": "main", "commit": "eb2dd6d187e1ab5fefec66f0d37b1a3dc8633d17" }, + "mini.nvim": { "branch": "main", "commit": "b0b435873375c4341f2ecbcb95e9e645abe0d679" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoformat": { "branch": "master", "commit": "34d4d89fea22645b16f69f818dcb7b6b682b0c1a" }, - "noice.nvim": { "branch": "main", "commit": "9f6f6ba74f8bfbf7e43d6302cf86b070362f6203" }, + "noice.nvim": { "branch": "main", "commit": "f119045f38792ad5311e5f9be7a879e4c1a95fe0" }, "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "e354bd84fed978e31501396aea6154bd97087e07" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "5a2f7121869394502521c52b2bc581ab22c69447" }, + "nvim-dap": { "branch": "master", "commit": "922ebc75c2fa9305e36402fbd8c984c8638770a0" }, "nvim-dap-ui": { "branch": "master", "commit": "334cf3038c4756e6ab999cbac67c847fb654c190" }, - "nvim-jdtls": { "branch": "master", "commit": "29255ea26dfb51ef0213f7572bff410f1afb002d" }, + "nvim-jdtls": { "branch": "master", "commit": "10691312d51c5485c656a71258b55d3798d3fb3e" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, - "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, + "nvim-lspconfig": { "branch": "master", "commit": "d70633830acf605ec03d9728698d9e7232442eb4" }, + "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" }, - "nvim-treesitter": { "branch": "master", "commit": "73fb37ed77b18ac357ca8e6e35835a8db6602332" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" }, - "nvim-ts-autotag": { "branch": "main", "commit": "cb57b07803476ee902c89412aeff219a9a58be13" }, + "nvim-tree.lua": { "branch": "master", "commit": "517e4fbb9ef3c0986da7047f44b4b91a2400f93c" }, + "nvim-treesitter": { "branch": "master", "commit": "aa02427dfeaead86fae038024ae7b29299f08b8c" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8ae54b90e36ef1fc5267214b30c2cbff71525fe4" }, "nvim-ufo": { "branch": "main", "commit": "65dda6360879f6ffe0278163b9192a573a0d2a08" }, - "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, + "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "project.nvim": { "branch": "fix-get_clients", "commit": "7c0575ce2400769e2c4c9c2aefa2e745ce9a9674" }, + "project.nvim": { "branch": "fix-get_clients", "commit": "6f1937d134515adb7302e3847981063842a65c8b" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "4aed63995a69e343b068c7469491a8d1592c339f" }, + "telescope.nvim": { "branch": "master", "commit": "4c96370cf93e2ba287548da12d673442d0ffecc3" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }, diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 371f3c35..cbf7b930 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -2,7 +2,7 @@ "bash-language-server": "5.3.3", "css-lsp": "4.10.0", "docker-compose-language-service": "0.2.0", - "dockerfile-language-server": "0.11.0", + "dockerfile-language-server": "0.12.0", "eslint-lsp": "4.10.0", "google-java-format": "v1.22.0", "html-lsp": "4.10.0", From 8bfabd9bd8f4108bfb487c6e8565013767c78ccc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 27 May 2024 22:05:38 +0300 Subject: [PATCH 2433/2667] Caddy: Remove old redirect for umami script --- docker/caddy/Caddyfile | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index d93c1589..1b53c2d4 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -94,7 +94,6 @@ korhonen.cc, *.korhonen.cc { @umami host umami.korhonen.cc handle @umami { reverse_proxy umami:3000 - rewrite /ua9quuaW.js /script.js } @nextcloud host cloud.korhonen.cc From 4275c7705e252c1843d215989db0b9c37a9709d0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 27 May 2024 22:05:38 +0300 Subject: [PATCH 2434/2667] Caddy: Remove old redirect for umami script --- docker/caddy/Caddyfile | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index d93c1589..1b53c2d4 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -94,7 +94,6 @@ korhonen.cc, *.korhonen.cc { @umami host umami.korhonen.cc handle @umami { reverse_proxy umami:3000 - rewrite /ua9quuaW.js /script.js } @nextcloud host cloud.korhonen.cc From 16a09aacfe2ddb78647de991b9a5a8935a0cfa65 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Jun 2024 10:48:13 +0300 Subject: [PATCH 2435/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 44 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 7 ++--- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index f010d773..16ac3c4e 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,12 +1,12 @@ { - "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" }, + "LuaSnip": { "branch": "master", "commit": "2b6860d15aaab01d3fb90859c0ba97f20ad7bc5f" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-git": { "branch": "main", "commit": "b9603f18496bc3ca07e6bd474607081af709e750" }, + "cmp-git": { "branch": "main", "commit": "8dfbc33fb32c33e5c0be9dcc8176a4f4d395f95e" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -15,40 +15,40 @@ "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, - "diffview.nvim": { "branch": "main", "commit": "1ec7b56b959dab18f7030f541c33ae60e18a6f88" }, + "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" }, "dropbar.nvim": { "branch": "master", "commit": "2b546383bdf4daa254ac70c760ee1e5524bc60b1" }, "firenvim": { "branch": "master", "commit": "cf4ff99033640b5ec33890bcdc892ddc436ed8e5" }, - "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, - "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" }, + "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, + "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, "kanagawa.nvim": { "branch": "master", "commit": "08ed29989834f5f2606cb1ef9d5b24c5ea7b8fa5" }, - "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, + "lazy.nvim": { "branch": "main", "commit": "0fc34a0cf5f5f6f998a0897119a7d846b47eaa9d" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "0f0f2b4c6c4a0bd05e89be605cf6db6b05a56e52" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, - "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, - "mini.nvim": { "branch": "main", "commit": "b0b435873375c4341f2ecbcb95e9e645abe0d679" }, - "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, - "neoformat": { "branch": "master", "commit": "34d4d89fea22645b16f69f818dcb7b6b682b0c1a" }, - "noice.nvim": { "branch": "main", "commit": "f119045f38792ad5311e5f9be7a879e4c1a95fe0" }, + "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, + "mini.nvim": { "branch": "main", "commit": "e736fe131e6c18d39eecffb43d582c3e95550a90" }, + "neodev.nvim": { "branch": "main", "commit": "1f4ebcc10852518166ce165e57d425a4265a10d4" }, + "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, + "noice.nvim": { "branch": "main", "commit": "2bf04290b32dc5b1a002a4888c95147bb91ec6f2" }, "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "e354bd84fed978e31501396aea6154bd97087e07" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "922ebc75c2fa9305e36402fbd8c984c8638770a0" }, - "nvim-dap-ui": { "branch": "master", "commit": "334cf3038c4756e6ab999cbac67c847fb654c190" }, - "nvim-jdtls": { "branch": "master", "commit": "10691312d51c5485c656a71258b55d3798d3fb3e" }, + "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, + "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, + "nvim-jdtls": { "branch": "master", "commit": "ad5ab1c9246caa9e2c69a7c13d2be9901b5c02aa" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "d70633830acf605ec03d9728698d9e7232442eb4" }, + "nvim-lspconfig": { "branch": "master", "commit": "74e14808cdb15e625449027019406e1ff6dda020" }, "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "517e4fbb9ef3c0986da7047f44b4b91a2400f93c" }, - "nvim-treesitter": { "branch": "master", "commit": "aa02427dfeaead86fae038024ae7b29299f08b8c" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" }, - "nvim-ts-autotag": { "branch": "main", "commit": "8ae54b90e36ef1fc5267214b30c2cbff71525fe4" }, + "nvim-tree.lua": { "branch": "master", "commit": "26632f496e7e3c0450d8ecff88f49068cecc8bda" }, + "nvim-treesitter": { "branch": "master", "commit": "121bf634fea767a9d58a0aee801bae5d68685d80" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "fd41b7ccc5490a3a99c734d1ee418b68d06c48a9" }, + "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" }, "nvim-ufo": { "branch": "main", "commit": "65dda6360879f6ffe0278163b9192a573a0d2a08" }, "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, @@ -59,10 +59,10 @@ "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "4c96370cf93e2ba287548da12d673442d0ffecc3" }, + "telescope.nvim": { "branch": "master", "commit": "dfa230be84a044e7f546a6c2b0a403c739732b86" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } + "which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" } } \ No newline at end of file diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index cbf7b930..dc60db86 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,5 +1,5 @@ { - "bash-language-server": "5.3.3", + "bash-language-server": "5.3.4", "css-lsp": "4.10.0", "docker-compose-language-service": "0.2.0", "dockerfile-language-server": "0.12.0", @@ -9,12 +9,13 @@ "java-debug-adapter": "0.55.0", "jdtls": "v1.35.0", "json-lsp": "4.10.0", - "lemminx": "0.26.1", + "lemminx": "0.27.1", "lua-language-server": "3.9.1", - "prettier": "3.2.5", + "prettier": "3.3.0", "prettierd": "0.25.3", "stylua": "v0.20.0", "taplo": "0.8.1", + "tree-sitter-cli": "v0.22.6", "typescript-language-server": "4.3.3", "yaml-language-server": "1.14.0" } From fad25a8127e17726e469bede9a78120d05b8a191 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Jun 2024 10:48:13 +0300 Subject: [PATCH 2436/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 44 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 7 ++--- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index f010d773..16ac3c4e 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,12 +1,12 @@ { - "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" }, + "LuaSnip": { "branch": "master", "commit": "2b6860d15aaab01d3fb90859c0ba97f20ad7bc5f" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-git": { "branch": "main", "commit": "b9603f18496bc3ca07e6bd474607081af709e750" }, + "cmp-git": { "branch": "main", "commit": "8dfbc33fb32c33e5c0be9dcc8176a4f4d395f95e" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -15,40 +15,40 @@ "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, - "diffview.nvim": { "branch": "main", "commit": "1ec7b56b959dab18f7030f541c33ae60e18a6f88" }, + "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" }, "dropbar.nvim": { "branch": "master", "commit": "2b546383bdf4daa254ac70c760ee1e5524bc60b1" }, "firenvim": { "branch": "master", "commit": "cf4ff99033640b5ec33890bcdc892ddc436ed8e5" }, - "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, - "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" }, + "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, + "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, "kanagawa.nvim": { "branch": "master", "commit": "08ed29989834f5f2606cb1ef9d5b24c5ea7b8fa5" }, - "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, + "lazy.nvim": { "branch": "main", "commit": "0fc34a0cf5f5f6f998a0897119a7d846b47eaa9d" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "0f0f2b4c6c4a0bd05e89be605cf6db6b05a56e52" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, - "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, - "mini.nvim": { "branch": "main", "commit": "b0b435873375c4341f2ecbcb95e9e645abe0d679" }, - "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, - "neoformat": { "branch": "master", "commit": "34d4d89fea22645b16f69f818dcb7b6b682b0c1a" }, - "noice.nvim": { "branch": "main", "commit": "f119045f38792ad5311e5f9be7a879e4c1a95fe0" }, + "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, + "mini.nvim": { "branch": "main", "commit": "e736fe131e6c18d39eecffb43d582c3e95550a90" }, + "neodev.nvim": { "branch": "main", "commit": "1f4ebcc10852518166ce165e57d425a4265a10d4" }, + "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, + "noice.nvim": { "branch": "main", "commit": "2bf04290b32dc5b1a002a4888c95147bb91ec6f2" }, "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "e354bd84fed978e31501396aea6154bd97087e07" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "922ebc75c2fa9305e36402fbd8c984c8638770a0" }, - "nvim-dap-ui": { "branch": "master", "commit": "334cf3038c4756e6ab999cbac67c847fb654c190" }, - "nvim-jdtls": { "branch": "master", "commit": "10691312d51c5485c656a71258b55d3798d3fb3e" }, + "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, + "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, + "nvim-jdtls": { "branch": "master", "commit": "ad5ab1c9246caa9e2c69a7c13d2be9901b5c02aa" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "d70633830acf605ec03d9728698d9e7232442eb4" }, + "nvim-lspconfig": { "branch": "master", "commit": "74e14808cdb15e625449027019406e1ff6dda020" }, "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "517e4fbb9ef3c0986da7047f44b4b91a2400f93c" }, - "nvim-treesitter": { "branch": "master", "commit": "aa02427dfeaead86fae038024ae7b29299f08b8c" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" }, - "nvim-ts-autotag": { "branch": "main", "commit": "8ae54b90e36ef1fc5267214b30c2cbff71525fe4" }, + "nvim-tree.lua": { "branch": "master", "commit": "26632f496e7e3c0450d8ecff88f49068cecc8bda" }, + "nvim-treesitter": { "branch": "master", "commit": "121bf634fea767a9d58a0aee801bae5d68685d80" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "fd41b7ccc5490a3a99c734d1ee418b68d06c48a9" }, + "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" }, "nvim-ufo": { "branch": "main", "commit": "65dda6360879f6ffe0278163b9192a573a0d2a08" }, "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, @@ -59,10 +59,10 @@ "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "4c96370cf93e2ba287548da12d673442d0ffecc3" }, + "telescope.nvim": { "branch": "master", "commit": "dfa230be84a044e7f546a6c2b0a403c739732b86" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } + "which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" } } \ No newline at end of file diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index cbf7b930..dc60db86 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,5 +1,5 @@ { - "bash-language-server": "5.3.3", + "bash-language-server": "5.3.4", "css-lsp": "4.10.0", "docker-compose-language-service": "0.2.0", "dockerfile-language-server": "0.12.0", @@ -9,12 +9,13 @@ "java-debug-adapter": "0.55.0", "jdtls": "v1.35.0", "json-lsp": "4.10.0", - "lemminx": "0.26.1", + "lemminx": "0.27.1", "lua-language-server": "3.9.1", - "prettier": "3.2.5", + "prettier": "3.3.0", "prettierd": "0.25.3", "stylua": "v0.20.0", "taplo": "0.8.1", + "tree-sitter-cli": "v0.22.6", "typescript-language-server": "4.3.3", "yaml-language-server": "1.14.0" } From 9b1601baca3994d89b75a2431a63d54e144f0c84 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 5 Jun 2024 00:19:53 +0300 Subject: [PATCH 2437/2667] Add umami analytics for index.korhonen.cc --- docker/caddy/Caddyfile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 1b53c2d4..786f76a0 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -1,3 +1,7 @@ +{ + order umami first +} + korhonen.cc, *.korhonen.cc { tls {$CLOUDFLARE_EMAIL} { dns cloudflare {$CLOUDFLARE_API_TOKEN} @@ -46,6 +50,13 @@ korhonen.cc, *.korhonen.cc { @index host index.korhonen.cc handle @index { + umami { + event_endpoint "https://umami.korhonen.cc/api/send" + website_uuid "9fe4f5c0-8e63-4479-a58d-d399cdbc0a3a" + client_ip_header X-Real-IP + device_detection + allowed_extensions "" .tar.zst .json .html + } root * /var/www/index.korhonen.cc file_server browse } From a14104a3b9399c9fceb36ec4765749ec2b615300 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 5 Jun 2024 00:19:53 +0300 Subject: [PATCH 2438/2667] Add umami analytics for index.korhonen.cc --- docker/caddy/Caddyfile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 1b53c2d4..786f76a0 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -1,3 +1,7 @@ +{ + order umami first +} + korhonen.cc, *.korhonen.cc { tls {$CLOUDFLARE_EMAIL} { dns cloudflare {$CLOUDFLARE_API_TOKEN} @@ -46,6 +50,13 @@ korhonen.cc, *.korhonen.cc { @index host index.korhonen.cc handle @index { + umami { + event_endpoint "https://umami.korhonen.cc/api/send" + website_uuid "9fe4f5c0-8e63-4479-a58d-d399cdbc0a3a" + client_ip_header X-Real-IP + device_detection + allowed_extensions "" .tar.zst .json .html + } root * /var/www/index.korhonen.cc file_server browse } From a0a78b926ea8e91030953c6b790606a7404decc5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Jun 2024 17:01:15 +0300 Subject: [PATCH 2439/2667] Caddy: combine common site settings --- docker/caddy/Caddyfile | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 786f76a0..cbb5aa15 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -2,23 +2,27 @@ order umami first } -korhonen.cc, *.korhonen.cc { - tls {$CLOUDFLARE_EMAIL} { +(common_site_settings) { + encode zstd gzip + + tls { dns cloudflare {$CLOUDFLARE_API_TOKEN} resolvers 1.1.1.1 } - encode zstd gzip + header { + Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" + } +} + +korhonen.cc, *.korhonen.cc { + import common_site_settings @static { file path *.ico *.css *.js *.gif *.webp *.avif *.jpg *.jpeg *.png *.svg *.woff *.woff2 *.pdf *.webmanifest } - header { - Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" - } - @homepage-www-redir host www.korhonen.cc handle @homepage-www-redir { redir https://korhonen.cc @@ -51,11 +55,11 @@ korhonen.cc, *.korhonen.cc { @index host index.korhonen.cc handle @index { umami { - event_endpoint "https://umami.korhonen.cc/api/send" - website_uuid "9fe4f5c0-8e63-4479-a58d-d399cdbc0a3a" - client_ip_header X-Real-IP - device_detection - allowed_extensions "" .tar.zst .json .html + event_endpoint "https://umami.korhonen.cc/api/send" + website_uuid "9fe4f5c0-8e63-4479-a58d-d399cdbc0a3a" + client_ip_header X-Real-IP + device_detection + allowed_extensions "" .tar.zst .json .html } root * /var/www/index.korhonen.cc file_server browse @@ -187,16 +191,7 @@ korhonen.cc, *.korhonen.cc { } korhonen.social, *.korhonen.social { - tls {$CLOUDFLARE_EMAIL} { - dns cloudflare {$CLOUDFLARE_API_TOKEN} - resolvers 1.1.1.1 - } - - encode zstd gzip - - header { - Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" - } + import common_site_settings @firefish-www-redir host www.korhonen.social handle @firefish-www-redir { From 46cfc9deb1079cd7d6523dfb9059d5284f5456cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Jun 2024 17:01:15 +0300 Subject: [PATCH 2440/2667] Caddy: combine common site settings --- docker/caddy/Caddyfile | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 786f76a0..cbb5aa15 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -2,23 +2,27 @@ order umami first } -korhonen.cc, *.korhonen.cc { - tls {$CLOUDFLARE_EMAIL} { +(common_site_settings) { + encode zstd gzip + + tls { dns cloudflare {$CLOUDFLARE_API_TOKEN} resolvers 1.1.1.1 } - encode zstd gzip + header { + Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" + } +} + +korhonen.cc, *.korhonen.cc { + import common_site_settings @static { file path *.ico *.css *.js *.gif *.webp *.avif *.jpg *.jpeg *.png *.svg *.woff *.woff2 *.pdf *.webmanifest } - header { - Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" - } - @homepage-www-redir host www.korhonen.cc handle @homepage-www-redir { redir https://korhonen.cc @@ -51,11 +55,11 @@ korhonen.cc, *.korhonen.cc { @index host index.korhonen.cc handle @index { umami { - event_endpoint "https://umami.korhonen.cc/api/send" - website_uuid "9fe4f5c0-8e63-4479-a58d-d399cdbc0a3a" - client_ip_header X-Real-IP - device_detection - allowed_extensions "" .tar.zst .json .html + event_endpoint "https://umami.korhonen.cc/api/send" + website_uuid "9fe4f5c0-8e63-4479-a58d-d399cdbc0a3a" + client_ip_header X-Real-IP + device_detection + allowed_extensions "" .tar.zst .json .html } root * /var/www/index.korhonen.cc file_server browse @@ -187,16 +191,7 @@ korhonen.cc, *.korhonen.cc { } korhonen.social, *.korhonen.social { - tls {$CLOUDFLARE_EMAIL} { - dns cloudflare {$CLOUDFLARE_API_TOKEN} - resolvers 1.1.1.1 - } - - encode zstd gzip - - header { - Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" - } + import common_site_settings @firefish-www-redir host www.korhonen.social handle @firefish-www-redir { From 160036a7c38ed2804b1d8eb8887d0195fc85a60f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Jun 2024 17:56:59 +0300 Subject: [PATCH 2441/2667] Add OpenTogetherTube --- docker/caddy/Caddyfile | 5 +++ docker/opentogethertube/docker-compose.toml | 37 +++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 docker/opentogethertube/docker-compose.toml diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index cbb5aa15..d94a84fa 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -171,6 +171,11 @@ korhonen.cc, *.korhonen.cc { respond {remote_host} } + @ott host ott.korhonen.cc + handle @ott { + reverse_proxy opentogethertube:8080 + } + handle { respond "404 Not Found" 404 } diff --git a/docker/opentogethertube/docker-compose.toml b/docker/opentogethertube/docker-compose.toml new file mode 100644 index 00000000..b780c520 --- /dev/null +++ b/docker/opentogethertube/docker-compose.toml @@ -0,0 +1,37 @@ +[services.opentogethertube] +image = "dyc3/opentogethertube" +container_name = "opentogethertube" +restart = "unless-stopped" +environment = [ + "PORT=8080", + "REDIS_HOST=redis", + "REDIS_PORT=6379", + "FFPROBE_PATH=/usr/bin/ffprobe", + "DB_MODE=postgres", + "POSTGRES_USER=opentogethertube", + "POSTGRES_DB=opentogethertube", + "POSTGRES_HOST=postgres", + "POSTGRES_PASSWORD", + "DOCKER=1", + "OTT_HOSTNAME=ott.korhonen.cc", + "YOUTUBE_API_KEY", + "OPENTOGETHERTUBE_API_KEY", + "SESSION_SECRET", +] +ports = ["8080:8080", "3002:3002"] +networks = ["default", "postgres", "proxy"] +depends_on = ["redis"] + +[services.redis] +container_name = "opentogethertube_redis" +image = "redis:alpine" +restart = "unless-stopped" + +[services.redis.healthcheck] +test = "redis-cli ping" + +[networks.postgres] +external = true + +[networks.proxy] +external = true From 8de560c410b58ff4ec0679e43ac1b68585fc9400 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Jun 2024 17:56:59 +0300 Subject: [PATCH 2442/2667] Add OpenTogetherTube --- docker/caddy/Caddyfile | 5 +++ docker/opentogethertube/docker-compose.toml | 37 +++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 docker/opentogethertube/docker-compose.toml diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index cbb5aa15..d94a84fa 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -171,6 +171,11 @@ korhonen.cc, *.korhonen.cc { respond {remote_host} } + @ott host ott.korhonen.cc + handle @ott { + reverse_proxy opentogethertube:8080 + } + handle { respond "404 Not Found" 404 } diff --git a/docker/opentogethertube/docker-compose.toml b/docker/opentogethertube/docker-compose.toml new file mode 100644 index 00000000..b780c520 --- /dev/null +++ b/docker/opentogethertube/docker-compose.toml @@ -0,0 +1,37 @@ +[services.opentogethertube] +image = "dyc3/opentogethertube" +container_name = "opentogethertube" +restart = "unless-stopped" +environment = [ + "PORT=8080", + "REDIS_HOST=redis", + "REDIS_PORT=6379", + "FFPROBE_PATH=/usr/bin/ffprobe", + "DB_MODE=postgres", + "POSTGRES_USER=opentogethertube", + "POSTGRES_DB=opentogethertube", + "POSTGRES_HOST=postgres", + "POSTGRES_PASSWORD", + "DOCKER=1", + "OTT_HOSTNAME=ott.korhonen.cc", + "YOUTUBE_API_KEY", + "OPENTOGETHERTUBE_API_KEY", + "SESSION_SECRET", +] +ports = ["8080:8080", "3002:3002"] +networks = ["default", "postgres", "proxy"] +depends_on = ["redis"] + +[services.redis] +container_name = "opentogethertube_redis" +image = "redis:alpine" +restart = "unless-stopped" + +[services.redis.healthcheck] +test = "redis-cli ping" + +[networks.postgres] +external = true + +[networks.proxy] +external = true From 93bffdf9941db25290465f5f75794ed5ca507d37 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Jun 2024 18:24:56 +0300 Subject: [PATCH 2443/2667] OpenTogetherTube: add configuration and fix redis container name --- docker/opentogethertube/docker-compose.toml | 3 ++- docker/opentogethertube/production.toml | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 docker/opentogethertube/production.toml diff --git a/docker/opentogethertube/docker-compose.toml b/docker/opentogethertube/docker-compose.toml index b780c520..f1333a94 100644 --- a/docker/opentogethertube/docker-compose.toml +++ b/docker/opentogethertube/docker-compose.toml @@ -21,9 +21,10 @@ environment = [ ports = ["8080:8080", "3002:3002"] networks = ["default", "postgres", "proxy"] depends_on = ["redis"] +volumes = ["./production.toml:/app/env/production.toml"] [services.redis] -container_name = "opentogethertube_redis" +container_name = "redis-opentogethertube" image = "redis:alpine" restart = "unless-stopped" diff --git a/docker/opentogethertube/production.toml b/docker/opentogethertube/production.toml new file mode 100644 index 00000000..e60fec7e --- /dev/null +++ b/docker/opentogethertube/production.toml @@ -0,0 +1,5 @@ +log = { level = "info" } + +[room] +enable_create_temporary = false +enable_create_permanent = false From 65203b480b298cece6fe5fb1924c7e8ca017b8f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Jun 2024 18:24:56 +0300 Subject: [PATCH 2444/2667] OpenTogetherTube: add configuration and fix redis container name --- docker/opentogethertube/docker-compose.toml | 3 ++- docker/opentogethertube/production.toml | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 docker/opentogethertube/production.toml diff --git a/docker/opentogethertube/docker-compose.toml b/docker/opentogethertube/docker-compose.toml index b780c520..f1333a94 100644 --- a/docker/opentogethertube/docker-compose.toml +++ b/docker/opentogethertube/docker-compose.toml @@ -21,9 +21,10 @@ environment = [ ports = ["8080:8080", "3002:3002"] networks = ["default", "postgres", "proxy"] depends_on = ["redis"] +volumes = ["./production.toml:/app/env/production.toml"] [services.redis] -container_name = "opentogethertube_redis" +container_name = "redis-opentogethertube" image = "redis:alpine" restart = "unless-stopped" diff --git a/docker/opentogethertube/production.toml b/docker/opentogethertube/production.toml new file mode 100644 index 00000000..e60fec7e --- /dev/null +++ b/docker/opentogethertube/production.toml @@ -0,0 +1,5 @@ +log = { level = "info" } + +[room] +enable_create_temporary = false +enable_create_permanent = false From f7fd1bccdb299fa1d16ba13ca522ea5ee63602e7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 20 Jun 2024 22:02:05 +0300 Subject: [PATCH 2445/2667] Add new computer, Shire (tablet) --- config-root.toml | 23 +++++++++++++++++++++++ config.toml | 10 ++++++++++ root/etc/kernel/cmdline | 2 ++ root/etc/mkinitcpio.conf | 10 ++++++++++ 4 files changed, 45 insertions(+) diff --git a/config-root.toml b/config-root.toml index 9c273580..18c9c38b 100644 --- a/config-root.toml +++ b/config-root.toml @@ -206,6 +206,29 @@ dotfiles = [ ] include = ["Locale", "Pacman"] +[profiles.Shire] +dotfiles = [ + "d_bin", + "f_20-quiet-printk.conf", + "f_60-uinput-permissions.rules", + "f_99-lowbat.rules", + "f_adb.service", + "f_bluetooth.conf", + "f_cmdline", + "f_cpupower", + "f_doas.conf", + "f_fonts.conf", + "f_freetype2.sh", + "f_ignore", + "f_logind.conf", + "f_mkinitcpio.conf", + "f_mkinitcpio_linux.preset", + "f_plymouthd.conf", + "f_sshd_config", + "f_system.conf", +] +include = ["Locale"] + [profiles.Moria] include = ["Locale", "Pacman"] dotfiles = [ diff --git a/config.toml b/config.toml index b6b2c7b5..00ecb92a 100644 --- a/config.toml +++ b/config.toml @@ -214,6 +214,16 @@ dotfiles = [ [profiles.Mirkwood.variables] wayland = true +[profiles.Shire] +include = ["pacman", "terminal", "media", "gpg"] +dotfiles = [ + "f_dconf.ini", + "f_fonts.conf", +] + +[profiles.Shire.variables] +wayland = true + [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] dotfiles = [ diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index 86a43e09..50587787 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -2,4 +2,6 @@ cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait acpi_osi=Linux quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Moria" @@%} cryptdevice=UUID=51115cf2-6a44-4f8c-8aa2-ff9d834953d8:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 +{%@@ elif profile == "Shire" @@%} +cryptdevice=UUID=370d6c2a-86ab-4e7d-9442-d15ad173f3e3:cryptroot root=/dev/mapper/cryptroot rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ endif @@%} diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index e45462ef..5944a930 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -1,6 +1,14 @@ COMPRESSION="zstd" +{%@@ if profile == "Mirkwood" or profile == "Moria" @@%} MODULES=(amdgpu) +{%@@ elif profile == "Shire" @@%} +MODULES=(i915) +{%@@ endif @@%} +{%@@ if profile == "Mirkwood" or profile == "Moria" @@%} BINARIES=("/usr/bin/btrfs") +{%@@ else @@%} +BINARIED=() +{%@@ endif @@%} FILES=() {%@@ if profile == "Mirkwood" @@%} @@ -8,4 +16,6 @@ HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesy {%@@ elif profile == 'Moria' @@%} #HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs encrypt fsck) HOOKS=(base udev kms keyboard autodetect microcode modconf block netconf dropbear encryptssh filesystems btrfs fsck) +{%@@ elif profile == 'Shire' @@%} +HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesystems encrypt fsck) {%@@ endif @@%} From 53c84a3200cf8946e25cbc1e7a76d3f518d1cf24 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 20 Jun 2024 22:02:05 +0300 Subject: [PATCH 2446/2667] Add new computer, Shire (tablet) --- config-root.toml | 23 +++++++++++++++++++++++ config.toml | 10 ++++++++++ root/etc/kernel/cmdline | 2 ++ root/etc/mkinitcpio.conf | 10 ++++++++++ 4 files changed, 45 insertions(+) diff --git a/config-root.toml b/config-root.toml index 9c273580..18c9c38b 100644 --- a/config-root.toml +++ b/config-root.toml @@ -206,6 +206,29 @@ dotfiles = [ ] include = ["Locale", "Pacman"] +[profiles.Shire] +dotfiles = [ + "d_bin", + "f_20-quiet-printk.conf", + "f_60-uinput-permissions.rules", + "f_99-lowbat.rules", + "f_adb.service", + "f_bluetooth.conf", + "f_cmdline", + "f_cpupower", + "f_doas.conf", + "f_fonts.conf", + "f_freetype2.sh", + "f_ignore", + "f_logind.conf", + "f_mkinitcpio.conf", + "f_mkinitcpio_linux.preset", + "f_plymouthd.conf", + "f_sshd_config", + "f_system.conf", +] +include = ["Locale"] + [profiles.Moria] include = ["Locale", "Pacman"] dotfiles = [ diff --git a/config.toml b/config.toml index b6b2c7b5..00ecb92a 100644 --- a/config.toml +++ b/config.toml @@ -214,6 +214,16 @@ dotfiles = [ [profiles.Mirkwood.variables] wayland = true +[profiles.Shire] +include = ["pacman", "terminal", "media", "gpg"] +dotfiles = [ + "f_dconf.ini", + "f_fonts.conf", +] + +[profiles.Shire.variables] +wayland = true + [profiles.Moria] include = ["pacman", "terminal", "media", "gpg"] dotfiles = [ diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index 86a43e09..50587787 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -2,4 +2,6 @@ cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait acpi_osi=Linux quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Moria" @@%} cryptdevice=UUID=51115cf2-6a44-4f8c-8aa2-ff9d834953d8:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 +{%@@ elif profile == "Shire" @@%} +cryptdevice=UUID=370d6c2a-86ab-4e7d-9442-d15ad173f3e3:cryptroot root=/dev/mapper/cryptroot rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ endif @@%} diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index e45462ef..5944a930 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -1,6 +1,14 @@ COMPRESSION="zstd" +{%@@ if profile == "Mirkwood" or profile == "Moria" @@%} MODULES=(amdgpu) +{%@@ elif profile == "Shire" @@%} +MODULES=(i915) +{%@@ endif @@%} +{%@@ if profile == "Mirkwood" or profile == "Moria" @@%} BINARIES=("/usr/bin/btrfs") +{%@@ else @@%} +BINARIED=() +{%@@ endif @@%} FILES=() {%@@ if profile == "Mirkwood" @@%} @@ -8,4 +16,6 @@ HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesy {%@@ elif profile == 'Moria' @@%} #HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs encrypt fsck) HOOKS=(base udev kms keyboard autodetect microcode modconf block netconf dropbear encryptssh filesystems btrfs fsck) +{%@@ elif profile == 'Shire' @@%} +HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesystems encrypt fsck) {%@@ endif @@%} From 01feed67db1ddd9e97b7f54a15d5c8b456a9c61e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Jun 2024 11:13:26 +0300 Subject: [PATCH 2447/2667] Add netbootxyz --- docker/netbootxyz/docker-compose.toml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 docker/netbootxyz/docker-compose.toml diff --git a/docker/netbootxyz/docker-compose.toml b/docker/netbootxyz/docker-compose.toml new file mode 100644 index 00000000..8b93ec68 --- /dev/null +++ b/docker/netbootxyz/docker-compose.toml @@ -0,0 +1,20 @@ +[volumes] +config = {} +assets = {} + +[services.netbootxyz] +image = "lscr.io/linuxserver/netbootxyz" +container_name = "netbootxyz" +restart = "unless-stopped" +environment = [ + "PUID=1000", + "PGID=1000", + "TZ=Etc/UTC", + "MENU_VERSION=1.9.9", + "PORT_RANGE=30000:30010", + "SUBFOLDER=/", + "NGINX_PORT=80", + "WEB_APP_PORT=3000", +] +ports = ["3000:3000", "69:69/udp", "8081:80"] +volumes = ["config:/config", "assets:/assets"] From dc52aa3852dcb241b228940762133f48e0781b67 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Jun 2024 11:13:26 +0300 Subject: [PATCH 2448/2667] Add netbootxyz --- docker/netbootxyz/docker-compose.toml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 docker/netbootxyz/docker-compose.toml diff --git a/docker/netbootxyz/docker-compose.toml b/docker/netbootxyz/docker-compose.toml new file mode 100644 index 00000000..8b93ec68 --- /dev/null +++ b/docker/netbootxyz/docker-compose.toml @@ -0,0 +1,20 @@ +[volumes] +config = {} +assets = {} + +[services.netbootxyz] +image = "lscr.io/linuxserver/netbootxyz" +container_name = "netbootxyz" +restart = "unless-stopped" +environment = [ + "PUID=1000", + "PGID=1000", + "TZ=Etc/UTC", + "MENU_VERSION=1.9.9", + "PORT_RANGE=30000:30010", + "SUBFOLDER=/", + "NGINX_PORT=80", + "WEB_APP_PORT=3000", +] +ports = ["3000:3000", "69:69/udp", "8081:80"] +volumes = ["config:/config", "assets:/assets"] From b4b85837f6f7bb133f7cfdd51576ddcdcbc1cee4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Jun 2024 11:13:50 +0300 Subject: [PATCH 2449/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 68 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 10 ++--- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 16ac3c4e..8d0028cd 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "2b6860d15aaab01d3fb90859c0ba97f20ad7bc5f" }, + "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, - "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, + "bufferline.nvim": { "branch": "main", "commit": "46192e794b73f92136326c10ecdbdbf15e35705f" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -13,56 +13,56 @@ "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, - "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, - "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" }, - "dropbar.nvim": { "branch": "master", "commit": "2b546383bdf4daa254ac70c760ee1e5524bc60b1" }, - "firenvim": { "branch": "master", "commit": "cf4ff99033640b5ec33890bcdc892ddc436ed8e5" }, - "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, - "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "kanagawa.nvim": { "branch": "master", "commit": "08ed29989834f5f2606cb1ef9d5b24c5ea7b8fa5" }, - "lazy.nvim": { "branch": "main", "commit": "0fc34a0cf5f5f6f998a0897119a7d846b47eaa9d" }, + "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, + "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, + "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, + "dropbar.nvim": { "branch": "master", "commit": "79847a78ec0c58f5e5c0360192b03d0cee803e95" }, + "firenvim": { "branch": "master", "commit": "e412ab23c5b56b7eb3c361da8a1f8a2e94c51001" }, + "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, + "gitsigns.nvim": { "branch": "main", "commit": "8df63f2ddc615feb71fd4aee45a4cee022876df1" }, + "indent-blankline.nvim": { "branch": "master", "commit": "4036c8ae9cc29faf8e6443fa5b23e679db055d24" }, + "kanagawa.nvim": { "branch": "master", "commit": "fe5b2c9e2549862c3dc3f3c8e9cf7ddece0f40c2" }, + "lazy.nvim": { "branch": "main", "commit": "4ea9fe060042f345960ad0c01aa7bca91405e10a" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-extra-cmds": { "branch": "main", "commit": "0f0f2b4c6c4a0bd05e89be605cf6db6b05a56e52" }, + "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.nvim": { "branch": "main", "commit": "e736fe131e6c18d39eecffb43d582c3e95550a90" }, - "neodev.nvim": { "branch": "main", "commit": "1f4ebcc10852518166ce165e57d425a4265a10d4" }, + "mini.nvim": { "branch": "main", "commit": "334a2d9cfbd86ea08c4d870e39b5ba8bb354d938" }, + "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "2bf04290b32dc5b1a002a4888c95147bb91ec6f2" }, - "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, + "noice.nvim": { "branch": "main", "commit": "c36467f9944cef92c4561080816c0dfe06a7a1bd" }, + "nui.nvim": { "branch": "main", "commit": "a2bc1e9d0359caa5d11ad967cd1e30e8d4676226" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, - "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, + "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, - "nvim-jdtls": { "branch": "master", "commit": "ad5ab1c9246caa9e2c69a7c13d2be9901b5c02aa" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "74e14808cdb15e625449027019406e1ff6dda020" }, - "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" }, + "nvim-jdtls": { "branch": "master", "commit": "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, + "nvim-lspconfig": { "branch": "master", "commit": "9c9eb07fecc578e25e28db8dc9002b43fff2ed79" }, + "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "26632f496e7e3c0450d8ecff88f49068cecc8bda" }, - "nvim-treesitter": { "branch": "master", "commit": "121bf634fea767a9d58a0aee801bae5d68685d80" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "fd41b7ccc5490a3a99c734d1ee418b68d06c48a9" }, - "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" }, - "nvim-ufo": { "branch": "main", "commit": "65dda6360879f6ffe0278163b9192a573a0d2a08" }, - "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, + "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, + "nvim-treesitter": { "branch": "master", "commit": "9d80c1497ec343f81c0c5800b65f2e73ca569025" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, + "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, + "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" }, + "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "project.nvim": { "branch": "fix-get_clients", "commit": "6f1937d134515adb7302e3847981063842a65c8b" }, - "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, - "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, + "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, + "statuscol.nvim": { "branch": "main", "commit": "d6f7f5437c5404d958b88bb73e0721b1c0e09223" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "dfa230be84a044e7f546a6c2b0a403c739732b86" }, + "telescope.nvim": { "branch": "master", "commit": "f2bfde705ac752c52544d5cfa8b0aee0a766c1ed" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }, + "vim-fugitive": { "branch": "master", "commit": "64d6cafb9dcbacce18c26d7daf617ebb96b273f3" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" } + "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } } \ No newline at end of file diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index dc60db86..37959b42 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,8 +1,8 @@ { - "bash-language-server": "5.3.4", + "bash-language-server": "5.4.0", "css-lsp": "4.10.0", "docker-compose-language-service": "0.2.0", - "dockerfile-language-server": "0.12.0", + "dockerfile-language-server": "0.13.0", "eslint-lsp": "4.10.0", "google-java-format": "v1.22.0", "html-lsp": "4.10.0", @@ -10,12 +10,12 @@ "jdtls": "v1.35.0", "json-lsp": "4.10.0", "lemminx": "0.27.1", - "lua-language-server": "3.9.1", - "prettier": "3.3.0", + "lua-language-server": "3.9.3", + "prettier": "3.3.2", "prettierd": "0.25.3", "stylua": "v0.20.0", "taplo": "0.8.1", "tree-sitter-cli": "v0.22.6", "typescript-language-server": "4.3.3", - "yaml-language-server": "1.14.0" + "yaml-language-server": "1.15.0" } From dc62164e1956dfcdf295d79e063d34c53c1758c1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Jun 2024 11:13:50 +0300 Subject: [PATCH 2450/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 68 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 10 ++--- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 16ac3c4e..8d0028cd 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "2b6860d15aaab01d3fb90859c0ba97f20ad7bc5f" }, + "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, - "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, + "bufferline.nvim": { "branch": "main", "commit": "46192e794b73f92136326c10ecdbdbf15e35705f" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -13,56 +13,56 @@ "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, - "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, - "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" }, - "dropbar.nvim": { "branch": "master", "commit": "2b546383bdf4daa254ac70c760ee1e5524bc60b1" }, - "firenvim": { "branch": "master", "commit": "cf4ff99033640b5ec33890bcdc892ddc436ed8e5" }, - "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, - "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "kanagawa.nvim": { "branch": "master", "commit": "08ed29989834f5f2606cb1ef9d5b24c5ea7b8fa5" }, - "lazy.nvim": { "branch": "main", "commit": "0fc34a0cf5f5f6f998a0897119a7d846b47eaa9d" }, + "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, + "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, + "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, + "dropbar.nvim": { "branch": "master", "commit": "79847a78ec0c58f5e5c0360192b03d0cee803e95" }, + "firenvim": { "branch": "master", "commit": "e412ab23c5b56b7eb3c361da8a1f8a2e94c51001" }, + "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, + "gitsigns.nvim": { "branch": "main", "commit": "8df63f2ddc615feb71fd4aee45a4cee022876df1" }, + "indent-blankline.nvim": { "branch": "master", "commit": "4036c8ae9cc29faf8e6443fa5b23e679db055d24" }, + "kanagawa.nvim": { "branch": "master", "commit": "fe5b2c9e2549862c3dc3f3c8e9cf7ddece0f40c2" }, + "lazy.nvim": { "branch": "main", "commit": "4ea9fe060042f345960ad0c01aa7bca91405e10a" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-extra-cmds": { "branch": "main", "commit": "0f0f2b4c6c4a0bd05e89be605cf6db6b05a56e52" }, + "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.nvim": { "branch": "main", "commit": "e736fe131e6c18d39eecffb43d582c3e95550a90" }, - "neodev.nvim": { "branch": "main", "commit": "1f4ebcc10852518166ce165e57d425a4265a10d4" }, + "mini.nvim": { "branch": "main", "commit": "334a2d9cfbd86ea08c4d870e39b5ba8bb354d938" }, + "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "2bf04290b32dc5b1a002a4888c95147bb91ec6f2" }, - "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, + "noice.nvim": { "branch": "main", "commit": "c36467f9944cef92c4561080816c0dfe06a7a1bd" }, + "nui.nvim": { "branch": "main", "commit": "a2bc1e9d0359caa5d11ad967cd1e30e8d4676226" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, - "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, + "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, - "nvim-jdtls": { "branch": "master", "commit": "ad5ab1c9246caa9e2c69a7c13d2be9901b5c02aa" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "74e14808cdb15e625449027019406e1ff6dda020" }, - "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" }, + "nvim-jdtls": { "branch": "master", "commit": "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, + "nvim-lspconfig": { "branch": "master", "commit": "9c9eb07fecc578e25e28db8dc9002b43fff2ed79" }, + "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "26632f496e7e3c0450d8ecff88f49068cecc8bda" }, - "nvim-treesitter": { "branch": "master", "commit": "121bf634fea767a9d58a0aee801bae5d68685d80" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "fd41b7ccc5490a3a99c734d1ee418b68d06c48a9" }, - "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" }, - "nvim-ufo": { "branch": "main", "commit": "65dda6360879f6ffe0278163b9192a573a0d2a08" }, - "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, + "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, + "nvim-treesitter": { "branch": "master", "commit": "9d80c1497ec343f81c0c5800b65f2e73ca569025" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, + "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, + "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" }, + "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "project.nvim": { "branch": "fix-get_clients", "commit": "6f1937d134515adb7302e3847981063842a65c8b" }, - "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, - "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, + "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, + "statuscol.nvim": { "branch": "main", "commit": "d6f7f5437c5404d958b88bb73e0721b1c0e09223" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "dfa230be84a044e7f546a6c2b0a403c739732b86" }, + "telescope.nvim": { "branch": "master", "commit": "f2bfde705ac752c52544d5cfa8b0aee0a766c1ed" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }, + "vim-fugitive": { "branch": "master", "commit": "64d6cafb9dcbacce18c26d7daf617ebb96b273f3" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" } + "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } } \ No newline at end of file diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index dc60db86..37959b42 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,8 +1,8 @@ { - "bash-language-server": "5.3.4", + "bash-language-server": "5.4.0", "css-lsp": "4.10.0", "docker-compose-language-service": "0.2.0", - "dockerfile-language-server": "0.12.0", + "dockerfile-language-server": "0.13.0", "eslint-lsp": "4.10.0", "google-java-format": "v1.22.0", "html-lsp": "4.10.0", @@ -10,12 +10,12 @@ "jdtls": "v1.35.0", "json-lsp": "4.10.0", "lemminx": "0.27.1", - "lua-language-server": "3.9.1", - "prettier": "3.3.0", + "lua-language-server": "3.9.3", + "prettier": "3.3.2", "prettierd": "0.25.3", "stylua": "v0.20.0", "taplo": "0.8.1", "tree-sitter-cli": "v0.22.6", "typescript-language-server": "4.3.3", - "yaml-language-server": "1.14.0" + "yaml-language-server": "1.15.0" } From aa55531f635300014728a830b84d32c472416fcf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Jun 2024 14:25:27 +0300 Subject: [PATCH 2451/2667] Remove tmux --- home/.config/zsh/04-aliases.zsh | 3 --- 1 file changed, 3 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 30fd7680..c07a51fb 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -214,9 +214,6 @@ update() { nvim --headless -c "Lazy! update" -c 'TSUpdateSync' -c 'MasonUpdateAll' -c 'qa' zinit self-update zinit update -p - {%@@ if profile == "Moria" @@%} - $HOME/.tmux/plugins/tpm/bin/update_plugins all - {%@@ endif @@%} } pip-update-installed() { From e82459e2f876924bb07ce8978ca5fd08297f0155 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Jun 2024 14:25:27 +0300 Subject: [PATCH 2452/2667] Remove tmux --- home/.config/zsh/04-aliases.zsh | 3 --- 1 file changed, 3 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 30fd7680..c07a51fb 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -214,9 +214,6 @@ update() { nvim --headless -c "Lazy! update" -c 'TSUpdateSync' -c 'MasonUpdateAll' -c 'qa' zinit self-update zinit update -p - {%@@ if profile == "Moria" @@%} - $HOME/.tmux/plugins/tpm/bin/update_plugins all - {%@@ endif @@%} } pip-update-installed() { From 81f956e683edd99ab08829225752a907721ebaba Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Jun 2024 17:00:16 +0300 Subject: [PATCH 2453/2667] Fix luasnip error --- home/.config/nvim/lua/plugins/luasnip.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index 88d922e0..1364a570 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -15,4 +15,5 @@ return { paths = { "./snippets" }, }) end, + run = "make install_jsregexp", } From b6af136f0bc9bc4038d08bc022ac9d7b817321e7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Jun 2024 17:00:16 +0300 Subject: [PATCH 2454/2667] Fix luasnip error --- home/.config/nvim/lua/plugins/luasnip.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua index 88d922e0..1364a570 100644 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ b/home/.config/nvim/lua/plugins/luasnip.lua @@ -15,4 +15,5 @@ return { paths = { "./snippets" }, }) end, + run = "make install_jsregexp", } From 3fac118c881f5b7d7d04be0eeac47c20d8236f7e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Jun 2024 17:00:29 +0300 Subject: [PATCH 2455/2667] Neovim: Switch project plugin --- home/.config/nvim/lazy-lock.json | 5 ++--- home/.config/nvim/lua/plugins/telescope.lua | 17 ++++++----------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 8d0028cd..665d4a91 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -12,7 +12,6 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, @@ -46,18 +45,18 @@ "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, - "nvim-treesitter": { "branch": "master", "commit": "9d80c1497ec343f81c0c5800b65f2e73ca569025" }, + "nvim-treesitter": { "branch": "master", "commit": "d4a888ae3cff358cb239643c45b2b38bb60e29c6" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "project.nvim": { "branch": "fix-get_clients", "commit": "6f1937d134515adb7302e3847981063842a65c8b" }, "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, "statuscol.nvim": { "branch": "main", "commit": "d6f7f5437c5404d958b88bb73e0721b1c0e09223" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, + "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "f2bfde705ac752c52544d5cfa8b0aee0a766c1ed" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index ab87eb27..89371aec 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -18,15 +18,8 @@ return { -- cd plugin for telescope "zane-/cder.nvim", - -- Switch to a project - { - "LennyPhoenix/project.nvim", - branch = "fix-get_clients", - main = "project_nvim", - opts = { - patterns = { ".git" }, - }, - }, + -- project plugin for telescope + "nvim-telescope/telescope-project.nvim", }, opts = { -- Set layout to vertical @@ -90,7 +83,9 @@ return { { desc = "Change to a project", "p", - "Telescope projects", + function() + require("telescope").extensions.project.project() + end, }, }, config = function(_, opts) @@ -101,6 +96,6 @@ return { telescope.load_extension("fzf") telescope.load_extension("ui-select") telescope.load_extension("cder") - telescope.load_extension("projects") + telescope.load_extension("project") end, } From 32a7a4221849f75726a7ce64b0af0196b0388b06 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Jun 2024 17:00:29 +0300 Subject: [PATCH 2456/2667] Neovim: Switch project plugin --- home/.config/nvim/lazy-lock.json | 5 ++--- home/.config/nvim/lua/plugins/telescope.lua | 17 ++++++----------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 8d0028cd..665d4a91 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -12,7 +12,6 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, @@ -46,18 +45,18 @@ "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, - "nvim-treesitter": { "branch": "master", "commit": "9d80c1497ec343f81c0c5800b65f2e73ca569025" }, + "nvim-treesitter": { "branch": "master", "commit": "d4a888ae3cff358cb239643c45b2b38bb60e29c6" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "project.nvim": { "branch": "fix-get_clients", "commit": "6f1937d134515adb7302e3847981063842a65c8b" }, "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, "statuscol.nvim": { "branch": "main", "commit": "d6f7f5437c5404d958b88bb73e0721b1c0e09223" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, + "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "f2bfde705ac752c52544d5cfa8b0aee0a766c1ed" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index ab87eb27..89371aec 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -18,15 +18,8 @@ return { -- cd plugin for telescope "zane-/cder.nvim", - -- Switch to a project - { - "LennyPhoenix/project.nvim", - branch = "fix-get_clients", - main = "project_nvim", - opts = { - patterns = { ".git" }, - }, - }, + -- project plugin for telescope + "nvim-telescope/telescope-project.nvim", }, opts = { -- Set layout to vertical @@ -90,7 +83,9 @@ return { { desc = "Change to a project", "p", - "Telescope projects", + function() + require("telescope").extensions.project.project() + end, }, }, config = function(_, opts) @@ -101,6 +96,6 @@ return { telescope.load_extension("fzf") telescope.load_extension("ui-select") telescope.load_extension("cder") - telescope.load_extension("projects") + telescope.load_extension("project") end, } From aca76119c96ec85018b2d1071129ee777c404694 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Jun 2024 09:01:52 +0300 Subject: [PATCH 2457/2667] Fix pairdrop ipv6 --- docker/drop/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/drop/docker-compose.toml b/docker/drop/docker-compose.toml index 6d316a1a..2c07364b 100644 --- a/docker/drop/docker-compose.toml +++ b/docker/drop/docker-compose.toml @@ -3,7 +3,7 @@ image = "lscr.io/linuxserver/pairdrop" container_name = "drop" restart = "unless-stopped" networks = ["proxy"] -environment = ["TZ=Europe/Helsinki"] +environment = ["TZ=Europe/Helsinki", "IPV6_LOCALIZE=4"] [networks.proxy] external = true From 765cb0ce2b2195ff1457f0cc9ebf27814f35585d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Jun 2024 09:01:52 +0300 Subject: [PATCH 2458/2667] Fix pairdrop ipv6 --- docker/drop/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/drop/docker-compose.toml b/docker/drop/docker-compose.toml index 6d316a1a..2c07364b 100644 --- a/docker/drop/docker-compose.toml +++ b/docker/drop/docker-compose.toml @@ -3,7 +3,7 @@ image = "lscr.io/linuxserver/pairdrop" container_name = "drop" restart = "unless-stopped" networks = ["proxy"] -environment = ["TZ=Europe/Helsinki"] +environment = ["TZ=Europe/Helsinki", "IPV6_LOCALIZE=4"] [networks.proxy] external = true From 2f74592bff775ed21c4d6f9903da10db0de76ff1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Jun 2024 11:34:00 +0300 Subject: [PATCH 2459/2667] NeoVim: lualine: show selectioncount in visual mode --- home/.config/nvim/lua/plugins/lualine.lua | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 895b9e87..377201d6 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -3,5 +3,25 @@ return { "nvim-lualine/lualine.nvim", dependencies = { "kyazdani42/nvim-web-devicons" }, + opts = { + sections = { + lualine_z = { + { + "selectioncount", + cond = function() + local mode = vim.fn.mode() + return mode == "v" or mode == "V" or mode == "\22" + end, + }, + { + "location", + cond = function() + local mode = vim.fn.mode() + return mode ~= "v" and mode ~= "V" and mode ~= "\22" + end, + }, + }, + }, + }, config = true, } From 08559475cf07139878626564c101f921643f606a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Jun 2024 11:34:00 +0300 Subject: [PATCH 2460/2667] NeoVim: lualine: show selectioncount in visual mode --- home/.config/nvim/lua/plugins/lualine.lua | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 895b9e87..377201d6 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -3,5 +3,25 @@ return { "nvim-lualine/lualine.nvim", dependencies = { "kyazdani42/nvim-web-devicons" }, + opts = { + sections = { + lualine_z = { + { + "selectioncount", + cond = function() + local mode = vim.fn.mode() + return mode == "v" or mode == "V" or mode == "\22" + end, + }, + { + "location", + cond = function() + local mode = vim.fn.mode() + return mode ~= "v" and mode ~= "V" and mode ~= "\22" + end, + }, + }, + }, + }, config = true, } From e042dbf274ee0772d72af3eb0b270601797556a2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Jun 2024 11:34:19 +0300 Subject: [PATCH 2461/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 665d4a91..f3dab37e 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -2,7 +2,7 @@ "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, - "bufferline.nvim": { "branch": "main", "commit": "46192e794b73f92136326c10ecdbdbf15e35705f" }, + "bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -12,16 +12,17 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dropbar.nvim": { "branch": "master", "commit": "79847a78ec0c58f5e5c0360192b03d0cee803e95" }, - "firenvim": { "branch": "master", "commit": "e412ab23c5b56b7eb3c361da8a1f8a2e94c51001" }, + "firenvim": { "branch": "master", "commit": "992e57666c0d4c301c5a231354b8237d7bae0282" }, "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "gitsigns.nvim": { "branch": "main", "commit": "8df63f2ddc615feb71fd4aee45a4cee022876df1" }, - "indent-blankline.nvim": { "branch": "master", "commit": "4036c8ae9cc29faf8e6443fa5b23e679db055d24" }, - "kanagawa.nvim": { "branch": "master", "commit": "fe5b2c9e2549862c3dc3f3c8e9cf7ddece0f40c2" }, - "lazy.nvim": { "branch": "main", "commit": "4ea9fe060042f345960ad0c01aa7bca91405e10a" }, + "gitsigns.nvim": { "branch": "main", "commit": "fa42613096ebfa5fee1ea87d70f8625ab9685d01" }, + "indent-blankline.nvim": { "branch": "master", "commit": "4288ce8128a52650e401dda42fd7651a6038f262" }, + "kanagawa.nvim": { "branch": "master", "commit": "7735b2147ee6d223e43287044caa4fb070bdfa3d" }, + "lazy.nvim": { "branch": "main", "commit": "aa1c9572aa1916e582f9b9c3d43e272b4f23b326" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, @@ -31,8 +32,8 @@ "mini.nvim": { "branch": "main", "commit": "334a2d9cfbd86ea08c4d870e39b5ba8bb354d938" }, "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "c36467f9944cef92c4561080816c0dfe06a7a1bd" }, - "nui.nvim": { "branch": "main", "commit": "a2bc1e9d0359caa5d11ad967cd1e30e8d4676226" }, + "noice.nvim": { "branch": "main", "commit": "cade1f972ba226e7753a7a113f3f1a942908e73c" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, @@ -45,7 +46,7 @@ "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, - "nvim-treesitter": { "branch": "master", "commit": "d4a888ae3cff358cb239643c45b2b38bb60e29c6" }, + "nvim-treesitter": { "branch": "master", "commit": "d467f7d5617ce30f70f31254537c4ce44c108214" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" }, @@ -58,10 +59,10 @@ "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "f2bfde705ac752c52544d5cfa8b0aee0a766c1ed" }, + "telescope.nvim": { "branch": "master", "commit": "61a4a615366c470a4e9ca8f8b45718b6b92af73f" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "64d6cafb9dcbacce18c26d7daf617ebb96b273f3" }, + "vim-fugitive": { "branch": "master", "commit": "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } } \ No newline at end of file From ec7f932e393d37cd92d3a430eb7de63b12d92662 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Jun 2024 11:34:19 +0300 Subject: [PATCH 2462/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 665d4a91..f3dab37e 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -2,7 +2,7 @@ "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, - "bufferline.nvim": { "branch": "main", "commit": "46192e794b73f92136326c10ecdbdbf15e35705f" }, + "bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" }, "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -12,16 +12,17 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dropbar.nvim": { "branch": "master", "commit": "79847a78ec0c58f5e5c0360192b03d0cee803e95" }, - "firenvim": { "branch": "master", "commit": "e412ab23c5b56b7eb3c361da8a1f8a2e94c51001" }, + "firenvim": { "branch": "master", "commit": "992e57666c0d4c301c5a231354b8237d7bae0282" }, "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "gitsigns.nvim": { "branch": "main", "commit": "8df63f2ddc615feb71fd4aee45a4cee022876df1" }, - "indent-blankline.nvim": { "branch": "master", "commit": "4036c8ae9cc29faf8e6443fa5b23e679db055d24" }, - "kanagawa.nvim": { "branch": "master", "commit": "fe5b2c9e2549862c3dc3f3c8e9cf7ddece0f40c2" }, - "lazy.nvim": { "branch": "main", "commit": "4ea9fe060042f345960ad0c01aa7bca91405e10a" }, + "gitsigns.nvim": { "branch": "main", "commit": "fa42613096ebfa5fee1ea87d70f8625ab9685d01" }, + "indent-blankline.nvim": { "branch": "master", "commit": "4288ce8128a52650e401dda42fd7651a6038f262" }, + "kanagawa.nvim": { "branch": "master", "commit": "7735b2147ee6d223e43287044caa4fb070bdfa3d" }, + "lazy.nvim": { "branch": "main", "commit": "aa1c9572aa1916e582f9b9c3d43e272b4f23b326" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, @@ -31,8 +32,8 @@ "mini.nvim": { "branch": "main", "commit": "334a2d9cfbd86ea08c4d870e39b5ba8bb354d938" }, "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "c36467f9944cef92c4561080816c0dfe06a7a1bd" }, - "nui.nvim": { "branch": "main", "commit": "a2bc1e9d0359caa5d11ad967cd1e30e8d4676226" }, + "noice.nvim": { "branch": "main", "commit": "cade1f972ba226e7753a7a113f3f1a942908e73c" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, @@ -45,7 +46,7 @@ "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, - "nvim-treesitter": { "branch": "master", "commit": "d4a888ae3cff358cb239643c45b2b38bb60e29c6" }, + "nvim-treesitter": { "branch": "master", "commit": "d467f7d5617ce30f70f31254537c4ce44c108214" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" }, @@ -58,10 +59,10 @@ "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "f2bfde705ac752c52544d5cfa8b0aee0a766c1ed" }, + "telescope.nvim": { "branch": "master", "commit": "61a4a615366c470a4e9ca8f8b45718b6b92af73f" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "64d6cafb9dcbacce18c26d7daf617ebb96b273f3" }, + "vim-fugitive": { "branch": "master", "commit": "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } } \ No newline at end of file From 87b86ee8e09db888e5ec5c0f6b2145807efb88ad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Jun 2024 12:29:42 +0300 Subject: [PATCH 2463/2667] Switch away from cachyos repositories and build packages for non-native targets This is because shire doesn't support newer x86 instruction sets --- config-root.toml | 6 ------ home/.config/pacman/makepkg.conf | 4 ++-- root/etc/mkinitcpio.d/linux-cachyos.preset | 7 ------- root/etc/pacman.conf | 16 ---------------- 4 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 root/etc/mkinitcpio.d/linux-cachyos.preset diff --git a/config-root.toml b/config-root.toml index 18c9c38b..04a8fd24 100644 --- a/config-root.toml +++ b/config-root.toml @@ -143,10 +143,6 @@ dst = "/etc/pacserve/pacserve.service.conf" src = "etc/mkinitcpio.d/linux.preset" dst = "/etc/mkinitcpio.d/linux.preset" -[dotfiles."f_mkinitcpio_linux-cachyos.preset"] -src = "etc/mkinitcpio.d/linux-cachyos.preset" -dst = "/etc/mkinitcpio.d/linux-cachyos.preset" - [dotfiles.f_cmdline] src = "etc/kernel/cmdline" dst = "/etc/kernel/cmdline" @@ -196,7 +192,6 @@ dotfiles = [ "f_logind.conf", "f_mkinitcpio.conf", "f_mkinitcpio_linux.preset", - "f_mkinitcpio_linux-cachyos.preset", "f_plymouthd.conf", "f_sshd_config", "f_system.conf", @@ -239,7 +234,6 @@ dotfiles = [ "f_adb.service", "f_mkinitcpio.conf", "f_mkinitcpio_linux.preset", - "f_mkinitcpio_linux-cachyos.preset", "f_plymouthd.conf", "f_sshd_config", "f_flexo.toml", diff --git a/home/.config/pacman/makepkg.conf b/home/.config/pacman/makepkg.conf index 0e014014..027c9288 100644 --- a/home/.config/pacman/makepkg.conf +++ b/home/.config/pacman/makepkg.conf @@ -16,9 +16,9 @@ CARCH="x86_64" CHOST="x86_64-pc-linux-gnu" CPPFLAGS="-D_FORTIFY_SOURCE=2" -CFLAGS="-march=native -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" +#CFLAGS="-march=native -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" CXXFLAGS="${CFLAGS}" -RUSTFLAGS="-C opt-level=3 -C target-cpu=native" +#RUSTFLAGS="-C opt-level=3 -C target-cpu=native" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" MAKEFLAGS="-j$(nproc)" DEBUG_CFLAGS="-g -fvar-tracking-assignments" diff --git a/root/etc/mkinitcpio.d/linux-cachyos.preset b/root/etc/mkinitcpio.d/linux-cachyos.preset deleted file mode 100644 index a5aaab2d..00000000 --- a/root/etc/mkinitcpio.d/linux-cachyos.preset +++ /dev/null @@ -1,7 +0,0 @@ -PRESETS=('default') - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuz-linux-cachyos" - -default_image="/boot/initramfs-linux-cachyos.img" -default_uki="/boot/EFI/Linux/archlinux-linux-cachyos.efi" diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 569afd7c..249cd2a9 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -13,22 +13,6 @@ CleanMethod=KeepCurrent CacheDir= /var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} -[cachyos-v3] -Include = /etc/pacman.d/pacserve -Include = /etc/pacman.d/cachyos-v3-mirrorlist - -[cachyos-core-v3] -Include = /etc/pacman.d/pacserve -Include = /etc/pacman.d/cachyos-v3-mirrorlist - -[cachyos-extra-v3] -Include = /etc/pacman.d/pacserve -Include = /etc/pacman.d/cachyos-v3-mirrorlist - -[cachyos] -Include = /etc/pacman.d/pacserve -Include = /etc/pacman.d/cachyos-mirrorlist - [core] Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist From 6409e977885c9efe51480fa514480d938d98d782 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Jun 2024 12:29:42 +0300 Subject: [PATCH 2464/2667] Switch away from cachyos repositories and build packages for non-native targets This is because shire doesn't support newer x86 instruction sets --- config-root.toml | 6 ------ home/.config/pacman/makepkg.conf | 4 ++-- root/etc/mkinitcpio.d/linux-cachyos.preset | 7 ------- root/etc/pacman.conf | 16 ---------------- 4 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 root/etc/mkinitcpio.d/linux-cachyos.preset diff --git a/config-root.toml b/config-root.toml index 18c9c38b..04a8fd24 100644 --- a/config-root.toml +++ b/config-root.toml @@ -143,10 +143,6 @@ dst = "/etc/pacserve/pacserve.service.conf" src = "etc/mkinitcpio.d/linux.preset" dst = "/etc/mkinitcpio.d/linux.preset" -[dotfiles."f_mkinitcpio_linux-cachyos.preset"] -src = "etc/mkinitcpio.d/linux-cachyos.preset" -dst = "/etc/mkinitcpio.d/linux-cachyos.preset" - [dotfiles.f_cmdline] src = "etc/kernel/cmdline" dst = "/etc/kernel/cmdline" @@ -196,7 +192,6 @@ dotfiles = [ "f_logind.conf", "f_mkinitcpio.conf", "f_mkinitcpio_linux.preset", - "f_mkinitcpio_linux-cachyos.preset", "f_plymouthd.conf", "f_sshd_config", "f_system.conf", @@ -239,7 +234,6 @@ dotfiles = [ "f_adb.service", "f_mkinitcpio.conf", "f_mkinitcpio_linux.preset", - "f_mkinitcpio_linux-cachyos.preset", "f_plymouthd.conf", "f_sshd_config", "f_flexo.toml", diff --git a/home/.config/pacman/makepkg.conf b/home/.config/pacman/makepkg.conf index 0e014014..027c9288 100644 --- a/home/.config/pacman/makepkg.conf +++ b/home/.config/pacman/makepkg.conf @@ -16,9 +16,9 @@ CARCH="x86_64" CHOST="x86_64-pc-linux-gnu" CPPFLAGS="-D_FORTIFY_SOURCE=2" -CFLAGS="-march=native -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" +#CFLAGS="-march=native -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" CXXFLAGS="${CFLAGS}" -RUSTFLAGS="-C opt-level=3 -C target-cpu=native" +#RUSTFLAGS="-C opt-level=3 -C target-cpu=native" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" MAKEFLAGS="-j$(nproc)" DEBUG_CFLAGS="-g -fvar-tracking-assignments" diff --git a/root/etc/mkinitcpio.d/linux-cachyos.preset b/root/etc/mkinitcpio.d/linux-cachyos.preset deleted file mode 100644 index a5aaab2d..00000000 --- a/root/etc/mkinitcpio.d/linux-cachyos.preset +++ /dev/null @@ -1,7 +0,0 @@ -PRESETS=('default') - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuz-linux-cachyos" - -default_image="/boot/initramfs-linux-cachyos.img" -default_uki="/boot/EFI/Linux/archlinux-linux-cachyos.efi" diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 569afd7c..249cd2a9 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -13,22 +13,6 @@ CleanMethod=KeepCurrent CacheDir= /var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} -[cachyos-v3] -Include = /etc/pacman.d/pacserve -Include = /etc/pacman.d/cachyos-v3-mirrorlist - -[cachyos-core-v3] -Include = /etc/pacman.d/pacserve -Include = /etc/pacman.d/cachyos-v3-mirrorlist - -[cachyos-extra-v3] -Include = /etc/pacman.d/pacserve -Include = /etc/pacman.d/cachyos-v3-mirrorlist - -[cachyos] -Include = /etc/pacman.d/pacserve -Include = /etc/pacman.d/cachyos-mirrorlist - [core] Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist From 028fe1da43be49b2447f11d6b6e61d9fd2793e5d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Jun 2024 13:42:31 +0300 Subject: [PATCH 2465/2667] fix shire cmdline --- root/etc/kernel/cmdline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index 50587787..32a058f8 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -3,5 +3,5 @@ cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards r {%@@ elif profile == "Moria" @@%} cryptdevice=UUID=51115cf2-6a44-4f8c-8aa2-ff9d834953d8:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Shire" @@%} -cryptdevice=UUID=370d6c2a-86ab-4e7d-9442-d15ad173f3e3:cryptroot root=/dev/mapper/cryptroot rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 +cryptdevice=UUID=370d6c2a-86ab-4e7d-9442-d15ad173f3e3:cryptroot root=/dev/mapper/cryptroot resume_offset=1908736 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ endif @@%} From 14920550cd67839512092035113f22ef89f78b5b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Jun 2024 13:42:31 +0300 Subject: [PATCH 2466/2667] fix shire cmdline --- root/etc/kernel/cmdline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index 50587787..32a058f8 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -3,5 +3,5 @@ cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards r {%@@ elif profile == "Moria" @@%} cryptdevice=UUID=51115cf2-6a44-4f8c-8aa2-ff9d834953d8:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Shire" @@%} -cryptdevice=UUID=370d6c2a-86ab-4e7d-9442-d15ad173f3e3:cryptroot root=/dev/mapper/cryptroot rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 +cryptdevice=UUID=370d6c2a-86ab-4e7d-9442-d15ad173f3e3:cryptroot root=/dev/mapper/cryptroot resume_offset=1908736 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ endif @@%} From 6678a6c3a3c86ec6b179f3f63a9a9aa75b22002d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 30 Jun 2024 10:56:50 +0300 Subject: [PATCH 2467/2667] Makepkg: use default flags --- home/.config/pacman/makepkg.conf | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/home/.config/pacman/makepkg.conf b/home/.config/pacman/makepkg.conf index 027c9288..4cb42c50 100644 --- a/home/.config/pacman/makepkg.conf +++ b/home/.config/pacman/makepkg.conf @@ -15,14 +15,18 @@ VCSCLIENTS=('bzr::bzr' CARCH="x86_64" CHOST="x86_64-pc-linux-gnu" -CPPFLAGS="-D_FORTIFY_SOURCE=2" -#CFLAGS="-march=native -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" -CXXFLAGS="${CFLAGS}" -#RUSTFLAGS="-C opt-level=3 -C target-cpu=native" -LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" -MAKEFLAGS="-j$(nproc)" -DEBUG_CFLAGS="-g -fvar-tracking-assignments" -DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" +CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \ + -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \ + -fstack-clash-protection -fcf-protection \ + -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" +CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" +LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \ + -Wl,-z,pack-relative-relocs" +LTOFLAGS="-flto=auto" +RUSTFLAGS="-Cforce-frame-pointers=yes" +DEBUG_CFLAGS="-g" +DEBUG_CXXFLAGS="$DEBUG_CFLAGS" +DEBUG_RUSTFLAGS="-C debuginfo=2" BUILDENV=(!distcc color !ccache check !sign) From 4d451a1007db865ba4ad7c2d083e907b825cdff9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 30 Jun 2024 10:56:50 +0300 Subject: [PATCH 2468/2667] Makepkg: use default flags --- home/.config/pacman/makepkg.conf | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/home/.config/pacman/makepkg.conf b/home/.config/pacman/makepkg.conf index 027c9288..4cb42c50 100644 --- a/home/.config/pacman/makepkg.conf +++ b/home/.config/pacman/makepkg.conf @@ -15,14 +15,18 @@ VCSCLIENTS=('bzr::bzr' CARCH="x86_64" CHOST="x86_64-pc-linux-gnu" -CPPFLAGS="-D_FORTIFY_SOURCE=2" -#CFLAGS="-march=native -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" -CXXFLAGS="${CFLAGS}" -#RUSTFLAGS="-C opt-level=3 -C target-cpu=native" -LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" -MAKEFLAGS="-j$(nproc)" -DEBUG_CFLAGS="-g -fvar-tracking-assignments" -DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" +CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \ + -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \ + -fstack-clash-protection -fcf-protection \ + -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" +CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" +LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \ + -Wl,-z,pack-relative-relocs" +LTOFLAGS="-flto=auto" +RUSTFLAGS="-Cforce-frame-pointers=yes" +DEBUG_CFLAGS="-g" +DEBUG_CXXFLAGS="$DEBUG_CFLAGS" +DEBUG_RUSTFLAGS="-C debuginfo=2" BUILDENV=(!distcc color !ccache check !sign) From bdf18b0908984521416aa054204e66b50f9c890a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Jul 2024 09:14:32 +0300 Subject: [PATCH 2469/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index f3dab37e..14d9bd86 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, + "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, "bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" }, @@ -17,22 +17,22 @@ "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dropbar.nvim": { "branch": "master", "commit": "79847a78ec0c58f5e5c0360192b03d0cee803e95" }, - "firenvim": { "branch": "master", "commit": "992e57666c0d4c301c5a231354b8237d7bae0282" }, + "firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" }, "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "gitsigns.nvim": { "branch": "main", "commit": "fa42613096ebfa5fee1ea87d70f8625ab9685d01" }, - "indent-blankline.nvim": { "branch": "master", "commit": "4288ce8128a52650e401dda42fd7651a6038f262" }, - "kanagawa.nvim": { "branch": "master", "commit": "7735b2147ee6d223e43287044caa4fb070bdfa3d" }, - "lazy.nvim": { "branch": "main", "commit": "aa1c9572aa1916e582f9b9c3d43e272b4f23b326" }, + "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" }, + "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "kanagawa.nvim": { "branch": "master", "commit": "b4110528b4a12c295efd3ae222882469b2b44d4a" }, + "lazy.nvim": { "branch": "main", "commit": "a9d7ade203b3f3ee3058c082c62afdf8e4bcb416" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.nvim": { "branch": "main", "commit": "334a2d9cfbd86ea08c4d870e39b5ba8bb354d938" }, + "mini.nvim": { "branch": "main", "commit": "7cd21b780e9891cb84e47198aa2ee20e184b8354" }, "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "cade1f972ba226e7753a7a113f3f1a942908e73c" }, + "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, @@ -42,11 +42,11 @@ "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, "nvim-jdtls": { "branch": "master", "commit": "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "9c9eb07fecc578e25e28db8dc9002b43fff2ed79" }, + "nvim-lspconfig": { "branch": "master", "commit": "7edfd6692ba17f8d4fe08d84142781898ab0a672" }, "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, - "nvim-treesitter": { "branch": "master", "commit": "d467f7d5617ce30f70f31254537c4ce44c108214" }, + "nvim-treesitter": { "branch": "master", "commit": "7ff0b8d3d21b15eb7231fcbd2acfded8987f5efd" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" }, @@ -59,7 +59,7 @@ "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "61a4a615366c470a4e9ca8f8b45718b6b92af73f" }, + "telescope.nvim": { "branch": "master", "commit": "7bd2f9b72f8449780b79bcf351534e2cd36ec43a" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe" }, From ff5fd33f7be0ed10d262a07b048306fa0309179a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Jul 2024 09:14:32 +0300 Subject: [PATCH 2470/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index f3dab37e..14d9bd86 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, + "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, "bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" }, @@ -17,22 +17,22 @@ "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dropbar.nvim": { "branch": "master", "commit": "79847a78ec0c58f5e5c0360192b03d0cee803e95" }, - "firenvim": { "branch": "master", "commit": "992e57666c0d4c301c5a231354b8237d7bae0282" }, + "firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" }, "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "gitsigns.nvim": { "branch": "main", "commit": "fa42613096ebfa5fee1ea87d70f8625ab9685d01" }, - "indent-blankline.nvim": { "branch": "master", "commit": "4288ce8128a52650e401dda42fd7651a6038f262" }, - "kanagawa.nvim": { "branch": "master", "commit": "7735b2147ee6d223e43287044caa4fb070bdfa3d" }, - "lazy.nvim": { "branch": "main", "commit": "aa1c9572aa1916e582f9b9c3d43e272b4f23b326" }, + "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" }, + "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "kanagawa.nvim": { "branch": "master", "commit": "b4110528b4a12c295efd3ae222882469b2b44d4a" }, + "lazy.nvim": { "branch": "main", "commit": "a9d7ade203b3f3ee3058c082c62afdf8e4bcb416" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.nvim": { "branch": "main", "commit": "334a2d9cfbd86ea08c4d870e39b5ba8bb354d938" }, + "mini.nvim": { "branch": "main", "commit": "7cd21b780e9891cb84e47198aa2ee20e184b8354" }, "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "cade1f972ba226e7753a7a113f3f1a942908e73c" }, + "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, @@ -42,11 +42,11 @@ "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, "nvim-jdtls": { "branch": "master", "commit": "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "9c9eb07fecc578e25e28db8dc9002b43fff2ed79" }, + "nvim-lspconfig": { "branch": "master", "commit": "7edfd6692ba17f8d4fe08d84142781898ab0a672" }, "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, - "nvim-treesitter": { "branch": "master", "commit": "d467f7d5617ce30f70f31254537c4ce44c108214" }, + "nvim-treesitter": { "branch": "master", "commit": "7ff0b8d3d21b15eb7231fcbd2acfded8987f5efd" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" }, @@ -59,7 +59,7 @@ "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "61a4a615366c470a4e9ca8f8b45718b6b92af73f" }, + "telescope.nvim": { "branch": "master", "commit": "7bd2f9b72f8449780b79bcf351534e2cd36ec43a" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe" }, From dedc01c1b9915dc8a21105f9ed3136147bbbd588 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Jul 2024 09:13:01 +0300 Subject: [PATCH 2471/2667] Neovim: add extra parameter for java snippet --- home/.config/nvim/snippets/java.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/snippets/java.json b/home/.config/nvim/snippets/java.json index b6392431..6ab73774 100644 --- a/home/.config/nvim/snippets/java.json +++ b/home/.config/nvim/snippets/java.json @@ -4,7 +4,7 @@ "description": "Create a method to get a List from the database (Rossum JpaBaseDAO)", "prefix": "queryListFromModel", "body": [ - "public List<$1> $2() {", + "public List<$1> $2($3) {", " return queryFromModelObject()", " .where((cb, root) -> $0)", " .results();", From f8329b1b78eb9b0eff725dbb0b7456743c989715 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Jul 2024 09:13:01 +0300 Subject: [PATCH 2472/2667] Neovim: add extra parameter for java snippet --- home/.config/nvim/snippets/java.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/snippets/java.json b/home/.config/nvim/snippets/java.json index b6392431..6ab73774 100644 --- a/home/.config/nvim/snippets/java.json +++ b/home/.config/nvim/snippets/java.json @@ -4,7 +4,7 @@ "description": "Create a method to get a List from the database (Rossum JpaBaseDAO)", "prefix": "queryListFromModel", "body": [ - "public List<$1> $2() {", + "public List<$1> $2($3) {", " return queryFromModelObject()", " .where((cb, root) -> $0)", " .results();", From 41c0c05623ab49bec80e41e8bc8f1ee4eda87851 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Jul 2024 09:15:06 +0300 Subject: [PATCH 2473/2667] ZSH: package remove alias: use local database for package info --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index c07a51fb..7194375c 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -66,7 +66,7 @@ mkcd() { pr() { {%@@ if distro_id == "arch" @@%} - SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" + SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Qi {1}' | tr '\n' ' ')" {%@@ else @@%} SELECTED_PKGS="$(apt list --installed 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Remove packages' -m --preview 'apt show 2>/dev/null {1}' | tr '\n' ' ')" {%@@ endif @@%} From b712091b1b12a53109817e6c43dc86ce93def49b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Jul 2024 09:15:06 +0300 Subject: [PATCH 2474/2667] ZSH: package remove alias: use local database for package info --- home/.config/zsh/04-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index c07a51fb..7194375c 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -66,7 +66,7 @@ mkcd() { pr() { {%@@ if distro_id == "arch" @@%} - SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" + SELECTED_PKGS="$(paru -Qsq | fzf --header='Remove packages' -m --preview 'paru -Qi {1}' | tr '\n' ' ')" {%@@ else @@%} SELECTED_PKGS="$(apt list --installed 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Remove packages' -m --preview 'apt show 2>/dev/null {1}' | tr '\n' ' ')" {%@@ endif @@%} From 77cc2660d7ac4e09b783e579ec6fd598c51dd78b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Jul 2024 09:16:39 +0300 Subject: [PATCH 2475/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 14d9bd86..530c9568 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -22,14 +22,14 @@ "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "kanagawa.nvim": { "branch": "master", "commit": "b4110528b4a12c295efd3ae222882469b2b44d4a" }, - "lazy.nvim": { "branch": "main", "commit": "a9d7ade203b3f3ee3058c082c62afdf8e4bcb416" }, + "lazy.nvim": { "branch": "main", "commit": "d0921f5b9b3d2c5e09618da55a018228edcc4d16" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.nvim": { "branch": "main", "commit": "7cd21b780e9891cb84e47198aa2ee20e184b8354" }, + "mini.nvim": { "branch": "main", "commit": "b8c1d3b2f4cd637760babb8a33ad12fd5afe2ee2" }, "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" }, @@ -42,11 +42,11 @@ "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, "nvim-jdtls": { "branch": "master", "commit": "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "7edfd6692ba17f8d4fe08d84142781898ab0a672" }, + "nvim-lspconfig": { "branch": "master", "commit": "53a3c6444ec5006b567071614c83edc8ad651f6d" }, "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, - "nvim-treesitter": { "branch": "master", "commit": "7ff0b8d3d21b15eb7231fcbd2acfded8987f5efd" }, + "nvim-treesitter": { "branch": "master", "commit": "6cd4ce6cab184e8787f164a182954534221f2af2" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" }, @@ -56,10 +56,10 @@ "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, "statuscol.nvim": { "branch": "main", "commit": "d6f7f5437c5404d958b88bb73e0721b1c0e09223" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "7bd2f9b72f8449780b79bcf351534e2cd36ec43a" }, + "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe" }, From 48910eb2c60315c808c094dd7ff2db84dd2df09e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Jul 2024 09:16:39 +0300 Subject: [PATCH 2476/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 14d9bd86..530c9568 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -22,14 +22,14 @@ "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "kanagawa.nvim": { "branch": "master", "commit": "b4110528b4a12c295efd3ae222882469b2b44d4a" }, - "lazy.nvim": { "branch": "main", "commit": "a9d7ade203b3f3ee3058c082c62afdf8e4bcb416" }, + "lazy.nvim": { "branch": "main", "commit": "d0921f5b9b3d2c5e09618da55a018228edcc4d16" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.nvim": { "branch": "main", "commit": "7cd21b780e9891cb84e47198aa2ee20e184b8354" }, + "mini.nvim": { "branch": "main", "commit": "b8c1d3b2f4cd637760babb8a33ad12fd5afe2ee2" }, "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" }, @@ -42,11 +42,11 @@ "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, "nvim-jdtls": { "branch": "master", "commit": "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "7edfd6692ba17f8d4fe08d84142781898ab0a672" }, + "nvim-lspconfig": { "branch": "master", "commit": "53a3c6444ec5006b567071614c83edc8ad651f6d" }, "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, - "nvim-treesitter": { "branch": "master", "commit": "7ff0b8d3d21b15eb7231fcbd2acfded8987f5efd" }, + "nvim-treesitter": { "branch": "master", "commit": "6cd4ce6cab184e8787f164a182954534221f2af2" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" }, @@ -56,10 +56,10 @@ "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, "statuscol.nvim": { "branch": "main", "commit": "d6f7f5437c5404d958b88bb73e0721b1c0e09223" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "7bd2f9b72f8449780b79bcf351534e2cd36ec43a" }, + "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe" }, From 758ffcfd08491b30a88f5d25469f71d9d61d4175 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Jul 2024 09:23:43 +0300 Subject: [PATCH 2477/2667] Nvim: use cond instead of enabled to disable confirm-quit --- home/.config/nvim/lua/plugins/confirm-quit.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/confirm-quit.lua b/home/.config/nvim/lua/plugins/confirm-quit.lua index 08d85558..f140e7af 100644 --- a/home/.config/nvim/lua/plugins/confirm-quit.lua +++ b/home/.config/nvim/lua/plugins/confirm-quit.lua @@ -1,7 +1,7 @@ -- Confirm before quit --- @type LazyPluginSpec return { - enabled = vim.g.neovide == not nil, + cond = vim.g.neovide == not nil, "yutkat/confirm-quit.nvim", event = "CmdlineEnter", opts = { From 29fc562c129a0b6963056afe7ba3c9d441b3b957 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Jul 2024 09:23:43 +0300 Subject: [PATCH 2478/2667] Nvim: use cond instead of enabled to disable confirm-quit --- home/.config/nvim/lua/plugins/confirm-quit.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/confirm-quit.lua b/home/.config/nvim/lua/plugins/confirm-quit.lua index 08d85558..f140e7af 100644 --- a/home/.config/nvim/lua/plugins/confirm-quit.lua +++ b/home/.config/nvim/lua/plugins/confirm-quit.lua @@ -1,7 +1,7 @@ -- Confirm before quit --- @type LazyPluginSpec return { - enabled = vim.g.neovide == not nil, + cond = vim.g.neovide == not nil, "yutkat/confirm-quit.nvim", event = "CmdlineEnter", opts = { From 91a658992363b7a5b24cd57a0216a30d7b6fb168 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Jul 2024 14:04:18 +0300 Subject: [PATCH 2479/2667] Nvim: add keybind to close other buffers --- home/.config/nvim/lua/plugins/which-key.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 0a65beac..12fd3d2b 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -21,6 +21,7 @@ return { wk.register({ h = { "nohlsearch", "Turn off search highlight" }, b = { toggle_theme, "Toggle background between dark and light" }, + co = { 'silent! execute "%bd|e#|bd#"', "Close other buffers" }, }, { prefix = "" }) wk.register({ From 930321bd3e52d2620cb9834359c1c02f7839a30f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Jul 2024 14:04:18 +0300 Subject: [PATCH 2480/2667] Nvim: add keybind to close other buffers --- home/.config/nvim/lua/plugins/which-key.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 0a65beac..12fd3d2b 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -21,6 +21,7 @@ return { wk.register({ h = { "nohlsearch", "Turn off search highlight" }, b = { toggle_theme, "Toggle background between dark and light" }, + co = { 'silent! execute "%bd|e#|bd#"', "Close other buffers" }, }, { prefix = "" }) wk.register({ From 50b5b13526b60af151361d6d836d76c74810a536 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 4 Jul 2024 16:45:06 +0300 Subject: [PATCH 2481/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 530c9568..cfbe9d45 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -19,17 +19,17 @@ "dropbar.nvim": { "branch": "master", "commit": "79847a78ec0c58f5e5c0360192b03d0cee803e95" }, "firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" }, "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" }, + "gitsigns.nvim": { "branch": "main", "commit": "39b5b6f48bde0595ce68007ffce408c5d7ac1f79" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "kanagawa.nvim": { "branch": "master", "commit": "b4110528b4a12c295efd3ae222882469b2b44d4a" }, - "lazy.nvim": { "branch": "main", "commit": "d0921f5b9b3d2c5e09618da55a018228edcc4d16" }, + "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, + "lazy.nvim": { "branch": "main", "commit": "6fdd904ee45b66d933c5d2f72bcec337e13744f8" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.nvim": { "branch": "main", "commit": "b8c1d3b2f4cd637760babb8a33ad12fd5afe2ee2" }, + "mini.nvim": { "branch": "main", "commit": "e0cd9ec751328655db4ae22d26876a67f9beaa3b" }, "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" }, @@ -42,11 +42,11 @@ "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, "nvim-jdtls": { "branch": "master", "commit": "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "53a3c6444ec5006b567071614c83edc8ad651f6d" }, + "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" }, "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, - "nvim-treesitter": { "branch": "master", "commit": "6cd4ce6cab184e8787f164a182954534221f2af2" }, + "nvim-treesitter": { "branch": "master", "commit": "acc1708b962e12cc1d671cd530782727801804c3" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" }, From 45373b57faf2017c9178a5928da257d4a5b20428 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 4 Jul 2024 16:45:06 +0300 Subject: [PATCH 2482/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 530c9568..cfbe9d45 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -19,17 +19,17 @@ "dropbar.nvim": { "branch": "master", "commit": "79847a78ec0c58f5e5c0360192b03d0cee803e95" }, "firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" }, "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" }, + "gitsigns.nvim": { "branch": "main", "commit": "39b5b6f48bde0595ce68007ffce408c5d7ac1f79" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "kanagawa.nvim": { "branch": "master", "commit": "b4110528b4a12c295efd3ae222882469b2b44d4a" }, - "lazy.nvim": { "branch": "main", "commit": "d0921f5b9b3d2c5e09618da55a018228edcc4d16" }, + "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, + "lazy.nvim": { "branch": "main", "commit": "6fdd904ee45b66d933c5d2f72bcec337e13744f8" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.nvim": { "branch": "main", "commit": "b8c1d3b2f4cd637760babb8a33ad12fd5afe2ee2" }, + "mini.nvim": { "branch": "main", "commit": "e0cd9ec751328655db4ae22d26876a67f9beaa3b" }, "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" }, @@ -42,11 +42,11 @@ "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, "nvim-jdtls": { "branch": "master", "commit": "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "53a3c6444ec5006b567071614c83edc8ad651f6d" }, + "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" }, "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, - "nvim-treesitter": { "branch": "master", "commit": "6cd4ce6cab184e8787f164a182954534221f2af2" }, + "nvim-treesitter": { "branch": "master", "commit": "acc1708b962e12cc1d671cd530782727801804c3" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" }, From 6f44df0db6b081337f68ac9e6d86264b046848e5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 6 Jul 2024 14:00:39 +0300 Subject: [PATCH 2483/2667] Add unl0kr for Shire, fix freezing problem --- root/etc/kernel/cmdline | 2 +- root/etc/mkinitcpio.conf | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index 32a058f8..f0b51c8f 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -3,5 +3,5 @@ cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards r {%@@ elif profile == "Moria" @@%} cryptdevice=UUID=51115cf2-6a44-4f8c-8aa2-ff9d834953d8:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Shire" @@%} -cryptdevice=UUID=370d6c2a-86ab-4e7d-9442-d15ad173f3e3:cryptroot root=/dev/mapper/cryptroot resume_offset=1908736 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 +cryptdevice=UUID=370d6c2a-86ab-4e7d-9442-d15ad173f3e3:cryptroot root=/dev/mapper/cryptroot resume_offset=1908736 intel_idle.max_cstate=1 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ endif @@%} diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 5944a930..cce0fe98 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -2,20 +2,19 @@ COMPRESSION="zstd" {%@@ if profile == "Mirkwood" or profile == "Moria" @@%} MODULES=(amdgpu) {%@@ elif profile == "Shire" @@%} -MODULES=(i915) +MODULES=(i915 hid-multitouch i2c-hid i2c-hid-acpi hid_generic) {%@@ endif @@%} {%@@ if profile == "Mirkwood" or profile == "Moria" @@%} BINARIES=("/usr/bin/btrfs") {%@@ else @@%} -BINARIED=() +BINARIES=() {%@@ endif @@%} FILES=() {%@@ if profile == "Mirkwood" @@%} HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesystems btrfs encrypt fsck) {%@@ elif profile == 'Moria' @@%} -#HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs encrypt fsck) HOOKS=(base udev kms keyboard autodetect microcode modconf block netconf dropbear encryptssh filesystems btrfs fsck) {%@@ elif profile == 'Shire' @@%} -HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesystems encrypt fsck) +HOOKS=(base udev kms keyboard keymap autodetect microcode modconf block unl0kr encrypt plymouth filesystems fsck) {%@@ endif @@%} From b3ac1d5852c1a14012433fcfaf7febf219f0442a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 6 Jul 2024 14:00:39 +0300 Subject: [PATCH 2484/2667] Add unl0kr for Shire, fix freezing problem --- root/etc/kernel/cmdline | 2 +- root/etc/mkinitcpio.conf | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index 32a058f8..f0b51c8f 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -3,5 +3,5 @@ cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards r {%@@ elif profile == "Moria" @@%} cryptdevice=UUID=51115cf2-6a44-4f8c-8aa2-ff9d834953d8:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Shire" @@%} -cryptdevice=UUID=370d6c2a-86ab-4e7d-9442-d15ad173f3e3:cryptroot root=/dev/mapper/cryptroot resume_offset=1908736 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 +cryptdevice=UUID=370d6c2a-86ab-4e7d-9442-d15ad173f3e3:cryptroot root=/dev/mapper/cryptroot resume_offset=1908736 intel_idle.max_cstate=1 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ endif @@%} diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 5944a930..cce0fe98 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -2,20 +2,19 @@ COMPRESSION="zstd" {%@@ if profile == "Mirkwood" or profile == "Moria" @@%} MODULES=(amdgpu) {%@@ elif profile == "Shire" @@%} -MODULES=(i915) +MODULES=(i915 hid-multitouch i2c-hid i2c-hid-acpi hid_generic) {%@@ endif @@%} {%@@ if profile == "Mirkwood" or profile == "Moria" @@%} BINARIES=("/usr/bin/btrfs") {%@@ else @@%} -BINARIED=() +BINARIES=() {%@@ endif @@%} FILES=() {%@@ if profile == "Mirkwood" @@%} HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesystems btrfs encrypt fsck) {%@@ elif profile == 'Moria' @@%} -#HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs encrypt fsck) HOOKS=(base udev kms keyboard autodetect microcode modconf block netconf dropbear encryptssh filesystems btrfs fsck) {%@@ elif profile == 'Shire' @@%} -HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesystems encrypt fsck) +HOOKS=(base udev kms keyboard keymap autodetect microcode modconf block unl0kr encrypt plymouth filesystems fsck) {%@@ endif @@%} From e89325eef368132896174af22219e337954acff7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 6 Jul 2024 14:02:48 +0300 Subject: [PATCH 2485/2667] Remove unneeded kernel parameters from Mirkwood --- root/etc/kernel/cmdline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index f0b51c8f..8521db9c 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -1,5 +1,5 @@ {%@@ if profile == "Mirkwood" @@%} -cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait acpi_osi=Linux quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 +cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Moria" @@%} cryptdevice=UUID=51115cf2-6a44-4f8c-8aa2-ff9d834953d8:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Shire" @@%} From 762e504a890950ce99c1fa1935c24b00cb86708e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 6 Jul 2024 14:02:48 +0300 Subject: [PATCH 2486/2667] Remove unneeded kernel parameters from Mirkwood --- root/etc/kernel/cmdline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index f0b51c8f..8521db9c 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -1,5 +1,5 @@ {%@@ if profile == "Mirkwood" @@%} -cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait acpi_osi=Linux quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 +cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Moria" @@%} cryptdevice=UUID=51115cf2-6a44-4f8c-8aa2-ff9d834953d8:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 {%@@ elif profile == "Shire" @@%} From 6fadc26aee1c7ab3c9b5ccbd6775134567beebad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Jul 2024 14:08:11 +0300 Subject: [PATCH 2487/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 48 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index cfbe9d45..8d54d1f3 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -2,11 +2,11 @@ "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, - "bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" }, - "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, + "bufferline.nvim": { "branch": "main", "commit": "aa16dafdc642594c7ade7e88d31a6119feb189d6" }, + "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-git": { "branch": "main", "commit": "8dfbc33fb32c33e5c0be9dcc8176a4f4d395f95e" }, + "cmp-git": { "branch": "main", "commit": "22116bdffbe68bfc6ca05d52e9f217587cbfea8b" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -16,40 +16,40 @@ "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "79847a78ec0c58f5e5c0360192b03d0cee803e95" }, + "dropbar.nvim": { "branch": "master", "commit": "cab5e0226bc4f90a28cadcb0dc7341d550f1bdf0" }, "firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" }, - "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "gitsigns.nvim": { "branch": "main", "commit": "39b5b6f48bde0595ce68007ffce408c5d7ac1f79" }, + "friendly-snippets": { "branch": "main", "commit": "45a1b96e46efe5fce8af325d4bed45feb9d29d0f" }, + "gitsigns.nvim": { "branch": "main", "commit": "e9c4187c3774a46df2d086a66cf3a7e6bea4c432" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, - "lazy.nvim": { "branch": "main", "commit": "6fdd904ee45b66d933c5d2f72bcec337e13744f8" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "lazy.nvim": { "branch": "main", "commit": "58c6bc4ab298dc0d808d325754585f918a031919" }, + "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, - "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.nvim": { "branch": "main", "commit": "e0cd9ec751328655db4ae22d26876a67f9beaa3b" }, - "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, + "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, + "mini.nvim": { "branch": "main", "commit": "27de3dd4485161470ea55004fc132f2b158d1d24" }, + "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" }, + "noice.nvim": { "branch": "main", "commit": "b32b9a65cef2735b2be855c8b366e2574d7e59b4" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, - "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, + "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, - "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, - "nvim-jdtls": { "branch": "master", "commit": "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d" }, + "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, + "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" }, - "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, + "nvim-lspconfig": { "branch": "master", "commit": "216deb2d1b5fbf24398919228208649bbf5cbadf" }, + "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, - "nvim-treesitter": { "branch": "master", "commit": "acc1708b962e12cc1d671cd530782727801804c3" }, + "nvim-tree.lua": { "branch": "master", "commit": "f9ff00bc06d7cb70548a3847d7a2a05e928bc988" }, + "nvim-treesitter": { "branch": "master", "commit": "7f4ac678770175cdf0d42c015f4a5b6e18b6cb33" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, - "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" }, + "nvim-ts-autotag": { "branch": "main", "commit": "323a3e16ed603e2e17b26b1c836d1e86c279f726" }, + "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, @@ -62,7 +62,7 @@ "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe" }, + "vim-fugitive": { "branch": "master", "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } -} \ No newline at end of file + "which-key.nvim": { "branch": "main", "commit": "0427e91dbbd9c37eb20e6fbc2386f890dc0d7e2a" } +} diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 37959b42..9d801495 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -14,7 +14,7 @@ "prettier": "3.3.2", "prettierd": "0.25.3", "stylua": "v0.20.0", - "taplo": "0.8.1", + "taplo": "0.9.2", "tree-sitter-cli": "v0.22.6", "typescript-language-server": "4.3.3", "yaml-language-server": "1.15.0" From 165c1ee9cafeb6c37876cc3f14fab267508edaa8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Jul 2024 14:08:11 +0300 Subject: [PATCH 2488/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 48 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index cfbe9d45..8d54d1f3 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -2,11 +2,11 @@ "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, - "bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" }, - "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" }, + "bufferline.nvim": { "branch": "main", "commit": "aa16dafdc642594c7ade7e88d31a6119feb189d6" }, + "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-git": { "branch": "main", "commit": "8dfbc33fb32c33e5c0be9dcc8176a4f4d395f95e" }, + "cmp-git": { "branch": "main", "commit": "22116bdffbe68bfc6ca05d52e9f217587cbfea8b" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -16,40 +16,40 @@ "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "79847a78ec0c58f5e5c0360192b03d0cee803e95" }, + "dropbar.nvim": { "branch": "master", "commit": "cab5e0226bc4f90a28cadcb0dc7341d550f1bdf0" }, "firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" }, - "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "gitsigns.nvim": { "branch": "main", "commit": "39b5b6f48bde0595ce68007ffce408c5d7ac1f79" }, + "friendly-snippets": { "branch": "main", "commit": "45a1b96e46efe5fce8af325d4bed45feb9d29d0f" }, + "gitsigns.nvim": { "branch": "main", "commit": "e9c4187c3774a46df2d086a66cf3a7e6bea4c432" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, - "lazy.nvim": { "branch": "main", "commit": "6fdd904ee45b66d933c5d2f72bcec337e13744f8" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "lazy.nvim": { "branch": "main", "commit": "58c6bc4ab298dc0d808d325754585f918a031919" }, + "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, - "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.nvim": { "branch": "main", "commit": "e0cd9ec751328655db4ae22d26876a67f9beaa3b" }, - "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, + "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, + "mini.nvim": { "branch": "main", "commit": "27de3dd4485161470ea55004fc132f2b158d1d24" }, + "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" }, + "noice.nvim": { "branch": "main", "commit": "b32b9a65cef2735b2be855c8b366e2574d7e59b4" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, - "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, + "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, - "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, - "nvim-jdtls": { "branch": "master", "commit": "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d" }, + "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, + "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" }, - "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, + "nvim-lspconfig": { "branch": "master", "commit": "216deb2d1b5fbf24398919228208649bbf5cbadf" }, + "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, - "nvim-treesitter": { "branch": "master", "commit": "acc1708b962e12cc1d671cd530782727801804c3" }, + "nvim-tree.lua": { "branch": "master", "commit": "f9ff00bc06d7cb70548a3847d7a2a05e928bc988" }, + "nvim-treesitter": { "branch": "master", "commit": "7f4ac678770175cdf0d42c015f4a5b6e18b6cb33" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, - "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" }, + "nvim-ts-autotag": { "branch": "main", "commit": "323a3e16ed603e2e17b26b1c836d1e86c279f726" }, + "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, @@ -62,7 +62,7 @@ "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe" }, + "vim-fugitive": { "branch": "master", "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } -} \ No newline at end of file + "which-key.nvim": { "branch": "main", "commit": "0427e91dbbd9c37eb20e6fbc2386f890dc0d7e2a" } +} diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 37959b42..9d801495 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -14,7 +14,7 @@ "prettier": "3.3.2", "prettierd": "0.25.3", "stylua": "v0.20.0", - "taplo": "0.8.1", + "taplo": "0.9.2", "tree-sitter-cli": "v0.22.6", "typescript-language-server": "4.3.3", "yaml-language-server": "1.15.0" From 661f71d1a8cef25a3bc988c0a85d13dfaff0edbb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Jul 2024 15:49:55 +0300 Subject: [PATCH 2489/2667] Neovim: update which-key configuration to v3 --- home/.config/nvim/init.lua | 1 + home/.config/nvim/lazy-lock.json | 2 +- home/.config/nvim/lua/keybinds.lua | 14 ++++++ home/.config/nvim/lua/lsp_utils.lua | 55 +++++++++------------ home/.config/nvim/lua/plugins/cmp.lua | 4 ++ home/.config/nvim/lua/plugins/gitsigns.lua | 22 +++++++++ home/.config/nvim/lua/plugins/lazydev.lua | 15 ++++++ home/.config/nvim/lua/plugins/mini.lua | 3 ++ home/.config/nvim/lua/plugins/neodev.lua | 14 ------ home/.config/nvim/lua/plugins/nvim-tree.lua | 1 - home/.config/nvim/lua/plugins/statuscol.lua | 12 ----- home/.config/nvim/lua/plugins/which-key.lua | 39 +++++---------- 12 files changed, 95 insertions(+), 87 deletions(-) create mode 100644 home/.config/nvim/lua/keybinds.lua create mode 100644 home/.config/nvim/lua/plugins/gitsigns.lua create mode 100644 home/.config/nvim/lua/plugins/lazydev.lua delete mode 100644 home/.config/nvim/lua/plugins/neodev.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index ff8ce68f..a23743b8 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -13,6 +13,7 @@ end vim.opt.rtp:prepend(lazypath) require("settings") +require("keybinds") require("neovide") require("highlight_yank") require("lazy").setup({ diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 8d54d1f3..f6f4a22d 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -23,6 +23,7 @@ "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, "lazy.nvim": { "branch": "main", "commit": "58c6bc4ab298dc0d808d325754585f918a031919" }, + "lazydev.nvim": { "branch": "main", "commit": "96d72f5eed344964e24e9561fc81522ef327b5bf" }, "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, @@ -30,7 +31,6 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, "mini.nvim": { "branch": "main", "commit": "27de3dd4485161470ea55004fc132f2b158d1d24" }, - "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, "noice.nvim": { "branch": "main", "commit": "b32b9a65cef2735b2be855c8b366e2574d7e59b4" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua new file mode 100644 index 00000000..84e17e5c --- /dev/null +++ b/home/.config/nvim/lua/keybinds.lua @@ -0,0 +1,14 @@ +vim.keymap.set("n", "b", function() + local current_theme = vim.fn.eval("&background") + if current_theme == "dark" then + vim.cmd("set background=light") + else + vim.cmd("set background=dark") + end +end, { desc = "Toggle background between dark and light" }) + +vim.keymap.set("n", "h", "nohlsearch", { desc = "Turn off search highlight" }) +vim.keymap.set("n", "co", 'silent! execute "%bd|e#|bd#"', { desc = "Close other buffers" }) +vim.keymap.set("n", "", "bnext", { desc = "Next buffer" }) +vim.keymap.set("n", "", "bprevious", { desc = "Previous buffer" }) +vim.keymap.set("t", "", "", { desc = "Exit terminal insert mode with esc" }) diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua index b99e5011..bc17a3a0 100644 --- a/home/.config/nvim/lua/lsp_utils.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -9,39 +9,30 @@ local diagnostic = vim.diagnostic -- This makes them only available when LSP is running function m.map_keys() local builtin = require("telescope.builtin") - require("which-key").register({ - g = { - name = "Go to", - d = { builtin.lsp_definitions, "Definition" }, - D = { lsp.buf.declaration, "Declaration" }, - t = { lsp.buf.type_definition, "Type definition" }, - i = { builtin.lsp_implementations, "Implementation" }, - r = { builtin.lsp_references, "References" }, - s = { builtin.lsp_document_symbols, "Symbols" }, - }, - [""] = { - name = "Leader", - w = { - name = "Workspace", - a = { lsp.buf.add_workspace_folder, "Add folder" }, - r = { lsp.buf.remove_workspace_folder, "Remove folder" }, - l = { - function() - print(vim.inspect(lsp.buf.list_workspace_folders())) - end, - "List folders", - }, - }, - k = { lsp.buf.signature_help, "Signature help" }, - rn = { lsp.buf.rename, "Rename symbol" }, - ca = { lsp.buf.code_action, "Code action" }, - e = { diagnostic.open_float, "Open diagnostics" }, - F = { lsp.buf.format, "Format with LSP" }, - }, - K = { lsp.buf.hover, "Hover" }, - ["["] = { d = { diagnostic.goto_prev, "Previous diagnostic" } }, - ["]"] = { d = { diagnostic.goto_next, "Next diagnostic" } }, + + require("which-key").add({ + { "w", group = "Workspace" }, }) + + vim.keymap.set("n", "F", lsp.buf.format, { desc = "Format with LSP" }) + vim.keymap.set("n", "ca", lsp.buf.code_action, { desc = "Code action" }) + vim.keymap.set("n", "e", diagnostic.open_float, { desc = "Open diagnostics" }) + vim.keymap.set("n", "k", lsp.buf.signature_help, { desc = "Signature help" }) + vim.keymap.set("n", "rn", lsp.buf.rename, { desc = "Rename symbol" }) + vim.keymap.set("n", "wa", lsp.buf.add_workspace_folder, { desc = "Add folder" }) + vim.keymap.set("n", "wl", function() + print(vim.inspect(lsp.buf.list_workspace_folders())) + end, { desc = "List folders" }) + vim.keymap.set("n", "wr", lsp.buf.remove_workspace_folder, { desc = "Remove folder" }) + vim.keymap.set("n", "K", lsp.buf.hover, { desc = "Hover" }) + vim.keymap.set("n", "[d", diagnostic.goto_prev, { desc = "Previous diagnostic" }) + vim.keymap.set("n", "]d", diagnostic.goto_next, { desc = "Next diagnostic" }) + vim.keymap.set("n", "gD", lsp.buf.declaration, { desc = "Declaration" }) + vim.keymap.set("n", "gd", builtin.lsp_definitions, { desc = "Definition" }) + vim.keymap.set("n", "gi", builtin.lsp_implementations, { desc = "Implementation" }) + vim.keymap.set("n", "gr", builtin.lsp_references, { desc = "References" }) + vim.keymap.set("n", "gs", builtin.lsp_document_symbols, { desc = "Symbols" }) + vim.keymap.set("n", "gt", lsp.buf.type_definition, { desc = "Type definition" }) end -- Combine built-in LSP and cmp cabaibilities diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 8af73485..72538fa8 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -104,6 +104,10 @@ return { { name = "buffer" }, { name = "spell" }, { name = "path" }, + { + name = "lazydev", + group_index = 0, -- set group index to 0 to skip loading LuaLS completions + }, }, }) diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua new file mode 100644 index 00000000..6e620bc1 --- /dev/null +++ b/home/.config/nvim/lua/plugins/gitsigns.lua @@ -0,0 +1,22 @@ +--- @type LazyPluginSpec +return { + "lewis6991/gitsigns.nvim", + config = true, + lazy = false, + keys = { + { + "[h", + function() + require("gitsigns").prev_hunk() + end, + desc = "Previous hunk", + }, + { + "]h", + function() + require("gitsigns").next_hunk() + end, + desc = "Next hunk", + }, + }, +} diff --git a/home/.config/nvim/lua/plugins/lazydev.lua b/home/.config/nvim/lua/plugins/lazydev.lua new file mode 100644 index 00000000..4e9b1b54 --- /dev/null +++ b/home/.config/nvim/lua/plugins/lazydev.lua @@ -0,0 +1,15 @@ +-- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. +--- @type LazyPluginSpec +return { + { + "folke/lazydev.nvim", + ft = "lua", -- only load on lua files + opts = { + library = { + -- See the configuration section for more details + -- Load luvit types when the `vim.uv` word is found + { path = "luvit-meta/library", words = { "vim%.uv" } }, + }, + }, + }, +} diff --git a/home/.config/nvim/lua/plugins/mini.lua b/home/.config/nvim/lua/plugins/mini.lua index cc4f78ac..1c2c25a9 100644 --- a/home/.config/nvim/lua/plugins/mini.lua +++ b/home/.config/nvim/lua/plugins/mini.lua @@ -5,5 +5,8 @@ return { config = function() require("mini.surround").setup() require("mini.comment").setup() + + -- Recommended for which-key + require("mini.icons").setup() end, } diff --git a/home/.config/nvim/lua/plugins/neodev.lua b/home/.config/nvim/lua/plugins/neodev.lua deleted file mode 100644 index c925081e..00000000 --- a/home/.config/nvim/lua/plugins/neodev.lua +++ /dev/null @@ -1,14 +0,0 @@ --- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. -return { - "folke/neodev.nvim", - --- @type LuaDevOptions - opts = { - override = function(root_dir, library) - local dotfiles_path = tostring(vim.fn.expand("~/git/dotfiles")) - if string.find(root_dir, dotfiles_path, 1, true) then - library.enabled = true - library.plugins = { "nvim-dap-ui" } - end - end, - }, -} diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index bacd3a97..fb185398 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -2,7 +2,6 @@ --- @type LazyPluginSpec return { "kyazdani42/nvim-tree.lua", - lazy = false, dependencies = { "kyazdani42/nvim-web-devicons" }, opts = { diagnostics = { diff --git a/home/.config/nvim/lua/plugins/statuscol.lua b/home/.config/nvim/lua/plugins/statuscol.lua index 38a75a5a..c8890013 100644 --- a/home/.config/nvim/lua/plugins/statuscol.lua +++ b/home/.config/nvim/lua/plugins/statuscol.lua @@ -2,19 +2,7 @@ --- @type LazyPluginSpec return { "luukvbaal/statuscol.nvim", - dependencies = { - { - "lewis6991/gitsigns.nvim", - config = true, - }, - }, config = function() - local gitsigns = require("gitsigns") - require("which-key").register({ - ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } }, - ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, - }) - local builtin = require("statuscol.builtin") require("statuscol").setup({ relculright = true, diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 12fd3d2b..481adc15 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -1,35 +1,20 @@ -- Display possible keybinds --- Here I have also defined some generic keybinds --- Plugin specific keybinds are set up in plugin configuration file - -local function toggle_theme() - local current_theme = vim.fn.eval("&background") - if current_theme == "dark" then - vim.cmd("set background=light") - else - vim.cmd("set background=dark") - end -end - --- @type LazyPluginSpec return { "folke/which-key.nvim", config = function() - local wk = require("which-key") - wk.setup() - - wk.register({ - h = { "nohlsearch", "Turn off search highlight" }, - b = { toggle_theme, "Toggle background between dark and light" }, - co = { 'silent! execute "%bd|e#|bd#"', "Close other buffers" }, - }, { prefix = "" }) - - wk.register({ - [""] = { "bnext", "Next buffer" }, - [""] = { "bprevious", "Previous buffer" }, + require("which-key").add({ + { "", group = "Leader" }, + { "g", group = "Go to" }, }) - - -- Exit terminal insert mode with esc - vim.keymap.set("t", "", "", {}) end, + keys = { + { + "?", + function() + require("which-key").show({ global = false }) + end, + desc = "Buffer Local Keymaps (which-key)", + }, + }, } From 44345df4a9d7a03dfdf5734e0d2e5cb0e9736c53 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Jul 2024 15:49:55 +0300 Subject: [PATCH 2490/2667] Neovim: update which-key configuration to v3 --- home/.config/nvim/init.lua | 1 + home/.config/nvim/lazy-lock.json | 2 +- home/.config/nvim/lua/keybinds.lua | 14 ++++++ home/.config/nvim/lua/lsp_utils.lua | 55 +++++++++------------ home/.config/nvim/lua/plugins/cmp.lua | 4 ++ home/.config/nvim/lua/plugins/gitsigns.lua | 22 +++++++++ home/.config/nvim/lua/plugins/lazydev.lua | 15 ++++++ home/.config/nvim/lua/plugins/mini.lua | 3 ++ home/.config/nvim/lua/plugins/neodev.lua | 14 ------ home/.config/nvim/lua/plugins/nvim-tree.lua | 1 - home/.config/nvim/lua/plugins/statuscol.lua | 12 ----- home/.config/nvim/lua/plugins/which-key.lua | 39 +++++---------- 12 files changed, 95 insertions(+), 87 deletions(-) create mode 100644 home/.config/nvim/lua/keybinds.lua create mode 100644 home/.config/nvim/lua/plugins/gitsigns.lua create mode 100644 home/.config/nvim/lua/plugins/lazydev.lua delete mode 100644 home/.config/nvim/lua/plugins/neodev.lua diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index ff8ce68f..a23743b8 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -13,6 +13,7 @@ end vim.opt.rtp:prepend(lazypath) require("settings") +require("keybinds") require("neovide") require("highlight_yank") require("lazy").setup({ diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 8d54d1f3..f6f4a22d 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -23,6 +23,7 @@ "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, "lazy.nvim": { "branch": "main", "commit": "58c6bc4ab298dc0d808d325754585f918a031919" }, + "lazydev.nvim": { "branch": "main", "commit": "96d72f5eed344964e24e9561fc81522ef327b5bf" }, "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, @@ -30,7 +31,6 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, "mini.nvim": { "branch": "main", "commit": "27de3dd4485161470ea55004fc132f2b158d1d24" }, - "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, "noice.nvim": { "branch": "main", "commit": "b32b9a65cef2735b2be855c8b366e2574d7e59b4" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua new file mode 100644 index 00000000..84e17e5c --- /dev/null +++ b/home/.config/nvim/lua/keybinds.lua @@ -0,0 +1,14 @@ +vim.keymap.set("n", "b", function() + local current_theme = vim.fn.eval("&background") + if current_theme == "dark" then + vim.cmd("set background=light") + else + vim.cmd("set background=dark") + end +end, { desc = "Toggle background between dark and light" }) + +vim.keymap.set("n", "h", "nohlsearch", { desc = "Turn off search highlight" }) +vim.keymap.set("n", "co", 'silent! execute "%bd|e#|bd#"', { desc = "Close other buffers" }) +vim.keymap.set("n", "", "bnext", { desc = "Next buffer" }) +vim.keymap.set("n", "", "bprevious", { desc = "Previous buffer" }) +vim.keymap.set("t", "", "", { desc = "Exit terminal insert mode with esc" }) diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua index b99e5011..bc17a3a0 100644 --- a/home/.config/nvim/lua/lsp_utils.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -9,39 +9,30 @@ local diagnostic = vim.diagnostic -- This makes them only available when LSP is running function m.map_keys() local builtin = require("telescope.builtin") - require("which-key").register({ - g = { - name = "Go to", - d = { builtin.lsp_definitions, "Definition" }, - D = { lsp.buf.declaration, "Declaration" }, - t = { lsp.buf.type_definition, "Type definition" }, - i = { builtin.lsp_implementations, "Implementation" }, - r = { builtin.lsp_references, "References" }, - s = { builtin.lsp_document_symbols, "Symbols" }, - }, - [""] = { - name = "Leader", - w = { - name = "Workspace", - a = { lsp.buf.add_workspace_folder, "Add folder" }, - r = { lsp.buf.remove_workspace_folder, "Remove folder" }, - l = { - function() - print(vim.inspect(lsp.buf.list_workspace_folders())) - end, - "List folders", - }, - }, - k = { lsp.buf.signature_help, "Signature help" }, - rn = { lsp.buf.rename, "Rename symbol" }, - ca = { lsp.buf.code_action, "Code action" }, - e = { diagnostic.open_float, "Open diagnostics" }, - F = { lsp.buf.format, "Format with LSP" }, - }, - K = { lsp.buf.hover, "Hover" }, - ["["] = { d = { diagnostic.goto_prev, "Previous diagnostic" } }, - ["]"] = { d = { diagnostic.goto_next, "Next diagnostic" } }, + + require("which-key").add({ + { "w", group = "Workspace" }, }) + + vim.keymap.set("n", "F", lsp.buf.format, { desc = "Format with LSP" }) + vim.keymap.set("n", "ca", lsp.buf.code_action, { desc = "Code action" }) + vim.keymap.set("n", "e", diagnostic.open_float, { desc = "Open diagnostics" }) + vim.keymap.set("n", "k", lsp.buf.signature_help, { desc = "Signature help" }) + vim.keymap.set("n", "rn", lsp.buf.rename, { desc = "Rename symbol" }) + vim.keymap.set("n", "wa", lsp.buf.add_workspace_folder, { desc = "Add folder" }) + vim.keymap.set("n", "wl", function() + print(vim.inspect(lsp.buf.list_workspace_folders())) + end, { desc = "List folders" }) + vim.keymap.set("n", "wr", lsp.buf.remove_workspace_folder, { desc = "Remove folder" }) + vim.keymap.set("n", "K", lsp.buf.hover, { desc = "Hover" }) + vim.keymap.set("n", "[d", diagnostic.goto_prev, { desc = "Previous diagnostic" }) + vim.keymap.set("n", "]d", diagnostic.goto_next, { desc = "Next diagnostic" }) + vim.keymap.set("n", "gD", lsp.buf.declaration, { desc = "Declaration" }) + vim.keymap.set("n", "gd", builtin.lsp_definitions, { desc = "Definition" }) + vim.keymap.set("n", "gi", builtin.lsp_implementations, { desc = "Implementation" }) + vim.keymap.set("n", "gr", builtin.lsp_references, { desc = "References" }) + vim.keymap.set("n", "gs", builtin.lsp_document_symbols, { desc = "Symbols" }) + vim.keymap.set("n", "gt", lsp.buf.type_definition, { desc = "Type definition" }) end -- Combine built-in LSP and cmp cabaibilities diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 8af73485..72538fa8 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -104,6 +104,10 @@ return { { name = "buffer" }, { name = "spell" }, { name = "path" }, + { + name = "lazydev", + group_index = 0, -- set group index to 0 to skip loading LuaLS completions + }, }, }) diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua new file mode 100644 index 00000000..6e620bc1 --- /dev/null +++ b/home/.config/nvim/lua/plugins/gitsigns.lua @@ -0,0 +1,22 @@ +--- @type LazyPluginSpec +return { + "lewis6991/gitsigns.nvim", + config = true, + lazy = false, + keys = { + { + "[h", + function() + require("gitsigns").prev_hunk() + end, + desc = "Previous hunk", + }, + { + "]h", + function() + require("gitsigns").next_hunk() + end, + desc = "Next hunk", + }, + }, +} diff --git a/home/.config/nvim/lua/plugins/lazydev.lua b/home/.config/nvim/lua/plugins/lazydev.lua new file mode 100644 index 00000000..4e9b1b54 --- /dev/null +++ b/home/.config/nvim/lua/plugins/lazydev.lua @@ -0,0 +1,15 @@ +-- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. +--- @type LazyPluginSpec +return { + { + "folke/lazydev.nvim", + ft = "lua", -- only load on lua files + opts = { + library = { + -- See the configuration section for more details + -- Load luvit types when the `vim.uv` word is found + { path = "luvit-meta/library", words = { "vim%.uv" } }, + }, + }, + }, +} diff --git a/home/.config/nvim/lua/plugins/mini.lua b/home/.config/nvim/lua/plugins/mini.lua index cc4f78ac..1c2c25a9 100644 --- a/home/.config/nvim/lua/plugins/mini.lua +++ b/home/.config/nvim/lua/plugins/mini.lua @@ -5,5 +5,8 @@ return { config = function() require("mini.surround").setup() require("mini.comment").setup() + + -- Recommended for which-key + require("mini.icons").setup() end, } diff --git a/home/.config/nvim/lua/plugins/neodev.lua b/home/.config/nvim/lua/plugins/neodev.lua deleted file mode 100644 index c925081e..00000000 --- a/home/.config/nvim/lua/plugins/neodev.lua +++ /dev/null @@ -1,14 +0,0 @@ --- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. -return { - "folke/neodev.nvim", - --- @type LuaDevOptions - opts = { - override = function(root_dir, library) - local dotfiles_path = tostring(vim.fn.expand("~/git/dotfiles")) - if string.find(root_dir, dotfiles_path, 1, true) then - library.enabled = true - library.plugins = { "nvim-dap-ui" } - end - end, - }, -} diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index bacd3a97..fb185398 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/home/.config/nvim/lua/plugins/nvim-tree.lua @@ -2,7 +2,6 @@ --- @type LazyPluginSpec return { "kyazdani42/nvim-tree.lua", - lazy = false, dependencies = { "kyazdani42/nvim-web-devicons" }, opts = { diagnostics = { diff --git a/home/.config/nvim/lua/plugins/statuscol.lua b/home/.config/nvim/lua/plugins/statuscol.lua index 38a75a5a..c8890013 100644 --- a/home/.config/nvim/lua/plugins/statuscol.lua +++ b/home/.config/nvim/lua/plugins/statuscol.lua @@ -2,19 +2,7 @@ --- @type LazyPluginSpec return { "luukvbaal/statuscol.nvim", - dependencies = { - { - "lewis6991/gitsigns.nvim", - config = true, - }, - }, config = function() - local gitsigns = require("gitsigns") - require("which-key").register({ - ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } }, - ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } }, - }) - local builtin = require("statuscol.builtin") require("statuscol").setup({ relculright = true, diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index 12fd3d2b..481adc15 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -1,35 +1,20 @@ -- Display possible keybinds --- Here I have also defined some generic keybinds --- Plugin specific keybinds are set up in plugin configuration file - -local function toggle_theme() - local current_theme = vim.fn.eval("&background") - if current_theme == "dark" then - vim.cmd("set background=light") - else - vim.cmd("set background=dark") - end -end - --- @type LazyPluginSpec return { "folke/which-key.nvim", config = function() - local wk = require("which-key") - wk.setup() - - wk.register({ - h = { "nohlsearch", "Turn off search highlight" }, - b = { toggle_theme, "Toggle background between dark and light" }, - co = { 'silent! execute "%bd|e#|bd#"', "Close other buffers" }, - }, { prefix = "" }) - - wk.register({ - [""] = { "bnext", "Next buffer" }, - [""] = { "bprevious", "Previous buffer" }, + require("which-key").add({ + { "", group = "Leader" }, + { "g", group = "Go to" }, }) - - -- Exit terminal insert mode with esc - vim.keymap.set("t", "", "", {}) end, + keys = { + { + "?", + function() + require("which-key").show({ global = false }) + end, + desc = "Buffer Local Keymaps (which-key)", + }, + }, } From 3761c502f01732154f9808ce2d915c611ea94fc8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 16 Jul 2024 09:33:39 +0300 Subject: [PATCH 2491/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index f6f4a22d..e45514ce 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -18,37 +18,37 @@ "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dropbar.nvim": { "branch": "master", "commit": "cab5e0226bc4f90a28cadcb0dc7341d550f1bdf0" }, "firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" }, - "friendly-snippets": { "branch": "main", "commit": "45a1b96e46efe5fce8af325d4bed45feb9d29d0f" }, - "gitsigns.nvim": { "branch": "main", "commit": "e9c4187c3774a46df2d086a66cf3a7e6bea4c432" }, + "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, + "gitsigns.nvim": { "branch": "main", "commit": "2a7b39f4d282935f8b44cbe82879af69c7472f5c" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, - "lazy.nvim": { "branch": "main", "commit": "58c6bc4ab298dc0d808d325754585f918a031919" }, - "lazydev.nvim": { "branch": "main", "commit": "96d72f5eed344964e24e9561fc81522ef327b5bf" }, - "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" }, + "lazy.nvim": { "branch": "main", "commit": "9d445ebbd89401544a538c6af080e4d2785abb49" }, + "lazydev.nvim": { "branch": "main", "commit": "02f1055a777264d4b65896051ec28d0f322f7932" }, + "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, - "mini.nvim": { "branch": "main", "commit": "27de3dd4485161470ea55004fc132f2b158d1d24" }, + "mini.nvim": { "branch": "main", "commit": "f20d8cd3a116ef65f022797de064a044b217ff53" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "b32b9a65cef2735b2be855c8b366e2574d7e59b4" }, + "noice.nvim": { "branch": "main", "commit": "3b5ea551448bd769976428458c11ae3f5849b7ba" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, - "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, + "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "216deb2d1b5fbf24398919228208649bbf5cbadf" }, + "nvim-lspconfig": { "branch": "master", "commit": "01e08d4bf1c35e5126b2ad5209725e4c552289ab" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "f9ff00bc06d7cb70548a3847d7a2a05e928bc988" }, - "nvim-treesitter": { "branch": "master", "commit": "7f4ac678770175cdf0d42c015f4a5b6e18b6cb33" }, + "nvim-treesitter": { "branch": "master", "commit": "a6b2f4ecc8a47011868632142a9b687d7e0f9aaf" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "323a3e16ed603e2e17b26b1c836d1e86c279f726" }, + "nvim-ts-autotag": { "branch": "main", "commit": "26c365cc7d58d0da17b13e747855d331eb26fcf0" }, "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, @@ -64,5 +64,5 @@ "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "0427e91dbbd9c37eb20e6fbc2386f890dc0d7e2a" } + "which-key.nvim": { "branch": "main", "commit": "b55a568ae69724e334aec3ef291ea4e1768ba47a" } } From f71985d621b1486558e57bfbaa77da41b5d0aef5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 16 Jul 2024 09:33:39 +0300 Subject: [PATCH 2492/2667] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index f6f4a22d..e45514ce 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -18,37 +18,37 @@ "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dropbar.nvim": { "branch": "master", "commit": "cab5e0226bc4f90a28cadcb0dc7341d550f1bdf0" }, "firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" }, - "friendly-snippets": { "branch": "main", "commit": "45a1b96e46efe5fce8af325d4bed45feb9d29d0f" }, - "gitsigns.nvim": { "branch": "main", "commit": "e9c4187c3774a46df2d086a66cf3a7e6bea4c432" }, + "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, + "gitsigns.nvim": { "branch": "main", "commit": "2a7b39f4d282935f8b44cbe82879af69c7472f5c" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, - "lazy.nvim": { "branch": "main", "commit": "58c6bc4ab298dc0d808d325754585f918a031919" }, - "lazydev.nvim": { "branch": "main", "commit": "96d72f5eed344964e24e9561fc81522ef327b5bf" }, - "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" }, + "lazy.nvim": { "branch": "main", "commit": "9d445ebbd89401544a538c6af080e4d2785abb49" }, + "lazydev.nvim": { "branch": "main", "commit": "02f1055a777264d4b65896051ec28d0f322f7932" }, + "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, - "mini.nvim": { "branch": "main", "commit": "27de3dd4485161470ea55004fc132f2b158d1d24" }, + "mini.nvim": { "branch": "main", "commit": "f20d8cd3a116ef65f022797de064a044b217ff53" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "b32b9a65cef2735b2be855c8b366e2574d7e59b4" }, + "noice.nvim": { "branch": "main", "commit": "3b5ea551448bd769976428458c11ae3f5849b7ba" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, - "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, + "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "216deb2d1b5fbf24398919228208649bbf5cbadf" }, + "nvim-lspconfig": { "branch": "master", "commit": "01e08d4bf1c35e5126b2ad5209725e4c552289ab" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "f9ff00bc06d7cb70548a3847d7a2a05e928bc988" }, - "nvim-treesitter": { "branch": "master", "commit": "7f4ac678770175cdf0d42c015f4a5b6e18b6cb33" }, + "nvim-treesitter": { "branch": "master", "commit": "a6b2f4ecc8a47011868632142a9b687d7e0f9aaf" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "323a3e16ed603e2e17b26b1c836d1e86c279f726" }, + "nvim-ts-autotag": { "branch": "main", "commit": "26c365cc7d58d0da17b13e747855d331eb26fcf0" }, "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, @@ -64,5 +64,5 @@ "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "0427e91dbbd9c37eb20e6fbc2386f890dc0d7e2a" } + "which-key.nvim": { "branch": "main", "commit": "b55a568ae69724e334aec3ef291ea4e1768ba47a" } } From e0ecf9a1d07989d4a9086ea506eb9f91be319c32 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Jul 2024 09:13:05 +0300 Subject: [PATCH 2493/2667] Update runner --- docker/forgejo/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index ffbaf049..a0dffd6a 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -12,7 +12,7 @@ ports = ["2882:22"] volumes = ["data:/data", "/etc/localtime:/etc/localtime:ro"] [services.runner] -image = "code.forgejo.org/forgejo/runner:3.4.1" +image = "code.forgejo.org/forgejo/runner:3.5.0" container_name = "forgejo-runner" user = "root:root" volumes = [ From e34a84810aa4dd1f51b3183f30ab26f720ca5f52 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Jul 2024 09:13:05 +0300 Subject: [PATCH 2494/2667] Update runner --- docker/forgejo/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml index ffbaf049..a0dffd6a 100644 --- a/docker/forgejo/docker-compose.toml +++ b/docker/forgejo/docker-compose.toml @@ -12,7 +12,7 @@ ports = ["2882:22"] volumes = ["data:/data", "/etc/localtime:/etc/localtime:ro"] [services.runner] -image = "code.forgejo.org/forgejo/runner:3.4.1" +image = "code.forgejo.org/forgejo/runner:3.5.0" container_name = "forgejo-runner" user = "root:root" volumes = [ From 4cc10c7c860e8e92d236666c8628565d0faf7d7a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Jul 2024 09:13:17 +0300 Subject: [PATCH 2495/2667] Fix jellyfin card --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 80c0fd9b..661d0d2d 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -24,7 +24,7 @@ volumes = [ ] devices = [ "/dev/dri/renderD128:/dev/dri/renderD128", - "/dev/dri/card0:/dev/dri/card0", + "/dev/dri/card1:/dev/dri/card0", ] [networks.proxy] From ac19a47faf40ba4858819e92e3b0da052b196990 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Jul 2024 09:13:17 +0300 Subject: [PATCH 2496/2667] Fix jellyfin card --- docker/jellyfin/docker-compose.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml index 80c0fd9b..661d0d2d 100644 --- a/docker/jellyfin/docker-compose.toml +++ b/docker/jellyfin/docker-compose.toml @@ -24,7 +24,7 @@ volumes = [ ] devices = [ "/dev/dri/renderD128:/dev/dri/renderD128", - "/dev/dri/card0:/dev/dri/card0", + "/dev/dri/card1:/dev/dri/card0", ] [networks.proxy] From e924f75bd9ebf1f532a1b67ce68b823f6d75ea32 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Jul 2024 11:34:00 +0300 Subject: [PATCH 2497/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index e45514ce..121cb334 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -2,11 +2,11 @@ "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, - "bufferline.nvim": { "branch": "main", "commit": "aa16dafdc642594c7ade7e88d31a6119feb189d6" }, + "bufferline.nvim": { "branch": "main", "commit": "2e3c8cc5a57ddd32f1edd2ffd2ccb10c09421f6c" }, "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-git": { "branch": "main", "commit": "22116bdffbe68bfc6ca05d52e9f217587cbfea8b" }, + "cmp-git": { "branch": "main", "commit": "3d83031c4b63f9b10703e32e070cda0700a81992" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -19,36 +19,36 @@ "dropbar.nvim": { "branch": "master", "commit": "cab5e0226bc4f90a28cadcb0dc7341d550f1bdf0" }, "firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "2a7b39f4d282935f8b44cbe82879af69c7472f5c" }, + "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, - "lazy.nvim": { "branch": "main", "commit": "9d445ebbd89401544a538c6af080e4d2785abb49" }, + "lazy.nvim": { "branch": "main", "commit": "6ca90a21202808796418e46d3cebfbb5a44e54a2" }, "lazydev.nvim": { "branch": "main", "commit": "02f1055a777264d4b65896051ec28d0f322f7932" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, - "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, - "mini.nvim": { "branch": "main", "commit": "f20d8cd3a116ef65f022797de064a044b217ff53" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.nvim": { "branch": "main", "commit": "db52ea9a1fd5183bb15f557db3fd6e504099bf06" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "3b5ea551448bd769976428458c11ae3f5849b7ba" }, + "noice.nvim": { "branch": "main", "commit": "daa5f6908e97c89ca3e9861e03bdf356ea48cc72" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, + "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "01e08d4bf1c35e5126b2ad5209725e4c552289ab" }, + "nvim-lspconfig": { "branch": "master", "commit": "df9c116cbcf0aa7e58f2b36b0296fa687e87f36f" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "f9ff00bc06d7cb70548a3847d7a2a05e928bc988" }, - "nvim-treesitter": { "branch": "master", "commit": "a6b2f4ecc8a47011868632142a9b687d7e0f9aaf" }, + "nvim-treesitter": { "branch": "master", "commit": "874b99065b4b00b84b0ca5fa63490c93728a45ab" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "26c365cc7d58d0da17b13e747855d331eb26fcf0" }, + "nvim-ts-autotag": { "branch": "main", "commit": "1624866a1379fc1861797f0ed05899a9c1d2ff61" }, "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, @@ -64,5 +64,5 @@ "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "b55a568ae69724e334aec3ef291ea4e1768ba47a" } + "which-key.nvim": { "branch": "main", "commit": "ed5f7622771d0b5c0ac3a5e286ec6cd17b6be131" } } From 812423a3cd58e1489b859d6f163a47c316c4a832 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Jul 2024 11:34:00 +0300 Subject: [PATCH 2498/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index e45514ce..121cb334 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -2,11 +2,11 @@ "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, - "bufferline.nvim": { "branch": "main", "commit": "aa16dafdc642594c7ade7e88d31a6119feb189d6" }, + "bufferline.nvim": { "branch": "main", "commit": "2e3c8cc5a57ddd32f1edd2ffd2ccb10c09421f6c" }, "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-git": { "branch": "main", "commit": "22116bdffbe68bfc6ca05d52e9f217587cbfea8b" }, + "cmp-git": { "branch": "main", "commit": "3d83031c4b63f9b10703e32e070cda0700a81992" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -19,36 +19,36 @@ "dropbar.nvim": { "branch": "master", "commit": "cab5e0226bc4f90a28cadcb0dc7341d550f1bdf0" }, "firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "2a7b39f4d282935f8b44cbe82879af69c7472f5c" }, + "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, - "lazy.nvim": { "branch": "main", "commit": "9d445ebbd89401544a538c6af080e4d2785abb49" }, + "lazy.nvim": { "branch": "main", "commit": "6ca90a21202808796418e46d3cebfbb5a44e54a2" }, "lazydev.nvim": { "branch": "main", "commit": "02f1055a777264d4b65896051ec28d0f322f7932" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, - "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, - "mini.nvim": { "branch": "main", "commit": "f20d8cd3a116ef65f022797de064a044b217ff53" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.nvim": { "branch": "main", "commit": "db52ea9a1fd5183bb15f557db3fd6e504099bf06" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "3b5ea551448bd769976428458c11ae3f5849b7ba" }, + "noice.nvim": { "branch": "main", "commit": "daa5f6908e97c89ca3e9861e03bdf356ea48cc72" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, + "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "01e08d4bf1c35e5126b2ad5209725e4c552289ab" }, + "nvim-lspconfig": { "branch": "master", "commit": "df9c116cbcf0aa7e58f2b36b0296fa687e87f36f" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "f9ff00bc06d7cb70548a3847d7a2a05e928bc988" }, - "nvim-treesitter": { "branch": "master", "commit": "a6b2f4ecc8a47011868632142a9b687d7e0f9aaf" }, + "nvim-treesitter": { "branch": "master", "commit": "874b99065b4b00b84b0ca5fa63490c93728a45ab" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "26c365cc7d58d0da17b13e747855d331eb26fcf0" }, + "nvim-ts-autotag": { "branch": "main", "commit": "1624866a1379fc1861797f0ed05899a9c1d2ff61" }, "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, @@ -64,5 +64,5 @@ "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "b55a568ae69724e334aec3ef291ea4e1768ba47a" } + "which-key.nvim": { "branch": "main", "commit": "ed5f7622771d0b5c0ac3a5e286ec6cd17b6be131" } } From a57a9f10e9e8787fd942a0ebdbfefb0092ccbe65 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Jul 2024 11:34:11 +0300 Subject: [PATCH 2499/2667] Neovim: add keybinds for gitsigns --- home/.config/nvim/lua/plugins/gitsigns.lua | 50 ++++++++++++++-------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua index 6e620bc1..72e4e00f 100644 --- a/home/.config/nvim/lua/plugins/gitsigns.lua +++ b/home/.config/nvim/lua/plugins/gitsigns.lua @@ -1,22 +1,36 @@ +local k = function(lhs, rhs, opts) + vim.keymap.set("", lhs, rhs, opts) +end + --- @type LazyPluginSpec return { "lewis6991/gitsigns.nvim", - config = true, - lazy = false, - keys = { - { - "[h", - function() - require("gitsigns").prev_hunk() - end, - desc = "Previous hunk", - }, - { - "]h", - function() - require("gitsigns").next_hunk() - end, - desc = "Next hunk", - }, - }, + config = function() + local gs = require("gitsigns") + gs.setup() + + -- Add groups for which-key + require("which-key").add({ + { "g", group = "Git" }, + { "gr", group = "Reset" }, + { "ga", group = "Add" }, + }) + + -- Keybinds + local opts + + -- Hunk navigation + k("[h", gs.prev_hunk, { desc = "Previous hunk" }) + k("[h", gs.next_hunk, { desc = "Next hunk" }) + + -- Hunk actions + opts = { desc = "Hunk" } + k("grh", gs.reset_hunk, opts) + k("gah", gs.stage_hunk, opts) + + -- Buffer actions + opts = { desc = "Buffer" } + k("gab", gs.stage_buffer, opts) + k("grb", gs.reset_buffer, opts) + end, } From c530a0d099d205398bb3cac2e28307ea50f15d4b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Jul 2024 11:34:11 +0300 Subject: [PATCH 2500/2667] Neovim: add keybinds for gitsigns --- home/.config/nvim/lua/plugins/gitsigns.lua | 50 ++++++++++++++-------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua index 6e620bc1..72e4e00f 100644 --- a/home/.config/nvim/lua/plugins/gitsigns.lua +++ b/home/.config/nvim/lua/plugins/gitsigns.lua @@ -1,22 +1,36 @@ +local k = function(lhs, rhs, opts) + vim.keymap.set("", lhs, rhs, opts) +end + --- @type LazyPluginSpec return { "lewis6991/gitsigns.nvim", - config = true, - lazy = false, - keys = { - { - "[h", - function() - require("gitsigns").prev_hunk() - end, - desc = "Previous hunk", - }, - { - "]h", - function() - require("gitsigns").next_hunk() - end, - desc = "Next hunk", - }, - }, + config = function() + local gs = require("gitsigns") + gs.setup() + + -- Add groups for which-key + require("which-key").add({ + { "g", group = "Git" }, + { "gr", group = "Reset" }, + { "ga", group = "Add" }, + }) + + -- Keybinds + local opts + + -- Hunk navigation + k("[h", gs.prev_hunk, { desc = "Previous hunk" }) + k("[h", gs.next_hunk, { desc = "Next hunk" }) + + -- Hunk actions + opts = { desc = "Hunk" } + k("grh", gs.reset_hunk, opts) + k("gah", gs.stage_hunk, opts) + + -- Buffer actions + opts = { desc = "Buffer" } + k("gab", gs.stage_buffer, opts) + k("grb", gs.reset_buffer, opts) + end, } From 31c70a3235da24ffa158bf469542b2d05f5e410f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Jul 2024 14:40:45 +0300 Subject: [PATCH 2501/2667] Neovim: fix gitsigns keybind --- home/.config/nvim/lua/plugins/gitsigns.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua index 72e4e00f..2266b0b1 100644 --- a/home/.config/nvim/lua/plugins/gitsigns.lua +++ b/home/.config/nvim/lua/plugins/gitsigns.lua @@ -21,7 +21,7 @@ return { -- Hunk navigation k("[h", gs.prev_hunk, { desc = "Previous hunk" }) - k("[h", gs.next_hunk, { desc = "Next hunk" }) + k("]h", gs.next_hunk, { desc = "Next hunk" }) -- Hunk actions opts = { desc = "Hunk" } From fa99efa07782222d32f6f1ed3d9d2a2f3c8327d1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Jul 2024 14:40:45 +0300 Subject: [PATCH 2502/2667] Neovim: fix gitsigns keybind --- home/.config/nvim/lua/plugins/gitsigns.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua index 72e4e00f..2266b0b1 100644 --- a/home/.config/nvim/lua/plugins/gitsigns.lua +++ b/home/.config/nvim/lua/plugins/gitsigns.lua @@ -21,7 +21,7 @@ return { -- Hunk navigation k("[h", gs.prev_hunk, { desc = "Previous hunk" }) - k("[h", gs.next_hunk, { desc = "Next hunk" }) + k("]h", gs.next_hunk, { desc = "Next hunk" }) -- Hunk actions opts = { desc = "Hunk" } From 6c9755e9191fd0b9f526858b72f0b5f85ba00a30 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Jul 2024 14:40:59 +0300 Subject: [PATCH 2503/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 121cb334..767cd7f4 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -2,7 +2,7 @@ "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, - "bufferline.nvim": { "branch": "main", "commit": "2e3c8cc5a57ddd32f1edd2ffd2ccb10c09421f6c" }, + "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -16,23 +16,23 @@ "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "cab5e0226bc4f90a28cadcb0dc7341d550f1bdf0" }, + "dropbar.nvim": { "branch": "master", "commit": "6567d50fd792056e2001663f5cd4d8bfb6840604" }, "firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, - "lazy.nvim": { "branch": "main", "commit": "6ca90a21202808796418e46d3cebfbb5a44e54a2" }, - "lazydev.nvim": { "branch": "main", "commit": "02f1055a777264d4b65896051ec28d0f322f7932" }, + "lazy.nvim": { "branch": "main", "commit": "839f9e78e78dc935b1188fb16583365991739c51" }, + "lazydev.nvim": { "branch": "main", "commit": "399299ca570aa82c13ee4fb1bd1304ce6baf7f05" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "db52ea9a1fd5183bb15f557db3fd6e504099bf06" }, + "mini.nvim": { "branch": "main", "commit": "23669ab7abc2cd10f9a5166de07400bb34eaecda" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "daa5f6908e97c89ca3e9861e03bdf356ea48cc72" }, + "noice.nvim": { "branch": "main", "commit": "dd7363eae290ecdb9d6a2db6e0f59527df79edd6" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, @@ -42,15 +42,15 @@ "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "df9c116cbcf0aa7e58f2b36b0296fa687e87f36f" }, + "nvim-lspconfig": { "branch": "master", "commit": "fa6c2a64100c6f692bbec29bbbc8ec2663c9e869" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "f9ff00bc06d7cb70548a3847d7a2a05e928bc988" }, - "nvim-treesitter": { "branch": "master", "commit": "874b99065b4b00b84b0ca5fa63490c93728a45ab" }, + "nvim-tree.lua": { "branch": "master", "commit": "4e396b26244444c911b73e9f2f40ae0115351fd1" }, + "nvim-treesitter": { "branch": "master", "commit": "5f5077f8f7fa545065a0846406011cd3cc49093b" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "1624866a1379fc1861797f0ed05899a9c1d2ff61" }, "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" }, - "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, + "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, @@ -59,10 +59,10 @@ "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, + "telescope.nvim": { "branch": "master", "commit": "79552ef8488cb492e0f9d2bf3b4e808f57515e35" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc" }, + "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "ed5f7622771d0b5c0ac3a5e286ec6cd17b6be131" } + "which-key.nvim": { "branch": "main", "commit": "650f298f516018ad7ebce6d957e015d5db434f3c" } } From e4c0bed1a888c61874595ae1159c23dfac7dfd5c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Jul 2024 14:40:59 +0300 Subject: [PATCH 2504/2667] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 121cb334..767cd7f4 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -2,7 +2,7 @@ "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, - "bufferline.nvim": { "branch": "main", "commit": "2e3c8cc5a57ddd32f1edd2ffd2ccb10c09421f6c" }, + "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -16,23 +16,23 @@ "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "cab5e0226bc4f90a28cadcb0dc7341d550f1bdf0" }, + "dropbar.nvim": { "branch": "master", "commit": "6567d50fd792056e2001663f5cd4d8bfb6840604" }, "firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, - "lazy.nvim": { "branch": "main", "commit": "6ca90a21202808796418e46d3cebfbb5a44e54a2" }, - "lazydev.nvim": { "branch": "main", "commit": "02f1055a777264d4b65896051ec28d0f322f7932" }, + "lazy.nvim": { "branch": "main", "commit": "839f9e78e78dc935b1188fb16583365991739c51" }, + "lazydev.nvim": { "branch": "main", "commit": "399299ca570aa82c13ee4fb1bd1304ce6baf7f05" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "db52ea9a1fd5183bb15f557db3fd6e504099bf06" }, + "mini.nvim": { "branch": "main", "commit": "23669ab7abc2cd10f9a5166de07400bb34eaecda" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "daa5f6908e97c89ca3e9861e03bdf356ea48cc72" }, + "noice.nvim": { "branch": "main", "commit": "dd7363eae290ecdb9d6a2db6e0f59527df79edd6" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, @@ -42,15 +42,15 @@ "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "df9c116cbcf0aa7e58f2b36b0296fa687e87f36f" }, + "nvim-lspconfig": { "branch": "master", "commit": "fa6c2a64100c6f692bbec29bbbc8ec2663c9e869" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "f9ff00bc06d7cb70548a3847d7a2a05e928bc988" }, - "nvim-treesitter": { "branch": "master", "commit": "874b99065b4b00b84b0ca5fa63490c93728a45ab" }, + "nvim-tree.lua": { "branch": "master", "commit": "4e396b26244444c911b73e9f2f40ae0115351fd1" }, + "nvim-treesitter": { "branch": "master", "commit": "5f5077f8f7fa545065a0846406011cd3cc49093b" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "1624866a1379fc1861797f0ed05899a9c1d2ff61" }, "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" }, - "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, + "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, @@ -59,10 +59,10 @@ "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, + "telescope.nvim": { "branch": "master", "commit": "79552ef8488cb492e0f9d2bf3b4e808f57515e35" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc" }, + "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "ed5f7622771d0b5c0ac3a5e286ec6cd17b6be131" } + "which-key.nvim": { "branch": "main", "commit": "650f298f516018ad7ebce6d957e015d5db434f3c" } } From 12a2e960af218949d83b40fd078d53f65611c597 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Jul 2024 14:41:08 +0300 Subject: [PATCH 2505/2667] Neovim: add macro notification to statusline --- home/.config/nvim/lua/plugins/lualine.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 377201d6..d3c0a565 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1,3 +1,4 @@ +local noice_statusline = require("noice").api.statusline.mode -- Statusline --- @type LazyPluginSpec return { @@ -5,6 +6,13 @@ return { dependencies = { "kyazdani42/nvim-web-devicons" }, opts = { sections = { + lualine_x = { + { + noice_statusline.get, + cond = noice_statusline.has, + color = { fg = "#ff9e64" }, + }, + }, lualine_z = { { "selectioncount", From 7f1e3dcd3449cf8baa320738da9ceb3ed6a7c617 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Jul 2024 14:41:08 +0300 Subject: [PATCH 2506/2667] Neovim: add macro notification to statusline --- home/.config/nvim/lua/plugins/lualine.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index 377201d6..d3c0a565 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1,3 +1,4 @@ +local noice_statusline = require("noice").api.statusline.mode -- Statusline --- @type LazyPluginSpec return { @@ -5,6 +6,13 @@ return { dependencies = { "kyazdani42/nvim-web-devicons" }, opts = { sections = { + lualine_x = { + { + noice_statusline.get, + cond = noice_statusline.has, + color = { fg = "#ff9e64" }, + }, + }, lualine_z = { { "selectioncount", From bdeffb8b7f206eb3452437e52167fdd9897661b7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jul 2024 15:55:36 +0300 Subject: [PATCH 2507/2667] Neovim: Fix showing filetype etc in lualine_x, don't show mode there --- home/.config/nvim/lua/plugins/lualine.lua | 9 ++++++--- home/.config/nvim/lua/settings.lua | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index d3c0a565..1aaba3e7 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1,4 +1,4 @@ -local noice_statusline = require("noice").api.statusline.mode +local noice_mode = require("noice").api.statusline.mode -- Statusline --- @type LazyPluginSpec return { @@ -7,9 +7,12 @@ return { opts = { sections = { lualine_x = { + "encoding", + "fileformat", + "filetype", { - noice_statusline.get, - cond = noice_statusline.has, + noice_mode.get, + cond = noice_mode.has, color = { fg = "#ff9e64" }, }, }, diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index c4953c1e..a02c5de0 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -49,3 +49,5 @@ o.softtabstop = -1 o.expandtab = true o.shiftwidth = 4 o.smartindent = true + +o.showmode = false From d9b1dbf51253bbee2428dd33eaa8c0448dd378b6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jul 2024 15:55:36 +0300 Subject: [PATCH 2508/2667] Neovim: Fix showing filetype etc in lualine_x, don't show mode there --- home/.config/nvim/lua/plugins/lualine.lua | 9 ++++++--- home/.config/nvim/lua/settings.lua | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua index d3c0a565..1aaba3e7 100644 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ b/home/.config/nvim/lua/plugins/lualine.lua @@ -1,4 +1,4 @@ -local noice_statusline = require("noice").api.statusline.mode +local noice_mode = require("noice").api.statusline.mode -- Statusline --- @type LazyPluginSpec return { @@ -7,9 +7,12 @@ return { opts = { sections = { lualine_x = { + "encoding", + "fileformat", + "filetype", { - noice_statusline.get, - cond = noice_statusline.has, + noice_mode.get, + cond = noice_mode.has, color = { fg = "#ff9e64" }, }, }, diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index c4953c1e..a02c5de0 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -49,3 +49,5 @@ o.softtabstop = -1 o.expandtab = true o.shiftwidth = 4 o.smartindent = true + +o.showmode = false From f542303cbd9b233d499629db324faec319a0dd0f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 10:17:33 +0300 Subject: [PATCH 2509/2667] Neovim: include extensions in telescope Also refactored the keybinds to use functions instead of strings --- home/.config/nvim/lua/plugins/telescope.lua | 65 ++++++++++++--------- 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 89371aec..a5587e74 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -59,35 +59,41 @@ return { }, }, }, - keys = { - { - desc = "Open Telescope", - "t", - "Telescope", - }, - { - desc = "Change directories", - "cd", - "Telescope cder", - }, - { - desc = "Find files", - "", - "Telescope find_files", - }, - { - desc = "Grep files", - "", - "Telescope live_grep", - }, - { - desc = "Change to a project", - "p", - function() - require("telescope").extensions.project.project() - end, - }, - }, + keys = function() + local telescope = require("telescope") + local builtin = require("telescope.builtin") + local extensions = telescope.extensions + + return { + { + desc = "Open Telescope", + "t", + function() + builtin.builtin({ include_extensions = true }) + end, + }, + { + desc = "Change directories", + "cd", + extensions.cder.cder, + }, + { + desc = "Find files", + "", + builtin.find_files, + }, + { + desc = "Grep files", + "", + builtin.live_grep, + }, + { + desc = "Change to a project", + "p", + extensions.project.project, + }, + } + end, config = function(_, opts) local telescope = require("telescope") telescope.setup(opts) @@ -97,5 +103,6 @@ return { telescope.load_extension("ui-select") telescope.load_extension("cder") telescope.load_extension("project") + telescope.load_extension("notify") end, } From 6006c9b81f87a8f04e8984b5af7016c381d30f23 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 10:17:33 +0300 Subject: [PATCH 2510/2667] Neovim: include extensions in telescope Also refactored the keybinds to use functions instead of strings --- home/.config/nvim/lua/plugins/telescope.lua | 65 ++++++++++++--------- 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 89371aec..a5587e74 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -59,35 +59,41 @@ return { }, }, }, - keys = { - { - desc = "Open Telescope", - "t", - "Telescope", - }, - { - desc = "Change directories", - "cd", - "Telescope cder", - }, - { - desc = "Find files", - "", - "Telescope find_files", - }, - { - desc = "Grep files", - "", - "Telescope live_grep", - }, - { - desc = "Change to a project", - "p", - function() - require("telescope").extensions.project.project() - end, - }, - }, + keys = function() + local telescope = require("telescope") + local builtin = require("telescope.builtin") + local extensions = telescope.extensions + + return { + { + desc = "Open Telescope", + "t", + function() + builtin.builtin({ include_extensions = true }) + end, + }, + { + desc = "Change directories", + "cd", + extensions.cder.cder, + }, + { + desc = "Find files", + "", + builtin.find_files, + }, + { + desc = "Grep files", + "", + builtin.live_grep, + }, + { + desc = "Change to a project", + "p", + extensions.project.project, + }, + } + end, config = function(_, opts) local telescope = require("telescope") telescope.setup(opts) @@ -97,5 +103,6 @@ return { telescope.load_extension("ui-select") telescope.load_extension("cder") telescope.load_extension("project") + telescope.load_extension("notify") end, } From eaf567e594a8569fb9f3e34c5a3799542df2c11b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 10:25:06 +0300 Subject: [PATCH 2511/2667] Neovim: use flex layout for telescope --- home/.config/nvim/lua/plugins/telescope.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index a5587e74..c038c744 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -24,10 +24,10 @@ return { opts = { -- Set layout to vertical defaults = { - layout_strategy = "vertical", - layout_defaults = { - vertical = { - preview_height = 0.5, + layout_strategy = "flex", + layout_config = { + flex = { + flip_columns = 200, }, }, }, From caf00593bf2357262a99d737e0658921832015ad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 10:25:06 +0300 Subject: [PATCH 2512/2667] Neovim: use flex layout for telescope --- home/.config/nvim/lua/plugins/telescope.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index a5587e74..c038c744 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -24,10 +24,10 @@ return { opts = { -- Set layout to vertical defaults = { - layout_strategy = "vertical", - layout_defaults = { - vertical = { - preview_height = 0.5, + layout_strategy = "flex", + layout_config = { + flex = { + flip_columns = 200, }, }, }, From 33828c6afa41f4e739d2cf3490ce1f053ceddf3f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 10:25:49 +0300 Subject: [PATCH 2513/2667] Neovim: update plugins --- home/.config/nvim/lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 767cd7f4..3680041b 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -16,13 +16,13 @@ "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "6567d50fd792056e2001663f5cd4d8bfb6840604" }, + "dropbar.nvim": { "branch": "master", "commit": "aa4c0ab1ade45ff9a3c5d4c06365c9b119f32d36" }, "firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" }, + "gitsigns.nvim": { "branch": "main", "commit": "1d2cb568a7105a860941ef45a01b13709d7aa9d2" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, - "lazy.nvim": { "branch": "main", "commit": "839f9e78e78dc935b1188fb16583365991739c51" }, + "lazy.nvim": { "branch": "main", "commit": "4496b4cad69a862199bb3ad452d3c4988bb925a1" }, "lazydev.nvim": { "branch": "main", "commit": "399299ca570aa82c13ee4fb1bd1304ce6baf7f05" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, @@ -30,25 +30,25 @@ "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "23669ab7abc2cd10f9a5166de07400bb34eaecda" }, + "mini.nvim": { "branch": "main", "commit": "657ef75b52a548090fb7906735517b7ddbf39e88" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "dd7363eae290ecdb9d6a2db6e0f59527df79edd6" }, + "noice.nvim": { "branch": "main", "commit": "d9328ef903168b6f52385a751eb384ae7e906c6f" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, - "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, + "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" }, "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "fa6c2a64100c6f692bbec29bbbc8ec2663c9e869" }, + "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "4e396b26244444c911b73e9f2f40ae0115351fd1" }, - "nvim-treesitter": { "branch": "master", "commit": "5f5077f8f7fa545065a0846406011cd3cc49093b" }, + "nvim-treesitter": { "branch": "master", "commit": "96c5cb23342db3e51994680781da54b45d7e0c9b" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "1624866a1379fc1861797f0ed05899a9c1d2ff61" }, + "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" }, "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, @@ -59,10 +59,10 @@ "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "79552ef8488cb492e0f9d2bf3b4e808f57515e35" }, + "telescope.nvim": { "branch": "master", "commit": "47ab113de540d1d1d9cdf7dba76dc60ddd808bb8" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "650f298f516018ad7ebce6d957e015d5db434f3c" } + "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } } From 8d2b06f27bf34f8c07b036fe62ce61aa4b89b338 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 10:25:49 +0300 Subject: [PATCH 2514/2667] Neovim: update plugins --- home/.config/nvim/lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 767cd7f4..3680041b 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -16,13 +16,13 @@ "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "6567d50fd792056e2001663f5cd4d8bfb6840604" }, + "dropbar.nvim": { "branch": "master", "commit": "aa4c0ab1ade45ff9a3c5d4c06365c9b119f32d36" }, "firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" }, + "gitsigns.nvim": { "branch": "main", "commit": "1d2cb568a7105a860941ef45a01b13709d7aa9d2" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, - "lazy.nvim": { "branch": "main", "commit": "839f9e78e78dc935b1188fb16583365991739c51" }, + "lazy.nvim": { "branch": "main", "commit": "4496b4cad69a862199bb3ad452d3c4988bb925a1" }, "lazydev.nvim": { "branch": "main", "commit": "399299ca570aa82c13ee4fb1bd1304ce6baf7f05" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, @@ -30,25 +30,25 @@ "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "23669ab7abc2cd10f9a5166de07400bb34eaecda" }, + "mini.nvim": { "branch": "main", "commit": "657ef75b52a548090fb7906735517b7ddbf39e88" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "dd7363eae290ecdb9d6a2db6e0f59527df79edd6" }, + "noice.nvim": { "branch": "main", "commit": "d9328ef903168b6f52385a751eb384ae7e906c6f" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, - "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, + "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" }, "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "fa6c2a64100c6f692bbec29bbbc8ec2663c9e869" }, + "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-tree.lua": { "branch": "master", "commit": "4e396b26244444c911b73e9f2f40ae0115351fd1" }, - "nvim-treesitter": { "branch": "master", "commit": "5f5077f8f7fa545065a0846406011cd3cc49093b" }, + "nvim-treesitter": { "branch": "master", "commit": "96c5cb23342db3e51994680781da54b45d7e0c9b" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "1624866a1379fc1861797f0ed05899a9c1d2ff61" }, + "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" }, "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, @@ -59,10 +59,10 @@ "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "79552ef8488cb492e0f9d2bf3b4e808f57515e35" }, + "telescope.nvim": { "branch": "master", "commit": "47ab113de540d1d1d9cdf7dba76dc60ddd808bb8" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "650f298f516018ad7ebce6d957e015d5db434f3c" } + "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } } From 22feb12d3355bcd6d2baed413ddda664ae7801d8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 13:36:52 +0300 Subject: [PATCH 2515/2667] Neovim: lazy load telescope --- home/.config/nvim/lua/plugins/telescope.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index c038c744..8a9155ec 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,7 +1,6 @@ --- @type LazyPluginSpec return { "nvim-telescope/telescope.nvim", - lazy = false, dependencies = { -- Internal dependency for telescope "nvim-lua/plenary.nvim", From b8b3c2106bf7ffc3e27c71367de740670098f826 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 13:36:52 +0300 Subject: [PATCH 2516/2667] Neovim: lazy load telescope --- home/.config/nvim/lua/plugins/telescope.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index c038c744..8a9155ec 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -1,7 +1,6 @@ --- @type LazyPluginSpec return { "nvim-telescope/telescope.nvim", - lazy = false, dependencies = { -- Internal dependency for telescope "nvim-lua/plenary.nvim", From 79a7db5bb989ad55a61b4ca16df6613302753b57 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 13:40:20 +0300 Subject: [PATCH 2517/2667] ZSH: Don't update nvim lockfiles in update script --- home/.config/zsh/04-aliases.zsh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 7194375c..ad1a5586 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -210,8 +210,9 @@ update() { } plugins() { - echo "Updating NeoVim plugins" - nvim --headless -c "Lazy! update" -c 'TSUpdateSync' -c 'MasonUpdateAll' -c 'qa' + echo "Updating NeoVim plugins to match lockfiles" + nvim --headless -c "Lazy! restore" -c 'TSUpdateSync' -c 'MasonLockRestore' -c 'qa' + echo "Updating zsh plugins" zinit self-update zinit update -p } From 4ec9a9ada662222631aca1ce1e330cf6608c08be Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 13:40:20 +0300 Subject: [PATCH 2518/2667] ZSH: Don't update nvim lockfiles in update script --- home/.config/zsh/04-aliases.zsh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 7194375c..ad1a5586 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -210,8 +210,9 @@ update() { } plugins() { - echo "Updating NeoVim plugins" - nvim --headless -c "Lazy! update" -c 'TSUpdateSync' -c 'MasonUpdateAll' -c 'qa' + echo "Updating NeoVim plugins to match lockfiles" + nvim --headless -c "Lazy! restore" -c 'TSUpdateSync' -c 'MasonLockRestore' -c 'qa' + echo "Updating zsh plugins" zinit self-update zinit update -p } From 243b82148be0b28e8dedaef0bc4daf9fa42502ee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 13:43:30 +0300 Subject: [PATCH 2519/2667] Nvim: Update mason lockfile --- home/.config/nvim/mason-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 9d801495..77826d6e 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -6,12 +6,12 @@ "eslint-lsp": "4.10.0", "google-java-format": "v1.22.0", "html-lsp": "4.10.0", - "java-debug-adapter": "0.55.0", - "jdtls": "v1.35.0", + "java-debug-adapter": "0.58.0", + "jdtls": "v1.37.0", "json-lsp": "4.10.0", "lemminx": "0.27.1", "lua-language-server": "3.9.3", - "prettier": "3.3.2", + "prettier": "3.3.3", "prettierd": "0.25.3", "stylua": "v0.20.0", "taplo": "0.9.2", From 96a51205d354bf09a45747abfcd81b9fa7fc2c8f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 13:43:30 +0300 Subject: [PATCH 2520/2667] Nvim: Update mason lockfile --- home/.config/nvim/mason-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 9d801495..77826d6e 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -6,12 +6,12 @@ "eslint-lsp": "4.10.0", "google-java-format": "v1.22.0", "html-lsp": "4.10.0", - "java-debug-adapter": "0.55.0", - "jdtls": "v1.35.0", + "java-debug-adapter": "0.58.0", + "jdtls": "v1.37.0", "json-lsp": "4.10.0", "lemminx": "0.27.1", "lua-language-server": "3.9.3", - "prettier": "3.3.2", + "prettier": "3.3.3", "prettierd": "0.25.3", "stylua": "v0.20.0", "taplo": "0.9.2", From e9d20f005d9120eff3832a02d87d03684f4856bf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Aug 2024 11:45:57 +0300 Subject: [PATCH 2521/2667] Nvim: add gitea plugin for fugitive --- home/.config/nvim/lua/plugins/fugitive.lua | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/fugitive.lua b/home/.config/nvim/lua/plugins/fugitive.lua index 24d58a49..f6282331 100644 --- a/home/.config/nvim/lua/plugins/fugitive.lua +++ b/home/.config/nvim/lua/plugins/fugitive.lua @@ -1,3 +1,12 @@ -- Git commands --- @type LazyPluginSpec -return { "tpope/vim-fugitive" } +return { + "tpope/vim-fugitive", + dependencies = { "borissov/fugitive-gitea" }, + config = function() + vim.g.fugitive_gitea_domains = { + "https://git.korhonen.cc", + "https://git.rossum.fi", + } + end, +} From 1dc452b66d016a6d2cd8bdc15deb36cd094dccbf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Aug 2024 11:45:57 +0300 Subject: [PATCH 2522/2667] Nvim: add gitea plugin for fugitive --- home/.config/nvim/lua/plugins/fugitive.lua | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/fugitive.lua b/home/.config/nvim/lua/plugins/fugitive.lua index 24d58a49..f6282331 100644 --- a/home/.config/nvim/lua/plugins/fugitive.lua +++ b/home/.config/nvim/lua/plugins/fugitive.lua @@ -1,3 +1,12 @@ -- Git commands --- @type LazyPluginSpec -return { "tpope/vim-fugitive" } +return { + "tpope/vim-fugitive", + dependencies = { "borissov/fugitive-gitea" }, + config = function() + vim.g.fugitive_gitea_domains = { + "https://git.korhonen.cc", + "https://git.rossum.fi", + } + end, +} From 9882edcd49e2315411fcd2c54ddb488e55c13bbc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Aug 2024 11:46:34 +0300 Subject: [PATCH 2523/2667] Nvim: update plugins --- home/.config/nvim/lazy-lock.json | 51 ++++++++++++++++--------------- home/.config/nvim/mason-lock.json | 6 ++-- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 3680041b..7afed52b 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { - "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, + "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "14cad96b80a07e9e92a0dcbe235092ed14113fb2" }, "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -17,49 +17,50 @@ "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dropbar.nvim": { "branch": "master", "commit": "aa4c0ab1ade45ff9a3c5d4c06365c9b119f32d36" }, - "firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" }, + "firenvim": { "branch": "master", "commit": "bb70728c13c305ff35193586d5f6ce68668af063" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "1d2cb568a7105a860941ef45a01b13709d7aa9d2" }, - "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "fugitive-gitea": { "branch": "master", "commit": "d93176028d13820f941c165c14039a6019744a5a" }, + "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, - "lazy.nvim": { "branch": "main", "commit": "4496b4cad69a862199bb3ad452d3c4988bb925a1" }, - "lazydev.nvim": { "branch": "main", "commit": "399299ca570aa82c13ee4fb1bd1304ce6baf7f05" }, + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "657ef75b52a548090fb7906735517b7ddbf39e88" }, - "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "d9328ef903168b6f52385a751eb384ae7e906c6f" }, + "mini.nvim": { "branch": "main", "commit": "d8faae693d266ee4f3a2bf1fb7ca4bc81314c3e9" }, + "neoformat": { "branch": "master", "commit": "b3b38589b39038dc12c2f5a59a828ed43439363a" }, + "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, - "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" }, - "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "be3b04943d6bcace9431e44062ffc5cc260e8aed" }, + "nvim-autopairs": { "branch": "master", "commit": "4a39f2dcbe1967ddc3a0f76f863540dd3aa7871a" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" }, + "nvim-dap": { "branch": "master", "commit": "dcc85d12d6e2c18c5fa0f9a304d9f5e767e1401a" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, - "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" }, + "nvim-jdtls": { "branch": "master", "commit": "99e4b2081de1d9162666cc7b563cbeb01c26b66b" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" }, + "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "4e396b26244444c911b73e9f2f40ae0115351fd1" }, - "nvim-treesitter": { "branch": "master", "commit": "96c5cb23342db3e51994680781da54b45d7e0c9b" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, + "nvim-tree.lua": { "branch": "master", "commit": "48d0e82f9434691cc50d970898142a8c084a49d6" }, + "nvim-treesitter": { "branch": "master", "commit": "2e01c7104c0983467ee1b9f569e0874b8d2b44c6" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ca93cb2c34b67ab22d01976fc90bc95627a3317f" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, - "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" }, - "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, + "nvim-ufo": { "branch": "main", "commit": "7dcb8fea3e7b3ccdb50f2c3ae7c248cdf6fe1ae1" }, + "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, - "statuscol.nvim": { "branch": "main", "commit": "d6f7f5437c5404d958b88bb73e0721b1c0e09223" }, + "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, + "statuscol.nvim": { "branch": "main", "commit": "93d8bcda516fc86e11c03f9ef577bae9a72fba0e" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "47ab113de540d1d1d9cdf7dba76dc60ddd808bb8" }, + "telescope.nvim": { "branch": "master", "commit": "3b1600d0fd5172ad9fae00987362ca0ef3d8895d" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 77826d6e..9237e9a0 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -4,17 +4,17 @@ "docker-compose-language-service": "0.2.0", "dockerfile-language-server": "0.13.0", "eslint-lsp": "4.10.0", - "google-java-format": "v1.22.0", + "google-java-format": "v1.23.0", "html-lsp": "4.10.0", "java-debug-adapter": "0.58.0", "jdtls": "v1.37.0", "json-lsp": "4.10.0", "lemminx": "0.27.1", - "lua-language-server": "3.9.3", + "lua-language-server": "3.10.2", "prettier": "3.3.3", "prettierd": "0.25.3", "stylua": "v0.20.0", - "taplo": "0.9.2", + "taplo": "0.9.3", "tree-sitter-cli": "v0.22.6", "typescript-language-server": "4.3.3", "yaml-language-server": "1.15.0" From 316dfa5137f522430424e6550e6f19f217bdac30 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Aug 2024 11:46:34 +0300 Subject: [PATCH 2524/2667] Nvim: update plugins --- home/.config/nvim/lazy-lock.json | 51 ++++++++++++++++--------------- home/.config/nvim/mason-lock.json | 6 ++-- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 3680041b..7afed52b 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { - "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, + "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "14cad96b80a07e9e92a0dcbe235092ed14113fb2" }, "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -17,49 +17,50 @@ "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dropbar.nvim": { "branch": "master", "commit": "aa4c0ab1ade45ff9a3c5d4c06365c9b119f32d36" }, - "firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" }, + "firenvim": { "branch": "master", "commit": "bb70728c13c305ff35193586d5f6ce68668af063" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "1d2cb568a7105a860941ef45a01b13709d7aa9d2" }, - "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "fugitive-gitea": { "branch": "master", "commit": "d93176028d13820f941c165c14039a6019744a5a" }, + "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, - "lazy.nvim": { "branch": "main", "commit": "4496b4cad69a862199bb3ad452d3c4988bb925a1" }, - "lazydev.nvim": { "branch": "main", "commit": "399299ca570aa82c13ee4fb1bd1304ce6baf7f05" }, + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "657ef75b52a548090fb7906735517b7ddbf39e88" }, - "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" }, - "noice.nvim": { "branch": "main", "commit": "d9328ef903168b6f52385a751eb384ae7e906c6f" }, + "mini.nvim": { "branch": "main", "commit": "d8faae693d266ee4f3a2bf1fb7ca4bc81314c3e9" }, + "neoformat": { "branch": "master", "commit": "b3b38589b39038dc12c2f5a59a828ed43439363a" }, + "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, - "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" }, - "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "be3b04943d6bcace9431e44062ffc5cc260e8aed" }, + "nvim-autopairs": { "branch": "master", "commit": "4a39f2dcbe1967ddc3a0f76f863540dd3aa7871a" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" }, + "nvim-dap": { "branch": "master", "commit": "dcc85d12d6e2c18c5fa0f9a304d9f5e767e1401a" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, - "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" }, + "nvim-jdtls": { "branch": "master", "commit": "99e4b2081de1d9162666cc7b563cbeb01c26b66b" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" }, + "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "4e396b26244444c911b73e9f2f40ae0115351fd1" }, - "nvim-treesitter": { "branch": "master", "commit": "96c5cb23342db3e51994680781da54b45d7e0c9b" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, + "nvim-tree.lua": { "branch": "master", "commit": "48d0e82f9434691cc50d970898142a8c084a49d6" }, + "nvim-treesitter": { "branch": "master", "commit": "2e01c7104c0983467ee1b9f569e0874b8d2b44c6" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ca93cb2c34b67ab22d01976fc90bc95627a3317f" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, - "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" }, - "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, + "nvim-ufo": { "branch": "main", "commit": "7dcb8fea3e7b3ccdb50f2c3ae7c248cdf6fe1ae1" }, + "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, - "statuscol.nvim": { "branch": "main", "commit": "d6f7f5437c5404d958b88bb73e0721b1c0e09223" }, + "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, + "statuscol.nvim": { "branch": "main", "commit": "93d8bcda516fc86e11c03f9ef577bae9a72fba0e" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "47ab113de540d1d1d9cdf7dba76dc60ddd808bb8" }, + "telescope.nvim": { "branch": "master", "commit": "3b1600d0fd5172ad9fae00987362ca0ef3d8895d" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 77826d6e..9237e9a0 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -4,17 +4,17 @@ "docker-compose-language-service": "0.2.0", "dockerfile-language-server": "0.13.0", "eslint-lsp": "4.10.0", - "google-java-format": "v1.22.0", + "google-java-format": "v1.23.0", "html-lsp": "4.10.0", "java-debug-adapter": "0.58.0", "jdtls": "v1.37.0", "json-lsp": "4.10.0", "lemminx": "0.27.1", - "lua-language-server": "3.9.3", + "lua-language-server": "3.10.2", "prettier": "3.3.3", "prettierd": "0.25.3", "stylua": "v0.20.0", - "taplo": "0.9.2", + "taplo": "0.9.3", "tree-sitter-cli": "v0.22.6", "typescript-language-server": "4.3.3", "yaml-language-server": "1.15.0" From 5baa4af47421f0b900bfda296738f259142eb42d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Aug 2024 11:47:00 +0300 Subject: [PATCH 2525/2667] Nvim: make cmp bordered, fix keymap --- home/.config/nvim/lua/plugins/cmp.lua | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 72538fa8..9f6537d5 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -1,4 +1,4 @@ --- Autoompletion +-- Auto completion --- @type LazyPluginSpec return { "hrsh7th/nvim-cmp", @@ -16,6 +16,7 @@ return { "hrsh7th/cmp-cmdline", -- cmdline source "saadparwaiz1/cmp_luasnip", -- Snippets source "f3fora/cmp-spell", -- Spell check source + "petertriho/cmp-git", -- Git source -- Copilot source { "zbirenbaum/copilot-cmp", @@ -35,17 +36,23 @@ return { -- Set completeopt to have a better completion experience vim.o.completeopt = "menuone,noselect" + local bordered = cmp.config.window.bordered() + cmp.setup({ snippet = { expand = function(args) luasnip.lsp_expand(args.body) end, }, + window = { + completion = bordered, + documentation = bordered, + }, mapping = { [""] = cmp.mapping.select_prev_item(), [""] = cmp.mapping.select_next_item(), [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.scroll_docs(4), [""] = cmp.mapping.complete(), [""] = cmp.mapping.close(), [""] = cmp.mapping.confirm({ @@ -111,13 +118,15 @@ return { }, }) + require("cmp_git").setup() + -- Enable autopairs when enter is processed -- on completion local cmp_autopairs = require("nvim-autopairs.completion.cmp") cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) - -- `/` cmdline setup. - cmp.setup.cmdline("/", { + -- search cmdline setup. + cmp.setup.cmdline({ "/", "?" }, { mapping = cmp.mapping.preset.cmdline(), sources = { { name = "buffer" }, From 0d75a242780023c04a0b3ead9b6003d9afa485ae Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Aug 2024 11:47:00 +0300 Subject: [PATCH 2526/2667] Nvim: make cmp bordered, fix keymap --- home/.config/nvim/lua/plugins/cmp.lua | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 72538fa8..9f6537d5 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -1,4 +1,4 @@ --- Autoompletion +-- Auto completion --- @type LazyPluginSpec return { "hrsh7th/nvim-cmp", @@ -16,6 +16,7 @@ return { "hrsh7th/cmp-cmdline", -- cmdline source "saadparwaiz1/cmp_luasnip", -- Snippets source "f3fora/cmp-spell", -- Spell check source + "petertriho/cmp-git", -- Git source -- Copilot source { "zbirenbaum/copilot-cmp", @@ -35,17 +36,23 @@ return { -- Set completeopt to have a better completion experience vim.o.completeopt = "menuone,noselect" + local bordered = cmp.config.window.bordered() + cmp.setup({ snippet = { expand = function(args) luasnip.lsp_expand(args.body) end, }, + window = { + completion = bordered, + documentation = bordered, + }, mapping = { [""] = cmp.mapping.select_prev_item(), [""] = cmp.mapping.select_next_item(), [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.scroll_docs(4), [""] = cmp.mapping.complete(), [""] = cmp.mapping.close(), [""] = cmp.mapping.confirm({ @@ -111,13 +118,15 @@ return { }, }) + require("cmp_git").setup() + -- Enable autopairs when enter is processed -- on completion local cmp_autopairs = require("nvim-autopairs.completion.cmp") cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) - -- `/` cmdline setup. - cmp.setup.cmdline("/", { + -- search cmdline setup. + cmp.setup.cmdline({ "/", "?" }, { mapping = cmp.mapping.preset.cmdline(), sources = { { name = "buffer" }, From 4046ef4e486b40f86337acac58b85a8df329914d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Aug 2024 11:47:17 +0300 Subject: [PATCH 2527/2667] Nvim: some code prettifying --- home/.config/nvim/lua/lsp_utils.lua | 35 +++++++++++----------- home/.config/nvim/lua/plugins/gitsigns.lua | 16 +++++----- home/.config/nvim/lua/plugins/mason.lua | 4 +-- 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua index bc17a3a0..8851c307 100644 --- a/home/.config/nvim/lua/lsp_utils.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -4,6 +4,7 @@ local m = {} local lsp = vim.lsp local diagnostic = vim.diagnostic +local k = vim.keymap.set -- Maps LSP specific keybinds. -- This makes them only available when LSP is running @@ -14,25 +15,25 @@ function m.map_keys() { "w", group = "Workspace" }, }) - vim.keymap.set("n", "F", lsp.buf.format, { desc = "Format with LSP" }) - vim.keymap.set("n", "ca", lsp.buf.code_action, { desc = "Code action" }) - vim.keymap.set("n", "e", diagnostic.open_float, { desc = "Open diagnostics" }) - vim.keymap.set("n", "k", lsp.buf.signature_help, { desc = "Signature help" }) - vim.keymap.set("n", "rn", lsp.buf.rename, { desc = "Rename symbol" }) - vim.keymap.set("n", "wa", lsp.buf.add_workspace_folder, { desc = "Add folder" }) - vim.keymap.set("n", "wl", function() + k("n", "F", lsp.buf.format, { desc = "Format with LSP" }) + k("n", "ca", lsp.buf.code_action, { desc = "Code action" }) + k("n", "e", diagnostic.open_float, { desc = "Open diagnostics" }) + k("n", "k", lsp.buf.signature_help, { desc = "Signature help" }) + k("n", "rn", lsp.buf.rename, { desc = "Rename symbol" }) + k("n", "wa", lsp.buf.add_workspace_folder, { desc = "Add folder" }) + k("n", "wl", function() print(vim.inspect(lsp.buf.list_workspace_folders())) end, { desc = "List folders" }) - vim.keymap.set("n", "wr", lsp.buf.remove_workspace_folder, { desc = "Remove folder" }) - vim.keymap.set("n", "K", lsp.buf.hover, { desc = "Hover" }) - vim.keymap.set("n", "[d", diagnostic.goto_prev, { desc = "Previous diagnostic" }) - vim.keymap.set("n", "]d", diagnostic.goto_next, { desc = "Next diagnostic" }) - vim.keymap.set("n", "gD", lsp.buf.declaration, { desc = "Declaration" }) - vim.keymap.set("n", "gd", builtin.lsp_definitions, { desc = "Definition" }) - vim.keymap.set("n", "gi", builtin.lsp_implementations, { desc = "Implementation" }) - vim.keymap.set("n", "gr", builtin.lsp_references, { desc = "References" }) - vim.keymap.set("n", "gs", builtin.lsp_document_symbols, { desc = "Symbols" }) - vim.keymap.set("n", "gt", lsp.buf.type_definition, { desc = "Type definition" }) + k("n", "wr", lsp.buf.remove_workspace_folder, { desc = "Remove folder" }) + k("n", "K", lsp.buf.hover, { desc = "Hover" }) + k("n", "[d", diagnostic.goto_prev, { desc = "Previous diagnostic" }) + k("n", "]d", diagnostic.goto_next, { desc = "Next diagnostic" }) + k("n", "gD", lsp.buf.declaration, { desc = "Declaration" }) + k("n", "gd", builtin.lsp_definitions, { desc = "Definition" }) + k("n", "gi", builtin.lsp_implementations, { desc = "Implementation" }) + k("n", "gr", builtin.lsp_references, { desc = "References" }) + k("n", "gs", builtin.lsp_document_symbols, { desc = "Symbols" }) + k("n", "gt", lsp.buf.type_definition, { desc = "Type definition" }) end -- Combine built-in LSP and cmp cabaibilities diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua index 2266b0b1..000ef9d5 100644 --- a/home/.config/nvim/lua/plugins/gitsigns.lua +++ b/home/.config/nvim/lua/plugins/gitsigns.lua @@ -1,6 +1,4 @@ -local k = function(lhs, rhs, opts) - vim.keymap.set("", lhs, rhs, opts) -end +local k = vim.keymap.set --- @type LazyPluginSpec return { @@ -20,17 +18,17 @@ return { local opts -- Hunk navigation - k("[h", gs.prev_hunk, { desc = "Previous hunk" }) - k("]h", gs.next_hunk, { desc = "Next hunk" }) + k("n", "[h", gs.prev_hunk, { desc = "Previous hunk" }) + k("n", "]h", gs.next_hunk, { desc = "Next hunk" }) -- Hunk actions opts = { desc = "Hunk" } - k("grh", gs.reset_hunk, opts) - k("gah", gs.stage_hunk, opts) + k("n", "grh", gs.reset_hunk, opts) + k("n", "gah", gs.stage_hunk, opts) -- Buffer actions opts = { desc = "Buffer" } - k("gab", gs.stage_buffer, opts) - k("grb", gs.reset_buffer, opts) + k("n", "gab", gs.stage_buffer, opts) + k("n", "grb", gs.reset_buffer, opts) end, } diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 8e8c6693..b357e5d4 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -7,7 +7,7 @@ return { "neovim/nvim-lspconfig", "williamboman/mason-lspconfig.nvim", -- Add MasonUpdateAll - { "Zeioth/mason-extra-cmds", config = true }, + { "Zeioth/mason-extra-cmds", opts = {} }, -- Add lockfile support { "zapling/mason-lock.nvim", @@ -18,7 +18,7 @@ return { -- Extended functionality for jdtls "mfussenegger/nvim-jdtls", -- Add support for LSP file operations - { "antosha417/nvim-lsp-file-operations", config = true }, + { "antosha417/nvim-lsp-file-operations", opts = {} }, }, config = function() require("mason").setup() From da9cd3f89a03df1fe6ca8300400e3e9dfd625073 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Aug 2024 11:47:17 +0300 Subject: [PATCH 2528/2667] Nvim: some code prettifying --- home/.config/nvim/lua/lsp_utils.lua | 35 +++++++++++----------- home/.config/nvim/lua/plugins/gitsigns.lua | 16 +++++----- home/.config/nvim/lua/plugins/mason.lua | 4 +-- 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua index bc17a3a0..8851c307 100644 --- a/home/.config/nvim/lua/lsp_utils.lua +++ b/home/.config/nvim/lua/lsp_utils.lua @@ -4,6 +4,7 @@ local m = {} local lsp = vim.lsp local diagnostic = vim.diagnostic +local k = vim.keymap.set -- Maps LSP specific keybinds. -- This makes them only available when LSP is running @@ -14,25 +15,25 @@ function m.map_keys() { "w", group = "Workspace" }, }) - vim.keymap.set("n", "F", lsp.buf.format, { desc = "Format with LSP" }) - vim.keymap.set("n", "ca", lsp.buf.code_action, { desc = "Code action" }) - vim.keymap.set("n", "e", diagnostic.open_float, { desc = "Open diagnostics" }) - vim.keymap.set("n", "k", lsp.buf.signature_help, { desc = "Signature help" }) - vim.keymap.set("n", "rn", lsp.buf.rename, { desc = "Rename symbol" }) - vim.keymap.set("n", "wa", lsp.buf.add_workspace_folder, { desc = "Add folder" }) - vim.keymap.set("n", "wl", function() + k("n", "F", lsp.buf.format, { desc = "Format with LSP" }) + k("n", "ca", lsp.buf.code_action, { desc = "Code action" }) + k("n", "e", diagnostic.open_float, { desc = "Open diagnostics" }) + k("n", "k", lsp.buf.signature_help, { desc = "Signature help" }) + k("n", "rn", lsp.buf.rename, { desc = "Rename symbol" }) + k("n", "wa", lsp.buf.add_workspace_folder, { desc = "Add folder" }) + k("n", "wl", function() print(vim.inspect(lsp.buf.list_workspace_folders())) end, { desc = "List folders" }) - vim.keymap.set("n", "wr", lsp.buf.remove_workspace_folder, { desc = "Remove folder" }) - vim.keymap.set("n", "K", lsp.buf.hover, { desc = "Hover" }) - vim.keymap.set("n", "[d", diagnostic.goto_prev, { desc = "Previous diagnostic" }) - vim.keymap.set("n", "]d", diagnostic.goto_next, { desc = "Next diagnostic" }) - vim.keymap.set("n", "gD", lsp.buf.declaration, { desc = "Declaration" }) - vim.keymap.set("n", "gd", builtin.lsp_definitions, { desc = "Definition" }) - vim.keymap.set("n", "gi", builtin.lsp_implementations, { desc = "Implementation" }) - vim.keymap.set("n", "gr", builtin.lsp_references, { desc = "References" }) - vim.keymap.set("n", "gs", builtin.lsp_document_symbols, { desc = "Symbols" }) - vim.keymap.set("n", "gt", lsp.buf.type_definition, { desc = "Type definition" }) + k("n", "wr", lsp.buf.remove_workspace_folder, { desc = "Remove folder" }) + k("n", "K", lsp.buf.hover, { desc = "Hover" }) + k("n", "[d", diagnostic.goto_prev, { desc = "Previous diagnostic" }) + k("n", "]d", diagnostic.goto_next, { desc = "Next diagnostic" }) + k("n", "gD", lsp.buf.declaration, { desc = "Declaration" }) + k("n", "gd", builtin.lsp_definitions, { desc = "Definition" }) + k("n", "gi", builtin.lsp_implementations, { desc = "Implementation" }) + k("n", "gr", builtin.lsp_references, { desc = "References" }) + k("n", "gs", builtin.lsp_document_symbols, { desc = "Symbols" }) + k("n", "gt", lsp.buf.type_definition, { desc = "Type definition" }) end -- Combine built-in LSP and cmp cabaibilities diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua index 2266b0b1..000ef9d5 100644 --- a/home/.config/nvim/lua/plugins/gitsigns.lua +++ b/home/.config/nvim/lua/plugins/gitsigns.lua @@ -1,6 +1,4 @@ -local k = function(lhs, rhs, opts) - vim.keymap.set("", lhs, rhs, opts) -end +local k = vim.keymap.set --- @type LazyPluginSpec return { @@ -20,17 +18,17 @@ return { local opts -- Hunk navigation - k("[h", gs.prev_hunk, { desc = "Previous hunk" }) - k("]h", gs.next_hunk, { desc = "Next hunk" }) + k("n", "[h", gs.prev_hunk, { desc = "Previous hunk" }) + k("n", "]h", gs.next_hunk, { desc = "Next hunk" }) -- Hunk actions opts = { desc = "Hunk" } - k("grh", gs.reset_hunk, opts) - k("gah", gs.stage_hunk, opts) + k("n", "grh", gs.reset_hunk, opts) + k("n", "gah", gs.stage_hunk, opts) -- Buffer actions opts = { desc = "Buffer" } - k("gab", gs.stage_buffer, opts) - k("grb", gs.reset_buffer, opts) + k("n", "gab", gs.stage_buffer, opts) + k("n", "grb", gs.reset_buffer, opts) end, } diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index 8e8c6693..b357e5d4 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -7,7 +7,7 @@ return { "neovim/nvim-lspconfig", "williamboman/mason-lspconfig.nvim", -- Add MasonUpdateAll - { "Zeioth/mason-extra-cmds", config = true }, + { "Zeioth/mason-extra-cmds", opts = {} }, -- Add lockfile support { "zapling/mason-lock.nvim", @@ -18,7 +18,7 @@ return { -- Extended functionality for jdtls "mfussenegger/nvim-jdtls", -- Add support for LSP file operations - { "antosha417/nvim-lsp-file-operations", config = true }, + { "antosha417/nvim-lsp-file-operations", opts = {} }, }, config = function() require("mason").setup() From b2a6de7ebcb79359cafe23dddfb1820477c2280c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Aug 2024 09:11:45 +0300 Subject: [PATCH 2529/2667] Add git aliases --- home/.config/git/config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home/.config/git/config b/home/.config/git/config index 3f4d7fe3..dde22dfc 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -1,9 +1,5 @@ [user] -{%@@ if profile == "mko-laptop" @@%} email = marko.korhonen@rossum.fi -{%@@ else @@%} -email = marko@korhonen.cc -{%@@ endif @@%} name = Marko Korhonen signingkey = F2B9F713E7ED627336DD85E444FA3F28CD931BB0 @@ -38,6 +34,10 @@ mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 feat upstream = !git push -u origin HEAD sync = !git pull && git push recommit = !git commit -eF $(git rev-parse --git-dir)/COMMIT_EDITMSG +pull-merge = pull --no-rebase --no-ff --no-edit +log-merge = log -i --grep=merge --pretty=oneline +log-fp = log --first-parent --pretty=oneline +ll = log --pretty=oneline [color] pager = no From 436526ffb9d9747afe48cd7b1fef56fd7e6ff612 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Aug 2024 09:11:45 +0300 Subject: [PATCH 2530/2667] Add git aliases --- home/.config/git/config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home/.config/git/config b/home/.config/git/config index 3f4d7fe3..dde22dfc 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -1,9 +1,5 @@ [user] -{%@@ if profile == "mko-laptop" @@%} email = marko.korhonen@rossum.fi -{%@@ else @@%} -email = marko@korhonen.cc -{%@@ endif @@%} name = Marko Korhonen signingkey = F2B9F713E7ED627336DD85E444FA3F28CD931BB0 @@ -38,6 +34,10 @@ mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 feat upstream = !git push -u origin HEAD sync = !git pull && git push recommit = !git commit -eF $(git rev-parse --git-dir)/COMMIT_EDITMSG +pull-merge = pull --no-rebase --no-ff --no-edit +log-merge = log -i --grep=merge --pretty=oneline +log-fp = log --first-parent --pretty=oneline +ll = log --pretty=oneline [color] pager = no From 016c02a449977b761bda49042e8eb0a4c06ee323 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Aug 2024 12:40:07 +0300 Subject: [PATCH 2531/2667] Neovim: add open project to dashboard --- home/.config/nvim/lua/plugins/alpha.lua | 9 +++++++-- home/.config/nvim/lua/plugins/telescope.lua | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/alpha.lua b/home/.config/nvim/lua/plugins/alpha.lua index 64cb66c5..792ea76d 100644 --- a/home/.config/nvim/lua/plugins/alpha.lua +++ b/home/.config/nvim/lua/plugins/alpha.lua @@ -14,9 +14,14 @@ return { [[ \/_/\/_/\/____/\/___/ \/__/ \/_/\/_/\/_/\/_/]], } dashboard.section.buttons.val = { + dashboard.button( + "p", + "📽 Open a project", + ":lua require('telescope').extensions.project.project()" + ), dashboard.button("e", " New file", ":ene startinsert "), - dashboard.button("", "🔍 Find file", "Telescope find_files"), - dashboard.button("", "𑪢 Grep files", "Telescope live_grep"), + dashboard.button("", "🔍 Find file", "Telescope find_files"), + dashboard.button("", "𑪢 Grep files", "Telescope live_grep"), dashboard.button("l", "🛋 Lazy", ":Lazy"), dashboard.button("m", "📦 Mason", ":Mason"), dashboard.button("q", "ꭙ Quit NeoVim", ":qa"), diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 8a9155ec..0a8435a9 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -87,7 +87,7 @@ return { builtin.live_grep, }, { - desc = "Change to a project", + desc = "Open a project", "p", extensions.project.project, }, From e5f677793ddff498bea376dc1b6e8a41f7ad8c99 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Aug 2024 12:40:07 +0300 Subject: [PATCH 2532/2667] Neovim: add open project to dashboard --- home/.config/nvim/lua/plugins/alpha.lua | 9 +++++++-- home/.config/nvim/lua/plugins/telescope.lua | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/alpha.lua b/home/.config/nvim/lua/plugins/alpha.lua index 64cb66c5..792ea76d 100644 --- a/home/.config/nvim/lua/plugins/alpha.lua +++ b/home/.config/nvim/lua/plugins/alpha.lua @@ -14,9 +14,14 @@ return { [[ \/_/\/_/\/____/\/___/ \/__/ \/_/\/_/\/_/\/_/]], } dashboard.section.buttons.val = { + dashboard.button( + "p", + "📽 Open a project", + ":lua require('telescope').extensions.project.project()" + ), dashboard.button("e", " New file", ":ene startinsert "), - dashboard.button("", "🔍 Find file", "Telescope find_files"), - dashboard.button("", "𑪢 Grep files", "Telescope live_grep"), + dashboard.button("", "🔍 Find file", "Telescope find_files"), + dashboard.button("", "𑪢 Grep files", "Telescope live_grep"), dashboard.button("l", "🛋 Lazy", ":Lazy"), dashboard.button("m", "📦 Mason", ":Mason"), dashboard.button("q", "ꭙ Quit NeoVim", ":qa"), diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index 8a9155ec..0a8435a9 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/home/.config/nvim/lua/plugins/telescope.lua @@ -87,7 +87,7 @@ return { builtin.live_grep, }, { - desc = "Change to a project", + desc = "Open a project", "p", extensions.project.project, }, From 4b82bf1d536e254637a4466ee40f20fabfe79f3c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Aug 2024 12:40:38 +0300 Subject: [PATCH 2533/2667] Neovim: update plugins --- home/.config/nvim/lazy-lock.json | 34 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 7afed52b..2fd9a9b5 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,12 +1,12 @@ { "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, - "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, + "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "14cad96b80a07e9e92a0dcbe235092ed14113fb2" }, "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-git": { "branch": "main", "commit": "3d83031c4b63f9b10703e32e070cda0700a81992" }, + "cmp-git": { "branch": "main", "commit": "50d526dff0f6bc441b51fc269d9fdc99a50c76af" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -16,51 +16,51 @@ "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "aa4c0ab1ade45ff9a3c5d4c06365c9b119f32d36" }, + "dropbar.nvim": { "branch": "master", "commit": "d26bf92161cd70e049dc138b44ffa0246dbf7178" }, "firenvim": { "branch": "master", "commit": "bb70728c13c305ff35193586d5f6ce68668af063" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "fugitive-gitea": { "branch": "master", "commit": "d93176028d13820f941c165c14039a6019744a5a" }, "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, + "indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, - "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, + "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1c55991321d1a861537e32446affc5de5d9a6eaf" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "d8faae693d266ee4f3a2bf1fb7ca4bc81314c3e9" }, + "mini.nvim": { "branch": "main", "commit": "fe573c7fb74252076d6c6d40837a92a7138dbb00" }, "neoformat": { "branch": "master", "commit": "b3b38589b39038dc12c2f5a59a828ed43439363a" }, "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "be3b04943d6bcace9431e44062ffc5cc260e8aed" }, - "nvim-autopairs": { "branch": "master", "commit": "4a39f2dcbe1967ddc3a0f76f863540dd3aa7871a" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "50708bea09cead374bf0b4b9c50686de68951d5c" }, + "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "dcc85d12d6e2c18c5fa0f9a304d9f5e767e1401a" }, + "nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-jdtls": { "branch": "master", "commit": "99e4b2081de1d9162666cc7b563cbeb01c26b66b" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" }, + "nvim-lspconfig": { "branch": "master", "commit": "43200fb3a820ed1b6c526e0eb0f3e6e6edd9fd64" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "48d0e82f9434691cc50d970898142a8c084a49d6" }, - "nvim-treesitter": { "branch": "master", "commit": "2e01c7104c0983467ee1b9f569e0874b8d2b44c6" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ca93cb2c34b67ab22d01976fc90bc95627a3317f" }, - "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, + "nvim-tree.lua": { "branch": "master", "commit": "ad0b95dee55955817af635fa121f6e2486b10583" }, + "nvim-treesitter": { "branch": "master", "commit": "cfd2095e66e49ea0dfbef6b41be2efd0ba6cc4ee" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "41e3abf6bfd9a9a681eb1f788bdeba91c9004b2b" }, + "nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" }, "nvim-ufo": { "branch": "main", "commit": "7dcb8fea3e7b3ccdb50f2c3ae7c248cdf6fe1ae1" }, "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, "statuscol.nvim": { "branch": "main", "commit": "93d8bcda516fc86e11c03f9ef577bae9a72fba0e" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "3b1600d0fd5172ad9fae00987362ca0ef3d8895d" }, + "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 9237e9a0..18047f30 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -7,10 +7,10 @@ "google-java-format": "v1.23.0", "html-lsp": "4.10.0", "java-debug-adapter": "0.58.0", - "jdtls": "v1.37.0", + "jdtls": "v1.38.0", "json-lsp": "4.10.0", "lemminx": "0.27.1", - "lua-language-server": "3.10.2", + "lua-language-server": "3.10.5", "prettier": "3.3.3", "prettierd": "0.25.3", "stylua": "v0.20.0", From 267e7c36d5cef13c5f5163394316ffee62726753 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Aug 2024 12:40:38 +0300 Subject: [PATCH 2534/2667] Neovim: update plugins --- home/.config/nvim/lazy-lock.json | 34 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 7afed52b..2fd9a9b5 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,12 +1,12 @@ { "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, - "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, + "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "14cad96b80a07e9e92a0dcbe235092ed14113fb2" }, "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-git": { "branch": "main", "commit": "3d83031c4b63f9b10703e32e070cda0700a81992" }, + "cmp-git": { "branch": "main", "commit": "50d526dff0f6bc441b51fc269d9fdc99a50c76af" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -16,51 +16,51 @@ "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "aa4c0ab1ade45ff9a3c5d4c06365c9b119f32d36" }, + "dropbar.nvim": { "branch": "master", "commit": "d26bf92161cd70e049dc138b44ffa0246dbf7178" }, "firenvim": { "branch": "master", "commit": "bb70728c13c305ff35193586d5f6ce68668af063" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "fugitive-gitea": { "branch": "master", "commit": "d93176028d13820f941c165c14039a6019744a5a" }, "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, + "indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, - "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, + "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1c55991321d1a861537e32446affc5de5d9a6eaf" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "d8faae693d266ee4f3a2bf1fb7ca4bc81314c3e9" }, + "mini.nvim": { "branch": "main", "commit": "fe573c7fb74252076d6c6d40837a92a7138dbb00" }, "neoformat": { "branch": "master", "commit": "b3b38589b39038dc12c2f5a59a828ed43439363a" }, "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "be3b04943d6bcace9431e44062ffc5cc260e8aed" }, - "nvim-autopairs": { "branch": "master", "commit": "4a39f2dcbe1967ddc3a0f76f863540dd3aa7871a" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "50708bea09cead374bf0b4b9c50686de68951d5c" }, + "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "dcc85d12d6e2c18c5fa0f9a304d9f5e767e1401a" }, + "nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-jdtls": { "branch": "master", "commit": "99e4b2081de1d9162666cc7b563cbeb01c26b66b" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" }, + "nvim-lspconfig": { "branch": "master", "commit": "43200fb3a820ed1b6c526e0eb0f3e6e6edd9fd64" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "48d0e82f9434691cc50d970898142a8c084a49d6" }, - "nvim-treesitter": { "branch": "master", "commit": "2e01c7104c0983467ee1b9f569e0874b8d2b44c6" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ca93cb2c34b67ab22d01976fc90bc95627a3317f" }, - "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, + "nvim-tree.lua": { "branch": "master", "commit": "ad0b95dee55955817af635fa121f6e2486b10583" }, + "nvim-treesitter": { "branch": "master", "commit": "cfd2095e66e49ea0dfbef6b41be2efd0ba6cc4ee" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "41e3abf6bfd9a9a681eb1f788bdeba91c9004b2b" }, + "nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" }, "nvim-ufo": { "branch": "main", "commit": "7dcb8fea3e7b3ccdb50f2c3ae7c248cdf6fe1ae1" }, "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, "statuscol.nvim": { "branch": "main", "commit": "93d8bcda516fc86e11c03f9ef577bae9a72fba0e" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "3b1600d0fd5172ad9fae00987362ca0ef3d8895d" }, + "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 9237e9a0..18047f30 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -7,10 +7,10 @@ "google-java-format": "v1.23.0", "html-lsp": "4.10.0", "java-debug-adapter": "0.58.0", - "jdtls": "v1.37.0", + "jdtls": "v1.38.0", "json-lsp": "4.10.0", "lemminx": "0.27.1", - "lua-language-server": "3.10.2", + "lua-language-server": "3.10.5", "prettier": "3.3.3", "prettierd": "0.25.3", "stylua": "v0.20.0", From f185eb86be6927f40a1d699e85f5751a71394c47 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Aug 2024 15:15:23 +0300 Subject: [PATCH 2535/2667] Update README --- README.adoc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index a83478dc..5e0b5219 100644 --- a/README.adoc +++ b/README.adoc @@ -11,7 +11,7 @@ ease deployment of my dotfiles. == Mirrors -This repository lives at https://git.korhonen.cc/FunctionalHacker/dotfiles[My git server], +This repository lives at https://git.korhonen.cc/FunctionalHacker/dotfiles[my git server], but it is also mirrored to: * https://gitlab.com/FunctionalHacker/dotfiles[GitLab] @@ -20,5 +20,4 @@ but it is also mirrored to: * https://codeberg.org/FunctionalHacker/dotfiles[codeberg] If you have any ideas for improvements, questions or anything of this -sort, you can open an issue or a pull request at my git server -(registrations open for anyone), or any of the mirrors. +sort, you can open an issue or a pull request at any of the mirrors. From f1b28a9b2d5df7c9ba5ff7d7cebd0b3373c8ec2f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Aug 2024 15:15:23 +0300 Subject: [PATCH 2536/2667] Update README --- README.adoc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index a83478dc..5e0b5219 100644 --- a/README.adoc +++ b/README.adoc @@ -11,7 +11,7 @@ ease deployment of my dotfiles. == Mirrors -This repository lives at https://git.korhonen.cc/FunctionalHacker/dotfiles[My git server], +This repository lives at https://git.korhonen.cc/FunctionalHacker/dotfiles[my git server], but it is also mirrored to: * https://gitlab.com/FunctionalHacker/dotfiles[GitLab] @@ -20,5 +20,4 @@ but it is also mirrored to: * https://codeberg.org/FunctionalHacker/dotfiles[codeberg] If you have any ideas for improvements, questions or anything of this -sort, you can open an issue or a pull request at my git server -(registrations open for anyone), or any of the mirrors. +sort, you can open an issue or a pull request at any of the mirrors. From 4e4edec9892a8c52c3e7ad87491944643a25d1b3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Aug 2024 15:29:28 +0300 Subject: [PATCH 2537/2667] Nvim: add keybind for alternate file --- home/.config/nvim/lua/keybinds.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index 84e17e5c..6676d121 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -9,6 +9,7 @@ end, { desc = "Toggle background between dark and light" }) vim.keymap.set("n", "h", "nohlsearch", { desc = "Turn off search highlight" }) vim.keymap.set("n", "co", 'silent! execute "%bd|e#|bd#"', { desc = "Close other buffers" }) +vim.keymap.set("n", "a", "e#", { desc = "Edit alternate file" }) vim.keymap.set("n", "", "bnext", { desc = "Next buffer" }) vim.keymap.set("n", "", "bprevious", { desc = "Previous buffer" }) vim.keymap.set("t", "", "", { desc = "Exit terminal insert mode with esc" }) From 1db002a9cb47aed3263ad7808c213a412f8b0a23 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Aug 2024 15:29:28 +0300 Subject: [PATCH 2538/2667] Nvim: add keybind for alternate file --- home/.config/nvim/lua/keybinds.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua index 84e17e5c..6676d121 100644 --- a/home/.config/nvim/lua/keybinds.lua +++ b/home/.config/nvim/lua/keybinds.lua @@ -9,6 +9,7 @@ end, { desc = "Toggle background between dark and light" }) vim.keymap.set("n", "h", "nohlsearch", { desc = "Turn off search highlight" }) vim.keymap.set("n", "co", 'silent! execute "%bd|e#|bd#"', { desc = "Close other buffers" }) +vim.keymap.set("n", "a", "e#", { desc = "Edit alternate file" }) vim.keymap.set("n", "", "bnext", { desc = "Next buffer" }) vim.keymap.set("n", "", "bprevious", { desc = "Previous buffer" }) vim.keymap.set("t", "", "", { desc = "Exit terminal insert mode with esc" }) From 74b2ebd884f231aa992e22366c73ca8e6cc40a5c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 15 Sep 2024 21:02:35 +0300 Subject: [PATCH 2539/2667] Initial nixos configuration --- .husky/pre-commit | 50 - config-root.toml | 256 - config.toml | 273 - configuration.nix | 140 + home/.config/asd => flake.nix | 0 gpg.nix | 24 + hardware-configuration.nix | 42 + home/.Xresources | 21 - home/.abcde.conf | 89 - home/.config/aacs/KEYDB.cfg | 24347 ---------------- home/.config/alacritty/alacritty.yml | 192 - home/.config/aria2/aria2.conf | 9 - home/.config/beets/config.yaml | 39 - home/.config/beets/whitelist | 37 - home/.config/bspwm/bspwmrc | 75 - home/.config/compton/config | 53 - home/.config/dconf.ini | 88 - home/.config/efm-langserver/config.yaml | 6 - home/.config/electron-flags.conf | 2 - home/.config/electron12-flags.conf | 2 - home/.config/environment.d/firefox.conf | 3 - home/.config/environment.d/sway.conf | 14 - home/.config/flashfocus/flashfocus.yml | 8 - home/.config/fontconfig/fonts.conf | 22 - home/.config/foot/foot-light.ini | 45 - home/.config/foot/foot.ini | 44 - home/.config/git/config | 59 - home/.config/gtk-3.0/gtk.css | 4 - home/.config/i3/config | 266 - home/.config/i3/config-teapot | 132 - home/.config/imapnotify/admin@korhonen.cc.js | 19 - .../functionalhacker@korhonen.cc.js | 19 - home/.config/imapnotify/marko@korhonen.cc.js | 19 - home/.config/khal/config | 28 - home/.config/khard/khard.conf | 28 - home/.config/libra/config.toml | 2 - home/.config/mako/config | 12 - home/.config/mimeo/associations.txt | 50 - home/.config/mpDris2/mpDris2.conf | 7 - home/.config/mpd/mpd.conf | 24 - home/.config/mpv/input.conf | 26 - home/.config/mpv/mpv.conf | 109 - home/.config/mpv/script-opts/osc.conf | 1 - home/.config/mpv/scripts/autosub.lua | 30 - home/.config/mpv/scripts/iptv.lua | 505 - home/.config/mpv/scripts/mines.lua | 367 - home/.config/mpv/scripts/redshift_toggle.lua | 43 - home/.config/mpv/scripts/slicing.lua | 145 - home/.config/mpv/scripts/yledl_hook.lua | 76 - home/.config/msmtp/config | 26 - home/.config/ncmpcpp/bindings | 551 - home/.config/ncmpcpp/config | 156 - .../neomutt/accounts/marko@korhonen.cc | 9 - home/.config/neomutt/neomuttrc | 9 - home/.config/networkmanager-dmenu/config.ini | 28 - home/.config/nvim/README.adoc | 16 - home/.config/nvim/ftplugin/java.lua | 111 - home/.config/nvim/init.lua | 28 - home/.config/nvim/lazy-lock.json | 69 - home/.config/nvim/lua/highlight_yank.lua | 12 - home/.config/nvim/lua/keybinds.lua | 15 - home/.config/nvim/lua/lsp_utils.lua | 56 - home/.config/nvim/lua/neovide.lua | 29 - home/.config/nvim/lua/pager.lua | 2 - home/.config/nvim/lua/plugins/alpha.lua | 39 - home/.config/nvim/lua/plugins/asciidoc.lua | 15 - home/.config/nvim/lua/plugins/autopairs.lua | 6 - home/.config/nvim/lua/plugins/bufferline.lua | 16 - home/.config/nvim/lua/plugins/caddyfile.lua | 6 - home/.config/nvim/lua/plugins/cmp.lua | 150 - .../.config/nvim/lua/plugins/confirm-quit.lua | 10 - home/.config/nvim/lua/plugins/copilot.lua | 9 - home/.config/nvim/lua/plugins/diffview.lua | 3 - home/.config/nvim/lua/plugins/dropbar.lua | 6 - home/.config/nvim/lua/plugins/firenvim.lua | 17 - home/.config/nvim/lua/plugins/fugitive.lua | 12 - home/.config/nvim/lua/plugins/gitsigns.lua | 34 - home/.config/nvim/lua/plugins/gnupg.lua | 6 - .../nvim/lua/plugins/indent-blankline.lua | 24 - home/.config/nvim/lua/plugins/kanagawa.lua | 56 - home/.config/nvim/lua/plugins/lazydev.lua | 15 - home/.config/nvim/lua/plugins/lualine.lua | 38 - home/.config/nvim/lua/plugins/luasnip.lua | 19 - .../nvim/lua/plugins/markdown-preview.lua | 10 - home/.config/nvim/lua/plugins/mason.lua | 60 - home/.config/nvim/lua/plugins/mini.lua | 12 - home/.config/nvim/lua/plugins/neoformat.lua | 12 - home/.config/nvim/lua/plugins/noice.lua | 30 - .../nvim/lua/plugins/nvim-colorizer.lua | 6 - home/.config/nvim/lua/plugins/nvim-dap.lua | 123 - home/.config/nvim/lua/plugins/nvim-tree.lua | 25 - home/.config/nvim/lua/plugins/redact_pass.lua | 8 - home/.config/nvim/lua/plugins/statuscol.lua | 16 - home/.config/nvim/lua/plugins/suda.lua | 3 - home/.config/nvim/lua/plugins/telescope.lua | 107 - home/.config/nvim/lua/plugins/treesitter.lua | 153 - home/.config/nvim/lua/plugins/ufo.lua | 28 - home/.config/nvim/lua/plugins/which-key.lua | 20 - home/.config/nvim/lua/settings.lua | 53 - home/.config/nvim/mason-lock.json | 21 - home/.config/nvim/snippets/java.json | 14 - home/.config/nvim/snippets/package.json | 14 - home/.config/pacman/makepkg.conf | 54 - home/.config/paru/paru.conf | 6 - .../pass-git-helper/git-pass-mapping.ini | 9 - home/.config/plasma-workspace/env/wayland.sh | 16 - home/.config/polybar/config | 263 - home/.config/ranger/commands.py | 213 - home/.config/ranger/rc.conf | 50 - home/.config/redshift/redshift.conf | 3 - home/.config/rofi-pass/config | 88 - home/.config/rofi/config.rasi | 150 - home/.config/rtv/rtv.cfg | 162 - home/.config/sway/conf.d/01-vars.conf | 7 - home/.config/sway/conf.d/02-bar.conf | 5 - home/.config/sway/conf.d/03-input.conf | 13 - home/.config/sway/conf.d/04-output.conf | 9 - home/.config/sway/conf.d/05-workspaces.conf | 16 - home/.config/sway/conf.d/06-keybinds.conf | 228 - home/.config/sway/conf.d/07-appearance.conf | 16 - home/.config/sway/conf.d/08-exec.conf | 30 - home/.config/sway/config | 4 - home/.config/sway/scripts/exit.sh | 30 - home/.config/sway/scripts/idle.sh | 13 - home/.config/sway/scripts/lock.sh | 15 - home/.config/sxhkd/sxhkdrc | 209 - home/.config/systemd/user/aria2.service | 11 - home/.config/systemd/user/autorotate.service | 10 - home/.config/systemd/user/autotiling.service | 10 - home/.config/systemd/user/clipman.service | 10 - .../systemd/user/gnome-keyring.service | 10 - .../systemd/user/kdeconnect-indicator.service | 11 - home/.config/systemd/user/kdeconnectd.service | 10 - home/.config/systemd/user/libra.service | 9 - home/.config/systemd/user/mako.service | 11 - home/.config/systemd/user/mpDris2.service | 10 - .../systemd/user/nvim-headless.service | 11 - .../systemd/user/nvim-remote-ssh@.service | 13 - .../.config/systemd/user/polkit-gnome.service | 10 - .../.config/systemd/user/redshift-gtk-service | 10 - home/.config/systemd/user/sway-session.target | 6 - home/.config/systemd/user/sway.service | 17 - home/.config/systemd/user/swayidle.service | 11 - .../systemd/user/telegram-desktop.service | 10 - home/.config/systemd/user/thunderbird.service | 11 - home/.config/systemd/user/trash-empty.service | 6 - home/.config/systemd/user/trash-empty.timer | 9 - home/.config/systemd/user/waybar.service | 11 - home/.config/systemd/user/wob.service | 12 - home/.config/telegram-desktop/lang.strings | 1803 -- home/.config/termite/config | 44 - .../wal/colorschemes/dark/kanagawa.json | 27 - home/.config/wal/templates/colors-foot.ini | 24 - home/.config/waybar/config | 127 - home/.config/waybar/scripts/mediaplayer.py | 126 - home/.config/waybar/style.css | 141 - home/.config/weather-bar/config | 51 - home/.config/wofi/config | 2 - home/.config/youtube-dl/config | 7 - .../youtube-viewer/youtube-viewer.conf | 97 - home/.config/zathura/catppuccin | 37 - home/.config/zathura/zathurarc | 7 - home/.config/zellij/config.kdl | 12 - home/.config/zsh/01-zellij.zsh | 4 - home/.config/zsh/02-env.zsh | 91 - home/.config/zsh/03-plugins.zsh | 56 - home/.config/zsh/04-aliases.zsh | 408 - home/.config/zsh/06-keybinds.zsh | 50 - home/.config/zsh/07-misc.zsh | 5 - home/.config/zsh/08-pacman.zsh | 17 - home/.docker/config.json | 3 - home/.gnupg/gpg-agent.conf | 2 - home/.gnupg/gpg.conf | 2 - home/.gnupg/scdaemon.conf | 1 - home/.hushlogin | 0 home/.ideavimrc | 1 - home/.ignore | 22 - home/.librewolf/librewolf.overrides.cfg | 48 - home/.mailcap | 1 - home/.mbsyncrc | 74 - home/.mpdscribble/mpdscribble.conf | 5 - home/.newsboat/urls | 6 - home/.npmrc | 1 - home/.pam_environment | 2 - home/.ssh/authorized_keys | 1 - home/.ssh/config | 83 - home/.ssh/id_ed25519_yubikey.pub | 1 - home/.tmux.conf | 20 - home/.vdirsyncer/config | 35 - home/.xprofile | 7 - home/.zprofile | 0 home/.zshrc | 3 - package-lock.json | 803 - package.json | 23 - root/.ignore | 3 - root/etc/bluetooth/main.conf | 6 - root/etc/clamav/clamd.conf | 15 - root/etc/clamav/detected.sh | 26 - root/etc/cryptissue | 50 - root/etc/default/cpupower | 6 - root/etc/doas.conf | 7 - root/etc/flexo/flexo.toml | 26 - root/etc/fonts/local.conf | 19 - root/etc/fstab | 21 - root/etc/kernel/cmdline | 7 - root/etc/locale.conf | 2 - root/etc/locale.gen | 4 - root/etc/mkinitcpio.conf | 20 - root/etc/mkinitcpio.d/linux-lts.preset | 7 - root/etc/mkinitcpio.d/linux.preset | 7 - root/etc/pacman.conf | 35 - root/etc/pacman.d/hooks/zsh.hook | 11 - root/etc/pacserve/pacserve.service.conf | 1 - root/etc/plymouth/plymouthd.conf | 7 - root/etc/profile.d/freetype2.sh | 12 - root/etc/ssh/sshd_config | 14 - root/etc/sudoers.d/pacman | 1 - root/etc/sysctl.d/20-quiet-printk.conf | 1 - root/etc/sysctl.d/99-sysctl.conf | 1 - root/etc/systemd/logind.conf | 5 - root/etc/systemd/network/01-wired.network | 8 - root/etc/systemd/network/02-wireless.network | 8 - root/etc/systemd/networkd.conf | 3 - root/etc/systemd/sleep.conf | 5 - root/etc/systemd/system.conf | 2 - root/etc/systemd/system/adb.service | 11 - .../system/getty@tty6.service.d/override.conf | 3 - root/etc/systemd/system/qbittorrent.service | 10 - root/etc/systemd/timesyncd.conf | 3 - root/etc/udev/rules.d/20-yubikey.rules | 1 - .../udev/rules.d/60-uinput-permissions.rules | 1 - .../udev/rules.d/99-conbee-usb-serial.rules | 1 - root/etc/udev/rules.d/99-lowbat.rules | 2 - root/etc/vconsole.conf | 17 - root/etc/welcomemessage.conf | 1 - root/usr/local/bin/sway-run.sh | 45 - root/usr/local/bin/thunderbird | 1 - scripts/autorotate.sh | 22 - scripts/checkupdates.sh | 12 - scripts/hibernate-lowbattery.sh | 9 - scripts/mail/notify-new-mail.sh | 23 - scripts/media/imageviewer | 29 - scripts/media/imgurviewer | 11 - scripts/media/mpvqueue | 30 - secrets/.gitignore | 1 - secrets/env | 25 - secrets/secrets.sh | 33 - 247 files changed, 206 insertions(+), 36718 deletions(-) delete mode 100755 .husky/pre-commit delete mode 100644 config-root.toml delete mode 100644 config.toml create mode 100644 configuration.nix rename home/.config/asd => flake.nix (100%) create mode 100644 gpg.nix create mode 100644 hardware-configuration.nix delete mode 100644 home/.Xresources delete mode 100644 home/.abcde.conf delete mode 100644 home/.config/aacs/KEYDB.cfg delete mode 100644 home/.config/alacritty/alacritty.yml delete mode 100644 home/.config/aria2/aria2.conf delete mode 100644 home/.config/beets/config.yaml delete mode 100644 home/.config/beets/whitelist delete mode 100755 home/.config/bspwm/bspwmrc delete mode 100644 home/.config/compton/config delete mode 100644 home/.config/dconf.ini delete mode 100644 home/.config/efm-langserver/config.yaml delete mode 100644 home/.config/electron-flags.conf delete mode 100644 home/.config/electron12-flags.conf delete mode 100644 home/.config/environment.d/firefox.conf delete mode 100644 home/.config/environment.d/sway.conf delete mode 100644 home/.config/flashfocus/flashfocus.yml delete mode 100644 home/.config/fontconfig/fonts.conf delete mode 100644 home/.config/foot/foot-light.ini delete mode 100644 home/.config/foot/foot.ini delete mode 100644 home/.config/git/config delete mode 100644 home/.config/gtk-3.0/gtk.css delete mode 100644 home/.config/i3/config delete mode 100644 home/.config/i3/config-teapot delete mode 100644 home/.config/imapnotify/admin@korhonen.cc.js delete mode 100644 home/.config/imapnotify/functionalhacker@korhonen.cc.js delete mode 100644 home/.config/imapnotify/marko@korhonen.cc.js delete mode 100644 home/.config/khal/config delete mode 100644 home/.config/khard/khard.conf delete mode 100644 home/.config/libra/config.toml delete mode 100644 home/.config/mako/config delete mode 100644 home/.config/mimeo/associations.txt delete mode 100644 home/.config/mpDris2/mpDris2.conf delete mode 100644 home/.config/mpd/mpd.conf delete mode 100644 home/.config/mpv/input.conf delete mode 100644 home/.config/mpv/mpv.conf delete mode 100644 home/.config/mpv/script-opts/osc.conf delete mode 100644 home/.config/mpv/scripts/autosub.lua delete mode 100644 home/.config/mpv/scripts/iptv.lua delete mode 100644 home/.config/mpv/scripts/mines.lua delete mode 100644 home/.config/mpv/scripts/redshift_toggle.lua delete mode 100644 home/.config/mpv/scripts/slicing.lua delete mode 100644 home/.config/mpv/scripts/yledl_hook.lua delete mode 100644 home/.config/msmtp/config delete mode 100644 home/.config/ncmpcpp/bindings delete mode 100644 home/.config/ncmpcpp/config delete mode 100644 home/.config/neomutt/accounts/marko@korhonen.cc delete mode 100644 home/.config/neomutt/neomuttrc delete mode 100644 home/.config/networkmanager-dmenu/config.ini delete mode 100644 home/.config/nvim/README.adoc delete mode 100644 home/.config/nvim/ftplugin/java.lua delete mode 100644 home/.config/nvim/init.lua delete mode 100644 home/.config/nvim/lazy-lock.json delete mode 100644 home/.config/nvim/lua/highlight_yank.lua delete mode 100644 home/.config/nvim/lua/keybinds.lua delete mode 100644 home/.config/nvim/lua/lsp_utils.lua delete mode 100644 home/.config/nvim/lua/neovide.lua delete mode 100644 home/.config/nvim/lua/pager.lua delete mode 100644 home/.config/nvim/lua/plugins/alpha.lua delete mode 100644 home/.config/nvim/lua/plugins/asciidoc.lua delete mode 100644 home/.config/nvim/lua/plugins/autopairs.lua delete mode 100644 home/.config/nvim/lua/plugins/bufferline.lua delete mode 100644 home/.config/nvim/lua/plugins/caddyfile.lua delete mode 100644 home/.config/nvim/lua/plugins/cmp.lua delete mode 100644 home/.config/nvim/lua/plugins/confirm-quit.lua delete mode 100644 home/.config/nvim/lua/plugins/copilot.lua delete mode 100644 home/.config/nvim/lua/plugins/diffview.lua delete mode 100644 home/.config/nvim/lua/plugins/dropbar.lua delete mode 100644 home/.config/nvim/lua/plugins/firenvim.lua delete mode 100644 home/.config/nvim/lua/plugins/fugitive.lua delete mode 100644 home/.config/nvim/lua/plugins/gitsigns.lua delete mode 100644 home/.config/nvim/lua/plugins/gnupg.lua delete mode 100644 home/.config/nvim/lua/plugins/indent-blankline.lua delete mode 100644 home/.config/nvim/lua/plugins/kanagawa.lua delete mode 100644 home/.config/nvim/lua/plugins/lazydev.lua delete mode 100644 home/.config/nvim/lua/plugins/lualine.lua delete mode 100644 home/.config/nvim/lua/plugins/luasnip.lua delete mode 100644 home/.config/nvim/lua/plugins/markdown-preview.lua delete mode 100644 home/.config/nvim/lua/plugins/mason.lua delete mode 100644 home/.config/nvim/lua/plugins/mini.lua delete mode 100644 home/.config/nvim/lua/plugins/neoformat.lua delete mode 100644 home/.config/nvim/lua/plugins/noice.lua delete mode 100644 home/.config/nvim/lua/plugins/nvim-colorizer.lua delete mode 100644 home/.config/nvim/lua/plugins/nvim-dap.lua delete mode 100644 home/.config/nvim/lua/plugins/nvim-tree.lua delete mode 100644 home/.config/nvim/lua/plugins/redact_pass.lua delete mode 100644 home/.config/nvim/lua/plugins/statuscol.lua delete mode 100644 home/.config/nvim/lua/plugins/suda.lua delete mode 100644 home/.config/nvim/lua/plugins/telescope.lua delete mode 100644 home/.config/nvim/lua/plugins/treesitter.lua delete mode 100644 home/.config/nvim/lua/plugins/ufo.lua delete mode 100644 home/.config/nvim/lua/plugins/which-key.lua delete mode 100644 home/.config/nvim/lua/settings.lua delete mode 100644 home/.config/nvim/mason-lock.json delete mode 100644 home/.config/nvim/snippets/java.json delete mode 100644 home/.config/nvim/snippets/package.json delete mode 100644 home/.config/pacman/makepkg.conf delete mode 100644 home/.config/paru/paru.conf delete mode 100644 home/.config/pass-git-helper/git-pass-mapping.ini delete mode 100644 home/.config/plasma-workspace/env/wayland.sh delete mode 100644 home/.config/polybar/config delete mode 100755 home/.config/ranger/commands.py delete mode 100644 home/.config/ranger/rc.conf delete mode 100644 home/.config/redshift/redshift.conf delete mode 100644 home/.config/rofi-pass/config delete mode 100644 home/.config/rofi/config.rasi delete mode 100644 home/.config/rtv/rtv.cfg delete mode 100644 home/.config/sway/conf.d/01-vars.conf delete mode 100644 home/.config/sway/conf.d/02-bar.conf delete mode 100644 home/.config/sway/conf.d/03-input.conf delete mode 100644 home/.config/sway/conf.d/04-output.conf delete mode 100644 home/.config/sway/conf.d/05-workspaces.conf delete mode 100644 home/.config/sway/conf.d/06-keybinds.conf delete mode 100644 home/.config/sway/conf.d/07-appearance.conf delete mode 100644 home/.config/sway/conf.d/08-exec.conf delete mode 100644 home/.config/sway/config delete mode 100755 home/.config/sway/scripts/exit.sh delete mode 100755 home/.config/sway/scripts/idle.sh delete mode 100755 home/.config/sway/scripts/lock.sh delete mode 100644 home/.config/sxhkd/sxhkdrc delete mode 100644 home/.config/systemd/user/aria2.service delete mode 100644 home/.config/systemd/user/autorotate.service delete mode 100644 home/.config/systemd/user/autotiling.service delete mode 100644 home/.config/systemd/user/clipman.service delete mode 100644 home/.config/systemd/user/gnome-keyring.service delete mode 100644 home/.config/systemd/user/kdeconnect-indicator.service delete mode 100644 home/.config/systemd/user/kdeconnectd.service delete mode 100644 home/.config/systemd/user/libra.service delete mode 100644 home/.config/systemd/user/mako.service delete mode 100644 home/.config/systemd/user/mpDris2.service delete mode 100644 home/.config/systemd/user/nvim-headless.service delete mode 100644 home/.config/systemd/user/nvim-remote-ssh@.service delete mode 100644 home/.config/systemd/user/polkit-gnome.service delete mode 100644 home/.config/systemd/user/redshift-gtk-service delete mode 100644 home/.config/systemd/user/sway-session.target delete mode 100644 home/.config/systemd/user/sway.service delete mode 100644 home/.config/systemd/user/swayidle.service delete mode 100644 home/.config/systemd/user/telegram-desktop.service delete mode 100644 home/.config/systemd/user/thunderbird.service delete mode 100644 home/.config/systemd/user/trash-empty.service delete mode 100644 home/.config/systemd/user/trash-empty.timer delete mode 100644 home/.config/systemd/user/waybar.service delete mode 100644 home/.config/systemd/user/wob.service delete mode 100644 home/.config/telegram-desktop/lang.strings delete mode 100644 home/.config/termite/config delete mode 100644 home/.config/wal/colorschemes/dark/kanagawa.json delete mode 100644 home/.config/wal/templates/colors-foot.ini delete mode 100644 home/.config/waybar/config delete mode 100755 home/.config/waybar/scripts/mediaplayer.py delete mode 100644 home/.config/waybar/style.css delete mode 100644 home/.config/weather-bar/config delete mode 100644 home/.config/wofi/config delete mode 100644 home/.config/youtube-dl/config delete mode 100644 home/.config/youtube-viewer/youtube-viewer.conf delete mode 100644 home/.config/zathura/catppuccin delete mode 100644 home/.config/zathura/zathurarc delete mode 100644 home/.config/zellij/config.kdl delete mode 100644 home/.config/zsh/01-zellij.zsh delete mode 100644 home/.config/zsh/02-env.zsh delete mode 100644 home/.config/zsh/03-plugins.zsh delete mode 100644 home/.config/zsh/04-aliases.zsh delete mode 100644 home/.config/zsh/06-keybinds.zsh delete mode 100644 home/.config/zsh/07-misc.zsh delete mode 100644 home/.config/zsh/08-pacman.zsh delete mode 100644 home/.docker/config.json delete mode 100644 home/.gnupg/gpg-agent.conf delete mode 100644 home/.gnupg/gpg.conf delete mode 100644 home/.gnupg/scdaemon.conf delete mode 100644 home/.hushlogin delete mode 100644 home/.ideavimrc delete mode 100644 home/.ignore delete mode 100644 home/.librewolf/librewolf.overrides.cfg delete mode 100644 home/.mailcap delete mode 100644 home/.mbsyncrc delete mode 100644 home/.mpdscribble/mpdscribble.conf delete mode 100644 home/.newsboat/urls delete mode 100644 home/.npmrc delete mode 100644 home/.pam_environment delete mode 100644 home/.ssh/authorized_keys delete mode 100644 home/.ssh/config delete mode 100644 home/.ssh/id_ed25519_yubikey.pub delete mode 100644 home/.tmux.conf delete mode 100644 home/.vdirsyncer/config delete mode 100644 home/.xprofile delete mode 100644 home/.zprofile delete mode 100644 home/.zshrc delete mode 100644 package-lock.json delete mode 100644 package.json delete mode 100644 root/.ignore delete mode 100755 root/etc/bluetooth/main.conf delete mode 100755 root/etc/clamav/clamd.conf delete mode 100755 root/etc/clamav/detected.sh delete mode 100755 root/etc/cryptissue delete mode 100644 root/etc/default/cpupower delete mode 100644 root/etc/doas.conf delete mode 100644 root/etc/flexo/flexo.toml delete mode 100644 root/etc/fonts/local.conf delete mode 100644 root/etc/fstab delete mode 100644 root/etc/kernel/cmdline delete mode 100755 root/etc/locale.conf delete mode 100755 root/etc/locale.gen delete mode 100644 root/etc/mkinitcpio.conf delete mode 100644 root/etc/mkinitcpio.d/linux-lts.preset delete mode 100644 root/etc/mkinitcpio.d/linux.preset delete mode 100755 root/etc/pacman.conf delete mode 100644 root/etc/pacman.d/hooks/zsh.hook delete mode 100755 root/etc/pacserve/pacserve.service.conf delete mode 100644 root/etc/plymouth/plymouthd.conf delete mode 100644 root/etc/profile.d/freetype2.sh delete mode 100644 root/etc/ssh/sshd_config delete mode 100644 root/etc/sudoers.d/pacman delete mode 100644 root/etc/sysctl.d/20-quiet-printk.conf delete mode 100644 root/etc/sysctl.d/99-sysctl.conf delete mode 100644 root/etc/systemd/logind.conf delete mode 100644 root/etc/systemd/network/01-wired.network delete mode 100644 root/etc/systemd/network/02-wireless.network delete mode 100644 root/etc/systemd/networkd.conf delete mode 100644 root/etc/systemd/sleep.conf delete mode 100644 root/etc/systemd/system.conf delete mode 100755 root/etc/systemd/system/adb.service delete mode 100644 root/etc/systemd/system/getty@tty6.service.d/override.conf delete mode 100644 root/etc/systemd/system/qbittorrent.service delete mode 100644 root/etc/systemd/timesyncd.conf delete mode 100644 root/etc/udev/rules.d/20-yubikey.rules delete mode 100644 root/etc/udev/rules.d/60-uinput-permissions.rules delete mode 100644 root/etc/udev/rules.d/99-conbee-usb-serial.rules delete mode 100644 root/etc/udev/rules.d/99-lowbat.rules delete mode 100644 root/etc/vconsole.conf delete mode 100755 root/etc/welcomemessage.conf delete mode 100755 root/usr/local/bin/sway-run.sh delete mode 100755 root/usr/local/bin/thunderbird delete mode 100755 scripts/autorotate.sh delete mode 100755 scripts/checkupdates.sh delete mode 100755 scripts/hibernate-lowbattery.sh delete mode 100755 scripts/mail/notify-new-mail.sh delete mode 100755 scripts/media/imageviewer delete mode 100755 scripts/media/imgurviewer delete mode 100755 scripts/media/mpvqueue delete mode 100644 secrets/.gitignore delete mode 100755 secrets/env delete mode 100755 secrets/secrets.sh diff --git a/.husky/pre-commit b/.husky/pre-commit deleted file mode 100755 index 79df10e4..00000000 --- a/.husky/pre-commit +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -# Source husky -# shellcheck disable=SC1091 -. "$(dirname -- "$0")/_/husky.sh" - -echo "FunctionalHacker's dotfile pre-commit hook start" -printf "Using shell: %s \n" "$(readlink /proc/$$/exe)" - -# All staged files -staged_files=$(git diff --name-only --cached --diff-filter=d) - -# Run taplo on staged TOML files -staged_toml=$(echo "$staged_files" | grep '.toml$' || true) -num_staged_toml=$(echo "$staged_toml" | grep -vce '^$' || true) -if [ "$num_staged_toml" -gt 0 ]; then - printf '\nFormatting %s staged TOML files with taplo\n' "$num_staged_toml" - taplo format "$staged_toml" - printf "Re-staging\n" - git add $staged_toml -fi - -# Run lua-format on staged Lua files -staged_lua=$(echo "$staged_files" | grep '.lua$' || true) -num_staged_lua=$(echo "$staged_lua" | grep -vce '^$' || true) -if [ "$num_staged_lua" -gt 0 ]; then - printf '\nFormatting %s staged Lua files with stylua\n' "$num_staged_lua" - - for file in $staged_lua; do - stylua "$file" - done - - printf "Re-staging\n\n" - git add $staged_lua -fi - -# Run shfmt on staged shell scripts -staged_sh=$(echo "$staged_files" | grep -E '(.sh$|pre-commit)' || true) -num_staged_sh=$(echo "$staged_sh" | grep -vce '^$' || true) -if [ "$num_staged_sh" -gt 0 ]; then - printf '\nFormatting %s staged shell scripts with shfmt\n' "$num_staged_sh" - shfmt -w $staged_sh - printf "Re-staging\n\n" - git add $staged_sh -fi - -# Run prettier on all other staged files -# that are supported -printf "\nRunning prettier on all supported files\n" -npx pretty-quick --staged diff --git a/config-root.toml b/config-root.toml deleted file mode 100644 index 04a8fd24..00000000 --- a/config-root.toml +++ /dev/null @@ -1,256 +0,0 @@ -[config] -backup = true -banner = true -create = true -dotpath = "root" -ignoreempty = false -keepdot = true -link_dotfile_default = "nolink" -link_on_import = "nolink" -longkey = false -showdiff = false -workdir = "~/.config/sdotdrop" - -[dotfiles."f_60-uinput-permissions.rules"] -dst = "/etc/udev/rules.d/60-uinput-permissions.rules" -src = "etc/udev/rules.d/60-uinput-permissions.rules" - -[dotfiles."f_yubikey_udev.rules"] -dst = "/etc/udev/rules.d/20-yubikey.rules" -src = "etc/udev/rules.d/20-yubikey.rules" - -[dotfiles.d_bin] -dst = "/usr/local/bin" -src = "usr/local/bin" - -[dotfiles.d_network] -src = "etc/systemd/network" -dst = "/etc/systemd/network" - -[dotfiles."f_networkd.conf"] -src = "etc/systemd/networkd.conf" -dst = "/etc/systemd/networkd.conf" - -[dotfiles."f_99-sysctl.conf"] -dst = "/etc/sysctl.d/99-sysctl.conf" -src = "etc/sysctl.d/99-sysctl.conf" - -[dotfiles."f_adb.service"] -dst = "/etc/systemd/system/adb.service" -src = "etc/systemd/system/adb.service" - -[dotfiles."f_clamd.conf"] -dst = "/etc/clamav/clamd.conf" -src = "etc/clamav/clamd.conf" - -[dotfiles.f_cryptissue] -dst = "/etc/cryptissue" -src = "etc/cryptissue" - -[dotfiles."f_detected.sh"] -dst = "/etc/clamav/detected.sh" -src = "etc/clamav/detected.sh" - -[dotfiles."f_freetype2.sh"] -dst = "/etc/profile.d/freetype2.sh" -src = "etc/profile.d/freetype2.sh" - -[dotfiles."f_fonts.conf"] -dst = "/etc/fonts/local.conf" -src = "etc/fonts/local.conf" - -[dotfiles."f_locale.conf"] -dst = "/etc/locale.conf" -src = "etc/locale.conf" - -[dotfiles."f_locale.gen"] -dst = "/etc/locale.gen" -src = "etc/locale.gen" - -[dotfiles."f_logind.conf"] -dst = "/etc/systemd/logind.conf" -src = "etc/systemd/logind.conf" - -[dotfiles."f_bluetooth.conf"] -dst = "/etc/bluetooth/main.conf" -src = "etc/bluetooth/main.conf" - -[dotfiles."f_pacman.conf"] -dst = "/etc/pacman.conf" -src = "etc/pacman.conf" - -[dotfiles.f_pacman_zsh_hook] -dst = "/etc/pacman.d/hooks/zsh.hook" -src = "etc/pacman.d/hooks/zsh.hook" - -[dotfiles."f_plymouthd.conf"] -src = "etc/plymouth/plymouthd.conf" -dst = "/etc/plymouth/plymouthd.conf" - -[dotfiles.f_sshd_config] -dst = "/etc/ssh/sshd_config" -src = "etc/ssh/sshd_config" - -[dotfiles."f_welcomemessage.conf"] -dst = "/etc/welcomemessage.conf" -src = "etc/welcomemessage.conf" - -[dotfiles."f_99-conbee-usb-serial.rules"] -src = "etc/udev/rules.d/99-conbee-usb-serial.rules" -dst = "/etc/udev/rules.d/99-conbee-usb-serial.rules" - -[dotfiles."f_99-lowbat.rules"] -src = "etc/udev/rules.d/99-lowbat.rules" -dst = "/etc/udev/rules.d/99-lowbat.rules" - -[dotfiles."f_sleep.conf"] -src = "etc/systemd/sleep.conf" -dst = "/etc/systemd/sleep.conf" - -[dotfiles.f_fstab] -src = "etc/fstab" -dst = "/etc/fstab" - -[dotfiles.f_ignore] -src = ".ignore" -dst = "/.ignore" - -[dotfiles."f_mkinitcpio.conf"] -src = "etc/mkinitcpio.conf" -dst = "/etc/mkinitcpio.conf" - -[dotfiles."f_vconsole.conf"] -src = "etc/vconsole.conf" -dst = "/etc/vconsole.conf" - -[dotfiles."f_20-quiet-printk.conf"] -src = "etc/sysctl.d/20-quiet-printk.conf" -dst = "/etc/sysctl.d/20-quiet-printk.conf" - -[dotfiles."f_system.conf"] -src = "etc/systemd/system.conf" -dst = "/etc/systemd/system.conf" - -[dotfiles.f_cpupower] -src = "etc/default/cpupower" -dst = "/etc/default/cpupower" - -[dotfiles."f_pacserve.service.conf"] -src = "etc/pacserve/pacserve.service.conf" -dst = "/etc/pacserve/pacserve.service.conf" - -[dotfiles."f_mkinitcpio_linux.preset"] -src = "etc/mkinitcpio.d/linux.preset" -dst = "/etc/mkinitcpio.d/linux.preset" - -[dotfiles.f_cmdline] -src = "etc/kernel/cmdline" -dst = "/etc/kernel/cmdline" - -[dotfiles."f_timesyncd.conf"] -src = "etc/systemd/timesyncd.conf" -dst = "/etc/systemd/timesyncd.conf" - -[dotfiles.f_sudoers_pacman] -src = "etc/sudoers.d/pacman" -dst = "/etc/sudoers.d/pacman" - -[dotfiles."f_doas.conf"] -src = "etc/doas.conf" -dst = "/etc/doas.conf" - -[dotfiles."f_flexo.toml"] -src = "etc/flexo/flexo.toml" -dst = "/etc/flexo/flexo.toml" - -[profiles.Locale] -dotfiles = ["f_locale.conf", "f_locale.gen"] - -[profiles.Pacman] -dotfiles = [ - "f_pacman.conf", - "f_pacman_zsh_hook", - "f_pacserve.service.conf", - "f_sudoers_pacman", -] - -[profiles.Mirkwood] -dotfiles = [ - "d_bin", - "f_20-quiet-printk.conf", - "f_60-uinput-permissions.rules", - "f_99-lowbat.rules", - "f_adb.service", - "f_bluetooth.conf", - "f_cmdline", - "f_cpupower", - "f_cryptissue", - "f_doas.conf", - "f_fonts.conf", - "f_freetype2.sh", - "f_ignore", - "f_logind.conf", - "f_mkinitcpio.conf", - "f_mkinitcpio_linux.preset", - "f_plymouthd.conf", - "f_sshd_config", - "f_system.conf", - "f_timesyncd.conf", - "f_welcomemessage.conf", - "f_flexo.toml", -] -include = ["Locale", "Pacman"] - -[profiles.Shire] -dotfiles = [ - "d_bin", - "f_20-quiet-printk.conf", - "f_60-uinput-permissions.rules", - "f_99-lowbat.rules", - "f_adb.service", - "f_bluetooth.conf", - "f_cmdline", - "f_cpupower", - "f_doas.conf", - "f_fonts.conf", - "f_freetype2.sh", - "f_ignore", - "f_logind.conf", - "f_mkinitcpio.conf", - "f_mkinitcpio_linux.preset", - "f_plymouthd.conf", - "f_sshd_config", - "f_system.conf", -] -include = ["Locale"] - -[profiles.Moria] -include = ["Locale", "Pacman"] -dotfiles = [ - "f_99-sysctl.conf", - "f_cmdline", - "f_cpupower", - "f_doas.conf", - "f_adb.service", - "f_mkinitcpio.conf", - "f_mkinitcpio_linux.preset", - "f_plymouthd.conf", - "f_sshd_config", - "f_flexo.toml", -] - -[profiles.Tirion] -dotfiles = ["f_doas.conf", "f_ignore", "f_sshd_config"] - -[profiles.Gondor] -include = ["Locale", "Pacman"] -dotfiles = ["f_doas.conf", "f_sshd_config"] - -[profiles.localhost] -include = ["Locale"] - -[profiles.Edoras] -include = ["Pacman"] - -[profiles.mko-laptop] -dotfiles = ["f_cpupower", "f_doas.conf", "f_timesyncd.conf"] diff --git a/config.toml b/config.toml deleted file mode 100644 index 00ecb92a..00000000 --- a/config.toml +++ /dev/null @@ -1,273 +0,0 @@ -#:schema ../../dotdrop-config-schema.json - -[actions] -dconf-load = "dconf load / < ~/.config/dconf.ini" -kanagawa-compile = "vim +KanagawaCompile +qa" - -[config] -backup = true -banner = true -create = true -dotpath = "home" -ignoreempty = false -keepdot = true -link_dotfile_default = "nolink" -link_on_import = "nolink" -longkey = false -showdiff = false -workdir = "~/.config/dotdrop" - -[dotfiles.d_systemd] -dst = "~/.config/systemd/user" -src = ".config/systemd/user" - -[dotfiles.d_mpv] -dst = "~/.config/mpv" -src = ".config/mpv" - -[dotfiles.d_nvim] -dst = "~/.config/nvim" -src = ".config/nvim" -actions = ["kanagawa-compile"] -instignore = ["*-lock.json"] - -[dotfiles."f_abcde.conf"] -dst = "~/.abcde.conf" -src = ".abcde.conf" - -[dotfiles.d_ssh] -dst = "~/.ssh" -src = ".ssh" - -[dotfiles.f_beets_config] -dst = "~/.config/beets/config.yaml" -src = ".config/beets/config.yaml" - -[dotfiles.f_beets_whitelist] -dst = "~/.config/beets/whitelist" -src = ".config/beets/whitelist" - -[dotfiles.f_gitconfig] -dst = "~/.config/git/config" -src = ".config/git/config" - -[dotfiles.f_librewolf_overrides] -dst = "~/.librewolf/librewolf.overrides.cfg" -src = ".librewolf/librewolf.overrides.cfg" - -[dotfiles."f_makepkg.conf"] -dst = "~/.config/pacman/makepkg.conf" -src = ".config/pacman/makepkg.conf" - -[dotfiles."f_mpd.conf"] -dst = "~/.config/mpd/mpd.conf" -src = ".config/mpd/mpd.conf" - -[dotfiles."f_mpdris2.conf"] -dst = "~/.config/mpDris2/mpDris2.conf" -src = ".config/mpDris2/mpDris2.conf" - -[dotfiles.f_ncmpcpp_bindings] -dst = "~/.config/ncmpcpp/bindings" -src = ".config/ncmpcpp/bindings" - -[dotfiles."f_ranger.conf"] -dst = "~/.config/ranger/rc.conf" -src = ".config/ranger/rc.conf" - -[dotfiles."f_ranger_commands.py"] -dst = "~/.config/ranger/commands.py" -src = ".config/ranger/commands.py" - -[dotfiles."f_ssh.conf"] -dst = "~/.ssh/config" -src = ".ssh/config" - -[dotfiles.f_zprofile] -dst = "~/.zprofile" -src = ".zprofile" - -[dotfiles.f_zshrc] -dst = "~/.zshrc" -src = ".zshrc" - -[dotfiles.d_zsh] -src = ".config/zsh" -dst = "~/.config/zsh" - -[dotfiles."f_fonts.conf"] -src = ".config/fontconfig/fonts.conf" -dst = "~/.config/fontconfig/fonts.conf" - -[dotfiles.f_ignore] -src = ".ignore" -dst = "~/.ignore" - -[dotfiles."f_ncmpcpp.conf"] -src = ".config/ncmpcpp/config" -dst = "~/.config/ncmpcpp/config" - -[dotfiles.f_hushlogin] -src = ".hushlogin" -dst = "~/.hushlogin" - -[dotfiles."f_paru.conf"] -src = ".config/paru/paru.conf" -dst = "~/.config/paru/paru.conf" - -[dotfiles."f_foot.ini"] -src = ".config/foot/foot.ini" -dst = "~/.config/foot/foot.ini" - -[dotfiles."f_gpg-agent.conf"] -src = ".gnupg/gpg-agent.conf" -dst = "~/.gnupg/gpg-agent.conf" -chmod = "600" - -[dotfiles."f_gpg.conf"] -src = ".gnupg/gpg.conf" -dst = "~/.gnupg/gpg.conf" - -[dotfiles."f_gpg_scdaemon.conf"] -src = ".gnupg/scdaemon.conf" -dst = "~/.gnupg/scdaemon.conf" - -[dotfiles."f_electron-flags.conf"] -src = ".config/electron-flags.conf" -dst = "~/.config/electron-flags.conf" - -[dotfiles."f_electron12-flags.conf"] -src = ".config/electron12-flags.conf" -dst = "~/.config/electron12-flags.conf" - -[dotfiles.f_pam_environment] -src = ".pam_environment" -dst = "~/.pam_environment" - -[dotfiles."f_dconf.ini"] -src = ".config/dconf.ini" -dst = "~/.config/dconf.ini" -actions = ["dconf-load"] - -[dotfiles."f_docker-config.json"] -src = ".docker/config.json" -dst = "~/.docker/config.json" -chmod = "600" - -[dotfiles.f_npmrc] -src = ".npmrc" -dst = "~/.npmrc" -chmod = "600" - -[dotfiles.f_zellij] -src = ".config/zellij/config.kdl" -dst = "~/.config/zellij/config.kdl" - -[profiles.pacman] -dotfiles = ["f_makepkg.conf", "f_paru.conf"] - -[profiles.terminal] -dotfiles = [ - "d_nvim", - "d_ssh", - "d_zsh", - "f_gitconfig", - "f_hushlogin", - "f_ignore", - "f_ranger.conf", - "f_ranger_commands.py", - "f_zellij", - "f_zshrc", - "f_npmrc", -] - -[profiles.media] -dotfiles = [ - "d_mpv", - "f_abcde.conf", - "f_beets_config", - "f_beets_whitelist", - "f_mpd.conf", - "f_mpdris2.conf", - "f_ncmpcpp.conf", - "f_ncmpcpp_bindings", -] - -[profiles.gpg] -dotfiles = [ - "f_gpg-agent.conf", - "f_gpg.conf", - "f_gpg_scdaemon.conf", - "f_pam_environment", -] - -[profiles.Mirkwood] -include = ["pacman", "terminal", "media", "gpg"] -dotfiles = [ - "f_librewolf_overrides", - "f_dconf.ini", - "f_docker-config.json", - "f_fonts.conf", - "f_foot.ini", -] - -[profiles.Mirkwood.variables] -wayland = true - -[profiles.Shire] -include = ["pacman", "terminal", "media", "gpg"] -dotfiles = [ - "f_dconf.ini", - "f_fonts.conf", -] - -[profiles.Shire.variables] -wayland = true - -[profiles.Moria] -include = ["pacman", "terminal", "media", "gpg"] -dotfiles = [ - "f_librewolf_overrides", - "f_dconf.ini", - "f_zprofile", - "f_fonts.conf", - "d_systemd", -] - -[profiles.Moria.variables] -wayland = true - -[profiles.Tirion] -include = ["terminal", "gpg"] - -[profiles.Gondor] -include = ["pacman", "terminal"] - -[profiles.mko-laptop] -include = ["terminal", "media", "gpg"] -dotfiles = ["f_librewolf_overrides", "f_dconf.ini", "d_systemd"] - -[profiles.mko-laptop.variables] -wayland = true -scale_factor = 1.25 - -[profiles.Isengard] -include = ["terminal"] - -[profiles.Isengard.variables] -distro_id = "termux" - -[profiles.Edoras] -include = ["terminal"] - -[profiles.TakamakiPC] -include = ["terminal"] - -[profiles.TakamakiPC.variables] -wayland = false - -[profiles.localhost] -include = ["terminal"] - -[profiles.ViiruJaTeippi] -include = ["terminal"] diff --git a/configuration.nix b/configuration.nix new file mode 100644 index 00000000..8a12708d --- /dev/null +++ b/configuration.nix @@ -0,0 +1,140 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ./gpg.nix + ]; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + boot.initrd.luks.devices."luks-cf2ca44e-d8d1-4ec8-a072-921f29ed693d".device = "/dev/disk/by-uuid/cf2ca44e-d8d1-4ec8-a072-921f29ed693d"; + networking.hostName = "Mirkwood"; # Define your hostname. + networking.wireless.iwd.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable networking + networking.networkmanager.enable = true; + networking.networkmanager.wifi.backend = "iwd"; + + # Set your time zone. + time.timeZone = "Europe/Helsinki"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "fi_FI.UTF-8"; + LC_IDENTIFICATION = "fi_FI.UTF-8"; + LC_MEASUREMENT = "fi_FI.UTF-8"; + LC_MONETARY = "fi_FI.UTF-8"; + LC_NAME = "fi_FI.UTF-8"; + LC_NUMERIC = "fi_FI.UTF-8"; + LC_PAPER = "fi_FI.UTF-8"; + LC_TELEPHONE = "fi_FI.UTF-8"; + LC_TIME = "fi_FI.UTF-8"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the GNOME Desktop Environment. + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "us"; + variant = ""; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.functionalhacker = { + isNormalUser = true; + description = "Marko Korhonen"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; [ + # thunderbird + ]; + }; + + # Install firefox. + programs.firefox.enable = true; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + neovim + telegram-desktop + zsh + neofetch + usbutils + wl-clipboard + git + ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "24.05"; # Did you read the comment? + +} diff --git a/home/.config/asd b/flake.nix similarity index 100% rename from home/.config/asd rename to flake.nix diff --git a/gpg.nix b/gpg.nix new file mode 100644 index 00000000..0edd476d --- /dev/null +++ b/gpg.nix @@ -0,0 +1,24 @@ +{ config, lib, pkgs, ... }: + +{ + programs = { + ssh.startAgent = false; + gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + }; + + services = { + pcscd.enable = true; + udev.packages = [ + pkgs.yubikey-personalization + ]; + }; + + environment.shellInit = '' + gpg-connect-agent /bye + export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) + export MARKON_MUUTTUJA="test" + ''; +} diff --git a/hardware-configuration.nix b/hardware-configuration.nix new file mode 100644 index 00000000..7003d571 --- /dev/null +++ b/hardware-configuration.nix @@ -0,0 +1,42 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/fcb4b991-0704-45c0-9d31-bd858e1476aa"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-2d20d058-3ea8-41cf-90fa-872f46960add".device = "/dev/disk/by-uuid/2d20d058-3ea8-41cf-90fa-872f46960add"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/8498-FFAF"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/dba8a94b-d7b6-4ac1-a0bb-82d6538ff331"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/home/.Xresources b/home/.Xresources deleted file mode 100644 index 0c8e48b9..00000000 --- a/home/.Xresources +++ /dev/null @@ -1,21 +0,0 @@ -! Snazzy - Converted from https://github.com/sindresorhus/iterm2-snazzy -! using https://github.com/richo/itermcolors2xdefaults -URxvt*background: #1e1f28 -URxvt*foreground: #ebece6 -URxvt*cursorColor: #e4e4e4 -URxvt*color0: #000 -URxvt*color1: #fb4245 -URxvt*color2: #50fa7b -URxvt*color3: #f0fa8b -URxvt*color4: #49b9fe -URxvt*color5: #fb4cb3 -URxvt*color6: #8be9fd -URxvt*color7: #ededec -URxvt*color8: #555555 -URxvt*color9: #fb4245 -URxvt*color10: #50fa7b -URxvt*color11: #f0fa8b -URxvt*color12: #49b9fe -URxvt*color13: #fb4cb3 -URxvt*color14: #8be9fd -URxvt*color15: #ededec diff --git a/home/.abcde.conf b/home/.abcde.conf deleted file mode 100644 index 5d890b62..00000000 --- a/home/.abcde.conf +++ /dev/null @@ -1,89 +0,0 @@ -# -----------------$HOME/.abcde.conf----------------- # -# -# A sample configuration file to convert music cds to -# FLAC using abcde version 2.7.2 -# -# http://andrews-corner.org/linux/abcde/index.html -# -------------------------------------------------- # - -# Encode tracks immediately after reading. Saves disk space, gives -# better reading of 'scratchy' disks and better troubleshooting of -# encoding process but slows the operation of abcde quite a bit: -LOWDISK=y - -# Specify the method to use to retrieve the track information, -# the alternative is to specify 'musicbrainz': -CDDBMETHOD=cddb - -# Make a local cache of cddb entries and then volunteer to use -# these entries when and if they match the cd: -CDDBCOPYLOCAL="y" -CDDBLOCALDIR="$HOME/.cddb" -CDDBLOCALRECURSIVE="y" -CDDBUSELOCAL="y" - -# Specify the encoder to use for FLAC. In this case -# flac is the only choice. -FLACENCODERSYNTAX=flac - -# Specify the path to the selected encoder. In most cases the encoder -# should be in your $PATH as I illustrate below, otherwise you will -# need to specify the full path. For example: /usr/bin/flac -FLAC=flac - -# Specify your required encoding options here. Multiple options can -# be selected as '--best --another-option' etc. -# Overall bitrate is about 880 kbs/s with level 8. -FLACOPTS='-s -e -V -8' - -# Output type for FLAC. -OUTPUTTYPE="flac" - -# The cd ripping program to use. There are a few choices here: cdda2wav, -# dagrab, cddafs (Mac OS X only) and flac. New to abcde 2.7 is 'libcdio'. -CDROMREADERSYNTAX=cdparanoia - -# Give the location of the ripping program and pass any extra options, -# if using libcdio set 'CD_PARANOIA=cd-paranoia'. -CDPARANOIA=cdparanoia -CDPARANOIAOPTS="--never-skip=40" - -# Give the location of the CD identification program: -CDDISCID=cd-discid - -# Give the base location here for the encoded music files. -OUTPUTDIR="$HOME/Documents/Rip" - -# The default actions that abcde will take. -ACTIONS=cddb,playlist,read,encode,tag,move,clean - -# Decide here how you want the tracks labelled for a standard 'single-artist', -# multi-track encode and also for a multi-track, 'various-artist' encode: -OUTPUTFORMAT='${OUTPUT}/${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}' -VAOUTPUTFORMAT='${OUTPUT}/Various-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}' - -# Decide here how you want the tracks labelled for a standard 'single-artist', -# single-track encode and also for a single-track 'various-artist' encode. -# (Create a single-track encode with 'abcde -1' from the commandline.) -ONETRACKOUTPUTFORMAT='${OUTPUT}/${ARTISTFILE}-${ALBUMFILE}/${ALBUMFILE}' -VAONETRACKOUTPUTFORMAT='${OUTPUT}/Various-${ALBUMFILE}/${ALBUMFILE}' - -# Create playlists for single and various-artist encodes. I would suggest -# commenting these out for single-track encoding. -PLAYLISTFORMAT='${OUTPUT}/${ARTISTFILE}-${ALBUMFILE}/${ALBUMFILE}.m3u' -VAPLAYLISTFORMAT='${OUTPUT}/Various-${ALBUMFILE}/${ALBUMFILE}.m3u' - -# This function takes out dots preceding the album name, and removes a grab -# bag of illegal characters. It allows spaces, if you do not wish spaces add -# in -e 's/ /_/g' after the first sed command. -mungefilename () -{ - echo "$@" | sed -e 's/^\.*//' | tr -d ":><|*/\"'?[:cntrl:]" -} - -# What extra options? -MAXPROCS=2 # Run a few encoders simultaneously -PADTRACKS=y # Makes tracks 01 02 not 1 2 -EXTRAVERBOSE=2 # Useful for debugging -COMMENT='abcde version 2.7.2' # Place a comment... -EJECTCD=y # Please eject cd when finished :-) diff --git a/home/.config/aacs/KEYDB.cfg b/home/.config/aacs/KEYDB.cfg deleted file mode 100644 index 48c7cf64..00000000 --- a/home/.config/aacs/KEYDB.cfg +++ /dev/null @@ -1,24347 +0,0 @@ -; KEYDB.cfg -; 2017-09-03 22:09:23 -; -; server: http://www.labdv.com/aacs -; processing keys: 18 (18 from doom9.org forum) -; host certificates: 8 (7 from doom9.org forum) -; disc VUK keys: 24010 keys for 23999 discs (0 from doom9.org forum) - -; processing keys -| PK | 0x810827A76E5B2CC1685E3217A23E2186 ; DK_V01-V12 -| PK | 0x44145A846F19D096F2C84A2E50C5C4F5 ; DK_V14-V16 -| PK | 0xEB55A475080FBCF18534EFA0839A7373 ; DK_V17-V19 -| PK | 0xFB4AC39009E82113D45ECF4B7EAEA467 ; DK_V20-V21 -| PK | 0x8BF4FBD91A7FB7DB8576D1E5A15A8544 ; DK_V23-V28 -| PK | 0xAA856A1BA814AB99FFDEBA6AEFBE1C04 ; DK_V01 -| PK | 0x09F911029D74E35BD84156C5635688C0 ; v1 -| PK | 0x455FE10422CA29C4933F95052B792AB2 ; v3 -| PK | 0xF190A1E8178D80643494394F8031D9C8 ; v4 -| PK | 0x7A5F8A09F833F7221BD41FA64C9C7933 ; v6-8 -| PK | 0xC87294CE84F9CCEB5984B547EEC18D66 ; v9 -| PK | 0x452F6E403CDF10714E41DFAA257D313F ; v10 -| PK | 0x973940BB180E83266231EE596CEF65B2 ; v3-4/7-10/12-13 -| PK | 0x58EBDADF88DCC93304CBBEDB9EE095F6 ; v14/15/16 -| PK | 0x465FA8BE828509014D05D2FCCEFF35D2 ; v17 -| PK | 0xAD5E546C46D72DC083AEB5686924E1B3 ; v18/19 -| PK | 0x53FCE78ECD352DA50D526B5EE3D3D96B ; v20/21 -| PK | 0xC32238976FF44A51E2D33553CFE85772 ; v23/25 -| PK | 0x99AB6AE0A7E13504CE284B7CA401B26A ; v31-36 - -; host certificate from PS3, v25 -| HC | HOST_PRIV_KEY 0x668C9A75EEFC8DA4261938E271285061BB09F0DD \ - | HOST_CERT 0x0201005CFFFF80000039000065EAC9878B85EFF4 \ - 0xD77A62B1D600024ACE68DD3366880E4F844F34B7 \ - 0x7A050135A20E73B626DAEA5157B32EB84BC6E87B \ - 0x0DEE4D833CEADA86120151002C3C66D5256F71CF \ - 0xA68B7E55BA1B351F3403434E \ - | HOST_NONCE 0x2923BE84E16CD6AE529049F1F1BBE9EBB3A6DB3C \ - | HOST_KEY_POINT 0x8A60C80BD60C23605FBE90B27BF96B2DB38195C1 \ - 0x801F54EB29E0F6EC57AC2B9168E88B2D56977508 - -; host certificate from unknown, v20 -| HC | HOST_PRIV_KEY 0x567A6A8EFFFD8967651CF1BB8D15EDB6D2463555 \ - | HOST_CERT 0x0200005CFFFF0000006400006440BE797538E4FC \ - 0x369FC50BBE9F95CC694338210CDFACE0D2C878BA \ - 0xB96BB72BA5A29D0F7D2E9B836B4CE06781D93354 \ - 0x4E6258F1F38668B4733F24638CCB6F5B71220A22 \ - 0x20217367F833635E97784D9E \ - | HOST_NONCE 0x2923BE84E16CD6AE529049F1F1BBE9EBB3A6DB3C \ - | HOST_KEY_POINT 0x8A60C80BD60C23605FBE90B27BF96B2DB38195C1 \ - 0x801F54EB29E0F6EC57AC2B9168E88B2D56977508 - -; host certificate from aacskeys-0.4.0c original, v18 -| HC | HOST_PRIV_KEY 0x8C8647FE2A70EF0388EA9E43F432CC441C6B108C \ - | HOST_CERT 0x0200005CFFFF000000AE00004142A5411F1E63F1 \ - 0x85581C876B939FB40B523BF69C004CA69E047606 \ - 0xEE5183C0ABEF1E7D04CB6E65260677E7B0573D08 \ - 0xE60957935503ED78F7E27B190B4A7CAFCBAFF4A2 \ - 0x836453ECF72E49668DAF1DB9 \ - | HOST_NONCE 0x2923BE84E16CD6AE529049F1F1BBE9EBB3A6DB3C \ - | HOST_KEY_POINT 0x8A60C80BD60C23605FBE90B27BF96B2DB38195C1 \ - 0x801F54EB29E0F6EC57AC2B9168E88B2D56977508 - -; host certificate from powerdvd 7, v12 -| HC | HOST_PRIV_KEY 0x4737676058D7029452514F0AB186DC4CCA8C578F \ - | HOST_CERT 0x0200005CFFFF0000000C00006E3DEB679B9A16AD \ - 0xFAA8E30878767BA6EB2A9B415385AD1181B4446C \ - 0x31E9A5DD2AB808B364FF15885BAC490964318C9B \ - 0xF8029FCF76F688A54FBDA03F6D9332EF04E5A613 \ - 0x12DA85880A4D9CBB79D8602E \ - | HOST_NONCE 0x2923BE84E16CD6AE529049F1F1BBE9EBB3A6DB3C \ - | HOST_KEY_POINT 0x8A60C80BD60C23605FBE90B27BF96B2DB38195C1 \ - 0x801F54EB29E0F6EC57AC2B9168E88B2D56977508 - -; host certificate from aacskeys-0.4.0, v4 -| HC | HOST_PRIV_KEY 0x88B245EA25315F46E6E99D9D521EB1194454A82D \ - | HOST_CERT 0x0201005CFFFF800000C400005BF6843ED1AA9C9D \ - 0xEEFEAD8174479C72AB5457691EEB75669105BB19 \ - 0x5D4B9133069A18FD5357797116CEC22D7FE8F366 \ - 0xC2A092E1D00DB770E9E01DB687456B6FBFA28C96 \ - 0x2D88F05DD43F584ECC821AF7 \ - | HOST_NONCE 0x2923BE84E16CD6AE529049F1F1BBE9EBB3A6DB3C \ - | HOST_KEY_POINT 0x8A60C80BD60C23605FBE90B27BF96B2DB38195C1 \ - 0x801F54EB29E0F6EC57AC2B9168E88B2D56977508 - -; MKBv50 (revoqued in MKBv51) from dizzier at doom9.org -| HC | HOST_PRIV_KEY 0x0F7B481182425FC4C32CDDE612DD05B1BD7863D6 \ - | HOST_CERT 0x0203005CFFFF800000AD00005F27B91F047E60C2 \ - 0x51F4262DE74EC061F9261DCE3254EB737EDED53A \ - 0xD84E12805BBEEDB12C285A61627A529129BD98F8 \ - 0x590634CF35A9820CD213D5AF786BDE489EC37A75 \ - 0xD4D444B8AB40923E317169E9 \ - | HOST_NONCE 0x2923BE84E16CD6AE529049F1F1BBE9EBB3A6DB3C \ - | HOST_KEY_POINT 0x8A60C80BD60C23605FBE90B27BF96B2DB38195C1 \ - 0x801F54EB29E0F6EC57AC2B9168E88B2D56977508 - -; From Dizzier at doom9.org -| HC | HOST_PRIV_KEY 0x27263F402E2D6DB56B1FB7BB4524C6CD5C9F2EF4 \ - | HOST_CERT 0x0201005CFFFF800001460000952D611B06911B0E \ - 0xAEE577D3715D1FA0E405914068752559DFBD845C \ - 0xB80F4FEE04A40B8FED842ACB78F9F898AEC39540 \ - 0x9E929C55A20A7EE853509BB84D8FB0DC99E5CAC5 \ - 0xF239F0CD79B38C0678702B1C \ - | HOST_NONCE 0x2923BE84E16CD6AE529049F1F1BBE9EBB3A6DB3C \ - | HOST_KEY_POINT 0x8A60C80BD60C23605FBE90B27BF96B2DB38195C1 \ - 0x801F54EB29E0F6EC57AC2B9168E88B2D56977508 - -; MKBv61 from dizzier at doom9.org -| HC | HOST_PRIV_KEY 0x5F291AE7CF68D67F58689A4CBFE2953064539FAA \ - | HOST_CERT 0x0203005CFFFF8000018900003E7C4B0931C0045D \ - 0xFB017F24B1557F5BD0AF5B961FBC1B43519F9023 \ - 0xA1E84A3E8C06967B76469CC86527AA3807258C58 \ - 0xE00F73971F9BC8353165476454911E3A9D07D742 \ - 0x980598BFF9B3DF5EA18E0C7F \ - | HOST_NONCE 0x2923BE84E16CD6AE529049F1F1BBE9EBB3A6DB3C \ - | HOST_KEY_POINT 0x8A60C80BD60C23605FBE90B27BF96B2DB38195C1 \ - 0x801F54EB29E0F6EC57AC2B9168E88B2D56977508 - - -; disc VUK keys -0x0123456789ABCDEF0123456789ABCDEF01234567 = | V | 0x0123456789ABCDEF0123456789ABCDEF ; -0x076B7552F6E5DB950BDD8DDB931A61B0F07F0EDC = 01611720_GOODFELLAS | V | 0x0E05BD328A80943C0DCEFEB89D926542 ; MKBrev 1 - FindVUK 0.54 -0x7ADD9F3975D307C7D432A29D1BB1083C22D83790 = 04794165_HILLS_HAVE_EYES | V | 0xDE531D214336165B9345C02B61502A81 ; mkb v4 -0x5952ED440CFCC33D9B16D0847107BBF4273BDD6C = 05051300529772 (Havana Moon) | V | 0xE4A8358BAE1A3F328C5E88E9AC213F24 ; MKBv62/FindVUK 0.93 -0x05A0B3021481649E7BE308C639EC5C4D9DE3DB03 = 08433STOBLURAY | V | 0xCA4B5A2A24957341F25C069268DC1348 -0x261B6200B0559681520D4534D7A28EA9F4DACB13 = 08575CINBLURAY | V | 0x3B000BCBD9D3D3DFCE77DBC61E2A5904 -0x92511A221E9B575AF46B968327EAA2277F73A97A = 090114EFE | V | 0x45BC92F84EF0C3FDADA5B413262387D8 -0xEEF03B51953316500BC6EA80BAA06B80D6A84639 = 09033PAS | V | 0x3B0C5AE233A1F10F90B1D4D94AFA2DF6 -0x9931671767F9C989277CFE19A7D3F1174D906FE2 = 09061COD | V | 0x06A2417A4CFAA184A09C73B95283D96E -0x1DF375A9A3FBB327AC8D051EDA01EE1F74CE8E62 = 09153SBM | V | 0xFE1B3B76C181044BAECBD551170DA0A1 -0xA1A3E2D97D61CBAFA68B018FA1904A22F6572B3B = 09222NOR | V | 0xE6D2444183579AA6DAE08521CB5E4294 -0x866A13AF6ED8004DD6F90C4EDE1F34C9FD336C79 = 09281GAM | V | 0xA52243B814F230F66245819B5CAB0796 -0x9B8199394FAAAA62693F45C4071AF8EBC7E26A55 = 09358P51 | V | 0x8630D92E163932C56EAE400D7C7B20A7 -0x331A7743967CFB2195D2BE459C403BD6D863641D = 1 ON 1 VOLUME 2 BLU-RAY | V | 0xE1DEAEB2BFD0F8E00C7DDE087D0316D2 -0x5AF32426D00EDD0749B4EAFCB8A9719B039783F6 = 10 Things I Hate About You | V | 0x48B2F719C259D45C6D3E528D0A45794F -0xFDED89F2FDE3BC3A327D94985174BE7AD270AA23 = 10000 Years B.C. | V | 0xDF2CD1018A436F88FF647D48B37001A0 -0x35266E500584A33C67F93F03BFF834F38FA2C1EA = 10000_BC_NA_UK | V | 0xCE086D5C97849E0C950F3D443E95C32D -0xBD4EECED6AD29DE9CA980F066A1D002A88B109CD = 10000_BC_NA_UK | V | 0x3D939C85D1660956C65CDBEACFACC6F8 -0x78DA8BE451A77EB53339AB9E73E67F1596D77862 = 100BLOODYACRES (100 Bloody Acres) | V | 0x5D321644AE629DCBC051DF69A0AD4DD0 ; MKBv44/FindVUK 0.96 -0xB4139B8942E15E2564D0A75E28FFB8CBA55592C2 = 101_DALMATIANS (101 Dalmatians - Blu-ray | V | 0xE8E9E0290B62F6A6E5B86A3B33693C7C ; MKBv27/FindVUK 1.00 -0xF03D6E8A9E016209BBCC22306F551332822D419C = 10267PAR | V | 0xE37FCB235E812DB8D909E6D9B7D496D8 -0xCDFE19939BDF83D2D48F4A488BDC6E2B495FE493 = 10_Cloverfield_Lane (10 Cloverfield Lane | V | 0xCB0A78242DDC856ACAE4041D34577A17 ; MKBv61/BEE/FindVUK 0.96 -0xE767D7FCBB97797812CD46BCAE342FDF756B3387 = 10_Cloverfield_Lane (10 Cloverfield Lane | V | 0x7D4A5682E497AC035709568424C965FE ; MKBv61/BEE/FindVUK 1.00 -0x6CA06FFE13CBE0DC802D96643ED1B2F788B85133 = 10_Cloverfield_Lane (10 Cloverfield Lane) | V | 0x0F20EB56C4FB39E4FE87817CEC2A92E8 ; MKBv61/BEE/VUKNOTVAL!/FindVUK 1.02 -0x35F6F37138A314C427BB2122CFC997A710167EDE = 11_6 (11.6 - The French Job) | V | 0xCD77D0E15A20CFC9F2DC2FC9700ADD44 ; MKBv43/FindVUK 1.00 -0xC113A7C3638B4E47DAC11753F1A00964942B083C = 12 MONKEYS | V | 0xF4F4A542E66A7C477236C6093471FB2F -0xE5A273B07E7733FE8AE3936840F88DCBA7BF120D = 12 MONKEYS | V | 0x53F47560CF73F8E03A08BEE871068198 -0x8BEC3226816C1FF31A2281D70DE16CECB5CF71DF = 12 MONKEYS | V | 0xEDAEDFA377C16F58815C623DAAD97BEE ; MKBv3/FindVUK 0.96 -0x3092B1D29990EACB29405121DE044F26325300C5 = 12 Rounds | V | 0x95E5B0630AE5BA016309F2621D492F3E -0x8418F3F85AB746600D90207D27FAAC9B5530B622 = 12 YEARS A SLAVE (12 Years a Slave) | V | 0x82375706DB3726B33F74BA65F4E69A36 ; MKBv40/FindVUK 0.96 -0xE27BC144D56AAE9B78AE995294C98FB94063AADB = 127_HOURS (127 Hours) | V | 0x567236367ADE8921F478FB8951C273A9 ; MKBv19/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0x27F1E1ECFF396C48BBABA6293D6BEFF3A4CBEBD7 = 12_ANGRY_MEN (12 Angry Men) | V | 0x0A45C13BE63232CC241EC8A9EFF03FF6 ; MKBv36/FindVUK 0.98 -0x28DF382EB7CB2F16D97086ADB12F2124FE9C4D20 = 12_ANGRY_MEN (12 ANGRY MEN) | V | 0x07E29CC84F4E97A7F189820AE881A797 ; MKBv27/FindVUK 0.99 -0x471EFE7334927F7B5D5B638BFD9469B8C0D54411 = 12_MONKEYS | V | 0x5C8441DDBAC9AC6DC58DFA5953D79FFE -0x18DD866BF2255A52421A14BD3D2E32424888EE7B = 12_MONKEYS_G51_GLO | V | 0xFD0253A4D1C7F4C1FBA08466AD508704 -0x015A3C80B26F2DE7BE3D96AB2F907E9493518DE4 = 12_MONKEYS_G51_GLO (12 Monkeys) | V | 0x3F7DBEF0238C4D192A4C22AB304D9639 ; MKBv12/FindVUK 0.96 -0x122862AFA973626872D8DC882C302234FFA5030E = 12_MONKEYS_G51_GLO (12 Monkeys) | V | 0x6F7942CE3F6ACAB334A61309B8E7E8DE ; MKBv12/FindVUK 0.99 -0x9DFFB7D42679C86C6E03A4CFD48F8E23340F9239 = 12_MONKEYS_G51_GLO (12 Monkeys) | V | 0xA5BF806D43A2E0787FCB68116E3D392E ; MKBv12/FindVUK 1.02 -0xD2348CF16A01E0EA3F4D8D3FA4D77003C1E7F769 = 12_Monkeys_S2D3 (12 Monkeys: Season Two | V | 0x8C5CD9864A8A14C7EEE1A4AE3D70C059 ; MKBv57/FindVUK 1.00 -0x9A773060B62A748FF5E7CA1C30D5141AACEFFF44 = 12_Monkeys_Season2_D1 (12 Monkeys: Seaso | V | 0x11C218AB8A1561018C430832B5B23C2C ; MKBv50/FindVUK 1.00 -0x8A60C178E01A82EF073CCC01FA54CE8EACBC5413 = 12_Monkeys_Season2_D2 (12 Monkeys: Seaso | V | 0x27C52806455DD661F129679DE5B5D8F0 ; MKBv57/FindVUK 1.00 -0x660E24C9E86815ECB191B35716CAB0C7550BA5BF = 12_ROUNDS | V | 0xD22EEBEBC6C4A9F1B6E2845AD0A299A4 -0xD1505CEB424DF7ACE8B1D6FC65C0A0F4CB1136C5 = 13 (13 - Blu-ray???) | V | 0xDAE49F6AD5AE65B365F235BEC51E38D5 ; MKBv28/FindVUK 0.84 -0x8CE4925F614B98FCCD04A1DBEF53FCE87C6002BF = 13ASSASINS_SPECIAL | V | 0x205BF6F0C082870D91D9D2160A339335 ; MKBv23/FindVUK 1.02 -0x50736BE25C788A018ED3386ABAD1D4B2A6972DEC = 13_GOING_ON_30 | V | 0x9CC984A59875024C81477D185DF19690 -0x6D467590D54D6FABCCA04271BF273DAF42A3DC2A = 13_GOING_ON_30 | V | 0x69EAA15A1A976755570526676F2550B8 -0xA4AC98CA5DDAE64A0C0E2F6EA8A11F74F4BC917C = 1408 | V | 0x0FAD5C134268F94848F4F57B47C095CE -0x5BBD41BCFE4E964FFCF1915761646B879E1A7C4C = 1408 (DK) | V | 0x61CE7002E6D21FE275F90031B76B6B27 -0xC3E65E943BC342443208C0F0E713C99B728676A9 = 14BLADES (14 Blades) | V | 0xD67AC3CF84B0816C63A40008F192BD11 ; MKBv18/FindVUK 0.84 -0x8332E5C9CB2537A333D52A4744B66343881CEE88 = 14_BLADES_G51_60336 | V | 0x429761ACB01C326F0A16853FB1AC5D94 ; MKBv19/FindVUK 0.65 -0xE524DFEECA69B174C7D83960EF604DB62B97B3BB = 17_AGAIN | V | 0x5BAA6DB9762411516BD622EFD7444665 -0x2EF65E1BECAAAF2D807154A7C4F031AAF4823B6D = 17_AGAIN | V | 0x693DF14F1E5034623FCB54E574E3AE4B -0x249EFEDCD87C6F4D971DC8564E77CDD63621B088 = 180001_1 | V | 0x64FAFC9C816E9F3CAC205C26F81E338F ; MKBv56/FindVUK 1.00 -0xE92214CF82EA5E762E22452F11D1D3565B5E136F = 180001_2 | V | 0x6E63B670264849D5B532A288B721DCE7 ; MKBv56/FindVUK 1.00 -0x938361E7F010C69AEDC19DB5BE02419841420248 = 187 (187) | V | 0xDEDFF7080F230B7F79C94A084F16F222 ; MKBv62/FindVUK 1.02 -0x0860627678BDC620C2F73025BD18F06D31C61AA2 = 1911 REVOLUTION (1911 Revolution - Blu-r | V | 0x66F140FC050B396EEBD754173CAF087D ; MKBv51/FindVUK 1.02 -0x3F3FA0903B305FD3512F64DBF77F9BF80BC67A49 = 19642920_TROY_DIRECTORS_CUT | V | 0x0D8FBEDA243FBB2D82CE00181AC36A18 ; MKBrev 4 - FindVUK 0.54 -0x66DC116618DE4F9753541837991E6EE3608CA604 = 1984 (1984 - Blu-Rayâ„¢) | V | 0x37F6E32489F7E63D6B905871DE4F63CF ; MKBv57/FindVUK 1.00 -0xE8310497E0364C604EF4C992CAE26399E3FDD1D8 = 1984 (1984) | V | 0x0261257501464E4F518A556BB62CFBC8 ; MKBv50/BEE/FindVUK 1.00 -0x4C615FDEC370644180B380D788912FB2C6B4019E = 2 Fast 2 Furious | V | 0x6E83EDCE1B08C22D1679C8EFA031BDC7 ; mkbv15 -0xAC897174F7972ED19878CCDD486BB97F1288BD50 = 2 Guns (2 Guns - Blu-rayâ„¢) | V | 0x20E369690442BD8B0A6582BA54B25A01 ; MKBv44/FindVUK 1.02 -0x315E5D3A51B279EB622A1FB5211286C7A8FBD266 = 2001: A Space Odyssey | V | 0x4F08D7715633A715B08E84D70643AD57 -0x581394912A577F7314E7676AB9D1F77901E5031B = 2001_A_SPACE_ODYSSEY (2001: A Space Odys | V | 0x680B3185DC38830ED5D5F2353B3FF5CF ; MKBv8/FindVUK 1.00 -0x4192A4D88EFE915D743AA58C5877B483C464616C = 2001_SPACE_ODYSSEY | V | 0xB4A467529A1D6F38522BDADE9FA77319 ; MKBv4/FindVUK 1.00 -0x002330EB3D08BA394685388232315AD40D13E67A = 2001_SPACE_ODYSSEY | V | 0xB6A4DB23C6678FB9569DF174CF480035 ; MKBv4/FindVUK 1.00 -0x48F542AE85AD039F0523A8EBB01D0B59031216CB = 2001_SPACE_ODYSSEY | V | 0xC204905B20C64F997BC855A8353DF9AA ; MKBv4/FindVUK 0.98 -0x1A56FA95D85B2A5F5EE438101694ABBBBF3C84BD = 2010_THE_YEAR_WE_MAKE_CONTACT | V | 0x65EDA5989B3511CE4669102BFB1E561C -0x013F27BF31432428F4994DC34280BA829D79B19B = 2010_THE_YEAR_WE_MAKE_CONTACT | V | 0x19A49F734A684A01D4F90EDADBE1FCE0 -0x55C6D9E77A5BADC01A5B4EA00637717F9D14B5A5 = 2010_THE_YEAR_WE_MAKE_CONTACT | V | 0x82AF848735D6062274106ED0FF69BAF1 -0xED49938D55878D57F1F0CC7C699CD5897C598A5E = 2010_THE_YEAR_WE_MAKE_CONTACT | V | 0xA8E8C405B35E1EF8768234D1ED71D9EF -0xE96D4AC328AE83907A2242D02537512D5C510DD2 = 2010_THE_YEAR_WE_MAKE_CONTACT (2010: The | V | 0xCD2513C83DFCF8EA82763E4C70A99654 ; MKBv12/FindVUK 0.96 -0x7F9BBEEB2582EE621996BFFD7FECD6506E5DFF7A = 2010_THE_YEAR_WE_MAKE_CONTACT (2010: The | V | 0x8B22BD512B8E1EB27AF90E5BA8A457E5 ; MKBv12/FindVUK 0.90 -0x7F20A4586775DF5C282309F20D846C739E03CDF3 = 2012 | V | 0x83AA37CB8AAD0AA7DBFA55B7A9EB9C25 -0x6B4A20E426E2424E47C689E2FEED23C6CE85F73A = 2012 | V | 0x1FCA6E29AF467F429F480C789CD74859 -0x8E102F8C1E667291C9C8FCF391D9D4440581801C = 2012 | V | 0xF43B15B0EEB32922F20FFFE9C77F866F -0xD0068C5A140B2CA27BF3FE3FD4A5C973304C46AA = 2012 | V | 0xA6449297B334D9F4B2F6E9B089E0F1B8 -0x1D47F3DDEE3CB86113BA2BE283203716D0E9BCDF = 2012 | V | 0x4B6CFBEF2DC0FFE63B1ADBBA3FA4154F ; mkbv16 -0x989659D8EBD3C764758D9392C7D45815338A71F8 = 2012 | V | 0xFB7EDE6C08DD48655507D6742F617A3B ; mkbv16 -0xF6D3FE8F7844378F2B05B52C992EEF6F4FD0BF2A = 2012 | V | 0xADBB055F1B97FCDA17AF51F94B5DE94D -0x23636A937163C3F03706E312C1FC28B264372814 = 2012 (2012 - Blu-ray???) | V | 0x5E04159107CB123AC2BBFC167225C07B ; MKBv16/FindVUK 0.96 -0x2DB63FC832DF84EF39489A0C1EF626126BC6B405 = 20TH CENTURY BOYS PART 1 | V | 0xF5B20C1CB0BC4669BE64D85ECB67FDC7 -0xA0CBB4AC0C65ED2006E57B17BE2BB1072275242B = 20TH CENTURY BOYS PART2 | V | 0x1149C387C73E05A5EC89207980BDC849 -0x725C4366DF066AB3CFBC76C9A1C37DB70423D934 = 20TH CENTURY BOYS PART3 | V | 0xE1EFEDFD0F2E571F63629153A0E4070E -0x1350BE9D46F250D348A10BCD7BE554EEE9007F5E = 21 | V | 0xA319D6FE56FF84EECEB8513A3B44176D -0x59691C6080A901E586E7F64B73C4F660DD25DC1F = 21 (21 - Blu-rayâ„¢) | V | 0x98F2BE111E23CF295F972C82731C5E7E ; MKBv7/FindVUK 1.00 -0xD410F5A5317831AE22BE86EC0ED9542B69DB5EAD = 21_JUMP_STREET (21 Jump Street (2012) - | V | 0x1F029EC98ACC814768A73FE744A6ED11 ; MKBv31/FindVUK 0.97 -0x826E2ED647E8B7229A0662E8A1207ACB7E7AFF6E = 22 Jump Street (22 Jump Street ??? Blu-r | V | 0x808F9D0D692A9C154E3C8286356CF006 ; MKBv47/FindVUK 0.84.1 -0x4D08FEC7352E30F25ED9A4088149CA52E33DE829 = 22 Jump Street (22 Jump Street – Blu-r | V | 0x8643188F7441FA2881CAF2CC5B937AA5 ; MKBv49/FindVUK 0.97 -0x6D957A6BE17D5CCD5ADE06CA68B4E32BBBCF8B23 = 22BULLETS | V | 0x365084CEF0F5882240D48A3D611B1908 ; MKBrev 20 - FindVUK 0.57 -0x1A86CE2F071A46E0046FAF292267B4BC14CFC8DB = 22_BULLETS (22 Bullets) | V | 0xEEA2ED0E312601125E6971445D655662 ; MKBv19/FindVUK 0.84 -0xEEDC49525C7E7816C05E151B70D96C5C5A2FBA0B = 24 (Prison Break: The Final Break) | V | 0x38E4358EDC4421C7500A4A81B067BAF7 ; MKBv14/BD+/FindVUK 0.98 -0x28A2B891DCBCD20B7252D92E4DF116F4866E0AA5 = 255 (Gruft11) | V | 0xAAA5C9F190390F730F9070B697D9F52D ; MKBv20/FindVUK 1.02 -0x7988C54C3E535448D329A860131A07F7793042A6 = 27_DRESSES | V | 0xDB3E503406FF494F1047DA2E8912512E -0x107C6F6A18E85B977313610B6156C8F944FBB401 = 27_DRESSES_F1 | V | 0xA1C741F6436F15A8C93DD512E01256D7 -0x6A192634E213450FBF1F2286DDAA6F0B8E081658 = 28 Days Later | V | 0xCE12BA7C939AD39A8F491CE384D8DBF4 -0xAAC4D73868CCF3AC41AF2E776E48756BE3471B7E = 28 Days Later BD+ protected (US) | V | 0x0F2F463F5F27A7AC9A61CEB7B4F2E967 -0x23B9EBC51966A31380265F182C2D099B3540E0DB = 28 Weeks later | V | 0xC88DF50677322FE00AAD27AA65AA35CE -0x030ACFD0540FEC7D1FC4274B545097EB912421C6 = 28_WEEKS_LATER | V | 0x28A0B36BCFE37FCFED7B621AA6E71380 -0xA899D3372D22ADC1E307FA95B648D281AA4DE6C1 = 2F2F | V | 0x55E323E3D331E7A666B048EA5D5CEF19 -0x7B69F98B9C0118F1115F71C1C178392C884B303B = 2F2F_G51 | V | 0x0BDFB60466D72243952EE266C9EADD1E ; mkb v12 -0x45CBAD92EB1ADE6289C55AD3787D328367B94F81 = 2F2F_G51 (2 Fast 2 Furious) | V | 0xC6EC2DAEB306BC7CE83D5F0C3E9459AC ; MKBv15/FindVUK 0.96 -0x35581214F56766078B25B0EA6E53ED4BD7C1E3CE = 2F2F_G51 (2 Fast 2 Furious) | V | 0xBE2319176D20FB11E810CBF86A015438 ; MKBv15/FindVUK 0.96 -0x840C39A6D38A01449041CD687DBCEDCA5A2F6D5F = 2F2F_G51 (2 Fast 2 Furious) | V | 0xAD6F94B0A1AA7E3DDF4E18E13D4E1EE2 ; MKBv15/FindVUK 0.96 -0x7BEBAD866ADE7F77CC767C7429AAB993118AD834 = 2F2F_G51 (2 Fast 2 Furious) | V | 0x3721FEC7B5F782DB65D61033464322E0 ; MKBv15/FindVUK 0.96 -0x9C8459C02A1AE5ACFC0E929789670B640C52546B = 2F2F_G52 (2 Fast 2 Furious) | V | 0x7750DBCFEF5E9D8852F473F34A3672DB ; MKBv12/FindVUK 1.02 -0x50B1FD9E67153E10B2311BAD6FDB205755C7C411 = 2Fast 2Furious | V | 0x82ABFB388E4F881E76116E185C8DD517 ; CAN version movie box set -0xF9533BF1C646B0AC5A48834C94182234827EFC3F = 2NDBR4002 | V | 0xAA486523D74E4204E1360ABF16A8B088 -0x739D5DE78A23D1971E936ABA4F224DB721AFFB66 = 2NDBR4003 | V | 0xA36A140CC0A58BFA117F5A63F58ADB3A -0x280D008BC5FF1DAD3153E82C9B29EC2530122832 = 2_GUNS_NA | V | 0xFD9CD5E86B66D5579C1D84A4D635F643 ; MKBrev 36 - FindVUK 0.54 -0x00058A7C429C3D581994F124FEEDC7437EBE557B = 3 | V | 0x80AEE2C425344C277152B1D632CA4D97 -0xF6838566C00180B37C8972DE1E7ACDE37870ECC3 = 30 Days of Night (Australia/UK) | V | 0x3C4C1E2C35E8B7887E185A56D5F91ACB -0xC5E5CE90518017206B93C2B1BC9EB5639109F07D = 30 MINUTES OR LESS (UK) | V | 0x9A9ECC3ACC309586BE55BF5D735CE504 -0xB4335DD527038B139127AA7BB6E72A0FE2AF360D = 300 | V | 0x37310789CA9962C7CEC65AC8F9FFB37F -0x0FDC437418F7B59A16266C06E7A82CA9B6CA0E7B = 300 | V | 0x16B2B856A783031BF8A39DC19D2F4BAE -0xDDE2F79D5B081202261511EAB52993BA5C8B8790 = 300 | V | 0x3771C7AE0BDEABFC9F7C4D95282BAED3 -0xD6521C965FDE9DE1500A994E92B2CF1FB3C4D662 = 300 (Australia) | V | 0x3F247545EC52F0CEE69FF2C01592FD49 -0x5AFDFB4F3E46DFA63F31B19B4D5B29BE0F227599 = 300 E.S. (ESP) | V | 0x971879F87978533826FE800DCF5886E1 ; mkbv12 -0x6CC3EED9EC4CCB13197D935A9C89C60B769E3D64 = 300_RISE_OF_AN_EMPIRE | V | 0xC61E1719DB22D384B8F1B550D2FB1D2A ; MKBv46/FindVUK 0.96 -0x761429C21AAB6D8FF7A7B94C1F476C09BC20243E = 300_RISE_OF_AN_EMPIRE (300: Rise of an E | V | 0x13E0BE90C219D4EF191FAE157F0F9D8E ; MKBv46/FindVUK 0.96 -0x6DB35E0D5D3B5C367EDCA998A6D21C785B196430 = 300_RISE_OF_AN_EMPIRE (300: Rise of an E | V | 0x93A61FB725D17C35790204C13D60CBA6 ; MKBv39/FindVUK 0.94 -0x995D9EB43E034FB0D9D6EEDB9DAF0524440A3F71 = 300_UCE | V | 0x3B256E37B3AF83E7E90F692FAE02B911 -0x0B918C7BBB9DDA02297F622DDE28A4C2265D9133 = 300_UCE | V | 0xC3E0B839AA85E1DD9104CF5A9DCCC2F9 -0xE0E8B679D1E77944A37228582FFFF65EB014D868 = 300_UCE (300 UCE) | V | 0x9759EA147CFAC7C41404A06E1C406AD5 ; MKBv14/FindVUK 0.96 -0xB2EC86CB8DB277665F0CC7E695AFD02D36073685 = 300____ | V | 0xAF88C1ECFCD42ED5B01C2A6D07AEBAF9 ; MKBv3/FindVUK 0.80 -0x7252928350E58869BF0133F31D46A95F9856296B = 300____ | V | 0x435B1CC94CBDBE30D351CB521D064FBC ; MKBv3/FindVUK 0.96 -0xD3F92E6323C6D0F963464D729DEE5E241B75C8C8 = 30DON | V | 0x3DBD616FD388065CF5C8C7AE433C8857 -0x4FCBC1F25293E266BBEE481FFA46F3F1C04C5138 = 30_DAYS_OF_NIGHT | V | 0xE250912FF0BB63CA654D3F25A3FC9EB4 -0x4DD26936E86E02EA34268F058404313BD7BB89B1 = 30_DAYS_OF_NIGHT (30 Days of Night: Dark | V | 0x276799C5EC15232C7C296D5023565F71 ; MKBv17/FindVUK 0.84 -0x606556A76A721FC79429F8E95E65C490953786AB = 30_JOURS_DE_NUIT | V | 0xE19FDD5F971994199EFB898A9E4905E5 -0xF535AC6888788501CAC69B0FE8ED6BDA98F3B111 = 310_TO_YUMA | V | 0x9B4AEFC77441C5FA1A3774C2225E6D10 -0xBEAE33D71F1B5C415D0A1F8750C66F99F23E4CDC = 3711532723 (The African Queen) | V | 0xDCFBA2855EE39C039860DD5EF38B38D2 ; MKBv16/FindVUK 1.00 -0xFC9A3020472CB93EA1C4F4008DA49333AB3CD527 = 3711532743A (The Prisoner) | V | 0x6D569859C753630DFEC84E244F2EE21D ; MKBv16/FindVUK 1.00 -0x175200EB2498793F63E8050E4B2F417EB40CB5CB = 3711532743B (The Prisoner) | V | 0x32E2B15554A5488DA3AABB3CC1817D1B ; MKBv16/FindVUK 1.00 -0x249DF0724D3C0AF91BFE497A2E160FC9C6AE483B = 37832344_XXX_UK_FRE | V | 0x4556F8AB3EE95B0E6E05834EB2C38409 ; mkb v1 -0xF2D3424598346B8DCC60DFC5DB84EFB12F141ADA = 40_YOV | V | 0x930831C668F0ED380E188594AD054715 -0xB44BF4692E2950BBD95AAD136491FCBFD00C9DCF = 40_YOV | V | 0xB471FF6BC018CC06D526EBD123DCD90F -0x8EFAE5DD3E9FB962DD55EC2FCEF7A42E3A2AE46B = 42 | V | 0x4A908C827DA6E3EB1B3C00EDB69353A9 -0xDEEAA9B39B3480AF12BDB0CF18F1A2075FFF6535 = 42 (42) | V | 0xF54094B549557D2D8F3C732A6FA4E2FF ; MKBv31/FindVUK 0.96 -0xD0BD09670B1944BB44F538D65998D44DC2010340 = 44_INCH_CHEST | V | 0x073F9AE6B4495AA7AA33BA110B16CD27 -0x0B2CA822CDB16782B700126AB69F68F54AE504DA = 45 years (45 years) | V | 0x8A2917900CDB6C04877111D3E85CB364 ; MKBv60/FindVUK 0.98 -0x332EACF9C44CB433EF15A80102854D783930A510 = 47_RONIN_3D_G71 | V | 0xD6980F63781DAF093A3C07926EEE6619 ; MKBv47/FindVUK 0.80 -0x08C61335A0B76F722D12EAB8D7BB610E27FE5E9B = 47_RONIN_3D_G71 | V | 0x3544F34ECEDD18EF26A2C7A38D3C6C63 ; MKBv47/FindVUK 0.81 -0x70DEFD88040AC9D83A49371C445544F2DC713618 = 47_RONIN_G51 | V | 0x564B3128BCB7CF503DBDFB4FEFC4AC69 ; MKBv47/FindVUK 0.81 -0x9EA61D2CF027967713A36C0D9C74005F66F85254 = 47_RONIN_G51 (47 Ronin) | V | 0x5867A9F9068A1DAC2649B5F9E2B0F5C9 ; MKBv47/FindVUK 1.00 -0x740DB0F74CF6CE6C45BA1A5F83740C2BCFD2503B = 49775_DEEPSEA_3D_WB (IMAX Deep Sea 3D) | V | 0x3A992913FA85FE66FE384BA57FF3A998 ; MKBv17/FindVUK 1.02 -0x3F00F0D7730952F7D92F2344DE21B0AE72099988 = 5 Centimeters Per Second (5 Centimeters | V | 0x72FE1B92668FE8022CD24045943F3912 ; MKBv58/FindVUK 1.02 -0xBF158EDC8E9F2149D87DF66712E07344E6FA0F17 = 5 CENTIMETROS POR SEGUNDO | V | 0x8F1DC2C9B55DBC98FAC67CA493D7D0B7 ; MKBv43/FindVUK 0.98 -0xE648ED56189CB658C89C5B21137EC3113D5C9237 = 5 cm per second (5 cm per second) | V | 0xABB2D608969AD459E578661FA73C9BC7 ; MKBv25/FindVUK 0.96 -0x1987D710C8F85450CC701CFD547C0804FC836455 = 500 DAYS OF SUMMER | V | 0xC6236BDB5CDAD35F8ADD9D4F6855FF89 -0x58820D864BCA8CEBABC23156BFA1749422010279 = 500_DAYS_OF_SUMMER | V | 0xBBABB3CD44F9D947552EF0084D69F40E -0x2C2543BB5B28254E1B18C0AFF44DBEFCB66C011A = 500_DAYS_OF_SUMMER | V | 0xB5463AC079CD1D10A57062D04CE3355C -0xBB7AA08C58CDBE7CA59174E2B0F7453873878300 = 500_DAYS_OF_SUMMER | V | 0x93FE4C8761AAE8115D2340BC3E75176A -0x8B88F987DBD970AF44D731B5DE7BD625612C0D10 = 500_DAYS_OF_SUMMER | V | 0x99E19BC84CB5233459D677FD3E08D982 ; libaacs -0x528AB9B6AABE43F939015E25E45A6FB079D74CFB = 500_DAYS_OF_SUMMER | V | 0x13A8D1023E1720036CFA0025C9C82E3C ; mkbv15 BD+ -0x9CBBABB65409D76C6B1C81D7A9A6C5B0DAED874F = 5050 (5050) | V | 0x4E91290E0D09F8A9E8DFCF38773CA2F6 ; MKBv28/FindVUK 1.00 -0x04FAF88E8AE5FBF751D411925C2B7AD9D445F69B = 50SHADESOFGREY_UPB3 (Fifty Shades of Gre | V | 0xF85BB39348FD2292DC5F83E5FDC2220A ; MKBv39/FindVUK 1.02 -0xAACF6B3E18686B5B781D7F6701EA63D7AC6EB0C9 = 51 (51) | V | 0xE036BC3465E8189DAE32F1D4B3ECD5AD ; MKBv23/FindVUK 1.00 -0x160444108DAD120C1C592FD44E29FDCDF756AA55 = 52 PICK UP (52 PICK-UP) | V | 0x100099BFC9075CC489B1113A2D2A53B4 ; MKBv62/BEE/VUKNOTVAL!/FindVUK 1.00 -0x2AA2690F0D80F396E371D4C92E3CAA132C4917E2 = 56569276_2001_SPACE_ODYSSEY | V | 0x623FAAED045C4FB75988D73BAD15C460 ; MKBrev 4 - FindVUK 0.54 -0x60D39E21FC11D1B1A5DA277978E26698CC8D2B58 = 5SOS_LIVE_AT_WEMBLEY (How Did We End Up | V | 0xE70D1CC7C036D5C9008510D828F7E6DF ; MKBv56/FindVUK 0.96 -0xC18C4A0729502E45C33484C567A913B6F7C95CE3 = 5TH_ELEMENT_BD (Das Fünfte Element) | V | 0x25F812703131A6BAC12562FFCEE718AE ; MKBv9/FindVUK 1.00 -0x4EA701CB4F11A689F4B42605C35DB26830A88D8C = 5_STARS_LIVE_BD | V | 0x39C8D1BF1A21D17806520555F7737177 -0x574C907D518AE8F01B6BE1C95707B6E59D541E7D = 7000052313 (Call The Midwife) | V | 0xF0FE9944F748D52B2D09EDA080A56093 ; MKBv27/FindVUK 1.00 -0x92B5277D3097BD21DFA2EE2C18B602D947A1A5D9 = 7000052314 (Call The Midwife) | V | 0x7E0F7FAC269943F5233511A02A0AC1B0 ; MKBv27/FindVUK 1.00 -0xDD88EF86119409B8A7BFCA81982372AC0A366318 = 70S SHOW A XXX PARODY | V | 0xA7C2CF84E036D1E5F6DF70F7621D2152 -0xCC691027F5FA674057466C0A0D01165530C524F6 = 71_INTO_THE_FIRE (71 Into The Fire) | V | 0x22C3EC499D03CC8C795B0EE6E479F496 ; MKBv19/FindVUK 1.00 -0xD54A2634105EE30321DA286B3D78039E0FAF26AC = 72 STUNDEN (72 Stunden) | V | 0x651A1691F032DC467F95315D08DE1234 ; MKBv20/FindVUK 0.91 -0x9C7F899A3B035126F80A4DB0B1AF0E30426B4464 = 72 TENANTS OF PROSPERITY | V | 0xB5FE1717E33480FA11381152AC9A9BA3 -0x5FE2F1E2EEBAEDF8DE691A7133254DAE8636EC84 = 76216151_NIGHT_AT_MUSEUM_F3 | V | 0x029FF83BBCA367CEEEE1BE8A6A71FBA1 ; mkb v3 -0x6F4D5B3F496187C4CBE7CB6E6A0B526BF7D76FB2 = 77947342_TOTAL_RECALL | V | 0x43F831044A7AE445FEB938460C83D8B8 ; MKBrev 3 - FindVUK 0.54 -0x7E90CFBF28242C89B11A2DC6818947E8C8883FE4 = 7_SECONDS_P4 | V | 0xBE2F8BEE7EA01C63FEBEEFC8B318C948 -0x7E86685098BD24E116C4BF6EB5613A37F5A6D514 = 7_SECONDS_UK (7 Seconds - Blu-rayâ„¢) | V | 0xED5784B3A6001C5E52C8C6EAD232DE61 ; MKBv7/FindVUK 1.00 -0x4A735F5CDC78B916A80AC3D0FFE2011A0C0E0C89 = 8291626 (Downton Abbey - A Journey To Th | V | 0xBE01D3C4D09393452920BF1F90E3088D ; MKBv27/FindVUK 0.93 -0x48A021D4AC0A0F8EFD9C137123B5659DC7069F9B = 8291641 (Downton Abbey - Series 3, Disc | V | 0x82BDA78FDF450C311E1FC80DB6E82877 ; MKBv27/FindVUK 0.93 -0xF0EBDEEBA1768DF06A8E3D20670910CF3CFC4642 = 8291641 (Downton Abbey - Series 3, Disc | V | 0xBFFC3FDB20CCFF79B020F8ACEF0A5887 ; MKBv27/FindVUK 0.93 -0x4117042609D504F75C22237375EFDF5CEBE8F5D3 = 8296096 (Downton Abbey - Series 4 Disc 1 | V | 0x9CD17B55A28D8210786B3C1E166685F8 ; MKBv43/FindVUK 0.93 -0x78B3A6B069C0DE8DD424FE4F1E401D31112D3211 = 8296096 (Downton Abbey - Series 4 Disc 2 | V | 0x660CD86A7CC60A6B5862D2F23D33EF47 ; MKBv43/FindVUK 0.93 -0xA8DA001AB148CAC669E2FE45B82BB6072099279E = 8296096 (Downton Abbey - Series 4 Disc 3 | V | 0xC483D95E20A92989B573F7ADDA5F3791 ; MKBv43/FindVUK 0.93 -0x591F90969E212C782BF3C494865486867314706B = 8296101 (Downton Abbey - The London Seas | V | 0xE5AD090C4D3801FFF511FE8BCFF52027 ; MKBv44/FindVUK 0.93 -0x93DA0E700C0B552351A6643681A13ADA9069E7E0 = 8296101 (Downton Abbey - The London Seas | V | 0x2F47BDE14A36F4C477B1CAEC6B8B9180 ; MKBv44/FindVUK 1.02 -0x7E50D22116A2744BD70DC8A3E90F767FA0738CA3 = 84235626_ARTHUR_ID | V | 0xEFDC7F25EAF5C69185B93DBDC274B329 ; mkb v4 -0xF21F3686D4606BE6231F216850158FAE5A91AA9D = 88 MINUTES | V | 0x23DF6A38AA78AC1FBDB0B5FAE0BFBC81 -0x5FFE2616A9E151D111771AC875E75F562EAF0873 = 88697940619_SHAKIRA_LIVE | V | 0x95D04EC4B31910FA5CBF4ADA81202400 ; MKBv27/BEE/VUKNOTVAL!/FindVUK 0.96 -0x6AFF420869157CF15668ABF81812F5640D5FD4BC = 88927563_SHINING | V | 0x10941D50C4C3C20929BDF90AE5C6CAA1 ; MKBrev 3 - FindVUK 0.54 -0x67CC9982A21A31EE9E1FF9DC901330CEB4D98537 = 88MINUTES | V | 0x6238A1F15BAD7A30305A11E553CB0EDA -0xD550A36759195CD1E9D2A30BB661595BA57D8F4F = 88_MINUTES | V | 0x4AFC99A7C6DD19C7A79561CE489DFF01 -0x005E177AAA8D61772E993B1404982B5CCF2A7B65 = 8BELOW | V | 0x0AB3E3EBFF30BBC524B39E1D6CE7ABA6 -0x67999F558218995305ADC3D1144E8399B7F14E70 = 8BELOW | V | 0xB98FE2AE7B848B98D052A2798F11E597 -0x18AFBC7BF399E912C83875EFB6AD3CCFF1F0B5B6 = 8_5 | V | 0x22BDA747BB91B150A3E868BCE6413AE6 -0xE559E711C35F774BA81BD49AA1B939B2D5AB6429 = 8_5 (8??) | V | 0xB12ED0F817F3CCC65B412274A4DE2DA2 ; MKBv4/FindVUK 0.96 -0x63EB0B50E4F5E76CCF387E23D030D8AC454FD68F = 8_MILE | V | 0x334F8971052057C79852FFED3C21E325 -0x56BEBB6433F1AE83844E1D8A336570138EE0BC17 = 8_MILE (8 Mile) | V | 0x4C37EE4DEA2565B5556C423A93A223AC ; MKBv8/FindVUK 0.96 -0x90F0D1833F56BB9E701E3820BA2C4B2E160B3A37 = 9 | V | 0xB0176193E1BF46991D3BB0DDFCD14C38 -0xD03A9C61FF61AAB75457462CB6E65184E180A4C9 = 9 | V | 0x70D35F38528BB2C92DDB024C385020DB -0x427C459679B7F366BE73622F99B59A980291CC12 = 9 | V | 0x6E13F94B4D616E464A178C7656D9380D -0x9ECD5640C2E5778291AF88169E5CE61A8E7811FF = 9 | V | 0x5C932BD66B4C5139A292FABDE44FC9E4 ; mkbv16 -0x0AB2B07D8D4C91E5259089CC0A9927F06C178097 = 9 (9) | V | 0xED18266364D5D28ACBF2F7E9C566FA45 ; MKBv16/FindVUK 0.94 -0xC079D24847F77C350E964AE2796CA0C379AC35FA = 9 (9) | V | 0x1AFC766425992EEE88F485816EA1AD81 ; MKBv17/FindVUK 0.92 -0x884651F124150317B0E1D02D053ABF83EFE32FBF = 95312002_TRANSPORTEUR2_ID | V | 0xFFE7E3AAD8C474A00BC98F948A80F84D ; mkb v4 -0x84F42E45DD48398009A9843734A6B4F691F7D8A5 = 99094134_HITMAN_ID | V | 0xA98D064C31E48567E718F13F0A50DE48 ; mkb v1 -0x41E3B335F64B0CB50F2807439496648BD50A812A = 9PGD_341 | V | 0xB6F5B701A2DA94221FDCC421AAD53BF4 -0xCFEE7E60E61D23EE670ABDA3558658C7FE1C23B8 = 9SHKD_415 | V | 0x1D3B06757BC8FAD15089A246F77B37DA -0x4E1171BFB877608060F42117F2C7418B4EC419C0 = 9SOE_287 | V | 0x99A54FE8AE4277AE78CCB45EC2A463C6 -0x1F2CAA9162DB69ED48793823F7385F066E95CEA9 = 9SOE_354 | V | 0x035B717DE28DB43FBFE4A959353E967C -0xC8304CE70F2D5D4D03D642848180C804F7155180 = 9SOE_385 | V | 0xFBDBC8B053F1E0A482E10A9D4C00AFD9 -0xC227B2EDC7A83A34AAEB357B3528733DF4FE26B3 = 9TH_STORY_CONCERT_NEIN_SP_D1 | V | 0xE9D1DA8A69074FB92494DDBD1B9662A1 -0x680B2AD1DC4C0DB156B8D87871EF94798E19F2E1 = 9TH_STORY_CONCERT_NEIN_SP_D2 | V | 0xEEC1EE9EF701848FCB3B34D20078F97B -0x5821BF2D343C84B5350ED963278E19066C9D0E53 = 9_AV | V | 0x6B85E357FF3AA1AB5216ACFA1928BCA0 -0x366ACABFA101214B408F13023CB1BABAAD1D9530 = 9_BENELUX | V | 0xF182E067C8FCEEDF8407E594693F7350 -0xA4928126417A75A43D82170C6F95447411438A47 = A BETTER TOMORROW | V | 0xFF7B70640C051F825FAD637B47258235 ; MKBrev 25 - FindVUK 0.54 -0xA84EED5DE72800C9DB9EB8AFA9AF0D9FFCD07A16 = A BETTER TOMORROW (A Better Tomorrow - B | V | 0x84689D9897401B385F400766B5FE5FFD ; MKBv53/FindVUK 1.00 -0xCC435891089060FBD35CCAEFEA58EE66CF0123A9 = A Bug s Life | V | 0x2D39F1BA0FBD66C963AE0CCB0C4C13C8 -0x8E162EC96710117D70A1DA9B83E93D504B99DECD = A DANGEROUS MAN (Der Name der Rose) | V | 0xE33F37E0825B5342C22C0588BA84A091 ; MKBv17/FindVUK 0.99 -0x6E9AB4D66F7D2AE1FA21E1A78323DD8F4EEA480A = A des millions de Kilometres de la terre | V | 0x0CFFD72A78E775E690989E48201948AD -0xCECAB6D006E89BE00499327E768D21B3E37D19ED = A Espera De Um Milagre - Green Mile | V | 0xFDA97896DF2CECD76E05F5539DD3CD78 -0xCFB3EA872BCE4590BF786916F494A6229DA9738A = A Few Good Men (US) | V | 0xA5A5DB846B0A7F7D76830B752CB59B08 -0x6F74DD5D1783463D15673A703D73F661C4BEF4B7 = A Girl Walks Home Alone At Night (A Girl | V | 0x0CA0C070CCAA89AAD9DA60D662F2F861 ; MKBv56/FindVUK 0.99 -0x953D6FB6198DA3311AA4932E8763BE63B1C32B85 = A Good Day to Die Hard | V | 0xEE67F6CFC588901215C440636E699DCC ; MKBv35/BD+/FindVUK 0.80 -0xD1CE633DD9BB61076EA5C7B6A6652EECB02BF7F4 = A Good Day to Die Hard (A Good Day to Di | V | 0x2E476E07E29152A6836EC5B6C3987E44 ; MKBv35/BD+/FindVUK 0.91 -0xE46E82AD5B992E3F9DABA04C5692A0FEB3DBE3FD = A Good Day to Die Hard (A Good Day to Di | V | 0xD9DACC6F555504481D412B2B1C1FD257 ; MKBv35/BD+/FindVUK 0.89 -0xE1705C7E75B03A2ED2DB79FAED825BCA257A44F5 = A Good Day to Die Hard (A Good Day to Di | V | 0x715778EF17DB13441B1E265B2B349995 ; MKBv31/BD+/FindVUK 1.00 -0xEBE62C608A1B87C0A5A135EC107F7CA7E22C21F2 = A Good Day to Die Hard (A Good Day to Di | V | 0xC5899CFFD9723BF6257B2829ABAEE22F ; MKBv35/BD+/FindVUK 0.96 -0xFF85286ACCE43FFBFB6569C686D4A5DAE28E3FE4 = A Good Day to Die Hard (A Good Day to Di | V | 0x924271C85A4FF92A486967AE100A881B ; MKBv31/BD+/FindVUK 0.96 -0xC7B79166C4F13B420AFA2697BA5C949BB6920F72 = A Good Day to Die Hard (A Good Day to Di | V | 0x17795D9420C6BC27B35E9C01DD427093 ; MKBv31/BD+/FindVUK 1.02 -0x3474CE712D4C04E518BC5B6A9D8614BE6D6425CC = A Good Day to Die Hard (A Good Day to Di | V | 0x2FF9E4AA1897CADEC632848EF6340F00 ; MKBv31/BD+/FindVUK 1.02 -0x2A63433A70546D789D5B44FCACDE972DB60611A2 = A HIJACKING (A HIJACKING) | V | 0x2A22AAA1104F8AD35BCC2F3C9D940B7E ; MKBv38/FindVUK 0.92 -0xD83FFA7920BC76D37D2ADD9C3B132952623D34E8 = A King in New York | V | 0x0FE0F4B674A0CCE8E6F0453F10115BCD -0x07CA81E257B0482617CBEF32BB292D5C8FADDC5E = A KINGDOM FOR THE DZANGE GORIL | V | 0xC9F693B497566FB0A0556410E37593B3 -0x0E01BEB4F19CE9AAF23621B730F8D6BED2546BDE = A Liar's Autobiography | V | 0xE6BB80913F19372D6326BB066BA46A31 ; mkbv33 -0xF9DC3242FC2F91312401DB910F03681301990576 = A MONSTER CALLS | V | 0x5D8FF96D14DD92D7FD44D33AF3344A91 ; MKBv62/FindVUK 0.98 -0x533CC7414B3AC6DEC72ED6F2C8D04C347C40020D = A MOST WANTED MAN | V | 0xD8C71F67C79DBAD5A19C290D48B48E78 ; MKBrev 47 - FindVUK 0.57 -0xB5C03589B095995865C3AB292D80F2AB48EF3ECE = A PROPHET(US) | V | 0xBF6A7029C3E4B593936627B165C32AE6 ; mkbv18 -0x104EA9D53B0DC918A1A7BFFA8487998D1F82D853 = A ROOM WITH A VIEW | V | 0x8D85CF9377C40F64CD04F23A6A95518A ; MKBv12/FindVUK 1.00 -0x59ECF9FD457F6825E4E2E598653F193D4C6813F6 = A Scanner Darkly | V | 0x81DEB9D00BB98869134799BB25BEA1BA -0xEDF289D6051CD1192E27618D43C1ED13322D617E = A TeaM | V | 0xC44B1D97E31E06EC7C57EFF746C69184 ; mkbv18 BD+ -0x009BB39E1986116DD968F36B0255CCCFCF44F5A5 = A Time to Kill (US) | V | 0x0E4DCA8A7E865EEF4DD2D719CDC3FB5B -0x5BDCA8EC64A8B33C75E6ACAA5D6B718A7432A2CF = A VIEW TO A KILL (A VIEW TO A KILL) | V | 0x54D092C72F99CD12775427D50D0ED91E ; MKBv20/BD+/FindVUK 0.96 -0xF83E222ABFA6B359AA4273609E8FF399C29433B8 = A VIEW TO A KILL (A VIEW TO A KILL) | V | 0x1F2B074839108BCAEE79DB716C09D6D1 ; MKBv20/BD+/FindVUK 0.99 -0x2003ABC8489B1A9ACE139FFFE89D9681F6C342A4 = A VIEW TO A KILL (A VIEW TO A KILL) | V | 0x132D5CF6F4283DC90F2FA4C1287E811F ; MKBv20/BD+/FindVUK 1.00 -0x0FBCA20289F1E6DAE29929AC4DC693BB8797D35B = A VIEW TO A KILL (A VIEW TO A KILL) | V | 0xD48A46CF2A83818FF36E8AADA9FBFD10 ; MKBv20/BD+/FindVUK 1.00 -0xD33886F72264F65821987BD0F46452C45693ED77 = A VIEW TO A KILL (A VIEW TO A KILL) | V | 0x3301A0A11C78B69D28549268491EB0BA ; MKBv20/BD+/FindVUK 0.84 -0xDCD23F94A4CB17EE159CC057C1B5E317FA2BAE08 = AB0902_1 | V | 0xF758FE16D7EDAFB6D62A4A661306AF81 -0xA75A658FF2716575D12B6F81CA20ABE4756398D6 = AB0903_1 | V | 0x821A19DCB278427AF887D9CEF16B5936 -0xCB5C4476EB49BAE9F39D3A967EE7E855CA99BAB6 = ABDUCTION | V | 0x7EBB30EDD22B9CA7A7386C321EE53E17 ; MKBv30/FindVUK 0.84 -0x9457CD9C3FE7D762512407A0BEB9B4EF4E764BF5 = Abenteuer in Rio | V | 0xC851862071A5F394C0DEF5AE80D61B14 ; MKBv46/FindVUK 0.89 -0xF86529ADCD18793D88A1C349EC4A87365A698712 = About Time | V | 0x0818239243AA4AC77D63E7BAA7C2BBBB ; MKBv44/FindVUK 0.92 -0xFD248B30948E24D64ACB39879867B453AB1929D8 = ABOUTMARY | V | 0x93C87562D2C81C369CE4D2CC7AAEB504 -0xC974BD288077CFEA0DF8CA2407AEFE54B19B87F2 = ABOUT_A_BOY_G51 (About a Boy) | V | 0x8CB56FAED79E2132A1D1A613456FBFCA ; MKBv19/FindVUK 0.92 -0x0C2F920417AC04D393E04A5EBC374CC96ED4EB2E = ABOUT_SCHMIDT (About Schmidt) | V | 0xD438C7E27F586AB7B3A4827B56A5354C ; MKBv50/FindVUK 0.96 -0xFDCA54FD52922DCCB6398E46B726A7FF9904A0D1 = ABOUT_TIME_G51 | V | 0x9C2052BE15F8CB22B38E66A7DD2A66C4 ; MKBv44/FindVUK 0.68 -0x3F1281F1DF03EFB778E51CFCBF9108CE0DE1C2D5 = ABOUT_TIME_G51 (About Time) | V | 0xEE5E79EE1443D4B49A7E2CA903C1AC5B ; MKBv44/FindVUK 0.96 -0x3A67CA98B1C4C7772DA130835DC24F33BD436040 = ABOVE_THE_LAW_BD01 | V | 0x7026C9B4E6CD85FEF6E54F79ABEE8AE1 -0x8CD374AC1E3D43964838CD1A717752CB64264374 = ABOVE_THE_LAW_BD01 (ABOVE THE LAW) | V | 0x2A85A0FFB40822E2CE87A3485E43180C ; MKBv12/FindVUK 1.00 -0x0EA50BFB84E3C21D799585AD6CB03C1624FE2BC7 = Abraham Lincoln_Vampire Hunter (Abraham | V | 0x114362D9A811C34A8184946EBAA9DB65 ; MKBv31/BD+/FindVUK 1.00 -0xCD8424B284D005A6754F6F40A74C99DEB19B5B8E = Abraham Lincoln_Vampire Hunter (Abraham | V | 0xB566B059DA930723F751CAAA4E253859 ; MKBv27/BD+/FindVUK 0.96 -0x4DE721C0FC08769CB41CAAD5DBADEF83193048B3 = Abraham Lincoln_Vampire Hunter (Abraham | V | 0x30DE5590B2D4E626416B58EF01DEC19F ; MKBv27/BD+/FindVUK 1.02 -0x5B26A59F1828FC48BA5015B9CDEDA27D1CB89D07 = Abraham_Lincoln_3D (Abraham Lincoln Vamp | V | 0xA87A7C76382937A64D5B2ACFA6A34569 ; MKBv28/BD+/FindVUK 0.96 -0xD652C89F90CBDA9B0EC86B4076CB09A799CBF2CA = Abraham_Lincoln_3D (Abraham Lincoln: Vam | V | 0x4CA2BDB1A94CDAE06ABAF5C5BA198204 ; MKBv28/BD+/FindVUK 1.02 -0xE35254A8520998F3AE5823BAB7F2DCC25D5A3087 = ABSENCE_OF_MALICE (Absence of Malice - B | V | 0xC356A572A6D77694F55CC84FE6B8ECAA ; MKBv27/FindVUK 0.96 -0xA1ACC7D99795044D12DD49578B3DD8DFCC296573 = Absolute Power | V | 0xD8D2AB1392B887281591B4A5F2374671 ; mkbv16 -0xDE35242D915A14449FCB4D9D80F8C7EE29222F77 = ABSOLUTELY_ANYTHING (Absolutely Anything | V | 0xA26DAB6BDF9988B0BE750BBD42D4F089 ; MKBv57/FindVUK 1.02 -0xCB180A27BA3775DBE5E79B3D05AFC1C1E7684705 = ABSOLUTE_DECEPTION (Absolute Deception) | V | 0xB553CD81F488D50AB5811F5098B6E749 ; MKBv40/FindVUK 1.02 -0xCC6A1F120714A841EDE562864FE6C392FE8D03B8 = ABSOLUTE_POWER | V | 0x24DE69C6B6473FA90B8107223F30328E -0x42D4BFCAFFD3E2A23E0AFC468CB3B0437AF7E15A = ABSOLUTE_POWER (Absolute Power) | V | 0xDCC62E31CCA7519E2F93B379B0B0C636 ; MKBv16/FindVUK 0.96 -0x5927732CD6AF91D5D1A0BA979CA898A5B96917F8 = AC/DC: Live At Donington | V | 0xEE452BFC97F0A9F7751936A04F661B1A ; AC/DC: Live At Donington -0x350A6CDC91D5CC9F31F4F3C84F2B46E4A91D3696 = AC/DC: Live at Donington (UK) | V | 0xFFF987A72C42422969AFF5B0023C3176 -0xE65491D541FAB4E1C3D263536D00B0819CC89479 = AC/DC: No Bull (UK) | V | 0xABA5D8C58BEA31E8F3448B0C1F19517B -0x974EA78D0AA027A5CD672F9FD4F73FD294A70472 = ACCEL WORLD DISC 1 | V | 0xF185D4872C0A9230456DDC5D693B2766 ; MKBv40/FindVUK 0.96 -0x683791B9DDFCB5B24556E9623BB4C464E051F87C = ACCEL WORLD DISC 2 | V | 0x6AD8DC70D271847641B12893184EBCD0 ; MKBv40/FindVUK 0.96 -0xCFB904D58B7EDDE59F0D77EAFA1A15FC8F2F9F12 = ACCEL WORLD DISC 3 | V | 0xBECD43ADD36DCB8F7CA8133D84233386 ; MKBv40/FindVUK 0.96 -0x7CDBAEBEA16598FA0D45C4E52C8A39235AD20DF8 = Accel World Set 1 Disc 1 | V | 0x37F02E5C0F5D8810441F8B30426330E9 ; MKBv42/FindVUK 0.93 -0x874AE23EB7D28278E4B7FA108B04EAAD78BC9073 = Accel World Set 1 Disc 2 | V | 0x4F2F789ED7E62A2BB366D1956E11B7FB ; MKBv42/FindVUK 0.93 -0x02E46B7DE54A8AD5F0E7B6EA4BEB12B4FC802B4B = Accel World Vol. 2 Disc 1 | V | 0x61E9E984D20CB53D722AE48FDEACA614 ; MKBv42/FindVUK 0.93 -0xEC6811AF7F3B76A21BF35C3ACFC5B73FD6B14FBC = Accel World Vol. 2 Disc 2 | V | 0x92A2480D1BA813C5332F160B2E1BF4AE ; MKBv42/FindVUK 0.93 -0xEBAF0EF531A2F97FDBD6420DE61BADCB718369EC = ACERTAINSCIENTIFICRAILGUN_S_D1 (ACertain | V | 0x94B36632638D4573FC83A1D3AA9F8FC0 ; MKBv57/FindVUK 0.96 -0xBA52B3E517A6B3A0217F4A3734D2764AC4C215F9 = ACERTAINSCIENTIFICRAILGUN_S_D2 (ACertain | V | 0x392123BBE75ED64F365C3363501E1297 ; MKBv57/FindVUK 0.96 -0x03427A28E1C80F80EC92C8AD7DB25FB46EE88F59 = ACERTAINSCIENTIFICRAILGUN_S_D3 (ACertain | V | 0x3530508783BDC940E07D876372868D16 ; MKBv57/FindVUK 0.96 -0x5DE5C7D7EC7A41C2C4A39A106AFB840591C09BE6 = ACERTAIN_SCIENTIFIC_RAILGUN_D1 (ACertain | V | 0x59900DBE3D7CC3ED223183AD0ACACD5E ; MKBv50/FindVUK 0.84 -0xAC0A0D12BF37A63317903889BDF0B5F818384141 = ACERTAIN_SCIENTIFIC_RAILGUN_D2 (ACertain | V | 0xD7125AA679F80D861F3B87967E5CD57D ; MKBv50/FindVUK 0.84 -0x481BAD4502D0CFDBF3506C96BE72E87BB59147A7 = ACERTAIN_SCIENTIFIC_RAILGUN_D3 (ACertain | V | 0x3B5B5D3DD60AAE6875F7912AED04AE73 ; MKBv50/FindVUK 0.84 -0xF6523F9E6B8CCE564939E2F9D78DC5A386C5DCD7 = ACERTAIN_SCIENTIFIC_RAILGUN_D3 (ACertain | V | 0x9A1EF7560F7234AC85A9655665AC07C6 ; MKBv50/FindVUK 0.96 -0x1D76AAEC5DBAF44DA693C9A08E74561EA7D8A56A = ACE_VENTURA_PET_DETECTIVE (Ace Ventura: | V | 0x11F1216851D72AFB581276C11F00ADF7 ; MKBv36/FindVUK 1.00 -0xA8555AD0B55733BE3A294C0AD3490F74E48989E0 = ACE_VENTURA_WHEN_NATURE_CALLS (Ace Ventu | V | 0x4CAC024EE087816C538F33FC95CD1BC9 ; MKBv36/FindVUK 1.00 -0xFE55E2BFB2309B9A8B3525145B54A17208BBC462 = ACIS AND GALATEA | V | 0x365AF35BD88B8C8BFE639531CBB4C78B -0xAFBEC6D44635F1C7CF3D1AC2F8193097565C8788 = ACMF_NA (Abbott and Costello Meet Franke | V | 0x0C926CF8327327EB18D9E1FF6EEF8AA2 ; MKBv31/FindVUK 0.92 -0x1EBC62215819CA8C46ECA09CE8D4F4FB6DFA6000 = ACROSS THE HALL | V | 0x47CB5F6E986ED0C9C9BA2ECD4A16E3A9 -0xACF4760DCB183C1EFDA291E968DDF56E2A1EEA7F = ACROSSTHEUNIVERSE (Across the Universe - | V | 0x80077F7ED335FF798927E15489C0A93C ; MKBv4/FindVUK 0.96 -0x85C323C0484D1BF4725B7E8805C9F912C8763493 = ACROSS_THE_UNIVERSE | V | 0xA36D152D2D21E53B1465F7999A83DA64 -0xDA9DC6F761F68AE2CECD84CE8F269F15C41FFEFA = ACROSS_THE_UNIVERSE | V | 0x7BE0BEEADE9BF38856A730B99A07BB8C -0x8CE2B3BA65D0DBCDB0D464A4DB702F42B86C6B8C = ACTION_JACKSON | V | 0x150C4D2D81E36BA0FE79D352AF49E661 ; MKBrev 36 - FindVUK 0.54 -0x12B1E830FD009DBC5E4295A67DA24ED53F09230B = Adele Blanc-Sec | V | 0x3B11F8900EED6E2D95B057CF2B2BBFB4 -0xCDAE802BC15E2458BAB6A032A25AA3B6AEDD41D6 = ADELE_BD | V | 0xD8C44FD1CDC69A19AB55AB8424E7ABE2 ; MKBv21/FindVUK 0.80 -0x9A5CBEB3A8FB20A12BF725D6921FCAB015D7E0F2 = ADJUSTMENT_BUREAU_G51 (The Adjustment Bu | V | 0x8630625830AA296F88B426FB76EC4737 ; MKBv20/FindVUK 0.98 -0x004CC9027B6E2ACF1C178F4110B30244EEC5FE38 = ADLER DER NEUNTEN LEGION (Adler der neun | V | 0x9A6FFEF15697C8515F85D0536DE8E662 ; MKBv25/FindVUK 0.84 -0x697AF3C3D76C1F47F91F9362D6C7D498A9B35137 = ADMETO | V | 0x2067BB35F41A2AC272062F6AAF338D89 -0x6D70F39F09EFEDB0FD39E454C58A7D78A2F6F82D = ADRENALINA 2 | V | 0x711B00517785637996E9FCF4FD8457A6 -0x4E7628352AAF7C9FD0DB7545695FCD4974E2E610 = ADRENALIN_RAUSCH (Adrenalin Rausch) | V | 0x95EF2A8EF25DF0301FF20CD9F108FDA9 ; MKBv19/FindVUK 0.96 -0x33956BDABD5CA0222896BC6BEAEEEFE55BDC53CF = ADVENTURELAND | V | 0x49CDFD8F3F9D6379B6A684B74960DEAB -0x4A76BE9774A2A9242C08E271D14219A6B074ECFA = Adventureland | V | 0x5AF7404F032B94EC946D5FF6FC03260A -0x90DBD8BA2767FA59EAA21F68DD0667A62E77826D = ADVENTURELAND | V | 0x814BC1417BFF84717398F87AE66B054A -0x975C5B3AA1DFC1FB1183DEE985D62987BC843F55 = Adventures of Robin Hood | V | 0x838E4046F2DDA7951B27B23F7B88C7E0 -0xF1918F36D2B7C137D84B7C122AB292D64A025774 = ADVENTURES_OF_ICHABOD_COMBO (The Adv. Of | V | 0x7B80F1916CAE533086E1AE6747ADE084 ; MKBv39/FindVUK 0.94 -0x98E2F14E3AB26DC785E30530B1ABE0229ABD32A8 = ADVENTURES_OF_ICHABOD_MR_TOAD (The Adven | V | 0x5C1CBFE1E1DC90C33DF2E453F43ED10C ; MKBv39/FindVUK 0.92 -0x43333D74D3A06014F43C6D6DCBE76EFE8F3EC3BB = ADVENTURES_OF_TINTIN | V | 0xE222B50F0909003F9A6C709833A962AC ; MKBrev 25 - FindVUK 0.57 -0x153FF3E5DC15C1FCF3638106A66365398060321D = ADVENTURES_OF_TINTIN (Adventures of Tint | V | 0xD22C43D8C4270A91015C2018C5D6C9E4 ; MKBv25/FindVUK 0.96 -0xF1BBAF9F93FCF5AA0AE4266B423642EB8F902B42 = ADVENTURES_OF_TINTIN (The Adventures of | V | 0x3FBF6310665E96FC686A88E33158383A ; MKBv26/FindVUK 0.87 -0xCED9DAC67C9A4CC4C43C629EC5A035A8807714AB = ADVOFPRISCILLAQUEENOFTHEDESERT (The Adve | V | 0x77429EC090952CF6E4DB17D8F49B77E5 ; MKBv23/FindVUK 1.00 -0x3699D68C41E8CBC1B6EDC1897100A16A8F746FC3 = AF1_DEU | V | 0x5882905D0ED605A4FFB94A857C08DCF1 ; MKBv3/FindVUK 0.91 -0xBDF78B87B194157AA1E837D4D0ECEC040E021D0A = AF1_GBR | V | 0xF3A88D1A056D74493E508D1D963DD55A -0x434B000C7EC34D2BC18CF787EB230AA1663F818F = AFRICA | V | 0x8943C646009E60E5FD7485042E8D4C38 -0xA64B34EF09C0A3E38DA427D04B03C89F30FF5318 = Africa Imax The Serengeti | V | 0x47604551FCCC20EB1E462378D240D783 -0x776F900F8D196AE7E52BADD30D69FD1EEBC4C052 = AFRICA_D1 | V | 0xA1A0A328BC1BDF278A6D9CF67F1134CB ; MKBv33/FindVUK 0.80 -0x4066E3D4F6C721C9CE6AA643476C63E67B32E8B0 = AFRICA_D2 | V | 0x6A73D408977B62EA121BFAA9F69237DC ; MKBv33/FindVUK 0.80 -0x61871E73A529A53D14BC0DB66DAD132063D4DBC9 = AFRICA_D3 | V | 0x4DA778BFB88A96D9D15758342735DFFC ; MKBv33/FindVUK 0.80 -0x474BF1C5FFF09BE07FE35F4D5C3E5DE6B5E8FFAB = AFRICA_D3 (Africa Disc 3) | V | 0xE28229C8B749842666ECB2F005A4DC4E ; MKBv34/FindVUK 1.00 -0x77CC4B6D4D9D743C54687152BFFFCBB44CCBBA5F = Afro SamuraI | V | 0x654A84363D5E0E269E608F2E792BC415 -0x2967407299CD8CCF8D1CF6942714443B3FEF2A9B = AFRO_SAMURAI | V | 0x184748AAEBC314BD05B95C67CBDD3F9E -0xE8CBFAB0CC6961D22FA3161CC9D2290ED6EA52C1 = AFRO_SAMURAI (Afro Samurai) | V | 0x012224FF81F3F410C8D8F1F8B26D5AF4 ; MKBv9/FindVUK 0.94 -0x6B09D96018A1151F71E8738D22FC8AC003FF6A0E = AFRO_SAMURAI (Afro Samurai) | V | 0x8D5D6F3111AFADE94BCD6719692788F3 ; MKBv9/FindVUK 0.98 -0x9DBF2247835B2DE6D9DFEF8746672683A7A2051C = AFRO_SAMURAI_RE_BD (Afro Samurai: Resurr | V | 0x95CAFF895D68DDDB54DFB59F7244F236 ; MKBv12/FindVUK 0.94 -0xF83B710AE1550F690BD090055D2EBDDA701A5F0B = After | V | 0x3CE3D35597E49611625A210B8C593B01 -0x2A0D68C783CDC077729EEF581491DED5AD639FD3 = After Earth | V | 0xB8D70F4FFB9CB6DDD2148BACE4B8521B ; MKB V43 -0x043D58001A95B96ABCD83370CD993908E572B5CB = After Earth (After Earth - Blu-ray??? (M | V | 0x70186A8FA7CBB396A45D9CEFD89FF012 ; MKBv40/FindVUK 0.94 -0xEA65C292B51089C8803C1CF6926F78B4BE342316 = After Earth (After Earth - Blu-rayâ„ | V | 0x8C4A9A2E85154167115AC3781892B567 ; MKBv40/FindVUK 0.96 -0x196313A786DE498E373062B63E7F29AD7ACAC7F0 = After Earth (After Earth - Blu-rayâ„¢ (Mas | V | 0xD083B34691D29555FCEA8D3E35679BBA ; MKBv43/FindVUK 1.00 -0xCF09BEC20B04EC6C5945EA3C6D516998BED7C9BE = AGENT CARTER SEASON 2 DISC 1 (Agent Cart | V | 0x3E110F16723D2ED386F9CE84216C5A7A ; MKBv57/FindVUK 1.00 -0x37A99F6E6D8CA6F6DC89F61003BCDE4B72FDEEB8 = AGENT CARTER SEASON 2 DISC 2 (Agent Cart | V | 0xF3B65285056D24F764E4CE59F1F5016A ; MKBv58/FindVUK 1.00 -0x40F7748DEAEB8FD623FE36BC30AE2F593E67C270 = Agora | V | 0x22AFCF3352712A93B9AE22EA9BA3DBCE ; mkbv17 -0x8693399D67EE77E7E86F363988615FB20B613DDD = Aguirre (AGUIRRE) | V | 0x2726AA0CF5D48635E5ACC5963463A9F1 ; MKBv47/FindVUK 0.99 -0x880622BE823958D72E04F81789883EE649A00DCF = AGUIRRE WRATH OF GOD | V | 0x6985624631E8B4CEE282B134A00EBE66 ; MKBv46/FindVUK 0.99 -0x4D6038EDFB62E8BF2F4AD7E383CC183DC0F67EA3 = AHA THE FINAL CONCERT (a-ha The Final Co | V | 0x51D9FCD4140374506CC78F4020F7269C ; MKBv23/FindVUK 0.96 -0x66807FACA044E427D69315CFF11504521C89CA8A = AHS_S1_D1 (American Horror Story, Season | V | 0xB749A878A8424421F612621E890F7495 ; MKBv47/BEE/VUKNOTVAL!/FindVUK 0.96 -0x34067D29527CB963EFF15A6204B9B734D86FE030 = AHS_S1_D2 (American Horror Story, Season | V | 0x3AF99D372DB6A978BF8175F68CD71EEE ; MKBv39/BEE/VUKNOTVAL!/FindVUK 0.96 -0x58764BEA5EBDF6A93ED06ADA0F452D73F229DCC1 = AHS_S1_D3 (American Horror Story, Season | V | 0x2DF6802BD191CCD2FBAEB6611E56C889 ; MKBv47/BEE/VUKNOTVAL!/FindVUK 0.96 -0x2C8B5804C7D462A4F397372F0C37D9A15B3E1501 = AIKA_ZERO_1 | V | 0xC6F63798BA16C2B1D473AB047CEB20E9 -0x1FC8B27861F012FC94D6D4FCCA73C5A631280456 = AIKA_ZERO_2 | V | 0x6D6E6D33C0F7FC29D893E5D9B48C276D -0xCAD4E3F86A10FDF552ED9316A9DB3A48E90D2290 = AIKA_ZERO_3 | V | 0xCBB6C3272B5DE205704BBD0CFC7714FD -0x33827CD4DA69B891514F2CDA29498392A7D60A53 = AIR Blu-ray Disc Box (Vol.1) | V | 0x1E80A6BD90C9CEEBCFC92389B7B56289 -0x1ED72C850260D2BEB67644F2DB6D925A058CBB5E = AIR Blu-ray Disc Box (Vol.2) | V | 0xF9FBC978B24EE05EA9473321ABAFD296 -0x3F6EC85EBCF69691C3715EF760104CF64D777C93 = AIR Blu-ray Disc Box (Vol.3) | V | 0x5A297B1FC0F26BF8A0CDDC6CA9F5E6D6 -0x1C1376A896CE1E9BFE23BE5F4F0395B847893A9F = AIR Blu-ray Disc Box (Vol.4) | V | 0x34BA7364D4A97630CCF801FA976E0416 -0xAE09E63D45D7B7B5ADCF3E79C28737814C525189 = Air Force One | V | 0x6B1659C93055D43AF5E3354E6BA05DD4 -0x804D0839847C411BFBED6FEB72070A7BC37D5A30 = AIRPORT_DOM (Airport) | V | 0x96C9A8F6D2E09AA4E55D9474337CD727 ; MKBv25/FindVUK 0.96 -0x007F7C041C47611705479AC6080765C58F52AC94 = AIRWOLF S1D1 (AIRWOLF SEASON 1 DISC 1) | V | 0x5D1B1C7730C755697C5BAC95C431C9C8 ; MKBv61/FindVUK 0.99 -0xF64C83D44AD73A58E7060D64F8471DE4224E9595 = AIRWOLF S1D2 (AIRWOLF SEASON 1 DISC 2) | V | 0x68C608EAAB4EEDE779B7E241370E9FA3 ; MKBv61/FindVUK 0.99 -0xB2C433485D8198A8739999B1FABFE88D20D32BB9 = AIRWOLF S2D1 (AIRWOLF SEASON 2 DISC 1) | V | 0xDC6E480D7CADABC81079210C838262A8 ; MKBv61/FindVUK 0.99 -0x382BC0EBD0AEE3151764361BCA026CCA31BEA172 = AIRWOLF S2D2 (AIRWOLF SEASON 2 DISC 2) | V | 0x3AB838A90641FAFC83590815D07B996C ; MKBv61/FindVUK 0.99 -0x2B6BF8653708B3C42346A0A2D6FA270446138F24 = AIRWOLF S2D3 (AIRWOLF SEASON 2 DISC 3) | V | 0x5653E3B47B278365EEAB8171821EE4A4 ; MKBv61/FindVUK 0.99 -0xC0519CA027AE9AFF9739BC400F26FF3708C9F560 = AIRWOLF S2D4 (AIRWOLF SEASON 2 DISC 4) | V | 0xB80FAB840D92E1BA13BBA01389C4709B ; MKBv61/FindVUK 0.99 -0x6FD80107893CEC3829191FB5AC1A35E38A56AB8E = AIRWOLF S3D1 (SEASON 3 DISC 1) | V | 0x77F0CFF8467EBC516B58EBB93A8C103D ; MKBv61/FindVUK 0.99 -0x110A4E369CBA86961BA8A4435660C6F737497E61 = AIRWOLF S3D2 (SEASON 3 DISC 2) | V | 0xEB24DC72CCE0A29A5506DCEA031C1B99 ; MKBv61/FindVUK 0.99 -0xCC8DCABF1A8B6A0E2DB207309359AAA042768362 = AIRWOLF S3D3 (SEASON 3 DISC 3) | V | 0xBE5FE83CA462C397A1134D33B9419B72 ; MKBv61/FindVUK 0.99 -0x19DA8A39C0A18F599C65DD5521F1A561B82CB567 = AIRWOLF S3D4 (SEASON 3 DISC 4) | V | 0x7FEBEE8F9ED859D049163B361FA0D8A3 ; MKBv61/FindVUK 0.99 -0x1C58BA0DD712D17DFDC6F08E1A861F5C54B51C27 = AIRWOLF S4D1 (AIRWOLF SEASON 4 DISC 1) | V | 0x98C679725E4FCF4CD174B092CBAF8E38 ; MKBv61/FindVUK 0.99 -0x26DE3CB79B71BF6F549B8534754652B3650015D6 = AIRWOLF S4D2 (AIRWOLF SEASON 4 DISC 2) | V | 0xB1015875229AC7EDDE30BDB433CE3A89 ; MKBv61/FindVUK 0.99 -0x559FC1003EE4648B21CB24FEBF88E724F846A9C0 = AIRWOLF S4D2 (AIRWOLF SEASON 4 DISC 3) | V | 0xF96054D6473230D0272506D4D730DF72 ; MKBv61/FindVUK 0.99 -0xD00F29B41CA6DA20BA9C6D1996E719C4B802F5FA = AIRWOLF S4D4 (AIRWOLF SEASON 4 DISC 4) | V | 0xA57F840B0F31F6C8F4D86976769FBEC6 ; MKBv61/FindVUK 0.99 -0x083DB57D4463329ED3A48F92F45A1FC0DB4234B5 = AI_KAWANAKA | V | 0x1666BC68BFF6847B6C5E5363722EA4B5 -0x64579699F9206D025E7B1E3DF9FD72B75E9E2F11 = AI_OHTSUKA_BD | V | 0xA3491F884E1392FAD14781C882F3A3D5 -0x65351F02D23159DF11D77D301936935B790D97B1 = AKB0048 NEXT DISC 1 | V | 0x046DE76971E02F67DCEDF535BE55AD67 ; MKBv43/FindVUK 0.84 -0xD0DCEFC1944E27D879DF99B3E8A206E218A1D0F0 = AKB0048 NEXT DISC 2 | V | 0x9F6B61C6CE70CDE165D3E5AAAC141BB8 ; MKBv43/FindVUK 0.84 -0xFF0A682EB2701F37BE99B990C8B621E32EF03C5A = Akira | V | 0xFBE5462FAB4D8F0FCD1EF01A79491486 -0x0C2A61EB68B2ACCA5E2058DDE64E128BD0118E0D = AKIRA | V | 0xA0D8D3C475E330F57F2810CDB154DD24 ; MKBv21/FindVUK 1.00 -0x1DCF723CF2DD1EF49C5848896C9D91AEC551B118 = AKIRA | V | 0xB29622ED9662B70879F24993BC00D21F ; MKBv20/FindVUK 0.98 -0x9AEE677CE6DB365BB0D9E9AE3477FD61B4F8FAFE = Akira (Akira) | V | 0xA634D485754F10C1304935DD65866557 ; MKBv42/FindVUK 0.92 -0x62C1EEB9E8BB0A847AAA372D257A0B0A85051FDC = Akira (Akira) | V | 0x3790BE2D648E4A92705A6D30BB9FCDE8 ; MKBv42/FindVUK 0.92 -0x73337B0975363E382CEC3BA1E6FD0F42C7062A9B = ALADDIN (Aladdin - Blu-ray???) | V | 0xDB1918E2EB4273F2729319101E8BAF18 ; MKBv35/FindVUK 0.89 -0xA81BD562AA0588C6F62D92FAB6017E282E7EA8B0 = ALADDIN (Aladdin - Blu-rayâ„¢) | V | 0xB876515334CE32AAC36CC27747854498 ; MKBv35/FindVUK 1.00 -0xA65C542238458AAB1AA676D5C5E9D71A57ACEFB3 = ALASKA | V | 0x8B99853B21FAB037CD291C4DA935A1B8 -0xF44A0B377E78256386057881A15E8B6A481AA0E0 = Alaska Spirit Of The Wild | V | 0xDD4A46CF2AEFCF044DACE49EB4E60260 -0x5758BFEA174425BEFED4AC5172500E8E44BB0EB1 = ALBATOR2D (ALBATOR - LE CORSAIRE DE L ES | V | 0x6B087D52266C984B02A5DEAD919C0F0B ; MKBv46/FindVUK 0.92 -0x9A238534B5B3CFAB51ECD9260CA83E34B88142A4 = ALD1EFE1 (Alice in Wonderland - Blu-rayâ„¢ | V | 0x4D02DD76EAB87B23DC21627A83B759A2 ; MKBv23/FindVUK 1.00 -0x7C1598522F38A42E2413929EBB25F981F2E691F6 = ALEX CROSS (Alex Cross) | V | 0x669BD358C8B84E5B9B6F875FA4927955 ; MKBv37/FindVUK 0.84 -0xAA6E521CDFB1B605DB4DE9ABA69D35D0F4D2FEB0 = ALEXANDER | V | 0x01974B4CA3F1F4096EDC8726595ED0FF ; MKBv16/FindVUK 0.84 -0xD1E76D3399D4EEA5698F1F6DBE46A17111B07624 = ALEXANDER AND THE TERRIBLE (Alexander An | V | 0xEECB7C85486BAA8C709B0C1308240D10 ; MKBv39/FindVUK 0.96 -0xF3367AB43D0315ECD0044A40DCEB80F1E69DBEF1 = Alexander D2 | V | 0xE6DE2A81850B97545E200BC9E3FA78BF -0xC10E71034AD45267A7D44BC9EA4BEC9899D64EE1 = Alexander Revisited | V | 0x1CA932660D82B1083BC4C80F93412670 -0x4CF44F7F5A2AA6A4765863C0CCE90365B4B4D1E0 = ALEXISONFIRE | V | 0x6DCC83627EE640226B32BCA4B78D27E5 ; MKBv58/FindVUK 0.93 -0xF10D9A1446EBA09D731FC957C2F0E87C15346D50 = ALI BABA ET LES 40 VOLEURS (ALI BABA ET | V | 0x9B6F57FF1D4BC6A02582512CD7DF4482 ; MKBv46/FindVUK 1.02 -0x917E969D3737B5A8525572E4E72805A6DA290844 = ALICE | V | 0x485E9A661298AD5F4C220B2011BD3B3B -0x9F1881A0C3918732CB5D4012A51EAB0996A8EE3E = Alice Cooper Live At Montreaux | V | 0x12E7627BB7B07BA92BF4D36B71BFD826 -0xDF4B76E3751990AF097C433EC495B0D0E15F39C7 = Alice In Wonderland | V | 0x530397683445FF1170D2A80AB350FE84 -0xA0319B2E877612E0459F973145A98E084DA7214F = Alice in Wonderland (PL) | V | 0x1D3BD8F849ECA25770A551987634068F -0xD2C1D199C27C6B226B0A3BE173C62305C8D532C6 = Alice in Wonderland 3D (PL) | V | 0x22B153F526CDD165A222D17AC5E492E9 -0x9AAC673512CD38F97D2D3B1FA5AEDA2F58BD28D0 = ALICEINWONDERLAND | V | 0x93C90FD24B37698ED4C7771AD85E7A87 ; mkbv16 -0x8E436BC9932BB2E04070D5D22F19F363E2791273 = ALICEINWONDERLAND | V | 0x19CE3D968F55A50CF71789A5FD3DEBD3 -0x84E6DC268BA3DEA643A21BA4FB0F777CC9DA16FC = ALICEINWONDERLAND | V | 0x3DEB3D1292BD52D5494FCCCBA9DBAEE7 -0x93EF45B5D8DBAF454CCEB7C4F56AC0674F2064B1 = ALICEINWONDERLAND | V | 0xB469D84FF55B62B5E1320EDF49B16C42 -0x04D98C99E3A2A85CF22B0D4378F58853FACE5334 = ALICEINWONDERLAND | V | 0xD65A660A343697911E0892C392406C5E -0x05BE2F3CCFA444A54ED6F8552F025F48C766FC18 = ALICEINWONDERLAND (Alice in Wonderland - | V | 0x045909B24F35839E3241B3B21E176429 ; MKBv16/FindVUK 0.96 -0xC903672C36DA28F7A01CCBD0500AD68D9405D089 = ALICEINWONDERLAND (Alice in Wonderland - | V | 0x5DE32F9591D043C063D534512A149F9D ; MKBv16/FindVUK 0.96 -0xCCD5EFFB562462D8933D1912970883518F38C51F = ALICE_IN_WONDERLAND | V | 0xBA4115AA24CD0452283CEDF2770A7AE3 -0x208085CD4D4C49CB870C1DBAEE3B316491E96D46 = ALICE_IN_WONDERLAND | V | 0x9A7BC1FEA2ED2CB0B41F7C64914A8F0E -0x43559D0635EADCA8F6B108B0B9C67A92F0F5BEE8 = ALICE_THROUGH_LOOKING_GLASS (Alice Throu | V | 0xB7DCF3042D4DE4ED1E08A7C65C55CDEB ; MKBv50/FindVUK 1.00 -0xE07BEE52E554ABB5BF1116B889EBB0C71F8731EB = ALICE_THROUGH_LOOKING_GLASS_3D (Alice Th | V | 0x038D5F763B096D446959D900F8176A8D ; MKBv57/FindVUK 1.00 -0xEEE2924689C5587A47A481C1AC9E3D13502A5000 = Alien VS Predator Blu | V | 0xCE1ECD7384E884E67C76C43048F858B2 -0xB00DB5993E7D7B755D7FA6D5CCE23058E0662D2B = ALIEN3_F4 | V | 0xDEB0161F599470FEA838FCA612C0E730 ; MKBv19/BD+/FindVUK 0.81 -0xDFCBB0F8482004F5C0108C8D75BE05023FCF7392 = ALIEN3_F5 (Alien³) | V | 0xA5677069E840BAD3249C6256325B5590 ; MKBv19/BD+/FindVUK 1.02 -0xF36A5403F33094B1434A7C7B388C6C3C272BEA9C = ALIEN3_WW (Alien??) | V | 0x1A8919AA76A9C4D1BDF0181BA0B2D5C4 ; MKBv19/BD+/FindVUK 0.96 -0x186AAD796A5167BCE1448AAFA3EBB12DCCE5995D = ALIEN3_WW (Alien³ ) | V | 0xFE9A3C38A03D3835D7C7E3BFBF870114 -0xDC24DAF7A0A2D38AFA0E33B4A5A1E58E7062FFE7 = ALIEN3_WW (Alien³) | V | 0xF83E1D71BE7738865C364674EA740D87 ; MKBv19/BD+/FindVUK 1.00 -0xC416F7E78CD42075BD068982FE7A3E979227AD4B = ALIEN3_WW (Alien³) | V | 0x9D3A21845B39C0BC28DFE4BE2E7F54B9 ; MKBv19/BD+/FindVUK 1.00 -0xD8D8B5337A56FBCF63396558DF11F361F29F951B = ALIEN3_WW (Alien³) | V | 0xFAD0408FCBA1FB92FC3FAB963998ECC0 ; MKBv19/BD+/FindVUK 1.00 -0xA4B7036BEF6776C099CA55C7875AAD014E9B5D77 = ALIEN3_WW (Alien³) | V | 0xEB7CDF9C5151FAEFA0F474FC876D2EF0 ; MKBv19/BD+/FindVUK 1.00 -0x51B1FF46BBD15122CE2463CD9E2DC6DBF3D7BE8B = ALIEN3_WW (Alien³) | V | 0x86F3DADD82980556BEA53FC95AF3E61F ; MKBv19/BD+/FindVUK 1.02 -0xA1596437051D9E7DC1A2E226849D4604182E93AD = ALIEN3_WW (Alien³) | V | 0x46C3D3CBAD51F56C5FFAFFB58033E93A ; MKBv19/BD+/FindVUK 1.00 -0x2139183D964C0E8FEE73B251A2C40C60D35BD130 = ALIENS_F4 | V | 0xF2F76EED805441A13D07C088C717A149 ; MKBv19/BD+/FindVUK 0.81 -0x95A37E5C831B941171628AF34072EC698C6622E2 = ALIENS_F5 (Aliens) | V | 0xC06E4B85CDC5559FF96C9457A6C4AA8A ; MKBv19/BD+/FindVUK 1.02 -0x0A9D6260A7D595620B3775BEB2878EF45B108E24 = ALIENS_FL | V | 0xA290C1058A3B2EC1FBA1B4E3225AD50C -0x03DF64E99C5C635407288923B49AEEA225DA59E2 = ALIENS_IN_THE_ATTIC | V | 0x769F2BECE4A7540EBB4D739C13674CAD -0x63877B6AB2CF98FAE42AF2FFA1AB55E3A00718CA = ALIENS_IN_THE_ATTIC | V | 0xFF167D6A2C59FE0088473AB781E2EE55 -0x53BE0851EEC22709D732DCBA12E48BD31CAE2070 = ALIENS_IN_THE_ATTIC | V | 0xFD36E5710C33B58F42AC089C32F1D829 -0x2D5EECFAA605BE14EB86F77DDD657C07930963E8 = ALIENS_IN_THE_ATTIC | V | 0x6BD98FC209E64433AE333073435BC3DA -0xD4DBEE6F606C6532FBBC6CB2A04B64DEF5CEB70B = ALIENS_IN_THE_ATTIC bd | V | 0xA2F7C559579FF5388ADA5DF053F90F6A -0xF2A1BEB10850B51DEE8AE8822605E88727320829 = ALIENS_WW (Aliens) | V | 0x340B68F8E3606214CC625B076FEDBC08 ; MKBv19/BD+/FindVUK 1.02 -0xDF66D94C4081770A6FECDDC08B36441675F1E528 = ALIENS_WW (Aliens) | V | 0x1BA6635ED2E5AE90E87FBEB3713CD85F ; MKBv19/BD+/FindVUK 1.00 -0xE6363BCA5681E2B03D4F5BB637A659D5B443CD77 = ALIENS_WW (Aliens) | V | 0xA82D5C0113633EC2B2DD3CCD129DB750 ; MKBv19/BD+/FindVUK 1.00 -0x2E1F1359FDA40649DDF3378AE8E78AB95F08DF45 = ALIENS_WW (Aliens) | V | 0xABF900EBC43692DDF39629265B869B61 ; MKBv19/BD+/FindVUK 1.00 -0xC26BB56D2F44AF21077C05EFBB9C00AC84C2F84F = ALIENS_WW (Aliens) | V | 0x9DFD2EF94B08598A71DF4714919A10E8 ; MKBv19/BD+/FindVUK 0.96 -0x279A856D0CDD34505DA5944D2361757B5C03D5C3 = ALIENS_WW (Aliens) | V | 0x667E22754998EAC9296A3BCFBC6B8C4E -0x679AA7C4F228268A34AB05F405F8CA484DE2073C = ALIENS_WW (Aliens) | V | 0xCDB439DF434CF0FF9E405D674275B01B ; MKBv19/BD+/FindVUK 1.00 -0x9D62AB281E96A083D89FC4681EA60E8E4A6F9754 = ALIENS_WW (Aliens) | V | 0xC52731F6B0913B43A0B855BBA36332B6 ; MKBv19/BD+/FindVUK 1.02 -0x3F96F0EAE8BFD4C28F94004415A447B2C8032105 = ALIEN_BONUS_D5 (Disc Five: Making the Al | V | 0x5EB710E1A3D14D168D4E3EBBCB09C146 ; MKBv19/FindVUK 1.02 -0x90EAC988009749D460B49AFD87FD754190BC572E = ALIEN_BONUS_D5 (Disc Five: Making the Al | V | 0x11D0A7920149F0CDBD823FEC9457061A ; MKBv19/FindVUK 1.00 -0x7A3FEA878FA9D328796B5FF5CB971E22C1B33D47 = ALIEN_BONUS_D5 (Disc Five: Making the Al | V | 0x3BFCCA4C46FF1CA44B0A0C68D38FBA78 -0xBD0365455E089D6392B4893C90B30144D08D03FB = ALIEN_BONUS_D6 (Disc Six: The Alien Anth | V | 0x0DC4A48729C8227A314E99094885AF6C -0xF1B9F289DCDFB5CAFEBEBCBE51CE86104658349D = ALIEN_BONUS_D6 (Disc Six: The Alien Anth | V | 0x128DAD3B9EAC8F5AAC59B9E0D5C43703 ; MKBv19/BEE/FindVUK 1.02 -0xF0AC692E52B4DC59F515179DEAAF249535BFA7B2 = ALIEN_F5 (Alien) | V | 0x4BA31C18754A6B3474B6DC5510DDA5DF ; MKBv19/BD+/FindVUK 1.02 -0xAE4309AECDE2FE22C0C11B61ADCFD144368CE183 = ALIEN_FL (Alien) | V | 0x38975082B9AA769B28B0BB67E02DBB47 ; MKBv19/BD+/FindVUK 1.02 -0x3D88F0E199E87BD287F63A87EBCBAA45C0E4559F = ALIEN_RESURRECTION_F4 | V | 0xBD1A42F751F2E88FFF8488014EA78BA9 ; MKBv19/BD+/FindVUK 0.81 -0xB49D3D4FC5761FA5AB872E45B7ABDA04E437422A = ALIEN_RESURRECTION_F5 (Alien Resurrectio | V | 0x2ECEF2ABD8680E907F4E6104381D6805 ; MKBv19/BD+/FindVUK 1.02 -0xC83413ED496936177F37F1AC31E25B2E0B9F433A = ALIEN_RESURRECTION_WW (Alien Resurrectio | V | 0xFFFCFEA33E9EF65747AC4060B7F5D55C ; MKBv19/BD+/FindVUK 1.00 -0xDBFE9D6716B0BA5E00B3685BB2EB3DC7B9C61D9B = ALIEN_RESURRECTION_WW (Alien Resurrectio | V | 0x6D77D9EC81E60635A3322D7BD8448EC4 ; MKBv19/BD+/FindVUK 1.00 -0x2CF8CB2D3EA5EBE3777AFA3D1156E9D275B8790E = ALIEN_RESURRECTION_WW (Alien Resurrectio | V | 0x44FBFA04DB3945998F7C4A90581BFFAC ; MKBv19/BD+/FindVUK 1.00 -0x8A7280C10E5D53BB2A941D48DE7E625AB95401AA = ALIEN_RESURRECTION_WW (Alien Resurrectio | V | 0x374C50B476A89F010AD355CD8F4D2258 ; MKBv19/BD+/FindVUK 1.00 -0xC97E302C6A965F60F6F1888373A44F83FB944BAD = ALIEN_RESURRECTION_WW (Alien Resurrectio | V | 0xC867DF1A101FE3C3ED7D6A4863665FBC ; MKBv19/BD+/FindVUK 0.96 -0x6F6DC5EDC2F39125029F4FEC6F178DEA467DBEB4 = ALIEN_RESURRECTION_WW (Alien Resurrectio | V | 0x22D622EC3B5DCEBCBAC8F3FFBCFF736B ; MKBv19/BD+/FindVUK 1.00 -0x500D8129C86CB9F6BE635BB5315E3D1E507429D7 = ALIEN_RESURRECTION_WW (Alien Resurrectio | V | 0xD43A0332EED26722D2E4331C8A5CBA99 ; MKBv19/BD+/FindVUK 1.02 -0x22F6350D0F0F5E9561F57B2569801D24D51084C4 = ALIEN_WW (Alien) | V | 0xC29AC516495B75BF4859FB964AF4AAD1 ; MKBv19/BD+/FindVUK 1.00 -0xA1EA145739EC9CB8E59E7C77E64D186C970A2666 = ALIEN_WW (Alien) | V | 0x3DD684B286301DC2A74C3500020A9390 ; MKBv19/BD+/FindVUK 1.00 -0x36AF6B10ED58A0895561E0EC586FA3F5A4757187 = ALIEN_WW (Alien) | V | 0x4F5AED0DED77978DE41752A2851E8410 ; MKBv19/BD+/FindVUK 0.96 -0x629C0F85C1430CBECAB861A5CDBFE955099DD36B = ALIEN_WW (Alien) | V | 0x0E197B16F29DDB94E453BBDCF77D0C25 ; MKBv19/BD+/FindVUK 1.00 -0xFA8DCD986D50B1A56AA0300976C59823E25ABAA7 = ALIEN_WW (Alien) | V | 0xB15718EA1F295DE9D41D94601C5DAF3E ; MKBv19/BD+/FindVUK 1.02 -0x7D888EEF77337E2CF36C1A2D1F6A5F923C608594 = ALIEN_WW (Alien) | V | 0x057F04D7E71C8103131716F396F7D3B1 ; MKBv19/BD+/FindVUK 1.00 -0x9B2FEFD1E7A70031F6B64E025638B988AE2D3A6C = ALIEN_WW (Alien) | V | 0x490D736A22E591D7646AF861A0274D70 ; MKBv19/BD+/FindVUK 1.00 -0x84A74B0C213B8700D3CBA4CE872E3CE43067CF23 = ALIEN_WW (Alien) | V | 0x563D1EFA11CCE7474ADC7CAA456B63E4 ; MKBv19/BD+/FindVUK 1.02 -0xAA7DD619AA9DBCCF62868FFA886F21C82C79426E = ALIEN_WW (Alien) | V | 0x68BC792E69EA46B2DD3CC0A797A6EE0E ; MKBv19/BD+/FindVUK 1.02 -0xF1C565BFF351633A14B40D3BB76154D12B25DED8 = ALIEN_WW (Alien) | V | 0x92CF93832E5DB847D76CF2394236FC8F -0x2A4F81004510735B547F1B6F896B2B2959869E42 = ALIEN_WW (Alien) | V | 0xDE1DF59B62E8D6B14A75C226445F8865 ; MKBv19/BD+/FindVUK 1.02 -0xD33AF0B18B1BE38649F704B4A482B0D2FFCD4145 = All About Steve | V | 0x646FC113AF57A73CDA40C70067133369 -0x8AF9F14456AD8149529199784C09930DD8F05CE6 = ALL IS LOST (All Is Lost - Blu-ray???) | V | 0xC45C129D43D2E63FBCC5B1F467C403FA ; MKBv43/FindVUK 0.96 -0x6A230BA4B7FA66159297B8C7D4C1F6B2E9749D9F = All the Boys Love Mandy Lane | V | 0x2DDDFFD789EE4282794E74B182F93B78 ; mkbv9 -0x678A5A5A35B89F9BBC4BDE37339F826087597BAB = ALLA_RICERCA_DELL_ISOLA_DI_NIM | V | 0x3FD95C373ED4D73B25AEB5B02E9CA74B ; MKBv7/FindVUK 1.00 -0x3A6214323DFF7AF393F49195C3941DF9E45B4698 = Alle for | V | 0x010357E9580919F53DEFE15845C430BA -0x3BAF7F39C8BCBDBB0F426A61E34861A9C01726A9 = ALLEEN MAAR NETTE MENSEN | V | 0xD9AA46B1107E479A5E66DA1FCAC95146 ; MKBrev 31 - FindVUK 0.54 -0x053DA2E925027D0584B54F1860863AF23877BFF9 = ALLEGIANT (Allegiant - Blu-ray™) | V | 0xF2E066A7ECB91968BBE257581FE71789 ; MKBv60/BEE/VUKNOTVAL!/FindVUK 0.92 -0x317AFBE29C5FA91A10B0DF94263048BF0F2C423D = ALLIANCE_SPY_WHO_BD01 | V | 0x8C3CCE1F885DECBFD7CC149D05E5DE0B -0x96F106D691531AAAD4E7E8B31D976440B2C6C272 = Allied (Allied) | V | 0xD0E90D87557BBC0D38305092648599EF ; MKBv50/BEE/FindVUK 1.00 -0x03FE1AC5915F2848DE24027020CCE207FD2D36E0 = ALL_ABOUT_EVE (All About Eve) | V | 0x869428F2979F83E0A676C22B2C42C095 ; MKBv19/BD+/FindVUK 0.96 -0xDB278BE0335834AEFA7B33BAE29E69D8BAC39308 = ALL_IS_LOST (All Is Lost) | V | 0x6C67DAC08B3E898E1260FBEF79369047 ; MKBv47/FindVUK 1.00 -0x2F3303204EA3461B89EAF37D24D8883216FDA717 = ALL_STAR_SUPERMAN (All-Star Superman) | V | 0x3053B9D145DFEC4233ADBE98FDB1645F ; MKBv19/FindVUK 0.91 -0xBC7CFBDC89C9D1303A3003185C70E53DA77EB2E9 = ALMANYA (ALMANYA) | V | 0xFA565877ECDA9C92AB4F58D22A3FD63C ; MKBv26/FindVUK 0.92 -0xF573399BCB0BDF7E98A46FEFD0B8CFAABFDB861B = ALMOST_FAMOUS | V | 0x9AF1B7D163B2DACA5A879CD03641D110 -0x336DCCEC09A5B0658F6909E2D7BAA516335B6F3E = ALMOST_FAMOUS | V | 0x224D89A5ABDD9370655F9DA7AC75AE38 -0x30E9AC880D7B3BB9E28F4D17A3B4972CDDB9C4F3 = ALMOST_FAMOUS_P2 | V | 0x8F0C11F35FBA7E3116E865E798B21406 -0x3E38686F6BAD101D7E90AC70C87D5D355AD39896 = ALOHA (Aloha) | V | 0x747947FC33395A5D94928B0643529185 ; MKBv47/BD+/BEE/FindVUK 1.00 -0x9F543C3E924DBEA6EA3B8EC4A16431643B153BF5 = ALONE IN THE DARK | V | 0xA17ADF026018DF632A4FDE4ABCBA5397 ; MKBv3/FindVUK 0.91 -0x794A1FCE9D0D8D1F0D44C2AFE7F07EE289DAACC2 = Along Came A Spider (Along Came a Spider | V | 0x6F3A9925B86DB15994011C74C17A7058 ; MKBv35/FindVUK 1.00 -0x1533C2DB20F543D95014AAA759650E2026AC33C2 = ALPHA DOG | V | 0xA7F5FC17E2A7275ED0B2EE92AB7FD3D4 -0xEDDB2A35082CEBBB5DDA2EDDD28F4229BDC73311 = Alvin and the Chipmunks | V | 0xD254AC5D095BF42E02FCB657EC6A369A -0xA851AAE1C866B2BB9AAE367FA2ECA6FBDD0EF15C = Alvin and the Chipmunks - The Squeakquel | V | 0x2C5298B920950B3E17B6ACA51272D2A5 -0x077D568F5D126E7CAD3434EB0BC785C259F14586 = ALVIN_AND_CHIPMUNKS_3 (Alvin and the Chi | V | 0x69C145F7A20C273D1BB010F6984C8460 ; MKBv20/BD+/FindVUK 0.96 -0xD44686A4C4C073470DEF460FA6E08DC6F8EF5D5F = Alvin_And_The_Chipmunks (Alvin and the Chipmunks: The Road Chip) | V | 0x5CA85C3D7FBFFA2DEAAE5BA340EF8E63 ; MKBv56/BD+/BEE/VUKNOTVAL!/FindVUK 1.02 -0xED120112EF5CB61816F6A43596E8DD2365D383DF = ALVIN_CHIPMUNKS_F2 | V | 0xB362543A13A10452B9602CBED3B2EF7D -0x1336210A995A3CC5D685326AADE441CC4010AFA2 = ALVIN_SQUEAKQUEL | V | 0x73D98FB62E6537760965BD6D31D22469 -0x8883C732634256DB94206123E824D9BF58E02063 = ALVIN_SQUEAKQUEL | V | 0x47F81A76F28D22C0F31578892390D7CF -0x465CB3A38AFAC7078DD1626876438394BDA383BC = ALVIN_SQUEAKQUEL | V | 0x1C448D7FC0992BC75C2EF7B5D9ED7761 -0x12321EC6C2CD22386486541AC17F37ED542302C6 = ALVIN_SQUEAKQUEL | V | 0xAD2A7DFA2697C445DC8D914FE2EBAE2D -0x7FE86E80FCB21BE4459FAE2F1E0B96AF24CB8A4C = ALVIN_SQUEAKQUEL | V | 0x1ECE522F3B4EF0CA7C53AFFB6594F625 -0xA28668AE257E8367E493D7DAF8E21FA16C00D319 = ALVIN_SQUEAKQUEL | V | 0x0EC43268E9B1E8488A167830887214FA -0x4BDC43E2A489C63E871BCB74FC47D8A985CFF56F = AMADEUS | V | 0x210C49126CF7800CF2D98A5A04D1F838 -0xB4AC3A6D39952084274FC214CAEAD81C98D3E767 = AMADEUS | V | 0x39DBE3E213DA930741E0E2E330E2413E -0x2DFDBE4AB3F72D8156B3CB6E835A606C3682602D = AMADEUS | V | 0xE31700169252B05ABD90A026FB04C0FA ; MKBv9/FindVUK 0.80 -0xE6ADF35657014A2CF8F129D93424DDB49A646DAF = AMADEUS (AMADEUS DIRECTORS CUT) | V | 0x61A67121F25F68E45303E516CE97B41C ; MKBv9/FindVUK 0.84 -0xFC08F7A8C902A0588D97C2D06ECF8FE699233361 = AMAZING_JOURNEYS | V | 0x9EF02A550ABEBC16E60045C9436CA0E1 -0xE56648A5FC76E8083EFB7998C14D048859A26049 = AMAZING_SPIDER-MAN (Amazing Spider-Man, | V | 0x40EB32A964EF3B2C79745089C44B7073 ; MKBv31/FindVUK 1.00 -0xFDDA21D7AE733BFE8378FB76EAA1EA87FD476FD1 = AMAZING_SPIDER-MAN (Amazing Spider-Man, | V | 0x9C091A88BF223B3CFDE91B43B464F9F0 ; MKBv31/FindVUK 0.87 -0x78A0D02EA96C6E708F051023DB71C23E7E8E76BB = AMAZING_SPIDER-MAN (Amazing Spider-Man, | V | 0x91036E7983F7BAA9B3DA74890961BF15 ; MKBv31/FindVUK 0.84 -0xBEF7D426F926398B33D1BF7E7F5181061B8B3374 = AMAZING_SPIDERMAN | V | 0xEE3C88DC60CF05F18E5A870AAEEE817D ; MKBrev 33 - FindVUK 0.54 -0xA479515A3671E1C37444C6FE5791662115A759E6 = AMAZING_SPIDERMAN (Amazing Spider-Man, T | V | 0xA0D261D7229D0E26FDE964C123EF46A4 ; MKBv31/FindVUK 1.00 -0xDBB1BA536F8304B7AF099F5DFC9A4E09F272CE0C = AMAZING_SPIDERMAN (Amazing Spider-Man, T | V | 0x0C6E3A3A210705374FBA9374FFD8BD88 ; MKBv31/FindVUK 0.91 -0x25390977F439A359EB21551831CD07C18D8D5844 = AMAZING_SPIDER_MAN_2 (Amazing Spider-Man | V | 0x661FD3BF0FFE341876E25A32EF36F3D4 ; MKBv47/FindVUK 0.96 -0x10357004318D36084A688E077D26C686151EAFF1 = AME UND YUKI | V | 0xDC55A5FE4A876E5651B50D79BDC47EBB ; MKBv39/FindVUK 1.00 -0x1E5CE72409C32FF2891CE2BED899A14798444512 = AMELIA | V | 0xB83D7A9F256DEFDA532971432DFF345E -0x25FA4A78BF4AAAD19920C126ED36105522CBB6F3 = AMELIA | V | 0x7E38460876BEE5D76D84277F4252751D -0x9DF05F549C8A81BC83B301FB55146A9C7CC1013F = AMELIE | V | 0xAB393FA775EE34BA9B72D909842AB30E -0xC7E5E012F6AB8D147DF2D731613B1B6BB7A6F929 = AMELIE | V | 0xDE02D305F51CA453C08BE976340C8EC6 -0xA2FCE8FF92228E175B4B3569D9E1B0959B1F695F = AMELIE | V | 0x9071B29502D59276B9596C9D6A5F29F1 ; MKBv16/FindVUK 0.80 -0x0D582D8024D0C8FF28E21BC7E12B26EE3D7E00D5 = AMELIE (Am??lie - Blu-ray???) | V | 0x4E78F2DC03169D511F6C4230DF8B49A4 ; MKBv21/FindVUK 0.94 -0xBDF481F6C733C7724CF6B52AB943DCF37EA105AD = AMELIE (Die fabelhafte Welt der Amélie) | V | 0xA9D1AD81D452B1C1EB60726D27533D7C ; MKBv35/FindVUK 1.02 -0xE0E505DC1DEAB177A69B68CFB47A0991F80107A1 = American Hustle (American Hustle ??? Blu | V | 0x2488057BF30CFF48C73EB1A8B3A5FED0 ; MKBv46/FindVUK 0.96 -0x0F35F3B1FD3AF3CD52232E350EB9314960F9A60F = American Hustle - NOR_SWE_FIN_DA (Americ | V | 0xCF64F3D5F9D5E160E0C221DF23F7C4CC ; MKBv46/FindVUK 1.02 -0x9D8C4DEC90D1E99674F7F3EECD1B037F36AFDAC0 = AMERICAN PIE | V | 0xE82DC07D5B23811EDA533DCA305B7F7C ; MKBv14/FindVUK 0.98 -0x2C82BA7DA80C90116DFBCCFE9DD8AB5E225276FF = American Poltergeist 3 (American Polterg | V | 0x4FCBDD58A440EC7B1840509649D7F8C1 ; MKBv60/FindVUK 0.98 -0x8517827CE98EF0AAB417719D6983DA8A1A9383E3 = American Psycho | V | 0x326B1BF17DE87C9CBAC1F87F1C26099A -0x0CF0FD9DF3D34B8DEF8BB5147038A45CBF6D7C17 = American Psycho | V | 0xD7C536E09EAF2502834073159C48A95F -0x30EF5726960EA1E020956159451795A04F809F6C = American Psycho (US) | V | 0x7893CFE105F39A6FE240CE635788EBB4 -0x9A71BF858CE9FF0CF0E6AA84B7DF48AD1AC91AA1 = AMERICANHONEY_UPB1 (American Honey) | V | 0x60D55543CDBFEE308B960FB8FAB6A32E ; MKBv61/FindVUK 0.98 -0xF23620FB68EC899201A688B5F4A9B804E923F9A4 = AMERICAN_BEAUTY (American Beauty) | V | 0x54A17FD3D04C6E2996A8E471646CF214 ; MKBv26/FindVUK 0.84 -0x030786DAACD9D94FDCF52374CEE85C29F9B8B4A6 = AMERICAN_FIGHTER_1 (American Fighter) | V | 0x7A79D33491673EC664682724581DB4B6 ; MKBv62/FindVUK 1.00 -0x32773FC38DF2FAB1DD786B689ED35A5DC58C1130 = AMERICAN_FIGHTER_2 (AMERICAN FIGHTER II | V | 0x83A2EF0A8B464B5F5953B8C4DEA24D82 ; MKBv60/FindVUK 1.00 -0xA687341A9810F20CDAB5507543E9644A7D3A5098 = AMERICAN_FIGHTER_3 (AMERICAN FIGHTER III | V | 0x848EF6D44DC093E64795380E6182D416 ; MKBv60/FindVUK 1.00 -0x93C1D2DD70BDA9F0D64F89954C55BA575DE8BDE8 = AMERICAN_FIGHTER_4 (AMERICAN FIGHTER IV | V | 0xC5C7300B7019E523DE32A9F04BCB486A ; MKBv60/FindVUK 1.00 -0xAADDC7C5F50EFE98443BF3F71A6808A3AF128B42 = American_Gigolo | V | 0x845C2E7F83988FAE53961D433B1C41B3 -0x1E16CE4674C6A5321D0FEDBEF412664EDB1BDF0B = AMERICAN_HEIST | V | 0xD69C4C2A145B91293FAE8939BCF38456 ; MKBv56/BEE/FindVUK 0.95 -0x5D18303C9623300E3BB3DD02458C2CC4C131B3DF = AMERICAN_HISTORY_X | V | 0x8E01F65D510859908751D6C6D6909721 -0xAA1814273D9DB4ECF4EE1DFBC23C7B950D9B4613 = AMERICAN_HISTORY_X | V | 0x7619B87A22D73E6A84203272D99FB4C7 -0xFB6969E261625686F5B4ACAE2E62FB5C9272C6F8 = AMERICAN_HISTORY_X (American History X) | V | 0x94252C19862349AC78DDB4B9DAF7EC2E ; MKBv10/FindVUK 1.00 -0x6CDDAE1C62AE0EA44954825A56AEDA8010C82C0C = AMERICAN_HIST_X_BD02 (American History X | V | 0x46B71F5AD2047A707070FD647DA1A116 ; MKBv23/FindVUK 1.00 -0x08BA2D8DCE4DCF59806B94ED9834CC1A6F9306F3 = AMERICAN_HIST_X_BD02 (American History X | V | 0x931F93CC0BD1F840510FEDB967142F6F ; MKBv23/FindVUK 0.84 -0x012CE4339AF6015D734FCEF6FA09B9B6CE21183E = AMERICAN_IN_PARIS_B03 | V | 0x358FCFF66A1471FFD7B54C0C4FFA9A5D -0xE3B137D3F573D8D570AE976357351CDB08E0A720 = AMERICAN_IN_PARIS_B03 | V | 0xBFCAAF532911965B7D0549966D3CB200 -0xACC8F7AB882DE7AC32A3C15FCB9335FB96A0B645 = AMERICAN_PIE | V | 0xFD0BDFCC5CCCDE712FA22AD7B7AC7A66 -0xA062C2CB44F1C5C21045CF19FDDDCE4E40715865 = AMERICAN_PIE | V | 0xC41FF7F66A0003F5D2B2B58D66F43069 ; MKBv4/FindVUK 1.00 -0x5F0D80A69870F5C83C5A1A3F208F552E68B4EFDF = AMERICAN_PIE_2_G51 (American Pie 2) | V | 0xAD786CFA7AC99844412381C9127BDB6E ; MKBv23/FindVUK 1.00 -0x3BD2620ED89DA6C7EB31F308C0F1DE2363A93AE2 = AMERICAN_REUNION_G51 | V | 0xEE52D58749871940DC2C4B22050AA88B ; MKBv20/FindVUK 0.80 -0x78F6767464046362752D456950971CF85499A1B1 = AMERICAN_REUNION_G51 (American Reunion) | V | 0x9A20E98BAD221D912F0A498642B1AAF1 ; MKBv20/FindVUK 1.00 -0x5BEEEF047E64B43D1E34D986FB9EE269B351310E = AMERICAN_SNIPER | V | 0xABE21A4C8EE89CA1E44A3D2922EAA147 ; MKBrev 47 - FindVUK 0.57 -0x557B118FFA363172B1E1C491E2522144282ACF55 = AMERICAN_SNIPER (American Sniper) | V | 0x7C00A8A8A5CCBCD5EFA55CB430CF3D77 ; MKBv47/FindVUK 0.96 -0x935E4C639BB3F7EB48C4030D97F0A4DB568BD9A2 = AMERICAN_SNIPER (American Sniper) | V | 0xBB30A02D613119A0BD42C1644C80F9A4 ; MKBv50/FindVUK 1.00 -0xF92E75A6A3350D7823780774F96DAA37A8A89CAB = AMERICAN_SNIPER (American Sniper) | V | 0x519BD68E97DD71A0E55223BBFC8E3FBD ; MKBv47/FindVUK 0.83 -0xCCAE29885C3087E978A879B2A848C4F9DE31AB44 = AMERICAN_WEDDING_G51 (American Pie: The | V | 0x5133483FC167617BB3EAAC128AD000D4 ; MKBv27/FindVUK 1.00 -0x2BDECEF6C3B04ADFA90A15C570D0121D3700CCD0 = AMERIKA (Asterix in Amerika) | V | 0x59EC36F1A5363455A6498E8BCB95BA2C ; MKBv46/FindVUK 0.89 -0xB7F9065F5F9886BCC74B8257DC30331676ACAB65 = AMER_GANG | V | 0x25C24914BE3EC782A4DAFD310178DC4A -0x2023814D05C3648685F3FCC216061B3FC6643968 = AMER_GANG_G51 | V | 0xD776BCC08BD596DEE622F8C21D2F8C51 -0x80EB50B1A3966B7CFA69CD23F413CCD5AB2C3FB2 = AMER_GANG_G51 | V | 0x7C0D6A0494795AFF2305A89DBDC5DA2E -0xC3B4B87FF9B50D45A3C19EE0DD53CBEFC5085B37 = AMER_GANG_G51 (American Gangster) | V | 0x46C70AA843631F87FEDCB25077F8D796 ; MKBv8/FindVUK 1.00 -0x49E51081B534E339FEEB5B4373D82670A55AC0AC = AMER_GANG_G52 | V | 0xD8FD20403CAF4766D9B3F9A90654BC8D -0x4001B4C1B2766C50E1B9E7997B0786ABF33E1C33 = AMIDSUMMERNIGHTSDREAM | V | 0xB2235DA3D408DA95B20A47300E828D53 -0x645C98F7A2CA7BB4535D4178EFCAB693031B3283 = Amityville | V | 0xA3173EC38EABF1470EDBCE138B69B5E9 -0xE25A16802C15B31586D91E5BC74598E46C8C7418 = AMWTDITW_G51 (A Million Ways to Diein th | V | 0xBFFFE6B3319879AB0E0F4EFCE2E0305C ; MKBv39/FindVUK 0.96 -0xD648AED4209B07997AD42EAD59B2C817182748DB = AM_LIMIT | V | 0x9E595C2DE8188A61A5A9B9B840A94279 -0xC482BFEE4C272A67A390585ED0D8B6FED2E6B9D2 = AM_WEREWOLF_G51_GLOB | V | 0x6086BD28DD704FD12B294DD0632EDC96 -0xB58AE985D2751FB850F920D476532FC83C8C9B07 = AM_WEREWOLF_G51_GLOB | V | 0x589DDD44C174947363597ED17C01D5F3 -0x74EF1B9E6C6830EF3F4532A8F4379136B36145FB = AM_WEREWOLF_G51_GLOB | V | 0xC5D422E45DFF879B8C0313873944E777 -0x1A5B6C41F9379484DD93AD7417B94CE79E581A8C = AM_WEREWOLF_G51_GLOB (An American Werewo | V | 0x1EBABD98DBFC2B38107B99E601EFE7F3 ; MKBv14/FindVUK 1.00 -0x3F37D2E95ACA51AA5E6D7278E9A438A3A5DEDD82 = AN ACOUTIC EVENING | V | 0xD27D2C60F2005E35BC54FB6DC6B8EB0B ; MKBv31/FindVUK 1.02 -0xB9EBDF0D3BC417D9BAB0583789CB917D5696E301 = An American In Paris | V | 0x19F8F1E3A09EC8AF01656EA19092658C -0x5072E34E2AEA1E30718FEE7C27FB06215F4CA62A = AN EDUCATION | V | 0xBF38E515E14800516BF25E059B3D5DFC -0x3F9FCE3C9BEDBCB7A28ECCAA26F9CCECCF14D70D = An Idiot Abroad D1 | V | 0x11AD494C58CC3FCC1B276E9FB5390EAE -0xAF0467B0F607725FA35BA22B9442C68CAC585987 = An Idiot Abroad D2 | V | 0x07211606052E17DA36E43BAF475A211B -0x0738FDFE43DCDB5D6A56AB0A6AC82601A2D8937D = ANACONDA | V | 0xD23C88C9C308E2808E071B575051D3AE -0xA5DED702008FDBB5B9BC6585BA3157A9A62DE13E = ANASTASIA | V | 0xEB0C8B796E98CF33AEECB9FC3AE093EF ; MKBrev 19 - BD+ - BusEncrEn - VUKNOTVALI -0x18955CF86221ED971F5262A0413C81AE99B02EF8 = ANATHEMA | V | 0x15993BA3F1E38438C553288659FD81D1 ; MKBv40/FindVUK 0.93 -0x15932F28A0F6CF921C3063426CAFCC0B84EDA6B9 = ANCIENT ALIENS S4 D1 | V | 0x18F77938735BF64B799DBDFE39A57FF6 ; MKBv46/FindVUK 0.80 -0xD8D82BDA3AB5E9AC2F6CDA4ABB918D23E22863E8 = ANCIENT ALIENS S4 D2 | V | 0x5AA08682D82F02DE26A7F3DD88DAA1FE ; MKBv46/FindVUK 0.80 -0xEADA4D343934C78AE993F4BB9645763A67DB5C52 = ANDRE RIEU | V | 0xC6948C7EB96FFFCB7804B17DD3002EB8 -0x881F93AF7A5840B8ED4D7FA5868A492C7D34C49A = ANDREA_BOCELLI | V | 0x55FE9C4BFBA624D8E005E428635F3B79 -0xFA52DC049A8AD32A6D71E86988339ECD7E783BE1 = ANDREA_BOCELLI | V | 0x3D9AD8BB5EDD95D40F175863E6CEC500 -0xFE568D72BFC16B60BE522687C4F864D8FFD9EACE = ANDREA_BOCELLI | V | 0xF6B32C8071C510490258321CFC176A34 -0x6AD58550953C33450950D3D0FF1F3A74BDEA4C9A = ANDREA_BOCELLI | V | 0x76391B01B5922A729C779779AB1D5E77 -0x9B2B49C75FCD42DD2B571A85710A3A681712903B = ANDREA_BOCELLI | V | 0x94796194D75BFD47C397DC85CF6FED57 -0xA735238CFE7A13C09CBD5E878CD5D1683109BAB6 = ANGEL BEATS 2 | V | 0x4A1962966B098F07EE81A4D6CE5F896A ; MKBv24/aacskeys 0.4.0e -0x4A57AB3728B13DACACAF34DD0D76FF64E673E0E5 = ANGEL BEATS 2 | V | 0x46B15A393C80AF8E5ED0DB04FB1E51B8 ; MKBv28/FindVUK 1.00 -0x3E9482C4579DAA674F2186A1CF76985A965A6E26 = ANGEL BEATS DISC 1 | V | 0x4F17A2C7019825271D23A83404EDDD99 ; MKBv28/FindVUK 1.00 -0x9CA2DBD7482E8D6507468690C948EAB2190F3F01 = ANGEL BEATS DISC 1 | V | 0x36C939AB1C232099F65A320CDEDC64C6 ; MKBv40/FindVUK 1.00 -0x2B4D6FD4008F4DD88E35257DC9766F5D8C3CF99C = ANGEL BEATS DISC 1 | V | 0x380B06088083BE240605423D24E009CD ; MKBv24/aacskeys 0.4.0e -0xAF2832F6AEB74D916ABE0224BDD362484FD2C7F7 = ANGEL BEATS DISC 2 | V | 0x592F8770CA5BA540487C9363AA32CF30 ; MKBv40/FindVUK 1.00 -0xE3CD633DF16974EB539FEC92B79505B0A4A2B9C7 = Angelique (Angelique - Eine grosse Liebe | V | 0x68B4D6529AC6C278BC4A8CCE025CE17D ; MKBv48/FindVUK 0.96 -0x2260969DE53B8F1D94F9C124474B9F898CA95D06 = Angels and Demons | V | 0x277A969CC119AE3F068157FF068F0969 -0x1BEBC25C691099477D0783E573A46F27AC7046BB = ANGELS_AND_DEMONS | V | 0xB23012E5DC24A7094805BBD751164C91 -0x8D46D55B7479A7ECE7F6FF6F4E2D578469CAEDE9 = ANGELS_AND_DEMONS | V | 0x36DECB89119B6D175857E995C54BD88F -0xCC2E9541772078F60F5C564449575BBC8C2442BA = ANGELS_AND_DEMONS | V | 0xE4BF3EBB06C18081AF019FD4F3616C8E -0xE7D1C9615FBC84B4B7E1D17225B3DF13848EE2CA = ANGELS_AND_DEMONS | V | 0x34F59F5B666DCFCE8FF17D7CF0257E7C ; mkbv14 -0xE95A7DE62CB4566945E7B5B6C301887646E54E1C = ANGELS_AND_DEMONS | V | 0xDFF1E2B86BC0582E6FA1F9CB6A3981A0 ; mkb14 -0x2A24E412A92DDC39C873F93D4357401E03455549 = ANGELS_AND_DEMONS (Angels and Demons - B | V | 0xAAF6876314F8495AEAA7577C83F1D76D ; MKBv14/FindVUK 0.98 -0xB3178F12F8AD370323E2E30C7EFCC1F1885F8A10 = ANGELS_AND_DEMONS (Angels and Demons - B | V | 0xC5124B0D8F04708B88B609190EDF0AC1 ; MKBv14/FindVUK 0.96 -0x13B297BB775794EA0AA5C2CA969D36FE59875FE5 = ANGELS_AND_DEMONS (Angels and Demons - S | V | 0xDC886EB6DFC414F6C454F1E0298B7D7B ; MKBv61/FindVUK 1.00 -0x1CACD84B1964F20D9D3C2BABE22574B817BDFD41 = ANGEL_BEATS_D1 (Angel Beats! - Disc 1) | V | 0x045CBB9C1A9BDE1C99F591FBC40DC337 ; MKBv48/FindVUK 0.98 -0x49E8F7D9D866D1E24CE814B573651616DF744144 = ANGEL_BEATS_D2 (Angel Beats! - Disc 2) | V | 0x33E7A9DFAAEF76679C5231EEBD2CEF5E ; MKBv48/FindVUK 0.98 -0x10F6B839086B2B6067B0F061997198DC378E2BF7 = Angry Birds Movie 3D The (Angry Birds Mo | V | 0x546BEA1A305BA4A89C8F34F69599F0F0 ; MKBv61/FindVUK 1.01 -0x4CEF54CAFE710A54872AD168A82EF11800665258 = ANGRY VID D1 | V | 0x5F62813C5EFC3A850A48A1D12BA433FC ; MKBv56/FindVUK 0.90 -0x987DE67691DF27C739108A2924A64441F0456C1B = ANGRY VIDEO GAME NERD DISC 2 | V | 0xDFF1810892E49F9956BB46E46FD5E332 ; MKBv56/FindVUK 0.90 -0x2A164831BA1692E6CB29FD75B020CD517FE0D7B4 = ANGRY_BIRDS_MOVIE (Angry Birds Movie, Th | V | 0xC18750B6A07FADF91231700E733434B8 ; MKBv58/FindVUK 0.99 -0xA583E97662EC28ECEAB0B0613C78E72DD1DA9575 = ANGRY_BIRDS_MOVIE (Angry Birds Movie, Th | V | 0x808C6DDFA98BF77BEB3FDC2117978465 ; MKBv61/FindVUK 0.99 -0x0235E3E71172589B37117FE6358C528C9839EA56 = ANGRY_BIRDS_MOVIE (Angry Birds Movie, Th | V | 0x79E3E5869206D6F6B5E7FFD3C6633C51 ; MKBv61/FindVUK 0.99 -0x89C298CEED9F52254E4790BF185CE1117DC6B2B8 = Animal Kingdom | V | 0x9EC4FB93DB3DF269E7D2F80D48B793E0 -0x246397F2364D027E5462B45F637CC0CC1DFCD393 = ANIMATRIX_BD02 | V | 0x3D5AB21B343AA884384A5D0C27439B45 ; MKBv7/FindVUK 1.02 -0x3A51B11DFF3FD457579AA52EF0798A6BA78CF721 = ANIMATRIX_WW | V | 0x4A52F03E47D7DFE8EE08CFF4DB5A3DDF -0x83DE2121E46F69D9288BF1A4C008293998AB7709 = ANIMATRIX_WW | V | 0xC1EE7E7C79003E39B9A6098B78FBB17A -0x6381E9D2FE422630C0DACE7EAD70A94A035B8144 = ANIMATRIX_WW | V | 0xE2268929D32DE88DB258114BA5FAD988 ; MKBv7/FindVUK 1.02 -0x1E98BBD55FCD6FAE0630F188FF351163C7DA5D08 = ANIMATRIX_WW | V | 0x3022339C6A8233FF64C570911DE18F71 ; MKBv8/FindVUK 1.00 -0x50610594B439DB430B01E76EB0284741942FE7FC = ANNIE_HALL_BD (Annie Hall) | V | 0x2E959E941325B08088175E31E0FDB712 ; MKBv31/FindVUK 0.98 -0x6361B7504F0019E50D4C5010938465E90B4795CB = ANNIE_HALL_BD (Annie Hall) | V | 0x87EA934CBF80C8309D8E01ED095270CF ; MKBv26/FindVUK 0.93 -0xB7F76B4116E1F6C441358B45D39E6F9130D493D3 = AnoHana Disc 1 (AnoHana) | V | 0x2B74230A4E035264E6971696940491E7 ; MKBv40/FindVUK 1.00 -0xA178308C23C02532C87618ECAE40D17312D55755 = AnoHana Disc 2 (AnoHana) | V | 0x576F70CD74173C3FD68CD2169590A9FA ; MKBv40/FindVUK 1.00 -0x71CEB36DB1B017ADA7E8C2B1111AE8E5D86A3A17 = ANOHANA _ DISC 1 (Anohana 1.1 - Blu-ray? | V | 0x4F3531641DF28F342B3149C1857EB667 ; MKBv44/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0x4836F08014808A05B7F0732A71E00FF38844BD36 = ANOHANA _ DISC 2 (Anohana 1.2 - Blu-ray? | V | 0x723F19C88C4B5D08B2FF27548B46C78A ; MKBv44/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0xDE99CD501947E47F670455835DAF51F0F0B9410D = Anonymous | V | 0xBA09D046DA2CC650CF24F720E6B3A531 ; mkbv28 -0x5CEB68709D12219175DF6A8C6E4FC6E151D2E596 = ANONYMOUS (Anonymous - Blu-ray???) | V | 0xBFA04652CC73DB6784FC94680A478DCD ; MKBv25/FindVUK 0.96 -0x4767E43FC0C2DD211A9766A721162FEE0F42D55E = ANOTHER DISC 1 | V | 0xF5EB73F632E5063E9F312228840D5E9F ; MKBv47/FindVUK 0.72 -0x2F752E78D6869F37B65265AF6164616D4223E6D2 = ANOTHER DISC 1 | V | 0x38637ADB1C5F8949BCD0670B86819BA3 ; MKBv40/FindVUK 0.96 -0x1A509DAFC1EF6EB9FFFE8290DB59CFDF2C518530 = ANOTHER DISC 1 | V | 0x8C769ACF29640A0086D4C17EB579F473 ; MKBv40/FindVUK 1.02 -0xE98A64D7D67B5098A47BA0E636892D409A192950 = ANOTHER DISC 2 | V | 0xCC93343F2C806CA9248CF3CEB217BAE6 ; MKBv40/FindVUK 1.02 -0x60B2C3257D80CC2EA7219A8240A9C0FC5E2DF753 = ANOTHER DISC 2 | V | 0x95FB481A59B7A84A513A81CA019602B1 ; MKBv47/FindVUK 0.72 -0x45DF5B9A50FE2866B0E287431D3745BB41EA9175 = ANOTHER DISC 2 | V | 0x935AB52F6E36884ABC192AF65EC6AAD4 ; MKBv40/FindVUK 0.96 -0x115634DAEA120429BC11474276EB3D7385C4FC0C = Another Earth | V | 0x8532DA80DB0F50D97D9E682C65DE63C7 ; mkbv20 -0x922D8B12EB843A57E3579CFECAC3973DB7683FD1 = antarctica | V | 0x875EA1B3066A4F9B06CE6CBC4AC3013C -0x083ED2690E013EC9CB52052FD5CDA83C625D4D1A = Antartica Dreaming | V | 0x4688B427AC5381843C8A85DCEEE8FDFA -0x8CC55E95827B2EDEF11F2AC5C673731185F7CE1F = ANTHONY_ZIMMER | V | 0xB380B6C27D19690DDB77BAA6EC947E0C -0x22DD18F5E197AFF45D7A3A8336F9E2FBCDCC3FBB = ANTICHRIST | V | 0xD6F8A6D4B7FC65E511EE7CE8C8EDAB72 -0x2AC7E1F891060F8EC631E29A6CE90A4F56C0A1EC = ANTICHRIST (Antichrist) | V | 0x7CA35AAAADD33E7EDCD6DEA4E1D6FBCF ; MKBv19/FindVUK 0.99 -0x0D1E81D99BDD244CF885121F269A09673421D7EE = ANTICHRIST DK | V | 0x40697F787C9565DD1311FECBEB6076B2 ; mkbv12 -0x1744224EBA0A858B3DF6023129EB51394E2A941B = ANY_GIVEN_SUNDAY | V | 0xD629CBA9235882A87B6E620496C505CF -0xFB494C0F336089B84445F2BB6F8E61F81F770471 = ANY_GIVEN_SUNDAY (Any Given Sunday) | V | 0xD60060D34F7128B536BEE982E8B21989 ; MKBv9/FindVUK 1.00 -0x87659C14D9856D21038D5C5ADFD1559C8C52AFB9 = ANZX_9451 | V | 0x6BBD7DB70E93DE1E348DBE710E8E9040 -0x44125BE1A2740448F7F039FF99C045D473BB901C = ANZX_9453 | V | 0xF56FC45381C0B56BDF63D9985A7C6180 -0x024280CB0BBE217CD83E91790FA4163C96DD9004 = ANZX_9455 | V | 0xB05070C2413A09C7267BF6DCED6DCBD0 -0x7BE3B4E6AFC45ACEFFDBFEBB8F5ADC98ED70ED27 = ANZX_9457 | V | 0xE1407A6FA06501830EA3E2BB59055560 -0x1C8378BACE6CB101F11A400B91617092FA217F39 = ANZX_9459 | V | 0x7A403B129BC85CF4A3CC7DF38A156F09 -0x2F5C9594BCB3575EDD7CDF789EFCC72739E1B39B = AN_AUTUMN_AFTERNOON (An Autumn Afternoon | V | 0xD65F2A3154AB2108A6D31201BBD7B1A0 ; MKBv21/FindVUK 0.98 -0x7D40AC61C9CDC6C0C9F35BA1E87D712C53C532DF = AN_EDUCATION | V | 0xBFF1261534874D4A4CC378DCBDFA5FC1 -0x5386D415E423A9ACFA4F2E79BCFDE94E7200D7F7 = AN_EDUCATION | V | 0xCF9FB7185CAD20D5950BB5DE13C77FC1 -0x27645567BD7C19141637A87B850675B13FA48445 = AN_OFFICER_AND_A_GENTLEMAN (An Officer a | V | 0xF152CF84A4BF70CB36B6E83677F4893A ; MKBv36/FindVUK 0.96 -0x5456C5FFF27C202F540E06D5EF8003FCC2B2A77C = AOA_5301 (NISEKOI Vol.1) | V | 0xD177343CB525D0B83248B5EBFA8AD7FB ; MKBv50/FindVUK 1.02 -0x3D222BA0817CC6197BA4FBC71A4B36191F35B6D3 = AOA_8001_DISC1 (Charlotte Volume1 Disc1) | V | 0x2CE0535463837B7538811B6E4A16EF4D -0x9F6AE0E106E4B8615F0F672E6C84E652F52F006B = AOA_8001_DISC2 (Charlotte Volume1 Disc2) | V | 0xC2F7B6E6CA27ED09E559CBC16907672C -0xED627394BD65CDAED06A4A5EE21B0DAC8C3EDE7C = AOA_8002_DISC1 (Charlotte Volume2 Disc1) | V | 0x77ADF8B53B59C808839AC9B79BCE3BD2 -0xF50B83ADBDF3B42DC5F90BCE3BD45C49B96C3AC1 = AOA_8002_DISC2 (Charlotte Volume2 Disc2) | V | 0xC64B22A77A7F03B876A431188DEA7DEA -0xC2639C2C97194850F0895D4626D1A2DDF92B465D = AOI REI NO BLURAY TOKUHOU | V | 0x97FB265C2D533C9EE03934025865E33B -0x1B8AD69B786F486EED8CBCB4D3B269D7A9489054 = APL1NNE1 | V | 0x0B0FC071C49D9FD4098709385B1E17C8 ; MKBv3/FindVUK 0.96 -0x096DC59D47CC58DDD9048D81DB1B647D8CD0C51E = APOCALYPSE | V | 0x5D4ECA936C7671A4BEA5AE577857615B -0xC7FB2D4F3884ED7E9B5981BE84B712D600D8AB6B = Apocalypse Now + Redux (2 BD) | V | 0xB5C9769E1F4122789C40D4111CA8A11A -0xE184883A050F027A9F2CE1786FDF364CF01A07F4 = Apocalypse Now + Redux Special Features | V | 0x7C95C2DA5C1D2D8E7A52ADFDE1AB2ED7 -0x82698D4D755B03C2F9AB1DBCC84CA53932D85642 = APOCALYPSE_BD1 | V | 0x720BF908BAAB2C53859F2D378D7389F5 -0xCB9F94BB76FB287B925C3C2145E6C4A3CE92071E = APOCALYPSE_NOW (Apocalypse Now Disc 1- B | V | 0x393614FEA54E87CA031E49D7FA28DCD2 ; MKBv18/FindVUK 0.92 -0xB52A03AFD4CF9816716BE1622AD9AE0EDDF52836 = APOCALYPSE_NOW (Apocalypse Now Disc 1- B | V | 0x64E8AAA4DD97893D8A682C1725A335B6 ; MKBv18/FindVUK 0.96 -0x0F0BD3C4C5F3D349F83AED4013F92703ADF2027D = APOCALYPSE_NOW_D2 (Apocalypse Now: Disc | V | 0x818A28A341F3FFF4334617F47038A162 ; MKBv18/FindVUK 0.96 -0x315B0161D72291CB7105976FADFC42E5FC8ABD3B = APOCALYPSE_NOW_DISC1 (DISC 1) | V | 0x8D101ECAAB621E20EBD953D17F893DF8 ; MKBv20/FindVUK 1.00 -0xAA735BDF176B726D9C6359B8B9211DF8AC730260 = APOCALYPSE_NOW_DISC2 (Disc 2) | V | 0x10157ABF6F3A8F0EC4869B8185CA0904 ; MKBv20/FindVUK 1.00 -0x2F2A17A8255BF883F6E6DDF4F7ABB21645461E38 = APOCALYPSE_NOW_DISC3 (Disc 3) | V | 0xE54A97A0725CFE088C6C5140FE584562 ; MKBv20/FindVUK 1.00 -0x89E98F1609EBD4A7C442884B86958838E22E5530 = APOCALYPTO | V | 0xC7F68755E58FD19547DBBC31FBAD3FD4 -0x3549DC4881B11B8E3B8077811998B196D73B58C2 = APOCALYPTO | V | 0x9ABC1DBA0F52E939A8A03469BEB47D01 ; MKBv4/FindVUK 0.98 -0xE50472D23F460C0363A5F020B2F1E16885638619 = APOKALYPSE DER URZEIT | V | 0xC85CD5BA4ADFC7383E81692FC00F2B31 ; MKBv17/FindVUK 1.02 -0x06BE0A7D02D7A354D0C1139073AE04E3CC74FFAA = Apollo 13 | V | 0x4C973FE12ECD717F27028E47174AAC1A ; mkbv16 -0x191D0EAC2A69E8D45BFCDAB7D73A3955337599DD = apollo 18 | V | 0xB94EBEFC642FD2CFAF08CDC0734FB608 -0xCC0F8FCF116865BE6AF01AA480E54BED8395116E = APOLLO_13_20TH_UPB1 (Apollo 13) | V | 0x2AA3B98E706BC4A5B6297ED1C191A3D5 ; MKBv47/FindVUK 1.00 -0x39275F7C2A7DFB54EF17ABDFBA749A6B2CDCFC14 = APOLLO_13_20TH_UPB1 (Apollo 13) | V | 0xE1BD90B019DF24AA0B94B46F4B181944 ; MKBv47/FindVUK 1.02 -0xF3465732D6BF5130BE0442C7CE85FBEA8DE3D3F9 = APOLLO_13_20TH_UPB1 (Apollo 13) | V | 0xDD17BC56B78F89485CF6C793578A5309 ; MKBv47/FindVUK 0.89 -0xE95972E6E36573D3408DD025A28F8D7122EACD4B = APOLLO_13_20TH_UPB1 (Apollo 13) | V | 0x776D62E1F14AFE14FBAC67C54E94CBE3 ; MKBv47/FindVUK 0.98 -0xF69A08B7A8AAF1B72906C8F23CD290DF16303C64 = APOLLO_13_G52 | V | 0xD24C9710B8E86DC703DF8A70BDBB0F8B -0xA858A05070AF1BFD1EDA2771E0EE29789C41B5A8 = APOLLO_13_G52 (Apollo 13) | V | 0x83232594CE2206C8B560EF322BA9E5E3 ; MKBv16/FindVUK 1.02 -0xD58353E99E0C6FE0937061360D665469937DDE01 = APOLLO_13_GLO_G51 | V | 0x9AAF49AF41B74F3A9AB9915AE20D7D07 -0xFA06C2B87DF1D6AD9931AA6F5BE8A4979B504A56 = APOLLO_13_GLO_G51 | V | 0x4E49A0B36231602BB67A3860CCF5D91E -0xC8A6E3147374A27BECB5E4DD1053AEC9DE8C4380 = APOLLO_13_GLO_G51 (Apollo 13) | V | 0x887FD90407BB0C1CE01E68695DD5702D ; MKBv16/FindVUK 0.98 -0x6A9A9F2DF61B25645FD3D0B846EB63BD10038BA3 = APOLLO_13_GLO_G51 (Apollo 13) | V | 0x3C9096728131F8502EE002500C74D342 ; MKBv16/FindVUK 0.96 -0x665A07A26F2E2648843B8A7DBB961D866087A816 = APPALOOSA | V | 0x29E1931C6B6D871898709B2B0D70336E -0xB480BD107EBED970AD8604F7038AE352516D0189 = APPALOOSA | V | 0x4A50B962267CC43E50335C36B41D1FBE -0x0C8D00403AE9DF0DBE375CCD64F7C73F0527B29D = APPALOOSA | V | 0x3678A82D262D1BFBBA50867F8554B71A -0x7099CA7B190AB63D243134C49B4749FC37A2FA16 = APPLESEED | V | 0x768A3ABDF840C0E89FA4FEAB0BAE80D8 ; MKBv16/aacskeys 0.4.0e -0x3F555827DFA2E41C589FABD8EB7945C4447678DC = Appleseed Alpha | V | 0x38F4B6FA490DB8EDDAFB30EEF38E7696 ; MKBv46/FindVUK 0.81 -0x857F6DA080152EEF80460BBFF60D9A29F9ED092B = Appleseed Alpha | V | 0x2175CE117E070CC4B24E4833B7809205 -0xB2452495FEAB6890734100880B6B9465657FEFFE = Appleseed Ex Machina (USA) | V | 0x518CEC8427B5579D870388748898502E -0x0FC81155E0108197D9CB31A2FA280494088D375E = APPLESEED_BD | V | 0xF2A4365B77403D50E010C5C1478B2E48 ; MKBv16/FindVUK 0.80 -0x35C02CBD61AFA95D8570160361038760FA785147 = APPLESEED_BD | V | 0xA7BF6579B95D6F941761612E434F29FE -0xFB43BE360EB7058E79758CB42EF79B1505DB7270 = APPLESEED_EX_MACHINA | V | 0x9EC6A306185C34CAA8117300FFABF6B5 -0xB5138106421D7D97286C8D2BC98338323324CE78 = APPLESEED_EX_MACHINA | V | 0x9A7E40427F18CED2886FC05B18C0C0F8 ; MKBv4/FindVUK 0.80 -0xCF2643A5E42C4325E74B8085C5E25657CB4F215C = APPLESEED_XIII_D1 | V | 0x41422A545AF762F71CB3616E2F46512C ; MKBv40/FindVUK 0.81 -0x89E8C1051F04B8AA0C11FEC704EF9541D802A554 = APPLESEED_XIII_D2 | V | 0xCD6EE25C2B3DA449804A9F0CBE593FA7 ; MKBv40/FindVUK 0.81 -0x4E657F88BC9CBA159F22A82D175F60FC1C96F5B0 = APRILEXTRAORDINARYWORLD_NA (April and th | V | 0x93B1E1C5C4ECD25824142691622692E0 ; MKBv56/FindVUK 0.98 -0x591EFB5E7B1A1326570CD799D9DA257479211048 = AP_MAN_OF_MYSTERY_BD01 | V | 0xC8C49EED16704AA69FF659D81208A9CE ; MKBv9/FindVUK 0.84 -0xE41137C5B8295EE19952C0F2A2B8E2743E28F608 = AP_MAN_OF_MYSTERY_BD01 | V | 0x269EB123921770F019AFF8DD6DB15C59 -0x9F12F66F31A5BBE7408C369B749AB0F7B9C22683 = AP_MAN_OF_MYSTERY_BD01 | V | 0xEF9FD9474DDE083BDA417BCFF623E2EB -0x3E72438296A87749C614598F8E56803E56E7E5E5 = AP_MAN_OF_MYSTERY_BD01 | V | 0x3052BDE12868B0ADECBFD9EB58F20C8E ; MKBv9/FindVUK 1.02 -0x4441EE338DBDA6242CDF2A5EFD4406BCB1BA76DE = AP_SPY_WHO_SHAGGED_BD01 | V | 0x9595D72D7C5BA54571F813804BF30567 -0x3053D93F3B74A18842E86FE32A7CF9E4F2A75A37 = AP_SPY_WHO_SHAGGED_BD01 | V | 0x873A3E2DFC67B94004A1B5D73B7B7B56 ; MKBv9/FindVUK 0.84 -0x450668AB0F294E1C0BC404ADE107FA961F42E4D1 = AP_SPY_WHO_SHAGGED_BD01 | V | 0x0EF20104019715FF9CA16FD5C3E0037C ; MKBv9/FindVUK 1.02 -0x4180C3DAAB87AE41A4F1F7C49333A721006DFDBD = AQOTWF_G51 (All Quiet on the Western Fro | V | 0x98A930C1E284D06D5D1A24BB9860C127 ; MKBv27/FindVUK 1.00 -0xD1CD12FC3A8A46D5B12E20122E4AF39CB4F0A246 = AQUARION_THE_MOVIE | V | 0xC72716ED17B4A298F4CADAA9CA92B140 -0xC8C45FFE79DBCEFF9A5B7DE75982288A4EE27F67 = AQUARIUM | V | 0xDB6E0D7D815F5E6305AD264EF441691B -0x0C3A68010F38CDB432A386B2F1C456269F176EA0 = ARBITRAGE (Arbitrage - Blu-ray???) | V | 0x541DCE40F34B2EABADC99A12B580CED0 ; MKBv28/FindVUK 0.96 -0x0465F9B55E8F3A14FAC81C760EC48652A531A649 = Arcana | V | 0xE8E376D47F4CB081226D806A58F3FA76 -0xBC9315BB5B4C7A647F7958E562878D6EB2408657 = ARCHER_S3_D1 (Archer, Season 3 Disc 1) | V | 0x81CC0D037347668F320EB1A6264FB7B4 ; MKBv27/BD+/FindVUK 0.99 -0xA86C4DA4E060BD5D4B7A2FC00B56B0A80197BD7E = ARCHER_S3_D2 (Archer, Season 3 Disc 2) | V | 0xB5714BE3EB60D830DF8DB5F64B74A406 ; MKBv31/BD+/FindVUK 0.99 -0x99A0432F4ADEC2AB72B4E5DDBE6034586B77D013 = ARCHER_SEASON_2_DISC_1 (ARCHER SEASON 2 | V | 0xF0310E32FA59A05EBCD63D2C215DD66F ; MKBv23/BD+/FindVUK 0.99 -0x5D9848924F10C9221FD5D884CC486740D39B20BE = ARCHER_SEASON_2_DISC_2 (ARCHER SEASON 2 | V | 0x3D9C6D7BEBF48CF38D08E8B72F7BB228 ; MKBv20/BD+/FindVUK 0.99 -0xEDF5A2232B45408543C39EB6A68276C9602DDB35 = ARCHIVES_EP_IV_V_VI (Star Wars Archives: | V | 0xC1187046182FDD6DDF38B493F6638B8B ; MKBv23/FindVUK 1.02 -0xDE689183874670CBA1F55DF6C366C1608B173666 = ARCHIVES_EP_IV_V_VI (Star Wars Archives: | V | 0xF7EF18A6AD2D6AFCA095BECC9E03ACCD ; MKBv23/FindVUK 1.02 -0x0C43031D5917C9B08760D72D3FE6679834379BAB = ARCHIVES_EP_IV_V_VI (Star Wars Archives: | V | 0x3CE2DB12AEF55EA490621440BAD16227 ; MKBv23/FindVUK 0.84 -0x7BC7BA6FEBF913C470C7B93280C433B20E750147 = ARCHIVES_EP_IV_V_VI (Star Wars Archives: | V | 0x5379DBD6F3ED67310566EA8837E927DA ; MKBv23/FindVUK 0.96 -0x6D51ABB14EDB89FA49C31DEB6E17F4BB6A14F774 = ARCHIVES_EP_IV_V_VI (Star Wars Archives: | V | 0x1256EDC1B130D31F7225C2B77AEECC08 ; MKBv23/FindVUK 0.92 -0x9C3402B8C88307DDED4DA8FCD7144F1051A5BB01 = ARCHIVES_EP_IV_V_VI (Star Wars Archives: | V | 0x023549CB3232F9B8EC25AF7F678DEE50 ; MKBv23/FindVUK 0.99 -0xDA8F800E6A5ECB313C6BE99C9090361C9C97573E = ARCHIVES_EP_I_II_III | V | 0xEE907E66772B3DF637BF99B54311587E -0x0ED832F9EE89891851F08C96144C1A7CD48D3FAE = ARCHIVES_EP_I_II_III (Star Wars Archives | V | 0x16781E120A6BA8EA76EBEE8654C3B6B6 ; MKBv20/FindVUK 0.92 -0x78F809A8C7F9BC619FA1C233D4AD6306CF043194 = ARCHIVES_EP_I_II_III (Star Wars Archives | V | 0xE50CBF659AA69ACBBB5708616356C333 ; MKBv20/FindVUK 1.02 -0x88061A735FE8B56178E66F3525DEA9877B428DEE = ARCHIVES_EP_I_II_III (Star Wars Archives | V | 0x6D1BF8E10E943E0C8D707AF30D0799E5 ; MKBv20/FindVUK 1.02 -0xE737580AE14E8DA34C6046970B5E51970BB9CD28 = ARCHIVES_EP_I_II_III (Star Wars Archives | V | 0x4C714384E6E2CD7F5333F7CAA52A486D ; MKBv20/FindVUK 0.96 -0xD99B3ACE7AC36438F1B69C59C36E0A757188FEA0 = ARCHIVES_EP_I_II_III (Star Wars Archives | V | 0x337C6310645ACC302DDB868F30BB7D5B ; MKBv20/FindVUK 0.99 -0xC22931239124CDEE6DECA03B853AB841F2CEEF1E = ARCHIVES_EP_I_II_III (Star Wars Archives | V | 0x34C8971F8D36F88683BB2537A999FE51 ; MKBv20/FindVUK 0.84 -0x4F3BFD821EBF826F1B796C6BC644740C73AF0260 = ARCTIC_TALE_AC | V | 0x6384EE97717914E244F36B116C6B2140 -0x3D0C27032AE936E0F9C106DB80759178BE82C9CF = ARE WE DONE yet | V | 0x7A514BE2BE29BEABC17647F1BDAF72B4 -0x140ED5DEC9E2B3C6DD9336C7D722410FF5875246 = ARGERICH_SCHUMANN | V | 0x29BFD7830A7A83D8F0904CBB5984101A -0x86AF257E4D92403AE4AA72175D2FA8970C0156D8 = ARGO | V | 0x1DB99081F6221C44ADC9458AD120BEF0 ; MKBrev 31 - FindVUK 0.54 -0x92A7CFEFFA230BC1E23D17E8FCB20307AA8A0A32 = ARGO (Argo) | V | 0xDF63AE8FF09BD15D32B06B42BEE82DC8 ; MKBv36/FindVUK 0.84 -0x08E53771F3EC1D2D3AA4128414EF0DCE61FAEDBD = ARGO (Argo) | V | 0xFCBBF6BAC8E3FC306F54A16729EC835D ; MKBv31/FindVUK 0.94 -0x8D1DEA9C0CAB9DED3C5D4830544CA962EE9EA69A = ARGO (Argo) | V | 0x786E29D1512B6DA49AB245DA180A9DF4 ; MKBv31/FindVUK 0.96 -0xC5ED08A050E402222CBA5DBAC8D1443E6BE1644E = ARGO (Argo) | V | 0xD064139D18AB76D6A3D1154D2B7448F1 ; MKBv31/FindVUK 0.96 -0x4B888AF5BB7B4A9EB20CB07AD1832BAC9601E368 = ARIADNE AUF NAXOS | V | 0x0E6F4042215B4858307F32822CC0CF36 -0x78CD71D5FC2420549F67C24CCA45CEDDBF9744F8 = Aries_EU (Mission: Impossible Ghost Prot | V | 0x3A1DA6B155DD90BE529C53F4EA5353CD ; MKBv27/FindVUK 0.96 -0xC0AABA67453E1EC4756E2C4F3E3AF6C6F2C71F73 = ARLINGTON_ROAD | V | 0xD67C353E9ED72429ACD0CE7D82D3291B -0xB1950606156491B2F1FF48933230F2661B9906E5 = Armadillo | V | 0x9816C0573370D882606BB37B2CFEC33D ; mkbv17 -0x103B224C45ABD00E5BC2BE7F07403C17C43493D0 = ARMAGEDDON_ALA | V | 0x63942661CA6953EEEAFFC5C85E0F91A7 -0xB9257BD1FAB4AB6608B5D7933C5AB1EAE338657A = ARMAGEDDON_JPN | V | 0xC6E13E9654AE265D7E80D4E026EECA78 -0x34D6D7F088AB5F089CCE16B79F58FD52760FF9EF = ARMAGEDDON_USA | V | 0xE268773E80AE6610D1212DA52492F387 -0xD45508B449F3461DD281F8580226B2206FACE96B = Armageddopn | V | 0x57E0BE69C44F18FE5317F7A4ED99ABEE -0x4EEDB8D78BA38C02A725CDE953F5FF67469C71F5 = ARMEE DER FINSTERNIS DISC 1 | V | 0xE4DE75043485E9570533762C36DCC45D ; MKBv39/FindVUK 0.80 -0x0A3C8CFFC1F001E14302723B219A987E04CEE400 = ARMORED | V | 0x9C0FD583EB765EE2BA6A13C7182FD386 -0x10DBAFC7EF3627426F1691C09EACDE0C2DB8DAAA = ARMORED (Armored - Blu-ray???) | V | 0xE17A08230CBF8CF07AC5A1BE506F2483 ; MKBv16/FindVUK 0.84 -0x848594D02099B2EA25A3D878457BC60B3B6F49FE = ARMORED_TROOPER_VOTOMS_GEN_EI1 | V | 0xC3530B97393DD110B1CF3316F3826147 -0x734E4C728CF28A5B670472285E292FA6AF4CD996 = ARMORED_TROOPER_VOTOMS_GEN_EI2 | V | 0xDA0E61792500EE7CC34ADEBA0CEA50E3 -0xFC68AFC50285FDB55421289CD7D6D4FC093EFF50 = ARMOUR OF GOD 1 (Armour of God - Der rec | V | 0xEDB330C72DE9D983B83CA0B49A7873EE ; MKBv44/FindVUK 0.96 -0x31FEF0ED650213E86B9D7E372D023BD29F2110D9 = ARMOUR OF GOD 2 (Armour of God 2 - Der s | V | 0x0DE956C3C8843598B7A746D7C46CA892 ; MKBv44/FindVUK 0.96 -0xF7FF2D62B309ADED8824FC77841D9AF2E98315AB = Army of Darkness | V | 0x60A6F869A0439FE59DA8654F7270D234 -0x94B8C5BCCD606930020520A4FD9C4336493AAD06 = ARMYOFDARKNESS_DIRECTORS (ARMY OF DARKNE | V | 0xDF4FBA1C86D08DDB536BE3E9BE84F526 ; MKBv57/FindVUK 0.99 -0x4FD4121165901A72248A02B82716FD36A6996FC2 = ARMYOFDARKNESS_INTERNATIONAL (ARMY OF DA | V | 0x72D6F461C6452EC4B08574BD1E82DF19 ; MKBv57/FindVUK 0.99 -0xA64D9C0117126504920A9F0C01120CEFF5A1979C = ARMYOFDARKNESS_THEATRICAL (ARMY OF DARKN | V | 0xA5A3F9A93F5A154ED9A23AD849A78E01 ; MKBv57/FindVUK 0.99 -0xFE747AD7763621AADF22AB7BE3BA958DD1992018 = ARMY_OF_DARKNESS | V | 0x5EAE57D637568E5422E1D91B205786DE ; MKBv6/FindVUK 1.00 -0x50F35054399922DA0C445908633444687E95EEDB = ARMY_OF_DARKNESS_SH (Army of Darkness) | V | 0x85432A9FC67070F8FF976B5F8A12207B ; MKBv14/FindVUK 0.92 -0x49AFECF864E9F2E50AA5CF4D716360107CB9D844 = ARN THE KNIGHT TEMPLAR | V | 0x764539C155EBE39374C27EEDF19FE6A0 -0x4669541581B45263C6B0F9729965C5BCEB2BE03D = ARRIETTY | V | 0xDB9AEF4E1005F94E292E5C3367C4BA0A ; MKBv23 -0xEC6D16520F88E2FD1C3C6B0C10772F670CDF5F9B = ARRIETTY (Arrietty) | V | 0x1E40DD8BF4E04580ABB488F0C6FFC36E ; MKBv26/FindVUK 1.00 -0x6C654E756D6265723D2234223E46696C6C657242 = Arrival | V | 0x693A7469746C654E616D653E0D0A2020 -0xA246864ABFB50A16A2210AD95FB2259E2C9B729E = Arrival (Arrival) | V | 0x1C697DDC6B5A89694DF71EB58F215713 ; MKBv62/BEE/VUKNOTVAL!/FindVUK 1.00 -0xC4D70912450DB1C8F8BB39E7C7790BB9D9D6981C = ARRIVAL_2016 (Arrival (2016) – Blu-rayâ„¢) | V | 0x161D3F56759EFB7BB1BF5BE9A74C01A4 ; MKBv62/FindVUK 1.02 -0x9802CECD8EAD320E889D4DB4B7E2A1E6B7BC4E61 = ARROW_S1_D1 (Arrow Season 1 Disc 1) | V | 0x98AF2DC6CC71E325188725F3ACD9B155 ; MKBv42/FindVUK 0.91 -0xDCB61B434464F10E2B71B22D84898AEDDCE9FB96 = ARROW_S1_D2 (Arrow Season 1 Disc 2) | V | 0x40BECDF9D46E0787A4C8BE6052402CD8 ; MKBv42/FindVUK 0.91 -0x78AD0E4F5E220377348C382F5EEDD89BFBE075D6 = ARROW_S1_D3 (Arrow Season 1 Disc 3) | V | 0xA1F7BF3B60B654D05734C93F3F8D2C0A ; MKBv42/FindVUK 0.91 -0xF4C15AB54704D7B3BE55C6B54BBDA61D3BC11E15 = ARROW_S1_D4 (Arrow Season 1 Disc 4) | V | 0x6D2B3FDEF292881C8611526C6240416B ; MKBv42/FindVUK 0.91 -0x1BDFB6C4158001D6F275EE63996C5692E993C162 = ARROW_S2_DISC_1 (Arrow Season 2 Disc 1) | V | 0xD224F5809A87E6810CC7D4B827EF8879 ; MKBv47/FindVUK 0.91 -0x09DDF4D62CBF400AB890D6AF2017B39229B510BB = ARROW_S2_DISC_2 (Arrow Season 2 Disc 2) | V | 0x9AC9067C9DDE7712CBA4934E3E4148D4 ; MKBv47/FindVUK 0.91 -0x2A9E641BF0A3FEFFF54EB29DC7AD41C80DD56751 = ARROW_S2_DISC_3 (Arrow Season 2 Disc 3) | V | 0x2AE454D7053B78FDD8DEA8056EB8A3FE ; MKBv47/FindVUK 0.91 -0x05212B792C1AED9094F6D17FB85ECA4A942813BF = ARROW_S2_DISC_4 (Arrow Season 2 Disc 4) | V | 0xF6BCBF86CDA25E53417456E3EDEA02C7 ; MKBv47/FindVUK 0.91 -0x4CE46CFC1E8DE0BEDACC34C4C90C7167565DBE54 = ARROW_S3_DISC_2 (Arrow Season 3 Disc 2) | V | 0x9CB472DEA14F48862E688362FD96CB65 ; MKBv53/FindVUK 0.91 -0xF453023B06076733C83A85B72FAA85FA64958DB3 = ARROW_S3_DISC_3 (Arrow Season 3 Disc 3) | V | 0xAEED05FDC8C4065C619A9575C90F4754 ; MKBv53/FindVUK 0.91 -0x9A03466D06AA5C5193B473CBB4DBE81D48B8D68F = ARROW_S3_DISC_4 (Arrow Season 3 Disc 4) | V | 0x0253302727ECAEFDA84748B378AB2BF0 ; MKBv53/FindVUK 0.91 -0x9EB8869DDDD33E2240141989E8C9138A2D872A73 = ARROW_SEASON_3_DISC_1 (Arrow Season 3 Di | V | 0x9CD3893BE95505B3F542300E5DB0DC95 ; MKBv53/FindVUK 0.91 -0x2772DBBF5CC160AA16ADC39787CFB2B0DC6429E9 = ARR_FFXIV_OST (A REALM REBORN : FINAL FA | V | 0x9441DBE8AA0BB41927BF858FA7DBDDC6 ; MKBv46/FindVUK 0.92 -0x363695527067F5B546275436D6F158BEAA36C591 = ARS1EGW1 (The Aristocats - Blu-ray???) | V | 0xC36B1C3F80562C263D203633BB44BC2D ; MKBv28/FindVUK 0.94 -0x99B72470D16332BA0BB4ACC5C977E5487CA7532D = ARS1EXW1 (The Aristocats - Blu-rayâ„¢) | V | 0x4548037586D3C161847B9BF789CE29CF ; MKBv28/FindVUK 1.02 -0x8674321492E8F23A7769EF81213F4F43872B3480 = Arthur | V | 0xEA68DD7ECAFCB9E8238ED886301F3716 ; mkbv23 -0x0A8CF549AAD4E7BFFD5BD6C8A461634F3F2877C2 = ARTHUR 2 MALTHAZARD | V | 0x4AC1A09E4C07AA05FCA874AA804885A0 -0xE3F558B2C904F3E0DD75069EC661CAA99B07B618 = ARTHUR2 | V | 0x3E034C69BBD3C5B5A5124F6AAEB847F5 -0xD803BD1E446643FC8DFEC007EA87C80B2AAC76F4 = ARTHUR3 (ARTHUR 3 (LA GUERRE DES DEUX MO | V | 0x43D44F7D10F25BFDD0ABB5FF5ACECCD3 ; MKBv20/FindVUK 0.96 -0x59197D58CA31CAD4F3BD4D3A79E4162368E1494C = ARTHUR_2_BD (Arthur und die Minimoys 2) | V | 0xAA38E362B8E1451EB18BFB824E0F0501 ; MKBv17/FindVUK 1.00 -0xE368912DBFF4A5CE45F4B7F69479AF783933418D = ARTHUR_3_BD (Arthur und die Minimoys 3) | V | 0x4D1B872B2A1C524F6E118DDC4326DDEF ; MKBv23/FindVUK 1.00 -0x933F3EE458762749AE28490605CAD0A75F0C59A8 = ARTHUR_BD (Arthur und die Minimoys) | V | 0xCD2372165F19773B0DF6CB44F2BC3071 ; MKBv14/FindVUK 1.00 -0x85056CA55FD6A80F044354B62A74917A16D74EA7 = ARTHUR_E_LA_VENDETTA_DI_M | V | 0xAFFAAB6DC728280B842218FF3098C9EE -0xAFDA5718479F47A85A5F5B3500A74C8F068383AA = ARTIST (The Artist) | V | 0xBB8709859C486F80F5D5E75290A4758B ; MKBv32/FindVUK 1.00 -0xBC14C6953EEF1B0ECBA17E2C8C15C0CC7E13EF78 = ASCHENBROEDEL (3 Haseln??sse f??r Aschen | V | 0x22B2E7AA43F8E086FDA04F8D664BE994 ; MKBv46/FindVUK 0.92 -0x0A12F84F1709A69A71F3E319ADE102E8F4F17E83 = ASES CALIENTES (ESP) | V | 0xD9D90154024900238601BEB6721D4606 ; mkbv15 -0x24659A68DA918E315D32E6BBA5E1A4542E40D67D = ASHENS (Ashens and the Quest For The Gam | V | 0x6072957DEB968846F7B1D666FD7D659D ; MKBv47/FindVUK 1.02 -0x580BEF99F9E81A55E5D68BCD76830687ECEF91BE = ASHES_OF_TIME | V | 0x2586CE8D0BCCCEE343C2D9DF51CAF625 ; MKBv10/FindVUK 0.84 -0x6E9208668F600A77A935DA430C8B8C4C5BB93E95 = ASIA FANTASIA LIVE IN TOKYO | V | 0x603353EF8C2EAD8FCD04ECC354AF9253 -0x3263982A8F775F8CD49D2CC2AE541BD1422C6F67 = ASIAN NURSES BLU-RAY | V | 0x6546113483D2A557B6CED4AFB41F78E3 -0x468864F2C1FEC0B6FE44B2800B2F016D60615F55 = ASP_VZB_BD (ASP_VZB_BD) | V | 0xB8CBABFAD4930537A507E3B967E17BBF ; MKBv14/FindVUK 0.96 -0xEC96005E710A3AE5BB4D39C73893C3E7059A9837 = Assassin's Creed (Assassin’s Creed) | V | 0xC1B1B691E3CA020D1565AF56CF4C75B7 ; MKBv58/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0x98229CCDDE31D9CB5BA10FAE6E6E1A91E256F2D9 = Assassin's Creed (Assassin’s Creed) | V | 0x4FBE7C0D8F93DBA082D8BB2F2D296B01 ; MKBv50/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0x1A31D66E1ECA8C27D9DEEF90E01DB3B77101BED6 = Assassins | V | 0x945DCB50D46D9CB14B3273C45A7C041C ; mkbv20 -0x683D8A0B5E9A9BA161B4CA4235BD5462A5FC352A = ASTERIX | V | 0x11F3C5BDE88E9E2005D8390852D51BDB ; MKBv4/FindVUK 1.00 -0x92ADF88BA731F1E07AAFC3C1BB2A258130BDE087 = ASTERIX CAESAR (Asterix - Sieg ??ber Cae | V | 0x846D0EC363D805256ECB410FE4CEB3B1 ; MKBv19/FindVUK 0.83 -0xB67D854555262904FB50F3BC2DB44736AD87937C = ASTERIX EN LOS JUEGOS OLIMPICO | V | 0xF93DEADB4EB660E03E902F7A5DA3980B -0x9AE03D2333A4C80E6FA54449E9131F64905846C6 = ASTERIX LE DOMAINE DES DIEUX | V | 0x18270B004078B2EE82A01BCEA9D64196 ; MKBrev 52 - FindVUK 0.57 -0x0B47BC388E9ADCFCD151678726D4297B8C5583C9 = ASTERIX OPERATION HINKELSTEIN (Asterix O | V | 0xA1B0491E3F5C7567054BBAA0247358A9 ; MKBv30/FindVUK 0.91 -0x2FE580EA028A4F50A62E3DE544A298CB1E785ABB = ASTERIX THE LAND OF THE GODS (Asterix - | V | 0xFED4E06E38E3041F0980594C4E1BD395 ; MKBv54/FindVUK 0.93 -0x6DB7604CC9B58031197A582888318BD6D4E9737D = ASTERIX UND OBELIX (ASTERIX UND OBELIX) | V | 0x6F480B2D6B6A3DCD4B7B550075CAA6A0 ; MKBv37/FindVUK 1.02 -0x447BE4F11C443CD0659F793B30BE372FFB1268F1 = ASTERIX_ILDG_3D (Asterix - Im Land der G | V | 0xFC16459D7CBADDCFD15D42B776E5C52A ; MKBv56/FindVUK 0.91 -0xD39FD659F9B7760922A78BAB264A773D46CF3187 = ASTERIX_LE_DOMAINE_DIEUX_2D (BLU-RAY) | V | 0xF6123E38F9134CAAEC73BCC0862AE62C ; MKBv48/FindVUK 1.00 -0xEC3C32ED4E8B72D2AF027CCC73A8871276FBBBF0 = ASTERIX_LE_DOMAINE_DIEUX_3D (BLU-RAY 3D) | V | 0x86DB57D9F2B65FD201B118E561011195 ; MKBv48/FindVUK 1.00 -0x3C7BE609E64CC579455026B327C21F1D2DE0DF8C = ASTROBOY | V | 0x5705ED981A58213D964BEB6D33C1469B -0xA59BE81D4A5C21A069AE39D27D495D9B2CB85CC4 = ASTROBOY | V | 0x78CCAC026C32B572C13146BDA11F1C1B -0x8A2656FAB71982B8D097910902A99EED5CEFD541 = ASTROBOY | V | 0xC34F8850066D500726278A039037CB77 -0x3FDB012BDCDD155C11F75BF2335B9214F2DC91B1 = ASTRONAUTFARMER | V | 0xBCD7B68FA4517DAA92CC17A495D4A00F -0xB4FC60FAED61E6D501103B2F13B64A6F146799FD = ASTRO_BOY | V | 0xFABB295FD1E9A79C8CEB0B0FEDCD53AD -0x8A92C9324C8ADF3E9E44A26D9774EB0DED8A0032 = At The Devils Door (Devils Door) | V | 0x21A003BBF27965D141F9F5FF36A83902 ; MKBv49/FindVUK 0.95 -0x851F979AA109F62755388726F304AE01864ADEFA = ATLANTIS | V | 0x0E71F4C7CE3409A9AC14A2612283484C -0x1478A3623425BAA91581316CCE39BAC73AFF416D = Atlantis | V | 0xA02E9504A4FCD3AD9D8FB0901FF3E319 -0x786A5734205A533E3AFA3EFEF8AC104D80C11D3F = ATLANTIS THE LOST EMPIRE (Atlantis: The | V | 0xA285C5481527A585A3B9614B8B8BAF5F ; MKBv36/FindVUK 1.00 -0x28277BC17F1BF93B62124508B1485E751E928085 = ATLANTIS THE LOST EMPIRE (Atlantis: The | V | 0xB83C36EA5CA9539358C7D63390153943 ; MKBv36/FindVUK 0.94 -0xCC51F87217352CB56907B57F12B01A9BE49D7405 = ATLANTIS THE LOST EMPIRE (Atlantis: The | V | 0xCF64EEDA6539547016F101EF15913D9A ; MKBv31/FindVUK 0.92 -0xADF7DC60021900C26DD2DC5FFADF56F5BC57A3E8 = Atlas Disc 02 | V | 0x5FC8FE7211E24F6FF0CDEE324FB93058 -0x1E6282DBDCC2A6979C8D9AC277D02574E80D5F4C = ATOM BOMBS | V | 0x2B8EC9AC88B16C0D901582E644D09FAE -0x470146EDAFA3255507B7526397EC68C29347B171 = ATONEMENT | V | 0xC9AE319911311E9480129B017A6614B8 -0xF6AB6F5D46D61EB08E21B96AA34BB39FC3331236 = Atonement | V | 0xC1EE046BAD974E316872F993FD5E2182 ; mkbv16 -0x4BB04684617907EEC55C5986E9E4B3E31515812D = ATONEMENT_G51 | V | 0x8EA0CE3108E921A054B315272C9ECD2B ; MKBv16/FindVUK 0.80 -0x42347048990B04A10F0E4BAD75B79A0CB31A1784 = Atra????????o Fatal | V | 0xCEC1AB78163E7155744B1BB3CD7D54D3 -0x6666BC02F4C18C0CD89BADC2F3D425918CDB4B93 = Attack The Block | V | 0x83002363F597A610E32618E9ABCB2BAE -0x0A0992DE4B074A45020BEAA79BDABA10F487F233 = ATTACK_OF_THE_CLONES (Attack of the Clon | V | 0x734110B08AB6BAF9D536429DD91979B3 ; MKBv20/BD+/FindVUK 1.00 -0x080B0556F357234BE84F35A6ACB0946B247AF543 = ATTACK_OF_THE_CLONES (Attack of the Clon | V | 0xA6077578C605BB9E8D91AAE2EFBBF84B ; MKBv20/BD+/FindVUK 0.99 -0xF3CD7DAE8A87B42F4282A5B214FBD01AC3D35E8B = ATTACK_OF_THE_CLONES (Attack of the Clon | V | 0x96F915C134916D43836CDCF182DDB17C ; MKBv19/BD+/FindVUK 1.02 -0x7441C0537A356921B29986E9A1C1D3F9D6E0A6C4 = ATTACK_OF_THE_CLONES (Attack of the Clon | V | 0x3A25C5DDE5A06421EE84081050B82402 ; MKBv20/BD+/FindVUK 1.02 -0xDE9B1D692EE58E393B95D7857A2D770D13A30160 = ATTACK_OF_THE_CLONES (Attack of the Clon | V | 0x72C64251830BD617AB64B2D89B444586 ; MKBv20/BD+/FindVUK 0.96 -0xF08E7A96834680A8BCE152387B9F8594748DA34D = ATTACK_OF_THE_CLONES (Attack of the Clon | V | 0x9CC0FFB4974AC232B69B2DDEDAABACA2 ; MKBv20/BD+/FindVUK 1.02 -0xFE4AF38889BB98AB663727377BE5C092213ECF37 = ATTACK_OF_THE_CLONES (Attack of the Clon | V | 0x623C6CF1A82EB6B40B4DC92CCD9F1D1A ; MKBv20/BD+/FindVUK 0.92 -0x11D885E29C0FE18DD6BAF7CFF5288CC0D16E364C = ATTACK_OF_THE_NAZI_HERBALS | V | 0x6629401D63C9330C419B4E9E8B2C0776 ; MKBv37/FindVUK 0.99 -0xD09D3B24E46C9FD766E8B7BFB8E0EB6D8FEA920D = Attack_on_Titan_P1_D1 (Attack on Titan P | V | 0x4DD4906065C6269F1AE450DEB56AE292 ; MKBv46/FindVUK 0.86.3 -0x5809A753B599B62976C7F73A33569A10911F4496 = Attack_on_Titan_P1_D2 (Attack on Titan P | V | 0x21D35DFF11E420EB44ACFA1EF75002C9 ; MKBv46/FindVUK 0.86.3 -0xEF1DDF90F633B753B298F3C29D9AD15D9596DB36 = Attack_on_Titan_P1_D2 (Attack on Titan P | V | 0x92DB01EF1CC432274A49A95C777454CB ; MKBv46/FindVUK 0.92 -0x03E4DF3A30332D2382A471760DBFF9590FE6B2F5 = Attack_on_Titan_P2_D1 (Attack on Titan P | V | 0x17272B07791F50CB2EBFCA08E0A60024 ; MKBv47/FindVUK 0.86.3 -0xD73B3CDC1056387DA1FFAF5B412EDC6383567869 = Attack_on_Titan_P2_D2 (Attack on Titan P | V | 0xE9C16E5C19E4967FB6BC930A5CD343AD ; MKBv47/FindVUK 0.86.3 -0x16A593FDCF9CB2878265E1156DB3B1C456EA6092 = Attack_on_Titan_P2_D2 (Attack on Titan P | V | 0xD6FC949EDED2E0E4128AA95C7CADC875 ; MKBv47/FindVUK 0.92 -0xC41757BBFACB748DF9A33E818FF3EFB07964A892 = Attack_on_Titan_P2_D2 (Attack on Titan P | V | 0xD4AC930C46B4C01298F46A19C08FB8AF ; MKBv47/FindVUK 1.02 -0x56D3F40A225C986DDF761D6929ACD3D2B1870E22 = ATTACK_THE_BLOCK (ATTACK_THE_BLOCK) | V | 0x59DD8A74AEAF58456E5F1D3FA6B3824E ; MKBv25/FindVUK 0.94 -0x4DE61DBD37921EB01305E77541558401E0EA36ED = ATTACK_THE_BLOCK_BD (Attack the Block) | V | 0x95F838756117AEA7E3C29595F70D14DD ; MKBv28/FindVUK 0.96 -0x7F11AC01007975EFA3481933355E7C04C238ED86 = AU SERVICE DE LA FRANCE 1 (DISC 1) | V | 0x8D73E9ED8460D44E53BEC4CB2A33C9AC -0x1BE665A6F8FE4F2F598790F82834605836BDCE1D = AU SERVICE DE LA FRANCE 1 (DISC 2) | V | 0x1A8DF8ACACF5F3F66BD00AA25237A9D8 -0x3F8EE3AF8F9CBF3CAB9339F8F01BACD72EC05DA4 = Auch die Engel essen Bohnen (Auch die En | V | 0xF6417D8AFE43ED200F8081E37B0B6A61 ; MKBv47/FindVUK 0.96 -0xA232640B23109910AF34BB8F28A4F6A093C185B0 = Auch die Engel moegens heiss (Auch die E | V | 0x4835B480EC76FB7E75129E4B78ADBE36 ; MKBv55/FindVUK 1.00 -0x3F0351A89F7B4450A2E56CD5E38D196DB73BA037 = AUFTRAGSLOVER_BD (Der Auftragslover) | V | 0x34AB942429353BAAEA0A277D9086F5DD ; MKBv23/FindVUK 0.99 -0x40481F5D458A22568B52C55C3ECBC5E55FF353CF = AUF_DER_SUCHE (Auf der Suche nach einem | V | 0xEB68C99D15FB7C2B22583FCED4DC956C ; MKBv27/FindVUK 0.92 -0x941E9283397766C6A505D4CD453CD0C8C579F865 = AUGUST_OSAGE_COUNTY (August: Osage Count | V | 0xC1A1248FD40102F41F97BE287652678C ; MKBv46/FindVUK 0.96 -0x4A61ACAC150AEA5C34B288121C184A450788A46B = AUGUST_RUSH_NA | V | 0x6739AB98A8C7E729526598A1EF041CC3 -0x7E00083C7F863AFA9BF236F5F0E2D3F2AF6D23E0 = AURORABOREALIS | V | 0x244F914EAEDDF0B45FC0D65BC194B4C5 ; MKBv7/FindVUK 1.02 -0xA75A59088F51E8C1FCFAA973FB3968664AC5AFAE = AUSGEQUETSCHT | V | 0xE177F59B27309E6117A78C00E3B8BA66 ; MKBv17/FindVUK 0.80 -0x3F7DA2062C67738CB450FD5DBB59FC9F2B51F880 = AUSTIN POWERS IN GOLDMEMBER | V | 0xD92DE616B11F1EFEA9DC3795D7475D2F -0x415CF44BAFB0FA0EFA130AF8FB7EB94F4C98CA39 = AUSTIN POWERS IN GOLDMEMBER | V | 0x43CDE6B221AFB78D027B12A5A35F8553 -0xBFC189C9CA7FF907891A35DDA6BC60A1B2EC7A6E = AUSTIN POWERS IN GOLDMEMBER (Austin Powe | V | 0xC943CC3CFA5148EF05E1634C8009524B ; MKBv9/FindVUK 1.00 -0x9ADB45F1685120AB26B0C2035768324DEF8C2762 = AUSTIN POWERS IN GOLDMEMBER (Austin Powe | V | 0xD16A963E4B399AC0E01D2730AAE63959 ; MKBv9/FindVUK 1.02 -0xFE85DCF39F38995EA34A76E8DF65A3846195EA5F = AUSTINPOWERS2 | V | 0xAA1456C22175C1B499A72CD7A8D810BD -0xAFEF7956EDAC0B28AA9DF81AAE28E7620CB91492 = AUSTIN_POWERS_3 | V | 0x74DA4DF8BEBDA163CC85025ABABF2714 -0x0BAC0683865A125B856145A089A5AB364ABA8C8B = AUSTRALIA | V | 0x93E35482F422CABA28F1E21E6D40909C -0xEF2AAB2E1B6850249DA9A9B401BB4ABCB7DD904A = AUSTRALIA | V | 0xB4C4037F10ACEBE645CAF8B26CE921CF -0xFD4FE0E3A533D8478190542E8F5AFFF1362B45B8 = AUSTRALIA | V | 0x3328A645E640A8493E7A4475577590BF -0x4B362D2A67B5D3E05A8582609F5272D128757D50 = AUSTRALIA (Australia) | V | 0xE371DF7F827C2DCEF136E2CABE30FE7A ; MKBv12/BD+/FindVUK 0.99 -0x4E7663541BDC95CB0435111E2D2CCE66CBC1EFA1 = AUSTRALIA (Australia) | V | 0x21C419EE7DAA10864856DC3633BABC51 ; MKBv12/BD+/FindVUK 0.96 -0x020FC206C5E0946369FD717C68641AE38B6133F3 = Australia (Land Beyond Time) | V | 0xFD684C56E894C42E26FAAADC097A3685 -0x515C07FD6092A3EAE2DF96B4D06A9882E2A020E9 = AUSTRALIA_FA | V | 0xDA5E542E6CBDEC8F3D37DA34F9779196 -0xBA478F47003EC194B474E1657542AAA7DFF41C95 = AUTOMATA | V | 0x77B73BA38BFC571B39A00D5F8B6FA865 ; MKBrev 51 - FindVUK 0.54 -0xD0A9A468DA751EC8CD556FF6F56B36B847537026 = AUTOMATA (AUTOMATA) | V | 0x4612309F5A5FC4423559BC332C6D9511 ; MKBv52/FindVUK 1.00 -0xFB4E607A293ECA90B1AE5F2FBC37C49463C22B57 = Avalancha (Avalancha) | V | 0x133D224AEC5B051762F4F9D59552A634 ; MKBv50/FindVUK 1.00 -0x1E42C1356FF49177263CE62F70D42562FD3D1E5D = AVANTDALLERDORMIR (Avant d aller dormir) | V | 0x5C122804E4970A38245542C4F0DEA900 ; MKBv50/FindVUK 0.96 -0x30D0D4072A93B50F6753E157DD7AEB346857DFF0 = AVATAR_3D_FL (Avatar) | V | 0x1DA21F60FA82DCAB051C757276D574B9 ; MKBv31/BD+/FindVUK 1.00 -0x76DAAA3A52834683DBF268308EA216496CE86DC3 = AVATAR_CE_D1 (Extended Collector???s Edi | V | 0xC5DC7802CDD59163378B53B8761BAAC3 ; MKBv19/BD+/FindVUK 0.96 -0x46E2300DD7CB21605C2972318F6563EF04F250CE = AVATAR_CE_D1 (Extended Collector’s Editi | V | 0x5555A8B25AF8AFDE6D349C7A878560AE ; MKBv19/BD+/FindVUK 1.00 -0xC98FA762452A62B046E8017684028C36878254AB = AVATAR_CE_D2 (Extended Collector s Editi | V | 0x80BD17794469DDA28D4869D91604D7F8 ; MKBv19/BD+/FindVUK 0.96 -0x38CEBA9ED420C4FBA779A12F4404E3C9F043179F = AVATAR_CE_D2 (Extended Collector s Editi | V | 0x7B4599F6FDE95948C4F5E3FD8B85F7CF ; MKBv19/BD+/FindVUK 1.00 -0xB2B000F4B89D4125A97D312168D3031BC8EE3B99 = AVATAR_CE_D3 (Extended Collector s Editi | V | 0x5A13249D390B2FFDDBFAD9C8B840D608 ; MKBv19/FindVUK 1.00 -0xF2B38013AFC2F1CC7DC67BD05A3941D9E3D45EE3 = Avengers Confidential (Avengers Confiden | V | 0x298879CE94A69CBCD6F12F3E8701B4FC ; MKBv46/FindVUK 0.83 -0x547427E7401901775D9A2FCFA81377D4DC583EB3 = AVERAGE_PSYCHO_2 (AVERAGE PSYCHO 2) | V | 0x409088EE755C9569CD1C82F13F4BD851 ; MKBv50/FindVUK 1.02 -0x9966F25CB9B37AB2BBA2CBA15B94C3842002CD7F = AVGNM | V | 0x46DC832053357196A4A63744E063FFAF ; MKBv50/FindVUK 0.96 -0x8D6FFF0479BCAFC163E6518FB9990553D8632CA3 = AVIATOR | V | 0x2634E54E113FD0A1A26ECB28696208A6 -0x6E4D4ACC0FC75B4E66A49A415DA65C37054BD37E = AVP2 | V | 0x7BF8C968F42D2376576A11EDD710DD39 -0xDF6DCDF35244DFF6261E7E786E1D8C4C580EC4E1 = AVP2 | V | 0x30C191A08B5F3637ED3CA859EBA12708 -0x7FA657C4482A2FB3B202677097D39217A1B49EA0 = AVP2_F1 | V | 0x3150E3ACF467CE84B48DE6D0C74D2A71 ; MKBv7/BD+/FindVUK 1.02 -0xDF9AD92BFB7996B47FC917F8B0FE40076BE399D9 = AVP2_F4 | V | 0x49D04019DF7DAEF23E74AA4940CD295D -0x09C839B5599D0355C9FE29AEAC1A9C6C69D6B0F2 = AVP2_F6 | V | 0x92D0107D0416AADE4594C416C00691BF -0x6558618CC67F044841239297CA251D0CC3C7BF35 = AVP2_F6 | V | 0x7C7F772D8A387DFFECBBBD8181CB127F -0x773CF1C09156C494B59860888CF55B753343E3B7 = AVXD_0x91606 | V | 0x755EEAA3CE8F28BC9A2E495B15C638E3 -0xC052FDA97FEB7565F4C4C19D608E048108B8E0F3 = AWAKE | V | 0xFBC9F402B3EDC0B4D7B80B0719DE063B -0x58F824527C34A54742E436667FB7764011B33F5D = AWAKE | V | 0x868ED10A8A16006447A72509E0C4DC02 -0x81236CD8336CC9FB4CCDB63020803BD1AAC50312 = AWAY_WE_GO | V | 0x86839D7A7B0DC5C26E8CC48F009835CE -0x368B5EECCF665199E375F74918571456E2D8A5AA = AYAKA_MTV_UNPLUGGED | V | 0x02FECF86B50A9DB6E5E7F3E657978698 -0x22356A5FE360840F6F75AD631EFD25E6F0158A31 = AZTEKEN (Der Schatz der Azteken) | V | 0xFE1783E3B3E3F7B0A28BEA1BC708D858 ; MKBv35/FindVUK 0.96 -0xA871B12DA6607BE5B9E510A63EB4C257C289E02F = AZUMI 2 | V | 0x63DDB2460BED7DB38B0281289A0EA801 ; MKBv20/FindVUK 0.80 -0x4DB048E20460084019E5170017A4B8F65863CC54 = A_BEAUTIFUL_MIND | V | 0x253C62F7CC49778D93D2B7E5C079F30B ; MKBrev 19 - FindVUK 0.54 -0x3D6AF18E3A11ABA8EFB0CEE865AB18136E2B34D0 = A_Beautiful_Mind_EU (A Beautiful Mind) | V | 0x62BEDBFAAFCEC9BA5A643E6E83678B36 ; MKBv27/FindVUK 0.84 -0xE128D61B83C2D4FC41A8EC73E5397E5AE178E0BE = A_BOUT_DE_SOUFFLE | V | 0x7ACC9A5503AC5D176F2714DFC7CEA93E -0x033B61863F93B523CE5370CA4DCF6D2B6744775E = A_CERTAIN_MAGICAL_INDEX_D1 (Disc 1) | V | 0x5F9BD880F223FCFA536BDEAA5313D2DD ; MKBv47/FindVUK 0.84 -0x3E0BB8C983721B8D48DAFE69F64566F768207209 = A_CERTAIN_MAGICAL_INDEX_D1 (Disc 2) | V | 0xEDF1818326F74DD8DBFE911718675E09 ; MKBv47/FindVUK 0.84 -0x763D81BA8D63E4137813E383202D41F9692595D6 = A_Certain_Magical_Index_Movie (A Certain | V | 0xCD0264AC237D334BC867D1B04323AB18 ; MKBv50/FindVUK 0.99 -0x06552CF374A3F32C38471E725B5C4E119E87B77D = A_CHRISTMAS_CAROL_3D_DEU (Disney s A Chr | V | 0x460491A161FBE96BDE10B2D3E54732B4 ; MKBv18/FindVUK 0.96 -0x1720B9FB33DBAB638982FB270B841B90CB945462 = A_CHRISTMAS_CAROL_3D_GBR (Disney's A Chr | V | 0x2C9F79F6FDA17DB46AA6F2FFF6CFF262 ; MKBv17/FindVUK 0.84 -0x94DFC959D7CE13E20DE55F0C28AAEF93F349E3A4 = A_CLOCKWORK_ORANGE | V | 0x389619ED991D456389094F628C13AB91 ; MKBv3/FindVUK 1.00 -0xAFA28F9014C19BD2AEF2E890AC0723507E5E3FAB = A_CLOCKWORK_ORANGE | V | 0x67B1EEE1C01E03551A98836034EE16DA -0x4B169D84EEEFDED499FFF5C468B0C3FA059C920C = A_CLOCKWORK_ORANGE | V | 0xBEDFA60CF6E96E500574D5E007D4FF32 ; MKBrev 4 - FindVUK 0.54 -0x3224AC2154E38F41521379E65915FE286D9E63B6 = A_CLOCKWORK_ORANGE (A Clockwork Orange B | V | 0x7E39DE310D55D4E957A9F07D63F46BED ; MKBv19/FindVUK 1.00 -0x5A2A8DDE73467709004081553211DA0551CA1BF1 = A_CLOCKWORK_ORANGE (A Clockwork Orange) | V | 0x005795AC23DFAA42249C5C9905057B88 ; MKBv19/FindVUK 1.00 -0x34BCC08B396CA49456F03CE98338CBAF3C12E6EB = A_FISTFUL_OF_DYNAMITE (A Fistful Of Dyna | V | 0x67398E92672B6C40B67FF0780348CACD ; MKBv47/BEE/FindVUK 1.00 -0xFD1B1F6C3D5A8ADAD5CB7CC26CECDE88E2010629 = A_HARD_DAYS_NIGHT | V | 0xA3488D5CD0FB9B4F518ECFA62AACF7D9 -0xDDAE67EAC8CE7555CD509C0D2AC433C4329C568B = A_HARD_DAYS_NIGHT (A HARD DAY’S NIGHT) | V | 0xCEEE2BCEF9669E1254F70F1C0FBEE4A6 ; MKBv46/FindVUK 1.00 -0x236C7C463BB5CA7CE64A6CB1241E73A3E78E249E = A_HOLOGRAM_FOR_THE_KING (A Hologram for | V | 0xA65B757A882B9AD15240BE73E8155AF3 ; MKBv61/FindVUK 0.96 -0x1994672BB8F86DDEF6505AA776F58613E35C7AEA = A_L_ORIGINE | V | 0x9A63C55AECBEEBDE12A2D5DEC7FB1071 -0x806D7DCFA3605E5C7C2A5E993FF61617A39F484C = A_MAN_CALLED_HORSE | V | 0xC7DFBE76D8543825276B745AF26C1650 ; MKBv23/FindVUK 1.00 -0x5806E904234718B00B918A74C40E3CB4889D221E = A_NEW_HOPE (A New Hope) | V | 0xD1C067F1FD73391F484094D31CD1A28C ; MKBv23/BD+/FindVUK 1.00 -0xF7E19E6D8A58F08FD1196B2B88F5DE915309DFC0 = A_NEW_HOPE (A New Hope) | V | 0xFA1A95A43F463F035E189F05DA568BEB ; MKBv23/BD+/FindVUK 0.96 -0x832152BDCDE055E9A01C3F9984A78CB7F7F6E082 = A_NEW_HOPE (A New Hope) | V | 0xC179BC2BDC3ED0761DD5FE118E514364 ; MKBv23/BD+/FindVUK 0.84 -0x4C9052DA781DF222CC65BE50951E6839B24EF33E = A_NEW_HOPE (A New Hope) | V | 0xFBE836E9FB39F6D0BCF0024FF12CABB4 ; MKBv23/BD+/FindVUK 1.02 -0x8C307BB5AE1F8DC21A6692735AB2B3E2A5A1995D = A_NEW_HOPE (A New Hope) | V | 0xCB42A1CAADF2A799878ED00B2311CE6E ; MKBv23/BD+/FindVUK 1.02 -0x352EF2F6478F595807CD42842CFF60FE803B6AA3 = A_NEW_HOPE (A New Hope) | V | 0x7C8DF3A2816FF4449C5F4E93FDBDF1BE ; MKBv23/BD+/FindVUK 0.99 -0x65576B03D6C135DA5C79495DCC586D33477D1D24 = A_NIGHTMARE_ON_ELM_STREET | V | 0x5C92A8535790FD2147480C629EEACCE0 ; MKBv14/FindVUK 0.80 -0xD5553F06C777F602F4F8FC98603B6D82E3E3BA44 = A_NIGHTMARE_ON_ELM_STREET | V | 0x98BED83EF40CC5686B83F030BFA9DCC7 -0xB0238AEF8B24169EFE763057F78E5CF04B4054F6 = A_NIGHTMARE_ON_ELM_STREET (A Nightmare o | V | 0xAF291406E3E275D98594A37101272770 ; MKBv19/FindVUK 0.95 -0x724BF0DC9D02F0F5A865039C3F349625531CD1F8 = A_NIGHTMARE_ON_ELM_STREET (A NIGHTMARE O | V | 0x674B8EE5579552C822CD7DF52761A078 ; MKBv15/FindVUK 1.00 -0x26DB54C112CBE2810F4F857106D8771077EC4A29 = A_PER_GETAWAY | V | 0xD6DD519FEE3BACFA658C83707B27F0B7 -0xD825B62000E7DE4239862220EDE7996BD2509A4A = A_SERIOUS_MAN_BD (A Serious Man) | V | 0x4C584D2A4DDEA31FE5386DA32D8AC867 ; MKBv17/FindVUK 1.02 -0xE7D217C759AAF7A97D12FA90167A928F8BF288D4 = A_SERIOUS_MAN_ITALY | V | 0x339C1A22E5C600839A67B27B6A89ED81 -0x652CB1651DFD727DBC797912CE490F0545F6C35E = A_SERIOUS_MAN_SCANDI | V | 0x29ED69267BE264FCEFF851F3488E373D -0x9A11DBB5DE0582C28D5115A0E48C1F5739FB2112 = A_SINGLE_MAN_2009 (Single Man, A (2009) | V | 0x593D87BDE5522668C1C5CF9252A3B183 ; MKBv17/FindVUK 0.96 -0xB6255F870BA92697369EE03BA3C8ED666A4530DE = A_TEAM_F8 (The A-Team) | V | 0x627C361C6D3756B9E900AA878D4E338C ; MKBv19/BD+/FindVUK 0.92 -0xA967B2133D7D2274E130673B2CBA6EC6B7DA4F15 = A_TEAM_FD (The A-Team) | V | 0xF43C59428A45822D37B936FE4935C352 ; MKBv19/BD+/FindVUK 0.98 -0x58DC55C3A94908040375F25FCD894D496E91002B = A_toda_prueba (A_toda_prueba) | V | 0xB4100B436FB14FA789BD4AB59CC696E7 ; MKBv50/FindVUK 1.00 -0x07F5752B41FD6311405F1BB02956BE348A721A08 = BAADER MEINHOF KOMPLEX | V | 0x1FCDA7A48C732517D692C6FCCFD15638 -0xDECE384A21278A44FF199056C2A4EA86E71434EF = BAARIA_RENTAL | V | 0x2DAFD1D6BB6FC1D5DE25D9353C7B5340 -0x41B9105F33FE299091ACB9DEE3F82A733945DC05 = BABEL | V | 0x9B651407228BE65C308A13ADB24B82B8 ; MKBv34/FindVUK 0.98 -0xC560795C7657BCD57E38C47953592EDF1A9762B1 = BABYLON AD | V | 0x563412440A5D91394BEA84CBFB1F178B -0x05690CD228A5D6FD637412F355DFBD0B73F72D67 = BABYLON_AD | V | 0x88BA347E00A8A45B98C31F7509297CBF ; mkb v10 -0x6E1118F32BFBB35E50F50DD581101DC9203E2BC2 = BABYLON_AD | V | 0xB4943FEED3E1B814B05A7A0DC4BA592C -0x0EC4CEA21020E987C45AF09423D79BA763723538 = BABYLON_AD | V | 0x71639770C2548F48D65776EA903C71CF -0x229B94B4C25BBFF4C03D966ACBD28A3CFD0EF66C = BABYLON_AD | V | 0xF94E1EECB158F6BB7E5B8EAC6FE046F3 -0xDCF44B2468C0A33EF2B6388414248D9001F253D4 = BABYLON_AD | V | 0x6DEDE342CC589DCF400023EAD1120959 -0x40C130A33B3AF003C0F90E136991F1F2F9179755 = BABYLON_AD | V | 0xC959314DCA97B14F67C9D9E7AE5A8B6C -0xFCE0C230E182FBF17A68E21D73724DFE474AB538 = BABYLON_AD | V | 0x9B78E5B8DEAC78074B713F88FFA19865 ; MKBv12/FindVUK 0.96 -0x4158CEB6618534FE1557D0BBA41CA05BCBAD8B13 = BABYLON_AD_F1 | V | 0xA2EC99E7E4E3AF67A01A237A2A9D5655 -0x31D0CFB1E368F772078F2B1EE22287EB8B93118B = BABYMETAL - Live at Budokan (BABYMETAL - | V | 0x70E92343D879EE7DF9951338C53C7DC9 ; MKBv47/FindVUK 0.93 -0xB50C69B5E990C7832B4F0947FB9757147CE37235 = BABYMETAL - Live in London (BABYMETAL - | V | 0x200EA349CCC50F7FD929AF728C70518D ; MKBv47/FindVUK 0.93 -0x7F03623882E8798D4EAA011D887DDD4A7B2FD509 = BABYSITTERS BLU-RAY | V | 0x4A1B006CF5B61667482BE2968DCF8A90 -0x49C32D228FD072B5ECE3C1BD77B004BAFDEE2E05 = BABY_ON_BOARD | V | 0xB5D3B8F6F03DE83DDBB08FE8350751D3 -0xE1DD32036B1D56FAD8D91CF94C0F4C06665A5965 = BACCANO DISC 1 | V | 0x6F12214AAFFE8B94428E9800DCB9A1D8 ; MKBv40/FindVUK 0.96 -0xA32F37E7D3A16C680BDF457E58C9A4B7D852332D = BACK TO 1942 | V | 0x7DD32EF8258E672A3A0BCB5F45A336EE ; MKBrev 35 - FindVUK 0.54 -0xBB12ADDC62E49F10BBB6E59FA332586962B9B8D1 = Back to the Future 2 | V | 0xF2D3DED614F13C410BFA561299311608 ; mkbv18 -0xD0E95AA46B962F64BF910A7C6C3D1DC99A12B64F = BACK_TO_FUTURE_1 (Back to the Future) | V | 0x35ED941A0F377132BA2BCE7E6A2B1C5F ; MKBv18/FindVUK 0.96 -0x1A190C27D43E4DB1BE7E89F6C92F36F84E5AD24D = BACK_TO_FUTURE_1 (Back to the Future) | V | 0x14BEA0B71210B4AA8742F4FF60B0B7C6 ; MKBv18/FindVUK 0.96 -0x655A315071EBF41958DF806FD85D04114A9F9AD2 = BACK_TO_FUTURE_2 (Back to the Future Par | V | 0x173A61D7956019C3F5365882B1C45772 ; MKBv18/FindVUK 0.96 -0xEB4BA6B082866111968C238F97A572B2F052D07E = BACK_TO_FUTURE_2 (Back to the Future Par | V | 0xBFE05ABFA40171AD07D9FEC68CAADCFA ; MKBv18/FindVUK 0.96 -0x785EBCB7C0E7C9C49502B8725840BA4051BC9B31 = BACK_TO_FUTURE_2_G51 | V | 0x0864CC6ED24761820ECC7FB86364210C ; MKBrev 18 - FindVUK 0.57 -0xA3B5925CF4D52F89443EFE1311AE52FE21E0A0AA = BACK_TO_FUTURE_2_G51 (Back to the Future | V | 0x3E0E9B375F6EDA827BE8D4438921AB3B ; MKBv18/FindVUK 1.00 -0x24C021C40F6ABD1FADB247EB20250599A7AFA57A = BACK_TO_FUTURE_2_G51 (Back to the Future | V | 0x7B206BDBF8AFB6CF042FA9E0B741711F ; MKBv18/FindVUK 1.00 -0xE07590A20DD0C3611FE035F38F4CF32265ECE594 = BACK_TO_FUTURE_2_G51 (Back to the Future | V | 0xFCD4D2EE12AD25D32E7998D2223806A4 ; MKBv18/FindVUK 0.98 -0x2D3BC7BE69FF8196884E9B1A0531EF9825D74822 = BACK_TO_FUTURE_2_G51 (Back to the Future | V | 0x1766AB969E28B4FF32974C1900666241 ; MKBv18/FindVUK 1.02 -0x0D5D31B62FD68AA5EE4B20E97DB3B96965A11D4C = BACK_TO_FUTURE_2_G51 (Back to the Future | V | 0x42CFB5B960861D2837ADA63FC0A2A196 ; MKBv18/FindVUK 1.00 -0x91340BD82FB792BF1F521C0A2B2D598DDD2AA6B1 = BACK_TO_FUTURE_2_G52 (Back to the Future | V | 0x4CA1905ECED41CCD9D935061DC1061BC ; MKBv19/FindVUK 0.96 -0xABF354B208D6B8E9EDAE636386CC2D4D7FC8A5E0 = BACK_TO_FUTURE_2_G52 (Back to the Future | V | 0x4A71889E4098740611D3CC47B5B2458C ; MKBv19/FindVUK 0.96 -0x720F2264217C675E639AB5C02FECE862432F40BC = BACK_TO_FUTURE_2_G54 (Back to the Future | V | 0xF71175225B6B1D209F2DB1DBF9C35535 ; MKBv18/FindVUK 1.02 -0xF96AFDD102FDC196098BC621F6C1220CF53C1E9E = BACK_TO_FUTURE_3 (Back to the Future Par | V | 0x9C58ADE5FDEFE1500C6F15E5F9796618 ; MKBv18/FindVUK 0.96 -0xB0E2D48E6758B0338920217B907A93004D967827 = BACK_TO_FUTURE_3 (Back to the Future Par | V | 0xF8831F02BD909297DA68EAE8745F0B2A ; MKBv18/FindVUK 0.96 -0xD2F4805446DEA6DD1720B39A9BBF2BBEBBD52378 = BACK_TO_FUTURE_3_G51 | V | 0xBB5C06B304CF0B9FF5A13B1F83095686 ; MKBrev 19 - FindVUK 0.57 -0x0B5F012327BAE6974F1EA3A2532FA0BBE469F35A = BACK_TO_FUTURE_3_G51 (Back to the Future | V | 0x9FE3BC8E9392CF48E5ABE897AC29247F ; MKBv19/FindVUK 1.00 -0xF4AD4DB3195056F861876DB6FF1F26A9FA30409B = BACK_TO_FUTURE_3_G51 (Back to the Future | V | 0xA5BBFC7B7B0F94F584CF674B5B58DAC8 ; MKBv19/FindVUK 0.98 -0x5A154E1D81D93B70262FBD199E845A532AA494A0 = BACK_TO_FUTURE_3_G51 (Back to the Future | V | 0x992111EB48D5204C1AA6F3144BE99EA0 ; MKBv19/FindVUK 1.00 -0xA76F09C7AE0140DD15CCF6990CCE5205C13ED85F = BACK_TO_FUTURE_3_G51 (Back to the Future | V | 0x8B4C47F1FBD4AB09825A8C44BA03898B ; MKBv19/FindVUK 1.00 -0xBD16819FCEBACF047A12E7C84B7B078AD1E109A4 = BACK_TO_FUTURE_3_G51 (Back to the Future | V | 0xAE5B04C3D9DB3F23082854D24B5F3525 ; MKBv19/FindVUK 1.02 -0x48C39ABCEAAFA5A1271CBC178715BA417AA73727 = BACK_TO_FUTURE_3_G52 | V | 0x502079CA061142013EDED1C29498FFB5 ; MKBv19/FindVUK 0.65 -0xCC9D86218B6AA1E7405644E6DF6D56AB168443A4 = BACK_TO_FUTURE_3_G52 (Back to the Future | V | 0x4EDA52A8D8B8F5E5B4FD3C2EF0BB127A ; MKBv19/FindVUK 0.96 -0x598889AA13E2DD46E9B00F0C7506213AF6765C08 = BACK_TO_FUTURE_3_G52 (Back to the Future | V | 0x62051788E90595C55424CFFDD312CDB3 ; MKBv19/FindVUK 0.96 -0xB031D7F08D4C7F1CC9E03F09BF3C6863F3B4DD13 = BACK_TO_FUTURE_3_G54 (Back to the Future | V | 0x2ADDDA44E68E8C8D69A65AC504C9D761 ; MKBv18/FindVUK 1.02 -0x3AFF81C7C2067B6227BB29634EA77E8608A9DEBA = BACK_TO_FUTURE_G51 | V | 0x8967C11EF50CCA1A4DADC6F728A44463 ; MKBrev 19 - FindVUK 0.57 -0xDC2D73E3756995CA383D3176F100A2DA373D20A0 = BACK_TO_FUTURE_G51 (Back to the Future) | V | 0x4A49D790B2C944C5751B554DF1AAFCCA ; MKBv19/FindVUK 1.00 -0xD5A2761D5BF6BCF472E66D597D4B1B53ECCA48BC = BACK_TO_FUTURE_G51 (Back to the Future) | V | 0x76ECCBEF64642D70F27DCB8A85C37D78 ; MKBv19/FindVUK 0.98 -0x36671B9D54340C05269EF227EF4E7073E96F0C52 = BACK_TO_FUTURE_G51 (Back to the Future) | V | 0x3A2B6778784DF0BBE3130E2EDFACEE48 ; MKBv19/FindVUK 1.00 -0x3629D12E258BDE9ECEC27F99808BEA13AA3A4114 = BACK_TO_FUTURE_G52 (Back to the Future) | V | 0x2B619724AD2114F3AE9F72F1AC1353A7 ; MKBv19/FindVUK 0.96 -0x752E870604FE15CA82951120157F99AB06A31DB3 = BACK_TO_FUTURE_G52 (Back to the Future) | V | 0xA3FFA7AC40C6C736EF3717CE7AD96D3B ; MKBv19/FindVUK 0.96 -0x42A5B24C44D02590CC053F25C4E57238CD9C6E28 = BACK_TO_FUTURE_G54 (Back to the Future) | V | 0x2AF0EF95852C185F1D28DD653C1A41A5 ; MKBv19/FindVUK 1.02 -0x046325AAD3781AEE2FE6AE40E779E99AB015C47E = BACK_TO_THE_FUTURE_1 | V | 0xD51D4200F9863ACFB70E8D76DE0E3D3C ; No BD+ ) -0x55635C4510864D92F094CEA0B1F15ECCBDC46FA0 = Bad Boys 1995 (Bad Boys (1995) – Blu-ray | V | 0x0EDC2AFD3FA0A43D75C69CF22FBC879C ; MKBv56/FindVUK 0.98 -0x5C503F19FBCD694F64CB6F69EF2B6ADA3805C429 = Bad Boys II (Bad Boys II - Blu-ray™) | V | 0x64DE3A67FCBC5256A835443089B53A08 ; MKBv57/FindVUK 0.98 -0x90267B8D3351457CF37167A799F4DB94ADCE00C7 = Bad Company Hard Rock Live | V | 0xADD3CFB7A5B67A73E00566F205531710 -0x4D0D7CCEC25B270E8F91E9CCA360A92D0E5F7E16 = BAD CONDUCT | V | 0xAB9963CEC34EDEF6440EA0D2259AC78B -0x83CFAB4630ADD5DD75EE2801A56AA2B8C66C0117 = Bad Lieutenant | V | 0x0FFA3764610D0BE81310694FD6A61C55 ; mkvv17 -0xAB239B8511AB2D19E6C811861DE78540CEF9466A = BAD MANS RIVER (Bad Man's River) | V | 0x38C0820240838455B1D3A1C1C05C9F59 ; MKBv57/FindVUK 0.92 -0x615ABF685FE2103635336FDF8A5DA0BD7DF6E2E6 = BAD TEACHER (DE) | V | 0xB593156F3222817B865802B26BEB9094 -0x62ADF446BA2E8DBA797AF68155730F85FF02A571 = BADLANDS (BADLANDS) | V | 0xEBAC6B057FC9DD674A65E57997E4EF95 ; MKBv35/FindVUK 0.99 -0x07EDF13C438691952681E7760C0FEA992B5E47C6 = BADLIEUTENANT | V | 0xAD263CCB11D7F0D4304B41CB91541FB4 -0xEA7939AEECF7E0C4D167EECE1F791C31C53C6646 = BADLIEUTENANT | V | 0xE5E2E7AE3AC3C5A28CF85E74BCC15BD8 -0x0E3E4805BF394414A2A3B8C3FA0C144DECB3D145 = BAD_BOYS | V | 0x887A49B4601F81EEE43D512041543E0F -0xB0AE1006A564F2C343CABBDBBC055F3B696E0728 = BAD_BOYS (Bad Boys - Blu-ray???) | V | 0x7F32CFECF7B947FD9B04F45B0A2B8B1E ; MKBv17/FindVUK 0.91 -0xBB63C892EEB6F37CAE9409C8BEAB6B7933493864 = BAD_GIRLS_4_BD | V | 0x6607C9D40556DBDA5B3DDFDF6C58367E -0x35DE32BF1DC73AD911BC0C95F7A6996BBE8A4045 = BAGDAD_CAFE | V | 0x7FC33816E255CD623F99C7AEF3BAAE9A ; MKBv14/FindVUK 0.72 -0xA6C9839FC2FF3D2A4EF05525019AC19723FAAF7F = BAILANDO CON LOBOS | V | 0x6A611DD34EEB27488681FD4905524A7F -0xC1EEF098158F8FED0619A340F90011C7FC6B4513 = BAKEMONOGATARI (Bakemonogatari 1.1 - Blu | V | 0x51CB98964EA3C5BF38B2EAEA436516C9 ; MKBv40/FindVUK 0.86.3 -0x4298A5AF6DD9607E780AFF2C11B0D6D234FC0BB3 = BAKEMONOGATARI DISC 1 | V | 0x2573E57EA152AD4A0AABA28396CBCF92 ; MKBv52/FindVUK 0.72 -0x4BE8717E730A42771A8CEE24854B8272441CEB97 = BAKEMONOGATARI DISC 2 | V | 0xA1E2C3E2F0099C027F062DA630D9BF7F ; MKBv52/FindVUK 0.72 -0xD078D2993CC528A4F65701D8184F29D3EC3B7C7E = BAKEMONOGATARI DISC 2 (Bakemonogatari 1. | V | 0x0BE28CCC29F2EB724B5D7240504FE460 ; MKBv40/FindVUK 0.86.3 -0xFBF27FB90FB8214E0FC5743D39D2D4A1D0DC52E5 = BAKEMONOGATARI DISC 3 (Bakemonogatari 1. | V | 0x37493A3591FE5CAB14DD94A7CB9E5FE4 ; MKBv40/FindVUK 0.86.3 -0x32499B1480BF4C669C01345F7AEDCC97DCB4A10F = BAKEMONOGATARI DISC 4 (Bakemonogatari 1. | V | 0x80258FF41612D1111021062E51ECDF8D ; MKBv40/FindVUK 0.86.3 -0x0C3A853F3924C48A24D6709435A01AD977511C8E = BAKEMONOGATARI_VOL1 | V | 0x5316D527D3FBB792045D781623AC6B2A ; MKBv62/BEE/VUKNOTVAL!/FindVUK 1.00 -0x5D9E4DB88373B816D403321E6B1457944A5E4823 = BAKEMONO_NO_KO (The Boy and The Beast) | V | 0xB404495DD86622DF4EBA96D729ADBEBD ; MKBv57/FindVUK 0.93 -0x9794B56B238A72412A6F40A1977C4FAC9A06EC52 = BAKUMATSU TAIYODEN (BAKUMATSU TAIYODEN) | V | 0xE22440DE2FABC392984AE3D8FEAAA480 ; MKBv34/BEE/VUKNOTVAL!/FindVUK 0.98 -0x2641DC347A415A5D5CAD3558318A2B578AC5566E = BAKUSHIN_MAKUHARI_MESSE (BAKUSHIN ARENA | V | 0xB4D3E83016523876440732A0157FF1DB ; MKBv62/FindVUK 1.02 -0x616F9C06ED9D75FC7067F60FE460DADDBEC65043 = Balla Coi Lupi | V | 0xD48222635EC26110890FC777F072F131 -0xCDA71BC6D73E89387A58A9A3FCBEED8562DF328A = BalladOfTheLittleSoldier_WhereTh (BALLAD | V | 0xDD7FD9E5C0B213BE36F222D79D2F5E2B ; MKBv47/FindVUK 0.99 -0x74EB1025B4063218E21FB38941FD04AEF2920FC9 = BALLERINA_2D (Ballerina) | V | 0xC3DE04449A8BB446CFE1CE6692A97DE5 ; MKBv63/FindVUK 1.02 -0x7B7E8C5E89D0A7B40C580772C035A07AAFC542C9 = BAMBI (Bambi: Diamond Edition - Blu-rayâ„¢ | V | 0xEA96954C82CB5CEA87B40A60339ADC99 ; MKBv19/FindVUK 1.00 -0x974DA1C2B6D10E51B33B42DC6042064B5633F3A6 = Banana Joe (Banana Joe) | V | 0xF61ACDA1C4E5E4A3642C4887BEE62787 ; MKBv39/FindVUK 0.96 -0x150BABBC1FB1ABE2FC9F1CA1F553A6C9F0B40717 = BAND OF BROTHERS DISC 1 (ESP) | V | 0xDE1E8491132956BE29911D597EF72CDA ; mkbv9 -0xEDD68A33C1C491F9F64D1F319EF40C8F9B73D87E = Band of Brothers Disc 1 (UK) | V | 0x73386CC303C98A25F16B119A3F4070E8 -0x34C7FE631B291FD73D6BA881D09ECF90BDE48551 = BAND OF BROTHERS DISC 2 (ESP) | V | 0xD1F3687B9B63BC7552E3919D8F214CD7 ; mkbv8 -0x4E3D1315049704D6DCA583897790DE8F44106952 = Band of Brothers Disc 2 (UK) | V | 0x6EB24B8E14FC791363EC5769880F7D9D -0x893FFDDBC09160236F5C0DFE1319BEEA171A3555 = BAND OF BROTHERS DISC 3 (ESP) | V | 0x16ECD164A33EE6ADEBCFA986CCEA0AB2 ; mkbv8 -0x070688A9B21AE8E828CA2FE91D1D88B884957A79 = Band of Brothers Disc 3 (UK) | V | 0xE417D1BCDC043743E278A97C6448C065 -0xC5462B34EB7557FB5A1FD091ED1FA3C7AC5A089E = BAND OF BROTHERS DISC 4 (ESP) | V | 0xC20F2E53042D15E366B3881C447A6217 ; mkbv9 -0x8BCCDCDB6520C6D3D0FF5E8C70C349805263C46C = Band of Brothers Disc 4 (UK) | V | 0xDDA79E33F67F055841CD32F37620802C -0xD5019AA3553B50D6963926BC4F1706ACB7C18126 = BAND OF BROTHERS DISC 5 (ESP) | V | 0x02710A7376C4BECC0CEF317552125764 ; mkbv9 -0x9C363D76C0E6C62ED01958D30CEAC1478E391348 = Band of Brothers Disc 5 (UK) | V | 0xF73693237DCFE5E11CEA75F29877D11B -0x2362F4AFF50ACEF45E04DE0E5199D589C2A9A16C = BAND OF BROTHERS DISC 6 (ESP) | V | 0xEA03F0D8D31F7A54F174C1AF0B8C28F9 ; mkbv9 -0x68EA1EE7F83F2A8C801D1B890B562A4DEE8F374C = Band of Brothers Disc 6 (UK) | V | 0x0A439885DE3783091546BAAF9E9F7841 -0x584DC03D45531D795AF8BEB84CAF011D146EC1AA = Banderas de Nuestros Padres (ESP) | V | 0x7F3E1B7CD48FB7724B538D070B31380C ; mkbv3 -0xD94A009395E2EDDF719D60392254C620EB31EAED = Bandolero | V | 0x3EF8E9A1ECE037DFBB530C9CE53FDF60 ; MKBv35/FindVUK 0.84 -0x23070777648DD15C50D08EB7AF50FCE1345A0A49 = BAND_OF_BROTHERS_DISC1 (Band Of Brothers | V | 0xE864DAAF207C81921F3CAD4EA333B4B2 ; MKBv46/FindVUK 1.00 -0x09A0E5776742200F86B97388573ED8FC5310021B = BAND_OF_BROTHERS_DISC2 (Band Of Brothers | V | 0xD296095B42769D0204767C7A3F509A16 ; MKBv46/FindVUK 1.00 -0xFBE7BE5B2BA23496EF9A5AC9B30CE6DE1BAB9FD3 = BAND_OF_BROTHERS_DISC3 (Band Of Brothers | V | 0x8C8E1C437FF09A1B36EFF01958FC2DD1 ; MKBv46/FindVUK 1.00 -0xB28A532E44502294B361E601E2DFB611A1D0BBFA = BAND_OF_BROTHERS_DISC4 (Band Of Brothers | V | 0xCC3F699DB7A03509CA2231062D638FD6 ; MKBv46/FindVUK 1.00 -0xED9D9BC30DE6EF5EB333677C41772C52787CE33B = BAND_OF_BROTHERS_DISC5 (Band Of Brothers | V | 0x1C79CE1207B2FCFA11A9A27416A9292C ; MKBv46/FindVUK 1.00 -0x60B2FA14D01D51BCC9289FAFB19CFB34C5A8D418 = BAND_OF_BROTHERS_DISC6 (Band Of Brothers | V | 0x77CB1A8C8A2D2EAB45AB191F33E1081D ; MKBv46/FindVUK 1.00 -0x1F269190F62737CE64F045BE30165D5DE9F3E194 = BANGKOK DANGEROUS | V | 0xCA7D9D4B914AF34055569D4A4C031CA4 -0xDB2934376C00243926A3BB9C25385E9E4FC3F0BA = BANGKOK_DANGEROUS | V | 0xC6F2B3DBD60166C9D9A7D44E7813524C -0x40C7C8B65DC3EA60E79118AC04F5E8E7AC8DB142 = BANGKOK_DANGEROUS | V | 0x4FCE348296914CA7C3D4B326BB8B8B7C -0x159D76CFA884CFC4FD4FD3177942BFA2D50AAA10 = BANGKOK_DANGEROUS | V | 0xA4993BAEBFCBE97143E48D2EF0F94B23 -0x6E2D651DA484AC878DB11F1D34EB07315074C737 = BANG_BOOM_BANG (Bang Boom Bang) | V | 0x88A4BE2D7583062E3E2DA3951894E190 ; MKBv48/FindVUK 1.00 -0x7D6A0FDDD0D8ABB3410D7E23B915B66AF7A87AC2 = BANKJOB | V | 0xDABA5AE4AC6E2C89E191AA045E63CFE0 -0xF39A7E9432A4A3120A43DD967FA0DB624E5BC3D9 = BANKJOBUK | V | 0xC937D6BE5EA1D92E0C6FB96F2C9B0EE3 -0xF547AB2DA418E748CA24FB251584DBE249389D73 = BANK_JOB_THE | V | 0xB73DAD64CFA32BD215375112EB454157 ; MKBv10 -0x6BA323C2292FD4C53C7803081C8D4E8B8222BD30 = BANK_JOB_THE (The Bank Job) | V | 0xF85FC445A48BC2D1DFB1B1A2EBC7833C ; MKBv16/FindVUK 0.96 -0xB09F29D38B7D69C891DC99BFE23665CB8352307D = Banlieue 13 (EUR) | V | 0xBFCBA37FC08BA0669886B4F4AE2B184E -0x35BF1BF3F6D9EAB2ABF394746C38BA1DBEF75FCF = Banlieue 13 Ultimatum (EUR) | V | 0x0629E725A1B42BCBC4BE61CF8F618458 -0x0EEE057927990D38F63E8ABC13BD0C0A09D2B111 = Baraka | V | 0x2D6FA55A8EF917B4A51D8D3DC8479E84 -0x164DD0A3F8603502604E1AE1462D9D6BF5227F11 = BARAKA | V | 0x34519F54ED140BBCE827F17C11666608 ; MKBv9/FindVUK 0.96 -0xFFE0F804B5516D116E9B15EADC5F9ED9FB38C123 = BARAKA | V | 0x0DEBE873EC4C2B6C727B0C39E5F2C6A9 -0x592D3985596361E1EB8675FC074B07DBD2A5ED5F = BARAKA | V | 0xF158A97EAC48617A2AEC427DD4CD8F66 -0xEE5DF71D68C912A08256B8A832ED16739E3416A5 = BARAKA | V | 0x47430C8FBCF6DB1527EBE197EC895B6A -0xDFE603FD91F91A86CDC9724BDF2EDA061B51D29F = BARAKA | V | 0x6E1926B9A9E2811A0D8FD54E358081ED ; MKBv16/FindVUK 0.65 -0x42BEBFF680A65D06A89BF7ABCD6BB7FAF4A34110 = Barakamon_Disc1 (Barakamon Disc 1) | V | 0xE5A2082BDA03C446AAC412B6ECBAEA8E ; MKBv61/FindVUK 1.02 -0x9BD51A8B287BA33692C927342FE61D10928C363A = Barakamon_Disc2 (Barakamon Disc 2) | V | 0x0935E5FD8EA2377A7FD625CA79F5DED6 ; MKBv61/FindVUK 1.02 -0xF38A2034C0E86AB87917D2E4A87438D4B3C33EAF = BARBARA_BROADCAST | V | 0x06FB62F5FF84AD97A1345A2082306D70 ; MKBrev 42 - FindVUK 0.57 -0x6915989258FC4C802F37198172DA6F89E2B9B488 = BARBARELLA | V | 0x2C71BCD772B0567DAF39B3BB9F4A2796 ; MKBv31/FindVUK 0.68 -0x79DE0F7882C63F0490C0B0896A646597782914B7 = BARBARELLA (Barbarella) | V | 0xABD841A7E70FC0C921D88E6FCB57512D ; MKBv31/FindVUK 0.94 -0x25B38E34B7F974E5CD0B99E731F40B7C54D2FA34 = Barbarossa | V | 0x2D45CAFB6EF81A608251FE7F9F6BDA05 -0x42305FF11C9AFC6E5611E4F443DA761D1DFB1108 = BARBIE_STAR_LIGHT_NA | V | 0x13C231C2CBCF76FCAC18E80848534C74 ; MKBv57/FindVUK 0.81 -0x43881F8AAC8F07125B11F81150B0DA132813BA4B = BARDOCK_TRUNKS (Dragon Ball Z: The Histo | V | 0xCCD8FC5B34814D93A1B06BC2F4D50971 ; MKBv6/FindVUK 1.02 -0x5226130AFA2EBAD59DBD2C06591F23A440B06046 = BAREL LEGAL - 81 | V | 0x689D7FE450440D63DC70564BC8A2667B -0x2FBF6F03D6EBB9732CEB10CFD64EA1CB907FCAC7 = BARELY LETHAL | V | 0x4541597FCEAD0C1455CEFEDE21563F2E ; MKBv57/FindVUK 1.00 -0xECC815E10D4A017CB3A5CD09CFDFEAB4F048EEAD = BARELY_LEAGAL_84 | V | 0x782369A6E8B1D6CD069C77622D5C05E2 -0x0934EEF5800EC1B1D037BEF6E364FE6C5290F742 = BARELY_LEAGAL_85 | V | 0xDE347273217B6526882B4BA7C4AF3DA9 -0x56D469D5C4CDF55F22F66B99DD9D2F520749BA2D = BARON_MUNCHAUSEN | V | 0x79BB4833E2E866BBC8B98BA0B096BEEC -0xE3E7A5081C5A524A2D66DC6B624C3D2813DA43D9 = BARON_MUNCHAUSEN | V | 0x17891EDAD7A6F6E9C110D475DDD0B5A4 -0x6156F16BEEB51791CBCC8E3BF752ADE3DFC2F4C0 = BARON_MUNCHAUSEN | V | 0x96D599686F51E0C110969E14D9749F04 -0xEA66B9AE8AFDE689FCCCAAD892CF7ABACE2DBFEE = BARON_MUNCHAUSEN (The Adventures of Baro | V | 0x9591A5D34529F5210CA3DAD5F086A1A2 ; MKBv4/FindVUK 0.94 -0xA641336C84E639A7BB395284A3A6C2ED9ADD2411 = BARRY_LYNDON (Barry Lyndon) | V | 0x0D10D02FBD0A653E7E612BCFA6241001 ; MKBv19/FindVUK 1.00 -0x9D744978134201655CD39061DEEBEB522BFB8A18 = BASIC_INSTINCT | V | 0xD08255AB76FC2BE5B7A48C4B4B9FF04D -0x4C71E4E72C2CF5BD57E35A386F629C8220F80ADA = BASTILLE DAY (Bastille Day) | V | 0x5C5993FD8BAC8D2CE3EC99CC2C77CCF6 ; MKBv61/FindVUK 1.00 -0xC6F9ECC6D685170F04AAF18A6F7E8D31E3897C6C = BATHORY | V | 0xC71947E7844953077EA322B94C6D9851 -0xB960CB4081AB208C9A048DED9CC62ADDDC425479 = BATMAN 1989 | V | 0x7EECC2E35CDD9BEA9A1C9BFAC48343F0 -0xD9BDB0A0C6BFDABF130E896BB3AF490C62584D0B = BATMAN 1989 | V | 0x061C860176A9ED25C2DC18BD82781ADE -0x8A7AE20834C876290A9F539CB94E66FA64FAF0AA = BATMAN 1989 | V | 0x5A4D9D686DF5E7DA8AFB17E6F50523DD ; MKBv8/FindVUK 1.00 -0xB7731884F0E5B7B3D951D799DD34F290FD654EFB = BATMAN 1989 | V | 0x023A0D48DECC3D42AD762316E7F7CDE3 ; MKBv8/FindVUK 1.02 -0x24B897C886DA9ABE3E9EB24EE795BF712DF1F898 = BATMAN 1989 | V | 0x049E8B8D007479B723BC1927334DAFDA ; MKBv8/FindVUK 1.00 -0x63EEC8EDC80838AACD9542E9D27231ECC1E67D8C = BATMAN 1989 | V | 0xEFE7242C980B78B525A5745775E4437E ; MKBv8/FindVUK 0.92 -0x2CF45A2C3551E0D7E61960712D950F12EE6D4A0A = BATMAN 1989 [Batman] | V | 0xF876CF978E111F803930BF03627C3B52 ; MKBv8/FindVUK 0.84 -0x2B5B25025F6C40A310F4FC862649E4B2616E86EC = Batman Begins | V | 0x141609273B949E8B96A898AA4311F631 -0x991DEFF824E5B7D7D6F117621F7899792FC0BD90 = Batman Begins | V | 0xB58AC9371DDB16392ADFB1BACDA66347 -0xB46D0AE08E12837F343EEDA3954AD9E0854762FF = BATMAN FOREVER | V | 0x55A7367ACED998BB6956536B54E1D318 ; MKBv7/FindVUK 1.00 -0x227FA2DC6789BB5A11BCCA1C9124C8D13C53B1CF = BATMAN FOREVER | V | 0x0C6D0CF4C85AD2B864D08658DF015C32 ; MKBv7/FindVUK 0.80 -0x096A4881C588EED92E795423AA2A207B819A47C7 = BATMAN FOREVER | V | 0x61751A843085C7DB9BE3CCFEEE524DA5 ; MKBv7/FindVUK 1.00 -0x39B4328301C823ECBE27C00C964A5952AAE01728 = BATMAN FOREVER | V | 0x601927B1E4B1442162B7D947A74EA2F3 -0x691F127212BF0AB8627D04C6DE9A9F2DFCE0829B = BATMAN FOREVER | V | 0xFA8319E30300CBF242D3AD77DE39B25C ; MKBv7/FindVUK 0.92 -0xFA0211CE1FFA7F82200D9B826778588C0E28F238 = BATMAN FOREVER [Batman Forever] | V | 0x664B0C89D7B8CFA43F569E568F10745E ; MKBv7/FindVUK 0.84 -0x95B671BD69F19502608DC44865D4257F6456D579 = Batman Returns | V | 0x58937EDE655A58745DEA889E4F109DE1 -0x9DCEB8E8FCDBD5473AFCFCB3726F0194E88A8B1E = BATMAN THE DARK KNIGHT RETURNS | V | 0xF084B7A4942AA653E087B059A6E946C2 -0x892D84900AE13D7B1DCED5748E41E223E6D13B25 = BATMAN THE DARK KNIGHT RETURNS | V | 0xB233DB077D941BA9B2A55826D35675EF -0x044E0E09EEFF1886B62126F7ED312F7A66D85C4C = BATMAN THE DARK KNIGHT RETURNS (Batman: | V | 0x1F815097EC4F6DCDF2A560D761F6AF6A ; MKBv35/FindVUK 1.00 -0xB07D3451708A8F08F21ABA712FEB9032D04F2C37 = BATMAN THE DARK KNIGHT RETURNS (Batman: | V | 0x45F18BD6C578240CE51835337138EA08 ; MKBv35/FindVUK 1.00 -0x4DB8FCD965A3D867CA008B8B31A5E47CBFBC57A4 = BATMAN_AND_ROBIN_WW | V | 0xF8A5B9D3C7C0A7BC2A542B7C16A5AFD2 ; MKBv7/FindVUK 1.00 -0xE78DE82C5EAE7D12006E06E707E0A285396884C2 = BATMAN_AND_ROBIN_WW | V | 0xC0DFFB423A588EF318BC94EDAE5757E1 -0xDA171CD787E94D44C6C8365BEB08F1EB46EA4D63 = BATMAN_AND_ROBIN_WW | V | 0xD37E4F14E0298FA5F74F7851AF31EAEE -0x5228518944F37E84564E5EACE6E63E6CB012F854 = BATMAN_AND_ROBIN_WW | V | 0xBBCB65D1DC51313FA0DE32316997E2FC -0x64F54E759FEC326EE9FA7389BD28DB50DBCA8F83 = BATMAN_AND_ROBIN_WW | V | 0x80503E593BAC766D2D3B825156526676 ; MKBv7/FindVUK 0.80 -0x1F18BA5B1FD19680032B3BBE17742919453DBDC1 = BATMAN_AND_ROBIN_WW | V | 0x6A8E842630BCFDE3C5FE7835E7F6676C ; MKBv7/FindVUK 0.84 -0x0931F62E6FB576B45402BD793647A1584A0ED42B = BATMAN_ASSAULT_ON_ARKHAM (Batman: Assaul | V | 0xBC8715380D1102410244361F20A355DA ; MKBv47/FindVUK 1.00 -0x964D7FE40E47FC6F5154090780367169C5E7D623 = BATMAN_BEGINS | V | 0xA42845246282B24A2E98804968D231EE ; MKBv7/FindVUK 1.00 -0x2BBECA9E934D400422F143FF9F6067F04163F05E = BATMAN_BEGINS | V | 0x6B279154E9AEE122B1869B72825D65AB ; MKBv7/FindVUK 1.00 -0x7EC9B7E0DD7CCBB9C61CB87539937B18D557C6CB = BATMAN_BEGINS | V | 0xB9536BE534B3B0FD3AD2363C6045776E -0x576DFE31112F2196E27D8D4589AEA3B71196E835 = BATMAN_BEGINS | V | 0x82B15E822D06E133ABADED7CFE937E0A -0x60A1BB8CE70EA1E319FEE176271FFB13B828ABBF = BATMAN_BEGINS | V | 0x7DCD39C680BEA748AAD13FE5762D12EB ; MKBv7/FindVUK 1.00 -0x31045120DE79D8F8707C6D2CAA17AB6FECCD5AC1 = BATMAN_BEGINS | V | 0xB46CFC149909C84CC3F184EBA31AFDCC ; MKBv7/FindVUK 0.99 -0x0EFCBC9D523E565003990E4D9F865D4C70A0EA94 = BATMAN_BEGINS | V | 0xCA2D6BE19653CAA0CBDB26E662C7F5AC ; MKBv7/FindVUK 1.02 -0xFB42A9B156B15977EE45A20128D51CA11E61FA00 = BATMAN_BEYOND_RETURN_OF_JOKER (Batman Be | V | 0x3280756017FFACEC89C8E7A4ABB35253 ; MKBv19/FindVUK 0.91 -0x5F4B648FCB3A32904FD443C50765380752680565 = BATMAN_DARK_KNIGHT_RETURNS_PT1 (Batman: | V | 0x052A53E87C8F4BB19DF8C51FBBD47CAB ; MKBv31/FindVUK 0.91 -0xAB78D72949CCD04534D5F4A7346EE7BC78CF6EFA = BATMAN_DARK_KNIGHT_RETURNS_PT1 (Batman: | V | 0x69D7BCFE97C90997C415F94F7CF76BC6 ; MKBv31/FindVUK 0.92 -0x9362D4EE92FD0748937816F5422131DAACC98F05 = BATMAN_RETURNS | V | 0x073B79B3877DCFD28C272BD79732C2EA ; MKBv7/FindVUK 0.80 -0xB8AE373C1AC92FC3FB07AE2292BA905327FB8203 = BATMAN_RETURNS | V | 0x34CB323AC471E3685FED629454C09FC8 ; MKBv7/FindVUK 1.00 -0x8585357BE9D32098BF5A8782D759A189A92FDE31 = BATMAN_RETURNS | V | 0xFD2939282BC54AE147804BC7A20A17C6 -0xE47BEB9BA541FAE3CE6CC32BD1A05EE8A0B697F0 = BATMAN_RETURNS | V | 0xF56E420C7F93F72731315EDF7B22EA3C ; MKBv7/FindVUK 1.02 -0xB1D66A545D49B3650E6A49E0520CC6C5CC2DA19C = BATMAN_RETURNS [Batman Returns] | V | 0x3DD5D93F9CB033C14D7EBD4F3267985B ; MKBv7/FindVUK 0.84 -0xFEF8FB9E0E9A30F155F1B7C871337B3CD9200C25 = Batman_The_Killing_Joke | V | 0xA592F292004A0A558BC16A6F4F948B09 -0x518F25E6016614D5788C257304AAC59D64C309D5 = Batman_The_Killing_Joke (Batman: The Kil | V | 0x2DA65A72FCE3783663C08593E9A0EE78 ; MKBv61/FindVUK 1.02 -0xC06A515B22463994AF50F009954EEFCBF47FF3BE = Batman_The_Killing_Joke (Batman: The Kil | V | 0xDEE76CB5575C1F0B90034F4B7FDEBFDF ; MKBv61/FindVUK 0.98 -0x3326B24A41897F7BFDE65DF7FCC66FE8AB9F847B = BATMAN_TV_BONUS_DISC | V | 0x26F2F802D70D0A7E6C4A64157781DF7F ; MKBv46/FindVUK 0.80 -0x24BC9F1E636BA2FBAD1DFDDFEA9122335834E691 = BATMAN_TV_BONUS_DISC (Batman TV Series - | V | 0xA01B7602BC835DF64833D838528D7812 ; MKBv46/FindVUK 0.99 -0xE0F84B3EC90CEF4125A09C5C57AB24F4A1656552 = BATMAN_TV_S1_DISC_1 | V | 0x4D0D2A09520F8B61EEB9370E66B70283 ; MKBv47/FindVUK 0.80 -0x99E9066ABBE9819945E7E8FD269704EA8E5A26BD = BATMAN_TV_S1_DISC_1 (Batman TV Series - | V | 0xEB1103B59088658D185B00CAC6C6F9FA ; MKBv47/FindVUK 0.99 -0x5C612139514D0B974CA1213116F34C983E96E1D1 = BATMAN_TV_S1_DISC_1 (Batman TV Series - | V | 0x671C055797FF567E389331E2F7A800F0 ; MKBv47/FindVUK 0.95 -0x8B88F6F9B89C86A0C0571F094B45E15418F5C29B = BATMAN_TV_S1_DISC_2 | V | 0x293ADA2EADC5301BE7F32D9A753C1BBD ; MKBv47/FindVUK 0.80 -0x52D825CDAB97B6F0F1122B946073C10BB8AF73B6 = BATMAN_TV_S1_DISC_2 (Batman TV Series - | V | 0x1020B04A7C2E850507A385C977EFB4DD ; MKBv47/FindVUK 0.99 -0x64F636B6EB3B259736556890BE35815D7CB50D3E = BATMAN_TV_S1_DISC_3 | V | 0xE3F37B75ED89EA0FDF508F397CB83709 ; MKBv47/FindVUK 0.80 -0x817BDB517A11BA0FAF2A595EC7CFE57EC32C464D = BATMAN_TV_S1_DISC_3 (Batman TV Series - | V | 0x29FE0D042E62C3AF08ECA6E0047B5D2E ; MKBv47/FindVUK 0.99 -0x87C6790F99E67C2AA919182053E661BBD211E9A5 = BATMAN_TV_S2_DISC_1 | V | 0xC8B91F59D745832CDE11AC9C3A99EB53 ; MKBv47/FindVUK 0.80 -0x6C9356B8C6A0CC5277D10B47C434D18F27DA936C = BATMAN_TV_S2_DISC_1 (Batman TV Series - | V | 0x478D4DDDFDD1CBC16D0BACA4F0D96928 ; MKBv47/FindVUK 0.99 -0xAF027762C087AC9C9FE919CD9291D6001E8B0174 = BATMAN_TV_S2_DISC_2 | V | 0x060C84E74DE79A8C24C968EA791E3E3F ; MKBv47/FindVUK 0.80 -0x2102B5910D7E41AB93B79C78D6ECAD2854232E43 = BATMAN_TV_S2_DISC_2 (Batman TV Series - | V | 0x2E78BE11A5FD8EECCD7EDB596D3BF38E ; MKBv47/FindVUK 0.99 -0x2A0D2CEDA88BA8D6A2B98D7D4BF0464F85DBF763 = BATMAN_TV_S2_DISC_3 | V | 0x7D9C711F00E5039D864CAEEE06E58C98 ; MKBv47/FindVUK 0.80 -0xBF804D4A95925FD10936C51AECE4851B1547DA68 = BATMAN_TV_S2_DISC_3 (Batman TV Series - | V | 0x5E77000D0CD22828CAAF7A4C178EFE09 ; MKBv47/FindVUK 0.99 -0xA221A5D67160F5157B8E60D28215E57E8FF8786A = BATMAN_TV_S2_DISC_4 | V | 0x0B851BC3807C9E390546417FC1C817EE ; MKBv47/FindVUK 0.80 -0x65564F90C9416742C5D173D093F46097FB26C3E9 = BATMAN_TV_S2_DISC_4 (Batman TV Series - | V | 0xAD4F62D26D8AC2C3E416702A30047AF0 ; MKBv47/FindVUK 0.99 -0x51C78B551247E64EAE529377D317762B2552B5F3 = BATMAN_TV_S2_DISC_5 | V | 0x51C6EB7C1B7DC45B24F1FE0CD0CDF597 ; MKBv46/FindVUK 0.80 -0xBEF42AF8BB335D31C743B958FF0479D378F4DF37 = BATMAN_TV_S2_DISC_5 (Batman TV Series - | V | 0x0B1A4B14E2224C8A1F6B3D2048D3798F ; MKBv39/FindVUK 0.99 -0x94778C0B248207E8E051CA456E41F0D5E27A023D = BATMAN_TV_S2_DISC_6 | V | 0xD3C0D3FA125595C94C2554CABFBEC3E5 ; MKBv47/FindVUK 0.80 -0xF7A4E924A93288A276FBF11CDAD20E657C8F078E = BATMAN_TV_S2_DISC_6 (Batman TV Series - | V | 0x560BEAE9D45281A26523AE2E554FF3B9 ; MKBv47/FindVUK 0.99 -0x2C9EE06AF9DB54F26EAA02668A12B8AE87C3C94B = BATMAN_TV_S3_DISC_1 | V | 0x43D52FD0B9548F3EB31B65C9D03ADC8C ; MKBv47/FindVUK 0.80 -0x682717A9AA09349AF9C9DED5FC6C05A669332ABE = BATMAN_TV_S3_DISC_1 (Batman TV Series - | V | 0xFDE97C814F2C8E4746E0B041AFEED51E ; MKBv47/FindVUK 0.99 -0x8BDBE2BE713EB2D117E6C1043CC01DE4CD1F585D = BATMAN_TV_S3_DISC_2 | V | 0xCC966DD77367B60050B7F67029522744 ; MKBv47/FindVUK 0.80 -0x7DA84E52A20A463B606B40F00FEAC69FB5982063 = BATMAN_TV_S3_DISC_2 (Batman TV Series - | V | 0xD2575D4EC3456BD4FB5D0486FD72E881 ; MKBv47/FindVUK 0.99 -0xE4F2F5414D7643D0499C08CC6D7F886CD58615E9 = BATMAN_TV_S3_DISC_3 | V | 0x7208B94D62AE236109986FF5213A0683 ; MKBv47/FindVUK 0.80 -0x419430EEED4F5D0443E27227EF0EF05B76C8C222 = BATMAN_TV_S3_DISC_3 (Batman TV Series - | V | 0x1ED55F515E6057BAD77EDD9BEC080373 ; MKBv47/FindVUK 0.99 -0x8D2ED0899EF3204130BAE474007A7F911B2FE311 = BATMAN_UNDER_THE_RED_HOOD | V | 0x3C30291EF0D69DC6561F37EB57757C4F -0xE9A608A64CB4B732A908D6DDFC08E4B413CDC8E6 = BATMAN_V_SUPERMAN_DAWN_JUSTICE | V | 0xBF107BC3032989EC379972FA4C1D9177 ; MKBv61/FindVUK 0.96 -0x9045A9FC6C1652943542DE9BF5507744561484F8 = BATMAN_V_SUPERMAN_DAWN_JUSTICE | V | 0xB655E020735E744E0A59D35A5BC51D1A ; MKBv61/FindVUK 0.96 -0x961856F7094FC01AECF5B98827AB7C9D4F099543 = BATMAN_V_SUPERMAN_DAWN_JUSTICE (Batman v | V | 0x1E4F280ACD2C280742525D21E157FAB2 ; MKBv61/FindVUK 1.02 -0x27B5CF08517BA278B4CC95C2F209ED3A71D56842 = BATMAN_V_SUPERMAN_DAWN_JUST_UE (Batman v | V | 0xFB49D7159DB759344279B2D1BCC9113E ; MKBv57/FindVUK 0.97 -0x9BD5F1A1A78EA99A5DB5558E78F15DA377DA8C50 = BATMAN_V_SUPERMAN_DOJ (Batman v Superman | V | 0x7562B34462DD86F41507727235D0D44C ; MKBv61/FindVUK 0.98 -0x1079B078058E949CAAF68DFF92D486BE527073E0 = BATMAN_V_SUPERMAN_DOJ (Batman v Superman | V | 0xB1E02C5DDBF0A86347198BDD80EE118A ; MKBv61/FindVUK 0.99 -0xFC91EA6FCCD90441961C027F08FAD4A26FDD46FA = BATMAN_V_SUPERMAN_DOJ (Batman v Superman | V | 0xC3E68BF5912C3AFDF7EE3314622116BA ; MKBv56/FindVUK 0.98 -0xE795AC0595F22CB01D73CF8109A8A94244E2E1B2 = BATMAN_V_SUPERMAN_DOJ (Batman v Superman | V | 0x52D4A8E23F0717CD0A688C3A4F080974 ; MKBv50/FindVUK 1.00 -0xA8EB4EBAFC6E58C71901D388BDEF06D9C81A0927 = BATMAN_V_SUPERMAN_DOJ (Batman v Superman | V | 0x88F98BEC32F8C1A698A7AEDD7F0DBA0D ; MKBv50/FindVUK 1.02 -0x762CE8BBCF3075529370371C507240DB94480DF8 = BATMAN_V_SUPERMAN_DOJ_UE | V | 0x6947E09ABD0B1E99C800D32A3CD15D05 ; MKBv61/FindVUK 0.96 -0x2B716BF91424EAADB87BDBC2C604B954D137224B = BATMAN_V_SUPERMAN_DOJ_UE (Batman v Super | V | 0x9E98F2684ADE2BEF3ABA1839D5031ED6 ; MKBv61/FindVUK 1.00 -0x5B2A7C88660AB7BCE3E9E5303BD3555D48E80E65 = BATMAN_V_SUPERMAN_DOJ_UE (Batman v Super | V | 0x4829FDA2CEE1ED381C5AC73E16ADAD34 ; MKBv61/FindVUK 0.98 -0xE03596F822AC02299E1D32EC17D369C83DA68245 = BATMAN_YEAR_ONE (Batman Year One) | V | 0x73DB3285CE528A8353124BC02A7F954C ; MKBv19/FindVUK 0.98 -0x5C84C559195478E35205E0B24325B372226D7425 = BATMAN_YEAR_ONE (Batman Year One) | V | 0xAD802293FE5F4E6A9A5A9075B5FC3EFE ; MKBv19/FindVUK 0.91 -0x0229B3F6BFC7603CFB02209154E800ACE8D7E162 = BATTAGLIA PER LA TERRA | V | 0xFF999EEC7D6F2BF2296AF6F7AEAF3446 -0xFAE956536B9FA18459B116A7CDBD51CEE91903B4 = BATTLE CREEK BREAK DOWN | V | 0x7C43FCECD76E58058A4C9CD0BA4C21FA -0xE77583351A83AB80E489DD466D130E7C9F5C625A = Battle Of Britain | V | 0xBA64BB26B8E8BEF324C69BE713D1BB2F -0xECB9B41FEA74BAFA5B86AC97E62C1416DCE7733C = Battle of the Bulge | V | 0x2AA872281F4C5489BF050A0A6160BD99 -0xE1BD4657B15F1E9D4628B3BDA9DE9F311E9963F1 = Battle of wits | V | 0x550975476359FF69D60D092845B57C02 -0xD1983DAABCE0456A50DFE985F3AF3952DD1E2399 = Battle: Los Angeles | V | 0x7DA4F0E07D86E6BF1D8AA103CFF45E37 ; mkbv21 -0x5CECDB072DC072F543F734AA708ADCCD4AF7EDDB = BATTLESHIP_G51 (Battleship) | V | 0x4D9B9A5BBD976A964DCC631E4129448D ; MKBv25/FindVUK 1.00 -0x5F0A40A04317F04C1DA8A3207F78E57FA42EDC12 = BATTLESHIP_G51 (Battleship) | V | 0xA002F403FDED5470428D3B1B114259CC ; MKBv25/FindVUK 0.86.1 -0x3ECE571437157FE4A5AE7C8377B33A7D7E81885E = Battlestar Galactia s2d3 | V | 0xB3EE1175E8D444FAD57877625D99E310 -0x7EC3218DE2079D746BEAD8274320C0A632F9DBE0 = Battlestar Galactica - RAZOR | V | 0x26F1C1781F49C434B7BC313E9303CD2B -0xBD1D127E49C43B13ABD5ED78F6E1589003767AFA = BATTLESTAR GALACTICA DISC 1 (Battlestar | V | 0x6B7B578E300C12448C2729E4AC3D2DB0 ; MKBv51/FindVUK 0.99 -0x57A2C2B3A714A6F802065A926EE6C20CF37CA76B = BATTLESTAR GALACTICA DISC 2 (Battlestar | V | 0x86FCFFD875C1ACDFC5484D2C1CBF2592 ; MKBv51/FindVUK 0.99 -0xD46E336803EBE257FD966D3D80D228C7D6832FFC = BATTLESTAR GALACTICA DISC 3 (Battlestar | V | 0x44F60F3897475BA3B876AA7C4A000D1C ; MKBv51/FindVUK 0.99 -0x0B8F418B49D92E400616EEA057CA9C281EC5462B = BATTLESTAR GALACTICA DISC 4 (BATTLESTAR | V | 0x0DDDB4C9C4023854F825936F2EB024A3 ; MKBv51/FindVUK 0.99 -0x889C367503690AAAF5B619648DCB5A0386C181C8 = BATTLESTAR GALACTICA DISC 5 (BATTLESTAR | V | 0x7A18B60AEBEC5D4B94FB8FD0756403B9 ; MKBv51/FindVUK 0.99 -0x8F4E990208ABD38172B8145C812832855C82BBB8 = BATTLESTAR GALACTICA DISC 6 (BATTLESTAR | V | 0x60D57072EEB1C8620F64ABB549B6A01F ; MKBv51/FindVUK 0.99 -0x93EC39EE3CDA8F3FBF24521251BEC39C8F93D539 = BATTLESTAR_GALACTICA | V | 0x80E805401C27FC03A948293EB992CE3F -0xDD2F0903D6FBFD5B1E0B6CF6E6D77B9FFFAB3937 = BATTLESTAR_GALACTICA (Battlestar Galacti | V | 0x01FFFBE1B281F40397161C0F76E1B06B ; MKBv12/FindVUK 1.00 -0xB43E3270E086AC759D4622F950C7EA82737DAA57 = BATTLESTAR_GALACTICA (Battlestar Galacti | V | 0xB5D7E831920E837026875D762543B546 ; MKBv12/FindVUK 1.00 -0xCC2590952094465197B44BAF3626087326637696 = BATTLESTAR_GALACTICA s3d3 | V | 0xCF99D32AE5978CE6BF66FDCC2EDDFEC4 -0xA91EA6356AC6E2170E15C80A547A2A537B0B5BDF = BATTLESTAR_GALACTICA_D1_NA (Battlestar G | V | 0x1BFEFBC1E8DB4610D20BB3CFC8CC326F ; MKBv50/FindVUK 0.99 -0xC2909BE82598B8AC58E71D9D300F2E33C8CAB842 = BATTLESTAR_GALACTICA_D2_NA (Battlestar G | V | 0x867DA927E571D53FC76BAA007571AF59 ; MKBv50/FindVUK 0.99 -0x581C726F161700CCCAA5752AFEE17F54F0EDDF7A = BATTLESTAR_GALACTICA_D3_NA (Battlestar G | V | 0xA99F06A1C9397B36E726BC8348403674 ; MKBv50/FindVUK 0.99 -0x24EC97AE2BEA1DEF770DC3F1E6F750AFAA08FF04 = BATTLESTAR_GALACTICA_D4_NA (Battlestar G | V | 0xD6E544CF3012DC44B8B23F21DA27C636 ; MKBv50/FindVUK 0.99 -0x4841C34846F7DFDF01D64DF68AB03616240521B8 = BATTLESTAR_GALACTICA_D5_NA (Battlestar G | V | 0xD4F01A9AE5121488939F4BC7876FCA57 ; MKBv50/FindVUK 0.99 -0x0E27D3F11324294802E065C86050CC21B4DC3339 = BATTLESTAR_GALACTICA_D6_NA (Battlestar G | V | 0xC78135F096F67C907BC93425033B577C ; MKBv50/FindVUK 0.99 -0xE2D0EE7EBAC26CFF703779B1398432A3BBDF52CC = BATTLESTAR_S2_D3 | V | 0xDD5151B95647295D28C0558E47D63817 -0x6ECB018BC5C38D9F5FB690617581D121A488D0BC = BATTLESTAR_S2_D5 | V | 0xB0C0040B72EDE0E9D0CA765DA5C4436A -0x090C2642E60D0AEF77924A209A7F4848DE3C0AA3 = BATTLESTAR_S3_D3 | V | 0x68B1D0038AA719D8E7AF4D1326A08725 -0x4ABFF91C5BF16CD9EAACCFC5D48A4E1E2B863258 = BATTLESTAR_S3_D4 | V | 0x0646551D4323C9323402B8E8119748D0 -0x9572F3E58C0B6537D9C9BCC174F3D8C32EE2A063 = BATTLESTAR_S4_THE_PLAN (BATTLESTAR GALAC | V | 0x2F2CA0ADC54D7BC4F10127644AE6FE7D ; MKBv16/FindVUK 1.02 -0xBF3620DC2E15935D0F64212261A0A98BD37665DC = BATTLE_0F_BRITAIN_F6 | V | 0x67AC74F42CB31735E017B0C59DF8E59A -0x52B2161A5153AB1366A325479764A764308DD8B1 = BATTLE_FOR_TERRA_3D_SONY | V | 0x51756321A9E3107EE92AE5B0399D4072 ; MKBv20/FindVUK 0.80 -0xF62135CF50BCF1C9BBF912B184073B9E4F5E3A32 = BATTLE_OF_BRITAIN | V | 0x73926232F585DED128F08A8A89E35F28 -0xC00E4D76F801F23388246E4BC308BC3A8C3E9359 = BATTLE_PLANET_APES_F1 (Battle for the Pl | V | 0xDA3952FA9053383C07ED08E525DF8B4F ; MKBv8/BD+/FindVUK 0.96 -0x6BBA2F93024EA032459C63ABA2ED37CC59329F7B = BATTLE_PLANET_APES_F3 | V | 0x6AB6CA70C8E32E927DA1B940804D3672 -0x3E42D28A5C8F4FA1011FB468699D9B344A843018 = BAT_F1 | V | 0x8CF8E1D2BC113BC8A6C920F4F7A1D9FD ; MKBv7/BD+/FindVUK 0.80 -0x2617BF13BE65ACACBA89CC6A7445BE1CF342B3E7 = BAT_F1 | V | 0x1BCAA3522AE95C46A5E6841DECDCBB0B ; MKBv7/BD+/FindVUK 1.00 -0x57F0570B51EEE8596AF065E19EEF9540565642C6 = BAT_F4 | V | 0x72E35C7FB7C3F83969F3338BFF00B9F8 -0xA8DB5D07DF1F2BE1F3A4E531009C3837A1714139 = BAT_US | V | 0x7785D138F1458DD890E416F500EF6DB7 ; MKBv7/BD+/FindVUK 0.99 -0xF9D613603AF8468050BD177239816FFA4CC18DC5 = BAWBJ | V | 0x003A7243B76AC3757B3087D677A7E3B8 ; MKBv25/FindVUK 1.00 -0xA950AD59DCB487C4BC651E7E6E6D5A3AD0E36018 = BBCBD0238 | V | 0x53EA675E77C8C2DBE67FE8889EA77ABA ; MKBv40/FindVUK 0.80 -0xCE955A73DE4AC22D688E87466619D5197A0A0A63 = BBCBD0238 | V | 0xBE29C4A03538020F54A2D2C61905300E ; MKBv40/FindVUK 0.80 -0x9728A09FC2F46E5DAFA54AFE7A9AA0165D9A5E4F = BBCBD0238 | V | 0x981D22D8557A77147269B2175A066CA4 ; MKBv40/FindVUK 0.80 -0xE1B368A777E1AB6A98CDCDE3D6EB3151D30C9B1C = BBCBD0383 (Sherlock Series 4 - Disc 1) | V | 0xA1FE2840C679D4F314E93EC3AAB731D5 ; MKBv62/FindVUK 1.00 -0x447640273D666B71F6115BEDC337BCB6D80E0F7B = BBCBD0383 (Sherlock Series 4 - Disc 2) | V | 0xDD31416B2A8B514FAB447B4C3C4D3222 ; MKBv62/FindVUK 1.00 -0xAFC6718E1C0FB3F68EFF820F6F39A66BF3E614DC = BB_King_Live | V | 0xC740F906522A4300BF2331AD745A288C -0x6039EF4505C087091C7D9A430445C2ED1399ABA5 = BD Demo | V | 0xF41039128B1764E191D180C8AAAD3CC2 -0xB109E841A471ADE92044DF4C3B25EA20E8F59798 = BD ROM | V | 0x72C003FE021182EFE6B72C527A86AE95 ; MKBv46/FindVUK 0.94 -0x25366B6F1DBD01FA29F90CD529F206FB1049D654 = BD35083JOHNMAYER | V | 0x31638D9DE754485ADADCEE4660516D14 -0x9DC32501F8601D4D0B599DCFB197347D114D0785 = BD35083JOHNMAYER | V | 0x8F8053FA75A009FA02E8B8B8DCD490ED -0xBDDC1DA4358F5C1301B2B93030D4CAD77640627C = BD3711531993 | V | 0xCB595B0BD8445C54BAAB6A7195441DB0 -0xCE1943D62B4F54405FE5C7BA63C06F5A46CA7FAA = BDCASH | V | 0x43CDAC7791293C2F5687D8F5E6EA887A -0xD7FB8B61556EC9A7D312CD18465ED3E50BA79FBE = BDJ_THEORPHANGE_ITA | V | 0xB958A297E6A0625E8ADAB09F69CABF6E -0x98CE3E7B4891679406EA3AB3E88087AF6EF9E5EA = BDLEGRANDBLEU | V | 0xDCA9DBD32D21AF61477D3E8A66B5EE9E -0x5C32BA4C1E8F4B2480B88A8FD63AC44FE422CE75 = BDLIV0xE1609 | V | 0xDABC12920B40E1F930577ECD41E7B722 -0x57C0E1FB32031787A133ADA10DD275A90DFD8B18 = BDLIV0xE1609 | V | 0x890C55E9B808CE9CF791274C029D9D04 -0x7CB2ABBD211159E2DF598F07FD4F383D6A78F9C2 = BDMV | V | 0x0F9488D5B90E8B69F0484C61E1245990 -0x1A64D5413C6BA85236D9DB9C9D1378098F58DB37 = BDP26409 (Downton Abbey - Series 3, Disc | V | 0xFCDDA2D2932F49BB41B583665002C3BF ; MKBv38/FindVUK 0.93 -0x2777A92E2234A9E0F20D0A88A0FC36F80AC2E629 = BDROM | V | 0xD0276253CE3C21DE425B5B4FA262A502 ; MKBrev 42 - FindVUK 0.57 -0x0A77C681B7AE7DFB6F253BE3A021543358CDBEBE = BDROM | V | 0x416CE64FA6976C9D62B5EE747436EE9D -0x42ECB65552836F99BBA94E4EB875804F01A7F2AF = BDROM | V | 0xD316CD50557E7CE29AF3F0B05A98DF81 ; MKBrev 42 - FindVUK 0.57 -0x22A250259EEA2EEC89F7838E1861CC76D7C517BC = BDROM | V | 0xD250974405E45E0D1224D8C561235A75 ; MKBrev 56 - FindVUK 0.57 -0x6E1DE0244C3E3CFF9CB8F6673F182E30CCCE4793 = BDROM | V | 0x10587CD66D07A14515965AFECB80FEBF ; MKBrev 48 - FindVUK 0.57 -0xBC6E7D1CED7136EDFD65271D19C24AD7F462799E = BDROM | V | 0xC68707E5F155D244B4AB9DBC221C276F ; MKBrev 42 - FindVUK 0.57 -0x64353A78FB739ECD2548B565D9733EE854AFD554 = BDROM | V | 0xE7E1BABA69CF2B5DA87FBBF53E8F7BA9 ; MKBrev 39 - FindVUK 0.57 -0xB90BAA8F7133411FCEF421AED1CECCC673F64860 = BDROM | V | 0x2FEC4DE7410464651B588133255C964F ; MKBrev 42 - FindVUK 0.57 -0x352AE189FA3B5D77A7140CB4BE0B40143DFDB94B = BDROM | V | 0xFF543BC7D050CAA19671532A867ED03A ; MKBrev 42 - FindVUK 0.57 -0xFEF7263C3271EAE32B57AD9729AA18F15C9F8ACF = BDROM | V | 0xF4C2038F84F10F7924B13BAD3AAA7305 ; MKBrev 42 - FindVUK 0.57 -0x068624A6D3A5E14CBA90DEF8FB4542F34F730499 = BDROM | V | 0x3745F0B9E694DB708E01218054FFA0C4 ; MKBrev 7 - FindVUK 0.57 -0xC52DBAF9D43EEC386F87AA45BC622C14A0ABA468 = BDROM | V | 0xDC0DD4221093796DC5A41EA133FA0A16 ; MKBrev 3 - FindVUK 0.57 -0x85700F4457BC7517BC018A400419AA8DF623D236 = BDROM | V | 0x4237495EDE2680DA2C4EB52E325FC3E8 ; MKBrev 43 - FindVUK 0.57 -0x9ECB99D2ED6461FC1071ABC5643D056ACF02E061 = BDROM | V | 0x3ABD38CA7287FE5352591DC8B7F7901A ; MKBrev 43 - FindVUK 0.57 -0xBDADA5B741A09156D9A96C8C85601530A0E14F44 = BDROM | V | 0x26DCCF2F4E639F04D4B687F2D8545E2D ; MKBrev 42 - FindVUK 0.57 -0xC06373D8B251456BB0F0B239D703925AB4CB6C26 = BDROM | V | 0x152556696714CC73CF05FC99E0DF41E1 ; MKBrev 42 - FindVUK 0.57 -0x48D80AF11CF468A094F404DB5A92C46F3688FDD5 = BDROM | V | 0x4336EEFEC7B573745524E179C0AB96FF ; MKBrev 47 - FindVUK 0.57 -0xEA036DED7EE295A70FE1FF06F143007F4D004922 = BDROM | V | 0xAA262AFFD93BCCD6326B7FD79EDEE108 ; MKBrev 42 - FindVUK 0.57 -0x8330A4CE585A35A00C43350C4B76D3723A034063 = BDROM | V | 0x6A36F5353393C32CDB2A746A5D1816FA ; MKBrev 43 - FindVUK 0.57 -0x7CE2287782FE78E5DC2F363D42BBAB92BCFE55B7 = BDROM | V | 0x49D73DFB232926D89DFC8B3B9EA0ED01 ; MKBrev 42 - FindVUK 0.57 -0x2E42DDB3B1B1E915678CDCD946979809A98F773F = BDROM | V | 0x59CB5A4DFEB675A026B2CBC10BA4A450 ; MKBv61/FindVUK 1.00 -0x9072028F338B1B839B93516EE933B3E18E436762 = BDROM (12 YEARS A SLAVE) | V | 0x1718870DA45E116E5616AED3E18F7920 ; MKBv47/FindVUK 0.98 -0x03BD12C0C60DD14939E23AF0008FEB58FBFEB711 = BDROM (????????? Blu-ray BOX Disc1) | V | 0x3C08AEBFA84F267D72B4DBEBC84A4448 ; MKBv57/FindVUK 0.96 -0x2EAA87015669B4724CB61FC7411400F5B717BDBA = BDROM (????????? Blu-ray BOX Disc2) | V | 0x08BBB23CBF53A7BED653163B868C3031 ; MKBv57/FindVUK 0.96 -0x13DB1E3874E1533FF820EAAEDC1BA76EE3101E1F = BDROM (????????????????????? ??????????? | V | 0x8C307868F3FD0208E55E012CAB66ED94 ; MKBv56/FindVUK 0.92 -0xB9FA3F46728180ACF4207BCF4277ED272205E3C1 = BDROM (????????????????????? ??????????? | V | 0x6ABA43BED024CD2EB625024C95D2435D ; MKBv56/FindVUK 0.92 -0xE74789760B3E3A3898C6D8B40BFB96B37D7200EE = BDROM (????????????????????? ??????????? | V | 0xA4E0724D24FB025C6E919BC1C53623E3 ; MKBv53/FindVUK 0.92 -0xBF302E935345597492398C1145BA67EA8C955786 = BDROM (????????????????????? ??????????? | V | 0x080A5F634DCFA1B3CB2ED2F1A7D0FB92 ; MKBv53/FindVUK 0.92 -0xB5B6B611C353500FE15403124E7BC9C03F017076 = BDROM (????????????????????? ??????????? | V | 0xEA6EBB0820F57608A90CAC3CD58FA1BA ; MKBv53/FindVUK 0.92 -0xCB0C4D8383E3E34BD52E0872259690B65E7BCC1A = BDROM (????????????????????? ??????????? | V | 0xD8BA2251B1DE33C723E3319438B310B8 ; MKBv53/FindVUK 0.92 -0x8F8866836F178A21F3F3422B55EFCA28B78AB641 = BDROM (????????????????????????????????? | V | 0x0017A30609BAC25D7074A0A2C8A7B147 -0x399D0DE8652AB3B068910A6E9256F1A404C6C3E2 = BDROM (????????????????????????????????? | V | 0x3CDDE204036516BAF7299B9D6B79151B -0x3DDE39A9F2EB5AC189C0A45E8A3E17C182BA4292 = BDROM (????????????????????????????????? | V | 0x8C207898A00991A262A221FED8EE6CEE -0xCA7C7E08F60196F179DBADA15BC8FA988D8BBE33 = BDROM (????????????????????????????????? | V | 0x677AC06DA6E51496230CA5B73871000E -0x3FB5396B23C1A9BCC409DEE33773D41B985C9AE4 = BDROM (????????????????????????????????? | V | 0x8D073FF0419D3DF2D1D7A1C9A1D38DEF -0xA7AA8356C67169744224A9B47674CF60BD835EEB = BDROM (????????????????????????????????? | V | 0xA2DAE1247E365FE265492BFD8FB15A64 -0xDE3F8CE79C2C581739BD2721BACC45540A4D24F4 = BDROM (????????????????????????????????? | V | 0xD8B6BF73B06CE48A9F37F3844FCF9FF4 -0x1A00583FFFEB1AC2F747669342AE25645B3A50E5 = BDROM (????????????????????????????????? | V | 0xBFF875A888CD40ED9E8F0ACE67AFDCBE -0x42439874B0C85FE988B0150AA653C89834168152 = BDROM (????????????????????????????????? | V | 0xB8076431DD756A4B7E090C45F3089124 -0x60C06325F4BC21A7A77BF372A12233B7DEA48705 = BDROM (????????????????????????????????? | V | 0x197720F4332EEAEBE1568D187FF40F83 -0xE16FFC7CA32C5641239741497C150F502AB9B3E1 = BDROM (????????????????????????????????? | V | 0xED3FAAA3F2FF229A7BB599F7FC7D7DDD ; MKBv30/FindVUK 0.96 -0x1443A2F3B0F10B2FFCFC8298FF4DD0CEB264E704 = BDROM (ポケットモンスター ジ・オリジン) | V | 0xBD2B4737DB39749282E8227A2E0C566B ; MKBv43/FindVUK 1.02 -0x99A99DF66F5CAC9EA038DEBACD47031828F632FA = BDROM (縁会 2012～3) | V | 0xAADA27B10D0B9866FBEAFAC95CAC561A ; MKBv50/FindVUK 1.02 -0x9672C3E6175786C2C3D6ABD1BEE677E76D7D015A = BDROM (美少女戦士セーラームーンCrystal　第２巻) | V | 0x6D44706A1F411BE758C74C37C1E0F97F ; MKBv48/FindVUK 1.02 -0x2948C3A7D5F850E16CEB519C1C47085F624F140F = BDROM (EVANGELION:3.33) | V | 0x7A42FCB208782E64A86698E879DCE048 ; MKBv37/FindVUK 0.96 -0x8F417546A391FE981C0A53F1EA97D46A17BC3062 = BDROM (KILL la KILL 1) | V | 0x9536EDDDE848E311DE7DEBA7B9BBFEF0 ; MKBv43/FindVUK 0.99 -0x49CC1FF79F389AE40E3B3926B7CA085133544596 = BDROM (KILL la KILL 2) | V | 0x513DBBE8F463EF051CD30FA99B737B83 ; MKBv43/FindVUK 0.99 -0x0BF200B9111E66CB5564A76A1BD28FB48177B5FD = BDROM (KILL la KILL 3) | V | 0x01C4FA470A6AA2E8F4A05716E04E8315 ; MKBv46/FindVUK 0.99 -0xF7CA9692567BCF754B7F18E2973E953A41851DA2 = BDROM (KILL la KILL 4) | V | 0x1E9DFD6D93E8431DD54C213A385A5396 ; MKBv46/FindVUK 0.99 -0x384312354FDACB152A62B9C411F5683F2FA6D50F = BDROM (KILL la KILL 5) | V | 0x3C7496916C0F221A02B6A2AA63E9F00C ; MKBv46/FindVUK 0.99 -0x4C0FD70946A271D67EF85FFD54A5B172A582D510 = BDROM (KILL la KILL 6) | V | 0x2BCC862C9D404C8DF36813DEDAF60CB7 ; MKBv47/FindVUK 0.99 -0xB18508C604CF143EC09A07A1DC49F80EA81DB323 = BDROM (KILL la KILL 7) | V | 0x77DE88E3DAFE0F4046D08307F8918264 ; MKBv47/FindVUK 0.99 -0xB291715A2CEF6E3524730F456CBE21229AB9BDE4 = BDROM (KILL la KILL 8) | V | 0x3793FD6FF22FDDCF7DC888C386EE1867 ; MKBv47/FindVUK 0.99 -0xEA7B78C24C26BBD6998F4C79A4DD8E3D6E0FD855 = BDROM (KILL la KILL 9) | V | 0x087232A4248209C04FF533EB1EADCDDF ; MKBv48/FindVUK 0.99 -0x10741BD3B556111211B2E6F956E57712D674AA68 = BDROM (Le Portrait de Petit Cossette) | V | 0xB8FE3833FE277005D8633D65FA16C14C ; MKBv42/FindVUK 0.96 -0x349B92192482FB1E875533A8CFC17E4DB7239F50 = BDROM (Love Live! Sunshine!! ï¼–) | V | 0xC48BAAD5993244E48D42157C24D8776B ; MKBv62/FindVUK 1.00 -0x4485B5B7E91EFC323657626DCAD7B0D5A09AF5B2 = BDROM (Love Live! Sunshine!! １) | V | 0x4CC4D4C5E0B521FC2216A1A028A776AA ; MKBv61/FindVUK 0.99 -0x382A55A4A5E24256F5728C45A32DF65608C96613 = BDROM (Love Live! Sunshine!! ï¼’) | V | 0x3505409625BB7667BFEEEE2BA9665242 ; MKBv62/FindVUK 0.99 -0x2F84B36B263F0581CB33DA912F6E85BA6DD2A3B8 = BDROM (Love Live! Sunshine!! ï¼”) | V | 0x89846F5E0F2841E9DFCF91A0783B560D ; MKBv62/FindVUK 1.00 -0xD9BA2BA50446165DBEF7200E3D2E6B95D332E370 = BDROM (Love Live! Sunshine!! ５) | V | 0x10E60E2681E65228AF422EADE6011650 ; MKBv62/FindVUK 1.00 -0x98190FF8CA86B4525A1DB95E61479E6F34C89D0D = BDROM (Love Live! The School Idol Movie | V | 0xD74B0A6BAD94709A850A1B139872891E ; MKBv57/FindVUK 1.00 -0xF444A4DF49CDDC61DC838B5807807D037CA29022 = BDROM (Love Live! The School Idol Movie) | V | 0x2355AA8E9BB706353ABD243ABB246FF0 ; MKBv57/FindVUK 0.72 -0xBCEDAC62A13D9948978C6FCCFED3C4888C67256A = BDROM (MADOGATARi展) | V | 0x9FB5BB8A00825ABD6894565BFAC1DC56 ; MKBv62/FindVUK 0.99 -0x03074CCA7826E488BB4FB451BE144BB453D063DC = BDROM (MOBILE SUIT GUNDAM THUNDERBOLT DE | V | 0xC5950E901AE8106C619805A9313ED194 ; MKBv60/FindVUK 0.98 -0xD37E7C65999A79807FDD004E7B858FB1F313C407 = BDROM (Public Enemy Number One - Part I) | V | 0xE2700307EE3D1F194DE3942FC418D714 ; MKBv12/FindVUK 0.98 -0xD19550E9DB62FD2584C15C74EE689B095754BA68 = BDROM (Puella Magi Madoka Magica the Mov | V | 0xC9228BBDF8A75264E64221C68C619104 ; MKBv46/FindVUK 0.99 -0xB07D5A91315C40469B4602A23765F369F9FD5707 = BDROM (Puella Magi Madoka Magica the Mov | V | 0x01DAE811DF32A8630D40386234CD34B9 ; MKBv46/FindVUK 0.99 -0xEA19AD4443545807781BF0EBA4FB5D5851423759 = BDROM (Spetters) | V | 0x61ECC93EA0963727385E13B4FE1BDEAB ; MKBv28/FindVUK 0.98 -0xAEF2D2E10E6B1196B60A33055B06D802EFFDC4A4 = BDROM (Steins Gate 1) | V | 0x08D658258BB53414DBC82B65318A0A60 ; MKBv21/FindVUK 0.96 -0x5FEAD8EF75BE29FCDE304F171E84E2D03F535D14 = BDROM (the Garden of sinners 10) | V | 0xDAAF0DD79D339D35190AF99EBBE43A4B ; MKBv52/FindVUK 0.93 -0x19B3475FE5ACE6AECA3181CC033516EBED2AA4A6 = BDROM (the Garden of sinners 9) | V | 0xD0927AB4DF2F51D5C2C4F635768B831F ; MKBv52/FindVUK 0.93 -0x8ABC5878045B853A8094B14ACBAFBA46441D8695 = BDROM (THE IDOLM@STER CINDERELLA GIRLS I | V | 0x467DCEF63D6E8B37E95F66E6D401FE82 ; MKBv52/FindVUK 1.00 -0xE9E83243E4F62794568581B923150136717BF892 = BDROM (THE IDOLM@STER CINDERELLA GIRLS I | V | 0xD5A30775B3B692E6700A4F38B066181B ; MKBv58/FindVUK 1.02 -0x436F392D62218E6CDC7BF73D90CD0A43B65A3FC4 = BDROM (THE IDOLM@STER CINDERELLA GIRLS I | V | 0x4C3326E480D22672111575FD647E910D ; MKBv53/FindVUK 1.00 -0xE4D2B640EC840475AC96841AB50768E0161EDCC3 = BDROM (THE IDOLM@STER CINDERELLA GIRLS I | V | 0x4B5F4FA32FA203473A97B142072C4396 ; MKBv53/FindVUK 1.00 -0x0E2D164B80189A845DACCABE33A38A5B211C6FFD = BDROM (THE IDOLM@STER CINDERELLA GIRLS I | V | 0xB8A05039D01232F478CAE917B1504E26 ; MKBv56/FindVUK 1.02 -0x15EF6D054E91F456FCF907FDE9C745420604FAEF = BDROM (THE IDOLM@STER CINDERELLA GIRLS V | V | 0x1E5F26C1F5BC162F8660C853BB3B590E ; MKBv57/FindVUK 1.02 -0x6D351C176868AD31A4E88D1D2133A182C33F648E = BDROM (THE IDOLM@STER CINDERELLA GIRLS V | V | 0x466D7389CEAC3D59AF3C091C1FFC6970 ; MKBv57/FindVUK 1.02 -0xC701B6A6A463EEA08DF654E971CFBC57DC032E95 = BDROM (THE IDOLM@STER CINDERELLA GIRLS V | V | 0x2D5B8BA43CCFF78D524021300A3C88CC ; MKBv58/FindVUK 1.02 -0xD248A26E453C2B5DFFF19E5D8DC721C9D973D08E = BDROM [4 Rise of the Silver Surfer] | V | 0x329B83F4CFFE2EACA423675E5B7AEC4E ; MKBv4/FindVUK 1.02 -0x475B277B590B95C8994070DCAB8FF1B311A9A060 = BDROM [AKIRA] | V | 0x2136E297C8C2E86C58801C3BC43785BF ; MKBv43/FindVUK 0.96 -0xA81494321B71ABDD962B131015F8E274FEDFCA62 = BDROM [BATMAN GOTHAM KNIGHT] | V | 0x179463218E719EE721F42A04FF5ECCDE ; MKBv7/FindVUK 0.91 -0x3793B871A7C56A25EB26E218CD5B213CB83DE3EE = BDROM [Castle In The Sky (Laputa) (JP)] | V | 0xD3FFA7F7FD096990C7CCCE6EE1E8A900 ; MKBv19/FindVUK 0.99 -0x05948263C35299E57A89BBF17428CA578923064C = BDROM [Castle in the Sky] | V | 0x213BCEDACBD9C087BD65FCBFED4AD436 ; MKBv47/FindVUK 0.99 -0xE024FC2BC9FD8994123E7EA312F75F32C5008BB7 = BDROM [End of Era] | V | 0x39A7C75E4C23094D5B30F926D6D9BB8F ; MKBv12/FindVUK 0.96 -0x93DACDE87B111D3A4C83C4CDCA4CB2207FD166A1 = BDROM [EVANGELION 2.22] | V | 0x28CF1D4633423C5790E5B6628AC7C5C1 ; MKBv12/FindVUK 0.98 -0xEE026C4D81FCC2C8F6727499B0F496EEA26D2DAB = BDROM [EVANGELION 2_22] | V | 0x8AB84363DF99BED6394971DD67B0C99E ; MKBv21/FindVUK 0.72 -0x0B11BDC460ADA6FB6F3A4B6A2E5B8F2652EBA2EC = BDROM [Fantastic Four] | V | 0xC6063E8828EA0A194EA83651460DC0C3 ; MKBv3/FindVUK 1.02 -0xD4AE0BE2EF58D69A7111B66E17E7F75D35B52F2C = BDROM [Feuerwehrmann Sam - Helden im Stu | V | 0x35A78E54244ED98961E2BC611B485EFC ; MKBv57/FindVUK 0.95 -0x92DFEF4C46807221D007CA776D8D0AFFF5F17D8D = BDROM [Ghost in the Shell The Movie] | V | 0x292EFCF13A738A2F41386EBD09F70AB1 ; MKBv57/FindVUK 0.65 -0x5BB875E5D716A1A9CCAE3C3865D92695A5E05FED = BDROM [Grave Of The Fireflies (JP)] | V | 0x9DD62748A67B3D78757AC9474D0CA4FF ; MKBv30/FindVUK 0.99 -0x7B57F2A59120D3B71EA5A0B4F95AB4F86BB3E6EB = BDROM [Hollywood in Vienna: The World of | V | 0x76CA881B9453E05EB14C42997D3724D4 ; MKBv61/FindVUK 1.00 -0x2CCDFC11C7901554470F976D3D8345EC48BCDF73 = BDROM [Ice Age: The Meltdown] | V | 0x3CD9D25E2DB787253D7C78240AEA9EFD ; MKBv1/FindVUK 0.96 -0x9A7ABA81FBE63DA30EE1DCFD17A5DD9234540551 = BDROM [Ice Age: The Meltdown] | V | 0xDCE64DBD14401F91BAF8D5BF6115F1A4 ; MKBv1/FindVUK 1.02 -0xAA021D1BCBD137A4FF6FFA78C298E80277F7230B = BDROM [ITC VOLUME 2] | V | 0x458AF37CA7B52C76CF8399E71E530718 ; MKBv19/BEE/FindVUK 0.94 -0x593C1DF9EEA239C75623E09E1C89ADC564260ACA = BDROM [KIN-DZA-DZA] | V | 0x45042E507CB9CDFEE4BB8B5A78DC8C83 ; MKBv37/FindVUK 1.02 -0xF330B0A10F46E9D05978BC418338D3F5BD4ACD55 = BDROM [Laurence Anyways] | V | 0xBB2B0125D53E8E57A4BE484154B10FA5 ; MKBv31/FindVUK 0.98 -0xA9EC293DB2965E7971A8CF8010E8DCE4B7927E67 = BDROM [Mi vecino Totoro - Deluxe] | V | 0x00A4A94B98F33E834C2A6CBCB853FA47 ; MKBv35/FindVUK 0.89 -0x07102AA328B7771BFB1E1C557A33E725A2E7346D = BDROM [Momentum] | V | 0xF7366AF7CDCD277191ACFB26D2A426C1 ; MKBv57/FindVUK 0.98 -0xE4FDA0A4E91E59A75A9DEFE39458428C54E69C70 = BDROM [Momoe Yamaguchi Budokan... At Las | V | 0x7EA87476A3C3554FD03B926350121591 ; MKBv37/FindVUK 0.98 -0x560B877A35D2B383CBEACFEBB17009F94F68A96B = BDROM [MONONOKE HIME] | V | 0x9D4AFD6A697885BD20C9B7ADAF031345 ; MKBv43/FindVUK 0.96 -0x82268A67755D3BEF961491D99C5C01271990A6EC = BDROM [Nausicaa of the Valley of the Win | V | 0xC63748F46B69DAA34504F10E812986A3 ; MKBv47/FindVUK 0.99 -0x535974FF4632B10AE05B90D5306794E17B9D4091 = BDROM [Omoideporoporo] | V | 0xA1CA5B80030CA77C4B799C4C58B98890 ; MKBv35/FindVUK 0.96 -0x229B1F0FE96ABBD819665A51FFAA87C0B70F9875 = BDROM [Pale Rider -- Der namenlose Reite | V | 0xC92FE0E0D8017283837C0D83C9C9E493 ; MKBv7/FindVUK 1.00 -0xD460A4A2A873CBD32E7F6C040285D693F09F9247 = BDROM [PROFESSIONALS DISC 4] | V | 0x0AB4FAD26A2A8E30D44A915BF47420E0 ; MKBv46/FindVUK 0.80 -0x30E473A3BB358F8D91B7478A349115FFAD922B7A = BDROM [REGAN] | V | 0xAC1F1B1890E354A1DCDC1D0EAC39409D ; MKBv23/BEE/VUKNOTVAL!/FindVUK 0.80 -0x19F83A83F4F444D07BEA884388B7DE1F90122A62 = BDROM [Resident Evil Apocalypse] | V | 0xE858EB1181C78E6DA05168D27C4986EE ; MKBv4/FindVUK 0.96 -0x1787DAD8618CD94E3F2B25E3C53B02DB31E1F2F5 = BDROM [Resident Evil] | V | 0x13D9EFC33BB184506F061159CDD2BDBF ; MKBv4/FindVUK 0.96 -0x6456A9246A036F685FBDAE871355198F511FECBB = BDROM [RESTREPO] | V | 0x68D794B6CA1C37187736F2A651DEB922 ; MKBv20/FindVUK 0.96 -0x153AE618FF72ACE385AED54844FD405C08F81DFC = BDROM [Royal Space Force - The Wings of | V | 0x7AE088F05D8FC38BB5205BB506595908 ; MKBv3/FindVUK 0.96 -0x72786C84D4DDA4EC823D3804C9C1D0086A453610 = BDROM [SHERLOCK_D1] | V | 0xAFA6699A366052401F7F3062E55EE289 ; MKBv47/FindVUK 1.00 -0xD618AA624408513B8E879450B40A7EDB5DED3630 = BDROM [SHERLOCK_D2] | V | 0xFA2A3DCF51F3353B03049A460E6473C0 ; MKBv47/FindVUK 1.00 -0x49D990AD885770C3A4104B155E8A5667B42B7FEE = BDROM [SHERLOCK_D3] | V | 0xF79C1CC68FFD7AEA3E24B6B2447D1E90 ; MKBv47/FindVUK 1.00 -0x22513E8485385C29A1B8D034C441B0192BAB38E3 = BDROM [Sicario Ejecucion de mando] | V | 0xC5A304BC3533BC2A00FCFB951A21150F ; MKBv14/FindVUK 1.00 -0xFEE7EC3E1F6C5FE125B2CCD71D1F32333E2581FF = BDROM [Spirited Away (JP)] | V | 0x4C7290416A3EC15C01B46CE9961801C2 ; MKBv47/FindVUK 0.99 -0xD1A9631F1987A0A6D761E75DC66D2080306D48B6 = BDROM [The Bank Job] | V | 0xD714848298B09E4AFE620A5546CFF1CA ; MKBv7/FindVUK 0.98 -0x65844D853C5E4F520565F5D5F256A90C6D7DC934 = BDROM [The Girl Who Leapt Through Time] | V | 0x8A6B016E0F5C5F1EE7156069806C72BC ; MKBv19/FindVUK 0.98 -0x343BAE24BDEF501513199A5A0E41D1790711579B = BDROM [TO KILL A KING] | V | 0xD5FC6572AB33C463F69014E60BB32483 ; MKBv4/FindVUK 0.96 -0x46467BB20C7929B9D4FDD069053CE970E0F07A44 = BDROM [Whisper Of The Heart (Mimi wo Sum | V | 0x6D0CC23758DAA1693F63D6DDD704E0A8 ; MKBv24/FindVUK 0.99 -0x59B8290A5224BD2FBB21A7454691D0D1A1D09A2C = BDS1EUE1 | V | 0x6CF6526FA21E2D2476DF6D33D2B077A0 -0x42A2E9165ADE7263D152675E837232CD2B650CC5 = BDS1HLE1 | V | 0x0028C840EECA1C22E0E887E78B39A0A7 -0x7653A6B4DEB9663839EF4B25FA9782EB95DA836D = BDS1JJE1 | V | 0x214947441692524C4A7D8EDC44006F5F -0x74022CF8D62E02A7D82B0DB33902EBB99D20DE41 = BDU_2131 | V | 0x7B8DF497A2B2025217A0C60653262E73 -0xC5BD514FCD1FF9A098E4D9D566387EDDCEC3F2BC = BD_36 | V | 0x23E196E73C05F499E9DE5B04091A572F -0x320F3DA94960CE0F9433128FC68286412FB52BF7 = BD_DONGIOVANNI | V | 0xB6197A0111BF74EA04E2B5FCDDF43378 -0x0822D8A4B3C442E9381FDF796D3780B0673146C8 = BD_FROMPARISWITHLOVE | V | 0x651957F557319C8A6CD4EC6D0D0C40FE -0xA36624F98A5F23A1A1938FF5FF26F2E9C636EE44 = BD_G06 | V | 0xFC53FD098C0F4C9906D912852EA345CD -0x5A8CC112F5BDE203A8D051EB15D5D8118CEEBCE1 = BD_IRON_MAN | V | 0xA31DDFCF88A2FDE9870C917FBDC50E84 ; mkb v9 -0x6DEEDF1CC87829DFDCB86FB058A07EC8D75B7344 = BD_JAVAAMELIEPOULAIN | V | 0xD6E4C2B225218DE6AF2EBBAFE8A62C5C -0x2612E4EEE9B2EEB4388692A1E2FF8B44A6372A12 = BD_JAVA_ULTIMATEGAME | V | 0x687D113A580C53FEE1CC9D446772C1DD -0xDBEF317FC6579DFF8A2ACD55ECD9406588D5DA46 = BD_LA_VIE_EN_ROSE | V | 0x4B60942D2F88E735430564AA0FAC9E0E -0x9A6091A15B3D61568DE1E895BEB95F866101991A = BD_LESTONTONSJAVA | V | 0x1E41E0475162ECCF2BC0DC97726C1D46 -0x11C8E622DC00A7DC819885A081854E964AD8FC14 = BD_LE_PERE_NOEL | V | 0xE843BB9BE33E1D985062DFABFCFD79E2 -0xFE5C294D9519A1808593CCEC99C11F7E7AF52E19 = BD_M29 | V | 0x5263C39EB01B57AB994CD8B8848D9A62 -0x81AE51A52171F9DFFB532D10D8C3E89E6618F4FD = BD_REAUTHOR (Psycho Pass Disc 2) | V | 0x18FE95CC689F5521E1D80837CE09BC53 ; MKBv46/FindVUK 0.86.3 -0xFDC8C51EF563D23522FBF7E6863518FE80FB4CEE = BD_ROM | V | 0x6202366D7A89FD36FD47FC2058C344A3 ; MKBv60/BEE/VUKNOTVAL!/FindVUK 0.98 -0xF40D3CFAAD08D3CA285492F39F7F92F5286CC0EE = BD_ROM | V | 0x524AA6418456966608F3738228C08596 ; MKBv52/BEE/VUKNOTVAL!/FindVUK 0.96 -0x61DDBFB8F5FCF1C0D1F37A828AAB53D7B39C8A00 = BD_ROM | V | 0x981A82A4589E69110EA026E87A46ABF3 ; MKBv62/BEE/VUKNOTVAL!/FindVUK 1.00 -0x8C04D5887661FB6DF2F87C168A5982F65C01A7E1 = BD_SOURCE_CODE (SOURCE CODE) | V | 0xB2A87006FB4FC88635FA64FEC19B1CFA ; MKBv20/FindVUK 0.96 -0x4AB5A375B56377EB37DB171FD033E16CE15DE981 = BD_TWILIGHT_2 | V | 0x60D720BE834FA9FB12EABB2A602106C5 ; mkbv16 -0x8092A66B67C7477AE550106F38226A33B90A5178 = BD_VIDEO | V | 0x875989CEFABDCCDAACFB9085583B01F4 ; MKBv57/FindVUK 0.96 -0x346E2DBF7DF7A1A6327032AA8CD046D5CB3CABFD = BD_VIDEO | V | 0xC17DAF13ECB40E749D4B8BE7C0A2F5FC -0x726CCF0AB439328C4CDB20E0977565C7131794C9 = BD_VIDEO | V | 0x011DE2452F6C312B3E9C21D2FAAD5AC1 ; MKBv35/FindVUK 0.99 -0xF1F8B8FC2CD125EDCCD80547748A13C92F528F99 = BD_VIDEO | V | 0x820B9E83E9E2369C051C2C7251E35333 ; MKBv35/FindVUK 0.99 -0x7BCB70CE15A9B6EFBEF579956AC5AFC015609DCA = BD_VIDEO | V | 0x412F69A5F69F06EAEB2D50494F9E09ED ; MKBv35/FindVUK 0.99 -0x63A1E75284412DC557BC3375DA87B0FB759B44C1 = BD_VIDEO | V | 0xF82282E896CF60CBF959014B415BE21C ; MKBv35/FindVUK 0.99 -0x07ADDBD4839D485C3D3ED49CE5E84D3709BE591D = BD_VIDEO | V | 0x2C123E9F382B1838004B51C412074AAE ; MKBv8/FindVUK 1.00 -0x702E22190FC8A09B3D641739C23CD67FECE14F9C = BD_VIDEO | V | 0x502758F7D072B868CA82E4DD8AB036D7 ; MKBv12/FindVUK 1.00 -0x68468B8D5A331FDBA099E8EAF1835640699A0A6D = BD_VIDEO (?????????????????? Treasured S | V | 0x0A7CC1599F1953A5BC5128C0A5462161 ; MKBv47/FindVUK 0.92 -0xD44A6F89CDC21B0609F0CBC27CE57ABEB874AF55 = BD_VIDEO (?????????????????? Treasured S | V | 0x5EB951D8771D38BBD62C9877DF851919 ; MKBv56/FindVUK 0.92 -0x9D7C7F8CD40AE1E3730E3EF2FA37017391B4E0C4 = BD_VIDEO (Demichan wa kataritai 3) | V | 0xCA5CAB4B34227CF060E16743C0C3DC05 ; MKBv62/FindVUK 1.02 -0xFF465B09DACABA2C1B8CF74D6F59CF27D10F37B7 = BEAN_MOVIE_G51 (Bean: The Movie) | V | 0x9A6EB400EAE9F0F57A62197EB453A9EF ; MKBv18/FindVUK 1.00 -0x83A68C838E11DD4A263ADDA3C2F754204D2C9422 = BEASTS_OF_THE_SOUTHERN_WILD (Beasts Of T | V | 0x70E8400207FE9F79AAC87636AA717C76 ; MKBv34/FindVUK 1.00 -0x2465A419A32506EF7DA1CF7CB4D14B35CF87FF64 = BEATDOWN | V | 0x73A0E159C2B8756703718ED446474F42 ; MKBv19/FindVUK 0.84 -0xAB8070B2D2F2A0C8390D261806CC77238DEBC25E = Beatles (Beatles) | V | 0x2E6D5175AF56501A67C3B163ADDA32FA ; MKBv62/FindVUK 0.98 -0x9FC3ADA36C45762EC9EF04CF075E04FEA2AADEB5 = Beaufort | V | 0x25D9AB1676B6DA82AB81F71E93378FA4 -0xCE7D20148CAE77ED3C37CBA6874DCBC485E40238 = BEAUTIFUL CREATURES | V | 0x10169FD25CB7221B52B8E6DCF087D229 ; MKBv39/FindVUK 0.80 -0x1A43379B45362E5BE9B18DBA5F83A896048BF75E = Beauty and the Beat (Beauty and the Beat | V | 0xC4D9B781402012397B3C6479D6B3E681 ; MKBv44/FindVUK 0.96 -0x5E387448CB99EE018B7CAB2E938A32DCCCDB14BA = BEAUTYANDTHEBEAST | V | 0x0307AA264A5FBEAF290E1176A87AAC8D -0x76CBD730DFC0F89686ED9D1AB1529E1588EA7A55 = BEAUTYANDTHEBEAST | V | 0x705D7A1C573D56390E7793D7BA7B50B6 ; MKBrev 16 - FindVUK 0.53 -0x277F0FC05533BD6C0D62651E39B8512BF218EE34 = BEAUTYANDTHEBEAST (Beauty And The Beast | V | 0x92543A32A81AADFF5282EAFD0171ECD2 ; MKBv35/FindVUK 1.00 -0x623E0149445808C9428832456B2FE9F3E4C6F9D7 = BEAUTYANDTHEBEAST (Beauty And The Beast | V | 0x394C9D26AE55D88891798AFABAC24DAB ; MKBv36/FindVUK 1.00 -0x2A7B58B768408EFA52778C105A8D903AB64BDAFF = BEAUTYANDTHEBEAST (Beauty And The Beast | V | 0x841BB21C1B24D2C023A97690171B4B7A ; MKBv35/FindVUK 0.92 -0xC042C6D41ADD3AA2F868DEA51A176A6B456AACF5 = BEAUTYANDTHEBEAST (Beauty and the Beast | V | 0x59258508F2DE0B88AFD6C53055744805 ; MKBv17/FindVUK 0.94 -0x81AB01C92895D87911DAE27802A801DB5162A0A3 = BEAUTYANDTHEBEASTD2 | V | 0x418B1C02C973CC05D514F152FDD38108 ; MKBrev 17 - FindVUK 0.53 -0x74867F933A2679419B291BC4332CB6BE214F4CB7 = BEAUTYANDTHEBEASTD2 (Beauty and the Beas | V | 0x55298ACA505F6752B436C133C0840F12 ; MKBv18/FindVUK 0.94 -0x361CA3B26EF8972B3D0A4EF3C9DE957CAED7FE3F = BEAUTY_AND_THE_BEAST (Beauty And The Bea | V | 0x96108346FDCA443164B202C6D6F2BD51 ; MKBv57/FindVUK 1.00 -0xC7D345989566E4D42DCC0C057CF2EC396675D071 = BEAUTY_AND_THE_BEAST (Beauty and The Bea | V | 0x23E2850DD551ED8B8113CDDBD0C63EF1 ; MKBv18/FindVUK 0.96 -0xEB4E15E3D65E18FF144C54291F6E499FA5F7E4DF = BEAVIS AND BUTT HEAD (Beavis and Butt-He | V | 0xEAEBC8559FF9E0678B107900B6195547 ; MKBv26/FindVUK 1.00 -0xDAD3635ACC84B4A1ACE7DCC74077096B66F3B148 = BECKET | V | 0xC4D204F3BAFE4CCACEB6301FF77C2C6B -0x0D2C393D51933B87BA15246BD1005B11D4EE54F2 = BECKET | V | 0x95681AECDA02513804FD17CF42874184 -0x18E9A3664688C142B34A907A108D3F69737B7CA9 = BECOMING JANE EYRE | V | 0xA442F853C224812BA889CF0ECC13C879 ; MKBv33/FindVUK 1.00 -0x61FBBB18D43C4F621C21BC442C1E2AD74CE1FCC5 = BECOMING_JANE | V | 0x5A8624E7F829F079259C8D419D28DEBF -0xC38E94C9C27595154ABAB475BD05D86C0FA7C1CE = BeeMovie (EU) | V | 0x43396274BF426972E98CDC8D4A0363B4 -0xF2E9B317555E671C4E460440FA8F3DCE5DE601EC = BEETLEJUICE | V | 0x75E7B0076DBD05DAEC6008F5A67C6FAB -0x9405B9649EB16840D97CE5358E1908A6B52E1D97 = BEETLEJUICE | V | 0x59BD7E6E9E98656CDC2F4E0C40271AE7 ; MKBv7/FindVUK 0.96 -0x91CC97949B382A785D65A5298E7A9055858BB8AD = BEE_MOVIE | V | 0x1555C076D9B0AB67F0476E70D5E3A63E -0x4ADC1835B8C2E886783B8659CEDEFEC1AD4AF789 = BEE_MOVIE | V | 0x5D70E18B50AE0BBAE69BE97010DCE38F -0xFA7F8E3F0F58F8B16B2F19BB0AA7D9219B92F26A = BEE_MOVIE | V | 0xBE11826C82BD6DFDC0BB582D3D933209 -0xD74C49F29CED465C79DD97EFCB43B5865DF73BD1 = Before I Wake | V | 0x6787D91E6EFF17B60FFA90C49CCBB555 ; DateDiscID: 2017-01-27 -0x855CF7833896BCABC4F003CC354A2977474638AB = BEFORETHEDEVILKNOWS | V | 0x709FF432ED8C8323F6EAFEFC0D2E35D6 -0x78EF7E34F33DEA38EB7C69384CF47CDF98A2FE90 = BEFORETHEDEVILKNOWS | V | 0x8C9A55BEF62D3E9362EF8680C05A6E3F -0x7B3ABF537D7A96B1457AE0133664E8DFDE3E91F5 = BEFORE_THE_FALL_OST (BEFORE THE FALL: FI | V | 0x71709AFC78329C86504D211BC06C725E ; MKBv56/FindVUK 0.92 -0xD4533C959DABE61A1875A52EFB70F7DDB3796EE5 = BEHIND_THE_CANDELABRA (Behind The Candel | V | 0x24A7C31DBAD74E86F2EAE8F4EE881069 ; MKBv36/FindVUK 0.96 -0x227CFE32FFF73339C438B7B0FB86857098337249 = BEING THERE | V | 0x32A0AE3761EC916ED976D10E4089FE25 -0x7C63FC6AB4364666610E9D83AA6CBB07D7327954 = BEING_HUMAN_D1UKBD | V | 0x167E0EE5F241282B9768B4A7D3DD4DF5 -0xC2D0060CA2C70416C8009AF65700523FF1CB69AD = BEING_HUMAN_S1_US_D1 | V | 0xAF5EB0B22005D5D353D4DD94523F88A9 -0xDD03946A637EC13560B132DF7B79A98E7173A8EC = BELLA_LOVES_JENNA | V | 0xC7DD7DAF279EDF45476F09B5FE020FA0 -0x19C15EE42AFE2BC5461F19930EC94134C8D0E97D = BELLE (BELLE) | V | 0x0F4C36FBF02D9861098B40E4E26240ED ; MKBv44/FindVUK 1.00 -0x80C347CFE35A47C1229A4EFAF97B2CAB50DCB922 = BELLE_DE_JOUR | V | 0xE655E3EAC1AC6F2A12CFBB81DEFD7DE7 -0x667379306A4BD2BA2A3B8146E28F1527B0FB8C71 = BEL_BD | V | 0x31D0F618F7DBD37C1E8191BFE6F24579 -0xEDD11DAB63DFEB613631167E537B303FAE30789C = BEL_F4 | V | 0x940ADD2B7536FB08AAADAD6731C43136 -0x97544A21A5149B5E206D53E1538D55C0988A9B33 = BEN HUR 50TH UCE BONUS | V | 0xAA756A1FF3D7B999A193D6A3800350A2 ; MKBv19/FindVUK 0.80 -0x0F36D970EE3C75A87F5AB4079FFC839BFA978DC1 = BEN HUR 50TH UCE BONUS (Ben Hur: 50th An | V | 0xC98AC9DC9C3B9D40BFD70C2DA521EF24 ; MKBv19/FindVUK 1.00 -0x0F48AF285DB81A9E1202BE739BE71B62F58FFF4E = BEN HUR 50TH UCE BONUS (Ben Hur: 50th An | V | 0xDD3B5BCDAFF00BBDABD69C6B2624B18F ; MKBv19/FindVUK 0.96 -0x3134CAA44940FFD0F8B841EAAB53D6EEEFF6FB95 = Beneath Planet Apes | V | 0x287148B6DA2FE206C0708973312CC965 -0xBAFC4D76D06B11EB00CE64C9DB57F522665B43B5 = Beneath the Darkness (US) | V | 0x7866468127A7C9954BB0D7486FB6F2CF -0xAEDC335AED3EEF65DE2E1463FB341301E6A0A4E8 = BENEATH_PLANET_APES | V | 0x43384E66999A1AAB4AB23BEABC5C830B -0xBDD990671CFFAE7D0A2816F86BED3E57C3D48AF9 = BENEATH_PLANET_APES | V | 0xBA1937C29D1A8A0479A2F800D81A06E2 ; MKBv10/BD+/FindVUK 0.80 -0xDBBBA58686FA66AB88C13502C463F53322F7D3C4 = BENEATH_PLANET_APES (Beneath The Planet | V | 0x5ACC68418FFE47657D1C17D1FA9129B5 ; MKBv9/BD+/FindVUK 0.96 -0x87B023D6820A385741E1DA950B2A5C5668108817 = BENEATH_PLANET_APES (Beneath The Planet | V | 0x2EB84D0265764DCD03C30B222C156B88 ; MKBv10/BD+/FindVUK 0.96 -0x8D139990F152E666EDDD2C36636FC064D2995329 = BENJAMIN_BUTTON_DISC1 | V | 0xBA8C3FBC1BF76933E4CB96B615912EA0 -0x331B0EAF5E9DA3457E78DB46DF0AD35F21F157B0 = BENJAMIN_BUTTON_DISC2 (The Curious Case | V | 0x2156B6D6C1A00BFAF2E4F9AC6F04AD0C ; MKBv12/FindVUK 0.96 -0x5B63F4F837A29ADF71C0BB5BFCB615B58D47829A = BENNY_AND_JOON_BD | V | 0x579F48E6DAD75D251BD46368870A1FEE ; MKBv21/BEE/FindVUK 0.80 -0xBD34210A99028BCE63A3265AE32525A06A96EED4 = Ben_Hur (Ben-Hur) | V | 0x3703AF6A6D73B19E125E0A76D9EA32F1 ; MKBv58/BEE/FindVUK 1.00 -0x6CAF46E38C10BFE3079A328ED93EF1581C07A5FF = BEN_HUR_D2 (Ben Hur: 50th Anniversary UC | V | 0x9AA48BC7A0E7AC6FEA8F96909FC45C69 ; MKBv23/FindVUK 0.96 -0x250466D2C6508BD3AEF9968D7D941C4872DAD750 = BEN_HUR_D2 (Ben Hur: 50th Anniversary UC | V | 0xBA19C03DD1B8845C01B59FE866BF0D38 ; MKBv23/FindVUK 1.00 -0x8BC3515B428DC4845141E5751B26FD24FF91261B = BEN_HUR_D2 (Ben Hur: 50th Anniversary UC | V | 0x6AD60E3BDA488EE37589C9F7B4F3E315 ; MKBv23/FindVUK 0.84 -0x7B36D87EC57A1766A815EB386C175BFB4F449B94 = BEN_HUR_D2 (Ben Hur: 50th Anniversary UC | V | 0x1EE9198A4BB5D98F1931D50A88044EDA ; MKBv23/FindVUK 1.00 -0x49ECE31B82149411C60EF40E4E2678C6655D7D55 = BEN_HUR_DISC_1 | V | 0x7DA7B65E80335A6AB7BFA7EA936515B9 ; MKBv19/FindVUK 0.80 -0xEC937DB8E0F62A69E4952EB67432B8864F537E3B = BEN_HUR_DISC_1 (Ben Hur: 50th Anniversar | V | 0xA4050CD4F510D6231FD61B7575D121B9 ; MKBv19/FindVUK 1.00 -0x7C9982BC44F92466759EAEC729E18FE1B9EEDCEC = BEN_HUR_DISC_1 (Ben Hur: 50th Anniversar | V | 0x718375EA9583A431DEDD6F8058CCB8C7 ; MKBv19/FindVUK 1.00 -0xF24412E3A2087F352062A8CF3A3C02258964A686 = BEN_HUR_DISC_1 (Ben Hur: 50th Anniversar | V | 0x2FE4C76B847CDE592B132A62895AFFCB ; MKBv19/FindVUK 0.96 -0x40A6D07275572AAEF9A939A074AAE4786FE6F59F = BEN_HUR_DISC_1 (Ben Hur: 50th Anniversar | V | 0x9B70B281A64A3349C6F36F0135D811C4 ; MKBv19/FindVUK 0.84 -0x2ED4496AA9CE1C36954A0618FEB7161AA7AE0CFE = BEN_HUR_DISC_1 (Ben Hur: 50th Anniversar | V | 0x4246D5A62F740E613B1D9872174C5285 ; MKBv19/FindVUK 1.00 -0x09F34587187042D9359CD91CC942859EF5C7574C = BEN_TO_CS_D1 (Ben_To_CS_D1) | V | 0x51C9972C28019F8AA42B31A30EAB7BD4 ; MKBv50/FindVUK 1.02 -0x6F47050C27962F36702287D50DFDE993589C108B = BEN_TO_CS_D1 (Ben_To_CS_D1) | V | 0x81702D9DD62C30CC81257C1771FFD2E3 ; MKBv50/FindVUK 0.86.3 -0xB2325D81395EF3BCA167420E2A618D20D22836C2 = BEN_TO_CS_D2 (Ben_To_CS_D2) | V | 0xB8A368ED3928A7F0E3DDEB314B8CDAB7 ; MKBv50/FindVUK 0.86.3 -0x4E91335B9A7B6CFEC5B9555A9E3C1F374D844B81 = BEN_TO_CS_D2 (Ben_To_CS_D2) | V | 0x940965E47DDF27B165A51542568E7A5D ; MKBv50/FindVUK 1.02 -0x20830641DBC58DA1FDAD2797673B5F38B167E276 = BEOWULF | V | 0x140DBF8A37A13F6813249D417484CA7B -0x9A032728932B7F673BE076FDE0F8765885D36878 = BEOWULF (Beowulf) | V | 0x2B5C7AACFD85DFCBD542C13F2BA8C93A ; MKBv7/FindVUK 0.96 -0x6826A341CE11FCAFA9F4AF52A8B7195415E3027E = BEOWULF_B5 | V | 0x7E8EBE4F908378C227683031631E551B -0xA8A349FE83475E70766CA7FFCEDE51837BDB99EC = BEOWULF_B5 | V | 0xB0B5F27A2E5195BCC19E9FC7033D8639 -0xE9FD010592625FC65F820F3F2779CB5594337ED9 = BEOWULF_JPN | V | 0x99E3279EEAE23070E2F559123B4DC51E -0xCF72229BA957A226168423C92D02A2F0875C3541 = BERLIN_CALLING_FILM_AND_MORE | V | 0x225C269C831A4CC7A38210108C45FDFE -0x039383E4C8E4ADBF0B7911533B88C651819FA28D = BERSERK - THE GOLDEN AGE ARC II (BERSERK | V | 0xA5CCB31B7833DCA5F8170A9950851659 ; MKBv39/FindVUK 1.02 -0x6A1CD1388FDCECE21FF5D3A4B98D02C9944E68F2 = BERSERK - THE GOLDEN AGE ARC III (BERSER | V | 0xE3C1A8888DDBF0E6CB549B0DD64527F1 ; MKBv46/FindVUK 1.02 -0x6324C0F4FA45B153F9D25C8FF47C003FE9725CA1 = BERSERK DISC 1 | V | 0x6AE5AEC70A630EACAA42E5CB68EFFB4E ; MKBv47/FindVUK 0.96 -0x2F2EF855FE0EB86F52610CD3B36B7B666FF8E16C = BERSERK DISC 2 | V | 0xB004BF1EC63075D77DAE00C0F48F0F1D ; MKBv47/FindVUK 0.96 -0xDAF2A13C2C8C8E99698A663D1EE66B06B9153415 = BERSERK DISC 3 | V | 0x27409B08707F472A8CEEBB2841E6774D ; MKBv47/FindVUK 0.96 -0xCDC9AC1A28D61D490AC6BD1F3B3EA8CD83F40ADC = Berserk Movie 1 (Berserk Movie 1) | V | 0x312FFCB9AA7C27653CE21D7BACA76A6C ; MKBv31/FindVUK 0.96 -0x69EC1E83B4F115A93890E0F90E1D8F4F6B4A5777 = BERSERK THE GOLDEN AGE ARC I (Berserk Th | V | 0xC691ED095721A83AA1EA93C7C396023D ; MKBv31/FindVUK 1.00 -0xC584E359A423C9324F8F083CF799ECD219E5A3DE = BERSERK THE GOLDEN AGE ARC II (Berserk: | V | 0xFE9D349E957DBA4B0D07DA2DD047D012 ; MKBv36/FindVUK 1.00 -0xCE82F7A91021DCF11C7B47D6C8E0963939B81B25 = BERSERK THE GOLDEN AGE ARC III (Berserk: | V | 0x24AA3CF794B1BAACD3F8CFF08319AB67 ; MKBv46/FindVUK 1.00 -0xB7140F0AAA05D3A7DE845D609BF2857A4B6C8D55 = BERSERK_01 (Berserk -1-) | V | 0x0CB69DBF11F44C15550341A0A6AAA29A ; MKBv35/FindVUK 0.96 -0xB450954FCD156D747354E228F8019D00389CFA91 = BERSERK_2 (Berserk 2) | V | 0x3C7E015D53EA75E7F9C79A2624819169 ; MKBv47/FindVUK 1.00 -0x6E52053C0945164A9A0F0BAA8010518EA74DF67F = BERSERK_3 (Berserk 3) | V | 0x6EB50936172AB5C2AD3EDF0801CEBCA0 ; MKBv47/FindVUK 1.00 -0xE7437309B2AA99853195254A1FDDABA3C9D6BD80 = Best of Unser faszinierender Pla (Best O | V | 0xFB859B78B30FE2D6A21D5C9BBAD9D83F ; MKBv39/FindVUK 0.96 -0x313E9C44CD1388B9CC4E4E20E6BDA9AC6E310F45 = BestFictionTour | V | 0x221C5036A1C67151D2F45AC3DFB8B404 -0x3D37C6CAD3520280D4EBF647438BFBB3A789FE8C = BEST_EXOTIC_WW (THE BEST EXOTIC MARIGOLD | V | 0x9B3BD036558ADF1CA66AD29BDEEEC32D ; MKBv20/BD+/FindVUK 0.96 -0x011789F79AD78C7A4926C20F05F0DDE2C5EDE8CB = BEST_OF_TRAVEL_AUSTRALIA_NZ | V | 0x1EDB0695EC823BB7A52B8B7B5D01C7A3 -0x684AE75A24744B203D5CB567CB7DFE79BB16534F = Better Call Saul S1 D1 (Better Call Saul | V | 0x62D99F115A3C1D6D0194690CAA502F43 ; MKBv57/FindVUK 0.96 -0x0E1C0D9BF17FB474DD7394F0149756285F41E85B = Better Call Saul S1 D1 (Better Call Saul | V | 0x587482B90DD2109E51FC99D68C2C3B25 ; MKBv57/FindVUK 0.90 -0x944087174EB9296461FBC6B4970AA0865067DEF5 = Better Call Saul S1 D2 (Better Call Saul | V | 0x462238C3356C14FB4F4FF7DBF8052E28 ; MKBv57/FindVUK 0.90 -0xCD445AAA7EC3288B6229BFBE511EF6D689C78D6E = Better Call Saul S1 D2 (Better Call Saul | V | 0xAAA90DAD134372249FD177697DE8EC1E ; MKBv57/FindVUK 0.96 -0xB267A3A5D5D1E8F0F7D82C2045E275169A6E9DB0 = Better Call Saul S1 D3 (Better Call Saul | V | 0x28778A1186A3D802ADC3A39063F66B52 ; MKBv57/FindVUK 0.96 -0xACF70660E1561E0C656E7B7F84355772C89D1147 = Better Call Saul S1 D3 (Better Call Saul | V | 0x46F595D6F44DA810A0C2422B1C5A458C ; MKBv57/FindVUK 0.90 -0xF529ED828892F79C267EA8677EAE203A5F30A1FC = BETTER_CALL_SAUL_S2D1 (Better Call Saul | V | 0x1B9236C3AD88DC26F2591BFE5750D632 ; MKBv62/FindVUK 1.00 -0xBE558038C9402DD6F80E70BD5186BFDC112F3505 = BETTER_CALL_SAUL_S2D2 (Better Call Saul | V | 0x397760B93DD269001D45022294BB61A1 ; MKBv62/FindVUK 1.00 -0x9D028CA29696035B96770F7D5D0CDA7E053AEAE6 = BETTER_CALL_SAUL_S2D3 (Better Call Saul | V | 0xB9B0BE9A3FD73205533EF328F56E1966 ; MKBv62/FindVUK 1.00 -0xC17CD6FA8AA38F31A5D8050ABB87335998EDA6E5 = BETTER_CALL_SAUL_S2_BONUS (Better Call S | V | 0x95FFC5550E94ADF1B47AFDCFDAE45500 ; MKBv61/FindVUK 1.00 -0x4F07673429EEBD011E3785FF8739772408F4EB1D = Between The Buried And Me | V | 0x691DC9AC2EC028CEE01DB18FDB623913 ; MKBv32/FindVUK 0.93 -0x10618B0BD060DA504C1295AC3C5F6D306B9EB5BB = Beverly Hills Cop II | V | 0xEDFEB0F3842445A12899E9CCDF2176BA ; mkbv31 -0x7823F014FB2D68F6E734C198DAF8C2015E7B2BBE = Beverly Hills Cop III | V | 0xBB74A389D5DB64BC0C2686CC302BEBA7 ; mkbv31 -0xD8E1D30A21F05A2772C60E6D38938A7634FFBD38 = BEVERLY_HILLS_COP (Beverly Hills Cop) | V | 0xF89D797F26FB2C84CA7B6CF435ADB771 ; MKBv23/FindVUK 1.02 -0x22B9BC1D0D57E896EDA278C75B2D7E314C1C6C17 = BEVERLY_HILLS_COP (Beverly Hills Cop) | V | 0x362A361B160F55AC788D696062CE7459 ; MKBv26/FindVUK 1.02 -0xF8C4732B996C1CD2689A05B7397B5921F81EDCCC = BEVERLY_HILLS_COP_II (Beverly Hills Cop | V | 0x424581C6CA152722972BBCF45B7E92BF ; MKBv31/FindVUK 1.02 -0x59EE099B7F054DEDD7E4DE08E30376E592728C29 = BEYONCE I AM YOURS | V | 0x542F883788F5E0B0662A632D8EA9BF52 -0xA6834A480197884E109AFDDF81E30B1A63D908E0 = BEYONCE I AM YOURS | V | 0xCAE4EA40052D11DC618ABAEC56DD5597 -0x70405A23DA6DC955CFF3158DA5ED9E1AD8F416AD = Beyond a Reasonable Doubt | V | 0x1722C8FCB644B779E6E954EC5F633A39 -0xB0534BC65FFE2A375BB3DEA76A8C639561DD54C5 = BEYOND A REASONABLE DOUBT | V | 0x0D4828710ECB052BD8E5522F886DFD83 -0x17711FD465F0FAF4568FC92DFAABC58AF5D6EDD8 = Beyond The Boundary BD-1 | V | 0x2453796EB78B3AEA758F3FB6C4FCA165 ; MKBv57/FindVUK 0.92 -0x8B81BA5CF6106324F9C66EA3329B02ACB6683DFD = Beyond the Boundary BD-2 (RE) | V | 0xBF4CB9126746953AA0204A0BAC6E087E ; MKBv57/FindVUK 0.92 -0x8FC046ABB4F861CD6C1AF97F83765E19E06B3FF3 = Beyond the Reach (Beyond the Reach) | V | 0x70E2872F3BC70C56B92834FC8287DA0C ; MKBv56/FindVUK 0.98 -0x9EC91F4A67509F6D2A797C3896DB2D494954C1CB = BEZAUBERNDE_LUEGEN (Bezaubernde L??gen) | V | 0x5488FE1E79001D783384E29E81E73A69 ; MKBv31/FindVUK 0.89 -0x244DADACB9D686404302E15206D213EEE98BD14E = BFG_3D (BFG - Sophie und der Riese) | V | 0x1C53C5E468898919D911179606E239EB ; MKBv62/FindVUK 0.96 -0x5D7D6E6B937ECF9C17A44C675F6B3A33E651207F = BFIB1219__BD (Farewell My Concubine) | V | 0x60C161B28D1B5CD62C5324AA1203A078 ; MKBv58/FindVUK 1.02 -0xCC483F14B2D504AA7E067CC21593DBF4EC5EAF93 = BG_BLOOD_CHROME (BLU-RAY) | V | 0x4037102E2897ACEC6E037A32F5BEAEC4 ; MKBv39/FindVUK 0.90 -0x89CA9F3C270BFD9EE29306CD8B596F7CC85BF120 = BH0x090701 | V | 0x09AD771C3C2B052D2E66E95547E921D5 -0x9F46A3055AA52AA68A17B41BBB86EF0465B7D9AD = BH0x090901 | V | 0x70AB876387BB08853CA418420EF4E881 -0x32F286355E39E4607A380D7AD14F577BA05516E6 = BH0x100901 | V | 0x89A87E5C5ABBB44D1AFE3F83FD3D9D81 -0x8CCC9E2EF24EDF4C9099D5B3FBE399B0C9B55D24 = BIG | V | 0x8EDBBB8FFB3515C3EC791A400A8C0F80 -0x5CE10BE39D726BAD7371EFD75FCE05B2CD1D2CEF = Big Bang Theory s5 d2 | V | 0xE4AA81E8C470F896F1274B7D8F60019D ; mkbv27 -0x2CEB10749A98A172D23BEF7218768B8DE326A8DE = BIG BLUE | V | 0x4FAD626CE5BCBFA0B07E635E00AE45F0 ; MKBv15/FindVUK 0.80 -0xEC93C34DAAD28FC093A33C227CEDB77A248EE331 = BIG EYES (Big Eyes - Blu-ray???) | V | 0xCEBF612E22A0CB594968AE0322D75A40 ; MKBv54/FindVUK 0.92 -0xC128E7F484C0D6F00B61B1A53ED9B31AED74BD95 = Big Fish | V | 0x32072F269440B998EAB1F8D107A75972 -0x2745F7455949CF34D7F69A3E1ABAFA6807E463FB = big fish | V | 0x9BE4418702414AAAC38A2D18B9AE5978 -0xAC740AABDFDDBE435964259A5A00298021B89B2A = Big Tit Inavasion | V | 0xCB879B9CDF1DBA740D5951090991BDE5 -0xF774D6E285DFEA2ACF9BCB048C82C6E5656E65F5 = BIG TROUBLE IN LITTLE CHINA (Big Trouble | V | 0x3ED0B7EACC3127B87ED82944DEB77B89 ; MKBv43/FindVUK 1.02 -0xF8C8F8D9E6AB890AD5BADDF0FA05F781672F95B6 = Bigfoot | V | 0x4D882035B6B274B63711128762B0E58E ; MKBv31/FindVUK 1.00 -0x696B0627A740A0E82D3A5842A0D57DB967ED30EC = BIGGER_THAN_LIFE | V | 0x3A78C72A24F04BDC9C60B6FD10F24A87 -0xD245DFD69526067725DF274B91A575B42AF99580 = BIGGLES | V | 0xE9668D43B71559125DA38FDB5137EB33 ; MKBv53/FindVUK 0.94 -0x76F7CD1580443E11DCD90EA23014ABC8D586CA27 = BIG_BANG_THEORY_S5_D1 | V | 0x7A9D90266B317E54B1F50C957657EBA2 ; MKBv31 / VukExtract -0xAA1AC96DA1EED889C4C8ED08634FF9B1E7B71669 = Big_Bang_Theory_S9_D1 | V | 0xB6106283767FB32AE4C6051AF45D8DA2 ; MKBv62/FindVUK 1.00 -0xE5379992739419906FDF0BA558962ED7C052F994 = Big_Bang_Theory_S9_D2 | V | 0xCF0988D01288C3452FC10E2280DAE1B8 ; MKBv62/FindVUK 1.00 -0x5432531042931AEABD13328B441794C2ACB8D954 = BIG_DADDY (Big Daddy - Blu-ray???) | V | 0xB194EE7CD438F687F47B485770473AB5 ; MKBv19/FindVUK 0.96 -0x42B2E4C0509AD324983A5691255665D14149876D = BIG_FISH | V | 0x91238550D1E36E2E1D74056B91C2E9A5 -0xB644F912394BBEE5971EB7CF8CA4B421A154FCCF = BIG_HERO_6 | V | 0xB78FA084B431C43340CB4729F7E32775 ; MKBv47/FindVUK 0.84 -0x791E31AA78CD48EBD84D9D30484D14B6E5E78142 = BIG_HERO_6 (Big Hero 6 - Blu-ray 3D???) | V | 0x47EA799B8DA3A853E924DB6B160827F6 ; MKBv47/FindVUK 0.83 -0x3E60292EE34688BFA88A2CC102E03C641A4730D3 = BIG_HERO_6 (Big Hero 6 - Blu-ray???) | V | 0x7D0AFB10A107FA3FE53989FB0997E3A5 ; MKBv39/FindVUK 0.87 -0x9E3C286EE45F9A55B57E101DF53621103FABE08E = BIG_HERO_6 (Big Hero 6 - Blu-ray???) | V | 0x9C9C0C5629D499117E1E06017E27F582 ; MKBv47/FindVUK 0.96 -0x8CD1701673FDFBAE3E9D62903D53D05A990C19E4 = BIG_HERO_6 (Big Hero 6 - Blu-ray???) | V | 0x97328322ADE930642FC62657B672B8FD ; MKBv39/FindVUK 0.92 -0x7825690B834B47E16CAD4452B9B35C759DA9832C = BIG_HERO_6 (Big Hero 6 - Blu-ray???) | V | 0xFC374A8B63AECDACFE3A6E1690DB2434 ; MKBv47/FindVUK 0.92 -0x54D20A73DB0205C912E55A706E8E38192D5D0AAF = BIG_HERO_6 (Big Hero 6 - Blu-ray???) | V | 0xB75B702BC9C5357B1A76E0305C2D33C8 ; MKBv39/FindVUK 0.90 -0xFF7D1B4C632E1C6FE2837284D862CAED20DC7575 = BIG_HERO_6 (Big Hero 6 - Blu-ray???) | V | 0x71E094B9E94B215F354E1997BA6F61AD ; MKBv47/FindVUK 0.83 -0x436F4FB5AC841EA84A948EC88B7F88324B31DB85 = BIG_HERO_6 (Big Hero 6 - Blu-rayâ„¢) | V | 0xB668F87823284DB0F852D711DC138EF0 ; MKBv47/FindVUK 1.02 -0x551BDEB3134D875284B3CCFF5B5F903175E014EC = BIG_HERO_6 (Big Hero 6 - Blu-rayâ„¢) | V | 0xCEBAA4910C1A6E8AD5A0A33AD1B11996 ; MKBv39/FindVUK 1.00 -0x01D422918086470945B39E20644A38C2D4DCA7FC = BIG_HERO_6_3D | V | 0x2157005CD7FF52BD1E06592AE8C992DC ; MKBv39/FindVUK 0.81 -0x3EEA3194DC36F01B488BB645B87448B74CC7E070 = BIG_HERO_6_3D (Big Hero 6 - Blu-ray 3D?? | V | 0x15EEEFD57CF36E5389817992F1D84766 ; MKBv39/FindVUK 0.92 -0xCC6BFE79081F804671A7C54EED855C1E410BDE79 = BIG_HERO_6_3D (Big Hero 6 - Blu-ray 3Dâ„¢) | V | 0xE30F6C3CFA3CA70B59CED30AE39BFADF ; MKBv47/FindVUK 1.00 -0xC1ED63D80FAB3794325E90DD00ECC9DB4BA81FD2 = BIG_JAKE | V | 0x89C2B01E94D8802C3816E3E2DDF00801 ; MKBv23/FindVUK 0.82 -0xAF5ED11968A0FE69F41F280A26D1E31B90DE61FF = BIG_LEBOWSKI_G51 (The Big Lebowski) | V | 0xC581925D13109C7266FD2ED493B5D0C1 ; MKBv20/FindVUK 1.00 -0x0E11334D16B1EDB000F7917363A71A9E6D41EA2F = BIG_STAN | V | 0x9E6540AA88DF23573CDD7F212C12BF1F -0x04CEEC950694729D3AE45EFACEDF63F2BEF65EE5 = BIG_TRAIL (The Big Trail) | V | 0xD68A54B6C0B961EE2295F250AD0A0649 ; MKBv20/BD+/FindVUK 1.00 -0xBFEC71213BC54997D0B0F5CF031FE837F60F124C = BIG_TROUBLE_F2 (Big Trouble In Little Ch | V | 0xE94565FAB30D04B3C00B21BF8492D261 ; MKBv12/BD+/FindVUK 1.00 -0xB14EBF8DDC679B347A03871B934D9CF77C88E450 = BIG_TROUBLE_F2 (Big Trouble In Little Ch | V | 0xFD570C2368AE01033B9097043E7266F8 ; MKBv12/BD+/FindVUK 0.89 -0x60008FCA0D0C54EF8992DA9942422B18D7CF7831 = Bikini Destinations - Triple Fantasy | V | 0x1C2089E9B59E4F80587251AC97C0ACFB -0xA045C40EC3E757F32EB1B88C399C99EEC4D94BB9 = BILLIONS SEASON 1 DISC 1 (Billions Seaso | V | 0x6350D9BF95CD909A48B19D4130E7AF8A ; MKBv62/FindVUK 1.00 -0xED9A7B1FCEAFA677721C89BEF64DEFC6DB536C89 = BILLIONS SEASON 1 DISC 2 (Billions Seaso | V | 0x3F5493643C1C0B80BB2AAFE9C5C71E63 ; MKBv62/FindVUK 1.00 -0x032E70E1C6DEEA19B68AC275B56F72169DB7B702 = BILLIONS SEASON 1 DISC 3 (Billions Seaso | V | 0x427444B1BFCCFEB4CFBE3FF179D97877 ; MKBv62/FindVUK 1.00 -0xC6EB168854CFEB4047533D65EAEBC94FB2CFD242 = BILLIONS SEASON 1 DISC 4 (Billions Seaso | V | 0xD4515C0ADF40C83E4927CB201BD30691 ; MKBv62/FindVUK 1.00 -0xE2AABB13FA75791BA80BFAAE6FCC63A4E21511C6 = BILLY_MADISON_G51 (Billy Madison) | V | 0x3CA9718310AEA90A5FB02E6E027DF338 ; MKBv17/FindVUK 1.02 -0x97BA0CEA3EC25FC4816C453F6A99B65172A8C8BA = BILL_DOUGLAS_TRILOGY | V | 0x2D6626F3C55DE4A1B06014274EB65046 -0xF74BB168B1EB170B6C62AFFF6BA6AFC24051D5B7 = Biohazard-I | V | 0x44056015513C046F733BA18E95A154D2 -0x3AC555F427811310A484C844271E7520F8A28E00 = Biohazard-III, RESIDENT_EVIL_3 | V | 0xAFEB4E03C1F0A0909B0E4AEE37DFE39A -0xC0AF00C3A45FE7F3C9AD6C0B80494E6556EF7863 = BIONIC | V | 0x98363E8E8C9CEB03A0CBBCF151A790D1 -0x90DFBC0108DC19123A4922EF831C379AA5229CD0 = BIRDMAN (Birdman or (The Unexpected Virt | V | 0x5D79D6B3461AE74E36131904F4FCD1D7 ; MKBv39/BD+/BEE/FindVUK 1.00 -0x27245C62EC935F097FC4E4058BA76407E70CEFA2 = BIRDMAN (Birdman or (The Unexpected Virt | V | 0x1854B56CA4681135A82C5276BAB03915 ; MKBv39/BD+/BEE/VUKNOTVAL!/FindVUK 0.90 -0xF896081308280657DF4D1F779818FC8EAFFB2517 = BIRDMAN (Birdman or (The Unexpected Virt | V | 0x13B25A564F0677EFFA4161E16131877D ; MKBv39/BD+/BEE/VUKNOTVAL!/FindVUK 0.98 -0x14AFC64AA794C6898AA93A0997DB1FE8942DE7C2 = BIRDMAN (Birdman or (The Unexpected Virt | V | 0x8B4E41F36F447A7E89894231B9358A2D ; MKBv39/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0xBBEFFE8630EE1F2FF4D4F4D7EFC7964EDE39A25B = BIRDMAN (Birdman or (The Unexpected Virtue of Ignorance)) | V | 0xEA03104EC807D82375A099CAB563A220 ; MKBv39/BD+/BEE/VUKNOTVAL!/FindVUK 1.02 -0x382793880C2C70689E7D7469682DA784457C973D = BIRDMAN (Birdman or (The Unexpected Virtue of Ignorance)) | V | 0xA13FAC880A3246934B081EBA2F534592 ; MKBv39/BD+/BEE/FindVUK 1.00 -0xD371562CF4ABC686D1C8B8AC680F89FFBC404C08 = BITCH SLAP | V | 0xC676CDFBE42FED0E79C4E5A763132714 ; mkbv16 -0x4DF14A27B951895C04EC723393BFF710320BD042 = BITTRE BLOMSTER | V | 0x96C68E3C9D54B46798CC92612B28CA10 -0x7AF02B821B8ABA19B0F57C2CD41BD90F843AE81A = BL 80 | V | 0xD08316C8F5FC538F18CEF85A6F01CAC0 -0x80773A7A90836AF0E75690092E6BB36905EA1280 = BLAA_MAEND | V | 0xF3CCF53424683BD4265F6A121C63D9E5 ; mkbv10 -0x8EB3AAA673205ABAA53215F7F427F4824B52D986 = BLACK BULLET DISC 1 | V | 0xE9039BAFA9366FA0F847895218DBB761 ; MKBv52/FindVUK 0.96 -0x8C2B0FFD0520ED74E6CF96DDEF658FE9F46D6570 = BLACK BULLET DISC 1 (Black Bullet 1.1 - | V | 0x250F867541C2AA4A649003BB4398FF12 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 0.89 -0x552F1ABA2F242CC13CCE6D5EFC7A064221AAB019 = BLACK BULLET DISC 2 | V | 0x059A550ADA925DB74B8F68071E37033F ; MKBv52/FindVUK 0.96 -0xBBA52DF6449591BA221C9A4672DC6C1126805135 = BLACK BULLET DISC 2 (Black Bullet 1.2 - | V | 0x985CE6819C5C411CB42CB26F89F42ABB ; MKBv56/BEE/VUKNOTVAL!/FindVUK 0.89 -0x9B5EDA4E85C2F6E67A5CF6AD579C1702DC358D6E = Black Butler (Black Butler) | V | 0xFDACF9475CA33F5506F76804C39B33BA ; MKBv47/FindVUK 1.02 -0xCC48B7EBF06FA3A117C582B642020636EA2D7A77 = Black Christmas (Black Christmas) | V | 0xCB97B738647D510C5F0517E02B9DDE3C ; MKBv44/FindVUK 1.00 -0xFCF192D499CDC5771112628BEDD8208678405BC8 = Black Death | V | 0x9266F3A1660A82001EC8F8332691908A ; mkbv17 -0x12B39CD095E0BAA726705B6CC0C34F0A83FF84DD = Black Hawk Down | V | 0x16D2E6A1A8B142671F93DF6972DF1FF3 -0xA3584FA4C8823498E51D9DA8380C089146A5E2EF = Black Hawk Down | V | 0xB51277827AE8BE8671655B090243ABFA -0xDB83728411429632468CEA68B3A8352EB51CB21E = Black Lagoon AOV | V | 0x4A7CF0BE7CA02EDBFA66F29D3BB05444 ; MKBv40/FindVUK 0.81 -0x82D1F8BF2D758D3FB5412A9EE160FDE18DB67D27 = Black Lagoon vol01 | V | 0x69EF95CA57F39526AF0465A1827CA719 ; MKBv28/FindVUK 0.81 -0x214BAE1B8534A5D81995EFE0B00A7DA813AD38EB = Black Lagoon vol02 | V | 0x450AB87588EE4FC39C711C5C1D1AF082 ; MKBv28/FindVUK 0.81 -0x30885BA3B41D5EA25EA7A11C56DAD01BD92FA246 = Black Lagoon vol03 | V | 0xDE1E19A7AEF1AC27D050621C0C9DF472 ; MKBv28/FindVUK 0.81 -0xA2A8AC22E753D35A1C8A3599164B86064A5DF291 = Black Lagoon vol04 | V | 0xB41A95BBDEBC7D717FE264B1F8F3E892 ; MKBv28/FindVUK 0.81 -0x2422F629A87CC20692D0D448155FFE6F39F1C21A = Black Lightning | V | 0xBF9AF1AFA3BC4FBF5A614A8207E85452 ; mkbv18 -0x44DE31E593523643F036524652322273FE3B376D = BLACK SABBATH | V | 0x66698D5FF52C596BD72D268B1E553D4F ; MKBrev 34 - FindVUK 0.54 -0x868297A9FCB63499462D47691F5B20AE793D52E2 = Black Sea (Black Sea – Blu-rayâ„¢) | V | 0x8B1613CF9B4094ADF85ADAFC3FB61911 ; MKBv53/FindVUK 0.98 -0x0115B8889622BEF37B8666498187129C7E41D390 = BLACK SUNDAY (BLACK SUNDAY) | V | 0xECE098A6078DE2D5C9F009D27B235A98 ; MKBv33/BEE/VUKNOTVAL!/FindVUK 1.00 -0xFF53D428FF651C73C13D71AB02FAF442EB61FF71 = BlackButler_BOC_D1 (BlackButler_BOC_D1) | V | 0x887F2F6C05898F9F871EE86F8F32B20C ; MKBv57/FindVUK 0.96 -0xACB84DF7766DFA22571217128BA1BE43AEAF2829 = BlackButler_BOC_D2 (BlackButler_BOC_D2) | V | 0x1D18484EC9BBCB526F912BC9F63720FD ; MKBv57/FindVUK 0.96 -0x26DB8CCB666362DDE4D6B28F472C2E1E53C5BA93 = BLACKHAT_DOM (Blackhat) | V | 0xFF4467BE0482390E59A7C246C85756F7 ; MKBv39/FindVUK 1.00 -0xF141BDDA33E170440AFE4D4A896A60AB48BB8AD1 = BLACKHAT_UPB1 (Blackhat) | V | 0x9AA68F9AACF3061D28D0149BAA1C7E58 ; MKBv49/FindVUK 1.02 -0xC8E6CC7DCF12C153597F5E4D84F78A4CB738B168 = BLACKHAT_UPB1 (Blackhat) | V | 0xF2399B43C38B6D22009160FAFC25E6AE ; MKBv49/FindVUK 0.96 -0xCB81061201F8442879A4DD1ADB3173F1862B3879 = BLACKHAT_UPB1 (Blackhat) | V | 0x26BF97A0A20C62BBED4F37AD62734BF1 ; MKBv49/FindVUK 0.96 -0x3A80A2AC6786315CC489FA35085C8DC317BBEEF8 = BLACKHAT_UPB1 (Blackhat) | V | 0x4161B68627D39E87623774037A8F9B81 ; MKBv49/FindVUK 0.95 -0xA4B08B941D78C24F5EB0385092BFE1ECBE79D52B = Blackjack (Blackjack) | V | 0xC5D8F9AD3CB179C6AC2310F9E0D7A015 ; MKBv50/FindVUK 1.00 -0xB8716F4FD266EF27F464407F52CED7278C8A2ADD = BLACKLAGOOND1 (Black Lagoon Disc 1) | V | 0x2A8585BD0FF0A5A68D3278BE54CCB0D4 ; MKBv46/FindVUK 0.86.3 -0xC050D61DD36724F89AA5971EB429BBECD5449E4C = BLACKLAGOOND2 (Black Lagoon Disc 2) | V | 0x83986FAAB528038F8CC7443A6B05F2D3 ; MKBv46/FindVUK 0.86.3 -0x6418A5F800E375BC08412C7FDE2F86B1DC709BC2 = BLACKSGAME | V | 0xD27E9A28D7F9923AA2A84FA4A46635BB ; MKBv35/FindVUK 1.00 -0x5606D429124DF72B86CC869977D2DE98EDA088DD = BLACKSHEEP | V | 0x1631B401FCE097440FEC8224D206FD67 ; MKBv35/FindVUK 0.96 -0x561423B0F55FD4561BF8549866080D4A0C3A1F22 = BLACK_BLOOD_BROS_D1 | V | 0x087AA6F9DDCBC390EB9545A9269C1728 ; MKBv17/aacskeys 0.4.0e -0x3C28221A693B2CB97B5BEFEE6942880991A7A9CF = BLACK_BLOOD_BROS_D2 | V | 0x830FCFEB5389EFA3A132CF221947958D ; MKBv17/aacskeys 0.4.0e -0x2861561FF787A4068B5A16CF69B1BC196737EB68 = BLACK_BUTLER (Black_Butler) | V | 0x35BB41435CEC0C702B60E6094F71BA24 ; MKBv26/FindVUK 0.96 -0x77018BE162C6CF5B59F015A5C4EC15C9E1798421 = BLACK_BUTLER (Black_Butler_S1_D2) | V | 0x90D3049C7707DD98074E6E18F1792DD4 ; MKBv26/FindVUK 0.96 -0x7CB5DF221FCC0810A5B862DA7E130ACAF6385BF6 = BLACK_BUTLER (Black_Butler_S1_D3) | V | 0x588276429A49246A9B242276BA47192E ; MKBv26/FindVUK 0.96 -0x8B998167F4A13602FD08062E3D37F2C468AE2E3A = BLACK_BUTLER (Black_Butler_S2_D1) | V | 0x3E0056FD8BB334BB3EEDE297A63E4C4B ; MKBv26/FindVUK 0.96 -0x75FFCE101DFABDF85380DC71D318BA51A0BE4DF4 = BLACK_BUTLER (Black_Butler_S2_D2) | V | 0xFB624EFD7284084CD1E9787B7C692860 ; MKBv26/FindVUK 0.96 -0x5C4BEE7EAC750C9FF818B18DB63A22A914BAF784 = BLACK_CHRISTMAS | V | 0x65B0B29A9A9081791408024CCD4AF8DD -0x8F3BC3AEDAF475988A02ED2BFAC86E42ABDEF38B = BLACK_HAWK_DOWN_BD (Black Hawk Down) | V | 0x7705861140F27D56D9CDAA2C086B638D ; MKBv18/FindVUK 0.99 -0x61097C1BC718D6A7F3700D8F8E937A3F0282B379 = BLACK_KNIGHT | V | 0x106B38A2E49A42F0C207729B4043087A ; MKBrev 34 - FindVUK 0.62 -0xB3DE6259388273E14B9BCAB5087E44AFE191AD23 = BLACK_LAGOON (Black_Lagoon_S1S2_D1) | V | 0x749AC35445EB740EAB12E901623AC706 ; MKBv31/FindVUK 0.86.3 -0x394FB32068DB981A8C1F2E48FBA6B10F2C45EC16 = BLACK_LAGOON (Black_Lagoon_S1S2_D2) | V | 0x43EC5447523C8B934B47DD0812F3BB21 ; MKBv31/FindVUK 0.86.3 -0xB726EFC0ACC6EC6D08D464AB7E248D135BE78325 = BLACK_LAGOON (Black_Lagoon_S1S2_D2) | V | 0x28879696098E6E4CFFB99EFD8EB20D9D ; MKBv31/FindVUK 1.02 -0xF28A00E1422201E5F9EEEE300705679ACE6B2B74 = BLACK_LAGOON (Black_Lagoon_S1S2_D2) | V | 0x5C6A3E0747D409C432331354650FB0D0 ; MKBv31/FindVUK 0.92 -0xFC4785BA6C6A21F16C5FC3CEE5B827326732C989 = BLACK_LAGOON (Black_Lagoon_S1S2_D2) | V | 0x380C24EE1CDB49634909898D5B9E792F ; MKBv31/FindVUK 0.92 -0x57A24E931FED76EBD5891A35A6B0F688CECCD623 = BLACK_LAGOON (Black_Lagoon_S1S2_D3) | V | 0x2BAA8E8C8AAB181AA28791E8391F6848 ; MKBv31/FindVUK 0.92 -0xDE327DEA4036472EAC002A8A4B95D879C8AACFA8 = BLACK_LAGOON (Black_Lagoon_S1S2_D3) | V | 0x0A9DB0A50517DEC5099D97285B5FB6F7 ; MKBv31/FindVUK 0.86.3 -0xE27774135FB5AD250180CF952BB1334923DAFBDA = BLACK_LAGOON (Black_Lagoon_S1S2_D3) | V | 0x9BDB80C9E722E136E757B6276FB1EF25 ; MKBv31/FindVUK 1.02 -0x988A7A5A700333F957AC4F5F252A441ED8B545C6 = BLACK_LAGOON_OVA (Black_Lagoon_OVA) | V | 0x33418BFFB2612F9DD8136B32F32A54CE ; MKBv36/FindVUK 0.86.3 -0x7EE897D164525F8A54C2154C24B39C997864AFB5 = BLACK_MASS (Black Mass) | V | 0xD7E992D7CC9C01881A9D7F58D70D5BB7 ; MKBv46/FindVUK 0.96 -0xEE3E7A671B906C2EF07CF8011B24F0B6302B2826 = BLACK_MASS (Black Mass) | V | 0xC2C1948317CA78EC65002B38412FD57C ; MKBv46/FindVUK 0.98 -0x4E7FD993779573D88D8E0A102B41DF276E8F358A = BLACK_NARCISSUS_BD | V | 0x809F6678B18A9E4CEC013B71601178B6 -0x28A93070E7B65024759FA1871486308D730F55EF = BLACK_REBELLION | V | 0xF05645DC25C5457940EC1A86F8FA4D79 -0x713AD3993034741E85B70007AC10487B810A2BA9 = BLACK_SHEEP | V | 0xAF0C76C4557AADE7785D2A16F11E1F89 -0xC8D7C105CE5B41DE10C01007C60E76EFB1C08484 = BLACK_SHEILD | V | 0x52622604A50BC2F2020AB0E1562A975E -0xED684E8F280653EF205F3345AEA3404F14E8C253 = BLACK_SNAKE_MOAN | V | 0xC76E573D12CC7A2A465AC071297D5189 -0x7E27B55E3965113B119ED50FE86550DF7B0F6A67 = BLACK_SNAKE_MOAN | V | 0x48FF1FE041070201FE089921C0A4A422 -0xB97C3F3572A5595394E28D424ADC5EB7F1F894BC = BLACK_SWAN (Black Swan) | V | 0xAADD254A465AE8208B3C84EF778945E8 ; MKBv19/BD+/FindVUK 0.96 -0x5395F82184B97A0E31CC55463962EAAF852010B5 = BLACK_SWAN (Black Swan) | V | 0xE859555E48E34A7D06C9CF5F659D421F ; MKBv19/BD+/FindVUK 1.00 -0x24F57B47BB1689BB5D846BE777412C838772BE28 = BLACK_SWAN (Black Swan) | V | 0x9E8C4AC4388BC963028652D206DB3698 ; MKBv19/BD+/FindVUK 0.99 -0x1AF29464D4FA0639FBF93A0CFF73976A76329EE7 = BLACK_SYMPHONY | V | 0x041359F1DCA11FCAB1C0FEFDC10CC334 ; MKBv9/FindVUK 0.96 -0xEF4FF6B506C86EE81052B78B21571C6762511BCE = BLADE | V | 0x91474D9F5EC47BBC21CC83D25B11A208 ; MKBrev 27 - FindVUK 0.57 -0xD58D2A08797B52ED0568CE372622832FE76621A2 = BLADE | V | 0x3C493131BEE98682F3E6213B8084E7BE -0xF0D8245A576B8586507214086558E3E3C45D3D99 = BLADE (Blade) | V | 0x5B4B704B038CDAC6506FC6E5236E91AD ; MKBv28/FindVUK 0.91 -0xB8F1CE50DCD08A35C7E904446B7D2FBA502F843B = BLADE (Blade) | V | 0x74055B513D2EF13E0FFFEEF6C195CEDE ; MKBv28/FindVUK 1.02 -0x10A40DB4630552C386CE3DFD002CC519A98F7A11 = BLADE (Blade) | V | 0xEBD42007EF89BFD432FB4EB77C4D88A0 ; MKBv28/FindVUK 1.02 -0x16B235D0B9F8FB92E5B393858440A3AFE7B66086 = BLADE 2 | V | 0xD3F34939C9A85EFD5F347D461C5D9BB9 -0xA1C9FB4A5974EF59DE2C4F05366AF4CD8AF23C6B = BLADE 3 | V | 0xC5BA6C6A5469C038BB16FA73700007D5 -0x1E5B15D5735FA7B30D62D6172B507A0890557C40 = BLADE II | V | 0x4AEE18516DA762763BB35DF6A0922FF7 ; MKBrev 31 - FindVUK 0.57 -0xEE68B23366BBB24E2AB75EA4F82A4E2086FF0E99 = BLADE II (BLADE II) | V | 0x9D6F221B0C9DBA1EEB48A19C27B4B726 ; MKBv25/FindVUK 1.02 -0xCDFD3C394BB659157B98ADE0DB5C237F1785318A = BLADE II (BLADE II) | V | 0x8E3F8527DDB17A6DBAB84DE47E32E6D2 ; MKBv25/FindVUK 0.91 -0x9AB08C19D87B94CD899CDF7B97E7643C7A708067 = Blade Runner cce (US) disc 1 | V | 0x1F7EE642B5DCEFA499A91FFC00EAE2BC -0x1F854CF944067A526CD4F64B4FB13C5338BD918D = Blade Runner cce (US) disc 3 | V | 0xCBFB02DBD91574113A0B1E74276A9109 -0x583769BF545462347DE54FF0B161B5C8E4642B1E = Blade Runner cce (US) disc 5 | V | 0xA93F004DBD9E7A7775D4EDD6109002E1 -0x1FE7BD390127538A6D63E37013EF7128FDB77E6E = Blade Runner: The Final Cut | V | 0x479B80F144EFEEA05FE2967F331CE14D -0xB935EF12F7888886D9D39930004F0660CC831CA5 = BLADE TRINITY UNRATED CUT | V | 0xD0786834F86E33287703CA6C213C26FF ; MKBrev 25 - FindVUK 0.57 -0xC30CD0CD1C6F63137379913CEE00878270C03666 = BLADE TRINITY UNRATED CUT (Blade: Trinit | V | 0x5F5F9C04071CCBD85469BE5B766E4C7D ; MKBv25/FindVUK 0.91 -0x04C4EF5947AFA0EA77D704F4AEAA5C7CFAC70330 = BLADE TRINITY UNRATED CUT (Blade: Trinit | V | 0x3FE965761E42134E0916958BE98CC1AA ; MKBv25/FindVUK 1.02 -0xA6EDEFA21B658E6E71ED794CDAD144F49FC2A09D = BLADERUNNER_BRANCH | V | 0xD213BFF48B68FA29F6374540C73CC46D -0x8B057E1A57A940665C6E2F69824201AA1858DCFF = BLADERUNNER_FINAL | V | 0x2F6324770EE09B246C714A4C323FA436 ; MKBv4/FindVUK 1.02 -0x1C259770CE391D972F6D00FF7C557A3CC34ADC2B = BLADERUNNER_FINAL_EU | V | 0xCB4DB99F1E4F67B54B52E39AE3DA17BE ; MKBv4/FindVUK 0.98 -0xF1F716A037649FFF393BF36B3FCE8E0CF17DDDE5 = BLADERUNNER_FINAL_EU | V | 0xBFFA22BEDFFF540C83FEF741801A74B4 ; MKBv4/FindVUK 1.00 -0x0E7D6320896A32C654209252E58CB25559856F7C = BLADERUNNER_FINAL_EU | V | 0x213B279327C8F646E44AC4E7F2FA4B09 ; MKBv4/FindVUK 1.00 -0x347CB32EBCF8F1E01801411E623B19D792E83E93 = BLADES_OF_GLORY | V | 0x044ADCEDB3B71E7D599C5C09DE2290CE -0xD4EAB9545CAF5558C1080B6791872B39F90CC8BB = BLADES_OF_GLORY | V | 0x08B009DEE679D2F51AD12293253BB721 -0x42398B5E3184FC5C573508A0087A99650A68B2D4 = BLADE_RUNNER | V | 0xD9A7A0CD07AA5588221B3AC62E768A9D -0xBCABC3861754DD41BCB06DCA4BC5C683C211FC89 = BLADE_RUNNER_30TH_CE | V | 0xB07F6701F26B10EA397B6EA837E7E01C ; MKBv27/FindVUK 0.81 -0x0E19C7EE871C1A3245539ECD70AD73FEF1A2D139 = BLADE_RUNNER_BRANCH | V | 0xC6F09F70BC7FC30524C83DFF872675FF ; MKBv4/FindVUK 0.81 -0xF6FFDCE5133F0131FC519E2312D31E7CE72ED2A7 = BLADE_RUNNER_BRANCH | V | 0x6AE62EAE6EC03C0AB287D2707D814A86 ; MKBv4/FindVUK 1.02 -0xBF605CB58A90449C1A0D87A7575A6F92AA900A20 = Blau ist eine warme Farbe | V | 0x39136443789C2E17461F23AC97689EB2 ; MKBv46/FindVUK 1.00 -0x5923BF099113EE111CC743BB04E667F85CD15A2E = Blazing Saddles: 40th Anniversary | V | 0x141888BF00FC1BE2FF218AD663510169 ; MKB 46 2014-02-04 KRJ -0x67974B379CC07638F2D43CFFA84548C14964A7C1 = BLAZING_SADDLES_40TH_ANN (Blazing Saddle | V | 0x4E0D1AD429B11231F69FBB703AF187E7 ; MKBv46/FindVUK 0.96 -0x88C2BF3EAB144AB29DA330D636CCCFC02800FA3D = BLAZING_SADDLES_40TH_ANN (Blazing Saddle | V | 0x4C871F0335ACD12CFE36853B0C3D4F0C ; MKBv46/FindVUK 1.00 -0x1BDEE3C574F7AE01B26E63AD13A8B755783ACA3F = BLEAK_HOUSE_D1UK | V | 0x987BB8BD047DA54BB0714AF4D7474F9C ; MKBv9/FindVUK 1.00 -0x01E65F04E7F886394126DCDF7DE3C25B283B158A = BLEAK_HOUSE_D2UK | V | 0x069592706ADE7D4AFAC14DDAC8DAF336 ; MKBv9/FindVUK 1.00 -0x4DFA21804C606B4B28D36EB87E8A2869A49CD506 = BLEAK_HOUSE_D3UK | V | 0xC87649D2EE9B18F26AD8D9F11BF8218D ; MKBv9/FindVUK 1.00 -0x7A1F2B76DAD7818CF9F8E92B446B9E18F40E3F99 = BLENDED (Blended) | V | 0x88F3E665C4D74BB8858F795308E60703 ; MKBv39/FindVUK 1.00 -0xAB7756902776B4310B394C38B141DBC331D17ED4 = BLIND (Blind) | V | 0x4B1478D7DEBB2EA97F5A48C7FB037784 ; MKBv54/FindVUK 0.98 -0xE211448119DF99517D082D8E6E9D917D2927F2D9 = BLIND_CHANCE | V | 0x76E4FABD46F35ABBF7E40A0F6A040A45 -0x9A07871FB9B44BC7386C140672D05D78236D7B40 = BLITZ | V | 0xDE397FB7869D2AF31FA3679740C9AC13 ; MKBv23/FindVUK 0.84 -0x7B120A040BC097A31FD23E2284AA59449B69543F = BLITZ (Blitz) | V | 0x15D8CF94393A160742B560C9F8F40C5E ; MKBv23/FindVUK 1.00 -0x65DA561C0EF33E645B8F24FF88A4D721CBBA7854 = Blood (Blood) | V | 0x4F7A988D268482F3E5A8D1BBCC0D4042 ; MKBv43/FindVUK 1.00 -0x985B1F36D34BA030A410974B2AA2A5888ADD44EF = BLOOD AND BLACK LACE | V | 0x7D43D00301B4B9D6D285B875F16EE339 ; MKBrev 51 - FindVUK 0.57 -0xA815975D8459718650737CA93172DB4CED4A33A3 = BLOOD BLOCKADE BATTLEFRONT V1 (Blood Blo | V | 0x3D4BC166A9A9B75F42D7FC887349B26D ; MKBv61/FindVUK 1.00 -0xE24A33A02151963085095E8035065910B8330F4E = BLOOD C THE LAST DARK | V | 0x5BD2E1775105BC406BD185C5927F1D5D ; MKBv39/FindVUK 0.96 -0x4F483886669DBF7B18762C7DB36268E8CAF84E2C = BLOOD C THE LAST DARK (Blood C - The Las | V | 0x12C2FA39F511DA65C85EBA8889E608EF ; MKBv46/FindVUK 0.86.3 -0x1FDBA44B8C426B590DE6C60FAFC6C3F020FBA368 = Blood Diamond | V | 0x86277F1682212229D860B25F7ECA5241 -0x304F5135F32094D8FC844F353812F1308F6DA23E = Blood father (Blood father) | V | 0x53C0CA2675ACF797EA6FA71F5F85DB66 ; MKBv61/FindVUK 1.00 -0x33CAF15E320E79A819F9D0232E97DCD2C0F25E17 = BLOOD LAD _ DISC 1 (Blood Lad - Disc 1 - | V | 0x7C0A3D18AC0090416518CCE303A48A73 ; MKBv51/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0x208F0B133B6D40ACAB2138E6BF427C90B17B206D = BLOOD LAD _ DISC 2 (Blood Lad - Disc 2 - | V | 0xB89087F0040EC471816FE7760AF351E2 ; MKBv51/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0xDE961876CAF33ECF5C29E07DC6CAF2F030393734 = BLOOD THE LAST VAMPIRE | V | 0x5253209CB983A959B26B2F1A6C3E4531 -0xA9B6839611CC089E3A703AC242224A10D389F2DA = BLOODSPORT (Bloodsport) | V | 0x50DC7F64F3642B343FED52F4CD27F72A ; MKBv36/FindVUK 1.00 -0x63D65F4D59AB97CBA6A6037A1BB5CE5484EEE36F = BLOODSPORT_TIMECOP | V | 0x1A7D1B7B3B25D6C88A02EC4A9D17554E -0xF469E98F3780DD0C3EC7573BA8BBC71D631507FA = BLOOD_AND_FLOWERS | V | 0x610B6AA12663C173E85DD6A943AB5149 -0x0F839D00EF429117E4EE27A7B3409E22C4FEBB0B = BLOOD_C (BLOOD_C_CS_D1) | V | 0x5832D6471875ED93A5A2EBE79384BF75 ; MKBv36/FindVUK 0.86.3 -0x075525327FFEF8D221E7CD10551B4C348F1A6F6E = BLOOD_C (BLOOD_C_CS_D2) | V | 0xD0AF20E2E5E29E8CB2FB05E6F71A616D ; MKBv36/FindVUK 0.86.3 -0x1A8A9A26E8A4EC30CDEF4D0A68D162C049E1C41C = BLOOD_DIAMOND | V | 0x77649A507D45DE845387EB092EA298E4 -0x657E43D4CDA256876D8702D203D7EA10EE02EFAE = BLOOD_TIES_1 (Complete Series- Disc 1) | V | 0x169D7B5020C5918CADB53B69819D19BD ; MKBv16/FindVUK 1.02 -0xAF0900D15BEA714B74CF8FB9661DB7C663504855 = BLOOD_TIES_2 (Complete Series- Disc 2) | V | 0x2ECA1103EB0B98272B13757F56FA2007 ; MKBv16/FindVUK 1.02 -0x1E0D141A6D8228AA5BA859FDDC318186A8F5E417 = BLOOD_TIES_3 (Complete Series- Disc 3) | V | 0x9FFC5CDC5C4EBDF986624CC55CF08C16 ; MKBv16/FindVUK 1.02 -0x9D2DB8D53D2018B87CAE256D3CF98CAEB7F4B385 = BLOOD_TIES_4 (Complete Series- Disc 4) | V | 0x750EC51D84FDEF299DDB0B0DCDA74A9B ; MKBv16/FindVUK 1.02 -0xCC80AED889656EFEE588F3FD0024AE90EB92A26C = BLOW | V | 0x430F4A8E62394CD755849B2747301931 -0x82D38CA80275795D15DC3B855392B8943B36AF49 = BLOW | V | 0xA5C4A59E3FABBA85DEC52FADEF760DA5 -0x521B24ED9C97C328513A1A7CBFFAC2EF06610261 = BLOW | V | 0x36BF30FE896812C03C24AC46E9A02274 ; MKBrev 7 - FindVUK 0.54 -0x23E898B23D380870C10FD049D3977CB18E646466 = BLOW_ME_SANDWICH_12 | V | 0x5A65113B6D3D326EC2AEF870192F1EC7 -0xEDEF3C5A21836B188C6AAF31AF225D8E81FC4084 = BLOW_OUT (Blow Out) | V | 0xA7F627DE4CC6FD588A3FDE5E230035CC ; MKBv21/FindVUK 0.99 -0x3455ABFF9D903FCF702385070B7C019C6904C7BA = BLU ELEMENTS FORSENSES | V | 0x626F606157B1A5FA9CD1F00ACF7BEBC3 -0xC137BDAF82FA56F69FFCF2CA310489A8658B56A9 = BLUBBERELLA (Blubberella - Blu-ray???) | V | 0x1E858A3A58C16C5F159E44AEEA8400BE ; MKBv19/FindVUK 0.96 -0x44A8B4A32A039D8E4F01EDE10DA64BF1F7E47686 = BLUE | V | 0x25805ADC5DEACA21FF92DC171558F0CB ; MKBv57/FindVUK 1.02 -0xF4856A1EEA9C7264AA2311E7534B9CFC10BB8374 = BLUE EXORCIST D1 (Blue Exorcist D1) | V | 0x356576B2D55C844F4E5F79C2113A0BE4 ; MKBv42/FindVUK 0.91 -0x064DC7FF48312D3A1A84006CFBAC9201BEB57E35 = BLUE EXORCIST D2 (Blue Exorcist D2) | V | 0x2F71977268E8ADD1B31679D5B2BFA584 ; MKBv36/FindVUK 0.91 -0xF1272C9C9DCF62E865CC9A037769BDCF18319DB4 = BLUE EXORCIST D3 (Blue Exorcist D3) | V | 0x2DF41B03FDEA607D754A0322ED97EE56 ; MKBv40/FindVUK 0.91 -0x571E71453EDADC44E1ADCC2CAE069DC87F44944F = BLUE EXORCIST D4 (Blue Exorcist D4) | V | 0x16403A0D4F8CFCA5A32CAB3612BB3779 ; MKBv40/FindVUK 0.91 -0x89AACE9C2B0F5F727F74D92AE0F4833608DC323F = BLUE EXORCIST D5 (Blue Exorcist D5) | V | 0x4377AF5F656B7284CD008478C369CDE4 ; MKBv46/FindVUK 0.91 -0xE6EE5AC97AE6C4AA1FC4C5E1CCCD2F65178A1621 = BLUE EXORCIST D6 (Blue Exorcist D6) | V | 0x42C35E6C69EB4F2415748037066AED7A ; MKBv46/FindVUK 0.91 -0xE876018893270E5E72C5BA5A50961DC4D6E348C1 = Blue Man Group Live ! | V | 0x30E958526401525DB13EEFA8B9F01758 -0xC41AA3EC8683ECA21A1BADE3E6A42D4C404F5B21 = blue planet | V | 0x9FB3944F9E028E682302A8B5D3CA5268 -0xA4207B79F7D868FED9A6B7D1836815B43DC65574 = Blue Spring Ride BD1 | V | 0x88D6ECAFD379AE3AF4D6652D1BE3BC88 ; MKBv57/FindVUK 0.92 -0xF0081F6528E72BD767373EFC15D841581B993A7B = BLUEMOVE | V | 0x79E70EE85071D59AE661FD21DC4B41B6 -0x52989E6B6C1BA3B663B4D2A315827AC69EF5F5B3 = BLUES_BROS_G51 (The Blues Brothers) | V | 0x9CCF44EC62E04194370A7DAAB5E66DE1 ; MKBv20/FindVUK 0.98 -0xEB04CD569DE58544036426D94FD2A0DC2733C14F = BLUES_BROTHERS_G53 (The Blues Brothers) | V | 0x9E1A6445F072FD1144C20D2CDB54481A ; MKBv19/FindVUK 0.96 -0x3E9F74FA15BCDB0A4DAC41DEAA7FC0DAFADD7E70 = BLUE_IS_THE_WARMEST_COLOUR (Blue Is The | V | 0x5F5A18E41F926304799806415921F43E ; MKBv46/FindVUK 0.98 -0x57B9110E1D69B055B7D03E24A06DF54DD287D951 = BLUE_JASMIN (BLUE_JASMINE) | V | 0x2C33597570D76B99553E64F059CFA675 ; MKBv43/FindVUK 0.98 -0x301935FC39934E16F3DC01C5765388B8A5CDEB44 = Blue_Jasmine (Blue Jasmine - Blu-ray???) | V | 0xC3DC744404D1A24C79DCE37DC5826D43 ; MKBv43/FindVUK 0.96 -0xB62944624C006A29BF200C38E5BECA35A1A6704B = BLUE_LIKE_JAZZ_BD (Blue Like Jazz - Blu- | V | 0x634FF14AFC42EB80AB1FCD0764E61CEC ; MKBv28/FindVUK 0.96 -0x2E76E7E046BCBB859D1518DDB7577DC94CC71019 = BLUE_MAN_GROUP | V | 0x936A9D9D5F5BD2C8E69BA26577F2C92C -0xB7C7768C2F77DDAFB85811B9E613EDCE3FE8278A = BLUE_STREAK | V | 0x4CB2087E2F9A64A643644048FEC7E37E -0xBA83F09BAB274757ADC0CEED9AFA7BAE0D748E9B = BLUE_VELVET_BD (Blue Velvet) | V | 0xA46DE3F4D30D475067FA3B1E35DD5359 ; MKBv23/FindVUK 1.00 -0xCF136E90F4DF98D0A7B068723D6A5F219E1E77C2 = BLURAY | V | 0x77B873ED7C9521644C6EAFDFDD177D1D ; MKBv47/FindVUK 0.98 -0x36FD0ED6A518040F0A71A757B1D242765599095F = BLURAY | V | 0x8A5AD981B6FC214E2E0CBAE2535225DB ; MKBv47/FindVUK 1.00 -0xF0AF82934852BAB8E5E7B33C7A7B81B6436A200A = BLURAY DISC DEMYSTIFIED | V | 0xEA852D2A05FFDC13025E24B5FCEB91F5 -0xF4EE102C6F074717C6ECC819334E5D32D6670F8C = BM FFXIV OST (Before Meteor : FINAL FANT | V | 0x60F2603BE4EFE3D8CAAE35E5D2FF636C ; MKBv42/FindVUK 0.92 -0x9188C20B28E767BCD9CEBA108EFD97030573E234 = BMXV_5007 | V | 0x1062E9FBF1F23DDF7729B4A59867B79B -0x669CFC895360A5E4CBE2A6E585366CEA97CB52C4 = BNYOG005 | V | 0x73910ED6CFFA429D62EDFCF10A75837A -0x27AC48432EBFD8CFB884A254AF67C331B46D0229 = BOARDING GATE (BOARDING GATE) | V | 0xA2460E4DDB8585E4E3D76474B7C6DF49 ; MKBv4/FindVUK 0.96 -0xFAB14FB1D182CB67C8D6DD3E48807564F9478796 = BOAT_THAT_ROCKED_G51 | V | 0xC21E767F610EB34C1F35440335964B86 -0xD4EEB6DF782AC32C379735EAE87D8E3DB6E81BB0 = BODACIOUS SPACE PIRATES 1 | V | 0x331E4C58E331440B0DC44487FCA20BCA ; MKBv35/FindVUK 0.86.3 -0x14ECFBA3EF2233B24FFE216C400539E6E1FB57FE = BODACIOUS SPACE PIRATES 1 | V | 0x599C9EE6E4309A208C701EBC8F77C3B0 ; MKBv35/FindVUK 0.81 -0xD131B4CC1D80886B25A04F94313AEB8880498640 = BODACIOUS SPACE PIRATES 2 | V | 0x9554AD6C6E6E817B16C3A9BD2572C664 ; MKBv35/FindVUK 0.81 -0x0018657206231425334C905D6CAB0C47F72AB941 = BODACIOUS SPACE PIRATES 2 | V | 0x820CB9A96353E11BB0ED24221E4F2511 ; MKBv35/FindVUK 0.86.3 -0x51002B9BB1B535DF429C1BC54E8A549EBDCEFADE = BODACIOUS SPACE PIRATES 3 | V | 0x60511485FFF7C7DCE20BED011CC2B5D0 ; MKBv35/FindVUK 0.89 -0xC802BB89733450F1AD8A7B2AACD814308C21A3F3 = BODACIOUS SPACE PIRATES 3 | V | 0x284B2384F9E64F6A538BAF6AFD467EFF ; MKBv35/FindVUK 0.81 -0xAE78EBB56193CDDA51F702107B101B57A01AFC77 = BODACIOUS SPACE PIRATES 3 | V | 0x7FEEDFF073C55DC9B63B7E37B9BDF776 ; MKBv35/FindVUK 0.99 -0x0A76C5FAB7DF28D9F093ABBA719799DDBC92FDCD = BODACIOUS SPACE PIRATES 4 | V | 0x99644ABBCE2F579F1F2E226C48231005 ; MKBv35/FindVUK 0.99 -0x0BE09111A446C3E720BC48C14088865A4F017B11 = BODACIOUS SPACE PIRATES 4 | V | 0x8CD69619329F923D0DE7386B1EC449DA ; MKBv35/FindVUK 0.81 -0x76135DCBEDC3D531BD8B117DFDCDAD1E5D1879F8 = BODACIOUS SPACE PIRATES 4 | V | 0x3F6E32974722DE0654483F52AB2302C7 ; MKBv35/FindVUK 0.89 -0x7903EE0A051B298336E978795EEB38498B5DF6F4 = BODY OF LIES | V | 0x5CC309B9182823B0F5F371908FC13E7C -0xA986599309AA6E9D1D9FEF3343116CE0CB3DE668 = BODY OF LIES (Body of Lies) | V | 0xC5122024DB129230FA19C644026086A5 ; MKBv12/FindVUK 1.00 -0x25B70744DFEDE23A5D63BD47F25AD06812BBDC00 = BODY OF LIES (Body of Lies) | V | 0x10CC48EDDEC5F730CB08BE5D5ACD6DFC ; MKBv12/FindVUK 0.98 -0x3ABC8B623F49E29F90B1035422993613934653C5 = BODYGUARDS AND ASSASSINS | V | 0xFC158037EC942173398BAF6EB5F77E76 ; MKBv17/FindVUK 0.84 -0x933D125A9B6092B29FBDE57DCDDD7323E27917E9 = BODY_HEAT | V | 0x7A16A99424EA61E7E6C2DD7DC929D8F8 -0xBF2A210271762701A7E3DDE3C154CCCF547C1556 = BOF_G51 (The Bride of Frankenstein) | V | 0xD54543E0D7A6F23BF2788DFE36354BD1 ; MKBv31/FindVUK 0.96 -0xA084222FCD2DC3EBAAC0253C7E80F81AF0FC7331 = BOF_G51 (The Bride of Frankenstein) | V | 0x8AC2400DCFA50A4DE05F12411F6DC4FF ; MKBv31/FindVUK 1.00 -0x8BDFC0EFF4F0D032F6CFFA0874E7BB5CDBF48101 = BOLGEN | V | 0x0FA6235962DAA5FFCD7047AA652F2533 ; MKBv62/FindVUK 1.00 -0x8A86CD88FAF57259869595292E7837478C5DDE7C = bolt | V | 0x5B538628EEDBB8E0C9BFAB14C45698E1 -0x45443101D0781566FBDCAFA914A8F857603627A7 = BOLT | V | 0x685B60C93E109F99D1AF44F7C1E178C5 -0xDCE9788812D93F5C05E00353AB43BBC935E13273 = BOLT_AUS | V | 0xFE590ED08AAAFFEB78E97F8D545FB1D0 -0x420EB4BE007D059E95FF52B7DC28E01D41943910 = BOLT_FRA | V | 0xF02AAA86259079463F059AF6620DC1B3 ; mkb v10 -0xBAE12852869ABE0FB546DBEED73F29840B4F3AED = BOLT_GBR | V | 0x27F833117E7A28AB01C4064D8B48E1B7 -0xC53D401ACF4CF9D42DAAED07F39EFDB04D3E7817 = BOLT_JPN | V | 0xC04056680683B6EECA1C65BA531F8D10 -0x7C8F6FE71E5C8DEAE2842B5708D8BB2D30BC512B = Bond_50th_Anniversary_Bonus (Bond 50th A | V | 0xF66C63B4E33436A57BD5900576AC865E ; MKBv28/FindVUK 0.84 -0x4A6F0E7BD0427CB35491822E8B0EA6EA5A33A28E = Bond_50th_Anniversary_Bonus (Bond 50th A | V | 0xFBEDF0FA0DB7AE9FE96A25304C1A5AF7 ; MKBv28/FindVUK 1.00 -0x0BBAB1CABAEB7A6F45F7AF97E595AA5CE7D79DD1 = Bond_50th_Anniversary_Bonus (Bond 50th A | V | 0x51A2690129CFA055CA98B134313E83C7 ; MKBv28/FindVUK 0.99 -0x5EB9F202F84CDCED5181EABE2B465ED019F15097 = Bones S5 D1 | V | 0x1DFC8F06329C318FA3E41B621D3AE062 ; mkbv18 BD+ -0xBCCE2AA484311D4C7986CDA68F3C5E45221F609E = Bones S5 D2 | V | 0x1D129462DEE34A9F0535634FC05AED82 ; mkbv17 BD+ -0x34EF1878C6894844A46369251354EE018BFDA3C8 = Bones S5 D3 | V | 0x63F111FB99AD99B22127FEC3F1C4C30D ; mkbv17 BD+ -0x99B2246DD84FE543A903CD7DC4444761BDF2976E = Bones S5 D4 | V | 0xA0E91AB99B82F320916A56120EB76587 ; mkbv17 BD+ -0x21CA7B6709F77B793194A5A2E663F33E7FF842D4 = Bones S6 D1 | V | 0x430D468A3AB32AFDECB735644DD3528C -0xFBD514CC949541963917E5391C02AE1211FEA236 = Bones S6 D2 | V | 0x6BAEC48215E35B10B515704789756C11 -0x0F9C9222728F9023E53DE0F2DD87DEA2ED2788E9 = Bones S6 D3 | V | 0x3C5669A77047BDC4C7655AA4C06B3469 -0x8F3709C4D5E0E4B2C9331B2EE2D6C4598A054E56 = Bones S6 D4 | V | 0xDD40F1F75D1A5499D797003D1300E0F9 -0x8B23D6038055D97A450BCF2A4DD4B73443F77948 = Bones season 7 disc 1 | V | 0xEC1CBD81D29E1D3F1D5641C5B8D198E6 ; mkbv28, bd+ -0x1947157FE3C41DCC12508327CF21628C5B646482 = Bones season 7 disc 2 | V | 0x63ACCDDE65E4335AF1C7DA1E8F4A676F ; mkbv27, bd+ -0x3CCB6A13ED45762EDD80D6FF3F57B7101DAC94B8 = Bones season 7 disc 3 | V | 0x0D372907D8AD46F1B1E6C5DFCB518B0D ; mkbv28, bd+ -0x25E21FADFCE2839D1AFAA5228EDAABD3AE69A6CF = BONES_S4D2 | V | 0xE7941066931214C5F9C44699FF61A512 -0xDA19025B3D50A98D117237103A8FC2B93442FAE1 = BONES_S4D3 | V | 0x1F3341F12BE363EC80BF3E5F21AF2B2B -0x3DDCB24F90EA16AEF25901D3DBE9EF24FAC8A29E = bonnie_and_clyde | V | 0x1A6805C7866DFD7FD64F56379C31B2DD -0x3AA78BE80A688738FC0D90C05479AA88B790844C = BONNIE_AND_CLYDE_JPN | V | 0x8CCAE95C2EC509391C8FD49F7F78271B -0xC525E8981CBF919E78E6AE9EFEC0449857BBC88E = BONNIE_AND_CLYDE_JPN | V | 0x6D1CB075EA56B43158C7F23B20FBFCFD -0xF55254E3DE2245D4607CF1B59A3ACA7D9AD139DE = BONNIE_AND_CLYDE_JPN | V | 0x7FF949947148CCAA3A348BFE7E316330 ; MKBv4/FindVUK 1.00 -0x1A26ED2EB383C603DAE4F40A9D194D0F61CAF954 = BONNIE_AND_CLYDE_NA | V | 0x1D093054606E4C5FE38FF3A479536E0A -0x4FC75FBA184A6C35C007D098010559B0BF96CBFC = BONUS_DISC (Bonus Disc) | V | 0x31CCD79243D91B5B70D1D9F1A1F4AA94 ; MKBv49/FindVUK 0.94 -0xD11156FA77BC1B657A4FD3FD6A130B402D8B3114 = Bon_Jovi | V | 0x43E40AF1101A5DAAF002246A21004651 -0xA3CA4720F2194E27A5B43762566B5AA64A2A5A79 = Bon_Jovi | V | 0x865921FCA859C29C12CA146537FDFACE -0x5CB22FE86658350E3C097059557F573EDB16CF35 = boob | V | 0xDDCD736440EE3713D3CA88A20176C0BA -0xBA0D78175593B9FCF30AEC649F6041A8D3035D1C = Boogie Nights | V | 0xF9DC0A6EB58B5DD2122F12690D145E26 -0xE872631520CAAF4FF80D7D45B66D9F5FA2BF5CE0 = BOOGIE_NIGHTS | V | 0xAD98B69A0D40A6A42B4ADB4E2B78F568 -0xD498789D5709AB1292B2339E3E29BDCFE99525C4 = BOOK_OF_ELI_BD (The Book of Eli) | V | 0x7B4E7456A60A15F7DFBC57379F363285 ; MKBv17/FindVUK 1.02 -0xC5829F0988F05CFC4889A414F151A30DFA2BB8A4 = BOOK_OF_ELI_BD (The Book of Eli) | V | 0xA42D025059080FA7C71DAAA137B29D30 ; MKBv17/FindVUK 0.96 -0x8DBAB26A0C8F11B64925B3D338D83C88BA228AEC = Boondock Saints | V | 0x9DE54F38CCAA717A5794D3D4B18305ED -0x4024C5104E067DD64E0D83FF562C8BC115886572 = BOONDOCK SAINTS | V | 0x35D4756167D04E8791ACADE133CD7153 ; MKBv17/FindVUK 1.00 -0xBCFC557A636FF0848C0125199A119C3C1D79D981 = Boondock Saints II All Saints Day | V | 0x6901357C259ED6A44732D4B4F14652A0 -0x6D77805DBE3757E28F0912675E38DA85E78E41FB = BORAT (Borat: Cultural Learnings of Amer | V | 0x5FAB79A628BF4A8210A4BD28B9AC4B4C ; MKBv16/BD+/FindVUK 0.96 -0xA425700099262B3378E7EFC2F233E78F929DDAF1 = Bored to Death s1 disc 1 | V | 0xB2DD4C7EF977F886F96AD1E499DC482C ; mkbv18 -0x2C5950C6C180B51DE09FA35361ED7514BE6CC908 = Bored to Death s1 disc 2 | V | 0x645E0A140789ED66D003C8A0B4992FB8 ; mkbv18 -0x0ACB7614B559385BAF8A0C28E6BD73B333E9A131 = Bored to Death s2 disc 1 | V | 0x30D7520B6F0D3EC25D185EF4AF5AAC2F ; mkbv23 -0x11490B58CC61E16B8FFAC34C199E25A8DE6EEFB6 = Bored to Death s2 disc 2 | V | 0xA2DD2EB836185F6CC2F828851119C086 ; mkv19 -0x0B27CAE612C0F796645645871E5CF0426091B4E2 = BORGMAN (Borgman) | V | 0x16BE3A9D1229CBA1F052701DAA4ABAC6 ; MKBv46/FindVUK 0.98 -0x6FD45C3E7BD3347255817D9FE27B1916CD55E005 = BORN_TO_DANCE (Born to Dance 3D) | V | 0x056AF4C03E9DCCC5E891AE86CAFF93C8 ; MKBv47/FindVUK 0.90 -0x4EA395873DBADA22466C65A1434306D79DC59BFB = Boss s1 d1 | V | 0x4E3FAAC53A5C7570FA63CF444416D08F ; mkbv28 -0xC8C3E7C5A95C16F197E45B1C7B636B9DC58D84C0 = Boss s1 d2 | V | 0x5409DC156BEA70E3C2CD51D46A884721 ; mkbv28 -0xF25EE7A91AF1AE79AE043D15DB2756748573341F = BOSS_S2_D1 (Boss Season 2 Disc 1 - Blu-r | V | 0x5E3BA404BDE7A9289613E24015B37C99 ; MKBv34/FindVUK 0.96 -0xD92234AB16666158E6EAD9436F7202C46AE90AF0 = BOSS_S2_D2 (Boss Season 2 Disc 2 - Blu-r | V | 0x4B41DAAC7242534D66AB514D94691A26 ; MKBv34/FindVUK 0.96 -0xF55A28FD2C314B4551CB481132FCDDE0F3187B3C = Bottle Rocket | V | 0xBDE54AA413CFC0CE71CE2388C86D3E4A -0x96BC0AB4FBA0849EC9157CB48C251460F8C6B5C9 = BOUND (BOUND) | V | 0x90FFD31E07F8E9341F74E92D31B1D136 ; MKBv9/FindVUK 0.89 -0xE76996856701F53CE508DD982350EA7447FFBADA = BOUNTY KILLER (Bounty Killer - Blu-ray?) | V | 0x32D902EF69FE69B9D868C64547776DA2 ; MKBv44/FindVUK 0.84 -0x9E905486D4E42D6D79C8F2CD37221677E5402D14 = Bourne Legacy | V | 0xC4E9318EDED9AD3C7B3BDCD7FEB8F1A2 ; mkbv27 -0x3D32A2D64DAD85B60CEEE30F2204907E8164855D = BOURNE_IDENT | V | 0x29EB5C3145255505EAF75750CD662EB5 -0xF7AA1B6E85712351F074F5019E5C5159D365783E = BOURNE_IDENT | V | 0x49F442DE12B3E63244A8CC1C93160293 -0x34DBFAB95316647FCFB6B830FD26644720B9432C = BOURNE_IDENT | V | 0x0E884FBE7812478753C63A4A1E88BE56 -0x0437C9D6ED067480F9302AD8889861E6924ADDE9 = BOURNE_IDENT_G51 | V | 0xB74B8889E3E56AB9DF8F406845D511B4 -0x8833D340648B7595266AF6C9CD60174E3F7FC507 = BOURNE_IDENT_G51 | V | 0xE29FFB9312009020BBB4328B552E514B -0x435EA3C9A70F3B0C24E8105252827A1F4A29DFB9 = BOURNE_IDENT_G51 (The Bourne Identity) | V | 0x592990C0DAD23322352CDAB3474E79EA ; MKBv10/FindVUK 0.96 -0xB013BEAA35E2DA45F7B68526D4713013BC337EBB = BOURNE_IDENT_G51 (The Bourne Identity) | V | 0x7567E7062FB85CC5622962BC3850AD4B ; MKBv10/FindVUK 0.98 -0xF2AC62C8005EAC18CF73224D01FF79407B12EC7F = BOURNE_IDENT_G51 (The Bourne Identity) | V | 0xD32EE0ADE0D92621E76FE9F055B90962 ; MKBv10/FindVUK 0.99 -0x7BE32022098345013EBB985B0797717A021D893D = BOURNE_IDENT_G51 (The Bourne Identity) | V | 0x581211558BCF10EED9A6F067BE043DCE ; MKBv10/FindVUK 1.02 -0x6A1AED660130CDE9CBD2F7CB3F865E07F67589FF = BOURNE_IDENT_G51 (The Bourne Identity) | V | 0xCC25F72D78C7737F47ACD59CAC87C679 ; MKBv10/FindVUK 1.00 -0xABB2274CEDC3364EFC67F3BAB1B375A028C9981D = BOURNE_IDENT_G51 (The Bourne Identity) | V | 0xC513F7FD3B8B7C9B1709E624DACD6FA7 ; MKBv10/FindVUK 1.02 -0xA98A69DB4B69BA95E525529A082578D9DCDA6FF6 = BOURNE_IDENT_G51 (The Bourne Identity) | V | 0x3DE5BB2996DB172DA819DC9142217F6A ; MKBv10/FindVUK 1.00 -0xBAA074425128EF92B44E8230C8E259051F327F7C = BOURNE_IDENT_G52 (The Bourne Identity) | V | 0xD94245093B0187FDDFFF6B789FFDF8DD ; MKBv12/FindVUK 1.02 -0xB4BC83073B84E9C0786606ADB52B0DF785EAB6FB = BOURNE_LEGACY | V | 0x905ABE070B9D84ED25335982B7B5A686 -0xD593F0E9B0262E08A5D2448F0E0F7B46B7846BA5 = BOURNE_LEGACY_G51 (The Bourne Legacy) | V | 0x99460F7000754110B0966B426147CE31 ; MKBv27/FindVUK 1.02 -0x00D361180ABBC27BF477C4EB7B816133656DA1E9 = BOURNE_LEGACY_G51 (The Bourne Legacy) | V | 0xF0821EBF9037A6AA140F50BBA8F3DED3 ; MKBv27/FindVUK 0.92 -0xCAFDCBFE2C4F7B92B9B1E19D238A1AFE4A1F856F = BOURNE_LEGACY_G51 (The Bourne Legacy) | V | 0x571C99CEDFD566B3AA672AB3B9708838 ; MKBv27/FindVUK 1.00 -0x1BE8DD81B621EC85967A56343F66A723C86F9BF7 = BOURNE_LEGACY_G52 (The Bourne Legacy) | V | 0x180FF1594B1A23FF237A9E594089B656 ; MKBv27/FindVUK 1.02 -0x0DA15614CF46CAFB24E8508EC921F9F58E0C2FE9 = BOURNE_LEGACY_G55 (The Bourne Legacy) | V | 0x21B311A3560E579EEF214329D93C5EAB ; MKBv27/FindVUK 1.00 -0xB9F31F25D9A8F0718A748BAAA8A06117C39C18F8 = BOURNE_LEGACY_G55 (The Bourne Legacy) | V | 0x478F3CEAD57B14D330562E4822558303 ; MKBv27/FindVUK 0.84 -0xA24056829D287B68D1D68FD05F6B74B931372F2D = BOURNE_SUPREM (The Bourne Supremacy) | V | 0xB19B45BA3BE5E0EFA3D7DF2A3F6A61FC ; MKBv10/FindVUK 1.00 -0x3DC712D6BAADBF5F202B3C3CE17DD1A8E08157BD = BOURNE_SUPREMACY | V | 0x89404451447C3DC94D5A79AF951E5DE2 -0x6D8D3D321A361F21C82E6E669E6A7A8B55DD7AA5 = BOURNE_SUPREM_G51 | V | 0x32EF52969D4426D4AFB54B8490F20D21 -0xD579871EE1BA17969F3DD5C9156F7EF5BD52634F = BOURNE_SUPREM_G51 (The Bourne Supremacy) | V | 0xD1316C4091B4AAB9E6D8E088213EB732 ; MKBv10/FindVUK 1.00 -0x4A156EE89CE0FF1E3729773C22CADF130BC787B7 = BOURNE_SUPREM_G51 (The Bourne Supremacy) | V | 0x079EBB9B42C5B7027321005D3D216B75 ; MKBv10/FindVUK 1.02 -0x7E61EDD9BA2A06624393502787100F373E91AD47 = BOURNE_SUPREM_G51 (The Bourne Supremacy) | V | 0x95C019370583D02B554EE6BE8E654245 ; MKBv10/FindVUK 0.99 -0x1695190DC88178D5EF8F5893684D57B02A7FB6C1 = BOURNE_SUPREM_G51 (The Bourne Supremacy) | V | 0xDFEAAC0AA82A71C8CBA8F11019D2C678 ; MKBv10/FindVUK 1.00 -0xD28CB74D24A2A8A8BA37E4F67745C33B1AF0CED7 = BOURNE_SUPREM_G51 (The Bourne Supremacy) | V | 0xC666197D83294018DF1939BDE8F7E575 ; MKBv10/FindVUK 0.98 -0xFF12615FBBEB66AE840BAE29211FD2DC947DA602 = BOURNE_SUPREM_G51 (The Bourne Supremacy) | V | 0xB973B0884F6F0EDFCE36AB85F64D38AE ; MKBv10/FindVUK 1.02 -0xDCB7771C7674D0C4C7C1ABD9CBF1AA5B626DC984 = BOURNE_SUPREM_G51 (The Bourne Supremacy) | V | 0x80BE3B612D486A95BDEEE37DBF1E4B51 ; MKBv10/FindVUK 0.96 -0x5DB53D61111CEDED5EBB9477F86EED00C5C31A74 = BOURNE_SUPREM_G52 (The Bourne Supremacy) | V | 0xDD6610347D8D6308E76C1B99AFBB2BB8 ; MKBv9/FindVUK 1.02 -0x3B13E211828B49CE6E54C69AD6F6A690240451B2 = BOURNE_ULTIM | V | 0xDDA4687B90A3903C4E74943181BCA80D -0x1CA6BC362FCD4E0511112AB6B54863F53EB7320A = BOURNE_ULTIM (The Bourne Ultimatum) | V | 0x33969265816C1B89164EA66264EBB73A ; MKBv10/FindVUK 1.00 -0x3907D41445DD430DFCD9195987A3992357E12B4D = BOURNE_ULTIMATUM | V | 0x14B1205C8C82851F73F8F2F9214CA2D2 -0xE0C50D9E48C184B9A3CFD3E568B037BE0A1295EE = BOURNE_ULTIM_G51 (The Bourne Ultimatum) | V | 0x84CEE6A4BA257AD0EDB1FF4CF4BDB436 ; MKBv10/FindVUK 0.98 -0xEDD968805C05486E148E88841D39187FB20EBBD1 = BOURNE_ULTIM_G51 (The Bourne Ultimatum) | V | 0xC4C59066478AE8B60B34B103D9635B33 ; MKBv10/FindVUK 1.00 -0x9E4172B972DCCE5D370EEFB7427AA033223C8556 = BOURNE_ULTIM_G51 (The Bourne Ultimatum) | V | 0x7563875B3A950636A4BD4A6EDD01CF54 ; MKBv10/FindVUK 1.02 -0xED790A99CA418909F11F4F7E55E566DCE72A2A0A = BOURNE_ULTIM_G51 (The Bourne Ultimatum) | V | 0x3CA4BE55C5FB003151E887853510FF2D ; MKBv10/FindVUK 0.96 -0x2F5F81B787ADBF8382BEDF9D74F924AF75696F0C = BOURNE_ULTIM_G51 (The Bourne Ultimatum) | V | 0x2266887DEA0A1CE0D0179A0E7208F328 ; MKBv10/FindVUK 0.99 -0xE54793CDBB01D4405D1811DCF6024C091427E2B6 = BOURNE_ULTIM_G51 (The Bourne Ultimatum) | V | 0x47A94BAA4C8E20E3C8C1AE73CA722F4A ; MKBv10/FindVUK 0.99 -0x74436E10D5CDC5C52EE03943BD9DA4F2260C212E = BOURNE_ULTIM_G52 | V | 0x6D019DD2553F2F4D583AACE0E70B765B -0x1449DD0CAB59E5B8212516D5255149749B0D6464 = BOURNE_ULTIM_G52 (Bourne Ultimatum) | V | 0xC7431ECCFC397517FCF705695A21BD5B ; MKBv10/FindVUK 1.02 -0x0F8229E7A4336892E51C4CACA9AB9555BCF7A5D8 = BOXTROLL3D_EONE (The Boxtrolls 3D) | V | 0xD447A3937627BF1C860F75E4D12219B0 ; MKBv50/FindVUK 0.98 -0x377CE3868000A093D74D267D56D42EEAEBB3B47D = BOXTROLLS_UPT1 (The Boxtrolls 3D) | V | 0xE4E2F777CDED48C3EC765CD4D2B4FBEA ; MKBv47/FindVUK 0.94 -0xE932709EFA555B9775B8CF8112B3EBE5033C4B59 = BOXTROLLS_UPT2 (The Boxtrolls 3D) | V | 0xD7CA1BB320AF640E892F064C420E6724 ; MKBv49/FindVUK 1.00 -0xA9E053F129F66C160D0153D594CFB8F0E4364479 = BOY7 | V | 0xFCCCFC763CFAE81463439604FD61ED75 ; MKBv57/FindVUK 0.98 -0x549C581438DA5ACF7FED4B3418ECD155A9D0B824 = BoyAndBeast (BoyAndTheBeast) | V | 0x8311A30AEFF01DA31FF6DE3E2EBA71C5 ; MKBv61/FindVUK 1.02 -0x84A4E213DCE52EF00D5B6D97730460E8673711EB = Boyhood (Boyhood) | V | 0x3BEEB6A886D84D9903FAD569A8A15ABF ; MKBv47/BEE/VUKNOTVAL!/FindVUK 0.96 -0xFCC21C1CEE9320702E5A1B8B47E15ED8954031CD = BOYHOOD_G51 (Boyhood) | V | 0x7EDC827ED78EB49F35F4C304FEE2D18C ; MKBv39/FindVUK 1.02 -0x70BA9E18E5CBBF74C75C211E757965C7888FD69D = BOYHOOD_G51 (Boyhood) | V | 0xAADA74D953E3FB5B6FEC15A6DB5FD363 ; MKBv39/FindVUK 0.98 -0x72514A4B4909CC8C8D8EF40BAD536694C0AD2D91 = BRADDOCKMISSINGINACTION3 | V | 0x7B0F234CF293C2280FABAB0478EF4777 ; MKBv32/FindVUK 1.02 -0x616B74721BD8036AC80BCE614B829A002B8AEA56 = Bram Stoker s Dracula | V | 0xBE99DC23B9BE7FCE75AA00FD5A0372F7 -0x8FA26863E4A7813D75FD26F650E2AE5B28E003D0 = BRAM_STOKERS_DRACULA (Bram Stoker s Drac | V | 0x73D16BA302D2F6783089B272F716F56F ; MKBv56/FindVUK 0.98 -0x2E2E919C20A812D42052FA1877175C41DDA1D966 = BRANDENBURGISCHE KONZERTE | V | 0x33E99D497B839631A4B2BCDEDFE481E1 -0xCA2B7ECA455071ABD854FB813CCDF12311072D43 = BRAQUO_SERIES4 _DISC2 (Braquo_Series4_Disc2) | V | 0x475DF454F619DBB8C65DE65D26602493 ; MKBv62/BEE/VUKNOTVAL!/FindVUK 1.00 -0x0CC18568C77FDEA1C54331E439AB09CFA1008048 = BRAQUO_SERIES4_DISC1 (Braquo_Series4_Disc1) | V | 0x16E5D9D432E3A53F7D0AE82EDAEF7EEF ; MKBv62/BEE/VUKNOTVAL!/FindVUK 1.00 -0xED02A85D13CA31F6F283D7E9146855E987633799 = BRAVE | V | 0x7390CBA0E95CB50B6B49AC06381CDA68 ; MKBv31/FindVUK 0.81 -0x7A6A3F35DFEED223998DC79A7112C46B29A73A8D = BRAVE (Brave - Blu-ray???) | V | 0x060AFDBD6199D8E7617D1D98A5B487FF ; MKBv28/FindVUK 0.94 -0xD54DCBA9B0569FDDD98A2D2F54F66E842266F404 = BRAVE (Brave - Blu-ray???) | V | 0xCA0485613D0AC4CAF83A4D8B94D089EC ; MKBv27/FindVUK 0.96 -0x24297F424C05C32DDF249DCDD079218D88942602 = BRAVE (Brave - Blu-ray???) | V | 0x345D9CE402029DC53783702764F47A9C ; MKBv31/FindVUK 0.87 -0xE9AC2CB48956628CABF77E5C394A0CD946C3B112 = BRAVE (Brave - Blu-rayâ„¢) | V | 0x88CDFF98055D12CE3F11EA15E5A5AC1B ; MKBv31/FindVUK 1.02 -0xAE986E8C449CA42BAB76B4E9E4D4CA97D31730C9 = BRAVE (Brave - Blu-rayâ„¢) | V | 0x9EA9ACEEE966D98CAC852FE3F3708B01 ; MKBv27/FindVUK 0.99 -0x5BB6B77AD4FAFF9EE99EF6DFE824309858BA9F85 = BRAVE (Brave - Blu-rayâ„¢) | V | 0x02C7BF82667F84C37E49B19C767F200B ; MKBv31/FindVUK 0.98 -0x6192B945ACB29DC3A00F1A4A6B0C2A5ACB822484 = BRAVE (Brave - Blu-rayâ„¢) | V | 0x15FE493D1D810CD79B2430C26AD0015B ; MKBv31/FindVUK 0.99 -0xAE93884DCA639CC8C55C2D1B8CEB3154DA00A722 = Brave Story | V | 0x8E4339E24AD960013336639E2CEFB098 -0x2EB945F94E0792211D39BA6A72C146D726D18F73 = BRAVEHEARTDISC2 | V | 0xBBB59BA9EA12FE06CFEAC920285D16C2 -0xD03846E0EC4B5D16FC07A9368F49C7CB4CBDE5B8 = BRAVEHEARTDISC2 (Braveheart Disc 2) | V | 0x238FDB84A7CB18331E5F782A39A0031D ; MKBv12/FindVUK 1.00 -0x9721C1622D5421C767601637AA6C23C3C3CBF90D = BRAVEHEARTDISC2 (Braveheart) | V | 0x7A565DEA134F9E31E5BFA6116197C298 ; MKBv12/BD+/FindVUK 0.98 -0xA606C701C8933118D9E175873CEEACD200C32B8D = BRAVEHEART_D1_AC | V | 0xC68F2D683668ED1B4F90023A7D4D33A6 ; MKBrev 12 - FindVUK 0.54 -0xF6E988F5B570A2F1D17098EF3AA9C5375986D814 = BRAVEHEART_D1_AC | V | 0xDD5855B6BDA5FAE59E1CA822C353A504 -0x2BA6A3D38F276948C4DEF9218F65CAB8142AFF80 = BRAVEHEART_D1_AC | V | 0x30C7A8F4A8678D16BA809F78D509B6C2 -0x7027759B41B73BD54BC00E3FC18DCD2046D74C65 = BRAVEHEART_D1_AC | V | 0x028F05F9F0499FE12DCFA4FE02341D8A -0x73A712CA344F771F0E67CF59DDE976319C24D974 = BRAVEHEART_D1_AC (Braveheart Disc 1) | V | 0x58157CA28D476F24F7ACFE07DFCF1D84 ; MKBv12/FindVUK 1.00 -0x13A48D69490A659184E0E4A0E1B2E77DD3177F50 = BRAVEHEART_F1 (BRAVEHEART) | V | 0x14E0A67FA0C606AB03E974DC4CCC7B08 ; MKBv14/BD+/FindVUK 0.98 -0x25CDBEABAEB20BFED56653C29C62D10534B8468D = BRAVEHEART_F1 (BRAVEHEART) | V | 0x58075E484C4431CA6CC058BEF5E27B4E ; MKBv14/BD+/FindVUK 0.84 -0x3EE3A089D707440D4B266007FE858292D815D21D = BRAVEHEART_F1 (BRAVEHEART) | V | 0x6CB11C360D753142A68E45BED9C1F10D ; MKBv14/BD+/FindVUK 1.00 -0xABFFEBAC68704FA08EF20421024241D0A7E3A492 = BRAVEHEART_F4 | V | 0x10DC337D3C30EAD75B919497D0C84F01 -0xE5E6AC5378CF148DCA01302CCC7EDA223AD2CE58 = BRAVE_3D (Brave - Blu-ray 3D???) | V | 0x3EE7E3551AE19426CBDBAA60AF7F285B ; MKBv31/FindVUK 0.87 -0x4383E1642625EFF74DE5A9FB41F6ABC1B25BEF08 = BRAVE_3D (Brave - Blu-ray 3D???) | V | 0x15BB81A06367CCBD171E1A2E832B90CA ; MKBv27/FindVUK 0.96 -0x0093B258A6047192BDB6E245C3F0343334B19A9B = BRAVE_3D (Brave - Blu-ray 3Dâ„¢) | V | 0xC039377A79A11EB5F402F639C4B8DD3F ; MKBv27/FindVUK 0.99 -0xB795A7E732AF0DDC3A2667F24D908B80ACBF48A4 = BRAVE_BONUS_DISC (Brave Bonus Disc - Blu | V | 0x5B1E3DA62681F8D344F403ED67349AFB ; MKBv28/FindVUK 0.96 -0x38854B038D3D42D99FCF2C1D85995D3BF98F9731 = BRAZIL (Brazil) | V | 0xF1DFC43302B7A89EB91B7133C046E85F ; MKBv23/BD+/FindVUK 0.90 -0xD2DC86C827660FFC506917E2E16B552B42A4EBDB = BRAZIL_BD | V | 0xC49175F4F66A008912E43FADA3BC5692 -0x086D737FF1F68D456FE5493914E85B332E77B4CF = BREAK UP MAN | V | 0x4495926980A674ED2623A9F1F9ECA1AA ; MKBv36/BD+/FindVUK 0.80 -0xC1C2C03101BAB30A1E1622B322A4FBACC4E4BD61 = BREAKER_MORANT | V | 0x5540A5B5F8C124C916822E26B41ED2D0 ; MKBv4/FindVUK 0.96 -0xD18C58E25AC206F356E94B93BD03FE7FCB0B902F = BREAKER_MORANT (BREAKER MORANT) | V | 0x9FB2A6500718721AE8C93F5751A0A54E ; MKBv53/FindVUK 0.96 -0xE1ECDD966F44233A247C924ACE44191A0DC2210D = BREAKFASTCLUB_UPB1 (The Breakfast Club) | V | 0xF86B02EF4B3B4B85F92F7E103E6F7289 ; MKBv46/FindVUK 1.00 -0xA79310F9C5F41AD3CF75E33B689410C9685FF958 = BREAKFAST_AT_TIFFANYS (Breakfast at Tiff | V | 0x02FBCF236C450B657C69454C31DB03BB ; MKBv23/FindVUK 0.99 -0x816681588B6B942194EFC39065A29D205ECA3D38 = BREAKFAST_CLUB | V | 0xFBD51DB43F10096048E5A7E582753ADD -0x6D45616255160F9E1E49EC23E960A32CE399AB67 = Breaking Bad Final Season Disc 1 | V | 0x1360718C072B97EF22376905C580044B ; mkbv43 -0x01FE54496D3AE43E663C350642FEA6B9C0AAF101 = Breaking Bad Final Season Disc 2 | V | 0xD9B3AC199D170641CDF886AFFCCA66B1 ; mkbv43 -0x5AD8F968B52CCA46A9BBEA314B9E540E98535FCE = Breaking Bad S1 D1 | V | 0x8856D513C7407B49005975F9BAF19A5A ; mkbv46 -0x034968FBF4E1E50BD472D259ADBE77E14A452C5F = Breaking Bad S1 D2 | V | 0x2B938EBCFBDAE8318858E844F116FE94 ; mkbv46 -0xD669A623EBA4F0E4FF47549A5BF438101F4043C6 = Breaking Bad S2 D1 | V | 0x5EBC96B5FD47F32CE2CD71BFB34DC965 ; mkbv46 -0xDA40E9245D9DD499BF15DA8FA0BC75BA5DB48DC7 = Breaking Bad S2 D2 | V | 0x3895A183D51807B48078EC17236A24ED ; mkbv46 -0x8167E8AC56BD3A6C6454033B3CDBAE384FD4531E = Breaking Bad S2 D3 | V | 0xBE8ABA4D9D8AD75ADF2BE11B9767CD3A ; mkbv46 -0xBFBF8460C86D32EFF14E8C7E488E4C722B844044 = Breaking Bad S3 D1 | V | 0x1F7D167F7DB33DFBECD4A76E432F54FA ; mkbv44 -0xAC026EAD9A2D2481B48943C1830656B4C56A94B0 = Breaking Bad S3 D1 | V | 0x83E12276FCF8B04521766D50E92EF6A6 -0x499A0034CFFFDFF8FE41D9CBE4FFA764C8FC9652 = Breaking Bad S3 D2 | V | 0x35F3B5B9A1380E47F9ECC18703408E6E -0xB5D209A3368149CFE23261C6794D9A5CDAEE4DA5 = Breaking Bad S3 D2 | V | 0x6D847D1C7C8159DBCDA770B5B5298853 ; mkbv44 -0xD253E98646EFF80CC0A6FD9E4E4BE670A95E19F9 = Breaking Bad S3 D3 | V | 0x9E395084102DC1E288A436E2BD938B7E ; mkbv44 -0xD3C756555E6E1D6BB4FC1A522B73C0FF4BD59F1C = Breaking Bad S3 D3 | V | 0x689569A66D348650D57C09C2CEAAD6EE -0x7208FDC65EE0B7DDFD6EEB0D8AFA59377CE28E32 = Breaking Bad S4 D1 | V | 0x07B086265A1059FFD7A9DE5A9BE26C8F ; mkbv44 -0x4C7357154B7CBC7BC2DD861C4B2A26C0FD265A8D = Breaking Bad S4 D2 | V | 0xE7D1FA9FD1C25735C5571BD12DD83B33 ; mkbv44 -0x717876BA85DA5A5CCCC62915F3721B028FCE2B49 = Breaking Bad s4 d2 | V | 0xF355BB65853D2D89AA95F5BADAAF27FA ; mkbv30 -0x207FE3B220F337D04B028547FF7A31E475D19C68 = Breaking Bad s4 d3 | V | 0x7535E5103AFF8459DFC641B1D01A6B34 ; mkbv30 -0x6F072E966EB60B80B2C1C87BB3F3C5134D5B70F2 = Breaking Bad S4 D3 | V | 0x344C57D33A5B4CCA563CD7E162D449FE ; mkbv44 -0x74FC02605BF0BF64EF2F2C31BE966DCE28EDD8BB = Breaking Bad S5 D1 | V | 0xC9B956419AF7D419B1820AE4E32B8F4D ; mkbv34 -0xBE27CEED429AFC0CE80004B7C6CB84FE6B760555 = Breaking Bad S5 D2 | V | 0xD8245C0D5577E8CC155415944D7BF406 ; mkbv34 -0xCA9D969739B3E6E40D680A882275D1FD6579E328 = Breaking Bad S6 D1 | V | 0x48268514E93A648DE5BB55E72BD67164 ; mkbv44 -0xBD5C6383AB25DA8D6E52298124AA97A0AD635B5C = Breaking Bad S6 D2 | V | 0xB87AE1F88A5F3D6B408E3F96594EA015 ; mkbv44 -0x1E4C394070DC48DDCE696388877EACD67B2122A0 = Breaking Bad Season 1 Disc 1 | V | 0x6AC29068051D04138600EA275C32BBDA -0xC85E953ED340F2664E5F9BA904CE39813E0FB42E = Breaking Bad Season 1 Disc 2 | V | 0x7D3497034B0EB2B68426856FCA4ACEBF -0xF7C96DC63EAF02B1E51CC35600AB9F513807E2B5 = Breaking Bad Season 2 Disc 1 | V | 0xCE5C2A3FDB0D748CDA2D4402E597115C -0xD75EE71FA9A2E9496D1DF0D1B59D765D78E2D1F5 = Breaking Bad Season 2 Disc 2 | V | 0xB6D8450472E6DA5D2514E51C84343D62 -0x600C5767676646617E852A1A98AC4A295FE4E0CD = Breaking Bad Season 2 Disc 3 | V | 0x422CFFC4683CAF2F9669F38603718734 -0x972B62FE31874AFBB31D90F9802748F503B25E0B = Breaking Bad Season 4 Disc 1 | V | 0x4590FDFAAE9CB88E804C4C2E28D4869A ; mkbv40 -0x2CCFC12AE2F3870005B4A5C5A9A42FC381BAC533 = Breaking Dawn | V | 0x9913048F65B3824714E6921BB1581A8E -0x0223EB9F0C05B49E194E3F4BE05F81702D41D083 = BREAKING DAWN - PART 2 | V | 0xA1BD8A0BD91B4582B18EF5D4434E2D69 ; MKBv37 -0x6A20FCA12BF9BEFA3A20AFB3E5EE97268FD5936F = breaking dawn part1 | V | 0xC3AFCB9D8EB22E3A05825EAEED1D52CB -0x90E8D83502BA0480FDC3F5E65A25B98C6FFE153A = BREAKING DAWN TEIL 1 (BREAKING DAWN - TE | V | 0x76525DA67D38A47F37498884E6048624 ; MKBv30/FindVUK 0.92 -0x2CCFC12AE2F3870005B4A5C5A9A42FC381BAC533 = BREAKING DAWN TEIL 1 (BREAKING DAWN - TE | V | 0x6299F9E6FD8317024FA2BCFF68CB1027 ; MKBv44/FindVUK 0.84 -0xA57FC3475B38CE98FA17A21206656AD2F2D561FF = BREAKING DAWN TEIL 2 (BREAKING DAWN - TE | V | 0x1D5E56B8BABCC5D42234D128902B5480 ; MKBv37/FindVUK 0.92 -0x38C8888B2847DB2635A6B57D6914847DF3C6FE49 = BREAKINGBADS1 | V | 0xC295A23F9F9873105A671FC48A5512B1 -0xA9291BF085BFA269B63C03BE1D101190A176E40C = BREAKINGBADS1 (Breaking Bad: Season 1: D | V | 0xA06DAD7EE56C6AE6A6087A30A1BC7616 ; MKBv25/FindVUK 0.96 -0xC7BA182144FD617C7B52FD4BF91DA5C0BFF669F8 = BREAKINGBADS1 (Breaking Bad: Season 1: D | V | 0x0D8D97DE4BEA6368FC4980567531D091 ; MKBv30/FindVUK 0.96 -0x9AE3925AFA2F36746C21D080F54C437C3F559B4F = BREAKINGBADS1 d2 | V | 0xDDC90727F8F11D88CE96D491C289AFEE -0x3BA58D0EAB3F1DD973C292B43D51EA04D98ADEE7 = BREAKINGBADS2 | V | 0x31A6632B6615B8C935B1A833FB174607 -0xFA7614ABDE615102BAD872EBC6264E522EBB2AF1 = BREAKINGBADS2 d2 | V | 0x5906C689C8894E0BE9477374EE4F5238 -0x833CBAE1A21B1BB4886F92D2B0906CA0B3110E0D = BREAKINGBADS2 d3 | V | 0x10AA99862C1D10827B3CC4D5F41F89D5 -0x3019CFD091EE2628B00E8304EC0DD06A70D7A1F9 = BREAKINGBAD_S3_D1 | V | 0x6F7FEFAE9DBAF04C6F3EE3F3653F3194 ; Barrel set MKBv33 -0xA4703F51BE76CEC56B8B75ED51873A851DAFEA87 = BREAKINGBAD_S3_D1 (Breaking Bad: Season | V | 0xD9B6DE4DE0799CFD284225913FDBA955 ; MKBv28/FindVUK 0.96 -0x8D4522B323E60BC92B61FC67A05AEE32587A577E = BREAKINGBAD_S3_D1 (Breaking Bad: Season | V | 0x61726B040A0F5ACE7A976EDEBC2891AA ; MKBv34/FindVUK 0.96 -0x09326B49D93CD881A7935A78E33724AD7DF75091 = BREAKING_BAD_FINAL_D1 (Breaking Bad - Fi | V | 0x121AEBC452E4F53E10F55DAA6B34C3D0 ; MKBv43/FindVUK 1.00 -0xC936CE70B69D4107DADA13E5402192A03B075C31 = BREAKING_BAD_FINAL_D2 | V | 0xD92E66F411796625CD483D2A1CA9CEEF ; Barrel set MKBv43 -0x20BD02347ECC59C70ABBC5663BDD1934A1832C0B = BREAKING_BAD_FINAL_SEASON_D1 | V | 0xFC6CE237A80DB51EAF80372913DA5DE0 ; Barrel set MKBv43 -0x42E6EB186668C4D0EEEC989309AAB143869222E6 = BREAKING_BAD_S2_D1 (Breaking Bad: Season | V | 0x04FFCAE24EDB82EB6A95A69FCD9803C9 ; MKBv25/FindVUK 0.96 -0x0D439D046CED9712CCFDEDE858CAC635E332664C = BREAKING_BAD_S2_D2 (Breaking Bad: Season | V | 0xD2FCAB4DD9901BE0D17F489ABC09B5FA ; MKBv25/FindVUK 0.96 -0x72101ABBE8D1810A1655620EAF4E4B8FC057EC92 = BREAKING_BAD_S2_D3 (Breaking Bad: Season | V | 0x4684F8D149D81FA881B6DB034D67A1A8 ; MKBv25/FindVUK 0.96 -0x9EFE7C4E10A713C463CC9C90BA8C60B7AB256C49 = BREAKING_BAD_S3_D2 | V | 0x88C9AEDAD665B3A5B79ABE6C89091EDB ; Barrel set MKBv33 -0x5D319E5CD79D8A0C467973408CB455773738C981 = BREAKING_BAD_S3_D2 (Breaking Bad: Season | V | 0xBC35E0BCFA0EF5A849EB793B77FE8250 ; MKBv28/FindVUK 0.96 -0x902F65F539407595310C97203038C8A087A3C3A4 = BREAKING_BAD_S3_D2 (Breaking Bad: Season | V | 0x0C63533B4B9A7EB3A7016DB0C0A045F9 ; MKBv34/FindVUK 0.96 -0xFD9FDDDCF9BCD86F94E9E73241B590E40CC25C3B = BREAKING_BAD_S3_D3 | V | 0x71F4A60411EC12E6781CB74B08C480BE ; Barrel set MKBv33 -0xF470D39CE97015B5EE0EB588746256C0282AC7E3 = BREAKING_BAD_S3_D3 (Breaking Bad: Season | V | 0x21DE49C98DA32F98611797ABB6B7A82E ; MKBv34/FindVUK 0.96 -0x6AB7F2CD7B31D1345F4E091F9C7ACC6741E07AB7 = BREAKING_BAD_S3_D3 (Breaking Bad: Season | V | 0xF223C949F87AA357A1D51E1279CD673E ; MKBv28/FindVUK 0.96 -0x0DD36F5945B3E23799FDFED1458F56BD466DDE11 = BREAKING_BAD_S4_D1_P1 | V | 0x88DB16B300BFA9849D9A66DCEC68F2A8 ; Season 4 Disc 1 Barrel set -0x425D39917D4DABC9971E6DDC47B59BC417FCD389 = BREAKING_BAD_S4_D1_P2 (Breaking Bad: Sea | V | 0x82AB148C396BD0DA829104D1DB5DF7B4 ; MKBv28/FindVUK 0.96 -0x86EF9715465C3B451A6531AE264763180B76AC3F = BREAKING_BAD_S4_D2 (Breaking Bad: Season | V | 0x64E49F720C0E08B8A94C0583BFA01AE6 ; MKBv40/FindVUK 1.00 -0x0E1D2B982DB99C0E2DEF767A595837599FBA25E4 = BREAKING_BAD_S4_D2_P1 | V | 0xC786A6FC2C8A8996679F2286BD8F0A95 ; Barrel set MKBv33 -0x4B228AFB68DAD65E6CAE71FCA3840B6F63E6C564 = BREAKING_BAD_S4_D2_P2 (Breaking Bad: Sea | V | 0x05A8E3B73EA6B122B25406FB33A04042 ; MKBv28/FindVUK 0.96 -0x4243B724B3EFD7298F255AC7279D4292FE49DCFA = BREAKING_BAD_S4_D3 (Breaking Bad: Season | V | 0xEBFC30E735F76AB7FCEC292CA7015D04 ; MKBv40/FindVUK 1.00 -0x825C85810A06A960DE26BB622B1DC46D93AE441D = BREAKING_BAD_S4_D3_P1 | V | 0x8A1BD239921B0A8D22AC9A6B743BE907 ; Barrel set MKBv33 -0xB013A2BDEC272DC009B64AA8296EC64D67719ACF = BREAKING_BAD_S4_D3_P2 (Breaking Bad: Sea | V | 0x1543871AB678E7A08557C5026220912E ; MKBv28/FindVUK 0.96 -0xBA686056F0D777857F023DA04B0ADE713836D52D = BREAKING_BAD_S4_P3_D1 (Breaking Bad: Sea | V | 0xEB9006C501B8AB90AF7DBA675A461839 ; MKBv38/FindVUK 0.96 -0x273E130F5240C0F7D914AE4F9CC0047F1F57F472 = BREAKING_BAD_S4_P3_D2 (Breaking Bad: Sea | V | 0x82043EC61A452B57319833CCF66AE6C2 ; MKBv38/FindVUK 0.96 -0xCAAC1FF3F171CE9017BAF76566C63020F6C1B127 = BREAKING_BAD_S4_P3_D3 (Breaking Bad: Sea | V | 0xB60283E1220644E81C0332DF590C91CA ; MKBv38/FindVUK 0.96 -0xD7163B1BF883F00AE1329537269897A9227003A8 = BREAKING_BAD_S5_D1 | V | 0x209958C451D1D2BC04FC44378858DF94 ; Barrel set MKBv38 -0x0CC81A57AFB3D7CCD0B521A4F91A7B0BCA33F522 = BREAKING_BAD_S5_D1 (Breaking Bad Season | V | 0x2F9F9CCBC762E1CFA9C1BE6049EB7294 ; MKBv34/FindVUK 0.96 -0xB9563767320257FEFAFA60B9ADD5B65DA84F6D69 = BREAKING_BAD_S5_D2 | V | 0x32AA03768FCEE4130B53A1AE0E645582 ; Barrel set MKBv38 -0x71957AD1E73659A1AE30B2EF9737723D3826AB31 = BREAKING_BAD_S5_D2 (Breaking Bad Season | V | 0xFD2758AE222BD9B9BE77B6B8C70DB2D0 ; MKBv34/FindVUK 0.96 -0x6019102B80A9D7D6FBD8195A12E6F59DF784519E = BREAKING_DAWN_2 (The Twilight Saga: Brea | V | 0xBA36F06F1BA202F1CD6BB3E9DE8BCFB0 ; MKBv35/FindVUK 0.96 -0xC11DE05563D2EA978DF9B29271C631E5FABED64E = BREAK_BAD_FINAL_BONUS | V | 0x638453C3B60FCFB4F3AA9A179ED1763A ; Barrel set MKBv43 -0x7E2FA7695906B2F724C7087D0E81E5319302A0E4 = BREAK_BAD_FINAL_SEASON_D1 (Breaking Bad | V | 0x754B767503BF0BF360E3803AA7A0B722 ; MKBv43/FindVUK 0.96 -0xE68E78C601522F7AFFBFBFE2B3B8D69BA5A8CCE2 = BREAK_BAD_FINAL_SEASON_D2 (Breaking Bad | V | 0x7400E38B3E8CE85E8B72F1CF38B28B7D ; MKBv43/FindVUK 0.96 -0x962C1AE6D2708E6E1EAE698418E3BCCC84C3B056 = BREAK_BAD_FINAL_SEASON_D2 (Breaking Bad | V | 0xE028D43CCA6705E43A598D94E7F651CC ; MKBv43/FindVUK 1.00 -0x0BA5FDC7BEC3B86B74F32889A9EFF794D45C99A5 = BRICK | V | 0xA91740959C9535B10273AF9536C7D8B9 -0x86AF29A5732C4F910BBE4BF48CCEB7741474A788 = BRICK_MANSIONS | V | 0x970F4D8FE440B9300F6102426ED1F390 ; MKBv50/FindVUK 0.71 -0x7E02FB33C42465541FA9F6F760F69CA89C351B79 = BRIDESHEAD_REVISITED (Brideshead Revisit | V | 0x02CDCEFE4B82597830BAFEBC483391C3 ; MKBv25/FindVUK 1.00 -0x94031C9504DBE86C8F4C5ACEFB124069201BA560 = BRIDESHEAD_REVISITED (Brideshead Revisit | V | 0x8EF03DCA6E92B6CE0050289206E9828A ; MKBv25/FindVUK 1.00 -0x833A2C741742131ACB554F519F3387B537837067 = BRIDESHEAD_REVISITED (Brideshead Revisit | V | 0x9658F9DD6A7467E6FEA6222BFB82A8F7 ; MKBv25/FindVUK 1.00 -0x39C8861E43283DC4C0E4F69102C20B0F68552A84 = BRIDESHEAD_UK_D1 | V | 0x4FE9E57732C8E87A496F85C3E4D3EECB ; MKBv10/FindVUK 1.00 -0xB81C67658C2BB6C2992DFFD2E03A80F34E98361F = BRIDESHEAD_UK_D2 | V | 0x95D66D112D9BB49461FC34F1FD798743 ; MKBv10/FindVUK 1.00 -0xADCF17C4442A20A4F0A2625218DA9BA81A9D89EF = BRIDESMAIDS (US) | V | 0x55990FA2B2B339F7721CE10F55B55E8F ; mkbv19 -0xFA3E0A86458AD4B58A2F0F9CA63781AFA5B12D19 = BRIDESMAIDS_DOM (Bridesmaids) | V | 0x4D10D37931C317232DF92E622198F108 ; MKBv19/FindVUK 0.96 -0xC30FEB6F4835076E26C46D06733A4BDE50E864FD = BRIDESMAIDS_G51 (Bridesmaids) | V | 0x326468AEB0FBD7EE4266CC8FB091E808 ; MKBv20/FindVUK 1.02 -0xBE923CFB3BE73A148E61EC1ADEE94AC3FF1AA008 = BRIDE_WARS | V | 0x937D6C856470D0D489103B2B352F7B7A -0xF6642961A296E557B4D2BE368FEAD59B961AA9B5 = BRIDE_WARS | V | 0x8780D7C7FA83F8096A7578DB1C7663B4 -0x4AAA089D44B9244F02F8A4673FD972C0423F660F = Bridge of Spies | V | 0x0F237B9D2AF7BE52E65FB4558228D04D ; mkbv50/bd+/bee -0x8B932F6B7D026371203C38A6A6E15854ED2FA36A = Bridge to Terabithia | V | 0x3BDD6E38DB434140FDF04A504EB11F46 -0x662EEB39264EAC8641F0D68987E1C6970FB6E123 = Bridges to Terabithia | V | 0x74D25C9B98ECAB7B9E7354A80C72CBBD ; mkbv4 -0x92D7320CC82885353EC0D131E3197BE88A964A76 = BRIDGET_JONES | V | 0x95AB79364C972F05A1A2603B7B2FBAC7 -0x967472F7E23FD5FF50BE527F3D1CF7B5C25B17CA = BRIDGET_JONES_BABY (Bridget Jones Baby) | V | 0xC5C4C2A8A7AFDFADF7F14F8BE47B2E54 ; MKBv62/FindVUK 1.00 -0x3AA78D395CC5AAD191D1F0FD9479526B33DCF1D0 = BRIDGE_OF_SPIES (Bridge Of Spies - Blu-r | V | 0xA3E6332D3684525B5F1BA107147F90A4 ; MKBv50/FindVUK 0.96 -0xB0E7A339E8A81BDF99E7054EC7A7401A646B42DC = BRIDGE_OF_SPIES (Bridge Of Spies - Blu-r | V | 0xD5D56C247D239F31EF4163077BB1EF44 ; MKBv50/FindVUK 1.00 -0x8D3716E0A95E5AA5E9917F9DCBD24C266CB2E286 = BRIDGE_RIVER_KWAI (Bridge On The River K | V | 0x78D610E843BDD320C640E593DFB9B999 ; MKBv18/FindVUK 0.92 -0xDFC9CF666D1B797FF50059E989B83A54F647A611 = BRIDGE_RIVER_KWAI (Bridge On The River K | V | 0x0913376B0477B20E47B79D4AA475CB12 ; MKBv19/FindVUK 0.96 -0x0133E4F053D6521E1D3731A6E039C06ECFB9B97D = BRIDGE_TOO_FAR | V | 0x2AAC39E565637DC732B87A6D658F50A1 ; MKBv4/BD+/FindVUK 0.96 -0xDC4ECAFE0CB61F6C62DEC19C13F9E8686133A690 = BRIGHTER_SUMMER_DAY_A_D1 (A BRIGHTER SUM | V | 0xF519B74ABE340F5AC2BA4AE06481CC64 ; MKBv58/FindVUK 0.94 -0x6F407525A9C8A817B2219653D0B73100A54C46C5 = BRIGHTER_SUMMER_DAY_A_D2 (A BRIGHTER SUM | V | 0xADF223454E3BA9109C6FB80593CECCF3 ; MKBv58/FindVUK 0.94 -0x8547EF44A8A32E59F2546F854F17C1A2A3602C8D = BRIGHT_STAR | V | 0x5C77C5617A1B49D16F7700120267D609 -0xD5528360CEBD435762AA7999A90DF3A3886FA4A2 = BRING ME THE HEAD OF GARCIA (BRING ME TH | V | 0x80623EC8938558EEE45B2BAD79E01213 ; MKBv62/FindVUK 1.00 -0xF773B0E766F02732CE9B3EA15C5E0A2E58CFF790 = BRMM_10047 | V | 0x8BF4EEBCA55C4C9A5A5B350DB22DFBF3 ; MKBv53/FindVUK 0.81 -0xE0CF8E099D02974E85E730E8BF257704A86B3CAD = BROADCAST_NEWS (Broadcast News) | V | 0xC9A5D8C24696CDB706234F91FA1E5C74 ; MKBv19/FindVUK 0.99 -0x6260022A90CEB51C4B8DCC7DD2C74F424E328E4F = BROADWAY_THERAPY (Broadway Therapy) | V | 0x43381C8DF9DC9F653516EA62E2753C73 ; MKBv57/FindVUK 0.94 -0xD6D2C6F255E54B96A6C32ACE8098A889C6D624A4 = Brokeback Mountain | V | 0x39A65F64790D1966A2E5F90438DB970D -0x4BF2C5F3C81B04CB820A90FCACA816ADACD91790 = BROKEBACK_BD (Brokeback Mountain) | V | 0x58966D3ADACFEE9CB5724FFB79DBB10A ; MKBv12/FindVUK 0.96 -0x3ACDB778253E957EC2E1124C40129A5532B36F64 = BROKEBACK_BD (Brokeback Mountain) | V | 0xF2A26FB046CCB8CDDDD8D13A5A67E0C0 ; MKBv12/FindVUK 1.00 -0x6645F6A233296F877E5E955E502F7E38F7847E65 = BROKEBACK_MOUNTAIN | V | 0x88A73707AFADBB1CEA1B136F9A538987 -0xB7D98329E085239BD5A99832B223CD27A90DCCD8 = Broken Arrow | V | 0x0865324B7BCC21E8FF27A0EACCF040F9 -0xDA63D12E917D806DEE1002E3BC82A8EDBD1AA91D = BROKEN BLADE D1 (Broken Blade Disc 1) | V | 0x8275F3CADF3829ADA45073041A80C015 ; MKBv19/FindVUK 0.98 -0x1DB20C196F589670DCB7040F617C53508C2C6012 = BROKEN BLADE D2 (Broken Blade Disc 2) | V | 0x540E92C4D81C286498AA5DBEDF00012D ; MKBv19/FindVUK 0.98 -0x953E65EEAA12AD3006CAA6C8E235C0515D9567A6 = BROKEN BLADE DISC 1 | V | 0xE9DDA884F3D74421AEF9999D6CAB85D3 ; MKBv40/FindVUK 0.97 -0x06BF1C092FBB5747A46EF6B5645B44E48A7A379D = BROKEN BLADE DISC 2 | V | 0xC232C06D96F1306092BC315BFC7428A7 ; MKBv40/FindVUK 0.97 -0xFEEFD244548AC596794FF89CE498AA154D58709A = BROKEN_ARROW_F2 | V | 0x51178477584B9B7F96AAD8059A8A772F -0xCAFF56F06ADC649117C5A174D0B1A33DF4225067 = BROKEN_EMBRACES | V | 0xB332398D86CC12B052C53C6C2151A0A5 -0xC21391FF5B8836A7F7504550E04CBBC086F82046 = Bronies_BD | V | 0x39D955F38C8CBABB23704B9276A846C8 ; MKBv36/FindVUK 0.92 -0x9078FF7620C6E04080B9696152D25866AD2F3A29 = Bronies_Interviews_BD | V | 0xFB14CF069CFBAAC71E0EC5444225F525 ; MKBv31/FindVUK 0.92 -0xDAA0FF306745EC9AB629864C4C261B08D0C0399F = Bronson | V | 0xE9870C8E1788FCE335D04A09B3C9274B -0x4DF1FFA6FB4264AC7FEBD2451C72D211ED6A9D33 = BRONSON | V | 0x7BB0A5F82D2EABAC82FE78A7F0BE441D -0x101690EDA8E94465891DB05BAFAC80D2F8B5AF9D = BROOKLYN | V | 0xE9CA0F60974B47D898202739293B0DEB ; MKBv55/FindVUK 0.96 -0xE6C16C37F024E4DE121C1669824CAEFA8BD8987A = BROOKLYN (Brooklyn) | V | 0xFBB0B9ED40ADE6E2ED33BEDA74578A48 ; MKBv46/BD+/BEE/VUKNOTVAL!/FindVUK 0.98 -0xC6A25B5A4EDA083F006C365C91C9492B6CE5D08D = BROOKLYN (Brooklyn) | V | 0x460FF6EE9968104032549E09D02577E9 ; MKBv57/BD+/BEE/FindVUK 0.98 -0xC4FF3059976B689C980C5A4864A6CE419A34ADE0 = Brooklyn s Finest - NO_SV_FI (Brooklyn s | V | 0x840DE75D521CE4028489C0371250EA11 ; MKBv16/FindVUK 1.00 -0xB1CD1EC46F87107D39F1B3073589344AA960391C = BROOKLYNS_FINEST (.) | V | 0xB5DAA69F806AF6599725D2D473DC8579 ; MKBv18/FindVUK 0.94 -0xD72C174B2AB76FF17753714A074329E254A916B5 = BROOKLYNS_FINEST(US) | V | 0x40B41DFA74D0BD6786055178433F5728 ; mkbv16 -0x3E1BA85B98EBF9206FBD0078FF410A1716BCC4B6 = BROTHER BEAR (Brother Bear - Blu-rayâ„¢) | V | 0x8A17D16853AE2EDBA5F4BDC0774A70D6 ; MKBv35/FindVUK 1.00 -0x72DD263C147827930743D2FDBF04809986B03A34 = BROTHERS | V | 0x882D28EFC1946F7DF5D6B1A1966901CA -0xED4F63592159AB5B9591F6859EF8F84BC5DB19B9 = BROTHERS | V | 0xFC7D0794AB30B95A81F55D5F6BDD5D61 -0x294BD587C72C823B2F05243B146E723413E10F0D = BROTHERS (BROTHERS) | V | 0xAC88AC13CEFB19412B6EDE80CA9361AE -0x3130FA223AD953DAA125E54E1352EFA7DA522139 = BROTHERS FIVE | V | 0x9E7D0CF9BCCA92C228B124A9DFD575B2 -0xCD9E35FC887C3DA1085098BEA4603E8BA522354F = BROTHERS GRIMM | V | 0xF38EA1A1455740C76B2E09064D749E0F -0x97162EE47E0C7374F8A8484552BEA2456299DCC2 = BROTHERS_BLOOM | V | 0x946F49CD38A1856EF5C66853B50F0D7A -0x500123FC447AF78609CF44A0CE8CE3261713D9B5 = BROTHERS_GRIMM | V | 0x227420F8D78E3E88CDD3E74C261E202D ; MKBv17/FindVUK 0.96 -0xFD0959986D3338D8630F5CA924EDEBA1411DBAB9 = Brothers_Grimsby_The (Brothers Grimsby, | V | 0xB6B73FF49B217D5A45CCFBCAE7136296 ; MKBv60/FindVUK 0.98 -0x319B55083E042B027AD474CE3CF087C3E0A23F61 = Bruce Springsteen: Live in Dublin | V | 0xE410A44120DA608172D11F479DB50F9F -0x91E6C95D93E10BDE2616D0461C9D1A6573B05781 = BRUCE_ALMIGHTY | V | 0x17DDA13B4C47C192008821CE64CE6CFE -0x52CD025E7402C23AB0829E6DDA09C4044EB18932 = BRUCE_SPRING | V | 0xFDFA28FFBE67426850C8F6A9498E6AD3 -0xCC96F142D339B24E1C451A18F80840539753EBE2 = BRUEGGE_BD (Brügge sehen... und sterben | V | 0x220AF87122BA3893BC75F0327767B078 ; MKBv12/FindVUK 0.99 -0x900C2643F56F1D9EFE4FC22CF6F53370C4AA13FA = BRUNO | V | 0xDF15279ADCE62B0A65B927CC8D3CC122 -0x6D43527935E207F12FD338A25E032582EE85EEF4 = BRUNO | V | 0x770370ADABFBB07CBB0FF50999F9BB61 ; MKBv15/FindVUK 0.98 -0x0DEDA30583DE4E42F6B541165D9F1B3FBC09FC35 = BRUNO_G51 (br??no) | V | 0xEDBDE919084D1D9870C593694636F73C ; MKBv15/FindVUK 0.96 -0x9A5B138A1FA6CD7952C549B9D63F0D49762B8E8E = BRYNHILDR IN THE DARKNESS D1 (Brynhildr | V | 0xCA5AB2F45DE7BA23AFDBE488AA0CFE3E ; MKBv56/BEE/VUKNOTVAL!/FindVUK 0.98 -0xD7CEE3571C0F915E6B2E9B8B9B9AEE2DE1F10F06 = BRYNHILDR IN THE DARKNESS D2 (Brynhildr | V | 0x9FCE77734B804B5FB207DF25131096C2 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 0.98 -0xD51907C258F066162A097FAC18B2DEFB6271657E = BSG_35TH_ANNIVERSARY (Battlestar Galacti | V | 0x91A08F6605159154C3674F38C64A336D ; MKBv36/FindVUK 0.99 -0x4B0287AF112B87AD0858D031EDA5D5655040F03E = BSG_BLOOD_AND_CHROME_NA | V | 0xD7F5F8F8948F469E498C680ADE525F0C ; MKBv31/FindVUK 0.80 -0xB6B7593E96C61C2BF025409B88534EDC64F9C971 = BSG_S1_D1 | V | 0xB89699D9430ECEEE93102F657E389DF8 -0x245CE32EB030B7E02EFFBAE5BBD7B4FDAD277FD2 = BSG_S1_D1 | V | 0x5215C561F7D9D877E10B1CE5512C6152 -0x63033274E27698AA2D3342FCECA8559931BFA812 = BSG_S1_D1 | V | 0xCD72E5C2E858637B69BF0450E936D544 -0x850E88004CC6219EBD823DAA64434122C921BAF4 = BSG_S1_D1 | V | 0xBD53EDAE76E72C8504BC8C6E97BA4DC2 -0xA2CD79F61C9D21DAC6ECB54E71B161607BEA1AE6 = BSG_S1_D1 (Battlestar Galactica: Season | V | 0x4F0166D87228073C86763993AF8F0825 ; MKBv12/FindVUK 1.00 -0x3CFFE7A1A808BFD46DC1482C277CE9CEDAC54678 = BSG_S1_D2 | V | 0x7F149C6FFCC9604B034063D1F48B3D69 -0x35B7E19E86B35261F63C6AD3B9B80136B81C1C8E = BSG_S1_D2 | V | 0x7D96856CDC90132209CD17A3135BC72B -0x8226F937F0C4EEAD3EA2E6B47400AD3FB04BCFE1 = BSG_S1_D2 | V | 0x67614F6F721A6AF49850566055470874 -0xF7C0D0B6A05CA2A5FDD0EAD708B46C13EC960749 = BSG_S1_D2 | V | 0x857EDA4215BDA0B6606DF6483ACBE7F2 -0x8752B433F14DD31B7DF32624D35C3C4108E71E8A = BSG_S1_D2 | V | 0x985C1D561F0B035DAC18582BB41D2B81 -0x881D62BACE7F49DD34955F541EB055EC389F7C9D = BSG_S1_D2 (Battlestar Galactica: Season | V | 0xE6C85E8E9AF6AB86F01B5A3B8D1C20AE ; MKBv9/FindVUK 1.00 -0x1984948FA45A3D61B14891E80D0E713F52AE295C = BSG_S1_D3 | V | 0xEFFADB9E1F4C35059E0DCC9CB7A46F57 -0xDF16AE023C6D882BB525DFAE27A77BBCA4B89E48 = BSG_S1_D3 | V | 0x1BEF4846B9BFBB1FB9C2524BFDA65B14 -0xF5B8710277B1282DA5BE302D09FE4DD37C9052EE = BSG_S1_D3 | V | 0xBD4B974FDEC4997DA5044C76E8496198 -0x97ECD741E4857E28C91F5A0EC58E0B3DC4B0992C = BSG_S1_D3 (Battlestar Galactica: Season | V | 0xAC59AD0FE70E1F3ADB904E58F08E0038 ; MKBv10/FindVUK 1.00 -0x0E5E160F4E1C1682D347FAED60BCBF2D9EFF6DF6 = BSG_S1_D4 | V | 0x9451F62502E5CAE6CB5517FF7A490EBF -0xEE460192DE8C30261D864D49AE0599FADD3BECD5 = BSG_S1_D4 | V | 0xE9F2C797C60FE636A3E1056FDF05F81C -0x71171E0208D18B9DE249416F8379DC50E59F1A13 = BSG_S1_D4 | V | 0x541BE98D75525ECED9C136099A69835E -0xA11746DD82D81A6DB8FEAD06AC6846BB52A665F9 = BSG_S1_D4 (Battlestar Galactica: Season | V | 0x41CF5D8254A3ECEFAECD653676905134 ; MKBv12/FindVUK 1.00 -0xDB3B92ADB2757827F91A187609307C39E5D880C4 = BSG_S1_D4 (Battlestar Galactica: Season | V | 0x27C873FF48EE4FF6C239CEFADDAFDFCC ; MKBv12/FindVUK 0.92 -0x48FA34B5F123A21EDC0D97A82CCBA938D608D915 = BSG_S2_D1 | V | 0xAD7122E5DAD8F7305D1D67D0853FEB4A -0x4E5D0F3E93FF6DEC749232771500A05DA6F0A60B = BSG_S2_D1 | V | 0x521563EEDAE91F5E3A37BC9566E3386F -0x54595B2B0FE93A21C5C893E5260D4D9356C092B8 = BSG_S2_D1 (Battlestar Galactica: Season | V | 0x094B97A5BD19722EEA334DFC6E199CD9 ; MKBv12/FindVUK 1.00 -0x54E55CCBB934F9856E2B6C1926FF729E4F7C5B05 = BSG_S2_D2 | V | 0xBA2530CF991B17CF5B9ACE50E0A98262 -0x2672689B2E22D4FA343076AA50AB234013EF0053 = BSG_S2_D2 | V | 0x46F8FC419CD0BC040E2C9CC9D00D5C85 -0x00A4BA2D47DA96BA64D6463E804A219608D76205 = BSG_S2_D2 (Battlestar Galactica: Season | V | 0x4B3A283972045989DEE984CD9A907BD0 ; MKBv12/FindVUK 1.00 -0x5668C6D02E723B2D788982AA3F44CD2963824B79 = BSG_S2_D3 | V | 0xF0E7D034BEE06B3384A233D3BE8200ED -0xAE91E79BBE0AFE2284A6920AFA11ACAA89E5C642 = BSG_S2_D3 | V | 0x00144168912AA4FEB312BE7F08354D1C -0x5BF32691F11C8D4139FCF596EC8C7B542403BE30 = BSG_S2_D3 (Battlestar Galactica: Season | V | 0xEA98E9A043D56B3F43D0574AA903DE8B ; MKBv12/FindVUK 1.00 -0xC5168EF802DBEF24AEAAD81651E55D9419FEBB9C = BSG_S2_D4 | V | 0x4662B12F2BF27A2BA772FF2A5D3D0596 -0xC34C90C7E7AA9CE3F8095CEEEBA5FCFFB7822A60 = BSG_S2_D4 | V | 0xE31079C3EBA838ADC172B5BA155933EE -0x7D89F247A75AC964D0869FADFA2B707A042E0C9E = BSG_S2_D4 | V | 0xDDC087C8063BE8AAE8EF680604D6188E -0x339E77B031DC324B61292695ECACB2CC5D5FDE84 = BSG_S2_D4 | V | 0x25943EF4ACB184C08E7FC9AA64E1A302 -0x462AFFD786780F89FD81D0A020E57738657E70F3 = BSG_S2_D4 (Battlestar Galactica: Season | V | 0xE1B2985E9A5090176A6BABD6EA5EF162 ; MKBv12/FindVUK 0.92 -0x69C4F73E93A4951FB863919FF3FC41C44ACE4F7D = BSG_S2_D5 | V | 0xF8CEFE406FE7FBBCC626E1160C278737 -0xAC5B0E4E04D64B5345B36657FFE6FB0073F5DF50 = BSG_S2_D5 | V | 0x5EC8244370FFE35672FBDA024180D71D -0xAF70D89EAB23230F3666F84B0DCEA25AC76FEDD6 = BSG_S2_D5 (Battlestar Galactica: Season | V | 0xC983A2724C9C6200547B755B564CD9DF ; MKBv12/FindVUK 1.00 -0x273FF6177BAB69CA5ABCCEA0CAEA142274AD7E1F = BSG_S3D2 | V | 0xA502B3EA8A630D458AEB2B09556FFB96 -0xE4F2DD3BCB0456377AF13CF0139EB3C7F1165FC5 = BSG_S3_D1 | V | 0x5B61B6A3CE027710948C518DC99A6578 -0xACBC840B57BC4AAE9949F88B76BFC409C8453083 = BSG_S3_D1 | V | 0xD8DF0BA8F883317A18DBB850B72D6637 -0x2CDF553FC81F7810C9C16F1063D11EFC0608FB05 = BSG_S3_D1 | V | 0xF86EE771B5B5D0520F2099CB27217FEE -0xA12B8DBE9CD7102A0CDBAD775064AE8215E4683D = BSG_S3_D1 | V | 0xCFFDE70C654E9987DC5DEA845AE4C3B2 -0x58B737B4650D6D4CF804FCC67EFEAE56D270D7D3 = BSG_S3_D1 (Battlestar Galactica: Season | V | 0xE0C3E9BB938AEF3542BE90299A7B49C8 ; MKBv12/FindVUK 1.00 -0x4F1ECF7FBC63BF222ADE7FB9BD498FF5B88B0836 = BSG_S3_D2 | V | 0x1C1A9B25B4C46DD3782A106919EC1F5C -0x0D1C19F5C543A24A63C9D84F4D85C1EEF0078F18 = BSG_S3_D3 | V | 0x47B88A067D663072BCA01E8C578A17F2 -0x58038122DB4D4D7B2D96B2F541E90ED8535FE4A5 = BSG_S3_D4 | V | 0x013EF6BBEF6F77AD4F4DA4059321EE08 -0x48CCC2F5CC6C074A32E536B3DCE1DA39B264112B = BSG_S3_D4 | V | 0x6DBCBE729CDB3EC5BDAE98E02EE23C01 -0x778F5B355178ABA9A7AF7C523228FE78BA822F70 = BSG_S3_D4 | V | 0xF78591ED7D76235DBDCD6A56FA9213C3 -0x5D8D150CDD4D5CD712CF932775ACE352656D1E22 = BSG_S3_D4 (Battlestar Galactica: Season | V | 0xB72665673E5CBD98BB36320334BB7B32 ; MKBv12/FindVUK 1.00 -0xF5A78CD54E3615F540E10901B5F743D3E16E6003 = BSG_S3_D5 | V | 0xA47F11C0EF3F01743F286BAF327E45B0 -0x8C0E9D85AF92234B1EFBF1B31E7E7C10B13683BE = BSG_S3_D5 | V | 0x9313BBDA82DF8881636B008AD5BEC8B4 -0xD04CE6B0B85756D2712377362B2531EA9733BED0 = BSG_S3_D5 | V | 0x492DD2E7120480A0BA66F1170394A40A -0x627CA4FA74FC1176F111EE1CE51B6B8899F9A234 = BSG_S3_D5 (Battlestar Galactica: Season | V | 0x7184DA0542F0160CC4886F14CA05ABF5 ; MKBv12/FindVUK 1.00 -0x57FEC7FFF2838F589094679039B1A43759A612EE = BSG_S4&FINAL_D1 | V | 0x624B759975D3F8A0D0BCEA8D56D00A28 -0x6CE617878FD0A6AC8042962F9068B1659CE2E1DC = BSG_S4&FINAL_D2 | V | 0x22FDCE48A6FC051074720C77B578237B -0x10599EFCCC738D7D8D95E32197F3DD29C560BD93 = BSG_S4&FINAL_D3 | V | 0x786C4668CB696F358FD01923DCA9AA0F -0x319481D1992EF53B2B4A5CB8B41710BAE20F1C2B = BSG_S4&FINAL_D4 | V | 0x878A918E264EFC944D0A225BB0698268 -0xC1B266BB1915C5F95297E500E9147607E4140AFE = BSG_S4&FINAL_D5 | V | 0x05EBA5F03141CE479225B3550E9E782C -0x4E945D86F9A5EC6222CDCE3D84110165A7779910 = BSG_S4&FINAL_D6 | V | 0xF83218333F8420EFB02B8D40D3487A12 -0x40F38E0AEB0D1209E2FBC6A930371697C62FFF76 = BSG_S40_RAZOR | V | 0xB1049ACF1142CDD3067C2284E0F920FE -0xF3C5D78802DC5134B5A277B08C024E0BA4ADCC85 = BSG_S40_RAZOR | V | 0xB303A32859D028DB5037E62ED4E5BB0A -0x3B44A113946DB96A1D711B7E93D5CB314194FBBD = BSG_S40_RAZOR (Battlestar Galactica: Raz | V | 0xF770896A6BAF4136E987279B11AAB957 ; MKBv12/FindVUK 0.96 -0xA39C93AE6A6DC4E9F28E10325EE0528A2EF286AD = BSG_S40_RAZOR (Battlestar Galactica: Raz | V | 0x7EAB57C1F1AC6292A5DE0B649A111911 ; MKBv12/FindVUK 0.92 -0x8F8C06E10AC608F1935614CB7E577C7732BEEC97 = BSG_S45_D2 | V | 0xE81E84A78C40D7C5DF860BCEC16221F1 -0xDF9128E1DB1122FFBF4B2E692A82EBB4BCE1AE80 = BSG_S45_D2 | V | 0x75DFC87312C26FB33C052617C5E6F011 -0xD31F82FCB1D74FEE6149BC06C6611D4627CFA1DC = BSG_S45_D2 | V | 0xBAF6D2F06B5F3BA68A6F0172FED0D2CF -0x34A83F508C15E2F020D0620FB3A2988D0ECF037D = BSG_S45_D2 | V | 0x0252192DE7B9CA3E1E118463F4ABA86D -0xB6F79C80A6D170DE6349793D77141D1D13EA14EE = BSG_S45_D2 (Battlestar Galactica: Season | V | 0x9464DDE9B878E0C033F535913ED478EF ; MKBv12/FindVUK 0.96 -0x49381449DD58B13846CA11226E443B5664452321 = BSG_S45_D2 (Battlestar Galactica: Season | V | 0xF7C6D9451D6BE77600AA9CBD662C174D ; MKBv12/FindVUK 1.00 -0x39D50EC86E0CD591241B412049FE0E6867E382B6 = BSG_S4_AND_A_HALF_D1 | V | 0xF938C12128F75B47CB5C8307867903D4 -0x854485D6D5D4E9160647B89A3BA8192F05DDBB72 = BSG_S4_AND_A_HALF_D1 | V | 0x81222DB143D9FA6E7E604BAD8F27958B -0xBE7867DCE4EAC0BE296B2C2B2F6376688E4341A5 = BSG_S4_AND_A_HALF_D1 (Battlestar Galacti | V | 0x8E07C595B95223A208C6E8C0EFFDF7F5 ; MKBv12/FindVUK 0.96 -0x6E49CBCC3A5CA7BF526B54C36FAAECB2E7DBE9BD = BSG_S4_AND_A_HALF_D1 (Battlestar Galacti | V | 0x986A2E30B9A5CBC8FD439F5AFB489823 ; MKBv12/FindVUK 1.00 -0x04242260751C2FBA92351A4D79FBBAE834AD1603 = BSG_S4_AND_A_HALF_D3 | V | 0x3EF734A40E8BDD96AAA144B73B4A4BF9 -0xF2B534B38CE3E230F5FCC882E0940E451E5730D5 = BSG_S4_AND_A_HALF_D3 | V | 0xEB77632EAF87B9347D65C7DBF4AD3896 -0xE654258FB7813D509566FE5038EE74D72E349588 = BSG_S4_AND_A_HALF_D3 | V | 0xA1F33B3A2EADBA142847AF933539F05D -0x78DF275FCE7830BE3B4B73EF3A7521ACD6ECA732 = BSG_S4_AND_A_HALF_D3 | V | 0xE0D431CDE923A97BD8B74E51E50A3B18 -0x93D5FC83F9023FC6127FD092F8B3629671043787 = BSG_S4_AND_A_HALF_D3 (Battlestar Galacti | V | 0x41678EF74356B4693E68B49A79C450D0 ; MKBv12/FindVUK 1.00 -0x3B412D4B586D16CE4BDB8B1561BB59D64B5EFD5E = BSG_S4_AND_A_HALF_D3 (Battlestar Galacti | V | 0x80D0FA1280A92E399AFAE29422CE7341 ; MKBv12/FindVUK 0.96 -0x6980804B31B8022CB6162E5E960560DCF880F100 = BSG_S4_D1 | V | 0xB983EEB1F68A82D784344D55645A4139 -0x0C43ACC27C4A446F512EC21F9ADEB2BA387C367B = BSG_S4_D1 | V | 0x267EC0C93ED8009E40537D563AE9A609 -0x359C23B31B17CFDCE97C6A62D101C5238AA8CD59 = BSG_S4_D1 | V | 0xD3227392AA8993FA3039D2C0C543CED7 -0xBC1B47927B701F370B87D7875F44C1718D6FEA8E = BSG_S4_D1 (Battlestar Galactica: Season | V | 0xEE68D15C512BA76263255EEC09D3A060 ; MKBv12/FindVUK 1.00 -0x187414A44A213EFD034BB81B88EE26733E3F77A3 = BSG_S4_D1 (Battlestar Galactica: Season | V | 0x76899882257E7E5085F220DF9324CF87 ; MKBv12/FindVUK 0.96 -0x03F53DB849897A0326092C27FC29362EC9AEC12C = BSG_S4_D2 | V | 0x10306E7472B8DA11D4EC00B0D0288EC0 -0x6F915CD9FCD65CFF3B6775FCD48B85696102CD06 = BSG_S4_D2 | V | 0xDD72C1B2BFDF364666910D0F3813686D -0x39C743790D825E8EDF7A6E1D0DAA242A79F4D01F = BSG_S4_D2 (Battlestar Galactica: Season | V | 0xF10A24E389EE28B114081CD127C57380 ; MKBv12/FindVUK 0.96 -0x4E006571FFC6211E4E253AD03128E21B30553165 = BSG_S4_D2 (Battlestar Galactica: Season | V | 0xE392903A2F0C0E155E3156613AF16DC1 ; MKBv12/FindVUK 1.00 -0xAE75225EA2F0245097450FB6EEDC60639A665383 = BSG_THE_PLAN (Battlestar Galactica: The | V | 0x24FAA2C9B063BEB1B30F64C61F678DB6 ; MKBv14/FindVUK 0.96 -0x24ABE55236FE385AD8D04633B98709B57078C842 = BSG_THE_PLAN (Battlestar Galactica: The | V | 0x1D74433FCAC0220362C0C9DDF4584520 ; MKBv14/FindVUK 0.94 -0x1B955264521BE55F620660E40A6B76E957E77C21 = BSG_THE_PLAN (Battlestar Galactica: The | V | 0x26A99EEED15A7E9D52B76F31B92D3079 ; MKBv14/FindVUK 0.90 -0xD1089601522CF67186B21335BAD0A27FC49327FD = BST0xD02702 | V | 0x484A2AC3F0405313F10A85AF8E3C00A5 -0xBDDFDE523F32A043A5F78BFF4146017ED15FFD45 = BTM0904_2 | V | 0x129CED0E743C97C3A064052C6532D808 -0x4FB2783F3B51872D17F201DEF52F0C74BA34A0A5 = BTM0905_3 | V | 0x97568A939066B75008F9D3614F6F1715 -0x31817E26E2463E583BFA42821093A26EE921908E = BTM0906_1 | V | 0xF92A0927708EAE263D120AC5FAC78FA0 -0x7559C08451347698FBED0A7C64390239CA63B532 = BTM0908_1 | V | 0x65AAAF85B2366FFB31333708DB55D8A3 -0xE9B6E0E11CFA2EE6996B622CF2C18E97E1431290 = BTM0909_3 | V | 0x83A1B3A45A4AD6DC817AA865009673EB -0xE67E1CDFDBDAB6DE04FAB4E61303B7265C7A0C18 = BTM0909_4 | V | 0x2895F176E60E43FC175C936721324A3D -0xF317C8BA04ABAC755DC8A5244C982AE8650D6132 = BTOOOM DISC 1 | V | 0x9724BEF229C5BD494346E3EA6919AFAD ; MKBv44/FindVUK 0.86.3 -0xF550EF645513AC9836BDAFDCE5D5E8EDE4676E42 = BTOOOM DISC 2 | V | 0x8CF5EB1FB50075AD5A3B9D055FE2C49A ; MKBv44/FindVUK 0.86.3 -0xDEB7D1B3EFDE8665726D3CE6F7F697B2C037931A = BTT1NNE1 | V | 0x6369B62E40EBFC969BADAD6ABC29D91A -0x6845F7DC19CED663FDDDFD1C7D3345ACA8FAF261 = BTT1NNE1 | V | 0x6D33D13100742E8BE6E9A1F61D4C9994 -0x33B3E9A225178C8F69EB4E409B61EAADF02C617E = BTTFBONUSDISC_UPB10 (Back to the FutureB | V | 0x464339E98435156D6EB7F7FB6BE33329 ; MKBv47/FindVUK 1.00 -0x865DC9D9B8C74001031FE0DCF32DA2BE5B8D7768 = BTTFBONUSDISC_UPB10 (Back to the FutureB | V | 0x33FF7A468B4DC74229E6B14E49F6B32B ; MKBv47/FindVUK 0.96 -0x889459B2C333A86ABFBFE63F04247E496CCD0056 = BUBBA_HO_TEP | V | 0x83760C71A3C95FCFA7306ED6134111AB ; MKBv9/FindVUK 0.96 -0xC4FFDA4D626E5F40BD503166EA62DE86A7258520 = BUCK-TICK memento mori 0x090702 | V | 0x73F27F28FED9B493BA0910825CBE0D73 -0xED0FBB4405F7F46848007CFEC50F4ED3E0BA5ACB = BUCKET_LIST_B5_JP | V | 0x8C36DB9EE198DAE0F1005EFA2950DBF9 -0x6912ED6ACBC72B3F9448753221A28B06A166C02C = BUCKET_LIST_B5_JP | V | 0x8269B26DCBE0AFA36D5A0C6784367C8C ; MKBv7/FindVUK 1.00 -0xDDA00FC46600E1D8ECC8B96E320C1B35E7CD442E = Bud der Ganovenschreck (Bud der Genovens | V | 0x11ABF306B591E8959556A27F386C032B ; MKBv39/FindVUK 0.96 -0x85DA2993E7DE27F2041AC8741FBBD7FE52605A46 = Bud der Ganovenschreck (Bud der Genovens | V | 0x27CB78CEAB11C6A49C8808E86CDC22C7 ; MKBv39/FindVUK 0.99 -0x179119133C4E8A95D67B98E8842E21A58AD86364 = BUDDY (Buddy - Blu-ray???) | V | 0xD2A7CCBD04B3EB17B147B42E668BDEA2 ; MKBv47/FindVUK 0.92 -0xAFF230E14C87F13B9A1E08099ABEF87AE8E6D9B5 = BUDDY HAUT DEN LUKAS (Buddy haut den Luk | V | 0x508CBC99EB9F5502BF64FA465DEF25C8 ; MKBv54/FindVUK 1.00 -0x34E092222ECB68E4E787D2A6154759ADEC04276B = BUGSLIFE (A Bug s Life: 10th Anniversary | V | 0x8743CB2E952FEE2A0D66B7D382564DFE ; MKBv19/FindVUK 0.96 -0xF8AF4F04346F65BA6AD35CFC47D79C72F3D77A7D = BUGSLIFE (A Bug s Life: 10th Anniversary | V | 0x067168B917FC6EA83E39D40F8E547B11 ; MKBv19/FindVUK 0.96 -0x8C51BA256969065F5F4760E78FD81CDF3E5CCEDE = BUGSLIFE_NDX (A Bug s Life: 10th Anniver | V | 0xADAF1D7F9449208C147436A47402AE5B ; MKBv19/FindVUK 1.00 -0x1AE287A4321B2B6ECF23BD927839C68F84082DA4 = BUGSLIFE_USA | V | 0x76E03CDABAEFA1F5E90D994C64A5827E -0x8E9DC345AD64AC5C95FD5E45735FC404E5A7B65C = BUGSLIFE_USA | V | 0x2CF74387E0B97B3CDEFD1582680017AB -0x92E0653F76F9FB492B2D8B99851E0ADD6587D3CD = BUGSLIFE_USA | V | 0x00E0F4F51E8CADEDD8BDAADC0ADCFCCF ; MKBrev 12 - FindVUK 0.51 -0xEC5EFA4144FB481C3A0B96731A897CC5415B9B1E = BUGSY_MALONE_BD | V | 0xACE8809933CB859D935AC58829E8D1DB -0xAAE4B72698CB2740412D3D5478EF50C0B5F2180B = BULLET_TO_THE_HEAD (Bullet to the Head) | V | 0x19B9858FEE72C83BEBCF6786A34EABF6 ; MKBv35/FindVUK 0.84 -0x8BA3C153361765F631B4A8EE155114EBDE6951CC = BULLET_TO_THE_HEAD (Bullet to the Head) | V | 0xAA3E346BBC55588737D556307EDED212 ; MKBv31/FindVUK 1.00 -0x416FC15207266D952F8E20B3948E38E1645385D3 = Bullitt | V | 0xA8892FD5ED4F509B3C616660A850BF25 ; mkbv3 -0x5C7294C9FA1ED8D313ED846530883BE517E06EA8 = BULL_DURHAM | V | 0x70461BC240A8348C30425D504463798D -0x610D29796BA172489DEA88107E5A988C56EDD6F8 = BUNNY AND THE BULL | V | 0x4F9E71BDA9A2EF4E2A963388FF2195CA -0xD959DEC81B5AC1AFC518A444FD27878F7346DA17 = BUNNY_DROP (Bunny Drop) | V | 0x86FA8A7BD72F246FD3E9F3D08FC31541 ; MKBv37/FindVUK 0.98 -0x518C56E0CD183E750DC328F3B290D2EF7808A3CB = BUNRAKU (Bunraku) | V | 0xEB29BA69C18F92828E16F95DDD9B4F47 ; MKBv4/FindVUK 0.95 -0xAB654CF18ECFA6C756CEED43365C017AA6CC6C4F = BUON GIORNO (Buon giorno) | V | 0xD2EB672362DB9D566D19D14874AE46E9 ; MKBv57/FindVUK 0.89 -0xB8FC38FD0977E15F17DAF49C9C7C0F4DB1A88D03 = BURDEN OF DREAMS | V | 0xDDE04B7AA4092A766E7A1A2EB6E4CAC7 ; MKBv47/FindVUK 0.99 -0x633ADB1C9AE82CA09644730511CAE43D45624B84 = BURIED (Buried) | V | 0xC041754D7692DF6E6C0DB491DF6E9085 ; MKBv21/FindVUK 1.00 -0x044B899173DFFDF2527857BFC248B40C1CC252CC = BURLESQUE | V | 0x0F08A73E7FFB2160286580BC7F191852 -0x7B538F36F0BF48C574827436B768A983C531248E = Burn After Reading (US) | V | 0xA3922C378A625A0B5B09A9015D70035B -0xC7DD1510023B87EF770954D2AFA5B122823BEFC0 = BURN_AFTER | V | 0x7FE166D234E60A66F1F7CC605C7AA7EA ; Burn After Reading (UK) -0xC773985C0D25C4C1169FAFB4ADB79988259E20D5 = BURN_AFTER | V | 0xF147EDA96DAC4DD8A95C85B76F178A36 -0xD43FAA6C82BE4BCAC92911015501B5B633B100AE = BURN_AFTER | V | 0x9C5A44CE0EA05FFBEE166C95E7AFF940 -0xFB28A0E4A6D7555852C72D1CA3441C97A5C1B5D8 = BURN_AFTER (Burn After Reading) | V | 0x44842F1E917AC6CBD9F1EBD9F51B27DB ; MKBv9/FindVUK 1.02 -0x7258EA7063B61F8C5026E02F01E676CF1312C526 = BURN_AFTER_ITALY | V | 0xBF4619280A0E0049D0CE1496353CC1AA -0xE3476282A6AD9D7895D14E84C3409E7B078843D6 = BURN_AFTER_READING | V | 0x7A25FA0D5C7152F3EEE1DA06F28BA0FD -0x76E793AC436AB90A8366FECA7804A99105C1763C = BURN_AFTER_READING_BD (Burn After Readin | V | 0x699B7401F933E33E12418B842FDBDBA5 ; MKBv9/FindVUK 1.00 -0xF162B0DD168E8D0294816FD3795EB74BCAA79DE5 = BURN_NOTICE | V | 0xC67A32C0CB2362A21B6A1C7C63F3FF45 -0x5BA7B9881769E1AC8995E4E7F9B4B22EBCCFEF03 = Burn_Witch_Burn | V | 0x9CC85A3414840111CE907745AE668F14 ; MKBrev 53 - FindVUK 0.62 -0xDDCF468FFBB4D7F8388779FC022C11E33739B1C5 = Businessplan zum Verlieben (Businessplan | V | 0x3FA13E8F392525C87183F675BF564F80 ; MKBv54/FindVUK 1.02 -0x696E2FA1F96D9D0D35763922BEB06201B86AC236 = BUS_657 | V | 0xA5AAE2CEB0415744D08EE6301C80F7AD ; MKBv57/BEE/FindVUK 0.95 -0xA51E306D60F7A07C60F102BE78FB8FA51E594877 = Butch Cassidy and the Sundance Kid | V | 0xC484EA662D89EC8965F5891F793029A2 -0xB515AB92490CD6875255935C6C026FB6DB14A1CE = BUTCH_SUNDANCE_F2 | V | 0x1540D9A6C8D1FC0D4E28A37B581D4ED7 -0xD35608C961B2AB69EB799558795659B1C2940D79 = BUTLER (Der Butler) | V | 0x329AA8ECD1600B3319959054017041E1 ; MKBv46/FindVUK 1.00 -0xA56849E64B8737FD478859CD98E23D1686E7D957 = BUTTERFLY | V | 0x53A20D75FE3A5CF39539B7456330CF73 -0xCF870219B5191C88EC61A8BB912660AAA1DF3E4C = BUTTERFLY_EFFECT (THE BUTTERFLY EFFECT) | V | 0xD4F772916FC0FB23B80B220F4AFAF54A ; MKBv28/FindVUK 0.96 -0x5E3874D8B27FB9A7FDB8F3181693B215FCE0C6D8 = BVXR_0x11001 | V | 0xA4F7281BE7ED2A26AF84AD27B5C648C9 -0x4027B7702A7CC7792CFE35CEF02B12759CBB6020 = BWE_S1_D1 (Boardwalk Empire Season 1 Dis | V | 0x7D473A258780F1D3833698E6EFB2FC78 ; MKBv23/FindVUK 1.00 -0x9B918E0FA247CFFE2ECF315F4E89925677B7FD50 = BWE_S1_D1 (Boardwalk Empire Season 1 Dis | V | 0x39AC873AC8BDA50952904824CC416730 ; MKBv23/FindVUK 0.96 -0xDF5DA41E4F9DB862F49DE4638D0F81508EE06AE2 = BWE_S1_D2 (Boardwalk Empire Season 1 Dis | V | 0xF9C3EC19ED48D2A9935A05072AB08A11 ; MKBv20/FindVUK 0.96 -0x6D11044DC2E1003430F353FA53F3B6AB56B1D48F = BWE_S1_D2 (Boardwalk Empire Season 1 Dis | V | 0x9C07AB320E05113050D3325430412545 ; MKBv20/FindVUK 1.00 -0x1EE618D4C296D25BB9F13E1D60FB1581EAF9CDA9 = BWE_S1_D3 (Boardwalk Empire Season 1 Dis | V | 0x769C93C5168B0220F5076F78C51FA52A ; MKBv20/FindVUK 1.00 -0x1AD424A7C2ED1E48FFF4144927685AA84AC3C0B5 = BWE_S1_D3 (Boardwalk Empire Season 1 Dis | V | 0x1439E2B9B5925427661BD8D4091D13FF ; MKBv20/FindVUK 0.96 -0x5687B58D8D86E050E0517C64AF846C9832B5D8AF = BWE_S1_D4 (Boardwalk Empire Season 1 Dis | V | 0xC9246E9442187B48E1A83231EF6A8A74 ; MKBv23/FindVUK 0.96 -0x168E08E433A9469A68235C9657AB89E45793B545 = BWE_S1_D4 (Boardwalk Empire Season 1 Dis | V | 0x328584FE2D0346CFDC380DC70C611561 ; MKBv23/FindVUK 1.00 -0x1D82307CDD54C8A0947AD4D7DC81328258B69C54 = BWE_S1_D5 (Boardwalk Empire Season 1 Dis | V | 0x1631BFF32BD8168C03ADF9A093E4DECC ; MKBv23/FindVUK 1.00 -0xF728879611708C2C98BF37C65DD2DCBBEC57BC46 = BWE_S1_D5 (Boardwalk Empire Season 1 Dis | V | 0x16AE171C4162D8AF3C614E4AE43A6052 ; MKBv23/FindVUK 0.96 -0x084053AD88924FECF8DA746E400FDDB155C7BF4A = BWE_S2_D1 (Boardwalk Empire Season 2 Dis | V | 0xA5FC9A4187512C3FCCEC7F57A4677B7A ; MKBv28/FindVUK 0.96 -0x80D3FE1421368357E0A30CBDBCD38E0C1ADEEFE8 = BWE_S2_D1 (Boardwalk Empire Season 2 Dis | V | 0x4063396B8AA609A891CF1613BB5933FB ; MKBv28/FindVUK 1.00 -0x870002F46B9755C463F25742EC1A288097B0E418 = BWE_S2_D2 (Boardwalk Empire Season 2 Dis | V | 0x3361BE40358FCE85B12F127440F73E57 ; MKBv28/FindVUK 1.00 -0xEC0D848D370E5907126A2F3AFA270C98A7D399FC = BWE_S2_D2 (Boardwalk Empire Season 2 Dis | V | 0x2FBADC162B32B7B6FB5FB63F7DC28640 ; MKBv28/FindVUK 0.96 -0x035DE515F3D11ACE7211CAE58A483E8CF745D52B = BWE_S2_D3 (Boardwalk Empire Season 2 Dis | V | 0x0D737A01EE50F524D37F1154FBDC87B5 ; MKBv20/FindVUK 0.96 -0x93A39DF3234832D35BB2996062ABC109DED6714F = BWE_S2_D3 (Boardwalk Empire Season 2 Dis | V | 0x004107F5B2CE819ED3F3E6CD134B13D1 ; MKBv20/FindVUK 1.00 -0xB2AF7228F5567D3C88129434A53D6BB39067166C = BWE_S2_D4 (Boardwalk Empire Season 2 Dis | V | 0xF9E54CD53116ABC271BFA2196D3A9594 ; MKBv25/FindVUK 1.00 -0x624C57EBAA8544D1FBDDB0CF9A304C34FBAAD6DB = BWE_S2_D4 (Boardwalk Empire Season 2 Dis | V | 0x909ADF07087B61648F538ACBA54CD01F ; MKBv25/FindVUK 0.96 -0x24D2DD291FBDE1252B6E0FC26654EEB314FD3D4E = BWE_S2_D5 (Boardwalk Empire Season 2 Dis | V | 0x2388C8509719823E7284D81EE35F4040 ; MKBv25/FindVUK 0.96 -0x53E2F53830162513E4EB9F66B9B0F0812A87BDC5 = BWE_S2_D5 (Boardwalk Empire Season 2 Dis | V | 0x9C26DE5470ACA2974ABDCFA50AA46A47 ; MKBv25/FindVUK 1.00 -0xA6473E5B2516324149107FBDF003E09B91897AC8 = BWE_S3_D1 (Boardwalk Empire Season 3 Dis | V | 0xC036B3B793A74AA593CCD7F196F9157A ; MKBv36/FindVUK 0.96 -0x0E93CB12EDEBAE156B6157105864D35857F7BB6B = BWE_S3_D1 (Boardwalk Empire Season 3 Dis | V | 0x71108723951F7B83D8EDD3CD18C9D32F ; MKBv36/FindVUK 1.00 -0x8515291CCC3BA421E0D5D1E8F2621D7CCA888BEB = BWE_S3_D2 (Boardwalk Empire Season 3 Dis | V | 0x2AD7AF79E573C93DA343B3283713F5D6 ; MKBv36/FindVUK 1.00 -0xE82A86226022D57FA70C7C98227F270E79C16EDD = BWE_S3_D2 (Boardwalk Empire Season 3 Dis | V | 0xF68FDD7331D7DE9356C14561F0B48934 ; MKBv36/FindVUK 0.96 -0x0D33392EC5704502DF176331DDE3FE866C206722 = BWE_S3_D3 (Boardwalk Empire Season 3 Dis | V | 0x088D3F5BD6F0D7FABDEDB3470117DE4A ; MKBv36/FindVUK 0.96 -0x7EF39FD200D7A04451CB532228DA12127452646B = BWE_S3_D3 (Boardwalk Empire Season 3 Dis | V | 0xA598D0D146A958759D721C79A8DFE0CA ; MKBv36/FindVUK 1.00 -0xC05593632CD4C98561C7B2D1CFEFC5419803A835 = BWE_S3_D4 (Boardwalk Empire Season 3 Dis | V | 0x296EDAC6F80F639AB16F56D8FDA0733E ; MKBv36/FindVUK 1.00 -0x944DEA5BA2A53E048AB2B61A02E528AFD208DEAA = BWE_S3_D4 (Boardwalk Empire Season 3 Dis | V | 0x360290CB52F4059390B2505585657B7F ; MKBv36/FindVUK 0.96 -0x30611F8C6F974E92DCC5536BA98AB6160D173C04 = BWE_S3_D5 (Boardwalk Empire Season 3 Dis | V | 0x44F2D8293AA9840B7B0F4D877F65818F ; MKBv36/FindVUK 0.96 -0xAE5CD387690AAC53EC7A21A123313CE6BB45D4E0 = BWE_S3_D5 (Boardwalk Empire Season 3 Dis | V | 0xA797C126A52A0985D139CFCB7A32B745 ; MKBv36/FindVUK 1.00 -0xF8B57B960D124D3F39E23C468A3B29CDBEF05A90 = BWE_S4_DISC1 (Boardwalk Empire Season 4 | V | 0x33E3299BA002CAB7D5A0181D9FD19B8D ; MKBv46/FindVUK 1.00 -0xD57101D81EA6F64749E79D5D45271B9C4E92B8D5 = BWE_S4_DISC2 (Boardwalk Empire Season 4 | V | 0x2EE295CD1AFD1455B57366FE49438B0D ; MKBv46/FindVUK 1.00 -0x36EE3DB9C696C7C183F2D6170E29BF44929E2CA4 = BWE_S4_DISC3 (Boardwalk Empire Season 4 | V | 0xCBBDF7A7BA1CBB10C000DCC3483277BA ; MKBv46/FindVUK 1.00 -0x0E73BF7C3A1D00BA6C274C74D7EBE373E741CDFD = BWE_S4_DISC4 (Boardwalk Empire Season 4 | V | 0x646847D6B3369CE213D626B5B6B50CFD ; MKBv46/FindVUK 1.00 -0x0C6D9439ABA14FC4E00FA91438FD1B4FB59CE005 = BWE_S5_DISC1 (Boardwalk Empire Season 5 | V | 0xAC9D0114D4CE7EADB816E4970B88C413 ; MKBv50/FindVUK 1.00 -0x1076EF2E7D49730A67A2680F67789B12F1DAE1C1 = BWE_S5_DISC2 (Boardwalk Empire Season 5 | V | 0x317AE05F87790159FA31031A0D4DA06C ; MKBv50/FindVUK 1.00 -0x8E7B15C04E2ABF87EC1494B7A00ABE8256489D97 = BWE_S5_DISC3 (Boardwalk Empire Season 5 | V | 0xC6034B7EAB2C17825185CDCF945028E2 ; MKBv50/FindVUK 1.00 -0x3F4693270729E43118FBF15B6394BB234CB7571A = BYEBYEMAN_NA (The Bye Bye Man) | V | 0x35ABED2F4087F02E71A280FA1E3D61DE ; MKBv57/FindVUK 1.02 -0xA137A8CD2CC655AA0F4243831C858F9CEE085BFF = BYOSOKU 5cm (JAP) | V | 0x3798D3B5A9B9230F3B793F4C438298F1 ; mkbv4 -0x58162DC0FE0881284E6A8DF1605BA5F9E14358BC = BYZANTIUM | V | 0xB519A011B66BE8EA43B0E0FCF2DA98A4 ; MKBv44/FindVUK 0.80 -0x9EF0D78146B7510032550830BD164DFEDF0B29C9 = Cabin Fever | V | 0xFA7A05C452EA6E068AAFD5F95FE380AE -0x2B099B08FB4806529234720CE851C265B34421F4 = CABIN_IN_THE_WOODS (Cabin in the Woods - | V | 0x6FB14E3F71DE1A10E371B9AFBA66F4ED ; MKBv31/FindVUK 0.99 -0xB14F752F681DD9C90FE8BB995DC0FDB85BCB5221 = CABIN_IN_THE_WOODS (The Cabin in the Woo | V | 0x5372015B7890C7E2E23D37E5AF733EA8 ; MKBv34/FindVUK 0.96 -0x415F0655058D6708D5558BEBD54B36B67CF64D50 = CABIN_IN_THE_WOODS_DE (The Cabin in the | V | 0x1AF8BE3F54FBFB09609E2A8F869CA63E ; MKBv35/FindVUK 1.02 -0x81DEF94F61E4F379525D7977CEBC5E744CBFED41 = CADDYSHACK_CE (CADDYSHACK CE) | V | 0xB9DB2A42F6D227BD2B1B6773FEFD69F6 ; MKBv16/FindVUK 0.96 -0xAEEF175E30DA60611331054583BDD7181A4E5E00 = CairoTime BD (CairoTime BD) | V | 0xDE5262541648E2EDD67D1A7CBA5B9509 ; MKBv19/FindVUK 0.96 -0xB6CB0EF32461926AC835F761434BCE8CA857B482 = CAKE (Cake) | V | 0x568930DF075B0C2E022F83058176E0A0 ; MKBv47/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0xADE58054B01CA1DD148CC032E824033E22CDDE59 = CALIFORNICATION SSN 1 DISC 1 (Californication Season 1 Disc 1 - Blu-ray™) | V | 0x13B9D272051A975D6F7CD74FCBC4F38D ; MKBv36/FindVUK 1.00 -0x7C495027DD112A51E7D26079DCFC34089C9BCB0A = CALIFORNICATION SSN 1 DISC 2 (Californication Season 1 Disc 2 - Blu-ray™) | V | 0x12061F9669A0B11F0DD7DFC5408197ED ; MKBv36/FindVUK 1.00 -0x693E9F3BB868AC1F7E79A7DD5F9EA20F81CA0E1B = CALIFORNICATION SSN 3 DISC 1 (Californication Season 3 Disc 1 - Blu-ray™) | V | 0xA53D2A3D2566EF549FE3CF1CAFE61977 ; MKBv36/FindVUK 1.00 -0x73E0FFE619379C00CB0D45936B40C16C6AD89D00 = CALIFORNICATION SSN 3 DISC 2 (Californication Season 3 Disc 2 - Blu-ray™) | V | 0x8352980AC38C99E2FD55359A26D0CB8B ; MKBv36/FindVUK 1.00 -0x03CC35B3F001035DCB62674E36159C8C08690779 = CALIFORNICATION_S2_D1 (Californication Season 2 Disc 1 - Blu-ray™) | V | 0x54A284B5316D49F2228FCCE7EC2D2BB3 ; MKBv36/FindVUK 1.00 -0x3349A4A74B1228ACEC71568FD7121B728967CFD8 = CALIFORNICATION_S2_D2 (Californication Season 2 Disc 2 - Blu-ray™) | V | 0x24DC4C062646E880E1D043501EF59721 ; MKBv36/FindVUK 1.00 -0xF9DFBF4167EF1EEC1297047CBDB35CBBA3E6B0A9 = CALIFORNICATION_S4_D1 (Californication Season 4 Disc 1) | V | 0xB1FDAE0F09F332ECB43F5125D3AD381A ; MKBv23/FindVUK 1.00 -0xBBF8C1E07B94727E2D0B8A8D89E602DB8C2EBC43 = CALIFORNICATION_S4_D2 (Californication Season 4 Disc 2) | V | 0xF8C2652CD684CF481A6621FCF792C0B5 ; MKBv23/FindVUK 1.00 -0x00F8C0F27C876AC840778E0E28786857AB8B4D14 = CALIFORNICATION_S5_D1 (Californication Season 5 Disc 1 - Blu-ray™) | V | 0x25F3A417C27E7F1B8F383C2F95178E27 ; MKBv36/FindVUK 1.00 -0x942D375F60F94CC8F493C257AFCB8572620A6827 = CALIFORNICATION_S5_D2 (Californication Season 5 Disc 2 - Blu-ray™) | V | 0x5A48A720F5C3829F19A29EE77195CD2B ; MKBv36/FindVUK 1.00 -0xC4E445984DCCC26BE73D30290EF15245FB6A8670 = CALIFORNICATION_S5_D3 (Californication Season 5 Disc 3 - Blu-ray™) | V | 0xD686077EE1CD4100123E786F12EC0951 ; MKBv36/FindVUK 1.00 -0xCE82A3FB901CA93186B7984CA8E5CC8F79EA8DB0 = CALIFORNICATION_S6_D1 (Californication Season 6 Disc 1 - Blu-ray™) | V | 0xDC842482843ED1A8EB007BBAFF96896E ; MKBv46/FindVUK 1.00 -0x2D74B7774F44A9B0BF1176100F54A13051614A43 = CALIFORNICATION_S6_D2 (Californication Season 6 Disc 2 - Blu-ray™) | V | 0x0086D80376BBCF3E78CCB50C19FBC24B ; MKBv46/FindVUK 1.00 -0x165734B11AA49C65ED7BF5096A654EA9174A32DA = CALIFORNICATION_S6_D3 (Californication Season 6 Disc 3 - Blu-ray™) | V | 0x0A86EE95EA86A4B54E7CB5D7E9D4E85C ; MKBv46/FindVUK 1.00 -0xDF1E1E3EFDEA58CDB4C66D57722E8B84E9481880 = CALIFORNICATION_S7_D1 (Californication Season 7 Disc 1 - Blu-ray™) | V | 0x93B7678F8666CEB73A11340B3BC1644E ; MKBv50/FindVUK 1.00 -0x732C67019DA199FA31438C5977739989BACE936A = CALIFORNICATION_S7_D2 (Californication Season 7 Disc 2 - Blu-ray™) | V | 0x9524CE814FF8D65D66F21B174C0D0AE7 ; MKBv50/FindVUK 1.00 -0x176AE82CF29645253BC2231342F42553DF434006 = Caligula | V | 0x9AF12C619E336ED7FEB7B65372114085 -0x2295D039AE0E09FCA2BB13C868E47C00D8FC4A8B = CALIGULA (CALIGULA) | V | 0x23000A438EC40142F815D0607C7B8132 ; MKBv20/FindVUK 0.90 -0x21D0F811A6F0F62CB0AEF1E5755EF6FF0091627C = CaligulaFSK | V | 0x75E89D3E46A255DCA49481DDF13C7F8B ; MKBv33/FindVUK 1.00 -0x3586AA00E7E3C45CBB41B2737BE99C0B876F25C0 = CALL THE MIDWIFE S2 D2 (Call The Midwif | V | 0x2B648489181AF7840B4D40411B901479 ; MKBv31/FindVUK 1.00 -0xE4162BB3C17B65961ABDB49CB17DF86E66576D10 = CALL THE MIDWIFE S2 D1 (Call The Midwife | V | 0xD5DB29C7D859F81FAF86F431680FADA9 ; MKBv31/FindVUK 1.00 -0xA29D05B9A937EBBD84DB56A8621ADF0B859635BD = Camelot disc 1 | V | 0xCE95236A6F8E2424B37EAE0C8BBA79AD ; mkbv25 -0x6E9F6D6A28B9F42945E4D60EE0AE5E698FFB337D = Camelot disc 2 | V | 0xC8378369771FAF84F7E6C833B87BB730 ; mkbv25 -0xCDB2D2BFFC00CFC24B8857AC712F5C88D2F3387B = Camelot disc 3 | V | 0x585285A8B2BCE56FBF5F336E737981F3 ; mkbv25 -0xAFE5718AD8D7BFBF50ADBF9B93B473823803E28B = CAMPIONE _ DISC 1 (Campione! 1.1 - Blu-r | V | 0x1BEA71D4437BD6BB6C6C37633061E7A5 ; MKBv44/BEE/VUKNOTVAL!/FindVUK 0.89 -0x850284E25FC80916D56314806603E3090B347CCF = CAMPIONE _ DISC 2 (Campione! 1.2 - Blu-r | V | 0xBE9A797485813A52F04A9C87F4AAEA8E ; MKBv44/BEE/VUKNOTVAL!/FindVUK 0.89 -0x98AF4361187546E57EAEBB335E82C9F61F46611D = CANAAN DISC 1 | V | 0xD1ADC89ABD040DC47135DF406C630D20 ; MKBv19/aacskeys 0.4.0e -0xC7A93F377E73C8EA431ACB4F7EFF5B2A6B6B216D = CANAAN DISC 1 | V | 0x09DE83E677263D0117480B8CD18B50FF ; MKBv58/FindVUK 1.02 -0x92771D1512651B3154913929CEBFD58659543366 = CANAAN DISC 2 | V | 0x3DE86E67853CA13C8A0B9D337B470179 ; MKBv58/FindVUK 1.02 -0x802B6C61D7C9DF8B51BE34C15FE20BB303E21F14 = CANDYMAN_G51 (Candyman) | V | 0x709AE71DC39913054B8BF95EF8BD794C ; MKBv20/FindVUK 0.96 -0xE6D6D7EA0BF84A144E56F89A4DACD3F002E25B8D = CANYON_3D_DE_BD | V | 0xCFA92528E537374C2F713F053C74475C ; MKBv17/FindVUK 0.80 -0xCA955456BF36123F76927212141D62222A1EE6CD = CAO_DE_BRIGA | V | 0x278A779AAA0FF0D0C75330BD5034F113 -0x568A2317FD5BB090A26D40664AA4DDA7A9174E65 = Cape Fear | V | 0xDF2428737089DFD59D8EA9258DD3E679 ; mkbv19 -0x0D125F157FBF7992CBBF4387C3F314AF8190DDE3 = Capitalism - A Love Story | V | 0x1600A9F9232E073DEF01DA2C08774C65 -0x5932E6B802C742DD19E2C87C185B48B89FCB678E = CAPOTE | V | 0xA595B9AAC1CE51EACA9D6076846EEBBA -0x88F04ED6C9DF10D444DB2B22FA0B8318C16F88DC = CAPOTE | V | 0xE6285D82CBAA042350FF46546C10C151 -0xE2FA2EDD0D3DEA1331A2E32779024EFEC2C199EA = Capote In Cold Blood | V | 0x906D4941FF87DA75A3DF963E64EB5DA7 -0xC8A8BA5928F9EC67493C10E42AB4BAF252C56E9F = CAPRICA_DISC1 (CAPRICA BD1) | V | 0x9B60140283785B3106128206C237EE9D ; MKBv49/FindVUK 0.96 -0x597BE732E2800A1D7980D026ECF7BF6977D8C17A = CAPRICA_DISC2 (CAPRICA BD2) | V | 0x9CAD62F0E051DC7C092CE1C54A41DBBB ; MKBv49/FindVUK 0.96 -0x39BC6F04770ABFA9CDA787285FBF882E8214BCFB = CAPRICA_DISC3 (CAPRICA BD3) | V | 0x983A65BA1EA4099A22179B785ECBA796 ; MKBv49/FindVUK 0.96 -0x7C8068AE8B805676B547694F7255231D1F9C6BEF = CAPRICA_DISC4 (CAPRICA BD4) | V | 0xA68B9ABBC6DCF06E1176D4E74F7D4482 ; MKBv49/FindVUK 0.96 -0x0B818A3293A4CE02F9E2C762D9E05E8AB6D4FA47 = CAPRICA_DISC5 (CAPRICA BD5) | V | 0x62D5728815213136F1B8365E290AF0C1 ; MKBv49/FindVUK 0.96 -0xB7782B2230F9D5948EDAE34CEE8DC6752CE50B0D = Captain America The First Avenger | V | 0xC32B11275BC21434F1DA3A2751D91554 -0xFE2F4F349CCC9E8DEB811D9150EBD3D80D078C97 = Captain America The First Avenger | V | 0x4BEA5C080D934C1A064B9410D86B7117 -0xAED1CC26EA09E76F0A158674D183790166DE1C16 = CAPTAIN FANTASTIC | V | 0xFF412549F4E8E5D0979FD5CE95D42411 ; MKBv62/FindVUK 0.98 -0x3F2E665EC234BC3C026C6FFC5A0ACA80338875CF = Captain Phillips (Captain Phillips ??? B | V | 0xEDA96D9C0AC7D4190A6D15C21D4CF825 ; MKBv43/FindVUK 0.96 -0x402448FD685088002E1B2C818D645999350EDE86 = Captain Phillips (Captain Phillips – Blu | V | 0x004587CCA50C812D33072E912F7A0F06 ; MKBv44/FindVUK 1.00 -0x1A56AD35D52A2B5D04DBC7C4E05382D773ACE4B4 = CAPTAIN_AMERICA_CIVIL_WAR (MARVEL S CAPT | V | 0x853975BFBBB44DB7673825C76388F227 ; MKBv56/FindVUK 1.02 -0xE19E856125BD16144B8328ECA76A205D7EAE4F43 = CAPTAIN_AMERICA_CIVIL_WAR (MARVEL S CAPT | V | 0xF92611EE5FF8948E88930F1EE83FD957 ; MKBv57/FindVUK 0.96 -0x7629C5E31EC5D87F1E831AD5E0B3277C856CBB87 = CAPTAIN_AMERICA_CIVIL_WAR (MARVEL S CAPT | V | 0x9CB211577194270E05D3F797412BA442 ; MKBv56/FindVUK 0.99 -0xC5A68060302E8AB2A6010480BE93837A8145F5FF = CAPTAIN_AMERICA_CIVIL_WAR (MARVEL S CAPT | V | 0xF66CD2C0BBD5ED430D3B3BE00C02DB8D ; MKBv57/FindVUK 0.98 -0xD69423533BD40B2CC3D8D3D0305E21D77A005F9F = CAPTAIN_AMERICA_CIVIL_WAR (MARVEL S CAPT | V | 0x6F1CBCB55A70C038B86FAE73ED930151 ; MKBv57/FindVUK 0.96 -0x9A3F76F936285CE37AA5ED5C68C29ADA7884D9F5 = CAPTAIN_AMERICA_CIVIL_WAR (MARVEL S CAPT | V | 0xF14A239766B6264137FB93CB8194298E ; MKBv56/FindVUK 0.98 -0xE318708FDD301C53E0D46678A36B5BDD59514379 = CAPTAIN_AMERICA_CIVIL_WAR_3D (MARVEL S C | V | 0x0251D46C214841349E30ECE6A62E5B6B ; MKBv56/FindVUK 0.99 -0x84F374985A7D6B34AB3CCD8168155FB24B061522 = CAPTAIN_AMERICA_CIVIL_WAR_3D (MARVEL S C | V | 0x5444DD0FDEC445F1C4B533C40F11F254 ; MKBv57/FindVUK 1.00 -0x72E0B13EB5391A83FF4D98D5535353DEEC8C4638 = CAPTAIN_AMERICA_CIVIL_WAR_3D (MARVEL S C | V | 0xB4B6C3D9DC1055FE22BE79047270D380 ; MKBv56/FindVUK 1.02 -0x7E676841540B33358884467FB15EEB882E8F16F7 = CAPTAIN_FANTASTIC (Captain Fantastic) | V | 0xEF58634860CF087DECACFDF2BCCE938F ; MKBv62/FindVUK 1.00 -0x34FF278B4B27943ADC7CE98D9EDCD60681D722F5 = CAPTAIN_FUTURE_DISC1 (Captain Future - D | V | 0x1A8D3087F3FE05179BFBA5DF1BB5994D ; MKBv62/FindVUK 1.00 -0x52ED793D678D460A52BF07B7BD1D6AA433C3FA22 = CAPTAIN_FUTURE_DISC2 (Captain Future - D | V | 0xD8665FBDD3C321E7E188C58BD3BEC184 ; MKBv62/FindVUK 1.00 -0x273B5D5FC6D8654D72DD38A3E4CA610636B0D369 = CAPTAIN_FUTURE_DISC3 (Captain Future - D | V | 0xCE1A74077157244FB4933DBCF3EACD73 ; MKBv62/FindVUK 1.00 -0xF34AC0F93D6801C6472049D1BD24D9C6C963FC52 = CAPTAIN_FUTURE_DISC4 (Captain Future - D | V | 0xE88266A07E3A403FF6FCFB11A2175C4E ; MKBv62/FindVUK 1.00 -0xAC4F2A8AF11D21CE5ADEA0B7D5E67A0DBB1B3A59 = CAPTAIN_FUTURE_SF_DISC1 (Captain Future | V | 0xB48BE0A1E0370FA4EC77C577070E05FB ; MKBv62/FindVUK 1.00 -0x29C6E5F2A158B3C6EC2DC50BB5A07277928491E5 = CAPTAIN_FUTURE_SF_DISC2 (Captain Future | V | 0xE0ED617CF7F2976BED7034A04F208AF6 ; MKBv62/FindVUK 1.00 -0x06E77B5347C32A61E996B17B9F439EADB21BC972 = CAPTAIN_FUTURE_SF_DISC3 (Captain Future | V | 0xD30A9DFA653264C6B387070D497D5161 ; MKBv62/FindVUK 1.00 -0x88AAE5B278C43C9F6395BFAAC7E5B301E54C72D1 = CAPTAIN_FUTURE_SF_DISC4 (Captain Future | V | 0x4D04A7FCC20A8FCB365C5654D6B34964 ; MKBv62/FindVUK 1.00 -0x73ADBE87903805F2B3745B2662828E67E0433D0D = CAPTAIN_FUTURE_SF_DISC5 (Captain Future | V | 0x1E0397F1643A2F0A71D8EB1D4AD887C6 ; MKBv62/FindVUK 1.00 -0x23C7BDB23916BC9BB74B8B41B9889319E20213AC = Capture_The_Flag (Capture the Flag) | V | 0x8E63897B28FBBAC4C66618A2D2870A4F ; MKBv56/BEE/FindVUK 1.00 -0xD27B39D92536EC04EBA91A1BFAC7BFECC5877AEB = CAPT_AMERICA_WINTER_SOLDIER (MARVEL S CA | V | 0x7B28CFF1C9F7EA885953B078DDDC3FE3 ; MKBv46/FindVUK 1.02 -0x43454B93060647DE542D6C008B5748F3D77AF995 = CAPT_AMERICA_WINTER_SOLDIER (MARVEL S CA | V | 0xBB277A16937A507C6A8DB53DA2E94DF1 ; MKBv47/FindVUK 0.96 -0x4CB07A80D998C06118A48747EA5ADE847C403E57 = CAPT_AMERICA_WINTER_SOLDIER (MARVEL S CA | V | 0x425392171A875D2F0B356ED952DA04E6 ; MKBv46/FindVUK 0.98 -0x5F5C160363B4CB9343605221630197BFE1C4538E = CAPT_AMERICA_WINTER_SOLDIER (MARVEL S CA | V | 0x03A605780680ADCD39283B4953C76206 ; MKBv46/FindVUK 0.96 -0x8F5EF420B337E08D75C5FEC4C6DC5B551DA536CC = CAPT_AMERICA_WINTER_SOLDIER (MARVEL'S CA | V | 0x2C8B119AC87ABEDCA96531EE5A897B12 ; MKBv46/FindVUK 0.84 -0xA8BED649BAA93A3171BC19766328062A2C4E03AC = CAPT_AMERICA_WINTER_SOLDIER (MARVEL'S CA | V | 0xBAFE1039C5FEA293FACDC44C364BCFBE ; MKBv39/FindVUK 0.87 -0x768EE77A2BB03A685011904D9433480B77E23AED = CAPT_AMERICA_WINTER_SOLDIER (MARVEL'S CA | V | 0x1A5C1FC3C3B0725A56BA84AE180FB107 ; MKBv46/FindVUK 0.92 -0x3365732F4A6E0D1F0A1AEA70515DE5C3A5058554 = CAPT_AMERICA_WINTER_SOLDIER (MARVEL'S CA | V | 0xA10FF2BCBAE7A31CDEE7712568AD6AA2 ; MKBv46/FindVUK 0.91 -0x4715E60E6795CD006B6A168F69F18BD31D56C80D = CAPT_AMERICA_WINTER_SOLDIER_3D (MARVEL S | V | 0x621191DAE6C134492BF814066B7B900B ; MKBv47/FindVUK 1.02 -0x0202770E2C817028D77779ADC46AF07FF1EAE64B = CAPT_AMERICA_WINTER_SOLDIER_3D (MARVEL S | V | 0x0C6A2DC9004AB1DB6061931EDC152B1B ; MKBv39/FindVUK 1.02 -0xE9675D23F5B9D4D71A249345F3BB9FF4F99BCE1E = CAPT_AMERICA_WINTER_SOLDIER_3D (MARVEL S | V | 0xE8CF6316927813137C8B53E692DE9675 ; MKBv39/FindVUK 0.98 -0xA8D2AFAB354AA80D8AB5555E590AFA54CD9D0844 = CAPT_AMERICA_WINTER_SOLDIER_3D (MARVEL'S | V | 0x441E50B5504B047FC07FA942F2022FAF ; MKBv39/FindVUK 0.87 -0x43756B70228EF5F713B0AD1AA25B93B2204771A5 = CARAMEL (CARAMEL) | V | 0x4ADE47A7E3247795A7377BA5E7F7DB80 ; MKBv19/FindVUK 0.99 -0x60EF67147E8FBA10E4766DD454E14ED173C045AB = CARAVAGGIO | V | 0xE0B44F41E6B4439439A226210C0663CE -0x1CF013EC6112ECDDE599A0FF4542768A6053D537 = CARDCAPTOR SAKURA Disc 1 | V | 0x0E3B767DD75ABB998822B64A913C5C8C ; MKBv47/FindVUK 0.81 -0x12B4FB41A01871E02F5FA9B8AB4E26E516F25A16 = CARDCAPTOR SAKURA Disc 2 | V | 0xD9E813A6C0D693697273DC2EDC7C8782 ; MKBv47/FindVUK 0.81 -0xCDAF9FB4656289FF6CB585F8D41CB464332716F2 = CARDCAPTOR SAKURA Disc 3 | V | 0xF9476BC84E6407B1CC3909BF1D320541 ; MKBv47/FindVUK 0.81 -0x72740258634530D2D50CCB06D2BE439FA882E159 = CARDCAPTOR SAKURA Disc 4 | V | 0x0B608E83A61797FA0FB4CF80E7BE0201 ; MKBv47/FindVUK 0.81 -0x2584D8E42F7B26E16656300B326BF00B23C9AD92 = CARDCAPTOR SAKURA Disc 5 | V | 0x1BD8288A95A071AB02740D203C95A3F9 ; MKBv47/FindVUK 0.81 -0x2C1A7C92F7C5AD82B33AA3859EDE85EAD0A61396 = CARDCAPTOR SAKURA Disc 6 | V | 0xD981F47115C937B58202C48971908358 ; MKBv47/FindVUK 0.81 -0xDC7B6FD711DE38FBBAF5EBE46DD31665A85D1948 = CARDCAPTOR SAKURA Disc 7 | V | 0x56724A92C9B1AE33DAFE0437D7B6BD86 ; MKBv47/FindVUK 0.81 -0x637A6B824B6463E6D881BCD2B3356D6E88045567 = CARDCAPTOR SAKURA Disc 8 | V | 0xAF01534D763E45AB707A47EDD42E49D1 ; MKBv47/FindVUK 0.81 -0xED2AA28CBF585BD3CAF0ED0C109D373D57D5CAF9 = CARDCAPTOR SAKURA Disc 9 | V | 0xA474BA1BF27E139F58A3965D9ACD82AF ; MKBv47/FindVUK 0.81 -0xEE82917B757976800724D66CD2A70DC1507AD13B = Cardcaptor Sakura Movie 1 | V | 0x6D938ABE0D98930DD4B1F2CF68A87577 ; MKBv47/FindVUK 0.81 -0x70C51575DAC69AFBA070B92B6CA5A6CBE29E5B19 = Cargo | V | 0xF99556221FF8ABA78F12DB13D3837A97 -0x1838E67C40C94FF229E895CAF08722B0844813E2 = Cargo | V | 0x61DE45F1C3B9F2A6ADE69431BC75C92A -0xB070849435C01B764CE5690107DAFF00F79F443A = CARLITOS_WAY | V | 0x392B9D61B39CB0ED07B3C8F29602452B -0xBB7CC944AD9D118A69690351A6680FF9A363B4D0 = CARLITOS_WAY_G51 (Carlito s Way) | V | 0x91A6873823E3376D7A84743EF1579D41 ; MKBv17/FindVUK 0.98 -0xF708812895D0AAE3F7A6AA9B236489174A8E6A85 = CARMEN | V | 0x5233F7F379012458AA066B31FC183699 -0x0C02D4E74A86DAD13D4449DF4CFF93702BCC49AA = CARNAGE (Carnage - Blu-ray???) | V | 0x30CDE77AB9ED0694824770A67EB3031B ; MKBv27/FindVUK 0.96 -0x58E4EEBE0297517DAF147A3F523FC468FBA4E4AF = CARRIE (Carrie) | V | 0xB0169D6F8FE3EE1CBBB77F50879ED8C1 ; MKBv42/FindVUK 0.92 -0x621E7F3DED061842E6AA4B1F0EE4E23A921ED1DE = CARRIE (Carrie) | V | 0x4B42787E6123EBA449346F0E6EE6EE0D ; MKBv42/FindVUK 1.00 -0x21FB8F6CFE6FFBDB54F0C808357E4DCDCB84CE71 = Carrie (Carrie) | V | 0x640C9B86361858966BDBEE4A8D5B1833 ; MKBv36/BD /BEE/VUKNOTVAL!/FindVUK 0.96 -0x1A6F27055637025090BBBAC1D721246F5BD2EBEA = Cars | V | 0x9509AAC96A85B6170C82350EFF6FF2FD -0xC562F1EF4B736F68330C6E0BC9E916C85AE0467D = Cars | V | 0x1C5E18F1F5FEAADC6FC735A917D5A7E3 -0x59996671AB3F7FD95D39A48B04D4CE52B13F2073 = Cars | V | 0x59A2287CF71E73FF6DC1F2540CC3EBD5 -0x9B717BEFA5E5D3084E94A981D2FCEA315F54622A = Cars | V | 0xD93E5229C5208E763F4A72F96045660B -0xFE349C3727C6FEE8F03558B2B0706704B8D69AE9 = CARS2 (Cars 2 - Blu-ray 3Dâ„¢) | V | 0x5C5FDE2B1666687EECB52B61C741AA78 ; MKBv23/FindVUK 0.99 -0xFA22A9EC562F1366AD2CAFAAECC0412080C9E0A2 = CARS2_D1 (Cars 2 (Disc 1) - Blu-ray???) | V | 0xE95F54FAD52879E05C9ACF33C2CFD9AD ; MKBv23/FindVUK 0.96 -0x5342057443242D6E97523CF32DDC48A73A040121 = CARS2_D1 (Cars 2 (Disc 1) - Blu-rayâ„¢) | V | 0x4D5EBB7149A3D6E4D81B7B08BC24D0E9 ; MKBv23/FindVUK 0.99 -0xDB6B73BA4A70DBDBE7CC3A1B0FE5CD8B1A2CBC67 = CARS2_DISC2 (Cars 2 (Disc 2) - Blu-ray?? | V | 0xDB221F7D03B0EA6196E906191713C007 ; MKBv23/FindVUK 0.96 -0xA36A08ACD0C566E1FC2DC2DA2F7600665FEB0A4A = CARS2_DISC2 (Cars 2 (Disc 2) - Blu-rayâ„ | V | 0xA1C577C5813C76AAF9E933CFD47FBE0E ; MKBv23/FindVUK 0.99 -0x5830B2371C425C1C3383CDD7BA4E6201AC84FB36 = CARS_2 (Cars 2 - Blu-ray 3D???) | V | 0x35872EA6B5149199CA05528D1D99EA09 ; MKBv25/FindVUK 0.96 -0x138B7987D035DBFE53307480FB55BAE509E68EB3 = CARS_FRA | V | 0x67FD31B6D6D80C510BFBFDA80F486CC9 -0x2A4E0851B1C8C0FFE665D692856ACDFD86C43F3D = CARS_GBR | V | 0x93F073907528E17CABEC3CC886DE7AB4 -0xCEDBD55D77F9FE19F3F30B3EB228A931595A4EDC = CARS_LAM | V | 0xE6CEAF5C639882E74C85209B1BE8F63C -0x4BBE0630F22487CDA620153F5BCD2499221DFBB8 = CARS_LAM | V | 0x1BA9040C85184E6CBCA7D221D4FACD86 -0xCFCE58B40075F08E3059062DC6719E1244261199 = Cartas desde Iwojima (ESP) | V | 0x62D87FA8E06C4F01C5AC1924D342DF23 ; mkbv3 -0xE3BC99CE94720FDAD8F94B3AF02879AC04D85AA2 = CARUSO_PASCOSKI | V | 0x73B36E3B328FB4E223E9F6697B7F580B -0x5AEB5E65D3FFEBB5AAE5A00F8F1A8B37DE8507CF = CASA DE MI PADRE VENTA (CASA DE MI PADRE | V | 0xCD8183980BCD946BC2023067313555DA ; MKBv33/FindVUK 1.00 -0xC1CC6740725A2B041063301213DA8AEF0DB502F2 = Casablanca | V | 0x78C655A716D48902B1E69648E6495039 ; Casablanca 70th anniversary edition -0xA3920D572ED1AC48CEC3D0727C9C0DB4162D5099 = CASABLANCA | V | 0xA4D6389A9C46A83DD00F9D9EC367788D ; MKBv3/FindVUK 0.84 -0x512FFF1F45B060A84AF3350B8450305701D3B692 = CASABLANCA | V | 0xDAE66A2FECD682B5989EA72BA1C2B9AE -0x614914FFD15638A7F869967678CD1157C24CCB3B = CASABLANCA | V | 0x68BB6131CEF410B2ACBD7AEFF2991264 -0xC6868DA5267BA42C8EAF8507A6567DB2922FFF4A = CASABLANCA | V | 0x5E3ED9B0985286B6094296B79A84327A -0x74ECCA48BDB30EC827DC3DF0B2463039275BE562 = Casablanca | V | 0x3C0C6026540A700072BFD57828A19BF7 -0x0F43E11A8169ECD32B9D75CA14C61F4DCC57A6B9 = Casablanca (EU) | V | 0x2F4AED51CE4F504321901BF0D4558A3C -0x2B7B88CD152E0E2103B3013E7C73E10A08EED8F9 = CASE_39 | V | 0x461CE5A0C2D3CC44FE48B1F8156F12F9 -0x7EA90B4365EE6EFBD0AE4CCBEDBAEF8A7D77AA94 = CASE_39_EU | V | 0x68A0B3D42909955BB2E4821182A66DBB -0xA5F2CEF342BEDB3862E98BE70D7D9323267937CE = CASINO | V | 0xBA39C54E7208822893F0B363CCCCA0D1 -0x7AC8E53563DC2C13D0F5BF2071FF09B8100BFEF5 = CASINO | V | 0xAAEDE08D97DBDBA5FD5038BFFEAE1105 -0x7D2B6FD6CBC79349203E79EA712F5EA73970C138 = CASINO | V | 0x750DDFCEFD76295046AC5831130B72B2 -0xE1C383DE1779921482318BC27665D6C43D5C8E13 = Casino | V | 0x90AE2C61FCA8A4F760AF479F5785F7D6 -0x84568F9A128E7BB1DAF45A0B1FC5914374C4B9E3 = CASINO | V | 0x0C2F4B2AEB8F48792262C9CBD366B3CF ; MKBv9/FindVUK 0.72 -0xBCAC0267736DBA15C842877BDC7F11B5448B8FB6 = CASINO (Casino) | V | 0x12874A0BE84A931FE44E44B3E812B5A5 ; MKBv9/FindVUK 1.00 -0xCA1FDD942AFB77309D89414097CC280A73B10F86 = Casino Royale | V | 0x53129FA779185ECAB151EACC3A8E54F5 -0xA3EF177AD4D3D59F32224021CB877A483731B927 = Casino Royale | V | 0x494B67D46277D3D2CBE996D5D6160089 -0x33EBA24A47A7BC772F164B0EFDD67A8D44F9602B = Casino Royale | V | 0xF463D9A3562CD578FC8BCCAA170ABFC2 -0x6E342961127ACDF0A05D1A62FFF2007047C84425 = Casino Royale | V | 0xD1DD4EA53DEC03ED7E4D7FA50CA6F059 -0xC593CE9A3002E805C4C2D99193C08FA390B1BF9C = Casino Royale | V | 0xC4855FB5F63014D9B43B5CBAD60F47CD -0x439308A6CE5399503DA1AE61939C7C3D2209048C = Casino Royale (Deluxe Edition) (Disc 2) | V | 0x17F833234F533711F879EE190E8E596D -0xEA499A03B2052AD3402619DC88624D71BD024CA9 = Casino Royale (ger/eur) | V | 0xD27373828633B74F676883E1B1BD516B -0x0B26317386EB713B4D61E9967D82C2169AE7520B = CASINO_JACK (Casino Jack) | V | 0x76BEB1AA9A7BD40693C5BB69EB44B875 ; MKBv19/BD+/FindVUK 0.96 -0x54EE85D18E71B4C9725A9139450F5CC56C00B4E0 = CASINO_JACK (Casino Jack) | V | 0xB3679D1F00ABE4C9196E6E6BFB34E550 ; MKBv30/FindVUK 0.92 -0xAEA21B43439BE2415A3C0726308A38E05384CCC9 = CASINO_ROYAL | V | 0xF6502FBF2BAAABB3C361A3FC152CA78B -0xCAA72ABF0E4232E56EA2FDEC302D6B02AFEB431E = CASINO_ROYAL | V | 0xCA094569CB654C183DF75AE407B18F14 -0x31A75A597A87074A7C08DB8E81172A4629EED325 = CASINO_ROYAL | V | 0xC70D3D0BE910D5E1F1A63EA8DDE25689 -0x4430BC62CF3EB27E8876ABFB18874EF65DF2D05B = CASINO_ROYAL (Casino Royale - Deluxe Edi | V | 0x9449022CD06B41CA064114AC9D5BD594 ; MKBv8/FindVUK 0.98 -0xAD10AF257344FDE3472EB81C1A027CC470689D07 = CASINO_ROYALE | V | 0xC82C9BE8C8495DBCC1BB45C17EA9FFEE ; MKBv31/BD+/FindVUK 0.82 -0x076928E29A9B5DAFD8C83A54D4DB687CE12E5616 = CASINO_ROYALE | V | 0x575B95DF00F6836085BD72A33ADA3F7D -0x27567332E6D7E0935FD9F278187FB230DD9FB022 = CASINO_ROYALE (CASINO ROYALE) | V | 0xFF06A6D668294112960F74227F96199A ; MKBv31/BD+/FindVUK 1.00 -0xE11B1EFB0173F8EEA03950A07C43990CFDF666B8 = CASINO_ROYALE (CASINO ROYALE) | V | 0x570E8EDEA9DC2A534EBD75F9A423871F ; MKBv28/BD+/FindVUK 0.99 -0x942DD72348B2A6CC04F2609D4BBD42398ED6F7DB = CASINO_ROYALE (CASINO ROYALE) | V | 0x2194E36A720A1007236A0F7915FA7CFB ; MKBv27/BD+/FindVUK 0.84 -0x3FA49A4CC335F506E094D2384F269913749831DD = CASINO_ROYALE (CASINO ROYALE) | V | 0xAA4A04EC9600BB134943345713BC73CB ; MKBv27/BD+/FindVUK 1.00 -0xCA35F60F73C2A105EB938F6B98F4657DFC6CE660 = CASINO_ROYALE (CASINO ROYALE) | V | 0xD40C465A3E5BA3491D63E869475FFF6F ; MKBv27/BD+/FindVUK 0.92 -0xCC0599B6C298E8C51C57393D0F8EA69EDECB9C3F = CASINO_ROYALE_BD (Casino Royale) | V | 0x8EAC68F1ADB23729FBD8F383DB1F7A78 ; MKBv21/FindVUK 0.96 -0xE35EFC6B5A8B6CB87179AA29E2487B459B0F9182 = CASINO_ROYALE_BD (Casino Royale) | V | 0xABBF24F1E6DCCB055B84D322019CF7C4 ; MKBv21/FindVUK 1.00 -0xB2F1993ACCF8B6F719DFAAF6A4318431137C124C = CASINO_ROYALE_BD (Casino Royale) | V | 0xDF6C7E8E630D44260A5E17D05E232AAB ; MKBv21/FindVUK 0.84 -0x1746AF6317768F9AA6E001476EDEDD7C4A429C05 = CASSHERN SINS DISC 1 | V | 0x7D9984DE4E35BD67C64931F17B60D4D6 ; MKBv40/FindVUK 0.96 -0x888C80762ABF08A98E91FB70B595FA610D2DD23B = CASSHERN SINS DISC 2 | V | 0xB44F3B90B6B4E9EBD08D87B4B120FF06 ; MKBv40/FindVUK 0.96 -0xA14E53C96224F802712289535465587FEB287B2D = CASSHERN SINS DISC 3 | V | 0xE12A934938F94C9FD0D08E0B2DB78651 ; MKBv40/FindVUK 0.96 -0xACB4CDFB5BDFE8EB00B4DD2EE5BECBB514F8ACB1 = CASSHERN_SINS_P1_D1 (Casshern Sins Part | V | 0x1A999A481663F2CB43B475CF37CF85EE ; MKBv17/FindVUK 0.96 -0x5E58BDBFE75D510D78F3530C47EB8083CA25127B = CASSHERN_SINS_P1_D2 (Casshern Sins Part | V | 0xC77F39FE520197BF2C5B2F7448662544 ; MKBv17/FindVUK 0.96 -0xEAF1E8759EF56760172B7680AAF532347AD6A9A6 = CASSHERN_SINS_P2_D1 (Casshern Sins Part | V | 0x21380635E0696FD7EFC4008FE0C86416 ; MKBv17/FindVUK 0.96 -0x773C0DC10564573E7E94F24BE498E7BF7216AA9D = CASSHERN_SINS_P2_D2 | V | 0x39C8E4B5CC79739BC23F4B5105B9AE73 ; MKBv17/FindVUK 0.96 -0xE08B9371145E6582181353DB459B9D6645631AE2 = CASSYL (Can A Song Save Your Life?) | V | 0xB960223E436F1BF11407357047623F10 ; MKBv49/FindVUK 0.98 -0xEECC1D593F73FABBCB0C1500816A542BDAAB3B45 = CASTAWAY | V | 0x2A5D9659809EACADD1DCD88681160E90 ; MKBv4/BD+/FindVUK 0.99 -0x2C29C45CD7EED998A0F885FFB03AA1D6D07EC94B = Castle in the Sky (Castle in the Sky - B | V | 0x74CCDE2386AC54E432782F19440A2E54 ; MKBv20/FindVUK 1.00 -0xC3E46533F6CE40BC5F3214740532CB32C8A046FD = Castle in the Sky (Miyazaki Collection ? | V | 0xCAE1B9C19D57C37532D7BD20E8610D54 ; MKBv56/FindVUK 0.96 -0xEB36016266BDAFCB0298EBEC3314D46C11C15281 = CASTLE_OF_CAGLIOSTRO (Miyazaki Collectio | V | 0xEF00445CDE364997B91B7F30056D2CB7 ; MKBv47/FindVUK 0.96 -0x9392B4197B2EE6456A6D1E968A23889A54C34143 = CAST_AWAY (Cast Away) | V | 0xDB7DAA61202C9B3BDB6A0E0C0ECEE7E4 ; MKBv31/FindVUK 0.96 -0x622AAACF0F4A70959556ABED64F684FC42AC3CB4 = CAST_AWAY (Cast Away) | V | 0x96FCA36D86C4CB61886E65D938F83C70 ; MKBv31/FindVUK 1.02 -0x83AC98C0BB5B13AC19C6CBF26EFB84042732D08F = CATCHING FIRE (The Hunger Games: Catchin | V | 0xC888E99AB42EACEA03004275851581FE ; MKBv47/FindVUK 0.96 -0x80161B97AE4BF0162C014212258A09DE80EA45A0 = CATCHING_FIRE | V | 0xD24012D89BAFDE52954CCC956D0F09D4 ; MKBv44/FindVUK 0.80 -0x46A566D2F3E09ABF690B20C641ED60FC0A29C77F = CATCHING_FIRE (The Hunger Games: Catchin | V | 0xE4CB8FFD231FA31CF4CB675D328DC7A5 ; MKBv44/FindVUK 1.00 -0xF6E38EE1B94C8BC31C21D77FDA667BF32FEB9DEF = CATCHING_FIRE (The Hunger Games: Catchin | V | 0x62C9CE365AB3CDB5D73F1C37B7198FEF ; MKBv44/FindVUK 1.02 -0x17BA64236915127D1F66B1CFF7F0FC29B05DBF48 = CATCHING_FIRE (The Hunger Games: Catchin | V | 0xD33DBF91C7A79998FF41390E22C0722D ; MKBv44/FindVUK 0.92 -0x952D3BA1FDC1C512C5C6E0D71E39590731188A64 = CATCHMEIFYOUCAN_WS (Catch Me If You Can) | V | 0x4DC629C28D4DF4DBE12922A79D15B6CD ; MKBv28/FindVUK 1.00 -0x5B6E72A8003280290054E894DD60DD6D9CDFB2C6 = CATS_AND_DOGS (Cats and Dogs) | V | 0xFF31518B5BD9CB3951A67A3AC52F74E3 ; MKBv17/FindVUK 0.89 -0x003563C9BE9A42BD2C8088AB294852F256D88251 = CATWOMAN | V | 0x921B8C4C8CB441E4B45DF60E66926345 -0x2672534B59464F317E48B1BDED3D1DD494F1F2A6 = CAT_ON_A_HOT_TIN_ROOF (Cat on a Hot Tin | V | 0x7E29A87E7B756F6A082B2842B805918D ; MKBv61/FindVUK 0.96 -0x9E6CFA9E193AEEBE5AD0C38C0BA45D311825D9DF = CAT_PEOPLE (CAT PEOPLE) | V | 0xDE69C1D0762688E8D197328D383F29FA ; MKBv61/FindVUK 1.00 -0x678FF6C750BA30216064E26EF4C53B3220385EC1 = CAVALLERIA AND PAGLIACCI | V | 0x442FD5BACA7A2937557FC471AA214378 -0x443621B2034B7C09F7C9F2956125CCAFF32FB742 = CAVALLERIA RUSTICANA | V | 0x9C8AA890ED5A62EEBAFC48E212A26E46 -0x16B651AB1B231203BC3BAACAAD9FA83E1BE4937E = CAVE OF FORGOTTEN DREAMS | V | 0x4CB6B053E436B30170667A4010A1189A -0xA6FF3B9979780854A7BA65F1BB32D9353FCC6054 = CAVES_BD | V | 0xC1A344EC3DB6548F203392DB8DE4CAF0 -0x2E9E7D8891F5F83914CC476A1DE1B806A116F706 = CCS1EGE1 (A Christmas Carol - Blu-ray??? | V | 0x6741BA33AA9C6197236C201353385E57 ; MKBv19/FindVUK 0.96 -0x54423F274A34B8D4FF5BE619A8B351DB3190E0A6 = CCS1EUE1 (A Christmas Carol - Blu-ray??? | V | 0xB205F6E94EACC2775153010E0FCFAC77 ; MKBv19/FindVUK 0.84 -0x3F7E519AE80211A33DBA40283AF028415974E953 = CCS1HLE2 | V | 0xD0FF48EE2565ACE8DFD5ABC907A6478F -0x534D66D91431CF26953D22859635A9D221F3173F = CCS1NNE1 (A Christmas Carol - Blu-ray??? | V | 0x6BCF1ECD01E53C0702BC20D90F6652AE ; MKBv18/FindVUK 0.96 -0x164E28ABBE4A2839296A2E4E6AB0C80299FC0531 = CE3K (Close Encounters of the Third Kind | V | 0x851B294BD4BF554F1A32BBF739618E8B ; MKBv4/FindVUK 0.96 -0x59D7FFA2532703143CA2866719FCDDCE82EBE813 = CE3K_BONUS | V | 0x94E54E456F9975F707295B53F7F80B3F -0x7AF55434C03871EBBB0B61DA6D1CC5508141924C = CELEBRITY | V | 0x86683BCB7510879DC04F19F4D55AB1B3 ; swedish edition -0x5CE000F96985365F45BC7331B4499DE023DE2816 = Celestine | V | 0x53BFEE95DB848A7B0FD68050F1398B18 ; MKBrev 32 - FindVUK 0.57 -0xEAEF7A96E7D0A2ED545534A77CF6FE35E4D8B5DB = CELINETHROUGHTHEEYESOFTHEWORLD | V | 0xF7AB959E290D881C0A557C27AE22F2DA -0xE6F5175F314D0CE32BB60CF93E53709450571FA9 = CELINE_DION | V | 0x84A1E789076F56893AB9ABD82BDE0E5F ; MKBv4/FindVUK 0.96 -0x3DE4569A4AC1A2EE2A97FAFC62B1C8D8CB89AF91 = CELINE_WORLD_D2 | V | 0x5992CACB72FA1E1A4EB82F06808B0C4E ; MKBv4/FindVUK 0.96 -0x96306FE71A240D3B00559A400700F811262B3FAC = CELLULAR | V | 0xD7CCBE46B3DBC9F1DA8839D95E9CF942 -0x2C26BC995225257D3680C84F7C2E3AA26C2A4B88 = CENTRAL INTELLIGENCE | V | 0xA77D555D7709A539F24477B45CB62282 ; MKBv31/BD+/FindVUK 1.00 -0x8C42D7FFB84C4B40F67F1085C630B5AAFCAC94B9 = CENTRAL_INTELLIGENCE (Central Intelligen | V | 0x3A9D15CA79760FA3C52D444006A8369F ; MKBv57/FindVUK 1.00 -0xC406080536BA49F507923FF14089A182692A716A = CENTRAL_INTELLIGENCE_UPB3 (Central Intel | V | 0x43E8A8ACC1D608F4B3E1E42B9179AE7F ; MKBv57/FindVUK 1.02 -0xF14EF72A1699521CA42296B7A8D5B92B1F2F1810 = CENTURION | V | 0xA17A3C81F6BCB878A7807C7CB92F3499 -0xCE76E5532B831784B58C7A5115EB5F599DAFAFDE = CETK | V | 0xE87F372975F53A30DDE31052A136AEF1 -0xDF496A62C431AB76303FE89479C308D4712EBB4E = CHAINED (Chained - Blu-ray???) | V | 0x86A4E1689AA371D05E8D3544FE87ECC1 ; MKBv23/FindVUK 0.95 -0x2BFA57C9D595F41E5D2D0E627FD147D313072F54 = CHAINSAW_MASSACRE | V | 0xE3B097D42FED9B39AD2806E066913173 -0xF64A6FE528F74DAF996B5A32B4E66FC09D923DF7 = CHALLENGE_OF_CHANGE | V | 0x8043DBC92DA01B31044C4CEC217F7A37 -0xAA07CF2B0714721D961A09C7CE02D6A91EC29E4C = CHANGELING | V | 0x46CA0EB0025175228E2623581612532E -0x0153D4C20EF8CA3D4E0BF30E1FF0FE3C030FB674 = CHANGELING | V | 0xB2641EDCE9D425DC4BFA2EE65DF00CD0 -0x898AF0EDEF779C7E1724ED77C9015C1F0895FBD3 = CHANGELING | V | 0x10CDD453A22EA676B88025F1E5E4CACC -0xDA1FC49D14AAA0AB3C65C65EB1D94A4747F0871C = CHANGE_UP_G55 (The Change-Up) | V | 0x077E57C3A2D9C2D7405AF2C710554D11 ; MKBv23/FindVUK 0.87 -0x0C1860C6095D6F4687B709D1A9B00F98FB1F7549 = CHAOS | V | 0x33D5B77B425F9397A9DBDF92D9F0DB2C -0x2B43546D84214115E054B0E27F6CA2506CCD05F2 = CHAOS_HEAD_D1 (Chaos HEAd Disc 1) | V | 0xE2A84D288704251FD18BE51698AAB907 ; MKBv26/FindVUK 1.02 -0x32D837F67950DADDF55CA1C461CB650D58717E12 = CHAOS_HEAD_D2 (Chaos HEAd Disc 2) | V | 0xF13F96957A3BEA1EBFD9708B3EAADDFE ; MKBv26/FindVUK 1.02 -0x335387E0F6962BC35BB2E566F663937171436F75 = CHAPPIE (Chappie - Bonus Disc ??? Blu-ra | V | 0x2A599B1A436212F922C0F38FD93B0A2E ; MKBv53/FindVUK 0.96 -0x6D627E9D8A6D8DC607DCB92BE409E5887661478F = CHAPPIE (Chappie ??? Blu-ray???) | V | 0xDDBB2FC64FEBED50BE42B35B8C543532 ; MKBv53/FindVUK 0.94 -0x562DD5ACEFB38FE7E614CF77E4E81481BEBF17ED = CHAPPIE (Chappie ??? Blu-ray???) | V | 0x00D884F2EB0BF473BF8BCD64074A4015 ; MKBv53/FindVUK 0.96 -0xD58D5FF0E530E39F48961CC0B2AA1702C1E74693 = CHAPPIE (Chappie ??? Blu-ray???) | V | 0x57426C89059491316C179E90D8E80679 ; MKBv53/FindVUK 0.92 -0xEA48A0E451FBD29BF2F4B66C14C009BEE0E105A2 = CHAPPIE (Chappie – Blu-rayâ„¢) | V | 0x7FBA1E1DC9E9AC2D55B61542AD7AFC59 ; MKBv53/FindVUK 1.02 -0x0F0AC53E8BFD6246C45E439E3CF36943F76DB878 = CHARIOTS OF FIRE (CHARIOTS OF FIRE) | V | 0x1E849C621938115AD622EAA6B52B78FC ; MKBv27/FindVUK 0.96 -0xB05204A38C499B846A9F51FD73A9C9C59230EC76 = CHARIOTS_OF_FIRE (Chariots of Fire) | V | 0x75D9ABE22811D791393BEC4C9BC3A329 ; MKBv20/BD+/FindVUK 1.00 -0x83F3262223399C9011B95AF06F81888627CF7F04 = Charlie And The Chocolate Factory | V | 0xDB6920BA629716E1AC9AA8F73251F669 -0xC86F553DCEDBD19845F8269EDA23799B0C06BCD9 = CHARLIE_AND_THE_CHOCO | V | 0xEABA5E4E8D12BDBCF4B3E378781167E0 -0x4FAEDBA2C4AC576E5BB16B40A12326475F25157C = CHARLIE_ST_CLOUD_G51 | V | 0x3350E8BF87B9A699570074B51FB2D7E1 ; MKBv19/FindVUK 0.80 -0x0DBB945CCD808FCEFB577F9C0C3A3B8858671968 = CHARLOTTE_VOL2 | V | 0xEC197944FB3364782B4FF70F98935C32 ; MKBv62/BEE/FindVUK 0.98 -0x0BBFF6ED63600E9A6DDAB6121834BF9C93DC3792 = CHARS_COUNTERATTACK | V | 0x349C5DD3C86759631D15E77D92CE7D40 -0xAA4FA7B7FC022B763B18C174B1CC6B4DBF0CD20C = CHASING AMY | V | 0xC9230D8956F3BB7A9526FF348A4B427C -0x686BFAF4CAD29AEF1B38C4C1EEE92EC5B422F4AD = CHASING AMY (Chasing Amy - Blu-ray???) | V | 0xAF10A9CC307079AF5EFE3C59251DA538 ; MKBv14/FindVUK 0.96 -0x4C6772FE9D4483696EC95A660294F15103C61114 = CHASSEURSDEDRAGONS | V | 0xAEBD171553B43E6F388A09836D414980 -0x5E1A187C0066330FD5F1B0B7A19E34BC5E2E6F44 = CHATEAU_DANS_LE_CIEL | V | 0xD82A351C9A0B2C24F2803A98DEEB8003 ; MKBv23/FindVUK 0.84 -0x7FD0298D5BBFAE4D86598ADCAF50C43638940F56 = CHATMONCHY_RESTAURANT_MAINDISH | V | 0xFB24AA9D75D074218FD3145B5FC6C93E -0x076993FAC10F7622FE7D9BEDD38733CF2864FE3A = CHE | V | 0xE07D052C9C159EE96047B4BBC83B5B85 -0xD88BE098E23EA2DCDF62FA25548682EC964C8A79 = Chef (Chef ??? Blu-ray???) | V | 0xFC81EEAB973AC69C5AD5395C50082E07 ; MKBv53/FindVUK 0.93 -0xAC5D979BF4FE2CA99843ADF2E8A51881F7849705 = CHERI | V | 0xDD14721FE3B437DE8342E2CCE54970AC -0xDF5FF71BD9787A3456A235CFE1438E150A33D05D = CHERNOBYL_DIARIES (Chernobyl Diaries) | V | 0xD8AD059A608537C547FE93C6A7BF3E0F ; MKBv31/FindVUK 0.96 -0xCC3E29B60F29BF6ECBB1C414E7F1FE8C058A0919 = CHE_BD | V | 0xCCC0FE1C4500CD44F3A5A615BE266237 -0xAE40113D5C295640FF461E1ABF6EDCD12240CFA0 = CHE_PART1 | V | 0xF2722154194985ABB6B4F55E16C761A7 -0xDA3207E8F38A6A9562F7F2676B8ABFEF2DC9689F = CHI1EUE1 | V | 0x717A3F8D8BCE7354B671ED78B617E410 -0xA23076BB13E3570743822ACC62DBCC43BB0E52A6 = CHICAGO | V | 0x67C13AA66A51A4AA6CEB4DB9A32578AA -0x9D97215A67FAE1FAA3305BD5FEE735553FADC067 = CHICAGO | V | 0xDF0CB3ECC528FF155F5C671865216304 -0x75079979699BE83A822332D1DA8AA4371C92D79F = Chicago | V | 0xB0CEC136E3B184B2F1DF709BD11D8162 -0x6D1E878D2BEC4E91761B16BE39892EE62FDE74A4 = CHICAGO | V | 0xF3EAEDDB524DAD55309805C995ED0F33 -0x547ED2F7A1142BCCCB7AC73B4242522DCF41E3E9 = CHICKENFOOT | V | 0x2D70A7DC61AF9978B6F8B4190FC29256 -0x783FA2C145CCD31053E2F688DF50A66F2AB166D1 = CHIHIRO OG HEKSENE (Spirited Away) | V | 0x1A070BEA8991427077A7DA145FF88EA2 ; MKBv56/BEE/FindVUK 0.98 -0x17E831BE412EAFD5729E70018A8DCC941133CE2A = CHIHIROS_REISE (Chihiros Reise ins Zaube | V | 0x3C179EEA26754B6201DC1CFC1E5850AB ; MKBv56/FindVUK 0.98 -0x6713011E615120148171826F6E0AFA4901F2D185 = CHILDREN OF MEN | V | 0x198CE9576A620EA2053F38BEAE707D65 -0x7B88E0BDB7EB4D31F034C02742E91923FB628A7F = CHILDREN WHO CHASE | V | 0x6C8E815ED7019AB91FBF0C93D96E1C1C ; MKBv33/FindVUK 0.94 -0x7C8D819D989F9A5ABD3110245F5C1BE8955296A9 = CHILDREN_OF_DUNE (Children of Dune) | V | 0x0439948CEE78DBC6E78CC594CF7BF19C ; MKBv37/FindVUK 0.96 -0x5ABE2273CB79B464F8E3D267BFC4722EF509FBE2 = CHILDREN_OF_MEN_G51 | V | 0x570B57C4DB151543AD3976A61E31A71C -0x1CCD31DAD26EF8818F4299DEE5ED0885ECA4FC49 = CHILDREN_OF_MEN_G51 | V | 0xE4E11C4B10776A667BC9B7C573290F5B -0x36B0F25BA8BBC6A0108B973CCF1060CEE096BE3E = CHILDREN_OF_MEN_G51 (Children of Men) | V | 0x28CDCA4274F0EAAD5FB121D24E6D53FD ; MKBv12/FindVUK 1.00 -0x4A23656BA9AE2A856A19F4C7C5E6C92F1727EA17 = CHILDREN_OF_PARADISE_D1 (CHILDREN OF PAR | V | 0xF878FA0C89D2DDE568FF1523CBCCEF08 ; MKBv33/FindVUK 1.02 -0x1C64448105051B20BFEB87305B0EE4EFC44C3D78 = CHILDREN_OF_PARADISE_DISC_TWO (CHILDREN | V | 0xBA2BF9AC4C071B647DD346DAC4E36C6F ; MKBv33/FindVUK 1.02 -0xEFDF18AEF2798B33FD9D512B9014015286B3808B = CHILL FACTOR | V | 0x73AEE2ACF25851C1C378895AEE75480F ; MKBv26/FindVUK 0.98 -0x5F4C4C25CAA44D57A9A18153FECF2E56C5D9DA63 = CHIMEI DEMO | V | 0xCFAE81DAEFEEF78D2C20A6B0A641F61D -0x6B7ED74DFA6957A03C95B5B0004C4F1A608A46F6 = CHIMEI_TAIWAN | V | 0x019979E43F1989E89169E4B39402AAD7 -0xA009FCF1BB33700A5013D64DCCC91BBCF7D210BF = CHINATOWN_AC (Chinatown) | V | 0xC6046F86E8222F467C16236C58CEEC71 ; MKBv25/FindVUK 0.96 -0x7303AD89B67CDCACB29E12CADF4F172E327C57F0 = CHINATOWN_WS (Chinatown) | V | 0xCCE3EC971A050E22B7265A4ACCA03F44 ; MKBv27/FindVUK 1.00 -0x3A79540F11E4D1138D5CC30A7988C30F0176B963 = CHINESE ZODIAC (Armour of God - Chinese | V | 0xBA020603560172C3DB08E0B4DFA22ACE ; MKBv44/FindVUK 0.96 -0xF932DBD96DA46EB153E0AA970558CE714DD6C556 = CHINESE_ZODIAC (Chinese Zodiac) | V | 0x0278B0FD40D86088D1A16E95642CE4C3 ; FindVUK 1.02 -0x77CB258E2E4A03437DEB0C123508D282756067C3 = CHITTYCHITTY_BANGBANG | V | 0x957B927718F8BED4842879938B0D6E19 ; MKBrev 19 - BD+ - FindVUK 0.57 -0x16713D501B4223769434C18F92CDE86ECFEF33AF = CHOBITS_DISC_1 | V | 0xC51B20D494306B04A5E5211B1B9BA594 ; MKBv23/aacskeys 0.4.0e -0xB8285776AB5EB94FAC0E7E1BD2118FD1200A762D = CHOBITS_DISC_2 | V | 0xF6631B7EE7F68D841532AA709AF9C204 ; MKBv23/aacskeys 0.4.0e -0x1C3481BA3B28FD7EC13DEC2856B0D714CE1400FB = CHOBITS_DISC_3 | V | 0xB1EA0929F3A195283E8D34B539F516FF ; MKBv23/aacskeys 0.4.0e -0x63945569A7F1FF522215AF0C0DA50CBEEAB8E541 = CHOCOLAT (Chocolat) | V | 0x64268ED5CD84D66F0AD2AB7016A95BC5 ; MKBv30/FindVUK 0.99 -0xD7D2FD1A4C49B035C252A8D2C840435AA704520D = Chocolate | V | 0x1D82381AAA7C6EE2BDE3ACFCDC223400 -0x8447E5978C3E621E978D23AFFA3B29E0BA98E686 = CHOCOLATE MILF 4 BLU-RAY | V | 0xE790C5E9073FF3E5648AB7CBB5D88AB9 -0x60344B947727567638921AE68CA239A5C81412CD = CHRIS_BOTTI_IN_BOSTON | V | 0x5FC410D0DBB8BC99318C765467AD6FA7 -0xA459283590CB55C1715C89337BB4D965522E77A1 = CHRIS_BOTTI_IN_BOSTON | V | 0x085DBE75BDD25A614B2E33FDEB7CE2D6 -0x7982C3B625FB74642E28BEEDC129FA00DF7FF47D = CHRONICLE (Chronicle) | V | 0x344B94EFF319AA84E049A01F3C49297A ; MKBv25/BD+/FindVUK 0.94 -0xA3841FF8724FA58D05B140DC5716A19CD11E36CF = CHRONICLE (Chronicle) | V | 0x72AB23F688694BB2442CD527D3937256 ; MKBv25/BD+/FindVUK 0.96 -0xE93EE643E126B24F7632746DE4375B27F2BB3397 = Chronicles Of Narnia Lion, Witch And War | V | 0xDA95FC922DE527741B34607073151B0F -0xA51CB5791601310689D06B0E0FB24E8A01EC8E8B = Chronicles of Narnia: Voyage of the Dawn | V | 0x81CF813E78476886AC4E8B6E481CBE54 -0x9E722131D1C8D17E18B84D9EDEA201FF26ED8A65 = CHRONICLES_OF_NARNIA (The Chronicles of | V | 0xD196427135DD53E4C0C8FF8C40862C04 ; MKBv19/BD+/BEE/VUKNOTVAL!/FindVUK 0.83 -0x3C7F860EE68C2F5658D89E25373A4E481882BB83 = CHRONICLES_OF_NARNIA (The Chronicles of | V | 0x7DD08E0102B7AAB8743E96A6144497D0 ; MKBv19/BD+/BEE/FindVUK 0.94 -0x07BBE130F5671E8DFDE9FD565A9C81B5D39F751C = CHRONICLES_OF_NARNIA (The Chronicles of | V | 0x85EC4A081D1B301A07A36FA1D1573596 ; MKBv19/BD+/BEE/FindVUK 0.92 -0xD33EA119E25FD8A20341895DFA06E890FBA2A9BE = CHRONOS | V | 0x0E1CD1656951B2843CFECE3FC3A32476 -0x010E25C238FEEE6839C0025825324D57170931B4 = Chuck - Season 1 - Disc 1 | V | 0x7974454FD6C00873BEBCF56C55793F21 -0x400F6CDE6E2DD88155197A87A9BF49DECD1880CB = Chuck - Season 1 - Disc 2 | V | 0x4920172551B08A6BF268A5CE05A8826C -0xD14517ABA7D151E0EBEC779F9911B961635B7343 = Chuck - Season 1 - Disc 3 | V | 0xE1489DBD933DF849DA22ED398E316BFD -0xA29C64933221F5DB16AE1C880098F16457FEAED6 = Chuck Season 2 Disc 1 | V | 0x843CBA2DE329944F9F301140CC06308E -0x98C156B102ABE0EAC21DD61CE218C6D2EFD7A051 = Chuck Season 2 Disc 2 | V | 0x03799A753F417FAA229982B7005FD535 -0x4F68A32416E0EEE124032D7B0462D89A5A53BADB = Chuck Season 2 Disc 3 | V | 0x32FA8264E6E7753B7EDFA784C990E8A3 -0xD649E082C0B6CEB9BD78C5CE0FE40C7BA4317763 = Chuck Season 2 Disc 4 | V | 0xB221D3C53D515627E10FCB4215A1E45F -0x22909E4A796A5CA9BAFA8FDC0B6A3F921CE39574 = CHUCK_SEASON_2_DISC_4 | V | 0x40B665009E07CBD6B27F20DDFC847FAB -0xE4DBC2DD1EA7BFA4C2AF01A6403A72F2A08A58D6 = Chunibyo BD-1 | V | 0x1D8A92114333FEC8D2FB2D8B8A3F2C1D ; MKBv49/FindVUK 0.86.3 -0x4A87EA8B7B3F8C57560FA1A3D9961C1C8D237A69 = Chunibyo BD2 | V | 0xA3C76AEF64525A01BF8CF2F136F63DBF ; MKBv49/FindVUK 0.86.3 -0x6176A7C78CFC55AC07A080E8FD1B1DC96E5B0D0E = CICERO_SINGS_SINATRA (CICERO SINGS SINAT | V | 0x5EC6FB91CEA31E76588A3A11CACB352B ; MKBv57/FindVUK 0.92 -0x5FA0DCE29043A9010DB0FCFA5D5EDF4A3CB1A73B = CINCINNATI_KID_BD01 (The Cincinnati Kid) | V | 0x425D9433CE813F1AA372CBBD0E31F6BE ; MKBv19/FindVUK 0.96 -0x6546F2E73F3D220138C3A64F9BAA9C689AB7AF7A = Cinderella (Cinderella - Blu-ray???) | V | 0x09C8183A3B86DD1CD584BA2D5E97AA1F ; MKBv47/FindVUK 0.92 -0x2E51AC8264EED832A81D456168C1C643EDB29086 = CINDERELLA_2_AND_3 DOUBLE (Cinderella II | V | 0xBD487465F6CFC21C68AAE93264434840 ; MKBv31/FindVUK 0.96 -0x582EF4B60D890322DE907F89F985D700DBE46EF1 = CINDERELLA_DE (Cinderella: Diamond Editi | V | 0x094885F01D86CE2BD56ED6359F2C0FFA ; MKBv27/FindVUK 0.96 -0x34E89AAA88874BE4AFAD19B86AE8ACA67D4C77DA = CINDERELLA_DE (Cinderella: Diamond Editi | V | 0xD6C3C0BF595E1751113AF0F4FA6D761A ; MKBv27/FindVUK 0.94 -0xF5A326F33093B15F74E0B7CEB3538B748B051ED2 = CINDERELLA_MAN | V | 0x4A636B84BF370A3FFBE0B0C64CAC7F74 -0x9F81CBB2A9BAFE8CA91CC0176BA8AA88319CE48C = CINDERELLA_MAN | V | 0x6462BB9E6F212BDCDC9BA418AA3EF122 ; MKBrev 12 - FindVUK 0.54 -0xA90CFFAD4540A90A364723A5255C1ADF3224BFC6 = CINDERELLA_MAN (Cinderella Man) | V | 0xB878C7F0D02720BDE328109D4D6E5FEC ; MKBv12/FindVUK 0.96 -0xECFFA206E7B3F25DA2DB73E010923F86592E9CC4 = CirqueDuSoleil_WorldsAway3D | V | 0xB7CD1F7B63CE40612FB44876DE8762C2 ; MKBv36/FindVUK 0.80 -0x37B7A36BD3749C281657A4AFAA1A2F1C229BFFA9 = CirqueDuSoleil_WorldsAway3D (Cirque du S | V | 0xFCE84284230FA987B506C014667E22EE ; MKBv36/FindVUK 0.99 -0x7D3FBA0AD97A4899D601F2DF1F86B33DBF935CF6 = CIRQUE_DU_FREAK_VA | V | 0x047DF1F169C094D68C955214F0330396 -0x9A23C7D689434DE387F8AD3EE2CD003CC123A589 = CIRQUE_DU_FREAK_VA | V | 0x787EB59D708B1B0545E8846C60974C31 -0x24A4103D2658DC37632B5964367BF1871AFF5256 = CIRQUE_DU_SOLEIL | V | 0x8A74FD0A2385D3D2A176D5AAB41C06CC -0xC6DA0E8C3BBE37AA57C94AED473F9EEAB079AA7C = CIRQUE_DU_SOLEIL | V | 0x0DC4E3B36FF2E9C3EC02440F6B29B515 -0x56D3A20DDDF8D9A472BBBD22EF11A96B5F78E1CC = Cirque_du_Soleil_Worlds_Away | V | 0xBE8D9D3B86C8AEDAB00866D6AA24737F ; MKBv36/FindVUK 0.80 -0xA745FA959AA1CBA2320DFC3C16205F59BF864F04 = Cirque_du_Soliel_Worlds_Away (Cirque du | V | 0xC31678C554C8400B8F5B3861EE8F5A3C ; MKBv36/FindVUK 0.99 -0x6D537D6378969792DE901B895E19E9E0A91632D4 = CITIZENFOUR (Citizenfour) | V | 0xA6DF337FAEEA0D61778B514012C2821B ; MKBv53/FindVUK 1.02 -0x3F0C8A4A2A8241407919F2A6F802C63E885F227A = CITIZEN_KANE_1941 (Citizen Kane) | V | 0xD05F85C703495C78A9C574079EA5C4F2 ; MKBv23/FindVUK 0.96 -0x963DB8A63283BD42BAE0936E40CC0F695F8053A4 = City Lights | V | 0x9A32915CFA26679BCB3B2BD127D9DE10 -0x2BACFE37D15B4119E34744A6D8220D36F9A79A3F = City of Ember | V | 0xC3BD44256931B69966B287662E210F16 -0x3D554C31C651F3FF054D0B7C8F519A79692B0489 = CITY OF EMBER | V | 0xDE66F53E655907C16B5AE551CE14590E -0x58D22352CD12C5A6E1567808059750FEE5D8E56A = CITY OF EMBER | V | 0xAB40919E2BBACB7F32DCD37517B04090 -0xC29D4CC1CB1A82CBCE4F6ED5DF9D6EA1AD0AD136 = CITY_OF_EMBER | V | 0x7BD2365D6BD5F135052050AE22DC125E -0x5F556275028C874ABE6444A471EF012C72DDFC2A = CITY_OF_GOD (City of God) | V | 0x7EFD624F8FFAA73F5F3DDE9ED7D1671F ; MKBv21/BEE/VUKNOTVAL!/FindVUK 0.96 -0x7789FB7A4BCE10F9D1A23DBD395BE1C64A4ED04F = CITY_RECUT_BD | V | 0xF858B7D59105A49356389590ECC2DCC5 ; MKBrev 28 - FindVUK 0.57 -0x812F6D7706A4B58562337AD4DD97966861C005DF = CL31NNE1 | V | 0xC43FF49D9D05250114A088C8FF3A43CA ; MKBv20/FindVUK 0.92 -0xA588F318E7C6F53E9E35AA9E7F96399CA095FE06 = CLAMP_DOUBLE_FEATURE | V | 0x089029655DC38A1BAAA8266344109170 ; MKBv16/aacskeys 0.4.0e -0x9B73EF4CD7B99EAA8956827E3441CA23CCC91DC6 = CLANGERS_SERIES_1 (Clangers - Series 1) | V | 0x428F17DDCD842BD4C35F5FAF928B2B50 ; MKBv57/FindVUK 0.94 -0xF5ECD044F15549849BF06E4093147D7C6EDFF9CD = CLANNAD AFTER STORY DISC 1 | V | 0xC0DBC73B246D49E284315061C4E09C0A ; MKBv31/FindVUK 1.02 -0x61CC00834A2089FF3F26EFB72E8961A2320E486A = CLANNAD AFTER STORY DISC 2 | V | 0x2302D8285E54C41D317494D60A1325F7 ; MKBv31/FindVUK 1.02 -0xFA716C7044F766EEA4821A73D55A1CCDD8399E85 = CLANNAD AFTER STORY DISC 3 | V | 0x728DAAA2C8C8C23291C0C041F5CBDF60 ; MKBv31/FindVUK 1.02 -0xAE8FA78F5C6BF8A22D65DEB213080161163BB9A9 = CLANNAD DISC 1 | V | 0x446CA7C657A61859EA245987574F431D ; MKBv25/FindVUK 1.02 -0xD2279D5C5698F6D9CF983B32F163123AC97C5FA1 = CLANNAD DISC 1 | V | 0x6F2E8687195F5150E775D8059716A6F0 ; MKBv25/aacskeys 0.4.0e -0xAC045ADC0DD6BE8839FC426D18778531197C883E = CLANNAD DISC 2 | V | 0xAC120D918630C3794BAC8167C3864076 ; MKBv25/aacskeys 0.4.0e -0x41A932A78E94A6E524B56846703A2F82FA31166A = CLANNAD DISC 2 | V | 0x3805B2DB9ACCB0418D3726519F96D1A0 ; MKBv25/FindVUK 1.02 -0xD137A402B49D598D9C7DF5B4D78EF226A808CB90 = CLANNAD DISC 3 | V | 0xCF8D29358782A8B9D438247C9EB755C9 ; MKBv25/FindVUK 1.02 -0xC0E952116A273DA529860F070E2C36F9C2B8640D = CLANNAD DISC 3 | V | 0xE16BF457F67A4B3C3729743322DD6BA2 ; MKBv25/aacskeys 0.4.0e -0x3857A0A1269C5F00C92727CB22565BB4C6AA12E4 = CLASH OF THE TITANS (2D, UK) | V | 0x638245981AED6AB97FDB445E132AB8EA ; mkbv16 -0x0FC6C0D2F65AF3FB356082B53722069B42B7A023 = CLASH OF THE TITANS 3D BD | V | 0x9AF85B43BFF068269BECE7CF52F49F11 ; MKBv17/FindVUK 0.81 -0x344BFCCD4913E1EDF0B19FE98E1213D113F735CD = CLASH_OF_THE_TITANS | V | 0xFE9556F452A1D1E637AF466905AA1ADA ; MKBv16/FindVUK 0.81 -0xFA9F1FCF882A7FA0C3AA77323505001DB3701D0E = CLASH_OF_THE_TITANS | V | 0xE2C4EED7BFEB99EDB83636BCB70B8C4C ; mkbv16 -0xC7064633F4A6374CB808706C414F806CB89B5376 = CLASH_OF_THE_TITANS | V | 0xB8FA426EAF2EF7040A188B2D2859C244 -0x7816D66533353674CCB85FF35B3266CDC3B29A8C = CLASH_OF_THE_TITANS | V | 0xC103A89D5556EEF5AB4FDC3529D4125D -0xDE4A6714DE28B0BB629D338C20EF5ED5B038CEFD = CLASH_OF_THE_TITANS (Clash of the Titans | V | 0x926372867A4776E9E5EE4A537FD4ED88 ; MKBv16/FindVUK 0.92 -0x0797355FD7C8D74DBB64C48B44B404BC164BEF4E = CLASH_OF_THE_TITANS (Clash of the Titans | V | 0x8AFB75416EF6916F47A1004A249686A4 ; MKBv16/FindVUK 0.96 -0xC6293FE41C9345AD8B4BE55B56F131E7B7BBF6F2 = CLASH_OF_THE_TITANS(2010)US | V | 0xE78B1D0262C172FEBA3F70C58A4C9655 ; mkbv16 -0xB7F2BB698011CB41CBA22ECF079579E01A2E6CA3 = CLAUDIAS HOLIDAY BLU-RAY | V | 0xAF126A26A7702B66E70BFBEA75CBF6F1 -0xB39C2785F059D6D4FBDB004608FA6D98A2B4BAE5 = CLAYMORE_D1 | V | 0x4252EBF42DE4BFD0385E8328A9DCAEFC -0x3B4627648C5C3E675125B2F345EDE550964360FF = CLAYMORE_D1 (Claymore Disc 1) | V | 0xEF3D9ECF3E04E0BB62AD610B0269FD9C ; MKBv15/FindVUK 1.02 -0x2680872A8E9E02B585DA31D795AE604D6D9EF74B = CLAYMORE_D1 (Claymore Disc 1) | V | 0x2CE7E958ECE4D9273F2837F270DFF638 ; MKBv15/FindVUK 0.96 -0x9CC93987E29A54F7E3CA1A66B8D6390F63BC283E = CLAYMORE_D2 | V | 0x8A9DF95DDCFF536079204AC31D4745FD ; MKBv15/aacskeys 0.4.0e -0xF2EA444878B171F6E294E4A79E407BEA80A9B4B2 = CLAYMORE_D2 (Claymore Disc 2) | V | 0x84FB1659FC9CE4DC07D06BF4CC62B3C2 ; MKBv15/FindVUK 0.96 -0xE6D23CC5614E7744F43D5650E93358B5F5528141 = CLAYMORE_D2 (Claymore Disc 2) | V | 0x5A73D7B8983D685B20CD02881226A902 ; MKBv15/FindVUK 1.02 -0x4246B3B0BD6E2DB66912F78219F296AF6F1E1331 = CLAYMORE_D3 | V | 0x175902BEF2452D2B6A85A2912580D16D ; MKBv15/aacskeys 0.4.0e -0xDAD7EB9607DF402EEF7CA3929AECD95497DC9D8C = CLAYMORE_D3 (Claymore Disc 3) | V | 0x972C5C58B0AE354B19D2E6594F3A12FA ; MKBv15/FindVUK 1.02 -0xA046071F354665CF41555C2FBDF0B60312E9C283 = CLAYMORE_D3 (Claymore Disc 3) | V | 0xFDBA290FDE5FB87D2C3039147E7E2815 ; MKBv15/FindVUK 0.96 -0x039B9DFCC7AC13D79872918E02ED8CAE9B623897 = CLEANER | V | 0x6FDC3BB677B88B446C39ABFE8A47CC59 -0xE1830D9F75FEAAEF873C5F776B9957EAAE4748FC = CLEANER | V | 0x6B30C026A1EF63D45DECFCE611C13A90 -0x162C71E804B0E0DC095F6F6C175CDEE322E2AFBC = Clear and Present Danger | V | 0x213B4AA3FC87D3DB4AB58EFCB05ACF63 -0x71851A49509C8724712171C35C1721550DEECCB4 = Clear and Present Danger | V | 0xFE6F2C3464A1C9081EABE01F31096247 -0xDF0A1C5F91E22871AA735F2F7A61A11AA24432BF = CLEOPATRA_DISC_1 (Cleopatra) | V | 0x6A2C8E33801C27E60B738F4CE60632D1 ; MKBv20/BD+/FindVUK 0.96 -0xD11C16908C379A789DED44961A863241825E54C5 = CLEOPATRA_DISC_1 (Cleopatra) | V | 0xDB0BDA8645E9E0B191ED2AA482D38772 ; MKBv20/BD+/FindVUK 0.84 -0x4E0AC2E3DF8B49F3838A064590FA27DBB3FADF98 = CLEOPATRA_DISC_2 (Cleopatra) | V | 0x618942C6B1B75CCE1A8ECF726B7B0812 ; MKBv20/BD+/FindVUK 0.84 -0x202E08474A84721DC830E60738A9D20DBE9ED85E = CLEOPATRA_DISC_2 (Cleopatra) | V | 0xAF0A6593DE3B32250B75EFA77583563D ; MKBv27/BD+/FindVUK 0.96 -0xB5CB592786D4E4D06B3C6C0E4C5989164B7E5B6E = CLEOPATRE | V | 0xAF36ABDF12F9BB5AF8FAA8A69CDC1968 -0xCE0D2CD2278967F63146511637833D4515F7C94E = CLERKS (Clerks) | V | 0x72AA4E41431A3EDB5AE8C8AB4E18DFA3 ; MKBv25/FindVUK 1.00 -0xC29C4DC839FD8A4F0C0ABD9C82BF34B0F9B952D5 = CLERKS_GBR | V | 0x942DA1A911E4DBEF028795BE036622E7 -0x7C788267CED2FAD16E1C45D49656EFC0D73B9BA0 = CLERKS_GBR (Clerks: 15th Anniversary Edi | V | 0x68E0E89D4177CA763F0178BF9DE2B164 ; MKBv15/FindVUK 0.96 -0x3E6041586646686CE860148A72322CC60CB0CC13 = CLICK_D1 | V | 0xDE71307958B3C29677135959BF8E971F -0xE00F4AD119471818F91DD2875E573C797CFBBF09 = CLIFFHANGER (Cliffhanger - Blu-rayâ„¢) | V | 0x3F79EBB390BC3CA578055022C64FF1CA ; MKBv16/FindVUK 1.00 -0x5EA1BB9E58E717DEE18114CD851605D3021338BF = CLIMBERS_HIGH | V | 0x5C4FEA5836817189947FA30AC5E01D66 -0xDE09DB432126BE7F4E1155EBB936D9508D77B84C = Clochette et le secret des fees | V | 0xF88CD4557D8FDE288593146A759FAAF9 -0x67B5A20669D3E239916769FD47552ECF5B3A0E11 = Clone Wars S1D2 | V | 0x367762088EC8E402F79823398054D07B -0x946A6814A6EEDAC562CE964B38CF55F05C316D52 = Clone Wars S1D3 | V | 0x0ECA029315623378FC6E1EF6002068B0 -0x000AB3D2B8F95EF699928437B98012C28F447768 = Close Encounters of the 3rd Kind | V | 0x86ABF5A951D64E5AF515F37FD6F4A4A2 -0x0FC1C7C9D05845E8DE6F8EEE7269901CCE03CDC4 = CLOSE TO THE ENEMY DISC 1 (Close to the | V | 0x71A7127B8730A4B09277BC8B946BDF63 ; MKBv61/FindVUK 1.00 -0x99737870BE3A621B7BEC510B237B25C6B9DC68CD = CLOSE TO THE ENEMY DISC 2 (Close to the | V | 0xDB0ACF112464F79E48154F95980079E2 ; MKBv61/FindVUK 1.00 -0xC8C95B43E01D7F5EC27976AD6AC16FF98EA6A3DF = CLOSE TO THE ENEMY DISC 3 (Close to the | V | 0xFAC12B9441523D03D0458ECD62D83EF6 ; MKBv61/FindVUK 1.00 -0xE5D3C8A4067DEA5044FF597F6A7D81432C07C133 = Closer | V | 0xE035BB120AD500E0E20F27DC3A3B4798 -0xC4525A4C1CE9CC2F25F5B1229A8075B7D8812CDF = CLOSEUP | V | 0x30F30FF5F3759FC43CEAD982C8B6BF66 -0x62DCA989375D5B6C15D2B54FAC92C6573C568BB5 = CLOUD ATLAS | V | 0xB49006E2483C2F8353355B41C2CFE193 ; MKBv35/BEE/FindVUK 0.91 -0xF67996793BF42CC4E0CD926A46EA9F22E37AA0A4 = CLOUD ATLAS | V | 0xE056528D69BC0349C68407AB9129B97F ; MKBv37/BEE/FindVUK 1.02 -0x44598F642D53C7CE3F876BF21D5EA43C28A03F9C = CLOUD ATLAS | V | 0x2A19E428584616742CD26DBE2097CDDF ; MKBv35/BEE/VUKNOTVAL!/FindVUK 1.02 -0xD7A0E6887034E7664B6C0693124F8B4D6EFBA2D4 = Cloud Atlas (Cloud Atlas) | V | 0x8E2491F7B161693D89AF876E28B09B5C ; MKBv38/FindVUK 1.00 -0xADD2304BB2795ACE9F94E2BD91D0E32FEFC90554 = CLOUDS_OF_SILS_MARIA | V | 0x848213A3EE2A6FEB936A797DA767919B ; MKBv47/FindVUK 0.98 -0x82C9CDEB3BEFF47F527EBCE1E439649C92985093 = CLOUDY | V | 0x6DACE76D6B4F5A9810E3283E6695573B -0x4B285C63F2207C0D5AEFAA95D9ADA84FA937A2B1 = CLOUDY | V | 0xF247397DDEAA23C6526BBC01F7ABC9C2 -0x299053469FE7C3AAC23CB32FEA0A585DBB306C67 = CLOUDY | V | 0xCEC514375B7E71E25593132063E92622 -0x0A531B390E61F7C097417A9C858BE4370E87013B = CLOUDY | V | 0x0D46D02EBD7030C156D8603E1342D8BB -0xE9641EF50F0436CB98D76AF7F4F5D010B856912D = Cloudy 2 (Cloudy With A Chance Of Meatba | V | 0xD4BDBFF88C568E3424061CECC5D23012 ; MKBv44/FindVUK 0.92 -0x30C0EA4845EF188940452034615EC953923C39FB = Cloudy 2 (Cloudy With A Chance Of Meatba | V | 0x0ED885A6CBBB7E0E8FE28EE8FC5A7AB8 ; MKBv44/FindVUK 0.94 -0x509C80912C65B4B9C37E32F90107AF64C5ED256D = Cloudy With A Chance Of Meatballs 2 | V | 0x677CAF6C9E418688A223F186CA41C7AE -0xF4AC261A94092DEDB45BAC231D1EA22234BCBFA8 = CLOUDY_3D_P1 | V | 0x65B348AA4CD2B5AC5C98A4B519D7AB35 -0x822F23EDB94656037F8EE223580701A55D185833 = CLOUDY_3D_P3 (Cloudy With A Chance of Me | V | 0x344BFFFDDFF7AC15046E4021CC8E02B2 ; MKBv17/FindVUK 0.96 -0xF760B1E39E3C170381EF234C8F309509A3D0E8C4 = CLOUD_ATLAS | V | 0x1D370E17134019997070BA2C01BD456C ; MKBv35/FindVUK 0.96 -0x2E23B52D1239A3D99BEDE688F184543C16DB8494 = CLOUD_ATLAS (Cloud Atlas) | V | 0x0A41DF0AF2EEFDA3935339F1CAFC37DC ; MKBv40/FindVUK 0.98 -0x03F2328AE38D1F8EA457ADDCB913419D280C3889 = Cloverfield | V | 0x956D929651F4C4744AE2196C233CBE16 ; mkbv7 -0x6E16B397BA4B2D3DDAD32E3201703C964EDF6F51 = Cloverfield | V | 0x8C44E5AEAE441C107A45E5ED02A6B037 -0xFDD18A78035B173599F92E763FD29474B320D1DD = CLOVERFIELD | V | 0x76546D2A02CAE189FF602958E88224A5 -0x07C06F60C471E69874A89D50BA8AF1F095DB39FF = CLOVERFIELD | V | 0xC5E3408E80D64DA369A6FF338BA9737C -0x380420AA19E15301722DA01DA36A5447E604CDED = CLOVERFIELD | V | 0x828FCD0DC12A6B15194C99D12766BA89 -0x14BFFB9739971205ABC60EE0AA3D9E2E02B920B2 = CLOVERFIELD (Cloverfield) | V | 0x0247A7CC096B69340E2E76A48D31E113 ; MKBv7/FindVUK 0.96 -0x111AA1236E81C79F1E021B97AA7DB7EC9EFFE981 = CLOVERFIELD_EU | V | 0xADAABDFF1D01F991068567417B738D76 ; MKBv7 -0x7FE602BAFDBBA782126A9B64F42B17390B717749 = CLOVERFIELD_EU | V | 0x50B440AD95D1341EA74A8DF22FB8B635 -0x8383D40B65EA6184EC9D33F3402AE4A7F887E7E9 = CLOVERFIELD_EU (Cloverfield) | V | 0x6491F164BFAE7C73B1B620E3FA74268F ; MKBv7/FindVUK 0.96 -0x837FC58AEBF6671E5AA5BB0547E5FF5BDD5DF315 = Clown 3D (Clown 3D) | V | 0x7B16EEBE94ADD5F1A0810F52562FE67D ; MKBv57/FindVUK 0.98 -0xE53E5B28A3764583A608AED0FB94E93AE39A9E75 = CLUB_DER_ROTEN_BA_01_D1 (Der Club der ro | V | 0x310D46BFDB4D729FA79818B191E7CC5C ; MKBv57/FindVUK 0.92 -0x17F10FA130E5C20A9988E8A7D903B129A0860FFE = CLUB_DER_ROTEN_BA_01_D2 (Der Club der ro | V | 0x5B8C58778EF1255802A0180052C8D379 ; MKBv57/FindVUK 0.92 -0x86FBB991FF9F4BEF6EF9680B8E2036DED085CF93 = CLUE (Clue) | V | 0x0A2CDE85B0E20ADABD7E164F2ECA5A78 ; MKBv31/FindVUK 0.96 -0xBC8B9933AEEF7F18184A577BB36C564B27099097 = Coach Carter | V | 0xD5D58B836C501A37CC3CD15702D19D93 -0x48A4328FC4866C597CFEF367F764B9BC663AA704 = COBRA | V | 0xA5FECAA628A2F3FA2AD19E782D14F6C6 ; MKBrev 28 - FindVUK 0.57 -0x6480A42555ACC5B8123EFE89B47F4847D4DB2ED7 = COBRA (COBRA) | V | 0x4999515C81A25CB3A7EFE9291F04AFF3 ; MKBv19/FindVUK 0.99 -0x9B4085533562AE86329A6C9458269F8AA4175D6E = COBRA VERDE | V | 0xE9084D58C44839183AE6A79327300315 ; MKBv47/FindVUK 0.99 -0x09F850015851D4EDBA1DB23C03CFFB560ED5FF82 = CobraVerde (COBRA VERDE) | V | 0x30F4E0EAE83844A5566E7AD23715F6C0 ; MKBv47/FindVUK 0.99 -0x74AB66E06B15A440585838F43E02EA5A7444F8A7 = COCKASIAN_3_BDROM | V | 0x471509EE75202345B9C437AE49A7DF6D -0x3C358BCBF574078C7306A52E2AEC19209A17B8DC = COCKNEYS (Cockneys vs. Zombies) | V | 0x0BDEF8B9FD76BCAA93FC1B3EAE4BA41B ; MKBv31/FindVUK 0.96 -0x4E5BE500CD2810996E9F9CECD033BE6BAB0DA497 = Coco Avant Chanel | V | 0xEB3B1F155629C6E2AF412B746FD6FFC0 -0xC493D85BF2BF9C61D8A4CBBB7CC9370667D08CFB = COCOONWW | V | 0xEA4E19E42033CF142CF8E8CA6FCCCB03 -0x616D7DC3EE7A9AB0783776DE3E9E5B3DDEDC7B95 = COCO_AVANT_CHANEL | V | 0x9F6FE28AFFFD82C7BA1646AA138B1ADD -0xD65738503F026FA75F02B1BA11518AEE05ACB9D3 = COCO_AVANT_CHANEL | V | 0x2272ED78B495FD57C2D639BE5198F234 -0xDDFA3868A1F5953CAD71D85FC00818E9B0807DA4 = COCO_AVANT_CHANEL | V | 0xFA2F3B29A98ADA722CD3C9FDD50E8FF1 -0x258775C43DE94C9E4674112D2D625A9622915CA3 = COCO_AVANT_CHANEL | V | 0x22570CF1E657E83E507F826A05D74342 -0x1CFEF5084A898F3994FE695207AA7E3E74448029 = COCO_AVANT_CHANEL | V | 0xD7734E07DE1449783B970E62A3ED6804 -0xFB82056701FF2E72A729788D8232BC8876123789 = COCO_AVANT_CHANEL | V | 0x570B51E5263D67F19AEDC94289645277 -0x28CEC8B3BF5E29E6FA4BA54BE9A09C6482F8F805 = COCO_BEFORE_CHANEL | V | 0xB08AB84B5DEA197FB25E21C7489931F3 -0xC347F10D5FECEB99EFA5306AA96065428E1819EA = CODEGEASS_KISEKI_BIRTHDAY | V | 0xCF8FBA43ED175114B7EB85FF0E6E86DD -0x9EC60964AA069B7C259BA6FA45FBE47667A7DC00 = CodeGeass_S2_D1 (CodeGeass_S2_D1) | V | 0x0D77F4D3BE0AA580DC594DF7863DD074 ; MKBv62/FindVUK 0.99 -0x55F60B141B68846E7ACD09B0FB2DD072D1764D94 = CodeGeass_S2_D2 (CodeGeass_S2_D2) | V | 0x329ED4D94D5192895FF10DE14C01CF48 ; MKBv62/FindVUK 0.99 -0x319FBCB1092F88A60EAA09AC5B3BD8C35FAE8D4B = CodeGeass_S2_D3 (CodeGeass_S2_D3) | V | 0x0ABE900161438CA4A629EB37FBC4A629 ; MKBv62/FindVUK 0.99 -0x064183188ED9DA0CABD8CC2E6FD24CF3CBF809CC = CodeGeass_S2_D4 (CodeGeass_S2_D4) | V | 0xB368237192BD5C20E17BF867BAE8978F ; MKBv62/FindVUK 0.99 -0x1BA3DC6ACB228AB78EC1BD9380BB1ABF8C1020B6 = CODE_BREAKER_CS_D1 (Code_Breaker_CS_D1) | V | 0x7D8D75F4CB0405811097FA8C1172A321 ; MKBv47/FindVUK 0.86.3 -0x0812440DAF02127B67BC11E6ED8EE6BFE0B250DB = CODE_BREAKER_CS_D2 (Code_Breaker_CS_D2) | V | 0x409355E3FF85B4FCABE97B47EBAADF8A ; MKBv47/FindVUK 0.86.3 -0x33871F2763030E14D73F9E51EE0346F2B62A4E19 = CODE_GEASS_R2_01 | V | 0xF89D766056A92FDBF18BEEBE6DB4BDDE -0x1359C14F537B6C5A00FF992CF3A19E7BC3094300 = CODE_GEASS_R2_02 | V | 0x4D51B1F939A5773955501252580787DD -0x5A909B54F8044024CD8C8B0F7ED12F588C7C017A = CODE_GEASS_R2_03 | V | 0x130A277FAFC0BB8E50AFE7DABD7E2DA5 -0xF9FA55B102D72A9644D43D5831435776B2BD13B0 = CODE_GEASS_R2_04 | V | 0xBEC11A43846D3C7DF3D3655827144744 -0x6002A16A29A36FF6EE74B70EEC46D1DABE76D785 = CODE_GEASS_R2_05 | V | 0x1EB228203D865017CB4FDDF19D27C0D1 -0x4EC0C0380760B3AD46C4C05FAB29B79CFA745A07 = CODE_GEASS_R2_06 | V | 0x2EAB629792402D21ABE826FC142A5B28 -0x1C6F3B3A9191A426ED4719BAF65F69F857DE0A08 = CODE_GEASS_R2_07 | V | 0xD4CC0AF19F70E95501936A12E8ACD578 -0x43FB3CAB49A33DA457CA1224C4057D652AE0035F = CODE_GEASS_R2_08 | V | 0x39C2E65E3E83D3AAAA4820CDC05DB51F -0x77DB4FDFC33910B3FA639422689AAD773C0CC459 = CODE_GEASS_R2_09 | V | 0x9A15FEB4F59DDEDEF7586E5A0B4EA2AD -0xA6E6F6496AC3D83E9A3B05E511CA5C3AE33FE5FD = CODE_GEASS_S1_D1 (Code_Geass_S1_D1) | V | 0xAFFB1C2ED1CA0BD171495EEE09BCF892 ; MKBv62/FindVUK 0.99 -0xC9EBA651C614FF08DE50A6114FE66813953EEA36 = CODE_GEASS_S1_D2 (Code_Geass_S1_D2) | V | 0xFC8C9D4C93196153AE9AE7C557F56798 ; MKBv62/FindVUK 0.99 -0xF791684E4EC4858B0982E510B04149AAA08371E9 = CODE_GEASS_S1_D3 (Code_Geass_S1_D3) | V | 0x27D3349DD1FBABC1020435115DF3599B ; MKBv62/FindVUK 0.99 -0x8F56A9C8AA132C84E66E1B4D1780A475EBB0CF31 = CODE_GEASS_S1_D4 (Code_Geass_S1_D4) | V | 0x4FBEE681CD03F5BC5E8DC7B23134EDB1 ; MKBv62/FindVUK 0.99 -0x99CD2569D377F35CF271C7516F7E6BB2A22DE2F6 = CODE_OF_HONOR (Code of Honor) | V | 0x901AF860445BB208402CDAC8817040F3 ; MKBv61/FindVUK 1.00 -0x997CC9A609B0C6478B6DEA2C0C1AC786A7435F51 = COFFIN ROCK | V | 0x5DB0C482CDD2CA6A71A9197A1B457F3D -0x05322D77ED6360235A62B1A98AE41DC9470A31E8 = COICENT FIVE NUMBERS | V | 0x92B56C6350AFD1A9B2CF57A433783968 ; MKBv25/aacskeys 0.4.0e -0x54A3B786380FBECDFE665CA26DB05B28492CA168 = COLDPLAY A HEAD FULL OF DREAMS (COLDPLAY | V | 0xA36D58481AB36F52C5D1942A4433973A ; MKBv61/FindVUK 0.99 -0x693C86042ED759120E60A03B8CCB9C0C06F68A61 = COLDPLAY GHOST STORIES (Coldplay Ghost S | V | 0xF212A55D9C6847C385C28DF958A30B51 ; MKBv50/FindVUK 0.89 -0x4A289B12626FC92E48019FA5F2BB1DE3AEDB9714 = COLD_MOUNTAIN | V | 0x17B3615B3C755213B8F0FA0D372A0C19 -0xBE9F88316DA75CD44285320B6A2EDFE571FB7045 = COLLATERAL | V | 0x85ACBAF0864C3597E6AD9F3A214498A2 -0x16E8FC9C0604697B679EF82D483795DA260DF007 = Collateral | V | 0x54F2238282CC726734256C8899AA2F1D -0x0BB5ED5921698A20CB31C84382F711E64CAEEAC5 = COLLATERAL | V | 0xF900C8603CA5D1282ED0B1996E075D63 -0x0A0B3D3A659B2978760F7D8C5D3557D3F9F96F13 = COLLATERAL (Collateral) | V | 0x5C1CF40C9250DCFE2858A9C1DF447FD9 ; MKBv16/FindVUK 0.93 -0x97BC594BAE84E730CA08998DE3C028206CA64394 = COLLEGE ROAD TRIP | V | 0x4560DD98102B4F4ADA710AF29A07775A -0x3EAC7925B42F7D6F0DB43AC5708D4FAC7B8733FC = COLOMBIANA_BD (Colombiana) | V | 0x13365A05114914DCAF9D8824F6180DE8 ; MKBv28/FindVUK 1.00 -0x8209571526D4EEB22FE6F2D306D0FB58EB9A0BB5 = COLORADO (BLU-RAY) | V | 0x13B31645EE8AB8854D45CFAA0C1C4FF7 ; MKBv36/FindVUK 0.98 -0xCE58E4CD6F8650A696CBCFB5EC01DDDD87F46AA9 = COLOR_PURPLE | V | 0x8BF557A43B021712F822D5309B7A4242 ; MKBv19/FindVUK 0.82 -0xCAF59590E23839F4EFA1307B25E3A551D95EF08C = Colossus - The Forbin Project (Colossus | V | 0x01858CDED50CF0AD7DFCC59984486EB6 ; MKBv61/FindVUK 0.99 -0x46B8F5B9ED69DC0559D37F81F62A7E57F8E3F9D8 = Columbiana | V | 0xA7152B16152B4718B5A344D8C2DDBAB2 -0xEDE3CFE845B4429A0C07910B3DFAF0B0DBB55BD0 = Comic Artist BD1 | V | 0x65EBA2CDF7D30B7158996E22BAF395BD ; MKBv53/FindVUK 0.98 -0x3A0D93D3BD7A13258A76F5521A536391E58E6A7A = Coming To America (Coming To America) | V | 0xDD9B1BA23A2B9BA10C72ECBC47EEF273 ; MKBv36/FindVUK 1.00 -0xE3AB6E10F1398AF9778EA34DDBF5AEE4FAFFDA40 = Comin_at_Ya_3D (Comin' at Ya!) | V | 0xB6010EC45B8EDEC9D0B7A6099F2CADAE ; MKBv56/FindVUK 0.92 -0x5EC01EC86049E3C55AE4F3D2E8CCC69BE01ED94C = Commando (Commando) | V | 0x06E5B17A726C589CB2257BBB1D8D9E6C ; MKBv47/BD+/BEE/FindVUK 1.00 -0x22044B8D3FEA17FEE25C0DD67AF8ADFC98484FA3 = COMMANDO_F1 | V | 0x5EBCA58392D72C2FD49F8911E135A89D ; MKBv4/FindVUK 1.00 -0x739E9DC3E09A6BFA17FB9596C642F3EEC4FB7D2F = COMMANDO_F1 | V | 0x4EBC20437904A63821B7221343537D39 ; MKBv4/FindVUK 0.80 -0xEBAF10613763E29CEB2304D85695301544E755AF = COMME_LES_AUTRES | V | 0xE7D64CF36D53AE42F20ABCA039811D94 -0xF6132BCFE49F7E95F617A6468504DA323A14164A = Company of Heroes (Company of Heroes - B | V | 0x70153028F621519ED1723E3375C9CED4 ; MKBv35/FindVUK 0.96 -0xE6D3CB51F295D316163634B6DAA91A130C5913B8 = CONAN IL BARBARO | V | 0xEEA1D7FF0560137E8E7BA59B290133C0 ; MKBv25/FindVUK 1.00 -0x0252BB2B4FAF3ADA0FBB64A2E35575BAC3D9A5DE = CONAN_THE_BARBARIAN (CONAN THE BARBARIAN | V | 0xF55C65889C182E4E10D7B9C73B7A149D ; MKBv25/BD+/FindVUK 1.00 -0xED42B7B96A79099872F3207AB697DF725F09A548 = CONAN_THE_BARBARIAN (CONAN THE BARBARIAN | V | 0xA3B1F283023B77245A915AB36627BE5B ; MKBv19/BD+/FindVUK 0.93 -0x6EB9011051843A253C7DE7572AC4293A8FDDF23F = CONAN_THE_BARBARIAN (CONAN THE BARBARIAN | V | 0xF7989B16AA203FF860E1D2C4E976D574 ; MKBv27/BD+/FindVUK 1.00 -0x375884B96908A7FA47E2048835D2E3407E1110AC = Concussion (2015) (Concussion (2015) – B | V | 0x9F891A5DAB1FA6D164251AB22F24828A ; MKBv60/FindVUK 1.00 -0x6D0355762749C47870919B9CF5910FBDDA24410B = Confessions of a Shopaholic | V | 0xB4FE89CCCD318F4EC6D826F153CA2024 ; mkb v12 -0xBDB9BC49E98E3063BCA00654C3B8CB79E07AE4BE = CONQUEST_APES_F1 | V | 0x0311148581290D74FAE6FEB4A7968D56 ; MKBv9/BD+/FindVUK 0.80 -0x82506B97560F52EA81D114424F9D1923C73A19D6 = CONQUEST_APES_F1 (Conquest of the Planet | V | 0xFE5130E1B160AEBFABBAA9364D89CE3A ; MKBv9/BD+/FindVUK 0.96 -0xD709B6FFFEA895D8A2C51F81200F85619D861660 = CONQUEST_APES_F3 | V | 0x3C786317AAAA427E6150DA0A00B6922E -0x1DE5F19EEE30C14AAEE4E3C2314E708141BB90EA = CONSTANTINE | V | 0x84BFE6C97A67823E5FC4C7BD44E536FA -0xE563FDCCE2B1D51276F5D00F35B4E7534FD9D96D = CONSTANTINE | V | 0x857E93447D139E156E89DAB228B3D33D -0xE7FB610E7F45A257B3F6A44438753BFB102A029A = CONSTANTINE | V | 0x54C2549A8280B40DE7C934D25330C6FF -0xADBFE58E77315569D5926F5CF67301BBA1811D82 = CONSTANTINE | V | 0xF1180AD0153257D4727ECB1D7BD2A192 ; MKBv7/FindVUK 1.02 -0x10AB916AC68C625B7C282691F24B9ECED48627DD = CONSTANTINE | V | 0x194DA352894F47058CBB32EDEC79C4D7 ; MKBv7/FindVUK 1.02 -0x7A777800A03EE437CCBD8ACD18B8A0ED7172CA59 = Constantine (US) | V | 0xEBC5A3363F25F3D8023E56C888EF6447 ; mkb v7 -0xC8A8EF4F2FA9F8CD7152FBA42B688B290BEDB949 = CONTACT | V | 0x5C0D5602B9ADA7DA2529456678A4B59B -0xF0CFBBED398A447E1A7404CC62FD3908BC7B743B = CONTACT | V | 0x6B9DA43476DC8C43D7A539383370B5F6 ; MKBv14/FindVUK 0.80 -0x402C0109B6707DC6CE889EF2E632B6BC7C93B1F1 = CONTACT (CONTACT) | V | 0x2E7FA42C75A8D52BD84F797A89BEC15E ; MKBv14/FindVUK 0.98 -0x6F757CFD11574CDEF398DCF65259D12E48571D16 = CONTAGION (Contagion) | V | 0xFF7CE33A1E3D6AF08DDF20164A2A72F2 ; MKBv27/BD+/FindVUK 0.91 -0x55DD784C34B65BFA98721554B11D41B2AD8A97C9 = CONTAGION (Contagion) | V | 0x4BE17A091F5F171465D8FCC7C5848D6E ; MKBv20/BD+/FindVUK 0.84 -0xA32A1B272F4D9242326DF4665AFFE96518F14004 = Conte de No????l (un) | V | 0x31C0B14DED1C4D1DDD35B5825659F4BF -0xCA9097AE8DD6B898C5C5B36374745D13D4ACD9A9 = Contraband | V | 0x58231FD5834810403ABEB426773D7EE6 -0xD4E13676F7EA6131518753B3DFF3F30918119F11 = CONTRABAND (DE) | V | 0xCEE3E2CE8BDB5051B1E9E1A7E6B0A166 -0xF4714E2004511FCE3B27CE29A7DF81AF098188CC = CONTRABAND_G51 (Contraband) | V | 0x45218738F809F9F26D52913AF890C086 ; MKBv20/FindVUK 0.91 -0x5419B985F861F564FC39760C8FE8472A1D67E4A3 = CONTROL_BD (Control) | V | 0x4EEF3DB92D30AAFEED8CE6FB03B9BFF4 ; MKBv9/FindVUK 1.00 -0x64690228436795452E165DFA68620421F168DBB3 = COOL_HAND_LUKE_SE | V | 0x0B79A4EE78B37649178D02D2CFD7EDC7 ; MKBv7/FindVUK 0.80 -0x30B0E49173EAC9255575C5AD33FCB49A51729F36 = COOL_HAND_LUKE_SE | V | 0xB9F570D1D9CE9D7CD211A0B024039B77 ; MKBv10/FindVUK 0.96 -0x37008AF2BFB853AC0654C1263DEAB010FB291753 = COOL_HAND_LUKE_SE | V | 0xE520BE0958D0654B2FAF3B869B5CF24B -0x46647CEFA0F3EE787419D2B382A277EA5E6819D4 = Cop Out | V | 0x0C25E2E0482647D729447CBFD79B3CE3 -0x3E7624500D3B64168D743D25AE226DC5DF5380F2 = COP_LAND (Cop Land - Blu-rayâ„¢) | V | 0x0D49A953E341EBB69B8E2FAD85FEBEC9 ; MKBv27/FindVUK 1.00 -0xC9C73A00CEA5ACF4F69C765551448501F3A3613A = COP_OUT | V | 0x372FBEF5EF71C0B05263A1A395CBCC05 -0x43100B1E04AAF5FB787826A2E2762315E0612922 = COP_OUT | V | 0x8E5BD05DB59DF4DDED7FF501F2810A1D -0xC44FA9F400F0430672440A99F82A86593D7C9287 = COP_OUT | V | 0x77BD17FCA99E134A2E4FF70EC32EB5FF -0xD0D2591C1840CADBD8224D00BB99908CCEBA6A7F = COP_OUT | V | 0x426BCC1DBC2A151A905D4F0C943C1FE2 -0x0712F489A53EDC1DD0E0DDA8C7AF3DBE8210112E = COP_OUT | V | 0xC96086545B8A362E6A068FE906BC5045 -0xE8E52D8DB54D17481B9F7FC25C2254A36F023B29 = COP_OUT (Cop Out) | V | 0xD48694716F565FE1B924488AA79995F3 ; MKBv16/FindVUK 1.00 -0x269D1A0C36F2716E0A1DD47472F2D4CB5CBB5A2F = COP_OUT (Cop Out) | V | 0x5B4CD6F49B8373153E8B619302127858 ; MKBv16/FindVUK 0.96 -0x6F06E43E49F025A18F77447E861768F3DC7F0875 = CORALINE | V | 0x4B370FD635E9DD8C0AC4BA3D2A38D74C -0x91FB6FA68537EB51E3BFBFFB33BA1ACE4A4C5740 = CORALINE | V | 0x42ADBEC9D06B4EEB000B35079914457B ; mkbv12 -0x78440B0E643C6BCC3DCD1C86CF8365546D5F3FDE = CORALINE (Coraline) | V | 0xDFE97A6E226442A619B3AE1450E0CFD0 ; MKBv12/FindVUK 0.96 -0xEF679AF9171036C5AB55E34E480BA00F42483314 = CORALINE_3D (Coraline 3D) | V | 0x6F510F21142EEA138713EE072260D146 ; MKBv19/FindVUK 0.96 -0x2FF38081D02F0EBFF6E6AEE62D088BCF62927B47 = CORALINE_3D_BUNDLE_REGIONB | V | 0x0AB95BC3A3058DA59A976B2875601629 -0x3489CA8B7747D9BEDCE878D11703052180308B8A = CORALINE_3D_G74 | V | 0x7778DDFE794B9E4C2C979306EAA93C33 ; mkbv19 -0xB8656A6DCFB01D184FED7B517025F80238F5DFFE = CORALINE_AV | V | 0x0358F1DA3296BB9D1A9E9B7FD5EED842 -0xAC7CACF80470B38AAA5A444A96C25FEAE5620F1E = CORAL_REEF | V | 0x2316F6887975C9BE1B20614FF17362E5 -0xB3200B27FD104AC51A752B6AB0FF88701DD71044 = CORAL_SEA_DREAMING_2 | V | 0x533780F493C2A66F20FD0A73E58EC226 -0x42054590AE388C6BEB38E794D9FB262FF2B1A6E1 = CORIOLANUS (Coriolanus) | V | 0xD1E534D8904CBCAD5C30C877A0C16C8B ; MKBv26/FindVUK 0.96 -0xCA37729D1E227D117CDD80E6C4F551194134C351 = CORMANS_WORLD (Corman's World: Exploits | V | 0x556582952FAC351BDC2084DF8EEAB6BE ; MKBv28/FindVUK 0.94 -0x1EE3636E14F162D871FDFF254B33316F6EAA6E0D = CORNIAUD | V | 0x74558BE030FCCD0359F8DDCD1A04E319 -0x679E43E9EC6AF8D2F627DD644A7AE74D2DAE80C5 = Corpse Bride | V | 0xDB41AF50CBF9CD672B2730B666301C95 -0x44AAAA67344CA755F585D95C385F98BEDBA8E715 = COSE MOLTO CATTIVE | V | 0xDC4E9314A47A776391E37806CEFA2AE7 -0x4A082D2816B99B6AF5BE709976E6D97775C8E523 = COSI FAN TUTTI | V | 0x46EEB79D63F1FDF6A7EDE82E2F671FFF -0x27E07245960102625B8A220C5E0D99EFED3AF9E5 = COSMOPOLIS | V | 0x52472C739AFE8E42C8A37B7332F76828 ; MKBv35/FindVUK 1.00 -0xDF4F55D6C1961EEB34C84B4A4D76358FBA27C05C = COSMOS_S1_D1 (COSMOS: A SpaceTime Odysse | V | 0xF1683FB31652808DE038C8F001003CFF ; MKBv46/BEE/VUKNOTVAL!/FindVUK 1.02 -0x705F713AF38A37BD3F1497A3AA7D5EE0EB54399C = COSMOS_S1_D1 (COSMOS: A SpaceTime Odysse | V | 0xD0FCCF08EF4D4CB0C75B798C0055D98C ; MKBv46/BEE/VUKNOTVAL!/FindVUK 0.83 -0x43F0E1228CEF48880AB722D4709D2B303E4D58C8 = COSMOS_S1_D2 (COSMOS: A SpaceTime Odysse | V | 0x7990F37BB59223DE1C097DE05465083C ; MKBv39/BEE/VUKNOTVAL!/FindVUK 0.83 -0x42E3E2567FA1DB64972B1306E8B537A278B5D981 = COSMOS_S1_D2 (COSMOS: A SpaceTime Odysse | V | 0x995A8A2AB5AB4EE54393B89562C11C05 ; MKBv39/BEE/VUKNOTVAL!/FindVUK 1.02 -0x01E04E280FBB5529A0DE12C27FAEBEE7803B5F22 = COSMOS_S1_D3 (COSMOS: A SpaceTime Odysse | V | 0xDE61D809591DB313F5E338274A498CB7 ; MKBv46/BEE/VUKNOTVAL!/FindVUK 0.83 -0x4C383B7E64348965F5BFB3F93D535E2294B6C62C = COSMOS_S1_D3 (COSMOS: A SpaceTime Odyssey, Season 1 Disc 3) | V | 0xF94F54EBC0744A5796A8CD1169E971CE ; MKBv46/BEE/VUKNOTVAL!/FindVUK 1.02 -0x1B55E171304DCF8501D3FABBD65A4EAFC17B611B = COSMOS_S1_D4 (COSMOS: A SpaceTime Odysse | V | 0xF4E27D2A2EA9A35652D2AE3D47B728C1 ; MKBv46/BEE/VUKNOTVAL!/FindVUK 1.02 -0x5568FA40CF75C236FFB8287AD75CF8FEA1DEE888 = COSMOS_S1_D4 (COSMOS: A SpaceTime Odysse | V | 0x22DFFCE757FD4D4CC89003FFD2C1D0E3 ; MKBv46/BEE/VUKNOTVAL!/FindVUK 0.83 -0x36B5C78125F1A75D3E876E5930222B71361DE1C9 = COUNTDOWNTOZERO | V | 0x3BA33E21221DC39216B2441FE10EC097 ; MKBv25/FindVUK 0.96 -0x3E3C5D4EED85342C50C8D5B762AA0DE6FF6C7FDE = Couples Retreat | V | 0x64000023063E6A54A2B2ADC7C1B6E791 -0x72CF68CB76717547A5C475BDF5DB8DEB11D749B5 = Couples Retreat [BluRay | V | 0x5ED1950B44D530410F59EF2BE76F8F86 -0xD1F2648FC899A3CF6DC742F3DB6468FA728B458C = COUPLES_RETREAT | V | 0x1B4B55587598D1A8B472556F2F181F06 -0xDE0CAA160FB744F83BF84C1A6F78E9D3AD0DEA88 = COUPLES_RETREAT | V | 0xDE42EDA45C116D35C74B07762353C570 -0x4B4DE37CAFA1C98A44FF3998ECF3C052EF9E8833 = COUPLES_RETREAT_G51 | V | 0x6133D2D9F46DAE9F457957BE42F8E4A7 -0x32E4C29E6AB592E1A4000B1672068A37E53E833A = COUPLES_SEDUCE_TEENS_10 | V | 0xA10541E3A5CA52E120A0C9F1539B0912 -0xE14899874825F430B18802A0669BC1B04C1D896A = COURAGEOUS (Courageous - Blu-ray???) | V | 0xB213140F421FE71295E95AD3D3E943E7 ; MKBv27/FindVUK 0.96 -0x5B782FD4D0F2F9AAB864D2F7F4A56DF237B98F2C = COVENANT | V | 0x8638D31D62A8F596ACACBBA2397A080C -0x494F41CA64D6333C3B71F0734F56DFBCD5F63A3F = COWBOY BEBOP DISC 2 (Cowboy Bebop Disc 2 | V | 0x4BF9BF0089DA3CE4C8FDD36E3B739F9A ; MKBv38/FindVUK 1.02 -0x3F4AC39F52A92FC45C8694A0C5EFE5BD0BE7F397 = COWBOY BEBOP DISC 3 (Cowboy Bebop Disc 3 | V | 0x294C9BBC568B224F88667117D569352E ; MKBv43/FindVUK 1.02 -0x356F7D8336034751121E19CA53AD38C068961987 = COWBOY BEBOP DISC 4 (Cowboy Bebop Disc 4 | V | 0xE7F5A718EB2A601540EC8F73FF655DFE ; MKBv43/FindVUK 1.02 -0xBD2D673EB4472598EB28551D681573BC2E876AE7 = COWBOY BEBOP_MOVIE | V | 0x039FC75C88B1663EDE5B455FB93D2D58 -0xECAACF18F0CAF65E8BA1E7BC646C70525EB43514 = Cowboys & Aliens | V | 0x9D88915E0C8B8C7EC7A66D47EEA4CF17 -0xFE0C085F9F85B24151E835072BCA22F2649C570D = COWBOYS AND ALIENS (DE) | V | 0x795223016186CD6EE80A935814A1B6F0 -0xDFDE2F2C36257A372CFA719E31E30D58EA45293B = COWBOYS VS DINOSAURS (Cowboys vs. Dinosa | V | 0x274AD809A9A24850D7D555E5B2046A36 ; MKBv47/FindVUK 1.02 -0xF6AF363831F93343FD864BFC7B89FF4405517122 = COWBOYS_ALIENS_DOM (Cowboys and Aliens) | V | 0xCDBBC70BEB38DD6DF30CEDE76FA2A841 ; MKBv23/FindVUK 1.02 -0xA5C99D6265C5DBC0CFD575A68479D134A13E4ED7 = Cowboy_Bebop_D1 | V | 0xAE053D73B33FBB6010FB147C0D6C679A ; MKBrev 50 - FindVUK 0.56 -0xC01BCE9EEDCA943A1BD4756D6D801FB3A8450A62 = Cowboy_Bebop_D2 | V | 0x5E1D0191C12B9CF64C3C83F14D2ED5AE ; MKBrev 50 - FindVUK 0.56 -0x7A8B4BEE2C3C9B18A7B2933790CDCD0764839EC3 = Cowboy_Bebop_D2 (Cowboy Bebop Disc 2) | V | 0x249CF075D3DD998E29B4B9FB31F085FB ; MKBv50/FindVUK 1.02 -0x9E19BCEE7DC78E751A30444EB8AD1BD21D4A04DC = Cowboy_Bebop_D3 | V | 0xFFE8BD9EA17978E0E93123A3EE460C3B ; MKBrev 50 - FindVUK 0.56 -0x16472AB199823A8980B7934C1C42B7FA524A0B9C = Cowboy_Bebop_D4 | V | 0x38E6ED644A0AF04B3BE66C848885D662 ; MKBrev 50 - FindVUK 0.56 -0xD0A1EB1AD6FC70C289A313F520B4BD1C27407EF3 = Cowboy_Bebop_D4 | V | 0x2E5968C6689368CA130C87A794974760 ; MKBv50/FindVUK 0.92 -0x201FD6689272077A8113AA318B7772567BA4C9EE = COWBOY_BEBOP_DISC_1 | V | 0xB8F791D0BDA21AEB3DAB0B8EAB68B5EA ; MKBv47/FindVUK 1.02 -0x4A3002299A9DAA797B2F1E88F2CF2450ACACFAEA = COXC1191 (COXC1191) | V | 0x76E0CFAA4F8B7CA7E98D4DEDEDC0648A ; MKBv61/FindVUK 0.98 -0x9356C00C6E3A933E9C203A9BC71FA6352D9845C6 = COXC1192 (COXC1192) | V | 0x59B1D4FFB7D9D5A8DDA891F9D82BBE28 ; MKBv61/FindVUK 0.98 -0x70677ECAC16922C1B58606F834F58D08B530220D = COXC1193 (COXC1193) | V | 0x155D5BC2BD48A2501E6DFA140C304507 ; MKBv61/FindVUK 0.98 -0xA6015BBA0C1094B7E8EDF29C9864BA1BB8E2D380 = COXC1194 (COXC1194) | V | 0x84D6057B11B468E918B531EC52C3EC06 ; MKBv61/FindVUK 0.98 -0x2A359DB7F9B2854FD8F3B394890047E708B0C0BC = COY1EGD1 | V | 0x495661FECDC6C001F4AFCC71E5C723BF -0x4F92FCCD460888428F205A55014A457D1A8A6A19 = COYNDND11 | V | 0xE382F6A99467DD12B73797EB5D2CEB8D -0x6BBB19BCC97FFE4B6A5CAF0E956664A76DF609AC = COZC1028 (COZC1028) | V | 0x88D2FC54671C44DC1D8AE6156DD6BC3E ; MKBv52/FindVUK 0.99 -0x40ED8B92EA4B7B84C9A0C12156DEB45882AED8EF = CRACKS | V | 0xC8D6F52F2E70F9EE69A0C56597A55E40 -0x2EBB98990E33356A059BD9308518F56021E44C64 = CRANFORD_US_D1 | V | 0x2710D339896A02C207169BA6852A3E48 -0xD8A93C38C302D5163ADD946A00FE3F334BBFB434 = CRANFORD_US_D2 | V | 0xF5DEE37F05803FC7EA0F7E3126CB5ECE -0xF7808CA4DD531C069A2F0F78CE3BA05FF3373142 = CRANK | V | 0xF6A0B4ADA125661E082CEC7F1D3A3298 -0xCC676E0A06DC3D3ADC097B1279EACA88BA66CA62 = Crank | V | 0x167D7A7DB062CAC4C6D2FF4A6EDDDBEE -0x5D348586460DF61206F4752BB8EA090A1D434B8D = Crank 2 | V | 0xDAB2DCC02FDE430089CA223248628C95 -0xB249CD06422F2F15986BE5F7353680C04FA91170 = CRANK_2 | V | 0x67D52DFB1C8C806DFCA515B02E3AB385 -0x73925C9ACD5CD8B77F2DBC6146CDFBC36161ADD7 = CRANK_2 (Crank 2 : High Voltage - Blu-ra | V | 0x63FD91833A5AD1AF241DF50CB7582D77 ; MKBv14/FindVUK 1.02 -0xEEB6A05A1633AE7571BAC6FABB59DB50CCC0CB55 = CRANK_2_FSK18_VAN_BD (Crank 2 - High Vol | V | 0x03FC0FCE7BE5A39E3A29DFAA4660E747 ; MKBv16/FindVUK 1.02 -0xE0095D5F1CF08B7EFE3DF4CFE2A78ABB47DFBA7A = CRANK_2_HIGH_VOLTAGE | V | 0x118C6E443967FD4B72896E69522CFC1A -0x54048A9E19DE015CF2EC41E440C58BFC16859F25 = CRANK_2_UC_VK_BD (Crank 2 - High Voltage | V | 0x9CC071EB80BA2B9BFE09A6C46B3CD1DF ; MKBv15/FindVUK 0.96 -0x1BB7A3837470E3AF842826C7BB1B66A66EB84236 = CRANK_BD | V | 0x250467547531FD2E25EE01C2D884918C ; MKBv3/FindVUK 0.96 -0x4C76810D8477105AC0AA432C8A3FF9AE1DB74112 = CRANK_BD | V | 0x8A74E1683FD12697F48C45F862C14946 -0xF98C639F9E761AE440BCCBF4D9607D9C9AAFE82A = CRANK_BD | V | 0xADA0C9DD11DDBD78724FF605AE893AF6 ; MKBv3/FindVUK 0.92 -0x549C45742C5C84E786C7EA718B8CAE933504FF61 = CRANK_BLURAY | V | 0x27D7C87B25F1C841F112C4359B181098 -0x1BB93F0CF89BCD436F6040EE88B47829AD67C603 = Crash | V | 0x6A1B96CD2872A5B57B30538377CC5104 -0x0208C89DB6A708F160D68EFD72A524DFA2130531 = CRASH | V | 0x814C5F63DAF7E4641D0ECCBB261D98A8 -0x693B78E1BC7F26355D30AC3F52D22CF20C5D4E62 = Crash2 | V | 0x8F93E6325C52FCB5A3BBEF1A615352EF -0xB6F1C7588CCF37362FB4BB0CA24D415B382DEE98 = CRAWLSPACE | V | 0x97265F2C722649EC97625DCD04905258 ; MKBv37/FindVUK 0.93 -0xDD88CD68E3DF4C71E1791C4C52A68876D974A1A1 = CRAZIES (Crazies - Blu-ray???) | V | 0x2240160F503A81F415AFF2DB2B03C112 ; MKBv18/FindVUK 0.96 -0xCADD51295F223A2734A40B6C0109FC9D3318B810 = Crazy Heart | V | 0x7427033ED8960C8BC0B6985EA3FC079B -0x92D765FCADC0E8C50E710453BF6974EEDA573ECD = CRAZY HEART | V | 0x98D528CC47E2284CDC4E3EEDBA91649E -0xBE48D1D0A137677D2E62464F0396775ABA2081A4 = Crazy Stupid Love | V | 0x1138B9260245A100FF20A5F1B967723A ; mkbv23 -0x884FCD403B748CFDD3F1918266863DCBDC44C52E = CRAZYHEART | V | 0x6325F45B09160580FF01D8CBEDD17E46 -0xC4F40D4E8CBFE8705039BB670D03BAEC36C2FD1D = CRAZYHEART | V | 0x5CC086491DA1BBEDA073EE604F247BA1 -0x2EA91261E27AD4501CD70D1F23AE58F41BCB1F98 = CRAZY_HORSE_3D | V | 0x803C0B8A75077712C63A3912D6C6A66B ; MKBv37/FindVUK 0.99 -0x84930421DF715C28B32DA68076CD7862BBEE30C9 = CRAZY_STUPID_LOVE | V | 0xF1559F4619818BE19399B68417F24D0B -0xEEBA74DA6D613B62B7B6FF0E6ACAC72DAFC5C5C4 = CREATIVE CONTROL (Creative Control) | V | 0x486B5C179D9DC5C653EFC26705B6BEC5 ; MKBv56/FindVUK 1.00 -0x4D17D974C53C68BF7E626049C91F5956BB63DAE1 = CREATURE_BLACK_LAGOON_G51 (Creature from | V | 0xAFC8C5203D72FA90021B37A5F93CDDE4 ; MKBv31/FindVUK 0.96 -0x5F772E570BE42EDF2BAF3E6BED31857D6F4BF963 = CREATURE_BLACK_LAGOON_G51 (Creature from | V | 0x63BED3DDCFB9FE7CC991495B38047958 ; MKBv31/FindVUK 1.00 -0xC3579F891B3B32682AFA176B0D73A4C71EF2F3A2 = Creed | V | 0x1EB5A073F655382EDB242AFD5BA90921 ; mkbv61 -0x96352DB00762B07BE0E05248CE37AA7DC233A660 = CREED (Creed) | V | 0x563AD5F56A11C070E4732591EBF52BC3 ; MKBv56/FindVUK 0.96 -0x637826A643B8F1C00658C984A41ED7344FB8B3C2 = CREED (Creed) | V | 0x316AA3F7C59C9837955C0CD91147B579 ; MKBv61/FindVUK 0.96 -0xDB0CE3BD897987187DF5372B83DE9A9F02A5EC01 = CREED (Creed) | V | 0x0684E9253F5CB2327173CFECBD4ADD33 ; MKBv61/FindVUK 1.00 -0xF2C6C90C91198C8611CBE46D1F92CE5AE56C6DA7 = CREEPSHOW | V | 0x026E774C1507D7010B2BBC2229F44911 -0x4DBD40916AF7B72A17030E51B4D8DA46C3BE8F19 = CREEPSHOW (Creepshow) | V | 0x8E835A2A05351876C041A2D87F5D894D ; MKBv12/FindVUK 1.00 -0xFAF184160590C95F5DC0FD4AEA50CC78B76CC144 = CREPUSCULO | V | 0x4D625F262E88EF42CDA2FD9298299563 -0x80DD7A95A2CA1E418011893E9BD3CC8A1DCE13A8 = Crimson Tide | V | 0xCE8A0582FFAD52E8E614E1EBBFD45AFA -0x852A438C5D70B5A035880B28C7A48C6E2E22CEEB = CRIMSON_TIDE | V | 0xF62CA3AFB2C91F6D3F71D0516C5C9246 ; MKBv3/FindVUK 1.00 -0xE5B5CEAAB77BC1D575396ABC51DD7225E1878DF7 = CRIMSON_TIDE | V | 0xA0953F9CBD7944BE7816EA166D7CEACC -0x99CAD173B8707D959234EC2862ADB662B46D4135 = CRIMSON_TIDE | V | 0x8FD95B22C89AE70C2C7B704982BAF10C -0x69C83F59A13CF8CF8816749EC151E3AC8824815D = CRIMSON_WING_FRA | V | 0x594325BE273A33931E800F014CF72BE5 -0x7FC5EF32EC3304C373660AA6FE29C1F54F736CB0 = CROODS_3D | V | 0x0E3E82AC6B571AFEA47A677F9EA52FE7 ; MKBv31/FindVUK 0.81 -0x90BB0AB9FF2688E7603A080D9BA1AC0074EBA20F = CROODS_3D (The Croods 3D) | V | 0xB51CE67A05705A4783310A2DA8EA8B66 ; MKBv31/FindVUK 1.00 -0xCC28315552FA187F41E91667DB7BF3F9365473AD = CROSSING OVER | V | 0x34CCD818D56FFDA87459509E303812BF -0xB38621F8F1D3B17CB674D782B70E44D688BFBDCC = Crossing Over | V | 0xBF578537F524C231593960DBAF91856D -0x215FA8A0621A9246B19618500A746B8F9BF54D81 = Crossroads 2013 Disc 1 | V | 0xA8CE070FF8A12B2E1F934404885B1CEF ; MKBv39/FindVUK 0.83 -0xFD570AFFADC60C88CC9AA152E00C93EEFC4E4D6D = Crossroads 2013 Disc 2 | V | 0xEC62646E2428188E209319422C11F7D1 ; MKBv39/FindVUK 0.83 -0x82C15122840C2A08881527354A45C2A8848F235B = CROUCHING_TIGER | V | 0x32CCA872FD4F2CE1C1C7F7068FC6DEFF -0x17B2DAC08F36C9CBC540FD451104355FF76A7768 = CROUCHING_TIGER | V | 0x7363B7D2CA8E6424E5F4842ACB5909D9 -0xDD477602F84C9FA6CA48BC3C145A8564E8B3D4B0 = CROUCHING_TIGER (Crouching Tiger, Hidden | V | 0x702CD97A0ACDFEC5C4B6352691CB532C ; MKBv12/FindVUK 0.96 -0x9821CFABF41DFECD13F4E7F63B1651FB2268A8E3 = CROUCHING_TIGER (Crouching Tiger, Hidden | V | 0x73A47B3905C07AA9FA06CD3BF6258B8D ; MKBv12/FindVUK 1.00 -0x74519C0BE7C5EB1598806DD58A70383EE617D91B = CROUCHING_TIGER_HIDDEN_DRAGON (Crouching | V | 0x50F3856A838B24FE9F3CE75940AC0E47 ; MKBv61/FindVUK 1.02 -0xA160FA877476F2368B05C35A6860328D6D2FA85C = CROWS_ZERO | V | 0xF5EE944343A4F6FE791B0868FE87AC61 -0xA1E7F02C9D8B2E27C4B3C67F8A2E0EE157B852F5 = CROWS_ZERO_0 | V | 0x08495E8785D84AA4715D540DB0EA4F82 -0x1540489B690467D6E7B39177626360ABD196EC7E = CRUEL_INTENTIONS_P2 | V | 0x23E5E8C72D7C72E9B1C6EAC7A11A4792 -0x5A24D2904C5EA45C70BA9F74ACBD8254D9D1949C = CRUEL_INTENTIONS_P2 | V | 0x7C46BC96135D8E2DE1AD8A187432300F ; MKBv3/FindVUK 1.00 -0x608E39FD6B585D9CBCDE9779F0A150892D5A5977 = CSI NY s6 d2 | V | 0xE1D14C7A213F25FCB445DFF58392E6C6 ; mkbv23 -0xE7DCBE8D92EE48AD9AAA98DB11AA2D698E6A2869 = CSI NY s6 d3 | V | 0x725553C29B115FCB2B5909B5CE8BA82A ; mkbv23 -0x752F7AC7AFD065D66AE707E68FA9D08DF20074F5 = CSI NY s6 d4 | V | 0xB4897B818322F9AF7B52C1197FCCEA3B ; mkbv23 -0x2BC9D4754DB1EA0DBCD56B5CFC1F8728FC404C98 = CSI_LV_01_SK_D1_BD (CSI - Season 1 - Dis | V | 0x3902B3B48F313FAA22130EDC255E50BD ; MKBv14/FindVUK 1.00 -0xC615DA50F8672EAA671AC03DCB7A1397BBC9E0DB = CSI_LV_01_SK_D2_BD (CSI - Season 1 - Dis | V | 0x9D82CAD31043DCB8C5307860DE092C52 ; MKBv14/FindVUK 1.00 -0xFBBE96232E793D15AB43B44352E4DCF20339DB5F = CSI_LV_01_SK_D3_BD (CSI - Season 1 - Dis | V | 0x36141B8C4BA33945DAFB0DD5F166A799 ; MKBv14/FindVUK 1.00 -0xE0C37000C5AF7A2A6728E205000610E4B3D957B4 = CSI_LV_01_SK_D4_BD (CSI - Season 1 - Dis | V | 0xB45469650ACFD6A7AA5FFC7734B889D4 ; MKBv14/FindVUK 1.00 -0xBC3E91407F0ED05734FFAB56E1A6EEC53B98DB3A = CSI_LV_01_SK_D5_BD (CSI - Season 1 - Dis | V | 0x1B8D1B62DBA569B5A216B5D5F93D73C2 ; MKBv14/FindVUK 1.00 -0xBE27A34563CC65ECC7D9CDEA1B34D0F7107E08E7 = CSI_LV_08_GE_D1_BD | V | 0xA3909DB639966432D9B20E4ABA2DD41C -0x76CC01F2932DDDA7358246429FA4B38809CAF801 = CSI_LV_08_GE_D2_BD | V | 0x52E73DD080870B3FD215F3C7AECFF9A3 -0x211505E3D9A9B9C4F358BDCA1C79A46002B76794 = CSI_LV_08_GE_D3_BD | V | 0x5A255D99E3F3DAC0A15AC5A07B020928 -0x990614DC0EDFCE18A93945E114FD38C3DA5B2677 = CSI_LV_S8_D1 | V | 0xB700ACC7226EA1FDABEE76696DE656A8 -0xE180C6C1FDBDF9DF54D8A51655E382FD1153D2B4 = CSI_LV_S8_D2 | V | 0x989A190B4FD4B55A48D722031078E940 -0x01785C2E40245EFE7DE88256C724798DDC60CD65 = CSI_LV_S8_D3 | V | 0x5E825D6A3733BF6A636CE11B2F995AF2 -0xD4525DCF89C1E372E36674024A950CA8C6B2C579 = CSI_LV_S9_D1 | V | 0x2F8BB76C57F4938B5E1C91BD5B951589 -0x13F317081E530C1BBB9F0E91B263C449C34DB26B = CSI_S1_D1 | V | 0x49D7D28ADF46A1C95D3061B5EE8082D4 -0x48898F04417A4E3573B6DB67CD5C72701549777D = CSI_S1_D2 | V | 0xDA6E4230676511DAEFDCBD2DFD984B00 -0x47E43B924A4F8284631DE3C50F76E71731BE6D2E = CSI_S1_D3 | V | 0xCABE5B66B4172D7FD7F53533CEA63047 -0x9F90AB04400C6229C2D40A07CB47BA42B0BA44C1 = CSI_S1_D4 | V | 0x44C94B2AC646A6D45BE1D45986CB4E47 -0x0338B161D988A5F784E6B6BF890894BE28E29078 = CSI_S1_D5 | V | 0x181994C674B553C3CB8517274FC9355E -0xE91A960FF7A1A26DDF33F0FFCB7CFFB5D6CABE48 = CUBAN_FURY (Cuban Fury) | V | 0x2A1A1DAE1730147562C63F1B6A7550F6 ; MKBv47/FindVUK 0.94 -0xEAF87CBD1A7C047A5E667CC539C6ADFF62B85215 = Cum Inside | V | 0x88A00C70277FAE470036471A70ED6945 -0xD036390A0069C39E7D44D7220DE7A04410379C18 = CUMCOCKTION_BDROM | V | 0xDE68F68504D5B32F0433048349EFE219 -0x787E86C2DDE692313CC6C2E86F55DB4A353D0B7E = CURIOUS_CASE_BENJAMIN_BUTTON | V | 0x74C3D8E47827D795780D6A3CF9B0DAB4 -0x03EF2CC17211A94EFFEB635CA746EB951237CC04 = CURIOUS_CASE_BENJAMIN_BUTTON | V | 0x0092B8FBF45F1208B3E8F7EE23DE3935 -0xC5B3A8F8E8B7038CD0A6203B83C096006B814FF9 = CURIOUS_CASE_BENJAMIN_BUTTON | V | 0x17416D9D9F5E8728E94EDEF46B0E7654 -0xDA9A0061FD675D8E6EDDF58D2E94CC773B6459AA = CURIOUS_CASE_BENJAMIN_BUTTON | V | 0x107DB3E44226E891B205E30CC81A83E8 -0x250375A32EFA7EC6B9740D09CA98084ADC559EB9 = CURIOUS_CASE_BENJAMIN_BUTTON (The Curiou | V | 0x87A5CFA7CB9CEEE2A8AEA1AE04BB7168 ; MKBv12/FindVUK 1.02 -0xF51B4E70B0DDE419181019B08B1E02F3A0117AFB = CURIOUS_CASE_BENJAMIN_BUTTON (The Curiou | V | 0xA871B567406918B1510FD915A8D6461B ; MKBv12/FindVUK 1.02 -0xBF56D04EB2A189A92B02B4A6D85A187E652BAAC5 = CURIOUS_CASE_BENJAMIN_BUTTON (The Curiou | V | 0xD540191E8D626212E94C5F7655DFF20B ; MKBv12/FindVUK 0.99 -0x39A9C448E3B4318A4504356E68BB5035604E945A = Curse of the jade scorpion | V | 0x649F1E1298C62AF0F543374C935907D3 ; MKBv19/FindVUK 0.98 -0x104F764212160784A4D119CFFDE708BB35872C5F = CUTTHROAT_ISLAND | V | 0x3374531480A085EFCEEC27CE7E2A6386 -0xB83A0182F529AD64BEC3B0591ED14C0DEED15766 = CUTTHROAT_ISLAND | V | 0x57AFBA33A9C705FBDC92BDBB6B633804 -0x98A34FD2ED9537D4BBE14197E1C9AD236D7DE426 = CVBD1005 (Equestria Girls) | V | 0x2B70E1BBC0F626B14E8780F6DCA683DA ; MKBv46/FindVUK 0.96 -0xE86621309B51612AA40A098DA341C65576870333 = CVT14002 CINEMA PARADISO | V | 0x6BC871ED161E49CA8BB8E22288F3AE3B ; MKBv31/FindVUK 0.96 -0x7ED2FBC8BDB666BA567C98F83639E817CD195FC1 = CWPBD_16 | V | 0xE5C6C0531B8E1938DE04BBAB747C0C10 -0xB6B3647EF5BBD95E695237529E67BFDE9909B8FA = CYPHER | V | 0xA01EC4C371C63111129202D37553F509 ; MKBv44/FindVUK 0.80 -0x8D8D05D99377FAA1F798205254BC1EA750802494 = CYRANO_DE_BERGERAC | V | 0xE4BD9741041182F591628F785C8FCAE1 ; MKBv16/FindVUK 0.65 -0x34E84F8B6131650E866502B607BA87F5411472EE = C_CONTROL (C_Control_D1) | V | 0x7CE9DBF5491461FAEF565D2BEFFC6E0C ; MKBv31/FindVUK 0.96 -0x7ACB89D4F1C3B70F841C12F621D84A3AA03C64BB = C_CONTROL (C_Control_D2) | V | 0x3D4597DEBD924D268D9319E8CE0450CF ; MKBv31/FindVUK 0.96 -0x98EC90FEA3285680BF16111437F3E711347FB259 = D125186V1 | V | 0x4BD991B15B23FFC3F13A4D163F2C8345 -0xAB4991BFB4A2B3E84446830E8EE01E2F574D8C37 = D181523D1V2 | V | 0x6DF5646C8885ED2B8253A170C50CC9A1 -0xE5A76A29E031310ADBA1F2C337C95C34E754B317 = D181716D1V2 | V | 0x1F68DC7ED254025F04531050594DC59D ; MKBv9/FindVUK 0.94 -0x34AF557BD5578665EAC55BDF395C0521272A0283 = Da Vinci Code, The (Da Vinci Code, The – | V | 0x42371401636A7BBC50141E49059D39A3 ; MKBv61/FindVUK 1.00 -0x1D638BC3974D003728D2ED12005A4C8E780DA8DC = DAD S_ARMY (Dad s Army) | V | 0x0368B50730A000D56D761C412FB87722 ; MKBv56/FindVUK 1.02 -0x3225C84F23F2AC16F1CCF233BCA218F28FA09068 = Daddys_Home (Daddy's Home) | V | 0x90AC4A6C99863E1CEC2B804F85A68F4E ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0x6C565D7D79835B7E332CBA53ECEE7FB90ABF1A6B = DAFUR | V | 0x5A7F180275DE3956E3C55C1421F489C9 ; MKBv19/FindVUK 0.80 -0x25E5327C4954325735CDCC5D28405F4EE24A0FAE = DAIMAJIN_BD | V | 0x7CA90D4651AA1AB9491AD020B966060C -0x9FC5CBDBDFCF73F8E53F8CAA5F605A7129176D05 = DAIMAJIN_GYAKUSHUU_BD | V | 0x0B1AE4BD455BDF004B8D49C11C3F6456 -0x65DCAC1A8376102121315FA8264C9756A7178F2B = DALLASBUYERSCLUB_NA (Dallas Buyers Club) | V | 0x6B786B55D34623E1D5733F454DC4DC0F ; MKBv35/FindVUK 0.96 -0x0CC0E443C43DB9CC377684CE9F640A60B695042E = DALLAS_BUYERS_CLUB (Dallas Buyers Club) | V | 0x89410E7F1BA497E9C8B1B40F165925F1 ; MKBv47/FindVUK 1.02 -0x813B537A10077C8FDF66FFE2C9C894EE7766B0A3 = DALLAS_BUYERS_CLUB_NOR_SWE_FIN_D (Dallas | V | 0x550B00DD632D584058CFBA3535237468 ; MKBv46/FindVUK 1.00 -0x1999712DD0B672FD36D50E337805FC19B940A7A7 = DAMAGES | V | 0xBD403FCAB234CECDD5D1F9F4E5710740 -0x055FC726FE0AB85EBED798BEAD4787E662C7A093 = DAMAGES | V | 0xA803B3059C151308473DB912A53A5BB2 -0x9F091381AF88824863982CAC44266CB31ABD1B17 = DAMAGES | V | 0xDFABDB6EF64C279BABB4E1A9B1CC1FA0 -0x6584FF334124B9A8845D1335C9E9FF3337BB78D8 = damned_united | V | 0x9829ED347B56AA1B368A57014A506274 -0x6DFFB0998BF1424F6EE822242CED185C7EDDCA01 = Dances With Wolves | V | 0x5CB32E9598422D2CCFFB5FC9AD354877 -0xA30B38EC170A88BCD4F0B07954CEAC2B199E308F = DANCES_WITH_WOLVES | V | 0xCA3A9F8F3AE963B774FE4E98FE4E51F6 -0x6066FA2323FCFE5172E8201C5A0A4BAFBC2D9BEB = DANCES_WITH_WOLVES (Dances with Wolves) | V | 0xC2C962FFF725347B46C2B961DA6C62C7 ; MKBv19/BD+/FindVUK 0.96 -0x6EA3CD2DC27351883524ED4632C24784BE6A600A = DANCES_WITH_WOLVES (Dances with Wolves) | V | 0xE1893D6E487B7474648940FF62F82C09 ; MKBv19/BD+/FindVUK 1.02 -0xC97CA28CB33DEF3E1812A5B8150205D43FFF436B = DANGANRONPA_CS_D1 (Danganronpa_D1) | V | 0x4C39130774F4AF84FE75948863C9FFBF ; MKBv57/FindVUK 0.98 -0x1BEBFA925B27043E902AE85A02402C39DD85F6E5 = DANGANRONPA_CS_D2 (Danganronpa_CS_D2) | V | 0xA6D97570658161D02C3A2A21FB615A21 ; MKBv57/FindVUK 0.98 -0x92090DCC4E5FC0072B65776B3E1D780A18F29B84 = DANMACHI DISC 1 | V | 0x92FDF9ED4368AC1F6355D9FA64F780E3 ; MKBv61/FindVUK 1.02 -0x7A05C2F294D10AA87598344C9A56F9CC31E9C35B = DANMACHI DISC 2 | V | 0xCFCAA4919A5348487C29ABB73CE24E61 ; MKBv61/FindVUK 1.02 -0x2D385A284D000FFD17FA51B9153F904AE5B38DB5 = DANMACHI_VOL_1 | V | 0xB8C3185DEF47B93B99B42DEAFF65FD82 ; MKBv57/FindVUK 0.98 -0xF68ABB5020D27E4C0C65AF1AB55B33F64F50DDC6 = DANMACHI_VOL_2 | V | 0x2A926427553B50CFD1DEEF802E4AFF53 ; MKBv60/FindVUK 0.98 -0xBB99A5E1FB4788BC69DF891018AEE6A35218B0EE = DANMACHI_VOL_3 | V | 0x44CF455711948892E90D8B6E7A1B7FCE ; MKBv61/FindVUK 0.98 -0x86B77AEF47AB943A225AC0055E86F1F542EF611B = DANMACHI_VOL_4 | V | 0xA99CA4C9DDF250B801A636F135C98E37 ; MKBv61/FindVUK 0.98 -0xB34EC5585A6664C1CC9C3CBD61FBD8FF26A0F16C = DANSE_AVEC_LES_LOUPS | V | 0xF446D86A19B35F7040229915C18C0195 -0xA5D3D3F8B740E4D7931DEBF5E8B285B2AE4C0019 = DANS_LA_BRUME_ELECTRIQUE | V | 0x885632DD12B2EB368C03971DFB8F7EAF -0xCF1B5117DCC6432601ADBE1C94AAC8815034D951 = Dantes Inferno | V | 0x6358B4681E38C93C39F58B93D6EE53D1 ; mkbv16 -0x5E329AD91F1DA738B15B5BCA4304751A8110CAD7 = DANTES_PEAK | V | 0x09C35973F0E941427DF7B2DD906513B4 -0x0504BD4C203399FEB1CBE2058966B69B96C4C64A = DANTES_PEAK (Dante s Peak) | V | 0xA63D5B377DB21C5DFD6F6630797FB9CE ; MKBv16/FindVUK 0.96 -0xF07DC10435AF68923E5255EEF1F851A0EF300718 = DANTES_PEAK (Dante's Peak) | V | 0x82836F3B27B27B0D6BA88912F365047E ; MKBv16/FindVUK 0.91 -0xA763FA3D409E4EAFF60D5FAB67FE7F12733C3216 = DARA O BRIAIN THIS IS THE SHOW | V | 0xFBA184DE7BE864EC6E6778937A120515 -0xFA8959BB93AC54CF58C307F83CC5F3650C2695B9 = DAREDEVIL SEASON 1 DISC 1 (Daredevil Sea | V | 0x5BF923AF53F4E070D71333F4A66857E3 ; MKBv50/FindVUK 1.00 -0x5689A752A739422266C50F304EDCD33A4054BBB1 = DAREDEVIL_US | V | 0xE4F66FFAD877E586891373C888D9D2A6 -0xC3E8F033A289DA6AE11C55FA471DA3ADF688E3B4 = DARJEELING_LIMITED (The Darjeeling Limit | V | 0x4B415ED0A4F92F731232D122005922C6 ; MKBv18/FindVUK 0.96 -0xDF57811828CCA7D818438F2B2D31074E0CE64983 = Dark Alien (Dark Alien) | V | 0xA73A4BC028F1E67D033E81D0B0060EEA ; MKBv53/FindVUK 1.02 -0x6F3B8C618FCFF780C7FDCED7C954CA22658843A1 = Dark City | V | 0xD99DC1C66DEE35D1A48C6001CFC3CF69 -0x531A0B5342DB620873162007990503926B4BB002 = Dark Energy | V | 0x8DB539143A5E218D70996064CEEB22FE ; MKBv40/FindVUK 0.92 -0x73A3141925884BCFF2303594D843FF1B429B68FE = Dark Shadows | V | 0x201AE5D534A7A02141EA357FCA06D493 ; mkbv27 -0x2DF8D8BA53599C2828BF6D28FA423DB08DDD83E3 = Dark Skies (US) | V | 0x7386FE24CF560CEE4A45BBD0B873CA91 -0x6908F0B91A0E59E88D83DA233789EAFA62060315 = Dark World 2 | V | 0x01DE9E5C7E84DD5011EBA8AAC5169757 ; MKBv49/FindVUK 0.80 -0x0DB1EBAA1F5AB7CBAA347732263D847E3FCF8B39 = DARKER THAN BLACK DISC 1 | V | 0x223BC13E0584C2DA1BE640CF096E83C8 ; MKBv40/FindVUK 0.72 -0xC8856E79B30E351E93166DC86C221DBE467D550B = DARKER THAN BLACK DISC 2 | V | 0x52E351345DCAA5384CD09FC6AAF27409 ; MKBv40/FindVUK 0.72 -0x4B3D90E5151299AD5FC0BE32B8C482ACA457ADB6 = DARKER THAN BLACK DISC 3 | V | 0x13F751546431EAE09A58DB045BE5A427 ; MKBv40/FindVUK 0.72 -0xC09202723FFA3C7784AB58879797848773D66E57 = DARKER_THEN_BLACK_4 | V | 0xC4803D69F59DD8A7FFE679C725824410 -0xE0252BA4CD21CBC45843041D94EDA38E6B5EA3A5 = DARKMAN | V | 0x03D09F12EDF5BDC372641A4B690A1F27 -0x20E9639B552BE0A909935C269906A8A3D8109CFE = DARKMAN TEIL 1 (DARKMAN TEIL 1) | V | 0x681CB6F84709298E6DE47E345FB9B6B8 ; MKBv39/FindVUK 1.02 -0x96DE39DB2D5FB8C7DBA56B2E0BD09A0620FCF532 = DARKWORLD | V | 0x85056ED2E0AF7870D0BC99585B3721D5 ; MKBv28/FindVUK 0.80 -0xE52FEDAB3FFDF893910F4E66EF8A78CA64201DCD = DARK_CITY | V | 0x7B20F719578E05B6573DCF60DDAAA51F -0x649334BB4D0E6D8C92DDA881A303F004B5087863 = DARK_CITY | V | 0x0F5E5C457AAF5E9C433C6AB59CF87101 -0x6DDF773F5F4FC62E5833898A6EA2C5BB61D5C0EA = DARK_CITY | V | 0xAED01B2C84862507CB822F035D6A5CC2 ; MKBv7/FindVUK 0.96 -0x4E1401E4F91BC5DC96455385D829C7EA5D3F6399 = DARK_KNIGHT_RISES | V | 0x7EE614AA7BB0FBD0A4AF683F709E23BE ; 2012-09-27 MKBv27/FindVUK 1.00 -0xA8F64202C0C028461B751EA0336842723DCC975B = DARK_KNIGHT_RISES | V | 0x362F778D9E2E75A1D695C8AFABD5A2F4 ; MKBrev 31 - FindVUK 0.57 -0xBBA78528399022C43D11DED8E1F1A39AE8CA5353 = DARK_KNIGHT_RISES | V | 0x699DC39BD6F985763334FFD5D10BC39F ; MKBrev 31 - FindVUK 0.57 -0xEFC97B04C0F672B689485A8E141F0DEE95C7EE97 = DARK_KNIGHT_RISES (The Dark Knight Rises | V | 0x8CF059990461498D780D9F75B1663937 ; MKBv31/FindVUK 0.90 -0x4F0593852E220577235F8E8750C063FD538F05DC = DARK_KNIGHT_RISES (The Dark Knight Rises | V | 0x87A80436176C8FCC0436CEAA11987F94 ; MKBv31/FindVUK 1.00 -0xD3AE0EC086CE3B5CB69C0BD0BCBBB4C555E7CE79 = DARK_KNIGHT_RISES (The Dark Knight Rises | V | 0x86C269367934A5CF08D8B1C325DBC0CD ; MKBv27/FindVUK 0.98 -0x7272E6704C9256A77925E1AE29C8E55999646107 = DARK_KNIGHT_RISES_BONUS_DISC (The Dark K | V | 0x8AF5EFCE54E0A36BE51AC10D45510210 ; MKBv31/FindVUK 1.00 -0xC3A201C8846CDEF94E46C71F38DCDED5287495F2 = DARK_KNIGHT_RISES_BONUS_DISC (The Dark K | V | 0x1D80FF1D2379632E9C674F36A7EBC37B ; MKBv31/FindVUK 1.00 -0x69BF22B039CD02B9308ED4D323FC25E58F2E2090 = DARK_KNIGHT_RISES_BONUS_DISC (The Dark K | V | 0x09AEB6E6C7D19475A967308349314E24 ; MKBv31/FindVUK 1.00 -0xC96147C9D9FFDA7AAF9315A71018E79AC5A7D834 = DARK_KNIGHT_TRILOGY_BONUS_DISC (The Dark | V | 0xA1449518CEC35DE92BC1E38009F79726 ; MKBv31/FindVUK 1.00 -0x4435EE4EB1642EEA07A4A33D9031DA1B7AAEC38F = DARK_SHADOWS | V | 0x41D3BC2B063B15301972E2E623E0CA51 ; MKBv28/FindVUK 0.81 -0x76E4B6063F15A14021E92CF2273BE0A2F58085B9 = DARK_SHADOWS (Dark Shadows) | V | 0xA9A1F6B288F9240CF8E3B29634CF1418 ; MKBv28/FindVUK 0.96 -0xD41D82245236F3472B12177D0219F46AF38F8357 = DARK_SKIES | V | 0x459187364A433AB8E29BCA87B281F934 ; MKBv47/FindVUK 1.00 -0x9E4D12DDB6F51645EFA8AA84327CAB7AA4697B2F = DARK_WORLD | V | 0x556677ABAE3632FF42DBFBE50F2F3607 -0x177404B9AC5FDB88359D60D3D869E177C51AC992 = DARLINGS_AC_RETAIL (Super 8) | V | 0xE52FFDABF8A771EC89ECDE718C03E995 ; MKBv23/FindVUK 0.96 -0x4434662772A956E6A8D3A1C859EEF2E7776946F8 = DARLINGS_EU (Super 8) | V | 0x1674A32A69CDE567242E5925094506FD ; MKBv20/FindVUK 0.96 -0xEE6430709BC3EB3EDA3B1D87395375E8FF028FE7 = DAS BOOT 1 (Das Boot BD 1) | V | 0xE75FC1945E260CE7CCB9389C193629F6 ; MKBv47/FindVUK 0.99 -0xA998581F17EDC9E1BBAC8D1A526F3C01E796E9A2 = DAS BOOT 2 (Das Boot BD 2) | V | 0x80C61BABB6936445DB7B925BAE181816 ; MKBv47/FindVUK 0.99 -0x91422284CE3ABD8A261516B2770B29D42B83FA60 = DAS CABINET DES DR CALIGARI (DAS CABINET | V | 0xA9E1D53AB9FC0FDF0C9F51F87798104C ; MKBv48/FindVUK 0.91 -0xFB43C85E262E8C185FBDD8B3F9E71B101AE62B1C = DAS FINSTERE TAL | V | 0x1FB83CEBAF2CDF82AEF53A89EE23D3E0 ; MKBv47/BEE/FindVUK 0.80 -0xC051E863D0C13563F0E90AC12992F1386AF87D8E = Das Geheimnis der 14 Geisterreit | V | 0x3E7C465F0B16BE893036FADE476F0E6F ; MKBv57/FindVUK 0.90 -0x53ABFAAB50C95B7A2FFC7F69684FA862560E8170 = DAS GEHEIMNIS MEINES ERFOLGES | V | 0xC071A99652B616D9B2D7532C7DC77E2B ; MKBv44/BEE/VUKNOTVAL!/FindVUK 0.83 -0x0CCAA65275E89C4C255765D1D9FB1BE913C43793 = DAS JERICO PROJEKT (Das Jerico Projekt - | V | 0x284BC9931C5532F768A88C7AD510E7D3 ; MKBv61/FindVUK 1.00 -0xA8BBC98D02E499ACFC42840B5DD2B2C1721AC801 = DAS KONCERT | V | 0x0DCD91CFF4EBBB2A6D2F42EAB16F8D7E -0xB0A910710D740A18DBF471396094D996797BBAD3 = DAS LABYRINTH DER WOERTER (Das Labyrinth | V | 0x19D6813EC97489A7E73BDD08AB8C4D38 ; MKBv23/BEE/FindVUK 1.00 -0x658827C4EE6EA82CBA08FEB89C0165BEA40EC1B5 = DAS LAZARUS PROJEKT | V | 0xAAF6748AEAB666A7498043E61D1E1A30 -0x7CEAF2600E94E895B76FFF836583DE1EFF6D0ECE = DAS PIANO (Das Piano) | V | 0xAE2456943E9283EEBDF1E988E06BDBCA ; MKBv38/FindVUK 1.00 -0xF274E470606259BECED20BD7310A378BE6AF9F9E = DAS SIEBENTE SIEGEL (Das siebente Siegel | V | 0xBEFF3EED397A7D2BAEF97078C256D9A7 ; MKBv40/FindVUK 0.93 -0x25CE9DF67F15D4AE8AC40F44A6560C4A743D1091 = Das Waisenhaus (D) | V | 0xF3B1512D78F6E4BFBABC958D5D2A86D9 -0x21999BE140427BBCE4EE6A8A74A85DA9F9FD7274 = DAS_BOOT (Das Boot - Blu-rayâ„¢) | V | 0x1E26426AFB230A7504515B7AA16B3865 ; MKBv20/FindVUK 1.00 -0x3615FDCCBA2FC35E356C1542DF22A5ADC6A2C21D = DAS_BOOT_BONUS (Das Boot - Blu-rayâ„¢ Bonu | V | 0xD4D8BD07FBA1B2EFD2245836B2338047 ; MKBv20/FindVUK 1.00 -0x9CD6BDEDBB81F728E2DFF9A0F6FBBBCA42FF406F = Das_juengste_Gericht_1 | V | 0x0FE2B7C4D59239E7C2B1AFF71B901959 ; MKBv28/FindVUK 0.80 -0x59B69B3FE5F29F06EA49C9C4A999A98227166280 = Das_juengste_Gericht_2 | V | 0x6F8A96F57DB594140E593518B2EF617E ; MKBv28/FindVUK 0.80 -0xB8A2B8130DEBA7D1F76FA19E87DE05C5B3F98CEF = DAS_WEISSE_BAND | V | 0x9F8266AF9185645FD121DDA0D39D5ABE -0xBCCC56FCF89D120DA3A503A9649275CCBC95631F = DATE NIGHT (UK) | V | 0x1155B097150AF6A34948B0AB5E249541 ; BD+ -0xB618766621FEF3A66EAC0937F1CE84E0B8E00A4D = DATENIGHT_DOM | V | 0xE5452957BFE400553AB810D2A1AC1E25 -0xC8B9B86B3CC00117D471C2325700BC2F512217A9 = DATENIGHT_DOM | V | 0xDF83F3305102BCCD58938861989CA32A -0x5CF3C3937F27CDFA0F984D8A07BD4E26005ACA72 = DATENIGHT_DOM | V | 0x9E6D3813EC9F5CCCF12E8C0A84CCCED3 -0x8FE7D0929F06F12394799F3A31C0184405CA2FEE = DATENIGHT_DOM | V | 0x2F5352C863746640409FDADC96C29A30 -0x75B7B89239E517DDA7CD0858D26AA9B8101ECEAA = DAT_F2 | V | 0x449C3BFC66F97EE7488E9D966A3DB352 ; MKBv4/BD+/FindVUK 1.00 -0x770F0B6E274DF1F09082395A87342EF4D15752A6 = DAT_F6 | V | 0x0BE5D3452E637398AD4844567BBDB546 -0xCE5DB73944BA52E812339B793FD498F89C08DEB2 = DAT_F6 | V | 0x023F1CFEF04FB0BB4470040AA3AB68CF -0x422FC12A21A8A9C375E6ED690A13BC9D3F46A3DB = DAUGHTERSOFDARKNESS | V | 0x0CC0DBE414943DFAE8EDCCBCFF32A122 ; MKBv19/FindVUK 0.68 -0x15345865A640C84F937BEE21BE643C22B9A09662 = Dave_Matthews_and_Tim_Reynolds_Disc_1 | V | 0x51BD9B390C945CD65F8746834F50A568 -0x74FB9E110FE6CE9844E9795E406649F17BE4AF5B = DAVID CRONENBERGS EARLY WORKS (DAVID CRO | V | 0x23AE765AAFDD081AB9C997EEACBFA4BE ; MKBv54/FindVUK 1.02 -0x31E6363F24B51E00DCC49AA5563BFDEA18446754 = David Gilmour: Remember That Night (UK) | V | 0xAC509311A06048FB1F6A7FC70AFF5DCE -0xB0F12DF9C7E6C121100385420FB9E7DA045276DD = David Gilmour: Remember That Night (UK) | V | 0xFFB583DA53F228B98C620E8BAFBE9313 -0x9BE2AEDD969B842A7D3B29A9B18649069DB4E174 = DAWN OF THE DEAD (DAWN OF THE DEAD) | V | 0x2D8DDA90EA804AD77825816A91553271 ; MKBv40/FindVUK 1.00 -0x2013973CD7583C82C365765E4E1BB05A55C6549D = Dawn of the Planet of the Apes | V | 0x05970230D28263B6EBF8FD6E58E6229C ; MKBv39/BD+/BEE/VUKNOTVAL!/FindVUK 0.80 -0x2013973CD7583C82C365765E4E1BB05A55C6549D = Dawn of the Planet of the Apes (Dawn of | V | 0xB16817333D54AD01E20E46084B152CB3 ; MKBv39/BD+/BEE/FindVUK 0.89 -0x831DCF3E81CCFF5E9850F7E530A8EB23ED1C7852 = Dawn of the Planet of the Apes (Dawn of | V | 0xEFD354B3299D4FBEB0CAD0005EEA1E54 ; MKBv47/BD+/BEE/VUKNOTVAL!/FindVUK 0.94 -0xB742D06428D55BBDD9E135AF9C6C0E0A227EEC6A = DAWN_OF_THE_DEAD | V | 0x88486A601415C3D1676A4C65EDB740A8 -0xD7B23E0F57DF288A7FC80B7D1E9BE169FA75F0A8 = DAWN_OF_THE_DEAD | V | 0xB7AA892DD139764718ECA6C1FC5E48F9 -0x79CD7347DE3C14C913A4F6E6ADF3E32690B0CC51 = DAWN_OF_THE_DEAD_G51 (Dawn Of The Dead) | V | 0x4A4A1FFC6E2CE3087AB8DA36434C8B57 ; MKBv17/FindVUK 1.00 -0x44836ADA39E707E37C6142DAD7D413212EE83CE9 = DAWN_OF_THE_DEAD_G51 (Dawn Of The Dead) | V | 0x5C2647542060D6D9EC893D5BA05789C1 ; MKBv17/FindVUK 0.96 -0x8590FA560F84DBC3F9D0346FD807C7EF68EAC169 = Day Watch | V | 0x764A4C8D60AFF56B6298C49CBE00DEC6 -0x5B7D8FED42E529A3B7D97B2F4D4D1E732C517DE6 = DAYBREAKERS | V | 0x930D7E400B1D185D4DF3E6C38A093C66 -0x6B6992AECD2C54FEA4B0B15BBCDBE94FD03147CA = DAYBREAKERS | V | 0x2F861BCD6626221F24D986BC7B64A28E ; MKBv17/FindVUK 0.80 -0x54E9F4209BD23F93418B1F800E1EBB547365E1C3 = DAYBREAKERS | V | 0x367595E9A9BD503FA489576BFEBB5C16 ; MKBv17/FindVUK 0.96 -0x2604C5EFD3168617379A51FFD89E658C71F609E9 = DAYBREAKERS (Daybreakers - Blu-ray???) | V | 0x526751BB5B83018A2F7D78CCAF67D813 ; MKBv17/FindVUK 0.95 -0x63A54A62DAD00C868FDCB8222572F933F1082BC4 = DAYBREAKERS (Daybreakers - Blu-ray™) | V | 0x8446F8181612BAE131139DE3D8318DAA ; MKBv17/FindVUK 0.99 -0xD41185FAAB15DE20173F5399F573DB0A893A37D6 = DAYLIGHT_G51 (Daylight) | V | 0xCFC6B5C3B78B4F932EFE766ED1D8B064 ; MKBv19/FindVUK 0.92 -0xB904E3D663D67360282CCADCA0590206546D76CF = DAYOFTHETRIFFIDS | V | 0x5419E087C3682E249F04A60313FE0BA8 -0xBBD8A8925D455251666E343111EE1AB7426BD2CF = DAYSOFTHUNDER (Days of Thunder) | V | 0x5368985AC6D5ABC7C2F32A44F87B2B7B ; MKBv9/FindVUK 0.98 -0x88A6A8395131DD37A41A14B38868C91098B0FF76 = DAYS_OF_HEAVEN | V | 0x01B67248C2B501EFEC45F17C454C41C1 -0xABB5F81CDCADDE2D047E274263C2AD706D0B7B82 = DAYTHEEARTHSTOODSTILLF1 (The Day the Ear | V | 0x68C06E5CDE20493778A08DEFC7C2C347 ; MKBv10/BD+/FindVUK 0.94 -0x7860E7C60A0D9A90D30D08E8D33A89474AFCB9B8 = DAYTHEEARTHSTOODSTILLF1 (The Day the Ear | V | 0x1C36690696970D0B3674FBC0761D51A3 ; MKBv10/BD+/FindVUK 1.00 -0x2C412CC0818C7D3C4DE9491CFF2C1201A2CB57E1 = DAY_EARTH_STOOD_F2 (The Day the Earth St | V | 0x144E1C606B758845CA30ABF73D6863BC ; MKBv12/BD+/FindVUK 0.91 -0xA5EF0EAC1D9DE7581668978685D423874AB5B2F0 = DAY_EARTH_STOOD_F6 | V | 0x461D3C87D1452E69B840D5EA594CFA83 -0xCC146C21A4B5E30C5879D074072D98693B8B7173 = DAY_OF_THE_DEAD | V | 0xB8F994E94064FC1CFC66EEF1CD0105D4 -0xD11A3D14065EA6F56016C4D9D47308F882EB5F72 = DAY_OF_THE_DEAD (DAY OF THE DEAD) | V | 0x3A97C9759FFD4B441AC9D5CB5F27B452 ; MKBv43/FindVUK 1.00 -0x13D7935DE9BC9ACD15E8D358D1FBE03E4A2D90A7 = DAY_OF_THE_TRIFFIDS | V | 0x87636659A55C26F2D9720BF84A9D5E82 -0x73886D08811073F45AD8C75012689097E17EBD3C = DAY_WATCH_F6 | V | 0xB6091B1BB8A528373125FEF912739DA5 ; MKBv7/BD+/FindVUK 1.00 -0x1CE4D38AF7682FB4D4BD88A9BA101312692E6347 = DA_VINCIS_DEMONS_S3_D1 (Da Vinci s Demon | V | 0x3251193BAC1494C6357BACB8A8A4F035 ; MKBv55/FindVUK 0.96 -0x93ED2DE302F5B0FFC0B0F46C348634B3AF85C6E2 = DA_VINCIS_DEMONS_S3_D2 (Da Vinci s Demon | V | 0xD45E1A57C5A87F3014A6B13E485E2183 ; MKBv55/FindVUK 0.96 -0x4B04CCF02377058DF07DCFF4571DD1543F834DBA = DA_VINCIS_DEMONS_S3_D3 (Da Vinci s Demon | V | 0x595E5B5BA62A0A04D485B615964305CD ; MKBv55/FindVUK 0.96 -0xA3CC883057ED01F3D558946BF01270799588F510 = DA_VINCI_CODE | V | 0xE50ADFAE10C3E8635B6242ACEB383B52 -0xC014F53ED0335A857C3B1C44E21F4E2EAB0E17A9 = DA_VINCI_CODE | V | 0xDCF14C9318BE18EB2EA69A653BBE3664 -0x892E738E70149AB0E6884CEED303957A70214255 = DA_VINCI_CODE | V | 0x1260F8385A947F3D34445C3D591C5627 -0x37599A00361B5C3979CBB7C6C9E067097C58B081 = DA_VINCI_CODE (Da Vinci Code, The - Blu- | V | 0x21C1360E96BD41FD07322852ECD10F8C ; MKBv12/FindVUK 0.96 -0x9003E645A003C63942A41CAD04061847B3167B7F = DA_VINCI_CODE (Da Vinci Code, The - Blu- | V | 0x9B587DCAB92314F83E5574D084C32598 ; MKBv12/FindVUK 0.98 -0xCEDBA605276B315F89BA16D027842E87C1F5D68E = DA_VINCI_CODE_BONUS (Da Vinci Code, The | V | 0x06EC54E4E516053F12236B5BA31FDBCA ; MKBv12/FindVUK 0.96 -0x5E0358C6E5B8BE9E55DB499FA3111845835CF9E1 = DBZ KAI P3 D1 (DBZ Kai P4 D2) | V | 0x96DC68808E168025AEE08099DD81E418 ; MKBv52/FindVUK 0.84 -0x69EAFFF1DCED27B68B39DE6C20BA5FD1529AC6BE = DBZ KAI P3 D2 (DBZ Kai P3 D2) | V | 0xBEEED36283C7C33C618B6A75F42075E9 ; MKBv52/FindVUK 0.84 -0xA4F742449041DBD88009C8A83DA0E4B162456DFA = DBZ KAI P4 D1 (DBZ Kai P4 D1) | V | 0x587913C89D4D3AF22B34358CB4D09C4D ; MKBv52/FindVUK 0.84 -0xDD6906174244385FD9A5F5318A4F48228449DF12 = DBZ KAI P4 D2 (DBZ Kai P4 D2) | V | 0x2AB4307CD6CBD0FC4BD69BC5B8653EA9 ; MKBv52/FindVUK 0.84 -0xF6F058C4CB8F060586E45DB90F88E96D3A95FE85 = DCU_DARK_NIGHT_PART2 (Batman: The Dark K | V | 0x1ACFEE473571CA9E7FE67384CD68EF33 ; MKBv31/FindVUK 0.98 -0x27B7C7BD6361AE76F669E0C43A81C1FECF4C5670 = DCU_DARK_NIGHT_PART2 (Batman: The Dark K | V | 0x030CF784CCAD713202B170F2FB2BCEC5 ; MKBv31/FindVUK 0.92 -0xA74B8706FC1325F95EC28E3C46AB3073B2C10300 = DCU_DARK_NIGHT_PART2 (Batman: The Dark K | V | 0x67244A72F01E10C2B0C2D87EB233F727 ; MKBv31/FindVUK 0.92 -0x0BF914766C3AEA4E7EB02DCB7455E4801D5336A4 = DCU_DARK_NIGHT_PART2 (Batman: The Dark K | V | 0xB57A918071F3161E4FB65B6B8545CE37 ; MKBv31/FindVUK 0.91 -0x71C8669E9598089CBAE37C340CB64E058DA6E360 = DDLJ | V | 0xBFF5F2BB963B3D3F0E3D0B789D79C1D1 -0xD2BECDDD763B5B9B911C0339C7A19D35A5FFC8A9 = DEAD END DRIVE IN (DEAD-END DRIVE-IN) | V | 0x6EBF50E74EAC907C083F283B4F387225 ; MKBv61/FindVUK 0.98 -0x07336D46B9794FCEC7F527462556B996DDE8AC98 = DEAD RISING: ENDGAME (DEAD RISING: ENDGA | V | 0x81D3F7E89B16E51A7567F2136B10ED43 ; MKBv62/FindVUK 1.02 -0xECAFCF2468A6BE274E5362B518A652E5BF712D50 = Dead Snow (Neige Mortelle) | V | 0x5143F3BC2501FD616C1E0D8FB1D33D60 -0x990382C0FFDCCB61961B70AAE54B893DC5DEAC81 = DEAD SNOW 2 (Dead Snow - Red vs. Dead - | V | 0x93F6C898FE6D62549F12170E665D4BE2 ; MKBv32/FindVUK 0.96 -0xFED838BDDB045B6EE68FD9A778435056290E62CC = DEADMAN DISC 1 | V | 0xBB40F84C2B2CFE0F87A3F1D0A099C2C5 ; MKBv52/FindVUK 0.96 -0x0E09505060A7CFCA9B2F495BD2CD9F9C8778628F = DEADMAN DISC 2 | V | 0xF432380E66295FA721506CB55350DFD0 ; MKBv52/FindVUK 0.96 -0x2FA0687FE00D1276401BF76AD88077DBDE614937 = Deadpool (Deadpool) | V | 0xDC263D7E04A7E24A5BD7E5B697336950 ; MKBv46/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0x01B6F2CF212496EF6F7A329D4224D6A2A6C748F3 = Deadpool (Deadpool) | V | 0xC1BC0968D86ECF0F401224699BD2189F ; MKBv46/BD+/BEE/FindVUK 0.96 -0x4D92EFDFFD3DBD8EDCE989C0B464939F43F805B6 = Deadpool (Deadpool) | V | 0xE957A13897B2EF89F419A48D57CFB138 ; MKBv46/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0x7C6BA7769B9FFCB4583F703B14C5072D85BD9E94 = Deadpool (Deadpool) | V | 0x09C5FED00EAD8563B6E93D70654E5708 ; MKBv56/BD+/BEE/FindVUK 0.96 -0x629AB9778117554074D742DEF61652692BA7386B = Deadpool (Deadpool) | V | 0x58C0942ACCC1C2BCF3C06B454A772D3C ; MKBv46/BD+/BEE/VUKNOTVAL!/FindVUK 0.99 -0xCFC68F3D31093942BE12908CED8C02C4494F1C5E = Deadpool (Deadpool) | V | 0xA4944CD349ABF30495041421CF5E0D9E ; MKBv46/BD+/BEE/VUKNOTVAL!/FindVUK 0.99 -0x0CC386110E9285343277C5F59742838B9858A29D = Deadpool (Deadpool) | V | 0x4A9E12BB24293EEE3B2D35AB6476F3F5 ; MKBv46/BD+/BEE/FindVUK 1.02 -0xC97DC010E424E1141444987A4785F72E835931DC = Deadpool (Deadpool) | V | 0xE707E364C413BE0A7F3F6E68D34FE722 ; MKBv56/BD+/BEE/FindVUK 1.00 -0xC02969BC6A8D6DE9AF7A7D74BE26622D739FAE55 = Deadpool (Deadpool) | V | 0xC74E2AFB235F4432D29626C8E8882D59 ; MKBv56/BD+/BEE/FindVUK 1.00 -0x3FEC46640BD62F1153F17061B9AB8C95BEE53D7A = Deadwood Bonus Disc | V | 0x2255CC409DD23551AB38B4354E3F6476 ; MKB 19 2010-09-10 KRJ -0x40FD313656F360560CB8B65B7C1E9339810589D1 = Deadwood Season 1 Disc 1 | V | 0x055C983CD0E9B5175DAA924C2D92518A ; MKB 21 2010-06-11 KRJ -0x7B442D477CD578990292E443FA90C00ECD9E8BE8 = Deadwood Season 1 Disc 2 | V | 0x8F85BE97FEFD77536249D482F73D5F67 ; MKB 21 2010-07-14 KRJ -0x1220421CE0A9CB33715B0A4A580F31F3C3DB2346 = Deadwood Season 1 Disc 3 | V | 0xEE2E52CF857FBCE42BBEB509AC1672DD ; MKB 21 2010-07-14 KRJ -0xB1CB0442868B40F5A427FD1CA0E3D56F4A9E70D7 = Deadwood Season 1 Disc 4 | V | 0xE166BF3338838990FB1E2E235E67DDF7 ; MKB 21 2010-07-19 KRJ -0xAF9FDDA576D777B45E411F7D165797D1DFB0B6A9 = Deadwood Season 2 Disc 1 | V | 0x3CF48DA40F2FE776DF1B007FD378BAEA ; MKB 21 2010-07-22 KRJ -0x0CDB3AAA69829FE7FED3C92DBD33A435C588FE95 = Deadwood Season 2 Disc 2 | V | 0x25FD35A4E4DA71B0101D573B976D66C3 ; MKB 21 2010-07-23 KRJ -0x02B8359FE6866E81F993524D77EF7BEDF086C158 = Deadwood Season 2 Disc 3 | V | 0x93EBC089A6845910B13605A52DCB3737 ; MKB 21 2010-07-26 KRJ -0x29D4D25AB8A8EE1F4B030B41861E98523F999892 = Deadwood Season 2 Disc 4 | V | 0xFB1079D9491F35F4C1E274959D2C3908 ; MKB 21 2010-08-03 KRJ -0x38F9D8870822B6A5A03324D83F784B01F086E0A1 = Deadwood Season 3 Disc 1 | V | 0xDFEC97221FB6675082780F2B06C7C33B ; MKB 21 2010-07-29 KRJ -0x86C5D5BF339E60C83DA0A0D76EF505272A0DFC6D = Deadwood Season 3 Disc 2 | V | 0x01CF02B0921E52C4CE38D9811B8C2475 ; MKB 21 2010-07-29 KRJ -0x824AD886CFD83D4F176A8A457BB5CBB603B0B4AF = Deadwood Season 3 Disc 3 | V | 0xC95F2737266796A35ECEC9211AE661CE ; MKB 21 2010-08-02 KRJ -0x699B0305271F3A2A99D58F2BAD936C8F8954B24E = Deadwood Season 3 Disc 4 | V | 0xC704EF90DA562FAABC875CFF163141FE ; MKB 21 2010-08-23 KRJ -0x11125D44D8C2F2207048C0A126BD6FE27242DC32 = DEAD_CALM | V | 0xC91CD36905EC4C77C192712781C17A0F -0x738C0E6E02E77E881767828EEF1B2247EA62D44E = DEAD_CALM | V | 0x780D14E0FB9F26845639254C49D813E4 -0x8AE2F9B6050E06759E3AF73054488C99D4AE6BBE = DEAD_MAN_WALKING_BD (Dead Man Walking) | V | 0x13319B9AA68A08EE9701129B39A00225 ; MKBv21/BEE/FindVUK 1.00 -0xBA3A2647E37587615082484B7D6A5CDF410CACA6 = DEAD_OR_ALIVE | V | 0xB06F8110CCC28D0BC327F370B6F2575F -0x23CE0DECC4A332F8709F159DFCC499323F2E8C0F = DEAD_SNOW_SE (Dead Snow SE - Blu-ray???) | V | 0x2552BB1DA70D9A780ABAD0727C10367E ; MKBv30/FindVUK 0.96 -0x57140CBF834D2EA5E6B08E1E5910403DC1CA6E8C = DEAD_SPACE_DOWNFALL | V | 0x056EC3C07BA1EA3ABC3D23B5E77F181B -0x02F69C791F23B69E49FE4937A78020444A096151 = DEAR WHITE PEOPLE (Dear White People - B | V | 0x91460ABFEACD2601F9BC2F96E444127A ; MKBv50/FindVUK 0.96 -0x3BA7E6C821C859DEF027EEBC92CE94A796A6FA08 = DEAR_JOHN | V | 0x313FE249B30D31900DBB9ADD88A543FB -0x036E415C271BD7EE68AA90302317AF76AA5CD36A = DEAR_JOHN | V | 0xF0D2F5B0969F6A763E6F4B15BF8D1014 -0x2879E625697A6CA2CACEA01EACC214FEEF41301B = DEATH NOTE 1 | V | 0x9D0DFA8CEEA97E7F038C8C76C3E14214 -0x83ED803570F3B1491AD2F27F4C8CB2793C287751 = DEATH NOTE 2 | V | 0xB64AD8FB1F729BCD4C937CF6E4B7513D -0x3D22633E0D3A7A50D10E491A1391DFF17C3AD641 = DEATH NOTE EP 01 _08 (Death Note 01 - 08 | V | 0x855E26A2651C87CB82560CFC158ECBD2 ; MKBv57/FindVUK 1.00 -0x61039028F44B50C6B50C00EC3C19559F58681859 = DEATH NOTE EP 09 _16 (Death Note 09 - 16 | V | 0x814E3076A973F8748A89F10192EC81B4 ; MKBv57/FindVUK 1.00 -0x718D7D230957C5F2E814773FACDE7429D566EFC8 = DEATH NOTE EP 17 _23 (Death Note 17 - 23 | V | 0xC1E1EC3B75DECDC8B742630A2FE1D45C ; MKBv57/FindVUK 1.00 -0x2D987A03074B5F6A0A8F6E579051A3693917BC5A = DEATH NOTE EP 24 _30 (Death Note 24 - 30 | V | 0xD4B68F1A68E0218E2A317D98EDC6EDF5 ; MKBv57/FindVUK 1.00 -0x9626C49C1AADC31ED43BFEF43C2F9CDF26C61B2F = DEATH NOTE EP 31 _37 (Death Note 31 - 37 | V | 0x85A22D602CB21FE82DDB31CFEB98337B ; MKBv57/FindVUK 1.00 -0xBF80209F39559A162EBC122979EF192217171A5A = DEATH NOTE MOVIES (Death Note Movies 1 - | V | 0x4D80A41B90E430E9BDF85A6326E73E51 ; MKBv57/FindVUK 1.02 -0xAB0E84C37715119AB4D6523271F3CF0E85CFE3AE = Death Proof | V | 0xCA776A37C334911EE3C092506681DADF -0xD2C4229F5D706A11AB3D3E0B30F2D7A33DB346B3 = Death Proof | V | 0xDE84DA34D6D73959381BFA2767D8AE22 ; MKBrev 25 - FindVUK 0.57 -0x86ED4E94D1D9BD653EEAE943E977D8A171C8731F = Death Race | V | 0x769EE0213161A124265F4F21C519E3DA -0x558AA640E4E9EBAC36A7D4F14EB77DC56287C25E = Death race | V | 0x9F6875CBEF110FADC2C5492FAA3BA474 -0x8E07603B24363CDB96957CBB300B78D43CFC5C71 = Death Race | V | 0xF8F84F02B44ACDE1A4722D4A1F2E1608 -0xE7AB87AF1FC2E92DC2A80DA1F9FD5C10AC7E0254 = DEATH SENTENCE | V | 0x9A4B5FC88391A895A9656B937F3DF4D1 -0xBE5DE698C3119626F32E7FBC05FA3F783C7FE4C7 = DEATH SENTENCE | V | 0x8FC76D555497865F7A9E210AA61B8FF0 ; MKBv4/FindVUK 0.98 -0x58084AA8CA608CFD7389B3A902B989655495CE88 = DEATH_NOTE_2 | V | 0xE30D7DF2264D562EB92695E9CE642D37 ; MKBv19/BEE/VUKNOTVAL!/FindVUK 1.02 -0x28E98E084CE3C052148EB46940A98750F7B5DD9B = DEATH_PROOF | V | 0x7BD930E60F9612A58ADE7AE6DB49BB55 -0x41E10AF74019255355E7EEE305E54A6390CA0EB1 = DEATH_PROOF | V | 0xD0AA95DBABBDED4964880846B0BA4A07 -0x4EBD458972E98B4FDC7F1AF5744E6CFD93BF8798 = DEATH_PROOF_BD | V | 0x40AF00226A0EA26748945D40B6353C84 -0xDFFEC3050E8E1ACC32136D1588A2CBDB484BFC17 = DEATH_PROOF_BD | V | 0x2C1C83AD800DCBC8F4A30A8825F1654E ; MKBv9/FindVUK 0.96 -0x8F482FA1CD4D488F87BBFF980CF4B77CEED1B7DC = DEATH_RACE | V | 0x5B88D731E05C2D572F8D851F9A19D998 -0xCCC458552DFF704109439B5F5918A78E85F68C07 = DEATH_RACE | V | 0x793C50CE218CD679EB55CD9DD00AC04C -0xC69B9C5335BFC4F31CC5064266C235BABA13315B = DEATH_RACE | V | 0x825C37B9C4D56992DEBA22C084E2DB4E -0xD032598E814D686B620AD7C49C48D6D54F0DF589 = DEATH_RACE_2 (Death Race 2) | V | 0xF325CDEC5D9E9E02D732116815AD21E8 ; MKBv19/FindVUK 1.02 -0xB79C7B0A79995D1CB8D9198EBB4CDBF83AD76127 = DEATH_RACE_3_G51 (Death Race 3: Inferno) | V | 0xDB412DD21DD9B128146EC42C4A51417E ; MKBv27/FindVUK 1.02 -0xA5DB9270A4C19C4604B6537D234617DB1F451C2B = DEATH_RACE_G51 | V | 0xA0A71A081A26E4F12CD5E172B4272174 ; mkb v10 -0xAD805FFCD5C53E3941333AB680ABACD3DFCF9403 = DEATH_RACE_G51 (Death Race) | V | 0x12F70DCE5329B9DBBE50CCD1A3C6AC8B ; MKBv10/FindVUK 1.02 -0x8F9E8AC6C760991C77A9A045131852FECCEF1046 = DEATH_RACE_G52 | V | 0xFAD7BEEF5B7B71023E831CAEDDBCFAAB -0xD3824DB3DC6B90DCA92B41342D0865E5028D3FE9 = DEATH_SENTENCE | V | 0x2AA160E0D114DCEDF25F36801B55F811 ; MKBv7/FindVUK 0.96 -0x1835457FACF2F9E4977F8FE22A9205038349F5C2 = DEATH_SPA (Death Spa) | V | 0x6A5FECC8C7C9F807BD8CA05E566AF479 ; MKBv46/FindVUK 0.83 -0xACC6BEA3518965319F4C74E27C5021520F162F11 = DEATH_WARRANT_BD (Death Warrant) | V | 0xCA3DF80A8E19B10FE25A57BAB8BEB486 ; MKBv31/FindVUK 0.92 -0xB7451E364F2359BC42297781E4E65AEC484D3660 = debbie does | V | 0x00D435ABF87FA1CE1FFCBFA92720A64F -0x5C1ACD9785F12A46AA5D407A2E47C33EB0852C27 = Debbie Loves | V | 0x603C95FDFAEFAFE3904AD5D818391F12 -0xEE5D912A1FD0C4AA3E5F2A969DCDE6A5190945D7 = DEBUG (DEBUG) | V | 0x739A0D878A0EDACAF0CFBB7FE0DC30BD ; MKBv48/FindVUK 1.00 -0xA0FA4A13A784E658E3C5401E37FED1090F80AB9F = DECAMERON_PIE | V | 0x14F8E14464B523316C0A9A446CC958EC -0x3DEB6566BF1C418886F6529DA06408569BBD8CC1 = DECCA AIDA | V | 0x8A4C618F4E5EB1EA131139CC292086B7 -0x3D529EE94EEDFE77610367914FD3ED14662EA36A = DECCA CARMEN | V | 0x3F7F8C41797FABDB05729FD951EEAA54 -0xF38722D3AA2E7B9C02B714C6AE2597DF1E8BBBC6 = DECCA DER ROSENKAVALIER | V | 0x092F64BA0D787E2294E747B182374017 -0x54B3F34630CD1A8475BB61ECF00D012BCFCE475C = DECCA EUGEN ONEGIN | V | 0x7C97159595ACC3470235DA977E4901A1 -0xD073AB96A3AB34169038CC3484546C2758139485 = DECCA LA TRAVIATA | V | 0xAD77DE39E5640FB98C34BD4090122E18 -0xF703DB8AC9A11102F69116DEE1E9D9E4F4DEF7DF = DECCA NUTCRACKER | V | 0x714D6602E9A965ACC186AF7DF66A8D24 -0xA7DBA153FD43F3AFC57B8C8B9439AB84CF37F8D9 = DECCA NUTCRACKER | V | 0x9CC73C52A1F6C3C7538CD29347746C27 -0x33A1B5929FF4F0145FE92399CFFB4F692940AD00 = DECCA PAVAROTTI | V | 0x2E4F69880ECBF12127D02F0736E0F2BC -0x62695821E6FDA27680F030C61BFE740586462694 = DECCA ROMEO AND JULIET | V | 0xB68E4C197D22EA3EC45148C42EF5F2FA -0x0A0D56F8E45B52182E88588FDEC3813CCBDA2B57 = DECCA SEMELE | V | 0xE700206072828CFC843AFB4B02FDB461 -0xA1B7750794B91FDF9491F76EBCD5AB2BFAA058E1 = DECCA SWAN LAKE | V | 0x6758752EB9F5C042437711B9F5CBBCEF -0x5537CE78D0BCE48E472DE92C8085F55BF7C8DA16 = DECEPTION | V | 0xAAB6B2C46284A705779AD525D46A69F0 -0x052B43768775ACE58A20A3C6BD2C7DCC847C1AEE = DECEPTION | V | 0xCC80E6B680DB1DB54493B5C5800C7786 -0x5DA0766C25DD443A28C512E0A5E98C433B38C6AC = Deep Impact | V | 0xD3455747D16E4ACDA5EFCDE6A492C7F0 -0xF894781B85A2276B2C01EE438BBACA8805D1F2D6 = DEEP RED (DEEP RED) | V | 0xF45E5E4812A51EEDA37B1608B1B19DEA ; MKBv57/FindVUK 0.91 -0x5E35515E4888AF58CA0CFD75030E0EC2B7D392C2 = DEEP RED EXPORT VERSION (DEEP RED - EXPO | V | 0x991A60BEA92FD39E2822F0A3305867F5 ; MKBv57/FindVUK 0.91 -0x066A9DFC0DC8F43B3AF02E4A0825312B53651CDF = DEEPIMPACT_AC | V | 0xAD8E75220E601AAE921B8C6AB63CAE53 -0x173EC598F41CC7B5A66DAAA99E2418DC0E671F99 = DEEPIMPACT_AC | V | 0xB868E76708033BEDFF37C37A96B21064 -0xB440FC7B2E8AB8482032F73B1BC04A40C3583B7D = DEEPWATER_HORIZON (Deepwater Horizon) | V | 0x38DF7D5E9C050D1C5C357A0135C88783 ; MKBv62/FindVUK 1.02 -0x71773B7550D78ED1CDE6B653E2674922F809C107 = DEEP_BLUE_BDROM | V | 0xF1783F08BD10162C9FB795DAEDE114FD -0xA820825B5DCCEB760F34629F78B9A0F553D1B0CD = DEEP_PURPLE_MONTREUX | V | 0x76275A6394FB2066A0FC13248A138A9D -0x93C8E01AB0E0898E02E6841F042C761F800E7B31 = DEEP_PURPLE_MONTREUX | V | 0x5E55CD3717A7502B2B78E350037A6640 -0x9CA7399041CAC8163ABE9647906FDC85C5D03B71 = DEEP_SEA_INTO_DEEP_BD01 | V | 0xE59EE999F59754B3874FB8F39CD91E5A -0xFA3847C926ACC1D4653D0B791B3A21D5BF27BE2F = DEEP_SEA_INTO_DEEP_BD01 | V | 0x1CD642CE5588ACA5E9A60BD6CD9CE97B -0x2D04E407D2E665F370A2825F180FC01EF4942923 = DEER_HUNTER_ED2009 (THE DEER HUNTER) | V | 0x906B3D75B2937DAE43FEDE03DA9C6B9A ; MKBv12/FindVUK 1.02 -0xFF3419828893F780DB5EA039BBC1A39FC618DB05 = DEFENDOR | V | 0x01463B7FACE35746BE49E35D5F2FE3D2 -0x90CBB22CFB7CD59ED66DCAD5B122DCB55685F549 = DEFIANCE | V | 0xD46CE702BD6045542994394B2BD07AD3 -0x733F9A31E652667550EA98E33CDEEDF4C9D30203 = DEFIANCE | V | 0xE81F9E83962C65800FD7B25472DFAD27 -0x5BE5C0F8B1902A4058D47E7A1D199947C4D9D7BA = DEFIANCE | V | 0xF0FC617CB562D277CE9B521629F14754 -0x75288C67745B5B10C1029374F006FD02420DD877 = DEFIANCE | V | 0x0AFC02A1A5DE1838F7F8482921C942F4 -0x03026A2AFF7C0EDC86E2A52D363FE0276D846DB1 = DEFIANCE_S03_BD1 | V | 0xB9E2B339BE99D264A7144F9DCEAF5745 ; MKBv56/FindVUK 0.80 -0x37ED69665007D21CD6863B615CB39A9E461D5C1A = DEFIANCE_S03_BD1 (DEFIANCE S03 BD1) | V | 0xAA13DDE01733014402AA53551579E548 ; MKBv56/FindVUK 0.96 -0xD9464F60DE211582B5568D6A55AED8C9EF54B322 = DEFIANCE_S03_BD2 | V | 0x8F7EE04154068F42D71D8005DA6FD492 ; MKBv57/FindVUK 0.80 -0x3EB71AA0ACE49F715294D6230A50F2EA09F9766F = DEFIANCE_S03_BD2 (DEFIANCE S03 BD2) | V | 0x01151DC9BB4F41F86B826B40044DAF7A ; MKBv57/FindVUK 0.96 -0xE942DD31E17BD0AD0B3C18A963075E1781004B90 = DEFIANCE_S03_BD3 | V | 0x21056BA27B1E301FA4ACD23721A52027 ; MKBv56/FindVUK 0.80 -0x19E69928905A14656C989052CC505FC8D2E56EAE = DEFIANCE_S03_BD3 (DEFIANCE S03 BD3) | V | 0xDCEB675F28EDB763BC18BA4FE9503FF4 ; MKBv56/FindVUK 0.96 -0x2F3639852B04711B45811BD2ABE93AF12C738B35 = DEFIANCE_S1_BD1 | V | 0x451F48A0DE275E0A1A53851AFB03B5C8 ; MKBv39/FindVUK 0.80 -0xD30458DE60C97B7131A5D23FDC54CA97B22D2FE1 = DEFIANCE_S1_BD2 | V | 0xF2BE19E098C21176039689470C70FE80 ; MKBv39/FindVUK 0.80 -0x7FE4F72D9509AD3C166B3620B26B96F39D438151 = DEFIANCE_S1_BD3 | V | 0xBCB6C7306A43AED064438D6CF7185A48 ; MKBv39/FindVUK 0.80 -0xFD2079FD8F6C0A189A11651A0F83A1341420C5CB = DEFIANCE_S1_BD4 | V | 0xACE792371D8E31A8281176EC5433DA9E ; MKBv43/FindVUK 0.80 -0xC54CE63249FD93C2C64A844D39726646616D3B9F = DEFIANCE_S2_D1_G51 | V | 0xF91EA2010E3DAE7D840964CC42AC6888 ; MKBv47/FindVUK 0.80 -0x14EEA16AF2E3100E0CBC0EDDCFC1DFA92835CAB4 = DEFIANCE_S2_D2_G51 | V | 0xD200840A61346B2C24D5709BD30A2874 ; MKBv47/FindVUK 0.80 -0x94B464EF2DA4F5C7C62F7CEC80DDCA97C126954E = DEFIANCE_S2_D3_G51 | V | 0x1E7EB1C3A7AAEFFFD4B4B3F8B3CF6BF2 ; MKBv47/FindVUK 0.80 -0xD04A46FB542633250DE4BA8FF3FDCFFB8689BC6C = DEIN_WEG | V | 0x58BE19DF77F0094F7EC52C50D73AF6F4 ; MKBv35/FindVUK 0.92 -0xDFA5DAE43229CF69CB83D295D271EE0C01FCAD3C = DejaVu | V | 0xF09966F4A6A0E99F2440368FB95CD74B -0xD5DEB7FE5B995AA67534099107CA20471AA5F8CF = Dejavu | V | 0x971B653B443FA038A3F2A617131985A3 -0x26BB64D296D487A8C7E70D2039195B4825EA45BB = DEJA_VU_DEU | V | 0x83622D09A7304BF8EC40DBAF1E5C83CC -0xC7F2160F13910A2B1EB93EACA02ECE7B86DFC14F = DEJA_VU_JPN | V | 0x9D964D4B3D9D0207CE0CEC40180413F6 -0xA419FCF73F1BF14A0ABD9E579DFA10392123E3BE = DEKALOG_D1 (DEKALOG - DISC 01) | V | 0xC58F6CF0E138F63C6747E1DBC4CDD4A5 ; MKBv61/FindVUK 0.99 -0xC13E0213E9E3F15AA1BA2B07D6708A3A361E181B = DEKALOG_D2 (DEKALOG - DISC 02) | V | 0x2A7290CE902D14D533E905B970EB8D59 ; MKBv61/FindVUK 0.99 -0xDD26DFA4F9E570AAA63DB7CCDF90DE8ED445B238 = DEKALOG_D3 (DEKALOG - DISC 03) | V | 0xA359D0ADD7A85B0DCE4F1B7CADC8E03D ; MKBv61/FindVUK 0.99 -0x5663888A31FF2E2A901A9A3DF2705537A076EB8D = DEKALOG_D4 (DEKALOG - DISC 04) | V | 0xC1DFD08A5A49BA2EEDD2B55D7D70D1D7 ; MKBv61/FindVUK 0.99 -0xE95C8CF73C6B22D10F4F8B48655311314C9D82B6 = DELICATESSEN | V | 0xAF7387E99E6BF60CA50E911DA90C35A9 ; MKBv17/FindVUK 0.80 -0xBED3FADC8FB0F0CC751124157575A574BFC07E79 = Delirious | V | 0x6D5C0FEE403EBEE0EDDE4A6B7363F6B8 -0x77758491FD762C19E24401CD20996FB6516E747E = Deliver Us from Evil (Deliver Us from Ev | V | 0x025D3BB21C19B0AA06119658979620F4 ; MKBv49/FindVUK 1.00 -0x54D4D71549310F5E556E206AD794D67FE4C881BF = DELIVERANCE | V | 0x8F352CDDBB41CD58819D2B971BE7AEDF -0x6CF88976C2873B204A8EDA92AD04B9FF97928D35 = DELIVERANCE (Deliverance) | V | 0xCFD3F8A529735EBB073E1086717A4FFF ; MKBv28/FindVUK 1.02 -0x73F9B22CA80717822E4782C191B8371C1E7750A0 = DELTA_FORCE_BD (The Delta Force) | V | 0xD77672E39341E17A9C7E169249042523 ; MKBv31/FindVUK 0.92 -0xA55895D26D659058055362FBEF1F7FE20E112ECA = DELUXE TV BLURAY | V | 0xA439E3C1B491942340ED9564783D5280 -0xFCA2E5A6416377E8C91189672A25EA5F1E467B57 = DEMAIN (BLU-RAY) | V | 0x8A070B96456E7E804AF1A2C8D1830D1F ; MKBv60/FindVUK 0.96 -0x706D99D1BBEEB7E10F8FC3372DB64AC294076963 = DEMINEURS | V | 0xEE291BC76DC64567517E65050CC80B61 ; MKBv14/FindVUK 0.65 -0x1A904007D0049591446DC14B73D57D5756F2B4B5 = DEMINEURS HD | V | 0x062293B24D0AF0D40ADF34B72A563B7C -0x10A3A67C5DD77D55296CD5EF4B9CC7968C1E94EF = DEMO | V | 0x165640BF859B78D74529A828583FD1D1 -0x30EC98ADEA2D22287C647C8FF975FC8BA8B9333C = Demolition Man | V | 0xB7458D442A222E98285C843223E325ED ; mkbv19 -0x56B1DD13E6C2B24675E04508289048497EA1B98E = DEMOLITION_MAN | V | 0x07464F940C285C16CDF410EDD53CDED0 ; MKBv19/FindVUK 0.80 -0x47373CE1E7504AD5A1CCBC5595A680613D4AF165 = DEMOLITION_MAN (Demolition Man) | V | 0xECE081C8204E0AF9693BB3D5C25D1C9C ; MKBv19/FindVUK 1.02 -0x4C53DE68C9A12B66915DDF962ABAB6D65BF8910A = DEMON KING 1 | V | 0x4A9BEDC2A99C77215A803C1CB84DF10F ; MKBv21/FindVUK 0.96 -0xAFD2676EA2F320D92A818ADDF3F28115B58C3AB5 = DEMON KING 2 | V | 0xDDE60A0C53721B90D95F42AE33B04950 ; MKBv21/FindVUK 0.96 -0x389D1904D93BBDBAF0A3AF3F56EF2B3F5E6DB5FF = DEMON KING 2 | V | 0x23294A250FEA9522925ED7FB6EE506C3 ; MKBv21/aacskeys 0.4.0e -0x9F29807B87F14449FB80512CF11C5728D1994D0A = DENIAL_NA (Denial) | V | 0xD263093A3719343A86CF37087B2487C0 ; MKBv58/FindVUK 1.00 -0xC002DCF3DFD9870A7771B6456196E73225A6EBA4 = DEPARTED | V | 0xE264491E2E12204E9A8F3C38EB147124 ; MKBv40/FindVUK 0.96 -0x733E01782979EAB4CCC5E1FEB9584C2CBFB311C5 = DEPARTURES (DEPARTURES) | V | 0xBF6064E83CC625A07D56A82FF64BD094 ; MKBv16/FindVUK 0.98 -0x92560063646B565416B0B95F04E2E10909BE2034 = DER 7BTE ZWERG 3D (Der 7bte Zwerg - Blu- | V | 0x87013FB9A80DA03436F924EB6C8C81FD ; MKBv47/FindVUK 1.00 -0x476FD2E9C317DE9CB4686EC1839CD4E0EBF83C1D = DER ADMIRAL ROARING CURRENTS (Der Admira | V | 0xEEEC62BFCF21177E8536A31374595CF6 ; MKBv53/FindVUK 1.02 -0x018173FE1638AF303D61EFFCC5EB091E8AA1B753 = Der blutige Pfad Gottes 2 | V | 0x99D07E2756695E9BD89BDE1384CB67F4 -0x97ADDF2B941773DFCFA0322661CB1AC8F6A25FFF = Der Bomber (Der Bomber) | V | 0x09B9AFBA5AD9F80B121547C5ED6CF8D7 ; MKBv44/FindVUK 0.99 -0x9CA278C718703F175EC9B523BE08DDA5C3E660E5 = Der Bomber (Der Bomber) | V | 0x244B2A409749D4CEEDBCD6893FC2A19F ; MKBv44/FindVUK 0.96 -0x754C986116A4DF87FC86FAC695F32AF033C1DB01 = Der Diamantencop | V | 0xAB3799E02A7E6AF7043976D61017CF74 -0x5A7B2E86A801F2AC0991B6981FB74D499835020B = Der Dicke Ist Nicht Zu Bremsen (Der Dick | V | 0x7CA037978CE3DF40E38681CD14A75B79 ; MKBv55/FindVUK 1.00 -0x57700D77D968D5BC2532A137E2AAF1F40AD7BE4E = DER ENGLISCHE PATIENT (Der englische Pat | V | 0x66B57B9EBFF0A0A5738D3CD1A3BC03C4 ; MKBv15/FindVUK 0.99 -0x537C50ADA1B31EDD373D4818F6FFD8702F9E796B = DER GEHETZTE DER SIERRA MADRE [La resa d | V | 0xC613170557F5DF77C54624122BAAAB79 ; MKBv32/FindVUK 0.96 -0x5F7994A84B255E02893991BF9C5D37A7DD4E1804 = Der Gro??e mit seinem au??erirdisc (Der | V | 0x152AA0FEF7F9F0AB96A3BAAFB3092014 ; MKBv44/FindVUK 0.96 -0x54381866A57E79581BCBEE92667CDA0CE68726A1 = Der Große mit seinem außerirdisc (Der | V | 0x86349CF0EB2923D24596632F5B006996 ; MKBv44/FindVUK 0.99 -0xC4F2D7FB7787F034DBCE0C781855E224178E2413 = DER GROSSE DIKTATOR (The Great Dictator | V | 0xE4570D22B6DAB6B65974C740934E8270 ; MKBv16/FindVUK 0.99 -0x1513E6251BFB418218B48E59660DEF1494D0F641 = DER HERR DER RINGE - DIE R????CKKEHR DES | V | 0xF56432D761B1CF424442AFAD6BB2F342 -0xB7A80AE3480B741E64811B91D46A7E41BACB2DB9 = Der Nachtmahr | V | 0x4F85A33DDEFB3C7C47161FC91CC6CD11 ; MKBv62/FindVUK 1.00 -0x975A9CE52886DB5E33712056DF34E6920128785C = DER RING DES NIBELUNGEN (DER RING DES NI | V | 0xEC38A10888061F554C8CAD185140EAE6 ; MKBv33/FindVUK 1.00 -0x860CF1C83FFD73B62E75E77EFABA949D9B4EEE4B = DER SCHUH DES MANITU | V | 0x514D68B2B5EAF3D45D119ED485712E6A ; MKBv56/FindVUK 1.00 -0x6BEDA7883132F411A46451CF0D3BB4F0F6E30E7A = DER STAAT GEGEN FRITZ BAUER | V | 0x2F55CC1E9ED45276AE538B7054D4E6B5 ; MKBv57/FindVUK 0.94 -0x41D8E5AF51A49CADE9667F99FBDCC496A8DF48A4 = DER UNGLAUBLICHE HULK | V | 0xE5DAA24F2A3B9FB8986CF240075774A9 ; MKBrev 9 - FindVUK 0.53 -0x52C963B91356DC5C5800232ABE565FBDF67B746A = DER UNGLAUBLICHE HULK (THE INCREDIBLE HU | V | 0x1D8F03262C69B5405F1679D8F358892D ; MKBv9/FindVUK 1.02 -0xFB727AE3530698E0C5BEEF4A1C1878B16732345E = Der Ursprung des Lebens - Blu-ra | V | 0x500C00B77ED29F8F8F7A6B0C818FA8F6 ; MKBv32/FindVUK 0.80 -0xC5CA47E443C10AAFF9C56C67048A0CFEF3C399CB = DERAILED | V | 0x414E0C3E45874AAACF007BB4D14973C5 -0x7C1FD3BD69EBF0C89E6274104D4F3E5F0A27CA25 = DERAILED (Derailed - Blu-rayâ„¢) | V | 0xFE53102BA0EEA7DA72FE7F8019941F4B ; MKBv30/FindVUK 1.02 -0xC3C33A749CC2D34C92A53B7321CCC13AFE3594CB = DERBLINDEFLECK | V | 0xE18C6DC90C81BCFEC18ACDC6465A0A5D ; MKBv47/FindVUK 1.00 -0xEC0360ED97382C271CB45ADE1BDA6C2827F32107 = DERNIER GANG | V | 0x57A824722D33F6C10B4A3C2B131B5F11 -0x5C9B3C8237D9AE511BF0AD7B09CB7192E04E8DF2 = DERNIER TRAIN POUR BUSAN (DERNIER TRAIN | V | 0x27BA709174BC83D4324E40DB61A4CD29 ; MKBv62/FindVUK 1.02 -0xDDDA987E87AEF596DFA9E77408AD5E2D55278647 = DER_AUFTRAG (Der Auftrag - Für einen le | V | 0x51B177AB83F04552B91D328F501D6BA7 ; MKBv57/FindVUK 0.99 -0xFE4C0497243101C210452B10433246467E4B40A0 = DER_FUCHS_UND_DAS_MAEDCHEN | V | 0x422E626831C66B9D78B891C075B4C3FD -0x3C3CF277ABD1E7C4D160EBA8F834210DB80C954D = DER_GEZAEHMTE_WIDERSPENSTIGE | V | 0xF578AD9D99ECB5A1F5C348D2E87970C6 -0xFEEE1900C5209E6417ABD3578D7D57B44BC1AB1A = DER_GROSSE_CRASH | V | 0xAC7C369BB2AF4F76FC591EB6366F55D7 ; MKBv25/FindVUK 1.00 -0x37D2161280CD2C275453E8D58364ED532114F415 = DER_KLEINE_NICK (Der kleine Nick) | V | 0x6A62FE710F36738FCFBD897F68B2C49A ; MKBv19/FindVUK 1.00 -0xC6DEEFE1BB1D83B0287805C5DEDF3EB45155AF04 = DER_MEDICUS (Der Medicus - Blu-ray???) | V | 0x57A4824989EC92BC461204E684D841F4 ; MKBv47/FindVUK 0.92 -0x4F0CAFE71DE2FDF5EB83B02FA26F9F32E53B532C = DER_PFAD_GOTTES (Der blutige Pfad Gottes | V | 0xD7C54BC0D95F3F9165972D0CCA6A4A48 ; MKBv33/FindVUK 0.96 -0xB5619F4727625EE0FA603EF19344B5D641CD7861 = DER_ROTE_BARON | V | 0x621AC17D66D3086975F3AB460F6F6FBA -0xF511EBC64151BB71DA756BC346A3BFA565CBF8EF = DER_UNTERGANG | V | 0x02163475DD89861A5146187DC29608C2 -0x39BC438509B02AF20F4E198A05715D4B348E07A4 = DER_VORLESER | V | 0xF0E8F211BD1D1F1C7B095700C73A24F2 -0xA09FA90D0E5A1C85799ED8B31824F8D036BEDD03 = Descent (US) | V | 0x39DA45223D6B76413ACE5D57ACC1EF77 ; mkb v3 -0x119DDB107CD3FB1562D5B6AD05785F8228C2F1F6 = DESPERADO_ELMARIACHI (El Mariachi / Desp | V | 0xCFABD6AB687F6F5F08DD23D599A82AB1 ; MKBv19/FindVUK 1.00 -0xE9362F7C4F0AFB01C334C447A6622B84C682B4AA = DESPERADO_EL_MARIACHI (El Mariachi / Des | V | 0x1565F17A7B0EB4C0F2982549294F6AB4 ; MKBv19/FindVUK 0.96 -0x79596B185F3FB325E82708EE33B1C81EA05C509C = DESPEREAUX | V | 0x42F0FF5C6FDD6340E108D83568D118F5 -0x295B009811579205FF193E1160B5A0550C526A3E = DESPEREAUX | V | 0x27A274C3D0AC7CEB0E6F6B5E02EB7A51 -0xF574C7793BD7CFAC4B76297DB251A3EE6B3A0996 = Despicable Me 2 3D | V | 0x8C9E0860C8AABB826ECB3452548B9DB1 ; mkbv36 -0xE6B0CEB8DFA88A5EE1F3224ECA225E9506654B3D = Despicable Me 3D | V | 0xAEB6AA97B613EF31D06D6E93A14FDFD2 ; mkbv19 -0xD319A99CB81F96EB89CD045F55737E8E29995B72 = DESPICABLEME2_3D_G71 (Despicable Me 2 3D | V | 0x0CE0864107B1D256811DC783CE4D7181 ; MKBv43/FindVUK 0.87 -0xE39A6D895C2C5296CEEBE42BC4D36D248667DB1F = DESPICABLEME2_G51 (Despicable Me 2) | V | 0x6E696B2448EC8315AC065C866BA34F86 ; MKBv43/FindVUK 0.86.3 -0x93A1B1838B91C0E102B0E73B96380A559401D674 = DESPICABLEME2_G51 (Despicable Me 2) | V | 0xDE081706A48103D0E636245607AD8DCD ; MKBv43/FindVUK 0.94 -0x9BBE55E412C343B86DEC93A66DF0141D7D158DF3 = DESPICABLE_ME (Despicable Me) | V | 0xB7D03A31E6CFA3263979E3689FB9FC2F ; MKBv19/FindVUK 0.98 -0x248D69DECF56802BD2BA429B60B0185557CA6177 = DESPICABLE_ME_2_3D_G73 | V | 0x466EF83AB792DA0B33F63716F01D57DF ; MKBv36/FindVUK 0.80 -0xAB77CC13AD1F7E928B5D27455213518D2F1ACE19 = DESPICABLE_ME_2_G54 (Despicable Me 2) | V | 0x7FFDEF0580F65E8DB0BF2E1071802306 ; MKBv43/FindVUK 0.92 -0x806FA380F942777D4A5531FFEEBC90722C78106D = DESPICABLE_ME_2_G55 | V | 0xEF9EAEA05D7CA8D7D18F689B4397A176 ; MKBv31/FindVUK 0.80 -0x30067EA5B54AB2BD72E43532AAEF54DF0E2FB4E8 = DESPICABLE_ME_2_G55 | V | 0xFACD67E32CAC32B6E8EB143ABCA7984F ; MKBv31/FindVUK 0.80 -0xC3FF7FAD40E334B23BB3CDD995828AAA9371F9D1 = DESPICABLE_ME_2_G55 (Despicable Me 2) | V | 0xADF28B1DB2C6BCD1345E775A7971EA93 ; MKBv31/FindVUK 0.91 -0x39830AB865B3CC2685E610AA42F5A209E81B049F = DESPICABLE_ME_3D (Despicable Me 3D) | V | 0x9F662376CC3E95A41EE4C24AC89B7386 ; MKBv19/FindVUK 0.84 -0x7381B0CD055FAAD44EED11C447BE4F907CF775A0 = DESPICABLE_ME_G51 | V | 0xA1445E8E2DDD8FFBAD8C9AD5C09EE69C ; MKBrev 19 - FindVUK 0.53 -0x07758F83309C4813A103D32078FCB60BBE530639 = DESPICABLE_ME_G51 (Despicable Me) | V | 0x30A7AE572BD8B4B2C5BDDFF2CA7950DF ; MKBv19/FindVUK 0.84 -0x4E6D6C83ED1635FE998AA24A0484B7295E27D43A = DESPICABLE_ME_G51 (Despicable Me) | V | 0x27006E0C7F6B145F60877FCF9F96BAA0 ; MKBv19/FindVUK 0.94 -0x2F58281942EB83B1A52688B3CAC37EF535D2F94E = DESPICABLE_ME_G51 (Despicable Me) | V | 0xD15F235226C4D1D3DE281E0AC061738B ; MKBv19/FindVUK 0.96 -0x4B0BC120CF07679548684C2E7DBDB8C5926593BA = DESPICABLE_ME_G51 (Despicable Me) | V | 0x38385FBB610BEF07C9435087933BDEB4 ; MKBv19/FindVUK 0.92 -0x421B864766EBF96E6FB23266B5F6E021579A60EA = DESPICABLE_ME_G53 (Despicable Me) | V | 0xFE5CA6AF8D4DB52E44DEC1FA15ECA82C ; MKBv19/FindVUK 1.00 -0xBDB97824A56CFB4B51AC11F48F74AC78DA649865 = DESTINATIONFINALE (Destination Finale) | V | 0x61737BB576B63D46665098CEAC9C4975 ; MKBv21/FindVUK 0.96 -0xC1466CA4EAD411ED3A17F0F3512FBF4ABFB750AF = DESTINATIONFINALE2 (Destination Finale 2 | V | 0xF7C02EACD483DD82B8C409304F5CCE0E ; MKBv21/FindVUK 0.96 -0x2A63E826B905E5DF27570AED8347411C84D89644 = DESTINATIONFINALE3 (Destination Finale 3 | V | 0x514AEC4C34EAC626701790A1D22572B9 ; MKBv21/FindVUK 0.96 -0x2BE717BCCE15EAEEA3DE68CDBA3ADD4BB5643133 = DESTROY ALL MONSTERS | V | 0x71888E0424B815E0513EC95A466B924D ; MKBv19/FindVUK 1.00 -0x8E153F3D2A310F0D4A28488D2CA88B0BA89CA4A8 = DETECTIVE DEE 2 (Detective Dee 2 - Blu-r | V | 0x0989E5DD22503C23725DA0FE7DEE4213 ; MKBv44/FindVUK 0.96 -0xFB4E9BD4646B7307C444D59A8881BA0C6880D068 = DETECTIVE_DEE (DETECTIVE DEE) | V | 0x40247724BCA5B7C2CDAC5F72F04042E8 ; MKBv20/FindVUK 0.98 -0x40BFC17BD6F62C1B317E22E945286DA484B08E05 = DETEKTIV CONAN 14 | V | 0xCA442175C102C5884FE66AAB78D4B096 ; MKBv9/BEE/FindVUK 0.98 -0x9DF667DFB49FB50B9D0B0349C57F1738FD5F86B6 = DETEKTIV CONAN 15 | V | 0xCA7DD14E6DC6ECA53748E90FF0B5A652 ; MKBv9/FindVUK 0.98 -0x413EA1A41D1EED5A4A69560DC6D0220EF5190196 = DETEKTIV CONAN 16 | V | 0x3C3BC23D7D157ABB62DA6C2895AA8C27 ; MKBv39/FindVUK 0.98 -0xF70ADCE1FE32C58741867599F6CE75B0508C04AD = DETEKTIV CONAN 17 (Detektiv Conan 17) | V | 0x69DDE9310B7EA24C82C82D37FB5A0B67 ; MKBv47/FindVUK 0.98 -0x04C67D2EDB74D26DED13429462FA4BC6D1EC5529 = DETEKTIV CONAN 18 (Detektiv Conan 18) | V | 0x37FD47EC5B7C946E94F07D1866D03553 ; MKBv55/FindVUK 0.98 -0xE4181DF6EA8ED21DEF805294400BEF3EB7F67BBC = DETEKTIV CONAN 19 (DETEKTIV CONAN 19) | V | 0x15C9D46A543F385DF89F14C9D277F47D ; MKBv62/FindVUK 0.98 -0x101824B394B0E06969A7C0BB4F8CF8CBC3022575 = DEUTSCHLAND_83_D1 (Deutschland /83) | V | 0xDD88091B66DC8D39779FA2D4AAD6F001 ; MKBv57/FindVUK 0.92 -0x3E93CD6FF354863DAC1AF017D04449E720FE24EE = DEUTSCHLAND_83_D2 (Deutschland /83) | V | 0xD90D5C8DCBF3DA3B6B3EE7CB63139D14 ; MKBv57/FindVUK 0.92 -0x17E56F179A455EB8545BC6353FA408A227B36628 = DEUTSCHLAND_83_D3 (Deutschland /83) | V | 0x4CFB9D89100BAF9F527B628684B0F8AF ; MKBv57/FindVUK 0.92 -0xDC376E2763279A976B8B18993AB53170FE5F3719 = DEUTSCHLAND_VON_OBEN | V | 0x757959D545189075A500BE6E18DD1E74 ; DVDFab -0x1F1C8F80E656343401F59F6A181E697B7D00D82F = DEUTSCHLAND_V_O_1_2_B (Deutschland von o | V | 0x2F8017DA518317A069557C9D39C0A053 ; MKBv25/FindVUK 0.96 -0xC5001B823AF564F5A8BFD1D9E35AD3057816E0BF = Devil | V | 0x6828241F9494AC68A44AF02773D1EC93 ; mkbv19 -0xAA36AF1F97C39CC063AFE574097E75E1F4853673 = Devil's Tomb | V | 0x163E06823761C722E89FFDFC5F7227C8 ; mkbv18 -0x777823333EF68D1194B659A382ED53A63058C2FE = DEVILSISLAND | V | 0x028D39DB0F11435A4B0D6CCB75E78698 ; MKBv39/FindVUK 1.02 -0x90659BA13969E70CA10E5348DCC4810646249640 = DEVILS_ADVOCATE (The Devil s Advocate) | V | 0x2BE18173D81A35EA2D1999696774A04E ; MKBv25/FindVUK 0.96 -0x5D625C10A9C96F727F0E535A23BB57F466E0695E = DEVILWEARSPRADAF1 | V | 0x3756627E6F05FE45C6D72A885198496B ; MKBrev 7 - BD+ - FindVUK 0.53 -0x86CE23E40112D17B5AB8EF188F22FD8F0AF4B80A = DEVILWEARSPRADA_F6 | V | 0x14A8269A3D65D136F189E11DA6021E8F -0x05E212B748E96C0C1AB9BECE2282DA5B454C42BD = DEVIL_INSIDE (The Devil Inside) | V | 0xEDABD1E0296C57257366F5E58C5867A2 ; MKBv31/FindVUK 0.96 -0xB996AD0A509600DBDADC51F06B84614291B6A7B3 = DEVIL_MAY_CRY_D1 | V | 0x66AC1E7D8FD5E69EACA3904D06588CF1 ; MKBv12/aacskeys 0.4.0e -0x8B8BA0546BA3D4C04DE7669D50579E5FE7E13F43 = DEVIL_MAY_CRY_D2 | V | 0x4E3852CCB37E6F8C3E1977E6649970CC ; MKBv12/aacskeys 0.4.0e -0xB9664BB65B8000178B3F0C31DB66044154302D55 = DEVIL_PART_TIMER_CS_D1 (Devil_Part_Timer | V | 0xA433AE42E0AD66399D58C2094A8AD18A ; MKBv46/FindVUK 0.96 -0xD6F493897B684DED1DBEAC3B34763459D76B997F = DEVIL_PART_TIMER_CS_D2 (Devil_Part_Timer | V | 0x441554B1E22A4E897F51DC9EED34CFCA ; MKBv46/FindVUK 0.96 -0x1128A20857F0E20F6736C1C4EB77ABDBD5E17375 = DEVIN TOWNSEND RAH (Devin Townsend RAH) | V | 0x469FF7DFDAD5455BEE6BC8CD04D14150 ; MKBv56/FindVUK 0.92 -0x79E251075AFBCEC83AE6A5590ADB24A32D9F390F = DEVON_EROTIQUE_BDROM | V | 0x7BF6C094C4410237C42510021D36327D -0xB44413A995A07B36F2DCC0E619F0DAF30DC38199 = Dexter S5 D1 | V | 0x1962871F7DA776C42A9005DBED05C9B0 -0x07EE9095F38D46B9A83DA5A4CD289F213344033E = Dexter S5 D2 | V | 0xFEDB967F96F667E4D39B36C6EBAA8839 -0x266E6F242368FEA5022666D94CBF2460C22A86EB = Dexter S5 D3 | V | 0x6E912962CB62945B6EED2000F5F42A51 -0x1FA2486DDCDC2A5E5C00F80976E5CE991088207E = Dexter S5 D4 | V | 0x657343A48D638741F25D38E3910CAC76 -0x72D09DC45101900F03430C255EAB74DAF97D8DF4 = DEXTER SEASON 2 | V | 0xF993576BF16EF56E5CB8711C57C3449C -0xA10D25A16EC7196292390A71D63EF747B4E7CD82 = DEXTER SEASON 2 | V | 0xAA5A70B2EA1E48D2856C2F8C1EC43519 -0x05A79ADA372E5C20CC07889CABFEFFFA7CD7E703 = DEXTER SEASON 2 | V | 0xB87A6FA95AC9154E9E3BF648171732E6 -0x5607316A5F737A905641DF7E7F529987BE0D4C22 = Dexter season 6 disc 1 | V | 0x4A38B07733D8B57E68C2553F55BA33F2 ; mkbv26 -0xCF0DB895200AB89A0E9BB4CFFCD0228D2D02D1D0 = Dexter season 6 disc 2 | V | 0x4B3EA82FE9351B87EEB235ABB0E53B13 ; mkbv26 -0x9C6841615A2B2DACDE2E0838A1FD33F63AF7B4B3 = Dexter season 6 disc 3 | V | 0x3C35C0B632F2A619C569051A38A886D9 ; mkbv26 -0x967B1624896A3FF94332823DB518B2670E58C7D9 = Dexter season 6 disc 4 | V | 0x5FA2B7855F73A3B1278F1121CAF2C13F ; mkbv26 -0x01CF6D868A197967EDDCFB060041A88CB19F10D1 = DEXTER SEASON 7 DISC 1 (Dexter Season 7 | V | 0x87259E9B5BC4B38DD69937279E6B875E ; MKBv36/FindVUK 1.02 -0xB7B7A66DA6CD1BEBF610157A8CF16CB4675D8FB4 = DEXTER SEASON 8 DISC 4 (Dexter Season 8 | V | 0xEAAF461BA0F28347BEB591969AD3B12D ; MKBv42/FindVUK 1.02 -0x8F22D576B8A2467730241FC611872728D3386B1E = DEXTER_S1D1 | V | 0x6BE4C80F049CC82BE47A663C0BFEC0DB -0x38927A3A88A6CDA705F268D25619765B11DC956B = DEXTER_S1D2 | V | 0x7C617F9F30E42988029ED72B6AE93FA7 -0x878CA4FFC2FF662EFE69949980406A19C4A650E5 = DEXTER_S1D3 | V | 0x7A3D121235BEAD711D7F90200558A5EE -0x888E46FF3D53E32C718D98203CA607E49449BB53 = DEXTER_S3D1 | V | 0x0575238ED861BDF0131CADF12E05A181 -0x83927BC0B0A64A10D2CAC550F9E88EF5CCEAC2F6 = DEXTER_S3D2 | V | 0x0400D5C35D5A3CD2CF29804D6280929B -0xB50E3F436142F9D5138D2F7E2CD23CF92AE08308 = DEXTER_S3D3 | V | 0xA60C0D6E4F6E24F930C7198B715E97CF -0xE7483AEA47163FB457D8C1DE54327AC13A104BE7 = DFA_Disc2 | V | 0x99D787D4BFB7F069D04E01CFC232051C ; MKBv58/FindVUK 1.00 -0x065FFF8A5008947AE555B9201A6483AF79156542 = DFA_Disc3 | V | 0x7BA3FA8C4C2016DFBF133069D20BAD66 ; MKBv58/FindVUK 1.00 -0xABF94B6809CE3F229EF09702B3C09509C920CE2A = DGG | V | 0x0D731FE56B5C119D22CE63673635DB76 ; MKBv9/FindVUK 0.96 -0xF09910066BE554C164C705E44DF15F1B99754F2B = DGG | V | 0xC89F5904FB25E6D7D8017D90AAFDA7FC -0x08EF18E0354158BB0BCD34059C2F69CF4800C2CE = DHV1EGE1 | V | 0xA877B2759130145334093BB9A233EFBE ; MKBv10/FindVUK 1.00 -0xC70A6296F08EC0CFB3EEA94BB94D95586476378C = DIABLO_VISTE_PRADA | V | 0x7B0C4943ECAA377B4172E10A8C65D528 -0x1296816167C6E4DDC6D75B60D6C8A084B67DC112 = DIALOGUES DES CARMELITES | V | 0xE13C9D921FEBCD4AED42BA301748ACD6 -0x969BBA6E29FADCB5F2DA7CBCE27402A986C6A859 = DIAL_M_FOR_MURDER (Dial M for Murder) | V | 0x9F7414F67009F0D6ABC936BC686E9A71 ; MKBv31/FindVUK 0.99 -0x7B142DF5DD26C9183293359712BCA374619575E2 = Diamond Dog chien milliadaire | V | 0x8D8DFCA1A3659D13E9D823DA8FCB431E -0x4109359ECB176262973490F9C94BB660A900CCC4 = DIAMONDS ARE FOREVER (DIAMONDS ARE FOREV | V | 0xE29D900A1BA537F31111206B2FF7E8CB ; MKBv27/BD+/FindVUK 1.00 -0xFFF927CCB94CF406A73020A3E8A39DA5F9087CE1 = DIAMONDS ARE FOREVER (DIAMONDS ARE FOREV | V | 0xEA85F792610AA7B562A22CDC6388CC5F ; MKBv27/BD+/FindVUK 1.00 -0xB6CF25D35247D5E383EAEA53F2DA68A7FEE2AFCF = DIAMONDS ARE FOREVER (DIAMONDS ARE FOREV | V | 0x705828A4606D0B08E1E9526FEDDDB2F0 ; MKBv27/BD+/FindVUK 0.99 -0xBE0D079B8D880548F9194872A4000474E9C7D109 = DIAMONDS ARE FOREVER (DIAMONDS ARE FOREV | V | 0x5CF53025449594022465C430B545B067 ; MKBv27/BD+/FindVUK 0.92 -0x0E66943304E35D60A6D7962B63705B63EBBD768D = DIAMONDS ARE FOREVER (DIAMONDS ARE FOREV | V | 0xADDA1650872974BA9814AB1BDE0274D8 ; MKBv27/BD+/FindVUK 0.84 -0x0E92F3B4174408151E78603C07ECF1ED7E714D9B = DIAMONDS ARE FOREVER (DIAMONDS ARE FOREV | V | 0x97000C88268FFD6BF32262E2F269464B ; MKBv27/BD+/FindVUK 0.92 -0xFBC666AB0DF13CF5CD9E326F8DA9646A79206D58 = DIANA_KRALL | V | 0xBDFF4EDA22F0DD42436F4BC9876C98B7 -0x239F3377ACC05C8179D9A76CF9A56AFF16242F56 = DIANA_KRALL | V | 0xFE838F51FEE36A08BC2C1462BF6C7B24 -0xEA801D63DC37647A015039D0A90271ACADF80B22 = Diary of a Wimpy Kid | V | 0xACCC329CBEBC26A3E33C17EB43DB36B6 -0x53EB2A3B814076D8DF98691939E49F157C19A073 = DIARYOFAWIMPYKID | V | 0xCD8FBA44C911E61BE9CC250CD92D6250 -0xA9290C47EA70341E90238F59B5DD895B90C25079 = DIARYOFAWIMPYKID | V | 0x6190892A77A0DFFEF669530A7D7CE00A -0x4D0DCFA33B01B1372443D4AB094D282D33D487D8 = DIARY_OF_THE_DEAD | V | 0x8A052A3252792BD44FFC20211952CE77 -0x644D3EADB2C1E62393E2FB3BCCDD926A0CE193C4 = DICK VAN DYKE S3D1 (Dick Van Dyke Show: | V | 0xF8B08A5F49D6D588830E6339BC96F9CA ; MKBv33/FindVUK 0.96 -0xF0CBE369D264F505EF39D8F3B63B0C6DBB1A2B72 = did you hear about the morgans | V | 0x3D224DE4D0F19BBF4DB84B301AF3708B -0x4B296996A56FD3E677DA48911427BC61E59C98E7 = Did You Hear About The Morgans | V | 0x68B09149DB9F91306B51DFA322298B69 -0xBF46641BB8306C186686B91720CAA713F0B26A60 = DIDO AND AENEAS | V | 0xA6AFEB1FF754179380C0A6CBD1C9A000 -0xFC746BA4E8E9B10970D56708D50B29051FD1DACD = DID_YOU_HEAR_MORGANS | V | 0xD395A928B79925EFA5B7024A6C8F62B8 -0x6674DBB7FAB69908F6263A68532ACB1681CCDDA7 = DIE 2 BD1 | V | 0x7592B4CA10E8542045FDB58AC770C7FB ; MKBv35/BEE/VUKNOTVAL!/FindVUK 0.94 -0x80E747E3E8C904BAEFD89351DCF6D34899A774E1 = DIE 2 BD2 | V | 0x58C428998ABE04F969448D031B089F25 ; MKBv35/BEE/VUKNOTVAL!/FindVUK 0.94 -0xA85878F243BA6FB565FC88F8AD76705AEBE14E67 = DIE 2 BD3 | V | 0x7759045A3BF4CACF7336ABECF7C6C8CB ; MKBv35/BEE/VUKNOTVAL!/FindVUK 0.94 -0x138CB1796362E9321C810F71A5FF625073C06B3B = DIE 2 BD4 | V | 0xFD0C3B49A328317D794CF6903B092056 ; MKBv35/BEE/VUKNOTVAL!/FindVUK 0.94 -0x3136EFA5948A8E87255A9FBFC2A6DFD19D0B8AED = Die Ausgebufften | V | 0xC0781D2F48EAD5BB57545196B089F44E -0x603DA8D5782857D2F5BF4272D92D50AC10A5176E = DIE BELAGERUNG (Die Belagerung) | V | 0x0ABDF975C17058D04BA230F9B8C81864 ; MKBv51/FindVUK 1.02 -0x5E347804DB3A81BA862419BAE3A095E607A27196 = DIE BESTIMMUNG ALLEGIANT (DIE BESTIMMUN | V | 0x52B77C397EE7981E9ABBDB22DAFF6E9B ; MKBv62/FindVUK 0.97 -0x5EF3138FDFF509E8788A5FE0AD9D141BD75F235E = DIE BESTIMMUNG (Die Bestimmung) | V | 0xE5636616EFC790E6E95877F607EB72B4 ; MKBv48/FindVUK 1.00 -0xDC361695198070B736C7C64DBDC2D7AFF761AFAA = DIE BESTIMMUNG INSURGENT (DIE BESTIMMUNG | V | 0x84CD86171BDBD414539C40ECFCA9A974 ; MKBv56/FindVUK 1.00 -0xB05C5C7D86AE741E85F4256DDD3D928F1D52465E = Die drei Fragezeichen und der seltsame W | V | 0xA5C218B2520BB032206A2AB50F13CBCE -0xB864E4C97591E53696F283CCA19ED65E4ABBC6E9 = DIE DREI MUSKETIERE | V | 0xB5112050C39A84C75474CFAA14C9F0A0 ; MKBv30/FindVUK 0.80 -0x70336E94C71D916B68EE040742A3926CD465BCD7 = DIE EDELSTEINTRILOGIE (DIE EDELSTEINTRIL | V | 0x718877E8AF12AC74718897FD19BC26C4 ; MKBv62/FindVUK 1.00 -0x3D7FEBD38193CC9B8E93156DD64C7C7637130744 = DIE ENTFUHRUNG | V | 0x6618B90ADD5F4CDE98192CF6FAE463AB -0x3A0E4F32C22C3229C1E8BEF5CED2C058921012F5 = Die fantastische Reise der Vögel (Die fa | V | 0x470121A1E7C622A20FAC79D10F7591F1 ; MKBv37/FindVUK 1.02 -0x221F16CD9BF50B26438E3869B53273C172EA43B1 = Die fantastische Reise der Vögel (Die fa | V | 0x40E70D29F3A24AACBDD64C0442C79742 ; MKBv37/FindVUK 1.02 -0x4546062AA66B2AC94D200EAF108E65AF9E2F8656 = Die geheimnisvolle Minusch | V | 0x11BA6F7B8A4AD99DEE67AA8D30F75ED2 ; MKBv56/FindVUK 1.02 -0xF3BB4753BFF5E3A0D5EFC2A2BD36D0F5D8167913 = Die Hard 4 | V | 0x4919FF54CB19A64DD01F4247CD7BD262 -0xFDCA606015C4736A9C916B541BEE8185A6ABAE45 = Die Hard 4.0 | V | 0xF4F29D7870280852DF274382D5EA17B5 -0xC6E24C3612A4BC0EFC186EC1B4DCA29814088E3C = DIE HERZOGIN | V | 0x1F7AE6DEC892ACC3A290C3A684E038D5 -0x3C12BE1751A43C48AFA1557AA7A4B6D0FD526B74 = DIE HORDE | V | 0x2A394B8A7788ADF804F1304869C1D994 ; MKBv17/FindVUK 0.99 -0xC53845BF9F95C15FFB7115350386F2B0EBFF3B2E = DIE LEGENDE VOM WEIHNACHTSSTERN | V | 0x11742AE0D9F744ABEE3C82AD58FDCF1B ; MKBv32/FindVUK 0.81 -0x657DDD77984C75A883992338FAC385B43C72082D = Die Liebesfaelscher | V | 0x560154293AA392DF0170512929EC1D76 -0xE81566654BB3351DB09315B3C2E34CDCDCF5695B = Die Miami Cops (Die Miami Cops) | V | 0x6A6051FFD004B57EE31741BAE22379CD ; MKBv37/FindVUK 0.93 -0x90A5E06BD0FB4E682D9EA9F94B5D936FE45F7357 = DIE NIBELUNGEN DISC 1 (DIE NIBELUNGEN - | V | 0x08FCE823B7420B82CADD6920E0A66A92 ; MKBv31/BEE/FindVUK 0.91 -0xE5D8713A6CBFC3800EF2230BAB7ABB8D2C46CD47 = DIE NIBELUNGEN DISC 2 (DIE NIBELUNGEN - | V | 0xB5EA83F88537A9CB80ACC352106B373D ; MKBv31/BEE/FindVUK 0.91 -0x951882ED49278F5150314E6849C71C51C3453815 = Die Olsenbande auf hoher See (Die Olsenb | V | 0xA70FCF1F82C5DC9F2B6C8A862BCEF928 ; MKBv48/FindVUK 0.99 -0x9B52C83339DEED568D59B55EC97EC231E8B4D7AB = DIE STIMME DES MONDES (DIE STIMME DES MO | V | 0x72B4404D7DC7AFB4D32EB51C7EA223E8 ; MKBv55/FindVUK 0.95 -0x7FF9CAD0005D4DF9C5BF713DA1F7BB4BD0006590 = DIE TWILIGHT SAGA (DIE TWILIGHT SAGA) | V | 0x422BEE5FE281AFFD3ABC1300093D080B ; MKBv44/FindVUK 0.84 -0xC3B96159453A3520E0C79644A278EF9E6DE8690A = DIE UNENDLICHE GESCHICHTE (Die unendlich | V | 0xDCDB53CEE22966A32F44819B57B43C87 ; MKBv42/FindVUK 0.92 -0xA6B4DCDEA0BB139A21825E013821C43298D4750C = DIE UNFASSBAREN | V | 0xD649D2EF56E7B8C9A12FAD5D39769C52 ; MKBv44/FindVUK 0.80 -0xDA55C6497CBB5E357854DD06C5F629394BD19DB3 = DIE UNFASSBAREN 2 (Die Unfassbaren 2) | V | 0xF82C623E2F4AE5FE2F7A95D87C393C82 ; MKBv62/FindVUK 0.96 -0xA28F8AAEA2AC6E0F4A2FBD35CAD50E578BAAD39E = DIE VERSCHWOERUNG (Die Verschwörung - B | V | 0x684342386D2CBD9BCEC6A8B6D7B94FE9 ; MKBv33/FindVUK 0.99 -0xCBB617EDB1E4C00FDF5903BF5F0B8EFF5F8D3785 = DIE VIERTE MACHT (Die vierte Macht - Blu | V | 0x5E618CD8181A831A3BF8A6CE651E3C06 ; MKBv27/FindVUK 0.91 -0x15A035221CD3922F41328A16F1F9E51F46FBB383 = Die Welle | V | 0xF72FA162B89D6A5824C4ADEA67B8AC81 -0x7215DF1F4C5CA2448FEC2475315CA3584C806865 = DIEANOTHERDAY | V | 0x9CFB5AC27655BF70FA0DB4AAA3177D0D -0x3F255EDB47BA46F87C375B164085303445BD183F = DIEANOTHERDAY (Die Another Day) | V | 0x18B782CA66055171C20D63402CADD8EA ; MKBv8/BD+/FindVUK 0.99 -0x561C80B204435D95B7EB278DFC7E2DE66DC61B44 = DIEANOTHERDAYF1 (Die Another Day) | V | 0x42971EDE55FA978A8CECF905747A8AD2 ; MKBv8/BD+/FindVUK 0.96 -0xB81164E01CA46DDF1AB35AEA0E4A4FD69C8312F7 = DIEANOTHERDAYF1 (Die Another Day) | V | 0x82AB3A8B584A7991E42252499240357C ; MKBv8/BD+/FindVUK 1.00 -0x4AFD5E74D7EB8EBED90E182E855F74DBD8A0226A = DIEANOTHERDAYF1 (Die Another Day) | V | 0xCBCABF5E89AA6C11B80F95BD75CC0915 ; MKBv8/BD+/FindVUK 1.00 -0x8D667BD2998DDBBDD3FB3399BFB064898F7BC8B2 = DIEBUSTER_THE_MOVIE | V | 0x7B2189054FA049D12AC0A4CDDF1DBFA4 -0xE9441B57D8D87DF51012627A85F6CA29DBC4310F = DIEHARD1_JPN | V | 0xD6EC7F7DA99ACF1EBC90BC237D17B113 -0x353E4A5DE5551FBE1E84B7B66C0F4B1D7CEC821E = DIEHARD2_F2 | V | 0xF13F7B9B84EFAE320E2D5C003B040974 -0xC7829A41EA5050599F99FD4740051F7A052D3ED8 = DIEHARD2_F2 [Die Hard 2: Die Harder] | V | 0xD3A25E6D353CDBB69780B573C7D72F98 ; MKBv8/BD+/FindVUK 0.89 -0x0B6E0BECCECDA0CC1C8D003231FE84065EF4A8C9 = DIEHARD3_US | V | 0x6B6A6D44A8E0DD90C7F1AEE4A3A1CD63 ; MKBv4/BD+/FindVUK 0.98 -0xAF3EC8469FCA627AD0291C1BB4A8EA87F270E2AE = DIEHARD3_US | V | 0xCDFEB8A477F8AEF794CA25E96F0E61AF ; MKBv4/BD+/FindVUK 0.99 -0x078C4A5B17FC9C0316DC9E90EBCCDFFE4179F0D9 = DIEHARD3_US | V | 0xD5DF2326ED3504605692115480EB54CB ; MKBrev 4 - BD+ - FindVUK 0.57 -0x60329A85D03E4CFFF0BE91DC853BAB38FA78EC4F = diewinzlinge (diewinzlinge) | V | 0xEEBEDC0599395A86DD055D8B0E2214B5 ; MKBv61/FindVUK 0.96 -0xB7223B99F09C12957C3B51B6D899C42B0328B37A = diewinzlinge (diewinzlinge) | V | 0x026A0DB295E1F26255754458EE851257 ; MKBv61/FindVUK 0.96 -0x141CFAE4A411BB2748CDB50A89730D9B82603FA5 = DIE_ANOTHER_DAY_F6 | V | 0xBFFE44B2EE3996180505E92BFFBE6006 -0xF2C0A58285A8AE1C567115FE38D404A050A886DA = DIE_BUCHT_BD | V | 0xF1D93EF2BE45954A2007E25E29BBE8BB -0x2526478A6F160CFD70A7BCDDD0BC98A17B921CB5 = DIE_DINOS_SIND_LOS | V | 0xE3E0D643BDA7F4133CA8B8025CDF6446 ; MKBv44/FindVUK 0.98 -0x4F66997FDC5C7A5D97D9840C24FBC846E891240E = DIE_DREI_MUSKETIERE_BONUS | V | 0x8604F4D6AF528B76CF13362408223254 ; MKBv30/FindVUK 0.80 -0x2654E9F9A471B9A66F56381C863853326C149FD0 = DIE_FLEDERMAUS | V | 0xCF9823BC72F34B0F07A4A45381EC591E -0x57E62BFAB5BFE644522DB260DAB55FF0EE5B5932 = Die_H??lle_von_Macao | V | 0xD46D03D29B1E625F1DAA6288B0D05777 ; MKBv53/FindVUK 0.90 -0xD7ECA4955EB35EA5AB941455A47C779A54FCC9FD = DIE_HARD | V | 0x0AFC434CEB937DC7A4223A2E09D008DD ; MKBv4/BD+/FindVUK 0.98 -0xE82C81D08B620B205573FA243A5B0BFCE5AB11B3 = DIE_HARD | V | 0xBCB42E63C911BBEECAAA3C023C65EED9 ; MKBv4/BD+/FindVUK 0.96 -0xD49E411FFEBF1EF38CF5136BA83862782AAAC005 = DIE_HARD_1_F1 | V | 0x49F265F72CE52530943F5EC10A3A91C2 ; MKBv4/BD+/FindVUK 1.00 -0x263E09D4A372A190D13A933643806572248D5262 = DIE_HARD_1_F1 | V | 0x7ADDEC02A5AD1D7D34F5DD757A005A01 ; MKBv4/BD+/FindVUK 0.80 -0x2A86467157F40833A66CB9AB70B55095A9389150 = DIE_HARD_1_F2 | V | 0xDC9631DBB0FF56B3E914B3E1B71183FF -0x4C430E24097D0D382E20A2AAE06BC0778229154C = DIE_HARD_2_F1 | V | 0x18F22D82E2A964E3895C94DDEF711957 ; MKBrev 4 - BD+ - FindVUK 0.54 -0x044D199750F2C8CDD95DDA6031A939E9AACDFA28 = DIE_HARD_2_F1 | V | 0xABED58DF0FF0AC0E078D2729FAB4C270 ; MKBv4/BD+/FindVUK 1.00 -0x0EBEC2922946B1677ACECE75F05EE5C8B95D7BF5 = DIE_HARD_2_F1 | V | 0x18BF94442305EDE54099BA7BF9097825 ; MKBv4/BD+/FindVUK 0.80 -0x6A48071718BCE95F8CB38FDF4F925ED561E7A768 = DIE_HARD_2_F6 | V | 0x3217513241A36CF88C5F2C236F858991 -0x892FB547FA16A730EC9BEC13FEED27179B25A186 = DIE_HARD_2_F7 (DIE HARD 2) | V | 0x6FE2104759C00A5111EB2C4B4F2B50E3 ; MKBv16/BD+/FindVUK 1.02 -0x99ABEB654ED90EC55CA40E30EB293D937785BA93 = DIE_HARD_2_US | V | 0x6BD0A1353291FFD99E7948B85D3D6F3C ; MKBv4/BD+/FindVUK 0.96 -0xB1A1BEB050B44D490C77D4EC0DA45A9BA7B8FC86 = DIE_HARD_2_US | V | 0xF7DC34BAEE6C1326FD7F06391E3DE54F ; MKBv4/BD+/FindVUK 0.98 -0xB83ABF38F39CD2D205044BACF21563462E347B2D = DIE_HARD_3 (Die Hard 3) | V | 0x99D6384E8AFAC353051943403B556832 ; MKBv28/FindVUK 1.02 -0xB936F5E91C6D07DE2042EDBE09E762D35AE34DEA = DIE_HARD_3_F6 | V | 0xD488F1C5632C6A93A1B3A546E33A2A24 -0xC0C5E68B5A979037031B62DCBC279475CD9E5D62 = DIE_HARD_4_0_F1 | V | 0x8985CEFDF1C1124C1D563FAC273348FC ; MKBv4/BD+/FindVUK 1.00 -0xA074E7C05BA7923974DF43E00ADB2E1988EFAA2B = DIE_HARD_4_0_F3 | V | 0x155C34EE56E5C2621A86E7B2F62737F0 ; mkb v4 BD+ -0x2780D3FA524F2F1A4C0241C80222B7C6681DD225 = DIE_HARD_4_0_F6 | V | 0xA20F4EB4C332D9FBB95382A5B5E871C8 -0xA608B8EF11FCFD461848710C630736EAF0018FA9 = DIE_HARD_4_F7 | V | 0xE16BFFEDF9AB25201474B01DFE4A7F07 ; MKBv16/BD+/FindVUK 1.02 -0xF8F5DF81008BD9718216861A783EA7FE0E1DC187 = DIE_HARD_F7_NAV_V3 (DIE HARD) | V | 0x35CD778439C50AA64FB4B120491C8676 ; MKBv16/BD+/FindVUK 1.02 -0x7F2FAC4AC8E59049522857398A8A035FEDA27125 = Die_Krupps | V | 0x64E7D569292147903736962E7ED9F5BE ; MKBv60/FindVUK 0.97 -0x6711E9631130780C96DDE837E6E7F0A87BE46C27 = DIE_VERSCHWOERUNG | V | 0x85A47CFED88F8AC276B2486C8C023DC0 ; MKBv51/FindVUK 1.00 -0x7D83FEEE523C0E8100966710375380660F31A7AE = DIE_VERURTEILTEN (Die Verurteilten) | V | 0x645B80174538DDD938EA9AC7C899A63F ; MKBv32/FindVUK 1.00 -0x22E6B71DE60CE649582A2C698530322C696EDD4F = DIE_VERURTEILTEN (Die Verurteilten) | V | 0x3696F74758C4A6E39140582F0553D30F ; MKBv32/FindVUK 0.84 -0xCBAB05E29564390995BFFC1BA5CFE50A7C080EF4 = DIE_VERURTEILTEN (Die Verurteilten) | V | 0xD60CBD78576CC21566983547C04196EF ; MKBv9/FindVUK 1.00 -0xBCE3A7E6637A3F281348CA6525DE131FF178235B = DIE_VORAHNUNG | V | 0x705FCA78A612C1EFEB34C5E34871A848 ; MKBv4/FindVUK 0.92 -0xE65526CAEABD7624B164415CDED868A0A0D70F28 = DIE_WALKUERE | V | 0xD80ABFE269D9F787F4F1496876DF6DD3 -0x53E1F5D6666FA85AF3A477B378010ABE93B89E74 = DIE_ZAUBERFLOETE | V | 0x4314556D158FE6C9ADEB7B961E5C3EF6 -0xDBA015D3C99ADD9B5F91398A17DD4AAAD98ACFD3 = DIL TO PAGAL HAI | V | 0xAB5B566AE178F46042C169205A70EB73 -0x78C3A7DBB46E85CE8E89C67B84B8C664986B7C42 = DIL1NNE1 | V | 0x886DF8EC5044A85282F63B4FC02C296B -0x6FD88D6E6BAB7B387022AA86E329B4E468FE8AAB = DIN TILL DODEN | V | 0xE1175EEB2375007B5B4E9D2103E25AF6 -0xE6B0E0EEFBF3B025BD9AE810CC8968B94C16BD33 = Dinosaur | V | 0x0F034D0DD07A8F51A1B399D49AB49395 -0x79381D797A48AD57EAB38F2D9ACB499915480EA4 = Dinosaur | V | 0x82D839CCC212373A49DFE01187877801 -0x393C7ECFCDF14B51EA22C0010D50BCBC131EEA69 = DINOSAURIER (Dinosaurier) | V | 0xB69CB10661319812724DCF89EC3D5E93 ; MKBv14/FindVUK 0.96 -0x657200A28C7AE3212911942347D2205ADDF454B9 = DINOSAURIER GIGANTEN 2D (Dinosaurier - I | V | 0x91DDF27BBE77FB9DB80C65ABE140B33A ; MKBv47/FindVUK 1.00 -0xF6EC7ED8E269B3583039D0C1C71A2E9C9C037340 = DIRE_STRAITS_ALCHEMY | V | 0x733394302A635492CCA8538CF9672D48 ; MKBv17/FindVUK 0.96 -0x88D4FEB81412EF57515928025B6427048DB3ECC9 = Dirty Dancing (US) | V | 0xF81D288F828E7A02D269EDE3BBB391E7 ; mkb v3 -0xA7F80F4C282225BAFCA980D31ACBB63490746791 = Dirty Harry (US) | V | 0x707982E25A285DD8944129B7739E71D0 -0xEEF9F7DEDE6857431333596B0A24C4E59EF02522 = DIRTY_HARRY_WW | V | 0x7E7DBC547DEA5B1E9923D475DE1F0A16 ; MKBv7/FindVUK 0.96 -0x69F85642AEE1B4E036DC08415E63161739270521 = DIRTY_HARRY_WW | V | 0xC5FB6879ACFE9B5DEB3ED43296BF6023 ; MKBv7/FindVUK 0.98 -0x4B5642953B3DE942F18A5FE79FC4B66E21192DF1 = DIRTY_HARRY_WW | V | 0xD18CCDEDF773B32A8D2F3366BDA5B0E3 ; MKBv7/FindVUK 1.02 -0xDEB0661B5427A4CE24047E7EC853C97E26C7D108 = DIRTY_HARRY_WW | V | 0xD34D166F6313C976CFB57ED35B290438 -0xF01F87B8FEC7D9C4B6DB833D4A1822FCFA2C2A8F = DISAPPEARANCE_HARUHI_SUZUMIYA (Disappear | V | 0xA15B9CA2A9042B1D1523A2784B71986F ; MKBv62/FindVUK 1.02 -0x0D36BCF6FE3C53DFFA56E99F3342F01640C996D4 = DISC 1 (The Avengers - Series 4 - Disc 1 | V | 0x461ADA20C59EC104EA932990C94ACFAC ; MKBv47/BEE/FindVUK 0.94 -0xBC0BF813D4B85C078F47738C9F7F85929FE4333E = DISC 2 (The Avengers - Series 4 - Disc 2 | V | 0xCD5A7DAD819192159BD341D3AFC8B2A0 ; MKBv47/BEE/FindVUK 0.94 -0xBC372311F8C3F0496FED275B4BF689DB2FA18366 = DISC 3 (The Avengers - Series 4 - Disc 3 | V | 0x0547A73C49C91E2C3507F5B82774952B ; MKBv47/BEE/FindVUK 0.94 -0xD4707C444F30C7E89532A5A171EE1BB7079E4407 = DISC 4 (The Avengers - Series 4 - Disc 4 | V | 0x76191836FBA8C0668670F984B327A132 ; MKBv47/BEE/FindVUK 0.94 -0x3A1610BB76022269391E6664541D33C0C47967A7 = DISC 5 (The Avengers - Series 4 - Disc 5 | V | 0x8ED8900A185556D703D5F7F292C934C6 ; MKBv47/BEE/FindVUK 0.94 -0xC58B4032954F40EDC15F9CB40FD12439CC20F495 = DISC 6 (The Avengers - Series 4 - Disc 6 | V | 0x9B19BC0AE8F910C25ABD78E3BFD619D6 ; MKBv47/BEE/FindVUK 0.94 -0x9CB9D85EDF214C850F8D3B1683AC13A18FB79B3C = DISC 7 (The Avengers - Series 4 - Disc 7 | V | 0xE76F5C56263D408155AA99D9E11B9425 ; MKBv47/BEE/FindVUK 0.94 -0x9A0FA862E7BAAE87F4186A795988B99A8DBD8E68 = DISCLOSURE (Disclosure) | V | 0x16FD99E214C954C7CBEE5406B9C3064F ; MKBv25/FindVUK 1.00 -0x8C39E76560C4A7BA5D119DA094D6399FBFE63264 = DISCTITLE BD1 | V | 0xD5D09BA0CFB3B6E251AEA089A2624578 ; MKBv57/FindVUK 0.96 -0xF02C48C685605125D34DA7047905A1C9E7979FBB = DISCTITLE BD1 | V | 0x88768D4FE4D8BF1E171305597D4D9FEF ; MKBv52/FindVUK 0.86.3 -0xE7925955A8D75D2201F28CC997BA5C1FF9985263 = DISCTITLE BD2 | V | 0x2755D44E37847A69E81C4E12088B632A ; MKBv52/FindVUK 0.86.3 -0x024496D017BF1C15F7104AC3B0C2CD12C91499A3 = DISCTITLE BD2 | V | 0xBBE20B66AB59B44DA5B2C6813FC71D8A ; MKBv52/FindVUK 0.86.3 -0x50BF453C340FDB023BAFB0E0007C614C9F53AC57 = DISGRACE | V | 0x68949EFE3D544FEE737318BB6FFC0758 -0x644C8F84381B157761918BEFAE3BE89353640BB8 = District 9 | V | 0x7961F340C560800276F793EE8430E592 -0x78F7439A1CA5975FDAB1AA1812F45F062725F481 = DISTRICT 9 | V | 0xF73BF95CBB58EF0679B50D8492631475 ; MKBv16/FindVUK 0.98 -0x91F082B3064960AE42153EF15D23F5084CA3AF37 = District 9 (District 9 ??? Blu-ray???) | V | 0xE3492FC53F65BBF1A55CB6C3864BB664 ; MKBv53/FindVUK 0.96 -0xF981ECD75B721AA37DB67518218169FE18EFD7AC = DISTRICT_13 (District 13 - Ultimatum) | V | 0xE9375E43CC3D4DF0CA010EB5B3FA9B93 ; MKBv15/FindVUK 0.84 -0xAC8FA152CDFB84842A4342B8545AF4B3574DAAB7 = DISTRICT_13_ULTIMATUM | V | 0x54379CE7561714A37492B72468530A16 -0xC5D88B0C08926B8FA4E769EC63E8BDA8691FEC2B = DISTRICT_9 | V | 0x88EB3314707297FFF94AA12A833EF52A -0x987BF6AC795E81A9EEDE39FAF3E1758A648474DC = DISTRICT_9 | V | 0x47543E6EFA31858BC885ADE9FB11B6BB -0xF3664A7D91F35B2C230001BC08856B7605B87EA4 = DISTRICT_9 | V | 0x753ACB04BAE365AABCC9D55E17835E8F ; mkb v12 -0xB3B1787F93B172A0D5CF5CF625CFEED44A4150FD = DISTRICT_9 (District 9 - Blu-ray???) | V | 0x45C61E9349A06C3212FA32CDB1D4002E ; MKBv30/FindVUK 0.96 -0xE88F87F302C21E298A153905346951782C44BCFF = DISTRICT_9 (District 9 - Blu-rayâ„¢) | V | 0x2D695D4FDB4FA6BAD04D08E93B13A362 ; MKBv16/FindVUK 0.96 -0xBD57E6330066F42765E71FC25ECB0DDF5B08D257 = DISTRICT_9 (District 9 - Blu-rayâ„¢) | V | 0x12AF15BA3B577D2EABD5B4C124B282F9 ; MKBv16/FindVUK 1.02 -0x70DF2CCB4EB22F5DE5C35B9DE26384B4873E7B03 = DIVERGENT | V | 0xE4D25A702EDF30DBFED8DFBE73E00485 ; MKBv47/FindVUK 0.80 -0xE75E1B80E7759C6CD946C02FCE988F18284C23B6 = DIVERGENT (Divergent - Blu-ray???) | V | 0x68A28063C2B866534C96EF7F7EBB00EA ; MKBv46/BEE/VUKNOTVAL!/FindVUK 0.84.1 -0xC2D3772467C1A7C5175286A39B261DD81E6AF121 = DIVERGENT (Divergent) | V | 0xA7C87674127156DCB7E0162201376FA5 ; MKBv48/FindVUK 1.00 -0xB042C4DE76F53A67CA5B7501CAF9615DD43CE75C = DIVERGENTE (DIVERGENTE) | V | 0xE2C6FE3CB3D6623571EEFB85210DA034 ; MKBv48/FindVUK 0.99 -0x5512BD2B3CCA154A3DBD5FC97E37412B1636EEF0 = DJANGO | V | 0xE0ECC7CEB24C58C3635DF11C209ACC6F ; MKBv38/FindVUK 1.00 -0x31B4457D1CAC7859A8870BF3414F186941D94FB0 = DJANGO | V | 0x63D1285A9F92C85450522C64B42B02FC -0xE10F11789D0F005094DBD4BCB8125BB0771376F2 = DJANGO (Django) | V | 0x5E630A1CE73FB6C9FE95CB6CF7A0EB86 ; MKBv34/FindVUK 1.00 -0xA1C42AE24A23E7A91FED627A68BE2771FA367122 = Django Doublefeature | V | 0xF7C9BD9F5C0559987D4285A7F046D2EA ; MKBrev 31 - FindVUK 0.57 -0xA21DF7EC622AEB12687DA22F7ACDBF7592B239D3 = Django Doublefeature (Django Doublefeatu | V | 0xB1538C0855C9FD74F9D64CA460C15692 ; MKBv31/FindVUK 0.99 -0x60121C5D9B993FD38EFB0D51E957D9593A6D4963 = Django Doublefeature 2 | V | 0x9223D117EF313B494C0E843BC38404D7 ; MKBrev 31 - FindVUK 0.57 -0xABB084C9C518E8E1FA94CB64CBBE9F73573443BF = Django und die Bande der Gehenkt (Django | V | 0xE16840595D9B4290C8BADA88C5E6A01D ; MKBv39/FindVUK 0.96 -0xBC938CF2C40ED45A5F7901058111EA8C796D6F48 = DJANGO_UNCHAINED | V | 0xFC71871648D42B6AE920D64FF52DCEBB ; MKBrev 34 - FindVUK 0.62 -0x8F120A001A5C631C4BEEC1D8F1B42829B383878D = DJANGO_UNCHAINED (Django Unchained - Blu | V | 0x593F1FAB21EDAE7FCE57E0F93F1C62E5 ; MKBv34/FindVUK 0.96 -0x6546C04DCB541491A3216612EF81F5F3F4D3F801 = DJANGO_UNCHAINED (Django Unchained - Blu | V | 0x31B5F34E25B78DCCABD24EAB96D18442 ; MKBv34/FindVUK 0.93 -0x2C4AB5D29FBCC446B818704CDB35331B22123C5C = DJANGO_UNCHAINED (Django Unchained - Blu | V | 0x5F0C7782E2FAB9EB252467525FA43C35 ; MKBv34/FindVUK 0.96 -0xEC62B87BFD5585AC8BE5C7FB0CBBA1CE6A29C0BD = DJANGO_UNCHAINED (Django Unchained - Blu | V | 0x3A043DA3C337B5EBF444ECB0D2D2E593 ; MKBv34/FindVUK 0.84 -0x542EDCFC8659DAD4F5120A825D7494461F0D4C9B = DJANGO_UNCHAINED (Django Unchained) | V | 0x1BF8ED48D2146813F6D38AE784DD1AEF ; MKBv36/FindVUK 1.00 -0xB65A03A030ED92DC6C6B3EC1E9BBAB40163A7932 = DLA_NIEJ_WSZYSTKO | V | 0x65B6A2DB8CA84508063ACF1002DCC1B1 -0xC2E1F9B2464007D36F8B33303BB7603590DEBEBE = DLG1EUE1 | V | 0x283FE9662BBCE4F0CEBB239087280BBB -0xA98B44988126A5F896AF7A632EDE56E42EED3D99 = DLG1NNE1 | V | 0xE6FF186DE72D92BF1F8092F993A325C3 -0x6CE680A0DB600667DEAF5C03235B89FB77F63606 = DM22D_NA | V | 0x8E2BC2452A4C652B3999B6A6B6A4DDED ; MKBrev 31 - FindVUK 0.51 -0x0644E3FEA33D92EE599E8464D8E6E52A0F78AC7B = DM22D_NA (Despicable Me 2) | V | 0x1D327AF9F53DA7253BD914F4A7E7657D ; MKBv31/FindVUK 1.02 -0x8599ED5FB218AC1D74DDAF932426CD70811AE0A9 = DM22D_NA (Despicable Me 2) | V | 0xB858DD985CD81B3E33C17E981658F758 ; MKBv31/FindVUK 0.98 -0xF2F4D7C03D6BFAC2916828170FE7C3BDD960ECB4 = DOCTOR PARNASSUS | V | 0xF0C3053F3E142DE139A71A780EA33F67 -0x97ABEB818DA7331D7FED6E804B0EAF929B1A0099 = DOCTOR PARNASSUS | V | 0xF16B1806143E1A1BB184EAA28863542C -0x651F610EA17AC7B518EAFD269E48161EDA2131B9 = Doctor Who - End of Time D1 | V | 0x478BE7C7057B7BFD1F4D318430164ECA -0x1A97B29C7FAD6E526C4B95BFCE2537277E84A8B2 = Doctor Who - End of Time D2 | V | 0xE816471CF5ECF79080834DBDCC66AF4A -0x5BFD1110B8299F9FFAD09E0A04645683C9CF4EB2 = DOCTOR WHO STAFFEL 9 DISC 6 (Doctor Who | V | 0x54059C949B9431DE24CEAC45A879670D ; MKBv57/FindVUK 1.00 -0x4937A653D976E79AFD473452E9B813AF166BAE37 = DOCTOR_ATOMIC | V | 0xB70AA8E02DD8352A8F7DC180F50ACEB0 -0xBABA757BF2798BD11E87AC675B84464209822147 = DOCTOR_WHO (Doctor Who - The Power Of Th | V | 0xC6E8018808128EF325FA07DC33F2FEEC ; MKBv62/FindVUK 1.00 -0x0EE3519D721A8D14C72B943D811994E2FBD39A33 = DOCTOR_WHO (Doctor Who - The Power Of Th | V | 0xE1B536074CF65DD7C3980A3ECD98D1AA ; MKBv62/FindVUK 1.00 -0x0C78E98EEEA192F0DEC67ED1099FE9D9251700E3 = DOCTOR_WHO (Doctor Who The Return of Doc | V | 0xC3D926414DF80B811537A579086EFDB9 ; MKBv62/FindVUK 1.02 -0xD341C4A020BCA00811D5B5F7E22909762A145CE7 = DOCTOR_WHO (Doctor Who: Dark Water / Dea | V | 0xBD944CDB3D19603E228C4F34D4F51D4D ; MKBv53/FindVUK 1.00 -0x8F9AE29522B76B4AC19FD9B03433075666ADAE8D = DOCTOR_WHO_BONUS (Doctor Who Bonus Disc) | V | 0x28D1B93208CFE489A5ED6DD349F3ED4F ; MKBv36/FindVUK 0.99 -0x71AD0AB2F6DB176A16FE416DE67A610CDF025919 = DOCTOR_WHO_DAY_OF_THE_DOCTOR (Doctor Who | V | 0x99BBCF2FC3DDFA41E339550CB6BDD982 ; MKBv39/FindVUK 0.99 -0x241493F62BA448D26D6D57590604502351687DC3 = DOCTOR_WHO_LAST_CHRISTMAS (Doctor Who - | V | 0x6C8C6AAD1E7F6629DF16F24B14299B21 ; MKBv39/FindVUK 0.99 -0x35A185C2F17B2E8968F3BDBB758532CBABA8EBF5 = DOCTOR_WHO_S1_D1 (Doctor Who Series 1 Di | V | 0x606CC9A76E7EE25FABED93F164718E99 ; MKBv35/FindVUK 0.99 -0x65C3812BB14EA10C1282C581C65D41BA17D6C563 = DOCTOR_WHO_S1_D2 (Doctor Who Series 1 Di | V | 0x0494393286A6702EA7D97D41096E4DD5 ; MKBv31/FindVUK 0.99 -0xD06399D02519AD05423EF8944F78E8EB7CCF818A = DOCTOR_WHO_S1_D3 (Doctor Who Series 1 Di | V | 0x4C0892F3D6A4E1D535E3209F6B957C0C ; MKBv35/FindVUK 0.99 -0x784E467651A721BE14C8C39202EEADD37EDDEC9A = DOCTOR_WHO_S2_D1 (Doctor Who Series 2 Di | V | 0x4C866932C211C122348B355471BB32A4 ; MKBv36/FindVUK 0.99 -0x10E26F2B62EB15363076ACBB402EAE4C9F00AB97 = DOCTOR_WHO_S2_D1 (Doctor Who Series 2 Di | V | 0x6261C284941546EC8DDDE7C8C0215B2A ; MKBv43/FindVUK 0.89 -0x032E6A0066AF6D0E35C90A4DBE3B02EBE6FBCC91 = DOCTOR_WHO_S2_D2 (Doctor Who Series 2 Di | V | 0xC719472B4105DB0C62F2F1B4B763C493 ; MKBv31/FindVUK 0.99 -0x9535E5776170E3F4844728121D051CB47B718C6D = DOCTOR_WHO_S2_D3 (Doctor Who Series 2 Di | V | 0x4C0183389BCD7028DD9E6ED7213B918C ; MKBv35/FindVUK 0.99 -0x41A3D4AA86EF5B1F75D9FD0D0D64A5C43EF9BDD3 = DOCTOR_WHO_S3_D1 (Doctor Who Series 3 Di | V | 0x6CDE1422C994C7AFBD8E6CABA4E44DB3 ; MKBv35/FindVUK 0.99 -0x0D1DE2A8EAA676C1C1B89055199ECF58DC1FD5E1 = DOCTOR_WHO_S3_D2 (Doctor Who Series 3 Di | V | 0xF93B40E3190F17612675D69523B79245 ; MKBv36/FindVUK 0.99 -0xD67A870A28B981EDCEDBE4DA49DA689DCF648C86 = DOCTOR_WHO_S3_D3 (Doctor Who Series 3 Di | V | 0x2485D7749F07B4CCF36393D3F0603A99 ; MKBv31/FindVUK 0.99 -0xDC1C44C18B754EE8B2574F0C69135FA9A2FA8063 = DOCTOR_WHO_S4_D1 (Doctor Who Series 4 Di | V | 0x84999BD23777669F3433B9A0BDAF397B ; MKBv35/FindVUK 0.99 -0x1C32427C6DC61985EC7A2096B7676B46938B91E8 = DOCTOR_WHO_S4_D2 (Doctor Who Series 4 Di | V | 0x7870BFF9B026A20811269CBDEF943FDC ; MKBv35/FindVUK 0.99 -0xBA377FC980DBCFD4FE4B0C12B99FC61B424295BC = DOCTOR_WHO_S4_D3 (Doctor Who Series 4 Di | V | 0x82CAB39BEC76FBEA3654269D6F629AB5 ; MKBv31/FindVUK 0.99 -0xC990729B788EEAC9D5D0A7A521C80C739905F2C9 = DOCTOR_WHO_S4_D4 (Doctor Who Series 4 Di | V | 0x96A6E71914AC042A8A7602A1B070B550 ; MKBv36/FindVUK 0.99 -0x3F497425B3AC62816C5C582B57ED4610CE628F7F = DOCTOR_WHO_S5_D1 (Doctor Who Series 5 Di | V | 0xB6AF778B3104688809D62688DA477C68 ; MKBv31/FindVUK 0.99 -0xF1D6EA42B3607C992BD1D4802BDAA737977CC49F = DOCTOR_WHO_S5_D2 (Doctor Who Series 5 Di | V | 0xD19F3FC846615E10C4A50F6AC7895C60 ; MKBv36/FindVUK 0.99 -0x4F0C04E8854AC89FD4539F3A02E4921AE6CB17FE = DOCTOR_WHO_S5_D3 (Doctor Who Series 5 Di | V | 0x0BBF750D06A7643551C9F01013B624D5 ; MKBv31/FindVUK 0.99 -0x75C09EB57C918769AD001D171B0176D0AECD401A = DOCTOR_WHO_S5_D4 (Doctor Who Series 5 Di | V | 0x7CE9F691E6DAA515EEA84522FF5BC86F ; MKBv31/FindVUK 0.99 -0xC09B813CE457CFC010E98FBE67D06425160F5CD0 = DOCTOR_WHO_S6_D1 (Doctor Who Series 6 Di | V | 0xB24B1560A97C36F0A4654720758E79DE ; MKBv31/FindVUK 0.99 -0x03C1260351DED78DD65BF79924320BC1E545BC6E = DOCTOR_WHO_S6_D2 (Doctor Who Series 6 Di | V | 0xE69619C34C1810221E0CD90BCD01D176 ; MKBv31/FindVUK 0.99 -0x8A465BC889B188A67EB8039F474329AD67961C78 = DOCTOR_WHO_S6_D3 (Doctor Who Series 6 Di | V | 0x135AED0DFCA62CBF0AB5106AEF570F02 ; MKBv31/FindVUK 0.99 -0xCB545EB7056C889EC835166B45F4B682BA9F0518 = DOCTOR_WHO_S6_D4 (Doctor Who Series 6 Di | V | 0xBA6D35C48CF29AA9904F85780210E714 ; MKBv36/FindVUK 0.99 -0xB1B26A73BA6D63FC08596A1A90E3FAC1066FED2D = DOCTOR_WHO_S7_D1 (Doctor Who Series 7 Di | V | 0x75D9F4A6BD2101543102491D74553979 ; MKBv36/FindVUK 0.99 -0xD3E245EC9EE73B300378C114C41D993CAA240338 = DOCTOR_WHO_S7_D2 (Doctor Who Series 7 Di | V | 0xBB17D2465EABE70C6E52E0FDEB2BC10E ; MKBv35/FindVUK 0.99 -0xADA013316E7BC04972A1793AF25FA9713F84C1BB = DOCTOR_WHO_S7_D3 (Doctor Who Series 7 Di | V | 0x83514A779432B934317352AB56FD8C40 ; MKBv31/FindVUK 0.99 -0x95527C912C8521D697E0EF70E9007013D5286A75 = DOCTOR_WHO_S7_D4 (Doctor Who Series 7 Di | V | 0x2A1434C63703085A3A4B99093258D208 ; MKBv31/FindVUK 0.99 -0xA01806F992D65EB28BEBC2CAF6D463CA6CEBD4E7 = DOCTOR_WHO_S8_DISC1 (Doctor Who - The Co | V | 0xCDE90015F0B7097F5655D60D769484D8 ; MKBv47/FindVUK 0.99 -0xDBCED598E1F75B5E7462645D502F4C7AC359A051 = DOCTOR_WHO_S8_DISC1 (Doctor Who - The Co | V | 0x04C0F4E5E138560280CE063D34A7BDE5 ; MKBv47/FindVUK 1.02 -0xD68808377DF5EDC336C2EFE4CFA5589FD2F0C7D6 = DOCTOR_WHO_S8_DISC2 (Doctor Who - The Co | V | 0x45025611A8E42DE17ECF6760163136B3 ; MKBv39/FindVUK 0.99 -0x33C5C10D94604F72CA2976BD472C893CC631BC02 = DOCTOR_WHO_S8_DISC3 (Doctor Who - The Co | V | 0x95220508E3F27F3DA1B315B082A67DA1 ; MKBv39/FindVUK 0.99 -0x69228CBBBCB3DB313B61C9B17D14F22C467750CE = DOCTOR_WHO_S8_DISC4 (Doctor Who - The Co | V | 0x5EF54E7F7210C3937B3ABCB1FD5D683B ; MKBv39/FindVUK 0.99 -0x5CB571E226ED73A134C90831073F1DB7DC0E7BC7 = DOCTOR_WHO_S9_D1 (Doctor Who Series 9 Di | V | 0x60ACE755A1773FB628B73AC226E40553 ; MKBv58/FindVUK 0.98 -0x2661DC55883018087FA4843A2404B56F0A40EB34 = DOCTOR_WHO_S9_D2 (Doctor Who Series 9 Di | V | 0xEECFCFC324888D6CECDC1D8652E995FB ; MKBv58/FindVUK 0.98 -0x6BEF6893A6566812F9793E3513BAFA6D8AFD4EBB = DOCTOR_WHO_S9_D3 (Doctor Who Series 9 Di | V | 0xABD080B6C314131994F3713838E1C8AE ; MKBv58/FindVUK 0.98 -0x92389074C75FEFFDAEC5BD9C106859550AC2AE90 = DOCTOR_WHO_S9_D4 (Doctor Who Series 9 Di | V | 0x989D718C28A33025517E4A88C70BA804 ; MKBv58/FindVUK 0.98 -0x56ADC9E53372F29CDDBD64DE35DF93B104E6E0FA = DOCTOR_WHO_S9_D5 (Doctor Who Series 9 Di | V | 0xE82F92D295460A895CC2038132F43540 ; MKBv58/FindVUK 0.98 -0xD67B17E2E581E273527F4DFE9E0A4E5A87D45200 = DOCTOR_WHO_S9_D6 (Doctor Who Series 9 Di | V | 0xC7ACA5E806C1EF6DEED7672FE552128E ; MKBv58/FindVUK 0.98 -0xA45740FD75E55555487574554D984962EEE7A463 = DOCTOR_WHO_S9_PART1_D1 (Doctor Who Serie | V | 0x9F08939D9A5EE1C8F4B4081224D869AD ; MKBv57/FindVUK 1.02 -0x02E63B6A15A5811037584862342A0E68654D4E56 = DOCTOR_WHO_S9_PART1_D2 (Doctor Who Serie | V | 0x0D33F28BAB20391BA2836CCFB69226DE ; MKBv57/FindVUK 1.02 -0xC5091EF345C1709DA597FF1DCE170F5A7DE1F322 = DOCTOR_WHO_S9_PART2_D1 (Doctor Who Serie | V | 0xCA86357623CA518EBCA0A36E7BCC9F3F ; MKBv57/FindVUK 1.02 -0x5F0353875DE971339D303E22105375C7AABEA6B7 = DOCTOR_WHO_S9_PART2_D2 (Doctor Who Serie | V | 0x584C63D2438C7FA5117D892662D5489C ; MKBv57/FindVUK 1.02 -0x5DEFD8B1161A2AA2FF8174E4CAC286C15AA2DEA4 = DOCTOR_WHO_SERIES 4_UK_BD_D1 (Doctor Who | V | 0xA6F66C222162C789B08792AEAFD1CACB ; MKBv43/FindVUK 0.89 -0x221B21392C3F3903ACF81AD2DDC32A9F30C3FBD6 = DOCTOR_WHO_SERIES_1_UK_BD_D1 (Doctor Who | V | 0x375228B09D66994970374BA95E64B48F ; MKBv43/FindVUK 0.89 -0x6F1C6FC3C9FA79ACB88C8FCBEFBBBC61A51F3F9B = DOCTOR_WHO_SERIES_1_UK_BD_D2 (Doctor Who | V | 0x26D25CB9CBC7BCFEC54EBC9418E440C6 ; MKBv43/FindVUK 0.89 -0xF227292E1CC648E0232200F25BC37538F6DE64A4 = DOCTOR_WHO_SERIES_1_UK_BD_D3 (Doctor Who | V | 0x2EC47887D8226A658B1D52453CE2E2C9 ; MKBv43/FindVUK 0.89 -0x6CD9444A0EA2A1DD9ACFDEAC177D9FDD83B9F64A = DOCTOR_WHO_SERIES_2_UK_BD_D2 (Doctor Who | V | 0x31B7796AEFA9453814BED2A64D271211 ; MKBv43/FindVUK 0.89 -0xF3E8D87859D802B430343AF4557EC5DFF9097EC5 = DOCTOR_WHO_SERIES_2_UK_BD_D3 (Doctor Who | V | 0x39D794F2FCA813B24F1C4C3158F6D08F ; MKBv40/FindVUK 0.89 -0x9D0B665E7CA3427DDD2AA5F24D98DC19B5A0F893 = DOCTOR_WHO_SERIES_3_UK_BD_D1 (Doctor Who | V | 0x563306ABA2097346062ED2F75C81F8D3 ; MKBv43/FindVUK 0.89 -0x9B21AD236BD0577039154408AC4DFCF4AB87E3E1 = DOCTOR_WHO_SERIES_3_UK_BD_D2 (Doctor Who | V | 0xDCF8C4E556A4C6C06CE00531CB023ACC ; MKBv43/FindVUK 0.89 -0xDD91F3E059A1D0B52EBE9E079EEF10293CDEC498 = DOCTOR_WHO_SERIES_3_UK_BD_D3 (Doctor Who | V | 0xE4566D62DBFCDEBD0FE3CE5A1B89CC29 ; MKBv43/FindVUK 0.89 -0x2A90494685EE83A9EAC83A87C99BA0FA127B42D5 = DOCTOR_WHO_SERIES_4_UK_BD_D2 (Doctor Who | V | 0xCCA476A5BCD70E99A88E0EE4FA1372DA ; MKBv43/FindVUK 0.89 -0xE10B82F74A5FE80186AA9C534D14536BA28B788C = DOCTOR_WHO_SERIES_4_UK_BD_D3 (Doctor Who | V | 0xE63C4A3FF80B55C70C29B58886C83567 ; MKBv43/FindVUK 0.89 -0x2C89929FEC71497770803BFB0C492F9ED2AF7A21 = DOCTOR_WHO_SERIES_4_UK_BD_D4 (Doctor Who | V | 0xFEEE421B31925879F7EB260D94434DC8 ; MKBv43/FindVUK 0.89 -0x1D94AF2B819E85D56EBA22EC4B86D49EF69B400D = DOCTOR_WHO_SERIES_9_D1 (Doctor Who The C | V | 0xC0FC08D6A39AE041BB034ED66D39E2EC ; MKBv50/FindVUK 0.99 -0x5045E2CD38A037DB9BA6A163FE5769AE99747DBF = DOCTOR_WHO_SERIES_9_D2 (Doctor Who The C | V | 0xA10361A2C95F3579A932BB57DC0E0EDB ; MKBv50/FindVUK 0.99 -0xCD5282131C0CCB4B0CABC37688CF4F1D6B393733 = DOCTOR_WHO_SERIES_9_D3 (Doctor Who The C | V | 0xB7B2638B2240670B7A8781FED2D93446 ; MKBv46/FindVUK 0.99 -0xB286F7D08058CCC86AA59F0F171E5F593BC82E15 = DOCTOR_WHO_SERIES_9_D4 (Doctor Who The C | V | 0x6CDAAF12941C4AAE18F283B140189802 ; MKBv46/FindVUK 0.99 -0xE8630848E67A6F4A9351CBE31F1D34A18BAFC942 = DOCTOR_WHO_SPECIALS_D1 (Doctor Who The C | V | 0xEFC5D8F4A349B85A010772549636EAAD ; MKBv35/FindVUK 0.99 -0x9247E9CAC2033994A6A160A97E36496BB9E15D34 = DOCTOR_WHO_SPECIALS_D2 (Doctor Who The C | V | 0x6509E24B24A7B2B9DE0246E992A657A7 ; MKBv31/FindVUK 0.99 -0x73D31811A0368A24EC557D70F0A68079F3782EE0 = DOCTOR_WHO_SPECIALS_D3 (Doctor Who The C | V | 0x3ACCABC1E9A9F21E6FB876DFB69EE8F4 ; MKBv31/FindVUK 0.99 -0x096E9FA29B9C00CC3580382B46B875467DE9ADDB = DOCTOR_WHO_THORS (Doctor Who The Husband | V | 0x66F18A5BE833FB2FCA213DD903527D25 ; MKBv57/FindVUK 1.02 -0x6D7A76992FBD95742B235B021B50E2637CFC3E89 = DOCTOR_WHO_TIME_OF_THE_DOCTOR (Doctor Wh | V | 0x0FB1684675A25004654EB612AF6E745E ; MKBv35/FindVUK 0.99 -0x3DE507295F122E6C2DA5D39DDA530C49EEC0AC6E = DOCTOR_ZHIVAGO | V | 0x6A63F6526BB71C0F54CD88C75A8395DF -0x68D3F4A0E0F1D8F6B9AEE0162F6D095B7316771B = DOCTOR_ZHIVAGO | V | 0x7071442F79BEE29F94EE7ECFD2F71EFC -0x0A45C650B3FE438CA41CC6F9D8856F09447699B6 = DOCTOR_ZHIVAGO | V | 0x4CD78E838072C35B8738BBD32CE49203 -0xA056E7B51ADE03088432035523C0D3234F9877F6 = DOCTOR_ZHIVAGO (Doctor Zhivago) | V | 0x4B0EDB401D14ECDBC5B0DC5221D3D5C5 ; MKBv14/FindVUK 0.96 -0x1F636257D928F33CD8930720BD4613649B6392D5 = DOCTOR_ZHIVAGO (Doctor Zhivago) | V | 0xF2FADAE2D516C679F308161696E3675E ; MKBv14/FindVUK 0.84 -0xFC3E0AB2964AC1C2F2B411669C18EE7F66CDD6AC = DODGEBALL_F1 | V | 0x7D7CFB31099A5622320689AB79A86D60 ; MKBv4/BD+/FindVUK 0.94 -0x69D60FF961ADE928EFA90F42AB90CCF53142E524 = DODGEBALL_F4 | V | 0x075D526E2A2F39244D27F28E7A0DFAAA -0xB03382EEEB59839F13343E85D71080A930DCCFDF = DODGEBALL_UNRATED | V | 0xEA20742B650B58FFD0C53478DDCE99FC -0x8701B4A472CFAF3B166BF7DF56966699E14A0E28 = DOFUS_LIVRE1_JULITH (DOFUS Livre I : Jul | V | 0xA5D16C2B5E4A4B11FD01311A15A219A8 ; MKBv60/FindVUK 0.96 -0x01C61AAAB1F7BEB4DBE9195C818006B4109B501B = DOGMA (Dogma) | V | 0xCB1D7CDAAC0BB3C38D38434DE55D0660 ; MKBv23/FindVUK 0.84 -0x0826FFEEE58D3644CB124E15585D7D3068A6CF40 = Dogma (US) | V | 0x4942E7BE41126C074B76D75CAB4841C1 -0x9CDE0A6DF4CCFF5E25D09CA381FCBB5C2E92C6B3 = DOG_DAY_AFTERNOON | V | 0x25AE2215F75D6DEF0F8BC817BE735C90 -0xD816B34409F38356DAF0212A9460095B5674BAC6 = DOG_SOLDIERS | V | 0x9A0D7AD8ED9FA4A0045298E816B2CEC1 -0x8BB87EF795984CCDBB142F2FB683BA995582C5A4 = DOKTOR FAUST | V | 0xE95B80E02F324AD11865783F5A5D00AF -0xD46333FDDF0EFA4CA23E2838D19D7178100D8624 = DOKTOR PARNASSUS (DAS KABINETT DES DOKTO | V | 0x90D68F43E8E947DF36513053E2A09052 ; MKBv17/FindVUK 0.96 -0x3168793110681B8B0F11419EC7BB3C23826A5112 = DOLANS_CADILLAC | V | 0xD3E9A5D248DD44ECBB63EB9C7E05512E -0xECDCCF926AC3DDCB7F595CE054FE9287E4B42842 = DOLBY _ THE SOUND OF HD | V | 0x2E1DA218E6E7433ED8160AC7DE8A6A93 -0xEFD2EE5696BF67AA2D43F59560361F44E418E651 = Dollhouse S2 D1 | V | 0x5F68A96DAEE8E71464737044F78B3D18 ; mkbv17 BD+ -0x7BD759306292F9F409A8EF97098E116DB6D97758 = Dollhouse S2 D2 | V | 0x6D75ABD1E97499B1373129145E9666FF ; mkbv17 BD+ -0xB6E1E1A38105D2176CCD1A27D7C0C6A2AB1AAD24 = Dollhouse S2 D3 | V | 0xCCE683186F7B44041463DD942E98E68D ; mkbv17 BD+ -0x39D774731284F2E7991A2051188E55DF267A90D2 = DOLLHOUSES1D1 (Dollhouse - Season 1 Disc | V | 0x7D7826EC0BA33FF7960A9D51FBADDCBF ; MKBv12/BD+/FindVUK 0.92 -0x91B9C578DE9254D6FECBF1D45B5DD585288987A9 = DOMINO | V | 0xCA779863F08A8E33DC2B6F3572781693 -0x67DAB82DAC4C68BD181FFF63DC7297C5895E0452 = DOMO | V | 0x439C6135FBF4ACA3C7F00D17BCE3A549 -0x191BBEF4035F19C2EF91DECE42D55B323FE4B5DA = DON GIOVANNI | V | 0x68CB528C8CD6AED2608E6C535B93E4E3 -0x71E3E4CF592000D4CFB1D257C1D31BB8DE1DCF6C = DON GIOVANNI | V | 0x05647F72491ED28E678B2679F09BF573 -0x5D4E78B4E8BB4FF2F168B336EC820E97C5C129E4 = DON GIOVANNI | V | 0x19482F6F54572F7E9F4D1B930C46D678 -0xAA0266752CFF86E0A0118AC044AEFA4A13CAC54A = Don't Be Afraid of the Dark | V | 0x488FE8A61448EC20FADFDCDDE266D171 -0xC3BFA641D0F607DCE0AA8BABD73E7AADCB06A074 = Don't Be Afraid of the Dark | V | 0x53FBD3033653508D76E38E8B6BD83F12 ; mkbv28 -0xF2E6B45A71460CC6B8659CF64053D05321A037BC = Don't mess with the Zohan | V | 0x368810AF93F785766A0EA061DBD3F338 -0x34B141516567829BB067420748B5147F1F3783E6 = DonkeyX | V | 0xE2C3972C9E6F9D30C1AA5C59637862C4 -0x5C16D2DEDF58F4855B5A8B52C615DF069662D8F6 = Donnie Brasco (Extended Cut) | V | 0x8BFFDDE09E60409824BD9C078E6D4F41 -0x5A65570BC2AC3FA159EEC1301E7FEC3FC156B44E = DONNIEDARKO | V | 0xF7371CABB3207D8EB61B53D236F22337 ; MKBv19/FindVUK 1.02 -0x796D4D3F82642995D79BD77C00AE62FEE29957F1 = DONNIEDARKO | V | 0x4F874D4D55AB99D8FB2B05BC0FD94986 ; MKBv19/FindVUK 0.96 -0x2010333BC8E272C91D225C277AB92B82EB739AA0 = DONNIE_DARKO | V | 0x26C2F4885F242817D155725555AF478D -0xBB0131C4537142EE2937BDC6748FC93498388DE1 = DONNIE_DARKO (Donnie Darko) | V | 0xD2BB6ABF28514FE2669856A6DDB60EFC ; MKBv10/BD+/FindVUK 0.96 -0xC2372533632D3F9B1B4334D813CF43B1DE85B042 = DONT_BREATHE (Don t Breathe – Blu-rayâ„¢) | V | 0xA8D83B5B5ACC7EDEC593FEC42B94593A ; MKBv62/FindVUK 1.00 -0xBF7809EDBDA9DBE9FE6E045372AEF76BA1B49CBF = DON_CAMILLO_SCHLACHT | V | 0xD00AD4FB0FF3F84631A0863DBC285F4B ; MKBrev 25 - FindVUK 0.54 -0x32FBB8187E381A9EB67F9E80C4F1F6EC59CCA0B1 = DOOMSDAY | V | 0x1FF62C2229EA0AA899254AA0C0E48445 -0x0ACCCEE94666DCC55C4CE40961C80FE79A28FD92 = DOOMSDAY | V | 0x685041437783B97465DB001005E4311A -0xC254A434D0672814D558315AFA39B1E5309B9B15 = DOOMSDAY | V | 0x73894BEC776F9C6A6FBE71FC92511C50 ; MKBv8/FindVUK 0.96 -0x5393B8C602238D3F636E20AE595EFD79EC554EA1 = DOOMSDAY_ITALY | V | 0xDC75CB52866333C949A150E171BA75BB -0x4AB83099B1A1F96C724B97C7328007C6EE4923A3 = DOOM_G51 | V | 0x5B73EB8406E0D9D894A15ECFF96112A8 -0xBB3FB210722DB8AA6A4CE4F4E8E02D87C2022CAB = DOPE (Dope – Blu-rayâ„¢) | V | 0x0CA3743F33E6E6B066F1AC94CC495664 ; MKBv57/FindVUK 1.00 -0xEBE3AFEEB26548C963BEA73A172BE594358CFAE4 = DORIAN GRAY (DORIAN GRAY) | V | 0x3B549D16BF5F3665494642FCBFF38749 ; MKBv18/BEE/FindVUK 0.86.1 -0xDFF3118D804C6D11E9D73003C61662F4C7CA0C7F = DORIAN_GRAY | V | 0x414DEBA7C520C5C6664719E5C74F789A -0xA4C69A1F588EB22EB953668BC659DC582E51FF85 = DOUBLE TEAM | V | 0x83DF91038BB0929C61264C990B43E3BA ; MKBv60/FindVUK 1.02 -0x93BCC5E160C2BCADDB1BE998FC38098CEC09CBAA = Doublefine_Adventure_Disc1 | V | 0x8B324266D8F2FAD539F293456300BD06 ; MKBv58/FindVUK 1.00 -0x91BA4AF55722347FFFB05C104F8DC6BEE3A317EE = DOUBLELIFEOFVERONIQUE (Disc 1) | V | 0x3907B3DDEB13A378253A6CCFB32D4782 ; MKBv16/FindVUK 0.98 -0xD77CF7713E870E81457C2AF380585CD1C7CCB299 = DOUBLE_STANDARD | V | 0xD7B781FE5E17ABDB240031A8015F3C14 -0x484C5430387A76076BC359D99A5F2190C37CBBEF = DOUBT_GBR | V | 0xDCFA1850073084C9082DCA9E907E1CC8 -0x755DFE69BBFBB3C428924B252887A7DCFC5A1AAD = Downfall (UK) | V | 0xF22128F2B8801606C79453EA98351A02 -0xE553488FD451CDE21B2A98D8AC91715BD5F9912A = Downton Abbey s1 d1 | V | 0x94DF321899403EE634983CAF070BECBE ; mkbv19 -0x1F2EA3876D8550ABF0A866E64A604DD04CC227F0 = Downton Abbey s1 d2 | V | 0xE491C33ECBF156D2D3022831A14353F6 ; mkbv19 -0x33C56FA8D347FB661574BEC7865E6C10A7A6B285 = Downton Abbey s2 d1 | V | 0x182CD61820CD284DB19D0AB434641436 ; mkbv27 -0xF5A133BDDBE434B71C62281027A0C20186E0F508 = Downton Abbey s2 d2 | V | 0xBF94674EB1FADD3CACA63F743FE056D9 ; mkbv27 -0x565388AE3E4ADE43443858869F0A313AFA8590AF = Downton Abbey s2 d3 | V | 0xF2F72E5B3431462F8BB4DBDD06205599 ; mkbv27 -0x51466032B625357A64A2DE2D26235BDED287E289 = Downton Abbey s2 xmas special | V | 0x6E916D7B995FCC148F6B57EE76A0A9EB ; mkbv27 -0x221961A78343D8B62D3602EEB3D45F7D47D75BEF = Downton Abbey s3 d1 | V | 0xC3A130EADB81732C838EFE1F26553FF9 ; mkbv27 -0x96F38B60D0A12A16E189A603933A85FFFE0BCBB5 = Downton Abbey s3 d2 | V | 0xE64B058CF41AB27A81EA817C508B08A7 ; mkbv27 -0xE0E801B8B29662C9DA75FFACD79719DBBBD67810 = Downton Abbey s3 d3 | V | 0xC9CEC4BA4D599FD13E53BA376302D8EF ; mkbv27 -0x534C8D274EF8321E55C3E97E1395F668CB1C7DE3 = Downton Abbey: A Journey to the Highland | V | 0x509A9639F3A4FA2A5E6402817A12E898 ; mkbv27 -0xF35765F0A47DB44E0074721421AA0C5A07FA0D0E = DO_THE_RIGHT_THING | V | 0x2F690454DDC3536BCFC228BBBF0F7449 -0x60AA63F1293D3B5A68DB04C00B7C45D6193C6ADD = DR PHIBES (THE ABOMINABLE DR PHIBES) | V | 0x7297DA3127F20492422B8C8D6EFE038C ; MKBv46/FindVUK 1.00 -0x413AF6BB6AF86146B922DCF83D5CF2F6E29EDC8D = Dr. No | V | 0x848FF6607D25510284F0A41ACE852E39 -0xE86CC478A023414DD08D0188C78CE5F279B7EA95 = Dr. No | V | 0x64457EB1995C3ED27C70CE0125F980DB -0x6CE97711755F913039E4D42B4E6D9C12C3E79CF6 = DRACULA | V | 0x0BF5064A749253AD3DF543BFC00EA771 -0xACE55D41F6B29DA79874CDB2CFC7F26632CBABFD = DRACULA | V | 0x36A6FF51B463A4ACB87B03624E8EAAC9 -0x08DC264F60658681B5706A1C542BCDC9DC1EB111 = DRACULA (Dracula) | V | 0xC3E9C258F9F258CEBF8C1DEADA7C9D02 ; MKBv34/FindVUK 1.00 -0x6EF6B8C083A53234D81A5444943D5907325DBCD5 = DRACULAUNTOLD_NA | V | 0x6126716132AD6938BFB13876240D824D ; MKBv39/FindVUK 0.81 -0xCEC2FEABFA600B119AE8C82AE72E25500AA6EA09 = DRACULAUNTOLD_UPB1 (Dracula Untold) | V | 0x7484C1D2BDCB6567E4E1205CE7375F29 ; MKBv49/FindVUK 1.00 -0xD4EC515CDFE8F47E7E381B02DA1554CCA0D7CE3F = DRACULA_G51 (Dracula) | V | 0x0344CCA757FE1911470EAFC851A17530 ; MKBv31/FindVUK 1.00 -0x370477CA7371BDF71B68E15DD0DC9072C9CFB23E = DRACULA_G51 (Dracula) | V | 0xDA3285B5A2EDB4BB03E122C2E80E02A4 ; MKBv31/FindVUK 1.00 -0x308DDD83D4FEF8227F37023DEDC5912E92855492 = DRACULA_G51 (Dracula) | V | 0xD11D4964E9F99E030F2AF8C9932DF131 ; MKBv31/FindVUK 0.96 -0x700F12CC38060FC596F3373C4A6556224CD63C80 = DRACULA_JAPAN | V | 0xFBFEE7E7DAE758C7275EBEE724D2045D -0x476EEC9D8F90122F3C0D16A7371E4A87EE777889 = DRADON_KINGDOM | V | 0x20DAAEFB7807FDCA1392CBA848568BAE -0xDC3EA2AF4C8D5484463750F61E8E2D6E059DAD07 = DRAFT DAY (Draft Day) | V | 0x56414F6CCFC318082017D0DB6847AE91 ; MKBv50/FindVUK 1.00 -0xEEB47026F1C857D95559EB46B38289B9681DF87D = DRAG ME TO HELL | V | 0xE9F8A9DC4643C61DF05304EC03A20741 -0x7997DBB9D7E89A663E600E766888E8B3A012372F = DRAG ME TO HELL | V | 0xB25BA096746B0D88CF80FC5BD99785E1 -0x53951EA5C25C14BE73A8E1959645FE3EF83A2047 = DRAGMETOHELL | V | 0xD82BBC2D5B3A3EB3BB8A30776927E662 -0x898049EBBF8A3968C0B1334FF2E8580F46CE89E3 = DragonBallZ_Battle_of_Gods (Dragon Ball | V | 0x39DC9E07A6BFF324B8A01E861407EB44 ; MKBv47/FindVUK 0.96 -0x9B902EB8A1A43DAE626F6646AE837429C181E567 = DragonBallZ_ResurrectionF (Dragon Ball Z | V | 0x37C753C4644E22EF9BEA112611F11115 ; MKBv53/FindVUK 1.00 -0xECA06C2E32D238518BB3F4C0EA74B23C733447F2 = DRAGONBALL_F1 | V | 0x8CDB0A827CD8D41490BAA6A34B32B1D8 -0x80A123031007845F507D6311758594D5874AC715 = DRAGONBALL_F2 | V | 0x40D132FBFCD871324C6BC6A8FA56AC1E -0x6D85873D2EBF57E61B286DA8BED428BBB5BC35A5 = DRAGONBALL_F3 | V | 0x1869FDFC34440908719D5A8757EC55A1 -0xA7DBFE2DF7E8FE5D8DBE6382499EE768FCB85817 = DRAGONBALL_Z (Dragonball Z) | V | 0x0964D7F65D96E6AEC42515C93EC043FA ; MKBv54/FindVUK 0.92 -0xFCCBA003CE103809EFDEA69885B9F32E4F59761C = DRAGON_BALL_Z_RESURRECTION_F (Dragon Bal | V | 0xE4D7F946D20A0E9AEABB61C763B48411 ; MKBv57/FindVUK 0.96 -0x31EFC4B26C1263D705178E8C6C8A72A7B11B34B6 = DRAGON_BRUCE_LEE_STORY_UPB1 (Dragon: The | V | 0xBF3D45D91908CAE2746E2B01AF6E2178 ; MKBv49/FindVUK 0.96 -0x4371FB6C416AFD7ACAC843A9F430C5373CCAAF4A = DRAGON_WARS | V | 0x9AB61FF60B64DC23EE15B058328EAC9A -0xA296A8C2AE928C59B549EA504739D9FAF56219E1 = DRAGON_WARS | V | 0xEBD988B01B601F1A94277CA2EB70A68D -0x24D6C0BA1E50FBD361303752ACEF3A899B47ED79 = DRAGON_WU_XIA | V | 0xD9198F040C0E1161E2CD64C6156658CE ; MKBrev 37 - FindVUK 0.62 -0x52692491CD7B582309F89B7E36611E2357ABB2DE = DREAM EATER MERRY 1 | V | 0x4ABCDD8275335653989EC7667D04BEFB ; MKBv31/FindVUK 0.99 -0xEF6BC356EF8340CD5932142375634CF80BBAAEFE = DREAM EATER MERRY 2 | V | 0x7945680E01ED763E3AAEFA45C6E1D284 ; MKBv31/FindVUK 0.99 -0x0B24FC465EF967E8A0F9D97E0876666BCC066724 = DREAMGIRLS | V | 0x2A2B9D50E383282907984B24CECEC0BF -0x3D9016A8CC0E4D12F337E432A34961048846A0D4 = DREAMSCAPE | V | 0x7B151AA2AACBFD78C4153138965A3F6F -0x76B3CABC2F62FABC4A95BE1895C566B65700231F = DREAM_HOUSE (Dream House) | V | 0xB5777E11EC5F8BB493AA55F8AC15E164 ; MKBv23/FindVUK 1.00 -0xAF872AA5968EA8B8CAEC9F068976F6ABE7625864 = DREDD | V | 0x050A7A017FE5A88260BBCFFBC719C63E ; MKBrev 28 - FindVUK 0.54 -0x1035AA557BAFD4747DA06AB6E896F2303D5A76CD = DREDD | V | 0x43F206808FBD3E78EEC5FFA4A3197443 ; MKBv35/FindVUK 0.81 -0x0CDBC376D3B73BB551A9B9E4649F7BCBDB187F61 = DREDD (Dredd) | V | 0x3FF66237F4AC77082525097C12626418 ; MKBv31/FindVUK 1.00 -0xCCAF7343FAD27FF69734258F6DF34F845ADDB75E = DREDD_2D_DE (Dredd) | V | 0x13215E3E791501A446DA912CC93AD272 ; MKBv37/FindVUK 0.91 -0x28DC6D4D6CF76FD9F3895961AEBF6C14E6541BA6 = DREDD_3D_DE (Dredd 3D) | V | 0x23F3E14336CF6AA441386FE2C36D4E05 ; MKBv37/FindVUK 0.96 -0xBB59CBF4281273C6E44B822597A4FFB8D65A8747 = DRESSED_TO_KILL_BD (Dressed to Kill) | V | 0x84786846661FF0D5E799733748CE08AF ; MKBv23/FindVUK 0.96 -0x736000E83B7387C92D82C8AB7726146F31605A04 = DRILLBIT_TAYLOR | V | 0x3906B7F738B029FA56285C2A544C45F8 -0xACB5C973DF99FB8739DFE0DD2010CCEF0740D467 = Drive | V | 0x6FD1389824F05D82230AB58CFDC18D10 -0xCFE99499084E0BD4674DCB75A2FA7AA39A3625D0 = DRIVE (Drive - Blu-rayâ„¢) | V | 0xBAE1C2EDA400A7672EDA325A39312712 ; MKBv27/FindVUK 0.99 -0xC1590C61324391777451432644CA685E49F1E932 = DRIVE (Drive) | V | 0xBF4286E06432BFE4FECFE9E362460810 ; MKBv31/FindVUK 0.96 -0x3FE6CA2E3ED12D8C301B61B524EC282DABDEE2D7 = Drive Angry 3D NL | V | 0xF26C9D1A90DFC9C10FE5183C29F05487 -0x7AF87BE8F6BE2415D407D0901A64164083F4376C = DRIVE HARD (DRIVE HARD) | V | 0x86D9157F9BD6B5E8A6F8401D594D21DA ; MKBv46/FindVUK 0.94 -0x0026643159053E0B98AF85C1FC664EB2A83E7820 = DRIVE_ANGRY (Drive Angry) | V | 0x59B4DD92E83288F1C601FE3F916D75FC ; MKBv19/FindVUK 0.91 -0x51E81FF831A7EF8E3179151C45AEFAACD86324D0 = DRNO_F1 (Dr. No) | V | 0x80097065FA7A8E03D788FDBD8D6158DD ; MKBv8/BD+/FindVUK 0.96 -0x3B4C173A375D65B5098C51EB111EDBCA13B632AE = DRNO_F1 (Dr. No) | V | 0x055E44867B8A0ED0B6634ED5B0E52DBA ; MKBv8/BD+/FindVUK 1.00 -0x313B7D6F356A540BB568289AC37743E9A7A88CF9 = DRNO_F1 (Dr. No) | V | 0x9070D312F31B246DF536F48CF81A0F1C ; MKBv8/BD+/FindVUK 1.00 -0x738EFA03AB05AC4779776BCA544C2C9C86AB9FDE = DRNO_F4 (Dr. No) | V | 0x39C45B10038D49E9A9549FA45B798700 ; MKBv10/BD+/FindVUK 0.91 -0x4DCC0746A04A099F3D060B18B3D5236C2023DCF8 = DRNO_F6 | V | 0xEED8DDB6316D987EC91896F35FF2FCA4 -0x7FBB40E6B682D140A32266831B91C663E9513184 = DROPZONE | V | 0xA62D268B0410AD4ED8B32D2979E690F4 -0x315C9B4E629D880E83216E905FB4524516A4249E = DRWHO_ENDOFTIME_PART1 | V | 0x285577FB8259236D96A990E275B23B22 -0x68AE583CB35EEE251F39160195DD622C2DC2D8B8 = DRWHO_ENDOFTIME_PART2 | V | 0x23CB3AE5157255757138277F7139D8C8 -0xDAE9113C1C89710C54037F606FB96BE4CA1D6C4E = DRWHO_PLANETOFTH0xEDEAD | V | 0xEA76D44F98AE61C1D24EB1F22A68C73A -0x0C8EF1E79CD80B80617588058D7B57BFFFCCD2DE = DRWHO_THENEXTDOCTOR | V | 0x89668C4DB5DD87F64E798705F0E28312 -0xBC05BC4ADF61DF7A7A264727EC4C4B4528C1E238 = DRWHO_THENEXTDOCTOR | V | 0xCC76A94D5F505B08FDF0F6D11BB96F07 -0x82073CB71220FAF966FCC3775A44B2C023D67D06 = DRWHO_WATERSOFMARS | V | 0x9C6F61CFD30670A8E91FEF77A079AFE2 -0x7992A32CD3EEF490D620D9A4E26235586723555F = DRWHO_WATERSOFMARS | V | 0x65FB715010FB8347E823D88AC37639D2 -0x3077121CD3984A2374534F5E250EA85DDD737FB7 = DR_HORRIBLES_SINGALONG_BLOG | V | 0x016BB7AA0672BD4DF63A4E1C2FAE4FD7 ; MKBv16/FindVUK 1.00 -0x5053CB7AB22D4EE6D4312016643B6664199AE633 = DR_NO_BD (Dr. No) | V | 0x2C7D74A2DB4D39A44509B55AC2884C39 ; MKBv8/BD+/FindVUK 0.99 -0x9C3A016C6BB0381D26EC3AA04AB555F3A0BA85AE = DR_NO_BD (Dr. No) | V | 0x9749D052A363E44758632802669B903D ; MKBv8/BD+/FindVUK 0.96 -0xD12570DEA913A975F237CEC912E7C068C50C31BF = DR_PARNASSUS | V | 0x2C91C26BD0CBBC6328C045EB32CBE45D ; mkbv16 -0x9AC974F405F36891EF5A622D09A5B76EF9FE746B = DR_STRANGE | V | 0x1117AB40D715CA20D9FC93617C2BC074 -0x0E17C026F6B2147AB5FCE5B448D800E63FBE648B = DR_STRANGELOVE | V | 0xE356B02382167F2F1718E53140CCBCD5 -0xC40E9E3F52A7F5FC8A71807ECFEDA6CF5B2A7A71 = DR_STRANGELOVE (Dr. Strangelove - Blu-ra | V | 0x6DB5C7F8E8C33D653A2900D9C74E7D3E ; MKBv12/FindVUK 1.00 -0xBD45F9291AE4EE82D4EA09346ED29335EA4B6C98 = DR_STRANGELOVE (Dr. Strangelove - Blu-ra | V | 0x8FBE762AC0477FDB0C494ECAF21C6B70 ; MKBv12/FindVUK 1.02 -0x8AD341617DD027BD58093AE472B46A37769E3C51 = DR_WHO_S6_SE_D1 (Doctor Who Series 6 Spe | V | 0xDEA0FBBEA601E0AA647AA001B3C29A57 ; MKBv25/FindVUK 0.89 -0xB6384D74131B07809B6ABB3AFD4AAD767D3E729A = DR_WHO_S6_SE_D2 (Doctor Who Series 6 Spe | V | 0x79EC1DB1E736F2FC4888E18FCC2274D3 ; MKBv25/FindVUK 0.89 -0x38F39E3E683945CA32E263CCA111F92D235D36C5 = DR_WHO_S6_SE_D3 (Doctor Who Series 6 Spe | V | 0xA1201BDD9195BA151BB34B9F6A73DCD4 ; MKBv25/FindVUK 0.89 -0x4430B6D494BB898229F4AFBBA697F8641764A71D = DR_WHO_S6_SE_D4 (Doctor Who Series 6 Spe | V | 0x7FB6674D3F514D44466AF10FF25C725A ; MKBv25/FindVUK 0.89 -0xB6C5977557F58FAA6FF7B75454997EB635BEAA58 = DR_WHO_S7_SE_D1 (Doctor Who Series 7 Spe | V | 0xCD65D169F726EE8A88262D618E1613F0 ; MKBv40/FindVUK 0.96 -0x5CE07E105DFAC4FDF1048164E4C53B65BB6DEE9C = DR_WHO_S7_SE_D2 (Doctor Who Series 7 Spe | V | 0x8894C289E795E49DFE2D98AEFD63B4B8 ; MKBv40/FindVUK 0.96 -0x64D600BC34FB8A2FCC58C527955BE3C188E3D933 = DR_WHO_S7_SE_D3 (Doctor Who Series 7 Spe | V | 0x4A5C8DDD22D6F7FD7A4D1A4176277561 ; MKBv40/FindVUK 0.96 -0x4A66679D2E9589B1B9A0C2F255B37D9857AB738D = DR_WHO_S7_SE_D4 (Doctor Who Series 7 Spe | V | 0x4257734E6CDFD260548ECB1E9F196A86 ; MKBv40/FindVUK 0.96 -0x31A869C79CE7759E9274C36DCE1BEA12CB7553D4 = DR_WHO_S7_SE_D5 (Doctor Who Series 7 Spe | V | 0xAC3C5401B411974DBC231DAD1B4E6C16 ; MKBv40/FindVUK 0.96 -0x9E30D0DDEC026596BD3D8709760E5EE390EE18D7 = DR_WHO_SERIES_5_VOL_1 | V | 0x47E3ACA6DBC65BD48D677C7B7CBDAC70 -0xC7A28A049D1E65AB49DB6067780A6421D67D8E86 = DR_WHO_SERIES_5_VOL_2 | V | 0x9856793CDF005E5242779ACC2831B8DC -0xCC5F4BC7B121F7044267937C1D6E9F4EEF9A7810 = DR_WHO_SERIES_5_VOL_3 | V | 0x5EC24AFD994B041F5F1FAED594C6B844 -0x7C61F7F67774388B9A82D02251614B923D8B15C9 = DR_WHO_SERIES_5_VOL_4 | V | 0xEF0C3C1D47D7EB5CE11F24EB18B95656 -0xB54CDBF77F82F9E1FBF81E19BE565CE18A2FF657 = DR_WHO_SPEARHEAD_FROM_SPACE (Doctor Who | V | 0x6BA00405AB3DAB34A766EAB8580C5377 ; MKBv38/FindVUK 1.00 -0xC1BBDBA3B5879682468690A1B58BDD29C635B588 = DTOX_G51 (D-Tox) | V | 0xAF91AC72F0BBFA38D887BCDCE01F7692 ; MKBv16/FindVUK 0.96 -0xA4E490102DEF6AD35F2CDC04CAB56B7C3562637F = DTSHD_DEMO2008 | V | 0xEC87C771F6550348D788429406C2EF6E -0x5419C453EC69E7383DAA70B46AAEFA520C1059E4 = DUDE_WHERES_MY_CAR | V | 0x59F45246CB0FB80AEE4111CF8FECF960 -0xD6283195D88648731DF31999B72D775C486B3E35 = Due Date NL | V | 0xA62AED61F4FFECE9A1B53CBF43D09848 -0xA08BFEB5DA4D097F25072D63794EA45CE548D5D8 = DUE_DATE | V | 0x7F86F3FD7235EEAD4643B6140EF5941B ; MKBrev 19 - FindVUK 0.54 -0x0CB4CE6AB703EFAFEDB80BCAF8DB97C3DF079CA3 = Dumb and Dumber To | V | 0x1B26328A822AB79FFFB5007B8130402E ; mkbv52 -0xEF6B12964FEC86CBF4792A2DB3827BBA86488E05 = Dumb and Dumber To | V | 0x855FF997A7582C285735C2BA69E1036E ; MKBrev 47 -0x4D3E3F42026D962B6E698D3FCDDD927F1EB6E23B = Dumbo | V | 0x008150F5691CCC9344B065103BCE0869 -0x56528B561F42CD7846EF0CC6E2E9DE210F4132CB = DUMBO_GBR (Dumbo - Blu-ray???) | V | 0x8C446E2BBA4398272EAA9277E958AC23 ; MKBv16/FindVUK 0.94 -0x280C144BBF56E8AD31A3C92CA3A53FFA3EFDB9A6 = DUMBO_LIC1 | V | 0x7F4914B8476BD56ECE1050B35DF9ABF8 -0x820AC7C3C11FDE9F7E41EE04C0D1616DD28DAE87 = DUMBO_SCX | V | 0xE56E28B91A9FB25D2C2C08A407DC10EF -0x9EE4FCA406E618E2906F062C1303A29196F053D6 = DUMB_AND_DUMBER | V | 0x9F3DD3023B856CF0FC30D0322F737992 -0xB82E437B430080175067B4EDF8E4A94009A72CBF = DUMB_AND_DUMBER | V | 0x007350AAB2636342207B9EA002EFD22C -0x5ADA188EE4D6476CC483A53A2FDFA0A3AC6C9DBA = DUMB_AND_DUMBER_TO_UPB1 (Dumb and Dumber | V | 0xFFF62571F7BBB1F992B88C2D1A7D7355 ; MKBv47/FindVUK 0.96 -0xC3095288DA26AE452DFEF4CB6EBDC2689BEBFF8E = DUNE | V | 0xD25C06C12834CD935D7E86AD8052D74F -0x0424E6DAAE0CECF90FA73A625D5D3C3BF319A9AD = DUNE | V | 0x50DC3F65AE9FFB99FE692BC8154F366E -0x5D5BA9587EB6073F1148A2F2181EBA64F4C843C0 = DUNE | V | 0xB94E8B6AE484A141B112D0D7B5DF2C28 -0xAF8A20A79E8DF7D64CF5F9E776EB07EA1DECD2C2 = DUNE | V | 0x4A4DC40DC1D715F051A7BD04578B02BC -0xBE02631DA75BA2857BED503F1CFD61DB342C7102 = DUNE (Dune) | V | 0x0375821C0243B096694599E1A7F528DB ; MKBv16/FindVUK 1.00 -0x2EA39B384A3238E4DD4D936F53251415964EB0A2 = Dune (Dune) | V | 0x606F2ED7069DE1595BB1A36FB10E6767 ; MKBv42/FindVUK 0.96 -0xFBC58F8573E33C9B52E57017E31862249E3608D7 = DUNE (Dune) | V | 0x520737189068479569B6DFF390C7425E ; MKBv28/FindVUK 1.00 -0xFEC26ECD4CDEF471294DC147E5433F5150EF35D7 = DUNE DISC 1 | V | 0x65C9E75FBEED2094A64A048619E2CBBC ; MKBv46/FindVUK 0.96 -0x22652B2E4A39AF77548D1584AA9825E91752256D = DUNE DISC 2 | V | 0x5ADC7C4C9D49C160D505A4385A36AC3F ; MKBv46/FindVUK 0.96 -0x0E969C113847EAB79261C7E0854D8F1497470941 = DUNE_BD1_KINOFASSUNG | V | 0x9B49A08735FD7837C53160A8C1D0286C ; MKBv49/FindVUK 0.80 -0xB39B659CE59A11D930FCB3637FBCB4160C83D595 = DUNE_BD2_TVFASSUNG | V | 0x5985D162F9C6B125B10531E7F44C96C6 ; MKBv49/FindVUK 0.80 -0x4ED61D87B2C41A03EB9184AA083A6D75253CDF2C = DUNE_WARRIORS | V | 0xA5FDBFE6A8F46A0C494E4EE4106397F2 ; MKBv57/FindVUK 0.89 -0x2C22D6A65090FAB5B7A0D1D05AB8B9D15664CAC9 = DUNGEONS_AND_DRAGONS (Dungeons and Drago | V | 0x46DC156A651F7B6AC1C4B5EC83219A48 ; MKBv19/FindVUK 1.00 -0x077D66295CC9D16ECBFEA9DAE1AB6D7F2ABEF20E = DUNGEONS_AND_DRAGONS (Dungeons and Drago | V | 0x3C1B1C5C2B549DFAFB13435FF4E6AFFC ; MKBv19/FindVUK 1.00 -0x1ACBC7D4001089BBB3A9BA467ECD4C90D4666240 = DUPLICITY | V | 0x48951D79412E05D973D003E5FE394837 -0x37FCADBB266FE65088F7EDC305ECB8E24CCD6EC8 = DUPLICITY | V | 0xD0D380B016FC729209124614AEFC99AB -0x24D6F1BF9158432AE533112FDC0674662B0439A3 = DUPLICITYG51 | V | 0x61CF4EA85CA4BA498107F6A26BCDB4CE -0x566A2BD3599E27E678E9B352C95ED9E423E5EB5E = DUPLICITY_G52 | V | 0x15065EDFFA0F7BE21D601FE155B72B65 -0x44CB5E0483852DB0FCC125A8617CAC6F9A3B51C9 = DUSK MAIDEN DISC 1 | V | 0xA059E6353ACEE859AE6AB01AC2560D01 ; MKBv40/FindVUK 1.00 -0x84A7F3B94F342FD71C64092E6795DFE4A6112F7F = DUSK MAIDEN DISC 2 | V | 0x18F01290A99406B8769CDB7F2667BCB5 ; MKBv40/FindVUK 1.00 -0x7E163D8905601FF7B65731E477345939ABC26B3A = DUST DEVILS | V | 0x7B8621AFEAA3ADEF5A6E3E69227B1B40 -0xE9A4F33F169738389CAA9E5AF2C9007FEBFF3165 = DYING OF THE LIGHT (Dying of the Light - | V | 0x6CA952A10DEF0F6A704B8D94371D56AA ; MKBv51/FindVUK 1.02 -0xDDF0CA9F404921516C4D2B388C653A71697E1DA2 = Dying of the Light - NOR_SWE_FIN (Dying | V | 0x11AC4CA9B8DDE16B82521CDFC5E477BC ; MKBv52/FindVUK 0.98 -0xEDD9F6AC77EA2C8C26BFE0F7B0DFAAF2DF6A3952 = Dzielnica 13 | V | 0x9D366FB42142103CD16BB580E85E0B29 -0x06550960EA1F81C6B2549A6356B79C6700E4EA44 = D_FRAG_CS_D1 (D_FRAG_CS_D1) | V | 0xFE6FCFE52001ADBCC153F7A91215EC9C ; MKBv50/FindVUK 0.86.3 -0x6F49A1AF3A7E214759CCF5DA11FCBC01464FAA88 = D_FRAG_CS_D2 (D_Frag_CS_D2) | V | 0x80F4BEED9BB3B00ACA776F6215C8A755 ; MKBv50/FindVUK 0.86.3 -0x168F8CD9CA688F39F61D6E35E761EE42C76F9FB9 = Eagle Eye | V | 0x6209846B4BF95C66E107DFC3011F4BFF -0xCD2DE7718D96E502A71B2C79AA67AA64CADB0593 = Eagle Eye (US) | V | 0x0D51DBA90547D6570BE07D2FCF6C9B03 -0xF9443339FF0DF6C6E2EF3A7248458A9C3679EA45 = EAGLE_EYE_AC | V | 0x84F5DEFB0D3B686070E211DE075226AD -0xB9D0A24FED879D23EFF40271517136E74338B129 = EAGLE_EYE_AC | V | 0x70DB6F5BDC74B468F6A87C6D5EEB1186 -0x4A95FF3349D749321D9A985A767285AE263CC9E0 = EAGLE_EYE_AC | V | 0x011E485724A895B95ADEC60E4EE186A6 -0x3027A7029FD740875C6A76B5EC7100864C81E463 = EAGLE_EYE_AC (Eagle Eye) | V | 0xA289E6F38FC77370EB3F98BC0BB7D101 ; MKBv9/FindVUK 0.96 -0xFA4E000ABF6D297FADD55CA40CB296E6488CCE8F = EAGLE_EYE_EU | V | 0x08F481FF658504B949BB8F6CBEA3BD0D ; mkb v9 -0x30D38FED1E508240B9B3A9F72F01164BE5D21442 = EAGLE_EYE_EU (Eagle Eye) | V | 0x064B11B70444FDE55A8B792DC276DDCA ; MKBv9/FindVUK 0.96 -0x0198FCF100D2113BCFDADA41DC880BFFE725ADDA = EAGLE_EYE_EU (Eagle Eye) | V | 0xC37266B99DED82B7D76A3452B11EA09B ; MKBv9/FindVUK 0.96 -0xA272EF12C80469CDD26168A5C9C039CCC81DA148 = EAGLE_EYE_EU (Eagle Eye) | V | 0x6945A381235380BC8B6A0981EDAE6C88 ; MKBv9/FindVUK 0.95 -0x8417388FDE64857CC6707B48CE640AA2DBF3EB8B = EARLY SUMMER (Early Summer) | V | 0xF7BB5052E007884A9D27B530D5AA4E22 ; MKBv17/FindVUK 0.98 -0xC51EB4B53092BE79F924A30BC542F888B0A6EF3B = Earth | V | 0x02E836E5A54B3CEB458B74DD37DA8F96 -0x6AD6B435240D64F8202AA7B4F45EBACC668E4FE4 = EARTH | V | 0xC8DF203AC6D0862B66CA655EFB124BD3 -0x80A858AF48C667F1DB1C39B617D540C5EC3C4B08 = EARTH_BIOGRAPHY_D2_US | V | 0x92D4A9196D8FF295735C3AFC2934B81B -0x78F8BFA02D79CF0CD4B273804BEA432791B4C12A = EARTH_POTP_DISC1 | V | 0x8B098102E080C8F8E1AD9F136F85F9A7 -0x25B93D9AFAA0D311E9B149DCAD8D74FEEF14FAC7 = EARTH_POTP_DISC1 | V | 0x9E4559F9C9F857A0EAD976D92B793CEE -0x87377ABFB7AC0B001F664C587D0AB4DCA50A4C53 = EARTH_POTP_DISC1 | V | 0x1EFF1DE6EA7F763B1F6897F1F228298C ; MKBv19/FindVUK 0.80 -0x3E408F53F290BD8552E30D70C36FD4A79FD99D13 = EARTH_POTP_DISC2 | V | 0x2A2C3103F92E3000A54A3A1A359E2E3F -0xAF389F849FFE8F6B26A49E2563AFB95A239D28C8 = EARTH_TO_ECHO | V | 0x37DCB7C67C22F99A228CA54662803F8E ; MKBv50/BEE/FindVUK 0.85.3 -0x1F4F19AFE2C97891F043752982F3892BDDAA6EA1 = EARTH_US | V | 0x198BA6D244D0094056A1C929BE865646 -0x870E2DC60612E7FA7075EA066F30A4FEFCF2C0BE = EARTH_US | V | 0x20CBA27FBB02CCB3C9A06CCF35EEE2ED -0x4A06C27174C095D30B3CD0460EB9CF336C33C19D = EARTH_US | V | 0x53DFFB090E96633A2CEC752E16B427A0 ; mkbv12 -0xFD89B3C597D3EFE29EE8D396284A27C7A31D482B = EARTH_VS_FLYINGSAUCER (Earth vs. The Fly | V | 0x7F2261901366323BBC448C958902FF02 ; MKBv7/FindVUK 0.94 -0xE99553EB842D26C1317F14E1D977A5CD1CFEA3A1 = Eastbound and Down s1 d1 | V | 0x8AF0FFBA5DFE9642BEBAC6A2F9475833 ; mkbv19 -0x2744B7DC2BA057C787054BDC7A3CF5E257BC54A0 = Eastbound and Down s1 d2 | V | 0x9CE94790696CAE5419FD8EECB1E9F1CD ; mkbv19 -0x220D05A8879B550C1F69A9C9695F2C7841217BDD = Eastbound and Down s2 d1 | V | 0x440DA3C1FE33B2FC94F2AF0139CF8B9C ; mkbv19 -0xA9251432927FCEE02C9F4A77F14ED045015ED45E = Eastbound and Down s2 d2 | V | 0xCBD45054862F2D0F41E4F3692C9A009E ; mkbv19 -0xD3C3996930706631F6833C23E601CBB2940E1534 = Eastern Promises | V | 0x778D88B66D670AC70E0045BCA359FFBC ; mkbv16 -0x8B5781D344AFB2816FCFDF1B559DFAC61B7D81DA = EASTERN PROMISES | V | 0x36AD23BA2F23DEAC953B396D198664DA -0xE4DD10F0CE6823CA6D3797C66039516BBC030512 = Eastern Promises | V | 0x9C7076358D501267DA52BB200678C44A -0x2DAF4E2D49ED0DD33417F92B801BE0BF11361BB9 = EAST_IS_EAST | V | 0x3BCA4C83C11DB69A32F81A8F57B062CD -0xE83EEBCEA6399818EF3AD48F7A7E8409496DB70E = EASY A (UK) | V | 0x7C4A2436F09B5E814A8216BACC298118 -0x7B678542939DB75BEC0D71D80FF0626241B3BC5F = EASY VIRTUE | V | 0x5E2B4E5EA85FB361CF3BFB9AFB4054DE -0x5781B8CA23A7ABAF817DECA940A62459461D8ACA = EASY_A (Easy A - Blu-rayâ„¢) | V | 0x5440577BAF574ABB74A8881553339162 ; MKBv20/FindVUK 0.97 -0x95D18AF0F50AD93D56726401CF185A67D0CFC661 = EASY_RIDER | V | 0xFD4E5062F4BF6A1D31B368BE8FD2F939 -0xEDDB5DB48B76C67E4452B8B5EA1D80E6DFA8E936 = EASY_RIDER | V | 0x9C7D6A0E0751F78D9C459E8DF2391EE6 -0xE5C2295D1B85B98B507558EE196C83F41D77E6E6 = EASY_RIDER | V | 0xF0A017686DCB310A1CBE48AA8013D231 ; mkbv14 -0x634BEC99CB2E3F89912F7919EC63109F24F84071 = EASY_RIDER (Easy Rider - Blu-rayâ„¢) | V | 0x6C724CF6D546692015CF0A38FFA086F1 ; MKBv14/FindVUK 0.98 -0x2D97A1DB5D2C6E13F5CDBD5CCABC6B0D48B376CE = EASY_VIRTUE | V | 0x376458A6E59E700670FF649F4A6C4E69 -0x7E8DCA6758367D97855CD127ABF14929D7C2FFF9 = EBIRAH HORROR OF THE DEEP | V | 0x558FADC6AC5B792C24934288C47BD371 ; MKBv46/FindVUK 1.00 -0xCF0A98900A41617094C1AA5D6DAFA5ED61EDAE6D = ECHELON_CONSPIRACY | V | 0xECBE58D2F2294217AECB28C8398D2490 -0x68471B1B285B89CFD844DE35B299944AC83706C6 = ECLIPSE (ECLIPSE) | V | 0x21792DD37B19D6B5C5DCB18742771060 ; MKBv19/FindVUK 0.84 -0xA895D0C2045F96E259C43FD8B50EA4CAB00BF676 = ECO DE LA MONTA??A CVT15729 | V | 0x8F17CC685F6ABEA68135BACDEC8FB81C ; MKBv57/FindVUK 0.96 -0xC2D02BF3476193838893C8228B742EDC63A79561 = EDEN OF THE EAST KING OF EDEN | V | 0x7AC7C36013BE5AC72BC9A519982701C4 ; MKBv21/FindVUK 0.81 -0x59EAF7B6D8F009F0F7AE88902353438D39430153 = EDENOFTHEEAST_MOVIE_2 | V | 0x51D8AB69D99D8DCA58490D54A582D738 ; MKBv21/FindVUK 0.81 -0x7693CBB0ED4F6CEC1396253FC1C97996830987BC = EDEN_LAKE | V | 0x67B30CD304488B4BCD8072737E4F7D8D -0x0DCA2301912F394E98F45AB701D4949930AB3CD7 = EDEN_OF_THE_EAST_02 | V | 0x83406D4CFE41245E32D31BB4C0EC7D1C -0xD4DF5337E59B794702316C13DCFC2DBB87C44649 = EDEN_OF_THE_EAST_D1 | V | 0x4A81982C9E2ACAB12789EA3850F52EA2 ; MKBv18/aacskeys 0.4.0e -0x15FE0155C7B85C1A38EE6496DFA7F9DB042B6425 = EDEN_OF_THE_EAST_D1 (Eden of the East Di | V | 0xB87350B3C3045B261FC12F109F0F9259 ; MKBv18/FindVUK 0.92 -0x8ABED0204A53B81EB75CBCEBAD3AC6C240B7F8B4 = EDEN_OF_THE_EAST_D2 | V | 0x091756558D14631E4426A75A2EE4B752 ; MKBv18/aacskeys 0.4.0e -0xA4E3CFCEC771565A9E1BAB30338581571478D1E9 = EDEN_OF_THE_EAST_D2 (Eden of the East Di | V | 0xA3193AD27FD8DA4F13E85B519C3A56E5 ; MKBv18/FindVUK 0.92 -0xB7D0E62724489AD42893F86BD1C810283BDEBDDD = EDGAR | V | 0x7BFE42DE1DD782E4CB152F46B009038A -0x390B3B4EB33FAF4E741B0ACD0C9965D1653B40DC = EDGE OF DARKNESS | V | 0x043D6AFD2F665243C503B2B35407DD6D -0xB70344AF29E18F0E58DB43A2CBB8C8401884628C = EDGE OF DARKNESS | V | 0x2CD3EB939DEB6CFCD145044C8AED521A -0x75B01AC0F8BD5D60B1443D4856C9D6B7C40D5430 = EDGE OF DARKNESS | V | 0x638246F659F3821E4671E4A230E533C0 -0x410F1BC1448B392C5E9D18B68AD352E37E86ED8C = EDGE_OF_DARKNESS | V | 0xB52BE512CD65D7111791BB7B43EF6A0F ; mkbv16 -0x3272CE422270CB11347F197284217C78C73333F8 = EDGE_OF_TOMORROW | V | 0x476C784D4EF8F5C5C1A612ACF45C4505 ; MKBrev 47 - FindVUK 0.57 -0xA70ADEA86BF863FBBDF05DCE9126B15FF19C5350 = EDGE_OF_TOMORROW (Live Die Repeat: Edge | V | 0x8247D995E06E7E8CCF5DD2810FE12959 ; MKBv47/FindVUK 1.02 -0x40EB9081EFD48BE748259D0A0E76DAF61BB9923F = EDGE_OF_TOMORROW (Live Die Repeat: Edge | V | 0x3F0DAE5FB637CA93C858262A890EC9CC ; MKBv47/FindVUK 1.00 -0xCD556EDEF01757879B2780E76D4ABCD17FC4021E = EDGE_OF_TOMORROW (Live Die Repeat: Edge | V | 0x2E526B685D5FF36923F95B55B0C1C300 ; MKBv47/FindVUK 1.00 -0x22343D0AC00CD083746EABB68246E080E3F0A34D = EDGE_OF_TOMORROW (Live Die Repeat: Edge | V | 0x5F87533EBC0C9636ED457CD0507A7F9C ; MKBv46/FindVUK 0.87 -0xFF884658A7BFB47AD6A6708054CB005392430F31 = EDGE_OF_TOMORROW (Live Die Repeat: Edge | V | 0x6DB6315AA9D818EB7F56D744D85338DC ; MKBv46/FindVUK 0.87 -0x71C4708BB35DB418FBB43476159BF4A473B6BD4F = EDGE_OF_TOMORROW (Live Die Repeat: Edge | V | 0x28F1AF3EDE1AE6E94C9A9236D66D1138 ; MKBv47/FindVUK 0.94 -0x74F60FE8DB27E400B1C5B0369B3EA0E114E13F30 = EDGE_OF_TOMORROW (Live Die Repeat: Edge | V | 0x716D16712EDC39F130095A0325F8379B ; MKBv47/FindVUK 1.00 -0x302A0E07E80423A2D20C1C06A24A85B991D1A399 = edward scissorhands | V | 0x49CFFBC301F9705209FA291217EF1051 -0x66F4EB1B313963BA1654135801D981D51B719BD7 = EF MEMORIES DISC 1 | V | 0x15524F7B76D5F4CE26A8CD7B26319AF6 ; MKBv28/aacskeys 0.4.0e -0x58CD16317641CDF3C7CC5ED78169FC88B761CA85 = EF MEMORIES DISC 2 | V | 0x13F894CF7C57CB19A5159C9FE9AFFE59 ; MKBv28/aacskeys 0.4.0e -0x33478FE4127D4470154F3B04D5AE5FECAB80E673 = EIGA_K_ON (映画「けいおん！」) | V | 0xB9AAC1128BAD64827E80D81089084998 ; MKBv31/FindVUK 1.00 -0x5052E3D55E73B919D70BDCBB871D16CCAD6F3A59 = Ein Braeutigam zu viel (Ein Braeutigam z | V | 0x4D2003746777784D32C2317ABD97BE1F ; MKBv54/FindVUK 1.00 -0xF8A41A795C302357DCD8135C618AB3DB27D85F71 = EIN RISKANTER PLAN (Ein riskanter Plan) | V | 0xF2ACA15853133C5ED80D9466A8AF8A87 ; MKBv31/FindVUK 0.91 -0x2363128AE7727820C1C8D2F536ADEBABFCC8F639 = EINE FAUST GEHT NACH WESTEN (Eine Faust | V | 0x23CA99BC78CEE020C791A66A8DDDEA81 ; MKBv54/FindVUK 1.00 -0xC88CCAD2696D66855A036C34FB21A44C34710FA9 = EINE PRINZESSIN ZU WEIHNACHTEN | V | 0xAAB16906949231969D0DF85A4F582A90 ; MKBv35/BEE/FindVUK 0.92 -0x62706B88D9589C907329E0E49EE38F81740501FA = EINEINHALB_RITTER | V | 0xE25FF94CD4DA9BA8275636B0C3A29946 -0x7BAB58EC4E8A4AE8D72148F9A170F0F1265C2BA7 = EINMAL IST KEINMAL (EINMAL IST KEINMAL) | V | 0xA1BEAE928980929EF91D02D04D069A57 ; MKBv33/FindVUK 0.92 -0x40313F5E67C2E1F0740AAA51456A362F616D97F7 = Eksperimentet | V | 0xD736A382A46FCCBE69A46E42433CDDE6 -0xF0D864226C9481B2A8805CBC8D8CA47A24048DE5 = EL CRISTAL OSCURO (ESP) | V | 0x49113B189A11580B1ED70EAD6818B5F6 ; mkbv14 -0x6170726910EA80F15E4CB1715390E80C644E9D75 = El Extra????o Mundo De Jack | V | 0x572ED51D4461846A495D8AC34EA77591 -0x1276C7356D662E0E09D17191AF991554ABE53730 = El luchador | V | 0x89A1170EE311AF9F18B36B2376DE1469 -0xFD251DA60A6C3CCE3834C6EFF091C1F18632A4FE = EL MAQUINISTA (ESP) | V | 0xAB8FF725EB7AFC7A2854E24C7E3F183D ; mkbv9 -0x3510399BC3895DA4AD86B2DDF772747C9E79D75B = EL NINO Y LA BESTIA | V | 0x1D2981D2193B5A0EB7D081DFD99228B6 ; MKBv61/FindVUK 1.00 -0xDB6C073C2DF1C244DFB3FFF907361336C82A8BE4 = El Orfanato (DK) | V | 0x0EF95D702BDD91173C1B3010507E2F11 -0xB1190955F832CA7C44DF9C17D16F32508F41FE52 = EL SARGENTO DE HERRO (ESP) | V | 0xC91C0A607DC9E3CACCA680B024071FEA ; mkbv16 -0x2607D6B2BFE4EFE102D95486F00B13BE2A81E5B2 = EL TOPO | V | 0x8FFE3897E2E82CF1B408E029A445F98A ; MKBv44/FindVUK 1.00 -0x24AADA167F8C01DFF685AB13F35C9DC64D4EDA9F = EL ULTIMO MOHICANO | V | 0xFBA214B9FA44054D435C4DE86C64E76A ; MKBv31/FindVUK 1.02 -0xF52E3640E09EA0740E433625A673A207CDAA2A5D = ELAGUAYLAVIDA | V | 0x0A1F6C7A08C746F65ECDA762659B2B78 -0x4BC941827A4C211B9029DA6C5A62073D2D312086 = ELAGUAYLAVIDA | V | 0x8BDE9D9F94621D6C6108FD533A17A77F -0x48BFA22918A0AD24AAFC9BD7952F6C2E9110314E = ELAGUAYLAVIDA | V | 0x38C2E385D816433EC9E13C9674363726 -0xCD7C9341409C483E1FFBBEF4C62387E3514EE129 = ELAGUAYLAVIDA | V | 0x26160F5AE34E4CBAF685AA08EBF9610D -0xC0198879760C4660E02A594978F4E0D9DB63101B = ELAGUAYLAVIDA | V | 0x677F4FAD9CCBCD68A6F6E11C38FFA9E9 -0x56E7A4CF8F17E11E9A8B796F6B806259AF7DD1C7 = ELECTION | V | 0xE1ED9F58FE457022BDBAF5E82D9438CE -0x716DB767B467936015AD887CB9ADE8CDC0077AE0 = Elegy | V | 0x557BB5DD5A6A4CA8C8E9CC356B5AE5EC -0xE61C9079C6C18FFBD99CE5216D3759947A6146DF = ELEKTRA | V | 0xEC0DE4394166D904203CF624E600349F -0x35E275DFFD40545EDFB662460FC8ABC2D0B9867C = ELEKTRAF3 | V | 0x874FA32760079DAABEB7D659D22BD26E -0x19ABB4ECAF0075DBC5783676D8C7B54ADFBBCE1B = ELEKTRAF3 | V | 0x13C5009B9B9611448BE00BFB53BB41C7 -0x1CB03F5E128466F29AF5BC3B63EB9E51018A115D = ELF | V | 0x836500A64FF5D08DA7BCF9B34823F321 -0xC9AA84A602AA02CED2789DF0CF44A936FDE1629C = ELFEN LIED 1 | V | 0x226454E90E1B8CBCA9C01FF9CBEBBD07 ; MKBv40/FindVUK 1.02 -0x462BBE0ECBD7A2F1174C1F7A97232B19FC08A2D1 = ELFEN LIED 1 | V | 0x835B6603DF90E85B994787A11006C59E ; MKBv40/FindVUK 0.92 -0x2BE5ED816E87F1DBA5384BD06AF352B4B244C754 = Elfen Lied 1 | V | 0xEC3BB8B3E44A088B3D9AF1B8EBE3DD8A ; MKBv40/FindVUK 0.80 -0xF331DEB798EC507880826D8F9D247880ECD37A06 = Elfen Lied 2 | V | 0x9710B4AC8E7AC98DC1A6B98374C03E6C ; MKBv40/FindVUK 0.80 -0xCEB085FA7C63692C6F67891E0C78211F808804BD = ELFEN LIED 2 | V | 0x8CA66FAE8D4339F3BE75EB1522B7305C ; MKBv40/FindVUK 1.02 -0x4B9B163427C0C19D1EEB55CD54E6F662AB7A10B7 = ELFEN LIED 2 | V | 0x71C7AB5073333600EC26E3E7627FDE72 ; MKBv40/FindVUK 0.92 -0x57D45553284625FC4B670388F7A17E6AFA35632A = ELFEN LIED BD1 (ELFEN LIED BD1) | V | 0xD641C5F38BBC06A07282D25E9B65BD1C ; MKBv51/FindVUK 0.98 -0xE0EE475E8DCD7EBABACE93C35A0C6FD43C99B87B = ELFEN LIED BD2 (ELFEN LIED BD2) | V | 0x19CA6C7A315DB13AF7F3277861291AB9 ; MKBv54/FindVUK 0.98 -0x742AD521AD198BE933FC9F5755960348115D676A = ELFEN LIED BD2 (ELFEN LIED BD2) | V | 0x6855C9F283B1C10F795A3D7CEB4057BE ; MKBv51/FindVUK 0.98 -0x2CE94DEA1899589F79EC3E65AFE9D4265E3F5674 = ELITE_SQUAD | V | 0x60E42C31DD837CE5CB46845D50DCAE53 -0x28633C40B9608D9622E746221EDD74CC4D25BE89 = ELITE_SQUAD (Elite Squad) | V | 0x6431459E7F946CFD9153A4D4355AF935 ; MKBv9/FindVUK 0.98 -0x7BE3B4164345FC5A4A968F796973621DBFD1D600 = ELIZABETH | V | 0xDCC7C4224B39C4B5ED35A7FC25AA0664 -0xB10150C092DF76CC78EA854E01CA764347B2781C = ELIZABETH_GA_GLO | V | 0x0957FCF3AB1547B9CE4B20B41F951CCD -0x98FA867DE03BD7CCCAD4448299BF5986024DA48E = ELIZABETH_GA_GLO | V | 0xAB1C427F32D2DEC4754F4EF162CBAD91 -0xBE91DA487CB7CA427A3AE410522E5BFE42FD53CA = ELIZABETH_GLO | V | 0x5140935EF09B8B239C82FCA355E9B88F -0xEB17C86D343A1C7F3DDFD56BB82F70CF5C77508F = ELM_STREET_4_5 | V | 0x9C09932CB3BE914D8F704CAF94E63DCB ; MKBv25/FindVUK 0.80 -0xC7978EB22C0AB891D66B023FA7D95E7044A5BB49 = ELM_STREET_6_7 | V | 0xFC8F7BE5BD2A9A99CD441DB96D3B00AD ; MKBv20/FindVUK 0.80 -0x7008741B04B42BB9E014C10E64829AEE7297A3FE = ELOISE (Eloise) | V | 0x1B9BAFA5F74F07FE6F42F2E1A49312D0 ; MKBv62/FindVUK 1.02 -0xDADB33C8EBD15208BEDFD3571A8995953085C99F = ELTON_60 | V | 0x99F7CBD3ACF22E12D4ADBA597DFF777D ; MKBv4/FindVUK 0.96 -0xEEC9544B8260D6D672F9100A67AE665C1AC930C4 = ELTON_60 | V | 0x85D8A4D9BA96833111ED56419310E51D -0xFFAF2519943D3FD18929C714B7BD0AA2B7D257C3 = ELTON_JOHN | V | 0xAD1ECB74DEA0518139FB1C4587FCA7B2 -0x41010C32A3ECBE25BAF41005F1F43109CB769C43 = ELYSIUM | V | 0x75A12A09C8A1102B8967F2FD0B5EC85E ; manuell -0xBEACAF28ED07FE30698D8DE15C8171200C0E101E = Elysium | V | 0x4BB3F3D20A3C422E1C2B4A06CFE1D66C ; MKBrev 43 - FindVUK 0.54 -0xFA15F4820ADC7AAE8E8532CA4E6C33938C147953 = Elysium (Elysium ??? Blu-ray???) | V | 0x60DDA4486791FEAF2E6CC379D4134FE6 ; MKBv53/FindVUK 0.96 -0xD01C1C991F425DCE9A036909A4269B1FC74D262C = Elysium (Elysium – Blu-rayâ„¢) | V | 0x42D4F87800898D49CCA6E161961238D6 ; MKBv43/FindVUK 1.00 -0x964446ABD0751808A5745A7EDF6D36D09FB35F91 = El_Buen_Ladron (El_Buen_Ladron) | V | 0xD5941F7F0F5BA69965C3345F75CFA827 ; MKBv50/FindVUK 1.00 -0x78B3CDEA828C94E42842B5BBEB3ABFFFD712C13F = El_Camino_de_la_Traicion (El_Camino_de_l | V | 0xADC42742CFBC630C3AACBCFCB8EC0D14 ; MKBv50/FindVUK 1.00 -0x65C02A721B0A6711EDB097FD687F728C93D34154 = EL_NORTE | V | 0xBB6646A865F688F6E75E1675A082D3DE -0xC8C4D55C0A106A221478E2C578AA5EDC8B847745 = EL_NORTE | V | 0xC27EB6A777BEF7BC1F1943FF9E769713 -0xF87D5B37C16F83AD2BA3869ADC76101F557A23DA = EL_SUPERBEASTO | V | 0x298D27C96761BDFCF6DDB6A13773ED91 -0x9B4196B666FC823A65D04FFD0C10A9F54AC8435C = EMIGRANTS_THE (THE EMIGRANTS) | V | 0xA913037E97C13E1869ADD0A69EF0DE9D ; MKBv57/FindVUK 0.96 -0xB09A5C16CCF3FF3C0F0963BE39B6FD6704FFC20B = EMMA (EMMA) | V | 0x8BEE7EF1DDE4BB5A36654BE9C1D2F6EC ; MKBv17/FindVUK 1.00 -0xFBB3566EFDE2FA9FD1FC79A3C2CF3809605BF7DA = EMPEROR_BD (Emperor - Blu-ray???) | V | 0x5B3B6F51F5732B9650248B2FD735F47C ; MKBv34/FindVUK 0.96 -0x4E814FC1546761CAE060AF262FFE35224E920C88 = EMPIRE_STRIKES_BACK (The Empire Strikes | V | 0xF00E897B35D0C8B316A2A97BCEC18D96 ; MKBv19/BD+/FindVUK 0.96 -0x0AEC237BE41201C8051533618ACB0E5545BA4566 = EMPIRE_STRIKES_BACK (The Empire Strikes | V | 0x2E3D64C300ABB989667B2C6CCA1ED0E5 ; MKBv19/BD+/FindVUK 1.00 -0x03BF797193A7E10D12EFEF471DCBD4CE363229F7 = EMPIRE_STRIKES_BACK (The Empire Strikes | V | 0x5EC780CE2C30C6372D46B79331B73D50 ; MKBv19/BD+/FindVUK 1.02 -0x4BA362F695350992F8FD1593F073FDC2359A6CE6 = EMPIRE_STRIKES_BACK (The Empire Strikes | V | 0xA2C1BEEB2BE1809DBCB1292DE37320C5 ; MKBv20/BD+/FindVUK 1.02 -0x5B34036DBEAB4E6C6F15A0F069AFFEA3D8AAE6ED = EMPIRE_STRIKES_BACK (The Empire Strikes | V | 0x504D3FFF4340F3AD6049D3B069BD3C94 ; MKBv19/BD+/FindVUK 1.02 -0xEE13EEADB49F2B7A81CA6A39C12764BB3DFC305B = EMPIRE_STRIKES_BACK (The Empire Strikes | V | 0x412B844F34EBEDC01819924A59D8FE52 ; MKBv19/BD+/FindVUK 0.99 -0x6C3F041CCB03C1EECB4A01B385EF909AAD236AAB = EMPORERANDTHEWHITESNAKE (Emperor And The | V | 0x5346A08CED9647BF640060F8FB66EE37 ; MKBv28/FindVUK 0.84 -0x0549E31CBBBF855FF070A54C1544CDC08219D742 = Empress and the warriors | V | 0x8F19F0CEEE059870C7D5A44307004420 -0x8C9D5B2F789E32FE32E2634F845850A747FF4C5B = EMPRESSES_IN_THE_PALACE_DISC1 (Empresses | V | 0x969DF58E9E9CC6965028C01D9938ABBA ; MKBv37/FindVUK 1.00 -0xC7728D3355981EFC3486CDA57D88FF6E3B67B016 = EMPRESSES_IN_THE_PALACE_DISC10 (Empresse | V | 0xDB25FB55EAD3FA73515ECDA8CEC770F8 ; MKBv37/FindVUK 1.00 -0xE174A39535851939443191C4BC68C48203E04BFE = EMPRESSES_IN_THE_PALACE_DISC2 (Empresses | V | 0x388586FC2C6D5EA28FE31D6EE77056E8 ; MKBv37/FindVUK 1.00 -0x3594431F39C84180FEF73351FF2C518FAEDC9AE6 = EMPRESSES_IN_THE_PALACE_DISC3 (Empresses | V | 0xD4EFDBF956B39E3F3B9EACB93023126C ; MKBv37/FindVUK 1.00 -0x0E2CB999CD48AEAFEA3741256241A139295A2C0D = EMPRESSES_IN_THE_PALACE_DISC4 (Empresses | V | 0xDE1B306DE8A33669E65F9AD312FE6CEF ; MKBv37/FindVUK 1.00 -0xEE9F7E23C0FF29A39CEBF1663E96654E43EBCBF9 = EMPRESSES_IN_THE_PALACE_DISC5 (Empresses | V | 0xBFB37D48AF73E300AF5D16F0FAF0BDCD ; MKBv37/FindVUK 1.00 -0x1328C764636C8E48427C55A739F29BE1BC773371 = EMPRESSES_IN_THE_PALACE_DISC6 (Empresses | V | 0xE2094EA44EE4419E6BA3278BACFA3B38 ; MKBv37/FindVUK 1.00 -0x61EAB0824A56FBF1786A52466FB8FE38DEA7DDC0 = EMPRESSES_IN_THE_PALACE_DISC7 (Empresses | V | 0xF8C65E944E0613ABBEF23244DD07C3FD ; MKBv37/FindVUK 1.00 -0x1D39D49E3797808D2AA4A6CEE52EDAE596FDC667 = EMPRESSES_IN_THE_PALACE_DISC8 (Empresses | V | 0x24F152A30E96D9F9A31AA84A7040FDCA ; MKBv37/FindVUK 1.00 -0xC530F9EF6FDEA342ED730111E76487B834632BB7 = EMPRESSES_IN_THE_PALACE_DISC9 (Empresses | V | 0x69511747505380E2997B794508C09EFF ; MKBv37/FindVUK 1.00 -0xF598C85D3F3DB8AD55CA4CCFF61E4A4183A824CE = EN MAN SOM HETER OVE | V | 0xE5B5EBAA88EF82BEE6B40847C998C39E ; MKBv60/FindVUK 0.98 -0x15E7023B1E1CC980A477E62470D49AD79F364CFD = ENCHANTED | V | 0x9CC54F067D33EEC215DB0F6250110662 -0xA101AE3B4AB11354FF003DB930217E96758D89B6 = ENCHANTED | V | 0xF33C7C820357E607D0F9DCF15646FA75 -0x3A6AA6627901FD4FFC86E7B4B36B4238B599F0AB = ENCHANTED | V | 0x3F1E185E18E6CC9FCA4B356ADD893B9A -0xB98791F0F3F49709611E3F217ECD86BBBFB4AFE3 = End Of Days (1999) BD | V | 0x6FABD876B1ACBCECD69DAFAB7E5F315D -0x892E0CE59DC72E4A1E749E208E0647DB53F4899F = ENDER'S_GAME | V | 0x04699B2534D5FE2929321934B1FAEF1F ; MKBv40/FindVUK 0.80 -0x6280F525AC2D0CE425BF61CCB86C71C71001B62F = ENDERS_GAME | V | 0xBB49335FE3D1A5F2BFA3125B0D4900A7 ; MKBrev 44 - FindVUK 0.51 -0xBD6ED1C005020A7123F7D6919573DF5E93AD075D = ENDERS_GAME (Ender s Game - Blu-rayâ„¢) | V | 0x0D4A0E6166FB12DAAC1293C710CF466E ; MKBv44/FindVUK 1.00 -0x2E12771430568A9C4874B3FA306A04A70B6CAB1F = END_OF_THE_TOUR (The End of the Tour - B | V | 0xB03519F1B60AE20BB80FB0137013C155 ; MKBv55/BEE/FindVUK 0.83 -0x071E35458500F1222F000588412E47CDD05EB94E = END_OF_WATCH (End Of Watch) | V | 0x40360B40E1A113C47CA120A1039319C9 ; MKBv34/FindVUK 0.84 -0xC8E8FFCA0C905A5CC86C7F30812AA5EB34A95C55 = Enemy | V | 0x6410480407BD80C9F4EAE3F5A5D11ED9 ; MKBv47/FindVUK 1.00 -0xB0483B14B7F38A1951AFF489214782AB29A8F909 = Enemy at the Gates | V | 0x4F5B061936953FF377CF2A8AFB301646 -0xA58CAA2A42FACA520E18B8F935794FB12CC315E2 = Enemy of the State | V | 0xD1847BAA90C776DC1461DA45F16A2860 -0x00A89491DC76C1A704A4C0F8A78A070333ECB50C = ENEMY_AT_THE_GATES | V | 0xB313C4534C54044E50AB8127A687732C -0xC4DC3D2137B556838E8589CCDB8DB9F28C68B45F = ENEMY_AT_THE_GATES (Enemy at the Gates) | V | 0xAFC798B424616B7099BA8583751B46FC ; MKBv12/FindVUK 0.96 -0x3F8C7ACE5A8CE557E04FCE2CB062C9352C1230A8 = ENFORCER_WW | V | 0xC450A4A26DA83ED9930DC34BA3365DF8 ; MKBv7/FindVUK 0.96 -0x33CD4E6758B2BBB10F552CCD0BF9D1350854C497 = ENFORCER_WW | V | 0xCBA7E167CFF73FCFB6EA267EFEF07DAC ; MKBv7/FindVUK 0.96 -0xC1B398E160B8766C68339C31C129A1CEF2A2D1E4 = ENFORCER_WW | V | 0xA056C88064357A0DA242000221C1ECA3 ; MKBv7/FindVUK 0.96 -0x7C7C78AE861793C878651055FF69D326482C5C1C = ENFORCER_WW | V | 0x452F160B8FA94C304C99DD7C8E25B534 ; MKBv7/FindVUK 1.02 -0x7F7B7CDAC81A3082F8BBA8FDBFF827BC72F291F5 = ENFORCER_WW | V | 0x7024F3E0C67387A67C53B25AB986AAEC ; MKBv7/FindVUK 0.98 -0xAC42F82FDDD3778AD0723E1F054BBAFD9B6A3062 = ENFORCER_WW | V | 0x236C8D8208C8C6FE9F0EA289501EC095 ; MKBv7/FindVUK 0.98 -0x7B1AF534E7A382C7746C25D776AD797DCB536C42 = ENOUGH_SAID (Enough Said) | V | 0xA45AC91ADA8411A3191FA2241EF164AA ; MKBv39/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0x858F4637F93B1CF5AC4A2B01276FCA7E2B1B2141 = ENTERPRISE S2 D5 (Star Trek: Enterprise | V | 0x7CA1A33C6C4347550B289D461A340077 ; MKBv36/FindVUK 1.00 -0x5758664ADD7B3B19B04E93F3F4CEF7D44CDEA068 = ENTER_THE_DRAGON | V | 0x2A4203830722226C3B847889D7CB6B32 ; MKBv3/FindVUK 1.00 -0xCB538006B273CA4CF48B6C34E19818E8132D40EF = ENTOURAGE_S6_DISC1 | V | 0xA8D61500C6673C3B77C09B8E4DFD5996 -0x2550C4EFEB91C7DADCD6EFB2EAFD0EA86509FA29 = ENTOURAGE_S6_DISC1 | V | 0x4123A9BAB83A1E994DF966D1848E7A8A -0x7C49255E5B03C2867A51F3A6140956187A792160 = ENTOURAGE_S6_DISC2 | V | 0x52739B0CA287E9BCAE4B3FD363BF50E2 -0x8E8A1B86BC500A98403EA9A301FE497789177178 = ENTOURAGE_S6_DISC2 | V | 0xF2FFBE610EDD07DD61F2A824B220E452 -0x3F1704EE1A5C2865A604117F980B3EDDAAC5E8F2 = ENTOURAGE_S6_DISC3 | V | 0x19BB7289F070E7144AC89552B905D536 -0xE42C2C7EFF35FFF7C2674D26B09708A5804162E0 = ENTRAPMENT | V | 0xFF75E1AB66263BEF4BEC37E9E20D0268 ; MKBv31/FindVUK 0.91 -0xB6E73F514590E9A8069EA83EFB72F938B09624CA = ENVOYES_TRES_SPECIAUX | V | 0xC9591EF03F204A03BB01CEE620FAA9DE -0x082286795AB4FD3C349855233319AA6EF2718D51 = EOM | V | 0x68C58B5362FF543F6CA4981C0F021CDF -0x3B0D0DCFE1EA39582574281930E4918556170633 = EPIC | V | 0x55E43AD9F5DBC76ED7FC7E2E5F355CA7 ; MKBv36/BD+/FindVUK 0.80 -0x2ED60FB8E9D74FD73D3BC4766FD6B59EA4FDB1A3 = EPIC | V | 0x1D86E2E898C57314B0B08DE7065778E8 ; MKBv35/BD+/FindVUK 0.84 -0x5F72973DF6711D178032D9198F1CFB69CD61A67E = EPIC (Epic) | V | 0x3AA92550AFCB7CBB17BE07A27405C005 ; MKBv35/BD+/FindVUK 0.87 -0x752BA7F88E827A4CCBF44D97CAA0ACE21002456B = EPIC (Epic) | V | 0xFB3DBF9B4A0D5BFB88E50AB942813F76 ; MKBv35/BD+/FindVUK 0.92 -0x94E9E19C8431C5F9B03F18E090C42E3EA5F8B279 = EPIC_3D (Epic 3D) | V | 0x8321FEB6006C4708F61E4AD1F8DB95B5 ; MKBv31/BD+/FindVUK 0.87 -0x2B771E49A9879C1B268AC533F2ECFDBCC5A6CB23 = EPPU NORMAALI RATINA 2016 (Eppu Normaali Ratina 2016) | V | 0x677BB46923134A9AF4BFE649C66BB67F ; MKBv62/BEE/VUKNOTVAL!/FindVUK 1.00 -0x3BAF8AFC89CE5209FDF0F138DAFFC38CAECDD19C = Equalizer 2000 | V | 0x15B0067A573D073BEBB3C2C6C0567970 ; MKBrev 52 - FindVUK 0.56 -0x056E9AB87083939A299B66F5221150DF4A9C807A = EQUILIBRIUM | V | 0xCB291C35CC4EE2229BA6ACC3C4E5DC5C ; MKBv9/FindVUK 0.80 -0x99485B5C61DD115B84D08E457651FCBC26A3C95D = Equilibrium | V | 0x05EB94FA4B6843971D6A4F09291AD481 -0xDC641699CD979126518A17CA26160CBE2E766A57 = EQUILIBRIUM (Equilibrium) | V | 0xCC40A899DC6C5EE6E7D049ABFDFDB230 ; MKBv33/FindVUK 0.91 -0x60BF8682ECEFD0355075E83C213DFABEBDE74015 = ER IST WIEDER DA (Er ist wieder da) | V | 0x61565B8D7E6D64F3E7146AB3206EB46E ; MKBv60/FindVUK 1.00 -0x7752389EEA3274AD1E6C3848D3A9A379BAE7756E = ERAGON | V | 0x4755DC588D04505F31D50CD0D8035DDE -0xE81DDB96AFF6554F52039BE57D4FECDC24E290E0 = ERBR0xD5012 | V | 0x0DE12137D46B839E9FCA208547336DD0 -0x2E6DD9470DB163F2D7524628179C2707A0F25261 = ERBR0xD5020 | V | 0x43E3BBB921EF95C84454AD7262DDF694 -0xC614F0925721AEA893F9B6665B16A806F7EFBC8F = ERBR0xD5020 | V | 0x669C336A39D037CF8210D577D34BDEE1 -0xDB47E7F2AE6C2331ED7D3CDAA2C74DD8A788116B = ERBR0xD5028 | V | 0x3DCE5B9EB80988E1BE81A8E435AB1C2C -0x49EB1F78693E0F9C089B24BBB11F3D9A32BDA70F = ERBR0xD5035 | V | 0xB25F87FF30847983C301642BE5F4A4B8 -0x41563455F8E2B19197D55DD8EED799D1FB77AE1B = ERBR0xD5059 | V | 0x4A32BF6B9AB9BE11B1D1D73A625B868B -0x49B406D1A5AC4C0EE6B4C31DBA3AA9A5D52AF91E = ERBRD5172 (HERBERT GRONEMEYER) | V | 0x83CED237122BA57015D9714DCAFA464D ; MKBv31/FindVUK 0.96 -0x224BD3458E6DFC708CC32E4FFB95E4817D953737 = ERBRD5198 (Caro Emerald In Concert) | V | 0x44AB43A1520910F0C61A1B3660111F24 ; MKBv40/FindVUK 0.94 -0xD56D0E1CF33240FBEF12B578199FABC2BA45E4B7 = ERBRD5232 (Eric Clapton) | V | 0xDA160B6003035466A17D72A1EF2176B3 ; MKBv32/FindVUK 0.89 -0x0D81D499096E2EB578BC177411A0DF7CC0B0258C = ERBRD5268 | V | 0x2802A5B9C8103DF1DC7874D2C1C0A732 ; MKBrev 55 - FindVUK 0.57 -0x29E94310F5596E9E948940656503CB58E219CB7F = ERCOLE AMANTE | V | 0xB79D7963E4A64F022B8AC9CF64243682 -0xF80150317564AD0922F3F33DDBBC8659E869985A = ERCOLE AMANTE | V | 0x5151F6398E7AE7134B071889D5922FD0 -0xBC26F109F584FBAD9063AF922F7AD9C011C7D2D3 = ERDE_VON_OBEN_D2 | V | 0x92143DE206F6B1006A329BFFEB18CC8C -0xBCF427729390244E636B0E71BE5956DBE9FBB512 = Eric Clapton and Steve Winwood : Live fr | V | 0x6827DB3A0D3D8E6AB0B7F0AC7DF35F9B -0x10B2B476BEB359542D3B8717CF71E91566561048 = ERIK DER VIKINGER (ERIK DER VIKINGER) | V | 0xD2911433D8EE4A9AC7177DD7667FCB39 ; MKBv35/FindVUK 0.96 -0xD295BCCCD0E1BD822473206A5E4517184C25F042 = Erin Brockovich | V | 0x802C3F3D7CD6C1582C17C6D3D8A7EDB8 -0xE853E85952ACDC52F98261DA681FB34D720432F4 = ERIN_BROCKOVICH | V | 0x6917632E84AEAC2A4F43AC778C588EAC -0x2D42570A049D72C0F402BC1A3D6493B1B09FBF45 = ERIN_BROCKOVICH (Erin Brockovich - Blu-r | V | 0x29B7C3E8AF4262BB1ECE7CBB75B7EF08 ; MKBv4/FindVUK 0.98 -0xDFCE37ACC35D2E10810180921279E804DD5F948B = ERNESTETCELESTINE | V | 0x782FCBD704FC779C85729C027758CE89 ; MKBrev 34 - FindVUK 0.57 -0x1981C0317A01A5102A10A38D8C5E1C52199BC5B0 = ERSBD3014 (Diana Krall) | V | 0xFE0FF26B06A281AF185741121276373B ; MKBv47/FindVUK 1.02 -0x905B5497DD6FA0E361AF836470E3695DC3268E8C = ERSBD3024 (THE ROLLING STONES) | V | 0x6DA1437E14DB8BBECD3E8AEBD1C51F17 ; MKBv61/FindVUK 0.93 -0xD6AD837FE612B879345B0F5F73DFD429027DAC31 = ERSBD3026 (THE ROLLING STONES) | V | 0x6F0679C60B85507076F69343C93D9C38 ; MKBv61/FindVUK 0.93 -0x19753F1342AC4FE880B65E1D109F7AB4EA84053B = ERSBD3027 (THE ROLLING STONES) | V | 0x316DF62409CA3E1EA75F72AC68BD0B20 ; MKBv61/FindVUK 0.93 -0xCBA7DB86B8C8534B1003D11E7A04F339E8F3FC12 = ERSBD3028 (THE ROLLING STONES) | V | 0xE7A14408C6B17288F3F8589D9B840987 ; MKBv61/FindVUK 0.93 -0x71A2F4B350593C854BCC3D4570479731F26F814E = ESCAFLOWNE | V | 0x2229AE44D84A3CDFFAD19911E9FA5CCF ; MKBv14/aacskeys 0.4.0e -0x524E9AA2EB229814C47CB2BE9829E5FB7DA3F502 = ESCAFLOWNE | V | 0x6A0B7F76D4161931BAD0A7C68F233115 ; MKBv20/FindVUK 0.98 -0xD519892E2EC77791B9126FA36051DF1A1F784C14 = ESCAPE FROM PLANET EARTH (Escape From Pl | V | 0x01B3D46CF4EB573859995AF683C00DA1 ; MKBv38/FindVUK 0.87 -0x62A2038F7EBFAE7FD2BC18631990E35AB991C2E6 = ESCAPE PLAN | V | 0x3D4F94732DAEC51028FC0DB189F673D3 ; MKBv44/FindVUK 1.00 -0xCE1F1AE9B60905999068144091B7E813705EAF43 = ESCAPE PLAN (Escape Plan) | V | 0x083A32736EE3F4C52A69CAB9CB4E7277 ; MKBv46/FindVUK 0.91 -0x4F1BCEFB1AEBDA02111D5574E7950AEAC803486F = ESCAPE_FROM_ALCATRAZ_WS (Escape from Alc | V | 0xEC78C332D5F2330F21987F7A541B8C3D ; MKBv31/FindVUK 1.00 -0x21EB6D4C2A06B732EE883587A3A16953053B205E = ESCAPE_FROM_NY | V | 0x5A785C2F2E9D500273571AF4BDF458BA ; MKBv7/FindVUK 1.00 -0xDA67A7819732F9899ACB90FD7EE3F7309C719DDC = ESCAPE_FROM_NY | V | 0x4CAF6B8A71BBF9F23D209C3009958086 -0xDFBC4FAA7D565F3FF606090156DC56C592B6636E = ESCAPE_PLAN (Escape Plan - Blu-rayâ„¢) | V | 0x31E0CBB94181A1606FC47AF7CAA53C50 ; MKBv44/FindVUK 1.00 -0xD3461508814346144E008BBF05FB55C4B3D34AA9 = ESCAPE_PLANET_APES | V | 0x56932B19E4041EBFD34A2DBF3292C780 ; MKBv9/BD+/FindVUK 0.80 -0x259954673B497AA35DFF20B17DAC1039991D7B09 = ESCAPE_PLANET_APES (Escape From The Plan | V | 0x3F859084DA696C87F68F72E2947E4785 ; MKBv9/BD+/FindVUK 0.96 -0x45BA5FAD506A94FA15BFAC0851C8BEA5191D7050 = ESPN_30_FOR_30_DISC2 (ESPN 30 FOR 30 DIS | V | 0xFEE3CDE3954F0FAF3599C0912C545CF7 ; MKBv50/FindVUK 1.00 -0xD7A795FC61CA47F6E115819B1EE0361D2B0F3458 = ESPN_30_FOR_30_DISC3 (ESPN 30 FOR 30 DIS | V | 0x83F050FAE4B25D9AE4D87908978F5EA7 ; MKBv50/FindVUK 1.00 -0x47A6F0235836E537E79AC4DEB13A51159EAE0B13 = ESPN_30_FOR_30_DISC_1 (ESPN 30 FOR 30 DI | V | 0x4FF9E16F96B6E45D7980023EC70318A6 ; MKBv50/FindVUK 1.00 -0xBED81D09B3F27F732091F35BE1CFC0F53E798D4A = ESPN_30_FOR_30_DISC_10 (ESPN 30 FOR 30 D | V | 0x0BBC763A4C4537A0C05864FF347BCE79 ; MKBv50/FindVUK 1.00 -0x0ED8C73BF628B491EBF15D3D14C7BDBDF83D975C = ESPN_30_FOR_30_DISC_11 (ESPN 30 FOR 30 D | V | 0x92515D2078D346FFBCA9B0F452D57D17 ; MKBv50/FindVUK 1.00 -0x32894E9F83F87172B162D329978550B8D4518BE1 = ESPN_30_FOR_30_DISC_12 (ESPN 30 FOR 30 D | V | 0x4765632C038229FE410231CE68CC0CFA ; MKBv50/FindVUK 1.00 -0x41E7B1B049687DAE2A8B9CE335AD0C944B787003 = ESPN_30_FOR_30_DISC_13 (ESPN 30 FOR 30 D | V | 0x991D14E08529AB394D3A9C721F5C968D ; MKBv50/FindVUK 1.00 -0x243A75C9ACB1046189586EF961472CB8A94C3019 = ESPN_30_FOR_30_DISC_14 (ESPN 30 FOR 30 D | V | 0x2F9D8157D29EC79E0B6ACF55821147BE ; MKBv50/FindVUK 1.00 -0x31176189CBD43DD6D92B293514AD3198EFDABF53 = ESPN_30_FOR_30_DISC_15 (ESPN 30 FOR 30 D | V | 0x729DAC461FBEA1E724931F05D5F7CEC3 ; MKBv50/FindVUK 1.00 -0x4395BF26CD10AF592230D41D786CE76FB32A26CE = ESPN_30_FOR_30_DISC_16 (ESPN 30 FOR 30 D | V | 0x468D0E4B2C5B4F670CC5FD108A018401 ; MKBv50/FindVUK 1.00 -0x685995226C0E50A46E1DC6BBF58AC5ECAD3533EE = ESPN_30_FOR_30_DISC_17 (ESPN 30 FOR 30 D | V | 0x432FAB477CFAD7FB4FF3FE378623F1F5 ; MKBv50/FindVUK 1.00 -0xC13FD6CCE5239A9F8AD2D7D15A96D57740D1E058 = ESPN_30_FOR_30_DISC_18 (ESPN 30 FOR 30 D | V | 0xBC3E00DE544919F2E603A80A067C647A ; MKBv50/FindVUK 1.00 -0xDC199D0B80CD37EB452B1AB88D53234CDAC33DDC = ESPN_30_FOR_30_DISC_19 (ESPN 30 FOR 30 D | V | 0x2DF52E954A10B6C150257AE9B1B4992F ; MKBv50/FindVUK 1.00 -0x307276E21784DF5CF914453DA933CA19D7F55204 = ESPN_30_FOR_30_DISC_20 (ESPN 30 FOR 30 D | V | 0xC180D02355871A3CE21160F3F8DAD2D4 ; MKBv50/FindVUK 1.00 -0x2C869989B8F78DE8409027731A2366E448779E01 = ESPN_30_FOR_30_DISC_4 (ESPN 30 FOR 30 DI | V | 0x28B43F6D76F4588D8A346B6E2EE9A01B ; MKBv50/FindVUK 1.00 -0x25D008714A38596DE84853CCB246C4DEFB56455B = ESPN_30_FOR_30_DISC_5 (ESPN 30 FOR 30 DI | V | 0x2B72C3DC59201A983DC5F1F76099B12D ; MKBv50/FindVUK 1.00 -0x94B26F02A49024C6387220AB2B55B1423346FE0F = ESPN_30_FOR_30_DISC_6 (ESPN 30 FOR 30 DI | V | 0x7DACFBD543DBA43F85BB367A21916EA6 ; MKBv50/FindVUK 1.00 -0xECA9B46FEBCD7AA1DC75CF01C08B8AE482059850 = ESPN_30_FOR_30_DISC_7 (ESPN 30 FOR 30 DI | V | 0x5A563B7BF8967BAC8B3068B8B0236D55 ; MKBv50/FindVUK 1.00 -0x0DAFB430C56E1760D0052834D9A4FC392A64CA26 = ESPN_30_FOR_30_DISC_8 (ESPN 30 FOR 30 DI | V | 0xCF328D8EFB08D27B3E98781846C0170E ; MKBv50/FindVUK 1.00 -0x92B7057F9C9D82B8307F34E01C2D5067764F8644 = ESPN_30_FOR_30_DISC_9 (ESPN 30 FOR 30 DI | V | 0x2C85AECECEF7DFBCF4CF1EDF9A3AA9A0 ; MKBv50/FindVUK 1.00 -0x5251B369A44C7EDC2426168F27FA88244405B4EE = ESPOSAS E HIJAS | V | 0xB430F568464F605B77634544FB66C648 ; MKBv31/BEE/FindVUK 1.00 -0xE6B41B0F1C0878460191A9961C8AB2C849D711CE = ET MAINTENANT ON VA OU (Et Maintenant On | V | 0x95DCDFC5D6B539AFAE6C04D39AA1BE7A ; MKBv39/FindVUK 0.98 -0xDB52EF7ABD0E2D17D7D8728FD30A514941B8D2EF = ET_G51 | V | 0xDD2EED98DE4E830A730AF85513EEC641 ; MKBv31/FindVUK 0.65 -0x84A5FEAD741AD423829564AAE44799794B81A700 = ET_G53 (E.T. The Extra-Terrestrial) | V | 0xFD1CAD7895B47BA1D0234A1B08FB2AEB ; MKBv27/FindVUK 0.96 -0x31C2A059756B09B51F56930217F899599D7FE87E = ET_G53 (E.T. The Extra-Terrestrial) | V | 0x9338D2C8B18F0EB0B00371E410FEBC3E ; MKBv31/FindVUK 0.92 -0x45B91E8AFC6920CD2A32BEE6A05E53E1A23A3EEC = ET_G53 (E.T. The Extra-Terrestrial) | V | 0xE1881055563DF5BFE7D8A0B3DE40FA7A ; MKBv31/FindVUK 0.96 -0x2F1BC540E5A2733C8B5340F603EC12D12D9A163A = EU0x113632BVR2 | V | 0x0CB23A6268221EA3B164B966C076B88F -0x0AFB2E02345939BA40A19FA2E1A04C54A6A59B50 = EU0x113632BVR2 | V | 0xA033ADC4ED838FC92BF05A699589F1DA -0x9086A6FE362C94EA68611482BBB5A9ACCAA4F109 = EU0x113632BVR2 | V | 0x14AFAC384A9C4DFA4A04260D9A4DB516 -0x3369BD377D73E45ACC6EBC8B93CEE6D8D8ACD749 = EU113632BVR2 | V | 0xE84D766796147FB93C578F7631518751 ; MKBv7/FindVUK 0.98 -0xB3EEFBED39AA44D417ACF5358D103F52A9C0B704 = EUREKA S4 D4 | V | 0x2C00FABEE57FBA4E0F88F155D7FC81BB ; MKBv43/FindVUK 0.80 -0x68F4F602CF9E9F8658CA1C25B79038414CF07686 = EUREKA_95 | V | 0x3488FD1775D3075782DCA14FC95A0CAD ; Eureka 95 (History of HDTV) -0x5795AA538D05525AA42EE5C2CA4EA78DDDE13289 = EUREKA_SEVEN | V | 0x59109165C4D59BAAF391294FA05251DB -0xFB4A0BF8B457253A2764C30AA75715715F068415 = EUREKA_SEVEN_01 | V | 0xCECCDD1F09916DCF27FB96FD3A64EE70 -0xD5AA770242D3F7F8EC38E211AD8A40AA6A08A24A = EUREKA_SEVEN_02 | V | 0x53C7CDB0652A4D36D69AE91306EAF026 -0x15FF2C86F7D487D82FAD66D0B3084981153BD353 = EUREKA_SEVEN_03 | V | 0x4464F1764BA959223B2347FDDABEAA79 -0x1E8E816E9C73B0E459B85E37AEA0C0D1B188959B = EUREKA_SEVEN_04 | V | 0xA5697FA293561EB1481A8BC8300713FF -0x104D304A2C068930B2E13DC7726D090CCE27FAF3 = EUREKA_SEVEN_05 | V | 0x67A0CB6268C8E9D04B91E1F56AAE5FF6 -0xA88B1180EC2D752159782668DA63440257160AC4 = EUREKA_SEVEN_06 | V | 0x70D274D60DA50BBD97A5D11D15C79CE0 -0x725585592A8E2C22F4CB39A8C64912FDE763EC56 = EUREKA_SEVEN_07 | V | 0xE3D007AE0F93746A381D17BB802D32B2 -0xD28C12B41FEDA608A5A7139F53E94E520A030D30 = EUREKA_SEVEN_08 | V | 0x7E79D7D8105D7431FA61FA29B6AA9F2A -0x370E0E2ACCED5AAC345C3B85F6E04E2D5A6010BB = EUREKA_SEVEN_09 | V | 0xC6B74676BFECEEF276C53397191E7D76 -0x56212DD33E55EDCB5F311942687DB6126F35B160 = EUREKA_SEVEN_10 | V | 0xE9CB52D5FCB0898C5C51E43D4C192787 -0x3C3661F86F3A0431BB55CD7E9E39AB00425FEAA1 = EUREKA_SEVEN_BONUS | V | 0x7D14BFBEA78BC6A409B550AF5F7CF8C7 -0xDCDA5EE9BF6C759E4F27FE34EAA4DBCB181A7C1C = Europa Report - NOR_FIN (Europa Report) | V | 0x462CCB4E8AF0DAD8A0EC0662111BF029 ; MKBv46/FindVUK 0.92 -0xF25B45D814F56628C8A3FDE1656F6ABC4B9D3A55 = EUROPA_REPORT | V | 0x4EBEBCCFE0921A2790B6D33BAB21EF65 ; MKBv42/FindVUK 0.92 -0xD9AFF733AF46DA734FB2A55D13D58BB6BA80B576 = EVANGELION 1.11 (ESP) | V | 0x07181A359AF9ED6AC7E2F5587FC96629 ; mkbv12 -0x63CA3D07346589C353492A7CD1690CC9482ABDEE = EVANGELION 1.11 (JAP) | V | 0x4087E642AEAD9E8FA64E273FD864C7AC ; mkbv12 -0x32A0AA9918CE059979FCE5C11AD79E8845F38AA0 = EVANGELION 2.22 (JAP) | V | 0xF84731C38179419E71A802CB007ECEC9 ; mkbv17 -0xE5F794CAC1135CDF52C00D07A974A30E1899DF2F = EVANGELION 3_33 | V | 0x4FC7E3C5AFC62C7ACC8E243D80036276 ; MKBv44/FindVUK 0.72 -0x46B9615CAD0394DE5A440409C3836B1BBA9AF446 = EVANGELION_1_11 | V | 0x4B2ADAB4B6EE8753630AA7D0BAC8D241 ; MKBv16/FindVUK 0.81 -0xB35189E17BAE4F3F4A6BCFBE016917FFA460D26B = EVANGELION_1_11 | V | 0xF690B39F665F69FD6713B1084168CFED -0x8C6C9D02E4D42D57DA8348EC467143020F94CC5B = EVANGELION_1_11 | V | 0xC2C7F5BD4B57B8990E91A17D50297E03 -0x35DC7E0A021D7C4E8AA9E92E2A306E22B6E849E5 = EVANGELION_1_11 (Evangelion 1.11 You Are | V | 0x2455D176B794208085299A0957021767 ; MKBv16/FindVUK 1.02 -0x93CB9E5EE4ACDACFEE86713E8E5DE1EA90E9AB9E = EVANGELION_1_11 (Evangelion 1.11 You Are | V | 0x97275B754809B0604692C6D50E3364B8 ; MKBv16/FindVUK 0.96 -0xF78377F78CBDFA1ADFEED17C2FC885C5754CF110 = EVANGELION_222_BD (Evangelion 2.22) | V | 0x6C6098362976F3A269F920B3E4E1AF30 ; MKBv18/FindVUK 0.96 -0xDDEB75751476EA11A3E885281940BE4F08617805 = EVANGELION_2_22 (Evangelion 2.22 You Can | V | 0x1E10BEF9D5F1723381FD5D268AEF64D3 ; MKBv21/FindVUK 1.02 -0x350930277DBEC4B9E4B646099B0079C5692DDE1A = EVANGELION_333 (Evangelion 3.33) | V | 0xA1D96BDC3D613632C57B12819A249F31 ; MKBv44/FindVUK 0.96 -0x8674C959F02C367C21C67390FE2318A63FD4DDD6 = Evangelion_3_33 | V | 0xBAAD798E8C893592FAE7099247888EDD -0x0CA9FF417B8EE492E1B84FCE41BF5BCF8ED47D9C = Evangelion_3_33 (Evangelion_3_33) | V | 0x16B8E895DF35C4A47A072794ADC7781C ; MKBv53/FindVUK 1.02 -0x4B399BD31A17FB1F868C461BE59BCBF8BBEA67F3 = Evangelion_3_33 (Evangelion_3_33) | V | 0x0BA4C2D3D29BCE5526F5934897C0022C ; MKBv57/FindVUK 0.92 -0x71FE236CC0DF847DEE4DC984F1775D71366F17A7 = EVB333929 (SUPERTRAMP) | V | 0x9D5C0E4180BA2F98DB7646220E67E239 ; MKBv30/FindVUK 0.96 -0x629B155D4B2BEF446123246352ABED801ACDF1B8 = EVB334319 (THE DOORS) | V | 0xD3B22768903CC5319672E6952E1EC517 ; MKBv32/FindVUK 0.96 -0xDCCF590F57DA8675EE28A7BCD375E0D67DA59EDE = EVB335149 (ELO Hyde Park) | V | 0x99D0DDD21A73196C14F437390B4EFF06 ; MKBv55/FindVUK 1.02 -0x9684971DFB6B97608394823ADC8C0DAA963A4F8B = EVBR0xD333229 | V | 0x42119A27F6047B4D946FFEFEBF27BCC1 -0xB29DF62FD7D8A776B31FDF920788A7145BD394A4 = EVBR0xD333259 | V | 0x630B143302E67425F702060118A45E39 -0x812CEF7DACDEB1CF19CE9D4DF31B31266503739E = EVBR0xD333269 | V | 0xE1EBEC669B35A328C23AA8D58100FAE2 -0x03790C151885A97405F4C89145A89A5901A5951D = EVBR0xD333449 | V | 0x3983970B4E919F9701286891A0AAF964 -0x33391730FA5BDE91D5CDC4161ACF3CED0AD7E88E = EVBR0xD333499 | V | 0xAAA785DE3F6B7060DE6AB8C9070AFA2A -0xC27669B42E1CAB2A0BBC75A5D0AD3BE9D403D413 = EvenDwarfsStartedSmall (EVEN DWARFS STAR | V | 0x97DD5B124B689E7F73769066F79DE51B ; MKBv47/FindVUK 0.99 -0x8A9EF3C37A5394687F614D7A6918EDCAE4ABC74F = Event Horizon | V | 0x80015206D9C65AFBBE5D532B23C857A6 -0xF5220802673D09DFAA43B02EA1FC6F83CB1E753E = EVENT_HORIZON_AC | V | 0xED656C54113A3D7C9C7ECE256848C916 -0x370B3494EAEB36B8A8C41F663DF1E371F0CBA3C3 = EVENT_HORIZON_AC (Event Horizon) | V | 0x5C846560D94AE7C4E31E620CC1B767B3 ; MKBv9/FindVUK 1.00 -0xDCBC8CFB06B7B697FC0F37FE4528C8A312D600EA = EVENT_HORIZON_EU (Event Horizon) | V | 0xA4FBE86767E53FAFEC51D58FB77F2E12 ; MKBv12/FindVUK 1.02 -0xCBBAD7B6D6E02CA94EB68518C28B01B4A0D0927E = EVENT_HORIZON_EU (Event Horizon) | V | 0x58E4ED3216A157230E8B2BD1D35FA35A ; MKBv12/FindVUK 0.96 -0x5918E9AF882DE133E67E445E697B9C9CE0BEB40E = EVENT_HORIZON_EU (Event Horizon) | V | 0xEB0AFA16D31F87AFAF7F6E2F7C91322A ; MKBv12/FindVUK 0.98 -0x124D36306A6B8DCA14CA15B5313962EFD9F78468 = EVENT_HORIZON_EU (Event Horizon) | V | 0xAB732A43396DBB4600D0CB482ECB4D9E ; MKBv12/FindVUK 0.96 -0x8BDA17E3045FD26A2989128FC5AE23CCC85D99C7 = EVEREST_NA_RENTAL (Everest) | V | 0x8380034B6B74CD2E06FCDE20A66F5888 ; MKBv50/FindVUK 0.92 -0x2C4F1157138FDFE8C84FEB1FD96FD5FDF6EC8144 = EVEREST_UPB1 (Everest) | V | 0x114D1F0CC9EBFF5806595919244754D2 ; MKBv46/FindVUK 1.00 -0xD1C94697F424E16CC166B3F733A13B51F460DAF9 = EVER_AFTER_CINDERELLA (Ever After: A Cin | V | 0xF610D1DBD1E3C7EB47E0773F56DBF0B9 ; MKBv19/BD+/FindVUK 0.92 -0x52AEC3169560928BBF312B3C06586A54F86D4DBD = Evil Dead 2 | V | 0xC992899E9532F26F1A8D0A9414851AE9 -0xC6CA5DE51F4F9256CAB568B1F519032876D784E2 = EVIL_DEAD (Evil Dead, The - Blu-rayâ„¢) | V | 0x26BB38BFE00F234F4E10A8F742BFA0EC ; MKBv18/FindVUK 1.00 -0x7568CB30986E70C16A3E6D789226A1A5786F14B3 = EVIL_DEAD_2 (EVIL DEAD 2) | V | 0x090FEE49E542E3602541B2B6256A580F ; MKBv34/BEE/VUKNOTVAL!/FindVUK 1.00 -0x85014ED19EB2A3316FC7EC3C2384BD61EB49F083 = EVIL_DEAD_2 (EVIL DEAD 2) | V | 0x7B8DCE058154A79BD5D142D5D9DE0636 ; MKBv34/BEE/FindVUK 0.99 -0xBA9FA9963CA54FDBB6EA3D194E0E70B99247608A = EVIL_DEAD_2013 | V | 0xCFF4A7C07BD444A8DA2AAA0262126A7D ; MKBrev 40 - FindVUK 0.57 -0x389D5DB2229A49AD18FC28BFDF7A93429E843DC8 = EVIL_DEAD_2013 (Evil Dead (2013) - Blu-r | V | 0xE206C998CBCC06073C3B27CED69C05DF ; MKBv38/FindVUK 1.02 -0xFD85181644ABD5F9C18D8043DE10185910927DD9 = EX MACHINA | V | 0xCF41D591719D06CAFCEDFB3EA689CB30 ; MKBrev 50 - FindVUK 0.53 -0x6831A59EC8E56A9F80E72A4D763443373709119F = EXCALIBUR (Excalibur) | V | 0x4C36A0DD41B344979B08D26BC47F7AF1 ; MKBv19/FindVUK 1.02 -0xD40D597DC6B9E73A0390D37C1E09FC77F1466BB7 = EXECUTIVE_DECISION (Executive Decision) | V | 0xE25896094263BF7665ED1BDABDDA22BF ; MKBv20/FindVUK 1.00 -0xBE0939DFA006F54837443D04CE3CF4FC06EB4B8F = Exodus | V | 0x925440B887A2A59335F13E2C02C9E233 ; MKBv27/FindVUK 1.02 -0x924780A847ECFE972D5ADDBE7E987DFA45420F8D = Exodus - Gods and Kings | V | 0x09FB8DFDFBB86CEE4A631EFC695D98F0 ; MKBrev 39 - BD+ - BusEncryptionEnabled - -0x636B3ACCD35605B04DE2DEA5FCE1DE14AFAFE562 = Exodus - Gods and Kings (Exodus: G??tter | V | 0xC66B49083CF5C197251216031EFA857F ; MKBv39/BD+/BEE/FindVUK 0.85.3 -0xBD006FE60DFE079379F52AB544E5A4636CD96FDF = Exodus - Gods and Kings (Exodus: Gods and Kings) | V | 0xBB9E7713AA5B2B94A2E2021AC9C1B73F ; MKBv47/BD+/BEE/FindVUK 1.00 -0xAACFB441069E29690634DC6F304274697EB3FF93 = Exodus Gods and Kings - Disc 2 (Exodus: | V | 0x3FC8089CBA43B2ED077B0DAA0708C1CB ; MKBv47/BEE/FindVUK 0.96 -0x073433A96DC04BA289A592FCB720049DE96034E5 = Exodus_Gods_and_Kings (Exodus: G??tter u | V | 0x889025D36E79C62485B9C04D8B9879C0 ; MKBv47/BD+/BEE/FindVUK 0.96 -0xF2CA1E02A35981B8D15978977621DAC2809F8463 = EXORCIST_DC | V | 0x6B58284FAA83C51D3FC2A320D5E854EA ; MKBv19/FindVUK 0.80 -0x47105F49B1048BC5E97D271440D5074F1871C896 = EXORCIST_DC (The Exorcist - Extended Dir | V | 0x9B8ED03ECE3DE48EE07830D39BF1BC6C ; MKBv19/FindVUK 0.96 -0x7B46884BC5C0C34D0CA5B41A08A8EDBDE08E3AE8 = EXORCIST_DC (The Exorcist - Extended Dir | V | 0x5146C4D4B7ACA209A97878E77DCCC988 ; MKBv19/FindVUK 1.00 -0x16FE1E242666F61A496EF6CF35900BF5A25179B9 = EXOTIC SALT WATER AQUARIUM | V | 0x26CDE90E672313F000A434D849BDCE04 -0x8B8B51671AE342567C54FF1DD97908C3DC7F3C6D = EXOTIC SALT WATER AQUARIUM | V | 0x3CA9ECB0397746D79BAAB3BBBD4B3C2C -0x46B5E3407E7D897109ADB2D7BA710CDFCA8DD86D = Exotic Saltwater Aquarium | V | 0xFB24A79060D08D127F1E79229AD00DF8 -0x7D45F13E89F8B5A0AAEEB1955C15F33DD129DD2D = EXOTICA (Exotica) | V | 0x9C8C2673F11F1A9854A47F5B77907ED9 ; MKBv31/FindVUK 1.02 -0x93CCCAE799609A073DE63BEC57DC2581F8CB8320 = EXPANSES1D1_NA (The Expanse: Season One( | V | 0x764A23463BA9F46B95E600BAD2329C0D ; MKBv56/FindVUK 0.96 -0x1AC95833D71B3D00464B9D4AD6ACCFB371EA0A68 = EXPANSES1D2_NA (The Expanse: Season One( | V | 0x504DE546E9A9C756B4E7B8750FAAFEA1 ; MKBv46/FindVUK 0.96 -0xA45364047AC4F4ECB0CE77F1537081367657A591 = EXPEDITION_ALASKA (Expedition Alaska - B | V | 0x3F65B8FFDBCA82DACB52F485AD382F1B ; MKBv14/FindVUK 1.02 -0xE6CF306DF5FC555D062FEBFD02481204192D2783 = EXPEDITION_ERDE | V | 0x76B659703E0203BA5634584C1FD4D856 -0x8846F146D8D6D5A5E9A73A3089BAC6029D785557 = EXPELLED | V | 0x082CBCF6441A81855BEC301FCDFDD4E9 -0x93CAB2A0563236CB602CA9AF5F2123C27B24A6C7 = EXPELLED FROM PARADISE (Expelled From Pa | V | 0x0C5DE81D55802409A8F96FAC6255AB90 ; MKBv57/FindVUK 0.96 -0x79635530C5710FAEB5C32F89AD91BFEB470A45C7 = EXPENDABLES | V | 0x3B190748FBD669A08C09FCE39D7CA695 -0x59716BE6521A58F7B57EF7A0B1FB0E96DEF9F8A7 = EXPENDABLES (Expendables) | V | 0x672EEEDFE56C4C53C1A30F02C2A5354E ; MKBv19/FindVUK 0.96 -0xF093EF9DC690D271D295428CA4C7B9797774FA72 = Expendables - NO_SW_FI_IS (Expendables) | V | 0x65CC4916784624D2F1AE1BABE77CC595 ; MKBv19/FindVUK 1.00 -0x6CDC8AD23905C8DA465DD2492D75709BBB4D0578 = Expendables 2 - SWE_FIN (Expendables 2) | V | 0x7AE79D9101F0D374D40CE2CDA252633B ; MKBv35/FindVUK 1.02 -0x9A19FA515985384903FDF9504840B59FDD5DF02C = Expendables 3 - FIN (Expendables 3) | V | 0xE075377648C66E8EF666415B72986C4A ; MKBv50/FindVUK 1.02 -0x66B2D279474ED86D71C74129E57F503A7D56FFFA = Expendables 3 Extended Cut - NO_ (Expend | V | 0x04FE1AA3B5F3C2BA6ABD87F6243C90ED ; MKBv50/FindVUK 1.02 -0x2854742CF78E6D83A9F678CA38C53B846CF67EF0 = EXPENDABLES EDC (The Expendables EDC - B | V | 0xDEC1D6B9131CCC23DC8255E8C845D5A3 ; MKBv30/FindVUK 1.02 -0x000008CE3635493ECC947BAFE3FBCCAC77CD5EE7 = EXPENDABLES EDC (The Expendables EDC - B | V | 0x6D60E331D36257ED9C888C10702AFB07 ; MKBv30/FindVUK 0.92 -0xC0A72D12201DC135B49EFCED099B790FAD175CBC = EXPENDABLES EDC (The Expendables EDC - B | V | 0x2B427D0FF3774234A858E792A3B77CB9 ; MKBv30/FindVUK 0.99 -0xE9983778EB2192B9BA6AF3D46B6D06A3B8B28B85 = EXPENDABLES_2 (The Expendables 2 - Blu-r | V | 0xB8B41E3DB251D2A15AEA3CA80C7F3853 ; MKBv31/FindVUK 1.00 -0x3103CA42EECFD15D9CD61D180091E74572238817 = EXPENDABLES_2 (The Expendables 2 - Blu-r | V | 0x88B4F912C72FB02C7A29B1E01D0D12AA ; MKBv31/FindVUK 0.84 -0x595424003EF5C22375C9DEBEF0831AA04F738B29 = EXPENDABLES_2_UNITE_SPECIALE | V | 0xAE4FAC8C0AC12B562362CF53EF4E0F17 ; MKBv31/FindVUK 0.84 -0x62B391FF8C0D2DBF5502A71A9BF2A8F8D39AAA7E = EXPENDABLES_3 | V | 0xEE7EABB0F4852BF47CFA3E3A4CD58B01 ; MKBrev 49 - BusEncrEn - VUKNOTVALIDATED! -0xE7E96F5D1353D06A7E1D25A76164A02422405B60 = EXPENDABLES_3 (Expendables 3 - Blu-ray™) | V | 0xEDB84533F96EFFB7AA53C21729A8DCE7 ; MKBv49/BEE/VUKNOTVAL!/FindVUK 1.00 -0x6DDEFBEE4B4F3D90D174C94C296FA4EC724F27DA = EXPENDABLES_3 (Expendables 3) | V | 0x94B2BE15E0968428C0F8DF0A3D667C11 ; MKBv49/FindVUK 0.96 -0xAD325C72027A2FF169AC206F0F32A7D650BA1E0B = EXPENDABLES_3_INTEGRALE (Expendables 3 - | V | 0xDAC0AA0769EBF01C160BEB9CD289296C ; MKBv49/FindVUK 0.96 -0x2E0E2CEACA289585B946CFB4217F88A47D1F7BB6 = EXPENDABLES_DIRECTORS_CUT (EXPENDABLES U | V | 0xD343CAC905C6065B7AAA0D5AB73ADCFF ; MKBv30/FindVUK 0.96 -0x48AF6DBF3B8F49A8D4AEC3372D43B4EA3B4A9D6D = EXPENDABLES_THE | V | 0xDEDCF602F90C24DEE4485BA9EF4601DB ; MKBv19/FindVUK 0.81 -0xA6E61B72E0E00E884CBE8E836DA91E33E80D2A13 = EXPENDABLES_THE (The Expendables - Blu-r | V | 0xE03B737B0AC2021AA06BDE3D8BDEBE8E ; MKBv19/FindVUK 1.00 -0xBFD21E310C50AC21EF0BCA2B06A2EE09F8E6E170 = Experience Hendrix - Voodoo Chil (Jimmy | V | 0xDB2B378B04EAB71816FB17E0CD3571A9 ; MKBv23/FindVUK 0.94 -0x0E3F197F09245C46BE38348E8B658638CEE3FEF8 = Explorers | V | 0x6B67D616D19C85CA0918FAE7C0960181 -0x83BC5654B3ED0501D99D2E68801A0A12E3E19564 = EXPRESS | V | 0xFA059783B9EB4E353E1AA5BC3BD02D2E -0x52DB641B9A7571A138AE08B4AC1F11397209202C = EXTRACT | V | 0x72451DBE49C7915748860CECA2C0B386 -0xA8B63603A82B840ADDD168EC33E9288498D0C305 = EXTRAORDINARYMEASURES | V | 0x201F58FFC79ECC92CDB36589E669B583 -0xD8302CBB34298E56EA897F513249A01A36E9876F = EXTRATERRESTRIAL (EXTRATERRESTRIAL) | V | 0x088F64A519EFCD54189F8B33ABC7DFE3 ; MKBv50/FindVUK 0.90 -0xB56C56B53D547DA7B3F7B6651A8F153FC38E4872 = Extraterrestrial (German) | V | 0xD046AADCAA53B43FB025A43EE77FF6B0 ; dvdpasskey 8.2.4.7 -0x8E71EE9C0F704243B9BEF7380704FA808F2B33C7 = Extremely Loud & Incredibly Close | V | 0x7668D134B1EF9E50215C36E520B7D5EB ; mkbv26 -0x6ED879FF55FB58B7F7D103BDFF5958107AD6820A = EXTREMELY_LOUD (EXTREMELY LOUD AND INCRE | V | 0x3A31499FFAD29F74584418BDE779CBE6 ; MKBv27/FindVUK 0.96 -0xCDDEF40D9E41FEB210A59B3B3C72A3E9EB3C35E7 = EXTV001 | V | 0x1D89D3D58543C1AE1B245522D0EFCCAB ; MKBrev 50 - FindVUK 0.57 -0x8387C9B8B123D190AFCD4EEDF72104E1A657D7BE = EXTV002 | V | 0x3C4234392E116057A25D03706814C05F ; MKBrev 56 - FindVUK 0.57 -0x5E7CD2C45FD1BFF763767C7AA3D3BF16E626731A = EX_MACHINA | V | 0x5429DB75FF37183E528FCF9B1EC452DC ; MKBrev 48 - BusEncryptionEnabled - VUKNO -0x56B196C61D23889E6295D0801B00FA720BE564EE = EX_MACHINA (Ex Machina - Blu-ray???) | V | 0xAD5E2847633324FD5DCF1240EE13C9AA ; MKBv48/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0x07EA9816F0318AD2A8FA18F760EEE6F9F0387663 = EX_MACHINA (Ex Machina - Blu-ray™) | V | 0xE85AF9C6A59A8E5AB19030766D4BEE58 ; MKBv48/BEE/VUKNOTVAL!/FindVUK 0.99 -0xB6328488E10FA84DFE334182FDDB240BF441BBCD = EX_MACHINA_UPB1 (Ex Machina) | V | 0xDE072F523BBDFC60E4E89E82A58E9D55 ; MKBv49/FindVUK 0.83 -0x52BD2358F262AF7482D2425E451AE7AD5C557D07 = EX_MACHINA_UPB1 (Ex Machina) | V | 0x41EEF4D98A39844C4CA7218705487C67 ; MKBv49/FindVUK 0.96 -0xEE74A2148710A878F27866047CB81902E1679F18 = EX_MACHINA_UPB1 (Ex Machina) | V | 0x37028CFDDBF3DE81895FBCFE6CBB0567 ; MKBv49/FindVUK 0.93 -0x5D50A6419F9514CAD2865DC86BFBE90DE1C3D034 = EX_MACHINA_UPB7 (Ex Machina) | V | 0xEC93942D118E52321EA478277E41FF9D ; MKBv49/FindVUK 0.89 -0x9B3FD1966AF8DE71B2295C0721C312C89F898796 = EX_MACHINA_UPB7 (Ex Machina) | V | 0x3A3F32E66ED9AF143EA4C6A6DE6FC899 ; MKBv49/FindVUK 0.96 -0xE5AB732EEED3BCECD8A8579F4A2729B62FBBD3B9 = EX_MACHINA_UPB7 (Ex Machina) | V | 0x2E9BB91BAEBA8D2FD68A851674A5EED4 ; MKBv49/FindVUK 1.02 -0x3FB772FAF37C9CA2585382B8A6299EA2E47554B1 = EYE CONTACT | V | 0xF1959B664BDBFDAE8D2CBE312536C3F5 -0x3F20376F68C7E246AC602CB50F6AEB6C627C7CBC = EYES_WIDE_SHUT | V | 0x68FB994B450E5C544110F44648EB52B9 -0xE01D8E3343E611AA767C90AACA986A485DAED739 = EYES_WIDE_SHUT | V | 0xEA9A717A7838D5AC0B52AB0ED2F6F576 -0x1EE01ED43CF001F70FB645F4F1D2083848C44049 = EYES_WIDE_SHUT | V | 0x0EE5E8D09E2FA8EED802983DCBD8D4B3 ; MKBv4/FindVUK 1.02 -0x8A5CC042385B3F8C7421DC55FF9D82F7714C5230 = EYES_WIDE_SHUT | V | 0x84577B2303ACFFB76D3F52CCF29AEE63 ; MKBv4/FindVUK 1.00 -0x49B9B44A8D1DBAD304DC03585E39EBC65D1DF119 = EYES_WIDE_SHUT | V | 0x1EF88B1B2BD549E554B74B1B3BEE2DF0 ; MKBv4/FindVUK 1.02 -0xB1F8D52B63BC4FF0B2CCA83894F875F6B4985430 = F2 | V | 0xA6A433A0E173F887C272F075319CBE0A -0xCA619435598FECF4724E5567C687C2F76EF368C3 = F2_55120_BD_SE_1 (Spartacus: Vengeance) | V | 0x44C415EE0E73E8261588DDFF57662DEC ; MKBv35/FindVUK 1.00 -0x9E6D465DF8C1A4AEAB337FFAFF7814ED97A7F1ED = F2_55120_BD_SE_2 (Spartacus: Vengeance) | V | 0x1B71F4825801FBE24FE9C5FAE8B36360 ; MKBv36/FindVUK 1.00 -0x72A13BCD71D50A115A046DC5256C63885FE0BC18 = F2_55120_BD_SE_3 (Spartacus: Vengeance) | V | 0x486E4022199E3E44BBAC54E8C992A05B ; MKBv35/FindVUK 1.00 -0xB49284E5A19AA926A58A63FCC332D4E79CB95413 = F2_55120_BD_SE_4 (Spartacus: Vengeance) | V | 0xA8C618946FB04CDF71CF9ABD9C386F23 ; MKBv31/FindVUK 1.00 -0x4F75A4F038E97490B95480E40ACB0DA1BA45649F = F2_57672_BD_SE_1 (Spartacus: War Of The Damned) | V | 0x3217B1150A589343A98BF3DFFCB3EFA7 ; MKBv35/FindVUK 1.00 -0x1B48EB3D1D3433294B4EE0BE42B985B8A9958701 = F2_57672_BD_SE_2 (Spartacus: War Of The Damned) | V | 0xA206AC3386D262AA5589343374D6BC17 ; MKBv31/FindVUK 1.00 -0x231137DE9F68E1138BB7A7A83927F5B3B32AAC2A = F2_57672_BD_SE_3 (Spartacus: War Of The Damned) | V | 0xBD5D263A9E99D7E9F31566DAFB6F0E42 ; MKBv36/FindVUK 1.00 -0x9AAA503BD8622B3A23B8EAC52AD654527B2E80A7 = F2_57672_BD_SE_4 (Spartacus: War Of The Damned) | V | 0x4F03F67CCAF7E43CAB6B9ED70A7A0996 ; MKBv39/FindVUK 1.00 -0x0F349769E1C8A28829D53805FB67EBC169F2E04D = F42_F6 | V | 0x0EAD6696FA82A78DCA6F7B8144290555 -0x614AD900E2736789A6BE3EAC148C29045AB92E26 = F?? meg p??, for faen | V | 0x830E2C7357090C670E896424B131EC7B ; mkbv25 -0xF283AAEC3270C53B9BBF08F57FC5F311F7B86C39 = Face Off | V | 0x0494B3436444C0F8711C3F977D7C4A36 -0x8067DCE73A78BAAF47DF5CBF7321C3EB89100161 = FACES_IN_THE_CROWD | V | 0x158D97B4AAB9A20449319E5FA55B47E1 -0xDEB1CE6DFEEDFE261C9E44748D964CD04514CA16 = FACE_OFF | V | 0xAA7F16A6176F9B8E80C26A1951F1A46C -0x4411B71F0074912382BD59ED1833E96D04AFA38C = FACE_OFF | V | 0x902FFBAF0D8C5046BB37BAF51C75287D -0xCE04E2E3074551F2838CDABBB4E3883E4D840457 = FACE_OFF | V | 0x719B4316B0E56D38EBE945DBD61B9584 -0x8FD79813C3CCB4328C6D84070650512D5E4D1CF8 = FACE_OFF | V | 0x4491AFAFD40E33FEADDA576FCDF2AFE1 -0x7958DAD985FC857290D88FD7A8F1C4F5D2C8C494 = FACE_OFF | V | 0x708AC80EDC8614A9177062A67F9C3C7A -0x3B16044A2271610F8EFB4A759977074515846398 = FACK JU GOEHTE (Fack Ju Göhte) | V | 0xDBBEB52B3740F04ABE7083602C4B5BF5 ; MKBv46/FindVUK 1.00 -0xABD6A5D67E9C2F7F851DAB18439B85AF7ADF0CFC = FACK JU GOEHTE 2 (Fack Ju Göhte 2) | V | 0x0FB6C3D8C8A63F98B274FD8C978486DA ; MKBv57/FindVUK 1.00 -0x59FED8DC9EAA7CAE43C5E098113AA3CE324CCA35 = FADOS | V | 0x5DB976268F6CA5D6CF4A727F16198415 -0xCF6D1AE4F3FA73AD5390B58E003B7D0CCDF4D5B3 = Fafner_Movie (Fafner Movie) | V | 0xA707412DC4DA4B39001046E95313CDE1 ; MKBv31/FindVUK 0.98 -0x577C5B9E15035DBE4D773700F297EB23B0E8F4AA = Fafner_Series_Disc1 (Fafner Series Disc | V | 0x7B8A6C6E4635ECD98B9A31D9530D409C ; MKBv31/FindVUK 0.92 -0x598F11D2643E639B718414E1944D1B256A58A7FB = Fafner_Series_Disc2 (Fafner Series Disc | V | 0xA7CEC34A36C2600E310AC7F10889C561 ; MKBv31/FindVUK 0.92 -0xDE3190DC534635C7917EC9B556B21CBEDE897D92 = Fafner_Series_Disc3 (Fafner Series Disc | V | 0x721D1BC2973968B15CD2920AE502B636 ; MKBv31/FindVUK 0.92 -0x0C459128F3025ADBF37037B4FA53604CD8564304 = FAIR GAME (Fair Game) | V | 0x972B3C0CCE8AE880392F8C0E6B7BB5A7 ; MKBv23/FindVUK 0.96 -0xD568D1ECBF52C0C334777DD2D89EF1407C05D7AA = FAIRY_TAIL_P10_D1 (Fairy Tail Part 10 Di | V | 0x5563ACE2EE1E5C0CEDA22B521CC19BC2 ; MKBv46/FindVUK 0.93 -0x6DB21CA88AAC36C04FD44A214581F6FC45474B7E = FAIRY_TAIL_P10_D2 (Fairy Tail Part 10 Di | V | 0x9E48269137DFC8C82270BB160F2C6B4D ; MKBv46/FindVUK 0.93 -0x46241FF82F7021C788001C7904C0EC481A54DAB4 = FAIRY_TAIL_P3_D1 (Fairy Tail Part 3 Disc | V | 0xF71CC31CB47BABB62B575ECE253E6F19 ; MKBv26/FindVUK 0.93 -0x4656754ADFAD61372F7C15013D9D2C0C71F8E550 = FAIRY_TAIL_P3_D2 (Fairy Tail Part 3 Disc | V | 0xD9A293A6A84459C7D347BC8A70AA63A3 ; MKBv26/FindVUK 0.93 -0x8770DDEE861A46E274A79F490A94BF111B2BBC86 = FAIRY_TAIL_P9_D1 (Fairy Tail Part 9 Disc | V | 0xC162C71F8AB40E517C12FA7644DC1356 ; MKBv46/FindVUK 0.93 -0xE8575EFE04F287689CE9836CDFBC2B3016F616F2 = FAIRY_TAIL_P9_D2 (Fairy Tail Part 9 Disc | V | 0xCB3A330D5082FD9AAB0B9CF4544587AD ; MKBv46/FindVUK 0.93 -0xF0AB00F96F662AE465DA6EFD2D1F4F774206BCC9 = FAIR_GAME (Fair Game Blu-ray???) | V | 0x258AD3FDDA05874D65DE3504F53398E0 ; MKBv19/FindVUK 0.96 -0x8D414300D69D4124BE02805067778DA44BB5C279 = FALLEN ANGELS | V | 0x2F95E3BE0CB110B65D3E3A5C4E725957 -0xF4AF6ABEC364098DFB92F11DE7D4F11562D7228F = FALLING_DOWN_BD01 (Falling Down: Deluxe | V | 0xB59D975CAB0B392A861383E060EAFAB1 ; MKBv12/FindVUK 0.98 -0x9A500B5361D11C72C3A0CE59D0C052430BF9CE8A = FALLING_SKIES (Falling Skies Season 2 Di | V | 0xCD3175DD608F4265C8D47AEB08F107AA ; MKBv36/FindVUK 1.02 -0xB9AAC5BE9E444916117393BB30C769F802CE50FB = FALL_IN_NEW_ENGLAND | V | 0x94A3C97B46FBD089F5255D0C6C72219F -0xDF70686D768236FB71A5ACD9DAFBE16074631858 = FALSTAFF | V | 0x6A2F29300D8D17E734B25DCDFC47C32A -0x95E7247CC64BFA7503E2B113FEB7B8D31C37D487 = FAME | V | 0x2DFA180079CD3A5C3FF02BE316C9348B -0x3CB40D9977D39F82D715D21AE2928A51A0347B2C = Familiar of Zero BD-1 | V | 0x36C065736C25FBC734330FDCE5245071 ; MKBv50/FindVUK 0.86.3 -0xE9BC3ABDD0B4279D607D9719EC0F03AEC7F75670 = FAMILIAR OF ZERO _ DISC 1 (Familiar of Z | V | 0x8FB5B83E139EF022AED8E8006CC93FD6 ; MKBv44/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0x36A55501681FD7016ABE9463827E76A15BBA2E51 = FAMILIAR OF ZERO _ DISC 2 (Familiar of Z | V | 0x2BE22E98AC860B5B1C61B36CED204CDC ; MKBv44/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0xA27FAE6693E9A2E6CAE89D68A64D98AF1CC6DBBA = FAMILYGUY_ITS_A_TRAP (FAMILY GUY: IT???S | V | 0xCD62C24BB915A5453B034C9A99DCA2E8 ; MKBv19/BD+/FindVUK 0.92 -0xC4712DFB9083C4739D2C50CC6A5595DC14FAAA01 = FAMILYGUY_ITS_A_TRAP (FAMILY GUY: IT’S A | V | 0x4BC7D268AA8C92F3CE26AAE0C34211FB ; MKBv19/BD+/FindVUK 1.00 -0x988392DEBAC30EF34F16BBA332323537479CFDBB = FAMILY_GUY_BH (FAMILY GUY: BLUE HARVEST) | V | 0x6CDFC80146002E3A14ABABE9AA834734 ; MKBv19/BD+/FindVUK 1.00 -0x5D87A7D14434E7787E4C6EAB3AC40C10380CF661 = FAMILY_GUY_BH (FAMILY GUY: BLUE HARVEST) | V | 0xBD4B0313617C4CA09EE5FAC57253E4A6 ; MKBv19/BD+/FindVUK 0.96 -0x6FD609193FEF58456A15172CC4EF3D3123DE9548 = FAMILY_GUY_BH (FAMILY GUY: BLUE HARVEST) | V | 0xC49DB2B55FB7D49EC3D59BB3508826FC ; MKBv19/BD+/FindVUK 0.89 -0x536F217A068627FEEFDED0C207F0DBAA192D5011 = FAMILY_GUY_SSSDS | V | 0x0B6EE712F32272ED8465B911583D5462 -0x609D668A4AE808FDB1DD59E6746A996435145840 = FAMILY_GUY_SSSDS | V | 0x871AB87C0175798440150FCA90CCCE2A -0x2798A0993C5C7DEE53E1D9C6B4123B473DD158AE = FAMILY_GUY_SSSDS | V | 0x5948CFA7329C4BD3CD41F210B72159CA -0xD3CF1033D9EFEBF83D72D95F46DAACE578BF1F84 = FAMILY_GUY_SSSDS (FAMILY GUY: SOMETHING | V | 0x6B238764EC730A188158CDAF8516FB84 ; MKBv19/BD+/FindVUK 0.92 -0x8DA2A8C843BC06884A5E444052F993C814C504E1 = FAMILY_GUY_SSSDS (FAMILY GUY: SOMETHING | V | 0x545E94A564E4418BDBB64998490F104E ; MKBv16/BD+/FindVUK 1.00 -0x1ADEEFF5ABE2C5B4BD166BF9DFBC0F95DE651673 = FAMILY_GUY_SSSDS (FAMILY GUY: SOMETHING | V | 0x0BA70457E983B17F80CA328284654CAA ; MKBv16/BD+/FindVUK 1.02 -0x380028819035778B6940C4EED2FEEF39E0CF2ABA = FAMILY_PLOT_G51 (Family Plot) | V | 0x781DEB07469DC3B50D7623164AC2B927 ; MKBv28/FindVUK 1.00 -0xDE1DC3568D3436784AB51E4894B9FA6D3D8B7E90 = FAMILY_PLOT_G51 (Family Plot) | V | 0xF7ECF13E4CBBF27020EE9D8DBB8BAEC7 ; MKBv28/FindVUK 1.02 -0xFD178CF6611F7846257E272ACF6A9495338AF995 = FAMILY_PLOT_G51 (Family Plot) | V | 0x064E6B0E08A02B7FDBA17F7A9899E1B9 ; MKBv28/FindVUK 0.94 -0x1BEC0BC34B312973C7D2A6D272256D9D14427265 = FANBOYS_BD | V | 0x5CBB07721B2D2C895724B2AC7A061254 -0xB56E0E72D5E44ABBD24C87BB04DCBA9B4397C4D4 = FANBOYS_BD (Fanboys) | V | 0x79B1DDAFC660B4CF99181360E66E61F8 ; MKBv9/FindVUK 0.96 -0x9312F272317DECEE016141B381081C4CE1D57632 = FANNY OCH ALEXANDER | V | 0xF86A7520BE17C4E34130BF15EFB59E58 ; MKBv8/FindVUK 0.98 -0xB035AA180B9E68FEAEAD85D20246D45C1BC677A3 = FANTA4 | V | 0x2AFEEDF304F23B26A9769197A65228B0 ; MKBv19/FindVUK 0.96 -0x3CEFC7D6C6134726C5AB95074BE5B2C6723D0EE2 = FANTA4_HEIMSPIEL_BD | V | 0x0C76C591716B21F176C629853190027E -0x4A779B8CF5772DCEA3A9AE21ABBC76A3F5F40224 = FANTASIA2000_GBR (Fantasia 2000 - Blu-ra | V | 0x846E214B766BD846DA65C60F461BB315 ; MKBv18/FindVUK 0.86.3 -0xB2AA63C20CE6CB05715C7B7621352FACEDE84666 = FANTASIA2000_GBR (Fantasia 2000 - Blu-ra | V | 0xE7433C33349AFD3331A57571B3392060 ; MKBv18/FindVUK 1.00 -0x4B55BC0F92279F95737F9F7BEB6C92EF617AE447 = Fantastic 4 | V | 0x3F81695F1DE88FC4C3D7310B22C0E2A0 -0x1580DAAEB2C02699FBC75C7895B4D4238ADB05E9 = Fantastic 4 (2005) BD | V | 0x838B5F224FD43810496CF379BA90A015 -0xD40CDC00A62DA360097CBF18A3627D896819D1BD = FANTASTIC FOUR | V | 0x20EE51F39DF66726382C324F4373865E -0xA8FB5A6522F2A1DA28312754ECEC808401CF5488 = Fantastic Four (Fantastic Four) | V | 0x8832ADFE46831D75CF1A869D82B276B9 ; MKBv56/BD+/BEE/VUKNOTVAL!/FindVUK 0.93 -0x8D2216F66CDEAF97DD06D82F442543853F91E070 = Fantastic Mr Fox | V | 0x4E84F52CBD961B7C9A99B4125AC09FFD ; mkbv16 BD+ -0x1E88D497417D22412973A43CA152158035D09CD6 = Fantastic Voyage (Fantastic Voyage) | V | 0xD10C1495B2D843D34A7FB0C551190D6A ; MKBv35/BD+/FindVUK 1.00 -0x6F6AA0E7F6BD7F90420E8F054310CAB1FE3D6925 = FANTASTIC4_2 | V | 0xE9C482E96685A1D6000AA64AB67F2CC6 ; MKBv4/BD+/FindVUK 1.00 -0xFF8BA0125DE2DA334798226F8BA1B7876BD55692 = FANTASTIC4_2 | V | 0x949F21C52390427FB47A16FDF36D505C ; mkb v4 BD+ -0xD7673AB999CE0F3395FBB82CA7C675C8FA46E090 = FANTASTIC4_2 | V | 0x218377C93ECCF8E4444B392407E4D633 ; MKBv4/BD+/FindVUK 0.98 -0x1C71EEE1757762161C82A04E067F33F2668368E2 = FANTASTIC_BEASTS | V | 0x1AFE0D3D6B2D58EF3BE14B52F95E4872 ; MKBv62/FindVUK 0.96 -0x7E189EDB8E23938FDB96BF595E6C6CCCD303607A = FANTASTIC_BEASTS (Fantastic Beasts and W | V | 0x675D5971756F619D53DBBBAD6E1EF96C ; MKBv62/FindVUK 1.02 -0xDDFF3477F36956A794E169BC2714F06FCC3F075A = FANTASTIC_BEASTS (Fantastic Beasts and W | V | 0xF256262633736D60F649FFA56DC48517 ; MKBv57/FindVUK 1.02 -0x81194D6E6CB86B7517C2546E1868714900EC4702 = FANTASTIC_BEASTS (Fantastic Beasts and W | V | 0x1A7E347B7F38E53AA084700C59B6D885 ; MKBv57/FindVUK 1.00 -0x61F4FEEEB94853816A6EDD89DC2614D54A416E12 = FANTASTIC_FOUR_2015 (Fantastic Four) | V | 0xB9EE58DD001317F704348149904C9EBB ; MKBv57/FindVUK 0.99 -0xCF4FB266B40DE759EB9A454475FAC04A63768B41 = FANTASTIC_MRFOX | V | 0xC1C49FE5F1AA22D8895838D6EFF2F523 -0xC0BE26476BC28B8F3949E46FF9F4401D3897D10A = FANTASTIC_MRFOX | V | 0xB967C89269298EA709969A652CC5B70E -0x66354EE1F24D9EEC40BEC11DE4235C29D8C99BEE = FANTASTIC_MRFOX | V | 0xCD32B45351DF82C5F68A2EC064FF8E1F -0xE2089A735C9199C65FC145A739544ED60BEC670C = FANTASTIC_MRFOX (Fantastic Mr. Fox ) | V | 0x641385955589666F53F68086087F1B0D ; MKBv15/BD+/FindVUK 0.98 -0xCED98BDFDDF5C49062E52BD2FACE075E1BE1F93B = FANTASTIC_MRFOX (Fantastic Mr. Fox) | V | 0x1F97D8AFA918B45980B0365F6B901D50 ; MKBv16/BD+/FindVUK 1.00 -0xD11A904E6F4FB022923AAA5D94829115AFE6CADD = FAR CRY UNCUT | V | 0x20D64C8ACE50FE6029E286F9FD2A7C1E -0x6EEC50757304E31E42EEEDEA4B2A9280516A0745 = Fargo | V | 0xC095689D41107B50D920BE7FA753A6E7 -0x838BB906DBC638522F69031DC259ACBCDA2183DD = FARSCAPE | V | 0x82F7B25339134E9A749E289AF631C6EC ; MKBv39/FindVUK 0.96 -0xC8DF685AEA05FAEC8384CF0779AA5F1541329C8A = FARSCAPE | V | 0xEE4CD0DC067E02C558CD8A7A9B56E5B0 ; MKBv39/FindVUK 0.96 -0x8A6E2E2DC09E1F9243D8122943D06EE10A09C660 = FARSCAPE | V | 0xC99C265A0E8C146246F0760935882DA0 ; MKBv39/FindVUK 0.96 -0x932FBCECEB5CCB1FF39393CAEA510307C0500356 = FARSCAPE | V | 0xCBDFDEDA85761737F669B1229C0A6442 ; MKBv39/FindVUK 0.96 -0x4A66792BD583B58403F33FBCED76510522FAE9C2 = FARSCAPE | V | 0x3F3EBBE04D081629F3CD9134F29E7C0C ; MKBv39/FindVUK 0.96 -0xB8441287AC1165C85641687A052BA1B3A6BABE5B = FARSCAPE | V | 0x38D5E1C9132B4ED4B17E49A6A0994002 ; MKBv39/FindVUK 0.96 -0xBE2E7A2E1291BC4F2B327B1EF8FDC9C93F4E4F28 = FARSCAPE _S1D2 (Farscape Season 1 Disc 2 | V | 0x8AEA19154FA97E4112F19E408100FABC ; MKBv42/FindVUK 0.98 -0x2037985B0EAC3AB8394A83EB46CFE2B8DB4E4F29 = FARSCAPE _S1D2 (Farscape Season 1 Disc 2 | V | 0x92D6702A590922CEC7F8E20A48E13012 ; MKBv42/FindVUK 0.96 -0xF08196D9669AC9C6E211560B2139F1BF29662B1D = FARSCAPE_S1D1 (Farscape Season 1 Disc 1) | V | 0x0F9552C609356DE326024B9AC7C57C4F ; MKBv42/FindVUK 0.96 -0x6A3F5DAB6D4E4B8BE95D22F0746F01C953121762 = FARSCAPE_S1D3 (Farscape Season 1 Disc 3) | V | 0x20897B3037370FD186C0CB6508B42C9A ; MKBv42/FindVUK 0.96 -0xFCA5262809EF43301C345DD8A6AA3CE7D2FC12F6 = FARSCAPE_S1D4 (Farscape Season 1 Disc 4) | V | 0xFF61B16A24E53F2BCC444EBC854EEB83 ; MKBv42/FindVUK 0.96 -0x8337E85C8431EDC5F97E1809036485800E9670B2 = FARSCAPE_S1D5 (Farscape Season 1 Disc 5) | V | 0x35E55CEFB303CDB6B133C1CB0987A36A ; MKBv42/FindVUK 0.96 -0x30F04E5899F4E776298D795BDC133E4E480E22E3 = FARSCAPE_S3_D2 (Farscape Season 3 Disc 2 | V | 0xAE5223A528C6BAC80216A85ED5277877 ; MKBv42/FindVUK 0.96 -0x077A90D9FC9BA95B480108DAF91C4F0FC4C92367 = FARSCAPE_S3_D3 (Farscape Season 3 Disc 3 | V | 0xA0A9C7E313ADCE4FA020E74EE2B86B80 ; MKBv42/FindVUK 0.96 -0x30D8339720EB48552FD228352F50AF84B073F82B = FARSCAPE_S3_D5 (Farscape Season 3 Disc 5 | V | 0xBB592FABEE94BBC44CA14F4BA8BD5BF7 ; MKBv42/FindVUK 0.96 -0xD300E75E6CA373F84AADDDE4FD883E3B26D8051A = FARSCAPE_S4_D1 (Farscape Season 4 Disc 1 | V | 0x259056FE61F1DA80730B3160EA38B2E9 ; MKBv42/FindVUK 0.98 -0x0366F731E7953482424385EBC151279D0571D290 = FARSCAPE_S4_D4 (Farscape Season 4 Disc 4 | V | 0x282E75B12D7D5AB4642F8CA939AE3A23 ; MKBv42/FindVUK 0.96 -0xAA7555C7E7F5CA2E15F4FA6E4F1070391D6B4A87 = FARSCAPE_ST2_DISC_2 | V | 0x80135F0899CDB25A1ECAF6F17340A33B ; MKBv39/FindVUK 0.96 -0x401794472324333EB4802F1DFE5B8048BB5AE976 = FARSCAPE_ST2_DISC_3 | V | 0xA7AC2A769CD706CA1DB57EF008BBAADF ; MKBv39/FindVUK 0.96 -0xC05B046E5BE0A23C089712B1348475A362756CFD = FARSCAPE_ST2_DISC_4 | V | 0x2CD5BE1537C379E6E3C4D0CE1AC8162D ; MKBv39/FindVUK 0.96 -0x155750BD8BE8235FAD7CF44D064138711091DF90 = FARSCAPE_ST2_DISC_5 | V | 0x45B8D36F630FF62905CAFBE1BB14097B ; MKBv39/FindVUK 0.96 -0x342E691546DA65AFA46BC41D512142480DA7A5AF = FARSCAPE_ST2_DISC_6 | V | 0x4A505EED8001A4DF963EDDB921426290 ; MKBv39/FindVUK 0.96 -0x00AF940CE884FDC7FBDDCED789C588CBF9D3E6E8 = FARSCAPE_ST_2_DISC_1 | V | 0xEA2906DEFD6FBE1FFF55830D138A8CAA ; MKBv39/FindVUK 0.96 -0x5ED2A29A2A337338356E13949A53AA55E34E0AEF = FARSCAPE_ST_3_DISC_1 | V | 0x388730AAEB82EEAA0324B48BDF540961 ; MKBv46/FindVUK 0.96 -0xDAEA92F2782AECFEFD34A501797F26F44E8862E2 = FARSCAPE_ST_3_DISC_2 | V | 0x6708023716116158B4DDA5A32514876D ; MKBv46/FindVUK 0.96 -0x4CD418BDAB5294DB52CCDD5AFCAA05DA9777F3E5 = FARSCAPE_ST_3_DISC_3 | V | 0x10612920AAB753DA8B213F1E61BF40E6 ; MKBv46/FindVUK 0.96 -0x51E8469254568F3E9FD575FD93C15623847A3757 = FARSCAPE_ST_3_DISC_4 | V | 0x3AF17147C5E7AD3AD5DBC5DCFB4FE120 ; MKBv46/FindVUK 0.96 -0x83B855A93D2A076AAA316FD127AE5B6059535F93 = FARSCAPE_ST_3_DISC_5 | V | 0x9B566FFD91FFBBF3D23243913B846C27 ; MKBv46/FindVUK 0.96 -0x152EB09EFC5281C9E3405EEE41305DDA2DB1DC16 = FARSCAPE_ST_3_DISC_6 | V | 0xB20123C75E23E2161B8F53DDFF1F7351 ; MKBv46/FindVUK 0.96 -0x6BEAFEF4442B469AB837ABE070ED761BF63634C9 = FARSCAPE_ST_4_DISC_1 | V | 0x17C854587F48DBC7394A38E7C20E00D8 ; MKBv46/FindVUK 0.96 -0x9E6A6762CA9A0306E8DB37588676A16EBD0DEB14 = FARSCAPE_ST_4_DISC_2 | V | 0x43424F896611AE1597C74E0162454ADA ; MKBv46/FindVUK 0.96 -0xAEB5696A66063DE400D9727C533CB42717260017 = FARSCAPE_ST_4_DISC_3 | V | 0xE0D6ECCEAD3E9B59799B8BF18FC21F53 ; MKBv46/FindVUK 0.96 -0x676934343296F579C9CAF72E3BE0050C7C96E49A = FARSCAPE_ST_4_DISC_4 | V | 0xC26C33F734066EBB5D29AB0D28DF434C ; MKBv46/FindVUK 0.96 -0x372F96E4C1DB1C8210AFB58FEB62E7ACF3E43FD3 = FARSCAPE_ST_4_DISC_5 | V | 0x92E509356719D12DA84284BAEBBC2985 ; MKBv46/FindVUK 0.96 -0x06EC924D8E899F7475E93E973D0E20866A8ACB75 = FARSCAPE_ST_4_DISC_6 | V | 0xCB58556238730570BA6E6FF6651A428D ; MKBv46/FindVUK 0.96 -0x174805100BEB134B48C4EBF86E014445B6DD2CB7 = FAR_AND_AWAY_G51 (Far and Away) | V | 0x5DCFC2C6085EF2119D76F64068866DA5 ; MKBv47/FindVUK 1.00 -0xAC78F8609EE424E8C2F313FF92A3827456D67661 = FASSBINDER THE EARLY WORKS (FASSBINDER: | V | 0x77DD7068D3E29D72D34C45B68124E63D ; MKBv58/FindVUK 1.02 -0x80D431D3B3933977420B66C26D589D0949EB21D1 = Fast & Furious | V | 0xDEB7E279B8BC8193FE58AC146D95CAF5 ; CAN version movie box -0x501BC63ADD6B5A9784C7588E4BED8A534C1E9068 = Fast 5 | V | 0x88BDC81E80997D42FAE5376262A5F36B ; CAN version -0x558E25555D55A29006382A98FD149A88873B556A = Fast and Furious 6 | V | 0xB6875E3B80F1BC60E500F1A2F75B613E ; mkbv39 -0x015EB7E5A5E8CA5AE99AB02C3D5FFDD4CA4FAEE8 = Fast and Furious 7 | V | 0xA0D49E05706AA3AFB80FFFB34C46DC4A ; mkbv46 -0x2529C4F646935BDFFE90EAB1944F9E4EB4AA20AB = Fast Five | V | 0x232DD383E54C88FD4373A5EA904B5155 ; mkbv23 -0x573A99C3608EDB189027F69099EE6260768F1668 = FAST6_CANADA (Fast and Furious 6) | V | 0x03DE9EDCF394D49954874069CBBC3D55 ; CAN version movie box set -0x1A9EC92E36939524B789CF3B775A724DF931AF29 = FAST7_NA | V | 0xBE5576C8B5E1A1F8252AAA85A5DD16A9 ; Furious 7, Fast&Furious Series -0x115B61CD468300C77AA43B7066F40DE7DAE236F0 = FAST7_NA | V | 0x03D4F77D14D17B9E9C1011E8828FFA75 ; MKBv47/FindVUK 0.83 -0x12E75B165889C7BDD9527B4A5B784E1FBF7ACAB9 = Fastball (Fastball) | V | 0xC7D950DBD096BD71DC40B8BC0D0BC08B ; MKBv58/FindVUK 0.96 -0x4AB0B4D5E3235CC5A31D8E45E07A21D3DC24EE7F = FASTER | V | 0x1B42009AFA30E51AFEE5BFE63C87D272 -0xA417E35D84B3D3030DC4B49C9E9E840A5A6F2DC6 = FASTFURIOUS6_G55 (Fast and Furious 6) | V | 0x43293633A4DD85D9960742691DE9D004 ; MKBv39/FindVUK 0.94 -0x75FCE67EDB8C2DC389A1818B51417E69B775AF86 = FASTFURIOUS6_G56 (Fast and Furious 6) | V | 0x6BE3C3C27D5113C73DD110D95C8571BF ; MKBv39/FindVUK 1.02 -0x6BB8E5FEC7C2B21DC21021800B44B2F34F3C1C5F = FASTFURIOUS7_UPB1 | V | 0x81FC68C0A317CB25695B2C5CF37C2D35 ; Fast & Furious 7 - Extended Edition -0xD2B7DED36DB41028AD9F89941E4E1AF1AAB500A7 = FASTFURIOUS7_UPB1 | V | 0xD3CB7795A9F4D22A648059902C369032 ; MKBv46/FindVUK 0.80 -0x8FF70D87172E37C3540F462C6521DF9A95DA472F = FASTFURIOUS7_UPB1 (Fast and Furious 7) | V | 0x559F7F6ECE557454FF9CC9F2D7004330 ; MKBv46/FindVUK 0.87 -0x8AAF10954A786D14FB60A66574B203A5740CB825 = FASTFURIOUS7_UPB1 (Fast and Furious 7) | V | 0xDD58A5324CEAC582620C8FDDEE060841 ; MKBv46/FindVUK 0.84 -0xCAE431C289F61E9415E1708651C67EB8091C872B = FASTFURIOUS7_UPB2 (Fast and Furious 7) | V | 0x0D038FC124B72598A697BF85E363B5EA ; MKBv49/FindVUK 1.02 -0x6D81E1C8E93E9C21667D4226460766F2F56299A0 = FAST_AND_FURIOUS_6_G51 (Fast and Furious | V | 0xB70B1AF65A65D8A89739775685770DF0 ; MKBv39/FindVUK 0.96 -0x31A970BD9B1756937587BB22F1986E9BA8578BBE = FAST_AND_FURIOUS_G51 | V | 0x21A464FE7838A5C0D1094F36BCEB65B7 ; MKBv12/FindVUK 0.96 -0xE12F2A8318451354CB04DB2DCB8F1FFB9808F6C7 = FAST_AND_FURIOUS_G51 | V | 0xD769F8556FFB1F4DBED72203E00D5C08 ; MKBv12/FindVUK 0.80 -0xAAFE492BF35426AF0B070F8E883B8C5FD22429A0 = FAST_AND_FURIOUS_G51 | V | 0x94CB502C876C2CBDB4853EAD2BF12435 ; mkb v12 -0x0BD6D8917DB1F2508AFA57318E6A9D81565BF90F = FAST_AND_FURIOUS_G51 | V | 0x7529FAD61B35CCEA2D547A40E4A7E1D6 ; MKBv12/FindVUK 1.02 -0x26BB407EE3989C8A81E78936939F16584D3FA2CF = FAST_AND_FURIOUS_G51 (??) | V | 0xE776D7193F64A3C6F8A76D25625E5048 ; MKBv12/FindVUK 0.96 -0x22B5958F4564FDEA1ACE1F8B470D8D0B0951B5CF = FAST_AND_FURIOUS_G51 (??) | V | 0x924BF0D8EDD6BECC224059A4E11814B8 ; MKBv12/FindVUK 0.96 -0xFA9731EEFB9B514C11F7EF31F0D48DBAEC63BFB3 = FAST_AND_FURIOUS_G51 (??) | V | 0x478037DC881C644E2BAC443089AC6759 ; MKBv12/FindVUK 0.96 -0xF510F89D1756D0C93F0FCC044A8D040A09199338 = FAST_AND_FURIOUS_G52 | V | 0x0262461BB74F0856BD0CC920F5FB2C1D ; MKBv14/FindVUK 1.02 -0xA7D6D96EE37C5E48A7F06DAE40E44164C3C16295 = FAST_FIVE_G51 | V | 0x989D5671FDFBE0653A9E1594A3291E08 ; MKBv23/FindVUK 0.80 -0xF32C87E2AB291934D77CD066033B8086F03E1769 = FAST_FIVE_G51 (Fast Five) | V | 0xB6EC790872B490E75BB05F65658627FA ; MKBv23/FindVUK 1.02 -0x29891238308C1B269455B4D1B356DCD36742AA28 = FAST_FIVE_G51 (Fast Five) | V | 0x20C8B29F04197BCF77507B84EC2BD7D6 ; MKBv23/FindVUK 0.96 -0xA78DAD06317F081B3221D7E85746F41012DD60BF = FAST_FIVE_G51 (Fast Five) | V | 0x92EEBB98C28C9F5B3E110EBF476906D1 ; MKBv23/FindVUK 0.96 -0x5C2D61FBE1C6002A358B2BD5EEF116E759DF8836 = FAST_FIVE_G51 (Fast Five) | V | 0x70BA64D563DDDDB1CAE9473D0EB59ED5 ; MKBv23/FindVUK 0.96 -0x21CA46B7C9C5685CFEC43D4B9C86C977029728A3 = FAST_FIVE_G51 (Fast Five) | V | 0xFC87AB1335FF85F2EB24D55005F86D9B ; MKBv23/FindVUK 0.98 -0x3473A6B577E03047B8AEA9B4A92F2BFC5286E8DA = FAST_FIVE_G52 (Fast Five) | V | 0x95A15BE2E465FDDEC554C43FB3CDC43E ; MKBv23/FindVUK 1.02 -0x6CE3873669B869ACD691C40D448311A8A6D3ED02 = FAST_FURIOUS_6_G54 | V | 0xD639E425A2E1F8DC4DC068F4068E7DD9 ; MKBrev 39 - FindVUK 0.57 -0xC4EE3B8356E6F1757DB1CE8590FEC1E4ECFC9A1D = FAST_FURIOUS_6_G54 | V | 0x578FF39BBCA4B9C489E611959A68637D ; MKBv39/FindVUK 0.80 -0x5574CE7B993EE50C18A5BAB12AC006F97E21B906 = FAST_FURIOUS_6_G54 (Fast and Furious 6) | V | 0x6982C5012B545487720EA99BC97C182D ; MKBv39/FindVUK 0.92 -0x7CA4C183802C425FA3B3A7228D4A626689BC4022 = FaszinationIsland | V | 0x5AD3150BB57AD148612FFB4CB0313822 ; MKBv33/FindVUK 1.00 -0xC3350853121486DED0F1F2A35CAAEC15DF440233 = FATAL_MOVE | V | 0x1A16D45C39E45C4D784969D339006D94 ; MKBv14/FindVUK 0.84 -0x2B6381026A813996F37509B19EBAE1C5D3F94A7A = FataMorgana_LandofSilenceandDark (FATA M | V | 0xE1FF411BC4FAA9995818004A5A6B17D2 ; MKBv47/FindVUK 0.99 -0x9118D1E64661B3948F04D2F0D92A4EF1C921549C = FAULT_IN_OUR_STARS (The Fault in Our Sta | V | 0xCDCF6180E7EDF3D7B5A544498413F18C ; MKBv46/BD+/BEE/FindVUK 1.00 -0xA04D5DFD5B795C00045E8B75A2E8D246131BC5EF = Fear and Loathing in Las Vegas | V | 0xC61A4048A500ED457A126C5A1CA098BE ; mkbv16 -0x511635EFCB184636605114E3D0676E30703A2B78 = FEAR THE WALKING DEAD S1 D1 (Fear the Wa | V | 0xC4477D2327EE314E485943B2656A5F2E ; MKBv47/FindVUK 1.00 -0x344F3CF58A4A98952926BC696B4F8FBBE13F38A5 = FEAR THE WALKING DEAD S1 D2 (Fear the Wa | V | 0x545342742D91384DDBEF3E7720AFDD69 ; MKBv57/FindVUK 1.00 -0xD5FB339B6BB844712B778560A7BACC31651D7EA2 = FEAR THE WALKING DEAD S2 D1 (Fear the Wa | V | 0xF9168CE34D8CE7F8746ED3BA4CD46220 ; MKBv61/FindVUK 1.00 -0x2F9CA7D9CFA9107D0BAF9D426EA0F6B9B0A11059 = FEAR THE WALKING DEAD S2 D2 (Fear the Wa | V | 0xCDE50B68E5EE9771C2F5517A29E67AC8 ; MKBv61/FindVUK 1.00 -0xF6E2856E80342F4B68647B033EC382059883CAED = FEAR THE WALKING DEAD S2 D3 (Fear the Wa | V | 0x80E9C13E73E074C06D2DBA2030684123 ; MKBv61/FindVUK 1.00 -0x70C2BB9C3C1BDE1F74DAF3246CBE32A239185EDA = FEAR THE WALKING DEAD S2 D4 (Fear the Wa | V | 0xF6357ACE89625E90F78169B6A0D3F92A ; MKBv61/FindVUK 1.00 -0x85CCC0E46A087C97291E2E6BC97AC5DC25C39B11 = FEARLESS (Jet Li s Fearless) | V | 0x7581E60CF1540F223AA652244EE240A0 ; MKBv8/FindVUK 0.98 -0xB29A3E97C3A0C8B3677049D11FBA5A79EF3FA985 = FEAR_AND_LOATHING_BD | V | 0x5E62BC51EEF0EC8D3D27498F03774CEE -0x3DADBC7EEE2191A8F38C26D0B1801D45E5C430F6 = FEAR_AND_LOATHING_BD | V | 0xB0C07289B26F5258E1BB0B6A472BFE30 -0x00F1AA28D108A37F93718287CECB9A7FD568C611 = FEAR_AND_LOATHING_LASVEGAS_G52 (Fear and | V | 0x783B03386C5C160C4957B751E5331917 ; MKBv47/FindVUK 1.02 -0x4E2723B88A483DEF38358A7E41C75E2665587B74 = FEAR_THE_WALKING_DEAD_S1_D1 (Fear The Wa | V | 0xD2422EFF3A9F4DD7D295A83D28DC0BAB ; MKBv55/FindVUK 0.96 -0xA99CD4E0FB9585113AEE3C00A72B1989F29C3CB4 = FEAR_THE_WALKING_DEAD_S1_D1 (Fear The Wa | V | 0xFDD7ABC721DB301A440068EE2DFE8C27 ; MKBv57/FindVUK 0.96 -0xFAEF92A75BC7984FF5AC4466E6DB2E3037518738 = FEAR_THE_WALKING_DEAD_S1_D2 (Fear The Wa | V | 0xDEAB7A30581D516173EA9334FDEA6181 ; MKBv55/FindVUK 0.96 -0xE1B33A850EE2B96B6E65C5719BA68747975B3CFE = FEAR_THE_WALKING_DEAD_S1_D2 (Fear The Wa | V | 0x37C8D9FEA88E9CCB3B62835D88F17ED2 ; MKBv57/FindVUK 0.96 -0x4BDA57C08F0A50D8038EB70261C2DCCA984E6FFA = FEAST | V | 0x1DC3A0C10E8B835C5C91DC23010D17DC ; MKBv21/BEE/VUKNOTVAL!/FindVUK 0.95 -0x631E71EBEF1C8CBCC0F9E8A78CF7B6E7036C679A = FELLOWSHIPOFTHERING | V | 0x012D8DC7FF7355DBBE1F67112901D57D -0xB2197C4A774178676E471E46BDCE173C8F8914E1 = FELLOWSHIPOFTHERING | V | 0x7399CEF211C88E69381D2DDD0B0824EB -0x1288C49D74F61D5AAB6949BA4008A96357D4CD1F = FELLOWSHIPOFTHERING (The Lord of the Rin | V | 0x33B33ACAE14B24A72E168BEE18D35A88 ; MKBv16/FindVUK 1.00 -0x49E3C2EB3DF6697BF6613F84775EE419A817C06C = FELLOWSHIPOFTHERING (The Lord of the Rin | V | 0x6C6693B4974EF8DAF2D6B9C542E1B468 ; MKBv16/FindVUK 1.00 -0x93BB0B40B871653D6E483D0AAED5D784E86EE806 = FELLOWSHIP_OF_THE_RING_(FR) | V | 0xFC3E894E80FB89BD8318944E91A89155 ; MKBv16 -0xE5CAB83C2E4B3D21E8BF779B39D7F0BC2FA9C34B = FELLOWSHIP_OF_THE_RING_EXT_P1 (THE LORD | V | 0xEEE4429F18952C5A26BCED8572E9915D ; MKBv39/FindVUK 1.02 -0x91AA61E3FEC6E097F45625317E3181C423A0EAE5 = FELLOWSHIP_OF_THE_RING_EXT_P2 (THE LORD | V | 0x4CA4099C44ADE5347A7F23AC3804DCE3 ; MKBv46/FindVUK 1.02 -0x371B62A0CBB78CBACE936E0D5674E550C517ED5E = FELLOWSHIP_OF_THE_RING_EXT_PT1 (THE LORD | V | 0x7438DA33EBE97E9782299FAC29D6DC22 ; MKBv22/FindVUK 1.02 -0x643E0585A620E16D15321F1FE8FE892EFB94987C = FELLOWSHIP_OF_THE_RING_EXT_PT1 (THE LORD | V | 0xEA10D69515602B7F3990D3DF828D1C77 ; MKBv20/FindVUK 0.84 -0x2D21B16A45D637511BA740A108B46A4CA569EF02 = FELLOWSHIP_OF_THE_RING_EXT_PT1 (THE LORD | V | 0x64927A0B61E0EE6E0729E0784628A595 ; MKBv19/FindVUK 0.96 -0x2E44736DDCFEB36C473BBEDB1CDC9D2F1B6DDDF8 = FELLOWSHIP_OF_THE_RING_EXT_PT1 (THE LORD | V | 0xFABD62F4663A4502BFAD309D572F1D9D ; MKBv20/FindVUK 0.96 -0x9FB186FDD6E2F079634C9F95D33035CC15DBA40C = FELLOWSHIP_OF_THE_RING_EXT_PT1 (THE LORD | V | 0xEB5E9F93173E24B84FBD13FD4E7D5C56 ; MKBv20/FindVUK 0.92 -0x8419B67A539E75F0ACB38548F2AFE5B1BA70EC02 = FELLOWSHIP_OF_THE_RING_EXT_PT2 (THE LORD | V | 0xD66908808485D6A044908EF3AE33190F ; MKBv19/FindVUK 0.92 -0x28E2F779E51C3F9DD303807F2BD7E8D5C9146682 = FELLOWSHIP_OF_THE_RING_EXT_PT2 (THE LORD | V | 0x47319F38CD679A7583B52FA651573C62 ; MKBv22/FindVUK 1.02 -0x93D8045FFBDDD88C204F7C601956FFC791C9E160 = FELLOWSHIP_OF_THE_RING_EXT_PT2 (THE LORD | V | 0x822D02196B0ED4FCEB2E6C7EFA9C877A ; MKBv20/FindVUK 0.96 -0x16C8B393022FD1365FA2B6AB7737A7C9545E7812 = FELLOWSHIP_OF_THE_RING_EXT_PT2 (THE LORD | V | 0x07D4FF97265B205FB21B09C15DBE3596 ; MKBv19/FindVUK 0.96 -0xCC3BB2CDE6C44BE30F4A059C4B17AD7840BC65F5 = FELON_P3 (Felon - Blu-rayâ„¢) | V | 0xB0C555160B0AD2CE3799B8793A8C82D0 ; MKBv7/FindVUK 0.98 -0x3A96E048DC846C8B6450EBE5CC301BA99298C5CC = FELON_P4 | V | 0x4A9758FEB0B025D7214F9B9CBD1B51BB -0xA21D6FD5B9B483E7FC3374F4E3366609C2287E4D = FERRIS_BUELLER | V | 0xCE497BE8E0FD18A1222A855E94FBE0C5 -0xFC96BD2983B6877CC7898B4703AF609428F8ACC7 = FERRIS_BUELLER | V | 0x0226265ED3B89380ABB4959B935F0B46 -0xD4A988DE7A630BCC270B7AB7A1DB38B7A21A07AD = FERRIS_BUELLER (Ferris Bueller s Day Off | V | 0x9BAC584FE884E984D3C602A3F6E68E91 ; MKBv12/FindVUK 1.00 -0xA341A69318147BD7C6C53AAB84E571A12227D2B4 = Feuchtgebiete | V | 0xD1DC115F4D9E06FCEF67DBF03C7067BB ; MKBv44/FindVUK 0.80 -0x3D51A05747D72200CE8AEDA47EA4DF020B5C4AED = FEUER_UND_EIS_BD | V | 0x50738FE8AB892FB64D04CC3E0CF0AF72 -0x9C3DDE30A03E8B2C93F924396F67E266F5CE17D3 = FEWGOODMEN | V | 0x5E5D204C2D957B9C24A1D4D00AEE8D98 -0x989B27C047903E53C68E07DA33DFD38DF99C73E8 = FFXIV_DUALITY (FINAL FANTASY XIV Duality | V | 0x1C38CA209F2F7AAD569FA73BBFC5FE23 ; MKBv62/FindVUK 1.00 -0xD227F9C2D9CCBD7A637B2DD92CB1DEF1F1506EF6 = FFXIV_FATU (FINAL FANTASY XIV From Astra | V | 0x7B0BAE1CFF34ED94C81E0540DD50709A ; MKBv50/FindVUK 0.92 -0x627823039894D27877424919B15B73E9EAFC2A1B = FF_XV_OST_BONUS_DISC (FINAL FANTASY XV O | V | 0xF5D0FA94B475D427711938AAF7CE7154 ; MKBv62/FindVUK 1.00 -0xB187603949963B07C38150D9F1077C59781043DE = FF_XV_OST_SE (FINAL FANTASY XV Original | V | 0x36CC4613E1C2A4CAE9D5A86AF2E38A50 ; MKBv62/FindVUK 1.00 -0x2D7D7416147CDDB7F747E050CB36B9829310DE19 = FIELD_OF_DREAMS | V | 0xA4B828E423597A9493C51BE0B904DB86 -0xDEF545CEFEEF3B954511CF71458C0730C333BC4C = FIFA WM 2010 Alle deutschen Spie (FIFA_W | V | 0xF937C3D11D7A4C5228BE7676BFE761D4 ; MKBv19/FindVUK 1.02 -0x588801EB55698D39636FB07A46308B992EDE30B1 = FIFA_WM 2010_Alle deutschen Spie (FIFA_W | V | 0x70FDE35DE5864B5748F7BAFE913D0FED ; MKBv19/FindVUK 1.02 -0x449A8AA6B6B4902277259D8AB58C70470405D9D3 = FIFA_WM 2010_Alle deutschen Spie (FIFA_W | V | 0x566416BA80E97E11DB6EA684C69D8DB9 ; MKBv19/FindVUK 1.02 -0x1D390110F579299BB2F0C2EEC67FFC01A3D7E5A5 = FIFA_WM 2010_Alle deutschen Spie (FIFA_W | V | 0x20405092813DE8A582A64423479A7E63 ; MKBv19/FindVUK 1.02 -0x51D3196D53CB2AA3166B3E397370543C28E2C66B = FIFTH_ELEMENT | V | 0xE41477F733F47C263D1B1A3DECD14EEC ; MKBv3/FindVUK 0.99 -0xC7F9701A56253E2BF13358020CEAB500D24A770D = FIFTH_ELEMENT_BDROM | V | 0x38CBB635986B96F2953AD63A3F20703A -0x9A6FC8628A2F7216DBE4631C0A99B0A22028E9EE = FIFTYSHADESOFGREYRENTAL_NA (Fifty Shades | V | 0xA02891BEB3597CA3909E5FCF079DF44E ; MKBv47/FindVUK 0.83 -0xE3C7B6627149111CEB6ABBBBDB752641D79F3764 = FIFTY_SHADES_OF_GREY_UPB1 (Fifty Shades | V | 0x8A2AFDC64E6E5BC31A50EF84190DE6FF ; MKBv47/FindVUK 0.96 -0xE5ABD2B1BFBEA01A2554336FEF71852152234A94 = FIFTY_SHADES_OF_GREY_UPB1 (Fifty Shades | V | 0xBD5B946419B58A29531073377E89C006 ; MKBv47/FindVUK 0.98 -0x86176D6AB58031AF4D82EB4E026F6ED8B1779DA5 = FIFTY_SHADES_OF_GREY_UPB2 (Fifty Shades | V | 0xB8B0F97EDB1EF2C5156119F9DF8A13B8 ; MKBv47/FindVUK 0.98 -0x922460C1935C6B044CC8B951321B9E7D483C38F9 = FIGHT CLUB (ESP) | V | 0x75FB2170F9E3A5CD1E6A647A03AD0D2A ; mkbv16 BD+ -0x2BB59A2A11643895DE230AD794145570BEA4D104 = Fight Club (US) | V | 0x3F000E8354BDC6312E8D717DC5DE0B50 -0xDBA9E37E6913B5A000B30F4AC220FCC8FF965454 = FIGHTCLUB_BD | V | 0xC3686E6160600B5CD1F4AA2923D2C781 -0x3A1F4A702DE4810A89E1D1CAD283936B70A4E438 = FIGHTER_PILOT | V | 0x87A30C92401ECACD8AC70836738E63B4 -0x759AD1AE5B06777877AD492480CED69F63456FB1 = FIGHTING | V | 0x7A88851A84C8E797A78AEC5C47E2D004 -0xB1302C6D50CB84D3407A0EF58CA231FACDB09CDC = FIGHTING | V | 0xF522F6786317D9F81759C02040D10CB9 -0x351B764E8E192239A98F5FABC8D2DF81FA7D1DAB = FIGHTING_G51 | V | 0x17CEAF3EC27A2FC8EDCD62BDF454BFC2 -0xDE8268DB4EB180633ADA6110508E32C546F5E05A = FIGHTING_G51 | V | 0x59A3E9FA7112ED099D249BB4C94A7C1F -0xE7B89656874B64339F68712321260E17B54D0CBB = FIGHTING_G51 | V | 0x5E9F7CC68130881B5240B59DF1A37CFB -0x57655B903417FA3221B1D3B3514FC5929C9DAFFF = FIGHT_CLUB | V | 0x169A407B76CAB88D84ED14A3D62252B6 -0x3D71EEC8671DEF37B5E7C9A508469DCABF7CACCF = FIGHT_CLUB | V | 0xC78AD36A7596398E4BC3871A85C975B0 ; MKBrev 14 - BD+ - FindVUK 0.54 -0x5F0B486D71D05404C8C6AF684D80BBB053E19799 = FIGHT_CLUB (.) | V | 0xCEA2ECE95051BA36110BE3DDAC4FBE0A ; MKBv35/BD+/FindVUK 1.00 -0x0FC3A2AC76379365A762F7A5295D058C97A85AD9 = FIGHT_CLUB (.) | V | 0xACD10DD0EA76F40248952EBCB2C71DAC ; MKBv14/BD+/FindVUK 0.98 -0x5B8017A7D67744FBC1C79E0E4EAC27657ACF4401 = FIGHT_CLUB (.) | V | 0x7013EA2FEEFB5A8813B387F1D87FA408 ; MKBv35/BD+/FindVUK 0.84 -0x655AFCA5C43C2F6009814A854E1498DE95D31AEA = FIGHT_CLUB (.) | V | 0x0B48C1FEA2B7F9263C59AE4B6142F8F6 ; MKBv14/BD+/FindVUK 0.91 -0x370E73774FBDB0CADC0018EDE2C6B45577762720 = FILMED_IN_SUPERMARIONATION | V | 0x1FC520F9269F44070C7064AEC3DB698C ; MKBv48/FindVUK 0.94 -0xF6E60F7322C65754FCF57B91BFEADFA44C09BC6F = FINAL DESTINATION 5 (Final Destination 5 | V | 0xAD8621DF5B626DEB93722D998488413A ; MKBv20/FindVUK 0.90 -0x05CAF8087F49C7CD80AC077E8F19AD1B0FE0EA70 = FINAL DESTINATION 5 (Final Destination 5 | V | 0x5ECC12C38969D9CE8A90059626545B95 ; MKBv20/FindVUK 0.96 -0x57DD6F7959CDBFD6231453DFF7DC6CDAAF82A118 = Final Fantasy VII: Advent Children Compl | V | 0x9DCEDAD826BE2230F0382EC8937061C0 ; mkbv12 -0x399DDBE80A71CF515F330693993C0B738DB26B5F = Final Fantasy: The Spirits Within | V | 0xC465EA87137F528972C2D02521C125DD -0x6F89972E8EC1063910F718F865963D5E3968C37D = Final Fantasy: The Spirits Within (ESP) | V | 0xB21B4FED98CDF5CD07A8607E199F2F8C -0xB5A9B60D7F125C11B1C1D52142AE9B5B3058975C = FINALCOUNTDOWN_FIX | V | 0x65D44878AF785093CBA881FD8E286D8D -0xA0A87958D81845CF3BDAB98C6F6D72A34434E0DD = FINALDESTINATION2 | V | 0xCCCEDE657609DCC9D7F06E525DB6B4B2 -0x6199155FF580A453F254D192910C99B979568128 = FINAL_DESTINATION4_D1 | V | 0xD9895E3988C47BBB776FCF3A49025F8D -0x90CD5F374E5E916A8B090228A5F4B8EF97AA39CE = FINAL_DESTINATION4_D2 | V | 0x86FEBB96C44F3DF821191ED2610780F3 ; MKBv16/FindVUK 0.84 -0x6DEF766049D753A1505C6C4283847A69285DEDED = FINAL_DESTINATION_1 | V | 0x7CA8DF7BAD2C29FECD05BC2270C7E7C5 -0xA2242550634DBB237A16BE0FCCFB17BF0B04C2A7 = FINAL_DESTINATION_4 | V | 0xE0BD438EF7B5641F9FA8D6DC188A2D9C -0x7E86D3B034DB1FF42FF92AD5DBE60005FBBE0112 = FINAL_DESTINATION_4 | V | 0x58DA21A92249E6CDCD4F40AE6563D9DA -0xC70C922E07E4A2B2FC6CF18A3EDEE1C7A75F9E72 = FINAL_DESTINATION_4 | V | 0x253E36623380BC0F96944F781EFC5233 -0x067155F5591F65F96BF9893DDFA70E87E46C1DB0 = FINAL_DESTINATION_4 | V | 0x6AB12670E2BE8F9E1C93114334E5ED10 ; MKBv20/FindVUK 0.96 -0x32828042902FC79A2647567B477DD71783BF4FB2 = Final_Destination_4_3D (The Final Destin | V | 0xCF5C2D5705E49B762DBBCF6EE11D8FC8 ; MKBv19/FindVUK 0.90 -0x7CC6DB26689377F52AA614D873C6038AFF01B8BC = FINAL_DESTINATION_5 | V | 0x6CDC0EE0230C8DFD0BF3B587A821E5F0 -0xC1BA356F58363D7FD5B858DAF1E7BC79F9B110AE = FINAL_DESTINATION_5_3D (Final Destinatio | V | 0x3AF41DDFC6A4C52AD5101A51B85E062F ; MKBv25/FindVUK 0.90 -0x36CB8945484CBFED6BABFC3037ADDF779CBC10BC = FINAL_DESTINATION_D1 | V | 0xE0A1B66115641C92C292563F1910C6D0 -0xA6FC2ED3085B02A7B0AACE8D20ACD83424CFAD07 = FINAL_DEST_2_ITA (Final Destination 2) | V | 0x9C3ADCA993079984772545963CE6F81E ; MKBv23/FindVUK 1.00 -0x2663EEE4E084CECB1C281EBDE87B680C07804D69 = FINAL_FLARE | V | 0xEA86A618DE78C35658B0C4B225121DBA -0x1779C840B17BF449EB57B30488CAE8B135D6924E = Finding Neverland | V | 0x531C9FA8CC267E37AC2CA052EA523DCA -0xEF4C6CFC8827D03D235F9924C841C97915167CE3 = Finding Neverland | V | 0x3387F05B5A69D46B4454BBDA3EE23F08 -0x48C22F33BD463D7D43B5095CD7DBE9ADF8695BF9 = FINDINGNEMO (Finding Nemo - Blu-ray???) | V | 0xC1F5BD7BAD61D71F90B3116EF72AD8D6 ; MKBv31/FindVUK 0.96 -0x7EA329F253A42D444C06D0020DB57ED92B26FF6F = FINDINGNEMO (Finding Nemo - Blu-rayâ„¢) | V | 0x2656E2F2E78F6F7D00971B4BF72E86D6 ; MKBv28/FindVUK 0.98 -0x2BA5672F9D09618312484027D02DF0C5C66C7390 = FINDING_DORY | V | 0xED9FE207D6EEF77B6A0101866CBAE164 -0x3D8ACA46A86FDBE83ABC9DAEF8BC26CBE1236AC6 = FINDING_DORY (Finding Dory - Blu-rayâ„¢) | V | 0x44FAF5D995739A715BF645F8E8146C5C ; MKBv58/FindVUK 1.02 -0x1D8F3F775F1127991A58597355DF6D653B19A090 = FINDING_DORY (Finding Dory - Blu-rayâ„¢) | V | 0x738191EED2090B3AD1B87662F7D3A18D ; MKBv50/FindVUK 1.00 -0x2954FC04DC9DC6B47AA4F26E44D01C07937AAAF5 = FINDING_DORY (Finding Dory - Blu-rayâ„¢) | V | 0x177267BC12A2CC4C554EC5790ED9656E ; MKBv50/FindVUK 1.02 -0x91AC8C3B550CBE8162AB579DCF20B03D5E3A5B3D = FINDING_DORY (Finding Dory - Blu-rayâ„¢) | V | 0x83B254A11E1329340ACA34EFED27B591 ; MKBv50/FindVUK 1.00 -0xDD351F047EBCE0787F839AACE60446BC66EEDC11 = FINDING_DORY (Finding Dory - Blu-rayâ„¢) | V | 0x27F8489C1D15A3105B5B642D416840F6 ; MKBv50/FindVUK 1.00 -0xD02EDA98BF401EA8392DFF9AC649D7AB3DF00884 = FINDING_DORY (Finding Dory - Blu-rayâ„¢) | V | 0xDEA841937F4BF2F732E6E9C5F45BEE54 ; MKBv50/FindVUK 1.00 -0xA18D1623ECD1028623EF26F48607E0E8D8E73610 = FINDING_DORY (Finding Dory - Blu-rayâ„¢) | V | 0xEEA3A250B9C872C9E2B0D08368FD2601 ; MKBv57/FindVUK 1.00 -0x5762F5C0B01653F19412317A455C3199B5F8C1B5 = FINDING_DORY (Finding Dory - Blu-rayâ„¢) | V | 0xF058B0373A2E206BFC5199246ABCE852 ; MKBv56/FindVUK 1.00 -0x6B5F360C6AB3B49C8A229F51D3B649F7FF77C363 = FINDING_DORY (Finding Dory - Blu-ray™) | V | 0x6D1A1E93CC45FF2B069CCA9FEA42B10C ; MKBv50/FindVUK 0.92 -0xCFCB9F7750D41B7AEDB3AC440861DA56B3F9EC6F = FINDING_DORY_3D (Finding Dory - Blu-ray | V | 0xC64249DFAFCFABC3883FDB709ED92669 ; MKBv57/FindVUK 1.02 -0x6E70101CA49E21BB9A0EB48C006F682923AB195E = FINDING_DORY_3D (Finding Dory - Blu-ray | V | 0x8CEE2A895FFABCEC4DCAF8656AAF2AE7 ; MKBv50/FindVUK 1.00 -0x8D3FA99303E23F9F246C6C01461B8634ECD786F1 = FINDING_DORY_3D (Finding Dory - Blu-ray | V | 0x3627BFEABBD13C8F25875D229016D24E ; MKBv56/FindVUK 1.00 -0xE20760AB019C4812A15F2F39306C7846FF05F7F2 = FINDING_DORY_BONUS_DISC (Finding Dory Bo | V | 0xDDBC4784B105C970C3B492D47CA82E4C ; MKBv57/FindVUK 1.02 -0x8C7A5C3146E3C8B4F0C542022A934C4DB7B6B6BF = FINDING_NEMO | V | 0x25148B3AC22C3D33CD269F6E9C287765 ; MKBv28/FindVUK 0.65 -0xF94A49F9CDDED2537B948F092C5070EC89459F3F = FINDING_NEMO (Finding Nemo - Blu-ray???) | V | 0x35A844D8D7FD9D5D62F5014C5C9557A3 ; MKBv27/FindVUK 0.96 -0x72706993EFA2B3FA5B014343D718B11F640DF36B = FINDING_NEMO (Finding Nemo - Blu-ray???) | V | 0xB721C37D2B8DC021F3A35E487FCDDF0B ; MKBv27/FindVUK 0.96 -0x09B12C8DDE866D7A25FC60397BEF2820A93A9941 = FINDING_NEMO (Finding Nemo - Blu-ray???) | V | 0xDACF6535075451751339D0E0875FE26E ; MKBv27/FindVUK 0.94 -0x34AC67EC97DA378953415125ACE6B2319709D0AD = FINDING_NEMO_3D | V | 0xEF5F15BD3DE313F119F1D5936ECBB391 ; MKBrev 27 - FindVUK 0.54pre -0xBC98629A685C50FFE5461B512631F634932ED7C2 = FINDING_NEMO_3D (Finding Nemo - Blu-ray | V | 0x2BF8F5F1A4D51629B5C83D6358B89919 ; MKBv27/FindVUK 0.98 -0xBF5B90215C12121FFED59CE78B6EF522DA3BCD67 = FINDING_NEMO_3D (Finding Nemo - Blu-ray | V | 0x6A772F197C53D7F04FEA35A8AC252219 ; MKBv31/FindVUK 0.96 -0x35CFE28B1D5DB8C9E56A720B39CF591A1E1BF24D = FIORI D_EQUINOZIO (Fiori d'equinozio) | V | 0xF3D7D60F488C8CFBFE82C340E9EBFA91 ; MKBv57/FindVUK 0.89 -0x06C4D56F4E7BDACF0776936A94B658A5E78ED5A1 = FIREBALL_XL5 | V | 0x2EE24839FF2F83B7957B229D9B270DF5 ; MKBv15/FindVUK 0.94 -0xFF2421BC238549031ADAE397CD2DAEE2F08F1516 = FIREFLYUS_D1 (FIREFLY: DISC 1) | V | 0x6FE41FA17C8B52CDC4A04C391E92B3C6 ; MKBv9/BD+/FindVUK 0.99 -0x696283A674CCC24CD1F226CEFDF0EAD38109B364 = FIREFLYUS_D1 (FIREFLY: DISC 1) | V | 0x21D5FAD5FB96092E002DBDBBF725ED17 ; MKBv9/BD+/FindVUK 1.00 -0x899BB2D93710E183740683F4BDE4013860DA9057 = FIREFLYUS_D2 (FIREFLY: DISC 2) | V | 0x3F88AD341947A922541E35921B6E615A ; MKBv8/BD+/FindVUK 1.00 -0x5C2A215C058BDD076F0A113395198B5EA2F26E2D = FIREFLYUS_D2 (FIREFLY: DISC 2) | V | 0x7622643660E2E7873E181E828A094FA0 ; MKBv8/BD+/FindVUK 0.99 -0x535A7B98D2A15BBD3AEC566117BD3492672C2270 = FIREFLYUS_D3 | V | 0x902D050AEC0B50EACA6C99FF9C70E6AB -0xF928E059C620AC03120DD69ADE11424110FEE621 = FIREFLYUS_D3 (FIREFLY: DISC 3) | V | 0xD2A1A907FC952271E328CC5DF6237DC3 ; MKBv9/BD+/FindVUK 0.94 -0xDDD7302B9A198D46D533AA022919EC5115C22F84 = FIREFLYUS_D3 (FIREFLY: DISC 3) | V | 0x971D542D84140B58741E40501C16CCE7 ; MKBv9/BD+/FindVUK 0.99 -0xD8FAB87A0FD3891167DF36570047CA1E403A00DB = FIREFLYUS_D3 (FIREFLY: DISC 3) | V | 0xD08E0620BF721C8C5D035906C732B3FE ; MKBv9/BD+/FindVUK 1.00 -0xCCBCFEFF89BFBEF44644A358C5ED18E44C29BD5D = FIREPROOF | V | 0x3CB93BBD28953E51300542CA69A7BB8E -0xE3B78498F660DED4D9FE0672C4439B48F3063C4D = Firewall | V | 0x268725501944237F79541EDA32FC0AFA -0x752762BC782EFA3168E39131BC7D17F753DD5E90 = FIREWALL | V | 0xBF85B538F950DC70AA134F5EA75CDEB0 -0x3FF7198D946E0C79F43290F17F8E7C548902AC33 = FIRE_WITH_FIRE (Fire_With_Fire) | V | 0x9EB5C74E301CE41F83F955C4991AB498 ; MKBv34/FindVUK 0.95 -0x9446527752EA982DED3FD73D789C3A4E1F33C93B = FITZCARRALDO | V | 0xEBB5A023B15C746659B67AD9C08AD970 ; MKBv47/FindVUK 0.99 -0x1C2EC13370B4FD137E78F2A2697172D6D3ABA469 = Fitzcarraldo (FITZCARRALDO) | V | 0x92769AE05098858EB13435E441573ECD ; MKBv47/FindVUK 0.99 -0xB14A2BC2DC64D80025815FE42237319D063385E5 = FIVE MINUTES OF HEAVEN | V | 0x8FE25DABECE940A9AF88A47905724AA3 -0x49F8A1A85769B52548D8DE8E5E24DC079690C601 = FIVE_DOLLARS_A_DAY | V | 0x6778A5C46CC291B54B74843CF8D625E9 -0x509A0A831370A1B4865802D29E05B26C69211B3C = Flags of our Fathers | V | 0x59A2125C3E7C38E12B8E2C7C24D36C27 -0xF16E04F8CF20505793AE27F23C94A9E8D63B5E26 = Flags of Our Fathers | V | 0xCB410D73EDC17210E72F1A003C248248 -0x3B16E9DCF120B78540B48C3691EF962667856903 = FLAMECITRON | V | 0x23478FA7F37EC0F188AC507949FC5F28 -0x4802C7E1321314BF6B7F7721B26C58E750461D44 = FLAMMEN OG CITRONEN | V | 0x70CDC6E26B0EE4B70407B58F9FF75FDB -0x6662866642ABFA3CA5C094B173A2814163B3BA0F = FLASHPOINT_DISC1 | V | 0x00711D09349108ADD9A1A65C71CA286C -0x950ACC7C30AF660E1A8FC760E1D846A9179C29A8 = FLASHPOINT_DISC2 | V | 0xBC8A038B79D2C0406EB9B6DCC5689EA2 -0x8C0143BE671C676F6397F374DDA2EE69F983C8F7 = FLASH_GORDON | V | 0x9559C874E2B59DFAD23DBE5F6C120CCB -0x6C0701FADC33C7A1BDAA945A00DD832CB09FD8C9 = FLASH_POINT | V | 0x8FBB54C7DD21D4C66304212EDFFF1CE0 -0xE7240E922C8DF7C02C0A6D85027C866F1B9CF05E = Flatliners | V | 0xE7F7D692B103703ED6B42B185EE9DBA3 -0x05BC8AC2A5B426970200F2EC83258BACE5833612 = FLAWLESS | V | 0x1DCB7BF5546F447368CE663D5F6224B6 -0xC6656B3C5853B7BCA80ED14302CBC9B805C362DE = FLCL (FLCL) | V | 0x8D6CE0C8C81C7AFCB99BFD7B13156D65 ; MKBv19/FindVUK 0.86.3 -0x1FC17C2430DE7890B862CA3BA3C4C311F1A1E992 = FLCL (FLCL) | V | 0x3C36DDE2938973B530DB06ACE3F15429 ; MKBv21/FindVUK 0.96 -0x0BBE525B22B2C7D478F18F86827486A5EA2F3824 = FLETCH | V | 0x9AA9D972227585EB16D8034B61295ED2 -0xB42187517784335CE37153FF2F27774E1BD13E88 = FLIGHT (Flight) | V | 0xAF60B4C3D04CD8084E664067E2B9821C -0x849DDB5A77D9AC2AB0B93C75CA6D0526D6502D66 = Flight (Flight) | V | 0xB09A02F5A9E60AD5BA1BC31D2ADBD4BF ; MKBv31/FindVUK 0.96 -0xC5C222D4BEDAF36C3399783C9541C363F969AA22 = FLIGHT OF THE PHOENIX | V | 0x175285A229C42CB5E758631C846FB71B -0x74F0DB13B54FD08A64ED782AC9581D57F62338DD = Flight Of The Phoenix | V | 0x281D922EA835A79977E71BBCD9E5D003 -0xF3E10AF78FE5A73596BD3BAE3E7A18F3BCEAFAF0 = FLIGHT_BD (Magic of Flight) | V | 0x77C97B4B388989247540B880B41E6913 ; MKBv12/FindVUK 0.92 -0x8488FE2371E411DBE0040BA268BD1149BD4D623F = FLOATING WEEDS (FLOATING WEEDS) | V | 0xF30A8208741E6AACD1C3B4066C28FCCF ; MKBv31/BEE/VUKNOTVAL!/FindVUK 0.98 -0xEF3994C6C8BDE3F1CC270CF1FC572D2DBB217234 = Fluch der Karibik I | V | 0x4EB56EF9D580DA2AF114E03709E41D63 -0x78315BF45BEA790108B71843C0AC22F5F6EDFABA = FLUX | V | 0x0978D5C2228E190F01E7C4B88CE537C0 -0x05449649C9E5C247C72910781888F632072610E1 = FLYING SWORDS | V | 0x3C4E23559A1F5FC2C67E0D4BE6C02B12 ; MKBv32/FindVUK 0.80 -0xC217C9B4F8DDDB814762B385AFD636D2B004DFD3 = FLYING SWORDS OF DRAGON GATE (FLYING_SWO | V | 0xCDD401591C98B32C961C84124D4E7444 ; MKBv31/FindVUK 0.84 -0x78333C913D302CFD07F84133918F34C910FC4BB0 = FLYING_SWORDS (Flying Swords of Dragon G | V | 0x832D1867219B0DCE3AF0B772965C9DB9 ; MKBv31/FindVUK 0.84 -0x2E07FDE605F3DCBDFDAE6FF1DC8CBBCCEC5936F2 = Flypaper | V | 0x10FECECDF926C903F7E0C2678BE29382 ; mkbv25 -0xEF3112B92983F5687B086C902F9BA0BAB6445C7B = FLY_AWAY_HOME | V | 0xA414E2CC120DC04F9A3F8EC2A79EB21E -0xD4EE5DBC62687431E9044C6E0B9865AD267BB105 = FLY_F4 | V | 0xC456AD5F5DA999A9D5F2D82FB9AE11CE -0x430A8937DED07196811192E723B051972FBA25C2 = FMA BROTHERHOOD OVA (FullMetal Alchemist | V | 0xEBDE403F72FD83CB4C7A6C358B5061A8 ; MKBv26/FindVUK 0.86.3 -0x53162AEB8BCBD342C4890C678EDBDBD3A26016B1 = FMA BROTHERHOOD P1 D2 | V | 0xD0D79CD7E72637A4AC2C390CF0F854AD ; MKBv19/FindVUK 0.80 -0x928D2F6B5E79E48000A4007B68B3B193AC0C3981 = FMA_BROTHERHOOD_OVA (FMA Brotherhood OVA | V | 0x3F938B49CB157CEC41F3CE752B64AFA2 ; MKBv26/FindVUK 0.92 -0x6A7B5B8CC8A713E5CDC6B4E86DE2D88D72F08FB3 = FMA_BROTHERHOOD_P1_D1 | V | 0xD3D07DB85D92AE0B51E31B432967161D ; MKBv19/aacskeys 0.4.0e -0xE4A53A68A0638DFE5A82AD237239DA9235390D94 = FMA_BROTHERHOOD_P1_D2 | V | 0x795EF3B450A8079A83F445A7FA9A57F4 ; MKBv19/aacskeys 0.4.0e -0xD8BE525560887F9507520C52F410FD4C5A73CEB9 = FMA_BROTHERHOOD_P2_D1 | V | 0x705E69ABECFED4227C6076DE87340870 ; MKBv19/aacskeys 0.4.0e (P3_D1) -0xF94052699BF097B7A78611C0D2488D7E7CE383AB = FMA_BROTHERHOOD_P2_D1 | V | 0x86A57775DACE1D7BE74926F7C13BA160 ; MKBv17/aacskeys 0.4.0e -0x1A6EB0A56EAFC4BCCB69B065EC6E0E406BC994A5 = FMA_BROTHERHOOD_P2_D2 (Fullmetal Alchemi | V | 0x419D574A98C89304F5D6B0EA6B1260C2 ; MKBv19/FindVUK 0.99 -0x1D56EA219A05702C71A2AC5A11B35D5F9F4D28AB = FMA_BROTHERHOOD_P3_D1 (Fullmetal Alchemi | V | 0xA956A1DA4FC85224E668675A49F0A01B ; MKBv35/FindVUK 0.99 -0x82775C6B91EDA52D288FE9BD44C0681E06A34D03 = FMA_BROTHERHOOD_P4_D2 | V | 0x88821FE16039A6F5137B55E800C46A99 ; MKBv21/aacskeys 0.4.0e -0xCE064B0BD5382098ED790DA1C5ABB5EED8C1ACEC = FMA_BROTHERHOOD_P5_D1 | V | 0x6BC58218E52B09619A72F04DF0B14DF2 ; MKBv23/aacskeys 0.4.0e -0xF22B646D23292B548730FBBF7D0CDA9B954CC5F1 = FMA_BRO_COLL1_D1 (FMA Brotherhood Collec | V | 0x2C1404AC18A3ACC6C32A74F0F037AF76 ; MKBv26/FindVUK 0.86.3 -0x1E4265335D5C0FBA6C25884D591B2CE5C7FB2868 = FMA_BRO_COLL1_D2 (FMA Brotherhood Collec | V | 0x7C35EEFAA47BEB18747AF99236E344F8 ; MKBv26/FindVUK 0.86.3 -0xBF51FEC01E59A1D1E64A42D926EFEE260C8AF630 = FMA_BRO_COLL1_D3 (FMA Brotherhood Collec | V | 0x4BB9877B76E60B6EE39181BB9726A288 ; MKBv26/FindVUK 0.86.3 -0xEF1164EBF42BB3F22F4BA549854BA4A804192688 = FMA_BRO_COLL1_D3 (FMA Brotherhood Collec | V | 0x570F5B035C97C475F1B50207C525848F ; MKBv26/FindVUK 0.92 -0x7B2B4C5069A85564F6B426EEB20A1089883DD155 = FMA_BRO_COLL1_D4 (FMA Brotherhood Collec | V | 0xC78BC4E929EB4B40C8E9405FDE8EBE83 ; MKBv26/FindVUK 0.86.3 -0xB85AA02E50B1021D19B64984525185734D89DEF5 = FMA_BRO_COLL2_D1 | V | 0x952DAA18EC87F8D119673A62C3A7E68E ; MKBv31/FindVUK 0.92 -0xAD2440821CEAD19EC8F60F26DD52FBC6C5025B91 = FMA_BRO_COLL2_D1 (FMA Bro Collection2 Di | V | 0x53B713F863B8EF7261A70DA59C68A183 ; MKBv31/FindVUK 0.86.3 -0x5EADEB403E5363E52FA717351AF3F33615C318C7 = FMA_BRO_COLL2_D2 (FMA Bro Collection2 Di | V | 0xA41595784BB9E81E6207D6CE0D89B681 ; MKBv31/FindVUK 0.86.3 -0x5156EC90B1E425CC7E873025EAAC8CC96D635FF1 = FMA_BRO_COLL2_D3 | V | 0xCAD5511727EDCA133DC41551B1715396 ; MKBv31/FindVUK 0.92 -0xB74713A411EA9B0A06DB85D4AD8FA8C556BD415A = FMA_BRO_COLL2_D3 (FMA Bro Collection2 Di | V | 0xC714AAE9F23600AC2AD407557733DB35 ; MKBv31/FindVUK 0.86.3 -0xFBDA04D9DFA7EE13A9ABE00140EB8B5050B4FE24 = FMA_BRO_COLL2_D4 | V | 0x913840D9CB795D06968B5D2BA44AFEED ; MKBv31/FindVUK 0.92 -0x2911F633038D66F73EDF9F4C2ACF668680643B69 = FMA_BRO_COLL2_D4 (FMA Bro Collection2 Di | V | 0xF86D402B7646CA15238F2DDD1E78809F ; MKBv31/FindVUK 0.86.3 -0xF65E0DA0FAF95F72F5823EA038C373B4D7774074 = FMA_Sacred_Star_Milos (FMA Sacred Star o | V | 0x51307F12FE7E261642C6EE92F48A2EBD ; MKBv26/FindVUK 0.98 -0xFB21D24F4344AE2F5F3DC4A2373F1F61F12C2B9B = FOCUS (Focus) | V | 0x65E776D238C58899ABCBF490087C6400 ; MKBv50/FindVUK 0.96 -0xB117F8B00D763FBF0BEF849C302CCE9564E91EEF = Fof0SSN4 BD1 | V | 0xD4C67F6FAF320095D431DD9942B78F27 ; MKBv53/FindVUK 0.86.3 -0xA93776CAD5ED119485FAAA265778726F50EBF630 = FOGGYBOTTOM_2D_F2 | V | 0x6A8E8C794E6965A1A461D78F79285B17 ; MKBv31/FindVUK 0.72 -0x1F6A6149D118466F1B9F133BD83285D441C3E41E = FOGGYBOTTOM_2D_F2 (TITANIC) | V | 0xF36D48E14DB26772F545531E57CBAD27 ; MKBv31/FindVUK 0.84 -0x66ED6315C724A8C96F10C0D97C51709AAC930F3D = FOGGYBOTTOM_2D_F2 (TITANIC) | V | 0x7CD4AD27DB7BC3930690BB0025C4D316 ; MKBv31/FindVUK 0.98 -0xE74BAF499C8701842FF3BD16169B9BBA05A3E529 = FOGGYBOTTOM_2D_F2 (TITANIC) | V | 0xB8DF346EDF471F1AA46C71202E89C4C2 ; MKBv31/FindVUK 0.99 -0x6BCE0F2B686C6F3FB35D03F724A7C897216DB63F = FOGGYBOTTOM_3D_F2_D1 (TITANIC 3D Disc 1) | V | 0xD23178CED5CAE4E04BF119852BDE5C01 ; MKBv25/FindVUK 0.98 -0xEC3B0621DEF60D4E63F2BA6C5EF3F6B1A9EAB62D = FOGGYBOTTOM_3D_F2_D2 (TITANIC 3D Disc 2) | V | 0x6AD25DD8BFE104C0C19BB4C76030B7E4 ; MKBv28/FindVUK 0.98 -0x52535D80898B6F455B3B70680D7FFDEAAED19EFF = FOLSOM MANEUVERS | V | 0x6F3E6B6461EAFF74585AB0780AFD8250 -0xEDF613F5761028D1E9D6F8E8D1F06ABB01B0EE7B = FOLSOM_PRISON | V | 0xC040FA07E6950CBF0917183C1F19D12A -0x5C35820685E9F31AF0D25EAA5F64D116E361B62C = FOOD_INC | V | 0xB749B7E20009EB54AA64580973FB064A -0xF75BA04BD6873433E2F4A4057C621E47464DA144 = FOOLS_GOLD_B5_JPN | V | 0xFDC10DDCA306B2DAB7ED007700A47A15 ; MKBv7/FindVUK 1.00 -0xCB0CCEBD2098B776C97837A7B027E4E344688D0C = FOOLS_GOLD_B5_JPN | V | 0xB1C68E8D8BB86D038F0DBD812FA54795 -0x5482B3126372DB83738B4EBF1DBFB12A155EB9C8 = FOOTLOOSE | V | 0x7A9BF48B3B93098EABDB3B3D9005F8BE ; MKBrev 26 - FindVUK 0.53 -0xA7C7FFCCACCFD27F28755A8B13682D987BE2F0FD = FOOTLOOSE (Footloose) | V | 0xBA408DF6A588EC84AFEBD5BFEC653214 ; MKBv23/FindVUK 0.96 -0xDB01E20C57700F87820D32F91655E374F792A525 = FOOTLOOSE (Footloose) | V | 0x6E73A6B232D0B094172A487D2F1664FC ; MKBv23/FindVUK 1.00 -0xD6B24DFD84881965CFC3D41E47E3C9A47AB96310 = FOO_FIGHTERS_DISC3 (Sonic Highways Disc | V | 0x08FDCB078468AAC5AECCF62469D4585A ; MKBv51/FindVUK 1.02 -0x882A1BCA2F2F057EF686EA7DB4E98ED54FC7C950 = FOR ALL MANKIND | V | 0xEAED721A5FB0CD98D8916C5071410A1A -0xD91098791BA9B8FD6E181280EE4E16765CA16EFF = FOR0x1EED2 | V | 0x6381DBB5CD5FF5C697BD2EA24E6E12A5 -0x45B56F6BDE6EA6AB08333C082D2F8C1517618A7C = FOR1NNE1 | V | 0x4636EF2F9C59644C367CCF45A39B5AB6 -0xB4FEB5ED4477C4471FD5814AF3F6E302DA6A1B0B = FORAFEWDOLLARSMORE_F2 | V | 0x6F54ABBE2E0E7E0103A19818800933A3 ; MKBv17/BD+/FindVUK 0.65 -0x8EDA5A4612F3F71B4FB1FA9434A7324FE9F97123 = FORAFEWDOLLARSMORE_WW | V | 0x278827DC0C1841809DB947EC1B163A26 ; MKBv16/BD+/FindVUK 0.80 -0x05B2F47D24DF761994BD0DCF37A14B6BB31F12C3 = FORAFEWDOLLARSMORE_WW (For a Few Dollars | V | 0x4D28C6EEC2E8FAB1758A26A85521F0EB ; MKBv16/BD+/FindVUK 0.96 -0xBBC58ED2B939F700A47655610F4ECBC310FD0981 = Forbidden KingdoM | V | 0x8C89BCFB14388E0468D4E988232A0A8E -0x4CB70DA2658947D8FB195788F66EA2554D4C3229 = FORBIDDEN KINGDOM (Forbidden Kingdom) | V | 0x70BBAC111B78E6F76941949F0AC5FFCC ; MKBv14/FindVUK 0.98 -0x5408E7BCABCF5FA76D89B20255D22E1CDAC150C5 = FORBIDDENKINGDOM (Forbidden Kingdom - Bl | V | 0xAE20C21CF51AFA143B11441890B21600 ; MKBv6/FindVUK 0.98 -0x5783CA0F7E820A175CFEFBAE541601E513CB2537 = FORBIDDEN_PLANET | V | 0xFF77211605CC3430DB00BF041F064794 -0xBC497F834A9B0C1F02587D469CBE4B80169449E5 = FORBIDDEN_PLANET (Forbidden Planet) | V | 0x50F30A1980CD3D0D0E1ABFB72029BF96 ; MKBv16/FindVUK 0.96 -0xB230D68D4C665CD6D03401F9CD505068B60455D2 = FORBIDDEN_PLANET (Forbidden Planet) | V | 0x18254A345DF7E064DFDD32F20EF79783 ; MKBv16/FindVUK 0.98 -0xA05C63564934A8D6A04F35C52EE4B9A8D3BFAB33 = FORBIDDEN_PLANET (Forbidden Planet) | V | 0xA51C30C52015196CE56F0C732A1B8FA8 ; MKBv16/FindVUK 1.00 -0x0D92EAC6AE208255804F16F1C5CABFF7A5BE3A60 = FORCEOFFIVE (Force Of Five) | V | 0xC8AE6EB9DEEA9ED30D1E5D140E709302 ; MKBv17/FindVUK 0.84 -0x8230262BB3D58374F6A33B9CB0D81D1F78FA8FD1 = FORCES_OF_NATURE_D1 (FORCES OF NATURE D1 | V | 0x03C507038EFB10518782F5BEEA5EE527 ; MKBv61/FindVUK 1.00 -0x75756155BEB056BDBCB0C71FFDB255A8122DD8E4 = FORCES_OF_NATURE_D2 (FORCES OF NATURE D2 | V | 0x0D7AE81B0B263A887EEF31588D5D6331 ; MKBv61/FindVUK 1.00 -0xCAA2A24F0F8E29FFC03EB11786F31581CB95CE8C = FORCE_10 | V | 0x62BD65A39C04D487F998B8C2944C1C1A -0xADD5C9D38E4EE2C3C6EEC3329B6F4F7A22ECDB7A = FOREIGN_XCHANGE_STUDENTS | V | 0x19605E7976EA8A1C38D8BCDEFF6C412F -0x7CED228713B8C19384D31AE4A0CF3A2D29D888F2 = FORESTIPARTY (Foresti Party) | V | 0xD8BD53782BD7BD6467793A1CA8F849E3 ; MKBv31/FindVUK 0.83 -0x677A4032874CDC5D28D3EC660C392EC6B8FFACFF = FORESTI_MOTHERFUCKER | V | 0x7A8A8B1B922406EF83229D51ED94F382 -0x6CF052615AB0E00F129E6E180C2B30FAD8D98D7D = FORGETSARAHMARSH | V | 0x7EDE7A1E6B1EBFC7DB2245C72FA4B78B -0xB4274DA9B0CD63A9DAB0E0E47ACA121EE9A2E984 = Forgetting Sarah Marshall | V | 0xB119C72DC18E5C38E6F69E23923A3521 -0x335ADFED5B7BF3003DD336B2890D6A8049308272 = FORREST_GUMP_D1_EU (Forrest Gump Disc 1) | V | 0x0D411C8CB6A83876C8FEDE78796BF728 ; MKBv14/FindVUK 1.00 -0x3393E11995FE8DBD2446C204464EFD264EE20602 = FORREST_GUMP_D1_EU (Forrest Gump Disc 1) | V | 0x3F3C7930BF647D291B75F4565D681F01 ; MKBv14/FindVUK 0.99 -0x00BF3267BCED1B21BD731834BF6374F6699283B5 = FORREST_GUMP_D1_EU (Forrest Gump Disc 1) | V | 0xD59B9CF8AF3C8BF48EDCF4F908078104 ; MKBv14/FindVUK 0.98 -0x996878FE4A1E0A9AD12EB2A40DB80B76A3752830 = FORREST_GUMP_D2_EU | V | 0x61A55C717F5C5D8EAE4C2C2286C46DF0 ; MKBv14/FindVUK 0.80 -0x330DA6A6E2C8DEF8B9CA737D396448107F110766 = FORREST_GUMP_D2_EU (Forrest Gump Disc 2) | V | 0x112F079DA92636C8427AFFBCADE71419 ; MKBv14/FindVUK 1.00 -0x67EE0B1D0C002B68838E2E169CBC40ABDF61580D = FORREST_GUMP_D2_EU (Forrest Gump Disc 2) | V | 0x6E47A26E92039BFDB0461335BEB289B4 ; MKBv14/FindVUK 0.98 -0xCD4E87426B3533D4168C129136D72427ED3C7816 = FOR_GREATER_GLORY (For Greater Glory - B | V | 0x63990B673DB926862818A41F15931B42 ; MKBv33/FindVUK 0.92 -0xAB04E727E8876CA0EE18C2800F1BA130DE14F3FA = FOR_YOUR_EYES_ONLY | V | 0x5D7037CFCA1B01DD2D2EF83336EB6690 -0xD509A3B7E04BD5E5E37D754601A07EC04440EE60 = FOR_YOUR_EYES_ONLY (For Your Eyes Only) | V | 0xFB15A9EFD3E39A8C4CC42DB7F3BCDB60 ; MKBv8/BD+/FindVUK 0.99 -0xFF52F2BA92261869725C94FFB700C8C9480BABF8 = FOR_YOUR_EYES_ONLY_F1 (For Your Eyes Onl | V | 0xC63E5EA559C5999A02C28B9B0FA51F4A ; MKBv9/BD+/FindVUK 0.96 -0x59C46C8D3F4E9103D23D27EB1782084CC2750C1B = FOR_YOUR_EYES_ONLY_F1 (For Your Eyes Onl | V | 0xBE9B2A77E78C18BC10948FB91AC8386D ; MKBv9/BD+/FindVUK 0.89 -0xCDF42C10D2362F3966A6D8300E257FF69B4257C9 = FOR_YOUR_EYES_ONLY_F1 (For Your Eyes Onl | V | 0x6A16E5720B23D3753F821619477627E0 ; MKBv9/BD+/FindVUK 1.00 -0xA325CF38DAB47341834BBB63AB621C1BD8635524 = FOR_YOUR_EYES_ONLY_F4 | V | 0xC00DC986A92110CC44F1872A7E6894F4 -0x1B606B6C99C7EE3A57D3B9E0882AE0055CDDC15E = FOR_YOUR_EYES_ONLY_F6 | V | 0xF2B18072F197E379E61242B013EC7430 -0x97380E5C521529EA6D38C43A5DE3BB2C5A3A5121 = FOR_YOUR_EYES_ONLY_F6 | V | 0x89AE84A731025AA1CDB46496D0836C94 -0x7C9C5ECCAB6A464E2497213C7AFE5F31B23AB8F9 = FOSTER_AND_FRIENDS | V | 0xB7463D926D4E45CB14AA245E34562F2C -0xC0A0CAD63C15E28151912C45AF98B4E6050AAFA2 = FOSTER_AND_FRIENDS | V | 0xCCFC27D169FF2DE33E47E99E1204A68A -0xAC62FB64488E6E60ADABF0C1E652FF81DAE8E22A = FOSTER_AND_FRIENDS | V | 0x8517B71F2EDFF3FE63C587DC6053B6C0 -0xBF9A51F8B4CC61D4330D6BD8980FFE037445DDF6 = FOTR_D1_MTA (THE LORD OF THE RINGS: THE | V | 0xA05E6F7671FF755D47F17B5237CD6205 ; MKBv40/FindVUK 1.00 -0xED559C7D1BC240DF18492A2F5F184C6C9DD35625 = FOTR_D1_UK (THE LORD OF THE RINGS: THE F | V | 0xB6E77780D13508BDF95ACD7C17F5D43C ; MKBv21/FindVUK 1.00 -0x3596B8B1B568097576A1831D71599081B6866FB3 = FOTR_D2_UK (THE LORD OF THE RINGS: THE F | V | 0xA67BBE7FEEED81B2A4F772ECEA7807C3 ; MKBv21/FindVUK 1.00 -0xEF557F3A48923EB1D791FD7A1B644760E4EB02A6 = FOUR CHRISTMASES | V | 0x1715E67140F3161A1C2CD58750547BC1 -0x8B7C3E5A0249B99D30C0E9B1559A8364C160DD49 = FOUR CHRISTMASES (Four Christmases) | V | 0x446868112AE967FE84709AEFE9E8D205 ; MKBv3/FindVUK 0.96 -0x987BF30377B218B5A190EDDF0E564395F02354A2 = Four Lions (Four Lions) | V | 0x8F6D040027B3DD207D469166AAB63171 ; MKBv24/FindVUK 0.96 -0x8174ADE13419425A2199118D3480423F10DA9032 = FOUR SEASONS | V | 0xBBCC86EEA53726507F58E127434695E1 -0xE1AE41192BBE8F905E7513F0A4A6175A1B312594 = Fourth Kind | V | 0xE1FF7B5BC33FABE940DC428A4EF316F1 -0x8F226247F1DEA856C1E2E09D30F0F2881DECFEC6 = FOUR_CHARLOTTE_DISC1 | V | 0x50B6FBBEA9AB0C78BD4885A94235514C ; MKBv62/BEE/FindVUK 0.98 -0x670A209DEA1BF1EA15594A5984645A4EA93EA4BF = FOUR_CHARLOTTE_DISC1 | V | 0xBD565F2C11413095205BD28FB95BFE06 ; MKBv61/BEE/FindVUK 0.98 -0x74A6BF7AEBEB466D8B9FE9C0B068C5760FA81257 = FOUR_CHRISTMASES | V | 0xD9B903AF8609531B905CF83BC3CB50DC -0x6036820713197F7D427145F31DAC58A3E0751E56 = FOX AND THE HOUND (The Fox and The Hound | V | 0x76A14A18DAC97FE2EDABD84CA440B36E ; MKBv27/FindVUK 1.02 -0x35B5E6BBF5F8A1B4213D424CB522F78175183D5A = FOX AND THE HOUND (The Fox and The Hound | V | 0x803B704381702237B55CCFF508E11131 ; MKBv27/FindVUK 0.94 -0xA8B96E76FFADFB7DBB60A922C178614DB175830C = FOX AND THE HOUND (The Fox and The Hound | V | 0xB26FD2ACCCBE79B78A97ACCDA17FEAFD ; MKBv27/FindVUK 1.00 -0x3ACE2329AA698476183843CAD4BA979AD52246AC = Foxcatcher (Foxcatcher ??? Blu-ray???) | V | 0xBF5149D8D40AFAC59D6B821B2756BCDC ; MKBv50/FindVUK 0.96 -0x374EF3545771E99B7E7992BF536480272D5E31C9 = FRACTALE (Fractale) | V | 0xC53680CEFE2DE720744609641E42096C ; MKBv31/FindVUK 1.00 -0x89AA456D38DC0BE14102511B6A54AA3E58C6F2B4 = FRACTALE (Fractale) | V | 0x518192314ED2D8585DFA6A16A4D823D6 ; MKBv31/FindVUK 1.00 -0x45F15F8CC311F6DBD95A8845FF1DD266A1AB4794 = FRACTALS | V | 0xA6B329371F9CF562F90FFF5CFC3310E6 -0x3DC54A59454FD607364A65C4B3AB5D14CE8C0B10 = FRACTURE | V | 0x0109F35BA55556D267C2E0FD0A249513 -0x803F2C7B2A1613F4D70DC51613FEDCD3DDC87283 = FRAGMENTS | V | 0xA8A9EC7178DD95E40380C7CE7DEEA9B4 -0x33CC536D5265334AF82BE758F9FC6C90C94CC3CA = Frailty | V | 0x9C407B822EDC620F92169890FDBA1F48 -0x34EEE27D80C94460E7C9037C6CDE72424331DEEF = FRANCOFONIA (Francofonia) | V | 0x4620471E931E85D9E48908C23C91D45A ; MKBv62/FindVUK 1.02 -0x4E20BAD1F82E649D55B672F49EB4D49B2B15D9E7 = FRANKENSTEIN_G51 (Frankenstein) | V | 0xE9905F717BC74179D1BD0D060BEB4167 ; MKBv25/FindVUK 1.00 -0x9707BB21CFC33F7FAD6AD23FF61D13298B2BDAD6 = FRANKENSTEIN_G51 (Frankenstein) | V | 0xC206E9EDE8836262CA15DC996F632A02 ; MKBv36/FindVUK 0.96 -0x67665D428F9D824BC1795B45936376260DC4A6BB = Frankenweenie | V | 0x87229433CFE548FE390652C92C08CB30 ; MKBv31/FindVUK 0.81 -0x92A2A31E40816E8871398E85AF05F087414EC3C3 = Frankenweenie (Frankenweenie - Blu-ray?? | V | 0x3AC76845A7B04D6A2C854F0A354E64CD ; MKBv31/FindVUK 0.94 -0xBF296E7658EDCD77D685266CA25BB0CD3941CC71 = Frankenweenie (Frankenweenie - Blu-ray?? | V | 0x5092E4F29EFCFFDDE916FE287DA4FA49 ; MKBv31/FindVUK 0.92 -0xEBCD60AAE1D9663F5C11FC2703577037D3BD4D2E = FRANKLYN | V | 0xC1392229B505FB9C4B8E516DE7B019AB -0x92433ABB33BACF56D4E01C21FF1FCA87BA52B282 = FRAU MUELLER MUSS WEG (Frau M??ller muss | V | 0x923C467A9E6B9E28F2E7CBD86459387C ; MKBv54/FindVUK 0.96 -0x5252233E562530EC6C3EAEEA82CF0F38946652B3 = FREDDY_VS_JASON | V | 0x095DE6BDD0676448699046C312103230 -0x036FD38009B32C2217F6710FD8EF057DFCBED0BF = FREDDY_VS_JASON | V | 0x89B26878CC1D28A25961A55F7ECA5E0E -0x474880726BCFBF17756C65578DEEAC293E0440DE = FRED_CLAUS_B5 | V | 0xB0CE3CBFB158464FC5B5105ACED7315E -0x6C28B48275C1976F0B3FDEE324FF87D0346C2749 = FRED_CLAUS_NA | V | 0x651790FD206E99B3EFE7D9A2A952D236 -0x8B47119B690B9A0F2E6E1F0CE9107F88F615829C = FREE BIRDS (Free Birds 3D - Blu-ray???) | V | 0x0878973615C7CC7DECF543352793FAFA ; MKBv46/FindVUK 0.87 -0xCA21913DCD33262ACBE1038F80E0A91209D184B9 = Free Willy 4 Escape | V | 0x59C6A6D29F2BCA25EF825B519FEE0580 -0x4E8A3A34ADC3BEEBE7966F611E2D07D3674BBB72 = FREEBIRDS | V | 0x4E35A61BED6759EB11697A8A280026A0 ; MKBv39/BEE/VUKNOTVAL!/FindVUK 0.80 -0xF32AC67A11B9913B18EFFD9579DED71028CC9FF2 = FREEDOM | V | 0x014CD0F9C44CF57C461653952054EAE0 ; MKBv21/FindVUK 0.81 -0xF55096201F567ADF547593398613EC9E6D432C7D = FREE_BIRDS (Free Birds) | V | 0x33F6955EC5F295A52ED567706CA03EE0 ; MKBv32/FindVUK 0.96 -0x7D184E5C6DF905F95F763D3691FC4896EC03D103 = FRENCH KISS (French Kiss) | V | 0x4D876C0CDEB74C92C88E5323FBBF36B5 ; MKBv48/FindVUK 0.92 -0x8940C02444623D77AA071F9213F5DFB818121A89 = FRENCHCONNECTION1_D1_F2 | V | 0x330A9EF9962AE4A2EFFA83E13953265F -0xED51DC625088FEF9778A9FDF6FE7B12B41A2F531 = FRENCHCONNECTION1_D2_WW | V | 0xA8FE9DC7E182FBBB99AEF7DF4BA2C352 -0x672537B905EED1ACEEC5A5C780246D311D80C47A = FRENCHCONNECTION1_D2_WW (The French Conn | V | 0x1AA28D157EB0839CA2A0BB47E1CDC6A2 ; MKBv9/BD+/FindVUK 1.00 -0xC312A5B64055A9A93D67FC1E8E38AAFDCBDD60EC = FRENCHCONNECTION1_F1 (The French Connect | V | 0x84EAE962262A10D2F799311EC396D29C ; MKBv9/BD+/FindVUK 1.00 -0x85852ABF27421944469AFC1DB47E45F0FB3765C6 = FRENCHCONNECTION1_F6_D1 | V | 0xBCB747D6F6382C3764F547AD659942EB -0x949D540660F8651081530A6D45514ABFDAEFC559 = FRENCHCONNECTION2_F1 (French Connection | V | 0xA393FED324433F79879C6C3F13FE9EEB ; MKBv9/BD+/FindVUK 1.00 -0x289FEF68083E5953EB1C1ECFA4561D4A8A3BA95D = FRENCHCONNECTION2_F6 | V | 0xA462B908AD6E6F5A68EC20BDCB2DB103 -0x69615E1F18FB58E935EB904753F4ED39A1BF035A = FRENZY_G51 (Frenzy) | V | 0x5D5E883B4AFD47C72A163C3831223087 ; MKBv27/FindVUK 0.94 -0x87DA29E47E12ACB5983CD75F68FBA3EC408725D8 = FRENZY_G51 (Frenzy) | V | 0xA9B99D0757B3D6F81E83BF3BE9FF4878 ; MKBv27/FindVUK 1.02 -0x0DC8D03A21A6A358559B7B97684A5EDDA599AF2A = FRESH_OUTTA_HIGHSCHOOL_8 | V | 0x03DEAEB62140E3E1A5F2018EFC1C9862 -0xCED1678D1DB636FBAD340DBD77FF46764BE08CF3 = FRIDAYTHE13TH_EXTEND (Friday the 13th - | V | 0x29DAE58F9119037C2C99DF27CE9F6BB0 ; MKBv12/FindVUK 0.95 -0x6920B4FB43A63D380990586C924860AB0D036774 = FRIDAY_13TH_PART_12 | V | 0x8A63087E7311FD800F2D4965CF821DB1 -0x6922CC161FF36D9920073452BAEA240C770210F8 = FRIDAY_13TH_PART_12 | V | 0xE533F0798566B7A4E1DEDEEA369802AE -0xA04F26F1F5F12DFC33D48FA4CD47900810164CCA = Friends S1 D1 | V | 0x9E3DD912D51F9E0F3FEDD8F698242B95 ; mkbv31 -0xF426DF6A27CE2B0A75CE57EEBCC311D43A1CEAEF = Friends S1 D2 | V | 0xD61407645880885BC02AED456EE97603 ; mkbv31 -0x45C825459A03F87736383E2BF80A83F6098922DB = Friends S10 D1 | V | 0x99566BD32B2FC9F030C95C1AE5E0469F ; mkbv31 -0x4ACA92DB36959285FB60231A566020610BD7E78A = Friends S10 D2 | V | 0x351192677E8F759661997D88B0BAE89E ; mkbv31 -0xFD37E39B93D415C9AF0DEE1ECB01E2BB049E9D5F = Friends S2 D1 | V | 0xD0802A2780E4B860F56F28F07AE39483 ; mkbv31 -0x6D11622DFC67D67164B83D313802F5DDD1FDE634 = Friends S2 D2 | V | 0x8F234E1D737CC427C06DDD61C60EEABB ; mkbv31 -0x4C78973ED822CC4961B572FA567664BA3F40082F = Friends S3 D1 | V | 0x45630698726834042235BD8106209619 ; mkbv31 -0xF0387199E9B3AC45A72BBC6E32000DE256286EB9 = Friends S3 D2 | V | 0x6406CD9D4191748B2F632F5D3A816CD3 ; mkbv31 -0x9EA91C8022EA6C9D678795640D59D2F4F2E6429B = Friends S4 D1 | V | 0x54686B2D0042C1758A77350533AC0A5B ; mkbv31 -0x562EF123A286A598CB5C54CF4C4D9824F65D312F = Friends S4 D2 | V | 0xBEB6CA4C0D58FE56794B6E5BD43372D7 ; mkbv31 -0xB30932CB0C7D5840A57A662D368560F4160F0C31 = Friends S5 D1 | V | 0xA2E7B4990D0E427B0AA199F61F7989DA ; mkbv31 -0x9BAED883FD46F717FD001070EF9284C93F656CB7 = Friends S5 D2 | V | 0xC2E956A2A57A5D695505B8DF423D1518 ; mkbv31 -0xB1F12C059CF7600ED11BC4E61AEF29F4C4D2E993 = Friends S6 D1 | V | 0x052E2B221385E4C95F4EF1AACAD25057 ; mkbv31 -0xC62F7B1055B016E90732B5C4577EF51D0EABA161 = Friends S6 D2 | V | 0x71703A7617CF9F3EEFFCD6679F90C572 ; mkbv31 -0x42D8D4EB86B3A093F3CEDF4D561CA82C38BDC9D1 = Friends S7 D1 | V | 0x45B1FCD9CCDD146A399CD224F93A3B27 ; mkbv31 -0x069A1D0917929BAC4984370B41334E9E24107C47 = Friends S7 D2 | V | 0xCED23E244FACABF1404E8945757BBD34 ; mkbv31 -0x147C04ACF237DA83E2296468FDD0828DFE3D9D03 = Friends S8 D1 | V | 0xFC26E2E8B582C30FFA6C9D2E0DF01ECD ; mkbv31 -0xE43FE51E6626A7FC5214E0895A3D71A89DF7C043 = Friends S8 D2 | V | 0xE1E5B9FA78D897FDFECC3999AC8FDDA0 ; mkbv31 -0x9DDA5F0DEC6A24E40C83DF41CED9D0C357F7410B = Friends S9 D1 | V | 0x25435CC2D86F2D1AAB8891247F8725E0 ; mkbv28 -0x820C09B9692451645F0E41EE9051EC6BFB4D96CA = Friends S9 D2 | V | 0xF391F9A1762D96D87167C6A277541287 ; mkbv31 -0x91065BA75512F2D0908313E6528D3873C5CF7F9F = FRIENDSHIP | V | 0x6AE49A005D40E3149DD69C41FC838F41 ; MKBv17/FindVUK 1.00 -0x8C7A9282E46E15A9AEAD48A95D56CE2BACD69460 = FRIENDS_BONUS_DISC (Friends: The Complet | V | 0x1449238ED5465B8C463BAA36F1706958 ; MKBv31/FindVUK 1.00 -0x215754085D3411D48658D780AD0E085BE2AB7039 = FRIENDS_S10 (Friends Season 10 Disc 1) | V | 0xDF68EDC27BA48E33228AD34883174459 ; MKBv31/FindVUK 1.00 -0xC51FBE8A862A0F790BA02FA5D88FBC2F5446B3C0 = FRIENDS_S10_D2 (Friends Season 10 Disc 2 | V | 0xF42350AC57936AE2D1EE229933C16118 ; MKBv31/FindVUK 1.00 -0x1D011DC0DB55EDBA4A4EE5475D8A028E77DE8514 = FRIENDS_S3_D1 (Friends Season 3 Disc 1) | V | 0x963524E4E2B8D504F7EBE88BB98B1215 ; MKBv31/FindVUK 1.00 -0xBEB6EAFE40C315706823F6EE7127AA9BEEB81F8D = FRIENDS_S4_DISC_2 (Friends Season 4 Disc | V | 0x1A2A16717F13207E7C7C64AC9F1E46F1 ; MKBv31/FindVUK 1.00 -0x1DAE8D8ED11FE63968235B2CA51B5C5066042CC2 = FRIENDS_S7_D2 (Friends Season 7 Disc 2) | V | 0xFC41BF3E61DF9B395F5ADA39E4F7EAC3 ; MKBv31/FindVUK 1.00 -0xC1B8EA70933D144559B030E51D9E1D6A068B840E = FRIENDS_S9_D2 (Friends Season 9 Disc 2) | V | 0x4E538B0A7476E8C944EC2DE5DB174A4E ; MKBv31/FindVUK 1.00 -0x102596E40AFFF59C56F0C99B2906C0019378A295 = FRIENDS_SEASON_2 (Friends Season 2 Disc | V | 0x2753FD7613071BF7D8E76143C6015748 ; MKBv31/FindVUK 1.00 -0x52652568BE0E377CA399F0A6D31E088889EDF9F8 = FRIENDS_SEASON_6_DISC_1 (Friends Season | V | 0x3097FD4FA2884C76B695034EB753A6B2 ; MKBv31/FindVUK 1.00 -0xD0518440623087F36AFB9D67A042CF6E081DEE2F = FRIENDS_WITH_BENEFITS (Friends with Bene | V | 0xB68BA1BD01C8FBAB64077B939DA908D7 ; MKBv25/FindVUK 0.96 -0x154393F69E7874BC8DC23099F2390741D495A2FB = FRIGHT NIGHT (Fright Night - Blu-ray???) | V | 0x238A80875CF79EFAE38379D5210BBC03 ; MKBv20/FindVUK 0.96 -0x16882AEF5338E0DD3E2B9CF8452DB1B1480E6054 = FRIGHT NIGHT (Fright Night - Blu-ray???) | V | 0xC0B03D1847D04A1BD1F22C6DB10D671C ; MKBv23/FindVUK 0.84 -0xA451E1808A8D6E44626F66D1DCD138B98004A11C = FRIGHTENERS_G51 (The Frighteners) | V | 0x951F9007C537C4F2A72618A89C42EDCA ; MKBv19/FindVUK 0.96 -0x0E6D10549251FBBEF3E22835986D9A1BE090EE59 = Fright_Night_(1985) (Fright Night (1985) | V | 0x0026E20D58D070D3C270EBB3E2796B14 ; MKBv47/FindVUK 0.84 -0x463814653DFD52D29FF5C3BE1421627C5A610E6B = FRIGHT_NIGHT_3D (Fright Night - Blu-ray | V | 0xCC70D5E17529C8BF4C5A0EFC40FEDD11 ; MKBv23/FindVUK 0.84 -0x48FE3FAACE6DE861A8C4DB319C5A200E2C64752B = FRINGE_SEASON3_DISC1 | V | 0x8F7C0665A5FD1078951BC0AAA431EB04 ; MKBv23/FindVUK 0.72 -0xDD4A903F4B4163C07BB6E59159BA4618F9D04518 = FRINGE_SEASON3_DISC1 | V | 0x68E7EF643EE5F9172D24D549AD2755B3 ; MKBv20/FindVUK 0.80 -0x570FD5747501306364CD97480951F70E87EC4B52 = FRINGE_SEASON3_DISC1 (Fringe Season 3 Di | V | 0x1F2F1690D5F0612438B267E2B8F24212 ; MKBv23/FindVUK 1.00 -0xD37093E19B6777D8DE2A4A2AFDBB2D6C5C1CE762 = FRINGE_SEASON3_DISC2 | V | 0xD2459F777456A0ED2B68A1D64285D47E ; MKBv23/FindVUK 0.72 -0x803E58E7B8C78F16C6EA9C614EFAE11A23418BD1 = FRINGE_SEASON3_DISC2 | V | 0x0649994DB06DD95811E4A4EB9212E318 ; MKBv23/FindVUK 0.80 -0x7B2193ED9E89A341A3928974F055A22C22C461A4 = FRINGE_SEASON3_DISC2 (Fringe Season 3 Di | V | 0xC8093DD7590DFBE359BB39CAB86BB867 ; MKBv23/FindVUK 1.00 -0x7B96B39C8FF15DA42DFB9C2EF4ABBBEA1E6E2222 = FRINGE_SEASON3_DISC3 | V | 0xF21A8FA58A2527940E2686BA3A00334A ; MKBv20/FindVUK 0.80 -0x264923D4940A1D4A4A9392E1C47D7E74C884BCD8 = FRINGE_SEASON3_DISC3 | V | 0x6491E6A589AB45D1D721D892C2C48167 ; MKBv23/FindVUK 0.72 -0x9F5432C1848536D45512605D3CF05B8C6A7E3ADB = FRINGE_SEASON3_DISC3 (Fringe Season 3 Di | V | 0x99A48FD0159482BC64BBBECE4DB18251 ; MKBv23/FindVUK 1.00 -0x6E7CE84A5532BEC0E7070B2D257399C4EA4F9E0B = FRINGE_SEASON3_DISC4 | V | 0x642D93130445196B81C1451C7AFC026F ; MKBv20/FindVUK 0.72 -0x14D80A297C97E957E7155A300CDA3898166D3E94 = FRINGE_SEASON3_DISC4 | V | 0xD381D0D5682229FBE9F3CAB6EBF9329B ; MKBv23/FindVUK 0.80 -0x66AD403D7EB9AB88D09FAED67948E1294B0C8C78 = FRINGE_SEASON3_DISC4 (Fringe Season 3 Di | V | 0x80C7ED3B8B0711F42DB13A2681EF293A ; MKBv23/FindVUK 1.00 -0xF6B8AB2B897D73D6C2DD94D1D966F22A6E7D3100 = FRINGE_SEASON_1_DISC_1 | V | 0xF244F715633CA0AA92A90A25BE2B6F97 -0x4CAC40F1E131621DCCF9C137C38CF2488AC775B2 = FRINGE_SEASON_1_DISC_1 | V | 0x97D7DB53CE351AB81C413235D642E9D4 -0xE2B74A0272AFBE6290FE959DBAFC267A80F6860C = FRINGE_SEASON_1_DISC_1 | V | 0x71E660B02E410E5C216D89BBA7D5FCB1 -0x44803762F7E2847E5DD47212F8BC299972A489D5 = FRINGE_SEASON_1_DISC_1 (Fringe_Season_1) | V | 0x159AF04715FBBE1E5EA976CC68640951 ; MKBv12/FindVUK 1.00 -0x4247BE709B6B31C60EE382FE06EE56CC57692A58 = FRINGE_SEASON_1_DISC_2 | V | 0x381BED8025753B776A86656F720B742E -0xDD852E5731146D1EC398EF2AB68002E262349E1A = FRINGE_SEASON_1_DISC_2 | V | 0x4D47AF171BB299BB741F741E42A4B962 -0x4688817CBB7E2D4737C335375505A24F1E364CBA = FRINGE_SEASON_1_DISC_2 | V | 0xDFE9E1D1EFC6ECFA9A4C4308A1A63B5E ; MKBv14/FindVUK 0.72 -0xB13111AAC28B6A9B8E02DB936D05FE4E2874D502 = FRINGE_SEASON_1_DISC_2 (Fringe Season 1 | V | 0x08A9C8903860DCC0571D2ED585AA1A43 ; MKBv12/FindVUK 1.00 -0x9D7FA355ABB8652339B78DFC43384820E84E9D12 = FRINGE_SEASON_1_DISC_2 (Fringe Season 1 | V | 0x2657383AB442E528CB4A1A87A0AD352C ; MKBv14/FindVUK 0.92 -0x911CBEB1D978967111D128947F0E58B4EF6E2B2B = FRINGE_SEASON_1_DISC_3 | V | 0x3DAD1072EE7B06BFDBF6EE18C211ED62 ; MKBv14/FindVUK 0.72 -0xE5061BA6CE727F09CA5794E60CD27D872B9C2389 = FRINGE_SEASON_1_DISC_3 | V | 0x1B4B376B4C877F67D17AE0BB6582032E -0xA8AF9F4DA090F79C399CD6B1D00F5DCAC4CD1F1F = FRINGE_SEASON_1_DISC_3 | V | 0x5E24104339287A148E7A2BB29994C18B -0xC9086CB5A3AD2ED5E8B08CFBD18A25EBE81D658C = FRINGE_SEASON_1_DISC_3 (Fringe Season 1 | V | 0xE2244CD2F2ABDCB0928DC8DBD189CFE7 ; MKBv14/FindVUK 0.92 -0x0EC763CDE4AACE1E6DA0877A1803F70A64474B61 = FRINGE_SEASON_1_DISC_3 (Fringe Season 1 | V | 0x34EA850AF65947F8491E3CE4C617C1F0 ; MKBv12/FindVUK 1.00 -0xBD059BE4549928FDF3C84C9D4BCD0094D7E82961 = FRINGE_SEASON_1_DISC_4 | V | 0xCA29304CF36C4BB81B81BB0161AA0EB7 -0x72DDA389A85F2999DACAF49634716B36BD412C31 = FRINGE_SEASON_1_DISC_4 | V | 0xCD9AB7AB12810DB75D20AF689A8DC054 ; MKBv14/FindVUK 0.72 -0x518E99ADA6F1E7903A1EF02AF687C104C3BC29F0 = FRINGE_SEASON_1_DISC_4 | V | 0x2A03F345C6CFCDECFDC61D7F6D01BD37 -0x9DED38F139282067A91ABA2169CC5E8CDBA101D9 = FRINGE_SEASON_1_DISC_4 (Fringe Season 1 | V | 0x8B5951CAC2D3E1BA4FBF9B9131A4BFE9 ; MKBv14/FindVUK 1.00 -0xCFA46A0357F6924258AAA9A8024EAA5E5FBCBAB2 = FRINGE_SEASON_1_DISC_4 (Fringe Season 1 | V | 0xB6FDA3041B679F6416BB65214AFB8856 ; MKBv14/FindVUK 0.92 -0x7CCE4351AAB8D0F8E39A41F712B1BC4D5BE6D911 = FRINGE_SEASON_1_DISC_5 | V | 0x59F2717FBF7770A3FB5F1A0EFC2A9008 ; MKBv14/FindVUK 0.72 -0x33F5C470052776254BF07A359C46B4939E71851D = FRINGE_SEASON_1_DISC_5 | V | 0x0514A31E5C2552A14E5AA1D6F67909ED -0x38B58F55CC61B767FFAFD0EE668BCF1A81804FD5 = FRINGE_SEASON_1_DISC_5 (Fringe Season 1 | V | 0xF7E2801355A935815184737F69AA243B ; MKBv12/FindVUK 1.00 -0x4B6A52306058B07E37A6C48CA50DAE5349E59BF9 = FRINGE_SEASON_1_DISC_5 (Fringe Season 1 | V | 0xBD195C6FA8DA2F38BD1D92B1B20343DD ; MKBv14/FindVUK 0.92 -0xC62E22ACB9B4FAEC4CE515E8E8AAC1A1EFF85C6C = FRINGE_SEASON_2_DISC_1 | V | 0xEF597D9D273AAAFB393B7E648C23E0C3 ; MKBv19/FindVUK 0.80 -0x27CC8DCF403D114623C9226E53A0254EE30AB56F = FRINGE_SEASON_2_DISC_1 | V | 0x2F82DDAECFA98EECDE6CC83520BD1EBA ; MKBv19/FindVUK 0.72 -0xC92B699648945D61B0579DD3AF1AD04B634C0B11 = FRINGE_SEASON_2_DISC_1 (Fringe Season 2 | V | 0x2140F985A549A52DD9DA79FC6D5B01EA ; MKBv17/FindVUK 1.00 -0xB322CBFB6804480131B2595A317FCAAE0FD604AB = FRINGE_SEASON_2_DISC_2 | V | 0x63A564E50D34DF1D81F23A0CDCA9F92E ; MKBv19/FindVUK 0.80 -0xB99DDC8FBDBE82D3E937106FA95AD336CFF03077 = FRINGE_SEASON_2_DISC_2 | V | 0xC478AF548BE77430623D5F8B538D6CBB ; MKBv19/FindVUK 0.72 -0xEB4570B4CDD237CF40EEB6CD5E0F021094BB631E = FRINGE_SEASON_2_DISC_2 (Fringe Season 2 | V | 0x00141E674AE463C413D962787E6D5030 ; MKBv17/FindVUK 1.00 -0x4072F91E247BC2F52EEC8D994023765C32111776 = FRINGE_SEASON_2_DISC_3 | V | 0xC4111526D114C7F0901D06B8E63C6111 ; MKBv19/FindVUK 0.72 -0xE3BBF754C1C3868B8BD6CE7FEBB9C56E905DBCF4 = FRINGE_SEASON_2_DISC_3 | V | 0xF5136167FA5FD1188B363C777FBF1F60 ; MKBv19/FindVUK 0.80 -0xE6BA405F7E31324BB5EB2E439E273DB90E3B4D09 = FRINGE_SEASON_2_DISC_3 (Fringe Season 2 | V | 0x3D9243D6AF28933F6FC8651F493CEE9A ; MKBv17/FindVUK 1.00 -0x201DC329EE9714FDB91C85B22D95738F5A3A1DB6 = FRINGE_SEASON_2_DISC_4 | V | 0x3827C54B092D68A141823A4F08311C23 ; MKBv19/FindVUK 0.80 -0xF11F2FB6D3E4E58D8FAD853118F7054604704CB9 = FRINGE_SEASON_2_DISC_4 | V | 0xA7CC3EC5197D7797348BF3E1D8999199 ; MKBv19/FindVUK 0.72 -0xD3FD2234379D9D90B431AB2A47D1A4B5AA4B0ACA = FRINGE_SEASON_2_DISC_4 (Fringe Season 2 | V | 0xDAC4B9F121EC29117A1F12AAE8FFE114 ; MKBv17/FindVUK 1.00 -0x1E2EB5921ED872771133EEE5C2F8B27825E64020 = FRINGE_SEASON_4_D1 | V | 0x94032B40D24BFB9C851787274230F567 ; MKBv27/FindVUK 0.72 -0xCFA17EB19424B6623699F6902E442FBF3B756853 = FRINGE_SEASON_4_D1 | V | 0xCD758BB5E14ED24D72EC3611D9790DEF ; MKBv28/FindVUK 0.80 -0xAE69806F36AA7690BAE2539139C2FB838A8AC3D0 = FRINGE_SEASON_4_D1 (FRINGE SEASON 4 DISC | V | 0x26DECC67F1BA8BDE20D25B6F99A38AE0 ; MKBv27/FindVUK 1.00 -0xC03E3D70C5E3CDABDFDD7DBD5CDD4D2D897A0591 = FRINGE_SEASON_4_D2 | V | 0xFD6D16E2713316E85927D42F12AC5B70 ; MKBv28/FindVUK 0.80 -0x1B2C198A75464267C50A73D3307E37435A24E512 = FRINGE_SEASON_4_D2 | V | 0x5044A0640E80F456610FC4D2E743007E ; MKBv31/FindVUK 0.72 -0x44090F287DBD7036D9E65C663AC277E6ACC05FE1 = FRINGE_SEASON_4_D2 (FRINGE SEASON 4 DISC | V | 0x49BB81969284FD70750D189DD97B00A3 ; MKBv31/FindVUK 1.00 -0x09B01789CE92ED79435DBAEBFADDF9F0B98EC7CB = FRINGE_SEASON_4_D3 | V | 0x1C2B613AA6421F21D1CB74F4A49FD0C3 ; MKBv31/FindVUK 0.72 -0xD3D82CCAFA79713017C84398F8C328BA023EDC82 = FRINGE_SEASON_4_D3 | V | 0xFA27EC09AD42325F0AC743F41541E161 ; MKBv31/FindVUK 0.80 -0x26D192C2F0C962B50124B3DFB3F74517420762C0 = FRINGE_SEASON_4_D3 (FRINGE SEASON 4 DISC | V | 0x7196B4F36E07556F156A740A455EA39D ; MKBv28/FindVUK 1.00 -0xFB45F74C2AEEF5170B0EDA09D164D4779AE75757 = FRINGE_SEASON_4_D4 | V | 0xC811EB64C9580A24EB38A9E0EC743C17 ; MKBv35/FindVUK 0.80 -0x11B814231F81285F7F0DB751FA751CFA0A6D920E = FRINGE_SEASON_4_D4 | V | 0x69247700D9742C1D02809C3118388377 ; MKBv28/FindVUK 0.72 -0x9DECB74FB1D5FC15DCB26D586FAD42EEDA688D69 = FRINGE_SEASON_4_D4 (FRINGE SEASON 4 DISC | V | 0x0B3AB71A9BB88DC8177C329B54971974 ; MKBv31/FindVUK 1.00 -0x6E9AE49F7A14145CCC99483712B7F8C10530F0F5 = FRINGE_SEASON_5_D1 | V | 0x74F8AE482DD46D3A50ECF88FB2764883 ; MKBv35/FindVUK 0.72 -0x73121442B482550F26E171D30DBA86F6C3120BFD = FRINGE_SEASON_5_D1 | V | 0xDDFBF0DC1364C608DA6A0AEC93E4A14C ; MKBv42/FindVUK 0.80 -0x1CE4997DD6C3E980B632C9173DD73D0FE163D12A = FRINGE_SEASON_5_D1 (FRINGE SEASON 5 DISC | V | 0xDD30004B781CD0A8058179AEB5124147 ; MKBv36/FindVUK 1.00 -0x5B026733150C2CD51D7CCFDA9A1F2E48ADD66081 = FRINGE_SEASON_5_D2 | V | 0xCB03B706B08A16A190405333EFC5595D ; MKBv42/FindVUK 0.80 -0x39C27789D0AAE8A7B2E5A77FB39EBE77ABE5A4B1 = FRINGE_SEASON_5_D2 | V | 0x8C294E9FB319CE30279C67CA6440641B ; MKBv35/FindVUK 0.72 -0x87329456772A5C50398B4A9103781EFCECD7CA0E = FRINGE_SEASON_5_D2 (FRINGE SEASON 5 DISC | V | 0x2D8EDD4D2CDEB97849F25E8168501034 ; MKBv31/FindVUK 1.00 -0x7613B6BF4666C56824E1779316EB1538E0A1D7EE = FRINGE_SEASON_5_D3 | V | 0x6C588FF27D7047EB0150F50C68AA0109 ; MKBv36/FindVUK 0.72 -0x64B81CB7C0E5D4241253F3AA6D9AA1345061485A = FRINGE_SEASON_5_D3 | V | 0x1333B9750B77533447C1E743467175ED ; MKBv42/FindVUK 0.80 -0x97970959EBE297EAE8415797A215ADC4A9C1EA6F = FRINGE_SEASON_5_D3 (FRINGE SEASON 5 DISC | V | 0x00747D9DCA2E3D7E76B1B642008E29D9 ; MKBv31/FindVUK 1.00 -0x95CAC4CCB86AA22E198EED2757ABD6E3C0E3F63E = FROM BEYOND | V | 0xC0848D7C904BA28717A613D4E2978139 ; MKBv34/FindVUK 1.00 -0x86390D8D069554C77022E133336A00AF72B9D2E8 = From Dusk till Dawn | V | 0xAA045257B935E6C67C41209F592129D9 ; mkbv30 -0xA52C0A87150030934E3AF38D728E835E4D960E49 = From Hell | V | 0x97C8432E250AAE03116D585D00CB9ABF -0xAB6302BAB5579ECE6B5C394F657D7063E0A5D220 = From Here to Eternity (From Here to Eter | V | 0x6B90D4A9B0171031E300FE5A51C3CC48 ; MKBv43/FindVUK 0.96 -0xACDC41E20193BDE90907AE906C5E09FDCA9ADB3B = From Paris With Love | V | 0xD7E0C380F238E1143FE220FFF1E077D3 -0xCA2AE513540BD2B4D65989509F259EE1B05CC43E = From Paris with Love (From Paris with Lo | V | 0x71AD9B90EDEBB196FACB5F93546E366F ; MKBv17/FindVUK 1.02 -0xD6805625914BF194A54335C6BD3748CBF7494043 = From Russia with Love | V | 0x27A7C84BFA58125F90576E45BCF02324 -0x09F7CB976F9DCA9A9BED5BF065F257ECEAA5E386 = From Russia With Love | V | 0x29269990B806F764709465C42BD802F6 -0x75121BEAD45EE20FC3E8BD161AAA391546A7DBCD = From the New World CC BD-1 | V | 0x449E2DB6C0A6BF038E9BA8D3BE59EEB6 ; MKBv57/FindVUK 1.00 -0xC520EFB910C05EBD9875FA3DD0F7D8333373D93A = From the New World CC BD-2 | V | 0x5362A0D247C49A78F3F74D084B6B8131 ; MKBv57/FindVUK 1.00 -0xF9EC325DECD9CD0F051D79F99684DF1378C372CD = FROM THE NEW WORLD DISC 1 | V | 0x19A1E72A628937F9B0C4777432953CC9 ; MKBv47/FindVUK 0.96 -0x34CA9255CF8CECCF207CFB9551E2F22FC8BE1409 = FROM THE NEW WORLD DISC 2 | V | 0x9FE808378DF38E5DBDC1C7015A74F070 ; MKBv46/FindVUK 0.96 -0x666F4FC20511CBE5B6432E7C49BAD5DE135A2EBC = FROM THE NEW WORLD _ DISC 1 (From the Ne | V | 0x2F5D7432B6A6881748E56588A90B46E5 ; MKBv57/BEE/VUKNOTVAL!/FindVUK 0.98 -0x83143EA54853AD86DEA3B29D198B4660A28407E1 = FROM THE NEW WORLD _ DISC 2 (From the Ne | V | 0x59EA3DAA0F49A83EB225B4AD3244CAEE ; MKBv57/BEE/VUKNOTVAL!/FindVUK 0.98 -0x7C2DE9806845858D4D7D4980B228090774EDBF66 = FROM THE NEW WORLD _ DISC 3 (From the Ne | V | 0x4BD2C1EC77FC7DD9543583B06CA392F0 ; MKBv32/BEE/VUKNOTVAL!/FindVUK 0.98 -0x164EC10B8ACA9400E31DEC55062DC3AFD2EAC4BE = FROM THE NEW WORLD _ DISC 4 (From the Ne | V | 0x5123D24384F2FF9240D6D32346A01DAF ; MKBv32/BEE/VUKNOTVAL!/FindVUK 0.98 -0x6C9B0C58E8E28ECBE2930B7607569EEBCB34FC81 = FROM UP ON POPPY HILL (From Up On Poppy | V | 0x416CEC6B62BB61ED57E4CA0AED0B78F9 ; MKBv38/FindVUK 1.00 -0x4D5AB701EDC2E3044B6284E9A0C6257F2D7A2562 = FROMHELL_F1 | V | 0xC3DAD3728BC1E032C6D4DED37B71C06C ; MKBv1/FindVUK 1.00 -0x6D6C1C0317FBAE817B6698CF4D2992411E8644A3 = FROMHELL_F4 | V | 0x75CB7AE3D37EEF751A5BE521082D753B -0x0FF6199A03AA7DF3D3F42DD3828BC8ED040F4B0B = FROMHELL_JPN | V | 0x5508068D6C5558F3B568024C503001F2 -0x9F95CFD905F6C90FA760B8FA0F2A7CDEB283CD6A = FROMPARISWITHLOVE | V | 0x955FF09384E7EEDD758211F8E6398C51 ; mkbv16 -0x7D2A7165D5C0DE1447CC43C053388A7E6147289C = FROMRUSSIAWITHLOVE_F1 (From Russia with | V | 0xCE69C856DF53CEC79ACA992C691BDE40 ; MKBv9/BD+/FindVUK 1.00 -0x68ED50802BA74BB3A48B5BF4361CCA627561042F = FROMRUSSIAWITHLOVE_F1 (From Russia with | V | 0xD4EEF395D6ECF9C84B4EF04F1BEC308B ; MKBv9/BD+/FindVUK 0.89 -0x11081BD15543CC1D93230C9A77284F953B5C8FB7 = FROMRUSSIAWITHLOVE_F1 (From Russia with | V | 0x470610719000F7DA637FAEB28DEF5132 ; MKBv9/BD+/FindVUK 1.00 -0x9E18B5F7D9E71F8359CF855E62685ABA90601168 = FROMRUSSIAWITHLOVE_F4 | V | 0x0761AFF8C76E50D49F2E3F72AF0C6CAE -0x98C97975715F8E6CBF3236EB15A682FA4B02828C = FROMTHENEWWORLDBD1 | V | 0x25CCE336795BEDAA9E40AE4F0D7A4BA0 ; MKBv46/FindVUK 0.99 -0xC5E354ED7217C2ACCCE1AEF01B9C944030A970E9 = FROMTHENEWWORLDBD1 | V | 0xAA79DDB01A85CAC704BD2080F3C27B70 ; MKBv46/FindVUK 0.96 -0x999424C674692EF4FE7B0041B88DC88A0F93F14B = FROMTHENEWWORLDBD2 | V | 0xE9B028368FE12B2AB5AB59B9579A5E1D ; MKBv46/FindVUK 0.96 -0x76E3BC4C1E1FC6E7A3623F0D555797EC6D839F13 = FROMTHENEWWORLDBD2 | V | 0xD55885EF5537F3CBFB297C2981AB7137 ; MKBv46/FindVUK 0.99 -0xCA91DE01689A412F1A39638E02F893B0FB4D5E24 = FromtheNewWorldCCBD-3 | V | 0x1891B90A14D2AC73D5373E16279A8C72 ; MKBv57/FindVUK 1.00 -0xAADB1C0789B7F7FCB5E768D9B74C4EEF068A4659 = FROSTBITE_3D_AC (Captain America The Fir | V | 0xF199232B5BA234BF425A8A175AB6EB45 ; MKBv25/FindVUK 0.98 -0xB0903BC1E31BB129F98205FD1A9748EE4FC270F4 = FROSTBITE_3D_EN (Captain America The Fir | V | 0x551AED6BC9B2280D3FE5F4BC18A47550 ; MKBv23/FindVUK 0.84 -0x2500D71C3A5747D161F312099BCD8BC59CF82716 = FROSTBITE_AC (Captain America The First | V | 0x76930F65229A23B74E4C0018C3CA7DA9 ; MKBv23/FindVUK 1.02 -0xF1ED4B80A3E33B3CFF73ABB1FD50E3291EA4ED89 = FROSTBITE_AC (Captain America The First | V | 0xBE7354D875E3E50481F97B2DC728FFFA ; MKBv23/FindVUK 0.98 -0x202127F81A8128AECB3F6F45AEE45E1D4A712E7F = FROSTBITE_AC_RENTAL (Captain America The | V | 0x7E37464C3BD070A180B034CF44E73733 ; MKBv20/FindVUK 1.00 -0x07B6F64D74FA188FAFADF4CC947D28777EC22775 = FROSTBITE_EU (Captain America The First | V | 0xB221B6086E00EEB5CE851893F77827A1 ; MKBv25/FindVUK 0.96 -0xB5CAC971833D37325BD49947D8CCB3816C9FD715 = FROSTBITE_EU (Captain America The First | V | 0x58243DD80184C2DF0245DA6E72564D54 ; MKBv25/FindVUK 1.02 -0x9A956EC4F74A7D90FF2ED01A75C282D29CF99F38 = FROSTNIXON | V | 0x22736B301C2ABD2E47088943D3DEEEE0 -0xDB9B7043103FEF9A2A02B2BA55627B45CE92E54C = FROSTNIXON_G51 | V | 0x529F3BF837C8CA54ED149D9998C50BAA -0x51DCD033FCDD301ECBE300830C7595660C7D95CB = FROZEN | V | 0xB69E9C1295F8CE85648033DC01B03FB3 ; MKBrev 31 - FindVUK 0.51 -0xC11D42F9F7E62F9538E11C4E990A5E20FFFAC228 = FROZEN | V | 0x1FC09DF7AC47CAD2C0B5859721B29C98 ; MKBv35/FindVUK 0.84 -0xA1F9D9BA456B18EB70A907AA6104E53C8CC8595D = FROZEN (Frozen - Blu-ray???) | V | 0xB7D454FB018145324226494136AA3682 ; MKBv31/FindVUK 0.96 -0xD590CFE6C2DA2CDA4C97A9109C8EF4CCD6104F80 = FROZEN (Frozen - Blu-ray???) | V | 0x9D41C12C3C62870B46F9E5891A416948 ; MKBv39/FindVUK 0.89 -0x1ED86A17E20DD05502640F0C0C0DC954B374237B = FROZEN (Frozen - Blu-ray???) | V | 0x50354E20DD8A4CD42365415A9D31026B ; MKBv36/FindVUK 0.92 -0xA9D6CE74AD5D6985F13341675AB69F83C0A40816 = FROZEN (Frozen - Blu-ray???) | V | 0x87B8B1484A6E5139A7FBA04523698F0E ; MKBv36/FindVUK 0.94 -0x07EEF00D2D9A68C0AB41DB71C40AD39476D4C6D7 = FROZEN (Frozen - Blu-rayâ„¢) | V | 0x29AC64ED5FDEB03CEE440246D82CCEFF ; MKBv36/FindVUK 0.99 -0x1971AEB9EFA309CA56C8B3985F34C53509E675DB = FROZEN (Frozen - Blu-rayâ„¢) | V | 0x64A742F7ECFDB5A42658F351F39D453C ; MKBv31/FindVUK 1.00 -0x68A5CA167DA3CA80F128918A8E53B78F08789323 = FROZEN (Frozen - Blu-rayâ„¢) | V | 0x330E9346231BFFF4A1A549E4E363849A ; MKBv31/FindVUK 1.00 -0xCD48F28BAE4BFEA356A7ED6A642327EF28F08443 = FROZENPLANET_D1 (Frozen Planet Disc 1) | V | 0x38FDD004ABDE146A217284D124E4C504 ; MKBv25/FindVUK 1.00 -0x926074C18CA74D55BF5DC4969326C1953BA07FEE = FROZENPLANET_D2 (Frozen Planet Disc 2) | V | 0x96D7D82FB73BD9DAEB3BB77B7CAE7CEF ; MKBv25/FindVUK 1.00 -0xD3C200BA525F2A28401B40C054A9B54CC429B1E2 = FROZENPLANET_D3 (Frozen Planet Disc 3) | V | 0x6FE9F4B4812C0B980DC79675FB549CF7 ; MKBv25/FindVUK 1.00 -0x5E4496BA5FB8207461B6FB3731D7FC2178254B08 = FROZEN_3D (Frozen - Blu-ray 3D???) | V | 0x16EA6C6236B2389E14F88DB750322DDA ; MKBv31/FindVUK 0.83 -0x4A93109BE1A77C846080EFD0EEFD366B81A254B1 = FROZEN_3D (Frozen - Blu-ray 3D???) | V | 0x9E772CE4C46464D0CCEF784C7C8893A9 ; MKBv35/FindVUK 0.92 -0x2D1A1B0D5B31E8359AB1215C01FBFF866D964508 = FROZEN_3D (Frozen - Blu-ray 3Dâ„¢) | V | 0x91E32B9034CD6ED90B307BD18D6264B4 ; MKBv35/FindVUK 1.00 -0x6A3D0943DA080097C0CAF122905F5CD2000F70BF = FROZEN_GROUND | V | 0xDE74E42DF8A3F979679185F99EEF233F ; MKBrev 44 - FindVUK 0.53 -0x671BADE1215FEF61D3338F21E99A3264E9F76443 = FRUEHSTUECK BEI MONSIEUR HENRI (FRUEHSTU | V | 0x38089057001A1F0DADA98D39DDA029CD ; MKBv62/FindVUK 1.00 -0x401CE02F4B1A31AEB5673CBC41C00CF31C0ED0CD = FRUITVALE_STATION (Fruitvale Station) | V | 0xB642466A21C26FF265963C800AFE58AD ; MKBv42/FindVUK 0.96 -0xC39BDA2682DA62813BF95712FFB13535EDBBED14 = FTD1EFE1 | V | 0x684679ADD1EBCEC2E545A5EDDDEE64AB ; MKBv19/FindVUK 0.65 -0xD7E942CC0340C64A3E72A9C6B5D25444A3261D39 = FULL ACCESS | V | 0x7E29320FA003763288BAFC29298C72FA -0x20D7112BCC8F2C4BEAF9A8507B0B5E5E0E3F76B4 = Full metal jacket | V | 0x40EC12B37A892EAF77001544D00F442B -0x0B882E014EA94A3D7F7BD5E7360496EE093BEA53 = Fullmetal Alchemist Brotherhood Pt 3 D1 | V | 0x703AF4F3CE85884FBC2CC09CB6AE609D -0x752754074D69C21FB90F75EB2530529120F3A074 = Fullmetal Alchemist Brotherhood Pt 3 D2 | V | 0x9D492522669D58E1F3317656558F0E5F -0x274888EC8BA091EB11BF6E0D74DD097E4D9B045D = Fullmetal Alchemist Brotherhood Pt 4 D2 | V | 0xD7F52D999817C37D12400A24B433BC0A -0xFE94880B4FA43700B44C6E647687DF2D020E4470 = FULLMETALPANIC_S1_D1 (Full Metal Panic D | V | 0x8CA6189C58142075F6E1CD75FF4DBC91 ; MKBv18/FindVUK 0.92 -0x25B8F49FB7ACFE3C2AB27AD7C7E9C1E28173C4AB = FULLMETALPANIC_S1_D2 (Full Metal Panic D | V | 0x70B12C35512A10C4ABDD22950AB42585 ; MKBv18/FindVUK 0.92 -0xC4E90CFDC59A7A6BE069982D7A5A75556FEA80BA = FULLMETALPANIC_S1_D3 (Full Metal Panic D | V | 0x2AB4F1CEBA13E98939D0139BCF0DEB3D ; MKBv18/FindVUK 0.92 -0x5C5680E79C756CF960B1B48A37E3BE55D692A061 = FULLMETAL_ALCHEMIST | V | 0x16B4A4E5A72C3D3FBFBD10262F64065D -0xACA317B2407D802F83C19F7A12B3C76C16CA6041 = FULL_METAL_JACKET | V | 0xFF588A6FD0140F6DEF22B7927A8F447A ; MKBv4/FindVUK 1.00 -0x65EFB917C4CE8CC2ECDA47FF35BBE1F6D0854F4A = FULL_METAL_JACKET | V | 0x6E2FB87084E61AEEB594FE483368E964 ; MKBv4/FindVUK 0.96 -0xCE67FE57289AD2301AF11B3CD0F13330675A1330 = FULL_METAL_JACKET | V | 0xA7C694C07A62FD85353D985AE38E4B24 ; MKBv4/FindVUK 1.00 -0x29F792DE5B6F4FF3364D1E828DBD0352C2A9E182 = FULL_METAL_PANIC_D1 (Full Metal Panic Th | V | 0x61CAAF22D747C65F593066C37E27147A ; MKBv23/FindVUK 0.92 -0x798A635B79EE6A44C2F7AD6F47D8D6EE941DD124 = FULL_METAL_PANIC_D2 (Full Metal Panic Th | V | 0x1B8BFEF4B4FB471F2CC1E95B2CB0285A ; MKBv23/FindVUK 0.92 -0x9A56E91F6D5BCEB77977BCAC35FA58844114A4DD = FUNHOUSE | V | 0x800009BC8EB80C578EA86D8BD96D6542 -0xA96BC956FD1EA4A87FC6F4DE4156877FD9E360E4 = FUNNY_FACE (Funny Face) | V | 0xF3304584AD508344E3D7EBB3DB58831A ; MKBv26/FindVUK 1.00 -0xE6A24CCC44C9C854D2284C49DF23F49D3D50F7EA = FUNNY_FARM (Funny Farm) | V | 0x62182B6056C81E438DCA4B92718A55AF ; MKBv16/FindVUK 0.96 -0x4C263F5BE515E9B9F920750636A5CD0D1D541735 = FUNNY_PEOPLE | V | 0x124DDD54E3077639D5ADB8616384849F -0x0EAC45A16E2AC09981F5120E0853FA1E2C75C433 = FUNNY_PEOPLE_D1 | V | 0x16F440D5ED56BA370B309DBE59689890 -0x52EB490C6B8D6E9238DCF4047CC81FF4FCEF55C6 = FUNNY_PEOPLE_D1 | V | 0x91D347ACD4B78595D887C7FCD9C3B607 -0x0D634CC6C07A85FAC7680258DAA0E3E8B8AEF01E = FURRY_VENGEANCE(US) | V | 0x5324FDC37E64193C860E94C9DBE4715B ; mkbv18 -0xECABE77691E9E904D96265FA98ED9AA40FF5CE00 = FURY (Fury - Blu-ray???) | V | 0x997D174CC21576750424AF61960807DC ; MKBv50/FindVUK 0.90 -0x1120A58407D3715467F832BB873FB7C901F3D488 = FURY (Fury - Blu-ray™) | V | 0x8E6242A956D39715007DCCD600F0070E ; MKBv50/FindVUK 0.98 -0x6B833D8873E2FC6C218BCC6F643D9605689C481A = FUSSBALL 3D (Fu??ball - Gro??es Spiel mi | V | 0xE4B8941BD75A497350FF3CF8B76D5A60 ; MKBv55/FindVUK 0.92f -0x7A5B599CE834A9B0E4B653B4A35CE221742126D2 = Futurama 7 disc 2 | V | 0xC73858EEC564C05C02C43F0B3C78A74B ; mkbv27, bd+ -0xE741CC5631425EAEE4A59ED45D50866866CB6B81 = FUTURAMA3_BENDERSGAME | V | 0x9F62A1D169EAFF58985DC443F2672357 -0x2EB0F3E9EDF2AACDB90D945147A0D2A8D0417F51 = FUTURAMA_6_DISC1 (Futurama Complete 6: D | V | 0x95D9278EF580C98775296E23F61B3E50 ; MKBv23/BD+/FindVUK 0.90 -0x850CDEE5A007FD3EAC8A4F9872BE8852DC363460 = FUTURAMA_6_DISC2 (Futurama Complete 6: D | V | 0x9561AF610B428C2041E6E35F4C9ADBCF ; MKBv20/BD+/FindVUK 0.90 -0x6D35A36BAEE3E9D46FDD5946361148FBCF97103A = FUTURAMA_S5_D2 (FUTURAMA: SEASON 5) | V | 0x98F8652760B39CF29D4552378E5D1561 ; MKBv20/BD+/FindVUK 0.90 -0xA8FC7FB28FB528DBA41D6C62054C78F2418353CB = G Force | V | 0xA3F005D04039AEB7604FDBC138053CFB -0x08B12D85118DA88B3A2EEA3DCAB83B60D010F887 = G.I. JOE: The Rise of Cobra | V | 0xEF1A5F0C9E7756E8EC60DF4C442445B8 ; mkb v1 -0x916906293C45820B09D9742D496B76E22A24DB57 = G0xB0901_1 | V | 0x91F850E7B6FC57A8FCE93219A077490A -0x709193B404B6ABAA17625A0D144C5393E7939463 = G0xBD008 | V | 0x474DBE29A1147F3BA94DAAFD22E665F8 -0xAF177453889D0FED9FDD1C231B4C7BFE26766DE5 = G51 48334D1 | V | 0x7B981B79B6F2B88BD767E01DC45E62AC ; MKBv43/FindVUK 0.80 -0x6475B546BE5A3E31A3901FE7F2D33556CD42D69B = G51 48334D2 | V | 0x535F1119F50A155A810F9B38616CF26C ; MKBv43/FindVUK 0.80 -0xFF9B763DE7184122710AEB856A4FBC19A218954A = G51 48334D3 | V | 0x1B6CABE9D540A28A291AED62A98254AD ; MKBv43/FindVUK 0.80 -0x87D8105E1173D48310929A73753EE38C31BBC95D = G51 50728D1 | V | 0xE212AB9C78F7C61D4BDC42F0B8B90014 ; MKBv43/FindVUK 0.80 -0x8D0CD500B3862C0F3336BCE1FC9661A863183ED8 = G51 50728D2 | V | 0xF5FF236AC4CE13D64817CDFA48B2909E ; MKBv43/FindVUK 0.80 -0x2997E28941AE1899AB60C910943D9A3BC31A4D66 = G51 50728D3 | V | 0x3E18CE78AAF84DA1BE8DFCEE0BD27D40 ; MKBv43/FindVUK 0.80 -0x06271B2A54FC34E19515F61FBAE8F5CEB7199083 = G51 54214D1 | V | 0xACD3859D0B0D315A53A845166487AAB3 ; MKBv43/FindVUK 0.80 -0xF6CF80D9CF381EA59980CEC639E5AFC210D071DB = G51 54214D2 | V | 0x12DA9E4B260CAD9B8D0ED9EBF3B18B7D ; MKBv43/FindVUK 0.80 -0xA5DED06CAC6E19564E39C50EDD5EB660DFED87C5 = G51 54214D3 | V | 0xEA7FFC0E57CB2DE9F041DDDC81D9ECF4 ; MKBv47/FindVUK 0.80 -0xB9C3615BC0C05AAA639E181B95E5F6B71755C23E = G51 54214D4 | V | 0x79C3651DFC99A5CF36E659CB08F7518E ; MKBv43/FindVUK 0.80 -0x57A02C4C39CAA6892E3F0D0C43D5D13C05FBD815 = G51 57540D1 | V | 0x84FFE8A9C1DD717CFDD1D3B3949E327B ; MKBv43/FindVUK 0.80 -0xE95B134574F1872DB94DC11144F6C8F54085647A = G51 57540D3 | V | 0x0B14930A9CD3D7E47CEB2FE3FEA9DB55 ; MKBv43/FindVUK 0.80 -0x557821DD0218032BA8A47276CBB603BB106FC076 = G51 57540D5 | V | 0x97977364136D3340AFF3CBC7EF60C29A ; MKBv43/FindVUK 0.80 -0x08832ECCAD630387FEDD765C1C3130A51A818927 = G51 57540D5 | V | 0xE70FF2A3DF299162BAC1CBFA2BDF51C5 ; MKBv43/FindVUK 0.80 -0x95A03AC8BCA72ACC33EBE09902B7294A139E9959 = G51 65934D1 | V | 0xC9460ADBE3D2F08B045D99728859AE3E ; MKBv43/FindVUK 0.80 -0xD8D45F75FA42BA1A9B42F12FC1AC16B9657AD7AE = G51 65934D2 | V | 0x962662CE7521867F3F6D4DAF39F7CBC5 ; MKBv43/FindVUK 0.80 -0xD440E8C1392B2D28A1E8EFF279BFB64B2C92A88C = G51 65934D3 | V | 0x92C50D83EEE73848A1DDB8A8A402B45F ; MKBv43/FindVUK 0.80 -0xDFE0BC986C327894340B096A321D8AAC52C7C38A = G5163382 (The Revenant) | V | 0xC1AE38F0E856E55FA7FF247592A65BFC ; MKBv27/FindVUK 0.96 -0x521D2BDF7AAAFF35D839196DEE080610ACCA223C = G51_11364 | V | 0x0728F29220AAD3DD949B461F6EE3A0F7 -0x7DA0A0E4CF37182C67396EEFA77CA20EF4E6C6BE = G51_35037 (The Man Who Fell To Earth) | V | 0x1E8E85EA84591B4CF18416F222FE9F69 ; MKBv49/FindVUK 0.92 -0xEEDFBC5C3A5E5D1EE7DC62A2DAF74595AF272AD0 = G51_45205D1 (House - Season 1 Disc 1) | V | 0x24DE89CE0841150A2B1C10A06A0B500E ; MKBv49/FindVUK 0.96 -0x0C07C3CF32F491BE8DFBBD4A6F3D3F79C945A9E7 = G51_45205D2 (House - Season 1 Disc 2) | V | 0xF24A7A9BEEF68F2A447E99AA00F29612 ; MKBv47/FindVUK 0.96 -0x6EE4B320CFEF1C98BF1313C4A8F7A73A81F6ABF5 = G51_45205D2 (House - Season 1 Disc 2) | V | 0x1DB8D1AA2B994FB30DA970B040FC9D2C ; MKBv47/FindVUK 1.00 -0x722C6877457EA38AB0E091EEB550E23300C2B3D6 = G51_45205D3 (House - Season 1 Disc 3) | V | 0xB2A3A1692C56291601639B4EF8029C37 ; MKBv49/FindVUK 0.96 -0x54905DA701047CF09118A53E53073153F17BE89D = G51_45205D4 (House - Season 1 Disc 4) | V | 0x308083832C636423854D917CB7AC855D ; MKBv49/FindVUK 0.96 -0xA3C0D2BE02D602C14304C1BC848BFABD4211D692 = G51_45205D5 (House - Season 1 Disc 5) | V | 0x4FF1A15B21CD4836599083AFC2CB7E8E ; MKBv49/FindVUK 0.96 -0xC4AD66A39977885216E5F2CE3895228776D4322C = G51_46174D1 (House - Season 2 Disc 1) | V | 0xD43B02A99D349FF869399072D8287401 ; MKBv47/FindVUK 0.96 -0xF48100D30F27733D401AAFF1055973219514319B = G51_46174D1 (House - Season 2 Disc 1) | V | 0x2544BF259E0F5C64421A75AE3C92ED74 ; MKBv47/FindVUK 1.00 -0x6E02F761294CF8A463B18F9BD91AA3909815AF1C = G51_46174D2 (House - Season 2 Disc 2) | V | 0x95A9B0BFA8D3BA751C1BD53B0B3DA89A ; MKBv49/FindVUK 0.96 -0xF9D35E3509338EB4522F2833E2716EA28E9D4E0B = G51_46174D3 (House - Season 2 Disc 3) | V | 0x02CF87FC32579FCE1037FB7D40CBC402 ; MKBv47/FindVUK 0.96 -0x7B9B9942D088D167E5CB7635D9928F809BB479AA = G51_46174D4 (House - Season 2 Disc 4) | V | 0xF604A95B3A3A5A567F3FAA1EE968F3F3 ; MKBv47/FindVUK 0.96 -0x7365D985BB510A2F26C82683EF6896456E9E4491 = G51_46174D5 (House - Season 2 Disc 5) | V | 0x1EA40EB5BFD1BE8A9F84E129141594B8 ; MKBv44/FindVUK 0.96 -0x36ED23341120B6A67850BF3093D380846AF0C667 = G51_48714D1 (House - Season 3 Disc 1) | V | 0xF6934665FDC628AB58DA5D3C5E7F256B ; MKBv47/FindVUK 0.96 -0xB48CD2174876775E57C7978EE833D63868A1200F = G51_48714D1 (House - Season 3 Disc 1) | V | 0xA3BAB6637E1832BE6FC6B2B4E6ED24F1 ; MKBv47/FindVUK 1.00 -0xD944FB99AE2408D2925123AD0EB9AA5F74B9C745 = G51_48714D2 (House - Season 3 Disc 2) | V | 0x72F4761E0BFE5113D8C6B05C369476D0 ; MKBv47/FindVUK 1.00 -0x00C1BD74D74D658C3DEB5187181A745AE0114033 = G51_48714D2 (House - Season 3 Disc 2) | V | 0x023151E61AAF0F8697A7F7B58C618C97 ; MKBv47/FindVUK 0.96 -0x40D0DB848D8EFFC68842508600B8C3BE54E9A3C7 = G51_48714D3 (House - Season 3 Disc 3) | V | 0xEF4D992D5A813B577516C73418159AA8 ; MKBv47/FindVUK 0.96 -0xD7503CE72D0A0198750BD4B8EAB5AA378B498C21 = G51_48714D4 (House - Season 3 Disc 4) | V | 0x1B676DEDF0FDD530884729D49DDF02DF ; MKBv47/FindVUK 0.96 -0xBE045AFB90A0847CE3E0D182573679FD5D9535C9 = G51_48714D4 (House - Season 3 Disc 4) | V | 0xC51047D25C7378F058511E37A470AD30 ; MKBv47/FindVUK 1.00 -0x2BE17B238F161A27FDE4BCE1D5D83DE87DEE190B = G51_48714D5 (House - Season 3 Disc 5) | V | 0x619F8981DF01020716F7ED2606921020 ; MKBv47/FindVUK 0.96 -0x1CBB8C711EFEEE088996ADC19552139D58A7288A = G51_51166D1 (House - Season 4 Disc 1) | V | 0xED70253053A81E1567F5E0788DC92ABD ; MKBv47/FindVUK 0.96 -0x8EB487BCC966D20A8E0C49F1E8E5868C59CD621E = G51_51166D2 (House - Season 4 Disc 2) | V | 0x47F1214AAB28B2CCF3EDD657BC04EBE9 ; MKBv44/FindVUK 0.96 -0x40D05C36737207C7BB85CBA6391F49E4B83CFE2D = G51_51166D3 (House - Season 4 Disc 3) | V | 0xAFC3BDC664601E1B84974E6DCD84AF76 ; MKBv44/FindVUK 0.96 -0x96812C511FA93417599BCA3501AC8DE82BC66833 = G51_51166D4 (House - Season 4 Disc 4) | V | 0x45FB185C3ABDB9AF3FCAD0E9ECC34B9B ; MKBv47/FindVUK 0.96 -0x69312D72EDD26C0123F1983DD60DA569EAEC7C44 = G51_51166D4 (House - Season 4 Disc 4) | V | 0xD4E6981EED5E798C5710A0AE3B7F000C ; MKBv47/FindVUK 1.00 -0x424784CA12CE03347A389E448BD22F2F02F1EE2A = G51_53191D1 (House - Season 5 Disc 1) | V | 0xDFFC8702D27D73A5E0EE64E004ACA0DA ; MKBv44/FindVUK 0.96 -0xC03A3E6BB2BF9909EF516E645AE0A02E244067AE = G51_53191D2 (House - Season 5 Disc 2) | V | 0x59373B668E609B4034E7CC434EF4C005 ; MKBv44/FindVUK 0.96 -0x8FD162C13EBADA87A97341D07F282C7C07157142 = G51_53191D3 (House - Season 5 Disc3) | V | 0x07551EDDA2F41E4974B1141C63E3BC9E ; MKBv47/FindVUK 0.96 -0x5F3B53B778783458164C5A83DBCB949A70A182A0 = G51_53191D4 (House - Season 5 Disc 4) | V | 0x64A4A2CE8436605EF0D0DC924AB46312 ; MKBv44/FindVUK 0.96 -0x9C3E1E563234257C9FEB96C3C222F6572B68A293 = G51_53191D5 (House - Season 5 Disc 5) | V | 0x236466271E5DCB4E59CBB83852427CF1 ; MKBv47/FindVUK 0.96 -0xFACBE9E76F5B7079937CE76EC51788794C7C8E80 = G51_57542D1 (House - Season 7 Disc 1) | V | 0x16C4E19463A35FF78A4C99DFBFB7B9C2 ; MKBv47/FindVUK 0.96 -0xDA12BA314F00A8D6EF2B59818BCF13EABEB3726A = G51_57542D1 (House - Season 7 Disc 1) | V | 0x429A2D0589D1724406D3FA49A38787B9 ; MKBv47/FindVUK 1.00 -0xF88FCBD84BC12B038FB69E5AB5667B57BAA1EA97 = G51_57542D2 (House - Season 7 Disc 2) | V | 0x80C7AC0B37263B0196F034F2CDBAD0E8 ; MKBv47/FindVUK 1.00 -0x1AC4E81ED52287C6DC752F704A494D00F2CA5468 = G51_57542D2 (House - Season 7 Disc 2) | V | 0xCE655EE947E9E2241EF3985F346E1AD5 ; MKBv47/FindVUK 0.96 -0xB0F259056DEE1657B87CF73EC9503F4074BD3577 = G51_57542D3 (House - Season 7 Disc 3) | V | 0xAC2164AEFA84983AC1D5BBB0F8DAA391 ; MKBv47/FindVUK 0.96 -0x33CFB349F8C3F7B85DF516DDDA2CAB28717B4765 = G51_57542D4 (House - Season 7 Disc 4) | V | 0x2767A414332BE0A649AFCA810799C3D0 ; MKBv47/FindVUK 0.96 -0x17626DE72C12E8799777FD2BEB1F297746B55505 = G51_57542D5 (House - Season 7 Disc 5) | V | 0x1C443B2F5D69B58863AB76566D965E0D ; MKBv47/FindVUK 0.96 -0x7A10859E464A5A229DC32D0D77065FB3BFEE5EE6 = G51_65971D1 (House - Season 8 Disc 1) | V | 0x867796D294605A4C100F25C39807026B ; MKBv47/FindVUK 1.00 -0x0315239ADC7868315C1FE882E51FF660934A66F0 = G51_65971D1 (House - Season 8 Disc 1) | V | 0x49B35AF4F6F00C85897CA62CB4DBCE53 ; MKBv47/FindVUK 0.96 -0x48350ABC82F8500EDA49BF783E48768A2163FFE5 = G51_65971D2 (House - Season 8 Disc 2) | V | 0xA106ADCAFECBE6D69C069DDF53B5039C ; MKBv47/FindVUK 0.96 -0xE242C1A5E1AFFC8B2D503A7B9E6E86500B760DD5 = G51_65971D2 (House - Season 8 Disc 2) | V | 0x14BCFCFE2AFA03B420999A34CA610BB1 ; MKBv47/FindVUK 1.00 -0x71833B5B46A7487132622100E22BEDF48098293D = G51_65971D3 (House - Season 8 Disc 3) | V | 0x39A18990D72FDF50A0C6F2F172CF2BFB ; MKBv47/FindVUK 0.96 -0x82277FFF02DB0BCE78C65AC5A448B0764F33C090 = G51_65971D4 (House - Season 8 Disc 4) | V | 0x1C7CD8A8FB1415C5AB21F2FA6C8D7C9E ; MKBv47/FindVUK 0.96 -0x634C0B9D324F4CEEB5777C01E720F3CD7C5812DD = G51_65971D4 (House - Season 8 Disc 4) | V | 0x305E7B889294C7CE3478BA4EA4DB2EB5 ; MKBv47/FindVUK 1.00 -0xCE1503E2185E9D67D1AECAA0646045538360109F = G51_65971D5 (House - Season 8 Disc 5) | V | 0x3D5B651BDDD9E422EDBC26651D373F18 ; MKBv47/FindVUK 1.00 -0x4AE6B40C64718406935C94D36B0D77811EEAFECD = G51_65971D5 (House - Season 8 Disc 5) | V | 0x8D0120DB55C3D47581837FD6B1EA5DBB ; MKBv47/FindVUK 0.96 -0x938545C740492133AA1329D555D6BD199B1AE69A = G51_66980 | V | 0xDDE8FF07F364F64C85D0131940ABD6BF -0xB17C988ADECFAB681F4283478BA71613AD1B621E = G53_54947D1 (House - Season 6 Disc 1) | V | 0x6276CBCDB49C727467B9D3F23C536009 ; MKBv47/FindVUK 0.96 -0x1E7F9D298456332CDE5E4323FEBDDE1260F88E04 = G53_54947D1 (House - Season 6 Disc 1) | V | 0x9DF482B929CC71D16B2DF19A3F4FC9AA ; MKBv47/FindVUK 1.00 -0x01DDF1DE68A9E573B4C55512ED7C251E633E087A = G53_54947D2 (House - Season 6 Disc 2) | V | 0x49A5E2823A854F61D8922B295B4C609B ; MKBv44/FindVUK 0.96 -0x8A6D773240E6736471063B8398671CD1809D6AE6 = G53_54947D3 (House - Season 6 Disc 3) | V | 0x3829249597950068AC2026E5AE09B1A0 ; MKBv47/FindVUK 0.96 -0x18B14B8B4B9C4032F2DAD1A60D53CB64DD57E616 = G53_54947D4 (House - Season 6 Disc 4) | V | 0xA90138A4B3E74C634D00CC00B492A9F6 ; MKBv47/FindVUK 0.96 -0x9D383DDB51BEAFF6391089E584BBF6E0515003FA = G53_54947D5 (House - Season 6 Disc 5) | V | 0xA5BFFE02CD5196E00505965C9BDF3D7F ; MKBv46/FindVUK 0.96 -0x1E033BB6F374F3D4F71127635201CFC7C17B08C4 = G53_54947D5 (House - Season 6 Disc 5) | V | 0x59BF7BA1D16C4DA704DA430782F780E0 ; MKBv46/FindVUK 1.00 -0x2E115C79E470D05EB45B606A25B3ABCE5D9D3F3B = GA41EUE1 | V | 0xF7B0FB987D4CE0713E977693826488ED -0xD3E170C9FDED8399DB5B23987BF9EA643FB0ABEB = GA41EUE2 | V | 0x7F6967F0DCFD37E504396A9C0F0056A5 -0x49CF29E99B435D50832AC09F9230697BD448A168 = GA41EUE3 | V | 0xFF8CCFF293D347DD5FC34888D42E954F -0xED0836D94E96825C9F6BD7E41D6A9E4A74F0C66D = GA41EUE4 | V | 0xDC7F0D9FC0DAF0D4EDE88C5E675D7281 -0xDA01B9ACF58272781CF61B2E4B3B90F0A7BD08FE = GA41EUE5 | V | 0x04CFB130D3C735C1914CDD4C921ABF4C -0x61173D06EEFCB5A03FCB3EE3A5767919E5D7A147 = GA41NNE1 | V | 0xD18A3EE71754CC53AAC84FA1D7E8FDDF -0x0B1A72C36C50EA1099CA1DEC164B8A130D1C5F65 = GA41NNE2 | V | 0x89B21DCAD2FB4DA73978776D9FF11011 -0xABA0EC2EA24F655732E0CFA0FD65BFC361EA3B40 = GA41NNE3 | V | 0xCBD0640C6A55D5C1912703DAE0ACDF52 -0xDA8E09A03CAEF819FB88074367AFDB827D419C89 = GAERTNER | V | 0xD8BDEEA4FD79E6803C1D53EE7B85B16D ; MKBrev 3 - FindVUK 0.53 -0xD7B29EEC52B3E5D079A297872BB57F4B0F43A278 = GAKUENSAIMINREIDO1 | V | 0x003A9615A94827401A92AB85731B6BCA -0xF855A23DD6CF30BF2B84170C33920C57CA58FB75 = GAKUENSAIMINREIDO2 | V | 0x45DDFFB53D0EDB9C0387BB42490AB488 -0x9EB7E38BF6D9050004869AE9573F68E33E7CF698 = GALACTICA DISC 1 (GALACTICA DISC 1) | V | 0x6CD9553D40C7ACBDC94438D915EE912E ; MKBv51/FindVUK 0.99 -0x5E2DF29C59D67F7E1D444E9A0C87F76B52E050B6 = GALACTICA DISC 2 (GALACTICA DISC 2) | V | 0xE26BBB7A3CB460B18E14AEBECEFAACF3 ; MKBv51/FindVUK 0.99 -0xCF695214000426C19B9385011E39A8236B6A347D = GALACTICA DISC 3 (GALACTICA DISC 3) | V | 0x1E8C4B92120D2C433CF47B750901D8D9 ; MKBv51/FindVUK 0.99 -0x02F8D6A3115F8A3AD4454BAEE099BBE70514676C = GALACTICA_1980_D1_NA (Galactica 1980 (Di | V | 0xC180953553C493FB811EA680A3797440 ; MKBv50/FindVUK 0.99 -0x77EDA6385F3C8A380DCBBA1FA6DE4A2E8BF58C3F = GALACTICA_1980_D2_NA (Galactica 1980 (Di | V | 0x08C42499D75BDED48F59058333C21060 ; MKBv50/FindVUK 0.99 -0xB2FAB85EE84EF0601ED1C71C4FAEC7767645396F = GALAPAGOS | V | 0x0490C221C6AABCB22F68198B54126DD3 -0x3433307C276779F65A1EC7938C580C1F0B220B05 = Galapagos - The Island That Changed the | V | 0x007AB21326FDFB59997D06F82F4D795C -0x188F3471683FBFEE66F00456D23EE435CE97EA86 = GALAPAGOS_UK | V | 0xC3FDC83946B86AD08CFEC5FC18E0534B -0xD0DE6BD4025E2516CAADB2F15E98552F9BBD93C5 = GALAXY QUEST | V | 0x2D5D04029F7E5D4B0876F78B5E11153F -0xED2E2D4389C23F9D11B00B00B02A0637A8D53743 = GALAXY_QUEST_AC | V | 0x3F32BB9C381D33E2DFE56A6148D29BC0 -0xBFA87BDFBF8446659C5B777BD5455E5C6518ED08 = GALA_ST_PETERSBURG | V | 0xDFAE72A0B1568E8F702564B82596F88D -0xF3C20E0B1A43ADF88AB8E3332CDCE7016D1809F6 = GAME (The Game) | V | 0x038CB46F4BFA73D5E48D00A2B87A18EB ; MKBv16/FindVUK 0.83 -0x5C0F0BC38D84CED6F93A1D86EE5C0E1B8488E607 = GAME (The Game) | V | 0x261BD59340AABCEC5AD68E8D6ED17731 ; MKBv16/FindVUK 1.02 -0xAD4DA5C6EE5C5B5D9F7950648B845A3326E37ECB = GAME (The Game) | V | 0x3B7465DF33313D9C3F83203E5B50B9A4 ; MKBv16/FindVUK 0.99 -0x27A228D068BC08EA3DE52183CCEEBD91FD8FA224 = Game of Thrones s1 d1 | V | 0x71FFB3E100A9D0CC40ED3F761DF91B13 ; mkbv25 -0x9CC73752F7BD93D42C02B8D7D8DD3063D9AFAAAD = Game of Thrones s1 d2 | V | 0x86E9384364B4E5C804F59D59B30672C7 ; mkbv25 -0xBF31EE73B8BEAAB735BF987ACAC8E7B09DD49D46 = Game of Thrones s1 d3 | V | 0x81B5874A026B8941FB5ADA699D4532C5 ; mkbv23 -0xA425DAC53DD8B07A65F161BA78732702620E6913 = Game of Thrones s1 d4 | V | 0x6095A8BFA59B321679AB60C7A51D0945 ; mkbv27 -0xA73C278182A1DD08753DC60EBEE67938FEDDFE85 = Game of Thrones s1 d5 | V | 0xC2F4AD72DD484B63BFB47F3FF23293B2 ; mkbv23 -0xEB06CEEE0F9BBD49745166F54AFDE3761AA921E5 = Game of Thrones s2 d1 | V | 0xF8879FC1E54E8B372A9F316D836996C0 -0x7EFAEC2E64ED018C4BE7B957A8FCD341307036DD = Game of Thrones s2 d4 | V | 0xB65C8BAA9FDF6A180CD27D9E9ABF72A6 ; mkbv28 -0x417C8257A5E9F8AB780F6D5A0753DBCACA2A87F7 = GAMEOFTHRONES_B5A_S1_D1 | V | 0x44CC5ECE615EE441823E6215BF2E83E0 ; libaacs -0x4F99B7D6D005A92F5546DFBEF6D1205BDDA0E37F = GAMEOFTHRONES_B5A_S1_D1 (Game Of Thrones | V | 0x77FB143F48421C44E9F9D55040BAB282 ; MKBv31/FindVUK 1.00 -0xD48830991AC75FED0559E395A5AFE8E9B96AAF17 = GAMEOFTHRONES_B5A_S1_D3 (Game Of Thrones | V | 0x9BBE8E427CD51B38D98128541C3F8399 ; MKBv25/FindVUK 0.96 -0x69F1AF0589342F9EBFDA23FBF6CEFB9F2324F8B9 = GAMEOFTHRONES_B5A_S1_D4 (Game Of Thrones | V | 0xDC50588ADEE594323372A6AC27DB5044 ; MKBv27/FindVUK 0.96 -0x2584C818BB93DDF5FA84871E7283E6C8ED5BA1AD = GAMEOFTHRONES_D1 | V | 0x1BC1D97721A6CDE9A3AB1865291B0CDE ; MKBv28/FindVUK 0.80 -0x927C72FFF3637F344E5AA0FF7DDB89584A215B20 = GAMEOFTHRONES_D1 (Game Of Thrones Season | V | 0x8C2288F311EDAF4219864D0402F8E8B2 ; MKBv28/FindVUK 0.97 -0x207AD649E2F66B2953499275EF53E36A24B01304 = GAMEOFTHRONES_S1_D1 (Game Of Thrones Sea | V | 0x1CD6203F873BE420D1B9DEF006B3CCCE ; MKBv53/FindVUK 1.00 -0xB79ABB159EDA658CB5EC9D60C4677F32A82394A0 = GAMEOFTHRONES_S1_D1 (Game Of Thrones Sea | V | 0xFCF8F25E5FECBCE820396061AC231C49 ; MKBv53/FindVUK 1.02 -0xEED766367D26DBFF53465414C846C612FDF2D5C4 = GAMEOFTHRONES_S1_D2 (Game Of Thrones Sea | V | 0x1CB61F655AF898231F4C4AC60EB82A26 ; MKBv25/FindVUK 0.97 -0xF8EA69DB9AB34E0967AD6D5A7FF1F4F273EBCC1C = GAMEOFTHRONES_S1_D2 (Game Of Thrones Sea | V | 0xBFFE03179ACDDB321069F56D22B67987 ; MKBv53/FindVUK 1.00 -0x069A5790078027EBB2290BBA1C2646BCEF971381 = GAMEOFTHRONES_S1_D3 (Game Of Thrones Sea | V | 0x0B2AFADE5D929B101AE206E901909035 ; MKBv53/FindVUK 1.00 -0x8DBFC51D30DFCCCFB29D5A9F63BEBA888CA7D55F = GAMEOFTHRONES_S1_D3 (Game Of Thrones Sea | V | 0xB13A1640D4F4091F40362079F152B0EF ; MKBv23/FindVUK 0.97 -0x0273C4F1DC690FC6FCE58F9FE48056D62E1B0F92 = GAMEOFTHRONES_S1_D4 (Game Of Thrones Sea | V | 0x0394FF6C5686ED44B5A2A3770F27B100 ; MKBv27/FindVUK 0.97 -0xBB56051BD7B6A9B41980B60E16AF6B64344D9C0C = GAMEOFTHRONES_S1_D4 (Game Of Thrones Sea | V | 0x0F59A786383B3A5F95A67A23B3A06274 ; MKBv53/FindVUK 1.00 -0x74B7522C266C3504FC54D8836C5C4D7DF1694C2C = GAMEOFTHRONES_S1_D5 | V | 0x7D1682FE1AF89E273144DD89AEDD017B ; MKBv31/FindVUK 0.80 -0xDD73D4455B6755D00BBF2CE97A4D207B042B329D = GAMEOFTHRONES_S1_D5 | V | 0x697F08E6A135083A9A9679C98C75C239 ; MKBrev 31 - FindVUK 0.62 -0x2C64BC72E788157D327A69AE44DF0422506B79D3 = GAMEOFTHRONES_S1_D5 (Game Of Thrones Sea | V | 0x58383B230F63B5FA3603424DDA17B036 ; MKBv53/FindVUK 1.00 -0xE7A3F700D3E06E4153AC6C4E88222DE5D5A11C4C = GAMEOFTHRONES_S1_D5 (Game Of Thrones Sea | V | 0xD88D4E33974CEC46793C7F308867EF88 ; MKBv31/FindVUK 0.96 -0x2E9997D4605B74D80BAA847D5959C0DA3AE80E30 = GAMEOFTHRONES_S1_D5 (Game Of Thrones Sea | V | 0xF0FA16D52FA8D5C9AEA3C680ADF4A4D9 ; MKBv31/FindVUK 0.98 -0x6176DB501CBC08B630DB9BF2C53799312108139C = GAMEOFTHRONES_S1_D5 (Game Of Thrones Sea | V | 0x6B128C9B3CC2306A69D50EC09BB3B22D ; MKBv31/FindVUK 0.97 -0x1FFC0F8B9C0275EA61C4B94D93728ABAEE2D88C7 = GAMEOFTHRONES_S4_DISC1 | V | 0xF2A1336333BE1D4739F6A0A7D59F6D5C -0x6B9A4D43553D6947BB8A2B0490CC948B24D90CB6 = GAMEOFTHRONES_S4_DISC1 (Game Of Thrones | V | 0xC2562F8D56667F1B140E6D4D7D7622B1 ; MKBv50/FindVUK 0.84.1 -0xB581B44886D31936F9CD72B0324AE758510056B1 = GAMEOFTHRONES_S4_DISC1 (Game Of Thrones | V | 0x3BCDFA2EBDA28E26AF2D639EB2636A0E ; MKBv50/FindVUK 0.97 -0xD7C91BC8F85BFD3F338EC05F18734524438AAB65 = GAMEOFTHRONES_S4_DISC1 (Game Of Thrones | V | 0x347048E70CD6E40BC89436AE574DCA39 ; MKBv61/FindVUK 1.00 -0x966F727BC74FC90C665250FBBA24A3177AAF6646 = GAMEOFTHRONES_S4_DISC1 (Game Of Thrones Season 4 Disc 1) | V | 0x38E76B5AB9CD5465A5019539AED590C2 ; MKBv50/FindVUK 1.00 -0xF0EF5D86D9ED7B818357CEEF1E72D4F2A0E5CD37 = GAMEOFTHRONES_S4_DISC2 | V | 0x12C5848330BD8F7B9CFCF413ABDE8843 -0xD0632A59CF38F170F12D77ADD542B1A9F947DAAB = GAMEOFTHRONES_S4_DISC2 (Game Of Thrones | V | 0x31101C68B6D206869CD24772CF01D208 ; MKBv50/FindVUK 0.97 -0xBBD5122F34946F6C0A932D6A3D29608D56559A6B = GAMEOFTHRONES_S4_DISC2 (Game Of Thrones | V | 0x223607703D49A9055F9DCD4F2153C1D3 ; MKBv61/FindVUK 1.00 -0x43BEE2391D49BB86195FC145FF051DA3588F71DA = GAMEOFTHRONES_S4_DISC2 (Game Of Thrones | V | 0x8A3FCA99D2DA92C0655C01574F1B6F16 ; MKBv50/FindVUK 0.96 -0x186B8E349953159CEEF0848BB12608AFB641EF5B = GAMEOFTHRONES_S4_DISC2 (Game Of Thrones | V | 0x1ED191F9B2484E248FCBED7966B34B35 ; MKBv50/FindVUK 0.84.1 -0xDAAD5C3C49AE7E50CAE68D9CB84AFAFB4138A757 = GAMEOFTHRONES_S4_DISC2 (Game Of Thrones Season 4 Disc 2) | V | 0x0F684F566408F9FC71CCF16CFBDDE7BF ; MKBv50/FindVUK 1.00 -0x6C93023A88D0CCE93BDF92410A90A48F476D5833 = GAMEOFTHRONES_S4_DISC3 | V | 0x554E21CB6D14076D66A87E898F21A4D4 -0xA464D4D74AD1DF2B50AD072398D13E838DBC8D4E = GAMEOFTHRONES_S4_DISC3 (Game Of Thrones | V | 0x106E6F7FD361E34AD4508A9BFF10B1B2 ; MKBv50/FindVUK 0.97 -0x68646BD2B3D90890DF34424FE07F60EE7B29F926 = GAMEOFTHRONES_S4_DISC3 (Game Of Thrones | V | 0x4BA27F0D656BD67F0B2F84DBBDABC83B ; MKBv61/FindVUK 1.00 -0xE523293ADA2F07D6EEC6EDC45C863FAC1371209A = GAMEOFTHRONES_S4_DISC3 (Game Of Thrones | V | 0xC089FC215DF8AAC9A5AA5A1AF69C6D27 ; MKBv50/FindVUK 0.84.1 -0xBD9022B440C5437B455D916DDE7380DD64EDAC42 = GAMEOFTHRONES_S4_DISC3 (Game Of Thrones Season 4 Disc 3) | V | 0x381F75C294354E863CD8D6430E9F2C90 ; MKBv50/FindVUK 1.00 -0xE39006AFF830D49783AD1B135E46D4D5E1A29FC3 = GAMEOFTHRONES_S4_DISC4 | V | 0x5FA006CA152E44F9AA0A1BFB19EC1DBF -0x924B57A3DF1D13C5E049E89589B4E985F9E6ACD1 = GAMEOFTHRONES_S4_DISC4 (Game Of Thrones | V | 0x659222FBBBEA5B8BEA1DAE08ACC50193 ; MKBv61/FindVUK 1.00 -0x4CDCF6AD888B88B959F4D81FA10869F7BF5620F1 = GAMEOFTHRONES_S4_DISC4 (Game Of Thrones | V | 0x01CE069B898F5FCFE3BB87E2697C94DD ; MKBv50/FindVUK 0.97 -0x72C6871A2174B701DF130587FE802B753D19CD92 = GAMEOFTHRONES_S4_DISC4 (Game Of Thrones | V | 0xB1AD8CBD9CFC2387692B80696EB70637 ; MKBv50/FindVUK 0.84.1 -0x0838A3265F7425D01B89F62F2235CB13BFC5760B = GAMEOFTHRONES_S4_DISC4 (Game Of Thrones Season 4 Disc 4) | V | 0x4AEABF0DC398B67C4ECAA98146DD2CD8 ; MKBv50/FindVUK 1.00 -0x67BD993C999B773C1C14EFC8945730B2FCAEF26A = GAMEOFTHRONES_S5_DISC1 (Game Of Thrones | V | 0xDBBA6F78A5B4D45F909BB50DDA1BC0FB ; MKBv57/FindVUK 1.00 -0x69AC75AC63C01E15607558DD55963EBB4FE14DB3 = GAMEOFTHRONES_S5_DISC1 (Game Of Thrones | V | 0x85CCF450E728C01F9C09F60589AC0510 ; MKBv57/FindVUK 0.92 -0xB440CBA18CBEC00B956E46F0C8CA8EFC4949052C = GAMEOFTHRONES_S5_DISC1 (Game Of Thrones | V | 0xD8D6E8B641A61F6CA5C7E6126F0AFD4F ; MKBv57/FindVUK 0.91 -0x2C4FB009F3CDB0F939B2BDDDB29D05919B72A5DC = GAMEOFTHRONES_S5_DISC2 | V | 0x6FC76304130900FC907E0B3C12B15285 ; MKBv57/FindVUK 0.65 -0xF13B6CFA069ECCA95E4006D26BD854BD41ACF0DC = GAMEOFTHRONES_S5_DISC2 (Game Of Thrones | V | 0x1F7EA645C2A291F194C93F3CE41B7240 ; MKBv57/FindVUK 0.96 -0xC131769027A3C7DB95A6BDCAE17643905A82758A = GAMEOFTHRONES_S5_DISC2 (Game Of Thrones | V | 0x548D8801173692BD2E05509620BA4F76 ; MKBv57/FindVUK 1.00 -0x1EE82A3E1FFD52F1577A6FA7D43B39CCC553AA41 = GAMEOFTHRONES_S5_DISC3 | V | 0xF6DF02EE5A294676C96BCBBC65452D28 ; MKBv57/FindVUK 0.65 -0x056CA8107A22E801F046D47E1ABDAA9C41BBD4DE = GAMEOFTHRONES_S5_DISC3 (Game Of Thrones | V | 0xB2A53E0682716892850271000E5A15E7 ; MKBv57/FindVUK 0.98 -0xDF2CC92691DEBDE2F2190C8C5F328E706CD48EFA = GAMEOFTHRONES_S5_DISC3 (Game Of Thrones | V | 0xEE483D5EF983D4735EB30E74945EB20E ; MKBv57/FindVUK 1.00 -0xB5E21D8FD68887A75DC60F614B8A492079FFA825 = GAMEOFTHRONES_S5_DISC3 (Game Of Thrones | V | 0x9F094B555252FA915853E48F6D5F4E30 ; MKBv57/FindVUK 0.96 -0xE2D52AEBC2B92D90BACBAF554A2B85538562792F = GAMEOFTHRONES_S5_DISC4 | V | 0x1951A95A87EF582F87E530891F487599 ; MKBv57/FindVUK 0.65 -0x773D98D2F767CE96418AD9F9870D99ED88CB8B42 = GAMEOFTHRONES_S5_DISC4 (Game Of Thrones | V | 0x188C7F95743C7A1B9E59C7495C073826 ; MKBv57/FindVUK 0.99 -0xF069B0828859FB967EAD45E551F1115DE8D30E7A = GAMEOFTHRONES_S5_DISC4 (Game Of Thrones | V | 0x3A607F10F387632BB24228542D1FEBA8 ; MKBv57/FindVUK 1.00 -0x48628706CDF90719D565F745475B151972BD54C1 = GAMEOFTHRONES_S5_DISC4 (Game Of Thrones | V | 0xAEE89E52B577A5410729CBACE2326855 ; MKBv57/FindVUK 1.00 -0x4DE30299E2CE83587AB84A745F81794E63BFD0B7 = GAMEOFTHRONES_S5_DISC4 (Game Of Thrones | V | 0x0D3FB3CCC293B9D560D1F9A9B080B4C1 ; MKBv57/FindVUK 0.96 -0x982CBDC319171C15044DA83AFFB9B1E8C1F27683 = GAMEOFTHRONES_S6_DISC1 (Game Of Thrones | V | 0xD53778257178D95B501712913AA5573D ; MKBv62/FindVUK 1.00 -0xE9C2588CEBCE9587EE8CFA17E3F60A5E661B6479 = GAMEOFTHRONES_S6_DISC1 (Game Of Thrones | V | 0x6221876C0FEE7BFDCECC4FA818CCD607 ; MKBv62/FindVUK 1.00 -0x2AC3FEF842863CED8EAA51E0FE6A45D8687FD948 = GAMEOFTHRONES_S6_DISC2 (Game Of Thrones | V | 0x7050C7EF74A3F6987BB650ECE275BB8B ; MKBv62/FindVUK 1.00 -0xD70A5F03D2E6768EB5372A1AD7ED4541FBEFF48A = GAMEOFTHRONES_S6_DISC2 (Game Of Thrones | V | 0xE003255BBB06365A7C888F92B986241B ; MKBv62/FindVUK 1.00 -0xD2B02348533142681FFFC9717C39C498A02CC285 = GAMEOFTHRONES_S6_DISC3 (Game Of Thrones | V | 0xDDDF141A3527CFBA3BA253770715FC0C ; MKBv62/FindVUK 1.00 -0xE3FC9C589649A6E01128A14B6DEF46504CDEB2B9 = GAMEOFTHRONES_S6_DISC3 (Game Of Thrones | V | 0x6C29A6267D21DBFDDF5C0D8C93F08703 ; MKBv62/FindVUK 1.00 -0xAD87F0DCBA386C451ACA6D6D5D90200C74E65CE7 = GAMEOFTHRONES_S6_DISC4 (Game Of Thrones | V | 0xAAC4CF55457C33275874BAF766D8178C ; MKBv62/FindVUK 1.00 -0xFF09D075A6469F51E4015C786755B36FF42CDCD5 = GAMEOFTHRONES_S6_DISC4 (Game Of Thrones | V | 0x03A2F490445C257756AE06FC01058553 ; MKBv62/FindVUK 1.00 -0xA36B2153B83EFD777973CAB329CF52E168191D20 = GAMER | V | 0x87E882F7302E66ED707DC6701F1008DC -0xEFB1560DA51742D6918FEB89063E27BD2D9459AF = GAMER | V | 0xFED4F0556FB195C5784AD9639EDEAE82 ; mkbv16 -0x5D424268A558749E72EF72832ACEF5C50D30A927 = GAMER | V | 0xC7C75BDEA80D89A11060C82DC237A7F1 -0x147C28ECCA1659EADFE297A71DAECEA9320F1327 = GAMER (GAMER) | V | 0xD15A75AA0B14F592374E6DA86FE0FBE0 ; MKBv16/FindVUK 0.98 -0x0D95F60080D4BB7E6D435C5A68AEF2C800BCC052 = GAMERA | V | 0xE0124B262280EA6A03E772E9A7522E2D -0x1E16C94890E984ABA254AE1702CE52B00C83FC33 = GAMERA VS BARUGON | V | 0xFD9BF788000C5995F14980A52D37B8AD -0x62ED74280DDAC514E5D217D0FE0D79F6F630B2A3 = GAMERA VS GAOS | V | 0x8B9BA5A031330773331958C162C0BD47 -0xA808B94E6A5AF92E8D888655857A7A0DC5984067 = GAMERA VS GUIRON | V | 0xBC4598633135524A71FF898B2CB6BD67 -0x4DE1FB182B2EDE58EE27B35EC2B2A49A8BBFD0D4 = GAMERA VS JIGER | V | 0x5E186DFA8BF029A6F690209CFF0D024C -0x02F69ABF927F36DB611CCFA0BAEA63F553852093 = GAMERA VS VIRAS | V | 0xFC8DB5E0CA7A7541BD152DC792A75636 -0x2795313FA3FC1EC5B98ADBFC72ADB57E7C10F040 = GAMERA VS ZIGRA | V | 0x24726E1B1C78E0AD8CD8C9EB3A32ADA4 -0x2F40CADB8745624123791B938A647A22EF1FBB9E = GAMERA_3 | V | 0x38157CCBFB5FB61847CDC15BFB960602 -0x98FA474249DAB845738D9C97AD9350F5AF2018B7 = GAMERA_3 | V | 0xCD6A6980CA706D210FF7AA47985E6CE3 ; MKBv19/FindVUK 1.00 -0xA5191C8B615BDCA5B8F551A5DF18F69FFF6DF235 = GAMERA_DOUBLE_FEATURE | V | 0x05AFAB3720FC7B3A1D28D808EF1B07D6 ; MKBv19/FindVUK 1.00 -0x2D647B32DE08DA8B04944C46DC59FE91F2F4FB31 = GAME_CHANGE (Game Change) | V | 0x9FD1D35D36A7830EA42730680C98A4B6 ; MKBv27/FindVUK 0.96 -0x590DAD942C3D4444AFCB92C3E4BCA614AF107CBC = GAME_OF_DEATH | V | 0xFC1E36E462BEF122DC1F0B773267A070 ; MKBv4/FindVUK 0.84 -0xAB6DAF1F77EEB06782525D440B84CF4F52D96452 = GAME_OF_THRONES_S2_EPISODE_ONE | V | 0x7012069ABAC742423FD9184472CCC06F ; MKBv31/FindVUK 0.65 -0xD976B6AD0D84DA29B9A7A32AC3302C1BFBA7D177 = GAME_OF_THRONES_S4_WALMART | V | 0x4A818D4CB224E94EBAD2C07119A3C217 ; MKBrev 50 - FindVUK 0.62 -0x7A8134F7BFB4D02469677DDFAB9E907766718C17 = GAME_PLAN | V | 0x64D3BC70CDF66B80035230A9512A780B -0xC5965FD05A67E30F5D49B9D94777110D6C1B2F01 = GAME_PLAN_DEU | V | 0xEBEBA5E7612893BA5E1C151DE2F7612E -0x6DE34BE98D1769236A14B85F072EE151384BFB1E = GANDHI | V | 0x02824A99F4CD0A5375F0339B6A53CD06 ; MKBrev 10 - FindVUK 0.57 -0x392E118F8BBBDCF12ABF0694A797851A957094D5 = GANDHI (Gandhi - Blu-ray??? Bonus Disc) | V | 0x2D1879563650B7D2567802E2B399FD6E ; MKBv10/FindVUK 0.96 -0xDD8A8264B28B4CFC9FEAC8F276D2A6D61FE33DF1 = GANGES_UK | V | 0x5F843CD9464733ACB0AD30638A91E6A7 -0x2B2721E2F77CD81952855AAE142CF9DFB1E9B4FC = GANGES_US | V | 0x7E999B64F35622397C4E0DE0BACDEAEB -0x4613CE73E167A7336FA058382DCD41A53FD272C1 = GANGSTERLAND | V | 0x5E27B2D854ADD60299B38E4271728144 ; MKBv25/FindVUK 1.00 -0xFAE2905F2130BF4C11C5B693C721EF34C18053A3 = GANGSTER_SQUAD (Gangster Squad) | V | 0x03E5DADBD8E99298BBB3B60CFF8B3FCD ; MKBv38/FindVUK 1.00 -0xD6C656C2800F2EF1AA9F3A4F06650A9E0C08865A = GANGSTER_SQUAD (Gangster Squad) | V | 0x3F02FD6EF45227121484207865C39E38 ; MKBv35/FindVUK 1.00 -0xA14A87785B312914CDC7554DFD2CB6667D741AD3 = GANGS_OF_NEWYORK | V | 0xA1E1480C3D9AAA74CE29394A954D3BFD -0xEF2271EBED7643DF9B91D52517D8430C9FB617F2 = GANGS_OF_NEW_YORK | V | 0x8B7FBF2121EC81D78333913C62728650 -0x9E2159842B2FC1A68395C3FAA28B6CED5D62E157 = Gantz | V | 0x09C0AEF796FE0A5967991C7466959BDD ; MKBv25/FindVUK 0.80 -0xF2212F2B88715C2F56E5308BF822DDCAC54A2B54 = Gantz2 | V | 0x3EA640D4F051BC6D3372B84505B6BC5A ; MKBv30/FindVUK 0.80 -0x828E88213AEAF89627F0708EC4521C1AE75B79AF = GARFIELDF6 | V | 0x6833023418B4CD0F8D7D8C4F56380258 -0x2B4097C9B021D0199F2DBA8C1FA1F2271B7E13E1 = GARGANTIA DISC 2 | V | 0x106132C9883E093FA2616F02FFA604F3 ; MKBv52/FindVUK 0.98 -0xD1768FA9A8C11B0E0AB2E8C733B6062350D400E5 = GARY_MOORE | V | 0xA652020638F255B1270B960A2C89D80B -0x8C0337D34C9725FA32C637921E62CFD53D3CD423 = GATCHAMANCROWDSBD1 | V | 0x14D8B9CD5422B1CC8BA454D37E253D90 ; MKBv47/FindVUK 0.96 -0xE3EB315511B12024CCAFDC99DC1B63AB0DC60789 = GATCHAMANCROWDSBD2 | V | 0x93795347EE784506B65BA2177B6D3143 ; MKBv47/FindVUK 0.96 -0x76945D9BBA506D94C937A39B75B74FE0BAAEAD7A = GATE_OF_HELL (GATE of HELL) | V | 0x14B04A694DED73645E546850A2928B35 ; MKBv35/FindVUK 0.99 -0x1A4290C27D6CF3768F3C99F25551D12F18EA2DFA = GATE_VOL_1 | V | 0xC8DB0C2EF23D30D1673E2050B6457AB8 ; MKBv62/FindVUK 0.98 -0x3927433DC506BC39CE1E1C4FAE7E6F619D4847F1 = GATE_VOL_2 | V | 0xAFB4C2274A7D1423C69D68E51C57C545 ; MKBv62/FindVUK 0.98 -0xE1616B4836790610BBAC9AE902B764A59A482738 = GATE_VOL_3 | V | 0x7BFCC9B5001E29629BC7B5C218BB72D8 ; MKBv62/FindVUK 0.98 -0x34A15C53EF96D0085E708991D99F71DBB870EE60 = GATE_VOL_4 | V | 0x264FF9DF7211654D1BA11B1558A74AF4 ; MKBv63/FindVUK 0.98 -0x6B07D785C8CDE8DE715D1A2D93EB7428BCB2DA5E = GATTACA | V | 0x72A2A3BD6813E5D1F9F9E209B59662EC ; MKBv4/FindVUK 0.80 -0x506BC2961706BF7FB736259CD03D03C5AD529455 = GATTACA | V | 0xDAF0E53483F2C07DF67F02B9FD9E790B -0xD89343777024AEE03875A0E5542DE0DD589E487C = Gattaca (US) | V | 0x887E19DF02E83A0C0DA173AC2420BABA -0xD5C910C59178F6B0B2E7E962AAAFB9A1FC9E6D04 = GAUNTLET_BD01 | V | 0x2800E8D6CAEDBECB2C4319C9AF4BA425 ; MKBv7/FindVUK 0.96 -0xAD9E4CD4FB4B793CD8D3BA3063465192DB27EBAB = GAUNTLET_BD01 | V | 0xAC9BF1070C339DE7AEA611329043ADC7 -0x2BF8159757B570D7A29D7B646E29142BB2086353 = GA_REI_ZERO_D1 (Ga-Rei-Zero Disc 1) | V | 0x965BB26A14690228EF5BDBE6460A5E8B ; MKBv21/FindVUK 1.00 -0xDFD4E677FDE088EFA979C71992143CFF2F40FE1B = GA_REI_ZERO_D2 | V | 0xC3D618007F31754ACF27F8D390370133 ; MKBv21/aacskeys 0.4.0e -0xEEF3054806F5AE19E514EFFDF4A0B274B6DFA41F = GA_REI_ZERO_D2 (Ga-Rei-Zero Disc 2) | V | 0x967C37CF4E92146B156A53C50ABB5E54 ; MKBv21/FindVUK 1.00 -0xF9A36541055FF7CC36134290DFFB1622F7BD5018 = GBD_012 | V | 0x01DD196A1FD5A2F448B77DBE2789C836 -0xF3734A9573CFA5DC629144BBDD66C9BB263B88E6 = Gefangene Frauen | V | 0xEAEDB2735A44DFB1E4130BE24D7602CC ; MKBv44/FindVUK 0.89 -0x61CA4CD5C5C469FFFBC1F108AB1BF147C7F74A74 = Gefesselt | V | 0xB99DA4C45B3296086EA8793D91129BC5 ; MKBrev 54 - FindVUK 0.57 -0x26441268EB54AAB052C09A715A4CD3922919FFF1 = GEISTERHAUS (Das Geisterhaus) | V | 0x1DFA594720F67E62BA405DE1A1D5F4AA ; MKBv52/FindVUK 1.00 -0x7873FA8D42628AC2C46BB6D5B03FF9BAD8AEE808 = GENERATION IRON | V | 0x24C8BC5312871AF86C0AE022041ADCA3 ; MKBv46/BEE/FindVUK 0.93 -0x733F282976B08728F4D6288863602DFCCD34B1A8 = Genghis Khan | V | 0x2D038439F32913137589D3813B2EE3DB -0xC45B1D785B4FA53D2CBCDD1B1CAF39EA9EA902F6 = Genio Indomavel | V | 0xB27673252F3BBA803C17A06BF960B59A -0xF2CA4F60C0181B631A4C2F59C446349E9B817102 = GENMA TAISEN | V | 0x10977B90AF24320819536831F0201E7C -0xAEA11D72AD2E7BD803C552E7A6D64B7C78F53AAF = Genmukan | V | 0x61ECA7C158B39291893ED7BCC5B6D464 -0xE9A5436B74DF3B7CBE44C3AE2E6F716FE24A4638 = GENOVEVA | V | 0xB3BEE00A16F25C4C9E1037AA07656611 -0x7ACC15B31D92ADACC2EA14F42384941808CEC3AA = GENTLEMAN_AGREEMENT (Gentleman s Agreeme | V | 0x1B133F8373621C7A75580DA7DE9E4EBA ; MKBv19/BD+/FindVUK 0.96 -0xFD3594C90FECAFA6655940071290C17EA043F544 = GENTLEMEN_PREFER_BLONDES (Gentlemen Pref | V | 0xEA787284EF4E5B936E7E625522BB322B ; MKBv28/BD+/FindVUK 0.90 -0x6A6596831D6E7465D0ABFC13179DEE38F48A3FEC = George Harrison: Living in the M (George | V | 0x74572DBEA404813EDBA98845F6EEAF15 ; MKBv30/FindVUK 0.96 -0x8897DB66DB53DD7FB48B4AF9E5EAE77A5689917B = George Michael Live In London | V | 0xFA78510A95F1F381C3D172C72A91F7F1 -0xCF73EA257E0BA07437358657D1FE0232210A0950 = GEORGE_MICHAEL | V | 0x36DCE0471547906808F23A9F41F07442 -0x517BB6B13025DDA756DEC745A46849CB42434A20 = GESETZ_DER_RACHE | V | 0x510E37E371804FB12BADAF77629B1AEF ; MKBv17/FindVUK 1.02 -0xF6E0A572B6394FF3AEFB25BE0DAADB3C7C57933C = GESPENSTERJAEGER (Gespensterjaeger???Blu | V | 0x59B394E16E4E81A3F0D533811FF6BA1F ; MKBv52/FindVUK 0.92 -0xBEB57110ED4FE2A6C3B0D13AE0D3790C0CC5BAB6 = GET HARD | V | 0x35FD84553B79636297F50CB259617FD9 ; MKBv50/FindVUK 0.72 -0xB84328684FE683B049EB187D9ADD4733CF3108EF = GET SMART | V | 0xDD9FAC206266EB86BB5111ABCA51E038 ; mkb v9 -0x13C6ABA97BA5615BD88421D334B2FF195537E103 = GET SMART | V | 0xA639FDC56D8950A41E11DC05F8A0E211 -0xBE6309A8233EC458D74FF928E4E5524D94649445 = Get Smart | V | 0xA7385352852EED65CC7BDB917193A64B ; Canadian version -0x452C138D1DF85181E6E4DFB96AD87E9E83710E01 = GET_OUT | V | 0xD6923F36967316E255C0F127762A2E40 ; Redbox rental version -0x6E4E42C845F4CBC90DDB6FE1C156845785605DEA = GET_HARD (Get Hard) | V | 0xB7E19D4F5CBA906698C0D974F6661A72 ; MKBv46/FindVUK 0.84.1 -0xB063AC56E3BB0CB47C91FA2420E194E40D86CEF2 = GET_MEAN (GET MEAN) | V | 0xFBEF1190E667051DADBAD29D322857B1 ; MKBv56/FindVUK 0.92 -0xFFBBAA793B06D736AC873BC0CD0D257BCA4238A1 = GFO1ESE1 | V | 0xA406DA9C9737412A94FD46393FEF4BC7 -0xEAFA48DEAD301BCA2783DE473D124B5EFA2E31E0 = GFO1EUE1 | V | 0x6CB4878861C7D00C4F0DA40B50A7F107 -0xF0EE009FA7309567AAC48437E811D89CA889CE4E = GFO3L2E1 | V | 0x72BB9D2CAC273CB4CF54CBEE36A29BA7 -0x7DCF364FB2193CBA60A67999847161C99E4D01E8 = GHOST | V | 0xCF870BA11F06708C6C19A448172CC58F -0x1AD9B960BA9B86F20DE96D9B39A7E7FF677EDCEC = GHOST | V | 0xA9C568C94E202A1E62DA6593BC821D8F -0x40D2752FF91B6845283D0F7906B9A8400031AE3D = Ghost | V | 0x3B767DA6C476204E69F69958BD58483D -0x558245A7AE4512D6FFD8F38433BE9D9DFFC5D505 = GHOST HOUND 1 | V | 0xE673A2A1E48959F8F0BB2AB7CEC98B45 ; MKBv18/FindVUK 0.96 -0x0276B93FAC3254A8D92FAF7BCB08831DD2B322E4 = GHOST HOUND DISC 2 | V | 0x373ED8353DEC7379C4BEEE1ACB445F0E ; MKBv18/FindVUK 0.96 -0xFB22D81EE03EDABA5FCA1A6251F293503218D9EF = GHOST HOUND DISC 3 | V | 0xE7099141B758870A5DF0FBD96CD9E7FC ; MKBv18/FindVUK 0.96 -0x6D9D92F985D80B81ABD4D528ABD543066D0EBF4A = GHOST IN THE SHELL 2 | V | 0x6FD84F3C1C869B67F028F7A26B6A51C9 ; MKBv15/FindVUK 0.81 -0xC0CD0DE93BA0727379385BED2BB34B7416AE9553 = GHOST IN THE SHELL 2 (GHOST IN THE SHELL | V | 0x45B982EEE37CBFF7800D19BEDC604A3F ; MKBv15/FindVUK 1.00 -0x3177609B072A01E4C11A19D51F6109DB17563902 = Ghost in the Shell 2.0 | V | 0xFBF36751905DD6BFC7F95CA61BA20DF5 -0x79CFC5477CA215B285D22E41B923C15BE13703E7 = Ghost in the Shell 2: Innocence (PL) | V | 0xCBBA8C325A992A74D6E1E24F7E956092 ; mkbv16 -0x89B5B41797B708132A153D5367F960281FBCDA9C = GHOST IN THE SHELL 2ND GIG 01 (GHOST IN | V | 0xEB1886E9EF55C242A61847B0368BF635 ; MKBv62/FindVUK 1.02 -0x5F645E13453564E64A26D88E8328025B264FB6B2 = GHOST IN THE SHELL 2ND GIG 02 (GHOST IN | V | 0x452766C7A1576CA2571E4E98DA4C00C5 ; MKBv62/FindVUK 1.02 -0xC0A972B3D4D57E9F778DC983E96FF9D6CDA75F16 = GHOST IN THE SHELL 2ND GIG 03 (GHOST IN | V | 0x6AB3B632B47AC5BC918A8BFE7CDAA0A7 ; MKBv62/FindVUK 1.02 -0xB072DCE88CD9921EE2553494C08C6804F906AD2F = GHOST IN THE SHELL 2ND GIG 04 (GHOST IN | V | 0x68BFC7BBDD4F218451017E2917A73EEC ; MKBv62/FindVUK 1.02 -0x85A6EE2D39F5F0315BC7526129EA6BC9BB4451CB = GHOST IN THE SHELL INNOCENCE (ESP) | V | 0xFBE4638DE132C40993FA0E118DA35D54 ; mkbv12 -0x9691EC46010F6DE58F1340FFA13A19F8547E8F7A = GHOST IN THE SHELL INNOCENCE (Ghost In T | V | 0x0FA650DD0600655A3BA5C97EAD633B69 ; MKBv14/FindVUK 1.00 -0x6B6924A53FA7CA525EFA5086C84C94722B7A7132 = GHOST IN THE SHELL SAC 01 (GHOST IN THE | V | 0xBB24923BF2AE4739B3DB536EB78D008C ; MKBv62/FindVUK 1.02 -0xABF54D8D927F5ACCAFF19A46BAB4C3DC21F639FF = GHOST IN THE SHELL SAC 02 (GHOST IN THE | V | 0x8486F0E35256F061C36FB1FF83710369 ; MKBv62/FindVUK 1.02 -0x3CE83E4767246123C8962852998725C2B739CFAC = GHOST IN THE SHELL SAC 03 (GHOST IN THE | V | 0x2BCECD45B05D8194917010CC4C200A72 ; MKBv62/FindVUK 1.02 -0xA494879AADDA7AB40F6F6D20DF14C6FB554CF1EB = GHOST IN THE SHELL SAC 04 (GHOST IN THE | V | 0xD3511F6925FACE584E6B7F68B1F124DF ; MKBv62/FindVUK 1.02 -0xBA90038E5ACEF041AC20AD9D6F1812B3A46ECA69 = GHOST RIDER | V | 0xE35BD674FFA4B0AAC184E1A80FD96835 -0x205C13017CF30BB0E26FC600240566378AEBA9D1 = Ghost Rider 2 | V | 0xCE70B80F40481227B31700E8786DEBBA ; mkbv28 -0x6453E4D2C8625780E2B2AE45D119089ED8746FFF = Ghost Writer | V | 0x61D0B9D94A63D3AD0FED81DD761CA2B5 ; mkbv17 -0x9592A4BAD91CFE7C8F89D490EE4D9485C0837796 = GHOSTBUSTERS | V | 0x9D6EBCE877939AACD8F139DFDDD95DAF -0x512EA2FDE82828B02544BA7E6545BA512E479606 = GHOSTBUSTERS | V | 0x1521BE2833F0701F2B4628C7AEDDC284 -0x9578E89A8F5DCB949927CCE5195C034A7321F1BB = GHOSTBUSTERS | V | 0xAB79582E9A0A7CA1C6CB01563A720874 ; MKBv47/FindVUK 0.68 -0xEFA287E04758B19CE2F09BCEFEF5821536BDD75C = GHOSTBUSTERS | V | 0x8D47A0D7DECBEF264227EDB2C14EEF5E ; MKBv38/FindVUK 0.81 -0xFCBC3C6ECD942B098476F666964B2AD66DAD6DC1 = GHOSTBUSTERS (Ghostbusters - Blu-ray???) | V | 0x5DD853AB18775029E6212FB0B04BA6B6 ; MKBv47/FindVUK 0.96 -0x8216B202E3993C8A0726757E1BC858E65E6395A9 = GHOSTBUSTERS (Ghostbusters - Blu-ray???) | V | 0x796C0A867E291C41CED7A2FC4755D349 ; MKBv47/FindVUK 0.94 -0x575AD54CABEF0B19986B622C84BF7C2158B1ED21 = GHOSTBUSTERS (Ghostbusters - Blu-rayâ„¢) | V | 0x2CDBB96B4511339D356F9BA5816847F5 ; MKBv47/FindVUK 1.00 -0xFA9935B09A0028AB61A9A0670CF30B22ECDACD26 = Ghostbusters II | V | 0x75BC0054FD76A5DFB8857C8721C6B579 ; MKBv47/FindVUK 0.81 -0x4CA5298D1A9F81D08B38AC9CCB0320CDCE3D2F88 = Ghostbusters II (Ghostbusters II - Blu-r | V | 0xD2FE72F7ABD51E2F195BDE671A0BAA17 ; MKBv47/FindVUK 1.00 -0xEAA99C0CFAC6C2667BB0E7280F58CCADB078AF91 = Ghostbusters II (Ghostbusters II - Blu-r | V | 0x27A63F86B6642FBEBDDA96E85E7E5721 ; MKBv47/FindVUK 0.94 -0x4E744537BFB8D9069F2DF208CEBA2795EF88CB58 = GHOSTBUSTERS_2016 | V | 0x1C07FDB8C469AF52953D0C9F8C8ED7A5 -0x3B9F75FD5B8AE3F083D07A4C52A37D8E756B236B = Ghostbusters_2016 (Ghostbusters (2016) - | V | 0x0352FD00DBC5F0C22D3EF88543EF5606 ; MKBv62/FindVUK 0.96 -0x48A329B82DE1E6FD9C309B51C1594F6ECF604024 = GHOSTBUSTERS_2016 (Ghostbusters (2016) – | V | 0xB2674B21F13E30100FAE4982722D0E99 ; MKBv62/FindVUK 1.02 -0xB705B78DF672A2ACEA81EC94E2F508C905998717 = GHOSTBUSTERS_2016 (Ghostbusters (2016) – | V | 0x294D5F1E7CAAAB8F654D4483C652ECEC ; MKBv61/FindVUK 1.00 -0x2DE21F9B22B235C88A7129D9E9D050209E778F3D = GHOSTBUSTERS_2016 (Ghostbusters (2016) – | V | 0x127F420B0FAD7AB6E9A28EDDCFFDB9FF ; MKBv62/FindVUK 0.98 -0x24E53C4A3CFDB67B97500DD30A1F16C8284C7F65 = GHOSTBUSTERS_2016 (Ghostbusters (2016) – Blu-ray™) | V | 0x2BAE2C22E21B8E6D5BA4D6761911E489 ; MKBv61/FindVUK 0.92 -0x5AD19F7DC9AC8F6315F305D1862BF4B978376F51 = GHOSTS_OF_GIRLFRIENDS | V | 0xE12B94401413140EA574ECD69C9B4886 -0x82E854AD382ED64BC12936F2F2D0DF1857B46FDC = GHOSTS_OF_GIRLFRIENDS_PAST | V | 0xA59BAC30906DA29CE9EEED53BF85A064 -0x578AE2A2248D6784C4CB00024BE96EE725D2F58A = GHOST_IN_THE_SHELL (Ghost in the Shell) | V | 0x270C08D26CAD1E1C9E74FA1721A70DD1 ; MKBv43/FindVUK 1.00 -0x3C2428734A276B5EAD485F11C5B11847520496F3 = GHOST_IN_THE_SHELL (Ghost in the Shell) | V | 0xA60255771B5C94D22777B2274B2781E8 ; MKBv43/FindVUK 1.00 -0xB015EF07EF22321B4CD8CB1ECE8BC490E023E09B = GHOST_IN_THE_SHELL (Ghost in the Shell) | V | 0x77A44B0269869EB76C85E462E2DCF19D ; MKBv47/FindVUK 0.96 -0x7709073AA567F0EF548C5E24C46908EF9B9C2BE3 = GHOST_IN_THE_SHELL (Ghost in the Shell) | V | 0xE8C98F4AB2A6E3983AC990665075394D ; MKBv43/FindVUK 0.98 -0xFC48AF5FDA9C7EB47EB9F1015D968F98C3A22F1D = GHOST_IN_THE_SHELL_1 | V | 0x96B5019AF9C6207FA4D6C80A03E353F3 ; Italian BluRay of Ghost in the Shell 1 -0x28A3AE70971036DB3295F871D7E4575573551DE9 = GHOST_IN_THE_SHELL_2 (GHOST IN THE SHELL | V | 0xC5CF90077C466D754AF8AF8AACC56ED8 ; MKBv35/FindVUK 1.00 -0x2C1CF64A47486B674550B93552653593D8A2215E = GHOST_IN_THE_SHELL_20 (GHOST_IN_THE_SHEL | V | 0x72116CA51225A9BAFEBD4D23A2AA26F1 ; MKBv62/FindVUK 1.00 -0x6C6C68CEC809B68D8C0112B6BD425EA6381A41BA = Ghost_in_the_Shell_2_Innocence (Ghost in | V | 0xC4368B4413581720D82EC9798D3A8B46 ; MKBv62/FindVUK 1.00 -0xFFD5ACC68E3F68877167D9E97EC447CF3F73FCFC = GHOST_IN_THE_SHELL_95 (GHOST_IN_THE_SHEL | V | 0x73DEA5F8C83569975DB69216376ECB7A ; MKBv62/FindVUK 1.00 -0x22C14DDCE3F586F6ED8A3CEE42F0B41DF5F210D8 = GHOST_IN_THE_SHELL_ARISE_D1 (Ghost_in_th | V | 0x1EE316A054096075595A797E3E1C8B7C ; MKBv47/FindVUK 1.00 -0x05168FD6F76905B452214C0B8670A25B132C47AA = GHOST_IN_THE_SHELL_ARISE_D1 (Ghost_in_th | V | 0x4F6BF71D025ED4BE34FDB70CEBA7CADD ; MKBv47/FindVUK 0.96 -0x0E5A6EC4687D06150D75078727B5EAFCBE50D5C1 = GHOST_IN_THE_SHELL_ARISE_D2 (Ghost_in_th | V | 0xDFC3654BF455FE9CF1FD488843F60553 ; MKBv47/FindVUK 0.96 -0xA032F685C176E00648454F6977E4DF798C4EB6AA = GHOST_IN_THE_SHELL_ARISE_D2 (Ghost_in_th | V | 0xC409DA34EEF67BD980DD6B6CD2557BE3 ; MKBv47/FindVUK 1.00 -0xF47487CD225FDC76C2948245734583134A0995A9 = GHOST_IN_THE_SHELL_ARISE_D3 (Ghost_in_th | V | 0xC02C4A2A445645AE62EC65BB120235E9 ; MKBv53/FindVUK 1.00 -0x23798C43C54F6BF5676FC1DBF27585DCDAD5DDB1 = GHOST_IN_THE_SHELL_ARISE_D3 (Ghost_in_th | V | 0x4FCDCEE80886801E32CC48C0642AE147 ; MKBv57/FindVUK 1.02 -0x1BEDF032F49D06BE35565ED92994AC2498E761B2 = GHOST_IN_THE_SHELL_ARISE_D4 (Ghost_in_th | V | 0x5F3D96FDE202ED012A21B37F20DA9760 ; MKBv57/FindVUK 1.02 -0x8CA764EAD5093398DDED66259C0CF80E5F40C4FD = GHOST_IN_THE_SHELL_ARISE_D4 (Ghost_in_th | V | 0x45D63BE1A12A04025514502A5DD2B5A9 ; MKBv53/FindVUK 1.00 -0x33BADE6196716BDB772347585F8FB04106FEB1F1 = GHOST_IN_THE_SHELL_ARISE_DISC1 (Ghost in | V | 0x57D40B2319192D7AF610506A8A28B6BC ; MKBv47/FindVUK 1.02 -0xC98A3D6AB1BF27B59E2CB56D9F2A29B4499AE4E9 = GHOST_IN_THE_SHELL_ARISE_DISC2 (Ghost in | V | 0x570700513204274AEEC4057EE3B63CA3 ; MKBv47/FindVUK 1.02 -0xB434EE98B2767412D10E357FE5BEE0C04C793460 = Ghost_in_the_Shell_New_Movie (Ghost in t | V | 0x404E75542B98BC5B53C67D3D60698B23 ; MKBv61/FindVUK 1.02 -0x3C2EB560BAB8F1D50F54AC8AD1C3628E1B077DD3 = Ghost_in_the_Shell_New_Movie (Ghost in t | V | 0x3750B20575AFE66A8179D0AF35F3CFD7 ; MKBv57/FindVUK 1.00 -0x4BD07727388F93DCEF04FE0ECE4E4B55312B0616 = GHOST_ITS_2_BD (Ghost in the Shell 2) | V | 0xCB226765CAAD704A9394A208051F0717 ; MKBv16/FindVUK 1.02 -0xF4F434D07A02D1F1CA90D47153E225E5A3D8ACA3 = GHOST_RIDER | V | 0x932D1631099292EDC78DE1697872F779 ; MKBv3/FindVUK 1.02 -0xAE7C7653243984B1427475E5E2F6D3ABC95FDA90 = GHOST_RIDER | V | 0xD2B1977859D6610D3057A0EBE2D60A34 -0xA7D8CA540CBF8D094A92D069ECE06C824546B303 = GHOST_RIDER | V | 0xBF2E3DCD0FA82B8ECE1F794D50B1288D -0xB10B7332107F24C8F0703FB8B716458A7AC14903 = GHOST_RIDER_2 (Ghost Rider) | V | 0x494DDA1149C911FCBCDAB4AA3893ECF3 ; MKBv31/FindVUK 0.96 -0xF8CB61BEFB146BBCC5935AA9751973F7E4CBBC2B = GHOST_SHIP_2002 | V | 0x80FBE7C5E57C828F77E39EAC3CBC9FCC -0x8C13C9A3698C1D481D10423798831EFB96021FA8 = GHOST_SHIP_2002 | V | 0xAF156F986534D95E4976BCE8A0F18D74 -0xBE53828D316A11DE965F6B072BD6B9928CBD4179 = GHOST_SHIP_2002 | V | 0xD9ABACBAE323F6B88EFA094BFE4009D1 -0xA54249CD764A251FA237D32404A02F93EC1A5CB9 = GHOST_TOWN | V | 0x38E18088D2E5B4BFE9419841D270D3C9 -0x980A19ED854B0C9B4FCC75FEE36D2AE2C2FF520C = GHOST_WRITER | V | 0xCA53E80A98E0D86843055F5DF4FFF15B -0x56D53011F725F5C4F8D6DB68C8BB81241F02FCF6 = GI Joe Blu | V | 0x789F039811967F754E35D4569CD737AC -0x7A71B7A57536AC8FB9BC26667912E27604434241 = GIANNI_AND_MISERLY | V | 0xB435ADB6F3E0ED42A8CD76128244A3F7 -0xBC6D10780DD21C71FCFFADD0E01A080A5B82F4BC = GIANTS_BD (Dinosaurier - Giganten Patago | V | 0x18746A53C2894D3019C9F21BA74D59DD ; MKBv19/FindVUK 0.96 -0x7DA0C1A3EE567E34F5476DFC6A6115D02D63B525 = GIANT_PANDA | V | 0x6F3613B0CEEFC79D3B4DD1666A0535B1 -0xDA05C5BF3E959843E91A61527AACB934C6A6C29A = GIGI_BD_03_DIM_1 | V | 0xDA4D8E09123D9F12C6AB244503083916 -0xA353C2E1876C3D5443CF14456166BF7A67E8AAEF = GIGI_BD_03_DIM_1 | V | 0x5A514B6B6DCC6B4D5F493532EB9611A7 ; MKBv8/FindVUK 0.80 -0xA1A466A6048ED55DC3478E99B485081D77E41B4C = GIJOE_AC | V | 0x2A13AD796034EE1F83E8A1FFEA208835 -0xD8858F9D140C3E8277D6220E04D038F8F89216A5 = GIJOE_AC | V | 0xAD6E3BE0B65ABF001664A6916E4E2ED6 -0x4760099E3BA9B0D71F3148741A68897C424B6B23 = GIJOE_AP | V | 0x32D2EEC47B0E7D67ECB578C3197C903C -0xC2EE44E53EC48B4E85F3CFAE39E9DB863CD3FAB9 = GIJOE_AP | V | 0xF531FBFB98646E9BF97539394E225D49 -0xE8B67ABD69EAB709804C2C5094558D1F06A40A63 = GIJOE_EL | V | 0x20BD511014B7BC2FA0CB6364FA008146 -0x5D125AA18B3F9EA7DA592F97C954B7D53347B43C = GILMOUR_REMEMBER_D1 | V | 0x337E7B9476954365A846344639426C76 -0xA9E18943C8D777F7483CC0B35D4883FE93E0577C = GILMOUR_REMEMBER_D1 | V | 0xB4EE5A6664EAC4B9CE34A210ABD40717 -0x4C1FED5FE844F1E22FA66A84F484F7B075528556 = GILMOUR_REMEMBER_D2 | V | 0x3467F20A7D9E6CD543327165B9A1CFF4 -0xFC49588E458FD3D57C7FB0FFE4E09E3E9CB26282 = GILMOUR_REMEMBER_D2 | V | 0x7CA033FCFB1DBDCDD97E1A9B1E9017C7 -0x5269F107A49A783FDADD432CDD4DF971F041EF00 = GIMME_SHELTER | V | 0x611B98FBCD0A783B3CA73662C0E3A644 -0x8CCC91DEE9EE83CE8C6631836692B8EF14F468DA = Gingitsune BD1 | V | 0x00411DAEBE37B6F2298FA8FB7358492F ; MKBv50/FindVUK 0.99 -0x5BAEC1446BF2753553B72E7C6AE08F720B2EAEE0 = GINIRO_NO_KAMI_NO_AGITO | V | 0x0489E1A1A5A2E307B56BE4FBB6BE8D61 -0x907208CA1E68C61A55238BA6EC3952015C49B152 = Girls s1 d1 | V | 0xA2BE14129DF4D197BE40DA53A5403B64 ; mkbv27 -0xF17140D295CB8D96F5AF59368ACCEAE776D3DFE7 = GIRLS UND PANZER DISC 1 | V | 0x70CE24407AB951131561FAD03AFD025D ; MKBv44/FindVUK 0.81 -0xEAEA66EA5297A08C2162353C1F249F5DAD6EC3DC = GIRLS UND PANZER DISC 2 | V | 0x749EB1109DBC70B7F0259A0DFB1C9268 ; MKBv44/FindVUK 0.81 -0xA3ED6FA679B9ED1D20039BF85931EF677C50D723 = GIRLS UND PANZER OVA | V | 0x7D0863A4495003E4633EEC815148DFF0 ; MKBv46/FindVUK 0.81 -0xD7D18E6B9B03622933EB2AB75EBB5AC83B067495 = GIRLS_S4_DISC1 (Girls Season 4 Disc 1) | V | 0x0391C7E4B0C61066DBBC183E814ACE9A ; MKBv57/FindVUK 1.00 -0xCC2D4CA6D4DD7CE75F8D2C921B0C9E3F8D134683 = GIRLS_S4_DISC2 (Girls Season 4 Disc 2) | V | 0x5BC4C8308BD58BF57E12B23BB713DD4D ; MKBv57/FindVUK 1.00 -0x6C5978BCC93071B6A88391932979472C295801C9 = GIRLS_UND_PANZER_DER_FILM (????????????? | V | 0x2D52FF416CF32D35A839D4FC54842BEB ; MKBv58/FindVUK 0.96 -0x56B4D38A97AB4AC0231C5E61638CB0760F7487AA = GIRLS_UND_PANZER_DER_FILM (ガールズï | V | 0xF4B2AE59D8FE30D9F1C2F48AFB87C402 ; MKBv58/FindVUK 0.99 -0xEE00B264A921CB52985742911BADFA7B2F0A0D20 = GIRLS_UND_PANZER_DER_FILM_SP1 (ガール | V | 0x760788DAEBAEB17592246999F29DA846 ; MKBv58/FindVUK 0.99 -0xB0C97C9BD5F0ED0F46E82A44005CF9C65CA27FA2 = GIRLS_UND_PANZER_DER_FILM_SP2 (ガール | V | 0x213ECC48BF0986BA9EB0D6A87A6778A5 ; MKBv58/FindVUK 0.99 -0xA1755C1CAF46DC0F0AFA025EBF26EFD2971517A6 = GIRL_NEXT_DOOR | V | 0x824775BEE71C71896E67C313657EB850 -0x3299162C2A54E6238E6061F3DBE49DC1662FC3C5 = Girl_Who_Leapt_Through_Time (Girl Who Le | V | 0x1A7BEE2B84661E4478228F958E2B3D51 ; MKBv61/FindVUK 1.02 -0x4D42CAF70EA481F83BCB81DF6DE4B344FAFC87E0 = Giselle | V | 0x8EE8D0DCF86191168626CBECDA588D93 -0x049B677C5A7E226926F4DB30334946638D7B9D4F = GISELLE | V | 0xD35A4BFA8BB99C1D3255CB54C74CF1A5 -0xBC5D0D0C8AA35061A8CF8490B428561FFF034BB4 = GISELLE | V | 0x028687174B7F63026DC14CA2A3F0F418 -0x22BD29CBB7CCB4C62B21B3B216EEB42380B83689 = GITS | V | 0x8473D9A635CFFC37EA0C0C1D43930D96 -0xB2215069EFE6BB723060213D361F0F42B18BAF03 = GITS SAC BD1 | V | 0xD2BBF0EBD7CF5A3BE725116DD0EBC6FF ; MKBv53/FindVUK 0.96 -0xE6BD9B04EBFE7D4A82E69C58BB237B5AC3A351CA = GITS SAC BD2 | V | 0x7A1321BD6694330F5C91010A0D94E75E ; MKBv53/FindVUK 0.96 -0x6FC95B9D01F853B91E0CC84909A4DBF73B70E8A6 = GITS SAC BD3 | V | 0x90B4D8517131D45049E4FEFAE5C73DFC ; MKBv53/FindVUK 0.96 -0x68BA1CA40A6AD0ED9BDFBAFA2438C3FB10860D6B = GITS SAC BD4 | V | 0xE93C0527D4915DE5954583E1ADED0D01 ; MKBv53/FindVUK 0.96 -0x7239AD221346ED4DE4B996E1FE6DC74BAB002847 = GITS_2_INNOCENCE | V | 0x021BA1743050FB15E8E64D202EAFAB32 -0xDE307392A24F2642F1FE0B1DA1A730558750CE58 = GITS_MOVIE | V | 0xDE4F374637E0EC1E6ABDC2FF0A8D9947 ; MKBv46/FindVUK 0.98 -0xD02734F3104EE43C5D18E1070C9735380B720619 = GIULIO CESARE DISK 1 | V | 0xA8363FB091A3DD1CAE732F86A95F46D1 -0x72BBAC3D768F43263BD9E003373C13E4619AEA02 = GIULIO CESARE DISK 2 | V | 0xF46570975C8ADC9B1E8669D95A4108A8 -0xEA863740326B2AD6BE84A38F6FFAEB48E49FAF55 = GIUSTIZIA PRIVATA | V | 0x25DD3F632F290D04AE8F7F5E2A5513CC ; MKBv19/FindVUK 0.84 -0xC5E78A8FF9397554F38DA1161579C3C4247C5621 = GIVER | V | 0xED83EF7C4641859FA65863A85F708F2D ; MKBv50/FindVUK 0.80 -0x691F5A3A31A378EC99D52A3812324D99F7D63F06 = GI_JOE_EU | V | 0x45645BFAA30B74F89636BA787546559A ; MKBv15/FindVUK 0.81 -0x1C94E1E77C042EE91C19DCE1D5BEC454235D2C8D = GI_JOE_EU | V | 0x56715E72482270DF68024964A0FCC8B1 ; mkb v15 -0x88C682E53B698D2CDE4C64129EE478F43359CEA7 = GI_Joe_Retaliation | V | 0xDE2810C36B47E253B7227133FE969BC5 ; MKBrev 35 - FindVUK 0.62 -0x29DE3937F6CE77A5363134751C9EA513AA124FBC = GI_Joe_Retaliation | V | 0x0818B9CFC28063E0FE4C39DA29895113 ; MKBv35/FindVUK 0.81 -0x4FB9A745C10879CEB4347B7907F3440294AAF81B = GI_Joe_Retaliation | V | 0x6AC7D538CC300A1BC33E3A24229CAA00 ; MKBv31/FindVUK 0.81 -0xC967EDE97BF38695899B798DB59C69FB991F513F = GK_D1 (Generation Kill - Disc 1) | V | 0x01B04EBFF1506CD1BA48B93D42BCE9C5 ; MKBv12/FindVUK 1.00 -0x48BFCB7075A9C5EB3FFD2AF36BE79FBA7AE4FD72 = GK_D2 (Generation Kill - Disc 2) | V | 0x00A278850FD9A1A3654C82AC59AE0D18 ; MKBv12/FindVUK 1.00 -0xEDD4DCA5F7046161586C075FD0F114C416B3603C = GK_D3 (Generation Kill - Disc 3) | V | 0x7BA4003B6C92DB4600954266D5505170 ; MKBv12/FindVUK 1.00 -0x351DADB92EACCA06F29B1BB297CD8395862650A2 = Gladiator | V | 0xA90102DD3E6C90C0067505446F04C2A2 -0xEA909AAE3C51E4EAB42650CA5581187DD68E6DC2 = Gladiator Disc 1 | V | 0xBCCE8FDA29C427006972888063530445 -0xAE718C495B17681DBCAD6CD252101E739ACF55DC = Gladiator W | V | 0xA7E708C4CE9FA6A33AE0071C94B4DCCE -0x86CF11E120E8A4B012F56B8D634A7C21D8F38F31 = Gladiator Y | V | 0x37DBD018302E4EDCF21AE45D198C80E7 -0x0F5B5BC895F1AF251F04C15BC4FDABF7E6E4A0D1 = GLADIATOR_D1 | V | 0xD0157B02D8915846EADF6C0FF9CF023D -0x1C7C7303FBA506A89365F9AE3DA9BAAF9523EA77 = GLADIATOR_D1 | V | 0x0A34C9BF658885233377369F9F4340FB ; MKBrev 12 - FindVUK 0.54 -0x9A15C4581FAA566240F1B3BF9019D108A11242C5 = GLADIATOR_D2 | V | 0xE7A6D1EE260003D68B521A34951B4F36 ; MKBrev 12 - FindVUK 0.54 -0xC76F4B1D4D9604A7ADC21852417C0DC8D101F3CB = GLADIATOR_G51 | V | 0x5ECC0ADE567FF017510EA5EE5D07E57A ; MKBrev 16 - FindVUK 0.57 -0x12AF307F054BAE32EF90B46EBC52A2C6BC7C0D02 = GLADIATOR_G51 | V | 0xACC821682D414905B3B445D7CDF96928 -0x705A09A474CDD7C1EDE2C83281F773DC71370017 = GLADIATOR_G51 (Gladiator Disc I) | V | 0xF920FE6EDEAB2A67BCD30649D6DF9A19 ; MKBv16/FindVUK 0.96 -0x1534D66D4A67669CBAB4E798F60D7A83F6349166 = GLADIATOR_G51 (Gladiator Disc I) | V | 0x943825B9744C4E3D204F230F87752520 ; MKBv16/FindVUK 1.00 -0xB83F988096B4AFEB3FBF9374AF126D06D88B34F7 = GLADIATOR_G51 (Gladiator Disc I) | V | 0x43782FA5FF64909E3F8A972F0AB38A57 ; MKBv16/FindVUK 0.83 -0x6CC36A5263781607FFF61999E46267898C91F7D4 = GLADIATOR_G51B | V | 0xD1E0F40E9F795932EDEE7DBBB52A8E9B ; MKBv14/FindVUK 0.72 -0xA01822AC7575212C4E1F019C8D21A6650E9D2355 = GLADIATOR_G51B (Gladiator Disc II) | V | 0xA7052055C0CA6EBCAEDE65BF9DB2E04F ; MKBv14/FindVUK 0.84 -0xE6C9A5D987C70A0F3EA31656DDE40BACD0588D5B = GLADIATOR_G51B (Gladiator Disc II) | V | 0x28DB2183E44E3EAEA3810C6768FBA38E ; MKBv14/FindVUK 0.96 -0x55F686458D784B0AFE30E4DFC5F7BC798F3CEF0A = GLADIATOR_G51B (Gladiator Disc II) | V | 0xE301072E1984CC0C28871CDBC2B9FBA1 ; MKBv14/FindVUK 0.86.1 -0xF67872135B877C298DFD21A01B1426D35EA70E2F = GLADIATOR_G51B (Gladiator Disc II) | V | 0x654482207A24C1CFD4B47C6EB608487D ; MKBv14/FindVUK 1.00 -0x099AFA1B7A22AE7589F7B3B1EC0FC0EBA128109D = GLADIATOR_G52 (Gladiator Disc I) | V | 0x57CA8A2925F89E4F2ED2E18A9D418196 ; MKBv16/FindVUK 1.00 -0x7DA86F192D8489C5483534CDCAF08B9CC9697E6C = GLORY | V | 0xD10050C4D94DC1A02F8628D58590427D -0xBCEEA744A27C1CBAEFD3B5BE446F23C5EF5E7670 = Glory Road | V | 0x06A8203A20F3CAD21E77F6A7356EA24E -0x6B23942EEFE4F815F7833EFB3A94B683F5420260 = GNOMEO_AND_JULIET (Gnomeo and Juliet) | V | 0x84D47D3F41B13C9496AECD8C1EA3B35C ; MKBv21/FindVUK 1.00 -0xC7647F610C2A0271DE3D2B38BFA3ABB1A125D948 = GNOMEO_JULIET_2D (   ) | V | 0x836DC8D699750C02093A4B33C9A83F3E ; MKBv21/FindVUK 0.98 -0x06B455AEE2E2E3CF281A30ACBEDAD802776C8E37 = GNXF_101201 | V | 0x778B9CD41C1BC685E563937D5F7AF39C ; MKBv4/FindVUK 0.98 -0x3A2756FFFE169FF56274F2D84C2A2A444C859265 = GNXF_101202 | V | 0xF534793387D1DE4D759DD36EF5C483BE ; MKBv4/FindVUK 0.98 -0xA388D22DA4D63C835A7A3EB03A16DA2215AF597E = GODFATHER_BONUS_DISC (The Godfather Bonu | V | 0x740B0849977DC6B9AF85969A4A218E38 ; MKBv7/FindVUK 0.96 -0x61D62E948E23E949C296B33CDB6529FCBBB32448 = GODFATHER_BONUS_EN (The Godfather Bonus | V | 0xE74763C55A6BFBFF0D1DA3A641FD55BF ; MKBv8/FindVUK 0.84 -0x3016586F45A3B25A6B522E386839548683043117 = GODFATHER_BONUS_EN (The Godfather Bonus | V | 0xB4C1BEA6C6A1F40A74D0799E730D7B58 ; MKBv8/FindVUK 1.00 -0x006CA821EA93EA1E4302F1D9D7B2210F34B53396 = GODFATHER_PART1 | V | 0x3B83B9E83CFA95BAF61A67E630AD1323 -0xF13F0028CEB37D5D5856A8E472A5B16AE4273B16 = GODFATHER_PART1 | V | 0xD5FEE7B6395B1816D821BA275C1FDAFE -0xE6049688952EDBF42BE660953C6B413AEB6CE7AB = GODFATHER_PART1_EN (The Godfather) | V | 0x24C1978D28A061502654E24706EBED26 ; MKBv7/FindVUK 1.00 -0x6C1DFF82E06F6A49218F93FD31562D6BDF394BC1 = GODFATHER_PART1_EN (The Godfather) | V | 0x6AF19F846979B49686586707E5D46D9F ; MKBv7/FindVUK 1.00 -0x28EE4FBFC2982CD182F3D45BC0546041C0954260 = GODFATHER_PART1_EN (The Godfather) | V | 0x73A68AC0A61C2DB69F4F6D8189107DE9 ; MKBv7/FindVUK 0.99 -0xF15644137AE231E21EB9323E38B2784F073614E2 = GODFATHER_PART1_EN (The Godfather) | V | 0x560B323C07F329998DB59DCF305459CC ; MKBv7/FindVUK 1.00 -0xFBAE119AAD6ED56DF12AAD669BC5AC86F3CCE50C = GODFATHER_PART1_EN (The Godfather) | V | 0xD2B52090ABD7C5BABE2752D61727C755 ; MKBv7/FindVUK 0.96 -0x8CEBAC0CE1C8CC472BF459D61698ED70BC645E46 = GODFATHER_PART1_ES | V | 0xEC14BB1DAA767FB56040F46D927DD110 -0x367C2D83BE5B1D3C6FFE78395608A9FFB73FB44F = GODFATHER_PART2 | V | 0x413350A8803F7B6913EF81A531768AB1 -0xCC8ADDD12B0953693616438F6C42AC57FF0D6D8E = GODFATHER_PART2_EUN (The Godfather Part | V | 0x2C578A140C5DB2A4E8055717A38C817D ; MKBv7/FindVUK 0.84 -0x3ABD1568DBCEEF934EA3ED8FA54A69A5F869299B = GODFATHER_PART2_EUN (The Godfather Part | V | 0x494304F7FC2804D742D76341961E33BB ; MKBv7/FindVUK 1.00 -0xF87081DBFAEFE2F271937CCCDCFA21ECA8717217 = GODFATHER_PART2_EUN (The Godfather Part | V | 0x8B5D1ABA1AF01743DAC8BBC476BF6FC1 ; MKBv7/FindVUK 0.96 -0xE1E03DF436F808AA98BBF530DECE56AD7C5B9083 = GODFATHER_PART2_EUN (The Godfather Part II) | V | 0x4A4A72F2FF94C4149A1CDD1ED06C5252 ; MKBv7/FindVUK 1.00 -0x99485661BE5D4EF9839F30AACBB8D658495B824B = GODFATHER_PART3 | V | 0xD6647286095D6BC7BC8CFF55ACC56BE5 -0x80BF45F9D55F72C2C201EA391F01DC766533CB81 = GODFATHER_PART3_EN | V | 0x5828C48A288F18F77B2AD4BB6591CF10 -0xFB79149FD6A103CBE89F4FD141815FA9DC418F07 = GODFATHER_PART3_EN (The Godfather Part I | V | 0xB3AC32E8D74ADB1AC45151A8087B34E0 ; MKBv8/FindVUK 1.00 -0xF3C7D7AA105D76EDD728329AAA232C1615B2166F = GODFATHER_PART3_EN (The Godfather Part I | V | 0x19BF1BDC59E553D6E3A90493A3981EAA ; MKBv8/FindVUK 0.84 -0x15CBEF2F8771085338AFA1D7C934D8B815B49051 = GODFATHER_PART3_J1 | V | 0xBC2D181EACFC05184AE7AE14BC77181F -0xC5C08AF50895E7AF3FC19C6C1386B46DE125056E = GODS NOT DEAD | V | 0x0FD3EC0BFE4D009B489EF337B9931F8E ; MKBv47/FindVUK 0.96 -0xE96303F2D36C0E96BAD9DCC853190FDB92FD306F = GODS_AND_GENERALS | V | 0xE127E9B60F4B0403E21150A4C2BCE2E6 -0x70B3CDFFC063D5F3FB1078849EB04299A2E01703 = GODS_NOT_DEAD_2 (God's Not Dead 2) | V | 0x82F03E95C4D173808F8E17C14F7432D7 ; MKBv61/BEE/VUKNOTVAL!/FindVUK 0.96 -0xA2CBBF143D6F6DE25C59442B4550BD4BE6C683F6 = GODZILLA | V | 0x18CBF23AD6D2353007D5CBA308A7491A ; MKBv47/FindVUK 0.81 -0x4BBC12E56804F7A360F1963D0E1103C6CCEC58ED = GODZILLA | V | 0xBCDA7C4EF5B6EC0B4EF00DEAE3AF6948 ; MKBrev 47 - FindVUK 0.57 -0x0114D80A664F3016E881DA4DA260EB2C6F597CA2 = GODZILLA (Godzilla (1998) - Blu-ray???) | V | 0x14D877011EB3479ED51F09C365C4ABDB ; MKBv14/FindVUK 0.96 -0x7962C06C90C3909E95598D378758C397B9D68633 = GODZILLA (Godzilla) | V | 0x875101E8D3A800CDABC549C8E3266AAE ; MKBv47/FindVUK 0.96 -0x0DF62175D76D84C7D27BC080494A62161C352126 = GODZILLA (GODZILLA) | V | 0x3E5C4103FB840FF0EAFEC3C9214714ED ; MKBv27/FindVUK 0.96 -0x0B0B069F24A142E653033EF614B578D8F3F368FC = GODZILLA (Godzilla) | V | 0xFF66FDD32365C6F089E36D69D614D917 ; MKBv47/FindVUK 1.00 -0xE69D27841EEF6949B1A783914338180630E4FCD2 = GODZILLA (Godzilla) | V | 0xE3A5F024CBB0B7F7706A32DFBC42CBF3 ; MKBv47/FindVUK 1.00 -0x38CABDBC506F09114A1BA3C87D79FF4D002B55E3 = GODZILLA (Godzilla) | V | 0x87337AE71BFB8A4100D6BAAF8DBB4D44 ; MKBv47/FindVUK 1.00 -0x317F1FD5459AC04233DC21EB50C775DFC5FE5A80 = GODZILLA (Godzilla) | V | 0x8E0BF4446758F07371E7D3EB9B0D5A80 ; MKBv47/FindVUK 0.94 -0x851BE2F3F958021C8CEE6C6642BE6BBD30BA596B = GODZILLA (Godzilla) | V | 0x3EE3584A4179F2BE6C2B784C5F57D883 ; MKBv47/FindVUK 0.96 -0x38B2D47586E17146BC37930B03EC66E0C1778E5C = GODZILLA (Godzilla) | V | 0x25F55B7DFE17960B13883157E4CB735D ; MKBv47/FindVUK 1.00 -0xE960BFAA765774726EB98FBB8C6705719FFB95CF = Godzilla - Final Wars (Godzilla: Final W | V | 0x2A03761E5D1A6CA6A6DC4A45910E6CE7 ; MKBv46/FindVUK 1.00 -0x632EA33096B6D0593C52360FB2CF44411D6D4F57 = Godzilla 2000 (Godzilla 2000 – Blu-ray | V | 0x92747C78F630C9EA01DAD35BB5E79527 ; MKBv47/FindVUK 1.00 -0xAEACB8C1E5BFF047D198AC51144FD3BD6FCE5443 = Godzilla Against Mechagodzilla (Godzilla | V | 0x1D7E1F725AE5CB0F7A19489E33829D37 ; MKBv47/FindVUK 1.00 -0x42879B01C9DCB4F488644066B207EB03E6A1F60C = GODZILLA BD | V | 0x096A404D64E27BC5E1CF90014E901B0D ; MKBv47/FindVUK 1.00 -0x52FF0CF7F9D183F6EA2331F79A4D6B86A3A7E6E6 = Godzilla Tokyo SOS (Godzilla: Tokyo S.O. | V | 0xAFD03C47DB4122A0D2DFCC61BB404C27 ; MKBv46/FindVUK 1.00 -0xDA307EEBC162066C40237CE05B045B1A109136F7 = GODZILLA VS BIOLLANTE (GODZILLA VS BIOLL | V | 0x703ECCBEC23BFA62E692554100AF8E7F ; MKBv35/FindVUK 1.00 -0x719370305018338929A1E21450BBA83F90E6303A = GODZILLA VS GIGAN | V | 0x73A4E1A5DD36696542C6923B66AEF02C ; MKBv46/FindVUK 1.00 -0x837F4D610C7F868100AF9F47125B497D417F8D0E = GODZILLA VS HEDORAH | V | 0x1AFEB42785DFFEAEDCE0D3A2FF85C1D5 ; MKBv46/FindVUK 1.00 -0x190B436FFD8F54BC9AFCC10A46100C97B476D725 = Godzilla Vs. King Ghidorah (Godzilla Vs. | V | 0xCE6365C08BC43DC8E48FD6F8DF3D0F39 ; MKBv46/FindVUK 1.00 -0xC46B03EC724447E8846E43DAB780CD31862E8B3B = Godzilla Vs. Megaguirus (Godzilla Vs. Me | V | 0x349F27A93ED963981F6438B2E8B4AE4D ; MKBv46/FindVUK 1.00 -0x668582788CC7579828158926ADBA67EFF9A959DE = Godzilla Vs. Mothra (Godzilla Vs. Mothra | V | 0x0170C00E7BD581286C5D0882A754E3E5 ; MKBv46/FindVUK 1.00 -0xACE85923CF816FD222D43C084C0C8C848F9CC250 = Godzilla Vs. SpaceGodzilla (Godzilla Vs. | V | 0xCCBF159502677ADBF00D3D17D772EA11 ; MKBv46/FindVUK 1.00 -0x2D59F988A2F0E3682A56CFEAFF2F9E4AB6A3F43C = GODZILLA_1998 (Godzilla (1998) - Blu-ray | V | 0x992FC0A22DC31697CB44CFA043262923 ; MKBv38/FindVUK 1.00 -0x51F8790352D4642D9771A1F8B8BA615F7F6159CF = Godzilla_Mothra_King Ghidorah (Godzilla, | V | 0xF66456CFA15CBA7B20768A3CD0DF2508 ; MKBv47/FindVUK 1.00 -0x1CE4A0E03E09FAB912CE574281F55E989AE0CBE7 = Godzilla_Vs_Destoroyah (Godzilla Vs. Des | V | 0x9526F1E18663D7C1E3460D11D3C691AE ; MKBv46/FindVUK 1.00 -0x04BAC12EA094A1C7F33F7B7966BFDB7FF88EEAE9 = GODZILLA_VS_MECHAGODZILLA_II (Godzilla V | V | 0xAACAF1E549EB5AD32F26FECB8BA1D9F9 ; MKBv46/FindVUK 1.00 -0x0310BCC62C3631F096B2BE9F8CE8DF997BD88463 = GODZILLA_VS_MEGALON (Godzilla Vs. Megalo | V | 0x6B11C4AF6C7297635B63D3EBAAEEAFF3 ; MKBv47/FindVUK 1.00 -0xAF386019CA46A7F4B989B5A950B960A84EDA6979 = GOD_BLESS_AMERICA (GOD_BLESS_AMERICA) | V | 0x4387E82A86F39EF22E7424A4F70A0966 ; MKBv35/FindVUK 1.00 -0x5FFD746AB1ABA54F28C6A8E6CC5BC7ACD9CB4FCC = GOETTERDAEMMERUNG | V | 0x47A86D64F5C197672EF4F6AFA6FD58C6 -0x99A909ACD8245884B4F1503AD14110C1F9C349E6 = GOGO_DEMPA_TOUR_2016 (GOGO DEMPA TOUR 20 | V | 0x86EC33D6708FC43C2E1FA534B19DF60A ; MKBv60/FindVUK 0.96 -0xAA52BCF1D0512C4B7E7DCBE05E9812BC4A42D0A5 = GOING POSTAL | V | 0xF6C4C6CAD7648C80E074F104B78BF949 ; MKBv19/FindVUK 0.80 -0x582EAF60C8125411010DD700CFC31A5837EC6C04 = Going Postal | V | 0x12D34054EFB3F3DCEDB4622C8FD26D09 -0x63EA6DE6BFD4CDD14BEFB1149EEF277DF68B6052 = GOL | V | 0x4A0E0D00BDBE28EDCC2497467D72A39B -0x8E840485602C91CFF88211EC40D8A3ACBF981AF1 = Goldene Zeiten (Goldene Zeiten) | V | 0x8C053A0A6EB34D593B2B34B8D77C1186 ; MKBv48/FindVUK 1.00 -0x7E281EE1629454EED304F4EFE778ADC02668DA1C = GOLDENEYE (GOLDENEYE) | V | 0xF2BE8C8E85EA5206334639C3EABB7346 ; MKBv28/BD+/FindVUK 1.00 -0x2287556353063C189F5967FFE3634DF9F31C8ED3 = GOLDENEYE (GOLDENEYE) | V | 0x2B9237086799655DCE30642CB3A9CCC0 ; MKBv28/BD+/FindVUK 1.00 -0xB064B913102DA45CA72963F11CDBDD0EB02AB3AC = GOLDENEYE (GOLDENEYE) | V | 0x830E4EBF693253E0F80249C1B7881BE8 ; MKBv28/BD+/FindVUK 0.99 -0x9A3343724D4FED3FF24208A47511325E1A163035 = GOLDENEYE (GOLDENEYE) | V | 0x172FEB68C541741E2826B2A1BA8B0E24 ; MKBv28/BD+/FindVUK 0.96 -0x717BE2AEF6BF1E891773B4253E19A36F34EED27F = GOLDENEYE (GOLDENEYE) | V | 0x49853ED9E584B4E2CA4CE12D6E750DB2 ; MKBv28/BD+/FindVUK 0.96 -0x3FC0714B6043BF4AB6EC546BC3A7265551B56CB6 = GOLDEN_COMPASS | V | 0xFBAFCDB42CF4F783737AAC7F89C6D467 ; MKBv7/FindVUK 0.96 -0x689D10EF763FC24E511D0947B5F6C09043D85E90 = GOLDEN_COMPASS | V | 0xBA42AF24CC9C5163A0C344DE586F4CF4 ; MKBv7/FindVUK 0.99 -0xEE7545628CAE3BC86CD90CFE52D451AA6EF7E75A = GOLDEN_COMPASS | V | 0x6B14AE3B5716C8A8328533E8C22F9C65 -0xA5B41A97C5FE47815C460E310ACEE5489D49DF95 = GOLDEN_COMPASS | V | 0x10DDEEA874494445BA0A7C2E166292D5 -0x7092BFDA9523E495692BA57F97553128CF126CFC = GOLDEN_COMPASS_DISC_2 | V | 0x0FCF421E93E43C0A73B8277E134EB931 ; MKBv8/FindVUK 0.96 -0x27A9082073960BD4A77E105ADE1AF556B66C7E52 = GOLDEN_COMPASS_DISC_2 | V | 0xAD07D641499683E00D813B175B3E6E55 ; MKBv7/FindVUK 0.83 -0x63ECCC3177A1F6A16F9456EB8206FAB2CD2BD3F3 = GOLDFINGER | V | 0x38D031DE9F47613C70AF95043E4F2D0F -0x5673B5542D6C7D35CA11B3992F6AAFB1625C8B3E = GOLDFINGER | V | 0xAF054EA5AB0E8F77085BEADE92742D43 -0xAA34CE1F6446323EB61E1E46D525CC1FC33AAD58 = Goldfinger | V | 0xE4896B160F5089F16BE10150EBEE3415 -0xBBE7DDCB70A9EF8CDE00FC1115709A1E7976CDD9 = GOLDFINGER_DOM (GOLDFINGER) | V | 0xA0DDD48FAC3253519E9B7123BC24492A ; MKBv10/BD+/FindVUK 1.02 -0xA37C0A30B2B6016FBDB0E6041B3450DFDFFA9E03 = GOLDFINGER_DOM (GOLDFINGER) | V | 0xF1528CC5994633E33BDCB66096C5F903 ; MKBv10/BD+/FindVUK 0.92 -0x4E01D9470EA6541708648DEA98CB727D5FAE7E29 = GOLDFINGER_F1 | V | 0x10FF2F8B5F2FE9B8709F26F40B6AC34D -0xA0288573F543D8335936C1C401038718CE36C21B = GOLDFINGER_F1 (GOLDFINGER) | V | 0x33ED9305FF3D83E5B80928B5E2E3CE74 ; MKBv12/BD+/FindVUK 0.92 -0xD0D8EF04C1D7CEF30E56E0B310B96EDF9B443C0E = GOLDFINGER_F1 (GOLDFINGER) | V | 0x045F4D9F1304CB9C2AA908B5889CA616 ; MKBv12/BD+/FindVUK 1.00 -0x72705D0C7E41DADDCD221D07CB0F711F6779E134 = GOLDFINGER_F1 (GOLDFINGER) | V | 0x5DD630C18FE871CD695A6E0BF7E04E82 ; MKBv12/BD+/FindVUK 1.00 -0xDC4DF4AA2C42873B884C8FB998CA78D046766655 = GOLDFINGER_F6 | V | 0x36127D26C64FD0DF3AB17CBF8174B593 -0x8D6B515A321E57C34A36CBE461056EBA1D72D61E = GOMORRAH | V | 0x28CE7A49BFFB4AA03188712C1C37385B -0xC33D2C9BC14CB3CB7C7DD15C98703438D12259C9 = Gone Girl | V | 0x4D809DAB256463FAB3E2D28CDBD19A53 ; MKBv39/BD+/BEE/FindVUK 0.72 -0x78E2E35F161E56677795CE49FD4A51C4CB034DED = Gone Girl (Gone Girl) | V | 0xBB5512A774E33E78A4640945A8F511C1 ; MKBv39/BD+/BEE/FindVUK 0.96 -0x2F6F17C15D41DC477166112E808FE3FD3780182B = Gone Girl (Gone Girl) | V | 0x5B33C99CC3B451B562CB6DFCA89FD010 ; MKBv39/BD+/BEE/FindVUK 1.02 -0xBBE3F5FF5574046E1F99DC77B872D07D5D4A4BEC = Gone Girl (Gone Girl) | V | 0x5465EC9ACD2CB8BB6AE0EB04500B40A1 ; MKBv47/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0xAD190087C9C31086369D06C4F1D25619ACE579D2 = Gone in 60 Seconds | V | 0xFAF0D8B4E3E4472F624B4FDEC863B1F5 -0x153FFE326D643490FC19A2EBC23CBBD7F58533BE = Gone in 60 Seconds (US) | V | 0x2598D432820DCBD3D6A5603B8E322751 -0x47FAA16137D7EE8D9C3A481074A1B391A19FC1C3 = Gone with the Wind | V | 0x7480F8A076474559D0A6668AACC32F3C -0x4724D2870B5F13B78984B801378CA24769BC0657 = GONE_BABY_GONE | V | 0xDE6A52530E02A8479CCB8B90AACF638F -0x2F37228564ACBDC08271682E7F3C559E538CB52A = GONE_BABY_GONE_GBR | V | 0x4E14E4C2E3FFEBCAF73AF2F887E96798 -0xD316411DD10A61E220FAB6B9627BE592CF041B5F = Gone_Girl (Gone Girl) | V | 0xCBF37C3DECACBF1896BF2F585B17B4F4 ; MKBv46/BD+/BEE/FindVUK 1.00 -0xBD96E5F4DE7F56D1DDA9788DA7961761D1660D94 = GONE_WITH_THE_WIND | V | 0x7FBA1CEDD3218C8E85DE3E2348CE7D96 -0x460E5CC38C226A5EB417C68FE11326261FBD843B = GONE_WITH_THE_WIND | V | 0xA55F95719ECCB23B0C05879E31FA8A1E -0xB4AF3B06EBA75E51AD5F797049953F5205FAEE76 = GONE_WITH_THE_WIND (Gone With The Wind) | V | 0x56CD44AC48A583FA0717FB866264F67A ; MKBv16/FindVUK 1.00 -0xD386EF26ED6CE7C12F1DA302DA6975A512BDF7B9 = GONE_WITH_THE_WIND_BONUS_DISC | V | 0x3AC760CC39FF5F450FFD4E9D73DAE8D5 -0x35007F793C6F5193519F527E770F1AB3B7CF0A3D = Good Dinosaur | V | 0x0396051AF9457F443BF5FF7033CC3835 -0x3F1A256C4400B4C7C19372C499343E2D0EC3F308 = Good Luck Chuck | V | 0xDC01C60421264BD027E04CBDB8C81C93 -0x2B0EA70E23E159ACDAC31171FACA39BAFCE5ADF0 = Good Night and Good Look | V | 0xFC62A73CDB311C545A362975219F7DA4 -0x0D01C360D0D3EC7F69DBF289D81A1FB04A6DC9E7 = GOOD WILL HUNTING | V | 0x217E6C969F05BAC0545138579BE04511 ; MKBv30/FindVUK 0.98 -0x1F751D5A438056971D2B58BD16515E418512296D = Goodfellas | V | 0x3490648EFF01012B5F554B3A3FDDC50C -0x5B260FBD402CA9D6D87D1574F3F55193DBA84835 = GOOD_BAD_WEIRD | V | 0x7CBF4DD90ADB987CFF6CF58E235D330C -0x2E771D357B5CD34258770B45D08A02E4607A85FF = GOOD_GUYS_WEAR_BLACK | V | 0x5A54D2926FDE269B09EF7674EA125A81 ; MKBrev 47 - FindVUK 0.54 -0xA6CCA04FEE155E54ED397BADD6534565B53AF723 = GOOD_KILL | V | 0x47649BE4E25485F0B13C8BDA554F4B37 ; MKBv52/BEE/FindVUK 0.96 -0x6D140507E9987DDBBBC49C17ABE1CCFFFB525F5A = GOOD_LUCK_CHUCK | V | 0x16F74FDB40C4864EDC969CAC1709D788 -0x81487FE5130C2DBF343340B5DA8A4F0CFBAF6F4A = GOOD_THE_BAD_THE_UGLY (The Good, The Bad | V | 0x3DC4298E21D8AFDDEE2FB356CC2DAD1F ; MKBv12/BD+/FindVUK 0.96 -0xEE220CF2CC17F13D461DD750D7DEDF4FBFA42E60 = GOOD_WILL_HUNTING | V | 0x83992F7E32661C8DE1CC7DB797AA9704 ; MKBrev 25 - FindVUK 0.54 -0x6DD6B6EBB4B66CDA91E337D496857D8301C74B01 = GOOD_WILL_HUNTING (Good Will Hunting - B | V | 0x5D4D6649DA7D1B3D66ED2532250763F0 ; MKBv33/FindVUK 0.96 -0xB4EE05355150D18CC92CF2A8281783073E51EBBC = Goosebumps (Goosebumps - Blu-rayâ„¢) | V | 0x6812C2E5C7D1AE6F420F13A8750BE41F ; MKBv60/FindVUK 0.96 -0xA8C1AD2DFB98EECD761DD7D4550874563B865446 = GOOSEBUMPS_3D (Goosebumps - 3D Blu-rayâ„ | V | 0xCD174E4E40B3084D04EB3A7E9FA4BB84 ; MKBv60/FindVUK 0.96 -0x423A6EF147DC464221794CBD243CF4024A5096FE = GORGO | V | 0x3D71F058B1D76A2CF5A90F0939A971C9 ; MKBv39/FindVUK 0.98 -0x6E961E3635AD9857A4EC027E71109C3412875CB2 = Gota Kanal 3 | V | 0xD8B12C0F96A39168E78004B0B5487053 -0x2572C02BB9918C719F65AE29593146EA4E4A5C57 = GOTTES WERK (Gottes Werk und Teufels Bei | V | 0xD75A6E440F00F5773EEAA6CC95CF462D ; MKBv20/FindVUK 0.99 -0x07343139FCB653EBC0B53E62FF8EAF3F3CFDF6C4 = GOT_S2_B5A_DISC1 (Game Of Thrones Season | V | 0x3B98DD62893A2E1BD81AD448713739D9 ; MKBv31/FindVUK 0.92 -0x25E9AD214DF4773792BD38AB1AF6A5CA6D5690A1 = GOT_S2_B5A_DISC2 (Game Of Thrones Season | V | 0x01014334098EAC8DA26465E274C99746 ; MKBv36/FindVUK 0.92 -0x4572109C8934858AFB3D44AAF780748A3C0C0066 = GOT_S2_B5A_DISC3 (Game Of Thrones Season | V | 0x381E93A06889935A87C806FB4691F007 ; MKBv36/FindVUK 0.92 -0x30410CD348C08FCCD390A27BEDD0CF5ECA668B15 = GOT_S2_B5A_DISC4 (Game Of Thrones Season | V | 0xD9C9664FC1B87A36F03B3B16D3D3EACE ; MKBv31/FindVUK 0.92 -0xE7D4E28DD2AEDEF292F02BCF3C08311A5DB364EA = GOT_S2_B5A_DISC5 (Game Of Thrones Season | V | 0x08D42409D5BDC4C6BB1DA1A87CEF239F ; MKBv35/FindVUK 0.92 -0x4666D015A9E76B020C4C5060C0621353C66254C0 = GOT_S2_B5_DISC1 | V | 0xEF5C564106D7F0C7C531AA62E9D43844 ; MKBv31/FindVUK 0.80 -0x8233B1AD07A7839ED00EFB6C173CA4B0F84F7AB7 = GOT_S2_B5_DISC1 | V | 0xAD566A54E588192E8DF701D582E47310 ; MKBrev 31 - FindVUK 0.62 -0xE84111F68BDA9ADAF5A6FBC76C969941B97C4842 = GOT_S2_B5_DISC1 (Game Of Thrones Season | V | 0x6AC7DBE957009E1EF72A5E80543C178E ; MKBv31/FindVUK 0.96 -0xBB24316A9E0243F3EC422D1EB38A6CFF87C7F2E0 = GOT_S2_B5_DISC1 (Game Of Thrones Season | V | 0x3A1B038BC4B47D0490E539B894C14E34 ; MKBv31/FindVUK 0.97 -0xC8E6D439D5D3BC2487914440514593AB15149459 = GOT_S2_B5_DISC1 (Game Of Thrones Season | V | 0xE179697794E00A5609FACCFE75E118DB ; MKBv31/FindVUK 1.00 -0xD2E3D6DA3B1FCB1853342268571E1A423A053518 = GOT_S2_B5_DISC2 | V | 0x46C94C35FBE675EC8A629E3D94544A0F ; MKBrev 31 - FindVUK 0.62 -0xA34DBE8844C86D520FBCB83F266C8CDE8F80A939 = GOT_S2_B5_DISC2 | V | 0x52014DB5E24A1B4EA5E3B8303FA9F8F4 ; MKBv31/FindVUK 0.80 -0x531BDCDFE9E2E34A44402CC6FF99AD6DCA40D209 = GOT_S2_B5_DISC2 (Game Of Thrones Season | V | 0xE3994D1CE4B234FAEAF9E1377707A62D ; MKBv31/FindVUK 0.97 -0x1D2AC89F5028F7222C1459D0DC757BD85C25FA9F = GOT_S2_B5_DISC2 (Game Of Thrones Season | V | 0x62F178F8EBBD1B08F1506617BDA03A87 ; MKBv31/FindVUK 1.00 -0x1D32F5237CA40386900D672553BC9703CF2C4AE6 = GOT_S2_B5_DISC2 (Game Of Thrones Season | V | 0x00D97CEC304225E6BB637FFD751D1BB6 ; MKBv31/FindVUK 0.96 -0x73CBBD768F79257A75549AB93131D4B11A48637F = GOT_S2_B5_DISC2 (Game Of Thrones Season 2 Disc 2) | V | 0xD4E5AEE909BDEFE5DBBBD0B35758C4CA ; MKBv31/FindVUK 1.00 -0xC3A97A997AE7DAE5B74093C51F1E29B3151DC165 = GOT_S2_B5_DISC3 | V | 0x6FC306C0FD168204FB875B4DF6493142 ; MKBv31/FindVUK 0.80 -0x79C95924D57C98C7DE50F10E5F5BC5A741E6CEC0 = GOT_S2_B5_DISC3 | V | 0x0CA100E4E886D774081F383F786C7A35 ; MKBrev 31 - FindVUK 0.62 -0x808B732D4CBF90D96EE5DEF25823A01A430CB0F7 = GOT_S2_B5_DISC3 (Game Of Thrones Season | V | 0xDC7B885F786BFD2B7D316F5D8F1E4FF4 ; MKBv31/FindVUK 0.97 -0xAE3BDEB7B49249B279F5FA17E1CD19E5903E60CA = GOT_S2_B5_DISC3 (Game Of Thrones Season | V | 0x13BDE2C99EEC3DC8537560D26E1578D5 ; MKBv31/FindVUK 0.96 -0xB0D2B609159A35965C683EB90FC2933186724F91 = GOT_S2_B5_DISC3 (Game Of Thrones Season 2 Disc 3) | V | 0x02C55CA6B180FEE2F14AF91047A552D8 ; MKBv31/FindVUK 1.00 -0xED2B3283748443DFFD2B735231E3F895E02E59D3 = GOT_S2_B5_DISC4 (Game Of Thrones Season | V | 0x1AADD5944651E13BFD71F927C8363BF3 ; MKBv28/FindVUK 0.97 -0x78100DB803598AD8D6245CF3CA968E4A0B5A1304 = GOT_S2_B5_DISC4 (Game Of Thrones Season | V | 0xA48D22304888BFE23B0B78DDB1658179 ; MKBv28/FindVUK 0.96 -0xC9B8E422A0D0AEE952FB562B267670DB7A8D5B35 = GOT_S2_B5_DISC5 | V | 0x40CFEAB8E06F003B951B10CCC09F38EF ; MKBrev 31 - FindVUK 0.62 -0x9AEACDC165E17228A4F03287CEBF47B33EAC18E3 = GOT_S2_B5_DISC5 | V | 0x1D994737B86900F66D5DE58011E18768 ; MKBv31/FindVUK 0.80 -0x0FC681C81F2602986CC3EB6E20AB4F4DC8342A67 = GOT_S2_B5_DISC5 (Game Of Thrones Season | V | 0x2432636112A2387597C3E8DA12264ADC ; MKBv31/FindVUK 0.96 -0x402C797B945D33D8948C4456C6A5A93516FE369D = GOT_S2_B5_DISC5 (Game Of Thrones Season | V | 0xE85BB41147931933D460D629B51CE448 ; MKBv31/FindVUK 0.97 -0x236E5AF569626E67D2BC4EE767D4D1BD281621EA = GOT_S2_B5_DISC5 (Game Of Thrones Season | V | 0x17EC87509D79425C904C5D053AA377DF ; MKBv53/FindVUK 1.00 -0x655B07CF85B0224394BD9B89D5665589F58F6369 = GOT_S2_DISC1 (Game Of Thrones Season 2 D | V | 0x24ADAF4B54DA944F5D430D898248A92E ; MKBv53/FindVUK 1.00 -0xF6008587A8BE84EF100C2C834AED457630707A5A = GOT_S2_DISC2 (Game Of Thrones Season 2 D | V | 0x02540104176FFC7502813983E5CC35E7 ; MKBv53/FindVUK 1.00 -0x7066B36A530C150A413570A0B3DEAAE78E987D40 = GOT_S2_DISC3 (Game Of Thrones Season 2 D | V | 0xD8646D6DF145C0C73489B1D40360711E ; MKBv53/FindVUK 1.00 -0x95A6C3E8C8F2FA8605BB2205AECCE709DC639152 = GOT_S2_DISC4 (Game Of Thrones Season 2 D | V | 0x16FC96F98BCCDC986EFA3505782D812B ; MKBv53/FindVUK 1.00 -0x5CD5C9710E3B4E37CD97E0721E946DC299D6B84C = GOT_S3_B5A_DISC1 (Game Of Thrones Season | V | 0x744D05E5DB30BA60A8F9536E183DA682 ; MKBv46/FindVUK 0.92 -0x7671522B971DEA4E4D8448C2EFB68AC7D5039E8E = GOT_S3_B5A_DISC2 (Game Of Thrones Season | V | 0xF68C6B013FA5C6848A0BF9F75A0DD4ED ; MKBv46/FindVUK 0.92 -0xDF0CC9853F8BAA9AADD66DCEC7EAE65EF2DCF67A = GOT_S3_B5A_DISC3 (Game Of Thrones Season | V | 0x784A9FF646EBA49BF005275BA9DBD7C6 ; MKBv46/FindVUK 0.92 -0x9DF498A116B301163E55674F9A0CDB3FC1FB2EB4 = GOT_S3_B5A_DISC4 (Game Of Thrones Season | V | 0x710FD64A06CA959DD227D648C282DDC3 ; MKBv46/FindVUK 0.92 -0x445FD63F1634605414932E43BB0C5AAFA309CE41 = GOT_S3_B5A_DISC5 (Game Of Thrones Season | V | 0x91D410A3C2EA9B8F1CF693F2A29A9187 ; MKBv46/FindVUK 0.92 -0xEC6A0C1CDB1D82B545DDA2BE48E6A0779F0C24DC = GOT_S3_B5_DISC1 | V | 0x376841D072112EE82A3AA8BD1C85AAA0 ; MKBv42/FindVUK 0.80 -0x9D8F42D6DEDE85CD5C866C29F34064D33FF94321 = GOT_S3_B5_DISC1 | V | 0xD42D923E3DD27281D9C22121ED9FA746 -0x81A621685B44F113FB8B6468F77EC85D1982D1EB = GOT_S3_B5_DISC1 (Game Of Thrones Season | V | 0xD1686D1BF33645A0A935C26EAAEE1AEE ; MKBv42/FindVUK 0.98 -0xB05D308E86B1694DBA71FD515712AA08CF02F4DC = GOT_S3_B5_DISC1 (Game Of Thrones Season | V | 0x1438A52D034B6744D31B879E61365AEF ; MKBv42/FindVUK 0.96 -0xBCC59832837A2D27C366AB525C3B1CC1EBE74987 = GOT_S3_B5_DISC2 | V | 0x526FDDDDE41C490258EC7A1D66425A33 ; MKBv42/FindVUK 0.80 -0x076F3BD8D18A7530D651A7449F505F1A76FAA14D = GOT_S3_B5_DISC2 (Game Of Thrones Season | V | 0xB049B1F2778AA781210BC4BA37097BBD ; MKBv42/FindVUK 0.96 -0x3C323AFEF3B6827C9A2A4BD331FB289DBD7C8E4E = GOT_S3_B5_DISC2 (Game Of Thrones Season 3 Disc 2) | V | 0x85B71C4646E250D9719E0582F6F4A070 ; MKBv42/FindVUK 1.00 -0x6C50507F25DB3AAAA1550D3EA81BE79A38A3D679 = GOT_S3_B5_DISC3 | V | 0xFE03E4DD1D7FD9EB14920152C38DAB91 -0x1B27F10A804AFC5205DD44C25866113A9EF02000 = GOT_S3_B5_DISC3 | V | 0x395780A5C24D7A0DF2AEE736088A1843 ; MKBv42/FindVUK 0.80 -0x8EB12CBA976841C4A43FF16D572F6D730C1691C8 = GOT_S3_B5_DISC3 (Game Of Thrones Season | V | 0x7926055E68E0686A968209DE5C99DE92 ; MKBv42/FindVUK 0.98 -0x5F88ACA426BBBC421D40A5A2144F4B0D4A4989F6 = GOT_S3_B5_DISC3 (Game Of Thrones Season | V | 0x985B472D8A3BA2A04297D9A1ADF150DA ; MKBv42/FindVUK 0.96 -0xC705163762461FB94DB51B31A8B9BCFE78EC9D01 = GOT_S3_B5_DISC4 | V | 0x6E85CD3FC43FE817D87055952A34C5D2 ; MKBv42/FindVUK 0.80 -0x219DEFAF87A7F98DEFFC15AB1A5D9631359D8223 = GOT_S3_B5_DISC4 | V | 0x7E411623936F4E7ADECF4CF424BB92C1 -0xEBF546021D882826E69BBB3C5A285A5F6E5317A7 = GOT_S3_B5_DISC4 (Game Of Thrones Season | V | 0xAC722E2B3FAED7B24963741B774E5D4F ; MKBv42/FindVUK 0.96 -0x75310A882F8657D0875477529729335919FFFD82 = GOT_S3_B5_DISC5 | V | 0x749A0E1CA29801B2F6E7B30CB4EEFAE2 -0xD8B4390EED6CAF80FCA29A79621B6846D273DAC5 = GOT_S3_B5_DISC5 | V | 0x35440ED6801CC97D30B94F3F20669448 ; MKBv42/FindVUK 0.80 -0x7540DAACB87736DEA03396743E9ED4DD7BCEEDFB = GOT_S3_DISC1 (Game Of Thrones Season 3 D | V | 0xF834133376E94D498FA44EAFC806078E ; MKBv57/FindVUK 1.00 -0xCE69DA179581AC0E43E0B23B85B9BF95CF355A3C = GOT_S3_DISC2 (Game Of Thrones Season 3 D | V | 0x2B8443DDC66541CAFC6AB6B62664E7DF ; MKBv57/FindVUK 1.00 -0x827B1C73F3C8F1E256FE8C1F42CC66D2007E6A37 = GOT_S3_DISC3 (Game Of Thrones Season 3 D | V | 0xCFB78553253616AF6964B6CC6386E67B ; MKBv57/FindVUK 1.00 -0x4731D4FF70534117E71BCE15326340EEB2B106EB = GOT_S3_DISC4 (Game Of Thrones Season 3 D | V | 0x3F2B21607502DB19A4BE2F486FB6C81B ; MKBv57/FindVUK 1.00 -0x4BCD965EA5003747F773905295BDD17F7C160452 = GOT_S3_DISC5 (Game Of Thrones Season 3 D | V | 0x1802EA9CEFD5D1F756E8190E03A3BE7A ; MKBv57/FindVUK 1.00 -0x10625B1EB11693022F3D17C29131C7B873728BF9 = GOT_S4_INTERNATIONAL_GWP (Game Of Throne | V | 0x6C7F0B561D9E732889E40FF92DDB59C7 ; MKBv50/FindVUK 0.84.1 -0x0A8CA4FFCDAC27D6DE863C99DB11899DD4F1044F = GO_FAST | V | 0x587F25EF7CA7C0B5C6AAA73B0D9AF087 -0x61B900810C742C499F0A2635908E52FD0D8DCDD9 = GRABBERS (Grabbers - Blu-ray???) | V | 0xC88744D1C929F73243B11087CFBB4E5E ; MKBv35/FindVUK 0.96 -0xEB663E67BF6094946DE038C3B5FD425D3333B34A = GRADUATE (The Graduate) | V | 0xDD430803DBCD00B2FBFDDBF6389B42A8 ; MKBv17/FindVUK 1.00 -0x6EFFF1BF93761BA8C61E103B503602E26038A94D = Graduation Day | V | 0x3357A1F1452660809334D43A1D3D5D2F ; MKBv48/FindVUK 0.98 -0x3C372E44778D7BD5A31B7F0934119220EA41A7BB = Gran Torino | V | 0x857036B2916F8D2B73873FF1EDB63170 -0x4E18892216F2EED0E07BA9BBCBA4BDDE204B4B80 = GRAND_BUDAPEST_HOTEL (The Grand Budapest | V | 0x771C91025AC55799338FE18A80E1A5CA ; MKBv36/BD+/BEE/FindVUK 0.94 -0x7C4944DF7D8FCE3A333141F4E03A300D39E86FF9 = GRAND_BUDAPEST_HOTEL (The Grand Budapest | V | 0x5C4406B6C21744E8A1923A32520FCF60 ; MKBv36/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0x1FB5CEED42174593A87AB1255EBA73C641A7F72B = GRAND_CANYON | V | 0x77F4664AB23B99F7423CD58C8605BB76 -0x0227F72207FF9171FAA49E2DB4293E1E8489021D = GRAND_HOTEL | V | 0xDCCB13F4F5B84F48109064809DEB6104 ; MKBv31/FindVUK 0.80 -0x54E3F241C8039F3C57A2A92884CB12F1FE87CEB3 = GRAN_TORINO (Gran Torino) | V | 0xE9D464462613BE3F03924EC6A4E9D6F3 ; MKBv12/FindVUK 0.98 -0x0A47D3305118B32CE4F9D73B9805FEB5E4222146 = GRAPES_OF_WRATH_WW (The Grapes of Wrath) | V | 0x6E72FDA8285CFAA8F2CF597273053720 ; MKBv25/BD+/FindVUK 0.96 -0xC89BDE4456027EA6C8DD622DFBA323688FA36594 = GRASGEFLUESTER | V | 0xDE98E6D524928FC16C088704FF289141 -0x6FCA910598FD70794045B2248A89A6CA898384F1 = GRAVE OF THE FIREFLIES (Grave of the Fir | V | 0x75793130E7209C01CA2A873B23AE3BA9 ; MKBv57/FindVUK 1.02 -0xDE67FB74C5A09E562969855F247AD134D7BC79AA = GRAVE_OF_THE_FIREFLIES (Grave Of The Fir | V | 0x195882D5E86433B9325162FD854C55B8 ; MKBv38/FindVUK 1.00 -0xF33E6D65C581281C7B8EF309A64A37AB46890E67 = GRAVITY | V | 0x802D81B0D99248812C2DD015EAE8E80B ; MKBv35/FindVUK 0.80 -0x9FA48378070F6DCC397623E1DB598494F0969352 = Gravity | V | 0xE03EB751317D13786799C9E8054B40CE -0x37C06F18A8ACFEBC58B047173E0CBD9D4DEC6C75 = GRAVITY | V | 0xC7688A5132B4237782EB44F251D25CCB ; MKBv36/FindVUK 0.81 -0x9FA48378070F6DCC397623E1DB598494F0969352 = GRAVITY | V | 0xC69691DA2CC76AC15D51022B09AFDBEE ; MKBrev 36 - FindVUK 0.57 -0x34532A3A5EE2D9A234A9B525BCB1C399355E2C67 = GRAVITY (Gravity) | V | 0x8AB4CCC0780900EE191726CA79E42200 -0x450E5BD865BD00BC88AD2CA3C88F2964F4DB958B = GRAVITY (Gravity) | V | 0xC284ADDE74B45A618DC1FDF48F59E2E4 ; MKBv36/FindVUK 1.00 -0xEA0E715FA8C21B6B16BDDB1BBD1A82321062C372 = GRAVITY (Gravity) | V | 0x6BC803B967186C8279B3164D12812392 ; MKBv31/FindVUK 0.92 -0xC43AE7FA2B3BF1F7BFD6B20E8A09B20EFF6F42DC = GRAVITY (Gravity) | V | 0xCF7E9F787C1A7A0DB59C4A2265C01E44 ; MKBv31/FindVUK 0.92 -0xAE30BFB77FB8C00C4C8C8D6D8EEA0FD609E41BD7 = GRAVITY (Gravity) | V | 0xADB1CFB1349E920EFB45F70FA7F71A26 ; MKBv36/FindVUK 0.86.3 -0x7CB77DC2520DB49EE310CD543190FA55A51BFFBC = GRAVITY (Gravity) | V | 0x2CEBA0F7D4061D52EEC160151F103D43 ; MKBv35/FindVUK 0.84 -0xFD15CFE2C936C55D82A8F81096D63304BABB03C0 = GRAVITY (Gravity) | V | 0x151449440E3E34EC90BC1DCB6ED78535 ; MKBv35/FindVUK 0.86.3 -0xF11A29AA70452A619B6F6FC697D24270C52CD94C = GRAVITY (Gravity) | V | 0x75724B6C709D891750C4039DB0F8FA01 ; MKBv36/FindVUK 0.99 -0xCAE62C5CA6F13CB9CB01DAD8E64F3AFE601ED8F8 = GREASE_AC (Grease) | V | 0x69391F8E15D19EB62375CB1F3FC22142 ; MKBv12/FindVUK 1.02 -0xE904B5CF3CB48E6099550832D71B410565EA6D32 = GREASE_AC (Grease) | V | 0xB7340862B7E13F264DA53F68732663EE ; MKBv12/FindVUK 0.99 -0xF2465C8490EB581FD8D4E609B5EE339BDB23AD8B = GREASE_EU | V | 0x56A79336AC399B88F6AA110DD1910B58 -0x906BDC4A36968C4A52A47BFBBD97907FF0E1307A = GREASE_EU (Grease) | V | 0xE98AE2B64EA64775730673A73F9B78A1 ; MKBv12/FindVUK 1.00 -0xB78B8666B330058B295E81DF9ED3BB3E98BDE68E = GREATESTGAMEDEU | V | 0xBFFAD4388C66BE83DDCAF8F6053B4D48 -0xE5A4719D892000B36D6983B586C66EDEDDF77582 = GREATESTGAMEPLAYEDUSA | V | 0x30C5D3D54B8DCD2B0DD4C5CF5F01B5DB -0x4EE36F732751E84935CB2D356DF5A00EE754FAC3 = GREAT_EXPECTATIONS_BD | V | 0x74F3C0912A15741EDB6D316D5C1B17F1 -0x67EB8644ADD19169A59919FC418D65193F45A09A = GREAT_GATSBY (The Great Gatsby) | V | 0x161ED15F68B1851E3B402E94ADDB55C9 ; MKBv36/FindVUK 0.98 -0x827E65E9A3A38637A5E4BD62ABF6D679DA8711A6 = Green Zone | V | 0x7B86EE19A05C4E8A722DAEDBFD05178D -0x245BA7669C9A2EB057C9820A24E1A3B1250B0390 = GREEN_BERETS_BD01_DIM1 | V | 0xCDA47C098B4D7CB87E7D3D29F3B00EFF -0xEB78F43AFE1FC4D1776825DD45D2B7876619794F = GREEN_BERETS_BD01_DIM1 (The Green Berets | V | 0x376421B27F8860E953E0C653A041333E ; MKBv15/FindVUK 0.92 -0x42AD67E1D3E3012349903B42F5C759E2081961CD = GREEN_DAY | V | 0x37D880F36B4BAD6CACEFD226C5D898B5 -0x2A72BADB273872F5FED03DF927E767CBE26103E9 = GREEN_HORNET | V | 0xD1D066A9C8CB90027BDA4C599370A5E6 ; MKBrev 30 - FindVUK 0.57 -0x9821557E1E9A3771B52C29DDCFB2DA719F106900 = GREEN_HORNET (Green Hornet, The - Blu-ra | V | 0xE6DAD7B3D2E9A70E7AA2422644EFAA7E ; MKBv20/FindVUK 0.84 -0x3BD3EBC493986C869E0593D6F5D3C6E8C1F5C844 = GREEN_HORNET_3D (Green Hornet, The - 3D | V | 0xA07621EEFBBD435F10813FCDF8948B1B ; MKBv20/FindVUK 0.87 -0x1E0229C37E940376F73E4308CE7853BA66A2DB33 = GREEN_HORNET_3D (Green Hornet, The - 3D | V | 0xD0296800F7DD8B20A01ADCFBF77F99C1 ; MKBv20/FindVUK 1.02 -0x3801808C684A9E9AA98DD91FE967E6FC3B43EE5D = GREEN_LANTERN_BD02 | V | 0xC1C3C398ADFA9820B98333B3FCCBFFF8 ; MKBv23/FindVUK 1.00 -0x25B134F508AFC8C7A9197C67EC5D3838B163AB37 = GREEN_LANTERN_BD02 | V | 0xA56341518C9C5B3DCEF363BE84FA4DA3 ; MKBrev 23 - FindVUK 0.53 -0xBACBA580A69965EC0920E57A009C0342627E6847 = GREEN_LANTERN_EMERALD_KNIGHTS (Green Lan | V | 0x8951EDB378A73AB7C4B1D15048DD5343 ; MKBv19/FindVUK 0.91 -0x9C7CC9FA351510A507EAF47F91E255E7B487353A = GREEN_LANTERN_FIRST_FLIGHT | V | 0x94E3334081B1BF0D9A890371EBDF7525 -0xC0436E10F7DC63A8C923042752BDEC0F9245330A = GREEN_MILE_THE (GREEN_MILE_THE) | V | 0xA8AE396B506CE8004932ABD8BF24FBCE ; MKBv14/FindVUK 1.00 -0x017F5089E16D7F34E1930C1DD9611AB5826F93C8 = GREEN_STREET_3 (Green Street 3) | V | 0x32E221F0EA2D3162536A5341D52A1057 ; MKBv42/FindVUK 0.84 -0x2023CA9E9070BD8A20CA1A589D27DE9187DCCF18 = GREEN_ZONE | V | 0xD12C98CBD03AF634C3938A0C7E7FB9CE -0xEADA6B62716AD7E9FF04547275682761F6A463C7 = GREEN_ZONE | V | 0x5D5BA33D12554D170C17A36EFD639F4D -0xA432E4410F299127A26AF7C413A88F71ED3ACBAA = GREEN_ZONE | V | 0xE4C8F01B3E8D745B0D1EC9F7EF045026 -0xB9F13B84C206AEFE08B768D13E546466DCF8E54A = GREEN_ZONE_G51 | V | 0x1F2E66B79E09603EF5C35245564DF30A ; MKBrev 16 - FindVUK 0.57 -0x10904D6B2D1D8085AF3E395CADC077A15C3772D0 = GREEN_ZONE_G51 (Green Zone) | V | 0x276DF6F5B56C8854C550C88A144C1EAA ; MKBv16/FindVUK 1.02 -0x2EC908172E81F918DD4657B013CDAB861D85CA45 = GREEN_ZONE_G53 | V | 0x24D6FCF936BD2D871D5337E21E872236 -0x3325DFCB2202957B36E6BD491083496F6E26836C = GREGORIAN LIVE! | V | 0x1E0542AB9A72F799F10655F3EDB16E9D ; MKBv61/FindVUK 1.00 -0x72CE1EA95B5B8144B8845D297F6BC0DC90FFDBB6 = GREGORYS GIRL | V | 0x4D499CD5DA9AD6514C4E88E1E4CA3ED5 ; MKBv47/FindVUK 0.98 -0x2DCC076A2C0A922B5EE39270193F8211E1343D09 = GREMLINS | V | 0x210B6464E1179EA105657E8910605D80 ; MKBv12/FindVUK 0.96 -0x2C11A410BB84E32754E9FF8B6018D3F2E4BF587E = GREMLINS | V | 0xE73AEB4F04A4DA61A5967A83A6206683 ; MKBv12/FindVUK 0.96 -0x1714A1290EABA6DCE1D1A5E4489F1363F7368A74 = GREMLINS | V | 0xA307E1F8D62B9AB96581ACFF4252507D -0x0C247DACA2036EE65F7A53BF7C7E0E9D8F50B232 = GREMLINS | V | 0x028C322887FE9ED8FC794D1FE656CCFE -0x9390183B1FAB69213C30F197BE104C812655B046 = GREMLINS 2 (Gremlins 2: The New Batch) | V | 0x49D5F66CABE7EA7AFA136630E572853D ; MKBv27/FindVUK 0.92 -0x14DB41132C7CC76264328E321F51117B14EC58AD = GREMLINS 2 (Gremlins 2: The New Batch) | V | 0x851F4735693DF6C3978020A27E851FD4 ; MKBv27/FindVUK 0.96 -0x7999F2B52CABCC2718A6914E747DB7585DCC493F = GREMLINS_2 (Gremlins 2: The New Batch) | V | 0x2768DEF66CA5FB3A512E3BEAC5F7E956 ; MKBv35/FindVUK 0.96 -0x651BC3212AB83E4CD1820FE51F3EE9D1C016A1DB = GREMLINS_2 (Gremlins 2: The New Batch) | V | 0x4F60BAA53320E87FD47412F27A61C61B ; MKBv35/FindVUK 0.96 -0x89016F632BBEA660BC84CDB36587AFA161BA23CC = GRENZEN_DES_UNIVERSUMS | V | 0x95AF300D8D06C51742588636908D9275 -0xB91469ACD14DC25780DC377806008695837BD22F = GRIMM D1 | V | 0x3681D9022FF5E75EB4C3795E58D6995D ; MKBv39/FindVUK 0.98 -0x86BA13139DF24586ECD2A0811889C4526EBEAE6C = GRIMM D2 | V | 0x37D8639C5789E9A10D74C7405F775C40 ; MKBv39/FindVUK 0.98 -0x3F3483768D7EF5B747863108C16620A8DF5AC06B = GRIMM D3 | V | 0xB1019AEBA9EBB0DD46C13E3825411CC8 ; MKBv39/FindVUK 0.98 -0xB4484541501415DC26E2F8322CB141BA354DA59A = GRIMM D4 | V | 0xD643091176EDE151E33E468CB6C463B1 ; MKBv39/FindVUK 0.98 -0x37FC2CC8FA73B7F2982B3EB4F35387BBEA683FBC = GRIMM D5 | V | 0x96BB8C0AC4DE3806E2531D40039AAB7D ; MKBv39/FindVUK 0.98 -0x87AB33FA667B5887DAA722F04F8E4D25CAC1D123 = GRIMM S3 D1 (GRIMM S3 D1) | V | 0xC31B4DD9B3B6804103BFA892B878ECF9 ; MKBv49/FindVUK 0.98 -0xEE526F9C8086FB84E78F4AD7ABA0EB1B6BD46E56 = GRIMM S3 D2 (GRIMM S3 D2) | V | 0x17D0D20F5B88B030BD068AB877A6272A ; MKBv49/FindVUK 0.98 -0xDC9E24C5FCF7BAAC3C4FB4A7331AE1FBD92BE536 = GRIMM S3 D3 (GRIMM S3 D3) | V | 0xB1A9AD0948525523BA6FFAABF40B3950 ; MKBv49/FindVUK 0.98 -0x3F4F01055135D84C8073762FA49469F0B092F6F5 = GRIMM S3 D4 (GRIMM S3 D4) | V | 0x9DBD141C2A99E8B17EA3FDC9B32BB2BA ; MKBv49/FindVUK 0.98 -0xEA9F27098CBBC243F56033D9720A017912680588 = GRIMM S3 D5 (GRIMM S3 D5) | V | 0x53E9B17D12C5F609BAF8BC155A931AE8 ; MKBv49/FindVUK 0.98 -0x3C519A08E82CDBD29395667EAEE6279DA6B0A429 = GRIMM_S1_D3_NA | V | 0x044FC153A241A4CEDC5F4596B542AC5E ; MKBv31/FindVUK 0.80 -0x2405EBA02D395EF5CC15F6CB84BB0EF93B9D1D49 = GRIMM_S4D1_UPB2 (Grimm: Season Four (Dis | V | 0x0C2C6697AA6CABAAB45F276ECFC472F6 ; MKBv56/FindVUK 1.00 -0x044509F0A550DCAFE1F756780FD00E878238B72A = GRIMM_S4D2_UPB2 (Grimm: Season Four (Dis | V | 0x6F1D7EE90B7360617C5903FBA295A0A8 ; MKBv56/FindVUK 1.00 -0x31C95CA20475FD2B0779B6D2F21386D370855B31 = GRIMM_S4D3_UPB2 (Grimm: Season Four (Dis | V | 0xDCA5D5CF70FF8F1F681A51CEA9C6BF5E ; MKBv56/FindVUK 1.00 -0xDA91D9B1C6838CABA88D1CA44B0162C8B89504D8 = GRIMM_S4D4_UPB2 (Grimm: Season Four (Dis | V | 0xFDB20EC8CF6EF690B41E6166A929BF7A ; MKBv56/FindVUK 1.00 -0xF09280B9799267A3D853640286F16935070A5104 = GRIMM_S4D5_UPB2 (Grimm: Season Four (Dis | V | 0x880475DF233D4467B85EC406A8C9CD92 ; MKBv56/FindVUK 1.00 -0x1F6B22E6E2E496A9E4857294FF39731459D35B20 = GRIMM_SEASON2_DISC1 (GRIMM S02 BD01) | V | 0x07061CC11B6E4F531B3D6D0DAD4C3998 ; MKBv44/FindVUK 1.00 -0x92E8D40777CC92DAD7D16431D07F5372FBC69B35 = GRIMM_SEASON2_DISC2 (GRIMM S02 BD02) | V | 0x6CCE63CCD22329E0DD381BD3B906ECEA ; MKBv44/FindVUK 1.00 -0xE1922D58E17F9D843EF961617F6057DCBD1531E7 = GRIMM_SEASON2_DISC3 (GRIMM S02 BD03) | V | 0x070BFA48A3417155A4519915BD7AFCA6 ; MKBv44/FindVUK 1.00 -0xAB91A5A4AD715254ECBB83E81B93782EA6979827 = GRIMM_SEASON2_DISC4 (GRIMM S02 BD04) | V | 0xDD9B59862826E53BEB484DFC89313249 ; MKBv44/FindVUK 1.00 -0xACE0C3671A0771AC4ECE9F40A5A82A61E77E202D = GRIMM_SEASON2_DISC5 (GRIMM S02 BD05) | V | 0x154453E66E16ECB084960A6098DF8373 ; MKBv44/FindVUK 1.00 -0x68BB7C302933C4786526B859861BF4466EB8A1D5 = Grindhouse : Planet Terror | V | 0x21500CAAB5A070CA1230D76D486C47CD -0xDEC331DBAB56A9A62D9AFCA2384AD1C453104D5F = grindhouse: planet terror | V | 0xB952786DC626C65092D4003CAD6925FF -0x38AB75BA009ED75241C450D3ACFB91FA5A921B75 = GRIZZLY PARK | V | 0x04327261E41956B12ACD7A67EA624F81 -0x06B67A3C05239563D353BF55B113E58D79CAD2B8 = GROSS ANATOMY | V | 0x2FBB245DE8EF234603D234A3A68D4444 ; MKBv21/FindVUK 0.96 -0x85266FDD6677339360FE697817B5CAFA226EDAF1 = GROUNDHOG_DAY | V | 0xDDECBDC41E8B04E788CE2887A5E93E6B -0x297225539563B14BEF325D8D21DDAC27C993D844 = GROUNDHOG_DAY | V | 0xBA7DECB59820F82A8787E6D3EA10DB05 -0x423D9704E06D364655F1E261DAB69D68F2C6864A = GROUPIES_BLEIBEN_ROCKET | V | 0xBA8FEC178CE5342787E77242AECBC655 ; MKBv23/FindVUK 0.80 -0xBC1915BAB6C9213A5B8FCE672D266F5D1E2AD55E = GROWN_UPS_2 (Grown Ups 2 - Blu-ray???) | V | 0xE02CFBBBB8D4D2220FE2B5529392EACB ; MKBv43/FindVUK 0.89 -0x3E4C6F2CC85DD8966486E8719614DEAAD21B0BEB = GROWN_UPS_2 (Grown Ups 2 - Blu-rayâ„¢) | V | 0xF4344A4386079468D1462FF7C8519D27 ; MKBv40/FindVUK 1.00 -0x5C787EBCCA51EEF08050F75078812A5947FEC048 = GRUDGE_MATCH (Grudge Match) | V | 0x390964DD1B871D7E9B8DCFE46A65B4CA ; MKBv39/FindVUK 1.00 -0x97B731EA9E0BA185AE4460CF7AF4E261628A4894 = GRUDGE_MATCH (Grudge Match) | V | 0xCE21070BE09D01B2569455325C1FB758 ; MKBv46/FindVUK 0.98 -0x4709DF5CE7CE4C76B1446293E41984AA1643E2CA = Guardians (Guardians) | V | 0x912C36BDF4062C3CBCF3A6546E84C553 ; MKBv63/FindVUK 1.02 -0xAFD617D95C4012B4F4FBCFF4842DCA1A790056DE = GUARDIANS_OF_THE_GALAXY | V | 0x83213AD6C014D6A90D24F0943CBC6816 ; MKBrev 39 - FindVUK 0.53 -0x592D8F243FB0DAC8F8FC884F5054B56A2351117C = GUARDIANS_OF_THE_GALAXY | V | 0x5AAD72AD508400F4B4BF3E797A2A3F5E ; MKBv39/FindVUK 0.81 -0x0D9E6D40709B7857052241E1CC44F6DF7CD40AEC = GUARDIANS_OF_THE_GALAXY (MARVEL S GUARDI | V | 0x73780BB0F774C45E3268F4F58E17ACAE ; MKBv39/FindVUK 0.99 -0xFA7A859200426F39705C9A9BFB25B4AE5E98C2F3 = GUARDIANS_OF_THE_GALAXY (MARVEL S GUARDI | V | 0x1EF727CC47110A8B446BCE471A09DF6A ; MKBv39/FindVUK 0.98 -0x65F168374B73195F76F3A707213DCC07FE99D823 = GUARDIANS_OF_THE_GALAXY (MARVEL S GUARDI | V | 0xE92A7E2E107A6B6BB24A2A9C40E8A297 -0x4D48926A386BFFBF7739A7A69FDB82650B5467A2 = GUARDIANS_OF_THE_GALAXY (MARVEL S GUARDI | V | 0xCD18C40A2A60810A5B19724A6D131206 ; MKBv39/FindVUK 1.00 -0x3C8FC7356734E6B288F726E3E12B935E2C453BCB = GUARDIANS_OF_THE_GALAXY (MARVEL'S GUARDI | V | 0x7A166235FEB00C8DA3B0B65E961D9E05 ; MKBv47/FindVUK 0.83 -0x88BAC865050AE67CEE9BB7107AF37A7654186722 = GUARDIANS_OF_THE_GALAXY_3D | V | 0x1B5187934EE0D245D864DE7BCDF5E216 ; MKBv39/FindVUK 0.81 -0x485B93798DEB1360002B0D5C4E7252B12FC230F0 = GUARDIANS_OF_THE_GALAXY_3D | V | 0x6FDADC65D32FF6C41EE4591F9592BC41 ; MKBrev 39 - FindVUK 0.53 -0x916EC83FD37E610F0BC3592F5D770E60CD3D972F = GUARDIANS_OF_THE_GALAXY_3D | V | 0xA719E13FC7185837AA1B95B7691348A6 ; MKBrev 47 - FindVUK 0.62 -0x7CAE01BC39C4BA32C0168A4A4967B9D4C4BD2A06 = GUARDIANS_OF_THE_GALAXY_3D (MARVEL'S GUA | V | 0xAF90CD58DA3919E7A85B303F2167F704 ; MKBv39/FindVUK 0.83 -0x8B1806599C7CFDADB3B06950A5EDBFD6CC366268 = GUARDIANS_OF_THE_GALAXY_3D (MARVEL'S GUA | V | 0xD9FB92E7037A2EC155529636585A773C ; MKBv47/FindVUK 0.90 -0xE7F3220F3B43068490117EB4F4546F206434D197 = Guerra ao Terror | V | 0xC4451649749C60EFE86ED47E9A50DA2F -0x4F33947B04D0B97F3B6299505E13F0F733A399D4 = GUILTY_CROWN (Guilty_Crown_P1_D1) | V | 0xDDA51D789F26AC14882ECCAB695F864F ; MKBv36/FindVUK 0.92 -0x961033016A9EB7ACCD7163D6B3D7F0326F4D01A2 = GUILTY_CROWN (Guilty_Crown_P1_D2) | V | 0xCE0A923F5535D5955899DD2C19E04637 ; MKBv36/FindVUK 0.92 -0x16A94FC209FA04ED6B5843AA6816FEF0D7C6ED70 = GUILTY_CROWN (Guilty_Crown_P2_D1) | V | 0xC5F99CABE08E08EBBA33B784CEA1EE5E ; MKBv36/FindVUK 0.92 -0x0AC322D9C2B868492DA49C50204906C97929DB5D = GUILTY_CROWN (Guilty_Crown_P2_D2) | V | 0xD0C7B0A4287BA6EFA6406A54A81E2771 ; MKBv36/FindVUK 0.92 -0x16D6DA80AAB72F752CF7949EDF15A0AA1BE0A5F4 = GULLIVERS_TRAVELS (Gulliver’s Travels) | V | 0x0005CA59626F70995B28DCC714EE0CBB ; MKBv19/BD+/FindVUK 1.00 -0x0FC40676F125C5BD5E41C4C59B29CB5C93AA0F57 = Gun | V | 0xF28C0E90A8723374D80D433940C37794 -0xCB6087A5D2B5E6FA736BC9C7F516C22A446F4698 = GUNBUSTER_THE_MOVIE | V | 0xBE2B0706D1D8C873F7FAE44233C47ACE -0x94E53D054D5C40F6E50CAF9F4682E4737CBAF0A6 = GUNDAM F91 | V | 0x3E9B534284828FC94C24BD3E639F7279 -0x74DFD43030C49783CE32B909369DA3A36FB13ABC = GUNDAM RECONGUISTA VOL1 | V | 0x5F23E9FE69DDD689CE199B391F8EF063 ; MKBv62/FindVUK 0.99 -0x9DDD0FADC2236402E38EBFF7437980F881E0CFBC = GUNDAM RECONGUISTA VOL2 USA | V | 0xE045AB5E7688C54AC40BA4AB4E498DFF ; MKBv62/FindVUK 0.99 -0x98B4E25B3E2E96B0616EAA4FF741CC075D43B807 = GUNDAM RECONGUISTA VOL3 USA | V | 0x66AA71073A8AE08DA1BA44A7E91EB288 ; MKBv62/FindVUK 0.99 -0xA4ADC57C89EB5728E0276AA2CD398E29A2893F00 = GUNDAM00_01 | V | 0x1FE352E524DA50FB2974AAE5D4A939BE -0x74EE5F3DCE083581C7CF4855E878EC271611E31E = GUNDAM00_04 | V | 0x119DCDF4AF21AF8FA917D3481445CD72 -0x34E25C50634AA2ECBA2583CFBE5F998ED3268174 = GUNDAM00_2ND_01 | V | 0x1FD425A70506E4EE472B845C9FCFD359 -0xAB597AEB2C0C40E59A0780584CEC397D5583ED7A = GUNDAM00_2ND_05 | V | 0x418DC64258685CEAA6EA8E26612435A6 -0x1841F3D62EC661032C72186BC346C077E561146E = GUNDAM00_COMPLETEBEST | V | 0x31F16B60966A40D9CE117CD525FAFEF8 -0xECE07FD684E61F83E9085F079D5E2E4B1F5C9628 = GUNDAM00_SE_1 | V | 0x24AD5785B2E1E458F817B522082611AD -0xAC65C210FC5243025439E675CF1ABFE0BA8A2123 = GUNDAM00_SE_2 | V | 0x913F8233DACB08E2BB4765C1C68CCF7A -0x26E4D58E119AF1805967D608449CBC467B36CB6D = GUNDAM00_SE_3 | V | 0xEFC78230517DE6F84CD3BD4E362212EC -0x2E8A2866670843D47AE29C7E7778C907811FDCB3 = GUNDAMUC_1 (GUNDAM UNICORN 1) | V | 0x0CA2D7BF492E0063F475644A40C8CCF7 ; MKBv16/FindVUK 0.98 -0x65CB24E428502697853D557A1E2D1B538CADEAF9 = GUNDAMUC_2 (GUNDAM UNICORN 2) | V | 0xE5AAEB6BC3BF1128409354211F3CFB75 ; MKBv19/FindVUK 0.98 -0x54D6693A0597230C57B0E106F8D7D517AA928B92 = GUNDAMUC_3 (GUNDAM UNICORN 3) | V | 0xF22613E7CC995D3F26128ADF57608D82 ; MKBv19/FindVUK 0.98 -0xB9876347014B69E5B217ECADB0238B511286F40C = GUNDAMUC_4 (GUNDAM UNICORN 4) | V | 0x1A62060CA18CE503208E918EF84AEC24 ; MKBv24/FindVUK 0.98 -0x1EB5D964F514DA4C47AFD405314B906F9284DFE6 = GUNDAMUC_5 (GUNDAM UNICORN 5) | V | 0x81095326BE826EBBB812346E5B16A983 ; MKBv30/FindVUK 0.98 -0x884D2760AD100796A8FC3C2C139AD6717D516426 = GUNDAMUC_6 (GUNDAM UNICORN 6) | V | 0xE5353024508A811BD66EAB9966B265D1 ; MKBv37/FindVUK 0.98 -0x8A2519FDD8495CC81287F6EF52D728A13BF9D378 = GUNDAMUC_7 (GUNDAM UNICORN 7) | V | 0x0BBF3BADD18FA8A159D932206F822E6D ; MKBv47/FindVUK 0.98 -0x789B01B5352647C19EA621A82772C17C5A3C43EC = GUNDAMZZPT1BD1 (Gundam ZZ PT1 - BD1) | V | 0x39532066AD10C93DAD801DBB2A7B3C01 ; MKBv61/FindVUK 0.99 -0x42CF225A5D38342521809DE88F07AEE554E1BE7C = GUNDAMZZPT1BD2 (Gundam ZZ PT1 - BD2) | V | 0x37BB98413AB8648D59DCCBC93A3A752B ; MKBv61/FindVUK 0.99 -0x179F21D9A0C93D6361D22BBE23C8B575F8B00E0B = GUNDAMZZPT1BD3 (Gundam ZZ PT1 - BD3) | V | 0xA893E81321050EBF8E931948BA221EBC ; MKBv61/FindVUK 0.99 -0xD74157EF31BFC9853038825F6FA20AF210A88A31 = GUNDAMZZPT2BD1 (Gundam ZZ PT2 - BD1) | V | 0x5CEE36C8E6951A50AC2CE56C0C836658 ; MKBv61/FindVUK 0.99 -0x495346D231C1C24933D16F8F53273B7D0873578C = GUNDAMZZPT2BD2 (Gundam ZZ PT2 - BD2) | V | 0x3B2D590E914907807D527CE718BAB25D ; MKBv61/FindVUK 0.99 -0xF95DEEBC5A30100F52E170A86E3C954244EC4993 = GUNDAMZZPT2BD3 (Gundam ZZ PT2 - BD3) | V | 0x07DC74776621023F6D2C7C0E366ECE4E ; MKBv61/FindVUK 0.99 -0x9CEAA6C549B7FBBF3C775934F8D6E7FB3CA21710 = GUNDAM_AGE_01_SPECIAL (機動戦士ガム| V | 0xABD49811BC71216BEA8D5D498682C3C3 ; MKBv30/FindVUK 0.98 -0x226F16D28374DFB78E5AB27EE2F130B7FA341FF7 = GUNDAM_AGE_02_SPECIAL (機動戦士ガム| V | 0x56DBF12261F6FCD4DA26E23892867DDB ; MKBv30/FindVUK 0.98 -0x04105AD9FA4FAECF029603BBE5A9039CB42B74C5 = GUNDAM_AGE_03_SPECIAL (機動戦士ガム| V | 0xB989BB954A898D1EEF6D846B28BEF8F8 ; MKBv30/FindVUK 0.98 -0xEBE16E9180D1A4CBA4E6A088E183E1835231964D = GUNDAM_AGE_04_SPECIAL (機動戦士ガム| V | 0xD98230F04AA24B5D381726126AE1967E ; MKBv30/FindVUK 0.98 -0xFA8973164CC16135F8858CFA1F9648EA40E45D59 = GUNDAM_AGE_05_SPECIAL (機動戦士ガム| V | 0x4935ECA015A28737F337B26961F6CDC6 ; MKBv30/FindVUK 0.98 -0x204E2CE8BCBE5E95DAC2AB72FFBCD6185F7AB77F = GUNDAM_AGE_06_SPECIAL (機動戦士ガンダムAGE　6　豪華版 | V | 0x7E52FB82EC870889DE4176FF83F95F38 ; MKBv31/FindVUK 0.98 -0x5EBE9334AE566085DF1FF1673546AAE475A6D898 = GUNDAM_THE_ORIGIN_1 (MOBILE SUIT GUNDAM | V | 0x1B8410B472824D6B3E1089F3CE006A42 ; MKBv52/FindVUK 0.98 -0xD5C115C6CF953ED4B8694AD54C6DB20F3979DF35 = GUNDAM_THE_ORIGIN_2 (MOBILE SUIT GUNDAM | V | 0x9F1949D0BD5289E6BCE912B80EEBD81A ; MKBv56/FindVUK 0.98 -0xEB311092489C1F47433DB2B79833DC2D29C2E840 = GUNDAM_THE_ORIGIN_3 (MOBILE SUIT GUNDAM | V | 0x012FF70ABBC462A1340872FAF18B2E96 ; MKBv60/FindVUK 0.98 -0xF9089AE40103CFC219F5D4D957370F2AA7454C33 = GUNDAM_THE_ORIGIN_4 (MOBILE SUIT GUNDAM | V | 0x1E20B16070CF4D31F9185C8CF409DA5E ; MKBv62/FindVUK 0.98 -0xBE61A7F7C4A3E754AFF71CF8F3879491A4A7FB28 = GUNSLINGER_GIRL_S1_D1 | V | 0xFFAC36A928D991096CF933E82926AB87 -0xB970B9ED9960EBA94291AD762C357C1A228D5CEE = GUNSLINGER_GIRL_S1_D1 (Gunslinger Girl D | V | 0x738B992574B0F28C6CB7DD2A32D109DB ; MKBv15/FindVUK 1.02 -0x1173EC3BEE51B3AB32F06F72D486DB856B4E2DDD = GUNSLINGER_GIRL_S1_D2 | V | 0x482E8BA14562D7EE5945DD76E57CA194 -0x3A47FB51A5253CEEB36834A75D5971EA52D34732 = GUNSLINGER_GIRL_S1_D2 | V | 0x21DCE024225743CF0558B426A3987890 ; MKBv15/aacskeys 0.4.0e -0x503033270192EEEFF6E69BB810B7FD3FEF2316B4 = GUNSLINGER_GIRL_S1_D2 (Gunslinger Girl D | V | 0x358CF4D16B5068FA2057DA5881129ECA ; MKBv15/FindVUK 1.02 -0x1EE3F1461548A4087EFC9111BB0EE37B609C8049 = GUNSLINGER_GIRL_S2_D1 | V | 0xA891548A13915E01C97B5A6E05A4997E -0x5BE085E417355018D148B18101EE062E8E58AE4E = GUNSLINGER_GIRL_S2_D1 (Gunslinger Girl I | V | 0x8E5DBBBA4EC63BF46EB078276F959D76 ; MKBv15/FindVUK 1.02 -0x345C9CC37898FDC34AE337759DB6BD5055EA5180 = GUNSLINGER_GIRL_S2_D2 | V | 0xCCE7B6EEACC7CE02FE3A2B5673860F5D -0x8CF801BB4C454B1666CB8E90C954B7B92FA6F211 = GUNSLINGER_GIRL_S2_D2 | V | 0x58060BD4B5B2ED0294A190E1B8A49C3D ; MKBv15/aacskeys 0.4.0e -0xF203DB6B4CBA60499BF07B389711620AD55001E3 = GUNSLINGER_GIRL_S2_D2 (Gunslinger Girl I | V | 0x8A02CFD2711C2BD183E82630FBB02A31 ; MKBv15/FindVUK 1.02 -0xB7BB2FD4B1F12A6E9E0732024DD8084E235F381C = GUSTAV_MAHLER_SYMPHONY_NO2 | V | 0xE42E22278D647092CA5172C0431C2368 -0xD16204D65D9271626E6C70F619C0A61928E1EBB1 = GUYS_AND_DOLLS (Guys And Dolls) | V | 0x4782ABE4E75E776DB427F0D36BE4162B ; MKBv31/FindVUK 0.96 -0x7F1658B6F998C5390C679ED346C42EE77DFBFE94 = GWIAZDY_PREHISTORYCZNA_ASTRONO | V | 0xA7A8049770B6FAC2EEF58430CFBAE773 ; MKBv9/FindVUK 1.00 -0xFEFAE2C6151B508330C252ECEC20BB5194AF55AE = HACHIKO | V | 0xF26CC5A82C9921B9D4291A7D739B9281 -0x27543CC787905BF29E62219EF1B17FB81352DF65 = Hacked | V | 0xE241524797AE1DA1A6D276879C0267CF ; MKBv62/FindVUK 1.02 -0x68ED8C4C68F446C51E61A9B2E15AC8D86F22700A = Hacksaw Ridge (Hacksaw Ridge) | V | 0xD4DB143BC37AD1F141A26DF22A261FBF ; MKBv62/FindVUK 1.00 -0x6C5043DDABDE15C94F72E5F66DB673AFF534BBD1 = HAENSEL UND GRETEL | V | 0xFCE7B20DA3448F0B2C453DACF29E30EE -0x7B689999377B1215183E51E8226E9C948F21197B = Haganai_Disc1 (Haganai Disc 1) | V | 0x55084B43A5397136B814C246E2B9B2CA ; MKBv36/FindVUK 0.92 -0x4F2E3361623BC7BA983EEF3B075FC3D007490591 = Haganai_Disc1 (Haganai Disc 1) | V | 0x052D3E056A86388A8FCE3D2290643998 ; MKBv36/FindVUK 0.86.3 -0xE583CAAC4A3D1765460142C87A14F4CBA74D850A = Haganai_Disc2 (Haganai Disc 2) | V | 0x80EDFFC3BC5928F09C6995E0EC371541 ; MKBv36/FindVUK 0.86.3 -0x6A7F7C6F992876A56FA631F311CD932EB8B08991 = HAGANAI_NEXT_D1 (Haganai_NEXT_D1) | V | 0xEAEA07BD0F37290E267E41AF0546DC87 ; MKBv46/FindVUK 0.86.3 -0x0AEC5104CB4239C37D2CCF6B08CE0C3763F27B7C = HAGANAI_NEXT_D1 (Haganai_NEXT_D1) | V | 0x412E4710C78734F27E20272A2AE91FD3 ; MKBv46/FindVUK 1.02 -0x4BD0C7C75C88A0B908005488E29FB1D9CC9E3AF6 = HAGANAI_NEXT_D2 (Haganai_NEXT_D2) | V | 0x8E093A6A033ED2CAA055A832BF134142 ; MKBv46/FindVUK 1.02 -0x56CFDA0253DC897A6B1D06CCCC6E0F86491E90D6 = HAGANAI_NEXT_D2 (Haganai_NEXT_D2) | V | 0xC0F4F95FD050BA02817593B7794FAFA5 ; MKBv46/FindVUK 0.86.3 -0xCC2C2947477F3161EFF2FC8179AE314AA30BE7D2 = HAIBANE_RENMEI_BD_01 | V | 0xCBCDBAC6C3CB69356B2A0A6ADFD15C75 ; MKBv17/FindVUK 0.89 -0xFE631CEDE24E2D16989BCAB85F6ED81DEF1A9857 = HAIBANE_RENMEI_BD_02 | V | 0x3F9EB7AF8C265F1DF5818ACE4675B332 ; MKBv17/FindVUK 0.89 -0x2A90172519DD5D36F03E1BF98918403EEE76D29D = HAIBANE_RENMEI_BD_03 | V | 0xD6CE99FCFB94671C99B0320896BC969B ; MKBv17/FindVUK 0.89 -0x0134BC78E8C3B0CD08EA440F41A5FDE086C26083 = HAIL_CAESAR (Hail, Caesar!) | V | 0xBAC6D62FB2CC1E96AE59FF4C5E8BCC92 ; MKBv56/BEE/FindVUK 0.98 -0x1482EAC480F1D3D32A564BC9289009AA65C647A1 = Hajyt | V | 0xEC9B95D8EC449FAA729365AF113986B6 -0xA727086BF682DF29807A0DA8EB3291BF3CDF66C7 = HAKKENDEN DISC 1 (Hakkenden: Eight Dogs | V | 0x8E9C8E389F00F6D09409B694BD4CB19A ; MKBv51/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0xFD34EF554214EC5A7E513CF6BC3D935BCCBC69E8 = HAKKENDEN DISC 2 (Hakkenden: Eight Dogs | V | 0x47E496574EAD5E4625E608A2B11B6C61 ; MKBv51/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0x4D5A8E20B55DC54E3B72C5424B7A57BF6C4A75E2 = HAKKENDEN SEASON 2 DISC 1 (Hakkenden: Ei | V | 0xE93966371D10FE4FCAACE9DF693AC4E7 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0x989A40B492430FE26EAE7D85B8DD2BD3402453D2 = HAKKENDEN SEASON 2 DISC 2 (Hakkenden: Ei | V | 0x3303D83DA4135475018C37671BB4F7E3 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0xADB750411B0D9A588D94795DD8AFED734DD4AA98 = HALAS_AND_BATCHELOR_HERITAGE | V | 0x72F9393551C08B10800421499D3CB120 ; MKBv53/FindVUK 0.80 -0xD035DDAEF4C8D4A725571583DAA264FD5DBEF68E = HALF_PAST_DEAD | V | 0xCD89A00EC66605CE0E18B566AFDD5677 -0xCAF74B518E23FD54BC205F6BB4973AE2ABA2AB32 = Halloween (UK) | V | 0x4E094D679F0C3EC672728D22AD74E261 -0xFCC9CDBA3C80BBAA78D7C4BEEFFF2C206BE56D8A = Halloween II(2009) Unrated Director sCut | V | 0x4B6B380D3BE0CB400C509D0B984E1035 -0x363423A0A0D302DD392A086A7389508328652F69 = HALLOWEEN2 | V | 0x451FB98DA02928C750AD0F2F4B523EE6 -0x4F503A3B4657BDC89A0398EC265F5EE392A321A7 = HALLOWEEN_2 | V | 0xAEB2A2ACAAA68F3B3E4A546DDEE8184B -0x2E352C853121850B71E1F6A047E7B802946E5078 = HALLOWEEN_35TH_ANNIVERSARY (Halloween 35 | V | 0xB296BC155AFEFE1AE3DA5C57A43EBA5C ; MKBv40/FindVUK 1.00 -0x34ACD9864E2A64CA261731DD85A1A41BB774C689 = HALLOWEEN_D1 | V | 0x7B6D934E79AA11C50F4626B601581DFE -0x77D9056C9019B6E39CAB400D396F2452E2EDC2E8 = HALLOWEEN_D1 | V | 0x5666EA4DC4693D350A03DDC223CDA4C9 -0x975C23486197F124E5252AE0C2F63A0637631D75 = HALLOWEEN_II | V | 0x6395FB68D6DFABF83169D786F14E8574 -0xF96E38FBEC4D75D67006008361A5F5E0D80A2882 = HALL_PASS (Hall Pass) | V | 0xE6DCA756EF23B3EABFBFA0ADF1C2B7EF ; MKBv19/FindVUK 1.00 -0x9C4DAE75A77AB13901AA2741F7E6897126D2145B = HALL_PASS (Hall Pass) | V | 0xA11515DE2D96BBA6825579CBC4B264FD ; MKBv19/FindVUK 1.02 -0xBC52210BB39B9AF300E7EECA2B1D130CD5DBAE07 = HALO 4 - FORWARD UNTO DAWN (HALO 4 - FOR | V | 0x5CB814295DE072FF5CC97CAC6E2EDE20 ; MKBv40/FindVUK 1.00 -0x9B9172D76A678DBB2EE36DB390F6F8EF00BFAD10 = Halo The Fall of Reach (Halo: The Fall o | V | 0x56388AC6533AA188D8AC3732E485D138 ; MKBv57/BEE/FindVUK 1.00 -0x73C5DA888C834949958B512330AEA286D3A2B9FD = Halo: Nightfall (Halo: Nightfall) | V | 0x148589A738B5A358491B78698A4E07BE ; MKBv51/FindVUK 1.00 -0x92202EEAA3EC1F3A8FE164C04389376C4CFC29B7 = HALO_LEGENDS | V | 0xBA2DB9FBC1AF86AA5CC5ED1C5CD9DE01 -0x750A1DC2061153D200ECC3D49BB7ABFC13F96E2E = HALO_LEGENDS | V | 0x726967F7732D6F1EAA69ED7B231F60FD -0x35598FF29090202987B4879374185D5109F7820A = HALS_UND_BEINBRUCH_BD | V | 0x48838CC3F43065F5D92A05725C3688A6 -0xC6E13E775D30455949F4F5F6E1CF8F277E257B0B = Halt auf freier Strecke (Halt auf freier | V | 0xC6988BF05DF23C666D6D72AD876A674F ; MKBv33/FindVUK 1.00 -0xB3684885BD917BBC00909CFFD271ED2E242BA6E6 = HAMLET (Hamlet) | V | 0x7C85C2717F97EDC7EADEF41BCB2CF641 ; MKBv17/FindVUK 1.00 -0xF6E26D4FE443798FA2909E732B33CC28870D7F00 = HAMLET (Hamlet) | V | 0x28BA41F68574BD7E424BDD3500DE8B3E ; MKBv17/FindVUK 0.96 -0xB7CD28F0980D39E3CF548C84AA098EEC8A3F1795 = Hana-Bi | V | 0x30BF8C3C767238A86B2D9EDA0133EF56 -0xED9CF4BE07451CD7E50EA64A7FAA2F8FA42C0B0C = HANAMONOGATARI (Hanamonogatari - Blu-ray | V | 0xF295AB20E83F3BDCD5E254EB0BE41F9D ; MKBv57/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0xE5EDD8D3270E6AB6FB54CD696CA2647547FA111B = HANA_YORI_DANGO_VOL1 | V | 0xD1AEB12B4FF4EB63AA903554FFAA2B17 -0xD3344F0AC57B47CF83C00F6B928578DB7731BC48 = Hancock | V | 0x6A1C19A416424838B1973D2C2C25CDFB -0xBBF37D288024568CDFFD9D240CEDDB882799B292 = HANCOCK | V | 0x24E97BDDF6722575F1179EC0430203D4 ; mkb v9 -0x4185CF6397B0BFDEF1B5B66F15FD3DA4D2AD4366 = HANCOCK | V | 0x2B831BE8DD34EE44F2F8046ADFF2BB8F -0x0779C8B1B372CB555D1B949C2DADB850E7480AA1 = HANCOCK | V | 0xCD7B2810D4C8313CBDFFDFC3D8092991 -0xE2069F6EF42CD6CDCD9055CA95AF30A4685CFC57 = HANCOCK (Hancock - Blu-rayâ„¢) | V | 0xFDCC26E317747794ED974EE4B844BEE8 ; MKBv9/FindVUK 1.00 -0xEF18D8B48916B559415423D038FDBFA7E5936699 = HANCOCK (Hancock - Blu-rayâ„¢) | V | 0xFB97B19483082C06D52AC1A26B782232 ; MKBv31/FindVUK 1.00 -0x358B99E382B0FA7AAEB2E45246AB96CD6803E961 = Hancock - Unrated Edition (US) | V | 0xB3342CDF32CF21B2A674AD47B79E9FDD -0x7021208A63C6A0A6DA65ED584394D880A17D350F = HANDVOLL_DOLLAR (F??r eine Handvoll Doll | V | 0xDCC343241385951E21656418C80ADDCD ; MKBv37/FindVUK 0.84 -0x0FDF2382CE75B90C37F1828C6D836D05A99F7633 = HANNA (DE) | V | 0xC8CB4AECCE74CC32E41E8A6293D2AEF4 -0x8A898398A2EC46EE696DECE6F6A7CD3EEA7E728C = HANNA_DOM (Hanna) | V | 0x88D1F74F8E7C855411CBE6A34DCB2FE2 ; MKBv25/FindVUK 0.95 -0xC1BA57B16B9CBEA59AADF85BC8B3F210418FEBDF = HANNA_DOM (Hanna) | V | 0x7C3E66D905723D68D32F48CD0AD2D19B ; MKBv25/FindVUK 0.99 -0xE2D1E65A1DBD4AF351E5D1D2FCAF75E377B046DA = HANNIBAL | V | 0xFCE77A112799D32D750271683940D822 -0x716D0FA3893C7383B79C035905E57F63F37F5F7C = HANNIBAL_BD (Hannibal) | V | 0x98DC6ECF262CF8A7C346F56813690C74 ; MKBv9/FindVUK 0.92 -0xBF76544E5AE77D68FD07839EED56087EE8E5812F = HANNIBAL_G51 (Hannibal) | V | 0x4B3869EAE12B1A9D48D83D6DB3A5CC4F ; MKBv12/FindVUK 0.98 -0x19A54D911421EC9A250C3B3352F9E311C81FA600 = HANNIBAL_NORDISK_11597 | V | 0xC994B6141CD986D6D89E2DDC740A93D7 ; MKBv4/FindVUK 0.98 -0xE0C32044EBBB64249C89107B3010FF0BF202108F = HANNIBAL_RISING | V | 0xE7B985F904314974AF0440777DF50700 ; MKBv6/FindVUK 0.96 -0xE4A75B3BAC78626F32CAEBE67F0C72E1F30DC9FC = HANNIBAL_S1_D1 (Hannibal, Season 1 Disc | V | 0x72DEDE507C82D073452959671E8A3E2D ; MKBv34/FindVUK 0.96 -0x22112826B9FA4C86284AED86459EDBCDC41E895F = HANNIBAL_S1_D2 (Hannibal, Season 1 Disc | V | 0xE1A53C1E6C3933328D4D61682946F5F9 ; MKBv34/FindVUK 0.96 -0xC918E23900DF5DD37BE3DBAA59598BC3F2B636EB = HANNIBAL_S1_D3 (Hannibal, Season 1 Disc | V | 0x54ABC154D81305434A53C548EEB4132F ; MKBv34/FindVUK 0.96 -0x564022C61DB48D17065F5D3822F67993389DA5EC = HANNIBAL_S2B1 (Hannibal ST02/BD1) | V | 0xDC97740BA7471272C0D51FF2F0E0F7E8 ; MKBv49/FindVUK 1.02 -0xF4B6792158EDC7CAD43F7F240F6E8502297B3065 = HANNIBAL_S2B2 (Hannibal ST02/BD2) | V | 0xCC64A370C2B92AE3D0C42FCB8D42FE88 ; MKBv49/FindVUK 1.02 -0x5FE45D1722B42503C47DED7F142401E0AB1E7E89 = HANNIBAL_S2B3 (Hannibal ST02/BD3) | V | 0x46BFD3DCC739FB8044B043D112907ADE ; MKBv49/FindVUK 1.02 -0x88441E20799FC4C1A70D8FE15C57DA1BEC3F100F = HANNIBAL_S2_D1 (Hannibal Season 2, Disc | V | 0xD5858CFAC8FC6E7C69484B020274FADD ; MKBv43/BEE/VUKNOTVAL!/FindVUK 0.96 -0x39495927ECF7FF37E12B2F590B444A84CF6453DA = HANNIBAL_S2_D2 (Hannibal Season 2, Disc | V | 0x934B0567805A8C973DB00FFC84E5BEDF ; MKBv43/BEE/VUKNOTVAL!/FindVUK 0.96 -0x0B44CD59C86B015F23B1E0B5AE2F82E1D93F0E4E = HANNIBAL_S2_D3 (Hannibal Season 2, Disc | V | 0x8A043ABD2566106AE7345E1750F19A5F ; MKBv43/BEE/VUKNOTVAL!/FindVUK 0.96 -0xB31366AFEA2C9AB210B19A531D9BB4A37771D687 = HANNIBAL_ST01BD1 (HANNIBAL - PRODUCER´S | V | 0x50E3EA4D7C774CDC2B786AF83047064B ; MKBv57/FindVUK 1.02 -0xB8024A183FA7CE11C8E379D3EB5C9ACB16F74CC4 = HANNIBAL_ST01BD2 (HANNIBAL - PRODUCER´S | V | 0x4280D08BFD0A1B7E47FDCC1BB94C301C ; MKBv57/FindVUK 1.02 -0xC7A2EA419349F23D9B47BA1F5B5FA4AB3378B109 = HANNIBAL_ST01BD3 (HANNIBAL - PRODUCER´S | V | 0x67C97D4D14AE1B374A7CDA3CEF2B5EDB ; MKBv57/FindVUK 1.02 -0xBB0F19FA48DE53783136CDF8F06B00EC872FE7C0 = HANNIBAL_ST03BD1 (Hannibal ST03 BD1) | V | 0x1B1D6150B36A779117339D561F903785 ; MKBv57/FindVUK 1.02 -0x79749AA28FA77E72792FA598BCDCF4080F818B1D = HANNIBAL_ST03BD2 (Hannibal ST03 BD2) | V | 0x3C3A8B301D4EDC378D0AE87FD7B83624 ; MKBv57/FindVUK 1.02 -0xC25B704625541CF62BD0199C3A33FBF44B6FBD15 = HANNIBAL_ST03BD3 (Hannibal ST03 BD3) | V | 0xA5BB04075013278B5437EE0A9E7430EE ; MKBv57/FindVUK 1.02 -0xB1F84234F9B076841E4E7D993CAC7B677695D836 = HANSEL AND GRETEL | V | 0x5ECAF30EA786D5E84511226073F7ACE6 -0xA9834A8D28EB480A1363112C1BEA6B229C6E62F1 = Hansel_and_Gretel (Hansel and Gretel Wit | V | 0xB09AFAB8DBCC91E6F40F917A6267B8BD ; MKBv31/FindVUK 1.00 -0x9C2A7842DF99F5293E4EBC83966BE2844442E86F = Hansel_and_Gretel (Hansel and Gretel Wit | V | 0xF2A48E003CC436FE10F9A0D6C5C54F69 ; MKBv31/FindVUK 1.00 -0x2CFEDB2ACFB4CB55BDD90E3BC273B6BB5EACCE47 = Hansel_Gretel_Witch_Hunters | V | 0x5FAB6848A41BEF4BAA59D2EFD953EA23 ; MKBrev 36 - FindVUK 0.57 -0xF8720CE5E9059F8C27FA9B6DB43291FEAE47D6BF = Happening | V | 0xD3FF9CCC71EEBED6DB1A8CD69E139E97 ; MKBrev 46 - FindVUK 0.54 -0x426E1C851D67DB63FD3E66F2CA73A0673ADC7AAC = HAPPENING_F2 | V | 0x009623BD1BEFFEF2597B80E2215E4D23 -0xCBB3A299492BC0EB2804C0231AF812911A7A0CD2 = HAPPENING_F2 | V | 0xC1B3B95C45E88C0C71E590631A346A3A -0xE34493348B7E03316C18D05C46E899558335D26C = HAPPENING_F4 | V | 0x64B93EB1DBCC860E44C119CEE3DEB4BA ; mkb v9 BD+ -0xFC318C7783F6EB1E9498CB7B2CB2F0E7C7FE1E8C = HAPPY FEET | V | 0x425770A56DB4AF2D6D33231C39593253 ; MKBv3/FindVUK 0.96 -0xAD2965B56B724AFD2490F81A28D829AC2FEB1BB6 = HAPPY FEET 2 (Happy Feet 2) | V | 0x76611B70AD2C17934191F7D53DF211D2 ; MKBv27/FindVUK 0.96 -0x63DDA2F79D3693274A398CFF50F119EEB4C406E2 = HAPPY_FEET_2 | V | 0x5004B95EE02BB2C2C8FBDCE747D12367 ; MKBrev 20 - FindVUK 0.53 -0x1B1C5853111ED1550E257463BE0765D46440F3ED = HAPPY_HAPPY_BD (Happy, Happy - Blu-ray?? | V | 0xB0A5F0C2318F3AA9CD3E3EA77BB7F485 ; MKBv26/FindVUK 0.96 -0x2B1F0555F8F5AD6577A0A2BCDE68F387B1BA4A11 = HARAKIRI (HARAKIRI) | V | 0x55553F6874116A863BB47E75DFB50699 ; MKBv21/BEE/VUKNOTVAL!/FindVUK 0.98 -0x202B70EB5A571BB86D89A70CD1C5A930D031993C = HARD TO KILL (Hard To Kill) | V | 0x0F0AF382D6D177665DA762229F84641D ; MKBv28/FindVUK 1.00 -0x63EB4A0D1198E0613DFCCF5DCC15CE519F129C76 = HARDCOREHENRY_NA ( ) | V | 0x3AB2E737DCAF86F73016734B1E2D77F9 ; MKBv57/FindVUK 0.98 -0x77D3B89F6B7300FBF07AE13A74FDFC3E31D0CBB2 = Hardware | V | 0x2583C56875192180F94CC1FA94ED6A26 -0xF29937A76C997A9B77A99779BA6440A3BADE7AF2 = HARD_CANDY | V | 0x5BE0E0CFEE244F4A25CE1BE155318971 -0x941A04F74D8D3BE42D3127CAE2565961CCB5BC64 = HARD_DAYS_NIGHT | V | 0x49AB172D2BB93528C21C29C32C552F85 -0x519AB92684F98BBBE27DDA5279700866523FB440 = HARJUNPAA JA PAHAN PAPPI | V | 0x1F43E4C04E58462C7BCA52A621B3CF0E -0xBB620BC7AECA558C900FC28EDADA171DB2CAC8E2 = Harold and Kumar Escape from Guantanamo | V | 0x52F1B5BD6905FE96ED0853571C79CC3F -0xF968B86BE48D8206E1CB750B5A9B63E656E4A699 = HAROLDANDMAUDE (HAROLD and MAUDE) | V | 0x8965C98932D639CDE5C54E510CAE0558 ; MKBv30/FindVUK 0.99 -0x9078DCB0B7CBDC763EE4F5B78957818D16C45581 = HAROLD_KUMAR | V | 0x6DB567A110BE4AF1354EF807185A6C2E -0xFEB05C2C03D4C9A3FBA8586CA26D946C2AA7F758 = HAROLD_KUMAR (Harold and Kumar Go To Whi | V | 0xEE12B43129E0BF314B30DE85E2E9E0DE ; MKBv7/FindVUK 0.96 -0x96E92F324909B0234AF9225E9DE6B0C8FB709AB2 = HARRY BROWN | V | 0x73C4AD5F3B9ABD24949765082D3DB770 -0xA9D691F69604FE5F3850440A756FBE00FC1450FE = HARRY BROWN | V | 0x6AB06CB9256D17ADBBE73495A08DEBC3 ; MKBv17/FindVUK 1.00 -0x1E3090EA672574E8B8C995E944B047AB5161301E = Harry Brown | V | 0x50AFDDF6474C17130B35A90F02367FB5 -0xD37F6967BB50A8F0F84667ADAB383B394D902CE2 = Harry Potter 1 | V | 0x9BB485F2CAA8645A74526E10209DAB40 ; MKBv4/FindVUK 0.92 -0xA06691401321496281C86FB570298C7A979AB419 = HARRY POTTER 3 | V | 0x6749EF2A7A33163D63EA4B96BD139FCE -0xBD22C80DBFF1D6980C463048E82B57D834FE3F31 = HARRY POTTER 4 | V | 0xDA0F39FAD44F4D5EBCB7AF30B073EF5D -0x9947C2C2C6BA4FB632046A1DF6E3D089CE872C56 = HARRY POTTER 5 | V | 0x5F1A6F18672D6EE61613508516D81F8F -0x691917D1323417AE1BB72BEAD92ECD4C5A53F75B = HARRY POTTER 6.1 | V | 0xF62D12B126B89CFD5E4198F276375543 -0x3FE17D026609E37ED09EEC55AA8625B5F90B0DC0 = HARRY POTTER 6.2 | V | 0x89305F5E9C69B752A3E705CA535A3765 -0xA6AB88815BA2FFD4877F2E86756BC960ADC19E72 = Harry Potter and the Chamber of Secrets | V | 0xC67C0612191BC8728872A649FCA6DBEB -0x7BA3D870CC2E19D7C2AC83F9921642EC3345970E = Harry Potter and the Chamber of Secrets | V | 0x8F966F224C059674EEE280F789A5E25A -0x06F40874EF79ED320472DB52999401B4C30AEAF9 = Harry Potter and the Deathly Hallows p1 | V | 0x033CF18AF932FA7DD5AEA3ABE1D64B8A -0xA37ACB2D6DC83A79F4847FCA9D0E8BFCD68D8A7B = Harry Potter and the Deathly Hallows p1 | V | 0xB5F62334785CB4BBBFE57D2601C9690C -0x377FC96B4459CF7EC9BA2EE4B9B4D3AA531C5E78 = Harry Potter and the Deathly Hallows p2 | V | 0x94056A0D23D7E7CF678A7C3C26D0F34F -0xED36A23BCF54609F916302A55CDE2999A324794F = Harry Potter and the Deathly Hallows p2 | V | 0x67B7F258D3D43ACA04DCDDFD4EC25690 -0xF7415D67C1544A9392091FBC171D61EAAE2E91F6 = Harry Potter and the Deathly Hallows Par | V | 0xACE6BF8C44E74C2322F35395E1E383B5 -0xE64E4AF5D4F47365F5A40E3797009594E7B32D85 = Harry Potter and the Goblet of Fire | V | 0xBF9BF76A4A0BE9ACF4BE142776AE6211 -0x7197CDCFFC9248F5B196305A4A9D8F8D5033BEF9 = Harry Potter and the Half Blood Prince ( | V | 0xD05EAB3D8B8E2434E9D437EB540A02DF ; mkbv1 -0x179E2C7791BCAD877221B32A105BAB78AD783F71 = Harry Potter and the Half-Blood Prince ( | V | 0x26AFEF96CC678F606B1D5838A4B81BA7 -0x42F9014BE44C9950D0689523B186DC6F68CF26E0 = Harry Potter and the Half-Blood Prince d | V | 0x9A519C0DB416B2B45EDC5125B19CB6EE -0x552D81D782C5993C8F26073111B5964FFFDA3BF3 = Harry Potter and the Half-Blood Prince d | V | 0x2F8A1C4396D9BF6D4139430ACC75D81A -0xCD31E2D10BACD08686CBB4E9C6BE6CB990E95F04 = Harry Potter and the Order of the Phoeni | V | 0x3DBACA3B5CA83DDEEA62F97A538074C3 -0xFA75145676D5CB809E5F6B041CBDD991E5B5EEED = Harry Potter and the Philosopher's Stone | V | 0xBEE8AD960E9AA443A1EC4BFD9F279B8B ; mkbv4 -0x50D6641CFE33F4136C2116F600EEAFBBF59EB2D0 = HArry Potter and The Prisoner of Azkaban | V | 0xD39F0EE71225F0D2B1C01BE78834DE5B -0x4F855C7F0703B786D18B8016DAD416F8C12EE9F5 = Harry Potter and the Prisoner of Azkaban | V | 0x2B587C645968C2CFC112054F32C63C6E -0x393C749D2329ADC374B53228B4727CE2FBE50587 = Harry Potter and the Sorcerer's Stone | V | 0xF5410E01ECBFAD5F0B2C27E5351F90A6 -0x91E492D81210CACAFAFB248D6DCA5F246A4B0ABF = Harry Potter et les reliques de la mort | V | 0x5A3DB5C2D12344801A860F1B3D7412BA -0x12E06E7CB31EF3267DBCD12A40CE27F646CF170B = Harry Potter Goblet Of Fire (2005) BD | V | 0x45ACE6482E2A81C8E63F5D42FC9C6A3B -0x00DFA3D0C898423A13C5AF1721976B30BC068BD6 = HARRYPOTTER3 | V | 0x5D1DA49209E13D2B9A4C3CCD96A6E993 ; MKBv4/FindVUK 0.96 -0xA0AA1B8998CD4A8218DC096BDEC3FADDDF4D5F12 = HARRYPOTTER3 | V | 0x085CCC8116ABEF11C2972B0B9E2799E0 ; MKBv4/FindVUK 0.99 -0xCC75DEAB5AA51F21B600C67D5D0FCCC4158F5CF2 = HARRYPOTTER3 | V | 0x0509C213A3EE43F3F7C1795B30654E87 ; MKBv4/FindVUK 0.99 -0x236B1A5F1B4E62F4E8A746D2C0FE7A9DE49C805C = HARRYPOTTER3 | V | 0xCF6EDFBD15D9934854B917395DC25B0E -0x2EAE91395B39F701D160027F3CB3FFCF37D39557 = HARRYPOTTER3 | V | 0xFF1D638B465C202BD747C3946041FED3 -0x5CE3F78DCB4AD6A54816705344CFC8D9B8C83BF7 = HARRYPOTTER3 | V | 0x860C986453227880D6F468E08C89F0ED ; MKBv4/FindVUK 1.02 -0xA451785A18ACF2619746F662231254AE4B872A9A = HARRYPOTTER3 | V | 0x8E391D59998516C9D61696D965C782F5 ; MKBv4/FindVUK 0.96 -0x1C87B2F329826E6E94B16E847CB0FFCE161286C1 = HARRYPOTTER3 [Harry Potter and the Priso | V | 0x249E0C8DB5EB012923ECDB4697B7AF1B ; MKBv4/FindVUK 0.84 -0x095209588CDBC693C747D12F34BAC79C1C70E4A3 = HARRY_BROWN | V | 0x9490DFF17635974803E58F18A0A84EE9 ; mkbv18 -0xECCE102CA6119529CBEADAF2129F21AB5E8582F4 = HARRY_BROWN (Harry Brown) | V | 0x42FFF1CFBA191E40285FA38A487C2480 ; MKBv18/BEE/FindVUK 1.00 -0x395F8D73BC913B2C4B059901BB12E5A3DC76F759 = HARRY_POTTER | V | 0x21F9751E210A584ACEE6F679CA483837 ; MKBv4/FindVUK 1.02 -0x7A3729BB421741427B6B7D81921F5A18E0A8CACF = HARRY_POTTER | V | 0x9BB097557064C9EF2FC587B9A2F36D3D -0x67A7C3DD50D2E7C48EFBECBFE004793661CD6A8C = HARRY_POTTER | V | 0xD570C5749C29080CCC4F0900EE3D4565 ; MKBv4/FindVUK 0.99 -0xBEC0F58D0A713295587C60E5E8D092C5C4B625B1 = HARRY_POTTER | V | 0x1599A2CBDE05DA896B648C6A2B83DC0D -0x5E92C200DC1BE922D9D85F6AF99B1C30BD54AB10 = HARRY_POTTER1 | V | 0xF5965A472DB7516F2E359BE0F6F5F07B -0xEE9EAD414CBEC4A64FFD738854855E948E88CF2B = HARRY_POTTER_2 | V | 0x29FBD07A1CB76416897293230B81F78B ; MKBv4/FindVUK 0.99 -0x1E31BFEADC27422D29D991CD9CD8A19FA43C3EF7 = HARRY_POTTER_2 | V | 0xBAD9056A55255AAF145709617015C84B ; MKBv4/FindVUK 1.02 -0xA9AFD6F2519C0FB9FC146048047B8758D5A47DB1 = HARRY_POTTER_2 | V | 0xFD2496A6DD56EF2F72A00C3EF507392C ; MKBv4/FindVUK 0.96 -0x77076C02D23CD964AF9FC9246B4BEC7333586107 = HARRY_POTTER_2 | V | 0xE9938C17D7B7ABDF55CF7D0444DB6C84 -0x6DEA102B1090969FBACEF6F24DF19D3974032184 = HARRY_POTTER_2_BONUS (Harry Potter And T | V | 0x968A4C751F87E6A550AA9848ED8E1CDB ; MKBv14/FindVUK 0.96 -0xA7B3A4D3BE929A7007498A7542CD6D46814B7ADA = HARRY_POTTER_2_BONUS (Harry Potter and t | V | 0x4842F63C3D40575A74DEAD759D30BA70 ; MKBv15/FindVUK 1.00 -0x0D4DD9E65925063B995BC976C32D3C695F7ABFA3 = HARRY_POTTER_4 (Harry Potter and the Gob | V | 0x557DCDEBA36DE0CBBBF8F3E7C128F538 ; MKBv19/FindVUK 1.00 -0xB7D5C7A2D14CD3ED6456036B688D7E505D8DE102 = HARRY_POTTER_4 (Harry Potter and the Gob | V | 0xF587F01B90AD31468B7FF447EF488BC5 ; MKBv19/FindVUK 0.96 -0xCDDAC4BC29BB638A687BB95381F701872FB19FA8 = HARRY_POTTER_4_UE (Harry Potter and the | V | 0x72F2E979CD0F38109875F436FE545847 ; MKBv19/FindVUK 0.96 -0x8276D06EA60A1394A5557F477FB56D68E2710841 = HARRY_POTTER_5_UCE (HARRY POTTER AND THE | V | 0x1D6DE1C09178073CE9B69078EA7A52AA ; MKBv19/FindVUK 0.96 -0xF802F3D4E545FB7BF96213D57DF4535447E6A817 = HARRY_POTTER_5_UCE_BONUS_DISC (HARRY POT | V | 0x9588CDE53F9B10C18FC697ABA00B2FCD ; MKBv19/FindVUK 0.96 -0xAB687D58528C22664EC6E163C84AA0E1782EB032 = HARRY_POTTER_5_UCE_BONUS_DISC (HARRY POT | V | 0x3D4F70943303F5F4A5A26C8C308DCB8F ; MKBv19/FindVUK 1.00 -0x9DFD8C422CC5E2851A0BF390402076F92616D55E = HARRY_POTTER_6 | V | 0xBD58B39F05F6CB37AB363A6B2AAF4590 -0x75D870CAA40AB9F1AAEFC15DDABB9C419360A3E9 = HARRY_POTTER_6 | V | 0xDEA2DDD8AC155BA0930C4CA213B610C2 -0xAEA11E8CE36492FD006678C7E22EC3844840AC8F = HARRY_POTTER_6 | V | 0x404BF1B6F3510DC673E864A71973E9EB -0x1FD5EFCD6D6DF7C2002FEDA6825265FD52114265 = HARRY_POTTER_6 (Harry Potter and the Hal | V | 0x4BD6E0DFBACFC94D25828165B34CCE87 ; MKBv16/FindVUK 0.96 -0x8F87D176EB08E0E0015E7AA52F3EA9A509A0DCA1 = HARRY_POTTER_6 (Harry Potter and the Hal | V | 0x540BB661B8D4CAF62BE6F92C1F2B31AE ; MKBv16/FindVUK 0.96 -0x666B7CFD42953AB9B89001F6F780E81919EAABD9 = HARRY_POTTER_6 (Harry Potter and the Hal | V | 0xF53F1BBB23320F1EF12376759CA6F728 ; MKBv14/FindVUK 0.99 -0xEDB626F3AFC50CA05F71C6E92F4B6F961AED8D30 = HARRY_POTTER_6 (Harry Potter and the Hal | V | 0x06A3B87D9E2C1650C431990ADFAC9066 ; MKBv16/FindVUK 0.84 -0x5A219E2F19C00DAFC113CE23974BBA1DF412D3A7 = HARRY_POTTER_6 (Harry Potter and the Hal | V | 0x3793BD5128A36E80DF73E449BDB985F9 ; MKBv16/FindVUK 1.00 -0xC0FEEB18FA7B66636CBD2ABA1B483C530342756D = HARRY_POTTER_6 (Harry Potter and the Hal | V | 0xA99699FCF635F25C3E7E2A74F5044014 ; MKBv15/FindVUK 0.96 -0xA13EDEA323F5E8269E01DA92C7D131C49A089AB5 = HARRY_POTTER_6 (Harry Potter and the Hal | V | 0xF36093D408D5884BC0DD7CBAEF1A513F ; MKBv16/FindVUK 0.99 -0x70C059FE4E39DD5E6AA65F0F5DD7CC24300D2224 = HARRY_POTTER_6 (Harry Potter and the Hal | V | 0x152BB47B9536FA6C651DEDBF40A78F5C ; MKBv16/FindVUK 0.96 -0xC16E7F32B23EE65F98571EAD6CAB9F111C371CF5 = HARRY_POTTER_6 (Harry Potter and the Hal | V | 0x0DE044417F67726AA5396DF90E907475 ; MKBv14/FindVUK 1.02 -0x1C49D2E18860E9725CCB63A47D557606A17C6828 = HARRY_POTTER_6_DISC2 | V | 0x1CD252D48CF0662D1F18A4247F951235 -0x8A4CB984DE2F4FD9806682FF4C29F857128DE51A = HARRY_POTTER_6_DISC2 | V | 0x631E3685FB50512044B32FDD7A3E062D ; MKBv16/FindVUK 0.72 -0x3DCC0BD43C7A9D940D263AF0E1789AF0D4766086 = HARRY_POTTER_6_DISC2 (Harry Potter and t | V | 0x04269291F6F8CBD71233C330EC6F97F3 ; MKBv16/FindVUK 0.96 -0x358B58BFC964946321AF229BCAF062FD9E057F4E = HARRY_POTTER_6_DISC2 (Harry Potter and t | V | 0xA542AD36E9FBC22D91B43CE2F09C7E75 ; MKBv15/FindVUK 0.99 -0xFA81AA6B45E12EB6ADCA1486ECF529AF2CBBA86C = HARRY_POTTER_6_DISC2 (Harry Potter and t | V | 0x7EDAD85FA14241F032FCDF6D45036A2F ; MKBv16/FindVUK 1.00 -0x15FBEB36D8EEB75D901B248D550B68901E74F955 = HARRY_POTTER_6_UCE (Harry Potter and the | V | 0x819520FFF3F374F6A2E33DD3AA802DEA ; MKBv19/FindVUK 1.00 -0xE6F26AC6599D4F2DA4F8FB33DAA2170E880BEFD9 = HARRY_POTTER_6_UCE (Harry Potter and the | V | 0x8F50FB03C4E71AA45B8EA683A5D2E7C8 ; MKBv19/FindVUK 0.96 -0xFAD6892CB8D25E038B0C369DC5CD5071C9FF0105 = HARRY_POTTER_6_UCE (Harry Potter and the | V | 0x858F61CA6D78CE97C2C5DC6385D721D5 ; MKBv19/FindVUK 0.96 -0x82BB443E18BD1B606D61734107D6A7FC81AB3AC9 = HARRY_POTTER_6_UCE (Harry Potter and the | V | 0xDD365783B628ACED81A81B0F3704914A ; MKBv19/FindVUK 1.00 -0x290707CFAE5F53086EB87CFA72AD9A4A014C4518 = HARRY_POTTER_7A (Harry Potter and the De | V | 0xB727BA21CE1DB91C42EF50FA23632267 ; MKBv23/FindVUK 0.98 -0xA1571DA929FF216023CFB38AD3873F5675FC6F24 = HARRY_POTTER_7A (Harry Potter and the De | V | 0x6CB531E6B8229D0FAD8C5F675660E90C ; MKBv23/FindVUK 0.96 -0xB0076D9233677E8FB8A062419497E34694C63052 = HARRY_POTTER_7_PART_1 | V | 0xF986AA67CF9A82A0D8D1555BCCC9C38A ; MKBv19/FindVUK 0.72 -0x41F05EF6F64B1E711543225FA2769E15BFEFF1AA = HARRY_POTTER_7_PART_1 (Harry Potter and | V | 0xBFC3C910E2E4A608C47C34EED65951BC ; MKBv19/FindVUK 0.96 -0x68A64723CBE0D85628E6492600809CFFCBDD23A7 = HARRY_POTTER_7_PART_1 (Harry Potter and | V | 0x73560BB6E7B9D56323A2ED7C9B4CA886 ; MKBv19/FindVUK 0.96 -0xC186619602321D8FA7CE5CD24349CD17B4C9F243 = HARRY_POTTER_7_PART_1 (Harry Potter and | V | 0x9602FCE1B3BB7D5CD2DE60C0DAB11DA6 ; MKBv19/FindVUK 1.00 -0x941A56865C32882482589069713F7A3F12032C41 = HARRY_POTTER_7_PART_1 (Harry Potter and | V | 0xCFB1A4775788F1F2FAF888A5BFA9DA05 ; MKBv19/FindVUK 0.96 -0xA659DA801D0D94FAF7242598E95021A60DECA69F = HARRY_POTTER_7_PART_1 (Harry Potter and | V | 0xD28D5FD605A40FE9ED5DAB7BFDC9D378 ; MKBv19/FindVUK 1.02 -0x0D7D3257217ADE7D0F60D4B9953B8BEF096EE92C = HARRY_POTTER_7_PART_1 (Harry Potter and | V | 0xDD8D3E4CA2F0D8F60BD2E358748BD047 ; MKBv19/FindVUK 0.98 -0x9DBC07FD553D436A0512DBE362BE22EBA7961099 = HARRY_POTTER_7_PART_1 (Harry Potter and | V | 0x0C1C4F071E7AB161F2C7EDFF11425B89 ; MKBv19/FindVUK 0.96 -0x63DD838F15732C088D754A24A7E302ED0665BE16 = HARRY_POTTER_7_PART_1 (Harry Potter and | V | 0x3F3754AC9A57CC47DCC38A38E8CD8143 ; MKBv19/FindVUK 0.92 -0x4AA881C8F84035F209842FDB7116858BDEB77C62 = HARRY_POTTER_7_PART_1 (Harry Potter and | V | 0xEB3871CAB87E0F79E57AE51701134158 ; MKBv19/FindVUK 0.99 -0xDA05385FDD70D5C896B714F368858BC4F6906A4D = HARRY_POTTER_7_PART_1 (Harry Potter and | V | 0x0BC18D64EF891253ABE368D0B54851B0 ; MKBv19/FindVUK 0.99 -0xC07A163619C839AAE1E9E8B77A74C00CE909B77F = HARRY_POTTER_7_PART_1 (Harry Potter and | V | 0xC6E35D1D51B6186F2C448861652298B8 ; MKBv19/FindVUK 0.99 -0x45919132381D4905C69A8E0F8AE13D0B8E5E1C86 = HARRY_POTTER_7_PART_2 | V | 0xBB34841DE16E407F514C4E08E52C3E7A ; MKBrev 25 - FindVUK 0.51 -0x7E0A0CF86085DBC2015A3B9B7110BACE90274DC0 = HARRY_POTTER_7_PART_2 | V | 0xAB4CDC752610E7F36CB24C66B9A806E9 -0x1EF81AE22FA9D72B748F10D76618E8E9C653CF72 = HARRY_POTTER_7_PART_2 (Harry Potter and | V | 0x97A9C377F34161800DD36222F4D94A6B ; MKBv19/FindVUK 0.98 -0xEE64123FAACC49D20F222E613E66E49F2D3EA414 = HARRY_POTTER_7_PART_2 (Harry Potter and | V | 0xDD0330F3C18A07515A81ED378ADAD8B8 ; MKBv20/FindVUK 0.99 -0x0409F63FAB54820F8AE0F22DDA6350D4E0466683 = HARRY_POTTER_7_PART_2 (Harry Potter and | V | 0xCCB87677F2AE3F51BE387C725BFEA801 ; MKBv23/FindVUK 0.92 -0xB907117D0D454C84C943BF0A6EC13443D6CCA288 = HARRY_POTTER_7_PART_2 (Harry Potter and | V | 0x7C7B18CF67471146F07EAE0AA8183B5E ; MKBv23/FindVUK 1.00 -0xC747956CE652A273C62F3BFAD8A55C697F34C8C2 = HARRY_POTTER_7_PART_2 (Harry Potter and | V | 0x9B4823207AA7A546AE66BE2648A2EABF ; MKBv25/FindVUK 1.02 -0x359E29D8C8A414759883938ECC07919EC739F8C8 = HARRY_POTTER_7_PART_2 (Harry Potter and | V | 0x53286EC40D5F1F0C1DF21A5D6B7F59C9 ; MKBv20/FindVUK 0.87 -0xC0E35ED99F8BB63A6567A10E6ECF2890C8FD1336 = HARRY_POTTER_7_PART_2 (Harry Potter and | V | 0xB3733F4E5A979C1C81F4647DFB906388 ; MKBv25/FindVUK 0.99 -0x97331A48DF837C5AFCCFA97CE11DFEF875805B6D = HARRY_POTTER_7_PART_2 (Harry Potter and | V | 0x2C4B36FFBD49B30CF828A4563DA70970 ; MKBv23/FindVUK 0.96 -0xC6486EFD5046506F7DEE3D562D09BB521643E1BC = HARRY_POTTER_7_PART_2 (Harry Potter and | V | 0x145AC08193C052ABC9CB78E46F3FC632 ; MKBv25/FindVUK 0.96 -0xDF4641A8CCD09A5FF92F3878946A066C76AE13FE = HARRY_POTTER_7_PART_2 (Harry Potter and | V | 0xC32D0C6664C8472257AF8B86E3A2FFCC ; MKBv25/FindVUK 0.92 -0x38B21D50C5A375EA129393C007EB6CA0A35E0002 = HARRY_POTTER_7_PART_2 (Harry Potter and | V | 0x8019D5EFF3E43C7F09EE73AA6FB15280 ; MKBv23/FindVUK 0.96 -0x15A558CF6DFF0616CFAC08B096965BE65106EAF3 = HARRY_POTTER_7_PART_I | V | 0xBCD1F7B6F73DD952EEECBDA9EACE7E1E -0xAFF057E75A55EB68131D703D5BCEBE287AFD82D9 = HARRY_POTTER_7_PART_I (Harry Potter and | V | 0xA8F672A74631BF2D680CC02FCBC50554 ; MKBv23/FindVUK 0.98 -0x1064B6511E0B62194F9FF2932D3617073419B00E = HARRY_POTTER_CHAMBER | V | 0x22DD3EA1B969F8948C0D324F96CA8E11 ; MKBv26/FindVUK 1.00 -0xD68F3CB5B86D0AA00BEBF8284F90259C1FC360D3 = HARRY_POTTER_CHAMBER | V | 0x284A83839610DE597AAD5BBB8D0F84AF -0xAFBBD9266DECC30E6E7588842ADDD61B2E00D339 = HARRY_POTTER_CHAMBER (Harry Potter and t | V | 0x2BD11F76CF13936496FF3789475DD727 ; MKBv15/FindVUK 0.98 -0xD6CDD5AFA1ACDEE42A29F2B911FFBBA01DDDE373 = HARRY_POTTER_CHAMBER (Harry Potter and t | V | 0x0D5626A30873C185F1778B4382FB64A6 ; MKBv16/FindVUK 0.96 -0x6D23780A2FFF6EDAD384E4C2911C53767ECD0FBD = HARRY_POTTER_GOBLET | V | 0x489A35DAE4961AFF90ED189C26E63787 ; MKBv26/FindVUK 1.00 -0xBD8E2B29F69AE6E51081D4B503BD9B7EA3ED85E5 = HARRY_POTTER_PHILOSOPHER | V | 0x88B557056378E71E803721A46754EA90 -0x75AAC9AB505495230F172C96EC4AAA2C3D3230BE = HARRY_POTTER_PHILOSOPHER | V | 0xBF278C0743050BB0C4266ECBBA43425D ; MKBv26/FindVUK 1.00 -0xC311273611085524F4DA300EE84DE31BC2735B35 = HARRY_POTTER_PHILOSOPHER (Harry Potter a | V | 0x121214CAC365C5EFD37918A6DE894F2A ; MKBv15/FindVUK 1.00 -0x6FE7D4C7B12E9ED3FEF0C96D2608ACF420AC8DDF = HARRY_POTTER_PHOENIX | V | 0xC0047B735D04612E666DDAB5A5B33400 ; MKBv26/FindVUK 1.00 -0x2E297122CA553793F16DEBDE67417776FF0D7218 = HARRY_POTTER_PRISONER | V | 0x583708CABC0399266F78F3A1EEE67962 ; MKBv26/FindVUK 1.00 -0xB089E4A4322C89DD183AC889EF5C3639F3405F62 = HARRY_POTTER_SORCERER (Harry Potter and | V | 0x8D80E0F213BB55C0D57513141F26817F ; MKBv14/FindVUK 0.96 -0x3BEC4F1C89B06D3BC25C6D5D5345C47EF41A3CFA = HARRY_POTTER_WIZARD_COLLECTION (Harry Po | V | 0x2DAB451E2FFBEB4A291EF00959B4B219 ; MKBv25/FindVUK 0.96 -0xEC454639ADCC6A9469B0E0293CAF965694DB0379 = Hart's War | V | 0x0164ABAC353F8E845DE8E1C50FD34489 -0x59ED868823EBEAF88F26E4AB87F69E71172D968A = Hart's War | V | 0x391DDABBC53EE98302164BE8A7CCD244 -0xB3E8E448C354228697D01898BC7EF1969F7200DC = HARUHI SUZUMIYA THE MOVIE | V | 0x5B6150C870DEC68F2AE725F736562143 ; MKBv28/BEE/VUKNOTVAL!/FindVUK 0.96 -0x2DFAC300D04A32B05DDF9C5099614520F3D185D8 = HaruhiSuzumiya_D1 (HaruhiSuzumiya_D1) | V | 0x8F38C7E01D94C806465FAA2AFA8037AB ; MKBv61/FindVUK 1.02 -0x2B74612ACC77DD531B5EF5A4A03219F5B031DB32 = HaruhiSuzumiya_D2 (HaruhiSuzumiya_D2) | V | 0xCB7AB113A86DA8C46FA87D5A1A5DF03C ; MKBv61/FindVUK 1.02 -0xC8CC0EDC69C7DF862149F4551B5946DD1ECBC199 = HaruhiSuzumiya_D3 (HaruhiSuzumiya_D3) | V | 0xF99C31705D2B0CDEB86A3B08AFA010BB ; MKBv61/FindVUK 1.02 -0xE2F74A219CB6EFF5D9C5B5B8FB30AC844C451CD8 = HaruhiSuzumiya_D4 (HaruhiSuzumiya_D4) | V | 0x5739618F61E114A72CB2D4E5A117984B ; MKBv61/FindVUK 1.02 -0x666083A0BED982AFB5CD5673C3ACD6A39027ED4D = HARUKA1 | V | 0xAD85640C701B6E7A37FCA5892764F832 -0x33546F3F1E736A243B3C9EE0314F79A427322250 = HARUKA2 | V | 0x6AC4CEDCB519898AAEEECA1FFEB4C0C4 -0xB18FCD18325B404C40E412930463D8E309536D5F = HARUKA3 | V | 0x35AD409F6D0803A2998ACF9858516D54 -0xAD4946CBD1F0DCA12877F0015DB191944A0F6809 = HARVEY MILK | V | 0xACD657A648A97B03646923EFC68D0688 -0xC7446F079B97C08B8FA11C7B0D83A46F8CD1B0B5 = HATEFUL_8 (The Hateful 8) | V | 0xAF4BD9D1379C84B27CA08721218C810B ; MKBv60/FindVUK 1.00 -0x9E04A94F19D9527C768597746233E2F0375933D3 = HATFIELDS_AND_MCCOYS (Hatfields and McCo | V | 0x2A81C330126BDB89CC7BF3F4FB123983 ; MKBv33/FindVUK 0.96 -0x6C887C0EC09FA35447788B5B2E0805972CA74501 = HATFIELDS_AND_MCCOYS (Hatfields and McCo | V | 0x225EA4224B42C5545C96DB5A78AF29E7 ; MKBv33/FindVUK 0.96 -0xFFB37D86C3B85FA1F395F8BD345C569E36A87542 = HATSUKOI | V | 0x1BD4ADC82756B4CA5D3E59C7FEE0C8C9 -0x0ED39AE5F5CEBAC628B2E6CD06A1FB5A58F0D2D3 = HAUNTING_IN_CT | V | 0xD2CD84F5947D1FD063EFF7285783A869 -0xC7B7A57FDDA1FD995E9D4EE6C2C1CC2D228305EB = HAUT (Die Haut, in der ich wohne) | V | 0xDAB749C61B7AD4FCCEFA3B1CE553A0F0 ; MKBv30/FindVUK 1.00 -0x19D91A402E61DA751DE85434807B050AFC117AD1 = HAUTNAH | V | 0x74E36CF4843F4AE9BA422A1A5BBD6F11 -0x8C88CC1EFCC44D553BE8C89CA03F28B8318080C0 = HAWAII | V | 0x64F9C46E84F7EF0944F633C46B986D52 -0xC6207FC31D0B4A2BDAABD7AE824662708D7D034C = Hawaii Five-0 s1 d1 | V | 0x0E94660F429D8572FDD5C85D4FA3040F ; mkbv23 -0xEA8FB535207FD9EB2A2074EF4FF5A229A60CFCC5 = Hawaii Five-0 s1 d2 | V | 0xF36A172AF7BEAC4407DA8C0422D6322D ; mkbv23 -0xDA254D360EB057E3415D1FF409848E4D289551A4 = HAWAII FIVE0 SEASON 6 DISC 1 (Hawaii Fiv | V | 0x1AB5A866F15C4E69EB5C8D94DA29F239 ; MKBv62/FindVUK 1.02 -0xBE62274C86B0B96F1F21E4E5CFA6FD2F31F8B1A6 = HAWAII FIVE0 SEASON 6 DISC 2 (Hawaii Fiv | V | 0xB27EF7BD5AC77A703AD969167F9F387D ; MKBv62/FindVUK 1.02 -0xF8A4E15696D110E5C7AEEC70F07765270D7409E9 = HAWK_THE_SLAYER | V | 0xD3E677A10F8C26D97B31E444929DB411 ; MKBv54/FindVUK 0.91 -0x79427326496437C7F5E7C5431ADA524E9EE4A773 = Haywire | V | 0x6AD71F91A8236991F62FB41490F57973 ; mkbv28 -0x7DDACF607DDE86D0CD315FA664C377BB2C9E469B = HAYWIRE (Haywire) | V | 0x2BE60BC3B89C14DBCD445E5D150A33C9 ; MKBv33/FindVUK 0.91 -0x6F70191EC8111910404E494244E83E9846DC5740 = HD Moods Aquarium | V | 0x79A9FB7D5F1899F81B6A7A64CA9BC0B2 -0xF2EF1ED936849EFF012EDD2A2485E8A1D53FA903 = HD Moods Hawaii | V | 0x33C48358C39DDDDDB979AD074C49EBC0 -0x0F92A31FA8103C8A8426917DAD7BAB626A4800FC = HD Moods: Blu Ocean | V | 0x903A6171481684CC75E84CCC259A417E -0xA735AE2AEBAF3ABA7D34FC8805B18B1D54FEB980 = Headhunter | V | 0xE15F61C2F37862D463774CA0E30C2125 -0x33B2F63B22ACC754BE4C39F63F9AF49C30AF2242 = Headhunters | V | 0x351D4E1D0DA075D28879063B841D736F ; mkbv25 -0x6420895042AB9BF8DC71BB67E5C5F86AC5F5D805 = HEART | V | 0x1549531130B5E9505BB16FC0106ED306 -0xCE9309CA59905D7A4BCB1FC0A3303B5C8019F5FD = HEART | V | 0xE56AF39D5E891B9C76B3D8B126782DE4 -0x879E2A601103551758033525C3D1A6244B86B58D = Heartbreak Ridge | V | 0x8E328C0DDD1AD4709A82E11AD3D42348 -0x26F32CF65DD3593320624EE5265B712C75BE4BE7 = HEARTBREAK_KID_EU | V | 0x182BD9F534EA57F1586F0C495678E6B9 -0x169B673DC3EBE2A9148DC7D845C8B8805A27CA5E = HeartofGlass (HEART OF GLASS) | V | 0x6796B35A34AE26BA908161641747BD82 ; MKBv47/FindVUK 0.99 -0x823FEC5A44C8C408815EA3A911B3FECA66DDC12B = HEARTS AND MINDS 2 BLU-RAY | V | 0xE3D263AA09922A5513B2592AC3065970 -0x84F958719D0E20D9121ADB78D9DCAD868BE16BBD = HEARTS_AND_MINDS (HEARTS AND MINDS) | V | 0xD4C57CF1F2AAB3126D0AF5EC4E89A320 ; MKBv46/FindVUK 0.99 -0x97596D65527988D60528DEC24EB97212D139BC61 = HEAT (Heat) | V | 0x334B72A3C9BB426CB303584AEFD0C1B6 ; MKBv14/FindVUK 0.98 -0x2CDFA0EFF20BD5224280E17834D378BE3276BA16 = HEAT (Heat) | V | 0xBCEEF790F6E451AC1C92028170063424 ; MKBv14/FindVUK 1.02 -0xC25244E20307ED4E07FE669961940AE59CE23869 = HEATHERS | V | 0xA4C7DA5330CA7210D71F86EFB5211840 -0x7F1DA205FD30CF4920E89C4B8EF8CBC27405E63D = HEAT_D1 (Heat) | V | 0x705C92F1F671C598085C09A3AD7A2B4A ; MKBv58/BD+/BEE/VUKNOTVAL!/FindVUK 1.00 -0x857DD5099E2013D3134786ACE85E9712DDC74FF5 = HEAT_D2 (Heat - Disc 2) | V | 0x2B3E445891E0274ECA8DA17AA18D4A14 ; MKBv58/BEE/VUKNOTVAL!/FindVUK 1.00 -0x2171495D7682D0BED29999B97C2D7E8077BD2065 = Heaven Is For Real (Heaven Is For Real - | V | 0xE82AF6921944A1043CFDD064FCBC4359 ; MKBv47/FindVUK 0.96 -0xDDF9500127B8A1E3BF73D2B4990D287A442AD0C0 = HEAVENSWARD_OST (Heavensward: FINAL FANT | V | 0x56FB7A9FCE67B08154B21AC10C743A0C ; MKBv58/FindVUK 0.92 -0x3840657530451A7736B0AEC511BF1798D974A249 = HECHO EN MEXICO | V | 0x1C576DB11C976A3FD3A2F697FE33B9E2 ; MKBv35/FindVUK 1.00 -0xAC8414737BE9DBDC9DC6041DB65835EEBB25E6E5 = HECTOR DER RITTER OHNE FURCHT (Hector, d | V | 0x727C81FE83E799B26DB520014A710449 ; MKBv54/FindVUK 1.00 -0x5251BF7C0FF50D6B44C8150E56AEDA6DE7BC42E9 = HEIDI_DE (Heidi) | V | 0x24A96E5655BF15C8B431C3C8EBAD2991 ; MKBv60/FindVUK 1.00 -0xAF10347040E28AE797DCFCEB4F65246295DE6B8E = HELIUMD1ALA | V | 0x67AA237009B623B801024DBBF7886CAC -0xAD429218797902FAA78319F6033832104A47F994 = HELIUMD1DEU (Up (Disc 1) - Blu-ray???) | V | 0xD4A86D30D89D1EB871B832EF49E43C1F ; MKBv16/FindVUK 0.96 -0xDD84209ADD8CD5FC5354D60EA82DE6C0E162FF43 = HELIUMD1LIC1 | V | 0x6157940A27376318380469A6ACB7766D -0x6ACAEFD4B87BD99A12769056857D5D2A2F50DA2E = HELIUM_D1_GBR | V | 0xE3D8875F6B0C6FA22D2545EEA018519A ; mkb v16 -0x40686D761793CC1F94A71DD1C2966529896C7051 = HELIUM_D2 | V | 0x85E6D7AD1F404CA9195005BFAC99DF40 -0x1E8F3D6A9BA80DD0963530D5733A0C8CF4FAF57E = HELIUM_D2 | V | 0x8ED44686DA448234D8BBD29509889421 ; mkb v15 -0x5C5D8FD42AB50072DFC5C55C6EB6ECB3D897D731 = HELIUM_D2_ESP | V | 0xA772E6E86FC33512F646C23D04C2DBD5 -0x918F3CF334748280DDC7CC6D6478FF05951D5528 = Hell Boy | V | 0x5E3738281E19DA69DA3FFAE741858026 -0x02D73B3798A9CEC3687F70EAAB90A1EC9D27288C = Hell on Wheels s1 d1 | V | 0xEABAC4951D755C51E96E7D43F94474EC ; mkbv30 -0xDD3576D5E888059AF72AA273238D7CF21A1502B6 = Hell on Wheels s1 d2 | V | 0x72BFE8764AA9D100A04C1B714F4AA965 ; mkbv30 -0xA93DEE3B955E26E13CAE5178268EAF808398DD8F = Hell on Wheels s1 d3 | V | 0x2B5DB2C9E8B78B923E76EFCA58A4B455 ; mkbv30 -0xB91C89470E8E6657A8916B4263BA01BEA81874D5 = HELLBOY | V | 0x81D5D80059A27191BB7C844B0B170EA7 ; MKBv1/FindVUK 1.00 -0x18DDE64B5280A42B51F877B444578239D859223F = Hellboy | V | 0xC3D1EB3D8BA4660CA07280FE5470BBF9 -0x1D9927A27F7EC8CDAF89957924D87CB5BA1AA1DA = hellboy | V | 0x4F45C2F58DB5AE2DD5C871C9371800FB -0x1600262954D3C4534D084DCD345B30FC1E77940D = Hellboy 2 (FR) | V | 0x918405EFA4BEB96C99965414BA2CA5D0 -0x6B4409ED34420D956EC1BFE09D59A6BFF349F53C = Hellboy II | V | 0x15196D15F08E172095567AEF4513D38D -0x77C91DD5144FEE0044B84CD72188FCC0429B69D4 = HELLBOY2_D1 | V | 0x6707FDC4B9CFEF2B75174A4AFA30ADFB -0x84F414AD1FE7072531FF41356C980E20F408E279 = HELLBOY2_D1 (Hellboy : The Golden Army | V | 0xFD335ABD3D0595B8F57D36F4888FBFBE ; MKBv8/FindVUK 0.96 -0xA455374005D1FC75083D518BE9DE23CA7037B4E5 = HELLBOY2_G51 | V | 0x0E6DB463BBA4CE712459136561EC4D56 -0xB6F5E4775C8881E4C467FF16D74A5ACEC968EEAF = HELLBOY2_G51 | V | 0xF9525E7C35BDBD01DD03A38733A381DB -0xCDE2C44FC0EDD2CC48D8C470C8C346FC52C76163 = HELLBOY2_G51 | V | 0x613A7957DB9CFE18A0EF50FBA4A18A74 -0xD54412D542ED7912BA05C2394EFB6224C4D107DC = HELLBOY2_G51 | V | 0x83E7D9BDD9815F9710A37169DA37AB7C -0x5D3265C1C9651A6C3EF88104B0BD67390CBAAA51 = HELLBOY2_G51 (Hellboy II: The Golden Arm | V | 0x410FF77A9E8247CAF9E86D2BC7B43FF0 ; MKBv9/FindVUK 0.96 -0x32B91F8EC02FB18F02E6DEAF264C85D29BC43DFA = HELLBOY2_G51 (Hellboy II: The Golden Arm | V | 0x424ADA71C81D64C5E5475B1C0B6E6E7B ; MKBv9/FindVUK 0.96 -0x25B52085BA6EC74B32F5F1ABD3175F4390C28539 = HELLBOY2_G51 (Hellboy II: The Golden Arm | V | 0x35D2FB88A3F35611A26673A9E4010B92 ; MKBv9/FindVUK 0.89 -0xF1E53D7E5AB2E2BC0270FB4962E5CBEFA8F2FADB = HELLBOY2_G51 (Hellboy II: The Golden Arm | V | 0xD2E9FA5FB9D06EC7165D0ECFCFDC8A3C ; MKBv9/FindVUK 0.94 -0xE073DB521B7F7E2EF254BE6983C42C780DAA0F7C = HELLBOY_US_BD | V | 0x6C440BC29A373F9CEB6506F4DB1516C7 -0x4D0AEA24B33DC322C82A09F8D95FC89D9A6EDEEF = HELLO_MONSTER_D9 (?????? ????????? Disc9 | V | 0x8B8BECE8B7AA17D7C5ADFEA581DE1D24 ; MKBv57/FindVUK 0.96 -0xC1D61A7A5D6774AA5B73CF34B22D11C9B4A24F64 = HELLRAISER | V | 0x1C86B447F23EEF749D437FC2D0B29C4A -0xEF59A12693E70D84CD1D9F223A5E898D9A744F4A = HELLSING ULTIMATE 1_4 D1 | V | 0xDC3E7F3A5EADB265B1227E414D1801AA ; MKBv35/FindVUK 0.81 -0x1B664646D6919DF81FBDA8B1391E06339F0F81EF = HELLSING ULTIMATE 1_4 D2 | V | 0xEE6DA850B2C11DD75A537904C00FB601 ; MKBv35/FindVUK 0.81 -0xB52C4EE0491C42B4582277A4A63B9A1501D83E42 = Hellsing Ultimate 5-8 Disc2 (Hellsing Ul | V | 0x0A131D6CF64847F9F89408D950EDAE4D ; MKBv31/FindVUK 0.86.3 -0xDA221D3AADE1BFA49F1DF2746BC9E6626E3F143F = Hellsing Ultimate 5-8 Disc2 (Hellsing Ul | V | 0xB6AD1E88619F16D543E435934CCC5A34 ; MKBv31/FindVUK 0.96 -0xFF2684A3BC7494A10475B09DD3306E6CC4973B35 = HELLSING ULTIMATE 5_8 D1 | V | 0x69307B7B9DE4A6EA760AB276F4DF1F6C ; MKBv35/FindVUK 0.81 -0x025121FD2A715D4EDB4B6E00E156EA8024481E4E = HELLSING ULTIMATE 5_8 D2 | V | 0x575FFFE6823906154AF512AD344C464A ; MKBv35/FindVUK 0.81 -0x133E7E99023C3F9A0DE208AAA4D5BF91BE3FB409 = HELLSINGVI BLU_RAY | V | 0x20E41101B23E0B3C29D18358DBF481C9 -0x6F5E080DE7A323ABFCBB10DA1AF5319F406E2B8B = Hellsing_Ultimate_1-4_Disc1 (Hellsing Ul | V | 0xD3EDCA1A643FF238A2D0FE72FEF696AB ; MKBv31/FindVUK 0.92 -0xAD8B9BCDE57C5D51644816BBF755822149AC422B = Hellsing_Ultimate_1-4_Disc1 (Hellsing Ul | V | 0x07D5A3522549DD05BC3EC13F6E5AEAD0 ; MKBv31/FindVUK 0.94 -0x1D9BF75507AE22B58321E813838CA7C91AB5CD53 = Hellsing_Ultimate_1-4_Disc1 (Hellsing Ul | V | 0xCF062C4E59691066C5A18166714DD96C ; MKBv31/FindVUK 0.86.3 -0x14E81051CB6BFFED7C8F7E33D67772239382229F = Hellsing_Ultimate_1-4_Disc2 (Hellsing Ul | V | 0x8EEDE6FDC4C81D1B8423406E11505193 ; MKBv31/FindVUK 0.86.3 -0xF728AE96B4260AEDB5280A1294EA16A097D4B5B2 = Hellsing_Ultimate_1-4_Disc2 (Hellsing Ul | V | 0x30A09D15683A254042DD90170D4B68DF ; MKBv31/FindVUK 0.94 -0x3E1476C301A0E411D34007AC6FC8A89DE852237E = Hellsing_Ultimate_5-8_Disc1 (Hellsing Ul | V | 0x20A861A64C0FB25EBAFA90D0DB87A4E7 ; MKBv31/FindVUK 0.92 -0x03318C6F0A30E2C7E46BA54DB57653BE28B7F967 = Hellsing_Ultimate_5-8_Disc1 (Hellsing Ul | V | 0x7E2B02F3074D5715C8C501B940E58B5E ; MKBv31/FindVUK 0.94 -0xD4EBA5DBDA9D45847D4986F5E436156DDE952960 = Hellsing_Ultimate_5-8_Disc1 (Hellsing Ul | V | 0x8B497B9AE573692C0B97F1CDD4A48389 ; MKBv31/FindVUK 0.96 -0x2422AAE3A1FAEC6C1985CD5804E46E856BBFDD9D = Hellsing_Ultimate_5-8_Disc1 (Hellsing Ul | V | 0xCFBFE5239D76689B3375AA915FD66B64 ; MKBv31/FindVUK 0.86.3 -0xBE5CFE861F687D9CECB7C314059D4F5D9176907A = Hellsing_Ultimate_9-10 (Hellsing Ultimat | V | 0xD8A6919ECEF034E8CC18B766389E1D78 ; MKBv47/FindVUK 0.96 -0x1C09D5AE1F152C46117A533DEB17DCC48C6E9473 = Hellsing_Ultimate_9-10 (Hellsing Ultimat | V | 0x34A023AF0B70243ED805758EF1FBDD7B ; MKBv47/FindVUK 1.00 -0x43C9B2FA7C27EF771F6FE49EB7CE7EBDE5B324A8 = HELP | V | 0x39F6794340D2790116F013BD093C5631 ; MKBv38/FindVUK 0.96 -0xB745A4541E08AA2F8FB7356C21FFCCE1D9FAF4FE = HELPPO ELAMA | V | 0x1F1946A571778C39AD104B1BAFF394AA ; MKBv23/FindVUK 1.00 -0xCBC5498405E6F62F5F357F6FBF4859C61E2DBB3F = HELPPO ELAMA 2 | V | 0x9F9C9BE8950186DA9869D9B0E0FDE73A ; MKBv23/FindVUK 1.00 -0x2D525F396C1DB283ACA9D5A1B11391BB33026844 = HELPPO ELAMA 3 | V | 0xB5CF93195F498E979BFD567E95C630B3 ; MKBv23/BEE/FindVUK 1.00 -0x8A409DCF06987A9DF557FBCFDA6B43B7EC5986C1 = Henry of Navarre | V | 0x327A020B9140130A3FFE406AE9F25858 ; mkbv9 -0x2033CC180F38AD9338FE5ED5221800588A725527 = HENTAI PRINCE AND STONY CAT | V | 0xBF7372C8CD8F109B719B8342304B8475 ; MKBv46/FindVUK 0.99 -0x503B9361A163A720C8B7511FFF1BF72DC97B1952 = Her | V | 0xE04FD8451520A360AA2539B0BB076365 ; MKBv48/FindVUK 1.02 -0x8DA334F68E73D8FE91AB3E211058ABE15158E930 = Her (2013) (Her (2013) - Blu-rayâ„¢) | V | 0xA89B9C92FE4E3AA7DAA1DC8B5325D2E1 ; MKBv46/FindVUK 1.00 -0x5D0DCB89F82B89E57B53304059B2264B3725AF94 = HER (BLU-RAY) | V | 0xEB2473328EE2600A6B0D3E0FFE754D46 ; MKBv36/FindVUK 0.98 -0x3DBF72553017DB49F7893B1F653607332CF7A7B1 = Hercules | V | 0x6B401B0A952822BB632D2CEE053FE490 ; MKBv39/BEE/VUKNOTVAL!/FindVUK 0.81 -0x75DCC37ACA21D8135509A98600788EEAD4DC5D19 = HERCULES (Hercules - Blu-ray???) | V | 0xE95CC8E94518D4CC42194FABD0B30DA0 ; MKBv35/FindVUK 0.92 -0x08A5C0C2F1AA97F65B97EC6E8507FAEAF00458CB = HERCULES (Hercules - Blu-ray???) | V | 0xFF4972E11C97A9A01F76887FC737C6AF ; MKBv35/FindVUK 0.94 -0x6F7872C5FC44973AF48A101022823E81499CDF43 = Hercules (Hercules) | V | 0x951F6C720A54F4ECB3B49F72E623E2EA ; MKBv47/BEE/VUKNOTVAL!/FindVUK 0.84.1 -0xA6F6EB3CFFF757C6A77A5980FE5C66863C6D97A6 = Hercules (Hercules) | V | 0x9617F30A93262BCD6500B864E69CCBEE ; MKBv47/BEE/FindVUK 0.84 -0x9C677775108F1DF2AEE1DC0A7E7D0F2990BD6764 = Hercules_3D | V | 0x8B5AF726BE6F6A122F3F7D393A452C69 ; MKBv47/BEE/VUKNOTVAL!/FindVUK 0.81 -0x3DFE2614D0AB9AFB11E3A30BAC02779A72DDAB09 = Hercules_3D (Hercules 3D) | V | 0xC0A9508FA0DF63F6B3ED0F2FBE0DEC95 ; MKBv47/BEE/FindVUK 0.92b -0xF62AB1EAF1332E6AEB728871B873DC87D62E4D58 = Here Comes the Boom | V | 0xBA9DF767AF605B7F2C98477788F75822 ; MKBv33/FindVUK 0.80 -0xF802C09CED9730083111131B47005A900966F508 = HEREAFTER | V | 0x5A3AD23297EE6CF1C40A2BCA1CCCFBDA ; MKBv19/FindVUK 0.65 -0xB2AD9DB73E3A3B5559AC01771EE4150B838929A7 = HERO | V | 0x3B833ED4A4F9886010E300690F246155 -0x66A1F13EE233762AE8BDD4811EB2BFAAB88B3F1D = HERO | V | 0xBDD71195CB51C77AAC39B51E05622AA9 -0x0FEEC1FBE08C69440969B1C9B60768B192015D02 = HERO | V | 0x4F5C16943A681D30EE8CCE0B954851E9 -0x1C0C4442F778FE62B1F603A817B09EC7961DF19D = Heroes S2/D1 | V | 0x66FE2F2C81745BB6794C109CF7B8E216 -0x081F82D6EF9BEE298FC1488624D277C07706CA8C = Heroes S2/D2 | V | 0x8C2161DB3A2C1066845BD76079F12BAD -0xDDC54D8910A0CA4B8C7FD19F9526CBA66BFBEE96 = Heroes S2/D3 | V | 0xB82DE8EA61836062F169C40E78F60E7B -0x7C96E89FC688DB66CC690804DA389273BB1CB276 = Heroes S2/D4 | V | 0x0D11DA641E45B8C2F4FE7D052C3FEF4F -0xFD43F6F354F732921A31734BD76D4AC6EF5B5323 = Heroes S4 D1 | V | 0x8E333EA5C96B437DCF3ED5FAF85660DA ; mkbv16 -0x0EA1D836BCC208D33D45F5277AD1C9A943281782 = Heroes S4 D2 | V | 0xED5C4850AB139FF46E519F53D71599C6 ; mkbv17 -0x9EB4B73A7116EA69547EE0DD0718FAE2A347A73E = Heroes S4 D3 | V | 0x009C1237EDACDF5124A1219728F951A4 ; mkbv17 -0x2F808419F5F3AD679C3E55F6CC1D7B26570721F5 = Heroes S4 D4 | V | 0x04920ABDB92194E42B169FF5DFDD17AC ; mkbv16 -0x26C3C001311D481E8C250F030D5A7A84203A8919 = HEROESS1D1 | V | 0xD8D756CC7B9DDADB799F0C3C18EB4AD9 ; MKBv7/FindVUK 0.80 -0x6C8EC3C4A02D8E77445AFECF41713000CAF08CED = HEROES_S1D3 | V | 0x432AF71F0B518586EF81032139F1579F ; MKBv7/FindVUK 0.80 -0xE8BBC380BBC657857A17F2158EDB6DC15C68A56D = HEROES_S1D5 | V | 0xE27EA93A5D427DD377FFE274578F764E ; MKBv7/FindVUK 0.80 -0xFB335FFB34113165DA794FB2CA5726ABDBD0CA7C = HEROES_S1_D2 | V | 0xF66B9349B0E5EDF908EB9914796C94B3 ; MKBv7/FindVUK 0.80 -0xFC6DFDDCE682CF9034B8A088416A6D53BDC3EB16 = HEROES_S1_D4_NA | V | 0xFFEA1EC4F6E06A62034A7C269C5E2A75 ; MKBv7/FindVUK 0.80 -0xAE09367CC989F12D3E956CB38B1757834570404A = HEROES_S2D1 | V | 0x3E4684C5EE46953F00FCF223304C0E6D ; MKBv7/FindVUK 0.80 -0xCD7AB3A3597A36361373B9C09D97A208238CC065 = HEROES_S2D3 | V | 0x2A90C41D9AE13078B084DD5E61F19DC6 ; MKBv7/FindVUK 0.80 -0x9700F225A0BE79BE94519410469F1724DB92E2E2 = HEROES_S2D4 | V | 0x07BC9E7FB1958A56A27BA9957A04BAAC ; MKBv7/FindVUK 0.80 -0x9B67277B60817EFDFEA9B6B0E52A06671B81BAC0 = HEROES_S2_D2_NA | V | 0xA8B30ACB7553D2C56B2517B0D7127DF6 ; MKBv7/FindVUK 0.80 -0xB99CFD2F4788D84C548E72856CBE68006734B995 = HEROES_S3_D1 | V | 0xABAFCEA25EDF248E49F46E5918427124 -0x66688148CA24FA3C9D6A7AFC54FB16485000F347 = HEROES_S3_D2 | V | 0xB35C44F48E134D6FCA902B4CFF02B677 -0x5E086DFAD82CB8D2FE833A1B8C25725D68DD6DE5 = HEROES_S3_D3 | V | 0xDF05158CE87FCB4E5A8CA631F47C6CBF ; MKBv12/FindVUK 0.80 -0x46E3A6943A52C350BA7B7EBEDE02D95AED9E2DE8 = HEROES_S3_D4 | V | 0x308C3580C80E00A5FA2321E5C4F4D114 ; MKBv12/FindVUK 0.80 -0x9B4805964ABCBB2EE72204F8863A970BC69D1B94 = HEROES_S3_D5 | V | 0xD40E6105E4EF3BA100C41C1916421FEE ; MKBv12/FindVUK 0.80 -0xC1E6DC1BB7FFA824F2D1D4DC4D1BC6721FDAE185 = HEROES_S4_D4 | V | 0xB4ECEDDF421FE2EB0C4848305DB26ED6 -0x9768D41669539FA44F909C52F7B7AF132F5E1C85 = HEROIC_AGE_DISC_1 (Heroic Age Disc 1) | V | 0x2F4BF6DCC31C05D7172CCBCF068C4F44 ; MKBv15/FindVUK 0.92 -0xA314B941D5D453DE2E849B15F195AA859A38F75C = HEROIC_AGE_DISC_2 (Heroic Age Disc 2) | V | 0xB4B2B06B94A1F5CBA21C57A1D0DB51B8 ; MKBv15/FindVUK 0.92 -0xEB2654B9E47E9314ECAFC2F1CD561742F034BF43 = HEROIC_AGE_DISC_3 (Heroic Age Disc 3) | V | 0xA5E14536E014413485CD117EE397A67D ; MKBv15/FindVUK 0.92 -0xC6BF7CED893F97ED71E2AF3E28CD74C9A97C5F69 = HEROSE | V | 0x5F2D056D04A1421DF4A7CD043B300726 -0x8E4AF3BEB9C966A7E9371EC90B63D472F73BE41B = HEROSE (Hero Special Edition - Blu-ray?? | V | 0xBF2EA1203E95DCCE53036E018C4D9732 ; MKBv16/FindVUK 0.86.3 -0x8875A929168DBCB8C08D5899234F21FFB58EF1A3 = HERR DER RINGE - DIE GEF?????HRTEN | V | 0x80F9E5ACB49FF1F847C95F1B10743862 -0x551A5BFFFC552AA3009A037A35C7446D92D76F2A = HERR DER RINGE - DIE ZWEI T????RME | V | 0xDEA39242AF1C1585405D8446EE048651 -0x18D436C73DD6DABD3ECCFD631A25847F5B8B5562 = HES_JUST_NOT_THAT_INTO_YOU | V | 0x0DF610F5EE9BE7FD5CCCAF04AF1F6118 -0x3ACFD42B470EF70E9678890945CEB82D26E5FF37 = HE_IS_JUST_NOT_THAT | V | 0xF862FDB71C9F74D5F89E3C32CF474E43 -0x435B3FC2EF32125371E87A16C107B4C98BE81BD8 = HGMJ_PART2_BONUS (THE HUNGER GAMES: MOCK | V | 0x71FC77CD0FA284F99D9B75FB8911E6C2 ; MKBv57/FindVUK 0.96 -0xE284916522C722C7CFA34E99C94153A0333338BB = HIB_03 | V | 0x9634DDFA8A79B387FCFD9E3A300876FF -0xF4AC0EDFC5969FF87659314E9C9E3E50433D7828 = HIB_04 | V | 0xBCE1E5E7EB47AD55E0BC294EBC34A9A7 -0xF711BD35A2CF1BB5F1C8DB8E1F04920696C96A46 = HIB_06 | V | 0x843CC56BB03420E2CEF3F0E80F207AB1 -0x3019DEAE7914F584DC36269314375328E9602C4E = HIB_07 | V | 0x3A0CCC33CCFA04745AE116F0954127E8 -0x2854EF175A5D64DC28779E1C23561894E8102440 = HIGH NOON | V | 0x477152F443A3556F0D371044B160A3D4 ; MKBv38/FindVUK 0.80 -0xCC727D3B31CFA03FB6214AA2801EB5D59FCBA13A = HIGH SCHOOL OF THE DEAD DISC 1 | V | 0x94475AD5CAC47C2A953369E1531D68CD ; MKBv24/aacskeys 0.4.0e -0xAD4537207854BEB6D37D7551F02358369F885E8F = HIGH SCHOOL OF THE DEAD DISC 2 | V | 0xE431C33793A4962C7CE6640A0EACB5CA ; MKBv21/FindVUK 0.81 -0x2ED3C3F53E970301AB625F16FC40D61C255DA258 = HIGHLANDER (Highlander) | V | 0x49EEAA738FC879280EE96997AC199018 ; MKBv61/FindVUK 1.02 -0x9C62E56416A8890208818A05CDF5F5CBA00F3FCA = HIGHLANDER (Highlander) | V | 0x7956645CFAE73E2EE0F022009AF2830E ; MKBv61/FindVUK 1.02 -0x4AA79D21C76AE9AA59A9773B0439B9C2DCB0E9D0 = HIGHWAY (Auf dem Highway ist die Hölle l | V | 0x5D44FB3622DE8BAD8D9EF65F63616CB7 ; MKBv37/FindVUK 1.02 -0xDDEEAE6D1B58318419C2865E553C74125E8561B7 = HIGHWAY 2 | V | 0x223FB56C26F9AC428DC8850D87504103 ; MKBv32/FindVUK 1.02 -0x5CBF23281497FF0F3D097EFE39469F8A231F177A = HIGH_ANXIETY (High Anxiety - Blu-ray???) | V | 0x66E6E0846D980FB719395F64393D5C08 ; MKBv12/BD+/FindVUK 0.96 -0x1A69E0EFD3F1EE273EB758B5B7F63BB5F62D9B30 = HIGH_ANXIETY (High Anxiety - Blu-rayâ„¢) | V | 0xFA541CF122C9C85A060A500EE73092CB ; MKBv12/BD+/FindVUK 1.00 -0x86BBB570B25ABB66D66BCE97C9A62C0937B69223 = HIGH_CRIMES_WW | V | 0xC5DE5780FDFBCBE584CC10B46FA8633E -0x54E6CD9C44936918E3915C835C716E2C1F8BC836 = HIGH_PLAINS_DRIFTER_G51 | V | 0x0652C385A073CF9362DAD28FE77F035D ; MKBrev 39 - FindVUK 0.54 -0x3D3E9DAEDF9422B174F291663EB4EB312ACA3AF5 = HIGH_PLAINS_DRIFTER_G51 (High Plains Dri | V | 0x3D890098F370E18D654ABA2106728FE2 ; MKBv39/FindVUK 0.98 -0x1ACCE10A9176DD8B092959087A0AC3697D94B78C = High_School_DxD_Disc1 (High School DxD D | V | 0xD67BC097E5172873DC3FAF7D75F4F52A ; MKBv40/FindVUK 0.91 -0x21A9AD3CA4A6E74E63AF7BA0BCED48B7ED502F6E = High_School_DxD_Disc2 (High School DxD D | V | 0x40B0253A2D01AA65579A9CCD95B4BB14 ; MKBv47/FindVUK 0.91 -0x67FADC1D371418B8FD78390BB0FAFA8832EE3F07 = HIGH_SCHOOL_DXD_NEW_D1 (High_School_DxD_ | V | 0xD888502C44DD7248E3168DECC151B4DE ; MKBv47/FindVUK 0.86.3 -0x7E335E999C3FD1837B5959B928466854151F0796 = HIGH_SCHOOL_DXD_NEW_D2 (High_School_DxD_ | V | 0x13F40925547E6ECFD97B5E5F93066E7C ; MKBv47/FindVUK 0.86.3 -0x2FF207007F8CB7549216ACD66283B5066516E985 = HIGH_SCHOOL_MUSICAL | V | 0x92182F7A278417B88B424512EAE4E020 -0xF17B502E88477C5AB2BF39B2337C74BA4F002E1D = HIGH_SCHOOL_OF_THE_DEAD_DISC_2 | V | 0xEF28F627A5D67CA0EFE90E3934CDEE8E ; MKBv24/aacskeys 0.4.0e -0xD5024330EA6BF05956AC95FC70474895E04B0165 = HILLS_HAVE_EYES2_F1 | V | 0x362175976FE6F50582E5858B36EEB5C2 -0x7F0423BB0FD452C524BE0D55FC35E2A51390F27F = HILLS_HAVE_EYES_2_F3 | V | 0x77B5B52EC1F0FA409563E56415823199 ; mkb v7 BD+ -0x6B420C61F59DF921F3CEB580F49B713F36980FA1 = HIMALAJE_DROGA_DO_NOWEGO_ZYCIA | V | 0x172067F34C7C81AF1D588EC7AD8F53C5 -0xC22330886FF6BBB2315300C204F9C2E411B99D3C = HIMALAYA | V | 0xFA362437AA21DC335205BC65C1DF0229 -0x7BA00289EBCC39494887C3A26C5F66D0C2178E79 = HIMALAYA | V | 0x99682D4EF4280BB365F0BC897CED5FD9 -0xB7CBBED0824B1EC4523CDE885538039FC3DE7A06 = HIMALAYA | V | 0x4417417BE93A12B4F7B4F4644664D8C4 ; MKBrev 4 - FindVUK 0.57 -0x87936082DC6B4AA6EBD20D1D02404A02443381D2 = HISTORY_OF_THE_WORLD | V | 0x12BD11B365E1C250AF3A7AD67A067366 -0x4E4FF659365708FFFE7135E93B72B9A86921F450 = HISTORY_OF_THE_WORLD (History of the Wor | V | 0x012147BCDEF5A203380B6EF05EF79694 ; MKBv12/BD+/FindVUK 1.00 -0xEB1DE4683C5F6AA7F43DC29206C2B54C36399C2E = HISTORY_OF_THE_WORLD (History of the Wor | V | 0xF0229F3B05A8270CEEAE7C9AA243BC83 ; MKBv12/BD+/FindVUK 1.02 -0x73DDF9BC296FA59E87CB454599D9F6E58791A48E = HISTORY_OF_VIOLENCE_BD01 (A History of V | V | 0x023E023FF131CC908FC9B8523A44B383 ; MKBv10/FindVUK 0.96 -0xF93B2E872DA35690BFBAFB6740A85ACB4B47D119 = HIS_AND_HERS | V | 0xB020642B505CCC87735205763595E31D ; MKBv47/FindVUK 0.80 -0x5609BB64D2E4F6E2E963978D3967C93384945FCE = Hitch | V | 0x87F59A6B27D85187FE1AF35D69374912 -0xBE3A6058B5C47F982BD73F266A337EEA64CC76D6 = Hitchcock (Hitchcock) | V | 0xD9ED0FDB5D8FC16BEF36FD4D38D1F85D ; MKBv35/BD+/FindVUK 0.96 -0x7831C6BA88B7312463E86DA2CAA8B7F00064A98F = Hitchcock (Hitchcock) | V | 0x14362E88F3A6D33C52F47E3EAAF096D8 ; MKBv35/BD+/FindVUK 0.99 -0xF425567BCE63435663ECFFC86731213DF7E44A5A = HITECH_BD_REF_4 | V | 0x5C0EB87684857C718559BBABAACABF33 -0xE9AEC603F73579AAA9DC251E1FDF0110973DD35F = HITMA-01 | V | 0x623E8E54F914895770AA823FD8F60503 -0x59280800E57319FC0D964E939B90724B3F6BEA8F = HITMA-06 | V | 0x55F5269E1DA1CEB867EF2C7DB65BF162 -0x42442282F8F3A1087A8B8B936C1B81E940BD434E = HITMAN | V | 0x927FA23BDEE84C917904C2389CCE6CBE -0xD73B32A275934F46ADCA2E6FA88AA067A474A5A5 = Hitman | V | 0x7E4596D7328AF9A89517702A2A9E849D ; mkbv7 bd+ -0xF756C73A115A81E8E3F29B2330757C6E9F272117 = Hitman (US) | V | 0x3B1FE70BF6B01A3D7FE6E5516600AC46 -0x7937D01B963FAB681AD397DCE36718CA999053BF = Hitman Agent 47 (Hitman: Agent 47) | V | 0x318817A1E681399D4478A043A8C51F97 ; MKBv50/BD+/BEE/FindVUK 0.96 -0xAF9A178DFB636266231352036EBA75DE231A4D8E = Hitman Agent 47 (Hitman: Agent 47) | V | 0x53F53132A4B774DC0D05A587EC705B28 ; MKBv56/BD+/BEE/FindVUK 1.00 -0x2E44D82686483D03DA25B6F30641766E6E120FD0 = HITMA_10 | V | 0xAEB99DFBF783E0AE63AFDF2E74860E18 -0x3783BBAAB91A72021DF50B5CBF76C78E761DAA8A = HITMA_11 | V | 0x0C13E4AE6756146381426ED42571879B -0x6FF571176E9095839B3AFCA044B224B5A6BED1F6 = HITMA_14 | V | 0x52B8D7DFE1BC4F496CBF56EF27073FD6 -0x25FFFA2997A6CD695618DCBBA6121732397296CA = HITMA_16 | V | 0x51038A8DD1E6363227F7DAAF9D388DDB -0x8189561C7D5541DD5C907BEE4353CCBC75B1AE56 = HITMA_18 | V | 0x07BB596D1E6C1F3941549F5FF70E12FC -0xE1427EC0B4A7ECA0C9C1CBC8DBF6023BE9700B0D = HITMA_19 | V | 0x826EC4C3C7A5E6B493DBC72C336FC2B4 -0xE06FFBCD81C4E14457AB4A42448B9B2E2C74A909 = HITMA_23 | V | 0xEBB96D38D9BAED6AE3A45AA735EA3984 -0xA30E962B32A759D5A1FF6F543583FED8715C1B7A = HITMA_26 | V | 0x8D913CED604E4CB2598E25C7EEA93587 -0x96B9A2C17C66062AA570DEFAF8E36B3B72B2E768 = HITMA_27 | V | 0xDE59A53B9CEFD25ABA3FE39B6C351641 -0xD252242C6713A9544D062E05F8507F33A440CDD1 = HITMA_28 | V | 0xABBC12F100F214EFF1C7072DF4B9426F -0xB04F9BF1881A12B3EADF3EE765E08CA7B93915B6 = HITMA_34 | V | 0x7521CAF333489B62B1AD428AECAB4918 -0x02AC9435F966B374B2C06125EB58E9F820EE85F4 = HITMA_35 | V | 0x35CED53494469CA83807409DDEA9CCF5 -0xA923B72AF6AF15145C7FDC1D522E180CD1AB07F1 = HITMA_36 | V | 0xB037DB9781DA999FF9258E1D75348B56 -0xCB18625A717EA96E6E92DD53B529B39C3A2366CB = HK2 | V | 0x35A021894FE9B38829C7BB5114800AD2 ; MKBv7/FindVUK 0.96 -0xB17A4001ED8005243277B656D9C5E767B9F09EF9 = HLIDKA_V_ARDENACH | V | 0xD5BEF34D2746273D6DB9145D937F4925 ; MKBv43/FindVUK 0.98 -0xC41BD805D7E6DBFC01842C8A30B5E77A1857D246 = HM91EXE1 | V | 0x691B66E21D9A0ABB4896E45F93B9DC31 -0xE97EC521760E792810D427A56F2C42AC14ACD429 = HOBBBIT_PART1_EXTENDED | V | 0xE797CC67AF73A91D05C8878DD838B773 ; MKBv42/FindVUK 1.02 -0x8FAC75A0740DF829ADAC20AD151789A8311A174D = HOBBBIT_PART1_EXTENDED [The Hobbit: An U | V | 0xA96DB9DA4B8F198739E267F3EC6A52AF ; MKBv42/FindVUK 0.89 -0x0B5B7D19A34CC28B76DE2D3CEE71C7E5A6C7D65A = HOBBBIT_PART1_EXTENDED_BONUS | V | 0x12C6721E2CCA9268C2ED9306E3051E38 ; The Hobbit AUJ: The Appendices Part 7 -0xA0242EFD6803D0FA5C140C083BA9F58ED2E643ED = HOBBBIT_PART1_EXTENDED_BONUS | V | 0x046A0325D5D9F995B4221B3B19938B48 ; MKBv35/FindVUK 0.65 -0xB5F2230DA05504BC1826F4C32CB7C70797272AAE = HOBBBIT_PART1_EXTENDED_BONUS (The Hobbit | V | 0xBFC2FB1D0F84B356EE61BB914D57A086 ; MKBv35/FindVUK 0.98 -0xC882B14274BB8605EDAE337D651700BB9065C425 = HOBBIT_BATTLE_FIVE_ARMIES_P1 (The Hobbit | V | 0x35E7215F3AC70A23CF48D9F514A7D16A ; MKBv46/FindVUK 0.98 -0x6046A5C8368DC056CB72F8EDC7543AA6C6E19A20 = HOBBIT_BATTLE_FIVE_ARMIES_P2 (The Hobbit | V | 0x7331B6142977DF5CCDF8DFEC3A2D86AE ; MKBv39/FindVUK 0.98 -0x73AD3E02E6B0D546D57A0472C945F90D39C1EE49 = HOBBIT_BATTLE_FIVE_ARMIES_P2 (The Hobbit | V | 0x3A95AD5CF3D8396493CF75B37DA45FAF ; MKBv39/FindVUK 1.02 -0x680AEE2A295F617A9FD24691E89450040488B3E7 = HOBBIT_BATTLE_OF_FIVE_ARMIES | V | 0x50CA946FB385A88C2819268762185C50 ; MKBv50 -0x5F68799578578476A6F2BE61F90461518A88B1B9 = HOBBIT_BATTLE_OF_FIVE_ARMIES | V | 0xC276D4AC05C23151793F296C9962BD81 -0x8C386163BEC3A07F00841DF2AFECD940C790184E = HOBBIT_BATTLE_OF_FIVE_ARMIES | V | 0x8EE9C38AB014CB2EF0FF969E41729020 -0xCCB94F9FD4D5E905FF30AEA58F68387E5620010A = HOBBIT_BATTLE_OF_FIVE_ARMIES (The Hobbit | V | 0x427B2C82080EA0E2550DA14E6576891C ; MKBv50/FindVUK 1.00 -0xCC080C67F1DC4B08A4DCE952293DAFD41AB4612B = HOBBIT_BATTLE_OF_FIVE_ARMIES (The Hobbit | V | 0x277C8C60ADB99669503921489FD13DB9 ; MKBv50/FindVUK 1.00 -0x76E0237D62E44530C385A19B8A1F9587D5AFDBA7 = HOBBIT_BATTLE_OF_FIVE_ARMIES (The Hobbit | V | 0x0AD8892AE3E5F0BFA9C24E68376C52E2 ; MKBv50/FindVUK 0.91 -0xD173DE07AA51105616D6E6D981D3DEB76848D129 = HOBBIT_BATTLE_OF_FIVE_ARMIES (The Hobbit | V | 0xBFB2DAC486E24699C60990F1ECCF781F ; MKBv39/FindVUK 0.92 -0xBFF5C6446CA28C6948A9A96C56C566A14B42538F = HOBBIT_BATTLE_OF_FIVE_ARMIES (The Hobbit | V | 0x1493F53E2CDC27A685F43A4AC7FF06ED ; MKBv47/FindVUK 0.92 -0x1B470FD4D11FEC7DD85F8311955685E8730956E5 = HOBBIT_BOTFA_EE | V | 0x891C765611BE172F6434D9687202D51C ; MKBv53/FindVUK 0.82 -0xCFAD6F6929AF86098B651CDF13D0EF116D7CC136 = HOBBIT_BOTFA_EE (The Hobbit: The Battle | V | 0x109A121CE594798CA379742E3033C927 ; MKBv50/FindVUK 0.98 -0x17E997A7FFEEE2FA7EE31E3F86FE80B82EA61CE1 = HOBBIT_BOTFA_EE (The Hobbit: The Battle | V | 0xD754829F488CC57E3B96B6240D4472A8 ; MKBv53/FindVUK 0.92 -0x09302E6401D1BC2359EB2578D98DEFDD803A5373 = HOBBIT_BOTFA_EE (The Hobbit: The Battle | V | 0x985DB37CD05C893D93A595CB0C3CC38D ; MKBv53/FindVUK 1.00 -0xC72D57FA5C6DD4EF94C01FF5AB95F3640EC9A274 = HOBBIT_BOTFA_EE (The Hobbit: The Battle | V | 0xE3E0FD6C2611D1A4607EBEFAB504CF2D ; MKBv53/FindVUK 0.89 -0xF128DB63ACA0F53F9ECBE7DC8CDAD6FAB27AB5D0 = HOBBIT_BOTFA_EE (The Hobbit: The Battle | V | 0x42E0D1723CAC722BD0F075ED64132AAE ; MKBv53/FindVUK 1.00 -0x05FF627AB9EC18E2B091CB601286705DBD385812 = HOBBIT_BOTFA_EE_3D_PART1 (The Hobbit: Th | V | 0x8EFEA1F198187337C910B9BEF48B05E6 ; MKBv53/FindVUK 1.00 -0x930347ABAA8FD1A04F33D8E03528B855939006F7 = HOBBIT_BOTFA_EE_3D_PART1 (The Hobbit: Th | V | 0x0DE15CC876F3FB41DA703AC9E5476817 ; MKBv53/FindVUK 0.89 -0x0039A3ECE03CE505AB2D012564AB121191E7FAA3 = HOBBIT_BOTFA_EE_3D_PART1 (The Hobbit: Th | V | 0xB5FDDD1CEDE771AAD48153092F779A11 ; MKBv57/FindVUK 1.02 -0x41A3ACB86740318F120477934F9FBFB1FFF6B944 = HOBBIT_BOTFA_EE_3D_PART2 (The Hobbit: Th | V | 0x363D03C260D6A5423ADEE62A313382A1 ; MKBv57/FindVUK 1.02 -0x5D2640DF39DEA597B044E18473E2C0A4DB910180 = HOBBIT_BOTFA_EE_3D_PART2 (The Hobbit: Th | V | 0x57C0BF95D2BFD6CB2B0B230E9F75C3C0 ; MKBv57/FindVUK 0.89 -0xAE34289CBBE57E44692D5BBCC65E1BD01EE75729 = HOBBIT_BOTFA_EE_3D_PART2 (The Hobbit: Th | V | 0xA590825AF173BD175D7C2400D3F02384 ; MKBv53/FindVUK 1.00 -0x8C39E311401E00A9F7CDCCB27FFF5B1AC1D7CEB5 = HOBBIT_BOTFA_EE_BONUS | V | 0xF3AE62C6642700A682357ABB7867F481 ; MKBv56/FindVUK 0.82 -0x60D723D7FFF08B8E567B0D7B79439BEB8A2009FE = HOBBIT_BOTFA_EE_BONUS | V | 0x1CA515EDD0319D231F5F1A0A31D44E39 ; MKBv56/FindVUK 0.82 -0xEE7F9E8B4A750559C40EDB5682152CBDE663284A = HOBBIT_BOTFA_EE_BONUS | V | 0xEA5250FC869604E04D343E5A9C25BF4A ; MKBv56/FindVUK 0.80 -0x937998298D4B7224ABBAEE4C0A3CBE04346157DD = HOBBIT_BOTFA_EE_BONUS (The Hobbit BOTFA: | V | 0xC0A8221B448D5C313CBD8B5FEDAFEA2C ; MKBv46/FindVUK 0.89 -0x28405459F42AC45A135BB2BCEA3676B0574D6F97 = HOBBIT_BOTFA_EE_BONUS (The Hobbit BOTFA: | V | 0x002724F163FBECD52EBB4E6E19F7909B ; MKBv46/FindVUK 0.98 -0x0DF3AABE4E6E3AE72877492D876675BED4C03428 = HOBBIT_BOTFA_EE_BONUS (The Hobbit BOTFA: | V | 0x8459C24540DF4C6CDED90DBB3ED7D2F4 ; MKBv56/FindVUK 0.98 -0x4F5F1A8A21D6F191FA3E188E7324930FA2383D02 = HOBBIT_BOTFA_EE_BONUS (The Hobbit BOTFA: | V | 0xE9F0FE801462BB4F26593B91C2027403 ; MKBv56/FindVUK 1.02 -0x7A66BD0E1DA203DEE6060F38798A75E026A5F830 = HOBBIT_BOTFA_EE_BONUS (The Hobbit BOTFA: | V | 0x1D1ACEE76D11DECA230A70606118D1D0 ; MKBv56/FindVUK 1.00 -0xEB0949CC77B9662408730D809D46A08ADE4AE922 = HOBBIT_BOTFA_EE_BONUS (The Hobbit BOTFA: | V | 0xFC90D24EA43DFC7033A147008517214D ; MKBv56/FindVUK 1.02 -0x9F676567B68333E635091FDEABD3D5B37AF0013F = HOBBIT_BOTFA_EE_BONUS (The Hobbit BOTFA: | V | 0x6FD4B4A6BD1A1E9FE5D68AB13E011D60 ; MKBv56/FindVUK 1.00 -0xF236F4989598E8E932839552D98B75EF98782D52 = HOBBIT_DESOLATION_OF_SMAUG_EE | V | 0x2CC43F5A7D2B4A815283B3B71991C722 ; MKBv47/FindVUK 0.65 -0x93CBCCEA12EA0E69DCDE53D20B00C0568E5A873E = HOBBIT_DESOLATION_OF_SMAUG_EE (The Hobbi | V | 0x134CAD8C554591587514F80DE0A003F7 ; MKBv47/FindVUK 0.92 -0xB6AC1E1A0DB3433FF9EF197B878049483C0C5DC3 = HOBBIT_DESOLATION_OF_SMAUG_EE (The Hobbi | V | 0x10F048B2E76EF407A5554D793AF47097 ; MKBv47/FindVUK 0.89 -0xDE56C15C733F540518415EBCC5A564BC81C6224D = HOBBIT_DESOLATION_OF_SMAUG_EE (The Hobbi | V | 0xDFA8C4B8263384C978739C64860DFE93 ; MKBv47/FindVUK 1.02 -0x6AE859430210E809E11DF123E767661132B96300 = HOBBIT_DESOLATION_OF_SMAUG_EE (The Hobbi | V | 0x079BC8CD768A8805BF20E01F14E7F348 ; MKBv47/FindVUK 1.02 -0xB0444CA253D1DCBA2E2D71470C00D2C9F7CFDB8C = HOBBIT_DESOLATION_OF_SMAUG_P1 (The Hobbi | V | 0x21F05A7E713189040994CBE1EEA77678 ; MKBv39/FindVUK 0.84 -0x75BFDFDCF7E308274233676AA47A5D6FD4907415 = HOBBIT_DESOLATION_OF_SMAUG_P1 (The Hobbi | V | 0x0B0FB5B5D1643205B232EC49DFBB0396 ; MKBv31/FindVUK 0.96 -0xBA0E06737EE2F578E2220585B7C571D5BAB322E8 = HOBBIT_DESOLATION_OF_SMAUG_P1 (The Hobbi | V | 0xDA8A1A390EE7144E9F314704F61DD37B ; MKBv31/FindVUK 0.98 -0x809AA931DDFF4EF543901C8EC478CF90E491913D = HOBBIT_DESOLATION_OF_SMAUG_P2 (The Hobbi | V | 0x9AA6AC044E1E50E2E27840BDE80C2C07 ; MKBv39/FindVUK 0.96 -0x0F7DE9083174A221CF05F7BDE22C5EBB56E7D581 = HOBBIT_DESOLATION_OF_SMAUG_P2 (The Hobbi | V | 0xE16CDDF41E3255372047246760DB8FC2 ; MKBv39/FindVUK 0.98 -0x58536DB43FABDCB7D0BD581CE2D4B35668BD71F4 = HOBBIT_DESOLATION_OF_SMAUG_P2 (The Hobbi | V | 0x1721AD88D6116CE9B8F3AC7F486D35FE ; MKBv31/FindVUK 0.84 -0x157B76C28D4EA8C673402342F0CD920CDCBBBFB1 = HOBBIT_DESOLATION_SMAUG_BONUS (The Hobbi | V | 0xC7C8DC40FE43C494864FD2E56A6627FC ; MKBv46/FindVUK 1.02 -0xD9F7F6EBE38A98E02C8458C6D8C3F75ABC962A91 = HOBBIT_DESOLATION_SMAUG_BONUS (The Hobbi | V | 0xB8B9038AF93EE29319BC90463C82B338 ; MKBv46/FindVUK 0.92 -0x4A6FF91F224F47F34B37AA698E54AB72213E65D3 = HOBBIT_DESOLATION_SMAUG_BONUS (The Hobbi | V | 0x15114AB1B834304316C1FD886087AE98 ; MKBv46/FindVUK 0.96 -0x06A01FB6127A441121A566BBD4AE1F1DA517CC9B = HOBBIT_DESOLATION_SMAUG_BONUS (The Hobbi | V | 0x69FED4F7FF64EA45356C76989DE5C56F ; MKBv46/FindVUK 0.98 -0x773E6F3AB109518C218C31AF3759D24FD2FA5265 = HOBBIT_DESOLATION_SMAUG_BONUS (The Hobbi | V | 0x3F4212B69A109D1CE08F3BF7889CA164 ; MKBv46/FindVUK 1.00 -0x89E9CF82023D204AC8696AF75C7869C2F5C83A43 = HOBBIT_DOS_APPENDICES_PART_10 | V | 0xE9801C552C3C5027FA2D7F49E3446296 ; MKBv39/FindVUK 0.80 -0x97717A506F8B7874443769F97090DFD95EE76926 = HOBBIT_DOS_APPENDICES_PART_10 | V | 0xDDDD4A3A9AA56A0DAF65030D6408D08C ; MKBv39/FindVUK 0.65 -0x6094DE3458C6AAD4EDE2059A0670F820E5008140 = HOBBIT_DOS_APPENDICES_PART_10 (The Hobbi | V | 0x8BBF78244F3BA7FEC3298000873D48A3 ; MKBv39/FindVUK 0.92 -0xC44ED91759B79203F6A1C20773AFF34B0A7E1DD2 = HOBBIT_DOS_APPENDICES_PART_10 (The Hobbi | V | 0xF9AD2C1C5575EC2855B3D62A6AB5FFD7 ; MKBv39/FindVUK 1.00 -0xD325290ADB2D75B3181D585B8115378B18E99B6E = HOBBIT_DOS_APPENDICES_PART_10 (The Hobbi | V | 0xC3E995B1DA77AD775B8028466789DCB2 ; MKBv39/FindVUK 0.98 -0x84CF9C1FB2510083680E27D2BC0A3C8A2BA56EEF = HOBBIT_DOS_APPENDICES_PART_9 | V | 0xEFEA8715213DA73364C5EF253A63FC84 ; MKBv46/FindVUK 0.65 -0xE65A76968E366923CB1621C6679745DDFF63E0E5 = HOBBIT_DOS_APPENDICES_PART_9 (The Hobbit | V | 0xCD0D37A577E3D52F993F5004BE3A06F9 ; MKBv47/FindVUK 0.98 -0x1B4579EE5267BBA9FBBA3490F62D527B14DDDE50 = HOBBIT_DOS_APPENDICES_PART_9 (The Hobbit | V | 0x2C346621DEA05749F6CC5F1F3559DD97 ; MKBv46/FindVUK 0.92 -0x58279571C7A582DD89BFED6ABB0932D5DC0F4799 = HOBBIT_DOS_APPENDICES_PART_9 (The Hobbit | V | 0xE960B75CA4EE2AB3503D5415E9648D77 ; MKBv47/FindVUK 1.00 -0x93E4CC6A08B4B0A58B5570E134284B1B8B4176E0 = HOBBIT_DOS_EXTENDED_3D_PART1 (The Hobbit | V | 0x27D6290577225D931ED93FAB57163080 ; MKBv47/FindVUK 1.02 -0x2BD47014ADD093D38DBD022CFF026265219EA9EF = HOBBIT_DOS_EXTENDED_3D_PART1 (The Hobbit | V | 0xF13F8BAB616D6DB20A8E4EE48E9FF4C8 ; MKBv47/FindVUK 0.89 -0x55B21EB8F47BEFACF9030E8861997AC42B4F7461 = HOBBIT_DOS_EXTENDED_3D_PART1 (The Hobbit: The Desolation of Smaug Extended Editi | V | 0xFB16F97CA5060A8F763C167AE0AD171C ; MKBv47/FindVUK 1.00 -0xDEEC2C279F6B49FABFF8AB8E09AF13CAE6F52EFA = HOBBIT_DOS_EXTENDED_3D_PART2 (The Hobbit | V | 0x18DEA13876C8B9DE8B50167AD3B7D00D ; MKBv47/FindVUK 1.00 -0x2E67EF287577BA88D1E5687EDE284D8D4AA9544E = HOBBIT_DOS_EXTENDED_3D_PART2 (The Hobbit | V | 0xC0DCF8255679CACCDE0389707F848B3E ; MKBv47/FindVUK 0.89 -0x54B4CB3E39B6A5697C23E07CF5937E266D5DB362 = HOBBIT_DOS_EXTENDED_3D_PART2 (The Hobbit | V | 0xCB7CB4F2B88659F1D357851E5B4D1F8E ; MKBv47/FindVUK 0.89 -0xBD43FDFF6923D614C908328DDBA89FC1A883701A = HOBBIT_DOS_EXTENDED_3D_PART2 (The Hobbit | V | 0x25FBDF59B0500D45E4E501D957E290F8 ; MKBv47/FindVUK 1.02 -0x41CE3B871DA56E1A1ED441A6954C6D1B63BE1093 = HOBBIT_EXTENDED_PART1 | V | 0xA11CFFC3FB355E281EEADC461CD8FF8D ; The Hobbit: An Unexpected Journey -0xAEC630CFF12E1E628594656AB80259CC12D9DCA9 = HOBBIT_EXTENDED_PART1 (The Hobbit: An Un | V | 0x184B319AAEF2873A4D4AE5C8B62BD2C4 ; MKBv42/FindVUK 0.98 -0x1D4F2EBD65C810EF01443084B05609F3DD22A157 = HOBBIT_EXT_PT1_D1 | V | 0x3E2BC2EA018EE21DDDA53A930F64F7C2 ; The Hobbit: An Unexpected Journey pt1 -0x99ADD6FE705EDC2B709695F70D2592B9EF761EB3 = HOBBIT_EXT_PT1_D1 (The Hobbit: An Unexpe | V | 0x40484877548F7E9B427AE59B2FE7B5F7 ; MKBv42/FindVUK 1.02 -0xA8074F47C7966A75467F90FB33864154B1C9E5B2 = HOBBIT_EXT_PT1_D1 (The Hobbit: An Unexpe | V | 0x28AB41C6A922C56A0C5F0E5902075EDA ; MKBv31/FindVUK 1.00 -0xB8F580F72D1B913202823C6E727EE88BC133A72A = HOBBIT_EXT_PT1_D1 (The Hobbit: An Unexpe | V | 0x2E2ADEF5CBE916DE48BD9E49AFC4B955 ; MKBv42/FindVUK 0.89 -0x86E6C95AFC6300AFF1D6020A2955EAC9AD93E10B = HOBBIT_EXT_PT1_D2 | V | 0xB2E75FBAA8A31D6D9B4C3BCF269420FB ; The Hobbit: An Unexpected Journey pt2 -0xC19A5CC36E1086477C4E30194A4D8C9FE97F2BD9 = HOBBIT_EXT_PT1_D2 (The Hobbit: An Unexpe | V | 0x4CBF54C830842E9A88A21330D7F915C9 ; MKBv42/FindVUK 0.89 -0xF92C0536DC233B444504D382EBB4CE3C4F9E0796 = HOBBIT_EXT_PT1_D2 (The Hobbit: An Unexpe | V | 0x4F221513D62B082632EF8EA55EE5010D ; MKBv42/FindVUK 1.02 -0x7AA55708920FE0B3F31957795ABCB4A3ACF67B5F = HOBBIT_EXT_PT1_D2 (The Hobbit: An Unexpe | V | 0x132B4EC3A02F502140408A650995AF10 ; MKBv42/FindVUK 1.00 -0xC2BDF07443559EBC97FA202103049E4031BB426F = HOBBIT_PART1 | V | 0x305F81E500A072E7939D0D44CC76D625 ; MKBrev 35 - FindVUK 0.54 -0x53F98782D7B5E41E70544F2DD53A5C7DC48B6F27 = HOBBIT_PART1 (The Hobbit: An Unexpected | V | 0xC99B1AD771E2C1D763B06E5FDF15970B ; MKBv36/FindVUK 0.96 -0x2EAA150E4A4C0E48FBFFA5401AA9F4BFE261B8B8 = HOBBIT_PART1 (The Hobbit: An Unexpected | V | 0x1E7FBAEF016F82F1186694FAA82B77B4 ; MKBv35/FindVUK 1.00 -0x8192C3F79A1564C9D6E962910ECDCAADE3EDE32D = HOBBIT_PART1 (The Hobbit: An Unexpected | V | 0xB063790C1E2F968DC705229BAEBAF0AE ; MKBv36/FindVUK 0.92 -0x187D888FF0E12A46CAF1B76124687058F594BA56 = HOBBIT_PART1 (The Hobbit: An Unexpected | V | 0x3C415867C5F72C5E3C853C34558122FB ; MKBv35/FindVUK 0.92 -0x8267E7DF8927C03EF9D12A0D764D015F1745DD58 = HOBBIT_PART1 (The Hobbit: An Unexpected | V | 0x0F16351476FA1585F4C083F0A97C7506 ; MKBv31/FindVUK 0.98 -0x9EE4B3EF0822A6E86F531D63649C871B08CD4848 = HOBBIT_PART1 (The Hobbit: An Unexpected | V | 0x21142E298548207A83478D1ECC42E343 ; MKBv35/FindVUK 1.00 -0x043433902CFF0C23725ED12A028DE32BF413F609 = HOBBIT_PART1 (The Hobbit: An Unexpected | V | 0x3169F7EA05C2014D9D87B5339C692EA6 ; MKBv36/FindVUK 0.98 -0x0B1732543FE01D97ED90D5C15BD18FE047AC2481 = HOBBIT_PART1 (The Hobbit: An Unexpected | V | 0x918974326375C735BCB35AA10EBB0C8E ; MKBv35/FindVUK 0.99 -0x78BA56BDE0304991FB6975CEAE0EDE0DE002D2C8 = HOBBIT_PART1 (The Hobbit: An Unexpected | V | 0x4988354CD32E5D0B55785594BD9EBCA2 ; MKBv35/FindVUK 0.83 -0x3D7D552894952B230E9811844A61524CEBE600C8 = HOBBIT_PART1 (The Hobbit: An Unexpected | V | 0x61297AA2F416F14BFBA83BA3658E444A ; MKBv36/FindVUK 0.92 -0xD1CAB349DC87AB7CF0AC009B917E928958D9EE60 = HOBBIT_PART1 (The Hobbit: An Unexpected | V | 0x0ECD5BD80A0A23AC3D0427F72673C4D0 ; MKBv35/FindVUK 0.92 -0xB0CDF423F296DA64932AD635DDD5D60CBCCFE031 = HOBBIT_PART1_EXTENDED | V | 0x713634CCD9EF366E2FACFECA1682D2BD ; MKBv42/FindVUK 0.65 -0x598DE01467FB04697C64590826E91B3DE7C9F417 = HOBBIT_PART1_EXTENDED (The Hobbit: An Un | V | 0x7D51D23F4DE47AA831CC6C248F202D1A ; MKBv42/FindVUK 1.02 -0x4CA220384A687AB74D44176862DEDA4AD54FF0E9 = HOBBIT_PART1_EXTENDED_BONUS | V | 0x2BC0AA2FE9D3A50A567EC0554EA2A5FE ; The Hobbit AUJ: The Appendices Part 8 -0xBEFB4C35F59F1BA1EAE11D82B0AE50E8CD962E0F = HOBBIT_PART1_EXTENDED_BONUS | V | 0x1C615FD28BC4525A0FDA1B47B8C023D5 ; MKBv36/FindVUK 0.65 -0x85D8C97E7EEE39ACE247620C1D6A9AFB1853B019 = HOBBIT_PART1_EXTENDED_BONUS (The Hobbit | V | 0x4DE5871380489CD98ABCA0FC6C17E9C5 ; MKBv36/FindVUK 0.89 -0x8940B05498ADEB3C78E56617A93F74E8CF7047A3 = HOBBIT_PART1_EXTENDED_BONUS (The Hobbit | V | 0x53A2A2C41C8933D8F3407EDFD09A2A90 ; MKBv31/FindVUK 0.89 -0x7EAE2B2F9132A737EFB72E8785D7BCB3A8B3385E = HOBBIT_PART1_EXTENDED_BONUS (The Hobbit | V | 0x9B8B2677B95C3F51BA03177E0487FE30 ; MKBv31/FindVUK 1.00 -0xAA3DA0BEBA3386EAD9AEABA147C6ED7AD256554E = HOBBIT_PART1_EXTENDED_BONUS (The Hobbit | V | 0x3C0A208915F421CB92946E24886E39DF ; MKBv31/FindVUK 0.96 -0x82B5918D63F1F8B14B2C92402542B8D528196AE7 = HOBBIT_PART1_EXTENDED_BONUS (The Hobbit | V | 0x4F8DA6A13283369655D1AEDB23AC38C6 ; MKBv36/FindVUK 0.98 -0x7C5E5C041AD428D4D73FA81B9585E3DD296FD68C = HOBBIT_PT1_D1 (The Hobbit: An Unexpected | V | 0x3E48ED983D2A183A22F8EDFAE1A8FF58 ; MKBv35/FindVUK 0.98 -0xBBD8706212A94C7A2012DEE739E184DE06934482 = HOBBIT_PT1_D1 (The Hobbit: An Unexpected | V | 0x945D61E5915ABF83D3F3DB69E253F420 ; MKBv31/FindVUK 0.83 -0xAE2EF3A08679B7613F403F6810CF9D280C77893A = HOBBIT_PT1_D2 (The Hobbit: An Unexpected | V | 0x875F54CB720645FD74C8C232D63D4AA1 ; MKBv31/FindVUK 0.83 -0x37DD76AE2781AC27843B2B6EC3BBD170A62E7EE9 = HOBBIT_PT1_D2 (The Hobbit: An Unexpected | V | 0x557A33C33BA909BBBD30367F352BE361 ; MKBv31/FindVUK 0.98 -0xA8531D6627EA9993EEA2370E902702CD7ECAD9D9 = HOBD_0x00001 | V | 0x7F810CA059DD6783BFC1BF7ADD232AE8 -0x0E5153D54D4825918B8F1D665EA8D447860456FD = HOBD_0x00008 | V | 0x4AC2521BE9DDA935CEEA3C8AE0282D7C -0x1B9C88EB4BB3C8330C7CCD0FAD08949BAEEEB90B = HOBD_0x00009 | V | 0x41300745992A213690435C339B9432D7 -0xD247F49831B22B3CBFC109B58B3C5B348D862BA9 = HOBD_0x00015 | V | 0x2E53C5FB957F1743F039689BD00C1086 -0x37F1DDD58E3BBDA03113D66EE504A7CB498E9C14 = Hobo with a Shotgun BR | V | 0xFED6DAD488E9652375A86F2C860EC817 ; Canadian movie -0x5634ACA828A1FD28CE506B57F2D508F858633BE0 = HOBO_TAURUS (Hobo with a shotgun) | V | 0x5C8A8C1E9D9C389728AF022A69A47808 ; MKBv33/FindVUK 0.96 -0x605DEE6D0074CA7B4A2B20E4909AB171CF04F023 = HOCC CONCERT 2009 SUPERGOO | V | 0xEA81EBC239C4FF00E52D7E9D8F5489DF -0xE091CE4333D1DFAC53944CFD38B8EE3815D8E7C3 = HOEHLEDERVERGESSENENTRAEUME | V | 0x196CA98694AE2094353FA6747462C876 ; MKBv30/FindVUK 0.80 -0xDB73FB30D2542BE854210265A506D776FA1F0261 = HOEHLEDERVERGESSENENTRAEUME | V | 0x5E9CCAAC1849F84FCF9C92303A9C1143 ; MKBv30/FindVUK 0.80 -0x5CCDB1091AC55DF0AA1DA9EB80B383083158DAED = HOEHLEN (Fantastische H??hlen) | V | 0x7F49D6A7EED38A3531DF5E238C075AB9 ; MKBv16/FindVUK 0.96 -0x0FC261FA80E6E066DBC214C9A7CF95C48CB44ECC = HOLE3D (THE HOLE) | V | 0x9D0809A7E515F258B0D5E3BFE2FA3DCC ; MKBv23/FindVUK 0.96 -0x106CD3954106C8B7A90E5376FEE6A1999058A41D = HOLE_3D_BD (The Hole 3D) | V | 0x0558C000CB4FF324406A808F96C5940E ; MKBv18/FindVUK 1.00 -0x5B5EFB199CC259FA3DB1F1F944A8FB46D1E49DFD = HOLIDAY | V | 0xCAA4633CFDF813912D68753E7DC53DB6 -0x25A1AD4B6656B0B03D1EED8F43FC51D86A686F9A = HOLLOWMAN | V | 0xBE2E5C07ABBE34E7E9983E5054D10EBB -0xFF0DA80921A2248F0197A20CEC633F32D4FFCB2A = HOLLOW_CROWN_S2_D1 (The Hollow Crown: Th | V | 0xF7BD55CB05C42FA0AAA1CA08808AF46C ; MKBv46/BEE/VUKNOTVAL!/FindVUK 0.96 -0x67B7B06A7B5A90EA8566A313AF32F6D3A1C5A91D = HOLLOW_CROWN_S2_D2 (The Hollow Crown: Th | V | 0x3031448014003F7B010D8FDEC0A402FE ; MKBv57/BEE/VUKNOTVAL!/FindVUK 0.96 -0x2798B95A7476E95D46A23843BF06BD2818A7CDA1 = HOLLOW_MAN_DOUBLE | V | 0xF3E812BB689D14359024E49FABA7AEBC ; MKBv31/FindVUK 0.99 -0x1029FD7F22EBECB0FF5B649220EF22B2671085D0 = HOME | V | 0x3D7FFFE0D7CFF7890753807428FF53C6 -0x6D1C93E8702D6E38EA4B1DFCA5DEAF0E220876CD = HOME | V | 0x528DB05BB911938C231107E14BC7E1DE -0xA511739F88C8EE2340794E8FAF7F67E0CAFF6F45 = Home | V | 0x78F31F89A1F09364AD9B5CC977FB9FD1 -0xC9C5B089DB908953E78CA067CBD3C43B193C3565 = HOME | V | 0x1ECD6D8306B599C01B5387788378B418 -0xD7EA0C773F6391C488B3558E3358435EB7131F08 = Home | V | 0x4CB23C812938EC181F82BC430E42B95F ; MKBv47/BEE/FindVUK 0.80 -0xD131F10AFD96F6E003A783F5C64729F9E33062F4 = HOME (Home - Ein smektakul??rer Trip) | V | 0x6E131AC60C7AD88CD17757BC98B96D0A ; MKBv47/BEE/FindVUK 0.85.3 -0x4C59D30F87D45F0BB46C3BE9E2DFBD1816F2BD36 = Home (Home) | V | 0x4329DA12211B2E47DBEED9E6A6ACC7A5 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 0.87 -0x3DC9E3E4FB2B6F4502CFDD16F770ED86D30A45AC = HOME (Home) | V | 0x64D37057B6A02172808545C5737BA3CE ; MKBv50/BEE/VUKNOTVAL!/FindVUK 0.87 -0xD08617E74848EDB306CFD6D54060A8DB4AC965C1 = Home (Home) | V | 0x04A26AD2859FC570637B78FD5499AEB6 ; MKBv50/BEE/FindVUK 0.92 -0xB4DC68AB30D835C415DF83C9CDEF4EE430AEB54A = Home (Home) | V | 0xEA5C13B14E958B44B451453882B2B3A7 ; MKBv50/BEE/FindVUK 1.02 -0x0DB2EAD4DE0A258B1AFBD1A4817B50C157A29275 = Home -Party Edition | V | 0xF934B5F09A108EFA1FACD666260E3BB7 -0x0968AB9C3BDB876D9A0DAABC2D98163F42BA9564 = Home Alone | V | 0xA58ED9C68C9A1BD31B113CEE3681A7A2 -0xDB2A7E79DBC1B2275C269EB2E01F9D0FA5CB5467 = Home Alone | V | 0x1A9805014C17E52881365F796629E3FC -0xCCED2F2C26CEE2E216719F70B4ED70FEAF9BD835 = HOME OF THE BRAVE | V | 0xE7D304B46752BE2242BA980662496C79 ; MKBv4/FindVUK 0.92 -0x2BC9C39537F56AA7E507E2577FEA27FFD225BC34 = HOMEALONE1_F2 | V | 0x5027D38FAB5A12A8BD279C48FC82796F -0xE97C7BAD565C072C450CFD6124A4B9FD42A96C0B = HOMEALONE1_F2 (Home Alone) | V | 0x592428A2426D94F494CDF30F3E421250 ; MKBv9/BD+/FindVUK 0.96 -0xD9C552D2EFA05B54276053F9BB166FB82A8855DF = HOMELAND_S1_D1 (Homeland, Season 1 Disc | V | 0xCD24B3BACC06FDAE40EA274A6E37CB58 ; MKBv31/BD+/FindVUK 1.02 -0x62A622B97AEA9376F2C085799F93A7D0BB250933 = HOMELAND_S1_D1 (Homeland, Season 1 Disc | V | 0xEF2B2D6DED11340F15FECDB428522D23 ; MKBv27/BD+/FindVUK 0.96 -0xD23D4C27FFED12E98603BF4A78011B45F3996F22 = HOMELAND_S1_D1 (Homeland, Season 1 Disc | V | 0xE8324CB60DB8F7ABC4D913DC81512A0B ; MKBv25/BD+/FindVUK 1.00 -0x4DB959A9F99FE2C3AE18068157DC59C2152EAA5F = HOMELAND_S1_D2 (Homeland, Season 1 Disc | V | 0x71476AF40A6B67705250EE0017197FD3 ; MKBv25/BD+/FindVUK 1.00 -0xEB1EB3233D308B00E36726EB54767E81FEB40441 = HOMELAND_S1_D2 (Homeland, Season 1 Disc | V | 0x773516C5C1CAA31748DEFD172DC76EF5 ; MKBv25/BD+/FindVUK 0.96 -0x6A388AAF7FA5FC8F7A445C41F628C9E957420326 = HOMELAND_S1_D2 (Homeland, Season 1 Disc | V | 0x311151A743B9602D1E9759B652EA39AE ; MKBv36/BD+/FindVUK 1.02 -0xEF8E2FC5E16275B8CC0C5CAD752149B4F7F5B91A = HOMELAND_S1_D3 (Homeland, Season 1 Disc | V | 0x41CDA70E8068B66DE1C2EA8239EF428E ; MKBv31/BD+/FindVUK 1.02 -0x4270BCFFA57C33782A1B1FF4552079BA11FE03B5 = HOMELAND_S1_D3 (Homeland, Season 1 Disc | V | 0xA02F9B889305BA2BFE66225D73C8753A ; MKBv28/BD+/FindVUK 0.96 -0x3B8461EB7DCD91684137B9521DBEC342A4028BC3 = HOMELAND_S1_D3 (Homeland, Season 1 Disc | V | 0xFD543217EA9083121DD7B394CC48BFD3 ; MKBv27/BD+/FindVUK 1.00 -0x94201C7B497D264CEA6348E647431235E5F36E70 = HOMELAND_S2_D1 (Homeland, Season 2 Disc | V | 0x16B3E7349FFE46D2E0A9B9795FA3A7FC ; MKBv36/BD+/FindVUK 0.96 -0xE52FDFE67A8EF9A0A2899441E2FAA22D0E62963C = HOMELAND_S2_D1 (Homeland, Season 2, Disc | V | 0x4D9A925F61D96737237C899526E07DDD ; MKBv36/BD+/FindVUK 1.02 -0x940A3347A2D38916EDCAF4BCF19E3DC0AD14BA8D = HOMELAND_S2_D2 (Homeland, Season 2 Disc | V | 0x1C2B8B7434E8A57191753F33561F7A0D ; MKBv31/BD+/FindVUK 0.96 -0xAC0460DA07DF71EDB4FC14FA459BE56B6F9674D4 = HOMELAND_S2_D2 (Homeland, Season 2, Disc | V | 0xA7511E554432207D148D070930AC135C ; MKBv31/BD+/FindVUK 1.02 -0xF17CE0D8353CDC0F6E5B86ACED7154D8D5545371 = HOMELAND_S2_D3 (Homeland, Season 2 Disc | V | 0x09CD2964ED85C6C4F2E92F1537229610 ; MKBv36/BD+/FindVUK 0.96 -0xC1363DA945E610393ED905B6BCBED6BEE6F74523 = HOMELAND_S2_D3 (Homeland, Season 2, Disc | V | 0x4C2AAAAF5726918059C7FCCE91464F79 ; MKBv31/BD+/FindVUK 1.02 -0xE2B3AC5CB3A1F26767E825D48D275DBAFDC253D0 = HOMELAND_S3_D1 (Homeland, Season 3 Disc | V | 0x95AF0F62B012A3CC69EA877B7855F011 ; MKBv47/BD+/BEE/FindVUK 1.02 -0x57D63B00DFB3DEFC1BC9CB01F17F7C4D1AD57806 = HOMELAND_S3_D2 (Homeland, Season 3 Disc | V | 0x221930F696C9D439EADDBB6BF2995215 ; MKBv47/BD+/BEE/FindVUK 1.02 -0xCA497BA81B90408B5FB266F68AA4EE0FA454F547 = HOMELAND_S3_D3 (Homeland, Season 3 Disc | V | 0x361A7813036E6A9CFA65A6826573E9B9 ; MKBv47/BD+/BEE/FindVUK 1.02 -0xB552F243F5060766FCD491A51E8E958A8D256BA7 = HOMELAND_S4_D1 (Homeland, Season 4 Disc | V | 0x76B1BCD99D02E35D874BF173652489C0 ; MKBv50/BD+/BEE/FindVUK 1.02 -0xF9D15D31EEF4062B4355EC2AC407E989EEBB8DAF = HOMELAND_S4_D2 (Homeland, Season 4 Disc | V | 0x4BF3FFC977A17F6B571BC2B2E37219EC ; MKBv50/BD+/BEE/FindVUK 1.02 -0xE2C786368B5FCFD17A8940F9359023A845E6411E = HOMELAND_S4_D3 (Homeland, Season 4 Disc | V | 0x5B723F89018E1B0E6C15881C8CDAB7A5 ; MKBv46/BD+/BEE/FindVUK 1.02 -0xAC6F0DF29E84556523E4B29A907C30713DA47398 = HOME_ALONE_2_F2 (Home Alone 2: Lost in N | V | 0x87FAD6DA27D6D727977D8EE70ACADF35 ; MKBv16/BD+/FindVUK 0.96 -0x39C4F1A39A409AC614E7A76DF22529C2762AC970 = HOME_BD | V | 0xDB8F88E662584D980B722CBF700F70F8 -0x94A8DAC135BA0AD1C4B524E86B110FCCD8CFDFCA = HOME_BD | V | 0x4B6FC14F811823E61814BB60930F2EA7 ; MKBv9/FindVUK 0.80 -0xC1F6074E7A003B3B4C54912AD0BE71230F6F7C56 = HOME_ON_THE_RANGE (Home on the Range - B | V | 0xDA8CC7245B196650A8C8FBF91E9CBE9A ; MKBv31/FindVUK 0.94 -0xEFEAC997FF26DA7F3E5C43A465CB16896F5DEF73 = Home_Run (Home Run - Blu-ray???) | V | 0xAF87ADF0CE07DFE1C4672F5F4126FC18 ; MKBv38/FindVUK 0.96 -0x7D185B99BC1996C482972097CA2C4BD78715E5AD = HOMME DE RIO (L'Homme de Rio) | V | 0xB35F98A8642815DE5AFB20B963D5C637 ; MKBv31/FindVUK 0.86.3 -0xABDDD98861D668B424AE64C577A51FE4E74F29E6 = Hondo WS (Hondo) | V | 0xCDE3D157D3EA48263332352F7D6307C6 ; MKBv31/FindVUK 0.86.3 -0x94B976C53199914547D074033E00EF0ADF48C1D2 = HONIG IM KOPF | V | 0x008C529DBBB9AC59BB919E9638ABFA74 ; MKBrev 52 - FindVUK 0.57 -0x593ED98747E324C09EAE56F9A8C4DD50631680EB = HONNEAMISE | V | 0xA098D7A5B96E3FAA89D7A8582B19C241 ; MKBv51/FindVUK 0.81 -0x03039642CD06A975CF3A8FD946DB659BAE46AC1F = HOODWINKED TOO (Hoodwinked Too! Hood VS. | V | 0x2272BED84CD0395A263B4AF54781C103 ; MKBv21/FindVUK 0.87 -0x5E309975AEFE8D1D5E9108E7A1F1493713C8426B = HOOK (Hook - Blu-ray???) | V | 0xF12C90EE52EE20ABC86D66A71CDE76C2 ; MKBv30/FindVUK 0.92 -0x1E7AC47BA8B45C77777BD206D742A71D56944510 = HOOK (Hook - Blu-rayâ„¢) | V | 0x6CC68823F680D7206F73FDADC8EFA9EC ; MKBv23/FindVUK 0.96 -0x5660CFB56E87739058FF13AD89D89BB19EAAF68C = HOOLIGENS | V | 0x958D8A707C24E028DDB7004C452D4AF0 ; MKBv12/FindVUK 1.00 -0x3655959C8F915B419422567626F1FAF4E4EBB6EC = HOOSIERS_BD (Hoosiers) | V | 0x3B93AEE8278D0E745DA83A72616761C7 ; MKBv26/FindVUK 0.96 -0x64E2048E48E755311343F8436CADED37F1550274 = HOP_DOM (HOP) | V | 0x8BC06B46D8B001AC45D952E54B3D1998 ; MKBv27/FindVUK 0.98 -0x90BE6CFDBA12017C4DFC8E57299D660591B56866 = HORRIBLE BOSSES (US) (Extended) | V | 0x4EA8E28F2268AC4550EBBD0E4283E352 ; mkv20 -0x9F57493681ADDC721E282C004BE50D9FD188695D = HORRIBLE_BOSSES | V | 0xE34924F3BD6192D15E12D57CA385312D ; MKBv23/FindVUK 0.96 -0xC8BC8E15A98FE12C7EF59111548895628F6008A1 = HORRIBLE_BOSSES | V | 0x6047943935DAC26F678162AE454B72F2 -0xFDCD8785EFFF63AB6AB09D99F590A4F3577E5B7D = HORRIBLE_BOSSES (Horrible Bosses) | V | 0xEADACF1BA6C2FCE6D8912D2140026C43 ; MKBv23/FindVUK 0.96 -0xBB124AB87EFE479914E795EBEDA5CC1AD2DDEB91 = HORRIBLE_BOSSES_2 (Horrible Bosses 2) | V | 0xAA8D0CF8A9793D8A5B30B5D44E85CC55 ; MKBv47/FindVUK 0.92 -0x07663A6129BDCF1552E2477FFBD164F73A37CBBE = HORRIBLE_BOSSES_2 (Horrible Bosses 2) | V | 0x81ADBA2935F30EA1E58A699406AC18EB ; MKBv50/FindVUK 0.89 -0xDA0D9EC0BD1385F9CF6D407105AB212E3606C683 = HORSEMEN | V | 0x4D15ADEE37B5B17296074989F20651B3 ; MKBv16/FindVUK 0.95 -0x8793CA5359755C4A927DE852B1D7107D9BDE9D22 = HORSEMEN | V | 0x7DAFB794D45A4383716EAF3AA39176E4 -0xB67F8F0EE77552BDA01E4976453374DE079CA0D9 = Horst Schl????mmer - Isch kandidiere! | V | 0xD4A1CDDA5DE408B3DABAFB312C580F31 -0xC70C0A18F18A83C3A5C6269C66DDBC09D0CB0BBB = Horton h????rt ein Hu! | V | 0x0108BF442883057394385167C8C2A65F -0x93920931CDF3B01C2E887580B7AD8080D93692BD = Horton Hears A Who | V | 0x9F5B2819F3FA17EE7E6902A02A3BB299 -0xE70515CCCB580A0B225C000D8C379F16A7F3D4BC = HORTON_HEARS_A_WHO_F1 | V | 0x22E721781D7E63C0AFD0865F6CB482BA -0xD285475BC0642E65E3F134AC1F9CB07AB0BB17DD = HORTON_HEARS_A_WHO_F1 | V | 0x19F0D58CE39E2B98EBFBDD84D4098769 ; MKBv7/BD+/FindVUK 0.94 -0xD9CC029ABF4E00D5B69BBFA40953B2AFBAE946E6 = HORTON_HEARS_A_WHO_F2 | V | 0x8B828064285638B6830B2B9F2BF1DF55 -0x6CEFB1E1B13D96D899D64355DAB46336A9B05E80 = HORTON_HEARS_A_WHO_FS | V | 0x598368F7136FE8F8A8620BF835B4BB7C -0xBBF273318C868A71412940120C499D67BD1F40F6 = Hostage | V | 0x9BCDC64F38DEEEAD8707DB9830C470B6 -0x39A75194DA99A6A459D6804297CEE664495EB666 = Hostel | V | 0x8927069DE5FED3DD6231400426010BE3 -0x80D17DA5E3C21E2E02BA97529F2D4FEF6E702CF2 = Hostel Part II | V | 0x59710C0104C009DEAC8E711F0D68C5A6 -0x3431CE60E78AD0647BEDFB844D7B199650DDBD8F = Hot Shots! Part Deux (Hot Shots! Part De | V | 0x5F355F056CFC3125854F75FB3DCE02F8 ; MKBv36/BD+/FindVUK 1.02 -0xD945F1C314FEFD9B9C5BF24D4D820BEA1BCC0DB7 = Hotel Transylvania 3D | V | 0x38FA65550AAFE5D9CE2DA39C73EC897E ; MKBv35/FindVUK 0.65 -0x523B6E98D55BFCB9ED79A691EF79F221346001DE = Hotel Transylvania 3D (Hotel Transylvani | V | 0xB053CD27F4FA1A07EA9DAFB33F8B2AC3 ; MKBv33/FindVUK 0.96 -0xBD0DA5C3B168E28CE7DEE102F7909CBF47FE2DE0 = HOTEL_FOR_DOGS | V | 0xF93F9B33F786CC13ACE44809896E9EE2 -0x47A8C02A2DC6481A3027B2F112564A2E740BA261 = HOTEL_FOR_DOGS | V | 0xF82A8F79F1DDC4047B529DA32E694784 -0xEC3DEA2DB24C8FDB0EA9103E23FCEC5D5F3D015F = HOTEL_TRANSYLVANIA | V | 0x2C8A7DB5C6704BF419639AD3A4F8C27C ; MKBv35/FindVUK 0.81 -0xAC09A603C4E4325E97DEFC6E7BE167C666D1613C = HOTEL_TRANSYLVANIA (Hotel Transylvania ? | V | 0x45AC8AD12E87AF3B45A7D80AE8E6DA8E ; MKBv33/FindVUK 0.96 -0x6CD0FA2E12653790F90AA85E98B8779591E68E4C = HOTEL_TRANSYLVANIA (Hotel Transylvania ? | V | 0x3ABF70EB83B89785650F7D1330C7BE00 ; MKBv33/FindVUK 0.94 -0x6617A48580E19BB5DE0ABF5F499427A7611518AB = HOTEL_TRANSYLVANIA_2 (Hotel Transylvania | V | 0x07B978EB40B42B2797BF95562207BAB5 ; MKBv57/FindVUK 0.92 -0xD7A02D03C618033EDF626467A2CFFD95D4A038E2 = HOTEL_TRANSYLVANIA_2 (Hotel Transylvania | V | 0x08F4AD49CE4FF9B1D0AED6CB17E691E0 ; MKBv57/FindVUK 0.92 -0xCFA88B5986A16FA8BCEB77B2F04C1D0C9AAD2662 = HOTEL_TRANSYLVANIA_2_3D (Hotel Transylva | V | 0xCCD38E3C85782002657CADB703F3CD2B ; MKBv57/FindVUK 0.96 -0x651EE1E973A878A24546BE6F08A1A2E465E00E67 = HOTTARAKE_NO_SHIMA_MOVIE_DISC | V | 0x342E8EFBBBE05027C1AA4FFABF7C34C8 -0xE9FBCDB0EDF15E9748950A467E979623F05B5E8F = HOTTARAKE_NO_SHIMA_MOVIE_DISC | V | 0xC1D83208EF817454A38E2E740CFEDBC3 -0x87F1BF0EFDF3033B79BC7E2453A1CB6C8B1B83C4 = HOTTEST_GIRL_IN_AMERICA_2 | V | 0x01862FF793ECC1F8B1D46F5B98A06964 -0x12CBCCDAEAF9E8095498EBA3F291C94EDE2024FF = HOT_FUZZ | V | 0x323E81ECF0A0AA74B8376EAE8DD308D0 -0x6BC046A733EE4B00B5B3C382DE78327433A6099F = HOT_FUZZ | V | 0x6ADA7AF8F2D9F0471DF31FB30399E5B8 -0x8A15158DEAB86E1FC08975E71EE65DE05821B1FB = HOT_FUZZ_G51 | V | 0x2ED105CEF3E6550094D6327ED7631934 -0xBCA8B12E2AB18819CE4963DFB0F0C24DA328E87A = HOT_FUZZ_G51 (Hot Fuzz) | V | 0x1AABA62925BBDE171C50DB4085FD434A ; MKBv14/FindVUK 1.00 -0x4CF71DC312AC99896705F98F2B48BAEF7A7556AF = HOT_FUZZ_G51 (Hot Fuzz) | V | 0xC9D9077EF7637959AFE2C3667C7EE3A3 ; MKBv14/FindVUK 0.96 -0xE739795DF70EEF742782862CAC4DA15BFB54B306 = HOT_FUZZ_G51 (Hot Fuzz) | V | 0x67392CAA4E503FEF0443A9F4C188FC8A ; MKBv14/FindVUK 1.00 -0x5C0ADB972244135359DB87429A49270CC7BDAD83 = HOT_FUZZ_G51 (Hot Fuzz) | V | 0x7325D646C8EE1D4900F56353AF0182B0 ; MKBv14/FindVUK 1.00 -0xE2903722E81A20D23490519996653D9EF7F0D2C4 = HOT_FUZZ_G51 (Hot Fuzz) | V | 0x3B05B86F91A45540388DC90C06B0D7C9 ; MKBv14/FindVUK 0.94 -0x785A6310C680EAD9737B639EF8BD5DD91272E586 = HOT_PURSUIT (Hot Pursuit) | V | 0x096E65297903C61273DF01C0A87C51E3 ; MKBv53/FindVUK 0.84.1 -0xD2B95CDEF8C408E60BAD476E8F265F109B1E0D06 = HOT_ROD | V | 0x3F00DF2DFC83742B219594B3777B59C6 -0x5E7685FAE50BD4F376CD2D210E24029AB1890E44 = HOT_SHOTS (Hot Shots!) | V | 0xA614230D30C737F1C76292B4A88D806C ; MKBv35/BD+/FindVUK 1.02 -0xF5DFDD334BB9E075E61A7D50D14A8675910D65BC = HOT_TUB_TIME_MACHINE | V | 0xEF507402136D25B30A687FEE15BA5262 -0x304072D35AF1187532EF9AD524059374D8CC1C7D = HOT_TUB_TIME_MACHINE | V | 0x40EE52BD8361EE436DDF9EA5A0A32E60 -0x331A7AE8B1241D02B487BECA4026524E924A3248 = HOUDINI ULTIMO MAGO | V | 0x9E900CE701A70BCE2643B589CA583741 -0x0CA479014E2D7E2C1ABF0FE2C95AE2D782D58D81 = HOUND OF THE BASKERVILLES (THE HOUND OF | V | 0x66C98ADD1D255B960317835BEEB7F3DE ; MKBv53/FindVUK 0.98 -0x3335B5574BF87E3D860207D6B6102E398BA0C89E = House Of Flying Daggers | V | 0x908B5F244D4DFD191E539C68E4933D90 -0x578F648A8F6B43D898D93493EFB3C8D5422BF441 = HOUSE (House) | V | 0xECB6F6345E9C827AC3BC67B2519259B0 ; MKBv19/FindVUK 0.99 -0x5C8205139315126E5ED55F326676A1DCC7EFBF29 = House of 1,000 Corpses | V | 0xCCCA3AE6B40A116B221C7A67CA2DE42C -0x8C3E2CF00378DE67CA7453AF4FC594431C6D0B43 = House of Cards - S2 - Disc 1 (House of C | V | 0x046E61FA4F66E206CEA1727E53805CD8 ; MKBv46/FindVUK 0.96 -0x95948375C4FC87F6F72A1B47E510AE64C9786DA2 = House of Cards - S2 - Disc 2 (House of C | V | 0x002EF98324F3F77DDBFE754FC68B1500 ; MKBv46/FindVUK 0.96 -0x5814B1AFCC7A5011F115468C9686F758A5793B10 = House of Cards - S2 - Disc 3 (House of C | V | 0x060C8B94EBB408571D5B655FE37A3995 ; MKBv46/FindVUK 0.96 -0x494A98FCE32B33E207AC295577821D19370EDD0E = House of Cards - S2 - Disc 4 (House of C | V | 0xDE9DAE87C39827A84115A77B552576EB ; MKBv46/FindVUK 1.00 -0x0EB7E522E6BAA102F592EBE95610EF5FA5970AE4 = House of Cards S3 D1 (House of Cards - S | V | 0x37CB210A6D1F061F8235B3A3EB4B3899 ; MKBv53/FindVUK 1.00 -0xD24888B9270EDAD0B332E40CA8CF88D0BE1AB537 = House of Cards S3 D2 (House of Cards - S | V | 0xA0562B7F1A3FE4705841BFC8043B80C1 ; MKBv53/FindVUK 1.00 -0x95AE480706DD50DE71C958CD42F2931440A6100D = House of Cards S3 D3 (House of Cards - S | V | 0x16D40AEFFF9011CD65EC7D3184FEC863 ; MKBv53/FindVUK 1.00 -0x6A79F204CAD70C6C83A5140AAF2DF5EBD4C7002D = House of Cards S3 D4 (House of Cards - S | V | 0x90AB43639EB23448F64AA0191E38F860 ; MKBv53/FindVUK 1.00 -0x32B79074CAE7F84E5FD7986A0C6EC2835A36BDE5 = HOUSE OF FURY | V | 0x4E486378B4AA49B04522C7DD1202EDB6 ; MKBv7/FindVUK 0.98 -0x27C3A04734D273645FB975BCC5CD13E7C3FB4CA4 = HOUSE OF MAGIC (House of Magic) | V | 0x15D0813593513F58CCFD1D2DBF483C0B ; MKBv47/FindVUK 0.84 -0xFB05A9359CEB937DF1C03C588000392A7D0F5245 = HOUSE OF THE FLYING DAGGERS | V | 0x16C037E8F0FE99388C9195855F434834 -0xE6A021FD130780E4DE1B7464178970F8F47E4CFC = House S6 D1 | V | 0x1B357A43A5803B726685316284E118ED ; mkbv16 -0x77E36BE6B2E10A874E4CEED2552E67E05834BA47 = House S6 D2 | V | 0xB7357E5A9194AE227B30C34D243FE2CA ; mkbv17 -0x0A0FDE4F451E80F16B0C6E736C1953E03D6B1262 = House S6 D3 | V | 0x65A49A2C02EA58CCD0B5525DF24F28F3 ; mkbv17 -0x43078A1AFEF164466C5025B46E460284A4DB376B = House S6 D4 | V | 0xB96A85BB2B1CE43C46F9893FF97AD99B ; mkbv16 -0x0122B1163F5E3246B3F8DBB7BD47519C5B2D4638 = House S6 D5 | V | 0x123DB9DB2A7E7A82A926328ACFB7A55A ; mkbv17 -0xD6433A56146F808C6D267F6F2056B712AB171946 = House s7 d1 | V | 0xDB185D0FF9A3E480A8FFAFBD1791F7A4 ; mkbv20 -0x23E6D1075C9EF8E6EC33F8C5AB6F9434242E0655 = House s7 d2 | V | 0xAD314EA0FDFCDA4358C46DCD106A71AB ; mkbv23 -0x43A738C92AE03F2C1EEF6309EA9CA5E1AB806DDC = House s7 d3 | V | 0x3C5D5BD7F7DA65A862C8C875F1939C75 ; mkbv19 -0xE8655691DF6BE4005913D8467A9A35C07F08C033 = House s7 d4 | V | 0x9BA9E50953F22086F6534B75F9315C6F ; mkbv20 -0x731275DB11183C11ADA148F232669E7B040A15F1 = House s7 d5 | V | 0xFC71C17A959F997EF04FF4B835281C43 ; mkbv20 -0x69D639725E0D5D7D8F4FB2D01F7ABB52A9172022 = HOUSEBROKEN | V | 0xD6818EDD51320BDF46FC54EF52A80BD2 -0x3A1BCFA9405FD6BD82A93605FBEE91560E0365CA = HOUSEKEEPING | V | 0x6FFCBE6EA6C902D9066BF771D1C3FB47 ; MKBv62/FindVUK 1.00 -0xA2D50608F8413DB842D0E1F2BCE24F4880BCB7E3 = HOUSEOFFLYINGDAGGERS | V | 0x381E52F99F2B64340D184BFD187791F9 -0x8138BC1274E578568D7AED8F7A0B1E26A9771629 = HOUSE_BUNNY | V | 0x92B6664A541AB95A952D62F719C447A3 -0x6849F6EF4E6615CF57E36377D4CB354D1CB0A8B8 = HOUSE_OF_CARDS_S1_D1 (House of Cards - S | V | 0x095CD1A28C79F89C6672E153AEDB2076 ; MKBv46/FindVUK 0.98 -0xC5E2AB360336886C43DA2038218645D8DD8FEE67 = HOUSE_OF_CARDS_S1_D1 (House of Cards - S | V | 0x7E12FFAF9F6A4ECA405EE301FE04FC05 ; MKBv34/FindVUK 0.96 -0x86C84649C15B7D91CF55D358A5263A0AF2045469 = HOUSE_OF_CARDS_S1_D1 (House of Cards - S | V | 0xC0D2C4997A97114D948BBD6776980991 ; MKBv38/FindVUK 0.96 -0x426BD8BAF26483ACD946058A5F7B9810616F7503 = HOUSE_OF_CARDS_S1_D2 (House of Cards - S | V | 0xC48D6561681B9530BD8A3727CC65BF65 ; MKBv38/FindVUK 0.96 -0x8F4FFC5C0EA0C34657BE780154A709359A7D09EA = HOUSE_OF_CARDS_S1_D2 (House of Cards - S | V | 0x5BD75F0857CB2F828B05D977E4194AA0 ; MKBv38/FindVUK 0.96 -0x8D638774C1FF5B89AEED0BB0C6B6CCC6FCC5C72A = HOUSE_OF_CARDS_S1_D2 (House of Cards - S | V | 0xB17BC1415E2F9C62DCACEF92BD8237D9 ; MKBv46/FindVUK 0.98 -0xF87D7FAA717DCB84C5444A30BC81604290B961CC = HOUSE_OF_CARDS_S1_D3 (House of Cards - S | V | 0x1CA2DF5E7E8B17B591AA27D8A956EB1C ; MKBv46/FindVUK 0.98 -0x4455715408373BB90261E2D9F9F78B03B36D8406 = HOUSE_OF_CARDS_S1_D3 (House of Cards - S | V | 0xED7E4F666843F303911F002A1590682F ; MKBv38/FindVUK 0.96 -0xEC6ECE6B4E10C135F52FE72911231763B721DC2E = HOUSE_OF_CARDS_S1_D3 (House of Cards - S | V | 0xA9203239DBA3FD408DEAFA5ADA2F4AA3 ; MKBv38/FindVUK 0.96 -0x59C8897B78B3E08BDC2FF12A720A8CF5B9992895 = HOUSE_OF_CARDS_S1_D4 (House of Cards - S | V | 0x20323A72C5E28F64E094478E9C067C39 ; MKBv38/FindVUK 0.96 -0x47A640DC78EB5E259228E8AE9A8D99EE97D42A57 = HOUSE_OF_CARDS_S1_D4 (House of Cards - S | V | 0xFAEC3131592ED09A7C5FA5934FE241D2 ; MKBv46/FindVUK 0.98 -0x7A68F9D77F3585E247117BB11F9F5B41EF20C8CF = HOUSE_OF_CARDS_S1_D4 (House of Cards - S | V | 0x4AA3D14E6AA0DC988FB016E4C5A27A4C ; MKBv38/FindVUK 0.96 -0x2F6E3E0CE1B58DDD20955100F6A931D64AEA5A4C = HOUSE_OF_CARDS_S4_D1 | V | 0x3A6A40473ED471D4D1B93269BA060968 ; MKBv60/FindVUK 1.02 -0x59FD0131DAFEC0BED104BA1AFA0CA5C09C3BFF44 = HOUSE_OF_CARDS_S4_D2 | V | 0xBF2A37B79D11208BC78A51BA1197E2DD ; MKBv60/FindVUK 1.02 -0x131487BEB93EEFE75866E1D52F91890B8E3E6CE9 = HOUSE_OF_CARDS_S4_D3 | V | 0x1B0DE29AB3E5D7525E3254A188FA1CF9 ; MKBv60/FindVUK 1.02 -0x00FAA8BB7518DE72298F9EE8156EC77D7503B135 = HOUSE_OF_CARDS_S4_D4 | V | 0x24D0BF5F47988DFDFCA18F7DA6E4DD80 ; MKBv60/FindVUK 1.02 -0x607675E3ECDCC36202EADC0BC85A5B34337D1C33 = HOUSE_OF_CARDS_TRILOGY_D1 (House of Card | V | 0x8172243B8DB7923604874DAE3FB6F7EC ; MKBv31/FindVUK 0.96 -0x87EF86B3FEC83D342140F1815A1E1640CA8D3E08 = HOUSE_OF_CARDS_TRILOGY_D2 (House of Card | V | 0x241B5D79EBB558F82B46BE9C789BF198 ; MKBv28/FindVUK 0.96 -0xD67A7EBAAAC34AF5BA04CE6A5EDC6A73C5CDF0EE = HOUSE_OF_CARDS_TRILOGY_D3 (House of Card | V | 0x50EE60BDB46EF71905776E1E6BEBE609 ; MKBv35/FindVUK 0.96 -0xE8D01D2A22E520FA01B12170AEA97C49D0557EA0 = HOUSE_OF_THE_DEVIL | V | 0xF5EA4FDE6584711C5E16864BD7F528B8 -0x37E394A7793AF15A720FECC25F756175DE460E41 = HOUSE_S6_D1 | V | 0x7FB9826180B8EDB3DE4DB99043A87059 -0xE41F84462C2C29F1E6F0E024C2944A237C314D89 = HOUSE_S6_D4 | V | 0x5236165175D7F02C3BE12F221D814B07 -0xA4013F561B0A8CA1A2C6355938DCB6666AAF72EF = HOUSE_S8_D1_G55 (House: Season Eight (Di | V | 0xB8A7F0DF407E8657A87B17095E594095 ; MKBv33/FindVUK 1.02 -0xE586F85A7FC8FE783EB578709DF93D3D154F3B38 = HOUSE_S8_D2 (House: Season Eight (Disc 2 | V | 0xF42D7606045A5B8E1D6F0E5F38E0C811 ; MKBv33/FindVUK 1.02 -0x0326DF41EF411ADD27285ADCC92EB5D86711EDE4 = HOUSE_S8_D3_G55 (House: Season Eight (Di | V | 0x7A60CC4C49225002F33E3BA866BD2433 ; MKBv33/FindVUK 1.02 -0x365EC39E4E7BB65FDA561E9B40F38129F21297E8 = HOUSE_S8_D4_G55 (House: Season Eight (Di | V | 0x1AC3A37BCAB4FC2C4B56E6617807FA9E ; MKBv33/FindVUK 1.02 -0x23CDBF88436DC1D584A812B065AD6DC10026DE81 = HOW TO TRAIN YOUR DRAGON | V | 0x913BBA0AA6C75CEA310401A47EB97BB5 ; mkbv18 -0xAC5DAB4B5D6CB9C2F6EADC50126E6F4A00DC30DA = How We Got To Now D1 | V | 0x58EC088EF26DE78F6C4FBE3799CF5168 ; MKBv50/FindVUK 1.02 -0x95D4BD657359EEA5A81DF9B43EE49E2B3D6B263C = How We Got To Now D2 | V | 0x36CFEE4854327865C0D622B0FF9F0D00 ; MKBv50/FindVUK 1.02 -0x119EE540A7741316BF57939DB26AA21108B82B06 = HOWARD THE DUCK (HOWARD THE DUCK) | V | 0xC04BA4F665B1DB15DBEC7563D63264ED ; MKBv33/FindVUK 0.96 -0xBE218F2D0D8A580CCEE9A1683E0EBE740A1F2AA9 = HOWLS MOVING CASTLE (Howl s Moving Castl | V | 0xAD98300C94657B8F7EF795B64E2EB6C0 ; MKBv30/FindVUK 1.00 -0xDF29F7518E93C132B8E67F8B87214DCCB4AAD491 = HOWLS_MOVING_CASTLE (Howl s Moving Castl | V | 0x9E8B1EC9D820DAB5B64630B1B71626BC ; MKBv31/FindVUK 1.00 -0xC2B3F094F5126BA185CF1820914F3D6E875F9E60 = HOWLS_MOVING_CASTLE (Miyazaki Collection | V | 0x2792DA6B37B8378294F2A839BDB5E4C5 ; MKBv47/FindVUK 0.96 -0x14D051F883EB00DCA754292D0C5A521DF94EA53E = HOWTHEGRINCH_UPB1 | V | 0x95886CCC373C348C943B4FD7FA4AFF81 -0xED7C23F676648AFA6E3E5586B4FC178729034E25 = HOWTHEGRINCH_UPB1 (Dr. Seuss How the Gri | V | 0x09716B6501114633A3B302472BE60DC3 ; MKBv50/FindVUK 1.00 -0xB3C3D7434ED9E1681C2528611317CA4297D6DA6B = HOW_DO_YOU_KNOW (How Do You Know ??? Blu | V | 0x9F829164A346989C7746CFB03CE73D7E ; MKBv21/FindVUK 0.96 -0xE711F1226CD322A25CD0E21243A322377CA197A4 = HOW_DO_YOU_KNOW (How Do You Know ??? Blu | V | 0xDD8CC3D6F0A1E881FBB258EF014183BA ; MKBv20/FindVUK 0.87 -0x9A99E3D1B235E11E0CE161B0590CD5F9727E67E0 = HOW_EARTH_MADE_US_D1 | V | 0x58E79E9279801A9D8D2A946A25317EE3 ; MKBv17/FindVUK 0.80 -0xA5B794CD65B2B3EC575CF2A640F87FED7FF16CBA = HOW_EARTH_MADE_US_D1 | V | 0x3BF1E8A0D112EBF8C7ABA5662D35AF2A -0x10D516DC40A2C1FFA5B87A96C9731FAA23DB18CA = HOW_EARTH_MADE_US_D2 | V | 0xDB890FE033B769FE22E75A13528A401C -0x137D3789D8C28B702D08E0BC1DA92890BAE2B9AB = HOW_EARTH_MADE_US_D2 | V | 0xEFF1D7A34B5F165382EDB9FC4948BF30 ; MKBv17/FindVUK 0.80 -0x97EC8016BA1CA3F9AE51D35F01CDC8F36968562E = How_I_Live_Now | V | 0xCE1931B01FA33CE49E65500156E5E0BA ; MKBv46/FindVUK 0.80 -0x945245EB31A314F7D34F6753CF926A128DA73FBA = HOW_I_MET_S4_D1 (How I Met Your Mother - | V | 0x08FE8C43FFED640ED3EC4019A0978BA6 ; MKBv12/BD+/FindVUK 1.02 -0x20BA37C6C05D99F5C4DE24354E7D6AE2460B4B80 = HOW_I_MET_S4_D2 (How I Met Your Mother - | V | 0x9B6B1FC4FA749576D8260F6820E22266 ; MKBv12/BD+/FindVUK 1.02 -0xE8B5DC868C4C377FC3ECF06226D65A73AE74B6E2 = HOW_I_MET_S4_D3 (How I Met Your Mother - | V | 0xE2F1D1D5FF4870C51ADD6BEFD082F544 ; MKBv12/BD+/FindVUK 1.02 -0x66D81F483107CD088217050ABC9D1F23B492ED86 = HOW_I_SPENT_MY_SUMMER_VACATION (How I Sp | V | 0x313AFB53AB9BF65845DCB97942895F6C ; MKBv30/FindVUK 0.84 -0xA78EE8D4AD76B15F9DF82F2FC3B24BC432AC7F74 = HOW_S2_BD1 (HOW_S2_BD1) | V | 0x410BCE76413C949D75563D5E20D26C5D ; MKBv34/FindVUK 1.02 -0x75A2D0BF96A25A7BAF24CA0E88744641A5E1B795 = HOW_S2_BD2 (HOW_S2_BD2) | V | 0x86ED4E470C0AB3BA3B7F8218707382E8 ; MKBv34/FindVUK 1.02 -0xEF7B44055D3451F51886BCEAE34637B4D0A0C99F = HOW_S2_BD3 (HOW_S2_BD3) | V | 0x3B1AA9649B0EA57CFE92CAE918DC9A3A ; MKBv34/FindVUK 1.02 -0x5E3B2523DC0549FA2A623668E4CDC95F0BA35A23 = HOW_THE_EARTH_WAS_MADE | V | 0xFC89D68D2695E8B36993E3847A27943F -0x379277B9701E84FF0AEEA53CD7906A092709E9A1 = How_The_Universe_Works_Disc_1 (How the U | V | 0x72AEF0AED66E1A77D8472D7569319853 ; MKBv30/FindVUK 0.89 -0x17C0D5408D9ADE46DF9A5853DF5A79A18F6B740D = How_The_Universe_Works_Disc_2 (How the U | V | 0x315D245A4686C2C1E112D716BF9CB3E5 ; MKBv47/FindVUK 0.89 -0x75A2F73EC73CD04DE17D3B65736EF1D569EE6003 = HOW_TO_BE_SINGLE (How To Be Single) | V | 0xDC49CE5FA4A522C53B8171252EC2E62E ; MKBv56/FindVUK 1.00 -0x4AE98F942A03525842FBC8E6C59E40C628AC0AEE = HOW_TO_BE_SINGLE (How To Be Single) | V | 0x76F883A00D257CD321CF3C0D2F26C991 ; MKBv56/FindVUK 0.99 -0x8F3462D0480A4DA90666384818EBE70195ECAAAA = HOW_TO_MAKE_LOVE_TO_A_WOMAN | V | 0x364418E5C4581055F42A4F3B3085BD6F -0x2D96943A5E2CC64BCD9C81CA562E33BDD9CAB857 = How_To_Marry_A_Millionaire (How to Marry | V | 0xBCD090ED711E0AF80087D9ED89B9CAEB ; MKBv27/BD+/FindVUK 0.90 -0xEB747B956E9490AE64E6F94231D8A57A5631A9EA = HOW_TO_TRAIN_YOUR_DRA | V | 0x17C1EFE50A61E2DD9F6393499DAFB198 ; MKBv18/FindVUK 0.80 -0x28C05CB707C0B121299999202B1EE2026BE85246 = HOW_TO_TRAIN_YOUR_DRA (How To Train Your | V | 0xF281530881A05CE05FFC383E3BEACEE8 ; MKBv18/FindVUK 1.00 -0xBF409955BF9DE415BC1B2FA876E231FC2EF06293 = HOW_TO_TRAIN_YOUR_DRA (How To Train Your | V | 0x59AF99F05222A9613977159EABCBA24E ; MKBv18/FindVUK 0.96 -0xA841B4A62C9ADE9093D6A5EB33961C5060E868A0 = HOW_TO_TRAIN_YOUR_DRA (How To Train Your | V | 0x93C0505BCE22403B6656DC5BE1EDF9AF ; MKBv18/FindVUK 0.87 -0xA38B409B44A70713CD267EFB403BE05F21D09D7F = HOW_TO_TRAIN_YOUR_DRA (How To Train Your | V | 0xEB186DF208F12602E61ADD6CF957CD22 ; MKBv18/FindVUK 0.83 -0x9D710EFBB80A6AC1FB786459943E54BEE1693A94 = HOW_TO_TRAIN_YOUR_DRA (How To Train Your | V | 0x3A35E8FC3C725E3D17A4171965026CA3 ; MKBv18/FindVUK 0.99 -0x14448A9F1EE35489FE7B133B69FE5AB107D19DBD = HOW_TO_TRAIN_YOUR_DRA (How To Train Your | V | 0x9FA6756D246EB685F7BFB94F598B35DD ; MKBv18/FindVUK 1.02 -0xE560852F3A98FE5F6484426FA18FB3011B4D57F8 = How_To_Train_Your_Dragon (How to Train Y | V | 0xC83073DCCB9ECC9FC81C3B24305B080A ; MKBv39/FindVUK 1.02 -0xB1A1B5AFCDDBF73B21C26A02C929DA2038557479 = HOW_TO_TRAIN_YOUR_DRAGON_2 | V | 0x5E4C0827A4949A4BB1442C9C7E21687E ; MKBv39/BEE/FindVUK 0.84 -0x7624CBA6EE179D4376012D30801E1C189789B8D6 = HOW_TO_TRAIN_YOUR_DRAGON_2 | V | 0x40DB0F7B01B31269970BEA1ACFE10122 ; MKBrev 39 - BusEncrEn - VUKNOTVALIDATED! -0xB1A1B5AFCDDBF73B21C26A02C929DA2038557479 = HOW_TO_TRAIN_YOUR_DRAGON_2 | V | 0xC5B500CF3DD73C23B1F81DE093AB221D ; mkbv39 -0xC2107D282908E45BC13E343514620B77828CB67F = HOW_TO_TRAIN_YOUR_DRAGON_2 (How To Train | V | 0x88AB2EC05592405F6629D5BE4B579826 ; MKBv46/BEE/FindVUK 0.94 -0x59B8FB596CEC0CC809A00CEBBE1F6E2C43335EF8 = HOW_TO_TRAIN_YOUR_DRAGON_2 (How To Train | V | 0xA3A84CAF3569B034BF446021A8966442 ; MKBv39/BEE/VUKNOTVAL!/FindVUK 0.92 -0x12D4AF7C8E487C78EEB26D45C2FC2EE3282D09FB = HOW_TO_TRAIN_YOUR_DRAGON_2 (How To Train | V | 0xE0BD2A698698D8CF508E4D7075C98B33 ; MKBv39/BEE/FindVUK 0.98 -0x3008B66E9A1E55E003E664FE74B08873B9FD730C = HOW_TO_TRAIN_YOUR_DRAGON_2 (How To Train | V | 0x0424977024D84F18C3994953DACDA9C6 ; MKBv39/BEE/VUKNOTVAL!/FindVUK 0.87 -0xA44AED2BA7E316F4AAF7880E829361F36097A29E = HOW_TO_TRAIN_YOUR_DRAGON_2_3D | V | 0xAEB699ACBFB195BF07BC9FBFDE2BF2B9 ; MKBv39/BEE/FindVUK 0.80 -0x9EE03B1BABAA2A571487DCD4F30AD6F996FF87F0 = HOW_TO_TRAIN_YOUR_DRAGON_2_3D (How To Tr | V | 0x0790EC22D2549D43E67A742A6BF7A3B9 ; MKBv39/BEE/VUKNOTVAL!/FindVUK 0.87 -0x5D1724B2D721F159621D53E562E415C06A3F6FB3 = HOW_TO_TRAIN_YOUR_DRAGON_3D | V | 0xDBF6F601897D96E13A7B4705A05ABE5E -0x69DBAD3A473947F0DFC6FD79D27EE27665ACAD6A = HOW_TO_TRAIN_YOUR_DRAGON_3D | V | 0x1C6FF10EA15809AC39E76D58DDB15244 ; MKBv19/FindVUK 0.80 -0x60A6D1B1D75B317E00299B9243BB017CA1A1FFBC = HOW_TO_TRAIN_YOUR_DRAGON_3D (How To Trai | V | 0x5A249A10BA7E2290B76B5926090D87A3 ; MKBv23/FindVUK 0.87 -0x57B59B97DE85C5CD873596C2AB640B69D28D0A2E = HOW_WEST_WON_D1_BD03 | V | 0x3745A1A83FC7E49D60232112197E67E8 ; MKBv7/FindVUK 0.84 -0xFE1A8CE3AD1071BE22DFA2C5E0946B8B7107DB86 = HOW_WEST_WON_D1_BD03 | V | 0x69D72ED98DCF2CA08DB4097D3991DFD1 -0xB5B24D543A93421D5B260103B3B50CC1206D8C66 = HOW_WEST_WON_D1_BD03 | V | 0x099EB0E46F116B5220A30116780E0D48 -0xACABD5B581ADE596685A247244348D4B177E0F41 = HOW_WEST_WON_D1_BD03 | V | 0xB0D1FC48D75DB7F52B6D021D9917D653 -0x36AC60DAAE8BFCF32D6B7F5C6402F37CA5535769 = HOW_WEST_WON_D2_BD03 | V | 0x90169B7B3DBCED65F2FC9094F15CDA4D ; MKBv7/FindVUK 0.80 -0x49429CCC2B994F19EC62C55AEC2C8CB2C897693A = HOW_WEST_WON_D2_BD03 | V | 0xF0AAF734F6DCA9A4ECABF559FACFEF7A -0x34EB6ED3EB161B68E3B29D4A7D8ABAB99FE1EF8B = HOW_WEST_WON_D2_BD03 | V | 0xE595B64152EE685767104C4A7A4C3FB6 ; MKBv7/FindVUK 0.84 -0x99701923A5CE07FCC19601C9BBD51FC11C80340D = HP1_PHILOSOPHERS (Harry Potter and Philo | V | 0x12E110EC13DDE6F43DAF305A0CAEF983 ; MKBv15/FindVUK 1.00 -0xC08A766E4454529770D3C82B22FEE7F3B99FAD2C = HP1_SORCERERS (Harry Potter and Sorcerer | V | 0xCAC705683E8771FB26181375C3C18D7E ; MKBv14/FindVUK 0.96 -0x245F335427FA74CA7001B44BA69A99C98EA30ABF = HP4 | V | 0xFF371F3E715710F48A092C06AF4477FA ; MKBv4/FindVUK 0.99 -0x3D0E787FA762F6F3C1450C86BC40331CC3C7CA6B = HP4 | V | 0x3FE9B0F4D9E90556759B7D8638D07295 ; MKBv4/FindVUK 0.96 -0xD2624CF70B0B8ED6F9B8CFB21B5399503F0AAA9B = HP4 | V | 0xFA41A0B39EB47E808AB05D60D5A3BCA5 ; MKBv4/FindVUK 1.02 -0x67D6E7297EA66393C31C3598C0B04EA655B95B5F = HP4 | V | 0x40026A00A5D95CF2E3B6597326A1F496 ; MKBv4/FindVUK 0.96 -0x27947582C4698EC939FCD433AA8D5429C2F782DC = HP4 | V | 0xF11D04C9DF0E584581F9D6BF49C3FBB6 ; MKBv4/FindVUK 0.99 -0xDEB1668854A64A016E2681B3E4344E4552CF5E34 = HP5_PHOENIX | V | 0xCF10A06317D2428E26017137815C9B18 ; MKBv4/FindVUK 0.96 -0xCC7113B03056E378E7A94930F2BD6778B5DD185A = HP5_PHOENIX | V | 0xBA6268D58DB21B4123F9E32E0D4FA8E3 ; MKBv4/FindVUK 1.02 -0xB4375BEB0DEE02AED70316FBD10AF8FC9055C928 = HP5_PHOENIX | V | 0x9E1ABF5EDE833E2E8BBF35379F7EF061 ; MKBv4/FindVUK 0.99 -0xB931FC246D02A929AF84676403A61675E4CFA500 = HP5_PHOENIX | V | 0x5D7DF54C421BE0B58D2AE1514AE703CC ; MKBv4/FindVUK 1.02 -0x3CBE27C7241B987FDF1C218770E924EEE3ECC065 = HP5_PHOENIX [Harry Potter and the Order | V | 0x1BEC89200F22990CF048E39C27FEFFF9 ; MKBv4/FindVUK 0.84 -0x5FABA7C1E37ECC1FDB7726C2015D3C9A23E6B0E3 = HP7A (Harry Potter and the Deathly Hallo | V | 0xB6B66B5BE7CA8C4A3BDC2FBDC1CE87F3 ; MKBv28/FindVUK 0.96 -0x327F0994C5C0F55005595F537B4F33A04BC8534F = HP7A (Harry Potter and the Deathly Hallo | V | 0xCBBABC94F9CB3BA04883C2613BDB1847 ; MKBv28/FindVUK 1.00 -0x26F1159CB515CF813BA449DC26AC7F62D82B3D36 = HP7B (Harry Potter and the Deathly Hallo | V | 0xF1B15FB25C9F3BB8D0AA91CB3A2A4D68 ; MKBv20/FindVUK 1.02 -0x2E5391336F66E8C1797BD0952B1ACE51BB8A1406 = HP7B (Harry Potter and the Deathly Hallo | V | 0x48FF8293BF627C808BB5D731E05DA49F ; MKBv25/FindVUK 0.96 -0x6C7DFE9A150B2985931795A64F10B73BE8908257 = HP7B (Harry Potter and the Deathly Hallo | V | 0x15B251199837CBF9F7E9F05B64AD4D99 ; MKBv20/FindVUK 1.00 -0x53AB80EFBE1158A53532777145B8677A7D93D40D = HP7B (Harry Potter and the Deathly Hallo | V | 0xA877383A3A9002B47429C2978B279258 ; MKBv25/FindVUK 1.00 -0x99CC232E30563437CEC68E991A5D4829E6AA4462 = HP7B (Harry Potter and the Deathly Hallo | V | 0x73DAE28A3B4829B61DCAE6DB17C57F45 ; MKBv19/FindVUK 0.96 -0x397DEE3740066532E1A1DC7B30ACA4F926728998 = HP7B (Harry Potter and the Deathly Hallo | V | 0x93403EF8B2FF6F5A69F0F754F0BFBC27 ; MKBv19/FindVUK 0.98 -0xC0015BE2F375A7CA06E59448C8845858934ACC97 = HP_AND_THE_PRISONER_OF_AZKABAN (Harry Po | V | 0x6CA91267D1E835A561CF38F50AA6CE62 ; MKBv18/BEE/FindVUK 0.96 -0xCA9833BA76A0387E0C952F5860B600688CD113BF = HP_AND_THE_PRISONER_OF_AZKABAN (Harry Po | V | 0x927E71E9587BCB5765FC6BFC803A49FC ; MKBv18/BEE/FindVUK 0.96 -0xAFE60B2DB4020CAFC19F64573FEF526B1A52D201 = HP_AND_THE_PRISONER_OF_AZKABAN (Harry Potter and the Prisoner of Azkaban) | V | 0xE05AE3BEBFCC2EA21F29B16EC4AA6A2A ; MKBv18/BEE/VUKNOTVAL!/FindVUK 1.00 -0x5F6419237C933DBFA033A653DAE24D34FA98C4EF = HP_DEATHLY_HALLOWS (Harry Potter and the | V | 0x30225FA859C740EE08AFAA6B8BE8B4AC ; MKBv25/FindVUK 1.00 -0xA97B9795C25164CA7945AAEE6438ADDF2F300AD3 = HP_DEATHLY_HALLOWS (Harry Potter and the | V | 0x079EB543A1FD98BA9BF2593270700596 ; MKBv25/FindVUK 1.02 -0xB74A5E41A0521CBFB9A01E289A0A2D438EF5D5FB = HS0x31AAE1 | V | 0x92EAAEE6915ABC5E2BD0AC84C3D9B5A7 -0xEDC26471513836FAF892FB07FE0A3517EEEC48B0 = HS31EUE1 | V | 0x7884FE08D506100E1016F1346C3A5BF5 -0x2E44BAA623E51DFC041B265E3D9BD55C662BE781 = HS31NNE1 | V | 0x2F4FF594D1EBCAD2918A0EFF11741F49 -0xAEE7F910A01BF61173CC298CD949CEA67B5416B2 = HSOTD DISK 1 | V | 0xA0E3A56CC94D34A9E3D867BFF8F53A9D ; MKBv40/FindVUK 0.72 -0xB80F3D08D8440EE1E78C3D5938895099A8FA9ADD = HSOTD DISK 2 | V | 0x32892EA3E5A17A8DAF8F5E78AB74592F ; MKBv40/FindVUK 0.72 -0x7AA823FF9DEA12B8713ECF1B61105EDEEE36BC9B = HSOTD DISK 3 | V | 0xD8E870DF05AF653D94883DEC87AB4BE2 ; MKBv40/FindVUK 0.72 -0x880F5A69990D433AA1668D5452B028E27F2761BD = HS_DxD_BorN_D1 (HS_DxD_BorN_D1) | V | 0xBAA45EA843B1E5E20D119AC8A8F5A1D8 ; MKBv61/FindVUK 0.99 -0x3E5EBC703C3227658131421E41F5F9933F5944BA = HS_DxD_BorN_D2 (HS_DxD_BorN_D2) | V | 0x18F4BA7CF5A5E2B290150DB169E140F1 ; MKBv61/FindVUK 0.99 -0x503CE0EFAC717927087A0A31F46C0218708DD870 = HUGO (Hugo) | V | 0xD7C039E50EA4D2625ACC1EF6AC21C16B ; MKBv26/FindVUK 0.96 -0xF3A13C7D7B6E2102A44A7447945C0B4F6C3DCE20 = Hugo Cabret 2D | V | 0x8FD1D24B5DD2DD1FAD9BEBAB1ECC606D -0x0F45210614CF890B4546C1F8C3CE0E3A26D16B56 = HUGO_3D (Hugo 3D) | V | 0x91488196697A948D1C02E1A91986A239 ; MKBv26/FindVUK 0.91 -0x694078298A6501548E55957B524F0397A4197669 = HULK_2003_G51 | V | 0x0FAFC77665B19DF12B5696D8F4F4D5CE -0xCEBF1472F4F8C54492EE920A44A26DEE246C0CB2 = HULK_2003_G51 (Hulk) | V | 0xB7C08F7DBA05435E38FA8AE2A20EF6D6 ; MKBv7/FindVUK 0.98 -0xC898A20D0D7A70F5744A37701DBD26704783BE27 = HULK_2003_G51 (Hulk) | V | 0x29BA9EA50F35EDEB56B04368207F6E19 ; MKBv7/FindVUK 0.96 -0xA4C1AB252F066A98BDC6C55059E9F9F5977218E5 = HULK_VS | V | 0xFDBB8AB94164207986A4CC33C50599A6 -0x6C1FB11C87927D4B91060F0DCE3F4E3ACE04815B = Human Target s1 d1 | V | 0x6926ACAD000ACFF094518CECEAE1A814 ; mkbv16 -0xA42DFEB633496064C27B7D91B2AA5EA917122D3F = Human Target s1 d2 | V | 0x9A49685F06E3B0D4FD4AC4C292D28B9A ; mkbv17 -0x6CDABEF0C8B543F6B2EA797316CC1E326D449E98 = HUMANPLANET_D1 | V | 0x924F1336AB54DFF96A09E616656F0C42 ; MKBv19/FindVUK 0.80 -0x31B2B3509AABD03CDAB5DA96BBF8439E7B741DD1 = HUMANPLANET_D2 | V | 0x6294CF37287ED7E87D04ADE04734D110 ; MKBv19/FindVUK 0.80 -0xCAB41960255155704E163E2B196A108E85B279BE = HUMANPLANET_D3 | V | 0x55FFBD69B8917C04A764DB137C0A42EC ; MKBv19/FindVUK 0.80 -0x0F21DF42CAEDDE9BF6532D04849EE7200C706DE1 = HUMAN_TARGET_D1 | V | 0xD9B0B576CB72B2C585AB77112CC6ECEB -0x89C870F7C9D34F2D513F71E5586C30931526935F = HUMMINGBIRD (Hummingbird) | V | 0xB193C611CDE1875298EED79AFCA37D0A ; MKBv42/FindVUK 0.84 -0xC40D915E5EC6F8E1E8BE6A425101E03D7BA98585 = HUNCHBACK OF NOTRE DAME (The Hunchback o | V | 0x244544EA3FDC33FB86C47B9D68E5B2FE ; MKBv31/FindVUK 1.02 -0xA2632AFA559B7F76FAC744E39AC6234DC871C028 = HUNDERTJAHRIGE (HUNDERTJAHRIGE) | V | 0xD8C45B2C50D0AB3179B51FFF5EBDFDEE ; MKBv47/FindVUK 0.99 -0xD6E4C089D4DEC9FB350B0C8168334CE33F1C0747 = Hung season 1 disc 1 | V | 0x198191D79EFF15B25F36EB431EE9286C ; mkbv17 -0xB0E65FACD1D303457C07F9BCAF22AAC153608252 = Hung season 1 disc 2 | V | 0x90B0823FFD9A1C9CAE89642E63F60461 ; mkbv17 -0x18EA677058CF0F88E06C45476040B3FDC34092BC = Hung season 2 disc 1 | V | 0x23B2F562233BD8EB06DBF409F6458FBD ; mkbv19 -0x07D6F79C5E866B35FAF41993EAE53F616EC55DC4 = Hung season 2 disc 2 | V | 0xCCA5F6FD88F532F7589C9885C6423336 ; mkbv19 -0xFDC4B83A498CB585F44F8EF9CAA0D5D8BCBCD9F6 = HUNGER | V | 0x1F7C66393744603A4E54E6D5E5370C83 -0x38A49D5D3494BB64DE8C360BB0CE1566CEA28F7E = HUNGER GAMES 2 CATCHING FIRE | V | 0xB6AC87000784AC788FEC651CCB2B4293 ; MKBv46/FindVUK 0.65 -0x0C648FC6416C359BF0D66E5B422A9C1198AE702F = HUNGER GAMES 2 DISC 2 | V | 0xF259158AAA3E4AE91E1BCCD5910F4AFA ; MKBv46/FindVUK 0.65 -0xEC8BC9755E1F9D06F478FF60E637B8E2D6239308 = HUNGER GAMES MOCKINGJAY 2 1 | V | 0xF281E5EC666217E49BA896E1CC36969B ; MKBv58/FindVUK 1.02 -0x1E0C95E6DD8D62708EFD0B506F7989EEEB624CC5 = HUNGER GAMES MOCKINGJAY P1 D1 | V | 0x6CD046A5AF780545E0E702BD6221F3C1 ; MKBv51/FindVUK 1.02 -0xDFA5962812B42694554657A790EE47836A82403D = HUNGER GAMES MOCKINGJAY PART2 (THE HUNGE | V | 0x91A74D6C10FBA35F7DC02C0A55EB3372 ; MKBv57/FindVUK 0.96 -0x0D006058263E03F0AF6F7DF774C01C837FDFE5E5 = HUNGER GAMES MOCKINGJAY PART2 (THE HUNGE | V | 0xEEE27CE93F91A93E23DCB27F65BDA774 ; MKBv57/FindVUK 0.96 -0x678C30C6D8D02E676A71C51276731A8E510A3304 = HUNGER_GAMES (The Hunger Games - Blu-ray | V | 0x3A9FEA55349A7517753B91C92C7A0E1E ; MKBv46/FindVUK 1.00 -0xE4ACF38E58E30A4C0BF2CAE1D1F39924FB3690A8 = HUNGER_GAMES_2_BD1 | V | 0x4D06CA8D22DE205938D72E924A5B8A5C ; MKBv46/FindVUK 0.65 -0x5F70294AB69DD5FC22828CED8CD7B8540E13B0F6 = HUNGER_GAMES_2_BD2 | V | 0xAD473A0B62C93F72200F665F1445A3CB ; MKBv46/FindVUK 0.65 -0x36E4637AEA127AA4F52CBB3DC16664164B74B5FA = HUNGER_GAMES_3_PARTIE1_BD1 (BLU-RAY) | V | 0xC883193C11E98DF48B9D7BFBCFA85928 ; MKBv51/FindVUK 1.00 -0x561A790F1A9DD2E26CEA72760652F3015582981F = HUNGER_GAMES_4 (BLU-RAY) | V | 0xC4E066F4FA1E3073C0FB314FD51F4443 ; MKBv58/FindVUK 1.00 -0x440F5FB54FEABFC689051FDCA9806A172D3CBD6E = HUNG_SEASON1_DISC1 | V | 0x116E6B699EA2AEDEEA403C6C3FAD989B -0x560A440303610259757D20BA115119223F5FA752 = HUNG_SEASON1_DISC2 | V | 0xAAD061050D32FE7F8DAB05EFEF70C977 -0xC4BC3EFADA74291C23957B90902BC182001C51E8 = HUNT FOR THE WILDERPEOPLE (Hunt For The | V | 0x75D81BD346B46DFE6765DE0A96C6928C ; MKBv61/FindVUK 0.98 -0x513A5D09F53481CD5BCC96CF3A3EFF678CE42B8B = HUNT TO KILL (Hunt to Kill) | V | 0xD5BFAFEAA195BDAFC6CC77656920BB85 ; MKBv18/FindVUK 0.84 -0xDACA63244D0D138DC2F0EE9B2FDDD1B66E66EE2A = HUNTSMANWW_NA (The Huntsman: Winter s Wa | V | 0xD504FBB1BF8B0F6F9F6A9146CA49DC52 ; MKBv50/FindVUK 1.00 -0xD06B22C4C674309F80BD8D26343C7F2CEC321B22 = HUNTSMAN_WINTERS_WAR_UPB4 (The Huntsman: | V | 0x9C0BED79BA642DF8BA91C370F7B485E4 ; MKBv57/FindVUK 1.02 -0x394B1523E77BC1DAEC84933048001F49C870F3E3 = HUNTSMAN_WINTERS_WAR_UPT3 (The Huntsman: | V | 0x7622D88ED81BDB93AA358864F0BA0DF4 ; MKBv61/FindVUK 1.01 -0x95D01A7D31EB7754EE85531124BE3E05FC202C31 = HUNT_FOR_RED_OCTOBER (The Hunt For Red O | V | 0x0D079748168A86154873EE2BAC825A4F ; MKBv7/FindVUK 0.96 -0x006385EE509A9FAC0CD734C0C0E241E32938CD3C = Hurt Locker | V | 0x8E993BF764F301736216580D8FC8EC48 -0xFC2ED725148A52F7FBF577E1043AE38196191F88 = HURT LOCKER | V | 0xBAFA6193B9C10535F6CB1458D06FE9C5 ; mkbv16 -0x2675EE2C3F2C093FE770341D1A8242872F3FDF9D = HURT_LOCKER_NA (Hurt Locker, The - Blu-r | V | 0xBF106B09A71E8F56B67FA7B90AE2C732 ; MKBv16/FindVUK 0.96 -0x56F0CD1F60A0E738512FAA878A22A3626C72F84D = HURT_LOCKER_NA (Hurt Locker, The - Blu-r | V | 0x36BABACD1FFBC136B6E3E623951A6B50 ; MKBv16/FindVUK 0.92 -0xFE90440E0CBBFDD9D11DCA1068B1453009E06B3E = HUSTLE_AND_FLOW | V | 0x4233D26493CDF0255A29CB1AEF0C41D0 -0x5D3315FEE488920C00D6CD488ED73E421E568E42 = HYBRID_3D (Hybrid 3D) | V | 0x30F61722B9D8EE0193270E5E45556BE5 ; MKBv23/FindVUK 0.95 -0x633EE273B9A4DA8B6572AD82121A1FEDDE4A850D = HYDE_PARK_DOM (Hyde Park on Hudson) | V | 0xE6D66B5847DE01F1B507F82F62CFF84A ; MKBv35/FindVUK 0.96 -0x4547C89DDBD593D0D4276DFD12EB8C425593D5E5 = HYMYILEVA MIES (Hymyilevä mies) | V | 0x478F1BAB7462AF8754ED1F55C3D4CBCD ; MKBv62/BEE/FindVUK 0.98 -0xAD519E1152A29D50461ABB120CB1B9FF0DF65482 = HYPERTENSION (HYPERTENSION) | V | 0x515CA4A59FAAD57E170519FA421B7389 ; MKBv12/FindVUK 0.96 -0x39F00FB7A2309DE0FC2DAD236D41850FE8005088 = Hysteria | V | 0xAC76B2713540828833D2BD31AF04D3E1 ; mkbv28 -0x3A088D9FC3374093CE1F13BCB48B8CBD33AC093A = I am Number Four | V | 0xE60C91496BF944C36BF2063ADA5C2E4A -0x9A29C6C3584BB0C98D7198BA40D1FBD1C5447C67 = I AM YOU | V | 0xD566C13D43CB1B377E5729A2A44B4DBC ; MKBv25/BEE/FindVUK 0.80 -0x7CC2188BE42C94C810B401081CE0ABCED4F26A87 = I CAME IN YOUR MOM BLU-RAY | V | 0xD953925255B585BC7DEEC8CCB1C3CD9E -0x77C8869CECCA4E1D5E805AD40E176D70EAA1280B = I Dont Know How She Does It NOR_ (I Dont | V | 0xA5C6335565B1C42DE6CDCCCC8DD05679 ; MKBv28/FindVUK 0.91 -0x4810D6A0777AA63CDD6D3B441D92EF755342F455 = I FRANKENSTEIN (I, Frankenstein - Blu-ra | V | 0xC3D241146207C6A29CA7756ED747CE99 ; MKBv44/FindVUK 0.96 -0x9BDD1C5DCC92CCFD9EBA642179903A803FF3E451 = I Love You Phillip Morris | V | 0xBEBE572F8FB97607C6A533FC6B05DFDC ; mkbv17 -0xC2B252F0A07B3B83E4326B42CFE661CE41271B5E = I Robot | V | 0xBFC702068FEB98F0FC581021F16531E5 -0x00F0A0BB7DCC594ED5A6FAE0134CA7FFB40454BD = I TOLD YOU I WAS TROUBLE | V | 0x2707458C0C557F7C9E19C098D67D9323 -0x3BF1A7A688A28EA3CC36EB9D7A62374B4EF5596E = I0xFBD198TR | V | 0x127EA86A22E7A4CFB7545E4ABC8DCD9F -0x2BA22B2FCDCE550D247C2547EC57FACD44158738 = Ice Age 2 | V | 0x9809BB4DD4B5CE125F40B3FBFAD0CFBE -0x5205FE1C966C87877D7250F71A363E44218B74E3 = ICE AGE 2 | V | 0xB4D7C51BAFB5C095390F7D805C50C3FA -0x379007D22B2B2814D3374D3AA49E1B82FDD7230B = Ice Age 2 | V | 0xE812516DBA6D7000F610B83A24CC7C83 -0x8B4D71D21EBF90AE06F78904F649D2B9962B71D0 = Ice Age 3 | V | 0x878B4011E5247188710790D707BFF49E -0xCA629DAA3F9F48E5E8692462515261F03082C8B3 = Ice Age 5 Collision Course | V | 0x7C516C877DE8140B6785B5E91CCBC798 ; MKBv57/BD+/BEE/FindVUK 1.00 -0x2B4AF868D337C47559925DF144A76B939D900B53 = Ice Age A Mammoth Christmas (Ice Age: A | V | 0xA0DA69C03D4CDBC4BF5B1B8F3A8724F7 ; MKBv27/BD+/FindVUK 0.94 -0x8C0A8B080F940010139711F0D2AAB20DD316E23E = Ice Age A Mammoth Christmas (Ice Age: A | V | 0x9326C3E2CE46162264BFF1B8AEB30DD1 ; MKBv27/BD+/FindVUK 0.87 -0xA7228A201F6C77C3DBDD701F51FC772770D04D32 = Ice Age Collision Course (Ice Age: Colli | V | 0x920EC03E2FB4E5EB44FE8515951A14E3 ; MKBv57/BD+/BEE/FindVUK 1.00 -0xC0A2AD92E182C4AC5C3F977B7A32A9FC2630E3C1 = Ice Age Collision Course (Ice Age: Colli | V | 0x73A9EBEC8096ACD744E64BA79470E170 ; MKBv57/BD+/BEE/FindVUK 0.99 -0x0DA9C0DFDA467099D5F8197E60A6C3ECD5B8708F = ICEAGE | V | 0x5E9C597E3CD5A2B3CCFDC1341FA027D6 ; MKBv3/BD+/FindVUK 1.02 -0x7950653095A112C0F582F7FFF6EB3FED6B91BB31 = ICEAGE3_3DBUNDLE_F2 | V | 0x7ABF18723A4ADD773E1FEBB3857FDE1C ; MKBrev 17 - BD+ - FindVUK 0.57 -0x74C41487C451806E12E863F1BE0CE48BCDC3DDEC = ICEAGEF1 | V | 0xC97009653E9F8B7040ECCB33AB0EE0FB ; MKBv4/BD+/FindVUK 0.94 -0x37AFFC5D3C0D504EE47E6AA169A81ABF02ADE9DC = ICEAGEF2 | V | 0x99C1A92BC774D3E226DB3C16BC73ED5B ; MKBv4/BD+/FindVUK 0.96 -0x45BA54D3B8BC34973D870E11CDEDABC80CD7253F = ICEAGEF6 | V | 0x3DBD3428BE3A349B8C2D9F00D32BDDAB -0x05A3A61F1BF3B18E2C8196E4B081CCD6C4BEAA53 = ICEAGEFH | V | 0x66DAFFF61F948CEF44281D4AC85658DC -0xB2530E3797476A88A114578192ACDF58F00D1E0A = ICEAGEFS | V | 0xB6398D9FF86A01F5443A153B6CA7AE8B ; MKBv4/BD+/FindVUK 1.00 -0x26985E261A056F787DB8C2B6428BA3F3B2CB4505 = Iceman - Der Krieger aus dem Eis | V | 0x913FD13C66B7944CCB1F10AD65B8FFF5 ; DateDiscID: 2016-02-10 -0x1BEE570BFBA1CA06BE2D1C694E9B4C2BF0E314E9 = ICE_AGE_3 | V | 0x0656DC1AFDC7024E35A3E884A0CCDD39 -0xC054843476E70A2483866D7AB4E5B34771260607 = ICE_AGE_3 | V | 0xC4DA9FE6D7A3EDEE9C5285D463D6D007 -0x480678BB86F92453F617406574D4202B4A6EFC12 = ICE_AGE_3 (Ice Age 3: Dawn of the Dinosa | V | 0xD4B4B861366D1C2EB1A471A354C8DBA3 ; MKBv14/BD+/FindVUK 1.02 -0x84C0993696D310D4567B4E1A8FE1B96A568EBD7A = ICE_AGE_3 (Ice Age 3: Dawn of the Dinosa | V | 0xCA763CFD53E660155DDC45EE371465A8 ; MKBv15/BD+/FindVUK 0.96 -0xBAC81E1182FE5A01D6DE30A30E9E08CE0D1981F6 = ICE_AGE_3_F1 (Ice Age 3: Dawn of the Din | V | 0x6CCAB29DEA4064C8D716AA1EC4400A07 ; MKBv16/BD+/FindVUK 1.00 -0x6C36653F3A070C273BA1AF27CC30B8B55D29A656 = ICE_AGE_3_FG | V | 0x760918F18C9333B262B538D2A9FBF6C4 -0x6FF5959523529627A6CDBA8F0FA1C81ADF6CE98A = ICE_AGE_3_FG (Ice Age 3: Dawn of the Din | V | 0xDFDBD7847B1C86DE3BB066EBE00580DE ; MKBv15/BD+/FindVUK 0.94 -0xAA9B241A134ECDD4FFCD53DD93B1F35A505C5F52 = ICE_AGE_3_RENTAL | V | 0x919CC27464500A0E75C5B5AD553D8142 -0x280865074E4C451A14DAE16F060B8D959247D3B2 = ICE_AGE_4 | V | 0x069FED6D593FB7AD2F0B15526786E94E ; MKBv31/BD+/FindVUK 0.84 -0x6738FDC9BD1848F1F55D5FE0B133D23E6F303CAC = ICE_AGE_4 (Ice Age 4) | V | 0xC634AF4E1F3E62197114BC56AD33972C ; MKBv31/BD+/FindVUK 1.00 -0xCE61EE4C13B8ECB7E6E51726654A2061592914BB = ICE_AGE_4 (Ice Age 4) | V | 0x0031DD6148F958579997A88B170F18A3 ; MKBv27/BD+/FindVUK 0.99 -0x148A72BEC26C190587B45DB7F8853634AACDEBE4 = ICE_AGE_4 (Ice Age 4) | V | 0xDE930938CE9E9CE9604EA7721B4F2A95 ; MKBv31/BD+/FindVUK 0.96 -0xC43D7AE01ADC088AFD1022197512AE6AD77028B7 = ICE_AGE_4_3D (ICE AGE 4 - VOLL VERSCHOBE | V | 0x495655C2A3ACD7EE05251D711DDBB7A5 ; MKBv31/BD+/FindVUK 0.90 -0x3DCC2605CA481A40C1E81D217A862A9BAD88FDE8 = ICE_AGE_4_3D (Ice Age 4) | V | 0x09824B04994B433546CBEF66E744D988 ; MKBv28/BD+/FindVUK 0.87 -0x0F3B1F00A69C98F0A6BA40F99F294443D10DBD61 = ICE_AGE_CONTINENTAL_DRIFT (Ice Age: Cont | V | 0x4F47E34CEA6F031B2CBA31FACED7A88A ; MKBv27/BD+/FindVUK 1.02 -0xF0EC1307953D0B342D537B62236CA4AD863A55F6 = ICHI | V | 0xCF9646F8088176BB86CB0A3E80618170 -0x34CFEFF4D4B5AF2698C3C1C20DCC2AEA4F6FD8E9 = ICHI | V | 0xC8BC7C2332EC19924F6346616A3C8812 ; MKBv14/FindVUK 0.84 -0x47737734F1E398BF4002696AF7B5C9E85F51B905 = ICH_BIN_DANN_MAL_WEG (Ich bin dann mal w | V | 0x1D1BC0118E51B64078786A96EFD43674 ; MKBv61/FindVUK 1.00 -0x0B895A9EFDCA693276C19FCED1020BE26179301D = ICON70270 (IT FOLLOWS) | V | 0x6C33166FDF985E48287639A8435BD6AD -0x5664F6E56938392508F7AE55F80BD75FDD8B6957 = ICONS_OF_ACTION_1 (Eye See You/Blitz Dou | V | 0x767DAC94153895FDD766A4927F9069C0 ; MKBv35/FindVUK 1.00 -0x8EB33074D6D576941AA29E7F8EAE80EBD0652CC8 = ICONS_OF_ACTION_2 (In Hell/Direct Contac | V | 0x0614F54633C39DB1D0CDA495DC22BA3D ; MKBv35/FindVUK 1.00 -0x0BFAA7CCC5CCC1C727541220F3897FCEFC55D402 = ID4_F1 | V | 0x26A231F4C11E0E78B8D428FFC33A5314 ; MKBv4/BD+/FindVUK 0.92 -0x265BD3EB651976A1ED65F49C008EAA3AE81015FE = ID4_F2 | V | 0x872E4040E5AD7BB1FAA8F862B6F641D1 ; MKBv7/BD+/FindVUK 0.99 -0xA4BFCE1AC06EDD49D168910DBBBCC161D939FFE0 = ID4_F2 | V | 0x183ACA9A6F60738EAC499715EDAB0B40 -0x3C5AF8FF98BA5FD01BB35E21E3214D0F7FE72ACE = ID4_F6 | V | 0xC37388F89FC69CE229B74CF69399EC4D -0x64521F3775C61ACCF6B47B9A6CCA168EF7BCF90E = Identity (UK) | V | 0xB3C402A8B8B6EB45E9BDC4D08D4149C8 -0xBFB84C6AE7DD291191BBEF604888CF5BF56C02A1 = IDENTITY_THIEF_G51 (Identity Thief) | V | 0xEDAD10A398F1EA24D6D92EE9B1387DDD ; MKBv36/FindVUK 1.00 -0x4D5B85920105E3D3779653D5D59F46EA2699D067 = IDES_OF_MARCH (Ides of March - Blu-ray?? | V | 0x3D327BEC1C573FF388A98E22856773FB ; MKBv27/FindVUK 0.96 -0x06F0B2D2064D2886F5D4721DED49F16108212930 = IDTBENCHMARK | V | 0x3C1761706C19FEA71435F8AEE22406AD -0x55BDAE50953ACD13FE9A47E1BE5B4691095642E2 = IF (if....) | V | 0x4D0616805F98B643DFCF6BBC317AFFFC ; MKBv25/FindVUK 0.99 -0xAB26B5B33A97A3EEF970B339FC2DABDE3A078B4D = IGOR | V | 0x242A6A8E38791F77F5D3406927018BA2 -0x2B349B19930D0A4B58D011F044AAF337B2548A53 = IGOR | V | 0xB8146348CC1F706BBF352833E907D04D ; MKBv16/FindVUK 0.92 -0x3254D0978A0B24E654BEA5D60D57B81FB595728A = IGRZYSKA_SMIERCI_W_PIERSCIENIU_OGNIA | V | 0x11A3BEB0787987DDB1EED22B01CAB5E9 -0x3F8737BC53CFFC713D5752A17810EB8E03A77205 = IKILLEDMYMOTHER (I Killed My Mother) | V | 0x7603BA398D0C4D8989AB6A5DD48B1358 ; MKBv56/FindVUK 0.98 -0x0C5747C04E1C76C133FA22E7338BAE50BD909670 = IL GUSTO DEL SAKE (Il gusto del sake) | V | 0xC820C5C85371DE631751ED1B064C9A22 ; MKBv57/FindVUK 0.89 -0xCD6A1AD855F212E91597161A8EE5A9B18D8CB603 = IL MIO NOME E NESSUNO | V | 0x4CD5FFEE4EFB425DBF5FAF292BE37051 -0x61EF5E8B4C37E76A0889F4755C4B4E74EAAE1B0A = Il Mondo Che Vorrei Live | V | 0x8EA6F5302EEA7CEB111FCD31D3BB002F -0x8F3AA8B42A93D5B24F0628450E83610670E70F4B = IL PRIGIONIERO DISCO 1 | V | 0xED4354D6C0DB225C35E18FA5FFCDD12C ; MKBv46/FindVUK 0.96 -0xC62F30CA4CE3E82E93777D4C6BC6472EEF126BA2 = IL PRIGIONIERO DISCO 2 | V | 0x5690B3B695E3CD64D19E7A7B5E147713 ; MKBv46/FindVUK 0.96 -0x8A78094F76757D16A3F9B0894A516B3CD8D3D6DF = IL PRIGIONIERO DISCO 3 | V | 0xAE9DFB6D5996FD3C476313FEC9B22CD5 ; MKBv46/FindVUK 0.96 -0xC70EFD6977645183D9C5D26B3A273744273B334D = IL PRIGIONIERO DISCO 4 | V | 0x156E488F1284723F4D8895851A8473E6 ; MKBv47/FindVUK 1.00 -0x7173912725CD26B39AF64A6379D1D1E72642DC57 = IL PRIGIONIERO DISCO 5 | V | 0xFC55BDE349F6CDA7D351F5D07F7559D9 ; MKBv47/FindVUK 1.00 -0xB86E3F86CF65B08C5FDA1415B8D05FA644236FEE = IL PRIGIONIERO DISCO 6 | V | 0xABD5E745838640301428BDBE47C77F29 ; MKBv47/FindVUK 1.00 -0x2F04144EF532019E52FDC672043BC8947DA04E98 = IL RICCIO | V | 0x4F07D504DEF73A3B1277C317C0FDE191 -0x14D7C5877AE75B5677E682F6A4D05DDAFF7EA6B4 = IL TRITTICO TDK | V | 0x26DAA953C5C9090F5F7679E3BC6925A8 -0x4D2CAC308E89965930651C195B0721AF3DE4603C = IL TURCO | V | 0x55C9CA2DBDAECE01F549319EA275EA53 -0xA640BF255C575128EC1DD7F355C90BD5D36AB6F4 = ILLUSIONIST | V | 0x96FB79F93DF067D9C466CE3B6267E870 -0x649D33A44164DDEA6D52CBE2B5AC7F4A4DF8A594 = ILYBC | V | 0xD6FC8DBAA1C44060AE1C4B9962EC5486 -0x94D19A40041D3623546943EA2A5CF7851B36C975 = IL_CASTELLO_ERRANTE_DI_HOWL | V | 0xDCDC578AC658F4B8F660CC5ED3D7FA0A ; MKBv28/FindVUK 1.02 -0x064EB6122FF89FDA3299ADADA8CACE407588C357 = IL_CASTELLO_NEL_CIELO | V | 0xDE8A46E4E9A318F94C4BD7C8527BC80A ; MKBv28/FindVUK 1.02 -0x94EEE1F6C6D7C1ADEB1DC70B2D5E5DA01D257B83 = IL_ETAIT_UNE_FOIS_EN_CHINE | V | 0x164D3A80624063C1F96D7E71557741C4 ; MKBv38/FindVUK 0.65 -0x590C9A3114C25397FC24248A5F46E283828E52DA = IMAGINAERUM | V | 0x410A875496A8342E51CC55961F687824 ; MKBv38/FindVUK 0.80 -0x7E3F4EB23988BE5882FF22205BDC3E1732130A23 = IMAGINE (IMAGINE) | V | 0x5A53D23E51F1ACD5266BD72BCFCEA6BF ; MKBv36/FindVUK 0.89 -0xC56C572BAFB0A2F23AA0CC2B4180FA3DE2AF24A2 = IMAGINE_THAT | V | 0x112E0DDD70EDF239DF340AF8A1E2CBCF -0x5656566C0AA8AF1FC2C1D7795064BD57C1B9D4D9 = IMAX_SPACE_STATION_3D (IMAX Space Statio | V | 0x11C24A9CAACB4C20BB50E7A49AD128F0 ; MKBv17/FindVUK 1.02 -0x69194DE423D2FB461BA9E1F4582659FDC116BB09 = IMITATION_GAME | V | 0x66CDAD32C31F6AF1951DFD17BDBAE05B ; MKBv54/FindVUK 0.65 -0xCA1CAED13C82AC7E0DA9F952EBD76BB2001BDC8A = IMITATON GAME (IMITATION GAME) | V | 0x6F76FD1C3EA437EA5A91A9BFEB71AE89 ; MKBv53/FindVUK 1.00 -0x82B9552972B424C68129FFC6F527DE53E98BD072 = Immortal | V | 0x8801CBD462A87AD6020C5D51C7FCC4BA -0x512C8CF04EA334730B324AC7672E54C68ED0B1AA = IMMORTAL | V | 0x8DD5C9CF3131047976885B824EDC136A -0xB8402D151526849E024BB6F2418EA433067BA7EA = Immortals 3D | V | 0xAABC26C29F31640D9ADE17C47FC0DEF2 ; mkbv25 -0x0C5FF7D0C8C370A7A0E8D74B58723371BA702450 = IMMORTALS_3D (IMMORTALS - Blu-ray???) | V | 0x6B7EFA61FE7A3FA69B88C2A2C7C8662A ; MKBv28/FindVUK 0.84 -0x2B256366C8273990EC062DDF4D004E31DCC9ED8D = IMMORTAL_BELOVED | V | 0x9C3D1CBA41654279A019BE3BEBF2EE3A -0x7A82CB485BC83223DE721904CBF15FF53BE4E0DC = IM_A_CYBORG | V | 0x72B66F40712D3D1A2F9485D29FC43A5A -0x540A87935478E9605EFDAC0BE13B6D5955127976 = IN BRUGES | V | 0x4DB823E87739F265F02D6DB2046C9D02 -0xEF602E94434290C4212A96FF139CA56CA66EE488 = IN BRUGES | V | 0xE91DBF55896001E791CD511CE0F8E53B ; MKBv9/FindVUK 0.98 -0xDFFEF24118078D873108AD5B7C027065E8B17A26 = IN BRUGES | V | 0xE95FA4CF67D71028D94881FCA74AAEA2 -0x3AEBF9765CE37CBCD20E79AC1A69DC11C564D5C6 = IN DEFENSE OF FOOD | V | 0x15A98F3E06DCC1BA58523415BD2A9B5F ; MKBv58/FindVUK 1.02 -0x7D7BE5B9F771DB3E1C488FA9DC95F8F882272DB0 = In Good Company (US) | V | 0xCB9BA28903EA5962847CB8CE6A9BB230 ; HD-DVD, verified with DumpHD -0xB9770D130EBA342947530E612A1EEAF87E2B3AE9 = In The Line Of Fire | V | 0xF99D434F2BD3DA1A6168A2A495D217CA -0x688E63730D1B8187558B1380E27CDA3A8887B990 = IN THE LOOP | V | 0xBAD49A13F7199D1F5A549DD32DE7BE7B -0x057B31451F4FD32BF14736154778DBE1E4B9303A = IN THE LOOP | V | 0x98983E4F514B9791228B670098053849 -0xA392DDDC0F561E2917D68F85A4D47954F1E1A37F = In the Name of the King | V | 0x4E652F060BBAF749F3681870342E8738 ; mkbv12 -0x3F5C3019CF6F3CE3D81A8800776AF70402A4C300 = IN THE SHADOW OF THE MOON | V | 0x486DBD6C0B6901BE976C5351737242D3 -0xDBA2E5D37C83D8B628A22BE16E343BB1A8D2F3D6 = In Time | V | 0x2C6CCBCF8F49573796387F862EBD5C43 ; mkbv23, bd+ -0x9FB802F0DBC2B74FA7F5081B9A24C9033AA68D16 = IN TIME | V | 0x79C2C8CB2151D2B455B61758AE37CFE7 -0x46A6A93C63B446589B892A994491EE907176D22C = INCEPTION | V | 0x664AF73F504C67368AAC8FE0C33E5278 ; MKBrev 19 - FindVUK 0.54 -0x9E88DAF1646678332D542F22DACEEF929E62AECA = INCEPTION (D1) (UK) | V | 0xDD54BFF6BF0A845E11B862A7561368EF ; v19 -0x881BD0C0671CB45D441F1B6EE76905F1737A37AE = INCEPTION (D2) (UK) | V | 0xAA16B88846F1E1241B464239DD6E3B9B -0xB6BF43B57D49BBB0012A8CAD40CAAFA3BAD82435 = INCEPTION (Inception) | V | 0xB88390F662B81403EE6ECD6EC36147A9 ; MKBv19/FindVUK 0.98 -0x0ED6FC68F458AF6012CA4F30A22F95A0382EABD6 = INCEPTION (Inception) | V | 0x15F0E33B0EE9E20DFE70DDB38D29621A ; MKBv19/FindVUK 1.00 -0x5944DD8B625716AAB96D90EB708DC9922C4F3D58 = INCEPTION (Inception) | V | 0xC3B509A52A60A11500F98679F9E841E0 ; MKBv19/FindVUK 0.96 -0xCA2C869E8D9148FF4DBC76E57716C9A510EE80E6 = INCEPTION (Inception) | V | 0x34BD70F60606292C16441EEAFC5F782F ; MKBv19/FindVUK 0.96 -0xBA530C81B6314DAF999BBC564A8CEF442920043F = INCEPTION (Inception) | V | 0x49B50B1833374797CECE5E9039A23E4F ; MKBv19/FindVUK 0.96 -0x6F83ED6BB5B1E5C40D09ED2B529291A1DF2C7759 = INCEPTION (Inception) | V | 0xFF220E6E45321446F16F36FF18ED3D8A ; MKBv19/FindVUK 0.96 -0xDDE1D2075E173A9F4A9E96B621B9C371616E11F1 = INCEPTION (Inception) | V | 0xF5870C53C013EFD806A429CDC9228073 ; MKBv19/FindVUK 1.00 -0xC2DCDF44D670F9B6F3433566B8F62B2695960FB7 = INCEPTION (Inception) | V | 0x3B2E399C01DB5A72AD45CFD2D115AA32 ; MKBv19/FindVUK 0.96 -0x24ECFAE508CD76F0E40BC9604827AABBC6CF8C70 = INCEPTION (Inception) | V | 0x55C12612324DD7534B0F1D661E4929AB ; MKBv19/FindVUK 1.00 -0xD8513A18B2202891F3D8B4475DEA47DF9B572A3E = INCEPTION (Inception: Special Features) | V | 0x12F604AB0B8DC1AB3B88ADA7DDB614B1 ; MKBv19/FindVUK 0.96 -0x3A5FAFA49264601CC4FB4EEBBC83C26D06C80F4D = INCEPTION (Inception: Special Features) | V | 0xC368912BA8EEB2B97A87A331F6F8908C ; MKBv19/FindVUK 1.00 -0xCD8D2E8A739B3A05CF44387BB7AABC2918B66C3B = INCEPTION (Inception: Special Features) | V | 0x7EF41826BD577223B7E493E3FDA7127C ; MKBv19/FindVUK 0.96 -0x8563C4C2EFA9C14DB9382E6510388EA3B8FB4B7C = INCEPTION (Inception: Special Features) | V | 0x491F43AE3D19199622913262FA42F8C5 ; MKBv19/FindVUK 1.02 -0xAFF8D208A21C69B59870A4BC6597B03F143C9249 = Inception Disc 1 | V | 0x7E2BDC72819FC5A3BCDE5567462F7DD4 ; mkbv19 -0x65EBDCD13444000F9E5550C53E33367869AC2578 = Inception Disc 1 UK | V | 0xF5B37EE6360CD861E7779B90F9AF81D3 -0x5EA2BFF0EF85AB68E27850E5956268E9D912E6F2 = Inception Disc 2 UK | V | 0x5A842A73B748B112ABA5B9AA1A6DE247 -0xCC205F93284830150A1B1CF9A69AA8CC39BA2DEC = INCOGNITO | V | 0x381AB7553DE75AB0EECF24928C7780F2 -0x0E657720FB1944E245EA898BB9F528CE3BAB1CD6 = Incognito | V | 0x6F6E46E88DA6BCA64FCDF1EC3DA2C765 -0x1A77B0B97A1C91E1E3DF300B82A85E4817671BD4 = INCREDIBLES | V | 0x2C2B63CF11D61A613778EDE1B814E848 ; MKBv19/FindVUK 0.80 -0x4D7600C863F44231ED842C3C639FD5DC0A64F435 = INCREDIBLES (The Incredibles - Blu-ray?? | V | 0xF639BA06C33081726B4F23B7F449EDF9 ; MKBv19/FindVUK 0.96 -0x3646E9044BF74C9B191A208308B9B0AC0D34F258 = INCREDIBLE_HULK | V | 0xC666E2CC636630652D77C1D6FDB8AB78 -0x56F2421DA942F55236B6ECDB2174B4C8B2321955 = INCREDIBLE_HULK_AU | V | 0xFD2A33CD1363A2E3E041F570F46B9F55 -0x9274DE3EBEA42D27AF71AC54401F14CCB5B63F18 = INCREDIBLE_HULK_AU | V | 0x6E0DDD9EE1B9547005E7475BF1AD68D9 -0xCAE480E7DE3582683C3CEE3836382C81759DCD75 = INCRED_HULK_2008 | V | 0x862725174E830A98186CB6C11A6A7190 -0xC703A6D4A853825998A15546139845E6AF51EC5E = INCRED_HULK_2008 (The Incredible Hulk) | V | 0x6EDC74DF5E2E43E928C501EA4629AAC2 ; MKBv8/FindVUK 0.98 -0x698F8A7F77B9BE1E30B1DF9C789F803194096223 = INCRED_HULK_2008 (The Incredible Hulk) | V | 0x2BDFF4BDA25EBE2CC389CE030A1E11C9 ; MKBv8/FindVUK 1.00 -0x35344AA10D7A8B0D71CCB86AC3A2C773B3504FDD = INCRED_HULK_2008_G51 | V | 0x0A692E75145869F779F3F0E1A3F8A3F0 -0xFCE1AE81288FB5FE4BDA6C82307C4DDD45D0E3D7 = INCROYABLE_HULK | V | 0x75BF91FD3145E1DF3F58F5404B0C7BD0 -0xBC860F73A45B2652BB3F85E4BD78DEFE104DEB18 = INCROYABLE_HULK | V | 0x68BC31D3D845C9FFE9BA5BE26ED2C157 ; mkb v9 -0x499628D0DA962A025F0DB5225F276A3E5F4D61C2 = INCROYABLE_HULK (L INCROYABLE HULK) | V | 0x97ECA6C2FC63E520C5D378C3DEB69826 ; MKBv9/FindVUK 0.96 -0x7426743F42CFE89FCBFF78318BD968534EBE8208 = Indecent Proposal | V | 0x15D38EE4C75B5BA63DC6424312E1203F -0x10BEC9F2A28FDA044FD4FA270BAE3E917B561F54 = Independence Day | V | 0xC397805704A9C99F99D3DE37F258BF71 -0xA1C676A479AEDB7BA0427F46E08D4B0CDBB45D8E = Independence Day | V | 0x4CE106E3255B944EB3978423B79F7B6B ; mkbv56/bd+/bee -0xB8AB92E23B6D124415FA0A76F0D7926B38691646 = Independence Day (Bonus Disc) | V | 0x1710A3CEC711AC7F6547A9FE3A608161 ; mkbv57/bee -0x6D6DB9164B765DB1B524A684551F4AD4F9CB91EB = INDEPENDENCE_DAY (Independence Day Disc | V | 0xAB1413405F95E023A307E49A75A348AE ; MKBv56/BEE/FindVUK 0.96 -0x7A1F83B570F7935980F022CF0651F4F75D59A991 = INDEPENDENCE_DAY (Independence Day) | V | 0x5D3EC568425C5A5BAA9F96BDB9E06EFF ; MKBv56/BD+/BEE/FindVUK 0.96 -0xC35DCF65C27085A856BC490A53D8537423159AB5 = INDEPENDENCE_DAY (Independence Day) | V | 0x3CBA54AE2E024CA639EBA42017061ADC ; MKBv56/BD+/BEE/VUKNOTVAL!/FindVUK 1.00 -0x3271BD752998C8EDA63DDC3924E9455516EEDFB1 = INDEPENDENCE_DAY_RESURGENCE (Independenc | V | 0x49996049E2AC10A6356FB653CC77A7C0 ; MKBv56/BD+/BEE/FindVUK 1.00 -0x3095105C0AB2058277F3CCBF385A3F939ACBE459 = INDEPENDENCE_DAY_RESURGENCE (Independenc | V | 0xF42915EB00061EBB3741A2067320A7CD ; MKBv57/BD+/BEE/FindVUK 0.98 -0x95D0A06681F15D55084D78610D7AAC8AA2869129 = INDEPENDENCE_DAY_RESURGENCE (Independenc | V | 0xC11DF5D7B5EE05D29C7C5B9A2660B763 ; MKBv56/BD+/BEE/FindVUK 1.00 -0xDFF63D1ED9BE18016B65DEA2BE2CFB7FA3BDDB2B = INDEPENDENCE_DAY_RESURGENCE (Independenc | V | 0xA1B92EF3D7DAC520361087EDDC72A12D ; MKBv57/BD+/BEE/FindVUK 1.01 -0x8F82FF8A71942A5CEA412818B88ECFA15D48C7A1 = INDEPENDENCE_DAY_RESURGENCE (Independence Day: Resurgence) | V | 0xEBC761EB7C1D5BF6C16BC9551D7B19B6 ; MKBv56/BD+/BEE/VUKNOTVAL!/FindVUK 0.92 -0xBF3FD765978B229957FF2AACCC3B1F0916F208E5 = INDEPENDENCE_DAY_RESURGENCE (Independence Day: Resurgence) | V | 0x97C5F923FC621F99379EE09C8506E848 ; MKBv56/BD+/BEE/FindVUK 1.00 -0x9291E060B8BB35844D3EF7FF9E11A6DA57647037 = INDEPENDENCE_DAY_RESURGENCE (Independence Day: Resurgence) | V | 0x461E349906ED16353471944499A1A904 ; MKBv57/BD+/BEE/VUKNOTVAL!/FindVUK 1.00 -0x0F572A9B9DFC0F094D30EAEA77B3FB2B57325E0E = INDEPENDENCE_DAY_RESURGENCE (Independence Day: Resurgence) | V | 0xC35B2B70B18A09E0DD0EA9FF796FE913 ; MKBv56/BD+/BEE/VUKNOTVAL!/FindVUK 1.00 -0x0BDD5D41D8CC45156A23AB02E992501A3474B15F = INDEX_D3 (Disc 3) | V | 0x5EAEBF77D67DF59E4C725E7F22EA2EB5 ; MKBv50/FindVUK 0.84 -0x94AF4542B719E3C818141C9D5C4DEB487D6EB36F = Indiana Jones and the Kingdom of the Cry | V | 0x79D752E79AED1B6CA985D5304F098CE2 -0x48AF3EDF6746B0AD6C3EE1F3CF852465A659734E = INDIANAJONES_LAST_CRUSADE | V | 0x4B53B85A3E4757C3C7932A4E73ADBBBC ; MKBrev 27 - FindVUK 0.57 -0xA255864D47DD5112048AD995D7D090DC5C56B392 = INDIANAJONES_TEMPLE_OF_DOOM | V | 0xEB361DC546FED3E77184D5A137B331D2 ; MKBrev 31 - FindVUK 0.57 -0xB449BBACBA0CFDA4993E78020E47079E38CA0B32 = INDIANA_JONES_4_D1 | V | 0xC8E144B5296C01562D95A4047590DBC4 -0x7A87881DB39F2927F8668CD6C75FD3DAC85F13AB = INDIANA_JONES_4_D1_EU | V | 0x64ED60567F435EF9885B64C317765466 -0x29D16DE236B3098D0FD460E0EB78CF893ABD2D99 = INDIANA_JONES_4_D1_EU (Indiana Jones IV | V | 0x9AF7FFC2CF49C5658FD1981659BC1FCE ; MKBv8/FindVUK 1.00 -0x3F6A930848E67220B9D763F8DBB13D8510198E6D = INDIANA_JONES_4_D2 | V | 0x17A861D5C31655EA2DB8160C50EE7752 -0x344B88B77079FB2D61C7340235C53EAF2769536E = INDIANA_JONES_4_D2_EU | V | 0xC00E20AE8B6843D7272BCC4557F67BFD -0xA1BCEF0EFDE65BB81ED5FEA6FFCFDF77DE0A032F = INDIANA_JONES_4_D2_EU (Indiana Jones IV | V | 0xF7201CF379ABC5D8B235955F2378DC2E ; MKBv8/FindVUK 1.00 -0xD1A4D922B86B6932502AC03597235F13F434069F = Indiana_Jones_Bonus_Disc | V | 0x4943BF8E54289DC2E5EB9DF6CE085349 ; MKBv27/FindVUK 0.68 -0xCF34F08921EC7AB2AD3FF9453780593D5CB60A4D = Indiana_Jones_Bonus_Disc (Indiana Jones | V | 0x2A60B7CE036927D9A639F1A96205E2BB ; MKBv27/FindVUK 0.96 -0x44F8C1FACDBF9174483990D04973959BCD8AE13D = Indiana_Jones_Bonus_Disc (Indiana Jones | V | 0xBAAB0E865AE9105BD68D9B498DC73572 ; MKBv25/FindVUK 0.94 -0xC2C4F58D9854774FAA778118C6315CAB4E2A09FE = Indiana_Jones_Crystal_Skull (Indiana Jon | V | 0x5AF3D7E9DA2EB4FE2A64CAD4BA1D65FD ; MKBv28/FindVUK 0.92 -0xB0C17D17DE63DA320697588C789C150168C5244F = Indiana_Jones_Crystal_Skull (Indiana Jon | V | 0x0B4792288189DB22D92F37F4A5A88221 ; MKBv28/FindVUK 0.92 -0x93F552017F0AC79B477D32D6AB4CC2D8454375E5 = Indiana_Jones_Crystal_Skull_EU (Indiana | V | 0x835DED1839986AA85DB6D7FEF49138F2 ; MKBv27/FindVUK 0.94 -0x6CBD0885C5632020C95EA39A3B9A9E6EFFD88F2C = Indiana_Jones_Crystal_Skull_EU (Indiana | V | 0xCF696AAE1A6590F00A001C2CB88772FB ; MKBv27/FindVUK 0.96 -0xFB174BEBC1B220715F8CAECAAD3825CC9FE55C57 = Indiana_Jones_Crystal_Skull_EU (Indiana | V | 0xF31860A574450F1EB286587D98A89A35 ; MKBv27/FindVUK 1.00 -0x42E299FA1E78DE867DFCE21196440F09DE82A2DE = Indiana_Jones_Last_Crusade (Indiana Jone | V | 0xC6B3922318940C4173ED7D630082D70D ; MKBv31/FindVUK 0.83 -0x752DEFF0047553BF68F39A4739CFA34D4515661F = Indiana_Jones_Last_Crusade (Indiana Jone | V | 0xAAED9E9377C0A74099340C915B32E31C ; MKBv31/FindVUK 1.00 -0x50915E54B1314077B896E76834EAF25D011325FF = Indiana_Jones_Lost_Ark | V | 0xCE6BEA839E122E8F75654C62A317BAA1 ; MKBv28/FindVUK 0.80 -0x60CC758E6C2FC53727C2EA09C3F8C7C9D88467A1 = Indiana_Jones_Lost_Ark (Raiders of the L | V | 0x646415D8CC64F0DD7D631C55C6928E06 ; MKBv27/FindVUK 1.00 -0xA11AAB0C607D268243B602E3D26F12DB054D79CE = Indiana_Jones_Lost_Ark (Raiders of the L | V | 0x1883953FA81DD27E8DCD5D41DB15F5BE ; MKBv28/FindVUK 0.99 -0xED1FE88E9AF675E325480E1504C47293AFBB2467 = INDIAN_JONES_LOST_ARK_ES | V | 0xDE55F57FC834402795388D4DC9545DA8 ; MKBv27/FindVUK 0.68 -0x4C3CAA0AE249EF211C49818C271C52198597B12E = INDIENS WILDE SCH??NHEIT - DISC 1 | V | 0x9B85D3E8F1221F0F5F2338C70C94AC8B ; MKBv46/FindVUK 0.65 -0xFD3B5E45D7C0B160DE60200DEB24FD872EAD8660 = INDIENS WILDE SCH??NHEIT - DISC 2 | V | 0xD1F4724FD3B9C3C53DB7D4CF0D4F2AF3 ; MKBv46/FindVUK 0.65 -0x5D60E6980C4CB308FEBBB6D369E143500AE2927B = INDOCHINE_BLACK_CITY_TOUR (INDOCHINE BLA | V | 0x0314B5119C6526B4061D0553CA653DEF ; MKBv49/FindVUK 0.89 -0xF4C82A4F22503B905D93E76521261B858BB0BD2B = Indy Jones - crystal skull | V | 0x3E9D0568D9730D42AC4FBDD45ABDE3BE -0x153A7DE0B64304FA1D4ADF65B774031443F506B0 = INDY2_TOD_EN (Indiana Jones and the Temp | V | 0x1D45A4B72CD23B680464DEF7704F0D12 ; MKBv27/FindVUK 0.96 -0x508A6BBF282FEAC9E42479F4694B966B7555628F = INDY2_TOD_EN (Indiana Jones and the Temp | V | 0x646A0F9191A810F401B1C3C1E35CD864 ; MKBv27/FindVUK 1.00 -0x46BECA8658CAC855CB27C3B1B2FDBB5D8D06DDEE = INDY3_LASTCRUSADE_ES | V | 0x1C71E0A99567358B5E6FD5E905787E62 ; MKBv28/FindVUK 0.80 -0x586F4F2FDA0A0524FCB2F007707C34F29A4C5298 = INDY3_LASTCRUSADE_ES | V | 0x58C687EE806EADE714063AF91D2DE5A0 ; MKBv28/FindVUK 0.68 -0xDD64D2FE57BD0D01DE8278FE5E40254C2EC14B05 = INFECTADOS | V | 0xEB872F1628223B33014D30B9F87F14AA -0xD70F672991CC5210E52948FC4F31DBBBE812A1C4 = INFERNAL | V | 0xF86749375DE2AEA6D9F38C68AF8C3755 -0xDB1B23E90871E99440F2B7C2504F9FFB25F18F84 = Infernal Affairs | V | 0xB50CEDB21BFD966DF52C0D764E94F23F ; MKBv18/FindVUK 0.84 -0x62EBDA79CFCA11ABF98192164FA65667C914DC63 = Infernal Affairs 3 | V | 0xBF41D30C37CCF984EE0AEBB2C99C82E2 ; MKBv18/FindVUK 0.84 -0x4D75C556ADD0D3F96A008CF464ED47745488D5AD = INFERNO (INFERNO) | V | 0xD50A387E01037594E76C93305A4B7739 ; MKBv31/FindVUK 1.00 -0xB3B84A5DE1FF8C3FF904D02B43F719832D4163F5 = INFERNO_2016 (Inferno (2016) – Blu-rayâ„¢) | V | 0x45DF1B2A0A5B17DC068F5C3D10ABE097 ; MKBv62/FindVUK 1.02 -0xE346B81805D66AF1C4C9FC557C5E866713874A4D = INFERNO_2016 (Inferno (2016) – Blu-rayâ„¢) | V | 0x1D4B05CC61CDFBC395A66C3D866A1359 ; MKBv62/FindVUK 1.00 -0x37B89F6B09DF8064C9597AB1958AE0AC144AE71D = INFESTATION_BD (Infestation) | V | 0xD323F579E6D7DFBC4E63703564A2CDB8 ; MKBv19/FindVUK 0.96 -0xCDAF2A22B349CBCABDA80A746A5DA51963F0C53E = INFINITE STRATOS DISC 1 | V | 0x1DA89C19D0B873FB0D69B98FD0C2A9D3 ; MKBv31/FindVUK 0.86.3 -0x9AD2FF76CAA685BC273C775CF3C7C6C89942F3A5 = INFINITE STRATOS DISC 2 | V | 0xC50C23AD539A37FACAFD29AA7FFF3AC9 ; MKBv31/FindVUK 0.86.3 -0x036419A3EB73BD32D04E8006B8E842A62B184158 = inglorious bastards (CAN) | V | 0x7A51469633D04340786457E914B7BC04 ; Canadian version -0xD17C9C4290663DF4591F7793BA2AF14D1F231852 = Inglourious Bastards | V | 0x9DC580F44591133D1400D095456BFCEB -0x12AF523EB30B56A83690718054194151862D19BD = Inglourious Basterds | V | 0x232FCD0350D8C21F569A1EABE0F6FC80 -0x6F7AC26721FB730D047C7E706CCA12BB719FEA3A = ING_BASTERDS | V | 0x097F20B4536E713AF60FB2B344B7708B -0xEB4056FA0744843187A0AD338D2CDDDCDFCE9815 = ING_BASTERDS | V | 0xCB7EE4EED23DE155627ADF72528C5FCA -0x7C7D5E77A01D02B281852AB291780D5D9099E140 = ING_BASTERDS (Inglourious Basterds) | V | 0xE93819E31D34CE76DC1CB339BC802C23 ; MKBv15/FindVUK 0.96 -0xD538A495F088CCA018448A0F2B2B65C8E207F8C2 = ING_BASTERDS (Inglourious Basterds) | V | 0x49B51DFCD9C67F4363597844EDDD5C7C ; MKBv15/FindVUK 0.98 -0x4AA77686A618A4917CC019DFEB3352A482A61D26 = ING_BASTERDS_G51 | V | 0xB2CBE2C02E1775E2BE32D2D7C9D0850A ; mkb v16 -0x02179796554AC10E688B8AD8C8D23CC06129B7A0 = ING_BASTERDS_G51 | V | 0x4AB84C4B23FB034E2DA54AD9440407BB -0x84CBD217FD3C0C85A5F44B33FF267BBE80A2D80C = ING_BASTERDS_G51 | V | 0xCBCDC98E78A264591D6DAD6705A04D77 ; MKBrev 16 - FindVUK 0.57 -0xBD7141C0B6EE5F064378A12839890FC6F14A0E91 = ING_BASTERDS_G51 | V | 0x547C86E4CCA09A318DD4ECAA6596F8B6 -0x2F15DEA9C780FD56A7F104687DA8121268EA74C5 = ING_BASTERDS_G51 (Inglourious Basterds) | V | 0xE0C72C0B1DDD6CF0905E626C86FA62E4 ; MKBv16/FindVUK 0.98 -0x8A4BE5ABFB16CEF7A7D2F88E2E8CA9DD80E00D7B = ING_BASTERDS_G53 | V | 0xC15BA546A41BC1654C7B2209580996EE -0xEB34A532375C126B4EB4841E6240D72E2C5CAD98 = ING_BASTERDS_G54 (Inglourious Basterds) | V | 0xDB86F427388129E3801170435F7333E8 ; MKBv15/FindVUK 1.00 -0xB3AF6D6249584620DC24E83FFA843B218EF66978 = ING_BASTERDS_G54 (Inglourious Basterds) | V | 0xAF98903FF1CD4212A3876D7413899519 ; MKBv15/FindVUK 1.02 -0x13945334FDDCDFA216ACF862213192349EB21DA4 = INHERENT_VICE (Inherent Vice) | V | 0x8951B6F8863125DB250D525C5872CBC0 ; MKBv50/FindVUK 0.92 -0x5988FD426F5FD8B7F2534A1F66919D7CE1AF4B6D = INHERENT_VICE (Inherent Vice) | V | 0x0EE27099BE63B7FDE4294591A6CEA9F2 ; MKBv53/FindVUK 0.98 -0x8528F3BF1FE19163FF2B56A3B7B39C80F595980A = INKHEART | V | 0x8110A1F3393ED6C94DEB985796642A03 -0x62A6C46E21B0A2AE09C48EADD102AE853C1A3136 = INKHEART | V | 0x7C59004118F9A1BEA0D275222C6EF8FF -0xF529F0D96E3881D66F8B4A8D1B87A384DD97E7D1 = INKHEART | V | 0xFB29A9FD4AEE527DFE50FDC9E4DDA3EA -0xF573A0F8E7F092B48C676B724F26E6A633219AAD = INKHEART | V | 0xFB7C018FD715D38998377B942844550B -0xC77EA51DBC04E08766CBD0E3BBEECA6451351552 = INKHEART | V | 0x860183156AD0E00B381844B399DEB8F1 -0x1983D6258476EAC6DCD5D70382DE0899171F1D2D = INKHEART (Inkheart) | V | 0x9A69FD1F38875BB8C151A7995F7E01A0 ; MKBv12/FindVUK 0.98 -0xE83DDD300F9135FC68D39A2B07E70069EABAB8A0 = INKHEART (Inkheart) | V | 0x217E9BD3499F8AF4F9BE5B662471888A ; MKBv12/FindVUK 0.96 -0xD73CC7FAD517A9CB46C8B851DFFAC8B3F638B2BC = INK_BLURAY_AMERICAN_DIGITAL | V | 0x4BBA8269A6210D3E242EBC7FD4B328D1 -0x5E4717B6272BB9319950C18BCA9278A7591F4BEE = Inland Empire | V | 0x9A2E8B53FB299E1B711402165780303B -0x0C7ED3797B52865213D011E62C05125014A63814 = Inland Empire UK | V | 0x2AFDC57DC8159FBFF327B35EA5734C41 -0x888C3C1DC4064B1DF5E5E196D4A902E75FF2FAE3 = INNERSPACE (Innerspace) | V | 0x0A9F43DD32FC50C6FE3B49F90FF692F4 ; MKBv53/FindVUK 0.98 -0x7186DBC8C6750C0A05C6F9E1FE1DF5BB14266073 = INNOCENCE | V | 0x442A565CCCC03E344215FA20B86B877E ; MKBv31/FindVUK 0.72 -0x31CFB3640512E263B3B9700662AAE4D7863A8CA3 = INNOCENTS | V | 0x40C2A5E4D78035FEAA1F2BDE716A954D ; MKBrev 47 - FindVUK 0.54 -0xC14A38A58C4223F0EBB2BDA45F929F80D0A45F22 = INNOCENT_FLOWER | V | 0xF46B75F392DC85F7A0151268ECCCAB08 ; MKBv62/FindVUK 1.02 -0x9D5395652C51F3CD4D87D1CF4266F9F358F49AAF = INSCHWARZERHAUT | V | 0x00568C1B88963105373EDAF3C1ABE49D ; MKBv21/FindVUK 0.99 -0x2DB675BD170527A0F3BBB00E271B6ACCBA191732 = INSIDE WIKILEAKS | V | 0x8EC4034446C7716791F1E2CFA8B8D8B7 ; MKBv46/FindVUK 0.72 -0xCAEC110A7345CA50213732ECA7BA3F2C99ADC214 = INSIDE_MAN | V | 0xA884737671C29B3E5158BC5E315E09B5 -0x539EFC82C30DDB4A00D165FFD2FBF318284DD88E = INSIDE_MAN | V | 0x2A38ED4036D2BC3E0F6AB056F9A316B9 -0x59F0C92703CB4A05DC5CA0D499A551C9676B08D2 = INSIDE_MAN (Inside Man) | V | 0x1E5FF41AA6ACCFD372573249DF61DE71 ; MKBv12/FindVUK 0.98 -0x4366C5E985FEFCF0507B19F3644E4F84AEB401CD = INSIDE_MAN (Inside Man) | V | 0x6F85C263F3EACED35BE4DD0A38287697 ; MKBv12/FindVUK 0.96 -0x57C960F91FFC237B02286D65822778BAAF14E2D3 = INSIDE_OUT | V | 0xB2177B5C49060B3ED2798C18755D0DD7 ; MKBv46/FindVUK 0.89 -0x8049A20F934BF40CD8A7599588E2A3715333B4A6 = INSIDE_OUT | V | 0xD2A0A958DCD3F912F8A08D52B3C6D117 ; MKBv56/FindVUK 0.81 -0xDD3FA7FF21917610A3931D7CA78D71B4CDDE9CD4 = INSIDE_OUT (Inside Out - Blu-ray???) | V | 0x8E576AAC57A3F00C05D5E718E405E675 ; MKBv50/FindVUK 0.87 -0x5AB30902171516F35CB1AFEBDB999F14629F994F = INSIDE_OUT (Inside Out - Blu-ray???) | V | 0x758F4E6BF099048BC296384C3CDC8D2E ; MKBv50/FindVUK 0.83 -0x55112DBFAE29CC21E5128AF4B2972BE5FADF5184 = INSIDE_OUT (Inside Out - Blu-ray???) | V | 0xF63064F366D38092E2E93F4CA838B565 ; MKBv56/FindVUK 0.91 -0x5B5F84AFC22619D82563A15CB44F53B77B684207 = INSIDE_OUT (Inside Out - Blu-ray???) | V | 0xAED65BCA6E93D68F8FD9DB5DEBD4A7FB ; MKBv50/FindVUK 0.92 -0x8AD95C8187C7FE8DCBA5E8208B14D4E69E8E89C5 = INSIDE_OUT (Inside Out - Blu-ray???) | V | 0xFC0DB0882F41186457D5A02D9403B68F ; MKBv56/FindVUK 0.92 -0x1D0611CD0FD4E8C02C3DFE7EECD807871F1EC85B = INSIDE_OUT (Inside Out - Blu-ray???) | V | 0xC4E4B058F24043346376F4C3FB0E2488 ; MKBv56/FindVUK 0.94 -0xAE71E660B36DE5DB7AD1047B4DB2C09692FA274D = INSIDE_OUT (Inside Out - Blu-ray???) | V | 0x39AB6E61E93963BEF358AAD18E988D80 ; MKBv56/FindVUK 0.96 -0xE05EBD11BD2F02435E24F15E9BFD15C0EC350FAC = INSIDE_OUT (Inside Out - Blu-ray???) | V | 0x25AA1782BC3F8DB37D563021FE7BDFA7 ; MKBv50/FindVUK 0.96 -0xCE3EF1076FE243052886A63D0E1B03ADC0044237 = INSIDE_OUT (Inside Out - Blu-rayâ„¢) | V | 0x7DFFDC90D9498690C7720C07F42CEC42 ; MKBv56/FindVUK 1.02 -0x2B43A88F8EDB65976AFBAD913300C5A9BB4400B3 = INSIDE_OUT_3D (Inside Out - Blu-ray 3D?? | V | 0x44A1D4822AAB2522A9976EFEC713339E ; MKBv56/FindVUK 0.92 -0xD83467842BB29602CBE92E68A7D07E542A7D46D1 = INSIDE_OUT_3D (Inside Out - Blu-ray 3D?? | V | 0xF61E63D9D1CC39BE56209F17FC1B32C8 ; MKBv50/FindVUK 0.92 -0x48CF2253B0B6414059366E173B6C593E9BB77EA5 = INSIDE_OUT_3D (Inside Out - Blu-ray 3D?? | V | 0xA170B6E155CD6398900D2F3F885E6F25 ; MKBv56/FindVUK 0.96 -0xEB7F97BD2465633C2BD0E977CDED5E77C2EBEF4C = INSIDE_OUT_3D (Inside Out - Blu-ray 3D?? | V | 0xC022486E6ED79EB6C23A0C1917643B03 ; MKBv56/FindVUK 0.87 -0x3223618A1055521AA9D4AC57D25AFDB190FDF965 = INSIDE_OUT_3D (Inside Out - Blu-ray 3D?? | V | 0x69C310E38D1FBEED93269BCD1D493B13 ; MKBv50/FindVUK 0.96 -0xB8016EA67FC69D8E557AF82CEA8E8F465932F75F = INSIDE_OUT_3D (Inside Out - Blu-ray 3Dâ„ | V | 0x61F939CC4103CDFEC9D6D305845F417D ; MKBv56/FindVUK 0.99 -0x1FC5DF26951EB68520EE33B24D6A6F2C540635BD = INSIDE_OUT_3D (Inside Out - Blu-ray 3Dâ„ | V | 0x9EAED003A6F700F5FC93FC2A57EE33EF ; MKBv56/FindVUK 0.99 -0x2545D47ED68CA829E123EFD6FA5BB4A63913B7C2 = INSIDE_OUT_BONUS_DISC (Inside Out Bonus | V | 0xED0355B942632069EE64C5991649D6C4 ; MKBv46/FindVUK 0.96 -0xF4B84322EC72742D37FE0AB08E9BB16D86EDDCDC = INSIDE_OUT_BONUS_DISC (Inside Out Bonus | V | 0xC2FEB220FF4BB41F12396533AF8139A5 ; MKBv46/FindVUK 1.02 -0x04F6242ED6690E0B1289D1C75A87812A20F45C82 = INSIDE_OUT_BONUS_DISC (Inside Out Bonus | V | 0x856127A88231451CAC73444B1D992D9E ; MKBv46/FindVUK 0.83 -0xA53FA0C9513CE8E14E62AF989372ECBF704B5DFF = INSIDE_SPEED_WEEK | V | 0xB3DFFBAF49B4A9EFF0E90E5F9173ED59 -0x5C32289A8B788111F5E32A2CD13E30C48C173E52 = INSIDE_THE_BEAST (Inside the Beast - Blu | V | 0x88973791F8FD1BD805863413C0293893 ; MKBv30/FindVUK 1.02 -0x5C534F6ED7D0CA8EDBF9C53723F92B0E7D5608F8 = INSIDIOUS_CHAPTER_3 (Insidious: Chapter | V | 0xAE026E244601A99F167AD200C51C1BBF ; MKBv57/FindVUK 1.02 -0x1A3E1718F2F8803E8775696F140A6E5570BD3AB8 = INSOMNIA (Insomnia) | V | 0x641CB67BA8A2EB36EC7CB29FC9BBEE38 ; MKBv17/FindVUK 1.02 -0x8B380F3167CC5F118A8AF757FA58262E664CE3FB = Institute Benjamenta | V | 0x59F0D1FBC7A8575289CCFEDBB610ED5D -0x02F1B732AF11FBFC09E36A6C5C42FFFE6898374A = INSURGENT (Insurgent) | V | 0xEE75C704D3346B97043E3AC9CDD35343 ; MKBv56/FindVUK 1.00 -0x655EADEF969044E3E5B6B6933A6797EACD6AA6DA = INSURGENT D2 | V | 0x9957220768182C5B17C785DC783C56BB ; MKBv56/FindVUK 0.80 -0x473BA87E928AFEB38B84C8BD93AC0DE50D39D139 = INTERNAL_INJECTIONS_4 | V | 0xA7A606625E4D34E3E83D7B3C35EB668B -0x8AC9A6DBF918F1B9AE29BEA7F3803E25400D433F = INTERNAT D'AMOUR | V | 0x3F7D6CF8FD467BD08F457657AB9E7DDE ; MKBrev 48 - FindVUK 0.54 -0x627FF9C638235F63C1981DA63D30AE4417124174 = INTERNATIONAL (International, The (2009) | V | 0x43E6AC9C56B51036BB153687FF0F9700 ; MKBv14/FindVUK 0.96 -0xE239B4E6DB21B74E610D29FDF2B78D70B8E8C1FC = Interstellar | V | 0x9FF67F62DE7238D6360E56A55200773D -0x96DD22130C6BC770E87283F6F85B9824034EC85F = Interstellar | V | 0x588E52B0C25ECDC903C65A59E99E3E20 ; MKBv50/FindVUK 0.65 -0x910B45671881078BFEBD4983D25395FA58414984 = Interstellar | V | 0x2EADEAAB3B9E73D2E207439C51C8146D ; MKBrev 50 - FindVUK 0.57 -0xA4739AABC1EB357EC230BA4ACE44F0FD1D47720E = Interstellar (Interstellar) | V | 0x801E470FA14A58D5D65B5FDA88435DCC ; MKBv50/FindVUK 0.96 -0x46E26EC76696122B0F656236F50D38409B3073D1 = Interstellar (Interstellar) | V | 0x08F2C88E8C1B6C053369B465A1F8AB17 ; MKBv50/FindVUK 0.83 -0xBF4894689588D4D78DBC50EA37F3A4EA805AA8B2 = Interstellar (Interstellar) | V | 0x0E8BC931D13410C822F3A736229B2C73 ; MKBv50/FindVUK 1.02 -0x069F1D9A2442AA39FA53623E2CC0F241FE70C9C0 = INTERSTELLAR (Interstellar) | V | 0xB7E464CCA2A5B35DBE7EFE9D01C1AF8B ; MKBv50/BEE/VUKNOTVAL!/FindVUK 0.96 -0x63E3E8F8C7EC40E8D3FC7245BFDF3368F431F9C7 = Interstellar (Interstellar) | V | 0xB87C6EF9A6FFE86FAEB8DE6787328FD0 ; MKBv50/FindVUK 1.00 -0xF067B2D9478913A003CF979627BD0583B25DA7CF = Interstellar (Interstellar) | V | 0x78FEF0F83E31333644B9D376459AF075 ; MKBv50/FindVUK 0.83 -0x436465A582481502B4741710E2AA6462556114D8 = Interstellar (Interstellar) | V | 0xCFA096F841F60E4805A6AD835CD0EDB0 -0x773B6820D0DACC44B90075B855347808F69D7996 = INTERSTELLAR (Interstellar) | V | 0x6943B38889465516A7DA51F09972EED9 ; MKBv50/BEE/FindVUK 0.83 -0x57C752308DE662FE68AE9EF0B6446552C730DF7A = Interstellar Bonus Disc AU | V | 0xA1B364FCC5BE4D8C9B9D5B2F1ABA2637 ; Interstellar Bonus Disc AU - Roadshow -0xC4AEBF27E0DECB7A3F943A084D45BB6998DC68D7 = Interstellar_Bonus_Disc | V | 0x47C8FBB23FE2DACD9FCA259A32CC3EBB ; MKBv50/FindVUK 0.72 -0x3A38C0D2FD0A7091D7874473C401EA6FF69AA28D = Interstellar_Bonus_Disc | V | 0xD827B44861762E306A521FC39863053C ; MKBrev 50 - FindVUK 0.57 -0x42DA67066D560D8B869FC736CE25775EBCC4AB16 = Interstellar_Bonus_Disc | V | 0x5B0902D49D6ED274A7B02B077E6B3EEE -0x9F3E541C2688BF0F437374888D7B8A5AB0F480CD = Interstellar_Bonus_Disc (Interstellar Bo | V | 0x5D95B06C861A6F02BFC2D5D809D0C358 ; MKBv50/FindVUK 0.83 -0xC11CE1EBF739196E3187803DC7962A9D4049E671 = INTERSTELLAR_BONUS_DISC (Interstellar Bo | V | 0x2EED072D90D1DABB59539AAF202986D4 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 0.96 -0x0595AC210FC23DE60D91F8A5F5FCDB98325E2EE5 = Interstellar_Bonus_Disc (Interstellar Bo | V | 0x9366903A29402197570401397559EAAB ; MKBv53/FindVUK 1.00 -0xBF4BEFB9DEE2BB73A33368D11F27F73BD61AD46D = INTERVIEW_VAMPIRE_B5 | V | 0xF151EF24DD13ED4F6D4AA93F5998C2D2 ; MKBv4/FindVUK 0.98 -0x5CC7BCBE42FE3F5B7FA392FDFF3FF4E58CADC0E5 = INTERVIEW_VAMPIRE_B5 | V | 0x628CE2D7EA0D94E6F23EACFC98E256A6 ; MKBv12/FindVUK 0.99 -0x39185DBD6DB59674D6BB8A12281CD1B823812FF6 = INTERVIEW_VAMPIRE_NA_JPN | V | 0x5FA54391D307314D20D3E3AA0817954C -0x9AAE035F7B25B315193C60830F7EB3CB8275F4BE = Into The Blue | V | 0x9947F51260130416890A09A118BC31C1 -0x59BB97384A47E51919D69D297C9B70A47FE7DA89 = Into The Cold (Into The Cold) | V | 0x8D37993A29E26ABA3AEC9E597566F555 ; MKBv43/FindVUK 1.00 -0x622F34092D7ADB66F9D0F8A152C50B5B3FC2564A = Into the wild | V | 0x6A055814921FC0AD030BBC271E5EDD0B -0x01B630BD1269394321F3484E548D6A2F99ED57B9 = INTO THE WILD (Into The Wild) | V | 0xC3013A4AE7BF090239A46068EFF9C7EA ; MKBv46/FindVUK 0.90 -0x08F7FAAFE81E0FA2FEBFBCD273ECACFBA557E059 = INTO_THE_STORM (Into the Storm) | V | 0x0EDEEAE039804FA817B28861FFEBC835 ; MKBv47/FindVUK 0.86.1 -0xAF7331366D57768DF6040DADF3ED0360983FAD97 = INTO_THE_WILD | V | 0xEC2006187ACCE72EB5C681826FBAB3EC -0x680769AAB4A3EBD8C97F86B88D7CB1F062AFE6D6 = INTO_THE_WILD | V | 0x28865E18F8FFC810696D74B8F01ED653 -0x37CAA35F361CA735A5D063304427DC72B409C6DE = INTO_THE_WILD | V | 0x983DBF9787BBF6FAD4A72B7658AF63C0 -0xFD033788EAD880ED1544CDEE1AE589F9ABC2B223 = INTO_THE_WILD | V | 0x087F3D3B890542CDF441A18C761D4E1C ; MKBv1/FindVUK 0.65 -0x53275F459D07E0FA0F97ABEE8F514EA22D3337BF = INTO_THE_WOODS (Into the Woods - Blu-ray | V | 0xB93526748C03E8562FAF11031FAEBF2F ; MKBv47/FindVUK 0.87 -0xCA96C52F7C2002341DA3765432D6DC54E612F44C = INTO_THE_WOODS (Into the Woods - Blu-ray | V | 0x25821EEE167C965002725D631BA4076F ; MKBv47/FindVUK 0.92 -0x7271E6510055191715700563BB4E4E8CDFD33586 = INTRUDERS_G52 | V | 0x35F8B75A7012C8FCF7CB9BA40D0B380C -0x4B31A8551895B4AD8474AD1ABAF5BB3127BE35B4 = INUYASHA MOVIES DISC 1 (Inuyasha Movies | V | 0xC47D0A319E18AC243C67FD9FB008C3F6 ; MKBv36/FindVUK 0.98 -0xF6216AF34DD9DB129B5DD14C2D6D8C0ED7024DA1 = INUYASHA MOVIES DISC 2 (Inuyasha Movies | V | 0xA42E5C3FBE461799E167156B60A2B3F5 ; MKBv36/FindVUK 0.98 -0xD9DAAF7C8814DF336024A650604157B4DDFE33E0 = INVASION | V | 0x296E4CAAB11180D1B03074C371B68636 -0x286FD4D6E7A5BFBB2DA5925B51756385C3273E57 = INVASION | V | 0x464F132A02F59ECB9CF3A7BE3C8A26BF -0xF27DD2EA967CE7301164E06007340609D943B6D2 = INVASION OF THE BODY SNATCHERS (INVASION | V | 0x23A6C5DCCC64E309EF1D744DB0AD1251 ; MKBv43/FindVUK 1.00 -0x08A6799482C39E872695F23A29815A262F347FF2 = INVASION_THE_B5 | V | 0x859574CEB08D41D24E2331C920CF3582 ; mkb v4 -0xB29E914FA2C901967A1EBFA0B311D9998A4C4FBC = INVENTION_OF_LYING | V | 0x75797F60F8BF314DF94EDC408B9DB39E -0x33463ABC4F7C14C963B8DA00D37093BCB7B349BA = INVENTION_OF_LYING | V | 0x1F3030ED9BAC040FC74577A496CE51CE -0xB16B1BDE6655CC390E1D7D2214A8E9BBA480EAAB = INVICTUS | V | 0xB1C9590E649CDBE436B2B54781E0BA81 -0x7023F20D756DD0E6378FFA74E21094534143471A = Invictus | V | 0x621C35E7FE30B3AF963CA8BA61223D71 -0x4CDA42F0CAF00B0E0846C65F3BB1068A4B5941A4 = INVICTUS | V | 0x5B7D837E21E8432255FED1ABE76F9F12 ; mkbv16 -0xBEE767F888849CFB97DC013BC8D9B04BDA7838A6 = INVICTUS | V | 0xBC6EB7402166CE16C3F341881EF8F1B3 -0x8731508B7CC9C2E8E49E3041A9C3D4FF47F0210A = INVICTUS | V | 0x46516A0DAA15180636F108D440194D4D -0x24EF0E895A2457F0BBE92518A452388B5DA9EA5F = INVICTUS | V | 0x2CF25E14E5259FA3E83EF00D5DD99ADF -0x4C8ED5FE548A04B5000EE691F64A7EC2EFB53B41 = INVICTUS_BR | V | 0x69BFB6AF5A3FB1085EBDD21E9F784DFB -0xEC9413F5303404CA6CC549E42F8E2D2851589316 = Invincible Iron Man-animated | V | 0x2E29EDB2B4790F7557E5E02DE8824C39 -0xA15054953715937293C776B62CF67944164D48AC = Invinvible | V | 0x01868FCDFC22874D0358C7BB581400F9 -0xEA17011C2CDD6B40FDF7246A908572B0BD721492 = INVISIBLE_MAN_G51 (The Invisible Man) | V | 0x137E61BC86C57A2711607D288826C9E3 ; MKBv27/FindVUK 0.96 -0xB18C930CCD5D0577207E552D411807EBF14AEFB7 = INVISIBLE_MAN_G51 (The Invisible Man) | V | 0x9EBCE66A4097DA227B23B55A4EF9C121 ; MKBv27/FindVUK 1.00 -0x661181AE722BCA22A0A0B406151B3E328B36129A = IN_A_LONELY_PLACE (In a Lonely Place) | V | 0x10C3BD8EEF61ABE83FAF89030E56F90C ; MKBv60/FindVUK 0.98 -0x26EA526AB7B8E415FB36AD7805C3B42FE11B3FE0 = IN_BRUGES | V | 0x995077A0AFCA9ECFB5790D890C24D192 ; mkb v9 -0xD86EC8B2738ED24BA2972AA1080E97F5D5FE339F = IN_COLD_BLOOD_NA (In Cold Blood - Blu-ra | V | 0x6F58E38CBE144B6D180362285AADDA7B ; MKBv10/FindVUK 0.96 -0xF77675D6587357C91571447DE7A15CE9D86B01C0 = IN_DEEP | V | 0x95946C5A0D98A54F86FA5B6C99AC7B70 -0x59361D55DB06DAF90A3E0C546F66A4D087009006 = IN_NAME_OF_KING (In the Name of the King | V | 0x7A64257C50DA09617BA9BF7B42D5FA8A ; MKBv9/BD+/FindVUK 1.00 -0xC706CCAECFB585E79FEDBA919BEEADB5F44E48A7 = IN_THE_ELECTRIC_MIST | V | 0x077207910BC38AE9E34DAE0D88D65CC8 -0x2757EE63156A40DA0BB794AF00DF6559ADC058EA = IN_THE_HEART_OF_THE_SEA | V | 0xDD5A8B0CDB71D48825827AF378BAA45B ; MKBv57/FindVUK 1.00 -0xCEE568EE476494C318922CB175022B037C975DD9 = IN_THE_HEART_OF_THE_SEA (In the Heart of | V | 0xC8402667D52F9F8F86AC9CD077DE9422 ; MKBv57/FindVUK 0.96 -0x6532CAE695C23C7F9BD351B4E090661B430B56E2 = IN_THE_LINE_OF_FIRE | V | 0x4617AEFE833C41C8BA77903124F3E6A3 -0x9AD29C4C09CD9ED773E759864A48DA3B5827D40C = IN_THE_LINE_OF_FIRE (In the Line of Fire | V | 0xD56CABA244029F8B680F73CDA1E2364A ; MKBv7/FindVUK 0.98 -0xB6DACDB0D6DED8497C2FA3E1FA95C6788E90E87C = IN_THE_MOOD_FOR_LOVE (IN THE MOOD FOR LO | V | 0x5B4572A15659B7DD468DF7B4FE3A7198 ; MKBv33/FindVUK 0.99 -0x63973A53B7A759DA62F6BE362DF4E591C6C393DC = IN_THE_VALLEY_OF_ELAH | V | 0x0686B55C2470F1F937691452EF925CC3 -0x8808BF6DA6E6DC67ECBE7EA6C859ED95D8A90FB9 = in_the_valley_of_elah | V | 0xAD54B8D88167C63F48023730DD39E8B8 -0x5489D9DF5DB53BD13DFFCC6B100B98C9BED0F4B1 = IN_TIME (In Time) | V | 0x00615FFEB21E57013CF59094C1DDDE1A ; MKBv23/BD+/FindVUK 0.92 -0x120500B0B58CDBDBCE13192AF03584F99789BA7D = IN_TIME (In Time) | V | 0x7F0C4F991BCD029CD99D98E31F5ADB9B ; MKBv23/BD+/FindVUK 0.98 -0xB0929B5175047D9FAB44882213CE398B1711A204 = Ip Man 3 (Ip Man 3) | V | 0x14C58BC169D7E0AF9664D4925D60F74B ; MKBv60/FindVUK 1.00 -0x347A5D2519AD36CEA61C654691B2160302634E84 = IPMAN | V | 0x9EAA7BBDBFBB185E45554407EAF70BEB -0xD37F76A8BB52A07B4F218B478D6E511A652C96F1 = IPMAN | V | 0x6F866B83DFCA5F2BC5E0B4FE1432CEEE -0x8413F28C551610C9B20A45F0E3ADCF22CB46215A = IPMAN2 (IPMan 2) | V | 0x1C2969FCC24D89132EE9A5E766EF6DB5 ; MKBv19/FindVUK 0.84 -0xBCEA6F74F6ECDB4C0945DF5D1FC22EBBEE2D7B79 = IPMAN_2 | V | 0x3E894E4DE6170443E47AD848827E7D5A ; MKBv20/FindVUK 0.72 -0x0DCD91B175E1D04C1E7542EBC8C2A9A25C4FB1CC = IP_MAN | V | 0x8742F22DA4D1DE2CA9D42B984D9AD8E2 ; MKBv17/FindVUK 0.72 -0xBB31E5407967B101CB1AAD2C4BD1250955688590 = IRBT_F6 | V | 0x6BFABC789FB7355F2D320339882DE5DF -0x24FB36290940F87EEAF4B9F5BAFD2655D129D19B = IRMAOS_GRIMM | V | 0x9FE9A657F697B513F2C064AF218D7DE4 -0x35B1B09844DF7E6C1917BB7D00E9A60EFA9717DB = IROBOT_F1 | V | 0xF8B043AC6016F5EE2F5720112481392C ; MKBv7/BD+/FindVUK 0.92 -0xFD26D87D1447354E3D6CFC856CBEC070DAB905FE = IROBOT_F4 | V | 0xF22DDFA51B0E9923A4979E0BC3AF552B -0xF3E638E88ACCCC0D565CF5B33B9BC6B8D6EE7CCB = Iron Maiden | V | 0x8F00227823525704CE4BBAD1595FA876 -0xC5889BA59D37873F830CE18B319E4F8C19269015 = Iron Maiden: En Vivo! | V | 0x90B901AFC279838A9C754601B8F988F8 ; mkbv30 -0xD653FEFC0BC081042718E7ED508249EE1B0AB629 = Iron Maiden: Flight 666 | V | 0x1D2052E1301BA2BEF17B900C9AE764A8 ; mkbv12 -0xCED392A73675D498E9957D5A775ECC4EAC30BA84 = IRON MAN | V | 0xA8B9F5D816EDDDCBF7E56D9FE7E9F774 -0xFABD93205B3D90E9F597B2C56E4954DBB40A3B3A = Iron Man | V | 0x7CFAC5D553231E26C82023F72732B0F2 -0x7DAED437E5B7D34E4C5AC4430CD08EBE41E7E460 = IRON MAN | V | 0xF784F2A5E3D7249013D7F31CAC2D2C64 -0x256A1B4C895E98654F10DCF848A73CC88DE36A4B = IRON MAN (IRON MAN) | V | 0x5810DC356ADF9F7E47B0F9620018A082 ; MKBv4/FindVUK 0.92 -0x66B5BFE34A7C0F5B17E6C010F7766149E9C3292F = IRON MAN (IRON MAN) | V | 0xF7C868C87A47E90357B7C76542E8D7E9 ; MKBv4/FindVUK 0.96 -0x6678910844C00BDC3EB960B975648C5147B0941D = IRON MAN (IRON MAN) | V | 0x867CDC312B3817B6A92BF0E810678A6A ; MKBv4/FindVUK 0.96 -0x9936E28A26572AA5D3702263DB7A70352B76DEAF = Iron Man (Supplements) (Region B) | V | 0x82CC49B7F11FD07E6F70DDC0D31923CD ; mkb v9 -0xB325CF41AFDAE26ACB7B0D7418227DA7E3D62844 = Iron Man 2 | V | 0x62F7EDB4CBC9FEA23667B1038E487556 ; mkbv17 -0x573E39802F72A2C09508B6CFF73A022779141251 = IRON MAN 2 (IRON MAN 2) | V | 0xF20BFCCEF87F3573F85A4A542B65E7CF ; MKBv18/BEE/FindVUK 0.96 -0x8FB62BD409CBF98A83422D681B2EF11E6DB59051 = IRON MAN 2 (IRON MAN 2) | V | 0xAB2C014ED542D0AC72103E72EC59124F ; MKBv18/BEE/FindVUK 0.96 -0x2EDD42E1CD5E64375719829AE01FF975C20E365C = IRON MAN 2 (IRON MAN 2) | V | 0xCCBDC611364FAA8BBA747ED9608BCA24 ; MKBv18/BEE/FindVUK 0.98 -0x29C88CE46179FA3516B94BDB92115A8F231ED2A7 = IRON MAN 2 (IRON MAN 2) | V | 0x13A7F1FCD1147AAED7B70A764CE56A1C ; MKBv18/BEE/FindVUK 0.91 -0xBC620FA4662C905AEED1EE0C6FCB33C605B8507B = IRON MAN 3 | V | 0x54330545A8DD777290380058EA071B40 ; MKBrev 42 - FindVUK 0.57 -0x52ADCE371F8AEEE4AE7B34FCEE1C37CB2110D19D = IRON MAN 3 3D | V | 0x3911DF7D9369BCE2714DEAA88791B9D1 ; MKBv42/FindVUK 0.66 -0xCF7BE5CC603E97BBCE91E3636EA6A8563D4B54BB = Iron Man Bluray | V | 0x280E5859F15959184C24FB2F2ED546B5 -0x2E34AFEBE55D1C93C380E5565A234BECACFA435F = IRON SKY (Iron Sky - Blu-ray???) | V | 0xFE0B9597F6E9FEB1C05820F5BBFD590F ; MKBv32/FindVUK 0.83 -0x186BB5B7AB3512BE0686D75B927A95A397168ECD = IRON SKY DC | V | 0x947AC6A42DA6518DA29D68C936B7CFD7 ; MKBrev 44 - FindVUK 0.57 -0x7170C544409EF408703A317D8A7156DB42561227 = IronMaiden Flight 666 | V | 0x72633A8BF86C658BC726E17D2F479F9F -0xC1F93CF4619C2C81250925EBD8681D94FE66B3DA = IRON_MAN_2_D1_AC | V | 0xDE6E1D858410F925A4E707BAAAA08EF9 -0xF84721A6A7F9D6C8827C313A59F4E3C2890C068C = IRON_MAN_2_D1_AC | V | 0x5D5EB0C8A52F69593239A4D1EADA4C35 ; mkbv17 -0x3F8199ED4393591379745517153004E8BBF0EDA7 = IRON_MAN_2_D1_AC (Iron Man 2 Disc 1) | V | 0x6885D3C250C8F6FDBB4D42128C4031C9 ; MKBv17/FindVUK 1.02 -0x71894A21395108E680544F49B2EC8AAB0C2AD4A5 = IRON_MAN_2_D1_EU (Iron Man 2 Disc 1) | V | 0x342A4F604D0856B40007A92960F2BF50 ; MKBv17/FindVUK 0.96 -0xFE03997D96FD1D5DE05A2DCF335F1DEBFEA28353 = IRON_MAN_2_D2 | V | 0x35A7F8483A147CDFC74EFEB4963D93AF ; MKBv18/FindVUK 0.81 -0xAA82A66D8C3F91609D154D56E7CA06BC94C565F8 = IRON_MAN_2_D2 (Iron Man 2 Disc 2) | V | 0xFAA2E56A6B3435C0CFAA28EE3F16A60E ; MKBv18/FindVUK 0.96 -0x9DD3AFCA12C22228D6C31CD67A9F039E6639D703 = IRON_MAN_2_D2 (Iron Man 2 Disc 2) | V | 0x9DE91B39B108F98D835D42641DA8BD8D ; MKBv18/FindVUK 1.02 -0x827FB08D1932109D0D37BBF4590FFB0000EAAEA8 = IRON_MAN_D1 | V | 0x83C501D7DE8C3B574A21EB74353F0F67 -0x68EA892C934CED71C6D8BB279CAA0CFB3B050EC4 = IRON_MAN_D1 | V | 0x714371AE9DD9A45F38203550BBBC369D -0x175DE0793F28E8983115B7F8F2529533E57C6452 = IRON_MAN_D1 (Iron Man Disc 1) | V | 0xE94EB5E0FEE09D522096B2B56F6756ED ; MKBv7/FindVUK 1.02 -0x0D8BAFCC022B28CF0B91BE1377CFB98F75F45A95 = IRON_MAN_D1 (Iron Man Disc 1) | V | 0x3112707C29EE5E5D8D51F887E33B2247 ; MKBv9/FindVUK 0.98 -0x43EB24AB4037EB528A12B2CB8A943EC6A2497AD6 = IRON_MAN_D1_EU | V | 0xFB0A7EBD6552F12F8EA8E24527C46319 -0xA1C0A8049F17D81D9377ADFB7E30EA8A142E79CB = IRON_MAN_D1_EU | V | 0x21463A1200A5265A7101252B5E3EB20E -0xB5C24402DC3CE37D40D2B2DB990D5EA00F636873 = IRON_MAN_D2 | V | 0x1EC885F2E60A858E95B41EA019F6D49E -0x76B4662DD56E6129E9AA82F84D90AD45092DAA79 = IRON_MAN_D2 (Iron Man Disc 2) | V | 0x75C7659866BECF4912F701C8294158DC ; MKBv7/FindVUK 1.02 -0x422C4AF8C5CD373607949340830B56D9121D3511 = IRON_MAN_D2_EU | V | 0x57A3268DF038C8A736230D0D0CD634E8 -0x170F78F10CC9CBE482AFE8392871441B55D86AD0 = IRON_MAN_ROT (Iron Man: Rise of Technovo | V | 0x21A8D09E9D9793F701871B38E6D7315C ; MKBv34/FindVUK 0.91 -0xA70BD2718590DD706F35C1D0A4FBB7DB375C6427 = Is Genesis History? (Is Genesis History? | V | 0x880B4AEDCEDB0A91CD73DFA4D968F2AE ; MKBv62/FindVUK 1.02 -0xCF9C13C325D529AB23EA02B98AAB67E2E6326FAE = Is The Order A Rabbit BD-1 | V | 0x7D8A4A9ED238F07333DBCFD7C41912C6 ; MKBv53/FindVUK 1.02 -0x95F21426DC85550C73F69BB3B138B816423DA497 = ISLAND FEVER 4 | V | 0x83817F7742DC3ADA66CD59E9FB3EB28F -0x69A0452145D4675A0B0669008458C0BC455DA51B = ISLAND MAGIC | V | 0x94EE086155588554EDD2044162BC5D2D -0x37AE9B80F4681C354BEEE8179DF0BB101AAB3F91 = ISLAND OF LOST SOULS (ISLAND OF LOST SOU | V | 0xE5293D1C71B156B38EAFCFD893444262 ; MKBv28/BEE/VUKNOTVAL!/FindVUK 1.00 -0xCEB915F2A1CD6515A4C066FFAEFCE66525FDDFEF = ISLANDOFTERROR (IslandOfTerror) | V | 0xCAD62F5AFB43FC842EA3A8FCA0D7D224 ; MKBv61/FindVUK 0.98 -0xA372B7DD61AFBD32F6360EB64B50F3C6270C7B47 = ISLAND_OF_DR_MOREAU (The Island Of Dr. M | V | 0xC0831D90086EDB03A11CC51238FC7CFD ; MKBv20/FindVUK 0.96 -0xA076E88B369A69DF7903B94F9BED34509500149E = It Might Get Loud | V | 0xACAA3FB59E970A059B873E1AA65D4466 -0x048E2346F5DD15967A7E25C6EABD32538063853C = It s Such a Beautiful Day (It s Such a B | V | 0x3DDDC31061FFD6DAB3EC8DEAB81EA20A ; MKBv56/FindVUK 0.98 -0x11A7B8AE248E27A2BCE1C30747D377387500DBDE = IT'S A TRAP (UK) | V | 0x7819C9329C39DDA901626F965C2DB87B -0xD8FCBDF6C0607FB6CA00C63BA9562F52DDC946AE = It's Complicated | V | 0x6A3890A5DEE00F3B28B8BF6AFDF54CA4 -0x1ABB03302AAF497226F8312E37C2737FE6B83BA6 = It's Kind of a Funny Story | V | 0xA8C51C48827470C475ACF0B8C9F8B25B -0x3C31DBE853D74101696B9E87986C77F6706F83FC = Italian Job | V | 0xF2E29240CCB4883F484E70773B7A1149 -0x361972C0199B9C90B1B545466CA4613BFC35531B = ITALIANJOB_EU (The Italian Job (40th Ann | V | 0xD624870AA0953C8D10D78EC6CB9ED92E ; MKBv12/FindVUK 1.02 -0x86139EB40EE9F3C5AD2C8034B0A55A7B741B0065 = ITNOTF_G51 (In the Name of the Father) | V | 0x3F91FE313F89E7EA03E0CC8A7F05BD4D ; MKBv31/FindVUK 1.00 -0xC27B4220E14DC0F415277E215A3BD5156F137CCF = ITS_A_MAD_MAD_MAD_WORLD_BD (It???s a Mad | V | 0xEC9A2B588877A6D21BD91D7C885432A3 ; MKBv23/FindVUK 0.96 -0x8C1C1581C2EF515C99E5AFADE6DEE175096B8C56 = ITS_COMPLICATED_G52 | V | 0x8350FE8E207A707021D9B28FA71CFC9F -0x12C4921252B54D334140BEAD7416F9F95A5FE9D2 = IT_FOLLOWS (It Follows) | V | 0x8395D74397D29F416B34AD653C4B4D5F ; MKBv53/FindVUK 0.92 -0xD74C153FFB8C7C795D7FD8B07FDC40ABE5188CFB = IT_HAPPENED_ONE_NIGHT | V | 0x089803110B5F8014634CDB69F010ABE4 ; MKBrev 47 - FindVUK 0.54 -0x53153A29F0E65B8CD25FA7250DEC5702B2371340 = IT_HAPPENED_ONE_NIGHT (It Happened One N | V | 0x34CCD041CDA1597177CA79D9CF393AA0 ; MKBv58/FindVUK 0.98 -0xAD31A5DE9644A1B39156BBEC1862DD43B9B3521F = IT_MIGHT_GET_LOUD | V | 0xEA3307DCBC2BEAA95F38C8560C22A51C -0xBE9EA8E8F93C4FA7D32DF2C57EB48017F836AA1B = I_AM_LEGEND_B5 | V | 0x5D46F7D049A614E72F5CEC66617764AC -0x356D802C2354DAD7259D1AA1FFFA1EE21DA3B6A5 = I_AM_LEGEND_B5 | V | 0x456B7EA775B8F258C6D41D73949F6B5F ; mkb v7 -0xE0BB1B332176641EFEB0BA5ABB1BBB9256134757 = I_AM_LEGEND_NA | V | 0x7FC202B7668FB433FE7636A8CF5EE6C8 ; MKBrev 4 - FindVUK 0.62 -0xCD195F82D4880D6F003357B97686E06D0493B462 = I_AM_LEGEND_NA | V | 0x9FEBD5971E4A83AD7F41DF2309E3B3D8 -0x1475B0BA8F01DA7F0A3186A4FF6803A780F6901D = I_AM_LEGEND_NA | V | 0x38CEC56F5977A4A505E79FC18692855C ; MKBv4/FindVUK 1.02 -0xB075F1B9F3DB2967F4C15240AC81546AD8A7232D = I_AM_LEGEND_NA | V | 0x06F2F23B154D7A91633D051968A66646 ; MKBv4/FindVUK 0.96 -0xC66792250E3D831ACDDB79FBAEF01FAE25E0151A = I_AM_LEGEND_NA | V | 0x3AE2297529CDEA2D52B26B64E3D7BD50 ; MKBv4/FindVUK 0.92 -0x7D4570CA64BE1BC97AA40AC7AD1EA35EE36C4A77 = I_COULD_NEVER_BE_YOUR | V | 0x416EDFC41441F968ECE0B52AA7504FE9 -0x688F2BD729351280E383178A4BF8132C907AD755 = I_FRANKENSTEIN (I, FRANKENSTEIN - Blu-ra | V | 0xA6AC09536DCCC8963DB7977A36C89378 ; MKBv43/FindVUK 0.90 -0xF105A840DEF0F2908B536FC7C3C110630B740E51 = I_KNOW_WHAT_YOU_DI (I Know What You Did | V | 0x737381D0873DCF8C28ED87BBFFBC2102 ; MKBv7/FindVUK 1.00 -0xAF20014D7BFB1A802B29BC334AD41CE85480F591 = I_LOVED_YOU_SO_LONG | V | 0x48794E5415FB1BF6DAE2A8C1D379B43D -0x686F37EC5121C497414C3092AC3A9F580B50A3E3 = I_LOVE_BIG_TOYS_11 | V | 0xB335F05A940170C3C9D0AA92DFBD2915 -0x5671888D41BA69C23B03D6D4A947BB5547D6DF8C = I_LOVE_YOU_MAN | V | 0x3A0018FD7574CBD08B1531CA22E7F94A -0x4A6CE16EE0DE536B6BAA44FFF43A7812B8BBA9FD = I_LOVE_YOU_MAN | V | 0xE9CB7D46062E231EB6F66532F766F3F0 -0x9B7575BF97D93D55C0C82B78BC36884B6079DF07 = I_LOVE_YOU_P_MORRIS | V | 0xE9E9A4E89EBB7C4B15B18E696487335A -0xE63D17A8337B27797DEAEB946A3F95CF390A4B40 = I_ROBOT (I, Robot) | V | 0x78C1B677B3D428A1AE869D2FD44271C0 ; MKBv31/BD+/FindVUK 0.87 -0x83F28DD3455D7983948CE5203714B7731EC976B1 = I_ROBOT (I, Robot) | V | 0x3B074221CC3AED3216CE21A003BD0882 ; MKBv31/BD+/FindVUK 1.02 -0x106822BD6BDAD5200526420F2448597BAA827F8A = I_ROBOT (I, Robot) | V | 0x7C4CF1445C68EDB43E57F9E23B102823 ; MKBv31/BD+/FindVUK 0.96 -0x0FF5BE8F0C7372109762677F10F41E8BC9A07263 = I_TRE_MOSCHETTIERI_3D (I Tre Moschettier | V | 0x42DA9F9E249F253D31C1D228C8BEBECA ; MKBv25/FindVUK 1.00 -0xB072391C79736D320A85A1EEB1FCDB847DA85B44 = J Edgar | V | 0x40D172ACD9BD06448510D12B89ED1C77 ; mkbv20 -0xEE54EDED5E9E019581258DAD4D9565EB7964DD36 = J0x1113632BVR1 | V | 0x883865FCBE6B3968064C9F9ED45C463E -0x83165AA0AD2BCF7F2DC01691356981449B2CC1C8 = Jack and Jill | V | 0x62EB2D32C5195561462AAA458C899D11 ; mkbv30 -0xEBD5DC8879CAD6FDA054AFAB0EE689B04EC106C4 = JACK JOHNSON | V | 0xBB21318E71EADCE0921071DC90501961 -0xADC935DFE09ED37D267A285E4AA6A220FF68FEEE = Jack Reacher (Jack Reacher) | V | 0xFF04991D5871319A067E3F6BBB6A9505 ; MKBv35/FindVUK 1.00 -0x3F11502550013CC9838DD4E1584BBB6C36911F38 = JACKASS 3D | V | 0x3EEA05B3D811FE784D550074FE8BC6C3 -0x2676E38C63C4503EB3740C1197A2D53D49DA5B7A = JACKIE BROWN | V | 0x4A5C0592F0FA61F5F367FB4A5F512CC5 ; MKBrev 14 - FindVUK 0.57 -0xC314E46A3CE0526C43C1DB652688946C5FCD8797 = JACKIE BROWN | V | 0x829C9223E2F0C59F104B58C70F1C4A9C ; MKBv30/FindVUK 1.00 -0xAB733593770A5E99C34EEABE8FA2413AC6FC9EAF = JACKIE_BROWN_BD (Jackie Brown) | V | 0xE5A0E4BB7114141CD3A428345AFF142C ; MKBv25/FindVUK 0.96 -0x2175902BE6E0AB52CDD0A7145AD59FABB1540B52 = JACKS BIG ASS SHOW 4_BDROM | V | 0x8AAB9A59F69680B297C614CF23ADF47B -0x30DA28764004FA4920158185A268BB7823313FFB = JACKS BIG TIT SHOW 4 BD | V | 0xDE36C7E8BA26B49DCA4BE76533EB943B -0x7DEE5783DFC1BF58E5371EDE921D8F2D83B020D4 = Jack_Reacher_Never_Go_Back (Jack Reacher Never Go Back) | V | 0x4A12A006EA22DB48296380F42C639B78 ; MKBv58/BEE/VUKNOTVAL!/FindVUK 1.02 -0xD614D97968E7DA7440E34DFFCE7776AE2338C4AE = JACK_RYAN_SHADOW_RECRUIT | V | 0x98EE0B2A49EAB81D9121DFA764EE1E92 ; MKBrev 39 - FindVUK 0.62 -0xC3B205587737CFE5DC0420B10078E4345A65C702 = JACK_RYAN_SHADOW_RECRUIT | V | 0xC5066EC16006A1644294F8971E14BE79 ; MKBv46/FindVUK 0.70 -0x139F9723CEB2D538A60D889C1E99E68D9BE61D92 = JACK_RYAN_SHADOW_RECRUIT (Jack Ryan: Sha | V | 0x9A8F8ED1045D35A39B91E96FB3F95615 ; MKBv46/FindVUK 0.84 -0x2654C1F66AC1C67C0A8AEA1C3FE76B12DF69D39A = JACK_RYAN_SHADOW_RECRUIT (Jack Ryan: Sha | V | 0xD4C69AD832DA0AE50D70FA7306D02247 ; MKBv46/FindVUK 0.91 -0x28E1B7921304A9DAB99CCD798E3F69011F15986D = JACK_RYAN_SHADOW_RECRUIT (Jack Ryan: Shadow Recruit) | V | 0x5D78694001DC54FAC36A01A539D0F2CC ; MKBv39/FindVUK 0.91 -0x34C9A1B30A795C391FDE9AB02C7AD1AB022BB341 = JACK_THE_GIANT_SLAYER | V | 0xD351ADE9AF46F52EAB024AD7F85B2BCD ; MKBv31/FindVUK 0.81 -0x00DB20F9E00D5E36975F4715E67B1FE5FE3C69AD = JACK_THE_GIANT_SLAYER | V | 0x7C39E7FF814ECD7F85E445D23E2D68E4 ; MKBv35/FindVUK 0.81 -0x18BD711F63D6666530E12044D318C399129F99E4 = JACK_THE_GIANT_SLAYER (Jack the Giant Sl | V | 0x04488034B4266A7D0F13AA8F2A262143 ; MKBv35/FindVUK 1.00 -0xDD2E3B47B925A9F97DA013A8AE57658298246AF3 = JACK_THE_GIANT_SLAYER (Jack the Giant Sl | V | 0x85CA8AFCA38D6FC65DE9CF8C8A4CC783 ; MKBv31/FindVUK 1.00 -0xD1A145D0DB30C2611714EDF2E16490FE1EAF4671 = JACK_THE_GIANT_SLAYER (Jack the Giant Sl | V | 0xFC1084343EED4CE74EBCF37200EA671C ; MKBv31/FindVUK 0.96 -0xB697401F1CFF0348B93B05807ED4F87A5500468C = JACK_THE_GIANT_SLAYER (Jack the Giant Sl | V | 0x6F6956CFEEBA4A42ADD1C1951609D56D ; MKBv31/FindVUK 0.96 -0xC95E2F36863032D7ADB9882092C853ACB4AF5C04 = JACK_THE_GIANT_SLAYER (Jack the Giant Sl | V | 0xFEAACEEBA8EF62EFF7F781F741CC3196 ; MKBv31/FindVUK 0.90 -0xF60587397ED2D149C525B37407C666DDD4ABA1B9 = JAIL_HOUSE_ROCK | V | 0x98A10010AA77EDAD2FD382F1886126C1 -0xF5D24367F75A8E776928A180B663622574F0FFC2 = JAIL_HOUSE_ROCK | V | 0x57D6AE0B348317AAD4B6AF7D6CB5623A -0x756C6131E86F79C476AC851812F8571316613F47 = James | V | 0xE8A208AD4E0A93C5C27F9B831F3284A3 ; MKBv56/FindVUK 0.96 -0xBF6303563AFCE06D736CD07190201A826AC46F63 = James Bond 007: Dr. No | V | 0x5C7A2177C4903EEA60EF3B4EF17212CA -0x179F108C29036D7ABB6995446127213CF2AB0C88 = JANE_EYRE_DOM (Jane Eyre) | V | 0xB0352B224DA77FA7A37F66C185979FE2 ; MKBv23/FindVUK 0.96 -0x7F8ECFD1337837458501D337BD1D17A12FA6854B = JARHEAD (Jarhead) | V | 0x66901B0171F6D73D0BFC4103C5706462 ; MKBv9/FindVUK 0.96 -0x78DBCF4F36B6B68766382C18F1E854338380099B = JARHEAD_BD50_G51_43348R0 | V | 0x9C2956BCE02754D3A3E3876EA65D5F60 ; MKBv9/FindVUK 0.96 -0x840D7FCBFCA6B5CD3499356CF8F605744478AFFD = JASON_BOURNE (Jason Bourne) | V | 0xC2E5344514F827388793F9CECFDF23DF ; MKBv57/BEE/FindVUK 1.00 -0xDA6473AE1D908D820600F1646AFB194B44419B67 = JASON_BOURNE (Jason Bourne) | V | 0x2D3E7EFD93B836FE2616E42B56A8A4C7 ; MKBv57/BEE/FindVUK 1.00 -0xBE7BD75CC0DE26AB38AF164420A2B0EB2F2212AA = JASON_BOURNE (Jason Bourne) | V | 0xD26F4F90781923B809A3FBAF82EFC9B5 ; MKBv58/BEE/VUKNOTVAL!/FindVUK 0.92 -0x5FAD4AF726C9597262F9B769B8DE97D940075F0D = JASON_BOURNE (Jason Bourne) | V | 0x003BCA9508542C61B26640B6ECC84667 ; MKBv57/BEE/VUKNOTVAL!/FindVUK 1.02 -0x05FA4BC2CC3E478E54BC39885D81687A2074E420 = JAWS OF STEEL DISC 1 | V | 0xFBB7CD9CEFE3EF71FF109FD16FEE19FE -0x9144E8A2DA5151D7D06358A5B1FE7CC705A31A7C = JAWS_G51 (JAWS) | V | 0x11F7D7B46295117D86D38F7AE87079BC ; MKBv27/FindVUK 1.00 -0xAD1944C6E5765AD9FD8BB0FDC84B84F1AA9F00EB = JAWS_G51 (JAWS) | V | 0xCC55643B0A3770D494144A6174C5126D ; MKBv27/FindVUK 1.00 -0xF47BC03C56196909391A8A5EB57A43A08057BD2C = JAWS_G52 (JAWS) | V | 0x5CAC42B1AE2DA8F50AB4024B2AD6E842 ; MKBv25/FindVUK 0.96 -0x5030DB134B34A5FD2B5CA80F9FB6CF1A94952A4F = JAWS_NA | V | 0x5959ADE922426EF271807CCDCCD4A57E ; MKBrev 25 - FindVUK 0.57 -0x535C211854DC3816639629BB262C13EB5F7204FA = JAWS_NA (JAWS) | V | 0x5CAA6081F73FAB37C1A2225DD50E0F0C ; MKBv25/FindVUK 0.96 -0x33EE3405171D2075B60BE6EDBC8045AE766596B9 = JAWS_NA (JAWS) | V | 0x2B60BC70F7D071157AF7F3096CA607A3 ; MKBv25/FindVUK 0.92 -0xEA58CACF67C193A031A2E65C7C911E1BAEDED30F = Jay and Silent Bob Strike Back | V | 0xF896D2237AD60E8EA8003134425D0B92 -0x68C704EF6EB1E9D26C21282C7533C3EE4581DC75 = JAY_AND_SILENT_BOB_STRIKE_BACK (Jay and | V | 0xE4F89E337B72D118FF435787C6AED49A ; MKBv21/BEE/FindVUK 0.96 -0xB720A67ABB6B1B2472528735DCCD8B6BCA5FAC6F = JCVD | V | 0x9C3590279D2AB854A5602A6B61A748DA ; mkbv9 -0x7F064679648BF5F7C9E8C3B5D9DBCB98A4C80B9A = JCVD | V | 0x439AC64A73E00AC17BCB9355951088E3 -0x7DCE01A5272331878C8FCBABBED32E6161527D83 = JC_ESCAPE_FROM_LA | V | 0x849A7EB5C61DCEED3722E1CD0B4F1818 -0xB4C5955A6129D0AAC3B851F0B00B3E4F004CF39A = JEAN DE FLORETTE (Jean De Florette) | V | 0x8F1C927D942E1DD92E17E829E3B3800E ; MKBv26/FindVUK 0.98 -0x9FECF6A402B20D77342C68922EB1A5384095628E = JEANDEFLORETTE | V | 0x2834B5D56B29E9FD1F6DC4D125448A6B -0x6180BBF95457A39FD37F10B0B02BED5D69F6FEDC = JEANNEDARC | V | 0xE5A9B2FE72EB446429D3F72F3969B4D7 -0x97075FE0B507DE13375FDBDCE12DD68E15CED168 = JEFFCORWINSTURZFLUG | V | 0xB61E69867FE50FDCC10A228C8BA446C8 ; MKBv8/FindVUK 0.99 -0x4C78B4E18FB99294A83875EEB397A12B730B5FF6 = Jenna Haze Dark Side | V | 0xFE154F53FF104C542C95425EC45CFF42 -0xBE5328FE1850B2D6FE5EC5BE2DA49A76861FADB4 = Jennifer's Body | V | 0x35C440174FCD670223536019D40DA39E -0x72DEE2F275FC8C239CD6BEE548156FECA608F69A = JENNIFERSBODY | V | 0x1739407FF1F74E002AE1944718C4D008 -0x9AA5D2BF10FAAB9C63EDCF9EF71CB282F08D3B9F = JENNIFERSBODY | V | 0x06223DDE8C52445AF1E60AA740C53A2F -0x320A9F3873D30F0FFA54A78258DA3609E6FD0ECD = JENNIFERSBODY | V | 0x10BFC83A0858F863A9F3192150C7E7A9 -0xE98FA8157F62EAC095B9310824CAF54492427FF4 = JENNIFERSBODY (Jennifer s Body) | V | 0xEBB96F57C46E023FC9E98602714D3CD6 ; MKBv15/BD+/FindVUK 1.02 -0x9A6D66E84C970EF09B56AD283D7BE8077F1B74BC = Jensen & Jensen | V | 0xF554F1E4888DB17E68ADDCEF7A91B7ED ; Incorrecly deleted as unitkeys -0xD00E73B779FE292A3807E7B1873A7830DE44D381 = Jerry Maguire_AE (Jerry Maguire - Annive | V | 0xFBFC8B53C862AAC30AEC07CB6D419AC0 ; MKBv62/FindVUK 1.00 -0x679F1C1C2B603E64DDF1C9B57961D8C8E643E0C8 = JERRY_MAGUIRE | V | 0x3D48D57329848E93BAFAFD59DE61D02A -0x6931E2C6872FAB6EFF132462ADDBC4E698D3060C = JERRY_MAGUIRE | V | 0xC69F65D8C1C52FAFFB77BF58535541CB -0x79AC3DADC2B1A590A3A7EBC685E1CD95C2D23FD8 = JERRY_MAGUIRE | V | 0x3AD18369E4FC1DA950DC38A07BF1ADAB -0x6434522E8CC059CB0A4A9135EB4B13995ABBFAE1 = JERSEY_BOYS (Jersey Boys) | V | 0x3F4CC4B213DDCA4B51FA15099006CD8A ; MKBv47/FindVUK 0.96 -0x5CB90DF4B9B0DEA761C4E1FBCEC3E3A46A96B026 = JESSE HEAT_BD | V | 0x3442CBC4FB57E8D5B15DDB585EAA023A -0x6A7B13451E7B10C2E1E83FD8C5C6F59BAD092354 = JESSE ONLINE BD | V | 0x2CF56309C9B8D03042129273DDCDCE18 -0x085FA4D2B1542078CD6C425ADED3DB23C20B0BA1 = JESSE_HOMEWORK_BD | V | 0x658D2287B898346CB106D9F7EE644E87 -0x5D4076B1D6918AF9ED325D047F223530FC2A33FD = JESSE_JAMES_B5 | V | 0xA1888C77E416B417FAB9D7BB9E8456D3 -0xA8B17BA3DB2882AD7553D00DF8E185DAB02F8BF7 = JESSE_JAMES_B5 | V | 0x659F06C57D5187B09EE014E062CBD8D3 ; MKBv4/FindVUK 1.00 -0x466AE71C3D86D54CA3C3A042CF777FCC22C42267 = JESSE_JAMES_NA | V | 0xBD477F72B076D9F97022F9C09DD3490F ; MKBv4/FindVUK 1.00 -0x2392F618D263DA9BA0493DBB3096CD981BDDA746 = JESSE_JAMES_NA | V | 0x6D0A2B209A7ED2143C1BB617F3CF6C9A -0xF04CA48E17103B82EB6FF33BA448CF55F8FF1C96 = JESUSCHRIST_SS_G51 | V | 0x30D5E04F78C20899ACE85DF82D716AD1 -0xDE3FA6CE62C1453CA994848314C7B32AE1A3AB7D = JESUSCHRIST_SS_G51 (Jesus Christ Superst | V | 0xB84B04100D9769F343CCFDAFC0ED5043 ; MKBv36/FindVUK 0.96 -0xFC6D591108971BDAD9DEE3B5BAA30ED89DBBCFB5 = Jethro Tull Live At Montreaux | V | 0x57198FBCC7807F86F5801BE935233A3F -0x588BA7FB06088801868A8FDE89219615BD62F649 = JETHRO_TULL | V | 0x72334C56FAF62120E1FF1FD1F8D5FC5F ; MKBv7/FindVUK 0.96 -0x92A150FFB92A6CB44B62AA57812CC9ED398C9086 = JETS (Jets - Blu-ray 3D???) | V | 0xE9C6536999222F36F22EAD36AB8BD1CE ; MKBv40/FindVUK 0.92 -0x940EDCF29B9680E63EE3565F4453EFE6ED036ABC = JEUNE MARIE et GOURMANDE | V | 0x702BBCC2ABB865C56C0932CE19A00450 -0xAB27EBBF6B4F10CEB63FE1A5693F7C843590BFE2 = JEUNE_ET_JOLIE | V | 0xFB9021103C88A9FF6076250DBB991C33 ; MKBv46/FindVUK 0.98 -0x0D1656D7849A397BF01866239607D953E56E0A7A = JEUX_POUVOIR | V | 0x8CE8AACA7C10341C43C106F1BF909942 -0xC763BFE6D3961C4B5B9F0699CE5F8A3D3242833A = JEWELS | V | 0x34332F3FC97E7C3A00087B7ADBB61128 -0x8BE2ADB32349A2AB3CBC0B55C63AEC47D2EA1B63 = JEWEL_SONGBOOK_D1 | V | 0xDFCD2670279E97C825438C0F44F4183E -0x57FB1A4B9F486EA8F85D3578F624D46C057D5E67 = JEWEL_SONGBOOK_D2 | V | 0xBEF63E5918BEE8CF116DB24637EA8215 -0xC765B5BC7123B973A8270028A23A44C1C95A6B3F = JFK | V | 0xB0F1434E401591873DEFE82954EF98B1 -0xEB7688EEF52C641C294B4CC38DA0B1EF7996C358 = JFK (JFK) | V | 0x8E57C0C787F80F71FF0B34BD386C60A9 ; MKBv36/BD+/BEE/FindVUK 0.98 -0x2CE743FE3708CC6C765E35C216A8E24FA5490DAC = JFK_BD_01_DIM1 | V | 0x98882F3B16B142E0D3AC38BD37729C4F ; MKBv8/FindVUK 0.96 -0x77504199E90D53D617E6A95696DF2CB461DB65D3 = JIMI HENDRIX LIVE AT WOODSTOCK | V | 0xA67ACEB53E1BFFFF578DAA9E3A1C830B -0x144F2EC08DCAA37914AA95ECF04EC99381942D5E = Jimi_Hendrix_Live_At_Monterey | V | 0x08ECA5C26846C56F68219F482F4BEC82 -0x859CB615FF739F7657BDF2FC3E5940611065348E = JIMI_OTIS | V | 0x84AD005AB5D511B3F1189DBE52C113DE -0xBC1DB3E47172FA0E87ED04F4897A6F7825A88A35 = JIN-ROH (JIN-ROH) | V | 0xB58B2BBABA957F0109A191DF0ECC5295 ; MKBv44/FindVUK 0.96 -0xA5FDA0E207648B4E6F2898A029705C920EA676C7 = JM | V | 0x5ACCF613EAB47F3E5732E0B190D8007D -0x4A0C44E978B164CC0DDFEC9EA61311C98B88A64D = JMD | V | 0x7323F7C2351360DCA870D3595FBCDA8E -0x05A64CB09C646D0601A3544072515CEA79B2EFB4 = JOBS_NA (Jobs) | V | 0xC917B54AE604E1A7A9CF1FED023D2F7C ; MKBv35/FindVUK 0.96 -0x949F8A40C082E1568E32059B68FB0BB5E86B449B = JOE | V | 0x07E3E0E9E13BC7F1644BAC38ABE8D2CE ; MKBrev 47 - BusEncryptionEnabled - FindV -0xE25B0223FBBBC0792AF97A3B389C5B06CC1EDB1B = Joe der Galgenvogel (Joe der Galgenvogel | V | 0x2C852BC626ED06BA7B9EB6FFCA7228E6 ; MKBv47/FindVUK 0.96 -0x4E97508212C9CD04C768C78222D9C33FC1FC7E57 = JOE KANE HD BASICS | V | 0xD9E8A63AE5D0272A5C8D04A2E5A1C743 -0xB44983D5E884714A01F0562955CD2C11EFDD6236 = JOE_KANE | V | 0xB08D2726EE8C546C29C41C37044DAD80 -0x553280E358424FD2F16897EA19725787B5B3B699 = JOE_KANE | V | 0x337D272165942049BD45C48DA1FD9B7C -0x02D483DDA10D4C3AC1897CDDA7D80A54F53EF795 = JOE_KANE | V | 0xFD7BC3D86365F340E86C2D1739200597 -0xA93E92B03188DFE73DB8D9EEA188B2069FF4D7CA = JOE_KANE | V | 0x43061A726AC5567077759C1B19D8D8AA -0x9E9C264666ED783CE174AC117749FFDFA57366D1 = JOE_KANE | V | 0xA8EBAB5FA45D5700DEFDEF8861B192D3 -0xA8A5305B1CCA5C72514CCC7FEB7198A0AEF30417 = John Carter | V | 0x9AE5C018ADDA79CA84B45D8AE1932F1B ; mkbv27 -0x81B671BD35C856E8458A61318ECB9F7B605CC3EC = JOHN Q | V | 0x38BFC14DD944168DCE914861F7ECE7C0 -0xE5253860CC0C81DAD22E593EF873071B5FD7F136 = John Rabe | V | 0xA13A5CC41AF8D5FD7A6CB4C1ACA510DA -0xC6B6D1956709BEBFFA1728F363D5F65AACB5BD73 = JOHN RAMBO | V | 0x619D5CE83BCE5301F1E0E61301C0B1B9 -0xA76135A2CE7F5A91A548253B981F60A6BD7AA42B = JOHN WICK (John Wick - Blu-rayâ„¢) | V | 0xBBC94F081C23EC8169C92BB23EFA3495 ; MKBv52/FindVUK 1.00 -0x12C9D2B82C41447CACB557C1C540140FBA307A02 = John Wick - NOR_SWE_FIN_DAN (John Wick) | V | 0x3891E712DAECC1A28EC81FFF355AFA64 ; MKBv50/FindVUK 0.99 -0x1DF96FA79074796358186827F11A41D5C353EF00 = Johnny Handsome | V | 0x19A12EF53F7D9A8FD004404D6DBC9E10 -0x349E0B86908599F84BADC80EC15D8B10D76523DA = JOHNNY_ENGLISH (Johnny English) | V | 0x8DE1D534288EF2C0C8B17489C841F612 ; MKBv23/FindVUK 1.00 -0xAEA512AFD1157965C532677117C5203AD7354BE9 = JOHNNY_ENGLISH_G51 | V | 0x2587DD25E3B96D4434E6715BCBA291D3 ; MKBv20/FindVUK 0.80 -0x17E6EEC7E79FAB2AD5996D07F3C71B07D5101F2C = JOHN_ADAMS_DISC1 | V | 0x64C25E866EB54ECB082DA6EC6CB3FA3B -0x4601D722D3270E40C6916CFDD7BAE6B32A1EC9C8 = JOHN_ADAMS_DISC2 | V | 0xB71E330086DB24268CB3CFA3DF9A329E -0x467513D9A1C3413B25AFCEA130CA6C22F93B4280 = JOHN_CARTER (John Carter - Blu-ray???) | V | 0xD2FC4A1F18D95D5B984DB1E7BA03D597 ; MKBv20/FindVUK 0.96 -0x21A6427C7F50EB3F4AB3FBEF4A11B9BD81A54B7D = JOHN_CARTER (John Carter - Blu-ray???) | V | 0x7CDF685EC2ACA9A2748EEFC17EF79AA6 ; MKBv28/FindVUK 0.92 -0x7AE004C4F61C78F7013CD20DD2A498C03D66492D = JOHN_CARTER_3D (John Carter - Blu-ray 3D | V | 0xE33BB3F2950E29751BE8346B17D9C36A ; MKBv28/FindVUK 0.87 -0xAAB159D6110F7207A621E636C343171018339E1B = JOHN_RAMBO | V | 0x9F32B2E1169E5C4C3C80C6F025081176 -0xE8B37118E4CE198C9626C44A1E0C0B206D272358 = JOHN_RAMBO (John Rambo - Blu-ray???) | V | 0xB64FED0A20B59133F764A31B72BC3643 ; MKBv7/FindVUK 0.96 -0x8B65ED37DDA8412C21E0628884154A8AC639761E = JOHN_RAMBO_KJ | V | 0x556D96DB4A7A8B25E20B0F4B00F6CEF5 -0x30C0DEB168A077DD594EA1B559370A5481FEE493 = JOHN_WICK | V | 0x730F719DB641ECE5719D166F1F276123 -0x56A0ABDE16BC364AC38285F30FF3797B5A583790 = JOHN_WICK (John Wick - Blu-ray???) | V | 0x83558580B80EAD9023855A0A83A253EB ; MKBv46/FindVUK 0.96 -0x5C26DAD51EA8692230FA3D98548EE65E2F0D0189 = JOHN_WICK (John Wick) | V | 0xF5BE8E90B449D2FF30862A8C4B4698A6 ; MKBv53/FindVUK 1.00 -0x31C9A349C81C6218A52BBD33A183BB0DF0D1CC4C = JONAH_HEX (Jonah Hex) | V | 0x7B7FBE786551E7BFA3A700C40371BDEB ; MKBv19/FindVUK 0.96 -0x5F14D51845E6B64C99C33E2F3855B3EC7A3E5032 = JONAH_HEX (Jonah Hex) | V | 0x9F4DC49FC57805CD19BBBB360A780CBF ; MKBv19/FindVUK 1.02 -0x80A576D6BBF487E01B9AB8FD8C1C48B37836541B = JONAH_HEX (Jonah Hex) | V | 0x76A953CF77AD8EEEB7D1213A915D6844 ; MKBv18/FindVUK 1.00 -0x138F244477EB00AA9644ACE7E6A836031639B431 = JONAS_BROTHERS_DEU | V | 0x7D91D5DE6C90423496C58430163ADB0E -0xEB0C88FFD790D6BBA03AA361AB1529F6031BBF17 = JONATHAN STRANGE | V | 0x7A191EFA99B263101440710DD986DD6E ; MKBv52/BEE/FindVUK 1.02 -0x272995D0E1FD55ECC7DC176B3625C954A2510B30 = JORMUNGAND_S1_D1 (Jormungand_S1_D1) | V | 0x16C06ABCD803DC6F299ED907DAE05566 ; MKBv42/FindVUK 0.96 -0xB9A1AA489F3E76B55D04C62041599E6D3D1927F7 = JORMUNGAND_S1_D2 (Jormungand_S1_D2) | V | 0xE837C6AA9FB14DC9B73B4AA70C1C2C04 ; MKBv42/FindVUK 0.96 -0xA7D15C980588ABCBC8ED441027943215D6422019 = JORMUNGAND_S2_D1 (Jormungand_S2_D1) | V | 0x3AFDBF9353084C553573DADE28ADFCF6 ; MKBv46/FindVUK 0.96 -0x2C4420AABB309E3BDD5761883FB33120143BB8E0 = JORMUNGAND_S2_D2 (Jormungand_S2_D2) | V | 0x545C0B1AF2E5F628B2717A7C6C372E64 ; MKBv46/FindVUK 0.96 -0xB257FCBD6FB18F8584B2304E389EFE29B3CAE169 = JOSH_GROBAN | V | 0x63009AAC73CF5C8B37FB1281D8425196 -0x5434758D70356B5E348C37A958CB857A61B1DDA0 = JOTN_F1 | V | 0xA689D31B33B3E77B503DBD95AA4AB92D -0x2AF6BAB197298336426481C999D33B53A487E3AC = JOTN_F4 | V | 0x68D34DC235A3B81F376D0966BE950268 -0x008CBBB1FF25C4B8A06CE8D96DB28FCA58554C93 = JOURNEY | V | 0x17C9C47EB75476FF151A8444F1612831 ; MKBv25/FindVUK 0.80 -0x0EA72E0DAD00CC62F8294EB7BD5E80283BA392E0 = Journey to Agartha | V | 0xC0818A97F974395E6E7EF66E0D2391DB ; MKBv35/FindVUK 0.81 -0xC1F7D13FBDB73ECD1368EC49227DBA2CAFB585CB = JOURNEY TO CENTER OF THE EARTH | V | 0x7F8F53770DA67E0926FD2354F3159532 -0x02EBA2E5EAB79F726AF5E20E0D230E4F70F8F7B3 = JOURNEYEDGEUNIVERSE | V | 0x10A2AE7619B99225BE252093B4A54CC8 -0xDE684F987BF71C6832FCCD204BBB8D5FA37C4504 = JOURNEYTOTHECENTER | V | 0x11B224AE7D9B91E713182BF3452C775F ; MKBv12/FindVUK 1.00 -0xDE533215D4CA111136FD3683CA8C3700124A9307 = JOURNEYTOTHECENTER | V | 0xF3B9AE351564D3E5744B25CE7767A5D2 -0x872B2816E45130A72E2226CC50DBB1250DD9A8E1 = JOURNEYTOTHECENTER | V | 0x2ECE8561453FBB52B9E78A1EEDC1B409 ; MKBv9/FindVUK 0.96 -0x7EB23608CA72E5415FA66E7618509190D5BD7A78 = JOURNEYTOTHECENTER | V | 0xA4AB7E8D86CF3B2A02F1B34CB212A7D4 ; MKBv12/FindVUK 0.96 -0xF64AFEED8E2CB3619935DBC15F46A98717F7DDC2 = JOURNEYTOTHECENTER | V | 0x33019E8489C827A1B33399EB7F4E58C8 -0xA0BED78F54DDAF056EEBAAD7AEF842A851BE2674 = JOURNEY_ 2_MYSTERIOUS_ISLAND (Journey 2 | V | 0xD5E9D5712C44C26F895081465018679E ; MKBv25/FindVUK 0.96 -0xEF630F80AF341A523AA9791F50154A1F04C3D587 = JOURNEY_2 (Journey 2 The Myserious Islan | V | 0x8779BAD916B32DA83DD0897F8F1CD6B0 ; MKBv26/FindVUK 1.02 -0x9AF8AE34BF0729B1B89B504E0E451CA354A139BB = JOURNEY_2_THE_MYSTEIOUS_ISLAND | V | 0x28C92535752C28E20FB235E4EF430916 ; MKBv25/FindVUK 0.81 -0xA0C2875AF4D27EF39F1FDF59DB036F6DC71DCD3A = JOURNEY_2_THE_MYSTEIOUS_ISLAND (Journey | V | 0xA399332ABEDAC25E38A14D3A9ABE11EE ; MKBv25/FindVUK 0.90 -0x452DD4B4F470FB26B752FB9D8EE18DA5AE6529C2 = JOURNEY_TO_CENTER_OF_THE_EARTH | V | 0xB9E17F36F4912B41ACCB055A76D3E3B7 -0xF2C69AEFE382648B2235F2A3AAEED9B3D85F849A = JPN_FEATURE_FULLMETALJCK | V | 0x196CC18118835B1FE5833FF59CAE7AF6 -0x7118B5FAE5063E3601CC509270DDDF3366E927A5 = JUAN | V | 0xD2E0F8AAD6AF968B15B5970B8B97BF18 ; MKBv32/FindVUK 0.96 -0x4728E8EBBE93F804A6E84F1521BAC6BAA365F705 = JUD SUESS | V | 0x0D41280A518B100406320AB730152374 -0x217BA8F0A5F5B5AB3DF4675304881BF8B2A38DEB = Julia's Eyes UK | V | 0x91F64A93040703607BBD10154A6DEB08 -0x4A3B0486996531A55D7104A3E301D105B1A51684 = Julie & Julia | V | 0xF14D3173D1BA0E912CB2C5628BB23B3D ; English with French version. -0xFDCE5C2231A54F3D6C1A4F3DE9ACED1526805200 = Julie And Julia | V | 0x85F092BE025ED6E8EDCE0E05A66B3AFB -0x70487256B4241A01D4DC82E2334FC92B399FE9C5 = JULIE_AND_JULIA | V | 0x7EF1AFE4E015ED03DA4E0AE2AAA33E3D -0x13836731C6D19D5FF9A229669DC0CC41651D7E58 = Jumanji | V | 0xD301B4176067EC1A21EF82318EA818F6 -0xC71EAD02114775449AFD8953C7076CF8886637E5 = JUMANJI (Jumanji - Blu-ray???) | V | 0x5B81C65E594B3C5D8FFDE97E29976CFA ; MKBv20/FindVUK 0.96 -0x045916A4A07E2968BC35D55B073B6CE06882AD32 = JUMANJI (Jumanji - Blu-ray???) | V | 0xB5C14DB4717709EFAC4E4BC497B66323 ; MKBv33/FindVUK 0.96 -0xD284013F0AB41240B5BF8F4EE1BB0C78E525F159 = Jumper | V | 0xA079504D631A2D43657F822D221551B8 -0xA3EDF989357CBD9C02652A48896F9818BEE37009 = JUMPER | V | 0x920A375E1F5C2A76A914EA1862BE1E24 ; MKBrev 3 - BD+ - FindVUK 0.53 -0x71F5EFC66EEC9E8E0DE6AF48066628E90D212BA6 = JUMPER (Jumper - Blu-rayâ„¢) | V | 0x835912E86D8769C671E9591CA1A1AB12 ; MKBv31/FindVUK 1.02 -0x868F43DF7FBEE8FBC335DB21C93A4B61898199DA = JUMPER_F1 | V | 0x6D50025377C3D7A21B08722E353A5123 -0x511E1493CCA8F3F78840E95B91FF53FE44D5CF31 = JUMPER_F3 | V | 0x68ED851637529DF59EF43E4BA96FB06F -0x4859434F0902E739F0FC91B3D4D233397B6A628E = JUMPER_F3 | V | 0x99723FEB39BFFE2F6E9F11DD85D92ED0 ; mkb v7 BD+ -0x36A305885B5B3E128C84AE5044DC1C7E7F8AB315 = JUMPER_F6 | V | 0x0965A14D6D06F995A6C2BF5EE592CC18 -0x78E7797F40FB73A98EED23493E11598F4A1E780F = JUNGE WOLF | V | 0x6F336F0095E445FD41D0771F0A88602A -0xEB53CB737687910A97CE3921FAF49845FC321CB4 = JUNGE_UND_BIEST (Der Junge und das Biest | V | 0x79B54C08609FD64FA12B391C71D2B7AD ; MKBv61/FindVUK 0.96 -0xEC2F68B476B3449F684398A35C9216A455C805A7 = JUNGLE SHUFFLE 3D (Ab durch den Dschunge | V | 0xD76AF70AFF250E6F87FF79AEF67B79DA ; MKBv51/FindVUK 0.86.1 -0x9BFE5BE6F578B1DAB3A18F68C28ED5E6470ED7DB = JUNGLE_BOOK_DIAMOND_EDITION (The Jungle | V | 0x7478CBB9E2716019181F8437B93E7CD5 ; MKBv35/FindVUK 0.98 -0xA9636C93CF54465FABCC8DA5BB6204A752FBDB0A = JUNGLE_BOOK_DIAMOND_EDITION (The Jungle | V | 0x80E16252778ECED6AA5394001A94F400 ; MKBv31/FindVUK 0.92 -0xD68D26651DCF793F96B32AEB1AE50C7F6F5328E4 = JUNO | V | 0xD5276978FD29E1D0DBB2D57DC285102A -0xA8780EB90F88203C7205EB5C98EFF4CC53917494 = Juno (ESP) | V | 0x10E97E9609924059A2EB093EFDB688E2 ; mkbv7 -0x7F3069D111C2B9EC2B33844AA29BEB054C905EC4 = Jupiter Ascending (Blu-Ray & DVD Combo) | V | 0x2D36FA1CDDFBCDC8040B678539FAE3CD ; manual search -0xD7F63C48C7A1699235481F9571FD11ED1BE330D4 = JUPITER_ASCENDING | V | 0xB7E11B8511AD052BC36803DF2E32E494 -0xA57D3C48DD24EF5B7EA113DA0533336FDC1186C1 = JUPITER_ASCENDING | V | 0x074F4D44E104ABA7F1F2C4736F0A0E2E ; MKBv53/FindVUK 0.80 -0x8D6CB50A76DA5E4FCA7059A776E71989B437793B = JUPITER_ASCENDING | V | 0x798136902BAE729E3B9007A6DD925CD7 ; MKBrev 50 - FindVUK 0.51 -0xCDBCC498D8A5A2FB1CC1E7403113974A2803D029 = JUPITER_ASCENDING (Jupiter Ascending) | V | 0x346766574F374239B132FB6E5027B318 ; MKBv53/FindVUK 0.96 -0x6BDF0A76F3243EDAAFF1C36E5F04E15AF76FB66E = JUPITER_ASCENDING (Jupiter Ascending) | V | 0xDF13BD01C5F9F0AA87F11345DBC15323 ; MKBv50/FindVUK 1.00 -0x9D46E4DF6BBD675D99955923316E36B581947294 = Jurassic Park | V | 0x54692ABA11A5C6FE8D05A9F94BD436FF -0xD02C31DC919140A97FA8ED876519630034D5FA61 = Jurassic World | V | 0x8AC3D7F09DFE25E4905C88831D05C2AA ; mkbv46 -0xC6032B839D5AD0380AC775D350660132B9616F05 = JURASSICPARK3D_G75 (Jurassic Park 3D) | V | 0x1053AD4F5E1A65AAC65B211A31287875 ; MKBv36/FindVUK 0.87 -0x2E886A4D3D9215DDDFCCC6476E6ED91D24AFD0C3 = JURASSICPARK3D_G75 (Jurassic Park 3D) | V | 0x31A9689D307B75AB837486BD375DC59D ; MKBv36/FindVUK 1.00 -0xC123618D1D5DA89E7E08C69516607A48F341EFF2 = JURASSICPARK3D_NA | V | 0xAC27932876A6272F40D1F0554B0DDBFF -0xB0F4A0C4BEE2A9D08127B3CDFDB080234D3A3980 = JURASSICWORLD2D_NA (Jurassic World) | V | 0x01088A5C3769A23D800ED2D8B3F237B9 ; MKBv50/FindVUK 0.96 -0xD8FA0C21E06DB23168D0765D1BC8B43F8CC1E5B3 = JURASSICWORLD2D_NA (Jurassic World) | V | 0x1E3B6F6114DCE79834CFA04655DBC058 ; MKBv50/FindVUK 0.96 -0xE058004E3B32C04FBFDF8AC163F0020E24A082FB = JURASSICWORLD_UPB1 | V | 0x258509093AC4675C29686B4144585C25 ; MKBv46/FindVUK 0.81 -0x5422461F6EB5D6A12D6239B7C7C6B61482037CB1 = JURASSICWORLD_UPB1 (Jurassic World) | V | 0x14085F716C201766E0B02F824D9D1395 ; MKBv46/FindVUK 0.83 -0x50E45EE49440CE80A78A837A6EC141A9D0988674 = JURASSICWORLD_UPB2 (Jurassic World) | V | 0x0564C587802CA92E2313590C11C3EB25 ; MKBv50/FindVUK 1.00 -0xDC1ADEB2AB33EFF72525FBF65D7C45B8BF15E16B = JURASSICWORLD_UPT1 (Jurassic World 3D) | V | 0x435DA9464628FFC4ED0FDDCE94375253 ; MKBv50/FindVUK 0.91 -0x7E019655299ECABB775C4CC7F257D0D44928C8B5 = JURASSICWORLD_UPT1 (Jurassic World 3D) | V | 0xDD099B15B52121DD7A97A292B91625F8 ; MKBv50/FindVUK 1.02 -0x4FD89FE14638E8B17118C9A4E8598AB35A18385B = JURASSIC_PARK_2_G51 (The Lost World: Jur | V | 0x4497517F0CCECF881A73E927E5DBB7F3 ; MKBv19/FindVUK 1.00 -0xF8B77904E9D6815D9FE2B5C835AA4DB5C4BBBD41 = JURASSIC_PARK_2_G51 (The Lost World: Jur | V | 0x5CD96E98EFAEC2B8C3BA6454AC532DB9 ; MKBv19/FindVUK 1.00 -0x63008D3C317ABD73B75A167A54A4BFC522E2FC37 = JURASSIC_PARK_2_G52 (The Lost World: Jur | V | 0xA79BC1B20B8003616B79F65167060A1D ; MKBv23/FindVUK 1.00 -0xF0D109BE1FD22B7E4A1E58E7978541AE9286F91C = JURASSIC_PARK_3D_G74 (Jurassic Park 3D) | V | 0xEF03962D6CE0E3ABC78BC4E6CAD3A44C ; MKBv39/FindVUK 1.00 -0x37BFBA7D264D6BAD8F277562E8EB001D87769A5A = JURASSIC_PARK_3D_G74 (Jurassic Park 3D) | V | 0xF2C040D290DED1EE0164D258B84FBEFF ; MKBv39/FindVUK 0.91 -0xE905F0EB4D12978D930112805B8436704E055D09 = JURASSIC_PARK_3_G51 (Jurassic Park III) | V | 0x6594743A16FBB8E0AE57023BBD9FBA05 ; MKBv20/FindVUK 1.00 -0xF453B7FCA5CC61F40F8CE5E562FE583EB0703791 = JURASSIC_PARK_3_G51 (Jurassic Park III) | V | 0xBF8927634DE25A8DF648CC1D213A74EB ; MKBv20/FindVUK 1.00 -0x1C908338F259A26F664EA787049AF0908834E252 = JURASSIC_PARK_3_G51 (Jurassic Park III) | V | 0xD974B89E09062FFAE416DF5F4818CAE5 ; MKBv20/FindVUK 0.84 -0x79E983313EDFBE92D912C85B8A548BD3BA5D1ECA = JURASSIC_PARK_3_G52 (Jurassic Park III) | V | 0xA0960EED1D0DEB3AC1B4A87EC8844A80 ; MKBv23/FindVUK 1.00 -0x237EC3542EAB584C0AE5237A9BDEAF0930C35162 = JURASSIC_PARK_DOM (Jurassic Park) | V | 0x68806D237EEBB1015C51593BA1910558 ; MKBv25/FindVUK 0.84 -0xCDB007F0F0E0EBA49BA2BADE42DB10F5EFA92D09 = JURASSIC_PARK_G51 (Jurassic Park) | V | 0x732019C948BA285B928F8424863B1804 ; MKBv23/FindVUK 0.87 -0xC62C0090E62E1DEB5A63CACE4B38574D3B3C4DEF = JURASSIC_PARK_G51 (Jurassic Park) | V | 0xEFB3D94DB2F2DBCEB8719A1B79D76750 ; MKBv23/FindVUK 1.00 -0x72D93ECB1DD49BA0834C74774699E45F57228AA7 = JURASSIC_PARK_G51 (Jurassic Park) | V | 0xA652E25D90CA8DCA1E4B107704A8BD3D ; MKBv23/FindVUK 0.96 -0xF148077DF345CD73FB9E3F1351749B780C3915A7 = JURASSIC_PARK_G51 (Jurassic Park) | V | 0xB10599497AF7C262A31AA405184B3E87 ; MKBv23/FindVUK 0.90 -0x5305FCDD282B9ABE03E5BCA3950C28C4F2969B14 = JURASSIC_PARK_G51 (Jurassic Park) | V | 0xCAA69B0930DAEA13B70CD678FF596E36 ; MKBv23/FindVUK 1.00 -0xCB855C7586E4ED3DF4822504E0C4284FE4F1305E = JURASSIC_PARK_G52 (Jurassic Park) | V | 0x1246995B9E28446EEFE5368274A72EF1 ; MKBv23/FindVUK 1.00 -0xEDA67582F4308091B6BA3D86F10B8183D695686D = JURASSIC_PARK_III_DOM (Jurassic Park III | V | 0x546CFCC1A9B162846C4FDDD2B494548E ; MKBv23/FindVUK 1.02 -0x29A4247949EAE1262D9413CD1BB84A1FC3DE2B7E = Justice League - The New Frontier | V | 0xA086517E58F9E2CBE9CDE92879B66269 -0x6D0D6C7E89AF128D8F764F3BCC48DB99DF60304A = JUSTICE_LEAGUE_S1_D1_NA | V | 0x5E866E8E8EE8A92A9C6A8EBC25A52C34 ; MKBv7/FindVUK 0.99 -0xBE76B3EB63955CDCB4E70DD269701BEECF52D153 = JUSTICE_LEAGUE_S1_D2 | V | 0x83F4161D55A8EC0FC6826895535C1D38 ; MKBv7/FindVUK 0.99 -0xA6E7341A84023BC377B3B6E7EE84ED2A321A3A46 = JUSTICE_LEAGUE_S2_D1 (Justice League Sea | V | 0x02D9C37A534E92B4C0504CD8209F9123 ; MKBv19/FindVUK 1.02 -0x68A5F586C2A4A545A8C33CD785C6799B66AE192D = JUSTICE_LEAG_S1_D3_NA | V | 0x795FD37529CA4C13E9451C2F82F08E98 ; MKBv7/FindVUK 0.99 -0x6EE1568C22EAC7CE6A3149130D394CBF07194BC2 = JUSTICE_LEAUGE_S2_DISC2 (Justice League | V | 0xC77634E592227CBA3FE857BA2FC36ED9 ; MKBv19/FindVUK 1.02 -0x4C88AA87052251884F66D5037CF7DBA745F18DD3 = JUSTICE_LG_COE | V | 0xE9DD6FE5FFF12E9362BD56464B9D560B -0x56E63209CD4EDCB98EE7D6BEF618AF1710D1AA57 = JUSTICE_LG_COE | V | 0xDA7BADF7A92979F13AC98926D4EB2709 -0x9489F9EA0ABEF90D32B21BB8C4D4A4B106F91274 = Justified - Season 4 - Disc 1 (Justified | V | 0x60176E887C944FB5E1BF1F6BBA6841DA ; MKBv56/FindVUK 1.00 -0x0A2785EE473F7A3CE66FD3271AB76D34545CADDA = Justified - Season 4 - Disc 2 (Justified | V | 0x1BC54197546DBCD91A49FB598CD85668 ; MKBv56/FindVUK 1.00 -0xAA00E58CAFA9382FDD2E8CF065880B75906B5571 = Justified - Season 4 - Disc 3 (Justified | V | 0x6FA9FEF460666AC6C75694EEC785AA20 ; MKBv56/FindVUK 1.00 -0x3B774168EA3404242A31ABF04B0E8481E79CB4D6 = Justified s1 disc 1 | V | 0xA3E17A8DE20D86F359FD0AD71AD9F6CA ; mkbv30 -0xEF5A54D52CCB91ACBE3F208262A56FEA079E6308 = Justified s1 disc 2 | V | 0xFB4EFDC1C52190593228F56D19D42960 ; mkbv30 -0x4F1079EEB6AA19D32FA718617D3B686E6E3AECCD = Justified s1 disc 3 | V | 0x35A6A9F37252AE225437934B7CB8356D ; mkbv30 -0x8EDB3E9E3B0169F706B3AE1D6D24AA33F6A77324 = Justified Season 1 Disc 1 (Justified - S | V | 0x29F7E98B01BB560E8E6D89C2778ACD2F ; MKBv54/FindVUK 1.00 -0x729D88E9DBFEA181F14410C22EE6A6AC6706377C = Justified Season 1 Disc 2 (Justified - S | V | 0x9776E5DBB34FAE831F606CAEA1D21942 ; MKBv54/FindVUK 1.00 -0xBFC517BF99E7E509EEFA31CCA33E52FB5CDD8156 = Justified Season 1 Disc 3 (Justified - S | V | 0x45B14CE772D2DCAC36015D7CB73B18E2 ; MKBv54/FindVUK 1.00 -0xA8D59ED2DDC60088A3EE4089F9BB61489FE658FA = Justified_Season 2_Disc 1 (Justified - S | V | 0x42AB605E38BEAECC7FD1D579E51C515B ; MKBv56/FindVUK 1.00 -0x54FC3A73CEC418212304ABA6C70DE255B6BF2860 = Justified_Season 2_Disc 2 (Justified - S | V | 0xF677366BD8F5516426AE1C04CF63B3B3 ; MKBv56/FindVUK 1.00 -0x3518C0C4104255D203703B5899B87779DB756414 = Justified_Season 2_Disc 3 (Justified - S | V | 0xD3799C5CDE43C9B11AA841B17A2714AD ; MKBv56/FindVUK 1.00 -0x1B17B1736C0624FEA7B9D4D026E49B009433D2DA = JUSTIFIED_SEASON3_DISC1 (Justified - Sea | V | 0x41571BA79874B6E7AB18B2BDA0822469 ; MKBv56/FindVUK 1.00 -0x74A7DB6084ACA3E750633D04441EFDC0AAAD189E = JUSTIFIED_SEASON3_DISC2 (Justified - Sea | V | 0xE3C7DC9B122B18D622076044DADC4A90 ; MKBv56/FindVUK 1.00 -0x3EF38759E4C0526566994F93B16311B246F3333C = JUSTIFIED_SEASON3_DISC3 (Justified - Sea | V | 0xC7CF5A788646F0372C83B2E42754AA28 ; MKBv56/FindVUK 1.00 -0xD405805615DCB4335A5CC773C794590DF095576A = Justified_Season_5_Disc1 (Justified - Se | V | 0x27D95F5B383D73B32AF5BD143A399131 ; MKBv56/FindVUK 1.00 -0x1E290D084351848C79197328B6DDB1DC905B31A4 = Justified_Season_5_Disc2 (Justified - Se | V | 0xBE34E35A12EECFDE1CA28A9FBAF7EB5D ; MKBv56/FindVUK 1.00 -0xFA038098374E9E9EEEAAE9411F53647FAD2377E4 = Justified_Season_5_Disc3 (Justified - Se | V | 0x43912FD535F54FE53F616789CCE244AA ; MKBv56/FindVUK 1.00 -0x7A74F42C05A40F80A6223304C9328E32DD517798 = Justified_Season_6_Disc1 | V | 0x4CB9206EB887A3DE0249C7D259161168 ; MKB 53 2015-04-10 KRJ -0xDC5CAF326D518721747348A00589728910C2E055 = Justified_Season_6_Disc1 (Justified - Se | V | 0xE35CCF2FB3E48D419046F4F4990D3F47 ; MKBv58/FindVUK 1.00 -0x217EAE77CAA798C358C8A6AE70DE841601521515 = Justified_Season_6_Disc2 | V | 0xAD7B63A0830B5A76F4DA76937BF7D4A4 ; MKB 53 2015-04-10 KRJ -0x9ED6DD912A1480EE03C10314325536922C183C38 = Justified_Season_6_Disc2 (Justified - Se | V | 0x80DFCCEE63FE56BEEE31DC0BAA96305D ; MKBv58/FindVUK 1.00 -0x20C90A478DB293DC7679A7FE46DFED4D36B4C091 = Justified_Season_6_Disc3 | V | 0xC6F62C5D7E44161B850AACBD468C34B6 ; MKB 53 2015-04-14 KRJ -0xB94C4D36C308567BA0E4287EF80FC9A514E28D43 = Justified_Season_6_Disc3 (Justified - Se | V | 0x1C9FCC8AF762EF8D7D828C10831EF24A ; MKBv58/FindVUK 1.00 -0xAF3317A81F5CDDB6141CE0F632562CFC5698FB4A = JUSTINTIMBERLAKE_FSLS | V | 0xB8AFF0D6949D8A67706259B87A87B522 ; MKBrev 4 - FindVUK 0.54 -0x0240F93FE192DE2CF2028DE9097FBB4390561F86 = JUST_GO_WITH_IT | V | 0xB7F4A7E04013E0CA7F7C69E294ED85A8 ; MKBv31/FindVUK 0.80 -0x674793296C6FD42CA325641417DBFA0A8134F50A = JUST_WRIGHT_WW | V | 0x7BBCAADC34BEEC49B28A3B224981B2DF -0x880165EFDD5A7D6E249BB88AE8CAFD22587E982B = J_EDGAR (J. Edgar) | V | 0xA4689B0BBD9BD1A2DE1019B4EC7BA800 ; MKBv25/FindVUK 0.96 -0x8CEE83D9B54A53A14F66E509FFD831D11CA1C910 = J_ENGLISH_REBORN_G51 | V | 0x3DA36CAA680011140AFC37359C9310FA ; MKBv25/FindVUK 0.80 -0x10ADBB95F1AB078D42880EB927D885F1140D90BE = J_ENGLISH_REBORN_NA (Johnny English Rebo | V | 0x2789D56852319DDBCDF588E6B11AE643 ; MKBv23/FindVUK 1.00 -0x5578076AEE8BC5D72AB479AEAC58973EC215E34C = K Integrale (K Integrale) | V | 0xCE3C54954AB5C74C8731BCE8B1CE4B47 ; MKBv46/FindVUK 0.86.3 -0x759709387594A0D81F88AE5B487EED5D5F064453 = K-ON 2 Vol1 (K-ON 2 Vol1) | V | 0xD6EF46A6B1AD5E8E65BA3650FD0DAF3D ; MKBv53/FindVUK 0.99 -0x1BDEACEBF5267307DCC79BABB2D438A1B47410D1 = K-ON 2 Vol2 (K-ON 2 Vol2) | V | 0xD9F80C06A325EB35DC707AC7C7E763C0 ; MKBv53/FindVUK 0.99 -0xBCD0CA79AE9CFF9EFDD3DBAB123ACD007EEE3D59 = K-ON! Volume 1 | V | 0x9E0579EBA7CD14947AF90E16E91F9526 ; MKBv21/aacskeys 0.4.0e -0x47E4DC1F7D0D3CAAA3C21E13EE423ECB76D5A767 = K-ON! Volume 2 | V | 0x21D2D1211196F64B987031B7C48EF595 ; MKBv21/aacskeys 0.4.0e -0x29CBB88D4C6325D39130903E84C52CBC96AF34A2 = K-ON! Volume 3 | V | 0x28B74977A5480DCD44D4F574CE9B0FE1 ; MKBv25/aacskeys 0.4.0e -0x9FEBDD01A33B33D4981C4B0293FF21BF932BC21E = K-ON! Volume 4 | V | 0x1209EBA83B17CA43B9E15CE3C558A776 ; MKBv27/aacskeys 0.4.0e -0x4376293F6E849706C29C765B79C672867A1595EE = K19WIDOWMAKER_AC | V | 0xD1E315378F1A0E43B61B02729DC2CF84 -0xF29EA4EDD66FACF2AC805E9ED554C8CC368F32F5 = K19WIDOWMAKER_AC (K*19 The Widowmaker) | V | 0xC8C62002519EE7AB8F957B502E1C28F2 ; MKBv12/FindVUK 0.92 -0x2F461E0B0A3D48EDF64A7F9B13F1D7EBD3528F7A = KABUKIMONOGATARI (Kabukimonogatari - Blu | V | 0xCF9CC308B1C53F37AF999CD947D1B860 ; MKBv32/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0x72E44FE4DE1F5FEE5FDCE718CC0699F6312E6A22 = KAGEMUSHA | V | 0x6FC3DFD2873C027395839B3EF6DBD068 -0x021DB7F0BA8C8716A858AA144B3C11B741DCBCCD = Kambakkht Ishq | V | 0x5702E8399B2A0915FADB89B39E173120 -0x537F9510C189647DC5A9FD90E4D4553656933A14 = Kamikaze Girls (Kamikaze Girls) | V | 0x4CA00E863800CD8F939C1AF9D40C0B9B ; MKBv16/FindVUK 0.98 -0xEE0860B62D77B3847F148863AE6D6E70DED1A1EF = KAMUI (Kamui) | V | 0x74CF7B5C456541A3E4A69AFAB8C161F7 ; MKBv18/FindVUK 0.84 -0xF8E72110EE78AC4B2FF4A475174EB6495B40169B = KAMUI_GAIDEN | V | 0xDA6D5C4E4B25120E3A0352FC23D4B1F4 -0x3BB34F42425F1249F67B84ACA3390F08670EAA7B = KANOJO_KANOJO_KANOJO_1 | V | 0x9F8B41415C65DA530E7556A10FE24BE2 -0x5E54C37DD576FCB315F5B1BBFC9DAE58C3213AE3 = KANOJO_KANOJO_KANOJO_2 | V | 0x7A5A04F341379440EECA4BCEBC14D005 -0x6D8F8A0DB249E74022A79D1ED26ABB5BF60768CE = KANON_1 | V | 0x9214AE5705B43BA2A6E45F71D21AB0F4 ; MKBv1/FindVUK 0.96 -0x5039E307F132B26EFC5E275454DF6A3937BACFFE = KANON_2 | V | 0x6071628F1F410A55B0F9C81B00E0A55D ; MKBv1/FindVUK 0.96 -0xD0F70D60F8F7F2DB380A7615FC87A447C591615E = KANON_3 | V | 0x651F720C2E52D0514CF8A1463ABBCE31 ; MKBv1/FindVUK 0.96 -0xAFB3B210442CDFD2E6D7E9E67704E92360AC748E = KANON_4 | V | 0xE20A41716020DA36279C89EF78DFB7EF ; MKBv1/FindVUK 0.96 -0xC2CB4B611AB27BF4C77C03A4F6BF34B9A7B871DE = KANON_5 | V | 0x9595BDBB81396128952663BD37F55A3F ; MKBv1/FindVUK 0.96 -0xA936FF1719A1DE4CBE4327FCE9D8B33FD2D61F6F = KANSAS TKPLH | V | 0x35A43634A25C60A88990B6D4C9F9E496 -0xAA94E240667B87D21AA187C8714504B37C68EB95 = KARAJAN_MEMORIAL_CONCERT | V | 0x6E6E597383099FA4555C5DBEDAB30A37 -0xD0E9FEF131B61F2C8EABF4642616334BF165A7DC = KARATE TIGER (Karate Tiger - Blu-ray???) | V | 0x83EB0EB1B61B7CBA5FCDDFA1D51668F0 ; MKBv55/FindVUK 0.96 -0xA0469621CDB751A84C5C424646438AD1AAECD06E = KARATE_KID | V | 0x1CF479657445CDD7C4DFA5031430D8DD -0xCFF2A6E76DAA15A693FD13F21A83481099E26755 = KARATE_KID (Karate Kid, The (1984) - Blu | V | 0x1026CE200F0F75DBC50338BEC9929A71 ; MKBv17/FindVUK 0.96 -0x4D46CC3E4D7F7D62B320ADF6BF543AC602C98CD7 = KARATE_KID (Karate Kid, The (1984) - Blu | V | 0xF03D222B6E8465E81A95D12AED5F20B1 ; MKBv17/FindVUK 1.02 -0x2CE5AF1DC2F02ACDDC7E46A9FA23D9153AACDBED = KARATE_KID (Karate Kid, The (1984)) | V | 0x5CCC08A453EF561993AB409773046233 ; MKBv17/FindVUK 0.89 -0x053CDE33DD2B3123298E55A2769D8F3D0B74A291 = KARA_NO_SHOUJO1 | V | 0xCD538E00247359DD77A567C51497032B -0x863D6CA19B40B8E5DE02517FEA5588462A79438F = KARNEVAL_CS_D1 (Karneval_CS_D1) | V | 0x1B8BB98331500B3D0CF1D0B747D7205E ; MKBv46/FindVUK 0.86.3 -0xF65F28463696EF6B21BB80D8E02573B673D2FAE3 = KARNEVAL_CS_D2 (Karneval_CS_D2) | V | 0x7C6C1D189DC491C02BE59097B09BF2F6 ; MKBv46/FindVUK 0.86.3 -0x6D5D255C8A3D73A634DD377B202EEE511A12D4DE = KATANAGATARI DISC 1 | V | 0xFB60531E6FE2A9192665CB315615CFD0 ; MKBv40/FindVUK 0.96 -0x033A86170D5861CB92E8177C05459C473A38A518 = KATANAGATARI DISC 2 | V | 0x5E8CDB83A0E545CD09CADB624C87BF34 ; MKBv40/FindVUK 0.96 -0x69DFC9B05810C7F534F97EB466C38A3CBAEC10FE = KATANAGATARI DISC 3 | V | 0xECF13D51694804DDD3B1002DFF6F4FF3 ; MKBv40/FindVUK 0.96 -0x665CC45D8B2A71467E69612BAEA0F0A310C06C68 = KATE UND LEOPOLD | V | 0xC58510EAC0B6DDC5B54A61A9CE6102AC ; MKBv12/FindVUK 0.92 -0xA9055770115AD46556447C0B80932479B4FF3143 = KATHARINA BLUM | V | 0x4339AD02B99F60248BE40FB798FB7F3F -0x4E6C659B758ECD76BF0D8A623AF30A1269716A0E = Katyn | V | 0x4ECE5804FE5BFD2509131D501AF1BE8A -0x827B24F2640AF04B86DDD23B5DB7B7A102C85930 = KATYN (KATYN) | V | 0x12E62C6CE7104755E92CED4B826FF0C5 ; MKBv16/FindVUK 1.00 -0xE50249348661680DF3A66156B5361CC1B96CF8AF = KATZENJAMMER LIVE IN HAMBURG (KATZENJAMM | V | 0x087333908E532466F5A2C0F267419CF3 ; MKBv31/FindVUK 0.96 -0xB13317E6A5520C7DFAF896EB4F2F7F3062907259 = KEANE | V | 0x00416E489C0E2575284E02121D3E8CFB -0x555160B13F9B5CF10F1118D31A8103F37F763BF7 = KEEPING SCORE BERLIOZ | V | 0x3AB71456F998A929C2F8B8DD35F01238 -0x248FC6AF5C91177047B60B0B5EC21D278DE376C1 = KEEPING SCORE SHOSTAKOVICH | V | 0xDFEDF04FBEA62990C44C208E3F9C5560 -0x769B94B2C7F4D1F39EFC175466F1F554956D3878 = KEINER HAUT WIE DON CAMILLO (Keiner haut | V | 0x3A63D98F29F024B02B324636139D6816 ; MKBv54/FindVUK 1.00 -0xFB4440485AF27B9C7B8E9BCC48E20114AD5C17C3 = KEINOHRHASEN_D1 | V | 0x6C613B0508B4D07ACE888A70AB1EBFD3 -0x155DA66F113151E62AF59938F19585A119BF3EE0 = KEINOHRHASEN_D2 | V | 0xA04A3FD731A567E06114BF96CAE4FF45 -0xDF12C20B58A781DD07B3EB372CE16A945947DD43 = KELIN | V | 0x4FC679D47B0089CEC8BE2D2B13E10AA9 -0x09F5299EA7E54C158CCCC0B0D9745ED449A6C946 = KELLYS_HEROES (Kelly s Heroes) | V | 0xED8C61ADF5788556E0411DE16E605813 ; MKBv16/FindVUK 0.96 -0xEC1BDFEEEEBAFF38F44AEFD2D3FE955E8872DEC9 = KEMONO FRIENDS 1 (けものフレンズ 1) | V | 0xE7E1217E1F7A7E332CEB454FD8AECD81 ; MKBv62/FindVUK 1.02 -0xB9E1F0D177644475D0FE68A46900B28C4EDDA70B = KEMONO FRIENDS 2 (けものフレンズ 2) | V | 0x1EFC0A2881C83506D5B466805FED2AF5 ; MKBv62/FindVUK 1.02 -0xAD81F925BC4BBC7696A7B4BED23CE987DBF5BC1D = KEMONO FRIENDS 3 (けものフレンズ 3) | V | 0xBCDC33FA4DD6FE45377DEE1AF8C2065B ; MKBv62/FindVUK 1.02 -0x8B3177FA0877CAD4F037739A014B288C2456C72E = KEOMA | V | 0x4C2B11BB6B3A7B30CFC762A3B6621268 ; MKBv33/FindVUK 0.98 -0xD3FDA734226DEC8B5009C85D8193B634CB5AA110 = KICK ASS (UK) | V | 0x7F1C0779F56E096BB689775ACCFD0BC0 -0xD779193FA79D52B7ADB9894528E2504931FAFDD5 = Kick-Ass | V | 0xE1157156BF14139E787E317529F767F4 ; mkbv17 -0x6FEC2B66BE344E83548CFC34080FAD69B83BBF8C = KICKBOXER_BD | V | 0x3C402BC9DA65F25080FB81C35B60A71C -0x37E02D9B64037A8975AB397774DF85C12BE3A22C = KICK_ASS_2_G51 | V | 0xBFA8480E2B49CD5C9F7095F88132B913 ; MKBv43/FindVUK 0.80 -0x39BD04E6A829CDC6AC100FF28C3E6DB11B7F4A5D = KICK_ASS_2_NA (Kick-Ass 2) | V | 0x1DB41DC675E6301F2AB412C224B031C8 ; MKBv35/FindVUK 0.92 -0xB3EC847B6A7509DE0CE4A3002B9727D81DD48D09 = KICK_ASS_DISC1 (KICK ASS BD 1) | V | 0x49DEB0D340ADBFDE313442C1A1A7641E ; MKBv17/FindVUK 0.98 -0xB4D914404E51F3F89E2DF1EFB3B32B95166B2D08 = KICK_ASS_G51 (Kick-Ass) | V | 0xF0DC48FA92685299AE0A68E027A59D64 ; MKBv17/FindVUK 0.84 -0xAA1039E85D01270070B33CCB335355EC4AE75A8B = KICK_ASS_G52 | V | 0x6F2DD525CBDC1F509087C68720A96F3B ; MKBv17/FindVUK 0.80 -0xD5010F79AA90155EE12E481A4A9ECA8F3D909300 = KICK_ASS_G52 (Kick-Ass) | V | 0x208F1181D0A9F25189F2910EF1F7D1A3 ; MKBv17/FindVUK 0.94 -0xBD0DD78BEB6275C77B79712DB0DF706D9169DC78 = KICK_ASS_G52 (Kick-Ass) | V | 0x22A63A35B6587D87A51F4AE636F1617C ; MKBv17/FindVUK 0.96 -0x9F2A597638B39DEB66EB0FCE496E55AE06F3C2E0 = Kids Return | V | 0x93A0392FB357F4F120D3E355BEDFA97F -0xF03870673F1EAAE2E3B163FD4C31BA577C2EE2B3 = KIKIS DELIVERY SERVICE (Kiki s Delivery | V | 0xFB881484AC97AAE85CC36DEC189B9535 ; MKBv38/FindVUK 1.00 -0x242F7B3AE1F06F009347FA08B60EC478A733EA63 = KIKIS_DELIVERY_SERVICE | V | 0xB578D2F36367864B24EC88091BE7B474 -0x0EA67A02B7F51473D701A0FBB5616A23E12F538E = KIKIS_DELIVERY_SERVICE (Kiki s Delivery | V | 0x8D080911197338E2384E150A721639E8 ; MKBv46/FindVUK 1.02 -0x242F7B3AE1F06F009347FA08B60EC478A733EA63 = KIKIS_DELIVERY_SERVICE (Kiki s Delivery | V | 0x1A58A64BEDE889BDFABA5DEBBF005352 ; MKBv46/FindVUK 1.02 -0xFD75231905F36760426C9E508505DC33B3949916 = KIKIS_DELIVERY_SERVICE (Kiki's Delivery | V | 0x5C0BD2DDAF07A94E075208900C69B17B ; MKBv46/FindVUK 0.93 -0x2D7BEF4425041FD91E605011602BBE133A0F6AA9 = KIKIS_DELIVERY_SERVICE (Miyazaki Collect | V | 0x6365F40EF6CDF9E712CC3B40D0DDD85E ; MKBv46/FindVUK 0.96 -0x0EA93D833D7CA4B5AF97014A5094C3C0E9EFB4BC = KIKIS_LIEFERSERVICE (Kikis kleiner Liefe | V | 0xD594A4602B854016525F627D59B69D24 ; MKBv39/FindVUK 0.98 -0xBFD9183D4D59A0C690446E532AA4CFFCC8710FBA = Kill Bill 1 (US) | V | 0xA9AACD25E3048EC1D01D99C5FA2E7F63 -0xC1F74090D6CC3AEEBD751125E9951FFA44E3CED2 = Kill Bill 2 | V | 0x5542BC14524E0CB8DA043B035196CE43 -0xC74010679A48DEDCF11A175FB921BDC42930E15F = Kill Bill 2 (US) | V | 0x3390D8EC1FDEF3BFD87F0DAD9B575DB8 -0x8C3A930BF56E7CF8F041B53C341282F4C3E92295 = KILL BILL VOL 1 | V | 0xA7B6C36482DF32863EDD7ADDBC2C5F6F -0x981A02E42BA508290872B3769CB977CFADD0E0A9 = KILL BILL VOL 1 | V | 0x9103045BE7FD0EC061B3B0341513B79A ; MKBrev 9 - FindVUK 0.57 -0x77A408632315B58B3CCF93224C648E808F6E01A0 = KILL BILL VOL 2 | V | 0x3C89FB81B92F216953222129D335A580 ; MKBrev 9 - FindVUK 0.57 -0x7380FE1E3D682F2328D85D4A6F5F573BD32257B8 = KILL BILL VOL 2 | V | 0xA9129714731E323221DA45E0BFFE619F -0x09204E59D5FE4F8D518F672DDCDE355A37AE4589 = KILL BILL VOL1 (Kill Bill vol.1) | V | 0xBF506997CCA37407B621428CA36AEAAA ; MKBv19/FindVUK 0.99 -0x8BB67F6E815A4AB3841134C03948683BCB9D4ACF = KILL BILL VOL2 (Kill Bill vol.2) | V | 0x374D885F3E96087F774601794A79E608 ; MKBv19/FindVUK 0.99 -0xC77095837CDDE60C8D8CD02845497656A7F327A1 = KILL LA KILL VOLUME 1 (Kill la Kill Volu | V | 0xB5B09FA1010C6B0272554B8AFECDD7F8 ; MKBv47/FindVUK 0.96 -0xF881541612A983BB4725AD2BDA0C049B5C0A2917 = Kill Point disc 1 | V | 0x89C93F1EEBE1197BB56CF4B7A3F123DC -0xB8D4BF49F1BFF8C52EDEE751546C29AF7B9EFDB2 = Kill Point disc 2 | V | 0x7AABCB659C843B2144AA5C0985E007A5 -0x04A0CE54D5919717FBF3EA4275BFAAFCC26CBA78 = Kill The Irishman | V | 0x3C3DAA7CD62CD1F5E38E3EAACD86A694 -0xB90D5B241D8D53BD7B4D39D15AC8028112BC88F5 = KILLBILL | V | 0xEE140C0A1084802ECA498068D8410526 ; mkbv9 -0x758D64FD28F8B7088D1FA61FBA3B4D2FBA4F26D1 = KILLBILL1 | V | 0xE4A5303D033153C0E5A35C34F85882EF -0x199E02CA16354FCAA3420D98BCD5AE19068B706F = KILLBILL1_US | V | 0xD492AA42B555C8585E950A1F0C349528 -0x2CA278ED58D3F83ED02B778051D79586BF8DD012 = KILLBILL2_GBR | V | 0xA97426FD5DCF9D09BE5A860B0E2A8B69 -0x1813CC5E7C148978B6A3C33CBB0CA81D022D27CE = KILLBILL2_US | V | 0xC127A38661E9125AA6AD8892AA2E5557 -0xCE1FA5CA940D0075012F179ED934135CC19C3474 = KILLER INSIDE ME (The Killer Inside Me) | V | 0x73149EB08C43288373185AF42C5BFA28 ; MKBv18/FindVUK 0.96 -0xEA4DE213AAEDF5A04CD6A2F5BA7557E72BF980DE = Killer Joe - NOR_SWE_FIN (Killer Joe) | V | 0x1235AD254BB078C588DBE9C6CB19D96C ; MKBv33/FindVUK 1.00 -0x4037D3188403976CF485F5AF6A307FAAF26E3A0A = KILLING_OF_A_CHINESE_BOOKIE (THE KILLING | V | 0x963DE3D8493E36020788C9121B7EB0D9 ; MKBv43/FindVUK 0.92 -0xDD818B925A182A39179F32F055143EDDFF7227FB = KILLING_THEM_SOFTLY (Killing them softly | V | 0x44FBB86B23B59D10B92BBC6847BF3C6D ; MKBv37/FindVUK 0.99 -0xDFFB6D940FFAC1B814CAB96BE6162DDFE2D74EF7 = KILLJOYS_S1D1_UPB1 (Killjoys: Season One | V | 0x5266565783D02B5FC45075A3C6A69681 ; MKBv56/FindVUK 0.96 -0x5BECDA5C5D5C0D0B6F0198293ECF4D3087060CF5 = KILLJOYS_S1D2_UPB1 (Killjoys: Season One | V | 0x3D2A2FF6568918DEB9D5B7AFB66DE391 ; MKBv57/FindVUK 0.96 -0xC29C376E0828DB7C0F43044269690387F08D83FE = KILL_BILL_V1 | V | 0x09EE2C5D6A748524B0267BF420D8FD91 -0xCB305BB65E01774D4B3A7EEA1C5074D217DC19FB = KILL_BILL_VOL1 (Kill Bill Vol.1) | V | 0x646E04960A572F9A74EC4214030EBA65 ; MKBv21/FindVUK 0.96 -0xE7A436E9A0A06356AFA44223B2BAA114AAC19646 = KILL_BILL_VOL2 (Kill Bill Vol.2) | V | 0x2D1E572BB2B78C241F714D061DE176E5 ; MKBv21/FindVUK 0.96 -0x7E3851414C4DF1489E2FBE6CE104EDB02916E156 = KILL_BILL_VOL_II | V | 0xC4923152F990FD3669DEA2D2EBCD61B6 ; mkbv9 -0xB5D77555634C4257A7AFB8303E6A7C7632A259AE = KILL_LA_KILL_EP01_04 (KILL LA KILL PART1 | V | 0x61627D2DF457990BC8F24FFDF5F98B2D ; MKBv49/FindVUK 0.90 -0x98DFC9732B952D1231B6BDF135EF9C2BFFF0652D = KILL_LA_KILL_EP01_04 (KILL LA KILL PART1 | V | 0x0175179644219CFC5DB06AE54F396B89 ; MKBv47/FindVUK 0.86.3 -0xF4C0B00FD91774367A6BA9392227AF698FD07056 = KILL_LA_KILL_EP05_09 (KILL LA KILL PART2 | V | 0x636BB9A1D9F8EB8DB404277B0DCDA989 ; MKBv47/FindVUK 0.86.3 -0x3315CB5679BCE325BF454E3DB28B2FD2333B3F6C = KILL_LA_KILL_EP05_09 (KILL LA KILL PART2 | V | 0xD7B061C65D87DD4CDD204351C0A3B165 ; MKBv49/FindVUK 0.90 -0x7BB58630C8B0E3E51C1E444A7DAA3B3827171E6E = KILL_LA_KILL_EP10_14 (KILL LA KILL PART3 | V | 0x6055230722900A60EE593E5C2E7B66F7 ; MKBv50/FindVUK 0.90 -0x3F6C85D7B482A1F8758409FCD9481D14C373861C = KILL_LA_KILL_EP10_14 (KILL LA KILL PART3 | V | 0xB12AD57D10481D78F7763DC19B4B4190 ; MKBv52/FindVUK 0.86.3 -0x5B64A0CE59EFBBEA652E8B341A64C50C8D50927A = KILL_LA_KILL_EP15_19 (KILL LA KILL PART4 | V | 0x870B0F4A5DEA1F88523D92EAB2245F59 ; MKBv52/FindVUK 0.86.3 -0xD4806768A30BCD6B5C0D97B07F6C9DA9B916796E = KILL_LA_KILL_EP15_19 (KILL LA KILL PART4 | V | 0x0F7FBC4D326A2B7F48FA3CE5EC5AE5B5 ; MKBv51/FindVUK 0.90 -0x9E81ED343FC6E9F9F1B4B4F74BF1790DC66B926F = KILL_LA_KILL_PART3 (KILL LA KILL PART5) | V | 0x304733710857B4D67CCE2B76417285C0 ; MKBv53/FindVUK 0.90 -0xF15F1EF563BE14C7EF8157D7A117E6D63DC85B5E = KILL_LA_KILL_PART3 (KILL LA KILL PART5) | V | 0xA5784F12FA7BC60A51AB89E44FAB7867 ; MKBv52/FindVUK 0.86.3 -0x2623A23DFB93F8E52C6255A184D49B3609815D8A = KILL_MOCKINGBIRD_G51 (To Kill a Mockingb | V | 0xBA00958355C9418E417079297AB3FF8A ; MKBv27/FindVUK 1.00 -0xBFC9AE8C6063B4E1E787483C1A116FB96DB77053 = KILL_THE_MESSENGER_UPB1 (Kill the Messen | V | 0x7FBC87DF7D71701525BD651444692E9C ; MKBv49/FindVUK 1.00 -0x2D4A37782B4AF345547E622A851B9F9B471037C4 = KINDER_VOM_BAHNHOF (Wir Kinder vom Bahnh | V | 0x50939C86A7A43FE13B23349E4CBEB98D ; MKBv30/FindVUK 1.00 -0xD9A2D5688D9A2E11088E25831AED72C89D57736B = KINDER_VOM_BAHNHOF (Wir Kinder vom Bahnh | V | 0x156B2A74F3BC67C12352E4FB7C99E2B2 ; MKBv30/FindVUK 0.96 -0x45AFE9F9A392BE7731A02B3D14D8FA9F624E55F3 = King Arthur | V | 0xD80A67E2CE6784377FCFB0B6D6984FEF -0xBA5122C39E62BB185B624273324E2C05AB4B1826 = KING KONG | V | 0x978E17B79E42DE0159C5D45EE1230851 -0x32D5FA1862AFC75C883A61D8AF7F7BBEE39C9E06 = KING KONG | V | 0x7834E7996E74994A4F312EDD826D03B4 -0x358AAAAF0D3B2F4D1F3414643CADCE5A77B7DBCF = KING KONG (KING KONG) | V | 0x2A4A0A3B504C6B81A930E5D9F3035703 ; MKBv50/FindVUK 1.00 -0x27D8951009706E0BD42D2BC6BB3AFF7F3E454B41 = KINGDOM | V | 0x0698B9A78C7584176E1F237AB1BD92CA -0xC9A922821B4DDFFA868FD2C57B5ED9C2AE111646 = KINGDOM | V | 0xF3A1DCCE45C3E2D7572920F86454A47E -0xE073157ED0F7DE90120AC6139830BFCC8D2A4716 = KINGDOM | V | 0x69815CD1989D875AE454218671215DF1 -0xE8F8DF8187968194BC77209371F95200FF979297 = Kingdom Of Heaven DireCut | V | 0xFD125B02E0A36D9C72F82093BF8C1CD2 -0x1F3308570148831674C4B97CA68AAEB7E9F2086F = KINGDOM_G51 | V | 0x66BB715D10768DD207C2E013FB22F93E -0x4DDCF6B3C1983C004148E18BF5E8E41215EAD0D5 = KINGDOM_OF_HEAVEN_DC_(FR) | V | 0x87B43BA2BDA87CA95445C4DC791BA473 ; MKBv9 -0xB5D6237370ABA08398CA48E0E8F72A28EF20E4C0 = KINGDOM_OF_WAR | V | 0x124747C5393F0C402186D7B85353AD4E -0x55602734AA27FE68859CAF4A19FB47C0C9C556A8 = KINGKONG_VS_GODZILLA_NA (King Kong vs. G | V | 0x1DC56E0866A724B038AD55AFE4CC78AC ; MKBv42/FindVUK 1.00 -0xA74CD2CF83919BA71844CE10E1AD2284D0A5E810 = Kingsglaive Final Fantasy XV | V | 0x4F41F2A729C3C284E3F0B10E9483181A ; Kingsglaive: Final Fantasy XV – Blu-ray™ -0x11D09CE8EF80A4CE7F6CDAA9387A5255B4DDEA08 = Kingsglaive Final Fantasy XV (Kingsglaiv | V | 0xF7775952CBEC7BFF2AC2CFDD2CCF95AB ; MKBv61/FindVUK 1.00 -0xC14177DDA13690A73FEC1710A8BA0D8690EFAE20 = Kingsman - The Secret Service | V | 0x963E3C4076379109CDDEDEA6384EF70D ; MKBv47/BD+/BEE/FindVUK 0.80 -0xCB4DD39D2BCD2A3F59AB9BA6E0850B55DF50D1DD = Kingsman - The Secret Service (Kingsman: | V | 0x0F2E7C47EF7888A4AEFC87B751127BC5 ; MKBv39/BD+/BEE/VUKNOTVAL!/FindVUK 0.84 -0x50613E4317CFFBE8E0205EF5461CC13B70AF6BF7 = Kingsman - The Secret Service (Kingsman: | V | 0xC5539FDA8074C4D5E2D7F14B70F6F37B ; MKBv47/BD+/BEE/FindVUK 1.00 -0x11EDB223EEA1DED66871867DA65F6412447BDB2D = Kingsman - The Secret Service (Kingsman: | V | 0xD0F7DC14C662B7DAABF92FB652126FDD ; MKBv39/BD+/BEE/FindVUK 0.98 -0x34BE6928257AD91A04EB4E046163525B3FCF98DA = Kingsman - The Secret Service (Kingsman: | V | 0xA89E41D7DC35AA72FBDFC997B23AA6CA ; MKBv39/BD+/BEE/VUKNOTVAL!/FindVUK 0.99 -0xB9ED5BC7FC87E16DA17EE775F72065936447B3F6 = Kingsman - The Secret Service (Kingsman: The Secret Service) | V | 0x8E78D20F7FE5A7E6D4FB2A98CD74C8BE ; MKBv39/BD+/BEE/VUKNOTVAL!/FindVUK 1.00 -0x09F76C692CD1313C7FE42CEB0F3F71BB1DC368D9 = KINGS_SPEECH | V | 0x24C09CD2AD4F4AD29DC66162012EDF24 ; MKBv20/FindVUK 0.94 -0x42AA0C76A9F374BF74BDFF1DBABFE6D95B3C1B73 = KING_KONG | V | 0xC2037B371F581658E74911FA9FFAA040 -0x75CE16DBB6D7F63F1671CD10A8C8521C955CB673 = KING_KONG | V | 0x3673EF103BA477BF853257BC4BA5489E -0xAE41D33631CEB81BBA5E7D16A236C2B8097E02D5 = KING_KONG | V | 0x8837E47490FF6AE56856D6515384BF46 -0x19A4D498D93C7B5E631BC72222AB2E9B1072D5D6 = KING_KONG (King Kong) | V | 0x9E1CB29636CEE9FD9BAA1C17AA2FA0B8 ; MKBv47/FindVUK 1.00 -0x6CA5A59DAFE5A752EE8FC9FF196E7F1F5CE5F810 = KING_KONG_ESCAPES_NA (King Kong Escapes) | V | 0x756C884A81E30D00AE1BDB18C0976577 ; MKBv42/FindVUK 1.00 -0x30342A9C0D07C498B8D9BA059F90492B4483AC4E = KING_KONG_G51 | V | 0xF5B15566C276768AACB06C37E62C8A42 -0x1E9308FCAA4C18A9527599A8E5902D3D0F141135 = KING_KONG_G51 | V | 0xE635F51927CCD80C3737D73B18211DCA -0xD4661535B59C25FF6FED79432C6592F01FA4F431 = KING_KONG_G51 (King Kong) | V | 0xBD91147F867021EA1D409EF3DCDD9680 ; MKBv10/FindVUK 0.84 -0x470048A497E305C9B18B1F6CD0C2EAC924377E03 = KING_LEAR | V | 0xBE5B3DD389975011EF554ABD3E453187 ; MKBv9/FindVUK 1.00 -0x58E786E19A35A9DD3A54E62CEB811397DFE4D800 = KING_OF_COMEDY (The King of Comedy) | V | 0xBD505E11C6DA53E3E49D8E0F4AFDA5BC ; MKBv39/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0x0C7C6C18005D69F38D2489BFC0B21A8420663A66 = KING_OF_NEW_YORK_BD | V | 0xB0FE9808C1492526DC76F284919D9CBC -0x40F8CACC395484D73FF426B88713046AC744639D = KING_OF_THORN (King_of_Thorn) | V | 0xF6CCB0702DF8B8403EF3A9A7518BBA6B ; MKBv31/FindVUK 0.83 -0x3E8AC369EC96E67187105839D666E464C2788C5B = KIRIKOU | V | 0x95384B215555D2C641F54EA9B2D6C912 -0x631E577A78C4D5124A9F6565DABE1C72D85745A1 = KIRIKOU_LES_HOMMES_LES_FEMMES | V | 0x9691D0BFB8C9D52CF8D8998C00C35610 ; MKBrev 36 - FindVUK 0.57 -0x8823FCFDE57FFFC741898862BCB7411824B49833 = KIRIKOU_SORCIERE | V | 0xAD4B5CFDD9471B3D1FE5D97764CFEC52 -0xDE09FA1583288AFA75ED3CB4A3BDBEA8D399D736 = KIRSCHBLUETEN_BD | V | 0x4DA5AB2C6298DD00B63C4365877DBDC0 ; MKBv16/FindVUK 0.80 -0xB28F9A7F20856E4AB0931A3AB496F91E1C76DA96 = Kiss Kiss Bang Bang | V | 0x7161CF41220789B42A21BC477674C889 -0x2492B5A59ED0E4CC8E4DDE985C7C2F60E599BC83 = kiss kiss, bang bang | V | 0xC4CF4A339A9087CE67B18BEAB421151A -0x05C558E1266F8DB7739A2700D14153393085E8EA = KISSKISSBANGBANG_VOLUME_ID | V | 0xF630B16EA293BA605F3E9A82C9EC110C -0xF9570DA27620CEF4A8B5031B20F53BCCC0D21F3C = Kiss_The_Girls (Kiss the Girls) | V | 0x90D3AFD81E54C5E6BB775F2349F4E5E5 ; MKBv36/FindVUK 1.00 -0x1DB893FE6EDDCB486C3D684D2972FCDF9FF9010C = KITE - Engel der Rache (KITE - Engel der | V | 0x54EDADEE34A8069B4C5C1048A1636399 ; MKBv48/FindVUK 1.02 -0xEAE69625BB4309FFCC71D2BDA4FF70186A930CCF = KITERUNNER | V | 0xECA85E8A450D9E09045E10F0129986A4 -0x8E0476DDCED59346781489C3A691E7C19594CD5C = KIT_KITTREDGE_BD01 | V | 0x6D826A9D5F70E0A152FDAF200B75A8D7 -0xA1B0D693361DCDACB463732DD616EDABB8B99D66 = KIZUDARAKE_NO_TENSHI_1 | V | 0xDF0BD1C16D6D9B0C48C0511F8451E7F0 ; MKBv16/FindVUK 1.02 -0x64FEC33296C5C6BA8516CD6AE7E826AAC3D25816 = KIZUDARAKE_NO_TENSHI_2 | V | 0xAAE83D2E624D1EF6224C991ED86A721B ; MKBv16/FindVUK 1.02 -0xBAEB5594002B3BC02E56393BA60C4B2A9FAD04BD = KIZUDARAKE_NO_TENSHI_3 | V | 0xB59C39568013CE485035278E10DB6842 ; MKBv16/FindVUK 1.02 -0x7F7759EC96D13DC271322B8BB54C1840821250C8 = KLAPPERSCHLANGE_BD | V | 0xCE6BFF4F3E92CA856D249C8DB0F1FDD3 -0x3A5FF9E07779579B3A714A8D4D5ABFC92074ED92 = Klassefesten | V | 0x8C4A2B17A16FD0BCE806753A2F2F34CE ; mkbv25 -0x6C1DDE70E08DCD724B9A7E8170B2A9C744205959 = KLEINE_GESPENST (Das kleine Gespenst) | V | 0xBE0C7FEC1ADB0BE0397BB106E2FCCC36 ; MKBv46/FindVUK 0.99 -0x655E79E1AB50E1AF02B9A65E026D14FEC2173B7D = KLEINE_WAHRE_LUEGEN (KLEINE WAHRE LÃœGEN | V | 0x0E5BFE33E00A062C0FF2AE5851385675 ; MKBv19/FindVUK 1.00 -0x93601A9462DF6282184751EFD430CD40CBD2D295 = KMBD_0x28005 | V | 0x634F3AE276CA42F5E1121B8E70848933 -0x1AD27291D6DD9544F8DC3A17D7732C188F4BBC95 = KMC1_D1_HALBBLUT_BD (Winnetou und das Ha | V | 0xF548BC2F511EB052ECDAABE384534738 ; MKBv35/FindVUK 0.96 -0x7C78D07A41B2C51C668A1A746748C72BD6718D73 = KMC1_D2_FIREHAND_BD (Winnetou und sein F | V | 0x61A5EB9DB720B14C95727F25D80FA69D ; MKBv35/FindVUK 0.96 -0xFEB9E4E8AE2D75F5CF0081DED31FEF0D6E968427 = KMC2_D1_GEIER_BD (Unter Geiern) | V | 0x9A4E83D057B53CCB8E72982FF33A0717 ; MKBv35/FindVUK 0.96 -0x5F7F154AFA5CC069A29FBDB514D1FC633F1DF1D0 = KMC2_D2_OELPRINZ_BD (Der ??lprinz) | V | 0xAC42D9DEEF26F2D89E0DB9678CB49484 ; MKBv35/FindVUK 0.96 -0x8B45593B3DDD835629B809AA754FA51046C0FFF8 = KMC2_D3_SUREHAND_BD (Old Surehand) | V | 0xC6C40E08B4A8530F9A8C0B115F785A7C ; MKBv35/FindVUK 0.96 -0xF5AA25C487A43E6AAD55A000CCF40A05B45442A2 = KM_SILBERSEE_BD (Der Schatz im Silbersee | V | 0xB34400DC742FA57958741ADFDE0B5ACD ; MKBv19/FindVUK 0.96 -0xEAC2F76DF339403ADAA6710088BC3D04E3AAAC89 = Knight and Day | V | 0x3E866D9020DAD458C1A9C577E3FB7D78 -0xD4341FEA5A7BBD8719FFF0F533F72E0D0CA68EDA = Knight and Day | V | 0x79E3489FA872E58FEC59F6B3864B9D6C -0x336E5061E39CD510374359BB5AE6283687464C0E = Knights of Sidonia BD1 | V | 0xEFE9371F41D543B406FF0BDB42E45787 ; MKBv53/FindVUK 0.96 -0x60AE2CFACEA6E0FAE98AF357B521578964A55723 = Knights of Sidonia BD2 | V | 0x2B2E47ECDD909C09DE6F6CC7E704CD31 ; MKBv53/FindVUK 0.96 -0xC50AF3C1AF4679C36DD7D0748EFE5AD10F773734 = KNIGHTS_OF_BADASSDOM | V | 0xC91BD287E90841D52B7F449B5C0FE641 ; MKBv32/BEE/VUKNOTVAL!/FindVUK 0.96 -0x94B89334FECC39FAB12008E88861A767351D3755 = KNIGHT_AND_DAY (Knight and Day) | V | 0x2BA695F4CC963ADFD482CFA4E4A6851B ; MKBv19/BD+/FindVUK 0.96 -0xA300ACA6808EE3615316E97C7E5B8A7F07D559F5 = KNIGHT_OF_CUPS (Knight Of Cups) | V | 0xBBFE9BEAC5DE2315395C098480283F10 ; MKBv55/FindVUK 0.96 -0xDC94B2AD0D0D09824FB37C0C81A358612FE95E32 = KNOCKED_UP | V | 0xF6C018290434F675FFABBAFEE953C7F7 -0xDD24D82489C823A595D81E05545032E2AF9E1C06 = KNOCKOUT (Knockout!) | V | 0x3FE9ACFF90636C71C3B92350CB6A5846 ; MKBv21/FindVUK 0.84 -0x81A623503CD508E427AE542C6020C6042091AD4D = KNOCK_KNOCK (Knock Knock) | V | 0x39C22F9B0530A8ECB40542D86721DCD1 ; MKBv60/FindVUK 1.00 -0x4D61DA68916C1E7D9C7CE64CCC76A0E0CE0646D7 = KNOWING | V | 0x0096E491FACBB9A3FD449A7476A39711 ; MKBv14/FindVUK 0.98 -0x4EF8B102515136573802ABEA56C32016F9CC85CC = KNOWING | V | 0x2D1192EE908C52906E6DE97DFA7477E8 ; MKBv14/FindVUK 1.00 -0x725B42005B3B6978C34A9E9DD282641E5C0CD1BF = KNOWING | V | 0x6CC6FE4AD52EDC2E9AEAB8728FA0977B -0x24772F3C2E0CDD85145EEA891336F5962C518D90 = KNOWING | V | 0x0A361CBF6E8C53D41E9454321EFD4731 -0x6B7941122E3528B2FEA754A613ABF635811E38E1 = KNOWING | V | 0xB11F58AC1323A0AA29F52AE9353C7941 -0x992853AB8B218D2A65155D7F2BD1E81334B11408 = KNOWING | V | 0x143D3E82AD75A62E3343E3570D5D5C55 -0xA1BC1421AD88194125669B67613FD42E88DA589B = KOBIETY | V | 0x77F45E825B80DBB75D8BE6D4CAEB5462 -0xBB90319A681D45CB2A25D8398A11074757559E49 = KOCHEN_IST_CHEFSACHE (Kochen ist Chefsac | V | 0xB600A93D32E28F47BD42FFD9BB54D469 ; MKBv35/FindVUK 0.92 -0x85AA41D1C6825857CF00BF78AEDCE7A7473BC107 = KOENIGIN_DER_WUESTE (Königin der Wüste) | V | 0xD282D6A6271652515414AFC959EEEE4C ; MKBv57/FindVUK 1.02 -0x32499C121DBF6F03A0F1F9346AC545A468D5A0E7 = KOENOKATACHI_R (映画「聲の形」) | V | 0x5F7ED1D614DBF75FF0A7C86088D9A672 ; MKBv62/FindVUK 1.02 -0xF1AFA0DAE756FC0DE6A3B7AC7A46C16E7F107B20 = KOIMONOGATARI (Koimonogatari - Blu-ray?? | V | 0x0D1E3E60E451B05416ADF4D944A1C294 ; MKBv51/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0xC96A885AFBD212AE63F79AE31347383F9F6D5978 = KOKODA | V | 0x0E07E5051AC7EB3BF71C3CBCEF87C6F3 -0x87DC236910FD8F9E5CA920B48179439E4C6EA0DF = KOKORO CONNECT DISC 1 | V | 0x95B67D1B05135F4A76F6D95B3B9DA534 ; MKBv40/FindVUK 0.98 -0x77F6755961083A65377DBF81CBFBB8E05A0EE3E0 = Kokoro Connect BD-1 | V | 0x1E7DD2F5FE45E4C106B721BA2C1A6657 ; MKBv61/FindVUK 1.00 -0xBFE12C32DD4060A12C21E3FB5105BB71E934221E = Kokoro Connect BD-2 | V | 0x2486BF837A5E9FFE52D0467F8548DB41 ; MKBv61/FindVUK 1.00 -0xAFA6908E16B9C4F8B8DA6EFCB43597CB3456043F = KOKORO CONNECT DISC 2 | V | 0x7B42E5736309D76E259D203E11881F88 ; MKBv40/FindVUK 0.98 -0xE2928FF59F66B45CBF77562AAA05455C57706352 = KOKORO CONNECT OVA | V | 0x4EF43E9CD9D2EC97394D63C0962309F2 ; MKBv44/FindVUK 0.98 -0xC0AFF00A39F78C80E3F18E69F24AC7874FE71BA5 = Kokovartalomies3 | V | 0x37DE0D23778E6E8489542910DFBEB791 ; MKBrev 32 - FindVUK 0.53 -0x6F9882B2CF81385BE5CCCDC9AC5032E5494BA02F = KOKOWAEAEH 2 (Kokow????h 2 - Blu-ray???) | V | 0x8A3CC1468689BB83F14E3747B6D05111 ; MKBv40/FindVUK 0.92 -0x4E964186729F40AAA49A240BA4D00FC2107CD03C = KOMMISSAR MAIGRET (KOMMISSAR MAIGRET) | V | 0xBADDBEB07862B5B70CFB95901773985F ; MKBv62/FindVUK 1.02 -0x1706CFC4D7364CB8486E0991FD531D0E3A4FF6A7 = KOMPANIE DES TODES [Kompanie des Todes - | V | 0x20737584432F60628EA893CA8D550A01 ; MKBv19/BEE/FindVUK 0.99 -0x627D8EE1D9ACC365CA12A74D6E88EF94653158A7 = KON TIKI (KON TIKI) | V | 0x66C092734C9DBB0C5378E64134E15628 ; MKBv38/FindVUK 0.96 -0x29276FB41950965D5EFBA149D42CCE2E8972EDED = KONGENS NEI | V | 0x4C679920C09EC0AC4EC0A536595D550C ; MKBv62/FindVUK 0.98 -0x62D4D192C037E9E22C1BB853D9017B6850F1723C = KOTIRAUHA | V | 0xE36EB239902A25735375210B8126D416 ; MKBv28/BEE/FindVUK 0.98 -0x6455E6FC29C35E71C992CF0D3B70542D87F6B940 = KOYAANISQATSI (KOYAANISQATSI) | V | 0x1FC5998E5A0078D8A57B37522D4433AF ; MKBv35/FindVUK 0.96 -0x3C2CE29C4ACED1883ED124BD9369914B02D8FE6E = KPPMV01 | V | 0xC4D08C27DDFA330DF6A78DB8664EAA13 ; MKBv52/FindVUK 1.02 -0x5F930C68538706C77FE7F5898E183675D754548C = KRABAT | V | 0x040BE2B11A84730CE3001BD681EB2C42 -0x03F0E6E51950071FB1A09F37F35A50B380D575DC = KRAFTWERK_KATALOG_FILM_D1 (KRAFTWERK 3 D / DER KATALOG 12345678 / FILM / DI | V | 0x1587F9010E224FC87675410F2FD0A560 ; MKBv62/FindVUK 0.93 -0x9F76997D6F8367F5E264E00BC705D1F5CC8DFD35 = KRAFTWERK_KATALOG_FILM_D2 (KRAFTWERK 3 D / DER KATALOG 12345678 / FILM / DI | V | 0xB71180F8DD48D3208FC2442B2F672141 ; MKBv62/FindVUK 0.93 -0xCD51F153EB41903EFE7D15A885094FE5CB8F51F1 = KRAFTWERK_KATALOG_KONZERT_D1 (KRAFTWERK | V | 0x944F1DA932F1D3AF45EF8532762523CF ; MKBv62/FindVUK 1.02 -0xFF4F8EEB5360C05E9670AA9A780D0AAB24009518 = KRAFTWERK_KATALOG_KONZERT_D2 (KRAFTWERK 3 D / DER KATALOG 12345678 / KONZERT | V | 0x47254094E59732D244F437A98100AAC3 ; MKBv62/FindVUK 0.93 -0xE6F6F5A73697FF2CB6A4958F2791D884F5A0FBF8 = Krampus (Krampus) | V | 0x4CAE3DAB4988AF61BA2A55E1DBC70D23 ; MKBv53/FindVUK 0.96 -0x69BA0F3177994315ED41845CA9A67507FEE7F587 = KRISTINA_ROSE_IS_SLUTWOMAN | V | 0xE41191D8E7735B7B2169D016D3E1B81E -0x54F84DA5D781F0BB044112ECEEE218906AA8D97F = KROB_10101A | V | 0x74E4ED9FA1BCB96AAE1C385BAEF9AFCE ; MKBv62/FindVUK 1.02 -0x96641CD501A8070BA34F3CE656ACD75E747E4E2F = KROB_10201 | V | 0x50B078A86F454DD6DE1ABFBD2A8EFDD0 ; MKBv62/FindVUK 1.02 -0x2D4813878E309C95B76364757D58B3B6FD932A77 = Krokodil und sein Nilpferd (Krokodil und | V | 0xD0A2D850F8AC698ED86EC5E4C87D0B44 ; MKBv44/FindVUK 0.84 -0x3CC19E21695E298DC0D2FEFCF5BAEB0DED808519 = KSM RITTER VON MIRABILIS | V | 0x25C06E8BB4C015058EF72A89574A2A73 ; MKBv19/FindVUK 1.02 -0x117837E1BB92FEA86587226CE0846FE3150AABEF = KUBO_TWO_STRINGS (Kubo and the Two Strings) | V | 0x1D3580E68648C3F1962FC119340E5DA8 ; MKBv57/BEE/VUKNOTVAL!/FindVUK 1.00 -0xEFBFFEFC0DF2E1F76B3A9C2D53D43C7C8C74673F = KUBO_TWO_STRINGS (Kubo and the Two Strings) | V | 0xF945A7B78205D5EAECF194299D202FC4 ; MKBv61/BEE/VUKNOTVAL!/FindVUK 1.00 -0x4A9F4173F95A9783F4B52F4B5AF623D497B3101A = KUKAHI | V | 0x76EC4F1634FB0F6DA515F6A0351113F6 -0x176ADC69114C540F151BB3BD01DD9CF88DBBCCE1 = KUMO NO MUKO,YAKUSOKU NO BASHO (JAP) | V | 0xD5A8619B6C1DCFB214700414AB45768E ; mkbv4 -0xBD4CDA6FC1709993C06EA84AC11D71EDB6F32945 = KUNDO (BLU-RAY) | V | 0xFA6A2B03F739FC771CAFABBAD21A2C1C ; MKBv53/FindVUK 0.92 -0x88C93D7D1D82EAB51AB679B8B2CF0E1EBCF39101 = Kung Fu Panda | V | 0xDC828DF1F8081CC1B46C0D9E10557C38 -0xC3F190C9C42620153BEC422F3596699075E1E146 = Kung Fu Panda | V | 0x672C98BF56F717084A25113A39BF12BE -0x379472F2BE3D8E23D4656AB1F91375AA0C1F165B = KUNG FU PANDA | V | 0x1EA78423EE417B65614218D352291DFE ; mkbv9 -0xEAB28379130C28D09785585A836982A7453EF879 = Kung-fu Panda (FR) | V | 0xE1659B25EC04F94BE552DB4FC8B49C70 -0x433ED2F3AAC9303F5BD1449B060D6EEFE0232566 = KUNGFUDUNK | V | 0x71FD2301B1800DAEB88DC09FD91C7108 ; MKBv12/FindVUK 0.84 -0xC8C2843FDC494A295B6465B98A8373EFEEA48B26 = KUNGFUDUNK (Raging Phoenix) | V | 0xCFD661C550188F86F80A6F026C1C0D93 ; MKBv16/FindVUK 0.84 -0xF5CA7C94CB9845B92C3C0D9A06331DD08AAD9073 = KUNG_FU_HUSTLE (Kung Fu Hustle - Blu-ray | V | 0x2D1185A21B63A0C210E5A31A63B3DCFC ; MKBv4/FindVUK 1.02 -0xB9BD3C262042E4080CE26B8818786BED28A210C4 = KUNG_FU_PANDA_2 | V | 0x495E7CDB3E1F5CE86911E259EC572FA7 ; MKBv23/FindVUK 0.65 -0xF782A3EBD32329677157BF34F403F707CB6C21D1 = KUNG_FU_PANDA_2 (Kung Fu Panda 2) | V | 0x1E58D766E19D4896728CC970F2C4F2D3 ; MKBv26/FindVUK 0.96 -0x6CC43A8D50967020E90379B6A5F9BF2A5686D5C9 = KUNG_FU_PANDA_2_3D (Kung Fu Panda 2 3D) | V | 0x3AFD0D8DA0CA78441246CC4674130852 ; MKBv26/FindVUK 0.89 -0x691E3541C1997A10EBD3364C401C55596A86D624 = KUNG_FU_PANDA_2_3D (Kung Fu Panda 2 3D) | V | 0x8A266D5705AE9284B418F7F52D9FC738 ; MKBv26/FindVUK 0.96 -0x2A72DC3ABC3250B00C0DF493DAB2EC52F20B9DA3 = KUNG_FU_PANDA_3 (Kung Fu Panda 3) | V | 0xC890E77151CC827C0CAE38F1504CEDC4 ; MKBv57/BEE/FindVUK 0.99 -0xA346B02E344935869D237A853A56E2B2EB86384A = KUNG_FU_PANDA_3 (Kung Fu Panda 3) | V | 0x93B9A0E745C7DB271A3B3DA2FDC92C09 ; MKBv56/BEE/FindVUK 0.96 -0x2A55EE2F3360075D618FD2A4A61547DE803BF1BD = KUNG_FU_PANDA_3 (Kung Fu Panda 3) | V | 0x4E5E1DFA7C777AEF727454828F323C1F ; MKBv57/BEE/VUKNOTVAL!/FindVUK 0.92 -0x72D6B9B8AA92B851D4624F47B058EBE0B783219A = KUNG_FU_PANDA_3 (Kung Fu Panda 3) | V | 0x891EE78D53E15B20119CFE2C732A0FAF ; MKBv57/BEE/FindVUK 1.01 -0x44C3AE31700FA64399AB70A84B1498941C1AB5FB = KUNG_FU_PANDA_3 (Kung Fu Panda 3) | V | 0x58974F3B269E791BF8A4B59365541629 ; MKBv57/BEE/VUKNOTVAL!/FindVUK 0.96 -0xA1C049C836CD0BD37261A14F4104A783062918AF = KUNG_FU_PANDA_3D (Kung Fu Panda 3D) | V | 0xE268302C85CF80B59229C2E6B3179816 ; MKBv26/FindVUK 0.96 -0x947086471D19817DCFD2C020FF4393268B590292 = KUNG_FU_PANDA_AC | V | 0xEA299A2EA6ED73C1DF31EA7CBAED1731 -0x4A2B8C547F25CF0B6B0A5445843136DA2CD937A9 = KUNG_FU_PANDA_AC | V | 0x59FB94E872DA0EEF4DE9EA60CD9BE4C1 -0x977CAE9200ADA81176449DB88748D9F69E65F7E9 = KUNG_FU_PANDA_EN (Kung Fu Panda) | V | 0x540F72FD286D4BCAF9C302D44A6DFCC2 ; MKBv9/FindVUK 0.96 -0x63A2DDB72F0CF94F8DCC4A7543783CA6162375A9 = KURDISTAN (Durchs wilde Kurdistan) | V | 0x08636E21969C87194E2124A7C7A14A98 ; MKBv35/FindVUK 0.96 -0x242FD085CEE9E58274CF7999059C0388F21C7307 = KURONEKO (KURONEKO) | V | 0xB900C1C8A39017859F8C56EAD2ECC14F ; MKBv25/FindVUK 0.96 -0xFA03C77A843B815208CCFE4DBCC43BB859237F4A = K_ON SEASON 2 DISC 4 (K-On!! Season 2 Di | V | 0xC34571E1119BAF867F4B42927C9BF062 ; MKBv33/FindVUK 0.89 -0x6E396D4915D35EE87CD1D1F298C6990FD708F714 = K_ON SERIES 2 DISC 3 | V | 0x85369D408BE2D4EC6F2BC7700D4DC7E0 ; MKBv33/FindVUK 0.93 -0x93D719E876F1CEFC9E582DD9E16F8D61B895B384 = K_ON_1 | V | 0x3D2015BD1E46A1D7FE2F0121660E0F23 -0xE80C6FD3DD8EE4EAC4454174E2CE9FC76DA8E09C = K_ON_2 | V | 0x6EE7A1A644B56C4A91F9EECE5788F10C -0x73F4DED866402F3D9077FC75B917AC0021808EE2 = K_ON_3 | V | 0xA65F3B95B93B83CCCA4CC49ADE8CE42C -0x120C1A7A0C68D3A25044FEE860316AA146CD6E12 = K_ON_4 | V | 0x3F3ABE8158B61EC5568DF6F89F5EF35E -0xF1529B6E80F684850807165B65B8CF2EFACA83E8 = K_ON_4 | V | 0x14B72FD185DA26F848EEF0D2B9F15033 -0xCF97A99C87C917E2949B724293A4FEAC9F672790 = K_ON_5 | V | 0xC20ADFE318823CA3DB7164EC011FAD5D -0x5527867308688E9961152C1D84B60DE2042879B9 = K_ON_6 | V | 0x97A47263866688F608FE2F8A0DBDD0FA -0x47C19E92048A9C0ABA8FC03E0DFE8F3DDD1AFABC = K_ON_7 | V | 0x8B3C03F659042A9D26C4A75EA0A9B7C7 -0x0C1D4AAF71F32406D0163F098D396D57B19633EE = K_ON_7 | V | 0xE8697BF5A7049EC1DB5E2D4632616738 -0x054EA8B6AD39DF8263146629112DE3170042EFB6 = K_ON_THE_MOVIE | V | 0x43797653202EA56CD9DF79E49BBBBCE8 ; MKBv40/FindVUK 0.81 -0xD3860286529123D587031401EA2D1F4238F92A05 = K_ON_THE_MOVIE | V | 0xFD95DCDD53A20DA18D1720BD4EA2CFF5 ; MKBv37/FindVUK 0.93 -0x37286271562C26BD391E1050850C83A4341ACBF0 = L CARLTON R FORD A DU BLUES | V | 0x52BF919AB3D1F86A60C4506AF971D926 -0xCFF74FCDFC8CC84680D4DB7D580A26EFA6DF0CD5 = L Change The World | V | 0x2E9E6F83C9AF46860DFE6C96FEAC9B5F -0x3BBB1ACB9719711DA3CD77D254505C677FB42324 = L'era Glaciale 2 | V | 0xD113C7A14CCBBB55C520311B33D44B54 -0x46E97913BBFEFCC7B370CFC82BF98BBDD756177B = La 14?me lame | V | 0xC1EA2D77F4A6D3AF03A2FE8E74411015 -0xEB165272131186F93CED19A0462F17CF1BAF1BD8 = La Boh????me | V | 0x27BE3099A7891F169DB5C3F1A480EBBF -0xE00E203F643ECAC114026902EE7B1A79C4F6A8A5 = La Casa de los Cuchillos | V | 0x7E7D447794276062C772E48C71E9AF68 -0x92C43D38E67F9EDF549C6667EC1C5FB77D6679CC = La Cenerentola - Rossini | V | 0xB487EBF6836BD36ED38B62A28E8FAEA4 -0x6E72922F5E3BDAF727F95273EABD14E2FC1F1AB8 = La Chaqueta Metalica (ESP) | V | 0x0386A7FCD72EF885837B17985C70B49B ; mkbv1 -0x49C592D48AE91166E40F1F2EC5EC8A9FA410CC75 = LA CONFIDENTIAL | V | 0x7AFF105D636275B35763DD1623CF062D -0x1A0C81D5D50FB12396C5C8B48090B559956327B6 = LA Confidential | V | 0xDA041556F60C310F4BC1C1CDAC40D3D0 -0x65982FF4C1F7F8A64A6D4F4E21FD6B8CF2951226 = LA DAME AUX CAMELIAS | V | 0x460E03E18D59188EE5696194FB001C3B -0x6A0AC4333699EB9A300D72674E0AA0F0AE8711D3 = LA DAME AUX CAMELIAS DISK2 | V | 0x6351F7BAD3218B9D4660FACD7280E501 -0x29A4B6CD527C1D95A6E4797F5133A92E85ACFFC3 = LA DONCELLA (La Doncella) | V | 0x4A5EAFF0102F19DF988779DDEC28EC1E ; MKBv62/BEE/FindVUK 1.00 -0x5DD36A0C016B6A00B6D5226A1285D6C07B3107F4 = La Femme Nikita | V | 0xA524D560684683F9BDB1A252F59C398F -0x325F3B2F39595637B6B7BF3428A886E7496C2140 = LA FILLE MAL GARDEE | V | 0xC7D91F619874F96892DECAA0B0ADEAB6 -0x5C2D9395C05DCD6D320108909B9D4319E2D23DA1 = LA FINTA | V | 0xF225BE09A4E95C38158B50C2C7F31FBF -0x0AD27D225CDE61AD79DBB9A37ABA82723B15E471 = LA FORZA | V | 0x298C46341DA6408FB886BDCC9779EECA -0x6A87BB35482281E18AF4D6EF8663D21F72BA8449 = LA GAZZETTA | V | 0xB53C05C4FB0C471EA97F674FB739FF6C -0x7F72296F25A354CBADFBD96A17C0746A50FE8B27 = La grande vadrouille | V | 0x81136889EA0832319F5C8EC8ECB3C0EC -0xCBAF662147E6001F5A3478462450AF8619E97FEE = La haine (FR) | V | 0x11772CFA47F154B97CC73F856738CCB3 -0xD2530B6600CDEF2FA68D5354FB70E038027E99E3 = LA LINEA | V | 0xFBE7B499F0CB1E27199465CC7DD20203 -0xD26BC0E51102E59A53F97BBFEAA5BC02B9753828 = La Linea (La Linea) | V | 0x8004CFAF51C935A71F9B3A234D8B6394 ; MKBv14/FindVUK 0.98 -0xA49AB74AD60613E3EB209C24864CC9477BA553BF = LA MUJER DE NEGRO | V | 0x9E7773CDDA61EE00068E8D827998BC90 ; MKBv31/FindVUK 0.98 -0x0E1142A37030AD92FAE26370A0B1450F1D5BF08E = La Naranja Mecanica (ESP) | V | 0x7996AAE6B69D5FA395B4D26F01E547C5 ; mkbv3 -0x229462AD2CA0F3AE2E4B6F65F3193D4F48F4DD3C = La Novia Cadaver (ESP) | V | 0x1780CF74429470C12C58D5EBE79CE4CF ; mkbv1 -0xDD500D867B06DCEB963C86604872B97646853D73 = LA PRINCESA PROMETIDA (ESP) | V | 0xDA6670B06DFBF8705D1C52E7ED058803 ; mkbv12 -0xB732E6930FB2AA7E40A65A7FDC968DB59C49E5EE = LA REGLE DU JEU (LA REGLE DU JEU) | V | 0x0B0B07913D3D6923B6DF95306C5271FE ; MKBv25/FindVUK 0.93 -0x3889469592AD8B36B4678E27E3C92EDA644C1AC5 = LA RONDINE | V | 0xA3E97A3FB84BE210A226687C8A5DB6A6 -0x5407C7CCEDCC24F8FF4A8D8A8AE3A1029D540A4F = La visite de la fanfare (FR) | V | 0xC7A6D300BFEAAC6E5BAEFE66BE6A230E -0xBCB6A123E932B960DC6044A72B359970EED00BA1 = Labor Pains | V | 0xCF4F2EE08F3B440659BAB67E0FF08F98 -0xE1100534F6ED46C11FA74A129533F7DFD8790587 = LABYRINTH | V | 0xADC64BE57239E73CAF29CCC06EE8B7B6 -0x71356213914CBF21537D2E7030BD64B01CD118C3 = LABYRINTH | V | 0x06111B7364994C3FAA7AA14AD00A9B1D -0x20E48F81718110C4B8234C6ACDC5942CBBD5EEF4 = LACIE_SEXUAL_FREAK_BDROM | V | 0x7A449C3F518110C460055F9E28F0B936 -0x526EB498ACCCCA72DC71E9DFDFF3AE263F14D0DE = LADY GAGA MONSTER BALL (Lady Gaga Presen | V | 0xF8A15A9725EB1AC3DCD781FF9EE7E96F ; MKBv28/FindVUK 0.96 -0x9F262053ED8ED9D4CB11A2BC1881F739AD2E227D = Lady in the Water | V | 0xE51635BD7A8DEF71AC1A6346133FFA0D -0x3DD192B24EE31AD59EACF11D1A58D0D253B9C0A6 = LADY MACBETH | V | 0x9DE79999880CC286414454A6CC483299 -0x25FC9538528466F08070E25C0B0752246AC69663 = LADY MACBETH D1 | V | 0xC94FDD9534BBDEDBC013EBB0F1C65547 -0x0412F24C41BF6A11E4FB9D4925EC77848832D7E7 = LADY MACBETH DISK2 | V | 0xCAB58EEBA67F409A76CB27DC87D0F365 -0xA83FB1EE063BC8A59DE583B8D5F83F6F8190C55B = LADY SNOWBLOOD | V | 0xEC75561CCD6C63766BBBD31F507E99A8 ; MKBv55/FindVUK 1.02 -0xD7AAC6AD7F1DE10AC42BC66AFEC0CBAE253AB590 = LADYHAWKE | V | 0x5CB6E19B02020D0BC888D3888702BC79 ; MKBv19/BD+/FindVUK 0.80 -0x296FDA10B5DC3AF6EB0121947EBFF9820A14B9F2 = LADY_SNOWBLOOD (BLU-RAY) | V | 0x218507E891961B295331D41CA2446204 ; MKBv56/FindVUK 0.99 -0xE927AD30A8FF4ED77F2879BDD7FA17E603343C3E = LAJETTESANSSOLEIL (LA JETÉE SANS SOLE | V | 0x8E67A65F66217334285662EBA6AA05C7 ; MKBv27/FindVUK 0.99 -0xEE64B751EC710A372FCFD9527125A7A7A21FD1E7 = LALALAND (LA LA LAND) | V | 0x4C5C99A3F9111B10548AD8AB3BE8B21F ; MKBv62/FindVUK 1.02 -0x4C1E3862A1EB94098A225CA7C80C101E398F8DB3 = LANCELOT_(FR) | V | 0x5CFD43136C262646DFC1938F6ABD44E6 ; MKBv4 -0xF0A1D078A11860B835C41253B587AF171B0E424A = Land of the Dead | V | 0xAB057BF8010F30BABD269A59953F5515 -0x79B75515BA40051DCF97C6622F3C7A4B7067A1C4 = Land of the Lost | V | 0x835B5E5C17BA43CD50C864A27E568E49 -0x0D5CB80898D5D90D710644EBE87DC24025029299 = LAND_OF_PARROTS | V | 0x2E7B9A579CABFEB9AA644DD9D607F825 -0x33B3B915893413B3D8BE0BF3B1BB62C3EC7722C1 = LAND_OF_THE_DEAD | V | 0x6893188D000E1609E6689EA3B4852D47 -0xBD513A47336E657773937B64D8D27C7CFCFBE261 = LAND_OF_THE_DEAD_G51 (Land Of The Dead) | V | 0xDBFDDC8412AB4EB4C922EC346B339392 ; MKBv12/FindVUK 1.00 -0x2349EACCE115A3C1F45FDEA9BDE8E613CBFFCDC9 = LANG LEBE CHARLIE COUNTRYMAN (Lang lebe | V | 0x68C9D878BDFD25AD4B55CB663FB318DC ; MKBv44/FindVUK 1.02 -0xE4B3695B822D3879DDB42F7ADA7A8B714A8CDECD = LAPUTA | V | 0xD6A9016650EC66C7617D173F85AADD35 ; MKBv20/FindVUK 0.81 -0xAB18AF4D6EA0069B69E00DDCC6F8259D9EF96D7B = LAPUTA (Laputa: Castle in the Sky) | V | 0xBE0AB72A7504537A3BC3CB4F60B1377F ; MKBv20/FindVUK 1.00 -0xC64205041CFB542A8B03F143DB0BEF13E73A761C = LARA CROFT 1 | V | 0xAE4C9B57A1030F222976B253DC32BA0E ; MKBv3/FindVUK 1.02 -0xA071647D4372BF3A9419FF1092518013C941F536 = LARA CROFT 2 | V | 0x97AD2DC2B2D6F1735C0C264E20131516 ; MKBv3/FindVUK 1.02 -0x417CFA7A4648A650B91C980D678127E5223E19FA = LARA CROFT 2 | V | 0x21C5E97F56C35E0104D9AA602420F6D4 -0x49AEDCDCCEE485472DF28ADE037E0883DF92DBB6 = Lara Croft Tomb Raider | V | 0x07241C816C92EBB50F79425DCF4C96EF -0xE849E24981BBAD428C00C80A5B5485F90FB851A4 = LARA_CROFT_TOMB_RAIDER_1 | V | 0x1433D706CF77BC3767B74746FDAC693B -0x1ECDFBC37DCCF9AE0DF5911674653F17C30041B9 = LARA_CROFT_TOMB_RAIDER_2 | V | 0x423D61DCBFF1F16A061696A356F7B604 -0xEAEF19ABB96B725057C5E831B30DC24E39BC5153 = LARGOWINCH | V | 0xBB1DE5B2F8E1089FD69BE3279A08661E -0xC39A548DE63397D9877D602844EBBC19E4FF5AE8 = LARGO_WINCH | V | 0x695A637D1C300C62D742BFC819B4C8B1 ; mkb v9 -0x5F38F3AFA8AE3317B6BC051D6E8CEDCDF5AC4F9C = LARRY CROWNE (Larry Crowne) | V | 0x89F387F1EF7024950158E96D10115935 ; MKBv23/FindVUK 0.92 -0x29F96DE022758E2F8C4B6C01B36FDF16C0CB6481 = LARRY_CROWNE_DOM (Larry Crowne) | V | 0xC35A60324D95252944FF47FC3A96DCEE ; MKBv20/FindVUK 1.00 -0xF639C591EAA72F04F04914A6CCF0CFCAFA07EEE6 = LAST CHANCE TO SEE D1 | V | 0x0ABF671A1DC753A1F66BA0F6F1CA11C7 -0xDBC26212BEE29E27814971AF7CC9B27C570933F6 = LAST CHANCE TO SEE D2 | V | 0x87821B3C546473D8A9CF7E2C96E2C60E -0x627ED57629E1B1C736BA8D57AFF3260C3D06DE13 = Last Emperor | V | 0x072B4110760BFDF220C1DFA9FEC8527C -0x6FC283249AC1CCE33CC75986AEF85A5DA985D1B7 = LAST EXILE S2 P1 D1 (Last Exile S2 P1 D1 | V | 0x8594F44D7280E8FAD28E2C13CF80DF9D ; MKBv40/FindVUK 0.98 -0xC61268092C4BF0BBEE1605306CB74ED24EB38AAF = LAST EXILE S2 P1 D2 (Last Exile S2 P1 D2 | V | 0x046DDD814DAE040833D79709508B6EE2 ; MKBv40/FindVUK 0.98 -0xCFE324515C73FD31821F751BC3E9CD1AFA893570 = LAST EXILE S2 P2 D1 (Last Exile S2 P2 D1 | V | 0xEB3187D06D8C79C01AAA6E67AED7DC8F ; MKBv40/FindVUK 0.98 -0x3221CA2724644DC2EA50328AE27D9075F7D13C31 = LAST EXILE S2 P2 D2 (Last Exile S2 P2 D2 | V | 0xE26CFA3FFD17F3F7F76E06BD340FC3A5 ; MKBv40/FindVUK 0.98 -0x6368CDD7E6ECF805D69C17BDDACDA5F491A14761 = LAST VEGAS (Last Vegas) | V | 0xEDFD1B09DEB15503B35D4225FABECAB9 ; MKBv43/FindVUK 0.96 -0xCF173F2985CB94EA3E9C53C4A3670EC7BC9372CF = Last Waltz | V | 0xA632AA7F6976BD46311513DA60BE07ED -0x0A58C6BD7F8C8F607784FDBF731ECACE83079ABA = LASTOFROBINHOOD_GLOBAL (The Last Of Robi | V | 0xBA82C05729C460FFF5022B3DDBF901A2 ; MKBv49/FindVUK 1.00 -0x2C79CF527DA3FD78367D3856AB1AF448476B2AE1 = LASTTEMPTATIONOFCHRIST (THE LAST TEMPTAT | V | 0xB2B3F929C55191D408F97BF549D405DB ; MKBv27/FindVUK 0.99 -0xC0617E336929C33A78E5950ACB30200B16C57063 = LAST_AIRBENDER | V | 0x18497B7A3111218F9E075782B429D367 ; MKBv19/FindVUK 0.81 -0x7499CBCB59861C4D6EB8B329248EF98A5D3778E2 = LAST_AIRBENDER (The Last Airbender) | V | 0x86AC88013D90CD06A64AF46D03025C32 ; MKBv19/FindVUK 1.00 -0xC5A00D6F3A2B6C096E3C9828F1057B7587709B2A = LAST_AIRBENDER (The Last Airbender) | V | 0x15DF6286D6C1AD013C126269CE89F8B9 ; MKBv19/FindVUK 0.96 -0xB1F577250FD8C83039D9FE049D2646DBAF49C4F1 = LAST_CHANCE_HARVEY (Last Chance Harvey - | V | 0xD71AD5FD696938C75F7E68CEA3F01D4F ; MKBv7/FindVUK 0.96 -0x0A4475CFCCF0E57C3EA36D4C4CD14153C17777AC = LAST_EMPEROR | V | 0x5EC238F594B7DB938A8A07EE306236DD -0x269676C48D45F567AF4AD0CDB3603F0DDD53FA93 = LAST_HOUSE_ON_THE_LEF | V | 0xEBBEA19AA2DDF609CFA2E96D90012B0C -0x27FCF4362E7A29DFF488E8A3B64305B350CF32D8 = LAST_METRO | V | 0x152FBE76E60F5AF9B94DB3029DCEDD81 -0x451BC5B87DD948CFC0D6FCF4666B1BAE853F0FA6 = LAST_SAMURAI [The Last Samurai] | V | 0x47CE4DAC0BC52501B2F52EEF5E5B3513 ; MKBv3/FindVUK 0.84 -0x3B5089EA5040B6880A7FA005CA7B937A7D231450 = LAST_STARFIGHTER | V | 0x5F29D3A63D7DF949B1FA4EE16764C728 -0x29364FA6247E094ADC1992A32C76F8BEA55C1A9A = LAST_STARFIGHTER | V | 0x4EB91B9B76E558551C5D5D7A76074784 -0x004600AE100F5882609AFF640D4327B860736EAD = LAST_VEGAS (LAST VEGAS) | V | 0x4FD34832AF27737BC1959063C2B58DCC ; MKBv44/FindVUK 0.98 -0x4DE31E14508EB63AF08B05C6EB15D2F463C5BC1C = LAT DEN RATTE KOMMA IN | V | 0x7D7312F986D1CA398487521EF9DA3B3C ; mkbv9 -0xE412459AB8B5227044A6843ECEBB742821FD6545 = LATE_AUTUMN (Late Autumn) | V | 0x143ED38C593A410CBA0AC8391EB75F34 ; MKBv20/FindVUK 0.98 -0x89B3DD092B9D1E5C6772E35D72B7640101E7C34D = LATINA_7 | V | 0x57A0A10ED8244D9B21BD5FC5598763D1 -0x69AE03410176D17E5F421AB0AC191A3F266FE02D = LAUGHINGMAN | V | 0xF9794915E54D7CD9E9EC2488EE02B61D ; MKBv21/aacskeys 0.4.0e -0xFD2D7BF7A5FB73B2716856876C60BD5FA2CB6FCF = LAVERITABLEHISTOIRE | V | 0xC2FD04F6927D10BB4B353C0521DAE648 -0xACA470F94728DBD0F0ADEC06E8FD2696B0035234 = LAWLESS (Lawless) | V | 0xF475517FDE0B694165357B8622B2BEA9 ; MKBv31/FindVUK 1.00 -0xE81452179F8383103A0762FCCD1477732DFE234B = Lawrence of Arabia | V | 0xCAFADCE5AB111B44D3FF1DA8D0358350 ; MKBrev 35 - FindVUK 0.54 -0xF51EDEECB834662DD8736E6729695F844801054A = Lawrence of Arabia (Lawrence of Arabia ( | V | 0x9BECF220492CB54DE2DFFDA279324CE8 ; MKBv31/FindVUK 1.00 -0xAE7F9FA888DE1D265843CC67307648916E453A6F = Lawrence of Arabia (Lawrence of Arabia ( | V | 0x1E90C0016F2B19701690528E5BEA2499 ; MKBv33/FindVUK 0.96 -0xD6F4A87A2C0E34FF10CFC16BCCD242B0F15E4259 = Lawrence of Arabia (Lawrence of Arabia ( | V | 0xEE98C424583A6D0368D2185498658A79 ; MKBv31/FindVUK 1.00 -0x7D3618BBBD0FFB7053546C862832FB81BFDCD1D5 = Lawrence of Arabia (Lawrence of Arabia ( | V | 0x0D04B6FCC602E13B22B1115473F805B9 ; MKBv31/FindVUK 1.00 -0x0135B2EB858480722A1702D8217C86FDFC997366 = LAW_ABIDING_CITIZEN | V | 0x2617BD9234037316F372ECE4419BEC0D -0xDE0F320E1D6B5C0B6DB240F32E19B9653D5CC674 = LAW_ABIDING_CITIZEN | V | 0x76A0532CF2A5273524CA6FC20BEE1749 -0x9A4CB817E4EA2ACE80D34AE1B91F7B6396746E0F = LAW_ABIDING_CITIZEN | V | 0x45CFB5A7CE871BF7C0B4A5F81AD046E2 -0x2D34AC0DC711FDD14D649FABB62D5A1521BF7C7A = LAW_ABIDING_CITIZEN | V | 0xCF7A8A7866473F721A76478AD88E5FB7 -0xCFCB0E53AF1BBD8792825C009E6408455BB93445 = LAW_ABIDING_CITIZEN | V | 0xFD87DEE3208480999916E452DE03B096 -0x78D0DB35064F8DA5FAE0B320242A2C1CC72DDEB5 = Layer Cake | V | 0x39AE58F7D2531BCEAD9F897BB5AB4C73 -0x41D15A2965C01B160357900FCA7CA390C4177AC4 = Layer Cake | V | 0xC5A98B469B732C79539FA8849CC2782B -0x2FAB67990D60503A2980725F814E5581694E69E4 = LA_BOHEME | V | 0x9F4416AF642E157BB345A7B897FC2348 -0xAEF94E8917E41EC532128E3E1FCDEE8DBB029449 = LA_CIT?????_INTERDIT????? | V | 0xA020BF7ED29FDCDFB73DBE8E1503878F -0x72EF7D72FFAB551A741EF9291E3C2243D8C604D0 = La_città_incantata (Città_incantata) | V | 0xC81B6189A6929F65B02F003208FCD9C3 ; MKBv50/FindVUK 1.02 -0x2C6FA74365A8D3B1AB851F507083852D14E675F3 = LA_CRASH_BD | V | 0x82BBCEE5F531413FBE1B910E0F607E74 ; MKBrev 4 - FindVUK 0.53 -0x48B38F0A37F62ED1F62724EA995DB2F0D1BBB40E = LA_CRASH_BD (L.A. Crash) | V | 0x5D273B1E676EA38766C920973A208DFD ; MKBv4/FindVUK 1.00 -0x7AC233CEC4F64E3A54D94270519B458BC44EE815 = LA_DUCHESSA | V | 0x2EA39CBC75E63799A374C996C8EC0EA5 -0xAC70BDC8DE92F90F620C4468B4596F38AEDB456F = LA_GUERRE_DU_FEU | V | 0x38CD40242BB7E30E0499AE9D6CACF7CB -0x299F88695B00260BC66D2E19E27B4ABA43AC8412 = LA_HAINE (LA HAINE) | V | 0x85856B7668F3A5F5DB8ADF940907B0E9 ; MKBv30/FindVUK 0.99 -0x90286647EF7EE0659D42ADD7BFCF83B64121B850 = LA_LOI_DU_MARCHE | V | 0x3EB5B7659E95886EC414E6679DAD7149 ; MKBv53/FindVUK 0.72 -0xF71846249B1200391B2DAFEECC6FB5EA9C16B94D = La_Muerte_Tenia_Un_Precio | V | 0xE82F44AF62AB0C1F8ED5CA66123BEFD7 ; MKBv31/FindVUK 1.02 -0xB51E3CA8D88E666FD1BBAE1104CC9E5DAF5D86DC = LA_MUJER_DE_NEGR_2 (La Mujer De Negro: E | V | 0xE9053F51F63D4F26AB8DCCD1A1AEB0F8 ; MKBv54/FindVUK 0.98 -0x9FCDF1FBE051EEB228C9B8A6F66E74666BF2A0C9 = LA_PREMIERE_ETOILE | V | 0x8AFD8A852461F9E008258D827348968B -0xC16446E4FE918448D85FDED8555ACF7144E1B4F6 = LA_ROUTE | V | 0xD50B4F85B85E7CA5A8C734CD368C12D1 -0x70D3CB1E2455B65363089F4E4F163E51A3916EE7 = LA_SECTE_DU_LOTUS_BLANC | V | 0xADF60F35E0634CDD111BE6C657160C66 ; MKBv38/FindVUK 0.65 -0x0C3AA655CE9CEDA87B745D559BF4932A5FC2310B = LA_TRAVIATA | V | 0x402DBCAB9D78C1E0B4021D5CB1B89DEE -0x328EC5294EEDC8C551FB568DE13BC8940B124341 = LA_TRAVIATA | V | 0x542A42835A3AFC24FAB0C700323E4955 ; MKBv9/FindVUK 0.96 -0x7564A51C3916D5062CF910EACB4606E0262AD4C6 = LA_VIE_DES_AUTRES | V | 0xCD64ED3ED1C0E371C9646FE7E9D91C4C -0xEED63189299C95DFB7B4850ABECD515D3928C090 = Le 7e Voyage de Sinbad | V | 0xC2D7DD842DB7126C6310E8CF79D720C0 -0x704C7B16BD40C109170C5CA32BBB4107A38BE298 = Le Casanova de FellinI | V | 0x11538687A0EB92263740F67D6795476C -0x3952103F714411CEC7C5C2E20C5A46B5AD009551 = LE CHATEAU AMBULANT | V | 0x6FEE19BE64E4E499CAAA74DB23AA648B ; MKBv30/FindVUK 0.84 -0x0A7182A8B359DDB5A52503995FEA27092E055CDE = Le Come Back | V | 0xF276918F77B391F949BAF4D3A898D3B5 -0xA55BA78E6EAA96432F6218EA3FB5B1CA91016ACD = LE COMTE DE MONTE CRISTO VOL1 (THE COUNT | V | 0xA072A5C4F8C3E479A8041FDC17548397 ; MKBv57/FindVUK 1.02 -0xA23F317A81F88F18290C5436AD249CB7971A2118 = LE COMTE DE MONTE CRISTO VOL2 (THE COUNT | V | 0x54929BF7559120E507E8C79454070DC7 ; MKBv57/FindVUK 1.02 -0x67EE8666E1E8DEF9FDD5ABCB8355706D766EF0BB = LE COMTE DE MONTE CRISTO VOL3 (THE COUNT | V | 0xDC68C5EB7EA73058D14CF3FC84E3B05E ; MKBv57/FindVUK 1.02 -0x68256E8A91E58F15E448461DCD69D232C58AF808 = LE COMTE DE MONTE CRISTO VOL4 (THE COUNT | V | 0xAC2BDCA9136988BAD0EECA4A006F1700 ; MKBv57/FindVUK 1.02 -0x85481D9D605657FCC4F8BC1C9C009FBE61C5ADFB = Le Dernier Combat | V | 0x40ACC73B6D37BA5DF901BA09F3A803F4 -0x2387FF361035B2C17A2A4D70FFA338C5433361A8 = Le go?t de la vie | V | 0x6FDF95DD85B7B982C213EE693C922CA9 -0xAA88DD28C0E67F60B0101A766401310899DD6FFF = Le Grand Bleu | V | 0x22D62303B69C2BD96A02C171AEC416E8 -0xADDE14659DB18C7DF56022FC570671CBBA949B5A = Le Labyrinthe de Pan (French) | V | 0x7A0EC86418BF4AE884364293E94F66C5 -0xE814F846A320F8DB806DEB4F992085A75A443981 = LE MANS | V | 0xBA51E5C23DD5546F57D71B5BCB7769EF ; MKBv23/FindVUK 0.96 -0xFD74910D43B97E2A16ABCC0A6D9F6B4FEAA30286 = LE NOZZE DI FIGARO | V | 0xFE75193FD26A7398CAF33CA626977C04 -0x0CA29119B04C67800CBE53001CDEF8A33DF7681B = LE PREMIER CERCLE | V | 0x0AB3A427B0F11A14489336D9EBA34D34 -0x2E06A18ED552F728AB79D70A727B633FAE8FD498 = Le Tombeau des lucioles | V | 0x6C31CEF87D05D376B19151E798BEAD55 ; MKBv35/FindVUK 0.84 -0xA80E264D87DE38FB48672FB56105B836F6BF562D = Le Tombeau des lucioles (Le Tombeau des | V | 0x938E5BFC6A97E03219F076CE6E0EBF80 ; MKBv35/FindVUK 1.00 -0x0113BF4A871D1FC593C7329D52479E8247424A61 = LEAGUE_S4_D1 (The League, Season 4, Disc | V | 0x3FE3AD22D51E7E5ABA70293BBE35039E ; MKBv31/BD+/FindVUK 1.02 -0x8330CBA7450BD777E02900EFA1C39E5496D644F0 = LEAGUE_S4_D2 (The League, Season 4, Disc | V | 0xD592035D9A7A53ABCFF21BB2B48664FB ; MKBv35/BD+/FindVUK 1.02 -0x5DF9001D24317271423FBB6F3012B767AF6B0545 = LEAP_YEAR | V | 0xA96441465E4106150D1B2DADE0032BFD -0xC32AEFC389C9A76705D54CD8017D4B69C19B56BA = LEAP_YEAR | V | 0x1EC89AB53F2A83357848FBDAC3CE5260 -0xFCB62DC05E569F883E0D1DBA470FB670BBC6FBB1 = LEAP_YEAR | V | 0x1842320F3EA967B4F108F02EFCD89F6C -0xF6B6C0D3B92FDE5B96C9CB47D8C56F9B9B97FA07 = LEATHERHEADS | V | 0x24A7B4D31A4D5830A1372860EF664F77 -0x2F42CECE1B7AE043C3FC0175D354DDC697E257E8 = LEAVING_LAS_VEGAS | V | 0x715A633DC9B0221DEB66D025880B6222 -0x1022044A3B65285027BA85D5C5F921195EE4C876 = Lebanon | V | 0x77B5A0A59784FDFCDB8CB17ED82DA77D ; mkbv9 -0x6822E9C91AD206916D0F50D43FD44E83FDAFA8D4 = LEBEN_BD (Das Leben ist sch??n) | V | 0x74EB7F8EABB9A46CCB7AA810546B953F ; MKBv28/FindVUK 0.84 -0xEC13267F9F4D033059E91F8FF8ADC523ACB4316F = Led-Zeppelin The Songs Remains The Same | V | 0x4D9BC995E64E951DADF41198BA2E4523 -0x234371FEDDFCEDA7F70653FFA495ED646B3A4E77 = LED_ZEPPELIN | V | 0x8B363220276107EFEE726A7C832C91DC -0x0541B84C46DDB659D9042396667BEBA8F28EB744 = LED_ZEPPELIN | V | 0x034099E10B1888E9CC06E54F1E3377D1 -0x17EF039412502BEA58042DEB2BEFD06E9F6BB4D2 = LEE_DANIELS_THE_BUTLER (Lee Daniels The | V | 0x4B7B88F8B4C84DA7807EDF5C35996F95 ; MKBv42/FindVUK 0.96 -0x6C581549D0EB972778773D0F6DA08F8D685B3699 = Left Behind | V | 0x0EBB22C25D51DF906CDE316BE8AC5E3C ; MKBv50/FindVUK 0.96 -0xF579E13D539BDB2056844EA8E159178E7863B9A0 = LEFT BEHIND (Left Behind) | V | 0x63C6FF585BDF1904FAAEEDBFC53A3585 ; MKBv49/FindVUK 1.02 -0x609CC83A5419CEFDBFEBD5341D5882771151C5F3 = Legend | V | 0x205663851F2939FE60986542F2D2FC4E ; mkbv57 -0x99D1FE5C4C4658CDBB898233193857A12E30731C = LEGEND | V | 0xE847500CC2BE4A7C61A02C07F2D0FBF1 ; MKBrev 19 - FindVUK 0.54 -0x3FCFA6D2F1629DC2709E2763A5602B553320573C = LEGEND (Legend) | V | 0x612827B0C1E43A82C13E7E068B590283 ; MKBv57/FindVUK 0.99 -0x22934AE900EE12536EC840C14645590804F18517 = LEGEND (Legend) | V | 0x13C00CD1B4531C7ABB7266D289E45B63 ; MKBv58/FindVUK 1.00 -0x8CC8082DB7A4626BBF5ECF95FE07667F6026C32E = LEGEND (Legend) | V | 0x447AAF5797A9DE67700A1B6C88B6C247 ; MKBv19/FindVUK 1.00 -0x9A3E9B5C8106D00CE7552C5B87740E6EA2348338 = LEGEND I D Z APOCALYPSE (LEGEND I D Z AP | V | 0x0A3B35E6CD374C4FEF445C872F7FD968 ; MKBv42/FindVUK 0.93 -0xC86DB872F2E8D9196A50DAEB12BB12516BCE065E = Legend of Jazz Showcase | V | 0xCB643CA71CCDB81E7F9366BAE8988868 -0xDC5FF7E2D912D1D530A90C2D54349A7922F46260 = LEGEND OF THE DARK KING DISC 2 | V | 0x4F7F0C7E566B46BF78056AFA8FA5EE14 ; MKBv18/aacskeys 0.4.0e -0x86011E03D3A23E7F52D52BC011D0D7D38DE54EDB = LEGEND OF THE DARK KING VOL 1 | V | 0xD2AE9839448DBF1431F007AFDE8BAAE6 ; MKBv17/aacskeys 0.4.0e -0x41752259DCC7D5996BB77934E4097E16BB6FCA4C = LEGEND OF THE GUARDIANS 3D | V | 0x82C6B3D8B75ABBD9277179FBC28DC044 ; MKBv19/FindVUK 0.80 -0xF3329816308F901C729DD9B15DC98361D2F7D997 = LEGEND OF THE GUARDIANS 3D (Legend of th | V | 0x9C0B37D1320B84E64C94843883660F6F ; MKBv21/FindVUK 1.02 -0xF45AEDE32BF215BCAF782D0001B217C267F17158 = LEGENDOFTHEFIST_METRODOME (Legend Of The | V | 0xCA90B4B67665B040C358D5421B8D6A39 ; MKBv19/FindVUK 0.84 -0xBE9AC0B1CD25765A22B856860A3D473C52D621E1 = LEGENDS_OF_THE_FALL | V | 0x2E3F9675667871AACECE36142B4DE57A ; MKBrev 19 - FindVUK 0.53 -0xCB60A92E2E79ED88D2E3BD77D2B00FC21D1CB2CA = LEGEND_1999_1997 (LEGEND_1999_1997) | V | 0x556D2B2743C1C56408B8E3804E227046 ; MKBv48/FindVUK 0.93 -0x64EC80CE7FC9825FDE40DF2C9A0FD68F7CA332DC = Legend_Of_Korra_Book_1 | V | 0xFA351EA61123134967C6FC2BB724F686 ; MKBv31/FindVUK 0.80 -0x5F2AA5D01326C4F4EE12270013FE9EF43C992CE6 = Legend_Of_Korra_Book_1 | V | 0x95B4DCDB395E431FDD3FEA1D82B79CB7 ; MKBv31/FindVUK 0.92 -0x6A25878566A8CA409AF2F514AE46FEF8926C70AC = Legend_Of_Korra_Book_1 (Legend of Korra: | V | 0xCB4994AEA80579C96504BA4C686BFC85 ; MKBv31/FindVUK 1.02 -0x6510E0FDE0E53298460F19564F28D23FE94AD6B5 = Legend_of_Korra_Book_1_Air_D2 | V | 0xC83E3091AAB51DA32C508B72C64937CF ; MKBv36/FindVUK 0.92 -0x3744346B433FCF41E8F6381E65908AFAD56A9B79 = Legend_of_Korra_Book_1_Air_D2 | V | 0x71690F78CA74E2534B5DE8F52C04C4E4 ; MKBv36/FindVUK 0.80 -0xCDFDCA47A2145B9EC7714E4FEB7B77DE7C634D8A = Legend_of_Korra_Book_1_Air_D2 (Legend of | V | 0x0AE3B0704C8E1FCB0198D2A5819D64C9 ; MKBv36/FindVUK 1.02 -0xBD62C476137260113505DFF05422792B28254DE1 = Legend_Of_Korra_Book_2_Disc_1 | V | 0x937AAABE201E59C8055490FB1AB14AAB ; MKBv39/BEE/FindVUK 0.80 -0xDBDC1F7B713940734E34E187B74B2B8DFE058D99 = Legend_Of_Korra_Book_2_Disc_1 (The Legen | V | 0x5D5EAFF942144986EE1D3CA65C986CF0 ; MKBv39/BEE/FindVUK 1.02 -0x9717000873B69D8A6DCFF35C8D04EF661E09A5E8 = Legend_Of_Korra_Book_2_Disc_1 (The Legend of Korra: Book Two: Spirits - Disc 1) | V | 0xCE6707F1300D610FFBD0F09B8C93AD15 ; MKBv39/BEE/VUKNOTVAL!/FindVUK 1.00 -0x3AA0047D9B899B15B17E0C62C520071930E3EFCE = Legend_of_Korra_Book_2_Disc_2 | V | 0x0477BBAEA199C8FA1E38327334B6A506 ; MKBv46/BEE/FindVUK 0.80 -0x36DBC91F4A25696936C1D6C8121279AD917C321D = Legend_of_Korra_Book_2_Disc_2 (The Legen | V | 0xD10AE4D894BDF09EDEC5288244716CAA ; MKBv46/BEE/FindVUK 1.02 -0xAF34FCC38886D651F58F5DFB2540D9EDFAB98312 = Legend_of_Korra_Book_2_Disc_2 (The Legend of Korra: Book Two: Spirits - Disc 2) | V | 0x3C9FD0AD1640E73EF78C159D6320EC23 ; MKBv46/BEE/VUKNOTVAL!/FindVUK 1.00 -0x8295576B9A557CA2BA13797C84382EE4BCD5FAC4 = Legend_Of_Korra_Book_3_Disc_1 | V | 0x4D310FA4B351BFE21EB2CDF601BB3874 ; MKBv39/BEE/FindVUK 0.80 -0xC2FBA4F58526E0E20F61AC77D0B67605701A433F = Legend_Of_Korra_Book_3_Disc_1 (The Legen | V | 0x548537CFC23C661D5E510B56364F3F10 ; MKBv39/BEE/FindVUK 1.02 -0xC94A0DEE5B9FA9214889AB497F9279DDE65F985C = Legend_Of_Korra_Book_3_Disc_1 (The Legend of Korra: Book Three: Change - Disc 1) | V | 0xC48EF346288147E1C265B5CD9463493D ; MKBv39/BEE/VUKNOTVAL!/FindVUK 1.00 -0xD28D1398A76A049E9CF0645B65904B283690E789 = Legend_Of_Korra_Book_3_Disc_2 | V | 0xA20CF26C169D3E9D60364C64FB210722 ; MKBv47/BEE/FindVUK 0.80 -0x0B1AD7BC118D866B49770B66FCB21F0E1C722C38 = Legend_Of_Korra_Book_3_Disc_2 (The Legen | V | 0x57A2216F6C7EFB47A9B2567566132DC3 ; MKBv47/BEE/FindVUK 1.02 -0xF36B2BDD017528223B6C35D912E5AA102F76B197 = Legend_Of_Korra_Book_3_Disc_2 (The Legend of Korra: Book Three: Change - Disc 2) | V | 0x5F1402797B52636D5053C9A03DD820B4 ; MKBv47/BEE/VUKNOTVAL!/FindVUK 1.00 -0xC08C6D61C8F7A9B3062AA53FCA7B49170A0A7E1E = Legend_Of_Korra_Book_4_Disc_1 | V | 0x7AE20E6409ADF2F9696A1E0867921C24 ; MKBv47/BEE/FindVUK 0.80 -0xD9ABFD35EFFBDB37FF49C422EA0B722D8E79A0F2 = Legend_Of_Korra_Book_4_Disc_1 (The Legen | V | 0xD018CDC2860187A366677AEC74D11B7C ; MKBv47/BEE/FindVUK 1.02 -0xCCA1B934B73D73C8E61093805F9EFC8745FA2FF2 = Legend_Of_Korra_Book_4_Disc_2 | V | 0x0D23EDECEB8DFFF8E2643F86C983FC84 ; MKBv39/BEE/FindVUK 0.80 -0x444AEAB57E859FD788F23A875F57473B5F198065 = Legend_Of_Korra_Book_4_Disc_2 (The Legen | V | 0x06986AF63CA97BFC69DE2777DBF7F9BC ; MKBv39/BEE/FindVUK 1.02 -0xE00919C15EB67D498ABC9DC2F0B83F086A3886B4 = Legend_Of_Korra_Book_4_Disc_2 (The Legend of Korra: Book Four: Balance - Disc 2) | V | 0x7F054072C245E28E80363C455277D63F ; MKBv39/BEE/VUKNOTVAL!/FindVUK 1.00 -0xD530640273CAA87F4D68FB0CF73096C45CFF406D = LEGEND_OF_TARZAN | V | 0x6BBEDE0BF5B016E5DCF948764F78D945 ; MKBv62/FindVUK 0.98 -0x62C6D01B52931E47475465063C11E9AD65E75B08 = LEGEND_OF_THE_GUARDIANS | V | 0x456BE5DA0D841E6B13B2CEBF6A4636AE ; MKBrev 19 - FindVUK 0.53 -0x73598BBF7C33021CDDAB02526A88820AF722F805 = LEGEND_OF_THE_GUARDIANS (Legend of the G | V | 0x333054DD557E9A2FD3108D449FC558BB ; MKBv19/FindVUK 1.02 -0xD745B8740251C9D73760F4884EC7C0D08FA4A38A = LEGEND_OF_ZORRO | V | 0x98401C02B612696537470AFE6DF123D1 -0x2BF96B1B061E20F8268F56E409BFDD0AF9977193 = LEGEND_OF_ZORRO (The Legend of Zorro - B | V | 0x1A8E6AC7CD35217B2AB7D348F0087F7E ; MKBv4/FindVUK 1.00 -0xDBE0702CD1A369B215FE78DD53819AAFFC5C97FE = LEGION | V | 0x1013203DCCB293C4605AE582F194AB3D -0xB18071B544B7FD7BD2416C5FA6718F74E068CD7F = Legion | V | 0xDBC6129FACD74F4E069CC9A0CB74E16A -0x28B03EB03D44394808330C8C070F8AE08E3ABB3B = LEGION | V | 0x87405499111659A7A100F286561F5FE6 -0xF463E08B5D09E4F7EB9732ABF19F77F19EC8BA33 = LEGO_BATMAN_MOVIE 3D | V | 0xA7CE23B3202EF64FCCF1A03C5B9770F6 -0x6626AF7F875E276AAA5E0E401C5CBDBB98352CCB = LEGO_Scooby_Doo_Haunted_Hywd (LEGO® Sco | V | 0x2C4106B342E355D27A62754CF2587E50 ; MKBv61/FindVUK 0.99 -0xF1849B436EFCBFB46E0423CADFBD50C868D79E4E = LEGO_STAR_WARS (LEGO® Star Wars®: The | V | 0xE631E36782F6C721F069751306506EBF ; MKBv20/BD+/FindVUK 0.98 -0x7B8804E0AC1E2D531ED9329DE726553F0B0BBC0F = LEHUSSARDSURLETOIT | V | 0xF2FA8FB23ED25BDAEB5DD216C0409A09 ; MKBv16/FindVUK 0.65 -0x8A68B90E5E04AB547B3BE1C1B9628A5D5BA44C37 = LEJDIS | V | 0x0965AE79A786FC48FC535EDB45CC2275 -0x2FC63EDFB609EAE69E646E2CFC3C9DF09F360907 = Leningrad | V | 0x89F98635FDCF3B003212F6092E4AAD3B -0xE315C0DDADF6BF98F39FCA6BB5538CA624D02500 = LEON | V | 0xD2D5840545469D4796D1A9B0787D17BC ; MKBv3/FindVUK 1.02 -0x892A6E080D04EB0C7EF7294F990BDDED40362AE5 = Leon | V | 0x083F7935E2548C94CB615B622053630F -0x41980010D0588200DFE1B97A7745127FA5B1DEE9 = LEON | V | 0x9BD04E3017849C1C98E3FA8A6BA01162 -0x4C01FF55D2EBBC2A7FD0DD6A1DAB873EB2F48B0F = LEONARDCOHEN _SONGSFROMTHEROAD (LEONARD | V | 0xC50141804B51A7668998771DD2E4997A ; MKBv18/FindVUK 0.96 -0x20F9F9100616921619E75F0FF05FFF69FBD3E6C0 = LEONARD_COHEN (Leonard Cohen Live At the | V | 0xC75CD7AE5A8A8DDF3E9098AC6A5B3D77 ; MKBv15/FindVUK 0.96 -0xB944103E369D9F4131D03EA19246A68C4DD240D6 = LEON_BDROM | V | 0x0D418C92A3D18B3C335C1E43299CE0E8 -0xD021FEC1338970A81618D34115D97618612D75FF = LEON_THE PROFESSIONAL | V | 0xD8E78A538B6E9181A998C6802B55B4CF -0x6BE6EBE362197618CA27CD8BAF22D21BD3611F1E = LEON_THE PROFESSIONAL (Leon) | V | 0xF1567A7DD3125487D6E7D6CA64EAD452 ; MKBv12/FindVUK 0.96 -0x3082B7774B1D59DDD20034501B36C5C47EF6A13F = LES CHORISTES (Les Choristes) | V | 0x970FD727636524C19D0F557F6229CF71 ; MKBv26/FindVUK 0.98 -0x6F14A7BBB9E74FD16F4031506AFA69158FCACD32 = LES MISERABLES 25TH ANNIVERSARY CONCERT | V | 0x4F8F8C38E6D1A8F91F5C3FD25425D821 -0xB1034811C623DC32F1AEA9F1795108F5D3FE6F43 = Les Myst??rieuses Cit??s d'or Sais (Les | V | 0xD4EF9AF23C243372C8BD6A3AE8E2D053 ; MKBv39/FindVUK 0.89 -0x253A029A16A1D69CB1CF1AAD66BCFC8ED920814A = Les Mysterieuses Cites d or Sais | V | 0xBFC658A8858ACB39B0F00454DBB261A8 -0xD98B3C0ABBB6EC34E522544D2558AE995799329D = Les Mysterieuses Cites d or Sais | V | 0xE6D1EFDC7B49954FA64E1361118DFE5B -0xDC3934F459F30018D6A067CE4BFC8CBB81B4A321 = Les noces funebres de Tim Burton FR | V | 0xBC916F1AED8F6378F175EB719380635E -0xC1D58025569511A5ABD30FB768AC5A666D9950A5 = LES PASSAGERS | V | 0x5CEC3723D4AB175BB49D1BF3A85EF711 ; MKBv14/FindVUK 1.00 -0xCFC317D890E0E532761188BB0B35C8288C0537FC = LESBEAUXGOSSES | V | 0x6361974BBC6CD0A039F3E4FFF7FC71A7 -0x567651145ADEC66F9F65D88F207D07183736F1CA = LESBIAN VAMPIRE KILLERS | V | 0xFB3F0D2026A0BB6699A8573347A3512F -0xE69B9F02D2BF7B1BB583FB8F6309A99EE1DE2C6D = LESBIAN_VAMPIRE_KILLERS | V | 0x54C93E27909172040124889835E54459 ; mkb v14 -0x0F96A52683F53370F5518A5093A8B78B5DC819D0 = LESNOUVELLESAVENTURESDALADIN (Les nouvel | V | 0x427015BE13A9B4A649FC21ECF1411CD9 ; MKBv57/FindVUK 1.00 -0x628BF75A7CE88D39E04355BBD556453332860A73 = LESRIVIERESPOURPRES2 | V | 0x89AE425AC02DE86D7BA38C715465A8C3 -0xAA417FDEE916FFF43DE3AD31656A64793F3F36D6 = LessonsOfDarkness_LittleDieterNe (LESSON | V | 0x9C3F3B5D45237BD0D9E32B243BCF958B ; MKBv47/FindVUK 0.99 -0x2A31F0CCA9F474F72F3A815D14AE203D8820CF0D = LES_CONTES_DE_LA_NUIT_3D | V | 0xE3A111EB49E31E7A3311E4472F300A13 ; MKBv23/FindVUK 0.82 -0x465366CFD808B9A66C0A134D22906710960EFA85 = LES_INFILTRES | V | 0xC3E38DCFCA638FCBA049D4EE908185DB -0xEBB944DF2CE1B13E296ED1C5BE4D0AE28ED85579 = LES_INFILTRES | V | 0x99D9A160B3AC929187E96360351AD6E3 -0xE76CA80432106823AF037FB720054F5408D8BADC = LES_MISERABLES_DOM (Les Mis??rables) | V | 0x162770211027F5562FEBEB40F0E01C5B ; MKBv36/FindVUK 0.96 -0x64C46888AE74CC6E16FE8ABB8CD38B8902107626 = LES_MISERABLES_DOM (Les Mis??rables) | V | 0xF8015E6807893FA813D04043C92F6BF4 ; MKBv36/FindVUK 0.92 -0x82C1EB1CEC7BA8E8121FDC2F7048C0E6B705D622 = LES_MISERABLES_G51 (Les Mis??rables) | V | 0xB8A239733AF6B0A7BD3CDC2ED35C5C60 ; MKBv36/FindVUK 0.96 -0xB680623208EB278E511EF9146F5679FDB3C694C5 = LES_MISERABLES_G51 (Les Mis??rables) | V | 0x7E0F2B82A5198C03BA14374023E2AD14 ; MKBv36/FindVUK 0.92 -0xB0F9824BC233CC729C036B13706E0B95018E45FA = LES_MISERABLES_G52 (Les Misérables) | V | 0x5B49E7D2633FB03B92EF3D59FAC9C47D ; MKBv35/FindVUK 0.96 -0xA3367AE36CF11F1ED9B05953CE1286359BCE3B1E = LES_SOUVENIRS | V | 0xD62667E04FE77EE7F3AA89944807CA83 ; MKBv53/FindVUK 0.72 -0x3496A1D47AACAE46FA810A81D0CD22DA06D615D2 = LET THE RIGHT ONE IN | V | 0xC7B57986628C3B235FA227BBB40C6481 ; MKBv14/FindVUK 0.80 -0x1FE99A1E73D1BB35F43971AF29E1598B448AB883 = Let the Right One In | V | 0x111CB08E441FB5D75CF8AF5BD1426DF9 -0x93AC605BCE98647D6B575CFF93F3E1ECEEF55EE2 = LETHAL_WEAPON_1 (Lethal Weapon) | V | 0x7147F420C31A69952B219C03D1D3A288 ; MKBv19/FindVUK 1.02 -0x515891558E1A410FFF98F2865D3F0C0E1AF5114A = LETHAL_WEAPON_1 (Lethal Weapon) | V | 0x8EDCE58B315664ABC6361C3648A93DD0 ; MKBv19/FindVUK 1.02 -0x965D70F30D8AC1A6048FC502F3D10894E27B4349 = LETHAL_WEAPON_1 (Lethal Weapon) | V | 0x53D83A6494C604C4D516B620303C6EF7 ; MKBv19/FindVUK 0.96 -0x1A23E6C32AE14F63A157F40DE28D6EE599D743A5 = LETHAL_WEAPON_1 (Lethal Weapon) | V | 0x17D1060FA8A4B84EB8AA194C3FB62315 ; MKBv19/FindVUK 0.96 -0xD56FE02599D765B56EF47B18C07E1A6B5F478DE8 = LETHAL_WEAPON_2 (Lethal Weapon 2) | V | 0xECA3FAAFCC1C792B9A01D5D4EA54D970 ; MKBv19/FindVUK 1.00 -0xEBFF018F27F174A5859A258FD363341CA16A3551 = LETHAL_WEAPON_2 (Lethal Weapon 2) | V | 0x99ABE162DF11CD55001794EDFB7B81B7 ; MKBv20/FindVUK 0.96 -0x258B097801E1ADF7182A489594AC33ACD1D99A52 = LETHAL_WEAPON_2 (Lethal Weapon 2) | V | 0x4669ED1031DCC193F9B46481765BD5F3 ; MKBv20/FindVUK 1.02 -0x00D5857BDA6F8BB557823C14D64198115D08F4FC = LETHAL_WEAPON_2 (Lethal Weapon 2) | V | 0x78DE0AF99CBE550C090DBFF6556F0914 ; MKBv20/FindVUK 1.02 -0x80D8B4F0D28897476FFC4289EDCE4B1408EB7CEF = LETHAL_WEAPON_3 (Lethal Weapon 3) | V | 0xF04822FFCBD1598F6422D0BDF4AFA0A8 ; MKBv18/FindVUK 1.00 -0x267D662FEB44A0A6376CDAB292CEBC204B63A598 = LETHAL_WEAPON_3 (Lethal Weapon 3) | V | 0x74826013740BEBB4AB1AEEB64EEA5844 ; MKBv18/FindVUK 0.96 -0x275606EF11AF8F7C7DBF4B56E5CEA88CB81F5324 = LETHAL_WEAPON_3 (Lethal Weapon 3) | V | 0x1B6DCAC85548F929BA591AE74C42CCA0 ; MKBv18/FindVUK 0.96 -0x49458B419BDDE614DDDD8778D47F7D12D2D5BB48 = LETHAL_WEAPON_3 (Lethal Weapon 3) | V | 0xF137E5A965C672338006D3A9537B20C1 ; MKBv18/FindVUK 1.02 -0x06AF5602A7F6A46BEEAEABF1E3D2D85DE916266A = LETHAL_WEAPON_3 (Lethal Weapon 3) | V | 0xE53A476807F0193ECDF2B3A1B35A05BD ; MKBv18/FindVUK 1.02 -0x54DCC85D7EF4213021B9AEF02325B05CD8BF53A8 = LETHAL_WEAPON_4 (Lethal Weapon 4) | V | 0x43B87A38CADCBEEC3EC7626D1CA2FEDC ; MKBv19/FindVUK 0.96 -0x34990FA3587043625E16EDC94670DCF749061E89 = LETHAL_WEAPON_4 (Lethal Weapon 4) | V | 0xA21ABED03AE1507B3C40140B15FE82A9 ; MKBv19/FindVUK 0.96 -0xDB9D1CE6E155CCE421BB26F2FEBC86008D1FB536 = LETHAL_WEAPON_4 (Lethal Weapon 4) | V | 0xDFED4D9922FA2C11D363AEC4FF22D034 ; MKBv19/FindVUK 1.00 -0xC29E361117FE67B8885C568F3D2B57CCDCAE6DC7 = LETHAL_WEAPON_4 (Lethal Weapon 4) | V | 0x5D5E6E38AB4ECFD7D4527658DFE9FDBA ; MKBv19/FindVUK 1.02 -0x81622A2F9961DF12C52450573D4E7ED589942BB9 = LETHAL_WEAPON_BONUS (Lethal Weapon: Bonu | V | 0xED9CE05F43E9405327DFBCDE4DF19E91 ; MKBv19/FindVUK 0.96 -0xFD67CAC26532DE8ABF244472E8492304E1D92F66 = LETHAL_WEAPON_BONUS (Lethal Weapon: Bonu | V | 0x60F8ECD5934C8F8D0C590303B35E85BA ; MKBv19/FindVUK 0.96 -0xD9B50DD45BD4F701A88A5A96CF5D0EB04BED5DC5 = LETTER BEE DISC 2 | V | 0x159235FECF3E19458F81EC0858D2899A ; MKBv47/FindVUK 0.96 -0xB94FC60DA5AD6F964914B1E52D7546CA482CE0F9 = LETTER BEE DISC 3 | V | 0x8023B019D6EBD09434C6B98D8427305B ; MKBv47/FindVUK 0.96 -0xDAC45F6E9F8B0898807ACAC4C6E5341F03DD3AEF = LETTERS_FROM_IWO_JIMA | V | 0xD7FE36A2930C93094C075F35B9940554 -0xF1214D1ED1482A0D9EF9FB764316182CBB75E3E1 = LETZTE_EINHORN (Das letzte Einhorn) | V | 0x7A28BCC2A19D984D890FF9D14ABA2EB9 ; MKBv35/FindVUK 0.96 -0x152BB11C8F8707B6488C2F9CC1687EFFD6059A7B = LETZTE_TEMPELRITTER_B (Der letzte Tempel | V | 0x4AF4DA6F5065FA8380482B66C7CDC141 ; MKBv25/FindVUK 0.91 -0x3DDE7970A3084509E74E1C7EDCF721962FE970BC = LET_ME_IN_3110800 | V | 0x4DAB6949B6F8E7E7B3E7C1A1D1A81599 ; MKBv27/FindVUK 0.80 -0x6347E2E4781C0721A497A149F748A713D5D50A99 = LEVIATHAN | V | 0xA32B018676AA974042706777D8FE02C2 ; MKBv46/FindVUK 0.99 -0x0A364E4DAA1958A6C8E5786D892196C001DBD5C8 = LEWIS 4 DISK 1 | V | 0x1C3C7EB7E751DB2381F4A99D416F9282 ; v25 -0xAE633167053A7CB8749362FDF0251394125B6E4C = LEWIS 4 DISK 2 | V | 0x6319C286B50AC0969770AD8DAA0E12F2 ; v25 -0xD016608447A89FA7C8A456CD0595030BC24A859A = LEX THE IMPALER 3 | V | 0x90D7919749FDBC679730B64870B838FC -0xF57BA8615F47B25A023D589C3D31B4B6BEFD20A1 = LE_ALI_DELLA_LIBERTA | V | 0xE6E9B14F9F41A74DEC9932395B3702BB -0x3875004C2EF40BCF858A058A5FAD2043D0C36F3A = LE_CINQUIEME_ELEMENT | V | 0x4C73A04C6D48BF93B1B656A4E7353145 ; mkb v9 -0xE8B255C9A5A74B1FD7F2B0FE5409BC4511A84821 = LE_CINQUIEME_ELEMENT | V | 0x3B5E536DAFCF2F666BD581A88D683008 ; MKBv15/FindVUK 0.99 -0xAF071480CB2F3016A091F3256CEC55177D01A012 = LE_CONCERT | V | 0x15ACC365AA3468E8A0B3F20F88B86423 -0x2186808F83407DDFE6DD4F8370E5426055C4C715 = LE_DERNIER_VOL | V | 0x1186716E2560537EEC11E3E9E0B7FC30 -0xE86E052D472169CE7F78247D8565ED22E66341CC = LE_GARCON_ET_LA_BETE (LE GARÇON ET LA B | V | 0xA617C8F7206DEF653AB0ED282604F305 ; MKBv60/FindVUK 0.98 -0xFCB685C13A311FF1546236DD164676F91D63DE51 = LE_GRAND_BLEU | V | 0xAACC90168CC03B817D0F57933D99B5B0 -0xBCAF876D5E2C801D2854CADA22B4558F5DEAE83D = Le_llamaban_Trinidad | V | 0xA7477D5617E7E0548DBFBAA9BF45A31E ; MKBv31/FindVUK 0.95 -0x9F56F8D9DA8DDA353235CE1C7B897AAB8236F31D = LE_MAGASIN_DES_SUICIDES | V | 0x396BFEFA4A2E78E369BF63A3BCDFEBC5 ; MKBv36/FindVUK 0.82 -0x85B905E73DA108C93B4D9C1B87FC30BADB1E4676 = LE_MAGNIFIQUE | V | 0x5068309ABEED110285897425B9F08DCF ; MKBv34/FindVUK 0.72 -0x1B111630FCC9EFF542A015301E8700E29DE98683 = LE_MEPRIS | V | 0xA08209239330338C503A126F8B4ED6C9 -0x055ADA601208193C79A6A1686C44427C078A7FA7 = LE_MEPRIS | V | 0xE17B5D54F472CBDC53D2F1DEC2B77F72 -0xE0BEE2E8CE7B4BE9178FEA53B44154C956555774 = LE_NOM_DE_LA_ROSE (Le nom de la rose) | V | 0xA7048C5D1582D265478EB88FA52A978A ; MKBv39/FindVUK 0.86.3 -0xB688B1DCCA2ABB64685316330BAD21A2D544F71E = LE_PARFUM | V | 0x0B58D94B3CB4623FD2088E1E38FD2ECB -0x6578D9006ED78B670537E82F0594208FCD9671C8 = LE_PETIT_NICOLAS | V | 0x3C36EBEF99AC6AB859D07BF7AE304DC2 ; mkb v12 -0x075C1C03BA43E775FBE0F44AD8068F7342E6011E = LE_RUBAN_BLANC | V | 0x41F99171FE9E26690FB0E342591703E0 -0x0724312C3563CFFCA0372129A59DE6DF9F7753E1 = LE_SECRET_DES_POIGNARDS | V | 0xEE7194065170CF22355F90DCD3D13921 -0x668C6F432CDE5D5025B63686586DE0D54FF28B95 = LE_SEL_DE_LA_TERRE (BLU-RAY) | V | 0x4806548D1D1F94C8CA1A032086C4C934 ; MKBv50/FindVUK 0.89 -0xB8E9F95C48DD3D98840D8A9FBF20BB1C506DF003 = LE_TABLEAU | V | 0x8E184B3F37C443B2F1ACE21D99D560E6 ; MKBrev 20 - FindVUK 0.54 -0x79C3112EC8C94BC6D528A4C3AF34348272E88731 = LE_TOURNOI_DU_LION | V | 0xF9C3EDA6504F8515D7FCCE375C6798E6 ; MKBv38/FindVUK 0.65 -0xBB52A5AB57B8398F1BEE48F097BE08C46E65FC99 = LE_VILAIN | V | 0x11E67F9D5A582ABAFDAA7DF2FEA6232D -0x02F246581EBC0C956D40F5B7422DCA3E4EC18773 = LIAR_LIAR_G51 (Liar Liar) | V | 0xE2B75FA826EB5FB64111B2D96F7FFF65 ; MKBv18/FindVUK 0.92 -0x682374C62EB40B6C0F939F693C995E418F84CDC2 = LIBERA IN AMERICA | V | 0xC0EB52A4372932AB931BBBF11CE4E931 ; MKBv49/FindVUK 0.80 -0x2BB2B128D6EFEBFC97AFFE245957FAF1A179C99D = LIBRARIAN_KING_SOLOMONS_MINES | V | 0x6952D4265B37D9B2E21C72A8B9E49785 -0x3798750388E59B4B922F305C1D2CAE36F23FE169 = LIBRARIAN_QUEST4THESPEAR | V | 0x30034726A6917A96E1DEFCBCC627FDA7 -0xA6EED474FA784372757158B8F91491E21FA6AE37 = LICENCE_TO_KILL (LICENCE TO KILL) | V | 0xDD0F4D66D766BF19C1BE95656E2224AF ; MKBv10/BD+/FindVUK 0.99 -0xEA8FB62E47247CBCFEDFDF3D2AAD62C06205E7AF = License to Kill | V | 0xD5C969CF45BE99C902438C9E3AFC84EF -0x1D04E5561289F619FB5D0F04D737C84CEEBDD952 = LICENSE_TO_KILL_F1 (LICENCE TO KILL) | V | 0x3C8FA557072C5D11560D0D1C1EDA661A ; MKBv12/BD+/FindVUK 1.00 -0x2D77EF2F6C4264439C7DEC9EE1CF4F2E1E8D3E36 = LICENSE_TO_KILL_F1 (LICENCE TO KILL) | V | 0x11271FC39BD7AC3FBB152F40E7F503DF ; MKBv12/BD+/FindVUK 1.00 -0x4014D9441B68BF25B67976C2A4773491CB82A9E1 = LICENSE_TO_KILL_F1 (LICENCE TO KILL) | V | 0xD962BBEB358A7C209E92D8B91BE97589 ; MKBv12/BD+/FindVUK 0.84 -0x7AB85B69A53E9085FEDC91075286709640E14051 = LICENSE_TO_KILL_F6 | V | 0x8C351B6761ECED5C6C84024DFB29B80C -0x415B59CBA963E887D50929C8CE7219DDCDDF8213 = LICENSE_TO_WED | V | 0x67BF8BADF1114ECEAF15485BA560BCE6 ; MKBv4/FindVUK 1.00 -0xFF6AA399B683FB2FF0B4B008EFD439CA220DCBF0 = LICENSE_TO_WED | V | 0xF18BB2BE968F632CCFE903A1CF9014D7 -0xB8268AFBC714B501EECC5E0F34A03BED98AA21BC = LICHTMOND III 3D (Lichtmond III 3D) | V | 0x0CC4E3158D15DB94B3C04FFEFAFA7DC2 ; MKBv48/FindVUK 0.92 -0x679E8F71D627197A1860CD811997DEF197AFF837 = LIEBHABER_BD (Der Liebhaber) | V | 0xA3BD37C2CC8D3253705ED48B663A7ED6 ; MKBv26/FindVUK 0.96 -0xF563FCC1AEDDC8BE533F10A58CDB6E61FB8004C3 = LIE_TO_ME | V | 0x436327E8C38AA760DFA64DEABFCB7A58 -0xC011883B13DD236DD52BBF95E235A64F3E1968AD = LIE_TO_ME | V | 0x481BCDA5D1771B151D84675D5587652D -0x5A2B43733EA1EF9C2EF3EE735767029D9D48AE4F = Life of Pi | V | 0xBADF10317FF35E2376A9CBA9EC3BD810 ; MKBv31/BD+/FindVUK 0.80 -0x2B8F15EBC6F879D3BDDB0AB0051A949CC130668C = Life of Pi (Life of Pi) | V | 0xB1ECD9E59741CA0632E678DF4AADEDF7 ; MKBv36/BD+/FindVUK 0.89 -0xB313C8DD50CB874487BFF539443FC8ED6911803F = Life of Pi (Life of Pi) | V | 0x3DA0995154F27194460FD89E47F9F2D7 ; MKBv35/BD+/FindVUK 0.89 -0x3C4C6F25DA3172BACB9ED0F23B2ED12DA7DC992E = Life of Pi (Life of Pi) | V | 0x8DAE454737A21CB8D587ADB1F1641458 ; MKBv31/BD+/FindVUK 0.83 -0x2180D52A61A509C1F160F1A0D12C7630F8559FC8 = Life of Pi (Life of Pi) | V | 0x030BF7DA04E28A3A2930E84780392E15 ; MKBv31/BD+/FindVUK 1.00 -0xF13F537749D5156AFAFECE2B8FA056A590A336B3 = LIFE ON MARS | V | 0xF7475DFB0AD39DF9C0C059325E7469C0 -0xF875DEDD68CC5A530F48F23F0F66A2AD67BC270B = LIFE ON MARS | V | 0x48F74EFF93749E5AEBC911907BF27F21 -0xB2A05216B9281CED4AC2E6E118A7DB23E3233A7E = LIFE ON MARS_D1 | V | 0xA842720F8036663D32BE11EBE7766399 -0xFFC0A3752E2D9042C8EE58192DEEE9FAA8E65321 = LIFE ON MARS_D2 | V | 0x91A9176F41DCE9EC701F915FAC4345DF -0x9B248F5EB36783305C964705787B7A8F09DDAA1A = LIFE_D1 | V | 0xA6CF57223803BB78EC44E4BB8F594085 -0x136B2B9AEAA83A84082B9B04FDAB186BE067F914 = LIFE_D1 | V | 0x2672CC96984D4E82D98352F719B73CAD -0x4969695950875128DE29A1F1EF0B20D8DECCD2B4 = LIFE_D1 | V | 0x2D346CB566E8179F536BD1CB630B86D5 -0xF9B6496EE89D763D753BF5EF83FE83091AE7553F = LIFE_D1 (Life Disc 1) | V | 0xA5DED745C980FE05F9371C6EB18274D2 ; MKBv16/FindVUK 1.02 -0x1DED7F02AEDC7066465EDF1CEFACF63D434DB921 = LIFE_D1 (Life Disc 1) | V | 0x861F083C4151DF8150A5DD5D19E25D7B ; MKBv16/FindVUK 1.00 -0x8F67A123DBC0CCA39A15349ABDA36F21D3EA90EA = LIFE_D2 | V | 0x238F0F8F890941E0DB89D17BD49CE2EB -0x304C86C8604645EEBA9D628E49912CE3AB034FF7 = LIFE_D2 | V | 0xC522D82FEE3EB32F816522DC39B64C64 -0xD097F92D8697EBA64926F1D563FD822FAF7D76C3 = LIFE_D2 | V | 0x6D630396AD23776176BAF6FC70402716 -0x0749F727E82F8A4D5B4CFF8D7CB8514610E40115 = LIFE_D2 (Life Disc 2) | V | 0x73C619B0C5E82D662E9595279D534655 ; MKBv16/FindVUK 1.00 -0xA61875EDBBEA061925186699A3C616F083ECB7C8 = LIFE_D2 (Life Disc 2) | V | 0xB524079A8548D9B39C1616568855175A ; MKBv16/FindVUK 1.02 -0x282D75D34AE9BEE021C5172AD27CA6CF7D029F34 = LIFE_D3 | V | 0xB593CE4A2094EA5B3EEA16D08FB66188 -0xD543C05EEF7FD33720F60442587D103357500D89 = LIFE_D3 | V | 0xF635F67A1690B44D3C50B14849ADFC81 -0x305B1EDF43135F1CE51A62F56D2E339B724F1E4E = LIFE_D3 (Life Disc 3) | V | 0xCB691270B95FAD94FCB1DCE57A68BBC9 ; MKBv16/FindVUK 1.00 -0x6CE6BB9CF0B11B9E37F66886D2E8783EADC57D3C = LIFE_D3 (Life Disc 3) | V | 0x5176F4E38136D519E0771E6BE879D80C ; MKBv16/FindVUK 1.02 -0x66FA1D886C7E7ABC09F1145AB5854B5E7A8F7DB4 = LIFE_D4 | V | 0x85219920D877B1BDA99668230ADACC9E -0x5AE0D12B97B06A96D24D1E385963E47F251B550E = LIFE_D4 | V | 0x45B95794D49209A1BCC44BC42A9F831D -0x9827AA3C70AFE6E630B6C82B11624F503C644E52 = LIFE_D4 | V | 0x2665DDF7CC9EC0977D34D0DF0FBFD301 -0x38FBD112B58F987493B579030A9E6DA5ED2CF64B = LIFE_D4 | V | 0x5D3810811D95E97BD05BEB50FC03A41D -0xB62BBDA7245AFD04566441A3075B546F0831B48E = LIFE_D4 | V | 0xAB050FB2C8C74C4374343A09D10B5F08 -0xBE64BD00228F91F9980F8536F4413A5E1F48D7AC = LIFE_D4 (Life Disc 4) | V | 0x8A4D0069BB1EE0C304C34A4988E7208B ; MKBv16/FindVUK 1.02 -0x038455FD55968924E9D4A4109B158D3E884DA318 = LIFE_D4 (Life Disc 4) | V | 0xB7C42A675141AD5398463A65063D6DAE ; MKBv16/FindVUK 1.00 -0x2FB061D3DC174D245D48C283CB3D4F05B4463472 = LIFE_DISC1 | V | 0x993915C885D7BF67C2C8D62BB88E2E10 -0xE39A063C2D46BC49779D4634D4B2926B2419A555 = LIFE_DISC2 | V | 0x9D53F8B1F1142ECC8E73BB14D6974856 -0xD1B1E3BB00B2826C09FA61E7F712A30937DE0D14 = LIFE_IS_BEAUTIFUL (Life Is Beautiful) | V | 0x3BE294A6C135AEE0667D5E5A13F60994 ; MKBv26/FindVUK 1.00 -0x5F6C44EB1867B2E52041514A73BAA5256FC0A359 = LIFE_IS_BEAUTIFUL (Life is Beautiful) | V | 0xF10BE14586ED41098183125E14BD7AA3 ; MKBv25/FindVUK 1.00 -0x9D12FAC2AD4EFC108E9C1E48E106D076B6926D3C = LIFE_OF_BRIAN | V | 0xF1620AA1B43F3FD4693E28FB5287B3A1 -0x91DEE2AC41EF2C674D7CE95400E6EFBFFD4E355F = LIFE_OF_BRIAN | V | 0x18C4517F431CC23C044FBC7E09FEECA4 -0xCCF7E05F96945772E80413FD05F9B50FA6B27005 = LIFE_OF_BRIAN (Life of Brian - Blu-rayâ„¢) | V | 0x4F7D45736028B0C0C172257245B04741 ; MKBv4/FindVUK 1.00 -0x95A0AD35D2953F958765545F94718175A264BA03 = LIFE_OF_PI (Life of Pi) | V | 0xD3C4852721A3406E33BEEE56AC41B555 ; MKBv35/BD+/FindVUK 0.89 -0x12C2B749B351227AD2C98C396593D2EEBA173BF2 = LIFE_OF_PI (Life of Pi) | V | 0x8EB579B8A10AD98533E485809CE94643 ; MKBv35/BD+/FindVUK 0.89 -0xA383885B56E5E4447B412D4CBEF879B0F3476EEE = LIFE_OPRAH_D1 | V | 0xDEC617C6AFC96DBC8867176C8743DCDA ; mkbv17 -0x07B2AC4B7BD00EC5C2482EEBA5EAB0B64828F2FA = LIFE_OPRAH_D2 | V | 0xD303B4CAD1122D489141402B9BCEAB71 -0x9294A1204005953926321855A4420A69EB526CA1 = LIFE_OPRAH_D3 | V | 0xA278BA8BBE5339782959124251825102 -0x1E9FFF1C5A3CAEFAB6A36E8D104CEFFDA4FAE9CA = LIFE_OPRAH_D4 | V | 0xA5393F263F28B9A39C9C05E22C9D57CC -0xF7180871F4791F1977B69E5A6DA2D4EE058B176F = LILO AND STITCH (Lilo and Stitch - Blu-r | V | 0x75E2EC50F4138E4778BC72BF686104E2 ; MKBv39/FindVUK 1.02 -0xB954B255AD4F77913CC8C464677DD9EF3EDCC87E = LILO STICH 2 MOVIE COLLECTION (Lilo and | V | 0xE9610C82EF930364158EC97CBD1084B0 ; MKBv36/FindVUK 0.92 -0x37ED938D11FC8CE92A923C8461A5098437953130 = LIMITLESS (LIMITLESS) | V | 0x8CE3E1518400093397C68F1CFE0DB18A ; MKBv20/FindVUK 0.96 -0xA5D0BDD080E2C29CD72B973F6C44ED500ED79304 = LIMMORTEL | V | 0x569A09CF9BFAAAA00D089FF0FB8B8FB3 -0x63A07C3BDADF41288791BDC2DE116F6CD272A22F = LINCOLN (Lincoln - Blu-ray???) | V | 0x670F59D9D72AC69EF9351056F7B188CF ; MKBv31/FindVUK 0.96 -0x1B22FF5053D2B49F8F5526CE190043C0FF9B5744 = LINCOLN (Lincoln - Blu-rayâ„¢) | V | 0x37393DF366D169BC4B71EBC1B500A914 ; MKBv31/FindVUK 1.00 -0x5582911F520A82BBABF06C0553062A8320F40767 = LINCOLN (LINCOLN) | V | 0xBF562C909788937B830A05416DECC2FF ; MKBv31/BD+/FindVUK 0.92 -0x7E827F9836EE14C0FB636A5DC9467601EA2C6052 = Lincoln Lawyer NO_SW_FI (Lincoln Lawyer) | V | 0x771CA7A6023CD623F50C1EC12AD6651C ; MKBv24/FindVUK 1.00 -0x9873213BA8BEC9C5BC78EA754C116938A8EF15A1 = LINCOLN_BONUS_DISC (Lincoln Bonus Disc - | V | 0x6C4DAB059AF533D6168261281049C4D5 ; MKBv36/FindVUK 0.96 -0xB09868DDF87E3897EE6EE07931C5C57AD1A517D7 = LINCOLN_LAWYER (The Lincoln Lawyer - Blu | V | 0x3D4327C3DD87DF4BDA56F8EAB83865A4 ; MKBv4/FindVUK 0.96 -0xC7B430F86EFC682E2188920A69429548A07C783C = LINDSEY STIRLING (Lindsey Stirling: Live | V | 0xD85571AF44F4432D642183F9B78F048C ; MKBv54/FindVUK 0.96 -0xD4D5C6905C42CFDC97BC0007E4C51EA12FBB6A7B = LINKIN_PARK | V | 0x7424D1485B639D25890F5915693D8A9B -0x29504328A372B27F8FE698932B5C482881A6D20E = LINKIN_PARK | V | 0x1458458BD68855DD5F7BC9CD59478C9B -0xE7D4C9143C3D2B70D92B500CDBD4C5A94609C2EC = Lions for Lambs | V | 0x7E014C7A911CC6952D2E90DFC9B96E8D -0xF914448A2F6051C87A01847B352A0961E6FECC40 = LIPSTICK LESBIANS | V | 0x2141E339EFB9901263AD17230EA3BF17 -0x7B51952468E8BE6DD6FDF65456AC228039A25AA1 = Lissi und der wilde Kaiser | V | 0x89F13B608C8BB8ED049D4CD2BE077A15 -0x374DA9C05C7E5CF758AF474678D43A04346A2F7F = LISTENTOMEGIRLS BD2 | V | 0x0498769508943CDA788608FCC2669CDE ; MKBv47/FindVUK 0.99 -0xE05C7788F3B3D2C471AC3D43E4A656CEC2FBFFD2 = LISTEN_TO_ME_GIRLS BD1 | V | 0x5AAFD28D2ECA804BB45BE9899AA78DF4 ; MKBv47/FindVUK 0.99 -0xCE21BB51FCDF553AD18B9331319640441E6D1A19 = LITTLE BIG SOLDIER | V | 0x17CF61316FD26FC370D960799DEF7D8B -0xBD3BAC5F509680385CB6723159E314C065967A04 = Little Miss Sunshine (French) | V | 0xD9FD9E94076B433C7E6332B427B2B21D -0x6065D16B2592488D74A18C73C40168CFD5420B5C = LITTLE_BUDDHA | V | 0xA91AD8DD25780788F66C0D9E1B0E4B95 ; MKBv36/FindVUK 0.82 -0x7A5C6F3753EA8BF99397C6AB833EF44E4B4D82B0 = LITTLE_CAESAR_1931 (Little Caesar) | V | 0xD3178FC56C8EFFFDC5C5162B931F92A6 ; MKBv36/FindVUK 0.98 -0xCE9CE5EE919BF1FB2AEF2F49BBD5C3CDAE4D6CD2 = LITTLE_FOCKERS (Little Fockers) | V | 0xC1FE06558B3D5C90679AF7264466BE50 ; MKBv19/FindVUK 0.96 -0x2E21AEFDE40BE24D3EE2D2057D07609326FDCD03 = LITTLE_MERMAID_II (Little Mermaid II: Re | V | 0x993721A7A97CF3E5CA6461EAD862A532 ; MKBv31/FindVUK 0.96 -0x0030C8ABAAAA4E8FF975AD6D0941DAA18CCC12AE = LITTLE_MISS_SUNSHINE | V | 0xB31DF07C212BE7C8699D6EC2E90C3E2A -0xAE6C06429BD62A8568A23EF2E00F6C8D16BEA73F = LITTLE_NEW_YORK | V | 0xD5451AA2F685BA044A8E6D4A26931EAD -0xE53F53E61FA1C1B7175AEDCA8C194F459259C407 = LITTLE_SHOP_OF_HORRORS (Little Shop of H | V | 0x611F6A314B1962463347D3FB970A2BEC ; MKBv31/FindVUK 1.00 -0x5A37821150316331E461880297DBD58153ED0610 = LITTLE_WITCH_ACADEMIA_1 (LITTLE WITCH AC | V | 0xF28C54786E9C21D29B50B4169E6025E4 ; MKBv62/FindVUK 1.02 -0xF24A8B9CC9E149B9DBE45393F06FEC15A85AE0B2 = LITTLE_WITCH_ACADEMIA_2 (LITTLE WITCH AC | V | 0x7CE6E4E264EB2B6EC6C4CD33D6BE5F78 ; MKBv62/FindVUK 1.02 -0x024F5E23A145545725B2E2E5DDA20FE8F829C68F = LIVE | V | 0xE26D8D90F5C424A8C30770E5FF7E992B -0xBEFF52A5F39E7FE1208EE9E7420AFCD857E77F93 = LIVES_OF_OTHERS | V | 0xFEB3B09A3FAE6E5535B3E2B633E51639 -0x95B3686030C4172600C3EA647B3B99E1627AEDBE = LIVES_OF_OTHERS | V | 0xE007E96452B7A886F42CA7D1CC9F852D ; MKBv4/FindVUK 0.65 -0xB673F9FA0987AF53AD7AC5D1F1FAB56E8D25588C = LIVE_AND_LET_DIE | V | 0x6ED9B8D8E1EE79B503D8F19EC35FCA2B -0x9D5DA95B9A764EB5E1EDCF654D372428A6639D89 = LIVE_AND_LET_DIE (Live and Let Die) | V | 0xC59C6084BEFEE0A520CEE6609CB4B4EC ; MKBv8/BD+/FindVUK 0.99 -0x41E818842A1C52C1E39EFCAA7C351B43B23BE9C6 = LIVE_AND_LET_DIE_F1 | V | 0xF015694060F82C1CDF5EA3192A04BBF3 -0x1E2C25CDDCDF136B7C02DFB85DEE36AC69CE8D3E = LIVE_AND_LET_DIE_F1 (Live and Let Die) | V | 0xDE800C18D2373E0E4EEC63BB52D915B6 ; MKBv9/BD+/FindVUK 0.84 -0x1151A4A9119F176BB84F45887046091728DF0D2D = LIVE_AND_LET_DIE_F1 (Live and Let Die) | V | 0xFD8D9170689C406DD6ED0DD7B0E61572 ; MKBv9/BD+/FindVUK 1.00 -0x64F0B1B94884634AFB1DCC578E694575E0C93C51 = LIVE_AND_LET_DIE_F1 (Live and Let Die) | V | 0xB45EF6B5DD8988064C6DBBBD3DADBC30 ; MKBv9/BD+/FindVUK 1.00 -0x2ACB7609BACC16008A1009FDFB10AEBFA93DEE84 = LIVE_AND_LET_DIE_F4 | V | 0xA49CCBE728E024D227FE3148D8242B5F -0x2D28D3A897168397E96D20FFE43354EEF11B34B6 = LIVE_AND_LET_DIE_F6 | V | 0x0A3F1CA622D77D96331EFA109E805C3B -0x344291C4F0CD373D5AB1695D2B296EB574572CFC = LIVE_AT_TOKYO_DOME_BLACK_NIGHT (LIVE AT | V | 0x685AC96A4F86F33F3FC6F4FEC5799E8F ; MKBv62/FindVUK 1.02 -0x8FD0592B02B9E2D0D1A7C1B4D8B208E892571C69 = LIVE_AT_TOKYO_DOME_RED_NIGHT (LIVE AT TO | V | 0x0BB31619AA07005751D64A0A157AC86A ; MKBv62/FindVUK 1.02 -0xB4D97AF29495F064C1C31DF11B646634FC15D352 = LIVE_AV01 | V | 0x295B98B1981CDB363581C2D82527B9CD -0xE0DDAD5E84C7D644E21843B1C3AE27C4FA6CEE93 = LIVE_FREE_DIE_HARD | V | 0xD50349B98CBFB2FE6A0C5D95F7CDDBD8 -0xFBFC7D5019DD4840FDD57E3B32895CE927A1E12B = LIVE_FREE_DIE_HARD | V | 0x9862395514619483D28AB9B5C3B4BAE8 ; MKBv4/BD+/FindVUK 0.99 -0x2724F068C26DE55419E5152B6CF16A9B3A4149ED = LIVE_FREE_DIE_HARD | V | 0xB38C805E78570894AB3C9B9926076742 ; MKBv4/BD+/FindVUK 0.98 -0x303E6E1F76589FFE28F8E786CB6D1EDB0E22C236 = LIVE_FROM_ABBEY_ROAD | V | 0x1030E167DE1B0DBD51E857CF3A46FEDD -0x2F4B1520FDF08862002BDBAC09450D4EC9190F7F = Living Dead | V | 0x5CBD6974505472029560E334E27CE729 ; MKBv20/FindVUK 0.99 -0xFF73E0AF37C57AB0B52E95FB846406ECCA41EC7A = LIVING_FIREPLACE_VOL_2 | V | 0x09E7FD1929093057C26BD9FFAF1E7292 ; MKBv4/FindVUK 0.92 -0x12F7404848A3C2E2B328E28C5CFCFEDAD8F5A8BE = Living_in_the_Age_of_Airplanes (Living i | V | 0xFEBA5B546A1820442B4D9F3F165B68ED ; MKBv58/FindVUK 1.00 -0x9A3ED7108B0C9A7E6CBE0D93611F8EF9BCE9E489 = LKOFSCOTLAND | V | 0xDAEA80685483F0DC9372609DD5A08E7C -0xE689CDAE8D9BB17070C2E617C30BF96F2569D4E6 = LKOFSCOTLAND (The Last King of Scotland) | V | 0x433E1A2715E7D6BCA74B8230F8038CBB ; MKBv15/BD+/FindVUK 1.00 -0x35F76E51DB9312C7B6C2429A72A46B5FEDB51983 = Loaded | V | 0x32B2A43265ECB4C1F6F58119AAA78A37 -0x1F953BFE9E781334AD39E5702F88E997A6C6A1B8 = Lock Stock (Lock Stock and Two Smoking B | V | 0x436D94DD933C8BB5091596A50E083917 ; MKBv17/FindVUK 1.00 -0x4A4B2BBABB690EA2584FA9722403B3120919E7EA = LOCK&STOCK (ESP) | V | 0xC9524CAD12F930DD37A8AC5844E630F5 ; mkbv14 -0x1054BA1FEFECD06A9D3F6698CFBEFB2ECDC9ED41 = Lock, Stock, and Two Smoking Barrels | V | 0xDE0F542B822D0E840FB05DA905316011 -0x2FAEBCF2AB146F849211E5A6FD9C95BC112DDCE9 = LOCKOUT (Lockout) | V | 0x51B4E49DF26B7858D969EC99C69F3745 ; MKBv33/FindVUK 1.00 -0x3CEF3A32DB4EC8AA0EF1BD57C0A391569C8B915B = LOCKOUT (The Lockout) | V | 0x57918A477A2E2D717BAD24D1FCE5C112 ; MKBv33/FindVUK 0.91 -0x42775B88F2FD636E08A8BF0AFDBD49F18396DB38 = LOCKUP | V | 0x8A6E52DAB8981A45AD23DBAE664EAE4E ; MKBv18/BEE/VUKNOTVAL!/FindVUK 1.00 -0x07058A8537D7CE41FEB5EA3F46E84DD44BF1B284 = LOFT (The Loft) | V | 0x40CBB9A48CB6DC2A7F869EE08D962088 ; MKBv54/FindVUK 0.86.1 -0xEB0D4940DAA54DA8A378CF9F1D0FE71CB9E1240A = Log Horizon 2 BD1 | V | 0x5E24DE77D9BFDE4C0FC8B33075D839A7 ; MKBv52/FindVUK 0.86.3 -0x8D6A667D972E3CAE5C5F0D60417CB1A1A6C68D7D = LOGAN (LOGAN) | V | 0xEB8932893096D6BE444A802E1BF42229 ; MKBv57/BD+/BEE/FindVUK 1.02 -0x5C5B913E81D88D000131DC3668146B6B827E999E = LOGANS_RUN | V | 0xDC01985592451D49C9FC6C949039ADA5 ; MKBv3/FindVUK 0.80 -0xFA5832C83ACA94EA817E4EFB25FCD8AA5F7182D8 = LOGICAL_NLDAP_ID | V | 0x30FAAD0DF22C5386B1F0CE97D6295145 -0x57BDBCA689E3BE76B0AAA4374A1EB1E30562445F = LOGICAL_TAXI4_ID | V | 0x57BFE1F7EDD0C59611B027B02E0B40AE -0x0F72B67316F920CCA5510FE24BC35FF11700A710 = LOGICAL_VOLUME_ID | V | 0xF4D8C5C161E2B5B06F1CF21074B5DE2A -0xE8D62722B05D1EE095DA0BF4A588F81675F255E9 = LOGICAL_VOLUME_ID | V | 0x3D17B4AE746E4A6B1C9D3623FF660190 -0xF345F5CAE76A38EDC7A5FBE158DEC7C6E79F6A3D = LOGICAL_VOLUME_ID | V | 0xE0D9CF7AEA65708E5B563E1C5BA4F99D -0xF9A4455506D0BECF820E6DB99953E39ACBDC91F4 = LOGICAL_VOLUME_ID | V | 0xF345366DE3DF161BEDAA2C7A918B3D4B -0x601548F21FF21D799C7031C41C418AAC4A4F780B = LOGICAL_VOLUME_ID | V | 0x4316F0B65D312AD993AB64CCAEC37CA8 -0xCAB9658B87D6A5F6901202B5D52205C54408B382 = LOGICAL_VOLUME_ID | V | 0x060D1247B0F49823AD9CFCFC4932CBBC -0x4D23912A0353261FAF16F6B8A52BF446E00C5015 = LOGICAL_VOLUME_ID | V | 0x184384A20C83274276441AF36C8DEC2A -0x9DEECF9987976B7904EB9D806AEBF0B159556C99 = LOGICAL_VOLUME_ID | V | 0x29394C54C1DFCBC367E75680C2D0EFD6 -0x7EDCE5889781454B87AA0526E626A2FAB5C45B83 = LOGICAL_VOLUME_ID | V | 0xA6A9699B40495186073A9AAC8E9FD297 -0x8120F4B394A2787576BC8D3F597C917758B576B7 = LOGICAL_VOLUME_ID | V | 0x35AA046B78B90B2D3FAEC873A75DE936 -0x8AF2F90E6175130AA8D5A9D56A8BE65FF04001C9 = LOGICAL_VOLUME_ID | V | 0x3CD4470D970662A05939B490D86342CB -0xE53E13E8854B06448E2C168A767818A96EB705C4 = LOGICAL_VOLUME_ID | V | 0x508D11F7EF910CE8581111B4DAD24FDC -0x55967F6CA2B2DDA34A5546CC6AEB640B88ED6279 = LOGICAL_VOLUME_ID | V | 0x90BF95A1E3DE3DC496D4CADD0D23F169 -0x9245242B2B4785EEDA0B4074D1B8B874E5AF3FB6 = LOGICAL_VOLUME_ID | V | 0xD88E6A7E2BD73752675911E2422EF960 -0x3E6980656C8302E752F96236D31C49D0FE4CC3A2 = LOGICAL_VOLUME_ID | V | 0x3DC643952AE87CE9D769CBFD14EA07E3 -0x65FA4436B1596A2EC4275F90B0B3EC2E9616DC4B = LOGICAL_VOLUME_ID | V | 0xC3A5858A9100F4CACAFD87DA4D41BE35 -0x061E36F2E82B795F1221D66A1E1B01E600BBC837 = LOGICAL_VOLUME_ID | V | 0xE75DF4FABCBB7FDF2C14228C010A8EBD -0x8EDBAC875FE9A8CBE9389BF82453E24D9BE42205 = LOGICAL_VOLUME_ID | V | 0xE3322866717B34F818C1C6E65337C357 -0xEFBF50096031E6213823A60C17BE1DE1CF1F55F7 = LOGICAL_VOLUME_ID | V | 0x32C03D2BF72CB2F35176D4661422CBEA -0x420E32EFA85CB3DADDF161ED5A8ABCDADACDFA94 = LOGICAL_VOLUME_ID | V | 0x13089C166B34F0568FEFBBBC3E850333 -0x96DD7536D17D8CAA91D38BAA655CFD2B7AF8A5C8 = LOGICAL_VOLUME_ID | V | 0xCA5B4CA45288BF5F8AB6BE0F085F4AE4 -0x1F2A36465BA68883782A8259A78288749A2840F3 = LOGICAL_VOLUME_ID | V | 0x8A712D4310728884B06D9BCA78509102 -0x130DDC09E2A67CF2ACF1BE9E043DC71BF2CB9B2E = LOGICAL_VOLUME_ID | V | 0x450728E92AAAD3364611868D5A7D47D8 -0x0FAE7CFFF9E7C3664A2116444E3E21AF17A89021 = LOGICAL_VOLUME_ID | V | 0x2865FDB923586EB2835C15A9A75E9BC6 -0xA7E80A6E73FAED6FBE031DB3A2EAF8F06219B0DD = LOGICAL_VOLUME_ID | V | 0x6462DDD753AD2AD02BBCD0A2712E3EB4 -0xF10AB321FCA00D944CB59FBFB5300733370C0E9D = LOGICAL_VOLUME_ID | V | 0x7B975E1E0BEC47CC1A71B865F8348672 -0xB2B916255CA9DEFCAD530790CFB184B17BF2E24B = LOGICAL_VOLUME_ID | V | 0xFD21F323499E89F49A67B2B907F5E630 -0x4D027C8863964F6456CB245F073B9DACBEF72E82 = LOGICAL_VOLUME_ID | V | 0x1D32632BF692EDAE0526AAB9AECFEC8C -0xC15D638DDAE75796BB35A45964C8CDCE7F95F0AD = LOGICAL_VOLUME_ID | V | 0x14D8D4D01E75D330B175C4CC2D89C2D2 -0x68B6902E35E6EB2FB8804B4620AC1ABC40624EC3 = LOGICAL_VOLUME_ID | V | 0x6AE983234C03798673DBBA3FD0EEDCC0 -0xC3B8D67D1A9387FB9C8845740D08221FD4783710 = LOGICAL_VOLUME_ID | V | 0xE7694352436701C97F2FDCA76C13456D -0x25332B4414A1A2B13F5149FD37886F63A0D35560 = LOGICAL_VOLUME_ID | V | 0x6D82FCCFFC64645F271DBC1921B1F459 -0x86CFFFFBF3042D62151ECC3AD0C9F508271A2284 = LOGICAL_VOLUME_ID | V | 0x3F8A2D3CDD0084B9C746C92E4734B727 -0x1AA5EFC3E02F6052D54A129CE74DB088638181E7 = LOGICAL_VOLUME_ID | V | 0xCB7A22336BFB1D0506E11F006471C4F1 -0xFA9CC671B6CEC36C89CDF3D426B78792AF8C37EC = LOGICAL_VOLUME_ID | V | 0x70C0A793A7C5AF723F868760E43859EE -0x2E2A281A4499F25EF651BD61668B5342AE4F01FD = LOGICAL_VOLUME_ID | V | 0x14DDB2B868FD10ADA6D753A216957F7D -0xFE7AECA76D4FCFDCFEF6855ECB16D1D56BCF5ABC = LOGICAL_VOLUME_ID | V | 0x9D724D2C08CC94FF8BA514B45B531B42 -0x676C9D8D72638401C8C8B8078C68F4648765B97B = LOGICAL_VOLUME_ID | V | 0xA4780DA0722D0E37D5725B391612A74C -0xDAC6B834FB33B79AE100A10EB4F80404A7BC0142 = LOGICAL_VOLUME_ID | V | 0xC26EBF294CFC0280107C27E1270F776B -0x792A5E1E3E55BEC636C320045BF58AA3E392122E = LOGICAL_VOLUME_ID | V | 0xB858A7CC1E5428898B67209C6C8BD479 -0xE711CF29B82DB1B1905E607683BA293DDC0F57F5 = LOGICAL_VOLUME_ID | V | 0x5BA1C4902525DDDE1272A8628460EE3A -0xEC1F3CE5CF48E9BEEF6D9C3D347FAF0B02732A47 = LOGICAL_VOLUME_ID | V | 0x01EB150626F0EEB2AB1AD5F2D715CF37 -0x2A844A252B71FC5153C271B8F486399EE6273C6B = LOGICAL_VOLUME_ID | V | 0x1462DA28D72CAD257D71EA0E4A6F1B14 -0x728CACEEF12CE84D8193BDA4C5BE3D32D85BB8DE = LOGICAL_VOLUME_ID | V | 0x5B71F33F8A3681947F27039B9CD1B684 -0xE374C46EA3D9D192F4CD80308FC9A9C0EFD26637 = LOGICAL_VOLUME_ID | V | 0xE3E2F66380C5E589080552BBF059DCE6 -0x6E936A56D260F88ED4263A7648103CD115C6464F = LOGICAL_VOLUME_ID | V | 0x1E3F7CA69628237DEDC563ED02974135 -0xFC8AC3E2EFDC374B0617840D5494F9F6E5D302C2 = LOGICAL_VOLUME_ID | V | 0x496387DB7AAC493AB4B9469B60B7AAF1 -0xCE3DAB2B8C3FE3893FC3EDF1442FE85555D4C9E6 = LOGICAL_VOLUME_ID | V | 0xFA4C892C11BD70829BE57422AA6E4733 -0x150F7AAFCED3B6C7ED80B44D0B4522F78CF725BB = LOGICAL_VOLUME_ID | V | 0x2200C06A65AEA730E660326962A831E4 -0xF62357FDCDF42C7000E29F244FA09FE5E3B584B7 = LOGICAL_VOLUME_ID | V | 0xF44AE16C5A888AE79A43D61CBFC91C31 -0x6BAB628FB5A8E265BF79B0CF226CC71FF13B1040 = LOGICAL_VOLUME_ID | V | 0x0AF75D263B3E879B43897FC32964029A -0x2AD53FD8FD2226DC65513BA9963FF9F7C38917EC = LOGICAL_VOLUME_ID | V | 0xD92A03D505F87A65A63FAFB31366EDBF -0x988532445994B79D8AE4D3110C567DFFD1A572BD = LOGICAL_VOLUME_ID | V | 0x07E38743A86B0141559EC61BBE8B5789 -0xD9952DD166F0E7D3F95B5CB02D76125BC4212CDD = LOGICAL_VOLUME_ID | V | 0x70261AE763CDF5A43BA6BB6C7FD747C0 -0x040598C1D8FB76CA17184EE9CA6B3143273AA0C9 = LOGICAL_VOLUME_ID | V | 0x0DA4E53A82E3BB0191B0610EB4B7D873 -0xC4D7D148C487FE0A0778F9A8B13AC65E6C1C22F4 = LOGICAL_VOLUME_ID | V | 0x329B104A074B2BCCC40954793D77D22C -0x53DCC45514E664B377EB7C0FD2F85702859E86BB = LOGICAL_VOLUME_ID | V | 0xB9417D9ED78B69C9601BEB33BF6765D3 -0xE3B266C8B4A77C765DF1E8216F703F0BCD6649A8 = LOGICAL_VOLUME_ID | V | 0x59903985C972F384E386D238F2B03217 -0x445CBED6CD842D4AA06127B792302440E4C6D6F6 = LOGICAL_VOLUME_ID | V | 0x018301D3E81CE9C26E9D2C3ECC8B09F1 -0x371E03BE0D56064DC4A3FA85C7F3F3E285C9521C = LOGICAL_VOLUME_ID | V | 0x96DE0CCB75A2576F177D37826124208C -0x13E5F6FA42D2575A629DBFDE235E05C21A98756C = LOGICAL_VOLUME_ID | V | 0x0DED9ACB0AF2F916B0D2DC2B71F194F9 -0x22F8CA73A81069F916B59C46FC7474D465C43F1E = LOGICAL_VOLUME_ID | V | 0xABC2A63C40D0DE2068D302FA1B27C1DD -0xA4EBECBB8E7231E194548FADA2E803C21521A0E0 = LOGICAL_VOLUME_ID | V | 0x74537944C7874FFC3DEAE27CCB6E8364 -0x3AFF94F243456539A4F24F2585D821A18BC3C692 = LOGICAL_VOLUME_ID | V | 0x60F4D22AE43B16B3A228E5D4184232FA -0x7211F0744FAF378AF41FC7C3B517399C16BEC31F = LOGICAL_VOLUME_ID | V | 0xF3AE41E613A5DAD189AD8B83F512679D -0x47FBC5052664C7E96CAF9E1399CAA5C2A109F606 = LOGICAL_VOLUME_ID | V | 0x1711A61CD70EBC2066B59541B6B89DFE -0xFEB916923CB308BFCF136AB2EAB435C695789345 = LOGICAL_VOLUME_ID | V | 0xD89B4C5D51076A173B511154B7C61682 -0x6596AB8909F98793E0BBF136FC5CED721BAA4CA9 = LOGICAL_VOLUME_ID | V | 0x5D5DF19B16908405EA13C8F2E181C20B -0x9EC6F23E8D163D18032BD7B73DD1A19758623E00 = LOGICAL_VOLUME_ID | V | 0xF7E7D27FD9F566B4413682E5F11955DC -0x31221A7F7F02A9BFEF80CB9D2DB59266EA3C6F88 = LOGICAL_VOLUME_ID | V | 0x4780212955B544A75B5ED00A6A71196B -0x9251208A76D07662676A32221587AB24A5B90CBC = LOGICAL_VOLUME_ID | V | 0x46BACCD5858C7A3E1C235130D82061F7 -0x9BD41A6257B79A17621F397182057F14BA2A18F4 = LOGICAL_VOLUME_ID | V | 0x3B005079BB6D6B94DB51869298D1DFE0 -0xC053AA9C39BECC6CCC649DE5E1E0688C78B25D28 = LOGICAL_VOLUME_ID | V | 0x3BCA327DE22F9A9F4FA4EBB61C72A5CB -0x3652B6D329C42215B72294D6814F847EDE1847D0 = LOGICAL_VOLUME_ID | V | 0xA26A0443579BA068772ABD6D14778974 -0x6E37F4975F9B3D6A6CEB469CBC295A7935ED4532 = LOGICAL_VOLUME_ID | V | 0x2A4FBED395BBF1B62B687D039EC2D5FE -0x52B1AEBB9BB14B29106FFF0C7694D1EE8B2783EC = LOGICAL_VOLUME_ID | V | 0x476AD1120B526E4BA4290005C16E0443 -0x003BF12D736A828C11CAA1629090CA234AE53B1B = LOGICAL_VOLUME_ID | V | 0x3A1273F4C36F290428BA5E076FF2157D -0xD0C4813CE62C642E7926D2C4F2C03579A682EF2C = LOGICAL_VOLUME_ID | V | 0x993E4CAC6067526EB658A0DE4D6B9581 -0x0BFEACF73C22F6597AD29E85D274229CFFFA71FB = LOGICAL_VOLUME_ID | V | 0x724A330E955A776980F75744D7E48AAB -0xEAD03262357611278FCB5970754F80962DFFF5DB = LOGICAL_VOLUME_ID | V | 0x31753B67A9BA415AFADA9DCE81D5B2E1 -0x72CB3B8C1141117D23D5FD5D7584AFC84F117160 = LOGICAL_VOLUME_ID | V | 0x54813D09C7BEF0B19EF68EDFE0CE3113 -0x156413DD6E6A80C9D8D245D9AF7C50665D077D76 = LOGICAL_VOLUME_ID | V | 0x020F93594D86CACEA568F507342B913A -0x13031B1185F7145EC9E5E776987A52C81EA81AD4 = LOGICAL_VOLUME_ID | V | 0x2028B61067AA3125A7BAD3AC43F42EAF -0xFD85BB3B724D0C0C7719E307EE36696A55DF0A50 = LOGICAL_VOLUME_ID | V | 0xBB81E4294CED7EEA850FF8391AFCCE91 -0x52B379EDF51E884C1375D2E0ADBAE6085D65BCFA = LOGICAL_VOLUME_ID | V | 0xF9CFC69D3FA34F1CFF6216D7141F8A21 -0x9245CA325FE63D2FC8DD18AEA9D60CBD01CA5E79 = LOGICAL_VOLUME_ID | V | 0x44A357808A9A5FA861D27BD3D45128E7 -0xBD7F375639366DC5675F610A6B32906689157316 = LOGICAL_VOLUME_ID | V | 0x00444ADD4B9BFD979C67E41E8136C6F6 -0xFB8C643FC02F25673ACC4ACA24C87CF360D5FCDA = LOGICAL_VOLUME_ID | V | 0xC439953C42DE336F4BD3E6D92EA44C5C -0x2FA2E77870750EA52EC747D98C4AC7B0E57DA54F = LOGICAL_VOLUME_ID | V | 0xF7EDFB0506F89D19C5F1CE4DBBD6B14D -0xB2F70B16D41E51205E64F5DC7B20171A7311ECAA = LOGICAL_VOLUME_ID | V | 0xB43393F40A08A40C4F8CB3EE5B51FAF5 -0x6188CE1765B26DA66FC3704E5362B9B14336162E = LOGICAL_VOLUME_ID | V | 0x420BD844E991DC53E5F3D41E880D18A2 -0x12CAEF48799860236592448B239CC61B5ABE98AE = LOGICAL_VOLUME_ID | V | 0xB4FE042361BAD61619661D0B1F1F0B7F -0xDEB7D47EDDE7931FAECDEDF9A8F6A0AF2F72B9CD = LOGICAL_VOLUME_ID | V | 0x2573874BD7480E2478502F6AE5924E02 -0xB33F4C9F3A68A33C55E2B1CE26908CB3201C4D53 = LOGICAL_VOLUME_ID | V | 0xC376FA677660D53ED4C834F68E50060A -0xEA14EC226D05D89FBCFA0C5C448CD8B23DCBF55C = LOGICAL_VOLUME_ID | V | 0xF90BA6413D0B8E771240ED30B6BD38C5 -0x3C1AE7164BED468EA7EB4E9D85240DBEB889D9F9 = LOGICAL_VOLUME_ID | V | 0x3AC8B68EF0B070F9ED1B2B3F6F3A392F -0x3045E5D1F027B16D64F15961A7F0DB4AF6218E39 = LOGICAL_VOLUME_ID | V | 0x322B257486F6B58A8DAE4965C7811A1F -0xC8E126CAACB733117C3F5E15DC03C41AC180FE6C = LOGICAL_VOLUME_ID | V | 0x02AE927C843173E8DE555EDF77A5692E -0xF05BB08E06A1EEB33EEC5CFDE41ABA8BD0AE58F1 = LOGICAL_VOLUME_ID | V | 0x3BDEAD1A1A9F904113A91034EA99C4F9 -0xAB5071C30C4F88E9BCF91B66212ABA6AA716EAF5 = LOGICAL_VOLUME_ID | V | 0xBE84662C519CB264AE2D8C9064457301 -0x35164D5464A8649A9AE485004E9A0CA771C57C3C = LOGICAL_VOLUME_ID | V | 0x4D06C3B74FC4E924CE4CFFB59B487C85 -0x92C8AACC0A7772F515EC721E718A94D98FA37073 = LOGICAL_VOLUME_ID | V | 0xD2A762CB96BF02C46B8333386640BAC8 ; EUR/GER/ENG/FR -0xBE2A0062D56EC31B7A48C26BDC54EAD33069432E = LOGICAL_VOLUME_ID | V | 0x3D6D6C383024A9EF370C680568149C54 -0x4AE2AA4786A85F38C0F12FC7B442D90B19BC071F = LOGICAL_VOLUME_ID | V | 0x80E79213C28BFA1F383DF19FDA16B72D -0xA33769029DD7D41BA62CE226E2CC081AF8290B20 = LOGICAL_VOLUME_ID | V | 0x7467D81183841085B9BB8C5D15AC9DB5 -0x66A219912B5BB7F3226C6FD9F50C314FC3692757 = LOGICAL_VOLUME_ID | V | 0x87BCA4F5C0F32B2632F48B6F0ECE0FBE -0xB253B0891634F4D69A5B154C7E8ABD46B6F4A70B = LOGICAL_VOLUME_ID | V | 0x4F6FA9BF2731B5E6AA3BFE8795F70BE2 -0x5C05D2FC8534C343A517D9394FD249840C5B0309 = LOGICAL_VOLUME_ID | V | 0x0174A246D45B77D62A4F74FA235EA2D7 -0xFA9332FFC9A1ACFDD6C5B6EC05FF593801261A72 = LOGICAL_VOLUME_ID | V | 0xB03876118E376FB50E62005403167D3A -0xD8366CC4636DCA70DB302A5F4DA08CF50B6C1EF7 = LOGICAL_VOLUME_ID | V | 0x55B304698D47FCB1F39C09624B2B90A9 -0x7BAE08AACD02C7711EAB5341525ACA9871700A98 = LOGICAL_VOLUME_ID | V | 0xAD367F938B1772759203BA8B598BEB6B -0x20387582540CDC586BA223FBCDB2B2CDF6B88A8B = LOGICAL_VOLUME_ID | V | 0x24A1B11D407E677138BEDDDBC2F3EB8A -0xE3C6A29CAC16BC8CBB91FE21641EB0C11173FF78 = LOGICAL_VOLUME_ID | V | 0x995A9EA2ABA4F8D2015F74C4B9070C9C -0x4E576AC6B560CC03662158F49B7F1E3136F5B25A = LOGICAL_VOLUME_ID | V | 0xCFAE4630C8B337296C571307D456679A -0x5A5C0153819B164A665A09D7BE398D5A78B4C0B7 = LOGICAL_VOLUME_ID | V | 0x1BC97465259AEC13388E19F0554BF028 -0x7BDA72AFA16D3B2EECE88F9F25A0E07558129D30 = LOGICAL_VOLUME_ID | V | 0xA81091C11FB9461AFE7E9C34BB4F9839 -0x02E30F3C13D8D0FB5E2405A720167B5E377D91E7 = LOGICAL_VOLUME_ID | V | 0xB437C9E69B8FA7C550DA734285267A29 -0x96FB4026AE1E458D1AADD904C4C7EA4C40792B36 = LOGICAL_VOLUME_ID | V | 0x33ABE07614F163ED951017F71F9A03F1 -0x12C563A76BC6E29BB5F47E4900C6FD388E4957AD = LOGICAL_VOLUME_ID | V | 0xABB318B901F339C73B8B2ED32C854F83 -0x04C11F755193984E3DC964EEE4B615CA1D11ABDC = LOGICAL_VOLUME_ID | V | 0xCC6CB77F55A310C8D9336CFFD3D0CE06 -0x7DD34B63B95AF7094CAD5A1181077656AA7E378B = LOGICAL_VOLUME_ID | V | 0xD8570E1DC98555E1D984836120757CE5 -0x0334994DFBF746C43AFF705C82789CAE47CC528F = LOGICAL_VOLUME_ID | V | 0xDB3F124064B86DF4A924AF20A1325776 -0x9E49984B0ED709124EE6A79E0BD87B0EB8510D89 = LOGICAL_VOLUME_ID | V | 0x23A0B6F2AE29F8CE8E2EAA5C2F665284 -0x17694F04C815088FA98C427284CBA36B7BA88025 = LOGICAL_VOLUME_ID | V | 0x3AF3EB1AF91C1E725FA517263F79E3C1 -0x655F51336627F2602C06B9020A9B08306C1E8B76 = LOGICAL_VOLUME_ID | V | 0xF430DACCF141AE71749330EEFE75B4F8 -0xD835601E434E35A764E20213C79A36A0BC9EF4A6 = LOGICAL_VOLUME_ID | V | 0x7F8E2E9AB5C21CE2CE741C8BD4E64B75 -0xDEC6A6F07296583F4B6FF6B015FFD635A9AE00FC = LOGICAL_VOLUME_ID | V | 0x4EFCCFE6E846D83188E4158FE1612312 -0x5824F26773CA74668EC2CCBB5D648EB343AD2B4B = LOGICAL_VOLUME_ID | V | 0x7218E37FF3195C294FF0D1C391D2E99B -0x7585BC3355182EAC68C422C0D4B3ADD7C31E1FFC = LOGICAL_VOLUME_ID | V | 0x3773A0CF9888FA89909BF53D62299F3F -0x238BC410AA10566171109914D34911BD33FA561F = LOGICAL_VOLUME_ID | V | 0x81DC79BA4483D74428799E601250BA76 -0x4B2C9590B46A66ED2514BEAE1F64D0E5BC4750C1 = LOGICAL_VOLUME_ID | V | 0x5AB33A453CA489BDEC36823A2CAAD77E -0xA7ADBF38DA6E6345CD73F058B33275EF0F555777 = LOGICAL_VOLUME_ID | V | 0x4E434CA66E25624CAAE218A8AF758EE3 -0xB6ED66ED0B45BD81D2E784BD2E3CEAAAC82DAF80 = LOGICAL_VOLUME_ID | V | 0x4203DBC47950E6E2385E887B58B3FD77 -0xA00A4081E3FE9EC661030D383701AFCF4D78BB94 = LOGICAL_VOLUME_ID | V | 0xE2D0B090CC946E2E5B01C380910144EC -0xAF96B8C25871EBB9AA6F7D92CBCB0044ED44BB32 = LOGICAL_VOLUME_ID | V | 0x04FEAEEF051F442ECE95FBEE8E98FC50 -0xA609D432E1ECE85DEA6135A5541952E15230D2D6 = LOGICAL_VOLUME_ID | V | 0x9DF3F5C93E79C17D3F407090F2CFB83A -0x165CFA64110D4CD8FFA91C709247F882801ADD11 = LOGICAL_VOLUME_ID | V | 0x7AB9253A0477D887DA9176F1FF452E0E -0xFC42CE0A742036270D43A6058C5D416E9D818DEA = LOGICAL_VOLUME_ID | V | 0x311FD63BFD563D21BCE006A1FA96F5D5 -0x49B11C56C4FA673D5366F276168F12C4CDDDE79B = LOGICAL_VOLUME_ID | V | 0xD446AFABC3DD97EB0E52AD6316EC17B2 -0x7679C23E766657B023F0518A79999B48689499CA = LOGICAL_VOLUME_ID | V | 0x85254AAB410DCA51AA269875F18EE737 -0xE284FB42C6AE7918BADF994DB09D392F2A57503D = LOGICAL_VOLUME_ID | V | 0xFFA51EE49D01F60F1C86C6DCD1E8DBB0 -0x4BF395029536D7BA933BB97FD379FE415EAAC459 = LOGICAL_VOLUME_ID | V | 0x420975D462AE1D686B99F45A9E73CFE9 -0x0C9F4DBDFBA72B6F5929865D09B6BDE95FE84771 = LOGICAL_VOLUME_ID | V | 0x6B6A3D506271243FF8C1D1A5D0D94503 -0xADC6D7C1B3CF3D3FE5A3471AF4F2D6591FB2ECE9 = LOGICAL_VOLUME_ID | V | 0x71CFB5A8794055AA7112162F5C6BEB6C -0xFD3913D566E91247D059F2862633E3B65F25FA66 = LOGICAL_VOLUME_ID | V | 0xAAEFE0C884682A959F88E5018C9A359C -0xBAD80FFE79D1B12E1AFE8BF5F2D51871215692C8 = LOGICAL_VOLUME_ID | V | 0x7FE8245AD29DADBC2D4E3F3DC2785DD4 -0xAC1CD7B2443A72FE0831E6ABF1AC0E546EB277B5 = LOGICAL_VOLUME_ID | V | 0x84CE38DA81E64B2B40A1BC8999CB0608 -0x13978D0DEA4ED03A1D06AA958F653FF1EAF85CA2 = LOGICAL_VOLUME_ID | V | 0xB5FF3144074DCF8F395B23A4B5B2834C -0x66F8A8C9F30F6F9DDF697F2B335FA61F9B1C6A9B = LOGICAL_VOLUME_ID | V | 0x4492DFE609DF03920AF99AF7B39AAD09 -0xAC4F64805157AD558E42D11360BCA746C0CC5225 = LOGICAL_VOLUME_ID | V | 0x643CC082B91A6FE174E67B61FE323D4F -0xBCEA4B2BF554D3A0E766FE51B7CFE3E183306778 = LOGICAL_VOLUME_ID | V | 0xB0E43B9E06A234EF8348B592ECD98E9A -0x6E84468807E290FC7528A01964831FAC51CB412A = LOGICAL_VOLUME_ID | V | 0x43CDE731505FC97C05BC84F2AF1FC528 -0x30E458A7A8F080DD33B836D07A13F94631FB2503 = LOGICAL_VOLUME_ID | V | 0x95C5E922B9124712910B18714DE5B232 -0xCAD9676E7DC5D46B787515048AE39DDFB87713D4 = LOGICAL_VOLUME_ID | V | 0xB77EADA5ACECE0EAF5C43CC809C37DD5 -0x8044D903A6E6EFCD1BC9E420D12E8937CE908ED6 = LOGICAL_VOLUME_ID | V | 0xBFD4CB1DCE844EB4B885810C48BDA546 -0x3F653654EBA539CC73BA6328B059F9A35B49A644 = LOGICAL_VOLUME_ID | V | 0x64260AF7704BEB2A15156023675172E5 -0x77BDF228382CB545FC0F61768C8ADE2347AAFA70 = LOGICAL_VOLUME_ID | V | 0xC0D23C771DC7E820FAC7728892FD9728 -0xA749C434E286E24093F82F06FCA7DC1A8B240BE9 = LOGICAL_VOLUME_ID | V | 0xB0D0A2525731E3AE644AB8FEFF16B658 -0x6683BBF7B09D81451019A3792FB5675B19C37979 = LOGICAL_VOLUME_ID | V | 0xFA5F1D1DDC659360A94472FCD1DAF7F7 -0x189FE95DC96E375A2B3230FAB74A60940A6ED7B8 = LOGICAL_VOLUME_ID | V | 0xE973C9C6323A6BF795BF3696BC4DC92C -0xFCF7802D90734E23058EB0F0BBB4B608CE8C3D36 = LOGICAL_VOLUME_ID | V | 0x81F4D55ECD744FC0224F93AFD7857FCB -0x06B0FDBB82140C0EB0954DFEE68A40DA97802AC1 = LOGICAL_VOLUME_ID | V | 0x407BFC3336962CE46877365E1B4C9710 ; MKBrev 3 - FindVUK 0.57 -0x3191E0A6C6C19B45B1438E519696E29936AEE2DA = LOGICAL_VOLUME_ID | V | 0xA021B0532C06004EB59BEF3BE74FC1D2 ; MKBrev 7 - FindVUK 0.57 -0xD2A78849D8F463E658E8CC89B38658803AA7BFEB = LOGICAL_VOLUME_ID | V | 0x829444DB5BEBC23BF9C16B9EAC38E782 ; MKBrev 1 - FindVUK 0.57 -0xDE8FD679BB05D7F00136D46ACBDB4DFC8865F6EC = LOGICAL_VOLUME_ID | V | 0x1190811A987F7FC64980075A122DB444 -0x6CCEE15E0C3260A79BEB234F00F11D62C41887A8 = LOGICAL_VOLUME_ID | V | 0x8A0213BAB2D9BCAF99CE37C234632F8B -0xF6A0CE2158B9A1C2CFAD87B42B8ED90AE4B373CA = LOGICAL_VOLUME_ID | V | 0x198173F257DED12C95C7E8D254B39272 -0x0B4073DAF10DEBFB9F403068E100C6AA934BF421 = LOGICAL_VOLUME_ID | V | 0xE0814649DA7E3CBFBBFE1F0A4AD86E98 -0xBCD32A8BFD453F3DAB52F08B4A17B0C35D884926 = LOGICAL_VOLUME_ID | V | 0x4989486D25EDDD2969FB7E54FFA84B71 -0xBD25FBD8B24B4210E06FA1C72CCE749052D7EC0E = LOGICAL_VOLUME_ID | V | 0xB8A4D9452F0D401106CCC587E9493A3E -0xF0D681B3265F5E087970E31DEF35E66AED536F6F = LOGICAL_VOLUME_ID | V | 0xBDD102198B8304D855F60F0BD59A38B7 -0x0EB3D938C395BA135EEFD39F9271DBE475D99305 = LOGICAL_VOLUME_ID | V | 0x4BE33A008A45DFC77479B8A7C789323E -0xAFEAF46BD728BBEA7EFB58F4DAF802CF94DC1EC8 = LOGICAL_VOLUME_ID | V | 0xE1036309D7D5F4457047905FDEBCE2BA -0x7667BA6380C4BB7B16CF9AD7BDE3A5FAFC5C1CDA = LOGICAL_VOLUME_ID | V | 0x16BF3C5E0136A677106245EA09446ABA -0x7B884DF51DC3E542837160FE8B0258259F768251 = LOGICAL_VOLUME_ID | V | 0x3359F1D7439EFA7106B6696AEC7352A2 -0xA84515719B2977D15172B727AB9DC4C2ABFAB5BD = LOGICAL_VOLUME_ID | V | 0x4F688ECF5690B176F3D0E2C501EF7179 -0x8F4D023EBE48B90C5D361241EE178E7E0901D506 = LOGICAL_VOLUME_ID | V | 0x990757E670645F8149CC47F480E66ACE -0x1808E6D97D60D1D882503A947BA906AC0F00AC75 = LOGICAL_VOLUME_ID | V | 0x134E408F110FAD65319501E137161806 -0x2CCC522CE0C26F04F4015FFF9D3EE9D4E80DA43D = LOGICAL_VOLUME_ID | V | 0x61B6A65446D6F1AF353F5F7AF7E546D6 -0xD792657B9B54F8CCF9602CB74ADB74997316737D = LOGICAL_VOLUME_ID | V | 0xDCC6FECA9FBA0A011681636EC81F529B -0xC00A84190B9DA8A1BBE98096F49AE7C736A37B5D = LOGICAL_VOLUME_ID | V | 0x61BFE1F3BFC4560498CE2281E27AB286 -0xE5A97F687560491A02BF483754890F61BE89F230 = LOGICAL_VOLUME_ID | V | 0xDADB6BD8BEA16CFD333472701F138554 -0x611A725455F90601F6FF9DC54DC83D94FF9BEF05 = LOGICAL_VOLUME_ID | V | 0x80205C5A662EB7581B4820B2B2143205 -0xA284DE334FEBFA11153908F0969CF65AC5C36BB5 = LOGICAL_VOLUME_ID | V | 0x984575C99FB2ACBA2103E9548139E2E7 -0x0565211CD5FDA6D1AE15B0519446AB6FC49153F3 = LOGICAL_VOLUME_ID (Spider-Manâ„¢ 2 Blu-ray | V | 0xE8339EF75F6D6C1C16C659D91118A8C7 ; MKBv3/FindVUK 1.00 -0x7DACD3885D28D7C9E1EF04BE6CEC231418460689 = LOGICAL_VOLUME_ID (Spider-Manâ„¢ 2-Blu-r | V | 0xE5D4D2C78A0404CCDF24C22B838BB878 ; MKBv4/FindVUK 0.99 -0xA04AD4363C6D0CC2B32D06337F46BE6905493C87 = LOGICAL_VOLUME_ID (Spider-Manâ„¢ 3 Bonus | V | 0x63BB229E5DF7D4EA06088701DAD5844D ; MKBv4/FindVUK 0.99 -0x802EAB3F5805384406824924132957AB2855EFFE = LOGICAL_VOLUME_ID (Spider-Manâ„¢ 3 Bonus D | V | 0xB15A828FAF868BE0F5031777A3127BF9 ; MKBv3/FindVUK 1.00 -0x4AA3D867181E98F177B22FD78522081765B9BECF = LOGICAL_VOLUME_ID [50 First Dates] | V | 0xFD2A3A7913274D1A7587E1E8D21CBD11 ; MKBv1/FindVUK 1.00 -0x88372D700BDADDEBD04C975F338ADD618F8954BF = LOGICAL_VOLUME_ID [A Few Good Men] | V | 0xD601E2D2228EC44EB244EC1F373B003A ; MKBv3/FindVUK 0.98 -0x7BC72A389889BCD1D195753F961DD7026F27F1B3 = LOGICAL_VOLUME_ID [A Knight s Tale] | V | 0xF04C198CBFE40925BF21B45DE8C809EB ; MKBv1/FindVUK 1.00 -0xE8DBFC99304069D14EF45837CFB9F5BFC1F95F9A = LOGICAL_VOLUME_ID [A Knight s Tale] | V | 0xFB3F9F82B6E7B881E50DCE2DB7B206F8 ; MKBv1/FindVUK 1.00 -0x068F83213FAAB60EEF4968934E4966489D99D044 = LOGICAL_VOLUME_ID [Aeon Flux] | V | 0xC576410020054B91CB774375DAD6FEB0 ; MKBv1/FindVUK 1.00 -0x5C587FD4313F6284431C041BB7876F5208DBBADF = LOGICAL_VOLUME_ID [Aeon Flux] | V | 0xF16E5F1DF95B6516D889061E951F2AD0 ; MKBv4/FindVUK 0.98 -0xE346215ECEF70CFDB5A16D2611F16C9C90BC4CE3 = LOGICAL_VOLUME_ID [American Psycho] | V | 0x79456DED1EDAB90CC61F9E6EDBFADF31 ; MKBv1/FindVUK 0.96 -0xA067DBAD301E6409F162CED0EF15C4FDBC89753E = LOGICAL_VOLUME_ID [Antarctica] | V | 0x27326899305EFDAAF76A238EE593916B ; MKBv1/FindVUK 0.89 -0xFB353AF52844E6C327141B837E9248DC8A4A1353 = LOGICAL_VOLUME_ID [AvP] | V | 0xD4EB434C1F2E66260534F4B540412D77 ; MKBv1/FindVUK 0.96 -0x07FAC686390B456FE47C3F541FE91DA3883EFF7B = LOGICAL_VOLUME_ID [BABEL] | V | 0xAACE986EA5FD63408270DC2591F30446 ; MKBv4/FindVUK 0.96 -0x7FEA141C2CE8C0B14E1E21F1B6AC030A77B01751 = LOGICAL_VOLUME_ID [BLACK HAWK DOWN] | V | 0x58A0C16704BC2F913501ED6DEC7D5CCA ; MKBv21/FindVUK 1.00 -0x50B4C1ECC66E8C1507A9B4B209361B57B43AF9F6 = LOGICAL_VOLUME_ID [Black Rain] | V | 0xD4A8A7DFE047588131000F911F25588B ; MKBv4/FindVUK 0.89 -0xE35FE780D69B7AEB92741AFBE315B3671D0DE84F = LOGICAL_VOLUME_ID [Casino Royal] | V | 0x0E7BC3086410F6676279EEF4BA082418 ; MKBv1/FindVUK 0.96 -0x9DF9331DF0BDFA8F763B0258F401AAFE092C7A8A = LOGICAL_VOLUME_ID [Chain Reaction] | V | 0xF521FADDCFB97648861C65E5D6933A3A ; MKBv1/FindVUK 0.99 -0x8B7204A244C314B4A60E88746532F50E51FC4BF2 = LOGICAL_VOLUME_ID [Chain Reaction] | V | 0x099675406EDF85CA9C42D793B791DCD1 ; MKBv3/FindVUK 1.00 -0x8F3870027C56449270C22504DC0EE736E29158A5 = LOGICAL_VOLUME_ID [Click] | V | 0x5928C17E732E17FCC896401715556D07 ; MKBv1/FindVUK 0.80 -0xFF1A34664E66B69DAA8AA881FA81F5B6E67C2A7D = LOGICAL_VOLUME_ID [Deja Vu] | V | 0x4BE0572EE97A5F2DDC463FAE5F99C669 ; MKBv3/FindVUK 0.98 -0x8505A7B9D603EAF2E7BAACD226675ADEB48F6B76 = LOGICAL_VOLUME_ID [DEJAVU] | V | 0x5BAF5D46A259D17F79A7AE46F33FC9E6 ; MKBv18/FindVUK 0.96 -0x9EF8DC7C3D4B157B1E3124E117E0F2057F0969DB = LOGICAL_VOLUME_ID [Edward mit den Schere | V | 0xACD51AF01DD6EB64C5A0973FE464EF6B ; MKBv3/FindVUK 1.02 -0x290392CDA9EF76DC470849316DD76EA1A8FF9A8B = LOGICAL_VOLUME_ID [Fantastic 4] | V | 0x7A9F61951C68087D32CF8C72D30A338C ; MKBv1/FindVUK 0.99 -0xBB41AA948328B7AE020EC4A7A66E0F5401FCD27F = LOGICAL_VOLUME_ID [Fantastic Four] | V | 0x4D0E285A0B8038EA5046EAFBC385989D ; MKBv1/FindVUK 1.00 -0x2806BFE65D7390540B5E709D5BD6B19C7A9FC445 = LOGICAL_VOLUME_ID [FINAL FANTASY THE SPI | V | 0x62468EEA20B7ED70164F547E487CC365 ; MKBv3/FindVUK 0.96 -0x0044988A11CFA5D20B0FD27A14408E82AF9EC620 = LOGICAL_VOLUME_ID [FIREWALL] | V | 0x57B8B76A51D22739B156E34D004C4B24 ; MKBv1/FindVUK 0.96 -0xE2990289B2C15F5258645349806A9B65C612DB52 = LOGICAL_VOLUME_ID [Firewall] | V | 0xA085A18BB12F065F817C2BA5AFA5F0DC ; MKBv3/FindVUK 1.00 -0x9A9C054BEBC077BCE5AD5691E9B96AA5E497C7CB = LOGICAL_VOLUME_ID [FIRST_BLOOD] | V | 0x79AFB6F6EEA6D8278FE705267ADE693A ; MKBv1/FindVUK 1.00 -0xE17F4D8964AF70C97327961CA1AAAA0033463DF4 = LOGICAL_VOLUME_ID [Flags of Our Fathers] | V | 0x2795B05AB178EBFA397785C291E76187 ; MKBv1/FindVUK 0.96 -0xD1D5515944DA8D2BD64527B69F5CFBF2934364FE = LOGICAL_VOLUME_ID [Flags of Our Fathers] | V | 0xD520B04D4933BF4264B9CE3CCD8FD77F ; MKBv1/FindVUK 0.96 -0xBDBE77C2FB71C45F921767ABF3B483F13E42DDCF = LOGICAL_VOLUME_ID [Gone in 60 Seconds] | V | 0x886E9CE013C85DC302356017CADB0CB9 ; MKBv1/FindVUK 0.99 -0xDEA91F8E3EDD1AE6855ED9233C3C2B8FC961F4AA = LOGICAL_VOLUME_ID [Goodfellas] | V | 0x918A0D9A28AA86A2EBF3CAA6FF8B3BF2 ; MKBv1/FindVUK 1.00 -0x12A6C3646215C83D1EEA029A0BC3F7247A53692B = LOGICAL_VOLUME_ID [Goodfellas] | V | 0x2155A6358FA565C49381D8E965F02D76 ; MKBv1/FindVUK 1.00 -0x881850D52A32F03E27F52A3C6EF8B2E8CC4D7996 = LOGICAL_VOLUME_ID [Gridiron Gang] | V | 0x839142FCCF70F746CA7D87C6E66FACA6 ; MKBv1/FindVUK 1.02 -0x2C7E72A04D88D889A748A82658E513889E18E574 = LOGICAL_VOLUME_ID [Harry Potter and the | V | 0x581AAE0F8244EB1489763B4AC5F89B22 ; MKBv4/FindVUK 0.96 -0xC2521EDCFE8A30A7D1148149ACC14246EEEBD522 = LOGICAL_VOLUME_ID [Hellboy] | V | 0xFB509E09D562B48AF1C1E842A0E4CCD9 ; MKBv1/FindVUK 1.00 -0x5C1B566522D1CEEAC8A004F6F95194489803258D = LOGICAL_VOLUME_ID [Himmel und Huhn] | V | 0x6EBE0AABEB3AFB26461F41FA223F3C55 ; MKBv1/FindVUK 0.89 -0xAE33C48E3AA7DC3EA3ABEAA0099854DDA877D50D = LOGICAL_VOLUME_ID [HITCH] | V | 0xF714FB6B91D73972BAE5A6DE4108B165 ; MKBv19/FindVUK 1.00 -0x9AAC14383450FDB627598FF7A94A9F991AF214B0 = LOGICAL_VOLUME_ID [Hitch] | V | 0xA248BB8970136A3A7A4C24FBD1A1B772 ; MKBv1/FindVUK 0.96 -0xD1E78C902D92140BC82472AB052F1D919E426F70 = LOGICAL_VOLUME_ID [Ice Age 2: The Meltdo | V | 0x380C2ECE3735CD79E0140EBAEEE37402 ; MKBv1/FindVUK 0.94 -0x65824A2ECE404654C186FC677D16472DE3C8E5B0 = LOGICAL_VOLUME_ID [Ice Age: The Meltdown | V | 0xDBEAAD1DC4F5EEF556E5FBA01C95606F ; MKBv1/FindVUK 1.00 -0x94898BD4DEF700C2C5837A537C07FF683935C801 = LOGICAL_VOLUME_ID [ICE_ACE2] | V | 0x3921E31F030C5C2E46039C33BF22C9F4 ; MKBv19/FindVUK 1.00 -0x2000109A83C1B652C655148D085D89DE5F7B1A43 = LOGICAL_VOLUME_ID [ICE_AGE2 JETZT TAUT S | V | 0xBCC84A1DDD156DED3572D52D2BAC6A17 ; MKBv1/FindVUK 0.99 -0xD6E3DB012D758AAF3FDAA127B2201D9D7E320D1B = LOGICAL_VOLUME_ID [Identity] | V | 0x03FDA55B9E6AD0BFA55E3E7D47D30E58 ; MKBv1/FindVUK 1.00 -0x972311B7B3D85F869E27D27E82088D76B2019091 = LOGICAL_VOLUME_ID [James Bond 007 - Casi | V | 0xF05A7807CCBC2FF96A715BD25BE96F49 ; MKBv1/FindVUK 0.96 -0x4AB9F9B3EB888E74D6043771A2FF3CD0EB6B6B7C = LOGICAL_VOLUME_ID [K??nigreich der Himme | V | 0xF1CE1595DFA8B3F4425A230A27249F0A ; MKBv1/FindVUK 0.96 -0x62A6AE706548A69C8EA0CC5816E462371F322B33 = LOGICAL_VOLUME_ID [King Arthur Director | V | 0x5391D0213471357CB32902D55DBBAA34 ; MKBv1/FindVUK 1.00 -0xDC50B926DC1DDB3F600AAFD4A2CE27026290AD53 = LOGICAL_VOLUME_ID [Kingdom of Heaven (Di | V | 0x1E7E4C32C5F67F5E84ACEA4E8FADEB21 ; MKBv1/FindVUK 1.00 -0xC985A4F89682101C0D8BBA6571533F70F725FD15 = LOGICAL_VOLUME_ID [KUNG FU HUSTLE] | V | 0xEA69AA3F40B9BCC1A13AC2C4051C3F25 ; MKBv1/FindVUK 0.96 -0x811DB632BB14DDC881C0329E96C4C812AFAA0740 = LOGICAL_VOLUME_ID [LA_ISLA] | V | 0xAC293AE750BB4BE937D9F3981B30F23A ; MKBv1/FindVUK 1.00 -0xAAD83DC1410C4CB76146C416D7943D19DA464179 = LOGICAL_VOLUME_ID [Lethal Weapon] | V | 0xAD414061381A75E26024640DA6C5D096 ; MKBv1/FindVUK 1.00 -0x9B2E552CB07B8442E729F673C4FD3CAA4988482B = LOGICAL_VOLUME_ID [M:i-2] | V | 0x289C90005ACC8EE44CD7B7A43DA2033F ; MKBv4/FindVUK 0.99 -0xC52961F0B879A0296F0BA787A053904F6F898EC1 = LOGICAL_VOLUME_ID [Mission Impossible 3] | V | 0x797DF4C0A7A9829E0E9066895CE4536D ; MKBv7/FindVUK 0.96 -0x880553C48531D7032519E215BFCACA194C9052FE = LOGICAL_VOLUME_ID [Mission Impossible] | V | 0xFCC85FE9D5FAE0DD31770DBB36D3393D ; MKBv7/FindVUK 1.02 -0x5F0D2831814C0CB9B53D9493D8C64C642068D650 = LOGICAL_VOLUME_ID [Mission:Impossible 2] | V | 0x9F196DAD4FC85C91BEF414EBCB92ED79 ; MKBv4/FindVUK 1.02 -0x7D90D46EA5B2D22069A22248B7A57B3EB8DB9FBC = LOGICAL_VOLUME_ID [Monster House] | V | 0x440D281DC2DA3B45804C299D6F7F2D6F ; MKBv1/FindVUK 1.00 -0xE5953D9A8092F8436894A69944413A21B0BBB577 = LOGICAL_VOLUME_ID [Night at the Museum] | V | 0x0AFAEDABA95E8797D9832D4907DC32F2 ; MKBv1/FindVUK 1.00 -0x4B634C4A68DEBF10C8B1E32C0A4DBF6AC33AB552 = LOGICAL_VOLUME_ID [Ocean s Twelve] | V | 0x0D1C56202EDCFDE750838F6F345B4C6D ; MKBv4/FindVUK 0.98 -0xB51236704FC5CA38F3DF6B053FF4DC570AEDBA3F = LOGICAL_VOLUME_ID [Ocean s Twelve] | V | 0xA1EDBF4E59B26C6D1600177E91AB4E95 ; MKBv4/FindVUK 1.02 -0xE0A85CC3C3E6089DE3C958A3DE1124A6A36AB3F8 = LOGICAL_VOLUME_ID [Ocean's 13] | V | 0x9334B9D0FC5F5DB06E1B1930078F66B0 ; MKBv4/FindVUK 0.92 -0x5CA5E428F306B7A5B1BFC8B400ADC6C732D5792C = LOGICAL_VOLUME_ID [Pirates Of The Caribb | V | 0x2A8497A10308BD3AA89686EA9EF39B1E ; MKBv3/FindVUK 1.00 -0x62B99229ED5C436AB3AD3F740A3F5E8567651274 = LOGICAL_VOLUME_ID [Prestige - Die Meiste | V | 0x7F5AF6956BC934973BBC15959930EDCA ; MKBv1/FindVUK 0.97 -0x32A900AD06E54424801C2DDD2F7F60DA8EDA511E = LOGICAL_VOLUME_ID [Resident Evil: Apocal | V | 0x4E2A7B2EB67773EAB98CFFB03F9EA73E ; MKBv1/FindVUK 1.02 -0x2EFCEBEA8D9A46C58ACA3C0A5FAD0A17A27CB02F = LOGICAL_VOLUME_ID [Rocky Balboa] | V | 0x7C403225E0359A0C0C64823200A11AA4 ; MKBv3/FindVUK 1.02 -0xDC9FAF986C73C747AD1497E6D102F057A4CF854D = LOGICAL_VOLUME_ID [ROCKY_BALBOA] | V | 0xDCED8EED152188E7FC88C25F339A074C ; MKBv1/FindVUK 1.00 -0xCB18EDBA9F3989A3F6A3E9794D9ECD5C75C348D0 = LOGICAL_VOLUME_ID [Rumor Has It...] | V | 0x101DBEFE8430857E3117D65084C12A1C ; MKBv1/FindVUK 1.02 -0x0C03C075B8C8B7CFC067EC14B048F593B8E320AD = LOGICAL_VOLUME_ID [RV] | V | 0x1400F2ECAA79A3E7C711D28F7E04AB8A ; MKBv1/FindVUK 1.00 -0xB03990C3F6BB19290BC847ED0E3FC30022D1111C = LOGICAL_VOLUME_ID [Scooby-Doo (2002)] | V | 0x5DC8463A372C4BE5CBC59761AC266DF9 ; MKBv1/FindVUK 1.02 -0xEC8E531D116D7EDED07A4EDD7A26319AC0545EC6 = LOGICAL_VOLUME_ID [Space Cowboys] | V | 0x39AB9473D49B35532536D24D5334469E ; MKBv1/FindVUK 0.99 -0xCA12D26C3A3345F74C30474D47ED8E713278FDF3 = LOGICAL_VOLUME_ID [STARSHIP TROOPERS] | V | 0xF2FFC547A809AD49733A40E09C4A1D4D ; MKBv3/FindVUK 0.96 -0x5F81D1F88D56B6F7AC117693E356C5737FF759EE = LOGICAL_VOLUME_ID [Stealth] | V | 0xA3B63B021DF5EE604DDF5F5A030D3D7B ; MKBv1/FindVUK 1.02 -0x9AB33D8B8907A16C165D7B1344B4AD084B67CB05 = LOGICAL_VOLUME_ID [Stealth] | V | 0x548C12AAF056E866304C3CA3C320F01C ; MKBv1/FindVUK 0.84 -0xC202D2EDCF469314B34B4AA86A845BA4E695FAB0 = LOGICAL_VOLUME_ID [Stranger than fiction | V | 0xA68F80BC0F344DC4FE24659BDB0B9D6E ; MKBv1/FindVUK 0.80 -0x55B5F300A2CA94F319390D1AFCB530C8E3670479 = LOGICAL_VOLUME_ID [superman returns] | V | 0x8A71DB235ABC80070C928F3BFD4F5473 ; MKBv1/FindVUK 1.00 -0xDC147286136F3A726D3C871B3805E3D042E4459F = LOGICAL_VOLUME_ID [Superman The Movie] | V | 0x0C7D4C198F5A573B9D516A9C684206EE ; MKBv1/FindVUK 1.00 -0xD9CB921E843E14F06376E3C0D39D4DC131BC0DED = LOGICAL_VOLUME_ID [SWAT] | V | 0x449B1A1B5465F905D0EC7F8E504F8903 ; MKBv1/FindVUK 1.00 -0x4CDE7DF821F091A69196DA0EF3881E33424F634C = LOGICAL_VOLUME_ID [Swordfish] | V | 0xB53C8FA8212515889D3DC3DA3ED09953 ; MKBv1/FindVUK 0.98 -0x19B31707D8094060B76388A7B0ED4C356568D44E = LOGICAL_VOLUME_ID [Talladega Knights (Un | V | 0x008A4E0F385C56A9314AE70813117E0C ; MKBv1/FindVUK 1.00 -0x72E539DC34E08D6BB66248F2135A3877786F903C = LOGICAL_VOLUME_ID [Tears of the Sun] | V | 0x7369B14F0A417A22F6B836A9FB0375AD ; MKBv1/FindVUK 0.96 -0x4AF36D780BA062A72DAC246A0666430B2DD61D1B = LOGICAL_VOLUME_ID [Terminator 2 Judgment | V | 0x1B19D9F201AA5F18DFD0A932AFB2C2EF ; MKBv3/FindVUK 0.99 -0x732EA933E7B54826BB94DA297FE81445A6D795EB = LOGICAL_VOLUME_ID [THE BIG HIT] | V | 0x287429E2E2BF7B20D4F4B2E3BA6EDEAD ; MKBv1/FindVUK 1.00 -0x66C62EDFA7FAE081057BDAFD6F810E0EF19CE32A = LOGICAL_VOLUME_ID [The Dirty Dozen] | V | 0x792A61C64531384F7A2A502C3DA1C8FC ; MKBv1/FindVUK 0.99 -0x3B0A3F117ACB4CB19D8B5A80595263604827330E = LOGICAL_VOLUME_ID [The Guardian] | V | 0x7BBD29A367AC2C5C5E72D671CE905248 ; MKBv1/FindVUK 1.00 -0xBBD0923988F63242146406AAEB85C8497096978E = LOGICAL_VOLUME_ID [The Island] | V | 0x0928C9BED6715CBE4E42AD229BB07BB9 ; MKBv1/FindVUK 0.98 -0x6ED65860D1638BC639AD353F3E105CB104C016FB = LOGICAL_VOLUME_ID [The Patriot] | V | 0xD3DA27386D431087FE21D58FBCEF2BA5 ; MKBv31/FindVUK 1.00 -0xF0DA29C154C81B80AC92C97C069B88DE53F3F48E = LOGICAL_VOLUME_ID [The Prestige] | V | 0x52468EB348767A6A55BC4163B52977E8 ; MKBv1/FindVUK 0.96 -0x4D2517D8992279B690B2E051A8BBF2A1FF60B419 = LOGICAL_VOLUME_ID [THE QUEEN] | V | 0xFFA15E69C3ED9B7EA8D17C304A418E2D ; MKBv1/FindVUK 0.96 -0xDD6747C30D1F37EFF934664D67E78B540C288680 = LOGICAL_VOLUME_ID [The Road Warrior] | V | 0xD8A979125DE115686B1E1960C14CE09E ; MKBv1/FindVUK 0.99 -0x5F59438260A7F5BAB91FFA0D83EFBC19D5540F07 = LOGICAL_VOLUME_ID [THE SAND PEBBLES] | V | 0x1D78494944A41FEBA3C5F4BF7AFD6B6C ; MKBv3/FindVUK 0.96 -0xED58A6702B7A9814679B7B4D27568EF0A6A4221C = LOGICAL_VOLUME_ID [The Searchers] | V | 0xFF0542363D5995DF42314AD95CF8AEF1 ; MKBv3/FindVUK 0.92 -0xB3DCE386F2B1215E30E0B842F556778D7A9E3E41 = LOGICAL_VOLUME_ID [The Terminator] | V | 0xEF6932BEB5696E42BCDB38D784F2F0C2 ; MKBv1/FindVUK 0.99 -0x7B23E56A19188160968EEB05127BF1581A70BE3E = LOGICAL_VOLUME_ID [The Transporter] | V | 0x3F7033651C7B2E46329750A821A36707 ; MKBv1/FindVUK 0.83 -0xCDBC4BD09A5598D1668B093E2CDE79A29B5F14E3 = LOGICAL_VOLUME_ID [Toto - Live in Amster | V | 0x43F89124795D5FD43FE9F598D85DD957 ; MKBv1/FindVUK 0.96 -0xDB89900CDCCF6B500CA50E6EF90A7525A5961155 = LOGICAL_VOLUME_ID [Training Day] | V | 0xB30948AD2E9F2804CDC5DA732BE2F3FE ; MKBv1/FindVUK 0.98 -0xA7595DA5650DE7B9FFF3C11D05556D5E793E2DAB = LOGICAL_VOLUME_ID [TRAINING DAY] | V | 0xC0A627A2A4B1FA8C5D05ADAFFDEC5997 ; MKBv1/FindVUK 0.96 -0x88DB0DBC0CC257767F89F97118944222D2410F22 = LOGICAL_VOLUME_ID [Under Siege] | V | 0x3CF4C55D78426D1347333DD4AB7B3136 ; MKBv1/FindVUK 1.02 -0xE2AA9455257441BDEB4C9B1B8740CA32846AAF83 = LOGICAL_VOLUME_ID [Under Siege] | V | 0x2E480534EACC1CC92A799D273C03FC2A ; MKBv1/FindVUK 1.00 -0x2E51D65E4DA8428581A27A0A52C3FE671001C6FF = LOGICAL_VOLUME_ID [Underworld Evolution] | V | 0x9E28E1BD3839CE0D7A56EAD3D1A2893A ; MKBv3/FindVUK 1.02 -0x281260BAB001CC50126433CBC1620A943C3D901F = LOGICAL_VOLUME_ID [Underworld: Evolution | V | 0xE38559F717488E1BFBDFD2C786519B08 ; MKBv1/FindVUK 0.99 -0x87FBF426C214A6F759FE4E29D4C2F9BF1EB594A2 = LOGICAL_VOLUME_ID [UNFORGIVEN] | V | 0x11461F74AA232096CF2CD6114D1AE06D ; MKBv3/FindVUK 0.96 -0xF7884627F1406431BC1F1D63908E84E5A719D7FD = LOGICAL_VOLUME_ID [USUAL SUSPECTS] | V | 0x934164ECE28ED046593251DB47A8A6B3 ; MKBv1/FindVUK 0.96 -0x6512B400EB18A4477FF7E56D3E687506B915D488 = LOGICAL_VOLUME_ID [xXx - Triple X] | V | 0xE4A31F563A18139D10ABF21E3FB2CEE3 ; MKBv1/FindVUK 1.02 -0x89ED4BEB7BD2B668CF49DF8A2F1768A84A543956 = LOHENGRIN | V | 0x1415B3BCA9740C3A74AD001642350C4D -0xC05C8F6EA58ECB0CB187F2634AA093412458BEC8 = LOL | V | 0xEE5FA525C2762F42DF41C90D697E0D27 -0xB9F09DB77FF7382F80A2A666EFEA4FC873D35036 = LOLA_RENNT_BD | V | 0x1582701C1F3E4618862D0489C4EDCDEE ; MKBv21/FindVUK 0.80 -0x73732BC085621FDF09C29F6F3528DCE683B00BF5 = LOLITA (Lolita) | V | 0x4B6017A9B62B8C759654317BD806570D ; MKBv19/FindVUK 1.00 -0x086EE5C78F7E5FACB43304C3F19F5801A0680D59 = LONDONHASFALLEN_NA (London Has Fallen) | V | 0xA2511991841B9C63BAFA098E0DDFA66E ; MKBv57/FindVUK 1.00 -0xEC3DD6C6B4B16B2991CAD5C4E18624423D96BCB1 = London_2012_Olympic_Games_D1 (London 201 | V | 0x19D6E24512AEDF92C49D5A96B9BCBCFA ; MKBv31/FindVUK 0.86.3 -0x641E9511373FB47C546B34D4AA0EFC5E25034AB2 = London_2012_Olympic_Games_D2 (London 201 | V | 0xB4E6B71445D3E1098209F396B45A81D1 ; MKBv31/FindVUK 0.86.3 -0xDF5C572D25A51930B8A089DC5B3E72B3DBDB12CD = London_2012_Olympic_Games_D3 (London 201 | V | 0xFE9EB2619D7B2955F2E4425596934FD8 ; MKBv31/FindVUK 0.86.3 -0x2CBE42FDB3F1434086885421BC1339EF710A222D = London_2012_Olympic_Games_D4 (London 201 | V | 0xA906997550E208A2FCAEFCD0DD587449 ; MKBv31/FindVUK 0.86.3 -0xECF11ACDB225C9FA5EEE63B90445B40DBCB9A6D6 = London_2012_Olympic_Games_D5 (London 201 | V | 0xDBEBB38B28DA6274F6117D4D653808B2 ; MKBv31/FindVUK 0.86.3 -0xE68B72F0B59C609981862E4169FC36C5C83F4B5D = LONDON_HAS_FALLEN (London Has Fallen) | V | 0x6A5348C4A0C2CFA4DF9B045B584F7AEA ; MKBv61/FindVUK 1.00 -0xB677CAA0B60CBC282903109DB052E822F1CD7CAA = LONELY HEARTS | V | 0x2463880F308DEFA53FBFB81B59EB1760 ; MKBrev 9 - FindVUK 0.57 -0x9A8930E6CD850207BA2CD78D71669FE7134A61C1 = LONELY HEARTS | V | 0x84BBFF88D5C4EA99B0E2C80A03D954B3 -0x1A14ED42ED1E7DF6670106D5F79E2E0A01B9F916 = LONESOME DOVE DISC ONE | V | 0x25F6686EB5C31CD28590AE676BF4FFD2 ; libaacs -0xB0D02615B45DC6BF47BEBCC95BA4EAF695C9B432 = LONESOMEDOVE_NA_DISC1 | V | 0x5EDAF8D8F431AD5B086145D78A601348 -0x1DA824FB2E4C73B5223D4036400AB89D4E24D7B6 = LONESOME_DOVE_D2 | V | 0x2E5AB66585FC34961D86FE408A03D7BF -0xB2E36DE761DD766D642DC03A1BCA81E4DB5D51CE = LONE_SURVIVOR (Lone Survivor) | V | 0xF813B4AF8898452533ADBFCE3205129A ; MKBv36/FindVUK 0.96 -0xCE7BF19739394B664C2D25DF70223FCD50E54D59 = LONGESTDAY_D2 | V | 0xD74D6ED31424D824C565E7B8E8F3FDD6 ; MKBv12/FindVUK 0.65 -0xC01A2B23BD20E4A6B5817FD902D23FE2B55DDEF9 = LONGLOSTSON | V | 0xFDEC1254CCB039CB67B4F09B1B9CF6A1 -0xE332BE04F0BBF35669BF617C8B640ED209C1BC7C = LOOPER (Looper - Blu-rayâ„¢) | V | 0x0B191D06EBE4D21CF84A68F508039BB6 ; MKBv35/FindVUK 1.02 -0x234931141CBE6B4F507BB1C8311F6CC38255E5A7 = LOOPER (Looper) | V | 0x59E61B71085309E1115FB2B953A55EAB ; MKBv37/BEE/FindVUK 1.02 -0x75892891C897B4ABFC49F760CD2D9CEEFFD46D58 = LOOPER (Looper) | V | 0x24E15E066A85A3A129B67AAC25170CC1 ; MKBv37/FindVUK 0.91 -0x8DEFD2CE780D1CD875AE4B36C1BAF8C3CE362C89 = Looper - NOR_SWE_FIN (Looper) | V | 0x770DD78B3439BBE6E14B04A6F41B4AD0 ; MKBv35/FindVUK 1.00 -0x47D121696D09A25294E48AAC88509B89B4077BAF = LORD OF THE RINGS FELLOWSHIP | V | 0x618A451EB48825D529731D300C2508A5 -0xD680D09350A654C7743C4AB5F3D056F671492AE3 = LORD OF THE RINGS FELLOWSHIP | V | 0x79683C4EFF64DB60438075E1599EB30A -0x6C95D3D6642F3A227FE34F88888C6C6F13B085AF = LORD OF THE RINGS FELLOWSHIP (THE LORD O | V | 0xE582DD203AFA8FCD3A331655F9077A74 ; MKBv16/FindVUK 0.96 -0x0DB8500DC948BFF89C4F54277F0778E8C1CFBBD8 = LORD OF WAR | V | 0x140BB74FAA13DC44265B68AA3A42071E -0x212EB0E753A4D901B929C35268BEF890D4C77761 = Lord of war | V | 0xAAB34A376D922A17F60D7312DF245FC7 ; MKBv17/FindVUK 1.00 -0x10E2790397450CCCC8402A28E5CBC82249C502B9 = Lord of War | V | 0xC7149A7F4CC8E31C00E1C61CABE4595E -0x96E670EAF2E7C4799B1E9F0C2F94EB50E7843613 = Lord of War (US) | V | 0x7121E2D7A533FB1AFB4CF34BA1185C4D -0x0E759E50900B8E6D4F3D5165EA5365EE1F288E44 = LORD_OF_WAR | V | 0x8C3AB8EDEED06235156362CEBC186D7E -0xABA7336A4A57159D08C042CE7011D859F28BDF3B = LORD_OF_WAR_BD (Lord of War) | V | 0x83EAC6F9A6C43294C4A885009B8159A6 ; MKBv21/BEE/VUKNOTVAL!/FindVUK 0.96 -0x8F59013AFB0F52C0252A1780155B1071B37E684C = LORD_OF_WAR_BD (Lord of War) | V | 0xEA2D7491D663DCD74080278667A55764 ; MKBv21/BEE/FindVUK 0.84 -0xEFD36A25D6372D13120FCDBDF4E434780BF4C0E3 = LORE (Lore) | V | 0x4A170779D6F392A8953AC855C47F4C10 ; MKBv34/FindVUK 0.96 -0xB1C929F482C0116379CB880FFD7475E1BDE41AD5 = Los ojos de Julia | V | 0x3182C438BD897BF544497829F0FC6F89 -0x18C162F9F54D81BB32B4227B082A60432F7D6310 = LOS VIOLENTOS DE KELLY (ESP) | V | 0x6F4429AA14F2A9FB835D10AE638418CD ; mkbv16 -0x50615C1D53CF049AC1692219A9FB4D517E257550 = LOST HIGHWAY | V | 0x2EFDB3A8F33298652253798EC54E02D3 -0x48EF607335395B1C2C7383AF8F068FBC0986C340 = LOST RIVER | V | 0xBBC938C757AA9B2CA439998B8E5FDB7E ; MKBv58/FindVUK 1.00 -0x6078F02BB6A01259D1BB60C66BD2F76D7A559345 = Lost River - Kinofassung | V | 0x058DBA189CADDCC2ED5D209A2FAD7D8E ; MKBv56/FindVUK 0.80 -0x0F145F94C798D0B01DC97A4E6EC10EE961CA6EA8 = Lost S5D5 | V | 0x88214C19C04EB7D45818C8E51DA2B08F -0xAD886A2B4AEFF126313F3510E114F535A269B051 = LOST_BOYS_SE | V | 0x2E5735513B4D9A8A47AD5FF8139E9288 -0x25980A14C789D603D0DF4BCF13834D073C26786F = LOST_BOYS_THE_TRIBE_NA | V | 0x14BCC599CF2FE5E84C8D0B28DEC65B18 ; MKBv7/FindVUK 0.84 -0x8A60A7850739AD9D8BF9E0CD7875EC8422210473 = LOST_BOYS_WW | V | 0x962A9B0FDFD33E243336B9BA2ED56B1B -0x9F479F2A80A0350DE28E6F67035B9C1A14A9DE80 = LOST_BOYS_WW | V | 0xBCA1447341077A17A97A930889B1AE7F ; MKBv7/FindVUK 0.96 -0x1BFC2532ECC353F8C835C976CA191841A584F87D = LOST_IN_TRANSLATION (Lost In Translation | V | 0x0B3C084A125683DD3502E8A11FC68737 ; MKBv21/FindVUK 0.98 -0xFB5885CCA7E81C2FEF8EE86781180B0671405586 = LOST_PLACE_3D | V | 0xFE3BD1B16AF4BA77D9CE12C55F708E2D ; MKBv46/FindVUK 0.80 -0xC9C043FFFE4BA5C437F53B1B91B758587E8F3D99 = LOST_S6D1 | V | 0xC8DD7BA3E113F07C208C2DF01049C7B4 -0x6140657A76189FDD2379B18196E5B431D3BFDD76 = LOST_S6D1 (Lost: Season 6 (Disc 1) - Blu | V | 0xA5C2D08859751E1E88A9BEB7C34FC82F ; MKBv17/FindVUK 1.00 -0x8C8CEBB21E760B44282C6B949DC898C0BF8B5F9F = LOST_S6D2 | V | 0x90C68AD3355F2A33715B5D3B19B7F5DD -0xE39C4222C0F9F926F7C6E23896A2CBE1280B81A4 = LOST_S6D2 (Lost: Season 6 (Disc 2) - Blu | V | 0x34C952004EE7464D86E5E0095F5DA0F4 ; MKBv17/FindVUK 1.00 -0x2C2A47EDA91708C6270701FBC1B97BA3308572AE = LOST_S6D3 | V | 0x431275740628D8E317898EECBDFC8F97 -0xF61C03C45B68BD39A3343B585A95DED00F7BC51C = LOST_S6D3 (Lost: Season 6 (Disc 3) - Blu | V | 0x477D71B7AA773B1C89D3CE9B5A6D58A1 ; MKBv17/FindVUK 1.00 -0xF847C725939739BF4F52050017CEDAD3CAF8EEE2 = LOST_S6D4 | V | 0x871988E9A038585FA7413CC0D57BC543 -0x953129C3D250C42A8CCB463855F8C7457FA59559 = LOST_S6D4 (Lost: Season 6 (Disc 4) - Blu | V | 0xB247E93BE4E436F8CB539367FF904DE5 ; MKBv17/FindVUK 1.00 -0x2789A59D30B1B7D61FA686A0934DA7DD2B04F411 = LOST_S6D5 | V | 0x8235F4459DDCC825A80C0C17D0CA9DEA -0x5520BA7E0021AF387B2DC5FF10510B48C9EF04F5 = LOST_S6D5 | V | 0x9C3B53D507EC6BEDD22E76DDC8C527E5 -0xE3C3970B915D85DD0FDA6C33943C568B2743BF60 = LOST_S6D5 (Lost: Season 6 (Disc 5) - Blu | V | 0xF455B310AB427A0D813549F2324523FE ; MKBv18/FindVUK 1.00 -0xB1730AD3F82FA20A54FB2872EF57E25C8E9F4914 = LOST_SEASON1_DISC1 | V | 0xB70320DA87BDA784F5D75600A11BC5D3 -0x1B4524C2737087AF7E325CE97B5898196AEC7B53 = LOST_SEASON1_DISC1 (Lost: Season 1 (Disc | V | 0x04678A997930ADB7CC570174330E7095 ; MKBv12/FindVUK 1.00 -0xB3BAA7530B39CFE388073A4DE7F5C21DC4400874 = LOST_SEASON1_DISC2 | V | 0x1370147F5AECE88150D00C3B4DB990AF -0x88A4382623F420C880C8DE2CEA4AF86044797B0D = LOST_SEASON1_DISC2 | V | 0x3C9DBC681D86F2F9118FC90F3F71CF42 -0x42BE089502D2AF18A2177E7F1D89F2EC0EB607E8 = LOST_SEASON1_DISC2 (Lost: Season 1 (Disc | V | 0xF7DC3F7B2A69A1AC928BAC08254E4556 ; MKBv12/FindVUK 1.00 -0x059B610A79A7BD9B806F9918659A7359D8921861 = LOST_SEASON1_DISC3 | V | 0xDA5D701BF59DA26FFA9895CB440982FE -0x23E4303C04719C7031C2BCC0009A421A70DC896A = LOST_SEASON1_DISC3 | V | 0xD8C63E7FB7ACD7BDFD8E779DDEF82154 -0x644C1E8EB432E5C4CEA4D8A9842CAF72841C830B = LOST_SEASON1_DISC3 (Lost: Season 1 (Disc | V | 0x51CAA9E1B7B2F69518AE8395F3010159 ; MKBv12/FindVUK 1.00 -0xBF934C2CD7CCC6C52403BE9D5223BA7ED972F31A = LOST_SEASON1_DISC4 | V | 0xE031046D4DFA61D32CBC1AD0213D01D2 -0x2B2BA248AE5BA7454AD59D033F49DA737E58237C = LOST_SEASON1_DISC4 | V | 0x6045DA1D44B98BF96574F1A13330C527 -0xAF23D2B0873258A3912C7247F09FD93BF1FF7009 = LOST_SEASON1_DISC4 (Lost: Season 1 (Disc | V | 0x702B4943AA452AD26CC7F59C35769CD1 ; MKBv12/FindVUK 1.00 -0xD90FB1631E52EA085A252D38FF40852CD9F81903 = LOST_SEASON1_DISC5 | V | 0x6916BD2F678F242BBE902CA5E3AB63C5 -0xE8A54BB27DF7B64E0A089A4BC0499CE8FCAE9B2B = LOST_SEASON1_DISC5 | V | 0xD485CF0FF0BEE621AB0A22F39DEDD540 -0x5E39B080C0875EFC062A0D0EB3E207D546CE989B = LOST_SEASON1_DISC5 (Lost: Season 1 (Disc | V | 0x1EDCA6A028380B0A1C9249053946D594 ; MKBv12/FindVUK 1.00 -0xB505866221F440DCD73C8789257C8EC339C36D47 = LOST_SEASON1_DISC6 | V | 0x196806301472D80353CA829B707C4471 -0x73BBE382C88E87CEEA1CC4FD3E6FD5B802FBB8BE = LOST_SEASON1_DISC6 | V | 0x4F6FFA49C7B528EDCCC51F042EE6326B -0x0B82C424720FF42436448E23FB31CBBA67991DE2 = LOST_SEASON1_DISC6 (Lost: Season 1 (Disc | V | 0xCDA92CC6F9032672332A120AF5E6AE2F ; MKBv12/FindVUK 1.00 -0xB1CB7993B699F3D2CB139DDC83753DFC3D158C30 = LOST_SEASON1_DISC7 | V | 0x5D9CBBAA247E604A5267A2F359188838 -0x2D1241AB4952BDEBE3C87DC29DFCEBDA9C3FB391 = LOST_SEASON1_DISC7 (Lost: Season 1 (Disc | V | 0x8E4EEE6B5D04ECAA62FB9EF692780612 ; MKBv12/FindVUK 1.00 -0x1B0A8E5199614B00EE4E9E04EF374082856B96F4 = LOST_SEASON2_DISC1 | V | 0x8197522D6899275E011209B54DBEB409 -0xEC6AD277B41F5CEE44E191E7D91447C46FEA770A = LOST_SEASON2_DISC1 | V | 0x34AA6EFC52FE7DC6C0CB7A4F0C60C396 -0x57A04AC9EE9370379495CDA49FC65DAF17D6B1E5 = LOST_SEASON2_DISC1 (Lost: Season 2 (Disc | V | 0xDD101242FE33170B32074393B0FA6CB4 ; MKBv12/FindVUK 1.00 -0x52C329280563DC6EC9F2924F12F32D2847A51058 = LOST_SEASON2_DISC2 | V | 0x427F6DCDC31106035825D7CDA8767256 -0x3FCF41CF9C36479955EFC90A19A0AA845043CF94 = LOST_SEASON2_DISC2 | V | 0x157B1F9A97F1B7A902CBEF452F7E285E -0xC961C9E090D44A040CAB2B765DEF4B97DA20C085 = LOST_SEASON2_DISC2 (Lost: Season 2 (Disc | V | 0xD44F5678D9B1B82D22649027565E8297 ; MKBv12/FindVUK 1.00 -0xC2797EFC013EF9EC9D20711D36E3252E3545856B = LOST_SEASON2_DISC3 | V | 0xEF6598A1AA19B773976D1F4BB3E1BF68 -0x8D60AFCE661AD20895766A24B29356C37D1597D9 = LOST_SEASON2_DISC3 | V | 0x899ADC6A7E29013715849913C1486379 -0x7598A900EB8A32669ABD4B9F14704C2CFF53DF77 = LOST_SEASON2_DISC3 (Lost: Season 2 (Disc | V | 0xD496883AA898F313972F293729042716 ; MKBv12/FindVUK 1.00 -0xADE379C895C9D5F3A1D5C66BBFAD52A751E57D09 = LOST_SEASON2_DISC4 | V | 0x7FDE36D94E125EF60E1EFA2C771B8B9A -0x08A8A13C7215EFCF646FDB1C05D64E8B8C2A7F58 = LOST_SEASON2_DISC4 | V | 0xD907C1E8621CEBEA50F1E6F7F485CA6D -0x5EE09970795CB630F861ECB39A4641E80A3DCAE0 = LOST_SEASON2_DISC4 (Lost: Season 2 (Disc | V | 0x3DAF6B60885273192E82DEF5B31ED7B1 ; MKBv12/FindVUK 1.00 -0x8B298508C97984E8BF4B91E404BF579BD114E341 = LOST_SEASON2_DISC5 | V | 0x392C63B916944A60473CDD8C49D23769 -0x9274392E28E0AC50C0FFC89130C88FD617B300B1 = LOST_SEASON2_DISC5 | V | 0xDFCA9A87837CBFA42FE21B2FA871B1D1 -0x4CEE3751594BE3AA0AC74F30249A3D50BD5DAD6D = LOST_SEASON2_DISC5 (Lost: Season 2 (Disc | V | 0x2D7F6A75D36B93EF8CD9B5BD41F7841D ; MKBv12/FindVUK 1.00 -0x4A0E1637321B99C34B1142117D1B56B51AA0BAF7 = LOST_SEASON2_DISC6 | V | 0x12FC46E5834BD5E628FCD6AEB256037C -0xB224B43D0F928B51204E3763DADCC84675EB8BC5 = LOST_SEASON2_DISC6 | V | 0x256C6C12C51BBAF70E0002B430E47B1A -0x7AD882E93689071E6648275597473A341E296D6D = LOST_SEASON2_DISC6 (Lost: Season 2 (Disc | V | 0x752EA9C328FBE436DCDF4B154077A7AC ; MKBv12/FindVUK 1.00 -0x7C7010914110D8BC0ADC1184CD58FEED6AB0A6E7 = LOST_SEASON2_DISC7 | V | 0x9D261DE5D5F109F5B2276A97EC3328F4 -0xB7CC06DD04291971958D1758ED73ECE4DE7F8BD7 = LOST_SEASON2_DISC7 (Lost: Season 2 (Disc | V | 0x53A61B14E494D9F527C442DA220C2F4C ; MKBv12/FindVUK 1.00 -0x920745586C1DF8E08C58928C495C23895069A492 = LOST_SEASON3_DISC1 | V | 0x8CB1DA586816EF5638B24B0AC9B02E21 -0xCF1980979D20BA1CC1D87C74F8E75385A483F59E = LOST_SEASON3_DISC1 | V | 0x5A2683438E1191FA14A22AEE7420F974 -0x55B1C8ABA15F51D0829271941935078D377F605D = LOST_SEASON3_DISC1 (Lost: Season 3 (Disc | V | 0xEBAB4C0F125E7EE5FA5079088BF9969E ; MKBv14/FindVUK 1.00 -0xA1A759E4370B100C6A8319D782FAE416F2D0C1E9 = LOST_SEASON3_DISC2 | V | 0xECA71E2DBE183449AE7159AF6FD23EDA -0xFC49BF30B5A025E6B0DBE28405B2170B01E36CBA = LOST_SEASON3_DISC2 (Lost: Season 3 (Disc | V | 0x91BD3C24902FCD7EED5B238ABDF319F5 ; MKBv12/FindVUK 1.00 -0x00D8D45D58B1AD9435B0D96CB424FB614012FC00 = LOST_SEASON3_DISC3 | V | 0xB840FE907B6D6DF14B8BCC20E462BD4B -0x157C0978F005FFA2B042EA37B2E36A6DD8AA0C3B = LOST_SEASON3_DISC3 | V | 0x0AF3D409B91507EE8443EE7980B652E2 -0xFC54300135F4EDF4BBBFB168204ABA15BDB55443 = LOST_SEASON3_DISC3 (Lost: Season 3 (Disc | V | 0x1D3AEDA4A8615B406AE21F1F8995C5A4 ; MKBv14/FindVUK 1.00 -0x8D34B2F2C58C01EA888DEE5223CDF83785AF5827 = LOST_SEASON3_DISC4 | V | 0xE04038542C4039E8EE9933C8D1B3011F -0x09898E1B0FE0767A8FC3E2515A7E02A1E5604939 = LOST_SEASON3_DISC4 | V | 0x45C0ACCEA9EB70DB4BD779AB2800E7FC -0xA9B806E12AB1C20AAFC787CE4C42631BF5434A9F = LOST_SEASON3_DISC4 (Lost: Season 3 (Disc | V | 0x8F046797AEDE90CC615C88AF206A487A ; MKBv12/FindVUK 1.00 -0x20D88229210B36DB848A080428F5156FDA1F1D0B = LOST_SEASON3_DISC5 | V | 0x51B53728AD16CD23C00965F3EED3CB6C -0x6468E691669B0483628E7BB90D65A3B85B81E7AD = LOST_SEASON3_DISC5 | V | 0x5A248B933A9581E15FCD2260722B1484 -0x1A410C6F795EA9AD1E2AEDD91EF18F98C2BD5B29 = LOST_SEASON3_DISC5 (Lost: Season 3 (Disc | V | 0xC0541B798E527301930BE00F1BCCFF04 ; MKBv14/FindVUK 1.00 -0x9AE427823A115F85851C71911367AD0705A194B4 = LOST_SEASON3_DISC6 | V | 0x026390167A22B462D16589B74268D2D9 -0x24346B166BD80345AD5E4C7F35AFAD699BFCB3FE = LOST_SEASON3_DISC6 (Lost: Season 3 (Disc | V | 0x29EA0934A26911269A0129B2AAC73027 ; MKBv14/FindVUK 1.00 -0x70B9F4122045D995EA99581B29E22739232CF833 = LOST_SEASON3_DISC7 | V | 0x7007E9DA0A6BADAAA5BB37C93B1F08AD -0xEACCA3B3FC41EB8E612C58AD0A9417583228C1B4 = LOST_SEASON3_DISC7 (Lost: Season 3 (Disc | V | 0x879B25C8E64988D0EB530F74DA8E91A7 ; MKBv14/FindVUK 1.00 -0x9A1D15F84D664151A19802086CA1E180509B73DF = LOST_SEASON4_DISC1 | V | 0x69B73E6378A029DB5B72507CC2FA811A -0x23D777EE4D0FBAE666A2917BCB262A1FBB0DEF57 = LOST_SEASON4_DISC1 | V | 0x8689AAF8E70D41D501A718B6213F3638 -0x236A50FC5ABD2CC8AC2EE40AAD46BCE4FD50D1D9 = LOST_SEASON4_DISC1 | V | 0x69E20843ABB69F10D8BF24758F3D3B41 -0x1CF89B3A70FC2F94D310C1CA78954324C6A8D230 = LOST_SEASON4_DISC1 (Lost: Season 4 (Disc | V | 0x9703B2B7C7A403F937DDD7836C6BE011 ; MKBv7/FindVUK 1.00 -0x94BF127A33123975C148EABFE951CBED5ABC0B28 = LOST_SEASON4_DISC2 | V | 0x49FCFC8D886A01E9C467E829AC39499F -0x00A9AD6517960ACE2A4F6624F0847AE20DCB9905 = LOST_SEASON4_DISC2 | V | 0x4464A171B522981A5A97FD9728D7DDDB -0x428BF2AF40D85E16B5F949902AEDB8A065F80898 = LOST_SEASON4_DISC2 (Lost: Season 4 (Disc | V | 0xDC620330F4448835BF4D2488ECACEA1E ; MKBv7/FindVUK 1.00 -0x417BDBBC2533F437BE3160DEE96A7BFAF57412B6 = LOST_SEASON4_DISC3 | V | 0xE36B2BD9890C5571E8A1B8C42C4251AB -0x259759E3072AE9F0B284C84E107EE7477F5EDADE = LOST_SEASON4_DISC3 (Lost: Season 4 (Disc | V | 0xD50B65C3C732B7CCBE09AD25FBD0C741 ; MKBv7/FindVUK 1.00 -0x3A39A500FB94FE4A573C7746C716B058DF5676AB = LOST_SEASON4_DISC4 | V | 0xA9D770B933F60FD4959EF6960940C632 -0x9BBF6FC14550254D16C3168075A94340C9659D8C = LOST_SEASON4_DISC4 | V | 0x6CD6694303B63827E5DD2CE7A68884DB -0x61452CB0E63C9595A0100C22698EAD51CD6FCFCF = LOST_SEASON4_DISC4 (Lost: Season 4 (Disc | V | 0x3216209A353A7A7FDB77439B55544EBD ; MKBv8/FindVUK 1.00 -0x88886792A2F9A05FAEB606A25C88DB5328DD326E = LOST_SEASON4_DISC5 | V | 0x60C0E46F0AFD944114E82FD21B224A38 -0x134847CBDC9B492748EB10349F531B15576E9747 = LOST_SEASON4_DISC5 (Lost: Season 4 (Disc | V | 0xBCF841342224CBF6BC9A925268FE474C ; MKBv8/FindVUK 1.00 -0x8BEE9FF13931CDB5A8AA4A9296CACA7A36BD438E = LOST_SEASON5_DISC1 | V | 0x1093F82AE208C6771F9B13D4E6A7682B -0x3A24317C0540FC0A091F54E71DBAD52A4A3147C0 = LOST_SEASON5_DISC1 | V | 0xF7CDF38D29D26FB1F98E0D022F382B68 -0x1BC10911568F5834CB2EBD4539D63D241CE2EE62 = LOST_SEASON5_DISC1 | V | 0x11479B23EC9631D18667B3A7EEDB354C -0xC65897E0474DB84C7790341AA4C3F067C9C95D41 = LOST_SEASON5_DISC1 (Lost: Season 5 (Disc | V | 0x6D8078C9F999F35B17B9CC17614E3C71 ; MKBv14/FindVUK 1.00 -0x66C9294096CD6221A965AB549AFD8EDB1CBBAFAA = LOST_SEASON5_DISC2 | V | 0xB674595F2F36400CBDA44DCBEEC01B3D -0x3EAB4F649C6D98B9B5B7610793F64264EC04B8DD = LOST_SEASON5_DISC2 | V | 0xFC8D08E7CB3AFD3D3C1F0936B41B1DDD -0x7558111A78455C1A04D82D58871F15FE5671BC78 = LOST_SEASON5_DISC2 (Lost: Season 5 (Disc | V | 0x81829D3E618DB0BA29911C4F11B90D34 ; MKBv14/FindVUK 1.00 -0x690743F7C3E0B4C523A519320D9B96463E8D0A0A = LOST_SEASON5_DISC3 | V | 0x97AFEB6C42E9639EB97446D729B98831 -0x4912E748E3EE6A8C7B0FFC6326C298C20B56137C = LOST_SEASON5_DISC3 | V | 0xF3D0567C5B20BD9979E88B49A7BF0CC3 -0x3CD8B687519BD4EC147EC4255016083B9AEE621D = LOST_SEASON5_DISC3 | V | 0xE6835798AD189520A612C888AD3AB942 -0xBFD90976A0D771A2478F3CFC7C5A3FF6D0BD7D74 = LOST_SEASON5_DISC3 (Lost: Season 5 (Disc | V | 0x3CE51F26383B1B5BECA24CAFE52B4E61 ; MKBv14/FindVUK 1.00 -0x974C0B18726994FA8D843055248DB04CE7758FEE = LOST_SEASON5_DISC4 | V | 0xF8DAFFDF018CEB587DBDDA1DFCD02683 -0xE3019740B55D987211599F6EF034E4E9F0550E0A = LOST_SEASON5_DISC4 | V | 0xF26A0FCB6ED58229BA34443C6D276BC0 -0x5D45A3E87878C4517BDD2F58B0C2C3559CD0EAA4 = LOST_SEASON5_DISC4 | V | 0xE1EB257E16EC6FAB589FBFC81960D188 -0xB55D0C92245F8F7DF564F9FE8F21204CCBFF7B19 = LOST_SEASON5_DISC4 (Lost: Season 5 (Disc | V | 0x7063FF13C5261EA0BE1CA42072AA21A2 ; MKBv14/FindVUK 1.00 -0x029840A65DAB3D185FFD91BF2A2EBCC78A97572E = LOST_SEASON5_DISC5 | V | 0x8F0941FD3DB6789837AC4B132CCE703E -0x0F8466A13FC066D6DAB0623A4409FB3DA477B12B = LOST_SEASON5_DISC5 (Lost: Season 5 (Disc | V | 0xF5CC324DA4A14A863E849687E8A01310 ; MKBv14/FindVUK 1.00 -0x4DBDE6A260AFDE6258C4640B55514DC1BF344460 = LOST_WORLDS | V | 0xEC0B33A8DF69CF263B1A4D0427A400A6 -0x944C97E20F9153A357354E9CEBFA4BF54825C101 = LOTR_RETURN_OF_THE_KING | V | 0x9CE6B6132BDF3DA5CA3EB51EB1574BB5 ; MKBv16 / libaacs -0x34F0AF3BA282F9809714AA8E4F6EA8E570A91C43 = LOTR_RETURN_OF_THE_KING (THE LORD OF THE | V | 0x467BDF76160027E3603FC11545B9D7C6 ; MKBv16/FindVUK 0.96 -0x6A14B7A3D700D80F74E20C5C6E8312EDF52B8D56 = LOTR_THE_TWO_TOWERS | V | 0x1CF16280E84E7F1E31CEA6EDC4796742 ; MKBv16/FindVUK 0.80 -0xE8BD257EEDF62C916E04CA5E7C27DDC45792EA6D = LOTR_THE_TWO_TOWERS (THE LORD OF THE RIN | V | 0x7B442FDAF84A2B96FE25495C979D3FC7 ; MKBv16/FindVUK 0.96 -0xBE825A43159311B3704C2335F7D3EB90FBD820B7 = LOUP | V | 0x69D4F3654D7F8FF2E572C78FF71A5C39 -0x74A5A4698B9E707782B9CCB3692D6DD82E53CE12 = LOUPS_GAROUS | V | 0xDE8A0DF76BEE696B2E7E4F98DE28C6E8 ; MKBv25/FindVUK 0.94 -0x68D1637616B7E0523D471BEFDC29BC3A10E64809 = LOVE & OTHER DRUGS (US) | V | 0x46A75FF0500B7EC919E1E84CF77EE0FC -0x6D1952FFDA26708E5C9DC6D8FBB4C9C32321689F = Love Actually | V | 0xBA6633C51D18DEBD19405B7BF4778E55 -0x3EE358DC261F2B0A1B24DA79261C31C5507D7E7E = Love and Mercy (Love and Mercy – Blu-ray | V | 0x05A3E784464232AE3110544009066236 ; MKBv57/FindVUK 1.00 -0x35E756FEA47B4DB985E8510C73B60067F10E2A15 = Love and Other Disasters | V | 0xAB0966BF4BECFFA64E913309871FF177 -0x1A9B2BDEFB9BB483DAA5ABD4856B794FEB98B7A5 = Love and Other Drugs | V | 0xDACD2DE10B526459CE1BF59F7F2D2674 -0x0F3CBEFE67AD648BC5BDCA7E61273665B4CF6042 = LOVE EXPOSURE (Love Exposure) | V | 0x95AE07E55405924E66F26276F71793EC ; MKBv32/FindVUK 0.96 -0x6571EC0505CD3AD0C7B1AAE868BA7C51DAB42233 = Love Exposure (UK) Disc One | V | 0x680D2A213123B36A777A6F4580B26E21 -0x3206F97120D83857EB749E1663DAF8831FD0E275 = Love Live! School Idol Project 1 | V | 0x7026427D81A673DC710807FA035DA240 ; MKBv57/FindVUK 0.98 -0x7B6AF418F5005E1ADBE554E7EC1B188ECDB34E08 = Love Live! School Idol Project 1 | V | 0xE5EDBD0902E5075E6E0AA9D20B305FFC ; MKBv57/FindVUK 0.98 -0x83F17EDB1990C6F40AF601EE54F6FD2C083D4FA3 = Love Live! School Idol Project 1 (Love L | V | 0x38D96A29932BAA1DE0E82E746D0FCD64 ; MKBv47/FindVUK 0.86.3 -0xD8BC378CDDE47A199CD9F6724D318B37516F116D = Love Live! School Idol Project 1 (Love L | V | 0xDB3A3C27D095188009400B24DEFEAFFB ; MKBv47/FindVUK 0.86.3 -0x044285724B5D1F27D15EE841BCA25C6C624759F3 = Love Live! School Idol Project 2 (Love L | V | 0x3EE1D4448B27445095492E5AF82D11AC ; MKBv57/FindVUK 0.98 -0x0502EA2BF69586C674871757C260A23E6A0CFDA5 = Love Live! School Idol Project 2 (Love L | V | 0x9F8BD8EA5624EEA1FC88C809AB5CC57D ; MKBv57/FindVUK 0.98 -0x05D2ADD5CF56C708F79FD7C4CF72B2B107CF4442 = Love Live! The School Idol Movie (Love L | V | 0xCA128C752D04ABAD5A6E6824BBDD1548 ; MKBv61/FindVUK 0.99 -0x7A2B9A3A35E61ACCE8CF37A9BA8E04C9549F12C3 = LOVE NEVER DIES | V | 0xFA4C193A999A4A893E15C6A3BCA53C1F -0xB9177B0DA13ECE6F9C7CD3A0259DD54BAF109912 = LOVEANDMERCY (Love and Mercy - Blu-ray â | V | 0x8D92CE8E64553A7B3D4768F034DB9A1F ; MKBv54/FindVUK 0.96 -0x3F71F8BFB2C04951DE07ABB0E8C64B0A581161F4 = LOVELY_MOLLY (Lovely Molly) | V | 0xFDC0614571D890F5DC1CAA90D7163D05 ; MKBv28/FindVUK 0.95 -0x47E5CC05CFE74B17016D4FC1F89CE82871E707E0 = LOVELY_PARTY_DISC1 (AIKATSU???STARS! AIK | V | 0x7B1519A319FDBDEB9BD071DC6D5F23CE ; MKBv58/FindVUK 0.96 -0x3CAA4627DA894DBA4867A421156F4D7C583B0DDA = LOVELY_PARTY_DISC2 (AIKATSU???STARS! AIK | V | 0xA732179AA0908072EE9E9F46E420F39B ; MKBv58/FindVUK 0.96 -0x18D44CC9DF173B36527862D342D3907C8EFE67C8 = LOVE_ACTUALLY_GLO | V | 0xEAC1EEDD065365FE2AD9B63CE1E5115B -0x3FE57E3A680240C5684882EC607EEBDFF51F874F = LOVE_ACTUALLY_GLO | V | 0x1C631D1D89AE8D0EA166004F229D8B21 -0x321BAA0DB6F8A813AF8D53F995EE385B2FD64B21 = LOVE_AND_OTHER_DRUGS | V | 0xBFA29A33BC5BC0FB8F4A71719058E8CF -0xF1DD6C58670610843D2AD5F70C1E0D5346532471 = LOVE_HAPPENS | V | 0x80C45562694613B301B89B8AD40755A7 -0x8CD0ECD0D5F9678AE4616321A86C40D3E03E5FC7 = LOVE_LIVE_MOVIE (LOVE_LIVE_MOVIE) | V | 0x8CA27C93A60E0015779920FD0FD08652 ; MKBv56/FindVUK 1.02 -0x1427F42640326BA947147AAD7AE7AC309035C3A5 = LP | V | 0xBF78AB064F99954D53479C19E03E4FB3 ; MKBv30/FindVUK 0.80 -0x3C9ADC4EBB9DD4C613B3C72DDF9A7EA3659CAC34 = LSTSB_GLO | V | 0xF547CE28AA0EFE702E50523A05461717 -0x439B2EDE51FC428FFB5663ADAE312F2A85DBAC2E = LSTSB_GLO (Lock, Stock and Two Smoking B | V | 0x0B5F1C5456DFF933E1F2DD253FACF265 ; MKBv14/FindVUK 1.00 -0xE6F6A670AC5F45AEB2503D4AAAED7ABDBCB2FD4F = LTROI | V | 0x0B134E9E020029186E90B6E8E6B7DB25 -0x7B0A255B2105B69067916214AF4711CF745EDF79 = LTROI | V | 0x6D4F9141EE5C43801ADBA9A801E5C318 -0x89DBDF20FCBD49B3F8DB64591DF3D9833F32A4F4 = LUA_NOVA | V | 0xE18ED1DB6A94171FC98B0BBDD2732EEF -0xCAAE1190099D4E982495C5FC11647EF4EFE2FEE8 = Luck s1 disc 1 | V | 0x60B818C70ECAA30D3C60739E7CAF6CD4 ; mkbv27 -0x8E81FBAED0818EE8346072B47C36746F597D23B3 = LUCKY NUMBER SLEVIN | V | 0x435EF347763AB6D4CB887FF173CD65B2 ; MKBv17/FindVUK 0.99 -0x07735460E717790B58D739EDA26FA00CE8724DD4 = LuckyStar_D1 (LuckyStar_D1) | V | 0xBF5A6F0DB0702218EFFF361B728523E0 ; MKBv61/FindVUK 1.02 -0x1CAD3DDE1635D13C34B2E1C277846090B7A2FA65 = LuckyStar_D2 (LuckyStar_D2) | V | 0xDD7D28C6694396EF7DE8ABF9AD369C82 ; MKBv61/FindVUK 1.02 -0x10BC6BFB75AB9B0D61B66354CE2CCF66213C357E = LuckyStar_D3 (LuckyStar_D3) | V | 0x7119CE56D275E1E59CEDF161051881DE ; MKBv61/FindVUK 1.02 -0x54158F3A6466C31FAD539746E011AC2B62F7B1F2 = LUCKY_NO_SLEVIN | V | 0x0B5857111BDD7D66EC402B975BE0A4D3 -0x5FF0F14C6193B269CFE0EE899D8BCAD8C7C0B6C7 = LUCKY_NO_SLEVIN | V | 0xF22B63D062C2D04916754BA812FDC0DC -0xE3A00B43478662185D67D56FD8D8F576FE299C25 = LUCY (Lucy) | V | 0x3BB58EF4B449C54005F3EAC8F2BDB241 ; MKBv32/FindVUK 0.96 -0x9168DCF664402C485F668E29515841F307A0F674 = LUCY_NA (Lucy) | V | 0x68A00DEE6AB324ECB89CD707CC33668D ; MKBv46/FindVUK 0.90 -0x8FA0C2462C03019CF32DC6BDBB2B9EEFD2A3DB63 = LUCY_UPB1 | V | 0x78A6A533CB451667F378AF205F5CEA21 ; MKBv49/FindVUK 0.81 -0x70362499272D74213C6108BECCDF5E2600C9F5AA = LUCY_UPB1 (Lucy) | V | 0x09917DB5F5F83CF70BD52128C2C06508 ; MKBv49/FindVUK 0.89 -0xB851EA05E88759892C787C37077BC1EF4CBBCCD8 = LUCY_UPB1 (Lucy) | V | 0x2E98E601D058C407370EA06E2179B5D9 ; MKBv49/FindVUK 1.00 -0x85F4EC6640660C509053D47C10466B7B744A3A09 = LUCY_UPB1 (Lucy) | V | 0xCA402E2E0D466850ABDF5E33BA172EBC ; MKBv49/FindVUK 1.02 -0x15368D193064E6F613208DED070761C5B2AC3CD4 = LUFTSLOTTET | V | 0x4FB57074F8FADD38BCD4B90994A1844A ; mkbv16 -0x82DD88AF42518F506518CAE7B3633BBDE8EF0C84 = LUISA FERNANDA | V | 0xADA666353EEE1DA6BBFE46A124304043 -0x6F26E6EE01A361A2966381435D4ADD115CF4A350 = LUNAS ANGELS BLU-RAY | V | 0xFEBEE3F601E738A32EEA009AAE6E9A56 -0xDF07C77E1AF1B3DE828ED9765638CE780FF22A8A = LUOKKAKOKOUS (Luokkakokous) | V | 0x9C2570549CB91FF8610B5AB3BFE9B8E4 ; MKBv54/BEE/FindVUK 0.98 -0x43CD6E2888156B9517429A5A62E840010BC75AC0 = Lupin terzo VS detective Conan (Lupin te | V | 0x27BE5B5A68955E537479E201AC7A2334 ; MKBv54/FindVUK 1.02 -0xE3B0C47132B70E3031B70E8CCE1ED4A3D154C751 = LUPIN_1ST_BD1 | V | 0x4B80B59EFCB7AD5B02231F865F382125 -0x6A746DE30FC732D70DB6995EA784B375605610DD = LUPIN_CAGLIOSTRO | V | 0xC6860D6DAAA3B3956C587A31440C3866 -0x756E0A66D697B4F21E8CAE65635559C9D522ED2A = LUPIN_CAGLIOSTRO | V | 0x41B83D6FFD2E1A28CF4F8B6B4A84CDDF -0x39AE04C3C55CB8720809DE31F5949C5A09578F53 = Lupin_the_Third_Fujiko_Mine_D1 (Lupin th | V | 0xEC9DA9690E0A3B195A71BA211B7EEB32 ; MKBv36/FindVUK 0.92 -0x3DDCCD70EEC07B7397D17D5EF59291E50052AF12 = Lupin_the_Third_Fujiko_Mine_D2 (Lupin th | V | 0x1F0280B036DD6AAA4C001F08609BBCA1 ; MKBv36/FindVUK 0.92 -0xE9AD955EEE664B163C0CDF44884614E82F403860 = LUST CAUTION | V | 0xF9A73B278FEE9E15FB8F9E743CBD495A ; MKBv7/FindVUK 1.00 -0x8B438F8862323898B6A96560A29F425E96BFEE4D = LXGF2 | V | 0x05DE0DFD0D405B60D82129AC94537779 -0x41DE68F1D36733021275A5B795DE0242F21B1F49 = LXGF4 | V | 0xB9EF269413A260583A19B5161C4F3883 -0x0EB2CABD4A2DD77E6F173FA93F6AA1CB0931AAC7 = LYD1EUE1 (Lady and the Tramp: Diamond Ed | V | 0x6D49C68A9045C5CF4D8896132DF4451B ; MKBv20/FindVUK 0.94 -0x710746D3410B8907978FF3F5FF726920EFE5191B = L_AFFAIRE_FAREWELL | V | 0x047CA2E654DFDCD6DAE76F601E9E49DF -0x33C64C8215B511F810509810ABE5302968FD021B = L_UDIENZA | V | 0xD935B82DFEE48623544B47288F68579A ; L udienza -0x94CF058670B3D74C0B931ACAA1F149A567FF3548 = L_UOMO_CHE_FISSA_LE_CAPRE | V | 0xC06F6199E5E18A241472A6F241C96D99 -0xDA63DF51BE568D3DAD601E9B877FD91318339094 = L_W_ACADEMIA_2 | V | 0x6A4B8C95EF47A7748E06B55F4A8E3703 ; MKBv52/FindVUK 0.81 -0xD0DFCBA1720448DAAD054E7E4E3A4C7C24E39A38 = L_W_ACADEMIA_2 (Little Witch Academia Th | V | 0x369B2BD5518E419C56DBCC5088BA12E3 ; MKBv56/FindVUK 1.00 -0x8B9FF216AD03315B160BFE6F2BA884C9F0AD803E = M | V | 0xBA6DBB3FACBBEDB7A8221508795EAB1E -0xE4632563814F422BAEA8A20B5C02D23FACCE22D6 = M | V | 0x5748CE9BE904D6B23EBA627DD34094B3 ; MKBv16/FindVUK 1.00 -0x114ECD86C29AB7EB87F90533A9B8E3A3D79DA6DC = M0xB0906_2 | V | 0x9CBCA2206FD55C64B18E505FDD3149B1 -0xE64E75402928B920B43949D888DBDA1313DD5206 = M0xB0909_1 | V | 0x51D67D8DA4FA4F706070954141902EE2 -0x0FE5C669881ECEFFCAACCC13172F84D58C6F2D96 = M0xB1008_2 | V | 0xD94EBE229BA11F06E54446648A2AD32F -0xEE8C118C9F151B7272D9BB39BD5D6C0D5C4BB718 = M0xB1009_1 | V | 0xCBCDC76D1ECA14209A75CD948E3E734B -0x6667DCAA8D2D42CD2D028A54C00A227541EE64CE = M0xB1009_2 | V | 0xC6BFB657A3F2A9CD78153DA00700179D -0x8CA103BC806DBC6497F311879B498550C84DDEC5 = M:i:III | V | 0xCEB7770255E6CE200906A3C8A404B6AF -0xD9032059AC1F8A19F6250F9A7CF4232B7A96A734 = MAAYA SAKAMOTO LIVE GIFT | V | 0xF49959C3D8B4D13D46F5FCE51FF531B1 -0x4C7303902DA16C0BCD1F66CB40CCEA7B84A28BAC = MACGRUBER_G51 (MacGruber) | V | 0x80C5F413A1A07B9C45FAE2B1878650A3 ; MKBv19/FindVUK 0.96 -0x2BAB5FF4F18FE7E947CEE4D3FABB8BD327B0B4FA = MACHETE (Machete - Blu-ray???) | V | 0x7F9F2CC700E3E4D014A1EAD5410C8A58 ; MKBv19/FindVUK 0.96 -0x35BDB2E51461310F3C115C94B6A40F60EF472559 = MACHETE (Machete - Blu-rayâ„¢) | V | 0x7A3AAC14D15C40AB3CD579EF632864FC ; MKBv19/FindVUK 1.02 -0x2C134802C927ECFE886110C569773EB58D76C1C3 = MACHETE (Machete - Blu-rayâ„¢) | V | 0xBA920EC99B13A4C70F05C4A83D964AE5 ; MKBv31/FindVUK 1.00 -0xE47AA6E9C2C2D885F00CF426F801B8560C07FBFF = MACHETE KILLS | V | 0xA7B0111445A3F429CD97FB10B6DB5E25 ; MKBrev 44 - FindVUK 0.57 -0xB188F653C1FFCC572253D5170B7D53D12B301D29 = MACHETE_KILLS (MACHETE KILLS) | V | 0xF1A250B7AA1B5F5E36C68B38DF8F0A58 ; MKBv46/FindVUK 0.84 -0x689D8A3D1AB23909EF51E0954DA302482068CB4F = MACHETE_KILLS (Machete Kills) | V | 0xA36788D3F334D7CAD5E96B6DBF052497 ; MKBv46/FindVUK 0.83 -0x319126625ACD652C43F3D6C886070A5C5F79AA9D = Machine Gun Preacher | V | 0xEF6B481A3601444F82F0EFB29B409EB7 ; mkbv28 -0x2D36508A5859C6CB3730EBD8416214B6E98AD2A2 = MACHINE_GUN_PREACHER (MACHINE GUN PREACH | V | 0x5B13D2DA35419D6AE069227695BC00FF ; MKBv28/FindVUK 0.83 -0x3D062EF11F0287ABFC8E299EDBDA87D99D202BD9 = MACROSS F BUDOKAN Disc.1 | V | 0x74D3731B590568D973452B3D0470ADE8 -0xBC736EFE89E7E6D749A9C4D900783E534D24CDC8 = MACROSS F BUDOKAN Disc.2 | V | 0xFB0542B38418FF4B15EC47E29563AEE9 -0x7C9F0FCEF5CCCF1A083FDFE327819F0F5D8CA4E8 = MACROSS_FRONTIER_01 | V | 0x0A117AAA012C9D0E98E4D214B0054D2B -0x9D3C8A18DE22FA896FC27F68A3A471662DAF1FD7 = MACROSS_FRONTIER_02 | V | 0x357DD405980389E2609A03087869DC2E -0x64AD974AA22276B6ED506BA908751AA3C7D68855 = MACROSS_FRONTIER_03 | V | 0xF4BFC082A6AA4F51B6E5EF23D6C8656B -0xDECC5220FB2CB2241BBCD5EFC9BE3EEDBC91657E = MACROSS_FRONTIER_04 | V | 0x73243C036B77B0B310D583CD4E6FC84E -0x803C1589BCFF104FACD5C487D70EEED6D02EE4A2 = MACROSS_FRONTIER_05 | V | 0x377A9BA82075FC92DCEA239C171D3D35 -0x2A44ACABA4780A7D9C99472287C5EA62B7EC4262 = MACROSS_FRONTIER_06 | V | 0x92C045B8B0EB921F8AF1428827AF6F8A -0x1219593F2F4B26782D206B10EC86AC79E4D46FF4 = MACROSS_FRONTIER_07 | V | 0x70F4C86D4791E9820E7033B00DAF9584 -0xE7A4BEB4B30E6308423F25C7CEDF6D7874B43913 = MACROSS_FRONTIER_08 | V | 0x3F4AE1FD90D2351719D43A30843B3FA8 -0x812C62456E119E890014B263C74DC4224F68D82F = MACROSS_FRONTIER_09 | V | 0x3AC2FEDF34BA9C2C5433EF048FC3922B -0x06D0ABD42A3D3675BEA45CCCDFBD5B700074325F = MAC_F1 | V | 0x1CBC13182F363AB2E9A0BB86F9A9EDB5 ; MKBv4/BD+/FindVUK 1.00 -0xE830859C97FBF7E2C795AAF9EC8411A664DE9092 = MAC_F2 | V | 0x445A36628F35151EA84EBC9A0F172380 -0x091CE0E9E659503D2249DDDAC70E17C3CA0C9504 = MAC_F2 | V | 0x6674028EF25F0452B379A1637A553B60 ; MKBv4/BD+/FindVUK 0.83 -0x97B23302CEA54C9448BFC8DB95796D92C37A8CFD = MAD MAX | V | 0x50E6A0701C7A9699D390994947AE8AB1 ; MKBv35/FindVUK 0.65 -0x225ACC1ECF9D4ED0B8CEFDB407F4935E0AAB324E = Mad Max 2: The Road Warrior | V | 0xCD9F57CCC3DAAB50E661BF9C5F01320F ; mkbv36 -0x647DA92D0A947BA0899B975137C2DBB903EA4905 = Mad Max 3: Beyond Thunderdome | V | 0x81D888BD9B5285562D48CCA9C5433F00 ; mkbv31 -0x18BA83FDA3C43E581BA5753D1E99DE2871967604 = Mad Men - Season 1 - Disc 1 | V | 0xABC253040A9FDE86415948A586F59484 -0xABAD9A38EC55C6841AE71D3CB7A9BF1805362870 = Mad Men - Season 1 - Disc 2 | V | 0x47FDFA2D2EADECA922D2D75315A7E447 -0x459892FF2E9E85DE308D0AFA64B7F849664FC506 = Mad Men - Season 1 - Disc 3 | V | 0x1A66ECEF16E84D4398F744332DC3AE99 -0xD7DAE0B0453F17FAF3F3C25E8A2DD4C49F163D1F = Mad Men Disc 4 (Mad Men Disc4) | V | 0xF88AD1109C019B7E11718262F7FE4D1A ; MKBv9/FindVUK 1.00 -0x55C025158472E49E4CE1E44C42C0DBEBD7D5CCDA = Mad Men Disc1 (Mad Men Disc1) | V | 0x4718575F7F5656985D7D53A579B99D06 ; MKBv9/FindVUK 1.00 -0x883884F86D8E01B1AF550A8EF42411F496736E19 = Mad Men Disc2 (Mad Men Disc2) | V | 0xF814305693AB8BD48D3517D2B2852B9A ; MKBv9/FindVUK 1.00 -0x17FEC08394AC59BC0F591A1C529F931183648C58 = Mad Men Disc3 (Mad Men Disc3) | V | 0x09EE25ACB5F43BE4C3869244F1B6AE67 ; MKBv9/FindVUK 1.00 -0x938ABE5A8D9C9359050BB9E234C0B53117B047BE = Mad Men Disc5 (Mad Men Disc5) | V | 0x766C7A58A4C7EA6366FD731CE09535DB ; MKBv9/FindVUK 1.00 -0x88A9088DDCF96618FA749CFF6176CBEE9E45AC90 = Mad Men S03D3 | V | 0xE5768CB86ADC36E91F3B034DEC911685 -0x49FE1B0A0E4970086A2DB9373CD97E916147E0E6 = Mad Men S1 D3 | V | 0xA6A6E8BC6ED3D70F8EE5D4FD1C5C20BB -0x685271623EC81BD117E41965943D4164C88A5D92 = MAD MEN S2 | V | 0x00841595F24E7E5FF8330F48B02E6DF0 -0xBC0BDEE7BFB9D090214DB0B56B088D3159E8BD91 = MAD MEN S2 | V | 0x0640E222A5122AC8C39E72918A440BA8 -0x58ABCFFC1804410A105A130200F1CC72CBBB7FF4 = MAD MEN S2 (Mad Men S2) | V | 0xEC2CEACF2987AAEA7443CF1498B8B2E0 ; MKBv31/FindVUK 1.00 -0x35370A7AC2A83A5D8BB904B4AA5F8EF9B9949AAE = MAD MEN S2 (Mad Men S2) | V | 0xD1819BFA037277868B4AD7D1DBE12D50 ; MKBv31/FindVUK 1.00 -0xEE56B4785149BFBB563B017C842619A7800B5737 = Mad Men S3D1 | V | 0xFF85E6CCB5F2740796AE610CA2B66A9B -0x7114C88EE2D730F173999738897223615B99F4C2 = Mad Men S4 D1 | V | 0xE831B76E222596FD4CD2CAD98AF444CC -0x6BAB21F6722519FF7193834B15F877C17430CF1D = Mad Men S4 D2 | V | 0xD17166BD8CD37E73D8E97E43692DBD29 -0x8296CCCEAF656F094068DCEA7DFF9B7635157B5E = Mad Men S4 D3 | V | 0x39512EB0EE2EEFCA93282E0081FE46EA -0xC16794B84FDBBA5BBE46D9E331911743743BF517 = Mad Men Season 3 Disc 1 (Mad Men Season | V | 0xCD243804D288DD46DA51A89F646F1FFA ; MKBv31/FindVUK 1.00 -0x75EBF11F00664206550E9EDCD2A19309BB69E4C1 = Mad Men Season 3 Disc 2 (Mad Men Season | V | 0x52BCE44E98345F490D7C718F1FC6AD16 ; MKBv31/FindVUK 1.00 -0xC9DE2B2D208440BF3DF37E97B79B44749BBA144F = Mad Men Season 4 Disc 1 (Mad Men Season | V | 0x735E0772B7628A8B95B4F7FA8FED0E32 ; MKBv19/FindVUK 1.00 -0xA13622A1E120D3819189CA57AA0611402D803230 = Mad Men Season 4 Disc 2 (Mad Men Season | V | 0x7999C84075D41E8A3DF07A846E6B51A1 ; MKBv19/FindVUK 1.00 -0xB86DBAC3361A27B9D608D08F82BF6199310BB562 = Mad Men Season 4 Disc 3 (Mad Men Season | V | 0x39DC37EF774EEDDB5D3D2D071710146D ; MKBv19/FindVUK 1.00 -0x8C0C59836F69BA3D9AB6C9C18DA2E0CF00AA0EC4 = Mad Men Season 5 Disc 1 - NOR_SW (Mad Me | V | 0x324A823E8D3439F3538D97D17F08CB64 ; MKBv33/FindVUK 1.00 -0x29143CA36373F1D717A650405BC5B565DE211D46 = Mad Men Season 5 Disc 2 - NOR_SW (Mad Me | V | 0x7C8BCAD58F70779921B4C8113EA12348 ; MKBv33/FindVUK 1.00 -0x04CE90B4A833578A2ADA4E1978BFFF71CEDBCEE8 = Mad Men Season 5 Disc 3 - NOR_SW (Mad Me | V | 0x6E94270282F4C422067238F6E337AB8B ; MKBv33/FindVUK 1.00 -0x5D7A755A6820CC53540C6C5B95220A3DF45AE8C5 = Mad Men Season 6 Disc 1 - NOR_SW (Mad Me | V | 0x6772C0438291A66078CC10B99F511EEB ; MKBv43/FindVUK 1.00 -0xF810A0DDF95CCD0BFF00F6A3893450B092D50868 = Mad Men Season 6 Disc 2 - NOR_SW (Mad Me | V | 0xB91F1F817B5AFA6B99A5E06BE10CA7BB ; MKBv43/FindVUK 1.00 -0x9F55481CA51B915BE1F9BE58CBB48C953B597978 = Mad Men Season 6 Disc 3 - NOR_SW (Mad Me | V | 0x4E4C0F5AEF98423325521B8B3A6FF39C ; MKBv43/FindVUK 1.00 -0x0697104088BF4A4628F514F0E4BCC42C47C682C6 = Mad Men Season 6 Disc 4 - NOR_SW (Mad Me | V | 0x4C325F2AE03BBD3690441A9CF99B17B7 ; MKBv43/FindVUK 1.00 -0xC2E80EAB66D93C8452AB796D829C576D35E1006E = Mad Men Season 7 Disc 1 - NOR_SW (Mad Me | V | 0x23CE0D2AA5689E37E262A8E13605EF2F ; MKBv48/FindVUK 1.00 -0x41AB542F2443C772B6928437BE6F23F251C06623 = Mad Men Season 7 Disc 2 - NOR_SW (Mad Me | V | 0x76B8F751AA60AE6576899CC55B9B79A8 ; MKBv48/FindVUK 1.00 -0x07A80AFC6986DA6BC452A45B7CF80EF5081B1C4C = Mad Men Season 7 Disc 3 - NOR_SW (Mad Me | V | 0x8FA28B5B4047C41D224DF4AC9710888B ; MKBv56/FindVUK 1.00 -0x43E195EE011EA267C4573CA0C96FF7915F12CED4 = Mad Men Season 7 Disc 4 - NOR_SW (Mad Me | V | 0x3CAC09ADA83BCF912F4D54D7B5059B4F ; MKBv56/FindVUK 1.00 -0x2DD33517B73BA264D3769AFBBA6E483B05A980FF = Madagascar | V | 0x0ECEF38E9BD7B86F10BC7F0572CFAA24 -0x58551864746F7862536EA5F757EE35A4AFD88E28 = MADAGASCAR | V | 0xBBC1904D9B8A887D4CDB5C7A2E178364 -0x25011D76F28120DDB2FF7BAEBAA3ACD6050C6B2D = MADAGASCAR | V | 0x59C01AE54C31445027130F1257110FB1 -0x64EE4EB19410587A6E7E902866FB5D9379068583 = Madagascar 2 | V | 0x122B9ED33BEC2793293DEAE21508E97C -0x9F1F0DEA5CF01AF8A5E2F3B6E2AF7ABF41435B79 = MADAGASCAR_2_EN | V | 0x28410AB3CB62FA0F1104EF4A2D68D686 -0x0E492470FC3184F1035AD9DC89BF3A64C5636825 = MADAGASCAR_2_ES | V | 0x4259F1C9F66F32711294F586DF194E23 -0x24055B0A89583E7684D81FB8BFCCD37CCAB6C5B4 = MADAGASCAR_2_ES | V | 0xB5D9D1F2A2A9169DCC7D9FE231B59905 -0x02EC7B008E1CB4C80D2484C869EA7D37BE71608F = MADAGASCAR_2_ES (Madagascar Escape 2 Afr | V | 0xA673B9F2D9F9D40B4567DBF2E8B1AAB8 ; MKBv12/FindVUK 0.89 -0xDF50015DBE0D899382CD7B3D2A036A1F0EDCA34E = MADAGASCAR_2_NA | V | 0x4A702D1EF48E00265A4B2ACEEC7AE20F -0xE6AC632CB4547EBC39C55EA831C67B137E4954DF = MADAGASCAR_3 (Madagascar 3 Europe???s Mo | V | 0x35629B7EABC5BDAB1E7C86CBDD6F9593 ; MKBv31/FindVUK 0.96 -0x25F54599857DA1B05879554F9E230CE40167D09E = MADAGASCAR_3_3D (Madagascar 3 Europe???s | V | 0x99E4D5CCFD383EFCD8E1A6C1F6C7448E ; MKBv31/FindVUK 0.96 -0x5D003164FF24542F6EAF54FE8C96BB47CB101404 = MADAGASCAR_EN | V | 0x7DE705944CB3A98412230ECD56C7595A -0xEDD322FDC6417AF36AB72AEBD608B58AC5D27551 = MADAGASCAR_ES | V | 0x397EBECDF57F9EAD0A55E0E07ED37882 -0xCDE6B2223B34EC4FDB00F65F2D9BB1A055011D15 = MADAGASCAR_ES (Madagascar) | V | 0x2516C28ACF0F1A2119A3DC7CB925E97B ; MKBv12/FindVUK 0.99 -0x0428D928B691D986F2583701EAF14C57075BC7A7 = MADAMA BUTTERFLY (Madama Butterfly) | V | 0x4EE8375C7DB5AAC783B0C568DF556179 ; MKBv48/FindVUK 1.00 -0x0406D61648378128F1476DD396F66FA67E23BF02 = Made Of Honor (US) | V | 0x29EBDE5866C1D21EFB4DFB3695247E85 ; mkb v7 -0xEAE6EBD4ADC98D5DB6712B85CAD2132B96E20F04 = MADMEN3 | V | 0x05E967EA7CF9648BCAE86C93C717336A -0xA919E35C7A4A0B84C205549E17D822A5E03DFD93 = MADMEN3 (Mad Men Season 3: Disc 1 - Blu- | V | 0xD2D31B92C3E8AF6C33352D9BA6C3F767 ; MKBv16/FindVUK 0.96 -0x964855D09862471E91FF15C762B50D33F1250321 = MADMEN3 (Mad Men Season 3: Disc 1 - Blu- | V | 0xB4E950C27AF0F053E7CCC1D38F6CA9E6 ; MKBv16/FindVUK 0.96 -0xC9BC563D0154A9A866154113E4717B60E5A137A9 = MADMEN3 (Mad Men Season 3: Disc 2 - Blu- | V | 0x96A2EEC02F989BC6BDCC8C4AEDC2F115 ; MKBv16/FindVUK 0.96 -0xB1868F5BC2FD385BC645925008475CE8E0F98D33 = MADMEN3 (Mad Men Season 3: Disc 2 - Blu- | V | 0x31E29B6F62BB8C49CEE2637ECEC765C0 ; MKBv16/FindVUK 0.96 -0x3396D3B209A47B274B51A17A4A544D9E94D6D15D = MADMEN3 (Mad Men Season 3: Disc 3 - Blu- | V | 0x27A51B74FEE75614DCA5B3C784C69856 ; MKBv16/FindVUK 0.96 -0x52126B5EED7BE2D6D51ABCAB835689DB7B689E77 = MADMEN3 (Mad Men Season 3: Disc 3 - Blu- | V | 0x0F474886A56CD37BDB9AAB28A8A80147 ; MKBv16/FindVUK 0.96 -0x5FCC308476516C9881A1C7EFDEDFAC3145A64796 = MADMEN3 D1 | V | 0x12CD800C9603A1D15EA98091B2776832 ; mkbv17 -0xE0D7592967DF4FA27DC38771A34B6769F9A5F0AA = MADMEN3 D2 | V | 0x09C00159334585DB2BA4A9D3F9455415 ; mkbv17 -0x1829C6375CD8ED402F7E4AC44535A70CA08741BE = MADMEN3 D3 | V | 0xD99CE9E689520F78B941380441AAD2B9 ; mkbv17 -0x58497BBC239CA7874EA0247443698F1CD4FDAB1B = MADMENS4 (Mad Men Season 4 Disc 1 - Blu- | V | 0x6F5FA1DD9BA80C93B3D63CA730F35818 ; MKBv19/FindVUK 0.96 -0x5D9B86ED051F81979FA0BAB524702C32649BEBC0 = MADMENS4 (Mad Men Season 4 Disc 2 - Blu- | V | 0xB5F695786049D1F20EEEF60D7CFF7449 ; MKBv19/FindVUK 0.96 -0x004B903B46BF21261CBD9DBD611AD0833B858AF7 = MADMENS4 (Mad Men Season 4 Disc 2 - Blu- | V | 0x8B964153E73C4E403A5FE286DECCD1A8 ; MKBv19/FindVUK 0.96 -0x24B8A87EF8F415FF392EC0BE66EA00639DB029C3 = MADMENS4 (Mad Men Season 4 Disc 3 - Blu- | V | 0xB985886633EC426D249FCDDB43858DC1 ; MKBv19/FindVUK 0.96 -0x5B1CC0B63C1D2D7DF90BD8F5FE1F6D9B28DDB453 = MADMENS4 (Mad Men Season 4 Disc 3 - Blu- | V | 0x8F1C292CF3CBEA6005705A029A71C96E ; MKBv19/FindVUK 0.96 -0xAEAC4FD87D2405458084DBAFDA25D120B7F118A1 = MADOKA MAGICA BD3 (MADOKA_MAGICA_BD3) | V | 0xEF86CF91EDDB4D86D5D970DDA82F2D8B ; MKBv49/FindVUK 1.00 -0x8D6399D31E78794F8C0DBC30E5F727929BBC05A5 = MADOKA_MAGICA_BD1 (MADOKA_MAGICA_BD1) | V | 0x4FBADF4219B540A739967521369666E1 ; MKBv44/FindVUK 1.00 -0x923BEC5EC8867960C4B5620368EF0678910E853A = MADOKA_MAGICA_BD2 (MADOKA_MAGICA_BD2) | V | 0xC31344D3C867CA1F245A6200FC0B3433 ; MKBv44/FindVUK 1.00 -0x9FC9543C109B478895982F575FBF578E06F6D8E6 = MADONNA STICKY AND SWEET | V | 0x3DB09A711D1F1D23FE4FECDAB60770E2 -0xD939FCB8472A650C0E940F3D7CF42F46BE781AD4 = MADRES_HIJAS | V | 0x85DC15B4A3685300B91E6FFCF5AFE810 -0x267C62E7090E092811B9E723BE3644B3F765709A = MAD_MAX_3_BEYOND_THUNDERDOME | V | 0x801B0A46B445867438EF2E3D8A2EC2F5 ; MKBv31/FindVUK 0.65 -0x4F19F6D59E02E90F01A675AC4F1E8BAE23384DE1 = MAD_MAX_FURY_ROAD | V | 0xB97D930CD27C9A0BEA2D5E11589730C9 ; MKBv50/FindVUK 0.81 -0xA84E60E72C1B00D2B629882B992B48ED41AEDDF4 = MAD_MAX_FURY_ROAD | V | 0x0CCF210534C6B14F7053334EF398C7CA ; MKBv50/FindVUK 0.81 -0x30EEE56C70AF36838FA9ECE08125F96561ED5DBC = MAD_MAX_FURY_ROAD | V | 0xBE07607B8C32CAFD8AA3B189EA01C7CA ; MKBrev 50 - FindVUK 0.62 -0x7BD91E1BDC65267875B741783BA060BF19A7B40D = MAD_MAX_FURY_ROAD | V | 0x968340C0BC5F7AC7D25E9C69B8EB164F ; MKBrev 47 - FindVUK 0.62 -0x0059333875079156BEFF180BBD39B831F3B15D50 = MAD_MAX_FURY_ROAD (Mad Max Fury Road) | V | 0xE9D487438238FCA2E94692698839197A ; MKBv55/FindVUK 0.96 -0xDFA31AB4BC482A2BB157C23069F627837B9B346E = MAD_MAX_FURY_ROAD (Mad Max: Fury Road) | V | 0xCA5D3A76F160BB1698BCA8429C9470DC ; MKBv47/FindVUK 0.99 -0x351424BADF729EC6AF9DE56F6337B7A88CBD0E53 = MAD_MAX_FURY_ROAD (Mad Max: Fury Road) | V | 0xAA6475A5154AEE62D2E9B98A64628E68 ; MKBv47/FindVUK 1.00 -0xED9DCE6B9587B507AD7FCFE6B268536DF0A3E381 = MAD_MAX_FURY_ROAD (Mad Max: Fury Road) | V | 0x6F8A81B9DEF12D0B35C4D8046E9ED22D ; MKBv47/FindVUK 1.00 -0xCBBE5EAFD8DC89230024B3C544A286541816E120 = MAD_MAX_FURY_ROAD (Mad Max: Fury Road) | V | 0x49817117C1620B43C8FC7A8CDF9A4187 ; MKBv47/FindVUK 1.02 -0xFDD8ED6A7DE11EE7424A195B0A7E50752D839F42 = MAD_MAX_FURY_ROAD (Mad Max: Fury Road) | V | 0x10725A53EACD2CD6A0293F6890CBEFC8 ; MKBv47/FindVUK 0.91 -0x8FF0954E69714FDBBF64443A93EA5A075E2A1B2E = MAD_MAX_FURY_ROAD (Mad Max: Fury Road) | V | 0x1384281E37796C9DEC47F08E151355B3 ; MKBv47/FindVUK 0.99 -0xED337E3917AC6AE3A6863192832F389B88D027EA = MAD_MAX_FURY_ROAD (Mad Max: Fury Road) | V | 0x2A3ABFB20D3D0567A8E9EFDAD0DBD0D0 ; MKBv50/FindVUK 0.86.3 -0x384F81CC7E3D235A7AC8389AB1E729224C5EE9C2 = MAD_MAX_FURY_ROAD (Mad Max: Fury Road) | V | 0xDCFE3DA6D451F5F4E7FDA60DD7063890 ; MKBv47/FindVUK 0.92 -0x1CAFFFA41E1C767CB072B5E38ECEE81BDED04D90 = MAD_MAX_FURY_ROAD_BLACK_CHROME (Mad Max: | V | 0x8AA751096B2D808009443A7B384F39ED ; MKBv57/FindVUK 1.02 -0x13DDF641C6FDA238AC42765EAF5AE0C829F1D0E5 = MAD_MEN_BONUS_DISC (Mad Men, The Complet | V | 0x5A2CECFFDDBB1EFB7DAE7CFEF1BD1DAA ; MKBv55/BEE/FindVUK 0.96 -0x6BC8F1E83417C3E747EA9CE5B693DEC7950A485E = MAD_MEN_S1_BD2 | V | 0x2A0F91C993A30B42DBEC13608669A401 -0x22B8755C7E2FD1CE497CFA38ED1ABF8624B5AD45 = MAD_MEN_S1_BD3 | V | 0x363C7ED87474B2B7E2ACDC396BCF1E28 -0xFE2C3C87CCBD1E144B4F0DE0A0F03EADFC5F64D8 = MAD_MEN_S1_D1 | V | 0xB29EDA391AAA68B2A469C8C0A003ADC3 -0x101025DAC1FDF86E2561FC48E36F9576E642E1F0 = MAD_MEN_S1_D1 | V | 0xEC52C38D640150BF2E4BFFDD9AFC1790 ; mkbv9 -0xCAF08CB32F1E39F94C8EE65DFCD4276478217A05 = MAD_MEN_S1_D1 (Mad Men Season 1 Disc 1 - | V | 0x7CE1CCE03C882940A79E7BEFEC4307E8 ; MKBv7/FindVUK 0.96 -0x0898DC83F81B6D32474EAB52E8183FBBDF2645E0 = MAD_MEN_S1_D2 | V | 0x827F7ABA166601E7477BA6B924F30723 ; mkbv9 -0x948F0C2D797185869B78854968821B6B62D0A038 = MAD_MEN_S1_D3 | V | 0xF697B17E1C1E7EA1DAF3C5B67A82DB47 ; mkbv9 -0x47D0A72DD01137DA1576B8C852F357238CD7D52F = MAD_MEN_S1_D3 | V | 0xD0DC96821FEB3F6F8CFEAA22F8368F63 -0xB53E659A6E359EF8EEE49557827AE519EDD428A3 = MAD_MEN_S1_D3 (Mad Men Season 1 Disc 3 - | V | 0x0805A182E290AC229AAED1509197D0CB ; MKBv12/FindVUK 0.96 -0x3B2BD33C5FC4260EE92550885B6BF793625E919F = MAD_MEN_S5_D1 (Mad Men: Season 5, Disc 1 | V | 0x510774178B44F880BAABB4314E027F33 ; MKBv28/FindVUK 0.96 -0x966184DF8D3119CA10C70250A97C8F5C7BEA2227 = MAD_MEN_S5_D1 (Mad Men: Season 5, Disc 1 | V | 0x6CD45AA4E47A450233DC799D6CB251BE ; MKBv28/FindVUK 0.96 -0xE963AF229DA40B005FB7C0CCF8658E8F15F25EEA = MAD_MEN_S5_D2 (Mad Men: Season 5, Disc 2 | V | 0xCB5B4B4FD905FD7011D3BE7799BED90F ; MKBv28/FindVUK 0.96 -0x79AB57744B78667429C5364EAEBC319966B4F00B = MAD_MEN_S5_D2 (Mad Men: Season 5, Disc 2 | V | 0xBE3E4AE2109ADFB46EE0B250DB0C6062 ; MKBv28/FindVUK 0.96 -0x291EDF2E6961FB3D0C1CFF7F831934CB8932BF8A = MAD_MEN_S5_D3 (Mad Men: Season 5, Disc 3 | V | 0xD51B9A984D51CC46B7874A7ECAE04C55 ; MKBv28/FindVUK 0.96 -0x55A930AF3FD1427F4CFA367BFBA9B908BA13EA03 = MAD_MEN_S5_D3 (Mad Men: Season 5, Disc 3 | V | 0x37702914AC2636B5523AB89B85B7E0CF ; MKBv28/FindVUK 0.96 -0x6E51C2890B0270508E62C33A8AB12E5355860D04 = MAD_MEN_S6_D1 (Mad Men Season 6, Disc 1 | V | 0x5354721D3BA2D1B19C04DCF62F930988 ; MKBv34/FindVUK 0.96 -0x69848B9386059B5986F9792A8DD008BC965F9AD5 = MAD_MEN_S6_D1 (Mad Men Season 6, Disc 1 | V | 0xA03684A7C3784DD517CD3D3925DF4C5D ; MKBv55/FindVUK 0.96 -0xFCC61FB6592F8D5E341909B8D6C117F24B14EC52 = MAD_MEN_S6_D2 (Mad Men Season 6, Disc 2 | V | 0x8A7B4C3B958EFE4E794A0122CB4CC54C ; MKBv34/FindVUK 0.96 -0x394F74F4C3FDDD7B1CA3AAF088C88E1FD85FB3F0 = MAD_MEN_S6_D2 (Mad Men Season 6, Disc 2 | V | 0x5D7E0F160D6610B733BD5DA74564ECB2 ; MKBv55/FindVUK 0.96 -0x01D1084638997EE7E09EE07969AF7C6B98686C06 = MAD_MEN_S6_D3 (Mad Men Season 6, Disc 3 | V | 0x342FF553C3D711BA50D7DD9D5ABC1064 ; MKBv34/FindVUK 0.96 -0x3BFED19770E855EF6AAEB4B6E26A5D9CAB8D0190 = MAD_MEN_S6_D3 (Mad Men Season 6, Disc 3 | V | 0x5F01791978759112AB937D8AB479FC02 ; MKBv55/FindVUK 0.96 -0x00D2DAE22207C5030D19747416A412605C94FA0B = MAD_MEN_S7_P1_D1 (Mad Men S7 Part 1, Dis | V | 0x509FFC8DC8E176655E9A4745826F19D7 ; MKBv48/BEE/FindVUK 0.96 -0x37608EB8F90AAF1275D27D2C2B23BD63DCBA4D64 = MAD_MEN_S7_P1_D1 (Mad Men S7 Part 1, Dis | V | 0xDD825DC1F6579214466CF82C03D697F5 ; MKBv48/BEE/VUKNOTVAL!/FindVUK 0.96 -0x29C6CFC5EA0BA65DB6DE379F1D6627EFFE04EAEE = MAD_MEN_S7_P1_D2 (Mad Men S7 Part 1, Dis | V | 0xF7BC6EAB5B606C8C34497638B319874D ; MKBv48/BEE/VUKNOTVAL!/FindVUK 0.96 -0x496BC6FFE20A13AAD85D511F4F4758E8530069FD = MAD_MEN_S7_P1_D2 (Mad Men S7 Part 1, Dis | V | 0xD7A1570CE8AF781B9DD76F1B487A4814 ; MKBv48/BEE/FindVUK 0.96 -0xCB82A10C5F6F0C76DBE8F1411B2D152F0E31AAD5 = MAD_MEN_S7_P2_D1 (Mad Men S7 Part 2, Dis | V | 0x72DF26C021EF14FE1517982DA0CD779C ; MKBv48/BEE/FindVUK 0.96 -0xEF80098866A695C0B9F9F644FA14F5D2EFAC2821 = MAD_MEN_S7_P2_D2 (Mad Men S7 Part 2, Dis | V | 0xC824763C0D26B96689B1DBFC42CDFD84 ; MKBv48/BEE/FindVUK 0.96 -0x4A6C6060E0AC606F56FC238AF7ACCC419842E1E1 = MAD_MEN_SEASON2_DISC1 | V | 0xE0FFEFA45DF05DBCE7FA6F2CC91FF8EE ; mkbv9 -0x45D3489A262F36EC5288DE244B9C9054BB586EFA = MAD_MEN_SEASON2_DISC1 (Mad Men Season 2 | V | 0x39A66ADACC285F408BA3347A0F6DA4BE ; MKBv12/FindVUK 0.96 -0x12237CC4D7EBA3C57734F7202DD13C8D43A051DC = MAD_MEN_SEASON2_DISC1 (Mad Men Season 2 | V | 0xBF16973BBC04DA602E0CD57EFC47A07F ; MKBv12/FindVUK 0.96 -0x5A1FBF0094E1FEBD3AABE3D6721A559B98497952 = MAD_MEN_SEASON2_DISC2 | V | 0x103A4F1806CE477E71885672CEB24ECF ; mkbv9 -0xD05C9482714ED89EB151C8B2A7365A824CD0141B = MAD_MEN_SEASON2_DISC2 (Mad Men Season 2 | V | 0x8BD129182D9F7CAE4756D1B8B5815486 ; MKBv12/FindVUK 0.96 -0xB7208DA3E0B9D91C7DBF8ACC7713B94D6519F453 = MAD_MEN_SEASON2_DISC2 (Mad Men Season 2 | V | 0xF915352330E84298B98406E87452E047 ; MKBv12/FindVUK 0.96 -0x7C129CD73633B0E8BA8F133BC2171B1E37082AA9 = MAD_MEN_SEASON2_DISC3 | V | 0x1A8B4BC311F4321672164CE42392FC5D ; mkbv9 -0xAB5B98383DF2806561836FD4D4A57536EF0D2FF1 = MAD_MEN_SEASON2_DISC3 | V | 0x5B3A58794880692630D713B13DD6B829 -0xE3663297A158E6661167116E4DBFF541163C5015 = MAD_MEN_SEASON2_DISC3 (Mad Men Season 2 | V | 0x76C3CA93CE6813D3842684313E274E5A ; MKBv12/FindVUK 0.96 -0x7514DC67EDADB06CCAF2118C0A108732621D45B3 = MAD_MEN_SEASON2_DISC3 (Mad Men Season 2 | V | 0x952E12CFAFD4AFB60EDC5ACB07180E11 ; MKBv12/FindVUK 0.96 -0x8FCC871CB87EA48FA00C7B111F3705631E007CEC = Maedchen von St Tropez | V | 0xF78185E5A26F8E37D62E5F375BAE4CC9 ; MKBrev 48 - FindVUK 0.54 -0x0592380CC57166554AD91B563945FE1A38F37F1D = MAENNER DIE AUF ZIEGEN STARREN (The Men | V | 0x3B259DF28C40C3280B50141551EBE7CE ; MKBv17/FindVUK 1.02 -0x76B42984C657283710D04ACEEE297B9A9D476213 = MAENNERHERZEN | V | 0x9A8260D9F9DBFCF99A23DCFE9F0B5517 -0xC470A7D01E8C0E1B73DA54C9B6EF7B7A2A157FE8 = MAENNERHORT (M??nnerhort) | V | 0x02CF780A99113D64F17EE92232983B08 ; MKBv52/FindVUK 0.96 -0x1266E0FBA7269DE758FAB556D786687C7B0AE8B3 = Maffay - Tattoos Live (Maffay - Tattoos | V | 0x6EE71AA15500B9B795625BA555FCC977 ; MKBv18/FindVUK 0.96 -0x150A07279B452C3C5BFCDEB7C6D41422FA14A1FA = MAGGIE | V | 0x7CD0BC6AD154FC702DB41B1830223E11 -0x4D8A3018CF3663C74C57548D1F58CA3C64A5902D = MAGICAL MYSTERY TOUR | V | 0x52098EE449E84CE1464509B7EA86731A ; MKBv33/FindVUK 0.96 -0x1721E048AFD77078932D6E3300D31A3709E0CF65 = MAGICK_LANTERN_CYCLE | V | 0xF5E8F2A3A644C498A2938B50D082D65F -0x6590844F80EE7AABC8604DA8D42351F8D26CA851 = MAGIC_MIKE_XXL (Magic Mike XXL) | V | 0x0D2821E82A48C5793E690D2053D685D8 ; MKBv53/FindVUK 0.84.1 -0x6D61629A3D8A83FBCAF400F484C50DDCCBAF9E5A = MAGISCHE_HAUS (Das magische Haus) | V | 0x8424383AFF1D51FD0171A2AD1A6BE0F9 ; MKBv47/FindVUK 0.83 -0x03897B6E107636AE702868BBB4C7327CE9C26811 = MAGNIFICENT_SEVEN (Magnificent Seven, Th | V | 0x21253AE32A089F9C5512E457ABE85783 ; MKBv62/FindVUK 1.02 -0xE2BF4C2C2E4BC824B23728467BBF175B200DC0C7 = MAGNIFICENT_SEVEN_DOM | V | 0xD92800386367A1287591B3ADF6E800A2 -0x1495260B0FC9F424C7223E638C99EAFE4B52023E = MAGNIFICENT_SEVEN_DOM (The Magnificent S | V | 0x34FEA9C20D4A117D0C677D25BBB0EE6B ; MKBv15/BD+/FindVUK 0.96 -0x7BCAE593B343E711027FF9DFE0E063E1BE6E521D = MAGNIFICENT_SEVEN_F2 | V | 0xF8E5B34FD34E1A8952AADE66613F3DEB -0xA958F193B68D1C488126B0CE76B4AAACF5609E4C = MAGNOLIA | V | 0xF2BC7954E8577B3E202A87A8C3A8F414 -0x9905CC520ED13C7447C0F0FA744366300F28963D = MAGNOLIA (Magnolia) | V | 0x2C3436160A0C4F93E83D6B2F4D17483D ; MKBv14/FindVUK 1.00 -0xDC5EC2CDFD509AA5B7671E0B31D522C57298FEF3 = Magnum Force (US) | V | 0xC93720DCCE6410B02057084458593C2E -0xF0F306CEE60FCA5D658759F22ECD057FF7FAB06A = MAGNUM_FORCE_WW | V | 0xC165EB1FD10FBC4B4B4186FC454DB1E1 ; MKBv7/FindVUK 0.98 -0x9CF151BE84416B66C954AE6022478D18FF39538D = MAGNUM_FORCE_WW | V | 0x0FE5032CFF286482A8CA80FC2885FD66 ; MKBv7/FindVUK 0.96 -0xDF8C8AFE60B273169EA7DC848C1F81B5B2CFDFA8 = MAHLER 3 | V | 0xB4EECC196A636775C08F6E4415183DEB -0xC60ABF83A4C23E0C47F69598EF188E5469F0DD02 = MAIDRAGON3 (小林さんちのメイドラゴン vol.3) | V | 0x902FF05DA078E20C206896E92459B0FB ; MKBv62/FindVUK 1.02 -0x0F5B0CCD7BE905618156B81617CBADFC9D1B7361 = MAID_IN_MANHATTAN_P5 | V | 0x55188AE3B17E797D760C4B824CFA49C7 -0x26E1BB3CF4E7AE1CF4E8470C29F16E948F07C56F = MAIGRET (Maigret) | V | 0xE95BC9DAB8527DB61E5C95EC10B44091 ; MKBv62/FindVUK 1.00 -0x4F6B38F4D6608F4A0ECA4C0D5D4E49825465E40E = Major Dundee (Major Dundee – Blu-rayâ„¢) | V | 0x463FBD5C8CE0C34A87EDEBC142E1C24A ; MKBv46/FindVUK 1.02 -0x935C3FAA0A3E1C78EFE350E127740C28DB58CAEF = MAJOR_LEAGUE | V | 0xAB8D37925DFDFE08A349FD2A92B3F1F4 -0x30AF9CCA5300088FF25AB04A058AA3D3DEB4B789 = MAJOR_LEAGUE | V | 0x2D86C716280E587C61CBCB352942FB7B -0xD378EA3F381FD8B1C93DA52F49DB9467CC25D5A5 = Malaysia A380 | V | 0x219D55E2264484B34B7E0CA1943E35DB ; MKBv56/FindVUK 0.98 -0xD11F3FDB96B447096116D3694B056C7A014D0F8A = MALEFICENT (Maleficent - Blu-ray???) | V | 0xA52C10E3A0324D986C17886B1143C9FC ; MKBv47/FindVUK 0.86.1 -0x1185B3B8FAAAD078174A845637C6F95B8DC223C0 = MALEFICENT (Maleficent - Blu-ray???) | V | 0x87CDDDA021497EA62D4BF0E5B8FDB17A ; MKBv39/FindVUK 0.87 -0xFDCE5B3104DE8ADF330FD9517C0D485F822B3EE0 = MALEFICENT (Maleficent - Blu-ray™) | V | 0x23FA2C7651470912624CFEBDF88FE6E3 ; MKBv47/FindVUK 0.94 -0x83E80580C22987EAAD01154A2D814DF95E748F5E = MALEFICENT_3D (Maleficent - Blu-ray 3D?? | V | 0xE42E0D0B8B44FF9EA5C90DEE5A763B67 ; MKBv46/FindVUK 0.84.1 -0x99A7C720B5901AC0365748CF61FC93635217A9FB = MALEFICENT_3D (Maleficent - Blu-ray 3D?? | V | 0xB6AEDBDE307A5B5A55E45ECA12543A1A ; MKBv47/FindVUK 0.87 -0x351ACA41EE2BBF823CF3ECE47BD50C9482586918 = MALI AGENCI WYSCIG Z CZASEM (MALI AGENCI | V | 0x395E5B3177DB76F7E5B528EE847D877C ; MKBv28/FindVUK 1.00 -0x125E461408C2E25BBA821A3F7165D6E02E4C20A2 = MALLRATS_G51 (Mallrats) | V | 0x444629ED59966F081D6B9B9698458CB2 ; MKBv27/FindVUK 0.96 -0x52EC180F008302D6563864F58E039FA57B29124B = MAMA_G51_R1 (MAMA) | V | 0x2D17008D0B2D28153CC5ABDC1E1F54DB ; MKBv36/FindVUK 1.00 -0x872A8AFB6BA0D48859F91FF51377AEA25F09FBF9 = Mamma Mia | V | 0x651D17E18F13949AC4BAAC5BB9462D6A -0x8E77E344413A5101E88412CA641BEFD09E2353FC = MAMMA_MIA | V | 0x4387EC0227974DDF70C8FFEB7BC65234 -0x4B4BC1335360A1B0E17CE720F2D5848822A1FB31 = MAMMA_MIA | V | 0x396BEF263110420E571ECBD133C55B59 -0xFC61E38E93FAD35D6006EC94AED877403136FDC9 = MAMMA_MIA | V | 0x959E9147711BD7B266DB347AE84910CA -0x86236AA608CC8DC876F3F21E25C81500BE753928 = MAMMA_MIA (Mamma Mia!) | V | 0x8315AF758696FBF6DC4B08D60C8C2D57 ; MKBv9/FindVUK 0.96 -0x08552DA4D1C150DF6194AE9406B384B6F8BDE7B8 = MAMMA_MIA_G51 | V | 0x07809A21B936BCBDC1682E9BB5278D35 -0x4768763BCDE7B5C50FA4AF06AC2060C7CD07863B = MAMMA_MIA_G51 | V | 0xB5DD2D2363CA840956B8C79CFA07E360 -0xDB08C22BA9BC1927F1D23E58314B9480ADCB8545 = MAMMA_MIA_G51 | V | 0xF07A891D9234CADC7A70977954DEB0A9 -0x4CD088AC18415DEC95D708E561FC354B1C1FE959 = MAMMA_MIA_G52 | V | 0x6928613A6DBE18C77AD85803E5188B8A -0xFCB8AE918C9016AF8FBA4128D237B2C4047A3DEB = MAMMA_MIA_G54 | V | 0xA2982DE7CBB4ACE2D5E2C2DE71A69FC4 -0x58182C3C73374931E7F4EA8CDD0188E934FA50EB = Mammoth | V | 0xA0C8AF55AA7A68329D2C9A670F7D080C -0x169122088DCC201E035A0C71E969473E56CD1F13 = MAN HUNT | V | 0x32960A8F5D8E88E4F5FAFF7A6B80F102 ; MKBv39/FindVUK 0.98 -0xF2528FC9BC3099E08C5FEAABF069DF93B1831D85 = Man Of Iron Directors Cut (MAN OF IRON D | V | 0x94F7EA6A0B3A7E5CF2C7FEE8A192DDC9 ; MKBv62/FindVUK 1.00 -0x88F6F42614BC9E572A7FDE641496763889F6ADE4 = man on fire | V | 0x9630C2E061271C6C6E2A5D4B2A212506 -0x183076092328C9F8E6B89F527C15A525A40DA752 = MAN WITH A MOVIE CAMERA (MAN WITH A MOVI | V | 0x91AC790A83661E1CD2D0F5F5F46D74D3 ; MKBv54/FindVUK 0.98 -0x6A0C41297CB2BE356377899BC3D09680F2C0DA22 = MANCHURIAN_CANDIDATE | V | 0xD8B725CC2380E12A33A7FBD731A80C4B -0xAEF951519D5BC1CA567143418039EAA660C45E29 = MANCHURIAN_CANDIDATE | V | 0x69C4D809E18233EE7620B6BBEF5F27A0 ; MKBv3/FindVUK 0.98 -0x5B8E257BB164F7EF06BD84C96A529F9EB07EC3EA = MANFROMEARTH | V | 0xDA16D8A0B522D4A60184018341974FD4 -0xD192366AB2C3802444368C212F42A8BFA0379316 = MANFROMEARTH_US_BD | V | 0x5C6796A202EBA4B9CB10B296E01AD04C ; MKBv16/FindVUK 0.96 -0x6DAD6D1F208C5611FDB03E3D5696CF589E70CDEE = MANHATTAN_3D_EN (Thor 3D) | V | 0xA14D01684D5572EB3D28401E7D62DBE6 ; MKBv25/FindVUK 0.96 -0xA727448F5B4435C1A4D4CB36657323354000AAB5 = MANHATTAN_3D_EN (Thor 3D) | V | 0x9CA4397321257934D07A0889F1D4BFF8 ; MKBv25/FindVUK 0.92c -0xB9CA6C87A059C4BE68256643EC7FA9A406A6B70E = MANHATTAN_3D_EN (Thor 3D) | V | 0xC9CD9252A51828C36526A99E3F7BE9B8 ; MKBv25/FindVUK 0.87 -0x6CFCF3D7BEA4C990447687CA81E3DEC8821AD107 = MANHATTAN_3D_EN (Thor 3D) | V | 0xC2088229FA53D6F6CB8152DBBFCAD638 ; MKBv25/FindVUK 0.84 -0x8FEB1B10FE3F96069387497795A58F66DF7A290C = MANHATTAN_AC (Thor) | V | 0xA95AB211C7AADB6A0C8625EB2322CB0C ; MKBv20/FindVUK 1.02 -0x4B783B5EA458C5812F205020D900CA7BD4B6DD5C = MANHATTAN_AC_RENTAL (Thor) | V | 0x6870AFB429F98C8023D2A9FA306176F8 ; MKBv23/FindVUK 0.92 -0xDCB10FC108746158714BA73C788B3F9DF23174DE = MANHATTAN_BD (Manhattan) | V | 0x6DB0ADD65827C4FCC457D9EC549233B8 ; MKBv31/FindVUK 0.98 -0xE87E2E687B8B566222BF6401003245ABCA7AAC5E = MANHATTAN_BD (Manhattan) | V | 0xADE94E7D76C16B169DE7A23317645CDC ; MKBv26/FindVUK 0.93 -0x644CBF9B0B3A2F0C2D387303F9F930CA3D0B3BC7 = MANHATTAN_EU (Thor) | V | 0x691FAB822815F0FDAB40B7F7E7750224 ; MKBv23/FindVUK 1.02 -0x0D0E3B90C7A7068B0FF920C346D3A28CF2DBA7C2 = MANHATTAN_EU (Thor) | V | 0xEBCEFB21B33A2AE6525A40562046A917 ; MKBv23/FindVUK 1.00 -0xFD8BB5A635F4930D26CB86D1D7EF6F825C46590A = MANHATTAN_EU (Thor) | V | 0x79358E055FD1D7F974D72D867AC3E7E8 ; MKBv23/FindVUK 0.96 -0xC0B25F2D02B9958C592757D44FAA0218B96E81C1 = MANHUNTER | V | 0xD427CBF852CE4A68253BD08D60754749 -0x91E294BFAED2D65625FD0D1D2379AB7FD4700131 = MANITU_BD | V | 0x9EA919232A3B5D466BA6B3410FFF29FB -0x18A3767D177242F248346964D65D2FFEF262B5B9 = MANITU_BD (Der Schuh des Manitu) | V | 0x2D192D9C9579F5E449D5B16B041EE1F1 ; MKBv9/FindVUK 1.00 -0x5F8316D6C782FBE854671C8F95B3B10D100F6F33 = MANN_TUT_WAS_MANN_KANN (Mann tut was Man | V | 0x01B3F9E5045EF7D93C77ABC1EB570755 ; MKBv33/FindVUK 0.92 -0x46244679CD2526B7F6D4F4C92003CD9DA4DAB3C9 = MANON DES SOURCES (Manon Des Sources) | V | 0x5291F717D85DEC8F204933C6CFAD3770 ; MKBv26/BEE/VUKNOTVAL!/FindVUK 0.98 -0xFDE6E91A9C8922954AF4475930442C27BACDC9A8 = MANONDESSOURCES | V | 0x0AA4522CC845404EFA2CBE6345282D33 -0xDF0B3A0C8D15122C13D0A7DF03C36924FAD88D5F = MANOS THE HANDS OF FATE (MANOS: The Hand | V | 0x4768BEAD820C192DAFDAFC915B7296EE ; MKBv55/FindVUK 1.00 -0x851F2D64132A00D9D8D3D535684F71508040BB28 = MANWHOSHOTLIBEBERTYVA | V | 0xC01E362B268E4DE6AC9777F3C24B42F0 ; MKBv26/FindVUK 0.65 -0xF1FE1D8DF030FB3B601349355D9652D2CBFE3692 = MANY ADVENTURES WINNIE POOH (The Many Ad | V | 0x31072E0B2F774BCE55FF5781F8CF68B9 ; MKBv31/FindVUK 0.94 -0x261BEBC154CD1270647EF216D72D608C765F96CC = MAN_GOLDEN_GUN (THE MAN WITH THE GOLDEN | V | 0x590B0740A4F3BF7D3CBCC3A9F7B5DA60 ; MKBv10/BD+/FindVUK 0.99 -0x466AE9903C77761E1C552C81C88A96C686777F01 = MAN_GOLDEN_GUN_F1 (THE MAN WITH THE GOLD | V | 0xFD7686CB67DF3860CF3F65BC7B8E43E2 ; MKBv12/BD+/FindVUK 0.96 -0xBE225E335D6F22D0B6950D91F8D91D235B339D93 = MAN_GOLDEN_GUN_F1 (THE MAN WITH THE GOLD | V | 0xE9AEB52897090EF28A7826516A5ACD9F ; MKBv12/BD+/FindVUK 1.00 -0x8E887C8C0AB711181ED05628627200EAADE3E69E = MAN_GOLDEN_GUN_F6 | V | 0x8685790E4C36383873C1760EBA79941C -0x48FCD1E119A2399D94F3130C81B9045DB163FA06 = MAN_IN_THE_IRON_MASK | V | 0x929AC13FFB16BD95AAE2B687F522B7F7 -0x4BFFA195F105F724AC7DD51D27B696D14D21750B = MAN_OF_STEEL | V | 0x25A0FC057A9B0EDC25087D0617881203 ; MKBrev 36 - FindVUK 0.54 -0x01E02F4DEAAE5F176861B3DD208E2B1DF375738F = MAN_OF_STEEL | V | 0x90CC1F2AA69932BDCD12A5282B7A654D ; MKBrev 35 - FindVUK 0.57 -0xC1A529E4F5D629D8D72C770EB122D1E7E8343D80 = MAN_OF_STEEL (Man of Steel) | V | 0x709F9A0A4109CCA5F07C9CD21458C60D ; MKBv31/FindVUK 0.98 -0x1CFDB5C4CB44A2332591ABE01E47428B26163032 = MAN_OF_STEEL (Man of Steel) | V | 0xDFA99CEBB7D6A65AAC07611B2C225E40 ; MKBv31/FindVUK 0.96 -0xA6F2348D73E5E39B06ADDA9CDEC6334DF8B8D290 = MAN_OF_STEEL (Man of Steel) | V | 0x9E6CA430A424B1ED567BE78807279397 ; MKBv35/FindVUK 0.91 -0x7F43C09474BCF505DCB2696DDF9D8F94805200FC = MAN_OF_TAI_CHI (MAN OF TAI CHI) | V | 0xFBC0DD5DFD57E4E4047021891D337C36 ; MKBv44/FindVUK 0.84 -0x9EABB7B76289EBD8267033B84E69F48DB2A10903 = MAN_ON_FIRE_F3 (Man on Fire) | V | 0x22F5B8805F3982E98F4164E4129E00D7 ; MKBv10/BD+/FindVUK 0.96 -0xEB8C2ABC4E47C8ED0CACB269D52DE866DB585DB3 = MAN_ON_FIRE_F5 (Man on Fire) | V | 0x1141EE20C25085C89862701AD66AF840 ; MKBv10/BD+/FindVUK 1.00 -0xDFDA6EA979B031E7C4C033D984EF2D6050457803 = MAN_WITH_IRONFISTS_G51 (The Man with the | V | 0xE8E46A6D12E34E097BF3A0D7B2B9C56A ; MKBv35/FindVUK 0.96 -0x91E7291BEF4B249EC4E11AC897D5EFBBD277EFB5 = MAN_WITH_IRONFISTS_G51 (The Man with the | V | 0x17357A0AEF211096D0B46144140EC535 ; MKBv35/FindVUK 0.84 -0x93DD311FA761D6109F4487DA306346BF77E89635 = MAOYU | V | 0xFFAF2F1432104A5AA3429B2EE86DDDBA ; MKBv46/FindVUK 0.96 -0x0C6065686E5CB71104AC108CE21AE77D6092D10D = MARA UND DER FEUERBRINGER (Mara und der | V | 0xDF91390333BA3D51CCD510993A35DB1C ; MKBv56/FindVUK 0.96 -0x42350F5598670EA8FD1EF6B58DFBE98DA85F08A7 = MARATHON_MAN (Marathon Man) | V | 0x2A9908A492336FF7FA2D62F4B4AA5A86 ; MKBv36/FindVUK 0.96 -0x102168235BA82A3A1E9448A24796601CC0B1B693 = MARDOCK SCRAMBLE | V | 0x9C1C16E48D60BA02D5C3F87BBFF772BF ; MKBv28/FindVUK 0.94 -0x9AD40BC72D2031B69E8ED07E0E8AA82B0A1E3B39 = MARDOCK SCRAMBLE | V | 0xB8A043641D1E4946D326DB7D44B55462 ; MKBv35/FindVUK 0.94 -0x4860B0EE42A10A3C3B04ABB49307818FA6F8BAAC = MARDOCK SCRAMBLE 3 | V | 0x57F81C63C6D90EFCEB672EED9162F142 ; MKBv46/FindVUK 0.94 -0xD63947D57B8F74F357CEFF5FBFB4EA120C2C12DC = Mardock Scramble Film 1 (Mardock Scrambl | V | 0x081F35D08480111ADCA7F20718DBECD7 ; MKBv28/FindVUK 0.99 -0x7BC9896BE321BC7E764077A28F2A29B8311B5460 = Mardock Scramble Film 2 UK (Mardock Scra | V | 0x4FC47F6FEB30AC0CC81A45F4F3AE2715 ; MKBv35/FindVUK 0.99 -0xA8FA45495112C54D544EFEAD1445F462675CE200 = Mardock Scramble Movie 3 (Mardock Scramb | V | 0x5BAE3A910E708BD0DD10A3833308A9B2 ; MKBv47/FindVUK 0.99 -0x25ABF3AACFF1CD6972AD8487AA63E203AD0D7EEE = MARDOCK_SCRAMBLE_2 (Mardock Scramble) | V | 0x697DB549238F760F4A1ADAA99F926B14 ; MKBv35/FindVUK 0.96 -0xB322C7CD7716B240543EFAD34011E09073E87569 = MARDOCK_SCRAMBLE_3 (Mardock Scramble - T | V | 0xBD9415568E66F9B2F174351159638CD7 ; MKBv46/FindVUK 0.96 -0x108C9FE357E935A4CBB4630CC64A652C49CFD4AF = MARDOCK_SCRAMBLE_BD (Mardock Scramble) | V | 0xF03B86140F380998192A00BB5E4F83B9 ; MKBv28/FindVUK 0.96 -0xC278B92AB98CC729F6C8A162C96A6601FD1DFDD7 = MARGIN_CALL (Margin Call - Blu-ray???) | V | 0x837E9CB55E91D8C85B7FF072A3064049 ; MKBv21/FindVUK 0.96 -0x7FB1710184EAEEA1BB72D489785F8B7542B3FA0B = MARIA IHM SCHMECKS NICHT | V | 0x211353F54A1F86C8D8A1EFB6E335684B -0x57819E6F5F41C2103EE4E3F498D861D35B777E7C = Maria Larsson | V | 0x9343B4D8A726684DDA20F15874D7D8E2 -0x6D58AE199085CF7C2CEA8731DAAF369E50E0CEB9 = MARIAH_CAREY_ADV_MIMI | V | 0x42C6911C08804949A830A4986E8E4E77 -0x3B043171B422EC0717C4A5BD8191EADC5D623A4C = MARIAH_CAREY_ADV_MIMI | V | 0x76096A2B85298090F8338F5D560DB970 -0x4272E2CF5D524762236B521239D87726377E8D0A = MARIAH_CAREY_ADV_MIMI | V | 0x6F4710C0BB30A45B42FF60FF1E8D6827 -0x6D201ECCC94F3548D9B190B9FFF606CFF571DD36 = MARIENBAD | V | 0xD2A665068E5820EF4F2D55B4997A6781 -0x8371ECEF34E2D61D3196564F9096AB007A0A7DAC = MARIENBAD | V | 0x551E0B76884B25DE9024F79E1AB3A052 ; MKBv12/FindVUK 0.93 -0xE24F250FDD55FC5D21897A50FD07A7E961749E6D = MARIENBAD | V | 0xCEFF5293DC4E85125FCA5310E2D4FF6F -0xC1762FAF53809CE7F4D980C30F1E045FAF094A32 = MARINA | V | 0xCE599D7541D39B1D290A1E3EF034C642 ; MKBrev 47 - FindVUK 0.57 -0x2D4863D13164C2B2B5531BE130CE287A4D0FD979 = MARINE_2 (The Marine II) | V | 0xF0F5C38F59638BB04D5286E3DB6407B5 ; MKBv15/BD+/FindVUK 0.95 -0x9BA0504CDB5330B0C630CDA62A18E17881279171 = MARIO_BARTH_2013 (Mario Barth 2013 - Mae | V | 0xBC68CCF6B0BC04F27E211AC84D4984AC ; MKBv44/FindVUK 0.92 -0x00B0000283427BC8E0AC3E9F20DD2A21929226F0 = MARLEY_AND_ME | V | 0x2D3E3D4DDDD00E1E1BC847FF23F9A592 -0xDE11391632D5BEFD11413CA071FAE177E55A4A02 = MARLEY_AND_ME | V | 0xC617E656709F2C53F5A2C8157EE5853D -0xDFE7296F9AC4EA26C8D35463DF4376F9499EDF85 = MARLEY_AND_ME | V | 0x6248F1791B418B85AED0CFCF5911B64D -0x9F8BEA7D0D5CF047FFBC13B299617D5B6729BD1F = MARLEY_AND_ME (Marley and Me - Blu-ray?? | V | 0xF124C40204AAB20843D17CE138B55567 ; MKBv12/BD+/FindVUK 0.96 -0x3B901D1AAC2E815A73C084348D5C3310351A1EDC = MARMADUKE | V | 0x9B0161ED2BA4216B0A7A25BCCA72EBBE ; mkbv17 -0x4DD68860547767FD3D399725F6172DE9B0472BD1 = MARMADUKE (Marmaduke) | V | 0xEA79C1E3BBF2718198E0E8DBB3AA04AF ; MKBv19/BD+/FindVUK 0.96 -0x6DC1C0C34AB62B67013383DF1DA92AEA16835A6A = MARNIE (Erinnerungen an Marnie) | V | 0x019AFA757F387C30A3B8A8C01BA1CEBA ; MKBv60/FindVUK 1.02 -0xDFC451BF438456576BEF9E5ACCCAB40E6B0490FB = MARNIE_G51 (Marnie) | V | 0x11752E3EFDC68CD21EEFDB90A8BCF599 ; MKBv25/FindVUK 0.96 -0x72B30B0A3C5E01E0AFC098C9A66B3B3F3625790E = MARNIE_G51 (Marnie) | V | 0x6FFFBF7874BDC0395208C6B981C6F6FD ; MKBv25/FindVUK 1.02 -0x01FD4581574C8298E248432A04171AE56F0CD508 = MARNIE_G51 (Marnie) | V | 0x25A24BFD6D4B97EF41083EA64EE760E4 ; MKBv25/FindVUK 0.94 -0xC6AB0B5FFF08FABA91EEDF57C216D80EC550DA5A = MARQUIS_DE_SADE_JUSTINE (MARQUIS DE SADE | V | 0x5E6322AB70DBBE3B3717E33D1D01FBE0 ; MKBv56/FindVUK 0.92 -0xF82503884911B56826B781E92025C56A46DB6C31 = Martha Marcy May Marlene | V | 0xD70A95CB444857E12C04EA845A6928BB ; mkbv28 -0xAD24A7972C5EBDA457FB581C8371F5EF5459E6AA = MARVEL'S AVENGERS AGE OF ULTRON - BLU-RAY 3D™ | V | 0x97E1B3D1A9024FE7DBD12E5295AA15F3 -0xDCD3A59187FEA7D55A6607EFC0A1A66C733C17A6 = MARVEL'S AVENGERS AGE OF ULTRON - BLU-RAY™ | V | 0xCA55115915E9194FA0820F957C4F3E38 -0x967384D7A68A6DAA59136CE9D71B8D127381C618 = MARVELS_AGENTS_OF_SHIELD_S1_D1 (Marvel's | V | 0x1ADEE181F4DB20BD6CD84193A9927A43 ; MKBv46/FindVUK 0.83 -0xDA0ACE7793D828BE7D0BFC63B578B7F2BB417577 = MARVELS_AGENTS_OF_SHIELD_S1_D2 (Marvel's | V | 0x8073982DADE3CD72BE23926EEA2A4320 ; MKBv47/FindVUK 0.83 -0x93FEBDA5224F04526BAEB0C4EBEB630B92AC4753 = MARVELS_AGENTS_OF_SHIELD_S1_D3 (Marvel's | V | 0x41992B0A5DAE1DE3C8C6ACE179C9988C ; MKBv39/FindVUK 0.83 -0xFFD702E010E60F81E5DF4D40EB728F2A4875CD2C = MARVELS_AGENTS_OF_SHIELD_S1_D4 (Marvel's | V | 0x93FC237CA4300E86F8D9F81B424A5A53 ; MKBv46/FindVUK 0.83 -0xA464F5D47B3BEB17DCCDE411E73B1B3232D2815F = MARVELS_AGENTS_OF_SHIELD_S1_D5 (Marvel's | V | 0x4BB43881890303D7B9A5F9226E58B1BC ; MKBv39/FindVUK 0.83 -0x9D01F653E4F6EFF1FC1A9536CF6F8968679776C4 = MARVELS_AGENTS_OF_SHIELD_S2_D1 (Marvel s | V | 0xDD3F8E37CA6CE62C41B1DC191F3F13A9 ; MKBv57/FindVUK 1.02 -0xEB98BDB912469C8B3506A22FC8BE904B801EE95A = MARVELS_AGENTS_OF_SHIELD_S2_D1 (Marvel's | V | 0xFB24FF3DA776F1A0518F447C0B0312BB ; MKBv47/FindVUK 0.83 -0x7999DEC37CD1F8B6EF1E4D6A68D0FBB99E8851F8 = MARVELS_AGENTS_OF_SHIELD_S2_D2 (Marvel s | V | 0x573415B680137E45828CBFB9C654EC89 ; MKBv50/FindVUK 1.02 -0x4EBD0598F1541A20C5FD540BC9E48C2EC1ED065E = MARVELS_AGENTS_OF_SHIELD_S2_D2 (Marvel's | V | 0x3B3634C269CDD50D183EE95EC280C4D9 ; MKBv47/FindVUK 0.83 -0xFE00E18776BD50DD78B22A5FA20DECC145FA7B2C = MARVELS_AGENTS_OF_SHIELD_S2_D3 (Marvel s | V | 0x6750668EEFFB032AACC248B1F661B8A5 ; MKBv56/FindVUK 1.02 -0x5513D92F6B7DFF2902598C352A8353C2A7225A5D = MARVELS_AGENTS_OF_SHIELD_S2_D3 (Marvel's | V | 0x2954E5D5BFA7D32A8DFC2D7C8F25EAC7 ; MKBv50/FindVUK 0.83 -0xB2B5D4D9C33A867606FC7154AC5F40026347D8F4 = MARVELS_AGENTS_OF_SHIELD_S2_D4 (Marvel s | V | 0x898F69E372D4283429537F461A7614EE ; MKBv57/FindVUK 1.02 -0x7B8DC29FD0AD8CED5DC7EF6A0AF15E44F63B111D = MARVELS_AGENTS_OF_SHIELD_S2_D4 (Marvel's | V | 0x4C606B1166EC25318FDC87CB966A1FF5 ; MKBv47/FindVUK 0.83 -0x5C9359F47C48753E5318CCD4C60521E935C53C2A = MARVELS_AGENTS_OF_SHIELD_S2_D5 (Marvel s | V | 0x6B64904C857F6D07A57EBCEE5C17635D ; MKBv50/FindVUK 1.02 -0x3F1DF4BF5E2AD4EB53110BA313961280C122CB4E = MARVELS_AGENTS_OF_SHIELD_S2_D5 (Marvel's | V | 0x90965BB0E961C41749348D2D7ACCBEB0 ; MKBv50/FindVUK 0.83 -0x5DC6CE5CB487440243DD3C6F04593EC0C6CA7DA9 = MARVELS_ANT_MAN | V | 0xC5280A3946231998FAEC1A7A1A955628 ; MKBrev 56 / FindVUK 0.54 -0x8BEAB266BA763AAFEE3FC1160251CDE878EC7EEC = MARVELS_ANT_MAN (MARVEL S ANT-MAN - BLU- | V | 0xA656D33970FB3FBC9FE1E3F0B2091B2B ; MKBv50/FindVUK 1.00 -0x6B37733712E873A4B602D48CE613C97879911EC5 = MARVELS_ANT_MAN (MARVEL S ANT-MAN - BLU- | V | 0x59CBDFE79EC83AC7988F5A0D407A4014 ; MKBv50/FindVUK 1.02 -0x19FE222F0CB127654D5037DB3C753AA8F350616E = MARVELS_ANT_MAN (MARVEL'S ANT-MAN - BLU- | V | 0x1DDE6F8646B72DFDB3AA15AC01EE0E9B ; MKBv50/FindVUK 0.91 -0xFF17F6C691B9ED10F7053F95CD4D8EB070CE2510 = MARVELS_ANT_MAN (MARVEL'S ANT-MAN - BLU- | V | 0x07556A381050F57CE5ECC46734F2F66C ; MKBv50/FindVUK 0.92 -0x614086CD1A2B89F5EF1A3AD756745127A0291F4F = MARVELS_ANT_MAN (MARVEL'S ANT-MAN - BLU- | V | 0x2BB209B4E1B23F65C6FDC1C0B37D8956 ; MKBv50/FindVUK 0.86.3 -0xE8D766BC44FE8D873FE6FC85947240A38E2ED82D = MARVELS_ANT_MAN_3D (MARVEL S ANT-MAN - B | V | 0x7FAAB2908A1BBD94CC284197FD504701 ; MKBv50/FindVUK 1.00 -0x6D140FE86EC7BFA89460D24B5C907DE1A013B3D1 = MARVELS_ANT_MAN_3D (MARVEL'S ANT-MAN - B | V | 0x45AEBFC5E7CB4AD4F8CD146DA0913A6D ; MKBv56/FindVUK 0.92 -0x01096F89BBC388EA74546D1369915793DF58F494 = MARVELS_AVENGERS_AGE_OF_ULTRON | V | 0xDD6726B8AC1AB8A379C44AD325285402 ; MKBv50/FindVUK 0.82b -0x8F205C74EC5D2BAF11CBE21970A0E02AAB353CF3 = MARVELS_AVENGERS_AGE_OF_ULTRON | V | 0xE388BB9B9E87509A889F5E6BA67150C2 ; MKBv47/FindVUK 0.72 -0x0DC1881B87549E0E2DD150960FF8693674D68B34 = MARVELS_AVENGERS_AGE_OF_ULTRON (MARVEL S | V | 0x3AE86D3506F51BA01A81481964638FD1 ; MKBv47/FindVUK 1.02 -0x2629C3116B678012A920BF595EAE639BCB3AA4CF = MARVELS_AVENGERS_AGE_OF_ULTRON (MARVEL S | V | 0xE968C137ADF623307AB7A6B344A902CE ; MKBv46/FindVUK 1.02 -0x1A9FFB617584577ACEC2AD96958FA550C08B0C04 = MARVELS_AVENGERS_AGE_OF_ULTRON (MARVEL S | V | 0xFC91CCDEA9E6633A411F859AFD48478E ; MKBv47/FindVUK 0.98 -0x6EBAA57278D203EE7A6906EDE30DF7F0BEDDA688 = MARVELS_AVENGERS_AGE_OF_ULTRON (MARVEL S | V | 0xC70627BE529EBE09A1C4054A6D6C3FC5 ; MKBv47/FindVUK 1.00 -0x2F54A73C4E8726D5600C3E0968562C37A77F905F = MARVELS_AVENGERS_AGE_OF_ULTRON (MARVEL S | V | 0xCA1CAA333E6CC08EEB9756F95DBD08FA ; MKBv50/FindVUK 1.00 -0xD35E6FF1DAE19E56B80788BDA940491EFB38619A = MARVELS_AVENGERS_AGE_OF_ULTRON (MARVEL'S | V | 0x7ECEAD55775246B9F7C3DAB693D9A301 ; MKBv47/FindVUK 0.84 -0x5D7F698DF3E9749260CE4F24366F3CFB0011F012 = MARVELS_AVENGERS_AGE_OF_ULTRON (MARVEL'S | V | 0x2F004CDEF157E3D788F3320077D8C511 ; MKBv47/FindVUK 0.84 -0xD75151EAEA9F381FF29C5A90EBD4E5731B7F7FCA = MARVELS_AVENGERS_AGE_OF_ULTRON (MARVEL'S | V | 0xEF26FD5374A327F9D222AE169671F648 ; MKBv47/FindVUK 0.82 -0xB7633A4DC8D0A1CA36371A6A803BA9212A51230B = MARVELS_AVENGERS_AGE_OF_ULTRON (MARVEL'S | V | 0x21F02ECFCD96954E77197077803D8050 ; MKBv46/FindVUK 0.87 -0xAF2C66CFAD4D5E497E27C9FCFB235A0E623EB981 = MARVELS_AVENGERS_AGE_OF_ULTRON (MARVEL'S | V | 0x4515F25A9E9037F4B9B25362425B780A ; MKBv47/FindVUK 0.92 -0x0387C1C5FF8ECCE91679FA7E071A3EAE24C10047 = MARVELS_CINEMATIC_UNIVERSE (Marvel: Buil | V | 0xDAD63D0CF0BA34DB71F5A8981B2AE746 ; MKBv27/FindVUK 0.94 -0x6174B084764065F0E91C93115B5A07B5D2A15347 = MARVELS_IRON_MAN_3 | V | 0x03E73AF1E58657B4904A777BA846F5E2 ; Iron Man 3 -0x88F8ACED18064D786B55C6613D237D3C268C4409 = MARVELS_IRON_MAN_3 | V | 0x4DF74D44A0F788A255EA46ED9101F93B ; MKBv31/FindVUK 0.65 -0x022505B35813335964E958BD5ECA0CFF7549BC2B = MARVELS_IRON_MAN_3 | V | 0xC5CD0114B266B76CF980B76909ABA856 ; MKBrev 31 - FindVUK 0.51 -0x9A4A6C1A253929D8DA72044F9882A6844E327DAD = MARVELS_IRON_MAN_3 (MARVEL S IRON MAN 3 | V | 0xCDFD7EF0B32A7234DFCDF4CEE4D3FE09 ; MKBv31/FindVUK 1.00 -0xC061857FFDD00DF00995A2C406629C064E656247 = MARVELS_IRON_MAN_3 (MARVEL S IRON MAN 3 | V | 0x553664E0D5F9061DCBB5728D9971A47D ; MKBv31/FindVUK 1.02 -0x8B66A706F16F58550992D737E8381DF5AF678B56 = MARVELS_IRON_MAN_3 (MARVEL'S IRON MAN 3 | V | 0x067F6ACFD86BB589E08FD49D4AFEE84A ; MKBv31/FindVUK 0.93 -0xB9CA959076987B79E1BEDF085BA4F595F99BD1C7 = MARVELS_IRON_MAN_3 (MARVEL'S IRON MAN 3 | V | 0x76B19092DE8EB81718A1D7C0CD146364 ; MKBv31/FindVUK 0.87 -0x6626E52D26511B3BC4A72C71E92A8B7804BABDA4 = MARVELS_IRON_MAN_3 (MARVEL'S IRON MAN 3 | V | 0x5A0DF6235630A8217AF6585204680763 ; MKBv31/FindVUK 0.87 -0x5D65296C0005A20812C32B20770CE95B6844CD5C = MARVELS_IRON_MAN_3 (MARVEL'S IRON MAN 3 | V | 0x7F79D9D76B394145D2550DB47AA2C52D ; MKBv31/FindVUK 0.84 -0x05BC21100A30856129EBA206A3D58A250F8841DE = MARVELS_IRON_MAN_3_3D (MARVEL'S IRON MAN | V | 0x0DF39C003E164B753E870124728B3F19 ; MKBv31/FindVUK 0.84 -0x8D446AEC8F7214372BC86FA8201DBE48B98488AF = MARVELS_THE_AVENGERS (Marvel s The Aveng | V | 0xE97534FB7F49F8A8A0003AC3A6A3D6FA ; MKBv27/FindVUK 1.02 -0xCA1AB6CB63EE04F21FC81F0A7542012F7E8264A2 = MARVELS_THE_AVENGERS (Marvel s The Aveng | V | 0x191E000CDB495DA203B4D79B65EE729B ; MKBv31/FindVUK 1.00 -0x5E18A0DC160C11A8D78D738614477A6C6C97D3DD = MARVELS_THE_AVENGERS (Marvel s The Aveng | V | 0x6E6A7382B465C7E1D40998DB7D64EF49 ; MKBv27/FindVUK 0.98 -0x963C8B3F1EA2B50467186B610D4B7A1895A9AF84 = MARVELS_THE_AVENGERS (Marvel s The Aveng | V | 0x95C0959A5068AC76C22BAF720DE0D9FB ; MKBv27/FindVUK 0.96 -0xF2963B11DA69A6B6CCE1538B30B615F090D734F4 = MARVELS_THE_AVENGERS_3D (Marvel s The Av | V | 0xD5DA8E9489C60B9B1A63401D813B9631 ; MKBv25/FindVUK 0.96 -0x4C6A3D562DCCD7B3A69BDF93108F9A9C608829A4 = MARVELS_THE_AVENGERS_3D (Marvel s The Av | V | 0x6A3EE94CB15EC6CE4FAFB4C77E1331EB ; MKBv28/FindVUK 0.98 -0x149D34C5CD5ED415B7ED2F80F83631D4CFC0CC21 = MARVELS_THOR_THE_DARK_WORLD | V | 0x0E17E5280B05F220A38A4AD3D5A3249F ; MKBv35/FindVUK 0.65 -0xC0F1701562B9FA08D22566FBA00C8EE8EF459DB8 = MARVELS_THOR_THE_DARK_WORLD (MARVEL S TH | V | 0xAEF414ED0882E6A8194843446F86BEE0 ; MKBv36/FindVUK 0.96 -0xF35608930B21EF72CE0504A305BA8547AEB41C8F = MARVELS_THOR_THE_DARK_WORLD (MARVEL'S TH | V | 0x6C65FB891E6EF8E9C00EEFD3B02D6DA9 ; MKBv39/FindVUK 0.91 -0xE6C722E1912DEAE244358D8B9BF83385D183E09C = MARVELS_THOR_THE_DARK_WORLD (MARVEL'S TH | V | 0x0BCF6792353A7BADC9A76B850F37068B ; MKBv39/FindVUK 0.84 -0x0C373BF09E20128F1323DBD44B9C2987FF0947C5 = MARVELS_THOR_THE_DARK_WORLD (MARVEL'S TH | V | 0xA512AEA318476FD0122F7CF3EF6FB581 ; MKBv36/FindVUK 0.87 -0x2FC31B4FA64810BA53256293D9AEF42A7C0A7BA1 = MARVELS_THOR_THE_DARK_WORLD (MARVEL'S TH | V | 0x59D33CAAE9F5136DB1DD1B9D27A8D54B ; MKBv36/FindVUK 0.84 -0x19D3C4FCB69D21BFB10850632730A54511174039 = MARVELS_THOR_THE_DARK_WORLD_3D (MARVEL S | V | 0xC6D8A2CC9CAE5B08CA5CAC1D992B7583 ; MKBv39/FindVUK 0.96 -0x3CA20AFE2FBDDD28FD2FA1C045C9D8C56EEB3060 = MARVELS_THOR_THE_DARK_WORLD_3D (MARVEL'S | V | 0x18DFB040DCE701F3F585B9935B0F3501 ; MKBv39/FindVUK 0.87 -0x35CDA9380BB697C93E1187D920A312033669FECD = MARVEL_STUDIOS_DOCTOR_STRANGE (MARVEL S | V | 0xE3DFDEE08A128EC703E9A6B861213541 ; MKBv58/FindVUK 0.98 -0x034DA713728C84654B76227E499DCBA3D7D14825 = MARVEL_STUDIOS_DOCTOR_STRANGE (MARVEL S | V | 0x40713D5263106CA70617861B3C64FF84 ; MKBv50/FindVUK 1.02 -0xBDE38389B944E73B3999D2E653AA00395313795A = MARVEL_STUDIOS_DOCTOR_STRANGE (MARVEL S | V | 0x9011949609DA1B9C7EBDA2A2C45A8EB1 ; MKBv50/FindVUK 1.02 -0x386D61D3AE36A5EC346FC342495FC0FFB32317E2 = MARVEL_STUDIOS_DOCTOR_STRANGE (MARVEL S | V | 0x856D08D642889F746EF34463C78674EE ; MKBv57/FindVUK 1.02 -0xFC98068FFE7CBC933FD9BF4F1B619B7F79996DC9 = MARVEL_STUDIOS_DOCTOR_STRANGE (MARVEL S | V | 0xC09C088B1E156D8A01A78E063E08CBBD ; MKBv58/FindVUK 1.02 -0x6EB7795EEE89CFEE5354F92258D4D3E14E712346 = MARVEL_STUDIOS_DOCTOR_STRANGE (MARVEL S | V | 0x2B75EC70B5373E6D60B21D5D8A0C3D43 ; MKBv50/FindVUK 1.00 -0x362F66B60D084F255BB3FD1EDAB2812B234E8343 = MARVEL_STUDIOS_DOCTOR_STRANGE (MARVEL S | V | 0xB3397777DFB015F193F9945CD4319803 ; MKBv50/FindVUK 1.00 -0x8C0C58A4D91E52C289BF0357056CBE4057940AC2 = MARVEL_STUDIOS_DOCTOR_STRANGE (MARVEL S | V | 0x200478EBA597FF357C98CA4F4737106D ; MKBv50/FindVUK 1.02 -0x278FD269AD10E5393FC755E16B14B85D0DCCC19B = MARY AND MAX | V | 0xEC133CB66268669560EBD4DC23B88E8D -0x59862B009BD01FBCAA6314208A5D573E34BB6F8A = MARY_POPPINS_50TH_ANNIVERSARY (Mary Popp | V | 0xF51758FD341506DD7468FCBC008744F6 ; MKBv35/FindVUK 0.96 -0x96F8B5567AED8BA10E5020188AA445F36F0B1A6F = MARY_POPPINS_50TH_ANNIVERSARY (Mary Popp | V | 0x807950F8059668FC5849D06A48FECCAB ; MKBv36/FindVUK 0.92 -0x768231315364AFB46D6CD969F7237E99BF35D2E3 = MARY_SHELLEYS_FRANKEN | V | 0x71CE6EDA89D6604324096ADEE3CF5464 ; MKBrev 15 - FindVUK 0.54 -0x647D6C1A40A4530222EF5BCA9393A9763C504CF6 = MASA | V | 0x661AB57206741A2CEE541E416E250A5E -0x179EA95371854E8FDE966319541BC49ABA93F585 = MASH (M*A*S*H) | V | 0x03BF7092BC797049A196290166D100EF ; MKBv12/BD+/FindVUK 1.00 -0x4EB19EF41C5A759CCE61CF76A4B73605657742E6 = MASH (M*A*S*H) | V | 0x6A4AEFDC53AE6DCE89E956F544D013E6 ; MKBv12/BD+/FindVUK 0.96 -0x05CBAF58AEF8138921F9FEE3FB2AA97AE73D2735 = MASK_OF_ZORRO (The Mask of Zorro - Blu-r | V | 0x528C91F8FE2E31731A4DECF1354D99A8 ; MKBv21/FindVUK 1.00 -0xA4351C34B9FA06B57BCC81091B768FE19A7BD031 = MASTERS OF THE UNIVERSE | V | 0x13B9B349776404C54AA429B6EA2B2679 ; MKBv40/FindVUK 1.02 -0xA75506747D0B48229751845A87C50F657480C755 = MASTER_AND_COMMANDER | V | 0xBB295C97D7146C7C9E9B702EDD49DA80 ; MKBv12/FindVUK 0.65 -0xA3E415A848DE524B8B09057370DB0729DB9125E5 = Match Point (Region B) | V | 0xD328385160B8BCD1C51BBC076B93310D -0xB3083808B85D65A15A51C86CDC3FB7A6EE39E150 = MATRIX RELOADED | V | 0xD42B0C4799933A4C25383555B5A05D14 ; MKBv9/FindVUK 1.02 -0x082F721FD474C69B943898C177ECF443100AE3EE = MATRIX RELOADED | V | 0x77F0638EA4F7ADE8B4C84B115343A450 -0x7CEDE632308EF4740476D8A324B717FD0B9D03F3 = MATRIX RELOADED | V | 0x02059F2F5F8FC50BA0D69DE1CDB4E6AF ; MKBv8/FindVUK 0.96 -0x23178E6440E5536B4862CF2BF70EF7D2EDF4DF95 = MATRIX RELOADED | V | 0x43D8987C6DF24C9CBFACFA3AC15F30B9 ; MKBv8/FindVUK 0.96 -0x46D657AFB9F553ED3B46F3FCD3CD92256F91A427 = MATRIX RELOADED | V | 0x8F04FC62A521630CC51F7101635C210C ; MKBv8/FindVUK 1.00 -0x352C14C81B2C3C7553A49C492A6903D458AD114A = MATRIX RELOADED | V | 0x6966F8D4033FB7A61DD7DF4F507C3174 ; MKBv8/FindVUK 0.92 -0x28EA8D3366336493440476B710BB97376193A422 = MATRIX RELOADED | V | 0x33591E8668F7AF05AF82CA3BC69DC705 -0x4FD13ACC3BC4D2328F5BEA8EC5BB7AB55A5014B1 = MATRIX RELOADED | V | 0xF17F1FD7ACB36546B87D9DCD5C432C17 ; MKBv8/FindVUK 1.02 -0x220601FA09046ADFEB23F3A63147858344E0B99A = MATRIX RELOADED | V | 0x1444C1D681935D7BAE64267CA4EB6AA0 -0xF42A6703B6D1E074455300A3E9FF60E9ECA2182B = Matrix Reloaded (PL) | V | 0xAF5853B33A0BAA34B1295E3ACDA79933 -0x9AF86436F401C4319F6E51F2C50D0255842B3E9F = MATRIX REVOLUTIONS | V | 0x50216E05555C0EE77878169A9B60DC7E ; MKBv9/FindVUK 1.02 -0x26359C4810592999CB6384560FC15DB1E9BECBEA = MATRIX_RELOADED | V | 0x2B087A2013DEE50BD881D50A431E02B7 ; MKBv8/FindVUK 0.98 -0xE806C528C6D84ECAD7934E200698F0152045B9CF = MATRIX_RELOADED | V | 0x57D2CE5F9F62A9E971F7483EDBF01F97 ; MKBv9/FindVUK 0.96 -0xA74B5E3510CE16E767E06A7A688F64E6A6FCE153 = MATRIX_RELOADED | V | 0x191E36C3A6EF93873ADAF3BBE19CD149 ; MKBv9/FindVUK 0.98 -0xEB6417B595897DF4E3B3C0FBBFFCB9B0E43F2947 = MATRIX_RELOADED | V | 0x3CDD05223AE3CC1B417404FD45AA374F ; MKBv9/FindVUK 0.99 -0xFA0C505801C394C9DDB1ABD4E8E2CC3C782806E7 = MATRIX_REVOLUTION | V | 0xEA5929E994F8D4E63E6284C4046A2778 ; MKBv8/FindVUK 1.02 -0x3DD9A6D98CAA6BC30CFCB0ED65C676C2C2BDD24D = MATRIX_REVOLUTION | V | 0x07199E78C742055D694F3F36685ACC60 -0xECE0C04B43D3CDF4EDFA42B98F17BF698A67D6C5 = MATRIX_REVOLUTION | V | 0x98399E9D0C4AD9395132249B48ECB4AB -0x4137ACBDB25DEF4BBD3A81ADE0893EDAB244653C = MATRIX_REVOLUTIONS | V | 0xD8B97B1E15E8D0EB0DD87D57828FB072 ; MKBv8/FindVUK 0.98 -0x60D4212EBA8F3517B904CE14E3DA378867EF655D = MATRIX_REVOLUTIONS | V | 0x056C29807D3DD2A5FDA9502219F152AC ; MKBv8/FindVUK 1.00 -0xA2E33E6DE1F77A569234B4410B261E761F736E7A = MATRIX_REVOLUTIONS | V | 0x11775C75D18458C3AAE95A939139C1CF ; MKBv8/FindVUK 0.80 -0xDF5FAAD24071EB4FC32EA0A0F6C61A706894E86C = MATRIX_REVOLUTIONS | V | 0x7BB21330B1ECB97AC24B4F464B6634F4 ; MKBv8/FindVUK 0.99 -0x168342A069CDFE707D0F92E81B822E7C15747DD7 = Mauvaises Influences | V | 0x5E785F4E28BC71E3C90E3360FF71D79C ; mkbv12 -0xE76D409AAEEDBB1E8A60EAFC180CBB9A4EE88904 = Mawaru Penguindrum D1 (Mawaru-Penguindru | V | 0x9486FD50AC33FCF7B1EA2A4A2FD2F775 ; MKBv35/FindVUK 0.86.3 -0x3B58C4FAC27BE17FB15218E7B5199E8E8BAEE430 = Mawaru Penguindrum D2 (Mawaru-Penguindru | V | 0xC3B87FEC32DA2FDB0E062E1E3A2DCCE8 ; MKBv35/FindVUK 0.86.3 -0xCDE152C594BC105AD35480B4444A35BECFE3ECAF = Mawaru Penguindrum V2D1 (Mawaru-Penguind | V | 0x2360500F5219D16578156F5FBAF7F706 ; MKBv35/FindVUK 0.86.3 -0x34F135528912B69E7A2D2084EBD6265C69C0FCB9 = Mawaru Penguindrum V2D1 (Mawaru-Penguind | V | 0x7E6BB6C3215EAEB8D35625C7136E5068 ; MKBv35/FindVUK 0.86.3 -0x40F07204184D7B37889E416207CB0394C43D6B8A = Max le geant | V | 0x49F41B870B4114B053518E45CA0F16BC -0xDEB09195DC38E6D8490267B9F9766A9E24656318 = Max Payne | V | 0x6889747CE42171EA7905FD21C40B39E0 -0xE6199476CFD9BDBF2BA7DA97477317C724451CA4 = MAX RAABE (Max Raabe and Palast Orcheste | V | 0x35BD15A237E2A9C232FE160F004DAB2C ; MKBv46/FindVUK 0.96 -0x670BF5DD1B508C1210FD2B3C0B82A283BBEA42D4 = MAXIMUM_CONVICTION (Maximum Conviction) | V | 0xAB2646D99B2C3DF68EE180EF030BE0F5 ; MKBv34/BEE/VUKNOTVAL!/FindVUK 0.84 -0x88D99E7DC23C8FDB0A7F3B4E058279D013B68CF6 = MAXIMUM_RISK | V | 0x3F70B7A6B2592A57BD226B8EB8552B91 -0xF089269ECB92BE3C60CDAA28B746F9C5D3F7BACA = MAX_PAYNE | V | 0x29DD1C016BB61F49E236E960B1086BAB -0x3F2185FC4463DC6AA08F593DA5E4EC7779C99EC3 = MAX_PAYNE | V | 0x9C9BAF8CEC75B93312350BE91D8B0706 -0xC9E2219768CB00E5691F90950E875F676BE160ED = MAYERLING | V | 0x35BC68F34789C9005524A54476745988 -0x0EC3C6D3AACE7D66D12B1F019BB2BFFFDEDBEA72 = MAYN BIGW0xAAAAAVE IN BUDOKAN | V | 0x9C3A9EDFF440EE4A0FD86D59A559E661 -0x866EE45EE3F4A448D1DCD5DC3A05DD5227593324 = Maze runner (DE) | V | 0x53B009A0B99126CC05FB3F53A3A8DEA1 ; mkbv15 BD+ -0x9996E59CEE3DC4601A4E2C2100C52C0E98089153 = MAZE_RUNNER | V | 0x863B59E8C68FE06FB5DAEB8EC5B9D055 -0x866EE45EE3F4A448D1DCD5DC3A05DD5227593324 = MAZE_RUNNER (The Maze Runner) | V | 0xBE27A46A99B56810A6DF6F50D41A1F77 ; MKBv39/BD+/BEE/FindVUK 0.97 -0x7AC418675C137253963700E2A24DCE22A2D98617 = MAZE_RUNNER_SCORCH_TRIALS (Maze Runner: | V | 0xBCB12CBE397A37AE3C941CBD635BC4FE ; MKBv50/BD+/BEE/FindVUK 0.97 -0x728D8652B661C60928D2ECEAFE15CCFF31B9EF5C = MB1A (MONDBASIS) | V | 0xB6FFBCF3F2940525EA341C1B1AEB323C ; MKBv25/FindVUK 1.00 -0xB3F6EB256500ECD4DA33BE180C83853A5127A8BF = MB1B (MONDBASIS) | V | 0xFC26ABDDF500FA21E34BE5454BAE50D3 ; MKBv30/FindVUK 1.00 -0xBEE1599F4CDA2BC90A4242B8372A4632BB3FDC10 = MB1B (MONDBASIS) | V | 0x2710B979EE67E532D16D55FFFDEAA322 ; MKBv30/FindVUK 1.00 -0xF911671A9A2B03FA449D30D24662E9F047FBB52A = MBFGW_2 (My Big Fat Greek Wedding 2) | V | 0x716F03B052C5DF5BFF191DD789508512 ; MKBv61/FindVUK 0.99 -0xCC542812D5E0CD0DFF6D56644689507171F62A58 = MC_BAIN | V | 0x312677BFFCC8455C38442A90FAA57DF0 ; MKBrev 35 - FindVUK 0.54 -0x408434AEC12E9C346B405B186728FB0E2FFAEF34 = MDG THE THREE MUSKETEERS (Mickey, Donald | V | 0xBEA4B91D9D1416C2D854333577BCFF52 ; MKBv39/BEE/VUKNOTVAL!/FindVUK 0.92 -0x6E6BF2EDD230B9A529DCECBC5BFE29FE5ECDACEE = ME ROSVOLAT (Me Rosvolat) | V | 0x39C10AF88B999D43F5421772FB2C88CF ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0x51EB3AFA225B5032F316AC4DFB3CF7EFD210C876 = MECHANIC_RES (Mechanic Resurrection) | V | 0xE251E03ADE60D38380192705E4179E17 ; MKBv62/FindVUK 0.96 -0x98C715E885023381ACD7E81FA5C693507AB5695C = MECHANIC_RESURRECTION (MECHANIC: RESURRE | V | 0xD5A42FA772FE72998BDBF5944C5F3D6E ; MKBv62/FindVUK 1.00 -0xB00B12A82B684F9FAC69E4994726A87D3C4B3551 = MEET The BROWNS | V | 0xCBE99F65229E825C4805950345801C56 -0xD66AEC9CD23D42787159CBD2A1E58EA49ED67F6C = MEET the SPARTANS | V | 0x43F97DFBED5E7354E529A7B2D985700A -0x2AF2BC63BD0528AA3B3D8F0ED63A84DB87337EB1 = MEET_DAVE (MEET DAVE) | V | 0xE7513101EE482A71B5CE04716DD0CD85 ; MKBv8/BD+/FindVUK 0.96 -0x6EE6591ABD40EE82A25325A974DFA3C658FDD81A = MEET_ROBINSONS | V | 0xA941F0DCE9138A04355CA6D3142CCB78 -0x164B2B85B9243E3733710A993E2768A9A6D976F5 = MEET_ROBINSONS_AUS | V | 0xA6608C1F9A4EFEB33D8DAC4B060A83C1 -0x8EA81F22CCA84FB8C12D3A9E46AAF021938BAADB = MEET_ROBINSONS_FRA | V | 0x18CEC1F0ECDF4731E5B5D03F17BBD023 ; mkbv -0x6559BACDF67D190C4FEEB7FD35ED00451EF08D1F = MEET_ROBINSONS_GBR (Meet The Robinsons) | V | 0xBCC5372AF6382F4F087B0566C19E9CE7 ; MKBv3/FindVUK 0.94 -0xE531A3B3B3DCA48B588A7E08A863ADEF4DEBE65A = MEET_ROBINSONS_JPN | V | 0x196F72761E0F44AF76074EA187E5BBA6 -0x85118A03D04B9282F0EA51CF52ACA244A13AF5B8 = MEET_THE_PARENTS (Meet the Parents) | V | 0xA6807719BAD5FE4B113387C24EABC252 ; MKBv21/FindVUK 1.00 -0x520E03729190C6311DB5897A80198DF96CE8188B = MEGAFAULT | V | 0xAEF2A9B222CE86221ECAAA118BC1057A ; mkbv14 -0x6B3A3B0A8D292C7BBC71E1FC5E0BA85FF237D001 = MEGAMIND | V | 0x86020E65123E9002CD4962FD7DE1926A -0xB746808EBC601E6D2620EDA22E956396ADB17C93 = MEGAMIND | V | 0x95DAA3D0865D4C11FE4180745A6BEA1A ; MKBv23/FindVUK 0.80 -0x5C698C892862345E8147EC9AD440D732211E1C98 = MEGAMIND (Megamind SE) | V | 0x81CDD32B506E5D5A4EB2E37257883B1A ; MKBv23/FindVUK 0.94 -0x8CDE035BF9B0B81C9BA39C205ADD2734FE3E7460 = MEGAMIND (Megamind SE) | V | 0xD59F4C35184A92CB03468EA67860D329 ; MKBv21/FindVUK 0.97 -0xBF3C17DCD3F8278A5ABF5C71FB6ADA5DF65C7586 = MEGAMIND_3D | V | 0xD9F0BA003327032669B82D6303643D7C ; MKBv21/FindVUK 0.80 -0xC792ABFAD3CFF51F56A199D95DE6D1C814906F77 = MEGAMIND_3D (Megamind 3D) | V | 0x4D50600D9CF71B4AF010D29CB60BED9D ; MKBv23/FindVUK 0.87 -0x6A9A1315AD14F46D01E09472E988B87AB411E355 = MEGAMIND_3D (MegaMind 3D) | V | 0xCD52B9DF47ED216058C6222BCBDC9483 ; MKBv21/FindVUK 0.99 -0x0D4BA157CF160489F46A00EA5626CE5474CC8D99 = MEGAMIND_3D (MegaMind 3D) | V | 0x343390E6F9D91BAADE842D341F3244E6 ; MKBv21/FindVUK 0.96 -0xC278E9D035DA1B41ECAD28D16D7AF3C202967C24 = MEIN_NACHBAR_TOTORO (Mein Nachbar Totoro | V | 0x60416153C8B38949A8F22186F43D187F ; MKBv37/FindVUK 0.98 -0x9F3F795B8220C2278975BB02E86753D89E028DF7 = MEIN_NAME_IST_NOBODY (Mein Name ist Nobo | V | 0xE8A3DD3E80C8F52CC33A1C59D31D08AB ; MKBv37/FindVUK 0.99 -0xCF57BE5F60D9E0AADE6B256F1FAFD2EA9C72C7F0 = Memento | V | 0x596A7FF69BA95A2ABE74E58F66E87F36 ; MKBv16/FindVUK 1.00 -0xA1335891EF1C13C8120BC7824F14584ABE0D91B6 = MEMENTO (Memento - Blu-ray???) | V | 0x6C68A616E27E15B306CFCCFE728411EF ; MKBv18/FindVUK 0.96 -0xDA0E7E9F7DC98BBCAB4B3ED876619BCD1319EDBA = MEMENTO (Memento) | V | 0xD0EFB3F373646EEDBDB37AEF7002236E ; MKBv19/FindVUK 1.02 -0x24605BB0EE89A4CDF520223846AB66CC3A634713 = Memento (US) | V | 0x306DA496DE106B439D1BC3522CF0CCAC -0x1D3C7DBE8894C39CAE08A1136DB4E85879436681 = MEMOIRES_GEISHA | V | 0xAE5C8290BE902F274FDE6AD05B345A42 -0x47DEA75704CCDF6A00265E956058E5D90A1E1EF0 = Men in Black 3 | V | 0xEF70CC0C2D9EC8229B584DD0FE0641C0 ; mkbv31 -0x75C4FB285531352B3611635947B33EE21C1E823A = Men Who Stare at Goats | V | 0x3758958FAA38FCEAE221025C2B0B0420 -0xA742DD6D06FC71C1259EFCA8D91D1C33AFC2F322 = Men Who Stare at Goats | V | 0xEAFD3AA8D23B5E22771D1541D507EEBE ; mkbv16 -0x02970FB66C3C461C1997CE69A4D61090B17E0E63 = MENACE_II_SOCIETY | V | 0xC8C9FC341CB9D0C1EC347DA3FA726443 -0xC59FECA2273F11AB33FCBF5BD2B8D9AD34987B9A = MENINA_DE_OURO | V | 0xCD3F4E100748D42561D452E45DA6414B -0x85C5D97E2FC24E57C486F90F20783DB043019B3B = MEN_IN_BLACK | V | 0xDA6D19F3DC9709F7F3BF43D41885506F -0xAC042FBCF42DBEECA6A59A56C6C360B473F3BE1B = MEN_IN_BLACK | V | 0xCCA14CBC1161C08983103FD4A0321FC1 -0x74F975FEBE95C7930E4954B5A129478C2A42F48D = MEN_IN_BLACK (Men In Black - Blu-ray???) | V | 0x94F3C08AE4E44540B45E92318EBC04E0 ; MKBv30/FindVUK 0.96 -0x567C513109C3237C2C4110D1D03B0EC7BD61A08A = MEN_IN_BLACK (Men In Black - Blu-rayâ„¢) | V | 0x43A53A75F4C57C7280D2598BFB64D9F5 ; MKBv7/FindVUK 0.99 -0xEC9530D1D3FFDC44EF8F8022A92C5AC6C7666587 = MEN_IN_BLACK (Men In Black - Blu-rayâ„¢) | V | 0x55880040F21C2B31E43983B6CF13386B ; MKBv7/FindVUK 0.98 -0x17D293E7CDA8EB95F48823A3C008BC2074A54ACF = MEN_IN_BLACK_3 | V | 0x1477879CEF25BD324135D13FB2277B3A ; MKBrev 31 - FindVUK 0.53 -0xF7E14DCFA7B0B2F81EC131636B7795C0837233D9 = MEN_IN_BLACK_3 (Men in Black 3 - Blu-ray | V | 0x03C70718D9EBAE629FADBCE51A10C501 ; MKBv31/FindVUK 0.94 -0x43D243CBC199B5B66C983CBEA2283567903CE92E = MEN_IN_BLACK_II (Men in Black II - Blu-r | V | 0x5B39E741F773B881F12EFCEA40F80352 ; MKBv28/FindVUK 0.96 -0xE5D1B591487B5F29EACB3C44D5D62D44B450A573 = MEN_WHO_STARE | V | 0x709ECCC08B397DE7AF09F9AF42ABB499 ; mkbv16 -0x794CB168902A5B83B19724037E2BCE2E96D3C536 = MEN_WHO_STARE | V | 0x5DB1CB84938F609338A57D5C21676BF1 -0x65EFFBB6AEEC7DF7F3C0E934D195AC770CC152EA = MERCURY_RISING_G51 | V | 0x84AE45B8AF11B7A4B50D5F0AF9EA36FA -0x856AC0C0C64E0418B0084AC7775D6BD4D8E82261 = MERCURY_RISING_G51 (Mercury Rising) | V | 0x3BD2978269F8FF44C9DE01366B504B16 ; MKBv16/FindVUK 0.96 -0x5A3840CDC2F69AE43EFD9C47A85B6C22C3046649 = MERRY_CHRISTMAS (Merry Christmas Mr. Law | V | 0x79CB6E546C4FE8F546758982102AD261 ; MKBv18/FindVUK 0.96 -0xFD693E2A0E7A835D86D53ECBB12E4282A584D7BC = MESGR | V | 0xC692B29779A642B5464AC6B5A5975438 ; MKBv3/FindVUK 0.84 -0xAFE5F15D7FBC67BD3978616CD149428A8C417E0F = MESRINEPT1 | V | 0xA7DD252D3B29ED36B8AAB7617846F919 -0x3589F0949BFE3AC3D646FE520690EE1046EC000B = MESRINE_BD | V | 0xE8623A17FF70409B5FAC0451E1C49B88 -0x7E8EF83D88B39D3F085F6B8B06E7989BD6D0F5FE = MESRINE_BD2 | V | 0xD6CC7E946E51A82A439D94B3956AA341 -0x01DB8CD4DDBA6808D5947965DE3E0F4C9A8AD484 = MESSAGE_IN_A_BOTTLE (Message in a Bottle | V | 0xE392E6DE45F9883941322FA1D0E37C87 ; MKBv21/FindVUK 0.96 -0x0E613361CDD113F010DB9ECAB223FA636E592509 = MESSENGER | V | 0xB64335F29DB6E0AA558ED59B7C7FEE2C -0xA19EA92F718D1BD0069DD69B09B6F84660FDAA50 = METALLICA | V | 0x801033F7C8009027AE4BE31AB2A0D691 -0x28E63B2CA409D0CB5E865E5AF4F168250516C6A6 = Metallica - Through the Never - (Metall | V | 0x7D94385FC50B1339F922B22397C0CEAB ; MKBv43/FindVUK 1.02 -0x3D1496FC9309CBE20C7D1E024ABCD97526070553 = METALLICA3D | V | 0x3516A6EBA9BE76398B7981625520D262 ; MKBv44/FindVUK 0.92 -0xB0BD27381F334304AF7AAED80E08ED652E3A568A = METALLICATHROUGHTHENEVER2D | V | 0x8C460F667C69E1095C9F95973C08A653 ; MKBv44/FindVUK 0.90 -0x638FD3BA6DE74DA9E1B86EB9791B8BFB7D769B5E = Metropia | V | 0x87826AEDE094F3328A43386B6331F2D9 ; mkbv16 -0xCB74D34A350DD6435D2A755660144756B78563FB = METROPOLIS (METROPOLIS) | V | 0xFB1A2881C917C9981C79B83128B3681A ; MKBv19/FindVUK 1.00 -0xDF0974B0E1EC534C392A1FFEEFB1F1423928BC94 = METROPOLIS_DISC1 | V | 0x9F58B1C5EE86CBD8EB9BA0EAD8B26E41 -0x6D57BCC0FBC29FBF1BDC59566848BD745FBE6380 = METROPOLIS_DISC2 | V | 0x6ECAD84E8AE7C959E3860136C6EA392F ; MKBv23/BEE/FindVUK 0.80 -0x4C317396692EEFB231CF59E40E4CA3AA10A8BD17 = METROPOLIS_DISC3 | V | 0x1E487DF1F1CB865C4004F6DE6B292324 ; MKBv23/BEE/FindVUK 0.80 -0x92739F64CB9B4B5ACF73911B748820BB01C0B990 = MEXICAN_PLANETMEDIA | V | 0x9CCF9EE28E325C7352181C5998729378 ; MKBv20/FindVUK 0.83 -0x85C094AE8A476508004197B58F571CF097EDE980 = ME_BEFORE_YOU (Me Before You) | V | 0x4E21A9A650E52B8A00A83436C84276CC ; MKBv62/FindVUK 1.00 -0x36C60FB417CA4C032448F2CDD8378AC4E213EA37 = ME_MYSELF_IRENE | V | 0x960BA9FD16FA96BD15D20225AF0A5A3A ; MKBv3/FindVUK 1.00 -0xFF91538C685462E5D3EA99A1E0FE3CF6E6F8AB8C = ME_MYSELF_IRENE_F6 | V | 0x1F74765B0A4E857F5E8D2F3705167B2F -0x347BAA5BB8F4822A665CC6505BC78F3AD28A169E = MH0x090401 | V | 0xE752D4FEC592C48A9D10A56C6CEB3524 -0x8F9B15FA1AD6A7D843235439D98F25D91CDE6AF4 = MIAMI_VICE | V | 0xE01EC96235185387A61F92FEDFEC3D81 -0x581446EB7658345CB8F368BFE1D5100B7E968303 = MIAMI_VICE_G51 | V | 0xB59624111FE70D8E49456E4B5CB0749A -0x39F5433BFD5F969BAA3369EADA4CB751494CCB56 = MIAMI_VICE_G51 | V | 0x0EE73679CFF976948DAF1DAFFC39B4C8 ; MKBrev 8 - FindVUK 0.57 -0x3077130D0C97043A8DEC0C37795DFA21398C6501 = MIBDEMO (Men in Black II - Blu-rayâ„¢) | V | 0xAC2831AA68971C0A3631D805690E10AD ; MKBv30/FindVUK 1.02 -0x4072086FCB9BEFA3FDA28059C9E89FB010863125 = Michael Clayton | V | 0x8FF5241B9F6C8C4AF8D6132036AB17A8 -0xF2AD6C5A34DC662F01FE9F1B6BB8120BBE3EAA21 = MICHAEL_BUBLE | V | 0x9C21C66ADF81079394E6FCE8ED8D7209 -0x81877E0D07B6885AEF1ED16E67ACFDC4A4839192 = MICHAEL_BUBLE | V | 0x9B9FC359F615C7F1C3B0073812EC1AFF -0xFF69B40FBF8F880C1A904E3FEE0E4532FCDFECF7 = MICHAEL_CLAYTON | V | 0x6C481E6CD690FC3AA3873DA242EF9AD9 ; MKBrev 4 - FindVUK 0.53 -0xF234535EA12AD9AD8B5D500709B4C3AAA8AA82F5 = MICHAEL_COLLINS (Michael Collins) | V | 0xD08D02BDA82A2BA1B62431145D35719D ; MKBv57/FindVUK 0.92 -0xB51B730D30EC917A69E939119EFAF046E0E93506 = MICHELLE | V | 0x58765185CC7B17D9C2BF52FD4B3932B5 ; MKBv56/BEE/FindVUK 0.96 -0x8B02A426F5803FC9522C8033423EA347BD4B756C = MICHEL_VAILLANT | V | 0x22D3AE55D3EAEE4F237C4CF82EC7808F -0x1A915DF8158F429D6980DB4D53B0552C5C3FC249 = Michiko and Hatchin, vol. 1 | V | 0x8D9B8ABBE704593F5A37B6646E20AAFE -0xF9F22CE6B03B43C2980A9306D282BA1342AA52B1 = Michiko and Hatchin, vol. 2 (JAP) | V | 0x15C43845F7AC4DD3EC02CCA98677A8A2 -0x1854B601E4467A49350FD20F16969FCEAFB64376 = MICMACS | V | 0xBF9A4094BE9B7588135CE1603433DC84 -0xCE1180513739B47F712A27DE72D4A84D13893C04 = MICMACS | V | 0x44F8DB114A563B6BAFCA2B613E4645B2 ; MKBv18/FindVUK 0.80 -0x59ABFAD6EBE8900832B42F054E8674C1A3721FC2 = MIDDLEMARCH | V | 0x767087E68AFB919F45BC21F05F7E7F10 ; MKBv31/BEE/FindVUK 1.00 -0xFAED82283894A0C2EDA86C77CAC8C8AD081E1592 = Midnight in Paris | V | 0x7426BF08346A829DF178030012CF8A5B ; mkbv25 -0x53929A13450E88C4D84B689E0AEEE0C398D2D0D6 = MIDNIGHT RUN | V | 0x815ED897F9FE691D43162FF5F97D31AC ; MKBv51/FindVUK 0.94 -0x423865E7957525CBC70DE20545F97D12447635B4 = MIDNIGHT_EXPRESS | V | 0x6E2755597F58A4D83E3E2889CF5B6529 -0xD51E7F4A324AC63ED8C3C8F27362F90145496A35 = MIDNIGHT_MEAT_TRAIN | V | 0xE3803F17535D6895D3868AC9CB454221 -0xA1B9F3531DF24A13953A6E480BEF77F2A838FB7C = MIDWAY (Midway) | V | 0x1909FF05EDE13F774B6A958CFBD89C9C ; MKBv31/FindVUK 0.96 -0x092F2DB72CEFD611C4B9FE47895E7C0B9FEABFED = Mielensapahoittaja | V | 0x6C36991ED052C00EF4DF4B3BD052E8F5 ; mkbv50/bee -0xB3E93F3D7C86BACD779B380D8855D5C6F3B35485 = MIKA LIVE PARC DES PRINCES | V | 0x1946E8D420295B2E808CDB574B207034 -0x879DF44FB3497B203317AC0260A9DBB48754A23F = MIKE STERN BAND | V | 0x7656B5C5915203491FFD421CEA4AEF1E -0x6110D0ED187B856CCA74668B806B91373FCBE02F = MIKROKOSMOS | V | 0x0368E09ED557FACAE4072E68F6E5D960 -0x83A287E3108F09510713FE5F20FFD70D43BDC799 = MILES_AHEAD (Miles Ahead – Blu-rayâ„¢) | V | 0x303A0EF4A143BF2A0038C50850D1DCF0 ; MKBv58/FindVUK 0.96 -0xCBE0110841694BA05038A8BD107F492929FA5A0E = Milfland | V | 0xC8C21E3721C27AF8D3911754118300A6 -0xE45CA32A29C60C7082ECA661A83907B0C3B61F8E = MILK | V | 0x40157C6F6ED1F2EC29B4EFD00C57D50B -0x407AF3268240152FAD9F7B0F9524F30CB5708137 = MILK | V | 0xA6682836DCE670BC7EB2DDD0402C1689 -0x8AF2C5D31100EED5DF648AC6178A8F1D17FACC3E = MILK | V | 0xBB96F8C23DFC46BA532082610067602D -0x564B52A8584F532DB8918DC9B6DAD11650427CDA = MILK | V | 0xCB68E66FA1A9B1237A54E2244B228A74 -0x06F34F76C93DC3A26134AAB4C63021917F5D9BBA = MILK (Milk) | V | 0x41B7CE2A6EEEA8FE8C985B5050EB4CBC ; MKBv10/FindVUK 0.96 -0x385D011313CDC46C748A3C74A4E1D9AEF95E1B0E = MILK (Milk) | V | 0x39140575E80EEB9D79BB16E28579EE52 ; MKBv10/FindVUK 1.00 -0xD1BB5A9C8E1251D071D3D631A176699471CE6921 = MILLENIUM | V | 0xC6F90D693E32BD9B01DAB8C69826C638 -0xF8E832C0C6A56D136F663B0AF52F9634A9DA9382 = Millenium_1 | V | 0xFE782DBC6533F964130C8B5F8BA2BB97 ; mkbv14 -0x96CFE5D5BC67864931F6573D986BCFFA6B15B8E1 = Millenium_2 | V | 0xF417908E6C93146E41D759E529BE2258 ; mkbv19 -0x3F0135E5A96A09F51DB37C8BF54C379A41178C49 = MILLENIUM_2 | V | 0x94ED29E1C2CC2EBCE83846C520490A1B -0x29410D2AA953A00AAEF74A26F83D85F97B78C105 = Millenium_3 | V | 0x1B457D374F63CD437570EE48D6657485 ; mkbv19 -0xFAA1A0187456B048A18CDCD4EDBF6914A6EB84F1 = MILLION DOLLAR ARM (Million Dollar Arm - | V | 0x7AABC50D0D71B435B7D8954ED8290CE3 ; MKBv46/FindVUK 0.96 -0x2DF27157ADA563F3891409B1542898627E8D2F55 = Million Dollar Baby | V | 0xEC12891A40A8D76DEC86E82E5EA7BE4E -0x88D59FC4D38795E90CEAA3D4881D0E6055DF9C94 = Million Dollar Baby | V | 0x2BB67B7A935BF9A0CDE1C5EDA196E16C ; MKBv16/FindVUK 1.00 -0xECFDD1A9B1B6B5B657D39B4079D7591BCB96FE93 = Million Dollar Baby (FR) | V | 0xBE3CBA203AEC0F3BB5B3203769729D7F -0x4110D8F1E817BECF92F40799E55965BFF88A3212 = MILLIONDOLLAR | V | 0xCB560AA277871939237DF44BDA6D0873 -0x7A07A8C9C6D1440F128E98A8361E84820532C30E = MILLIONDOLLAR | V | 0x984B62C3C55BF56D8F716F516CBC86BD -0x9A583C75FDCCE56F7D7428BEBC23168D8CDF804C = MindCandy Volume 3 (MindCandy Volume 3: | V | 0x543FBA7983B4C134E52CC34A1E529314 ; MKBv26/FindVUK 1.00 -0x8C083D431511C23BBC1814EEC2F542D15902683C = MINIONS2DRENTAL_NA (Minions) | V | 0x6E511727D02EF41C496D6B12A06EF5CC ; MKBv50/FindVUK 0.83 -0xA14888B1D6664CB4E018A7F5664908F50E99E58C = MINIONS2D_NA (Minions) | V | 0x9F359F05C043F5ABB640963EE42DCA87 ; MKBv50/FindVUK 0.98 -0x512AA0533F3791576B6D221496CDAF3CA3936512 = MINIONS2D_NA (Minions) | V | 0x5AF41D6E90A5F0E0D693E67144D83222 ; MKBv50/FindVUK 0.99 -0xEBB2771D31A971392689129CF20A8AE472910E68 = MINIONS2D_NA (Minions) | V | 0xAC2E454C11A0DDB34C24CD5F55460D4C ; MKBv50/FindVUK 0.92 -0x1113457F2AE5ECFFF447924BACCECEFEB52A32C1 = MINIONS_UPB1 (Minions) | V | 0xD3866F6F33875F342A031ECFFBAF827B ; MKBv56/FindVUK 0.86.3 -0x0904577E7D8E808EADFCD278A5F1D39D7EEAE284 = MINIONS_UPB1 (Minions) | V | 0x82C03A92C3FC71F155EF90712018B50E ; MKBv56/FindVUK 0.99 -0x4E200113D0C0BECEE83B06660EF6AC76FED0619F = MINIONS_UPB4 (Minions) | V | 0xB02FE3B3F9A72771AA45AE86849CC975 ; MKBv56/FindVUK 0.96 -0x59B20771C37B6AB35A52BEFC5B74ED57843B9AF6 = MINIONS_UPB5 | V | 0x728F17AAA2B862CD721242F7377C418E ; MKBv46/FindVUK 0.80 -0xC8D77DFDF26672E61163ABE2214566E694998A27 = MINIONS_UPB5 (Minions) | V | 0x4D0F77A653CCB365FB05E1A048C5E799 ; MKBv46/FindVUK 0.83 -0x4CC0858992C589412167A7C96FBB84E545D42B17 = MINIONS_UPT1 (Minions 3D) | V | 0x992A9A7CCAF7768CFDDCCE9CAA612441 ; MKBv56/FindVUK 0.87 -0x0F974030346971571FD58326339856112FBE73F1 = MINIONS_UPT4 (Minions 3D) | V | 0x87C95FDB35ECE11E205D44074CBB1FA8 ; MKBv50/FindVUK 0.89 -0x46235133871DE38ED40C57CC2FE976A86CEBB7CF = MINISTRY_OF_FEAR (MINISTRY OF FEAR) | V | 0x7CDF99DA09445FB45D78FC0149AFC402 ; MKBv35/FindVUK 0.99 -0x874822A8EDBE6DBAFC8ED324FCB914D67F74C267 = Minority Report | V | 0xFBAC80ACC193DFB3E23E95E48A950DCC -0xF29E8F432E33723E65D093CB70AFF3DE430BFA1E = MINORITY_REPORT | V | 0x6B0EBC7823CE2572F24C7C05E81097BE ; MKBv16/BD+/FindVUK 0.72 -0x4F74CECBBD1646D17D0127E84AE6E37DF0F50DF5 = MINORITY_REPORT_D1_AC | V | 0x8FAE2B396D3394E65E92495E6E030230 -0xD9C6C333A3C5C217434C44622C0947A16355EE23 = MINORITY_REPORT_D1_AC | V | 0x7B8F1F6690A4788675A201A8B0565736 -0xEF6973BC3C46EA7FEE7660365EF666D9291F9125 = MINORITY_REPORT_D1_AC (Minority Report D | V | 0xED730C05C6340CC2C503CBE3B57854C3 ; MKBv15/FindVUK 1.02 -0x9E737566F0EC45C96A46E038210E5EF4FF18E247 = MINORITY_REPORT_D2_AC (Minority Report D | V | 0x155564464D93C82CDFD61DF0A48A09B5 ; MKBv16/FindVUK 1.02 -0x4A8F9B7E91A84500EEBDFB19836910E2DACA6A08 = MINORITY_REPORT_F1 (Minority Report) | V | 0x9DA34123A88099946B543D67738E6F6F ; MKBv16/BD+/FindVUK 0.98 -0xEFE59DBCE53A374D0A8B7ED5105F7630F164C381 = MINORITY_REPORT_F6 | V | 0x6124DC1704B6949F8B3413972516C74D -0xF98AE7525FBDD0375B7B5EBA1C07976599974433 = Minuscule - NOR_SWE_FIN_DAN (Minuscule 3D) | V | 0xF04767835F542D8420F84382DB8BE0BE ; MKBv48/FindVUK 1.02 -0x1F7D8DF0C326C529F4A6FC1BB36222741AF82DDC = MIR1NNE1 | V | 0xEDF141F04A87CE69858AD3D170ED6EB8 -0x26483E4FDE974C830AECA58E88C53B9BB87F8897 = MIRACLE_ON_34TH_1947 (Miracle on 34th St | V | 0x09F2619F2DC8C01B99949811B483B6DC ; MKBv12/BD+/FindVUK 0.96 -0x8F4370AE4536D0B6833E01314131C06A868FFF78 = MIRACLE_ON_34TH_STREET_1994 (Miracle on | V | 0xBCFED1698CCFA461E020D3B5C76B6C66 ; MKBv19/BD+/FindVUK 0.94 -0xAA10B276C7BC243D20E7BDF40C3197C520AE4232 = MIROPBD2119 (The English Patient) | V | 0xD289368FC49B7C3EFEEA1094EC6F2A8D ; MKBv23/FindVUK 1.02 -0xB0D6275A5ECC963FDA327BB297975D0226A1F1BE = MIROPBD2121 (Chicago) | V | 0x136929299096131458FA8C4B720C8C62 ; MKBv23/FindVUK 1.00 -0x1538447B7388E94578AFE069E66312E29F5F6971 = MIRRORMASK (MirrorMask - Blu-ray???) | V | 0x777CB4529F0EFB587C5539E93EF64FDF ; MKBv9/FindVUK 0.94 -0xC564469A7E05A57386E4B7AF4B335337F8B610EC = MIRRORS (Mirrors) | V | 0x07D758781AF62F598AB97F0E3579ED7D ; MKBv9/BD+/FindVUK 0.96 -0x77E988A63500D7AF7388A95A829900328ABAC022 = MIRRORS_F4 | V | 0xE9E862DFEA7DFA2AAE6E91B85B4313DD ; mkb v12 BD+ -0x1B1ABBDFE525B66A4600BFC17AA36C5D7BEBE611 = MISERY | V | 0xA77CF37E0622EFC900162781E1CBFBD7 -0xCBAB1A3A880E64B4A77C88620319B1255FED7A1F = Misfits series 1 | V | 0x3BA01C82B156E2D15590A87D871E9DEF ; mkbv23 -0x8E4E0CEECC07F037424B491F26C0D560B6396788 = Misfits series 2 disc 1 | V | 0x2A179E3F764268F9095BEADFCAA10E34 ; mkbv23 -0x06205F728D3EA424AC0E6371E507DE22E227F622 = Misfits series 2 disc 2 | V | 0x109E8E9ABF601601A56595CE40B7F8C0 ; mkbv23 -0x04E72EE1507B3C10EC98ACFE29C88078C3572F09 = Misfits series 3 disc 1 | V | 0x7B25A5947B0C66669384CDC84EBEF72A ; mkbv23 -0x0D6C51405560DA0D155A8390BD236592FA0C51FC = Misfits series 3 disc 2 | V | 0x947AAC05284E8C320261D0DB9855AD71 ; mkbv23 -0xAB82A3B0D59CD9C1C7E2FBB4235B4F10B0F7670B = Misfits series 3 disc 3 | V | 0x1A58E52F0A06E6A22141ADF042C2E815 ; mkbv23 -0x605783547AA72C6E3560846155F5874B8B58C51A = MISFITS_SERIES4_D1 (Misfits Series 4 Dis | V | 0x23384FE70E2BDE77EF9AA92EF8A68058 ; MKBv34/FindVUK 1.02 -0x5E236C5B479A52DDC22DD1D166EA25D61F5B1551 = MISFITS_SERIES4_D2 (Misfits Series 4 Dis | V | 0x87F79A31F79F98E18E6B7E249A1D4F65 ; MKBv34/FindVUK 1.02 -0x389F811E0CD2B4052997A228CDBDD807819CFB80 = MISFITS_SERIES4_D3 (Misfits Series 4 Dis | V | 0xE62AC9BDADD5F72A4B9A61621AB20BCC ; MKBv34/FindVUK 1.02 -0xE6F51E5B38622EEC7853EDF8819F0D0A7AB71849 = MISS MARPLE VOL1 DISC1 (Miss Marple: Vol | V | 0x5021D97CB6AFAC577EBF00ABCACB5386 ; MKBv39/FindVUK 1.00 -0x9103B14AA4E840FFC5CD8D4816915C711D38C9BD = MISS MARPLE VOL1 DISC2 (Miss Marple: Vol | V | 0xC67B569B21E34C7F8759A921448C8033 ; MKBv47/FindVUK 1.00 -0x71E83B169F4775102EEB6FFDF485297E64D207E8 = MISS MARPLE VOL2 DISC1 (Miss Marple: Vol | V | 0x5E634ED55A2F0B11F8B7A031B43B4E70 ; MKBv47/FindVUK 1.00 -0x9D6170021FC5FE8B4B65CEE4F466AB41F71401C7 = MISS MARPLE VOL2 DISC2 (Miss Marple: Vol | V | 0xAE8D686D3E4990CEA5CD9A27F7B35A07 ; MKBv47/FindVUK 1.00 -0xB3600639CBBA29887A02CACFC7585CE5BBFFCCC0 = MISS MARPLE VOL3 DISC1 (Miss Marple: Vol | V | 0x66E002E129EB590BCA68CAE24796B3F6 ; MKBv47/FindVUK 1.00 -0x091F4777EE50803982E10C74130CA24B9A75E444 = MISS MARPLE VOL3 DISC2 (Miss Marple: Vol | V | 0x950EDC65AACA03806D1B13570C1E6148 ; MKBv47/FindVUK 1.00 -0x5C04C563BC311CCC29A515044695F0B6486FFA52 = Miss Peregrine HFPC (Die Insel der beson | V | 0x3D16833D5EDDED4D4C21EE04537BC7D1 ; MKBv57/BD+/BEE/FindVUK 1.02 -0xB01C8C10CEA251CE65508498993E36D3FD1A7B72 = Miss Peregrine HFPC (Miss Peregrine's Home for Peculiar Children) | V | 0xC441A00C781061AC30C92E8E715C55F6 ; MKBv50/BD+/BEE/VUKNOTVAL!/FindVUK 1.00 -0xE9265EFC1FB2BEAFFF3955B48B59461DA18AB90B = Miss Peregrine HFPC (Miss Peregrine's Home for Peculiar Children) | V | 0x0B187B3A3DA0A7ED8D94C1FCE21F15D9 ; MKBv50/BD+/BEE/VUKNOTVAL!/FindVUK 1.00 -0x18392AE5E24CB7F06CECB0753B0F487F5DBD1D93 = MISSING_IN_ACTION_BD (Missing in Action) | V | 0xB7C8DE09CBB7B6D51D53D8839E67191E ; MKBv31/FindVUK 1.00 -0x754AE6D789346883EA389CD726304F4EE3839D00 = Mission Impossible | V | 0xAF147EB7C110A08DA78EB9B05C180E60 -0xC213D49B9B3975C264AB8E951A5EE8792A28CE80 = MIssion Impossible II | V | 0x7FC3A296BFB9B39995BB7933C3E4D9A5 -0xBF48337189B0CD51B62C08CCAB0546F7B0280BE5 = Mission: Impossible 3 | V | 0x203C42A7AF56F7910B9D0F14634AAAF3 -0x496020AB28A781251068E8CC30F9CBB5EDF0CA2B = Mission: Impossible Rogue Nation | V | 0xD30911343232FF81B39A5F4C310370CC ; mkbv46/bee -0x3AF12E247DEA6C529332E60C660C352C18A48668 = Mission:Impossible 3 | V | 0x6E84A83BE8DD922E9CF47CBA30900E18 -0xF11C397E0BE30C9F75D52DEFA3F1F38F62CE4ED6 = MISSIONTOMARSV2 | V | 0x260EBB3AD477DF2B70CC555915ED2F85 ; MKBv12/FindVUK 0.65 -0x54F6341EE43A7EE742D744F0B603E36864419AB2 = MISSION_IMPOSSIBLE | V | 0x31D6FA5F7D3DC1C15C5FBAE2C3ACC1A8 -0xC707151D7F8824EE92C163EC9F749746F5BC664D = MISSION_IMPOSSIBLE (Mission: Impossible) | V | 0x6BE286D6EAE0FDA9F6EAE39122F57188 ; MKBv26/FindVUK 1.00 -0x88601B85170FF1266B9E46AACDD759B3B3E371DF = MISSION_IMPOSSIBLE_2 (Mission: Impossibl | V | 0x29ED498110A1FB72939AB492862ABEEC ; MKBv26/FindVUK 1.00 -0x6E1F32FFFF7039F422FFBBB4918F66487A0ED266 = MISSION_IMPOSSIBLE_3 | V | 0x53A4EA1E1CB91B1B0DAECA7DF05235C8 -0x17394657BF261EBCA59D8531FD623EB64F10CB30 = MISSION_IMPOSSIBLE_3 (Mission: Impossibl | V | 0x5CDF94932D0AA4E05A896E066559E2FC ; MKBv14/FindVUK 1.00 -0xCF20D2E674F96B0FCDB0001150DEC261CBA4C1BB = Mission_Impossible_5 | V | 0x45F464B1F5528F63CEE05510DCE11F1B ; MKBrev 56 -0xA6EC2F810AB326767C12CDB5E8E3C8BADBB1A7F8 = Mission_Impossible_5 | V | 0xFE3038BEF5BF72BDFDBE6A74C89DF18E ; MKBv46 Mission Impossible Rogue Nation -0xD7D4DE9FA41C30255C45A6875F8B3D03CB4C02B4 = Mission_Impossible_5 (Mission: Impossibl | V | 0xEF7B7A2B13CD94AB0E165019C7F1DF63 ; MKBv46/BEE/FindVUK 0.96 -0xB6D9EA4F5CBD290183BF9DA6A7397B6A5663E79C = Mission_Impossible_5 (Mission: Impossibl | V | 0x8CFF369CC1648B0E8C3196D650BEC14F ; MKBv46/BEE/VUKNOTVAL!/FindVUK 0.89 -0x8B823A9A6D4727A4A78F6748ECCE18894A0430B4 = Mission_Impossible_5 (Mission: Impossibl | V | 0x17EF3A155BEDBCEFF90FEDB902661297 ; MKBv46/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0x82FCDE1C7FBD4F592C63E9E2146BC72777059984 = Mission_Impossible_5 (Mission: Impossibl | V | 0x2CD378F12B5C240A1AC1A35D65DB53EC ; MKBv46/BEE/VUKNOTVAL!/FindVUK 0.93 -0x9D92E617803E669DC251F11991B40FF56CC680F6 = MISSISSIPPI GRIND | V | 0x496FC5979B85C424C65AD98C22D989E2 ; MKBv58/FindVUK 1.00 -0x6901197D58BAFC1731F1052128C2325401D70C4F = MISS_CONGENIALITY_1_2 | V | 0x4E0762CECE087E345A505FD9BAE3E133 -0x7D9AEA37D14E9363C63E12CC9737D148DE38FDC6 = MISS_MARCH | V | 0xBAA84A4F55724FECCC7D20B48FBE4FDA -0xF2E2126CE533B0AF6960A629F3F3771C2C0E5454 = Mist | V | 0x480A05D53AD966B94B76AF37627E066C -0x2213D150E1A868B7F2BD9A4E7F8BD7206707A1AF = Misty_Beethoven | V | 0x3333C63EC1358D6A8619DC1A39174D61 ; MKBrev 33 - FindVUK 0.57 -0x7C3A084F51FA330EAF8F5A0223634459F9EA5C3F = MIST_D1 | V | 0x65A119BE968DCF3CEEA67EBD691FFD1A -0x0B4C63E2BDB328AFE5B251D680EC33D0581B1C06 = MIST_D2 | V | 0x1B33EF09B319D471DA0173F44E10FD1A -0x4BE46C6A2275902499C4688E9977640856B2CA23 = MIYAZAKI_COLLECTION_BONUS_DISC (Miyazaki | V | 0x09AA17BFB1BAB21D87834A892AA80527 ; MKBv50/FindVUK 0.96 -0x847EA263450E5D93041FB87547DA5CE3B13CBC65 = MLP_Equestria_Girls_Legend_of_Ev (My Lit | V | 0xD6DEC5EB6F76933CAD251F3A9CB56C13 ; MKBv61/FindVUK 1.00 -0x749EE9B1C94B3284EB569128070D9ED46E8C7A44 = MLP_FRIENDSHIP_GAMES (MY LITTLE PONY: FR | V | 0x8B5373449A0E76661F2451EC8670B301 ; MKBv57/FindVUK 0.93 -0x40CF9D476B0C6C9C63F3C91C53DAC5CE6EAB6CEA = MM0xA2943BR | V | 0x408A29DDBF9B4CEAA406B6DB55DEBEE4 -0xD2A6E28E86DFEF71A07EB13E4815112599830609 = MM41NNE1 (Mars Needs Moms - Blu-ray?) | V | 0xD78346632EFCF53641C154A678AE11CF ; MKBv19/FindVUK 0.81 -0xA735E43069758BD80B10CFC8FFF450E7B25C5756 = MM41NNE2 (Mars Needs Moms - Blu-ray 3D?? | V | 0x55E4F6BF56A03DABE5339ABBAB10A441 ; MKBv19/FindVUK 0.81 -0xBDE9FCA8601F050289453F471192CD0FC1B65914 = MMU1EUE1 (The Muppets - Blu-ray???) | V | 0x71A12F0B79F5667BD787EBC5B8275A9D ; MKBv23/FindVUK 0.94 -0x1BEF57C4539197716B93E9DD6C59008F41D8B916 = MOANA (Moana - Blu-rayâ„¢) | V | 0x3C0D217D7C4A872E4531B404A6E0908A ; MKBv58/FindVUK 1.02 -0x9E7B0A702C2A621899B41C45E8EC575A36D2091D = MOBILE_SUIT_GUNDAM (MOBILE SUIT GUNDAM) | V | 0xEEBAD2C99863F58823CBFD11CAB38A39 ; MKBv62/FindVUK 0.98 -0x45EB31906F79A8B43E8A1BA8F6A810B47A9C074F = MOBILE_SUIT_GUNDAM_II (MOBILE SUIT GUNDA | V | 0xE7A2C35FE6D6700901E9A8C23FEF22E7 ; MKBv62/FindVUK 0.98 -0xB59EB97C2D3709CCBB36C2C10722DB5A4B662C73 = MOBILE_SUIT_GUNDAM_III (MOBILE SUIT GUND | V | 0x1A440B7431803BC367A5586C466600F0 ; MKBv62/FindVUK 0.98 -0xC293960EDA39C897F331D6681827B152FAA94D57 = MOCKINGJAY (The Hunger Games: Mockingjay | V | 0x7E8CD7113F2CC448A5C5C2BDB61536AC ; MKBv46/FindVUK 0.87 -0xCC3559AE1E867D4689091DC36E82EBE46EFBA630 = MOCKINGJAY (The Hunger Games: Mockingjay | V | 0x13DE385CAA569287F48F284878869B7F ; MKBv49/FindVUK 0.96 -0x1DFCB0BB22CBBA70CC613463A4AD9BEBAB87107E = MOCKINGJAY_1_3D_REDO (Die Tribute von Pa | V | 0xF87445DD4ED866F9352B1A18DFA0EC16 ; MKBv61/FindVUK 1.00 -0x439E67A7021AEA389C3585515A4E37518FD56942 = MOCKINGJAY_2 (Hunger Games: Mockingjay P | V | 0xD92CEEA75355EF888B25480E6E1778BD ; MKBv58/BEE/FindVUK 1.00 -0xC0E8F4AD7A78B42EFA528AC3A1B6E165DC6166A3 = MOCKINGJAY_2 (Hunger Games: Mockingjay P | V | 0x53708F760C082F01D09E3063E6AA690B ; MKBv57/BEE/VUKNOTVAL!/FindVUK 0.92 -0xA7592B997942FF2E0533EFF9DE084ECBFE4C3B4B = MOCKINGJAY_2 (Hunger Games: Mockingjay P | V | 0xF6E0D9FDF3B442C48C92F8172DB87DC6 ; MKBv57/BEE/VUKNOTVAL!/FindVUK 0.92 -0xF56534C8F8E44C7D5E9F10EEE20B66726626F480 = MOCKINGJAY_2_3D (Die Tribute von Panem - | V | 0xA7848BBAE49C4C5EC99428184E817735 ; MKBv58/FindVUK 0.96 -0xD7530C3AC2A9A9E41533F882597968D31C0E579D = MOCKINGJAY_2_FE (Die Tribute von Panem - | V | 0xD7608CE0C26CAD6AD1ED34A7CD221D7E ; MKBv58/FindVUK 0.92 -0x4B04E15D88EC9CCF9CC3DC76AB77ACE1D0845BC2 = MOCKINGJAY_2_VL (Die Tribute von Panem - | V | 0x0E8068BB317F8C1A9B018EF894AF417B ; MKBv58/FindVUK 0.98 -0x357A2B18E1D5971B71A293B7EEE16E0D44496256 = MOCKINGJAY_PART2 (Hunger Games: IL CANTO | V | 0x40A5B6A2AD1362AA0A6D8F0BBD1F7DE2 ; MKBv56/FindVUK 0.96 -0x2A6A7A18CF79412C339E11917B92B951D17AD8B5 = MOCKINGJAY_PT1 | V | 0x9DECEBA6E442C5F8BDB707E1A1E4E8A5 ; MKBv51/FindVUK 0.80 -0xC1AFD60C1B29BDDF8CC3C4ABAF4CBF6C6D0E547F = MOCKINGJAY_PT1 | V | 0x6F19292CD8C98252368972A44E9F7B0B ; MKBv51/FindVUK 0.70 -0x85AD77385A8B2AC75B3AAE166B26767E1491258B = MOCKINJAY_PT1 (The Hunger Games: Mocking | V | 0xA92BF1752B97F83A0520C1CC799B37A3 ; MKBv50/FindVUK 0.92 -0x04CCAECF892EDD75E02C320BC35BD5457D6F5F51 = MOCKINJAY_PT1 (The Hunger Games: Mocking | V | 0x22BF041CA38107FE7D9A987E6FE245DC ; MKBv50/FindVUK 1.02 -0x068737FF0ED0A7DBD85F0BE459E472E3C3CBF3D7 = MOCKINJAY_PT1 (The Hunger Games: Mocking | V | 0xB84D00BF4A5F50D94D42DF5668845810 ; MKBv50/FindVUK 1.00 -0x944189101078A4E9B142C3E44E212E96E137A207 = MOCKINJAY_PT1 (The Hunger Games: Mocking | V | 0x9B85DF7C5177CD87986E69794E73E4FE ; MKBv50/FindVUK 1.00 -0xB56F128C07F11C1FE712DB203F9CD92BF25FD866 = MOCKINJAY_PT1 (The Hunger Games: Mocking | V | 0xC7A238CDDF31A891B7717F4557AEA380 ; MKBv50/FindVUK 0.92 -0x8E1FA87985CEBE260F22731D67DAB49F4DF54542 = Modern Times | V | 0x7E666A2FB0BAA76EE5FC87A104EAB5A2 ; Criterion -0x203CE17BF96D9219B569C5790A9A66AFCBD1FA99 = Modern Times | V | 0x3E8C2C904BA10E6835DE82F6BDEEF51D -0xC8DC5361123330416ADDD77A98DA935D6169A475 = MOD_AMER_OF_EMILY_883316987322_B (Americ | V | 0x9EDB662B7E295D72C3CACE604F0DE9EB ; MKBv46/FindVUK 0.96 -0xE14E2714FB51969D9CCC56473E5C3250D5FD1A0B = MOD_Justice_League_Unlimited_S1D (JUSTIC | V | 0x4C7805FCB487587AB7EB9B6E9B0721D1 ; MKBv57/FindVUK 0.99 -0x2131DF87BB1EFD2E39205FE91892F3421AEE4F35 = MOD_Justice_League_Unlimited_S2D (JUSTIC | V | 0xFDB494B68AB1A678213A5FFD3659FF2B ; MKBv57/FindVUK 0.99 -0xEEB279E3177108FB0D247F7695E96AA105EF277C = MOD_Justice_League_Unlimited_S3D (JUSTIC | V | 0x6A7F179167B5385529A6D3CAB604747E ; MKBv57/FindVUK 0.99 -0x30AD494D7F7CB26DC291BF4521A70E337EBCE6C5 = MOHNBLUMENBERG (Der Mohnblumenberg) | V | 0x3F29AC9AFBF16E9C136B63031A7DE34A ; MKBv46/FindVUK 1.00 -0x8ADA0F5438E143E24A9C87BB73E2933F3B3F1F6B = MOJAVE RUN | V | 0xF7C7BFD79946604B3EE5D407C6AF0AE1 -0x316574CF699479932C6545564921599E28A57254 = MOJA_WIELKA_GRECKA_WYCIECZKA | V | 0x91D9F698EE8F9E09F0914D8985A438C8 -0x41E123E2D63448BFAD0033BDDD9B68DD395DEBCE = Mom | V | 0x7F0B609F89408B563D21A34475FEA0DB -0x0875C1C2164C1C83C8F05C68C36DA26045FF7D43 = MOMENTUM (Momentum) | V | 0x4F82443BE9AF96BC353DE219F9813A39 ; MKBv56/FindVUK 0.98 -0x49DA9A70AA97C6DDF6CEA509EDEA7A36B8401584 = Mommy | V | 0x9B1A170B5FA08FA4F5909D67448D1241 ; MKBv53/FindVUK 0.98 -0x7AEFDB666C489AB02B5E739829D2718D2095BFBE = MON VOISIN TOTORO | V | 0xC59BC79E256904F726030EB55C7ED047 ; MKBv38/FindVUK 0.84 -0x184A110DF8B59CA25287D9913BE4D3A53C338BED = MONA_LISA_SMILE | V | 0xF0DA056C66BD0999CBFEF74D600349C6 -0x4496AC2ED376AAD55DCD1592FD75405AD36F7795 = MOND37 (MOND37) | V | 0xC37C99EF6D386E8ADC8AF88CEEED79DC ; MKBv32/FindVUK 1.00 -0x3999A3613291837BB5D0CE18E8D5DBCA920303EF = MONEYBALL | V | 0xE598D4C4F51BF5AB0AC896ECDE30CD88 -0xA0C1153E4151A3104C3C968AA6FEEDEC8AF363AB = MONEYBALL (Moneyball - Blu-rayâ„¢ (Mastere | V | 0xBAA3BF997D760545B93E40871FFEFC92 ; MKBv40/FindVUK 1.00 -0x870A438D71E8E8D33B125435DE886AA039410ACA = MONGOL | V | 0x555DD8C6937F8B41059CAD73057BA579 -0xC4DF86BD61805708C0F25B4B9C81541E23461945 = MONGOL_BD01 | V | 0x8C2D450E2C3F1BF123F8F7F880354900 ; MKBrev 7 - FindVUK 0.54 -0x04A678A2E3DD5870B3FCC72A6E2754FC3BB763BD = MONONOKE (Prinzessin Mononoke) | V | 0x400B1B2A445192DB17695C81EE21F55D ; MKBv46/FindVUK 0.98 -0x3C7BD815F9E17C5D4D325C7ABDB1705C0E305864 = Monsieur Verdoux | V | 0x758FA0576408947D63DB5AB8D5A8A855 -0xC4CDF5973CA48494088C51B8831D40A90865C152 = Monster | V | 0x5016E8161E8AC63DF7626FDA0D39349F -0x67BB04E7761C39E2DE2A30502A750DA533A2E101 = MONSTER | V | 0x16432BE1BF7BCF2DAA5672620EE00EDF ; MKBv14/FindVUK 0.92 -0x278E5F85485E5C0768EB87EC16614DC9C7F8267F = MONSTERHUNT | V | 0x736E84DBA05BC61ABF27AFC20EDA839F ; MKBv62/FindVUK 1.01 -0xF465818FA591508B6496898664ACDA555E49D464 = Monsters | V | 0x7B014E5BC88BF9D0DD3206291B0F9FD5 -0x359D6D1346BE46BBD0F3866C63B1E486CBE210BE = Monsters Inc. | V | 0x7B47109D997DEFD1663347C1030D1D00 ; mkbv28 -0x89A20D01579E37DD93D6814E2368B981F81FD1E5 = Monsters Inc. | V | 0x7037E105A5F66898A91CD5B7E23D6EF6 -0x0B9A682E360A0B3783BB1449CA2ED3B0725A775C = Monsters Inc. 3D | V | 0x30F5BCA99ED5B289A567C4DB886496E6 ; mkbv31 -0x466B3D6C36EF55312B74A1FDB79D8B7F652967C5 = Monsters S_A 2 | V | 0x99F9E3BCC0AC9BACF3B5E8EF81A161C2 -0x4F36F905EB5D7F1C01147488350CA929AA8BB03C = Monsters vs. Aliens | V | 0xB8B1F9827931DC0E3E69CFB29A82571F -0x90FA27F52ACBB66F914700BDD802352971F41537 = Monsters, Inc | V | 0x8FFC1E35A3E784D1B09D81D7ACE80D20 -0x5757D37188ADA652F941976B140385002C334CB7 = MONSTERS_BALL_BD_LGE | V | 0x9BFB72D98CBD549065CCFA705099C38F -0x8FA35F4AC5A8A180D3AF0CFE9D17650C2817BF29 = MONSTERS_BD (Monsters) | V | 0x4AFC2F0660628BA6B1F7E5C7212530FE ; MKBv19/FindVUK 0.96 -0x743B1CE50298991551B9D24C2B3AAE736E3E159D = MONSTERS_INC_3D (Monsters, Inc. - Blu-ra | V | 0x4458BBCFD191E09AA2DDD0DC5E75A44E ; MKBv28/FindVUK 1.00 -0x67A88EC84E926C1648A4A095C0E005B414C14772 = MONSTERS_INC_3D (Monsters, Inc. - Blu-ra | V | 0xF71091B99C0645731FE3BD8F1C8AFF9E ; MKBv36/FindVUK 0.92 -0xA59770ABB0E7594137C897F2AA803219850869BD = MONSTERS_INC_AUS | V | 0x660F3344D9A854E6F6A19935D0F3445E -0x6A2036180EAA8F943830D9A6CAA0BEB1B57A4BD2 = MONSTERS_INC_D1_JPN | V | 0x7E5EABE9A3B0DAA3851B663CC318D9FB -0x6D6676E810B1893CCA2241E8320DF1C45C7400B5 = MONSTERS_INC_D2 | V | 0x4397D377475452DECE1642497F0091FE -0xB4A79A51DA3A8559F2A9341B5FF87AB149BD810E = MONSTERS_INC_DEU | V | 0xBA1A7FD284614D8C2A21A3E5B3D1E375 -0x06C5D9C8B31534890927D3780177B827B78AE198 = MONSTERS_INC_DEU (Monsters, Inc. (Disc 1 | V | 0x32575C9A096DB740391D8C415BB8AB31 ; MKBv36/FindVUK 0.92 -0xE4746D26721F66E5DCBE34BB87FFE74E8FD7A3B2 = MONSTERS_INC_LIC1 (Monsters, Inc. (Disc | V | 0x1AAE15C65D75DF3C2405CD3E8B087510 ; MKBv15/FindVUK 1.00 -0x870B53084E3B54DEBACAA0364A8BC8EC3A9BDD0E = MONSTERS_INC_USA | V | 0xD6FEF2FE2C1600A75F0E62FA1CD50EE5 -0x6B924E6F21D5FB0461CB50CDB64799D88D67658C = MONSTERS_INC_USA | V | 0x0A2F6C6B322E42AE7E695C3979BD03EF -0x9AD4F97F592660382F2F1F90041DF7AE091D68E9 = MONSTERS_INC_USA | V | 0xC6DF7658812949860CF0D90DC2FF4CED -0xA7065C4E553267D4C9573D8C4AC66DF1C692EA71 = MONSTERS_INC_USA | V | 0x651C435FA968CB0A0E813C2E6EB8C59E -0x9EE786992909FEAE7E7AC44C4E3A5102B85042E0 = MONSTERS_UNIVERSITY | V | 0xBA07D2D659B30FC42D2B61EC008A2911 ; MKBv31/FindVUK 0.84 -0x51FA42951AC3F6724AFD1A6FAB39A7FBB3F0B210 = MONSTERS_UNIVERSITY (Monsters University | V | 0x322BB17D2BCDFF2336DEF0C44459317F ; MKBv31/FindVUK 0.92 -0xDF6A11851BEEBF04A7AC57D4E41390486368888A = MONSTERS_UNIVERSITY (Monsters University | V | 0xC03E1B8C10A48349558F94B89A056124 ; MKBv31/FindVUK 0.94 -0x043A02D42670DA2CEA72C1ECDB10F64AC3FEFE6A = MONSTERS_UNIVERSITY (Monsters University | V | 0x62596AE05CAC9F50719275D2F2B774FA ; MKBv31/FindVUK 1.00 -0x27BEAEFDB986608E73D9FE4D2B555992050FABCC = MONSTERS_UNIVERSITY (Monsters University | V | 0x2580CA760BAC71ECFCB6FBC8E15DC9BC ; MKBv31/FindVUK 0.98 -0xE8742C898574638905869D2E15AF0D98085DC317 = MONSTERS_UNIVERSITY (Monsters University | V | 0x7DCB8A238671AB09A9BE1808480B8FA5 ; MKBv35/FindVUK 0.87 -0x00DCC51AFCB4F2CB9AEE2F34161CBC73DC2FAE8D = MONSTERS_UNIVERSITY_3D (Monsters Univers | V | 0x59382A612DA481C9E5F6EB553DDE1EF7 ; MKBv36/FindVUK 0.87 -0x1C8E3B3B3C6D5A17D0E832FD29985E70FE8C728A = MONSTERS_UNIVERSITY_3D (Monsters Univers | V | 0x6617217E75363833CFF918FFA07B5C72 ; MKBv36/FindVUK 1.00 -0xCAB837C5C2222E525E42C1C81FDA1DA64EF3B7CB = MONSTERS_UNIVERSITY_3D (Monsters Univers | V | 0xCF663196B4A91C8F5AB5F36C8790296A ; MKBv31/FindVUK 0.96 -0x81EFD2EF90E6606AF7BCFD88090660212D814F0E = MONSTERS_UNIVERSITY_BONUS_DISC (Monsters | V | 0xD552573A828D6903B6BE8B309972E096 ; MKBv36/FindVUK 0.96 -0x7B8E61DF1CE79855984C51B2DF47939C4ACB7384 = MONSTERS_VS_ALIENS | V | 0xBD232D818B620DC8593EF4DE27364779 -0x9AF511AE59DA0C1E1896C60EC10175143B5B4CAB = MONSTERS_VS_ALIENS | V | 0x3764BA2AD6745733C32EF6B2B0D974EC ; mkb v12 -0x9BD1B22849D27869CDF6A057820FE96F63C234F8 = MONSTERS_VS_ALIENS | V | 0x7550B896959D1CFBB9738016B922AC66 -0x4EDF868F3005C7B42B4B1AD3DF359438B76DD592 = MONSTERS_VS_ALIENS (Monsters vs. Aliens) | V | 0xCD2C8C59BBAD58BBF67625BF57D33B43 ; MKBv12/FindVUK 1.00 -0x6DDAAA6368D11618AA0882C6FC3E953AC2D85C67 = MONSTERS_VS_ALIENS_3D | V | 0x30523F09FCED40E7F89C6B2D92DDD7F1 -0x806A317016FA27B5AEBFBEA53DDAD7B595E58CC5 = MONSTERS_VS_ALIENS_3D | V | 0xA6FC9D43B2D06D17E63144DC30E00BD3 ; MKBv16/FindVUK 0.80 -0x6536DF2B82A0FF5FA6BDE060917B16063F82E901 = MONSTERS_VS_ALIENS_3D | V | 0x69C0F0640C03C67D33516066744B40DA -0x54B521711CD64E5B9D7865CC139261F8C1A95CEC = MONSTERS_VS_ALIENS_3D | V | 0xD4D71AF034F308A4C47D1CB178C559CD -0xD6F0051599A6DB3EC1B444E26C99A5EA13C9A608 = MONSTER_HOUSE (Monster House ??? Blu-ray | V | 0x46B4BFDBC25AA0AEDB064EAC39712311 ; MKBv17/FindVUK 0.84 -0xB4938575BB804900EBE752C3677E124757EB1DE1 = MONSTER_HOUSE (Monster House ??? Blu-ray | V | 0xAAA64B22C77F7BFFEFB23EA56C285430 ; MKBv18/FindVUK 0.96 -0xF1076447316B9D0318B994B03AFA23A1865C65C8 = MONSTER_SQUAD | V | 0x0BD1AB9EC300B22C8E5CD229B91FFB51 -0x02D23F3937B8297897861CFB00FAEB7FDF5DD373 = Monster_Trucks (Monster Trucks) | V | 0x97672B36A0CEC2C339BCB63CFB846B0D ; MKBv62/BEE/VUKNOTVAL!/FindVUK 1.02 -0xA0E8A3E26989AA92FDD58B91F2858FA6E35FEAFE = Monstros S/A | V | 0x52567D4B0435ECB08BA425E214DB10FA -0x5036A7204361E6461F1CC06DD512652DB70E2F66 = MONTERS_INC_D2 | V | 0xA6033AA4E460910B5DCAE22573819BA8 -0x9F2677261AF79225FC8427659B34D807814E4640 = Monty Python and the Holy Grail | V | 0x342A8B3409DB89802E22104C5C9BD7A6 ; mkbv25 -0x665C98B4F99A7FD3CC3EF91E80B5F607AC5EE87E = MONTY PYTHON D1 | V | 0x03321BAA8C58C77A7E00DA975918C640 -0x1DA7088CDB062ADB50613BBA71480D40DCC7F751 = MONTY PYTHON D2 | V | 0xD860D3801D05EE01297706ACFDAA3B23 -0xBA464999972C7E506B17197BF333FFE4065565B0 = Monty Python Holy Grail (Monty Python an | V | 0xBFC35BE620E6F2140C7E5A39F9A4D909 ; MKBv56/FindVUK 1.00 -0xB0D19F27C1877280D8AE55C2403689F13E26F1BE = Monty Python's The Meaning of Life | V | 0x3FFC8B7DD9B6ACB5C9320E7F82544E93 ; mkbv39 -0x054E0106D72648D660E9F61411581E8F6379F518 = Monty Python: Almost the Truth (Disc 1) | V | 0x896410117E6A7673C6078C4391275211 ; mkbv14 -0x07C998ACB3D5228BE2F332A2EE9349797D65B901 = Monty Python: Almost the Truth (Disc 2) | V | 0xD90039CC5BBAAA05A938E6E5D70B8F2B ; mkbv14 -0x154D7FD615F8A9F46F5CB120A819F3BD778A49D7 = MONTY_PYTHONS_LIFE_NA (Monty Python sThe | V | 0x7E5EFA2C7B15B20235779704D1A2A837 ; MKBv36/FindVUK 0.96 -0xF6AABA46B4A845AA107A9204DA01931038E4EAFF = MONTY_PYTHON_LIVE (Monty Python Live (mo | V | 0x048E63489DDB3F5400E8B3845B535FBE ; MKBv48/FindVUK 0.94 -0x0D127D1AB2E8874EDA3AA53DE1AF04364E12F4F8 = MON_NOM_EST_PERSONNE (BLU-RAY) | V | 0x3A8AF2E0FFA282690A8029153BA3580B ; MKBv28/FindVUK 0.98 -0x4AC6832FA4DEFAE09F071B21461090E6F22FA4EE = MOODYBLUES | V | 0x3B53C670588FABD40D2E2EF4B5B071DF -0x923DDE3238352C8E6C6C86928D235CB8AC7B05B8 = Moon | V | 0xDA4FE0DBE012EB2A477D1A346EF5955D ; mkbv32 -0x5E5E9D64FAACF965A07E9BAD529CF4C8F6218C82 = MOON | V | 0x4212FDE1B8E6D32046EAF8FA2143EA5F -0x38371FD40E4ED93FF8E2D926A2AB118A852486C1 = MOON (Moon - Blu-rayâ„¢) | V | 0x9146E002BE769B5B104F45B0AC63EEE6 ; MKBv30/FindVUK 1.00 -0x4F4D96ED969B1C495AA523FEC55B86298A74AD3C = MOON (MOON) | V | 0x48553C856C2D45130E3E196A3ABC8A91 ; MKBv19/FindVUK 0.96 -0x8E55DCDF1F2316CA105338ED676361A2C944A7A5 = MOON (MOON) | V | 0xD6C74090BCA93D0C4A1C8FF9EC9D7DAE ; MKBv17/FindVUK 0.96 -0x245ACF1E03AC211177BBBE428457D3CEAC4060AE = Moonraker | V | 0xFFBF9808BC8099352D983B8E1657649B -0x1AAE9C453871CF3E8BA0203EDF0740770C9A8ED1 = MOONRAKER (MOONRAKER) | V | 0x5595001173FFA68F2093CAEBB2FE34A2 ; MKBv10/BD+/FindVUK 0.99 -0x45E2FA51EE67FEEED23D3C53458EB904D62B785A = MOONRAKER_F1 | V | 0x3CF709F98252F17F37F5F7B7A5FF7ACA -0x25EDC22EDB79627BDE835FE8A20A4AE0441B6E7E = MOONRAKER_F1 (MOONRAKER) | V | 0x90BC568DDCF0B6F29F28EF0511F208C4 ; MKBv12/BD+/FindVUK 1.00 -0x2E70EA6C75A87494EDB154447371C14939001444 = MOONRAKER_F1 (MOONRAKER) | V | 0x21A4E4B460489FCFD2A661161403CB4C ; MKBv12/BD+/FindVUK 1.00 -0xFD2314507AE25A41EAE32001EDAD1CA203B4929A = MOONRAKER_F4 | V | 0xF781EF75A7E80B13E6BD04CE8E113677 -0xD2795F9DE161E36ED73E248BE7F838E4F92922C8 = MOONRAKER_F6 | V | 0x1BFBD7CB50C47585A8D23C5B9AB29BCA -0x145C77EF23DED85FBB0D331148C3D7ED2952A108 = Moonrise Kingdom | V | 0x3B787EB2120AC887E96ACF73627057F2 -0x643BA7B23A443B86CF3761624E0D88F8A37DF403 = MOONRISE_KINGDOM (Moonrise Kingdom) | V | 0x51D0FB4D7D2B825F9EB5DB88054DB60F ; MKBv31/FindVUK 0.98 -0xE9C4D4C9B36DE8264762FA266ADF67837F82FB32 = MOONRISE_KINGDOM (Moonrise Kingdom) | V | 0xCCC1845121372227ADFBD5350B47C0BF ; MKBv53/FindVUK 0.99 -0xB469EFF030E2BCBFB0CBC0B6E7411C74E02B9E11 = MOONWALKER | V | 0x3C943FC68C89E1B0B778EC2AEC959665 -0xF6D37D14003C4703EA3DE6822A7FC77BFF0E732C = MOONWALKER | V | 0x7F1958F2ACEFAFC825FED79A1C30C45F -0x71A4FE50C888355941D419E8F3B89F293121AC42 = MOONWALKER | V | 0x58CDB88157B96BDE73FF6BE5633B7E8A -0xF9E87E640A800B763B2F0E1F6A4FE92931ED305C = MORD IST MEIN GESCHAEFT (MORD IST MEIN G | V | 0xBEE8B82C241E2D0125876890EC4D3475 ; MKBv14/FindVUK 1.00 -0xD46EFE2D5DEF2744ED15256D2F52CBBE0C601991 = MORE_THAN_HONEY (More Than Honey) | V | 0x5D1890FB178831EE768A660BAC7DC4AC ; MKBv37/FindVUK 0.99 -0x71A7122682526B2BA00238793300E14B83249426 = MORE_THAN_HONEY (More Than Honey) | V | 0xA0DB8E4AF85236C3CA076E14D1090B71 ; MKBv37/FindVUK 0.83 -0x21040D0C3E03CFBC976B13FE8125D29DEAB3C2C1 = MORSE | V | 0xB9277D7FA4669F6DC3240894D4CCFAC1 -0xD0AC2EC6295CC2E8679E45035F5D6AE05358B45D = MORTAL_COMBAT_2 (Mortal Kombat 2) | V | 0x9C96851EBC2B5167133CBFE35E07591D ; MKBv19/FindVUK 1.00 -0x2DBFDAB971C8477AB13B4D75590372C341FEADD7 = MORTAL_KOMBAT (Mortal Kombat) | V | 0x3C491309B97EA2E3DF13E6F1C6A05EA5 ; MKBv19/FindVUK 1.00 -0x0E236A7FD1B3F4FD6960C3BC3FA19877009662B8 = MORTAL_KOMBAT (Mortal Kombat) | V | 0x6B68597E5C86ED22C530865A20F2302C ; MKBv19/FindVUK 0.91 -0x9837E214B9BFF1DC1302F401ED2CD631D15982AF = MORTAL_KOMBAT_2_ANNIHILATION | V | 0x93B33CF4C0F47F832DAA7CF75F369D3E ; MKBv19/FindVUK 0.80 -0x8E6B70DBB6AA6C9B83FC23D3B1C66167BA65BF9D = MORTAL_KOMBAT_LEGACY (Mortal Kombat: Leg | V | 0xD56847AF22DAA7ABD4116C160A6571D0 ; MKBv23/FindVUK 1.00 -0xBDD0475875EC7AF0E475BE98586EBB392AA8FAA9 = MORTE_NO_FUNERAL | V | 0xF7E69FAEBCE11420AFFC41F599D4EB1F -0x3C629D81D0829DE42998B55D0392CBBACDEF4AD7 = MOTHER (Mother) | V | 0xC822E5FC5048DB7892BC0D3FE916D73D ; MKBv18/FindVUK 1.00 -0xDE42BAB3AC80A585C074654A4C75AF81D74ED35A = MOTHERS DAY (Mothers Day) | V | 0xE1031931EB7D3C2D132532E1C3DE29E4 ; MKBv61/FindVUK 0.99 -0x6DB8D05ED6C359564615B0D7DACC22BB34DB3C8D = MOTLEYCRUE | V | 0xC20C9FA3966F72B551DEC257A9656DE1 -0xA40E11B2437BED8EAB46FB979F0D755DFC2F5258 = MOTORCYCLE_DIARIES | V | 0x3798FAE11F56512F00AFB47A5035D736 -0x7BE5230C73F22C094DF2F51D4550841C76C92DC8 = MOUCHETTE (Mouchette) | V | 0xB2F2325B04AF6B9B39F4991C786566A1 ; MKBv46/FindVUK 0.98 -0xE56B57397F28401700C2468208FCE8D3BAAE63F0 = MOZART | V | 0x5E636922059A5686C6DA89F7829E42DC ; MKBv61/FindVUK 0.98 -0xFE70CB1220D8862D1A4C9831F6C700D72C138612 = MP883BR | V | 0x6752FAEE629BB6A03F921A3C9D6BA536 -0x93F82026EC92F405F5CFDE093767A0AEB83B0260 = MP892BRA | V | 0xDFF679B916A76627A9C9E49E771BEFE4 -0x61FBC91625ED6C802DA128F41F001DDB6F2FFE3A = MP895BRB | V | 0xDA96B1757DA6D8E2E709E7B7EB5C3C4A ; MKBv9/FindVUK 0.80 -0xF238741CB369218355C778E2EE7104ED0A0B9F82 = MPR1NNE1 | V | 0xF110C008D78E8C7E895CCBA6BA340159 -0xB12EFC737ADD623D0F66E6820B16260514C959A4 = MPTMOL_G51 (Monty Python'sThe Meaning of | V | 0x3F6BBCC7E4D59ED852FEFF76EC6730C1 ; MKBv39/FindVUK 0.94 -0x5DFB526428F45C68023E5FE25E057F7720A1C313 = Mr Billion (Mr Billion) | V | 0xF5BDFAEAD941AA8153A40EF06BDAA485 ; MKBv55/FindVUK 0.99 -0x2A44131FE8190F86559FA2CB638121E6745D4033 = Mr Gaga | V | 0x232E44E813AB63A19C931750F1F02AD5 ; MKBv62/FindVUK 0.99 -0x516590E17E1212DCCA5B5956164159CEA974FE21 = MR MAGORIUM | V | 0xCB753A0475010F14FDA7B312082840D2 -0x06A784AA18EE255478CAD155D0E01E81548E807B = Mr. | V | 0xFCE13C9C2E2C8A6BB13E5564A5D00007 -0xF3F1445DDB07ADAA56585D344CBAE01440CDA9EE = Mr. Smith Goes to Washington (Mr. Smith | V | 0x636663317568116CFC1E8DFFEA6D272A ; MKBv50/FindVUK 0.96 -0xA7E71D719D5E2E921186D51BCB84175212AFE563 = MRMRSSMITH_F1 | V | 0xCA797C96D579EBC0EB486241478E5A80 -0x084D4F983B647C6B94F248E2FB14F89C49C3F669 = MRROBOT_S1D1_NA (Mr. Robot: Season One(D | V | 0xA82B1B1A4799059922EAC17D325472F6 ; MKBv50/FindVUK 0.90 -0x9808482A677D262A28ABAF6D5CB5CBC2268801BE = MRROBOT_S1D1_UPB1 (Mr. Robot: Season One | V | 0x371C6654F58A38BD0966DC015F0311A5 ; MKBv46/FindVUK 0.98 -0xF24631EFD894E6A3D10A6E7A8BF1A1CEE5D7B7E3 = MRROBOT_S1D2_NA (Mr. Robot: Season One(D | V | 0xB80A69D5823F938B531EC9CE27F897CD ; MKBv46/FindVUK 0.90 -0x823F6DD978F69CA116C77A3991914AD9B463A0BF = MRROBOT_S1D2_NA (Mr. Robot: Season One(D | V | 0x48D048292EC90EA2F536383B1131426B ; MKBv46/FindVUK 0.96 -0x67368EFC743AB2043393A6F34B2A67C6345B27BD = MRROBOT_S1D2_UPB1 (Mr. Robot: Season One | V | 0xC1369903F8FBB7A05DF94E9CC7D23FAE ; MKBv56/FindVUK 0.98 -0xC82C34776E3935D240B7632A3A19C5D87EB2A201 = MRROBOT_S1D2_UPB2 (Mr. Robot: Season One | V | 0x35993C4AB989F336EC6FD688AB9C2F6A ; MKBv61/FindVUK 1.00 -0x020FCCA85CD7B2562C40FFEC02C40F556ECD0B30 = MRS_DOUBTFIRE | V | 0x0FB0B87137A227AEB4EB84E1CDA866DA ; MKBv4/BD+/FindVUK 0.96 -0xC5C7DAC939958D82271C8500292915EBE241B910 = MRS_DOUBTFIRE | V | 0xDBD753C824642B328DDE4DD88E2DD57C -0x0ED069792A4AAC35B87F4ABF6D94EC70F2F17BDA = MRS_DOUBTFIRE_F1 | V | 0x684F94E70A93CC9DF5EB56CAE8A61311 ; MKBv7/BD+/FindVUK 0.96 -0xC3D206AC8A6FDC6494A89072F601C439562A6CBC = MRS_MINIVER | V | 0x89C0642950CAEE9B7C1AB22735F2827C ; MKBv28/FindVUK 0.80 -0x23749F32AFCF7E1D6A10527BF3902F6FC18F7358 = MR_AND_MRS_SMITH | V | 0x85944E0413B4AD0DD0C44E6AC5868B89 -0x431A4D002E9B80F768BEA081F3D739A949683ACA = MR_AND_MRS_SMITH | V | 0xDA84EE5C227A17C53EF675F32C0D6956 ; MKBv4/BD+/FindVUK 0.98 -0x47F6DFE206CCF48656A7DD26A32E5C359C628268 = MR_BROOKS | V | 0x6FDA5BF937BC2DD42712E2C0CC7AB1C3 ; MKBv4/BD+/FindVUK 0.84 -0x937038A255F205B50D09C8F840420E6643A50FED = MR_MAGORIUM | V | 0x8B6786B86B1AAAC1DBC93ADF4A97C60D ; mkbv9 -0x317E1078699FD353F99995C817208462175EEEC4 = MR_MAGORIUM_US | V | 0x7FD40866927FE4A9363CECD5CED4A52E -0x92090DF062697E227A609ED8F6D351107EFB16B3 = MR_MORGAN (Mr. Morgans s Last Love) | V | 0x664E69070AC775FA90E057CD4C1C8FA4 ; MKBv44/FindVUK 0.96 -0xF9D60AEC4C5288FA4D56B1BDF3B335B4DFBA0635 = MR_MRS_LEE | V | 0x178FEDE6F387202F091C271AD95AC048 -0x8CE36C81741844DB386ADAE6CF731B1402778499 = MR_NOBODY | V | 0x903E906DAD8F0C2C786ACC2546D76A58 -0x38C1F522200A79033CC8F82BEDCF2E4FF5053387 = MR_PEABODY_AND_SHERMAN | V | 0x8C5090E206D76D4E6EE31B3EFEC86EC5 ; MKBv39/BEE/FindVUK 0.80 -0xE3982FE011942254A8A81C20BE7655EAB358287A = MR_PEABODY_AND_SHERMAN | V | 0x1AFFF4E1E05A6916B85CC363BF06D22B ; MKBrev 39 - BusEncryptionEnabled - FindV -0x84F9013A72694CCE8B7F9F13F57903DB5678D8A9 = MR_PEABODY_AND_SHERMAN (Mr. Peabody and | V | 0x3B3EC2D94152139778123E7F8C4EE29F ; MKBv39/BEE/VUKNOTVAL!/FindVUK 0.87 -0x749F55CA23065D51DA42F86BD4DB3027D0571CA3 = Mr_Peabody_And_Sherman_3D | V | 0x1B119C9C5FE55101A012C3C3738AFD2E ; MKBrev 39 - BusEncryptionEnabled - FindV -0xBBE79CA06989FEBBE77897750C35DADB466C1882 = MR_ROBOT_S1D1_UPB2 (Mr. Robot: Season On | V | 0x7410AA36D6FE2C7592BA345BA7064DEB ; MKBv61/FindVUK 1.00 -0x73B30FBFAD5C1B4E17E48FE6D4A7E473A46E4408 = Mt. Fuji (TW) | V | 0x237294D4F132C316F198690176BA29C9 -0x6C252CF4974796CA7E49F605F34EA41344000402 = MUDDY_WOLF_AT_RED_ROCKS | V | 0xDB8E5949FCCF644C59EC59A4D6EA28B3 ; MKBv46/FindVUK 0.89 -0x36E8B11D153EAEDFDD29CA3673840EE28D286EE4 = MULAN (Mulan - Blu-rayâ„¢) | V | 0x0AAC7DF54D3DE12530FE83CB54028D3B ; MKBv35/FindVUK 0.99 -0xC129DA4C90698DFBB51B81094337EED6BDDC3EF0 = MULAN (MULAN) | V | 0x5C7FA118DF10AA7F8C56EE5801544A07 ; MKBv17/FindVUK 0.84 -0x62B4B0846CE5AEDF62E6B07ADDF89AFB8A14C24E = MULAN_15TH_ANNIVERSARY_EDITION (Mulan 15 | V | 0x86576D1C5F2A705A8BFB878480B7404B ; MKBv28/FindVUK 0.92 -0xFE80F6A478DD616AD7387B5BC3F12CE0A4EDC8FD = MULAN_2013 | V | 0xEBC01060CB4F6A92AF86DC422B64F2CE ; MKBv31/FindVUK 0.72 -0x8E7FD613A3D552A3F68782663DB8AB93045B6632 = MULAN_2013 (Mulan 2013 - Blu-ray???) | V | 0xE13B8874F7E57C1A6E0E60BD903E3235 ; MKBv31/FindVUK 0.94 -0xC7EE6CCF534D58E36786B58438DC2720EB9FC630 = MULAN_2013 (Mulan 2013 - Blu-rayâ„¢) | V | 0x87868443E6A5F27D97A7D831C56D884B ; MKBv28/FindVUK 1.00 -0x0CB90310BE6975D9FE29E6E30E8E99CD52C6F3CE = Mulholland Drive (2017 StudioCanal) | V | 0x6249C6CA3CA4AFAF1F56A8E1F6B2AF79 -0xA94A7CBD978850C6B1DF13A8DEB35A86D2660160 = MULHOLLAND_DRIVE (MULHOLLAND DR.) | V | 0x507FE38E7BD20311AFF44326E86B1EC7 ; MKBv57/FindVUK 0.86.3 -0xF063BF29CF28C027BBA4DC03FFE67C375700997B = Multiple Sarcasms | V | 0x4E90F6B27ECE1970759D0E90FBE93DD1 -0x1A7A640337FAC0D2D10746239A6E17FCED042D29 = MUMIEN (Mumien) | V | 0x6CD04FD9D54E58D3F58B973DF348369D ; MKBv16/FindVUK 0.96 -0x05E9C38883ABA97BDF0EAC7A42D092BB8C183406 = MUMMIES | V | 0x6C165DA934C6C326A880533AF9384154 -0xB8436FA5DC0D5A5837313D78DAC8AAD898AF3563 = MUMMY_3TODE | V | 0x8A2475A02A43D27A2C9217FD9BFCCBCE -0x918D6FC2E9EF6DC122BD04196F69FCC96EF8AE53 = MUMMY_3TODE | V | 0xDBF33D7003A63BF1567EA24DE79B3D03 -0x37C7D722E9896B2A966F68E4B059632C35599200 = MUMMY_3TODE | V | 0x32E36C03C4744F64917EB574B59ADAAA -0xF39DFBFB2CEBE5E018845ED6CDD992DCA8D2E8F4 = MUMMY_3TODE_G51 | V | 0xFFF73D6AC1C795E5FBB4FFD5F9B98962 ; MKBrev 9 - FindVUK 0.53 -0xFAA8AD2717FCCE69EF6A626794E273A5F13043D4 = MUMMY_3TODE_G51 | V | 0x75A5E4E6D19EC1AA1D0BDD86D6601DE4 -0xB43CF1D053F0FCC20DA0F359FEE7728FF6870E63 = MUMMY_3TODE_G51 (The Mummy: Tomb of the | V | 0x3731D1D14EC05AD2CE9186830C57D4FF ; MKBv9/FindVUK 1.00 -0x21CE5BED9FF2F57C43ECB1C695F0FF05FC1ED3B8 = MUMMY_3TODE_G51 (The Mummy: Tomb of the | V | 0x9AE2FE02B7E4225E197522F116048CBB ; MKBv9/FindVUK 0.96 -0x4B966F2C034D1AE5A35B99B2290069C73AFF6C03 = MUMMY_3TODE_G51 (The Mummy: Tomb of the | V | 0xDD3953CADA186CF2A03F7E2B23E4108C ; MKBv9/FindVUK 1.02 -0xB538164D95C116DE1C5D5E20506340D3D9F409F8 = MUMMY_3TODE_G52 | V | 0xA9AF7358909E0BDAFBFA3BEE694BA4BD -0x531C066C7155F9A4D4855235680AEFE42543CD07 = MUMMY_G51 | V | 0x33509E72AA9DC810FD684853FE36CDD0 -0x2926BE4CE3ADCD0FE4AFA82ABD246004A204346D = MUMMY_G51 | V | 0xF4BA534BF5F960AF0E2C6A6B5F983365 -0x8CE422A9B3E9D58407ACE7FF304CB9FEC0E0DD8E = MUMMY_G51 (The Mummy) | V | 0x9BA550BA202D5BC01664F10B0E653F6C ; MKBv9/FindVUK 1.00 -0x2240677984267E6A6D418C7CAA51DC40BABAD33E = MUMMY_G51 (The Mummy) | V | 0xBB4E04241713C1D4728F0F33E853147A ; MKBv9/FindVUK 0.96 -0x85823B375FADCC464C62F20BBC7E9806BE2E79B9 = MUMMY_RETURNS | V | 0x7BBD1D89FF840739D57548A94A2FC095 -0x06A82BE1B3EB0624F73CC99266F5FD08551E097D = MUMMY_RETURNS | V | 0x4273DBD8019F50A184682979A3B2B0CE -0x802B78E573014104EDA9737D23A672368ADF02E5 = MUMMY_RETURNS_G51 | V | 0x6F7E3B1DDEC94777DFEED19A970AD3C6 -0x9A5351256462E71BA6E972D9A03F2BAC82EEF396 = MUMMY_RETURNS_G51 (The Mummy Returns) | V | 0x3645675F2B84F89B669AC66FBAD4484E ; MKBv8/FindVUK 0.86.1 -0x5EF2BDF8B124E695B8B955412B8F4660B497E87E = MUMMY_RETURNS_G51 (The Mummy Returns) | V | 0x5C8117712E78379B10655F60AB28DABB ; MKBv8/FindVUK 0.96 -0xBCC21A072956F559AA112BA02F24A62B2E1B7984 = MUMMY_RETURNS_G51 (The Mummy Returns) | V | 0x4BAA162922970E2FCE07721BCF8A3284 ; MKBv8/FindVUK 1.00 -0x82BD5AC08C5D0001B23303819A72395D53090B51 = MUMMY_RETURNS_G52 | V | 0xA0C6A1F29508D4472E7891C110F798EA -0x7D6B248DD60751AC3917404BBCE7A0E02AE17F60 = Muppet 2 Moive Collection (The Great Mup | V | 0x4932AC8B52F9E4BAC049ED44A5DA34AA ; MKBv36/FindVUK 0.94 -0x2E5379AA733AA0575223F1BEBC9910172B4526B6 = Muppet 2 Moive Collection (The Great Mup | V | 0x96363778455694BDEA8ADCFCC4D8DB94 ; MKBv36/FindVUK 1.02 -0xACA07D71D7BE28387F4F050AE43A2EBA319493C5 = MUPPETS_FROM_SPACE (Muppets From Space - | V | 0xE5868C708EE0053E62FC02261D6E52DE ; MKBv21/FindVUK 0.89 -0x1EE9E32E3E46272C2EA42236B452A020FD171A57 = MUPPETS_MOST_WANTED (Muppets Most Wanted | V | 0x5BF35119F4C2C71D3220BFFAFB0B8C0C ; MKBv47/FindVUK 0.94 -0x00B609FF866A23ACB825578925A737C5069CE58C = MUPPETS_TAKE_MANHATTAN (Muppets Take Man | V | 0xBE551E60CC04E3C01FDC54C88AB205AF ; MKBv21/FindVUK 0.94 -0x9227B0901BBB872A5E54EC7117C8601C29B3C8AB = MUPPET_MOVIE_NEARLY_35TH_ANNIV (The Mupp | V | 0x0576E60EA8218037AB175CDAA0011DA6 ; MKBv36/FindVUK 0.94 -0xA5CFEE74CAD750E8EA5955B40189026491438DD8 = MURDER_IN_THE_FIRST (MURDER IN THE FIRST | V | 0x397A41EBDA17F97F6ADE3C9578306005 ; MKBv47/FindVUK 0.98 -0x80287A44C4AFB14917FD54C1EBCF50A66E7AD771 = MUSHISHI DISC 1 | V | 0xBFC5B5551A8312FB9EE18BD0B0CD90CE ; MKBv40/FindVUK 0.96 -0x90F361945D95CBCA4280BADE1A930868755CD5D4 = MUSHISHI DISC 2 | V | 0x72E70E49C60FAA7EFD9F030D0B4E8626 ; MKBv40/FindVUK 0.96 -0xC8BFB538F64C8A881872E9FEB64AF9B1EACD7039 = MUSHISHI DISC 2 | V | 0x31D56904D18A2B2BD3D116C132E22516 ; MKBv40/FindVUK 1.00 -0x87F905EB025D90F80D799D9AD8427237DFBE30F4 = MUSHISHI DISC 3 | V | 0x6C175E28F08BEEFD338A5DBBF84C7EBE ; MKBv40/FindVUK 0.96 -0x986643A58B4EE09B71FFF8D6A5A55FF2C0A9C1CE = Music and Lyrics | V | 0xA33109F57FB657E94EE7BCAB26D4025C -0x7DF70FE2F8CA14E79EDC5F4673871B09967B0124 = MUSIC_AND_LYRICS | V | 0xB067C27C452205C9C0CEEA1460DEBE62 -0x0E4ADA41733170DDB33B76F5F01B43175F706800 = MUSTANG (MUSTANG) | V | 0xFE075CD605FE4F1A15C40CDBA81731E1 ; MKBv61/FindVUK 1.00 -0xEC57EBEE6BE203503D0E8891426D06384088FB6D = MUTANT_CHRONICLES | V | 0x402894B481F7C26B9EA908EDA84C0377 -0x856C23C07EA80D216BA2C3E894BFCF599F23DEBB = MUTINY_BOUNTY_1935 | V | 0xB76CBFD613C16F2EB97DCC4B8EF0DF54 ; MKBv19/FindVUK 0.80 -0xA83D686D0F1B3C41BB88386487D57E70B3A8069F = MUTTERTAG | V | 0x71B3F5B01BC334B9D911ABD70062262B ; MKBv37/FindVUK 1.00 -0x62D2028B24864A1C63140193D69AA97A10BE9D25 = MUUMIT RIVIERALLA (Muumit Rivieralla) | V | 0xF62C4E920C25943F74BE69BDD7518F21 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 0.91 -0xA839197CFC5242920D4B993853EC4A2479D29DEC = MWTIF2_UPB1 (The Man with the Iron Fists | V | 0x36D7C9CE6BB96573A70FDD5C5B440C70 ; MKBv49/FindVUK 0.84 -0xDDC8091E21AD29D8CCEC7C82859FBBFC80E460B5 = MX0xBD025 | V | 0x74CFA78D46F3F7B2E6527F616B545CDF -0xAB56075A70BD3F540A2D3CBBF54BBE88C44E8B82 = MXBD_014 | V | 0x37EF126D89A158F7D6E62DDBF90FD1EC -0x425EB76F53EBE27048F337B1B78CB69DC54CB111 = MY FAIR LADY DISC 1 (My Fair Lady: 50th | V | 0x0C72704BE972B0F5813643DF189DD6ED ; MKBv53/FindVUK 0.96 -0x05B8CAA53F8E1B444CA06D07F06BF3BFC395E9F0 = MY FAIR LADY DISC 1 (My Fair Lady: 50th | V | 0x451B98B29105D0B8364BAE84A8A7D432 ; MKBv53/FindVUK 0.92 -0x11FF0B9376B62DE46E823EE79192C0C0AB535DB0 = My Life In Ruins | V | 0xCAA5AC27A64560DE6F33BD9917BCF764 -0xD8BC9AC7AF87201737ABC074BC8B6A27BE98EDAC = My Little Pony - Equestria Girls | V | 0xA495062D17911BFC2528819E5B718FFF ; MKBv38/FindVUK 0.92 -0x7519AC979D739CC980484017011288ED923C31A2 = My Little Pony: Equestria Girls (My Lit | V | 0xF5F78154C8215E74361D18532B855C96 ; MKBv47/FindVUK 0.92 -0xF738B80F39866E5633E5B3D0248AD590EE26B7F8 = My Name is Khan | V | 0x25AA559E42F66841CDE82C3255C9F98D ; MKBv17/FindVUK 0.65 -0xFAC3AE0F491398DC9BCD23EBA7F787788B36C07B = MY NEIGHBOR TOTORO (My Neighbor Totoro) | V | 0x04D75DE8F6014B56F3021398F6F3DEDA ; MKBv33/FindVUK 0.96 -0x52EE43FE295155B8FE12253DD14DB85AD97667BA = MY NEIGHBOR TOTORO (My Neighbor Totoro) | V | 0xCBE8A559EFB6DDDA29A77199BC8DA87E ; MKBv34/FindVUK 1.00 -0xAF9736A851826BD22CC1F5D85796F021735CE579 = MY NEIGHBORS THE YAMADAS (My Neighbors t | V | 0x8979FD0189198DE4B6BC9708DCECC098 ; MKBv20/FindVUK 1.00 -0x66C7533D7EAF003FA4385AB08C464DBDB00CAD6B = MY WAY | V | 0x67F5F7AC51C90BE90233BAF0D468D1AC ; MKBv30/FindVUK 0.96 -0xFE1C67293883E9BCE84F0ED22AEDF65FE283D6F2 = MyBestFiend (MY BEST FIEND) | V | 0x47934EA4F611ADBCF74BF74895EFA476 ; MKBv47/FindVUK 0.99 -0x2D8003551D50537A9EDF511EBE92422400031EE1 = MYBESTFRIENDSGIRL | V | 0x412B30431913D57ED298F83E7F0A03DC -0x18DCEB2220553E6E6D74D25B333E113FF6AF7AC2 = MYBESTFRIENDSGIRL_AUS | V | 0x22CDB7E19D8334FCF2D36012702E2E04 -0xD737C181C9F9E10D3A67011BC20E02A9B72990C6 = MYBESTFRIENDSWEDDING | V | 0x36AB32B06C1A0C5E32ECD8B452F04D72 -0x4731480166F1598EDE6A99DC89F0E110D6805E5C = MYBLOODYVALENTINE2D3D | V | 0x8E523AD540FA033BEB6635CDB6132FDE ; MKBv9/FindVUK 0.80 -0x164E4A0CD812105E90EFC5A7487C431F65DC3EAA = MYCOUSINVINNY | V | 0xC1856D41CE296FCE0BB7B9156A8EE9E1 -0x5DE3566AA80AAB22D8EFAB593426A3057ECC5DAC = MYLENE FARMER | V | 0x57A30D99FDE661B0464182731FCA99D2 -0x1C2D0887E0D4BBDB4BD51473A99DC8A89FE1CAD6 = MYLIFEINRUINS_SELLTHR | V | 0x271B900A5662E44FF233CF2722E7D3DC -0xA35E96FAD2DD7055E97920D10F6A0BE4A35E312E = MYSTERIOUS GIRLFRIEND X DISC 1 | V | 0xBA2892AC95846555AB77F0C5602232DE ; MKBv40/FindVUK 0.86.3 -0x7D1B37356638EC6AF026368D78D651C35E265D8A = MYSTERIOUS GIRLFRIEND X DISC 2 | V | 0x77D2F4CAC1C4EA80BC36A22EA68212DA ; MKBv40/FindVUK 0.86.3 -0x5D1B3AB23E92B59C68CBC28CC75848758B85D869 = MYSTERIOUS ISLAND BR | V | 0xC0DA02A315DFE005A19B2DC4DA59A1A3 -0x16428602A1ED3A8B2E70023EA3E2BEBBFEA8FF01 = Mysterious_Island | V | 0x5CAD52F283F1E470AA8E983538A791E6 ; MKBv60/FindVUK 0.96 -0xAF575071CEB9C94021294B126DE36596E135DC65 = Mystery Science Theater 3000: ^_ | V | 0x58115A17E7CEDDF81F2F5E4482ED42A3 ; Mystery Science Theater 3000: The Movie -0xA6A84323E5F8486EFFA2E90C7A910A003B2AAFAC = MYSTERY_TRAIN | V | 0x4BD87FDB0307B43BD54FE70F1D3917F3 -0x531C54DE5C765772F2879CB4C93D811DBAD5FAB0 = Mystic River | V | 0x3590170F1EC2D33BEE159FE00F274F80 ; mkbv16 -0x70AAE9FBA9F6DF7E8B9676DA8DA5CB64205736E9 = MYSTIC_RIVER | V | 0xBB017375CE1B7B0C920F94A6922F013B -0x302D32854DF32177FD126FA220280B0102EA9B2A = MY_BIG_FAT_GREEK_SUMMER | V | 0x7704729DBE0B31C39973EC46A5DC0666 -0x2D07DC12B18B56714F3C37E07E8B3EB891FE73AA = MY_BLOODY_VALENTINE | V | 0xB36E467D52D81308F8A2DA219751677E -0xFE67F2BD578D493CDC868AAFC311284C2D15A89B = MY_BLOODY_VALENTINE (San Valentino di sa | V | 0x8DDB071BDEC562411D9C249FA4676BB7 ; MKBv14/FindVUK 1.00 -0x2FF831C69393D8B6039E0D52A46C31A7A233660A = MY_BOSS_DAUGHTER_BD | V | 0xDF6A28DE568A4BADB4C6E43334E0EC89 -0x7A4641EF6287B9319BAA11FCE8EF86E9EAD46615 = MY_BRILLIANT_CAREER | V | 0x2683ED85859DE844EBC20207D8334CDB -0x3150B136466665371CF5ABD3BF5C781211325419 = MY_DARLING_CLEMENTINE (MY DARLING CLEMEN | V | 0xCE405C252D882B12FDDA97C9838531BF ; MKBv47/FindVUK 0.99 -0xD57D5E9FD55E674975E66CFED033F9F4C99253E1 = MY_DINNER_WITH_ANDRE (MY DINNER WITH AND | V | 0x52C362ADB444CC14DA8B49ACD04A2BC3 ; MKBv53/FindVUK 0.99 -0xCADEFAD60050822846AC2C3E87B5E1999237E2E5 = MY_NAME_IS_BRUCE | V | 0x1F4218CE2AEFDEB5D6DD827AB979304C -0xC8EA24FDBC35185709812EF38F329353A47811BF = MY_NAME_IS_BRUCE_BD (My Name is Bruce) | V | 0xC09201889DE1789F6D066C4DA8AF0578 ; MKBv12/FindVUK 0.96 -0x8DF915EAE3CEC72E67EB156C3512A666F5557478 = MY_NEIGHBOR_TOTORO | V | 0x361E521BECC344CEF93EC7865572AF77 -0x9A1BF7631F24F2AB279725E566C47676B4EA75AC = MY_NEIGHBOR_TOTORO (Miyazaki Collection | V | 0xFA1E091C5755E29DF0A3439DE5481711 ; MKBv50/FindVUK 0.96 -0x8DF915EAE3CEC72E67EB156C3512A666F5557478 = MY_NEIGHBOR_TOTORO (My Neighbor Totoro - | V | 0x76FA7FB568CFC7A2F5B5845DE7ACD43B ; MKBv35/FindVUK 1.00 -0x5A0C87ECB401F6A5F0FF86BAA5BDE5595D5C7963 = MY_SISTERS_KEEPER | V | 0xB2F6921AFD6AF8D9E5E2FEC18E4E02F0 -0xC6AEE8B132009760CA4A3E4310C976265399D21D = MY_SUPER_EXGIRL_F1 | V | 0x36380EAE5CE6B559699812A329020CBD -0x54F5759A0E0183D47F18DE917D6C3E7935F35675 = MY_WEEK_WITH_MARILYN (My Week with Maril | V | 0xD6F6AB2EF4F4FB2C7CE3D8B332C848F6 ; MKBv26/FindVUK 0.96 -0x4F77CAA0F0812B86A3637E60140032473FD7D268 = MY_WEEK_WITH_MARYLIN (MY WEEK WITH MARIL | V | 0xCF4CAA953AF261F4DB28AA93A9D7E86E ; MKBv28/FindVUK 0.96 -0xFA46042730542C6EFF5FB7F0AB4BF38961306AC3 = N3D1EUW1 (The Nightmare Before Christmas | V | 0xDE2667BC014CA7717EE705F496AB70A9 ; MKBv19/FindVUK 0.96 -0xC9319B294C71B6D8A4F5201574896FAC33888C56 = Na konci sveta | V | 0x6FEBB5F51EE4BB94881B3B3846BD4F80 ; MKBv23/FindVUK 1.00 -0xB8028F5CFD5FF1C2C6B5B9AF119B030D504B31AB = NABUCCO | V | 0xA9024D74965AD09BCB1E82464BB31567 -0xDF979CE687C52E5A0032A0B1FF7F2C258F673F8A = NACHO_LIBRE | V | 0x1453099C35E910103E270FB4C9749659 -0x09F2BA9510A7927F891D2CEE097365CD5D7B91DC = Nacht der Woelfe (Nacht der Woelfe) | V | 0x9FDF2CDA9793AFE7E8B72742B3B80B0C ; MKBv32/FindVUK 0.96 -0x81EC3B05127DE74C88F58DE424B63D4C0AFF037B = NADIA DISC 1 | V | 0x077FEF27A34BA2FD9A2CC6ACE1837B24 ; MKBv40/FindVUK 0.83 -0xD81C76ACEE7C83B22DEA4281AB08B8B1885CF8AB = NADIA DISC 2 | V | 0x1894CC783D6C4028CCC496CFB63677AC ; MKBv40/FindVUK 0.83 -0x849FB66B30D7B6CC86191D5B57AB5C2E294445A5 = NADIA DISC 3 | V | 0x576F42EEC142CCA94CEDABEF41121791 ; MKBv40/FindVUK 0.83 -0x6001DC4B305460D9A60859A2FDF128935D59C2D8 = NADIA DISC 4 | V | 0x40047F8B117EF11FD38F1EFF372F8E59 ; MKBv40/FindVUK 0.83 -0xA404DFE6D4104358417A99C3AAACBAC974CBDB45 = NADIA DISC 5 | V | 0xB67265886A867DE3DF32DD0326DB0DBD ; MKBv40/FindVUK 0.83 -0x37D7B16BEB75F12F76139267873FECC17CA95F44 = NAECHSTE_BITTE (Der Nächste, bitte!) | V | 0x0A1AA9E4C02510DF6E2A98212210EE5B ; MKBv42/FindVUK 1.00 -0x425E6F5CFD37B4950C4BB1370B24354D4AC6716A = NAKAIMO DISC 1 | V | 0xB4EE56D48F21B2F467F2C15C655CD79A ; MKBv44/FindVUK 0.93 -0xDD2F9834B66EC03F4815AB8A37B5835ABAAE9196 = NAKAIMO DISC 2 | V | 0xB3414D7FA3D70700B51AFFC159EF5BB6 ; MKBv44/FindVUK 0.93 -0x9D9433DC16DB38CC8F094409D2CAACB963E19301 = NAKED ACES 5 BDROM | V | 0x3995D07535AD4EA806EA7B2E9C02C5E2 -0xF6410059598023B4C8206EB444CBA45F3817E25A = Naked_Gun_2_and_a_Half (The Naked Gun 2 | V | 0x9043A99101F4C94C46BE2FD7D6FE706D ; MKBv31/FindVUK 1.00 -0xB6E0C090175EFA9922DA63E24F753E9860DC3FE4 = Naked_Gun_33_and_a_Third (Naked Gun 33 1 | V | 0x2CE45D3C27E11EE75C89B21E02E30A8A ; MKBv36/FindVUK 1.00 -0x7A4451142F4A28105C616FD69FA9447858C71BC6 = Naked_Gun_33_and_a_Third (Naked Gun 33 1 | V | 0x42C1D5AB5AF3D5D10DB86ECE5E0F1CAA ; MKBv36/FindVUK 1.02 -0x3C08A98185A291DE24D227FB5156383B3D1D39AD = NAKED_LUNCH (Naked Lunch) | V | 0x288D750971FE5FDF81EF5D07A03106F5 ; MKBv56/FindVUK 1.00 -0xFA7ED33174C2F9D59CD7A68F1C8D7FA1652AF4DF = NAMINOKAZUDAKE_DAKISHIMETE | V | 0x45C16A4A41BE144BCF78CD60BE6F406E -0xB364D86D6668DB41B7C5802041B0BD3BF5F72B51 = NANAOTECHNOLOGIE (NANOTECHNOLOGIE) | V | 0x42C80F21516ADAB68D3C1EE8FB270D18 ; MKBv40/FindVUK 0.99 -0x59A157E5A4940B72785960D025232618D3852C5E = NANNTEN_PLATTFUSS (Sie nannten ihn Platt | V | 0xF8908E11E454712D4379CF24E512C8BF ; MKBv44/FindVUK 0.96 -0x0070AB6F6791BDAF6287F592DB305E299DC12ADB = NANNY_BIG_BANG | V | 0x8A1E3B7176E073E0E6D79693BD9BE7D9 -0xFE3A270EBF43415AC7C62136DEE330C61C1E49D6 = NANNY_BIG_BANG_G51 | V | 0x5F05B74D2AE050BEAF5D09674E70D47F -0xC194F2BCD66DA1F1F18F75640C2E5EB9B4DFCA0A = NANNY_MCPHEE_GLO | V | 0x12C88C1E0290D44B8194AF81230FD3F8 -0x473F44C48BECAF175AA644D55E5889D94DCCF641 = NANNY_MCPHEE_GLO | V | 0x2BE312067770740D5B2659EBC2D0ED15 -0x79C6E769335DA91221F0A9BDCFE49949BA3AE6CC = NANNY_MCPHEE_GLO (Nanny McPhee) | V | 0x0CE99BCABA2F8EC1DF69B9F520E09874 ; MKBv15/FindVUK 0.94 -0x2F22E394CED4C1E63927DFD4008C79B7CA181599 = NAPAPIIRIN SANKARIT | V | 0x5CDB210E9955D23E938AC801D6CE5B31 ; MKBv19/FindVUK 0.98 -0x7A6AD9FCA73E5D3FE060F45FC129C85EB52FD742 = Napapiirin Sankarit 2 | V | 0x22B2811E319E1B93F2DBFB3A7538542B ; mkbv57/bee -0xE9646D4D0E0B3F41C7DC313AB0C624A1C705D103 = NAPOLEON DISC 1 (Napoleon Disc 1) | V | 0x400900D05F01ABCA9F48B8567E52DE83 ; MKBv62/FindVUK 1.00 -0x03258B6FB152252D588722EF55D60E9CD8238AA9 = NAPOLEON DISC 2 (Napoleon Disc 2) | V | 0x8F96D8E1C64BC9A8CB9FFBC454B3AD56 ; MKBv62/FindVUK 1.00 -0x7912F0A964D70DD91C7933ED6BC097CF5FC745B9 = NAPOLEON DISC 3 (Napoleon Disc 3) | V | 0x03437B9B07D479560C4E902CEE04EA0B ; MKBv62/FindVUK 1.00 -0x28B394184FCAE7E984D150A28B24807D8B9A1806 = NAQOYQATSI (NAQOYQATSI) | V | 0xA128F47AA502E9202A7920BDEC67F07C ; MKBv35/FindVUK 0.96 -0xD29A1A5EEBF0CAAE0888983B9567943CEFC761A3 = NARCOPOLIS (Narcopolis) | V | 0x454BDBCD1B2D6382C3CA0599C31AE897 ; MKBv56/FindVUK 1.00 -0x1BB76DB6D980326C42712A9E43540C831C3B20D9 = Narcos D1 | V | 0x43AF1890666698CA1F1CC194E29C8296 ; MKBv61/FindVUK 1.00 -0x1DA129851268A93FE1D633F53423CA680340002A = Narcos D2 | V | 0xF03C6D3CD737FBF5AFA43F60E8B92F10 ; MKBv61/FindVUK 1.00 -0x083CC5F023689F87EC644EFE8D8AAB48419FC4F1 = Narcos S1 D3 | V | 0xA2F2CF014A4FC819B82B39013E250C91 ; MKBv61/FindVUK 1.00 -0x8717713BB1C07B1C6789312813FEFB4D0572EC7B = NARCOS Staffel 1 - Disc 1 (NARCOS Staffe | V | 0x399B0BA87C541D480E33206159F48BBD ; MKBv61/FindVUK 1.00 -0xED67496AC4142EFD3B5C749FFA4DE18B8649C070 = NARCOS Staffel 1 - Disc 2 (NARCOS Staffe | V | 0x7E7E0AAD16F3D6D37AD820D69194AFEB ; MKBv61/FindVUK 1.00 -0x9F80F62705CCFB161DE2E0AA497214354030FE10 = NARCOS Staffel 1 - Disc 3 (NARCOS Staffe | V | 0x76440B19C06C54FB7E46586B137773F9 ; MKBv61/FindVUK 1.00 -0xBEE0051EBFBCBA0E8D7DF3444DBDA74DC1450F48 = Narnia | V | 0xBBB8BC5259D08694A7F8CD6F6DD0DEA6 -0xB4836930EDC3D1535FAF63A13D79A9FB8BC33CA0 = NARNIA_LWW_D1_DEU | V | 0x19FF06B4691F841216E78A5F8E2B78F7 ; MKBv7/FindVUK 0.96 -0x7EE94ACFE8E3F363C27D2CF94E10628FD8996D70 = NARNIA_LWW_D1_FRA | V | 0xE9617BE3D0328D06E4E1E834EC1B504D -0x446D1E0257672BFCD1D9174C5EDE2F28905277F5 = NARNIA_LWW_D1_FRA | V | 0x4C6BBC55A5B80A81A39D01E8309EE4D5 -0x3907B1319574277C459477A5B7EC1E15AE9B2028 = NARNIA_LWW_D2 | V | 0x3FBF0C67AC6EF447C66417BDD0B2C147 -0x357292F9EB585AAE89942E3A5B7F02C8010B97C2 = NARNIA_LWW_D2_GBR | V | 0xC5A45C9F1D6E4E81DB8CE47D80FE3300 ; MKBv7/FindVUK 0.96 -0xF5D9E034EB7AA0ADA028B0E5732202A6E3425B65 = NARUTO MOVIE THE LAST | V | 0x49784B98643FDBA55AC57C35619FD6C4 -0xB066AA25C89EA22A0EA4D4AC253C8DCF783E1517 = NAT GEO AMAZING PLANET V2 | V | 0xCED79EE2458A252787C1361D79544694 -0x1464191BFDF52A38F1BC4D34E159454875483F58 = NATHALIE KUESST | V | 0xD95D9CD7BBCBAD3C011FD1593EBB9F0E ; MKBv33/FindVUK 0.80 -0x13E626E413EE6D2D78040710475C6DF7D52A61FF = National Geographic Relentless Enemies | V | 0xA5B46F51F9BD040FE0C5CF824AB13AA9 -0xCE157DD319F2180808C1A04D5318BA093B27333D = NATIONALPARKS_D1 | V | 0x0FAD71E7AEA7DA1057315534B152F80F -0x34431424D2CF66B9119093CAAB3A9E45F012EC9D = NATIONALPARKS_D2 | V | 0x660FD17C8BB67D921F0E64F0315A9BF8 -0x5FB49C5DC54B5430B858586111A8FEB39031D1C9 = NATIONALPARKS_D3 | V | 0xF8300E57AA7836F7B02956711B4C10D3 -0xBDC0ECFE892170A6B31B8D448DE867B72A6C0996 = NATIONALPARKS_D4 | V | 0xC89B483A2F79AAEF65670475278C9E6D -0x28B9098CC6A6566070297FD914FCAE4F226B1CBC = NATIONALPARKS_D5 | V | 0x68AAB235A3294002EC1D722B505778FA -0xCE867CCD9E86BB4CC75858D13C43B81517688D29 = NATIONALPARKS_D6 | V | 0x05062F04AEBD1BE477A8BA90653886CF -0xC45BBF661579A67397A45F41B1633908CA6A1EB5 = NATIONAL_LAMPOONS_VACATION (NATIONAL LAM | V | 0xCE6917728CEC603B1CA62ED1726F4775 ; MKBv16/FindVUK 0.96 -0xF288CA1B14729D15D494F387B409829CDC726AFF = NATIONAL_SECURITY | V | 0x4E793C3C008BCA635570D51FC090F51F -0x06D890928926D92955883CD08C0D50B17F3882DF = NATIONAL_TREASURE | V | 0x0A43E0E34DC1E7744AF1F1E1BDA874C9 ; MKBv7/FindVUK 0.96 -0x5E075600E41AE1E8B183FFAB71237CBDFB3103F3 = NATIONAL_TREASURE | V | 0x0F6FEB015A4ED19EE64778408EB15258 -0xDE639A36585A9039AC0EDD9EE42A0840EEDB5E71 = NATIONAL_TREASURE (National Treasure: Bo | V | 0x76081A1BB22DE8699660574B69729110 ; MKBv7/FindVUK 0.96 -0x87C82DE420592A340B3BB419D86D0E71EB5D4489 = NATIONAL_TREASURE (National Treasure: Bo | V | 0x220DB7BDA4C96A598431CCD42953ECA1 ; MKBv7/FindVUK 0.98 -0xDF3E6C03720824895D26A61FE8F82394D9E26F26 = NATIONAL_TREASURE_2 (National Treasure: | V | 0xC19FF564302A38AA21FA08091884EC2E ; MKBv4/FindVUK 0.96 -0x65C9FB4B1383B0F1A885800A5B1F7C5DE0AF1E1D = NATIONAL_TREASURE_DEU | V | 0x95F32B8418BFC24A2A10A9D17C1E773A ; MKBv4/FindVUK 1.00 -0xAC70251C81F6E9C09BF786F2AC2B78CEB101A21E = NATIONAL_TREASURE_GBR | V | 0x9F4671DF0466E0CCCAA1D4C4C70DADAA -0xAD4BBDC536041A4E6564D538C6281EBE3BB6D636 = NATL_LAMPOON_EUROPEAN_VACATION (National | V | 0x6D9BAB04928AE834FDB85B2E06F2FE4A ; MKBv16/FindVUK 0.96 -0xD6A4104CD5081FEB4EF0933BC6D6C14FF2DBBEAB = NATL_LAMPOON_EUROPEAN_VACATION (National | V | 0xBB5C29730F5864428E908A0544687A3F ; MKBv16/FindVUK 1.00 -0xD53C3A1039BBE103CEADB98D5B66494031102E91 = NATURAL_BORN_KILLERS_WW | V | 0x02EC1E05DF3328D29DC873DBC870318C -0xBA944AB01675CE11354E272F1ED326F3DEB89A2C = NATURAL_BORN_KILLERS_WW | V | 0x72837209500F504F5E8075B5E439686D -0xB7B2D04CC72F7D7EA43BBE9508949BBB88399212 = NATURAL_BORN_K_DC | V | 0x69C200D03FB5DB48FCE048B580A9D411 -0xD7265068BD6658D283A23840B41ADDE73097178E = Nature's Great Events - Disk1 | V | 0x91EA78A88A94BF5EFE975761039F297A -0x87B57A95CBB4DA3C6B5B5B5C99935AB4D64935C3 = Nature's Great Events - Disk2 | V | 0xEF532E22B24B0E3F7EED7F74D7CC9353 -0xDA244C15BF51CC5997D052A3A84A34EBEDBA1677 = NATURES_EVENTS_D1USBD | V | 0xBFED62ED48B14C7784D842A4AC34C436 -0x06D3BD8C2A73FB67605E5F547FBC39287C6A7187 = NAUGHTY_COLLEGE_SCHOOLGIRLS_45 | V | 0xC7DCE7AB57E7A7578AB8C68E900DA50E -0x9CDDC2AE0B400CCC892035910A1310B0A16C458A = NAUSICAA (Miyazaki Collection - Nausica? | V | 0x0D51F50BFEBC4C465FAB323CB31712A4 ; MKBv56/FindVUK 0.96 -0x3312F36E7324CF87EE82F85F9BBEB6D86FD4C1FA = NAUSICAA (Nausicaa of the Valley of the | V | 0xB58736E0CC7E1DDC96DADDF2973069B0 ; MKBv18/FindVUK 1.00 -0x31854765720E304EB843246786575EB0EA72A9EA = NAUSICAA (Nausicaa of the Valley of the | V | 0x80E784D2649997D78BB7C6FCCC2AFD27 ; MKBv19/FindVUK 0.96 -0xE2D9EAF4644D14426CC2CD0E62AE20E7FD55588B = NAUSICAAE_BD (Nausicaä) | V | 0x4E86A08A78DC5167D9050B91DAF8BCE6 ; MKBv23/FindVUK 0.98 -0xF3A9B201C4DE4CDAE2A6BD0D0949DDB92A2DC9B3 = NCA1EFE1 | V | 0xAAA8C4677778F6B6A7BA216D0A354D8D ; MKBv25/FindVUK 0.84 -0x913EE298C42292E248964813FD1850DB0CC29782 = Near Dark | V | 0x69F8BF4461A8DAF267BB6A11BE494609 -0x53CDA5A616D0EF99E010815DED95047B8065D3B6 = Nebraska (Nebraska) | V | 0xAA41D317F5550FC72FB317DD4DEB8075 ; MKBv46/FindVUK 0.96 -0x51BFBEB3B8240869048B0C7F7A312D6C7CD914AB = NEED FOR SPEED 3D (Need for Speed 3D) | V | 0x00FCB05B07ACEF5855D9273B52247DEA ; MKBv48/FindVUK 0.85.3 -0x19B31C0BDB5BB4BCF019C29566000827F1DD3CB8 = NEED_FOR_SPEED | V | 0xC090719279CDFB2FF093BBE58B8B5AB0 ; MKBv46/FindVUK 0.83 -0xC834EBDFDF311254D13FC70DAEE9226496942500 = NEIL_DIAMOND_HOT_AUG_NIGHT_NYC | V | 0x5A04A6D4D2F59D7255418E20F680890A -0x4F1E916C7FDC40E9301DE8F9BAF599B5D196BEEF = NEIL_DIAMOND_HOT_AUG_NIGHT_NYC | V | 0x2910D793B511EE60CE1F303991F22F65 -0xD2AF1B4E3614F9CA5EE74653554F6DA3C11C2C86 = NEKOMONOGATARI BLACK (Nekomonogatari Bla | V | 0x058E6B040E92BFD81AD530453091AFA6 ; MKBv44/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0x61EDB9286A5959E9AF8BC344CB9469B4786A5BF7 = NEKOMONOGATARI WHITE (Nekomonogatari Whi | V | 0xFF9E4EF651DE6DFA21F13A6C944A7FE5 ; MKBv32/FindVUK 0.86.3 -0xDD057CA1CD526FF8FEB547B619388EB0DD242D8B = NERVE (Nerve) | V | 0x760F877ADA7683EF927DC8B7FEE8101D ; MKBv62/FindVUK 0.96 -0xED7C6349776512FB4E20E56B26C4B49C2ECB4D5E = NETFLIX INSTANT STREAMING DISC | V | 0xCE21D8193FDA7E18D46A600120B4776C -0x1CBCC160724E4F79B1C96DC4F179B4A615C3A303 = NEUILLY_SA_MERE | V | 0xDA941765670F89505AFF5B2E8E2137A2 -0x4E4B217F67A2DEB0A42179B06C22FBA4B76EFBD2 = NEVERENDING_STORY | V | 0x795EDA0FE3610C485BF336D5E229E7FD -0xA31CF8DA26FDAE15EC7179975063286A7A5F80AC = NEVERENDING_STORY (The Neverending Story | V | 0x904CC73B7C94416A7AA10FADA3D954F5 ; MKBv15/FindVUK 0.98 -0xD8994CC32F531547977C716F78B8D5AAF5ADA8E9 = NEVER_BACK_DOWN | V | 0x5B6FFBDCAF2E0ED83EEBACEE9A61F748 -0x0688389E61C97D24E7C07E5A98824EFA941212E4 = NEVER_BACK_DOWN | V | 0x244FA0A6D4E9E39669E46BFA131C091F -0x9671A396FC7FFD6F15A665CE0441998F888EB505 = NEVER_LET_ME_GO | V | 0xB2CB36897F12DFDEFD1FE179D1509EF3 ; MKBv19/BD+/FindVUK 0.80 -0x88DA6BD821DA224A942B676089B30793AB3EC051 = NEVER_SAY_NEVER_AGAIN (Never Say Never A | V | 0xC1E81C5EBE614479C07FC5180F19768C ; MKBv36/FindVUK 0.84 -0xB0DA3FF77F7E50F94CD052DC0C2211AFB11CA2AA = NEVER_SAY_NEVER_AGAIN (Never Say Never A | V | 0x5F3AAB842D7D9FE18B7A8A35152660D7 ; MKBv10/BD+/FindVUK 0.96 -0xD5F76D02B0F3584642EA9C792A92A8C2CCD24C0A = NEVER_SAY_NEVER_AGAIN (Never Say Never A | V | 0x2C08C204ABE9C293F23AD68F56EDF4E7 ; MKBv36/FindVUK 1.00 -0xA23EFEBE60694D196BCC9641C24A5D6BB741EE91 = New Kids Turbo | V | 0xF3149D2BC2F74806C25AF72C55323928 -0x7234DDCCA707E4F3A92391BE7F42060C8DEB3E5E = NEW MOON | V | 0xF3C5DE0902600FC24E9A28C02EAED099 -0x7A3BC564388D1A528930E2AC84E82AA94E11B2EB = NEW MOON | V | 0xC2560E7A102FDFC19889A8A6F3B0F45D -0x256A3CED107A8308725D43D1F6DC7E7382E9757D = NEW MOON (NEW MOON) | V | 0x57C65F2F92F65A4220185267ECD76A05 ; MKBv16/FindVUK 0.84 -0x38746108B148E3050392C27F8AFC0C68DB4A4C15 = New Orleans Concert | V | 0x5D991ADFCE6424E84B3ED28E9E93EE00 -0x5567B7EE455030001155C23EAFA7A9EB6ACF416A = NEW YEARS CONCERT 2009 | V | 0x9CE3FD53F30775950C20B7F21F0C1D83 -0x8DAF45CCB53802A01A50C18575F63F9B6BFA9F8A = New York | V | 0xBD2F096733F5085192324DB87A29FF2C -0xE8995BA628DDB49724374EA32E536779CACE7A51 = NEW_IN_TOWN | V | 0x33141186F4F4CACDAB6FCDFBD44B09F3 -0xA907164B89FECC464151D5EE669AC677FCFBB2F2 = NEW_KIDS_NITRO (New Kids Nitro) | V | 0xE57DE7B3C8792DFEEA6B767FA6BCCB14 ; MKBv31/FindVUK 0.96 -0x4954AE6AED01B1E2DB2EA0D0D4A21A0AB1A18602 = NEW_KIDS_TURBO | V | 0x549DEDDDB9583CBC254005899FB576B5 ; MKBv25/FindVUK 0.96 -0xFDF17B837CB49A236E79DCDDF39EF2061CA789B6 = NEW_LAND_THE (THE NEW LAND) | V | 0xE973BA746922C9492E5C9FE49E45785D ; MKBv57/FindVUK 0.96 -0x700358DE164EE53988CA91F25F5EC5571C5C382C = NEW_MOON | V | 0x6F6873B1C81ED940F61543FAA66E40C7 -0xB47C1766929E1E5833E5B9D6B4A306C9891573CD = NEW_MOON | V | 0x2F804EE1A0AE813840007A06C1CFB75C -0x97433725F5361468657FA6517BB1E19C8B37D572 = NEW_POLICE_STORY | V | 0x99EDFC1E1253A5D691429D71167BCA58 -0xCB51DC2FD31C11E347A8E93BA628978112DD25F8 = NEW_WORLD | V | 0xECA9094A503D8E01854E7B389BCE58F3 -0x051E35E92E9DE318CF1D75673F4AC6DB64249A9F = NEW_YORK_RIPPER | V | 0x8C7E0AC305BA8E3FBA76A9D318C1C418 -0xCD4F5FB386B4DE559D5A477F74B66BA3AC8D1F02 = NEXT | V | 0xBD4E88EEDC65DFD79CC8503F8A80D690 -0x26D0C2CF5092579BBF0758C2CD78A7134E05A066 = NEXT | V | 0xEEFFECA6FE724EEF40B50B46D5A10301 -0xD800AE051530359ABAB49F88027C58B0C3BFC254 = NEXT | V | 0xEBFBE95D20421588E59DC92C6DC93D0A -0x53CF9C8CB5CD87A7DC2B1B5628B3CE67FC932D1B = NEXT | V | 0xB9DB80637633E399B5076403CC72416A -0xB815A68E5829E005F3A0928A31B5CA2ED973F84F = NEXT | V | 0xE6DD3DE07F3BA36E83D1375C60AA2168 -0xEF872846F5F12C162D8CEED6D1AD966EB09AC1D4 = NEXT_AVENGERS (Next Avengers: Heroes of | V | 0x1D6DFAD5AD23F6233AFA42095AFF01C6 ; MKBv8/FindVUK 0.84 -0x154A91B584E792355BC072DD8E8E5A918DA725FE = Niagara | V | 0x06E9F5697C2A09F6CF2BE5AFFB1F811A ; MKBv31/BD+/FindVUK 0.80 -0x6C1971F7E563D44AD30BD5AAE6E6F111D69AAD45 = NICE RACK 15 | V | 0x248AAA83563CDF08F5987CAD239A812D -0x9934F52904A9006EE643E633B8E22F9D0E20999D = Nichijou_D1 (Nichijou_D1) | V | 0x6A32F305E78F9886DF08961C4F964382 ; MKBv62/FindVUK 1.02 -0x846AC01D22017F49F240A26169E592B43C9935C0 = Nichijou_D2 (Nichijou_D2) | V | 0x37689594742EC28B2FC80A5CE89F47C2 ; MKBv62/FindVUK 1.02 -0x86DBD053A3B8BA6111FF04B8979ED9685A14560B = Nichijou_D2 (Nichijou_D2) | V | 0x66AEA052B7D66292F98138861BB72D5D ; MKBv62/FindVUK 1.00 -0x593412716E81E8F033799977618E0276637D5DFE = Nichijou_D3 (Nichijou_D3) | V | 0xC7048E31195E590ADC95C7EE23863422 ; MKBv62/FindVUK 1.02 -0x6BCB886AFFA7ACE8B32814424B3674EF4B2FF558 = Nicht Auflegen | V | 0x484BED42C68D99DC3FB24E44E5E1E1AE -0x681FF3C9E24BA2C5F726ECA4E351204614B42A9D = Nichts geht mehr | V | 0xC68C66EC9B179D0BBD8E001D838B3035 -0x61B1A55EC6DB790128CB0EC925CEE877896D9577 = NICHTSALSDIEWAHRHEIT | V | 0xB93C36BA01C6447F9993E57D4E7C0594 -0x0B1926D540545315E9FB1EB4743DADEB4FCA66D6 = NIE_KLAM_KOCHANIE | V | 0x7F516E7AA6591285BF155CF1A3898B20 -0x9E4313865AA282ED0722688FE2B2C836056FAD1A = Night at the Museum 3 | V | 0x13F583B9948971DF822A611BC69A5E5E ; MKBv47/BD+/BEE/FindVUK 0.84 -0xF2483ADF8EDB13D1D4B24AE196F83A0989BA6CB0 = Night at the Museum 3 (Nachts im Museum | V | 0x05CE4A0BCE5C0DEC81302A0662185938 ; MKBv47/BD+/BEE/FindVUK 0.81 -0xC27A6C3E9D34E86D4700DD25713662DAA63B8394 = Night at the Museum: Battle Of The Smith | V | 0xD5A2E9E142F59528464EF5763928F243 ; mkb v1 -0xEC7982966CF1F90550B657EFB1C576AAAED2AF36 = Night of the Creeps (Night of the Creeps | V | 0xF4333FBD30886149435349EBED11B8B9 ; MKBv57/FindVUK 1.00 -0x4DF369FF813CB2B79867CCDFB38559F64DE7428A = Night Of The Living Dead | V | 0xD31BC6D2863F3A221F280664B330BFC1 -0x001287CE882D7FC70C603582D59275E4D90FC55E = night of the werewolf | V | 0x8347B10BDA58E514D7D6F3E723404C62 -0xCBB89DCDD92E51B5DD752179D8F66F90497A378D = Night on the Galactic Railroad (Night on | V | 0xDD62D9B5D8A177B098D243AD46FF32FA ; MKBv57/FindVUK 0.98 -0x18FC34762DE8C0CE38C75537F21FC6AA62ACF505 = NIGHT RAID DISC 1 | V | 0x9D9E5F0D92E4ABDE1DA71725B14D8770 ; MKBv24/aacskeys 0.4.0e -0x5032BC22E9EAFBD10CD3A49648A534891688A2E9 = NIGHT RAID DISC 2 | V | 0x94C02E53DE23112A853310BC5F1698CF ; MKBv24/aacskeys 0.4.0e -0x5F1CF8DD019DC9EB223B1C84955DBE0A8CEDA813 = NIGHTATTHEMUSEUMFL | V | 0xEAE350C7460528045AD18EBE57556219 -0xD90D2EC44179CABD4FD574ECA4153F15E83C6BCB = NIGHTATTHEMUSEUMFU (Night at the Museum) | V | 0xFC197F99E9725237E1EA193E63969601 ; MKBv12/BD+/FindVUK 1.02 -0xB2C625AFE9D43AE098765AE16356BFF63E434FFC = NIGHTCRAWLER (NIGHTCRAWLER) | V | 0xA8889EB815E96C873B052C45F24AE091 ; MKBv52/FindVUK 0.92 -0xA4A6E6A19EC21A8B0C8F2B4FDB45D95D15AB7396 = NIGHTCRAWLER_NOR_SWE_FIN_DAN (Nightcrawl | V | 0x80DA8EFB3540B98E0E0EEC85BE8A9DC4 ; MKBv52/FindVUK 1.00 -0x12A3AC2EA28EBFC9C94B2190991F700B4047CA43 = NIGHTMAREBEFOREXMAS_GBR | V | 0x49226370BC278A87DA8C104309867979 ; MKBv23/FindVUK 0.96 -0x5AA2112FE8C914BA2B9CE58F9334405B744A440D = NIGHTMAREBEFOREXMAS_GBR | V | 0x49EACDDF69B5A3B807FBE42C5C966191 ; MKBv8/FindVUK 1.00 -0xC81F5E5B79DA5291F4EADF74A26853ED08DD5155 = NIGHTMAREBEFOREXMAS_US | V | 0xC2439B9748494F9B6CA52B25060C8EF9 ; MKBv25/FindVUK 1.00 -0xD44FE159CC2A5E94595217335E8DDA51A3962D46 = NIGHTMAREBEFOREXMAS_US | V | 0xBB7620F17B0FD3595EE4AD064192F94E ; MKBv25/FindVUK 0.81 -0x6E8D7F77B529E90C4CE01DDCF4008690D839D48D = NightmareCastle_BD | V | 0xA9C818237049597ED6A08BF26A1C6760 ; MKBrev 55 - FindVUK 0.57 -0x234300F43703640B851E425C4F3AD1ED48254AF3 = NIGHTMARE_ON_ELM_ST | V | 0x61CF69A529F715CBBD56C324BEF75CD2 ; MKBv19/FindVUK 0.80 -0x1AF7536EF5FC0362002B25FBAFA36EC54A712DBD = NIGHTOFTHELIVINGDEAD | V | 0xFD59E5CEC905A3029BE970BA110C1F18 ; MKBv6/FindVUK 1.00 -0x0A4C13CA37B345EBFA4180A63073CF566518CF73 = NIGHTS IN RODANTHE (Nights in Rodanthe) | V | 0x02D13615E5B38316AC2FB38A3D84A37F ; MKBv12/FindVUK 0.96 -0xAB0F40AE21ACA79A9AF28F39E46CA18422413DC6 = NIGHTS_IN_RODANTHE | V | 0x0F42A9F4E8C524CD3C0FFD7F3A99DA31 -0xCD55B74FC585591EA168A6F1E2F0D34666AAE0B6 = NIGHTS_IN_RODANTHE | V | 0x66815C485E559EFB82E77C624C540D65 -0x74215E16FD20F1640AC13B0B45B4C5449CB11322 = NIGHTWATCH_F6 | V | 0x139F7D87B19823E1D2AEB7DC4E9B1910 ; MKBv7/BD+/FindVUK 1.00 -0xA88499780E1C08710F8934BF2B716DD3F3F855BC = Nightwish Disc1 | V | 0xB42F72E3304B6A0DC35DD650136C2DB8 ; MKBv40/FindVUK 0.96 -0xD8BA70F5013334592411BF6EFC8425ED7676B763 = Nightwish Disc2 | V | 0x50EA7EC4C385A9F82A512812B5AC4866 ; MKBv40/FindVUK 0.96 -0xE642DA7EBC5536D153E3945EF2DB2E3B976EAD20 = Nightwish_01 | V | 0xB172FA65AC57E0C35FE53AD47595663C ; MKBv62/FindVUK 1.00 -0xEA200726476CA21EF99D0EFE2FF3ACE8FC3767F5 = Nightwish_02 | V | 0x1E79A466A469AD42E319F39B22C30354 ; MKBv62/FindVUK 1.00 -0x30F466AC74B214CEF0F55621CE6F6DA95617FE4E = NIGHT_AT_THE_MUSEUM2 | V | 0x53682B75E92005DCCCBA2B25721755C0 ; mkb v14 BD+ -0x29DA733EE9BC2A081AB35C40D3C717FDFD764C87 = NIGHT_AT_THE_MUSEUM2 (Night at the Museu | V | 0x2FB69579723E74FDC9A46A98ED478597 ; MKBv14/BD+/FindVUK 0.99 -0xCACD073FB73DADAAD78106D923F176BD098E1453 = NIGHT_OF_THE_DEMONS (Night of the Demons | V | 0x6117A998F41739DF0414BDE7EF9FA0C7 ; MKBv19/FindVUK 0.96 -0xEACFA4C0C1AB40BF7982E649555963D6D606EADB = Nikita | V | 0x4408A4B89A943F0279C21FFB5AB0A32C -0x8B8744F68BB2E735C2FB5EC6872324038CFECAC7 = Nikita S1 D1 | V | 0xBFF73D4881A3434CEE2BF7E7EFD4FB32 -0x8D9BE25CA888946A1452D85200ADDB8C6835F397 = Nikita S1 D2 | V | 0xF2A0A39810F2C8F75CC5B2A3DC493253 -0x7551BAE733222D004C4F3D2A04DC24BB8D906210 = Nikita S1 D3 | V | 0x382C2EAD33DD76FB6DF2F268124DD9D7 -0x02DDE4F9F94D002E5D75D716A1FCBCAB1B34CA53 = Nikita S1 D4 | V | 0xCA000CC7C46A425AA5ED589898747D06 -0xBCE1FCA99EB288C788B50E44F28037F9B8FB3556 = NIKITA_BDROM | V | 0xBB1BAC349EB9EFAC7B917B33EB109301 -0xF86B71D4CF35B373C0FD094D58701EF48E96F48D = NIMS ISLAND | V | 0xFDAF10B02F23B51E11C0FD63F328A1B8 -0x744315897BBFBA4F5B833FB4957F7CD0F567A8A0 = Nine | V | 0x07F1C10A5B3778175F04E319EC0E2723 -0xEF60214A2F78D03054355EE569DF2D88545C9644 = Nine | V | 0xCBD1DBAC400ECAAE53D7E4687F8CD626 -0x2EFD59C8262AD2E5FF4AC16D21E5E5B9FB3B5228 = Nine | V | 0xE1931AFEC0220EC036EC846A533694E0 -0x076E5DF919E9FCD2B901D8BF16AB972B75A5C96C = Nine Inch Nails: Beside You in Time | V | 0x0B7E1922AFFC27620AA56F3853B56258 ; mkbv3 -0x3BBB6F66B5D28C1B7B7E712DBBF6E440C2C8D9AF = Nine Inch Nails: Ghosts I-IV | V | 0xF4B7CB93C995E19FD3461475A796D760 ; mkbv7 -0xC9587C57397BE192A73F52D577A2E0EF0F1CB262 = NINE_2009 | V | 0x158899B13CA71550CC4C03B6B3383C4F -0xDF60FF6971D971C16B8C69AD68C84EC86723F3AA = NINE_BLURAY | V | 0x71D5544CACEE47C58A6B1E22E35A99A7 -0x707B6AA84F5A205530D73DB3A8D8487EE0DFAB36 = NINJA | V | 0x0F0FD9FF24703F32FA3BF02EAD991BB2 -0xF5EF9A111D6EDCD2E9DC61F918B0C6E74B493A52 = NINJA | V | 0x8E21A66FAED9029657FA7A8993EB28FF ; MKBrev 44 - FindVUK 0.57 -0xCD727A0412AA75927CEB22A3F6C946647B87BC84 = NINJA | V | 0x187D1605EC40CA976788A0A685617651 -0x8E8717D94C5D607337AFCCB27FE34A540B302D66 = NINJA (Ninja) | V | 0x213883670AA2DBE6E0352D9E157D6A87 ; MKBv16/FindVUK 0.84 -0x21D80C61398187363A265177D339ABDE794A113D = NINJA SCROLL | V | 0x98EE978CE347464A85FF5A6890B42D08 ; MKBv35/FindVUK 0.81 -0xC9DEF61FBBF47304A3BDCE80B8A635FED22D720D = NINJA_ASSASSIN | V | 0x606BCD547978D7E075F6C0E425BF8F35 -0xEECBA79EC48465618F380AE39F3C07DA5A568296 = NINJA_ASSASSIN | V | 0xFE80113A293362B31DF00ADA74126EEF -0x7BA0FD72A73AAFD15B96F1AFBA8619ECE883C9C4 = NINJA_ASSASSIN | V | 0xFC610F59DF8169D2D4FEFF34E4F09597 -0x7442725DEE844670D5709649166700E09782EC24 = NINJA_ASSASSIN (Ninja Assassin) | V | 0xF19C9F4C5923E2DB38325FE4CCD228C1 ; MKBv16/FindVUK 1.02 -0xE50443D3941A5A46CA0B31FE0E0D6323949D6212 = NINJA_SHADOW_OF_A_TEAR (Ninja: Shadow of | V | 0x57330D7FBA624204E7697B29BF59C93D ; MKBv47/FindVUK 0.84 -0x69A55619AAA52FEC518018ED90BAA677A7465750 = NINTH_GATE | V | 0x364F6D0B3EB62AD278874EDFAF37A710 ; MKBrev 12 - FindVUK 0.57 -0x2D2DF71885A90C897841CBBC749C475D8146A8C3 = NISEMONOGATARI DISC 1 | V | 0xD0169E2DBB407DDFF68351F28734F904 ; MKBv52/FindVUK 0.72 -0x9B423650A4ED482D32FE68CC6B1100F32F3F143B = NISEMONOGATARI DISC 1 (Nisemonogatari - | V | 0xA704B2766FAEA01BDE33B210F94FFF8A ; MKBv35/FindVUK 0.86.3 -0xC126D5E4F32973E4B57F2761B38ACC9AB953E827 = NISEMONOGATARI DISC 2 | V | 0xE46310AE16813A8129FD602A67BD1CD9 ; MKBv52/FindVUK 0.72 -0xDAE6964F5A3F3E51F7EECF60CDD3ADF5E6132DD2 = NISEMONOGATARI DISC 2 (Nisemonogatari - | V | 0xFB0C06D2A03C57AE12015FF756197A92 ; MKBv44/FindVUK 0.86.3 -0x07F98EF9933CB32C0CC68D7FF62AFB5F6E405C47 = NISHA HERO | V | 0xF5D2BDC370C76D81463856E8DBD9B60C -0x827710E7595D626AD27EE2D95B57445ADDE986B3 = NIVEL 13 (ESP) | V | 0x1480135881275E7F383C6FF7FD4EEAC9 ; mkbv10 -0x2127E6CB502205EF16535CF5EEF922A5F806EE96 = NIX1NNS1 | V | 0xA56367CA17C0A302B693AF5AE006D6BE ; MKBv7/FindVUK 0.96 -0x08FA8619C4CF1035769B0A739B20C5D1DFA84906 = NIXON | V | 0x84FE5270766702CDC818CA992E8330B0 -0x48D3F9A9CE20A313B7F4165DCDB6865AAF193AA5 = No Country For Old Men | V | 0x1578A6285F532FB6619B0DC3016D7C79 -0x7BB7C9DACED8BD327E677610D680CF47148B3F58 = No Country For Old Men (DK) | V | 0x194ACC2EEACA10CE89C387EFE2D70F56 -0xB0612B2B4E8994FC0B57D8486DADC5DCAAB55276 = NO GAME NO LIFE VOL1 (No Game No Life - | V | 0x19B8BF8727642ABECB6016F4B2C57069 ; MKBv57/FindVUK 0.96 -0x0BF59C8F20DFB73CFD21D7998FDCAA93E5351502 = NO GAME NO LIFE VOL2 (No Game No Life - | V | 0xA7770832C29B3AFD1693F4F120443AD6 ; MKBv58/FindVUK 0.96 -0x04B4037E78EE1CAD0DA18C9A90EE24E5E8B2C7A5 = NO GAME NO LIFE VOL3 (No Game No Life - | V | 0x8CDDFD4DD7D421E2A2D03A8A82FBCE50 ; MKBv60/FindVUK 0.98 -0x4C62EB8503A795255818B9A67AE2F45F156D8C14 = NO STRINGS ATTACHED (US) | V | 0x6ECE0F909F35223C7D4B01FD6AE91CA7 -0x4DC424E04C7945E575A5685302A5B8434C908FEC = Noah (Noah) | V | 0x809E0B4AC315318BE0DF1C887B92DCE2 ; MKBv46/BEE/VUKNOTVAL!/FindVUK 0.96 -0x96471A358A2995FC59E50F815987AB4F00970D42 = Noah (Noah) | V | 0x916CDA8F3CB64F0CAD37DA29B17163D1 ; MKBv39/BEE/VUKNOTVAL!/FindVUK 0.92 -0x685322089E0355671B0A020CB365B6AD8476D58F = Noah (Noah) | V | 0x20569D325922BD74F09869953C68B8E8 ; MKBv39/BEE/VUKNOTVAL!/FindVUK 0.96 -0x4A06DB277AD1A2698AD9C011C30F5465F97C8073 = NOBELS TESTAMENTE | V | 0x5E057F2E08DF4D16759602A9F777DAFA ; MKBv31/FindVUK 1.02 -0x018BCB105775DD08A5E1FB91B7D089A7A61BFFC2 = NOBODY_GROESSTE | V | 0xFD2AD7265CF0C0A6F579E33D8C586380 ; MKBv37/FindVUK 0.80 -0x44E59B2F5F7B8A5EC009FD63D44077AC812373EB = NOCTURNAL_ANIMALS_UPB1 (Nocturnal Animal | V | 0x79A3B0899A6081839BAC855F8A11C255 ; MKBv61/FindVUK 1.00 -0x66481756E2CA917A4F55816CB8BE1CA42B4AFA53 = NoGameNoLifeBD-1 | V | 0xC962B3A61283B1F58481741BBCC830F0 ; MKBv53/FindVUK 0.96 -0x1B48E2DBEBB276D39B7A5D65EA1B3FA3D599576D = NoGameNoLifeBD-2 | V | 0xBDA94C16343D21EDAAD6043DD97F79CF ; MKBv53/FindVUK 0.96 -0xB2197BC85F4103047277551E403512D4A0DF3260 = NOIR_CS_D1 (Noir_CS_D1) | V | 0xDF5C0FC608B1597B512086FFA8C9C210 ; MKBv50/FindVUK 1.02 -0x5A958BAAB0E5BF203EB6D4A0E6595420FA75A89F = NOIR_CS_D2 (Noir_CS_D2) | V | 0xA2641849901FBF6C21F918BE59BE987F ; MKBv50/FindVUK 1.02 -0xD3D2C7377614256936B7D7F8FE22B9FA2030A830 = NOIR_CS_D3 (Noir_CS_D3) | V | 0x757287AA8CADA00349906D940BD120F1 ; MKBv50/FindVUK 1.02 -0x3F93F72E541D73A84CF4287B760450979D9A7CE2 = NOK | V | 0x637FBA144E29A8CDD4526566855DF0BB -0x929CDC172D83D340331339116613FA1D4477F4F8 = NOMAD | V | 0x8226EA626B40BABE17D51A093343C48D ; mkbv16 -0xA2815DA73B85C9EF60EA6735688D2A860E0B5B62 = NONSTOP (NON-STOP) | V | 0xFC782B1293223032A2204456A7C9ED83 ; MKBv46/FindVUK 0.91 -0xB760A57715DCDFB8A7528083A633816CBA4B9773 = NON_MA_FILLE_TU_N_IRAS | V | 0x14CAD31B7EA2B785AA28E2E2A7203B7B -0xB3C2349F2CDFAF4D4201C94C0A9222CF48F9258D = NON_STOP (NON-STOP) | V | 0xA2E4B7831F5BB95050E010F197A72AA9 ; MKBv47/FindVUK 0.84 -0x48268C876ECD4FFAC2A2C48EDE9D47A3E66E8986 = NON_STOP_NA | V | 0xA919566EC3DC22B58A8455AA720B711A ; MKBv39/FindVUK 0.84.1 -0x6DE9A93AD8830D2B7CEC8C684207F031EE803625 = NORAGAMI_CS_D1 (Noragami_CS_D1) | V | 0x50B6D6434DEDA118050CCEFAC4967519 ; MKBv53/FindVUK 0.86.3 -0xC2EAC11925A1B70E1A49F349A9D9186E223E7EED = NORAGAMI_CS_D2 (Noragami_CS_D2) | V | 0xDE569A49326A1E20BF9220CC58DD6157 ; MKBv53/FindVUK 0.86.3 -0x5ED98D144010257399C4B484FC3C0A924A84EE84 = NORMA_BD | V | 0x8CD09B8966A3F6CC13EB41A279E59D19 -0xDF80D4F8679A5E26767566ED3E9861ACB6A6B4E3 = NORTE Y SUR | V | 0x36C99BF5B5900146223B7014D05BD269 ; MKBv31/BEE/FindVUK 1.00 -0xD6A5856007305E3525FCDBAC862F74FC4E72B8A5 = NORTH_BY_NORTHWEST | V | 0x251B571D3119E6B2CDAAA27F5D641362 -0xD25FC47077EFCB903A0B8722826883E567B5DFAD = NORTH_BY_NORTHWEST | V | 0xAD3320BABB7036239B73DAABF2FC67C9 ; MKBv27/FindVUK 0.80 -0x0C1F1305CEA36EA4857127C92F2510D1EFA8EC62 = NORTH_BY_NORTHWEST (North By Northwest) | V | 0xA23CD5E85D93C83CD83F01011A487C3B ; MKBv50/FindVUK 0.99 -0xE2A78E9453489B6AC0A9A36569C212A0ED2071B3 = NORTH_BY_NORTHWEST (North By Northwest) | V | 0xD40373F57FCA75278E83C859AB67B1DA ; MKBv14/FindVUK 0.96 -0xF2A5A15B5D8B470FEE68B18E1513D29AEC27E08E = NORTH_FACE (North Face) | V | 0xC61E0AEF8F4B680FFF37317A70DB63AD ; MKBv19/FindVUK 0.98 -0x04F41CEE5A4C33F700B6C8C7AF82096E030A3476 = NOSFERATU | V | 0xA8E3F06D2233C7B4D4D6F8AC18DAF334 -0x9A3DBE7FFB320CBEBDFFA382ED2F3FC4F834D883 = NOSFERATU | V | 0xA8DE4D7873013D4B1D9996A90C4849BD ; MKBv46/FindVUK 0.99 -0xA62979CB23A6281929625C1019F21A7FB15C8E43 = Nosferatu (NOSFERATU) | V | 0x1D2A386E7286392FD9163383FE10845C ; MKBv47/FindVUK 0.99 -0xCD9E87F96280783CD65E307EDC272BD7306D7822 = Nosferatu (NOSFERATU) | V | 0x0B8D97D85184764156ED366B4E9C88A0 ; MKBv46/FindVUK 1.00 -0xCA13FBE60315EA5B7F3F9DC7E70DDB5AE82503CD = NOSFERATU (NOSFERATU) | V | 0x763199F9BCC2F2790ACC29E6CF495A3B ; MKBv43/FindVUK 0.91 -0xFA83DB0D2AAAEE1C36BCCBB0C2329401B179811E = NOSFERATU (Nosferatu) | V | 0x2E3D1D6E5D26FE051385B60E1B04FEDA ; MKBv57/FindVUK 0.98 -0xC6DB49D534EB7CE408CBBFACEFB939E7BA4084B0 = Not the Messiah: He's a Very Naughty Boy | V | 0x35AC10624FE8481926969AA9D9331728 -0xFB563E62DFD7952D0F6F939F9E59143BC56EF136 = NOTORIOUS_BD (Notorious) | V | 0xCBAF9C5DF838ECC771B8F267C7FFA4F8 ; MKBv23/FindVUK 0.94 -0x4F01C8F8AFDCA00C39B8A41E8CE99B7FB5B533EE = NOTORIOUS_BIG | V | 0x3B2A7F7FBD2077CFAD1AF5C0094A438C -0xA7A6402AE6059D047F95B27C8F23B40EC9482165 = NOVEMBER_MAN (The November Man) | V | 0x957464C70E8DEFFEB981879EC0ED16F6 ; MKBv52/FindVUK 1.00 -0x226B841D0D2B9FED7DF06386200075F97C249003 = NOW YOU SEE ME (Now You See Me) | V | 0x34717D84951AEFCC5C026618BC7B5126 ; MKBv40/FindVUK 0.87 -0x0CA4341F044DC2F35A8FC06633690D2F7F0198DF = NOW YOU SEE ME (Now You See Me) | V | 0x27EC4D602274F6131D106F0AD3491DCC ; MKBv40/FindVUK 0.84 -0xF02FBAFDD361639E4F712C5068FE234DB6333168 = NOW YOU SEE ME 2 (Now You See Me 2) | V | 0x087BB144762B5EAC19F1BEBB37F13A80 ; MKBv61/BEE/VUKNOTVAL!/FindVUK 1.00 -0xF2D0860125E53A9943A8E5FB0606BEFD6BAD6E40 = NOWHERE_BOY | V | 0x66823BDCF583010A5A06B23D2E9F9DA9 ; MKBv16/FindVUK 0.96 -0xC2E51C7CE5E11A5F3A70613FEB95203D71BBD9BE = NOWHERE_BOY (Nowhere Boy - Blu-ray???) | V | 0xF7427893DA6C0AF95ECFB1528C170EB5 ; MKBv21/FindVUK 0.96 -0x04DCF16A3353FDE079358555E75FDAFE7AF0EF40 = NOW_YOU_SEE_ME_OUT | V | 0xE7AC00124499AA42B189D589C0934929 -0x6BD02E94F0E569D0913D1E8573AA2EDD5EEBA565 = Nozakikun BD-1 | V | 0xBBFEA7D122281A296905E4907F775CAE ; MKBv58/FindVUK 0.99 -0xEF73FAE6CF89175CD6AD168C8D100B154856EE36 = NozakikunBD-2 | V | 0x1F3F5DF12EB6CE311B8F54EEE9CFD4C7 ; MKBv58/FindVUK 0.99 -0x7ACD79EBEAB986AEC25836753B887B2E21454F0C = NO_ESCAPE (No Escape) | V | 0xAB5545E0F09A54B5F0BEEFD32B0E0353 ; MKBv57/FindVUK 1.00 -0x211C4D5D6EDEC21FEE518F22CE7C247B450DD29F = NO_OFFENCE_ST01BD1 (NO OFFENCE BD1) | V | 0x2DCAF294468C75246F9ADED4FF9A29D8 ; MKBv61/FindVUK 1.00 -0x97A1B271E38D2F083A25B4208B673F914BF5DA58 = NO_OFFENCE_ST01BD2 (NO OFFENCE BD2) | V | 0xA8F5B66CB86E04975414ED431B6CEE54 ; MKBv61/FindVUK 1.00 -0x1C446E907AF894471DE8A747749823615174D567 = NO_RESERVATIONS | V | 0x31006446B19707D79ADF5582CFA992B5 -0xFE2222E98014C10C2CDD151927764615F04D5ED9 = NO_STRINGS_ATTACHED (No Strings Attached | V | 0x374790D252D780BDA75DC2E80D7DEFE6 ; MKBv23/FindVUK 1.00 -0xC986646221BFF33BD587FD3086B28D7465A36CF7 = NO_WAY_OUT | V | 0x20E88C42B8F2BABE23D83196A872330A -0x236673B446BEEB87EB53DC360E273BC6F8BC19A0 = NUDE BEAUTIES - 2 BLU-RAY | V | 0x40FA74358C790B19A0493BDFE99E7E08 -0x7E9B270A76E8169AF49A5247FBACD8BA0164C4D3 = Nude Beuties | V | 0xA86C9B500A12ED3F69CA4983884EA6F2 -0xEB81CB9C0E9B88B0406F753A5CD633FC76711DC3 = NUDE_DREAMGIRLS | V | 0x0362267D16B6D065A34E9086B01AF47F -0xE04556C51EA3B12435A2E79B64E2848AC0053D75 = NUDE_FAIRY | V | 0xB3050CE887EEAD333F0286BE21AB9A4A -0xE080141E51B3F2973FDE821E3CEBB8EDD0715DD8 = NUMERO 9 (ESP) | V | 0xC79A5FB98ADBC7A9B590E6A0E62D091D ; mkbv17 -0xA7A8962A7A8DB7ABBEB6947C7BF7916340E6AB8C = NURSEJACKIE (Nurse Jackie: Season 1: Dis | V | 0x2A7DCFC28C82A6505F95E6DFF4E9C743 ; MKBv16/FindVUK 0.96 -0x919E987DFE500A07B619508743D04E5553EB4290 = NURSEJACKIE (Nurse Jackie: Season 1: Dis | V | 0x57A3FC0319DBBE0D412F09A45F9E9DEA ; MKBv16/FindVUK 0.96 -0x9FF94CAC88B15AA9ECB5388C69AB3507E9979FF5 = NURSES_BD | V | 0xB76937A33A6AA86F7B5B100C08CA7B6A -0x0D86B58066A0A60731B141597B0F1412F5527EC9 = NURSE_JACKIE (Nurse Jackie Season 3 Disc | V | 0xDDE5DED06035A7DC0F9681185303147F ; MKBv21/FindVUK 0.96 -0xDDA5030E387EFC7A563BE7128F1E5609CC989972 = NURSE_JACKIE (Nurse Jackie Season 3 Disc | V | 0xE8FBB30A1F94C8DDE39647D06E86BF9F ; MKBv21/FindVUK 0.96 -0x9E08FA6EB886B933486B207E31DE51310639F4EA = NURSE_JACKIE_S2 (Nurse Jackie Season 2 D | V | 0xC46333966CE9DF8A4CCC14B10D64CA48 ; MKBv18/FindVUK 0.96 -0x53A3DCE71F25DA109805F445182DC2761ECBBCD3 = NURSE_JACKIE_S2 (Nurse Jackie Season 2 D | V | 0x57D9CD7F694D6B65F32D1E7F522D0B10 ; MKBv18/FindVUK 0.96 -0xAC676461751FE5CAAA76EE1B436AABAFAF8A0503 = NURSE_JACKIE_S4_D1 (Nurse Jackie - Seaso | V | 0xCA5AEFF45DA35CB515E8A4DEDF0E3A79 ; MKBv28/FindVUK 0.96 -0x6A706AF35793F24CFA9AB06EA1F40327E780374E = NURSE_JACKIE_S4_D2 (Nurse Jackie - Seaso | V | 0x81F9E6085DD2547A4211CC3B8942BD14 ; MKBv28/FindVUK 0.96 -0x109002FA1630DB2A282628FA955B0A4281EC8E41 = NURSE_JACKIE_S5_DISC1 (Nurse Jackie Seas | V | 0x9612D517C800330335EC643633ED7109 ; MKBv43/FindVUK 0.96 -0x4432E288A9620B991521958ED0BA450F89C28D40 = NURSE_JACKIE_S5_DISC2 (Nurse Jackie Seas | V | 0x2BAEE77BD4EA6DBD15ACFD01CFFDC18C ; MKBv43/FindVUK 0.96 -0x68CF18D74A2307E4349CDCB2D03F2038DB68BF9A = NURSE_JACKIE_S6_D1 (Nurse Jackie Season | V | 0xD12F9690AFCCB0094AD16D6D5879A59E ; MKBv48/BEE/FindVUK 0.96 -0xA436E072B69062EB362F2A0F2F086B327E39B76F = NURSE_JACKIE_S6_D2 (Nurse Jackie Season | V | 0x330D2376F78985ABE03599EE242E4F68 ; MKBv48/BEE/FindVUK 0.96 -0x3C1F492DBB896C793EAC4D565A559464D48AD8FF = NURSE_JACKIE_S7_D1 (Nurse Jackie, Season | V | 0x7818E91D8CE38DF62521A7E38EB430D4 ; MKBv48/BEE/FindVUK 0.96 -0x68496029E34970F5A9A7E52BB3A3B5AA827F2A33 = NURSE_JACKIE_S7_D2 (Nurse Jackie, Season | V | 0x741809FF82A91FE44677318949FBA691 ; MKBv48/BEE/FindVUK 0.96 -0xBD8A0BC3D70C0CDB10FF984A59FFD4E8A2995CA7 = NUTCRACKER | V | 0xAEDFAA7B99EE38343F4D490B0934D9E0 -0x4EDB51F4DF2B2D9CF7FC882497A70B9C26EDC879 = NYA VOL 1 DISC 0 EARLY YEARS 1 (NYA Volu | V | 0xF4EE61ACB4014C0BB56A2D2290D4D2F3 ; MKBv10/FindVUK 0.96 -0xAC8B9DFEC3805111F1E3D3BC45B791A232107F73 = NYA VOLUME 1 DISC 2 TOPANGA 1 (NYA Volum | V | 0x3FBD5818344E2A1E4EF665E74B9C5BE0 ; MKBv9/FindVUK 0.96 -0x82044D7FB79EE0C7575213051A18FF8B1E75585C = NYMPHOMANIAC VOL 1 | V | 0xD9E32B67E295B649DB1DBE0725172C8B ; MKBv46/FindVUK 1.00 -0xBE43D06A42F6EC0EA15524BB6EB910E3E45D4346 = NYMPHOMANIAC VOL 1 (Nymphomaniac Vol. 1) | V | 0x511D4026BCA362FBF1B11E3F9AFAD50A ; MKBv46/FindVUK 1.02 -0xB592408CE933E4534283635C69AFF3E8B95C7940 = NYMPHOMANIAC VOL 2 | V | 0x40F41447C8B4C633D8A8F80904D038A1 ; MKBv46/FindVUK 1.00 -0xFC5C356A9B24EAB2F569DF409379B8BF4D2B9F02 = NYMPHOMANIAC VOL 2 (Nymphomaniac Vol. 2) | V | 0x8E15F63D879A4312E543F64BEC9843C6 ; MKBv46/FindVUK 1.02 -0x821E34E81764A19ADC5E6CE7081AB06C44FF7270 = O APOSTOLO | V | 0xEBD47ACEE43A7D30FDDE8A047781D9F1 ; MKBv52/FindVUK 0.81 -0xA9A97E8CAE4A2084A8779DD850FC564C2ECAF32F = O Codigo da Vinci | V | 0x3855B7686CAA9FC6ECFEFB7E7826DCD6 -0xBE37DECCC5E88A1F7F91E155275D76752B44FC58 = O FABULOSO DESTINO DE AMELIE P | V | 0xB4F4026345EA5AFED910079440C22D5A -0xABE513AD540AC04DE86A799680748DFC758BA4AA = O Leitor | V | 0x6B3551E7675593F574D7F6F23C3A92C7 -0xE5ABD5BD9E5CE628DE1912B4C2E2ACD887E58F03 = O Lutador | V | 0x777D7ADB685EB6AA549DB740248B4B5E -0xD5ADD2D4613D58CD9B6F8F3D0118197AE8954E6B = Oblivion | V | 0x0FF8460FD871964EB76595BDCB54C8BB ; mkbv31 -0x0CC599E10E5B81E88D706D7D08339071249E8CAA = OBLIVION_G51 | V | 0x30094D0631EF7943106EE37D28EA1D64 ; MKBv31/FindVUK 0.81 -0x6DEA94FB620586CF309C9627EFA6B38B79D8480E = OBLIVION_G51 (Oblivion) | V | 0xFF61C1A7C9E1A357266C82F1E44576F8 ; MKBv31/FindVUK 0.83 -0x6B8F70B6125BBB2A1D0A14D79367572618E5ABA9 = OBLIVION_G51 (Oblivion) | V | 0xD4E531E30718EA538AB25F16DEBA6FD1 ; MKBv31/FindVUK 0.92 -0xF31DBB2344A82F74ABDD7386F4385ABBD87E7E89 = OBLIVION_G52 (Oblivion) | V | 0x878798BDEA81F8C11C4F0B12B2B4B49C ; MKBv31/FindVUK 0.91 -0x03050617320359FA088C180D907E025CD221BA0B = OBLIVION_G52 (Oblivion) | V | 0xF70412F7FD6936F3E6A981D977CCC8C9 ; MKBv31/FindVUK 0.96 -0xD4E677978EBF9548A33BD2591015122AD2822F8E = Oblivion_Island (Oblivion Island) | V | 0x26D870FF5D48AB6129463DC344FDC494 ; MKBv31/FindVUK 0.94 -0xD98A5BB89239139886868E64F1830E66072DDB12 = OBLIVION_NA (Oblivion) | V | 0x865FA48E37F62F00C284B9637717136C ; MKBv31/FindVUK 1.00 -0xEFA2D19FF1FB00E7AF90496D4EA361DE036A967D = OBSERVE_AND_REPORT | V | 0xED67E698740BFFB70C02483581DCE77E -0xC218B7969D8BA3B8B734B19898F1736FA6CC1CCC = Ocean's 12 | V | 0xFE5A2C7CBD787D939F0A8F1A8BE22F4D -0x0D0EDC3C80D6FC026080532FF46F9A0558679467 = Ocean's Eleven | V | 0x77CA810FB8268BAEFF5CEAEC505D8580 -0x5FB8981FC0AA341EDD11323F5E6A59DB82DE2EC1 = Ocean's Eleven | V | 0x19C9BA2CD08E35EA6A176B192D059492 -0x9F1DE9E750BFF937B9356C0B2BB083FA2F4E89C0 = Ocean's Thirteen | V | 0x8D4BC39DBA159EE4D92042F0B9F3152D -0x31B0E62176D8B175DB994B5543A9FD1CDB2E35A6 = OCEANS (Oceans) | V | 0xA879B2643A585F03C8CE2397CE0EC120 ; MKBv19/FindVUK 0.98 -0xEC0B5D2EE0F0EBCBD840DD30B60865964E7F34E2 = OCEANS_11_1960 (Ocean s 11) | V | 0x881A31756E349D13BF22999478180A3F ; MKBv17/FindVUK 0.96 -0x6ABE0AB143D6E4BF567B2764433CEA6ED63928D4 = OCEANS_12 | V | 0x446912C938B9841B9378833E8E7C827E ; MKBv4/FindVUK 0.94 -0x340C0F5FB8C1B4D08792EA5232CD59189F4F1223 = OCEANS_ELEVEN | V | 0x10DA543A24C7A4AA87DC95C086A7DD5A ; MKBv4/FindVUK 0.94 -0xCD432BE2785B1F2786E9E63A30ECF2414EF7D170 = OCEANS_ELEVEN | V | 0x98C867BBEFFBA33F2154C447CBD94E18 ; MKBv4/FindVUK 0.98 -0x137D262F041CC0E571136DD451FD40A6D4DD1CA3 = OCEANS_ELEVEN | V | 0x252DB62C9B6037E1704635DE805FC51A ; MKBv4/FindVUK 0.98 -0x1D847331B497916C0DF2ABC8858CB5C68B774324 = OCEANS_ELEVEN | V | 0x4FD8D102ABE3068DDB5133619B211767 ; MKBv4/FindVUK 1.02 -0xAEB80426BAF342EC565C248FB215FB829420A57E = OCEANS_THIRTEEN | V | 0x4F1C238D44915B607DCAABA6F9577580 ; MKBv4/FindVUK 0.98 -0xDB2F0539C7854C1AA31376E57D3E872857477F89 = OCEANS_THIRTEEN | V | 0xE806F187D1375280F3A871B8DC73821D ; MKBv4/FindVUK 0.94 -0x0F25A4782BA6FF5F3815E9C05C7AA95936E0EEC3 = OCEANS_THIRTEEN | V | 0x55CD183CDE9215C279A3C9EDC3DDFA5B ; MKBv4/FindVUK 0.96 -0xCBA37148F1EC26940D53267E5144D5CA98803899 = OCEANS_THIRTEEN | V | 0x4B891BD19E3E16775462E81F85A3C67E -0x2F53E21CD069AFC19C4F4AB71E6BCFE0EBB1F20A = OCEANS_TRILOGY_COLLECTION (Ocean's Trilo | V | 0x7F806DF64D458117C798E42591F34345 ; MKBv36/FindVUK 0.94 -0x0D41DD2D883F93E67CB345E9805C7332F329656D = OCEAN_3D_BD | V | 0xA5B8978CF874467CEC9BF95A17ACF7BD ; MKBv19/FindVUK 0.80 -0xC5B3FBADFF7A3C48BB39CAD1F6B5384CA56D568F = OCTOPUSSY (OCTOPUSSY) | V | 0xADFE99E90718BE52225E0BD4CBD2AAA2 ; MKBv28/BD+/FindVUK 1.00 -0x486E6DB6D80D995BEA53BCE96B1515C094A8B5AF = OCTOPUSSY (OCTOPUSSY) | V | 0x95D3F8F1C79257B96F37A7A70EB3536C ; MKBv28/BD+/FindVUK 1.00 -0x65E42ACF67C02E84ED265EDCE60FD2A76C442F3F = OCTOPUSSY (OCTOPUSSY) | V | 0x83DEFDD8014F851448AC167C9E4B1509 ; MKBv28/BD+/FindVUK 0.99 -0x40F7DFC5FF39B00EA5373D142171FA53A3AED9D9 = OCTOPUSSY (OCTOPUSSY) | V | 0x550B51D2C9CE4BC1D10015975A980C01 ; MKBv28/BD+/FindVUK 0.84 -0x23B8FD6A4119790D4D256CFA34916212C5E41788 = ODD THOMAS (Odd Thomas - Blu-ray???) | V | 0x6661CA010DD5132B7CCCFE258FCB29DC ; MKBv44/FindVUK 0.96 -0x798E80ABD508D610539E8A2E29F212B391A46D3B = OEDIPUSSI | V | 0xA50772A16491557D4ADCC5150DA76D1E -0x7671F8E7922497BCC573A4F571945D0C85CFB8AE = OFFICER_GENTLEMAN (An Officer and a Gent | V | 0xB1C3DD0C4CFB7148516CF5186232871C ; MKBv36/FindVUK 1.00 -0xDBA4C48A56310550CD3D56D4444B3D975A2A34CE = OFFICESPACE | V | 0xB8F34730B4EAE4D9DE114EF7EAF6CBC8 -0xEF82E6EF9325DDBEB4D2F32DDEC1A20B5927922B = OFFICE_S5_D1 | V | 0x1E6536AABA95343E03449F317E57019B -0x8DD0D61859E678853FD53D565E016E9F4474EDB4 = OFFICE_S5_D2 | V | 0xF25984D1B7921B4AE1D18ED85C21D322 -0xDA2DCBE936B7039782C8CC25592140984734C7B1 = OFFICE_S5_D3 | V | 0x576F823A009CB118E043ED7CB0017BF4 -0x4336B304218DDC4B7971BB2A555BAC63D3688821 = OFFICE_S5_D4 | V | 0x9229289C6D6626678CECDE8701B9DD51 -0x30CB3D742851AC8D2F5BF0D87F433A7DD223BDF8 = OH BOY | V | 0xD1814AC0B932187FDC4A6F4E0095C443 ; MKBv35/FindVUK 1.00 -0x161045FFF0BBA6E93120B00E809691E4D576D6EC = OHNE LIMIT (Ohne Limit) | V | 0xE3D4B508325061BDA97DDCEDEE9EC122 ; MKBv25/FindVUK 1.00 -0xA926BAAC5186BA276B69DE112BEBC8D922EC63FB = OKAMISAN_DISC_1 (Okamisan Disc 1) | V | 0x6146F31052E8F01FC771C81439182DD4 ; MKBv26/FindVUK 0.92 -0x9F91B079E4AB3CFEA903D0CB32040CDEB8659B8C = OKAMISAN_DISC_2 (Okamisan Disc 2) | V | 0x7D5CA9E9EF508BC144FC4A1211C13D17 ; MKBv26/FindVUK 0.92 -0x21271D38A226D77C194CB8883CE94D55CDDF77CA = Oklahoma! (Oklahoma!) | V | 0xCC8B8A3BE14D379C13F913FEF7EE2C96 ; MKBv35/BD+/BEE/VUKNOTVAL!/FindVUK 1.00 -0xF3808B627A2956144346E8C449BB5E757749717E = Oklahoma! (Oklahoma!) | V | 0x9E3F5023587E53E80773979190D76F26 ; MKBv36/BD+/BEE/VUKNOTVAL!/FindVUK 1.00 -0x482534F7301D357363C0D1EAC3BB2819895FC415 = Okuribito | V | 0x775EA6B68BD1EA9001BB9B0087037476 -0x610989DD3813C2D7B0F8E318CA3BB520D0ED48BC = OL0xD1AAE1 | V | 0xE62D8656F6A4060EE89C74203A133D14 -0xC4318752DEBF9F9B5BDC86B5E019CB8E77DF6640 = Old Dogs | V | 0x5405191E31B7B3F8AD4AC23CE680CF78 -0x380F9559465D5E74F3871C9E91CFB0A83C5935AC = Old School | V | 0xC2FCF2A4C26F0BE3F1D0C9C6806F47F3 -0x29AE638ED5AF4D3B8F8F3A1D36EC59BB089DF32C = OLD1EGE1 | V | 0x6EEB1EBDE6E312B31EBBF61DDACFF4CC -0xBD9A1EC40AD4A508A317AD048F6E44CE899A0B06 = OLD1NNE1 | V | 0x0D38C7AC34189BA64487E5B27ABB542C -0x962A176897790C50F5EC7B795BDDE4FBCFDC2A68 = OLD1NNE2 | V | 0xF7B1AB13A40938613EB3C6207D64B0F6 -0x52FA77FB760C9A0A7C3E262CDE503B1C5CB99A15 = OLD1NNE2 | V | 0x87CFD7541B25DB19C0E91D617E996085 -0xBD6DB8B65BCD36865C928E620BC4B6CB4992C5A2 = OLD_SCHOOL | V | 0xFDB760156891C99E21EB7F3516B48B09 -0x0EEC314845EAA3EA4B72A2868948AB0E76D0EA14 = OLD_SCHOOL | V | 0x9AA98FC65A87BCFC17260E9AEA06F6FA -0x16E82E19E107D0EAAC112E83CB1FA2AC641156FA = OLYMPUS_HAS_FALLEN (Olympus Has Fallen - | V | 0xAFF9E07E1F89796A1C5B5C0EEC0FE82D ; MKBv38/FindVUK 0.96 -0x1178B8E690C82727192FB4FBBEC0B28925A79389 = OLYMPUS_HAS_FALLEN (Olympus Has Fallen) | V | 0xBFC7D52C9A56D6BA7A5F45C91D35D3C2 ; MKBv42/FindVUK 0.89 -0x59A8EB9094C4A46883FE1FE31BDB88A6F12BED36 = OMEGA_MAN | V | 0x36DFB42DCC168C9A942EE8487198527D -0x68E5E323ED8911C0F813FF4C2FA6E30741202423 = OMEGA_MAN | V | 0x29A03EBDBD9A9EC87932A752BF1F792D -0x3DBA31770EDA59A5F44EC8CB435AE7ED257F095C = OMEN2_F2 | V | 0xD07EF8E0D6B703331C846985FCE26348 ; MKBv9/BD+/FindVUK 0.98 -0xF88954662C1CFD60DAA5098F28922B1748CE161D = ON HER MAJESTY S SCRT SRVC (ON HER MAJES | V | 0x3468C6F9AF1ECDB5F7C290A38422E5B0 ; MKBv20/BD+/FindVUK 0.96 -0xA55C73E1654C7BFA22FF3530B83CFFBD27443B78 = ON HER MAJESTY S SCRT SRVC (ON HER MAJES | V | 0x5DDE57EB007ACD0D80B1CD3FC187596F ; MKBv20/BD+/FindVUK 0.96 -0xEB1E56174F59BE3F28E63946DE14AC1A23F4BD87 = ON HER MAJESTY S SCRT SRVC (ON HER MAJES | V | 0x72853336871B8B2DAC3A441D24E5872F ; MKBv20/BD+/FindVUK 1.00 -0x696BA2AB7FF32237D06245C42271B7EAB80366D0 = ONCE | V | 0x23EC1490B6101F5B4C2473A5D35B8593 -0x1D2A106D16059A12F713ED1568731F120B46EE5D = Once Upon A Time S1 D2 | V | 0x2BF8A3C27D0F4050D94009BC27E1F213 ; mkbv25 -0xFB34C6D4C1447CCCC51CC2F304121EF513EE3A75 = Once Upon A Time S1 D3 | V | 0x1717DCAB749F2A85DBE06258C2FA73CE ; mkbv27 -0xCD352CCE4B0F826FFA8528859AC7CDC5A066ADD3 = Once Upon A Time S1 D4 | V | 0xB275A704A8B3C398FDFEA19EFACC7FE9 ; mkbv27 -0x54F58C9E51C2765B8EA85D00A50B7F151CBB2787 = ONCEUPONATIMEINMEXICO (Once Upon a Time | V | 0x276651882DE3B6C2EC7E674127564781 ; MKBv19/FindVUK 1.00 -0xA0239475621CFA12EF88DB23954D30B283E3FD90 = ONCEUPONATIMEINMEXICO (Once Upon a Time | V | 0x07BA84E7AC0CFAFE941E22B484B9A963 ; MKBv19/FindVUK 0.96 -0x3F8BC9F561B3C6970D3FDE8AE4BA7B2ABBFA635A = ONCE_UPON_A_TIME_IN_AMERICA (Once Upon A | V | 0x501C4497AE0D5C21174B9704156341A0 ; MKBv19/FindVUK 1.00 -0x96503AD82C0CF38391FCE5AB6645F065731508F9 = Once_Upon_A_Time_S1_D1 (Once Upon A Time | V | 0x92CC670BC5F31E75909BC21134F9AB7C ; MKBv31/FindVUK 1.02 -0x9CB6519AA57A5A823F936F37DC0DAF0248A86276 = Once_Upon_A_Time_S1_D1 (Once Upon A Time | V | 0x1A5681B649877033DEFAA44F8A2B2FE2 ; MKBv28/FindVUK 1.00 -0xC3C80F1BB3C0A322A17232FCA6CEBFFCAD7B7964 = Once_Upon_A_Time_S1_D2 (Once Upon A Time | V | 0x15D645A5BD6C76EAF38C5710504A07FC ; MKBv25/FindVUK 1.00 -0x6448FC59F21EDB7CED2ADAB3546BEE75ADE528F1 = Once_Upon_A_Time_S1_D3 (Once Upon A Time | V | 0xC6763A5A9EFD1B834BE5DA6536042844 ; MKBv27/FindVUK 1.00 -0x210F3EC3D4C10FDFF00F82B7E61F96426D265F88 = Once_Upon_A_Time_S1_D4 (Once Upon A Time | V | 0xCE6EADDC3013F566141CBA246CBADE75 ; MKBv27/FindVUK 1.00 -0x72A449EF4F17CA1D326F9F6EF2A8ABEBC5BD6A3C = Once_Upon_A_Time_S1_D5 (Once Upon A Time | V | 0xC9785BB8E3A4B51E0186B99D7A94CA34 ; MKBv27/FindVUK 1.00 -0x57E43435B6D97C74709FA28BAF92B002B2115477 = Once_Upon_A_Time_S1_D5 (Once Upon A Time | V | 0x5D3F82843DD9B05559C51B70D514428A ; MKBv31/FindVUK 1.02 -0x2740B94F754E59874426B7E648A21F13A3ADECEF = One Day | V | 0xC62BF74FA72071A02D831ADEF14BE067 ; mkbv25 -0xA6EBAF51E69AF1D5E3A8E82E56166BCDFC2C283B = ONE SHOT ONE LIFE | V | 0x3517043AA1397ACD2F15A5587D1D0811 ; MKBrev 44 - FindVUK 0.57 -0x9E9A3131497BACF79A742BB9153283006F1E44FA = ONE_FLEW_OVER_THE_CUCKOOS_NEST (One Flew | V | 0xF9DD8D9FAD92D6B4ABFCBA951824CA0C ; MKBv17/FindVUK 0.99 -0xC49A09BDB00F62B1CD59928CDAE8B456B2AA9F61 = ONE_FLEW_OVER_WW | V | 0xECE39D48959508C21F0EF8F3D6851FC5 -0x5416DA05F59300F6C58BCB0CC999BE9D359D83C5 = ONE_FLEW_OVER_WW | V | 0x314B1D71FB9306A8D15ECC3C8C05F1B4 -0xA6AB0D050DFF414BADF1CF5CCD07C999E81ACEB6 = ONE_FLEW_OVER_WW | V | 0xE4F1EADCB9EA44E8D364A0600DC1E430 ; MKBv7/FindVUK 1.00 -0xA019D5435EF27816BA7ADF228011B7A23646E876 = ONE_FLEW_OVER_WW | V | 0xBAC1CCB31922B50CA5C3D9DB0C4F8809 -0xE3E92A0EAC9B114A00D23EACAAC9B5325E14B6F8 = ONE_MISSED_CALL_NA | V | 0xB199CC33F0D4DAA3738A248BD47F1F04 -0x8915ED2376BDFA22CCFDE5EBFFC94A5F0A93FD34 = ONE_NIGHT_ONLY_BARBRASTREISAND (ONE NIGH | V | 0x48210391D2BD3945BF9E00DE446A4108 ; MKBv16/FindVUK 0.96 -0xDF2D7F8CCAEBFDD48BF1268BB228301C946BA62F = Ong Bak 2 | V | 0xA86C3D5AA1838F87368730E54EB3962C ; mkbv9 -0x12E1B52CCAE2513876412994A943FEF4DE92838A = ONG BAK 3 (Ong Bak 3) | V | 0x859591B7FF3AA973F314351D94B973AE ; MKBv19/FindVUK 0.84 -0x9AD77E86321EDB22094328F3F435D531147DE953 = ONGBAK | V | 0x87DF83E352C86AB76B3E02A313B621D8 -0xD66F1A1EF9C6580C6C5998561B7FF236D63D6D25 = ONGBAKTHEBEGINNING (Ong Bak: The Beginni | V | 0x2368606B3D6FBAE7B82677B034EF2019 ; MKBv16/FindVUK 0.84 -0x9AA9789007AA4E64198F97C3BFB93C811948AFCB = ONG_BAK | V | 0x94D7D3235BD56FFBC96D9AC32CF07D49 -0xB93E6E97ECB819145209ED1C178C63E7474AD9D0 = ONIAI_CS_D1 (OniAi_CS_D1) | V | 0x56A7AEBBF8DA79BCBB5729F7095F613E ; MKBv42/FindVUK 1.02 -0x5C6C1538231A99289326C753F64A0D5170EDCCD0 = ONIAI_CS_D2 (OniAi_CS_D2) | V | 0x6D68227BD0945BC172592BB15893088D ; MKBv42/FindVUK 1.02 -0xD5B2BD58E2948CAB4F3AFDCB6D33BAC1841E302D = ONIBABA (ONIBABA) | V | 0x6818C6C23B09093796F49D874D59D655 ; MKBv33/BEE/VUKNOTVAL!/FindVUK 0.98 -0x1E25D20D59BE72D9D6CC01877472A97ECE154E70 = ONIMONOGATARI (Onimonogatari - Blu-ray?? | V | 0x528B231C8BE684EC35F2DF0B65AEE554 ; MKBv51/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0x00F3C971A4617183961FFA95F474D3AECCF0E614 = Only god forgives 3D (Only God Forgives | V | 0xE3186067AC9750E4D5101E79B87CA30E ; MKBv43/FindVUK 0.96 -0x45D95A7FD166D3001B035932CDDC2065AAF9FFFA = ONLY YESTERDAY (Only Yesterday) | V | 0x69B97B71B26162A574FBE51C9EAFB594 ; MKBv61/FindVUK 0.98 -0xF29137FCEEB96CA6CAFC3B1B130AE9EC783F33F6 = ONLY_YESTERDAY_NA (Only Yesterday) | V | 0x7A94E1A5F5D966509B46CB2F7EC16B2F ; MKBv56/FindVUK 0.92 -0x0C4A7BBE9370D118918F9106F3111B26DEB2B4F3 = ON_THE_ROAD (On The Road - Blu-rayâ„¢) | V | 0x5CE89EA21EF258BEB589603925FC2890 ; MKBv38/FindVUK 1.00 -0xE44AB7C69B84EBAC498ACC1D22593D16533EF596 = ON_THE_WATERFRONT_D1 (ON THE WATERFRONT | V | 0x07AEE1521CAD9B043E9F4F134739EF32 ; MKBv35/FindVUK 0.96 -0x5B897641EE16F7F24154560156EBEB964D5A899A = ON_THE_WATERFRONT_DISC_TWO (ON THE WATER | V | 0xAF5A814CC9C681CA344A44A3894F52B7 ; MKBv35/FindVUK 0.96 -0xEE125D9E3427D54D266109A79A18AF5DA5C69379 = Open Season | V | 0xDEF063926DC5E4C7D3719C1C89979F38 -0xB6DE3C5D97A4B58FFF2FE0AE2CB37DE2AC87B2C3 = Open Season | V | 0x9C1968B2DEE85B5ED627E08959BA6691 -0x55B2080C53D5DC3BE1D7B85C596E0689338F9A4E = OPEN_RANGE | V | 0xE6338B3BEF5C04DDD8DFCC3EDC156E22 -0xF1628A63E88B8A61DDCA1669C587A03A9D8E37C3 = OPEN_RANGE_BD (Open Range) | V | 0x477696ECE2BEA1F3AA3F19F9EA47B673 ; MKBv18/FindVUK 0.96 -0xD04D82A8F18EBC55C757FC09F2AB2F705C6CE397 = OPEN_SEASON_2 | V | 0xF046A345A356ADD1D6AB229F743B58CE -0x5AABCEEC82A6D7DE5F12CFF25EFCCC24E623FA86 = OPEN_WATER_2_BD (Open Water 2) | V | 0xD31CD8ECCD4B0420BCF9BD1A51405067 ; MKBv19/FindVUK 1.02 -0x77A3AEEDBD798481A71C0E764C9C59CB8ED386A7 = OPEN_WATER_BD (Open Water) | V | 0x79FC5003AAAFF95F228E0577F2EBCD4B ; MKBv19/FindVUK 1.02 -0x969D6BE1EFC9B53FCC3005C884CCD00ED2FD3BFA = OPERATION_NUSSKNACKER | V | 0x6D75B95B9F6887C13BB660F62AD55FB6 ; MKBv47/FindVUK 1.00 -0xA7390DED5EDC5AD8783E819BAC6F0566DBA528F1 = OPERATION_Y | V | 0xC517407E0356F42B7D9A294AF31B9181 -0x42F267611EE09510008A3F791EFA27D830984F91 = OPERNGALA | V | 0xE5B0DB9E01968A4575FA449106D0ACDE -0x6F1B2420F5DFD1E303255C1BBAA91EF8E528D371 = OPPAI_VOLLEY | V | 0x1548A892B610574BAA472340B0C73F8C -0x153360AB5873A83C2B0EB27B1B841D3269917B25 = OPTBD1850 (The Extraordinary Adventures | V | 0x90B0CF215988DA5E0340FDC8A448AF26 ; MKBv23/FindVUK 0.94 -0x9B18A86CE39A1BFA2D4A3B8E0CED00426010853A = OPTBD2753 (Paddington) | V | 0x0D47C6AD6690A4BCFEAC8547D816B44A ; MKBv50/FindVUK 0.99 -0x3FBA28CA9EA972E5353F1EF1DAF55D09829B7CC3 = OPUS ARTE PINOCCHIO | V | 0xC2174B785605E9BE2A961653AEEF881D -0xC48A0C91D42F89C73EB10F755C95723C2F78604F = ORANGE IS THE NEW BLACK D1 (Orange is th | V | 0xAE4DB2FCF0D6B75CD6441EA0F1A21125 ; MKBv47/FindVUK 0.98 -0xADFD5F5D1E2F4173CF3A5A72DFC6BFFD5F050789 = ORANGE IS THE NEW BLACK D2 (Orange is th | V | 0x45DCC649FC7D637F23808EB56B56C1CD ; MKBv47/FindVUK 0.98 -0x0BE267D3A33BB31F5A59D21FEF5CE522CAF84614 = ORANGE IS THE NEW BLACK D3 (Orange is th | V | 0xE4E7238F6CF770476D3BC3FBE450779C ; MKBv47/FindVUK 0.98 -0xE5C0D4BE11B9D685D03B5B3CD893E57EFAB2AFC5 = ORETACHI_WA_TENSHIDA_1 | V | 0xD051D1E051EABB4BD02EB1A8B4EA085B -0x59D3FF67C8C72397AB05BEBF29B66DCF58DA1480 = ORIGIN | V | 0x6B96047215BE8EE8ED3654AA6CBAE190 -0x6E463923242563A87DE4B11B9FEFA425A1CFFF43 = ORIGIN | V | 0x66350007B90956C8F18555F8151D04E6 ; MKBv14/FindVUK 0.80 -0xBDB3DEF93700FB68BB8C52187A795A19F47BB38C = ORLANDO | V | 0xACD813FA4A041442C57EE3E2B0057CEC -0x4F7D88DF32150555679BFB8C37B9596297E18C6E = ORPHAN | V | 0xCF2DA96CD31FE3D586D1621A10D17E13 -0xD3529F378EB133C10B103716E424D1A28BB741A9 = ORPHAN | V | 0x74613D392455BA630258FA2AE7092A5B -0x36A28248A455E656D693C03BF12AEB2058856B4C = ORPHAN BLACK S1 D1 (Orphan Black - Staff | V | 0x1372A2B6C7D895D1DA1369AAC7A450E9 ; MKBv44/FindVUK 0.91 -0xB7E0E4C1A65B76DA58AFD283AFD7A4A2D05FDE7C = ORPHAN BLACK S1 D2 (Orphan Black - Staff | V | 0xEE8974867DFA10B17CB81E9CAFEFFF92 ; MKBv44/FindVUK 0.91 -0xEB5CEFF8BB168756BCC966F82A86FB9D32531F99 = ORPHAN BLACK S2 D1 (Orphan Black - Staff | V | 0x70A76899579D40BA3F55D48C57E74575 ; MKBv32/FindVUK 0.91 -0x50B638D45C13EFA42AAF34D274FE4E6C1620F678 = ORPHAN BLACK S2 D2 (Orphan Black - Staff | V | 0x62DABA86C0311567CB00D3A65D9F6597 ; MKBv32/FindVUK 0.91 -0xC337A73F2654D97E356E10BAFF7557CD64CBEC55 = ORPHAN BLACK S4 D1 | V | 0xF9768D04A9AED964CD8420915E27BB59 ; vukextract v0.1.8 -0xBADB5741AF61C33922529FBB13AB0DB372F2A157 = ORPHAN BLACK S4 D2 | V | 0xEC4B2CE52E97C7EB724C933A26ACDD7E ; vukextract v0.1.8 -0x2C58032175A170895CAD5072CEB47F3B47A91055 = ORPHAN_BLACK_S2 | V | 0x38AE2E29AC327FBB814A6B9BCA050DB1 ; MKBv46/FindVUK 0.80 -0x9672D7A716EE6FE0BC958F02D725C6257B4BC178 = ORPHAN_BLACK_S2_D2 | V | 0x76CC8663EC45B85779ECACA7E4D21BA7 ; MKBv46/FindVUK 0.80 -0x7AE53E890D72B7FA6001E8E400BCF07C1E9AACA1 = ORPHAN_BLACK_S2_D3 | V | 0xEE4EF178AE8B6E2F31B90DBC893761E6 ; MKBv47/FindVUK 0.80 -0xD06D0B5CB02A4820753FF9A1F3212B5409EF8231 = ORPHAN_BLACK_S3_D1 | V | 0x6B7A597DE10CF52B25671CA1D436F372 ; MKBv54/FindVUK 0.80 -0x5F844C2A9910C454971F234522E1B70A71CF807E = ORPHAN_BLACK_S3_D2 | V | 0x45DFB5183101573D16FA514315DADC0C ; MKBv54/FindVUK 0.80 -0xA70FCAFFBB3401B1133412EA59B397B0EC78601B = ORPHAN_BLACK_S3_D3 | V | 0xA03097BE19898735249FE7D2A8456A04 ; MKBv54/FindVUK 0.80 -0x8526CA688C7FA277EADFBB841BA167725E2AFA4A = ORPHELINAT | V | 0x3933CC3D790859AFEC150FF6BEC9F44C ; mkb v1 -0xF45F55CC037875A6E62B2F71D282156228F206DD = ORPHEUS | V | 0x6156B4A0AACEBA9E8BD3271A237CA2AB -0x78D696170F1C51A2928FC46BCC25D34125F63FA3 = OR_NOIR (BLU-RAY) | V | 0x8B0C97139E5D28A3FAD78B993DDB0C74 ; MKBv28/FindVUK 0.98 -0xCDAAA8739D56D403D72547902D938504BD9A8BFA = Os Outros | V | 0x880329F0A7FC4AE01EE0FA2E5A262D32 -0x53EA37F4646702D22A580541B8A9C547CA82204D = Os Profissionais | V | 0x3678744E02EB653163D3CEDD9ED04BBD -0xAC61EFCAF951745CA6BCBB217CF10FC1E57BDCC0 = OSTWIND (Ostwind) | V | 0x8AE86E797ABA83B30C1B17DC445E26F0 ; MKBv44/FindVUK 0.92 -0x4C5DDCC8A48FD55E496AB7F01B605284EC395544 = OSTWIND 2 (Ostwind 2) | V | 0xE87BA494B4A85F7FBD0A4B7315B17CF1 ; MKBv56/FindVUK 0.92 -0x3A9832F0395919D829EFB44CBDA326AA157AF278 = OTELLO | V | 0x82887F3F5ADF93E5218149334523AB86 -0xE4738E4CEE90410434E2BD782A72B432490B38A2 = OTELLO | V | 0x31827E13DCC2B5B43307707034A6632E -0x89DF720F357B4B97F956FF29D71E6688CECDEE60 = OTORIMONOGATARI (Otorimonogatari - Blu-r | V | 0x58F792CD4E36A528CD144863D208F592 ; MKBv47/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0x360708EFFC89D5CDCA3F6FA4375FA968F10313B5 = OUJA48_1 | V | 0x05CA66E9968CD66421A01DBED4874021 -0xF8EB2C52DE12892F4CAF523E5E2C5CC9DDDF72B4 = OUJA48_2 | V | 0xF4D191D8FE034D1767F34021ECAA9428 -0xE9B0B190A4B2EA07ED09BB73BC64D409B6A35E6F = OUR KIND OF TRAITOR (Our kind of traitor | V | 0x529FF2E0E60166C07861724ED4FA08C3 ; MKBv61/FindVUK 1.00 -0x36EF85204218439ED2BCE77FFCB0E5910CDF4414 = OURAN_HOST_CLUB_D1 (Ouran High School Ho | V | 0x17803E1CCDAAFF25219D7E33CF3CA5E8 ; MKBv16/FindVUK 0.96 -0xFBB90940DEB248C7F73F33E69901497284D3AA08 = OURAN_HOST_CLUB_D2 (Ouran High School Ho | V | 0x74000099CDCAECE8DB50DF62833C14EB ; MKBv16/FindVUK 0.96 -0xCFEAA70D4FDDB5A312FDF13EB6021EE057A88B92 = OURAN_HOST_CLUB_D3 (Ouran High School Ho | V | 0xC94E33BAE1769E85D790F87775B87012 ; MKBv16/FindVUK 0.96 -0xE1C7EE26052E6AB4B587080BE926B2559D88DCFC = OURFAMILYWEDDING | V | 0x2D9722C90F2FE48DCE000FDD09577411 -0xB14EE7A72C8CF04DAFBB92BEDCAE6B5B091D0889 = OUR_BRAND_IS_CRISIS (Our Brand Is Crisis | V | 0x47C46993F620321DA86BF1BD162B4B61 ; MKBv57/FindVUK 1.01 -0xDE8D1ED999D9A034CE94CAE0166CF306ABE242C5 = OUR_DRAMATIC_PLANET | V | 0x6292C479EA8DB896BF8D93C8F0C1BE6E -0xF999212F061C412E168797664503F7BEBCD50AD3 = OUR_IDIOT_BROTHER (Our Idiot Brother) | V | 0x617D804FEEBD08AD9524854BB6C6D486 ; MKBv26/FindVUK 0.96 -0x422ED9EE704F58A4278ADF4BDE8A56DCC57DAB4C = Outbreak (US) | V | 0x93E473027AC3ACBB6AA16BB01C01F401 ; mkb v7 -0x60330C5C3005063BE9E92C64723C346AAEE34A0C = OUTCAST | V | 0xF448A2F5177BBF0131E5B9D820176971 ; MKBv50/FindVUK 0.92 -0x9BF26AF714BD6F03A6F81DAD08AD4577FC0B9072 = OUTLAND (Outland) | V | 0x2DC08367EC9B9AA1B333BD07934EC9F8 ; MKBv27/FindVUK 0.91 -0xF034D36F87BC73DC3859C073FFBBF2A68241E68B = OUTLANDER | V | 0xF50618C39CD9524FE4A92BAC780978CE -0xE022347B17F7CC1445D8CAA6B10455C2E1D66FD8 = Outlander | V | 0x07D43822FE9F67221EF26EE0E11CC2DB -0xDDE49C8C4C3DBCD2F2C2477CBA30B2F9960721F5 = Outlander | V | 0xD87BB4CD0AF8EAF41376275D7CD5CB03 -0x25B4211D7C8A6AC000D049D8D3CD7B8E2C4EF1D4 = Outlander (2014) - S01_V01_D1 | V | 0x9A7C7BF2BB90FD24BAAA7F8C49999752 ; MKBv50/FindVUK 0.80 -0x7A1CD6AA60F9A81F0CF198A39AE020EFD4F06045 = Outlander (2014) - S01_V01_D2 | V | 0xB56324E1FBB5726EA9761F0A14F89972 ; MKBv50/FindVUK 0.80 -0xE2DB4CB442FED68D8A79626CF32F4F20B83B1125 = OUTLAW_JOSEY_WALES (The Outlaw Josey Wal | V | 0xCFCFA874B71FB460145751FF36C84BD5 ; MKBv19/FindVUK 0.96 -0xE8AC5866E83D18EE77EC1C0F82D219F21E1C9D79 = OUTLAW_JOSEY_WALES (The Outlaw Josey Wal | V | 0x8C0DE0DAA247216AD8E3506D130BAD7B ; MKBv19/FindVUK 0.99 -0x104EB94DF64E0869276940618C277EFE6AFFB3A3 = OUTPOST_37 (Outpost 37) | V | 0x0FC2C2F6642270B3BE2C271AEA09B529 ; MKBv47/FindVUK 0.95 -0x54D8CE48A30151D08164FEE964ED4E7BA5C05664 = OUTSIDERS | V | 0x3A7B0482B8D0C11218FC0CD420BA2F97 -0x4A1F11D39BA6A5DE5653F8598B380E1C1EAF313E = OUT_OF_AFRICA | V | 0x5C36F703DC12F0957DDD250473BF625E -0xC0DF865F8B1288B217E3C5DA2D8C56E2B86CC79B = OUT_OF_SIGHT_G51 (Out of Sight) | V | 0x2C944A7255CEC7B0B64DF722921A7A60 ; MKBv21/FindVUK 0.98 -0x6E9FD0069DD967F58FD9BE1C4F8085DDBE44061C = OUT_OF_TIME | V | 0x46EDC2F1C45B91EBD38E89537E77CE58 -0x9B67B3B227A106DE90CD701377FF01994685FB55 = OVER ALASKA | V | 0xC2F4E151AF9BE980A8A6082FF0E0C3E1 -0xA952CA5E7B4A9C6CE2F377560BBD9F439B4BBC7F = Over Ireland | V | 0x2177024D0C718B0D56B49CD952F9CDDA -0x04757E6B7CC8627B2BD0534CEDAFCC0379313A43 = Overheard | V | 0x6BF2AC03E616A3F75945F0E3CC18A2EB -0xB93A93705AFC0CDA9CFA6280F8C0F96C486680E8 = OVERLORD (OVERLORD) | V | 0x84C1EFA1F7F9970027A8300031E6483D ; MKBv46/FindVUK 0.96 -0xAA2B155BD6327B1E813CDFE360CF179CF3DED21D = OVER_AMERICA | V | 0x0FA1C06C1853F4C73AA2D69D5EC4A8D7 -0x06409A50F2C84425AAFCFC4793D9885B27881447 = OZZFEST | V | 0x1796EC808B338962B519319B6E200BC4 -0x845B99ED334947BBEEE7A2937B2AB1C5B1B180F1 = OZ_GREAT_AND_POWERFUL_3D | V | 0x5272A4129848F427309D0A98C5D7C0EB ; MKBv31/FindVUK 0.81 -0x86FDAF28D87C9432B7A37BEDE3D7EFDA2CBEFC11 = OZ_THE_GREAT_AND_POWERFUL | V | 0xDCE315917A37D849BE72A6DAD0182B56 ; MKBv35/FindVUK 0.81 -0x0979D19002C48FEE0862852BA6FDA00F8194987B = OZ_THE_GREAT_AND_POWERFUL (Oz the Great | V | 0x86660ECC55C4600ABE66CC199D3EEE5A ; MKBv31/FindVUK 0.87 -0xE615F742E9C8AB71EBE0CE0A2F5BD3386E5F0AE2 = OZ_THE_GREAT_AND_POWERFUL (Oz the Great | V | 0xA4314858D19BC72A41D806672E212732 ; MKBv35/FindVUK 0.94 -0x49E11D08CC3FBE62299162C25129F530AD4044C5 = OZ_THE_GREAT_AND_POWERFUL (Oz the Great | V | 0xD52A17824BAD5654B681DCE88275A94D ; MKBv31/FindVUK 0.90 -0x04D6E85BB19B1BDCF4F519DC85FE0782F1FC8B1A = OZ_THE_GREAT_AND_POWERFUL (Oz the Great | V | 0x1C9F80E3F720A73DB9EEC59AC46B70B8 ; MKBv31/FindVUK 0.90 -0xBCBA076B120563FED13C612E40A4E5A44E408940 = P0xB0911_1 | V | 0x20EF4410FEAF669A1D5B60A593011EF6 -0x4F28F2E38F4617E8C21B96907798A5B769F877A7 = P2 | V | 0x05A793A2D025E214429BF6F4642665F4 -0xD7FC556C66EF5EDFF3BB302A2856E2AA24763F73 = P2M1NNE1 (The Princess Diaries - Blu-ray | V | 0x089CBD2FD11B9B346EAB78E718014FB4 ; MKBv27/FindVUK 1.00 -0x69306FAB9B098606AAC3413FDC116E44FAD72FB0 = P9255_BDSE | V | 0xDDF1CBA7A72BC125336F794AC442B7D6 -0xD8E8D8F54D6FBD4EC8360D3492DF2A499594DC32 = PAAR_DOLLAR_MEHR (F??r ein paar Dollar m | V | 0x86EB23C5BD2F85F82D4C261A3252ACA7 ; MKBv37/FindVUK 0.84 -0x95CBD5EAAB8B33A3A0797E43069DED2B32D8926F = PAAR_DOLLAR_MEHR (Für ein paar Dollar me | V | 0xC687AEF244F0049D9CDA90A1847B7CE1 ; MKBv37/FindVUK 1.00 -0xF814380EBB600CE295C6D4CB531D6F6A6D8DEC8E = PACIFIC_DISC1 (The Pacific Disc 1) | V | 0x550DEAB4F684059B6D8C9419939D3980 ; MKBv19/FindVUK 0.98 -0xA32F3CBF4359D37FF6B19E9AFB1DCB55E6B96336 = PACIFIC_DISC1 (The Pacific Disc 1) | V | 0xD7E4C317DDAD6065E6C250291F2554C7 ; MKBv17/FindVUK 0.96 -0xBD315065960C3AB475405CB92338D4705EAC5836 = PACIFIC_DISC1 (The Pacific Disc 1) | V | 0xC9B99E9A23A6A9BCEF7DA4F6109AE2A9 ; MKBv17/FindVUK 0.96 -0xB0F57504D628AB120470D0936767527E02EA04B5 = PACIFIC_DISC2 | V | 0xDD655335653A229430A8C4707833D7AB -0x2F9DDF2DD0BD54279958D8AF13258F8695039069 = PACIFIC_DISC2 | V | 0x64E49CE8A65A17EBC439272C93BA8468 -0x5B43F284B83E6B44F2C7886A80F7FE7A7F940522 = PACIFIC_DISC2 | V | 0xF9F5043D5164C63FC7D980159F07E3DD -0x6A86ADF3D1EB8B59C62FD79B72C5FF4C1E1C2601 = PACIFIC_DISC2 (The Pacific Disc 2) | V | 0xA6FAAA74EAFFA18D8C2C8B338DC5DC62 ; MKBv19/FindVUK 0.98 -0xC61B6F529987301AE28C800B4CAD1E0CC4FD1FC5 = PACIFIC_DISC2 (The Pacific Disc 2) | V | 0xDF7C0074B352D090046BF75AA41623CB ; MKBv16/FindVUK 0.96 -0x11D8584DDDD8C83B365145E0C6EAC9D099E96A05 = PACIFIC_DISC3 (The Pacific Disc 3) | V | 0x777690E71D6EEC7AD2C6F8E5367A7F12 ; MKBv17/FindVUK 0.96 -0xF6860F47117B2B6AB1A74BBE808B3A1203488228 = PACIFIC_DISC3 (The Pacific Disc 3) | V | 0x88C95684DF733E925607E37A2FFC12C5 ; MKBv19/FindVUK 0.98 -0x55D664A670F9A3D5D8EA0BA93C5208B1FCFED376 = PACIFIC_DISC4 (The Pacific Disc 4) | V | 0xA5F23049107057614DAF33DBE2A5FD22 ; MKBv18/FindVUK 0.96 -0xBDEAFEF512556BBB4DCC037063C5B9AFE0C281EB = PACIFIC_DISC4 (The Pacific Disc 4) | V | 0xC59EA30819139612E44D24829C0B7AC0 ; MKBv19/FindVUK 0.98 -0x3AD4A5B648B31B8B10C58DDA7ADCE60AA729ED1D = PACIFIC_DISC4 (The Pacific Disc 4) | V | 0xBD1DDADCE023C2B409A77874BABA2BC4 ; MKBv18/FindVUK 0.96 -0x825DEB4FFC173BC0B39E6BF43DCFC6290BBD2F98 = PACIFIC_DISC5 (The Pacific Disc 5) | V | 0x433080018BDDCC9F68605D26E7A2DEDC ; MKBv18/FindVUK 0.96 -0xB1FD786B97F78F21F6F85B0E6BE53B831BD4A9AB = PACIFIC_DISC5 (The Pacific Disc 5) | V | 0x98B173FDDBAB315747768ED393CF24E0 ; MKBv19/FindVUK 0.98 -0x54D298901B892AB0BD465D79AEA10FCEAAA6F7BA = PACIFIC_DISC6 (The Pacific Disc 6) | V | 0x6CBD4CC497CF8CC71019DBEAEAD63C47 ; MKBv19/FindVUK 0.98 -0x109B9CC39E6D095C3D36888F2D70AA19F9F461E6 = PACIFIC_DISC6 (The Pacific Disc 6) | V | 0x516ADFF3A81B80438F990E576539A10F ; MKBv17/FindVUK 0.96 -0x5A2C69374AA3060F6F561667210FAB933370D0C1 = PACIFIC_DISC6 (The Pacific Disc 6) | V | 0x79DA4E23D0E265530FD334444D28D5E5 ; MKBv19/FindVUK 0.96 -0xA9891F1D3D3F9E0FAE58BC3612544DC735C0DA8F = PACIFIC_PELELIU (The Pacific Bonus Disc) | V | 0xEA0AE9622D617134DD225D98C19D0DD1 ; MKBv18/FindVUK 0.96 -0x7C6C08B6BB021EFCE57529CE42B5DC8C10734426 = PACIFIC_RIM | V | 0x4A1A59CB4DD3F64122E8210C731EC6E5 ; MKBrev 36 - FindVUK 0.57 -0xDF588A1229246D0D33BBADF17FEA3C0CFB653E91 = PACIFIC_RIM | V | 0x09503536AD2E8FA962FFF324EBE96A3A ; MKBv36/FindVUK 0.81 -0x0B72CFDEBC96040F45EFDC04A93797794687165B = PACIFIC_RIM | V | 0xFC30EFA04A60F75F02201421814E4B3A ; MKBv42/FindVUK 0.81 -0x2BCA898506E60BE3625FB969D608B6964201F2B2 = PACIFIC_RIM | V | 0xDE697A02406AA6C7F878BE6C897067CE ; MKBrev 42 - FindVUK 0.57 -0xAE3F5EA31642C72D28CF25EA57CD09ED95283BE1 = PACIFIC_RIM (Pacific Rim) | V | 0x8924B20F923F927471F200E1E75CBACF ; MKBv36/FindVUK 0.87 -0x34B4E7CCF61E1CD9CC18B910AF01F97F27E26D1A = PACIFIC_RIM (Pacific Rim) | V | 0x0D4F81A8B1BAA65C75AAFBD3AA766AE8 ; MKBv36/FindVUK 0.84 -0xD6DE0EB6CA338DB3A5F8E6CE6C0584954D9DAE3A = PACIFIC_RIM (Pacific Rim) | V | 0x9F7B323BA26EF07CBB524FEFDDC3594A ; MKBv31/FindVUK 0.98 -0x78561614BD7EB145FE115FAE54732DD56EEC059B = PACIFIC_RIM (Pacific Rim) | V | 0xC7F64BF53EB7F6A26141DC3C6D0A3E7B ; MKBv36/FindVUK 0.98 -0x21AF3AA9E79B4672F6A6E5B09A457A9C5F111AA0 = PACIFIC_RIM (Pacific Rim) | V | 0xC321EF3AF19233BBDA41F2D9D0180F66 ; MKBv35/FindVUK 1.00 -0x6158731C8C5AA92369A0CB0D5DFE173C73268B52 = PACIFIC_RIM (Pacific Rim) | V | 0x26F154F3AA75EAFF46C99134EB3FDB4B ; MKBv36/FindVUK 1.02 -0xC9ADE815F6E2C57E3F4E733A8CFF2D21124B3856 = PACIFIC_RIM (Pacific Rim) | V | 0xC3B350D91E0D632FC557D279A394324D ; MKBv42/FindVUK 1.00 -0xA309FE2E1115AB999868C870C984697FC3D29008 = PACIFIC_RIM (Pacific Rim) | V | 0x967BBF192BA68534AFB65B1B750784F6 ; MKBv42/FindVUK 1.00 -0x4CDF83D83115C2C85A9E255FB4FF4D9FF58AC55D = PACIFIC_RIM (Pacific Rim) | V | 0x2D94468D6CDDBDB19B0DB58CF36569C3 ; MKBv36/FindVUK 1.02 -0x027241A99FA1C106CF92711DC0D16319CDEBBA43 = PACIFIC_RIM (Pacific Rim) | V | 0x95F22E26D3C33D0684ACEE1F9400E177 ; MKBv36/FindVUK 0.96 -0xFC98BD95B04D50D02013F03480FFD60F4F771102 = PACIFIC_RIM (Pacific Rim) | V | 0x28FF24FFF438610482415B833E7EC07A ; MKBv36/FindVUK 0.98 -0xFC1588AF30D065E6EAE380FA2FD48595ED1FA1CE = PACIFIC_RIM (Pacific Rim) | V | 0xCDBBC0E25FBAC3684F8249EAC0EA1724 ; MKBv42/FindVUK 0.96 -0x170D38A74A057EB82C3D15C7A25A4309D6B68EC9 = PACIFIC_RIM (Pacific Rim) | V | 0x7F0A074FF521ED62D112F33B4EA07AEE ; MKBv42/FindVUK 0.86.3 -0x86076C48C49CEBA9446C7B335ECBAA2C4BAF74BA = PACIFIC_RIM (Pacific Rim) | V | 0x1D068F725A5CA993D531C97D04ABD806 ; MKBv42/FindVUK 0.96 -0xC65F7F793A4FB6564FA02AA9C04A950CE30264D4 = PACIFIC_RIM (Pacific Rim) | V | 0xB743F7E8D875B5A50A71BDEE0BA334C4 -0x702A45EB804447E819B03E782B1B754B991339C4 = PACIFIC_RIM (Pacific Rim) | V | 0xACA2F4424C6681C49ED15A79CC7E0FA9 ; MKBv42/FindVUK 0.96 -0x9EA38FFDEA92126892446502B8CABAC2535A17A0 = PACIFIC_RIM (Pacific Rim) | V | 0x3F4485FF48D02A3E6896AA2B605A0DF5 ; MKBv31/FindVUK 0.89 -0x1CD0C259CB1D3DA9FA7D8310B4989D2F62938619 = PACIFIC_RIM_BONUS | V | 0xB973E8FFF319C8DCFA62DCE69574B8C8 ; MKBv31/FindVUK 0.81 -0xC9040A2BACCE1560CBBC9721B2505A90ABDC6746 = PACIFIC_RIM_BONUS (Pacific Rim Bonus Dis | V | 0xCCB88FA05267F0C6221C74899C875DB7 ; MKBv31/FindVUK 0.87 -0xAEAE99C567968E18BE12537FC40520890D448680 = PACIFIC_RIM_BONUS (Pacific Rim Bonus Dis | V | 0x1DDC3841F2B9B865D334B332F2912C1D ; MKBv31/FindVUK 0.89 -0x00A00EE4F55410EDDFEE5862E788EFFB3B1227B7 = PACIFIC_RIM_BONUS (Pacific Rim Bonus Dis | V | 0xA7647632D0B99DBD6F932C79F06420C8 ; MKBv31/FindVUK 1.00 -0x4FC0976A30C53795D3E73F9D4FFC66407951A1AB = PACIFIC_RIM_BONUS (Pacific Rim Bonus Dis | V | 0x671780244FFFADCC5F5FADCF18E5B75A ; MKBv31/FindVUK 0.94 -0x41FA7EB30FC1E05069E4BE6233F66725132E2F47 = PACIFIC_RIM_BONUS (Pacific Rim Bonus Dis | V | 0xDF05230AA14C8F1C12C8FF42AEB375BA ; MKBv31/FindVUK 1.02 -0x10B9EBAE8BAF114A5862E2EF1FB5ADC9D83EDAB2 = PACIFIC_SAMPLER | V | 0x18E2B23B76649C25A7203B1447B46568 -0xBB6C3174F0A70611DFE78DE5610BED0E465742E9 = PACTO_DOS_LOBOS | V | 0x0AA9536C45B82DBC9DA7E813F20ECD45 -0x65EC736E57C3EA7353DDB2C0CB0C0B2E6CC08265 = PADDINGTON (Paddington) | V | 0x639045DDFC9FAE945886D6B97D2CBCC9 ; MKBv51/FindVUK 0.92 -0xAA204797867CB18DD231C45641571572E0D2CFA1 = PADDINGTON (Paddington) | V | 0x6F1287E7C6DAD77D04498AB0E29FE346 ; MKBv51/FindVUK 0.92 -0x02FD6FD64527724148A5F8CA7E56D39BADE66F29 = PAINTED SKIN | V | 0x707755ADA3EAE0D3FDD97B3102FDE691 ; MKBv32/FindVUK 0.80 -0xBBAEB3C0E2AEF23ADB4AAD59FEE58A8019AF5680 = PAINTED SKIN 2 | V | 0x7892B93798A01505A4B1C17E1A85DCEA ; MKBv37/FindVUK 0.80 -0x0B2AAC885407BC2A22BAE754F9FA36F6E060D725 = PAINTED VEIL | V | 0xFC6C45E4EA6D395CF8D72DA3415D43BE -0x839194DE5214B414EAA5917CBED67F879D3B0AA2 = Pain_And_Gain (Pain and Gain) | V | 0x5F2CF632C6F833A7BBA90346FDD07DD0 ; MKBv36/FindVUK 0.99 -0xD66FF8C34B8DDA3B2429FF9EC4BBD536D9033527 = PALADIN | V | 0xBD2FC60E72B49AD815E8A198B60C9EB6 -0xE4F8F85D93AD84431936152FBD39AD96232ED349 = PALADIN (Paladin - Blu-rayâ„¢) | V | 0x663C31398FF9AC6626239404DD407879 ; MKBv30/FindVUK 0.96 -0x2EA67B2A42955FC4AE42F7AAA3A75058A0F1A0A6 = PALADIN (Rise of the Guardians) | V | 0x9738B998F5B19C319ED98FC289548648 ; MKBv31/FindVUK 0.96 -0xB5FD7704330ABF66645C78BAE45592032EFB3E1F = Pale Rider | V | 0x99A6F2B2FC1A29BBC3E8884991CCA87C -0x02D5E9C0767B75F8D52F5B4B939EC63EF864A338 = PAN | V | 0x0EFD801DD92354E99E94F4D321617D32 ; MKBv57/FindVUK 0.96 -0x885AB5B63FB20BAEAD64FA974C29E7404D8CE218 = Pan's Laybrinth | V | 0x6BDF8AA2CA3DB27746F27F57B68F4C6E -0x13673FE69A2F47F67C62A4FC0D82BC8B4C7D233F = PANDA | V | 0xF4E00074B6915A4F60F066ED04F33EB1 -0x56A42E5BF3F0BBF2C6C4636E5BCBB0215C320714 = PANDORUM | V | 0x9F664F32FF8C89CE4DBB40DEDCFFBA97 -0xB3C9A588FA7CF41AE1360BE5F342B2E66DCCD891 = PANDORUM | V | 0xC7EB00BBB01FA602AE8EA74797B53E1C -0x7AB05E9EC82EB880D246B762D416549E6EAB3C41 = PANE E CIOCCOLATA | V | 0x82378C57D4C469EC3A62733477E1E909 ; Pane e cioccolata -0xC67BBD3B989DCC860014853F9931F90A3980B446 = PANIQUE (PANIQUE) | V | 0xB0FDF0DD7075881C28E28024C9C87C0A ; MKBv57/FindVUK 0.98 -0x652B7DC2FBD68EE3CD01F961F8BB8082C01B43B2 = PANS_LABYRINTH | V | 0x49F45CE2E8082C9BE801D24670AA90A6 ; MKBv4/FindVUK 0.96 -0x508954231CF8FF996D14CD581134FEF6F904B045 = PANS_LABYRINTH | V | 0x5F1DD8F1B054325BFF4E1DB011D801B2 ; MKBv12/FindVUK 1.02 -0x55C8D88EC411F8C06A97D44D611A21653337FD99 = PANS_LABYRINTH | V | 0xFBC636C351060463BC5049E5566969B3 -0xC0489CF74EF546265C1AA54A707284E57F41D740 = PANS_LABYRINTH | V | 0xF196DECEF9AFB18DB5CBCB15C265020D ; MKBv12/FindVUK 0.96 -0xE07EAA4B2E3BB24CCD9AF494C47CD08FCDC8E8A8 = PANTY AND STOCKING D2 (Panty and Stockin | V | 0x7822E07B57397C3EF81704C2FEFEE7BF ; MKBv36/FindVUK 0.96 -0x9C6A26CE159D765E8AEFC8DBD98C7E588355AD6D = PANTY_AND_STOCKING_D1 (Panty and Stockin | V | 0x9BC831E0556130529EEF51BAFC7F1EBA ; MKBv36/FindVUK 0.96 -0x52400726053993D491A3E9CE6FDA7DF8A14EF1CC = Panty_and_Stocking_Disc1 (Panty and Stoc | V | 0x40281657551D2F01ABEB94A57F20D28D ; MKBv31/FindVUK 0.96 -0x2BA2FE6D7E87929812405F11241D97C58AF30315 = Panty_and_Stocking_Disc2 (Panty and Stoc | V | 0xACC4E6BEF95F20D23F89B0F10256C251 ; MKBv36/FindVUK 0.96 -0x8AADD8C32F8D0F92C96DD70319A80EC2641B4E34 = PAPER_HEART | V | 0xA93B86AED5BAA3A9CF3507F08BF241A4 -0x1A39D5495768F568C61B1DD4DD762FC2E28B228D = PAPER_TOWNS (Paper Towns) | V | 0x64042D332063F499B2FED036886AB5F3 ; MKBv50/BD+/BEE/FindVUK 1.02 -0xF63E42937C3220D7F142AF8C1EE8D4D8FDAD46DA = PAPPA_ANTE_PORTAS | V | 0x43B8B6B5FA44F9E65A40918CC68C8C1C -0xA7EE022751E519316AB19E15D20247AA4F025861 = Paprika (ESP) | V | 0xAEA89E498FE5CDD4833C7C2110240179 -0xA17E61CB9967A08CFA51350DEE3A379CC6874F22 = Paprika (USA) | V | 0x7BD299DBA02950E4A16A0AA2F5CC9FE6 -0x28FA3255170359E91E046AE1B9F47A673354782D = PARADES_END_D1 (Parade s End Disc 1) | V | 0xB5B7287B439335E9A9DB529359F897FF ; MKBv31/FindVUK 1.00 -0x803ED85652039E4037F3F21DD859ACEC5FA4321E = PARADES_END_D2 (Parade s End Disc 2) | V | 0x312283EFBBF05A974C61DB1596AE3DFE ; MKBv31/FindVUK 1.00 -0x5A73A7F78875ECDBC232769720780E3F7B0DB049 = PARALYMPICS CLOSING CEREMONY (Paralympic | V | 0x224F8BF81D10D6134B0B91C6CBCC3453 ; MKBv34/FindVUK 0.86.3 -0x8B80993901E19C6D16386547C3ED06303E787AF1 = PARALYMPICS HIGHLIGHTS (Paralympics High | V | 0xEC529F14ABE05636EC5C6DC350E69213 ; MKBv34/FindVUK 0.86.3 -0xDB7A1237DF636E31B2307207C72614555BE67578 = PARALYMPICS OPENING CEREMONY (Paralympic | V | 0x43052A62B30750CB454F840F2C27AA84 ; MKBv34/FindVUK 0.86.3 -0x5D05D2D2225E4BD5DF9B65996896BD9BD1611F14 = PARANOIA (Paranoia - Riskantes Spiel) | V | 0xD3CFDD9AA2772B86232AE91234A3E7D7 ; MKBv44/FindVUK 1.00 -0x1E16FDE45DA1AC64159A607F0407C7401D2CF961 = Paranormal Activity | V | 0xCCA3AF19A1125F28F5596E71BAB1DFF4 -0x48C5CA7BEBF59B9D9C5852FC7FF0BD800A24B6B6 = PARANORMAL ACTIVITY | V | 0x220229B076288441E6FAACE77A2653DA -0x22F05A3F5BAE4B69D53E7EA1889C3EFDE8AF77A5 = ParanormalActivity_GhostDim (Paranormal Activity: The Ghost Dimension) | V | 0xD8543CF4AD8FEE2E9495344961D10198 ; MKBv57/BEE/VUKNOTVAL!/FindVUK 1.02 -0xB1238D87E4E575BB583202A3CF483F4D14C9DF78 = PARANORMAL_ACTIVITY | V | 0xC603E4AE1EA954B43ECDCABDAF675E9E -0xBC8E971ED4ED9DBD2A47D692BE19ABD27E49D48F = PARANORMAL_ACTIVITY | V | 0xAF2EAF6FE578CC9B1CE6CA11559E7B53 -0xDE288DABF19CE0B0B16EB9DF6122DCF9768F00D2 = PARANORMAL_ACTIVITY_2 (Paranormal Activi | V | 0xA5E86C7B6B5B5B494F2FEB22D522BBE3 ; MKBv21/FindVUK 0.96 -0x1E968A2C1EE07D4C2D18B418857EA2DF4F7D9434 = PARANORMAN_3D2D_G74 (ParaNorman 3D) | V | 0xC8B88DB2FB27930FF4B8A079658F50DB ; MKBv27/FindVUK 0.96 -0x2898E0C937147FBE424B6CE91E5194C49F15F6AB = PARANORMAN_3D2D_G74 (ParaNorman 3D) | V | 0x577847BB45F693A619B9A2156AF78ACF ; MKBv27/FindVUK 0.84 -0xBDEB423705BD6BEA6F043A75963CAA2D793DDF49 = PARANORMAN_3D2D_G75 (ParaNorman 3D) | V | 0x1D6B53A6577684302E0649AA32B6A6DB ; MKBv31/FindVUK 0.94 -0xE5856412409E1C4B25E0090C5B697177DBE03D2B = Parasyte BD1 | V | 0x94436A4F417E99E1C282A46E33BB583E ; MKBv58/FindVUK 1.02 -0x27DFA5E19536A8112F132598BB99B4FDB523ADA4 = Parasyte BD2 | V | 0x572F0756109630D9AB104C1A1E76D605 ; MKBv58/FindVUK 1.02 -0x94D81745933CF7A433249171E80FF25398D7897B = PARIS | V | 0x096C1ED04D101B273B1C7E7B931DDFE6 -0x89F9EFDB508A02541B5E272C50F10F7B864D1258 = PARIS | V | 0x54BB9D00C778C6EBF2D477735D0008E2 -0x540E2996E04A58139C4FAA350EA2A12F8F078107 = PARIS | V | 0x3C2D62824145EF7650E730AFC31DD98B -0x79EDF27D11574A1D88A763D5F6A768F568680CDC = Paris Te Amo | V | 0x8898016434439B7CDC9801D82E9D1BC0 -0x0605BE82FFB60076C3FF2353AD1D2B780B2273A2 = PARIS TEXAS (Paris, Texas) | V | 0x5F12FB5D91A125461AC8392C4E8BC76D ; MKBv26/BEE/VUKNOTVAL!/FindVUK 0.98 -0x1A6D9E3A6C2A61D427EF1752CD90F70A1F963028 = Paris... Telefon 666 | V | 0xDF8BC0A53C76D658A38E786DAB5469A9 ; MKBv47/FindVUK 0.84 -0x4AE923E47CAE0053442533A918D41A662D047C58 = PARIS_TEXAS | V | 0x89AC26DF198BEBEB76284FAA679EAC4A -0x458BA435F3215CA56797481BF3A95DA9A8E711DB = PARKER (Parker - Blu-rayâ„¢) | V | 0x683B1A506342E1562AC71D87B19A2D00 ; MKBv38/FindVUK 1.00 -0x8B1445666AF56C46F932D77143E0674C03371C4A = PARKER (Parker) | V | 0xAF051A792D3BC4F4DECDC5C3F88BD519 ; MKBv38/FindVUK 1.02 -0x4F8FF864FD9C05D58D5ECC36624D912134846132 = PARKLAND (Parkland - Blu-ray???) | V | 0x42B06143CC42CBB43F80640F8918A6C3 ; MKBv43/FindVUK 0.96 -0x9FCCBB92841ABF33A1A61159511F1CAA7DC9BEFB = PARNASSUS | V | 0xBA445F4B886B8DA4CD3393ED44738603 -0x8A005459E466A2A9FC929D6DD43ABE3F9A4688D1 = PARTRIDGE FAMILILY XXX | V | 0x34273E5188F354D4AE151AC866981D75 -0xA361D570A6ED34B746EDA2A39CCC3F7641AD0942 = PASSCHENDAELE | V | 0xC48E527E5D5173219B698C5B9309FAA5 -0xE6B90107B634A2D813745B01D08CFB1C8CD9BBC0 = Passchendaele | V | 0x9794ACA821767D38E07E575C57310E9E -0x1E6B8FCB2D35C5C30C0F33324110A10CED1B3B29 = PASSENGERS | V | 0xDA7618FA37046469F40C25965431303B -0x0EC49D3C177BC1D38066BCA1A9ABB56B2620CB89 = Passengers (2016) (Passengers (2016) - 3 | V | 0x20686828AE1C202C591D54E8ADC61FF1 ; MKBv62/FindVUK 1.02 -0x53D6140CEE86874F6ADA6839235442C106460D91 = Passengers (2016) (Passengers (2016) - 3 | V | 0x617DC5AFE594083A91BE89840A222419 ; MKBv62/FindVUK 1.02 -0xBA4B8735B97B74C738FAD3E2A836AAFC22D0D108 = PASSENGERS_2016 (Passengers (2016) – Blu | V | 0x1474F54E99C6F376496C7AC713E9D3BB ; MKBv62/FindVUK 0.96 -0xA94991C81F1C93E77CBFAE387853841225690682 = PASSENGERS_2016 (Passengers (2016) – Blu | V | 0x8086832C2CA6B7D199992015D8649339 ; MKBv62/FindVUK 1.00 -0x2491E9014FC83303E4DC5F82FA5B3E8E6AC6C8AF = PASSENGERS_2016 (Passengers (2016) – Blu | V | 0xE881360EBFF5DF30E25E3945C2BD5E4E ; MKBv62/FindVUK 1.02 -0x9C5B5371D31176E17C62079B0690BC627B41301E = PASSENGERS_P1 | V | 0xFAC2DC4E537305729FBAEFA6A82283C9 -0xE9D8FEBA75109F5368D84EE342AE12F42495C37E = PASSE_SIMPLE_BR | V | 0xD9E01592DC998FD94B67FE51F6F53C5E -0x94E58E162E4FB76FEAFF001DC4E14CDBE9584A79 = PASSION_OF_CHRIST | V | 0x960F1170518544C4DEF3AEE6AB984347 -0xF0FFEAEFB08628CE49520FAF46397D7C19C2E073 = PATEMA | V | 0x2407628C8983673BB6601D8D4E67A8D5 ; MKBv49/FindVUK 0.81 -0xB9187C9344B14049AAC2EDB7E4D597E99E6C51BC = Pathfinder (2006) | V | 0xB7CB2626C7418071D195E52FD6CAA657 -0x07A322C2E2B096A837DF526AD025AEE144D14280 = PATHFINDER_F1 | V | 0xA0A992F50C85AAA7866B36072F1BED9B ; MKBv4/FindVUK 1.02 -0x80F0A219F13B0A8456B752441B72E47F072CBE94 = PATHFINDER_F3 | V | 0x402331F40D2A93A6B7D3B92C0A9EFED0 -0xA6E01F491CB00C57F482CFE0C74BFA198F81D65A = Pathology (UK) | V | 0x3EDC549ECD9D456684BA3C3BECFE4669 -0xB77FE41B395F8BE64002B205454DF1F0CE141BDE = PATLABOR 1 (Patlabor 1) | V | 0xC4642796C96062330710336EA1933FA2 ; MKBv19/FindVUK 1.02 -0x474FB7222E93D47D649B282401A79624D9674CCA = PATLABOR 2 (Patlabor 2) | V | 0x429DAAFBFE8419582792E3EA84E5C0FB ; MKBv19/FindVUK 1.02 -0x003C3C5ED01F1C1732E05A3DF5942860F5A7CAC6 = PATLABOR OVAS | V | 0x0DFC3C8BE397181C8D47CD78FF8B2800 ; MKBv36/FindVUK 0.98 -0x808A4ADDEE78464B704AED1A3CECBC850443B18D = PATLABOR-1 | V | 0x82CBA65E9522C0441E04344051380526 -0x13AC1F174A059064DC341FEB36E69ABBA606C19C = PATLABOR-2 | V | 0x3BF172416D7CB21300F45BEAEBFE2754 -0x66EA1EBE695F91F912464409254EBE6AC24E47C5 = PATLABOR-3 | V | 0xA905B54164890000E1577E17DB82C9DC -0xAA763977961E06B281987E9376887ED0CF7805EE = PATRIOT_EXTENDED_GR | V | 0xFB443C2797CCD61AB02ADC4E57E57DFB ; MKBv3/FindVUK 1.02 -0x9844E5615CE8A2C0BE2BBC0F6D9BF0D1F1667A10 = PATRIOT_GAME | V | 0xCC1CA9828DF358266EAA2CF57F3C7ED1 -0x0D8B8E0215052C002AFD7E41F67A4195DF4CF585 = Patton | V | 0xAB82C651E60C6691D4BC7046D05C7009 -0x074F1AEAA0B3707395745730DDB97AB951279E9D = PATTON_F1 | V | 0x5A606864A0BFA46718C653FD559B36BE ; MKBv7/BD+/FindVUK 1.00 -0x28184F09547D51968F5CE5D2F9D71EB05FB608F5 = PATTON_F6 | V | 0xC05711BF969A2C11DF4BDA12F2E7EAFA -0x145250E0EEF7CD40AFAF9DA561A5AA2EF8851397 = PATTON_US | V | 0x816C7C0ABD8683423F24D2170BF4A38D ; MKBv23/FindVUK 0.96 -0x82A2DC402BE1EE07BD26068048BA4045B5B0C64F = PAUL (UK) | V | 0x1FA3F36E3A86AD03F0DFA97E51D9835E -0x7A955A1763200774D55AA95BFE0A4E603B6AA078 = Paul Blart Mall Cop 2 (Paul Blart: Mall | V | 0x47AFA8D909ECA86EA5B876A04A0D3E3D ; MKBv54/FindVUK 1.02 -0x602A4004649954FCA5CF4FAA60CA35A4FD1102BA = PAULETTE (PAULETTE) | V | 0xD25BCA019FF590B8D6326F19BEF84A32 ; MKBv44/FindVUK 1.00 -0x0FD9FEA5426F5D4645AEA5C49469D4CFE5FA41CF = PAUL_BLART_MALL_COP | V | 0xD375D9D626CC8901BB21074850F79C0E -0x6807EC4E7A414A9F20ADCC59C139DE3FE5BEDD1C = PAUL_BLART_MALL_COP (Paul Blart: Mall Co | V | 0x47CAC10F82334C751A9F83A40CD0C604 ; MKBv7/FindVUK 1.00 -0x84ED34F7B41F8F759E5419F694BAB6FAFD12CCC3 = PAUL_BLART_MALL_COP (Paul Blart: Mall Co | V | 0x4A24A5F7BAF677B13A91308352FA7C4A ; MKBv12/FindVUK 0.98 -0x8D8BB7224F1D1AFC3FBEA4A3D2BACE2804594A97 = PAUL_G51 (Paul) | V | 0x0B13D1031A06FC657FE6A8EB98E84CBA ; MKBv20/FindVUK 0.96 -0x68D7BB686AEF255446B5BA41A2F8D7670CC119DE = PAUL_G51 (Paul) | V | 0x681AA7747210CC3512343BDBF9C287C4 ; MKBv19/FindVUK 1.00 -0x690AF23E27DDE5C0D2487A73C030111C43678114 = PAUL_G55 (Paul) | V | 0x5E39F9748EF61F99F9314BCCF24BD2C4 ; MKBv19/FindVUK 1.00 -0x3235694501D30009092D04FAEBA9E57A7B20664A = PAUL_RODGERS_LIVE_IN_GLASGOW | V | 0xA0C8D4733570606A898EE9FC0D685134 -0xF994399ED5ED2EB2A29C1EEAFBA962A0BF73B946 = PAUL_RODGERS_LIVE_IN_GLASGOW | V | 0xF9F65533668AC4432FF55AF4B8C3E0F7 -0x08AA00E0A0C340C18F39FED5F56AFC6F247804E8 = Paul_Simon | V | 0x05EE5A3394112EFBFBECC6756FA33958 -0x7F2B287B422D01AF519E2229DED3CEC777C41611 = Paul_Simon | V | 0x594D34656F4D242D87F955AA050A8A14 -0x3EEF648882E76DB5CC60B72621345CBAA5CC7823 = PAY THE GHOST (Pay The Ghost) | V | 0x1DFA4C40DA762E636A361957596EF3B7 ; MKBv58/FindVUK 0.98 -0xAF865235413D2E679F207C552E277D11BF631D24 = PAYBACK (Payback) | V | 0x1CF2DC1BFBEB73A9F1DA48C27CCEE225 ; MKBv14/FindVUK 0.98 -0x9168FFE6FE02AC0056849169AF5DD33F3726A412 = PAYCHECK (Paycheck) | V | 0x5D0F26E946A4A1EDD46AD36C0546714D ; MKBv12/FindVUK 0.91 -0xC5E22CBB7BD1F670C93CE6CE5B4532A91D425005 = PCXE.0x10001 | V | 0x4AFB8E82470A79ACECF7F498C5F7D48D -0x9E2AD718380726155B7A316C90EF277AE2A43FD4 = PEACEKEEPER | V | 0xB0FEB77021D287CEAD07F8E1E44FBAF2 ; MKBv46/FindVUK 0.96 -0xA363A82BAD7367DE394B2E23BF907E50F0813758 = Pearl Harbor | V | 0x57FCDA48022CA24FF8CD75965517D60C -0xF4325600229E7A58A41F6EECEA938946E4D9CE90 = Pearl Harbor | V | 0x246F6672305511ED680F51B59AEEF123 -0x8A80037015FDE4017F8F301DD9BCB04BC77979A2 = Pecos Double Feature | V | 0xAC0C231068B8D8B937560F33D086CE8D ; MKBrev 32 - FindVUK 0.54 -0x38DCFE9C0CEBF8A7493EAD79C0784C9C686CF257 = PEEPING_TOM (Peeping Tom) | V | 0xD3F0F699C2D478B17012903E42865580 ; MKBv18/FindVUK 1.00 -0xF504881CD762DC7F6F0975A20DE0B2F918CAFDF4 = PELHAM_123 | V | 0xE4EBF53E8867B44C43B1691CF2C50C11 -0x98B7B7F3D6CD6B892CBBE205CA7B6712AE4C3267 = PELHAM_123 | V | 0x87CBC2C3DDA59C5C7EEB679F40BBCC8C -0x3D8C50F89C6D4783747E7AB37F71B05F09EB70EE = PELHAM_123 | V | 0x041D5EF311DC741CFC9EC678A2D2001F -0xDBAD358AD9ACCDFDF26ECA6D4F6117CB02F7B088 = PELHAM_123 | V | 0x495C7D3D6CFDD21104253B36B8A1B46E -0x959B3F910479B176A2DB0BABDA24B77C8C53146C = PELHAM_123 (Taking of Pelham 1 2 3, The | V | 0x1400BB147992C25A9EE452A06B82926B ; MKBv16/FindVUK 1.00 -0x96F963D47331F07618A595F30255D39D40FE2F88 = PELICAN_BRIEF_BD01 | V | 0xD71E5C111089564149F62EA3A50907E0 -0xF6836620A13006C4ABA8C94EB83C8F9EDDFFBDAB = PELICAN_BRIEF_BD01 | V | 0x21C3FE6E031BFEA808A5124C48A7B620 -0xEF95B0FFF74A6A5E780270248FA4C2460F7D2BE0 = PELICAN_BRIEF_BD01 (The Pelican Brief) | V | 0x665C7E31DD85F3824D87C28A3602F537 ; MKBv9/FindVUK 1.00 -0x2B84961E9F085A08BDB1234437BAA847DB1805B7 = Peligro_Constante (Peligro_Constante) | V | 0xCD0942270063EDBDF4028566F441EB1E ; MKBv50/FindVUK 1.00 -0xF5EB8EAAF7095765D05BF8FD3A7979C6557DC8A4 = PELLEAS | V | 0xE213060EBA8C512132DA53BD76280E01 -0xB62DC3EA379898C18CFBDBD97AA7DAE2E0EEE1AD = PENGUINS_OF_MADAGASCAR (Penguins of Mada | V | 0x1117914EA9643CF91631ED00AA62A1B0 ; MKBv47/BEE/FindVUK 0.96 -0x67F38E549FDF83E739490D64FB59E69F5679713F = PENGUINS_OF_MADAGASCAR (Penguins of Mada | V | 0x099234CA863B959C80F31B1C8A921BD0 ; MKBv47/BEE/VUKNOTVAL!/FindVUK 0.83 -0x7E4B538194095D8C2286FA1FD1CF12B260F4C7A7 = PENGUINS_OF_MADAGASCAR (Penguins of Mada | V | 0x3EABD4049AFE9A4141A0524D1ED008FC ; MKBv39/BEE/FindVUK 1.00 -0xAC226514C2EE28E47C8D6AA9E839B4D68D67CDCD = PENOZA4 (Penoza4) | V | 0x11FC7A2FB5BDD9F6F05A0EF96A7348D8 ; MKBv57/FindVUK 0.95 -0x9A10FE06E3EACE4120D3A15992F34359742D344E = PERCYJACKSON (Percy Jackson and the Olym | V | 0x399E7B56F805A7A46105FC61A80E8544 ; MKBv17/BD+/FindVUK 0.98 -0xD5B61B079339656936CBDFC668F9C439705BD9E7 = PERCY_JACKSON | V | 0xED939DDC98349DD3ABE7D18647801D21 -0x88AD7992DB9503E485A5ED278F92859A6AFD8024 = PERCY_JACKSON_SEA_OF_MONSTERS (Percy Jac | V | 0x31C57EFCC436F8DA4EB324A6D77C7395 ; MKBv31/BD+/BEE/FindVUK 0.91 -0xA1B1E524793F6A1EE232BDF2AE54B4556548C163 = Perfect Blue (Perfect Blue) | V | 0x61493BABB2D013B1AD9404A88601A192 ; MKBv62/FindVUK 1.00 -0x2E5DA8109E86830321476AE283CABECC28815715 = PERFECT_STORM | V | 0x4AAF7FC33FBD5EC7C050C99AFC608158 -0x01352D62476E58C023AC8F36E0684F67F56E81B1 = PERFECT_STORM_NA_EU_JP | V | 0xE92BE8C4C8BB817C81CA83F475247E5E -0xFEC502E30ABF44A59D05A66557C74B98E204067F = PERFECT_STORM_NA_EU_JP | V | 0x267013D22276F15A52076C326AC43B42 -0xAC6E955E56A8B603DD27EA918E09F165D52AB820 = PERFECT_STRANGER | V | 0xF2C10A245409DF15E6D6B1A3215B21FD -0x6FFD47762F505280FECA16E7921D025F40752A4C = PERFECT_STRANGER | V | 0xB99A717A9FB32396EF9FCD7456E545FE -0xD600864697BDD2B8BE4831C497C4098B93581D2E = PERMISSIVE | V | 0x68749ED69CAC37A0D4F6AE355CD7AAFD -0x9216652BF7F8F85498253862D9CD6FF01A8B0C8B = PERSONA3_THE_MOVIE_04_BD (PERSONA3 THE M | V | 0xDE583809C31CE7ABD29DE48D7FF3596F ; MKBv61/FindVUK 1.02 -0x25D14ABC8DB2620238E687AF2D790655E36E06FE = Personal 0xEffects | V | 0x91484D8E0B43383ED33259A878CF54D8 -0x2ED6E79D4BCCB1749DFFC0E30CA00C23F1208F24 = PERSON_OF_INTEREST_S1_D1 (PERSON OF INTE | V | 0xD75D1BD0EF1361F5CCE5D3AD8708BD18 ; MKBv35/FindVUK 1.02 -0x27B8898A8FD7F2A7927457505F06099F931778B1 = PERSON_OF_INTEREST_S1_D1 (PERSON OF INTE | V | 0x6479BB4A5BBB8C53CA3664A86DE3138A ; MKBv27/FindVUK 1.02 -0xE4121352EC738E5A7C52BD0D72DC8FE5A46B3FA0 = PERSON_OF_INTEREST_S1_D2 (PERSON OF INTE | V | 0x64F7DBAF2468CCC1587525104F29D663 ; MKBv36/FindVUK 1.02 -0xE0D21C6C135813678BD5E61A503769C1A66E282C = PERSON_OF_INTEREST_S1_D2 (PERSON OF INTE | V | 0x38C183E25A667E3E5FA4F1E1117E3444 ; MKBv28/FindVUK 1.02 -0xC7642CE607E4D9EEA4189F83864035DF61256375 = PERSON_OF_INTEREST_S1_D3 (PERSON OF INTE | V | 0x001A0591AFCC4E7250E80A9BF44E3978 ; MKBv25/FindVUK 1.02 -0xF828476E7091CE669CC079EF9BFB1FF5B03E00A7 = PERSON_OF_INTEREST_S1_D3 (PERSON OF INTE | V | 0xFEA09739328C75772EEA1C6C4B5AAE27 ; MKBv31/FindVUK 1.02 -0xCB7CF660557827D3D0CE02AA473FD076B13E1FFD = PERSON_OF_INTEREST_S1_D4 (PERSON OF INTE | V | 0xC1488CFA5D81F1CA8BC8A48B85469742 ; MKBv31/FindVUK 1.02 -0x7A2CB0ED543E0A12E1E40D72AA83536029C6CAE4 = PERSON_OF_INTEREST_S1_D4 (PERSON OF INTE | V | 0xFD944E7D407495F4A267930F2F899FF8 ; MKBv25/FindVUK 1.02 -0x79C3F82B515D7929BAB8CADDA6C7B2F4A5DA9DFD = PERSON_OF_INTEREST_S2_D1 (Person of Inte | V | 0xC20BE6D27448A24EA4814BB8ED677D45 ; MKBv31/FindVUK 1.02 -0x2C1522444E37EFD7DDEBBC7557B9EAD432771C68 = PERSON_OF_INTEREST_S2_D2 (Person of Inte | V | 0xE878BA609D4C785E6118BC59C2ED66B9 ; MKBv36/FindVUK 1.02 -0x1B747424838593556D7D5A3297E4655E8FF23B67 = PERSON_OF_INTEREST_S2_D3 (Person of Inte | V | 0x13C97671734F213E4EE7ABBD9D2F4909 ; MKBv31/FindVUK 1.02 -0x1622908A26507758FA8ABED2910BAAA28136F613 = PERSON_OF_INTEREST_S3_D1 (Person of Inte | V | 0x4D0BB54B347435DF886DDAF111D6A90C ; MKBv39/FindVUK 1.02 -0x16F0D49FCE05559E996E00EF6067AEA65F24893C = PERSON_OF_INTEREST_S3_D1 (Person of Inte | V | 0xC5B1EEB8AA4D6CAF77A71526E91C9B7A ; MKBv50/FindVUK 1.02 -0x39BAE9C95EDC691C1C3737B183839FB663E26C77 = PERSON_OF_INTEREST_S3_D2 (Person of Inte | V | 0x45822BB40C53309630DDCBC3AA07D33F ; MKBv50/FindVUK 1.02 -0xD1FA26963A882575841578159C40DB03DD2FBCA2 = PERSON_OF_INTEREST_S3_D2 (Person of Inte | V | 0xB2401370F60F19A80B961B2A5D2B3E03 ; MKBv46/FindVUK 1.02 -0xE104048C1065E2953B4F1F215910DA85578F8B79 = PERSON_OF_INTEREST_S3_D3 (Person of Inte | V | 0x4DFCA66E8547BF130093F4743C317EA0 ; MKBv50/FindVUK 1.02 -0x7D720D31AFB2D2F4BD6D526EB7C417E9E159AE64 = PERSON_OF_INTEREST_S3_D3 (Person of Inte | V | 0x08757EA46A3F7ACFD038332DFD21CC57 ; MKBv47/FindVUK 1.02 -0x9CFFE6A777F69136D622C89FDC13ECADB69834EE = PERSON_OF_INTEREST_S3_D4 (Person of Inte | V | 0x81E41D03E6987AF35C9C808562F7F4FC ; MKBv39/FindVUK 1.02 -0x3E564764E0CE2212C49FEDAB18170CDBB8188F60 = PERSON_OF_INTEREST_S3_D4 (Person of Inte | V | 0x5B3FB0650C532FE6CAFE9EAECEE7BD5F ; MKBv50/FindVUK 1.02 -0x9237EEF9F16B9E39F4E2BF45E46858FBA4AEDA6C = PERSON_OF_INTEREST_S4_D1 (Person of Inte | V | 0xA8EE8C67E66202FDDB6F4D3B1A33B703 ; MKBv57/FindVUK 1.02 -0x1919926257F2865E68D5AE7DE8E194C90E865317 = PERSON_OF_INTEREST_S4_D2 (Person of Inte | V | 0x93E4B44AFFFB43997A890F2776DA5F0B ; MKBv57/FindVUK 1.02 -0x9305C5317988BB087950E399CD543618C0A9AAA1 = PERSON_OF_INTEREST_S4_D3 (Person of Inte | V | 0x5DE8BF1FD6BF3AD818704BE920AA31AC ; MKBv57/FindVUK 1.02 -0xFEBB2DE20E573C59A08CDEADFE180C314AF12038 = PERSON_OF_INTEREST_S4_D4 (Person of Inte | V | 0x450E56CF33B98363937CC76EE0D9FA9E ; MKBv57/FindVUK 1.02 -0x5A04EBD1CF1FE00063FF931AABE8C10BC1DF377D = PERSON_OF_INTEREST_SEASON2_D4 (Person of | V | 0x89CE2C41E6E3956AF5A81709B1288F09 ; MKBv36/FindVUK 1.02 -0x854E4172FDBDC4109A33AC4CDD0860782A40FAFE = PETER MAFFAY TABALUGA (PETER MAFFAY TABA | V | 0x5856E27C33EEA267F20C663923FFAEA5 ; MKBv35/FindVUK 0.98 -0xC9A6D580326ED1B4370DB48E1EFE56112ACDD3C4 = PETER_PAN | V | 0xA6B8644C01ECC26BF6809F7D6613420C -0xFF454A59903ABE7DC9C90E015D3675A5EDD981FB = PETER_PAN (Peter Pan - Blu-ray???) | V | 0xA130DEBC823925485F513779D1FF69CF ; MKBv27/FindVUK 0.94 -0x8E920B9F92CBE8FE6CE5436BF31A4293D443CCFA = PETER_PAN_2 (Peter Pan in Return to Neve | V | 0x2D87D885D2480181994CF6098876BA5B ; MKBv28/FindVUK 0.96 -0x264F3A1334314B443B7D541305A18F563A8EA8DC = PETER_PAN_DE (Peter Pan Diamond Edition | V | 0x435FF667B45DDA9E8342465058D32634 ; MKBv31/FindVUK 0.92 -0x47DDAA32DE977458D4269CC41B9A354EE2216D85 = PETER_PAN_P4 (Peter Pan - Blu-rayâ„¢) | V | 0x2C00618922D2D0517C3BD69EDECA9D49 ; MKBv4/FindVUK 0.96 -0xEF45D6C69A9849403ED825BBAD4155E5E24F36A3 = PETER_PAN_SE (Peter Pan - Blu-rayâ„¢) | V | 0x5069396EB43381CF365976DAD49EC265 ; MKBv27/FindVUK 1.02 -0x5BE6FE13911BE96EBDCE317CB2CE5B2B35293F1F = PETES DRAGON (Pete s Dragon - Blu-rayâ„¢) | V | 0xD8E200B9EB12451287B5052A6142BC09 ; MKBv28/FindVUK 1.00 -0x8A6A4F7ED4714B50192F328108A2D530F50A0D19 = PETRIFIED FOREST (The Petrified Forest) | V | 0xBE2CC342E024B26A787EA5734DBA42E4 ; MKBv36/FindVUK 0.98 -0x30660A6188AB08F79189578033A39C5B92EC3F8F = PF41EUS1 (Pirates of the Caribbean - Blu | V | 0xE9B7D36BB8C049EEF7D8CA30F44A276B ; MKBv25/FindVUK 0.86.3 -0xB33D954174E8CA1F4101BBC0FD366FDF6C98B97D = PF41EUS1 (Pirates of the Caribbean - Blu | V | 0xDFB4A418B433A2737534281A629604DD ; MKBv25/FindVUK 0.94 -0x55C64561B543FF2D9A38C038C22371557D3C90F0 = PHANTASIA3D | V | 0xF865C9E6759CB4D20A94E46A0B11561B ; MKBv35/FindVUK 0.96 -0x3B2D8B2B4971BD1F32EB71A022F323B11465326B = PHANTASTISCHE_FILM_BOX2 | V | 0xB6D62E3FF2638FB08385371C48642984 ; MKBv28/FindVUK 0.99 -0xDC321086C224A539FCC73A49762D42402D60D24E = PHANTOM (Phantom) | V | 0xDEA4361A2D4DD7553336B0255772BDEA ; MKBv26/FindVUK 0.92 -0x6FFDC6DCECB5820AC44EEC5178D5D00EB9C06CCE = PHANTOM (Phantom) | V | 0xA911AFC7FC7C7A0A4094063672CF4537 ; MKBv26/FindVUK 0.92 -0xBC29BAD5DED327944E209B6387C5C85108FC3D95 = PHANTOM (Phantom) | V | 0x9EF5395C5860EFD3FD4D7921709CE095 ; MKBv26/FindVUK 0.92 -0x81FE2A2A7AE8B1D65863AC8F5A54E5F82C08821B = PHANTOM OF THE OPERA (The Phantom of the | V | 0x048CDDC8A8AD9405EA264A2D0CB5A6D4 ; MKBv57/FindVUK 1.00 -0x14B53C0A15E24423B9FFB7B17E3242C1A56707B7 = PHANTOM OF THE OPERA 25TH ANNIVERSARY | V | 0xA0EC60BD5BA244A9415F1FD32D95CB4C -0xE3777309274FEAB827D6A6804BDED8F6B88F1879 = PHANTOMPARADISE | V | 0x727C6D8BF208A3D51C799F605E86EBDE -0x29409A449F45AE457189400454141D0A80C9FFF5 = PHANTOM_OF_THE_OPERA | V | 0x68A777A912D71023AC78C52BE3247912 -0x4835D4C563715AD1AB5638EACA2A454020183EB1 = PHANTOM_OF_THE_OPERA | V | 0x907CD080F9895761767E586D25500B63 ; MKBv27/FindVUK 1.00 -0x1210632DAA0A356B3579BA7685BAD3586A63915E = PHANTOM_OF_THE_OPERA_G51 (Phantom of the | V | 0x3CCEC67FAC843682F4C7824DD3FEDFBB ; MKBv28/FindVUK 0.96 -0x43B3FC66AAA4E203209754A2873552A3ACA42F6F = PHANTOM_OF_THE_OPERA_G51 (Phantom of the | V | 0x8A1ADE8DC81A13A6E1BDD2F6E9F552A1 ; MKBv28/FindVUK 1.00 -0x36EC06130680417188FFA1DBA0CD9699782943A2 = Phenomenon (Phenomenon - Blu-ray???) | V | 0x85482BA9EC8FA04E386C9428DF3E6A87 ; MKBv27/FindVUK 0.96 -0x192DF088D32D363F2A07AF873D26B573B1BEF2A0 = PHILADELPHIA (Philadelphia - Blu-rayâ„¢) | V | 0x397B613DACFF35AE26B8DA8415E54AF1 ; MKBv34/FindVUK 1.00 -0x4B579DF9F9D5C7AC82E98F505C0B8F4B9CE9BE18 = PHILOMENA (Philomena) | V | 0x7BCA867EEB587F0CA3FE5AB4541A478D ; MKBv44/FindVUK 0.99 -0x1F0EDF07113A2F5A1726E67D8BB38F7DD8881E30 = PHILOMENA (PHILOMENA) | V | 0x20FF8F50FCD0A161456EE1F4C17D74EC ; MKBv46/FindVUK 0.96 -0x21857840CC470F66CFFBB180EFAA8985183E5267 = PHILOMENA (Philomena) | V | 0x162F53F5C98EA28348C1785560BCAA47 ; MKBv48/FindVUK 0.96 -0xA16DF51FC3F3C2A3487ACA205765C40C11706F05 = PHYSICAL_EVIDENCE_ANDERSON_BD (Physical | V | 0x4178F26F4AC83C7C74EF1A554390FFD4 ; MKBv31/FindVUK 0.92 -0xDEAE77B9D06A238493F16061FED3D99522926FFD = PI (PI) | V | 0x1319EE42013DAA7A3C09871950B9FB61 ; MKBv30/FindVUK 1.00 -0x9DD50D6B62E8FA0B4F88F78910036A827095D1E5 = PIANETA TERRA DISCO 1 | V | 0x3B1CAB0BC87FFF2868F77CB983672F28 -0xEFB59511136BE7789AE6DEBCB18D84F94D26561F = PIANETA TERRA DISCO 2 | V | 0x52EC3DB14B07326A2AE3760817A23BE1 -0xB5520B00D2B2713711F44E7D87483C053876B772 = PIANETA TERRA DISCO 3 | V | 0xB6F647E8824DBF6FDC4670EEFD1FA43F -0xCA1561C366DAF08C97C0A7FF6B7C8A5E9456FE10 = PIANETA TERRA DISCO 4 | V | 0x73BBD8FCA6D744C3B6A0A1E402AD67F8 -0x4D38FA40EFB3C33F2C2D49AFCB48C0FD9E95047F = PIERROT_LE_FOU criterion | V | 0xD18851E0B112FC1BE8C5156C951F291E -0x47591CD68F4020A96F2F684ACC0DFBE3B29CFF1D = Pineapple Express (US) | V | 0xEE6194AA2F54F95F74DCD0240A421ED3 -0x65F77D467529BD07B9081A8621856E3AAD7CAB8F = PINEAPPLEEXPRESS (Pineapple Express - Bl | V | 0xC381883E912D9E454052255CED9AE119 ; MKBv9/FindVUK 1.00 -0xD7CCF1E511A777DCCFA60F9E595FD67521A69343 = PINEAPPLE_EXPRESS | V | 0x85169A79A8A4C497513A4E20AB018673 -0x6C2F3614F85F6B26DDEFC3167DB7D87193627876 = Ping_Pong_Disc1 (Ping Pong Disc 1) | V | 0xDC7487CE0965E2B6B152A69C859C9988 ; MKBv53/FindVUK 1.02 -0x3EAD29467DF8D9A3D4E8FDFA3FF0A293145C75C6 = Ping_Pong_Disc2 (Ping Pong Disc 2) | V | 0x091270E5908C8E44277A9BAA9AD1879F ; MKBv53/FindVUK 1.02 -0x5C648887B3DFED8FEBA7242A4A07870395953259 = Pink Floyd (Pink Floyd) | V | 0x914D9B16D3FF0AE9FA4C923943EEDF5D ; MKBv32/FindVUK 1.00 -0x64BE877AC1AED8C5DF1EF9C950A675EF67DC6A77 = Pink Floyd - Endless River | V | 0x82AAB6070F0E88FCC7C450E82144C5E5 -0xF8BC9CE5D30A5FD0934F2F449757FEFDA14FE885 = PINK FUNHOUSE LIVE | V | 0x29CF08791682AA0830EEA8810049298F -0xAFA183340FA29C24C902E02AF8260BA121E24F53 = PINK FUNHOUSE LIVE | V | 0x1F830AC818160508F267DC64ED31F2F3 -0x6864416F62FE93A349287983D37A11E5BD95C598 = PINK FUNHOUSE LIVE | V | 0x226AE7E64E54F917EF1F89AE7694FA22 -0x3FEA1B92A81065D06009368C3CD56FC63BD55FA8 = PINKPANTHER2F1 | V | 0xC9FB1051FA8F58F2D3E6D4118AD6C1B3 -0xB1587C0E0E03AC3BDF65DCC3EDED33AB23D09322 = PINK_PANTHER_2 (The Pink Panther 2) | V | 0x89AFE3F9D399C3F3E2B59A519715576C ; MKBv12/BD+/FindVUK 1.00 -0x82EE92F30D690BD614DDFFA22A420BC177CC85C7 = PINK_PANTHER_F2 | V | 0xA830D53729B1302AFDE555C3AEEC536F -0xF6FD0193D0FCBE1B0F160D7ECE6227CCC8ACF94E = PINOCCHIO | V | 0xD6D090245B7053071ADB96CFDFFA4A69 -0xFE96A09322F3AAA18117529E495951997489005A = Pinocchio | V | 0x1798B65619CB7BC0FF8763A05138A202 -0xF386EC1FFB72C9585901C27F21941E3A1B061722 = PINOCCHIO_GBR_D1 | V | 0xCACAA85A527611ED2A4D70A520E8D243 -0x2A087DF281BDBEA626644DFCA3B97A3609EE68AA = PINOCCHIO_GBR_D1 (Pinocchio Disc 1- Blu- | V | 0x1F3717D693D8C42367C8A1F987763213 ; MKBv12/FindVUK 0.94 -0xD08A491A87BD4819D7A4D07D78485864DFCCFFAF = PINOCCHIO_JPN_D2 | V | 0xDFD59E55398A41BDA089A4043BC89D03 -0x673F7D7E69DA219C9135DB5FE2DA07DAE0396E7D = PINOCCHIO_US_D1_BDLIVE | V | 0xE4B27B96CFEE0C0C387C5C2AD847ACFD -0xD068B8B57E7532BD3FFBF68C631990C4B874BC0E = Pioneer Pure Vision Demo 2006 | V | 0x106D33EEED646563A2E934751E1E9036 ; Incorrecly deleted as unitkeys -0xB53175004093D359185FEA1591D013E61317F8EB = Pioner - NOR (Pioner) | V | 0xEEBA2F5BED1F7D91B5F11C06F96BC7D3 ; MKBv43/FindVUK 0.98 -0xE479870DE24A21E7F980D3BA44AACF8D07D93D33 = PIRANHA (Piranha) | V | 0x3EB567B242EDE216F433636D2EC161D6 ; MKBv19/BEE/FindVUK 0.96 -0xFD5371E5EA41B962DA6D2BE45BD92B39CCE96E35 = PIRANHA 3DD | V | 0x8D4BBA6D3F3D2A53283A423559566C48 ; MKBv33/FindVUK 0.81 -0xF1D894B31CAF64C76A109C846B3B1B379E454E69 = PIRANHA3D (PIRANHA 3D) | V | 0x0FB98AAB714387709C66A7BE1980C945 ; MKBv19/FindVUK 0.84 -0x258B68EE57791F9630D832A64342547AE52E361F = PIRANHA3D (PIRANHA 3D) | V | 0x0733EC1797750E5B5893C4B4006B43AB ; MKBv19/FindVUK 0.84 -0x1A35A0146B013F50D00BB9976B77B1D12BAC2EC2 = PIRANHA_3D (PIRANHA 3D - Blu-rayâ„¢) | V | 0xFD0ED2D64D2FD19EDC2C8F3033510087 ; MKBv19/FindVUK 1.00 -0x3E2354DC2247289048945E59FE2B404D71EA2E50 = Pirate Radio | V | 0x87BE7465E2020A1E8D5F934CE43BC1C0 -0x21392EB1BED491F73556535BF64E8A5A2F0EF371 = PIRATES 2 | V | 0xF23D2CF1614E65D75F68906606FF95D2 -0x2CDE47FCB1A589BD6FB7A87B0F3D80D49D7157B6 = Pirates of the Caribbean: At World's End | V | 0x1F5D1194F8DFEDDAC87897BECD08AA57 -0xADD3B9A6218D640CD48F0CDC4920554EE6C425E8 = Pirates of the Caribbean: At World's End | V | 0xE6A212B4AF94A92DE4D570A629910D54 -0x619EDBE0AA9951561131C81311C7DBB064EE46B9 = Pirates of the Caribbean: Black Pearl - | V | 0x416711E0C54E3E3DE484F4F7A468432F -0xE177DBAB3A265F411B1CB345A184C125090E2A6D = Pirates of the Caribbean: Dead Man s Che | V | 0xC0DF2E54FBFFCAAEBE651487AD65081D ; Incorrecly deleted as unitkeys -0x4422882A94316D869551B2DFB4F03F7AC46C4E77 = Pirates of the Caribbean: The Curse of t | V | 0x62B71D7DFA9642079CAF6C0D8F9B1DFA -0xC3AE1CCBEE2DD34B8577642513C3552CEC79CCC8 = PIRATES1_AUS | V | 0x823C64FE5FF86173389731502E491FE2 ; MKBv4/FindVUK 1.00 -0xE1CF6C1BA432B07D69BC328A2E8B3D9F858CF23E = PIRATES1_AUS | V | 0x6239D4028973336281A0A82F763F6F57 -0x21BE8D05656D255C5A721BD5F418D4342EA6A43A = PIRATES1_DEU | V | 0xB7F7AF5F2660565D08DC1567A17268F5 ; MKBv4/FindVUK 0.96 -0x8E4795ABC6332D44E7C621C0F495777371197151 = PIRATES1_DEU | V | 0xBAAD15D93854453766831B754A3B1D71 ; MKBv4/FindVUK 0.94 -0x522085FDEBF1A67828D88C033B608F80EF19FDC6 = PIRATES1_GBR | V | 0x4AC8CDCCC5378D74FBA7DEFB0E9EF0BB -0x48CAA732AD7F7B4932C102C41276C58C0CFB0188 = PIRATES1_GBR | V | 0xC889B892AC09E6B963B8B5CD52CF5131 ; MKBv4/FindVUK 0.98 -0xEDD2F119B752D80120A93B06849CB4DDDC26F6D7 = PIRATES1_GBR | V | 0x9090A219C7FE9DF00305D48566A6752F ; MKBv3/FindVUK 0.96 -0x69197FA95BE83258EF622A74FD0F6EA232286DFE = PIRATES1_JPN | V | 0x7C30BE2C08F01CD47A949D7658F0C45C -0xA1FFB70F03E7C22DE6BACE5C53ABAE5BC9165206 = PIRATES2_AUS | V | 0xC21867E7AE9550C49A468E459C11A644 ; MKBv3/FindVUK 1.00 -0x444D360E9E3D6216410C78A27238595B95F8220B = PIRATES2_DEU | V | 0x4C4E97A2731CCB5429950FF5F8B7AA9D ; MKBv3/FindVUK 0.96 -0x8DBDB33F2B16700B357E39ED3EF77A4E9A7BD410 = PIRATES2_GBR | V | 0x5FFD47AA6F7F3A403F107DDE17376883 ; MKBv3/FindVUK 0.96 -0x8D537B9FF5B123B9E92A185B4FD8503C4314197C = PIRATES3_D2_INTL | V | 0xBE1D0BB6B13A6C662843B4F45CEFF9A2 ; MKBv4/FindVUK 1.00 -0xEBA9589428D00A2E3A924980ACD437F8F4B30F6D = PIRATESCARIBBEAN | V | 0xBC4303BA33B8B37BD264565C3CC84F57 -0x9A33D3E4CC5E4DA959319EEC48FB2887E7E8CA27 = PIRATESCARIBBEAN | V | 0x82C8181EAF256CE5284F976E0B0702E3 -0x48C776D4E82C8FA9F1D1039F531397E5B8620226 = PIRATES_3 | V | 0xD3AE9805E34BC97391AD02090B577BBC -0x05A73FA0244B78D34C578925B00708A93ED577CD = PIRATES_BAND_OF_MISFITS | V | 0x6CE98EE4AFDB67FECEDE984D17E5A884 ; MKBv30/FindVUK 0.80 -0x08C514CB91E0E72FBA25EF900B43B8A8F748B648 = PIRATE_OF_CARIBBEAN | V | 0xA66DB62FA54BEB7AD153FF5E1F244DDC ; MKBv3/FindVUK 1.00 -0x0482B44C1802580BB8487650ABAB9A62079B8217 = Pitch Black | V | 0x29DFF4559B50DD85FF1050C496CFD9CE -0x902773EEC0E545B2443B29DA43EE8DF418FC78A5 = Pitch Black (EU) | V | 0x5691D10325BB13B0A6432634D9063688 -0x96A800D655D81802F87FBA38E1E00273BA51CDAF = PITCHPERFECT2_UPB3 (Pitch Perfect 2) | V | 0xAB2E7FDE19B5CDDD8AAD66F505831180 ; MKBv47/FindVUK 0.96 -0x85FB06A39C5316B17EFE07CE773AD81C11A79933 = PITCH_BLACK | V | 0x19C340CDBD7FE2749960C82615D5B5F8 -0x69B24170FDACA832000B9BC1C60B7F9C98DECE4B = PITCH_BLACK (Pitch Black) | V | 0xC46E56B262F8ADD66A035E422559EFD8 ; MKBv9/FindVUK 0.92 -0xF8946D6EA0D88D6227950FC3CAECFF0A43A7FD6A = PITCH_BLACK_G51 | V | 0xC3D06A8FDAC8B12E30D9878B89AEF4A8 -0x3257B95DF1D19EC42BBC26890D100389500ECCC9 = PITCH_BLACK_G51 (Pitch Black) | V | 0x5F0D8EF243F654F242DE668C2DE76968 ; MKBv9/FindVUK 0.94 -0x58B389A3E2B309FE585144D008FD7EFDE5B24C2C = PITCH_BLACK_G51 (Pitch Black) | V | 0x4E856F18917ADA294012D414438D31FB ; MKBv9/FindVUK 0.96 -0xCE0094E3588F1C6CA37F7755BB82723EEC65581B = PITCH_PERFECT_G51 (Pitch Perfect) | V | 0xD780C10F295980E0F525ED572391EBBF ; MKBv36/FindVUK 0.87 -0x0A3A4584DE6DB4FEE29F8DB3DB593E730CDEF262 = PITCH_PERFECT_G51 (Pitch Perfect) | V | 0x645CD10EDD18715FDED40B11E4D3832D ; MKBv37/FindVUK 0.94 -0xD47BEA2E62377AA34CA38BD3F7EF19568480DC12 = PIX0x1AAD1 | V | 0x326F686F10A5629B5EF38B201AC108CB -0x0BCE03B8421F06D2DD1ED8C5CC2F0C8E1F7843E1 = PIX0x1EFD1 | V | 0x47EE117A56713488CD3C3E8A7531E6EC -0x031A56CCAFEE099A6A13C1EBD17DACBF57C9D847 = PIX1EGD1 | V | 0xD3D4316BCF8B5E7161521D7149C9749C -0x080D2D1AA9360F854677CD618CB9A7DA96DEA42F = PIX1EUD1 (Pixar Short Films Collection: | V | 0xB96BB3032FDB344D8F7F009993ECCC70 ; MKBv4/FindVUK 0.94 -0x45F35DCC1C86C171B4336910FCF1731F3ACED8CA = PIX1NNE1 | V | 0xB612F559A5BB5CC2B090E6A74F8054CF -0x880B3C32F0DDE0C9DF66DD5FE7A6334BE13F43D3 = Pixels (Pixels - Blu-ray???) | V | 0x1845214BD2D59F783299167F9F15DE13 ; MKBv57/FindVUK 0.83 -0xC22A9B5284E57639C177784300592C93E71AE1E2 = Pixels (Pixels - Blu-ray???) | V | 0xF5E30C4611FF878E5C686548503B1ADC ; MKBv57/FindVUK 0.89 -0x7DC0817B74FEE9A2FBAD62932D97035B6861834F = Pixels (Pixels - Blu-rayâ„¢) | V | 0x940617BB2EE6F115E915D25F7745394A ; MKBv56/FindVUK 1.02 -0x1B69C4327FD9B2C73B8E0AE638192CB7EA7AA186 = Pixels 3D (Pixels - 3D Blu-ray???) | V | 0x8410D910E951B4BD86242B3E1CA6B286 ; MKBv57/FindVUK 0.89 -0xDF29318D23512A2D4A2BA52C24C0F2B53F12BB75 = PLACE PROMISED | V | 0xF83583E6EA8A7544BB014AA2C5158A70 ; MKBv18/BEE/VUKNOTVAL!/FindVUK 0.96 -0xD7D2E1A3125D1904EE83AEDF355F65B356839DDA = Plamen a Citron | V | 0xE4FD9054E10E0C178F6E078890F41801 ; MKBv21/FindVUK 1.00 -0xE6C5E5D6FAE85D132FB0D691FD6572B1081C9603 = PLANES (Planes - Blu-ray???) | V | 0x36492937CEC90949EBB6AB7A68F64D00 ; MKBv31/FindVUK 0.96 -0x4EE34FFC768817F93A866DBC701BD87E3289171B = PLANES_FIRE_AND_RESCUE (Planes Fire And | V | 0x4284B33E234C2755FFFC2CFDB51BBF39 ; MKBv39/FindVUK 0.83 -0x0B444F6BB010EA50F4817989795192DE9B0DD0A0 = Planet 51 | V | 0x60C5E98F10062A43D3117E60CAE7BD08 -0xE3AC09D4A5EEBEFCEC3055AC7DB7009415F02722 = Planet Earth 1 | V | 0x99365335F5EEF6453EEAB2BA6DBC660B -0xA975EA076A7778E51B4668F1F4DAAF896A9A98E5 = Planet Earth 2 | V | 0xB1D2A72D06586C83741EEEF40AA0D20F -0xB1B81FC197D957DC3075A8FA6D89D64CFF71092A = Planet Earth 3 | V | 0x1B2A6580E855CE228AF24393131A5DB6 -0xF0BF9CEAD662EFFEF24017983DA1DB33A3E4858F = Planet Earth 4 | V | 0x7B1E440A4F3118282241DF0AD023DBBC -0x20AA25A6B10A588D900E692CD76547D2073C154B = Planet Earth BD | V | 0x1CE919478D1CB2287E7836381DA5426D -0x75105849E3A75702B52DC2E4649CCD3E79B27F7C = Planet Earth D2 | V | 0x69E1259DF86F36880F23AE293BC48A80 -0x24E63493BDFB751995739FDC655B36945770C900 = Planet Earth Disc 2 | V | 0x5B382E10786EBD398B304FABF36246BC -0x794B0EC3FD8D26B25E804C494FFDABBF03D81830 = PLANET EARTH DISC 2 | V | 0x04B4468F638275D059BFEC5728348D64 -0x30F7CB5AEA2F209539619B198A7B32E2E473B7F1 = PLANET EARTH DISC 3 | V | 0xA6D9C082B80C420E54EBCF29064166CE -0x1738EFCC4B617193128DCA7E5E108CBB8CD1AA35 = PLANET EARTH DISC 4 | V | 0x43C26497B8A344DFC8240D27D9309AB9 -0x4D492D057E0EC949FADF05263550B6037225B02D = PLANET EARTH DISC1 (Planet Earth 2) | V | 0x48EA4E0BDFF84096B480ECEE7B6F8C1C ; MKBv62/FindVUK 1.00 -0x301689F0339B63C689F8E16DF1DF0B8261E77B2E = PLANET EARTH DISC2 (Planet Earth 2) | V | 0x33500B06DCAB5C0A68445B8899CE8731 ; MKBv62/FindVUK 1.00 -0x0BF3122E3224C894633112435962F66483DD582D = Planet Earth Disk1-BD | V | 0x6832C5BAEE3EF98E825FC6C0A28703AB -0x9D74849DA0ABFF6EE6454EDB319E93163284C08A = planet of the apes (1968) | V | 0xE1C4FC766DF3C039D72DEB6CDE36661D -0x7E664A58FDDD40EA3013E415077755DA820AD740 = PLANET51 | V | 0x7D31BA276A6837F842F7DD75B32DDD2D -0xFAE7D9D980A4114BC902D658D29031AF1BAABCB7 = PLANET51 | V | 0x89F7B3D0EBC963A2F14A6746A3F01DCC -0x3CB8AB66B11AD9BE2148C201172FF37E6D99A696 = PLANET51 | V | 0xBC49835D2F4C805E8F77A1814776F8C0 -0x45AF0EB89D907FF0C50BE91E6790A2F766C7592B = PLANET51 | V | 0xFBDB89042D673749104485C845E1E1F4 -0xED08DAED64384B245944B490B83B315F57DA933A = PLANET51 | V | 0x467E051AD526BA70CE80DEB3A7EB3D54 -0xBB5B87C258F1C472F6C6A1FB7920736E405116A5 = PLANET51 (Planet 51 - Blu-ray???) | V | 0xD6CFF3FDE41DA2F99C1814E5E1FCBE6E ; MKBv16/FindVUK 0.96 -0xCD7EF6D70F7CDD9680C8427F21E49241B2CF972F = Planeta 51 | V | 0xFC559CEC6525352034CE4A9FE36C3994 ; Planet 51 -0x9E2B44FFA26346FC94AD28E7C0AA8FA1FDD525C7 = PLANETA ZIEMIA DYSK1 | V | 0x84363C9D60165873B63A2EF7113EA0F9 -0x3EC7A0D64BCF8FC12AE0535A11DC3E06F61BAC16 = PLANETA ZIEMIA DYSK2 | V | 0x43183D14E3A7F2B52FB650CC440A216A -0x466A3F903FCB944E2A672B3E5B63ABF30CF7CEA5 = PLANETARIAN_HOSHI_NO_HITO (planetarian ～ | V | 0xF03EF14127F98853033E70AACD1F4D76 ; MKBv62/FindVUK 1.00 -0x670546F25E1091CE364640265C991521352A6AE9 = PLANETARIAN_TOKUTEN_DISC (劇場版 planetaria | V | 0x2CB6800D9AB2C6CA2603A15F1AEF3D95 ; MKBv62/FindVUK 1.00 -0x5C46908B767F8CB9DA09F5A9D3130E1F229640FA = PlanetEarth3 | V | 0x797E73F6F51E4DD5114F1F078DF98FD7 -0xDE3172883E2AD345730CFCF8C51FDBDB28D843CC = PLANETETERR0xEBD01 | V | 0xE2FE902EB6486D82261F9CD6D82FBB43 -0x128F2E62C1E140B3A01CB37CE745BA07045C5F2B = PLANETETERR0xEBD01 | V | 0xB810BCD95C11215269C58E553D6860FA -0xF04B30C9BD45610DCB5E6F1BA231759F7BFC32D0 = PLANETETERR0xEBD01 | V | 0x56366B242FED9C580878C8DA130DD31B -0x7169E479A0241B263D4C8CFB30D0ACC4923E4757 = PLANETETERR0xEBD02 | V | 0xD4E3F30629C9C60E2CFFD605AF179502 -0x45B2AC9F3A15F6CA3930D933DFAFCB46C21B316D = PLANETE_TERRE_DISQUE1 | V | 0xE8025FB3C05587B0DEE931A223835D55 -0x33BF8B99326A548D1F2360EF7444BA63F1D5B15F = PLANET_EARTH | V | 0x7185C039F0B2E54291D35B80B319722F -0x4F2247BA3B2D33D263238FF5ED0872A448C03747 = PLANET_EARTH | V | 0x679039C50D094F34E3A616CD37F963BE -0x9DA9984514321A9E6854B64010437EE208D39295 = PLANET_EARTH | V | 0x328AC10676926FE109018664E7E9FBD0 -0x3776624FD8547716D7CFA6B8E00D44E59E1024CA = PLANET_EARTH | V | 0xB21E62A9D4D36AD3F6E046784EE2EAEE ; MKBv3/FindVUK 0.96 -0x666981C56375FA2D8666901BDB3464EB226AF8B5 = PLANET_EARTH | V | 0x554AF7C90EB2D6112E143728FFEE52EE ; MKBv3/FindVUK 0.96 -0x723B169E94403E5AD0DA86B664B7022F68C040E9 = PLANET_EARTH | V | 0x774842A55DF8FE78D418EB7BE16E3C0C ; MKBv4/FindVUK 1.00 -0xF946C086D30F3EE4ECAA4B0EE8E35A942A258868 = PLANET_EARTH | V | 0x8C0856110388D1CB7550832E88D3B186 -0xE83F174817EABBD5BD8634FF791D017D90021549 = PLANET_EARTH | V | 0x4AA441A36EDF5972D3B2CD5C0B388154 ; MKBv3/FindVUK 0.96 -0x0E71D7F590E2CC8CAA57EEC067CD1FD20C43BDBC = PLANET_EARTH | V | 0x9ED7EF1C2EFC8F68277F1EFC237EA340 ; MKBv3/FindVUK 0.96 -0xD13157602C31FA421311F4D79A84EB78AC85601B = PLANET_EARTH | V | 0xEA4D16514CB08CF80CD96A89C3A0A23E ; MKBv4/FindVUK 1.00 -0x0A210ACA62F8415EF42FE0F7EBC4879C1FFBFEB6 = PLANET_EARTH | V | 0x2C99C631D08E88321228DEAE90A0EFC7 ; MKBv4/FindVUK 1.00 -0x48998766E43B8F24079B987FD60CD2910601C52F = PLANET_EARTH | V | 0xBAED677E480869085312CCCD261F46F3 ; MKBv4/FindVUK 1.00 -0xCE9917A82AC22E0BE0520C3656839ABA55360CB6 = PLANET_EARTH | V | 0x6D60624C471F95AAB2E0FD446ACE9815 ; MKBv3/FindVUK 0.96 -0x8E3C1FB3AE029A72157CAB63A24DDD41B5FDDD71 = PLANET_EARTH | V | 0x1D15B05813E9CB5AEAAA4D5DD3446D7C ; MKBv4/FindVUK 1.00 -0xD419B3F5F95C882C930809DADB5A15CFEEFB70C7 = PLANET_EARTH_2_D1 (PLANET EARTH 2 D1) | V | 0x8C66E7EFA4B9A6F2DE88F97BD7393206 ; MKBv62/FindVUK 1.00 -0x1AC24AD2695F58E934A72F522B7E792EC35A7E30 = PLANET_EARTH_2_D2 (PLANET EARTH 2 D2) | V | 0x7C001498B0573DF8947520DFB81A967F ; MKBv62/FindVUK 1.00 -0x04511800543BD3118080EEBDE6D9FD143E6F1698 = PLANET_EARTH_D1 | V | 0x74415B7EF2C6E331A4B6233F49CC999D ; MKBv12/FindVUK 0.98 -0x1AE21563B73DA378FA81ABC5189BB1DA0F49255A = PLANET_EARTH_D1 | V | 0x184EF6300C4C11CB3824BE1213B23CB6 -0x8AAE5DA98805EBE3010A350CB6AB7AFD364ABBAE = PLANET_EARTH_D2 | V | 0x9C80D06F3DD78326149488011ADF685C ; MKBv12/FindVUK 0.98 -0xCC608DE38C319FA012926EB7E94E4E97E22F88DB = PLANET_EARTH_D3 | V | 0x1FC9758FA2DDFD2A610C1DF1C21BDA8F ; MKBv12/FindVUK 0.98 -0x6A236648F3182B67FA3A39EF4B2FA6E268246DD3 = PLANET_EARTH_D3 | V | 0x1B739A7ECBCAE9700F31DE7F056C0E3E -0x2866BF0FDEABFB9E69183B60416B0375AF3BA80D = PLANET_EARTH_D4 | V | 0x3D086CB8E6FFEE7D9E65C59C4127480C -0xDC23FD235837974121DCC947DFDC62A0B9BEF5D3 = PLANET_EARTH_D4 | V | 0x08CB6A6B9AF6ABCD841DC33CBE3660BF ; MKBv12/FindVUK 0.98 -0xBB54486C5B46EA08F53666C45838F367E952C38B = PLANET_EARTH_D5 | V | 0xAB68C932D16A2A8BDBEB916740C89DB0 ; MKBv12/FindVUK 0.98 -0x3D3582757B7BEEA1A6480881E989F2C90F2BC6D4 = PLANET_EARTH_D5 | V | 0x3EFDB8FBEA4A96AD099EC6214FE842B8 -0x23A99DAA02886427E7883C35FCB50039DDFB914D = PLANET_EARTH_II_D1 (PLANET EARTH II D1) | V | 0xFF1041FB91276D302DCBF33FCE0489E2 ; MKBv62/FindVUK 1.02 -0x49D5DE9E95A1C49973A3841CF6B7BFBD1E61A07A = PLANET_EARTH_II_D1 (PLANET EARTH II D1) | V | 0xD97178A13E50A2A4C91C7B43CDE6C646 ; MKBv62/FindVUK 1.02 -0xF836026914E70373329A06E931BFF6F627671A8F = PLANET_EARTH_II_D2 (PLANET EARTH II D2) | V | 0x3B1C832239C1F68319863F098EA23DF6 ; MKBv62/FindVUK 1.02 -0x339BC817E35153822E3D52DE4BFC4552849BC279 = PLANET_EARTH_SE_D1 (Planet Earth Special | V | 0x821E888F0EAE8352C34186030F809402 ; MKBv23/FindVUK 1.02 -0x3216395F81E723C15174ADB20E770F781EBA051D = PLANET_EARTH_SE_D2 (Planet Earth Special | V | 0x5FF0ACA7F3DB4ECB826A0C8253D58205 ; MKBv20/FindVUK 1.02 -0xAC441D895782CE269A4A1AA8E30FC4EC2374939D = PLANET_EARTH_SE_D2 (Planet Earth Special | V | 0x8C23A43FC4A2DF8530A98D644154709A ; MKBv20/FindVUK 1.00 -0xA96DD3FBB09996374885A8250607384F5278B8CF = PLANET_EARTH_SE_D3 (Planet Earth Special | V | 0xE57CFA1ECD93C8ABB05282155C1B977A ; MKBv20/FindVUK 1.02 -0x5D866CD37393337B6A893C6201F28C7482880DFC = PLANET_EARTH_SE_D3 (Planet Earth Special | V | 0x21FB3164CB0CB23C0857EE28D386424D ; MKBv20/FindVUK 1.00 -0xFA58AA73C9A5B5FC03A5CBE4302957906E25E193 = PLANET_EARTH_SE_D4 (Planet Earth Special | V | 0x3036EA1B49A92A0650E942BFDE67960C ; MKBv19/FindVUK 1.02 -0xF6414818E4D3B35BF1F5AD1619583B2CDAB7A16C = PLANET_EARTH_SE_D5 (Planet Earth Special | V | 0x2A9B302D2DDF3B7B7D066F267DD6A74B ; MKBv23/FindVUK 1.02 -0xF94B1339BAD7B8F62DF166CC38DEFAEBFD7B49C3 = PLANET_EARTH_SE_D6 (Planet Earth Special | V | 0x489FAF9D9ADD8B4962F515E299911B7F ; MKBv20/FindVUK 1.02 -0x09B06A523E1ACF4362027F53E419672F4FBD79F8 = PLANET_ERDE_D1 | V | 0x027253E653144DC000FDE652EFAC2F9B -0xB88A10671B4665F680C6AD805436D558AA0B18E0 = PLANET_ERDE_D1 | V | 0x703CC8F2B3EB929B29678CCE8E759B2A -0x4D36E5D77BF6C8FDD9619F0B721915FC385D4BFB = PLANET_ERDE_D2 | V | 0x026B8C37ACBBCA81B730B8362E160CDF -0x5E097C723A1001223D2BF3DFB9E565A05AEE652D = PLANET_ERDE_D2 | V | 0xE40518CE3FF8A1AFEBD48A5A9C12AC42 -0x4798B9240A241135A0C2FC283A9F087D0F261A24 = PLANET_ERDE_D3 | V | 0xA5AFD3E58F18EF35C18D3B87B32526CB -0xFF19AB6CED39C0DA355BA490439A2DDE35BE3EDE = PLANET_ERDE_D3 | V | 0x009C6453316A98AEDA52A98244503AAE ; MKBv4/FindVUK 0.96 -0xF06EFAAB507E5D8912F60323B27FEECC3468D832 = PLANET_ERDE_D4 | V | 0x5E92EFC021767B4599EBF92A72892F62 ; MKBv4/FindVUK 0.96 -0x0280F1DC79CC506D3DA248B7C7779FCFB09C5324 = PLANET_ERDE_D4 | V | 0xD225B90CCA68078350238A2394F8B73A -0x292C02F971923B8F44B5C3D5FB8BF58C25D96F36 = PLANET_ERDE_D4 | V | 0x25D6ED68D8770EA380B7B735FA6EBBC6 -0x5FE1F4ACD0A7D36E814609E565BA13DA88D95635 = PLANET_ERDE_D5 | V | 0x8453E04E1FF2DC8C3CEA22595A7CC3EB -0x955497A571241F971A4C30950648F7F3513A9AD7 = PLANET_ERDE_D5 | V | 0xE01BA1FCC483F2D339A98130B24B9084 -0x843C0D0B82AC417AB0FF4E938162B4BDCD8882AE = PLANET_TERROR_BD (Planet Terror) | V | 0x44C456B5111A937436B9486A636C14A8 ; MKBv9/FindVUK 1.00 -0xA0B3F469B9459AC2CD8E2BC49967053B953411C3 = PLANET_TERROR_BD_D1 | V | 0x639CAA02C211923DBB52EF980049A3D3 -0x35336EECEAA7A195FFA4E13356BB2A189D6A9828 = PLANET_TERROR_UR_BD (Planet Terror) | V | 0xE62C11911B5E24B59D2B954D6C59B1E2 ; MKBv18/FindVUK 0.96 -0x6315ADE77EA2CC98343224D7E6CF66FC806F323B = PLATOON (Platoon) | V | 0x31EC3739ADB651651B7D2E2D5DDB2B47 ; MKBv19/FindVUK 0.96 -0xE41D45462B8569A0983764BB1C9BB62DCFE34570 = PLATTFUSS_AM_NIL (Plattfuss am Nil) | V | 0xB3539A401D64C9DC0C8BFB80D02B3EC5 ; MKBv44/FindVUK 0.96 -0xD5909646154B721C7527A2E5A587592895948A01 = PLATTFUSS_IN_AFRIKA (Plattfuss in Afrika | V | 0x0B5D9467585130BD2D81EA160F2823FC ; MKBv44/FindVUK 0.96 -0x12AC14CCD574CEF0DDF1F37CC547D4971E08892D = PLATTFUSS_RAEUMT_AUF (Plattfuss r??umt a | V | 0x5880D8699EDF15D975A6AA2FAB676BCC ; MKBv44/FindVUK 0.96 -0xD82C81EF4B36FE214DA38701F8538E7DDDDFD8D3 = PLAY MOTEL | V | 0xC80AD9525D25854D8A57C9C1530E61C8 ; MKBv51/FindVUK 0.68 -0x6FE27FE25472A8705B4EB8E1BB8E8EE87CB27382 = PLAYING_FOR_KEEPS (Playing For Keeps) | V | 0xF4CA39D112E6E11BA6232F5A886130AA ; MKBv38/FindVUK 0.87 -0xAE1C57D694A56DE73B141A45263A6855A035097D = PLAYSTATION BEYOND 2 | V | 0xD61A72D510736FADBE3B1185AD975674 -0x006CA711018C66C6105FFF16D2745CE71D839740 = PLAYTIME | V | 0xB1D164D3885755B9FC3E0C8C22B76536 -0x047A3F27B14DFAD93A72B31512CA2366C1948C12 = PLENTY | V | 0xFE6957E7676B217B7F85DE30DC0B37D3 ; MKBv47/FindVUK 0.80 -0x5A929D81B89F4A2503E23776EEF2765A4D2A5B63 = POC3_AUS_DISC1 | V | 0x757EDBABB42BBFE73A5741D5AAAB36B3 ; MKBv4/FindVUK 0.87 -0xF4ACF54E71C57381B577CC5371E2E9F6DB534AD9 = POC3_DEU_DISC1 | V | 0x0833349AEAE044FE5ED57EE5CCC227A4 ; MKBv4/FindVUK 0.96 -0x3ED81D8706437A6D05E98D9D4F472AC43182EE07 = POC3_JPN_DISC1 | V | 0xA2569C7CD6FD9048DE446F996FC51324 -0x5B32342301D1D1C953A5EA75C3E33DEEC5F6E008 = Pocahontas and pocahontas 2 | V | 0x9BC2EF9B2D4BF133E1A9B797004B45E5 -0xAD8C5344A0A3D54C3F91E3C50A5A588ED1B08117 = Pociag | V | 0x7B97B847C6A8CA7BDF7166D5206DC4C1 -0x6E06021F6B2BAFE2EC5AE9315ED253DEABFFC6FB = PODEROSA AFRODITA | V | 0x088C8A52152C7EE98A91763ED63FCA59 -0x4B685976BDEE41B6FA38D49B3CE35690CB9C03EB = POETRY (POETRY) | V | 0x735C242A74CAAC689E2EDCF99F4D9F1A ; MKBv21/FindVUK 1.00 -0xBCEFCD10A06AE7030B7C9B7CFE407380A5AAD6AF = POINT BREAK (Point Break) | V | 0xED58A607AD566EF35A3CAEEB1BA156C4 ; MKBv55/FindVUK 1.02 -0xCF4495B5255FD28281CC1E1425D6C566AE387FE0 = POINT BREAK 2D (POINT BREAK 2D) | V | 0x38A4C2687C11073223246BA27FF51CE0 ; MKBv61/FindVUK 1.00 -0x29E83E4AF876290E2B9A99F6DEAEC3F4AED29662 = POINTBREAK_US | V | 0xD52536295CF1DD9B965BE8BFA1E640B7 -0xD60B15A677A0B282BA7976CE19613D76A0B82B75 = POINT_BLANK (Point Blank - Blu-ray???) | V | 0x54606B26851B4D70B0A686D208D15B22 ; MKBv30/FindVUK 0.91 -0xABE755E006B22F4E48932883B9FEF547EE51D116 = POINT_BREAK | V | 0x7F665A672D2851BD26DCF0A71AEFB243 ; MKBrev 19 - FindVUK 0.54 -0x09CD96F96957C3856D3C49214E9FC91DBB8D93EE = POINT_BREAK (Point Break) | V | 0x0094C88341227C2553839FBB5350AB60 ; MKBv19/FindVUK 1.00 -0x0E423D53E988A21D8F742D9DA4F7AED6B4E333E1 = POINT_BREAK (Point Break) | V | 0xAC4144F6F20BC7D1E0A874B859A0EF21 ; MKBv57/FindVUK 0.92 -0xC1341A4DB4FE2EC1B3C10C274C1563013976F323 = POINT_OF_NO_RETURN_BD01 | V | 0x01DEA9A2100BBF72E1F2D83F7EA79D43 -0xBE6C0B32AECAEBC7BEAF8AA1592A97B132925631 = POINT_OF_NO_RETURN_BD01 | V | 0x3B4C2D944EB8B08F93F927700A8D20E8 -0x833943836AFCA42DDEFC0E960CA73807686CC2BD = POIROT_S1_D1 (Agatha Christie s Poirot: | V | 0x9B5194E389F1669FC7590F0E573FEDCF ; MKBv27/FindVUK 1.00 -0xB914B156A5EAC3ECBA42F64A5E132DD498DF050C = POIROT_S1_D2 (Agatha Christie s Poirot: | V | 0x0194A7B9F864C8A2E8F4A94CF49FE5A6 ; MKBv27/FindVUK 1.00 -0x487D385F9F4B0A44A48640E3EF5DD7C4B2034B4C = POIROT_S2_D1 (Agatha Christie s Poirot: | V | 0x695007CE56733F28C2B5F531837278AC ; MKBv27/FindVUK 1.00 -0x7B735E0409EF82F44951278694CEBF4A850169AC = POIROT_S2_D2 (Agatha Christie s Poirot: | V | 0xFF52E7E2F303668B7B936541374B9FB8 ; MKBv27/FindVUK 1.00 -0x4AC47DFCACA0481903E725952FA7F6643E5989E7 = POIROT_S3_D1 (Agatha Christie s Poirot: | V | 0x59C7E25585DCFD4722094936F7B525F1 ; MKBv27/FindVUK 1.00 -0xA8DFBB12D4FE589B56F3F4CFB0EF444A5C3BD22D = POIROT_S3_D2 (Agatha Christie s Poirot: | V | 0xC45EE0056C9559D1D698F08B5F0C62E7 ; MKBv27/FindVUK 1.00 -0x2FE38121EECA98751A4BE9489E6A6AB151E42008 = POIROT_S3_D3 (Agatha Christie s Poirot: | V | 0x93E8C80312636EF9F90D491B2D52CE66 ; MKBv27/FindVUK 1.00 -0x00A39F5DF8F7CFE9A5310326FFB3552A7BB1925C = POKEMON MOVIE 1 (Pokemon The First Movie | V | 0x0A496CACF767FF074140F33A65D1C6B5 ; MKBv57/FindVUK 1.00 -0x8C56D7F2CBDC101BF218B991B11A9FADBE7F3062 = POKEMON MOVIE 2 (Pokemon The Movie 2000) | V | 0x9DF29AE9CDB5D1ECC7D6757778948B86 ; MKBv57/FindVUK 1.00 -0x2E760345896028E76C687B2C53813A89B38AA80C = POKEMON MOVIE 3 (Pokemon 3 The Movie) | V | 0x13806639AF2DCCE10E710ACCD4950B7C ; MKBv57/FindVUK 1.00 -0x6076649538067776DB3383424742D1C497308483 = POLAR EXPRESS | V | 0x83DD7C4966B917378CA9309C7B3A6ADC -0xA86C259984B90218D63C900544B42E0F8E6F5351 = Polar Express, The | V | 0xAF636EEAF15FBE07EACD143BEE5C0202 -0x66F38BA844189F1D733B44674F3DB121D356E2E7 = POLARKREIS | V | 0x05DC2A2C9AC5B7B3F49275654BBFECDA ; MKBv28/FindVUK 1.00 -0xA1A8E5E102442600A6FBCF6A131B1A33DBAE0B0B = Polar_Express_3D (Polar Express 3D) | V | 0x4A58737A64D078E65F254DFF6295A3A9 ; MKBv19/FindVUK 0.87 -0x638D4C397E20F8CA44A4CCBABBBAFB976A2B81AC = POLAR_EXPRESS_B5 | V | 0x2C9103CA31827872ABFCCC48EBCB50C8 ; MKBv4/FindVUK 0.96 -0xED4C494DE937C73A46F99353D89A4A57437150F3 = POLDARK S2 DISC 1 (Poldark Season 2 Disc | V | 0xD47EA41C7CFAA9FD5D6BC26F1666FE4C ; MKBv62/FindVUK 1.00 -0xE5FA68D766EF003F5786F56A8E51BD2FCAEC2D0D = POLDARK S2 DISC 2 (Poldark Season 2 Disc | V | 0x8A0F17B9F18E43155B7BAF44E7AF98BE ; MKBv62/FindVUK 1.00 -0x830503BFD7F46DFB636EB208E55672672444BE17 = POLDARK S2 DISC 3 (Poldark Season 2 Disc | V | 0x86880C676CD78511238E59778481E461 ; MKBv62/FindVUK 1.00 -0xFD0F4C349855DC19922A09A419E04FACB4D33609 = POLICE ACADEMY 4 (Police Academy 4: Citi | V | 0x0F38F47C68062B18101D89F008941A2D ; MKBv36/FindVUK 0.89 -0x5476C299DFF01AF1D0179E286CDD1B4C25B7BBC4 = POLICE ACADEMY 6 (Police Academy 6: City | V | 0xD39147CDE22124FF7F81FAD6098259B3 ; MKBv36/FindVUK 0.89 -0x14520BE8E1D530CC972709F8785F661F71ACF16F = POLICE STORY BACK FOR LAW (Police Story | V | 0xD388FB8CC0A1EEB3D43B9B76958B1F71 ; MKBv44/FindVUK 1.00 -0xC6050CCBEE1FF3BDCE69EE25E3805108C3415FBC = POLICE_ACADEMY (POLICE ACADEMY) | V | 0xEF044E2457B4667627BA271407DDC011 ; MKBv27/FindVUK 0.92 -0xA00B84200CB52DD91433B5D5CF8A9600037F7E46 = POLICE_ACADEMY (POLICE ACADEMY) | V | 0xEBEBD94C95ED8FC77C815AF0B0918A43 ; MKBv27/FindVUK 0.89 -0x8732463433D93CD914B20B2624C7674309F1B5D8 = POLICE_ACADEMY (POLICE ACADEMY) | V | 0x06D81CED90FC23FB68157E4749652249 ; MKBv27/FindVUK 0.96 -0x8FCE86BC59376F60EB4B5856AFAAF500E721C945 = POLICE_ACADEMY_2 (POLICE ACADEMY 2: THEI | V | 0xA66BFE41FED322A0556C41E091687D01 ; MKBv20/FindVUK 0.96 -0xBCFDEF89A5239C2AD7F28FEEF75AACF0B3FA079B = POLICE_ACADEMY_2 (POLICE ACADEMY 2: THEI | V | 0x6B7DA3A0A19E6972462049417F542CD9 ; MKBv20/FindVUK 0.89 -0x7FA727E732D26905C79A531A87C5EF35F3D65F2E = POLICE_ACADEMY_2 (POLICE ACADEMY 2: THEI | V | 0x79AC9C9FC55C4FAFB6D2E4BA087699DB ; MKBv20/FindVUK 0.92 -0xB2D5F2B88959542A5321820D4D86297ABBEFB5F6 = POLICE_ACADEMY_3 (Police Academy 3: Back | V | 0xA956272C3E5A783678E1868693AFB75F ; MKBv36/FindVUK 0.89 -0x37388D0B7F4B87F5799ECA6EB3F6D06143665C06 = POLICE_ACADEMY_5 (Police Academy 5: Assi | V | 0xB7091B0F6B47582CB3F6A4444B420940 ; MKBv36/FindVUK 0.89 -0x06E92613253B1341C879D32024632A0850B2F573 = POLICE_ACADEMY_7 (Police Academy: Missio | V | 0xAB3F73C98382D3272EA096E8EB03EFD9 ; MKBv36/FindVUK 0.89 -0x80CE80F816759C154DB080246888AAF519D074A3 = POLICE_ACADEMY_7 (Police Academy: Missio | V | 0x8055FC5B5C3AC812B990709025CF302C ; MKBv36/FindVUK 0.92 -0xFA60EC8D898CF9324F4CF16FB969E5B878763AF5 = POLLUX_V2 | V | 0x95327D6999F35F86F4CA78652E8D050E -0x3E7664E5BDA60054C28CFC9912A8F05833A7AED5 = Poltergeist (Poltergeist) | V | 0x4D59689628097F7CF934D47D8482F165 ; MKBv50/BD+/BEE/FindVUK 0.92c -0x6EA49D08298A98F17808FA141C6835C5538B7D7C = POLTERGEIST_DE_BD03_DIM1 | V | 0xE702C0BC65760056DD27FF3535B99286 ; MKBv8/FindVUK 1.00 -0x980E8A377BC3E4AC119E2FEE5E9DFF24D07A9CCF = POLTERGEIST_DE_BD03_DIM1 | V | 0xEFB9B2AF6BA3D6508F4D71299BAD6D46 ; MKBv8/FindVUK 1.00 -0x0B1FF2DB0A616507379E6AB141885C55A91B5E59 = POM POKO (Pom Poko) | V | 0xEB9FED49AA9233ADD8F74CA24B2164D1 ; MKBv46/FindVUK 1.00 -0x6642438A5876A8813514C6B442A018C61A09413B = POMPEII (Pompeii) | V | 0x2B3A13862C2F176F271350CE8CE4B9F2 ; MKBv47/FindVUK 0.84 -0xDBC8C4C784BD6375D603EC012DFC1C128EAAA824 = POMPOKO (POMPOKO) | V | 0xECC4117C480FD97DBA0325230D70AB4A ; MKBv52/FindVUK 1.00 -0xD36866503BC1EF0A7F6CF0748D4D444237E5B7C3 = Ponte Para Terabitia | V | 0xDFC62CB3FC98100A0C32E0BE5C354B93 -0xD872461FA043F635C5E3FA949DAC218D49BB4AD5 = Pontypool | V | 0xF8CAD2BE3E964F001AE30FF5516D24EE -0x7AAA95D4DB40F60A7AC241DD6CB1E28A10EDE953 = PONYO | V | 0xAD0B89109C66CA25A4F2B1F940BC011F -0x0CAD17B76AD9DAF3E241CB71C61C9E9FA0311556 = ponyo | V | 0x39F1AD9F0C820710B1162D4A26A539C2 -0xA7F101CB51B9A52E285933F14E1DE2BA22CEFC47 = PONYO | V | 0xB4B7D26B658754B8CF01FF9994A3BEF0 ; MKBv17/FindVUK 0.81 -0x1B6DBF1B8A8AD60B981BA461CEB695756116DFF9 = PONYO (ESP) | V | 0x8524046EEC12F0940C1AA1D4F4BCBD86 ; mkbv16 -0x4DD514B415E245596765E4A2D855E42F88A90BF9 = PONYO (Miyazaki Collection ??? Ponyo - B | V | 0xD1C6E86C58B063EDBEF6FC5F514BFDC4 ; MKBv50/FindVUK 0.96 -0xBAD6121F0F4E979413606806F41C3908EDD819C8 = PONYO_BD (Ponyo) | V | 0x60A5480EA1880F7C254B3AF22FA2421C ; MKBv21/FindVUK 0.98 -0xF7AECA9C475EA53E8BBA25DCACDA7FC9A1049C03 = PONYO_BD_US | V | 0x3417FCDDA377BFCD7A026B8E7A5492D8 -0xC90FC4746333DC4654F0CF020E5A07E7E455FFCE = Popiol i diament | V | 0x8D8C600E452BD00E5FB0981BE1422833 -0x41747D249700E1BD83E19795B961A73F73AC6E93 = POPULAIRE (Populaire) | V | 0x38EC3647DF7FFCBC95FEF242D1E961C2 ; MKBv40/FindVUK 0.98 -0x65CAEFF7C9EE2767490FDCE7437141A4AFE8CD97 = PORCELAIN_BDROM | V | 0x5020C92D59F5E4A56DA610E734F204B0 -0x3E92F2E1085085D68BFDFB31CB62CD4626631EF5 = PORCO ROSSO (Porco Rosso) | V | 0x911F3EBF4ED1FD5C413F77C0AB58A376 ; MKBv52/FindVUK 1.00 -0xD96A940A9A5EA5DC3B09A773935C198A99148CB9 = PORCO_ROSSO (Miyazaki Collection ??? Por | V | 0x27F18E225F868150D3C6A0B56D5A9FD9 ; MKBv50/FindVUK 0.96 -0xD2D87E801FDBC575F9A25441AB255944C4280873 = PORCO_ROSSO (Porco Rosso) | V | 0x7399196E8677474A7FA4FEEBDFF2A9E7 ; MKBv44/FindVUK 0.98 -0x54F93426CF5214F499E5E011DCA3CEBCE22EE8AE = PORTER_ROBINSON_MADEON_SHELTER | V | 0xDC6175601FBCA3C031818B3AA6663D0E ; Shelter: Complete Edition (Japan) -0xF0392A5AB7F13137599222A057DF9DDCDEF60042 = POSEIDON | V | 0xEB8E8736D6DF73E2D4A8CD2BCEF099F5 -0x0C7A461C0B1A0E34D9D2810886518FC1C0576036 = POSEIDON_ADVENTURE | V | 0x413F2490A4E35A42A304EEA75AF1AEE6 ; MKBv20/BD+/FindVUK 0.72 -0x27C243FA1CDE318B408E1C469C5FF393C7B46F0A = POSLANCY | V | 0x3695F75A2D2274B232CA0519A40E3E3C -0xF6807C6573F487602A7B412F1F477C7A8D2C88C8 = POSTAL DC | V | 0x65EDDD6024CCF4B936513E0F67774FB0 ; MKBv9/FindVUK 0.80 -0xDC829609EDF95780C4F5FFDEB2770130C3D79596 = POST_GRAD | V | 0x44ADFED03D9FE6FF997713225FB50B31 -0x317647AAAD794418BD849DBF2410BBC60BA08B00 = POT0xA2001 | V | 0x3F4AE91097E49CA884C2024F79B2A00A -0xD0A6F793E8D016732816D6D54CA768F3972EC64C = POTA2001 | V | 0x77C4AAA34AB0EE3F2C2E0DEE6DAB2A6A ; MKBv14/FindVUK 0.96 -0x1DC04DFCCCFDCB99B8E5950D2AA0D405C0F73814 = POTA_F1 (Planet of the Apes (1968)) | V | 0xD5EAE7F345773203191AAA1444DF3C4A ; MKBv9/BD+/FindVUK 0.96 -0xED89326BBFF7CCFA81EF575B8025828DA137FA76 = POTA_F1 (Planet of the Apes (1968)) | V | 0x3E51E50AAA5A5970032B9FE5CEDC4194 ; MKBv9/BD+/FindVUK 0.98 -0xB6410E35FFA0EFCA8B3F776BE2E581E2BA0F7B25 = POTA_F3 | V | 0x34009945C26D3E9509496C0E77A20611 -0x89A728C353B3E082727E7B7EA60331A55930F57D = POTA_F6 | V | 0xE7A882CEB8EDE89431C5265EB414C75B -0x4F9104F8D6DA982F8B5CCF33FF1069B66205B1A6 = POWAQQATSI (POWAQQATSI) | V | 0xD1E87A1E4870135D46BE4F50452235BC ; MKBv35/FindVUK 0.96 -0x22324FDE85FD076C353FC5EE16DE2CE5F889B989 = POWDER_BLUE | V | 0x8B2ACABE5BA5172FA97B41DE10A1EA8C -0xFD8B5BED91B58B2F41C67D551060E939D316CAE9 = PPL0x1AAE1 | V | 0x85CE2B3DA66A2FE77170D05AA63E2875 -0xB244B21F5DCEBE768AE62AD57C10524D4BE68A99 = PPL1EUE1 | V | 0x1039E6E0C85FB5612B037B0B3044833F -0xA2823323CA651A7B31E54685F3F50B3CDBE43F56 = PPL1JJE1 | V | 0x013778EBC2287394FB2783A1B763656D -0xFC7C84DA4F1E4AE9F49034387A404B5490B1470C = PPL1NNE1 | V | 0x23A51E012C034ABF4AE43DA56DA714D4 -0x21E68039B1F85EFC1A3309D43B650C6C972AD96C = PR0xC1EEE1 | V | 0x75AF4E2EB477E911A50985A7176CC9B7 -0x12B74934865EC49F8E1526A38701B586290D30F2 = PR41AAE1 (Pirates of the Caribbean: On S | V | 0x721C76DE16B553E8D3C9E7AAB1E584D4 ; MKBv23/FindVUK 1.00 -0x5EBC28BF364B419F6CFE36F3B6849ED86D7B321F = PR41AAE2 (Pirates of the Caribbean: On S | V | 0x68B75C1F80EB1C90BC5B41C0A5B89689 ; MKBv23/FindVUK 0.87 -0x79F31CFF14A4FE3A9752D99FD2DAAA53B9CB339C = PR41EGE1 (Pirates of the Caribbean: On S | V | 0xD1B049C832C25D7B0DF5E049D0C6F2F2 ; MKBv23/FindVUK 0.96 -0x2626A7B446931679AA368071DE197E25A11EF23B = PR41EGE2 | V | 0x3517AB4F3F331C2392AC0D26FEDF6F41 ; MKBv20/FindVUK 0.80 -0x3F19680A85540B8D1656630BD6A6A1C58085BBCB = PR41EUE1 (Pirates of the Caribbean: On S | V | 0x18964D555FD4048292EE0C0F37CCFB4A ; MKBv20/FindVUK 0.98 -0xF893A76F4C6DBC4A01B69012EBE657607F1E1F86 = PR41HLE3 (Pirates of the Caribbean: On S | V | 0x52B7E2CB5DC9D7EE01D57054BF7D0EB3 ; MKBv23/FindVUK 0.96 -0x6E676BFCB7EC7F3A85F5F3227BE2F68C37DAD18A = PRC1EES1 | V | 0x87F10AFA5446BAF4FE099284D72F2595 -0x314114706D88C27C3D4A22AF8A2F76CA859DFDA3 = PRC1EES1 (THE CHRONICLES OF NARNIA: PRIN | V | 0x3C0AAE7D0F2D3A30961B7A635B97AE6A ; MKBv8/FindVUK 0.94 -0x8848EC29252363F732AF673553BE24E28073ED22 = PRC1EGE1 (THE CHRONICLES OF NARNIA: PRIN | V | 0x7BAFB1871FBE5233A793A8296E8CE936 ; MKBv9/FindVUK 0.83 -0x0D6B5E8ABCE7B0B81BD957F6B7DE80D3980EB1C6 = PRC1EXE1 | V | 0xC0BE0ECA81002E7116EF51611C43AA7D -0xA8A1558FB73837891F3FB575D09BEBF10F0166D7 = PRC1HLE1 | V | 0x761FD1510F22A427A2137573E7AF0401 -0xBCF8EF59EE5DE58075D85F2FDA3AEE9BA3BF3E43 = PRC1NNE1 (THE CHRONICLES OF NARNIA: PRIN | V | 0xA70A8DF0A616E75187F7C4988CB0D73A ; MKBv9/FindVUK 0.96 -0x12F1130D9C6F36A8C5BCB6702405F68EA37259D4 = PRC1NNS1 (THE CHRONICLES OF NARNIA: PRIN | V | 0x23933E6CD7232141E56E4C8FB8B9D79A ; MKBv9/FindVUK 0.96 -0x60656DADA3890F376541F62DD07D0AAACF623D56 = PRECIOUS | V | 0x8669319210C2C98B5AE35F757ED20975 -0x0032B2FF63B30FBCD36B88DB48397C573839D291 = Predator (Predator) | V | 0x782B3C6227DABE2793142FDE84941943 ; MKBv35/BD+/BEE/FindVUK 1.02 -0xB4521892D6DE7D992AC0A5C393F79517DDD1B82C = Predator 2 | V | 0x83D715BA81BF2776FC484523476A6CF9 -0x251EDD924AB7B5CFD9FF686FE137AC48CAA52E89 = PREDATORS_F1 (Predators) | V | 0x7C16AF2C9CA2ADF57F44C6384A73B3B3 ; MKBv19/BD+/FindVUK 1.00 -0x5C4F0B32C59319B9D0368A93AD6E0AEA07E480A1 = PREDATORS_F3 | V | 0x4AAFAD396B08D157CA0DFDB13CD03AEC ; MKBrev 19 - BD+ - FindVUK 0.57 -0x921E86FE9DCBA3CEFB43F1B95C3B9481E3E5D757 = PREDATORS_F3 (Predators) | V | 0x2C682E302E906BA039918FA5F06D7A53 ; MKBv19/BD+/FindVUK 0.96 -0x77DF1154BD55F7B4560DE42312ABB098B0E50390 = PREDATOR_2_F1 | V | 0xAA3807E0DBD7E93FA96F1E90BD02C752 ; MKBrev 9 - BD+ - FindVUK 0.57 -0x6FE64C6332B8B45977FC400F71D1410013066C12 = PREDATOR_2_F1 | V | 0xB29681BAA3CCB885CCC72F416D33B8EC ; MKBv9/BD+/FindVUK 0.91 -0x303425F1DCDE632D037BEEFA31C72A47E88F5245 = PREDATOR_2_F1 | V | 0x42824FD1C1D7F53018F18F70C6031CE6 ; MKBv9/BD+/FindVUK 1.00 -0x86B6F866C734BFCEDF8D7C17F305191156394A71 = PREDATOR_2_F6 | V | 0x29FEBC85AAB058C988F7797EE1EE487B -0x8D4338D2D2EEF31CFFE3468CF6342088DCD9B9E7 = PREDATOR_F1 | V | 0x8885530DFDD106F7F40373E2EF37EBB8 -0x9E516486F679244A045CC4886F55C2D33830F993 = PREDATOR_F1 (PREDATOR) | V | 0x3DE5651A814A571625D24F335125105A ; MKBv17/BD+/FindVUK 1.00 -0x54E6467B6CD9DC7AE5C5F4447D2C17EA83FBF82B = PREDATOR_F1 (PREDATOR) | V | 0xC01AA4A56B602F4DA29DAF517FD837DD ; MKBv17/BD+/FindVUK 1.00 -0xAA5B2D0735BF048400155066E30221C5ABB12AB4 = PREDATOR_WW | V | 0xB76C27FA66EE9AD05DB31BEC97F1A46E ; MKBrev 16 - BD+ - FindVUK 0.57 -0x22C48715427ADC079F105E254B0619704D12C824 = PREDATOR_WW | V | 0xEECE272FAC452C3C26AC3B30BC9B7EBF -0xB0DE699E73A38EE63B3950F22B32077AB9FCF4E8 = PREDATOR_WW (Predator) | V | 0xD448AA344572EC694CCA000257BF8BA6 ; MKBv16/BD+/FindVUK 1.00 -0xC57A772D19F81FE96B6450554BE8BD26E5FDE15A = PREDATOR_WW (Predator) | V | 0x66F49A9E7C5A1CDB60335CAFEEB464A1 ; MKBv16/BD+/FindVUK 0.96 -0x3D6611A260CA1D0BF5248BB677A23468F514BCF3 = Predestination (Predestination) | V | 0xB255873F246245AC6B1A2C77CF6B554E ; MKBv50/FindVUK 1.02 -0x5DB0F8FB1D9B1395A900C68C053EA84C6EB38593 = Predestination (Predestination) | V | 0x08AF19C33F52F086C174D5844248F119 ; MKBv51/FindVUK 0.92 -0x175730AADF065F4892313ABB0754CCC05CDA03E3 = Predestination 3D (Predestination 3D) | V | 0x96786F2461B4CA028955FDF0F0471602 ; MKBv50/FindVUK 0.95 -0xFEB3DFED78E464A8EEAD1F7DCA873054E6ECF2EC = PREDICTIONS | V | 0xDED127253953A7298025E461D34D0FA3 ; mkb v14 -0xDD8EB8C8082429CFCD99161AD3CA55E44DB89497 = PREMONITION | V | 0x718D0DC1B8C5AD64FF15CEE80B5858BF -0x8F704E572AAB3A49E3F8B21525E866B55220FD0A = PRESAGIO FINALE FIRST SNOW | V | 0xDEECDDBFD1159330A22BA17AE74B419A -0x9D418E0FF25354401180850F8A4AF970E45C96F6 = PRESIDENT_MEN_BD01 (All the President s | V | 0xA39CB8D7E2A4E8E467F882F44509C823 ; MKBv19/FindVUK 0.96 -0x15048631D5CCFAEF20BE728091A833FA4538679A = PRESUME COUPABLE | V | 0x5CE9171257291DC6B6980A96012BA170 -0xB1CFBCFE13A4D93DC09EAB4EF0DF7D98F2518CE2 = PRETTY_WOMAN_USA | V | 0x8257E589F6E80CC87F3D510EAC53BCD2 -0xD963715F4041525AE9D514DD340BB0836F4FFA8D = PRI1NNE1 | V | 0x5CABFD6F73523A5289BD120AE56232AF -0x0BA750502032E7942420206A73D8CC9361ECD9D0 = Priceless | V | 0xDF58EF13C520C914A083D426AC964F0F -0xFABD41A9E084346BD48E654C9B8868ABCB11D4D1 = Pride And Glory | V | 0xDFD59C384E5B58B8994570CF038F2B83 -0x2F55E07AB9A134F8853E8B74CE5134B8EA6DE383 = Pride and Glory (Nordic) | V | 0x3FD857A0B79A83DD4B02D8D8AB7983E9 -0x8A97F59C99AA5275F42752F0D6FE2C74984552AD = PRIDE_ | V | 0xEDF17E58B8A610E46549A737EABDEAD4 ; MKBv61/FindVUK 1.00 -0x1DA78862D0579C15A07F963172BF1F8AEA4790C4 = PRIDE_AND_GLORY | V | 0x06733D22C643DCD0C4ECEE25F671F6F1 -0xE86FD8BF895001C176835494A609C1BFA4F0565B = PRIDE_AND_GLORY | V | 0xFA3B5D96E9AD096D6FE5976AAF0A4C12 -0x030680E66772C1162CBDDEA94F69C93F197264BC = PRIDE_PREJUDICE | V | 0x2E2AF143B91F21193B6AB83045B70ACF -0xCE6333B1341A93CF0C0FF4A9DC4534F8721297CD = PRIDE_PREJUDICE_D1 | V | 0xE9044FE1A5921D0E7F26D4F7AEA266DA -0xFF93417FE361343F0D08061F6C4044E21D47411F = PRIDE_PREJUDICE_D2 | V | 0x6E9BBB6523DF671795AB19DC0E9CF8D6 -0x27FECB59F39B51AFA6E825CE9C581E0C884FF74D = PRIDE_PREJUDICE_G51 | V | 0xCE097A605DB2418794A1A58B2A58FD45 -0x6C755FA2EDC3C2380E325D604074E07D919AC35E = PRIDE_PREJUDICE_UK_D1 | V | 0x923085B60F925FA329A24F44296D7FC0 ; MKBv8/FindVUK 1.00 -0x267D76CDA8905DB688CBE58E24161ED29C9C20DA = PRIDE_PREJUDICE_UK_D2 | V | 0x01265F288D806441782EB3C2191A8631 ; MKBv10/FindVUK 1.00 -0xFA2595E55AC7CAF924E88CD4C4B729FBC1AAA095 = Priest | V | 0x0356EA042E1BB5E66EB05FCF83BB544E -0x449157B653288EBB9ED5D5BC2CC6F98687B9BC24 = PRIEST (Priest (2011) - Blu-rayâ„¢) | V | 0x179E46BA524944FD442A372A31E6417E ; MKBv23/FindVUK 1.02 -0x4C0EEE8172C4E2282EB065EDBA2DC98C7FF381F0 = PRIEST_2011_3D (Priest (2011) (3D) - Blu | V | 0x778F6A68EE66771DF985FDA2F47ECA16 ; MKBv23/FindVUK 0.84 -0x8AABA9C0B6F351BA59FF67A7BE19B89E32C1F1F0 = PRIMAL_FEAR | V | 0x58DA1A07FF11E79827AC946CBDB3B976 -0x518EFEF5DCA9CA090F03CF419B96FAC88FEB07D3 = PRIMAL_FEAR | V | 0xB3DD72F8AB4E7DD1BFC18EDC648E71A1 -0x1A975B3513159FDB69923534C0A69E6A2A6DC6A8 = PRIMEVAL_NEW_WORLD_D1 (Primeval New Worl | V | 0x2858028A9CFB7020C2F1755F80079142 ; MKBv35/FindVUK 1.00 -0xA1EB9C6CD4BBBABA055E0D7A8D6EB15A743B69EF = PRIMEVAL_NEW_WORLD_D2 (Primeval New Worl | V | 0x78809139BCF15DCF79262799CCBC63AC ; MKBv35/FindVUK 1.00 -0x29E8F001E73BBDDA0FE84DEF6977DDDDF43F614D = PRIMEVAL_NEW_WORLD_D3 (Primeval New Worl | V | 0x62EE1F3D8EB38E6B2F311B95FCD42627 ; MKBv35/FindVUK 1.00 -0x9ED010535B45D2D9708BB76C464D6AF77F51080B = PRINCE OF PERSIA (UK) | V | 0x4710E870CC139AAADBD3CB783413661D -0xEFBA025896E639F259100A4035BAD71A17767887 = PRINCE VALIANT | V | 0x90AF1807766A53DD0B10AF9B7E8BE240 -0x524AD9CC6F216837E4EA874FECA1FD6BC20952BD = PRINCEOFPERSIA_USA | V | 0x7F0F85D4C3CA32386DFF766C91532444 ; mkbv17 -0x0206C20DD2823B58C82C30F7BA791ED81BF689FA = PRINCESS MONONOKE (Princess Mononoke) | V | 0x856790576A64C8EA48EB157E15777514 ; MKBv47/FindVUK 1.00 -0x36581981B284426C0D24D97E37A3703527162E4D = PRINCESSANDTHEFROG | V | 0x7F3D40FBE127C284D4891E21612D8186 -0xC1326E9FA1182819C345DA11E37E17AAFBC7A3CA = PRINCESSANDTHEFROG | V | 0x361EA0BD114B2618258E648425786CD2 -0x02AB1571294D49962F70EFCA54616214895DBD6A = PRINCESSANDTHEFROG | V | 0x84CC21F0156599E6FD2BECB2F95D0AF7 -0x80BAD79466BAE4F29B7F21F48AE465643CE5FBB2 = PRINCESSANDTHEFROG | V | 0xFF210235754E35DE7674658109169265 -0xE089C59A67653BEA7AF7C8607F236C9FB411D908 = PRINCESSANDTHEFROG | V | 0xDCE1AA78212F98E6F890F8677ACD887F -0xFDD2CA9D5F1A23679BF7F634A4DBEB8E93DF8B53 = PRINCESSANDTHEFROG | V | 0x39A60D78C2D51695B6416B8FA644130D -0x3CE226779935FC5A9DF1A1BFD25423F2F03EE6B5 = PRINCESSANDTHEFROG (The Princess and the | V | 0xA5024EE263CFB533FF192557932BACFF ; MKBv16/FindVUK 0.96 -0x19D565FCF46C6E9BCF07C4746FF0C5F18C62D4BE = PRINCESSKAGUYA_NA (The Tale of ThePrince | V | 0xD1FD185D4E2FFE6FC053F042201EC677 ; MKBv39/FindVUK 0.92 -0xB032567D1FDA4BE6B6CB0EB55883F646122AF011 = PRINCESS_MONONOKE | V | 0xF7108E9F23B6E7E692CA4424D9E362A6 ; MKBv39/FindVUK 0.65 -0x9D2B47017265C1D8430DB0CFB3187E996BDF8C0F = PRINCESS_MONONOKE (Miyazaki Collection - | V | 0x3914CA5EE5B0FBE8316D334EF152C402 ; MKBv46/FindVUK 0.96 -0x37ED37348C51088F2FFFAFE942E0F5AD923E2F1A = Prince_of_Darkness (Prince of Darkness) | V | 0x3D304A1627E62CFFE22FDA61360282B8 ; MKBv38/FindVUK 1.02 -0xA94BE741770F818F43C6FE39F7D40712DEAB697A = PRINCE_OF_PERSIA (Prince of Persia: The | V | 0xBFEB4AC802CC5C8822EAC3CDCB0B8055 ; MKBv17/FindVUK 0.96 -0xF9B6A84BE2C951E24D052EBA0FF9D9B0542A40FF = PRINCE_SIGN_OF_THE_TIMES | V | 0x933960C00DC8921F3E551ACAAF8112BA ; MKBv46/FindVUK 0.96 -0x3548FF82CDB211FC0A0D329E780E72E055379B8E = PRINZESSIN_KAGUYA (Die Legende der Prinz | V | 0x68057CDA627F0ECD9837DC1DD921D712 ; MKBv52/FindVUK 1.00 -0x360FE98AB41B6DEBD1DBA5706A2CD53E3AFA0022 = PRISONBREAKS3D1 | V | 0xE57D7E8F5077429A70650C5B3615A5EB ; MKBv7/BD+/FindVUK 0.98 -0xBE4AF4373D3973A7B8531102E589231A5154D087 = PRISONBREAKS3D2 | V | 0x17121D67CA08959C977DCFBAAF32EA27 ; MKBv7/BD+/FindVUK 0.98 -0x5560EF4D81957FB901097D6AFA9EB98D86D125BB = PRISONBREAKS3D3 | V | 0x2EAA4CD1756718575411BC65BB6B44DC ; MKBv7/BD+/FindVUK 0.98 -0x5EB56383A40AFF00D2C607DB0794051D0D35266A = PRISONBREAKS3D4 | V | 0xAB9D83762023FD9B96265EAFA8725685 ; MKBv7/BD+/FindVUK 0.98 -0x76C301A267BA4944BD9542977C681C8A3D3CA2F9 = PRISONB_S1D1 | V | 0xA905396F10BDE1DED3EA79B44047CD66 ; MKBv7/FindVUK 0.81 -0xEB0F58306EB99FC4E9C01A6D78FBD93353A7AC57 = PRISONB_S1D3 | V | 0x9C6B99C79CD7921661C68A26F9CDD067 ; MKBv7/FindVUK 0.81 -0x4CFCFCDD55E0DF7CE33F7C406BF35512AA3AA248 = PRISONB_S1D4 | V | 0x84E0D607F66A713810D971F9C249757F ; MKBv7/FindVUK 0.81 -0x5ACB25AF1F5052555A931BABB59A55EA1ADC4A0D = PRISONB_S1D5 | V | 0x4F1155BE2D6811ED27552F09B8017CF5 ; MKBv8/FindVUK 0.81 -0xF936E8032D5D399562D211A553695F791FBC2637 = PRISONB_S1D6 | V | 0x9043118B82E7BE725678ED23B071037A ; MKBv8/FindVUK 0.81 -0x97806B94F5A30AD9D1DCEE26B2706727A3F7E48A = PRISONER DISC1 | V | 0x4AB9321B39B5D07FC0A4C8E9B1C86C88 ; MKBv14/FindVUK 0.86.3 -0x540EE0381D6B4164A5D055FC2818DEE1C24B6DEF = PRISONER DISC2 | V | 0xB51653C8ABD5865EA5DEE8227D0846D4 ; MKBv14/FindVUK 0.86.3 -0xF5BE012B00F3A0C75E6E99850784FACCE0605998 = PRISONER DISC3 | V | 0x088FE96B5470EB6223B1257B9257AB91 -0x18A08C77EB54EF410A1EA9D1D932B4C9908CFD42 = PRISONER DISC4 | V | 0xE086E793ADC4A48C4CA4A5868C777065 ; MKBv14/FindVUK 0.86.3 -0xF8FCC334B3E2851B34A43614490EF0CF8F22CA6E = PRISONERS | V | 0x05ED9E3E046C88656BBD1429A189E9EA ; MKBv44/FindVUK 1.00 -0x039A9B27E872A763587512FA2E738AF47D639E83 = PRISON_BREAK | V | 0x10039B8032CDD445B7C3132179835E5F ; MKBv14/BD+/FindVUK 0.81 -0xC3757768218F3FFDFA5B86A7376F623E9CB1E3E5 = PRISON_BREAK (Prison Break - Season 4 - | V | 0x0CC0680FCD9799730068490B44200A89 ; MKBv16/BD+/FindVUK 0.98 -0x88BD276205683C7CF8F0D7EE81DCEBB5A0B0C1E8 = PRISON_BREAK (Prison Break - Season 4 - | V | 0xCAEE3ECDD8FE71FCA9DF733616617A95 ; MKBv14/BD+/FindVUK 0.98 -0xF8BBE196281309D14B492ACBF3965BF6FA48BA67 = PRISON_BREAK (Prison Break - Season 4 - | V | 0x6D26BAC4B57B4B541CBD678603DDBBA6 ; MKBv14/BD+/FindVUK 0.98 -0x33F1F098608EAAC840B7A342FC51E8895C26C522 = PRISON_BREAK (Prison Break - Season 4 - | V | 0xD0124BFC6EF5F033A6FF5E74EAD405E2 ; MKBv15/BD+/FindVUK 0.98 -0x7E920589A87B341DFE529C5BF5C78CF382738D08 = PRISON_BREAK (Prison Break - Season 4 - | V | 0xDC96060FA9853BD17371A93F0C00C73F ; MKBv15/BD+/FindVUK 0.98 -0xF6BFC95D2FF206D61F57D1C9EC47F0D14FDE1D3A = PRISON_BREAK (Prison Break - Season 4 - | V | 0x4F90341580CF6341D367E04EC3DD3A01 ; MKBv16/BD+/FindVUK 0.98 -0x5FEF66B4E6AEB59C7B16E35E75BDCD4313C40319 = PRISON_BREAK_DTV | V | 0xD1723F27FEF86154FFDFDAC9652710F0 -0xD1A8464B215C83368DCC373E6EBAD831904015AD = PRISON_FIGHTER | V | 0xAADD7C62DC3B6EB6C12AAE8A1D8C4831 ; MKBv25/FindVUK 1.00 -0x86A734DFB5C32A58E0246D9EAE25D0B19C066BF5 = PRODIGIES (The Prodigies) | V | 0xD978C6C796879B13CE45ED711C777C21 ; MKBv33/FindVUK 0.96 -0x387F3A9F22065EC68DC73617E51B8D40BC335FB4 = PROFESSIONALS DISC 1 | V | 0x1CFFBA80CB59BBBEF944823840B792DD ; MKBv46/FindVUK 0.80 -0x53D9265E0CDD5BACA4B43C77BBC9EBB3A89C5DC8 = PROFESSIONALS DISC 2 | V | 0x7062164D31268A6D1DC1577FA3D0C14D ; MKBv46/FindVUK 0.80 -0x7862C6474709EA6CD8A110862423EE3C9DC7F5A3 = PROFESSIONALS DISC 3 | V | 0xC7B2CF3C55F8847DE0420F8F7D12DCE2 ; MKBv46/FindVUK 0.80 -0x7CC9F346CBAA153BB1ACE457B281B9405744B5C0 = PROFESSIONALS_MKII_DISC_1 | V | 0xFBBA46A0DEAEB1E7C5B88288C30B7112 ; MKBv48/FindVUK 0.80 -0x38FC9AFFED56C2ABFF0B502D970D0D79F1EAFBAB = PROFESSIONALS_MKII_DISC_2 | V | 0xF66C2EEACFEF35DC16739545A7B6B1CB ; MKBv48/FindVUK 0.80 -0xDF95739F72240A7D9CC93A4EE15FBED9F59A791C = PROFESSIONALS_MKII_DISC_3 | V | 0x042BEDEB105DB056AB491F602FB0FB66 ; MKBv48/FindVUK 0.80 -0xF8EDAF4C6F988B58A8FDD5C114B49EB98D7F6502 = PROFESSIONALS_MKII_DISC_4 | V | 0xFBAED0B45392C844F9A3358F4109973C ; MKBv48/FindVUK 0.80 -0xB8BD07817C74E41C1E359A74B0CF2DA78AEDDC7F = PROFESSIONALS_UK | V | 0x3CEC36E265034D3DCE1BACE12C01402B -0x8F1CDEA2B92C14139B988810A06F6BBC43B94948 = PROJ315 [Die Hard] | V | 0x34A05EE99B6ADCC560EB32183B7D7409 ; MKBv8/BD+/FindVUK 0.89 -0xF85CB4208D4DE19598ED3433C0303707652F0ECA = PROJ424 (Doubt) | V | 0x842B4895A4FFD437CEFCA10E56D02F96 ; MKBv12/FindVUK 0.96 -0x42C381424BD1D305DFF4BCEBEEBEA628100A4A62 = Project_Almanac (Project Almanac) | V | 0x5DFFCB5AA4AC7774B85BD86343783F3D ; MKBv50/BEE/FindVUK 0.92 -0xE65B120C45DF85AEF12C55BE7442D8BD80293F63 = Project_Almanac (Project Almanac) | V | 0xFB29743CB056336580BD853F8064F30E ; MKBv50/BEE/VUKNOTVAL!/FindVUK 0.94 -0x7C7F84EA73F12ABD595671899DEB01A6230EFA36 = PROJECT_X | V | 0xB56426EADE44F6010E494A8030E39827 ; MKBv20/FindVUK 0.81 -0x7F932EFF4A0101805CC21B73FA24FC52E6A60E1D = Promesses de l'Ombre (les) | V | 0x305B7FE6D6BFB266E02A6B9008ADB2D7 -0x925F05D2D85C769BEA30992A0DED503CDDDFF361 = PROMETHEUS | V | 0x8437EE3315DB10EF0DF4CF05891F7FCC ; MKBv31/BD+/FindVUK 0.81 -0x986AF3EED696C86028B9F4A68CF765813FDC1F70 = PROMETHEUS | V | 0x80BEB404DF9CA8B285A763D0898FEF76 ; MKBrev 31 - BD+ - FindVUK 0.54 -0xF417FC59362D16D6AD16BA4762D8951BB9C5C6D7 = PROMETHEUS | V | 0xD64AF694CB7FD7A02896F3D00E576EA7 ; MKBrev 31 - BD+ - FindVUK 0.51 -0x1862F453B4AE051A13FDE6F32F5C7C8ECFCC1DC6 = Prometheus (Disc 1) | V | 0x929B3BA9D06E3ADB9022305C66D87772 ; mkbv27 bd+ -0xBD69956AF641376082ACDFD13F58B10FBCD997AF = Prometheus (Disc 2) | V | 0xEC73BE4D5EEE1D9C2474E650DECBEC0A ; mkbv27 -0x9F6760969BD7FFD8A61D42A830F8CBC62EAA50D0 = PROMETHEUS (Prometheus) | V | 0xF753DBAB76B3A0B404693E2645AE9795 ; MKBv27/BD+/FindVUK 1.00 -0x05155AEEAACA4F74889E11D69BDA0FD304205F37 = PROMETHEUS (Prometheus) | V | 0x12AAF807BFED6D4B299B827F5F7194EF ; MKBv27/BD+/FindVUK 1.02 -0x736F69B18A8B044EFC61912706DA685917D763AC = PROMETHEUS (Prometheus) | V | 0x2C2307DD414ED3A68157EEB17E29346B ; MKBv27/BD+/FindVUK 0.96 -0xD7CA6967F23658D163E64FC3725BCBE57DCA554D = PROMETHEUS (Prometheus) | V | 0xB9AED80AEB7860F498AD5304EC7942F7 ; MKBv31/BD+/FindVUK 1.00 -0x81F6BFA0A851EE8CDCE47F828ECC2A6A8B48E558 = PROMETHEUS (Prometheus) | V | 0x10158BA03BFE36FF595F15858EDC4718 ; MKBv31/BD+/FindVUK 1.00 -0xC4A0374C043B6C6B81FBC572A6F82528B1079F72 = PROMETHEUS (Prometheus) | V | 0x9F8224CF431B2E58A481B1EDDD26C68F ; MKBv31/BD+/FindVUK 0.92 -0xFEF59A91E29F9C21E553F6E54626CE03645BD97D = PROMETHEUS (Prometheus) | V | 0x7F1CEF0536D06540F4E87269EB993066 ; MKBv31/BD+/FindVUK 1.02 -0xC5C440A7D6354B73587995D9F248B12831EBBFA4 = PROMETHEUS (Prometheus) | V | 0xA036CB17647E73E1FC9EDE2EFBEB6A81 ; MKBv31/BD+/FindVUK 1.02 -0x4B141D9A38A12BF5516063178D2F8F5A80ECBF49 = PROMETHEUS (Prometheus) | V | 0x04DC9292E3A8A1CA1F076B7052CC099C ; MKBv31/BD+/FindVUK 1.02 -0xCAF2742FD980E3570E698498FB13B31939FBFA87 = Prometheus 3D | V | 0xDB42915919890640D8115745F4A70513 ; mkbv31 bd+ -0xCE1514404DD87A01C180B99E5C5F8B8B80D41EE1 = PROMETHEUS_3D (Prometheus) | V | 0xC2F2F008EF55D6FAF7048C95CDDA243C ; MKBv27/BD+/FindVUK 1.00 -0xE229F975BFFAE50120A4CA9ECF9BC2B1E4D163DD = PROMETHEUS_3D (Prometheus) | V | 0x5EB93277E39DA25CB029F30B0B25AE4A ; MKBv27/BD+/FindVUK 1.02 -0x8EB6D9842E78852CC45E36232762539C953895AE = PROMETHEUS_3D (Prometheus) | V | 0x0568A4BCCAA6991BF7E5DFCF61EA6C71 ; MKBv27/BD+/FindVUK 1.00 -0x2E17A7AE4C0BBF0A2A7640CA03E2AD1F347D5746 = PROMETHEUS_3D (Prometheus) | V | 0x6D96808C1C85C32AAA30B9D782E32428 ; MKBv27/BD+/FindVUK 0.96 -0xD652FC9823A790B5758DABFBDEBBBCC2580800CB = PROMETHEUS_3D (Prometheus) | V | 0x17A59A5DCAE42C6CF6CB20D45E53D2AF ; MKBv27/BD+/FindVUK 0.94 -0x7D1C00EFE184EF366DA71A84BE306BECA029404C = PROMETHEUS_3D (Prometheus) | V | 0x5FD8E45C5BB3B804A508ACDCA67491C1 ; MKBv27/BD+/FindVUK 0.96 -0x49073DE4EE5121ED5E27FAD1924E3E5F3F831820 = PROMETHEUS_DISC_2 | V | 0xF071D9ECDE7EA8285D167354C4B37884 ; MKBv31/FindVUK 0.81 -0x01F9B66C1C59BFEF6108869C8EAF6CA1DA2651F2 = PROMETHEUS_DISC_2 (Prometheus - Disc 2) | V | 0x409F78F8E7AAF7154D7D20B712665D02 ; MKBv27/FindVUK 1.00 -0xBA9709ACBD26C3FE7841A3407C83EF42CF40DA7A = PROMETHEUS_DISC_2 (Prometheus - Disc 2) | V | 0x5CC00A125C0187478F7587779FFBDEDA ; MKBv27/FindVUK 1.02 -0x25B143A22128499A82347167C6B5F9D5134AD616 = PROTECTOR_BD | V | 0x7467711051D1F004178E68AADA55912E -0x826B365C7FBD833D333FD23D5A50519A2FFE0D4A = PS3VOLUME | V | 0xDCC0BEBD91BA2215AF08B37457F78515 ; MKBrev 25 - FindVUK 0.51 -0x11317F7FD0ACCAC0511677A7447E700FDA1D0FA1 = PS3VOLUME (Harry Potter and the Deathly | V | 0x342061BF893C6E1BF2FDE416967FE89A ; MKBv23/FindVUK 1.00 -0x623299FCE5CFFF13EA36AABCA82EA6360C0CFFAF = PS3VOLUME (Total Recall (2012) Bonus Dis | V | 0x7E53079EAABF7F8BF885312D46C663FC ; MKBv35/FindVUK 0.96 -0x7EE0A1D384F768302DC37EA3077F8CF383DDCD54 = PSALMSOFPLANETSPCL | V | 0x1199487509A6C307DC581BEDBB516F64 -0xBB33B8F2B90C3D1D4A0642557C96AE11E008852B = PSE1EFW1 (Pocahontas - Blu-rayâ„¢) | V | 0x04066E2B2A64388136F3B3E09C42045C ; MKBv20/FindVUK 1.00 -0x65BD925DB8D89544144B3FFC2CA7D16B134207D3 = PSE1EXE1 (Pocahontas - Blu-rayâ„¢) | V | 0xCD74657798F0766570006B720AC1D6D3 ; MKBv25/FindVUK 1.02 -0x3BAE3F91E59FC00B8F008AE6810D2A8B7B840E29 = PSE1NNW1 | V | 0xDE969908157E6BC9F6C8E60771A9E09B ; MKBrev 28 - FindVUK 0.51 -0xEDDE22FE4863886A07E5742F9C198E526CAD466A = PSN INTERACTIVE | V | 0x2185EA29D9AC9FDD023C5B6B09911B2C -0xA598C9B6D43C4E800714FF2C703C1F496F5362C0 = PSYCHO (Psycho) | V | 0xF55F0393DC78F23F57C11DE8EB371061 ; MKBv18/FindVUK 1.00 -0x9CB9F2EB4F3931A45932C903163EB816712DDA38 = PSYCHO (Psycho) | V | 0x2D8ABF0CCD1EF158D0F34F0223BD341E ; MKBv18/FindVUK 0.98 -0x22A873AE8296FFCC44E33CEFE58CC46681346901 = PSYCHO (Psycho) | V | 0x81CF535521745203164CA10C4E1D2356 ; MKBv18/FindVUK 1.02 -0x717EE73A68F5F657704027E3443CACE8C443044F = PSYCHO (Psycho) | V | 0x45DBFDFF0CEF189A6E2F8B90C81F5C9D ; MKBv18/FindVUK 0.94 -0x67ECB0E1F42DEC812C0A908455F967EA2E326BFE = PSYCHO PASS DISC 3 (Psycho Pass Disc 3) | V | 0x445F7D555EC702FBC2E357144DA4004A ; MKBv46/FindVUK 0.86.3 -0xD0E6FA4E93BF05A29A6ADF35A7BD2B80644822BE = PSYCHO PASS DISC 4 (Psycho Pass Disc 4) | V | 0xD629BCFBB0C5CB5B7FFFF720572A9E3E ; MKBv46/FindVUK 0.86.3 -0xAC5BF4ED2055509AD69A57EAD8116AD4133255BD = PSYCHO PASS P1 D1 (Psycho Pass Disc 1) | V | 0xCE6699E0E2A340DD58B94428DF6059E1 ; MKBv46/FindVUK 0.86.3 -0x1A257437074BEE8B0039305A35BED8C5470E5E76 = PsychoPass_S2_D1 (PsychoPass_S2_D1) | V | 0xD07B81992450A65385B05EDEDC01BB18 ; MKBv57/FindVUK 0.98 -0x19F75F1675EDB1A3A12B1F8264FD1B39FE112BEA = PsychoPass_S2_D2 (PsychoPass_S2_D2) | V | 0xFF495A9E0CD456EC839E31A037A137BA ; MKBv57/FindVUK 0.98 -0x3D790DCE981B06847DA29CD2CB86AE3AD632745E = PsychoPass_the_Movie (PsychoPass the Mov | V | 0x5F2349486DC7AC6ECFEF001FA6FFAFD0 ; MKBv61/FindVUK 0.98 -0x3B572633850CDB86C4E4C94D8F95FB995507F459 = Psychoville series 1 disc 1 | V | 0xA42BB54ACFE3C49357494DF4F27DE75A ; mkbv12 -0xDC107F04AA61EA0A021BFF6C52E596B4EE010A95 = Psychoville series 1 disc 2 | V | 0x0FE91E62CB2689BD309ECA7FFCEEB88C ; mkbv12 -0x4074E977DD9A15F63594C138631B3A05E0B6B60B = Psychoville series 2 disc 1 | V | 0xD25A21CE2FAD45C30514BF4A61166F7E ; mkbv21 -0x23C132FF811E508BE33C6A4E448374A61D781214 = Psychoville series 2 disc 2 | V | 0xD799A4F4F8A4752F155C7AEB2F1A5E98 ; mkbv21 -0x27C1DC464B5E6BC7B90746803A71BED59131035A = PSYCHO_50TH (Psycho) | V | 0x6EE5917D796FA057F267973F9E7F98DA ; MKBv18/FindVUK 0.96 -0x7024ED95CA192E406DFA4853ECEB130C018B3D1E = PSYCHO_PASS_P1_D1 (Psycho_Pass_P1_D1) | V | 0xB7B7CDE1BAF19824D355504EE46CA9F5 ; MKBv46/FindVUK 0.92 -0x1482ADC4719F17ECF3AB7432EAE8EC457442DDDD = PSYCHO_PASS_P1_D1 (Psycho_Pass_P1_D1) | V | 0x284CE982366451A9439840C77CE1E8DE ; MKBv46/FindVUK 0.96 -0xA25163C06F739D8EE882DF7B5F60A2916535C77B = PSYCHO_PASS_P1_D2 (Psycho_Pass_P1_D2) | V | 0xE104F275F6C04CFC453716BF5B03DEC0 ; MKBv46/FindVUK 0.96 -0xB8E677C145C6EEDC166CC4A22054B2C44E26DF06 = PSYCHO_PASS_P2_D1 (Psycho_Pass_P2_D1) | V | 0x5D07A01DACDEB5C899BDD5E4C1F4DDBF ; MKBv46/FindVUK 0.96 -0xB8E049297B95F957A242E1DE4E99A92A7D731242 = PSYCHO_PASS_P2_D2 (Psycho_Pass_P2_D2) | V | 0x333ED663EF821D80AFE8A5D7C72B9FD6 ; MKBv46/FindVUK 0.96 -0x886912969B306475BC5AD7A1DF491DFC2CB459B9 = PS_I_LOVE_YOU (P.S. Ich liebe Dich) | V | 0x0256CA3FC4B73336236BD20669A11639 ; MKBv4/FindVUK 0.92 -0xF9419B5C09F88E5929EEE53BE1263243EBDC1BB3 = PS_I_LOVE_YOU_NA | V | 0xC79A2D3640F38ABF069D9470D4D89357 -0x60597DAA03DE41A2094AE0BBD01886B0D3C9DDFE = Public Enemies | V | 0x0CE269E3DC62BE460EEA8CB1D9CFA701 -0x8C69133DC6432661AD9134E651266C5DEF6E715D = PUBLIC ENEMY NUMBER ONE PT II (Public E | V | 0x1A7222910D1E16BF93AD17AAA1BF3662 ; MKBv25/FindVUK 0.98 -0x36CD3BAB1BD3C0288C0D85E25CF6FFAA506130CE = PUBLIC_ENEMIES | V | 0xC0DE4622FEF9F857266E05054A24CFA2 -0x252ED25EFF28157B19DC76C7EBAD27793507A44F = PUBLIC_ENEMIES_G51 | V | 0x2308C884E344EC5128947AB29C0B732C -0xF40D9A1E03018AB2E0E3A6AD6D41A2F08CEA65E4 = PUBLIC_ENEMIES_G51 (Public Enemies) | V | 0xC1C0A9EB8051F19332BEA8BDDEE9A817 ; MKBv15/FindVUK 0.98 -0x01BAFB38D5999C3F2EE4D21FD1C063575D52EDD8 = PUBLIC_ENEMIES_G51 (Public Enemies) | V | 0xBA3DE75794B24919DE417EA2D38F0DB8 ; MKBv15/FindVUK 1.00 -0x8955B045F626850D3E5FC4C7C6C167F863A8CB89 = PUBLIC_ENEMIES_G53 | V | 0xD095C0467D317FA5E319A3DE687B12E2 -0x1B318E54A9017A5C3678DE85EE854299F4718B17 = PUBLIC_ENEMY_NO1_GE | V | 0x74A190083C7373CAB8BB3CC282514FC6 -0x68A085FF9EF404E60DE02BC612C9EB70F38C30CC = PUCCINI LA BOHEME (La Boheme) | V | 0xA80E669735CC1B222F9CCFA7D7D64452 ; MKBv62/FindVUK 1.00 -0xE962C5ADE7C5FBB8F0E923790A4DD61FCA988E28 = PUELLA MAGI MADOKA MAGICA D01 (Puella Ma | V | 0xA6BFCBCB885212CCC9DB9CA5475E2BAE ; MKBv25/FindVUK 1.02 -0x4CC5A2EC9607A8AE3FD2E8ADADC70F7FEE88BF52 = PUELLA MAGI MADOKA MAGICA D02 (Puella Ma | V | 0x4AF5216DE2B5C1A5FB5630280AA93145 ; MKBv25/FindVUK 1.02 -0xDAF6E29264F00CC43F1D2E368E7CCBF1BED8B0D4 = PUELLA MAGI MADOKA MAGICA D03 (Puella Ma | V | 0x976FC0A4583D1BDE5343D3C6C3699CAC ; MKBv25/FindVUK 1.02 -0xCFF754D30D5A4AB6A53DE5F7ADA32329291CD03D = PUELLA MAGI MADOKA MAGICA D04 (Puella Ma | V | 0x23EE17683574D88198260A231359E68D ; MKBv30/FindVUK 1.02 -0xDF38435AC7F0D4D49DC9A7015C8C74F9D8E199C6 = PUELLA MAGI MADOKA MAGICA D05 (Puella Ma | V | 0xB19E60F40DA8E82D36C44DB2A09EFDBF ; MKBv30/FindVUK 1.02 -0x4EC3B1F318C78D14DA9011C3949DBA356E469883 = PUELLA MAGI MADOKA MAGICA D06 (Puella Ma | V | 0xAA5F66D768329D82077D31F1A3610CDA ; MKBv30/FindVUK 1.02 -0x7AB6B01E33671F670341FC50EF73544063DFF384 = Pulp Fiction | V | 0x602EEB850B1EB33899E7403548D9C06B -0xDAF6A6073CC621D8B19E46FD8ED80913971C2D70 = PULP FICTION | V | 0x083E7D5B6044B0C8353879B4C69A41CB ; MKBrev 28 - FindVUK 0.57 -0xAC47BEFD4136DABCD37BFD92C221366216D290EE = PULP FICTION | V | 0x3BF85BF47FA20825839ED7963F511D05 -0xF2405760DF12D05622AEC8C676BC51955BAAEC85 = PULP FICTION | V | 0xCED655EF05666903353BBE2D0CCEA5E2 ; MKBv9/FindVUK 1.00 -0xFEFD121FF160EF6263CE2322281B94600B9895AC = Pulp Fiction (FR) | V | 0xE32413620F9AE418E6F4FCF7BE0127C9 -0xB0C098E10A760B479CB6D35963B794A86B99D0F8 = PULP_FICTION (Pulp Fiction - Blu-rayâ„¢) | V | 0x253363AF175152035F549F6DA530E606 ; MKBv19/FindVUK 1.00 -0x68AA91290AEB3C8F50559DABBE064C6BDA82EEA0 = PULP_FICTION (PULP FICTION) | V | 0x60E07A932CCC5256F7DCC7D292C3976B ; MKBv9/FindVUK 0.96 -0xFAA3ACF76317B14DDB9096590AD6073D4B22D2B6 = PULP_FICTION_BD (Pulp Fiction) | V | 0xBB5294EF4F78D1BEBE9C976A3F0016E2 ; MKBv25/FindVUK 0.96 -0xDD8B0BA0DE82738EC9E7962535342F6851471FA1 = Pumpkinhead (PUMPKINHEAD) | V | 0x430D62FC1FA0D81C4039D24B58DAAC12 ; MKBv47/FindVUK 1.00 -0x8C93A73AA7A01B1FFE4EDBABC55415D2C4EAD2BD = PUNCH_DRUNK_LOVE (PUNCH-DRUNK LOVE) | V | 0x9DAE1A6BE7A5033C887F2EDC27AE6B41 ; MKBv62/FindVUK 0.98 -0x149DD4EBC5073A1300D8B40B5FC10BF83C62A2E3 = Punisher - War Zone | V | 0x39427D869B49DA199CB7D3C2640957F5 -0x6D99594D26A855F7316671F06997A0498811F291 = PUNISHER_WAR_ZONE (The Punisher: War Zon | V | 0x153675BD7F39A91F414FE7509A99DEA8 ; MKBv12/FindVUK 0.84 -0x8EC58745B46CEABD420DC7854B9A8B1BECEADB85 = PUNISHER_WA_ZONE (PUNISHER: WAR ZONE) | V | 0x63F8DEC5312D4B9E11FB70C386989C4D ; MKBv7/FindVUK 0.98 -0xE80534819AB3C0EC4C76FDBF9D3E6D325CA40458 = PURPLE_RAIN | V | 0xCC1FED526CDC930E0293FFFD4C23E45F -0xB12EA5F92B1E4F9B858550328D38D7ECD16D9735 = PURPLE_RAIN | V | 0x25FFF7177D9818DE04A7FF420A9DBAE5 -0xDDF3DC591AE2645CC0EE6A9F96851CDB5FDC6C56 = pursuit | V | 0x852ABD26C14DDF532574CB6B76D55040 -0x5E54EA852987F567ABE7E64350BD38CE08D4B042 = Push | V | 0xBA5D7ED44198C2769CD80169E75B78EB -0x9409EAEC866CC039BD33B2E4723C7D42902188E6 = PUSH | V | 0xA23328621E72A7719A6196B85632AAEE -0xF51B2E3B618B40013775054DF231463417658C44 = PUSH | V | 0xDB3CC1393C010418D615378CF2D60576 -0xA729B06C43C28852920213AE717119270E097333 = PUSHING THE LIMITS (PUSHING THE LIMITS) | V | 0xAF5BFF782E15AFC4311371E3A7B7159E ; MKBv36/FindVUK 0.89 -0xF905BA9DB6D5D1CDC1F85CF635913A025F10ACA1 = PUSHING_DAISIES_S1_BD01_DIM1 | V | 0xCEB446A643F1EB9FCDA24A8B3A9D05B9 ; MKBv7/FindVUK 0.94 -0x2349692EB57F5BBC3886BF615EFE5D4198B73DA8 = PUSHING_DAISIES_S1_BD01_DIM2 | V | 0x3334D3392F34DFBC11125282B44AE10D ; MKBv7/FindVUK 0.94 -0xCA5FEE25F4C8BAC6FE44ABF298FEDC8F7DE44548 = PUSHING_S2_D1a | V | 0x8E675BA84366654AC631B5A57BF85DA5 -0x5C77DDF924DE33208243980F264CD0680B1D4AA8 = PUSH_RT | V | 0x7D755DFE4EAEBAA95D8E52C3C5F557C5 -0x0C11EDCF796F35B0555F3F695CBAA64911977C5C = PUSS_IN_BOOTS (Puss In Boots) | V | 0xF3909668F9208010E4ABF0D2633895B9 ; MKBv26/FindVUK 0.96 -0x13DD7D0405CE092497A096EE82C7F111B637F81E = PUSS_IN_BOOTS (Puss In Boots) | V | 0xBC80BE0CC24017271A75F2DAD4A52961 ; MKBv26/FindVUK 0.96 -0x0F52D65702E55D2F41ABA1BC971ED959F3F782B7 = PUSS_IN_BOOTS (Puss In Boots) | V | 0x46ED037DB8212E3EF67921450D60CA5D ; MKBv26/FindVUK 1.00 -0x2E5691EA394EBEF20AA0D6360D24B8BC62A128D0 = PUSS_IN_BOOTS_3D (Puss In Boots 3D) | V | 0xA1FDA37C1CA0F690B8122D3619B0C51A ; MKBv26/FindVUK 0.91 -0xCC759CBE7BCEAABC2320D15BC83FDE36B615F89B = PUSS_IN_BOOTS_3D (Puss In Boots 3D) | V | 0xB03C3B4B84C55FBA2CD1CC54D40C1BE0 ; MKBv26/FindVUK 0.96 -0x5C617652543694D2066881744462169412A49AA3 = PUTE_VON_PANEM (Die Pute von Panem) | V | 0x672F4A6555984E5DFE415EEEF7147864 ; MKBv47/FindVUK 1.00 -0xE748B8F4E66EFC5B64102A25E422446C98651F8E = PYONGYANG | V | 0x040F951D629846B38425589E8822A9A3 -0x26F591158E0EC92D7607AE18C748CBD59FD00911 = Q0xB0901_1 | V | 0x9EC14EB728AA2F083E526BA9D91EEE80 -0x6530E3AC574A3359C23F5E1320FA81167C0631BB = Q0xBD3901 Disney Parks | V | 0x9A1C6119AAE876E37E21C559860870AB -0x67C34E2E629DD586C242FA2CF6C443578F067266 = QIR0x1AAD1 | V | 0x0666C4DC78F99CB900EAADE19018274A -0x123F3E5546FC84405DA18D44B496E6B14E287357 = QIR1EGD1 | V | 0x63DBD7F50C7E85B173799EC33070811B -0x71A71E7D432E4E36ECB50067B4504BA70966433C = QIR1EUD1 | V | 0xE9549C559DB03E59765BCC636526DF28 -0x9B7B70E04D76A13EDCB73038DF92E0E11DA6A4A3 = QIR1NNE1_CONAIR | V | 0x86DCC53E14DEFBBDFF45610DA77B5565 ; MKBv4/FindVUK 0.99 -0x59FA702A133BFB661CC1F9947489AD4C456FC7B3 = QSVSF S1 DISC 1 | V | 0x76D0D50C0133B3B992B20174EEAF2D8D ; MKBv47/FindVUK 0.96 -0x72E56A16FB73D5EF34EEAD8DDACC9ACFDA3628DA = QSVSF S1 DISC 2 | V | 0x626371CA7FF0AA3CE85D1473B8F767F1 ; MKBv47/FindVUK 0.96 -0x008C04D390AA757CEAD37119BCD8E278751112F4 = QSVSF S2 DISC 1 | V | 0x80DD5EE852A9D66DFC2E50A51FC43D54 ; MKBv47/FindVUK 0.96 -0x3D4E45EA75A97801C5201A28E0390F38A16D8A58 = QSVSF S2 DISC 2 | V | 0x749B5B648E52E95C0932D9AEC5DD01D4 ; MKBv47/FindVUK 0.96 -0x33FD7B88AEAD18248AB0632DC8EDD9D3F6F80366 = QUACKD1_GBR (Wall???E Disc 1) | V | 0x7E1224A2D1D1747E3DB9BB5E80ACECD2 ; MKBv9/FindVUK 0.96 -0x33BFA5C4B9B855ECED9815058DE77F7EDB5EA12C = QUACK_D1 (Wall·E Disc 1) | V | 0x8E4C3B6DD636525B5A93444E62217045 ; MKBv9/FindVUK 0.99 -0xC5E93BF4C64EB45785D86D537B722984B2F74001 = QUACK_D1_ALA | V | 0x6E8A974FEE5D08B3C8F704FE0492D402 -0x5407706E980DF0A8796924638CA2CF033EC12468 = QUACK_D1_CAN | V | 0x614E05B9E90142D17F56D7133869FD35 -0x125749AD670640095B77AD976A74B4FBA74372A7 = QUACK_D1_DEU (Wall???E Disc 1) | V | 0x0471B176C417A6BC969BFDCA990A3924 ; MKBv35/FindVUK 0.96 -0x5DC9C6A63AE052E4D62DED9E566E78186FD71D68 = QUACK_D1_DEU (Wall???E Disc 1) | V | 0xC1BD80200F55D5B9BB04354432DCE9DC ; MKBv10/FindVUK 0.96 -0x35BCF20D5A5081EAC0C945A37FABC1A36F96765B = QUACK_D1_ESP | V | 0x151EB2D3A113733F80AF629F93D807C7 -0x806D7EAEAA320E8D8DAF6B11E24598AEC42DFC62 = QUACK_D1_JPN | V | 0xC3B71D9B60014E01AA0DB332DAF4105C -0xBFE60B3BA59CD12CDAB391A4B3CF0E40E3250686 = QUACK_D1_LIC (Wall•E Disc 1) | V | 0x131D91C8467C8AA3B0BD3B28EF91AAFC ; MKBv6/FindVUK 1.02 -0xA052165797E4F0594EA5BB0FC202F6B4692E668D = QUACK_D1_SCX | V | 0xB117F23B6749DB8DCA334F2340A901C1 -0x51BD237A7BBC26900883E00F36EDD9FF16019150 = QUACK_D2 (Wall•E Disc 2) | V | 0x6A67CC6F4DBEA10D25AB9BA29DBE6F1E ; MKBv9/FindVUK 0.99 -0x9F5E9FFE331E07F29306D2C10DBD8163F4007A05 = QUACK_D2_GBR | V | 0xD4D09979FAA4149921547E8B506D0898 -0xA032B172C29A4913460EDC5C1B9FF2A249179E74 = QUACK_D2_GBR (Wall???E Disc 2) | V | 0xBD97DA1690ECCF1B8768199E3A365EB8 ; MKBv9/FindVUK 0.96 -0x630866779E831AACCBFBDC47C12F08C9EFCF0657 = QUACK_D2_JPN | V | 0x029E63DF9D3266582C888E185B18E6FF -0x90878D6D9326F9026B6C3522E38B6FFF0C53CF57 = QUACK_D2_JPN | V | 0x92DF643B2D1A5024FD0A92EE2F6D2714 -0x6CA486A18C9953161CEB5D9E569B37ED3EE96AB5 = Quantum of Solace (Nordic) | V | 0xFA197D2EB31A12B9598265DB9171BB3E -0x91AB97CE3A195FAE7E613C61A0B8B3DB7FE9F571 = QUANTUMOFSOLACE (Quantum of Solace) | V | 0x4F4FB7DC7E4D01A00589A79FAD4A65C2 ; MKBv12/BD+/FindVUK 0.99 -0x6B6B83146532B916190A06678C457C8A59E3E653 = QUANTUMOFSOLACE (Quantum of Solace) | V | 0x8F10C0EFC1EDBC485D3749D3FB3CB714 ; MKBv12/BD+/FindVUK 0.96 -0x86BB8CA77D82CFFB0D52CE1FAA01602DA21F4F40 = QUANTUM_OF_SOLACE_F1 (Quantum of Solace) | V | 0xF28F4FC5E6E2FA714D54C057CFA6361E ; MKBv12/BD+/FindVUK 0.92 -0x56EB55C448E8F020F218A8FC096C308D29BFE8F5 = QUANTUM_OF_SOLACE_F1 (Quantum of Solace) | V | 0xB4B29923D26A2444E109EB598220A3DE ; MKBv12/BD+/FindVUK 1.00 -0xBCF75DEF3736416813371F5479A23AAE80FDE0E8 = QUANTUM_OF_SOLACE_F6 | V | 0xF22A2BB0350DA2E23CCC8611440FB35E -0x42D1A27A4DA0DD5F5695EBA651BB23320B7DA435 = QUARANTINE | V | 0xFAF66483F98428EE6BAA105128460CC0 -0xB2AF12766AEB3A040BA5AD5DD07F40292F6DB55F = QUARTET (Quartet) | V | 0x894FAAC5CE3D6EC56D984B892E137633 ; MKBv35/FindVUK 0.92 -0x788E50E1CF26058C4326DC908961D29F2D0B730E = QUATERMAIN1 SCHATZ DER KOENIGE (QUATERMA | V | 0xA7CAB697DA3AFD8DF69A90C513801CEC ; MKBv61/FindVUK 1.02 -0x0BAA2F0FF5B7DE311FEB45CA2EC71F0DF9991BF2 = QUATERMAIN2 GEHEIMNISVOL STADT (QUATERMA | V | 0xA6FCB33478B037578973D2A367167CD9 ; MKBv61/FindVUK 1.02 -0x48C14E0EAD9441FED6DC9F420E0DDCF6B2216FF0 = QUEEN HUNGARIAN RHAPSODY (Queen - Hungar | V | 0x3132A8963B164C0969A965BFF8192517 ; MKBv35/FindVUK 0.96 -0x71AC709D33D84F91075BB0B345AFF7E6BFB9C848 = QUEEN LIVE AT THE RAINBOW 74 (Queen Live | V | 0x3F4C0713350468509DBF712A018122D2 ; MKBv48/FindVUK 0.96 -0xF45756E9E20E98C4961111F531533D51122998F1 = QUEENS BLADE DISC 1 | V | 0x04356B209FFEE36F030C8225C5DA0131 ; MKBv20/aacskeys 0.4.0e -0xD5460DB70CB46DB0510711C02ED784F285573885 = QUEENS BLADE DISC 1 | V | 0x151A947BA6630CBD6586AB483D614204 ; MKBv20/aacskeys 0.4.0e (disc 2) -0x1638BB4B4BC51BDD86A2E0C3A79EDC28A0EF7F00 = Queens Sex | V | 0x2FBE359D2C207E756A9FCD8EF740230F -0x35D74454104A0B3092E183EB7CB6FC6B3FC2F9AA = QUEENS_BLADE_01 | V | 0x1481BA5FB0D571F36ADF9ABD1177E342 -0x737745946A21DB723B827951F0A7C4D906B37D09 = QUEENS_BLADE_02 | V | 0x081ACB9C8E22F74FD117C652F11705C7 -0x25637C92D5821C2D5FCC4A54B8C2F2F960310E72 = QUEENS_BLADE_03 | V | 0x7034F91D94EBF985494004B221A33E4D -0x80E57BA8A3F4E384B9DE173FFE5EB10C85BD1EB3 = QUEENS_BLADE_04 | V | 0x46E96233382E58A1F022BA5281890DE2 -0xD443E1FA427FE7806136A2BC1D52B20A47C38D39 = QUEENS_BLADE_05 | V | 0x7AED312AFEF93F887826CD6D9CC40F03 -0xB892B8A5DAE148075789560910EFF559C94017A5 = QUEENS_BLADE_06 | V | 0x4A3D3405E6DF226C22DA6CCF1EDF6FEE -0x76024A5B057C91695B10352CCE16436D7917D95D = QUEEN_ROCK_MONTREAL | V | 0x32F9EA94F8BF46C16ADC993ABAC5BAB2 ; MKBv4/FindVUK 0.96 -0x0BAA962D2A4EB24A191F291405FCD89DB67023B6 = QUICK_AND_THE_DEAD | V | 0x221A208C995D7E07186F051918729395 -0x34E0E0943F009DB221145B10ECD7A7F55CD74762 = QUITO | V | 0x17C109483F8FAF10DD24004436DD57E1 ; MKBv48/FindVUK 0.81 -0x291B747195AEA83DF24DD3FEC677AA7832E67373 = Quo Vadis | V | 0xA656DE3571430B049AD7B2395F83C372 -0xCB0CF4489ED3FE1815A01D2CA6614C54468C9317 = QV0xD1002B | V | 0xF54C5861C96D29E62268A53EE5D44C62 -0x57E0EC203FDDB81818BC66F8DED8D5526B2432E7 = QVDB_1003 | V | 0x3653EC811B203E44ED82B30FF2B6A5BC -0x6E228D65FFF42A31A77B026831AC7236523B5177 = QWASER OF STIGMATA VOL1 | V | 0xBC903654D05D9AEB9C7200E9AB91E0A2 -0x3515A0F2C48E2A514243B5BFE65BBE57482FCD5A = QWASER OF STIGMATA VOL2 | V | 0x4A7A00E7ED09D39338EFCD604622B9C6 -0x870690925012D62D4D5F2C83F1CEF90857C9A1DE = R.V Runaway Vacation | V | 0x4FD026DA734BF81F817A4921DF7AA79C -0xD690464ECCE5E4F4764C09BF8A1346ADA1A32D61 = R30 | V | 0x8225116C8E1A09CDBC59A889AEB72EF0 -0x975A721D22C451699C10AA4A37482F1CE2112174 = RABBI_JACOB (FR) | V | 0x4016CF67E939ABCFC01ECABA71FA2E55 ; mkbv9 -0xCFC4BAB67D23A189D1045101F7D8C667A610A7A3 = Race To Witch Mountain - Full MBRP | V | 0xD1C808C0A5CDE05DFF98422B5B3CC896 -0x1A5BEF3B9D169F3A6B8A13E6DCFB4B79A2874F3C = RACE_NA (Race) | V | 0xD00514855427994706F8A614FBE36CA0 ; MKBv56/FindVUK 0.96 -0xC9B47A106A3A1292DE2A7BDD46BFEA42906A5FB3 = Rachel Getting Married | V | 0xBE746F9DAD043D571EB8FFD767907BED -0x187AD47823A3B72B0B8808A6343425D291F06B8A = Racing Extinction (Racing Extinction) | V | 0x9BB61D1A6B9825C823E6B4EF7602F2C1 ; MKBv58/FindVUK 0.99 -0xDC47716F0AD79E0AB320693165F03D750507F14A = RAGING_BULL | V | 0x0A9C28C23F1352660A90243EB193D387 -0x1667DD154E208805C58D4575C07B6F502E4155E0 = RAGING_BULL | V | 0x43E52D759F8C6BE5F8AF90303345C2C1 -0x022B929BDE2DD42A4D664EEC6C83A645987CC1BB = RAILGUN_VOL2 | V | 0x6EFF000A4340635EAFE76EA195AD1E4D -0x2329540B8AD4A943ECFEBD6FC9585636AEE90F45 = Rain Man (Rain Man) | V | 0xB5BF8749BA1EED9BE6243C1128767DB8 ; MKBv39/BD+/BEE/FindVUK 0.99 -0x0FD7AE29576E6704AE112F4047B2E2251070381D = RAINBOW_MEMORIES_IN_ROCK (Ritchie Blackm | V | 0xD763854FC1831786ACCF170F6FAD4D99 ; MKBv61/FindVUK 1.00 -0x6EB68CD54EE06945AC1E0BE459991CC60AB00092 = RAIN_MAN_BD | V | 0x74FDE88266D1A63641EFFA36ECB938A9 ; MKBrev 21 - BusEncryptionEnabled - VUKNO -0x93AEC236CA42EB2B3A42539C2F634BCF3D41D788 = RAMBO | V | 0x9AA71AB02AA92BBF6BE5FCDE8096089A ; MKBv3/FindVUK 0.98 -0xF81C766E9D11A912BC37D0823CBE0EB6CFC632F4 = RAMBO | V | 0xE592409D5DD02D6C5360B76C03921485 -0xAAAF5A14187CBA8ED872A7C2E2CA14AA34FED81D = RAMBO | V | 0xA812125B92D57D76D346E62269A27EFE -0x0E2F20D64215FDF15F95EA7C3E367B760300A9DA = RAMBO (Rambo - Blu-rayâ„¢) | V | 0xAA1D8C12FEED4C7621A649D6522BA90D ; MKBv6/FindVUK 1.00 -0x12B1D6626F08114B5D145BE41C24B2EE299FBD8F = RAMBO2 | V | 0x5DDED9AB2645443B2A6D4E542F321012 ; MKBv7/FindVUK 0.98 -0x404C4415F72211A52C68131C13E02201C13EF69D = RAMBO3 | V | 0x7E24C448AC03E587AD03924264E62763 ; MKBv7/FindVUK 0.98 -0x6AFD1C45A7BCDFB3BA676FB6E8A3424F552771A9 = RAMBO_1 | V | 0x639217E29C3C3960C7A964401FD3ED36 ; MKBv9/FindVUK 0.98 -0x5368C74B2168F56AC3A1C9662CD00CA8B85D4D51 = RAMBO_1 | V | 0x5B2586921DB8620AD19AA1455CC17961 -0x8F12C19A43436764892F5A6806483B1790C3DE70 = RAMBO_FINAL | V | 0x820CF4F381D65D6B60AC04F5F9807625 -0x6615C3CFA160DACD2B00A19B85E518424FE58BD6 = RAMBO_FIRST_BLOOD (RAMBO ??? FIRST BLOOD | V | 0x7452CF09C0B97A726A39869E6E695CC2 ; MKBv21/FindVUK 0.96 -0x38B5EAA48E2E59FD5FD9F3A67E431E6B303A8191 = RAMBO_FIRST_BLOOD_II (RAMBO - FIRST BLOO | V | 0x644E694838B723279B2A4B93D0657B58 ; MKBv21/FindVUK 0.96 -0xB8C1BFC1E97C573D86C3E48FC454BB35A2401765 = RAMBO_II | V | 0x983FBDDD23827392807BABD07E459D1D ; MKBv6/FindVUK 1.00 -0xAC00900D239AF778883535CDD21CABDB5FBE1CD0 = RAMBO_III | V | 0x657C39EAC3797363DE405D1809495B85 ; MKBv7/FindVUK 1.00 -0x95F1B110A9AE2AF9E3FE4F188E6E459FAB541EFF = RAMBO_III (RAMBO III) | V | 0x3E8574E283E4D1D3B764CB2686FD45EE ; MKBv21/FindVUK 0.96 -0xA0159D6A87783B001778D0FAA9498C0C7B03F4DE = RAMMSTEIN IN AMERIKA - DISC 1 of | V | 0xB00FF034755788EF96590343B213557A -0xBAC82A9E16343E4BBD3E6FF3437ED9C4E15D05E3 = Rammstein Videos 1995-2012 (Disc 1) | V | 0x14678D998E796D647108FB81C9302806 ; mkbv35 -0x19F1017FDC7C2C7C25C5CA45E4C58D3ECC93660F = Rammstein Videos 1995-2012 (Disc 2) | V | 0x893C585C3032933B87B025A219A72587 ; mkbv35 -0xB8196482E9DCCCEEE123B13218BDBFDFBBFFCE28 = RAN | V | 0xF6F4D532DE4142E39060EE8B66A6D889 -0x0D24B1ECB9FA8C0569A1F28EF8DDA16CF8AE5FCE = RAN | V | 0x8AF4D593AAC92DA65DA72042AE05F8BF -0x20C7A34E392173B9B2FF03A9C242B1387565632D = Rango | V | 0x23C9C71F96A65B3591D818F6F47DE509 -0x6B0B960CA8383CA59EA00333CF26AA9E4CFF1084 = RANGO_EN (Rango) | V | 0x05E67DBEAD0D6C9440E69298E9ECDCC8 ; MKBv20/FindVUK 0.94 -0x6852C15E56D75043954D321DAB3C79BD0CE926E5 = RANGO_ES (Rango) | V | 0x240C5A4106302F807297D34C1F6182E3 ; MKBv19/FindVUK 0.89 -0x7683CBB0EBDE82CF5DFB9E4C15E4B2FEB5E78397 = RANGO_ES (Rango) | V | 0x60A8D8DD222463FF67367AC218DC0077 ; MKBv19/FindVUK 0.96 -0x22A75E4027800737C816F608280CDE456DF2A28F = RANGO_ES (Rango) | V | 0xDDCC4A8356D78CE394451CC1F4FA21DA ; MKBv19/FindVUK 0.96 -0x9670C98AF027680E9B78197772B86866EB0CCCFC = RARE EXPORTS | V | 0x86B2DD568BCE213FEE7E1BE73A92C79A ; MKBv23/BEE/VUKNOTVAL!/FindVUK 0.91 -0x90787640CA0A17947F1165F77DE65ECD45B516D7 = RARE_EXPORTS (Rare Exports - Blu-ray???) | V | 0x5228D9860EF51E23CB802EAF59AB577A ; MKBv19/FindVUK 0.96 -0xED55093F1268F61E01B576DCF4426B27989FBDD7 = Rastro Perdido - Broken Trail | V | 0x564371C55E3652D29B1EDDBBAD9DB94F -0x500685E432616A24D9D908DC5ED687E7E0E859FA = Ratatouille | V | 0x3C6D5C6A623BA22E50EA2FF10C086410 -0x10DCDAE0623D3B75DE1072A8E337AD07AE98CD33 = Ratatouille | V | 0x2FC46C2519C01A0178F728D2EFB71DF3 -0x1348C907340CA8E669F6163CFA7FF795A3DEAB4A = Ratatouille PAL (fr) | V | 0x67E82C738B3634E52AB8A0A7210F8524 -0xBF7BC0E0E34AF823A7923F0CB96E34F6845D28E5 = RATATOUILLE_3D (Ratatouille - Blu-ray 3D | V | 0xFE9D301B9FD711975864819908E00F97 ; MKBv47/FindVUK 0.85.3 -0xA807BDB01DD9CF47C89AB347458A9AEC5E512906 = RATATOUILLE_AUS | V | 0xB30234303F67727F680AB3E89FB4D400 -0x9385DA4C33398B3DD10146CFAC9E595726486025 = RATATOUILLE_DEU | V | 0xCE7CBEFB7E6FB1D2BE03B5628B2E2EB1 -0xEA7D0FBA29EC56CB3BF3EA313362C31933A0EED0 = RATATOUILLE_DEU | V | 0x5DB9705EC5B681117C46BBE2587908FD ; MKBv4/FindVUK 1.02 -0x2C6DC0B09404B617E713A227CA15DEE0F895F603 = RATATOUILLE_JPN | V | 0xAB70DE4FFE626C8F4BD7C179C994E086 -0x72547EA7002667C85E82FA56505BAEC11D7FDFA4 = RATATOUILLE_SCX | V | 0x7761174B314C1A5C0B2CC889670FBF6C -0x78DB17CE59F72F466A1AB90D6BEB8E9ACF3B4B38 = Ratchet and Clank (Ratchet and Clank) | V | 0x7F8FF9B925A134A09916C9E1A0746432 ; MKBv55/FindVUK 1.00 -0x2BEB8BDA50080498A6B6C0914A8E3474AAB26DAE = RAY DONOVAN SEASON 2 DISC 1 (Ray Donovan | V | 0x6F4B62DA48615DFA22A35A2A5DF6AA39 ; MKBv53/FindVUK 1.00 -0xE887B68FFBA45FECC45683B0788CC090926C9702 = RAY DONOVAN SEASON 2 DISC 2 (Ray Donovan | V | 0xD2FC2ADCFCB4F019BCE77F12D7D791B3 ; MKBv53/FindVUK 1.00 -0x1369E5E7A1AA061DB3970B9CCB6E2867488D78B1 = RAY DONOVAN SEASON 2 DISC 3 (Ray Donovan | V | 0x81D2796C68F194E03B96F53619A1F32F ; MKBv53/FindVUK 1.00 -0x0EC9BB89D1CEA840BE739309A0452BB5143825DD = RAY DONOVAN SEASON 2 DISC 4 (Ray Donovan | V | 0x30604AD048CBFD707FE70D316C8C4D14 ; MKBv53/FindVUK 1.00 -0x29FC501CCBB6E6C8AF5C920E3F3F782F085AB2C1 = RAY DONOVAN SEASON 2 DISC 5 (Ray Donovan | V | 0xC8C13FB712966CB754F78FF52E6259A2 ; MKBv53/FindVUK 1.00 -0x72719EFAAC28D846070897B078A7CF34887F840C = RAY DONOVAN SEASON 2 DISC 6 (Ray Donovan | V | 0x4F24C85EDAD4EFED6A18B01C00688626 ; MKBv53/FindVUK 1.00 -0x707BDBB24B2761FFCF7BDC9725AEA9B7EDC6897D = RCSW III (Robot Chicken: Star Wars Episo | V | 0x365BCD067AD2EA78479277E35594EAFF ; MKBv19/BEE/FindVUK 0.96 -0xEE8240978DC58B9B4A5379854BFD8FE677A9363C = Real Steel | V | 0x3FC7CF3770B48555647C0D8530143F74 ; mkbv25 -0x90C213006CB01E0C98B15ED323075154E2829D78 = REALM_OF_SENSES | V | 0xB9F3DE30F0B1FFA7E133E7CE68982F78 -0x23F3D791D31EEC944C57B02A8828D807901E7EE8 = REANIMATOR | V | 0x882596DA3BC5710CEF12A6E00640709F ; MKBv47/FindVUK 1.00 -0x3437FCA8B17E6B5BC81F80B1ACD58D8EDD6A25DB = REANIMATOR | V | 0xB6788712B9B047E537D36EA6DFAA8790 ; MKBv47/FindVUK 1.00 -0x3019E9C6F77E734DE21DC95DA489742DE44CC8FE = REAR_WINDOW_G51 (Rear Window) | V | 0x2FE83A25DE47527B24056C8B8B6BC0CF ; MKBv31/FindVUK 1.02 -0xDDF2FAD71BA555AB649A1A00CABCF304B2C6CD0C = REAR_WINDOW_G51 (Rear Window) | V | 0x740F86C3CC474D340B971A8F3DE81C46 ; MKBv31/FindVUK 0.96 -0x8225E18485BF36D7CF66E4C6BF1915DC02A90EF5 = REAR_WINDOW_G51 (Rear Window) | V | 0x9D773A8D858AAC106BD974DBD865CB5B ; MKBv31/FindVUK 0.94 -0x1582252CF6675D4CA626822305199C887BFBE77A = Rebeca | V | 0xD97B78D3893AAFE804EC65EE5D9F8A5E ; MKBv31/FindVUK 1.02 -0x5B6A7AEEF318684D8E84FF69A5E1C999C7BD8029 = REBECCA_BD (Rebecca) | V | 0x673DBFDB23BEB6D3DF588CB185E3A7E5 ; MKBv23/FindVUK 0.94 -0x500B333B7F4DF8E6C79836558139DF82CEFE4278 = REBEL_WITHOUT_A_CAUSE (Rebel Without a C | V | 0x275CE2BF67F78931CF206C47C95AB28D ; MKBv42/FindVUK 0.96 -0xDCCC43AD62B5743B3E5E6DAA77EC0F4EF10D137E = Rebirth Of Mothra Disc 1 (Rebirth Of Mot | V | 0x8E6897349A5857D9E230E4282EF5C995 ; MKBv47/FindVUK 1.00 -0x6BD6AAA23934E3A8BF9E5D23AC28E62F84E3E148 = Rebirth Of Mothra Disc 2 (Rebirth Of Mot | V | 0x2A284F627DCACE6FEADF632089FAD660 ; MKBv47/FindVUK 1.00 -0x178F51D83A8B81DA7A07E8AC4485F36BA39C0731 = REC | V | 0xE172BA105DFDF8B63DF00C5A4B195E4F ; mkb v9 -0x38D1A35F6EA4960E7CCA2096CE1038E33C30AFE9 = REC | V | 0x52C163AEE26E5837EB1BF71F354253BB -0xD59E6E4AAF344554E07DABC4EF83F0560A99B2F4 = REC2 | V | 0x6E3BC4439798A98DFBFB82DAF2347EDD -0xF59370482834455354635303A5588F96586B8BAC = Rechte und linke Hand des Teufel (Rechte | V | 0xAD31D371CA088A7A5BC254F30E740BED ; MKBv39/FindVUK 0.84 -0x064AC07CEBABB412FAEDCBB936EB8B308BF3CF42 = Rechte und linke Hand des Teufel (Rechte | V | 0x89B66379F4F6B7D8394FA5C0DF35D0D0 ; MKBv39/FindVUK 0.96 -0x52FE3D3A0CA5B7B64BAF5C7697164511D239E12A = REC_2 | V | 0x49BF72D7F542A457D643B8368617E7F2 -0xD02CCEFF740E906F8C3639686F46E98708605854 = RED | V | 0xB31401DF333741FDAFBCF840919371C7 ; MKBv57/FindVUK 1.02 -0x1049D1FBB41DC7640E594A670B37F181C1D7205D = RED (RED) | V | 0xF37EC35675D316C22CB12A8BF4785B36 ; MKBv19/FindVUK 0.99 -0x3179F163130DCBF312746A1AE4F5EF310A0D6D07 = RED (RED) | V | 0x6225C3A84C0D741A98D02EB4CE49E615 ; MKBv25/BEE/VUKNOTVAL!/FindVUK 0.84 -0x254CEFB4A792F1AD6C3B7D5E150DD80602515880 = RED (RED) | V | 0x674943D7C9B384CE3A1058A7E8428F7C ; MKBv21/FindVUK 0.92 -0xE8F7D57C57B483861C40648CFC963B3B34CCF4E5 = RED 2 (RED 2) | V | 0xCA5FF7B1975362C7A180275CA4D29A9F ; MKBv44/FindVUK 0.91 -0x1ADADD92040E043185D2E259CDC617A00B9A88A6 = RED 2 (Red 2) | V | 0xE6CD407E42C667C243A844AE0595FDC0 ; MKBv40/FindVUK 0.84 -0x013EB9B46811B7D07AB442A854B41F189A26CB0F = Red Cliff | V | 0x47666A1390FBEA38186DA1CD92583C4B ; mkbv12 -0x5DF50B143B57C352D336CA842341DC30B2D8DC0A = RED CLIFF | V | 0x94FD780EA09CA91B290C64F32D3686EF -0x075584B7176B0C8865023737A4FFBB19A37C7D59 = RED CLIFF | V | 0x05A3CC26F84C2A7AF7DE795A842C6ECB -0xFDEC906B83B001210D782BC68D7975578DD19DB3 = RED CLIFF INTERNAT VERSION | V | 0x31DBCAD92D7FB6DE0F0349FBDED24B31 -0x492BFE163424C91CC79BFD39DCD29F5BE561F79C = RED CLIFF SE DISC 1 (Red Cliff Special E | V | 0x2BE6556DD013D905B18E8D4E36695D02 ; MKBv15/FindVUK 0.84 -0x195FB8835CD83442EB4B6916278C697246A8501B = RED CLIFF SE DISC 1 (Red Cliff Special E | V | 0xC065E86732589BC6E3D928620FE2C806 ; MKBv15/FindVUK 1.00 -0xEF79E117E018FB6BA49A8A8DF6997E542FA2433C = RED CLIFF SE DISC 2 | V | 0x6037379CC0E5D5D7409ABF8E948FA89D ; MKBv15/FindVUK 0.80 -0xA3F53B53CF915D91486107B9E543970CE559E3E8 = RED CLIFF SE DISC 2 (Red Cliff Special E | V | 0x10EE26AA65F27F1013702EAFBA7F24B4 ; MKBv15/FindVUK 0.84 -0x2BF22DC7F8BEFD1F792E51557D4AA7CAFFAB48AD = Red Riding Hood | V | 0xDB793EDB5DA2C9F24F18F0FB912B87CA -0xB031C48D8F6475FABB284485508443501718FB6F = Red vs. Blue Season 11 (Red vs. Blue Sea | V | 0x4B03DC1E462A13ADEDA69043348E81F4 ; MKBv42/FindVUK 0.96 -0x97E62E39BDFA6A274673B61CB96B5533C278D6C8 = Red vs. Blue Season 12 (Red vs. Blue Sea | V | 0x8142D49F4DE228EC0316E861B441F743 ; MKBv47/FindVUK 1.02 -0xCE4F6325CAFB843D999758F092684ABA85B3345A = Red vs. Blue Season 12 (Red vs. Blue Sea | V | 0x3D74CFA93275EFCFC11AFEC1D4803EE2 ; MKBv47/FindVUK 0.96 -0x4D403A5EFF07E16D0BB91B2D6A862B7E1D21AD48 = Red vs. Blue: Season 13 (Red vs. Blue: S | V | 0x5DBAB43D20ED763B548B09BB13DFCCF0 ; MKBv53/FindVUK 0.96 -0x386286645996A33AB57196A9D40A3AE9A52B3C3D = Redbelt | V | 0x5627A8B0841FD6A198371FA7DA9012D5 -0x8402027564511E3C47721E240848D0DF83D8F4C3 = REDCLIFFII | V | 0xAFD170E8BDC5889C6F86E6BF9DA2289C ; MKBv12/FindVUK 0.98 -0xBB25D9A839E0DC8D6CB438E6EBF4B9F38102115F = REDCLIFFPART1_EAGLE | V | 0xEFE869A244B9E9D5A70368EA5249C8FB -0x3E99C10174AE0FB1AB8591657826DB155F824A18 = REDCLIFFPART2_EAGLE | V | 0x816370B0928B24159647CD408F10D4AA -0x93DE5531D1E77828FEE30078FA6E8938668BD2B1 = REDDWARF_BACKTOEARTH1 | V | 0x0CD0C6FA6730CA22FC192EFCB4DB47BB -0xD53724F5F2D58289C6251FA259F526965E8C57C5 = REDDWARF_BACKTOEARTH1 | V | 0x9B8917329BA50540271A8250F358657E -0x0A3468A705DCB46CD9981A4654C67A67E23189F6 = REDDWARF_BACKTOEARTH2 | V | 0xA7EC2F680309050287B302019E07ED46 -0x4A9E8FF7317FFE235A5EF079C41C11ACB56BD2ED = Redline | V | 0xC8B7FDCE22FB019E11210880CF55C082 ; MKBv28/FindVUK 1.02 -0x7282CF6E465BB60FC2017821672A84CE466F88CD = REDLINE (REDLINE) | V | 0x3600A3A24EA76ECC5456EBB59527E196 ; MKBv50/FindVUK 0.96 -0xECB9A16AFE008400790A1EE6485E822B5026B6EC = Reds | V | 0xF27197D9A65D1CD56ABF3148CB204CE9 ; MKBv31/FindVUK 0.65 -0xBDF175405E4BCA6A5331E0E1F0E442DBB7A459E7 = RED_BALLOON | V | 0x29CB8DC5573A9370F478D41D1737798C -0xBFD72CEA310FBBE7ABF2818BFF41506473D1D12A = RED_BIRD_2D_F2 | V | 0x8C2465639225FBB464D55F0A9317890D -0x27ABDD19AE93BC8A8555D734E55318151A2A2230 = RED_BIRD_2D_F3 (Avatar) | V | 0xBF5FE445C0709C22164615CFF806B052 ; MKBv16/BD+/FindVUK 1.00 -0xC4023999423E266D12F5EF091B44E2F2D812DF06 = RED_BIRD_2D_F3 (Avatar) | V | 0x373CF21F0C072DC72FBC63A093CB81D1 ; MKBv16/BD+/FindVUK 1.00 -0x8747DE049A17596F4F2FB74FF6E90DAF92930407 = RED_BIRD_2D_WW | V | 0xB991380C0323808D4C0232BD699FC720 -0x6C9537A83142FBA28687953B198617D614E7E642 = RED_BIRD_2D_WW | V | 0x72F8ED95A720A87C77DF3B65FD118043 -0x6C3EBCFBEA0D7827C68E98B89600603C379A1115 = RED_BIRD_2D_WW (Avatar) | V | 0x17E18F2A9C41431E4C50F04B5CC8BAF8 ; MKBv16/BD+/FindVUK 1.02 -0x5946068EBB6E4913ADC26E1CCA58F3901DBBE4A3 = RED_BIRD_2D_WW (Avatar) | V | 0x7B39BAA625A02508E5DB20BD8935CDD7 ; MKBv16/BD+/FindVUK 1.00 -0xFB830866F3159C374AB8EE38E8C74ED09965A3B2 = RED_BIRD_3D_F2 (Avatar) | V | 0x4AE4BBA3DCDE867DA69B54A5DE067054 ; MKBv18/BD+/FindVUK 0.98 -0x710348934A76347327189941D2CCF067537C624E = RED_BIRD_3D_F2 (Avatar) | V | 0x91F6067F1CD9C5FAD928A511CDAB0739 ; MKBv18/BD+/FindVUK 0.96 -0x378F64C71CD3F20F3ED9BFDCB72F8B29AD2F824A = RED_BIRD_3D_WW (Avatar) | V | 0xFD2ECFB6EB0F156D74BEBA698ECC8700 ; MKBv18/BD+/FindVUK 1.02 -0xCCB975E250F16DF6844EFDB25A014273B63F2FD2 = RED_BIRD_3D_WW (Avatar) | V | 0xD16197A025DB40D675C3F2D2D7F1F3D7 ; MKBv18/BD+/FindVUK 1.02 -0x98F9BDF9774ACB6E30756E8541FB854FDCCE7DD1 = RED_BIRD_3D_WW (Avatar) | V | 0x904B8981A9CC93337A2EEEBE81A326DB ; MKBv18/BD+/FindVUK 0.96 -0xCECACE0743BFAF9571C9698B3F4F740938F6BF9C = RED_CLIFF | V | 0xB96E1730C9D70F475DB8A54678E720A9 ; MKBv8/FindVUK 0.98 -0x6A5FDFBF0A155071998D37D9A4B63A508BAC7A7E = RED_CLIFF_INT_PART_1 | V | 0xD9EC7650B83ED2D829CACDEDD7698115 -0xA8C4243C3A3009010309680DAB573FDDCDBAF123 = RED_CLIFF_INT_PART_1 | V | 0x55ED1EF313F95E3076C93B7D09FBB179 -0x797BFABA3298559B543C90249BD032125B957EF0 = RED_CLIFF_INT_PART_1 | V | 0x057EB0F1B613D39C4AB5D23A3F1C6BC1 -0xE88FA243A9D1A1211D01B7F1AB5B1151140C1AF6 = RED_CLIFF_INT_PART_2 | V | 0x92FA59721D18E3FC49DE8C053F8B77E1 -0x9FDDCA087C89CA310073B7348AD0A0FA62030091 = RED_CLIFF_INT_PART_2 | V | 0x61E17ABA17CB3AF68B55A35FDB7F73CC -0xE4B1DB17DA66D04B722D5F025282B69AAC099FC9 = RED_CLIFF_THEATRICAL | V | 0x62D976ECCC9D9725C8EAAFE5E6E123AF -0x3950766D2D969E00DD6C73FBA9BECFA25F4E0EB9 = RED_DAWN_BD | V | 0xC7F5377D9A0907BBBE398328746AC268 -0x121FA0437A03115BB6905E32007E3F1C4B5D3612 = RED_DESERT | V | 0xD8A22F60C8B98386744507804C3E5300 -0xDC800CA7ECF8EB4E24CF884852FD479AB9B453D3 = RED_RIDING_HOOD (Red Riding Hood) | V | 0x26CAF627889FAD89C6D87FB084C32939 ; MKBv19/FindVUK 1.02 -0x6B0436209140C640078269829FF784A387ADDE36 = RED_SCORPION (Red Scorpion - Blu-rayâ„¢) | V | 0x2D9FE4F9725DD1E78231324CCF3C2088 ; MKBv25/FindVUK 1.02 -0x66B75D82DE505BA09BA8560557BD19BBB8835DD2 = RED_STATE (RED STATE) | V | 0x99C1D9961FEC7C0A486F230870C8A727 ; MKBv32/FindVUK 0.93 -0x5DD191AF6CF52E4D7E6439B5E960B788A8C3BE4C = RED_THREE_COLORS (Three Colors: Red) | V | 0x542EE215693252D0FD4D5EC4AB23972B ; MKBv27/FindVUK 0.99 -0xB5E5937ACEABB31E20D2916831D22D2B332E2534 = REEFS_OF_RICHES | V | 0xA12FD4714B274EBD124F1765F67A6E4B -0x37A75C11D44993864D7E2F59A5FCF206E824C080 = REGRESSION (Regression - Blu-rayâ„¢) | V | 0xDC945434E8BB6EA7BC3663F7FC6EBD91 ; MKBv57/FindVUK 0.96 -0xD79612FEAEBA49E07496E720A4942FB11F543F1B = REIGNME | V | 0x686161CBDB37EB01808107CAA3FE33B5 -0x55DBBB1063D98B3015C4C14C15D009CD2013D31E = Reine Nerfensache | V | 0xB6E4B02CB3914A7AEEDCE3992F17DBCE -0x7BB03911EAC75A4B5A65649F327AF9CB3E6C567D = REISE INS INNERE DER ERDE (Reise ins Inn | V | 0xE44CD6F0443A014963A2F8904DF93D06 ; MKBv16/FindVUK 1.02 -0x31819B146CBCECAC7FCF47BA5EA22D6ECE661CDE = REMEMBER | V | 0x97DF16F22B0F4914369BC5FB7FFE29AA ; MKBv61/FindVUK 1.00 -0x2C9ACBD8C5BBDDF35B04A1765B0D179740C94891 = REMEMBER_ME | V | 0x9DF77540DC05FA164104330B2A0CEB51 -0x84E6924269C1E4866104076FD4B35E7294F426F5 = REMEMBER_THE_TITANS | V | 0x3D55EFD2FCA874A44B7DD918205A4EEF -0x00D0E6B68991455CCA1F7FB5053EB4BAB7CA692B = Ren and Stimpy Disc 1 (Ren and Stimpy Di | V | 0x954039DEF98F5419AE47BE75F727B872 ; MKBv56/FindVUK 1.00 -0x475BDBE0F013BA9BF0530B7FCDD52A24F79D709D = Ren and Stimpy Disc 2 (Ren and Stimpy Di | V | 0x22AA2B31108F9017C59EEC38C4260115 ; MKBv56/FindVUK 1.00 -0xF3C74786CEF947F68909EF047925768A49CBFE4D = RENDITION | V | 0x92B475B09A5B56348047279CE53C9169 -0x6494541DC38576F50F824F96EAD7118E69A13738 = RENDITION | V | 0x1CF464479B5961D2F301DD61962400BD -0xA3A06813CA24AFB28A4977BEBA303970DAD0B722 = RENEGADE (Renegade - Blu-rayâ„¢) | V | 0xF64AFC5682034397647A3161F70955AA ; MKBv50/FindVUK 1.02 -0x53712B7BE91D44FB8EA3192985FDCD1A4906D1CE = RENT | V | 0x7D5A1A38DA24C572E76A3FDDD6F2CC60 -0x2915958D576EE64A6055276A6DF8FD448B9553DC = RENT | V | 0x4BDEE561C664983D0A8A47F37263C1D2 -0x6C6D78D17E1CC8EDBDC2E31E0A6314F05C445B8B = REPLACEMENT_KILLERS | V | 0x5F4771481ED814385473D6C0F4B56B94 -0x4D7DE67BC1E7AC86444B19A6AF592009C0DDEE5D = REPO_MEN | V | 0x9D5D95871A701EC1B964967A28D365A7 -0xA173EB4A364A386471D006F5FBEB3BF11D6F8B13 = REPO_MEN | V | 0xF1AD9F748A9F119E27B9CBF22312718A -0x89B6BF6312AB0B59BB58CAC4E42043ADC253F0ED = REPULSION | V | 0x25DD6F917C716BE34123882160587898 -0xB54F8EA4147DCA3A6057C8B2FC9CE66438313B54 = REQUIEM_FOR_A_DREAM | V | 0x04EBDD135296E0549A17481697748BE5 ; MKBrev 14 - FindVUK 0.54 -0xDCBF9697AC69FC425C2CE1E01D6E8AB81454524F = Res Evil Degeneration | V | 0x85C470E48982743961296A52EE4FA2A9 -0x8F63ACD2B3102DCC23369AF2B245B027A8C657DB = Rescuers (The Rescuers 35th Anniversary | V | 0xAA6030AA8D80E379F0FEF895E470A9A7 ; MKBv25/FindVUK 0.96 -0xD945AF9E9FEB3FB8AE23681B0B7A4370E0A95160 = RESCUERS 35TH ANNIVERSARY (The Rescuers | V | 0x253BDA86EBC9105993DE4FEA18ACBDF4 ; MKBv28/FindVUK 0.94 -0xC0F55D1BE709462CD4A9C1128BDE64994A627E83 = RESCUERS_DOWN_UNDER (The Rescuers Down U | V | 0x39F5FBB009BB1FB7880BEF085819E40E ; MKBv28/FindVUK 0.96 -0x0FA49FAEA6CBCBDC997C35B3F49DB17558623966 = RESCUE_DAWN | V | 0x740F5DBB65855CCD569D1C67D7A0E144 -0x9A8F829431981B197A2121EB98F5BDB49B289748 = RESERVOIR DOGS | V | 0x96FD48DCCBE09124419607CB32DA8EB1 ; MKBv14/FindVUK 0.98 -0xFF61510EE5C4E75FD5C83390814AA6AF26BBB641 = RESERVOIR DOGS | V | 0x6A8DEBF7EEE1A893BCCCB841F8C12744 ; MKBv14/FindVUK 0.98 -0xC6919FEDF5BAEB572438C267C8D1FF4C21B1E055 = RESERVOIR DOGS | V | 0xE8623E866547AB38AC030AF74DB5E1BF ; MKBv14/FindVUK 0.98 -0x475A1512DDD4B9168423DC72B43803F3C3283FC8 = RESERVOIR DOGS | V | 0x0CFBBDAF92D947EA895DEF6AA622F597 ; MKBv14/FindVUK 0.98 -0x66AC4E68B881B4E1C06EB90524B0E9D21FEF80DF = RESERVOIR DOGS | V | 0x5BF6BD4CBCED5FE82DF986A16E0412DA ; MKBv14/FindVUK 0.98 -0x4B46D27ED42D093777976EF12E2ED9BBE8538FA3 = RESERVOIR DOGS | V | 0x0C3A911ADB8D184CE2E2458D555578CC ; MKBv14/FindVUK 1.00 -0xD70225BFF6EB70872D8832F6582968ABED2CCD01 = RESERVOIR DOGS | V | 0xA8DFEE44ABA275557224AC1C96FDB67D ; MKBrev 4 - FindVUK 0.57 -0x119F68D9279BF05542FFE5B93E46DAD189348ED2 = RESERVOIR DOGS | V | 0xD8EBC9B7E746B0B23F960B9D2BAED6B4 ; MKBv14/FindVUK 1.00 -0x16B4BDAEC71F421212C5DD7515790BB27F5999C5 = Reservoir Dogs (US) | V | 0x71A7C19C87DDC784055136BA20B786A0 ; mkb v1 -0x097E25AFF135B548A0A5A48ABDF1FF445FC8319A = Reservoir Dogs SE (ESP) | V | 0x5C7D67D0B4CE6C881614D2912C12DE87 ; mkbv10 -0xD78542185C2D733A50305B9D29547F13E342AD58 = RESERVOIR_DOGS | V | 0xC76E0FBEDAE85D76DD43C27C420D5B5B ; MKBv6/FindVUK 0.98 -0x4B2693AF27EA6DF01F3333C07F910EFC35E3C088 = Resident Evil (GER) | V | 0x387348E1AFBA19E53544C13C5D173D43 -0x882DB2929533A4516C48AD2F46BA5D5F5C31916C = Resident Evil (US) | V | 0x70338A318F7F34504E6D1C0B94F9F5A8 -0x4A261CD70D38324C9494D4162C11BC1428B3753A = Resident Evil - Damnation (Resident Evil | V | 0xB398219ABDD12D0F45F4120BE59D3554 ; MKBv31/FindVUK 1.03 -0x908603D99FBD8E9CF46D3650F7F0773FAB6C1C39 = RESIDENT EVIL 5 BONUS | V | 0x3B9A2B1EA32D9E1E694331F4EB3FFF6D ; MKBv37/FindVUK 0.80 -0x2C655F64EFFE09699F9A92616FD38536E7FCF204 = RESIDENT EVIL AFTERLIFE | V | 0xFCE76D00B35A04598FC4435407364A01 ; MKBv21/BEE/VUKNOTVAL!/FindVUK 0.83 -0xAD5F67FC2B7BA4227AB561D5D625A4766A9ADEBA = Resident evil apocalypse | V | 0x72A0811A36903FD5549F8BD184BC81FE -0xBBBB02C2383D431E7D34B99426CF5E825EE0261A = Resident Evil Retribution | V | 0x43CCF1EB10FD29C384B13410D802B65A ; MKBv35/FindVUK 0.92 -0x781A9B286C92273A8B46B6D8343F55AACB418D8A = RESIDENT EVIL RETRIBUTION 2D (Resident E | V | 0x2047EC5C4D038CDFECD0CF0AB75DA766 ; MKBv37/FindVUK 0.91 -0x7C771ABCF135ACD8560E2B1497D726C9A11607AE = RESIDENT EVIL RETRIBUTION 3D | V | 0x15A582536B185A4D7727649292FCE6E0 ; MKBv37/FindVUK 0.80 -0x80C0966ACDB90F257D9C99529FCE959D3EA5E181 = Resident Evil-Apocalypse | V | 0x4E920686B7FE25910CC20023232C6872 -0x2CB74442D613039DD1D7A3860B35458849F11C8C = RESIDENT EVIL: AFTERLIFE (UK) | V | 0xE831C3BD830E824BB74CA430A8AC4DB3 -0x2973B2C6E74266BB17A377C710046B99045C9596 = Resident Evil: Apocalypse (GER) | V | 0x269F1E5C4CF262052780E064E1486C93 -0x5076088629F36FDD9877DE69B7ECCB72447982AE = Resident Evil: Extinction (GER) | V | 0xD66AB8B03B41B4D505D7999C8C269330 -0xBE7C2C004F0B5FD202C6BE3C0AFE1C50CB3118F9 = Resident Evil: Extinction (US) | V | 0x5DF16E1393E712C57A5CB27A329B8C7D -0xFE22C2576D066DBE8DCA1B1BBDAE53D3A45FFEE2 = RESIDENT_EVIL | V | 0xF83DDD9224793B55F3E66645FC25D945 -0xC9612623C19322EA6A4309413840EB2C70F8AF44 = RESIDENT_EVIL3_OK | V | 0xAB1A6BD11073459202715BE81D7B3E78 ; mkb v9 -0x1A0F4027C976C3C06B41AE6C7161D072F8B42E5B = RESIDENT_EVIL_1 | V | 0x44E8950E9EAAC32BED4FE47EAB70ED7E ; mkb v9 -0x4754506699F1B890AF5F28AF98E9FCF742106BEE = RESIDENT_EVIL_2 | V | 0xA017EC96024D1E0D566B46EE6A2B2787 ; mkb v10 -0xC99FF690403D1671EAD4C6CB7030826EAF042C0F = RESIDENT_EVIL_3 (Resident Evil: Extincti | V | 0xA97D25B3CE1D3B1561C1AA7E6ECF40E5 ; MKBv4/FindVUK 1.02 -0xB1CD3E8C3B6BFAA3BBA6682CB08C788BD3D20312 = RESIDENT_EVIL_BONUS | V | 0x28101026FB33FDA7E38E8784EDAE283F ; MKBv21/FindVUK 0.80 -0x3A9279816E5AB5426AF5CDB0F4595F8C6846D662 = RESIDENT_EVIL_FINAL_CHAPTER (Resident Ev | V | 0x496D3DAAB3B327DBFDDBF0C937A57EF2 ; MKBv62/FindVUK 1.00 -0x191A6A5210D4CD8653E44FB7817A5D1910ABFB19 = RESIDENT_EVIL_III | V | 0xB9DDE55D2313CBD9A2D222981D8A8ABD ; MKBv4/FindVUK 0.96 -0x48BCC4A41926CE8719998998FFA30BE2D529F736 = RESIDENT_EVIL_RETRIBUTION (Resident Evil | V | 0xFF425851EE9EDDFF44399A5D97F0EBDB ; MKBv31/FindVUK 1.02 -0x28AA7EB5C6A48A2E18A1787C17D4DD0624DBC9E8 = REST_STOP_2_BD01 | V | 0xDA9007902BBD24446A02D814DF2478D3 -0xFB1795A6F40A98E7BBD1A084007540FF41677296 = RETURN_G51 (The Return) | V | 0x331E70D7965563A6CF7B8B02E8D13D29 ; MKBv17/FindVUK 0.95 -0xAE63A84C5BA49A184FBA9A59BBEECA532238C273 = RETURN_LIVING_DEAD_FD | V | 0x8FEAB9E1FFB50E472283D84D34D20D26 -0x50DD829216B173054B082855D4328789460582AF = RETURN_OF_THE_JEDI (Return of the Jedi) | V | 0x0C86CA650C1F2C52AB815C216FA038AA ; MKBv20/BD+/FindVUK 0.92 -0x201F8C8CBAD3B9324FE698A0F3D650DB458346EB = RETURN_OF_THE_JEDI (Return of the Jedi) | V | 0xA6CCDD76A87B292734DC684EAE9F0C98 ; MKBv19/BD+/FindVUK 1.02 -0xA7263940B154FEEF09A31FF50A6226F0D1118B0B = RETURN_OF_THE_JEDI (Return of the Jedi) | V | 0xFBDECC50BF5CDE1F445D51385F74479B ; MKBv20/BD+/FindVUK 1.02 -0x4B58D311F7C85D2D3DA5FC3198CD4843F8C6413E = RETURN_OF_THE_JEDI (Return of the Jedi) | V | 0x9392D7D5391E44855163E78E55E341DC ; MKBv20/BD+/FindVUK 0.96 -0x26141CC5B3356E95736BA53FE2C8BE821EE369F3 = RETURN_OF_THE_JEDI (Return of the Jedi) | V | 0xDACB582D503708A15A7C6D9362CA272E ; MKBv20/BD+/FindVUK 1.00 -0x113B873574ABF236895BE54376AA14649DA0152E = RETURN_OF_THE_JEDI (Return of the Jedi) | V | 0x73C153CC28B32B650F23F8A9891331B9 ; MKBv19/BD+/FindVUK 1.02 -0xEF2B024B575DD6F265F0A2A25C1D6ABF7F114424 = RETURN_OF_THE_JEDI (Return of the Jedi) | V | 0x0FFB68033EA68A7E1ECB7E2E7BBD476B ; MKBv20/BD+/FindVUK 0.99 -0xA3528A3011DC4BE83FA15C5BD100E950F629CD9F = RETURN_OF_THE_KING | V | 0x4FCB14CAFC9D24ED4454A97467917E7C -0xBDC88596606110CA04F939396F212CBD8700BD35 = RETURN_OF_THE_KING | V | 0x4F22D77D4E504DEBA9604B7186542EA4 -0x691F93D86476DB5D35384BADBC172666C0285404 = RETURN_OF_THE_KING | V | 0x4A5BFB9C71276E9632AD54900C2DFD3E -0x1C4CFB3CB4F4B3BCDFB5CC2E56BEA0D39F4FDD90 = RETURN_OF_THE_KING (The Lord of the Ring | V | 0x17900A543CD7A0A1F9EB6DA51543EC98 ; MKBv16/FindVUK 1.00 -0xD286AC2FF8020548249286D4C937515E250DBB36 = RETURN_TO_FOREVER | V | 0x5E3318503424053442522CE0C12AB71F -0x24FCC67A71EC04158BC322FD00FDBCD047A55DD7 = REVANCHE | V | 0xEC8CF6AA8336D4FA1E62AF517647BCA2 -0xC75686B0B86F3D4D28745E28A4CD7E803AB2E075 = REVEILLON | V | 0x5CDF1729C49B8220D2F32A41D6445328 -0xB33A93339A0E5946CE1FD4F272D79165C5D61FE0 = REVELATIONS_OF_THE_PYRAMIDS | V | 0x9A6C087B8F8A18B6CB524BC1CB1B41E4 ; MKBv21/FindVUK 0.80 -0xD2447BC68A1578011B5D80627B065CF283CBEF1D = REVENGE_OF_THE_SITH (Revenge of the Sith | V | 0x8886E021DB2CB2BFF88C1CC73D6CCDC0 ; MKBv23/BD+/FindVUK 1.02 -0xEB0876C5C93D02F9E3C58780C616A2B2510F5AF5 = REVENGE_OF_THE_SITH (Revenge of the Sith | V | 0xA626E4D2705FA747BB56C6373FAD6AB5 ; MKBv23/BD+/FindVUK 0.96 -0x4595A23A55821202ED0EC4D07EA9630A225E4BC6 = REVENGE_OF_THE_SITH (Revenge of the Sith | V | 0x82E069A27FFCC883FF1FDA9D70096EEE ; MKBv23/BD+/FindVUK 0.99 -0x835FBB1B42FA1959AB4FE809BCB50D1B1121D9F1 = REVENGE_OF_THE_SITH (Revenge of the Sith | V | 0xC7554CC182804602B255DC3FBD6B2C43 ; MKBv23/BD+/FindVUK 1.00 -0x6D63002CFAC9A95F8E303786158B6838D52A22BE = REVENGE_OF_THE_SITH (Revenge of the Sith | V | 0xD13982AA39EE1F2CCFBC3AB23D820001 ; MKBv19/BD+/FindVUK 1.02 -0x0BBDFB5BBE223A9F0E9150642DA2E2AA1F6887DF = REVENGE_OF_THE_SITH (Revenge of the Sith | V | 0x1D45FF3571FD787A60E9A3D8FC164063 ; MKBv19/BD+/FindVUK 1.02 -0x9C798B2BD74B7BCED8897261068D3AF5A0D89A3F = REVOLUTIONARY_ROAD (Revolutionary Road) | V | 0x3B1A95CCD48FDB09F926774B5498B7CB ; MKBv12/FindVUK 0.96 -0x445DA5207481E844CE4D67CF5400F0384805C6CB = REVOLUTIONARY_ROAD_EU | V | 0xB87AF106AFE1483C112C839474877FA3 -0x83607226F94C73AE9D31146067CCCF949B70A306 = REVOLVER | V | 0x284F486B1D75A39E75D46C04E3A663BC -0x34B51662BCB56B6FCEB3D5D54EFCE907C3FD60DC = REVOLVER | V | 0x24C02D69E8B1855E9AA2031589D5FA8F ; MKBv9/FindVUK 0.96 -0x2B7EC40DE3B28F5D54C11C0323761DACC29C6D48 = Revolver | V | 0xCCB974709F6510B4DE2FD98AC506270F -0x40160DDCB235A8F83E2E52D1DD779C2AA1E97B76 = REVOLVERHELD MTV UNPLUGGED (REVOLVERHELD | V | 0x6250E7FCA9B121E659A8CC62435DCCF3 ; MKBv54/FindVUK 0.92 -0xCAFD62C56AADAB5C583AC4EAE08D1543338A33CD = RE_AFTERLIFE | V | 0x8CBF2994BDEE5BC6E777E855E7085676 -0xF7DFC84B2AB6DCB2E01835324B9E18F712918497 = RE_DEGENERATION | V | 0x8FD09AB0893409E95478BC7D5740C485 -0x59C4558B5461600184C15BCBB84445D2DC45B123 = RE_DEGENERATION (Resident Evil: Degenera | V | 0x47275463FB77BC079E07A9F0F8A9E4FA ; MKBv10/FindVUK 1.03 -0x3460B0084CA92EA3413B2173B718207619F8A083 = RH3_D1_CT | V | 0x3B2D70A02015AD7CAF35AE554AA8BA2D -0x373F39F3C71092BA1C241D793899139557F7E49D = RH3_D1_JC | V | 0x58E480DD2F2815B73094C5850DC65A2D -0xFD19BCC2563A026A709D2407F67D22AFFA369531 = RH3_D1_JC | V | 0x645D55F1BDD7C4BFA29339BACF7D22FE -0x30615387B922CB4EE7182646E37C82A8744A3D8D = RH3_D2 | V | 0x404D098E160A7072B8E67E68B910FBD2 -0x7B3BEC92061653088370C7D5BE677428273500A7 = RHEINGOLD | V | 0x62E1425C0949453127F99F59249B28AA -0x3A2096722DFC19E4E4AFDE75FE199DA020818ADC = RHEINGOLD | V | 0x3181C057731E52D0AAB868A7B902FABE -0x9BA84FF5022AD2BD1E5ADEA3050A9139BC28698C = RICHARD III | V | 0x9F3D9ED7EE9D6D380009493A34111B5C ; MKBv60/BEE/FindVUK 1.00 -0x70FAFDCFD61A7B0CAB15718E100884635E4A9394 = RICHARD III (Richard III - Blu-ray???) | V | 0x4F73F66BD82FD7FA5857154924CDCFEA ; MKBv52/FindVUK 0.92 -0x2B53DB916180ED3CAC07CB3AC15A00CF1C2B425A = RICHARD_III | V | 0x44656A159AB08FC0953430702575370A ; MKBv47/FindVUK 0.80 -0x147613D5B218FB84CC5CC474F832E9CF987F2BBB = RICK AND MORTY SEASON 1 (Rick and Morty | V | 0x2EDB68CA8B47E9584C7FC482DBF50476 ; MKBv46/FindVUK 0.93 -0xF109E4D1E21681A7B62CDF602DDFD0520156A218 = RICK AND MORTY SEASON 1 (Rick and Morty | V | 0x98D90039737CEB8DB0F969E52C3D473B ; MKBv46/FindVUK 1.02 -0x6A83827DE34FE05652B1BF0D43BC4C0E01836826 = RICK AND MORTY SEASON 1 (Rick and Morty | V | 0x9CAA9E9ECDF1E6C251C3EC0811D12705 ; MKBv46/FindVUK 0.98 -0x1E318318C80CED8F55652F6490757C71569B27FC = RICK AND MORTY SEASON 1 (Rick and Morty | V | 0x89B84D16512C4CCB108C0EC9604B66EE ; MKBv47/FindVUK 0.96 -0x5F880DFDA7FFCBE94724D1BCE2D0016213C5FDA4 = RICK AND MORTY SEASON 1 (Rick and Morty | V | 0x9009460BBB5D49C77EDDD52F761FAFFD ; MKBv46/FindVUK 0.99 -0x6608CE417CC1481EE0AEA65E8F1EFEAD21DD139A = RICK AND MORTY SEASON 2 (Rick and Morty | V | 0x5E4CFAB0306D8B60874786C7066C8E05 ; MKBv46/FindVUK 0.96 -0x1B6A4DEC43645C8AE65957649BC6361A80F0E59F = RICK AND MORTY SEASON 2 (Rick and Morty | V | 0xA174F7467CA069364108CD06D6123816 ; MKBv46/FindVUK 0.96 -0xE2C68CAE6C9BC7A4A9235E2155152693926D0C1A = RICK AND MORTY SEASON 2 (Rick and Morty | V | 0x299391915CB34E39335C1EC7379F0E0D ; MKBv61/FindVUK 0.99 -0x18B593E9A3448F39377E61C6A5D73995B1A7BE84 = RICK AND MORTY SEASON 2 (Rick and Morty | V | 0x412178B64B00B7F7123E15DB43036376 ; MKBv46/FindVUK 1.02 -0xB277CF5737735F5C610A6D70CB1B5E6231BFD311 = Rick_and_Morty_Staffel1 (Rick_and_Morty_ | V | 0x262B8105F3976F7E4FE5B3F7926F6929 ; MKBv62/FindVUK 1.00 -0x39A5F41DAC3D3EEC568817A0B71B99F8052A9354 = RICK_WAKEMAN | V | 0xE1137FB21DA1F671E4442EB15ED26BD1 -0x15E96D90B13673F39B4795BBE648E96A18409BB5 = RIDDICK | V | 0x526927A8D433D058D706341B79CAB7FC ; MKBv40/FindVUK 0.94 -0x103AB5CC6FE154D1E3953BA10FD049DA29614011 = RIDDICK | V | 0x41CA240DBB0F69CA00DE17511B4A6FDE -0xE00EC486FFD533A198B31E63FD13093417C31028 = RIDDICK | V | 0x5EDBC255D97E2E24AF089A3768C1F64D -0x653FA1CFD4FD852AF29B2587673AD4EADFA435CE = RIDDICK (Chronicles of Riddick) | V | 0x9EDF852D352117C0256C8D9E24281713 ; MKBv9/FindVUK 0.92 -0x04C47C8CE6718A30EE4CA66E783D0996CFB5E1AF = RIDDICK (Riddick) | V | 0x66073B2C8DC269B6CAD9DC0157AD7174 ; MKBv44/FindVUK 0.92 -0xE2F864B3952DF9B88A875B5F2A30E7758AAF3FB1 = RIDDICK (Riddick) | V | 0x3AF602607BA7E14398DFD7500FD1A0AA ; MKBv44/FindVUK 0.96 -0x040072AD5DFBC0F0BF6CC7F22E453B1407A5F906 = RIDDICK_DOM | V | 0xFAF82ABE808F5C1D0BEEBC10174A60E6 ; MKBrev 35 - FindVUK 0.54 -0xF403EF1CD56612B4B15DAECDC8DA3FC33FD384BB = RIDDICK_G51 | V | 0x855A978F3ECA22FBF877189B96639621 -0x73DCC70D204378800C44BB75BDA8381154785F7D = RIDDICK_G51 | V | 0x5FA371D999F5DA575F1E5C4E7530D7CA -0xEAA34A68CF19B8BB1751B3E05441A3CB4444BDB8 = RIDDICK_G51 | V | 0x057C051B63D666B67E7EB3FDBAD49D81 -0x089CC68FEBBE7192D308849C1BF1ACFE90F25095 = RIDDICK_G51 (Chronicles of Riddick) | V | 0xDDBB23E4E35E87DA2F8BFD216069F2C3 ; MKBv9/FindVUK 0.96 -0xF2DA08C65E2568AF36238B59869EDF0AA4D769FD = Ride Along | V | 0xC526FB906C8CA11A630493F6F6436214 -0xDA9B0164508DD1650F2B12C49FFFD9CCDF577204 = RIDE_WITH_THE_DEVIL | V | 0x6521B8CEAC3F29055BA4D661E0AE5439 -0xD924FE27B2F4C8C647A85ADCF6471C362E87E53A = Righteous Kill | V | 0x4E24D5F472A7C622CCFCB2694B5A3A9A -0x6675BB0E614436119E637A713D2959EF03BCE6B4 = RIGHTEOUS_KILL | V | 0xD15E793F91B6585631EC1C4E1B30B1CA -0x4354215543ECD0B7CE9A1242C78C9976C250E668 = RIGOLETTO | V | 0x22093E66895770CA096E1FCFE8297BFB -0x5964F306316A7505774DE42DD4403C94D50693E3 = RIHANNA Live Konzert - Good Girl Gone Ba | V | 0x9AA324C4B97B01A80417B931F0D2CFD9 -0xCB941A26EE3B344F9316A5FBD017FECFD0B0DA7D = RILEY SCREAMS_ BD | V | 0xFA1186F8562959EEE58004072CAF1BEC -0xBFA0F5DC37B91DB8E420EC01469C0205AEC0E16A = RIN_D1 (RIN Daughters of Mnemosyne Disc | V | 0xD9EC064BEADCA8D2AD2566ED51C16EAD ; MKBv17/FindVUK 0.94 -0x714DAB1F8ED9B8AFDC3CB69C5E37F097C9723FAE = RIN_D1 (RIN Daughters of Mnemosyne Disc | V | 0xC655BF228B23824D78FF1851F33789D2 ; MKBv17/FindVUK 0.96 -0xFB72761083C1A7770740D1A341DF71E9003EA161 = RIN_D2 (RIN Daughters of Mnemosyne Disc | V | 0x9A90FAD6B0B5F143F53031774AA4BEAB ; MKBv17/FindVUK 0.96 -0x9FA2E0EE9E19930E7173018D4162EA821FCEF5F8 = RIN_D2 (RIN Daughters of Mnemosyne Disc | V | 0x7F02A57706371D60AE2D1B2A59D58B68 ; MKBv17/FindVUK 0.94 -0x779A5E075E404C3DF5473CF5741CC1416C8C34E8 = RIO (Rio) | V | 0x051D0B864C028BA1014172C2CA64314A ; MKBv25/FindVUK 0.89 -0x78D6456E18B3129354918B8DD9DA912FABE55557 = RIO (Rio) | V | 0x0F18D0040A8367FD6D45C5BAB7539A64 ; MKBv19/FindVUK 0.98 -0xB72DF7524E275D891EA0DB8183936DF7BA4DB060 = RIO (Rio) | V | 0x9B9752DD1F821208518D0EBFE5771E42 ; MKBv25/FindVUK 0.87 -0x6C870931499349385E2212A00538247B8E8541BC = Rio 2 (Rio 2) | V | 0xEDCF0D59040F8ACE05458492C58B19E7 ; MKBv47/BD+/BEE/VUKNOTVAL!/FindVUK 0.87 -0xB1A6881BC2FF74E74DD5C125A9ECC88912926B58 = Rio 2 (Rio 2) | V | 0xE48ECD9603C6A127B6F5B26FA5CA2703 ; MKBv39/BD+/BEE/FindVUK 0.84 -0xB3FC2F6388EAE3A65880110FACADF785B30A028D = RIO_BRAVO | V | 0x5B30F97DA0D183FD5F2808ED7C403E6E -0x6B671FEFD9136D965F710E358996E9F5E3C526FE = RIO_BRAVO (Rio Bravo) | V | 0xAFC986DE8A3E86CA010BFA4203D2D85D ; MKBv50/FindVUK 0.96 -0x77C11C94450BBAA355DD4141C47211CA1A21D338 = RIO_FD (Rio) | V | 0x38C98C87F6ABC9280AD1BF003BC1EE0D ; MKBv23/BD+/FindVUK 0.98 -0x45FCA0577D74A3B575B2C6985E9F72FD7BAE0363 = RIPD_G51 (R.I.P.D.) | V | 0x3F85539B808E53AA8496391D6E9BC32E ; MKBv43/FindVUK 1.02 -0x34543C543508E377789217181326F938D6FF2CC4 = RIPD_G51 (R.I.P.D.) | V | 0xA761C3B5F93B5CC374D3034F61BEFCEE ; MKBv43/FindVUK 0.89 -0xC863B62B5E343DF7C5245A853820C6B35A480D55 = RIPPER STREET - STAFFEL 1 - DISC | V | 0x6092E44A85EA0FE7836449A9EAC21E4D ; MKBv44/FindVUK 0.72 -0x32ADB08562C2AE1F990C36AEA4EF0985583B62FB = RIPPER STREET - STAFFEL 1 - DISC | V | 0xD0589EE29CFA376D46D690FC11EC42CF ; MKBv44/FindVUK 0.72 -0x49042FE1AE1DCC073712DEE5CF5A6FBE4DD91171 = RIPPER_STREET_D1 (Ripper Street Disc 1) | V | 0x3888ADFA8D802036332DD8183D56A79E ; MKBv33/FindVUK 1.00 -0xA3572BA59F397010E8A30FFF9E76F5912D248F3D = RIPPER_STREET_D2 (Ripper Street Disc 2) | V | 0xA0554600D54EB816CE84BE1CCC8C0B9F ; MKBv34/FindVUK 1.00 -0x94D002EE1A435285E6BCD85DE5B6B9067F504AEB = RIPPER_STREET_D3 (Ripper Street Disc 3) | V | 0xFE35FE9F7F1A4E9EF7E7B99B5966C41A ; MKBv34/FindVUK 1.00 -0x71B2EEC79733783FAD5632A39BBF576A875D22C4 = Rise | V | 0xE75613AE90904F855E1151D9636F9CF2 -0x5F02B5E0C313E7D75280B9F81A526EAC7CDDC504 = Rise Of The Footsoldier | V | 0xD151DF33E68559031627A62C347CE24F -0x5184F6D8958AE6FA1DC61141D107A84C99795D5E = Rise Of The Footsoldier (Rise Of The Foo | V | 0xEAD54BE0A0E6D2E6C789EEAC09BC639C ; MKBv9/FindVUK 1.00 -0x5592C47E183DAF22FDB2CCCB5B8539F89768D676 = Rise of the Guardians 3D (Rise of the Gu | V | 0x1FE21D5FECA6F243ADA43ACB808AB527 ; MKBv31/FindVUK 0.96 -0xBAE96F8A651CF5E04C2F71200378596A51FE8CCE = RISEN (Risen – Blu-rayâ„¢) | V | 0xFA4B8B2ACDCAF4F7048F4EDACFB91F9A ; MKBv61/FindVUK 1.00 -0x1D48A7A3C85F6521EDAF5E2F0735B4DB44D122DA = RISEN (Risen – Blu-rayâ„¢) | V | 0x1E740269AA69608A45EAE8EF089FE08A ; MKBv60/FindVUK 1.00 -0x4CBD8488682ED34E88A055E2D4BB903143E616D8 = RISE_OF_WAR (RISE_OF_WAR) | V | 0x76216613897FA45091198294AD04CBF4 ; MKBv18/FindVUK 1.00 -0x29D89586B3CDA0956B3C6990D1CB24F430E54E74 = RISE_PLANET_OF_THE_APES (Rise of the Pla | V | 0x6859B3C9582BC4CC3689DB7039B44CB3 ; MKBv25/BD+/FindVUK 0.96 -0x4D03DC5BB5A8EC3C127CE2EC05E1C5150A9E4681 = RISE_PLANET_OF_THE_APES (Rise of the Pla | V | 0xB63B66072B2ADD821385C7D2BBBD8CD5 ; MKBv25/BD+/FindVUK 0.87 -0xA2815A3528952E063B66392FCB488DD1961F31DB = RISE_PLANET_OF_THE_APES (Rise of the Pla | V | 0xFF5F75A156ABB6B7FB3D5EB2E1D39A79 ; MKBv20/BD+/FindVUK 0.84 -0xB693F5893BCDF9EACEF0E21F874C66A3BBB6A6A9 = RISE_PLANET_OF_THE_APES (Rise of the Pla | V | 0x47A721A2069517ECDFD656DF30CABC3C ; MKBv25/BD+/FindVUK 1.00 -0x72C0F764F37E2DC5620926E2FD90F6503EA8BACB = RISINGSUN_F1 | V | 0x788BF320DF09BDE7847D128B161FF70E ; MKBv1/FindVUK 1.02 -0x8614547730E2EE9B6F774ED52F52CB892BEA1475 = RISINGSUN_F1 | V | 0xA800131DC1A47A455B3AA275E7B6007F ; MKBv1/FindVUK 1.00 -0x5ECF4D48B28D3140E4EFDF5DC409D1B6854737B7 = RISING_SUN | V | 0x2E472C3AF1FF02F0861B91C71FDA8B13 -0x5CC5BD5BD8BF77BBC6529390660A764E2F811DEB = RISKY_BUSINESS | V | 0xB6664BF95D8E7B8890CC915F685ECB76 -0x3D43C5D884A58696E57DF4A1A854BB70BCD713C6 = RISKY_BUSINESS | V | 0xDD96A95F177465413CFACBD9F446F6BE -0x6B5A809889054B42E81F5CD5D4488AFA7F29457A = RISKY_BUSINESS | V | 0xBAB72B0C09483F09676AE71DDBC2E990 ; MKBv9/FindVUK 0.80 -0xF72C1CF63F7ADAE45736FEED18BF403202EFD5CC = RISKY_BUSINESS (Risky Business) | V | 0x5054141D6D271BE3ADB769C2AB9B7557 ; MKBv9/FindVUK 1.00 -0xCE4DEC423BAB70D661F9A50AC4F44C60DB41E569 = RIVERWORLD | V | 0xF7B00089A210A45D64E9D014C7D0DF1E ; MKBv25/FindVUK 0.80 -0x978437053621759DA58DCC4D39644CF68FA08504 = RIVER_OF_NO_RETURN (River of No Return) | V | 0xDEFB925318C56B8348A9E71648630FF0 ; MKBv27/BD+/FindVUK 0.90 -0x88E4787B55A7A70D123FC34F26D16E81AA036FBC = RMZ BD-2 | V | 0xFD333623FFE318D04605C6CE999749AC ; MKBv58/FindVUK 1.00 -0xA82866A3EBB7D71F83C8BDBE186A5E91693A4FBD = ROADHOUSE | V | 0x2B3C3CD180FD89D42988C8CA5D1214C6 ; MKBv3/BD+/FindVUK 1.00 -0xCD9CB58FB54EC3B9C2823E7C8B27CA63E193899A = ROAD_TO_PERDITION | V | 0xD2B9AEF29A576C4F76FC7D8C0337756C -0x33E554F4361AA34B13C8EBFCAD17647133A4E2F9 = ROAD_TO_PERDITION | V | 0x17DAD5F6EB53A85AF435DF3D24F65945 -0x9FF00437FC16B1E45B731BC0186233AE7FA3944D = ROAD_TO_PERDITION | V | 0x68274CC6E38FE5AADBB0E1AF4B63739E -0xACA8D84A05B780EEBB1CBB7804B3CCE130EB51EC = ROAD_TO_PERDITION_F1 | V | 0xFAC698090679F761CA97800C34226EEE -0xA26EAAE9BED09D3EEAF35E11A0F9041C0F2501D8 = Rob Roy | V | 0x6E71C7C15D3B576C086AC94C7C5D8F1F -0x288F64FD1E84DFA3D01C55B672BE98D7B36CD778 = ROBBIE_WILLIAMS | V | 0x1F54199AE81CE5AE2EE1C3AAD19D3140 ; MKBv4/FindVUK 0.96 -0xD3275B8B6131C786EE22F251F36C2947B014FC7E = Robin Hood - Prince of Thieves | V | 0x61BAFE7DAEDDA0943A5C32EECBA12DEA -0x3CFBBF3970F23B5D764C142B65F2838EC34FECFB = ROBINSON CRUSOE (Robinson Crusoe) | V | 0x197B5D129AC28A77632DFDFB08A38215 ; MKBv61/FindVUK 0.99 -0x87B0FD99F01255D495CBE3EC2E494E89C19F3DBE = ROBINSON_CRUSOE_2D (Robinson Crusoe) | V | 0xE5E7C46832C8E302820A83B1C1AB15BF ; MKBv60/FindVUK 0.99 -0xF6761405505BE6F6F2F40C7DB75D23F8F42EECE0 = ROBINSON_CRUSOE_3D (Robinson Crusoe) | V | 0x4A5E67591FD63B1166335D3E4D73F6D1 ; MKBv60/FindVUK 1.01 -0xB01F8449E6E9127FA7F261674A8FF58E89FAC489 = ROBIN_HOOD | V | 0x294FCB6B6F34489F57B7963A8A302273 ; mkbv17 -0xEFB4E0BDB039FB837482023819B0325A43BECB6C = ROBIN_HOOD (Robin Hood) | V | 0x0E5E3122D3D887A206101D9F43148F81 ; MKBv17/FindVUK 0.96 -0x2479004C708A46F2CCBFCE92ABA5F3CD418DF2EB = ROBIN_HOOD (Robin Hood: Men In Tights - | V | 0x50E2BCFA15061D417657104BA695E817 ; MKBv12/BD+/FindVUK 1.00 -0x6F485AF7261BEE8214D81C7D79BA12281B8EB3EF = ROBIN_HOOD_G51 (Robin Hood) | V | 0x8E218A4AE4DF4C22B649420970E6C06E ; MKBv17/FindVUK 0.99 -0xC88934296349C0E1EA649A2132F5CB969BB8177A = ROBIN_HOOD_G51 (Robin Hood) | V | 0x77035468FAA1E32F035950CD009A88AF ; MKBv17/FindVUK 0.83 -0x39E09DC9E322A067245C3313440C5F4CA595E5E4 = ROBIN_HOOD_G51 (Robin Hood) | V | 0xB8044732CE6504DFCC6378C91A283DBF ; MKBv17/FindVUK 1.00 -0xEC4BBED0C44F51C09011F37C4B22B0FD59245101 = ROBIN_HOOD_POT | V | 0x2ECDFB2F111A25BF164E3FF7E24B8A3D -0xCFCCFE87E4D286E6F4B83F139225424583F0B478 = ROBIN_HOOD_POT | V | 0xDA790F87DD95C4A4F2CC68A47D0A8B6A -0x63089CFC9A3D0E62B7906B2118828B27A06E9BA1 = ROBIN_HOOD_SE_2013 (Robin Hood Special E | V | 0xFBE0EBA199C3CBB3499EF8F0D16B4BFF ; MKBv46/FindVUK 1.02 -0x715B4008AFA5E29E1DBEE9A7ACC7B1D62178D566 = ROBIN_HOOD_SPECIAL_EDITION | V | 0xA89644CCB66AB8134323876DA50F95FA ; MKBv36/FindVUK 0.81 -0x84169BF463B055A8A780480C69643BC6ADBCB544 = ROBIN_HOOD_SPECIAL_EDITION | V | 0xE4D520B65543CAE37AA38EACA944128B ; MKBv31/FindVUK 0.84 -0x7E075D65DA543777C13875512D1CC0DA80ADE24E = RoboCop (RoboCop) | V | 0x5682EF63BEE822EF530D61FEDB9F1EAC ; MKBv39/BD+/BEE/FindVUK 1.02 -0x527A50FD6122A946D2C2693175061F0713F09C6B = Robocop (ROBOCOP) | V | 0x8A6CB6AB6DB68DF2BBC697F574E0C9B9 ; MKBv20/FindVUK 0.99 -0x88C076FD53D033CA24A6ACE9B5FEC1D83BF649EE = RoboCop (RoboCop) | V | 0xFA934448451E86F148932DDAAC47E893 ; MKBv39/BD+/BEE/FindVUK 0.91 -0x452511FE552951860FA48B482F30682D4F6E31FE = RoboCop (RoboCop) | V | 0x58E97208CFDCCD3F5D8E445CB4D60D41 ; MKBv36/BD+/BEE/VUKNOTVAL!/FindVUK 0.92 -0x10A068F798CF84702EE4FAAD63877C911CA609A4 = RoboCop (RoboCop) | V | 0xD8C789011A8C6FA96688F60E08EEEA70 ; MKBv36/BD+/BEE/VUKNOTVAL!/FindVUK 0.95 -0x2CC3A36907E90C22E0B0B16856DB12AD121991EA = Robocop US BD+ | V | 0x98B02655F0A387AFDF636352875E0AB6 -0xC425B7DB4D5AE507EC77D9A14BD2C77E93E4359B = RoboCopTV | V | 0x0702AB064DC5CA83794881209AC420AC ; MKBv39/FindVUK 0.91 -0x1B52AF62A186B7C8748F633C81D85590D1D82366 = ROBOCOP_2 (Robocop 2) | V | 0x143F117FBAA62D38BCCF03B4750C8CDC ; MKBv16/BD+/FindVUK 1.02 -0x61A6E3D49DF1AF88DDE5A21EDD7AFD6654D237E4 = ROBOCOP_2 (Robocop 2) | V | 0x6C8812720A911AE6CF733AF82734F696 ; MKBv16/BD+/FindVUK 1.02 -0xB24E171E1EE5D38DF0685A0698B1CA1317B36DFC = ROBOCOP_2 (Robocop 2) | V | 0x37AE86284103D730056E90BF53F3CD8F ; MKBv16/BD+/FindVUK 0.96 -0x230A55FE3C2C3B61400F55EB95BD8FA631E76E4C = ROBOCOP_3 (Robocop 3) | V | 0x104B0120E71D08D85AF82D5F5CF54084 ; MKBv16/BD+/FindVUK 1.02 -0x2EA6609BA6C6232F44FFFBA6A95E4D973BF88B7F = ROBOCOP_3 (Robocop 3) | V | 0x32615591E69E8CF2AC87C6F8507AD7ED ; MKBv16/BD+/FindVUK 1.02 -0xB3FAD0974949E4CB75A65862140439FB1AB54FE3 = ROBOCOP_3 (Robocop 3) | V | 0xFE0667CBD43DB7160ABBEF048A6BCF59 ; MKBv16/BD+/FindVUK 0.96 -0xDF98C69CDF90385309BEAE133D57231027D33F5F = ROBOCOP_DE_FR (RoboCop) | V | 0xAC2F7894EAC701EAB647BD51BBA6BA0A ; MKBv46/FindVUK 0.96 -0xB8E9EB3F81DE2540BA2024A63907B1450C472486 = ROBOCOP_DE_FR_NEU (RoboCop) | V | 0xA0102AF50C0CAB2F0684EF98369A74A0 ; MKBv47/FindVUK 1.02 -0x7EB6DB68B451AE234DE25DF54CFCF7AE0B86C8E2 = ROBOCOP_F2 | V | 0x093C920C97F2138FF19C1757B3357F7F ; MKBv3/BD+/FindVUK 0.96 -0xE474EC463B8861EEF6ACD6BB00A7B28F7D3DBCB7 = ROBOCOP_F6 | V | 0xA7F0DB3C3024FD2431FD279061683181 -0x47CB7AE6663401873044E900FA7121675BCB1296 = ROBOCOP_UK (RoboCop) | V | 0x9E71A5FEE407CCD7798E67FB85610565 ; MKBv47/FindVUK 0.84 -0x4D69F04F622C672ED2711A3786AACBEBD0BF4187 = ROBOT CHICKEN DC COMICS (Robot Chicken: | V | 0x841E500878171DC5407C7F8A6635942D ; MKBv35/FindVUK 0.96 -0x3233C3D3C72241CB0BF8E65F0560C7E349A6375B = ROBOT CHICKEN SEASON 5 (Robot Chicken: S | V | 0x29A7B9F5F0087108A03C13ACB79A819D ; MKBv23/FindVUK 0.96 -0x46F1A5079E3C45B90AC226FD22D1490115968F76 = ROBOT CHICKEN SEASON SIX (Robot Chicken | V | 0x1CF5E79E8F9B1DBAF012EB3BE88A094B ; MKBv36/FindVUK 0.96 -0x479B4978D4496FD2E9859436A87B2ACED99043A1 = ROBOTECH_SHDW_CHRNCLS | V | 0x33D5726007C07B76D1EC67734918AFE6 -0x2AEEDD7A5EF5DE5336078EF502BB20BB39649F54 = ROBOTS (Robots) | V | 0x4679D50A84E2C696691D21578D113ACE ; MKBv16/BD+/FindVUK 1.00 -0x44D7DA2DEA70B0AF83E79847A250EB7EE1B5A98D = ROBOT_OVERLORDS | V | 0x1CB8A5DD897E0DD4D098F5AD59296435 ; MKBv55/FindVUK 0.96 -0x2201CCE44FB9EFDDFDFDE4947A8252A0759E420B = Rock of Ages | V | 0x22F50726F71E0B478FC618DC5A2957B6 ; mkbv28 -0xC0B4F7B0E6E849E365F0BCFB928AB4C9F7E3CC65 = Rocknrolla | V | 0xFFCD89949B02E880C36C780770AD69BF -0x323430789DAFF989EFD17CBE480BB9C0FE0C82E7 = ROCKNROLLA | V | 0xEAC71AA6B0997EE1CA86DD9724A2C409 -0xB7F6E3511644456F54EFEE913C2D0D2CEE35DDDB = ROCKNROLLA | V | 0xCD0C72DF562B36FA72E0374286F28CAE ; MKBv10/FindVUK 1.00 -0xFF8EF05F3A0E549BB6B9E5902D874B6BB0CB17F7 = ROCKNROLLA (ESP) | V | 0xD69738FE02961D99EF7885A987FA639F ; mkbv12 -0x0677C5C72936AA2B7735F91C0CDB2C0A7F68BFA7 = Rocky | V | 0xEDF54A558C2661C78CE95E5774853BBC -0xF40426E2B3A36A8DC4EDAAAAC23AAFF41E9BE4DF = Rocky | V | 0x327121CA349BAB91E7AF5B1B5C312951 ; EUR/eng/GE -0xBBD831B37A3DBB4FEF4E3AC75465EEA729C2FB48 = Rocky (Rocky) | V | 0xD1A3A3A44A5E703A4C1EF3B3E7F78B7C ; MKBv31/BD+/BEE/VUKNOTVAL!/FindVUK 0.90 -0xA6366F6035A44BEF6AFB35276FE41076D16CB46E = Rocky 40th Anniverary | V | 0xB0EC574D479C9A6E3116A2494FFFFD61 -0x3EF7F50F7576B0A317F7E79D1174482E06F1F5FB = Rocky Balboa | V | 0x15215E308AFAAC87CBD2C4C97D8D9F93 ; mkbv3 -0x4EE1D9EF6CFB931404A904584929CC361397F677 = Rocky II | V | 0x5DB6EE5F1C7E2E29DE64AF21E0AC4617 ; mkbv12/bd+ -0x09CC99B6AEE7452D499B4E36F7447A00FF185FE2 = Rocky III | V | 0x8B2CB48DCF9262B9ADEE95E08707FC5D ; mkbv12/bd+ -0x64100B21651C3A189667CD49ACA7A38B1C42CC64 = Rocky IV | V | 0x6B0DF75392D0C2A34D1BC010B8D0132F ; mkbv12/bd+ -0x4FDB4DE0A78CC8F2083ECFED4674CD147D8AC659 = Rocky V | V | 0x02F62065B757BB0EDDDD05E2EB04EB19 ; mkbv12/bd+ -0x4691A1D4215E5A302492757C56CB18FEAD6517B3 = Rocky V | V | 0xFE1DEBD4666210D10C13268E01AF45ED -0x9CFDD638F2D70378A101128AAE76C6AECFEEB96E = ROCKY2WW (Rocky II) | V | 0x058E2C7785B426D6DB5F97C668716937 ; MKBv12/BD+/FindVUK 1.02 -0x486F283998D470F4924DAC9CCBC38479ED85C4D0 = ROCKY3 | V | 0x48E4688FB169860771400670B713AEF4 -0x501849BDB7C18BF38782E0AD174222D9B63EE9A0 = ROCKY_IV (Rocky IV) | V | 0x24E0E970570C3197FF6D4CF319D9D835 ; MKBv12/BD+/FindVUK 1.02 -0x7AD4437D2E093A35531329DF67F9CD7F8B0880E1 = ROCKY_V (Rocky V) | V | 0xEB31020AA3E6935461CE02CC7701ACFD ; MKBv12/BD+/FindVUK 1.02 -0xE714FC1309663CECB46DEC71E71B7A6CEAD321F3 = ROCK_OF_AGES (Rock of Ages) | V | 0x43BB7DA5ADB6868B966BB3401451EDA4 ; MKBv28/FindVUK 0.92 -0xC18F62AB7215ECFC7C19927D15AB7CAF115058AE = Rogue One: A Star Wars Story - Blu-ray | V | 0x44E3C60F61FD1400E07247674FFB91DF -0x7291A6AEFCDC58E5E22023C84833B9E550BED1EE = ROGUE_ONE_A_STAR_WARS_STORY | V | 0x04DFA76D9377A5552A70FA1EA42F73C2 ; MKBv50/FindVUK 1.02 -0x692AB9B827F01BA32A3769D94434C3B8D00061D8 = ROGUE_ONE_A_STAR_WARS_STORY | V | 0x382B7921F19BD90AFF8E1F34E8C61130 -0x5C23CF7981773971530BC631C9DC2B26C17F6991 = ROGUE_ONE_A_STAR_WARS_STORY (Rogue One: | V | 0x8005EA4967A6BA84DD6E82DE08074B47 ; MKBv50/FindVUK 1.02 -0x4751191C743DDC8AF01FF1ABBBCDC7235EE8AD62 = ROGUE_ONE_A_STAR_WARS_STORY (Rogue One: | V | 0x2B979B87DC2B0B395A45D921C96496D4 ; MKBv50/FindVUK 1.02 -0x7CD19A9D2124CF19E0CD90173BE67A97856636FA = ROGUE_ONE_A_STAR_WARS_STORY (Rogue One: | V | 0xAE4D676DA5960BE7F0D06C7ED00E0AF8 ; MKBv50/FindVUK 1.02 -0x1373DC5FD46E502E04EAC940BC1BA5D9B9F609B4 = ROGUE_ONE_A_STAR_WARS_STORY (Rogue One: | V | 0x421F57FA98F7E281B13DA48259A2273C ; MKBv50/FindVUK 1.02 -0xE437D559F67ECE5D4788EFDAB07EFBF59D4D1739 = ROGUE_ONE_A_STAR_WARS_STORY (Rogue One: | V | 0xD112339DDA0475EF1EBEF34CA2F38C4D ; MKBv58/FindVUK 0.98 -0x697FAD78411E5FCF1E8E1F47193C0D87A4865055 = ROGUE_ONE_A_STAR_WARS_STORY (Rogue One: | V | 0x0F3776CA615B6F1D180D05E465F03704 ; MKBv58/FindVUK 1.02 -0x5FB5E33A423C440FB2C22B633793CED8F8B90161 = ROGUE_ONE_A_STAR_WARS_STORY (Rogue One: | V | 0xD1FBC88E08B19364B0B003BDC4391778 ; MKBv50/FindVUK 1.00 -0x4366CB72A537C548B8E5780F572B4F1EF1405C1E = ROGUE_ONE_A_STAR_WARS_STORY (Rogue One: | V | 0xEF8DBD49F90E2EFBA01486BA666221FF ; MKBv58/FindVUK 1.02 -0x2D6E6AEAF6B25E41FFEB9F05C9E737F28C19C4BB = ROGUE_ONE_A_STAR_WARS_STORY_3D (Rogue On | V | 0xBA50EA2811C891860B04DCCFBD499BF3 ; MKBv50/FindVUK 1.00 -0x4298FFA8C1E75B30DDEFEDF986BDC0F1E6CD2462 = ROGUE_ONE_A_STAR_WARS_STORY_3D (Rogue On | V | 0xC276F5B58168364BCD2650FA31AAC942 ; MKBv50/FindVUK 1.02 -0x3E176557F16ECA7D0F5962764613EA4117A9094F = ROGUE_ONE_A_STAR_WARS_STORY_3D (Rogue On | V | 0xEE276513B876064A714465CDFE88F736 ; MKBv50/FindVUK 1.02 -0x02FD33EB4DB592600222F55882A78B4E573A4EE6 = ROGUE_ONE_BONUS_DISC | V | 0x8C042FA4EECF2F71BDA72CBF0ED1C109 -0xE20715B561B38DD4134423CDD62CA1B4170012C8 = ROGUE_ONE_BONUS_DISC (Rogue One: A Star | V | 0x0B527F0A2E330842DBAF7A7EB8545A2E ; MKBv58/FindVUK 1.02 -0xAB794F1304A6D863C49EFE4D4BD0A6F8FAA0117A = ROGUE_ONE_BONUS_DISC (Rogue One: A Star | V | 0xB12662BBF4F85A5276E8605578FE9DFB ; MKBv58/FindVUK 1.02 -0x6F06E8A71A442E93015CFB9CD6109BBBDF5B88AA = ROGUE_ONE_BONUS_DISC (Rogue One: A Star | V | 0x2F9280F1698F6B315EEB106A4873D7A0 ; MKBv50/FindVUK 0.96 -0xC75679B8C2AC530609D87826A6776B622E27C526 = ROGUE_ONE_BONUS_DISC (Rogue One: A Star | V | 0xD80BC3775CF77F40466C0FAFBC1CAE50 ; MKBv58/FindVUK 1.02 -0xF636695ADCB69A4AA77B3AC83A4051E0FA99F676 = ROLE_MODELS | V | 0x581CE97C99C7676DA11EF0D971D2C2DB -0x7F8B017F5A909E7EDC39BE80CA333B777A19FB3E = ROLE_MODELS | V | 0x84ECF4BCFF81DE25D6E3548A0C7F089F -0x5DA6CF3C0A95A0210FC639E417213CB1E8CBC18D = ROLLING STONES LIVE AT THE MAX | V | 0x86EEC5EE729B3515A692026C7F893DC9 -0x64869D26464559E16533EF08D9B514FB7696FB9D = ROLLING STONES LIVE AT THE MAX (Rolling | V | 0xD83F0994C33F9604F2FCE6C008961ED9 ; MKBv15/FindVUK 0.93 -0x9357465602BD2FA954788CD620BFCC3409C6FB13 = ROMANCING_THE_STONE | V | 0x5C6C17F03B77B0270F0030E3DBF0454D -0x977463AF8E1C3962BA1EB183FBD7BDE38AEAE713 = Romeo Must Die | V | 0xE240140FC111D3BDC60E47B471884BF0 ; mkbv27 -0xA31C8E399FC0E4E9724EFA2FFC1D96A8DAF17951 = ROMES1_D2 | V | 0x2ECA4EEC7825A97D29740A497FD2BBD8 -0xCFFE2E6543CDA55746DEFB195EE2FA22ADC8443D = ROMES1_D2 | V | 0xCBEE6A1460B985B5C0C91AB309C5DFCB -0x87903204C2EAA69B07B0E44130D0E8AB9F7A24AB = ROMES1_D2 (Rome Season 1 - Disc 2) | V | 0x42E4EFFE29F6E926383614338397A79C ; MKBv12/FindVUK 1.00 -0x39300A64D22B87D1E6A85A968DF9FA8BD4F9545B = ROMES1_D4_WW | V | 0x2405D786FBAEA674CD79E0601198476E -0xA9AE1B7A39C95435F8824F370D43376D19940C8F = ROMES1_D4_WW (Rome Season 1 - Disc 4) | V | 0x5B94ECC6FB0D6926B395FA49CA42FD04 ; MKBv12/FindVUK 1.00 -0x121F6CA837CADC056CDA1E32E324CA6BEE2DE77B = ROME_S1_DISC1 | V | 0x25764CDFE09F140D9BC0145029DF4D47 -0xC598D86605F2569D7D3919DA89EE3DF77D24A808 = ROME_S1_DISC1 | V | 0x875CBABA7CEC008983CBCEE863840DB5 -0x88665242565DDE76114476B7BD0A4CDD0DA5CE00 = ROME_S1_DISC1 (Rome Season 1 - Disc 1) | V | 0x96135CD89A55CE788A2781725076F258 ; MKBv14/FindVUK 1.00 -0xF1ACA440FC734707257964DD0F35A320F253E7F1 = ROME_S1_DISC3 | V | 0x7A2E0103F78EFC641420D9DFD618FAD7 -0x136BC48A21A1E1208F07BEB18484E3937CD700D4 = ROME_S1_DISC3 (Rome Season 1 - Disc 3) | V | 0x2C65089F3D6FAF6CDD1D2AE0465106AA ; MKBv12/FindVUK 1.00 -0x43DFC4C493FBD65BC9E2E87164E62DA2BF7BFDF5 = ROME_S1_DISC4 | V | 0x0ED29E5A78D8249E0CF0675682E9F01D -0xE2E9C86EC1DB4EC5908EFFB7A02FB4C61833C0DB = ROME_S1_DISC5 | V | 0x0AC5AA98058C094D46749AAC42F29350 -0x82526E53EE9FD68DE0E637A5C50228A04BE5AD52 = ROME_S1_DISC5 (Rome Season 1 - Disc 5) | V | 0x8BA67429A901174680988B89EC65E00A ; MKBv14/FindVUK 1.00 -0xCD8E34DB22064A479E52C4930A06E332256D0DF1 = ROME_S2_DISC1 | V | 0xE15401E0E5E3F6DD2C4F80A454FB2D85 -0xBC2B3FA54BBDA6F29C10101B336AF9AFC8F600F9 = ROME_S2_DISC1 | V | 0xFF4C93B9B0042431D9AC2F33EEFF3D1B -0xF89D50455A2D8CEB8044F72CA21E48934128AF4D = ROME_S2_DISC1 (Rome Season 2 - Disc 1) | V | 0x91F99B7A309B242FB2B807E2C345424D ; MKBv14/FindVUK 1.00 -0x28626ECB12B6A1AA7DC9B1308D18387F6B44EB10 = ROME_S2_DISC2 | V | 0x3FA04338F28B85F28502168108B87F8D -0x56D70AF72B084706E20B087F4B341AE10AD8D712 = ROME_S2_DISC2 (Rome Season 2 - Disc 2) | V | 0xE83A840014ADB1874E98466EEC714641 ; MKBv14/FindVUK 1.00 -0x3696CAE43E3D7E237DB28A1566E3C500017751C6 = ROME_S2_DISC2 (Rome Season 2 - Disc 2) | V | 0x974C3F6032A50A3008A34BA717641385 ; MKBv14/FindVUK 0.96 -0x59AD5A4E713AA5BE8C31E97860FE89F6023CB394 = ROME_S2_DISC3 | V | 0x42D43089E832B782293913F7DB7FBFC6 -0x81D3BCBDF1763A1892BD008A4557D78AA7F67904 = ROME_S2_DISC3 | V | 0xC85779AB6CC9AC530695CD1745AFA356 -0x431E2171E8046322344EC2CA02859C7A5D8956F7 = ROME_S2_DISC3 (Rome Season 2 - Disc 3) | V | 0x65770320C58CA6E63D2A9DDE6156182A ; MKBv14/FindVUK 1.00 -0x7175CEAF2A0B9019EA88F71EC67445CCAFBBBFBC = ROME_S2_DISC4 | V | 0x8A221B00EBD371B1E9B2618146ACDF85 -0x492551044BB6961B113756CB92E6BD410C0C5099 = ROME_S2_DISC4 | V | 0x6789E87D70D1790B913570692FAEBCE7 -0xC7C1E086879B4547C2243E74251ED51D916157E7 = ROME_S2_DISC4 (Rome Season 2 - Disc 4) | V | 0x863DC31B5728DB7A9815E7030C48FE55 ; MKBv14/FindVUK 1.00 -0xF89D9B13E4861AF02FDC75A61F805F74F575F96E = ROME_S2_DISC4 (Rome Season 2 - Disc 4) | V | 0x72F880E03A68587D335CC041BCF18F44 ; MKBv14/FindVUK 0.96 -0x963AFB14116144016DAA3BE380523DC2F7E4577F = ROME_S2_DISC5 | V | 0xABDE41492428419B48741E65F6E574FB -0x9AE107B10F74F6E7109776BFCEE28D44E5DFBEA4 = ROME_S2_DISC5 | V | 0x2258CCFAD5C73404F250502A1C6E213C -0x82754E94F213BA6F37CBB0948073D71BBD0AE273 = ROME_S2_DISC5 (Rome Season 2 - Disc 5) | V | 0x1DC2D7199996388FB2AFB6F39332BA15 ; MKBv14/FindVUK 1.00 -0x6E3342AFC42D48B1DADBD2C2C21C4FF0D39CAEDA = Ronal Barbaren 3D | V | 0x36664189145545B6542342E2EB99EE11 ; mkbv25 -0xFE8730BB9D60CB604BF6DF679083FB27AB718206 = RONALDERBARBAR (RonalDerBarbar) | V | 0x243D134105318E5E9F6EA0C4270715EA ; MKBv30/FindVUK 0.96 -0x8157411AF1DF4188C4684AF94DDAC4DCEB9761F4 = Ronin | V | 0x6AB0F642CF87DB635335352F83A67C66 -0x0C64CD7245CE546D8095FB0A22FA504E79AFE0BC = RONIN_F1 | V | 0xA31A61FC9EA0DE792A31EB374B913D30 ; MKBv4/BD+/FindVUK 0.98 -0x5CD227995FAAB90911A37F3EDC490A5922B2DC94 = RONIN_F2 | V | 0x0469B967EA4883B95A06D65845B4857E -0x60A8D37E42067EF7C5696104B0F1E101A21B8E0A = RONIN_F6 | V | 0x47303765DEB642823606B727E70E8466 -0xAB687181F626928D7EA752095AE42FEA2ED93951 = ROOM (Room - Blu-ray???) | V | 0x4BDC95A34582C06A575323BAA102CF28 ; MKBv55/BEE/VUKNOTVAL!/FindVUK 0.96 -0x4D6426128E978A40C192CC09915820B61E6D8CEA = ROOM_WITH_A_VIEW_A (A ROOM WITH A VIEW) | V | 0x548BF9DB7A2F3EAD9CD8F352211E74D7 ; MKBv53/FindVUK 0.92 -0x9D8499172A8CD724619BA47D9E4BDEF55B4E1A81 = ROOPERI | V | 0x946262A3E31B8E6EF766F98A4E05A579 ; MKBv15/FindVUK 0.98 -0xA0E0D4C2366439779E94ADFEFB52F465FF5BCC2E = ROOTS_BONUS (Roots Bonus Disc - Blu-rayâ | V | 0x41AAE39A1A3724E09E03F4507C01BF69 ; MKBv55/BEE/VUKNOTVAL!/FindVUK 0.96 -0xD049FF9CF7C3C21821454F7355B02563187A16B6 = ROOTS_D1 (Roots, Disc 1 - Blu-rayâ„¢) | V | 0x25DFD3095CFF4222A959EA6876650DAF ; MKBv55/BEE/VUKNOTVAL!/FindVUK 0.96 -0x369FE16F21660E16A92E643B90D3AAA5FC0B23D2 = ROOTS_D2 (Roots, Disc 2 - Blu-rayâ„¢) | V | 0x66728499DD6514E1D863B166F583AA56 ; MKBv55/BEE/VUKNOTVAL!/FindVUK 0.96 -0xC71A0E75621B279BE425FAC7014E85CA5F30A763 = ROOTS_D2 (Roots: The Complete Miniseries | V | 0x26D5553806615407255B8BDE48CFC61C ; MKBv61/FindVUK 0.96 -0x23A8AD55326568C11344010C6A14AA24C00D73BD = ROOTS_DISC_1 (Roots: The Complete Minise | V | 0x7A7A2CCE043BA8D0F7784BBB51C01CAB ; MKBv61/FindVUK 0.96 -0x07D26D294940630EF6B1A5D16B8FAEC28D0AECB1 = ROOTS_DISC_3 (Roots: The Complete Minise | V | 0x5E524BEB6B2D0E8B50744EB767721D97 ; MKBv61/FindVUK 0.96 -0xEE59C14A4AD80A352295D2CDC7CF349F90E34250 = ROPE_G51 (Rope) | V | 0x975D3BDA0B447849DD9BB733BA5BCF1A ; MKBv27/FindVUK 1.02 -0x387154C66E34E2204682D1BB28C32349C65AFE1D = ROPE_G51 (Rope) | V | 0xD1FB79E123C78A3431260B02E80A1C5B ; MKBv27/FindVUK 0.94 -0xF89B4EF3AF49D07C77AF74ADF5AFE1219347C794 = ROSEMARYS_BABY (Rosemary s Baby) | V | 0xE42799B1B49829CB395C8EE85FA1323B ; MKBv31/FindVUK 1.00 -0x44AD94F6E60CB4EB54B432BF10A298C8C13ACEFB = ROSEMARYS_BABY (Rosemary’s Baby) | V | 0x41049CAC42D3841424BFAFC1C5ACEFAB ; MKBv33/FindVUK 0.99 -0x48CF33F6AEF4622B989717D34A85A3AEEDAFFDDD = ROSENKAVALIER | V | 0x1CA004FA258BBF3884BA1692B14A2C67 -0xA50DB94FC61C96DDF9A0BADC724AEF3815F55F62 = ROST_UND_KNOCHEN (Der Geschmack von Rost | V | 0xE00A340141BD1E7A33E17F4A52424EF3 ; MKBv39/FindVUK 1.02 -0x01EA0B4A87450449619C32ED3A5473014B5B7531 = ROTK_D1_MTA (THE LORD OF THE RINGS: THE | V | 0x6C265C5FF310F37C08F4718487AB7D53 ; MKBv40/FindVUK 1.00 -0x1A658B0CB6DFCC9F6ABF7DEAACA72AD6EA056A4D = ROTK_D1_UK (THE LORD OF THE RINGS: THE R | V | 0x047C5C41F58BCDEC0D0B01D9ED9B332F ; MKBv21/FindVUK 1.00 -0xC055381463B478DBA849DA728E243DBC246A6A46 = ROTK_D2_MTA (THE LORD OF THE RINGS: THE | V | 0xF6170C1C1C81883CDB1FFF2759729C45 ; MKBv40/FindVUK 1.00 -0x9E3BAFEF0B8997EF106B6B08905C940D4C30452D = ROTK_D2_UK (THE LORD OF THE RINGS: THE R | V | 0x33E0DD3534B8B5B1697A830761089DBD ; MKBv21/FindVUK 1.00 -0xDA749F265CA3C8F41F3161CCE23EEC9EB8DB4C87 = ROY_ORBISON | V | 0xC2998180F77002017E8A8F9E4772F155 -0x5889181357A383EE1FC8B1BF8F76C54F5FE9D7AD = Rozen Maiden Z BD1 | V | 0xE8BFEBC58F5500ABA496347AF257D8B2 ; MKBv58/FindVUK 1.00 -0xF9709136AC964A700F08DABF3BE700046C35C563 = RS11EGE1 (Real Steel - Blu-rayâ„¢) | V | 0x2A943DEBF353E7F5646C032BCCAA6141 ; MKBv27/FindVUK 0.96 -0xD4D7ED64C9962B01C8AC26886E1DA62D9A126123 = RS11EIE1 (Real Steel - Blu-ray???) | V | 0x1E624F7CBE45778EE1FFEEBEFC66ECFA ; MKBv25/FindVUK 0.84 -0xEE674762A50F29B04FE3B68E3473224D19595F2B = RTT | V | 0x20C522FCBFD1A34F65325F948DEBA8DB -0xC915C91A761A5A6BF6AAC14B3CD2106E74F186D7 = Rubber (Rubber) | V | 0x27E0DBC61E1324E3E68645F7E4F2090A ; MKBv19/FindVUK 0.96 -0xDF1FD10DB887215EA39A3AD81E523CAAEEDC0ED1 = RUBINROT (Rubinrot) | V | 0x723C897BAC0BB96F9A9F310D59A2BBA4 ; MKBv42/FindVUK 1.00 -0x813E98088B6A9F8E0C2331C2873554825EDCA95A = RUDY | V | 0x71887EAEFF0877179FD84B05C5AC6447 -0x9265583053D9A13FF9F37AF82E224C8C7D299AE2 = RUHET_IN_FRIEDEN | V | 0x4AFBA700F62FE1B5265E6A9F1134B346 ; MKBrev 52 - FindVUK 0.57 -0x229032BF0260B5CCD93ED190E14AF15EDB7164A9 = RUKOJMI (RUKOJMI) | V | 0x940FF1C1F7527DB391298E81967236F1 ; MKBv49/FindVUK 0.98 -0xCE47B536C49D3802EF4ED99D4ED8A9C2C73AEB16 = RULES_OF_ATTRRACTION | V | 0xD61FCDE62698B977F63059717E18C776 -0xD6DE4D5A7D2524E0616B07F53014B50376BA87D7 = Run Lola Run | V | 0x1B2E4EC4914DA8B1D4B3370BE4359ADC -0x1BD0F643A96819CD4AE90FDF04166FF372AE88B0 = RUN SILENT RUN DEEP (Run Silent Run Deep | V | 0x474E05DACF0D3D047A93B7D871350DC3 ; MKBv47/FindVUK 0.96 -0x92023D21CF41DF3CCCCCC4BE6F6FEBF3AE1ED1A6 = RUNAWAY GIRL (RUNAWAY GIRL) | V | 0x7A6024C52F6BADE083981786AE0F9D2B ; MKBv38/FindVUK 0.96 -0x2A5F6A31AC8BDDF8CF0037709B0E23EA122F96E4 = RUNDOWN_P1_SPITASLA (Welcome to the Jung | V | 0x3EAA99C3CF888E03F9A8645B061440D0 ; MKBv4/FindVUK 1.00 -0x20B982FFDFE8EB622EDF0A1C9537CDD3BAD6CB5D = RUNNER_RUNNER (Runner Runner) | V | 0x183EFB1E4CB5CBB88DCE4CB72491CAD2 ; MKBv36/BD+/BEE/VUKNOTVAL!/FindVUK 0.84 -0xB04E05A0BD68766DB4A3E1532DF680689B9F00AF = Running Man 3D (Running Man 3D) | V | 0x6D8CE58E8DC615DA0C17F289D4661082 ; MKBv20/FindVUK 0.91 -0x62545F5CDF27A5EEB8EF85DC783ED4E460FB00D8 = RUN_ALL_NIGHT (Run All Night) | V | 0x27AB7D39379AA6A5402AD7DB85A9E473 ; MKBv53/FindVUK 0.91 -0x7A2297BBA7F0F3D8F39513DBDD088F3C106EC619 = RUN_OR_DIE (Run Or Die Blu-ray) | V | 0xF8DC76F4BB5B3F2E350D6C8176395B36 ; MKBv36/FindVUK 0.93 -0xA2D37548A89473B1227743857F725DF6D1008BB7 = RUSH (Rush) | V | 0x18064FCFDBB7EE22AFD0057975E47E12 ; MKBv46/FindVUK 0.94 -0xE9587B6802F703556D6A5B916A08CB86C83D710C = RUSH SNAKES AND ARROWS LIVE | V | 0x7B265DE8292E7DC70027F548246EAC19 -0x0BC88487D4F16918A92FD7296ED6130C1B6F6C0C = RUSH SNAKES AND ARROWS LIVE | V | 0x8145DB55C6A27DB1E8D52BD13642A4BB -0x683E24EA7989ABE71AF71357DFD5B5EDEA8B00D3 = RUSHHOUR3 | V | 0x52E3704FE0127AAC86B3C7F7B5039D1F ; MKBv4/FindVUK 1.02 -0x127496E35ED11C7344F9373AAE6CB389E205CBBA = RUSHHOUR3_EIV_0x12147 | V | 0xF6C8F06E156EDB9ADAC8C79DAE80215F -0xAD7E0668B602A884B562EAC8E7FE8B918FA2599D = RUSHHOUR3_EIV_12147 | V | 0xBD5B1C04C9D95CB4299A1E18BA913A5E ; MKBv4/FindVUK 0.96 -0x58E423ADD87D28462608C63C7996680D3BB9395C = RUSH_DOM | V | 0x8AFCF047928B5613D7F60DDE5CEF997D ; MKBrev 36 - FindVUK 0.54 -0x75128070FBDD141777C894ADC95FF76B9FFB6ED5 = RUSH_HOUR (Rush Hour) | V | 0x0E48EDCDA6E854E4A53D94EC61A966E6 ; MKBv18/FindVUK 1.00 -0x2FCA774B910784B431415B9E7E3C545C6531C7B8 = RUSH_HOUR_2 (Rush Hour 2) | V | 0x31C488D337BB9FC754CDF8148CE03217 ; MKBv53/FindVUK 0.96 -0xC221F236B34A72A68DEFA5AC3ADE8D718D283D5D = RUSSIAN RHYTHMS | V | 0xF9A486E9D344A3CBC21353219BAFC4DA -0x724FB7BC453A8A62C024AF50CE5650925857C7F6 = RUSSIA_WITH_LOVE (From Russia with Love) | V | 0x4708A2E41C18C5C99C422D8B511E2A13 ; MKBv8/BD+/FindVUK 0.99 -0x32D1CFCAC6AC1DDB5582B304CC5A243E0D07AA64 = RUSSIA_WITH_LOVE (From Russia with Love) | V | 0xC6E29946A11F24D2F3C35ED66FA364F3 ; MKBv8/BD+/FindVUK 1.02 -0xB018DD9331B5469A4FB6E0E850FB5C203A41CE3E = RUSSIA_WITH_LOVE_F6 | V | 0x397BAA56888D466ACCB8EB84003B42BD -0x73C70787B83DA9412399A6D4A5E0CD0A848BFBF1 = RWBY (RWBY) | V | 0x0CE3971A114D07330F9E20073B96E074 ; MKBv42/FindVUK 0.84 -0x2E33E5B4BAD1551F964253136B39F481316914E7 = RWBY (RWBY) | V | 0x084FEAEC57E4C2D59F8B359B326E9354 ; MKBv40/FindVUK 0.86.3 -0x0EBC7A7E9622EC3C3C4DAAE5CCD5ECABCAD44786 = RWBY (RWBY) | V | 0xA3EE8A29B063948A7DAA3E5C6AD9F2A3 ; MKBv62/FindVUK 1.02 -0x5301334DB1AB7D5C570F0D5404B3E433AE79F3D1 = RWBY (RWBY) | V | 0x17878DF3DFD01C9273E9098CD79BDBAB ; MKBv57/FindVUK 1.00 -0x2126DF7F6E85E8155993EAF0444636F3D068311B = RWBY (RWBY) | V | 0x6B275319057C838A3BF119EC45E4B6E9 ; MKBv52/FindVUK 1.02 -0xFC189F7BBDE92F6D520E2384B5C30FF034645139 = RWBY (RWBY) | V | 0x5FCFAFD694168BA34424C246062D7BE6 ; MKBv62/FindVUK 1.00 -0x8A3EA2E5D8F6CDAAFD28DB95751284E4D23B3ECC = RWBY VOL 2 (RWBY Vol. 2) | V | 0x44A42F63AFE2924A22B010F3C1E12110 ; MKBv47/FindVUK 1.00 -0x7A009C040923E5FE0402626D67CE7501F9C8661E = RWBY VOL 2 (RWBY Vol. 2) | V | 0xC8B60C7BFB9D6211799C793022C85889 ; MKBv47/FindVUK 1.02 -0xD7C8FEC2FD3315C4BB71CCFADEADC41B09FA1272 = RWBY VOL 2 (RWBY Vol. 2) | V | 0x45B3CA3C3C9D6C30DEB8D46AA159D4B4 ; MKBv57/FindVUK 1.00 -0x1D701FD92375B4C05876C012581C1608468D5FD3 = RWBY VOL 2 (RWBY Vol. 2) | V | 0x88FAFD03BD5362AF74DC8963F9C81D0C ; MKBv57/FindVUK 1.02 -0x64951FC3A0331C160D3EC51BD5678D07ED594ED7 = RWBY VOL 2 (RWBY Vol. 2) | V | 0x23C2AACB2E19A046ECBCF63A2F1841A9 ; MKBv40/FindVUK 0.86.3 -0xAFFF9EE652E00262B0AEDE92545BFBFAE3AE5C43 = RWBY VOL 2 (RWBY Vol. 2) | V | 0x01A58C29BBD62C3E53B5DC40BF4BDD64 ; MKBv47/FindVUK 0.84 -0xCB80079099D03B2A6A7752F25B6B24746C46F4F3 = RWBY Vol. 3 (RWBY Vol. 3) | V | 0xC22C501415A35AA264EABC840B55B3D5 ; MKBv57/FindVUK 1.02 -0xB515166D93983021916AF2FC3BF8095CD455DFD8 = RWBY Vol. 3 (RWBY Vol. 3) | V | 0x364F02BC5E39328867A0AE27068F14C8 ; MKBv61/FindVUK 1.02 -0x5C573F3EAA840FFC71840027C46D9DC68AACBED6 = RWBY Vol. 3 (RWBY Vol. 3) | V | 0xE1DF9710B4DCA857AE1A41EF36E198A3 ; MKBv57/FindVUK 1.00 -0x36DD9E52272347BCC7278823F0322E395DDC911A = RWBY Vol. 3 (RWBY Vol. 3) | V | 0x3A005034707F325F9D9779E9CD8AC356 ; MKBv57/FindVUK 1.00 -0xDF71D7B5DC743EC60F4750ABDE736D16035B3410 = RWBY Vol. 4 (RWBY Vol. 4) | V | 0xC288EFBA09B8E89A2C8EB44F88F81395 ; MKBv62/FindVUK 1.00 -0xCFCA27F8A0371C389229699EE28BA6EA6750EF40 = RW_LIVE_FROM_TALLINN (Robbie Williams: L | V | 0x1DD7332FEC081E926DCB8B89D9349C3A ; MKBv50/FindVUK 0.89 -0xE63682B23C57D7377DF539F3A357F360D2CCC07D = rzwrze | V | 0x90EAE0176ACA07601E7FA51E2BC8DA84 -0xCB46649131439C359DD64F1C84C66272CEA8A736 = S.W.A.T. | V | 0x4E079331F7B48EA37A68B788450BAD89 -0x2408232DD0BDB6BB5368002400C388301EC30CAE = SAAWARIYA | V | 0x8C305403A2D29BAAF40F864B234FF6F2 -0xAD5F59EDBC61A333D448829F3F842BCFA9A4DB08 = Sabaton01 | V | 0xA5F41A03BB487ED2254B3E113E63C116 ; MKBv57/FindVUK 0.99 -0xD25B92981C711FF089F25B6A66B781AE1D47F9EB = Sabaton02 | V | 0x0CCF70FADFCB7A9CE598F62A4CD71D40 ; MKBv57/FindVUK 0.99 -0xAE423C7C7104FC6F32BDF8C22E5A90CF1DB087C6 = Sabaton: Swedish Empire Live (Disc 1) | V | 0xE83444E209810E8AFE3408F84BAC46FE ; mkbv40 -0x5A7A2564F76695F723C96BEB3E862AD61BA85636 = Sabaton: Swedish Empire Live (Disc 2) | V | 0x9E4372CCBC72ED449072EE09B8B5285C ; mkbv40 -0x8F08B0A8B9D3630DE79D56F863BD2CC469E69F75 = SABOTAGE | V | 0x34ECCA766F7B91A67357CA0BF72FC34E ; MKBrev 32 - FindVUK 0.57 -0xA02F8C6D87771C7CD2A51C7057655DC2C8FC63F4 = SABOTAGE | V | 0x470BBFC00A47B7980EB90F81993548E8 ; MKBv47/FindVUK 1.00 -0x51598EF091792747D030E694080A9B4044FFD779 = SABOTAGE_NA (Sabotage) | V | 0x29A01A2FDF675F3A03D022E2A42B42E5 ; MKBv39/FindVUK 1.00 -0xCB7141E50037B3F70F999048E4CA66B63A6A92CD = SABOTEUR_G51 (Saboteur) | V | 0xB5D9FA14A07CB545141E3E1AC40ECFB8 ; MKBv27/FindVUK 0.96 -0x9EA1D058BE04D7833AFD187E14FD3010BC96F5CB = SABOTEUR_G51 (Saboteur) | V | 0x9EFF8E0D03A3B943044040566AF44D22 ; MKBv27/FindVUK 1.02 -0x3779B3401C977B0A2A4D1EE16346D95BA3101220 = SABOTEUR_G51 (Saboteur) | V | 0x7F4791A6CE6D29AA23533D15C98525A7 ; MKBv27/FindVUK 0.94 -0x51B1DA553AA10896677E225C48CC7C0CC984EE48 = SABRINA_WS (Sabrina) | V | 0x7FEBF2395BEABC3D2E13C5D9CC70A479 ; MKBv27/FindVUK 1.00 -0xED432EB416F61F29FC567FC7F03F8B2D28E19025 = SAC1-1 | V | 0x49D26A1631E69F89169E4A859AD96B46 -0xB914DDBAA84D0CC5268E55AE6E24720C752252B9 = SAEULEN_DER_ERDE_D1 (Die S??ulen der Erd | V | 0xF719EF72ACB1642DCE0311FB0B30D2A8 ; MKBv19/FindVUK 0.84 -0x3048352F1F5BA7D38B2B0D9A5E5337E7CCF301F0 = SAEULEN_DER_ERDE_D2 (Die Säulen der Erde | V | 0x5B7E7D3CE1EC42CF96CCD817F78F7F30 ; MKBv19/FindVUK 0.84 -0x7FA9502103A1338E30A6C030AA3F00C738C79A76 = SAFARIV2 | V | 0xF0F6E5A70D1038AEE16D61191F3B4A16 -0x782B5FF5792FCCB47C4DD9A5568B874BE88497E5 = SAFE | V | 0x927A82E803F37E2936FCDFDCD1198F80 ; MKBrev 35 - FindVUK 0.53 -0x299E7B897559A3A12FB88325FF5DE144CC869F9C = SAFE | V | 0x8AD42A3AFADBF87ECF8E02475D49EFC5 ; MKBv30/FindVUK 1.02 -0x73769841E5B8218EAE68C42461FD3D245C81D8DA = SAFE (SAFE - Blu-ray???) | V | 0x7081C12328A5EAC1E3314D0C9F110B43 ; MKBv30/FindVUK 0.96 -0x15E3BAA841BFD5B1AE908A7E2A26A636D2448A06 = SAFE (Safe) | V | 0x63B64E759F9724A9EF20C78A5D42D4DE ; MKBv28/FindVUK 0.84 -0x6E904C33A1B18799EA471FF172E8900B0F3373B3 = SAFE HOUSE (DE) | V | 0x15CE0CF55CFC7756C9FE6F199B185F76 -0x1D51F720321A91BD230E6E1790390892EFD45B71 = SAFE_HAVEN | V | 0xA1FE0D56BD2BFF6444E693BD81A0C846 ; MKBv40/FindVUK 0.80 -0x7376F63EF072A1BFE462DE6DF67A5B4429F15920 = Saga - Live (Saga - Liv) | V | 0x02BCF8CEC86E1383E3B67EC2F2631941 ; MKBv40/FindVUK 0.96 -0x8AF08603EC0D772C8F2E06EA59F32FDD6B42A961 = SAHARA | V | 0x4C981BFA7EDF08B58026C4964D3EFE0A -0xBF4B6D4E7D64091BE340A2DF8A7C0FA03AB60ECD = SAILOR_ET_LULA | V | 0x89701BDB089E071914CCD001185EC429 -0xE1FBC5D3359FA1972EBB78CD00ABC4B240585897 = SAKANOUENO_KUMO_01 | V | 0x404629A4FB9DAF091C7AB922398CB3D3 -0x65A0DA7A793968DA8EF85AE995C12109875A32EB = SAKANOUENO_KUMO_02 | V | 0xB56CEC241B2B923730FD8A72EE9803D0 -0x42678540AC1033AA9BEB2A9D7F604C8FEB2DF928 = SAKANOUENO_KUMO_03 | V | 0x7D2BA408D04CBA82D66759CE1D0877E6 -0xFEC617512DD11D447D1063B3078694060A38B5E4 = SAKANOUENO_KUMO_04 | V | 0x1919B9E9C3B2059A8808AEBEA8929A05 -0x945FEC9784489E35E158BA21AF51E20AA7695867 = SAKANOUENO_KUMO_05 | V | 0x967B2C4A0FDB0FB0BC075C9A79227DDA -0xD23261C50B8B1A5E426B7CB93C842113BD1AC49F = SAKURA TRICK DISC 1 (Sakura Trick 1.1 - Blu-ray™) | V | 0x37648129BB70C02E0973BBD6950627AD ; MKBv61/BEE/FindVUK 1.00 -0x6076AF811D0B653C12A9B99EE7A714EED3F4AFE9 = SAKURA TRICK DISC 2 (Sakura Trick 1.2 - Blu-ray™) | V | 0x3860C0FBFF9346D602ED504348972DE9 ; MKBv61/BEE/FindVUK 1.00 -0x3DE686FEB868C1A1AC0DC640B54A2728C755E81E = SAKURAN (さくらん) | V | 0xD97647C52694E3853293CBDB03035334 ; MKBv31/FindVUK 1.02 -0xE8276B1C307E8BA66EEB19A4516E7FB2861B9B7C = SAKURA_BOX1_DISC7 | V | 0xC629E60A183748AEADA6479DE07FC2AC -0x7D5125B19D54DA62BA0FAB801B7AA0C589B65C88 = Salmon Fishing in the Yemen | V | 0xF29C0D39DA4F695E4FC021729CE096C3 ; mkbv30 -0x796E27A16BE72DD1912BC874B914D4D095D721A5 = SALO | V | 0x13C638A423F803CD7FBA342E23EDF916 -0x301CE43134D16930244351CEDC5E7B8537657CBE = SALO | V | 0x62005AA7F3152CE1683053E42F814ADB ; MKBv8/FindVUK 0.96 -0x6EBCEFA7F7905DC7AD239796B2E228CF411C36DF = SALT | V | 0x24EEA3A8C7DB64F018A6C86C3B443BA8 ; MKBv30/FindVUK 0.80 -0x184A916F809441AC07C0C5EDD00C50D4A2D275B0 = Salt | V | 0x9A4FF7AD45AEC32AA48E79AD001FB5A2 ; mkbv19 -0xD462A8C35D32136DCA42BB1706885C4ADB3B0E87 = Salt | V | 0x6D56191E64067273EE62B19F2FDF4C0A ; mkbv19 -0xB936353BBAC548558B902AE5462AB61DCA28B5FB = SALT (Salt - Blu-rayâ„¢) | V | 0x04E58615752B5CD67C81B37CECE334B4 ; MKBv30/FindVUK 1.00 -0x8020C08F981C222E43FCC1C4670654828D4B9251 = SALT (UK) | V | 0x1DC94EA006139DD48A101C726A17AE16 -0x931AE326F0BC567DF5C36EA9E002BC5AEAB0F8D7 = Salt - Blu-ray™ | V | 0x83F228A6C173B9DB6357460A486B2BF7 -0xA9F8B14603F1A0C90B9E71ED18763A3F23EEA8FA = SALVADOR | V | 0x61570AF406BB43BF2AD7E36EC9F3DB80 -0x3CB5D2E860AC054B0D0F939F129997C630FB2C0D = SAMMYS ABENTEUER 2 | V | 0x9ACA8031CAAD34A33F21AE409DE48F95 ; MKBv34/FindVUK 0.80 -0xF31B97BCA6EF32E8D97EB2A7660DC36A9FE60C9D = SAMMYS ABENTEUER 3D (Sammys Abenteuer) | V | 0xC4CD643CA1345E9339E74C68294B095C ; MKBv19/BEE/FindVUK 0.96 -0xB64DBCC7C895075D48D25273356C4E1F87B7656A = SAMOURAI GIRL | V | 0x70EE1EB7980E220288DD148C2EC964E9 ; MKBv20/FindVUK 0.81 -0x766A3B3C9AD015BEB268E69C0E4B841EBF0BD3BC = SAMOURAI GIRLS | V | 0x44ADB6C67A78E6E7DBB3694268F1A278 ; MKBv20/FindVUK 0.81 -0xA519529142F59ABFD3BF68FEA0C50C9DE7BED6F5 = SAMSARA | V | 0x656BB939823629546EC55FB27FF0AACB ; MKBv35/BEE/VUKNOTVAL!/FindVUK 0.65 -0xA698900313853CF73535DB83D1C8B67927489D3C = SAMSARA (BLU-RAY) | V | 0xDDE10AECAEE3D87F04D47995D8DFF4E3 ; MKBv44/FindVUK 0.94 -0x27F27C9B75966C96048F39C51D87BDBC59059297 = SAMSON_AND_DELILAH | V | 0x32BA87DB7E5871D72C8F4E94CCD09A3B ; MKBv36/FindVUK 0.82 -0xF6A5C2FA9EEA6D228DC5348C13912C66F843C634 = Samurai 7 Disc 1 (USA) | V | 0xA48D1143AB7897A6385AC4C85891F5B2 -0xE4387861F38679206905890FB3AF5D01EBEE1CFD = Samurai 7 Disc 2 (USA) | V | 0x1791249F7E03AEAA71F4FA43C8F7E2FD -0xF95BDE308F8EAFEEAB66B4E51A8283F7A379004E = Samurai 7 Disc 3 (USA) | V | 0xDA5397229F6D546FC10024385E744FD6 -0xF38803CE4CAA054C05255A7D4ADDD095EC1D280C = SAMURAI CHAMPLOO BD1 | V | 0x895BAAFD16F2DDC033A2597645A5B0AC ; MKBrev 53 - FindVUK 0.62 -0x787DA408ED31FEC7CC8DA1D31E3880D001C38A04 = SAMURAI CHAMPLOO BD2 | V | 0xC298FE6C11834BC037D9112708B081E3 ; MKBrev 53 - FindVUK 0.62 -0xFE4B01227E201504F5E66D7FCF950C1745725316 = SAMURAI CHAMPLOO BD3 | V | 0x586A6E56DBD5410F9A4C8A4449F85A17 ; MKBrev 53 - FindVUK 0.62 -0x918F16AFC8AAD98E152AF2F197FF80ED024FA010 = SAMURAI CHAMPLOO BD4 | V | 0x7CEC3EFADBF4AE9D7B2BE0A01038E07D ; MKBrev 53 - FindVUK 0.62 -0x27BBF89E56AD2589E2159AB3438E625E2CE8F198 = SAMURAI CHAMPLOO DISK 2 | V | 0x49AD244CA119D64BA762CDD95154A7C9 ; MKBv40/FindVUK 0.72 -0xB2554D1B9A68DB3A4DFC5F56C36FDD47CB58B8F6 = SAMURAI GIRLS DISC 1 | V | 0x2D5AE8A5A8C9F20D039BEDD73AE71FA6 ; MKBv24/aacskeys 0.4.0e -0xA0DCCF490588CA49FC8B8D404708CA246447F0DF = SAMURAI_CHAMPLOO_D1 (Samurai Champloo Di | V | 0x3CD20B1513024AC7C6BF313411FFF82B ; MKBv21/FindVUK 1.02 -0xFB8ED40531A5C2C4CADC3E1D5887CF2ECDEC13AD = SAMURAI_CHAMPLOO_D2 (Samurai Champloo Di | V | 0x0568741441D7110EA0D6D850E94D5D64 ; MKBv21/FindVUK 1.02 -0x2C4B74FD948C6E3C0D0AF909F5AEE512F6192E72 = SAMURAI_CHAMPLOO_D3 (Samurai Champloo Di | V | 0xD00A53EBAA5F031AE78DDB14D69626C9 ; MKBv21/FindVUK 1.02 -0x3C2C4A68F0BFFDFCAF017A927AD96AD653BCE3ED = SAMURAI_CHAMPLOO_DISK1 | V | 0x601E146EDD22E8781831D2E157F84E1F ; MKBv40/FindVUK 0.72 -0xB327472DB54DC3E635E25F5CE0261C22EE412289 = SAMURAI_CHAMPLOO_DISK3 | V | 0xF7EBF72E6CE3F57AD20658B9E1EB95C4 ; MKBv40/FindVUK 0.72 -0xB7A34AECF53B395D34F4A891E444EA84B05C0574 = SAMURAI_SWORD | V | 0xBFA7F0596F1118D1DACDB40E6675DB67 -0x80DBD03BAF03DFF6FDD79A23A3ECBB0412721806 = SAMURAI_TRILOGY_D1 (Samurai Trilogy I an | V | 0x1DFE160609C0292C709870ADCF433CF9 ; MKBv30/FindVUK 0.99 -0xE7DF372A54B20925883AC28AED19619F682FC1C8 = SAMURAI_TRILOGY_D2 (SAMURAI III: DUEL AT | V | 0x564FCDCD544DFA0015CC024305C6ED24 ; MKBv30/FindVUK 0.99 -0x9F2E022BE0FE8EAE3215056509E2DBDE18401FAB = SANCTUM | V | 0x631536FB7DC7B9298F664E2E244F15D3 ; MKBv26/FindVUK 0.96 -0xDD0301974EC8FE4F2FFB7002C72D65D5C22F9536 = Sanctum G51 | V | 0x28C51FE03A45ACA13430E7387278CAEB -0x4378E4714AEF850E5DB4F0393C41E18EF7A8425B = SANCTUM_3D_EAGLE (Sanctum) | V | 0x132612124D08FE08E4E8245FE7E0955B ; MKBv21/FindVUK 1.02 -0x88A55A2F1207E6DB27CB7C5793A43AE19BB00C35 = SANDOKAN BD1 | V | 0x47CAA653A0166BD76506044C41DE3E1A ; MKBv51/BEE/FindVUK 0.92 -0x363BEE8D50DECBE6ECD3D03BCABBA44034F61D07 = SANDOKAN BD2 | V | 0x56D0EBD10D6BF23CE52FDEAA0E080FAF ; MKBv51/BEE/FindVUK 0.92 -0xEBBD04D1113D6881E23DA8854ABA353820C31600 = Sanjuro | V | 0xA9C3DAF21D71D48EE68C4D9D59605708 -0x4E8BBCC7036B76208E2F44F0255933DBDB7DD8BF = SANKAREA_CS_D1 (Sankarea_CS_D1) | V | 0xAC23956CE690A6EA104577044F17360D ; MKBv47/FindVUK 0.86.3 -0xA5588CC7C5A19188BBE2D71473B15D561357A2E5 = SANKAREA_CS_D2 (Sankarea_CS_D2) | V | 0xD5F9F638A5FFE8CB850F73153EBD7F8C ; MKBv47/FindVUK 0.86.3 -0xDC1DF17FAC1472ACB104762B94C69DC22D227572 = SANS_ISSUE (SANS ISSUE) | V | 0xE66575E83FCCFEE0EA0DDD3FAD1B46FF ; MKBv20/FindVUK 0.96 -0xFA1830F879640AFBFC7C6F436F523B7C68581C67 = SANTANA_HYMNS_US | V | 0x993DF931C20BA79A11020FD3AFA8EB15 -0x8109BB4A5B058C5B4399F4D8EBE06663268E49FC = SAN_ANDREAS | V | 0x2E93139631C3F674B8FB9985B813A909 ; MKBv53/FindVUK 0.91 -0x55A96FCC165D80742F90B8A588CD343D9436282E = SAN_ANDREAS | V | 0xF58C8599489B4E4F260A400617A2CF59 ; MKBv53/FindVUK 1.02 -0x422428BDC3F2A2D125072F0D041D24EDDC408029 = SAN_ANDREAS | V | 0x5448FBC548443E56E67DF263D3113FEC ; MKBv53/FindVUK 0.81 -0xB2FFA57820C7BAFCAF35E88F7BE96B820E25A0FF = SAN_ANDREAS (San Andreas) | V | 0xB06C651E937518072F0A5FDEAB3B1398 ; MKBv53/FindVUK 1.00 -0x3593544D8F7B1B018C8ABD4F28551900733D69AE = SAO EXTRA EDITION (Sword Art Online - Ex | V | 0xB0A68C02771E9F60F6E781201900BEAE ; MKBv47/FindVUK 0.98 -0xC929ACA69352EA176FF983040FA2FF7B00C63272 = SAO II VOLUME 1 | V | 0xEDB2E6215F189BF3B1ECA447AE2CBAEA ; MKBv51/FindVUK 0.98 -0x3B79B5DFB40FE8359DB4AB73A68B363B454B45CD = SAO II VOLUME 2 | V | 0xEB00FCE8B237E28FD2C740B072E49B8F ; MKBv55/FindVUK 0.98 -0x45B5851786F007F89C9750E85770C9DE67775F51 = SAO II VOLUME 3 | V | 0x000DF0CE5A763E7E54B0AEBB5692DF23 ; MKBv55/FindVUK 0.98 -0x12D590DBADFDB2381B86534D84BD607AE191BD62 = SAO II VOLUME 4 | V | 0xE29E5827CD2D09CE3E75C9D92ECFD76B ; MKBv47/FindVUK 0.98 -0xE87155297BF1F10B92421FD9207E1DF145CAEF73 = SAOHR_SPECIAL_CONTENTS_DISC (Special Con | V | 0xCBFE8DB7D6D4730F0FBE79E9C7F9D5BD ; MKBv56/FindVUK 0.98 -0x1DCAFDD8FF0A1454D791065FF1CAFCE66D5672D1 = SAPHIRBLAU (SAPHIRBLAU) | V | 0x9818041780F1E049DB25BAA526094103 ; MKBv52/FindVUK 1.00 -0xA5D03FF839DFB2579BED1309D70C5A6A87195883 = SARAB | V | 0x58E72A66FAB6E60FF406F5E22D3F9D87 -0xD6550923E54AB7047A175B421791F7A9E43E43FB = SARAH_CC_S2_D4 | V | 0xEBA60472AB6A4D8B148D94DF95FAE637 -0x6564A22A17717E07648782B0B8B166422DFF8B40 = SARAH_CC_S2_D4 (TERMINATOR SARAH CONNOR | V | 0x77C7CF57E582220E9E00C4BBE3651B80 ; MKBv12/FindVUK 0.98 -0x2F78506294C2BF0854FBAF62922F30A03B2F71EA = SARAH_CONNOR_CHRONICLES_S2_D5 | V | 0xE7F17CB39047239E21497A331D6E1432 -0x943584A8CEAFF7AA5E0F07A08A777280D6D19EE5 = SARAH_CONNOR_CHRONICLES_S2_D5 (TERMINATO | V | 0x00BD83BBB75B3CA1F76C46DDF46E9E05 ; MKBv14/FindVUK 0.98 -0x8F62531561CDEDA2CC61D2185A99BBF493DA2A62 = SARAH_CONNOR_S2_D1 | V | 0xEE6618A79FF307AB4C79FA928A0673FB -0x5031423EE09DD80E7922214D73960188CB77D7C9 = SARAH_CONNOR_S2_D1 (Terminator: Sarah Co | V | 0x4B26C83356199A1012FA73600D3949F6 ; MKBv12/FindVUK 0.98 -0x8672F7C3379A727394AA4E87F120C1285B234CEA = SARAH_CONNOR_S2_D2 (Terminator: The Sara | V | 0xDEC98E5FA4F03AA7C70A096CCE6042D9 ; MKBv12/FindVUK 0.98 -0x6985E58B9381D64D67043B84801682EDF4AB37F2 = SARAH_CONNOR_S2_D3 | V | 0xAAEA6E436B1CC39ECDB8CF44B08EE861 -0xCBC619D1D5CE3960318889FA1308F7E1C445E797 = SARAH_CONNOR_S2_D3 (Terminator: The Sara | V | 0x287A5CFB7CAD9276874D8B961158474C ; MKBv12/FindVUK 0.98 -0xF6F108803BFA8C117ACC11B7B1EF98D69A4592BA = SARILA (Die Legende von Sarila) | V | 0x03236F6025C4DC60108DB0B4A0673282 ; MKBv49/FindVUK 0.96 -0xFA1510E60D6EF7531BF3D440B2059BC90D18F90A = SASAMI SAN (Sasami-san@Ganbaranai - Blu- | V | 0xD67C41913720A4831C3F0AAB1B8592BE ; MKBv56/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0x2A73686720273D338BD2211E231FAD5223A1D249 = SASHA_GREYS_ANATOMY | V | 0xDD0CA7B722701C5804C93FC38390106A -0x13197E131D68784A2FEB36379E3AA95F2FCAC847 = Satoyama II (TW) | V | 0xB4DA2A130C2B93AA8F17FBAB328D55B3 -0xB30F47C8D16757FF130F596DDAAE6AF5E83AF2EE = Saturday Night Fever | V | 0x83AA8200451F5B735F66CC79595F1C24 -0x5E4CA196C7D475E7A02C1B3A54911B82360CD56F = SATURDAYNIGHTFEVER_EU | V | 0x56175B709398DBBAAA83F42A6B5A5475 -0x101BBF629AD8AF56E870DF28C85F68629ADA3E39 = Saturn3 (Saturn3) | V | 0xC075C53B58CB5A9AC15D1DDC7F930019 ; MKBv46/FindVUK 0.99 -0xD7099701D603AE4B1ED84CDB249F8CA710D3D4AB = SAUSAGE_PARTY (Sausage Party – Blu-ray™) | V | 0x0B665CDC676E63AE195D8FCD9851C5E7 ; MKBv61/FindVUK 0.92 -0x4F81880BC60290FBC235492B4C5538F21599DE5A = SAVING_MR_BANKS (Saving Mr. Banks - Blu- | V | 0x0CF908564D854464F0E73A61849BEDF5 ; MKBv39/FindVUK 0.94 -0xAF6937D6A1666CE4C27E85B6D8AFFBA7835A2640 = SAVING_MR_BANKS (Saving Mr. Banks - Blu- | V | 0x8512450B17303E61DD4C2B495951DE06 ; MKBv36/FindVUK 0.92 -0xBA6CBA8AD9ADAD9FAEEC5B288066FBFEC1A7EA93 = SAVING_PRIVATE_RYAN_1 | V | 0x5A831C882357DA4F7AC709B786CF0120 -0xB2E304E077867DE83E52B671CEC9C51D51A3B7B4 = SAVING_PRIVATE_RYAN_1 (Saving Private Ry | V | 0x8AA0EAAFEDDEDA23C887AEEE42E355C7 ; MKBv17/FindVUK 1.00 -0xDE1BB53F3FDF1B4CEDD86C988AD2839ABD144F88 = SAVING_PRIVATE_RYAN_1 (Saving Private Ry | V | 0x7F63E9633862F0CBD6BD359516C7BE76 ; MKBv17/FindVUK 1.00 -0x21E8EECC658B265238F6C0545083F336D41B1644 = SAVING_PRIVATE_RYAN_1 (Saving Private Ry | V | 0x771D9AA867E1BEC1055D54208F9F0610 ; MKBv16/FindVUK 0.96 -0xB450A60BC1B73ECC15E0AECDD8044E436F6CFF32 = SAVING_PRIVATE_RYAN_1 (Saving Private Ry | V | 0x8E49F7BD9814A2FA73E51F11374330FD ; MKBv17/FindVUK 1.00 -0xF2D315C2C32F52F6734CA4D53102E9093F2FD7ED = SAVING_PRIVATE_RYAN_2 | V | 0xF5A346F33F669DD2BD965EDFD57B2159 ; MKBv16/FindVUK 0.65 -0xFD8CC09F704BFE147644083B03D3DB07D8B5EEB9 = SAVING_PRIVATE_RYAN_2 (Saving Private Ry | V | 0x10615C787834DC344CCD1A30B657A037 ; MKBv16/FindVUK 0.96 -0xF7B9F651AB3CED9CA9F8BABEA70FA78A63232889 = SAVING_PRIVATE_RYAN_2 (Saving Private Ry | V | 0x9C44E73B2532919A8B543446D7FC3029 ; MKBv17/FindVUK 1.00 -0xFA9DEC4FDD6AA80766A0BA55B5AB6464AFA284E7 = SAVING_PRIVATE_RYAN_2 (Saving Private Ry | V | 0x93FF2244B6A216F3AD56BC015D972D38 ; MKBv16/FindVUK 1.00 -0x5EFA5838F6A8E38E0C42136E898706E3EDAA5A5A = saw | V | 0x1F39BD42694F8792487285C9B7F53358 -0x5B7724360605492AD28EE926EE8CEECC3171B10E = SAW | V | 0x5FF1B9467DE913B27B24320817698903 -0xBECFB1BFC62F9447380440D174B5A449ACA01997 = Saw | V | 0x87ED959A26A552F704FF481615F1891D -0x3EA5100E0325389549CA8B1D0F4564E3788151A5 = SAW (SAW) | V | 0x108A0241C086127D150E2F6A50A285D7 ; MKBv10/FindVUK 0.98 -0x4AED1810DB6BEFD3A1AB35AF0A486B3DB02FF552 = SAW 2 (SAW 2) | V | 0xC2C1CE2BB32698D361BC899D729ADB5B ; MKBv10/FindVUK 0.98 -0xD5C61C4D300C4E57F9479253B54279C14FF8FD8B = SAW 3 (SAW 3) | V | 0x1F7B956294D28913ED6931E7C06AD093 ; MKBv10/FindVUK 0.98 -0xC1296B56CB61C85B39131A962FC4BD6B99786ED5 = Saw II | V | 0x076A7AE42375D146EEA5B3DF7E1C2A47 -0x70339A9335E64BD6AF6E372C64965B7DBA12E180 = Saw II | V | 0x73F5EA6CE7954EDAE0FFC451E386665F -0x8A2184A90A3F214082D226A71C5C3A69828298E1 = Saw III Uncut Edition | V | 0xEE1473B97651C5CB80D2ED1DFF9B4834 -0x1260606A9C345F09D2B1983F77F4ABEF6004CFCA = Saw V Director s Cut | V | 0x4BC2F4D37108617AE62911C46CA0FBF0 -0x28CF62DC64A3B0047DE5E9272003AE25DFE5E91A = SAW VI | V | 0x5EC883E494F022D5F4EA8ACBAB736F43 -0xB40EA284AB6286145C6E490B02BB4FF11DF45267 = Saw VI Uncut Edition | V | 0x4463E6EADF91BD9960979393DE9627A1 -0x217217D7C2F8F476EC51063B70CE6DB27D85CB53 = SAW1_BD | V | 0x0FC91BB544D8FE203AFEF2051554847E ; MKBv16/FindVUK 0.96 -0xB5F741D8FA84A25C857F9D00220A6941779F5FD0 = SAW2_BD (SAW2) | V | 0x547D5982E93CB13C82020E10C9E47D68 ; MKBv3/FindVUK 0.96 -0x3783E8BED143DE45A9354315AA534E8440E0637F = SAW3 (SAW III) | V | 0x583371CADBF882169FA1A7F700BD17A9 ; MKBv9/FindVUK 0.96 -0x92C5CBC70FEFDE4459ABA66382E5AAA9A15E2C64 = SAW3_BLURAY | V | 0xC9AF16A7931A90740FA9C935442AC3EB -0x176240DA682F55B0331A51C1126FCCCB858FE1C3 = SAW4 | V | 0x65E6870A89FB9F808369202B29530662 -0x4BB814FA72E926107ADBDC9C94CCF10FCEA979AB = SAW4_BD | V | 0x1CCCBCBE54E581EED32758C36FF9A321 -0x2C818EC11DAC51A78A95BAC1DF135970ED855AD6 = SAW4_KJ_BD (SAW IV) | V | 0x695930A4DA1A29959BFC9D0489129C18 ; MKBv9/FindVUK 0.96 -0xC38719CF8B4E24A8E0FEC918EDF62A03F57E54FB = SAW4_UNCUT_BD (SAW4) | V | 0x235D75495987AD3B4FC59EA2AFAAC078 ; MKBv3/FindVUK 0.96 -0x5919720D724CFD829D85D67DC27455401B65907B = SAW7_KJ_BD (SAW VII - Vollendung) | V | 0x0322467BBC5D810956B1B88262432460 ; MKBv19/FindVUK 0.96 -0x6DC2ACE8983C354DEFD8DC73E36BEF92F0717E04 = SAW7_UC_3D_BD (SAW VII - Vollendung 3D) | V | 0xBE3C448B21EBCA7FE115C9831357740F ; MKBv28/FindVUK 0.96 -0xC73ABC2C091CF9618A689D8F1A739D1BF2B3DDDD = SAW7_UR_BD (SAW VII - Vollendung) | V | 0x52E0707E4DEF0F84F3BB63535BA38375 ; MKBv19/FindVUK 0.96 -0x610D481EDB528F4ED3D1328AE5FC526C7BB70617 = SAW_3_DC (Saw III - Director s Cut) | V | 0x79671596599A9D5C87491A886FFE339B ; MKBv28/FindVUK 0.96 -0x4E11A72EF07AD2DE244EF5B0E71A1BB6056D07EF = SAW_6_KJ_BD (Saw VI) | V | 0x70E0C89FC837F8FE36D8A6F99F31CA5B ; MKBv16/FindVUK 0.96 -0x24F868959BFAB4862D957801CF63491258CA3A53 = SAW_6_UR_BD (Saw VI) | V | 0x8E03431DFFA4DBE7DC34CCCEB4C72C5F ; MKBv16/FindVUK 0.96 -0xAAD45378913F746F4B3ABBAD27B9D02D6C2E024E = SAW_7_3D_SAVOR | V | 0x8A7040D370CAD7F142BD627537085A48 ; MKBv21/FindVUK 0.95 -0x0CF5752A878AEDB36F04E1AAAEB28F5C637F2C36 = SAW_V | V | 0x76672B03DE8299839CF689306C2C3358 -0x85D4B36CC6F1780C156A9CA7FDB10877DB525C5E = SAW_V (Saw V) | V | 0xE281EF286F481CA8972CA1C5AED53051 ; MKBv9/FindVUK 0.96 -0x3E24A700605874900447FB44B758FC6176310A1C = SAW_V (Saw V) | V | 0xE933E408222D937AFC49B6F0117A1946 ; MKBv9/FindVUK 0.96 -0xC513D8EF14705EB36CD01474C4727E0658873EC1 = SAW_VI | V | 0x7E3C531FE3AD9B80FB8F3999F34E946F -0x8918D8651D6E3E614B5D4630CA65C8E1574BE32B = SAW_VI | V | 0xF78A34A8FF5BB5C5DD7FD672182AF30E -0x54AEAD1D5219B04A90C00EA3A31BDC1F49822230 = SAY_ANYTHING | V | 0xD7EF5DE820301CA88B51B512F03AC640 -0xDB50C8924E8B31C45BFE26B906EDFE27954FDB8D = SA_ASSASSINS_BALL_G51 | V | 0xE8BF899A4EDD11974E3E818E8D6CA63F -0xD313E4C74572AD03BF5694DFEB36233387ED506C = SA_ASSASSINS_BALL_G51 (Smokin Aces 2: A | V | 0x6A3DE6AB9DEB4D41556AE4F532EF3654 ; MKBv16/FindVUK 1.00 -0x248BA41D426615452AFB9206B4F49FAB43526679 = SBO1NNE1 | V | 0x28612F58E8600853922A59B9B6FB3D60 -0xC15AD921F1CCD82C84D540A8EEA9CFE0D6A468F2 = SC91EGE1 (Secretariat - Blu-ray???) | V | 0x11AC6DB9520FFA767F1368E8B8377B80 ; MKBv19/FindVUK 0.92b -0x01A134DBA3553A729D1596701912059BDB935AAD = SCANNERS (SCANNERS) | V | 0xD08D626CF5784B8F667A7BE16360D743 ; MKBv46/FindVUK 0.99 -0x965E57718B9B645146384DEB29F3D64F8C27C9B8 = Scanning the Disc | V | 0x827D72EE929042A619383380745B41CA -0x282BA0DC0B0A3AC7C7143A186FADA59141198AA2 = Scanning the Disc | V | 0x01AD15E9B23B7C181534CD2A1AB2DD9F -0x7B6F03FFC5D13F2AB3F0E0B69E68F21E04569106 = Scanning the Disc | V | 0xF08F6D4B90DD395A0D4A4663CA0B6455 -0x81448A94DC4EE118839E67FEE9BAA3591ECB2B41 = Scanning the Disc | V | 0x2176118A3BD2148E93AE79A0B567B337 -0xB2062F23B01720648C3D96EBF2A177428AE18D13 = Scanning the Disc | V | 0xB39D596F39C087A51CAB672D937AFECB -0x45BD82FB733A0F5DFE709B635B72F44E2BCAE4AE = SCARFACE (Scarface) | V | 0xB38B93F16AEA559115631576039D7204 ; MKBv19/FindVUK 1.00 -0x56B3DECB5C2D01ABFF05C988FFD3B032BD434064 = SCARFACE_G51 (Scarface) | V | 0x78F645D8461C680009B39695552F0B89 ; MKBv20/FindVUK 1.00 -0x2C0E46E690A0CC7E707DF1F12E62BA287E9A6B39 = SCARFACE_G51 (Scarface) | V | 0x269040162FA33920FB33A982C543D757 ; MKBv20/FindVUK 0.96 -0xEDD59029253C3E39C0A24DF43D03C14C886789DB = SCARFACE_G51 (Scarface) | V | 0xB108F888204847318E3D45062FFEE6CC -0x6112AA8460E132CA498CF4BE2E5D58361F55AFBB = SCARY MOVIE 1 (Scary Movie) | V | 0xCD9F600AFD0C689D9DAE909057A87125 ; MKBv42/FindVUK 1.00 -0x1A29D102C803F83851C0863E9E92A15E5CDBDF8C = SCARYMOVIE2 | V | 0x41FD671E8F3C418D23C9721EBC92BB0D -0xB98EC0A3CC95564BBF7D8AB4EEF8ACE34B73AED6 = SCARY_MOVIE | V | 0x499EE3A2FFCB1DB1419CF133D680E728 -0x1C20A1B6C593210C8A446C53AB13B7D85ADCEE6D = SCENIC_NATIONAL_PARKS_DISC1 | V | 0x5F2BF147DC2933B1DF8981E88CB96756 -0x19B63A38DDF997A27E05B9BD5B112F7ED5823100 = SCENIC_NATIONAL_PARKS_DISC2 | V | 0xA7E5156219497E552597416487719008 -0x0BAC8050DC8C0694F56E1A9D00761E7127CACBAB = SCENIC_NATIONAL_PARKS_DISC3 | V | 0x1334124E8AF19D3E3BB08C0E17464A6F -0x48B9667338D74F6762BC5A806DF8C9542D07CB90 = Scent of a woman. Parfum de femme | V | 0x8DA37BA03878931156A7552869C2F707 ; Canadian version English & french -0x00A49C7FD8800009325B05D69F7C977F7E8D3E0C = SCENT_OF_A_WOMAN | V | 0xAAAD0DF07105CF6A1C250B424A65EA4F -0xD3832029263BFCD98F8C5C34DD0FABF00957C804 = SCHATTENKRIEGER (Schattenkrieger - The S | V | 0x50CCF3FE3E3B87E8B0ED7032992A533D ; MKBv39/FindVUK 0.96 -0xC6DBBE402F0EE0398A8AD1D8C2889923AB72D50C = SCHILLER SONNE LIVE | V | 0x1614AD25C532A432E3BCB134068DA7AD ; MKBv37/FindVUK 0.80 -0xF0D222CFF65C281C4DCF7847DEE483B5D2CC1FBD = SCHILLER ZEITREISE LIVE (SCHILLER: Zeitr | V | 0x22CC6D8F056FC5E7A8295A701C9A075D ; MKBv62/FindVUK 0.98 -0x0F72CBFC5F5860C4A528C2C92CBB0E8FDBC5EC41 = Schindlers List | V | 0x4E4D5583B20C56056B13A8657E665884 ; mkbv36 -0xA4C327A00C8CE2ECDA8F918C4C0B835A9B301E15 = SCHINDLERS_LIST_G52 (Schindler s List) | V | 0x16DD1BF7B7CF73052090A92E85B60790 ; MKBv36/FindVUK 0.99 -0x625D1B8B601179E21565E0244FEB1F443FF6968A = SCHINDLERS_LIST_G52 (Schindler s List) | V | 0xD1164F9265A8B1E1AC8280C90C97508F ; MKBv36/FindVUK 1.00 -0x053E150C76AF0D0C6ABFDA9392B3851DA2D6C186 = SCHINDLERS_LIST_G53 (Schindler s List) | V | 0x3FC44B45A643ACA54B775E7ECA7D6819 ; MKBv36/FindVUK 1.00 -0x308967382A7E6D807AD00B83AC59D1E7F360BC3C = SCHINDLERS_LIST_NA | V | 0x0E517B2ECD85C45A06E7E792CBED2787 ; MKBv28/FindVUK 0.65 -0x5F80B880E81BD42E4EB11A83725B9610DADCDF8A = SCHLAUWIEEINLUCHS | V | 0x02FB4A99D71AD11A2BDCA5D7241E63D3 -0xA1CEE78647982507E3E747352C821F9E4D1D7649 = SCHLOSS_BD (Das wandelnde Schloss) | V | 0x6E9B0815FB968413045D34AA5490BBF9 ; MKBv31/FindVUK 0.98 -0xB5652117D963B0DA7103C5CC5FE0AA040B534D27 = SCHLOSS_IM_HIMMEL_BD (Das Schloss im Him | V | 0x05BC0D84812362983686DF6FDBCC3E5F ; MKBv25/FindVUK 0.96 -0xAF3A153C26477852154EDCD91E50B47B9A747A51 = SCHOOLGIRL_POV | V | 0x52C6885785DCAF09D6008C6769F07C61 -0xA2358C934E30F6B695778C5ADE8D912C1A4CA437 = SCHTIS | V | 0xD9315BDBEBC10E59410099AE3AEE27D6 -0xBA144FB010D186840A2A9E2435CC86AAA91CC2BC = SCHUT (Der Schut) | V | 0xC50AF31345F60D0169DC78F0812B6D8C ; MKBv35/FindVUK 0.96 -0x07C5C764BBA1CD2CD379A3D4680CA55E13E83571 = SCHWERTER_DES_KOENIGS_EXTENDED | V | 0x595C3505BDA53791FD9AB9F629C93AFB ; MKBv12/FindVUK 0.80 -0x55E95448070D46CDDC52541E8139C16B141A5DA5 = SCOOBY_MYSTERY_BEGINS | V | 0x96FC82BBAB8A48BD7789A856212E4A25 -0x3E45C2E5515392FB8C940729E59D3E6A94456D41 = SCOOP | V | 0x6C7F9675D6CFF45C9D1689DBF20EB8BC -0x32026BD83DC4C2316EC72D1E4436741771185EFC = SCOOP | V | 0x342D77116FA09A71F2D16FE4A5E10682 -0xBCF5AD452120880E77BFD538D16EF3C6D892D9DD = SCORPION | V | 0x1B93B667A19A748F034A65C33B37DF57 -0x8071F4B5DDB8EB25234F628796EE499234D827FA = SCORPIONKING4QFP_UPB1 (Scorpion King 4:Q | V | 0xDCA268DD26CD8CC96B16377F7CAFC763 ; MKBv49/FindVUK 0.95 -0x3C500125AC58C5775B4EBE8685924CE503281D84 = Scorpions - Live in 3D (Scorpions - Live | V | 0xEB81229EE307FDB0E552F6864D8B4B50 ; MKBv26/FindVUK 0.96 -0x4B0A78F9DAD1A45EF4D84D37A6B7FBA2676144CB = SCORPION_KING | V | 0x3C6070E03144B88C491B8DC22315D8E3 -0x58321AD9D4DEE8BDA1EE700FA18B2EB0DFDB964F = SCORPION_KING (The Scorpion King) | V | 0x8409E7486C5F52EECE8CA8AE057DE308 ; MKBv8/FindVUK 0.96 -0x54CA1867EAABDA7E102551F5680523DE31FDA8B7 = SCORPION_KING2_G51 (Scorpion King 2: The | V | 0x812424DBDD8D8A9D3324EC0184E818A5 ; MKBv27/FindVUK 0.96 -0x025348BD339D5B590652AF934AE49FBDAD7EDEF5 = SCORPION_KING_3 (Scorpion King 3: Battle | V | 0xF2434F87D93E77E532CB61931E921672 ; MKBv27/FindVUK 0.96 -0xC48BA6D0F0C1C70559F2D0F8DE2886AC8AF246C5 = SCOTT_VS_WORLD (Scott Pilgrim vs. the Wo | V | 0xC6B50E1DEE19FE44E47E288E40AEBB4C ; MKBv19/FindVUK 1.02 -0xE2D23D191B8D4D3C5A64E89F267386A8FCF44CCE = SCOTT_VS_WORLD (Scott Pilgrim vs. the Wo | V | 0x712C379FA1AF256B78D1CCFE1EA8CEC1 ; MKBv19/FindVUK 1.00 -0xB8BB0A1F7ECB57F0CC8724C133A7AA10628B57B8 = SCOTT_VS_WORLD_G51 (Scott Pilgrim vs the | V | 0x915DF9C219A8BAA5831C1F0570625E0F ; MKBv19/FindVUK 0.96 -0x60CD3B69A31AE8CB026DB8E2ADBE508F18CAA1DC = SCOTT_VS_WORLD_G51 (Scott Pilgrim vs the | V | 0x5AB799A1DB6D2A2CCFE4BFC4EA6CA932 ; MKBv19/FindVUK 1.00 -0xD04529228C5B317AB1A18F6B5ED21D95D81D9D9D = SCOTT_VS_WORLD_G51 (Scott Pilgrim vs the | V | 0x2E3478C264D6791DE2C14DCA8FFD5BD8 ; MKBv19/FindVUK 1.00 -0xD99DB753B2294E357150AD07CF4FFBA4DDE8E5FF = SCOTT_VS_WORLD_G53 (Scott Pilgrim vs the | V | 0x5893C7E122BE38B55BE6718AEA98CC38 ; MKBv20/FindVUK 1.02 -0x50FAE0BD3761743AB951719B1E97375998B54F2A = SCOTT_VS_WORLD_G55 | V | 0xEF96B3F7DF2D5EB8EB3E44B5002E089C ; MKBv19/FindVUK 0.81 -0xCE6C320A1BEAE4EDAE593C50119D8B57A725E32F = SCOTT_VS_WORLD_R (Scott Pilgrim vs. the | V | 0x02002C3B9919DB36F364AB1E0AE6FA2E ; MKBv19/FindVUK 1.00 -0xFD91941223D4CF29B42D1B81BBA7A37DDE0F569A = Scouts_Guide_Zombie_Apocalypse (Scouts G | V | 0x3F61E3AF4324ADCF11175AF6D0ABAE5B ; MKBv50/BEE/FindVUK 1.00 -0x4B4187CDE815797AEE9F0B9FDE919142BD9EF6F4 = SCREAM | V | 0x710A826F910BF77DA01142B9AF28021A -0xFA4E0CE02F6357BCAD57F41057DE869B3D689D3D = SCREAM4 | V | 0x4371BDAB3F869AE32458B08DFEFBF351 ; MKBv26/FindVUK 1.00 -0xAEF6527798DEC8851FCD190A415709871A75BE52 = SCROOGED (Scrooged) | V | 0xB4D9D5197893DE5171C95B193ECA609A ; MKB 23 2011-08-01 KRJ -0x5F02C3B3A467F25E6F671C525121DC96ED0DA74B = SCUM | V | 0xE259617CFE376BCAF0D3C403DF78F3DC ; MKBv51/FindVUK 1.00 -0xDAE21AE9648ACFD1880EF7673BC52E6BBE620764 = SDARKO | V | 0xBAF83206A28018BDEF90AAE0E218EC37 ; MKBv14/FindVUK 0.96 -0x9F40295FDD39795BB097BA6707E70672A57094E0 = SDARKO | V | 0x9B3CED4EAF99B48A104FE4041D856242 -0xABD7ED4FDD3BEB3BB2ACC5F9F2C98F0F039BC55D = SE7EN (SE7EN) | V | 0x95684C4FB61C2774B01EB54CD3B6CEF5 ; MKBv19/FindVUK 1.00 -0x3647E4D11548C5F16E010ADE757203BEFF7BA398 = SE7EN (SE7EN) | V | 0x2F281067754F798543D7D041557AB936 ; MKBv19/FindVUK 0.84 -0xB6EF51A9B3A712C6A9864429C8FDFCFF425B1FF1 = SE7EN (SE7EN) | V | 0x2E28ED0D30ECEB35CA9C3E7FF6D3F911 ; MKBv19/FindVUK 1.00 -0xD4655209DDCAD8D619B7D9231EF1D9E6D82F3F97 = SE7EN a.k.a. SEVEN | V | 0x16973D5366A620049F1C70B02FFB303F -0xF062573634C740069003D54EC87289B1ECD5765A = SEABISCUIT | V | 0x0DA926E7FE4A75BD6C35685877F75093 -0xDD416AEFF0619BEE509623B1D3FE4AE251AED8F0 = SEAL_TEAM_SIX (Seal Team Six) | V | 0xE6E1E76972E18BD3171E5362D3E70327 ; MKBv31/FindVUK 0.96 -0x059AEECC970B4B720E61041F0A052CC1574633A9 = SEAMONSTERS | V | 0x1C1A8EF68F2F1AEF152FB84E82EE0C8A -0xA3179F415F6BCBA969B1F6F90975417F4CF6F8A3 = SEAMONSTERS | V | 0xC3BE402683938B640A6553ECB98E3664 -0x00FA34A9A58BE9FAB06B9CFF1C5800D02C63DF2F = SEARCH AND RESCUE | V | 0x1A72147A6CC804722FB17A1DFBCFC0EB -0x1459BFEFEA9FF5A35E26280D7727C81E483D7164 = Season of the Witch | V | 0xA53858FFB2001A06096F56EB2AF9592A -0x693CE8168436709E05FA16AE1E3CF8CDFC9F7AC1 = SEASON OF THE WITCH (Season Of The Witch | V | 0xDDBD17DA96D43B0F2185D67D7FC900A5 ; MKBv26/FindVUK 0.84 -0xCC197203DC1948816B2A2597717A94581499C36A = SEASON_IN_SIX | V | 0x147A2A3575B08F0DBB5EFF0403190D3D -0xB669C618FA1E0C887059A2F6E3C0EEEFB1B40851 = SECONDS (SECONDS) | V | 0xF97769A0729077A3491E20251B569563 ; MKBv38/FindVUK 0.99 -0xDCE4636D23143E6F60395640CF06C7880A3318CD = SECRETLIFEOFPETS_UPB1 (The Secret Life o | V | 0x1B4E096400DAC9F04DFC8D30863BA26E ; MKBv56/FindVUK 0.96 -0x7FB3CC238B52CD14B7B01C9B8EC3380A630E9679 = SECRET_LIFE (The Secret Life of Walter M | V | 0x7D157BE4C018815A45825709E82BB6B1 ; MKBv39/BD+/BEE/FindVUK 1.02 -0x5719F286318FD537BA766339CDA1F401072FC1BB = SECRET_LIFE (The Secret Life of Walter M | V | 0x99A60C68374B31E47AE5D2BA9DB4F52E ; MKBv39/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0x3B38A6C5485D1D97E5FAA91C17C01B85387FC3CB = SECRET_LIFE_OF_BEES | V | 0x438620EEAE1BE98F257D697FCAAF5682 -0xD0959322952435E48A3465F1D3976875218C5969 = SECRET_LIFE_OF_PETS_NA (The Secret Life | V | 0x04806A4A2622ED61372A22159B71A6CC ; MKBv50/FindVUK 1.02 -0xB2B71903482F70559DAC64B68DFF2EE3BE26EDB9 = SECRET_LIFE_OF_PETS_UPB5 (The Secret Lif | V | 0xBE73814DF6D25F98CBB5EEA0C2A966E8 ; MKBv61/FindVUK 1.00 -0x0D96FCDC9D6F1E71047E2B151E3EDE469158FEEE = SECRET_OF_MOONACRE | V | 0x17FF3B2482BE543B726469CEEB6D7C01 -0xCDA445D95990AC92E715FF0DCB01957CBD2DCA29 = SEELEN | V | 0x9D4AA47617186C7C1C065819A358B8C6 ; MKBv42/FindVUK 0.80 -0x5EA0523667D5E8F5C9215A5CAB1B2DEB66AADED2 = Seguian_llamando_Trinidad | V | 0x7C1D75FB0154195FD3D10E49D45475F3 ; MKBv31/FindVUK 0.95 -0x6CD7DE9C81B96F1819E3F28D84FE97A438C6D0F2 = SEIGE_F1 (The Siege) | V | 0x01CF84657C1FE2C959A58F9E8AEBB672 ; MKBv12/BD+/FindVUK 1.00 -0x52DE1C5DD27BF292A15EE2D71C588A946DA7673B = SEIGE_F6 | V | 0xC448D05CBE69086621BC8AFAB75C1FDF -0x3D60340B4F97818153D51A905EF3EF137974DF0B = SEIN_LETZTES_RENNEN | V | 0x6A6C63234FFDE5EDE2449A264CA04C5C ; MKBv46/FindVUK 0.80 -0x6D523FD67DF2202BB36EF5CAB052847349DD230F = SEKAI SEIFUKU VOLUME 1 | V | 0xE99AA82352D1422A32A9F315245CF1F1 ; MKBv55/FindVUK 1.02 -0x1017A0AACAEF6D7A2A2696A11EB75C35287C43B7 = SEKAI SEIFUKU VOLUME 2 (SEKAI SEIFUKU VO | V | 0x50F5B4489A0FD681A3AE755819759ECD ; MKBv55/FindVUK 0.96 -0x77E71FFD5D0C6D8EE1D4CFAE9B8686518B4C2EB6 = SELECTOR SPREAD WIXOSS BD 1 (selector sp | V | 0xF70A4862F5E04B16144400D0A69E1EBA ; MKBv47/FindVUK 0.93 -0xFCF64595270981E79A5DC7492ACF0F3E6D8CE04A = SELFLESS (SELF/LESS) | V | 0xC3C0CE8EEA1620F497641B2B41BB21B3 ; MKBv57/FindVUK 0.98 -0x3D63810BD8C39B8EA8E57E011986774C6E6CCBC4 = SELFLESS_NA (SELF/LESS) | V | 0x985CFD847FC5812BF97ED614E8EDA059 ; MKBv56/FindVUK 0.86.3 -0x92358BC7635E01F5D452FD1BF32BECAD605C4388 = Selma (Selma) | V | 0xE7B1F52B3E22C0888925060963AE52DC ; MKBv50/BEE/VUKNOTVAL!/FindVUK 0.96 -0xA43D4967D7939D6D4BFF476F93BF2C1A2B5669A1 = SEMI_PRO | V | 0x972E95C0672C1C8C495925B4BF0B1B73 -0x47472132EB97938C46C3A97E6771EEA72A591F36 = SEMI_PRO_D2 | V | 0x7D61A023AB2354848510F39790009CD8 -0x26B9B78230757D921E9DD32705397380F156A478 = SENNA (Senna) | V | 0xFF6165935C044BB92B1E90C7EB33CCEE ; MKBv19/FindVUK 1.00 -0x972D44015640EB09A1ECCAF1DC40DA47E0C540C5 = SENNOSC | V | 0xDC96DCFABF34F93683E6A841F9D00768 -0x9C5FDAB0D30E73C55D5CF2E5F3C69C14EBDB14E5 = SENSELESS (SENSELESS) | V | 0x81F0298900F472700BE75D633EA15CA6 ; MKBv35/FindVUK 0.96 -0x2C02D8EC34F2BBCD33F21D7762387909E2AE223D = SEPTANSAUTIBET | V | 0x93181092C96273BD6960DCE1F997DBCA -0xDD052A3EC2D29AC4A93D558AA9D9845A57349824 = SERAPH PART2 BD2 (SERAPH PART2 BD2) | V | 0x132723DB9D9395485B74838EA5DFE313 ; MKBv61/FindVUK 1.00 -0x98555DB1800CC253D19580617C943FB1D18B312A = SERAPH_BD1 (SERAPH OF THE END BD1) | V | 0x56D5829E574711B95C9659C334AD43B1 ; MKBv61/FindVUK 1.00 -0x2A1D0F1DBDC7504D5EE1F48C7F4AA0199FE1EB4F = SERAPH_BD2 (SERAPH OF THE END BD2) | V | 0x7282BA83D789AEAB94D8989C5C6CD6CD ; MKBv61/FindVUK 1.00 -0x4600431B3ECB430DA3856B4B3C4236E4BF512C0B = SERAPH_PART2_BD1 (SERAPH PART2 BD1) | V | 0xBC2CA6B4BE8F547022C2168B29B84589 ; MKBv61/FindVUK 1.00 -0x0FCF2E26056C8616C8EE8279021E4CBFBBED6E97 = SEREI NO MORIBITO DISC 1 | V | 0xFBDB10C15B5A3FF360F6857E1A3A8E8F ; MKBv20/aacskeys 0.4.0e -0xF47F78271ABA18C0116DD318115DDEB1C54144DE = SEREI NO MORIBITO DISC 1 | V | 0x9CC07C0C767EFDCB799AC65008A264EF ; MKBv20/aacskeys 0.4.0e (disc 2) -0x0F46BEE407C4A1E75E3682FCBFCFACA24E1DAB62 = SEREI NO MORIBITO DISC 3 | V | 0xE6B929F0023828873B151D1F3B6B6DCD ; MKBv20/aacskeys 0.4.0e -0x0E9C5F19C8C085BB0F65359198DD4F8A2DE93AF3 = SEREI NO MORIBITO DISC 4 | V | 0xDEBE2DE3B7C9ECD55822AB5C5724231E ; MKBv20/aacskeys 0.4.0e -0x9BA8B04D28C7C485E548F7E46239ABD3BBAB5E8E = SERENGETI | V | 0x8B0FF3F2F44B71BCD0DFCB8A7294809D ; MKBrev 4 - FindVUK 0.53 -0x566CDF371FB79923F5F1B0FE6B9C400E80C63337 = SERENGETI_BD | V | 0x750ACCFF5A9CFB4FD51812457CE025A7 ; MKBrev 25 - FindVUK 0.53 -0x8304568FF424FB2CFD4248FEFDB61685F6A6D8A5 = Serenity | V | 0x740BE2880805058E6C5290BF7E07D728 -0x94360024201587B2C6C17A0AF92B5AB2A67821CA = Serenity | V | 0x2500BF9C99D34BB43A483915936F0C1C -0xFA6D8133E04D9CE7E7A5692358FD06A6A1D03E3B = Serenity: Flucht in neue Welten (GER) | V | 0x5F767B5FD4EB2D044965A7086F58AADA -0x39469A6ED55A8171DEA5C273573AD57EB34DAF44 = SERENITY_G51_GLO | V | 0x273E83CFE664B588C2F8BCB4388F9F17 -0x8B6448CA06D539E72A18E3C94AB5A75749E37937 = SERENITY_G51_GLO | V | 0xE3A475EDBA434182E998552CC4BA7B64 -0xA94E8FDC39B928E06F826E52A78BCC95F12A4532 = SERENITY_G51_GLO | V | 0xBF01DE78AE172F27E652B0274AE17ECF -0x25FC5D7D1F349638BEFD72CAA6C515CC86C17ECF = SERENITY_G51_GLO (Serenity) | V | 0x47A5577E7F7C5DEEB22D7FE54CDFABD6 ; MKBv9/FindVUK 0.93 -0x2016006DE8D6117BFCC47EDC20AA40C279E47F3B = SERENITY_G51_GLO (Serenity) | V | 0x0EF4C6E09713E60DF507610DC8FB8747 ; MKBv9/FindVUK 1.02 -0x177EE31CB70864DB5BFFB30286A9D881930BDE47 = SERENITY_G51_GLO (Serenity) | V | 0x258D121B2A3901B7422CB04F6D723A00 ; MKBv9/FindVUK 0.96 -0x9F3D02A8F8CA9022B6BEF76C20845BA46758AD03 = SERENITY_G51_GLO (Serenity) | V | 0x1288E737C1EC39B94BEA403D607E8C27 ; MKBv9/FindVUK 0.99 -0xB8199AF3B77DCDEA556B40961F001467F997EE38 = SERIAL_EXPERIMENTS_LAIN (Serial_Experime | V | 0xF1DF5C64CCE7CAF4EC8EE7764B0AFDAF ; MKBv31/FindVUK 0.96 -0x2F23F334BE6D7F9F757357DA61192B05D0CD3E77 = SERIAL_EXPERIMENTS_LAIN (Serial_Experime | V | 0x108E71755CB1130CB2494637167CA2C2 ; MKBv31/FindVUK 0.96 -0x5736C7ECD0C9C2B77E3DA7428016F66DAEAC0314 = SERIAL_EXPERIMENTS_LAIN (Serial_Experime | V | 0x91756F1D19B915AA6FC54C00612E812F ; MKBv31/FindVUK 0.94 -0x3F7A3E3C0DC8C516D7CFACA1529C5367BF7D5640 = SERIAL_EXPERIMENTS_LAIN (Serial_Experime | V | 0x3E0E1F2CA9B32EF557266493983C749D ; MKBv31/FindVUK 0.86.3 -0x61C32F358967C14DB156C70B8D536B61F53C6B4E = SERIAL_EXPERIMENTS_LAIN (Serial_Experime | V | 0x11C32D051017F1BFA34B9D9736031B0D ; MKBv31/FindVUK 0.86.3 -0x7F4C4787BBDFE5F70C51A81502E82F5B38774525 = SERIAL_EXPERIMENTS_LAIN (Serial_Experime | V | 0x19CBAE486AAF8543F264601979D37B33 ; MKBv31/FindVUK 0.98 -0xFE21A933A2E51BA5EB5B352106393209B9FD63B9 = Serious Moonlight | V | 0x77EA79F24FC9991320132F7534C2FBD8 -0x81A30136415FC886A6E9FA17BEA554D2B4817A38 = SERIOUS_MAN | V | 0xA0ACC341EEE47123DD80836238D25DD1 -0xAD9B7C559B49F07A3EED118D9BB553066D60678A = SERIOUS_MAN | V | 0x58212446CA227CC22CCA54E612D82947 -0x26A85FA6867BDA8C041B16BD1E4C3C9DC7AC765E = SERIOUS_MAN | V | 0xA799145153D8BEC1E56C82A715A28146 -0xECE9F07B75ACAF061C16CB6FC2F8909F4D667DC0 = SERIOUS_MAN | V | 0x376426C3CEDD5A930EAEEF16C5495726 -0x81320AB98D3BAD4CE6AEED7D92A018799F617458 = SERIOUS_MAN | V | 0x77B9E0320F69CE6C2E37A8AC6FCF13E5 ; UK -0x0B68E92B413D1A8B4B51C6C6BB85948A0B88693A = SERRAT_Y_SABINA | V | 0x919756A987398EDBFC88FFE8C42A30AD -0xF6B171CDEFD99471E73E332426C669837E3CC7F1 = SEULS_TWO | V | 0x53E81B5A17079F1B8F683C0F2C62C090 -0x30CF9563D135A842F4D32DC1B5912F9D12B219A6 = SEV1EUW1 | V | 0x2C16BF145E611EEA67DBE2F18E2698CC -0x86BEB04382DDEF483B9A7D19D9346FD949E3AF1C = SEV1EUW1 | V | 0x4E6B1DDA9ED6BF46C2B55B21D78AA28F -0x9C1904560CFC821D1B92FF9DF75C4C75ED16C26B = SEVEN (SE7EN) | V | 0x1F69D4243C59D7C425A787EFDDC35EAD ; MKBv18/FindVUK 1.00 -0x6C26A5DCB8FA0C60A412A267065C2F044684E129 = Seven Pounds (US) | V | 0xE1557AA6C1B668A5646A3EE4496BF5C1 ; mkb v7 -0x521DCBA9CAA45DCA7A1BC7BAEC6451DB3068A289 = SEVEN SAMURAI | V | 0x8454709549D383A4D62D71D5029131C0 ; MKBv40/BEE/VUKNOTVAL!/FindVUK 1.00 -0x49D81A4A7F7512C22FD2E8387B4585B2936572AF = SEVENTHSON2D_NA (Seventh Son) | V | 0x31023BB8AF2803EDE2DF8D4746CCDAF6 ; MKBv47/FindVUK 1.02 -0xE7823761DE7BA909B6161F2D6056D0DEBE515F16 = SEVENTHSON_UPB1 (Seventh Son) | V | 0x0D094DFCCD26EBF8EFD40AED221357D3 ; MKBv49/FindVUK 1.02 -0xC0F8650C730D0A20859B62C4F765D8678985174C = SEVENTHSON_UPT1 (Seventh Son 3D) | V | 0xED2FAB5D990E959C09BCB2C322D7AEB6 ; MKBv49/FindVUK 0.98 -0xD74EFA406FD5A935B8BC0295BFDD1E3ABBBF1177 = SEVENTH_MOON_BD | V | 0xAD24969914EEFD2A04F6C575BE825BB8 -0x47EAE21DF642ECE6B201A392488E7D312F5F78A3 = SEVENTH_SEAL | V | 0x5A1338F40EA3F00EA45F86185C9AA09E -0xCB394953331F6B4A1374B6AE78124DDE812C9D04 = SEVEN_PSYCHOPATHS (Seven Psychopaths - B | V | 0xCB6C4B22E80E4212B4FD8A2A0E2E2A2D ; MKBv35/FindVUK 0.99 -0xA3CE9B05B66197E44B0540DD424CD71C0F01EFD9 = SEVEN_YEARS_TIBET | V | 0x51F2D092A9F55728D2BD276C33E66A54 -0x83C6947D279E874D1E0988DDE6FD35080C60A6E7 = SEVEN_YEARS_TIBET | V | 0xDB13ADA4188817B30D79FC98D81CAD30 -0xF4FEB33B8245EB60EA6AA104AD4DC3C743BB65DF = SEVEN_YEAR_ITCH (The Seven Year Itch) | V | 0x3A3EF8677F7FEA002F06F80D7152367E ; MKBv27/BD+/FindVUK 0.90 -0xD33884472049DA313C08AE9F92B652A3788D2E67 = SEVEN_YEAR_ITCH (The Seven Year Itch) | V | 0xFAAA3895C5DCB40B593DCF878D8021A8 ; MKBv27/BD+/FindVUK 0.96 -0x4831D7218BF840186F5DB3EF0B13E2543B4750C1 = SEVERING CRIME EDGE DISC 1 | V | 0x94E46AEB8344257FC2B3F4213BE42483 ; MKBv47/FindVUK 0.86.3 -0x31EA0E0CB5D0F2016B69661406D2F54085D2292B = SEVERING CRIME EDGE DISC 2 | V | 0x178F93F79B9F2249460CDC14CEB9BF90 ; MKBv46/FindVUK 0.86.3 -0x5DE4C56F7071F86EA3EA9E8434358021B68D73D4 = Sex and the City | V | 0xD2ECAEB746BCB7BD8A00F26C2CA16F6F -0xEED514C835EC3E54AC718B58A809ACB0223DB23E = Sex Lies Videotape | V | 0x2B9D8DEDA6C7C126BD1888675EC519B7 -0x93857DA8401022E7216AA074449FA205C3F9A2A0 = SEXANDTHECITY | V | 0x412B47A414913E04B0D68446AA73FB6F -0xB7C9EFF551EE42EAEA9FFE1A0D1C515AD362F083 = SEX_AND_ZEN_3D_BD (Sex and Zen 3D) | V | 0x2E494CE59A36491B79C069EA9F42665A ; MKBv24/FindVUK 0.96 -0xFDB3B0A71B7534754D81EBA3E57B47C2E66A05CD = SEX_DRIVE | V | 0x45BE3326CB393D5D19BC4437F369964E -0x4BCF830FF2CC6C29215EE8BE815465DB7B91C628 = Sex_Tape (Sex Tape ??? Blu-ray???) | V | 0xB8FC3BB5F2EAEE38B84A8541020D7703 ; MKBv49/FindVUK 0.95 -0x72C2370A9995870047E8621E6ECC74597929145D = SFIDA_SENZA_REGOLE | V | 0xF04EC92058E16B5A25EF9DCE2FCB00AA -0xDF04F6072C12510C974E26AED945B362252ACD9E = SGN1JJD1 | V | 0x8F1AE0C9D72529A9E69D1F858F913B8A -0x0E1DF248DFE1C7EA67E997F8E4D34922DD1400F5 = SGU_S1_V1_D1 (Stargate Universe - Season | V | 0xE35DC77788046B7524548240AD283C13 ; MKBv15/BD+/FindVUK 1.02 -0x7D3348D0BB774AD0DB784E0F75DE4E8D4EE37038 = SHADOWOFADOUBT_G51 (Shadow of a Doubt) | V | 0xD6058F4C75C23B036C7EACF1EC9B475B ; MKBv25/FindVUK 1.02 -0xE928A4F8747A754D386D3746BAB5DD23BC07F1AA = SHADOWOFADOUBT_G51 (Shadow of a Doubt) | V | 0xE0727248362574726A83BBC706FD094A ; MKBv25/FindVUK 0.94 -0x63A8F86EC13E07C155B46A5A54387E6390D867C7 = SHADOWS_IN_EMPTY_ROOM | V | 0x9B6BCA9B76E7F3AA62B3E2FAEB935098 ; MKBv58/FindVUK 0.98 -0x0A60832CF374118F5522317AFBF7E71ACDA46D91 = SHADOW_OF_THE_MOON | V | 0x4B843F9ECE9265BE865444CA9BB6B921 -0x1FA3A299FD0D4941BF7D229EE05110C89853D5E4 = Shadow_Warriors_I (Shadow_Warriors_I) | V | 0x3F1CE77620C66B89A514CE9E64F55EBC ; MKBv50/FindVUK 1.00 -0x5D6D6C87194F63D2800F54D7CF3B7073D5EEAA04 = Shadow_Warriors_II | V | 0x194F63D2800F54D7CF3B7073D5EEAA04 -0x5D6D6C87194F63D2800F54D7CF3B7073D5EEAA04 = Shadow_Warriors_II (Shadow_Warriors_II) | V | 0x8545498A9927B532918A718FCF110F7D ; MKBv50/FindVUK 1.00 -0xD101BE0CBD3717B376710C9FBFC8ACD86A1C68C2 = SHAKIRA_ORAL_FIXATION_TOUR | V | 0xAF1B573EDC5106318F57B2F32A0A9899 ; MKBv4/FindVUK 0.96 -0x98775BC0B1835C256CAFADC3B11B005529B04DF2 = SHAKIRA_ORAL_FIXATION_TOUR | V | 0xE2E2ECECC4E455E76441D33953ED89A5 -0x6BFFBD88DC1AD0F5C5AE6A557B63D08790A36725 = Shallow Grave | V | 0xFB08BD10AF41B3FCFE00E249130C31D6 -0xCE6E77C251D110F4F9B0D35AF41B96AFA069EC23 = SHANE | V | 0x5263FD672BE0E6518444BD2845D88C98 ; MKBv36/FindVUK 0.82 -0x5F1AB5214843092FBC8D711045FB79B55219EFFD = SHANE (Shane) | V | 0x8384148AF1F8EB476796474AF7C6DF9A ; MKBv36/FindVUK 0.96 -0xE1D9A8AE3B210D6B3441C76B4011C58DD5B8DE48 = SHANGHAI NOON SHANGHAI KNIGHTS (Shanghai | V | 0x4584D6E578547042EB1A9D52888FE6B1 ; MKBv35/FindVUK 0.87 -0x070B23081C5FD4995460600950530421B1F6F2F9 = SHANG_HIGH_NOON | V | 0xB602B269A086195588AAF5AA570B7D53 ; MKBv9/FindVUK 0.96 -0x45FCA3CD2D5EED012F74D59D6BCF9A1724C30F1B = SHAOLIN | V | 0x9F3391FC2DD63094460272267A1E0C5C ; MKBv25/BEE/FindVUK 1.02 -0x6D3DE55717472F620F3ECC1CD4D718A0DE07991D = Shaolin Box | V | 0x722E5401B4BEC7AEA54801FF094408E8 ; MKBv25/FindVUK 0.80 -0x7FE2A6E09DF58E6057427DFDDE5E2B77611DB302 = Shaolin Soccer | V | 0x68B236767CD626AB889C484D3E1FE9EA ; MKBv14/FindVUK 0.98 -0x6C38FD46FE4EB0CD1C1BBFC30924B189E07827EF = SHAOLIN_SHOWBOX (Shaolin) | V | 0x7758CDE5024F1C0B7CDFDF8AF0DF60B2 ; MKBv21/FindVUK 0.84 -0x84980A01662C979B10214D71BE7D5892779F0225 = SHARKNADO | V | 0x54923C74CB3A353D4B2F6E4CC836E209 ; MKBv42/FindVUK 0.68 -0x99FA0AE10B6A77FB389AAE9124AF969C4180A290 = Sharknado (Sharknado) | V | 0x08C3FD14E08E2A3CDE3177CFFF330C05 ; MKBv39/FindVUK 0.96 -0xBE212C1E5EAEBD3C8967988897157C4A9EF53363 = Sharknado 2 - Megapiranha (Sharknado 2 - | V | 0x9096CF02158E65C5284CBB9D7054CC79 ; MKBv46/FindVUK 0.96 -0x2130B4F0AE66BE59722A294706C0794518B8706F = Sharknado 3 (Sharknado 3) | V | 0x835E1B52EF45AB5BED896B4241A3ED12 ; MKBv53/FindVUK 0.96 -0xB8D5BF650944E1CFA5AAD10E467A00397EE67A93 = SHARKS3D | V | 0x83060195587A64B34FDF7A95AED8DF9E ; MKBv19/FindVUK 0.80 -0x91DD73D3EF7A02C2D398A39DDDB3884D00581226 = Sharktopus | V | 0x7DE7AD4F4783EB9D60F5D6BDFFD113BE ; MKBv28/FindVUK 0.96 -0x2E67DEF0FDA00A3DC808370CFE60F770A245B6D6 = SHATTERHAND (Old Shatterhand) | V | 0x21CCC12D8BC671C09D2BC8221620E012 ; MKBv35/FindVUK 0.96 -0x3709819CA45556A965B62A208B150C12E4F417C8 = Shaun of the Dead | V | 0x1E47C10375C1EE35DD98E79592AB526F ; mkbv39 -0xEA7419330D02BC5C26CAF9ECF527CACA34B2A5A6 = Shaun, vita da pecora - IL FILM (Shaun, | V | 0x1FBD66A3DB6C6800C543A071FB4D1CA2 ; MKBv55/FindVUK 1.00 -0xD2234FB2E90092A5A775B78F0E856B36EE698C2D = SHAUN_FILM (Shaun das Schaf - Der Film) | V | 0x4B90F8CBD42E461C898FDABD5A7F64D0 ; MKBv54/FindVUK 0.84 -0x80B4C2847213C907FA5AF8B2CB0F4040F6A08938 = SHAUN_OF_THEDEAD_G51 (Shaun of the Dead) | V | 0x3559AC7629A1B670F0DA3A8F22BBDF62 ; MKBv14/FindVUK 1.00 -0x582DAEE6DC45C1E3296BA2B593E0EA6DBABCACB9 = SHAUN_OF_THEDEAD_G51 (Shaun of the Dead) | V | 0xF0467A4C139BB52D5CC8CE13E0F11F2E ; MKBv14/FindVUK 0.96 -0x57EF50DEFE861BD787A5F02F52E3D320379A2BB7 = SHAUN_OF_THEDEAD_G51 (Shaun of the Dead) | V | 0x654DED7589BCC64D586EF579C05F53AC ; MKBv14/FindVUK 0.94 -0xAACC61E1AAD8E9C2BA3C4A5AEB3A0D6BD9AE6946 = SHAUN_OF_THE_DEAD | V | 0x4D1F9A65618C01DAF4988F615DAAE3BB -0x3A63BEF1F395C4FBAA51783DFFC5DF2C08312D09 = SHAUN_OF_THE_DEAD | V | 0xF87B18CDAD8DB0B18A7FDBE7B9DE9487 -0xBCEFA36C7A27BE9A9AFF4A0EEDE57612C6F40AD3 = SHAUN_OF_THE_DEAD (Shaun of the Dead) | V | 0x0BDA944699D8FAAF9E8909652761FCDA ; MKBv12/FindVUK 0.92 -0xD8C1C46828E59C9EB1F68F749DBA26FC42B25EBC = SHAUN_THE_SHEEP_THE_MOVIE (Shaun the She | V | 0xA1C1FF6B4F058C066E334E280B582D1C ; MKBv53/FindVUK 0.94 -0x44DB47268F18AA38E2724BE1FB4B3E2F617B7177 = SHAUN_THE_SHEEP_THE_MOVIE (Shaun the She | V | 0x8486AA6345B5BD13165C4D30FFD90094 ; MKBv49/FindVUK 0.96 -0xB13625BBCC55C4BF7B86010AB40C6757DF770D55 = Shawshank Redemption | V | 0x2E178E2424145DDBA2E3BE3E29DB85DD ; MKBv32/FindVUK 0.65 -0xC0A98E144A7262ADBB38ABFA21BA6096F7A2E81B = Shawshank Redemption | V | 0x3CF40FFD7CCDFC8F5070C3A5006AD475 ; mkbv32 -0x9F87306F48E871FED591B6766C4FAE2353E30E1F = Shawshank Redemption | V | 0xE8CE9607148C55ADB78E4581A10C1515 -0x3025D0588CD0704DD1AD1B01C5B71D913514D3EE = SHAWSHANK_NA_JP | V | 0x83061D0EB5B67B48A6FE7BEAE2F4EB6E -0xD4751D3120FE6A98E7D0641811A39290BA62A1C8 = SHAWSHANK_NA_JP | V | 0x5F08EE6172F15BAF5F234ADD6FFBCA53 -0xAE6755EF0723F76A41E4EF8B7F66F716A8ABD420 = SHAWSHANK_NA_JP | V | 0x9CB8ECEA8443C53BD6D222B9EC0ED7A9 ; MKBv4/FindVUK 1.02 -0x9266D3C82C3BC577E6133AB5C0EA3EFB8EBEE903 = SHAWSHANK_REDEMPTION | V | 0xCB5CBA48803BB32A295393F77541E6BD ; MKBv51/FindVUK 1.00 -0x8D776328A5FC3430529867AFE7F240076DA91E48 = SHD_05 | V | 0x1B61D3716DFF5ED8335042B9E344743B -0x9B21284367ADDF8F1174049CAE4392AF51B73E15 = SheKilledInEcstasy_BD | V | 0xE69F18865E8C5D2A662949C8304239E7 ; MKBrev 51 - FindVUK 0.57 -0x367C7E5F1E0203AD457756E86F006BE99EB90BCE = SHELTER (Shelter) | V | 0x7DE0202F34AE3A4E5A86D009D09AA044 ; MKBv30/FindVUK 0.95 -0x16E6F91644128360F37769D89FE7DB4958C75744 = SHERLOCK | V | 0x2CAF5989C65D60F16BE2DE80101433FA ; MKBv19/FindVUK 0.98 -0x9709C5DE70F14B38290BEF9B31D531512BDDB3B1 = Sherlock (Sherlock Holmes (1916)) | V | 0x14B27FBD9E75ABE007CC9449B4C5798B ; MKBv50/FindVUK 1.00 -0xF71E6738757AAC7A20568203EDCFDF963A17EBF4 = SHERLOCK (Sherlock) | V | 0xEA2FC3ADB40429965122129EFC845A7B ; MKBv18/FindVUK 1.00 -0x33BD2738F7B3A6B846481F7ECBB837F6F553AA6C = SHERLOCK (Sherlock) | V | 0x60DCE47740490AF2E68F2C19808F1A43 ; MKBv18/FindVUK 1.00 -0xFE1D882535B6B6895F179060D72099171DA21A65 = SHERLOCK DIE BRAUT DES GRAUENS (SHERLOCK | V | 0x38552CC231BB8D5B0B53D3431B365297 ; MKBv61/FindVUK 0.92 -0x8ED5C9E58E9B9B692EF4D74D5B671B4A16D87B84 = SHERLOCK DISC 1 (Sherlock Disc 1) | V | 0x447587F16C430995F04D3EDFAD5AAA8F ; MKBv19/FindVUK 0.99 -0x6EAA8C07C4A84DDAB4E7F7DDB123884D6C9C77C9 = SHERLOCK DISC 2 (Sherlock Disc 2) | V | 0xEDCC8C76142782C68D873087DB2DEEF0 ; MKBv19/FindVUK 0.99 -0x1A7A1EE5D43ACED716ABCBC35816556D7CD57DF2 = SHERLOCK DISK 1 (SHERLOCK) | V | 0xB808057F286C488938AD330797D29FA3 ; MKBv25/FindVUK 1.02 -0x1D48CF48A6953DBA4B267A05D411BFB024EEB56D = SHERLOCK DISK 2 (SHERLOCK) | V | 0x9CD297C87CE95206A0540E8AFB2C7835 ; MKBv25/FindVUK 1.02 -0xD8B60C11480504E9BD2B76733AFD56AF6CAD3A23 = SHERLOCK HOLMES | V | 0xFEA13528D93201CC145BF75B11D96C39 -0x8EABEDCACC59F8F8F1C37D204CCBB1E61100D789 = SHERLOCK HOLMES | V | 0x0A2EF551AE58D5A8197B480A1918B0F5 -0xD5C1D9727A8355740356CE7A3C538DA4051FC1C1 = Sherlock Holmes (2009) | V | 0x4F6F492E811D08CBC99B4B62818EE750 -0xEE8B9BDF414333CA5900559705076A747CC50CDF = SHERLOCK HOLMES (Sherlock Holmes) | V | 0x75AF595E9436A74DC134B55B62917413 ; MKBv27/FindVUK 0.96 -0x0941E672613CDDBF98AE1A5071DF1E1598D81EF7 = SHERLOCK HOLMES (Sherlock Holmes) | V | 0xA1D60BBDA8494B64D7E5C132B47367B2 ; MKBv16/FindVUK 1.00 -0x34ACA83EE756972164B7AD0FA7260E048E48D31E = Sherlock Holmes Box | V | 0x912C84CA9E1397ED6BF46937AE54D6EB ; MKBv20/FindVUK 0.80 -0x5CC4442FBBAFE3834CA5F203352C4986DA071920 = Sherlock S2 D2 | V | 0xB18D79FF06ACE618114DF3E1AC18FBA4 -0xB27F4E3CF7FB9C4EC601B0DE5DBF7B050BB5C429 = SHERLOCK STAFFEL 1 DISK 1 (SHERLOCK STAF | V | 0x211E2C10ACA9BD2A27E39AA1FEF72CC2 ; MKBv55/FindVUK 1.02 -0x8B4E21F85E99D0E4F58079CF3EA8D971770D8A2D = SHERLOCK STAFFEL 1 DISK 2 (SHERLOCK STAF | V | 0xC6AB211EC656C44DF97FB25544724B06 ; MKBv55/FindVUK 1.02 -0x43E9CD11DD5FF584FE5BD0880817F0F3C2232A66 = SHERLOCK STAFFEL 2 DISK 1 (Sherlock Staf | V | 0x46A1E2B5D1B059C6E0F2C8E72656BB71 ; MKBv30/FindVUK 1.02 -0xDBCBE485964CC1398153C935BFE6D05493DFBE51 = SHERLOCK STAFFEL 2 DISK 2 (Sherlock Staf | V | 0x77B2D8B58103E24399585BD573D079B0 ; MKBv30/FindVUK 0.92 -0xBD1488AF68F3E9C55072A83FA0DFD0015A428F6C = SHERLOCK STAFFEL 3 DISK 1 | V | 0x4F70DA510F9B6D7DB79D70D0D759991A -0xDBC812D024B1DCA84DD60234AA11667ADE2B2DC5 = SHERLOCK STAFFEL 3 DISK 2 (SHERLOCK STAF | V | 0xFA4FF9CEB2795491E428CEAB7E72B70C ; MKBv44/FindVUK 1.02 -0x200811F9A0AD8A137AA14E54F7198FDBABAD5AAD = SHERLOCK_2 (Sherlock Holmes: A Game of S | V | 0xEC3CEFB2D4E6A58377465081B24CD14B ; MKBv27/FindVUK 1.02 -0xCE8572011A8B7A7B7DF1E0BFD341E4A14B6CE88C = SHERLOCK_2 (Sherlock Holmes: A Game of S | V | 0xC319EC722695EDC7535C989506CEBA38 ; MKBv20/FindVUK 1.02 -0xE6C510765959568B9BE2904B7EB7222104F4FB28 = SHERLOCK_2 (Sherlock Holmes: A Game of S | V | 0xE909DBD3912348A041E2B904F1CDE673 ; MKBv27/FindVUK 0.96 -0x3DCAB69E3EFCFEFEA231861D0899BA8147647608 = SHERLOCK_2 (Sherlock Holmes: A Game of S | V | 0xCD6D77BFC0FDFE48D28FC3EF82AB31E4 ; MKBv27/FindVUK 1.02 -0x9FF44BA51C45AC0876D2BB5BFAEF6440343F5427 = SHERLOCK_BD1 (Sherlock Disque 1) | V | 0xA51D14064AB7FD91BB30D9D300A34D6A ; MKBv36/FindVUK 0.96 -0x0DB124A921BB7CF0B85F148BDF885087E4CCFC02 = SHERLOCK_BD_D1 (Sherlock The Abominable | V | 0xFCBD26953AB7F1E4A8DC541CB9CFD1E3 ; MKBv57/FindVUK 1.02 -0x6C466C3256AB0A67C3C97C234200879DEE3CC1A5 = SHERLOCK_BD_D2 (Sherlock The Abominable | V | 0xFDC7A73AAA625FEF18E61FE611D30219 ; MKBv57/FindVUK 1.02 -0xB7F74D52A978119B616EDF78BEB351F90479F4D6 = SHERLOCK_HOLMES | V | 0xCE1E3F5EBE36E5067D5AA2CBE7BC4DC0 -0xA23EEA2EC89B3C105022C4FF21E9A699CD8490F5 = SHERLOCK_HOLMES | V | 0x10A7585C14B312E514F601F50F60F2C8 -0xB5705722C09477109DA98966CFC5AD325A6B24A4 = SHERLOCK_S2_D1 (Sherlock Series 2 Disc 1 | V | 0x1C1D8607274D1E483591291580E5EA5D ; MKBv25/FindVUK 1.00 -0xB179D6255790C638074C1FE14DA61D893B29BD7A = SHERLOCK_S2_D2 (Sherlock Series 2 Disc 2 | V | 0xD2C28ECE4B0A0A22B7B38C6C0F26D112 ; MKBv49/FindVUK 1.00 -0x59ADE5ABA36FEAB27CA4E3D55D5961A36B64E633 = SHERLOCK_S3_D1 (Sherlock Series 3 Disc 1 | V | 0x23AEA9C704F9761DFC6A577AEC255E8D ; MKBv44/FindVUK 0.93 -0xA53C451E9C4293023AD1B114AB206F832571A60F = SHERLOCK_S3_D2 (Sherlock Series 3 Disc 2 | V | 0xDE288D5F6DE4639E88FBBE601B9D0BA9 ; MKBv44/FindVUK 0.93 -0xF8227B1A9E8385601C1E950984BF24856029D9C7 = SHERLOCK_S3_SE_D1 (Sherlock Series 3 Spe | V | 0x736FD2BEDA5C17B32C421DCA77E9E9BC ; MKBv49/FindVUK 0.94 -0xAAA420C2577CCF5492FCEE0B2D05E2F7EE5BDE98 = SHERLOCK_S3_SE_D2 (Sherlock Series 3 Spe | V | 0xD797DDF64F3AC08D442DF746E6FB0F4F ; MKBv49/FindVUK 0.94 -0xC3DE3CDA697DE1CDD19ED34C88A239430D0B1AF7 = SHERLOCK_SERIA1_BD1 (SHERLOCK_SERIA1_BD1 | V | 0xE3AA89D3EFFBD4B1A266473FE3191E6B ; MKBv47/FindVUK 0.96 -0xC619243212F439F1A14D3B7E98ACD85F9EAFC31E = SHERLOCK_SERIA1_BD2 (SHERLOCK_SERIA1_BD2 | V | 0x41B1A2ED23649225C8351E0F9AA8D282 ; MKBv47/FindVUK 0.96 -0xF4795C77EFE6B4E05BAC73E4D7401F287454E23F = SHERLOCK_SERIA2_BD1 (SHERLOCK_SERIA2_BD1 | V | 0x59E4C311D8A13E544D95DE4697980F77 ; MKBv47/FindVUK 0.96 -0x8472DED23A94AF4C663B8FAA9113B91D23C5C01A = SHERLOCK_SERIA2_BD2 (SHERLOCK_SERIA2_BD2 | V | 0xC495274E6CF725C2FE8BCF341E139DBF ; MKBv47/FindVUK 0.96 -0x29F44AED1A54FDDEBF7F4ADA615D6244D2C33236 = SHERLOCK_SERIA3_BD1 (SHERLOCK_SERIA3_BD1 | V | 0xCAFD891DB2C6DDC693A02E5F1162496D ; MKBv47/FindVUK 0.96 -0xC15370BA6A0934390ABC776BC150F35C50E8099A = SHERLOCK_SERIA3_BD2 (SHERLOCK_SERIA3_BD2 | V | 0x6368A59CE8BB3BABD1FB4CE008A9B0BC ; MKBv47/FindVUK 0.96 -0x2B3F89B7F0D2313D2BDF892147F7FFAEBA4C51EF = SHERYL_CROW_LIVE | V | 0x6D17AE1CD8D3E559950852C9F8CF0EFD -0xE47D4064BCA64EE887DD54833A5B27EB0E95901E = SHI KI Disc1 (SHI KI Disc1) | V | 0xFFC8BD6104E493A0C8371EED55000773 ; MKBv53/FindVUK 1.02 -0x0BF33EBAE4BCC54F439FA647EE007B1CC30AC212 = SHI KI Disc2 (SHI KI Disc2) | V | 0x1EFAE9B4ED8D7A5DAD411079404EF9F4 ; MKBv53/FindVUK 1.02 -0x66309554E48D3504A8B283A527C36F0A4631706A = SHIGURUI_D1 | V | 0x13EE1D32A99FDB540117730540F0FE21 -0x6BD3E72D93D19BB589133C2084B8FAEC902C2BFB = SHIGURUI_D1 | V | 0x05C1B9610C3FE548ED567B331168086E -0x5F730DD68033A861586F6F8F9F63B5CD6FC9D377 = SHIGURUI_D1 (Shigurui Disc 1) | V | 0x7ED1DAE64EA69B4FC388C4DF30281DA6 ; MKBv9/FindVUK 0.96 -0xF53DAD10C9733316F6FA7B98DB24CBE45BC394BF = SHIGURUI_D2 | V | 0x8166B876B82D6C1EE4F90DC0BE6288F9 -0xC645F8DE6D1A15C4EDE89DB8F1A244A182FAF1F0 = SHIGURUI_D2 (Shigurui Disc 2) | V | 0x6A0361E42AD24167EDD4D3C4E5C03411 ; MKBv9/FindVUK 0.96 -0xFA16BE2E758E0AAED80FC4908C52D81C0871E75C = SHIKI_P1_D1 (Shiki Part 1 Disc 1) | V | 0xDC9E20E8669F7607644C64C0F2401E50 ; MKBv26/FindVUK 0.96 -0xD080A07D243845B0345C66F67AA93A55EBD28105 = SHIKI_P1_D2 (Shiki Part 1 Disc 2) | V | 0xF5B5653382028E5172252AE79FC75D14 ; MKBv26/FindVUK 0.96 -0x678CD414AFB622531C46BF18567071374AE6E77B = SHIKI_P1_D2 (Shiki Part 1 Disc 2) | V | 0x988DF0ACFBE13DE0AEE156601F1AF2EA ; MKBv26/FindVUK 0.94 -0x58C5C8F35278FEBAB9C4DC7896244E0BFAA988DB = SHIKI_P2_D1 (Shiki Part 2 Disc 1) | V | 0x1C4D46D9BC4264879862A415C86528E3 ; MKBv26/FindVUK 1.02 -0x9CF1387F1C46867D87D7241B24CF7EB60EF83664 = SHIKI_P2_D2 (Shiki Part 2 Disc 2) | V | 0x3EBC5D2AEB7FFFFD0E8292A7BD7E3D08 ; MKBv26/FindVUK 1.02 -0x91AEE8620BB562F5220DB5E883444B3CD0DD5F55 = SHINE_A_LIGHT | V | 0xD549B52CAD0600EAAF5C7737FBCE7B18 -0x8C0D37AF45A1EE8C4697A9187BB11F9F84BABEF5 = SHINGEKI_1 (??????????????? 1) | V | 0xE27CF8059221E71C06E961B6DA11F3A5 ; MKBv42/FindVUK 0.92 -0x985F9FB5BF01433E1E47D489A3FD2E75B3EE9CFB = SHINGEKI_2 (??????????????? 2) | V | 0x520F76AC48E11F802F229552F585A5AE ; MKBv42/FindVUK 0.92 -0x33102038FBB4139056F9D168F048D5DD8A9BDE57 = SHINGEKI_3 (??????????????? 3) | V | 0x5B810D3C3243DEF7B68C2F3D6D4731E3 ; MKBv42/FindVUK 0.92 -0xBB1BDD6F75E49E1F4BA3D9AE057ADD3A6C3ED24D = SHINGEKI_4 (??????????????? 4) | V | 0xEF7B7A27EFDDB0ECA04D1176AE22B932 ; MKBv42/FindVUK 0.92 -0x38178F9DC3C8081420577015DC97CBF41CD93DA1 = SHINGEKI_5 (??????????????? 5) | V | 0x64EAD7BB53429A16E80F587F8775D699 ; MKBv40/FindVUK 0.92 -0xC79276305F0D8941CC9715E46BC0EC0DBEF49F86 = SHINGEKI_6 (??????????????? 6) | V | 0x774DAEEE94FE90CA61EEC8C88CD10AB5 ; MKBv40/FindVUK 0.92 -0xAD29A76956F053C98D9A745333D0B81DD0D8BCB3 = SHINGEKI_7 (??????????????? 7) | V | 0xDB759EB4607EF3666DEBA377E75B0E4C ; MKBv44/FindVUK 0.92 -0xEBA202D64058C2ECA21709BCD8532C51C5981DD2 = SHINGEKI_8 (??????????????? 8) | V | 0x0094D2390F7852BE9C21570CE35A4187 ; MKBv40/FindVUK 0.92 -0xA505D71E1C61DE8A183F6A41EDC55492E9BE9B69 = SHINGEKI_9 (??????????????? 9) | V | 0x1275A3DF74D7B5A459BF6E8376AA7927 ; MKBv40/FindVUK 0.92 -0xCB28A9F0B7BC7C15873A635DE173365B58FAEB08 = SHINGEKI_ATTACK_ON_TAIKAN (????????????? | V | 0xDBD15A3F724D4FBA1700EAF7F7BF8249 ; MKBv40/FindVUK 0.92 -0xC886A1BBEC9AB1A55F072CD06B15E8B89146C157 = SHINING | V | 0x5C857115A1C4367AB1CB1A2A7B760BBD ; MKBv4/FindVUK 0.80 -0xF98E03F968A61A7E10632A0FB9ED5B253F655828 = SHINING | V | 0xC59C073861D497A2D3CB553ED14F82B0 -0xB0C742C101107963117B0BBA9E2ABF9E37C61224 = SHINING | V | 0xC2134DCF429F0783F0F7DD5A77248AE7 -0x8D92CF3B05672BA9CFE40A32A20520401D3BF5C0 = SHINING | V | 0xD515C77E97FA682386FAE4AE315B2ECF ; MKBv4/FindVUK 1.00 -0x00813AC906D40691BDF9C994E8F08F05455EB9AF = SHINING | V | 0x44CF33252A5B2495C89AD05802CF256F ; MKBv4/FindVUK 1.00 -0x94B5D8917D34D66766484C9F2D4458D2E6E3182A = SHINING | V | 0x5AEB112DD43D8533DF62771E2E1EDF4C ; MKBv3/FindVUK 1.00 -0x2B67465294A55B7A16EB62EEEB8CC4D4117FDA56 = SHINING | V | 0x7B92C96984AFB954900E1B44255EA157 ; MKBv3/FindVUK 0.96 -0xB724CC05588077CC1396F56D27D0D619BA04F5DE = SHINING | V | 0x3F5C4482D708632C6C0640D80CFDDD34 ; MKBv4/FindVUK 1.00 -0x41F08E0590A5D0EA3C3B32D1092B080EDAE31BA5 = SHINJUKU | V | 0xD0D44A54BFB4A1A3EDA73BF5BEF46892 -0xACF5ADA5DE5FBADE14F185ADBDD2E4A3D9EEB2D5 = SHINKAI_NO_SEKAI | V | 0xBBF0E0B26C5EE8AE93955CB08D15EEAD -0x829469A051AEAC8A31E87212FC8A4B6248BC1CE2 = SHINOBI | V | 0x9D264E296F38683A172FCA85F2666EC3 ; MKBv12/FindVUK 1.02 -0xA6BE70B9275BBBC3B75E250BE0C05EAB29AE3E46 = SHIN_GODZILLA (シン・ゴジラ　本編DISC Blu-ray) | V | 0xEEDCCD23A164AAB74D56AEE1DEC538F7 ; MKBv62/FindVUK 1.02 -0x6752A4CD5778E85C9234E8E4D28EC89E513BB3DD = SHIN_GODZILLA_SPECIAL (シン・ゴジラ　スペシャル特典DIS | V | 0xAF0426A7A8AF5ADE608FED58368DC4D6 ; MKBv62/FindVUK 1.02 -0x8D1D51EEDE59B1D571A6427C767123A7E0D94E14 = SHIN_GODZILLA_TOKUTEN (シン・ゴジラ　特典DISC Blu | V | 0xD85D41C7F4BD3A94054339684C5EF83C ; MKBv62/FindVUK 1.02 -0x97E3299AA2835EADCEA5C005A7371D8513625D0A = SHIN_GODZILLA | V | 0x5B399726F1D35871AB3500D481A63FF8 -0x967C81E141E9DCD72EE45ACD52C464A66C308198 = Shirobako 2 BD2 (Disc 1) | V | 0xD3A3B7714DAA5BE2671DB92E64AFABF9 ; MKBv58/FindVUK 1.02 -0x9B094962C748ABBC084F1038531E6F38A58C3B2B = Shirobako BD-1 | V | 0x954CF15992A47C2F6701CFCA18E45D8D ; MKBv57/FindVUK 1.02 -0x5BFC773FA7243EA374FA6AF80E94204B4B377AF0 = Shirobako Col 2 BD-1 (Shirobako 2 BD-1) | V | 0x78ED7C95BB4232FF96B74F9EA3B95FCE ; MKBv58/FindVUK 1.02 -0x1FE970BFE45B3A6094A664CF51C792F17998291A = SHOAH_DISC_ONE (Shoah, Disc 1) | V | 0x7127B7F9B1F5224E99E81B55E9EFEC1C ; MKBv38/FindVUK 0.99 -0x1839B4F0F73164A1AE10CECFBED58221918AABED = SHOAH_DISC_THREE (Shoah, Disc 3) | V | 0x868B50E2286ABDEBBD3AAACDEDAD1F33 ; MKBv38/FindVUK 0.99 -0x8BB9C80D4F96B0582342D8C03907C0381F328140 = SHOAH_DISC_TWO (Shoah, Disc 2) | V | 0xFF9E3F37B5B24FF83D97EB08609BC652 ; MKBv38/FindVUK 0.99 -0x5B93E6953B9970CFA43BBC8A3E72804205C8D6C9 = SHOGUN PART 1 (Shogun Part 1) | V | 0xA634D906C9FD220E36BAA2BBB42E5191 ; MKBv42/FindVUK 0.98 -0xC88020EFED7D6C4071F2E1280DD6490512F911A6 = SHOGUN PART 2 (Shogun Part 2) | V | 0x4BBDC0821F658BFE9EF4DAEC0F063BB8 ; MKBv42/FindVUK 0.98 -0xF2B00B92DFDB6C2488221F9AE11F52B0BE646BCE = SHOGUN PART 3 (Shogun Part 3) | V | 0x7B4A0C1A61BCB8BD618FC9F26A7C43FA ; MKBv42/FindVUK 0.98 -0xCC8C5D74F130AA089DD96A6265544CE04CB8DD70 = SHOOT ON SIGHT | V | 0x14E5BF6829FE43AFED0883309863C918 -0x1F927847832F821C5B0C7EF670CBBEA0650B8CF2 = SHOOTEMUP | V | 0x0B9B132DCF03064CCAD9B71562C3309B -0x71955EDE61C712A19E0C6871B1B383A468B0E7AB = SHOOTEMUP | V | 0x0ED807D1BADBE8AA4A0597A3F438C504 -0x3DC9403B3AB9F5B6969D259E5F002DEA5780C481 = SHOOTER | V | 0xF8719E5145CD4BAD9504911C7A769BF5 -0x7DA81B48C43CC50028DAC447EF10991CCC640116 = SHOOTER | V | 0x8E3C162480599D1673468BEAD5383A89 -0xD6DA81AFCEC9AB3A63525CFAC9784D184F629EB7 = SHOOTER | V | 0xCCA569536D714A174F23F564D1C940E9 -0x1BF203033CCC23BB48CC0E8F57003DE63A61E854 = SHOOTER | V | 0xFF79A0B56B5AB85B974D54444C5B68BB ; MKBv3/FindVUK 0.98 -0xB28ECD64F459FDCF2BEC997F43E0FA72AB1CA966 = Shooter (UK) | V | 0xB83297CD77ECFEFF191AF4FEF0FB8770 -0x9D1D93BFD2A32AAC967E23545446C8B46D80004B = SHOOTOUT (Shootout - Keine Gnade) | V | 0x36E80D1446FB4885F101E791CBEB8556 ; MKBv42/FindVUK 0.91 -0xC26920C11BCC71D01EE05D4EEEA45C067DF0506C = SHOOT_EM_UP | V | 0x25D35AE528FB3404077B3211E2FAEFC6 ; MKBv4/FindVUK 1.00 -0x4A439F195F807BC2E203E9686DADBE717E8635DE = Short Circuit (US) | V | 0x0B1D18E97D640B6D1CCBE5EE3335AA7C ; mkb v7 -0x51A0BAFC30E71E45D837762DBC5348DFDBD3E5CC = Shortbus (DE) | V | 0x23229C23B1EB0BD161ED3802D242EDD4 ; mkbv26 -0x0C48CC1D2FBEC5109FBC081AC1B03D31A2431BC3 = SHOWBOX_LEGENDOFFONGSAIYUK (Legend Of Fo | V | 0x7AC4571E674F402CE3D16833219723C8 ; MKBv23/FindVUK 0.98 -0xD43FE4B598E5FD681643545F28755A1742C20ACA = SHOWDOWN_KEOMA_DOUBLE_WESTERN | V | 0xE9158888E9DBE09F09508B50C5AD2EA5 ; MKBrev 31 - FindVUK 0.54 -0x32A43021BAAE4AD774B77B1115C7B331144CB7A9 = SHOWGIRLS | V | 0x24A5347726E5DAE04B3CFDE779B99B10 -0x521DFEB9B9B805FF934DFDEE73D66CC614EA3E07 = Showgirls 15th anniversary | V | 0xCEE6185082C0F7CA53774F31B07EBC5A ; BD+ version 2010.3 -0x77155E041DBC3D0B32D30F76413426E98D476FCF = SHOW_MI | V | 0x8F9DB6575BF666DB2824452C3F0E0726 -0xC5BAE813A90E9C692E36A37AF5490B98BBEA5A7B = SHREK THE THIRD | V | 0x24BE0844F1F48C9F0A905F1BFB7088AF -0x9C8FE1645D4A4290B704F0509FACE9FB239AF9B7 = SHREK_1_3D (SHREK 1 3D) | V | 0xF126A5B265741BA1BF301CAB068EBB4D ; MKBv26/FindVUK 0.96 -0x051B3E29BD56F7FE209EC310AA6402FCAC3FE1E0 = SHREK_1_3D (SHREK 1 3D) | V | 0x52A1E79B70F8CFDBE7BE46AD7EA5EF4E ; MKBv26/FindVUK 1.02 -0xF0FB5610F1DEA512F0002D23CACEC7ADEA495FF3 = SHREK_2 | V | 0xD1C15CB019CB8A5E51662A9734815A60 ; MKBrev 19 - FindVUK 0.57 -0x3223D583295A92D4EEE88968F7DB346548A6A1D3 = SHREK_2_3D (SHREK 2 3D) | V | 0x90A68A4F8D935D3931DFF6D5150CC25B ; MKBv26/FindVUK 1.02 -0xEB1A899BF27BB5D236D9BBB691BD6F06A366C0DD = SHREK_2_3D (SHREK 2 3D) | V | 0xB17F717E6B96CC2DE196AA9D461E9660 ; MKBv26/FindVUK 0.96 -0x0A574F1F02C6E0E2CD135874A7C887CD21F64C26 = SHREK_2_3D (SHREK 2 3D) | V | 0xFC917F85A8E0AFEE6F7E08635E731178 ; MKBv18/FindVUK 0.96 -0x34B03C9D16DB4CFF1F6A80986656B35207F0BF62 = SHREK_3D (SHREK 1 3D) | V | 0x4AB0BB3FC298CE11F0D61C9A30B7442C ; MKBv19/FindVUK 0.96 -0x51DBE12ED6DA96C975940E96F5C6C2A8E444F30A = SHREK_3_3D (SHREK 3 3D) | V | 0x26F34CD492ECEF231B252902F99A9FBA ; MKBv26/FindVUK 0.96 -0x7FB52985E21A75998E43C67EB1A4AC2DF697200A = SHREK_3_3D (SHREK 3 3D) | V | 0x6DDE120333707ADCDDD0D4430083D31B ; MKBv26/FindVUK 1.02 -0xADF91DFE97C722688C90553FCA60E00F82D37714 = SHREK_ES | V | 0x6B4EDF15345CC06B33EA486DD1E42F75 ; MKBrev 19 - FindVUK 0.57 -0xB142FAB6C399803CC71C682BDAA7EE90EA7479F4 = SHREK_ES (Shrek) | V | 0x1A0C569144FEFA06220575C6035BAD98 ; MKBv19/FindVUK 1.02 -0x43FB5F59F04383C4FDDEB59F8F41F546350F4FC7 = SHREK_FOREVER_AFTER | V | 0x28E98893BD305EAC9F368C664C8D48B1 ; MKBrev 19 - FindVUK 0.57 -0x6B0B21391195688EA800E2A287AD2AD5065247FE = SHREK_FOREVER_AFTER (Shrek Forever After | V | 0x5F48BF1DF807CEE216F70EE2B1FA9969 ; MKBv19/FindVUK 0.94 -0x5639BED239AB390C8AA5652032BD78B0A18843CE = SHREK_FOREVER_AFTER_3D | V | 0xEB33C705C7D8D5F89DB62CDD10689719 ; MKBv19/FindVUK 0.80 -0xD73285FC6AC5E92A6D72633D10F5EA2D8A06E4D0 = SHREK_FOREVER_AFTER_3D (SHREK FOREVER AF | V | 0xBF0D0FF0E27078E8827AE2FEA3B75125 ; MKBv21/FindVUK 0.96 -0x7A0472A405A78125A5A6CFBE8CC8BF82025F1969 = SHREK_FOREVER_AFTER_3D (SHREK FOREVER AF | V | 0x6BB935A7509BF76C6BE63DE43F4AB64F ; MKBv18/FindVUK 0.96 -0xCAB1C9E5D5450511D45F2665EAFAEAD191FF2A18 = SHREK_THE_THIRD_3D (SHREK 3 3D) | V | 0x677F4CB455CD831959566B480B3049C9 ; MKBv19/FindVUK 0.96 -0xEBC2A00DEB44008394E3689F1DF455FC1CD8A2B4 = SHREK_THE_THIRD_3D (SHREK 3 3D) | V | 0x0DD08176D383853BC96160B78AF47ABC ; MKBv19/FindVUK 0.96 -0x3F0609701370F4468B3BD7E64FD7EFF485C6DC05 = SHREK_THE_THIRD_EN | V | 0x72C6DDFFBEA56E4D342E2F4A8188F360 -0x418023C3ACCF1AAC8769556A86B0DF37A25ED59E = SHREK_THE_THIRD_ES | V | 0xDB6AA493A8144E226F3F631F2C25F158 ; MKBrev 19 - FindVUK 0.57 -0xEB46DC24B78E5563519EBA39EEAF451A2FC56EE4 = SHREK_THE_THIRD_ES (Shrek The Third) | V | 0x669AA0CC95C72A18F18D79FA136DAAF7 ; MKBv8/FindVUK 0.94 -0x584BFA817A62EB1963BA86DF3A577DD0D6405C6B = SHREK_THE_THIRD_ES (Shrek the Third) | V | 0x5228ADC264DB4C366F16ED20554FB57C ; MKBv19/FindVUK 1.02 -0x45BBA67627A2A57CD09A60AF798854F9F20C89F3 = SHROOMS | V | 0x22CBC92F455A3054EEE16C7A8C254940 ; MKBv4/FindVUK 1.00 -0x81152DF33B129746442456E0BDCDD347780DC3AA = SHUTTER | V | 0x8C0D246B5F95C53839615C02ECDC53BA -0x43768C2E428932BF17C9A0A712DF93AE7CC8C2EB = Shutter (DK) | V | 0x08D6828C57C1AD87CBF4F018E382C83A -0x7C6885D56F114E10F9BA56E1F49480F05CC2FD77 = SHUTTER ISLAND (Shutter Island) | V | 0x94D25314E702971893D1144ED13988E7 ; MKBv17/FindVUK 1.02 -0x80175A1B40E80176E61443D482F18E2F4409565F = SHUTTER_ISLAND | V | 0xE543D784E07790C21D69CC095E56210B -0xD612CE6A0CF1C061DC47E3039FBD20AF0A8A5B06 = SHUTTER_ISLAND_AC(US) | V | 0x9993C00092E41982CE2AEAFBFFF14A11 ; mkbv17 -0x9F8D4B8FEF58175C8E053E5F41C4FFB764E15419 = SHUTTER_ISLAND_AP | V | 0x5D36059FD3D343864AA782CCD8A2724C -0x9E1CDA0ECE99CDA5419D3CF03CB8D92B192789AB = SHUTTER_ISLAND_AP | V | 0xE744D3E9F19FB3D610A89EA883739C13 -0x2DBFB00B3AD14A33F4853D3B4164335213837522 = SHUTTER_ISLAND_EU (Shutter Island) | V | 0xC2A74460847C336CE68E026F3C16C07D ; MKBv17/FindVUK 1.00 -0xD794BD820804521CC25D0007E6871F7998821836 = Si alza il vento | V | 0xC8D6E367AA62D8AD103F3949BD44B821 -0x72023D2AD6E9C320260062CEB5132899A2D17085 = SICARIO | V | 0xF4636E9EC6DDF326B881184C0239FB01 ; MKBv57/FindVUK 1.00 -0x2E56611C620CD53446EECE8AF39951E14D4DBEC1 = SICARIO (Sicario - Blu-ray???) | V | 0x4B8E9F9A4CDD1841A0E48DCC5F15794F ; MKBv57/BEE/VUKNOTVAL!/FindVUK 0.96 -0x16D640860CD10C9A76DA6CDACE6D9A6FECE888B5 = SICARIO (Sicario - Blu-ray???) | V | 0x335EC5E6040CA183CC62EA1D1BC692EA ; MKBv57/BEE/FindVUK 0.96 -0x3D535752494D400F4EC928FEEFF9F8313E63F1FF = SICARIO (Sicario) | V | 0xB81C8664F7FDFF2BA216F9D3EA1B5BE9 ; MKBv57/FindVUK 1.02 -0x224AAAA2E9E3F287CF2839643752B736FCAD282E = SIDE EFECTS | V | 0xD6DD257FAF1338EE41D25E865BEE4831 ; MKBv43/FindVUK 0.98 -0xE71F76297A94D0856B04F8962CCD7AE3862FE7CA = Sideways | V | 0xA05F160982EEE3E09D7E05008D9736D2 -0x09B197B4129C4DB786FA0EF93E86A8A67EEB63D7 = SIDEWAYS (Sideways) | V | 0xC9BBDB31CE0E20811417821F0006E188 ; MKBv9/BD+/FindVUK 0.92 -0x43DB5C627EFB0DC4C93F0E254BAC3A9695104068 = SIDEWAYS (Sideways) | V | 0xA708C03B11B5CEFE91FCD464AC153803 ; MKBv9/BD+/FindVUK 1.02 -0x3D1B2004B5A2CB3D4CAC263BD7D27FD9DF8A5880 = SIDEWAYS_F2 | V | 0xA93DA958FF93B4C1F1BE3455E58B7018 -0x7C3BF9264004FAE4D8C905C5A785570C275C7B75 = SIDEWAYS_F2 | V | 0x43CAFC5BECDE2EDFAA139320400B3B5F -0xA59617F83B24002C416B3DF0CFE3CEC72313EC42 = SIE NANNTEN IHN MUECKE (Sie nannten ihn | V | 0xF04373C7092E12BC281FFB01BE4C0639 ; MKBv54/FindVUK 1.00 -0xD5374923C04CAEDAD6C6A1583E59055E68125F9D = SIEGFRIED | V | 0x61657069856100A9A1139861434D0CE6 -0x3B0E0792BB28420682B70584B99C3FA84E710EA2 = SIEGFRIED | V | 0xAEE6B94094895C8DE4EF50F0230D5013 -0xFF45ECAAB46256A049C888E5EFF88778DE82B317 = SIGNAL (The Signal - Blu-ray???) | V | 0x5249DCA31303DE3538C82E72B93D1D21 ; MKBv6/FindVUK 0.84 -0x7FCD9C821A881F5074FF7379E539152DCD1798AD = Signs | V | 0xA96B15A9D73997F3D82C91081453F3DB -0x44C61E194410DA7242CB21BAB57587E65F5E0AAB = SIGUR_ROS_INNI (Sigur Ros: INNI) | V | 0x0984A1E787B8F4E815AA4934C3D32803 ; MKBv26/FindVUK 1.00 -0x9747B22A46FB637CCBB688BF9A87BF0726FF2F4B = SILBERNEN_LOEWEN (Karl May - Im Reiche d | V | 0xA45BDFEB9A759C4D8C8205156DA1CF0A ; MKBv47/FindVUK 0.96 -0x48EBACF49CE57B7A634EEC19B722A1094C41EA23 = Silemce Of The Lambs | V | 0xFF6D297663E3F548B74020276FEA3367 -0x86E9336BC9C77F75BDB0A1F6F021673630361DF3 = SILENCE_OF_LAMBS_F1 | V | 0x93386056F96CE269EED6BDD520610D9A ; MKBv12/BD+/FindVUK 1.00 -0xB46BB6397CD87AC67423A6C776C8CB290D17F6AE = SILENCE_OF_LAMBS_F2 | V | 0xE09733847AA3BE191B40C59DA9333311 -0x0E34E597492A4A65D679F37E9D71D028D8E8FD1E = SILENCE_OF_LAMBS_SE (The Silence of the | V | 0x18F6DA2DE9BA67D5FA21D8CA79B63D57 ; MKBv10/BD+/FindVUK 0.96 -0x469E379E4D99C9B91B2E600A850EF2215EBA1D1E = SILENT HILL | V | 0xF299676C2F694D4615957F5929D35511 ; MKBv3/FindVUK 0.96 -0x2917CAB3723C6BB0B199F374878D887776E73815 = Silent Hill | V | 0x27864162592809CA56D2F8209228F9ED -0x3F8AAEFD0B47BF29AA1A82B502C70B13A5B7626E = Silent Hill (UK) | V | 0xD7C7FDF806DF197E3FAC16A6728C8C06 -0x6F212DFE912478A2FB54CE92876F9A971E0A07B3 = SILENT_MOVIE (Silent Movie - Blu-rayâ„¢) | V | 0x30084ED7FEC360D0ABD651C095E9204F ; MKBv12/BD+/FindVUK 1.00 -0xF92BE93FAFCAB51F79D3057102E36F08884C8563 = SILICON_VALLEY_S1_DISC1 (Silicon Valley | V | 0x97D48E93CBA75DF8366E030350F12FFF ; MKBv50/FindVUK 1.00 -0x531886A429CE811B571AB4DF30E96FB07954E81B = SILICON_VALLEY_S1_DISC2 (Silicon Valley | V | 0x7EB77116E95E0F49179109814EC1D581 ; MKBv50/FindVUK 1.00 -0xDB5ED97C26A36B3BFCC17251F6EB9004A3EB2D46 = SILICON_VALLEY_S2_DISC1 (Silicon Valley | V | 0xBCD667177ECFE92CABD0251279E68C58 ; MKBv57/FindVUK 1.00 -0x4340E1FC8FEFA47247BFD771370516587DD76E7C = SILICON_VALLEY_S2_DISC2 (Silicon Valley | V | 0xC2F3B266A23C71B3F0A7A3554451ABBD ; MKBv57/FindVUK 1.00 -0x0C9F34134FBC0D64FEC8EBAD8D6980099E23B5B0 = SILICON_VALLEY_S3_DISC1 (Silicon Valley | V | 0x9849C89BF3AB9996549EF69E6DD75441 ; MKBv62/FindVUK 1.00 -0x0A28EA8A4D0662A0A7F3A8A1F4B3B9209FE257F1 = SILICON_VALLEY_S3_DISC2 (Silicon Valley | V | 0x116CF66AC78140CDECBFF6C428AE5071 ; MKBv62/FindVUK 1.00 -0x810901885C665B032E5613D1EA68F632F3761E32 = Silver Linings Playbook (Silver Linings | V | 0x36F2D2CF055B17D18BFB7DD8CF0E855F ; MKBv38/FindVUK 0.98 -0x98AE727017C813EB59FAE7E8333D574EB5E37CF1 = Silver Linings Playbook (Silver Linings | V | 0x23B4ECD600D5877CEB2DC4E57F089C1E ; MKBv40/FindVUK 0.98 -0x5FBF85C4EF03D0134B964A602CFDAD13DD67A8FF = SILVERADO | V | 0xC13A2D66913B01F901ECD883B7436249 -0xD5DC3AF3300B305C04D1254456F73F4C853C2A89 = SILVER_LININGS | V | 0x4789480F87F867899D9D95D69896F292 ; MKBv40/FindVUK 0.80 -0x6BF2154BAA29BBF02A5CBC631B5FFE3EF6FD0985 = SILVER_LININGS_PLAYBOOK (Silver Linings | V | 0x4C8F8555F5258DC1C3BAFF362C26CF0A ; MKBv36/FindVUK 0.96 -0xC1B6453418D28C3F42F0980A8CBCED67C5E796DB = Simpsons | V | 0x8F64CCB3A193B6F0430CA1FD94DF749A -0x704DC40295374F2450A675E2ADC7F54D33FC203A = SIMPSONS_MOVIE_F2 | V | 0xF169EF38CE36B19E63B060788C1F2C8D ; MKBv4/BD+/FindVUK 0.98 -0x4EE596158535CDF323D95D6EF863F92649830B44 = SIMPSONS_S13_D1 | V | 0x4BB0F7B5AFC6D75BA356FFF7E4CA0F6B -0xB730F32EEF63EE229B04C125E679282753253B83 = SIMPSONS_S13_D1 | V | 0xD8854BA3B6EBB04838013F3A39D81A4B -0x11313DE3D4522F4047E576B6F4CDB96CECF1DB2E = SIMPSONS_S20_D1 | V | 0x3A92483FFDCFE974C65387E468EE899A -0x371AA51565003F4CB73E623D1A1F261AF5FAFE50 = SIN CITY | V | 0x242C005A43EC0F6944EB8CBEA9FC4712 -0xE3229554F008FD8F6BCCA6D0FE29583BD738D849 = SIN CITY | V | 0x936574FA76A0918E5A06C033A6EC6223 ; MKBv9/FindVUK 1.00 -0xF98FC8FA5B89872D448A39DB6E26C9B5A6BEE265 = Sin city (FR) | V | 0xF6103E00D4BE545E1311FE0DC501FB34 -0xA164DE2F9710D60E74CB87806B4D396BAD86387C = Sin City 2 - A Dame to Kill | V | 0x5DBF2C55BEAF6DF7F79A590E9A3526DA -0x09092D69DEB2CC41A5444A17B61962838394A927 = SIN CITY 2 3D (Sin City 2 - A Dame to Ki | V | 0xBEDDA698EC2C833A8A666F58E0935942 ; MKBv51/FindVUK 1.02 -0x999FA523B730D6FD8497E170461207D3CED80D4B = SIN CITY A DAME TO KILL FOR (Sin City - | V | 0x52B148673D49C3A991AD9265BB15F34C ; MKBv49/FindVUK 1.00 -0x063E2478B707A9010F4E6E5DBE342964B07232C2 = Sin City: Recut | V | 0xDF97AB5C39CD2A58A6AF6AEA0CA42390 -0x7F5BF7C5539335B94575F6553E579ED6B5C36F96 = SINCITY2 | V | 0xD5FD3D84F7A51628AB6883144E10B2B9 ; MKBv49/FindVUK 0.65 -0x4AEBC1E8A2C357600230AAE7524C10E2D58E88B4 = SING STREET (Sing Street) | V | 0xDA2ADBA40D8B416D09170FBA6519BD93 ; MKBv61/FindVUK 1.02 -0x486A19585B9B6BCF645412B7A7C58C7557C035A5 = SING_NA (Sing) | V | 0xCC4848283BD634BB6F723C8C6BF7CBDF ; MKBv57/FindVUK 1.02 -0x202C635D0832C155E2F7BBA8EC1D767AA64966F6 = SING_UPB2 (Sing) | V | 0xDF61BBFF80DCDF1E303C0DCBA92EC82F ; MKBv58/FindVUK 1.00 -0xA9744F6AB83B8DA980E1BAA988021C4A2964ED53 = SINISTER | V | 0xD429587C893DD881A4DD7C8FD1B4CE37 ; MKBrev 39 - FindVUK 0.57 -0x513D4F00B34CC74D5C29CB198999F035990F23EF = SINISTER (Sinister - Blu-ray™) | V | 0x506C0A72C35EC839F2DDB47B1ED2C758 ; MKBv35/FindVUK 0.99 -0xC4A27DB3C46639B2D0BB2172812C0EEBFF452538 = SINISTER (Sinister) | V | 0x88F738791FBF39CA0132CDE4AF413AC2 ; MKBv37/FindVUK 0.98 -0x3C73D7F9C5D90C40715984770A9988D4E2CEF13D = SINISTER_2 (Sinister 2) | V | 0xBF2F07008CD002E06F529BAA9AEA7768 ; MKBv57/FindVUK 0.98 -0xDD8FFEC83518D747C9F7B6FA850CFF0965F4238A = SIN_CITY_2_A_DAME_TO_KILL_FOR (Sin City | V | 0x809F39BF575B8E3790CBD25A174A436D ; MKBv49/FindVUK 1.00 -0x359993A6C464E9CEC6520AB96F960F1828EAE7CF = SIN_CITY_A_DAME_TO_KILL_FOR_3D (Sin City | V | 0x9CE07CB3534D1836C9A3C0F2627AB576 ; MKBv49/FindVUK 0.84 -0x472B542A7C9D01350DBD5C00869F65A324C31EDE = SIN_CITY_BD (Sin City) | V | 0xE3B710DC921E29ACAED130674E574CE5 ; MKBv23/FindVUK 0.96 -0x92C04A17FC8226A5BA0BE5844BBE19402F218A1B = SIN_CITY_BD2 | V | 0x47785C87C89DE7A463B651D557DB54B3 -0x650C74CBEC59121764AD0135ECF52E38DBA01F6B = SIN_CITY_D1 | V | 0xB96152563B7E2228848DC2B97CF28F53 -0xFB28F2EB874348F4CD79EB58FEB70A8316DD651C = SIN_CITY_D1 (Sin City (Disc 1) - Blu-ray | V | 0x1ECF9EAF10A0CE4ED0E7264B6B959080 ; MKBv10/FindVUK 1.00 -0x69581FA4FAD650950BFBEC1B9C2B9B8982FE1D1A = Sione's 2: Unfinished Business | V | 0xF319FCEA8A87208B21902792447E7BCD -0xC69C46AE8AAEBB2CADEA785B0C433A9ECAC80E30 = SISTERHOOD_2_BD02 | V | 0x507271750EFDAF713A82C9FD91E45C1C -0xD084869E2447B37109C99429545F5A05651124ED = SISTERS_RENTAL (Sisters) | V | 0x6DAF54346EF2B7F3F075249623B44A42 ; MKBv56/FindVUK 0.94 -0x31A687EDB84D19951265135B66510E145AC464BE = SIX_FIVE_SPECIAL | V | 0x6D9E01C87D93543048F64E5B2F9AB7F9 ; MKBv51/FindVUK 0.80 -0x73330D9B310F31999201584DC2567F86C795ADE3 = SIX_MILLION_PEOPLE_TO_FEED | V | 0x595F316F0E39801BE7D80F278FB24F9A -0x785FCCBD17F1B7C0E7FFE15B9BB8B75C26F13B53 = SKELETON_KEY_G51 (The Skeleton Key) | V | 0xEAB895941ABC54951CCF4B1E256B0BA7 ; MKBv17/FindVUK 0.95 -0xFC45AE7DFCE18444342ACA9710A13177A430AEA5 = SKINWALKERS_VOLUME_ID | V | 0x9E0C8B658014BCD1C706BA491A162574 -0x04E2156C109FEB3A36251A87B4CEB8A27E677628 = Sky Captain and the World of Tomorrow | V | 0xE310E516A576956845676431E688CAAF -0xF6FC0223565FE2D63BB7ABDFED24DC2800A0C328 = Sky High | V | 0x48627100CADBB7A1FB47163A740F195C -0x66F6673A2FAEBF45E86742DEAB9FF7B663718C93 = SkyCrawlers | V | 0xAA1543470B4609C0B46FBA816340D308 ; mkbv17 -0x49D8D618DB50CCE992D24D05B93856DAE27C8600 = Skyfall (Skyfall) | V | 0xA75D6DB1F41B5996F8B6D503748D96F6 ; MKBv35/BD+/FindVUK 0.84 -0x5DD8CA0A287C6DDB7969858D4C2DD713FA5B9939 = Skyfall (Skyfall) | V | 0xFB082859DEAC986C008B39A67ED95881 ; MKBv35/BD+/FindVUK 0.96 -0x1E6F8E88E34074855E2DDE3F328187D8FD7B414C = Skyfall (Skyfall) | V | 0x1842FB9088313C7B25C8C624B8754067 ; MKBv35/BD+/FindVUK 0.99 -0xB8225C7621C5680E51EE881DF74B4EA15A314A17 = Skyfall (Skyfall) | V | 0x307FFF52D624159377457E6B95ED4421 ; MKBv35/BD+/FindVUK 0.84 -0xB8966FB2D1DDDB76647BF7295F7AA823B6B6997D = Skyfall (Skyfall) | V | 0xCCB349C035BEE0B5D2D2115F2D770FF5 ; MKBv35/BD+/FindVUK 1.00 -0xDD1978D1D53B2D5A2EE3CC83E34DE69BE0816900 = Skyfall (Skyfall) | V | 0xAB1B18C22B9155EC9E4812115EA5162E ; MKBv35/BD+/FindVUK 0.92 -0x795671E6C353CAA7674A95C2304C7C4E543F03F9 = SKYHD042 | V | 0x048BAB84290FE68642834427A4E894A2 -0xD7D955AC7D3428CC8D02FA4D7047C9D64027E5BA = SKYLINE (SKYLINE) | V | 0x537A0CF4E07249472D0406011F49F120 ; MKBv21/FindVUK 0.84 -0xCB796CB7974CFE325A42B830818FBC97D4835B24 = SKYLINE_V1_UNIVERSAL | V | 0xC3F4CC477956EAC9213AAADE063CB0F8 ; MKBv21/FindVUK 0.96 -0x12E5787C6B703DF4CC3299E775887821D0FE42E7 = SKY_HIGH | V | 0x4A4DB69043119A47DCDAC2D3D51D6E7F -0x1AB15B197B24422C84F19B63E243FEF342749026 = SLAYERS | V | 0xFF8F9B227374D4DA76F81CA47E2E3BD7 ; MKBv62/FindVUK 1.02 -0x18D62AE616EAE6CEC26A77C179DBC10A6543304B = SLAYERS | V | 0x23A1C0CA08276056FF0590123C115460 ; MKBv62/FindVUK 1.02 -0x18DAA812EA03D96A7936F56B7DFE76CAC32B42EA = Sleeping Beauty | V | 0x86FD67A73D987A5780B29AF952CD2DB6 -0x60911914A15F8E4FCD26AC9F52C90B1650AFA3D0 = SLEEPING BEAUTY | V | 0x5888C2D9432F1586A00FDC1453D5DCDA -0xA827167B96A001C83F408A2C118AA9710DB0D28D = Sleeping Beauty Disc 1 | V | 0x119AE9C321A3D3D8B6FB62EA9AB27353 -0xC75A58DE341843DF99E277DF9025C03AE1A02ADD = Sleeping Beauty Disc 2 | V | 0x61F0B9C1D496CE0F8BE3C5473972D743 -0x7CAD696533FA2E7BBF7413AD013AE7E6E3B70715 = SLEEPINGBEAUTY_D1_FRA | V | 0x401FCC5DC37CB21ABB097448B779FBBA -0x17E4C5422E609902EF9E7770A47D7C49A9A19BAB = SLEEPINGBEAUTY_D1_GBR | V | 0x84CFD3F33A92EB29CADC6BF47F0A54E8 -0x4B86DF8E7CA114BD49B7E7577F53C1A7069FDBC7 = SLEEPINGBEAUTY_D1_GBR (Sleeping Beauty D | V | 0xDD1C232EA1E9ABB87723C709C2509A19 ; MKBv8/FindVUK 0.94 -0x0E722ED76A2FA0EA4CFE5705497F477DEB0A00DB = SLEEPINGBEAUTY_D1_GBR (Sleeping Beauty D | V | 0x02EC7557026206627719FE31960E1B56 ; MKBv8/FindVUK 0.94 -0xC8F6759D121990AC9A239206B82708F2F0622081 = SLEEPINGBEAUTY_D2_GBR (Sleeping Beauty D | V | 0x3EBA9EB64100E6FCE6A1818F6DAEE280 ; MKBv8/FindVUK 0.94 -0x31134176A3A861EE28779C84A24DAFF6EDBDCA11 = SLEEPINGBEAUTY_D2_GBR (Sleeping Beauty D | V | 0x2893F8C46255D9AC9B9B31C3568303AA ; MKBv9/FindVUK 0.96 -0xAEB16FA0730F78DDAA6846CF27EF32D3BCEA7EFA = SLEEPING_BEAUTY (Sleeping Beauty Diamond | V | 0x586BA1FC7305FA27EA3DEC91F5C9BD91 ; MKBv46/FindVUK 0.92 -0x6CF3F24BD032CCEBAE1BC13F4755925B029FF70D = Sleepy Hollow (US) first edition | V | 0x156710589848E3149BD373CFE030A499 -0x10A0B1C13F45F091584DD885F057C395815C4457 = SLEEPY_HOLLOW | V | 0x11402D045F08093D8C0E959B7E4504FD -0xF058B750090A3C73809F8576618AA86BB568F89B = SLEEPY_HOLLOW | V | 0x073EFFBEB285D3804EC8B5CA1616C77B -0x8A0407514F03220658D8A945694C808B38ABFFF5 = Sleuth | V | 0xEC4B44BEC2E56444BB75B54373D70D29 -0x78215485B8AB95F020E0E75BB1E9CE155B58E0B3 = SLOW HEAT | V | 0x7D37F23C04AA09FA32EBEEDF55628A88 -0xD67A5A4866B19C6F3BD8616E4E8CFAC729DD35C5 = Slumdog Millionaire | V | 0x506F2DAC9C4425DC859727166036DFFC -0xDDFF9AF0B9D9FEC3F778B1814F1D60B14CCE921D = SLUMDOG MILLIONAIRE BENELUX | V | 0x588D3A76ACD3EBFE1BE612D5B5ABB7A2 -0x971838D270434E8A47E4285A442510C97881E455 = SLUMDOGMILLIONAIRE | V | 0x0294A84A798485465DED6156BAF2BEBB -0x86BD969A6C83D530D0A55E24B85A5B3EF9C61976 = SLUMDOG_MILLIONAER | V | 0xA131358D249CD0F7A78C0D2B71BCCF9B -0x50A7BA4445D517FADF41DE0F8FA15EBB8DCB3861 = SLUMDOG_MILLIONAER (Slumdog Million??r) | V | 0x6439FE112359D4B0E860415FFA244C34 ; MKBv26/FindVUK 0.96 -0x70677D696B21A6D2CF5B59D2A0F99F4282B40A68 = SLUMDOG_MILLIONAIRE | V | 0xD558B19DA43689CF04DABEF145B947FB -0x95194D292E3508CC9F43EC11773083DD3A2BC0AB = SLUMDOG_MILLIONAIRE | V | 0x2519ADC7526A3086DD070D0F2A22732C -0xFCADEADC33CFCA904F6E727693B7BE7855741C44 = SLUMDOG_MILLIONAIRE | V | 0x98638AD6C6BF16197ABC99BDFEA49638 -0x3BFC66CB7AA8AE989533D5A950C3BE8B7AF3A0C7 = Slut Puppies 3 | V | 0x016D5AF2BA998E0B49DAA2048DA3AB15 -0x817ABA3618B715497EEF8B4E5D6C886FA4929761 = Smallville Season 6 Disk 1 | V | 0xA28C3B24C5D6A40412DA79AC5D671FE7 -0x31E708D3E9AD2EF51A12A2C5A35FCD319D33A314 = Smallville Season 6 Disk 2 | V | 0x9E4E24F7584C3EDEE1AADF21A5EC2BCD -0x092E8102E1FB53335F8D601C2DAA1671807A497F = Smallville Season 6 Disk 3 | V | 0x42C52D111042FC6D0ACAB57385A54433 -0x91539287A77C283575825FCBDE2524722DB7941D = Smallville Season 6 Disk 4 | V | 0x2442459ACE8CAC31933B1163398DB8D2 -0x489F43FA997B470BFE7011BE3DBC3B833D541193 = SMALLVILLE_S10_D1 | V | 0x2BDC7C16FF403C2E641E70864710C9E6 ; MKBv23/FindVUK 0.80 -0x5E0BAA60F694F3D2040C746CB4675226B346BB49 = SMALLVILLE_S10_D1 (Smallville Season 10 | V | 0xC55638CD35BF112F9D9E81B84A95A2C5 ; MKBv23/FindVUK 1.02 -0x35DAFB4F94999C0173DD0EA466E83C9E124E7671 = SMALLVILLE_S10_D2 | V | 0xF7019C0F68DE2612D5E8554BA59E85BF ; MKBv23/FindVUK 0.80 -0x46E674A6B27C72CB52B9D460CEB996B25EB4112A = SMALLVILLE_S10_D2 (Smallville Season 10 | V | 0xA7570751781789C18B5E916585319641 ; MKBv23/FindVUK 1.02 -0xF8935B46085F16FF02A9EDE15F6690CAC366BF16 = SMALLVILLE_S10_D3 | V | 0x30AE7A90C8125B8CC472C33EE1EAE766 ; MKBv23/FindVUK 0.80 -0x0F788BDCB7BB2E157648223F414F2E4CB4014BA2 = SMALLVILLE_S10_D3 (Smallville Season 10 | V | 0x38A22DF3FD914F577A4E1614BC3F37F9 ; MKBv23/FindVUK 1.02 -0xBF1F6D309A2A32B6068BAB75455DAD6DF0557CF9 = SMALLVILLE_S10_D4 | V | 0xB17DA7B195ACB2974C483CB0A0738384 ; MKBv20/FindVUK 0.80 -0xC85DCC4BC0D2A04D2FF5836B3FCBDFC4182B5393 = SMALLVILLE_S10_D4 (Smallville Season 10 | V | 0x16B2ABF6C720BCC81E3E61E52A77D019 ; MKBv20/FindVUK 1.02 -0xAB8AECF51E7B91B0BDB5C7331930D41CF68548D0 = SMALLVILLE_S6_D1 | V | 0x07A740485734A6AF07A8B5B767D291E8 ; MKBv3/FindVUK 1.02 -0xDA2B1EBB060B834262587500CC4309CD10557991 = SMALLVILLE_S6_D2 | V | 0x3DEC962CDD4A2083773ED388CD3CAB99 ; MKBv3/FindVUK 1.02 -0xFCB102FE101D35E98EAF5790B42CB846590B80AE = SMALLVILLE_S6_D3 | V | 0x39F2D6CD2951F6C8E2EF4E2CB907B678 ; MKBv3/FindVUK 1.02 -0x740CD1095238F9F7509335D0F75C8149D22D458D = SMALLVILLE_S6_D4 | V | 0xC0FD4ECE2EE05BEEA414B06440D0A489 ; MKBv3/FindVUK 1.02 -0xFB95C3F04602C47B444EF8255BFB279FBFCDD359 = SMALLVILLE_S7_D1_NA | V | 0xD1D99E0C6776B046530C9A1F6DDB74FB ; MKBv7/FindVUK 1.02 -0xCBDCC8661307CA12009F45C606FFFEA571FB2693 = SMALLVILLE_S7_D1_NA | V | 0x4F40DE57F99877D339C496B695E2DE6B -0x0406A224A9C0A47496FF624A532892813DE87D22 = SMALLVILLE_S7_D2_NA | V | 0x1EC68C4974693845753FB318FCE23CC3 ; MKBv7/FindVUK 1.02 -0x481DCA8CECD24A824B92BFEF80ACAE6119B291CB = SMALLVILLE_S7_D2_NA | V | 0xEED698CB3653E89571A029348F618143 -0x7357EA27B65C337AB2E647AD99398AE5A327587A = SMALLVILLE_S7_D2_NA | V | 0x22898E7BB1332E3CA697F2E6A9194A4A ; MKBv7/FindVUK 1.02 -0xF2E6710351DED013AB52A2180EE0320E2319E379 = SMALLVILLE_S7_D2_NA | V | 0xEBD242DB506CA6961CF9C66E7DEA7E79 -0xA44C25528E23F85346A4A2EF66416C9479A29DAE = SMALLVILLE_S8_DISC1 | V | 0xE563FA25642C0989A6E25A136EE81FF5 -0x8A4099EAC7ACAFC9D86ECB8C867E22D41A0EAE4D = SMALLVILLE_S8_DISC1 (Smallville Season 8 | V | 0x4BB1FB77B425D59E1C2FB526DB35A2BF ; MKBv12/FindVUK 1.02 -0xB41869A34A4519F0E8ACF7DAEC979D107ECD9624 = SMALLVILLE_S8_DISC2 | V | 0x826E54A084EB8A36C7BD1506EF103754 -0x8628BAC39556B9F2BE98ECBAD636DAAD50780CFE = SMALLVILLE_S8_DISC2 | V | 0xC3B26086177F924D0DB820E04A77D41B -0xF40AA65DEB78110C376A88E2AB8E7E1CA7C7C1BE = SMALLVILLE_S8_DISC2 (Smallville Season 8 | V | 0x0550AD84F5393944F954DA35A8AB7F76 ; MKBv12/FindVUK 1.02 -0x2F88F3DB8AE3EC5243C242BC8B4DEC592BC7BFFC = SMALLVILLE_S8_DISC3 | V | 0x586724F019CF9D1A5AA15522391DE4CF -0x085197FE50AD88308653164F6941E5920A6D07D3 = SMALLVILLE_S8_DISC3 | V | 0x7E8969C4E41C56827DD4B7B1522A95A3 -0x7726B1B997F6D3437E56323263DFDF311B1390CA = SMALLVILLE_S8_DISC3 (Smallville Season 8 | V | 0x1C4EA82F321D65820CFFC26F44A34B66 ; MKBv12/FindVUK 1.02 -0x7852249F43C2CDC997A9E644F098BB4661DEC6F2 = SMALLVILLE_S8_DISC4 | V | 0x2B967FBDD52AFC9B7FE71C7559337341 -0x63D75D179A39C7B6EBCAE018FEEE231FC63B9E67 = SMALLVILLE_S8_DISC4 (Smallville Season 8 | V | 0xBFA91839D3A5E571B67E9A009B9B1B20 ; MKBv12/FindVUK 1.02 -0x784749B9E18CFF1964FFAEB52F5F90EC3CEE3695 = SMALLVILLE_S9_DISC1 (Smallville Season 9 | V | 0x897568F99879EF84936071FC487DF171 ; MKBv17/FindVUK 1.02 -0x173498B1E8D27F478E8F01A3602E4196AD7F8E21 = SMALLVILLE_S9_DISC2 (Smallville Season 9 | V | 0xB23CCBA4B464949F1BEF08941EAB76F9 ; MKBv17/FindVUK 1.02 -0xC520E4E837BD38A32E513F067B293CABA65FBA1C = SMALLVILLE_S9_DISC3 (Smallville Season 9 | V | 0x5FA7058516C858C5DB718642A6DBD7ED ; MKBv17/FindVUK 1.02 -0x79CCB0204A700054F8C8ECEA992C1DCD2E4AFD8E = SMALLVILLE_S9_DISC4 (Smallville Season 9 | V | 0x5B4C488C79761BA4E33F7665A2EB6673 ; MKBv17/FindVUK 1.02 -0xE31847052D6F6772BA5F2ABB9058BF9B96E9D9A8 = SMARAGDGRUEN (SMARAGDGRUEN) | V | 0x4D765F16C665043CB799F12873A2FC00 ; MKBv62/FindVUK 1.00 -0xA60C52BD7F175B4C34CCA00A99FB21520AD8E846 = SMOKEY_AND_BANDIT_G51 (Smokey and the Ba | V | 0x6D031BE6220CA1BAB3906F71BEBEEF84 ; MKBv19/FindVUK 0.89 -0x663316C5DD3002D714C9F8037BF76566BF8432BD = SMOKINACES_G51 (Smokin' Aces) | V | 0xA4A8F5038E83D39358D1A17B7F4BF79D ; MKBv15/FindVUK 0.94 -0xA026CBAA333B3BEB4D99317F5613E20FE96AC632 = SMOKIN_ACES | V | 0x59141FE7994C263645D7C2A0EFDC5C02 -0x1EBDB88B402F0C950EF6BD7FD16CB00B0B1BEF94 = SMOKIN_ACES_2 | V | 0xD40633FE37A5F8C920BE2A8EA879A110 -0x697307B6C14BC8B88C97F060192FC81CA8C60DB1 = SMOKIN_ACES_2 | V | 0x80FE9BCEC3687890D22F4E55B8729130 ; mkbv16 -0x5DE8396AF3B244556088EC068DF3E51B839E7E90 = SMURFS_3D (Smurfs, The - 3-D Blu-ray???) | V | 0xDA0E54355D58F12BBDAA2D900CA4E2C6 ; MKBv25/FindVUK 0.87 -0x2CF78418A2BBE8AF8672EDFDBEEBF874A5F78508 = SNAFU BD-1 | V | 0x484DCD98F47708DD891E01B2DAC3E7CB ; MKBv53/FindVUK 0.86.3 -0xDA5BDAE82EEFF4C5BF3881A806860299CF5654EA = SNAFU BD-2 | V | 0xCAD3473870B09EC761D31334752E89D5 ; MKBv53/FindVUK 0.86.3 -0x088C63D13A146F1643178C6214329C26F0294D34 = SNAFU Too BD-1 | V | 0x346DE06223A3F9D46DCAD10C00EC8B3A ; MKBv62/FindVUK 1.00 -0x83960CE2F68E78D454ED1154BC75C90A7978F656 = SnafuTooBD-2 | V | 0xF5226B418F121CAD01E060DB7EB8D10E ; MKBv62/FindVUK 1.00 -0x9FAF8BDD2463CE1E0801811872C62AE50B4FC44A = SNAKE_EYES (Snake Eyes) | V | 0x4EB4C39CA9AC6C62D35C0B4F05C50524 ; MKBv36/FindVUK 0.98 -0xEACC858DD9FF544FFB0CCBE8DD01BF06A7E1B51B = SNATCH | V | 0xF6E72E6C88F68D3670D42A255E4AE17D -0xBAAE46C9A57AA17A7DC3B6142A69C098EFAD318F = SNATCH (ESP) | V | 0xCFFB0BBD5598FCC7084DC8C6103850F4 ; mkbv14 -0x7F6DF14FC412FE29C8FF013DB26465A2F3DD30CD = SNATCH (Snatch - Blu-rayâ„¢) | V | 0x366F7101137356054B187EA10DC4FD56 ; MKBv14/FindVUK 0.98 -0x4F29E5C627646C0FA986032E7E20FB80F7FF79A1 = SNITCH | V | 0xE1A1FEFCA5403D81B9CBC96891E758EA ; MKBrev 39 - FindVUK 0.62 -0xD7BC1D6AA0BCA26274850A0C9A355FBA083B2F40 = Snow White | V | 0x9EEE6A5086B774892C8A834F55B83563 -0x97921BB4EBB6EFF17B623F45493C74136D710EA7 = SNOW WHITE AND THE HUNTSMAN (DE) | V | 0x3AA93309DF5A42416B1C154463EA2987 -0x40E5E73B5744BAD8D1D041449DD1882D172E78F5 = SNOWDEN | V | 0x25EFD77605182FAD3D558B8FAA4FFEAF ; MKBv62/FindVUK 1.00 -0x965CBCAF8E463AB20ECDDB16E0AA2C354531DC01 = SNOWDEN (Snowden) | V | 0xFFB7D19071F67997D2F1A813541C9E20 ; MKBv62/FindVUK 1.00 -0x85AFB9E5E411FCF60F9C79EDF1EEAC2F60B87154 = SNOWPIERCER | V | 0x3DF0C4AA7299F7BCEBCDC49FEDF1C477 -0x0B647B8267527E7B0F129FC40ECA22E184EDDE80 = SNOWPIERCER (Snowpiercer) | V | 0xE18D8DE7AF5E3DD30A06726264B44FD4 ; MKBv47/FindVUK 0.98 -0xA77972A23887E9B2F1A2B5A92A24B8AD0F572509 = SNOWWHITED1BRANEW | V | 0xE104ED522026E4CB89AE9A686120A045 -0x1AB59121D0CB75F295920CE2FCD8982751886F55 = SNOWWHITED1FRA (Snow White: Diamond Edit | V | 0x9AA78F4AC0E3B6AFA319BB6D664417A9 ; MKBv14/FindVUK 0.96 -0xAB2D7ACC67DB715849BA599A91F35903100A9138 = SNOW_WHITE_2014 (Snow White And The Seve | V | 0xEF29CDD81BC83BFF0E92704F296480E4 ; MKBv35/FindVUK 0.92 -0x3F16E47766D872C34A0081FBF33C4B641ED9D348 = SNOW_WHITE_2016 (Snow White And The Seve | V | 0x8F2D707935456B89EB4E4ECD110EF2DD ; MKBv56/FindVUK 0.92 -0xE5019DB858FD636D37848835FC481E29C2104133 = SNOW_WHITE_D1_GBR | V | 0x5DF81ED5B20871DFE475B395E604BC3C -0x53FE364BF1B694118939B8E5E115BF5721FECCF3 = SNOW_WHITE_D2 | V | 0x86EF511BB2634D716FD6320582A265A0 -0x88444664E09F7E17DEE3C61C6CDC5EA35C8D8DBF = SNOW_WHITE_D2 (Snow White: Diamond Editi | V | 0x65087E0FBE31ED14E0CDD7B5327E3918 ; MKBv12/FindVUK 0.92 -0x331C8DD5A3C50B04B6DD4364CC551E367220C707 = SOCIAL_NETWORK_BONUS (Social Network, Th | V | 0x3948AFA5055B0FCAC81D6B765EBDB3D2 ; MKBv19/FindVUK 0.96 -0xD2FFEE81AA930D4C8E18EE369413B0D4D6509B58 = SOCIAL_NETWORK_BONUS (Social Network, Th | V | 0xF86963128345DD10A9876AC5433827CD ; MKBv19/FindVUK 1.00 -0xA75D2D675FAA334F68963C9939AB82CC1634FADF = SOLARMAX | V | 0x5263F6954AD6BBD017FA55E7CEA15408 -0x1C47602E3E64D7254FEB91BE8B64A517D7799346 = SOLAR_SYSTEM_D1 | V | 0xC75E7C3642AA81F60B6F535981F7B282 -0x563FF7471C61D8065A4183760AE86E6EBFD93F42 = SOLAR_SYSTEM_D2 | V | 0x5ABD11E94764C80102C65929F484F39C -0x7880C95DA351AC0BA2560D01C685B4667AD257F5 = Solomon Kane | V | 0xB02A4369E63170C89037F229A8632B11 ; mkbv17 -0x26A709C0DDD1229D3D7FE8838B3756B8787C4549 = SOLO_PER_VENDETTA | V | 0x913AAE3B61C6BD0D7F4301C39AAFB0B5 ; MKBv28/FindVUK 0.84 -0xB0088A8BA93B94BC04C78DA5EE71372B76D49A9D = SOMETHINGABOUTMARYF4 | V | 0x703056CAF803A94D1A17B4FA8108EF3A -0x9FB5A423D5648D5FC8D946BAE7011491FE58D106 = SOME_LIKE_IT_HOT_BD (Some Like It Hot) | V | 0x5E780101CD932FA446F214DDF8C51033 ; MKBv21/BEE/VUKNOTVAL!/FindVUK 0.96 -0xA1A9C90F0E3F00F836437E9DA4F6B649F098E027 = SOME_LIKE_IT_HOT_BD (Some Like It Hot) | V | 0xFDD0D6251BEFFF53CDD30F7EDD7CF290 ; MKBv23/FindVUK 0.90 -0x4C0D8C34813A5F687B968C94AE2E913F2EF44B08 = SON OF RAMBOW | V | 0x29089D949FC5CFBC55A5E13E6BD5A769 ; MKBv7/FindVUK 0.94 -0xA08F6C3372F31FA32E20FF1347FEB485B78332B9 = SON1NNE1 | V | 0xC059ECD6F62E4827E6AB6BA14C18F9B6 -0x92C8FD99D35E83E482F86150F7353D99235E3CEC = SONG FOR MARION | V | 0x5F74317F70D4DCBF114AB087E6A7DE33 ; MKBv42/FindVUK 0.80 -0xE4A86D3B06979BFBEF3D573F321EB3162F8DBF47 = SONIC_HIGHWAYS_DISC1 (Sonic Highways Dis | V | 0x35BF1C010FD19E70F7990D4FE55D90D3 ; MKBv51/FindVUK 1.02 -0x45D7FB6C754BAA7D4490B2114F71B05BDC77E2E2 = SONIC_HIGHWAYS_DISC2 (Sonic Highways Dis | V | 0x038A14B7F5EF8A7751F5BA7C1B1A60DD ; MKBv51/FindVUK 1.02 -0x413FD32452782D857333806BBBB755E167C64C76 = SONNENGOTTES (Die Pyramide des Sonnengot | V | 0x8269EF8FA519EAAF8AE3231802C881CD ; MKBv35/FindVUK 0.96 -0x6EFFC3FA3263B688BD1226F89CB5FDF8A6D6AC3E = SONS_OF_ANARCHY | V | 0x45A5D150E68FDA3848E1F674973AE4F6 -0x6C208A6AA709DB90AACD1C4A83C32847C7C5BA0D = SONS_OF_ANARCHY | V | 0x4C6C5B81467707A110D9A1C66ADC73E6 -0xBA964B28FC42DDF7BDD2BF91D7B7929AF90839DE = SONS_OF_ANARCHY | V | 0xB67259ED42FD38C9A605ECA6050DADC0 -0x59559BB5ABB83B8371FD29505BDB62D7106323EA = SONS_OF_ANARCHY_S2_D1 | V | 0x943F4BC872BC4D6844D2C6046A26D64A -0x9BB9009F72C9DBC6FAE8F5242E9A784A8333CA91 = SONS_OF_ANARCHY_S2_D2 | V | 0x135ED12A662AB912CC892C5E4EFF567E -0xA2DFCA7DBC7349B72792A969E10916B7ED6144E0 = SONS_OF_ANARCHY_S5_D1 (Sons of Anarchy, | V | 0x9EC28FCFE8FFA71ABD2A2F6CD1C9AF37 ; MKBv35/BD+/FindVUK 1.02 -0x1AC65C5EC148550C8F52A2D052C4E56FCEB0D065 = SONS_OF_ANARCHY_S5_D2 (Sons of Anarchy, | V | 0xCFDCDCE6799C10CF85587BA04699FEA6 ; MKBv35/BD+/FindVUK 1.02 -0x926A0FEE6738A870373231404D8C54F961C1F0B1 = SONS_OF_ANARCHY_S5_D3 (Sons of Anarchy, | V | 0x3C741DAEEA02621B9F76A04D36EDB82D ; MKBv31/BD+/FindVUK 1.02 -0xB4FFFD38786C4D48610B07FD373B55C6F0D75887 = SONS_OF_ANARCHY_S6_D1 (Sons of Anarchy, Season 6, Disc 1) | V | 0x63D656DB5D7DBF19E56B480F2D5C2084 ; MKBv47/BEE/VUKNOTVAL!/FindVUK 1.02 -0x5BB77CF8AB010CB6311DBD60A3A25CF5CF6DE365 = SONS_OF_ANARCHY_S6_D2 (Sons of Anarchy, Season 6, Disc 2) | V | 0x8F654FA60CA853CA6928615041F1FD97 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.02 -0x9A89770BC1876178E8DB896A20D21ACC5154E464 = SONS_OF_ANARCHY_S6_D3 (Sons of Anarchy, Season 6, Disc 3) | V | 0xD5C7BC0F7D4F7742C079E63D8AE050B4 ; MKBv46/BEE/VUKNOTVAL!/FindVUK 1.02 -0x5600BFA420CB5F7EF9D4C86BC5E1185DA46631D2 = SONS_OF_ANARCHY_S6_D4 (Sons of Anarchy, Season 6, Disc 4) | V | 0xFB4D95C392621DBF36ABB458CEF39C9C ; MKBv47/BEE/VUKNOTVAL!/FindVUK 1.02 -0xD05E03EA0E22D7DDA45A9CC27A8F301ABFF148C9 = SONS_OF_ANARCHY_S7_D1 (Sons of Anarchy, Season 7, Disc 1) | V | 0x2BCC163184056F63212A312448408A6A ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.02 -0x9ACE19B90967CEFA377FD206CD3326C7E100BEE1 = SONS_OF_ANARCHY_S7_D2 (Sons of Anarchy, Season 7, Disc 2) | V | 0x919F29C167CC3712E4B1044812DAFEC2 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.02 -0x7BAFE66E6D1E57A5C431F631E5A18CB6329A4E6F = SONS_OF_ANARCHY_S7_D3 (Sons of Anarchy, Season 7, Disc 3) | V | 0x3A19A0888AA6E46DA907AFEFCD75A2D3 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.02 -0x6F1AEBDB49F5E6E840BFDBE85A42A93E5001DD48 = SONS_OF_ANARCHY_S7_D4 (Sons of Anarchy, Season 7, Disc 4) | V | 0xE982D480AAA166EB1B7C429F1EEA3923 ; MKBv46/BEE/VUKNOTVAL!/FindVUK 1.02 -0xB9D33F602C2433A881C0E8A56DC8502F367A0F42 = SONY PS3 | V | 0x434A399A8D8ECF93576347B9DC9F13AE -0x1388CA6735FB6B0424F7953F04FFDD86B49DA05B = SONY_BRAVIA_3D_DEMO | V | 0xB10F4E0E3398B30974F42F596F9AE333 -0x6D08223FD044A97A87DECA1DF5723D5D1440AF5A = SON_OF_BATMAN (Son of Batman) | V | 0xA54C5EFC9E86358634BF497299310D4A ; MKBv46/FindVUK 0.91 -0x0B7B5C19E0F05F232CDDD75A1273F41646EAE528 = SON_OF_BATMAN (Son of Batman) | V | 0x316A7CCAFFDAD6FDBE73B02607C65AE4 ; MKBv46/FindVUK 1.00 -0x9707D3E82626879E871FDA508171BE839E658EFA = SOPHIE_SCHOLL | V | 0xBC5B995707122BB69CBD2A0E639DF98D -0x09A014E31533B976E9C98C5FF0578B03895CF7D4 = SOPRANOS_S1_DISC_1 (The Sopranos Season | V | 0x5DF0B1F842379A7DF8C0A5D3C210CEE8 ; MKBv46/FindVUK 0.96 -0x19E5766C4D239FA0CF7523E6AFB7257B87C6E036 = SOPRANOS_S1_DISC_2 (The Sopranos Season | V | 0xDA7B8797CFF67CF802BE31D5D7519C8F ; MKBv46/FindVUK 0.96 -0xE22F23B3E713B479A65C2AA4401D6BE6B53C731F = SOPRANOS_S1_DISC_3 (The Sopranos Season | V | 0xFB9AA0903B7E35199D8A4326EC6EDE30 ; MKBv46/FindVUK 0.96 -0xD6618F6AF4BE5788BE1AAE8E0CB1E9AF043A25EC = SOPRANOS_S1_DISC_4 (The Sopranos Season | V | 0xBE6328F4F693602A1382D28741D1AC92 ; MKBv46/FindVUK 0.96 -0x94EFE43F992844D0DD7DC7F6BE6F9D06E022F431 = soramizu | V | 0x725458DEF371B1B99BC7643A8BC5D8AE -0xB315D991C08CE39016D1D326427F38014377CEA5 = SORCERERS_APPRENTICE (The Sorcerer s App | V | 0x42B75847532D962D94473008319CCBCF ; MKBv19/FindVUK 0.96 -0xC1DD0CBE15023C081AB78DBFB7CB23D4F56D8674 = SORCERESS | V | 0x13DA3166FD885E7DAB45628942AEAA22 ; MKBrev 47 - FindVUK 0.54 -0x97A0C1E75217CB2F53571B46380617E62E591682 = SORORITY ROW | V | 0x5540BA0CA6378B09A76F26D7127B1022 -0x2F5F1C46FD2CE83E1D1FD90A1D4B11361B1F7EDB = SORORITY_ROW | V | 0xE71CBF38E2CB38977E31BBF630354719 -0xEFA363493B4C398EBEC5D7985137A093DE6BC0D1 = Sorte Kugler | V | 0xC5E068AC2EF5C46E08DAA02C567A0AB1 ; mkbv16 -0xC8AB813EE7C9FACCF65A333C40845A76E994C502 = Soul Men | V | 0xE688DDB5B03CB1814CB63141C3F6D31D -0x39385BEB40A49A2944CD216D21AB0A5AD9D1829E = Soulkitchen (Soulkitchen) | V | 0x0CC18FA5C9D72FD52BE78F7F6BFEAFF5 ; MKBv18/FindVUK 1.00 -0x4276CC18774AF97366151E4DBF98A73FF6E2A0EC = SOULMEN | V | 0x8E2CA50BDC72CFE6B23B04295C3F430F -0x5984D8FD2AA372CCD815ABA3790E1AC8568493FB = SOUL_EATER_P1_P2_D1 (Soul Eater Part 1 a | V | 0xA74FC8A5F54382F454C3CCDDD7E34661 ; MKBv21/FindVUK 0.86.3 -0xBD0B6E2FBC5AF22D511E3DE56BD07D23BE02DCD6 = SOUL_EATER_P1_P2_D1 (Soul Eater Part 1 a | V | 0x74474CC15CD068558F80A668295EF6C6 ; MKBv21/FindVUK 1.02 -0x1085CDFBEE8CBCC9277A4E2D4DB05C9F7E83FC05 = SOUL_EATER_P1_P2_D2 (Soul Eater Part 1 a | V | 0x107CE1D4322B4D978A13E55C7E0C18F2 ; MKBv21/FindVUK 0.98 -0x378BE41BA9FAA421EA8993AA10759FE6B9E220A7 = SOUL_EATER_P1_P2_D3 (Soul Eater Part 1 a | V | 0xF3BEA03B88DED626EC1C97735514F667 ; MKBv23/FindVUK 0.86.3 -0x7F296BA4DF75318415C17AA9D06B6209045C0312 = SOUL_EATER_P3_P4_D1 (Soul Eater Part 3 a | V | 0x12594E4CBA4DA9222341EC204FB6143A ; MKBv23/FindVUK 0.86.3 -0xE6900C9196854AEF7C0CE4D9D063686EABD4EF6E = SOUL_EATER_P3_P4_D1 (Soul Eater Part 3 a | V | 0x2CDDDE18DF45C2947EBBAFACC8F3FA6F ; MKBv23/FindVUK 1.02 -0x6B91DED4FB4475B11BFCA7551B96B95B91DD3F6F = SOUL_EATER_P3_P4_D2 (Soul Eater Part 3 a | V | 0xD742875336DE8A997C256465597B4D9E ; MKBv23/FindVUK 1.02 -0x7EE8E2275AB32B993527C41A1E856326F19B14C4 = SOUL_EATER_P3_P4_D2 (Soul Eater Part 3 a | V | 0x6C907460A0C4D22A91E194684C4A12E7 ; MKBv23/FindVUK 0.86.3 -0x8DA8204CE4B6C654EFC56B3B3A611F89E13D0454 = SOUL_EATER_P3_P4_D3 (Soul Eater Part 3 a | V | 0xC80C2CCCE1F3D50F9F9FE7232F320741 ; MKBv47/FindVUK 0.86.3 -0xC243214B9790F1D27F13DCE34703ED711145F146 = SOUL_EATER_P3_P4_D3 (Soul Eater Part 3 a | V | 0xFD528A05D81C6B34C87C01E0B34ED9F8 ; MKBv23/FindVUK 1.02 -0xA8B0662EE25271C404E3430CD05EBA1E86DF6C96 = SOUNDOFTHESKYBD1 (Sound of the Sky BD1) | V | 0x62D06103CB74FC6C2A2C9DED62DAE6EF ; MKBv62/FindVUK 1.00 -0xA330AF00A6D4C3AF8FC89398D05F6B3BF09B3CD2 = SOUNDOFTHESKYBD2 (Sound of the Sky BD2) | V | 0x2D84B9D15DFEEA2281F0F3D14932B64F ; MKBv62/FindVUK 1.00 -0xEF6FD09CF0E3F965E23C4F3BFEA5811BD1EC881E = SOUNDSTAGE_SEAL | V | 0x4AA6924254E1A54329953E3022F5C629 -0xFEAD2B38A0FC252A319A800F2FF8FECE7A7F5166 = SOUNDSTAGE_STEVIE_NICKS | V | 0x5F005B172E4311605FEDC64EA1BB6F1B -0x0AF8BC418078F8913644E1A0831BBAE162AB1E56 = SOUND_EUPHONIUM_MOVIE (劇場版 響け！ユーフォニアム～北宇 | V | 0x5E22A1847C4E92C2B19B6D5D533B0F20 ; MKBv61/FindVUK 1.02 -0x3E1E5CCBF2DDEAE56C7575E63609BFEAA279DF4C = SOUND_OF_MUSIC_D2 (The Sound of Music: D | V | 0xFF4E77AB00E2F1D1C381867B43A00A7C ; MKBv18/FindVUK 0.96 -0x267297FCC89EC79E5D6BE07D170410FB26FBCB63 = SOUND_OF_MUSIC_D2 (The Sound of Music: D | V | 0xBC0B29897B91D705A4BE1BC4F65071F7 ; MKBv18/FindVUK 0.90 -0xC02BD83BA9A00711B32EDDDE45CF76C640248CB5 = SOUND_OF_MUSIC_F2 (The Sound of Music) | V | 0x5B4B329F745DD65DA44092A78774844F ; MKBv18/BD+/FindVUK 0.84 -0xAAD9CF9F9D8B5494FAD0885549D664A9D0B37A57 = SOUND_OF_MUSIC_WW (The Sound of Music) | V | 0xA639CE364770FE101BA185D5A94E6B48 ; MKBv18/BD+/FindVUK 0.90 -0x2964E0251A499F31706DEAD7DE670CA4941491C3 = SOUND_OF_MUSIC_WW (The Sound of Music) | V | 0x179DFC6C967503A159EC7DE714C99105 ; MKBv18/BD+/FindVUK 0.96 -0x168106D53C544B57395FCE6CD3EF8D0B5CC97FA6 = SOURCE_CODE (Source Code Blu-ray???) | V | 0x8141810DCD755C64F38200D2393990EB ; MKBv25/FindVUK 0.96 -0xBF4D58FC8F05B114AE9ADE07DFD98819F6C25838 = SOURCE_CODE (Source Code Blu-ray???) | V | 0x9D638FB39665A51CC7703E47794472F4 ; MKBv25/FindVUK 0.96 -0x60C248114E1C0B6F8FB8D11660DA2F621E94EEF6 = SOURCE_CODE (Source Code) | V | 0x90C4E91FF7B0AA99EC6EC60CBE68E6F3 ; MKBv23/FindVUK 0.96 -0x604890BE8AE053ED997302A7FAC0BCCD0DA6D108 = South Pacific | V | 0xC9B9E972B04C6D51C5DB1020C8BED637 -0xEE089205E411EAA1C1397ECC3999B85195777F53 = South Park - S 12 D 1 | V | 0xA257F8F7D5773DDE0FD086EB2CB1DB62 -0x4CAC15200D8FA8A0A1BEEF0A3178D6EF00F954CF = SOUTHAW | V | 0xC21051FBAD5F8A59B5FCB5337F715F8D ; MKBv57/FindVUK 0.98 -0xE1A32D7BD6943B597B24024208220A78EBD1501F = Southbound - Highway to Hell (Southbound | V | 0x08B8D332896DD2F104644949FFDC2894 ; MKBv61/FindVUK 1.02 -0x4A921D8D9928BD3DF6C4BAB4B93BB5EAE25A0D99 = SOUTHLAND_TALES | V | 0xCF35A0C8F52227D254EB79E1BEDFD004 -0xE38DBD7B58A8D0FBBF4279C1E3540BDA90CA265A = SOUTHLAND_TALES | V | 0xFA9E977021876D892D9E887A769753BF -0xB0EBFD82ADB0FD126BEA01A189DDCEEE9EE07363 = SOUTHPARK12_DISC1 | V | 0x383D95894E685E0B80D30043220EAFEB -0x9ED5A01CBEC9E040BEDD7B8193F13A91441E359E = SOUTHPARK12_DISC2 | V | 0xBEBDCDB6EAD78B8506D458BDAD973CE1 -0x752A5B241FBC675E48F0A92965D800051DC83245 = SOUTHPARK12_DISC3 | V | 0x25AFE5197EE41F89A4E64E9B82CA28BB -0xEB46F500D5DAD7C1C6706146BA1679DA4BFC4366 = SOUTHPAW | V | 0x49DB5CF8C9B6665CB6E21B521F20C69B -0x610D6ED9EE3CA797E64397711D3020A20AD8F1B2 = SOUTH_PACIFIC | V | 0x54A6DA641EAA3516DD8AE5646E24FE56 -0x75CCE889A1BCE99558D8FDBC655D6920F19F65DB = SOUTH_PACIFIC_DISC1 | V | 0x170B7D594615FAEEE334F7D263F0BF1B -0x489E8442F7A0E3C496BF00DC9BAD30007527B0B9 = SOUTH_PACIFIC_DISC2 | V | 0x4215F01EB212A14731531EFB9AF1175E -0x5B9E9E5669E9F528F2A5C74C78678A91371A00D9 = SOUTH_PACIFIC_DISC2 (South Pacific) | V | 0x55A9DB0E363C7C8A079589C6C2ED35AF ; MKBv12/BD+/FindVUK 0.96 -0xEFE097FB475838454A7808EAF567D5CC41FA89D8 = SOUTH_PARK_B_L_UNCUT | V | 0x7555B1AA8E1495EC749DF372E2E2B23E -0x9FF59D50380E8A3778BFC717BB4A6FF56711DAA3 = SOUTH_PARK_B_L_UNCUT (South Park: Bigger | V | 0xC27285013461D1A898AE46217C5F6E32 ; MKBv12/FindVUK 1.02 -0x78062B423111F1AF1877BD4B1C64B37960585781 = SO_I_MARRIED | V | 0x246B04E14DA5CE6A9416412DE6189F9A -0x51A4FBAEC795E5933075037480C23305161A0D7D = SO_WEIT_DIE_FUESSE_TRAGEN_1 | V | 0x29848C199C113D25893F9CFB0ADDAD1C -0xEB307EFD00D470E7F3274B78099222236C3A6EFA = SP0xACEBALLS | V | 0x37BEF3B3C79FE828F09D2C9D55520BD1 -0x680B64F68D128CECA055A1EDE5EB9FC1FF04039D = SP0xEEDF1 | V | 0x2332B590D29C42181E82778FB4E0EB5A -0x06AE35842AE18284DF2F6CBE0BE6843C74C1A0FD = SPACE CHIMPS | V | 0x5AE0B1DAC976D969D0634DB12689C8B0 -0x63AA02F2E73A0B82A58D9CAD07D0FD60B82B495D = SPACE DANDY BD1 | V | 0x1F32481718619A691C6FD703D7FF4FC0 ; MKBv49/FindVUK 0.81 -0xF915CB9B9134C6E055173F9D49507CBC1B1B3992 = SPACE DANDY BD2 | V | 0xE1FC3A4A6FFA48B2F586637E96CE0D25 ; MKBv49/FindVUK 0.81 -0x50262464EA6BA77737F0D87DD513AD8B411E9643 = SPACE DANDY PART1 (SPACE DANDY PART1) | V | 0xBE25340D29537D97B50B7652B5A70102 ; MKBv47/FindVUK 0.96 -0x16940C1872710A0A5A10434A0E1C8826E3D888D1 = SPACE DANDY PART2 (SPACE DANDY PART2) | V | 0x2AE89D9AFA5AD8347F01395E8CBFFC65 ; MKBv47/FindVUK 0.96 -0xE1ED899D957E350DEDD999B24750C93D69141B50 = SPACEBALLS (Spaceballs) | V | 0x39EBA5B0713ED476AAE8EF75D9FEDDC3 ; MKBv12/BD+/FindVUK 1.00 -0x473804134824DD03596588864703E4E8A5EB175F = SPACEBALLS (Spaceballs) | V | 0xFA9C6EEF3526AFDFDE29AC2EA500194D ; MKBv31/BD+/FindVUK 0.96 -0x9B8DB98F66B1406D27DADDA544EA36544690C9CC = SPACEBALLS (Spaceballs) | V | 0xDF7330EDBD92703B3D43878402C90749 ; MKBv12/BD+/FindVUK 0.96 -0xD3DC78D5B9C2EDDD54B9E2C1A093AEDA04B488EB = SPACEBALLS (Spaceballs) | V | 0x60D56AC07D29C1254348FEADEE77C8FC ; MKBv12/BD+/FindVUK 1.02 -0x710F134BD4B49DDFE75F5480506411FA475138DD = SPACE_BATTLESHIP (SPACE BATTLESHIP) | V | 0x68213ACCB33BF5062CEFFCE567236382 ; MKBv20/FindVUK 0.98 -0xCD61DB6826E6129A685BC61C3B7D8096E38495BF = SPACE_BATTLESHIP_YAMATO (SPACE BATTLESHI | V | 0xD673022CBA82617B002A7648EADD7ECC ; MKBv47/FindVUK 0.96 -0xC7C2F57E08C9C96B76BA021CC66AE7AA3F2FE21D = SPACE_CHIMPS | V | 0x5CC1003B21ACACB78F0B9333EDAA8148 -0xEBC09E62EF3999912A9CE1A333B6B3695F2A95B9 = SPACE_JAM_BD01 (Space Jam) | V | 0x51B0F1754EE7651AEEF20AC2D52DF28A ; MKBv19/FindVUK 1.02 -0xFE454E8F37BCAC7608E0952B874E6727F080280C = SPACE_LAUNCH_ALONG_FOR_THE_RID | V | 0xF31A0F7FBA34DE5654E01ED9BA3176E8 -0x0B03C54AB565AF5E7413DD0DCF95EB8691A02D04 = SPACE_PIRATE | V | 0xC610A44114A57ED8F65356A37D0B61AE -0x2B8E2640B7BE66DBEA5567B82B89DFE28D898077 = SPARTACUS | V | 0xDEDA53C26B81155EE234173627994BBC -0x6D1017909BB23DEBB07FC373E9149A94B27B8A84 = SPARTACUS (Spartacus) | V | 0x8CCF7A3178C5F9E96B550481ED124AC1 ; MKBv23/FindVUK 1.00 -0x90A4B955965A35F6F6BDC67093565EE0EBDAC166 = SPARTACUS (Spartacus) | V | 0x9E7F603626DB06640770279EF2394F2E ; MKBv23/FindVUK 1.00 -0x69292D2F7AE60339DDB516A9DBC65C0CA5BC2B10 = SPARTACUS (Spartacus) | V | 0x21ED87AC99153612A6318C882E7B182C ; MKBv23/FindVUK 1.00 -0x3ED9352F531621C7FBAC8A7857F13A76C0D2A26B = Spartacus - Gods of the Arena - Disc 1 | V | 0xF2F79918DD476F1BB85FD14F0251FC68 -0x5D5E8B87F81D5DA28B1DA2001ECF9EEF1428A1BB = Spartacus - Gods of the Arena - Disc 2 | V | 0xFB9AE07708060AE5F1227E1624EF8FB7 -0xED3BA6335D855E28541CED7B0546A473DC369059 = Spartacus D1 | V | 0xA8AFF18A7874F53290771E74D941C687 -0x0F79CC07C00C306B2002020542B60F670F8C2CF1 = Spartacus D2 | V | 0x166679B2A5103BBCFDB09AC959BB9D14 -0xB87554725B220F800D6BCF6B16CA367BD3A62B3D = Spartacus D3 | V | 0xFB356EA6B046F0F7EFAD00DEDB464DC9 -0x02935BC4EC56896BA6D76E38D575B36EF5187BE0 = Spartacus D4 | V | 0x53D0B09DA87F429AA4EC964D38A27816 -0xE609758B51E7EAB35A283C0F98BD17DA834726E5 = Spartacus Vengeance disc 1 | V | 0xCA8D06D78CE298110B40435CF4D0C3A5 ; mkbv28 -0xE753875A8475EFAE196327274DBFC4FA78AA34B1 = Spartacus Vengeance disc 2 | V | 0x8E009B1F5C88AF11E97BD4BAF498C559 ; mkbv28 -0x7BF2FCD372F463ADB111EFBC0FFFB197D3AE2AC8 = Spartacus Vengeance disc 3 | V | 0x56DA58AA71DB35368AF5E6300D4C74AF ; mkbv28 -0xCA1F072DE1A753A74B05985D571FA458ACD0E614 = Spartacus Vengeance disc 4 | V | 0xA1D62FC6ADE5DE6EDA75ED1EEF0C73A2 ; mkbv28 -0x7C8BD733A8150F6F3B83FED46B32B60603A99F06 = SPARTACUS_D3 (Spartacus) | V | 0x2268E02853006F2BC07E835C389B4BCA ; MKBv25/FindVUK 1.00 -0x3E77677E003B754A858A6A2CA524817511708323 = SPARTACUS_GOTA_D2 (Spartacus: Gods Of The Arena - Disc 2) | V | 0xFF34720BB35209F9919DB9E9DAD23A42 ; MKBv28/FindVUK 1.00 -0x7540F241187AE9FA9F9E2414DB6609D7BBDB476B = SPARTACUS_GOTA_D3 (Spartacus: Gods Of The Arena - Disc 3) | V | 0xFCC416B4EE2E1541F2133BAE3522F3F1 ; MKBv27/FindVUK 1.00 -0x72A09A7EEC89FC5B307650BDC24AC471FD6BABED = SPARTACUS_RESTORED_ED_UPB1 (Spartacus) | V | 0xA683360F363D4625E2DA85DCFC9C930C ; MKBv47/FindVUK 0.99 -0x9B645E671993317B10CAE9C862F530723E0D2EC5 = SPARTACUS_S1_D2 | V | 0x9D7C12183A701CCC64540AF5C69FC98D ; mkbv18 -0x42026D63C044D2C283D947C7A654622D5705A58C = SPARTACUS_S1_D3 | V | 0xB6EBB4432DD90399D309029F780594BE ; mkbv18 -0xB585C3452E8AE804563A10DA6C5B9F837A352039 = SPARTACUS_S1_D4 | V | 0x4D412AFB896337D2773C4CC515D5286A ; mkbv18 -0xA3A87B9B29F16FDCD4F2ABC3DE85693D6EB2ADAF = SPARTACUS_WAR_OF_THE_DAMNED (Spartacus: | V | 0xDF9C78E248BAA6EB91991425A1009F03 ; MKBv35/FindVUK 1.02 -0x7CC8E7DE74A41DB7C182C9B7443CB8BB8EF603D7 = SPARTACUS_WAR_OF_THE_DAMNED (Spartacus: | V | 0xADE263BF5859F99B9621A6717DF99791 ; MKBv35/FindVUK 1.02 -0xDC5403EC27DB620783011E101B76FCC886A50BCC = SPARTACUS_WAR_OF_THE_DAMNED (Spartacus: | V | 0x800CB1E1858B2FF6AF75D53D82EB6852 ; MKBv35/FindVUK 1.02 -0x19C2B375DFF261BAB1E3FF09B20D2CCAD146538D = SPARTACUS_WAR_OF_THE_DAMNED (Spartacus: | V | 0xBF976B0AEA56CD4944EF801AC3A904EF ; MKBv35/FindVUK 1.02 -0x9D9C9E53805202BE694109BB830EF7AE6FD2C65B = SPAWN (Spawn) | V | 0x1D7E287DBD062CBC45C06EAD20772DC9 ; MKBv20/FindVUK 1.00 -0x2176CC23F38A4C1D731A67A583EA690D9CC7E38B = SPBD_02 | V | 0x063B2884570772B18F4181FCC6650E4E -0xA35E5860A98EBFAFA1002E4A6B3A05A3BD7B539D = SPECIAL_ID (Special ID) | V | 0xFA2F96C316A8832C2E27D683555A4EE2 ; MKBv47/FindVUK 0.84 -0x959A210B7D3E31017833C9CB3A0EEFE6501BA6DD = Species | V | 0x702B7CF60A2B1F033B29F3CBFB0DD812 -0xC886C21D96FB8E1068F90BD7DEA12ABFBE6664AE = Spectacular Spider-Man (Spectacular Spid | V | 0xD62B3AD1E201E0A33F21CBB26102059F ; MKBv46/FindVUK 0.92 -0x3AA434A0053E248B2E0766D91D8850E67EF43613 = Spectacular Spider-Man (Spectacular Spid | V | 0x48629D0DDC3557C640A469DCA5222CF5 ; MKBv46/FindVUK 0.92 -0xD57BD53EBA0ECC9491ADD7537A4B9781FCA0E7F1 = Spectacular Spider-Man - S2D1 (Spectacul | V | 0x2998CC1AD0A2E928268D3FB94CB1F895 ; MKBv46/FindVUK 0.92 -0x58187B38AD3B3702A81858E391831D1DE4EA8916 = Spectacular Spider-Man - S2D2 (Spectacul | V | 0x8A8168C5DB9260D623FE0D014A98CA76 ; MKBv46/FindVUK 0.92 -0x442027D22200787B9605465F4C8AF18B3BF0D21E = Spectre (Spectre) | V | 0x9C37D2FF01F927D6BB882D078811FE1D ; MKBv56/BD+/BEE/VUKNOTVAL!/FindVUK 1.00 -0x2452E27E07A24B817F10DB35D10BE57D0B823727 = Spectre (Spectre) | V | 0xF2028A16943CD96EFC58DDE3D4AA46FF ; MKBv46/BD+/BEE/FindVUK 1.00 -0xD995A1F234F112FAEB65329C7F9BD2DEB43B3CDA = Spectre (Spectre) | V | 0x331BE06C7145A60941E0A8D586322547 ; MKBv56/BD+/BEE/FindVUK 0.92 -0xDC72B846D68413BB18355431C6B68E452781CD44 = Spectre (Spectre) | V | 0x72BA8E61AAFA4481BE4F6F926C35B703 ; MKBv56/BD+/BEE/FindVUK 0.92 -0xE61B5EF2B2E268875A964AC8D7B17619B31D48A1 = Spectre (Spectre) | V | 0x940747E53C5910FF9269A803CC7D759F ; MKBv56/BD+/BEE/VUKNOTVAL!/FindVUK 0.92 -0xD6EC3873A72BB7F9E07DFEC3909367249C039F8E = Spectre (Spectre) | V | 0x214199924D2ED3862B219EE7F326DCF1 ; MKBv46/BD+/BEE/FindVUK 0.99 -0xA5AFB6EAC5BBA7ED95EB2DC1204FB47D0410F17C = Spectre (Spectre) | V | 0x33FFA1885932E61284E38DD8C84C702E ; MKBv56/BD+/BEE/FindVUK 0.99 -0xE9C7A30F67C9CAB9FBA44F8055163698A486C7D8 = Spectre (Spectre) | V | 0xF775F1C5248AC63A0A92416DC14EC503 ; MKBv56/BD+/BEE/FindVUK 0.98 -0x5F097E7B49C7D69498011B2B4C28B2EDC6ABA138 = Speed (US) | V | 0x25E53ED0EF55E9130091FDF0CCFA36B1 -0xC2525DA5288AA59B9E7B339117BBA6F70A04DD0B = Speed 2 (Speed 2) | V | 0xF786D2C44C223B581F593B60C868F054 ; MKBv39/BD+/BEE/FindVUK 0.96 -0x9E63A5EDA48FF82A587B99BF17168D55FCB1705F = Speed Racer | V | 0x6CF55E370B6340063EFB0044CC3328B3 -0xFF9A9D5FE1E693DA7D0B3CEE0A9DF3AB5C90E026 = SPEED_F2 | V | 0xDFBB021A85D3E4EE65D4329674E22C6E ; mkbv1 -0xB4D016889DC6D72EED25FCC2C0F5B4657406BE9E = SPEED_RACER | V | 0xC37403A03A90FAAC37370EAED9A2E3AE -0x8D23F6C42453451B09854148DA1D093B22CAF3BB = SPELLBOUND_BD (Spellbound) | V | 0x431115AA9943FDB8CC66142FCA5C636F ; MKBv23/FindVUK 0.94 -0x25B1050C6F840102D65E6DBC5B8BE594462420CC = SPE_BDLIVE | V | 0xA7D20683736E9F2FFCB8C1EE75EEDFBB ; MKBv12/FindVUK 0.80 -0x6D19F44B3FDC4BB969C6A11B20B17FC9639279E0 = SPE_BDLIVE | V | 0x97E6105C04503265F603C76B2DD1404B -0xB8E5A0104C8781BC55F24CAF8D37E166A80933B9 = SPE_BDLIVE | V | 0x43DE0FDE6866AB5AF16656B6433A5000 -0xB972A66C73FB2E5BF88D409F8610C7E11C301134 = SPE_BDLIVE | V | 0x43B05533C8AF94244A72BAB9314A8B83 -0x88C97278E69B424BCD73F703AE6EF4026E872B20 = SPE_BDLIVE | V | 0x1DDBAAA33574033F5E17EEDD6B7783C6 -0xB915FAE668FD2A75D24FEDD29479013A1C2F5467 = SPE_BDLIVE | V | 0xC885EB8393A3B332D019483F99D12A9D -0x448F61B11B28070035C95DCB7A2B7242A2A6FA33 = SPE_BDLIVE | V | 0x4D609D9243497EBCEAFB6E9836313678 -0xBEC7728BDDFF1FE3F4A396A1C3FE7D3D551457E8 = SPE_BDLIVE (Facing The Giants - Blu-ray? | V | 0xC67DF22C0AD5B503826B146787E90A23 ; MKBv14/FindVUK 0.96 -0xADD2BCC6212135F10AFC6AC10AD7C7B215D901FA = SPE_BDLIVE (Underworld: Rise of the Lyca | V | 0xEB28320DE0A034F10F98C1DC1845100F ; MKBv16/FindVUK 0.96 -0xEB081B8AC0E558A8FF862F64B46828CD4345AB66 = SPHERE | V | 0x01F2D36697757322D160D8BF19B1B204 -0x530863AB4E7C4AA038FBB86C0FC4CD633495FFEB = SPHERE | V | 0x318CC9056DA0A2AE52F53A6E4B6F7FAB -0xDE236F6612FB5E9AC833263B2D2D5F6D3131B78A = SPICE AND WOLF DISC 1 | V | 0x1166C9DAE5D14C7EB826200945E64B2F ; MKBv57/FindVUK 1.00 -0x0DD0486350F80C437D47FC99A8F735B022A4F2DD = SPICE AND WOLF DISC 2 | V | 0xDAB265571983F1672ACAFD4D41FCAAF5 ; MKBv57/FindVUK 1.00 -0x2500FD30F034D672E76CC78ED77C838E3A62096B = SPICE AND WOLF DISC 3 | V | 0x9207E2789AEEB059E008C977FACB3611 ; MKBv57/FindVUK 1.00 -0xE85754C97D830B75F935B63BC76ECC58B103443F = SPICE AND WOLF DISC 4 | V | 0x215DBFC9808D9F2CD34ADD5A3622C722 ; MKBv57/FindVUK 1.00 -0x9E7B99BF569C5D0DAA8CA2F39E2871FD4579E238 = SPICE_AND_WOLF | V | 0xA11CAA8D620F396928A024D1FED37EED ; MKBv23/aacskeys 0.4.0e (season 1 disc 1) -0x5BAE4ABBD80A3225DDCC7767149CC029B99C276F = SPICE_AND_WOLF | V | 0x520AB6C0269246BD9BAF60B533208C45 ; MKBv23/aacskeys 0.4.0e (season 2 disc 2) -0xF512F3C3C356C0C43BB94F6766F4B040B1492B23 = SPICE_AND_WOLF | V | 0xCE58F0B994F85BDEDDA21DD1A3623FD5 ; MKBv23/aacskeys 0.4.0e (season 1 disc 2) -0xA5544927EE255CE36AC0AB20A8EB0E8FCC45B3C7 = SPICE_AND_WOLF | V | 0x9214395DF9C1C346B04482B9CC05B1AF ; MKBv23/FindVUK 1.02 -0xC0ACCE25DE05FFBDEA8BA4E786134D3B4040A344 = SPICE_AND_WOLF | V | 0xE8C5FEAE51CE6B23E47F4ED41ACBB2D8 ; MKBv23/FindVUK 0.96 -0x4176925CF5C089D1D3617387CA8EB4C7F7A47FB4 = SPICE_AND_WOLF | V | 0x6169C9D1469B1416DBDEC0D924BF1B20 ; MKBv23/FindVUK 0.96 -0x435CA5849CF76009353A93BB2D5224AE9FF31469 = SPICE_AND_WOLF | V | 0xAD4BCD451BC12A59652145FE94EF359F ; MKBv23/FindVUK 1.02 -0x954DE9F3F35CB6CFC1332970E7722740602ECC5F = SPICE_AND_WOLF (Spice and Wolf) | V | 0x2CFB389FA1536BE02E96763B4000AB8D ; MKBv23/FindVUK 1.02 -0xCEE04C28143FED9C6782C736ECABA19817FFC859 = SPICE_AND_WOLF (Spice and Wolf) | V | 0xCE1748760E770575C27FD0CD49D75A35 ; MKBv23/FindVUK 1.02 -0x243C4BB0FBA3E443B6FDA9A13DA9DF06EF88CC3B = SPICE_AND_WOLF (Spice and Wolf) | V | 0x884BF7668D70036D54A9613EBF44711E ; MKBv23/FindVUK 1.02 -0xD990F6DCFD59DE8B9748F94F1917605448AF838C = SPICE_AND_WOLF (Spice and Wolf) | V | 0xC193FA60876FF24B83FE44108308737C ; MKBv23/FindVUK 0.96 -0xCA8B96B254070A9916AF51514A3FED7BA045F7B1 = SPICE_AND_WOLF (Spice and Wolf) | V | 0xB00453EB85BC23822B52914570D01F81 ; MKBv23/FindVUK 0.96 -0x28E40DF28B7371D7BD4C9EE41F33DB745D7E5E78 = SPICE_AND_WOLF (Spice and Wolf) | V | 0x9623B64FEBD3C6DE185B95BAF50993A0 ; MKBv23/FindVUK 0.96 -0xF528ED4076EB507BACDB1F85A1437C966FFE1AA6 = SPICE_AND_WOLF (Spice and Wolf) | V | 0x087F731295B96E1D73A3DDE31555B901 ; MKBv23/FindVUK 0.92 -0xBF67155FD4EBB4903F8C714AA1C1E6C8D194A354 = SPICE_AND_WOLF (Spice and Wolf) | V | 0x91625C12C2A775216B849EB17263FAD8 ; MKBv23/FindVUK 0.92 -0xD52348E7E46517A056B4B61FDA20E9AF4CA8F3B2 = SPIDER-MAN | V | 0x9394B4272F060ECEE5D73C21A15034B6 ; UK version. From Spider-Man Trilogy. -0x32F05E176E5C80A4EAC71D5551EF788D6C341B95 = Spider-Man | V | 0x0B1B0A2665226879856180AB19E2B22F -0x9B1AD269159DF72AC1EC3033821DEB1BA62FB501 = SPIDERMAN 2 | V | 0x4A13349B987C62665BADB596C5585CB6 -0xC66FD837A670BC3107B3A76DA1FA7701A31223F6 = SPIDERWICK_CHRONICLES | V | 0x33A12424881BD60B455CD9D3C5A1E220 -0x59E7BBE91E303D945E6E769279FEFC0940118DB2 = SPIDERWICK_CHRONICLES | V | 0x8943B553AFD73D070BD501B5C08B1AC5 -0xBC947EDE1E011E32043B76E9F2DA084594925A6F = SPIDER_MAN | V | 0xA5067C4CACE14B518ED759C4872066A0 -0x4AA62ED5E3BF2EF25547887E732A85150A7C63D0 = SPIDER_MAN | V | 0xF809014CA9D448FA8E457A62CEF1A556 -0xA9A75DB13FC675FF15FE0618AA1DD2D1C921C9A6 = SPIDER_MAN (Spider-Man??? Blu-ray???) | V | 0x8925D6EDA146D54739FC0A8198408DE3 ; MKBv3/FindVUK 0.96 -0xFFF52D58F95C6972D2AE6D96CBD3BCBA2B15DB6E = SPIDER_MAN (Spider-Manâ„¢ Blu-rayâ„¢) | V | 0x633D165313F6020C08DE532B130B99EF ; MKBv4/FindVUK 0.99 -0x1F254EE51DBD1F040025806126A50C119EEC0D04 = SPIDER_MAN_3 | V | 0x66C36A831F8D084587EC0CDB484C33C9 -0x8199BE295B2E772DD08A3946B513001442DEA7B3 = SPIDER_MAN_3 | V | 0x4D6F24FAE92BE01F777F39A653ADE5A6 -0x2C2E6ED320B769358E7B2F4F4936B0BEB5A4FA27 = SPIDER_MAN_3 | V | 0xA9EE876161B143B2452366A09B778C44 -0xDA38CCABEFB8FB91FB1379F296EBCCACFA13DD63 = SPIDER_MAN_3 | V | 0x0654AE3A304266C92EF430762CCC9887 -0xF3604D1DDFB5A852566BAD37F14814145119DAE1 = SPIDER_MAN_3 | V | 0xB9B72307715A3ABD6BE3543DB7F5F328 ; MKBrev 3 - FindVUK 0.57 -0x06B1B30718355F5A468219F44A23436E2E27F36B = SPIDER_MAN_3 | V | 0x8AADB17EFDED49DD6BC3FC93A845CA01 -0x6775F006F674B12836CA685267C96AB8BEE12D81 = SPIDER_MAN_3 (Spider-Manâ„¢ 3 Feature Di | V | 0x9340178836556D4CF5CE82F9C9B5FC98 ; MKBv4/FindVUK 0.99 -0x1672CD54114191BA94D99E2A4A30A4E9D6F58CB9 = SPIDER_MAN_3 (Spider-Manâ„¢ 3 Feature Disc | V | 0x9ADA88373FA44C222BC6EA50B4C611A5 ; MKBv3/FindVUK 1.00 -0x467D592E66160C4D7C1F6AF225C19ECC2FF5AEB0 = SPIEGLEIN_SPIEGLEIN (Spieglein Spieglein | V | 0x8CE5508528666AC73C41BEB683E95AE1 ; MKBv31/FindVUK 1.00 -0xE98101ECCF7D1E2662588CD5F18053AE4055EB9A = SPINAL TAP | V | 0x45FEEF1811D6563232A0636065AFB78D -0x92E59FEE6E2AC11D4A724A870BA9C0D7AD0E632E = SPIRITED_AWAY | V | 0xD773265EAD67EE601FABA7662F5C3059 -0xE12F443FCA1E266BD9A4C678021CAA152390058C = SPIRITED_AWAY (Miyazaki Collection - Spi | V | 0x12089C87E581A52D84A0F1EEBF3B7298 ; MKBv46/FindVUK 0.96 -0xC17366207403E56D78BDD976AA2D664404F17F93 = SPLASH (Splash - Blu-rayâ„¢) | V | 0x1CCC287B6F36FD13F1F953E1B9EB083F ; MKBv35/FindVUK 1.02 -0xAEA73A0B5EC7D82BDCE213D4B55AD1EFE108F355 = SPLICE | V | 0xAA47D6176B21D639C833D30FFB837041 ; MKBv19/FindVUK 0.80 -0xF182C863F8B13994E8F82064451DF3EE10922BBD = Splice (US) | V | 0x1D4F36028F0A70BA90C22A6510D6326D -0xB9394ADB26C2C8DD0A9BCCAD98901ACC8B222048 = SPLIT (Split) | V | 0x1A46536D2C91B4227D125408F0E545E2 ; MKBv50/BEE/FindVUK 1.00 -0x49F0D6E627D7197411E33E4A0E089BFE1E3EA6D5 = Sponge_Out_of_Water (The SpongeBob Movie | V | 0xDD0A331DE1AAB9F9AA4F0A462A0AF8F9 ; MKBv47/BEE/FindVUK 1.00 -0x76FD16F7CEC89780C57DB440506E124FBAE70590 = Sponge_Out_of_Water_3D (The SpongeBob Mo | V | 0x5E5362411BD6CF0D1E2F06AAAC070761 ; MKBv46/BEE/FindVUK 0.98 -0xB10CBF7C4DBD95197B0C487A3376F2A7219890F4 = SPOOFS_DOCUMENTARIES (Star Wars Spoofs a | V | 0x3751C12D5A5F15832494117B125AC400 ; MKBv20/FindVUK 1.02 -0x7DC44D5ACB000D2CFECA6EE274987EF90DD8D307 = SPOOFS_DOCUMENTARIES (Star Wars Spoofs a | V | 0xE125FF0376AB15E76688ADFF176BF73E ; MKBv20/FindVUK 0.92 -0x5C7CB4BB1CC2D1829E6B58637D442BFB606F7626 = SPOOFS_DOCUMENTARIES (Star Wars Spoofs a | V | 0x091435DF3D583009927885E9BC648A46 ; MKBv20/FindVUK 0.96 -0x47D32EF6FE687DEF2964ADFC6906E442DDFA9DCE = SPOOFS_DOCUMENTARIES (Star Wars Spoofs a | V | 0x0A728BFCC1BFE05FA2589C21198C22FE ; MKBv20/FindVUK 0.96 -0xA81367EC0358E0EA5BA0C9E36CA690FBBFD0FA4C = SPOOFS_DOCUMENTARIES (Star Wars Spoofs a | V | 0xD609A1DA67F3F385CAA6888DAC6F684C ; MKBv20/FindVUK 0.99 -0xA53A5625AB0BD1457CE2DFA27FD888B4F577D277 = SPOOFS_DOCUMENTARIES (Star Wars Spoofs a | V | 0x24C19F0B209000853A926590CA6CFAC9 ; MKBv20/FindVUK 1.02 -0x936251277DFA51708A37FD0A9850221FC43FD69A = SPOOKS_THE_GREATER_GOOD (Spooks: The Gre | V | 0x67874B4559EEDD7937B41CAB263D534F ; MKBv52/FindVUK 1.02 -0x3A7E34946B92F6DA0A392642FA6DA368AC400E19 = Spotlight (2015) (Spotlight (2015) - Blu | V | 0x0C0A8A8F7383158F15ED0213D34461BD ; MKBv58/FindVUK 0.98 -0x84CE25E4EF368402D66656BEBDA2B712C16D94E3 = SPOTLIGHT (Spotlight) | V | 0xCB18C0F8A5E7CA68CB06E905C9BE6599 ; MKBv61/FindVUK 1.00 -0x38B8F354400523741E99B2114DA67C934BADD89C = Spotlight (Spotlight) | V | 0x9410AA885149E662A82AF5C3417D5406 ; MKBv56/BEE/FindVUK 0.99 -0xE98286547C4DDAFEC2EF8222445D188D2D72A025 = SPOTLIGHT_NA (Spotlight) | V | 0xE996F2EDC34070DC6776311E5E6532E3 ; MKBv56/FindVUK 0.96 -0x95467E4D1A25E51E5214E177995E5F3EF8005819 = SPREAD | V | 0x84DC063C5A47BC5F7EFC6B8189930339 -0x66B94D1D830ABD49C7FE0EFBBC7C55EFBAF1D731 = SPREAD | V | 0x3EE5B3BCF672E1BB386E222A7AED7C10 -0x3923FB0A7A3E67D20621F07D1CFD88AFC3729D1E = Spy (Spy) | V | 0xADB086E7BED893309CF55AA119896606 ; MKBv47/BD+/BEE/FindVUK 1.02 -0xC56BBD2A1BEC5825881B67B8DA01951BDC456F4A = Spy (Spy) | V | 0xA4E349AA704AE54A3210469D9A7FBF31 ; MKBv50/BD+/BEE/VUKNOTVAL!/FindVUK 0.87 -0xAA25220DF8D1B896D81254E4CF8E3F7537BCD7F4 = Spy Game | V | 0x7CCCC0A05FECB0BD8104C672D96869D2 -0x734CD13BB59EFC9F61D549544935B03590EFF37B = Spy Game | V | 0x6F523FE5FBD687BDD3AD5AE219150007 -0x5953F75292796409401979FF0DB1A5D89699BA36 = SPY KIDS | V | 0x68575EC0D08E0AAF40E410ACBDD3EFBA -0x1F8DB0008CAB009E2249637EC576D20FA5BB5777 = SPY KIDS 2 | V | 0x2190CEEB9A8438342CB82607AA8F420F -0x5C7F96D3E13FD7E6B51D5AFB6E6AE61BAA7E5C5E = SPY KIDS 3 | V | 0xC97725F794B805700B21788BEB83DA13 -0x6AFC3C1DCACDF8C15DD4FBF77F62983314C851E4 = SPY_GAME_G51 (Spy Game) | V | 0x8C86CF6E30239D79679242C7F62B5EC4 ; MKBv27/FindVUK 0.92 -0xC719385BD0FB5D2B8DD246DB21981752686CC1CD = SPY_KIDS_3D_BD | V | 0xD61A4DAC82C4D85F9CAEAEF827E5B644 ; MKBrev 28 - FindVUK 0.57 -0x53A0E3B495282960728EB6277C0041FB5DFD772C = SPY_NEXT_DOOR | V | 0x7EF3ABFBA7B0BC2DB539A2FEEA2DDA61 -0xC0EBBBD634733AA4B87A08B796A64A7941868B17 = SPY_WHO_CAME_IN_FROM_THE_COLD (THE SPY W | V | 0xD49079CBA439E723F95FEA1E58D376C2 ; MKBv38/FindVUK 0.99 -0xD8868D2D4726485102D9055F53B5093622CC7C60 = SQV_SELL | V | 0xFF9EEAEA6AA7DE02F2224CF75108F47F ; MKBv47/FindVUK 0.98 -0x2A5B7266A807FA7D481235D212D7F94053A5EA23 = SRR1EGE1 | V | 0xC98D96F74EB343FF6BD4B0AC9DC42BFE -0x3103BC7F5BDE62F99C4A829A9B00C1ABD651DB49 = SRR1HLE2 | V | 0x24AD2CD6F8B8D16A2DACD52E261D44FC -0xFC7C31E8F390A204AC6CD03103AEEE32E826B79A = SRR1JJE1 | V | 0x1E267CDA806429F6939D2E9E7A1E2B95 -0x767B75E27F73DA1108DA1517C746F89B830A9658 = SRR1NNE1 (Surrogates - Blu-rayâ„¢) | V | 0xE2FD7416796F1A037C48BD4C42CEF351 ; MKBv15/FindVUK 1.00 -0x2659E76EE4E38D2DE2D8370E6CC2D26E5A74A3CF = SRR1NNE1 (Surrogates - Blu-rayâ„¢) | V | 0xE67D52108CD0AFAC9A9CF2CDEBA68EFB ; MKBv15/FindVUK 1.00 -0xF1853C9F967A04ECAB9F9F2925273CED3625113A = ST ENTERPRISE SEASON 3 DISC 1 (Star Trek | V | 0x0D3F725E72EFEC0FF416DAA911F0A275 ; MKBv42/FindVUK 1.00 -0x47C66B27063878DA18B68FD695C1978DF62D9B3A = ST ENTERPRISE SEASON 3 DISC 2 (Star Trek | V | 0x37841A53EB2D8DDBC82F6AD76529D0C4 ; MKBv46/FindVUK 1.00 -0xF8F812D44091DD945B4AA81E0E68789FAB16ED4D = ST ENTERPRISE SEASON 3 DISC 4 | V | 0xAF51BF283AD138EF30D258D6D469F7BD ; MKBrev 42 -0x848BBD00DEC6EED86BE3E28982196D4B6A92FCB9 = ST ENTERPRISE SEASON 3 DISC 4 (Star Trek | V | 0x0C7CB7385816CEAF79DE0FD011ECAE4C ; MKBv42/FindVUK 1.00 -0xDE595640CC15FF0FB024923DB56ED72ADA69A674 = ST ENTERPRISE SEASON 3 DISC 5 (Star Trek | V | 0xFE8568D46BFC3476D788ED5008FB5993 ; MKBv42/FindVUK 1.00 -0xED162156811035957F73F05733DFD90435A7586A = ST ENTERPRISE SEASON 4 DISC 1 (Star Trek | V | 0x49FB3164B46C8E5EEC39755715F4CE1A ; MKBv46/FindVUK 1.00 -0xE17113AFF4E347A544D94949ECE133FB2EC226C9 = ST ENTERPRISE SEASON 4 DISC 3 (Star Trek | V | 0xF2439D8029982C9EB1661567DDEEA14C ; MKBv46/FindVUK 1.00 -0x32C22A8CA436C62DF1C0AE1D0C097C6D63FE3C10 = ST ENTERPRISE SEASON 4 DISC 4 (Star Trek | V | 0x0A27C277440B10A078C3EDBA1263A669 ; MKBv46/FindVUK 1.00 -0xB96BF2C7DD3EF37ABA650B1108D3B8A23C8D99C9 = ST ENTERPRISE SEASON 4 DISC 5 | V | 0x674C8E1395F4FCE6AE524C3E951CA772 ; MKBrev 46 -0x36CE22798934C734B485E927BDE7C9FCFED51BD5 = ST ENTERPRISE SEASON 4 DISC 5 (Star Trek | V | 0x84EE790766520216FAB4C51838931DED ; MKBv46/FindVUK 1.00 -0x9F19CECA718E0BAED6A803361C2C2C55D84DBBB0 = ST ENTERPRISE SEASON 4 DISC 6 (Star Trek | V | 0x3F918CB0A4E1515CD43BFE9F047A9AE5 ; MKBv46/FindVUK 1.00 -0x7BF76E14F729525EACA1A090E6B38F42FEF2F6BA = STAARGATE_TB_9 | V | 0x20F5E97D2ED13A896305C754FEF77989 -0x6B4FFBEA2CEFAF43FF9D2B31E4F480B6F7BC1D5E = Stagecoach | V | 0x3C9804080A5508DDEF346FBA20618125 -0xCFC51AF5987FA9944DDEB9E09BC9988E06650CFB = STALAG_17 (Stalag 17) | V | 0xCEB7DAB6FE1E979312571E9388E8C722 ; MKBv36/FindVUK 0.96 -0x89F585BD6230703AE6EC449ACAA21A2F9D51FB0A = Standart Operating Procedure | V | 0x1D25A1A95FAAE99A89E1B24B6C780736 -0x23974D91AB61496B90DA6E5BAE43352953E1531A = STAND_BY_ME (Stand By Me - Blu-ray???) | V | 0x3792A03B41DA2BB27F057AC247429E54 ; MKBv21/FindVUK 0.96 -0x79719C4ADC6CFD7ED487AF844F27FD12AE0EA750 = STAND_BY_ME (Stand By Me - Blu-ray???) | V | 0x37B5643FD7624A9FE1EED1CD53764B2E ; MKBv21/FindVUK 0.96 -0x16B2628083FFB154268335EEBD02ACB2C99BCC0F = STAND_BY_ME (Stand By Me - Blu-ray???) | V | 0x80137C09D472F4AA180AE3806D19947B ; MKBv20/FindVUK 0.92 -0xDC467BB9AA049DD605C99FCD662D87F1E693F678 = STAR TREK ANIMATED SERIES D1 (Star Trek | V | 0x5E78BF585B2807031E8860033A519724 ; MKBv61/FindVUK 1.00 -0x7D77412001167CB47936077BC84E65D9DC1B8272 = STAR TREK ANIMATED SERIES D2 (Star Trek | V | 0x6BE84914F813539864FD395EBBDDA8C1 ; MKBv61/FindVUK 1.00 -0xC4BBE15E94592FCC08CF7B07B4D1071C712875E9 = STAR TREK ANIMATED SERIES D3 (Star Trek | V | 0x085859C0E2973EF5560C0F0525EB3CC6 ; MKBv61/FindVUK 1.00 -0xAE09A792D99516E72F3D1087E05D8B9DC31748DE = Star Trek Disc 2 | V | 0xEFC38B9C48FE24B27393DBDA440D16FE -0x9E6170BAD1D25F981B2C161D57317AB768ADD922 = STAR TREK ENTERPRISE S2 D3 | V | 0xACA2DB3DB860BC81B4887099C5BE3462 ; MKBv36/FindVUK 0.80 -0x73DB03B1CE54519C79A86622873D0E0C376F1C5E = STAR TREK ENTERPRISE S2 D3 (Star Trek: E | V | 0x5C1EFA8E870D5396C498325D2C4CB3C2 ; MKBv36/FindVUK 1.00 -0xAABE486DE6CBE345910701BB64CF7A5EC265790A = STAR TREK ENTERPRISE S2 D6 (Star Trek: E | V | 0x13FAACF8697B380BC0540BFA85DC3EB7 ; MKBv36/FindVUK 1.00 -0x113F3337625245A5EF71EBF7D01F4371025FDD0E = STAR TREK ENTERPRISE S3 D2 (Star Trek: E | V | 0x95A430AE0AA67754C7262CEFA570036B ; MKBv42/FindVUK 1.00 -0xABF5D7A451252A0436F64D1267220205DA7A89E9 = STAR TREK ENTERPRISE S3 D3 (Star Trek: E | V | 0x7EB372E33E8E632B9D9ECB71956F0113 ; MKBv42/FindVUK 1.00 -0xAC03F3B3D355B1E90F3E084B93B5D54C80AD596B = STAR TREK ENTERPRISE S3 D6 (Star Trek: E | V | 0x3769E451290E0C49AFE91ECC22615983 ; MKBv42/FindVUK 1.00 -0x3AB9A38F6FDAA24D2F26DD08AC2B1A1D849F3618 = STAR TREK First Contact | V | 0xB43DD40A7ABFDD0C4A4396A10CD4E685 -0x588A7F1A23D142CA2B60DF9EF6902193D994547A = Star Trek First Contact | V | 0x86A6D5A6BDEFB0910F0482D00BDB71A7 -0x63EE308B3771B7CCE4EC75539FFBF40D4EABFE9A = Star Trek Generations | V | 0x479C2D13E30AAF181CE5086F45FB8D2A -0x567851C527681E285A3E9A0C443DB6215E84E3C3 = Star Trek into Darkness (US) | V | 0xFE25EA2A8E5563BFCE7754D78B35DCC6 -0xB7209D81E4F0A810A2F299BEE3CD3F2DD320A4BE = Star Trek Nemesis | V | 0xC10133F3A7EC7C25C5E87443F553C8C9 -0x903E6E22C1A395487CEE8DB94159FD6638A4DD7E = STAR TREK TNG ALL GOOD THINGS (Star Trek | V | 0x697A2358EF07438A6B3232CA2379CCEC ; MKBv47/FindVUK 1.02 -0x16309F4858C1404453218E2041C0004FFD67629D = STAR TREK TNG CHAIN OF COMMAND (Star Tre | V | 0x672A18DC5C170CA6D6BAFEB3DB77C3D3 ; MKBv46/FindVUK 1.00 -0x4A11EBBBEB0CD9D90D3305C0FE78580A826D80A3 = STAR TREK TNG CHAIN OF COMMAND (Star Tre | V | 0xDF99A1E69589D8CD169343BAC183C044 ; MKBv46/FindVUK 1.02 -0x63F1BDE787719A6D56174FFCB093B65AD2FB55A3 = STAR TREK TNG REDEMPTION (Star Trek: The | V | 0xAD3F2F4C8366FEA98ECE1E9F51CB1BD6 ; MKBv36/FindVUK 1.00 -0x397775E066A9BCE30A771428C7A021B88180A549 = STAR TREK TNG REDEMPTION (Star Trek: The | V | 0xCDEE7BF585D09AB1A64BC3B1248E886C ; MKBv36/FindVUK 1.02 -0x0134C8364519600BFC5DAA7F1970C0C68E528D03 = STAR TREK TNG S1 D1 | V | 0x506F22E8DB22803FCA4147E35B1697A5 ; MKBv31/FindVUK 1.00 -0xC71CFA0E534355270C448A26F3E3A68F3EEF583F = STAR TREK TNG S1 D1 | V | 0xC565E95899072D0E9120099F6DE1A679 ; MKBv31/FindVUK 1.00 -0x4A58F39AC75EF5F7F81D161A96F35DE5CEDECA9A = STAR TREK TNG S1 D1 | V | 0xA6D3DB4C6949A196EEBB79477D714477 ; MKBv31/FindVUK 0.89 -0xA7A58A45941F03F357FBBE72F468803D1C4B43A3 = STAR TREK TNG S1 D1 | V | 0x18F324F1C92DA227332CDA559971EAB8 ; MKBv31/FindVUK 0.80 -0x51F4D5066391A1F76F8E5D04080E4DDD0907E9CA = STAR TREK TNG S1 D1 | V | 0xCF61943C677946CBCFF8119B1B68E900 ; MKBv31/FindVUK 1.00 -0x12BA251E646814269ACA91FEE9C63E91B8BB0333 = STAR TREK TNG S1 D2 | V | 0x64EEE114952476299A08A47124A12FEC ; MKBv31/FindVUK 0.80 -0x8EE12A1C6A9E9259F841367BF4E6F81D4564A70C = STAR TREK TNG S1 D2 | V | 0x76BDC3FDEE7AF776447761A1A8B1FBAB ; MKBv31/FindVUK 1.00 -0x640E0C713B5895E0A8F5F0E593D69021EC8E4C97 = STAR TREK TNG S1 D2 | V | 0x2B29CCD9E4EBBB5FDAFDE64B63354E9E ; MKBv31/FindVUK 1.00 -0xD76A8ED349B8C101C643F39E63C2B17CC6B98660 = STAR TREK TNG S1 D3 | V | 0x89B1C76FA0A478A4C160A5AA87913F94 ; LJ -0xB7C97346420390863CBB085D7971526396CBDFE2 = STAR TREK TNG S1 D3 | V | 0x4D5F0B4F2C4257E1BA2691BE2707D0F8 ; MKBv31/FindVUK 1.00 -0x410CA4713705CA387B9E8BCE2B98C9390F1A242B = STAR TREK TNG S1 D3 | V | 0x8B5536AA061ED315E7229BC7B3D1F275 ; MKBv31/FindVUK 1.00 -0x26356DF63F175D09F676656D380716E10DA09695 = STAR TREK TNG S1 D3 | V | 0xBD8DBA1733BCE28A04B6730947C8A7F2 ; MKBv31/FindVUK 0.89 -0xAFC51DE5EB90DEDE05936B793ED529EE9F40FC13 = STAR TREK TNG S1 D3 | V | 0x16D9E77BF3A060A270AC48E7284105E7 ; MKBv31/FindVUK 0.80 -0x68CBB8B779094CBE79983D95383FEF6F654F164D = STAR TREK TNG S1 D3 | V | 0x122358986FF56E43198D66E916A825E2 ; MKBv31/FindVUK 1.00 -0x0B8F2AB1DFCBC6B90DD01A10BD2F1B94A6549081 = STAR TREK TNG S1 D5 | V | 0xB8C6F18D4067D1A3831262C4550AFC55 ; MKBv31/FindVUK 1.00 -0x0E043CDD2D604B4AD167E74160BC7782A9F7415A = STAR TREK TNG S1 D5 | V | 0x55918A94D8F589ED1C7B6DC571B8584F ; MKBv31/FindVUK 0.80 -0xAA0E7EE6CBFC5C6D9D9CA68BA9217E50C490A1D6 = STAR TREK TNG S1 D5 | V | 0x8EAC9A07E4F03E03FCCD54CA69BD8A2E ; MKBv31/FindVUK 0.89 -0x07C175E4036F974A3AE71E2430897446C4435A7D = STAR TREK TNG S1 D5 | V | 0xA57254309A71E0BF1EDD70F1D1555166 ; MKBv31/FindVUK 0.80 -0x3206A18127BA4D1FA4E922CB4BDE1788A4269930 = STAR TREK TNG S1 D5 | V | 0xB6BEEAA78C71EEC2561C275F434AB294 ; MKBv31/FindVUK 1.00 -0x932DC4F65B246BBA8E49E4146DC99EF962F9EDC5 = STAR TREK TNG S1 D5 | V | 0x4A0CA0CAC2FBC154AD0310FCC558869A ; ThomaZ -0xA00F47A43E77138A10D4279FE13FD862F4112449 = STAR TREK TNG S1 D5 | V | 0x23A281FC9294BAB177A71BCA4299B73B ; MKBv31/FindVUK 1.00 -0x9912D124326EE38CAB4DB4C16ED1A99F880A48E8 = STAR TREK TNG S1 D5 | V | 0xCECFDF6EF384027C4B4287AD70DD715A ; MKBv31/FindVUK 1.00 -0x0CC8F2C521F22308E7595E1F6AB80D19828A770A = STAR TREK TNG S1 D6 | V | 0x9DCC014B13B60DCDE226A7E7314EF70E ; MKBv31/FindVUK 1.00 -0x0D0696EB4D73DE5FA75DC6E73A437E4C850CC185 = STAR TREK TNG S1 D6 | V | 0xDF69FD1ADF7BB9F97420864E9F08376C ; MKBv31/FindVUK 1.00 -0xD5C825C488B7BC2D0F76202FB0C4C95F86B19B99 = STAR TREK TNG S1 D6 | V | 0x71FD5DA6C9B90016B0C5B779F0A0A1A6 ; MKBv31/FindVUK 0.80 -0x39725745D18E9858D169EA6C65FF2324016AD6AC = STAR TREK TNG S1 D6 | V | 0xBDE959A0EEA4BCAE80B7075DA27EEBA5 ; MKBv31/FindVUK 0.89 -0xB5976D15FA4110A05410A26A426E76D80BB56B54 = STAR TREK TNG S2 D1 | V | 0xDBFAB2415D47CA54C557488FADEA618A ; MKBv31/FindVUK 0.80 -0x64B82092CB61A808E9A8C50D9754EF18D7C1C36A = STAR TREK TNG S2 D1 (Star Trek: The Next | V | 0xE23B95DC9A1AFB26555AC90C6CFCA6BE ; MKBv36/FindVUK 1.00 -0x3A77553D9A6ED02FA5E10FDCEACE6C8038A4FEEF = STAR TREK TNG S2 D1 (Star Trek: The Next | V | 0xCBAE56F278F5898E7556C068E59E4BC6 ; MKBv31/FindVUK 1.00 -0x7FCEA814FC01A47A0096CDF7102F08B1FC2CD9A7 = STAR TREK TNG S2 D2 (Star Trek: The Next | V | 0x52C4927C866F3977E4066B68B1554D5F ; MKBv31/FindVUK 1.00 -0x2F43D12FEBD794A60B23113641D55AA073CB7871 = STAR TREK TNG S2 D2 (Star Trek: The Next | V | 0xDF2C096487A241664D5ACBE5528A98A0 ; MKBv31/FindVUK 1.00 -0xB1E44C507F74D175A2BBDC59EDC4DB8724F2B34F = STAR TREK TNG S2 D3 | V | 0x2635F3E7EF24AA2EF3A8CFE1C4E5B51E ; MKBv31/FindVUK 0.80 -0xEE9E4A697A82A788204802053927EC54D59E8BA5 = STAR TREK TNG S2 D3 (Star Trek: The Next | V | 0x93657D86FA2635E3041932D6B7BDDBEA ; MKBv31/FindVUK 1.00 -0xAA7DF30056A4FA7B2A9376CA3AD4E86F3040F036 = STAR TREK TNG S2 D3 (Star Trek: The Next | V | 0xCFA3D1E04048CF2690C13337C391869A ; MKBv31/FindVUK 1.00 -0x10C36985E62E92D2B7A24977F63D0AE3A7D99A3A = STAR TREK TNG S2 D3 (Star Trek: The Next | V | 0x970496A9AF16E1288AFF915B4BDFC41D ; MKBv31/FindVUK 1.00 -0xACBD2E9646F04BC5B87BDFCECD19D5C8947D5CC4 = STAR TREK TNG S2 D4 (Star Trek: The Next | V | 0xE54417E898321BC559B81C71EE81D621 ; MKBv31/FindVUK 1.00 -0xA6F491BA0FAB40F78C6CC6B1B1429D086835DB95 = STAR TREK TNG S2 D4 (Star Trek: The Next | V | 0x566EA672D4218F186934D5EEF6B3B280 ; MKBv31/FindVUK 1.00 -0x7DBFAA3264ECFF161AED0C33D5C9E1E74B51280F = STAR TREK TNG S2 D5 | V | 0x024A256AE59670BA18C9F6878D488524 ; ThomaZ -0x382BADFF46BB049F285AFEE1D79018FF09B22252 = STAR TREK TNG S2 D5 | V | 0xDC44739DEA3C92DED350103EBF5E4754 ; MKBv31/FindVUK 0.80 -0xF83C7BAD0CC09F2ADB23D763EF36766F19F55545 = STAR TREK TNG S2 D5 (Star Trek: The Next | V | 0xD32879C56F9695ACAF1B4C56359398DF ; MKBv31/FindVUK 1.00 -0x83DFC22824AC0C9F3D8213043116384F86358A6D = STAR TREK TNG S2 D5 (Star Trek: The Next | V | 0xD18DA875D72142850C8FAEF9F9E73A04 ; MKBv31/FindVUK 1.00 -0x3EFA00125DC80524724A22D8664CB06262771D13 = STAR TREK TNG S2 D5 (Star Trek: The Next | V | 0xEF9AA768354C37FBBDEA24AE606FADE3 ; MKBv31/FindVUK 1.00 -0xF4CD8C301160B220FEEDE6873D6136C028122E4E = STAR TREK TNG S3 D1 (Star Trek: The Next | V | 0x4881B35076911BDFF39B4706A2148B6A ; MKBv36/FindVUK 1.00 -0x97074296621A2AF787F67B9F47F8D81254DFA677 = STAR TREK TNG S3 D1 (Star Trek: The Next | V | 0xE88965CB0146BA2D0E978ABCEE1E4F33 ; MKBv36/FindVUK 1.02 -0xC4E901A4DD2A421233D1A8EE68AC102ECCEE31B4 = STAR TREK TNG S3 D1 (Star Trek: The Next | V | 0xAA774DB0226ABB234258618F24CCD9FF ; MKBv36/FindVUK 1.00 -0x089372626C1071A0CC98D1D85FB8CCFDAFA7C529 = STAR TREK TNG S3 D1 (Star Trek: The Next | V | 0x77F29A7AE02956B5923E8CC3E3201129 ; MKBv36/FindVUK 1.00 -0x3E80BEC337F42F1843F6F7427634D4E849642B89 = STAR TREK TNG S3 D2 (Star Trek: The Next | V | 0xE285A6E7A3EBF95020475F66AA46112D ; MKBv36/FindVUK 1.00 -0xA93DC9AC16D7FDBBBBFD24936098ED4407A46D5A = STAR TREK TNG S3 D2 (Star Trek: The Next | V | 0xF958D64080F6CAB41F2AA85E8FAFAB5A ; MKBv36/FindVUK 1.00 -0xC90E250FEC91BC078A5607E828DF76C6BD07BD5D = STAR TREK TNG S3 D3 (Star Trek: The Next | V | 0xEB6BDA48625F35D67C4D4A875AB4D570 ; MKBv36/FindVUK 1.00 -0x26F50C6DAE11F0501417F806C4161A0CE7D91394 = STAR TREK TNG S3 D3 (Star Trek: The Next | V | 0xD85B785FC86D05102A0CCC81023E0886 ; MKBv36/FindVUK 1.00 -0x713F27B1DC7FC3877FCFA4B19C2A625BEB9CAEBA = STAR TREK TNG S3 D4 | V | 0xD3AF782B135966F752919065D64435DD ; MKBv36/FindVUK 0.80 -0x41F7CD073F474963C90BACC7FFAAC6A195DD0F56 = STAR TREK TNG S3 D4 | V | 0x7B0745AFA81B81FE2C13C87EC01C8F8B ; ThomaZ -0xEEBAED788B06974E9C1863E837B2929175CB223C = STAR TREK TNG S3 D4 (Star Trek: The Next | V | 0xD10DAC042F3AF021E0BEED4EE4BA2F99 ; MKBv36/FindVUK 1.00 -0x9F1D929AA723318C70FA4E5327ED0E0EC08BB629 = STAR TREK TNG S3 D4 (Star Trek: The Next | V | 0x774F981426CC977491C9C414C00AE70C ; MKBv36/FindVUK 1.00 -0x352267B2D20940F80483451F8B9BDA54DE8CA5DD = STAR TREK TNG S3 D5 (Star Trek: The Next | V | 0x4415A23B1C108BEFD2757E33D7CFE451 ; MKBv36/FindVUK 1.00 -0x99A2D4606B997B89966FBD9BE4347B6B59CC0BE6 = STAR TREK TNG S3 D5 (Star Trek: The Next | V | 0x9B8FB2EF992B7038F08672D0E61C16D2 ; MKBv36/FindVUK 1.00 -0x365F2B765D94E5EFD7F198FEE73C59F8F5A5F1FE = STAR TREK TNG S3 D5 (Star Trek: The Next | V | 0x02D0145FBE36EFD042B71788174DC73C ; MKBv36/FindVUK 1.00 -0x87EDA192386B43FE5E0FD8A01DC28A75EE9CECFC = STAR TREK TNG S3 D6 (Star Trek: The Next | V | 0x356F3810C5561FF6D854E3342F56E981 ; MKBv36/FindVUK 1.00 -0xB9A0BA051EB64E29D5D31F92CD9135713F2D1AC7 = STAR TREK TNG S3 D6 (Star Trek: The Next | V | 0xB477DAB270CC6130580526A2938186C4 ; MKBv36/FindVUK 1.00 -0x632D954DC3E01705BE3F9B6EDC2E14024BE68D07 = STAR TREK TNG S3 E1 | V | 0x91949B241A23602993C8C6D08F32ECD8 ; ThomaZ -0xDA5C28BF2A9C85FF801115CCE9111204121C7442 = STAR TREK TNG S4 D1 (Star Trek: The Next | V | 0x771F7B0AC152579FF7FC564E6D963652 ; MKBv36/FindVUK 1.00 -0xB1B1BD2C889E52269E235B04DB370A00FC9F50DC = STAR TREK TNG S4 D1 (Star Trek: The Next | V | 0x872FD9D0DD614127C6FC4AA7D80A0C02 ; MKBv36/FindVUK 1.00 -0x8D5BFEB912790C68BE20E2E948477FF076F39D6C = STAR TREK TNG S4 D2 (Star Trek: The Next | V | 0x1BA1C0E2DC59885245EB431DB1808A72 ; MKBv36/FindVUK 1.00 -0x10E2A67388175F8D185133B88E3A39240F5EC5BA = STAR TREK TNG S4 D2 (Star Trek: The Next | V | 0xCAF06D692495A4C5ABCACCE0B49DC71A ; MKBv36/FindVUK 1.00 -0x96C4414C0D26CF6800EAA1931863D0272E7C64E9 = STAR TREK TNG S4 D3 (Star Trek: The Next | V | 0x1151EB56925CD87BA86FC62AC371C9D7 ; MKBv36/FindVUK 0.92 -0x9C3228A9606A304949D8F7FF7934290F695AD601 = STAR TREK TNG S4 D3 (Star Trek: The Next | V | 0xD353546EC7064F45E37CE435DCD88A7D ; MKBv36/FindVUK 1.00 -0x8E111F9F658F3E3051C38ACAF4A2B0A7E16BD6F3 = STAR TREK TNG S4 D3 (Star Trek: The Next | V | 0xBE34766C8348F5E0EABF93BD8BCE27C6 ; MKBv36/FindVUK 1.00 -0x4709EFD122F8DC3110BA7B3C83A62C7D4B6933AC = STAR TREK TNG S4 D4 (Star Trek: The Next | V | 0x1AE3C340DEC73F02494F09E3F4620F0C ; MKBv36/FindVUK 1.00 -0x89A8D62B497691F6C629998E5E6F249815FAE2F6 = STAR TREK TNG S4 D4 (Star Trek: The Next | V | 0x6AF384CD90789C90B24EDF1F3E0C268F ; MKBv36/FindVUK 1.00 -0x16CB1CB1221A11483F5C0F49F5A9511D85502DA4 = STAR TREK TNG S4 D5 (Star Trek: The Next | V | 0x9613C087CBD02DAD89047B9F2244CEF8 ; MKBv36/FindVUK 1.00 -0x9794F2B42E45BD37718E287A57DB3B15D7CBF2EE = STAR TREK TNG S4 D5 (Star Trek: The Next | V | 0x2C4E355FB426530D090CD7B9D0213B1F ; MKBv36/FindVUK 1.00 -0xBCCF7997D47B9C1C34534C1E2033089D9AC348E5 = STAR TREK TNG S4 D6 (Star Trek: The Next | V | 0x1F23C187278E92372869EE3721B13D31 ; MKBv36/FindVUK 1.00 -0x30D5A02FF086B90A5C38483EFC021192F2AD7D23 = STAR TREK TNG S4 D6 (Star Trek: The Next | V | 0x374E3BA1471D987EBF40FC6149ABFB1D ; MKBv36/FindVUK 1.00 -0xA8469306A89B8422F7A458D0DECD2F4A9D41BFFC = STAR TREK TNG S4 E2 | V | 0x3086AAAB8394A11C0B0FA90FC04C8C23 ; ThomaZ -0x574811E164D179A3FC4AB547A9A5FC410FB4BE70 = STAR TREK TNG S5 D1 | V | 0x04E5F08BBC83ACC6EEBFDA0295E5D42B ; ThomaZ -0xC2D1167B7E49C862179380FB52B5AB49A037AF38 = STAR TREK TNG S5 D1 (Star Trek: The Next | V | 0x4F360E289F2000E7088AFD3544BE4536 ; MKBv42/FindVUK 1.00 -0x852CBD78AB12FAA6A84704CC0AEB668BEB4A66DA = STAR TREK TNG S5 D1 (Star Trek: The Next | V | 0x5FB9DF63B307D67FA59E8049DE8CEEF6 ; MKBv42/FindVUK 0.99 -0x20F766881E31403A0414DE58BB4415A84DEE2D4E = STAR TREK TNG S5 D1 (Star Trek: The Next | V | 0x9F37CE123302938F6E74A9328E89A3D1 ; MKBv42/FindVUK 1.00 -0xAC95D28F70AF8FD208D68F94D8ED42EC7E6CF795 = STAR TREK TNG S5 D2 (Star Trek: The Next | V | 0x0D8B4911BBC1CC9211038C1EBAEE70AC ; MKBv42/FindVUK 1.00 -0x11EFF88708CC92791440C19F46041B15A1D20479 = STAR TREK TNG S5 D2 (Star Trek: The Next | V | 0x3EB7B726228D5B001A78AE7ECF6C459D ; MKBv42/FindVUK 1.00 -0xB4F01D419A9AF90D3D2D68DB3751ED27DFC561AC = STAR TREK TNG S5 D3 (Star Trek: The Next | V | 0x9EFB12DE1092660F47F5E19F934E5123 ; MKBv42/FindVUK 1.00 -0x2A339507DF858273C97DD275E3140D70633F1BB2 = STAR TREK TNG S5 D3 (Star Trek: The Next | V | 0x84E4B6673A4A0B4DA75B856733CA77B4 ; MKBv42/FindVUK 1.00 -0x8C45108A68A8D27B06A8AA6ED1933843592EDE60 = STAR TREK TNG S5 D3 (Star Trek: The Next | V | 0xA6B705DA7488869312A0646DCC50FB81 ; MKBv42/FindVUK 1.00 -0xF2044FD5920F71EA644F825F7612A635E690ED78 = STAR TREK TNG S5 D3 (Star Trek: The Next | V | 0x383A4A24CBFD4FE7C0B53A8DF0CCE0AE ; MKBv42/FindVUK 1.00 -0xF5801B7131CD78B38752A9BF00B596A50C96D8E8 = STAR TREK TNG S5 D3 (Star Trek: The Next | V | 0xB47E62FE8B9A274CF00FE4FF52768429 ; MKBv42/FindVUK 1.00 -0xA7A164C0C2F6F4B9CDBBF1C7DB4DDB73C420DA45 = STAR TREK TNG S5 D4 | V | 0x157716E93E6F2247C540D6931484D270 ; ThomaZ -0x7D35DE6D7323D1FACAEBD0D4A7B3F60FD638F852 = STAR TREK TNG S5 D5 (Star Trek: The Next | V | 0x2381EB6C9B1B9497D208FCBA687A4FBF ; MKBv42/FindVUK 1.00 -0xB1B7AF76D5E77101892D814B041A2A5CDB17D139 = STAR TREK TNG S5 D5 (Star Trek: The Next | V | 0x6264C06CC269F3A8044E014B01869BF7 ; MKBv42/FindVUK 1.00 -0xD219781087BF8A1FA9728723FD21A67B2F10145D = STAR TREK TNG S5 D6 | V | 0xD6D845F3A46222F15873BFA336127274 ; MKBv42/FindVUK 0.80 -0x1924DA340277E24F6774BE6F902CA629E3A3DB48 = STAR TREK TNG S5 D6 (Star Trek: The Next | V | 0xA45C67C6087EA4BC64BFA5311AF49CB6 ; MKBv42/FindVUK 1.00 -0x3C13A7DCAC25687AB505D5A80AF0ACCED46C9450 = STAR TREK TNG S5 D6 (Star Trek: The Next | V | 0x51982026B7972F88A6CDC4C9524E64FA ; MKBv42/FindVUK 1.00 -0x64EA60A7CF475EC054B8CC5DFF114DA3307708DF = STAR TREK TNG S6 D1 (Star Trek: The Next | V | 0xB117BB1257B94F8BA6281980DFA88E3F ; MKBv46/FindVUK 1.00 -0xDF9C268F091A8C906445779DA9A0B6E121D1FD10 = STAR TREK TNG S6 D1 (Star Trek: The Next | V | 0x341336DA84221061916E99796C5AF5B2 ; MKBv46/FindVUK 1.00 -0x5EFC421C5D9FBD5265CCBB732301B34A4B514923 = STAR TREK TNG S6 D2 (Star Trek: The Next | V | 0x7906DD08EAFC93C3082640430697D2FB ; MKBv46/FindVUK 1.00 -0xDF23BD2C3ED16F57E6CFA359446C5DC4BD3BD31D = STAR TREK TNG S6 D2 (Star Trek: The Next | V | 0x3C8B0029907126D68B20A825135BADAC ; MKBv46/FindVUK 1.00 -0x88DD9487A1BAA686B68B7BD839381D0C6AD110BC = STAR TREK TNG S6 D2 (Star Trek: The Next | V | 0x19C74A315525C305D1106E8A2D0A1B63 ; MKBv46/FindVUK 0.92 -0x2A95B9AC34B47358644D1C0C1D3BC9583EB4C1F2 = STAR TREK TNG S6 D3 (Star Trek: The Next | V | 0x5D06D4E4E915EB1C72CB83570EA58428 ; MKBv46/FindVUK 1.00 -0x2160AEAF37D9A3CADFC1D0512623A69E3F2128B1 = STAR TREK TNG S6 D3 (Star Trek: The Next | V | 0x56BB415EB8E297F6696DB0893F3984F7 ; MKBv46/FindVUK 1.00 -0x60943EE80BFAC00053DC648EF9A2D5B0A5D9CDFA = STAR TREK TNG S6 D4 (Star Trek: The Next | V | 0x16AB3D09944531F03DC0128756B74D3A ; MKBv46/FindVUK 1.00 -0xDA4B5785CED6C1FA4B9497DB511E830CE8B85C5E = STAR TREK TNG S6 D4 (Star Trek: The Next | V | 0x00F6601B2EAB09B99AE55C06234F1D1E ; MKBv46/FindVUK 1.00 -0xA92E152DAF8E573A16488C1ED5C97B576B146054 = STAR TREK TNG S6 D5 (Star Trek: The Next | V | 0x20237F94868E6493E3C3F9A151E97869 ; MKBv46/FindVUK 1.00 -0x3C07E3CC0B3850A62ED49157C9DF0748EB0063A2 = STAR TREK TNG S6 D5 (Star Trek: The Next | V | 0xB750D9CB0D54792B431AF6A76DD7DB24 ; MKBv46/FindVUK 1.00 -0xB8F3A7243FFB49646D5C950AEC747B1BB173F561 = STAR TREK TNG S6 D6 (Star Trek: The Next | V | 0x1623BCF0DF060FBD6C6518CCF0169F5F ; MKBv46/FindVUK 1.00 -0x8C2395CAACCD92177CC90F02996AC95BB6736A9A = STAR TREK TNG S6 D6 (Star Trek: The Next | V | 0xDD722B01F0E29099C72ADAFCBF405749 ; MKBv46/FindVUK 1.00 -0x647AC1013378595F33D0761EBDFDD42240349AB1 = STAR TREK TNG S7 D2 | V | 0x4FA519FA2A33A4B9860C8DF1655FE9D7 ; ThomaZ -0x292830EA3E6ECE2367521BC0B14E0BB8C083ABBF = STAR TREK TNG SEASON 7 DISC 1 | V | 0xB9D0B72A92DAE0DE0D1C1CF8200E098C ; MKBv47/FindVUK 0.80 -0xE7273AB9A40C55BCC9DF8973E54B09613CDCB054 = STAR TREK TNG SEASON 7 DISC 1 (Star Trek | V | 0xFFDCB79C8C98D618B86EFC2600514E5B ; MKBv47/FindVUK 1.00 -0xB1C466B61FE231B136FB1279295A38C01564B882 = STAR TREK TNG SEASON 7 DISC 1 (Star Trek | V | 0x6D61BF4924ED89A61CCC0F385391432F ; MKBv47/FindVUK 0.99 -0xFBD4B99AFB695921999C03F9EFF56C3BEDA092F7 = STAR TREK TNG SEASON 7 DISC 2 (Star Trek | V | 0x7381FAF7608389450B5A0E0B17ECA16B ; MKBv47/FindVUK 1.00 -0xDB278AA07153725C271EAA586DDBA7965C1166CF = STAR TREK TNG SEASON 7 DISC 2 (Star Trek | V | 0xC50A43A36F153F2CD2CCA3B6857D33CE ; MKBv47/FindVUK 1.00 -0xBB004DCE56008CA474A3CCE41E7D1E240E52B7DF = STAR TREK TNG SEASON 7 DISC 3 | V | 0x2991EBEDBA7F262653F8D867C9603EE2 ; MKBv47/FindVUK 0.80 -0xCC3E5BFEC39432F00CCAED446F8CF96122C2FAC0 = STAR TREK TNG SEASON 7 DISC 3 (Star Trek | V | 0x84B9C4558E81DFA1EFC5F5BB67302B88 ; MKBv47/FindVUK 1.00 -0x9F2D82E1A9A84CC1B11BDD2A87DA60091F633A4C = STAR TREK TNG SEASON 7 DISC 3 (Star Trek | V | 0x8697EE60FFC77420B057FE2A19ACFBF7 ; MKBv47/FindVUK 1.00 -0xE8124107FA508BFAA0DDB40BD5B104F20AB76801 = STAR TREK TNG SEASON 7 DISC 4 (Star Trek | V | 0x7EEE0F4A9D8017CA766AEC241302F2D5 ; MKBv47/FindVUK 1.00 -0xEFC60591FC515E6592AEDBD6A96CE36BBE0D18CD = STAR TREK TNG SEASON 7 DISC 4 (Star Trek | V | 0xDB4A977E959357F2240025079AD4A6BF ; MKBv47/FindVUK 1.00 -0x8EFA697ED9F272C70D27355D81E08D31A9832B66 = STAR TREK TNG SEASON 7 DISC 5 | V | 0xE4F47E0E9EB7E216C0FDD5B610C18C82 ; MKBv47/FindVUK 0.80 -0xBD89E972D09EEA463FDBC2AA2F276C8B3AF54953 = STAR TREK TNG SEASON 7 DISC 5 (Star Trek | V | 0x5AAD0B2B6B31C276BCE638CEC08197DE ; MKBv47/FindVUK 1.00 -0x8BB177D131C66A9E1570FFAFA25008928135C299 = STAR TREK TNG SEASON 7 DISC 5 (Star Trek | V | 0xF973AB7B12010D66E27819367AE512EF ; MKBv47/FindVUK 1.00 -0x9D4B9978932FD8F7C12006DF7F72416C03172E81 = STAR TREK TNG SEASON 7 DISC 6 (Star Trek | V | 0x149728FDDEE1D19C7E12B41595BEF0E8 ; MKBv47/FindVUK 1.00 -0xDD3B4324D62520DC9D056A4E9EA9D1DB53EF965E = STAR TREK TNG SEASON 7 DISC 6 (Star Trek | V | 0xCD145A51F74142775A10FE551A9EC094 ; MKBv47/FindVUK 1.00 -0xB06C3E71828ED1979615568EDD9E1E306F7A630B = STAR TREK TNG UNIFICATION (Star Trek: Th | V | 0x337F094617662D40527025E6636B56A8 ; MKBv42/FindVUK 1.00 -0x0083CAB17CA49F458D62E76601C596EE401EFD79 = STAR TREK TNG UNIFICATION (Star Trek: Th | V | 0x5EEA74B6ACEB455E2FDFF09B6AF1617B ; MKBv42/FindVUK 1.02 -0x6FB881CC62B197B34C18222D33B0179E4A84D28C = Star Trek: The Next Generation Season 3 | V | 0x07DF7F76360F68DFB5260A3431138CA2 ; ThomaZ -0x5A8BFE5553DBDFEFCFC046C57E25AFD93598F25A = Star Wars: Episode VII - The Force Awake | V | 0x1EDFCEF1FC9EF63AC3BA235AA66929CA ; mkbv46 -0x23660EFFB7952C345EC043BDD67EBFF0BFEFD7A3 = STARANIS_LIVE2015_BD_DISC1 (STAR???ANIS | V | 0x4DA34D7CFC33256595BAFC31795DB6C1 ; MKBv57/FindVUK 0.96 -0x492E483E5601C89576E2C37C26932BBED89F53D5 = STARANIS_LIVE2015_BD_DISC2 (STAR???ANIS | V | 0xB5A58B2F40310EEC9890032CE697794C ; MKBv57/FindVUK 0.96 -0x5C9320E0DB50E3B6678F7EB1894688AB6FEDCAFB = STARANIS_LIVE2015_BD_DISC3 (STAR???ANIS | V | 0x396BD7E68A33A893D56250FEFEE3AF69 ; MKBv57/FindVUK 0.96 -0xE77B49CA47D1C4C23D015B47519A2632A09E80C9 = STARBUCK | V | 0x872BDF755E00A6710EBB01779F538841 ; MKBv35/FindVUK 0.92 -0x52F7D57AE9C92FE3923EA66252F5E0A455D36850 = Stardust | V | 0x6589500665B09FDC6450A07E933421D5 ; mkbv15 -0xD4D072B17C3D720BF829C0DB02BB4786EDEACF4D = STARDUST_EU | V | 0x5C98164D47632221BED58FD687066317 -0x313F5E513024161B9B924AA00AE90EE8DAEBAD97 = STARDUST_EU | V | 0xE70097464B2E69DC4A1E85CD0E424CB7 -0x910E64532BFFF921788BD79F760CB7E042FF3F86 = STARDUST_EU (Stardust (SCE)) | V | 0x61C9186C3D57047FC3C8DEF64BCE64CE ; MKBv15/FindVUK 0.96 -0xC851313266A4CED3222509FD5A4AE541209D26B9 = STARDUST_EU (Stardust (SCE)) | V | 0x63136269CC81B055B8723A04A50908BE ; MKBv15/FindVUK 0.84 -0x0CCEB01B5945A7A6D31C91CDFD802F9FD24274D1 = Stargate | V | 0x1D6661E4818FC92090CF7A17923E7759 -0x6F9C2CA0C4EF7EDEE7FF74F8091B95EE94DA1D47 = STARGATE | V | 0x25B5E4FACB4F2D42E755337A539486FB ; MKBv7/FindVUK 1.00 -0x06FB4AECC2FC50FE80A43E2233537C54EF085E04 = STARGATE | V | 0x6837FDF56E2D47776E858DFC173662C7 -0x7C62B7C6FADF0BC83FA89497FF6A0197034183E8 = STARGATE | V | 0x0C8302B99CD6389835B677AC232CAC71 -0x4AB73003D11B195460A960B968D5C9CB9B0F1A0B = Stargate | V | 0x66DEDBD6F6A8493B634528E5C285BD2B -0x629940A69876859AEADAC3D96415829399809B14 = STARGATE (Stargate - Blu-rayâ„¢) | V | 0xC8B3A88030BF1F791212B2CB0E316620 ; MKBv16/FindVUK 0.98 -0x31D9C7E7A7FA76900750402A3AC1D0A946C510FD = STARGATE_ATLANTIS | V | 0xE6B3F1CB60A4405DC00BCE4D5F4539D5 -0xEB057480B13CF9181075E01DB9FD92063141EE3D = STARGATE_ATLANTIS_S1_D1 (Stargate Atlant | V | 0x94FE87A857C4AD0010B85AEA98BA7E90 ; MKBv19/FindVUK 1.00 -0x3172C3D3A30B01D7C8A677B8010ED7D33DF0ABDF = STARGATE_ATLANTIS_S1_D2 (Stargate Atlant | V | 0xF124369A070A1ECAB2790C2AFE95441A ; MKBv19/FindVUK 1.00 -0xAC4FDE6A8FA47784E04EA58F15752BB8F22DA89D = STARGATE_ATLANTIS_S1_D2 (Stargate Atlant | V | 0x0788BEFE5E9217B34D8DC2388524FD51 ; MKBv19/FindVUK 0.99 -0xBA45383387BBCAFEA6D0C9494EEF6566B229A172 = STARGATE_ATLANTIS_S1_D3 (Stargate Atlant | V | 0xF8984A13BD36AB182A69BBEB08C67616 ; MKBv19/FindVUK 0.99 -0xE508839781319B671E21048EFEFE97DD21437B26 = STARGATE_ATLANTIS_S1_D3 (Stargate Atlant | V | 0xC6DCD6363A80F7469CB56D5D0069517E ; MKBv19/FindVUK 1.00 -0xC5B892E11EF908BCBBA86673863E43310E4705C8 = STARGATE_ATLANTIS_S1_D4 (Stargate Atlant | V | 0x56E51679F2EEAA76D50A95EC46712BE0 ; MKBv19/FindVUK 1.00 -0x3DFFFA543FA361AA4B57DFFA6105CEB1C742B01B = STARGATE_ATLANTIS_S1_D4 (Stargate Atlant | V | 0x2F7D8B80B9476C223792CCB44969FD66 ; MKBv19/FindVUK 0.99 -0x56C4B984E3C900F80FCCCAEB0A27B4B1C5D159D3 = STARGATE_ATLANTIS_S2_D1 (Stargate Atlant | V | 0xCAB7671B4458A4BE615A3338BA362427 ; MKBv19/FindVUK 0.99 -0xC59A27F294BEE82A8DCACC5B131F9118A46E90CF = STARGATE_ATLANTIS_S2_D1 (Stargate Atlant | V | 0xC461480662F2B0533A8C27EE3424B938 ; MKBv19/FindVUK 1.00 -0xCEEEADC036922077B9377E4E07D3249E154AB4FC = STARGATE_ATLANTIS_S2_D2 (Stargate Atlant | V | 0x45058C031846E29A987AD67A6DAC87F7 ; MKBv19/FindVUK 1.00 -0x68DFAE7CF731CB340CDB9E1C2BD1EC4EA489A190 = STARGATE_ATLANTIS_S2_D2 (Stargate Atlant | V | 0xDC1DB7A54B03D181B151A86C68E2BD5A ; MKBv19/FindVUK 0.99 -0xDF0ABCC74C3A9F04626EE9166E3AEBDDCE2FE3B8 = STARGATE_ATLANTIS_S2_D3 (Stargate Atlant | V | 0xD329A51804214057E3566DDDB9F66FC5 ; MKBv19/FindVUK 1.00 -0xB5B043D3E31A5F1F52B8DFEE1C1B301BA3B5120C = STARGATE_ATLANTIS_S2_D4 (Stargate Atlant | V | 0xBEC6778D88FD71F6596FEF3653A51675 ; MKBv19/FindVUK 1.00 -0xA613A9295A8983D8922FDFA1C64E9FE84D29100B = STARGATE_ATLANTIS_S2_D4 (Stargate Atlant | V | 0x5CC96E83D478B27CFD70988559F19A87 ; MKBv19/FindVUK 0.99 -0x7B787748DAD76CBECA90186B889C536E19ADD8F4 = STARGATE_ATLANTIS_S3_D1 (Stargate Atlant | V | 0x31A71FCCCAB16C13338CE471DDACA82C ; MKBv19/FindVUK 0.99 -0x2364BB4C03B1C20E17BF6F1B015A976CB8615FA1 = STARGATE_ATLANTIS_S3_D1 (Stargate Atlant | V | 0x6FFB280F6C5F5B2919E774FBB814A21F ; MKBv19/FindVUK 1.00 -0x7FF5120FD73CB6DA878EC08877D9DCA54DC2754B = STARGATE_ATLANTIS_S3_D2 (Stargate Atlant | V | 0x13E47ECB1F450EFD3737D43320D63C36 ; MKBv19/FindVUK 1.00 -0x346BB29AEB85362613740828381437D3BB5B810B = STARGATE_ATLANTIS_S3_D2 (Stargate Atlant | V | 0xE3E4A6543F9E5DBF65F4BC06DD2A997E ; MKBv19/FindVUK 0.99 -0xBF910C1FFE86D32130EC1B8D2538C0544E43F2E5 = STARGATE_ATLANTIS_S3_D3 (Stargate Atlant | V | 0xD89233BF10D79ECE46CCB6B340705808 ; MKBv19/FindVUK 0.99 -0xE2EDD1ACE842BFAFA9AF71E2DAB9367C13F80AA0 = STARGATE_ATLANTIS_S3_D3 (Stargate Atlant | V | 0x01F7F7384DBE713832A60D2C0382EA97 ; MKBv19/FindVUK 1.00 -0xABD97D85B48B907155B8FFF4595A4F015081CFFF = STARGATE_ATLANTIS_S3_D4 (Stargate Atlant | V | 0x204D5B240A837631107813EA22AFA1C6 ; MKBv19/FindVUK 1.00 -0xE411745E421E9F11672146B5816729DE874F3BFA = STARGATE_ATLANTIS_S3_D4 (Stargate Atlant | V | 0xEB1B5C5CFF12A1E8FE3C56C9ED1A5071 ; MKBv19/FindVUK 0.99 -0xC42AF5D16188AFB3202C9DE323F932D672ED1DF6 = STARGATE_ATLANTIS_S4_D1 (Stargate Atlant | V | 0xE870ECD38B50011E6D7EB60EDFA25780 ; MKBv19/FindVUK 0.99 -0xC8F15989CCAD2DB3E5DDB23C1532CA66063BEEE0 = STARGATE_ATLANTIS_S4_D1 (Stargate Atlant | V | 0x1DE8064329C78FD992BA905F08C40D27 ; MKBv19/FindVUK 1.00 -0xE0E08B9DAC3619723042E30586853BC9AD9D3C2A = STARGATE_ATLANTIS_S4_D2 (Stargate Atlant | V | 0xCC4C430CE09D2DCFA90668219F08C792 ; MKBv19/FindVUK 1.00 -0xA5E40D0A68BB17B7B54CA32E0922C7977AA5E7A9 = STARGATE_ATLANTIS_S4_D2 (Stargate Atlant | V | 0x5DFED17C89E2229CA6B0E3956846B38B ; MKBv19/FindVUK 0.99 -0xECB1CA1F42045D43B054F2097332E52CF60DAB4F = STARGATE_ATLANTIS_S4_D3 (Stargate Atlant | V | 0xA952A9BE9A3ADF26E94C8D7BFC0ED1AA ; MKBv20/FindVUK 0.99 -0x0D5C2DAB619EE2CDA5B2E4EFA9DB7C1549406E65 = STARGATE_ATLANTIS_S4_D3 (Stargate Atlant | V | 0xC880B842012E11420598CDC8DFE59F28 ; MKBv20/FindVUK 1.00 -0x1AF157648E05AECFCCBBF8E8826F16A662D66478 = STARGATE_ATLANTIS_S4_D4 (Stargate Atlant | V | 0x07B45777821D41B4AD942D4B6631B7C0 ; MKBv20/FindVUK 1.00 -0x4E0E8F6FE9EF3C5E44C342C51FF10A67C073F48D = STARGATE_ATLANTIS_S5_D1 (Stargate Atlant | V | 0x418A3C4FE958F26E5B7171B5FCF0BE21 ; MKBv19/FindVUK 1.00 -0xA800F8A67BFFC02D516FAE4F257A8FD4FB9FC4A5 = STARGATE_ATLANTIS_S5_D2 (Stargate Atlant | V | 0x7CE63657B4D97C78F193235C62C9184A ; MKBv19/FindVUK 1.00 -0x70133A35843B56BD25E31EB7E6CE32D049AD27AC = STARGATE_ATLANTIS_S5_D3 (Stargate Atlant | V | 0x85165938C8C2BF7878776620200E4313 ; MKBv19/FindVUK 1.00 -0x23E520BBAAA3638872901F5A2152B87DF3FF2D11 = STARGATE_ATLANTIS_S5_D4 (Stargate Atlant | V | 0x47DF2A927B643605D28715782E2D6A1D ; MKBv20/FindVUK 1.00 -0x6CDF0F39164B5FEE4EDAAAFFF0942236AA4E8DF4 = STARGATE_ATLANTIS_S5_D4 (Stargate Atlant | V | 0x9FF9D566DA3164818772AF5FD543E467 ; MKBv20/FindVUK 0.99 -0x86026CF519049126533925A652D401695482D69E = STARGATE_ATLANTIS_S5_D4 (Stargate Atlant | V | 0x2011D8743545FEAF788820E4D620DD07 ; MKBv20/FindVUK 1.00 -0xCEDC47A426B528C724E8B5C7A2CCACA1CADC5110 = STARGATE_CONTINUUM | V | 0x96C6CBB21A432E47D493BED286335674 ; MKBv7/BD+/FindVUK 0.96 -0x8E00B3F0182849633C85C739EB360B12F7FBA7C5 = STARGATE_CONTINUUM | V | 0x35E55424B6AAEEB2A785AEF6ACC6A5BF ; MKBv7/BD+/FindVUK 1.00 -0x61179AD739B7D3D302EC279E8591A6774E5DE512 = STARGATE_VCOURTE | V | 0xA30F72EAD637FD5CE8F9D3FA1BF6FBD3 ; MKBv8/FindVUK 0.96 -0x2C10691C3E71E1DA55B076408FA150F361E820E3 = STARGATE_VLONGUE | V | 0xEE5FD7470C45921CFBF1CDD162281495 ; MKBv8/FindVUK 0.91 -0x12F93E2CCE3DBC1631C73F215177C964FCC1E0D8 = STARMAN_1984 | V | 0x09FFA4F0E2DADFE673C95ED18B0871D4 -0x820D8FA8DEE776C9C5A34E7F66DB8481C03E7114 = STARSHIP TROOPERS 2 | V | 0x10224F8368DE4D1FDCF91D777E386BFE -0x74FD525531D17D20C293D5010A15401E32E80DF6 = STARSHIP_TROOPERS | V | 0x5A20A729FD70717F439BF1A1F716EE7C -0x4062188545891F7906E4C98986171D37154ACBA0 = STARSKYHUTCH_DISNEY | V | 0xC794103AF141CBE80958C01BEBE42128 -0x55810D33DD9D16F0D69ECC7103580F7296DC0FE6 = STARTER_FOR_10 | V | 0x4B0CF16B7E570D039018CCFF487A32CE ; MKBv9/FindVUK 0.98 -0x0805047D2882CEB044EAA1A7D11C10F382487283 = STARTREK0x11D1AC | V | 0x44C641E3F1F35E8FFC8EEE2172C23026 -0xD7F4F568700EE843F32724E9A8295C1285D8450D = STARTREK0x11D1AC | V | 0xE38276263720EB3907E985738A251DF4 -0xADCCE56F90AE7DCFB408E6B66E44EAA9F07BD52C = STARTREK0x11D1AC | V | 0xF709BDB3D28EE35603A34746FF95CF4D -0x01783ADE23DD26F5C368E5A1A75DACF0BEF909D4 = STARTREK0x11D1EU | V | 0x1856A68BE63D7CB3C0638F8BD2276C5F -0x3AAF5CE921627D700382536EF06873B23B34D678 = STARTREK11D1AC (Star Trek Disc 1) | V | 0x2D0A5A39D73AE05A0C832AEB69A39752 ; MKBv14/FindVUK 1.00 -0x6DC78D22859975E0CCEE305FE7F45238FE2FE464 = STARTREK11D1AC (Star Trek Disc 1) | V | 0x2201A55DA97DBF020C3D60C4D270E6A6 ; MKBv14/FindVUK 0.96 -0x52BEFD904C46F4520B3EE3CBC7613E580502D637 = STARTREK11D1AC (Star Trek Disc 1) | V | 0xF45696EF0B5FC2FD08F536AA5B47CFEE ; MKBv14/FindVUK 0.96 -0x1222089FD2A03D49DAF8A95691C196FF3F1CF797 = STARTREK11D1EU | V | 0xE4A89EF89BAD8C13DFCA72D527271316 ; MKBrev 14 - FindVUK 0.57 -0x14F8712F0B89683630077702055802532993476A = STARTREK11D1EU (Star Trek Disc 1) | V | 0x19A3630739E123E9C995124D1A09CE57 ; MKBv14/FindVUK 1.00 -0xD4CCC609B1C6FC1F3979A8CE935E960EC2B5FF8A = STARTREK11D1EU (Star Trek Disc 1) | V | 0x3F1F115447E9B927EC7FC246D73AC7AF ; MKBv14/FindVUK 1.00 -0xEDE9401583C4943E98925006513D052F83AB6211 = STARTREK11D1EU (Star Trek Disc 1) | V | 0xFC37E2F062EC593807F958310445415E ; MKBv14/FindVUK 0.96 -0x64C0EAA85A07E6BFA02F57E276C3AA18B1422B7E = STARTREK11D1EU (Star Trek Disc 1) | V | 0xBDC8E5E3D16324C72B5D43745D026D29 ; MKBv14/FindVUK 1.00 -0xFC6FF052392B57AF2633C0B1180CD57D0DBFC560 = STARTREKXI_D2_AC | V | 0xFF85D9423626970523AD329DAF20CCF8 -0xD36A36171EDBE4E072937EE2F20A57B3E719B09C = STARTREKXI_D2_AC | V | 0x19CD2339EDFB314F629638683DF2301D -0x850B82BC373769A0AF7C6DAA5C3DDF074C58C3A6 = STARTREKXI_D2_AC | V | 0x89A004CE71A7E6BEED655AC076DFCDEB -0xD2ECB165283BCCA3774BACE33D9D9CD115DE3C03 = STARTREKXI_D2_AP | V | 0x18C390DDAB5B333BE9C3629CF3C1EA82 -0xEF6B27671DC056872F53C4B213A43CA0169D9A75 = STARTREKXI_D2_EL | V | 0xA5A8106DB459ADF7404F870A90B7788D -0x4B3411491CD1EE5A839E7613440FF1BD2033C202 = STARTREKXI_D2_EU | V | 0xFDCBDDE3B82DAD5C260A0AA2EA516D98 -0x2F77C9D5A5FF7058A1A6414CB222863BB77279A4 = STARTREKXI_D2_EU | V | 0x305629F2B919523ACED7DBD87028EA8D ; MKBrev 14 - FindVUK 0.62 -0x336BAC445ECAAF1576B10BF641E393382ED1B0A5 = STARTREKXI_D2_EU | V | 0x8CCC00F20449CF945ADE753C0A6D1BBC -0x1960B84C0DB1EFF6B578489009C4FE4FBED45EFF = STARTREKXI_D2_EU (Star Trek Disc 2) | V | 0xEBC20819FF3C5BF95178BC807FC063F9 ; MKBv14/FindVUK 0.96 -0x953D6B249252E0052893167CDA60030816B9620D = STARTREK_AC_BONUSDISC (Star Trek Summit) | V | 0x2545D07CA61F9804F4DC6522F4046AEF ; MKBv12/FindVUK 0.84 -0xEF5C603FE93FF8965F54514F8B84B7C4B963DD19 = STARTREK_AC_BONUSDISC (Star Trek Summit) | V | 0x706B5E063BDCAB23B5269532D157D606 ; MKBv12/FindVUK 0.92 -0x9AC120A1FE6C552BDEBEDAA105C72307FA017305 = STARTREK_BONUS_EU (Star Trek Summit) | V | 0x11AD3C379658269DDB8D555E0159C815 ; MKBv12/FindVUK 0.91 -0x440010CB7A2CC9E026DEAF9CCE44CDD6284306CB = STARTREK_BONUS_EU (Star Trek Summit) | V | 0x6DD432D75275047111DEA11C1AB7B45C ; MKBv12/FindVUK 1.00 -0x55DD301E608AF44C0D3E1BA2E02E7384BE79CFEF = STARTREK_BONUS_EU (Star Trek Summit) | V | 0xBDDB850DC892D454C4E0DD24D432C7EB ; MKBv12/FindVUK 1.00 -0x62155BA79E15E4A2D3F914A5D16AEFEF693FE1C4 = STARTREK_EVOLUTIONS (Star Trek Evolution | V | 0xC8A914F622161AD8C56EB12AA78BF79F ; MKBv14/FindVUK 1.00 -0xDA6D61F70486CB3FD4C5CDBB0F7B5B6E13A142E3 = STARTREK_EVOLUTIONS (Star Trek Evolution | V | 0xCD35AF02B25D5FFCC78118E4B33B496F ; MKBv14/FindVUK 1.00 -0x78ABB87B677D12EC46F5180782AA919EE3AF41ED = STARTREK_EVOLUTIONS (Star Trek Evolution | V | 0x6C73BDDEF7A5F448135118C5CA2903BD ; MKBv14/FindVUK 0.91 -0x7DA7654502CBD3C508FCD7762F1D286F30D5DE23 = STARTREK_EVOLUTIONS (Star Trek Evolution | V | 0xD6916E2EEA52425AF312AEC8A1590DBB ; MKBv12/FindVUK 0.84 -0x12A40C44214CFF2925591D209AF0AA3C85A65F7E = STARTREK_IV_AC (Star Trek IV The Voyage | V | 0x7AEED9678606BE7C181A11551B6FD8C5 ; MKBv12/FindVUK 0.84 -0x517593C72E66E08D9D0088FE74D4484660E03BC3 = STARTREK_IV_AC (Star Trek IV The Voyage | V | 0x215915BDAB832361A304391EA39985ED ; MKBv12/FindVUK 0.99 -0x787FB1A24F334EBB84E2CBD6E0FD998B1D978DDF = STARTREK_IV_AC (Star Trek IV The Voyage | V | 0x4AC1881D3C3E57130844DA78CEA291D8 ; MKBv12/FindVUK 0.96 -0x409B5DE3BD8B8D846B9EEEEF7BBC989E25DE29B4 = STARTREK_IV_AP | V | 0x1BAAD34094B16664FCDFD5C796EC6CE0 -0xDDEDA68EF8D449FB43CE8E7C77108B19F03E67DA = STARTREK_IV_EU (Star Trek IV The Voyage | V | 0xED6FEA3B731D62F9D7D73D0C6B68DC1B ; MKBv12/FindVUK 1.00 -0xA961B471C816E4D7C9860C1FF700556AC330CA6B = STARTREK_IV_EU (Star Trek IV The Voyage | V | 0x3DFC10F0C279C9AFF4082B0D9A22411E ; MKBv12/FindVUK 1.00 -0x35D46BB6B0A6DDF3DF7299CB8095A0756C883FB9 = STARTREK_IV_EU (Star Trek IV The Voyage | V | 0x8802B65666F5E586EC8E9D4354C37E84 ; MKBv12/FindVUK 1.00 -0x45D68306D5EA5C5C5CF3ECD3345278BC3AB8ECB8 = STARTREK_IV_EU (Star Trek IV The Voyage | V | 0x0E8BC17E423C1C89B03CC3B815A32949 ; MKBv12/FindVUK 1.02 -0x34C25FB3B5AC5C739E57056A8821705084E79BF8 = STARTREK_VI | V | 0xA64EA26269B4FF6B8D94B965996C6BB9 -0x0C4CE675250413A76713DE79A7D62DD4D121FCBE = STARTREK_VI (Star Trek VI The Undiscover | V | 0xFB00D58CAD7E9D9975191276BDE0D396 ; MKBv12/FindVUK 0.99 -0x7FF0BA08F240A5F14AFD1E7B55FF0F1233E20148 = STARTREK_VI (Star Trek VI The Undiscover | V | 0xF2D72BC5BC8419E167FE2D9D1A2B0F7C ; MKBv12/FindVUK 0.84 -0xB9964373DDAD153B0CDFFAE023A7C8CAF7B74B63 = STARTREK_VI (Star Trek VI The Undiscover | V | 0xA3DA39BDB983EC58F5D310649D9599BC ; MKBv12/FindVUK 0.96 -0x99B8CF03B10351C6C36CB6F3C1E156FB88A19B37 = STARTREK_VI_EU | V | 0xAC664C6AFE7A13F8768270C05F949CA8 -0x9BC8854408D5E03581511C109D3E90EB1F0ECB1B = STARTREK_VI_EU (Star Trek VI The Undisco | V | 0x1152D60B352E914F7DFFC869D226B0C9 ; MKBv12/FindVUK 1.02 -0x4E95BC0A9E5C1DB94B04374FD22211C494C690BF = STARTREK_VI_EU (Star Trek VI The Undisco | V | 0x078BB56253F22675324634D11F8DAF56 ; MKBv12/FindVUK 1.00 -0x39D1EB9D87D91480DFC6F24B028FE88F8716E54C = STARTREK_VI_EU (Star Trek VI The Undisco | V | 0x550BBEEC7F25EE5D7D2A56F22057B002 ; MKBv12/FindVUK 1.00 -0x1882DBEC2D6D3F5C470DA505198861080E8395C6 = STARTREK_VI_EU (Star Trek VI The Undisco | V | 0x5FC9BC220E100CADFF47A8C3BF0DC0C1 ; MKBv12/FindVUK 0.96 -0xE9905916513AA2581719D14752ACD3A5F522140F = STAR_CHAMBER_THE (Star Chamber - Blu-ray | V | 0xA1B2D6615C80DDCF396FEC6E0438C5F9 ; MKBv34/FindVUK 0.96 -0xD1D77BAA51383CCD32EE4210D3080847979179D6 = STAR_TREK_2_AC (Star Trek II The Wrath o | V | 0x9C7E8F8D0619918699D9EB686EDAC499 ; MKBv12/FindVUK 0.96 -0xEBADD9A3F6942D396618A9A7FDAE645DD4AF5361 = STAR_TREK_2_AC (Star Trek II The Wrath o | V | 0x21E7C88F5C27C02CE94EF35D225E6B66 ; MKBv12/FindVUK 0.99 -0x46B3C5652DB57EE27EA18C6B679FF2DBE3D8EEBA = STAR_TREK_2_AC (Star Trek II The Wrath o | V | 0x04D9D6EAF563B46B291A2E8CD760EC79 ; MKBv12/FindVUK 0.84 -0xC8F94990D72D4BB085F1FC31D9A9FFD43E7C3DB6 = STAR_TREK_2_EU | V | 0x28BB9FE80BEE059B9F70FF26AB19D86D ; ThomaZ -0x4516FFAA5C9144957166A9CB3E2CC6E7F7191F7E = STAR_TREK_2_EU (Star Trek II The Wrath o | V | 0x42BE3711816BFA11095174356DA71F0B ; MKBv12/FindVUK 1.02 -0x2411B40364CEB96BAC686DEAD936DC1D86061734 = STAR_TREK_2_EU (Star Trek II The Wrath o | V | 0xBE34509382321AE53A7AA7DDFF0359B5 ; MKBv12/FindVUK 1.00 -0x0245D7D3A752B641DD6BE0271A05DDBB06FAFC14 = STAR_TREK_2_EU (Star Trek II The Wrath o | V | 0x6202E3CAA27CCD9443DE2E59D8CE5FFC ; MKBv12/FindVUK 1.00 -0x5ABF8CBA16210411BF6C2B08D93745F76356615F = STAR_TREK_3_AC (Star Trek III The Search | V | 0xBB87DDD1F79DA3E8105383A123E8FAF8 ; MKBv12/FindVUK 0.84 -0x87C71342343338321705AC85DF70CE360327A944 = STAR_TREK_3_AC (Star Trek III The Search | V | 0xE5275305BB872A25E063B64ED8BC3D1F ; MKBv12/FindVUK 0.99 -0xA8E7BE8752EE9EA6CFAE4CE97C11C2C84FAF836F = STAR_TREK_3_AC (Star Trek III The Search | V | 0xAFD6AF74F56EB1F0A466285126262B73 ; MKBv12/FindVUK 0.96 -0x1330D18F9876ED56107B16B54E9F8FE315C2E0E5 = STAR_TREK_3_EU (Star Trek III The Search | V | 0xB73F58718D55482A4C80B2CF5DB7C4AD ; MKBv12/FindVUK 1.00 -0xF0BB7D34C54C3D6352909A4786F278A749D666FC = STAR_TREK_3_EU (Star Trek III The Search | V | 0x75168CC1591FD9DDBC3B009965774922 ; MKBv12/FindVUK 1.00 -0x3E2D69A6A8FA9A71715D5FAB0A0E7F0C24BADCA2 = STAR_TREK_3_EU (Star Trek III The Search | V | 0x886EB24860B217F231CA55F148C6E977 ; MKBv12/FindVUK 1.00 -0xC6E292A0C4B599F436E6CBDC01048E465A66B075 = STAR_TREK_5_AC (Star Trek V The Final Fr | V | 0xCF7AEC386E5F6E3103438F607B2646E3 ; MKBv12/FindVUK 0.84 -0xB67B12E095A36F6304927657A2AD180F22D2394C = STAR_TREK_5_AC (Star Trek V The Final Fr | V | 0x8E7E5615C8D0AE8E283403917F165F70 ; MKBv12/FindVUK 0.99 -0x1434815896EBA3A9512465A145D1B10FD7FF61A0 = STAR_TREK_5_AC (Star Trek V The Final Fr | V | 0x023CCBF960DFFA864BEBE054A53A9F9B ; MKBv12/FindVUK 0.96 -0x9FE9A5B3211CEBD7F6FE5D7229E47EE2C113F637 = STAR_TREK_5_EU | V | 0x510BBE12EC9B7607200C1FA62E33D81C -0x552E2B91348DB9390D994ADA8711683441192B5F = STAR_TREK_5_EU | V | 0x0266D98E6CD15A88C2A464D03F75025C -0x01CACB1CED68A1377391EF06CD9F57E80D59E701 = STAR_TREK_5_EU (Star Trek V The Final Fr | V | 0x07BD1664446CB135E90A91D812206B78 ; MKBv12/FindVUK 1.02 -0x34DDBBA9AF8175F94AB28E9887BE2844FAD9056C = STAR_TREK_5_EU (Star Trek V The Final Fr | V | 0x06C7555AC94CE8068CC42FF06172747D ; MKBv12/FindVUK 1.00 -0xE8985D7F1AAF404695EE3CA4B50DAA54D35AB441 = STAR_TREK_5_EU (Star Trek V The Final Fr | V | 0xBA449F1F07B7234822EA95E54B2262AB ; MKBv12/FindVUK 1.00 -0x610531B890E6D9779F68B37F6CDFAB76521F9655 = Star_Trek_Beyond (Star Trek Beyond) | V | 0x731B0D622FD71B7738F8E3C912A19C45 ; MKBv57/BEE/FindVUK 1.02 -0x6CAF3C6F1E277C36DBAFB6E97DEF65C55C55BF44 = Star_Trek_Beyond (Star Trek Beyond) | V | 0x3AE622A1220625F48261018211CC1843 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 0.92 -0x1E9575A97E431A37C1CABF7A4BEF84F00A5A7FBA = Star_Trek_Beyond (Star Trek Beyond) | V | 0xE6D58FE64CA9539615C5E5A41C82891B ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.02 -0xDB272F0F0A7DE1E7EC5C59928FF6A90B47CC4504 = Star_Trek_Beyond (Star Trek Beyond) | V | 0xC8CC3307563921DF9B4687483E7B8F9A ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.00 -0xD2F7A26978263F268E8D922DE6496F89F392E7A3 = Star_Trek_Beyond (Star Trek Beyond) | V | 0x8A7C7BCBEB4AE57C1B1ABDCB2F70C65C ; MKBv57/BEE/FindVUK 1.00 -0x0AED33A4B5D0B9A2EE60F1788FC680374C6A34CB = Star_Trek_Beyond (Star Trek Beyond) | V | 0xEA1E5778FC153E3705E24789A14A5391 ; MKBv57/BEE/FindVUK 1.00 -0xFF01D5E64803CA0F31D2FC83ED85661ADD67DFF4 = Star_Trek_Beyond (Star Trek Beyond) | V | 0x65FF08BF960349C9E024F40B3D010FA6 ; MKBv57/BEE/VUKNOTVAL!/FindVUK 1.00 -0xD0F98FFF7D1A75BBE6240F70ADE51329E819DA1D = Star_Trek_Beyond (Star Trek Beyond) | V | 0xAD86C78315939C60384CA2A5AEB48D4D ; MKBv50/BEE/FindVUK 1.00 -0xCA3B946068988EE330FE5C24E371818D07153177 = Star_Trek_Beyond_3D (Star Trek Beyond 3D | V | 0xF155D757FE595D15213658A1708D9C65 ; MKBv57/BEE/FindVUK 1.02 -0x904862B07B9E9D564DC3647C62F761D9BBAA34BE = Star_Trek_Beyond_3D (Star Trek Beyond 3D) | V | 0xDBBFBD72F1FB4C86AF0CE824638FEAD5 ; MKBv57/BEE/VUKNOTVAL!/FindVUK 1.00 -0x863CD1A9CCBE1BFB529104CBF6054D9D650F6099 = Star_Trek_Beyond_Bonus_Disc (Star Trek Beyond Bonus Disc) | V | 0xC1B6CDE75B331A65B6033226D36CC01D ; MKBv56/BEE/VUKNOTVAL!/FindVUK 0.98 -0x6CBDE8464D273B96EBD484BDC6B049CA8ECEE580 = STAR_TREK_INSURRECTION | V | 0xD168BB6E7C5A82C862D8D2DF0EA1B8F2 -0x6C7AA80E2ED130C89043954827947FDEBE06B896 = Star_Trek_Into_Darkness | V | 0x43187A9E08572576B2E443DE6D546343 ; MKBrev 35 - FindVUK 0.54 -0x0DB4A43C5089A97B82F087106AFFB4C5B5083DF2 = Star_Trek_Into_Darkness | V | 0x5391AAE21758D2A994D001DF38A9F34A ; Star Trek Into Darkness -0xE94FB39F7739148B10B0C6927B6893086EEF2F05 = Star_Trek_Into_Darkness | V | 0xC0B02FC6F6CF011ED7E910C47471D0AF -0xE507727A28854AA9AD72F16DD17A26B4E9EF3F23 = Star_Trek_Into_Darkness (Star Trek Into | V | 0x6AA63D5D5911A5E2811173A62CBA2AB9 ; MKBv35/FindVUK 0.98 -0x3CC0BFCA6A114DE67F9A2F750B85B94FAFB89BAF = Star_Trek_Into_Darkness (Star Trek Into | V | 0x7973CB8678832E455677C22693D22C56 ; MKBv35/FindVUK 1.00 -0x9896A44CB6AED21A98DA7554B98662B2A2DD285D = Star_Trek_Into_Darkness (Star Trek Into | V | 0x76740F4AAEE72F24833A6C5A111457AA ; MKBv35/FindVUK 1.02 -0x7017BBC141123BE6B82E35E1842D9BC713031FFA = Star_Trek_Into_Darkness (Star Trek Into | V | 0xDD87955ACBC1E509FC1C9A2E3E8D1432 ; MKBv31/FindVUK 1.02 -0x98CAE940A7717D564401D5323DF89255743E42D4 = Star_Trek_Into_Darkness (Star Trek Into | V | 0x5B66956EB9B706E516FBB30C9ADF0C58 ; MKBv35/FindVUK 1.00 -0xB5440B6BAA9B6EB6680EDBEA993BF4F25DF7F314 = Star_Trek_Into_Darkness (Star Trek Into | V | 0x8E0D8568437CBB02492D7B6BA408ED8B ; MKBv31/FindVUK 1.00 -0xDFB9ADC1C1495CA790B48BBC9EE914F6180B295A = Star_Trek_Into_Darkness (Star Trek Into | V | 0x1FFDDA2D5FE6FE2DDBE477508E5B75A0 ; MKBv35/FindVUK 0.92 -0xF6CB2A9E8F06C0668DD294C76F5A541D81689EB3 = Star_Trek_Into_Darkness (Star Trek Into | V | 0x2E1DBCA20E47BF054FF25AF4D63E5D8C ; MKBv35/FindVUK 0.90 -0x30088A556CC8949B2F9B75AFA84BFC1FC554C3DE = Star_Trek_Into_Darkness (Star Trek Into | V | 0xC2A6E14083D992818657BF88D83878BE ; MKBv35/FindVUK 0.92 -0x6109D58FD67778C43465F87D60E97605A614AF53 = Star_Trek_Into_Darkness_3D | V | 0xC0530D6E71BC6A6D4CC24762ABD19CB7 ; MKBv31/FindVUK 0.81 -0x075ACFE600D981AF3C4DA688400F2FC989C1E9AC = Star_Trek_Into_Darkness_3D (Star Trek In | V | 0x1BBB582DCEAC95E952FF71003E35F61D ; MKBv36/FindVUK 1.00 -0x493F6DC1E57EBC136B071A227A1FDA3852B6028D = Star_Trek_Into_Darkness_3D (Star Trek In | V | 0x93CB4A827134A7C0AAB0EF324CDBC75F ; MKBv36/FindVUK 1.02 -0xC410011CEC9EFF7E9A711A59D2763BF31C449DD4 = Star_Trek_Into_Darkness_3D (Star Trek In | V | 0x21F6B4C80BD8A0E6F03DFF32E5190B63 ; MKBv36/FindVUK 0.90 -0x3480197CBC5E8255649C7DB1EB01C4DA69F072A4 = STAR_TREK_IX | V | 0xD889F796FED08A4FFC62FEF9F4BEB333 ; ThomaZ -0xD98A30BF45A2F17542655FE42B237C49B31A5FD9 = STAR_TREK_IX | V | 0x1CE8299612AE4BD0B581C7AA6AEF0C6A -0xB0DF106F28A98E6CD7774817824770DB1E5C828A = STAR_TREK_IX | V | 0xC5E203BBB7E4A63768955219D4BBBF73 -0xEC61301C04F9C49557F6B75D797BF6E756686B56 = STAR_TREK_IX | V | 0x2EA03E2919EC80F71890FA4E3DF42C1D -0xFB4DB8AC751007CBB1DF521B9910FA876FDBA21C = STAR_TREK_IX (Star Trek Insurrection) | V | 0xCDC8F5A803A1643AB822C85E926A62CB ; MKBv12/FindVUK 0.96 -0x925578BA7821EB6401C710A5FA68FE0049884C65 = STAR_TREK_IX (Star Trek Insurrection) | V | 0x1AD5A38D533873B91A2521925C6692EE ; MKBv12/FindVUK 1.00 -0x6E14476F1C30A38F0CA2D6FC6CDA8B3BB09FB497 = STAR_TREK_IX (Star Trek Insurrection) | V | 0x8BDFF871F4ABA2EF642D09F4B40C3B82 ; MKBv12/FindVUK 0.84 -0x3E5D941FDE5B553A52895470C504EDAC7D298C3C = STAR_TREK_IX (Star Trek Insurrection) | V | 0x85F05617A4DE0D86313B48C1E7D021E1 ; MKBv12/FindVUK 1.00 -0xD43D849399A75F4A07B5084558D9836F2A2F07D7 = STAR_TREK_I_AC (Star Trek The Motion Pic | V | 0x43187F75973630CFF75B4B2232DAD692 ; MKBv12/FindVUK 0.84 -0x0E2A1EC994342233F6E89DDB247588B72B989D2F = STAR_TREK_I_AC (Star Trek The Motion Pic | V | 0xF32E62377817C26ABF5115A3C2BDD27D ; MKBv12/FindVUK 0.96 -0xFCE7D8F6E9C8A061F5C794AF6B0C0732A4EB3FEF = STAR_TREK_I_AC (Star Trek The Motion Pic | V | 0x1DAE64CC4DF31FD9FE867EC5DA1D9E87 ; MKBv12/FindVUK 0.99 -0x7E1146AD9DB2AC6F82CDC1491676FEA500FD3085 = STAR_TREK_I_EU | V | 0xEFFB87BFBC72642A9695A74614FDA15A ; ThomaZ -0xD1C8996C9EED9BE13D242DB50808EE94F96AA944 = STAR_TREK_I_EU (Star Trek The Motion Pic | V | 0xD53B22AAD0CE418E69337A97DCCA36FB ; MKBv12/FindVUK 0.96 -0x206F5E7DD7747AF65D61070711114D33524DEEBA = STAR_TREK_I_EU (Star Trek The Motion Pic | V | 0x25513521F3C968C60D577F5D3D51F44E ; MKBv12/FindVUK 1.00 -0x4AFB32364F5787C5B5427144B697CFBEB53AAD08 = STAR_TREK_I_EU (Star Trek The Motion Pic | V | 0xE78930AA2DF6049802AB2CAF50147E53 ; MKBv12/FindVUK 1.00 -0x1DEAFC849E0FD5194C257B626C8223EA6A380F38 = STAR_TREK_NEMESIS_AC | V | 0xB7D8EDB0F2332CEFC32E0228BA76D41A -0x127835D0A1D2A94C747B85BC23A389CC225F974A = STAR_TREK_NEMESIS_AC | V | 0x7129F231127DF13A6BF85165925CAA62 -0x94767545A3D1C7006300CEFD05A4AB502F438D71 = STAR_TREK_NEMESIS_AC (Star Trek Nemesis) | V | 0x84F465F7ED770414194C04C132ED4E8D ; MKBv14/FindVUK 0.96 -0x1C147719540916C518C11B605A54D7E968E0BEB9 = STAR_TREK_S1D1 | V | 0xF7F1A9C6D44033938A4EED876DA3B0A3 -0xC990DA9618EA1B9F049C71C064192ECCE8FF7C23 = STAR_TREK_S1D1 | V | 0x80FB7C0C533ECFA72279EB24218B6DBE -0xF892E443940B0A0442E78378807D179C27B48134 = STAR_TREK_S1D1 | V | 0xBB83928705E80C098F8FF29C6B1BCDA2 -0x77BA4A3C49D1FCB22C1482C6EE1861EA51B3E845 = STAR_TREK_S1D1 | V | 0xADA6E6BE5A555FE8C581E12FB9BCD1BB ; MKBv9/FindVUK 0.80 -0xD61CAE90394E077C27BDCCED3021EECCFA50406A = STAR_TREK_S1D1 (Star Trek Season 1: Disc | V | 0x111A4A4F522A297E9C574CC5DCF1B97F ; MKBv12/FindVUK 0.96 -0x1484B02377C708DD27BCB5E856A771D6DF82E436 = STAR_TREK_S1D1 (Star Trek Season 1: Disc | V | 0xFB83FD568F31921BB85467593843798C ; MKBv9/FindVUK 0.98 -0xE2669666435326B8D94531CA0C76FD087C23A0FC = STAR_TREK_S1D1 (Star Trek Season 1: Disc | V | 0xE55486D90205B946978D435EAE10F1DC ; MKBv12/FindVUK 0.99 -0x3904878FCA7DC9E92CFCCA4C7EB0ED0F702B8A51 = STAR_TREK_S1D1 (Star Trek Season 1: Disc | V | 0xFE60490A17AC1D4D3DFBBFD7D4C48571 ; MKBv12/FindVUK 0.92 -0x7EB76B7958192CECB818C1B9BE65E7F0238A52FD = STAR_TREK_S1D2 | V | 0xCE96FAF82045CA8CAF234056E37EDC0A -0x58193D8F2E1F7098B11F470BB351F65791F1FB8E = STAR_TREK_S1D2 | V | 0x86A4CA366F2EA827CD9710506A0BDDAD -0xE378A83B72D61563F8451BEB0BD61C3570C46CB4 = STAR_TREK_S1D2 | V | 0x16615009FBAB899BEBD4DF91E971FF39 -0xDEF84B63CED44C3E2F071D293FD46D6867A0727E = STAR_TREK_S1D2 | V | 0x814313203D8DA998ED35D45A058EE701 ; MKBv12/FindVUK 0.80 -0x58F184DD704119F3A122B2636CDFD156AE3B353A = STAR_TREK_S1D2 | V | 0x7E9058906C8AD397824E7173E772CA35 ; MKBv12/FindVUK 0.65 -0x5535A40F06B071DB94AF1E320D3D8E1816609F02 = STAR_TREK_S1D2 (Star Trek Season 1: Disc | V | 0xBFA9AA5DB949A818A966127A16734B53 ; MKBv12/FindVUK 0.92 -0xA074D28E584DB6D76DC9223C7A8B9817A3C25D6C = STAR_TREK_S1D2 (Star Trek Season 1: Disc | V | 0x8964DBECDCBB80DB432D8D9FAC36467D ; MKBv12/FindVUK 0.96 -0x4D1E4DC6C12AEC7DF96C4F5AAB41445842DAE5DD = STAR_TREK_S1D2 (Star Trek Season 1: Disc | V | 0xD54059A19A04141C0FCEE00D0282EDF3 ; MKBv12/FindVUK 0.96 -0x02FD075ADAD2AB63D2F348456E9972434337F9DE = STAR_TREK_S1D2 (Star Trek Season 1: Disc | V | 0xB6E3AE39CD549D8E2BC5A71E3C7FC846 ; MKBv12/FindVUK 0.98 -0x8B2A140E59113C08DD7E7C419040BCF97953332A = STAR_TREK_S1D3 | V | 0x8BF80028903A2E203C5DEC6471FD0D99 ; ThomaZ -0x7B4D575A0F46B3BB0B287C820EF49CED90B962D9 = STAR_TREK_S1D3 | V | 0x1D0862632BA65333556AA22D679BEA53 ; MKBv12/FindVUK 0.65 -0xD0A5B94A4B039EBA620478CD2E202CDFFE24E0EF = STAR_TREK_S1D3 | V | 0xD6767FD7A6FD893CC63E0306CA4D0FC8 -0xF3241FFC7EEEDC2FC6052D2A1CD8F3747846B177 = STAR_TREK_S1D3 | V | 0xA4AACFA05B932665E27069652B7DD95E -0xBF49DE0EB956A58FB20D2517BB22390DB78A2D76 = STAR_TREK_S1D3 | V | 0xF7314C39A601408CE2213154C98DD771 -0x0A4EC6A431C91A9284758C89849480316F3176C7 = STAR_TREK_S1D3 | V | 0x94F7FA0A8F891EC5FB4CE9F279876618 ; MKBv12/FindVUK 0.80 -0xC4ADCB2207A66FAAA76DA881DC047E1E711613F5 = STAR_TREK_S1D3 (Star Trek Season 1: Disc | V | 0xF21CD4505E0793FC6E31E88FFFC9A7E5 ; MKBv12/FindVUK 0.99 -0x0D98B4237144604C0B038F3F850CAF12FBC9CD74 = STAR_TREK_S1D3 (Star Trek Season 1: Disc | V | 0xEE15AB950312A52ABA6788C927AAEC88 ; MKBv12/FindVUK 0.96 -0xCF7550AE094D40D766FEF205A09BFA94C58F643E = STAR_TREK_S1D4 | V | 0x7F64835898752DEF37342FFB1D8672CD -0x95775B3BA9B8F6E1EDA5D57D1ADB189A753F10AB = STAR_TREK_S1D4 | V | 0x98CDB198A5A166E0DA4C6ED1D89C9509 ; MKBv12/FindVUK 0.65 -0x9A055C7899B2D79DB537CAA0213738414DB00EA7 = STAR_TREK_S1D4 | V | 0x31E6BD5345EF862D17916BBF749E70B3 ; MKBv12/FindVUK 0.80 -0x350C55DDCEFA4235859C8771B79A9F170E008D9E = STAR_TREK_S1D4 | V | 0x643E64A2941D991F4D6AF5DE5ECE59F4 ; ThomaZ -0x8BF66ED431EBBE424A15A78A1EAD867DB57251AA = STAR_TREK_S1D4 | V | 0x00E26A933FB1EBD9154C556587220BC6 -0x38557F591DDAA2C7B58CD2EDAA600F4A31FCF659 = STAR_TREK_S1D4 (Star Trek Season 1: Disc | V | 0xC537F1394A4D6308E17D3E6B67EB29BC ; MKBv12/FindVUK 0.96 -0x7C04780ACBDA30D6BC3E6076A8D235811C17CA5A = STAR_TREK_S1D4 (Star Trek Season 1: Disc | V | 0x3AEE088DA1A6FABD83318DE8A7AEFDF9 ; MKBv12/FindVUK 0.92 -0xB2EE25ADE9290B68C4056C7D90B39B7000C1994B = STAR_TREK_S1D4 (Star Trek Season 1: Disc | V | 0x82D4B9B310B16F04EBB853949BD522F7 ; MKBv12/FindVUK 0.96 -0xCCB2A5134C4996F33B22009AA83579A1388641B2 = STAR_TREK_S1D4 (Star Trek Season 1: Disc | V | 0x9D1475528498328A30D48DEB2CA10435 ; MKBv12/FindVUK 0.96 -0xAEE5317213EF9ADC8DEF1D22871117157EBB81DF = STAR_TREK_S1D5 | V | 0x857F3BB1A2183FB77A1A4505EF44EF8A ; ThomaZ -0x64071089CB99B0A38A98B18994C69A1C3D0F63F5 = STAR_TREK_S1D5 | V | 0x890FDC7FA27F4C5D6D4F8751A1956965 ; MKBv12/FindVUK 0.80 -0xD5918338FE60DE785036DA3E87D0FDDFF8C99CF9 = STAR_TREK_S1D5 | V | 0x5C1DC6AD81B03B7E1309C760BD7B53F6 ; MKBv12/FindVUK 0.65 -0x344BDF481C815B9352816136F8B06853BAE8EE74 = STAR_TREK_S1D5 | V | 0xC6E716C97D9C877800A44445B7027FB6 -0x3E855AAE5C47FFC5818957BAA21A8F4DA5AC08F0 = STAR_TREK_S1D5 | V | 0x642215A221D1952AC6C9C2B2F0D8FB9D -0x3CF441A20A1CC2238894ED02DACB0A66DD113F77 = STAR_TREK_S1D5 (Star Trek Season 1: Disc | V | 0x77C1D9D2B57F71A1B4C8B3720DC697EA ; MKBv12/FindVUK 0.99 -0xFD7A667C972298589EC9EA7B33ABC96D07E2A465 = STAR_TREK_S1D5 (Star Trek Season 1: Disc | V | 0x7C5766EE4B4B97EED86196E379F5ECD0 ; MKBv12/FindVUK 0.96 -0xFE44963FA059F40F4A8EC1E8954BF3B9913C8058 = STAR_TREK_S1D5 (Star Trek Season 1: Disc | V | 0x333C784D0C6CC29008DF3721F0B3C03C ; MKBv12/FindVUK 0.96 -0x8CCCDA3246773EA35F849760AE0828B8BDCF6D56 = STAR_TREK_S1D5 (Star Trek Season 1: Disc | V | 0xA016D8CC89BCC4B1A7625B1AA6CB9949 ; MKBv12/FindVUK 0.92 -0xDA124FEB0CFE63CF5B3E960ECAB4DEB01E07220B = STAR_TREK_S1D6 | V | 0x56B9594162540D0F24FD65F178A6029F -0x06EA31D375EF5DCAFA684ECCC449FB5AF47F9CE1 = STAR_TREK_S1D6 | V | 0xDBDD9492356358016A75ACB55FDDCB80 -0xB02C305106B4192E97488A76F6CA121C485874C8 = STAR_TREK_S1D6 | V | 0xDE066EAB87E9F906761458B4DF310D47 ; MKBv12/FindVUK 0.65 -0xE64FB0C36D19046615E51F344763A8E05257EC67 = STAR_TREK_S1D6 | V | 0x53C6CA316154329F55195AC5487149A5 ; MKBv12/FindVUK 0.80 -0x0F7A9EC8FD3D6CA6ECC2E610347A05F0FA744DFD = STAR_TREK_S1D6 | V | 0x4E7B42191858CA3233C7D0B1CD90A97F ; ThomaZ -0x796678DC74BD8C48B7D5F7103DE006C529FE1017 = STAR_TREK_S1D6 (Star Trek Season 1: Disc | V | 0x4AD23998FCF889D63EF3E3FAE1D570E0 ; MKBv12/FindVUK 0.96 -0xC056EA53C7ED4E05F4475614FAC348507F285B44 = STAR_TREK_S1D6 (Star Trek Season 1: Disc | V | 0xF799E0E07A8EEBD1EA77D5AD7C434C10 ; MKBv12/FindVUK 0.92 -0x97A3F430AC37CB30A439422EBC5E4CBA63154CE6 = STAR_TREK_S1D6 (Star Trek Season 1: Disc | V | 0x2594C2026429F49BEAF8F7BF3DD1C1A7 ; MKBv12/FindVUK 0.96 -0x51406E14B0C309A4CF70755CE5AFD6487B94E85E = STAR_TREK_S1D7 | V | 0x4D891CD81306CD488169C52CCE5F45C4 ; ThomaZ -0x51FE2EAFD7EF516F5AC6C0A6C1B0E325EFB3EBCE = STAR_TREK_S1D7 | V | 0x63FF3810E4232F3471EFF56A2AB60E81 -0x7282BAC1259FD680A6D91F2463708C2CCF934ED2 = STAR_TREK_S1D7 | V | 0x14B8D2AC96DAF73AE9B3C6CF18231460 ; MKBv12/FindVUK 0.65 -0x1E63A274350FE8D6B6E870CF37A4A1030BD37EE2 = STAR_TREK_S1D7 | V | 0x29EB86A0E74815B88464C02A515B9D9A -0xADE49B44E5285D01CF8B8565B601C1D15F311EA3 = STAR_TREK_S1D7 | V | 0x95BF02F802A2021BCC27C67D9D3BCB82 ; MKBv12/FindVUK 0.80 -0xE9A8F6F45980CCF96D3D4B30DAB2858A50802866 = STAR_TREK_S1D7 (Star Trek Season 1: Disc | V | 0xFAC0C89838A57BEE0C9F008EA48680E5 ; MKBv12/FindVUK 0.92 -0x2C1946AE4B854ACE60C776CA465AFA8865CF78F6 = STAR_TREK_S1D7 (Star Trek Season 1: Disc | V | 0x920F809A33BB0A6B7CF0DF47944E7388 ; MKBv12/FindVUK 0.96 -0x8E810E3B48AC470003C846CCE680A3FDF9672D35 = STAR_TREK_S1D7 (Star Trek Season 1: Disc | V | 0x7938EEDF8BE0D0A5FCAA897BEA6D39CB ; MKBv12/FindVUK 0.96 -0x35C74F357D48AE2B43887B9A9E2447D9FA88D087 = STAR_TREK_S2D1 | V | 0x6482456468F93B278184677248908D21 ; ThomaZ -0xB26A91261CA5B1A011FF8452D93BA178B7888C3A = STAR_TREK_S2D1 | V | 0xE4A810F8730512875D68AF2EF2F1E260 ; MKBv12/FindVUK 0.65 -0x3CB4447EFBD618CA79CDD21D984AE3B2DF019A11 = STAR_TREK_S2D1 (Star Trek Season 2: Disc | V | 0xD6055BCA071747CABDB62D2E0C28481A ; MKBv15/FindVUK 0.92 -0x0B8D46D47D43696A5D94391FA402216A5B855E7B = STAR_TREK_S2D1 (Star Trek Season 2: Disc | V | 0x4D09A60A1201D74569E715BE5B3ADA5B ; MKBv15/FindVUK 0.96 -0x015542F5CE9CA95654AA25F7DA5E7B369B7A8B87 = STAR_TREK_S2D1 (Star Trek Season 2: Disc | V | 0x99288458655C03CE5E1A806A49FDAE0B ; MKBv12/FindVUK 0.96 -0x02EBC9293943AC6F3049C3EB3FBC10C4142787DE = STAR_TREK_S2D2 | V | 0x913A34C54E06D18599A777F218BCEB40 ; ThomaZ -0xD7E857323F95C07E36EA3A98C1B9C3C710F91098 = STAR_TREK_S2D2 | V | 0x90E7390C2AA219D9F357A24D613D7D26 ; MKBv12/FindVUK 0.80 -0xF595D09A6B57958573D97CFEE533D1D376FFDB64 = STAR_TREK_S2D2 | V | 0x91AEDE76B97C4E1067C1A1BC4704B01C ; MKBv12/FindVUK 0.65 -0x029D099977B8DDABB87D5A992F25F6139D630F4D = STAR_TREK_S2D2 (Star Trek Season 2: Disc | V | 0x24D0D1412023D7B462E22EC0C4195456 ; MKBv12/FindVUK 0.99 -0xF079CC164CA7049ED5B56209F6E04FC383D827A2 = STAR_TREK_S2D2 (Star Trek Season 2: Disc | V | 0x71727EF2FF7E9F11D20238BBEB37932A ; MKBv15/FindVUK 0.92 -0xD3839FA8071FD008683BB9742FF0336762DA0A22 = STAR_TREK_S2D2 (Star Trek Season 2: Disc | V | 0xEFF0FAF86F3E61B9BE0DABEF4F1DDC8E ; MKBv12/FindVUK 0.96 -0xC25F064AB93CE0ADB4C73FCDD8E88577314E631F = STAR_TREK_S2D2 (Star Trek Season 2: Disc | V | 0x134C944CC171E66DA1D4040750618D58 ; MKBv15/FindVUK 0.96 -0xA0FFFA4DCA99B1F25458080878B0D4B2B2EF0D58 = STAR_TREK_S2D3 | V | 0xFD3AE95A4FD7071A6B49ECDCDFC018AA ; MKBv12/FindVUK 0.65 -0xAF6F1F8B36EB419E5C5744B4A24EF0286EDD20A5 = STAR_TREK_S2D3 | V | 0x35447ED3368D576D671DEA8DB8FECA7D ; ThomaZ -0x51DB74D59A8F0720B832F4AF269FA8A046CF8AAE = STAR_TREK_S2D3 | V | 0x19EC0BBF3C6F2F5BEE89B5862F12EA93 -0x907BE66CFEEACBF0954FC5D1E79E71708578FFFC = STAR_TREK_S2D3 (Star Trek Season 2: Disc | V | 0x63CFB99CB854FECDE7276E94905C48B7 ; MKBv15/FindVUK 0.92 -0xE91C403DB0484513BAB8ED12B920C11DB2B17536 = STAR_TREK_S2D3 (Star Trek Season 2: Disc | V | 0x4DC65F817E67FC6CFD0019AAD681215E ; MKBv15/FindVUK 0.96 -0x3BA3A854F372DBA8C530408EEFE38C4C469F9268 = STAR_TREK_S2D3 (Star Trek Season 2: Disc | V | 0xA5C1D975769D5859FEC3E304C5076B1A ; MKBv12/FindVUK 0.99 -0xF5BE732C2113180E6BA272F15E713EBBA7CA0716 = STAR_TREK_S2D4 | V | 0xE7B2110C8E3984B4C50B995CBCA96014 -0x14BB87C34AC34202BC4DCC5ECC3784138A3EE04E = STAR_TREK_S2D4 | V | 0x93F6E8D7990DA42049BA205A5A87CEE8 ; MKBv12/FindVUK 0.80 -0x30D6B72E106287D74673B90525C6C634B6376AF8 = STAR_TREK_S2D4 | V | 0xAA21979CADF853042BA58C1B4E65F3C7 ; ThomaZ -0xD5BD505455BB12814B4E750F95B17040FC143FBB = STAR_TREK_S2D4 (Star Trek Season 2: Disc | V | 0x6AADE389C54E798BAC071DAC91BB3BF5 ; MKBv15/FindVUK 0.96 -0x42596BB9C79748BDAE6AB841CC2632E337D63ED0 = STAR_TREK_S2D4 (Star Trek Season 2: Disc | V | 0x1CF7F46EB0F63F0A04D98DE322EDF9EE ; MKBv12/FindVUK 0.99 -0xDD2410D1DD46CDBA36409DB39E4A869A244A3A87 = STAR_TREK_S2D4 (Star Trek Season 2: Disc | V | 0xDBFB195036AE7E7D63EB00FED074E234 ; MKBv15/FindVUK 0.92 -0x2A1398765F8C4A20FA8B168EE375407B0DFD2532 = STAR_TREK_S2D5 | V | 0xC2560F5B817D760791187393B78E0AA9 ; ThomaZ -0x89527B142711A766DEE4734B2F69A2C78A7C8764 = STAR_TREK_S2D5 | V | 0xCA87F3F03599571A4FFF3D5C71B69FF5 ; MKBv12/FindVUK 0.65 -0xA98DFACF56A9A7BFEEA6361866DA169427E89244 = STAR_TREK_S2D5 | V | 0x7F08715BE4066655D0C040868B489D57 ; MKBv12/FindVUK 0.80 -0x7B5BC4D214938402C28594A73480157F7D925477 = STAR_TREK_S2D5 (Star Trek Season 2: Disc | V | 0xA9D5BA2C229E1A903C3691D2DCEB2E62 ; MKBv15/FindVUK 0.96 -0xD212F23F619C39DA169053DD5930039CC5AF19BF = STAR_TREK_S2D5 (Star Trek Season 2: Disc | V | 0x625C1E43DAD43B2652E225ADDBDFE338 ; MKBv15/FindVUK 0.92 -0xB9A081BC5AFC50FB79CC7F1ED3DE997BA8D829A3 = STAR_TREK_S2D5 (Star Trek Season 2: Disc | V | 0xC755D24C4B9A7A8F43231C0B3902FD2B ; MKBv12/FindVUK 0.99 -0xA976809D77888AD87CB08F6C1C54D9D37296402C = STAR_TREK_S2D6 | V | 0xB412F9590A6C188578C39ED3BC76A618 ; MKBv12/FindVUK 0.65 -0xB47FBA138992E68CA261A764CE8DC0B9AD56AF38 = STAR_TREK_S2D6 | V | 0x5B9BB87CB21C1EE27191F6A8DCB03A95 ; ThomaZ -0x93BCBADCBE73315402108FD8925E9FFAA658BB60 = STAR_TREK_S2D6 | V | 0xD7DF3361411911FDE8AD490F15CBA470 ; MKBv12/FindVUK 0.80 -0x8C2A8CD323284ACBF7CB24BEB6C9F7D2EFA08886 = STAR_TREK_S2D6 (Star Trek Season 2: Disc | V | 0x3A7B483BCCF9AF77060E787E6820047E ; MKBv15/FindVUK 0.96 -0xFB067FB87B72E4F603222A336F9041B94E792B4A = STAR_TREK_S2D6 (Star Trek Season 2: Disc | V | 0xA117EC7CF3F199586DD49F5C3D3076F5 ; MKBv12/FindVUK 0.99 -0x2075C01FED907BD0764633CB8095973C1528DD5B = STAR_TREK_S2D6 (Star Trek Season 2: Disc | V | 0x4FE82C2EFA43A16A2FCC9D66C7F7995D ; MKBv15/FindVUK 0.92 -0x8353AC626EA7F73DB855AB1F03291AD04D8E61CC = STAR_TREK_S2D7 | V | 0x1F68983C11FC2CE42772CA7A3CC7216A ; ThomaZ -0x224357AE737C07E2274DFF35211DCD7152D5937D = STAR_TREK_S2D7 | V | 0x67003A21ED48483A5F4A85D6891314DE ; MKBv12/FindVUK 0.65 -0x0DC21844BFE2E08B6288A7AAB6D65B5811F85131 = STAR_TREK_S2D7 (Star Trek Season 2: Disc | V | 0xE94E610E99CE16BB0E2D0F2C3B1DC819 ; MKBv15/FindVUK 0.96 -0x8E16EE4CF02B91FB09F0F1BA7C8B10DCD459504C = STAR_TREK_S2D7 (Star Trek Season 2: Disc | V | 0x608BEDAD6E487ED9D93A1543C09B3323 ; MKBv15/FindVUK 0.92 -0x20E53071BC0535FF2EFBAA441C7CCEE6E58FB22E = STAR_TREK_S2D7 (Star Trek Season 2: Disc | V | 0xB144858A242A5DA4FFFEC0B2D9057C57 ; MKBv12/FindVUK 0.99 -0x2198F8B87344713E119875DF4C2C2D9484029D03 = STAR_TREK_S3D1 | V | 0xE95384B67964A912BE8BA930944ACBE0 ; MKBv15/FindVUK 0.65 -0xFC5764CD1937A26CF287E8394D7CFE9C4631308E = STAR_TREK_S3D1 | V | 0x191505DD771AE46D231C8E63C2664346 ; ThomaZ -0xC5A7FCD9CCB97DEF40A5DE0CB9652BB4FB30CF11 = STAR_TREK_S3D1 | V | 0x7631F4B7A6FA86BBE3BE9426AEBECB9C ; MKBv15/FindVUK 0.80 -0xB1B293F85BFB95F18842032417B36F28D976ED81 = STAR_TREK_S3D1 (Star Trek Season 3: Disc | V | 0xDA0945D47621DDC6CA4426A1B107E458 ; MKBv15/FindVUK 0.96 -0x2BBDB151A8B61E91D874835B44DFC3DBC405E1E5 = STAR_TREK_S3D1 (Star Trek Season 3: Disc | V | 0x2003A190E95411D3C10F1B15586EDBF7 ; MKBv15/FindVUK 0.96 -0xFF07B8F5C1AC7DBBB85F3D3AFF520C02CFCA922E = STAR_TREK_S3D2 | V | 0x1F6DE4BD26101110FAC3A168BDBA3D4B ; ThomaZ -0xA9F91CCA2769BC8F4939C5C3B549C0EDEEF5A8CA = STAR_TREK_S3D2 | V | 0x942C979CB8EC6105BE337956A3176006 ; MKBv15/FindVUK 0.65 -0xAC9111611B4AD6AD02AA70248850602F3923A8D9 = STAR_TREK_S3D2 | V | 0x61F60667247067CBF4E27E85D992518F -0xA6669898341D5709F9B4074902FFEE822512651D = STAR_TREK_S3D2 (Star Trek Season 3: Disc | V | 0x5A4F26149A6FD0B2C4D4DFDB3FFEECD7 ; MKBv15/FindVUK 0.99 -0x17A7A689107AE67984E5876EA8FD607334CC8973 = STAR_TREK_S3D2 (Star Trek Season 3: Disc | V | 0x67B837322B53932DC045DDD284EACD89 ; MKBv15/FindVUK 0.96 -0xCA5AD4C828EF14671C4C585811B4F8FEE79522AE = STAR_TREK_S3D3 | V | 0x112146A2FFD66CA2E05EC8927F190BF8 ; MKBv15/FindVUK 0.80 -0xCABDD8011C0EFC29FE47588AB6BEE316653DAAFA = STAR_TREK_S3D3 | V | 0x694D1EB6A55D4597CB49FF85F147914B -0x8D38CCA8AC6459CEAE192B1FB84203B6E3746792 = STAR_TREK_S3D3 | V | 0x59832A0661BB3C6550D83AC649CA6480 ; MKBv15/FindVUK 0.65 -0x33A88EE696156B4F90BA3215AD4203682AA259B7 = STAR_TREK_S3D3 (Star Trek Season 3: Disc | V | 0xB3BC92EAE032C8150941AC2EFE73967B ; MKBv15/FindVUK 0.91 -0xF5F775CF038B566C44A7C9CC7ED76858B4AC6C3A = STAR_TREK_S3D3 (Star Trek Season 3: Disc | V | 0xB77C3F390B2BE57BFBAF1C7CED6EC2AE ; MKBv15/FindVUK 0.99 -0xE094F4058CD963E08D86C851DEE98E37676E3772 = STAR_TREK_S3D3 (Star Trek Season 3: Disc | V | 0x5E3DB95B9BAA47DB9289E218015DFFE9 ; MKBv15/FindVUK 0.96 -0x8242280450D43AFFE80C63FBE512B3A03AD643A7 = STAR_TREK_S3D4 | V | 0x8A10266759B02A31D1A1802FCB0F9DD7 ; MKBv15/FindVUK 0.80 -0x1B97A154140B730E88D03DB3D85F05AB69FCB39B = STAR_TREK_S3D4 | V | 0x6731DCE84742C48CE1C2D7D47AB15E41 ; MKBv15/FindVUK 0.65 -0x8FB2182F7F12E6736DAB981DDC0B8C06B9D9EFAF = STAR_TREK_S3D4 | V | 0xC645080F11329DB494B9D22031F39218 ; ThomaZ -0x1CC2D857200BCF1056B8E86CC7433778EE013D62 = STAR_TREK_S3D4 (Star Trek Season 3: Disc | V | 0x1C54B05622111EAB76F3566412A33D89 ; MKBv15/FindVUK 0.96 -0x46688E7263478E2018408EEEB03D1DCB28A63131 = STAR_TREK_S3D4 (Star Trek Season 3: Disc | V | 0x9107053A04E7C5A2E0ACC5FAA6A2B62D ; MKBv15/FindVUK 0.99 -0xB3403C122BBF3FB6D7A138FE908FAE669E6F989B = STAR_TREK_S3D5 | V | 0x93C08B6012359579B96B523291490E2F ; ThomaZ -0x4F77804E5042DB8063A59ADCDF75CAF4E1C9A1DA = STAR_TREK_S3D5 | V | 0x12123B846B1F0B42EA2CC1F1BED26703 ; MKBv15/FindVUK 0.65 -0xC57263CF7BF456B0EA66BD995C3A6A8FBF131225 = STAR_TREK_S3D5 (Star Trek Season 3: Disc | V | 0x4FECF6A131BBFC582C766E279F182366 ; MKBv15/FindVUK 0.99 -0xA441146ACA3AEA465DF28EC71026A2C814EAE047 = STAR_TREK_S3D5 (Star Trek Season 3: Disc | V | 0x96F93EF0A42FCAE30648C6B718739C7D ; MKBv15/FindVUK 0.96 -0x4356FB980459BFD847494981BD7C52A026DBFBE1 = STAR_TREK_S3D6 | V | 0xB2F13B5C434FCDC4D02A1F0D0D2E7014 ; MKBv15/FindVUK 0.65 -0x6AB639062A9D4660689CDC04FF3CBB98D854E4F3 = STAR_TREK_S3D6 | V | 0x6B7664773CC90CC3D2B29D53F0B76C60 ; MKBv15/FindVUK 0.80 -0xBE500379500DB8D54F8035089D2C57FB43AEA61B = STAR_TREK_S3D6 (Star Trek Season 3: Disc | V | 0xD288B77AAC62AD929B9C89BCD6201AF1 ; MKBv15/FindVUK 0.99 -0x29DB10CEBBE082EA808E50D3B438F4F691ECCD69 = STAR_TREK_S3D6 (Star Trek Season 3: Disc | V | 0x3E114AC928E8B90BC69455D642A1F48F ; MKBv15/FindVUK 0.96 -0x64D8B7393F8D713B709B5DF2CADA6D58FECC2AF1 = STAR_TREK_S3D6 (Star Trek Season 3: Disc | V | 0xBE3ED012B54D408693A72C3B42BFEAE4 ; MKBv15/FindVUK 0.98 -0x29F683E379FAE767FE7BBF3CC5A383B90841282D = Star_Trek_The_Wrath_of_Khan (Star Trek II The Wrath of Khan) | V | 0xB0858DA8A2A92604A80DCC8575741B71 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.00 -0xF9940C71847700C270EC6C09B604859E1158A951 = Star_Trek_The_Wrath_of_Khan (Star Trek II The Wrath of Khan) | V | 0xBCAADA803BC255514045C7041F427C77 ; MKBv61/BEE/VUKNOTVAL!/FindVUK 1.00 -0xCD5EB6221F2A4E2F4F9C06C3C35D31E44B6E13FC = STAR_TREK_VIII | V | 0x85F2C016F283EBAA5D1C1D033723F69D -0x968500BBF99937878FB6F9427276C5A801A28495 = STAR_TREK_VIII_AC | V | 0x38385DB4BB60CCECF05BDD26907981D3 -0x537A695762AB21CCF8D53DA28B27F45241E45EA1 = STAR_TREK_VIII_AC | V | 0x5A7E0CD989E572204B86D28F208FA39A -0x79E22FEB678E9115F8E44161551DAC25D5F92848 = STAR_TREK_VIII_AC | V | 0x5235D6DF0FA1055F36EF812524ED9981 -0xAA91C845EEE03EE9988F3B2246188706143CF04B = STAR_TREK_VIII_AC (Star Trek First Conta | V | 0xAD2449408153D1F3C5FB07D3E514186C ; MKBv12/FindVUK 0.96 -0xAA9F6C449F5AF0CFA41E307ECEA55C41A2A6FA99 = STAR_TREK_VIII_AP | V | 0x0E01E6BC0F927F7E1F07BFE56A75CF6A -0xAD4AF8CC794F2314F83CE3650878D127AF6E0E08 = STAR_TREK_VIII_EU | V | 0x63CB8280D5E316E15C787BB3C7E1D6EA ; ThomaZ -0xA63F00D60970F09053582614998447C266B274A2 = STAR_TREK_VIII_EU | V | 0xCBC38418346598D2FA9B819350E8C04B -0x8876066C156D9D00762D93594650405A225679FD = STAR_TREK_VIII_EU | V | 0xCEE3813F3DB25CAC7BD9100E38F5F5A8 ; ThomaZ -0xE04D84706FAEC8627ED5BB03D20025533B2D0668 = STAR_TREK_VIII_EU (Star Trek First Conta | V | 0x6412C9B8E4F1A07669451DD94A66B33A ; MKBv12/FindVUK 1.00 -0xCC5455D29D41399E7BE4BAA0563F736849C51178 = STAR_TREK_VIII_EU (Star Trek First Conta | V | 0x7F0591BF617EA5A7CED7DAAD8293D231 ; MKBv12/FindVUK 1.00 -0x6F6BCA368421213E9EAA21BE3EFD6195AE74FD90 = STAR_TREK_VIII_EU (Star Trek Nemesis) | V | 0xD75701FC298596BBC6B95F0461705EAA ; MKBv14/FindVUK 1.00 -0x2513F4B989692F6590F7D786171EC5BD1498BD0C = STAR_TREK_VIII_EU (Star Trek Nemesis) | V | 0x6F7232ED052FEE8806CBA32EBBD06F07 ; MKBv14/FindVUK 1.00 -0xDF9466C6143ACF922C09D993A8405D338FEC7FD8 = STAR_TREK_X_AP | V | 0xF717B688FB135A67731C50AD9C1ADD43 -0xB0405A3B7FF5A878BEA7C8DC30C89A93CE9F98B4 = STAR_TREK_X_AP | V | 0x53B2B2727A4796A92569AD691296271E -0xB9336C272CC35F8B7914CB2F9F46EE66FF8D19D9 = STAR_WARS_CLONE_WARS (STAR WARS THE CLON | V | 0x976780B43C80B0F035AA0E75C94D370C ; MKBv9/FindVUK 1.00 -0x946BC456EAC5C9AFF9A2286C4F2FCDACFCA6AF2B = STAR_WARS_CLONE_WARS_S1_BOX | V | 0x6830B2B5CC3AB84D6203B76E216CA99D -0x0E1DD2439DC37CB8CF3FDFBF99C55DE42E024585 = STAR_WARS_CLONE_WARS_S1_BOX (STAR WARS: | V | 0x3A7CD7E4C51D302EDA6A9E8F26B20865 ; MKBv14/FindVUK 0.96 -0x698484E85865FB3967340373C55386942635747F = STAR_WARS_CLONE_WARS_S1_BOX (STAR WARS: | V | 0xBCC5D853D9781AA70FBEB7A318F3A29C ; MKBv14/FindVUK 0.90 -0xBFC944585B3561A2BB2E93E24248C4783B22C616 = STAR_WARS_CLONE_WARS_S1_BOX (STAR WARS: | V | 0x24BDD6EBC84E95B1EFAE7B4ECA7FF602 ; MKBv14/FindVUK 0.90 -0xA5DDB18D624E1B39E31877A7A935A0525A64189E = STAR_WARS_CLONE_WARS_S1_BOX (STAR WARS: | V | 0xFA68F53B71F3EAC811535B9AB9C526A9 ; MKBv14/FindVUK 0.90 -0x502A2810C6891FA3946BCA3AADB78B676213AC7C = STAR_WARS_CLONE_WARS_S1_BOX (STAR WARS: | V | 0xF4A91B400DF8D4B45D9E586B54AE2E88 ; MKBv14/FindVUK 0.96 -0x68BBF34B21BDA86E94CFB5910246BE8292ED7B3C = STAR_WARS_CLONE_WARS_S2_BOX (STAR WARS: | V | 0x555EC9618EEF1C793DDFD4DB87235CA4 ; MKBv19/FindVUK 0.90 -0xAC80482594A877460AE54F46E38BFC3F0CC821E4 = STAR_WARS_CLONE_WARS_S5_D2 (Star Wars: T | V | 0x29D85C7235B47F10C7CB2D44F134D1D2 ; MKBv42/FindVUK 0.96 -0xB4B33ED7B9EB665B104210F72921E67EA46B531F = STAR_WARS_CLONE_WARS_S6_D1 (Star Wars Th | V | 0xAACAC995D0D4E76DCE2E6A2762E0EFA1 ; MKBv46/FindVUK 0.96 -0xB6BAC8CF950C42FA7A878150A864130A115889C3 = STAR_WARS_CLONE_WARS_S6_D2 (Star Wars Th | V | 0x6359921D83D5E6C076D23925260EF75A ; MKBv39/FindVUK 0.96 -0x02A68B4553586EB0CCB62B3C94C4B72A56D1FA51 = STAR_WARS_REBELS_S1_D1 (Star Wars: Rebel | V | 0xC41F806EEDD1FEC880C8BF69EAC98F89 ; MKBv47/FindVUK 0.90 -0xC20200E631537A232917FA73AF86754A22ABF7AF = STAR_WARS_REBELS_S1_D2 (Star Wars: Rebel | V | 0x62AE73CD18941907B425E77478B4EF6C ; MKBv46/FindVUK 0.90 -0x37AD7DE6F5C5C0C03FF350E28B92DD70E25F6E80 = STAR_WARS_REBELS_S2_D1 (Star Wars Rebels | V | 0x66B4D69A23408EABFB7AD9AD9973215E ; MKBv56/FindVUK 0.96 -0x68788EF3CA6C8AC95A4CFA362BE369872336E2F5 = STAR_WARS_REBELS_S2_D1 (Star Wars Rebels | V | 0x1FAEEFC5C1812CB84047A48A27B96001 ; MKBv56/FindVUK 1.00 -0x40C9B60957615851EEBFAFED92C832E7BF7FCAF9 = STAR_WARS_REBELS_S2_D2 (Star Wars Rebels | V | 0x5253645EFC8A5F282B8D9BFA57267D35 ; MKBv56/FindVUK 1.00 -0x8BE25654CAE5A04671661DC6DAB1C247615BAA46 = STAR_WARS_REBELS_S2_D2 (Star Wars Rebels | V | 0xA4A00078E3AEB2C3D643AFE6FB744EDA ; MKBv56/FindVUK 0.96 -0x6ECB37047285CC4F7BAD704AF9B3549546C37F0B = STAR_WARS_REBELS_S2_D3 (Star Wars Rebels | V | 0xF88222A8AA53F0B5E2AF3B3F714C6BF9 ; MKBv57/FindVUK 0.96 -0x64B88219A91882B046A2D955DD9717FA2DB7018B = STAR_WARS_REBELS_S2_D3 (Star Wars Rebels | V | 0xF9E3C511087D094358EBD8541E42768B ; MKBv57/FindVUK 1.00 -0x6E5E827EB1DE7AB9820C2D558452424194A5D591 = State of Play | V | 0x039B94496A50CA206F7CBD8E8BB1114C -0x37B3B1BA43A63EC2C7D67EFA587459E4F5015D78 = State of Play | V | 0x18109A08A5DEEE171207DB1B5995189C -0x684FD5F6367B8D54972FD9973DEA46805AB4541C = STATE_OF_PLAY | V | 0xF6D9BAE2F92708D725549AE44330899D -0xBEC1D6BAA41B13DBCE28F3210CA58F9B59AF2897 = STATE_OF_PLAY_G51 (State of Play) | V | 0x43A24459EDBB8715ED9287FF60BD6DCA ; MKBv12/FindVUK 0.98 -0x09491E58CBC1B8855504A6A6612BDF1EA8EBBA86 = Status Quo - Aquostic! Live at t (Status | V | 0xE4CB30714ED8F8FE9149D04F32D25AD2 ; MKBv51/FindVUK 0.98 -0x46DCD42545CDD3B66B40A1FB2F1167592CE1184B = STEALTH VERTICAL | V | 0x9B0BCDAC3F1FC473986D08C350D8246E ; MKBv31/FindVUK 0.99 -0xA6DCBFBAB268AA498CABFB33A9A00AA69295276E = STEINS GATE DISC 1 | V | 0x9541C6017ED3E4AE52E6AE201C02E32E ; MKBv62/FindVUK 1.00 -0xEEE968F53D98415BFFF30B9DB762F6EE24CF3A69 = STEINS GATE DISC 2 | V | 0xD58253E092EE229EDDCF6BD03B52503F ; MKBv62/FindVUK 1.00 -0x384740FEAFC4D148F13838A232EC3F4116959AF9 = STEINS GATE DISC 3 | V | 0x3BDADF077B585FC459F9C71FC1B179C0 ; MKBv62/FindVUK 1.00 -0x0807DDDFC9C0CC8CBCBD3B99579425A2D1987810 = STEINS GATE FILM | V | 0x319E251EF65B0D4038EA9B70CA3DD23E ; MKBv62/FindVUK 1.00 -0xF611C77947D17CFA25438EB4473EEC977A0E1BBF = STEINSGATE | V | 0x93F889F08E61D030779044F621042B84 ; MKBv40/FindVUK 0.81 -0x1C578933A1061A11080EF9B616B2E42D6975E714 = STEINSGATE | V | 0xCB09398D9A3068B17254B6EA6FB3FE13 ; MKBv40/FindVUK 0.81 -0x1C7F5DD2011F491EB8993BF44D8EFB3A36C63A69 = STEINSGATE (SteinsGate) | V | 0xB0EA2477F4D3CE8635A3DB89C161939B ; MKBv31/FindVUK 0.99 -0x7E5C4829C372475F2FF1A9F0E36B0D66108D1A93 = STEINSGATE (SteinsGate) | V | 0xF9A6FA2285B37AD2B5AAB5A3ABE178B4 ; MKBv31/FindVUK 0.86.3 -0x1F0B4B5E3D532EC3F6BCEF889840F3D6E58795F0 = STEINSGATE (SteinsGate) | V | 0x45BCD16DDBBA92D7B6B6FFCAAC2F802F ; MKBv31/FindVUK 1.00 -0x58AA2D53C1DA34F81BB4C1D23F99D86929598EC2 = STEINSGATE (SteinsGate) | V | 0x77E8EB4A0FA248CAE11BADEB8D95D1F1 ; MKBv31/FindVUK 0.99 -0x2BB7510928247FEF4C6EC9299A450EAE714AD01D = Steinsgate_Movie (Steinsgate_Movie) | V | 0xB87622BC060A67FB2C459F87540DD7FC ; MKBv62/FindVUK 1.02 -0xC16ABB9BEC6A6E326BE013E9C1EDE892018821E8 = STEINSGATE_P2_D1 | V | 0x178E70D85ACCFB0513D98DF6F8CCC919 ; MKBv40/FindVUK 0.81 -0xE0AA95CCF1DDA10B92122F08487CE7EB6F66BB6B = STEINSGATE_P2_D1 (SteinsGate_P2_D1) | V | 0xFFC8DD5A30CF0E59A56F1DC8FB2255A9 ; MKBv31/FindVUK 0.99 -0x3A1E400ED9546AD38738F3C80E7B1E7C56F5434B = STEINSGATE_P2_D1 (SteinsGate_P2_D1) | V | 0xCBE4D8ED3DAAC2019616FC189B6F9517 ; MKBv31/FindVUK 1.02 -0xCD6FA42CFD046E2EED8B3EE8223A333D55AA66E3 = STEINSGATE_P2_D2 | V | 0x5640FFB5017AF73756DEC21AB6845AFF ; MKBv40/FindVUK 0.81 -0x83DF13DA0BA684ACC64899629F8E71D1A51BA18A = STEINSGATE_P2_D2 (SteinsGate_P2_D2) | V | 0xA5EA837F99226840CC749511E3833EA3 ; MKBv31/FindVUK 0.86.3 -0xAFA83F9A42DC38A3032C32BBC8535AFA09F787C0 = STEINSGATE_P2_D2 (SteinsGate_P2_D2) | V | 0x47453B49E69FF92A8BC43D3F4EA2AE7F ; MKBv31/FindVUK 0.99 -0xABB7F740FD88F69623433D3BD0208EDC14651AE8 = STEINS_GATE_DISK1 | V | 0x06E410B8A4360C25D0401F6CD32D129B ; MKBv57/BEE/FindVUK 0.98 -0x95E41651B99F1FD3F331A16C8263A9FF72A18C6D = STEINS_GATE_DISK2 | V | 0xA734F41D575F0D2965579B848B070C7D ; MKBv57/BEE/FindVUK 0.98 -0x1D8CB1F76B32FB113A1EEC32D322BF93B1E8E5A3 = STEINS_GATE_DISK3 | V | 0x191B4AE59F3A7AE582350F25878A509D ; MKBv58/BEE/FindVUK 0.98 -0xDACBE612D9CAC06F80FB33F25AB68EFCA39D8F29 = STEINS_GATE_DISK4 | V | 0x4D1773BA02C3A3E3851E73EA401A0556 ; MKBv60/BEE/FindVUK 0.98 -0x23A140A6414A407EA4283DA39B03B87589FE679C = STEINS_GATE_THE_MOVIE | V | 0xF66294083690434290EC6194832916BA ; MKBv61/BEE/FindVUK 0.98 -0x1B2DE13AD1F0A8DD5EC0FCC495A0DDF2F6BD564E = STEP UP 2 | V | 0x635CC270BA34FCBD87FA07F39ECFC06D -0xE55CF6E6BF3AA93BC1F3406520CE4C23D82152E6 = STEP UP ALL IN 3D (Step Up All In 3D) | V | 0x542157747C78362B49865031580FF0C5 ; MKBv50/FindVUK 0.95 -0xE59FF89127EAFD4CF47EF5D5AA0B1A62E808A789 = STEP UP MIAMI HEAT 2D (Step Up Miami Hea | V | 0xDF3777A100A114E80B47AE22B4BFF135 ; MKBv37/FindVUK 1.00 -0xE0D6AF953B2FD82591B9B5115F4DA860B8BC07FE = Stephen Hawkings Universe | V | 0xC23FEDC1E2CFA7BA9266188A096B4B62 ; MKBv17/FindVUK 0.80 -0x9528ACB512FC72401394A975CCE18B527C3AC606 = STEPUP2 | V | 0xAD4F11742FF57C50BAB00B0917B6ADF0 -0x422F4FB559FE43AB3BA9379CDCCB8CFBA1D7F060 = STEPUP3D_RENTAL_EAGLE | V | 0x70B1F9D8727DFB29E4CCC72E4E03F01C ; MKBrev 19 - FindVUK 0.56 -0x4E7722942E6F1C1733CF21CD716A3E7B5584A25B = STEP_BROTHERS | V | 0xF1B9FF4FEF5E4B64D150F1F429155C96 -0xE88483EBEE2103D3A61D5D2EE9E5B047A5BCC405 = STEP_UP_2 | V | 0xBB86AECCBBE466A8C7FFABDA3A98C36E -0x6688585516824C30372B867F6C10A884BAE140F1 = STEP_UP_2 | V | 0x6B8A76D9B7613F585E4605394D21E987 -0xB1DAEC5659B5B90433F80DC9CDED0992F045663C = STERBEN FUR ANFANGER | V | 0xD702E15DD3665940C1055389B2BCA8AD -0xA8C61450C51A04A0EAEF5EB68D03689E6BC56314 = STEREO | V | 0x687E290EF148172DA68F7D28E4CE0AFF ; MKBv49/FindVUK 0.72 -0x88C9E9016B9729D648401A2B778F8C52C18F57D4 = Steve Jobs | V | 0xFE8E2190A73A4EEE017758EF98FFA846 ; mkbv56 -0x07BDEFD2571C0823986828375611D3653866263E = STEVE_JOBS (Steve Jobs: The Man in the M | V | 0x07F1CCDEEC072E1E339FBFD14F3289C7 ; MKBv57/FindVUK 0.96 -0xEB9EBF43E9755FE531D884D4A4BC20975DCBAE67 = STEVE_JOBS_NA (Steve Jobs) | V | 0x6D5EC00DF045D5A7123F462F0086F47C ; MKBv46/FindVUK 0.96 -0xA3B80F1797AA272BE9AE462D730C5F65B7173641 = Stevie Wonder - Live At Last | V | 0x7FFB8B84357457EBC1FFD5440E53D3F9 -0x5B8CF57BC67FD5BB978E5CAB7FB9303F6C92E843 = STEVIE_WONDER | V | 0x9E60223AC126E17618918A57751CC1DC -0x40D358417C31E6F3A321D77B3DEF7F91E96C8D94 = STE_S1_D1 | V | 0x9F992B925298CDFACA24FE938618C076 ; MKBv36/FindVUK 1.00 -0xD9E3E07A053B9CF43B0076D37DAD0BBCA9B7E1BD = STE_S1_D2 | V | 0x44971E64997D42D743D22D4852DF000F ; MKBrev 36 -0xC8FC1B3D644AA84A4C103CEE528628E11E18382D = STE_S1_D2 | V | 0xA06875750D15118ED94E6F212FD3C4E2 ; MKBv36/FindVUK 0.80 -0xF65CD613B87C79E68A34F4EB8B889C863BEB589E = STE_S1_D2 | V | 0x55F50E86EC206A66522E0A6829DCCFA7 ; MKBv36/FindVUK 1.00 -0xB624309D11B10ADDDEA4249E4C7766DD0A5ED51D = STE_S1_D3 | V | 0xD0179558E39741FF83C0BE2D750EFCAA ; MKBv36/FindVUK 1.00 -0xC7C359084FA5838CF03AB7F288E85FE269576604 = STE_S1_D4 | V | 0x0EF9F29AD8070ABA5C174C8150742E9B ; MKBrev 36 -0x3C46F2862362F590FFC811E51AB7E6073BFC40A2 = STE_S1_D4 | V | 0xAB28D7CC2A8A4D0C82A95895C7645361 ; MKBv36/FindVUK 1.00 -0x4EAFB016D60069330072D6D6312617E93FD47926 = STE_S1_D5 | V | 0xD504D58C78AED8012B1BFB998EF614F9 ; MKBv36/FindVUK 1.00 -0xF0D31D8BE5B255373117B01A6ED813562D9ABBDF = STE_S1_D6 | V | 0xDBB5AE511F88B655A4C2D76A77241CB5 ; MKBv36/FindVUK 1.00 -0x59BBB16474930A5AB57416B665EBBE0C21643BFD = STE_S2_D1 (Star Trek: Enterprise Season | V | 0xB91692F61C4F29E7E154597A25E74F1E ; MKBv36/FindVUK 1.00 -0xF85AFE5441E4BED310265FCE6E05304E6CF20A46 = STE_S2_D1 (Star Trek: Enterprise Season | V | 0x7F98999606172799F350717D2AD55344 ; MKBv36/FindVUK 0.92 -0x37962F1B1A718D2B58753285A8023E88C66A3E1B = STE_S2_D2 | V | 0x9E85E4B0B5337170425B71ADCC7F0C63 ; MKBrev 36 -0x6DD5C417A1FA8602A1D53B8AE5A8008D09956792 = STE_S2_D2 (Star Trek: Enterprise Season | V | 0x3B431AC022E9C6FB632B0A037D14F484 ; MKBv36/FindVUK 1.00 -0xFA9A834553FB5EB92D3E14885141D580F92D2AD4 = STE_S2_D4 | V | 0xFFAD7C7C7C9A5DBF770E518550EA0842 ; MKBrev 36 -0x3FB8AC94E93AE590FEF77F91B2F2D794D644A223 = STE_S2_D4 | V | 0xE13CF9D5AA41D459EAFA917A163C8629 ; MKBv36/FindVUK 0.80 -0xAAC9EA4DA4B9CFE6222525F4F3BCC9745FEDEC04 = STE_S2_D4 (Star Trek: Enterprise Season | V | 0xFCAC848DCB6F73376CD1A5C26739C2AA ; MKBv36/FindVUK 1.00 -0x8368044AE276E3AE264068E06996F31F5B0932D8 = STICKY_SWEET_BDROM | V | 0x1B49C3B7F805FD5D7094E0D5B31FE1C7 -0xEEE5E0B61C6C34C0FD1EB774893905C38FD49339 = STING LIVE IN BERLIN (STING - Live in Be | V | 0x47600A41AA2413BAF40E8234D35E2394 ; MKBv19/FindVUK 0.96 -0x14CF3F5CED99BACB4F4288F09267DA77FD01A2C6 = Sting_Bring_On_The_Night | V | 0xD0A74E50B69690E4C226EF045AAA3A86 -0xE571CD213267CEF8D7606B0881344DEB1920FCDC = Sting_Bring_On_The_Night | V | 0x50B9663E2B2BDD64C77F291B413E12A4 -0x9E238F159C1E2146A4E64CECF9CA314263C685DC = Stir of Echos | V | 0xF714CE36A0ADDE21B44DBC2C6FF114B1 -0x51F90C8A65AB41AE291F61B8F2FE4EF39A48A341 = STOLEN | V | 0x7E1C92ABBD8533C5C637DA2177DA4F60 -0xB55E8C846EEF5992E6F7B2C2D29F628FD9CB43CD = STOLEN | V | 0x45079541DAB2B69B6F0A0D7F81BBE178 ; MKBv35 2012-10-19 KRJ -0x6CD361D09B7815154C83B81A6346C5257D51DB23 = STOLEN (Stolen - Blu-rayâ„¢) | V | 0x59F5F1DEE849B6C60EB0A149CC9F86C8 ; MKBv35/FindVUK 1.00 -0x92B0B827060DA0CD64862394CAC1DB2C05B8F8FD = STOMP | V | 0xEAC61DE43A00C2BDEFEC8D3226144192 -0x6A02D136CB5B8E75B9D8ED29EFA7FE5E76D0B667 = STOMP_THE_YARD | V | 0x85E2F135D2F6303D22662AAB97EEF6A6 -0x7904B6E3F81202241E6FF282BEB83D0F4F84CAED = Stone - NO_SW_FI_IS (Stone) | V | 0x5D179FC1122E6BCDF9EEC21DB6B59A56 ; MKBv19/FindVUK 1.00 -0x4296E4002C75534378B167DA03BB421906A3BC16 = STONING_OF_SORAYA_M | V | 0x21D3492F2D3E80B4729F6CFE4093F4C4 -0xD4F2A56EEEAB32D697FC7411BFC680B864472E97 = STOP_MAKING_SENSE | V | 0xFD1315669735E8F5A9DEB60F671A09CA -0xDA585580CCAA6853745BF770CFE4767ABB082470 = STOP_MAKING_SENSE (Stop Making Sense) | V | 0xE595E587C562BFD0C4FF306E7C7D8C63 ; MKBv44/FindVUK 0.96 -0x181566746532A535462BC248091E241367FF6E96 = STORAGE | V | 0x7CB1868843D24D3E2FDF5816E5686BDA ; MKBv31/FindVUK 0.98 -0xCBD65740E901372CCCC3BCD5CAE11C0FBE87129E = STORKS (Storks) | V | 0x4FED98906315A9A5A4A759F27B4E03BF ; MKBv62/FindVUK 1.02 -0xFFEDA34AC822EE372EE014850A2266EB84AD9E3F = STORM | V | 0x4E749AAB2CB7DFD54669CD029B1E54FA -0xA35267288E918A43F8E8E1388C1AAF603B3FC69C = STORMWARRIORS (Storm Warriors) | V | 0x04AE564B2A301CDF27DEA1065033C7B1 ; MKBv17/FindVUK 0.84 -0x18AC3A17B2BAC2628D5C1DF5F44F3DEF1B8D06E0 = STOYA ATOMIC TEASE BDROM | V | 0x282E2D413EDC22AB5AE9DB39D88E3D49 -0xA46588C3EB2A9E70488115089A411A3C57FE54AE = STRAIGHT_OUTTA_COMPTO (Straight Outta Co | V | 0xF0F07E86993C840616FC40BD6A1C549F ; MKBv56/BEE/FindVUK 0.92 -0xD620235B6084F9C4F9B9848AF3F21E38360C6C8F = STRAIGHT_OUTTA_COMPTO (Straight Outta Co | V | 0x7067E39ADCC1F620BF4018BF803FE457 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 0.92 -0x485F218239292B1A826A5B0960A62080AB469B14 = STRANGE DAYS (Strange Days) | V | 0x08372E01068088463D0723265F2B5AD3 ; MKBv51/FindVUK 1.02 -0x02AB6F0B16356230AD6DD5AB01F9DBA8A1F8E19D = Stranger Than Fiction | V | 0xCD68BA35C618C42A02937B154C29682F -0xD76786B51A4F302CD88367AB8A82F80CCA5A721C = STRANGERS | V | 0x86D185C5D00B29B3B77F673F29BA4859 -0x01CC6C1CF7A4DC27B0A820F5B4F4BA4CC090BCC1 = STRANGEWILDERNESS | V | 0xFC0AACC86B694D514F66377CA2BEB1EC -0x8BD1597E805BB31D1F08E8A70F00535BA617DF49 = Stratovarius (Stratovarius) | V | 0x962FB545AFAAC622587B020A3142B570 ; MKBv32/FindVUK 0.93 -0xC914D1FF7DC40BFA6E2A6DCC3C7B307FBBB644EA = STRATPACK | V | 0x82DACA373306767BBE0CEE7183926E52 -0xFA39405AD45E577CEEA2B7C09DC284A9274C8CFF = STRATPACK | V | 0xB2B6B1E4A2F86910DE49D751E047171F -0x92EB1B16E682E5A0408CB9F55642EAB49C5C11FC = STRAVINSKY_BELAIR | V | 0x36575AB4C9E41683D3FBFD683383FC0E -0x4FD0901BBFE22DF0CC85AA0B6B8587B9BC7373B7 = Straw Dogs | V | 0x2277FD87BFB2CC9AC48556796C9BD23D ; mkbv25 -0x0675324E675CA96F90ECF5AAEFC379152FB168EB = STREETCAR_NAMEDDESIRE | V | 0xF92B389D1F85F15B395E33E3DB15C07B ; MKBv20/FindVUK 0.80 -0x611B818243D7D3C6CE16FCCB9B8C0D0AFCA360D3 = STREETCAR_NAMEDDESIRE (A Streetcar Named | V | 0x9A5BA9BDE9406B02C77AD4895F9AB469 ; MKBv20/FindVUK 0.96 -0x24E5C7452E21B39366A5D19A7E68D3CE242D4025 = STREETFIGHTER_TLOCL_B | V | 0x6544732F648888F23937ACF84B2FFD95 -0xC0946D759EAE28CCA40E2E0418360AD7E17C5A55 = STREETS OF FIRE | V | 0x4AC033B2DBB22C415552C4512A38279F ; MKBv42/FindVUK 0.94 -0xF3F39359B4ABF129291409C433F504358382DFE7 = STREET_FIGHTER | V | 0xDF7E6BBAB0C17451733320A991D85399 -0xFC95701C6904FE8438B7F933319DC4C5D999838D = STREET_FIGHTER | V | 0x6E2D0EE513DFF284DFC743B82E1F90DB -0x23FA138CBB4D4361455990C034E5F427997E866D = STREET_FIGHTER (Street Fighter - Blu-ray | V | 0x952BA63876C044A8E2E8FAA4F9D709A0 ; MKBv10/FindVUK 0.91 -0x6565275D2B5450B08423FF8F4A8430BBC86AA8FD = STREET_KINGS | V | 0x59B93ED72A7DD7D5ABD3FD9777738ACE -0x4307168A08EBFE72FE40709B9F00E6E9C23BD548 = STREET_KINGS | V | 0x504A1B5A414B61AE36DF3AAED6BD2C3D ; MKBv7/BD+/FindVUK 0.84 -0xCCB4C63809C257B331C4CAA5A460084F1840DD39 = Strength in Numbers | V | 0x94F13DA1CBDBA06BA1A00BC61952E34D ; mkbv28 -0xEEB74CB2A3F3290FBEAA80E2D2EE60E87087A9CC = STRETCH (Jack Reacher) | V | 0x86696B348DF02733F7F8FE4F6865B83A ; MKBv31/FindVUK 1.02 -0xBF3DD62D7041C3278475B317EF223EC4A54F5801 = STRIKEBACK_S1_DISC1 (Strike Back Season | V | 0xCD05555D2AAB15EE85EE6D335E284B75 ; MKBv25/FindVUK 1.00 -0x4119B5299D4B02C446E0C534DB9DDE3B450221C1 = STRIKEBACK_S1_DISC2 (Strike Back Season | V | 0xD3F36B1CBEC54AD8E6D6F54E35EA1608 ; MKBv27/FindVUK 1.00 -0xECF02082552B92EE4DF77050780585308B2510E3 = STRIKEBACK_S1_DISC3 (Strike Back Season | V | 0xA4AFE409CF4228F1BBFC4708F8A4A967 ; MKBv20/FindVUK 1.00 -0x03FDD3DFC4BB40E3322AC1D4AEA6E122931101C1 = STRIKEBACK_S1_DISC4 (Strike Back Season | V | 0x76EB5081908260904D589D3B2C90FFF5 ; MKBv28/FindVUK 1.00 -0x0F7C9068A2245A0B4324D13244E0A7B003E8A8F7 = STRIKEBACK_S2_DISC1 (Strike Back Season | V | 0x3D49EC08231B6B7EFB2FADDB69129689 ; MKBv36/FindVUK 1.00 -0xB5243028EE8E82CF6BA084A3041A48C6D1334A30 = STRIKEBACK_S2_DISC2 (Strike Back Season | V | 0xB85A8A2B5AFC442CCDFADE3B4C7A207A ; MKBv31/FindVUK 1.00 -0xBEBEE7F584C55C239F48CBEE7683A02E1473FB9B = STRIKEBACK_S2_DISC3 (Strike Back Season | V | 0xFD1F98E2A0DBD7C99EB211EB82CD482C ; MKBv31/FindVUK 1.00 -0xE43B1C99F893C20F8CCAF3A683563976D734ACC4 = STRIKEBACK_S2_DISC4 (Strike Back Season | V | 0x739D3ACF2334C840A8F32A753CF79A49 ; MKBv35/FindVUK 1.00 -0x94C97777CD621ADB5B43E5A8A723C4E28DB7950C = STRIKE_BACK_S4_DISC1 (Strike Back Season | V | 0xCA64B09D599E5AD80E67407C7077FEC7 ; MKBv57/FindVUK 1.00 -0x7D1C1734E2221F681097C2BE6585E7B9C2533AAC = STRIKE_BACK_S4_DISC2 (Strike Back Season | V | 0x80325A6D7EE9D8A6204640A5996C7C22 ; MKBv57/FindVUK 1.00 -0x09B27288A7BD4D11709D59C5541DE480CFDEC45B = STRIKE_BACK_S4_DISC3 (Strike Back Season | V | 0xF3939D3B8CBA816A8DAE8AAD1D3648D1 ; MKBv57/FindVUK 1.00 -0x8150783DD356FCC5DF8D0A21CE43BF22DF66344C = STRIKE_BACK_SEASON3_DISC1 (Strike Back S | V | 0xFB5B5F3188EB229F80B2150FE1454C9B ; MKBv53/FindVUK 1.00 -0x0B3B7E74A0F4925ACFC109F759498AA87410EF2E = STRIKE_BACK_SEASON3_DISC2 (Strike Back S | V | 0x8EF9BFFF5B72406D4A2F663C7B94DB83 ; MKBv53/FindVUK 1.00 -0xA61187BDC43E6758654826455511031D165D026B = STRIKE_BACK_SEASON3_DISC3 (Strike Back S | V | 0x6804800CE831029E7B32A0313091264E ; MKBv53/FindVUK 1.00 -0x46A93E8CA12754111609F1FB33220B2C911C4D34 = STROMBERG DER FILM | V | 0x496BC74BFAAFED86B27F7C1C11AFF10B ; MKBv48/FindVUK 0.81 -0xD57280E23EAD22D10CE229EFECE3C6C7DA9BC108 = Stroszek (STROSZEK) | V | 0xAE6DA38FCB0874D487A892B2DEFB2F74 ; MKBv47/FindVUK 0.99 -0x14235CAC8278817DBBD1E6D4F22AA7923DA842A4 = STROSZEK_HEART OF GLASS | V | 0x45EB0F320DF2F0FE3E27BA0319D5028C ; MKBv47/FindVUK 0.99 -0x1BF20D94E984CDA07A12B1C9DE037C95013D8DE8 = STYX | V | 0x52CF09154F7D69C6041EE580177202B8 -0x5CB7D0A35E4D44361BA2604E4F734920D69E8B43 = ST_ELMOS_FIRE | V | 0x68A5FF718EF78838702DC3CA5CA74D45 -0x14665E479D268C39BF3F2488743F5BC5C306A739 = ST_ELMOS_FIRE | V | 0xE9B27F371B340B0CE66305D0D0D8F676 -0x199E1E66151613BD84963A64B7116FDBF17B34DC = ST_GENERATIONS_AC | V | 0xB07FEF884FF6D266DDA9D12BE33FC528 -0x0367613061FAFBE34C7EB677D6A4A31814E050C2 = ST_GENERATIONS_AC | V | 0xD8C65D72C112F3F3E3B629B5478FB22B -0x1BFD9062D4FFE6826F7489D8AC66347B7C41F2C9 = ST_GENERATIONS_AC (Star Trek Generations | V | 0x6023437B3685E79A25CBABDD809406AE ; MKBv12/FindVUK 0.96 -0xEFD3E1CAAF0E4B206B6B66A72D13651CBD0A526F = ST_GENERATIONS_EU | V | 0x4079F9762E289536F0A4D248BA98233F ; ThomaZ -0x16AD92C5E2263108569EFC7AA16CA52E533BF43B = ST_GENERATIONS_EU | V | 0xC59FB2668E48E9E23F9A682C06A18E77 -0xF6EF8D061E702CE2EF4578B9D66FBD9885336DFE = ST_GENERATIONS_EU | V | 0x1931D171DC8238796DBBC014B4C8DFA1 -0xB18BC11EF8059CDB3833E6FB5000F1CB9A37BC2C = ST_GENERATIONS_EU | V | 0x18EDD6AA00168FF27C56C7E3E25331F5 -0xFD2D9585E51C30AC1D3E3C29EE7B656477A21785 = ST_GENERATIONS_EU (Star Trek Generations | V | 0xEA0A304996C498E2B29DDA9535CCC38B ; MKBv15/FindVUK 1.00 -0x1D1C34AFA638FD04806FA4208A88D00E5B480245 = ST_GENERATIONS_EU (Star Trek Generations | V | 0x94236567C93692763B3E6B8AA2CB332F ; MKBv15/FindVUK 1.00 -0x11B2F2A7048459388DA87DD662B2183BDC75EA1C = ST_GENERATIONS_EU (Star Trek Generations | V | 0x603ADABE1E61B7B7E60323B31A8F6116 ; MKBv15/FindVUK 0.96 -0x5B9AC2DB9651CAC38920FBE4404645E311D29D6A = ST_VINCENT (St. Vincent) | V | 0xCB7434263400FC6DF174A392B1A0457A ; MKBv50/FindVUK 0.96 -0x65C248C017A80D40302B75F48196E295991F40B3 = SU21NNE1 | V | 0xD7824686EDD6228F7956C4EE2C203355 -0x1CBD6DA851EBA863949170C10E67C4CC68AECCC0 = SUAVE PATRIA (SUAVE PATRIA) | V | 0x0E0E13C9AB78CB80B722BE47AFF7E048 ; MKBv35/FindVUK 1.00 -0xAB36550B12E40FCC483F55C00EF3392A5669DD2A = SUBWAY | V | 0x882A6101B379F0CF4104AA69F1B6ADBD -0x39F03949005CFEEA6F1232641445922494FC08ED = Subway | V | 0x780FFBA4382D8F3A946EA4D81BE0DA10 -0xA44B4F8BA20435A0BF839D84A5554D2116FA38B9 = Suck | V | 0x187BB13DC83A141D002BD939ADD92735 ; mkbv18 -0x51B6B9E7AE11384550B35F377F832D3877C45A50 = SUCKER PUNCH (US) DISC 1 | V | 0xA6343581A5160A028C8C5C94CD654D28 -0x4C95879D5F651C4F7C7528A226644F734A992F86 = SUCKER PUNCH (US) DISC 2 | V | 0xC97EE52711FB1AA6FCF4A64A84173E69 -0x8DA0C4D015F4E269BE1EE197877CDCCFD87A10D6 = SUCKER_PUNCH_BD02_DIM1 (Sucker Punch) | V | 0x9E727B56652ACB6C1EF13B88FC7D2499 ; MKBv23/FindVUK 0.91 -0xA7A649483CC7EB50FBF8467A245C3821775BC0FD = SUCKER_PUNCH_BD02_DIM1 (Sucker Punch) | V | 0xC457D6055C455ECA0EA519BF92D34E08 ; MKBv23/FindVUK 1.00 -0xDA90322B1024817327418B6F594F186308500083 = SUCKER_PUNCH_BD02_DIM1 (Sucker Punch) | V | 0xFDFC836B7CBE0B3CA02816E8ABEE9729 ; MKBv23/FindVUK 0.96 -0xEABCA7E6BFDF638B09C3A842F5A9E94A28592A51 = SUCKER_PUNCH_BD02_DIM2 (Sucker Punch) | V | 0xB56533094865BCA3F98FBE96F3513F77 ; MKBv19/FindVUK 1.00 -0xD27364B7777A21540C7714E54D837D4CAC5BC9B5 = SUCKER_PUNCH_BD04_DIM1 | V | 0x4CB8C1B197AD8AD5A886F3A6E1C86B2D ; MKBv19/FindVUK 0.96 -0x2EDC2E36939661B04E2FC340C13899A35E23C8A0 = SUDDENDEATH_G51 (Sudden Death) | V | 0x579D37777104D33D9CCF1C2C2A2D1CF4 ; MKBv36/FindVUK 0.98 -0x408C987C9D95F6F814076AFCCB85581BA040AEE3 = SUDDEN_IMPACT_WW | V | 0xE9454B18536F6992F1467A8C106FBCCA ; MKBv7/FindVUK 0.98 -0xE57C1C24D9591166FC235DB5CCBED59E911A8A15 = SUDDEN_IMPACT_WW | V | 0x492482355EB17C7D3F9FFA40878D8776 ; MKBv7/FindVUK 0.96 -0x1BCDFC6D24BD8E25ED4F185951C990B56F7BC7C0 = SUDDEN_IMPACT_WW | V | 0x273CB0C36377961993B1F48758D649E9 ; MKBv7/FindVUK 0.96 -0x7414B960600B135A10CD323A92BA2F1EBBAE7680 = SUICIDE_SQUAD | V | 0x89EDD751F2A46C5030315945C03D28B8 ; MKBv62/FindVUK 1.02 -0x05746C7809505B6F443F0165651525B351182291 = SUICIDE_SQUAD | V | 0xCD361592BA6225AF80179F115AAAFF08 ; MKBv62/FindVUK 0.96 -0x08BB9BC02A265BB7EF5A7D99CE617B3AE5CAFF10 = SUICIDE_SQUAD | V | 0x7738DE55C3E1EFE1F2D4047CB67CA5B9 ; MKBv62/FindVUK 0.98 -0xC30DED6635BBE986ABBC13ADFCBAF3A7BDD3B5DC = SUICIDE_SQUAD (Suicide Squad) | V | 0xA6505A811D31D5A233B02428DC191EF2 ; MKBv62/FindVUK 1.02 -0x62E2704A8FAEA9D950EE92BF7D89F87F12F9C74A = SUICIDE_SQUAD_EXTENDED_CUT (Suicide Squa | V | 0x1BDFAA4E6ED0326C38395EA716715718 ; MKBv58/FindVUK 1.02 -0x1F0EB25F82276C259FC607F038443B12917AFA7C = SUICIDE_SQUAD_EXTENDED_CUT (Suicide Squa | V | 0x80C52D63C7408D1ECF87378A144DBB36 ; MKBv58/FindVUK 1.00 -0xC4C849323E97963B49014C6F5C12159F54182B21 = SUICIDE_SQUAD_EXTENDED_CUT (Suicide Squa | V | 0x1CDB3F449DEA123F08AA10D16D665C46 ; MKBv58/FindVUK 1.00 -0x8FD9AC7297569B95BCB32B249AC4A467C70FFEEC = SUITS_S04_BD1_G2 (SUITS - S04 - BD1) | V | 0x6B3FB518BB910FB0AA81EBF07136F147 ; MKBv49/FindVUK 1.00 -0x2E310B92FA3B8B87EA72C2507ACC7ACBF3DDCFF9 = SUITS_SEASON_1_DISC_1 (Suits Season 1 Di | V | 0x438B8D80F5B926371C51E6513C87FE16 ; MKBv44/FindVUK 1.02 -0x1C8DDC2CDFD4925EA883C490B5A33AF3069A4846 = Sukiyaki | V | 0xB8E10664CE467834D06A8E834638A0B5 -0x456D890190C291BC6332E13178C0993FF4FED918 = SULLY (Sully) | V | 0x25E89136D9123F8F2DDD958B1DFB32C9 ; MKBv62/FindVUK 1.00 -0xEE306E175196D3B82B9552A0ECD19011729F2B86 = SULLY (Sully) | V | 0x21D89D48E7973C4408069A171B9B6801 ; MKBv62/FindVUK 1.02 -0xB893B31A7101DEF9E5B0374FD7DA3B30871D40CB = SULLY (Sully) | V | 0x5999129FB689F7B1FD7DBC1517DF5958 ; MKBv57/FindVUK 1.02 -0x5CC4974A8BD2BCA721D5649F802F59D20A0E3415 = Sum of All Fears | V | 0x073BCB0F371030DC683C3F0B234E3253 -0xE9F1EFC0085CD866D76643CE72D167455AE4D90E = SUMMER WARS | V | 0xC9C6945E4DD74F0CBA40069F4CFA5330 ; MKBv30/FindVUK 0.99 -0xC922E49755ABE94827B13FEE959AAEF35E56D6B4 = SUMMER WARS (Summer Wars) | V | 0x5173A4666AB3CD383ECF53F6C4B9C52F ; MKBv21/FindVUK 0.98 -0x16D73BB28D82E7DCD37C1B532B585041F1B01CB7 = SUMMERWARS | V | 0x2341037E4B8DBA915C1C7DD6D09EB835 -0xED81E895127C201486EC824452FA270513BB4C71 = SUMMERWARS_TOKUTEN | V | 0x1B5CA87861090B1707B7BAB078F2F866 -0x3A7E1B91DECD92ADBF2D9294CD6A7A671C103488 = SUM_OF_ALL_FEARS (The Sum of All Fears) | V | 0x02172C2CB6DE0F91986351F93A78D5CA ; MKBv7/FindVUK 0.96 -0xE598F38460236818B416F3F28EEBA98DC9BB3D99 = SUM_OF_ALL_FEARS (The Sum of All Fears) | V | 0x16436FF08D243E00EA2562F288750827 ; MKBv7/FindVUK 1.00 -0x6913C89F1CC2F764A3F50755DCE1FD2EA679C837 = SUNRISE | V | 0xB18C31BC34E38AD682E5E9B1F5614BA1 -0xE8F66E3D3D36FB0C94FFF5F5D1CAB5833E1A79EF = SUNRISEEARTH_GREATHIT | V | 0x292CF59E36796DC87D4AF9B766996358 -0xF549827362BFC397EEFB6FA90970D4F30B954CBD = SUNSET_BOULEVARD (Sunset Boulevard) | V | 0xC6E7F6704F8127CD15BC9C4B173C0056 ; MKBv27/FindVUK 0.96 -0x58DA9F8EF6D3E3D58192510C5D98CDB38D4C439E = SUNSHINEF1 | V | 0xE3B386B1289F45C2D2C60A9BAA193C03 ; MKBv4/BD+/FindVUK 0.92 -0xBF7D005B2207B4F539B7AD43718C6C018E526E1D = SUNSHINE_CLEANING | V | 0x719DD64A8CF1609B8C61A7C39D8C76A2 -0x08D3E715F02A5A317F88BA006C5B664E66520935 = SUNSHINE_CLEANING | V | 0x378CE184190BB9CE3474DD1AFCCB426E -0xEC0A12DF40B3EC7A0588656B065C796FEFCF772C = SUNSHINE_F3 | V | 0x8DC8744DE07916197DF4107F91606811 -0x1C7FCD16431FE458E94E922379E57ACF729362B7 = SUNSHINE_US | V | 0x52D04D9FEDB1E1D28DC3C430C0493558 ; MKBv4/BD+/FindVUK 1.00 -0xAE87C8948D55334B83AC73F2FF9AD2C3995144E6 = SUNSHINE_US | V | 0xE9A02851182153FD37176482E9CBE15D -0x74C3D0EBC9CFADF99B4FCE2DD0D4CFDE94C019B2 = SUPER | V | 0x710854E9B6000184DD2071651F3599F0 ; MKBv25/FindVUK 0.96 -0xA28B10F42AB4637FAA3E3E0F79917741FBCFEC7F = SUPER (DE) | V | 0x53C159FD53F31C74CCDB2ECDD2345366 -0x773EF33C5A8FF81C17690A3750FC1B696B4C9673 = Super 8 | V | 0x9A2F39561DBB7E5CBB60FEF18F492795 -0x26DB4AE649B074F040AC7ECDE61BC25070E45040 = Super 8 | V | 0x93E089F2416185B86AF3095E4BBC0C17 -0xE9F2C8AC9C414558010C0D14D1724608A28A1C7A = Super Queen | V | 0x7633B80ED22B097D47CDC8C7278E3BFA -0x147C0FB60F1EFBC646EAF30B087B54A9065D97E4 = SUPER ROBOT | V | 0x2FA97D788FD506A120CF03FC96B1960F ; MKBv51/FindVUK 0.98 -0xE7CEF2FDBAC16037C7D854AB9501825183C2D3E8 = Superbad | V | 0x30D7A5B22B7C50480253B8A05EEE7286 -0xEF04CA5BCCC295ABD8EAFEEC2E11EE360796A9D7 = SUPERBAD | V | 0xDC554E0DD8A850AB60F004180598D63E -0xF21D23B99BA9D9996450A40CF8152DC35404D5BC = Superbad (Bouns Disc) | V | 0xDB5075948AE870527234C7696E820BFD -0x06B8CCED7D38A91F30AFEFD0931C7DE31ED80EDB = Superbad 1/2 (Feature) | V | 0xA084ED35613AC776B2BCCDEAD413A788 -0x69086933198235BE0F610B997C5F62D7EB6CDD06 = Superbad 2/2 (Special Features) | V | 0xD309EBC267947E71DC178EE24613B587 -0xA285578BAC6D34AAF7ECF6468F1AA74078998966 = SUPERBAD_NA | V | 0x9729D78C79672416C5BDD7F0858A7CB3 ; MKBrev 4 - FindVUK 0.54 -0xD1F5F70262E183369ECD6411EC8430C6CAEC1701 = Supercop (Supercop) | V | 0x41A6E0B5D675E8CD024783B0848F4955 ; MKBv47/FindVUK 0.96 -0xBDDB4E1ECC257534DE10019CC07A0F208C43E259 = Supercop (Supercop) | V | 0x5E49E999AB9463C1CD4907A76B3E4DD7 ; MKBv47/FindVUK 1.00 -0xAE0E7476385FC79F72C88DD92D9800BB72C6689D = Supergirl_Season_1_Disc_1 (Supergirl Sea | V | 0xD653EB30E70162332C3A7FCBC533073F ; MKBv56/FindVUK 0.96 -0x45F7CEA863F8086DCE0C36D46075E0CEF08B218D = Supergirl_Season_1_Disc_2 (Supergirl Sea | V | 0x6CEC1476B48801C544E20BE55BFE5EA3 ; MKBv61/FindVUK 0.96 -0x5E7D7E6C4A8485B3E449F9E3F53E30BA81551D63 = Supergirl_Season_1_Disc_3 (Supergirl Sea | V | 0x6321215597D64224BFBE6964DA9D167B ; MKBv61/FindVUK 0.96 -0xBCB6E8A2D01644C7B77F5E31F71A64EEFCDAAC70 = SUPERMAN | V | 0xD50154A6274517141AAE7A2898A53D36 -0x6D762635BF7046C355572E147B420134D2A76AC8 = Superman II - The Donner Cut | V | 0xCD4DBFFBB67A3CA72D325EFAD0A51689 -0x7840838375326AEB3A758AE51ACB5A2527921EC8 = SUPERMAN II 1980 (Superman II (1980)) | V | 0xF887B900FA500E8810BD378942A33E37 ; MKBv19/FindVUK 1.02 -0x03441A4385083C4D2D318570C45BC7AC59AA2D98 = SUPERMAN II 1980 (Superman II (1980)) | V | 0x3A6B11A124E54F4C94F589A4A86C13D2 ; MKBv19/FindVUK 0.96 -0x76E250DCE781751608F1C8AD15AB80D88B2BB4AD = SUPERMAN UNBOUND (Superman Unbound) | V | 0xEA6FCA582300662894572CE9498E43A2 ; MKBv36/FindVUK 1.00 -0xE62535EB1FC13AAF09CD4CADB69CF51C34DEAFAB = SUPERMAN UNBOUND (Superman Unbound) | V | 0x23D8A01133DAA516EE0CFC705C0259CB ; MKBv36/FindVUK 0.91 -0x236C79C252C6DF02D50026EF3FF29AF4685C9B24 = Superman/Batman - Public Enemies | V | 0x8A127CA2E24852FAD414165911B0F1A7 -0xEE3273F1BAB437F516C32BB5C196D2EAB23FEB3B = SUPERMAN_BATMAN_APOCALYPSE (Superman Bat | V | 0x502C9648CD7E36AD42FF5B0A80B23C63 ; MKBv17/FindVUK 0.91 -0xAFDF61E263C57F9336D9369D6A49573B1D92C928 = SUPERMAN_III (Superman III) | V | 0x0226E29B22211F1714C96FBDDE0628B3 ; MKBv19/FindVUK 0.89 -0xEF963E414DDA0C47A2B236735E462EF4CEFF0BA1 = SUPERMAN_III (Superman III) | V | 0x5F3DC5BCC9DD66E46B6E3553B2E6C33E ; MKBv19/FindVUK 0.96 -0xB190758AB9D85D1AD870D63BC4BC9DC51B330742 = SUPERMAN_II_DC(US) | V | 0xF48A57AF59539639E1566AFD1B205A1F ; mkbv1 -0x79A57CF2ED382A8092585F674E815CEF5C509C63 = SUPERMAN_IV (SUPERMAN IV: THE QUEST FOR | V | 0xDFBEA0B3E988D6222054263DE8BB8D69 ; MKBv19/FindVUK 0.96 -0x998CF0226057364997FD6998CB202801027440E2 = SUPERMAN_IV (SUPERMAN IV: THE QUEST FOR | V | 0xDCF495E5F03DD8632CCD1FD091918FCF ; MKBv19/FindVUK 1.02 -0x69F22DFBB250DC69FD38BDF8BF95B99A722AE841 = SUPERMAN_IV (SUPERMAN IV: THE QUEST FOR | V | 0xBA09ED1C6B0B2E41C1AD3C367E32DB0F ; MKBv19/FindVUK 0.89 -0x58120B454767FE64A3948AF975DB378E9D01E82D = SUPERMAN_RETURNS | V | 0x4298B54E41954714F9AFC35566D0B2E8 -0x666C4092975C777B054290DF1476E338568EBA57 = SUPERMAN_RETURNS (SUPERMAN RETURNS) | V | 0xB28892EA4F4F691B537A88D00A109953 ; MKBv19/FindVUK 0.96 -0xD0CEC0BD034055D4E021041E470E90EB40BCC259 = SUPERMAN_RETURNS (SUPERMAN RETURNS) | V | 0x2739F2298A664BABD7BB9C3196C58163 ; MKBv19/FindVUK 0.89 -0xB74E458119EEFCEDB9E5AB861F6BCED60B080CD6 = SUPERMAN_RETURNS (SUPERMAN RETURNS) | V | 0x054CFF75C22296A0CB055406381AEF83 ; MKBv19/FindVUK 1.02 -0x7D599DF658F2CE818A26F25205D7829B56B2F9B9 = SUPERMAN_RETURNS(US) | V | 0xA87D981A651E4942E67CAB038E359844 ; mkbv1 -0x749F7DCB2D744B343E5AD9A383F220913754B016 = SUPERMAN_THE_MOVIE | V | 0xD38E18A316CDA1DBCB428EDC60416009 -0xFF8518250DB7019FBD1824F763B4D930419E82A5 = SUPERMAN_THE_MOVIE (Superman: The Movie | V | 0x5F3B3A7CF9244F410FB14C443F92012C ; MKBv19/FindVUK 0.96 -0xB55680F7E35FCD06C2BC437DC6B7FC9237A05C23 = SUPERMAN_THE_MOVIE_2000 (SUPERMAN: THE M | V | 0x26F2F8A83BB051162803F0E7E6E271EF ; MKBv19/FindVUK 0.89 -0x8EAF557F989A4A89EEB64F79A816FFBD4120230E = SUPERNATURAL S1 D4 | V | 0xB3C22D930A6B56252A0366C4EAEF1872 -0xDCF7F0F49EE493F83C65B943261A3B4956959309 = Supernatural S6 D1 | V | 0x9B25E80353CD7D5B2807AAFC3B14102B -0xD60C0B3DBE09FE539678D27A167729D0D6CBA2C4 = Supernatural S6 D2 | V | 0xC49443065471A55A1C5F715D5A26000F -0xDCDB6D7E7A1F736BB0682F6454224B2BF833D6DD = Supernatural S6 D3 | V | 0x87150EE05D534D8EE18FFB9A0332EDCB -0xCD97F31CAFC58B5823501AAFDC178AFE1264C164 = Supernatural S6 D4 | V | 0x85344D13FDF64B880173A669C2F18F49 -0xB26491897CA407049D72E66231B1133AEFE6180B = Supernatural s7 d1 | V | 0x46356A1EACD13DAEBCFDE2AEF90E8041 ; mkbv27 -0x53DA79C6EE1BB2FD3500C52D71548F189AF91805 = Supernatural s7 d2 | V | 0x380FF4D7615B8184E07AC78C7B5B5B84 ; mkbv28 -0x92B9AC7E0FB0B55CB6A6EB2858551EE9B21FF821 = Supernatural s7 d4 | V | 0x314A177FD22055F65F4DF6C204196933 ; mkbv28 -0xC377D3E7C58139BAE3BEDCCCC95EB52E4455D4E3 = SUPERNATURAL_S3_BD01_D1 | V | 0x08FD3BBCFF8B65855D347D4FF310E831 -0x4FE4501F83C42DCBB364B334410B9BDA7525981B = SUPERNATURAL_S3_BD01_D2 | V | 0x76AEDC05837FBEC6A95437168BF804DE -0xF6A964F365AF561EED63248BC58DAE954787B032 = SUPERNATURAL_S3_BD01_D3 | V | 0x5728BF24024F84A9B5BB935526985D90 -0xE1173C41356852A9F6A7AA9556F1FEBF89DBBB06 = SUPERNATURAL_S7_D3 | V | 0x508B7D713B78C24AB341AF1BC3981365 ; MKBrev 31 - FindVUK 0.62 -0x0EACE65FDE5D28758566B08976B1310CBCC6DD2C = SUPERNATURAL_S7_D4 | V | 0xAB610C0F5839A87DA786118D2A700136 ; MKBrev 31 - FindVUK 0.62 -0xA463876BD1B1246BFB8D0F3E3E425788EB6BF58B = SUPERNATURAL_SEASON_1_DISC_1 | V | 0xA2C812AC7A98C685801B4FDA7B7A9C7B -0xFC611FC1C18E86827E72ACBA32D93E7081078F60 = SUPERNATURAL_SEASON_1_DISC_1 | V | 0x49902AFEF77C8B2C69E040E6CD0F5417 ; MKBv16 -0xFD911638A4B6079F2FB868A4F2E8D2692AFD5507 = SUPERNATURAL_SEASON_1_DISC_2 | V | 0x9F909C46F923432391A9607B2FD74A5B ; MKBv16 -0xDABADD86593EC479D659EEBFBD0F28E61BACE9E3 = SUPERNATURAL_SEASON_1_DISC_2 | V | 0x2ADB0CF22558BDA075AE1661C34F2BB0 -0x789347EFA666BF9DF57F7841D7E9D10BCD7EF124 = SUPERNATURAL_SEASON_8_D1 | V | 0x268F07ADA2E94255EAECC85ECF3CF479 ; MKBrev 42 - FindVUK 0.62 -0x39F83DA916DCCBCBBD420571ADB8CCCEE4FC0125 = SUPERNATURAL_SEASON_8_D2 | V | 0xA929A39E7F295EFC8B42B7889766058B ; MKBrev 42 - FindVUK 0.62 -0xB09CC95CC31AC8E45C55BF050B0C1C37D56FB446 = SUPERNATURAL_SEASON_8_D3 | V | 0x64467ADE5DE936513727D8890790AAC2 ; MKBrev 42 - FindVUK 0.62 -0x81A552D6DDBF2ED7E435D2BCCD7B075BE703C6B8 = SUPERNATURAL_SEASON_8_D4 | V | 0x01D44DC721E7FFC0A6D1754A976F6141 ; MKBrev 42 - FindVUK 0.62 -0x1B07E34B8142AAED726C192E53F6ADFB6DA0AA61 = SUPERNATURAL_SEASON_9_DISC_1 | V | 0x9B39A9908C616D98C9B6C40D9BBF78D8 ; MKBv47/FindVUK 0.80 -0xAEB6C8A8B7589459BF608F8727D165AC7DE17DB6 = SUPERNATURAL_SEASON_9_DISC_2 | V | 0x62F241C0B03CF2E5832A50121F702F46 ; MKBv47/FindVUK 0.80 -0x0AF3EA3D594EA6F5EEA7EB008C24130F2589E25A = SUPERNATURAL_SEASON_9_DISC_3 | V | 0xF6280621E12D5BF5E502E9FBCAFFE13F ; MKBv47/FindVUK 0.80 -0x075C8D6873C7774C1A2CD715185E3577D5FA149F = SUPERNATURAL_SEASON_9_DISC_4 | V | 0x5CFAB8CB1D91A52FD480F7439A98F07F ; MKBv47/FindVUK 0.80 -0xA1B95D97EC6B9C083A21A93DDF9CF1C64156537D = Supernova | V | 0x5072C7B0829FAEFE6B23C4EA243BFAE8 -0x992649ABABB8AE0C1FE7066F78B4A2F1ECBE4983 = SUPER_HYPOCHONDER (Super-Hypochonder) | V | 0x9DC9DEC32DFEE959175B79D99B1FCDD7 ; MKBv48/FindVUK 0.99 -0xD77A377F58A9F88E8FC5F5006945D364D143B832 = SUPER_NATURALS_8 | V | 0xFDA66A09925EB9544D79F6C27BF8C7E5 -0x48B118FF90DFA50E8E8814549D0A4072D354A9E2 = SUPER_SEVEN | V | 0xD5D56B9EF0C18950692E0C0ECEFF9A9B -0x2B37661C5797F951AF97719AA6406E0DB154FBEA = SURFER DUDE | V | 0xB19F63B75C148DBAFBB51410A005339B ; MKBv23/FindVUK 1.00 -0x0C9FC707BC5F6BAA0D406EEF085B175BC4ED44AB = SURFING3D (Tangled - Blu-ray 3Dâ„¢) | V | 0x76AAC6AFFD93ACD72F480A569EAB4676 ; MKBv19/FindVUK 0.99 -0x472C7EE1B89C8CAF8C655B2C08DEBD1D69273CFE = SURFING3D (Tangled 3D - Blu-ray???) | V | 0x54C15A878D7868C4966B043F10A00FB6 ; MKBv19/FindVUK 0.96 -0xC85C529CC0C435B3CB35BE71CA141DDBD5A30A97 = SURFING3D (Tangled 3D - Blu-rayâ„¢) | V | 0x429FFAB114047A4053F4D28131AD9FF9 ; MKBv19/FindVUK 0.98 -0xE4C83755BF3A8265C8759464FA2277075B749323 = SURFING3D (Tangled 3D - Blu-rayâ„¢) | V | 0x35843D522CF235412E5CF59721337E2F ; MKBv19/FindVUK 1.00 -0xD740CD41DA6AA3951FE684F6CADF6F02A4A7ACE6 = SURFSUP | V | 0x1488C4B76AA709C9D4A73036CAC0B646 -0x874C3216FD2F88272A2AE0EA6FE2FFF7F37439B4 = SURLAPISTEDUMARSUPILAMI (Sur la piste du | V | 0x68E1DE0EB0B820645F707394752B196B ; MKBv20/FindVUK 0.83 -0x9A928901CB6745789C003A256210482D682F5D82 = Surrogates | V | 0x434986EC1ABC206DDC31E19EACC7B5A4 -0xBB6A6FEC243E16E44ADA0BDBE035D85E59EF6F17 = Surrogates | V | 0x81DECC261A51A5D6E58B25F65CD4A228 ; mkb v16 -0xFC9444C6273D48A916BA988DA120A0856020BB21 = Survival of the Dead | V | 0xC2F7094B93F908BAF3D42104408B83FF -0x311A6F33902F78082967F12FE4C4D27728EA7BDC = SUSPIRIA | V | 0x3C307390841AF0A235520C9E5C4FEC98 -0x7F190526B1452FE9B414AFF885F354BC0D0C5BEE = SUSPIRIA_BD (Suspiria) | V | 0x3D6B9A31A8DBB98039E3F021CF9A7662 ; MKBv46/FindVUK 1.00 -0xAA16A9361E2D1CE1B884123E9A760973748E03F7 = SWADES | V | 0xF49E32242A3ECECF5A05B235A4CC2A61 ; MKBv9/FindVUK 0.65 -0x86AEFD9FBE9ED17E7441F9EC0D82EED5B1F3B1BF = SWAN LAKE | V | 0x5E8E21C76A082948D91D25845B297F15 -0xC82976EDF938CB32FFB51920F1B635A399FABD20 = Swan Lake | V | 0xE7A39F22D728E5E8C9240557A489E44C -0x29C62D3A113EEF35FFA560E4CA913EBCC44D8CE1 = SWAT | V | 0x40430CA32DA49B0FD40A6D87CFB321BE -0x87450DB5EDFD6CDE0868F7846573F75E48262D11 = SWAT_FIREFIGHT (S.W.A.T.: Firefight - Bl | V | 0x641FCCDE36E7238663F1C6C1894F8DB4 ; MKBv19/FindVUK 0.92 -0x2FB52DD9CC3328B0DD76DF8EF7AD5B7A55F0BA5B = SWCW_S3D2 (STAR WARS: THE CLONE WARS SEA | V | 0x431A7C74108579D59B6DE7640C315000 ; MKBv25/BEE/VUKNOTVAL!/FindVUK 0.96 -0xE74EE75FA0E2DA04A5A956DC00BA9A1EFBE46AE3 = SWCW_S3D3 (STAR WARS: THE CLONE WARS SEA | V | 0xF8FD33E1607BB8AE517B11B4EF900D61 ; MKBv25/BEE/VUKNOTVAL!/FindVUK 0.90 -0xA160AC3BE96EF78165FFB65B5472C57B82FF3D7F = SWCW_S3D3 (STAR WARS: THE CLONE WARS SEASON 3) | V | 0x0E444C1E3B3295F1AA484E0C63EA356B ; MKBv20/BEE/VUKNOTVAL!/FindVUK 0.96 -0xCF1E428CF4E8C0A2052723641949E2C0DF36D973 = Sweeney Todd: The Demon Barber of Fleet | V | 0x80A6E0C63208C4F88F9BD9872DFD2D24 -0xDFDD25B3BDDE1EF414D00D5B25F1678448CA116E = SWEENEY_TODD | V | 0x4EFDDF7C11A93CFE80066EC879CB1475 -0xA0D470C62ACA58E7E56391936960B2EAEEAB8F68 = SWEENEY_TODD_B5 | V | 0xBFF1B9F112E0E2BE314075C13C760E83 -0x4CF10CE22540687096BC2710BE767CA48B5A44F5 = SWEENEY_TODD_B5 | V | 0xCA7F248E2C9EF5A08019629AEC61B6CE ; MKBv7/FindVUK 0.98 -0xC38412E027F19D653C35718B2FEFD35A46A9E866 = SWEENEY_TODD_B5 | V | 0xD999DEBF40D8C160038244C6DEEF82AB ; mkb v7 -0x5BBFDE86D12AD6BBB2DB6FD525F32EC047EA9A17 = SWEET_SUMMER_SUN | V | 0x837F8C09D4A6A56FF18190868424F0C2 ; MKBv42/FindVUK 0.89 -0xA16C4A4400E3234700C0C20A84EB8AE7A3085E46 = SWINGERS | V | 0xF13A32C3544D016148F1E19338017F1E -0x1A19B3B27796A464117752E5B6EEF17296C3BF81 = SWING_GIRLS_BD | V | 0x9ED9C45DD86619E9A40E445EC3283138 ; MKBv8/FindVUK 0.98 -0x8A9B12FE03EB99E6929E8E4BE21D9FE81483107C = SWORD ART ONLINE (Sword Art Online - Ext | V | 0x7031BBE982754A8C5004B6CB7D8A01E7 ; MKBv53/FindVUK 1.02 -0x5BBA817FA669D2DDCAD47D9CE60A6F47C7D48033 = SWORD ART ONLINE 2 BD3 (SWORD ART ONLIN | V | 0x3277ED547312E189E6DB1DB5BFC8F95F ; MKBv57/FindVUK 1.02 -0x8FC4CF6B3C8830691AC49F07983D8AA509963AA0 = SWORD ART ONLINE 2 BOX2 BD2 (SWORD ART | V | 0xC2EC9F37C53DACFA148C5031E8ED12BB ; MKBv57/FindVUK 1.02 -0x8AF8CC01674A16D5F6624EF1AE71F756C403129D = SWORD ART ONLINE D1 (Sword Art Online D1 | V | 0xC1DFAB70590C0EC490DF0EB903D8BDB0 ; MKBv40/FindVUK 0.86.3 -0xCFAE7006923AE1566B257C8EC2A86406AC7EBE83 = SWORD ART ONLINE D2 (Sword Art Online D2 | V | 0x0A150F5AB0453106F255709DA5F6399C ; MKBv46/FindVUK 0.86.3 -0x1168B05D3EADB2060C06A0A1D18910ABDBFC9F72 = SWORD ART ONLINE D3 (Sword Art Online D3 | V | 0x4644EC2FBF3B56F1EF091AFE05D4BE86 ; MKBv46/FindVUK 0.86.3 -0xEAC4914E50CDE7824E3B763EB826905FEFD0D749 = SWORD ART ONLINE D4 (Sword Art Online D4 | V | 0xFB5327EFE6C306C643688CF87208A71E ; MKBv46/FindVUK 0.86.3 -0x42A824CD2FA764A0ECB697C0705C66D6C958CB93 = SWORD ART ONLINE DISC 1 | V | 0xEE629415C3FA34994F56BAEA5B99F836 ; MKBv40/FindVUK 0.72 -0x26E46CB60CE2A7B91E5A8A1133682252FD39106E = SWORD ART ONLINE DISC 1 | V | 0x3DD3D4FEC162425E8852EB5DFAB29305 ; MKBv40/FindVUK 1.02 -0x0CE765E7169EC2DCD77020F6CE802E723D78FA3F = SWORD ART ONLINE DISC 2 | V | 0x35D988107FB704B91FAC76EC8400D749 ; MKBv40/FindVUK 1.02 -0xF3DDA09708E029A5DFBB4FDCD2914D0940E41CC7 = SWORD ART ONLINE DISC 2 | V | 0xD9C5491C3EB570F976F4E873B996AE2D ; MKBv40/FindVUK 0.72 -0xB563E6239E89758E91A154ABDCE58EEC5E119F7F = SWORD ART ONLINE DISC 3 | V | 0xF2FB3BBE525EA79A54DD8ADBE456B610 ; MKBv40/FindVUK 0.96 -0xC0DCD265F678EF741D59E07AFEBD8E35FDAEF0AA = SWORD ART ONLINE DISC 4 | V | 0x94ABD2F3CAF8687E2168FB578CE8EFE7 ; MKBv40/FindVUK 1.00 -0xCB582379B03726ABAE93722132F9F1EEC8D54D6E = SWORD ART ONLINE DISC 4 | V | 0x72586FC30B9F5B7024B0CF3F8EDD0D02 ; MKBv40/FindVUK 0.96 -0x9C69A1B9F320774641A6C15977F2B8D4AFCDD4EF = SWORD ART ONLINE VOL 1 | V | 0x424577F4CC929AC7896A8BF35E8DB97C ; MKBv39/FindVUK 0.98 -0x9191C9CCB48C795BF7C220D5CF99A8774EE9849F = SWORD ART ONLINE VOL 3 | V | 0xDA402DA41F0557149D15CD156E585EAC ; MKBv44/FindVUK 0.98 -0xD124512BE54B869A37C0DDAC6A5BBCDB8E5F6C9E = SWORD ART ONLINE VOLUME 2 | V | 0x9D0C225B8C45C21F6CE89EA0CF98705B ; MKBv44/FindVUK 0.98 -0x2689C6FCA5C2EBC567D64C15BFE67B0EA89539C0 = SWORD ART ONLINE VOLUME 4 (Sword Art Onl | V | 0x3ABE738CA3D3494C12A10B18217857A0 ; MKBv44/FindVUK 0.98 -0x44CB16C3C3645F6B3923CF23E4A9C525E68560AF = SWORD IN THE STONE | V | 0xA83A34552097E13E0E619765AF230E18 ; MKBv31/FindVUK 0.65 -0x1FFAA367195346669A7A46B4BF20E28B1C2FB094 = SWORD OF THE STANGER (ESP) | V | 0x5CB0BC4907DB95F077DE3489726B9D28 ; mkbv12 -0xAE663582CBADD8E8BA4B9241F1B7BF4CA08CB86A = Swordfish (UK) | V | 0x04191B8E7038724A5D16274595EB4E52 -0x194EC770C84A4441DE1FAB57AAEEDB38465B2E4D = Swordfish (US) | V | 0x9E2970704479182C6F9E249DBD8F4DB4 -0xA5CEB4E19C0AC3774A7E591CC3A2B6B85152C0F0 = SWORDSMEN | V | 0xEF018453BC22E59E799488B5FCB835DE ; MKBv31/FindVUK 0.82 -0x8865F6BB0BAB811889B2FD24A1C63EB6015E0FEC = SWORDWITHNONAME (THE SWORD WITH NO NAME) | V | 0x70055A67347F1F5E86C9E8CD522CDE06 ; MKBv17/FindVUK 0.84 -0xF1ACB16C565D2CAB91DD7497D99C236ED3FFBE9E = SWORD_OF_A_STRANGER | V | 0x6F0CA64A342E45A15B94536C7427EF1B -0x6EDD5B45C4C346E1768B02E8619A882A03E9A4BB = SWORD_STRANGER | V | 0xF6870CD1C9659EA9717904711FF3A415 ; MKBv12/aacskeys 0.4.0e -0xE49B2711295DD990D0C1A292E22367D43AEF262E = SYLVIA | V | 0x043B49B0A5261673EAB239032A3F5E76 -0xC32DB7217B7E3F0142D309AACCC7B952A723C528 = SYMPATHY | V | 0x6475F11A4FAF0C548A20E4534E60840C ; MKBv40/FindVUK 0.94 -0x3DCD6BF028D2E9A1DEEA566954397D250231A065 = SYMPTOMS | V | 0x4310BF6487FCAC4E557A2B432549A5D5 ; MKBv61/FindVUK 0.98 -0x171628498F6CBAF91D6225B67132D0370E089FEB = SYNECDOCHENEWYORK | V | 0x9E9A208840866F0C442C83F1DD992D01 -0x34E70168C615E8617EAA37CBAA37CDE194044D4B = SYNECDOCHE_NEW_YORK | V | 0x74D770768D352EDF7CA0435089846DFA -0x07B10D9F3A1E7F7C95B44F2A56D7BE301438B406 = SYRIANA | V | 0xA7F3315A094CE3C1BCAECFE4A3C04C9B -0x8BE943E16DD7F5DB1C9C06D14D4FF697EBF138A5 = Syriana | V | 0x1FB376526F956FF0B9E688B6B7BCD2E8 -0x229EF76DA9F8A62CF9F50A7AFAC6B0BE50F9C1A8 = SYSTEMFEHLER (Systemfehler - Wenn Inge t | V | 0x25EB653B9736BD18FDCB58DF8543289F ; MKBv44/FindVUK 0.92 -0x32656EA432302047245F9474C146BAC5397B880A = S_DARKO (S. Darko) | V | 0x8086557FBFFF0BC7418369A1C2FC4454 ; MKBv12/BD+/FindVUK 0.96 -0xDF43EE91718F4529D7E25BB32C83B0EB9DDD90C4 = T2_FEATURES (Terminator 2) | V | 0x7345A7A4FCF6B18B825AA369DE7BC39B ; MKBv14/FindVUK 0.98 -0x542AAA18BECD59C97BD1552ECA81D0F821970826 = T2_FEATURES (Terminator 2) | V | 0x3CB94EE3F13627ADDCA8CE67B6A68E98 ; MKBv12/FindVUK 0.96 -0x24E5F62540FD3CCD1634F156988303FCD51F3C39 = TAD_THE_EXPLORER_3D | V | 0xD3E1F5CB567A22EDE2C373B5E0229D9E ; MKBv38/FindVUK 1.00 -0x9466B3562A0116D810EB73C7CB1E1FF89FA3E215 = TAI CHI ZERO (Tai Chi Zero - Blu-ray???) | V | 0xD83DB7796BC974D50A0D96C5525B72E6 ; MKBv35/FindVUK 0.90 -0x519F5A1ED6F8975C9685ABD3D421E328CD6761C4 = TAI_CHI_MASTER (Tai Chi Master - Blu-ray | V | 0x7258ECE11067C69DAE419E772BE92508 ; MKBv19/FindVUK 0.96 -0x624C858BDFE25846C5A7D60F3380DD2DA1A7109E = TAK3N | V | 0xF00A31FF789A40B24B8A43158C405DDC ; MKBrev 52 - FindVUK 0.57 -0x32B4AB565CF2C7A8C3C5B37266D186F5EAE4B9C6 = Take Me Home Tonight | V | 0x20E0674DE025DB29813E563D31C34EB5 -0xD6DF73A0793E6FD1117AAE7A0DCE6E0D92EC6251 = TAKEN | V | 0x297BE12D205A041273AF16982A0D81ED ; MKBv12/FindVUK 1.00 -0xC165DF08C055DAB769C45D692EA9CC1E23C1F066 = TAKEN | V | 0xE7C9C5CF28F24B7B46C4C3639276E057 -0x0FE6943929F05D5A760FAFBBD82173B00684F601 = TAKEN (Taken) | V | 0xF8113DC4BA6CC4A233BA88826E5E2B10 ; MKBv12/BD+/FindVUK 0.96 -0x859A6EED09224637623F6893DB6AB86DEC580041 = TAKEN (Taken) | V | 0x9F40EFD2F9C5FCA99B1A1AEEBE924EDD ; MKBv12/BD+/FindVUK 1.02 -0x004C1C062A19D40C5820D0B6BD55F9ABC8859272 = TAKEN (Taken) | V | 0xE4F53E02DDF93E1DA7B791A4BCE04FE2 ; MKBv12/BD+/FindVUK 1.00 -0x2FD65EF761F6ED39553B3DA4B8617FCB510A1584 = Taken 2 | V | 0x0DAC9F3FCFDCFB0D3C78FE07FB45B78B -0x731204A0874BC6ADFE5406940FE8853705B3F0D6 = TAKEN 2 (Taken 2) | V | 0x97822445423863912EA805A114C938A4 ; MKBv33/FindVUK 1.00 -0xF4D21D206B3E1391F099A8C6B0DA9F86BCCB638A = Taken 2 (Taken 2) | V | 0x889F0384C2B3079AA57484B2FE00B6A1 ; MKBv35/BD+/FindVUK 0.84 -0x5325C8FA439E2F2C7B74C353150572374CE59CE3 = TAKEN 3 | V | 0xDB4B4F07B14E79620875590ABF4AEBF8 ; MKBv51/FindVUK 1.00 -0xC6E27CE25321F53914B8AB08E6D4E6CB0ED5D2F2 = Taken 3 | V | 0x91CA4C717B8C5B6CEED1D63956F20B50 ; MKBrev 47 - BD+ - BusEncryptionEnabled - -0xC3285BEF338F7B13E9E427377635F2587F15C997 = Taken BD+ | V | 0xB6ECC2EAF65ED83E1F77E35855F8889A -0x4843CD4F4B98D7447B1E57E5CF8AE9A1190C69A9 = TAKEN2 | V | 0xBBCC00A3B92B1AE12BBC352F87B1C8D5 ; MKBv36/FindVUK 0.65 -0x65959B784914A59567DC55E67A18DF5F6A205BF4 = TAKEN3 (Taken 3) | V | 0x21A158D36ACEE0DAFBB7845EDD492BD6 ; MKBv48/FindVUK 0.96 -0xDBF5FEE5B81058F66EF6245D98E602F76206FD0D = TAKEN_2 | V | 0x81E869D79E15FA32AD6777A6DC4A7386 ; MKBrev 50 - FindVUK 0.57 -0x640D5D6D72F0420D4C96440E442A0AB90ABFB328 = TAKEN_2 (96 Hours - Taken 2) | V | 0xC502C764EF2E547CF9079FDFFB0380FA ; MKBv37/FindVUK 0.91 -0x4A44FC7D607EF373D96105BDE553E66F6475627D = TAKEN_F6 | V | 0x08C38A27D9D526D063E819283EC98904 -0xC37EB62F9EF77EE775B97AA17D5D9EFE383A67A5 = TAKERS (Takers - Blu-ray???) | V | 0xDE02E1E6EE55B68418B34A1647290352 ; MKBv19/FindVUK 0.84 -0xA7627ADE3B833D2B890746A8C0D269CD3A9EC2DD = TAKE_THAT | V | 0x4A85D294A58311C3D0F1BBC50CF8F751 -0xE2797E568E9C4FBE666CC021E8F101DDAAFB7498 = TAKE_THAT | V | 0xDF43C6C7499744F9B058E9CE64D6293D -0xDAFC4C0B7AD59ABD79C9CC7FBD572ADEDCC20E8B = Taking Woodstock | V | 0x66F245AC3D201BB650EAEBAF23128E20 -0xB370CC14BCB452836999753F2D58561C4162C933 = TAKING_LIVES | V | 0x18204FDF02793CB0C8F355CBC75C6774 -0x267DC8CCDE99D17D325D943BE2E3DA1882E00BFC = TAKING_LIVES | V | 0x0177C36EF4F687CFF64D0E53D66A7E18 -0x23D1D0588F4939C00DA147DC712D5D791757DE47 = TALE OF THE PRINCESS KAGUYA (THE TALE OF | V | 0x853BCF1914E2AF69ACF2339DA3ECD85E ; MKBv52/FindVUK 1.00 -0x42331F0BEAA25AC6C549D7877766755929E9D699 = TALES OF BEATRIX POTTER | V | 0x78AD2A14F8D5A0525E3675F4AD7511C4 -0xE96E56070EB810A7BEE30F4BE7CF6D9CCD5CBB4E = TALES OF HALLOWEEN (Tales Of Halloween) | V | 0xDCD25DDC65B7FB5C18C48A0D93F5E8B1 ; MKBv62/FindVUK 1.00 -0xBD5788217099ED874A71F8F81201B0807E3C1A73 = TALES OF TERROR (TALES OF TERROR) | V | 0xE2BE1C9098453327C31DBC7A9FE99ED9 ; MKBv49/FindVUK 1.00 -0xBCB97D3B688C1FAB502952DE6B2EFCAA567D998C = TALES_OF_VESPERIA (Tales_of_Vesperia) | V | 0x50A9AA02E10B29EB4AF45D41E95285FE ; MKBv31/FindVUK 0.98 -0x2E4D773692DB16C449C1EBFADFC92C550B3ADA35 = Talladaga Nights | V | 0x9AC37C7493F6BA64A7AEE2D4E86C0F8C -0xACFAFA8C1835A6A490E9244806BA3E7ADA885F53 = TALLADEGA_NIGHTS (Talladega Nights: The | V | 0x4A9C392AD4C180C1D859082A7C5E859D ; MKBv61/FindVUK 1.00 -0x4B3DBAD2A85B7BB134B3A39944E9FABF7E7399B2 = TALVISOTA (Talvisota) | V | 0x6327CDC6F501B593E2ED2D1CBF96D7FC ; MKBv60/BEE/FindVUK 1.00 -0x7EDF4DEA198A2D64BDE720780507F0014AD3469F = TAL_DER_TOTEN (Winnetou und Shatterhand | V | 0xEE748015B4E4650D3416E148F8D1E209 ; MKBv35/FindVUK 0.96 -0xBBC7F2475EE2ED27139840EE57CF447DD1341CD0 = Tamako Market BD2 | V | 0x5BF8B55A21BCB26B5C75F8D53AAA0773 ; MKBv57/FindVUK 0.96 -0x0D3841654A23506FEA5ABDFCBEFAA582C492F0E2 = TAMAKO MARKET DISC 1 | V | 0x5F40F2D775DA02AB592EC9C652CA2E4E ; MKBv57/BEE/VUKNOTVAL!/FindVUK 0.98 -0x300D96AE11ED4E2A4ADD72F361DF95922EFC4C53 = TAMAKO MARKET DISC 2 (Tamako Market - Di | V | 0xC272A8CD237242666DE701EDD3E2D163 ; MKBv57/BEE/VUKNOTVAL!/FindVUK 0.98 -0x2030CAC91718B6E4B775178AF24C6FFC3B55D933 = TAMERLANO DISK 2 | V | 0x00DB6FF91BC34B2A4693235929A0D5F1 -0xAEDDE4F4A9E69E3EF0B6F20DAFF50D0A954783D9 = TAMMY (Tammy) | V | 0x1C795DBCE3F21640A0FDE64728C8A5CF ; MKBv47/FindVUK 1.02 -0x9DA1BA4036ACA5AD3196F32A52E9636B15F191AE = Tangled | V | 0xF39AAA8AD2D826A0088371E8E3639612 -0x8595DC105C79EE3BCC28AAC80B29722C8116E387 = TANGLED (Tangled - Blu-ray 3D???) | V | 0x4A9FF114BA4333ECEEF1C5245DB7AFA2 ; MKBv19/FindVUK 0.87 -0x33E79B0DFFE466EAD9C9492C2CF63C058986FD1A = TANGLED (Tangled - Blu-ray???) | V | 0x99419413AF4CFA8F619612C595EA02CE ; MKBv19/FindVUK 0.87 -0x7DC5466FEB8C21C81720A4790A1A75D3112D9937 = TANGLED (Tangled - Blu-ray???) | V | 0x69FA8645453CAE77789EC5CA70EAFAD2 ; MKBv19/FindVUK 0.96 -0x3D4A1A1CD5F298ABCC69B0B52DE4DB4D899F8EC9 = TANGLED (Tangled - Blu-ray???) | V | 0x4955E0D2801B7B598DBB80A188A05DB1 ; MKBv19/FindVUK 0.96 -0x960FF9841BD77E7E1981D020FCC3475B25AA60FE = TANGLED (Tangled - Blu-ray???) | V | 0x0A015F0FFEDCB4DE6D3F0434A7554703 ; MKBv19/FindVUK 0.94 -0x9627FF78AFB7B2FE27FAACF977C7A1B163A70149 = TANGLED (Tangled - Blu-rayâ„¢) | V | 0x0F7ECE752B73D22188230BA284020905 ; MKBv19/FindVUK 0.98 -0x8E72BD7E3D0F1892EDBB376780BC66BA457BBDFB = TANGLED (Tangled - Blu-rayâ„¢) | V | 0x58233D9C379DF5ABB8754000570AD2E5 ; MKBv19/FindVUK 1.00 -0xD21C8322B301E259F008DB5117941B5EC6519BC6 = TANGO_CASH (TANGO AND CASH) | V | 0xEC5A6EBA92805AD74BEEAE8B2A16295C ; MKBv12/FindVUK 1.00 -0x1B6FC76B36BB29A47E4DF6238E6DC5BF811DA0AA = TANGO_CASH (TANGO AND CASH) | V | 0xB240B324C2532F3AA5F518C91F790BF4 ; MKBv12/FindVUK 0.98 -0x165649D4C1C1A865DBD51A71D1FB8F75A686F1B0 = TANK_GIRL (TANK GIRL) | V | 0x9FE37266441E3A126D495CF47A42EB2F ; MKBv43/FindVUK 0.84 -0x32E84409E16DA26344E457F7A96B7C9113B3F307 = TANNHAEUSER | V | 0x5A434103412126335A01E8E037A48E7B -0x47DF69599CED02E6E3101558EF296877BF1C4EEC = TANZ DER TEUFEL BONUS DISC (Tanz der Teu | V | 0x9B67F1514F45686F79805A01B50D01BB ; MKBv62/FindVUK 1.02 -0xB815165CB90017CBA3F3B7A2126C359CC5DBE2CA = TANZ DER TEUFEL REMASTERED (Tanz der Teu | V | 0x37D4BEA89B2B4699EB97FA2474011780 ; MKBv62/FindVUK 1.02 -0xDBBC3BA2743958EBD552F37842463EDE06F60C9D = Tappajan nakoinen mies | V | 0xCD0288D8DB627541CB2B84D1B159B633 ; mkbv60/bee -0xEFDDB4AF7F2ABD6655410746CDAE1B8EB7AF11C2 = TAPPAJAN NAKOINEN MIES | V | 0x6F1C8854E3BCAD82C3F59C522DA50A58 ; MKBv23/BEE/FindVUK 1.00 -0x5E9A628C09320E9D8C9F3644A3E732B2EE3DFD92 = TARANTINO XX DISC1 | V | 0x90271690794E9DD235115AB728B3718B ; MKBrev 35 - FindVUK 0.57 -0x86EFCBB4121FD1B9ABD2899A6636D6CBCD4EBF69 = TARANTINO XX DISC2 | V | 0x735805D791E11115909D27DAD65B0685 ; MKBrev 35 - FindVUK 0.57 -0x946F91883FC8B814FE8033882AB72C0C5BEC22C0 = TARDA PRIMAVERA (Tarda primavera) | V | 0x3A01E6C39E9486DD84B1BA66CB36811A ; MKBv57/FindVUK 0.89 -0xC48AD73B66261B7F3681D944FCA363F6CD314008 = TARDO AUTUNNO (Tardo autunno) | V | 0xF30080035FCE232AE7038EDD4305C327 ; MKBv57/FindVUK 0.89 -0x4BD4FDF7EE84144E2730CA7491E854B82BBAA892 = Tarja - Act I (Tarja - Act I) | V | 0xB07FDBE0FD3CAE80F7D1DC0891D59F2A ; MKBv32/FindVUK 0.96 -0x581B6DD82F7CDE736FC5DC66F6832BCB6A4E4E35 = TARZAN | V | 0xFB9141380B90703EE9FDDCAC06F48C38 ; MKBrev 31 - FindVUK 0.62 -0x11625CC0F5C7267ACB762675142941EA36ABC9E0 = TARZAN (Tarzan - Blu-ray™) | V | 0x6A32E283E8CB91A2B1DF56E1BCAC1BDD ; MKBv36/BEE/VUKNOTVAL!/FindVUK 0.92 -0xB114CEF62A669411F68DC6F56810B59BC0FF2E75 = Taxi Driver (Taxi Driver - Blu-rayâ„¢ (Mas | V | 0x3016C63249AB6CB6BA3D8F5BAFD69E97 ; MKBv38/FindVUK 1.00 -0x99C251C56BE1D40CED895B3F56E74C88BD9BABEB = TAXI4 | V | 0x316FDFF82AFF83DCD7D7EC92DF6631B6 -0x4F5A9DE97EEFD77EFAC5B59C8B1114106AC86184 = TAXI_3 | V | 0x7C26E4710DB03F3FA297F082D8B4C98F -0x38E8B433750041EA692A950A1753BABC771753B5 = TAXI_4_BD | V | 0x70D92D3FB1D24DFFB41E8C7536BF875D -0xF1695868DB7AF65D27D8D36B88D53832A05CC911 = TAXI_DRIVER (Taxi Driver ??? Blu-ray???) | V | 0xFF25559E4DC578BFC1F8E4578B53804F ; MKBv21/FindVUK 0.96 -0x4797F443BDBC2DC86038EADCC2376D43D921CDC7 = tb65 | V | 0xB5D03686CB3B7CDC08282219A231D864 ; MKBv60/FindVUK 0.80 -0x5D938EAEE72860D440F40529916A4A59A4E3D5F8 = TBD_002 | V | 0x4A4A9020BBA8860A2C320A242EB11972 -0xA122CC787D802B066D0391914BD18811B480D6CC = TBD_003 | V | 0x57A3E99261466FBE8D8B64D49EA677D6 -0x7D61DEFFE7D8F02DB5955704CD25DDE67A97B6A2 = TBD_005 | V | 0x5E79B5EAE1D9633005EA59C695E09FA3 -0xE689A7492E708D6686E01486E07C0A39F6B812BC = TBD_014 | V | 0x27C886E573F96D24A6424E845AAD18F0 -0x0FEC8DA1CF24F8E8A1A37ACB8F256E93988B9793 = Team America World Police (Team America: | V | 0x723CF4DAC9426B7E0F4C031649C70A58 ; MKBv31/FindVUK 0.98 -0x9B5A89F7470CDED38C4819C016C8A5429A476F1E = TEARS TO TIARA DISC 1 | V | 0x405C0443AE31AC1A3505372F34ACF73E ; MKBv18/aacskeys 0.4.0e -0xE70B43EF29BAFDDE5266E826C5156822012503B5 = TEARS TO TIARA DISC 2 | V | 0x50C2EE8BC94575776AE240686E171489 ; MKBv18/aacskeys 0.4.0e -0x94B790ADADD30DB96EA2FA4972129EEDF015B0B0 = Ted | V | 0xB43BDB64CE917912AC9332C0545FF84B ; MKBrev 31 -0x059EF8F7DCA45AA6A0555EA3789B4736C9241FF1 = Ted 2 | V | 0xDA13B196B2136BE1FF1BB912305FA171 ; MKBrev 56 -0xE6F143891440706A09E0CECC13C50A0CCBD5FD70 = TED2_NA (Ted 2) | V | 0xB64A2316B478B59DC669D7816FC16402 ; MKBv46/FindVUK 1.00 -0x002FC45CB4299E83FB5C746BE9B49BF66498A725 = TED_G51 (Ted) | V | 0x20E68EFF02213EC9D73494A631E12509 ; MKBv27/FindVUK 0.96 -0x2C02B9D16C599F87FC9C7DBAED5301836C219F9F = TED_G51 (Ted) | V | 0xEEFFEC3664C84F1A25DEFD2F696BDF21 ; MKBv27/FindVUK 0.92 -0x51DAD03DBD69CC6A7DE8A5E3FD4058556AE984DE = TED_G51 (Ted) | V | 0x6557EEB70DD7AA32F54AA80EE21357CB ; MKBv27/FindVUK 0.96 -0x1EAD25A366029E193FBA79BD60655B686CE78028 = TED_G52 (Ted) | V | 0x400BD31827F9CF3E872064C78A3DB113 ; MKBv31/FindVUK 0.98 -0xC58FE7797607112086754F24ED152D36031B98A3 = TED_G55 (Ted) | V | 0xE0DCB780A05183CA743702EBA0C824A2 ; MKBv31/FindVUK 1.00 -0x4EDC1FEBAAA32136A7E1851F2D9F528A61BB9CBC = Teenage_Mutant_Ninja_Turtles | V | 0x97F3703F42BAB176AC05C73E55E50DE5 ; MKBv39 CAN VERSION -0x2A06DE8B645A035478542352F1A1E5635D3C60EB = Teenage_Mutant_Ninja_Turtles | V | 0xCEE7ED404350EF2ADAE045165A9DB3AF ; MKBrev 47 - BusEncryptionEnabled - FindV -0x7AEB3BAABEF05E20E6DABA98D1E934E96F2DC2F1 = Teenage_Mutant_Ninja_Turtles (Teenage Mu | V | 0x7C3FC0C39E01C844C3C619A99DE9B339 ; MKBv39/BEE/FindVUK 1.00 -0xB7DF6863CB583D32EBF8CB10D2645DAE91AE6CC1 = Teenage_Mutant_Ninja_Turtles (Teenage Mu | V | 0x542169EB5D31988EDE6A99B8A24ED4F6 ; MKBv47/BEE/FindVUK 0.91 -0xB4547DB119021079E956474ACA58C3EBBB6633C4 = Teenage_Mutant_Ninja_Turtles (Teenage Mu | V | 0x16013BE6EF2B35B79BD736DF774ED77D ; MKBv47/BEE/VUKNOTVAL!/FindVUK 0.87 -0x36C5312705F1292DB5B1FB01FB35A2C075FA8C82 = Teenage_Mutant_Ninja_Turtles (Teenage Mu | V | 0x684D4ACBE710EBE6530FE279969A4B07 ; MKBv47/BEE/VUKNOTVAL!/FindVUK 0.87 -0x0A07570CC7B97C89F91C197AED54B97192923CAA = Teenage_Mutant_Ninja_Turtles (Teenage Mutant Ninja Turtles) | V | 0xBC87962DAFE2D22F404ECF3C7D0EB43E ; MKBv47/BEE/VUKNOTVAL!/FindVUK 1.02 -0x971B3980C43C2CEF74439109EC0FF28E18B13C13 = TEEN_TITANS_THE_JUDAS_CONTRACT (Teen Tit | V | 0x39E29F2315A17638F82D1BFAB3FD3C9B ; MKBv62/FindVUK 1.02 -0x939D0651A237193AFAFEA193A0FC11EBBA572476 = TEKKEN (TEKKEN) | V | 0xB643C27C1C57B70AAC57883A96EDE0B2 ; MKBv17/FindVUK 0.84 -0x16B7619D4A7D014E9F5D65DBAD8A79D00624E1F7 = TEKKONKINKREET (Tekkonkinkreet - Blu-ray | V | 0x8952CDCC90F521CE2DF86AD438901E72 ; MKBv3/FindVUK 1.00 -0xCA9BAAC8757D7E7EA0466EF0C2169F6DB222CB26 = TELL TALE | V | 0x3CBF1A5A284BFF2996689D23CFC6B253 -0x567F5C4D98C169CD2D1030FD5DFF01DA4F73C6B5 = TEMPLATE (Red Dragon) | V | 0x043D9233F9D5509A1681157412965E56 ; MKBv12/FindVUK 0.98 -0x46B0359062E19759C2C8CC64B76A3F4E0FC99418 = Temple Of Doom ES | V | 0xC98B4E7F71445F5F073E5FD3A19CD869 ; MKBv31/FindVUK 0.72 -0x868BDB8C0BCFCC4D4AB4EF1CCDBE8C28180D0E8A = TENCHI_MUYO_WOG (Tenchi_Muyo_WOG_D1) | V | 0x2E51818D843EDD445F77518059BB9119 ; MKBv36/FindVUK 0.96 -0xEFD483AEB8A16782D2AA4926A4DD21FCD4159681 = TENCHI_MUYO_WOG (Tenchi_Muyo_WOG_D2) | V | 0x7DAAB616A684B3031021759865994711 ; MKBv36/FindVUK 0.96 -0xFBF981D6B3C6B863DE2FF045D46FD14423963409 = TEN_COMMANDMENTS_DISC_1 (The Ten Command | V | 0xBB9D62BD001360FDF2491859D1D4EAE7 ; MKBv26/FindVUK 1.00 -0x1C60DCB69493D1780B59E21E56CC4D8769792CF1 = TEN_COMMANDMENTS_DISC_1 (The Ten Command | V | 0x6859D1AD3CEE2607104AE8129EFE6661 ; MKBv21/FindVUK 0.96 -0xB95ACD7AF8CC3D4131264387534611868EF29ADA = TEN_COMMANDMENTS_DISC_2 (The Ten Command | V | 0x5A03C1F8C30C2C2FF9CB7530B86A61D7 ; MKBv21/FindVUK 0.96 -0x9F92F7A1989E4FA7ECD45CC2A5AEF966811CFF81 = TEN_COMMANDMENTS_DISC_2 (The Ten Command | V | 0x681BD7A762DA223C68CD27E4CB1DAA43 ; MKBv26/FindVUK 1.00 -0xF67ACA347492916DC33402289F53BD9D41863130 = TEQUILA_SUNRISE (Tequila Sunrise) | V | 0x8917CDC7ED901F5F22670A0A8326466D ; MKBv42/FindVUK 1.00 -0xAE45E8D16E5490F8C4AFB7B11594D1A43AD7F2DF = TERESA_TENG_82_LIVE (BLU-RAY AUDIO) | V | 0x4F7274295E312B17F209EBA8C156F2B7 ; MKBv47/FindVUK 1.00 -0x75673083FD45B39B1ACE02315523E3D242A17064 = Terminator 2 | V | 0x61B0F7CCFB372F34BC729AE68575DD91 -0xF1C4922817842242B4ED1E52BBA6DA822D97F4D5 = Terminator 2 - Judgement Day | V | 0x6D812383CEBFBEE2CF588C5588EC15C6 -0xF87802030C788EC0E2C1107AC7EC44E04534970C = Terminator Genisys (Terminator Genisys) | V | 0x923A30CC7BFEB672907B9A2342CDC01D ; MKBv56/BEE/VUKNOTVAL!/FindVUK 0.95 -0xEBE9C948A419200A72E763BB7B2078AE39DDC797 = Terminator Genisys (Terminator Genisys) | V | 0xB4C19125A18EF841862EDA003F2AA50C ; MKBv56/BEE/FindVUK 0.99 -0x990423AD58E7AE54B469E5AC40B863B738BCBB2B = TERMINATOR SALVATION | V | 0x9B4F763C7E1A6175AD80CACE800FAA7F -0xE72D0A899A56BBB10E61A16A486CB0C3401C1BE5 = TERMINATOR SALVATION (Terminator Salvati | V | 0xDC84FEB11C1B69A01AC004F0497FBE0F ; MKBv14/FindVUK 0.96 -0xE657E6F13175F6F8C329AA775EE8F4B5966B90C2 = TERMINATOR SALVATION DC (Terminator Salv | V | 0x6FF2DD0CBA035DD0346B9880E4A63A25 ; MKBv15/FindVUK 0.96 -0x63A7743CB127B7F28078B1ACFC8ADCC349477C65 = Terminator Sarah Conner Chronicles S1D1 | V | 0x25A96EEDC85C1A10A84F2FB674F2E8E9 -0xDC68D0759687B326EAE8C3E4BD8AE72504AB1EFB = Terminator Sarah Conner Chronicles S1D2 | V | 0xB5A18F518BD5D67F24DA4D2C6C48302F -0x19AF26BDC09B52140D870FE164916DA4619B3466 = Terminator Sarah Conner Chronicles S1D3 | V | 0x460940D436A789561A6C79F6ECA4C0FB -0x7E7C89BCF35C74043648A76296A517D6C170A787 = TERMINATOR SCC S1 D3 | V | 0x44AAFF6F0853E95C655B40C780A04B84 ; MKBv7/FindVUK 0.98 -0x72FC238C58874C0E4CCB12F00AC009114DD1DE64 = TERMINATOR SCC S1 D3 | V | 0xC646A1649C8BED8ABF9EDDF3EE6A088A -0x5AC7EE3F1A480416B610552982724FEB0A017A2F = TERMINATOR3 | V | 0x92B688E0DAA2E153C6D1E9570ABF6E68 -0xE3851841D28B351B34CC28FCEBBA29B7790939AB = TERMINATOR3 (Terminator 3: Rise of the M | V | 0x84194D5B2EDE6CE7986AC0EDE05D5B06 ; MKBv12/FindVUK 0.98 -0xB74B207C45FCF0EDB3A4892E4640215B7A6340AD = TERMINATOR3P1 | V | 0x97170DADD3558423F40949D1A6FD24BE -0x23284986A4851A44B464122575B9C0C7A4239F79 = TERMINATOR_2 | V | 0xF9B5572350ED07423C37E3B293B2390A -0xE4FEA79C50189752D2D55FA346B6B30ED5170C1E = TERMINATOR_2 | V | 0xFF4D4CFAA77EA8A66B075C05D8D6D844 -0x0DB849B30DAC0BDBB61223D525BE2436D1BCA7F4 = TERMINATOR_2 | V | 0xDE9CA8944E3FB0DBF3644F69513DF5B8 -0xF3BDA30DBF0439BD3748117EAD37B2FDF16D97BD = TERMINATOR_2_V_DIRECTOR | V | 0x5034907AFFFA81952AB44DBF827E8B81 ; MKBv7/FindVUK 0.94 -0x4DF463A2D9E0940EE7C10AAAC3EA53FE1E08510D = TERMINATOR_3 | V | 0x643E529B4D3948EC16FFF777322D432A ; MKBv4/FindVUK 0.99 -0x4792D07E9BFC26C604FB9E2C5D6272C1B1F55F72 = TERMINATOR_3 | V | 0x7887C96C45513CDD4A2BA4B0A23C7782 -0x739808EDDEF910C5EF9E6B999C3D75272698CB30 = TERMINATOR_3 | V | 0x87194DFDC8A47B9F576B926DB7F7F5B6 -0xD37F49EE8A89292E05EB2F30BD235582C6ED99A3 = TERMINATOR_3 | V | 0x04C5C8C135BA597B1B36201150CB9E73 -0x2D210BB15A758F0EB77D843205EFC2EC7CA8162D = Terminator_Genisys (Terminator Genisys) | V | 0xCFDAC946BA754AA5C630920AA3BC8596 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 0.93 -0x1ED4319576D2670D64ABF003C7AE3D1D8B2AC4A8 = Terminator_Genisys_3D (Terminator Genisy | V | 0xA8A87EBE389817E8D8E420D27B47833D ; MKBv56/BEE/FindVUK 0.92 -0x14A8649EBCAC37D7A930873B93A167590E6CA6EC = Terminator_Genisys_Bonus (Terminator Gen | V | 0xD3A142C00025EF45AF71578D677CF022 ; MKBv46/BEE/VUKNOTVAL!/FindVUK 0.95 -0xEEB264DBCC7CEED66557C5DE457DD25E9A880DCF = TERMINATOR_SALVATION | V | 0xD5A644F35AB9C0BD5778C882355461D8 -0xBA03A20932C95E5F5A7FC4FB9D20B7986403E128 = TERMINATOR_SALVATION | V | 0x5043ED8B60A981D99716E84FA7EC62FB -0xD81ABACA2125BBD2FF3C8C7FEA7C963175C0F613 = TERMINATOR_SALVATION | V | 0x9110246BD0C05125E9E7E39F475E2ED5 -0xC1297053E1C09915F039E7ADE3AF479D54BA82A6 = TERMINATOR_SALVATION | V | 0x9D0E738A7534A88A18269587F89E988C -0xD73B70F4074E4C83D36571F7CDEE39D188FEDD3F = TERMINATOR_SALVATION (Terminator Salvati | V | 0x7CD362484DF7277D289955274360D247 ; MKBv16/FindVUK 1.00 -0x9E36B4EC0242D85B36B918973A785275960D7D68 = TERMINATOR_SALVATION (Terminator Salvati | V | 0xE8E2563398146F7AF62E47A658BB96AF ; MKBv15/FindVUK 0.98 -0x90A2A0FBB7BADE60505B63421FC14E5CE7358A63 = TERMINATOR_SCC_S1_D1 | V | 0x3141B4D922036ECCF501514C7FD8336C -0x98F7BF2A0AB7E04730DADB68D5AB4BBB391C0094 = TERMINATOR_SCC_S1_D1 | V | 0x916B81B42186E3F6E6A9EFDB70638741 ; MKBv7/FindVUK 0.98 -0xA23DB6FAA2098B608BF13A3B0DC836CF7639FA41 = TERMINATOR_SCC_S1_D2 | V | 0xD12A4CEBA0A33FC1F787544385DA70D3 ; MKBv7/FindVUK 0.98 -0x88045AE8E49E36F479D5535339087924DF5341F2 = TERRA_X_DVO3 (Deutschland von Oben - Sta | V | 0x8FD83107BA91FCF65417BF5EE511A1D9 ; MKBv39/FindVUK 0.96 -0xA2B80C917BB7B4904129D74269E01B93805DFF73 = TerrorInResonance_D1 (Disc 1) | V | 0x8B3DF911DF1754F89F9E23B885210C2F ; MKBv57/FindVUK 0.98 -0xE8700F8667DDCF3F41EF44719901856C71A11393 = TerrorInResonance_D2 (Disc 1) | V | 0xE55896F7678E9606A507EAA401CC5C4E ; MKBv57/FindVUK 0.98 -0x515B45DFF6401E1F48B792FFE8EBB425479C3080 = TESS | V | 0x95052E05174DC98EAE46B8AA8F83AF9C ; MKBv33/FindVUK 1.00 -0xCF437FD3011CEBEA9C3673FCD2A5C65253A02ACE = TETRO | V | 0x3C72B31E8813907E59D4D268A2F0B8C1 -0x6B11DC73C8BA3E31BDE8DCD8BC6E85441BF58743 = TEXAS CHAINSAW 40TH | V | 0x3066C5EDC08B7F1E30CF28E7145CB7AF ; MKBv50/FindVUK 1.00 -0x3917EB29FB17BFD5F4374071305D6BAEC41058CE = TEXAS CHAINSAW 40TH | V | 0x27D496A7ABD42E50BF97771B77C5128D ; MKBv50/FindVUK 1.00 -0xE025C7C1E09B218F1810765EBBEC0B6A2579FB06 = TEXASCHAINSAWMASSACRE | V | 0x2A1E2ED44185135EC6430FB9EBB5C13F -0xCB55321B580DCD02A3581BFB00174DBB93486D42 = TEXAS_CHAINSAW_US | V | 0xF7988EDB84249BE4F158EC227ECA7152 -0x6ED0634563B9E02304314BBA5CD502098690B080 = TFATF | V | 0xC60E012A6F29B3E98A99F6FB7D1C4895 -0x34EEB7F60ACAA4BE791001936B753EA017F36078 = TFATF | V | 0x6F9594DB3E0C475BF2FA3A14C9086796 -0x416FF6628AEDB6954FFEC02CEC949BA7D76F8373 = TFATF | V | 0xA12DF89D9A5249364F74B1677BF08396 -0xF811D7617F2B451BC940E2F82C28E44F46E0AB33 = TFATF_G51 | V | 0xB13F90029CC11DA89F627F7810E59A2F ; MKBv12/FindVUK 0.80 -0xBE7FBC8CD5A506A63B8CBCB1449AAB679B66A7CE = TFATF_G51 | V | 0x31A34DE54615BFA7842CA8A602F810C8 ; mkb v12 -0x71F9639FC42928747C426B07340025079A62DAEB = TFATF_G51 (The Fast and the Furious) | V | 0xCCA90932724B73E433CDFC16D7AE1341 ; MKBv12/FindVUK 0.96 -0x736A58E6AF8746D33A9535E0140C9AFF498C07CD = TFATF_G51 (The Fast and the Furious) | V | 0xBC3752CA59557177FCEC6151F4898B3E ; MKBv12/FindVUK 0.96 -0x19BCEE13D837996D55797998C6E453286BBC2DC2 = TFATF_G51 (The Fast and the Furious) | V | 0xAD545516C71CE47217600506F9E96D89 ; MKBv12/FindVUK 0.96 -0xF4274FA5BAA8C3B40DDF48023450CDA06FC5F3AD = TFATF_G51 (The Fast and the Furious) | V | 0x714826043A1DE3788105871E97CCEF8C ; MKBv12/FindVUK 0.96 -0xE43C372C82902EF40B0549B9F1F1FA85DACE41F7 = TFATF_G52 (The Fast And The Furious) | V | 0x874736243821E804A19C4E364222BD27 ; MKBv12/FindVUK 1.02 -0xB9DADD042BC9F7FF7F362A10D4183D4766196F0B = TFATF_TD | V | 0x90D0CE7490AE75830E0154B348BD0E98 -0x5862F33963648A89F5DDAFFE976586F2CE5B7875 = TFATF_TD_G51 | V | 0xDD86E3EA3BB6EAFEE42EA58B401570F2 ; mkb v12 -0xEDB28DAA1A6501DE6D35CBACDFADE641AA37CFC5 = TFATF_TD_G51 (The Fast and the Furious - | V | 0xB997A4C29897DB02C5A5CFD6960FBD6E ; MKBv12/FindVUK 0.96 -0x4E098FF0B6F55D4DA6D1FEE458F8725842485BA9 = TFATF_TD_G51 (The Fast and the Furious - | V | 0x766830CD1B65A270FAF90484F8BB8FDE ; MKBv12/FindVUK 0.96 -0x41EAC4EA76C665E498FEA502272B76D6BE3F1B60 = TFATF_TD_G51 (The Fast and the Furious - | V | 0x83DC4C8FA13D912C42A83171081488B0 ; MKBv12/FindVUK 0.96 -0x4D506C6533EC861103A015E4FF67F3C79152DAB0 = TFATF_TD_G51 (The Fast and the Furious - | V | 0xAA45B4F8980EA0FE1D94030CBE4B3821 ; MKBv12/FindVUK 0.96 -0x052C2EE7F6EA93C2B9E076765C11F4A1186D7C1B = TFATF_TD_G51 (The Fast and the Furious - | V | 0x0E71E3EFEFB98D7AFF095BC9BA143C14 ; MKBv12/FindVUK 1.02 -0xDEC42373D64079ADEE3E952A68FED5346E638110 = TFATF_TD_G52 (The Fast and the Furious - | V | 0x4689809AEB1D4D804475987AD2AEFA71 ; MKBv12/FindVUK 1.02 -0x7D743F1B0C20C75E5C7527732A7DEE5308521CB7 = TF_2_D1_AC_BSE | V | 0x5E5FA0396EA66CE013676B931F50127C -0xD35132B61250735729D924FCAEFA50C4C5C5BBAD = TGWKTHN_DELUXE (THE GIRL WHO KICKED THE | V | 0x44E378AEA8E2998630B2B13D6F22222C ; MKBv26/FindVUK 0.98 -0x6EB039B8DB911F0301952D767DE0A460EE3C5F3B = TH11NNE1 (The Help - Blu-ray???) | V | 0xC424B30D9970FE48B13049717765E050 ; MKBv23/FindVUK 0.96 -0x22AB3548450EA5FF5011D233067FD49B74D760A1 = THAIS | V | 0x486CA245B732D684779E79F420E9E29A -0x391328E510C659060A0BAE6DD068F28107BA984A = THAIS | V | 0x94B52CC55556C8E42782ADADAFA9F1EF -0x077F944056E524AA13F1BFA324A6E656B01C0816 = THAT 70S SHOW S1D1 (That 70s Show: Seas | V | 0x087A3885CF4E5BC4867143121A0E8915 ; MKBv62/FindVUK 1.02 -0x5E5A1FE57394578CEA43C6C9527FB5F668C7AD0D = THAT 70S SHOW S1D2 (That 70s Show: Seas | V | 0x87C829BE73CCA0CE8608172193B4E7FB ; MKBv62/FindVUK 1.02 -0x62989295969D39CE7CF4C47B6AB6023562D2909C = THAT 70S SHOW S2D1 (That 70s Show: Seas | V | 0x3200F9151D61A1BE8866B84EBFD74506 ; MKBv62/FindVUK 1.02 -0x340E14563F260A89A7263AA35204579A63056249 = THAT 70S SHOW S2D2 (That 70s Show: Seas | V | 0xB746E98E1C5D7AFB94964DD32F4F85A3 ; MKBv62/FindVUK 1.02 -0x04BA39F308EFA40536F29D8CAB36EED256E55450 = THAT 70S SHOW S3D1 (That 70s Show: Seas | V | 0x7B4A796FDD164B3D5BD64D785967EB6F ; MKBv62/FindVUK 1.02 -0xC54D5FFFB395F48056A5A9139B23B7CF43CD405F = THAT 70S SHOW S3D2 (That 70s Show: Seas | V | 0x426774E5C0773931E4504681D0DC882D ; MKBv62/FindVUK 1.02 -0x2451F43E81852CE01B0110C84F431BE40D465544 = THAT 70S SHOW S4D1 (That 70s Show: Seas | V | 0x746E11AE2A9A60F02F3837E93AE7910D ; MKBv62/FindVUK 1.02 -0xDAD09CDF63D860E401E6C88504D2AB88B69BFB10 = THAT 70S SHOW S4D2 (That 70s Show: Seas | V | 0xF83AE47F5C7012BB63CDD05A841E9807 ; MKBv62/FindVUK 1.02 -0x1231B6721000EFC8F269FD86B575E668F6231C76 = THAT 70S SHOW S5D1 (That 70s Show: Seas | V | 0x6845495BF5B3B061E82142D7DECB6094 ; MKBv62/FindVUK 1.02 -0x9EAEDECDB1140D244A3B0CE0D6176FE086AB9294 = THAT 70S SHOW S5D2 (That 70s Show: Seas | V | 0x7360ABE6B0D6AC664506E12ABE365812 ; MKBv62/FindVUK 1.02 -0xAA155A6E51B7522286FA890CA116639C7E71810F = THAT 70S SHOW S6D1 (That 70s Show: Seas | V | 0x7F4A0D8256742C75DDAE4B5D3F0149A8 ; MKBv62/FindVUK 1.02 -0x7BEC04EE9165C041F9FE7BA31D5414A4F0D74E4D = THAT KIND OF GIRL | V | 0xE3A25474C63EB604EF7B8438D0C68A83 -0xDF2B7F5B94CA94429F19DDBC4B76C42FBDA43357 = That s My Boy (That s My Boy (2012) ??? | V | 0xB7012A68E075731BA5868740DA0E7752 ; MKBv31/FindVUK 0.96 -0xCA78665E9F1052ACFA184998271EDA74DD9B5B9A = That's It, That's All | V | 0x8EC833CD1299324C714AB581069D1822 -0xEB0AF7B36D7FD47CF59729494A9366826344D677 = That's It, That's All | V | 0xD767C95B9E4FA756EE89C72D87989902 -0xAB43907EE395EF433B35A0CBCDE3434A3B12BE8B = THATS_ENTERTAINMENT | V | 0xB4EF18E06FE33B6DD835A91B91E359B3 ; MKBv4/FindVUK 1.00 -0x8D4905B7E54A56C26182F6030723E042A2373958 = THATS_ENTERTAINMENT | V | 0xB557B8F88DAC6F733E004C0CFE8F4014 -0xEB71A48DB4F375E4814403C50966E0AF59C7B6BF = THATS_ENTERTAINMENT3 | V | 0x53268D7EA4C59372DA9EF891D688AAE3 -0x657232044B800150E4FA26102EE57C6D01B66EBD = THATS_ENTERTAINMENT3 | V | 0x44C5D97F66302F4A0B19CC071B593D87 ; MKBv4/FindVUK 1.00 -0xCB4F9DE20F62A64C835FE2939580C6A198CE547D = THATS_ENTERTAINMENT_II | V | 0xE8A2DD7EAE2F0E0BBADFF8094E1A6EE3 ; MKBv4/FindVUK 1.00 -0x611708BB4C445BC31318F576A2BC88B049A54922 = THATS_ENTERTAINMENT_II | V | 0x7037A895FA74FC4FF293DFD4F8F64E27 -0x696A9E10B388E8F3DE7027CA02E4B34402B0BD39 = THE A-TEAM (UK) | V | 0x7397FA3E45B92974D0A38DAC4B526044 -0x326859FAA3A1E51C9D41281B1EE97B899BADF9CE = THE ACT OF KILLING (THE ACT OF KILLING) | V | 0xE1D3DF458827B35483CFB67942257649 ; MKBv43/FindVUK 1.02 -0xCF84BBDBCBA656DDBF5DB83CA0399DCD35E5675B = THE ADVENTURES OF MARK TWAIN | V | 0xF61FFA3E8D6F1F96EF15E97F37FBA636 ; MKBv23/BEE/FindVUK 0.81 -0x8C72F2BDF305850EA9B8AB683634C1C21CBD979D = The Adventures of Milo and Otis | V | 0x040304A880865F0A890C38128C57C4AA ; Blu-ray + dvd combo -0x91F551179A9E127C9D1B9B34A9778D4AE3DC9384 = the adventures of tintin | V | 0x92BB842C624872E7321D7C7F62F1D081 ; the secret of the unicorn -0x1FAE5EE2CA4B777438E8C18015608BBE5CED899E = THE AIR I BREATH | V | 0x09BA341A7F5468E71F28F34756E6D3D7 -0xDE56FCE836FC021913EE8A26FC624DF908546C38 = The Alan Parsons Symphonic Proje (The Al | V | 0xA41197C1783EF3C10BF7313909928D85 ; MKBv61/FindVUK 0.96 -0x6A9C89D4EDC8FEB6FD42EC41A432737653DE8E52 = The Alient Anthology Archives | V | 0x82D16845EFBF9A0B69D0F4F33BB3A90B -0xC3B7D2D822DCE229806FB2FA8BCA8D80A0CE9F1A = The Amazing Spider-Man (Amazing Spider-M | V | 0x6231B9D67B10F8D8AA3F0D02FA798A90 ; MKBv31/FindVUK 1.00 -0x08BB6EE10B48BAF2969C83DC4151607B211F4528 = The Amazing Spider-Man 2 | V | 0x3629F3296E7404320425E8B0DB280866 ; MKBrev 47 - FindVUK 0.57 -0xDE3AFFF521E63033E299BB3BCC2520A7ECE47D8E = The Amazing Spider-Man 2 (Amazing Spider | V | 0xFE5E6514F292FDD6E7D21E2E8FB34172 ; MKBv48/FindVUK 0.96 -0x94F426BF3DDCD0C3C3B5A7BC26F5CEF653833960 = The Amazing Spider-Man 2 (Amazing Spider | V | 0x459FB5DDC66B158648F2D6F54254E6FC ; MKBv47/FindVUK 0.87 -0x66B4D7F520A4C231FEA8091A3B7ADFBECAA69730 = The Amazing Spider-Man 2 (Amazing Spider | V | 0x8932B897E9DC7EF9454D7BBC51E3733D ; MKBv47/FindVUK 0.84 -0xBED89FD2A3ABD9B80F9449137A24F6AEE6B27568 = The Amazing Spider-Man 2 (Amazing Spider | V | 0x2BC967E738A8ABE5A16D98958CAB778A ; MKBv53/FindVUK 1.00 -0x6EC993041B6BE89DAFA852959E58D4906FA45FF6 = The Amazing Spider-Man 2 3D | V | 0x142BEBAC0A5F7AAFA7C12167EFB8B5A3 ; MKBrev 47 - FindVUK 0.57 -0x380CB2BD35E637391CF7D33C4B15696AAD46B86E = The Amazing Spider-Man 2 3D (Amazing Spi | V | 0x620B7E0F16AC8ED724E36BD1B3EF4376 ; MKBv47/FindVUK 1.00 -0xE60A970C0D64B4F5808343A52BB5A88950E76985 = The Amazing Spider-Man 2 3D (Amazing Spi | V | 0x194ACEE44CE4B13754068AE7E8CF7899 ; MKBv47/FindVUK 0.84 -0xBDBAD032570BD304345AAB79D3B14CA484D1C5BC = The Animatrix | V | 0x5C6C9E1A17E98E7504E55FF845098E24 ; mkbv7 -0xB96A02922E9F998686F1F52432B8ADA21B1D71B2 = The Ant Bully | V | 0xF4E10273C0D7C922A908F409B3168A66 -0x6D736A1C8CCEA87619A6F1343C951404BBD1DFE2 = The Arrival | V | 0x63460D0C4BEFC497071D2442C7D203AE -0xF4A4181440692D275DC86094F2B018A929658D46 = The Artist | V | 0x82B6829C76CBA5700FEA23ACE0324B81 ; mkbv30 -0x811F27013586C911581CCE277C9E87937D0E9E81 = THE ARTIST (The Artist) | V | 0xC396B8555494159BFB25581ABCDBC4F9 ; MKBv31/FindVUK 0.94 -0xBB5B366643DB7894F44144BC7FB56DBAC090EC46 = THE ASSASSINS BLADE BD | V | 0xDCF3B96ADF4C0A5B7C7473B34AE11589 ; MKBrev 35 - FindVUK 0.54 -0x00BFDE1ABDF8A97984BB974B1A11B8407449EDBA = THE BANQUET (The Banquet) | V | 0x0898700E249F452446C26E3E3791C344 ; MKBv17/FindVUK 0.84 -0xC915A2014FDFEBA8A772350594DBB64DBCD6494E = The Baytown Outlaws | V | 0x7462DCF449F93809C7D54000FC75C34E ; MKBv35 2012-12-20 KRJ -0x5664649D96ECB5B237057BD1BA17A55D036CE194 = THE BEAST (THE BEAST) | V | 0x9C0076D7DB74097EA153EAE39B477168 ; MKBv54/FindVUK 1.02 -0xB79A72D243348F24AD8368E1685E7942121A020D = THE BEATLES 1 (The Beatles - 1) | V | 0x4CB42A342BFCBF88585549C8A3265991 ; MKBv56/FindVUK 0.84 -0x0C858BA1DEF9C76F0090F3A5586B350837293A2C = THE BEATLES 1 PLUS (The Beatles - 1+) | V | 0x33E79516D7E8E974EEC2D9806E4055B3 ; MKBv56/FindVUK 0.84 -0x7AC934E0B270E63644BDB92CD2771A283E44E9F1 = The Beauty of Snakes | V | 0x28225ECE2DE0642B39C2B5BF30B8B7E4 -0x749C7A6C8601FD7D7CB20DAB6E93F3D0C772024D = The Best Exotic Marigold Hotel | V | 0x2661A3D512D7E5BFE89C8EAE18CE743D ; mkbv25 -0xB910480E67DEFEDE9C771AF068A7C458D5583D07 = THE BEST OF XXX EROTICA BLU-RAY | V | 0x8D26A662F5F3FED803A074947EE93B53 -0x187EDE92BD7510CD8D9E27B18E330A4957BFB18F = The Bible, Disc 1 | V | 0x5F6166855F6317F6EEBDD201C13EF99C ; mkbv36/bee -0xCC38430CB36B11C9894B17430EBE8B35FB0FFBED = The Bible, Disc 2 | V | 0xAC7B7D2083B23E21AD4C945B23315848 ; mkbv35/bee -0xE07D21608747433251CD1CD8AF788234DAE38FAD = The Bible, Disc 3 | V | 0xB4CC1667690222A1A009578F2C928AE0 ; mkbv36/bee -0x525554A6315D45EFC4640AB413F542DB3E85CBAC = The Bible, Disc 4 | V | 0x60B3809C07D786F0F350E16FFF6EC510 ; mkbv36/bee -0x0FED21C44EB756C19F564CED720260B29B9530A5 = The Big Lebowski | V | 0xACA8B49A477C70B4C6757860ADDD24A9 ; mkbv20 -0x02D293EB7D058D535A17B2CD04C3B9A411D03271 = The Big O BD-1 | V | 0x9B46E6B6DE8A46A28FC17BEA01885E37 ; MKBv62/FindVUK 0.98 -0x84EC4C9EF0C29793AFC72F7F0C669037F5F73089 = The Big O BD-2 | V | 0xB421EC39437174198BEE6997839F1F5E ; MKBv62/FindVUK 0.98 -0x35102DE62421038226315DE4768C62F465615A5E = The Big O BD3 | V | 0xD9D1ADB2745965DBC79C13BFC03E52F5 ; MKBv62/FindVUK 0.98 -0xB5A4252BA60D56A562A77F5008A97E16A688817E = The Blacklist - S1 - D1 (Blacklist, The | V | 0x3C43940146D6383D7C4730E637655B79 ; MKBv47/FindVUK 1.00 -0x717463D0BB14C6E7FD297B4508C381D6EF1C78A1 = The Blacklist - S1 - D2 (Blacklist, The | V | 0xD51A65A366FEFB6A731EDD953D4AB455 ; MKBv47/FindVUK 1.00 -0xACB78EC2E33E90FB43C4E12ED073F02579E53146 = The Blacklist - S1 - D3 (Blacklist, The | V | 0x36462C58DECFD779B9BC66ABCDBC5E3E ; MKBv47/FindVUK 1.00 -0x63B3852D0A14DA27C670A7A9E1AF695965122DA6 = The Blacklist - S1 - D4 (Blacklist, The | V | 0x6AE059FD6F7581454508C0856F2A89F6 ; MKBv47/FindVUK 1.00 -0x808A8671FADA1CCBEE79EE5F9E73EE017046EB62 = The Blacklist - S1 - D5 (Blacklist, The | V | 0x3CDA7BDDFA946C17ABED5400E67B462D ; MKBv47/FindVUK 1.00 -0x737474285EC07C8C8E6777243AD3AFDFDF820C82 = The Blacklist - S1 - D6 (Blacklist, The | V | 0x98EABA81D508972201895F43DC768152 ; MKBv47/FindVUK 1.02 -0x2A0F874777E699DC96A1E4B56F6F92CAA41E5C14 = The Blacklist S2 D1 (Blacklist, The - Se | V | 0x62EB3BCE5502751291D0366B2D50AC15 ; MKBv54/FindVUK 1.02 -0x53C86C44681DA0E941BB1674580A6E05BF2C9938 = The Blacklist S2 D2 (Blacklist, The - Se | V | 0xEBEF4D5E27E58A2EDD998F64F2EF545F ; MKBv54/FindVUK 1.02 -0xA201FC45C09F708584E32C062C322365AF6D5F57 = The Blacklist S2 D3 (Blacklist, The - Se | V | 0xBE86267C91C90FC21522ABE506D0B0BB ; MKBv54/FindVUK 1.02 -0xBD2708BBE06F117EE8B3E9CFE76963FD3135D5AC = The Blacklist S2 D4 (Blacklist, The - Season 2 - Disc 4 - Blu-ray™) | V | 0x1A31ADB90FFF758B905A4970849A3969 ; MKBv54/FindVUK 1.02 -0x8718FE212760420D58944E33B4E2B7E4F64FAD25 = The Blacklist S2 D5 (Blacklist, The - Season 2 - Disc 5 - Blu-ray™) | V | 0x74663158DB2254870EBB0FEE258B4120 ; MKBv54/FindVUK 1.02 -0x5462E421B908831EF4F2D466B68CCFCB78D154CA = The Blacklist S2 D6 (Blacklist, The - Se | V | 0xBBBDF5F3698769BB235377D5F60EB386 ; MKBv54/FindVUK 1.02 -0x1894101A142E39C85F9125B9B8ECD74291F976E7 = The Blacklist S3 D1 (Blacklist, The - Se | V | 0xAA4D812B155055425F42AEBEB37FEFBE ; MKBv61/FindVUK 1.02 -0xAD3D403D4F1932C9CAE02CA2F06A5E2E6B11EEFE = The Blacklist S3 D2 (Blacklist, The - Se | V | 0x456336DE461F67729255E1B55717AF56 ; MKBv61/FindVUK 1.02 -0x28AF90D15574FE994E77C894D472C5F73B46FBB0 = The Blacklist S3 D3 (Blacklist, The - Se | V | 0xE83FAFA8350CA627026477D7A025A799 ; MKBv61/FindVUK 1.02 -0x7DFBAA63761D837D8A79F52139727328C381A39F = The Blacklist S3 D4 (Blacklist, The - Se | V | 0x2468D3CB7CAD4FD78F99D2711B4F719E ; MKBv61/FindVUK 1.02 -0x35A4C67B0C2D1DFA39BCE7DBD050AEFAAB4E531A = The Blacklist S3 D6 (Blacklist, The - Se | V | 0xADBD4E1C57A0297B36F2BECBBB0A4C95 ; MKBv61/FindVUK 1.02 -0x1D7821E47DFE4BF532B2E113EBDAF3DD82079CCD = THE BLIND SIDE | V | 0x527958A0094191B117CEDF86D8E13A4D -0x320022E3A443B75181C30AB3E538476AD5B1B33E = THE BLOB (THE BLOB) | V | 0x68D404B4E558AE20F5C841F0585C8D07 ; MKBv51/FindVUK 1.00 -0x1A70A0393F2EC11DB21173CE46D04E4EBBDE65E8 = THE BLUE ANGEL (THE BLUE ANGEL) | V | 0xA147A136D535E17EF1D520EAE5E0E5AE ; MKBv33/BEE/VUKNOTVAL!/FindVUK 0.98 -0xAB6B4C1A7BE83B9DE99568DB9F4FA85D280E6F23 = THE BLURAY EXPERIENCE | V | 0xB938EB4E431E5993282FD17CF05F61F7 -0x09C1DDEE063C3B14A27F54FF76B69D67F1DC9A11 = The Boat that Rocked | V | 0x2666CFF3AD57FF58D695ADEAB126EC08 ; mkbv12 -0x408CC38A9B71328173338D7F2377FE7B9DD6601B = The Bodyguard | V | 0x76C3C4AF44907AA552F607B8E0B143AD ; mkbv27 -0xE9F0F5DF1454E6A7F7963185A3DD4E07E6B34C9A = The Bone Collector (UK) | V | 0xCCDEE7F6749C5BC45BC009981674C64E -0xDB6BBC34B34C4AF4B24287CBD54A51AE2BF3D425 = THE BOOK OF ELI (The Book Of Eli) | V | 0xCAB0A7DB24E89EBFD108C882232B58B1 ; MKBv17/FindVUK 1.02 -0x35D531DA062811F363CE642606D04359B6D9DD61 = The Book Thief (The Book Thief) | V | 0x972FBF87DE6E7F4D383F131B1B6DF207 ; MKBv35/BD+/BEE/VUKNOTVAL!/FindVUK 0.83 -0xE980BC79490423792A9F465786F8303935B411C0 = The Borgias season 1 disc 1 | V | 0xE559A93D609D03B5F24AFCBDA2B774C5 ; mkbv26 -0xDCC5FC93260E5DF3999643B544EC20B561E029AB = The Borgias season 1 disc 2 | V | 0xAD1F11331508820BAF3C2E997FCB1376 ; mkbv26 -0x8B47D8097A1616F08C8657F96D00D997B26E5602 = The Borgias season 1 disc 3 | V | 0xB8C5E770A060582D990CD1598D7BB684 ; mkbv26 -0x1214372BAFA77CC79AB4E8B0DDCDC8E991FCE110 = The Bourne Identity (UK) | V | 0xBA9F66F9946C5E138D0E4872ED529281 -0xDAC44045E23B03653D08DA20CE3D69436DA7FE98 = The Bourne Ultimatum | V | 0x06017A44FA6F9E9D34D6017D1907AAD9 ; GER/EUR -0xFA520D06B1F88E39F3F412ACF549BE9F0CD4A75E = The Bourne Ultimatum (UK) | V | 0x95F675DC7DE1036C7A179F0527BE9DBF -0xE70B37909C85C2675A1F065E9CB9EDE934DC468F = The Box | V | 0x92DE0D308C89FB7E603786A3D52BA1C3 -0x86C7589E8702049B9D4D666B91EC9A9812A93FD7 = THE BOX | V | 0xC6486037E6D21869DC82056CEDDCB0D4 -0x1AAD031152E3219DB05752408C9603D415EABC86 = THE BOX | V | 0xDF708086E782393BFDE0E2B6C3AEC2AF -0xC42F053D739BA7DA1778C34780DD6EE960F56461 = The Boy | V | 0x595DF4860A2254B4D97C7FF8CF217052 ; vukextract v0.1.8 -0xC42F053D739BA7DA1778C34780DD6EE960F56461 = The Boy (The Boy) | V | 0xA0FE77D06951C86560EB419F520554E9 ; MKBv61/FindVUK 1.02 -0x45D628A2834515C705053413979078BF667498D5 = The Brave One | V | 0x85BE58C611CAF82127437FF69E11D3F0 -0xCF847E661BDFE8FFA6244AECBCE67FD5D3E7ABD8 = THE BROKEN | V | 0xEE53FC6161A1BBA49167F1F43BDC13DB -0xCF9B58E0F85F2864704A2E4F8132D8389ADF0588 = THE BROKEN | V | 0x96C49D4C2DDB7AB257358F3BDA434226 -0x4EDB8DB49BED6873CD1575FFFD5C394C80431080 = The Buddha | V | 0x90FE31D7B8F145FB25EAC785398BFE89 -0x9B1587B9BD2A78926E02021C368A8468299B76FB = THE CALL (The Call - Blu-rayâ„¢) | V | 0xE9550B8BE8CA1716D6F30D5B3CF73523 ; MKBv40/FindVUK 0.99 -0x486C257E94C8E244F4905C6F376FB49AC7A5E414 = The Call of the Wild (The Call of the Wi | V | 0x153BC035033136DE2C89E4D236A82A5E ; MKBv35/BD+/BEE/FindVUK 0.98 -0x4273E8A0F660BF569779EF357CBB190AA7BF0ACA = THE CAT RETURNS (The Cat Returns) | V | 0x60573AC79F39676C426C537B80B3194A ; MKBv47/FindVUK 1.00 -0xEE945D35F6D9D2FE9E109FE75531B8CAAD530A10 = The Champ | V | 0xF6E81238737234AE0817CE0779EE0E66 -0x211A69335F2D8562C29368895E43F4FA6DBAC1EF = The Chronicles of Riddick | V | 0x0E097DEFA4F86FA4EB0E59EF069901ED -0x7A47B3D5C6DAC61794C5239A039FA095B4FB79BB = The Cleaner | V | 0x12B1F82443C0249DDF17CE13D0923A37 -0x32A0EDE4129137AAFF98EBDCBCA5F1CCEF0116CD = THE CODE | V | 0x624CF514904BF484D22AABE2980B3D7A -0x04CE1C35A06FA8059E69A7BAA81C399D3C64A2C2 = THE COLD LIGHT OF DAY (THE COLD LIGHT OF | V | 0x7F012407D9BA1D40BECD775418E8C068 ; MKBv33/FindVUK 0.91 -0xD4035FAB32B57D23F0FCE2406BD3C0C246275148 = THE COLD LIGHT OF DAY (The Cold Light Of | V | 0xB201BA93A4B595E7DF9BEDE5918E31EC ; MKBv28/BEE/VUKNOTVAL!/FindVUK 0.84 -0x8E70474C5811AAC099669823A5A98F6857FE1881 = THE COLLECTOR | V | 0x10E2DF7DADF65192D7C907B7D72BB57A -0x050EBFC6DAC594557EBB6CF2A5BA85A8C691495A = The Colony (The Colony) | V | 0xAB686A0A4CE30EE97D48E026F371EAA4 ; MKBv43/FindVUK 0.92 -0xCDC0513FCBAF498E9EC0F684BBBF57F3F1C50858 = The Colour of Magic | V | 0x4749AED9AD44FBB722A46D71ED6E5847 -0x99A6FECB3C1D6EA08F2829B02E44FA58D7A6A0C0 = THE CONTRACT | V | 0xA33C1F4791688EE03EB741F377D914D9 -0x8E2F6131DB57994B408528E2A7ED1F4FB6195B3A = THE CONVERSATION (The_Conversation) | V | 0x8493F72A89D42EAA88E06A3BADA9671A ; MKBv27/FindVUK 1.00 -0xAD55E19645E5CA60FA2487C7B9F0795F7A4DA9F1 = The Counselor | V | 0xFC9224CC7666219D883378FB3A5941B0 ; MKBv35/BD+/BEE/VUKNOTVAL!/FindVUK 0.80 -0xD5FF79774A7796FD4C8CD2198B0FB3032399E183 = THE CUNNING LITTLE VIXEN | V | 0x076B13D79E0A181EE148BF1D1B2A2429 -0x577115062329E47E5D01256C61242CA2AC093E3A = THE CURE | V | 0xB768434E1CB9E9C55D5123159FD57B38 -0x8E6B9DE267D28B0D922C4033A0E40FF37438B2BD = The Curious Case of Benjamin Button | V | 0x4A1E3CC2BDDCED1FF437C47AC235E8FF ; The is the Disc 2 of the UK version. -0x1F106A3B78D426EF23B99A50EAF1C663C495BE73 = The Curious Case of Benjamin Button D1 | V | 0x443F17E46CA76F6AAAA6DEE4F2494B8D ; mkbv12 -0xEF853A3F3F6A7FA708FFA5830D1ACB20F39812BD = The Curious Case of Benjamin Button D2 | V | 0x0DA4BAAB556A5AA09E8DE3824945140D ; mkbv12 -0x5F78A26CFE94EA4A00B89B2DAFAB603CB26FED60 = THE CURSE OF KING TUTS TOMB | V | 0xF297B02FC8D330C22AA5E0D8A883ADA1 -0x75B734571300EC2D9B8E68CB447C745EB622957C = THE CURSE OF THE WEREWOLF | V | 0xAD9E335948FC129A59571EC550FF6006 ; MKBv53/FindVUK 1.00 -0x2128BEF9FD62D4178830D7F8ADA3782D307D17D6 = The Da Vinci Code | V | 0x0C209C6EAB83A40FA2162E1F005179A4 -0x6A31ADE8ADA0B405FF7E376759D3FA471BAF6DFA = The Dark Knight | V | 0xD35F9D6BD8B82FFBF1174C77C88199F7 -0x99A62BD421DF3E2850D839544FDF501EE34B5205 = THE DARK KNIGHT | V | 0x88C13554B91D378956698536BA331452 -0x03A84911A6D41655B99E9B15AEABFAD57031790B = THE DARK KNIGHT | V | 0xD088E4FC431FAE4480E0D653185CBA25 -0x2F09C22B978C099A95D7BC784FBEBB5EBDF8816D = THE DARK KNIGHT (The Dark Knight) | V | 0x8C45F669D4201DC332AEFDA577DB243B ; MKBv9/FindVUK 1.02 -0x922058959EC17DA3E8D754507D235894CCFB84FF = THE DARK KNIGHT (The Dark Knight) | V | 0xFC9B6A0FC2AD34EF8EFE0B286F6AB31C ; MKBv9/FindVUK 1.00 -0xE83AB5BDDB0A0C4F295F886436ECE1069761A0E7 = THE DARK KNIGHT (The Dark Knight) | V | 0x893D88FB6884512FB7DC1EEB9A958DAB ; MKBv9/FindVUK 1.00 -0x2637E7A1C88E2DA3C35C6D4E3B0EE065DFB2F6D0 = THE DARK KNIGHT (The Dark Knight) | V | 0x3CAE8D854859B9277DD4D6A53585A8F4 ; MKBv9/FindVUK 1.00 -0x92FA9D0D7816BB1D1138E2545008EB94BCAC88BC = THE DARK KNIGHT (The Dark Knight) | V | 0xA984B1E0AE99313ABF1671C4E8B33046 ; MKBv9/FindVUK 1.02 -0xF0E6F18EF79C2BA65CF6F7C065D7C7C21A99D79B = THE DARK KNIGHT (The Dark Knight) | V | 0xBEB549505C1A9DEB171DF1DF32D5C7C9 ; MKBv9/FindVUK 0.99 -0x22D814CAD53EFB2EC6467E86B5D048E203073BA2 = THE DARK KNIGHT (The Dark Knight) | V | 0x398A1006E7F84CDBCB9CB7827EDBA9A1 ; MKBv9/FindVUK 1.00 -0xB5C542C2DCFACF9ED5400CCFF243563B38F34542 = THE DARK KNIGHT BONUS DISC | V | 0x787A3279BC41DAEAC090DA44315E13B2 ; MKBrev 9 - FindVUK 0.57 -0x24389248290ED308CE241D0B53B6608F5D8B917C = THE DARK KNIGHT BONUS DISC | V | 0xE2D69E8F41C5B0494DFAD45679E6F01A -0x0365A70F90D22EB8A099D6AF5CF82ECC14C4A772 = THE DARK KNIGHT BONUS DISC | V | 0x9624D56C1534AA17078DBE9565F813A7 ; MKBv9/FindVUK 0.65 -0xA202BFE93686D691CB800837931A03AC0B8F8492 = THE DARK KNIGHT BONUS DISC | V | 0xF1C71438BFE73C767AD654585AE28F38 -0x5520609B4FBB918F44E9C23AE8C730683FC523CD = THE DARK KNIGHT BONUS DISC (The Dark Kni | V | 0xAE3A17D0CF75877F12651235E49CA89F ; MKBv9/FindVUK 1.00 -0x81EDCBB6C127074B1FC5BF9F8368D9744340E95C = THE DARK KNIGHT BONUS DISC (The Dark Kni | V | 0x8181CCDB2D90012435CAC216C4D556DB ; MKBv9/FindVUK 1.00 -0x3B548970F2676611D3547C9061A4857BC0A3C80F = THE DARK KNIGHT BONUS DISC (The Dark Kni | V | 0x07FA9A9B9F54300F9B62E8E8C0C17A5F ; MKBv9/FindVUK 1.00 -0x8C7CB4357AA04C87763F8D7575CF4FA5618B158F = THE DARK KNIGHT BONUS DISC (The Dark Kni | V | 0xF4E5D9CC2C00B62F2468EE83FB1C2295 ; MKBv9/FindVUK 0.99 -0x9CDFD2A32EA1C786F24D4E78B94E89F5CBD169F4 = THE DARK KNIGHT BONUS DISC (The Dark Kni | V | 0x7667F9EF93A2031655993664CC09E958 ; MKBv9/FindVUK 0.94 -0xD02C8AC181462BB7C7D71BE4A58D6F6D0C9CBF9B = The Dark Knight Rises (Disc 1) | V | 0xCF42034E55EE95D4044FC472647039E6 ; mkbv27 -0xEE07066F15EDA23B04AEA33106BE1EDF9DF537D1 = The Day After Tomorrow | V | 0x5549ED46711B2E6FD276FB9DAF5B2CCA ; mkbv3 bd+ -0x6B63A40DD45F17A466B0C5CC35BF1500B4E0A9BA = The Day After Tomorrow | V | 0xC5E868608ACD6700C2AC6A5E6AF533D9 -0x652F40B830E7A9279061C2D7875B80388F02A5FC = The Day After Tomorrow (US) | V | 0xE15A717A05A3141E62F158BEFA75C9F8 ; mkb v4 BD+ -0xD2F6E61AF7BDD0C5575C5D271E0BA108AAF2D7E1 = The Day the Earth Stood Still | V | 0xC197583A9D02E38C9AD6BFF1544434A3 -0xFFA85C21F8F1959212FBCCDE062C61F8A2A09609 = The Day The Earth Stood Still | V | 0x2FB2D3FCBE51E15856A8F079BBC494FB -0x5E0643251606F45B24B961700DF147169B8A708A = THE DEAL | V | 0x6A7D3D51665D9D08B68E01627FBA075C -0x5232540310E81E034186C95775BBACFF2ABC94ED = The Debt | V | 0xC6A0ABAA8F06146C90B1CB1F9F7591CD -0x7A32C9717D6E55719ED880695416B8A4E73688AA = The Deep | V | 0x639435E3331882AD3D56160939FFB746 -0xBEE4DB28F015AADD45AC03BE061E4DEDBFE2ADC2 = The Departed | V | 0xD87A6424AB17F289442ED8274A071944 -0xE38AF9B83B64E83366EF03A7AD861BDBAA184EBD = The Departed (Nordic) | V | 0x7787E247FB42B6C80FD31E72BE497C97 -0x44DD40BCF60AC55F5F8F726B737D832C0C466D13 = The Descendants | V | 0x079C2D56E76D0B14FDE44C722E22D241 ; mkbv28, bd+ -0xF745EB458382AEF0D170CE333E0FCC59F2243BEE = The Descent | V | 0x1AB2E138D87290EC87C5E3C59C32D8FF -0x0E6591A728018191EF9EC3D31AF8438EC978B10D = The Descent_MBRR | V | 0xC03740FF458C44E8AA74B76B57F9C62D -0x673390193A24FBFAE46A08BC3AAF9688CD38A393 = The Diary of Anne Frank | V | 0xD2BED630089CBC2BABDDAF4758F50835 -0x26ABCA963841DE312BD38A5D55F8DAC425CD10CE = THE DICK VAN DYKE SHOW S1D1 (The Dick Va | V | 0x594441EE248AE2725F0349A9D3B0CA01 ; MKBv33/FindVUK 0.96 -0x849C5FF05467ACE24A9B1AA887F3BE5E3976582A = THE DICK VAN DYKE SHOW S1D2 (The Dick Va | V | 0x3ABF6E0AD95D0A34F9E79DC32B4BE6DF ; MKBv33/FindVUK 0.96 -0xB586AF7C7274F7D1625E60154574C28BC0BD4DE2 = THE DICK VAN DYKE SHOW S1D3 (The Dick Va | V | 0x36DEB80357E0066AC2097C6A04C93654 ; MKBv33/FindVUK 0.96 -0x61AA47332BD87500B75A249F8042A5D87B26C37E = THE DICK VAN DYKE SHOW S2D1 (The Dick Va | V | 0x13DDC08C7A708419B598946CE5BB5064 ; MKBv33/FindVUK 0.96 -0x7D1629CA772FA8A51F89856F71475D322F669DEA = THE DICK VAN DYKE SHOW S2D2 (The Dick Va | V | 0xC44CEB3E5239A8C1B99223B2C93FF5D6 ; MKBv33/FindVUK 0.96 -0xE161837F666FAC97ED3FA787E967752495B9BC2B = THE DICK VAN DYKE SHOW S2D3 (The Dick Va | V | 0x4A18085337DC927819A7DD11BAB6F91F ; MKBv35/FindVUK 0.96 -0x35283FCB42687471B0F6638AD4434A77BA10BF37 = THE DICK VAN DYKE SHOW S3D2 (Dick Van Dy | V | 0x946C9F63FD09FE9B95583FCB18F2E5D4 ; MKBv35/FindVUK 0.96 -0x1C7FD73A668A072DB178C65A06C5A8D8B8086FF9 = THE DICK VAN DYKE SHOW S3D3 (Dick Van Dy | V | 0x82A7B707AF06B0021475CFDD4B4AF747 ; MKBv33/FindVUK 0.96 -0x162225DFFE9C273A2F52D6FB7907BA2C021E8901 = THE DICK VAN DYKE SHOW S4D1 (Dick Van Dy | V | 0x689D2497DB4D8A4824D6C8979735C804 ; MKBv33/FindVUK 0.96 -0x0A19B83812D400C08DB6F2FF418AD13956F81AF0 = THE DICK VAN DYKE SHOW S4D2 (Dick Van Dy | V | 0x01DFF5A0F5E1D86DEDA03C5E982B1D3F ; MKBv33/FindVUK 0.96 -0x01C53C13C513332681E8AF198935E3BDA99A7F37 = THE DICK VAN DYKE SHOW S4D3 (Dick Van Dy | V | 0x5869BF1F4BAEED8C049C5A32AFC6B19B ; MKBv33/FindVUK 0.96 -0xE29C7FA1D40EA66101142574155126AC9B192AFA = THE DICK VAN DYKE SHOW S5D1 (Dick Van Dy | V | 0xE0E3986DF0D3C6C4CC10FF8BF0B93EB9 ; MKBv35/FindVUK 0.96 -0x221FD15AF0A603979C1C32C10D505A77BFFC4176 = THE DICK VAN DYKE SHOW S5D2 (Dick Van Dy | V | 0xB35FF72AA28B299B6B58BA314C19A942 ; MKBv35/FindVUK 0.96 -0x12BDCC2F96C02EAAFCA30957E76994BAB60F165F = THE DICK VAN DYKE SHOW S5D3 (Dick Van Dy | V | 0x87BEE96B71F2D4503E2760E68E442BC0 ; MKBv33/FindVUK 0.96 -0x5729CA86DC4798DAD87EC69D6372C985806D7C02 = The Doors | V | 0xEEE9B425FD107999567C202FC31E4C15 -0x5717F9BFA55071B9C3E33810F066C5C0BF3CCD61 = The Drop (The Drop) | V | 0xFFA31E4D025897DF0CA593D9BCB3AF29 ; MKBv47/BD+/BEE/FindVUK 1.00 -0x689741F8BBF8B3200A13767A6CB39BC0C750BE3E = The Eagles - Farewell 1 Tour - L | V | 0xDF189188E5FD8A12CDAB38AA83FC4C5F ; MKBv34/FindVUK 1.00 -0xF8AC8E08FA5C329966D3B0FB47903B01B6E1BF21 = The Eagles - Farewell 1 Tour - L | V | 0x6C6FC3401230DB0DB8EBF3B5CB266C60 ; MKBv34/FindVUK 0.99 -0x6F2A8812C4313F722C8D42317D54AAD127E537AE = The Edge | V | 0x909923329D56948CB609CE122F51F131 -0xEB4B3734E7F3F90A98021720ED2A8946245954A8 = THE EMERALD FOREST (The Emerald Forest) | V | 0xE4C9CB5EA1ECA896E4AA91E72B617CF0 ; MKBv50/FindVUK 0.93 -0x2429D901EE6169A42545D3F422E53CE5EAA15035 = THE EMPERORS NEW GROOVE (The Emperor s N | V | 0xD1A942475245923599DD9961A20B85BF ; MKBv35/FindVUK 0.96 -0xA5B5D670A55079764305A944A34CD50A8D3972DF = THE EMPERORS NEW GROOVE (The Emperor s N | V | 0x4401E8CED6539D3AC72393735A373C86 ; MKBv35/FindVUK 1.00 -0xEC1F22AEA41884103A11F3C1E386EF62C4CEE207 = The Enforcer (US) | V | 0x71AE3204F099C0AA1C66A4FCDDF5B6DD -0x1175971F1B7F6632E3F6219ED2607176651477B8 = THE ENIGMA OF KASPAR HAUSER | V | 0x36FFDAC5CD1D56094C43371FAEF5E5FF ; MKBv47/FindVUK 0.99 -0xCDE063C09D3A3C6FD849E08E22E19FC53F7818ED = The Equalizer | V | 0x9918AA3CB476B6BEDE29F697A40A7A70 ; MKBrev 50 - FindVUK 0.62 -0xC770C8AE590092EEA151DC77585E643211A30E67 = The Equalizer (Equalizer, The – Blu-ra | V | 0x03CBFD0C97CFB40106CD80FAF7ED757E ; MKBv50/FindVUK 0.97 -0x329DF8989622FA334A2ED30B00D674E077BA0B4D = The Equalizer (Equalizer, The – Blu-rayâ„¢ | V | 0x8B240A326C27B0BDA9A67FE2595CE387 ; MKBv50/FindVUK 1.00 -0xEA552FDC9DC37A3C9A7F29C72C449C90112D591B = THE EXPENDABLES (The Expendables - Blu-r | V | 0x5EED2811F2CE639D1C3EA1DECBAFA0CB ; MKBv19/FindVUK 0.96 -0x16BA912F9E972FEFFDE2390D5F87495C1D1FD918 = THE EXPENDABLES 2 (The Expendables 2 - B | V | 0xF345C341415418F7879B42D27D4F7272 ; MKBv35/FindVUK 0.99 -0x4D4BB2CDC3A785D69C422076B7EBF2D37D234C16 = THE EXPENDABLES 2 (The Expendables 2 - B | V | 0x4B897C70935B5E776B8CC8E8C6535C7A ; MKBv35/FindVUK 0.91 -0xD84A4D7D9D7589BBC1611F96599C9F8ABFC8D988 = THE EXPENDABLES 2 (THE EXPENDABLES 2) | V | 0x94D2EB8B38CF626AD0547E555EFFC716 ; MKBv34/FindVUK 0.95 -0x8A01DAD5EE07806C98C6BB6EB6CA067114ACD8E3 = THE EXPENDABLES 3 | V | 0xEA95C0C8A3229024EFF2160FDDBED3B2 ; MKBrev 32 - FindVUK 0.57 -0x4A507BC32BB677E800466228D437FB3CCF774D29 = THE EXPENDABLES 3 | V | 0x61068540B56C82FB2E4634FD8E5156E3 ; MKBrev 32 - FindVUK 0.57 -0xC6E52AEE8F21AA559395DCB5D2C94F5112C79932 = THE EXPENDABLES 3 (The Expendables 3 - A | V | 0x81F67203D45EF46891B805D01C44CE78 ; MKBv51/FindVUK 0.99 -0x2D6DBE73D0A895B92114F7BE8CEE29CB2A8FB7B3 = THE EXPENDABLES 3 (The Expendables 3 - E | V | 0x75F18D0C7ED7BA8C340E211634CFB672 ; MKBv46/FindVUK 0.95 -0x20F05EAD2E29178071ED59CDEB70F2D17B918920 = THE EXPENDABLES SPECIAL ED (THE EXPENDAB | V | 0x27D3B044903E6CCB4C432CD79FCE0D4B ; MKBv19/BEE/VUKNOTVAL!/FindVUK 0.95 -0xDE35EA32A26AD0B5A915986886D4A0B304187F4A = The Eye (DK) | V | 0x7D49604E73E0F491FED8A4847B595A3F -0xABAF50375F204A0DD46C74C4C1A982FA97714A7F = The Fall | V | 0x3407DE4FF57DBAF36460F44D5D3F8F8F -0x74450691E0120CCAC109CA32470AD78620E6B0EF = THE FALL OF THE HOUSE OF USHER (THE FALL | V | 0x10827DC30ACED9ABA0E45B33F3FA16F2 ; MKBv40/BEE/VUKNOTVAL!/FindVUK 1.00 -0x88F154238E37B55C27E86C1BBCB86E58C93C8421 = THE FAMILIAR OF ZERO 3 (Familiar of Zero | V | 0x3CA1AC2959EB1153C7997D3DAA877D6F ; MKBv53/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0x41FB2BE5FF3583EC99FD0143E895CF2B15FC850B = The FAST and the Furious | V | 0x56467064F2B44FB474CBDD6E2C60770A ; CAN version movie box set -0x2AF241C327A8F308C91D57BF5AE0A3BFF2BD96B9 = The Fast and The Furious Tokyo Drift | V | 0x780A686A72630C0D475CD47A43379DB3 ; CAN version movie box set -0x7A9DD2D69219090D58A99DF629DDA729AAD10549 = The Fast and the Furious: Tokyo Drift | V | 0x87366DE8804A94865C8A62642F17796D ; mkbv12 -0x1D078D43544145770D2FF055F1D6598A3761D972 = The Fellowship of the Ring (part one) | V | 0xF2BE1FC7B6EF1463057C0CB658AF88CC -0x29A0FA1CDF6DF5E6E2C94D50754773BC9FEFD7E4 = The Fellowship of the Ring (part two) | V | 0x671E87B894C22625A8C1C97268A78C67 -0xCAA0230D5D2FC909EF98E9076B33D397A81ABE2C = The Fellowship of the Ring Extended p1 | V | 0x5602CAD90027DEC7F807385655E5CDD0 -0xA4B8EC2A00F549EC67E0F94318072C9BBDB5C87A = The Fellowship of the Ring Extended p2 | V | 0xF8B069510AFEAC8CB6235182EB2E3158 -0x8426FAEB73F33D9F5A8E615648D99A6D3EA34150 = THE FIFTH ELEMENT | V | 0x7A5BD9D99B77C8895526435B4154292E -0x611AA21956DB4DAA6EBD979F846CCD4C81EE0D42 = The Fifth Element | V | 0x72362EFBB602D288B7D572E79284B53E -0x5BB5B468205D21A2DA5759750B50A50B4C077010 = THE FIGHTER (The Fighter) | V | 0x80D5A80F0A92F7DD4D156565478320D1 ; MKBv20/FindVUK 1.00 -0x303825A13B4072EFAB4B00A29AABF6D100642476 = THE FINAL COUNTDOWN (THE FINAL COUNTDOWN | V | 0x68BB03BBE4235FDB16045B790A47EF81 ; MKBv32/FindVUK 0.96 -0x055B1164259742A3811D8006EEE026ECBCFB2882 = THE FINAL DAYS OF PLANET EARTH | V | 0xCBE751E033B3485F5A9DACFC45ABEED2 -0xB935BF2D563FA99ADC9360C101C39B9CFF108BE2 = THE FINAL PATIENT | V | 0x15BCE8BB5880962635F24CAD049F3599 -0xC86CEF316FFA4F1A9BD1E007C881884AA5F79EF5 = THE FIRE DRAGON CHRONICLES | V | 0x2D95B5A39C157DF8F40843DA76D55EC9 -0xB788EB003E55B5D64495EB6216546A977CB61D77 = The First | V | 0x311C981DD9E6972D59C337017CDB7C6D -0xFAB0451500732F99F3BB9A3FAF5F2611A11B1927 = The First Power | V | 0x6AC04576630A1296C284CBF97AE3246E ; MKBv62/FindVUK 1.00 -0x580B0EA9E8A0C9985AD3A4EA80B5ED833D911F6F = THE FIVE-YEAR ENGAGEMENT (DE) | V | 0x00B9FAD7571F1595B880531669C7855A -0x8D4B1A3CB386FE9CADA4E30357489869E1279A41 = The Fog (UK) | V | 0x30586AE946D82C09983DD3FD00B4804B -0xD8356834EBEBE7C56BE92BF5FBB3A8DE0A6F6E14 = The Football Factory | V | 0xE9C7BF63609955718688499FDB01B652 -0x1FB17879BCAC51610B92E8C32B7C005DD4E14834 = The Force Awakens | V | 0x1C4A87018B81991E5CC49D2B4A70FB72 ; MKBv50 2016-01-22 KRJ -0xBA887A976C898EFB7B75A97FD0CF2CC5D1D5FDAB = The Force Awakens Bonus Disc | V | 0x0ECD1146C7CC57DA943F66F4638D3688 ; MKBv57 2016-01-25 KRJ -0xB9252646B91AD4AFC5975B0D0491839B67FCC262 = The Fountain | V | 0x8224FAF96B7B7BB71E3ECA9B2782A342 -0x9AE69ED8B560AA48207796FB56A200D2CC4F43B8 = THE FOUR | V | 0x38003E973A1A7B36C5E73FB6AA77A5B0 ; MKBrev 35 - FindVUK 0.54 -0xD429771538A5949AD7AA3B47D04D03B693E64992 = THE FOURTH KIND | V | 0x6E30B2599B8B75430FFEBE028A639708 -0x2D82A0BC3DD708E1BE0676C64148ED42ABE35C6A = The Fourth Kind | V | 0x64503E8E6026A9F3A29EB8410533B737 -0xB7DCC1AAA8DE0818694AD20F179ABA89E6AA4397 = THE FOURTH KIND | V | 0x116879F514D09B26F7715D9278DCB545 -0x05424BCA91140950CF66069355158FA6D5881C23 = The French Connection | V | 0x547A3FBB439D3481C9933082D3896B03 -0xB184C6BE7427928803A987B37F6B14A0807F7F0C = the fugitive | V | 0x5BBD4BBFBF711129128A75509232D937 -0x5B71227F0FF9C99A0E482D81636AA79E9AD97603 = THE GALLANT HOURS (The Gallant Hours) | V | 0x3BA1B00B33629296AFB1B40A21B5C141 ; MKBv58/FindVUK 0.96 -0xB0973419EAF756CC5D8841B9084E05B46F027B0F = The game plan (EUR) | V | 0x76646E155D61F3BBDDFD9030F7CE36E0 -0x668D3ABA20B17D1A520216D7B3032531DB5EF0F8 = THE GARDEN OF SINNERS Vol1 (THEGARDEN OF | V | 0x04DDA9A0BE879DD25667F643250F44E0 ; MKBv31/FindVUK 0.96 -0x6876A678118A2A173D67DA1E1B1B2A4F9A871E43 = THE GARDEN OF SINNERS Vol2 (THE GARDEN O | V | 0xDA54B3BD968D661AD9A18678B7A7CA9C ; MKBv31/FindVUK 0.96 -0x9ACD7C9F4179B0E146809BE5834FFC3D64807F7F = THE GARDEN OF SINNERS Vol3 (THE GARDEN O | V | 0xD075840C289C359F889027E1BFCCB577 ; MKBv31/FindVUK 0.96 -0xD7EE5E66A5EF56B07C5E33C714DFC1360108BD9A = THE GARDEN OF WORDS | V | 0x204165C0CB5D4738A7DB61763BFC3367 ; MKBv40/FindVUK 1.02 -0x25DF9B218BA25D2D048001543106876192F0D1BA = THE GARDEN OF WORDS | V | 0x6155BC0A2141E2E4194BA53A165A3228 ; MKBv48/FindVUK 0.92 -0x60788B0E5E3D2A45B1241245F8885E46D7948F33 = THE GARDEN OF WORDS (The Garden of Words | V | 0x97A317BB66A4967510EA705E45A43D79 ; MKBv47/FindVUK 0.98 -0x35BCF4D6DEEC5FB0F6A2E18E1464BB9E5E16D6D5 = The Garden of Words (The Garden of Words | V | 0xD2C184C7B97814B87C30B1328BB09519 ; MKBv39/FindVUK 1.00 -0x7F5CBBC602A9B89EA90DF9B46A49D72769FBCC7B = The Girl Who Leapt Through Time | V | 0xA4D5F9E27F7340C4C7ADAAC63228FC90 -0x769C73B9BD1707462AF9A9003B4D95E8A2504C66 = The Girl Who Leapt Through Time | V | 0xA3DB9024A6823F400D1FDB23AC740318 -0x6C41E1D489BD3983220777C3BA63AD1A5F787DD4 = The Girl with the Dragon Tattoo | V | 0x2D58A3BF02DC8981C1B51DC23587B207 ; mkbv28 -0x496A86A1A55446EF8CB00F4C81DBE285F43F3305 = The Girl With The Dragon Tattoo | V | 0x567C451C35BB88FCDBB774738F604C2D -0x3EBCFC0C088BB8E9384ECCB55C1D6693F9B83735 = THE GIRL WITH THE DRAGON TATTOO (DE, D1) | V | 0xE5B015226B641344FD9E7085F71C8566 -0x1FCD9F5CE0134A456C3A92D841149BD80B3BCC3C = THE GIRL WITH THE DRAGON TATTOO (DE, D2) | V | 0x9CB1BC2DEE972FDD4981F0B81FBADA95 -0xB3F7F44C2495B0748A5016EBC482DD731B3F4DA9 = The Godfather | V | 0x3E4590D228BEB976E50869C5451E054B -0xC338BB85F4178181E423092728C35A242C00B2D3 = The Godfather (Nordic) | V | 0x1F7C9FC0B04FC468A756D56F11228D40 -0xAD6BC6E612C85ABF207F71618D4B9F89C2E254B1 = The Godfather - Supplements (Nordic) | V | 0x6C9E74EF332A1E286D76D9383F4E49B1 -0x9E1A8D9EA15DA866AB60861D1CBE6EEEB53379B3 = The Godfather Coppola Restoration (USA) | V | 0x1CBF5649D7ABDD15F165A589EE54CF92 -0x990D5ACBDEE3423FBD733A3080CB158E26A01940 = The Godfather II | V | 0xDCA04BFA3BB1C3CE01A499E9707C6D64 -0x8C96CA61B8B76089FCE5F5AA49796260A89AEBE8 = The Godfather III | V | 0xEEC28B68042A196455D32F0A82B6E97B -0xD5BA27F28AE584556B4EFB2E7A333DC3283DCF64 = The Godfather Part 2 (Nordic) | V | 0x7D4E90E5CC244014F3E39FDB37A79D94 -0xA955BD88477CB0088312FA163C860783AEA24F8A = The Godfather Part 3 (Nordic) | V | 0xEE1FAA914DEBD5B4189DABAAB4E19068 -0xB2F2C088402BCD4178FC9AA046D3497DA594FDBA = The Godfather Pt 2 Coppola Restoration ( | V | 0x22CFBD13C52CE4D344C856F102D587D6 -0x17AB1177958AB81414EA28DD14E55DB073CD83EA = The Godfather Pt 3 Coppola Resotration ( | V | 0x3246D25E19162256607DF8B119CB1349 -0x3662EC445BCE38F20DBFEF693D39C4AB1CA8F10A = The Godfather Supplements Disc | V | 0x533DA1A02B1B931C9CAAC80EF26175CD -0x759F1DBFFBBE3CCA19DB6A6E7B86AF0B1B93F0CD = The Gold Rush | V | 0xDB2F8C00DC1DD1E403DF2FBAB880A78E -0x2F164FC7617D6652334355FFB6A5E97829DCF5E6 = The Golden Compass 1/2 (Feature) | V | 0xE493324573E325A296A54D0EF7B4C787 -0xFC6A5FE300D172D3242022A0B996D5FE6F13EB6F = The Golden Compass 2/2 (Special Features | V | 0x9F20F7F0C3673E1A61B44A3E280F1C3C -0x109DCE825539D1928722B681636078C88ED9F9E1 = The Good the Bad and the Ugly | V | 0xDAE64544624C50077EBD4CB51D29E8DC -0x33A2DC1E5CF2DA6C51C06E9B21EADD312A9C9C3E = The Good the Bad and the Ugly (The Good, | V | 0xDB7996072FFA5196D99D011A10DF0D98 ; MKBv46/BD+/BEE/FindVUK 0.84 -0x1EB2EC8818BD944C0E41DBC7EECAD439C5143724 = The Good the Bad and the Weird | V | 0x0D00D0A9305C443146E5FDFC3021B559 ; mkbv16 -0x814635AB5E9F6864803AC199C8A7C54E1CBCBD88 = The Good, the Bad and the Dead (The Good | V | 0x5A34EF832A24EF80F975DA0A7EF49C2F ; MKBv60/FindVUK 1.02 -0xACE7DEBA52ABFDBB5C978ECE2B7D0E86E859ECDD = THE GREAT BUCK HOWARD | V | 0xEF9641CBE1AC8DA26BD3C8A5B792DE43 -0x4330877A7FFAC61AA2AD3D00E1ABEF0195D73EDC = The Great Dictator | V | 0xDC13D3BAAB66BE477CFEC5E805DD5E20 -0xB5404661F6EFCC52B78D17A1593984296BC81B9E = THE GREAT MAGICIAN | V | 0x3B4E66A94256909BD2BF33210AA9CAB6 ; MKBrev 37 - FindVUK 0.54 -0x0AE8EBD233355066081AAF80A611E3283EDEFF43 = The Great Mouse Detective (The Great Mou | V | 0xF4B7D9250575220A8141E1BED6FD9F61 ; MKBv27/FindVUK 0.94 -0x407E78E9A359822ACEEAB0ADFD6FDF48B785004F = THE GREEN HORNET (2D, DE) | V | 0x3BC3884E392A4D7B2AF5C2F2B09503AF -0x88F5CACAD6741B9C61F60E6EC35F94F2DC0453C7 = The Green Mile | V | 0xB7817CF6852F9D89BA3AF523769A4D70 ; mkbv14 -0xD4487AE75FA9DAD2974E43259D3C669ABF6B1FB8 = The Grifters | V | 0xF3FA9382C2D4AF24D040B33ED672F236 -0x6BFC35C05D011958E9E5D3BDBE187C7419D00AC0 = THE HANDMAIDEN | V | 0x30EBC8F3CA4A9DAC5DC06535A40311CC -0x6221E46A29A06F38F86A679D82EA195047306154 = THE HANGOVER PART II (THE HANGOVER PART | V | 0x696BCE4A4DDEC60FC781647E5B493138 ; MKBv25/FindVUK 1.00 -0xFE763F0CBE60126716BE9C36D85AC04B4DB3CE11 = THE HANGOVER PART II (THE HANGOVER PART | V | 0x853F520A16569266644DF2791EADF868 ; MKBv25/FindVUK 0.96 -0x9067662AF05E1470E2AF0978AF23394A902BA556 = THE HANGOVER PART II (THE HANGOVER PART | V | 0x4187038415C3CB6ED1DBABDF68F1AD9C ; MKBv23/FindVUK 0.98 -0x6E95CE70A2CF4F3D27BB485C179DC8B7A76432F1 = THE HANGOVER PART II (THE HANGOVER PART | V | 0x831B5493280F013973D473C5A7DCC5E5 ; MKBv25/FindVUK 0.84 -0x2E432BB9805AFDF45CDC13B411E19FC89F49C3C6 = The Hangover unrated | V | 0xA3113745142A1D0474620F43B64A3047 -0xE02E2A672A0E98204856E10B2B02BD36156B0610 = The Happening BD+ protected (US) | V | 0x09EF58D712A3C523B8B9CC7A4111F499 -0xE3304E541EB4BBBB0BC2972B1D985D041937EB8F = THE HATEFUL 8 (The Hateful 8) | V | 0x581CB9FE8D34EEF4DA7E76D58E7A26EC ; MKBv60/FindVUK 1.02 -0x42305441DDE882A3CF6443210DAD29B706377888 = THE HATEFUL EIGHT DISC 1 | V | 0x17D557BF316E26E967DACE74E9ECDB83 ; MKBv58/FindVUK 1.00 -0x975105D6760A9830E12783D422E74A59AD3B6551 = THE HATEFUL EIGHT DISC 2 | V | 0x6AB85176035CDC7E2CFFBD43803B8AE9 ; MKBv58/FindVUK 0.98 -0x5CC39BD73EA1CBDE4884C8425A7A67C062D43BF8 = THE HAUNTED PALACE (THE HAUNTED PALACE) | V | 0xA0CCBD5D49999C4D29B85522779934CB ; MKBv49/FindVUK 1.00 -0x4819E399F45772CE82A3366837B70430D3F32059 = The Haunting in Connecticut (DK) | V | 0x9CC3AD5CDF55866E3DD34292967BD4B5 -0xC1386384C7A49DC405CF31ABAC02B2C171D08B65 = The Heartbreak Kid | V | 0x723403302EAF6569CC16DEE65ADFF105 -0x73BA10447FEDE157DF440EFB16480080491F7EF1 = THE HIDDEN FORTRESS | V | 0xE42206E36EACD3E4BBDFE886CF7D314E ; MKBv47/BEE/VUKNOTVAL!/FindVUK 1.00 -0x6392B8B7C7D8DC7B6ADCDBFCDCA8C132C8FB8EE2 = THE HITCHER | V | 0x6CA1EE5D7695ECA5B8D3DD1D58B8BDC1 -0xAC2E27742DB164006DBAAB9BF87D3C96384A6720 = THE HOMESMAN (The Homesman - Blu-ray???) | V | 0x9489EB972ED3636F9507F37D2B826687 ; MKBv50/FindVUK 0.96 -0x0E0FF7BAEC3D15B7F255BF2D800D50B043428956 = THE HONEY POT (The Honey Pot) | V | 0x33158AF3D23FE18D4E121132B9D9D643 ; MKBv53/FindVUK 0.92 -0x401A6ADC2E6D1DEE22380706FC5DCB75CF05C2DA = The Host | V | 0x4BD2EF2E9F296500708BF11033C99AAF -0xA664E5DBE57DE89316CC50D78C5589879A4123EC = THE HOUSE ON SORORITY ROW | V | 0x635C39CB9D9D53715DAC792FBD9853FC ; MKBv56/FindVUK 0.98 -0x07498AD6DB725497742ABC376F5FF476375B4C7F = THE HUNCHBACK OF NOTRE DAME (The Hunchba | V | 0x0D9808558EA93022BFFD063E782CDE38 ; MKBv31/FindVUK 0.92 -0xF2006AFD41B9F0D170B171AAE804B674C2EF292C = THE HUNCHBACK OF NOTRE DAME (The Hunchba | V | 0x106F740E42B2821A9295019C9709CC55 ; MKBv35/FindVUK 1.00 -0x80E660D4537444AFDEE80C2BF8E238425A50BF61 = THE HUNDRED FOOT JOURNEY (The Hundred-Fo | V | 0xEB38D969C49D541400E0F3F320EDDCA6 ; MKBv39/FindVUK 0.96 -0x07C7FF1D981E0C73BADD1D18C031B7A8CC5D2784 = THE HUNDRED FOOT JOURNEY (The Hundred-Fo | V | 0xD83E1198634FF3A11A63CC01581CAF3F ; MKBv39/FindVUK 0.96 -0x541DB16032BC5B8B3132A2BF8D8720D64F5C5A72 = THE HUNGER GAMES | V | 0x4A04DF57C0165E03A1F37AA238E69152 ; MKBv28/FindVUK 0.81 -0x96F778A62ACB54BDC0A95B39D7C9528C7CB6675C = THE HUNGER GAMES | V | 0x97AAED761D633C8DBE96BA47D864D887 ; MKBv30/FindVUK 1.02 -0x2FEC71E9DFEB9AE2E87B8BDD0C9620CCDDE36EED = THE HURT LOCKER | V | 0x6BCA21700DE6B8B7031A78FC30A7BD0F -0xA90E05FD80EF2D96255C81378A845AC0EA9266A9 = THE HURT LOCKER | V | 0x7DE2FE3278DA210A8264091BA4D06BDD -0xF105379B06E0A3B42A533A8671BA0F7F3A9A9549 = THE HURT LOCKER | V | 0x0730E5D502DB904F9CD0C0FC57017C6E -0xA934AAF846E14B530ECBA6251DD9495388B43EAE = THE HURT LOCKER (The Hurt Locker) | V | 0x7623E217E81962248309A85EE79BF005 ; MKBv17/FindVUK 1.00 -0x3E9CD59170F0500F36AC806A93A447041FD02267 = The Iceman (The Iceman) | V | 0x44C6450C49D111C2A827A10EE966F3A7 ; MKBv40/FindVUK 0.98 -0x0940F2F9A7DD0B55B51467E30830B443DA7974FE = The Illusionist | V | 0xF5AD50107D65B7915974DEC8D9B6ED6F -0x4323F7AE0191668233A0E6EA5BABEA8F6056DEC9 = The Imaginarium of Doctor Parnassus | V | 0xB8F540A67B3253D64905903A6CC95645 -0xC973C651670C198FF60E4611E95FB295B8AC6482 = THE IMITATION GAME | V | 0xEFFE7C67DA024D175DF1FB6CB33CABC6 ; MKBv52/FindVUK 0.80 -0x9D2088DF973BB496F910601FA85741716031E9A3 = THE IMITATION GAME (THE IMITATION GAME) | V | 0x3D35C2EFD8EA516EF0DDC34ABC00D5DF ; MKBv47/FindVUK 0.99 -0xD5BEE1C6B74139B6E66B9F1E3C9CF2FAE53E6B3E = THE IMITATION GAME (The Imitation Game) | V | 0xE07997F3CEA609D4936E547349725088 ; MKBv51/FindVUK 0.98 -0x82C91C6856F4292E63C7B9FFE36A1B06682B9ACF = THE INBETWEENERS (The Inbetweeners) | V | 0x1E0B37F178B5C167B1226D444F0E2581 ; MKBv23/FindVUK 1.00 -0xB6E8DA894BDC9CEAE1B0EFE74067420554494E99 = The incredible Hulk | V | 0xFC3307071B380D96C8A4E4CAB5E9B227 -0xDA9CD786021832B221BF8F115DF11144F3DF7C71 = The Informers (US) | V | 0x646C799C688120731813C012007009C9 -0x0D85B1DD59C2A6C5BBD1DA46CFA53D83E3698C48 = The Innkeepers | V | 0x3415EBBFDF1C3A75A05F6C80D643E40E ; mkbv27 -0x35078CB584F2103EE51312006710D42D2FC1EF26 = The Interview (Interview, The ??? Blu-ra | V | 0xEECE9875615A9B6344CF8765D5D94149 ; MKBv50/FindVUK 0.94 -0x39B64899F39D4B2A6B115D8D583CAD3F6B775935 = The Interview (Interview, The – Blu-rayâ„¢ | V | 0x1410B54C50C53645C2699D724741A4A9 ; MKBv51/FindVUK 1.00 -0x837487B4D6F614D5B4D5F566387B41C2D284F393 = The Island | V | 0x5D9BCD44522B6940F8705400DA612ED9 -0x9524D5B77CFF4A7030BBFA45288D19441FBD7FF5 = THE ITALIAN JOB | V | 0x63B202729C9C6CBF619F818DD47A4594 -0xF451ACB2BC4506A62B788B2C6FD074F204A5FC7C = THE JACKAL | V | 0x7CAF3B0079D7E6ACB4632B6413778573 ; MKBv12/FindVUK 1.02 -0x32BC5878CFB20D91495017EDCA0B9CD03EE38254 = THE JUNGLE BOOK 2 (The Jungle Book 2 - B | V | 0x2F1F054E5A39AA4212BB3F7806F69032 ; MKBv31/FindVUK 0.92 -0xE96EF68D5493B7181BC445599D23967293956BE2 = THE KENTUCKY FRIED MOVIE (THE KENTUCKY F | V | 0x5ECBE3190F85826F56790FF2F7E32F11 ; MKBv57/FindVUK 1.02 -0x42F3EC9FBF62C932A519B27664A3A7EE3D57821F = The Kid | V | 0x7EB74DC7656E73D7B93C5160E32AA9A1 -0x15BA51C387567D673E00644D723CF9566CFCCE9D = The Killer Inside Me - NO_SW_FI_ (The Ki | V | 0x09132F9FECD5A56362FBC5322241953B ; MKBv19/FindVUK 1.00 -0x0A98A261826EA0C982C94A3C5DB17BB1422C8379 = The Kit Runner | V | 0x16DC1E6A18F8262A3AECC2A80BC23CAA -0x1D51235FDBBF4B3DC3D4EA2C8B127B25ABF8F710 = The Lake House | V | 0x8FB6EB6C54CDF0ABDF414D28DCD69DCB -0x2869A603DFF0262BB056E0531B462B0C3579014D = The Last Boy Scout | V | 0xB3058647996DB4756C44F9CC29A51C27 ; mkbv17 -0x231DE90783AA31DE411016C35C91696CC9AEE287 = The Last Samurai | V | 0xAB09CBBE4569D8E9B7719F097A4BBF16 ; mkbv3 -0xA87A176987A9A3D8B3F9F96B8D5E0F5DE6DC382C = The Last Song | V | 0xA7555EF1DDF87C058E40C46B315C11C5 ; mkbv17 -0x86B0C261F4945FBA282031207BF93902923467CA = The Last Song - Blu-ray™ | V | 0x72B2F6572612599986E523796D9B57D3 -0x737FAF92F001CFDE20E2326378CD52028032EEA2 = THE LAST STAND | V | 0x01CD8FA16513C2CC3B64FAD9853D0E28 ; MKBv38/FindVUK 1.00 -0xD9E37064075F90EFE43E46F0F7B10E1163BB5D85 = THE LAST STAND | V | 0xAC373412CC62327B8B7DFD3C32D085B1 -0x8DACE0CF2959BB30E04DA4601403F3333E4E4390 = THE LAST STAND (The Last Stand - Blu-ray | V | 0x7ACAF7BE4D82A7D9957A71A3AE441F9E ; MKBv40/FindVUK 0.91 -0x90979A2B334A3A5A4B5F7FE7216907AB95F809D4 = THE LAST WITCH HUNTER (THE LAST WITCH HU | V | 0xD27FBCFAA95158971C822BE2539C2D22 ; MKBv60/FindVUK 0.95 -0x74DC45B6D01CF2759991F1524BF9F111F14D2FB7 = The League of extraordinary getnlemen | V | 0xBD7F52449316E7B3D2D2FEE4CDFCFFBB -0x18726CD6AB9CE49EF475C8B2229399A60140F601 = THE LEGEND OF HERCULES (The Legend of He | V | 0xD7F8C1F7F39FE80AF0E1670916517AD6 ; MKBv32/FindVUK 1.02 -0x7D2BB44E131DCD95EC5D31C5B5E3FD9254235C40 = THE LEGEND OF HERCULES (The Legend of He | V | 0xD6DCFE6491E3D5ABA8475DF4088C0CF9 ; MKBv32/FindVUK 0.81 -0x285B4B79E5EC2113D0B7B7CA90C460515A5FE476 = The LEGO Batman Movie (The LEGO® Batman | V | 0xF33E95E3D532415C986DFB1CA3548520 ; MKBv58/FindVUK 1.00 -0xAAE84D65E276FD421DC534F60CF5B19CC2E3A3F6 = The LEGO Batman Movie (The LEGO® Batman | V | 0xC23D6B28A794BE360C826816043F4CF0 ; MKBv62/FindVUK 1.00 -0xD40D2756FD2BC985B11B591247CAA6F92E580F61 = The Lego Movie 3D | V | 0x9D657281806734823C21012F62BE23D3 ; mkbv46 -0x4842461B439149C24672A72DB876C84E816E0872 = THE LEOPARD (The Leopard) | V | 0x2B77081AFC41D873D06C431DE8A85E40 ; MKBv19/FindVUK 1.00 -0x24144880EDF1F3BA40EFF37399BC142C1AFD7A48 = The Leopard Two | V | 0x09CEC24753CA08B682BAC007A56BF4EB -0xFF1018217F7DC902456F1ED73A2D18069DF59593 = THE LION KING | V | 0x62B3148EDE35DA73148F34630736E612 -0xA3646587E427A273066F0B793440DDE500A5B053 = THE LION KING 3D | V | 0x9D6F39BE7DB187652F6804C1A858CC9D -0xC3039B9610B98E24B7CF4ACED6078BAA1978C741 = The Little Prince (The Littel Prince) | V | 0x0D4C0262B5F68DEA80A7529579620319 ; MKBv61/FindVUK 1.02 -0x64A39999A2B060D888A9FDD5F57930C4E6797EDB = The Longest Day | V | 0xDC293DCD085CF9456DCE40E185449A52 -0x1B3C113FA79B69B84AEB0BA6EAA3B65EEA2B8030 = The Longest Day (rip) | V | 0x5952A80304212154F4F37BCC2242D51D -0x72FFF46DDFB6D821D38F3EDAAD4B7E3A9130D593 = The Longest Ride (The Longest Ride) | V | 0x0D843AF724F1BCDD820A4165754909B4 ; MKBv47/BD+/BEE/VUKNOTVAL!/FindVUK 0.90 -0x433ED954576BA0E1A6C4880BA4886EE9F9BD7820 = The Losers | V | 0x60940190CA15BF222334E0A96044C9A0 -0x92194AA3B2983ED459A1F79B062112193CFC49FA = The Losers | V | 0x1EE47F60332651353D7908662DECCD82 ; mkbv18 -0x065760635C3278778711D30D79AFA911F05B7C29 = THE MACHINE (The Machine - Blu-ray???) | V | 0x93929E553A0E4A0BDACEA69E5190EE0C ; MKBv46/FindVUK 0.95 -0x8EF10F03A841FBDAE263B774548682B66103BAB9 = THE MACHINE (The Machine - Blu-rayâ„¢) | V | 0x9037F9522E72878BE4613E94FA4E105A ; MKBv44/FindVUK 1.00 -0x0B9B403693603D6E2FDC7121AFBF610C36758E3C = The magic of belle isle | V | 0x51E146C839AB45B0719DA6B544D13B18 ; MKBv35/FindVUK 0.80 -0x9F11D5B0025FF423D11E645DE44CA889FF585F6B = THE MAN WHO KNOW INFINITY (The Man Who K | V | 0x2E48E3E6B507683DFF26BD46CD841F8A ; MKBv62/FindVUK 1.00 -0x1F417DD3C9C85A2B0B22A6AC478B2DB92FB45602 = The Man With The Golden Gun | V | 0xA748E57D9CCC7C766F7BDCB503FD94C4 -0x018BEFB66EB2CA4E50AAC3E124CBD9520370B1F8 = The Manchurian Candidate | V | 0x4F2A112A076636B17017B9CB40AB5BFB -0x060BAFC35E1C2EF2A01BB1D7EB7769C0E8751C05 = The March Of The Pinguins | V | 0x620560F61382124B649724394B2BF246 -0x449254CFCB82A83CC313E602D0A07E146AEC0474 = THE MARINE 3 HOMEFRONT (The Marine 3: Ho | V | 0xA1A0118CF5549B4F6F3DBB1ED81892A8 ; MKBv35/BD+/FindVUK 0.95 -0x9562514508BF72F89D4F28D779AE5D2FF0B2CF9B = The Martian | V | 0xDFAA1AAFDEEDB80056B1BC322BB6E127 ; MKBv56/BD+/BEE/VUKNOTVAL!/FindVUK 0.80 -0xD13FC82B536890C4874745DBD878A214C21205C8 = The Martian | V | 0x9378D5A1A7C8B68A522C90C0C00103C0 ; MKBv56/BD+/BEE/FindVUK 0.80 -0x9FC286A899848E7449EA99A0B02077080F288972 = The Martian | V | 0xD033C636F875D8FA2CFB0F33650A5BEA -0xD38EE670282AB879E1045A335082DBFE18B2BF04 = The Martian | V | 0x0ED7DC79459C42F4EE0FF10B20BFEEAA ; MKB v46 & BD+ CAN version -0x5C87FEB8F358FB324B086F1101DC370979EF2ECF = The Martian | V | 0xCDBE6E3211018A64C56056B5202CC2CF -0xF955D265353BBEE645983FE347FC45D84E35DC04 = The Martian (The Martian - Extended Edition Disc 2) | V | 0x69FE0E1723ADF63B14D1760F0AF4C2D5 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 0.96 -0x76320F7A49EDEE88EF7C218D8047C33B40232551 = The Martian (The Martian) | V | 0xAFB27D5A108D26D96BCB4FA34AF4CD3B ; MKBv56/BD+/BEE/FindVUK 0.94 -0x24A0136F13029E6F1118433F40ADBDEE07AA2BD0 = The Martian (The Martian) | V | 0x5705938F8F7AE864B7C62B775CEB5028 ; MKBv46/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0x9A7AA07F32ED6E8E8B4698947C3282277A0E7654 = The Martian (The Martian) | V | 0x8010B9195C724E27D76CD825B82697B3 ; MKBv56/BD+/BEE/VUKNOTVAL!/FindVUK 0.99 -0x0A5D0B884836A3138D2672C70F088F8ACA725178 = The Martian (The Martian) | V | 0x437364C269A44BE11A5556BC414673BC ; MKBv46/BD+/BEE/FindVUK 0.99 -0x8BD8777AE0CAA8BC56C0540399320CB51FBA8F60 = The Martian (The Martian) | V | 0x8A77877198FD8A21FE5602178619F203 ; MKBv46/BD+/BEE/VUKNOTVAL!/FindVUK 0.99 -0x78B298877783D6CC5CE29D9038E8D92BE10F6FFD = The Martian - Extended Edition (The Martian - Extended Edition) | V | 0x2CF2C6962D9063D973C0610E325B589E ; MKBv56/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0x50D51C2320F711E24C58ACBCFE4146244AAA15E3 = The Master - NOR_FIN (The Master) | V | 0x973E19EF6C2727864CF3BD1B6ECDCC71 ; MKBv38/FindVUK 1.00 -0x28F6EF0570147CF479EA50A9B36703FD513A4133 = THE MATRIX | V | 0xFCAD84D238255167FC18EB9BE5FBFB36 ; MKBv9/FindVUK 1.02 -0x86A26862921D8975FD6D209AE115801B4D90CB87 = The Matrix (PL) | V | 0x9D3D782BAE849E0825F2D5EE4075DCD5 -0xDA0BD347E99F244D567118D35107B1C8D1085199 = THE MATRIX REVOLUTIONS | V | 0xB7D89BF07EB0649138D505FF56792E5F ; MKBv9/FindVUK 0.96 -0xF56541866D8DDA0A4E33AF6375DC9B2C9ABCE63F = THE MATRIX REVOLUTIONS | V | 0x99887AFCEE52CD053966B1F3418CEAC8 ; MKBv9/FindVUK 0.96 -0x5174FCAF9D2A3DE9772CEB1F8BB7B192B9794A89 = THE MATRIX REVOLUTIONS | V | 0xD7DF974E713BB61FF69E04DE7C7CC1A8 ; MKBv9/FindVUK 1.00 -0x88CE0CCDAEB113F482B01B8E2C38CE03DD14AFC5 = THE MATRIX REVOLUTIONS | V | 0xDCA2672BDE673600A88E53D8204C861C ; MKBv9/FindVUK 0.92 -0xFE3D0AF616CF4920CC603E20128075361F504D33 = THE MATRIX REVOLUTIONS | V | 0x6D45003F423454598934D2CA9C56F743 -0x15515A0309D8CEA5F95FAB6CA219B98DA58DB030 = THE MATRIX REVOLUTIONS | V | 0xC7C1AE40D3444CA4A7AC8640EF2B4AF1 -0xD698ECB4D221E79A7E478D87F1535673DC08F348 = The Matrix Revolutions (UK) | V | 0xDF93D2FABDE99748510A21FE2E322E86 -0x49CFFF29DDBB921F07CF68E8493D5B41A3E06E55 = THE MERRY GENTLEMAN | V | 0x94E4D90ED28737A7E09AC878BDDF3F11 -0x5C9B5FD1D836A94D3685366BD1621EBB09D229B5 = The Messenger | V | 0x03F66C1BBED09E08C4FCB598EE30AA8C -0xCB4E970724C31DBAF7231C726107C59BD1A0641C = THE MEXICAN (ESP) | V | 0xEBA7BE821EEA2B739A13680B65BB29EB ; mkbv12 -0xA3F66B8B6854A323094A3CDE583FAB1A310F3B23 = The Midnight Meat Train | V | 0x7FAED49C7B2F35CE8DD4BE4CADCCD6D9 -0xC2B4533C7DD6AC8FA1EAF4FBE2355CD25FFD97A9 = THE MINOTAUR | V | 0xD4F289DE50011121C30C891EA59537C7 -0xB0541E9FFC418B4F449B29CF83AE0026A19BD943 = THE MIST | V | 0xB918D7BFA49CFB31507A0D1915E3C486 -0xDF4C9B47622E47EF3060263F7FBE805D89248FDC = The Mist (Disc 1) | V | 0xC040879B17FA2BD69B62CB8FE0494F15 -0xE9A101EC04FB9AF6EE41783F6BF6B1E6AA0E1500 = The Mist (DK) | V | 0x6E118E10C33EF56BD27CF82BFF964A92 -0xD608BD1B95FC39C24B2224E068A1EA53FE1F2DD5 = THE MONSTER SQUAD (The Monster Squad) | V | 0xCAD7823359505394C950371AB89D447C ; MKBv44/FindVUK 1.00 -0x1CCC2A7EF68C8EC2829496B4DAEF022679B26108 = The Monuments Men (Monuments Men, The - | V | 0x8C46629E061AF3686D69AD8286A5E99F ; MKBv46/FindVUK 0.96 -0xF6525DE24F35D237194182FB28595CD7C3A5750F = The Mummy (US) | V | 0x5FDDF7F0E4C6CDBE5D3E08CE6150D5EB -0xFA778D343F8D80BADBFBC1D26C7BCB29F350403A = THE NAKED ISLAND (THE NAKED ISLAND) | V | 0x54E150BBA156C088C02F5B4827CDF0F4 ; MKBv38/FindVUK 0.98 -0x500267031D95EE0B04EA26D2DA88100518A01BF7 = THE NEON DEMON | V | 0xF814AEA4B46D1915C5D0FF0EAA2E67A9 ; MKBv61/FindVUK 1.00 -0xE26EF1E87143CC8E162AA479B5D3AAC4125CC59A = The Next Karate Kid (Next Karate Kid, Th | V | 0x98FDD128D04599F6957BA88B573D692B ; MKBv47/FindVUK 1.02 -0x5771F0ADDB1D75360423AB3CA759E8A5BD8B770C = The Nice Guys (The Nice Guys) | V | 0x0964D06378D73E842CD91828662E9F3F ; MKBv62/FindVUK 1.00 -0x3D77BD1BD9FE9F4229B13CD011A91B6763A703C3 = THE NICE GUYS (The Nice Guys) | V | 0x82EB9DC412AB30D4AFD6872DA8671EC1 ; MKBv61/FindVUK 1.00 -0xDD9A43FF65F4589E92FC8F5637EA66E0E873033A = THE NIGHT OF THE DEVILS | V | 0xD3176B631F42D6AAD9D26B6CD33E3446 ; MKBrev 33 - FindVUK 0.54 -0x5CEDBBA1265CDF081FECF841BC1B313B95541E14 = The Nightmare Before Christmas | V | 0x1EAB4485384FB2E40161AF5F66DDFEF7 -0x64CB729CA3A76293F34FFDB5002849C212860923 = THE NUT JOB (The Nut Job - Blu-ray 3Dâ„¢ | V | 0x2564D3784BEFE6BF5D6B9C1E92F912C6 ; MKBv47/FindVUK 0.99 -0x2BC0DF7159240DB49A662A32251611F3BF64B6E7 = THE OTHER BOLEYN GIRL | V | 0x18BE6827C8DD2EEE896FFD3D9FA0137F ; mkbv9 -0x4F2D5A9112DF599A905A74930FCE538F722EBA91 = THE OTHER GUYS (UK) | V | 0xACA7A42592536C83F7E21132B74684F7 -0x6DFCA99FA8F12672C13AB251231687CA5609BC85 = The Other Woman (The Other Woman) | V | 0xCD5409A21EB4C862D01D32799C10377D ; MKBv46/BD+/BEE/VUKNOTVAL!/FindVUK 0.87 -0x2FB359D211F2F89DF0807F720D5820C387384D95 = The Pacific disc 2 | V | 0x57818D329ADA3BDB4A0310B153046CED ; mkbv19 -0x26BF45BFE5100AABEFB3855B1CD9303DD19DC0B3 = The Pacific disc 3 | V | 0x6F4BCFAB3D6AADE8DF9A87951372C82B ; mkbv19 -0x42B5D99F69EF7899E2FD368C4CE8256326E8F771 = The Pacific disc 4 | V | 0x69BA78DF9BC6BBC14D70D7D49307AFB2 ; mkbv19 -0xEDF6DEA9FB2FDDAA7DCA76A0F222DB5EB8B319E1 = The Pacific disc 5 | V | 0x4A3F06EA82DF20EF491CE3EFA742863E ; mkbv19 -0x70E8CBC4E4ACC5C2904AEFC08D8EE8D6F01F7D63 = The Painted Veil | V | 0xEFC279A0A1AE62E33EAD5A138C87818E -0x648B672CBB834DF7EEFBDE8AE2C2A341D9536760 = The Passion of the Christ | V | 0x9D02C4C63F3C7B1461D4A9DCEF2EA4EB -0x27AF047254F26C7B8A2CCDE35E44E7BADD85112C = THE PAST (The Past) | V | 0xAC699B5FEB8F84E8896A3F57E3254734 ; MKBv46/FindVUK 0.98 -0xCCE347841D97E6C24710EA9993BC92028EDF082E = The Patriot | V | 0xE25D96580F7743668AE0A8AA75121029 -0x20B9E25037FBD69AAFB82B8E6BD1DB26A5C7D364 = The Patriot (EUR) | V | 0x91EEA3E1C51281246203DB38832B9B50 -0xAEAC8035B6F262ECF53124EC1AF57515389CE556 = The Patriot Extended Cut | V | 0x4E38BEA4BD19098D4A0FEEF4889F08FA -0x8AD5274C0AA98E891D3BA35A247CD1DF84529D59 = THE PAWNBROKER (The Pawnbroker) | V | 0x1F78680E663428FEE939C669F225FD43 ; MKBv44/FindVUK 0.96 -0xDC56356595EB0AE3A77CD4F7686DB00CC5243858 = The Peanuts Movie (The Peanuts Movie) | V | 0xD33B28E8EA269110A68A2BDF97127755 ; MKBv56/BD+/BEE/FindVUK 1.00 -0xA3C40B20651DDACDAB9885AADD285CA87049DEE9 = The Peanuts Movie (The Peanuts Movie) | V | 0x3DE85B06F69C81404DA0BC3EFA4DC589 ; MKBv50/BD+/BEE/VUKNOTVAL!/FindVUK 1.00 -0xD78081DE53B8AB73D843314AFE1036676215ED58 = The Peanuts Movie 3D (Die Peanuts – Der | V | 0x05E17B60CE43ACFFA863848F894F6749 ; MKBv46/BD+/BEE/FindVUK 0.96 -0x65842CC80AD1A562D887BB2F0FF4CE97BA3BBEBE = THE PHANTOM OF THE OPERA | V | 0xF4DCEAADDE53804A0C278409DEA0E025 ; MKBv43/FindVUK 1.00 -0xE49DEFFE4AFC9BD5F55311DD6C31EAB68D552AEC = THE PHANTOM OF THE OPERA (The Phantom of | V | 0x8AAF5F140D5BA3B879DE3D23DA0A3455 ; MKBv57/FindVUK 1.00 -0xED404C90FEBEBFB49505A969594A65FE89652850 = THE PIANIST | V | 0xF393BAA75D7BB1AC52452FAF1FD12DA1 ; MKBv14/FindVUK 0.98 -0xA30249D4154B78F7B423D28668334F884ECE26EA = THE PIANIST | V | 0x1A78389B543680D83B32303AF99D2670 -0x385B3C896896117AB0578CD1BEF9C758050F46E6 = THE PIT AND THE PENDULUM (THE PIT AND TH | V | 0x4B0756AA69EED9851A97411AE39EBCDF ; MKBv46/FindVUK 1.00 -0x96FB79287021D83D886FD822F22A5253B5CF8278 = The Plague of Zombies (Plague of Zombies | V | 0x64A62B5795FDAEA9A1CD754C09E1A42D ; MKBv37/FindVUK 1.00 -0xBFD79AFD0D2B4C1E70057ECB7E495BCF39D5CBD3 = THE POLICE _ CERTIFIABLE | V | 0xB8D0F6793BD94C1F56F277EF827706AA -0x03D5E6219F69AEF4704AF90BF38B3BFA8AC134CC = THE POLICE _ CERTIFIABLE | V | 0xD3B36F755A0FBACAEA2A4C45B16FB8C8 -0x7A94525A7D72EF765CCE99537FC93EBE9FB94000 = THE POLICE _ CERTIFIABLE | V | 0x6638893E66FC909C29A52F403ACF9493 -0x2ABB862B90CA2161D9B5FB85665A35EAE8DC3997 = THE POLICE _ CERTIFIABLE (The Police: Ce | V | 0x336F52A176CF65C20B0FEBA9393B360A ; MKBv9/FindVUK 0.96 -0x88BCE27D5CDF492CE7E748338D81DFBB1967364D = The Pretender Live in London | V | 0x7E741D27BAC9D16E511AED6E9B143433 -0x799EF271D7EE1429CECFA926D09206B5E094DBF5 = THE PRIME OF MISS JEAN BRODIE (The Prime | V | 0xCC0F73C21AE6471D3DAC34DADB375155 ; MKBv47/FindVUK 0.92 -0xFFF967BDB5B4370536859A35773888CF2406E7F4 = THE PRINCE (The Prince - Only God Forgiv | V | 0x7DFC1DA9910D80C498315169440FF14E ; MKBv48/FindVUK 1.00 -0x76238747C00E6C05417AC328DFBB24371B08C5BD = The Princess Bride | V | 0x289FFCBB252C842E99CEF485EFFD224F -0xE315C58E1B5F69A4E6401660AE36305EF1BCA02C = The Proposal | V | 0x2C0AC08FA03A8859EFD053B0E7A21614 ; mkb v14 -0x0A89B24494163C7C49F8E31910C20F97D9D37732 = The Protector | V | 0xC9D8530FB93DD7C76E0AF3ED613031E9 -0x30941A43794BA5A0F41A890F262375383E59E2CB = The Purge | V | 0x8CEFB1631BE8F15BDFCA9C797B475DD2 -0x2D2820FE4B3D417F56902F27C536E7B1632358B3 = THE QUEEN | V | 0x9D56471BFB669DC46CCAB0F3C8AFA672 -0xCA8D7B1291D86883A7120CA5E582615B9468F214 = The Raid 2 (The Raid 2) | V | 0x7336F51CD5D9DF8B4B790926BC50700D ; MKBv46/FindVUK 1.00 -0x635471425EE1DED8E68C121FAC47DD0BA4DB31B0 = The Raid: Redemption | V | 0xC4AB07AFDBE0EFDC6199878E7DF241E4 ; MKBv33 2012-06-21 KRJ -0x5FE1BEE5779EDCEE675B979F9D2FC8E17621D02D = The Rain Killer | V | 0xB2B546B581849BDC5B38EBA173CC12F2 ; MKBv52/FindVUK 0.98 -0x9F496AB686146EE10705AF459354D1576282C6A6 = THE RAKES PROGRESS | V | 0x111FD8367BBCB76860C5F8D9EDCF5DE0 -0xCB62CFC117F35667FF4C902AEB51AE2C8F385B25 = THE RAVEN (THE RAVEN) | V | 0xAF5E77F5A4A53332AD536B861FC83AC5 ; MKBv49/FindVUK 1.00 -0x6D3806084BFAE6FE95675242557327E3C32D3B00 = The Reaping | V | 0x59E5D2523B73FD4FA9791C09290307DA -0xD575D0D69D8DB2E18D9E097D70C10629EB09A472 = THE RED BARON | V | 0x4B2FE7A6755693BC4D9C0A06D133D85D -0x2FFEB8594CA3AC4C68C4583562CC0236CB10636E = The Remains of the Day - Blu-ray™ | V | 0x57E450210B9FED30D5AF9D49407F7044 ; MKBv52/FindVUK 1.00 -0xEEE5B7DA1428FEEB0A6457D6CC8EC54AA8817524 = The Replacement Killers | V | 0x208D56FDE258AA198680E4D6BCD6AB29 -0xD3DD03734D13195CBFCCF0F38D104353CB291A74 = THE REPTILE (The Reptile) | V | 0x11B1B58850CE6E1CEBB5BF0E7724F556 ; MKBv37/FindVUK 1.00 -0x14C19FEE0A089E4FE902E233B6B2B552181EF08D = THE RESURRECTED (THE RESURRECTED) | V | 0x17637DD69B06F7654C8D14C95F6674B9 ; MKBv54/FindVUK 1.02 -0x547450364BB5D3741DD43ACA1B50FF753A982233 = The Return of Godzilla BD-1 | V | 0x7D7F287F97A4D16A2B123EDE5A06C450 ; MKBv61/FindVUK 1.00 -0x575D51C3E5E65125BB298B608533A818F634CD83 = The Return of the King (part one) | V | 0x78AEF4575CF1BB1AF3383A1AB0C89EC1 -0xF6118B882210DD2E4BAF3F9F4C3F3BFE285F988E = The Return of the King (part two) | V | 0xAA46CF03F4462E824ABE88D769A05C71 -0x08B24E8787C7AE985D212A9618EEC50FEF53A08A = The Return of the King Extended p1 | V | 0x3273D1E5A014EEBAC334ECC889989EF4 -0x13573FC3DB5B77961F6D7F9AB7893A0FA30D4381 = The Return of the King Extended p2 | V | 0x578F5940F21777F6248171F6C761972E -0x34DCB7AECB4B6935472FEA0C4617B6E18B35FED9 = THE RETURN OF THE LIVING DEAD | V | 0x5D1F40D67DB33AD8E70B7A09847D1DC0 ; MKBv28/FindVUK 1.00 -0x351091730E73331E829386E238167BC49E08D32B = The Revenant | V | 0xB1FA54AF7E32789522F1963D9C22FEFD ; mkbv56/bd+/bee -0x25B96D09044AC8F73B6B4203676E80FAAB313B6E = The Rite | V | 0xE094260C99AF8B3149C56F6AAF71D7F7 ; mkbv19 -0xFAD9426410D114340EE178A0E90E6FD35C4063B8 = The Road | V | 0xB12E1913375E2257C8F6603CE6B874E6 -0x490802524E7ACC923C8ADB805E24DEE4FB5C49DA = THE ROCK | V | 0xD48110D9D050704DE0454BD9B664D56D -0x2DB31984BE22F66D9572726D65D83AC85AC46FD1 = The Rock | V | 0x8B703266B2CBCA650CF545FC414A86A7 -0x3EB91D2E5654B6C08B16762A152A90C9B8843379 = THE ROCKER | V | 0xA78A1FE21DAF3FF2F35572741B66BE9A -0x8F798A13D8C175D47F555C846B257B39ACC59561 = THE RODDENBERRY VAULT DISC 1 (Star Trek | V | 0x3763ACCF90C8D1066D1BBFDA7BBBDD87 ; MKBv62/FindVUK 1.00 -0x64ECD06270BFB085A0EAA77E1A91A163F93ABB89 = THE RODDENBERRY VAULT DISC 2 (Star Trek | V | 0xD42422CD0AACCDA84745119A8FFF3E5A ; MKBv62/FindVUK 1.00 -0xBB6F155CDE4AB14836C3C12DDFBF26A67E0CB963 = THE RODDENBERRY VAULT DISC 3 (Star Trek | V | 0xF0FAD47B51C8598701CACB765A9CF5CB ; MKBv62/FindVUK 1.00 -0xAB1F4ACF06D72C85EF3360C1927F29005B0A2BEA = The Rookie | V | 0x2A9CEBF6ACF150D92AB7BFD3CC5C7939 -0x0AEF2466DB1B74419B0ABF00DA5E4098296CACC3 = The Rum Diary | V | 0xB8AFD8086E618F0F984B0CC3E1E3C49D ; mkbv28 -0xC56E9EFFE5A136ED1915A8E504A5AE54359E24C7 = The Runner | V | 0xEE1E42AA09BA8EBA9AD3C7FCF30CC1C7 ; mkbv56 -0xD8236A81B6DA32726CCC185CD11FFD04CC8C1A9E = THE SANDS OF IWO JIMA (The Sands of Iwo | V | 0xD5F4BD937C86822B36345E288D5303FA ; MKBv50/FindVUK 0.96 -0x41EFA4590C13F95E2DBB738E847EB04B496A3476 = The Searchers (EU) | V | 0x065C696B04BA204CA0B896352F3EDA94 -0x2C583597590FD153F8363BBFE1A8AC8BAE9234DA = The Searchers (US) | V | 0x3C783748F4CEEF22DF31CD68A85B88DF -0x28D813C79C1C4C62A0383AA271961312C54C23D5 = THE SECRET (THE SECRET) | V | 0xE0B01FF5E5A5AEF5C1652A588AEFC43A ; MKBv40/FindVUK 1.02 -0x0EB7106D292E3B0E10403E00501524AB6A468DB7 = THE SENTINEL | V | 0x618A99F976F52941C937EDC3723040A0 -0x9A02A704BBB554F16943E8CBDD3FCB9B72D6DFA2 = The Sentinel | V | 0xFBB444DEDD9D836003274F8E062323E1 -0xE64B5510B473FF4CAEDDAD5DAC4C8D675B4DEEB0 = THE SHADOW (The Shadow) | V | 0xE7B8C40427C1D746B664B33793D31F98 ; MKBv19/FindVUK 0.96 -0x2D2611CD3BB5FEFE1B99719639EBB075F951D33B = THE SHANNARA CHRONICLES D1 (THE SHANNARA | V | 0x7A26204A7202EC1D27694E98E43FD66F ; MKBv60/FindVUK 0.96 -0xACC5627F711C8915541A1D8E7DBAF9CED63B5B48 = THE SHANNARA CHRONICLES D2 (THE SHANNARA | V | 0x934571A7E1DDE7F9D7C1C71A076D8282 ; MKBv60/FindVUK 0.96 -0xA1FB66D0E1D516CE670AC746A4C8FB2776676A4B = The Shawshank Redemption | V | 0x903DC2E5375BD74634C762EB77EF218F -0xFA052F315A21FFB5B358F32D3F7C238871A64FA6 = The Shining (DK) | V | 0xD9430C0F038F268808D29F232B7673D4 -0x227AAD5291B12B5F5BE15A0894DBE4BEABEEBFDD = The Simpsons Movie (DK) | V | 0x6EBB742D7066276EE5AD92108026241B -0x178AC7885DF1ACDC2DA30D3AF88E2183AC984BCA = The Sixth Sense (US) | V | 0x05DC20F6A4A0309B3BCB7E852C76323E -0x452B2237EEFD054E90779B15B30A19B2C1D18CD4 = THE SKY CRAWLERS | V | 0x4337D8F48F5BE4875450FE17A193A010 -0xECA3F7E90A2992048B525B557843FE0B3BD49083 = THE SKY CRAWLERS | V | 0x19B2D2FF58A2DC2990CF2BFB08BFA7B2 ; MKBv17/FindVUK 0.81 -0xA8E9B5A48976CD03BA1A26076AD86FBEB16FAF5E = The Sky Crawlers (ESP) | V | 0xD556AEFAD35875B1AA2924848FBE02A0 ; mkbv9 -0x6D69106325EBA7A602BA94B8DD133A789709DE88 = THE SLAVE | V | 0x2F56C5917C97F04BE4E807302B9C1924 ; MKBv47/FindVUK 0.98 -0xE376D3156C9055205DFD75CD9E75591CE447FEC2 = The social network disc 2 (Netherlands/B | V | 0xE06F27C06E3CDC948EBDFAD4B675DEE5 -0x7D0F355A9A103B2749A2CAA1F6B31846CBB177D5 = The Social Network Soundtrack | V | 0xBBFE30E53AE5AAF98F35F1F7448E6982 -0xE31D3C9A447174C6E4B35472CE75BDEE486D6A9D = The Sopranos Bonus Disc | V | 0x07EFCF534CCC2BBA9ECF45DCCABEB65C ; mkbv47 -0xE883B8FA0053F8B416A25A1B5945C8B99DA7A8C2 = The Sopranos S1 D1 | V | 0xF34142AAFD19B39A18C46AD2653E19FC -0x0D660F100BC03F25BF343A64EE02614CFB1B64C5 = The Sopranos S1 D1 | V | 0xD7CA1166DA41E42AA906BECA6AC863A7 ; mkbv46 -0x1DFBD1A64E9662587B2122633CC2C92121A5302A = The Sopranos S1 D2 | V | 0x048BCD2B674B1689EFE1FC5CCB618DB0 -0x2818249E8FC80C8B215384B28AADDADCF830B5DD = The Sopranos S1 D2 | V | 0x804F722D681AEE298E1F9769F95CBCA0 ; mkbv46 -0x19584F4A88BD0CB811993C46BE361AEA70037DD1 = The Sopranos S1 D3 | V | 0x9A50EA6C6971400418550055E665EA6D -0x4A28AEBD421A5ED460C4B0EACFCFC570DF688A24 = The Sopranos S1 D3 | V | 0x531CFDF3F1590351726452279DB2185F ; mkbv46 -0x943C90518C13EC71DB4998F4651F1CBC41041E03 = The Sopranos S1 D4 | V | 0xD11DB3B5C69C6E3B785D2501B4B101C0 ; mkbv46 -0xF9343AC470C6701C58F47A48E720FD74C992101B = The Sopranos S1 D4 | V | 0x85D0FB58F498AEB053B8A9A0A1F34AD8 -0xCCC3DA73DF7E0715577515865742CC084E938443 = The Sopranos S1 D5 | V | 0xE4E8A31661B0728A78C98BBE5F606E85 -0xE3808AAF77E4291FD99959669AB02BBE7A7984FC = The Sopranos S2 D1 | V | 0x83C3E27A20A4C9D9D48AF9712B94565A ; mkbv47 -0xAC1D69BB76131C56C801EF6188861AF270F06BD0 = The Sopranos S2 D2 | V | 0x60CA3D517174CAF8F79A6ECC34E46D7C ; mkbv47 -0x1194AE9B8F24C5564AB025583CAC371DCA9F662B = The Sopranos S2 D3 | V | 0xD9752F5D0E5B27EE761FEB46523C583E ; mkbv47 -0xBCB478346D9D94D67A26FC0D7969EDBF5E2A453D = The Sopranos S2 D4 | V | 0x3649F50B45C8C077A42EC1FCD8AAA44F ; mkbv47 -0x07D1314AF59C2AF867A139490BF6C0B7D71F0AEF = The Sopranos S3 D1 | V | 0xC452393B4E636E988C74BD955C25163E ; mkbv46 -0x568191758C9E36F8B1FDE6F376FDB5BF7214AE51 = The Sopranos S3 D2 | V | 0xBD649F8BA681BD93DD80F5A44368405A ; mkbv46 -0x7DD6D464921CEBFD4FE529DA1C7D622BC3AD4D7F = The Sopranos S3 D3 | V | 0x4CF13B0CE84032F2841C2D0B85B15FBD ; mkbv46 -0xD128D54009088F5D4A72F9EF072EA92C7FBBFB32 = The Sopranos S3 D4 | V | 0x0B811B9248423B33AEC51B677D44608B ; mkbv46 -0x4E455AA896EED3A19C03EC6A302CB51D638AAA32 = The Sopranos S4 D1 | V | 0xD9D0B536DB3E6A8EE35C36FB1261EEF6 ; mkbv46 -0x301B645258FDEE167A10F14F38683F2E82673854 = The Sopranos S4 D2 | V | 0x55C91077E5514802440D0AC5044A9B1C ; mkbv46 -0xE8C1F39A6E006C09590BB0C77C4EDB025BC4C07D = The Sopranos S4 D3 | V | 0x341734249E880949828A09E5CFAF5357 ; mkbv46 -0xBD8FBA33A0DD3DC95A03BB3A474CAC334DF85054 = The Sopranos S4 D4 | V | 0x20775097FE2911D65A3FA64B116448C6 ; mkbv46 -0x574A5D4FACE6E45DAF3E31A51E6BB69BA3D184F5 = The Sopranos S5 D1 | V | 0x29C32D8477163FC6462B48E13BDF275A ; mkbv46 -0x0BDCE4707F94BBBA96A90CA651BBF88F3B129C86 = The Sopranos S5 D2 | V | 0x316E058E29A0F6E7153A566CA367469D ; mkbv46 -0xA91C08EFED1DB523EA582BA6E759549AAEF75BC7 = The Sopranos S5 D3 | V | 0x4285909D7561F6420E71896AEA1E3277 ; mkbv46 -0x4568406CCF85E183E57E68585F7D719F49F5BF3C = The Sopranos S5 D4 | V | 0xE02A7D49E3BBD53A7D8C55C2D25106BF ; mkbv46 -0xC0FED3B4FEC75F3B937589B75601D239DAB54EE3 = The Sopranos S6 Part 1 D1 | V | 0xF258E2FDD664B01717EC658F88A9074A ; mkbv46 -0x8E27C1F246B8CABDEF002CCC8B724BC2FE89185E = The Sopranos S6 Part 1 D2 | V | 0x787CE8FCB03A2A5648346D36153BD38E ; mkbv46 -0xB9401E17394947EA9E5C79DF9F991657FC6098FD = The Sopranos S6 Part 1 D3 | V | 0xB565E4BFB82A32F729FB1FF73CBA3FF0 ; mkbv46 -0x75EBCF6D97E40F22F5707ABCE106711350E31B2B = The Sopranos S6 Part 1 D4 | V | 0x06B78CDB9D89E95636EF05A3F5A0B338 ; mkbv46 -0x452C4C06DAE3E55515FA27E3686E5E176BBBCDCE = The Sopranos S6 Part 2 D1 | V | 0x9BB800B00833A91C6E5C731553518474 ; mkbv46 -0x99E0B6F1A3BF69A9F5372E038F005FD007702642 = The Sopranos S6 Part 2 D2 | V | 0xDBB5EC2906AF7DE6E08E32EBE794121A ; mkbv46 -0x1F0070D39AC5881CAFCF78CDB0C91BA3D384369A = The Sopranos S6 Part 2 D3 | V | 0x4FDFA85023F4652E5A0519C3175EF0FA ; mkbv47 -0xF10B12A5E9F3E0201676FAB7FC9730FE36DD78DF = The SopranosS1D4 | V | 0x818B391DA129801C61D8C642138335EA -0x32C76A3D177C193B0F69EFBEF43819E8D244E289 = THE SPECIALIST BLU-RAY | V | 0x14362F0C384417200CB00DF268D48658 -0x8D00E693E81E7BC0273030F7274AF10ECE9AD331 = The Spirit | V | 0x05F175924C97A97F9BE1696D68267D8D -0x2672E3D1D7C1C81497F1CDD51DAB458046DE1C95 = THE SPIRIT | V | 0x9D301279DB78CB3B68BCCDE75B89F30A -0xCC3DFD66D2477486BCEE7BAE2CD4897204B44F5B = The Spy Next Door | V | 0x8A1733C5415A1020EB1B6B77D7CCEA45 ; mkbv17 -0xF9298ACACD5423ACB710F2B34FA1EE607F39D6FD = The Story of O | V | 0xA7C4F1EDD8A411C71DA1CB8B1484C997 -0xF8539772431C5CCE0E2D23058974CDF4E52DD3DD = The Strangers (DK) | V | 0xE235F4B34D82EBF9497B4C9BFA6FA09B -0xB84F623BC6A9E631DCAA0747F5040462C6C22C19 = THE SWORD IN THE STONE (The Sword In The | V | 0xB31FB86D79900AAA09AC265640B2E763 ; MKBv39/FindVUK 1.02 -0x26FDB0F0D2B75AA9B455D4D667961D0448EF2EDF = THE SWORD IN THE STONE (The Sword In The | V | 0x78B2A41E82684F417582F09ACFCCC6E3 ; MKBv35/FindVUK 0.92 -0x8D1B5B0278FED3A83914F47FACA253894D5E1AB5 = THE TAKE (THE TAKE) | V | 0x4FE310857E312C2D6BACC8F48048BC9D ; MKBv61/FindVUK 1.00 -0x4F4D172E6E810BF714CE2BFF72EEF5EABF34373E = THE TAKING OF PELHAM 123 | V | 0x8BAFF9B3BB73407D62C6D6DDD816A834 -0xE45ADE60313DAA16145D18284F5D4DE7775F2596 = The Tale of Despereaux | V | 0x9D64B03818AF6BCD54F48B12480EF156 -0x995173DFE8224BBF79EDF90D88EA393B85960288 = THE TEN COMMANDMENTS | V | 0xF046A07A5DC8DE09B53FFF312270224D -0x3893A3E10472A44A8DAAFD761EB0E5750039E44E = The Thing | V | 0xCDFC0BAB1CE929F53039475964EA8D25 -0x0E1353362DC6B0711059144A726D0A4D349E2F7F = The Thing | V | 0xA48D99BB7680B66DC1299621ED8559DA -0xFB06DA2DBEB957BDEAE865233111B33F31B757E5 = The Third Man | V | 0x05BA58C87FF4F0871BDB7E5ED9332DFE -0xD8DE988BDD370B36F76BA3806E2C713AD8B8359B = The Three Musketeers | V | 0xD391EF26628061D5E21A6745B56C9659 ; mkbv25 -0xF7A6B2925B0D5637240D13CEBD1BC31C5618FD98 = THE TIME TRAVELERS WIFE | V | 0x528A297860BD6AFC342F5928ACDE3D0E -0x25FBC8B23AC8DD09D53962ADF1AC6554E495F836 = THE TOMB OF LIGEIA (THE TOMB OF LIGEIA) | V | 0xD00AAD2715D5E981E271772490F30B44 ; MKBv49/FindVUK 1.00 -0x31AAB78E6DAB3DD4B3EBCA54D4B166D42FDD9D32 = The Towering Inferno | V | 0x8EF2B5B228C3CAC406F3D0A89F7CB0F9 ; mkbv15 -0x92BAC203E4DE9CE866A0EE01C91E09638A8B8B1C = The Town | V | 0x7DCC0E84E349E23D143244E4F393259A -0xC80B1901EE03F1052F407BB7492F6D5EB85C1252 = The Toxic Avenger | V | 0xF489FF8191B7DCA47C54E41A63BF2A97 ; MKBv47/FindVUK 1.00 -0xE406315ACF773DBD46AE73874E0F3BADCE65EE22 = The Transporter 2 | V | 0x806E3A01DF67AF68196EDEFC887A3B50 -0xE9505ABADA93F8C8319AD540C9CE84F1F43885AA = THE TRIBE | V | 0x2BB0B4E84AE57BF8301220614CE99C3E -0x902ADF937F282174F14DC71C1F39BE258B3AE527 = The Troubled Life of Miss Kotour (The Tr | V | 0x840DF0D6E3AC732E47A0064DB791E206 ; MKBv53/FindVUK 0.99 -0xB68EDCAD2C92DAF607FAF451CBE6F69E255CCFC1 = The Troubled Life of Miss Kotour (The Tr | V | 0xCDDF7CF6A81F698DE70CEE5151E016D6 ; MKBv53/FindVUK 0.99 -0x329B42CCCFE7F1B37D3DF94F9EB36E84D339E108 = The Truman Show (US) | V | 0x81951DF3C3912E4EF0097EC791BDF6B6 -0xF633D2E6FAF515138275482E191EE51CF39625B5 = The Two Towers (part one) | V | 0xA9295A18B465AA7C356407E4B8C389AF -0x454E64B2A317DA3AE1DBC8CEC6D07EB0A35B18A8 = The Two Towers (part two) | V | 0x72166F60B5B1945FF88E9DA317C00E96 -0x2001E87C312CE0FF7E81FCAF57320D35DBFFE084 = The Two Towers Extended p1 | V | 0xADD189563524F8EED6F98280401E1F54 -0xCA8200B36AA53DE7281F4A78F99CBF7E4D0DF3BC = The Two Towers Extended p2 | V | 0x1E1FA467361B7D044625B9D549487F19 -0x012BC6FC8B61EE7A23C5712096BC8E43A81184BD = The Unkindness of Ravens | V | 0x4A2F463C6CAF3B11C2AD0E5DDDE235E2 ; MKBv58/FindVUK 0.83 -0xB15EBBD4CB6EBF3C22CB2C6501CDD4AEC4790A86 = The Untouchables | V | 0x44C595257E746EC2B59E3D3839AD1B99 -0x98BF461F3A263C9BCAEA15347C806EE21C9818BA = The Usual Suspects (US) | V | 0x8AECD978164A710CD2C7B5E020F45F93 -0xEEB8BA87BED615696048102202F38EED47E54B2E = THE VENTURE BROS VOL 3 | V | 0x49EB4EB4F395CD5C88B5CB400FE3DC4D -0x026FC77BAB2AC70375A11AEEF0762F886B75AB5B = The Verdict (The Verdict) | V | 0x2906C18FA8C5D9BF639BA61082DDE03F ; MKBv36/BD+/FindVUK 0.96 -0x05E67C34C0A384F0C58AA2551273766A4F3C4944 = the VISITOR | V | 0x7E892646CB5FBD438D35D7477EE01D2E -0x91CD660954B7C3940EB937C3F3B0721722922850 = THE VOICES | V | 0x2E790DACFE3B5E6CB8C1D7B9D70A1266 ; MKBv53/FindVUK 1.02 -0x6AFA00930ECAB87E3CA95297BC8249468EE05808 = The Voices (The Voices) | V | 0xD4F4269CEFAAE9BC09B38E8E474A9201 ; MKBv54/FindVUK 1.00 -0x7C7491FAC99FA6A7013CBCD1EEDA523B95A3EE9B = The Warrior's Way | V | 0xF57D47B412ED65A100A05D1A5D300E76 -0x6B912553212692A844664B999154FD88B9363E20 = The Watch | V | 0xAAF3F6C9CB557BDF49CA96DE7A0ADE72 ; mkbv27, bd+ -0xA2B6EEC444A2616FA8B6F5A40535D2D2220C052A = The Water Horse - Legend of the Deep | V | 0xEC4CECC875658096D2E17D3744FE3FDD -0x0A933EB9FCC9AA95E66EE81DC6DA5C570A6F959F = The Waterboy | V | 0xBA10F9F1AF9A128D8D8559C4E4209DD4 -0xC97849BECF947284D237F50898AA68BF63C70A52 = The Way Back | V | 0xF603E9CB362F950E9285BE7C2EB9F421 ; mkbv21 -0xEFDB2452A7D305D8CC791CFBA4D47C4763234E33 = The Wedding Ringer (Wedding Ringer, The | V | 0xFD1DFC709398E387BE5F566B49AF26E5 ; MKBv53/FindVUK 0.98 -0xB9CFECE29DE2B8951A633F6EB6E9124BC21AA24C = THE WHITE STRIPES | V | 0x1ACDE04A3B9775E5DE2E1287486D580B -0x430D9035DE76B44B8330B429A313D2FA4A958772 = The Who - The Kids Are Alright (The Kids | V | 0x8A848B8E617047594006489475BC68E2 ; MKBv16/FindVUK 0.96 -0xDE8547152F70420FC6444671F3C22EF44B1ECBE9 = The Wicker Man | V | 0x3A3A333D98CF73325CE0CF99089B41E8 -0x56375D520A1E80C17268CB680D3C14A059413044 = The Wild | V | 0x0AF689C0E3B91494CC07F53E6569D163 -0xC00324FB15A0591AF48AE89DAAC66E1B3EB53FBC = THE WIND RISES (The Wind Rises) | V | 0x770BFB684BE695A4465B572758B31CC7 ; MKBv47/FindVUK 0.96 -0xB50DF51CDC37BBAB5B6212B0F66A3EA74A38EF32 = The Wire S1 D1 | V | 0x54448E42554D167DBC64681508A25802 ; mkbv50 -0xC3868E590E3145A5DE47FF81BD23CC454949D4D3 = The Wire S1 D2 | V | 0xCBBF008D0D6CD452B43CFE76CF360235 ; mkbv50 -0xE6C39E46AA06053AE6907F1912D563D5BBD6F8FF = The Wire S1 D3 | V | 0x70AB7D3C00E7666678864A31625896E8 ; mkbv50 -0xDD60C0F5B460ED96DBD6BD41DF41F57EFABB0E99 = The Wire S1 D4 | V | 0xFFAFABA20921E3D21532830B2218F516 ; mkbv50 -0x239F143E25C70825E3250BE4B0F06B1B6A8FF446 = The Wire S2 D1 | V | 0x5A21EE62D85D952DE79F19C250005BF7 ; mkbv50 -0x57EBF8EBD690D5AA43AA64388D5608D0F077DACD = The Wire S2 D2 | V | 0x3A49154A37A3186B2A15F9087678F1E0 ; mkbv50 -0x822171F85D5B4BF92969A0633E0B9A49A13EC944 = The Wire S2 D3 | V | 0xF4580653C065DA09500C0CDCAC6A35C4 ; mkbv50 -0x2AEC4AF41A9935945D90DDDB176960EEA393118A = The Wire S2 D4 | V | 0x0F16F172BAD720F6D3E2A2CD9D1C3E62 ; mkbv50 -0xF19E48D0FCEC08FC53A8DE0E66503FE74F0973EF = The Wire S4 D1 | V | 0x29EFE7DD35BACC67F1A5B732DE4E2C82 ; mkbv50 -0x4C7D459179A52FBD1E4A0ADBCCD03A5FF61AB958 = The Wire S4 D2 | V | 0xFF5E46D4D2DF6C353ACA6916595642EB ; mkbv50 -0x6C27708A34195E705F48DCB3A5FBAAC8575F1C8E = The Wire S4 D3 | V | 0xD7DB3ED7F7FCB5EE34A09315F3C1BD51 ; mkbv50 -0xF18AC5F07AED8C2381B76DD62915F75800F9C49B = The Wire S4 D4 | V | 0xADAFDF9CC9A8525762E8536065E3FD93 ; mkbv50 -0xBBD27A43E911F7EA6BDB3EE6E19FE8BDE88283AD = The Wizard Of Oz | V | 0xB0E9A3AA8C349548F8A9D3B5B08FACE4 -0xFC362A507F58AFE54225CB23ECF565258D0E496C = The Wolf of Wall Street | V | 0xB98CF81639CB5984773648DFE581940B ; mkbv47 -0x1B2B94856F8BC6B369E04B1073A85A2CDD0E1404 = The Wolfman | V | 0xD011461A1AA04B5006FB0E79708726C8 -0x1D6CFA4FBDE550EF3C04C5E668CB4B9B070DDA83 = The World Is Not Enough | V | 0x5C3A133F34DC3EE914C6E6B99CCA00E7 -0x62F59BBBB44BBD826B1C4FF519D172DAB0FD4D73 = The World's End | V | 0x85172531F3EF8F5743D080EFA0539367 ; mkbv43 -0x3965D2E93134AA0BA1B614E0BC250583ACAAD5FC = The Wrestler | V | 0x6F1F43C9082F64F8902D708D39476665 ; MKBv12/FindVUK 1.00 -0xDDA4C24E2FADF89AAE18BBF4D84359D04267BB6E = The Wrestler | V | 0xB86FA63156E7F25E7CCC2C09B931E180 ; mkbv9 -0x2F4FA8AEF7A0A5DF2CF9A807E6C9F38921A42EA0 = The Wrestler | V | 0xC22E6C2DA2F37F70BF9D42B69BDD35A5 -0xC6489B97A60491A76AC8EC92F52C2F4DC68E312C = The Wrestler | V | 0xF356A294287B7AB51390A639ED858A68 -0x69D5064EA0FB8EE6293818CB8D5181013741053B = THE WRESTLER | V | 0xCA13E4BE33E632282A3B53E97D11A3F2 -0x06887C204A7F7C4DADDE64938ABFBC4127B3A9D2 = The X-Files Event Series (The X-Files Ev | V | 0x5B5098A7F74E8764DDE32CBCFAC3DED3 ; MKBv57/BD+/BEE/FindVUK 0.96 -0x2E7182505EB50C49B9C671B984437F00950208A2 = The X-Files Event Series (The X-Files Ev | V | 0xDAE0A9CC2DEF6E9E53E352FE29578E08 ; MKBv57/BD+/BEE/FindVUK 0.96 -0x7F6543B5DBFDE4B23C6C3FC4F22A5D6E042F89A4 = The X-Files, Season 1 Disc 1 (The X-File | V | 0x8449329B49C190EB82E2DDFF74F20424 ; MKBv50/BEE/FindVUK 0.96 -0x7D117477805EBA3CA9DC97026DEE6EA6C86E0D49 = The X-Files, Season 1 Disc 1 (The X-File | V | 0x891F5E0D6F903BAF23015D372C0F0E55 ; MKBv50/BEE/FindVUK 0.95 -0x25DA663F745905105EE11EA8DF2A9B5EB3A24984 = The X-Files, Season 1 Disc 1 (The X-Files, Season 1 Disc 1) | V | 0x1DAB514B5F7D81B6BF05DDF4A8FAC8C8 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.00 -0x6D7CA1A2D0A599DBB4C9AB74103C9044D8F3E498 = The X-Files, Season 1 Disc 2 (The X-File | V | 0x02DCC424E3523CFBD405FBBB444F10FC ; MKBv50/BEE/FindVUK 0.86.3 -0x236946216EFFECEF25985957DECC0D0E549D99A9 = The X-Files, Season 1 Disc 2 (The X-File | V | 0xB57CCCD5B1FE23C279B6E4329C6F33D6 ; MKBv50/BEE/FindVUK 0.96 -0x92A31D944F246426A6479127F874A6669212B72D = The X-Files, Season 1 Disc 2 (The X-Files, Season 1 Disc 2) | V | 0x779499BC557F3E5C57325E7227EADE18 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.00 -0x83C29414CC9BC0A89AEF498E849F044DF5E5603B = The X-Files, Season 1 Disc 3 (The X-File | V | 0xCB57525A948EC9186337FE632F648956 ; MKBv56/BEE/FindVUK 0.96 -0x364CCA69F3110BA0683BB75A3CC0FE4F7239FC2E = The X-Files, Season 1 Disc 3 (The X-File | V | 0xDBE4C208CD2FCCBF5F9DB15D87BFFAF9 ; MKBv56/BEE/FindVUK 0.86.3 -0x2B03B348F1573963392140A630B970060D587EB1 = The X-Files, Season 1 Disc 3 (The X-Files, Season 1 Disc 3) | V | 0x1B9392C848C630F493CE7293D13AE12C ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0xF071262A9588FBF738E44457719254F1FD2EA974 = The X-Files, Season 1 Disc 4 (The X-File | V | 0x5F770CC0B8B3515DB92D689686C32DC2 ; MKBv56/BEE/FindVUK 0.86.3 -0x5BC50C480F8EB972092F72404B96E8B09AD3FE69 = The X-Files, Season 1 Disc 4 (The X-File | V | 0xBF1873629FB3C15CB3041F8933DBBA3E ; MKBv56/BEE/FindVUK 0.96 -0x79F2AAF3F117C5AF9D43AADCEDB38A17D45F5D94 = The X-Files, Season 1 Disc 4 (The X-Files, Season 1 Disc 4) | V | 0x115CB3FD2285005EA5A895EBD8607C93 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0xBCDDC1B131742385852A038786CD3062234084F8 = The X-Files, Season 1 Disc 5 (The X-File | V | 0x31D1B78D3C06516B62FA6E2D1CF70EF8 ; MKBv50/BEE/FindVUK 0.86.3 -0x728F29C6D346A21047000861BBAC56285DFC14CE = The X-Files, Season 1 Disc 5 (The X-File | V | 0x1A7753AEEEA319FEFE0E5656DFA3F973 ; MKBv50/BEE/FindVUK 0.96 -0x0BE6153E8E9AD7B18C15B9573A1BCD7DD7968C68 = The X-Files, Season 1 Disc 5 (The X-Files, Season 1 Disc 5) | V | 0xD48645AE03BDD1773D2D0369222CA47E ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.00 -0x8F4F3A80320B0054A3591CC3897DFC781B6BA894 = The X-Files, Season 1 Disc 6 (The X-File | V | 0xFDCCA004D55B85D2A33D3F3485ED814A ; MKBv56/BEE/FindVUK 0.96 -0xC5BE0684EE135D866429986CDC803E119DBB4121 = The X-Files, Season 1 Disc 6 (The X-File | V | 0x8D7C7948FCE79EE3F6F6FE989609DA68 ; MKBv56/BEE/FindVUK 0.86.3 -0xDAFEA336091E2636AC425DC8CD1C2B077722FC83 = The X-Files, Season 1 Disc 6 (The X-Files, Season 1 Disc 6) | V | 0xA0B6BE31E32E21B505C1FD76D4208CF0 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0xF17CBD4053380977371947F6FBCA2A3A7BC259F0 = The X-Files, Season 10 Disc 1 (The X-Fil | V | 0xF87B128A1A0E9FD160F07480038C859E ; MKBv56/BD+/BEE/FindVUK 0.96 -0x1BF3C1FE83F20D9E362E8761F7333D362C1E6F2E = The X-Files, Season 10 Disc 1 (The X-Fil | V | 0xBF5EE710B2CB44532D53181C0399E9B5 ; MKBv56/BD+/BEE/FindVUK 0.96 -0x759B3E2436F4591EE71B1522C165F95182F9B6F4 = The X-Files, Season 2 Disc 1 (The X-File | V | 0xDB70B3D82DB919CBD3DA07F547D2EE6F ; MKBv50/BEE/FindVUK 0.96 -0x0BD90791CB9BB277BC9870958B645E21CC724E8B = The X-Files, Season 2 Disc 1 (The X-File | V | 0x2A5B663AA5DB15B9A0B123576A8A2397 ; MKBv50/BEE/FindVUK 0.86.3 -0x976313267441977D49ADB145FCE1C853528133B5 = The X-Files, Season 2 Disc 1 (The X-Files, Season 2 Disc 1) | V | 0x575FC47EF30396382642F329F409945A ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0xA5FFDFC7AE15AE267A5A50FA89AEB6F66C6E1D3F = The X-Files, Season 2 Disc 2 (The X-File | V | 0x806242FE9BD74B9AC6F2E3EA3AA17F11 ; MKBv56/BEE/FindVUK 0.96 -0x324B0F38B1E25BD92C7B3D8CE986B75C2A54FC6E = The X-Files, Season 2 Disc 2 (The X-File | V | 0xF5748061B3233330795CD829D9E6AAEA ; MKBv56/BEE/FindVUK 0.86.3 -0x871DFE3B6CC2149175157666EE8E586412AAA17E = The X-Files, Season 2 Disc 2 (The X-Files, Season 2 Disc 2) | V | 0x1680FB71E25B660252B84BB6D1EB6620 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0x8BA45A5732F2C3C113DF4ABBF197A8843E43F0CF = The X-Files, Season 2 Disc 3 (The X-File | V | 0xE0A5DCEAE3E28462405F6584D1FA9C43 ; MKBv50/BEE/FindVUK 0.96 -0xE730B8DB0588A99E5417D591D913142AAC2FF32B = The X-Files, Season 2 Disc 3 (The X-File | V | 0xE7D2843E1888E7BB1ABDACE634BE48F4 ; MKBv50/BEE/FindVUK 0.86.3 -0xDDEF230FCAA229482D80BC0E658349574A3E9E58 = The X-Files, Season 2 Disc 3 (The X-Files, Season 2 Disc 3) | V | 0x10356D53900DC12E719E7B26833D4931 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.00 -0x7320E1EC489584ECAAF55D307A7101630E5D8AB1 = The X-Files, Season 2 Disc 4 (The X-File | V | 0xF284F2D9D48601B700674AE0A3617A8A ; MKBv56/BEE/FindVUK 0.96 -0x705CBA061EF09B3DFE6A0D0078C4267820278EA7 = The X-Files, Season 2 Disc 4 (The X-File | V | 0xB6E7D5BAB5B22FD3BBF570C2D76CF50C ; MKBv56/BEE/FindVUK 0.86.3 -0x1C85C2C544B8F90B4DF9985E6569ACDC57EE2335 = The X-Files, Season 2 Disc 4 (The X-Files, Season 2 Disc 4) | V | 0x9B9F8BD0C2D0FC37823BA4DF978861C6 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0x5B72C37CE03AA3D74ECE6F28C1B7FF7DAE3CC400 = The X-Files, Season 2 Disc 5 (The X-File | V | 0xB6B345B456DC7CB5230BA2B37C80FB1D ; MKBv56/BEE/FindVUK 0.86.3 -0x889903F0E0EF4277A0BD30AC96EF1E84E9AE0D24 = The X-Files, Season 2 Disc 5 (The X-File | V | 0xF0762003FD32D86A3EA266AE13CFA7D3 ; MKBv56/BEE/FindVUK 0.96 -0x1BAB82CD480716CEC4E1BE522B0F97456A98B398 = The X-Files, Season 2 Disc 5 (The X-Files, Season 2 Disc 5) | V | 0x0367695F4C5875D2BEF8C72593E7D5DF ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0x0AF5EF7D5D3747765278AD433CC5C19408FBEEBE = The X-Files, Season 2 Disc 6 (The X-File | V | 0x21D13D89C5C00761273432A17515AA24 ; MKBv50/BEE/FindVUK 0.86.3 -0x8621BE2B766B5992F6028EEB97DC2346ADA56822 = The X-Files, Season 2 Disc 6 (The X-File | V | 0x0D39257260AFBBE0877D00F0F55F4EB3 ; MKBv50/BEE/FindVUK 0.96 -0xED71AA1DE3A3633A823448BA839B8C974A28B48D = The X-Files, Season 2 Disc 6 (The X-Files, Season 2 Disc 6) | V | 0x278221B42D25B947E52BFF87D2925E4E ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.00 -0x7E1099A7BD517D73540F188E559811BC1020BE36 = The X-Files, Season 2 Disc 7 (The X-File | V | 0xA3FBB7FD66469FFBC734DEB9A12F465F ; MKBv50/BEE/FindVUK 0.96 -0xEE6911E1DCFB11A90609D2AC25AF66D57FF12CDE = The X-Files, Season 2 Disc 7 (The X-File | V | 0x6B89F8EA35A7429FB7401C10CB591E84 ; MKBv50/BEE/FindVUK 0.86.3 -0xBD42C3578929EB1AE4B280C3BB33602DFEA9B702 = The X-Files, Season 2 Disc 7 (The X-Files, Season 2 Disc 7) | V | 0xBDA21C932E51DC50CC35D660F87635C9 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.00 -0xA2FBC43A5F634232E8D393B812C5D8A12C0C351B = The X-Files, Season 3 Disc 1 (The X-File | V | 0xF1D96726A30A9034DCF2FFE90BF36D67 ; MKBv46/BEE/FindVUK 0.96 -0x53BC2E817733183156FE665F38FF8835435387D6 = The X-Files, Season 3 Disc 1 (The X-File | V | 0xC58B6347F67C31BC6D4662DBEA7DDD6A ; MKBv46/BEE/FindVUK 0.86.3 -0xA3D947C71B7ADDDD3EE5F11AFA73195CBBE1D0C5 = The X-Files, Season 3 Disc 1 (The X-Files, Season 3 Disc 1) | V | 0x8B6C8860C299252413FCB64251FCA895 ; MKBv46/BEE/VUKNOTVAL!/FindVUK 1.00 -0x190F43898A143A995AAC79129094171161465A33 = The X-Files, Season 3 Disc 2 (The X-File | V | 0xEE354C8F2746FE248026958506604B4D ; MKBv46/BEE/FindVUK 0.96 -0xE8CBBFB538EFFDE3AC2FCDEDE247FFB1B19A48CF = The X-Files, Season 3 Disc 2 (The X-File | V | 0x84133D7752EA7C656BBCF7F9383BBF4C ; MKBv46/BEE/FindVUK 0.86.3 -0x44A163C20D7347C6E891B6B3FC64B2DB865253D4 = The X-Files, Season 3 Disc 2 (The X-Files, Season 3 Disc 2) | V | 0x74B7CDF9CAB394277BA7B0E358CD27FE ; MKBv46/BEE/VUKNOTVAL!/FindVUK 1.00 -0x27EE0ED3E536A70B9262321D97DA5008D260F21A = The X-Files, Season 3 Disc 3 (The X-File | V | 0xAD654A5ED5F2309141A8FE97850072E1 ; MKBv50/BEE/FindVUK 0.96 -0x3893E608A32D8E01FB4AF8535A3D216A9D78EADF = The X-Files, Season 3 Disc 3 (The X-File | V | 0xE3BFDB062CD12AF5C8B7646A61831659 ; MKBv50/BEE/FindVUK 0.86.3 -0xAAF01EA03AD1636CFA4188161C9802EA7B01849E = The X-Files, Season 3 Disc 3 (The X-Files, Season 3 Disc 3) | V | 0x31A1DAF7D0A8FF0C744F7EC9D550DCD8 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.00 -0xF3F2266418BEC0A89CCFA6DF4B059C2EB65A1579 = The X-Files, Season 3 Disc 4 (The X-File | V | 0x2B65903C54CEC619FE4A726A4B277361 ; MKBv56/BEE/FindVUK 0.86.3 -0xC6AED7AA464AA9E5D3E96065BB727EC258E42D5C = The X-Files, Season 3 Disc 4 (The X-File | V | 0x3322B84D96D738F335E12DE1C56D644C ; MKBv56/BEE/FindVUK 0.96 -0x21E470F97AD46750739684046A47394DC61CF224 = The X-Files, Season 3 Disc 4 (The X-Files, Season 3 Disc 4) | V | 0x2E31F321CB0323F41C809382CA4B1865 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0xFCE369182EB15B8355B203EEE75ACCF8AA1B6F50 = The X-Files, Season 3 Disc 5 (The X-File | V | 0xB7ECAF817527410533652FA2BCE33A0E ; MKBv56/BEE/FindVUK 0.86.3 -0xCBCBBEA35D86FD5FC255418F9DA671288345C1CC = The X-Files, Season 3 Disc 5 (The X-File | V | 0xAADCF9CA4C4A8FDE17184F4029B84E68 ; MKBv56/BEE/FindVUK 0.96 -0x4B09B9A3E006581E50CDAD33DB2397CEB308329F = The X-Files, Season 3 Disc 5 (The X-Files, Season 3 Disc 5) | V | 0xC5254EEB8B9FC571D0AD2F69934216B1 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0xDDC2A9770BEA6FD6015F443FA347F8A51DB66C16 = The X-Files, Season 3 Disc 6 (The X-File | V | 0x740C5F0E631C66C9FF99339EE3C9AE9A ; MKBv56/BEE/FindVUK 0.96 -0x9EBD93217246175845BCBD487AAC319631BFA51E = The X-Files, Season 3 Disc 6 (The X-File | V | 0x4EADC4954045021B16E0AD98B805F26E ; MKBv56/BEE/FindVUK 0.86.3 -0x1E9669B8FF5CCEA912522A908060667459D511D9 = The X-Files, Season 3 Disc 6 (The X-Files, Season 3 Disc 6) | V | 0xA4D312B4A4A12851267C4967C1E42743 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0x3383DB96C97A9F00AAFEA5D81E90F3750A9F8AB8 = The X-Files, Season 4 Disc 1 (The X-File | V | 0xE5A38364C48EC3868D1BA1C6013ADA2A ; MKBv56/BEE/FindVUK 0.86.3 -0x4D43EB59C667D695FD8325F019A8710D39824541 = The X-Files, Season 4 Disc 1 (The X-File | V | 0x0914BB14ABFA24140D7A3AD1772500BE ; MKBv56/BEE/FindVUK 0.96 -0x68BAB323EEBDCD214FA774FA675303B18CDA8C22 = The X-Files, Season 4 Disc 1 (The X-Files, Season 4 Disc 1) | V | 0x606337D26FF25D0F1CACB4A31E867883 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0xD815D93159D5E370A839577A9AC9ADE2C9722C42 = The X-Files, Season 4 Disc 2 (The X-File | V | 0x2ED7F525BB5F825219D68BC08C216847 ; MKBv56/BEE/FindVUK 0.86.3 -0x530F40AD4E8F5A7A993BE65691F9BAED7F69ED09 = The X-Files, Season 4 Disc 2 (The X-File | V | 0x38AC240A09E29B7A0E784E161D002EDE ; MKBv56/BEE/FindVUK 0.96 -0xCE17AA143A85B52CA0D2ED36AEF926FBF775E58D = The X-Files, Season 4 Disc 2 (The X-Files, Season 4 Disc 2) | V | 0x8FDF840D3A410532596D72BD0527E1A4 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0x1E1CCC9DD3BD1BE1CC9D0654799A0B1E55FC9AFD = The X-Files, Season 4 Disc 3 (The X-File | V | 0xB590DD79F0605C74D4E1CF77C8C06DA8 ; MKBv50/BEE/FindVUK 0.86.3 -0xEF18AE0F04CE396FEC5238E33321DF1AF15D2727 = The X-Files, Season 4 Disc 3 (The X-File | V | 0x32D31A210B9D4C7A89BFFCD9F5D4BA0A ; MKBv50/BEE/FindVUK 0.96 -0x7BF30B01E2A445BD4C237855C4F6F275F2A82448 = The X-Files, Season 4 Disc 3 (The X-Files, Season 4 Disc 3) | V | 0x8ED7BFA7AA0336AC7419F3683FE674B2 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.00 -0x590B1915571C86A2E4EA6D364CE16356D2C58186 = The X-Files, Season 4 Disc 4 (The X-File | V | 0xAE4541ED7DF042336F3FB22D8F6243F9 ; MKBv56/BEE/FindVUK 0.86.3 -0x732DD032FE4757FE7E2E40AFB8C94EF74295DC3F = The X-Files, Season 4 Disc 4 (The X-File | V | 0xBCE7107AF9E181B9B27F1F6BB6A1CA05 ; MKBv56/BEE/FindVUK 0.96 -0xF0DA9116FBF876BCCCF7681B5BBC6DA3E14B4421 = The X-Files, Season 4 Disc 4 (The X-Files, Season 4 Disc 4) | V | 0xC2297FC2850BBFD8BCA0A8758BE66907 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0xC5A70DC7EBFDF37B27389CDDBAEBCCDBA83EFDD1 = The X-Files, Season 4 Disc 5 (The X-File | V | 0x54B7B71180DAF7A1B6C4EBEAF637BF90 ; MKBv56/BEE/FindVUK 0.96 -0xE747350BCCB4E9716EAD13101735724CD4B0CA23 = The X-Files, Season 4 Disc 5 (The X-File | V | 0x6EA9E5CC5BB5EB6F08E00724BCEE7774 ; MKBv56/BEE/FindVUK 0.86.3 -0x7534984D665D87B1D63E547605A87B88BA83CDD7 = The X-Files, Season 4 Disc 5 (The X-Files, Season 4 Disc 5) | V | 0x16223F7980B428102F6695E71B97B9EA ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0x04EE5B7B4CA05AEDDB469143F88A681249C94AD7 = The X-Files, Season 4 Disc 6 (The X-File | V | 0xCE84FD89E6028DA88868A0115B369FBA ; MKBv56/BEE/FindVUK 0.86.3 -0xDF49E7109730C6C766C0964F2963CFF1F5065444 = The X-Files, Season 4 Disc 6 (The X-File | V | 0x17C481FF9F5C96B4BA6DECC64B53CE48 ; MKBv56/BEE/FindVUK 0.96 -0xB1DE9C9333166297F2DE37D324C138CC699E859E = The X-Files, Season 4 Disc 6 (The X-Files, Season 4 Disc 6) | V | 0xA0EB6E09EDDAAD08779CD7B24CE1F74B ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0x801C9FDDD0031C5D9653639AB9EC8E4B1037A3CB = The X-Files, Season 5 Disc 1 (The X-File | V | 0xF02C0C8E60D32D4ACF6477D0D967D0DB ; MKBv50/BEE/FindVUK 0.86.3 -0xB7DCC7771A3486E4643DD74398E43261C75B51A2 = The X-Files, Season 5 Disc 1 (The X-File | V | 0xA46F1F1B84002EBB1B12D32F5AA18B46 ; MKBv50/BEE/FindVUK 0.96 -0x4EDD527CE5B2453FB38192A653E0F046DC0BCCAF = The X-Files, Season 5 Disc 1 (The X-Files, Season 5 Disc 1) | V | 0xB4ECFCC71A44881885C4E16881B430A2 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0xC6F7A81228927CA3EA4CE5BF1B93BFF038A6677A = The X-Files, Season 5 Disc 2 (The X-File | V | 0x286AF12DF6931CD244097C8E5775D8FE ; MKBv56/BEE/FindVUK 0.86.3 -0x10C747753FF319A068A5A0EFE6FD730E3D93E5D5 = The X-Files, Season 5 Disc 2 (The X-File | V | 0xFD98C36744922DE301F9F378222ED647 ; MKBv56/BEE/FindVUK 0.96 -0xBBC7227B7C65822FB12CD2CED425F71D258EE6CF = The X-Files, Season 5 Disc 2 (The X-Files, Season 5 Disc 2) | V | 0xC3C6378F7FED9CAA8AF0CEC338DFE137 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0x41A5E13D28EDD5B8F748B8BE59ED6FA7279C786E = The X-Files, Season 5 Disc 3 (The X-File | V | 0xE441D47A1DA6C38ACA8640375B1B1B7F ; MKBv50/BEE/FindVUK 0.86.3 -0x7DB420FA604957F52CFE156A4D7028122DCF0F42 = The X-Files, Season 5 Disc 3 (The X-File | V | 0xABD42E519AB1C14D576DF2E2AD399E64 ; MKBv50/BEE/FindVUK 0.96 -0x2BA8EB8427FA82DE2632408A2132B1D3C06B1057 = The X-Files, Season 5 Disc 3 (The X-Files, Season 5 Disc 3) | V | 0x4F10B8F0B22999B3F49D06B7510295F0 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.00 -0x86AEA10A5E5B814553218EF22350268ADF00D811 = The X-Files, Season 5 Disc 4 (The X-File | V | 0x7944634319F2B81B932FF2E8DFCB21A3 ; MKBv56/BEE/FindVUK 0.96 -0x32A3CE5B344F7F11CCA1D26124E3210167A7B5D9 = The X-Files, Season 5 Disc 4 (The X-File | V | 0x00F29EEE0B9F745E7E5214A092656772 ; MKBv56/BEE/FindVUK 0.86.3 -0x8EABC90FD0343C156AE43243590E51A6F35A4600 = The X-Files, Season 5 Disc 4 (The X-Files, Season 5 Disc 4) | V | 0x52A23BB0FDCF1D42B4B575A1A1B12D19 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0x2445EB04553301C963DA35005554899873FE78F8 = The X-Files, Season 5 Disc 5 (The X-File | V | 0xC99916134476D21772514AE2C457F409 ; MKBv50/BEE/FindVUK 0.96 -0x0DEF1536C725440B572D80D062C8D9E56765A198 = The X-Files, Season 5 Disc 5 (The X-File | V | 0xBE7AE97CA1BE820E1608BD97DAE9566E ; MKBv50/BEE/FindVUK 0.86.3 -0xFE101D2352BF86BC0043ACA069A9250CAF6F3099 = The X-Files, Season 5 Disc 5 (The X-Files, Season 5 Disc 5) | V | 0x9D96FD479065E6001DDC6976F6CB6461 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.00 -0x8CF58ED4C84D80A124E192ED5027065BE22069D1 = The X-Files, Season 5 Disc 6 (The X-File | V | 0x8D399EABAB7867C41EAB52411C57F450 ; MKBv50/BEE/FindVUK 0.86.3 -0x5D21D51B236224227E58B8E081F89D1C43B8964F = The X-Files, Season 5 Disc 6 (The X-File | V | 0xE5F1EC63A9645302624DECA9E6B2DD82 ; MKBv50/BEE/FindVUK 0.96 -0xF6EE55C83DDE2D3978D7EE3A2C7186944F4180BF = The X-Files, Season 5 Disc 6 (The X-Files, Season 5 Disc 6) | V | 0x7A26C37DDD7CA87A7D44BD0565EE787B ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.00 -0x217CF5BA2E5A98FB4940F934B26B5656AB3F6D01 = The X-Files, Season 6 Disc 1 (The X-File | V | 0xFD36BD7A30F8383D39676C6E8FBC8C50 ; MKBv56/BEE/FindVUK 0.86.3 -0x948B97F75E94E491A89A0AD42FC50D5FA7640B91 = The X-Files, Season 6 Disc 1 (The X-File | V | 0xF9B9E7370CA5D0778FA6FD5183944688 ; MKBv56/BEE/FindVUK 0.96 -0xB9264F555B9B5B7D665CAFDCA2881177D26F53EC = The X-Files, Season 6 Disc 1 (The X-Files, Season 6 Disc 1) | V | 0x66E383835AFBEA7D8245830EC61C7635 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.00 -0x9D8406A57F5C026596DC0AC1D03889DEC8141F90 = The X-Files, Season 6 Disc 2 (The X-File | V | 0xEEDA3C4E8B84A025F45F8B4C16F5C0E4 ; MKBv50/BEE/FindVUK 0.96 -0xB75D9EB7306E8817986D81852989C04C8A216A5A = The X-Files, Season 6 Disc 2 (The X-File | V | 0x160BBC40C0178307A83CDBCB3C1111FB ; MKBv50/BEE/FindVUK 0.86.3 -0x90598FE51DC7741D2D5BC73BEED5DA33E4DD9A58 = The X-Files, Season 6 Disc 2 (The X-Files, Season 6 Disc 2) | V | 0xC2015E5E7F90B5650F069FF085BBB821 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.00 -0xCAA8DE5F2BB2C495E9665A34AFF3DAB31F808AE7 = The X-Files, Season 6 Disc 3 (The X-File | V | 0xFE8528537C8BB88EDC5FEFC198F0D68A ; MKBv56/BEE/FindVUK 0.86.3 -0xAC142E7836AB7CA5587FF7F30D479463E60CCCCC = The X-Files, Season 6 Disc 3 (The X-File | V | 0xE4ECBBD87A6920052A0126EDB9511076 ; MKBv56/BEE/FindVUK 0.96 -0xC3EDF793A7211964C528DD3ECAC8D0AA540F1954 = The X-Files, Season 6 Disc 3 (The X-Files, Season 6 Disc 3) | V | 0xBE05DAB7F58CF4951AB02187048E1B61 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0xD507323F2C5B0E49418C9D4D7E55F5A8E7319C86 = The X-Files, Season 6 Disc 4 (The X-File | V | 0x2155657CB8C3EC85C990817642889F74 ; MKBv50/BEE/FindVUK 0.96 -0xBF73F077D45996EBC81CE9A6E10D2F2F6D5B4403 = The X-Files, Season 6 Disc 4 (The X-File | V | 0xD4CD4399AD4ED649195906A73EE55DCA ; MKBv50/BEE/FindVUK 0.86.3 -0x050235DA2EAE13625E747095DA3F371114E6F934 = The X-Files, Season 6 Disc 4 (The X-Files, Season 6 Disc 4) | V | 0x9865AB6AFE8F4C980E04EF8D72DDCC2B ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.00 -0xB810139A31D70D1482BF5FDB167082005B5FA09B = The X-Files, Season 6 Disc 5 (The X-File | V | 0xDCBB0E39CB2A8ED6D022628ECCE1369F ; MKBv56/BEE/FindVUK 0.96 -0x990381969DD1A095D7C355B2040F287CBF64AA54 = The X-Files, Season 6 Disc 5 (The X-File | V | 0x68FDD3F5AA2ADE859FEBEFA09F197648 ; MKBv56/BEE/FindVUK 0.86.3 -0xEE3F462266188FB733814423F1FF6849398B9E4A = The X-Files, Season 6 Disc 5 (The X-Files, Season 6 Disc 5) | V | 0xB5DC78DA7BB941D060FB59AC8C5E65C5 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0x5EAE0CF182F21F5AE4DA5CBF2887B6F29E0BC3F6 = The X-Files, Season 6 Disc 6 (The X-File | V | 0xD726C3BA1C8A1BBF5B3956CD6F284143 ; MKBv56/BEE/FindVUK 0.96 -0x7CE67E6D347D2410A0D337C00A3F231FB7A3FA14 = The X-Files, Season 6 Disc 6 (The X-File | V | 0xE22D98E32F99991FDA181C19112CE271 ; MKBv56/BEE/FindVUK 0.86.3 -0x5AFE5DC002CE6D7A6711062259BDAFB5A94F2CD7 = The X-Files, Season 6 Disc 6 (The X-Files, Season 6 Disc 6) | V | 0x1E9E55BF0FB4208D6C1C17AADD53EBF5 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 1.00 -0xA3448E0C6917EEE14ACE18446A2EF277BDF51BA4 = The X-Files, Season 7 Disc 1 (The X-File | V | 0x606910F2500725FC34BDC22B9D934212 ; MKBv56/BEE/FindVUK 0.96 -0x42B47C295AEE9146D54CA29E28A628F34CACA91F = The X-Files, Season 7 Disc 1 (The X-File | V | 0xEE8A10AE4413AE6F310E28BA941D2E14 ; MKBv56/BEE/FindVUK 0.86.3 -0x01A67121D83961CF3F02DD63162101EF8FC39606 = The X-Files, Season 7 Disc 2 (The X-File | V | 0x11A718120C397C68BB62C600D779181A ; MKBv50/BEE/FindVUK 0.96 -0xB62F4CD1EC56E76F80931758ABD723D13F21F3D8 = The X-Files, Season 7 Disc 2 (The X-File | V | 0x5D93E9E1DB7ECB738AFD3B0CE9EA0E2B ; MKBv50/BEE/FindVUK 0.86.3 -0xD705F41BAAE1B8F3230393262C7B6576D49EA5A9 = The X-Files, Season 7 Disc 3 (The X-File | V | 0x1DB6C99C9A5B042276469EE481D11AB0 ; MKBv56/BEE/FindVUK 0.96 -0x67AB3B4CC16AD4BADF8F9D55C08C26B2613D0593 = The X-Files, Season 7 Disc 3 (The X-File | V | 0x7705674E2426F5ACC29F2E9612BEAF3F ; MKBv56/BEE/FindVUK 0.86.3 -0x54CFDBE5F0A7F105255FE0202BBA05E9FD32C9AF = The X-Files, Season 7 Disc 4 (The X-File | V | 0xE7F298FF6FE7E66F2DDA42D73DA6823B ; MKBv50/BEE/FindVUK 0.86.3 -0x5311716B85D994084818C49229F9E4F84A5A8F2E = The X-Files, Season 7 Disc 4 (The X-File | V | 0xDD95FF129C0CF3DA16F6C0D10B6B8470 ; MKBv50/BEE/FindVUK 0.96 -0xF9A2AD58730FC52793D9B99E0513B9355E4462F5 = The X-Files, Season 7 Disc 5 (The X-File | V | 0x4FB1B87FADB20704271091F9044997EC ; MKBv56/BEE/FindVUK 0.86.3 -0xB26605DC1B2037AAA90A75BC0CE64864C6418098 = The X-Files, Season 7 Disc 5 (The X-File | V | 0x676F17527F03479746A91398922B3126 ; MKBv56/BEE/FindVUK 0.96 -0xBFD13538B9B0EED743467FD92551755A92E11D61 = The X-Files, Season 7 Disc 6 (The X-File | V | 0x7986DA393269E818CA15E34054ACDFEF ; MKBv56/BEE/FindVUK 0.96 -0xE22CE7C29EF1F7762BB9F48A0DE4CF498CFFF762 = The X-Files, Season 7 Disc 6 (The X-File | V | 0xEF21C10E837011F55B3B1C838AC5637D ; MKBv56/BEE/FindVUK 0.86.3 -0x1A96C2272819E58B841A704738BCB5476DE4538D = The X-Files, Season 8 Disc 1 | V | 0x94252EE5FEA30C0E2DA5897BB24F8555 ; MKBv46/BEE/VUKNOTVAL!/FindVUK 0.80 -0x532DB9F8E3C741AC99EBD9302F7A9464C3EFA7F0 = The X-Files, Season 8 Disc 1 (The X-File | V | 0x4F7694A178139E5D111F27A4C6F7CBCC ; MKBv56/BEE/FindVUK 0.86.3 -0x919E77ABEE23052CE301D2398EF237CD8F669E1A = The X-Files, Season 8 Disc 1 (The X-File | V | 0x83F73CCF494943EBDA540E5417308CB1 ; MKBv56/BEE/FindVUK 0.86.3 -0x3C65BCB2F3FC46A595FCAB9EAC2170D34677F99C = The X-Files, Season 8 Disc 1 (The X-File | V | 0x26C2784D1106B665E05B3145660247FD ; MKBv46/BEE/FindVUK 0.96 -0xCE8DAAF70B13B26CA34BA5C7D6BFDAB1F9272ACF = The X-Files, Season 8 Disc 2 (The X-File | V | 0x12779EBDA9C93A796938EE1458D328DF ; MKBv50/BEE/FindVUK 0.86.3 -0x96DA0C44C78CCE47690F8A9E3DF1A244E300ECFA = The X-Files, Season 8 Disc 2 (The X-File | V | 0x6B80DE7164B74D61C9A6A754CA4CE058 ; MKBv50/BEE/FindVUK 0.86.3 -0x265FA2093D16050FFE98517DF938DA3B8B996941 = The X-Files, Season 8 Disc 2 (The X-File | V | 0x8443DB571A193EF96B12201B5D9A84A2 ; MKBv50/BEE/FindVUK 0.86.3 -0x19D00ACCBA595CAB7C8762F7DDC2A7EECEF29CAA = The X-Files, Season 8 Disc 2 (The X-File | V | 0x906693B28C48CBEAC0A7A952A3BDDE69 ; MKBv50/BEE/FindVUK 0.96 -0xCFC99AEB1D9A004C648BC491A977F6AC6633E28A = The X-Files, Season 8 Disc 3 | V | 0x2E9FA3E1AB23C0A5BBC6307648659ED2 ; MKBv46/BEE/VUKNOTVAL!/FindVUK 0.80 -0xD73568A6DF36C944257577172D91FD1B4164B5ED = The X-Files, Season 8 Disc 3 (The X-File | V | 0x98A9C1585609A12BDE22054882223E6C ; MKBv56/BEE/FindVUK 0.86.3 -0x33DD7C23196EEAD60B36D66275AEC0E93330AAE8 = The X-Files, Season 8 Disc 3 (The X-File | V | 0xB8F58563C7391B0F61A9D18C880C261B ; MKBv56/BEE/FindVUK 0.86.3 -0x919C57CA901FCAE06210A2473968C91E9033043A = The X-Files, Season 8 Disc 3 (The X-File | V | 0x57C948A49098E0C7572F8FF0A162243C ; MKBv46/BEE/FindVUK 0.96 -0xC68F3933157BC2CE32F5EB97BE18EC5D66160C4B = The X-Files, Season 8 Disc 4 (The X-File | V | 0x85109576D826052432DA0C4BAB4CFE0D ; MKBv46/BEE/FindVUK 0.96 -0xEDAA96CB8274A300A5D63A4C19522739B245453E = The X-Files, Season 8 Disc 4 (The X-File | V | 0x692535A67DE91AA873AB1E8F4C9F5A58 ; MKBv50/BEE/FindVUK 0.86.3 -0xC42BA78CFC6247D47BAC8313FE219F993A628819 = The X-Files, Season 8 Disc 4 (The X-File | V | 0x705FC94519020907120E237D6CF1F769 ; MKBv50/BEE/FindVUK 0.86.3 -0x998195040109813CBD6659A648E0E63888E25D52 = The X-Files, Season 8 Disc 4 (The X-File | V | 0xEA96168260773463D07DE32AC3E969D9 ; MKBv46/BEE/FindVUK 0.86.3 -0x8674346F8DDF99842C50771A634A8D7D6D26352B = The X-Files, Season 8 Disc 5 (The X-File | V | 0xB0F48493D4E1F9103C97EC97B58EA92C ; MKBv56/BEE/FindVUK 0.86.3 -0x530FE4C6E117D296349C2B8711C4E7227102D75B = The X-Files, Season 8 Disc 5 (The X-File | V | 0x83CEEBEED43CD28DAAA264DD95EB9A61 ; MKBv46/BEE/FindVUK 0.86.3 -0xFCC0C38B24A9E94E5F4445FB5F4CA25CD56E59D9 = The X-Files, Season 8 Disc 5 (The X-File | V | 0x134151D68567D248156FC0168C741785 ; MKBv46/BEE/FindVUK 0.86.3 -0xD4282347AE1AEF289D74BD326663087B8D6B4A20 = The X-Files, Season 8 Disc 5 (The X-File | V | 0x09B60C836995535A0247C45A59C7576D ; MKBv56/BEE/FindVUK 0.96 -0x49ABEB52BA61CA8E021A8FA7170C87A907132545 = The X-Files, Season 8 Disc 6 (The X-File | V | 0x61B197C412A945955125685FC99C4552 ; MKBv56/BEE/FindVUK 0.86.3 -0xFF5FC6348F85365D9C759CBA1568D4FF4FA8C46F = The X-Files, Season 8 Disc 6 (The X-File | V | 0xA9FF1A535893822806EC6DB3906B2AC5 ; MKBv56/BEE/FindVUK 0.86.3 -0x87BB049051118B107D1A2AAF886F2C99E93ACEBB = The X-Files, Season 8 Disc 6 (The X-File | V | 0x6C08D51A232924A0E34FC337816CC55D ; MKBv50/BEE/FindVUK 0.96 -0x62AA17CF401E079727B2EF00460B49AEB3298730 = The X-Files, Season 8 Disc 6 (The X-File | V | 0xDFE3C24C0DDE353EB6545AFBE48F1066 ; MKBv50/BEE/FindVUK 0.86.3 -0x06C0C43C95701EC6178B54244AAC6DCCED7EEB6E = The X-Files, Season 9 Disc 1 (The X-File | V | 0x0FCF2459B0A55FFC5EEA925AAB74A375 ; MKBv46/BEE/FindVUK 0.86.3 -0xE2AC4BB1D6609FE6CCBE1AD6A00133857EE8CEE0 = The X-Files, Season 9 Disc 1 (The X-File | V | 0x482CE8A9B0A4CE9F16055A78B4D96132 ; MKBv46/BEE/FindVUK 0.96 -0x16F99302F8D5DA958F6D345F8501D1D5B801AB6A = The X-Files, Season 9 Disc 2 (The X-File | V | 0xC68EB06B331BB2308F9BF9DC2181B396 ; MKBv50/BEE/FindVUK 0.96 -0x78766D276362A8F993BB8B8D218132641F23E4C0 = The X-Files, Season 9 Disc 2 (The X-File | V | 0x3479C1C100FE160A1663C847BDC581B2 ; MKBv50/BEE/FindVUK 0.86.3 -0x0FAEF81EEC73659F6173D57E300622275A1717E2 = The X-Files, Season 9 Disc 3 (The X-File | V | 0x78ED7F2305170E226A39C950CD1E3C0D ; MKBv50/BEE/FindVUK 0.96 -0x1BC8A7CCC7B267BC72DB8642C530E39EA28AB152 = The X-Files, Season 9 Disc 3 (The X-File | V | 0x71E3D386A00D50C77EC1641C33DB8AE4 ; MKBv50/BEE/FindVUK 0.86.3 -0x49F6C35869B04E17DA0ACE856D16AA8C79C5BC96 = The X-Files, Season 9 Disc 4 (The X-File | V | 0x89F42711A4FBF4C7D4F8BD3C6DAAEEFE ; MKBv56/BEE/FindVUK 0.86.3 -0x3589292F7836A2A486B63E6A3A419E08C0D922B8 = The X-Files, Season 9 Disc 4 (The X-File | V | 0x28DBF5244CC6A277E92287FAEF9E1D90 ; MKBv56/BEE/FindVUK 0.96 -0x827B5B5172A073E191601D0E9BC74D68FB7482BC = The X-Files, Season 9 Disc 5 (The X-File | V | 0x484D41F2DCB3A1E5E2E103508E7878FC ; MKBv56/BEE/FindVUK 0.96 -0x5B784E2442DEA8E8964B676639987E2D7B26E9BA = The X-Files, Season 9 Disc 5 (The X-File | V | 0x1F08BAAE43698E6B52AAAA3195AB0D1E ; MKBv56/BEE/FindVUK 0.86.3 -0x436257947C94D306FAC596F2CC249C88E74425BC = The X-Files, Season 9 Disc 6 (The X-File | V | 0xCB76EAE0E606DB1D8CAFD07333329623 ; MKBv46/BEE/FindVUK 0.96 -0xB0ADDD8BC6CC03D7C90A77EC19BA36A386225D5C = The X-Files, Season 9 Disc 6 (The X-File | V | 0x5DFCA8035F40FE81EB487B5A2C2FAEC7 ; MKBv46/BEE/FindVUK 0.86.3 -0xCFCEF0207F1F8A7382B754F958F8D0069D5C90A5 = The Young Victoria | V | 0x9539A0F373AE5A0C1A3431495143F450 -0xCEFA23EDF229D31620DE111B16148399EBCA7112 = THE ZERO THEOREM (THE ZERO THEOREM) | V | 0xEA6F12FA076C640EED292E09C7F35041 ; MKBv52/FindVUK 1.02 -0x23980F0CF357B3111689118BC3ECE0061E9F5B1A = THE ZOMBIE DIARIES | V | 0x764EDC69F905901BADF927ECF6B33C93 -0xC4A45E895BAE30B6EC29BDDA104ED9BFE3B06ABE = TheBigOBD-4 | V | 0xB325A586B07A3DDB211A21E28DAE9B41 ; MKBv62/FindVUK 0.98 -0x2C1DC6BD615BD4EF2BDC53FE0907EA9C37826326 = THEDOORS | V | 0x7EB933448AE7BA4F23A3AEE4A4FA7BBE -0xE781690EE29400F8DA6C36C599DF271CD80BD5E0 = TheEnigmaOfKasparHauser (THE ENIGMA OF K | V | 0x1AB4C64781E94E84FD6FF5613FC08D9D ; MKBv47/FindVUK 0.99 -0x0AD9160E0CE2457316D7835C51085451730C2FB2 = THEGREATRAID | V | 0x5DAD664ADE34D82F2A847D3DFA3AA3D9 -0x9D124A70CA958BD103263C2607F789804A71870F = TheGrey_DOM (The Grey) | V | 0xD992116F99976D556E28235A8E106913 ; MKBv27/FindVUK 0.96 -0x9F4BC99483EB58CB6999A4370A947B12F8FDDB45 = THEINSIDER (The Insider - Blu-rayâ„¢) | V | 0x5A9CAC8BC9CAD937F6CCC3DAA562866D ; MKBv28/FindVUK 1.02 -0x3AFA6ED060F513B3161CE74108EDD4B34EA2B235 = THELIONKING3D (The Lion King Diamond Edi | V | 0xBFEA75CF95C7F9A7356B246BBA98E07E ; MKBv20/FindVUK 0.90 -0x0A6AE3F96DFECDCC75EC74CD0A0FAE6004E68411 = THELMA_AND_LOUISE (Thelma and Louise) | V | 0xE5E8B56268D187B289B3AE0B793A0CDB ; MKBv19/BD+/FindVUK 1.00 -0x1CE14E8FB450E56E8C080AE0ABD359CFB196C02D = THELONGESTDAYF1 | V | 0x8CE6187D4DA340D69253D2CD85DF669E -0x0A1DE7B97B77C27DB03B3C1A253380DB5C98D024 = THELOST_US_BD | V | 0xDACC8D7FC66A5D958160A86259248678 -0xE0529D4FA834025CEB034C231416E8E357C621CF = THEM (Them!) | V | 0x6375B4C2C000B63A3F41CA489353D4F3 ; MKBv56/FindVUK 1.00 -0xCD7684D0AE749D0AF972A13C435FCBE3CC1F334A = THEMYTH | V | 0x93E927E91712D87849CFE14120E3E561 ; MKBv12/FindVUK 0.80 -0x24AD59AD0A90B55D76CE37082CE0B9A4D028CEED = THEORYOFEVERYTHING_NA (The Theory of Eve | V | 0x07CE508AF012CC41A597AA181F0FC312 ; MKBv47/FindVUK 0.96 -0xAD5DF14FE25A5EEDEA0B938134636A6ADDF4FCDB = THEPASSIONOFTHECHRIST | V | 0xBEF4141961C53BBD2BDC5DB792AA55A0 -0x0F2CCBEDFAD896B72A927DD18BEA15293F431F68 = THEPROMISE | V | 0xE5D9E09173BBC8DE0249C8831D41C196 ; MKBv9/FindVUK 0.98 -0xC42DA672F00709715AA0B3F5122C868C6AA64EC2 = There Will Be Blood (US) | V | 0x6216DAD5828A7A19A7FDB0257490AE01 -0xF132D43F2A2A079F7569C1C52BB4AFC6FB8F4225 = There's No Biz Like Show Biz (There's No | V | 0x1FB9D55903C86FF460C260F9D51ABFDB ; MKBv20/BD+/FindVUK 0.90 -0x4BC87CA2D13F31F41111C608D660DF2874B7F350 = THEREWILLBEBLOOD | V | 0x989840E3D81F5B6771BBCCC9E8595A28 -0x99A3A2C155356A5B0750E139D54F2673ADF6BB8A = THEREWILLBEBLOODGBR | V | 0xCE4EAFA12FFA373D5E037BC363C3C0A0 -0x5400C550F85BE8DA8DD67DD7F237F6F5653098FE = THERE_WILLBE_BLOOD | V | 0x897DDB60E2122234D2526D837BF1A88B -0xBE2C2ABB741C67129221C9328C7EE55AA7B09760 = TheTheaterEquation | V | 0xF07154F476AE1D946C6886C3A6371930 ; MKBv61/FindVUK 0.99 -0xA1178BB8F1B7BE69D5973E367A60BF5257AC1786 = THETHIRDMAN (THE THIRD MAN) | V | 0xA66515C557C4EC2ADEA45C3D7ED903AA ; MKBv18/FindVUK 0.96 -0x2D1B9DDB33D18D172BD645EA7ADCD05157EDBA00 = THEWALKINGDEAD_S2_D3 (The Walking Dead S | V | 0x880DB78D548A0FFD87575583B8A5C905 ; MKBv35/FindVUK 0.99 -0x3CE240361F2CC61D4E6E726C9FFAB286DE88A9B5 = THEWOLFMAN_G51 (The Wolf Man) | V | 0x1176276EFC9083CD7140FFC2D88BAACA ; MKBv27/FindVUK 1.00 -0x720C7078FC91E1853E4BED423C492FECE20DB797 = THEWOLFMAN_G51 (The Wolf Man) | V | 0x5BCEF9951FFC9E6A15DD493318974BC9 ; MKBv27/FindVUK 0.96 -0x91E501E8E502FDD844FCC5576410DEC61ED0D8F9 = THEY LIVE (They Live) | V | 0xD1103A6823ECFDBA4896ECB8ECC512EC ; MKBv48/FindVUK 1.00 -0xE774551B6C834DCD1BD63F21CD12EDEB1E76421A = THEY LIVE (They Live) | V | 0x1982D73018A9F5087442801BEE979EE1 ; MKBv48/FindVUK 0.94 -0x0A842E56B280E51CA758953F7FD2EB8853F97FAA = THE_0xBAADER_MEINHOF_COMPLEX | V | 0xD68FD3008D002A00D3704213BF04C5C9 -0xB5F8F0C90486830905AC0EB68DE9292865E26398 = THE_0xBAADER_MEINHOF_COMPLEX | V | 0x097135D9F1003B7874F29DA66D25A77E -0xFF8AB4AA3C6F7151085B024D7DD4BD55270C5E6F = THE_5TH_WAVE (5th Wave, The – Blu-rayâ | V | 0xAF0A983CAEB2C82DEAC184A34C70EEAF ; MKBv58/FindVUK 0.97 -0x86D46C55EB2DE458132D823C337594E7FD190F34 = THE_5TH_WAVE (5th Wave, The – Blu-rayâ„¢) | V | 0xB5B498FEAC060D3D81A61006D814F395 ; MKBv60/FindVUK 1.02 -0x79A589AC32B396D73508085DCD03D9C599480BED = THE_6TH_DAY | V | 0xDAED6070FABE07259A321B520EBB9931 -0xA5C4662BD9EE827C11F88C454CAA9884FE234D3A = THE_6TH_DAY | V | 0xC47ECC92D1DBD961241C5C87EC0B84D1 -0xD9DCF8E51589DE1F884BF180B2634016C08241E6 = THE_6TH_DAY | V | 0x512DE23435B35091840D45F6E13AD19D -0x1C14D28E6D58540F6F6BBF9B1221AF81C040AF58 = THE_ACCIDENTAL_HOOKER | V | 0x91C9A038EDB56EB6F98481120B907C9B -0xB9CD12970C84EE473DF8F0D20DFEFACA0E39EBE8 = THE_ACCIDENTAL_SPY (The Accidental Spy) | V | 0x2CC6B8505444CF8B79C11EA311A67579 ; MKBv8/FindVUK 0.98 -0xCD5049D7C80DE2FCF8653E96C779B4B0FDE8192F = THE_ACCOUNTANT (The Accountant) | V | 0x66D11B60C6638E5B33440A34C7770AC6 ; MKBv62/FindVUK 1.00 -0xA34A0C095E34E3079C5885E7E0954B85B3711CF8 = THE_ACCOUNTANT (The Accountant) | V | 0x2A28C8D2769F01715B507ABD9C7506F4 ; MKBv62/FindVUK 0.96 -0xEF0CCD22F704B6D778DFCFE2D281840E46AC8E11 = THE_ADDAMS_FAMILY | V | 0xB0659FFD3460E116B82D6865F4866E68 ; MKBv36/FindVUK 0.82 -0xF7A9161EC7E69365492676A22ED786A2FA407F8D = THE_AFRICAN_QUEEN | V | 0x6DFA844A56D21BDA60CBE1CB17616B06 -0x9052DA6B30D9628E4C2C4F32E3D9D3E57B31FA1D = THE_AGE_OF_ADALINE (The Age Of Adaline) | V | 0x75A9C7AAA0AD2389E4960238BE98B52E ; MKBv56/FindVUK 0.87 -0x7FB1FC8BC59450C8806FF4E7BE1DD3A0DE3DF603 = THE_ALPHABET_KILLER | V | 0xC8429CECD295DF281941655BFC2CE3DF -0x77D250F7E981DE3A8E9F93F0DA61FACC97A58221 = THE_AMERICAN (The American) | V | 0x700184332982C8BF1B50C35572016CAE ; MKBv19/FindVUK 0.84 -0x9BA754A6A9745CDD5FCC7AF0AD53F09E8EF2839E = THE_APARTMENT_BD (The Apartment) | V | 0x7DCBB59DD93CFD0EE85FDDAB88A4360F ; MKBv26/FindVUK 0.96 -0xE86D1519EEEFE74A620256AA66217060EC936734 = THE_ARCHITECT | V | 0xFC212528315F406B67C1FEB3F141C3C2 -0xC2B4055A5323247777A73E8868C3647AE46721A4 = THE_ARTIST (The Artist) | V | 0x941DCFCB102F7AB619F84B05CCCBF56A ; MKBv26/FindVUK 0.96 -0xC701B40E52D5251B0AEABEF479DE76265B2575FB = The_Art_of_Flight | V | 0x02E8A2E2406C3D73127B7306BE30AF74 ; DVDFab -0x2B36DD0E50A5CE5216EC2BE786F354FD5D5FF734 = The_Art_of_Flight (The Art of Flight) | V | 0x2F871BDC65443F183C4473C9274C70FA ; MKBv25/FindVUK 1.00 -0x209DAC9C3E59CADA8162D53C0E890F9185CB6114 = THE_ASSASSINS (The Assassins) | V | 0xBCC4462CCBE5D119810B083EEE7D9C3D ; MKBv39/FindVUK 1.02 -0xB49FC8435F33C93EBBAE66652EC93C59AC774C68 = THE_AVIATOR | V | 0xF0FBC832D46C7D0DE3BF7BC114D2CE61 ; MKBv3/FindVUK 1.02 -0xC4A56A57017075A655672102A1C8AB6D41E06E99 = THE_AVIATOR | V | 0xA989C43BFCC27C2BCBCF7FD30FEB4B64 -0xA0CF8ADA8A47CBB187BD7CCFFB527EAF933E4AD0 = THE_BACK_UP_PLAN (Back Up Plan, The ??? | V | 0x4EA23AF45FB1C93D3E2751358F331474 ; MKBv18/FindVUK 0.96 -0x03F1AB40C6B05B0D11F4C0D590997CBDCE8B026E = THE_BEAST_FROM_20000_FATHOMS (The Beast | V | 0xFD613F28A03A20B3A2D5DBBABB8F9BD7 ; MKBv53/FindVUK 1.00 -0xDCFEE91C581D9B43E4E2DDC8F653011CAFB1BF57 = THE_BEST_OF_ME (The Best Of Me) | V | 0xF7150EA79DF98E32BD7A71DF2EB94AE2 ; MKBv46/FindVUK 0.87 -0xB44485D80C14A03CD9F9DA60E14A27C88CD42279 = THE_BEST_OF_ME (The Best of Me) | V | 0xF53E4F6BBD8C5E6811A99D78351B774A ; MKBv39/BEE/VUKNOTVAL!/FindVUK 0.96 -0xD124379A20B6A85D84965A4EA65C57BB9DC69A87 = THE_BEST_YEARS_OF_OUR_LIVES (The Best Ye | V | 0x39AF8713A20CA290F86A2A56458F0E65 ; MKBv42/FindVUK 0.96 -0xAD2842D28CAB9771251E60C20470F80BCB0CE6FF = THE_BIBLE_D1 (The Bible, Disc 1) | V | 0x64BDAB877701780AE947CCA3C8DA8EEA ; MKBv31/FindVUK 0.96 -0x6A7BBBD40CF3EC2868FA26AFB2432D4CDDA555F8 = THE_BIBLE_D2 (The Bible, Disc 2) | V | 0xCE2850B01858313ADA662D3C8CDA6156 ; MKBv31/FindVUK 0.96 -0x3DB9E7B6C0D6B2188072E9EB4BB41D9C76459D33 = THE_BIBLE_D3 (The Bible, Disc 3) | V | 0x89D42549DC4F56B40EAE10897B63BA33 ; MKBv35/FindVUK 0.96 -0xF76BD3A901BE54FC427ED528A31886EB93E81478 = THE_BIBLE_D4 (The Bible, Disc 4) | V | 0xEEECFDA785715E8E3B5CD02630A87F3B ; MKBv35/FindVUK 0.96 -0xE792EFDAAF023DCA7AB7D21FC245E8B0C0EBE6AD = THE_BIG_BANG_THEORY_S1_D2 (THE BIG BANG | V | 0x2782155465262C98A8425DABEB6342EA ; MKBv28/FindVUK 1.00 -0x4A6D0602C5837583BD0532F90CC4D11D558E2998 = THE_BIG_BANG_THEORY_S3_D1 | V | 0x1F5996D143C15CEDDCF09143A34002C4 ; MKBv17 / libaacs -0x9CA64A3559EBC9C1482B6E72025016CEF760B5BF = THE_BIG_BANG_THEORY_S3_D2 | V | 0xB71745F5A4F4DAF0E691FE0D9E70C1D0 ; MKBv18 / libaacs -0x5D40591763E9498815062E9AADE8E49BAB455784 = THE_BIG_BANG_THEORY_S4_D2 | V | 0x2711258022A64C297DE549FD6A133A44 ; MKBv23 / libaacs -0x7713A9A996981313A3858784E643A4CAF16427A7 = THE_BIG_BANG_THEORY_S6_D1 | V | 0xC424895D2FA651AC296F8F9765EDD82B ; MKBv36 / VukExtract -0x8E4E6D9A7C72629E52CEB1980700AA29A4B91DA8 = THE_BIG_BANG_THEORY_S6_D2 | V | 0x861EBA1F92D695F41E6640F727ED7B47 ; MKBv36 / VukExtract -0x806309EF8DE5CAFB6279DB0BF26AA2813D43D6B6 = THE_BIG_BANG_THEORY_S8_D1 | V | 0x8AF882D1F05BF697D45CB4197D1C2D56 ; MKBv57/FindVUK 0.96 -0x5F6062D088B96841F2C087CFA04549A00749FCB5 = THE_BIG_BANG_THEORY_S8_D1 (The Big Bang | V | 0x89D08E47D034890B1CC01832B335463D ; MKBv53/FindVUK 0.98 -0x4777FAD3C9F4E6EEDC9F2BE6B64E05D7D19D24F4 = THE_BIG_BANG_THEORY_S8_D2 | V | 0xAC014DF56F639568023A1FB6E3546A28 ; MKBv57/FindVUK 0.96 -0xC16920BB1021A0932B5DC112ADAB2D5C971EA66B = THE_BIG_BANG_THEORY_S8_D2 (The Big Bang | V | 0xA881D72382BB896BF4DBE1E0C6187BE2 ; MKBv53/FindVUK 0.98 -0x5F33B43A9FF916ECDAA590DBCCEFC97E2A025FA2 = The_Big_Short (The Big Short) | V | 0xC97741A17926D2148DB874D05AE9B8D0 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 0.98 -0x32CB670682BE76494E8E4AE10B544691080A4C98 = The_Big_Short (The Big Short) | V | 0x8B7CD6ECFE9C2258D2651730FC73F26E ; MKBv56/BEE/FindVUK 0.98 -0x7CC681D7C9526C04FA005EC774D09103894038C2 = The_Big_Short (The Big Short) | V | 0xF3EC6E7E21ACD463C1E74A51F557FD27 ; MKBv56/BEE/VUKNOTVAL!/FindVUK 0.96 -0x61E9FE774569E02821607FCCEC247E5BC776DE89 = THE_BIRDS_G51 (The Birds) | V | 0xB6E58CBE8BE8DA7D491B2BA25B476BDF ; MKBv27/FindVUK 1.00 -0xECFF9BC0A9AB71E7995B293CA9C6B45EF3C5EDD1 = THE_BIRDS_G51 (The Birds) | V | 0x85E07E1918FC62B2ADFFBA3A7021D3A1 ; MKBv27/FindVUK 1.02 -0xE4CFDD4C0F74A48D07573A656EF58DF5705916FD = THE_BIRDS_G51 (The Birds) | V | 0x3A995ABE7D41B6106A90C9584B2AF92D ; MKBv27/FindVUK 1.00 -0xC5BB44EB5A7E363549D06E3D4EDE416A9C5486E7 = THE_BIRDS_G51 (The Birds) | V | 0x07EE5CC11BACE953B540B613B50C4029 ; MKBv27/FindVUK 0.94 -0x519333DC5104D2F8B081B5E8DD85AE5B517A0894 = THE_BIRD_WITH_THE_CRY | V | 0x1B45395F5BA5B618D1512B775FB3D5F3 -0xE9473EA880418001EB33D6427228D2BD9E70A234 = THE_BIRTH_OF_A_NATION_D1 (The Birth of a | V | 0x039EBF132AC29C005A297927A178B120 ; MKBv57/FindVUK 0.98 -0x3F5E501455142E644DBAA61CDC4C8503858D545B = THE_BIRTH_OF_A_NATION_D2 (The Birth of a | V | 0x25307822AB882B905132C88853C96FEA ; MKBv57/FindVUK 0.98 -0xDCB9B047B972C755F8821DF2E46AD4B0850B247C = THE_BLIND_SIDE | V | 0xBE4855E846363007BBE589C491FAFECC -0x69238DD2415C0B1B1EFD3FBE39B02DCBF0FB7041 = THE_BLIND_SIDE | V | 0xE02CB9B9F19B807AEDA447576D632D11 -0x79045AE426B1BF04EFEAE499F2793749A2BAB805 = THE_BLIND_SIDE | V | 0x40640E1CE97126E7EA506CA80A623C26 ; MKBv16/FindVUK 0.80 -0x220C4E9B28CB1E7A81A9BC41D5474B05D7990BBD = THE_BLIND_SIDE (The Blind Side) | V | 0xAA36F4A6B38EF4BD75523ED9BA34E09A ; MKBv16/FindVUK 0.92 -0xC9B1605F2B5330472DF0C38826EA167E2EBEE96E = THE_BLIND_SIDE (The Blind Side) | V | 0x5A6A7B4C779D4D473602A4A824421804 ; MKBv16/FindVUK 0.96 -0x6A95F78B4B8BD19491383CF2621E57478CDFFAFB = THE_BLIND_SIDE (The Blind Side) | V | 0xDB42FF6FA83FFF37366345D0BFBF6E4D ; MKBv16/FindVUK 1.02 -0x3C111EC5035ADBA515F8953E5AE7989DC024AFD1 = THE_BLUE_LAGOON (The Blue Lagoon (1980) | V | 0xBDAEAC701105A8A817E4DAE0271AB967 ; MKBv34/FindVUK 1.02 -0x6CA836FF13F3330CA59F41048296A973B8781548 = THE_BODYGUARD (The Bodyguard) | V | 0xF0F1CC5108D0EDDA81D27AF13909D197 ; MKBv23/FindVUK 0.84 -0xCBCF3736289D047FEF259CC09BF0C8CED634EC61 = THE_BOOK_OF_ELI | V | 0x04D8B26D051DC8BBF669FB4F60A6A6EF ; mkbv16 -0x1A361FD79CAF98556D0A298F657FF0543A89D8C2 = THE_BOOK_OF_ELI | V | 0x179A976E5ED5F7E5823894F460585A7D -0xAD8112BF3E83EF938D27B57AB6A4926088E375C2 = THE_BOOK_OF_ELI | V | 0x7681464CF1DFD7A312FD3579B7E5C1E3 -0xF8EC6831953C73A483F44942C13FBC6DACFFDB1F = THE_BOOK_OF_ELI (Book Of Eli, The - Blu- | V | 0xC1A2C33177B593BFB72A00A85ADC3A2D ; MKBv17/FindVUK 1.00 -0x1C96AB34C753BFF362C7A37D9DEC7D350AFF88DD = THE_BOOK_OF_ELI (THE BOOK OF ELI) | V | 0x82E2A879F3A6BE49BBD1BB0D14925FAE ; MKBv16/FindVUK 0.96 -0x5C1584619479B233A6EFBB8AB4A254A781A14920 = THE_BOOK_OF_ELI (THE BOOK OF ELI) | V | 0x1CBDC8F7041A57F922BD85FBC10008B5 ; MKBv16/FindVUK 1.02 -0xC981D0350CD9AD659EC4832E59D94B56963F0229 = THE_BOOK_OF_LIFE | V | 0x63BB97B90AB25FF3FED72676D9343161 ; MKBrev 39 - BD+ - BusEncryptionEnabled - -0x94090F9CF4B6C95D83286EDBA6C8060F01FF8D4E = THE_BOOK_OF_LIFE (The Book of Life) | V | 0xDD22D7AD43C9936665B098D4BFB4C7D5 ; MKBv39/BD+/BEE/FindVUK 0.94 -0x8ABE0EC820D0A994E1688EF5199FD474444E92C5 = THE_BOOK_OF_LIFE (The Book of Life) | V | 0x8DF7403E76432A0E8B5EBB7750742DA2 ; MKBv47/BD+/BEE/VUKNOTVAL!/FindVUK 0.87 -0x21F2F20F8BF1C9B3EF2C5DD5769659EECE47929C = THE_BOX | V | 0x88C8C64CE7AB2030A927A6A497ECD08F -0x2ACA8E5FEAD9030125106977238B11823A2BBDB6 = THE_BOX | V | 0x49C8A761181C11E2C5E253424649BBCF ; mkbv16 -0x23E0C3D762FB7D7C71F036649F21B860A9CC1ED3 = THE_BOX | V | 0x41624F8B10906B0DE9DFC9ADBF8D931B -0x04AB0ACE3EB303F5451C6DDF9C712A4AAFB41B71 = THE_BRIDGES_OF_MADISON_COUNTY (The Bridg | V | 0x1D8A2B13CB7CF3D98119D1A3358FE071 ; MKBv46/FindVUK 0.99 -0xD0B9A7806D24A9C5B1CC08E6095D25A54D7D95B0 = THE_BURNING_PLAIN | V | 0xF52A9BA6606B38A983F03EA71B0F1AC1 -0x76BDA2F6DF69B3DD793AEB0A5B400D159CF9EFA4 = THE_BURNING_PLAIN (The Burning Plain - B | V | 0x88B75DFAA84943F0F485F2F52A27283C ; MKBv16/FindVUK 0.96 -0x1D0ABB5940404680CDDE6866CDF00AADF4FF887A = THE_CAINE_MUTINY (Caine Mutiny, The - Bl | V | 0xBA12E2188DAE9BCAA5F9226636A8FD47 ; MKBv25/FindVUK 0.96 -0x28FB1D370865375FA577155ECCC5E4BD109A4F42 = THE_CALL (THE_CALL) | V | 0x6B9538E0B2A0DD50C944FAD4CF1A555D ; MKBv38/FindVUK 0.95 -0x768015A8A959B3CBB265012CA3F61C7F39F35A24 = THE_CAMPAIGN (The Campaign) | V | 0x766534C84F1C42226C7C2CDB8249E841 ; MKBv31/FindVUK 1.00 -0xEBD9E1424519EA3E4A6F766F4797271D2FDC40F4 = THE_CAPTIVE | V | 0x3F07B8B0C4BA505D54DF40ED2721D290 ; MKBv50/BEE/FindVUK 0.94 -0x656BC613B0A7D554ED2510C8F434A6219ABC3BA5 = THE_CASTLE_OF_CAGLIOSTRO (The Castle of | V | 0x39A81D27A89F310F7B15BF943FDBDBCF ; MKBv34/FindVUK 1.00 -0x3AB8104B33469CF9B8540876DA4E8232F46E82B0 = THE_CIRCLE_OF_LIFE | V | 0x8F0B2EF1B7E484EE7E6A2A50EDDEF69A ; MKBv28/FindVUK 0.98 -0xC29301C793A5293FC25A5EEA3CD6F094CB648C27 = THE_CLASS_P1 | V | 0x7B747F3AD7427C5792FDE306812574B2 -0x54EFC382B8B75B36E53D4E7D898163D220E7C72B = THE_COBBLER | V | 0x17DBD69FCB35EBEBEF7BE8BA1BF92E61 ; MKBv52/BEE/FindVUK 0.96 -0x83B47D812A8E33716F722179087DF8EFF7541CC4 = THE_CODE | V | 0x3538CA3EFFCC0249ACA5E09C68323FFD -0xFCDD6EF8B5688671FE983220616D1F4B00D91971 = THE_CODE | V | 0xF916A9DE6BA410A1243DACA2A7889DC8 -0x4BE4F1DAB3B9AF572BC857643D00232CDC2EEC6B = THE_CONJURING | V | 0x4F15AD00A716E6FA61656CAB839163F3 ; MKBrev 42 - FindVUK 0.57 -0x2E99C58C0D7662F83A689C01AEAF7F4F86B6AD63 = THE_CONJURING (The Conjuring) | V | 0x00ED02702681DD3D99392F55027AA574 ; MKBv36/FindVUK 0.94 -0x807B6608D1DB97EDF6C9697B3A9DC45F4B2B0AB4 = THE_CONJURING_2 | V | 0x168E5CB1AADB73C8C0BB8C36E8CCE0C0 ; MKBv62/FindVUK 0.98 -0x51BFBFB0BCAA474A54B462E9F976DEEA6E4FD7E7 = THE_CONJURING_2 (The Conjuring 2) | V | 0xAF1DA029C7B22BCE459133678DE4BCFF ; MKBv62/FindVUK 1.00 -0x833CBC16C01024669D19A21989340795EF419644 = THE_CONSPIRATOR_BD (The Conspirator - Bl | V | 0xC7116CE3369BF505C9F839E9CF5FDA0E ; MKBv21/FindVUK 0.96 -0xC54D5E933C801FFFF43B9552754B784ACB94105F = THE_CONTRACT | V | 0xD1E748962CB35DE3C251F734A0542B88 -0xC523B8F31DD2A61DDD40A91CC1BE08EE27851A4D = THE_CORE | V | 0xD9F15494B66E5B28AC6AD514CD64D618 -0x49A176CB0887EA8468B2F8D999CBAFEC65250687 = THE_COWBOYS | V | 0xDBC1A650B3E9CBD44391C85EA7E25A5D -0x40522CB96ED5F909A9557B5B7C310981DF9187ED = THE_CRAFT | V | 0x814814BE9F481F57790A3CCFF0396967 -0x3545919B230F8474239F67D476A3CFF4D85312D7 = THE_CRAZIES(US) | V | 0xA51AA008033F1D65E7B8239686911086 ; mkbv16 -0x13C90F3D131AE5E330AA092C194DE368CF2DE147 = THE_CROODS | V | 0xFE2801A18F6EE1120CFA3D0BE1973661 ; MKBv36/FindVUK 0.84 -0xA66F3662F1ABD7B3D264E1DB28302E9E8FE5B1AF = THE_CROODS | V | 0x79CD0811D1CA743012BACFB879A15EB7 ; MKBv36/FindVUK 0.81 -0xB194AF1BC7F266910F68B238CBAC9E8EFF9AAF11 = THE_CROODS (The Croods) | V | 0x671F955FEB920B2389182C0ADEE3976D ; MKBv36/FindVUK 0.87 -0x0AA76D1AF302EE9AE2DFA257BF7A0FD2BA73B3C0 = THE_CROODS (The Croods) | V | 0x2478FEC2A0CE39FD11C91E433506D5F2 ; MKBv36/FindVUK 1.00 -0xBE6961E41701A5B43F02FF02A54E5DA47661C5C9 = THE_CROW (The Crow) | V | 0xC0B62E610840FD7D7D5E52712553783E ; MKBv35/FindVUK 1.02 -0xAFB672B01583DDFAA761476B441074FA776DB9DA = THE_CURSE_OF_FRANKENSTEIN (The Curse OF | V | 0xB44BE9E6A4EB77C2B79DF763ECDDB0CC ; MKBv34/FindVUK 1.00 -0x1DA713810EA8B4076E297A1A31F6F787C1A40F31 = THE_DARKEST_HOUR_3D | V | 0xE5E8FFE6F1E03B471C680B5B29B005DC ; MKBv27/BD+/FindVUK 0.80 -0xA4A0BDEB9C1374306A43418AF50564265F0579B5 = THE_DESCENDANTS_FD_FR (The Descendants) | V | 0x60A5BB310D7A60F0DB920972DB5A26D8 ; MKBv23/BD+/FindVUK 0.96 -0x4BCA332F7CBFC456B9E50810D14071E45BB20CCE = THE_DICTATOR (The Dictator) | V | 0x3DA7CD1D5F5B838E5F60B8126313D61C ; MKBv31/FindVUK 0.96 -0x3C1EA678EE2FEDDFF001694687A0AE66AB4E8F2C = THE_DICTATOR (The Dictator) | V | 0x482184D69757B446CB416A4FDCAAEB98 ; MKBv31/FindVUK 1.00 -0x3C26FF2673DCAAEDF27266966593B204881E29D3 = THE_DOORS_BD_LGE | V | 0x36A61368DE5AB3D52844500D9B36DE3A -0x69E7FDBE1A0EB0006D6FECF2E1FB68B6600290B1 = THE_DOUBLE_LIFE_OF_VERONIQUE (The Double | V | 0xC564EAA1E8370A7F1415B1003F3ED235 ; MKBv19/FindVUK 0.99 -0x4C05A76BD1D1D132C0771EDAD8798B7F35440F5D = THE_DUCHESS_AC | V | 0x3C6B19FC17C7349894537B591E2C1616 -0x22A7A99932AAFD6EC7D3E39C46021902DDFBADE2 = The_Duellists (The Duellists) | V | 0x0DC98CC5A1E74CF8CA47264AA64126CE ; MKBv35/FindVUK 1.00 -0xAE607BD57F75A5885AFA67E95F7B73F6DC706E8C = THE_ENGLISH_PATIENT | V | 0x39678E63BD6127C7A7C51E56DF147F4F ; MKBrev 12 - FindVUK 0.54 -0x710B5AFB27AADF29A172234C830C8C25D1F35FE5 = THE_EXPENDABLES (The Expendables - Blu-r | V | 0x39EAB124A25A48790419FBAFCC71CE91 ; MKBv19/FindVUK 1.00 -0xD54C67B63071B4ED745A74A3526ECD3105D99929 = THE_EYE | V | 0xE1C1F96DF070C9343F716205CD016371 ; mkb v9 -0x60FE92028B480E3B100DA8D85F5F56BF42248FB1 = THE_FALLEN_D1 | V | 0x5D2C2E2050C3BB9263BB75D5B4F37B29 -0xF758A77200B1B8C418F4E0125442153659540EB2 = THE_FALL_GE_BD | V | 0x208DDB6B4B3B8BE718A5CBA9BA5E2056 -0xC62B581356BE77E4EC8F596BD262700979526E2D = THE_FIFTH_ELEMENT | V | 0xB0B6B37BA445363F990FC75D07CA1422 ; 2015-08-28 MKBv57/FindVUK 1.00 -0xB4D6088764989DB278A8F158CCC2C0CAE92CAD5B = THE_FINEST_HOURS (The Finest Hours - Blu | V | 0x4B981DD2EE6EF17A08A04DCC20772150 ; MKBv46/FindVUK 0.93 -0x1FA3F009FCD731E830032CF93396984A16675739 = THE_FIRM | V | 0x14F322CF6866481AEFCC935BEC9D218F -0x710E8233DE649B44B9CD5DB8087FCCFFBD2AA6F9 = THE_FIRM (The Firm) | V | 0xFBCDF5823B9904AC8C345B9302290939 ; MKBv23/FindVUK 1.00 -0xBFFF47C0D0D7B8E9A0DE84B8741656F16FBF3854 = THE_FISHER_KING (The Fisher King - Blu-r | V | 0xF784DF2236A45F7C1B95E27F64462688 ; MKBv34/FindVUK 1.00 -0x68320115E0EF30B33CA19A3BF62B13591ED4E293 = THE_FLASH_S1_D1 | V | 0xB9FFA209AD8089E481257A7A4279FFE9 ; MKBv53/FindVUK 0.80 -0x9035FF8ED15DA719C063C479B1FCD9A6A5299085 = THE_FLASH_S1_D1 (The Flash Season 1 Disc | V | 0xB78161AF5CC2E4134572406B5BBBE4F4 ; MKBv53/FindVUK 0.91 -0x4A740CAB7C69EF2865FBAB7F2CEB4E17AF1DBA7A = THE_FLASH_S1_D2 | V | 0xB362C3DAF126E8345FD599A8A180B8A5 ; MKBv53/FindVUK 0.80 -0xB0B346672491680B07320419D80717BC319F0849 = THE_FLASH_S1_D2 (The Flash Season 1 Disc | V | 0xDEEA547F24E43F46D8AF9E5A1A4EB9D4 ; MKBv53/FindVUK 0.91 -0x78730F39E9DF5AD48E39B715B7C2F3D542865688 = THE_FLASH_S1_D3 (The Flash Season 1 Disc | V | 0x03048319D1EFFCF38E82C7B85ABE5FAE ; MKBv53/FindVUK 0.91 -0x72AC67324A11F11F8D18FF55BC18163913374D47 = THE_FLASH_S1_D4 | V | 0x7E61A8C09DD95CA335E7847378A4F08A ; MKBv53/FindVUK 0.80 -0xF7FE5CCAA6170E08226E80656AB1655D1EF44D97 = THE_FLASH_S1_D4 (The Flash Season 1 Disc | V | 0xB1ABC5B0E8731FD512C094854143F723 ; MKBv53/FindVUK 0.91 -0x70934907E3ADD848BCE137804FCE21729E6AD1B8 = The_Fly (The Fly) | V | 0x5DB2B3AD426DCBB04061A2182A5FDEB9 ; MKBv36/BD+/FindVUK 1.00 -0xDDBC9E08E21E0998A2B195DFC5E8D81F0CCAA7C1 = THE_FLY_F1 | V | 0xBDA4EFCE31DF672307957F2D08B858EE ; MKBv4/FindVUK 0.98 -0x6BCB6D34CFB3DD5485C310719BE26245A396F041 = THE_FLY_F1 | V | 0x8CB648E9E8EA7A8597062CEF877D0A72 ; MKBv4/FindVUK 0.92 -0x22B0B2C60F853335DEA406CA2AC61C0F91E427B4 = THE_FORCE_AWAKENS | V | 0x5B5950B8D1779B947E211953D87CB117 -0xA569D46A1FD21DDB3714F2055064A206F9F54EF7 = THE_FORCE_AWAKENS (The Force Awakens - B | V | 0x18330EE13AEE08A0EEDA33C54496B586 ; MKBv50/FindVUK 0.94 -0x22B0B2C60F853335DEA406CA2AC61C0F91E427B4 = THE_FORCE_AWAKENS (The Force Awakens - B | V | 0x348DA1785265A80DDB1B88E5A1F2F732 ; MKBv46/FindVUK 0.99 -0x7EFE46DFBC4AE3D1D8939B9D0E9FC266DA758D67 = THE_FORCE_AWAKENS (The Force Awakens - B | V | 0x1333F84168A548021162CFABD9E3632A ; MKBv57/FindVUK 1.02 -0x8ED7C074D0F33B67DC5193C1C47DB54DA6AC103F = THE_FORCE_AWAKENS (The Force Awakens - B | V | 0x3E9B972533534140B3CDFAC10E4AD3E5 ; MKBv57/FindVUK 0.92 -0xE510869AA797C736122BC5EDE2FA089E62862971 = THE_FORCE_AWAKENS (The Force Awakens - B | V | 0xFB272AFD696A648486A4E2DF5E6417F5 ; MKBv50/FindVUK 0.92 -0x511B9179BA0977C69DDB9EF01F0D7C9F2A801134 = THE_FORCE_AWAKENS (The Force Awakens - B | V | 0x1939C9D1F9A835420AF2BAC454A36C2B ; MKBv50/FindVUK 0.94 -0x7B32C0CDC27604258835D545B7E9480E31696BAD = THE_FORCE_AWAKENS (The Force Awakens - B | V | 0x900B1B4E9884ADF9E7CAFFB3331D60F5 ; MKBv50/FindVUK 0.98 -0x00228A7C48DF3B9B862DCB76D621F6BEE81EAD1D = THE_FORCE_AWAKENS (The Force Awakens - B | V | 0xFF68DBE54FE7EEA3DF9D03BA0EB4D232 ; MKBv50/FindVUK 0.94 -0xB102B85B651E0709A36ABF9767E8FD41E5F20B06 = THE_FORCE_AWAKENS (The Force Awakens - B | V | 0xB81C749B432CDA994BEDE166B3696D3F ; MKBv50/FindVUK 0.93 -0x74FB045DA9528484622CC73E353B58D57E0AA5FA = THE_FORCE_AWAKENS (The Force Awakens - B | V | 0xED197D41008CE011A4977C09AD8E1012 ; MKBv57/FindVUK 1.02 -0x4598396464095E2C1F3E351EDF3EBFF69A1A2C3E = THE_FORCE_AWAKENS (The Force Awakens - B | V | 0xF165ACB11A337DCC83D8726495FCC0EE ; MKBv46/FindVUK 1.02 -0xE42953CB115E95528533B9224669950187A8AB40 = THE_FORCE_AWAKENS (The Force Awakens - B | V | 0xD3CF0B23E079E3B7CF2B9A728116D2A5 ; MKBv50/FindVUK 1.00 -0x1596524ADEB41DFC97BAB65A2A1788BDCBC0D447 = THE_FORCE_AWAKENS (The Force Awakens - B | V | 0x19AA9C06ED9C7679055818BD198A6A01 ; MKBv50/FindVUK 1.00 -0xEFC2A7772B7BB634CA212EAD6C8FAB91EA1AF7FB = THE_FORCE_AWAKENS (The Force Awakens - B | V | 0x4B3F115A6B45CB8490D8D347A9B5E4E8 ; MKBv57/FindVUK 1.00 -0x1AF342B98ADC8E573E42A8326743AA8D72C11A4A = THE_FORCE_AWAKENS (The Force Awakens - B | V | 0x115AEFA5530742464EB93B2AA8F7874B ; MKBv57/FindVUK 1.00 -0x64F9D08D63F7073A872B9354242E632F81327EA2 = THE_FORCE_AWAKENS_3D (The Force Awakens | V | 0xA97891CE68E105BA3CDAD96C4E271016 ; MKBv56/FindVUK 1.00 -0xC6C2FEAB19C327FC26A6BB5660BB905490B3BBBE = THE_FORCE_AWAKENS_3D (The Force Awakens | V | 0x83B2A08B1D3D6BD1DB808CA099D67D44 ; MKBv56/FindVUK 1.00 -0xA7D3864679C12461A0F8141516EF2D1B7A6942BE = THE_FORCE_AWAKENS_3D (The Force Awakens | V | 0xA6E4488B6A37AE0B842681B54CFCD130 ; MKBv56/FindVUK 1.00 -0xB53D6B63031EE51F70B02EB5E1619F05C1D577AB = THE_FORCE_AWAKENS_BONUS_DISC (The Force | V | 0x5D2CD4636974904BDD94B0F4BA22660B ; MKBv57/FindVUK 1.00 -0x4CB95093E2F01445D3493C522222EC0EEC353B8E = THE_FORCE_AWAKENS_BONUS_DISC (The Force | V | 0xC54DBAF7BF7506D0C423D86BDA089874 ; MKBv57/FindVUK 1.00 -0x40E417263A20A7C6171724CCB405F068067D6A9E = THE_FORCE_AWAKENS_BONUS_DISC (The Force | V | 0x6C11C762E8ACC851EC43D30CE31DF17A ; MKBv50/FindVUK 1.00 -0x3EA16E9C92A43CCD66AB0F67078DA4DFA89CFAB6 = THE_FORCE_AWAKENS_BONUS_DISC (The Force | V | 0x73233C386EAE267AFA035C6DAC2F33D5 ; MKBv57/FindVUK 0.93 -0xAA74D568F8119E57CB3D08481F0CF5738A7FA727 = THE_FORCE_AWAKENS_BONUS_DISC (The Force | V | 0xB4F8BA535CD5E5DABD505D2D5ED0F2E8 ; MKBv57/FindVUK 0.94 -0xAF5B8BBE7190D737FB1D9F660ED7813FDE124DD1 = THE_FORCE_AWAKENS_BONUS_DISC (The Force | V | 0x8AF77627B818A5F718BB9329F497DCF4 ; MKBv57/FindVUK 0.94 -0x763C3C30DE596FE12CAF2A834DCEB8E8D715256F = THE_FORCE_AWAKENS_BONUS_DISC (The Force | V | 0x05C7C8ECB30217A309EB6669488A4166 ; MKBv56/FindVUK 0.92 -0x374F6DF5C8F1EBD520D235578DFBA3EBD903762E = THE_FORCE_AWAKENS_BONUS_DISC (The Force | V | 0x036C86950AA465A42D58A7F3444AD5DF ; MKBv57/FindVUK 0.94 -0x9D94C1735D403843D3C0EA64A0CD478B4CCAAF2E = THE_FORCE_AWAKENS_BONUS_DISC (The Force | V | 0xA01ECDAB6F4EEFF71E891FDDE52E7D54 ; MKBv57/FindVUK 0.99 -0xFFC1D4DA8258989C749C60FEF4A5A26D2A3F43E8 = THE_FORCE_AWAKENS_BONUS_DISC (The Force | V | 0xB7DF1A8A0B9E6684A90564709C522D13 ; MKBv57/FindVUK 1.00 -0x89E9D545C6DE9BF6EAF37AC9C5EA75554A25BCE2 = THE_FORCE_AWAKENS_BONUS_DISC (The Force | V | 0x368F16DA777D4EEA2546F5AA7F2F5A45 ; MKBv57/FindVUK 0.96 -0xAC7FE241FE6ABB3AA0D8DB11315642185F1B7211 = THE_FORCE_AWAKENS_BONUS_DISC (The Force | V | 0x1BB88F8E8CF884072E2E5E3D53A8EE6E ; MKBv57/FindVUK 0.96 -0xBE1FEEC2D1F7103BEAFF3E702382637985D1F091 = THE_FORCE_AWAKENS_BONUS_DISC (The Force | V | 0x0C7845963BBA1BBB1561720BAE0B110B ; MKBv57/FindVUK 1.02 -0xF9D7FC73897CDBC4D412362BE84CFA3871917526 = THE_FORCE_AWAKENS_BONUS_DISC (The Force | V | 0x1854A978EFE78F8E68ACA92F25CDDBE1 ; MKBv57/FindVUK 1.00 -0xC24B2C4384B5F4ED6ED6D9BD05E83DC3335577CC = THE_FUGITIVE | V | 0x26EA17126BA9219F738DA548EBA7F843 ; MKBv3/FindVUK 0.98 -0x0B05555B0E37F271ECC39515A60A7AE6E9BC0B0A = THE_FUGITIVE | V | 0x6DE56A7A0D759729DEA3C33DF57A89C7 ; MKBv3/FindVUK 0.98 -0x392D967CEA3B2D319CB22AE8DCD4D091793FF0BB = THE_FUTURE_DIARY_D1 (The_Future_Diary_D1 | V | 0x204FB298BE3AFF4CA54D9721C8E4C5A3 ; MKBv53/FindVUK 0.92 -0x32A49EF3BE80D56726A7A1ED9D739F937482B1C7 = THE_FUTURE_DIARY_D1 (The_Future_Diary_D1 | V | 0x534BEF4587C96B5DC2F6465A5B9768A5 ; MKBv53/FindVUK 0.86.3 -0xB16A32D6462E8E66972F92ECE320DF0C99C350CB = THE_FUTURE_DIARY_D2 (The_Future_Diary_D2 | V | 0x227269A7D1E5D65E5C1B88043F2DFB2B ; MKBv53/FindVUK 0.86.3 -0xA514D4F24929290E4F2C95C1309B011898AF0759 = THE_FUTURE_DIARY_D2 (The_Future_Diary_D2 | V | 0xF966F03D2151AD70BDA1F5CE358F89D7 ; MKBv53/FindVUK 0.92 -0x3544264FFF8863905751F8E69BC6A53DCAEF9971 = THE_FUTURE_DIARY_D3 (The_Future_Diary_D3 | V | 0x07008B5B0C351CF614966EC911DBD081 ; MKBv53/FindVUK 0.86.3 -0x61138DED7C82BF0E85A2F1D428F9C89014ED3012 = THE_G0_BETWEEN | V | 0x2E69090B3298E19D485AF6D1AF690D0C -0x29F18B4307A3D87EB3FDA9625F87C93557515D2F = The_Gambler (The Gambler) | V | 0x45EA2B9FDC2B50970A0A9CDD47EBD183 ; MKBv39/BEE/FindVUK 0.96 -0x033C4ABC9B2CFDAD5E83800A873EF85A18F24374 = THE_GIRLFRIEND_EXPERIENCE | V | 0xB29FC1831E35A487EA611523CC81BF2D -0xE29FDB6217445786DB905408CE513CECE8F218E5 = THE_GOOD_DINOSAUR (The Good Dinosaur - B | V | 0x936DD32A63BDB3BF3862826AF313A842 ; MKBv46/FindVUK 0.99 -0x29FE5013DB72C533CC21EFEC5979D7B3D08EF2D1 = THE_GOOD_DINOSAUR (The Good Dinosaur - B | V | 0x0B24961BE1D630A08F209956ACC816C1 ; MKBv56/FindVUK 0.96 -0x0816E40636AD212C5A6794A110A95F56E3A4706F = THE_GOOD_DINOSAUR (The Good Dinosaur - B | V | 0x84B51556946080291239A0B6AAEA64FD ; MKBv50/FindVUK 0.96 -0x29D9747874FC74CA3A06012CA0F26FBAA8074C07 = THE_GOOD_DINOSAUR (The Good Dinosaur - B | V | 0xDEC119EC7AFDC5DCB7874DE4B3CC72BC ; MKBv56/FindVUK 0.98 -0xF9F5BED8AB75FF57DE359D56F95ADC13DD27BADF = THE_GOOD_DINOSAUR_3D (The Good Dinosaur | V | 0x31F265EEB859C3285A57346C2A06784B ; MKBv46/FindVUK 0.99 -0xDBE57921630D2BD1043DA58AB693907DDE70A10C = THE_GOOD_DINOSAUR_3D (The Good Dinosaur | V | 0x2C7A82F0D8A2C06299615F72B4234595 ; MKBv46/FindVUK 0.99 -0x9BCCE8A7888B58E9FB8D8E054C2BCBC9EC61006A = THE_GOONIES | V | 0x1B12D1814FE2A0DB0E3A2AF274305AAC -0x49CB3DDB71A06422CA5B20ADF21172BEC7418873 = THE_GOONIES | V | 0xB8CDC1D0847F555FBEE3D3346C55888E -0x8FDA5A95C59C00361F6D4A94EA8A20DCFC72C4CC = THE_GOONIES (The Goonies) | V | 0x8D662121DB85049B749885FFE2740447 ; MKBv8/FindVUK 1.00 -0xCD9BD1A5F878E3240552220D8CA30871D8A2A8B4 = THE_GOONIES (The Goonies) | V | 0xC96B191285207171B1FE23637616AC38 ; MKBv8/FindVUK 0.92 -0x89CB5B9736A8764DECBE7E92D30BE5F3310B6285 = THE_GOONIES (The Goonies) | V | 0x0206AC388CE8DA30AD4CBA56215B3676 ; MKBv8/FindVUK 0.92 -0x32E008205C93C205E97529414253BFCFCD6D40A4 = THE_GOONIES (The Goonies) | V | 0x6582C9B1E0BB8DD93F4FD7E53F434AB3 ; MKBv8/FindVUK 0.90 -0x1C035F67F5F0DC422261458B0875C26D0A07816A = THE_GOONIES (The Goonies) | V | 0x9207C48C50172F1B36E1BDE4E8D5EC78 ; MKBv8/FindVUK 0.92 -0xBD8E534E3EEA5DF048B9C6B8D95588CE581B6168 = THE_GOONIES (The Goonies) | V | 0x0C51A84F6DDC8D4CE3EAF669CAF55FC1 ; MKBv8/FindVUK 0.96 -0x856206EC1BA1847FEB75E68E8A50B5D20585C65F = THE_GRADUATE | V | 0xA070CBB667824877B6CAFE62B854EBBA -0x0A6BD97C50812C1E352112536E1B522207036082 = THE_GRADUATE | V | 0xF64A2D4DE328270EE0AF6FA76563ACF3 -0x612049425551D5A4E99E3E14707D553DAB702159 = THE_GRANDMASTER | V | 0xCFBC600DCCD02CAB09DB5902DE058CC3 ; MKBv36/FindVUK 0.65 -0xF7A1C575AB25E23C87088DEC3F964FB53CF7398E = THE_GRANDMASTER | V | 0x5DFB3F70CC5D98EE8D49CC9E819A705C ; MKBv44/FindVUK 0.93 -0xEEE421A046C1FC684AC8B722B5B7354BFE6495CB = THE_GREAT_ESCAPE (The Great Escape) | V | 0xB016EFC3DD9DD37CFBC32F8246BA2B68 ; MKBv36/FindVUK 0.96 -0x85B644672B9659724827DBF9B8C6BDF9B16F939E = THE_GREAT_GATSBY (The Great Gatsby) | V | 0x553F00DCBADA066B2DCE0932C0221317 ; MKBv31/FindVUK 0.92 -0x2926AA38885EDEA524E58C921CD4FA2D9FAF5562 = THE_GREAT_GATSBY (The Great Gatsby) | V | 0x0F06F143CA3DF0C2699809DFA6160B14 ; MKBv31/FindVUK 1.00 -0xA5A2915F2E2725D5A399DFF9BA9D581E12C38328 = THE_GREAT_GATSBY (The Great Gatsby) | V | 0x8A9A180C472ECC18DF1891B29940F7FE ; MKBv35/FindVUK 0.98 -0x7B64AE0C3FF60F9239B3043E066B0CF938139C75 = THE_GREAT_GATSBY (The Great Gatsby) | V | 0xBAD85FE4F26B0130CB3780FE0EDC5281 ; MKBv36/FindVUK 1.02 -0x60D4C9B00C071236AFF74FEABAFA96C1FDB82E6F = THE_GREAT_GATSBY (The Great Gatsby) | V | 0xDA15ED06977A3283F07818E43C4DAE59 ; MKBv31/FindVUK 1.02 -0x8331A72CA54F6F2951F329B3A1CCBB8869A22B1B = THE_GREAT_RIFT | V | 0x602963299CC616D32218E665CF0F6602 -0x18F15C3008C9E090021ECBACE76FF792EE51C510 = THE_GREAT_WALL (The Great Wall) | V | 0x16F490B62EE40D07C24835253BC68BB1 ; MKBv62/BEE/FindVUK 1.00 -0x5320A1B40C7D04DB400C467942DF84C0BE316B33 = THE_GREAT_WALL (The Great Wall) | V | 0xAFFD498183FA48CFF69C858038634B0B ; MKBv62/BEE/VUKNOTVAL!/FindVUK 1.02 -0x1730FC5BA9A9A08760F4DD6547B127C6D0E5B785 = THE_GRINCH | V | 0x66095BD1E740C8B2FAC0D9CD881AEF16 -0x9E1754F82D683E6FC0BD478DB0CBC6775D55DC4D = THE_GRINCH | V | 0x69AA4577EC71E2FB0D140A3B22272A4E -0xF68DB893E461EBEC56F1F3CFCA414E18ABD9CEC0 = THE_GUNS_OF_NAVARONE (Guns Of Navarone, | V | 0x081BF217D0B150A184158D15A701F778 ; MKBv25/FindVUK 0.96 -0x1A7091E2D9ED17130E21668626E4900B8862732A = THE_HANDMAIDEN (The Handmaiden) | V | 0xB9DF36751C4C166C663687BF752E64D6 ; MKBv62/FindVUK 0.98 -0xA4A9FE066CC68EDA5DB398653393317505C37837 = THE_HANGOVER | V | 0xE615F1E4A2DD697D6959D0798EBAEB70 -0xF3B5990804DA04E889AFB9E7254C50A70564EF5B = THE_HANGOVER | V | 0x8900E4E4DA24C55D78ECF2E1205F0E83 -0xD4E0F2FA368EFA0E35876120C747FC05C1383CCA = THE_HANGOVER | V | 0xE4C9EFC1DED10420409901D7E8A75648 -0x20BFCB446B495AFFA632F64517C039E55666E9E3 = THE_HANGOVER | V | 0x5199425AF8C1C583B2E2E74DAF93D69B -0xF00F11B39516E6C223210D597FB7D6CFD604FF96 = THE_HANGOVER (The Hangover) | V | 0x3AF15AB3F5CEAF9257903F139105CD1C ; MKBv15/FindVUK 0.98 -0x40FACC421FB6D75867D4BEEB5DEE903054B9FBC6 = THE_HANGOVER (The Hangover) | V | 0x4D1DB033EFDC5F4C831C4C58322DB8B4 ; MKBv15/FindVUK 0.84 -0x1F4BA681384504D77210BE7250D251C5400AB402 = THE_HANGOVER (The Hangover) | V | 0x1CB78C2EDCA67AF277F8CCA696D51F32 ; MKBv15/FindVUK 1.00 -0x138D532F82FBE69DAD19FDDD422A3454C4DB5AC9 = THE_HANGOVER_PART_III (The Hangover Part | V | 0xAD9AE21F82B250F25984520E5697EA40 ; MKBv35/FindVUK 0.84 -0x93F95FC8AEB8538933E5891EB364150C2B91F224 = THE_HANGOVER_PART_III (The Hangover Part | V | 0x34155146D8E9790637B3D43A03C0A047 ; MKBv36/FindVUK 0.98 -0x7F59BE4E21B0782AA744084F065EF284A4069489 = THE_HATEFUL_EIGHT | V | 0xD453D6966B245E38B99062D7BBC315E7 ; MKBv60/BEE/FindVUK 1.02 -0x618B6DDD8D1F63DE266A61452B53DF8E79A6A475 = THE_HATEFUL_EIGHT (The Hateful Eight) | V | 0x415F3C329AD22B58CA8F69CD4F98B94C ; MKBv55/FindVUK 0.92 -0x1646C690CF4475EA645E1F63FC94E1D6D936584B = THE_HAUNTING_1963 (The Haunting) | V | 0x0F752E60E3594E8751716F75F9EE4A7A ; MKBv36/FindVUK 1.00 -0xF7319108A0F25A0BD08D3459A1EB6B9DF16FDE2F = The_Heat | V | 0x52FD22810211A79E9BEE6FE0EA1A795E ; MKBv36/BD+/FindVUK 0.80 -0x1420020C1C538A61476F79EF42F9CCAF1ECE9FBB = The_Heat (The Heat) | V | 0xF89E7B3CBAED2ECA2C774DC442AA1230 ; MKBv36/BD+/FindVUK 0.96 -0xB831D21D832BC204417D484B01AE52DA3B70C4D3 = THE_HEAVY_BD | V | 0x21657B952A439BB77012C51E943AE798 -0x45A3799109F22011104566F9BC67C1B8085407EB = THE_HIDDEN_FORTRESS | V | 0x0B9453BD8CC53822E545AE457BAC506D ; MKBrev 46 - FindVUK 0.57 -0x4DC6833F47C82797DAC0663AA19676FD84C947A4 = THE_HOBBIT_DESOLATION_OF_SMAUG (The Hobb | V | 0x2B91C8F42D4B02938D5D87FA7B52FBFC ; MKBv46/FindVUK 0.91 -0xB098F94BD79FC1480685A4AF3AF20553A16A6CC9 = THE_HOBBIT_DESOLATION_OF_SMAUG (The Hobb | V | 0xFD84D4A442BFD428AB3848E790B90FFE ; MKBv46/FindVUK 1.00 -0x82970D82BFD91AD1835B2596F62B45A43CF63A71 = THE_HOBBIT_DESOLATION_OF_SMAUG (The Hobb | V | 0x227814404CBA9909FEE71F8A7F0FABDF ; MKBv46/FindVUK 0.84 -0xFBEEB47849B8392E41DDD4D4920CE026521C64AA = THE_HOBBIT_DESOLATION_OF_SMAUG (The Hobb | V | 0x9BFF06B3A36CFC2C9A093CBEF58D950F ; MKBv46/FindVUK 0.98 -0xE925AD0483595B67C2721A95EADB4DE2FCE68249 = THE_HOBBIT_DESOLATION_OF_SMAUG (The Hobb | V | 0x84E229A143273EA262DFD14F19AEF01A ; MKBv46/FindVUK 1.02 -0x3F2FFD56B56A46952E35DE7A8EE6AD59BDDF8A8A = THE_HOBBIT_DESOLATION_OF_SMAUG (The Hobb | V | 0x6B21706B4234F266B14DE7F57027920D ; MKBv46/FindVUK 1.02 -0xBC28ABD6D9EA9F726D534958A0A5665CED212328 = THE_HOBBIT_DESOLATION_OF_SMAUG (The Hobb | V | 0x1F93F49CD41590F960C7799353C60000 ; MKBv46/FindVUK 1.02 -0x4BEFE9A60836C903FF279D996B95C95AC389D146 = THE_HOBBIT_DESOLATION_OF_SMAUG (The Hobb | V | 0xB2203C8BB64B83CCAE10DF8C346AE6DB ; MKBv46/FindVUK 0.98 -0x9A2842E152F5EDABF8B301AB75317475DFED7501 = THE_HOBBIT_DESOLATION_OF_SMAUG (The Hobb | V | 0x3E310D2F9FF2DB17ACAC69CB4D73F48C ; MKBv46/FindVUK 0.96 -0xEEB1947867B466608E6D8C1734711C8D29AC40F0 = THE_HOBBIT_DESOLATION_OF_SMAUG (The Hobb | V | 0x05DA928C7CF8EF71E37F428B2199C66A ; MKBv46/FindVUK 0.92 -0xCADE71A5108E3B06FC3CF01FAE566C45D3C3E8C8 = THE_HOLE_D2 (The Hole in 3D - Blu-rayâ„¢) | V | 0x9DC920634630EFB53EE594654D43DE45 ; MKBv17/FindVUK 1.00 -0x8167420E1F044ECD6558D524875B9812DE9B3458 = THE_HORSE_SOLDIERS_BD (The Horse Soldier | V | 0xCB366AE50625397E43775C8D363ADBF4 ; MKBv21/BEE/VUKNOTVAL!/FindVUK 0.96 -0x85F6FD89373D77F43D6AD32F3606392B5B38C364 = THE_HOST | V | 0xB3A40FDB08CFEBCD28A17D5A669C0D4A ; MKBv38/FindVUK 0.80 -0xD6F70EDE8632CD9C483587581666942A4A5E07B4 = THE_HUMAN_CENTIPEDE (THE HUMAN CENTIPEDE | V | 0x52ED1E0F30F428D6A2AC511A00E7D246 ; MKBv57/FindVUK 0.96 -0x38C0848778B9DEC3D3A18275FD3AB45705E9040B = THE_HUMAN_CENTIPEDE_2 (THE HUMAN CENTIPE | V | 0x7537425AFFA576EE117C7D8E85A5EE51 ; MKBv57/FindVUK 0.96 -0x9F0CD7EA0FA47063FB5DD0EBA02EE3836F139AC4 = THE_HUMAN_CENTIPEDE_3 (THE HUMAN CENTIPE | V | 0x850C32A093C9D27103B6E151F666BCEB ; MKBv57/FindVUK 0.96 -0xD38EC1E7CE27412BB6FB432B1399116539517818 = THE_HUNCHBACK_OF_NOTRE_DAME (The Hunchba | V | 0x40E15C74F5B6D67EE41381C1DBDC458E ; MKBv53/FindVUK 0.96 -0x853DF8E6F7AB9D3265AAEE4B85E780FD85D51DA5 = THE_HUNGER_GAMES (The Hunger Games - Blu | V | 0x1E66B8AE5801FDC0B9E865328ECF3B3F ; MKBv31/FindVUK 1.02 -0xC3C0029FD1A3FA8F7EAF73905CCA85626026B1BA = THE_HUNGER_GAMES (The Hunger Games - Blu | V | 0x2861759AEE35AA32C3316BF224678FC2 ; MKBv30/FindVUK 1.02 -0x79E93426CD60C9A40D5511A53E7A3BB6FDF9F7BD = THE_HUNGER_GAMES (The Hunger Games - Blu-ray™) | V | 0xB4E26EFC31EF48FC8847C69E72D15B60 ; MKBv31/FindVUK 0.96 -0xF3FE905BBE7AC9E5545595CF53BC6C4C9740F2BE = THE_HUNGER_GAMES (The Hunger Games Disc | V | 0x7D78A08669E19CC4932FBAEEF2014248 ; MKBv31/FindVUK 1.02 -0x747D8E0CB3E01C1787FC375B499E7A836AB41A69 = THE_HUNGER_GAMES (The Hunger Games Disc | V | 0x5E62258CB08CE339E262D25F8546EFE7 ; MKBv33/FindVUK 1.02 -0x9A2B422E794A0E1FDC65B92BB3C9F226D4C5CFC4 = THE_HUNGER_GAMES_CATCHING_FIRE | V | 0x3C650784F36CAEA214FB52A03DAEB010 ; MKBv46/FindVUK 0.83 -0xF4E088FE2844258B048EA6AB1A1696CF8252401D = THE_HURT_LOCKER | V | 0x76C92D71CAF7356080A45B9E9CE4DF9C -0x636C7BB5D77400C7F75BD5D15930F79BB32B35E8 = THE_HUSTLER (The Hustler) | V | 0xECAA3A548F145D158177B648F2F3EC05 ; MKBv19/BD+/FindVUK 0.96 -0x920951B7608B49FDE0093B1B92F1292AE7E5793B = The_Iceman (The Iceman - Blu-rayâ„¢) | V | 0xE7D9CBC3F8792F038B93B9BEB966E651 ; MKBv38/FindVUK 1.00 -0xC395EDF3005A0963BFC60630695E4238FCBCEE89 = THE_ILLUSIONIST | V | 0x2CCCA9BC23B00E83CFD99ED0334F615F -0xC7AAF7A074E419237E63C7A5D9E588A43416A37F = THE_ILLUSIONIST (The Illusionist) | V | 0x7E92FBD021A5652748AA686EBE036635 ; MKBv12/FindVUK 0.98 -0x7D13C837AFECCE110DF8134AA5161DDB36A0BD45 = THE_IMITATION_GAME (The Imitation Game - | V | 0xB4D198B03B013756088C1D42C6F22792 ; MKBv46/FindVUK 0.96 -0x2AB78D17C664C0DD3EC900C66C6BC1E03ECF51F6 = THE_IMITATION_GAME (The Imitation Game) | V | 0x4FDBE39E82E837D4C919DF420FCB77BD ; MKBv50/FindVUK 0.96 -0xA0ED6F0ED2A8038AA2712B3CF2B8E98489F4D0E8 = THE_IMPOSSIBLE (The Impossible - Blu-ray | V | 0x8E88750A6F02689137852756A5D01A07 ; MKBv35/FindVUK 0.96 -0xA6FCA8DF2E031742EDE8B49853A0DC6FDC986550 = THE_INFORMANT | V | 0x94DF5227305717130BB167A1DCB37D3A -0xC12ED58971F18E1F6AE655E64F698A4DFF4CF97D = THE_INFORMANT | V | 0xE609E2C066F7BDB154DDE1820316BCB8 -0x394505F790FDA84BE8C83C972AA2B9DA6B55A98A = THE_INFORMANT | V | 0x7F22810DDA69C2F9424F790B442B1B2C -0x0599789D334D0E1BDFB809C8BA2BAA6B9D1AFD6D = THE_INFORMANT | V | 0x4C4A5EA701AB612CC99814D61BAECAC7 -0x984E13E3F71ACABC495C6632B84A1C326DD8AA66 = THE_Innocents | V | 0xCFFEB6BC756B9BEF78192FA36D7A1C88 ; MKBv17/FindVUK 1.00 -0x2C5C2FA6B036BD69880FA36761D6AD4590142834 = THE_INTERN (The Intern) | V | 0x7BC63884D64995FC4A74D2AA82B5EA3D ; MKBv46/FindVUK 0.96 -0x33BDC81AFD9F73FD4558A9D6673CA5D3497859E2 = THE_INTERNSHIP | V | 0x13FF85E11CFDEDC523BA21499617AC3F ; MKBv31/BD+/BEE/VUKNOTVAL!/FindVUK 0.80 -0xF11C255B67AF58C849FFC99FD4312D1E597B1A78 = THE_INTERNSHIP (The Internship) | V | 0x77FA68962A1EA3D3F846C981BEC2EB46 ; MKBv31/BD+/BEE/VUKNOTVAL!/FindVUK 0.98 -0x6D005537A51A8FABA7EB7CCCDD5B51A421D3AF80 = THE_IRON_GIANT_SIGNATURE_ED (The Iron Gi | V | 0xC139F66BBC30A3929310FC1AFA05C72E ; MKBv56/FindVUK 1.00 -0xED6DAC49F2C96C783E31E3C2932F5908F3BA9DE8 = THE_IRON_GIANT_SIGNATURE_ED (The Iron Gi | V | 0x7794A85FD1808200D5D13EACB7EEDA18 ; MKBv56/FindVUK 1.00 -0xA8EEF8261C4F1B76458BA091635A9D95F187DAB9 = THE_IRON_LADY (The Iron Lady) | V | 0x1616BE4D9F2B32F26162F91749130EAE ; MKBv26/FindVUK 0.96 -0xA00A56919CEFF039F4F76486E4E98789B159FD9E = THE_JACKAL_G51 (The Jackal) | V | 0x5EA568782BDE67CD6D8A053765EC90BE ; MKBv17/FindVUK 1.00 -0xFD786D5A469AC9EFAC595E1C169268A95A96C2DB = THE_JUDGE (The Judge) | V | 0x2E3A9683710655A72565E3D27BF9DFF1 ; MKBv50/FindVUK 0.84 -0xDD3169A87801EBCF694079BDF5B5DCFF46A631FB = THE_JUNGLE_BOOK | V | 0xBADBDCCFC41ADFF0E51109857E062783 ; MKBv35/FindVUK 0.65 -0x652017849DAC347413508CEB7449801B3496F775 = THE_JUNGLE_BOOK (The Jungle Book - Blu-r | V | 0x5141E517050EB8D30309AB369D57EC8F ; MKBv57/FindVUK 1.00 -0x6C40B7AEDBB9BE66EBAB5C2602E4C7930F7D8C59 = THE_JUNGLE_BOOK (The Jungle Book - Blu-r | V | 0x448555E6152699FE3D8A7A2D93AE33B5 ; MKBv57/FindVUK 0.99 -0x8156096013C722ECA4927BD19C68783CB4B5C234 = THE_JUNGLE_BOOK (The Jungle Book Diamond | V | 0x082F048A1C768C5966FF40381D2EBA29 ; MKBv36/FindVUK 0.94 -0x768F9E44F16011E02CE149491D0E76AF48317E66 = THE_JUNGLE_BOOK_3D (The Jungle Book - Bl | V | 0x49FB7D04DB77CCA1C458357D0E68D5C0 ; MKBv50/FindVUK 1.02 -0xC283789FAEBFD9041AF098038E8CDAE0503E1C09 = THE_KARATE_KID | V | 0x1D6E016E818EA2883F1DD7615AF98FB8 ; MKBv19/FindVUK 0.80 -0x484B620EB1F6D31CDD1B25B8E79369AF2B0DBD40 = THE_KARATE_KID | V | 0x0D68C7F58382F9F2CF01A32BE1CC638D ; mkbv18 -0xFC59119CA925284A9E0DC9F0549519CDD1B7BE79 = THE_KARATE_KID (Karate Kid, The – Blu- | V | 0x7476801FD0FA79E84C3FBC89BE03DA9A ; MKBv19/FindVUK 0.98 -0xF6FD8EFC48FA9C5B194CD3D744E4148ACEFE6D77 = The_Karate_Kid_III (Karate Kid III, The | V | 0xE0FE579049AF6F2D4919E0E8804070FE ; MKBv47/FindVUK 1.02 -0x7BCE30CEC0171024ED97372C005E99F2A43B85CB = THE_KARATE_KID_PART_2 | V | 0x95973BF0379BA80C06A2C534D8B7BA07 ; MKBv17/FindVUK 0.89 -0x6B3D4C5927DB8AC9B94549AF3E33C636870571FC = THE_KARATE_KID_PART_2 | V | 0x4DB12A2A12418E8F0ABDBC603D54D741 -0xE00F8989994D22CFB7C99A0CE9FD6C499C03BC20 = THE_KARATE_KID_PART_2 (Karate Kid: Part | V | 0x5CFC7D66BEEB6528BC79B97A23F8B348 ; MKBv16/FindVUK 1.02 -0x5CBBE836F03F58ED5C34DAD57BA352F35A30F4BF = THE_KILLERS | V | 0xA7B235F030337108C6899DAD3F3074B3 -0x5018AC80DCFCF62BDD53A3186D5C4844CE2C666E = THE_KILLERS | V | 0x0816C507C9826072E82AB9D1F60BEA93 -0x2C4573FDAC5C20140D7F56AB3A4AAE30B1F10F8A = THE_KILLING_S1_D1 (The Killing S1 D1) | V | 0xF27B35C478E3DAD12AB1324B299F189D ; MKBv35/FindVUK 0.96 -0x970668809E0CBED161DB2C0BF661DCCC85C08DBA = THE_KILLING_S1_D2 (The Killing S1 D2) | V | 0xAFD44D0B582A200701868B9C4709A4D4 ; MKBv35/FindVUK 0.96 -0x69A7A2FB81770D004A0507EB50DCE87C2E486B9A = THE_KILLING_S1_D3 (The Killing S1 D3) | V | 0x41ABFB8F94F1672F2D63C50B31864ABA ; MKBv35/FindVUK 0.96 -0xF85ED6EB18A38336290D8FE79B5ED6D6ADB1BBA0 = THE_KILLING_S1_D4 (The Killing S1 D4) | V | 0x26E6B2C9E2C001149C10C90428BB6DAA ; MKBv35/FindVUK 0.96 -0xD5C9CFB146833F4CAEE4743E34FDDE0DE5B3CF29 = THE_KILLING_S1_D5 (The Killing S1 D5) | V | 0x5301A35EC7EDB783F15BF4402354C261 ; MKBv35/FindVUK 0.96 -0x1935BDDBC815D3A87BAD6A9D087C8F88A67F21D1 = THE_KILLING_S2_D1 (The Killing S2 D1) | V | 0x61637ED911A47538ED6F454E480BD522 ; MKBv35/FindVUK 0.96 -0xD267ED23A63FC18D5734FCBEFEA515C48DDC2435 = THE_KILLING_S2_D2 (The Killing S2 D2) | V | 0x90E30BCB00F24F4630BB109D557E0511 ; MKBv35/FindVUK 0.96 -0x3433E28C7DB39FEA733AA52546D797DDD4B27D61 = THE_KILLING_S3_D1 (The Killing S3 D1) | V | 0xF6EE82ED91213B295390ED505851EAB1 ; MKBv35/FindVUK 0.96 -0x80A58EDC42408F5E6B3D665AF44C8838B21C9A65 = THE_KILLING_S3_D2 (The Killing S3 D2) | V | 0x6EFB532F22BBC4B4763DCDDBEA3137D9 ; MKBv35/FindVUK 0.96 -0xD3EADE647C37E319BFE0090D8577A120C73561C0 = THE_KINGS_SPEECH (The King s Speech) | V | 0x046354F123EC7CF2283571A1F5FFD1AE ; MKBv21/BEE/FindVUK 1.00 -0x470CD55207DFB4BB35C165B8AE87A0A92D2DEE29 = THE_KINGS_SPEECH (The King???s Speech) | V | 0x104F9BBD2EBEC93C610E897FE1A9DACC ; MKBv21/FindVUK 0.96 -0x9CF14237870FA469A853F3D20BAF48EF128A7827 = THE_LADY_FROM_SHANGHAI | V | 0x48787D6143C08B324A391B1E389A2F14 ; MKBv56/FindVUK 0.98 -0x87EEFB8A44602B06BE994BAA13BC68C5138F055B = THE_LADY_VANISHES | V | 0x6E68FD724BCA33B176D0BAB7C8F4DFBD ; MKBv49/FindVUK 0.94 -0xB1FCA7C2C472456C87A4B82640BFA9EA9B8FD015 = THE_LAST_OF_THE_MOHICANS (The Last of th | V | 0x6DAE0AD92A71A96DE717CBC4326A3FC0 ; MKBv28/FindVUK 1.00 -0x9F61E32A55C931A7D20B50A3934685835DE8ADB4 = THE_LAST_WARRIOR (The Last Warrior - Blu | V | 0xC328559C2790031D70ECEA61160FB18E ; MKBv30/FindVUK 1.02 -0x69BE04C0179ED86F6EB6A28FFD7F4CB9AFD10388 = THE_LAST_WITCH_HUNTER (The Last Witch Hu | V | 0x2F537AC60D623C7CA7059FCB10EE515C ; MKBv57/FindVUK 0.96 -0x96892801C2A4344C8744CD91F2AB82E461879652 = THE_LEAGUE_S1 (The League - Season 1 - B | V | 0x5BC63963DF115CD64ED64586A94E2F16 ; MKBv17/BD+/FindVUK 1.02 -0x6CDA75264610667548E22AF94899842E143289A1 = THE_LEAGUE_S2_D1 (The League, Season 2 D | V | 0xECBC5343851551F74A3573B1FD6DC40B ; MKBv19/BD+/BEE/FindVUK 1.02 -0xA71395AF31F6BACDCDB6C4D2A3F0760D65FA5916 = THE_LEAGUE_S2_D2 (The League, Season 2 D | V | 0xF05E3D5628396F6D9543D8CFD9E723EA ; MKBv23/BD+/BEE/FindVUK 1.02 -0x1D6FE01588E3CDEAD6ECFA0F01338E3CAFE8AB86 = THE_LEAGUE_S3_D1 (The League, Season 3, | V | 0xD632C58E5AAC52CE75EB581256710966 ; MKBv27/BD+/FindVUK 1.02 -0x015853B258BA348B57EB5AE24412356AD26E678B = THE_LEAGUE_S3_D2 (The League, Season 3, | V | 0xDE2B4F5C17C8BFCCD8DFC8BF604CB02A ; MKBv31/BD+/FindVUK 1.02 -0x54DAC6641A9D92961F70A745EB68BAD39CC00D0E = THE_LEGEND_OF_GOEMON | V | 0x4A642CFEA0673BFDAD61F90D0832263B ; MKBv17/FindVUK 0.80 -0x5126ECCE07D4EB053C737D0B2E118EA8658705EF = THE_LEGEND_OF_TARZAN | V | 0xD04921DEB969EE25764062211B4D6AF2 ; MKBv62/FindVUK 1.02 -0x5DB5BA77C8C0DA13266B971FAB500428BEAAD1F3 = THE_LEGO_BATMAN_MOVIE (The LEGO® Batman | V | 0xFB259F5545DE7A43A36FA1B63832E8BB ; MKBv62/FindVUK 1.00 -0x952110C18741D972813C25675B62F056517B4190 = THE_LEGO_MOVIE | V | 0x7C7C55CC3B9E52BE04F70396006030ED ; MKBv46/FindVUK 0.96 -0xE6795AB20470304AFA01955904FE995586894269 = THE_LEGO_MOVIE (The Lego Movie) | V | 0xB8ECC3DB7C228B49AD6604197927327A ; MKBv46/FindVUK 0.96 -0xAFED4B460596D3F75251560F3B54DD986580F144 = THE_LEGO_MOVIE (The Lego Movie) | V | 0x3C8B11FCB0CBAC6DBE47073C94AF9363 ; MKBv39/FindVUK 0.84 -0x987560A048CA6EEDB570FADA04B5FC9A4BAC06B3 = THE_LEGO_MOVIE (The Lego Movie) | V | 0xB2D3DDD542418D2374FE2B8E063CAEF7 ; MKBv46/FindVUK 1.00 -0x072D0ECA7AA07AF035FFD3ABE4CDFA981BFAAB8F = THE_LEGO_MOVIE (The Lego Movie) | V | 0x52027A15EB20886BB0434E93178F65A4 ; MKBv46/FindVUK 1.00 -0x3F8D8EA8F34E2BFECC21069C0FA6EF3A218CEB3E = THE_LEGO_MOVIE (The Lego Movie) | V | 0xF4D385E38B0AC702E118DC6F285B0AF0 ; MKBv39/FindVUK 1.00 -0x11D7C3D803FF07C541CC63C618EA77642FBD06F2 = THE_LEGO_MOVIE (The Lego Movie) | V | 0xDCBCC413E2BDBA869B6AC7355FF1596F ; MKBv46/FindVUK 0.83 -0x49F391A18C6381D9CA9BFD19D32A7F0A591CF488 = THE_LEGO_MOVIE (The Lego Movie) | V | 0x98BB4691602E191748C2F55A6574EF1F ; MKBv46/FindVUK 0.83 -0xC3A74A968594F969E64D7708BFF6A2B844F31262 = THE_LEGO_MOVIE (The Lego Movie) | V | 0x24F93F0736F8DF5EFCF4C2C05BE79714 ; MKBv46/FindVUK 0.94 -0xDBE84228319B7A17F9B9EF90B0BF2D683212B83C = THE_LEGO_MOVIE (The Lego Movie) | V | 0x0B7B75FD3D7FFF95CC897D48C4DBE96F ; MKBv39/FindVUK 1.02 -0x9CC06AC3E0F7283A7C3A9B04788DF030DE5C2D63 = THE_LEGO_MOVIE_SPECIAL_EDITION (The Lego | V | 0x611CD7DBC10D49AA6537286B342423A5 ; MKBv56/FindVUK 0.96 -0x0A78862DFE3C9B502AEB73D6F986BEAA48691DC1 = THE_LIBRARIAN_3 | V | 0x9847C79475D4E2A1B6EB1B244EEAF9A3 -0x7A5ECC3C0399E3EFB4FB05F24B8AF964C7D9BBAC = THE_LION_KING | V | 0x664340109C2D63CE3F683AD44B7B8517 ; diamond edition (if that helps) -0xD48BF4B06009EB9267C360BD69F615225A8450D7 = THE_LION_KING (The Lion King Diamond Edi | V | 0x71B1144FAD510F23790FE74746C030FA ; MKBv23/FindVUK 1.02 -0xCF5E5C69B6EBAB352CA57D9E2331690DC186AC64 = THE_LION_KING (The Lion King Diamond Edi | V | 0xF1DBDF468C42794087B02178F19F4AD1 ; MKBv19/FindVUK 0.90 -0xBC1C518BCA95F97AC14627682260B984122A4F53 = THE_LION_KING (The Lion King Diamond Edi | V | 0x6D5A779458CB9F62D6D87196EE3E66BC ; MKBv19/FindVUK 0.92 -0xF902AA0CD377F9403088D5DADAD2F90A72910BD9 = THE_LION_KING (The Lion King Diamond Edi | V | 0xC0EB6AA7375A81C5A018FB04673ED9EB ; MKBv19/FindVUK 1.00 -0x30896412930B54F0A47F806AFE06FEE440DFC7FF = THE_LION_KING (The Lion King Diamond Edi | V | 0x8254F08130C21077965D480FED77F3CB ; MKBv23/FindVUK 1.00 -0x1E127B2CA26E14D1E303B05F20216E68B89144CD = THE_LITTLE_MERMAID | V | 0xE7B7AF3206764E75E8B42CCD313A4355 ; MKBrev 36 - FindVUK 0.53 -0x1200A04D0B18E25593275364710416D7A2C16811 = THE_LITTLE_MERMAID (The Little Mermaid D | V | 0xA4A4344108A313BA4BF094A474495C32 ; MKBv31/FindVUK 0.92 -0x438B188F403F5484CEE4DF827282CF5D3A005711 = THE_LITTLE_MERMAID (The Little Mermaid D | V | 0xD88E17FCB30D1DEA2CDBC2FB2F8EE826 ; MKBv35/FindVUK 0.94 -0xC91648EDE6CB8D879430A575A4A8B05F12CB06BA = THE_LIVING_DAYLIGHTS (THE LIVING DAYLIGH | V | 0x61959113265231AAA95DAEE3B02F4FBC ; MKBv27/BD+/FindVUK 0.92 -0x458C8921EAAF711C0B9BA29462B8F3A7506BA8CB = THE_LIVING_DAYLIGHTS (THE LIVING DAYLIGH | V | 0xEEE8DD7C59E3E7E449E27C97D4D9D22A ; MKBv27/BD+/FindVUK 1.00 -0xB2CBC33F37D1A7B6D0F50EEC8146A0A43652E09D = THE_LIVING_DAYLIGHTS (THE LIVING DAYLIGH | V | 0x9143811C1A25A5AA6FEB3892AFF8B43E ; MKBv27/BD+/FindVUK 0.84 -0xEE9D9A76032372C88E65C3DB6DCF9FC6D71C390A = THE_LIVING_DAYLIGHTS (THE LIVING DAYLIGH | V | 0x27D007D9298BF7847D52C494314CC309 ; MKBv27/BD+/FindVUK 1.00 -0x38014A2F1162E65D18F88BD36A19DEA37121B875 = THE_LIVING_DAYLIGHTS (THE LIVING DAYLIGH | V | 0xBBD1536C19741CC18EF679FD0690AC3B ; MKBv27/BD+/FindVUK 0.99 -0x48387289BF124DF114B0C26204D403F5C1AA1360 = THE_LOBSTER (Lobster, The – Blu-rayâ„¢) | V | 0x79022A0A3DE93849A94C5AD0365B60FE ; MKBv62/FindVUK 0.98 -0x97B0C6735F2C4F2FEDD7AE284FFEA6720AAB949A = THE_LONE_RANGER | V | 0x95BFAAC01C80C2CEC444488FB21EB9D8 ; MKBrev 31 - FindVUK 0.53 -0x53758F4C5DB634ADCA6DD23B6DEC9BB7970B8C3B = THE_LONE_RANGER (The Lone Ranger - Blu-r | V | 0x67FFF523C499634D8679FDCF8EA4983E ; MKBv31/FindVUK 0.98 -0x5169F952C970E9E672244F47DC2609641B0A3DF0 = THE_LONE_RANGER (The Lone Ranger - Blu-r | V | 0x1886A2E31000CDCD757E4F93B3BE4963 ; MKBv35/FindVUK 0.87 -0xFDEA13DF8DE5C3C5C7C8892293770D8DBA67C185 = THE_LONE_RANGER (The Lone Ranger - Blu-r | V | 0x0B751B89FB4AD3C508B7B4266E693724 ; MKBv31/FindVUK 1.00 -0xECF31FDB66E44692172AD23618FDB9F471C69C4D = THE_LORAX_3D_G74 (Dr. Seuss' The Lorax T | V | 0x92096377F0B70776B015493D9A21E1D6 ; MKBv27/FindVUK 0.90 -0xD0455B669422EE10C9B9AAD0220DCA8DBCEE8DAE = THE_LORAX_G54 (Dr. Seuss' The Lorax) | V | 0x22CEF3CEC48ACAC6EE9C6CE733038EBC ; MKBv28/FindVUK 0.94 -0x896883219C95CDCB84A8D627BA0EE2F53670D6B9 = THE_LORAX_G55 (Dr. Seuss' The Lorax) | V | 0xE078F72DD41726F6E87719600F22B7B2 ; MKBv25/FindVUK 0.89 -0xA2BAA6F28315CDC6C9210EF063909EE068852874 = THE_LORD_OF_THE_RINGS | V | 0xFEB6D46B51281B3AE1E4D39B0059D351 -0xF151FE86A01F247662FA60B90B141B1914682B0C = THE_LORD_OF_THE_RINGS | V | 0xC62CC9A5C3153681B1AD4CAC22F5BBB2 -0x16CF4FCDBB696C242C53FCAE9DA2CEA2451A17DD = THE_LOST_BLADESMAN (The Lost Bladesman) | V | 0x7387D166C8465DF1E4AB1053D84E6089 ; MKBv25/FindVUK 0.84 -0x7F8E72B66D4470B2A91C26D9F163E1EA24CCC95F = THE_LOVELY_BONES_D1 | V | 0x4C8E381E4EAC5A7BBF0067415AE9CCFD -0x9E14077F88387398E438872B7283E347862F023E = THE_LOVELY_BONES_D1 | V | 0x337E2886E505776230F51E6C5665719F -0x1E40748FB57932AB0099C15DA9ADC10E6905339C = THE_LOVELY_BONES_D1 (The Lovely Bones Di | V | 0xF13AA97A65740C9647E9F7AC550D5F00 ; MKBv16/FindVUK 1.00 -0x938E3844BF617D8F6E2ABD07E41297D0FCEC4FAC = THE_LOVELY_BONES_D2 | V | 0xCB9E7B0B120ECCB934A36398532B7526 -0xD9E217240BE115E2E720320704ECA756FC1FE473 = THE_LOVELY_BONES_D2 (The Lovely Bones Di | V | 0xE59B156E02F0F76E0869EF90725F74F6 ; MKBv16/FindVUK 1.00 -0xFE00B2E1DC8E8524D90E51BF053C3DABC7C6F2A9 = THE_LOVE_GURU | V | 0x687FA679619470CB61C62E78E71ADD12 -0x1EBD7825238922F0665A646F4D0814F06C0A3449 = THE_LUCKY_ONE (The Lucky One) | V | 0x3163A1629B090A81FAC0DA5E5FC4669C ; MKBv31/FindVUK 0.96 -0x2BCD73CC0662620DCFA4E5F39DA327527D14B1B1 = THE_MACHINIST | V | 0x568865EF09BA27813773C415ECAA36CC -0x814E872CB2A0DB292973629F1D968737BA88C15B = THE_MACHINIST_AC | V | 0x77B975087AE03D26035CF683AE38F6A0 -0x0AABFCEFD3C7F77DA2994669F680BF89363E5706 = THE_MALTESE_FALCON_BD01_DIM1 | V | 0x0E68E81EA920CA42B7CEE79EA9BF2EB2 ; MKBv17/FindVUK 0.80 -0x39945C2CDDE2FAB5D205A4DB18B3E5CB3985E30D = THE_MANCHURIAN_CANDIDATE_BD (The Manchur | V | 0xA035F1313304FA0D68BC268D80C25AFC ; MKBv21/BEE/VUKNOTVAL!/FindVUK 0.96 -0xD6643291B41C01D12951CA51DC8C4A119CDF446C = THE_MAN_FROM_UNCLE | V | 0xBCE2D34B8412E7DBC4E2C97C3740B145 ; MKBv57/FindVUK 0.95 -0x6198394C22C328EF92B35D0B3850A7B084409000 = THE_MAN_FROM_UNCLE | V | 0x842B3817558A77ED3A98E156CCB8193E ; MKBv57/FindVUK 0.80 -0x7FD3890492C9A7DC9A891FD4249CCEAB5FACF255 = THE_MAN_FROM_UNCLE (The Man from U.N.C.L | V | 0x0664B2956023BE9834F5BB69874D8C42 ; MKBv57/FindVUK 1.00 -0x2B825F4D9C53D4F6A80F9431B2D24D21DFDDB441 = THE_MAN_WHO_FELL_TO_EARTH (The Man Who F | V | 0xF99C4F7A5B5CDC1A87A1C26951550E80 ; MKBv61/FindVUK 1.00 -0x44B30A6336BC718B907E2EB4F1C8FAF065B75BED = THE_MATRIX | V | 0x4D095543E822DED9388E2EB88B23E948 ; MKBv8/FindVUK 0.98 -0x12330CA8AFD64D6951359C79170A3163172F5171 = THE_MATRIX | V | 0x365B499011DBF2D4535A7D0F10060057 ; MKBv8/FindVUK 0.96 -0x355BF6B52675628B64ACD34669C8B276CA4A6F82 = THE_MATRIX | V | 0xCB57AC43E268853371A86C30E315AFE7 ; MKBv8/FindVUK 0.99 -0xFCAC7BD389C443538E44CAEC163B5454EB94EE44 = THE_MATRIX | V | 0x35A97E5919AEE8F3EC403364D50DCF75 ; MKBv8/FindVUK 0.92 -0xBE3472878C9AA34F8F21E0EBE9D53D4D16C1572A = THE_MATRIX | V | 0x6F5A3295D515E5958CB960A065129682 ; MKBv8/FindVUK 1.00 -0x8F3562B000437244BE87249CBC112ECA11A57DA4 = THE_MATRIX | V | 0xD812B55F6576854E86006D21001C7796 -0xEE8E9CC411552702919077802DEAD29D17D11296 = THE_MATRIX | V | 0x3C536A74A28D823D6C781CFD4977CF08 ; MKBv8/FindVUK 0.96 -0x82A3472C13A161F6528AF0EA4DE2C55642CA79E1 = THE_MATRIX | V | 0x4E135EC9D8731DFDCBFA86456619031E ; MKBv8/FindVUK 0.96 -0x529CA537CF30EC68C684DBF3407186A6DCC02FCD = THE_MEDUSA_TOUCH | V | 0xF32CDD69B72B7AC39E5346B7CBFB0312 ; MKBv48/FindVUK 0.80 -0x1D098BECC0E8804FB130B4E79829831B766D1B39 = THE_MENTALIST_SEASON_1_DISC_1 | V | 0xFA2E47EF47EE13B095A464DF95A4BB2B -0x47BCA473EA6C0AB1FF49C2E1CD01A9D7AC375F27 = THE_MENTALIST_SEASON_1_DISC_3 | V | 0x18B9E5D39EE8B62C41BBA19DA9E27BF2 -0xFC48207D93A89F287E978C0CDBAF73B32A728976 = THE_MESSENGER | V | 0x5F3B9B3F6B8C58138ED099C514703A6A -0x31A28633485AE76FBBDA0F5EFA29AFCAC7BDEBCB = THE_MILF_NEXT_DOOR_4 | V | 0x32E485142B97D08256C5B7EE2590A0E1 -0xC927998F09A58D6A899869196DD19541D5E8DDF9 = THE_MISFITS_BD (The Misfits) | V | 0x807DBB2719E53A36A65FECD65F3A7EBF ; MKBv21/FindVUK 0.90 -0xF47798ED06F99D4A1459133BE03AE531296D1F45 = THE_MONUMENTS_MEN (The Monuments Men) | V | 0x4C3EB48C76FA157D54AB9E374943DDB5 ; MKBv39/BD+/BEE/VUKNOTVAL!/FindVUK 1.02 -0x5B0D42FF352D9D002502F64F191BD4EF63BF5D8C = THE_MUMMY (The Mummy) | V | 0x0CB40AB56C016F94EA92B7C5660389F9 ; MKBv40/FindVUK 1.00 -0xE3CF9C4D31DB42167685E206F2EEFCAD2AC89A5C = THE_MUMMY_(1932)_G51 (The Mummy) | V | 0xB20FD88B09E517F136D321069B8D66A8 ; MKBv31/FindVUK 1.00 -0x5F62852FE41AE593B5C1ACC717165BE4DD3003E3 = THE_MUMMY_(1932)_G51 (The Mummy) | V | 0xA260F2F678A9498BB99C4F9554AC8477 ; MKBv31/FindVUK 0.96 -0x8476034B0207A69DD375F96AB3F9F0DD009D216B = THE_MUMMY_(1932)_G51 (The Mummy) | V | 0x4F75E63247B60F840D05B7579F3C0EF8 ; MKBv31/FindVUK 0.98 -0x8BD44CB3B24954B02485EF950ED64773AAC9ADAC = THE_MUPPET_CHRISTMAS_CAROL (The Muppet C | V | 0x118A7610B0FF8FFA38427BE65E6E1064 ; MKBv31/FindVUK 0.94 -0xFB0FFC014191698432DBFF0A5B551D839AE4D5CC = The_Musketeers_D1 (The Musketeers D1) | V | 0xFBEEE4483D72CFE0DABB2DD92207F66E ; MKBv46/FindVUK 1.02 -0x29A688BE93BA6745AA29EBD8B75CF9AE6AFD1B89 = The_Musketeers_D2 (The Musketeers D2) | V | 0x4B873F24670A8906D0E61EF5F43DAB13 ; MKBv46/FindVUK 1.02 -0x091FD7EDE5AEFC0DFD6F04A4C3837CDBD768BFBB = The_Musketeers_D3 (The Musketeers D3) | V | 0x849271D9D6ED844E70E5844E1B724866 ; MKBv46/FindVUK 1.02 -0xFC44D6970740654E90E462C245FCD6BD4D6FDA59 = The_Naked_Gun (The Naked Gun: From the F | V | 0x80AAC669C306A15ED492985676EA4DCC ; MKBv31/FindVUK 0.84 -0x66776B41D7822379674E65D6D832FDCC541A22F6 = The_Naked_Gun (The Naked Gun: From the F | V | 0x464A89704F63DF0C8E1507DFD3C335E5 ; MKBv31/FindVUK 1.00 -0xE992E9535250C4410ED8798A469DAF124CA6ABE5 = THE_NATURAL | V | 0xDFC1CB3BD05FC68B8F1586C84AC797E3 -0x30EF29BF6C57689CA0C7A3C0FEF48D717E779656 = THE_NEON_DEMON (BLU-RAY) | V | 0x48542316C74B8763D032401333DCBC35 ; MKBv62/FindVUK 1.00 -0xEBDA31725CE06BD62E89229644C2C42DC3557B24 = THE_NEWSROOM_S1_DISC1 (The Newsroom Seas | V | 0x4BF0E4B957D1A6FA18AA3A9CA65332C2 ; MKBv36/FindVUK 0.98 -0x1D3DF577301632BEB508ED55CBEA97A21FF3213B = THE_NEWSROOM_S1_DISC2 (The Newsroom Seas | V | 0xFC32A878A2EF54AF21A009599F965BC1 ; MKBv35/FindVUK 0.98 -0xB700081B8F08959229FF465EBF08964F99156656 = THE_NEWSROOM_S1_DISC3 (The Newsroom Seas | V | 0x372A7C3C64ABBE4277BDE7C114B9D39D ; MKBv31/FindVUK 0.98 -0x6816EA9AB0AD306C208CE3771B2EE72D12C420C4 = THE_NEWSROOM_S1_DISC4 (The Newsroom Seas | V | 0x16F44B96FE80AFA994B7589B062A896F ; MKBv31/FindVUK 0.98 -0x2DA3DF20996BCEC8A1F6F05DB07BB2CD82CE7EF8 = THE_NEWSROOM_S2_DISC1 (The Newsroom Seas | V | 0xFFC8AAF5449D61125AA70647A69D159F ; MKBv46/FindVUK 0.98 -0x1E6E4E944F88DED8A2F9FA7A5193BE638D24B4EB = THE_NEWSROOM_S2_DISC2 (The Newsroom Seas | V | 0x9BB648A8468CC133C982F6700F6100BF ; MKBv46/FindVUK 0.98 -0x25F56DBC1A42877758E0397D7960DE6E06CB5EA2 = THE_NEWSROOM_S2_DISC3 (The Newsroom Seas | V | 0x5AC9465B4993A7713D8BE853EEF95DE0 ; MKBv46/FindVUK 0.98 -0x209EB1D0315FCF9820C8839DE096266D6FF4C865 = THE_NEWSROOM_S3_DISC1 (The Newsroom Seas | V | 0x1CC93EB987C672AB24D947C47BA8BEF8 ; MKBv50/FindVUK 0.98 -0x5866F6B52A5EF077EF88E7A74D6803FFD5070B33 = THE_NEWSROOM_S3_DISC2 (The Newsroom Seas | V | 0x2DE705CCF3E5CA90844C9AB1D77708D1 ; MKBv50/FindVUK 0.98 -0xD3AF98007EB61AA5778A78E96C58BF0956A04887 = THE_NIGHT_IS_YOUNG (The Night Is Young) | V | 0x2E805DA667E2DD74B50740813EB02B16 ; MKBv46/FindVUK 0.98 -0x5EFB504A27F12DE4F134DE2120130750D26421EF = THE_NIGHT_MANAGER (Night Manager, The - | V | 0x63677F1049DB06AA1A5085F8532E6FFD ; MKBv58/FindVUK 1.00 -0xEF30DAEF3D4BD2CC33EDAD3981221FB9F67D4377 = THE_NIGHT_MANAGER (Night Manager, The - | V | 0x8075C898C2BAA3BF2786818F1E66FE6F ; MKBv58/FindVUK 1.00 -0x27E0FC968B2B7F108F1570E3B524433A867AB2D4 = THE_NIGHT_MANAGER_D1_BD (THE NIGHT MANAG | V | 0x4CFB477C93358241694AF0D11A264BE6 ; MKBv58/FindVUK 0.96 -0xB19626218A06A5709FFC96E25D4FBF55AC388F6B = THE_NIGHT_MANAGER_D2_BD (THE NIGHT MANAG | V | 0xD507219C15CD042A46A092EAE9A26BAF ; MKBv58/FindVUK 0.96 -0xE0ED2C1637BBEE4FD73FD3658796DE8651CE08F7 = THE_NOTEBOOK | V | 0xF2CD1018902B510E512FD1AE39BDD5A4 -0xEDB0C14EB2F19E1C00E6FDBA48E14AEAB3917A2A = THE_NUMBER_23 | V | 0xB7A3898FEE736DCBE307D0990712F21F -0x26810E93C9BC79A53877CC543BA83FE1E4E47AD4 = THE_ODD_COUPLE (The Odd Couple) | V | 0xDC92BD93D765D893FC68D5DE16D6F708 ; MKBv36/FindVUK 0.96 -0x55CC042CF87D22994BD24F8C59C504CB5694CF11 = THE_OMEN | V | 0x4D364C7A9331ACE160B851950F8BE194 ; MKBv7/BD+/FindVUK 1.00 -0x3BED399A9E714FC39A19D25AFA51814A4F5554DD = THE_OMEN_F1 | V | 0x51BC32A0AEFF2EADDDC18FA575634653 -0xA1E08A5CC4E6194181879E34AB886F8B9D615DF4 = THE_ORPHAN | V | 0x653D598CCBC67BA3C7379C8E02FBFE0C -0x62AD8DADB0FB2BE0A4AECEABCDAC68E0D161404E = THE_OTHER_GUYS (Other Guys, The - Blu-ra | V | 0x230BA8B5293590C2F42CA1567DCEE034 ; MKBv19/FindVUK 0.96 -0xC9CAA011D6891E9D9A1008F1EF3DAF37E41F7B96 = THE_OTHER_MAN | V | 0x4D7422B350AF82BE2EAD5D0C1E29DA54 -0xE52BE1475EB98CDD7671C7AB04C482C8406D9732 = THE_PARTY (The Party) | V | 0xF6EC3E1787574A26145359A940ADC713 ; MKBv47/BEE/VUKNOTVAL!/FindVUK 1.02 -0x3BE531A22ABC5CA41D0AC392CC98820290F80712 = THE_PHANTOM | V | 0xC175505332EB1EE8C125AFF17766693F -0xB5D8582E33C85E957E72AA706A4CF9B9F3E533CC = THE_PHANTOM_MENACE (The Phantom Menace) | V | 0x3B74EC86E2506C6FA3FC93466F8A0D83 ; MKBv25/BD+/FindVUK 1.02 -0x5CD6FC82252C21A9D5C04157EB7BA9FAAFDCD372 = THE_PHANTOM_MENACE (The Phantom Menace) | V | 0x1AA238C35C13F4CD94F22C7891A5B445 ; MKBv25/BD+/FindVUK 1.02 -0x855D3D6592D2D0BAB12B4CB31F860ED6091A42BB = THE_PHANTOM_MENACE (The Phantom Menace) | V | 0x37ADB0EBD4730403E26D0925C0F8D5E2 ; MKBv20/BD+/FindVUK 0.99 -0x8E6311182E247C2B463824A535CA8CF473524C2E = THE_PHANTOM_MENACE (The Phantom Menace) | V | 0xC9C14B9EB8C91E98C1BF6870868E5E62 ; MKBv20/BD+/FindVUK 1.00 -0xC3044FEEEFBB959F4757662F9404CD60F5F6F186 = THE_PHANTOM_MENACE (The Phantom Menace) | V | 0x8AC8AF5ADB02F04AD8094335C717FA7A ; MKBv20/BD+/FindVUK 0.96 -0x6AADEF625B026946716A47F90592E5064ACFECAF = THE_PHANTOM_MENACE (The Phantom Menace) | V | 0x17D817BD42BDC739BF47422B6FE52E3D ; MKBv20/BD+/FindVUK 1.02 -0xCB9982FCE4E66FD783E20BD0FA7059B7635B49F6 = The_Pirates!_Band_of_Misfits | V | 0xB8A8187C7A754AA6778DCB17DE333B4C ; MKBrev 30 - FindVUK 0.54 -0x3F038E8317DC3C01278C1601A78F94F28FB20083 = THE_PIRATE_FAIRY (The Pirate Fairy - Blu | V | 0x8B5DA50B1CB9495F3FD6BBB805DECE12 ; MKBv36/FindVUK 1.02 -0x248D36E610D6C00DF7CE399274A6D78D03898792 = The_Possession (The Possession - Blu-ray | V | 0xC4414C2DD926889528340795542FC65E ; MKBv28/FindVUK 0.99 -0x7F12EA903B6390D9DE803E33B5C42ABFF3FE4FE1 = THE_PRINCESS_BRIDE (The Princess Bride) | V | 0x7876DBC558D097DD4B0CF8D050600F35 ; MKBv35/FindVUK 0.96 -0xED8402141D6AE7E8C8D492378353586A2804AF37 = THE_PRINCESS_BRIDE (The Princess Bride) | V | 0x3D808C9320830DBC387D77F0571A91FF ; MKBv38/FindVUK 1.00 -0x5475CCCDA1673F2DFA7F23DC142DB5E4559EF297 = THE_PROFESSIONAL (Professional, The (199 | V | 0x3DB5295BB88500481DA642854B542D26 ; MKBv21/FindVUK 1.00 -0x82EC2B978841E41D72981FF12983042B868EE57A = THE_PROPOSITION | V | 0x3B4C275AE919796D2A20194DEC238600 -0x576579700F2B6251D4CE86C7AD845D9F54E9039E = THE_PUBLIC_ENEMY (The Public Enemy) | V | 0x36CB67550337580C33887EF57D2652ED ; MKBv36/FindVUK 0.98 -0xAB9EB679DF1FF3C2CADCFAAE065AF85F291480D8 = THE_PUNISHER | V | 0xDB1FF1FEBBC42C1038905549606DBBE1 -0x2145B2F07C53457A8FDBC39209422850D3783C92 = THE_RAID | V | 0x5A607DBE09B370DBC590F9044A4FE0FB ; MKBv35/FindVUK 1.02 -0xC0CEEEA582907EEDEFA6F21D12674F8023DDCFDE = THE_RAID | V | 0x3D98837A7632F8F014899183673D88FE ; MKBrev 33 - FindVUK 0.61 -0xAD49538E378C4C894EED051E9F509254229B5065 = THE_RAID (The Raid) | V | 0xC74B01BD2FAF9A3B25210ED79036E322 ; MKBv28/FindVUK 1.00 -0xB1D9F96924DEDAB4BEDAFA7D78C35139C714A783 = THE_RAID2 | V | 0x26355F1C2121542C6D1F050AE9D49269 ; MKBv47/FindVUK 1.02 -0xEBBC518FB9ED6421CA734C9703D94AC21BDA9387 = THE_RAID_2 (THE RAID 2) | V | 0xE22417CB8366337E2BD2A2988756E2AD ; MKBv47/FindVUK 0.84 -0xCC8E14E2B3EF30120156F3EB37C11E5C0A4A8CEE = THE_READER | V | 0x53E2C41C33AC4AB3B9E58488161CC835 -0xA9C672EB3106EF9EBA217540884BE52DD7AE97BE = THE_READER | V | 0x5429DF493E239BA8C7C3E4CC55704CDC -0xEE7F1E1572AE7E9F8C3DCBF170225B7C1619A8AA = THE_READER | V | 0xF652C7FFF2E4D9A7B8726CEB359D4218 -0x3591C5C83BE3184B157652F09A798A89698BD1AD = THE_RECRUIT | V | 0xCE9429D1C058D048A620F1A2770C0DEA -0x07309828595AB017215C7DBC785961AF324EE9A9 = THE_RESCUERS (The Rescuers 35th Annivers | V | 0x638EF5B49BAB8D6EF1F04A505A009A25 ; MKBv31/FindVUK 1.00 -0x7087E6AE98E8B6700EA30CCEFAA425BB452FAB98 = THE_RETURNED_S1B1 | V | 0x9970D0777D3E2FEDE0DCF440958DAEA4 ; MKBv49/FindVUK 0.80 -0x3C539F996BEB16D3A5E31611C6486D97CA7743DF = THE_RETURNED_S1B2 | V | 0x62DD0BF292B6142DF96E53F27BB77247 ; MKBv49/FindVUK 0.80 -0x0E4C7630CACCA1D48FF1294BA36D0C2EFF07AD4C = THE_RETURN_OF_THE_KING_EXT_PT1 (THE LORD | V | 0xD26B870930FBC32AD7688DF277D1B9FC ; MKBv56/FindVUK 1.02 -0xA37D83691448848890F275E8EAACA9417281FFE5 = THE_RETURN_OF_THE_KING_EXT_PT1 (THE LORD | V | 0x2156C252E865D32E5632DC78DA8EFD1F ; MKBv22/FindVUK 1.02 -0x3A0801DFF498EED527FECA58DA984BE7A7211819 = THE_RETURN_OF_THE_KING_EXT_PT1 (THE LORD | V | 0xCDDFD07345913732527AB0229C08D75D ; MKBv25/FindVUK 0.96 -0x1A3968F40BADE33B6686756BFD7232933B010708 = THE_RETURN_OF_THE_KING_EXT_PT1 (THE LORD | V | 0x5F943CA839BC5B699698629CCED935A1 ; MKBv19/FindVUK 0.96 -0x912F1E3C64B38D4B5E0FB8B19060F72BD246CCC8 = THE_RETURN_OF_THE_KING_EXT_PT1 (THE LORD | V | 0x4ED7D5C2F782902CD9D101E2425CBA80 ; MKBv25/FindVUK 0.84 -0x914D06F532AFD80B34BDD04CD8E9B14BC1A08C6C = THE_RETURN_OF_THE_KING_EXT_PT1 (THE LORD | V | 0x7BCE80F130C594202287C577582B0CED ; MKBv25/FindVUK 0.94 -0x9360EB0E1E3A533ABBE4B825BF93B0FD6BD54A42 = THE_RETURN_OF_THE_KING_EXT_PT1 (THE LORD | V | 0xFABA9671E5AA30FA83B4088564033A1C ; MKBv19/FindVUK 0.92 -0x1273FD26CC6F308B08ACC335A21617D2BA8600C4 = THE_RETURN_OF_THE_KING_EXT_PT2 | V | 0x54938943FAC9C046CE6F6E34D81BDADF ; MKBv23/FindVUK 0.80 -0x581018919CDE2339C262D86FFD0C223E532499A0 = THE_RETURN_OF_THE_KING_EXT_PT2 (THE LORD | V | 0xBB9C19A216FDA1E484B76E4B29F4222E ; MKBv23/FindVUK 0.94 -0xBD27A874D99AA2648240453BEDAC4D3F56DB693B = THE_RETURN_OF_THE_KING_EXT_PT2 (THE LORD | V | 0x9D0718E756AEF4D5A01187ABC05C7229 ; MKBv23/FindVUK 0.96 -0x91C2170DE30101933CB2CF75D4DC8B69DEFDD9F7 = THE_RETURN_OF_THE_KING_EXT_PT2 (THE LORD | V | 0x26CE8BFAA6C37AD03F383DE14BA9F621 ; MKBv19/FindVUK 0.96 -0xF1FE2FB04AC23136CB55EB5BEAE98B2D536EB95C = THE_RETURN_OF_THE_KING_EXT_PT2 (THE LORD | V | 0xAFEA7E319C265291BC0630E64038A8F0 ; MKBv50/FindVUK 1.02 -0x5721C812CB756106EEDBDD17F4E5B69ED6FE3770 = THE_RETURN_OF_THE_KING_EXT_PT2 (THE LORD | V | 0x005082B2DDCBD2E20E4B354072335A9D ; MKBv22/FindVUK 1.02 -0xD8E31830FBEA2947A5C80351F5E8F1B8E35660DA = THE_REVENANT (The Revenant) | V | 0x95A901C7AA6AABFEE930CA56A3CA3C18 ; MKBv46/BD+/BEE/FindVUK 1.02 -0x067155017E2B743FDF4FFD1117948404E67EF543 = THE_REVENANT (The Revenant) | V | 0x42F0B902BBDC53BCA662F34B1ED50244 ; MKBv46/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0x6CEA56BCD55A7386BE13CA29A4D9C2715A1784F3 = THE_REVENANT (The Revenant) | V | 0x9FDE34D586BA38C1321B1C3699B64290 ; MKBv57/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0x010E0854E33B1FAC43041F1009CB69F5394EC9C3 = THE_REVENANT (The Revenant) | V | 0x1C7662176E9E68E5D891A581E1979A3C ; MKBv46/BD+/BEE/VUKNOTVAL!/FindVUK 0.92 -0x78975D471BD3AC6F7B1D19A7836D1399EE7D7732 = THE_RIGHT_STUFF (The Right Stuff) | V | 0x8BE3EFD72CE3A7009B6B1469A1762F9D ; MKBv42/FindVUK 0.96 -0x2678855C131F1C544DCF80DE7A2799FD6ADCF140 = THE_RING_AC (The Ring) | V | 0x4B9B619BB0064CE1F99BD0A92BB39601 ; MKBv28/FindVUK 0.96 -0x16F1FF9ED1C28D8726559E96A45F890A9EC67460 = THE_ROCK | V | 0x225C2E3BED2365CBCEAE0170BE2D31F2 ; MKBv3/FindVUK 0.98 -0x227FAF5763E93053BE2E0769CD4C16FF7D9FD94D = THE_ROOKIE | V | 0x2DFD768A7F4B4CB1630AC26BB324F24C -0x9C67FD945343CDE15D7A23F07BC313C64A511F22 = THE_ROOM (The Room) | V | 0x5F063D282E44C8FE5E8F77563D7DE7C7 ; MKBv61/BEE/FindVUK 1.00 -0xC1B34CF3C908CEEC0547835F1E71D360D7BE529D = THE_ROOM (The Room) | V | 0x4AA8BF953393BC49A4E03AE30F7CD5C2 ; MKBv61/BEE/FindVUK 0.98 -0x2B1F16ED844AA983D451365A0C8BE171EA6C30DE = THE_RUINS (The Ruins) | V | 0x722F663065524018C7CB80F471B72549 ; MKBv7/FindVUK 0.84 -0x077C22EE62F4F6DEB9EA78309850340D82D0D45F = THE_RUNNING_MAN | V | 0x018C6588FCB3429D48C699DA504F0B92 -0xDBDE28126F26F8297B85C73F1D980920B7A803AC = THE_RUNNING_MAN | V | 0x09C2AF450C45590C2065260C6DF1638E -0x867ABB6C3B31B00A9D700BCE4B1FC394D1AB35CB = THE_SANDLOT (The Sandlot) | V | 0x20C43020731BD232E9C04309B431D378 ; MKBv19/BD+/FindVUK 1.00 -0xF0BB629DD9EA961157F719E3C06DCDAF33496241 = THE_SECRET | V | 0xE03ABB49280B5B185330B52146613750 -0x82393E4CA152FE69F35EBC17F9586AFBB51D9795 = THE_SECRET_OF_KELLS (The Secret of Kells | V | 0x369E964C936E5775D1184C5AFA5DFDFF ; MKBv19/FindVUK 0.94 -0xC5D59BD94664C34A9670044A69F322BEB7195BAA = THE_SIMPSONS_S20_D2 | V | 0xF24806C32F9EFBE5EB76130439427E9C -0x57A1C15FAA799CD1C0C82CE2DD4F1D2D7F393F27 = THE_SLAMMIN_SALMON | V | 0xDFA845FEA379C59E7C6F4233B653556F -0x68C28EC6F6420C62DEB4263E5665667E648BB604 = THE_SMURFS (Smurfs, The - Blu-ray???) | V | 0x78AFE9FDAFD1AF827D761C649B2B0FFA ; MKBv25/FindVUK 0.92 -0xB4DD5AA5AA4CA9316D099915824C5FDF20D8D2C9 = THE_SOCIAL_NETWORK (Social Network, The | V | 0x1844B706288EF3B0FA3413AFFA67A782 ; MKBv19/FindVUK 0.96 -0x989A9D3072FF2AB3E3AD07FBDF0005209A611046 = THE_SOCIAL_NETWORK (Social Network, The | V | 0xAFFBC36B864D3F4CD4005508015C58CD ; MKBv19/FindVUK 1.00 -0x48FCB60B2F91980B24ACD88FD175785394F084AA = THE_SOCIAL_NETWORK (Social Network, The | V | 0xD47B2A7CE388E1C0E889DAA131DC7F5B ; MKBv19/FindVUK 0.96 -0x56B75F4BB33004314AF4EA70885AAF3054EB1463 = THE_SOLOIST | V | 0xD56ED316028977815500898589FCD8C4 -0xB13DA419FDD721F88D7BA89078C76EBFA8C673B2 = THE_SON_OF_NO_ONE (The Son of No One) | V | 0x6F7F9362C52A60B268411616DB663026 ; MKBv30/FindVUK 0.96 -0x2C9AC1BF3765F71949DE45A3EF1AE1B6646B01B1 = THE_SOPRANOS_BONUS_DISC (The Sopranos Bo | V | 0x9ABB33FA1943CC78B5C20C30096BEFFA ; MKBv47/FindVUK 0.96 -0x523F2F65BB6B8E7C1812C2A4E01E1B626EDBF322 = THE_SOPRANOS_S1_DISC_1 | V | 0x3502088EA6FAE7687247301326EE705B -0xF724FA36A90DE5D3F5D5C374697D244D59AF48EA = THE_SOPRANOS_S1_DISC_2 | V | 0xB43DCAADEE47ED099B75CB9D4B0ACEEA -0xDF63DD8125188BEA3AE7FDA955DACD46C73105F3 = THE_SOPRANOS_S1_DISC_3 | V | 0xEC6E46A099ECBBB71F9D9BCB4B1F289E -0x8225F8EEF090E8E1F9C972C2FA755499152A8105 = THE_SOPRANOS_S1_DISC_5 | V | 0x93750286F42D2930AC919AEEE777B467 -0xB556FD5F818D045170D786459630A1C2F77B606F = THE_SOPRANOS_S2_DISC_1 (The Sopranos Sea | V | 0x1B34137B486E003C2673A206603F0923 ; MKBv47/FindVUK 0.96 -0xB81BEA317C97920D548A4D1B166FA5DC6933954C = THE_SOPRANOS_S2_DISC_2 (The Sopranos Sea | V | 0xC18DDF4C3C9576208FACF9C4CD811149 ; MKBv47/FindVUK 0.96 -0x54C3B8FB008DD68514FFE7399CA59628364FFED2 = THE_SOPRANOS_S2_DISC_3 (The Sopranos Sea | V | 0xEB2969BD7A811433B0F0B2595F0F60E4 ; MKBv47/FindVUK 0.96 -0x39AF75701299613C8CD9CEDD725B647774B2A2E6 = THE_SOPRANOS_S2_DISC_4 (The Sopranos Sea | V | 0x9E012E1BAC58D843D95193C5E84C8C7C ; MKBv47/FindVUK 0.96 -0x9B685FFD516A5429DA55EFA2A03AE6C9BD83B050 = THE_SOPRANOS_S3_DISC_1 (The Sopranos Sea | V | 0x6E7282C5ACAA7DBF251CC091CAF3DDA8 ; MKBv46/FindVUK 0.96 -0xB215B86D5D1486D70671BF9A40CD2E13213BA001 = THE_SOPRANOS_S3_DISC_2 (The Sopranos Sea | V | 0x6FBD33478A9CDC9236DCA80976C976FD ; MKBv46/FindVUK 0.96 -0xCAE56D1CE97CCED67071839841DE65A7524F0363 = THE_SOPRANOS_S3_DISC_3 (The Sopranos Sea | V | 0x30D48D793F88D79D8B859E317DC04854 ; MKBv46/FindVUK 0.96 -0xCACF09F3FFED09F2388B751F47EA68D5A23ADAF4 = THE_SOPRANOS_S3_DISC_4 (The Sopranos Sea | V | 0x0715BA03CA81A995070EEB1592A096D2 ; MKBv46/FindVUK 0.96 -0x4F1C95A03D8BD968EB30FC28C82C69C243A649D4 = THE_SOPRANOS_S4_DISC_1 (The Sopranos Sea | V | 0x09C76FA0EEC03D66549CC4A7E4750029 ; MKBv46/FindVUK 0.96 -0x32B414A032C085AB0B8784F0B5C1FFCEF568A405 = THE_SOPRANOS_S4_DISC_2 (The Sopranos Sea | V | 0x114E9B27DDFBC3A60A083EF7FE2FF97C ; MKBv46/FindVUK 0.96 -0x94EA9792C901EB21E0D1DC4E074F3567CE075262 = THE_SOPRANOS_S4_DISC_3 (The Sopranos Sea | V | 0xC22E08A486A5BCC7FD0D3D2D5C91BE96 ; MKBv46/FindVUK 0.96 -0x2A34F5CA332E9C394DEA5A1230F5BE27E38C33F7 = THE_SOPRANOS_S4_DISC_4 (The Sopranos Sea | V | 0xE8CF305FA9613B1A26B85DF08472BC1B ; MKBv46/FindVUK 0.96 -0xD657165841D6D75675D44BE1BB7D2B0E8FCB7C6A = THE_SOPRANOS_S5_DISC_1 (The Sopranos Sea | V | 0xE67004F3F596C7F3DF254DC5E18B7342 ; MKBv46/FindVUK 0.96 -0x209C2A6B3F9B05F1836F71642FFEDCFDAA80A1D9 = THE_SOPRANOS_S5_DISC_2 (The Sopranos Sea | V | 0x101178A26115B897E38243E9B5227CA7 ; MKBv46/FindVUK 0.96 -0xC1E8BDC017ACC6C96C87DC68A8586DF7642426A2 = THE_SOPRANOS_S5_DISC_3 (The Sopranos Sea | V | 0xA036A023E67CC5EFBED7E987DEFF8549 ; MKBv46/FindVUK 0.96 -0xC7C7A4A77F9DC293641A99EE59C921486AB94CF8 = THE_SOPRANOS_S5_DISC_4 (The Sopranos Sea | V | 0xF003810DC4380C480B8148FBF38050BF ; MKBv46/FindVUK 0.96 -0x29246D019B052CFAC7381FE4E77A2920D881E3C4 = THE_SOPRANOS_S6_PART_1_DISC_1 (The Sopra | V | 0xF1CB0F0E50D46C347EB0997AC888B310 ; MKBv46/FindVUK 0.96 -0xA3B02BB9C5DFDEE3529BA33A41619023DAB2F0E8 = THE_SOPRANOS_S6_PART_1_DISC_2 (The Sopra | V | 0xE21E25DE29A65672441389521C87D042 ; MKBv46/FindVUK 0.96 -0xB23E60A04D3BFCA35627C32A18D35E0F5DD11132 = THE_SOPRANOS_S6_PART_1_DISC_3 (The Sopra | V | 0x867C64B2FE288EC19C276838CD98434B ; MKBv46/FindVUK 0.96 -0x1FE18F8D5B288C2B539A0B408A4CD6C34AADAE4B = THE_SOPRANOS_S6_PART_1_DISC_4 (The Sopra | V | 0x6FE1F58B079E24FE27FF4F834D00F796 ; MKBv46/FindVUK 0.96 -0x4538AD236265C8BF151FB6DBA6DD8BE13F4C510A = THE_SOPRANOS_S6_PART_2_DISC_1 (The Sopra | V | 0x52CE9E217BD74CBF8393A9E076379D16 ; MKBv46/FindVUK 0.96 -0xF0E59453B1822482DB3E93CDA2236D0EF3614521 = THE_SOPRANOS_S6_PART_2_DISC_2 (The Sopra | V | 0x307B501BF56C8E0BE5993B37A85D8140 ; MKBv46/FindVUK 0.96 -0x732C2E2EA22B6AB79FD863F923C96E0C0AADBE54 = THE_SOPRANOS_S6_PART_2_DISC_3 (The Sopra | V | 0x7879AE673399D0675521B2311C1E3944 ; MKBv47/FindVUK 0.96 -0xEC3055582CF39D1FA3D196E544098DA095E1300F = THE_SPIRIT | V | 0xC2DF894A68AAFCDDC6EF3FF33EEAC6DE ; mkb v12 -0x430BF1D617FBC0EFE4EF66F37C3E2349B5F462D0 = THE_SPIRIT | V | 0xFA0D46164F9A473C518D7967E7A5C088 -0xF89F19C9BBAAFF9C08108D61CCC5369BF23E9461 = THE_SPIRIT | V | 0x2E97C2E7F81FBBF0EEB363350F1C1B67 -0xA4B21851A3244AAF96228F08638072926C4F0D42 = THE_SPIRIT | V | 0xD119BF3BE8A31EC77ED95EFDC44CFB44 -0x1615EDFE422B4222711AEDE8A70CD1E2894DFF34 = THE_SPY_WHO_LOVED_ME (THE SPY WHO LOVED | V | 0x7011B98D59E82A5125DA3C7E64261214 ; MKBv27/BD+/FindVUK 0.99 -0x8B52477264800898E1A72C7FF8D7B32EDDC10895 = THE_SPY_WHO_LOVED_ME (THE SPY WHO LOVED | V | 0xD05DFFF7CBF0DA7ED56BDA98794CDB58 ; MKBv27/BD+/FindVUK 1.00 -0x4DC6C934392F566539937B7F63F87637DBF2BA5A = THE_SPY_WHO_LOVED_ME (THE SPY WHO LOVED | V | 0xB00434586810C5346EE83BE4D7C3C375 ; MKBv27/BD+/FindVUK 1.00 -0x968FDBF32A9C57BDB189E2ECC1ABB251FD63A294 = THE_SPY_WHO_LOVED_ME (THE SPY WHO LOVED | V | 0x8F1E1A13D7CC1D77F42BB932F16A7A6D ; MKBv27/BD+/FindVUK 0.84 -0x18676FFBA6E4F27E2363FFDC9E7F39D60F4EE3C9 = THE_STANLEY_KUBRICK_COLLECTION (The Stan | V | 0xE02FCC9990E6605028E8D02F905AB39D ; MKBv47/FindVUK 1.00 -0x5C3E87E1E3C33F4748C240338FDB74CB94303AD6 = THE_STRAIN_S1_D1 | V | 0x65684ABDE876B7BB89D9A0C0BE9DE6C1 ; MKBv47/BEE/VUKNOTVAL!/FindVUK 0.81 -0xDB9AE07310C696858E4371A115B91D06B314672F = THE_STRAIN_S1_D2 | V | 0x46DDF112351AD2838AF53CD08CC83B18 ; MKBv39/BEE/VUKNOTVAL!/FindVUK 0.81 -0x25644FD54CF16DF1B0CCC9E92C312CEA9AEB43E9 = THE_STRAIN_S1_D3 | V | 0xA4000D4137EC3EF02321060D733520B2 ; MKBv47/BEE/VUKNOTVAL!/FindVUK 0.81 -0xD963698DA824B414D61019FBFC49994DF51650C2 = THE_STRANGER | V | 0x3A117C73E9F7F775743A58BB607A675E ; mkbv16 -0xB9919FF007E4AC341548F45BD93E4C8414A39F29 = The_Stranger (The Stranger) | V | 0xAE769815E3429754CE6402A26FA39000 ; MKBv19/FindVUK 0.96 -0x90A565E8251F7C3BCB8171F2AFB8D84F9B500912 = THE_SWEENEY (The Sweeney) | V | 0x94FE357F0A82BC32601FB04B00C277C6 ; MKBv35/FindVUK 0.84 -0x6F6612BB1E9E8C5535DBBD83C111DA523AB5AAE9 = The_Terminal (The Terminal) | V | 0x1516700DF27BA3A7A9C15F2CA4233AAB ; MKBv46/FindVUK 0.96 -0x1197125F0F89144BF1365CC0B5BF75570E6C1BEE = THE_TERMINATOR_BD | V | 0xABA381D3A0EE9C21F9E043FB5DA9CD3A ; MKBv31/FindVUK 0.65 -0xAFD2C5672A378A7CB16CDD1031893E4B12ED8BE0 = THE_TERMINATOR_BD (The Terminator) | V | 0x60654FF81C99DBB1518BE8BC0B831C47 ; MKBv31/FindVUK 0.96 -0x8A3A3EC7E934E617E3F138F31044402EC6F35C9D = THE_TERMINATOR_BD (THE TERMINATOR) | V | 0x708AA8CBA8040B925D8FF608F228C7AD ; MKBv31/FindVUK 0.94 -0x18FDD3A342AE6BB6DB381C4DD97DF574D4FEA7AF = THE_TERMINATOR_BD (THE TERMINATOR) | V | 0x6D75124A92009CDC1D7B4A811B305DA6 ; MKBv31/FindVUK 0.98 -0xECB98DC62D08E826318485FC3DA24FD971E8DC8F = THE_TERMINATOR_BD (THE TERMINATOR) | V | 0xF45B83ABD0EFC6AC142BF0243039E33E ; MKBv31/FindVUK 0.96 -0xFB04C051B346A781E36B0DE4E950C58988053A33 = THE_TERMINATOR_BD (THE TERMINATOR) | V | 0x0B7864210C8869A3D892D1BE4FBE13CD ; MKBv31/FindVUK 0.94 -0x004FCC3F95DCF8F9BB522CA2E6C8F1E0C65CB60E = THE_THING | V | 0xCC06CDC4DE7923BB9BA04F21A2241184 -0xB50128839F6A590BAE391B783360ECC0C714BC50 = THE_THING_2011_G51 (The Thing) | V | 0xDA66DBD1653D9B9D533E7C82A39FAE52 ; MKBv25/FindVUK 0.96 -0xE8A6B2E4C014BDFBCB9715876E131383774CE989 = THE_TOWN | V | 0x94B3210EFF3BA08731DB843C4BA79006 ; MKBrev 19 - FindVUK 0.54 -0xA43E265E95961548816F7D05205B0846E8E78648 = THE_TOWN (THE TOWN) | V | 0xF1AAEA187D69BD7E5320DEB2655D6B71 ; MKBv19/FindVUK 1.00 -0xE579940034F70760C50AAE4ADAAC124727558DA4 = THE_TROLL_HUNTER (The Troll Hunter) | V | 0xBF0884C1CC2C31565481BD4BAD858F63 ; MKBv19/FindVUK 0.96 -0x0FC3D9662396E33C22FE8E86631F946E5D8C0673 = THE_TRUMAN_SHOW_EU (The Truman Show) | V | 0xB3650E5A2823F091681B3A086FBA72E5 ; MKBv12/FindVUK 1.00 -0x5F72487EDD1ED1099C0039E0ADF2B75751D2D4C1 = THE_TRUST | V | 0x0CCA1619B640851D1A71BB0A0A99F4D6 ; MKBv58/BEE/FindVUK 1.00 -0x87D8CEB5628C30EF22155BBBFCDBC34BBE0B621C = THE_TUDORS_S4_D3 (Tudors, The: Season 4: | V | 0x0A9C4813B6BC88727910ED47993628C6 ; MKBv19/FindVUK 1.00 -0xAD95C65F171627D0A51FA3D92E35EFBCE4DD6435 = THE_TURNAMENT | V | 0xB8E7C5D1C3592E279F352CECE965956F ; MKBv16/FindVUK 1.02 -0x8C2B89BE218C928143538F818628C5538B9F86D2 = THE_TWO_TOWERS | V | 0xF8F8EFFB7E7743718791B6D278C41F70 -0x9EB6C33CA6788E090A09F9301EB6934B8E3237D8 = THE_TWO_TOWERS | V | 0x0160176C7B2A5564D3A93BF24D512015 -0x77350C57E2246FF53DFA9F75412E94C4F4446B0F = THE_TWO_TOWERS | V | 0x43CC00D601EA021C1EF320E5FD4CAE47 -0xC9348CFA8CEA64E6A66C3D5EA52739786498D70D = THE_TWO_TOWERS (The Lord of the Rings: T | V | 0x37213D0704F9415DDB5EDD1214C9EBAE ; MKBv16/FindVUK 1.00 -0xF3D36DB0384BC828A4B44626F9424DD75A495E42 = THE_TWO_TOWERS_EXT_PT1 (THE LORD OF THE | V | 0xF0B67BF764A25DA19164095430B3254F ; MKBv22/FindVUK 1.02 -0x9DDD191218B560A7B98331F8BEE853CFD0387CFA = THE_TWO_TOWERS_EXT_PT1 (THE LORD OF THE | V | 0x98F36E7E66595561B898AA217569D12B ; MKBv47/FindVUK 1.02 -0x59EC82A26C57DA8FBF2E30431F36216C6F307509 = THE_TWO_TOWERS_EXT_PT1 (THE LORD OF THE | V | 0x524E224B29A107ACD0140D29C348DCC4 ; MKBv25/FindVUK 0.96 -0x1BAEC18E60E515886EFBC76A178323ABF56F76C9 = THE_TWO_TOWERS_EXT_PT1 (THE LORD OF THE | V | 0x30CC3F45D7154CB0D93DFA0390D3A313 ; MKBv25/FindVUK 0.84 -0x3A58D361DB66EECC3F2736948730507F50CA0AD8 = THE_TWO_TOWERS_EXT_PT1 (THE LORD OF THE | V | 0xAE7639D9225D7CD61E0EB2CB6656F54E ; MKBv25/FindVUK 0.94 -0xA4923FD9294BD140527F23B1B9669674A29FF0F9 = THE_TWO_TOWERS_EXT_PT1 (THE LORD OF THE | V | 0xD1E5C43CB934748846BD39321A86F01B ; MKBv20/FindVUK 0.96 -0x8289124853C09F2A7DAC99FAF405396A3CA1B7E8 = THE_TWO_TOWERS_EXT_PT2 | V | 0x8414BA98F473C9A8F8146C93C3F7D214 ; MKBrev 19 - FindVUK 0.57 -0x298FB537B1B068665C7B3F7C903FA8B685FF140A = THE_TWO_TOWERS_EXT_PT2 (THE LORD OF THE | V | 0x40EACE28B46C0CA7681A0EF47C322BB0 ; MKBv19/FindVUK 0.96 -0x04BA94B35E3F75A2D5D8FBAD18ADE2614D709CA7 = THE_TWO_TOWERS_EXT_PT2 (THE LORD OF THE | V | 0xA4935AC032FEEF2E0C867D48EE245838 ; MKBv22/FindVUK 1.02 -0x75803C6A929705C8826CD4A5006214C369A6C19F = THE_TWO_TOWERS_EXT_PT2 (THE LORD OF THE | V | 0x0B36BA9C18F8EBEF505B36DF6738C4C4 ; MKBv50/FindVUK 1.02 -0x7635A944829D8ADA92538FF7A22EC0F4EAE01531 = THE_TWO_TOWERS_EXT_PT2 (THE LORD OF THE | V | 0x5B1E62BEFE52DB5482284798C8A8A461 ; MKBv19/FindVUK 0.96 -0x8516FE0CB39BD9DFAFD60840EB35EEC93CA50F24 = THE_TWO_TOWERS_EXT_PT2 (THE LORD OF THE | V | 0x965E8B140572DF33F63658C1572BC2AC ; MKBv19/FindVUK 0.92 -0xD65ED56A7C181C30E7590D6D0C5BE0BE9A0C789C = THE_TWO_TOWERS_EXT_PT2 (THE LORD OF THE | V | 0xF6198987D5130700C50D9905FD815C88 ; MKBv19/FindVUK 0.94 -0x653D21CD4BE09E9DD357AE65D3ED9C686888F48A = THE_UGLY_TRUTH | V | 0x61362D15B4B8A9580ABABFE89325C309 ; mkb v16 -0x690855A9C0DC08A1E1577FA5903B25AFE0F8832F = THE_UNINVITED | V | 0xDFFFD2558043083A223417E44F2C08F3 -0xF6868870B02CB76B06370560B33B5EC4AD7AA6C2 = THE_UNIVERSE_D1 | V | 0x6AE0B6BFF4F35A62DCBCF9E8C1BB2A58 -0x850873D52428C78E3FCE3CD33FA78CB12268B622 = THE_UNIVERSE_D2 | V | 0x9BB7068D79F1CE5CECA16208A3F08FE1 ; MKBv9/FindVUK 0.89 -0xD71D4DB89489E85FC18FD846144AD028BA5F1257 = THE_UNIVERSE_D3 | V | 0x44109B869F9F3E810BF0D3614E6D0B66 ; MKBv9/FindVUK 0.89 -0xFF59EAEE9F79D8BF5A5029337C8ED75DA1E6E3B2 = The_Usual_Suspects (The Usual Suspects) | V | 0x58B01D29BCF5824B74A27D47F02F44D3 ; MKBv35/FindVUK 1.00 -0xF2F193EB9D613ADC13CA075FD1BBD6697E7DF325 = THE_VAMPIRE_DIARIES_S6_DISC_1 | V | 0x73426F51B9E7CBFF712E36616744B955 ; MKBv57/FindVUK 0.92 -0x08E003EC4FFC6C2CE19F23EF6B02D1A4B05DE062 = THE_VAMPIRE_DIARIES_S6_DISC_2 | V | 0xC9F428360807469148767AF28837660F ; MKBv57/FindVUK 0.92 -0xDBF21FE8C8D3CF5D75C7AB7135BE7E637B832763 = THE_VAMPIRE_DIARIES_S6_DISC_3 | V | 0xD59B4D0F1EB35F0C70E6C4F071356B9D ; MKBv57/FindVUK 0.92 -0xBEF647F6817D5958139247803DE376A687D27BA7 = THE_VAMPIRE_DIARIES_S6_DISC_4 | V | 0x8D2301F4368583ECA2A10539E58F40A0 ; MKBv57/FindVUK 0.92 -0x1462697834BEF09FD619E359CA5CAD4CCF8C498A = THE_WAGES_OF_FEAR | V | 0x61A0079E774011B3435EEE4BEEB843F2 -0x3C07E6285AF520002577CF77C3CDAF40BB1DA315 = THE_WALK (Walk, The - 3D Blu-ray???) | V | 0x66F428FAF8E55A22281AAEFADAAEDFD4 ; MKBv57/FindVUK 0.96 -0xD308BEA28832632D580406551CA03E0F8956DE1A = THE_WALKER_BLURAY | V | 0x2F00F54088FBE4B081CA2CA80DF9DC4D -0x79A806EBF72A63A14041028B1AA25151DF474EDB = THE_WALKING_DEAD (The Walking Dead - Dis | V | 0x28BFFDF0D186BC0B51398043FA4A9719 ; MKBv35/FindVUK 0.99 -0xEADA78A8C62DA22A7B5A1C67CF41EA85EECF8242 = THE_WALKING_DEAD (The Walking Dead - Dis | V | 0xC292580FAE6FCB0E3A8B67C5A70C2937 ; MKBv35/FindVUK 0.99 -0x16CDB069CC4E1728E6FD6A80C615DBCD1FFC88D2 = THE_WALKING_DEAD_S06_D01 (The Walking De | V | 0xADF508781E692F81317F9C5FAB8AFA42 ; MKBv61/FindVUK 1.00 -0x2F05604CEC62702B8543AEBC389A775DA3DD1679 = THE_WALKING_DEAD_S06_D02 (The Walking De | V | 0x1FE5A44AA2111A7CC08B1DFA800FC4EC ; MKBv61/FindVUK 1.00 -0xA91E49D8DA29DC0FE8032624FC8E245E8362F380 = THE_WALKING_DEAD_S06_D03 (The Walking De | V | 0x349DDFBA1D6D3A67CE7216DA276B3604 ; MKBv61/FindVUK 1.00 -0x059B74C7BDFEE89A4779AC5DA379D1B29E577EA4 = THE_WALKING_DEAD_S06_D04 (The Walking De | V | 0x7F47BF959A43D4E3B4374F56CC15731D ; MKBv61/FindVUK 1.00 -0x3C6BF0B94B327391D0A27CFD461A4A827FC97B6C = THE_WALKING_DEAD_S06_D05 (The Walking De | V | 0xFE21040B465878212F4D3303E0542504 ; MKBv61/FindVUK 1.00 -0x2A893398B13BED243EF56FA892C3FE60F3141092 = THE_WALKING_DEAD_S06_D06 (The Walking De | V | 0xC1130E9598F7598E03EB065A25AA17A4 ; MKBv61/FindVUK 1.00 -0xEE7E1D9913D7CF5C1C048461A72D7C48F121E176 = THE_WALKING_DEAD_S2_D1 (The Walking Dead | V | 0xDD1C827D732D8D46D8705A7D62AF062F ; MKBv35/FindVUK 0.99 -0x4645837BD74232C6EBEC62E90CD8B87612A82F7B = THE_WALKING_DEAD_S2_D2 (The Walking Dead | V | 0x21649E5766B69B82C49C7DB593130F06 ; MKBv35/FindVUK 0.99 -0x031A1779073D1234C768211D55EB808BF31B92F1 = THE_WALKING_DEAD_S3_D1 (The Walking Dead | V | 0x951D51A0DFEF55AB5A79F782AE35812A ; MKBv40/FindVUK 0.99 -0x7625A4E4D6813B907CCBD52FA93F8AB5635CC4C0 = THE_WALKING_DEAD_S3_D1 (The Walking Dead | V | 0x4CD5D1559D309ABBFF0442B6EE1F0232 ; MKBv40/FindVUK 1.02 -0xAAFF76C6CF9F15F8CCE0EB31AD0A00678BAF382E = THE_WALKING_DEAD_S3_D3 (The Walking Dead | V | 0x38CDC416C5B70081FBBC7B3528B13E51 ; MKBv40/FindVUK 1.02 -0xC37E0977D51E48AAD72C5ECA51A92F598628BA27 = THE_WALKING_DEAD_S3_D3 (The Walking Dead | V | 0x394D23843778455735FF7C389B2DC3C7 ; MKBv40/FindVUK 0.99 -0xFEF6417438136EEBF5C71BDA8B1D077BDDD2EDCC = THE_WALKING_DEAD_S3_D4 (The Walking Dead | V | 0x74C42443D1DAD22AEE3FC62FD5A34238 ; MKBv40/FindVUK 0.99 -0xF5CE82EF44EA3A332F45B2642CCCDA132557E74E = THE_WALKING_DEAD_S3_D4 (The Walking Dead | V | 0x04D6310103E8B9B9C12256BB06A93532 ; MKBv40/FindVUK 1.02 -0xFC05A9A0E97003AE20B3197AFDF1C15D1F2F9A99 = THE_WALKING_DEAD_S3_D5 (The Walking Dead | V | 0x5C7D8EE7C72F4C874F85CE650FBA3E03 ; MKBv40/FindVUK 1.02 -0xC193C543E904E40F705A1B027394ED459A4FE35A = THE_WALKING_DEAD_S3_D5 (The Walking Dead | V | 0xBD38335D0127FFBD32305127AEECE1AD ; MKBv40/FindVUK 0.99 -0x449FF402CC191EEE18AD814BF5BDA40775C6F280 = THE_WALKING_DEAD_S4 (The Walking Dead S4 | V | 0x665DCD73C6689F00E927729439059679 ; MKBv47/FindVUK 0.99 -0xAA29E8D7FF27C046B58029D8ED7A51D391DCDCA1 = THE_WALKING_DEAD_S4 (The Walking Dead S4 | V | 0x1CA7FEDEC7F14DDC0947E62DD248483E ; MKBv47/FindVUK 0.99 -0x7FD1FEDCE99F7DAA583F3242088139F58BB2C84D = THE_WALKING_DEAD_S4 (The Walking Dead S4 | V | 0xA5824F1AB18B3AF195B6B2A71B4FAF82 ; MKBv47/FindVUK 0.99 -0x5520DFDAC4C5F7E4C8F8B64A746A32BC602E22C7 = THE_WALKING_DEAD_S4 (The Walking Dead S4 | V | 0x3387557B7EFE4553CFDE0BF4C6F650BB ; MKBv47/FindVUK 0.99 -0x98A013AB9CF908398818A3184C2B8C2B76D9EB12 = THE_WALKING_DEAD_S4 (The Walking Dead S4 | V | 0xEF8466B9DAB3A355D85E19456C9F1567 ; MKBv47/FindVUK 0.99 -0x8E1662AD204445D266DAFDEFC46C68D720BD91D5 = THE_WALKING_DEAD_S4 (The Walking Dead S4 | V | 0x7F439C551BB3AE6DB988085B62E4B8F0 ; MKBv47/FindVUK 1.02 -0x1256403F86A3F38308769A08B90A64391E78683C = THE_WALKING_DEAD_S4 (The Walking Dead S4 | V | 0x56FFEE01BFCCAB7B8C293DC32331D776 ; MKBv47/FindVUK 1.02 -0x90E564DAF6DDF8C8AA5F7DE94B635E28A4706062 = THE_WALKING_DEAD_S4 (The Walking Dead S4 | V | 0x2286AB9653A3C456E7F74240FD9A7747 ; MKBv47/FindVUK 1.02 -0xCE66055B89F279C9E41AAFA1E5370BC6ED0D4244 = THE_WALKING_DEAD_S5_D1 (The Walking Dead | V | 0xD5F678871CB8EEFF7E7579FDB4979248 ; MKBv57/FindVUK 0.99 -0xB51D0209F939E38D20267E2D78FA0FDDF402BC59 = THE_WALKING_DEAD_S5_D2 (The Walking Dead | V | 0xFD4D80CBA7056D1747DC2934D192732A ; MKBv57/FindVUK 0.99 -0x0DBC66AA413DA6B6CC353D4A3FEB9C3FF948BC7B = THE_WALKING_DEAD_S5_D3 (The Walking Dead | V | 0x78B78A68FAF8A1944767ED716BAA0D44 ; MKBv57/FindVUK 0.99 -0x29D30A80E927730477847794C60A7E9335E1B7DD = THE_WALKING_DEAD_S5_D4 (The Walking Dead | V | 0xFF421FCA3D2E77BED9900CDE50FB5E01 ; MKBv57/FindVUK 0.99 -0xA34D64365F9E86ACE60A8D674F84EE28A3E9CCDC = THE_WALKING_DEAD_S5_D5 (The Walking Dead | V | 0x0D89B2EB3C496A8C20C8166CAC16D846 ; MKBv57/FindVUK 0.99 -0x2C6A81EA1025CE344F358D727BF4247865187CA1 = THE_WALKING_DEAD_S5_D6 (The Walking Dead | V | 0x0E790B7A7AB546ABD81F6DBE8CC78B24 ; MKBv52/FindVUK 0.99 -0x7E30550195DD13A76D094BDC3FD20965B8449BDF = THE_WATER_DIVINER (The Water Diviner) | V | 0x3804489B7DD1D4BE84BFE287071E8EC3 ; MKBv53/FindVUK 0.90 -0xDD041D7B090134BD15390DD86A0BF4E7CC18DC54 = THE_WAY (The Way - Blu-ray???) | V | 0x0089F12803C9877C6B879B0472C04DC8 ; MKBv28/FindVUK 0.92 -0x744F5AF4E3C597DF3115193D25F782F3ADE21DB5 = The_White_Queen_D1 (The White Queen Disc | V | 0x937620B816266636D0AC116D68BE6F8A ; MKBv43/FindVUK 1.00 -0x23497ADDC247E2D2E1418BF286BD652FDCF5EB06 = The_White_Queen_D2 (The White Queen Disc | V | 0xCA769EAB610AB28F6A4A80D478E43000 ; MKBv43/FindVUK 1.00 -0x8D93C8EDDDB3ABAF19A6A4911D4211FEA8937367 = The_White_Queen_D3 (The White Queen Disc | V | 0x64AC697D89D3EBB989B512708DFD43A2 ; MKBv43/FindVUK 1.00 -0x7AE07FCC1C683EEBCCCB6B1D143FBE6541F72E84 = THE_WHO_KILBURN | V | 0x0F6EC0C24835E09CE741C96CEB8BA6A3 -0xF6F671448CADD4BAA0461A43E2494259E666B679 = THE_WIND_RISES | V | 0x6BABA8814CB58A672C0EBE328975D48D ; MKBv48/FindVUK 0.81 -0x98EE362775EB86EB0BC3A3F0267EFD2FA025A7F0 = THE_WIND_RISES (Miyazaki Collection - Th | V | 0xCE3FB9E1CECBB797E11F3DB89499577E ; MKBv50/FindVUK 0.96 -0x116DEA94049488FC20C0B72C6CA958F6A232E2A2 = THE_WIND_RISES (The Wind Rises - Blu-ray | V | 0x3B2B273F3AB78A6B1F1CC30D4340589F ; MKBv47/FindVUK 0.96 -0xB5D7C352EFE2B613BA2B569A2D10D68DA3188F5C = THE_WIND_RISES (The Wind Rises) | V | 0x430C1FF77A743A601111526E36A35D77 ; MKBv48/FindVUK 1.00 -0xDD5DD6B425DCD269066E4DECED794F929667EE53 = THE_WIRE_S1_D1 (The Wire Season 1 Disc 1 | V | 0x9B13D65749B768E5DCE1F23B9B1D9217 ; MKBv50/FindVUK 0.96 -0x4F597C90277B247DB0CA634D53877916AD30D64A = THE_WIRE_S1_D2 (The Wire Season 1 Disc 2 | V | 0x1D45F0C9CCA2C1873CEC536E7ACC1BB3 ; MKBv50/FindVUK 0.92 -0xD47445DF45A2F008B9A747FBD8CCD220B73D0972 = THE_WIRE_S1_D2 (The Wire Season 1 Disc 2 | V | 0x802E3A0539392C9BF9FA13EAA76CA0CA ; MKBv50/FindVUK 0.96 -0xD87CEA54DA9EB802785D907BFBBCDEE7331FCE56 = THE_WIRE_S1_D3 (The Wire Season 1 Disc 3 | V | 0x1076340855AB7C817B21B08C2BA5A999 ; MKBv50/FindVUK 0.96 -0xF2F99F10B654703D245CDFBCB7291B60B94E5555 = THE_WIRE_S1_D4 (The Wire Season 1 Disc 4 | V | 0x77E79D71F10D061FF6DA4AFF22F8BEC0 ; MKBv50/FindVUK 0.92 -0x7C7193FBFB8050A2D74A0D843BF373E396DEC86A = THE_WIRE_S1_D4 (The Wire Season 1 Disc 4 | V | 0xB46756942B243762119CF6F62DAA928D ; MKBv50/FindVUK 0.96 -0x7236D4D43010A4D56B4CC9EB1032EBC951FAA215 = THE_WIRE_S2_D1 (The Wire Season 2 Disc 1 | V | 0xB79AF70A6B2D7F88F73C1883950529E3 ; MKBv50/FindVUK 0.96 -0x463531954247F26F908DAFE1DFBA473DF649FE5F = THE_WIRE_S2_D2 (The Wire Season 2 Disc 2 | V | 0xFF91F0D6D269F563B63EF428F721F6D0 ; MKBv50/FindVUK 0.96 -0x1F5F5562416F6303AE06849E64A78F34CA1C0B61 = THE_WIRE_S2_D3 (The Wire Season 2 Disc 3 | V | 0x1677C4F05E961F4B9454D6D5D8B11461 ; MKBv50/FindVUK 0.96 -0x7EB75300A28724DB67979C1A4F9FA46AE4DDC86D = THE_WIRE_S2_D4 (The Wire Season 2 Disc 4 | V | 0xFBC5B60B9B4C44DE401BBEF07EEDE10B ; MKBv50/FindVUK 0.96 -0x0E93118F7D5AF83FCE9BBEFD9229CBC7C3599B00 = THE_WIRE_S3_D1 (The Wire Season 3 Disc 1 | V | 0xDCC5ED07C94693B3A88F45E4A34C9447 ; MKBv50/FindVUK 0.96 -0xE66535C0BEEF96060229E89E748E7B8C3BF2CB15 = THE_WIRE_S3_D1 (The Wire Season 3 Disc 1 | V | 0x5D8CBA9903C65CA1FAB8C3F9F37D1EFB ; MKBv50/FindVUK 1.00 -0x317DA6026ED24F99740F861EE50CB25069F64253 = THE_WIRE_S3_D2 (The Wire Season 3 Disc 2 | V | 0xD18B7A7636AE890D6A6E620453E2D974 ; MKBv50/FindVUK 0.96 -0x0C674E6ED67F221AF93D48C97570807173934E98 = THE_WIRE_S3_D2 (The Wire Season 3 Disc 2 | V | 0xD88F01CC8A56B0E83F69C2EA105C8C34 ; MKBv50/FindVUK 1.00 -0x384597CF52877BDD8A82CDDFAC76CAAAE91FF245 = THE_WIRE_S3_D3 (The Wire Season 3 Disc 3 | V | 0x245ECD12A084F219685AF0B931891046 ; MKBv50/FindVUK 1.00 -0x7FAFDB18DC49FF421C4D7927734F2E234E081897 = THE_WIRE_S3_D3 (The Wire Season 3 Disc 3 | V | 0x4A9BD358457ECD6FA55B85A359CCCBC9 ; MKBv50/FindVUK 0.96 -0x39E2F5ED602717C42F89E5402E2B4F67844290C9 = THE_WIRE_S3_D4 (The Wire Season 3 Disc 4 | V | 0x0079B929724B601631C33E7673ED2753 ; MKBv50/FindVUK 0.96 -0x6DE5DC5643DDE78C425D72246F8EAEF1008B4479 = THE_WIRE_S3_D4 (The Wire Season 3 Disc 4 | V | 0x7A2FAE0CC5C76E69257B43029D2EFFB0 ; MKBv50/FindVUK 1.00 -0xB0B13426F2B95098842BA450AEAB21DB383B463B = THE_WIRE_S4_D1 (The Wire Season 4 Disc 1 | V | 0xD79F11E9E2BADD2E30E5D38851D8915A ; MKBv50/FindVUK 0.96 -0x800D78D9184F00F091D89EF9928DF6239EEFE13B = THE_WIRE_S4_D2 (The Wire Season 4 Disc 2 | V | 0x04878C0CDDD968B213DD317CB8863D82 ; MKBv50/FindVUK 0.92 -0x7E447E9C846F8E9E96F9CF48B84096EA1DD588EE = THE_WIRE_S4_D2 (The Wire Season 4 Disc 2 | V | 0xFBBE81817E7C7180FC8640395C2671ED ; MKBv50/FindVUK 0.96 -0x69A03AC75C887B4582161B35B46F9EF85B376EE6 = THE_WIRE_S4_D3 (The Wire Season 4 Disc 3 | V | 0xE6E562EDDD0ED31FDB4DC1D001BC73C1 ; MKBv50/FindVUK 0.96 -0x374C607C5A9B3AF6DAC78589CD8A1B8788118171 = THE_WIRE_S4_D4 (The Wire Season 4 Disc 4 | V | 0x516134A903C5AA3F0C4575D8519DDCC7 ; MKBv50/FindVUK 0.96 -0x69CC1FBA50899A2ACF61A1A459BD336D4F15405A = THE_WIRE_S5_D1 (The Wire Season 5 Disc 1 | V | 0xBB9D4900C8B1C8256ABA4AAA2307D35A ; MKBv50/FindVUK 0.96 -0x156A2B4269D7F44EC76267827A0DD5ACA1D461E2 = THE_WIRE_S5_D1 (The Wire Season 5 Disc 1 | V | 0xA441876A1448DBFFA73AFCBCC6C29915 ; MKBv50/FindVUK 1.00 -0xAA8F5E4FB35437E50D4B9663833DE5CCA87B3435 = THE_WIRE_S5_D2 (The Wire Season 5 Disc 2 | V | 0xF2870D8142E6CDBD5E6F53AE9A7D5A6A ; MKBv50/FindVUK 1.00 -0xB5472A1E0D72A7F4973C70213391C68A41DA2359 = THE_WIRE_S5_D2 (The Wire Season 5 Disc 2 | V | 0x5B80FC5A1723DDD379F386DBEBD9A074 ; MKBv50/FindVUK 0.96 -0xFBA1EF93C2ED4D9E34C23965DFEF6D0C74783A4F = THE_WIRE_S5_D3 (The Wire Season 5 Disc 3 | V | 0xDC73F93A708E7AFA4FC5BF8104304C58 ; MKBv50/FindVUK 0.96 -0x8FD854D79DBEB295745F4D539CB42A8D8E06334F = THE_WIRE_S5_D3 (The Wire Season 5 Disc 3 | V | 0xFB7D7707107D1A43EBA7F21130110C0E ; MKBv50/FindVUK 1.00 -0xD57CEC56B9D97D22F5B98D14827E04FD0AE2D972 = THE_WIRE_S5_D4 (The Wire Season 5 Disc 4 | V | 0x095244FD5689DFAEB86F5183D1E132C9 ; MKBv50/FindVUK 0.96 -0x114C3DA56B07455EE4C6F4E4DC0FCB1F4104BA76 = THE_WIRE_S5_D4 (The Wire Season 5 Disc 4 | V | 0x7CB12F96CB8580ED4FADD43954B9B21F ; MKBv50/FindVUK 1.00 -0xB0B7E2631D75A6B939E5AA7880A55284C4102986 = THE_WIZARD_OF_OZ_75TH (The Wizard of Oz | V | 0xDC12016A924EA67DF113A9218393EC6F ; MKBv31/FindVUK 0.92 -0x8F85808E4A4DCCF184D2BFBFE3F62EA6FCB66734 = THE_WIZARD_OF_OZ_UCE | V | 0xACA3F7153A656BAB4946963C01EC3CA9 ; MKBv14/FindVUK 0.80 -0x7463CA1A83BD31A2A7EA96B48F3D5AB7B22B3FFA = THE_WIZARD_OF_OZ_UCE | V | 0xE658C77366E59F1DFD54B899164C7E48 -0x3EAE2A5A63A60D26192AA1C8EA1034F1CB2416A7 = THE_WIZARD_OF_OZ_UCE (The Wizard of Oz:U | V | 0xCD6B319F4C165022A56EF4EA3E376DA6 ; MKBv14/FindVUK 0.96 -0x7FF926815A29A89FB397B9A89C8ADD881A2D327A = THE_WOLF_OF_WALL_STREET (The Wolf of Wal | V | 0x62F5A39CEE943C884978FB0454CCCB28 ; MKBv36/FindVUK 0.96 -0x06C68A2037CEBDC976A3D317D9C9A7C322060031 = THE_WOLF_OF_WALL_STREET (The Wolf of Wal | V | 0x6CD603E2C07E4AE24E86F7488076AFF2 ; MKBv36/FindVUK 1.00 -0xC6109972329DF9FA433F33FD2161CFA53BD67B5A = THE_WOLVERINE | V | 0xBF4695C682BB8B87ABBBA71FBE6179EE ; MKBv31/BD+/BEE/VUKNOTVAL!/FindVUK 0.81 -0x98B0138B5EA68D614908A7CD2F8B7B6EC89E0807 = THE_WOLVERINE | V | 0x665A442DAAF0F28ACBBA043BD8B5D0A9 ; MKBv36/BD+/BEE/VUKNOTVAL!/FindVUK 0.81 -0x5A9B53F71A0F2A4FF6593E4D711B4D4222029A82 = THE_WOLVERINE | V | 0x293B2998F6865510C74A37173E95A8C1 ; MKBv36/BD+/BEE/FindVUK 0.80 -0x4DBA9103DB4600E368BE17A65547B624DE94F0FE = THE_WOLVERINE | V | 0x6EFC9C0A1CAB702EC39103DB1112D6E6 ; MKBv31/BD+/BEE/VUKNOTVAL!/FindVUK 0.80 -0x893303BCC08AD6EB0456F8D40E80790CDA9866F4 = THE_WOLVERINE (The Wolverine) | V | 0x5293A92EDB3B81B7E84D32591C799083 ; MKBv31/BD+/BEE/FindVUK 0.91 -0x95F6571261D8BBF0E4CB71C970C5B132077ADD15 = THE_WOLVERINE (The Wolverine) | V | 0x4015EF2B40804EAB662EA7B40C819F9B ; MKBv31/BD+/BEE/VUKNOTVAL!/FindVUK 1.00 -0x570221BD8992FECD3F92B33AA96373D75E9DAEEA = THE_WOLVERINE (The Wolverine) | V | 0x5DA97B2D9388C3AA447C4B2CFF7ECA18 ; MKBv36/BD+/BEE/FindVUK 0.98 -0xB7B98BDFBE7318DB78C9272A203C2B38B4CCE223 = THE_WOLVERINE (The Wolverine) | V | 0xA1971B33389731BAE6D85AFA2A40E806 ; MKBv36/BD+/BEE/FindVUK 0.98 -0xA09E9CA00C39E757A3D636ED6D75085EE7B9B15E = THE_WOLVERINE (The Wolverine) | V | 0x968D6515886A81A7C769F8629D86838A ; MKBv36/BD+/BEE/VUKNOTVAL!/FindVUK 0.95 -0x4EF97538D2786C3FA9B346CB0E8FDF41BBB41F8A = THE_WORLDS_END_DOM (The World's End) | V | 0x133A768F712FAB3A4C8167A593A25515 ; MKBv31/FindVUK 0.92 -0x628ADEDCC0094540DA3E29BD253427AC35273039 = THE_WORLDS_END_EONE (The World s End) | V | 0x2FB30F0419C98E7CFFBB2D1DD669B797 ; MKBv47/FindVUK 0.98 -0x8F0244F8662914FD51EB53C1645CBA3446C12DBE = THE_WORLDS_END_G55 (The World s End) | V | 0x95603E3392FB8FA9FA6AEC576BFE79FC ; MKBv35/FindVUK 1.00 -0x9E3CF120AC7EB96814D46315FE26E70A707CE4D9 = THE_WORLDS_END_G55 (The World's End) | V | 0x3EE8CCFCB60604F06E0791A89CDF7427 ; MKBv35/FindVUK 0.94 -0x8431EE8BE9A26AB895F411F207148259B466701D = THE_WRESTLER | V | 0x53BFC4C63A30BFC1DDAA614F078B59A0 -0x01070ED005F4D144C9F1BF7BF5A419503BC51607 = THG_MOCKINGJAY_PART_1_DISC_2 (The Hunger | V | 0xBC2A61E2FD0CB12FC768215C9BB491C8 ; MKBv46/FindVUK 0.87 -0x55CD84B9E20963B1CDD89D7C64A17B9DA78EE348 = THIEF (THIEF) | V | 0x97C924E8A2E33937D6C2FF33307A223D ; MKBv50/FindVUK 1.02 -0x11213AAED3FFF4F7A73015690974741B3AA44EFE = THINGSWELOSTINTHEFIREDOM | V | 0xAA800854A8C30884B4E49BF282C1983B -0xE926576D8306A3A1263D5E6D7CC3C0397E76DFDF = THING_G51 | V | 0x36C79B4B4446A888271BA94D3EF317EB -0x03CD914E3BE520343B1067B5C999FE106F435891 = THING_G51 | V | 0x7E86BCBA3B0910D11A739737996FBDFB ; MKBv7/FindVUK 0.80 -0x96DD60025DA91E8F9435E52D340B81F428E5FA9B = THING_G51 (The Thing G51) | V | 0x36174007560CDCEA470B55CDFDD25760 ; MKBv7/FindVUK 0.96 -0xB3F29B53F8BA8C691D43C5782A955C80D67C4C9C = THING_G51 (The Thing G51) | V | 0x47564E7B18A8B8670B482C25AFBF4925 ; MKBv7/FindVUK 0.98 -0xB1AE1761B3EDB07AE21345FFF4423842D7216537 = THING_G51 (The Thing G51) | V | 0x9999EBDC0D0370F1DC8EE97A3729BCCD ; MKBv7/FindVUK 0.96 -0xFDCA6E36E5619F16BA8F555BC2B5D85ED995BED6 = THIN_RED_LINE (The Thin Red Line) | V | 0xA4E83BBBC8E193EC771CFA8649E9D844 ; MKBv18/FindVUK 0.92 -0x23E4DE76E2CF8E7E24B7519CED3FF93A8ACF9DC7 = Third Person (Third Person ??? Blu-ray?? | V | 0x50C4EC308D84359B404656F5780DBB80 ; MKBv50/FindVUK 0.96 -0x3850A62DD292DECA87F4F017A2DD820F56B85BF2 = THIRST | V | 0xEBF292DB7C69C73FBF5DF5EE45F658F8 -0x21D01F1166840D48B32C1907247064774B6E9C90 = Thirteen Ghosts | V | 0x2A24C82040917C705475661AF3BB47DA -0xC992239A592EE9666163069FACEAA61C01E2C6FF = THIRTEENTH_FLOOR | V | 0x053FCEB44954EB26FC4E9B163AAB2D94 -0x53F1E9666B30348530F4649A1FB86F4BB0885D98 = THIS AINT CHEATERS XXX | V | 0xAA354986D2DAFC92A1F9832F7D70AD73 -0x8667D4ABB438E98ED298DE9A8B432F98BB11566E = THIS AINT INTERVENTION XXX | V | 0xBC4C32B11D1F5271FD45F8254611CDF8 -0x196CCA0CF07EF5325B3EFA734113989F05E9F8D0 = THIS_CHRISTMAS | V | 0x4B501D32F404DD7E452EF372544512DF -0x330F03B16DF884CF0015FD449D42E3C059F4A48C = THIS_IS_IT | V | 0xE417019EB5BADD71A42581177E16C1E2 -0x9FF0B7FC4E21E11E3C1656DE6114470711C69789 = THIS_IS_IT | V | 0x1482BFBBB374D6CC1827C4FDD87AEDDB -0x79B3DDFFD34455A9AE57D89B547EC45BE0D75BC9 = THIS_IS_SPINAL_TAP | V | 0xD8860166123ECADC28A7CFE52A04609E -0x50D64D5B81AE67E0FD14FA3E1FD225E3F2B8E6E8 = THIS_IS_SUPERMARIONATION | V | 0x27CA5227253F0FF46147CC3CE796A088 ; MKBv48/FindVUK 0.94 -0x68FF16B2BABA8F0691F0715C8CFA548F513B896A = THIS_IS_THE_END (This Is the End - Blu-r | V | 0x892A066C3B683526C6F95F025A9B244C ; MKBv43/FindVUK 0.96 -0x7533EBD8002D0957CC067868F6899396874B6E11 = THIS_IS_THE_END (This Is the End - Blu-r | V | 0x9FE8FC3FB9583BD283427C7082C88339 ; MKBv40/FindVUK 1.02 -0x8F7623E9EC763263CAED37F3A9BA67095002A4ED = THIS_MEANS_WAR (This Means War) | V | 0xDA45A39F9285620F6CAF6C4842D8088A ; MKBv20/BD+/FindVUK 0.91 -0x325D900E0D4BD749585919C06F88832482C7E40D = THOMAS_CROWN_AFFAIR | V | 0xC6C90ED07AD55B18B61E61579BD7B303 -0xE2ABB6BAD9987CEB165E731F9CAA916F76642B5A = THOMAS_CROWN_AFFAIR (The Thomas Crown Af | V | 0x5B3BC352ABC0523D45AE6C097058B9B9 ; MKBv12/BD+/FindVUK 1.02 -0x8D2E6DDBA16CFBF59DF3318966EDC64C28D2C1F4 = Thor | V | 0x1F480EA791124CE02D536629BB31A801 ; mkbv23 -0x2224A95F8E682CB4E645B9BF24BA0FA8B3E058F8 = THOR (DE) | V | 0xD18FB77935D5863DD6B5665AE685B2B0 -0x64AF4B801E9ACEFD0930AF9CECA7C0688071CBB5 = THQ_SMACKDOWN_VS_RAW | V | 0x65ADAF411FBC6EBE37ED32B72BA20743 -0x59FC361F48F0EFD6C8F9513F827FF8696AEE28CD = THREE BROTHERS (THREE BROTHERS) | V | 0x01984F72FF86621BEBF9F90DCE1E4980 ; MKBv58/BEE/VUKNOTVAL!/FindVUK 1.00 -0x1486AAE618FD7B0C4881E59E993347AD47E41878 = THREE KINGDOMS | V | 0xD15271B8136D8199285B23B14D30EA39 ; MKBrev 12 - FindVUK 0.62 -0x3E3C970066A0B22C3BD639CC3F8EEE315458BE9F = THREEDAYSOFTHECONDOR | V | 0xAA0A1C450A00F029043C249E8EAA0977 -0x937319C1793C53F4EFD9752893A8BD398487B2D6 = THREE_COLORS_BLUE (Three Colors: Blue) | V | 0xAC66E4147CCF1BB857A754D8D6C99B72 ; MKBv27/FindVUK 0.99 -0x59358F5724021E834E7C33CD661562838EFEA751 = THREE_DAYS_OF_CONDOR (3 DAYS OF THE COND | V | 0x37FAF91C55E496C3982FF3D102DAD4B4 ; MKBv12/FindVUK 1.00 -0xF77BC3CF8B084EDA8854AC9D5774EB99D041B54A = THREE_DAYS_TO_KILL (3 Days to Kill) | V | 0x70AF709CFA4BB3BD3AC4E581E1B6EE69 ; MKBv48/FindVUK 0.93 -0xF9422432C16E72EC75163C37C1AD76BB7471596C = THREE_KINGDOMS | V | 0x1548A8EDEFF42498C7D0F1B5E0212810 ; MKBv12/FindVUK 0.84 -0x2089BA7F86091E7778F084152C8D1A48359C0224 = THREE_KINGS (Three Kings) | V | 0x36E1525C63F8E8BE15106088BA20948C ; MKBv19/FindVUK 0.96 -0xC6A0D80B806131888ABA4D0F5DA9BE2CCDC41156 = THREE_ORANGES | V | 0xAB475C3E37C7E813F02CB4F446ADC587 -0x622CB1F038BA6460A881DCE47D3202EDB46639A8 = THRONE OF BLOOD | V | 0x1673964A1B5F61E55ADB8DEA9075FCF9 ; MKBv47/BEE/VUKNOTVAL!/FindVUK 1.00 -0x7807D688403C89A563AC611563A016F14EE5C935 = THRONE_OF_BLOOD (THRONE OF BLOOD) | V | 0x58C13454287CF788EBC91C80D5F98316 ; MKBv43/FindVUK 0.96 -0x9EDC3A46FFB19960320B474A1215DD13AC123C43 = Through The Wormhole BD1 | V | 0x0232A51F104D3B703510031509C6C3C1 ; MKBv20/FindVUK 0.80 -0xCC81881B6F363DAEE5EB3BFF34A3674090416416 = Through The Wormhole BD2 | V | 0x25301BE629D3105B954369E403B505D1 ; MKBv20/FindVUK 0.80 -0xD5F9FC44A72B8FA782D69EF5BDD3D9FDE5D83A2F = Thunderball | V | 0xA5820191C5B392634F2D3048F55890CE -0x97D64B65C91BB6F20E0035DF043EF60EF185AAE4 = THUNDERBALL (Thunderball) | V | 0x345C4C89708B50268BC166DA5ADD049B ; MKBv8/BD+/FindVUK 0.99 -0xCF5BA3F8F059A93124414BF3937B734F78F798A7 = THUNDERBALL (Thunderball) | V | 0xD2B66223D1F4E6D877A165D905A9F2A3 ; MKBv8/BD+/FindVUK 0.92 -0x47425B1EB754D0797EFD3D57738068694707BB15 = THUNDERBALL_F1 (Thunderball) | V | 0x6EE03483FDA44C3608F730ECE58DF9A0 ; MKBv8/BD+/FindVUK 0.96 -0xD7F4006D8B853C948EDE87A67E71CDF325843C8E = THUNDERBALL_F1 (Thunderball) | V | 0x786C663C48AD636A434B7F889E848A74 ; MKBv8/BD+/FindVUK 1.00 -0x75B5EAE9842E586582918BD0F7ED85FA10C4AA97 = THUNDERBALL_F1 (Thunderball) | V | 0x518D37DB62336DE8FC9AAFD6E0219B96 ; MKBv8/BD+/FindVUK 0.92 -0x4C23D26230772A7EDB3123FC6BB56F6F84CA63A2 = THUNDERBALL_F1 (Thunderball) | V | 0x9D9B3DDDC5E015FE09762BC0EE716B54 ; MKBv8/BD+/FindVUK 1.00 -0x7E56F70DE920276EA7E61CAD9B4CA53620D1EFBE = THUNDERBALL_F4 | V | 0x515196CECF3F36CEAFABD905FB97AB09 -0xB55ABA14A3DE17D11A9B8D3A486AC8DA948AC45F = THUNDERBALL_F6 | V | 0x747F7DBF7F8FEAF7E6C655B4B2B95B34 -0x5ADDA372A34E5C9376A1A14E92779C19D125AE94 = THUNDERBOLT AND LIGHTFOOT | V | 0xA1318930F374F8FC7972D8E84BF3E902 ; MKBv47/FindVUK 1.02 -0x4CFABA14966E2D29EF707E0084F8FA9A1EB2A833 = THX_1138 | V | 0xABB77A3E541FF72B865ED08862C18AB4 ; MKBv17/FindVUK 0.80 -0xAD2D3829273871BF00752AB9705CB80FBD9AF7B5 = THX_CALIBRATOR (THX Calibrator Disc) | V | 0x21CF6EB5B52DD69BFBAE10237717640E ; MKBv19/BEE/FindVUK 0.96 -0xF1DD123C41884D55EF1CB74A743FC98FD39B1C58 = TIDAL_WAVE | V | 0x32C160A7921F86162E34FC5FD328DF41 -0x4704E4489B924C5B663D54DD80C3AC6F227344DE = TIDELAND | V | 0x80297797DDA04B900D9954B40FC976D7 ; MKBv3/FindVUK 0.96 -0x90EFEDDAED6AC4F6EB8ECC934F430B21D4AFEC32 = TIE POHJOISEEN | V | 0xDC60FEC69FF0DA38195B6DAC71557BDF ; MKBv31/BEE/FindVUK 0.98 -0xD256227B8ABCBF165D817359FA10500C8086B97B = Tierra (Earth-(ESP)) | V | 0xBA466D095DD75B3572655CA27F1708D6 -0x08CB49549959E1C1999E6780C074D435B8BE68F3 = TIESTO_ELEMENTS_OF_LIFE | V | 0xF5AF52AE68B116C4C745AAC53CF554C2 -0x5B0EF12816964601660C0760C76FFABDF55AABEE = TIGER AND DRAGON | V | 0x25A4C28F56765013FEF9494F7EE1056E ; MKBv15/FindVUK 0.80 -0x2064BF342B73741F15AC59A75DB5B43436E74348 = Tightrope (Tightrope) | V | 0xAECAEB689B848A7AD3BE656456C25FD7 ; MKBv46/FindVUK 0.96 -0xD018D302EA4FD48C2F8CEDD0EC38C557DA62231F = Time Bandits | V | 0x9A5296570F2291CEEC6369581E572F73 -0xE90D7727C5D348F1E6D391A8B11E5F20D74463BF = TIME BANDITS (TIME BANDITS) | V | 0xCBE19CFE3DBF047716AC959000874D22 ; MKBv47/FindVUK 0.96 -0xF85FC5C3E55293A01DAB8E612D9E39AD7D5B41ED = TIME BANDITS (TIME BANDITS) | V | 0xC88B5C2EE9B101336A7DFBD77AF09384 ; MKBv40/FindVUK 0.94 -0x6EF8B6697EE725E9DD8FC1C8D81B54F1A0DE28E3 = Time Of Eve | V | 0xE0E04CFCF407EBFECD047AB39AE8E183 ; MKBv47/FindVUK 0.81 -0x5609059B3291D927671179C7B777952825BE8B84 = TimeScapes | V | 0x77CF31A63BCCDE0BF903ECB89863BB5D ; MKBv25/FindVUK 0.96 -0xAC91E23FFCD77F600BB5A40D8C218BA0C6D899D9 = TimeScapes | V | 0x8DFCDDCDE9C29C82D031DDFD8ECC0599 ; MKBv35/FindVUK 0.96 -0x037B5436B57589423FB69F39E176BE0D34A2B57F = TIMETRAVELERSWIFE | V | 0x0B5E6C005861340AB3B34745B5426077 -0xCEDB527FC9C3A92BF5B3BF558B1FCB5E36EDCC24 = TIM_UND_STRUPPI_TV_D1 (Tim und Struppi - | V | 0x0119695E85A82F7FC707F3DE0B0E05E4 ; MKBv33/FindVUK 1.02 -0x54EBE64512C1484E4FA88EC44321BB3A226B7FFC = TIM_UND_STRUPPI_TV_D2 (Tim und Struppi - | V | 0xAF4BC2FD69F9A811D6572F6D429E087A ; MKBv33/FindVUK 1.02 -0x7B5A60BA6109825BBF03401B48B2C3BFE8E13633 = TIM_UND_STRUPPI_TV_D3 (Tim und Struppi - | V | 0x67794E58D24E4899DE74980551C4F2A0 ; MKBv33/FindVUK 1.02 -0xA37796D3A782DEE92FE4F23CD6CE18AA95A88A39 = TIM_UND_STRUPPI_TV_D4 (Tim und Struppi - | V | 0x529880B802C31C129E503C76D1ED01DC ; MKBv33/FindVUK 1.02 -0xB0E52CECFFB3EF948B15F08FABA5A652BB629641 = TINKERBELL2 | V | 0x0717FAEAB8652874199A9A5E1D2BB43A -0x6199D3BE53DD5DFDAF8DAB362E1D4506A9AF2430 = TINKERBELL2 | V | 0x7DAED99A314C9BDCAAD3C0ADC674D032 -0x3DECA58687E5EA810AB232A59C63CF59EF39BE19 = TINKERBELL2_GBR | V | 0x994162B0AAD9AA5F6B4C95F1EE9CD801 -0xD1F616DAFED00B8ABC709FA39EE747BFEEA9C1A9 = TINKERBELL2_JPN | V | 0x855681BEA205A6F7F7B4DF77A0250471 -0xBFEB39353F078E5000E23A00CCD9AE5F502D362D = TINKERBELL3_LIC1 (Tinker Bell And The Gr | V | 0x4F8BB3A25B9145AD5339D0A334182924 ; MKBv18/FindVUK 0.96 -0x41D3205745353CDB0DAA1A9B0C830155708DF31F = TINKERBELL_ALA | V | 0x2E75396F84562A59E321DA600282DFC5 -0x7D30C43F7DF785AB2C788FA86416AE4664C0DDD4 = TINKERBELL_AUS | V | 0xDE912A03069266F82CB9C4F3F51411C4 -0x52B367B23C0DE7750414CF6D59BF645955AEA8E7 = TINKERBELL_DEU | V | 0xD4D49776E60CCE315876EC9F11D071AB -0x00778D5A5E45CFF64D9DA5FBDFEEE2DB431D6209 = TINKERBELL_GBR (Tinker Bell) | V | 0xA18B998B9F0C49EB1093826F81EBEA57 ; MKBv8/FindVUK 0.99 -0x66FA398CAB91FEF4ED99482FCFE9323D348BE939 = TINKERBELL_LOST_TREASURE | V | 0x1C9AB324BB67C14FE9CCE9908445274C -0x39F95AF83853E138FCD32A16A7C75739EB800078 = TINKERTAILORSOLDIERSPY (Tinker Tailor So | V | 0xC8DFE424E849F9C8D65F7E91E5E6138B ; MKBv28/FindVUK 1.00 -0xD1FD50DF89EBAE834575DE934F61B95C294D5CCB = TINKER_BELL_THE_PIRATE_FAIRY (Tinker Bel | V | 0xC9A4BAFE5CEFB80E435AE4D9BA6428D4 ; MKBv47/FindVUK 0.94 -0xBDE3E751F4B57D868009443A06F604645ED6C698 = Tinman | V | 0x41D0722C736DB259E21C987EDAAAE74A -0xB51DE7ED81478612F903118C6BC3D26AC22DD92C = TITANIC | V | 0x314C665C9C1A235434693CCDCEEF92B0 ; MKBv28/FindVUK 0.72 -0x63488A99FFEB3AC9BEDD4CA5953F582CA28A5803 = TITANIC (TITANIC Bonus Disc) | V | 0xCA71276EC540A01DAE80310B5D7EDB79 ; MKBv28/FindVUK 0.84 -0xF266CA0AECC9BCC80B73691FC13D74BD00DE1352 = TITANIC (TITANIC Bonus Disc) | V | 0x333E671340A997A5CCB8C43564C033A8 ; MKBv28/FindVUK 1.00 -0xA2896E4D088235FE215523AFC4931DBF99DAA452 = TITANIC (TITANIC Bonus Disc) | V | 0x4CF0838037C8A10C68A562937D1953E8 ; MKBv28/FindVUK 1.00 -0x7C57C12135964A75B2DD1D9A29891DA2E3F42396 = TITANIC (TITANIC Bonus Disc) | V | 0x1AC68B5467D28D51A625490F76117B5C ; MKBv28/FindVUK 1.00 -0x0F0BA5B6B2C013EDBA8430A7CD2EC9F2FDB096F6 = TITANIC (TITANIC) | V | 0x9EEC16233AC4E6A521B7AA1F58C2222B ; MKBv27/FindVUK 1.02 -0xA06E11F87C867AACCFF265767B4826C586DAD0E3 = TITANIC (TITANIC) | V | 0x11D049838015DAC2188B4A4F5424E9F8 ; MKBv27/FindVUK 1.00 -0x52ECB12278B7D60491B6490FD1E269FD001252B5 = TITANIC (TITANIC) | V | 0x0498B164E8E9DD2CF6F274C08471718E ; MKBv27/FindVUK 1.00 -0x84D8BCE0013FBD92AB4F61A0A8DFC72292359D15 = TITANIC (TITANIC) | V | 0x1CA443FBC8722F76E4EB3A1248258530 ; MKBv27/FindVUK 1.00 -0xE78ABFDD063D817F0BBB498005E3081BA5B75B32 = TITANIC_3D_DISC_1 (TITANIC 3D Disc 1) | V | 0xD94357A2954203A32570558AB443D085 ; MKBv25/FindVUK 1.00 -0xCD627F7A3D21B71D884834C8432ADBE086015D9F = TITANIC_3D_DISC_1 (TITANIC 3D Disc 1) | V | 0xA7250F21A415CA562BF7D807BEEB0FFD ; MKBv25/FindVUK 1.02 -0x264E33903F7C95C2BB16ECAAECBE286DBA3794BF = TITANIC_3D_DISC_2 (TITANIC 3D Disc 2) | V | 0x4B73EF2F65DE3414A75BE41B4012B731 ; MKBv27/FindVUK 1.00 -0xEF44B5D9AF09D6FD657C5B29967E7C868BB806E4 = TITANIC_3D_DISC_2 (TITANIC 3D Disc 2) | V | 0x7AC878A925C9260382AA37AFD3252FE9 ; MKBv27/FindVUK 1.02 -0x7C77332B6A5A03D7C1708CDC7FE0AB9DC7F20F74 = TMNT_2_Out_Of_Shadows_3D (Teenage Mutant | V | 0x3939E382D2B303DB2D1C1988BD3628FA ; MKBv50/BEE/FindVUK 1.00 -0x4EB28E0116178075B54CBA28E80C6DB215BF993D = TMNT_Out_of_the_Shadows (Teenage Mutant | V | 0x9FA33A4DDC5123EE003F3FF2425395AF ; MKBv56/BEE/FindVUK 1.00 -0x3F9004B30ABE28E7BFF4B119885FC9F04E92296C = TMWKTM_G51 (The Man Who Knew Too Much) | V | 0xF915A971847DE79F404EB720D6722746 ; MKBv25/FindVUK 1.02 -0x961224344275E91DEEA057A78A69E55A287A5EBB = TMWKTM_G51 (The Man Who Knew Too Much) | V | 0xDC4F4E3ED0FB205D5700D595F19FC578 ; MKBv25/FindVUK 0.94 -0xF16996DB8F47B1BB6F36EDFF48036CD7FAB7FD57 = TODOS DICEN I LOVE YOU | V | 0x21149C2107BDEAC261832A7C72BEB8BA -0x51E543203A33645D055FE2972203F7002390220E = Toete Django [Toete Django] | V | 0xAFE0D218B94582A8CAA793CA378CBDB9 ; MKBv47/FindVUK 1.00 -0xB672E7DA73B22165DA9327E0991D246CF63D76B0 = TOE_UPB1 (The Theory of Everything) | V | 0xF4D2C067BB5B3080B0400F77EE28FB77 ; MKBv49/FindVUK 0.92 -0x8B826356CA62053F88F22CBB68E265EDC1F1D7AF = TOE_UPB1 (The Theory of Everything) | V | 0x024D968A656D5732F35CBA63A8391322 ; MKBv49/FindVUK 1.00 -0x0CFCBE28765AC28B82900018DEA80D5F6E5CBA99 = TOE_UPB1 (The Theory of Everything) | V | 0x9AB11AC4A771EB66CF4DE796FAFF31CB ; MKBv49/FindVUK 1.02 -0xF7F014A65270BE3F9F4C2778D2C0E2D88DB388CE = TOKIKAKE (TOKIKAKE) | V | 0x68F4C636903B6C17A8825F980CBF2C7E ; MKBv9/FindVUK 1.00 -0x0D3E48A993F185F5C0717DABC344E221674158DE = TOKIKAKE (TOKIKAKE) | V | 0xED19D1D528884457665520110D6E1AB0 ; MKBv9/FindVUK 0.99 -0x26393C6A489F4423A25154A98ADB582D0B8780EA = TOKYO STORY (Tokyo Story) | V | 0x6F0CA42A9FBB133EBC964C19C55BA7EE ; MKBv17/FindVUK 0.98 -0x12079250514DAA9044F8D51EB2B41CE5DB607A26 = Tokyo_Ghoul_S1_D1 (Tokyo Ghoul S1 D1) | V | 0x117A4BB0C5C0E4E64618BB130610547F ; MKBv53/FindVUK 0.86.3 -0xED3A5209AB5F085F6A78FCB1B0F1F671398C9282 = Tokyo_Ghoul_S1_D2 (Tokyo Ghoul S1 D2) | V | 0x608B753A56489C8682807ACBEC534A30 ; MKBv53/FindVUK 0.86.3 -0x1F87C750F3ECF3981C2367A90CDB5DABCB64C99C = TOKYO_SONATA | V | 0x56AA96DDE704B2E92669BBEF2F8F2EF4 ; MKBv12/FindVUK 0.98 -0x175276840C43AE956AB7334121C6F06CEE59A022 = TombRaider | V | 0x734664857B388B4947BBDD50910C3C11 -0xA0B762C1AFD4A6453960EEDE7695C7F4CF97C3F8 = TOMBSTONE_USA | V | 0xDF11939B7D194928794343EBE423A8E0 -0xF18BE995AA3BF36ED7EC410EF5792350FC718314 = TOMB_RAIDER_THE_CRADLE_OF_LIFE (Tomb Raider: The Cradle of Life) | V | 0xDE7B2416DA3624EB84B48710DF6DC4AE ; MKBv35/FindVUK 1.02 -0xC121FE793144F784F2AEFD7091160C838089E28C = TOMMY (Tommy ??? Blu-ray???) | V | 0xAB1E235C8A174403FB689541E0CBD868 ; MKBv18/FindVUK 0.96 -0x509DE793F8DC30489422FBB8C91081CDEF1D070B = TOMORROWLAND (Tomorrowland - Blu-ray???) | V | 0x787FD2DDFE239E02197F6A1ECE34A748 ; MKBv50/FindVUK 0.96 -0x1FCF93B6BEC25753ED3C2C7C7302E9968B695DAD = TOMORROWLAND (Tomorrowland - Blu-ray???) | V | 0x66F745027662F46A0696EA81C1EBAE67 ; MKBv47/FindVUK 0.87 -0x03B2F793DE8A570A415400193DD70AC568E19893 = TOMORROWLAND_A_WORLD_BEYOND (Tomorrowlan | V | 0x1EE263A47C0E52051F37B1980009460F ; MKBv50/FindVUK 0.89 -0x2B1BDB068C45A50EB07D2BB74AB2C3881F98C78A = TOMORROW_NEVER_DIES (TOMORROW NEVER DIES | V | 0xFCC22206A36E9DD8867FEAEC8ADA2A24 ; MKBv27/BD+/FindVUK 0.89 -0x738092E36765DB37A0EA0E7243472595C1715A06 = TOMORROW_NEVER_DIES (TOMORROW NEVER DIES | V | 0x18049525354C683C2D163403E46232D8 ; MKBv27/BD+/FindVUK 0.84 -0x2B2FC6C0627361DE6E767C17B2177159CA85F600 = TOMORROW_NEVER_DIES (TOMORROW NEVER DIES | V | 0x2B9F86F150DAEDD85677D1E61C10CD55 ; MKBv27/BD+/FindVUK 1.00 -0xA91F723C47BE2B6E5555DEB849F424ABEBE8F3A8 = TOMORROW_NEVER_DIES (TOMORROW NEVER DIES | V | 0x64F29FD63C28B48AD062EC0D8C44F1F9 ; MKBv27/BD+/FindVUK 0.99 -0xA217197CDE2ECE297E96638D09088C829DB9D644 = TOMORROW_NEVER_DIES (TOMORROW NEVER DIES | V | 0x77ED5AA003DDC71891B08C7A3F878F0C ; MKBv27/BD+/FindVUK 1.00 -0x75C43AE4BF47ABCBA347FDAED5C0DCECD897278D = TOM_AT_THE_FARM | V | 0xBE25D478F66F3FDE2C1869E61167B04D ; MKBv47/FindVUK 0.98 -0x4D30E1B6FEB531B2CA9080F95CCB527FA89EC02D = TONARI DISC 1 | V | 0x4FEB7DEACC7D3F9F6B1A916415306485 ; MKBv47/FindVUK 0.96 -0xD8F60C813D66F0261D1B9AD3E680B71F51A3348F = TONARI DISC 2 | V | 0x017A23895C61EE8CA3E3E435FF4019C3 ; MKBv47/FindVUK 0.96 -0x4CD729DF998C18BCBA3B314B6A6A0224C40F225F = TONI ERDMANN | V | 0xB3DDFFD203DDC2AA4B46B4147AD0A93A ; MKBv62/FindVUK 1.00 -0x4C6D16C627CBF241D74190CA098BB6C6B0333DDA = Toni Erdmann (Toni Erdmann) | V | 0x954A00C0C784AC35E000B485279C6631 ; MKBv62/FindVUK 0.98 -0x71EAE66C6EE3227767B740BD72374476372FACAC = Tony Bennett | V | 0xFFEF00B764EF90BA2C053E078CDA59D9 -0x61D3D24EA3BE6397EC953A8A90AD739D499FC78B = TOO LATE BLUES (Too Late Blues) | V | 0xB529370821A512CDA943CEC47252BBEE ; MKBv30/FindVUK 0.96 -0xF780EB0F46020CEBDB965B1A7D05430CE4578118 = Tooth Fairy | V | 0x1E85F9CD528FC12CDFABEE91BAD0B819 ; mkbv16 BD+ -0x5C45EFC705B2FC898C4663A4B4F4F34BB745EB96 = TOOTH_FAIRY | V | 0xC6E956F27E15E6C0E5BFF13EFF4CA90F -0xEAE5401FE5E4F581E462F10A317261E298B70C0B = TOOTH_FAIRY | V | 0x654A7EEACC3B09A6D37F5387922129D7 -0xD9D46E059558497591481D0090698A8DE0DD39F6 = TOOTH_FAIRY | V | 0x83279F7C399F2401624CDB5653329B92 -0xC9B55D4D37AA666E326E56E7F0365282597466E9 = TOO_BIG_TO_FAIL (TOO BIG TO FAIL) | V | 0xC8F006FD217D98BEE5ED52ACCB3E6E92 ; MKBv25/FindVUK 0.96 -0xA8100D0A7B96D6082D8D7CCB3F620575FC8F16EE = Top Gear - Polar Special | V | 0xCD4D105578D3CA8737F0F21157D49128 -0x472E96398240AD41EAF658369F9D28C31C557F20 = TOP GEAR SERIES 14 DISC 1 (Top Gear Seri | V | 0xE000C496C7879B1003905F3F6E154CEA ; MKBv19/FindVUK 0.96 -0x3ED4A6079D691C07A07A59B6AE05C59454909BAB = TOP GEAR SERIES 14 DISC 2 (Top Gear Seri | V | 0x685E251B4FDE8713641F2F1EFF08D869 ; MKBv19/FindVUK 0.96 -0x59C7D99F302DB1EEDB271537A11C1967C47A19A7 = TOP GEAR SERIES 14 DISC 3 (Top Gear Seri | V | 0xF3F3CA5F89B30CF6509AA2E5C3C36BD7 ; MKBv19/FindVUK 0.96 -0x5D794D6E3AAB709EFE6550238196F984E10C6E54 = TOP GEAR SERIES 15 DISC 1 (Top Gear Seri | V | 0xB9946FD1A15AF33D2FF15D30F7BD6CC3 ; MKBv19/FindVUK 0.96 -0x50F005BC69ECA39A65DB47B770B4CDC8A569BF5B = TOP GEAR SERIES 15 DISC 2 (Top Gear Seri | V | 0x2CE6CBCBBDBBF0421039399CB77CF67C ; MKBv19/FindVUK 0.96 -0x8FC0096F3DE7CB8BD257F6236E356FC3464099A0 = Top Gun | V | 0x4B3177B4BD05C441EA7E6193322ABE23 -0x32269267E3CFE1FFF29215B7F712DC5DC4F45395 = Top Gun | V | 0xB76AB052E924CB896898C608A8B30408 -0xAFBD49848C5D3D9F1A0AF66C2233FEEFCF4364DF = Top Gun (US) | V | 0x7638827CDBB7FEDE4647EF4D158011FD -0x370D72F6E2AD79FF268EADA88CEB8A0EEBE5D8C6 = TOPAZ_DOM (Topaz) | V | 0x3F3425914283913518976A0D755F50A7 ; MKBv25/FindVUK 0.94 -0xF44609F5A31BA78DA9E2DF3A16CB4CA8BC450927 = TOPAZ_DOM (Topaz) | V | 0xACCE12C0B6F2698481BE10727A5B32D5 ; MKBv25/FindVUK 1.02 -0xC4D70930EBE1ABD216775BF8F398389CA04F0596 = TOPAZ_G51 (Topaz) | V | 0x177ADAFBF1972B34E5EFB111578E6D50 ; MKBv27/FindVUK 0.96 -0x058E44FB5FDE0A8EE6F52344CD156C0354D05E8E = TOPGEARSOUTHAMERIC | V | 0x39C0F4AFB6DC490F559B59AD5BDDF411 -0x97B786DEB3C5B2C4B69F64D9A5E4BC31F6AA75F8 = TOP_GEAR_ROMANIA_BONN | V | 0x19563757CADEC827383F1C9CF68DC81F -0x05E206A97AA3110BE5C1CF4CA13DE8B679F2AAB8 = TOP_GEAR_S16_D1 (Top Gear Series 16 Disc | V | 0x8AFD53170F9C78B2EE5974457A1C2195 ; MKBv23/FindVUK 0.96 -0x94BAD8DDF9E1400D6E936469DDF04BDFC52F124D = TOP_GEAR_S16_D2 (Top Gear Series 16 Disc | V | 0x5FCA3FA7F39B502099F97B96BBAF1FE4 ; MKBv23/FindVUK 0.96 -0xE4991F1817E556FA1C65215038B427275F46C237 = TOP_GEAR_S16_D3 (Top Gear Series 16 Disc | V | 0x74408EC5E7AE505E2CD00B06CD11235B ; MKBv20/FindVUK 0.96 -0x0372F5360EE0F0E7164BF1E4DF4AAE33A29EF54B = TOP_GEAR_S17_D1 (Top Gear Series 17 Disc | V | 0xA8C660F72D68B7DA1C6888CA0BCECF2A ; MKBv25/FindVUK 0.96 -0x96F473D62E2577A17DC20319A8DB3012C1D6F6CE = TOP_GEAR_S17_D2 (Top Gear Series 17 Disc | V | 0x567123C3C77A8DBB69DBCD2C674D6F81 ; MKBv20/FindVUK 0.96 -0x1B50A6E1119BDFAE286F9D74C13310369555540E = TOP_GEAR_S17_D3 (Top Gear Series 17 Disc | V | 0x2F7117ED9DAD21EDBF63B718321B8B01 ; MKBv25/FindVUK 0.96 -0x71DB0C48A3F2AB921BD3D6FC55528F92AD07A577 = TOP_GUN | V | 0x901D6915AD462214C65A223452EE69AF -0xD8BBFC6BF21A9A0CAB5BFEFADCFB5C84676FAEAF = TOP_GUN | V | 0x62CCD9BE5AB69BEA3CA71B33072B017E -0xF7CAE7D271D601DDF409CB5CCD61099B5E7F5D12 = TOP_GUN | V | 0x018433E446903B6A0EF75F5F5E3342DD -0x8FE629BB2D2D5584FF9715CD1A8192D1A132FDE7 = TOP_GUN | V | 0x827DED0DFEBC47C96C1DC3E26BD5A8F4 -0x54C3D416523AAB9F5A855577140FA4339922A6A6 = TOP_GUN (Top Gun) | V | 0x6329BC3F323B9ABEB6FE085B54E242E4 ; MKBv7/FindVUK 0.99 -0x6A2E4BF363FAEFABB776013559203CC09C95C1D0 = TOP_GUN (Top Gun) | V | 0x230E86364121EF19B49387038374721D ; MKBv12/FindVUK 1.00 -0x0C51E947F0E894E7F074D1E7DD6EBFC15387DBBE = TOP_GUN_3D (Top Gun 3D) | V | 0xFD957E59C209698B7C014A88B06BADB4 ; MKBv36/FindVUK 1.00 -0xD7E3212B1FB987F0841D69362C321A87131E7C6D = TORADORA _ DISC 1 (Toradora 1.1 - Blu-ra | V | 0x0B4F7BD8F28C7C5CE54AEC5035E19747 ; MKBv44/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0x3CD07889CD59B64A2C717F706B0DA599BAB87566 = TORADORA _ DISC 2 (Toradora 1.2 - Blu-ra | V | 0x71AF9CD72054C68C10DDCE864D4E71C4 ; MKBv44/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0xAE6BB60BBC3E1C568E0A393C69E723DB8C6F459D = TORADORA _ DISC 3 (Toradora 1.3 - Blu-ra | V | 0xB02F08DD844F7C828CBE77848B171B36 ; MKBv44/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0x91934B6F2174889029707CBA2660178765A11F3D = Toradora! Disc 1 (Toradora! Disc 1) | V | 0x13282FF1E8CD649C2917ACABF8824A6B ; MKBv47/FindVUK 1.00 -0x629CF54BECA7E9802D0EEF8B24AE21E42ADC3AD8 = Toradora! Disc 2 (Toradora! Disc 2) | V | 0xC1AE539845535028396DCE476CA7627A ; MKBv47/FindVUK 1.00 -0x3137CB7D6A2A0379FFF002AC7EA57A1121C606F7 = Toradora! Disc 3 (Toradora! Disc 3) | V | 0x0997CFC4B0F84AB8E239D3090F7BCCC5 ; MKBv47/FindVUK 1.00 -0x7B7D0285C2C66EECC5CC6D3899C4B88217C508BD = Toradora! Disc 4 (Toradora! Disc 4) | V | 0xB202D483F6A7134AF06F3D43E151262E ; MKBv47/FindVUK 1.00 -0x989B77AAEFD41205A7C0D744A8117EA922A8FCE5 = TORA_TORA_TORA | V | 0x8484D7DF8212BE3B475208C1C18B75E6 -0xEF48D842D61505597B79254704AE584B72072AEC = TORA_TORA_TORA (Tora! Tora! Tora!) | V | 0x86BD1B1614F1F73179094ED4FE0A5121 ; MKBv23/BD+/FindVUK 0.96 -0x161E6D7436E3F85591B9C1AF0CFB28271667201B = TORA_TORA_TORA (Tora! Tora! Tora!) | V | 0x310B85DDA4FDD1D04B63B7F22140FF65 ; MKBv23/BD+/FindVUK 0.98 -0xD4740BEB8ABC41E29C679FFA775F661326907E82 = Torchwood S1/D1 | V | 0xA5C4C41B757780FD87F5DEAA3D78AB26 -0xDB04CE16BA89376A7881106BE836F400DB0ADDD4 = Torchwood S1/D2 | V | 0xF354926C5B510E37CE09D93280F5DB99 -0x3F7C8EBFFB30D65A626581E1B3A333308BDE868C = Torchwood S1/D3 | V | 0x73683BDFFEBD8F176DA7C6E389878CB7 -0x6D998243F515DD7B867F3D4A1A215FB3F4F9B4F3 = Torchwood S1/D4 | V | 0xC029726062C146062E282FE05D8B46FE -0x23C5AF2A83A5D8912B2680D93FCAF723325B138C = Torchwood S1/D5 | V | 0xF5789DFCC4E8ECAB63E6457B0265EB97 -0xCFB7EF59C0BDD71C071405CD43071F2BC2F1E22B = Torchwood S1/D6 | V | 0x9E8A8D3D849F1962682750F40A818144 -0x007A90F59D57634E0BDDF70A53DD5F3C9AFEB233 = TORCHWOOD_S1_D1_UK | V | 0x2CE2B8A17E4E26D08C5659EBAA0CE494 -0xF12F100042980DC6013ABD5B9C0B0C0422C881A5 = TORCHWOOD_S1_D2_UK | V | 0x9963BDD962484ECE28FC328448D609EA -0x394A2DB0DE7EF8E97F5DFEE68C48CF4E94A8105F = TORCHWOOD_S1_D4_UK | V | 0x31D4114C5A11050E0CDDD3672E148250 -0x0D39D0C93133AA771C1D760111267F2AC0C750F3 = TORCHWOOD_S1_D5_UK | V | 0x42BCF74B2DFF44B44B69237C2A9FC6AD -0x15EE2A0C30ED472FEE74482A55B4E9EE27383D59 = TORCHWOOD_S1_D6_UK | V | 0xCCCBC1668CB55624C445BB49A18E0E6D -0xBABF05B693FF94B3D59DE6BE4D6D1D8DD37E4E79 = TORCHWOOD_S2_D1 | V | 0x72EC53D082F9C6164C4DF7A40D5F3B6E -0x32E37713CD42C6AFB715B1A0935DB2A9871FAE03 = TORCHWOOD_S2_D2 | V | 0xAAF78275BC3CB0E366AEF070BCC7C3A5 -0xB4CE00C5BE624F7A126362C0FAA27CCF1C460D99 = TORCHWOOD_S2_D3 | V | 0xCBBB7AE0FE6DEE269D2763395C7D89A9 -0x8BA9B653BAD2B1B9F7BC77BA2139C6CC07F25616 = TORCHWOOD_S2_D4 | V | 0x955D73BF7E7DDD2E111195696139DECD -0x8FECD433F2899A4CF9135C346EDBC8E846895CE6 = TORCHWOOD_S2_D4 | V | 0x2AA315AE999237E4C9EBEBE7F396C9C9 -0x0AE8050437ADB5304FE523CF1FAE07C791AF0617 = TORCHWOOD_S3_D1 | V | 0xAFE57C5E55C26553E965F6386089FF34 -0xBF5F0345B105560B97CB29E5E497A46731D88CB3 = Tori Amos: Live at Montreux | V | 0x2E707529043C85A51E81269DA4880478 -0xFFFAAD8C6875262AECF5C2C82650F36F0A479231 = TORN_CURTAIN_G51 (Torn Curtain) | V | 0xF9D5383BC50866D4F7F5E0AA41FA9DEC ; MKBv27/FindVUK 0.94 -0x2224F49B67D8FF8490E6E445824D6C6FD1BA9323 = TORN_CURTAIN_G51 (Torn Curtain) | V | 0x16024D866D009EBA47A4E3E67F5F4894 ; MKBv27/FindVUK 1.02 -0x73C04F661B75B8EEDF0ECADB1C730418713B1A07 = TORTUGA UNGLAUBLICHE REISE | V | 0x84154F5D79B06EAC78B1ADE4E4FF8DC7 -0x6485584ABFF8835B1EF6C960014BA98AE6566D7F = TOSCA | V | 0xF216FD3A26E2CEABE8275867EFBA0724 -0x2D9C63F970C7DE3889B1EBF12B982BED1951A50A = Total Balalaika Show (Total Balalaika Sh | V | 0x1E52D41B65038CDC91B45AB854447023 ; MKBv43/FindVUK 0.92 -0xDEC2DA6FA24A146BA2E998FABD936C4E28A29AC0 = Total Recall | V | 0x477C53BC1E826E179129402C36C1F94B -0x8DD4C24E6097223F05D40EDAF40D4C3D3FB18BDB = TotalRecall | V | 0xBEAD2E5E8327963573609BAB75322F13 -0xFCFCC5E09CA32D47AF1D5EE1DE7327C7E56E977D = TOTAL_RECALL (BLU-RAY) | V | 0xA5BD5E88D80A8945E05368D8A600B0F2 ; MKBv31/FindVUK 1.00 -0xEE6C5B25A281A3703C24F19B8424867239A31915 = TOTAL_RECALL (Total Recall (2012) - Blu- | V | 0x35CDF8ABD1079D33786E08D48D751121 ; MKBv38/FindVUK 0.98 -0xCA2A55DC0D249AC139CA8EF0505E7B9AFBDF7396 = TOTAL_RECALL (Total Recall (2012) - Blu- | V | 0xD08CC73F018C366F357996E95B4806F2 ; MKBv34/FindVUK 0.91 -0x7AD4A328184ED9C5742027CE2D062A904DEE33AA = TOTAL_RECALL_2012 | V | 0x9B0D339D7B6E682DE4FFE89A264A1DB2 ; MKBv33/FindVUK 0.81 -0x0E574AD2AE64A2E0F0AD865EBA51855AD5267C8A = TOTAL_RECALL_2012 (BLU-RAY) | V | 0xBBF143EEEF370EC170D75B7ECB05924A ; MKBv30/FindVUK 0.96 -0xDC34C793192F9ADB4F2E34F359EAFF5D58C5A03B = TOTAL_RECALL_2012 (Total Recall (2012) - | V | 0xA62CE0BA4900D72366EBF287952CD2C2 ; MKBv33/FindVUK 1.00 -0x07BCC57E3DEA8DD3BAE516B92E893E0D12FA8C1F = TOTAL_RECALL_2012 (Total Recall (2012) - | V | 0xBF3C777728579FDA8B5C8A09CAD5F132 ; MKBv35/FindVUK 0.96 -0x1891DE80103E1064EABF7FE4437E0F609B02483E = TOTAL_RECALL_2012 (Total Recall (2012) - | V | 0xC778AAC1421B18D9B049607B7D8F8093 ; MKBv31/FindVUK 0.96 -0xB9E785D1CCE4447B17F7A9147C7E3A774E5CFB99 = TOTAL_RECALL_BONUS_DISC | V | 0xEE5B997E3A62F72ADC8596A386365B19 ; MKBv31/FindVUK 0.81 -0xB6F5C830369CAF13D96BE64C709015550682B868 = TOTORO | V | 0x82B73A2F1091DC2C2E521487ACD377C3 ; MKBv40/FindVUK 1.02 -0xAF9E83B439B8D4A9EDB745412240A72943A4BF9C = Toto_Live_in_Amsterdam | V | 0xCE7E56C0B703A875F2EF35249A4B3FEA -0xA4C1ACAF1DB735F8E237B0769772FDFBE4A1A2DC = TOURIST_TRAP | V | 0x721C57296519C7834315484E4B207F3F ; MKBv35/FindVUK 1.00 -0xC01CDD337A94332CB8C4AE20BA53CD17D21402D2 = TOUS_LES_MATINS_DU_MONDE | V | 0x279B3CEDBE902E9B25DA397F42135602 ; MKBv43/FindVUK 0.65 -0x2173E7C9D11994530247F237E8550330AC8FE157 = Tower Heist | V | 0x87AB9696E2BE3A1CD36DF95D6BFA814D -0xE1E65C646733576AC3FCE3E78AE68462D153726E = Tower Heist | V | 0x3BE2DBAF97060F41BEA2A02B378FAD31 ; mkbv23 -0x022890C12BD34D27A6D17A1E42C6A065E8274300 = TOWERHEIST_DOM (Tower Heist) | V | 0xD411686862F3F703D44BCD879C7A9B02 ; MKBv20/FindVUK 0.96 -0x857AFCE67DBFBBFC579AB50015CEFD0C428C8C9A = TOWERING_INFERNO_THE | V | 0x297257B0F0B944FD0AD54D59DCC2C707 -0x96F3E7FDD496C0FDF6A99BC8414170E05FE0180B = TOXF_5712 | V | 0x41D7BD516370DECDF167655ED2A739B8 ; MKBv24/FindVUK 1.02 -0xA8BCCB2BE206AC49D3C0AFC06A1859FC803B03CA = TOXF_5737 | V | 0x6A5AD9E888ACC5F1D4098B11478519A2 ; MKBv30/FindVUK 1.02 -0x4E9B41A7A66C4205EC56C7BFB5EDF9C1B954C403 = TOXF_5750 | V | 0xFB7ACBE50F49DECFF4972864EA52492E ; MKBv31/FindVUK 1.02 -0xBCD15416C62C91D75F9D0D2FC234807ECACAC115 = TOXF_5767 | V | 0xE34443A5086A76BDA8EDF71F2779BC2A ; MKBv35/FindVUK 1.02 -0x3E69B4C7D511B84230DE57292F5E80959B1830AD = Toy Story | V | 0x586F2EC7F3BCA75CABA3C09FBDBD5274 -0x0732CD5B0E44ADC62171F1C92B2FE5671B1AD9B0 = Toy Story 1 | V | 0xA87F7494FBB24E15C5F969A1D63B365B -0x94035E4E0CC916AB6CC89971B529C7D6A743D580 = Toy Story 2 | V | 0x4559FDD3F5F728669A992C88C49D02BD -0xF0A8E0557FF342C9D68D05B0CFDC7B8D684A77D0 = TOYSTORY13D (Toy Story - Blu-ray 3Dâ„¢) | V | 0x8E885DD2B361101DCDBCA1E8165F1171 ; MKBv25/FindVUK 1.00 -0x7634050570695E7DCBC5EFB3B7F0422DEA3C22C5 = TOYSTORY3_3D (Toy Story 3 - Blu-ray 3D?? | V | 0x1444795416AC2F38646A70EA375F851B ; MKBv25/FindVUK 0.92 -0xC441590B8C8EABA4B4DCEFD0BD0BF9199A714487 = TOYSTORY3_3D (Toy Story 3 - Blu-ray 3D?? | V | 0x29C937BF9BDE387D636326A8FC14DBFC ; MKBv25/FindVUK 0.96 -0x416721A2EC519B492A53FB429A274F6544F8EB68 = TOYSTORY3_3D (Toy Story 3 - Blu-ray 3Dâ„¢) | V | 0x544564BC89935E0357DD57974D2C2D10 ; MKBv25/FindVUK 1.00 -0x21748A7036F358379839DFB99FC27524C8D00EBF = TOYSTORY_3D (Toy Story - Blu-ray 3D???) | V | 0x0F06B39D8A1126DF7AB18E55683D53F4 ; MKBv23/FindVUK 0.92 -0x1A5B581FEA93BA537D4C14ABB6966D4BBD87514C = TOY_STORY | V | 0x4D73CEA11403C558D0C434F1AE34144F ; mkbv15 -0xDC3F0FF9342A0A8CF576C6CDF1A00C401C9BE4EA = TOY_STORY1_DEU (Toy Story - Blu-ray???) | V | 0xAE6361F458F32780CD279C8FC56BE6F5 ; MKBv19/FindVUK 0.96 -0xEE03514A513C79840F5A28C7B354F9B3B8743258 = TOY_STORY1_DEU (Toy Story - Blu-rayâ„¢) | V | 0x764F4066FFCCF035F682E9DDBACE5B26 ; MKBv16/FindVUK 1.00 -0x0B0140A4F4FB2113DD745EC7B883EAC27631F51A = TOY_STORY1_JPN | V | 0xD3708EBC9AA2DA37C1E42F8F46B12B60 -0x81AF760B9EA0AE3F07FF96058A9EDDA549E3FC53 = TOY_STORY_2_3D (Toy Story 2 - Blu-ray 3D | V | 0xEEAFFE0C17AE2E7CBD781DEA686118B1 ; MKBv20/FindVUK 0.96 -0xEB31FD42B2D9EB84901300E0BA13814949B24F7E = TOY_STORY_2_3D (Toy Story 2 - Blu-ray 3D | V | 0x09514338DEC377B98FB4C8EE133E649D ; MKBv25/FindVUK 1.00 -0xA2AF165342D787A3ED25DACD4BFB90A84C3E0A50 = TOY_STORY_2_DEU (Toy Story 2 - Blu-ray?? | V | 0x4F54F1AB276E30F0CC88353C3FD6A0F1 ; MKBv25/FindVUK 0.96 -0xC2981119E42270060FEFAFB9A6C8DEF7A476F069 = TOY_STORY_2_DEU (Toy Story 2 - Blu-ray?? | V | 0x5DEC896257789E573BC4E12717C455F2 ; MKBv15/FindVUK 0.91 -0xB4BAD2B3DA2BE29DB9C6423761700814D9E2ED54 = TOY_STORY_2_GBR | V | 0x1C8CDEA7E2595F025B95FF931EB0E1C5 ; mkbv15 -0x5A3A44E8E31658E33CC07DBC87DA1C0B3C5EBF79 = TOY_STORY_2_LIC | V | 0x12A29AD5A16BB17A38712BC7999E465F -0xA7A95F602D0FCA8AFF2CE4814581AB5FCF036C8F = TOY_STORY_2_NDX | V | 0x3BCA10488DD1B332CBA45A70DBD4E29D -0xAF86BBEC492ECE8D624993F49E3EEACA366615FC = TOY_STORY_2_USA | V | 0x814239253E604C30FD10D0F17F2888E7 -0xC5B0CDF776A22895AF2C15BFA143020483630C11 = TOY_STORY_3_D1 | V | 0xD344B394FD0FBA3D3FE58DC03A9EFC26 ; MKBv19/FindVUK 0.84 -0xCAA585AAC02DAA82ECE1630FCB6D182E952D40B3 = TOY_STORY_3_D1 (Toy Story 3 (Disc 1) - B | V | 0xC9D29927DE5B93C628093E10AAD24B32 ; MKBv19/FindVUK 0.96 -0x794AC13684068094D3D010B2102765E9EFC82E8A = TOY_STORY_3_D1 (Toy Story 3 (Disc 1) - B | V | 0x3B73B3CD2A907925822A4C886A51ADA7 ; MKBv19/FindVUK 1.00 -0x5CB6C946DF67955AA20284AF6A7DF16547EC4465 = TOY_STORY_3_D1 (Toy Story 3 (Disc 1) - B | V | 0xFF8E9537A07CAF3B350908926658D0A4 ; MKBv19/FindVUK 0.92 -0xD69C83722CF0EDE78C349A94121AF7A41D7E10B6 = TOY_STORY_3_D1 (Toy Story 3 (Disc 1) - B | V | 0xB120B10ACF917628896413E98E80CC60 ; MKBv18/FindVUK 0.89 -0x94F457F5DEDE6A7A3CC6AA80E8DCEF3D4EB1BE46 = TOY_STORY_3_D1 (Toy Story 3 (Disc 1) - B | V | 0x102C80D2AEC345760AAC8266404A09AF ; MKBv25/FindVUK 0.92 -0x116C54B083E8547F7F146D67F28A63693876C8A3 = TOY_STORY_3_D1 (Toy Story 3 (Disc 1) - B | V | 0x77A53351865577ECD37736957A5D8807 ; MKBv18/FindVUK 0.96 -0xD5F5F5B494D48CE2E8B36814B17489DA894EE081 = TOY_STORY_3_D2 (Toy Story 3 (Disc 2) - B | V | 0x21B2799C9FC0251A781B5135EBEC0E01 ; MKBv19/FindVUK 0.89 -0xCFBBF23F8CC3CA7B0E022E36129D9F3C222BC802 = TOY_STORY_3_D2 (Toy Story 3 (Disc 2) - B | V | 0x197FD70DBAB11F5B437B3B6D6A37C25A ; MKBv19/FindVUK 1.00 -0x585B8522D1F3EEE99252F23E74EA441AD64351F7 = TOY_STORY_3_DISC_1 (Toy Story 3 (Disc 1) | V | 0x801EA502BB36D1C0206A3D978FF20B74 ; MKBv19/FindVUK 0.98 -0xEC0C437B5B4B7F0D2C1AD0CDEFC5EBAA05198432 = TOY_STORY_3_DISC_1 (Toy Story 3 (Disc 1) | V | 0x4F33C21F80EA6E0939A165A64D68D46D ; MKBv19/FindVUK 1.00 -0x13CB662DF9F5F6E8245D416B69635C167BF4C19C = TOY_STORY_3_DISC_2 (Toy Story 3 (Disc 2) | V | 0xF55BF996ACC90062C5734E22121C5920 ; MKBv19/FindVUK 0.96 -0x2E273EF64E66585B5018274F7EB9EFD086CEB4E2 = TOY_STORY_3_DISC_2 (Toy Story 3 (Disc 2) | V | 0x6BEEB4AEE7D43CC98D71B52D3328EBAF ; MKBv19/FindVUK 0.92 -0x46019EFA25D6DBCB1F72C817B302884BC26C5094 = TO_BE_OR_NOT_TO_BE (To Be Or Not To Be - | V | 0xC8AAA082184EFFF6537C3F446C92209B ; MKBv12/BD+/FindVUK 1.00 -0x23BF8E51F310459292618C9B5B87D81816E4EC73 = TO_BE_OR_NOT_TO_BE (TO BE OR NOT TO BE) | V | 0x3364BC52EEC8CEDCBA9228C8FE4D25D1 ; MKBv25/BEE/VUKNOTVAL!/FindVUK 0.93 -0x382DC84A8CA3212F6F86EFC1571380562D7629E0 = TO_KILL_A_MOCKINGBIRD (To Kill a Mocking | V | 0x3BC4871BA21417A964664B381D70697C ; MKBv20/FindVUK 0.96 -0xEB749638B9054ABDE4A27B5F5F819E84177E9065 = TO_SAVE_A_LIFE (To Save a Life - Blu-ray | V | 0xE39363EDF66A658F69858F1797618558 ; MKBv18/FindVUK 1.02 -0x693FAD0F7AF9D1F9D0ECE847C3B3DC41EDE09D05 = TRADING PLACES | V | 0xFD05989B2A2F7F02CD6177FAF0CBEB65 -0xEC34B7340AE62085EF0A182EAB6767FBB7A42C6C = TRAFFIC | V | 0xBE8A07B233FDBD69A2829F1E9F4539CE -0xA96561CACD25EDF4564DE762A9F32A86F9C4E942 = Traffic (Traffic) | V | 0xD15A29BE836E71EB9535E3102B2B0A30 ; MKBv19/FindVUK 1.00 -0xD874179C3212492BE437A24494F6D2DA367F1826 = TRAFFIC_DIE_MACHT_DES_KARTELLS | V | 0xD8DFC2745877E2EFB92A4CE75EDE7784 -0x87A9AA27863C4F198E86CB4E42B8965178550E83 = Trailer Park Boys - Countdown to Liquor | V | 0xDA866D26B3AABD5F2829C9E88E91ECED -0xE47027829E98DFA86B1DDBD258D39329F2213FEA = Trailer Park Boys Say Goodnight To The.. | V | 0x3F10A4C36CA879DF33A0C81760432461 -0x6B72BD0A2115FA2A8C9D19AECD69658F451A6D18 = TRAINSPOTTING | V | 0x9BD88F029AF605ABB54370460A6C302D -0xA5D0459CBA0B1B4F11BEA9C06166A8F41EB63796 = TRAINSPOTTING | V | 0xA060D151796A5573034E184440635064 ; MKBrev 25 - FindVUK 0.54 -0x240407E0406DEC3A932BE7B72A73DF55D4794199 = TRAINSPOTTING_G51_R1 (Trainspotting) | V | 0xC396EFAEC38B1FE4F23518206AA406A8 ; MKBv19/FindVUK 1.02 -0xF1C5C5780307A0C03D5E4AC7D81E2452E48DB9C5 = TRAINWRECKRENTAL_NA (Trainwreck) | V | 0x3C0AE3CDC3DDAF558CA2BF76EB6B2372 ; MKBv50/FindVUK 0.86.3 -0x212AD56CE91A8902B44026A75D81289A441CF75F = TRAINWRECK_UPB1 (Trainwreck) | V | 0x0D72CF1B94065CDACCC7A5CA5E152C23 ; MKBv56/FindVUK 0.98 -0x3E7682D6078B1C518B886669C2BE0F2E3CC2D2BB = TRAITOR | V | 0x555C891DF32BE7E0A25FC1A63C6F25EF -0xEC6448502D2318C5FCA1303759A2CE2B515D49B1 = Trampa_de_Fuego (Trampa_de_Fuego) | V | 0x7EB20CB756A16181CE3E3360DC6E6B69 ; MKBv50/FindVUK 1.00 -0x0764AA8B07B36C97BBFB9CA95A60B4B8B21BA175 = TRANSCENDANCE (BLU-RAY) | V | 0xCF5D999EEB152C09B662F8B59ADA34A8 ; MKBv48/FindVUK 1.00 -0x77A740831A045386074EE0D59B2B4033B61EB7D5 = TRANSCENDENCE (Transcendence - Blu-rayâ„¢) | V | 0x01854BAF25C24D9726449E064D221412 ; MKBv47/FindVUK 1.00 -0x9BF206AFB7A24D69ED7260788C8DA735FFD8315C = TRANSFORMERS | V | 0x2C55BD87B3D6E1302EE201DC480C1DFA -0x32D3CE7DEF0DA78C1607FD3FD8BCEB925510AB42 = Transformers 2 | V | 0x23C336DB056451D9F0C2619FB456E011 -0x7A302AEF603170E4F5D94C1C87334A5A4330F748 = Transformers Age of Extinction | V | 0x92E5CFD211049E65488AF79464F19274 ; MKBv39/BEE/FindVUK 0.80 -0x0B23FF753CF73EADDBDE2658EE787CB597ED5CD7 = Transformers Age of Extinction (Transfor | V | 0x0DF147BC4905035B321094AD1BFEF79D ; MKBv47/BEE/VUKNOTVAL!/FindVUK 0.84 -0xD2FB7F6DBDEAE458C0F663C900C94FDAC1AD848F = Transformers Disc 1/2 (Feature) | V | 0xDA83706F51D5B354C7D5DEF348EC1AB5 -0x4558E483D4A7F40215D896C89AACD2B673D7033E = Transformers Disc 2/2 (Special Features) | V | 0x53FE3BE0A7BF376389244FC6E9C4051F -0x81C916AECC177162FE31AD75A9ECC8715767B57A = TRANSFORMERS2_D2_AC | V | 0xEB1D1292BDD365C692832117492E9700 -0x80F76BBB73187E5D71E8899C2CF31805DFB9AA5A = TRANSFORMERS2_D2_AC (Transformers: Reven | V | 0x0C3FFFBD13C216E2DF5484C78D2ED73A ; MKBv14/FindVUK 1.02 -0x1F215CAE88A1587634EB4D67952621DF828358F3 = TRANSFORMERS2_D2_EC | V | 0x7F971FDD1D1304723D636CF57A175DF0 -0xA93869ACA3F40E8D16FEF6F163B4584013072329 = TRANSFORMERS2_D2_EC | V | 0x23350E3D9BE510C772D0E611F1820DFD -0x45C81428B090678319451D284F2FFBEF10069B31 = TRANSFORMERS2_D2_EC | V | 0x85CCA68F7C74CBD837184754227641A0 ; MKBv16/FindVUK 0.80 -0x6CD12023AAE9FC3A458AC4817C3FA901929C89EE = TRANSFORMERS2_D2_EC (Transformers: Reven | V | 0x1012858B15AC3574DAF8E19CCBD8306C ; MKBv16/FindVUK 0.96 -0x1F8F895FB21A8C0B3892B8AAE31FC00A6B9C9D29 = Transformers: Revenge of the Fallen | V | 0x52C09043024D564F60026C3290B3D6FE -0xBCB4E6637C85D73C8FFB2540D2C0E6C54FAB0AF4 = TRANSFORMERS_2_D1_AP | V | 0x35EBBB7E8313132091D1D57465860CC1 -0x6EE0DFA97291679C5D12C8BB2EB2FE7387E90867 = TRANSFORMERS_2_D1_EL | V | 0x7B4248E00CFADEF00E300EB09398B18A -0xB7D8A3F69900ECB5F6D524F93FA159F644BBF9E8 = TRANSFORMERS_2_D1_EU | V | 0x9159E099FB27EB503B589390CF1B4D4F -0xAFC4548AFC22FA923915CADCDFE458A4AC40F847 = TRANSFORMERS_2_D1_EU | V | 0x48D785FF33982440DF689A148CAF5F59 ; MKBv16/FindVUK 0.80 -0xFE398DD74A1B97D29E71DC5EC611A71DE66160E8 = TRANSFORMERS_2_D1_EU (Transformers: Reve | V | 0x21A4D945FEFE3609C598635CBCFD3076 ; MKBv16/FindVUK 0.96 -0x7841138F4AAE3DCA92990207CFAD979CF16D1E02 = TRANSFORMERS_2_D1_EU (Transformers: Reve | V | 0xB2FD9127A5D64970E9471A5100BACD1C ; MKBv16/FindVUK 0.99 -0x306E5A481C1F41F78317A9528D246B1612D090DA = TRANSFORMERS_2_D1_EU (Transformers: Reve | V | 0xB3DB9FEE5DE79280004F9EC54165675E ; MKBv16/FindVUK 1.02 -0xC400CA4C0EB2D8ED110F99D562E35C9A0F572370 = TRANSFORMERS_2_D1_EU (Transformers: Reve | V | 0x534EA49783907546A5735357C57DEE18 ; MKBv16/FindVUK 0.96 -0xC0BB0B8BC542A340CB8E8D7976211CE8A4552162 = TRANSFORMERS_3_3D_EN | V | 0x05DDEC033F16F09BF63954DCDC73A074 ; MKBv20/FindVUK 0.80 -0xE35120EB41C8A328931A7225151C49C2A1DDD6C8 = TRANSFORMERS_3_3D_ES (Transformers: Dark | V | 0x9F0D757323B0FE9AD3E9137AB3AD0394 ; MKBv25/FindVUK 1.00 -0x9E60B9F4EA694300EEDB5EBDC72B994C788828BF = TRANSFORMERS_3_AC (Transformers: Dark of | V | 0xBAFB9BF5F910E971B5F9BB9013015C35 ; MKBv19/FindVUK 1.00 -0x3E8ED0D49F8FE4C0E24D5F2E692F32A9B31C5CC4 = TRANSFORMERS_3_EU (Transformers: Dark of | V | 0x05EE903B040FAF2589DACF5988CE47DC ; MKBv25/FindVUK 0.96 -0xA55E2E481D08C9C5254183AF5CBB7A18D6FF5C8B = TRANSFORMERS_3_EU (Transformers: Dark of | V | 0xDBB52D72ACAB4FEC6402245E240E3B16 ; MKBv25/FindVUK 0.99 -0xCDD3EFE77D804A4A7BFAF3A25F129F7EAEDE28E4 = TRANSFORMERS_3_EU_D1 | V | 0x89ED131C1A89AEDB2D40F35F6E11DBD0 ; MKBv25/FindVUK 0.80 -0xA332E397E49535401C7CEE0C69E3768E76414C00 = TRANSFORMERS_3_EU_D1 (Transformers: Dark | V | 0x6682B5AB7AFEEAB20D18B6B649BADFB5 ; MKBv25/FindVUK 1.00 -0x902BC53A06ED3A4A0A240547976CE8010DB56E92 = TRANSFORMERS_3_SL_DISC2 | V | 0xF7AD9F36CBAFF59344F56D07EAC2EAA7 ; MKBv27/FindVUK 0.80 -0x5E8FBCF6F7523AA1A61B77BC8F84C31725C3E21C = TRANSFORMERS_3_SL_DISC2 (Transformers: D | V | 0x73CA5CF9988C29F537ABB1B537A19000 ; MKBv27/FindVUK 1.00 -0xCA877255D061158D24A5876246222A697096BC1A = Transformers_Age_of_Extinction | V | 0x28E6C17D564299BDE5258BBD07F1223F ; MKBv39/BEE/FindVUK 0.80 -0x7F10CB6C8B6EF426C1CA5E0884679AA0BDF42231 = Transformers_Age_of_Extinction | V | 0x6EE817A01B873210C4CF63EC4C81BE0C ; MKBv47/BEE/FindVUK 0.80 -0x4FB7A158266682461E77B1582E5839ACB131B5B6 = Transformers_Age_of_Extinction (Transfor | V | 0xC9C918E3E565D35E134AF6C9157C38C8 ; MKBv47/BEE/VUKNOTVAL!/FindVUK 0.93 -0xA5916FD37E04D45B20198F4A2516AC61D21FC889 = Transformers_Age_of_Extinction (Transfor | V | 0xE79FE344C111BD73C4E0024D8D845D7B ; MKBv47/BEE/VUKNOTVAL!/FindVUK 0.93 -0xFDAAE4B6A04546C441B48FA874221186E502984A = Transformers_Age_of_Extinction (Transfor | V | 0xE065C0F01B93371B54AFA05BF4B23376 ; MKBv39/BEE/VUKNOTVAL!/FindVUK 0.84 -0xFB79C00D14F3C5C61FDF6F7E24AA5FD62E82664A = Transformers_Age_of_Extinction (Transfor | V | 0x39F3E97585D164ABD945328BE9BF2D62 ; MKBv39/BEE/VUKNOTVAL!/FindVUK 0.98 -0xC8AD31A63D7C3A4D5C01B1C48E97681EBB658AFB = TRANSFORMERS_D1 | V | 0xE92F4CD04D512E35829241DE3674ADF0 -0x1C3580EFA6406DEC5F942CE00B51A1A7AF14AEF8 = TRANSFORMERS_D1 | V | 0xDF4DD613F17F6DCF4358A50C883A9289 -0xC540E2CA898F06B282B1F4629C40528E2D969A87 = TRANSFORMERS_D1 | V | 0x2EC39D07B65B6186390596F93175F7B0 -0x390E7662E3EA2E16BC565650FBC76A31F0C96EAA = TRANSFORMERS_D1 | V | 0xA076CBD40A446F65AC78DC1718BB5D11 -0x7D98981CDF1B37CF254AFD274484DFD089E8DE87 = TRANSFORMERS_D1 | V | 0x01417DFA37C563D0BDD7CCBC43CFED0E -0x5531C372426C5D9B693FE72857FA46DAEFF5DC56 = TRANSFORMERS_D1 (Transformers Disc 1) | V | 0x438B83F2152491DD0313B00FA98D073F ; MKBv7/FindVUK 0.92 -0xE2675B1D668E2B71B8CACB8DA9B38EDFE2C99D28 = TRANSFORMERS_D1_EU | V | 0x469CAF5BADD2F84FE6CF1EF29FCE27FB ; MKBv9/FindVUK 0.80 -0x08B4A54A3A7C7A801514C7A2B4C4FF4A5C2CFB08 = TRANSFORMERS_D1_EU | V | 0x2985CE698E25FD365F5DDA63390BEF0E -0x2E08FA7AE798545A31F422C0171104EEC6648190 = TRANSFORMERS_D1_EU | V | 0xA643FA3D9775E8DEAD5D1B47C29EC325 -0xE8CAC7AA762FC66E5AA7ADCE039A3EC0EB3193F5 = TRANSFORMERS_D1_EU | V | 0x4336A4192A220EA86A01D63723858FF9 -0x3578C1416C250AEE488C66AEC04E713B41D3A719 = TRANSFORMERS_D1_EU (Transformers Disc 1) | V | 0x1156816A7445CECD0D0E8AFEB86566DE ; MKBv9/FindVUK 0.96 -0x6F4663EC30678F76DC278A452189B9108C88BA64 = TRANSFORMERS_D1_EU (Transformers Disc 1) | V | 0xAFD2644ECA11ECED429B4954ED09CACB ; MKBv7/FindVUK 0.98 -0x2BE05B6C6A89ED3286862C36FB9E7DF8FA5082D5 = TRANSFORMERS_D1_EU (Transformers Disc 1) | V | 0xD3EF5D862F81F43D4D4BF99F508292D1 ; MKBv9/FindVUK 1.02 -0xA82116531FD5C183DD6913E7BFF8E49026EFEFB1 = TRANSFORMERS_D1_JP | V | 0x1D13564B798A573E938347FCB6587C4D -0x38C6F15246D8CE74D3C7646C5C17E1C212C8BDB1 = TRANSFORMERS_D2 | V | 0x0BF152BB116463DD3D4AB340CA157A99 -0x0375384BC0CE7A411D29A34CF47EAB5A2405E9BC = TRANSFORMERS_D2 | V | 0xA947C904F73E3C4D9AC7D59850056A51 -0xEE30A547CFCEEDC7643D0CE532DDB2609162D6FC = TRANSFORMERS_D2 (Transformers D2) | V | 0xCCD37CAA97FA66213BD02A31F56585B3 ; MKBv7/FindVUK 0.92 -0xC5A86775356DAF42C7141053050E85BD4B5512BB = TRANSFORMERS_D2_EU | V | 0xA514AFA9F0D7FE254FB6C29E0CACB1B9 ; MKBv7/FindVUK 0.80 -0xAC780954C943E24E50E73F5B891BFECD13A364D8 = TRANSFORMERS_D2_EU | V | 0x7C1EEB5B52904DDA0561093D61D6243D -0x12DFF44F8E40F2BAF61CACFE52F52625D635C7FE = TRANSFORMERS_D2_EU (Transformers Disc 2) | V | 0x8A544257DED2CABFCA8C7E771DFCFBBF ; MKBv7/FindVUK 0.98 -0xE147785C8703027C6FD17014A3C67335D94BEFDB = Transformers_Disc_2_Widescreen (The Tran | V | 0xEF212820907CA9DD967A0FF16247C701 ; MKBv61/FindVUK 1.02 -0xE3D3FF88FBA421FC22F351AD3EACB6745C5313E0 = Transformers_Disc_2_Widescreen (The Tran | V | 0x5A7C4486FB780019DA7AB70259AD7AA7 ; MKBv61/FindVUK 1.02 -0x8C76A450028C4C4EA534601DA6D1B81CD15EBA6F = TRANSPORTER 3 | V | 0xC892C3CC1AEDBA850A7EAFABE17674BF ; MKBv12/FindVUK 1.02 -0xFEBC1BBCEA97CCC230CA62671D2E543569A0D6D0 = TRANSPORTER 3 | V | 0xB3D993C26023E5E7056773B079B93223 ; MKBv12/FindVUK 0.94 -0x21BE488B13A585DA77E7122F687006287AF48232 = Transporter 3 | V | 0x9BF71F6E433D69CC59FA23AF94225CC1 -0x1746C15CAC11568AC6F71E01A78669E80C06E21E = Transporter 3 (release for The Netherla | V | 0x40F685C9BB6C8700A0CF047866E27384 -0xD3422B7D6EBD20EDA60D548FA792CC1171187B34 = Transporter 3 Disc 1 | V | 0x08F6EA3CD5AA03CC1940FEE85AFFD05E -0xE36BDA1E82634ED6A0157B6797F07A0DDD817345 = TRANSPORTER3 | V | 0xE3D010F62BBA928723A96781FBB7BB25 -0x26AF5A9FF84CDB7891F7A267EFA9BCF8AD01BB3E = TRANSPORTER3 | V | 0x10007A74294EE55CA077C7180F4E5DDA -0x2A325DABAFC433F0DE400C2A9AA2C8EC8EF12534 = TRANSPORTER_1_BD | V | 0x78CD938C48D233D597704C8C5F7659CD -0xC2CF19B30A43603E8D486190752C37CFF617033C = TRANSPORTER_1_BD | V | 0xDD075ACE25F812FA7800CC184FA724DB ; MKBrev 9 - FindVUK 0.62 -0xE002CC592A4DC4C8FA939891EA633CD1C677A03D = TRANSPORTER_2_BD | V | 0xDBEDF531499C429BBD125FDC658F5A12 -0x04571051098F0D8D9B11EE02AB7F3CAEF9F3C33E = TRANSPORTER_2_DC_BD | V | 0xF653E72C5FA54D5C9BBE331EBF8D274F ; MKBrev 12 - FindVUK 0.62 -0x26552E820B2DBE117A5CFD24AC893B5ACF25FB94 = TRANSPORTER_3_BD | V | 0x2E49D6DC8D2EA545B95B16B21C20764C ; MKBrev 12 - FindVUK 0.62 -0x94B88EC40EE3AC1370C8D0628449B6B3843E6EC2 = TRANSPORTER_3_REDO | V | 0xF3DC8FA3578F58BA8D00247FDA2C303A ; MKBv56/FindVUK 0.66 -0x843678E5DE4C1440947169652CBDF9748AA6B523 = TRANSPORTER_REFUELED (The Transporter Re | V | 0x849D1A2D56138B7FAC09A388050E38F0 ; MKBv57/FindVUK 0.93 -0x4EAD242EA58C36E8C4D43572422E81D5487CC7D2 = TRANSPORTEUR1 | V | 0x0DA81F2ECDA345E154AC41C934A2EADA ; mkb v4 -0x3783554607BB1FC26B5C2DA0BD13A1E34C593C9A = TRANSPORTEUR3 | V | 0x8B8A776E19854A4BC285C419F8CD6FEF ; mkb v9 -0xF4A457244EC6A62E1DBD211E4C6D2D4C1AB92DD4 = TRANSSIBERIAN | V | 0x3F9660FA14EE9A90580ACCD69DC50E4A -0xA42D4E265505DAA0189844640D42CE33A3B56D99 = TRANSSIBERIAN | V | 0x65DD72B1EA75BDC1AD8AD2828E03A4F0 -0xD2717B5CA422D5B3C5A258C89EFBB3B30D539238 = TREASURE_OF_THE_SIERRA_MADRE | V | 0x0EDB81975BE3A76F4AAFFAF94F79B7DE ; MKBv17/FindVUK 0.80 -0x5D5454374A54077C8D5CA83EF244744BEDA7421C = TREASURE_OF_THE_SIERRA_MADRE (The Treasu | V | 0x365CD0DF7F31FEE9B6174DBD7A7F13F8 ; MKBv17/FindVUK 0.96 -0x0BA0B8EDAF3CF2C56EC405DC6726BD80DA04C2A4 = TREASURE_PLANET (Treasure Planet - Blu-r | V | 0x23BAD09ABB2D997E019FD8F2F680805B ; MKBv31/FindVUK 0.87 -0x3F3D0E13DBC69C84B7E8DB63391BF75043DBD0F1 = Tree of Life | V | 0x283CFB97AE1F52E78EF490977091B826 ; mkbv25 -0x2DE36E418D00A5EB6F5676E4FE43DFFE7FD3E53C = TREE_OF_LIFE_WW (The Tree of Life) | V | 0x626685A1D30B8CD18319316F8583FB7F ; MKBv23/BD+/FindVUK 0.96 -0xC6EB348D5EFA8316DF5056FE25A0E02787EBA0D0 = Treme s1 disc 1 | V | 0xF15FF55E5CCCC68E48FB743490F4637F ; mkbv19 -0x559DF3A7B26445C46B4713133BE6598A71404877 = Treme s1 disc 2 | V | 0x6991824876B59ED98F450855EDC71E5B ; mkbv19 -0x05055D3D7B18E8576D1BE28101D410CB8D2769D1 = Treme s1 disc 3 | V | 0xEF2FDCD645D0BA33FA4C66927D229F46 ; mkbv19 -0x52AC6B0FAAE031125CB2F7D5F4BAC0A4D90E2856 = Treme s1 disc 4 | V | 0xB766D23378B6FABD63026C72251DDC6E ; mkbv19 -0x60E0680CD473FEDC665CFA63CD722F4A7621AF6A = Treme s2 disc 1 | V | 0xDD126195D03D5E5BA28B27E0B62D7139 ; mkbv25 -0xAA3BB536B3ACC4039267856BEFFBDBD71ACBBBE0 = Treme s2 disc 2 | V | 0x657E40B404D295069843B43E5D990F2C ; mkbv23 -0x4D81C14A38B2C8E091FD660F445B32E7C4DEBE9F = Treme s2 disc 3 | V | 0x99FC9B708F43BCE7FC8EF5BD7157CA9C ; mkbv20 -0x9DDF7805D07D2632A012195B07C0EE06F430EE78 = Treme s2 disc 4 | V | 0xC485CD2788353CC0EE86D0749739BD21 ; mkbv23 -0x3EE8EB7C5EF069C2A5D4F0FBC696AF566D7F0068 = TRESPASS | V | 0x4A4AE4102DC0A688F3455F1B240B2536 -0x9B6350204A84788716ED8C1CB5BC27EF4FB5D02C = TRIAGE | V | 0x69C2ADEE984D7511FA949FB459A94ACC -0x48D395C912ADB9C6FAB43051936E144110295826 = TRIANGLE | V | 0x402BA03048C07FE0D3ED06582B11D8E3 -0x1340E8ABF72D9511F868D294D86961897DC7D2B4 = TRIANGLE | V | 0x5E481B2961FF198A6518509383DCF3DD -0xA18316138CC8382728E99FB0D103DE9668931A41 = TRIBULATIONS CHINOIS EN CHINE (Tribulati | V | 0x8F7A4510B5D004C8FA4F05D79759C15F ; MKBv31/FindVUK 0.86.3 -0x6F90DB94BF25D427C548AAABB3B38A2C10AE98C5 = TRIBUTE_PANEM_FIRE_FE | V | 0xAA4E8E101FD727FEA7FF6FECFFF65EA7 ; MKBrev 46 - FindVUK 0.54 -0x433F7853DB530DDD60350D3B420AE3893625F94D = TRIBUTE_VON_PANEM | V | 0x44C791C235EA7AA83992C6F239DE52CE ; MKBrev 31 - FindVUK 0.62 -0x2EBB0E2955418BF609EF00317CA0F0EEE237F3B3 = TRIBUTE_VON_PANEM (Die Tribute von Panem | V | 0x716D535C2D778590A18CAB8777ACF8E8 ; MKBv44/FindVUK 0.96 -0x999BE8D727B6095FFF0822C2ACD7DF817F4C9A8A = TRIBUTE_VON_PANEM (Die Tribute von Panem | V | 0x88FAF54D8DEAE9B1B211CCBF31F9AB4D ; MKBv30/FindVUK 0.96 -0xF43A02917D93710C1199E893FFBF14E2D33D9D89 = Trinity Seven Volume 1 (Trinity Seven Vo | V | 0x30145AB79A9717CC73E33021A309F345 ; MKBv62/FindVUK 0.98 -0x5ECBB859FCB29FE857626972DA547C26CE655B32 = Trinity Seven Volume 2 (Trinity Seven Vo | V | 0x5427AD1D99E4CC09686F31C318D59559 ; MKBv62/FindVUK 0.98 -0xB7ADA9FBA80B13C76474F5277232F994FD77BCA3 = TRINITY_BLOOD_DISC_1 (Trinity Blood Disc | V | 0x8E92E67F9DE2777822DF5316BA3F6960 ; MKBv15/FindVUK 0.96 -0x60824D38D2B4FB347C40823BF277439B72CA9DE1 = TRINITY_BLOOD_DISC_2 (Trinity Blood Disc | V | 0xB84C4CEA83B5C94044469993E4DAC46A ; MKBv15/FindVUK 0.96 -0xE8C26CAA3299CB64599B37CF63789C9FEDE7B797 = TRINITY_BLOOD_DISC_3 (Trinity Blood Disc | V | 0x6AF7477F3873C2EB86BD810EE2D8129F ; MKBv16/FindVUK 0.96 -0x64265E21F294DB3B97D5FBE585229F10CEF5121E = TRIPLE TAP | V | 0x772636BB61D1B6A1A7DE5A3612B46DE4 -0x5E6E1A15241BB12F6390E02B890CF3674E2808F4 = TRISHNA (Trishna) | V | 0x0EBB16218759E389B633A9D3D4AC34D5 ; MKBv39/FindVUK 0.90 -0x3483E2D52D926BF6E7E7C543D02D301E741EC40E = TRISTAN UND ISOLDE | V | 0x7D4CD2DA784312FAD466845ECDA0BADF -0x5833C3389F1EB5A865DD04FC3A98643BBAACD471 = TRISTAN UND ISOLDE DISC 1 | V | 0x23FC1EFE554C80C653B546AF1FB1E972 -0x76B2D702E3A58767986B99946213AA6756A9BA60 = TRISTAN UND ISOLDE DISC 2 | V | 0xD6E496A5A22A6A4D6A708BED7C6BD025 -0xB6D19390652B92A505EAD9143E5D7BB3D9AEDCB3 = TRIUMPH OF THE WILL (TRIUMPH OF THE WILL | V | 0x558D132E7AB9348D910F2439A729B66F ; MKBv57/FindVUK 0.96 -0xB5082D34B59895E7909FFF1BFA3C4F15A661073E = TROLLHUNTER_BD (Trollhunter - Blu-ray??? | V | 0x8422304D54A05567B06C46F1E3F3857D ; MKBv28/FindVUK 0.94 -0x12BE300193918BC91DA3C6B3F4860981E68C6881 = TROLLS | V | 0x486A7FA706578BD0B632409EF1878922 ; VUK tested and validated manually -0x3836417FC32D5CD391E3961BDC8A668CE5A4A873 = TROLLS (Trolls) | V | 0x6833770DE4B407464EC943A8FCA61E1A ; MKBv58/BEE/VUKNOTVAL!/FindVUK 1.00 -0xC622610CD63201018B996A3BDD122F8E0D21231B = TRON (Tron - Blu-ray???) | V | 0x48345C075C73C112D44D012897B3FA4C ; MKBv19/FindVUK 0.96 -0x7EE8EFA91EDD5B5934922EF95612E509AE4A573F = TRON (Tron - Blu-rayâ„¢) | V | 0x65948B515A8E9AEF5580995B9D8FF4C7 ; MKBv19/FindVUK 1.02 -0xC3EED8D0AEEF184DD04C53D96BEEA548B9A4955C = TRON_LEGACY (Tron: Legacy - Blu-ray???) | V | 0x424DC6DBF5E8BD71AF3C7FB32DCEC7FF ; MKBv19/FindVUK 0.96 -0x6D81A0AC1DE4C795608B738DD4A3AF8E964C30F0 = TRON_LEGACY (Tron: Legacy - Blu-rayâ„¢) | V | 0x8B000E2D08E0E2F3F1043EAD682E3293 ; MKBv19/FindVUK 1.00 -0x6C9019A86CACC23D9D3C251DDB69958D2A037B0F = TRON_LEGACY (Tron: Legacy - Blu-rayâ„¢) | V | 0x81EF17141F24A4E06C41B21449A5559A ; MKBv19/FindVUK 1.02 -0x11BB9A75A179373F93516A92DC0A95E1E8338D28 = TRON_LEGACY (Tron: Legacy - Blu-rayâ„¢) | V | 0x80732E939E88E510F56999C1AFC92AB4 ; MKBv19/FindVUK 1.02 -0x0F74E0A6F7D6A8421E910A4282C2443593878ED5 = TRON_LEGACY_3D | V | 0x15D737CE03916A8AC829E0E984EBB729 ; MKBv19/FindVUK 0.81 -0x758FCD13EDD5BF2B908684EC8C84FE35F3628EF3 = TRON_LEGACY_3D (Tron: Legacy - Blu-ray 3 | V | 0xDDBF17B592DFA3D23E1817F1D2B9753B ; MKBv19/FindVUK 0.96 -0x389988E08AE635C18A49474DBEECBFD695A00C2F = TRON_LEGACY_3D (Tron: Legacy 3D - Blu-ra | V | 0xACD6548B797C0E0BB0CF1CBECDDAA922 ; MKBv19/FindVUK 0.96 -0x88851411F07FC02A0E69D20D857D1CED794511A3 = TRON_LEGACY_3D (Tron: Legacy 3D - Blu-ra | V | 0x2494E68FA1CE0B767B0A6C604B749CE5 ; MKBv19/FindVUK 1.00 -0x5CA15B4FDC64DB570423FBE504CFEB30CCF8C2E4 = TROPA_2_BD (Elite Squad) | V | 0x11B6A6466A4D7534DA51A48C41024637 ; MKBv30/FindVUK 0.96 -0x982D695316E0172FE2971FB2FE1494FC49BC18A3 = TROPA_DE_ELITE_II | V | 0x11F4C07511A06EF2A5FD5F7E0B585008 ; MKBv21/FindVUK 0.96 -0xD2A351695A645B6DD781D2DD1FCA6FFA50FC7C55 = Tropic Thunder | V | 0x7B7D16E4F63DF71A2A37A18699AECEEA -0x4D170A124134DB25E0F69458B2ED2876606CFE2E = TROPIC_THUNDER_AC | V | 0x103AB1DCDADC2FC9FA208D87082ECEC2 -0x7D77CF69593F34E9CF1FD97B75D839ED3F5D66D0 = TROPIC_THUNDER_AC (Tropic Thunder) | V | 0x106BA9A0E43071308DCB54E8B7797658 ; MKBv9/FindVUK 0.98 -0xA545942CAE708AF0980A1CC33D778364DB82798D = TROPIC_THUNDER_EL | V | 0x009FDF3F530B250C4EEE3A8EE5519F56 -0xFB87337E6E0D191A32733352F1949850C443E231 = TROPIC_THUNDER_EL | V | 0x0214C43276E6A6E7A0055C9470370196 -0x3A7020A147702DD5A880617638F01846100B979A = TROPIC_THUNDER_EU (Tropic Thunder) | V | 0xE9FEDCE4AD7AFBAA1ADE54B685004FC9 ; MKBv9/FindVUK 0.98 -0xE5C75AD42E26469072D4A280EEAFF75ED10EC6E5 = TROUBLE_WITH_HARRY_G51 (The Trouble with | V | 0x420CA39A04C85CEF49D600138DA05A83 ; MKBv28/FindVUK 0.94 -0xFD7EB44731D64075981A79B546EFA33EEDD0B826 = TROUBLE_WITH_HARRY_G51 (The Trouble with | V | 0x543F2859CB1DEDF75FDB48B74101C19D ; MKBv28/FindVUK 1.02 -0x1326C4BFFEC0B754ED7DE6264671297A35F21B6A = TROUBLE_WITH_HARRY_G51 (The Trouble with | V | 0xEDDEEBABB1A95B79F09C54CCEA35EAC1 ; MKBv28/FindVUK 1.02 -0x8938080FE73737F32CF9B6C05F209FAAF9F0AAEE = TROUBLE_WITH_THE_CURVE (Trouble with the | V | 0xF55829F0B9B20C2C0DF5EC8B6C70D10E ; MKBv35/FindVUK 0.96 -0xC9C8A092234AB712292ECCA3064362CC960AB539 = TROY_DC_B5 | V | 0x359C1FF921876016AC3A7E6C1999C6A0 ; MKBv4/FindVUK 1.00 -0xC0BC3166F4201530E0EFF98BBB35162276DD7F06 = TROY_DC_B5 | V | 0xB22ECC2107E8D94E620CB69FBB69CCB1 ; MKBv4/FindVUK 0.80 -0x0B21D599EDB897022CDA86927686424FD961B800 = TROY_DIRECTORS_CUT | V | 0xBE6CFECB71C4CFDFC4B51F569B736144 -0x760EF25F1AD18EB5B9460A1BAC8AE1E8099AC873 = True Detective Disc2 | V | 0xBA5E64147E288B140D4A635F1AE80037 -0xF2D2ED80055352D496E5C436E776487667C44D51 = True Detective Season 1 Disc 1 | V | 0x1B8F7EF59A894CC0BA6465A3534A5F5F ; mkbv47 -0x85B1DE12D204595963E4FD40B67022F5CEB22748 = TRUE GRIT (2010) (DE) | V | 0x0D302FFB68F2FA1FAB011378A7B1EF8F -0x04A5543EA1312E89A07748B662F08EBC5F4912F5 = True Legend | V | 0x93E85AB7EAA58816EB879F87B793A112 ; mkbv19 -0x37E4DF1C943C5D2BB2551FF2010EE552FF1E8595 = TRUEBLOOD_S1_D1 (True Blood Season 1 Dis | V | 0xE67C2B32BB60A3D044DACFB6C1BE3E93 ; MKBv19/FindVUK 0.98 -0xE6BC1E28658157BBE849290889B84AD392BE1EB6 = TRUEBLOOD_S1_D2 | V | 0x214E4590F8768C760E3F5B4C9EC24341 -0xC11D951E50B3AD5D6333BE1E1BA76FBC39AC1B07 = TRUEBLOOD_S1_D2 (True Blood Season 1 Dis | V | 0x5A3733A6B2905EB7401203F325675F96 ; MKBv19/FindVUK 0.98 -0x1B5ECFB005E9292323A286A2BA416647229BEE38 = TRUEBLOOD_S1_D3 | V | 0xB791BF2CB088ADD681B7D933FE6293B4 -0xC48B5FCC107B813144C0632E2BDBC9EA896B37B2 = TRUEBLOOD_S1_D3 (True Blood Season 1 Dis | V | 0x4B36C1C18F105F9927A6E1D974E512A8 ; MKBv19/FindVUK 0.98 -0xE53ACC347A981DCAC8947237D20823D16EC45DE6 = TRUEBLOOD_S1_D4 | V | 0x6D7C5B35EBF76E5CD197A76B078F15EF -0xB87719914291A45B9DB6DBC54DE26F13B48396AD = TRUEBLOOD_S1_D4 (True Blood Season 1 Dis | V | 0x90E05486821A0886603D05A74C46579F ; MKBv19/FindVUK 0.98 -0x49FFF25E1D0DBED37A3563725FAF8A6D83049917 = TRUEBLOOD_S1_D5 | V | 0xF6895ADD11CEBEC991492B8073E5AB3D -0xC2E43E8F8A8D37E5927687E68600D19B6193244B = TRUEBLOOD_S1_D5 (True Blood Season 1 Dis | V | 0x478B33C01BCE15406BD0FBE0E391CBAB ; MKBv19/FindVUK 0.98 -0x878A7ECB90FD0A207E2B0495C9C26B5EE968D3AB = TRUEBLOOD_S2_D1 | V | 0xA0AAAC930D8D13EAD564331D5610476A -0xBBACEB0A3312AAC853DD73A51B51014E291C4E65 = TRUEBLOOD_S2_D1 | V | 0x3FE099A87EAB474B7B106C8691C8554C -0x04E94334F6CF73AEF152B957E1C32BF2BF515B6B = TRUEBLOOD_S2_D2 | V | 0x97D64B6687D5D8154ACA1C4249426618 -0x901E215D67D054B563A3F3DDAAD0A522EC01B82A = TRUEBLOOD_S2_D3 | V | 0xF4D85EFD424B5213C1F219756E3B6160 -0xFA42A4A45D986F604AFC55885DE27E25839ABE70 = TRUEBLOOD_S2_D4 | V | 0xF15DEC44AF410786A97C6AE5C4A41D9D -0xDFE2F9BC14AA679066E69DD9FA8152B0105BA278 = TRUEBLOOD_S2_D5 | V | 0xAF400D06C09EDA9690C20EC127EC73AE -0x1D1BEEE162E5B4B56E1882921933B6DE5B7F746E = TRUEBLOOD_S5_B5A_DISC1 (True Blood Seaso | V | 0xFBA007A5C8D425FB5BD13657D9B200C6 ; MKBv36/FindVUK 0.91 -0x351BB72570C3E2167176601F2AD49D7F52CAFA7A = TRUEBLOOD_S5_DISC1 (True Blood Season 5 | V | 0xB8E1F321632C3AF4DF4DE08AC611BACE ; MKBv35/FindVUK 0.98 -0x0663EB846ACB73CD09708319A93FFF7C44320917 = TRUEBLOOD_S5_DISC2 (True Blood Season 5 | V | 0xEEBFEB6CD97E91A06791AAD5ACAB356A ; MKBv35/FindVUK 0.98 -0x9FE7492E84284D9BC6BE514CCB598DF629D9CC4A = TRUEBLOOD_S5_DISC3 (True Blood Season 5 | V | 0x2D8B50E4532AF6B79075D48D874ECA02 ; MKBv36/FindVUK 0.98 -0xE7E535EA7811E0A35384D02292419C37B3156B1C = TRUEBLOOD_S5_DISC4 (True Blood Season 5 | V | 0x09028D583A3203CA633CED4BC9BDEF35 ; MKBv36/FindVUK 0.98 -0x0E18A9F00C61A6298411F70EB13D380FEA24DFE1 = TRUEBLOOD_S5_DISC5 (True Blood Season 5 | V | 0xF6E74517736828AF24E792D0D4A3C1DC ; MKBv31/FindVUK 0.98 -0x3DB0AF79845AA59D6FDF317630B05D2BCA3E5384 = TRUE_BLOOD_S3_D1 (True Blood Season 3 Di | V | 0x2A919A9D77AFB1F10F7FBAA585DA5A7A ; MKBv19/FindVUK 0.98 -0xDB7CD9581B39613418D6A532C6F32294D705A362 = TRUE_BLOOD_S3_D2 (True Blood Season 3 Di | V | 0xFADEEB4CD8D5518B03F8C65170519042 ; MKBv19/FindVUK 0.98 -0xA33121AF37320605D7E64FBE381477E719FB7DD1 = TRUE_BLOOD_S3_D3 (True Blood Season 3 Di | V | 0x4AEA0D3C27389F9CA95D68537472980F ; MKBv19/FindVUK 0.98 -0x65F4D7164761A42CDD56BC9886B78BD5AC622B3A = TRUE_BLOOD_S3_D3 (True Blood Season 3 Di | V | 0xF07D7AF04352840F85F205D1A750A7C9 ; MKBv19/FindVUK 1.00 -0x2A74760F59297267F900D3E42D14DE054D90ECAD = TRUE_BLOOD_S3_D4 (True Blood Season 3 Di | V | 0x2EE1FC66949B1A74FB5447A003CD5E91 ; MKBv19/FindVUK 0.98 -0xF5CFD78BC30E12D9520DEC845186F8DAE41E1FE6 = TRUE_BLOOD_S3_D5 (True Blood Season 3 Di | V | 0x5E091A1E117CA3083BA8535E5F537647 ; MKBv19/FindVUK 0.98 -0x9C9249319BD4E838D74E694BB0DC4009732B4D8F = TRUE_BLOOD_S4_D1 (True Blood Season 4 Di | V | 0xCC058150FE45B5FD3FB8992725DFF97B ; MKBv25/FindVUK 0.98 -0xC06C63CA36A6A6FAD6C9C9BEACF3F9CBAD4FC17F = TRUE_BLOOD_S4_D2 (True Blood Season 4 Di | V | 0x14C1D40B6C64E24BF537B3FBC4148305 ; MKBv27/FindVUK 0.98 -0x37B0344A746C1DA6A5EA1CDAB3486E106C58C231 = TRUE_BLOOD_S4_D3 (True Blood Season 4 Di | V | 0x3BBC1516A04F01AC9998A7DD0ABE24CB ; MKBv23/FindVUK 0.98 -0x5A748D5C39D215757741256A216A3AC08BC16EBD = TRUE_BLOOD_S4_D4 (True Blood Season 4 Di | V | 0x6E65C9F490468787B016832B90EF1E35 ; MKBv23/FindVUK 0.98 -0x97EC70FAA0660AA6173B451CAA8CA2ACD28F9681 = TRUE_BLOOD_S4_D5 (True Blood Season 4 Di | V | 0xB223670C511F25C680252113924C7CDF ; MKBv25/FindVUK 0.98 -0x38E59DC37D6C2D0324417F0FE4F6486539CB81E7 = TRUE_BLOOD_S6_DISC1 (True Blood Season 6 | V | 0x02598C5E99363B0DF62B2A36F545F66D ; MKBv46/FindVUK 0.98 -0x423B6CCCB2249C22E186436CD6C59E3730851CF2 = TRUE_BLOOD_S6_DISC2 (True Blood Season 6 | V | 0xDCCFA57D601964D2C98A7DD6F7D1D7A4 ; MKBv46/FindVUK 0.98 -0xC2DA0285DF33B0A40B3A690A20D6669ABAE700A5 = TRUE_BLOOD_S6_DISC3 (True Blood Season 6 | V | 0x92CCD79A9CCD5131F4AAF88D3489765C ; MKBv46/FindVUK 0.98 -0x36AA09F5C9A0210B207BCC0DB2A6F8527732D969 = TRUE_BLOOD_S6_DISC4 (True Blood Season 6 | V | 0xAC44053CC11789C7A96280C69857140C ; MKBv46/FindVUK 0.98 -0xE46619022F4E75B85C435801967D7F549267A95A = TRUE_BLOOD_S7_DISC1 (True Blood Season 7 | V | 0x4F09DAAECC3FE2B5320FF2CB85864381 ; MKBv53/FindVUK 0.99 -0x6FE271B53C8E070D5DD92366286D31A85F8D77E7 = TRUE_BLOOD_S7_DISC1 (True Blood Season 7 | V | 0x213B2DDAA05EEC706FE65353FE5E880A ; MKBv47/FindVUK 0.98 -0x736F51ACB157B2045C3F1D48B71AAC2B6DE9237B = TRUE_BLOOD_S7_DISC2 (True Blood Season 7 | V | 0x3E9F694213D895201DBC6133D836BA33 ; MKBv47/FindVUK 0.98 -0x51A281548F405EAA644FDA0F4E1DDDB49F5EFBC6 = TRUE_BLOOD_S7_DISC2 (True Blood Season 7 | V | 0x172F1FE5688247B8E0A5B70E49706374 ; MKBv53/FindVUK 0.99 -0x097BB12AACF9D6D90EA10EBD7A051100C227314F = TRUE_BLOOD_S7_DISC3 (True Blood Season 7 | V | 0x2A35827D51A46D9E79FBBAF6D6832D86 ; MKBv53/FindVUK 0.99 -0x22831BFB122BBF1CE632502C804C6FEBBE3B3C62 = TRUE_BLOOD_S7_DISC3 (True Blood Season 7 | V | 0x0774095EC27BC02C5369D8030501D861 ; MKBv47/FindVUK 0.98 -0xD7D386D6BDC00B17961B1400B5B85A158C2E94D3 = TRUE_BLOOD_S7_DISC4 (True Blood Season 7 | V | 0x7A6EE3F9ED8570104B03A2966F0512CB ; MKBv47/FindVUK 0.98 -0xCB2663E42799019B582430FA02C6F9A810021331 = TRUE_BLOOD_S7_DISC4 (True Blood Season 7 | V | 0xF7A4080569BB368368CF7C13959285E2 ; MKBv53/FindVUK 0.99 -0x47E871AD13A87BB4A13E3F25722C1F889242BAB6 = TRUE_BLOOD_SEASON2_DISC1 (True Blood Sea | V | 0x026346C4952CFA7C2DB59FAC3022467A ; MKBv19/FindVUK 0.98 -0x9E4B1B8907E86E2A288C6FD480D91C2B5F1736F3 = TRUE_BLOOD_SEASON2_DISC2 (True Blood Sea | V | 0x2BF7B10E4333BEDE2F40FCD62FB07D9B ; MKBv19/FindVUK 0.98 -0xF7F1A56EBCE5A48AEA5E4DA956D4B703672FB049 = TRUE_BLOOD_SEASON2_DISC3 (True Blood Sea | V | 0xA7A3F91F4D32F8DEA869C196D53E25B1 ; MKBv19/FindVUK 0.98 -0xC8F847618C4706DFE797C1DF24145FAD5C7A246B = TRUE_BLOOD_SEASON2_DISC4 (True Blood Sea | V | 0x7EE75E9C259B6009E427853BC9FF30DA ; MKBv19/FindVUK 0.98 -0xB8111DC88D35CF5B36AEE6B0701A25C93CA553E9 = TRUE_BLOOD_SEASON2_DISC5 (True Blood Sea | V | 0xA3FAE4C0BDD4F2B955819107668487A5 ; MKBv19/FindVUK 0.98 -0x0B1FC77608DC0708B2DAAE5CCF6ABB7B723126D1 = TRUE_GRIT (True Grit (1969)) | V | 0x3C5CEFEE63DFC8FA05E17B120A0B648E ; MKBv21/FindVUK 0.86.3 -0x19B8657B63F567BBC114194A2B1AAA02B25E7A54 = TRUE_GRIT (True Grit) | V | 0x97A056FD5E76D759D33CF6BDC6045649 ; MKBv19/FindVUK 0.96 -0xFC3B43BEE35A1A7FBD8A8977626BDCBCF7A1B80A = TRUE_GRIT_AC (True Grit) | V | 0x2F56A578FD74DFB88E9F0A321ACED5F4 ; MKBv19/FindVUK 0.92 -0x1C8A881715C4D1C117DB8CC4EBA514E4A6846202 = TRUE_GRIT_AC (True Grit) | V | 0x0A1CCD50C092BD4F56628B3522FD7066 ; MKBv19/FindVUK 0.96 -0x86ADA3F6C075CDD0865D1461E4F30BF9D9A13F3B = TRUE_GRIT_EU | V | 0x99F689A4B5D203986627F2B97FAB27AA ; MKBv19/FindVUK 0.80 -0xA4EA1C55A94F0F4B70AC83DD14EFCFE9899A147B = TRUE_GRIT_EU (True Grit) | V | 0x4FFA12EAD1DDF58860E7A6CB7DE942EA ; MKBv19/FindVUK 0.94 -0x358F5D37B16F35CD742663BB0F0170E74289711B = TRUE_GRIT_EU (True Grit) | V | 0xA125B40501F13764C736A7A043DC25A9 ; MKBv19/FindVUK 0.96 -0x957BEF91F9F903288BB025C6072D53C6A4A77BB3 = TRUE_LEGEND (True Legend) | V | 0xE42C9761C9E479DEA55E6243F18426C8 ; MKBv19/FindVUK 0.84 -0x41C81B150E3E6A954FA5E47DF59CF792FC213129 = TRUE_ROMANCE | V | 0xEBCDB03BEF17F3719D524946883027C8 ; MKBrev 18 - FindVUK 0.57 -0x4CC851AE731DC1AA2609465BF535D39000E66103 = TRUE_ROMANCE_BD01 | V | 0xDB69AC6DB1070073BDE8645F49AB5F47 -0x53E66AB2D7FBC69A31ED33F965E4EEC2BF99CF61 = TRUE_ROMANCE_BD01 | V | 0x2273410C1B8C07CD1AC7C9B07D44DAC0 -0x6E72B1F6B72375422C4BEE311A73F99A816B1A0C = TRUE_STORY | V | 0x67C0B451D96BBB5E3A205C46EDEABA1E ; MKBrev 50 - BD+ - BusEncryptionEnabled - -0xE3C93D2973D09BA220A2A62F03E83EAC5EE3BC8C = TRUMBO_NA (Trumbo) | V | 0xEFDC3CB62DD442A1E05779A2D175DB4F ; MKBv46/FindVUK 0.96 -0x8E70D49651330CA9887C406EBDAFD79D77D74F1D = TSCHICK (tschick) | V | 0xDF0BF4493ABDE0260E648EDC8FB237FE ; MKBv62/FindVUK 1.00 -0xC0E422861DD5806040BA77BCB0A1BA1BB9598D1F = TSUBASA_S1_D1 | V | 0x538A62938B01710FE5B1AF2D0F0F8D5B ; MKBv16/aacskeys 0.4.0e -0x5AED8FB6E921202C207E0996D33A80991A9636FA = TSUBASA_S1_D2 | V | 0x3B5714DD6EC0EF694932E54677CF3170 ; MKBv16/aacskeys 0.4.0e -0x47E699FD455A4FB57C6A722F465E2E56963E2EAA = TSUBASA_S1_D3 | V | 0x368DB0E72C9DFA44D55C4CE044AE52F8 ; MKBv16/aacskeys 0.4.0e -0x9D04F130D26382BBE5FB25A07057367DBA3EA5C7 = TSUBASA_S2_D1 | V | 0x9309DD762ADB2D7B502C633A60AA9B35 ; MKBv16/aacskeys 0.4.0e -0x39562A0A972E9EF973CEFB4FDA9168EF591A5D66 = TSUBASA_S2_D2 | V | 0xBBEE9EFA18268E6BDF9B67B44D3F6A56 ; MKBv16/aacskeys 0.4.0e -0xB8267AA1AF6E6F6C49F222903F3B4BA2A568BA71 = TSUBASA_S2_D3 | V | 0x504D322191B9CC304762716156EFE519 ; MKBv16/aacskeys 0.4.0e -0x5581DC005106AD0E682AC02A1CCFFDE025B7D216 = TSUBASA_THE_MOVIE | V | 0xF8EDCCA0D66A8C2609F8C79578611F58 ; MKBv16/aacskeys 0.4.0e -0xBDF1302DA336596C463C42A0A976084BE4F709B9 = TSUKIMONOGATARI (Tsukimonogatari - Blu-r | V | 0x2BE030FE30445377EACB1DC1B8709BDE ; MKBv57/BEE/VUKNOTVAL!/FindVUK 0.98 -0x3F9E0FB3B78E4CC635D0E710DEA71638A96A0CEF = TTT_D1_MTA (THE LORD OF THE RINGS: THE T | V | 0xB9A5241C89B188F4B0805E6EB1EF76BD ; MKBv40/FindVUK 1.00 -0x971BE927F444D86181A1D8430AA1FA7B97B4BF20 = TTT_D1_UK (THE LORD OF THE RINGS: THE TW | V | 0x7B603475F7026005EADD6EE75D09DE18 ; MKBv21/FindVUK 1.00 -0xEC2F975A52AAFBF056943AF65F5B04F872753FF2 = TTT_D2_MTA (THE LORD OF THE RINGS: THE T | V | 0x0D2F6CA42B748B37FCAB50980B3487C1 ; MKBv40/FindVUK 1.00 -0x582E1F18DC52793FE85A5EAF85087DFC8128D98E = TTT_D2_UK (THE LORD OF THE RINGS: THE TW | V | 0xDEA903EB7A50EB9B6001ED9B45EA0286 ; MKBv21/FindVUK 1.00 -0xE23B8563456A914C44C38E65B7FA817D51D47420 = TUCKER_AND_DALE_BD | V | 0x0D4E383CAACA7D9637A40D2159AEFB13 ; MKBv25/FindVUK 0.80 -0x7476C944BDB822446EE659258DAE9B6691F5CE76 = TUDORS_BONUS_DISC (Tudors, The - Bonus D | V | 0x8F42011A3E8EEC8ADC1EFCCC142BFBA1 ; MKBv49/FindVUK 1.00 -0x5859B21442406DB9CA44600CE6E94800078F1C19 = TUDORS_D1 | V | 0x490F332350A08A1E577DDDF946AFA4C1 -0x440F17E5B658EA17992AB59155F9BE8C0496F995 = TUDORS_D1 | V | 0x630FBCCEEAFAB933E2A315209EF94DBD -0x915E2316AB4EE552C30F9FCAFCCDDE8D6626C1F1 = TUDORS_D1 (The Tudors Season 2 Disc 1 - | V | 0xA0BA8094ED680C736A9E31F09796C46E ; MKBv8/FindVUK 1.00 -0x978D94E1FB9B77CFB78405E29BFF83E77F24CB79 = TUDORS_DISC_2 (Tudors, The - Season 1 Di | V | 0x2E63E71A1B65804EF8BA44B327160252 ; MKBv4/FindVUK 1.00 -0xC369C502FB6A7358918863BE51B00566BC4FEA8F = TUDORS_DISC_3 (Tudors, The - Season 1 Di | V | 0x59259EB56637C36A768A50B468112364 ; MKBv4/FindVUK 1.00 -0x37F16B295128FAB057B4A419759426984E8ABB88 = TUDORS_NA_DISC1 | V | 0x10161AA75D62F17E2649FA6541F56175 -0xB060E4B85FEB170C7C0D0A87215C7DBE357FCC6E = TUDORS_NA_DISC2 | V | 0xB80E8D4C520BC2CD7FB488A519D485EA -0x60C84FB4EAA382558E5CAFE74A95BEB40D98356C = TUDORS_NA_DISC3 | V | 0xD21EAC5F4536DB47B27575FE60BAB855 -0xAEBB6EC5780C1FD1610599AF79F6F47F4E49FB59 = TUDORS_P2_DISC1 | V | 0x0CDEBB89DE870CC98A9D5F934197659A -0x9AADF48E4AA3B3C794EB45F08DCD507FB695D0AD = TUDORS_P2_DISC1 | V | 0xDB0195C2DBADD7CFCDB520BF0A4807FE -0x78C32AFFADD1A21C2D24F631143DDE94C91392B5 = TUDORS_P2_DISC2 | V | 0x42462A755DD66E8431753FCCB9BC3062 -0x38B4ACD299D0AF1D9A5E5D2230542298A97DBDC7 = TUDORS_P2_DISC2 | V | 0x4C4EB6DB52BFF4BB490CB422A6BB3949 -0x39B438D2450ED77B5F2BB6BF31A4D3D78D7EBDFE = TUDORS_P2_DISC3 | V | 0x379080E036ECD06E0DD55A8C013B24FD -0xF726ED6802E70C491B5CFF7CA9AC3126B5C697F8 = TUDORS_P2_DISC3 | V | 0x1A586AD124F2CC3583FCB5FF5DD59D3E -0xF718C0E86B184A48E99A23B2138C86F29EE05E37 = TUDORS_S1_D3 | V | 0x2A64E708D70DCE1F4151BAB8B5657A25 -0xF8DB0AD6C48D0072209C24B1CEAA8717FF3387BE = TUDORS_S1_D3 | V | 0x41E472B2C54F59BEA5514342A3895D1C -0x6EE550DFB2A97627E355F9AD788EA335ED108BFD = TUDORS_S1_D3 (The Tudors Season 2 Disc 3 | V | 0xD7158921C531209DBD6AB2D7326E0F3D ; MKBv8/FindVUK 1.00 -0x1654DD3A05006D9E21BB7B2B0FDC31AB614ED01B = TUDORS_S2_D2 | V | 0xC4D09607F415F69FE543E6E830543D30 -0xEA0BC0E74F407598FF3A74D26275DC9FB2A57785 = TUDORS_S2_D2 | V | 0xE1DD4B1F62329DA8CED1BA742C574E60 -0xBE46D8264DAD1F3E2248B210C346F26AFEDB3D67 = TUDORS_S2_D2 (The Tudors Season 2 Disc 2 | V | 0x6B9BF519FDF4EDF48A48E901B544B772 ; MKBv8/FindVUK 1.00 -0x3FB2129F35794D80122FBDCB097C3708D61CEFA2 = TUDORS_S3 (The Tudors, Season 3 Disc 1 - | V | 0xA90EB2C025D36116869176081D47508D ; MKBv15/FindVUK 1.00 -0x37CCA0A76FA8209B5852607C44647A484127D880 = TUDORS_S3 (The Tudors, Season 3 Disc 2 - | V | 0x146F0E48EA61FFEE4B112D9C44650F9C ; MKBv15/FindVUK 1.00 -0x6722566EB1CE2690C2435A53BE513F5A90292610 = TUDORS_S4_D1 (Tudors, The: Season 4: Dis | V | 0x412C66AE21683F0B86BD42CF844A6847 ; MKBv19/FindVUK 1.00 -0x5FF911C4B62BD9E593986835EC7DEA9884FA17A3 = TUDORS_S4_D2 (Tudors, The: Season 4: Dis | V | 0x288C93B8CC588F88D87D761DF4B14831 ; MKBv19/FindVUK 1.00 -0x610DCDC4449EC4B731B8D6420BE136BC5D6F2687 = TUDORS_SEASON_1 (Tudors, The - Season 1 | V | 0x1925817DE67CB26A072AAC1DD03370BA ; MKBv4/FindVUK 1.00 -0xD6566DC13219F86E30D420073E2A250E38AA9024 = TUERKISCH_FUER_ANFAENGER | V | 0xE206237D976C2EA57E12CD607C8E74B3 ; MKBv33/FindVUK 0.80 -0xAB5DDD6CD4841DBC687E6E08F316E19E6218D837 = TURANDOT | V | 0x76A53444F081B8B38C60BA8C00BF2E5F -0x213DC5B8113B2E09CE6DC4D1C5A97737BC9349A8 = TURANDOT (Turandot) | V | 0xBF8126B2EFDD48756BA12B478612C276 ; MKBv48/FindVUK 1.00 -0x9B3306A26E5FEBF30D74CA629351A2B54B605CBF = TURBO (TURBO) | V | 0xF2F3361B46E3F1CF40A50E2E03F9E1CB ; MKBv36/BEE/VUKNOTVAL!/FindVUK 0.87 -0x3C014213AE09B38023AC17F63BEE6272AF0D261F = Turist | V | 0x32966BCF2F60C54AD69B768671303DB8 ; MKBv52/FindVUK 0.98 -0xCB2C75D748D4DC3CD59EF80E83495ACFF8AB1F79 = TURISTAS_BD (Turistas) | V | 0xD823E37D1987521AD7E174EFB4E8C33D ; MKBv15/FindVUK 1.02 -0x7D35D98B86747F7C93870C8C0459A558F23DE270 = TURNAGUNDAMPT1BD1 (Turn A Gundam PT1 - B | V | 0x6FC86C9075FFD87C3A2EB536D4075469 ; MKBv62/FindVUK 1.00 -0xDC86BC98EF1338D00CE27376465F919B311F5FF2 = TURNAGUNDAMPT1BD2 (Turn A Gundam PT1 - B | V | 0x67308CEB30CE1C3CE90850FA546E0562 ; MKBv62/FindVUK 1.00 -0xFB1F38E4329C00C13C3FDC8F4D5AEE28BF9B3624 = TURNAGUNDAMPT1BD3 (Turn A Gundam PT1 - B | V | 0x58E663322445C8D202663A84FAE44524 ; MKBv62/FindVUK 1.00 -0xE3F42F3A8C702B909C8FFAB56EF25F82CC1B52FA = TURTLE_NL | V | 0x0948E738B63E69F5F41B28B7B2B9F9D6 -0xF68A32EE422FC9FB73FF79B3F792EAA94EF676D0 = Tusk (2014) (Tusk (2014) – Blu-rayâ„¢) | V | 0x9D617D5C5A521052D33901B7F27A2524 ; MKBv50/FindVUK 1.00 -0x865C4839091A6833F006BD6B3C9BEDAC7F2FF034 = TV MOVIE CLEANER (TV MOVIE: CLEANER - Bl | V | 0x35D4950D68BC2944AD8F3BC6498BBEEB ; MKBv17/FindVUK 1.00 -0xC9E2FAFB8077F59B94180452A714BB4127ABF880 = TWELVE KINGDOMS DISC 1 | V | 0xB25808DC69834AB91CA92EC07C4EFB27 ; MKBv25/aacskeys 0.4.0e -0xFE9C4C64A8F001773DBC18310351533C59B1F528 = TWELVE KINGDOMS DISC 2 | V | 0x4EA8E9B69FA5BA9E42B1C0FAF578A725 ; MKBv23/aacskeys 0.4.0e -0xC183C2614D390EEDC613C3228614A52F22635B7E = TWELVE KINGDOMS DISC 3 | V | 0xDEA65930425713746A663A8ADB282FB8 ; MKBv20/aacskeys 0.4.0e -0x0642271D70C413A6D585147E94F21086542462FA = TWELVE KINGDOMS VOL 2 DISC 1 | V | 0x2179C33316B29B5F1D1D0F59D8B87C80 ; MKBv19/aacskeys 0.4.0e -0x20D0BB81B9BDE46BA37161BE1A593E7EDEC8EEC1 = TWELVE KINGDOMS VOL 2 DISC 2 | V | 0x4901B790A8C110DB3E1C855E8BE08479 ; MKBv19/aacskeys 0.4.0e -0x2D05BFAE501A3F99C349A5643CA3A965A9C0AD04 = TWELVE KINGDOMS VOL 2 DISC 3 | V | 0xDBDCA561C05B3F20320FBD45C32512DD ; MKBv19/aacskeys 0.4.0e -0x22682C4F8C8EE007135E6254F030B0FB1F833F29 = TWELVE KINGDOMS VOL 2 DISC 4 | V | 0xEF45EFCA58AFAF8B6B597131A3ED1AB4 ; MKBv19/aacskeys 0.4.0e -0x0FF2AAD345477CBF8DF758A8FD4EA8618C9737D1 = TWELVE KINGDOMS VOL 3 DISC 1 | V | 0xECC4A43E8CD3F2999FE0CBF266E8306A ; MKBv19/aacskeys 0.4.0e -0x2A5461939FFF416C4508FCF6C7B5AFB10E9DAEF1 = TWELVE KINGDOMS VOL 3 DISC 2 | V | 0x9495333091F463EFF35E2AF860E7F266 ; MKBv19/aacskeys 0.4.0e -0x2A5C3AABA83AEBEA147153C7B500C9F2A8CE5644 = TWELVE KINGDOMS VOL 3 DISC 3 | V | 0x196E1AAC175C507290DBEE8A8ED53976 ; MKBv19/aacskeys 0.4.0e -0xED59A0572C863D38F4EF614C39815410806F5550 = TWELVE_CHAIRS_NA | V | 0x010CE323744621E68955CE39F0266358 -0xBBA9D5642DE46C4AC8E6C5B3BD6CA955FB23363A = TWELVE_CHAIRS_NA (Twelve Chairs, The - B | V | 0x780A2193ACB86B4271BCE582843ACD83 ; MKBv14/BD+/FindVUK 1.00 -0x11EA5D01FF59757C148AD7506AB79D7ACD4C4A72 = TWELVE_OCLOCK_HIGH (Twelve O Clock High) | V | 0xE51690149A55C1654B87EE656AD7A64C ; MKBv19/BD+/FindVUK 0.96 -0xD5C8E73C04299ECC27F88B89D4AAD3566127C3DD = TWELVE_YEARS_A_SLAVE (12 Years a Slave) | V | 0xA58543E256ACB4F8431D042805C90CBB ; MKBv31/BD+/BEE/VUKNOTVAL!/FindVUK 0.96 -0x9CEB9254EA5AB28291E2FF5970185528EF3208D5 = TWILIGHT | V | 0xEA5C08DE786E79C85E014FD556FA32BD ; mkbv12 -0x2D60315CDD2C1CDDEA2AB4C7DB087337C02C4A0A = TWILIGHT | V | 0x687BBC1039651D3683C4C66B11047353 -0x8FED16877BBCB27B44E8BBC8D162897369F5070E = TWILIGHT | V | 0xFAF9328561A8CC07D5D8FC22B8228CB1 ; mkbv9 -0xF89A158C8CB4D7C8281D557BE268108212349CD4 = Twilight | V | 0x4F100C40F2375EEB86EAE2CDAD84302E -0x87D99EC3A0A025E67CAF96A056AE4E4729EE1C0D = TWILIGHT | V | 0x8CA101F9C5C766428336D7912B309FC0 -0xBB94E9E48581B91AB098B928B151464E002A9BC9 = TWILIGHT | V | 0x51130BB6A3CE2082FB9ABD0763201DEA -0x0203BE61ED5597C665E59EB203452AB08C625423 = TWILIGHT | V | 0x4140B4305E819EFD69A2DA7F0FAB1A7A ; MKBrev 12 - FindVUK 0.57 -0xBE8FBB5283101A72EA6E95DB066036EFEC3A8CA5 = TWILIGHT | V | 0xD6B1E2CC4E9EA1A4F24FC0358996A1E3 -0xA016ACFCA404FADBF0301DF6FA5A36B9E3A5FED4 = Twilight New Moon | V | 0xEB09CD73C6A0802D0619C560CEFB63F3 -0xB2FF1A8396D28B60A4123BA47D52FA4EB87E02B2 = TWILIGHT NEW MOON | V | 0x9521084ED43B29CF8414CCEF125110C8 -0x99E3D4ABADDC6520D7791C273382B714E2107C8B = TWILIGHT NEW MOON | V | 0x40A1112798EBC61231DC080E31AA906E -0x8066F3EA1FE534672B92DF61A4B99D380A364DA1 = Twilight: New Moon | V | 0xDA749839E3876CF44784899AAB7A6D0D -0x3A5BF63CF2B22FCB093E520DB60BDDCEA86F4A7E = TWILIGHTSAGA_NEW_MOON | V | 0xB11226F7F437C94B8163E0BBD924C74C -0x6041F4087C7EDBF8A0A0C7850303078EE937F31B = TWILIGHT_AU | V | 0x2C4850545BE1A38E6E5BB60FAD7E12D1 -0x47E17EC150D1FCE416381F8A8CBD237A780B6570 = TWILIGHT_AU_1 | V | 0xE885B7ED079A55E02581561FC0257D9B -0xB2C86051E5CE8CF69ABF1DF63E65E3E5C1487A2D = TWILIGHT_DISC1 | V | 0xB48DC9EACCF870B752FDE3D9F84D3C1B -0xC4895A4650058FA4E0E11F5C4D4641DBDDF0886D = TWILIGHT_DISC2 | V | 0x67932948CC1C9FC4F63F66FD7E34E599 -0xC1977D19BD9A1E4A6976F11C466CD6189958365C = TWILIGHT_NEW_MOON_D1 | V | 0x8C2912EA8C665F28C784702CFF200330 -0x1418705DAD64B4BE7056646127CA8F84263E3201 = TWILIGHT_NEW_MOON_D1 | V | 0x4AC020AB69C127ABA6E3AB7CE714674A -0x473415B72C75A5736CE75116649C42564CAD261E = TWILIGHT_NEW_MOON_D2 | V | 0x8B324065AAD60E2F262720EAD5631FF9 -0x7F7EBA0629C21973DE881905DC9F949D6501C6B4 = TWILIGHT_ZONE_SEASON1_DISC1 | V | 0x6A4DE6CC44C842A3E5D4C3E5867529DF ; MKBv35/FindVUK 0.96 -0xCA670B6448D672C1D4BD259158341F57755116D8 = TWILIGHT_ZONE_SEASON1_DISC1 | V | 0x51761DB4174E63CAF041809C9007A131 ; MKBv4/FindVUK 0.96 -0x4338517F8D0E616A18D5450DD76C00EC3CE0B1CC = TWILIGHT_ZONE_SEASON1_DISC2 | V | 0x025FB8C8C6A9016F43C1CFCD84F9962E ; MKBv35/FindVUK 0.96 -0xC58A1FD6E8DA04E14B7B7CAF464F0DA0856F9336 = TWILIGHT_ZONE_SEASON1_DISC2 | V | 0x7287F251FD7C7B077E5747B4CA8081E5 ; MKBv4/FindVUK 0.96 -0xA33266319FC4829DE1641E8055BC8F6BD8C8C509 = TWILIGHT_ZONE_SEASON1_DISC3 | V | 0xB5F9DF61ED2DF2FBB0CB8FBB44E6B415 ; MKBv4/FindVUK 0.96 -0x56252C4398CE0897DA5D8C30B8D106B507A8E3A9 = TWILIGHT_ZONE_SEASON1_DISC3 | V | 0x3DFB6ECFAFE70A85CDDEA1F9FAB01CC8 ; MKBv19/FindVUK 0.96 -0xE3A986E6526EF2EFEB084274D4CC0DD9AF62B45C = TWILIGHT_ZONE_SEASON1_DISC4 | V | 0x49604C6DBF04FA8A381336A0C1A7A87D ; MKBv4/FindVUK 0.96 -0x1CFA9E059F721047415F8F5E16F6F7304580502E = TWILIGHT_ZONE_SEASON1_DISC4 | V | 0x93F182C2F60E03CC96748A6527E13DB3 ; MKBv18/FindVUK 0.96 -0xB41AA647F86375EFBB89CBC73DFFFBC126C63BFE = TWILIGHT_ZONE_SEASON1_DISC5 | V | 0x8F0C04D7F329713C119FDEA1AF0C14D9 ; MKBv18/FindVUK 0.96 -0xD393DC11FE82453D4ACFFD430E4C4907B1CB6F01 = TWILIGHT_ZONE_SEASON1_DISC5 | V | 0x91A367D7565943B1C1F503ADF1D74C68 ; MKBv4/FindVUK 0.96 -0x131BDCCC198E9F35DFEB2EB6EDBDBACDD7F0B683 = TWILIGHT_ZONE_SEASON_2_DISC_1 | V | 0xE0A821604B96F940AEEBADC58E2D3C51 ; MKBv18/FindVUK 0.96 -0x6E62A770A740F4FFB4C8D512EA24AE38EC443E29 = TWILIGHT_ZONE_SEASON_2_DISC_1 | V | 0xD85FEF6BD83F2DEADFE8B5F3B30A72C3 ; MKBv19/FindVUK 0.96 -0x8FF12A4243199016CC93262AEF3CFE8DEB6419BF = TWILIGHT_ZONE_SEASON_2_DISC_2 | V | 0x7CBCA4C8BBAA53C8B400B3D4C4DBECE8 ; MKBv18/FindVUK 0.96 -0xCFDA273106FBAF7462323FDF5E20AA1FA4AAA9B4 = TWILIGHT_ZONE_SEASON_2_DISC_2 | V | 0xA9BF12A1EECB29EF918E0E419FFA0149 ; MKBv19/FindVUK 0.96 -0x6E42E11248CD42DCC1E6341A8809A3EFBE1A2383 = TWILIGHT_ZONE_SEASON_2_DISC_3 | V | 0x6846DFA0021C80183F83752B001653A8 ; MKBv19/FindVUK 0.96 -0x906140B914E9227F8696C5F8F8F624A7F1039F39 = TWILIGHT_ZONE_SEASON_2_DISC_3 | V | 0x55D3E3D9C6B2DDF2EEF4CC4920182789 ; MKBv18/FindVUK 0.96 -0x6C0091CB08DABD7E6241345A55F48526893E0F59 = TWILIGHT_ZONE_SEASON_2_DISC_4 | V | 0x4AF1BD673B89DEE2F446FEB17FBE173D ; MKBv18/FindVUK 0.96 -0x38E96BF042C30A5887B80708EFA4F1F94546F54D = TWILIGHT_ZONE_SEASON_2_DISC_4 | V | 0x8A96B24BC0ED323B3ED9A88DD6F4D395 ; MKBv19/FindVUK 0.96 -0xAF5734CFEBF181E1091E5B1F6707557B418A276D = TWILIGHT_ZONE_SEASON_3_DISC_1 | V | 0x99F7495BA29ED6241503DE24C93DB258 ; MKBv19/FindVUK 0.96 -0x99EC88E4D97EA6D390240DFE34526D833ECD05B3 = TWILIGHT_ZONE_SEASON_3_DISC_1 | V | 0x09038487D1D51A0F6754758FDD8714DF ; MKBv19/FindVUK 0.96 -0xF7F212D420B50CB2AA6DF7F8F60F1A0E4AAB1F0F = TWILIGHT_ZONE_SEASON_3_DISC_2 | V | 0x951AE0A7946075FBCC811898B0E2BCAA ; MKBv19/FindVUK 0.96 -0x8DDC4B8A0FBF78BBEB4445F7BBA37E8444B4AE1C = TWILIGHT_ZONE_SEASON_3_DISC_2 | V | 0x5C4762C6B360CBCCA5A6678FB3AB2B47 ; MKBv19/FindVUK 0.96 -0xECF571B1B30E68311632F86C04363DE1C3384C1C = TWILIGHT_ZONE_SEASON_3_DISC_3 | V | 0x0D987D1AFEF56CA4DB4156303540AE4B ; MKBv19/FindVUK 0.96 -0x3FCD16609AEEFC2E2C9F480F909616F65627A11B = TWILIGHT_ZONE_SEASON_3_DISC_3 | V | 0x63D125409702FDF73D2CD8EB81476D36 ; MKBv19/FindVUK 0.96 -0xD7D53AE7ADEB8B081CCFFC061B6E287FF558092A = TWILIGHT_ZONE_SEASON_3_DISC_4 | V | 0x902245533A744231F80B2449158852CF ; MKBv19/FindVUK 0.96 -0x8FAAB082A4FE9D99D786D3BA55BA315902B135AD = TWILIGHT_ZONE_SEASON_3_DISC_4 | V | 0x1D7C27A3AAA44084ECC73870CF8BA85D ; MKBv19/FindVUK 0.96 -0xD8E469D063CDB77716D44D9AC3B5CA250DEE0578 = TWILIGHT_ZONE_SEASON_3_DISC_5 | V | 0x6914B3C7F8DAD5EC27D49F3752E6CA27 ; MKBv19/FindVUK 0.96 -0xDC97A98CE7EA3BD8C77BC999EBAC70E42C1753E0 = TWILIGHT_ZONE_SEASON_3_DISC_5 | V | 0xE3032B9A0BF7A919060E0F9B741DFA81 ; MKBv19/FindVUK 0.96 -0xB0424E4BF2CD3223CA586547A91651B4807E2818 = TWILIGHT_ZONE_SEASON_4_DISC_1 | V | 0xE551CC881B348F9D6A281BFF3D24E08C ; MKBv25/FindVUK 0.96 -0x95F1175A18B27F0BBD5FBC62E1D8B61305A971F1 = TWILIGHT_ZONE_SEASON_4_DISC_1 | V | 0x56CDD270B4FFEED74E9EEFC45E23159F ; MKBv21/FindVUK 0.96 -0x5F1AEE1CC1D3D8E6136803BD5ADAAA6DC07E209A = TWILIGHT_ZONE_SEASON_4_DISC_2 | V | 0x823D4CC311EAAD6D53A2E1246F46A83C ; MKBv21/FindVUK 0.96 -0x0DC7C42733F903E03871CEBF1014D9B88591F3A8 = TWILIGHT_ZONE_SEASON_4_DISC_2 | V | 0x1C2DE741199BB60529089244F48D84F3 ; MKBv25/FindVUK 0.96 -0x219B238D1AEF080E703888AC7204C137B6A49881 = TWILIGHT_ZONE_SEASON_4_DISC_3 | V | 0x78EACAC4CA8E7D6FF89E82F203A260D2 ; MKBv25/FindVUK 0.96 -0x8F5D1687F22119C7A7261EBB29D7FA8F168D2DDF = TWILIGHT_ZONE_SEASON_4_DISC_3 | V | 0xBFABA25900BC3B7FFA4E7A721F5E8CEE ; MKBv21/FindVUK 0.96 -0x30D0E6F67CD6E05AC1B39338C1D820F914849860 = TWILIGHT_ZONE_SEASON_4_DISC_4 | V | 0xD66B91040665EEBFE109A4CD7300C804 ; MKBv21/FindVUK 0.96 -0xB2C79EB464CE0E9CF22A1FC447EC2C6026994CD6 = TWILIGHT_ZONE_SEASON_4_DISC_4 | V | 0x1C1BFF83D1C4434C9A65255A40C822A6 ; MKBv25/FindVUK 0.96 -0x339F60532595258C06B10CDE36A08A08BA5A3AA1 = TWILIGHT_ZONE_SEASON_4_DISC_5 | V | 0x9CA4FA21DA47A042A8B185FDCDA6C45C ; MKBv25/FindVUK 0.96 -0x5C890D276192B3355E3EBD62B993DC4B316382E5 = TWILIGHT_ZONE_SEASON_4_DISC_5 | V | 0x16DDBA471B1CFC64835B9E9E75D37D5A ; MKBv21/FindVUK 0.96 -0x63643CC3D39F0C4532B85DD078987CDA7DAE6A4F = TWILIGHT_ZONE_SEASON_5_DISC_1 | V | 0x3A8966FA5BE417403BF73B5926996210 ; MKBv25/FindVUK 0.96 -0x1DF9F835A5D27333DF3B6CA03B86C347ECFD9B4D = TWILIGHT_ZONE_SEASON_5_DISC_1 | V | 0x7A0191CAABCA1055C610D5DB5FD5F962 ; MKBv21/FindVUK 0.96 -0x6A112FA90884A677FF41293F7DF9949EAD6B35A8 = TWILIGHT_ZONE_SEASON_5_DISC_2 | V | 0xEB90C444A9B5439280E6D0B43855643C ; MKBv21/FindVUK 0.96 -0x6F17498C1C06AD3F87DE6048BB8226741D755B81 = TWILIGHT_ZONE_SEASON_5_DISC_2 | V | 0x5E6E277BB0010309605637C881D7F09B ; MKBv25/FindVUK 0.96 -0x08B7417FE7B984E499EEC3246BA449489E061A02 = TWILIGHT_ZONE_SEASON_5_DISC_3 | V | 0xB764C321997513F9252252E3BA38A663 ; MKBv25/FindVUK 0.96 -0xA95D748D9DF869D62DF2A607A3FD5687A0C97E2D = TWILIGHT_ZONE_SEASON_5_DISC_3 | V | 0x97DFFAAFE090BFB99E7A24BA4C21A5C3 ; MKBv21/FindVUK 0.96 -0x0876F5A861009087B6BC4D7BC12347C8D4BDC96F = TWILIGHT_ZONE_SEASON_5_DISC_4 | V | 0x495E8BCE906F994D5D3ACF1497D63189 ; MKBv25/FindVUK 0.96 -0xF61F37E8B67DF8474FC064A47BCBC06661A9E7CA = TWILIGHT_ZONE_SEASON_5_DISC_4 | V | 0x989E026EBC9AE2E49D51C13E2651D1FA ; MKBv21/FindVUK 0.96 -0xE83BB4080D1750AFAE9DE0A086C541D575B0B4FF = TWILIGHT_ZONE_SEASON_5_DISC_5 | V | 0x2133BD81D5063A572339CC7E973475A3 ; MKBv21/FindVUK 0.96 -0xC0057EBA7D96FD61F25896301455EE2EAF9E3869 = TWILIGHT_ZONE_SEASON_5_DISC_5 | V | 0x8795D86BCCC7F4A0F0609CDE26728F78 ; MKBv25/FindVUK 0.96 -0xDE049E7635ECF3FAD7FE8592455F17E2D3373433 = Twin Peaks Disc 1 | V | 0xD84351C29D521DB023A9AE7882FA44E4 ; mkbv46 -0xDEC318AE5D80DCC6118E813A691F1C62B241C5A8 = Twin Peaks Disc 10 | V | 0x2503520FC341D4B860A57EC549842CDC ; mkbv47 -0x4CA75F9B5EF82F0D6C50A17AA2A026361D202FAF = TWIN PEAKS DISC 10 (Twin Peaks: The Enti | V | 0xEC7FA58BF4E338D696AA04918927E009 ; MKBv47/FindVUK 0.96 -0x169A2E4C6DB0307A8A248FAD61B7D3E3B62A63C5 = TWIN PEAKS DISC 10 (Twin Peaks: The Enti | V | 0x6F5BEEE6BE3DB4CB0BB0B12D2825CBCD ; MKBv47/FindVUK 1.00 -0x1638754163A15A3D091A73C481367798A19A30DD = Twin Peaks Disc 2 | V | 0x2219259B8514E42E16B8070798EC5A9A ; mkbv46 -0x1E326252ACB400354FF80A24D1B495DCC9073EC2 = Twin Peaks Disc 3 | V | 0x7B64784277512287111FD2F85C4BB54D ; mkbv46 -0x404C5B36F1433C0734678AAB8A226FF5351B61A6 = Twin Peaks Disc 4 | V | 0xA7992A2FCC5D3C4E2D423FE704F42284 ; mkbv46 -0x8E6986512F1DE6F02B9BA3F22FDE28694CA13CBE = Twin Peaks Disc 5 | V | 0xC0CA455C6BD0A0BD23F600158DC77339 ; mkbv46 -0xC2956FC472E95C8EE5F3D0925800598C08101B51 = Twin Peaks Disc 6 | V | 0xF61F1DBEDAEF75E41254DBBA0294E0FF ; mkbv46 -0x72045B3B158F3C3C638E524BFD0854C522829F50 = Twin Peaks Disc 7 | V | 0x576256F5DB23AAD507D756EB01055415 ; mkbv46 -0x4A63FE716AD64F21545A0765C73A5C0592C5317E = Twin Peaks Disc 8 | V | 0x516D6A87680B1E2CFBA33A05E25234F6 ; mkbv46 -0x533506E4DD99BD47577EB96E18E5251E514B4E46 = Twin Peaks Disc 9 | V | 0x9ADD62F5880DE02AFCF3C78690C7384F ; mkbv47 -0x4DB0BC9E5EEAA9A7DC2B566AD5A422DAAC7ABF12 = TWIN PEAKS DISC 9 (Twin Peaks: The Entir | V | 0x77DE2FF64A94187CE4ACA48C5B8DCE86 ; MKBv47/FindVUK 1.00 -0x09484262BED87583C8030B31A651052FA95C3F52 = TWIN SPIRITS | V | 0x8269134EDFE32D9B8C04DAC85DFD9802 -0x8E913F5CC30AD40B868B493C204CB27758EAA750 = TWIN_PEAKS_D1 (Twin Peaks: The Entire My | V | 0x654A9870659755CAE457FA3CF4CE4A7B ; MKBv46/FindVUK 0.96 -0x33A3A73CF3C8E347716C7FBAF6299A51FD3E2F90 = TWIN_PEAKS_D1 (Twin Peaks: The Entire My | V | 0x04C580B5A0A05C43276CECC3F15A861F ; MKBv46/FindVUK 1.00 -0xF288FEC7E21C6E259AA29E097706F5F69E0C48E2 = TWIN_PEAKS_D2 (Twin Peaks: The Entire My | V | 0xD883A98CA1624160EF0CC5ED4546CE0E ; MKBv46/FindVUK 1.00 -0x50D0F5A3189F992990E755A40EC8DA477B7FA19D = TWIN_PEAKS_D2 (Twin Peaks: The Entire My | V | 0x3562EE9B163E62270F0BE3470E79A6E5 ; MKBv46/FindVUK 0.96 -0x4616245A1F1D01F608E910D2A8E664CE2487661D = TWIN_PEAKS_D3 (Twin Peaks: The Entire My | V | 0x932BAEC58BA1F0D6E1AB65D96313DEFF ; MKBv46/FindVUK 1.00 -0xBEA867029CB64B02259EE5F7C11B43557C446094 = TWIN_PEAKS_D4 (Twin Peaks: The Entire My | V | 0xEE9323C2DC08B0CAA47994027A524160 ; MKBv46/FindVUK 1.00 -0x5F1A5C284A19419A45E8D10187A2FBB15C98A264 = TWIN_PEAKS_D5 (Twin Peaks: The Entire My | V | 0xB4E6698FFFE5B3C0A0682AAD8656B6B9 ; MKBv46/FindVUK 1.00 -0x0085DCBC85367D0ADED8BC673684E58467302288 = TWIN_PEAKS_D6 (Twin Peaks: The Entire My | V | 0x8DB1C39E965ADA7FD11C8E01CE5AC1C7 ; MKBv46/FindVUK 1.00 -0xAB87E6F59B5238D2AC8D5D55C3338ACF272CBB71 = TWIN_PEAKS_D7 (Twin Peaks: The Entire My | V | 0x97CD425191625E69E779EFD486F93343 ; MKBv46/FindVUK 1.00 -0x699F190B7AEC3D13094AC5B33077AE5D95561637 = TWIN_PEAKS_D7 (Twin Peaks: The Entire My | V | 0xCC45F2BD6AEB60353FCC44C7A5149806 ; MKBv46/FindVUK 0.96 -0x99DBA2E9243217295D6DF1844FDD5FE04E0C1766 = TWIN_PEAKS_D8 (Twin Peaks: The Entire My | V | 0x4698455A490C56E9E0B9ADA984393109 ; MKBv46/FindVUK 1.00 -0x752DB456223B61DD6BB79CE930B08C291213E570 = TWISTER_G51 | V | 0xC6A0BE02F595C038D0611EE434E714C2 -0xAEC1E760C6EC2AC5936710B4CF82DC45E9644E99 = TWISTER_NA | V | 0x088E6D7AF94011DA10D54169C2D14EC3 -0xEECE77F420B5F2C37772348F64278FE30D9F232A = Twlight Zone The Movie | V | 0x1468896F728C87FC001F9F709588D8BD -0xE718E0A52A97BB6BEBA5764F28EC03495D9993E9 = TWO LOVERS BLURAY | V | 0x16F7CCBEF2A2329682E0BC7AA5E49AFA -0xF6DF70E34D3F2D9A1A2A30E8169203CFF10816C5 = TWO NIGHT STAND | V | 0xACC4B6384CBD6351FE25A12A93FAA390 ; MKBv56/FindVUK 0.80 -0x866C86B9D8EC3D2DFCA763465E7272B8A5B7653B = TWO WORLDS (Two Worlds - Blu-rayâ„¢) | V | 0x0D1962D83A0E17CA5273154215AE0E52 ; MKBv30/FindVUK 1.02 -0x6F92BFCFBF32A2E5B541F751A04D6205D271294A = TWO_DAYS_ONE_NIGHT (Two Days, One Night) | V | 0x30BB2DE168870D7E2C4CB6D815A7DB91 ; MKBv48/FindVUK 0.98 -0xDB2E01EF9802727905CF2BAF219373B563A760A1 = TWO_LOVERS | V | 0xCA7ABCD0E295373157A6AF70F1B81052 -0x91B193129DB83C6F6BEC6CDACFCE6705F301A22C = TWO_WORLDS (Two Worlds - Blu-rayâ„¢) | V | 0xE955849A09E1ED2AA1AA404C5F93BE49 ; MKBv30/FindVUK 1.02 -0x0100781811CCDEBB56646CF009A821BFC4322FAC = TYSON | V | 0x48160E0FDEA625203FF5BE818EDCBC8E -0x59AAD5C8FE9FB5D03A0309A7C8B7614D09084E82 = TYXN_10001 | V | 0xCBEB6A0401A60372137BF2E4697C47CF ; MKBv42/FindVUK 1.02 -0x0B823F4CFC1CAC6F1147C9CFC8DF0F981A921386 = TYXN_10002 | V | 0x78C8BFE6469BBED01926099F5558490F ; MKBv42/FindVUK 1.02 -0xFC3A07FE70E22656C1AAA0EEEDDD12F32E11BED4 = TYXN_10003 | V | 0x766563421EB8B79FC64FDF1DFDEF313B ; MKBv42/FindVUK 1.02 -0xA67624127E73397299EBD42931676BEEB70F36DA = TYXN_10004 | V | 0x2AFD0FA906A10369588D0A7FAAC09F74 ; MKBv40/FindVUK 1.02 -0xDC9E191BEC460A3A0CBA863506E484A830915C14 = TYXN_10005 | V | 0x7529F5DD87CD0286B1EECBCCFD69C6F1 ; MKBv42/FindVUK 1.02 -0xBEEEC1366AC96F056764106AFF59DFDD9713E849 = TYXN_10006 | V | 0xF1D4C7915215D5A46E5E7B2E4B232067 ; MKBv40/FindVUK 1.02 -0x490BFF617640722958B7E50C5D6D4DEDF46C4BF3 = TYXN_10007 | V | 0xEF080DA58BD719193138E5B33790F719 ; MKBv42/FindVUK 1.02 -0x91960CD8D4629390214C0111AAB4C443CF2B9C30 = TYXX_10005 | V | 0x2D19897AE7370222EC33401330765987 ; MKBv40/FindVUK 1.02 -0x710141425C4D7D3541B27DAF1BBC127686684658 = TYXX_10011 | V | 0x8AD47951CCECD0FEB147D780B2327A6E ; MKBv40/FindVUK 1.02 -0xCAD9925ABA573A6C6D818E8622AAC1158F07B0A5 = TYXX_13007 | V | 0xCDD9AA155CC627F02C00CDEB655C565D ; MKBv40/FindVUK 1.02 -0xC5306811D6B45F3D67C2DAAE34AB1BD6D9C2DC6E = TYXX_13008 | V | 0xF8FEB05EFE2308F96EF52B853228660F ; MKBv40/FindVUK 1.02 -0x82E2DDEB2766EDDC84D705AFA1E07F7F7B17BCA9 = U-Bahn (U-Bahn - N??chster Halt: Terror! | V | 0xE29DED4D475A4699DFAAFAC4226EBD35 ; MKBv44/FindVUK 0.96 -0x97B91DE05B0816909B790E720C24C5C929A1E313 = U571_NA | V | 0x606FD1FD96E9F5E59B480F2120B3AD1A -0x39510614C84D847F7608EB38BA4A9E9893F574DA = U571_NA | V | 0x2B6966D14FA101E3EB8D0580A219D74E -0x69A711FD7A286AC911FAC377A0F5D89FB98BD435 = U571_NA | V | 0x84334AF06AA75C8D0F7C028AD8794948 -0x5E9F9C83EDC6A4992AD01B54B45C949E1BE4E839 = U5_8291096_R0 (Citizen Kane) | V | 0x8E8C0C84C123C5B140E205735760F0DA ; MKBv27/FindVUK 0.94 -0x5311B5E955A68DA449413DE893C2407849955BF9 = UFC Rampage Greatest Hits | V | 0x2D92BDD333AC1256FAB52FFBE6E4C9DB -0x433DBBE6042DF0127FDEC60963B32D3144177C3F = UFO_D1 | V | 0x56E49C198461F2D3B2FAE93A1CBF00A4 ; MKBv62/FindVUK 1.00 -0x3C1B36B2F1D07C73859CB527BD68BF463AAFDDE9 = UFO_D2 | V | 0x820E90B156663B065875A7231F49024C ; MKBv62/FindVUK 1.00 -0x39A371A18E9489B4CD1458D2423E521042985561 = UFO_D3 | V | 0xFA3D52E0CC259F3461E220308E9F4AF5 ; MKBv62/FindVUK 1.00 -0x6B6F26B07BE567337490CA0604F3D95F3C599D21 = UFO_D4 | V | 0xD4299EE5A8D231BA2AEFF974452AF921 ; MKBv62/FindVUK 1.00 -0xCAFB053475D0C1C71CF7B9590AC3207060973039 = UFO_D5 | V | 0x763D0CE8FC610AD59F097AA79126A5D0 ; MKBv62/FindVUK 1.00 -0x53BCAABFBA95CD71DC01AB3558F5F7C6698DED32 = UFO_D6 | V | 0x6C184CD44552A913390B7DEF338DD49A ; MKBv62/FindVUK 1.00 -0xBB4763760B4BE0D5D241FB293F5758A2DE306175 = UHF | V | 0xFFA9A9FC7FE67FA325D01FC14B8C8E98 ; MKBv47/FindVUK 1.02 -0x0F1819845D114CC82F754AD5847D5F260FF85985 = UHF (UHF) | V | 0x1916BC50CF61B0D0CE5A92EE471478F1 ; MKBv54/FindVUK 0.94 -0xEE333E1B61382BB5182C1815B94EF75B959C873C = UK0x113632BVR0 | V | 0x5E65E14825B22869FDF88BC497D62035 -0x604752202376120D2C17C6FFAC3D5FD7C09AC296 = Ultimate 100 Greatest Fights - Disc 3 | V | 0x3DDFDC0664219BD8C66CA17CBEC49C0F -0xAE42186AA679D30FE86D9BA0E9739FFB15BE3DE1 = Ultimate 100 Greatest Fights - Disc 4 | V | 0x73220E4E777A7D32549A76A44BAD11F3 -0x072BDF56F8D939A576416979AC7AC4481A2DB823 = ULTIMATE_GS_BD (Im Rausch der L??fte) | V | 0x373566D3A0AF98118D9F3879FB61C10E ; MKBv19/FindVUK 0.96 -0xCBBA4F938C99FE0DE9767D9C6A2E8610AF82312D = ULTIMATE_WAVE (Ultimate Wave) | V | 0x0090D10D4F2731DC8F8ACF1188DF7077 ; MKBv19/FindVUK 0.96 -0x1E2685996EED1213754AD88379ED03ECEB398C3C = ULTIMATE_WAVE_3D | V | 0xB2DD7C5CE8E8021E3A983B201B4B9521 ; MKBv21/FindVUK 0.80 -0xFE36972CD1F5B413AC31BF9479B41488A5932E08 = Ultra Galaxy Legend | V | 0x69A7FCDED72DB1BF691DD7C7113B2EB8 -0xB121B199A937940128CA797520C76064C81D0115 = UltraViolet | V | 0x64A4F30F0EA870EBA56F7BFAFFF47CB8 -0xF1A67BCD4C7123FD1CAF7489386C7E650AC185E3 = UltraViolet | V | 0x67D64060928EF1DC85C332C7850D76C5 -0xADE6A0D9E184820CAF13ED82AA29C064331B8DD7 = Ulver: The Norwegian National Opera | V | 0xC6EC835BB34743AF19493E6E494838C6 ; mkbv23 -0x188E66ED8520DDF763815F2D2609E8CFBC65400B = UMXX_1011 | V | 0x72479EC2172156D18F5D01E7C28CB0C4 ; MKBv62/FindVUK 1.02 -0xA13BFE2E0F5E8541D06C8BE9743402F1DED66350 = UN BALLO IN MASCHERA | V | 0x2A9FEE21E89E918ED5A8A5902137AB3A -0xA01DFD2D4F17721D4372BCD304B63AD6ADD67244 = UNB1EUW1 | V | 0x9039048A2DC710E4F340C8E14F6B11C4 -0xACE1F962FDC6BB182E72CB2053BBA9B372D7CFF6 = UNB1NNE1 | V | 0xBB5BC30F39BFCF5FB787A55ABA396A2F -0xFC23E3D1BBDFB3C3B3272C90ABE80DFE6C759785 = UNBORN_G51_GLO | V | 0x9FB60ADAD78FBE04A19D5C379FEE320A -0x0971FF98FB917B7CD1FF1CFD1B17C1D4B4E0A338 = Unbreakable_Machine_Doll_D1 (Unbreakable | V | 0xB8B8C6F08CCF5752C0E574C3FCAE7997 ; MKBv50/FindVUK 0.86.3 -0x98F2EC3BED127AACBF541F45E32F70DD543AF8CF = Unbreakable_Machine_Doll_D2 (Unbreakable | V | 0xDAB14BDBA13DABDD78B68A7B9B72C365 ; MKBv50/FindVUK 0.86.3 -0x81296B154D53FD3C8A188752F302AA34ACBFBCFD = UNBROKEN_NA (Unbroken) | V | 0xCD3A0D9E87D63243BA3F5E967CAD5729 ; MKBv39/FindVUK 0.96 -0x74A1FB95CD0EF970F3EA2C619938516F8072F17E = Underdog | V | 0xD54188A21F2264D2B7C050DB75DBC774 -0xC73188C74D79CC8717AE1C5E66F998C3A4ACD606 = UNDERWORLD | V | 0xFAA1B7573128579E95F8102D918E79CA ; mkb v7 -0xA79147DA1999D65C53FB71EBA8589350E7D3CB81 = UNDERWORLD | V | 0xCBCE32DA9C6E6E7C724204B057EB33D9 ; MKBv3/FindVUK 1.02 -0x4798DEE8615C8C2CEE65D27214F16CD302EE2089 = UNDERWORLD | V | 0x0CB73D53EEDA6D23052814B78C2CDBD7 ; MKBv3/FindVUK 0.91 -0x205F136DDF9CDD3369634E224003F5FE3B448255 = Underworld 2 - Evolution | V | 0x085BBD196F3B05C266753C942C9B5DEA -0xE097AA866A7C27C65B2EF418EDBCD7AA2F0A291D = Underworld Awakening | V | 0xA8C38C937F166B2843E22EE62F4F5C10 ; MKB v30 -0xA89B223339693D977EA1322884DA09166D5200A7 = Underworld Awakening | V | 0x9C6210F1664C0CE04343171D04BDB33C ; mkbv30 -0x90021856C026A0DBD2B675C022D8A39CE4E31D97 = Underworld Evolution | V | 0xB446E50BD847C414CECE1CAAC3B445F2 -0x5DC500F8517F54857F30B927E2847A7AB1196BD0 = Underworld Extended Edition | V | 0xDC0DCAD79CD51804F801C3CB28F490E5 -0xD21E34E9B760217D9DE4BA5008B16C68C92D1058 = UNDERWORLD2_SND_1250 | V | 0x8B0E1F1F4ABCC740BC761C0599CDD322 ; mkb v7 -0x3E8B136DBEA8C38CEE849793D88F1429E190A1AD = UNDERWORLD3 | V | 0xFA980CC9F1FFBEA0A46A9E7DC42747E8 ; mkb v9 -0xC4F2BA2B2F507AE0ABB3AEC811070A40EB0A5B17 = UNDERWORLD3 | V | 0xE8054E35931B42F10E64FB7278BB2B8E ; MKBv12/FindVUK 1.02 -0x68C0DB9C2A26A36A4F08B2D881F792B1BCA3ACA1 = UNDERWORLDSEE | V | 0xF0162B7B1FE4F34281FB3C92FA7B5F97 ; MKBv3/FindVUK 1.02 -0xCFE7B2298980E1FE0D3B9A77A4E0AF63B8F170B4 = UNDERWORLD_4_2D (BLU-RAY) | V | 0x6D00E10787AD4A94CB25A7FC17C4E1F1 ; MKBv20/FindVUK 0.84 -0xACA4C441F1389907F73BF808DFFD92E159EBFB2F = UNDERWORLD_AWAKENING (Underworld Awakeni | V | 0x804813644E5D63400A8E141BB4D84E0F ; MKBv28/FindVUK 1.02 -0xDDACED1F8A7098A18B633CC8FFB31AE87B49CFEC = UNDERWORLD_AWAKENING_3D (Underworld Awak | V | 0x1A0DBEEFC18752723633C7E792D8D57C ; MKBv28/FindVUK 0.94 -0x8EDFBD517E8773F2CBA326A61C92BA413EAF8786 = UNDERWORLD_AWAKENING_3D (Underworld Awak | V | 0x38E7C94B81614085BA4FBF8C024CDA6A ; MKBv28/FindVUK 0.96 -0x3B8798D16B2751099A8747C484C7D421E3919B00 = UNDERWORLD_BLOOD_WARS (Underworld: Blood | V | 0x9AA1C55380995DA9097D0D046E40C0BF ; MKBv62/FindVUK 1.02 -0x15867E70084301B4599212CCD286FB3EC340299E = UNDERWORLD_BLOOD_WARS (Underworld: Blood | V | 0x6490FDED5C5996F867C334F42BBC7AE5 ; MKBv62/FindVUK 1.02 -0x0B4BE0F51E115770E3A803A86CB5591F6DC96CA5 = UNDERWORLD_BLOOD_WARS (Underworld: Blood | V | 0x981E4962C40687597E859A209397FF71 ; MKBv62/FindVUK 1.00 -0xCD84443048C9EA3FFE1E58756BA6E701B71C8214 = UNDERWORLD_BLOOD_WARS_3D (Underworld: Bl | V | 0x4CE606178884752190574D0E13FCE683 ; MKBv62/FindVUK 1.02 -0xE347E43F28D29445A77A35D9941B770244448A7D = UNDER_SIEGE | V | 0x38AF31DE10049F7FB9B49E6345B2DBB0 ; MKBv3/FindVUK 0.98 -0x59152FDA39B8D823FF411B6F3CA30A4F7C2335F2 = UNDER_SIEGE_2 | V | 0xB0242C7748747EAFE4A0D7C3ACEF5569 ; MKBv3/FindVUK 1.00 -0xCF55BCB4D9402BBB3AD3CAB87418B40BB10E52BB = UNDER_SUSPICION (Under Suspicion - Blu-r | V | 0xB9F2E8B4B36E8F83B727FF505131DCDF ; MKBv25/FindVUK 0.96 -0x0AA795126963C94675E4923C2F0303BD7972F2FF = UNDER_THE_SEA | V | 0xE5CE37A41958D8A1A2A55B97844E293B -0x238FEA1B5E43B508474AD8FB602B42486CF83ACC = UNDER_THE_SKIN | V | 0x8BD0CEEDCBA71F372BC6D25031740683 ; MKBv32/FindVUK 0.80 -0x376098ECA1C4E2A417EC6ED337B72CE97BDD804F = UNDER_THE_SKIN (Under The Skin) | V | 0xF6BF3FC2BB54F73FD1EDC96FBB7E55B8 ; MKBv47/FindVUK 1.02 -0x5E0EDB735522C31C233CE39C7787ADB4EFFFEAA8 = UNDISPUTED (Undisputed - Blu-rayâ„¢) | V | 0x5B0369584EC0C0214BD77C2F06C88AB4 ; MKBv25/FindVUK 1.02 -0xE27B8387FA9B5A2B834185539ADBF195A4EF6001 = UNDISPUTED_3 | V | 0xACD0EF6EAAD99E2817874C020D14DFD2 -0xAB1E78A1BE0419DA16E4BE8A2E705E7632989999 = UNE_AFFAIRE_D_ETAT | V | 0xBBE4C2757CAC184C88E669DAF349171E -0xA0A8E2C0B39FF8900DA9D3671CBC1595438423DE = UNE_FEMME_MARIEE_MOC | V | 0xBF9EDD17DE0C913A5ADFD5978FFECA60 -0x1A115146C68644BCD9AD1336048819A1BA673224 = UNE_HEURE_DE_TRANQUILLITE | V | 0xC0453F0E326D87DD9B63B5CFA3B9E40B ; MKBv51/FindVUK 0.72 -0x73600064163036A23186E8DD91667C3AC66C47D0 = UNFAITHFUL (Unfaithful) | V | 0x5E5A4774FE03A7E3C09D1017AD01F2D6 ; MKBv10/BD+/FindVUK 0.96 -0x2A50DCB5B48DD63885FFB95DD0A9344E41DCB701 = Unforgiven | V | 0xE662C5A55AA0CAA6CF92A4F50F497B50 -0x98E39691404512B23EDCC3121336B4FA700EE034 = UNGLAUBLICHE GESCHICHTEN DISC 2 (UNGLAUB | V | 0x75E06344FCAFBC14B9E5ED96ADDD4F97 ; MKBv61/FindVUK 1.00 -0xA0451EE2B72449B45363733680EE7934F747FACD = UNHEILIG_MTV_UP (Unheilig - Unter Dampf- | V | 0xA76B0EE3E89105E564C473EDEC7BBB4C ; MKBv57/FindVUK 0.98 -0x678B3528BBEE509FE9AA967F1127C5E964615EB0 = UNIVERSAL_SOLDIERS | V | 0xB318536A81CFE15DBF6584754B7A7E99 -0x699846655A4519734CA73330A41F3B63A81DB276 = UNIVERSAL_SOLDIERS | V | 0x1170726A9E0BD0455D63CE2A1C614CEB -0x21267128919EED251A84FE7298D14CA13A426284 = UNIVERSAL_SOLDIER_4 (Universal Soldier: | V | 0x4D6B6F5A9B5CDA9C1661F2706BBB8616 ; MKBv34/FindVUK 0.84 -0xB5570BE184D226D490534E62D8A4F1CA858A3831 = UNIVERSE_S2D1 | V | 0x4E24D6B477C3B97241B354BA45A231D6 -0x82E95E69D781E0D4BF5DF1883E202C5C0AA30F69 = UNIVERSE_S2D2 | V | 0x247102C57C953140A16D4903880BEE0A -0xCD03C2F45489000007C1284C0A79E3E79D29270C = UNIVERSE_S2D3 | V | 0xA8468DF6D044D0A2D9638F085004CD19 -0xF554625E49080A52777A90A65828699F641C2E60 = UNIVERSE_S2D4 | V | 0xDE8D09C831648A7EAFBA07BCF420C592 -0x1EAD966B0627F7498DA75F0358F2706AC81D9CA5 = UNKNOWN | V | 0xDFB33EDF93453E433194BF35576D9761 -0xB3B988DDF72ED2AA44A58985309338EEF9EA1D75 = UNKNOWN | V | 0x68D013579081241A304EF039B1FA25B8 -0x06A00AAB0AC7972AFEC67C1AA52D40ED90C5E761 = UNKNOWN IDENTITY (Unknown Identity) | V | 0xBC0CE1EB52A9E830EF4C268EB609BFCC ; MKBv23/FindVUK 0.91 -0x93468744648A3BD002D494B90E959631D19B4F4A = UNKOWN (UNKNOWN) | V | 0x9221337F968874F749F37AD65C1A4EF7 ; MKBv19/FindVUK 1.02 -0x457F9FE99A284253EF32B81282FC011DBF3AFA4F = UNMOMENTD_EGAREMENT | V | 0xF3200171CB229018D0F19027F3696BF1 ; MKBv56/FindVUK 0.72 -0xB2E719EE764846342CE3B9CD775AD6648D8800AA = UNSERE ERDE | V | 0x72DE552C884EFE1B6EDC57CF480EDD03 -0x42A698EA37EE362D7A66C4CD0BC4BD26B1EECFE5 = UNSERE WUNDERBARE ERDE | V | 0x6B8146777313B65176C20B1271946CEB -0x9B9A115C4574EB8CD52D3E7155482ED90C8855AE = UNSERE_ERDE_BD | V | 0xC16ED110A92293A0B24B3D58700DF1A4 -0x58347766C7E32CB4074F0363EEF9DDB9DA5575DB = UNSERE_ERDE_BD (Unsere Erde) | V | 0xBB6BC102C337C7F7280A6A0EFC23AE5C ; MKBv9/FindVUK 1.02 -0xF99FF50D45D01C286FD4FC47F67C4CB88E2DD8BA = UNSTOPPABLE | V | 0xA826DB148340966F76F25BA30B68406A ; MKBv19/BD+/FindVUK 0.81 -0xC9B06DECE56E28C469F4B5913229AE94686546A1 = UNSTOPPABLE (Unstoppable) | V | 0x6A25FC0004ECB449D3F8552F7AD72785 ; MKBv19/BD+/FindVUK 0.91 -0x5BC6F16B838137D0C637408314F7AB74E7466D8E = UNSTOPPABLE (Unstoppable) | V | 0xC4F37D39E82C1084174CDB3D05E76D06 ; MKBv19/BD+/FindVUK 0.96 -0xC02F90F15EB5CD165688B253DD458D5B954BA774 = UNTHINKABLE | V | 0x282BDD799C0CE8B914CBB322F5CAB16E -0x6579596EA1DD1D446992253F03512EFA22D05E93 = UNTHINKABLE_BD (Unthinkable) | V | 0x7A654481BFFF270AADF609F6503CF219 ; MKBv21/FindVUK 0.91 -0xEF256138E15B8A6BABB80E80C2994768263A847C = UNTOUCHABLES | V | 0x831625FB92F0C650B6F682BEA8C9861B ; MKBv3/FindVUK 0.96 -0x3F12AC1E3DC4142644E5E2D7209A4F593BABE64B = UNTOUCHABLES | V | 0x3D54CE8F02ED425943616FBE9325CE47 -0x995DE938F29AEC5920DF7722BCED6018DFE3FF12 = Untraceable (UK) | V | 0x967BA516ED4860456238B9CA55B2294F -0xDE3006A13CFE50BE54ED74B209FE8953F8C83F90 = UNTRACEABLE (UNTRACEABLE) | V | 0x5F35F38BA6132411E4B4AD5184E6878C ; MKBv8/FindVUK 0.91 -0xEDF893575F43CEC87988E76E1391DBA7531BABF4 = UN_PROPHETE | V | 0x29365A1D3F18FC5E8113FEB2DA323581 -0x7A614168E6C84B09BC0B648737E7AFCD9680D477 = Up | V | 0x0DA6BCE9E849F89620C3F2188CB1092A ; mkbv15 -0xBD821B7AB13E1025AC6297474B1520CF3E870F6D = Up - Special Features | V | 0x39047B89662CC3FABF7AFDD67F9E8362 -0x91A9C4D1C692019CBEAB04C195967A5467F9386F = Up in the Air | V | 0x94411FC5915746906BC76EAC53215B40 -0xA99E74F9774E27E860BA9D48DFFF979EA7F1F4F8 = Up! | V | 0xB2B1F7FD3985E2A1AD5EF577707EF9F9 -0x46115E02C587E765660406A39F3A3B4AD7BF85D5 = UPB1-633395A (LA CIUDAD DE LAS ESTRELLAS | V | 0x1239540739187A570639CF8C5666A9E4 ; MKBv62/FindVUK 1.00 -0xE8A66D3E36B77D6B0368348B604DD91F7969BF8F = UPB1_100128A (Downton Abbey S6 Disc 1) | V | 0x49EB8C2B87A4F5C2789BF074D18A03FB ; MKBv56/FindVUK 1.02 -0xA4A6E4EF5E6A295BDDF992D60EF9BBFB123E4F26 = UPB1_100128C (Downton Abbey S6 Christmas | V | 0xBF369BB63C8817374E0D85B9926AABFF ; MKBv56/FindVUK 1.02 -0xD4052AB01994E08AD13FED66C5D9E3637788FE6D = UPB1_473638A (Downton Abbey) | V | 0xE69A638BEF42D374B6CC8EE4AB8A534B ; MKBv53/FindVUK 0.93 -0x6A92C51D0909BDECB564E06918A5E94A8EDBFE1A = UPB1_585147 (Steve Jobs: The Man In The | V | 0x305E46F7FF36F21851887B6D0713D988 ; MKBv57/FindVUK 0.96 -0x04B35A44164C39F4E65031984EA449E2BF907E4F = UPB1_589325 (ROGER WATERS: THE WALL) | V | 0x0617FFACF2076270E7C6E6A9784CC4C4 ; MKBv57/FindVUK 0.92 -0x714B3C141F2A87784C622371D1620A09E3756F56 = UPB1_607677 (UPHE_UPB1_607677) | V | 0x9D0C63038CAB7B52ACE8EB4CC6B873A5 ; MKBv62/FindVUK 1.00 -0xC33B8DB989323BBCD615AC4C45924431B646F34E = UPB1_72524 (Downton Abbey S5 Christmas S | V | 0x228905068E7F1D2DD46B163498897BC7 ; MKBv49/FindVUK 1.02 -0x46B48D774F32ED08A476CEFE2689A6FC0BE16E85 = UPB1_73024 | V | 0x6DD7C4F76F0D2350CD7DDC8823234F9E ; MKBv49/FindVUK 0.99 -0x2AE74B93C9DC082C393AB9DE2938EDF19599EB04 = UPB2_589325 (Roger Waters: The Wall Bonu | V | 0x3117CC80774F27E746F58713B429BACA ; MKBv57/FindVUK 0.92 -0x2E1CAB3FB4321B17A6FC0D180BE4BA9F575D941E = UPB2_72476A (Downton Abbey S5 Disc1) | V | 0x85C5557E9004CAF45F9949F4A8804FE3 ; MKBv49/FindVUK 0.93 -0x1266BCE64459D8B941D5B6B7CF2615AF7D63E5CF = UPB2_72476B (Downton Abbey S5 Disc 2) | V | 0x136855FF37DCCDF590BD502F895D2B72 ; MKBv49/FindVUK 0.93 -0xD8D5D26AD5222EB24208017E52B760AD8DD5BBC6 = UPB2_72524 (Downton Abbey S5 Christmas S | V | 0xD9B6EBB3CFACD09A6D68385DE0A57F67 ; MKBv49/FindVUK 0.93 -0xDF33C8FC14EB661F688C91D44E4B3CC96E5C2608 = UPSIDE DOWN (UPSIDE DOWN) | V | 0x2257D0776F78503B8B9C82C92CBF88FD ; MKBv44/FindVUK 0.92 -0x43A307A02B02D6D6CE3C2A6ADA088855AF8FF981 = UPSIDE_DOWN (BLU-RAY) | V | 0x5DA1FE10CEAA3B2866634CB80D84F97E ; MKBv40/FindVUK 0.96 -0x34C343C6D44494ED8C17A1A065E47290C16F002E = UPXH 0x20001 | V | 0x247EF47BF82C3F7E47A7AC610B547CFF -0xCE7EC3198F852E7CCB1ED6CB42FB9BA6E5F93AFC = UP_3D | V | 0x131F87FC0BE9D7FE88FB837325F9405E ; MKBrev 23 - FindVUK 0.54pre -0x4D9680B8D9442B54FE5FE675BD87C809901A531A = UP_IN_THE_AIR | V | 0x11509FE08B127718CAA8F65DDE48E28C -0xE0BD90243DF4BDADF7C7AB05BAA8770C5821C5DB = UP_IN_THE_AIR | V | 0xD47A83F7AB95A32FB93208EAE3A8FEAA -0x2EB7E4FEB8B5401B0D23150F8265C57D6DD06A77 = UP_IN_THE_AIR | V | 0x7514E3CAC6C9AAA42419EF945807F6D4 -0xA14CDC80AAED5F10CD95ADD90E4D7B3591195C46 = URBAN_LEGEND | V | 0x9E1D21888371B04773E7B367B2313FF2 -0x10F7F17D74EB75137D66FF84AF457A994AF2E42D = URBAN_LEGEND (Urban Legend - Blu-rayâ„¢) | V | 0xDA3EBF0E4EB85420DBD19A6F5C738D17 ; MKBv7/FindVUK 1.00 -0x8D124B9B1128D1E43D7FC2F78DE5061F29F2A357 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0xC465913F6CA00DEEDCC09F985C32FE1D ; MKBv37/FindVUK 0.98 -0x1DBE07FC8F0BB4136589A48F8F60DD6F78C2DB9A = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x636EDA1AA2CB01A1FFC95ED01A312392 ; MKBv37/FindVUK 0.98 -0x45B0F7C5FF89461C4EE0262D9AF2229C0D1F1E9B = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x51B5D09CE6CEA73115E8C5A1A42499C9 ; MKBv37/FindVUK 0.98 -0xA5A360909100BDD71DCA9C538A6C209A704FDA28 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x7D9E4B1601F124586D949170D4C3B29A ; MKBv37/FindVUK 0.98 -0x60868653356F868C6BA669AB3FE1A7B3084E2CA4 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x4A24540AE8E44F55303FA8642D1FAFA1 ; MKBv37/FindVUK 0.98 -0xFA84773574E2D1FEFF227BE1A32B600A5F104BA1 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x46404F7E790F39E7FD381DCDEE52A12A ; MKBv37/FindVUK 0.98 -0x7CF50302B82A411A1C0862F183BFBDAD2DF8AC76 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x68E47FC2CA05543A3287D94B118E7BC5 ; MKBv42/FindVUK 0.98 -0x82F08DD125FDAC6A8011B92ADCB88EF53F7477B6 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x012048B34C9FC785D6F220C8FAC04161 ; MKBv39/FindVUK 0.98 -0x09A2EA2A91E7D0D37648FF8F7DBA103464A81F11 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0xCB615AD9D818688E2B1DF248E6AA4733 ; MKBv39/FindVUK 0.98 -0xDD4F66211ACACD8CB6EAEEC9219F0F8F729DB630 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x99FA8EEEB12BC934B439ECF3F35D486A ; MKBv42/FindVUK 0.98 -0x771D137B7562EB6ACB2F9C282E79C43536F01213 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0xD8CDEFF5543C5E7D4A49A9BB3C4852D9 ; MKBv37/FindVUK 0.98 -0xF9686A9BF3FC61B12C36AD393E0F9066907C00DB = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x11638457807C006D2D9D598D32685F10 ; MKBv46/FindVUK 0.98 -0xB6AAAFE0209DF6E4EFE96361C3D675864453F572 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x4023471DB69511374BE2CB3FC0BACF93 ; MKBv42/FindVUK 0.98 -0x7EC17F8B784D756B71ACEF9C4B07BD9C1969CD33 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x72198C7A181B9C5D490C40618E8E4465 ; MKBv42/FindVUK 0.98 -0x3B70CBF17F4B16CE6E63DCCE8D11AA75099F8BBF = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x6A89A3D7228C6A7E6CD9D8A56535FE4D ; MKBv39/FindVUK 0.98 -0x36362D3C3F639FEFC1EC2B6F80E8F27CBEDF9826 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x5BB76083EC64578B4A3DBA0A2482ED45 ; MKBv39/FindVUK 0.98 -0x8359E5996B38FEE6C7075578D292408035EF11A7 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x34722663EB714C937737AE5587A607B1 ; MKBv37/FindVUK 0.98 -0x053995E4958A8D00837CC6940A880F717EBCBAD6 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x92425FC73078C31D0FC586A6DAB57748 ; MKBv46/FindVUK 0.98 -0x282FCC4A7464E3216E539B8AFBAEF408B1F1D33E = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x59F3C41C7E5EE9630C8A3F3DED778D8D ; MKBv46/FindVUK 0.98 -0x740CDFAE3947D8534A47E07940D0C9F5310D7D03 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x0BB3BE61E7A68EF6F5BA4A0CDA97F014 ; MKBv46/FindVUK 0.98 -0x3D71585B62FB99133B69BEFC6B8276DF884F8BC5 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x58A4877A2F615369E3E3AD330983966C ; MKBv46/FindVUK 0.98 -0xCBEE67E3FE983EC94AA1878F4600F3F1888A17D3 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x0A8F259C310C03BE0C6DCF1AFAF38088 ; MKBv42/FindVUK 0.98 -0xC22AF9626DA0FDF547DB2521C58A0742FE0798A6 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0xDCB575DF7BDE06448E7EDEC375B01EC5 ; MKBv39/FindVUK 0.98 -0xBD77D59545FD925162A3C3821A7FB3E947222782 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x7C91138E7B05F7F346F5B7BE8BC4EB51 ; MKBv46/FindVUK 0.98 -0xB8DE7B47F7BE660E719525092972D79287DD9E04 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x55D701E5E14D011F8DFCBBB62AACF478 ; MKBv46/FindVUK 0.98 -0xE5BDB59E0E181F39382DBC2DCEE9FA32B8CB1767 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0xD7AA159FA6933C0BB0608DD7D99E1383 ; MKBv42/FindVUK 0.98 -0xE56FDBCC518A9EA6172A68D5DEAB9CAD5EE6BEE9 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0xFFEE4F8FAB34214D173ACF445D658AAB ; MKBv42/FindVUK 0.98 -0x5BB47266E26DC3AC4B2A5C6C9900F5138277AA48 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x7CF7E324A4283E9880E184B492316A7B ; MKBv39/FindVUK 0.98 -0xDFC20693BE62C94F4529A0B1DD0CB28925D30E49 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0xF84D3F583034AF4B19A8831D19626B39 ; MKBv42/FindVUK 0.98 -0x56B08DDAFF297866CC548440EF727C732A82083A = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x23F0B890AF4A7AE47BA3CB0BA2265885 ; MKBv39/FindVUK 0.98 -0x513950130046B6F7372CAEF063564575103307CD = URUSEI_YATSURA (URUSEI YATSURA) | V | 0xE4588019BE665B1BD4FEDA92E45C60F3 ; MKBv46/FindVUK 0.98 -0x91F56B33DBD0CE5983E77AE776FF523571C7C93C = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x1618CE470A77E8A37BD87E969F69DDCA ; MKBv39/FindVUK 0.98 -0x91AA1577BB5A9136624C80ADEE40B907F0E94402 = URUSEI_YATSURA (URUSEI YATSURA) | V | 0x8858CF22E1A1E9CD001BCE9D3EDBF59A ; MKBv46/FindVUK 0.98 -0xEA17AF2C9407C2C8A26DD85364690CB288CE82A7 = US MARSHALS (U.S. MARSHALS) | V | 0xDAE3050D254181573FF5C00FFBA2495E ; MKBv20/FindVUK 1.00 -0xDF4C60373C8EF072BD367F1F9475A8ACC938DE05 = UTAPRI5THLIVE_01 | V | 0x180053CB24E2E8F9F2E54E31444FA17A ; MKBv61/FindVUK 0.99 -0xD4E5E0A5FAAF98C9A163F08FD1FF5FE10AD02C00 = UTEK ZE SIBIRE (ÚTÄšK ZE SIBIŘE) | V | 0xE77F17C9E9D4C6C77B1A70200150925C ; MKBv26/FindVUK 0.98 -0x611CBBD04A21CBF888438C38479CC21EBEA5A34F = UTOPIA STAFFEL2 DISK1 (UTOPIA STAFFEL2 D | V | 0x51BE3AD95C894369708AF0FC12DACF7B ; MKBv55/FindVUK 0.96 -0xE6B5B01782BB445232F286D71FE72DCE249A48B3 = UTOPIA STAFFEL2 DISK2 (UTOPIA STAFFEL2 D | V | 0xD5C31F9B6E423087A62E0BDA2A73AF4F ; MKBv55/FindVUK 0.96 -0x21E9CB2685B15C53B831A06AA6FD1768AB1AC7F0 = UTOPIA_DISC_1 (Utopia Disc 1) | V | 0x3719CDCF33262CD4BBEF4F2F794B6CD2 ; MKBv38/FindVUK 0.96 -0x9DA93C0766E231C0081CB437338B7BBCD8D2B7A3 = UTOPIA_DISC_2 (Utopia Disc 2) | V | 0xEFF002F5F45F4D822B368E3893A92157 ; MKBv38/FindVUK 0.96 -0xC1C034B0EA7E4C0157BAE4ABB3DED1201F24C857 = V For Vendetta (US) | V | 0x81C9668826D37E0F9C2A28E67E25ADBA ; mkb v7 -0x73A55CCB6179A3C30769CC85531BEA5A2291267B = V PER VENDETTA | V | 0xEECAF11791A095102D559371C366B0EC -0xE0789C76FC7664B04129F72A62AC347790BF9092 = V2 | V | 0xFF42A42A3028F4F95C01C3E9171CBB42 -0xB7EA75378C89939FD0BE71291E5BAFEED819A295 = VACANCY (Vacancy - Blu-ray???) | V | 0x5B636BB7FD9495D736E90003532D1D32 ; MKBv3/FindVUK 0.92 -0x1B163FF550DB14D89514AE3CF083F0EAA664D160 = VACATION | V | 0xF47C350509DDEACDAFFCB46964B05B3C -0xBC5D7253AC5A761C105D74F5CCB5F1891BA02B42 = VACATION_30TH_ANNIVERSARY (National Lamp | V | 0x2E7C4CD7867AA90B8783B2721E1CD682 ; MKBv36/FindVUK 1.00 -0x717F9A97AE14242698E380E8F4CFAD9D06B5427F = VAIANA (Vaiana - Blu-rayâ„¢) | V | 0xF847815DE325BABE63BB51E6BFE022EB ; MKBv57/FindVUK 1.02 -0xD0F1C8716417B176E6872DF5E9D53B8754554596 = VAIANA (Vaiana - Blu-rayâ„¢) | V | 0x04C3B3544B5C95210A9604B403A26F69 ; MKBv50/FindVUK 1.02 -0x3887BB645A9CED8FE91D8E2ACD885E6EA8C92C76 = VAIANA (Vaiana - Blu-rayâ„¢) | V | 0xB8D9F5DEF1463F42A6C87FD039B77DF6 ; MKBv57/FindVUK 1.00 -0x463C431735436530205083C4BE1B0D4FB57CAC4E = VAIANA (Vaiana - Blu-rayâ„¢) | V | 0x8AA8E026F386C58EDF59C66E377E5889 ; MKBv57/FindVUK 1.00 -0x40DA9621A44AAC787D08603EE322DA07BCF51C28 = VAI_D2 | V | 0x232AA6586E87DDAB5BF54DAAF5AA454D -0x09E72772A45057ADC19A5AD7DDF8E4D091A912B6 = Valentines Day | V | 0x00AEF62CCB46E03DEF271F16C00344D5 ; mkbv17 -0x62B7766A22D3A9DED7E40CB024154E3024AA97CF = VALENTINES_DAY | V | 0xEE75229060602190A5EB4850DD1763A4 -0x8EB691500184F5F48ECC7815ECB993C035D3F8AC = VALENTINES_DAY | V | 0x20ED4905BBBBB8E854D4CA338A84879B -0x02E9E2DF61DAABE7F28F7B438054782F516D868D = Valhalla Rising | V | 0x994A9CF0C3A39916DC22EF88199BCFBF ; mkbv18 -0x1FAD68BD7A8441DC75D83E1D3FA55D99A9F82FE9 = VALKIRIA | V | 0xA3BA477A4F16440428DDA7B95962E9CC -0x2049E2E85CC2EF0573614520E8F8318EC331EE75 = VALKYRIE | V | 0x329D7C0189B1503084611BF65F8F1AD1 -0x3921C14DEB41F5288123B39839E44019DA64C7DE = VALKYRIE | V | 0x2AFF628477E322C1950539EDF9539787 -0xF265646E8322210EEA53C3B36BA31446F04006C3 = VALKYRIEF1 (Valkyrie) | V | 0xDD3B285ECE77B5D5E26ED5B135EFCA1D ; MKBv12/BD+/FindVUK 0.98 -0xF07A58DD300EB60689CF5E1B7EE6008B37ADA2C3 = VALVRAVE_THE_LIBERATOR_1 | V | 0xBDD5F49985E0A8F4C25C0CE9EA5B5891 ; Japanese BluRay of Valvrave -0xE253871A6F7666684BFC4E59A10F28238522A99C = VALVRAVE_THE_LIBERATOR_2 | V | 0x60375B64F5D40E49F4B9D6E5305EDE44 ; Japanese BluRay of Valvrave -0xEA7004110937FFC3CD649FA0BB0F8A68AC3718E3 = VALVRAVE_THE_LIBERATOR_2ND_1 | V | 0xAA5768FF1579CEBC3580CE2B2AC8AF45 ; Japanese BluRay of Valvrave -0x3CF7E7854EE9D0D1B058D722933B50AC5F69F1CA = VALVRAVE_THE_LIBERATOR_2ND_2 | V | 0x179FE74B60126C1E738D61F88BC86FB5 ; Japanese BluRay of Valvrave -0x3730EC730598BD5BBF07F54BEFB6E5743E570D37 = VALVRAVE_THE_LIBERATOR_3 | V | 0xA2ABEF50B0FD8B2A148BC3E6243A2FF7 ; Japanese BluRay of Valvrave -0x986602D269D239455477C4CC4C28E177F3695402 = VALVRAVE_THE_LIBERATOR_4 | V | 0x4E0646D778329AF35E2BBA6C16F477A5 ; Japanese BluRay of Valvrave -0x25ADC3ED413A8C3AC17F92E4F2A14A64CA9D55AF = VALVRAVE_THE_LIBERATOR_5 | V | 0x34ACAC2152256237F2A9923283923225 ; Japanese BluRay of Valvrave -0xC5E7C05C0ACEED5BC03C26D77E2773B7AAEF788C = VALVRAVE_THE_LIBERATOR_6 | V | 0x259323E1DA559E55F2B21BB8416D8C8F ; Japanese BluRay of Valvrave -0xE938D52783E4644BEECBDDB297540E156C29899C = VAMPS | V | 0x8C3A021B4206DA1CEB3E0437808FFA39 -0x021300290533F660F867B232D5F5CA295D05861E = VampyrosLesbos_BD | V | 0x6E2042E2D400E1DCA45BA281265AA9B7 ; MKBrev 51 - FindVUK 0.56 -0xC56CF69822EF058F83355587111FA2FC54D452F3 = Van Wilder | V | 0xA2409E0E937B2F9FD1328E05E56EEA82 -0xA7D825003F32AC00C74F9BFEE8934F9B32F80831 = VANISHINGPOINT_F6 | V | 0x8047269C5F8DEEA75022F8D0E589F886 -0x6301AD502BF544B41CBE7FCFD911E35CD5A46799 = VANISHINGPOINT_US | V | 0xD0660D770AC5ECDDE529CCB22286BC5C -0x5FE9CD247E5F3863592B7CB253D909DCC3D802D0 = Vantage Point | V | 0x4B92689779678FD1F32E87905608C527 -0x30C123A51683756B52EC8A8BED9882D0F36F75EC = VANTAGE POINT | V | 0x31371A1B653ACA7041335B64BA35AAC5 -0x0EBD6B188BBF0904B43AE92BE22D35A63B8D9E83 = VANTAGE_POINT | V | 0xBB75D5CEFE0584FC354B401AA1E7FECC -0xBC69D99A46568CD4F068F199FC4D1D908DCABB58 = VANTAGE_POINT (Vantage Point - Blu-rayâ„¢) | V | 0x38993B7C849C090F5BCEC9A88CA64AE7 ; MKBv7/FindVUK 1.00 -0xE71DDFB769697BE6C80ECF5FBAA43ACFB22CA7C0 = VAN_HELSING | V | 0xE69848E77571E882CF7C5C4CEFFF4FFB -0x9CBD5C510DA0EDD836CE74AC38A52DF5CD1366A7 = VAN_HELSING | V | 0x686FD6833E7A0FD44AA079EEC4453ADD -0x196CE5F64AE0CA267198319617D1E44128229143 = VAN_HELSING_G51 | V | 0x6FBF5C4D262727C0CD47248BC8CAB069 -0xC4A0D9DD19B126355D7B1490D34E6DDCC3369EB8 = VAN_HELSING_G51 (Van Helsing) | V | 0x1FB68F23F76B8EE4CCC63FDAA13A296A ; MKBv12/FindVUK 0.96 -0x0AEE92F65A30E33DCF0760AD040EB49F9EA45F72 = Vares 3 | V | 0x445D68762562F121E4EEAD49386DF273 ; mkbv20 -0x4E55659B7D8FB2013788C00C5F0925F632F825BB = Vares 4 | V | 0x04A1C7C29E810230AEDC47EE49AAA5C2 ; mkbv23 -0x5317F1EF7EF92A32EB4CCAD4DB52E35DE3E3CB09 = Vares 5 | V | 0x15D2DBA1F1E55BF4720E32BC565E3EEB ; mkbv25 -0xF586A9984FC1CA050460641CA324A05F34D92668 = Vares 6 | V | 0xA419D6B48582E6D99A2990B0C0DBF52A ; mkbv30 -0x792075698F8893AB7265455E76295B1F48C35779 = Vares 7 | V | 0x22E3F5A1D10EAB41E68BA345362FCAC8 ; mkbv31 -0x6FE0FCF77DB32B878FC1BDD3FE22410A4C632D5E = Vares 8 | V | 0xC85A47D1D6BED6026A80D3483FCCCB86 ; mkbv31 -0x97DD6FFF2447EC9115D32FF776868E6988735A7F = Vares 9 | V | 0x0003D491CF7F5A32F712A08453BD32D2 ; mkbv51 -0x42F826EF29244D9DB73C5C7990333641B3C215D4 = VARSITYBLUES | V | 0xA4A227EBF3F8A7FF3BDD700B56208858 -0xD1DAF09C8143C8B6A7981380218318D34F557383 = Ved Verdens Ende | V | 0xF9C03B431691B6E57BCFDCDA1EB13882 -0x7E3B66DBCEBD9EFD33CB7CD1853130FF584DFC87 = Veep s1 d2 | V | 0x0BD379558117C163F5C4A7F650583E9F ; mkbv28 -0x2995987BB56FFC10DB9D27E335A471FE073A7770 = VEEP_S1_DISC1 (Veep Season 1 Disc 1) | V | 0x753738EB0D5D7688737B6E7AB1ED3019 ; MKBv35/FindVUK 0.96 -0x6CA684B71432E6B6226FDC70600ADBA0A0A2F5BE = VEEP_S1_DISC2 (Veep Season 1 Disc 2) | V | 0x4ECDDD9BD08C4D24A06227AA77D158C9 ; MKBv28/FindVUK 0.96 -0x5DFD1044FC59BDB3046375FAEF52C1735B1037C0 = VEEP_S4_DISC1 (Veep Season 4 Disc 1) | V | 0x4B05AC288FDDE7A4BE3CD137A72E467A ; MKBv57/FindVUK 0.96 -0x72C8355A271931715864101FFFA464B4087F8D9D = VEEP_S4_DISC2 (Veep Season 4 Disc 2) | V | 0xA8B69D1D3F7CBFA7B0CBD55A1DE41DDD ; MKBv57/FindVUK 0.96 -0x66E7A9F0DAC221BC902E64DF7E4D654F1EAD1EBB = VEGAS_VACATION_1997 (Vegas Vacation) | V | 0xF66C0C053B303DE651AD6ECFBCEB4DB5 ; MKBv35/FindVUK 1.00 -0xAC3A79C3AB99590E0B4133F6546F06667A6D0CF2 = VEIVISEREN (Veiviseren) | V | 0x3AD46079E166822CFE041D79A29F03D8 ; MKBv31/FindVUK 0.98 -0xF2559388237A516F3B8D26E3143B6E3808D6C352 = VENGEANCE | V | 0x0005FB657137344B8A3B9536435E218C -0x58DF5F2A281FA9AF315DAF82D6AE697F15A6D7A2 = VENGEANCE (Vengeance) | V | 0xE71EC890BF252F2A4964F2D942395964 ; MKBv17/FindVUK 0.84 -0x1435E004117165167574B149AC798EAAE5654490 = VENGEANCE_IS_MINE | V | 0x9D58483B395579BA4B8E5F1A508FCA26 ; MKBrev 47 - FindVUK 0.54 -0x3E335030FB9CBEA1CFEA88250EB96E473200D47F = VENUS_IN_FUR (Venus In Fur) | V | 0x16C80F21AE6AC9FC13DF8807480646D9 ; MKBv47/FindVUK 0.98 -0xDAA802616214AF6DE8E729C106F2C23D89688088 = VERBLENDUNG | V | 0xD89935982D39A5E11A5C65B5D07874FB -0xCF42732B2DB2259EB7EB2B01CFBEDFEA4F5A1F8A = Verborgene Welten 3D (Verborgene Welten | V | 0x0B72EB02494144AEE352C46C361FBBE7 ; MKBv44/FindVUK 0.92 -0x0BB44ED5485CBCBFC3CCC5F59D0ADDCE99773FF5 = VERDAMMNIS | V | 0x9500FC8171C694017FC43946099D24C3 ; MKBv17/FindVUK 0.92 -0x2F62F13CC3BBDCCA377D2E8E8383ED793F184680 = VERFLUCHT VERDAMMT HALLELUJA (VERFLUCHT, | V | 0xB938B41908070876C717FF594A9839A2 ; MKBv39/FindVUK 1.02 -0x43F326B49C4A2BCB1ED9818CBAE3AE60E3E6588D = VERGEBUNG | V | 0x55AAC778299FA74E60DA4D920981000D ; MKBv17/FindVUK 0.92 -0xC1C2076093E34953932D0532BA51569581D0DA70 = VERMESSUNG DER WELT (Die Vermessung der | V | 0x720623AAC3DD2FE5C50C299A9139E7BE ; MKBv33/FindVUK 0.96 -0x9E5D8D567AEAAAE290B6C9348029938072372473 = VERMESSUNG_DER_WELT (Die Vermessung der | V | 0x4A59322AF719FFB0BDE961F700632B08 ; MKBv33/FindVUK 0.96 -0x97ECF736E53DEFDA17FBC61BC29A0D9160B3B444 = VERMESSUNG_DER_WELT_BONUS (Die Vermessun | V | 0xCC4F78D0B964EE2A036DEEE5C380505C ; MKBv33/FindVUK 0.96 -0x91E9FDBAEB4BE87FA85B05949CFE8C1418804B52 = VERONICA MARS MOVIE | V | 0x0B28E3482B82C06E8ADC9F7EF04CB2B9 ; MKBv35/FindVUK 0.80 -0x1E7AD3AC8EEEFF2EE31D5E8098AD1C2C6B52D474 = VERONICA MARS MOVIE (Veronica Mars Movie | V | 0x15C4DE7B350311325274F3C8EDF89180 ; MKBv36/FindVUK 0.96 -0x6980AC579478E5A73A635ED911315A9C304C8A5B = VERONIKA_BD | V | 0x52667AA7B56AC9E2731E741A8FB1FDBD ; MKBv19/FindVUK 0.80 -0x284211E88678295F4F415358BA3BCBBAD41BB7A8 = Versailles S01 | V | 0xB5176D9AE7A00639311CDB97F8B44F37 ; Disc 1 -0xF8530FF44B8D0434659A6B3A027CED3B68BBBC96 = VERSUS | V | 0x453FF037649C2F6830B7380F17F441CE -0xE3A234C5047CDE5C72DA5636E3E47CAA84F14201 = VERTICAL_LIMIT | V | 0x8C68BD1DC6C656B44D7C970154B2745D ; MKBv3/FindVUK 0.80 -0xECC6675593DAEA9A01030F7ED4FA4522933E2E02 = VERTICAL_LIMIT | V | 0x484C776ED28466F0EE7E2A720DD69FAA -0x750C20AD6621CF480E233F20A38F305D0A6E37F0 = VERTIGO | V | 0x5139E8BB4FB5FA6C0E85BF4F54FF5AB5 -0xF35CA81C2D56BA78F2D08A6EEDE98D5516745C91 = VERTIGO_G51 (Vertigo) | V | 0xC2549B4B1BB2E492F95B767A3D497EFD ; MKBv31/FindVUK 1.00 -0x809178024C8708D24675AAE8D70A69AF46F38C9A = VERTIGO_G51 (Vertigo) | V | 0x1C7159CA3175622D7312956EBE566CAB ; MKBv31/FindVUK 0.96 -0x48B2D12B3137DE6B75A083014CECE3DB71786C90 = VERTIGO_G51 (Vertigo) | V | 0xE065901222EDC4AF42DCEC9D57FF58F9 ; MKBv31/FindVUK 0.94 -0xD26BAFD5A14D492AA10331DA770D68B0BF9C8FA6 = VERTIGO_NA (Vertigo) | V | 0x6B1B9C11801896F54B7873AE1A514DC0 ; MKBv28/FindVUK 0.96 -0xE9179D9B7CE6F7594C5F7965F742786602498A56 = VEXILLE | V | 0xBE2B748AF90671EAABD3FF0CE1158FF5 -0x08258A78D56CC7676F04E93258F9FBB760AB3826 = VEXILLE | V | 0x926F5990DE0C353075687DB496122B5D -0x25D6BCDF601D6E429BC1B5B1E31F46E0FF8EE27B = VHS (V/H/S - Blu-ray???) | V | 0xBB9D72F64ACE80498D0B215BB9E3904E ; MKBv35/FindVUK 0.96 -0x84B4D70D770E15E8A9C73D7C223531376E9A1273 = VIAGGIO A TOKYO (Viaggio a Tokyo) | V | 0xDA058636606513DC2302A26F9A4D3255 ; MKBv57/FindVUK 0.89 -0xE0D7AF741040DA8A562A4845CB8F9E736CB86F38 = Vicky Barcelona | V | 0x5AC42CE234CB7EC53199FEBDD703D05A -0x7D50C56C47DB74E4EA11C416FBF35B65F0DDA326 = VICKY CHRISTINA | V | 0x8D6EC8C58D7E7007F79DAFCF30F1FCE2 ; MKBv12/FindVUK 0.99 -0x6A07CFA8AA80DFF6D08E1B3A59E6E6D170126F69 = Vicky Cristina Barcelona | V | 0xB4F7D85F66F975B5ABD478D09B33D7E8 -0xEAE693A9334BAA7083DFB449AF6E8A65517882DE = VICKY CRISTINA BARCELONA | V | 0x6C38CFC44E5182AEA0CCB65EBB89454E -0x503067167531F096DFA9607294368842828A69CB = VICKYCRISTINABARCELON | V | 0x4DF684CB458DA2B2E717CBD37C4AA67D -0xE64CF8166BE7CCEAFE49F555F44524F090D58875 = VICKYCRISTINABARCELON | V | 0x407607BBE43A48976564403E804B68BA -0x57FB3107A153D245046DD8EBB6EF4BE0DF165348 = VICKYCRISTINABARCELONA (VICKY CRISTINA B | V | 0x3E2D5A3A12CA409BA28704B6194BC7F3 ; MKBv10/FindVUK 0.96 -0x1F4D054AE3091C47BDF39891383F37ABBF9BBA3F = Victor Frankenstein (Victor Frankenstein | V | 0xABD7EFFE559FF4ED207885AA843D2D2B ; MKBv46/BD+/BEE/FindVUK 0.98 -0x4098A61ADBC33AEDB1BE01B4F3B0546A5790DFD4 = Victor Young Perez - FIN_NOR_SWE (Victor | V | 0x31644354003DCD938F5443814C37EFD2 ; MKBv52/FindVUK 0.98 -0x1017CE16C044BC377DA4DCA340E9279DE1097614 = VICTORYGUNDAMPT1BD1 (Victory Gundam PT1 | V | 0x9EDAFE315A5D1FF0D44BCD25AF3406A2 ; MKBv62/FindVUK 0.99 -0xF17BF7C1055DAE98981E0D5016974787D1EF8431 = VICTORYGUNDAMPT1BD2 (Victory Gundam PT1 | V | 0xA85F5814712C8A4D79D073131A0B8537 ; MKBv62/FindVUK 0.99 -0x26E3103A27C54D9811C548167426DB2BD5027E25 = VICTORYGUNDAMPT1BD3 (Victory Gundam PT1 | V | 0x5E7D36A308781545C7C7531E85D8D5D8 ; MKBv62/FindVUK 0.99 -0x3D8998F2C58CFECC553B59C16BF4FD3D3EAB667D = VIDOCQ3D | V | 0x8F8C4F0F4764BE263E9C8A9F0E2A44B5 ; MKBv25/FindVUK 0.80 -0x36B7CCDDF8669111D96680CF1BD80E952365162F = VIEL LAERM UM NICHTS | V | 0x217C40863D662D664A4A6F2A05A4D521 ; MKBv32/FindVUK 0.80 -0xC37407B15899C78269A990F409C5FD5444FE09B7 = Vier Faeuste fuer ein Halleluja (Vier Fa | V | 0xCD1078E517C9A010A4DBB6B346C80F22 ; MKBv35/FindVUK 0.96 -0x2C2F4E10DC2FE727FB8F9F7C16548A1EA9A1FA58 = Vier Faeuste fuer ein Halleluja (Vier Fa | V | 0x7AEC7F40CE2EC955CD40AA80E1C004FE ; MKBv35/FindVUK 0.99 -0x25B0A75AB5CE15FAB01F74FC7E82A3B6271A711D = Vier Faeuste gegen Rio (Vier Faeuste geg | V | 0xBD5472B43C405C876A66B853CF75A586 ; MKBv35/FindVUK 0.92 -0x44C9C0B215E7B31C21368FF9D058FD8C7E40A1C9 = Vier Faeuste gegen Rio (Vier Faeuste geg | V | 0x29E3C9B7CEA36BF1EA1C04318FB41513 ; MKBv35/FindVUK 0.84 -0x8DB5B3909A4A30D9A19079B5F0A848200896DB5C = VIERFAEUSTE | V | 0x741A4254768BBF6495D22274770D38DE -0x31CE1B0274880B340C166C11674AA30AD40AB5A2 = VIERFAEUSTE [Vier Faueste fuer ein Halle | V | 0x38B1D3708D3081D7E7A2BCD161569FC3 ; MKBv9/FindVUK 1.00 -0x1ECBB766A3CD1820140C7A2BB89E780497EA59DF = VIERNES DE ANIMAS (VIERNES DE ANIMAS) | V | 0x6129CE6F339AC87F30B7FFFD49FF6141 ; MKBv30/FindVUK 1.00 -0x366D6B741EBDADC9A675D208A13B732384B87E33 = Vikings Season 1 Disc 1 (Vikings – Seaso | V | 0x2B29856B01275613C28107974328CFFD ; MKBv46/BD+/BEE/FindVUK 1.02 -0x38E99FFD1E85286D79D539980C71171F1B30A1F2 = VIKINGS SEASON 1 DISC 1 (Vikings Season | V | 0xCBF3CFB3693BE6BEBCEB341948E3DB27 ; MKBv47/FindVUK 1.00 -0x30DE0A57A0D8D9653DB680FC51F88ECAEE2F8850 = Vikings Season 1 Disc 1 (Vikings – Seaso | V | 0x9AF8E20BCD2D5E68C45BB5163003C598 ; MKBv31/BD+/BEE/FindVUK 1.00 -0xF2C959D60F62D54DF8A29CF7948E9612551F2AF6 = Vikings Season 1 Disc 2 (Vikings – Seaso | V | 0xD141D29C1597A9720E9BDF155A3DF390 ; MKBv47/BD+/BEE/FindVUK 1.02 -0x238B1CCB3836DD6021E4D4288DFA7FE7A2617AC3 = VIKINGS SEASON 1 DISC 2 (Vikings Season | V | 0x8A7F242F6A2019783B7DD81D7F44DECD ; MKBv47/FindVUK 1.00 -0x74527B1727D5E06382EEA1529774B6E9643B12B0 = Vikings Season 1 Disc 2 (Vikings – Seaso | V | 0xC4263ADCF6D71B3A44CB5B1025AAA0F7 ; MKBv31/BD+/BEE/FindVUK 1.00 -0x7CA98D0E367AA56377B27D369AA79531479577C8 = Vikings Season 1 Disc 3 (Vikings – Seaso | V | 0x6867F06DE769C7359F7243DDDCEB07BF ; MKBv46/BD+/BEE/FindVUK 1.02 -0xD5E5BEFCF4F670947FFA4350A1FF6FCF018C2DEE = VIKINGS SEASON 1 DISC 3 (Vikings Season | V | 0x0CF2CC67B94B9D64D931A61D29669318 ; MKBv47/FindVUK 1.00 -0x4FD5C1FA7E7494575277FECF6B256A02CC9443C8 = Vikings Season 1 Disc 3 (Vikings – Seaso | V | 0x709A7464619F2ADB7A71483FBF4E4AB6 ; MKBv35/BD+/BEE/FindVUK 1.00 -0xA812C400605D123A1C708304E8E0CAA9E7980738 = VIKINGS SEASON 2 DISC 1 (Vikings Season | V | 0xEDA73E9230ABE5560411BE5B6BF56ED2 ; MKBv57/FindVUK 1.00 -0x45EA670F9DD7C3533F259103130C64D53D66C5B8 = Vikings Season 2 Disc 1 (Vikings – Seaso | V | 0xF59B7DF4B54FF85D2AB34F9034B349FF ; MKBv39/BD+/BEE/FindVUK 1.00 -0x56CF71970BEE293150C1818ADA37CC20F46378BD = VIKINGS SEASON 2 DISC 2 (Vikings Season | V | 0x27AFD19E1741989C9AEC8C1FE2F4CAA7 ; MKBv57/FindVUK 1.00 -0xC4F1E0E7C0AAD3D8E241F2199863A9415384CDE7 = Vikings Season 2 Disc 2 (Vikings – Seaso | V | 0xBC82E8DC4DD0A9FF0B13E21590FCB980 ; MKBv47/BD+/BEE/FindVUK 1.00 -0xECE27A7C415EDBBD2F37D4BBC19A3CC65048E611 = VIKINGS SEASON 2 DISC 3 (Vikings Season | V | 0x73D9925FA65DB8E6D6F6FE183CA24D31 ; MKBv57/FindVUK 1.00 -0xCF43A007A636BE8D53BE0DF74BAB0C2EF0A9C9D8 = Vikings Season 2 Disc 3 (Vikings – Seaso | V | 0x45639F7A8859F200467749EAD33294E4 ; MKBv39/BD+/BEE/FindVUK 1.00 -0x86EDEA3E28F58A95886BADB7EB06173A805D6919 = Vikings Season 3 Disc 1 (Vikings – Seaso | V | 0x42179658723AB6FC602F6DE7022D7690 ; MKBv47/BD+/BEE/FindVUK 1.00 -0x9A7B3C82E9371610E5E716E739AEF434CB5A90A9 = VIKINGS SEASON 3 DISC 2 (Vikings Season | V | 0x121B1E4B81587591A91A838AE2F8AB8C ; MKBv58/FindVUK 1.00 -0xC5239F5C58CE792BC5A4EC2D23823AB8AC2CB467 = Vikings Season 3 Disc 2 (Vikings – Seaso | V | 0x45F7636B62ADC30D8992033FEC626BFF ; MKBv50/BD+/BEE/FindVUK 1.00 -0x58725B7DF0D19F76409CA0616B10E83C0A9ECAE1 = VIKINGS SEASON 3 DISC 3 (Vikings Season | V | 0xCA8972E3906416B709B790FF69EB9E7F ; MKBv58/FindVUK 1.00 -0xBD58F196200B6C4FBC52862833BF1A39AA667BF6 = Vikings Season 3 Disc 3 (Vikings – Seaso | V | 0x6F523A209047972C1515289910109126 ; MKBv47/BD+/BEE/FindVUK 1.00 -0x1A955661184E4061370B0969850046415CDC54BE = Vikings Season 4 Vol 1 Disc 2 (Vikings – | V | 0x0FAD26243E73243EB9552DCE1853EFE9 ; MKBv50/BD+/BEE/FindVUK 1.00 -0xF8B088DFE62B10CF3017674B762D65B19DDAB81E = Vikings Season 4 Vol 1 Disc 3 (Vikings – | V | 0x42A57E64F2F05EF3C21DB46245ACC481 ; MKBv50/BD+/BEE/FindVUK 1.00 -0x4089F8BEA70BFBF604AF1E839A1B16CE6895A651 = Vikings Season 4 Vol 1 Disc1 (Vikings – | V | 0x1639CE10C91F7CC228950B52F4D0CDC5 ; MKBv56/BD+/BEE/FindVUK 1.00 -0x57D01D6BDAC33B4AFBBF1F6F70556656BCDDCA34 = VIKINGS SEASONS 3 DISC 1 (Vikings Season | V | 0x25874227B060582CE27576F7543B7706 ; MKBv58/FindVUK 1.00 -0x62CA13DBADD31BD91600D06033255A03B728F271 = Violet and Daisy | V | 0x7A63C59795A8A3652EE8F504C5DCAB66 ; MKBv40/FindVUK 0.80 -0xAB63B02ADB71309CF90BBF1F60D68E7431C11A45 = VIRTUAL_DRUG_ALTOVISION | V | 0xD0A13E052EAFE44CAEF849B0280817A0 -0x67E6803892D402DA287D6144037AE0B19BECA50F = VIRTUAL_TRIP_GONTITI | V | 0x8284934CE3DAA488E8296587FEEA6F67 -0x7557CDF4BB030F233433B4986B29A35587D0368C = VIRTUAL_TRIP_GUILIN | V | 0x98D58252D9CA5EDE2741CFEC942408E8 -0xA65E931A948808286820CFF7A0F8B6DF423632BD = VIRTUAL_TRIP_MALDIVES | V | 0x81F14EF53DBAD0874939516666C4EBB8 -0x251D78D1AC86F5CE7B960227FE00E8E49C2B008A = VIRTUAL_TRIP_MALDIVES | V | 0x3C95A710177CED39C4CFE775FB28D42B -0x2C00E0206F76DE26D7339D1B4661BA0169107D69 = VIRTUAL_TRIP_SHIBUYA | V | 0x02E9E04FE4FDDB8A80B373488BFE6F43 -0x45966091810692202A0A53A223EF70F31806624E = VIRTUAL_TRIP_YAKUSHIMA | V | 0xDCAD89A775BBA8B22FC34BCF6DB62CFA -0x8AB4AB5C2AC265A45B20AB82CFE3AA39DA93F118 = VIRTUOSITY (Virtuosity) | V | 0x82DC57657695C4DD09F77A53D81DF1C5 ; MKBv36/FindVUK 0.91 -0x786E776C6DF6A07213834F4D5BDC69C80CD06441 = Visions Of The Sea Explorations | V | 0x760B539A3BBBDC8AA8B293FC50A027C5 -0x09536035A1E89EE1EABE0CAB686E778EFE9F3524 = VIVRA_SA_VIE | V | 0x63EFB81E554406C9A3C8E6C362FFCE77 -0x99732D6B8F090B5BB53DA38F9798E1EAD46D738F = VIXL_200 | V | 0x055F4A5090AE83AE4B10398CE9DFF9E9 -0xD02B2A335FEC6EBD257A8783835FDD4168EF6E28 = VOELLIG_VON_DER_WOLLE_2D | V | 0x291825AEAE44513D6B25E57F7B027635 ; MKBv62/FindVUK 1.00 -0x37BEBC768592F526F7246B68DE2DD425E68C2915 = VOLUME_ID | V | 0x370D8DCE0F89C88828E008C42E2A561C ; MKBv3/FindVUK 1.00 -0xCCD370934B0B2ACC26D5AF8857CB8CB59AB706E8 = VOLUME_ID | V | 0x2A26AD68C72EEFB2BCD1BCECBF8AAD52 -0x7D59850144E22A3C899CC6BAE1C74DBE3DE75898 = VOLUME_ID | V | 0x8B9FFF8C8A9E339D5F5F0D88F282CB95 -0x21F82CD13D3A240CE10941228B926D7EC2184FDE = VOLUME_ID | V | 0x24747D48F52B9BD0D712A0D6BFF61FA4 -0x9196904EF2A70CF38756C77588EC0CE2B0816F6E = VOLUME_ID | V | 0x59C2DB9C6E6AFB7D40D290CF2AC0DC94 -0xA4D6703AB698CBF49A44D9DA5AF3B66B741E142E = VOLUME_ID | V | 0xA319CA9A2CC789B94C9E3FC88FB4F397 ; MKBv3/FindVUK 0.99 -0x1089C6DC584F111CD557C9638333E77749070E20 = VOLUME_ID | V | 0x92607E13EDD671F9685C9AD62DE7068A -0xE4AD5366A979B87A4DCDD01CA371F73A3B9721FD = VOLUME_ID | V | 0xA6FC3FDBF56CC70B09A1EBAFB9612CB6 -0x2129F2DD83C6596792CF2347E1E7B60884E0F399 = VOLUME_ID | V | 0x7E4D619E9ED0B005238254835D887AAB -0x1DD83C57B15F09426FF8F8B3F681E27547B0D79A = VOLUME_ID | V | 0x851880BCDF3B679E27EAF4A468417A92 -0x00D88CB4AE1454F225F1AEB945627F7288469122 = VOLUME_ID | V | 0xE6F406D57FD527D4F3E079C760C28453 -0xB6DA53AE45B0F9E3C0099D1BC0DF734219782B9B = VOLUME_ID | V | 0x15E4CD1992F2F0F765AAC0DF2AD3FCDA -0xC246754CBBF74AAC56350FBF52A6485F58A93F60 = VOLUME_ID | V | 0x6A9756B876FA57F0C2FE2C417AB0DD08 -0xA706FA55C295BE2BF848A7E4CE55C3DB9B94AF83 = VOLUME_ID | V | 0x0A88891E805144A9FA57B6FB1926E09D -0x5E7CA8B7DF4BF98A12D3FB99091E583D8D29A325 = VOLUME_ID | V | 0x5E2717A0E8ADF920E3D6DB2AB38B1C20 -0x81421FAA6545B8496C9DAC1DFBEDD55143947390 = VOLUME_ID | V | 0x07B790B229A26CFD9FB69BDCCC26B53F -0x9CF91E9FC51023222255AD7ED85A23D8E0D03A66 = VOLUME_ID | V | 0xD51250A4C98542CE075323FEA33C932A -0xF810206FB9B8542F763E291F663F7647DEBD400D = VOLUME_ID | V | 0x1F619B793830545152141ECE24F33A19 ; MKBrev 7 - FindVUK 0.57 -0xAA402824EA7ED715E0AEEBF1441BD3CD52205D59 = VOLUME_ID | V | 0x4E77D67095369554B2712309D34E647E ; MKBv3/FindVUK 0.80 -0x32F62E91260EBDD9C838DA931FB832E20A40BA49 = VOLUME_ID | V | 0x832BEFD611C868D99C93FBC4E80D0427 ; MKBv3/FindVUK 0.80 -0x1A89919EBA129F10956E1EF8D64ACDEE03EB3592 = VOLUME_ID | V | 0x0938D451058FC78552088C1BAD54F969 -0x66CFFA5A3AE2CB867593159D766F8F764B08A312 = VOLUME_ID | V | 0x01276CED5341134C39571425DEB9A313 -0x74E6F45498BAE0D69EF3A4576B9EF40C668269B7 = VOLUME_ID | V | 0x79C983DA7ADA93E86842C2EE95D6F064 ; MKBv4/FindVUK 1.02 -0x45EDCB8B64F9D89DD3DB478AFF127BAB07C7E91B = VOLUME_ID | V | 0x469340D6FE0E781AEAA94D40BA4A743F ; MKBv3/FindVUK 0.98 -0xAEC1182E7AF3F9A142D4C5653B20FCFD3CC1F2EB = VOLUME_ID | V | 0xFD18E7C6E891AC09601AEB47739E7FFA ; MKBv3/FindVUK 0.96 -0x917AAD0E59BE80D5F7BA62FC3897376402AE6072 = VOLUME_ID (Anger Management - Blu-rayâ„¢) | V | 0x1E09B7F68406564404F775D970B8B5AB ; MKBv4/FindVUK 1.00 -0x058C30A02C2EADDD13245DD0F6944A9B2A5AD516 = VOLUME_ID (First Knight - Blu-rayâ„¢) | V | 0xB0A13DB0F438D5AEC41A0305740E98D8 ; MKBv4/FindVUK 1.00 -0x3D3107ADBC3DD9AF35E59996F27DE282038A9043 = VOLUME_ID (International, The (2009) - B | V | 0xC983B9E4307B683E63BF0F73FFB1B490 ; MKBv12/FindVUK 1.00 -0x055B2D573AD63E50838F4BD03049D701FD1C1CC2 = VOLUME_ID (International, The (2009) - B | V | 0x94A370D5E91BFBA8F8A9213BCBB9EC8C ; MKBv12/FindVUK 1.00 -0x2B5152B31C17A04744446B5A6A43697C3C86377A = VOLUME_ID (Lakeview Terrace - Blu-rayâ„¢) | V | 0x7D3D2BCBA0C96E33C37A231C165557F8 ; MKBv10/FindVUK 1.00 -0x349D3C4A0A146C1733DE45E3AA92C8D9131BE9D6 = VOLUME_ID (Pink Panther, The (2006) - Bl | V | 0xB9A53825AA0140A55F0AB122D9A78B26 ; MKBv10/FindVUK 1.00 -0x3A7AB827EC8F3B522E6DD1199FEB587033157CEA = VOLUME_ID (The Thirteenth Floor - Blu-ra | V | 0x37716CA51822BA1FFED565D2C6EA66B0 ; MKBv10/FindVUK 1.00 -0x55BFD051D1F82CBB6776463B6D70091247BA615D = VOLUME_ID (V For Vendetta) | V | 0x20B591884DA89CDF215164496D03CD96 ; MKBv7/FindVUK 0.96 -0xB144C5ED42EF3E430B2C499488660A9FC1367C4E = VOLUME_ID (V For Vendetta) | V | 0x11F2CF9139411E14E2E3CEC4B8CD25AA ; MKBv7/FindVUK 0.96 -0xD1517246F3C1D900ECFF5F07FD2C2E07E7599145 = VOLUME_ID (V For Vendetta) | V | 0x6F89203F0D2C59227373F39CDD2F6F37 ; MKBv7/FindVUK 0.96 -0x158B745DF8868121910285684DCEA6A18C175D68 = VOLUME_ID (V For Vendetta) | V | 0x83E1E561333C2CE305C0A6DDEBBD1D92 ; MKBv7/FindVUK 1.02 -0xA35EE4772E4CB2F0EBB70AC4948091CDD5EBAA5E = VOLUME_ID [Blood Diamond] | V | 0x255172D456D8435FC4927AB81AEA594A ; MKBv3/FindVUK 0.86.3 -0x2056388C899F82A30EAB6F2F4CD1EC1F9750F348 = Volver | V | 0xF969D7BACEB49FBB740313F872335634 -0x34BAAE2D67A35C043740FAE5FFC593A3E22F6CB5 = VOLVER (Volver) | V | 0xF6946B3C5F7DE48AB405189C4BE0AEB9 ; MKBv19/FindVUK 0.98 -0xBF402D42740CDD7179083729C32212B472F0BBBC = VON_RYANS_EXPRESS (Von Ryan s Express) | V | 0x546EC4A0786DEE38028FA72C3847D5EF ; MKBv20/BD+/FindVUK 0.96 -0x9A5DEED2A1CC9AD33B7AA87C5AF2D5045AA40E93 = VOR DER MORGENROETE (Vor der Morgenroete | V | 0xC09114B020A8B535945868048AFC12F1 ; MKBv62/FindVUK 0.96 -0x183DFDE2F67FCAEAC4BF2F842DC234642297B452 = VOTOMS_PF_MOVIE | V | 0x474291677A07FC0735A6F48BA6504F8D -0xCDE5F0927A1753EBF9F9304C6887362BBED63A19 = VOUS_ALLEZ_RENCONTRER | V | 0xC3549AC90DDB55A7100A3260443B2962 -0xCBB93A6B0C7A1AD0FD269803CB10F321B0525881 = VOYAGE_SOUS_LES_MERS | V | 0x08E5303FA8896CFEE0E779BF837F56B4 -0xA003637A3AA902D6F51F3AEA5EF6A43D66DE1880 = VS054 | V | 0x5601519FDD76BA4C2F44D7394340DD44 ; MKBv47/FindVUK 0.84 -0x25B64DFA0D1C7C5867A9E9B101EF9660E7124FCC = VS062LTD [SexWorld] | V | 0x86163E994F3B2A5FFE4A93997A4CE6EE ; MKBv47/FindVUK 0.91 -0x183F514E20FAB2C6D55F6BBBA773565422D27DD5 = VS103A | V | 0x10A67B9CAF511A59DF015F9A799EC348 ; MKBv57/FindVUK 0.92 -0x8A9741581C64B70E2AD7B5D7F035898E24155F41 = VS103B | V | 0x9B2BAFF26E22CB5607550E2D9C231E1C ; MKBv57/FindVUK 0.92 -0x626EA2240078DAF2953EADE62C4463025E08FC87 = VTXY_45 | V | 0x403AF4904F31ECED571C222598043438 ; MKBv57/FindVUK 0.92 -0x3C076DB6C09F2AAF6F1FDE1DAE43D03D090A574D = VT_GREAT_BARRIER_REEF | V | 0x9CFE7DE2DCC44056E96F1D0A1AF0D495 -0x926CE0EA08ED878C5C2AC4598EE7CBF1E43B3DBB = VT_SAKURA_NOSTALGIA | V | 0xFFB5BB169E5E4C596075EFA209FA3AD3 -0xE0F36BBC08EF74F77256A0C2442688FACC0802E7 = VT_TOKYO_DAYLIGHT_FROM_THE_AIR | V | 0x53A936A7AA23F71A12048D772F3AC618 -0x8692BAE6C6092E326DD97FC41BAA824FB1D9AFE3 = VT_TOKYO_DRIVING_VIEW | V | 0xF151578FC8250336EDEB9B5151AA6413 -0x70D3850E1B0A6D841C549C7D2931822E08035C4A = VT_TOKYO_TWILIGHT_FROM_THE_AIR | V | 0xDE721DCDA4363DB9B1D2022C99A2B359 -0x5C1227468CE65D8269F7CE3CD1FF20CDCCC08BF4 = VULKANE (Vulkane in der Tiefsee) | V | 0x60B02F2B5178FA6A403C92266A714B43 ; MKBv16/FindVUK 0.96 -0xD9D138144D94524C3E83481D3BB674C6BBEFDE72 = VWBS_1078 | V | 0x9E93A055F3DEB4D438669167AAE0C9BA -0x0B0D0C9AA8E514A1B795EDBF51A4414018B54E0F = VYBIJENA (Vybíjená) | V | 0x06A82966C3847BC872C48C725017178D ; MKBv54/FindVUK 0.98 -0xEFB7A69854F90F27F7F96C8ADF77BEFE336866FC = V_FOR_VENDETTA (V FOR VENDETTA) | V | 0x4DEDF91B6B3604A33823D6E3C43D8BFD ; MKBv9/FindVUK 1.00 -0x02B5E3954C140ABA43426E8395E46DF67C47B69B = W | V | 0xDBBF2482178C290EB4160C0A022BB5FC -0x423062782295AB30110DEF762B7748B4F169DFA3 = W | V | 0xD98494360D3F7DA65EE2464BF9911E54 -0x8EE225D5362D0741584D3D3E78D2FB84A3C42579 = W (W. - Blu-ray???) | V | 0xEA45FD04EACAB63B086E7AB9F221F7AF ; MKBv10/FindVUK 0.96 -0x25F7D8050CEBF707901565D131FB4E1E5D4E64BC = W0xB0905_1 | V | 0x7B79465A3F1DF55A53AD663D834F4C23 -0xE729E9E7151893256978D7C5B7ED26B0FA7AF140 = W0xB1003_1 | V | 0xD5CB9BDE37D5962CA134EE77722D7766 -0x4D9823A6D339F2E324D1D749C5121BF40152FBBC = WAHRE MAENNER | V | 0x1775323F34D129AE37E35944C1FB99FB ; MKBv35/FindVUK 0.80 -0xC4386129AA93437FB17BE187176EAE0782B95182 = WAISENHAUS_BD (Das Waisenhaus) | V | 0x1B5152B3A57F2BFA6604934EE7CCD533 ; MKBv3/FindVUK 1.02 -0xB795FA9D294042F2685E38A0149E64113DAA9C5C = WAITING | V | 0xBDADD9E05648E95B4332FE6307496D47 -0x4761DEA3C72EF906729D1D5C68BC81B7D4136B8A = WALDBUHNE_2006 | V | 0xF74D5167525C71D324C8FE3F1C904001 -0x6627BD91D9DFEF6FDE3865ED8962C23735475C58 = Walk the Line | V | 0xAA52A36128B6BB34FDE8C50941A2C062 -0xC0FE8EE7128F1BCFC80E6BA3008B6CB5451EABDF = WALKABOUT | V | 0x3D26E4F76D4F1339EDD00F6E523E92DC -0x95D4A5492548F8EDB19C95AE76B4817B94E129B1 = Walking Dead S1 D1 | V | 0x8403FACBAFAF2DA3EFD3ADD3447F10B9 -0xEFE379DB8467ED9727E95C079C1E6AD19A3E4ED0 = Walking Dead S1 D1 | V | 0x8403FACBAFAF2DA3EFD3ADD3447F10B9 -0xBC9F9AFAC1AEFD57736F5D3598ECAF4143CD9C9F = Walking Dead S1 D2 | V | 0x8B365829781CD8720805AD4353EDCCDD -0xEC16385894D90288CB705397DFB9FB50764B2B68 = Walking with Dinosaurs | V | 0x1B6D1BC543C9D5887A6559D7885917DF ; MKBv36/BD+/BEE/VUKNOTVAL!/FindVUK 0.80 -0xE9E40A1813B78A5BF47D56619CF25D962A4E24FA = WALKING_ON_SUNSHINE (Walking on Sunshine | V | 0xCD63487243D51B005CF344DC30B38C01 ; MKBv50/FindVUK 1.00 -0x8E987E5BD7FCEDA20F74574037886034F87BF9D7 = WALKING_TALL_F1 | V | 0x2EC60C3B0ECD86E1DDDBEE13152BED70 -0xD055298ECC2E7C5D7FA2223AD63695CC9FC976BB = WALKING_TALL_F2 | V | 0x803E9B1316EB4415C5EF5092B1CBA1EF ; MKBv9/BD+/FindVUK 1.02 -0x6D1CE09C437F402A9D0455EFD0806211836A7293 = WALKUERE | V | 0xF9A605B40213D54A1EB4F5035F834756 -0x6583FC112BFFC9A21D17B0CE16DEF85F03D1FDBC = WALKUERE | V | 0x49FD3D85BEF98522E7580A0C152D3746 -0xAF203968BB009E7DB41AA8EDB40391D32A9E185E = WALK_THE_LINE | V | 0x36DB0400BC8BC916AD08AA22FA615296 -0xB20C695AB7E9F48916463E3F9E631DA1EC7CE4F9 = WALK_THE_LINE_F1 | V | 0x5B570A9A9D9C242AB90B29383DD57174 -0x0CD5AC9FE5753B7912C42176ADCBC6D655357664 = WALK_THE_LINE_F4 | V | 0x0BE231B47C72CA1D9216D41D2164F4A6 -0x7284CD080B0633DC5DC67612D2092B3687FA94B5 = Wall Street | V | 0xF345B25DCB451A5884E3082E9057BCD8 -0x2E2246E48D314BD78D3E6A49D1A2030D7CB13FA1 = wall street | V | 0x7BE7A57EE3D341EE4ADF3A79B0DD6B79 -0x2105AA6BACA6AFC1A720A579168B7CEBBC24BEE2 = Wall.E | V | 0x383A40A427FC84CA7FBA9A27A4018120 -0xAE467DD837AD6EEC0581DC91436C90087905E04A = WALLACEANDGROMITWORLDOF (Wallace and Gro | V | 0x2DE6B5FA6DD68A5B1A9454843CDC0419 ; MKBv19/FindVUK 0.94 -0x48F0BA483C4043D0D95066C61CA0E5DA4FD5E3E0 = WALLACE_AND_GROMIT | V | 0xA2808F2CD3351DBF11FD483EC79FFFA0 -0x13B041F762066AB49814338EFF76BE11398D77D8 = WALLACE_AND_GROMIT (WALLACE AND GROMIT - | V | 0xD8AFCA931BC3692F0DBB497256BAACE6 ; MKBv15/FindVUK 1.00 -0xFF84962A3E4682D151BF8537104C095BDA97630A = WALLACE_GROMIT_2ENTERTAIN | V | 0xA13D7EC6E9B50344E81E5117AEB0F3EB ; MKBv28/FindVUK 0.98 -0xD2392770D6A36F292A8B75EB4C57955C03BC14A4 = WALLACE_UND_GROMIT_BD (Wallace und Gromi | V | 0x6A1FB727087039CA2D442D784727CEA8 ; MKBv19/FindVUK 0.96 -0xF8B8F9D568458099BC4171E41026A8851963DB9B = WALLE | V | 0x77D7FB77889BC63B894A03E13A5427AB -0xA56C898250D4B9E8F3CEB6AA2B133F750FC3EA87 = WALLEDIN_US_BD | V | 0xC5FC78647894B038E50A08B028843786 -0x03399F7F0BA6C2FA12DE2204974729F9A09F913F = WALLSTREET | V | 0xDF0CD4B880E452CF2AC9881B72567D51 -0x40EA5CCE43E305B7D91BA08D0692798D5C6C403E = WALL_STREET_2 (Wall Street: Money Never | V | 0x948C5C1FC6E8DBDDB483E8DDD5C3FF9A ; MKBv19/BD+/FindVUK 1.00 -0x759BE8DD378DA5CFABEFFDE04A6D1B47F1CEB466 = WALL_STREET_2 (Wall Street: Money Never | V | 0x478143774219DF85CB749C812A82989B ; MKBv19/BD+/FindVUK 0.96 -0xA170B74B07FF66229BFCC1AFB17764A09F98F194 = WALL_STREET_2 (Wall Street: Money Never | V | 0x46D2FC16932A1800324A110B39314B5B ; MKBv19/BD+/FindVUK 0.99 -0xC26727726765D327DFFAA7EDBDE7ABFB509B898E = WALL_STREET_F1 | V | 0x14E0089E6CA5B4CB5A2E25BD868D8ED4 ; MKBv4/FindVUK 1.00 -0x5057ED631A1E9BD0DD456255B139FEEAFF7374D5 = WALTZWITHBASHIR | V | 0x3BFA399C4B22C5C119302F8B46CB6B5B ; MKBv12/FindVUK 0.83 -0xFC01617D2F8A642532A68379F534BACC96DC7ECE = WALTZ_WITH_BASHIR | V | 0x0DB0412B42B0307739070D97CD15E02F -0x30E7907542F9DC49268E34288A5276E2919882A2 = WALT_DISNEY_ANIMATION_SHORTS (Walt Disne | V | 0x5554870CAFACE426458A100F5572D31F ; MKBv46/FindVUK 0.91 -0x4B2E75592F638C2CCE90427431859D734BA46FA1 = WANGAN_MIDNIGHT_THE_MOVIE | V | 0xCFA1AF870AD4F4A7B51EA7D15678C64D -0x49E41A0062FDA541A697FAF4A5F09B6693C4D2C6 = WANTED | V | 0x7638329A8B858D360004D41DAB2FE3EC -0xD0DB10D5E569DF3D4C49C29524EBD192A776C0B7 = Wanted | V | 0x96BA50CC93946D1A63F34F161A9FCD00 -0xDEBA3F2C04DA1E18F8A6C9B8CF3D9307BF870320 = Wanted | V | 0x756B14229519955A2C636387EF8E5BF1 -0x9D4ECF3D6F3E8B84CBE2834649E8F483097E8C1F = Wanted (US) | V | 0xF64C513B790401CFA7BC740B380119C0 -0x5F2DF65319D5F65B68ACA67A7AB83883399B95AC = WANTED (Wanted) | V | 0x3141BC7DF49A0AFB354220D317E9E56A ; MKBv8/FindVUK 0.96 -0xBF6CE6D273C61562384A21C3A4DA0FA75A42B80F = WANTED_G51 | V | 0xB223A227EFA6173E2BF30B2A495E1542 -0xA520BFF085CBF7191890B0AC25D30BCB5C941807 = WANTED_G51 | V | 0x9144AC4BC0E2C6734B392357EA89042C -0x0BA1D9F26DD62AE515DC110DA7571C23C09B8F2C = WAR | V | 0x028A25F7066BB8D732998F700B44DBAA ; MKBv4/FindVUK 0.84 -0xED120BF731E553B74A55848B661A3D819E279B40 = WAR | V | 0x43021DD05A737F4B0EA9AAEAE3431D44 -0xD9C4BA62E74C075D501E4B9C4F745BBFDC768B07 = WAR | V | 0x307D05BDD58E6BDC9680CFDBAC445D85 -0x2F5C14BDB51727BC5D61D5409870D7919A03FD9D = War Room (War Room - Blu-ray???) | V | 0x31DFC5D1640C0D4B42A951773FFE79EA ; MKBv57/FindVUK 0.96 -0x0491373B51ACEE8E5B8F40E6D91C08806AFD6F17 = War Zone Punisher | V | 0x046D80FD244DC823E5A178A826E94E95 -0x70725CCCEFD467EB25D798BD92D58011162B1522 = WARCRAFT_RENTAL (Warcraft) | V | 0x2965CE8350238D425C00BEB6D0CD4C31 ; MKBv50/FindVUK 0.92 -0xFBF9C8E34C6CAE4CE9A08CBEB204C697C343DF30 = WARCRAFT_UPB1 (Warcraft) | V | 0x6FC8EFACB1E390A655C95D6BD0A44F6E ; MKBv57/FindVUK 0.99 -0xB8896A186FDF602AFC321752C39AAA6B1D0AE9BB = WARCRAFT_UPB1 (Warcraft) | V | 0x2E32661E3F648C93615C27972138946D ; MKBv57/FindVUK 0.99 -0xE1520E3450563D22FF3CBF0CC160B380D15055B3 = WARCRAFT_UPB2 (Warcraft) | V | 0x2C2FD66AC3613AEA7E8238F831EF3B06 ; MKBv50/FindVUK 1.00 -0x21E6E08C1EDD6B772C8F16A60B4AF95890519C2F = WARCRAFT_UPT1 (Warcraft 3D) | V | 0x5FFB755B67A7427BBCE1CF48D24FDD21 ; MKBv56/FindVUK 0.99 -0x0AF791291A0B9B3EBA9BFFCFD2CA451E276977A6 = WAREHOUSE | V | 0xA7A62330AC446808B40A2A281FDE3D6B -0x1B1B5445EEF721113212AA605FDAC3438A500E7C = Warehouse_13_S1D1 (Warehouse 13: Season | V | 0xD66060078013163FD8A681E8B7A36138 ; MKBv50/FindVUK 1.02 -0x7593EB4E2A1229BF69356C3CBBEADD11618CF40E = Warehouse_13_S1D2 (Warehouse 13: Season | V | 0x0C12DDFE64F1A752B0B1FA494FD9C39D ; MKBv56/FindVUK 1.02 -0xE64EAEB5BC5D69FC3583FFA546BF6ECE15246AEB = Warehouse_13_S1D3 (Warehouse 13: Season | V | 0x6CF747130FB04C6B2D42C4F214BF2AC6 ; MKBv50/FindVUK 1.02 -0xA0A74D9F19EC3FA7AC7A8E3B2257FD6026D50B49 = Warehouse_13_S2D1 (Warehouse 13: Season | V | 0x973484AA8860A7162746D9105C06D90F ; MKBv50/FindVUK 1.02 -0xD79EA2FB666AA95BB1EC2F7F27565C62F8ADB003 = Warehouse_13_S2D2 (Warehouse 13: Season | V | 0x6B1825DE7D1E81F949EC7951675B5AEE ; MKBv50/FindVUK 1.02 -0xC6FB760C4C068E427FD7BFFA8E1349B50F9BD1EC = Warehouse_13_S2D3 (Warehouse 13: Season | V | 0xA322E57B371F8B3F46032D7EE1F7300E ; MKBv50/FindVUK 1.02 -0xFEC754A440B7E40587A1EA7B43CCF7A31698428C = Warehouse_13_S3D1 (Warehouse 13: Season | V | 0xED7F91ACA58376C69FAF5207CBAD1AEC ; MKBv56/FindVUK 1.02 -0xD3AE016FEC014BCD7E249E878FBA98DF28DCD536 = Warehouse_13_S3D2 (Warehouse 13: Season | V | 0xB3F3353BF1D0107508D5D6C773251FF0 ; MKBv46/FindVUK 1.02 -0x46C2EF024E31C4BFB0588439CBAB998FD135E09C = Warehouse_13_S3D3 (Warehouse 13: Season | V | 0x7619A934345B6961398044CB6ADD8250 ; MKBv50/FindVUK 1.02 -0x0981D933F8E49BE1937946E6353FB2DF63669651 = Warehouse_13_S4D1 (Warehouse 13: Season | V | 0x891104804CFAF2F9487768B257F2F454 ; MKBv50/FindVUK 1.02 -0x1042F474C6632D439D261D657B2A2F735F243B93 = Warehouse_13_S4D2 (Warehouse 13: Season | V | 0x79E51C2176EB7CFC964012E625FA3CB0 ; MKBv56/FindVUK 1.02 -0xE5626D557EFDE0FDCE737C3B844FAA9ACD08ED8E = Warehouse_13_S4D3 (Warehouse 13: Season | V | 0x0609007F15C01418A4C2F6E384DD6897 ; MKBv56/FindVUK 1.02 -0x39BBE9CA8A4375A9C14A042FA6B1106E832AF833 = Warehouse_13_S4D4 (Warehouse 13: Season | V | 0x2A4F95D212D10647E957D4A2EF1637BF ; MKBv50/FindVUK 1.02 -0xDB7F404357263A68708BA33F99F4F3AFDF2D09A5 = Warehouse_13_S5D1 (Warehouse 13: Season | V | 0x532D566AA2774B0689D8C1C64F5DA983 ; MKBv46/FindVUK 1.02 -0xE9D8CB032B70025B438CD264113F95CF0DB64444 = Warehouse_13_S5D2 (Warehouse 13: Season | V | 0x2A5C8F4D1C837E1F366323BD77EC66C1 ; MKBv56/FindVUK 1.02 -0x3BF4A42CEA67C30EDCB68E53F29FF28BC7FF2EBD = WARGAMES_BD | V | 0x7C574880CDFD4E31AACDB8B49C1A3FBE ; MKBrev 31 - FindVUK 0.57 -0x1987D0289221E84D24F8124527E1519D32CB6800 = WARHORSE (War Horse Bonus Disc - Blu-ray | V | 0xDA3145050B38155FEBF549B3FAD378A9 ; MKBv23/FindVUK 0.96 -0xC22C4521695061845393736119619F10FE51147F = Warlords | V | 0xE4118EF527D33D47852202D6570EB791 -0x216927C66FE34897B76A768EBCE5359522AD968A = WARM BODIES (Warm Bodies) | V | 0x7DFAFA44EED9D20DA73D3CA1EE17B68B ; MKBv39/FindVUK 0.96 -0x0CAE20927C3441310ED0B1AF01B474D77A84752A = WARREN_MILLER_PLAYGROUND | V | 0xD2F7B7E1F1B230D2CC9369DF1A8F0456 -0xF681C34AEA7A61B9F5FCFA5C573E604700EA32C8 = WARRIOR | V | 0xC6160CBD35B185441078D40216ECD1C2 ; MKBv27/BEE/VUKNOTVAL!/FindVUK 0.84 -0xB406659265B2225C860E400D30963C456FB7816D = WARRIORS | V | 0x69282891F599E8F020F9C76AD52E5747 ; MKBv4/FindVUK 1.00 -0xEACBB581359DDDB0DABD0B928688C196AD53A907 = WARRIORS | V | 0x81D0FF8142833AF68882280C3950C124 -0x7DD9666611A588D93710B55983709092D1E717F5 = WARRIORS | V | 0xC973CD22C55AD0F8A93DAD017FDDFB7C -0xD1B7BC78E53EFEB99E040B1DBA94D69F3C16DC38 = WARRIORS | V | 0x69B7D240585F20983F03A5A037F446C0 -0x9C89B578429CBF5393BB0ED964A28C8C8CF251C1 = WARRIORS | V | 0x62AC47B189CA0844FFC9AE1B7C063E48 -0x747E97E5FF819361038EF838F5B579D3C6211BEA = Warriors Of Heaven And Earth | V | 0xD0F9AECE6FC218B2B783E6B18F78A35E -0x323A8BD2EF26191D36A16509DDAF28BA561B146C = WARRIORS(US) | V | 0x7DAB479C25656EC260FE36E243346763 ; mkbv4 -0xD42D63EE3EF78FE63ADB3C6EBC5DF3489847B063 = WARRIOR_BD (Warrior) | V | 0xD9959F49A5DA4660537293D176B92C09 ; MKBv28/FindVUK 0.92 -0xB569848F330BC33AE63ADBB895CFD74585FD6808 = WAR_DOGS (War Dogs) | V | 0x2DABEF89EED5DA34FCA11F1B981E5558 ; MKBv62/FindVUK 0.92 -0xF8981E2BC1CC01956C6B9FBD5454A182D97CFF9A = WAR_DOGS (War Dogs) | V | 0x77B002C07B169800D917E091BF1C0F46 ; MKBv62/FindVUK 1.00 -0xA729F6AF999C1DF067550491B9F6A914D6BF8521 = WAR_HORSE (War Horse - Blu-ray???) | V | 0xE3AC4AD80A1F79AE4571B5601A8BB0A6 ; MKBv20/FindVUK 0.92 -0xA8BC03071FFDBF7C765D845D7FA5BF5A562BB630 = WAR_HORSE_D1 (War Horse - Blu-ray???) | V | 0xD7FC0C67470E1851E11AAD90BEB0011F ; MKBv27/FindVUK 0.96 -0xD0C2BBFF202246095ED6B1E7B6E99FDD4D094153 = WAR_INC | V | 0x44A4F9219905105C33B7648D8B95E2BE -0xF729ADB9CC16DC43E555BAE91A13AF4B92C929CA = WAR_OF_THE_WORLDS | V | 0x605D4BA72BD3F0144819FC723D45D0D7 -0x1C366CE65BEB34383C66792AE3282C46AD44C533 = WAR_OF_THE_WORLDS | V | 0x666D996EFC15D01188144DDAF9245CD9 -0x355AFC0FE710CF14B724C0A547937527FFA5B8FE = WAR_ROOM (THE WAR ROOM) | V | 0x56E646DE5C7DA90D1E26E87953722AEC ; MKBv27/FindVUK 0.96 -0xC477663F2B09DB15883982CDEBA9D0F3A0B63C7E = WAR_US_BD | V | 0x924E438BFF712A7F50419E4FCAE59F9F -0x3005183E26E543BB26A8A275891B384C47F76357 = WASABI_BD (Wasabi) | V | 0xBE1A53C0BBE48D8E53713836318982F6 ; MKBv26/FindVUK 0.96 -0xCD43E7E082FB15453B322494298F6F228751F699 = WATAMOTE _ DISC 1 (Watamote 1.1 - Blu-ra | V | 0xBD7AC69FEF10A9025CC6F2305F28C09C ; MKBv32/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0xCD2DC1FBDC8DCF7CE02194D196F78E6888D3369B = WATAMOTE _ DISC 2 (Watamote 1.2 - Blu-ra | V | 0x31798E598261C6EA0E57CD44A007E79A ; MKBv32/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0x20C03F5C423995BE1A0FA397C9FCB2110F2D9AD4 = WATAMOTEBD1 | V | 0x67C98A414DF1E92A9DACD1C6A528F8CB ; MKBv47/FindVUK 1.02 -0xA70304A9C19254E6DDCDC5276011BE50C7B349B9 = WATAMOTEBD1 | V | 0x20D90F0C0BFE181E70DC21F07892133B ; MKBv47/FindVUK 1.00 -0x3B15F0991410C18986AC131E4F1B45975E534287 = WATAMOTEBD2 | V | 0x433856A85EAB852B4B5153086172E86C ; MKBv47/FindVUK 1.00 -0xBAA03E3FDEEE0468F5D6748E6DD48173BD21652D = WATAMOTEBD2 | V | 0xCA9E0DB124FFEB6B14EF7814074DF97C ; MKBv47/FindVUK 1.02 -0xB98DA4A0B2D0B79D55701B5DF47E47CA0059134D = Watchmen | V | 0xEE972DB9AAA9318BE741A4AB84D25579 -0x40353D86E9431C8D877729263D154C4FD74CC7A5 = WATCHMEN | V | 0xAC7833B25FD0F070F54340BB478B190A -0x4D60474073344DD856B68E2195359E8F3E9DAD21 = WATCHMEN (Watchmen) | V | 0x2074BFC57C652F6ECB19B8E12BD062BE ; MKBv12/FindVUK 0.96 -0x5D820E0F3DDA2523AD44099FF1761CF06F193567 = WATCHMEN (Watchmen) | V | 0x3BBC6C2979B91E6447384121F6B5B950 ; MKBv12/FindVUK 0.91 -0x7A64877182C36BAED44EE25A524E134F1822163B = WATCHMEN_BLACK_FREIGHTER | V | 0x67C34D90137BBB43235CEE93A2F60D1B -0x0851C03D737B6BE58106C2B0BB88444345167D80 = WATCHMEN_D1_EU (Watchmen Disc 1) | V | 0xC46E4641E496A23E9F7AFF994B2083DF ; MKBv12/FindVUK 0.91 -0xD05D6D39A41D34AE0E9CCDAFB38C524BDCEAE444 = WATCHMEN_D1_EU (Watchmen Disc 1) | V | 0xEBC1FC555A6BF9860D4BAC2CA959446D ; MKBv12/FindVUK 0.98 -0xC5060975A1B0D9D6655C798CBAA17F5F109C0572 = WATCHMEN_D2_EU (Watchmen Disc 2) | V | 0x78DCE598991A3072B1679EC2E99FCEB7 ; MKBv12/FindVUK 0.91 -0x57C03F99266EA0AA80AAC9F806835DDB4C7587BD = WATCHMEN_D2_EU (Watchmen Disc 2) | V | 0xDBE92AC83F3D491AE2816B945FC63485 ; MKBv12/FindVUK 0.98 -0x879183149E241516ACC6E94640AC11C95DF12698 = WATCHMEN_DIRCUT_UK | V | 0x98F0D4B22426E96D18EFF779C58ED6C8 -0x14EC0DE9CDB39459469752E0594A240BC8AF3938 = WATCHMEN_MOTION_COMICS (Watchmen: The Mo | V | 0x44BA78BB55F74C0A7977D752DE5A76A5 ; MKBv12/FindVUK 0.98 -0x1A3398F003AD26312306FE97DC0E6CB4EC172AF6 = WATCHMEN_UCE_BDX1 (Watchmen Ultimate Cut | V | 0xA23CEE9126BC3374E2EAE7C97355E076 ; MKBv14/FindVUK 0.96 -0x49B9BED28921DAB126759DC61BB9329A6C14AC58 = WATCHMEN_ULTIMATE_CUT (Watchmen Ultimate | V | 0xF332C7424B260E52A8A293662FA627D7 ; MKBv16/FindVUK 0.98 -0xFED7FDA6F129AFC8B7FAF83D4582B81D943B4EFA = WATCHMEN_ULTIMATE_CUT (Watchmen Ultimate | V | 0xD20686C6791A872CBAFC12C7154A6081 ; MKBv16/FindVUK 0.96 -0xF6F6F18453C8F0F3C89F794D0E084371976976CA = Water For Elephants | V | 0x92942335E5CCCC286BBB010F8F0FA285 ; mkbv25, bd+ -0xEBABA2A8E5B7D45C88F4A67E5B75A1EFA1638531 = WATERHORSE | V | 0x75A2BC33A21CEC9EC680898FD8661818 -0xAE1879867A178E366CC0A8C0918B0E26FBC6FF27 = WATERHORSE | V | 0xA74B7474ABF04C9C7BC11AD23615FD21 -0xE79FCD9DF2B113C5407F2AF28C3D3981D1220359 = WATERHORSE | V | 0xB6E4CB4CE7BF9BC08E0BF6F82D7FE8BC -0x9289170E559D64DA4E4F28DD49E57C7E0C6D210B = WATERHORSE | V | 0x0E3CC1ACCB4D56D7113CD46088E2D8EC -0x78A43D2BA5AE25A40EEE4C0C55A36E3BA43478F9 = WATERLIFE_PLANETWATER | V | 0x0FC5F011C24E2F536FEFF4F2ADAEA652 -0xA1998206A4A0FE9FF152781F780A90E5DCB7A4B2 = WATERLIFE_THEBIGBLUE | V | 0x3E877E1E6D43928868199DCC7345FFEE -0x5ABF9BC977917570A44F5EEB0949F0BAD3774720 = WATERLIFE_WATERSJOURNEY | V | 0x5E8B458ADC97734C0B5D2F3254E1D4CD -0xFDD98FB1CCDA8C45BAE0D3334F41070ED56203DA = WATERWORLD_G51_GLO | V | 0x63C5EB59261882BF470C44F9935C55EF -0x94672D97E864797E09FCAB3BBA32D2A9BF34887E = Wayne s World 2 | V | 0xD816273AF1FCDFDC3C532CB9CB2861CE -0x4F6F755377B2267716B67A63104CB57DE01C94F6 = WBR_B001 | V | 0x08381833CFDF70F8F3C7B62AFF39354A -0x3DB93F11FF8DA0327A8313116C8BF5C535893227 = WBR_B002 | V | 0x0A0D99C5D8C8DE75C2D39D5B9A62C48F -0xCD7C3E26E77383CE5E56CA06E2DC324C22315CCC = WBR_B003 | V | 0x361452CE5150FE3B00C7054A44985484 -0xA03DC4918E0FAC49B247439C792E578A720E64C5 = WBR_B004 | V | 0x6A0D89A88869366E5F8C220D11CF38A4 -0xF6366D72BA569F714A5A7B4D88D1D0A58917E6C3 = We Bought a Zoo | V | 0x2BC20C0425D315D15605E3433FCE0F44 ; mkbv20, bd+ -0x1478E10C322F17C569FF0D4B390CD934745071A7 = We Were Soldiers | V | 0xCA49F64C02DF1EC26D7098F9EDA13876 -0xCDB68B37DBB78E0C3D994801402CAC8298809290 = WE WERE SOLDIERS | V | 0x432AF5C59B55E748BB7E95EE067E3D3D ; MKBv3/FindVUK 1.00 -0x3042D0010CD82037D0AF6E2E863F7E4944E02067 = WEDDING_CRASHERS_BD01 | V | 0x3886D0AE642BDEE6DCC282E03979F235 -0x97E9FE3A4A7E3D7E5EC3D24D72161614A43549DF = WEDDING_SINGER_BD01 | V | 0x14B26885D68A4A7C822F0FE4A98EDECA -0xC72BF71D9CAC9A9B0087160C9CDB17E739DF66FA = Weeds S1 | V | 0x315B3A4D2E67942986F7ED4F313B9AEE ; mkbv1 -0xE3A37989808A47156F7C16E0C6DF80E71F94568E = Weeds S2 D1 | V | 0xF9543A96A82423F53D4949744EF35671 ; mkbv3 -0x013EC17FFCC64F6EE5F5F4B64C0FB1AECC69F406 = Weeds S2 D2 | V | 0xAE7F19257CE9618402008027D2448DAE -0x9C64B96B8CD45C6DF50C7F5B19155910346F2371 = Weeds S3 Disk1 | V | 0x5B11F6396F2E02E97E4BE1052A657B52 -0x22093285478484B4572482863B317A842272594E = Weeds S3 Disk2 | V | 0x4C3A6DD0E705034C0606EB9C06EF6F27 -0x96E7C60DF0E4629E9B88AC1900B54215A7E645DB = WEEDS S4 D1 | V | 0xF449387AC34B43118A7CA5965CE6B9DA -0x2088AEE4F3F5F435F418087C3E0E0F6FECF10427 = WEEDS S4 D1 | V | 0xABBF4D486A4E2C0DC087ADFD0865B7AE -0x3338D18FF17531548992781332B11DC697509C00 = WEEDS S5 D1 | V | 0x4922D79893A2AD779E4E752D66229472 -0x078A17F11D8BC66E6256DAA9733A6BC103357539 = WEEDS S5 D2 | V | 0x40040B58D5F6EC3714BE73570C1A4BC5 -0x3E08C88FB82927FE0D3328EF2C0433175E6F3DBB = WEEDS_S1_D1 | V | 0x0E41BB17ED6771E56E02ACD4ABC4D2B0 -0x6B1693443DFE550FF6F18C67036CB3CE40F2E624 = WEIHNACHTSZAUBER (Weihnachtszauber - Ein | V | 0x03EA02FA761F9A0A42202A78A4B81505 ; MKBv32/BEE/FindVUK 1.00 -0xB0785FF9E5CE33AB571FDC26987C1ADAFE6CE9E0 = WEIRD AL THE ALPOCALYPSE TOUR (Weird Al | V | 0x37C96B38349A20B27AE4276B72981ADE ; MKBv23/FindVUK 0.94 -0xBE371E015F31AA8E55450F4C1D22FDC26E0B4C5B = WEKA_ITALIEN | V | 0x87D5FFC2648455CA7CB4C609E44D0725 -0x53DDE0EC860948BD133EB209BAE694602611EB7E = Welcome to New York | V | 0x711DD682BDDA3C403BFA00D9A0813089 ; MKBv32/FindVUK 0.98 -0x4714A119CF534A9960628613B97F927830E69407 = WELCOME_TO_THE_JUNGLE | V | 0x690718DA8C101432B774E80C71F4CB65 ; MKBv43/FindVUK 0.82 -0xDA3B154C9D17A6D132C9CB26D196000AA1278A0C = WERE_THE_MILLERS (We re the Millers) | V | 0x9C23D0D34091F1F2E6B0DBFD3995B31D ; MKBv42/FindVUK 1.00 -0x86AB4DE7292E467AC6521856FF36A22623352C7D = WESTWORLD (Westworld) | V | 0xC40B479F7BE07D9125889DE6833103D3 ; MKBv35/FindVUK 0.96 -0xBFE5856E79FF4ECC7CEC6ECA7009F8FCF9802555 = WEST_SIDE_STORY (West Side Story) | V | 0x04C9D6570C85753F30FC5A49F27B965E ; MKBv20/BD+/FindVUK 0.96 -0x5571F67A8B54F7F44DD571D28AD01BB0E07262F9 = WEST_SIDE_STORY_D2 (West Side Story - Di | V | 0x52F772E18FC39CB20B8D3DE266DE16BD ; MKBv20/FindVUK 0.96 -0xEB4DE533C087D279662D3745E08A7E0336353F0D = WE_ARE_MARSHALL | V | 0x929A26EAE1188DA13630C428AAA47845 -0x9257E89451F74A861C41B608E9734D41CAB488E6 = WE_BOUGHT_A_ZOO | V | 0xC44C39B1FF4EB8FB6EAF377E47562286 -0x738291A296609BBCDBC69E8778473A2A7299CE72 = WE_OWN_THE_NIGHT | V | 0x45879B75AA7C3C90B8553FB3CC479225 -0x7F21420F59138EFB1C7C5F7443F2C349A0AF6F7B = WE_WERE_SOLDIERS | V | 0x3C14B29255B87B63D4CEFCE8ABFEB894 -0xC06A329F99FA24B3D838FA58BC0B8A0673272E4A = What we do in the Shadows | V | 0xB94B362199B581FF6F10F02651A0D661 ; MKBv50/FindVUK 0.98 -0xCC879976137D7ED761EF43D9BAF35A5C440E5789 = What's Your Number? | V | 0x879EF3A167CD8906A215A2F415819802 ; mkbv20, bd+ -0x6DDD99334619CDEAC386CCE09484E60CD3587951 = WHATDREAMSMAYCOME_UPB1 (What Dreams May | V | 0xE966E0F0B38C2420EFFE7F033E63BCA8 ; MKBv49/FindVUK 1.00 -0x907329B249D3D1F3E96622F2EBAAB149DA7090BC = WHATEVER WORKS | V | 0x95A2D2AF6513E092B8A6E18C4728567B -0x39BE675886CE35CDF171A0DDB1ADAFBE75F8F5EC = WHATEVER_WORKS | V | 0x6C5DAF9DE0677AE338C3740AC5E38CAA -0xF4E792A37A77E48558B693A873B18551EA76BFF3 = WHATEVER_WORKS ( Whatever Works - Blu-ra | V | 0xB09CD8990D30916474919612F15D8EBF ; MKBv15/FindVUK 0.96 -0xC60B5ADD0C633B4BAF8003A98456FB79AC23E8AA = WHAT_HAPPENS_IN_VEGAS | V | 0x653332A1533FAA2F0DB9E887C8613E48 ; MKBv7/BD+/FindVUK 0.99 -0x6FD291C2534AD4C65A3FEFCB0FAA67B320E17B9B = What_We_Do_in_the_Shadows (What We Do in the Shadows) | V | 0x1FD91CB9F98A7CC09FD6D53E15062405 ; MKBv47/BEE/VUKNOTVAL!/FindVUK 1.00 -0xC1B69D06B25B6F35C97DBABED61E2C5C251B53F4 = WHE0EGW1 | V | 0x2474D79C6BB83E090DF76F7D9C8EEC19 -0x6F1C09D27C28C24BE343B24BF98E789A58883465 = When In Rome | V | 0x39B15AC8C4559FC42E1F4F83E21DB241 -0xE57E768FD6D761BFABA53A91860C79829719117F = When In Rome - Blu-ray™ | V | 0x56BE6B63EF157F91089EF2A34E36A95E -0x1C2FC780E52AD06F7344F56F0CAC9F9E28542FA7 = WHEN MARNIE WAS THERE (WHEN MARNIE WAS T | V | 0x3C9A908D96B1C2D35F843C032922137A ; MKBv61/FindVUK 1.00 -0xEA9C653D67AF3ED2E93F120E085907E8D8519195 = WHEN MARNIE WAS THERE (WHEN MARNIE WAS THERE) | V | 0x9A7CB40C5C4E1DC9E7E03C31D5245986 ; MKBv56/FindVUK 0.93 -0xFB7BC9CDA375070DAE4CBC6E91CC6FC634FE6E70 = When They Cry BD-1 | V | 0x3246CD4F1C46E66F88104C59DF2BE02B ; MKBv58/FindVUK 0.96 -0x0A23F08DB4DBD9ACC286AB05A03AFCBB1AFFA30A = When They Cry BD-2 | V | 0x64DB855731D34E52594A56CEE7A60A48 ; MKBv58/FindVUK 0.96 -0x8A6660C4249A41050CA3E8E2711ED3F513242C44 = When They Cry BD-3 | V | 0x50FFE17EF988F39A096DA596A82138FA ; MKBv58/FindVUK 0.96 -0x4B4F71E661066D91FCA1F64FEF9A2E94D99F5DE4 = When They Cry BD-4 | V | 0xD66318E45DB1386CBDF10393011580E8 ; MKBv58/FindVUK 0.96 -0xD873E1FF943893FF4198511801D53A5F664A3B2A = When They Cry Kai BD-1 (Disc 1) | V | 0x3FF176F3377ECC689FE3C93E87A8871A ; MKBv58/FindVUK 0.96 -0xB69F681DEF5F258CEF17CC75B417AC7AC3C41E37 = When They Cry Kai BD-2 | V | 0x83530A8DC55AD6C3B76D67DDCB60B75D ; MKBv58/FindVUK 0.96 -0x9390438A366F8F5E7B8C51348A6159FAC2BDE693 = When They Cry Kai BD-3 | V | 0x47BD93C19B563CBFBA08A629DD2BAB43 ; MKBv58/FindVUK 0.96 -0x68AF9899F7112F34AF29BE9FA180E5E9D60B18C8 = When They Cry Kai BD-4 | V | 0x59FFAA06B660FF7F78671640FF6888FC ; MKBv58/FindVUK 0.96 -0xD05805CAED62BC7B331B87799AC2E460AF2B9BF7 = When We Left Earth 3 | V | 0x57050AB3DC2A0DC88BC25A5BE96AD60D -0x03BEA585CA4300665F7C95929D78751101C23DC2 = WHENMARNIEWASTHERE_NA (When Marnie Was T | V | 0x512BE58DF63C6B8B5E5631309715A040 ; MKBv47/FindVUK 0.92 -0x1AC5AEA31CD30D8B68C83FFAD609E02789598A55 = WHEN_HARRY_MET_SALLY_BD | V | 0x07A0921B69A98688FD915FA44D53D68B ; MKBv21/FindVUK 0.80 -0xC68CB67C12E1B47E51C11E3C42CD48AC4394F84F = WHEN_HARRY_MET_SALLY_BD (When Harry Met | V | 0x92759CB6497FF977AFF23C9E12F6262D ; MKBv21/FindVUK 0.96 -0x2228412309693376E4391DEFF644E0910B6B20FA = WHEN_MARNIE_WAS_THERE (When Marnie Was T | V | 0x5B8B64DADE880B3AA9DC0634FF55D9B5 ; MKBv54/FindVUK 1.00 -0x8769ED34E48424D39BA17FC3C9BCAC9DCE396F7C = Where the Wild Things are | V | 0x9BF65FCC932B5A9EA286F6B9873336E5 -0x83FDE09D714E13B512E4C2138272AEFAC236E82B = Where the Wild Things Are | V | 0x9A507E9618E5DC43E4A91C5775A38D00 -0x4BAAA17B63F9B4CBD814C6B0AF84B5F1EB816405 = Where the Wild Things Are | V | 0x2DD8CBCCD34AB33E120855D245CA77BE -0x15190D34079E27224C3031D0F475783EF8762397 = WHERE_EAGLES_DARE | V | 0x77C794C267EC37DD09C15A95379003D1 -0x9FAD855ED426FFA6B69C1CCCC689FFC88F6A0506 = WHERE_THE_WILD_THINGS_ARE | V | 0x5BBF24F583700604F01F9D18A91BD993 -0x74DBB71082436FE1EAE58FE0D44B18D07F0228F0 = WHERE_THE_WILD_THINGS_ARE | V | 0xC804D696417DDE3995B69FFFA7076592 -0x92EC5001B83BC0DCD38E6936E1663D02504349EE = WHERE_THE_WILD_THINGS_ARE | V | 0xFCCC2FE76D4332E64DFB86A0A984393E -0x21CBAE5D145F750AA37E245021949AB45A861CF6 = WHG0x1AAD1 | V | 0xF6D000635AEEAFA72E80A89E55054EE3 -0x924033579F6EADCBBDC10A8441CA933FB8E5BA46 = WHG1EUD1 | V | 0x2E46E183F51AE7F3395048581C78C03C -0x60B3CE5110AD10D4CA7C12608236D8C89B7745E1 = Whiplash (Whiplash ??? Blu-ray???) | V | 0x85CA7DD826F0F35DBA3FD8782F12D58C ; MKBv50/FindVUK 0.96 -0x0B5B5A6CF2761AEAD4ABF935FBB298D85BF85ABC = Whiplash (Whiplash – Blu-rayâ„¢) | V | 0x376CA5A5B3E737AE277D12CF0785DC25 ; MKBv53/FindVUK 1.00 -0xA1BF09F04D9081B8D1E31409E0E6EB2F4764E1AF = WHIP_IT | V | 0xB164D124430D45A37C0833B7BD51C173 -0xFC3D544F8816D658008E0D61662B08EDA45A7585 = WHIP_IT | V | 0x066B8CA1243C8169218CD34B5104E100 -0xD3B649B4D3731AC4DF55278548C58D965EE44B81 = WHIP_IT | V | 0x48DE27704A648183E8F0B3BE3E1F6D7B -0xE94B567A02A863A510D409130E8E3BDB0500F91C = WHISPER OF THE HEART (Whisper of the Hea | V | 0x92D9841817F02657EB26E078DE57C1BD ; MKBv52/FindVUK 1.00 -0x3D0597C00F56DE315D4FD1CEDE1A92653E7E1FDA = White House Down | V | 0x0C25E8004B26AECC04EEC2BE49DC490C ; MKBv43/FindVUK 0.65 -0xC466B231B423E60C62846C6C3637A90691B1414C = White House Down (White House Down - Blu | V | 0xFB2C86B7A3B27E79FC6CC503CFCB654F ; MKBv43/FindVUK 0.91 -0x0053A901F7DB3A05D0F2C12F307574DB7258455B = White House Down (White House Down - Blu | V | 0xF6311F0B305C2AB693252D966911FAA2 ; MKBv43/FindVUK 1.00 -0xA7F54DDACE72D5D83C80AE666B287A8AD057F415 = WHITE SQUALL (WHITE SQUALL) | V | 0xC3F47DD4B3AD431ED0A610605FBE0608 ; MKBv31/FindVUK 0.96 -0x7D20F71451B02C85EF6E927329C3E482A4F27830 = WHITE ZOMBIE (White Zombie) | V | 0xF3AD4B84ED887D49906CA81857453566 ; MKBv35/FindVUK 1.00 -0xDBA496CA7134C4A155DD3FAABCA29A40C65FC976 = WHITECOLLAR_S1_D2 | V | 0xF1B0257D2B83A4279A75CBC08E0290C8 -0x117FAB75AA0A2389B4668DE8413038C46D64A2E5 = WHITELION | V | 0x4F7859C7FCB5D951AFADF7CABC081707 ; MKBv25/FindVUK 0.72 -0xA2828B07447AE36A4E08ED1A9F50EC8FB4415D4E = WHITEOUT | V | 0xE69F7BB2E67B3380DE478362E0A673B7 -0x1E8FEB840DA0D2F4B7ECB6BD7AE00EC988BBBBB6 = WHITEOUT | V | 0x25043D0ECFE7D32CCB53744FE0F61F35 -0xF50C20C86AF5663515C9A42C9DFC3037C352E1BF = WHITEOUT | V | 0x7872E0DD42F336114FC739CB33C05DE3 ; MKBv16/FindVUK 0.96 -0xD356D284045FA38A1EF3A7F28F6BCB233EBA012A = WHITEOUT (Whiteout) | V | 0x2E6D035842ACAF286F30BE672C95BA3C ; MKBv16/FindVUK 0.96 -0xA52B11C23E57F2C9C92275BE9EB8F905E7685BEB = WHITE_CHRISTMAS (White Christmas) | V | 0x0775D3275A60F7779C799C06E6FC6B92 ; MKBv18/FindVUK 0.96 -0xDAB4D81A611C0CFA49281D557CE6EB04539A46FC = WHITE_HEAT (White Heat) | V | 0x4388ACFF70CFD7F5E660617D45502252 ; MKBv36/FindVUK 0.98 -0x349496EA7163E51B126E540AEE17DE6ADEB59490 = WHITE_THREE_COLORS (Three Colors: White) | V | 0x2338BDBACD11EA1E0D7087C20ADB95D1 ; MKBv27/FindVUK 0.99 -0x57B5BDC7A463FB3F15599C18F47F7759344D694B = WHORES_GLORY (Whores Glory) | V | 0xE005B5421F8D2410E860462DDEF7468C ; MKBv30/FindVUK 1.00 -0x320D2E442DD7FCA4678029FAD68E1F56E6579ED5 = WHO_AM_I | V | 0x7A24DCD20377E4D443C6FA4D9C2F96EF ; MKBv51/FindVUK 0.81 -0x17162F254D7B85BE0A260CCCDE3BBA383371BDD4 = WICKERMAN (Wicker Man, The - Blu-ray???) | V | 0xE7A4FD37F8471450F6AB9917B9E51E04 ; MKBv4/FindVUK 0.95 -0x15069870ADE44EE8CD9F797A1292739AF2D52A53 = WICKIE AUF GROSSER FAHRT | V | 0x138E8098DA5F3F17BA0205BCFB0047C5 ; MKBv30/FindVUK 0.80 -0x23D0904F0A11AE94EB971D24EC772DDEB6C9564E = WIE SCHREIBT MAN LIEBE (Wie schreibt man | V | 0x57DE3D08C9A3573D9B4B9E1D2BE8A2CD ; MKBv52/FindVUK 1.00 -0xD513C753D2AA6C88CF6A3CABD1F8EA2D2DDD4E3D = WIE_ALTEN_ZEITEN (Wie in alten Zeiten) | V | 0x83CB11F813556A3A570EFDFFBD6B24B0 ; MKBv52/FindVUK 0.83 -0x3D4537F25582CCF349385194403CBE5FD9DF2212 = WIE_DER_WIND_SH | V | 0x216C1AA4DD7061111DE0F112826AAF05 ; MKBrev 50 - FindVUK 0.62 -0x598CC93707338DA7211D43758DF1B96E8605FFAE = WILD ASIA 7_BETWEEN TWO WORLDS | V | 0x00675960B7E3768A9D2B2DBCCBC98020 -0x4CAEB4CF04AEF80ED0543B52A14712FD9FAD79DF = WILD CITY | V | 0xC171DEC57D52E20A8E97EE874B509833 -0x7ABEFF09886AD25E7172E764E0F1B64C7673B43E = Wild Hogs | V | 0x7B743E9AC0FA59B57C69F97B24BC5653 -0xAB7F88D9A08894922B2BA23EEB933F806FC99D68 = Wild Tales (Wild Tales – Blu-rayâ„¢) | V | 0x008E12CB4BFD43ABA49A39DF33688934 ; MKBv53/FindVUK 1.02 -0x28C218AF0050CC90F1491686BD272B964039D7EE = Wild Target | V | 0xFDC3C9BD5333DF9404C2AC5802BD85A2 ; MKBv9/FindVUK 0.91 -0x76B3C1DDC7DC601B1AFD3BB028861C6746BBED26 = WILDCARD | V | 0x8708C5F6FC5F2960CF94327CAE914734 ; MKBrev 54 - FindVUK 0.57 -0x97371D94CAAEC7E245627F29D5C07D25BE6C8FD4 = Wildes Deutschland | V | 0x61F195EBC4F692983E97731C97CF5BF2 ; MKBv25/FindVUK 0.80 -0x5F1D1C27790D4C07853733AC6CEA9BB410307DD4 = Wildes Deutschland | V | 0x05E8FF2A5350FBE773A2354DA06C941E ; MKBv35/FindVUK 0.80 -0xFC78687334A069960F67C7F3FCFE1E4AB4DAA6DF = Wildes Deutschland | V | 0x09F11EB32ADA1E0DAB8435314EFF2F0F ; MKBv25/FindVUK 0.80 -0x6FE9B881D1F4CA8C582D5B71402761920B10D51D = Wildes Deutschland II | V | 0xFF3D51DF2734B95E6474B18AC66F9606 ; MKBv35/FindVUK 0.80 -0x9B8526F22D6DA45F705D988BA6358E28E197A8CB = WILDES RUSSLAND 1 | V | 0x917744F4EBDBCE51558CC415B87F4B50 -0xD7DD33389F556494B7E40CF73EC9C00D840704A0 = WILDES RUSSLAND 2 | V | 0x9C85A1437A1DEF4119E254C04199C05E -0xA614ED23D9711DBF27BBBB563DB690BF4EA80800 = Wildes Skandinavien | V | 0x6A2E5D41DE24BF66A2EA987C1D5378E4 ; MKBv25/FindVUK 0.80 -0x4FC75F4DA30A55746CAC76B3807189CB7CF88956 = Wildes Skandinavien Disc 1 | V | 0x47C5105843B5CE025A3144AD86F0845F ; MKBv25/FindVUK 0.80 -0x51823D61EE53B3742C4885F454C33958DCE69393 = WILDES_CHINA_D1 | V | 0xF48F5C85907BA89734B4B7E734E37ED3 ; MKBv4/FindVUK 0.80 -0x3C5FA30EB7C82977FD9AE04C8C32E2DD06982678 = WILDES_CHINA_D2 | V | 0xA728664B39936DFB3B244D12DF0159D0 ; MKBv4/FindVUK 0.80 -0x774CF6A53A95B1387B1F87494D07FD0FF571D5D2 = WILDTHING | V | 0x7BDABE97A6EB4173D051DBDA279829B5 -0x907FE70D6B7E4ADCF5D1653B4E170A2859A39BCB = WILDTHING | V | 0x34691AD7E3D4F3050DDE1964A58695FD -0xDE0CCFF9A589AC477B34565D4262C16B3004E9B9 = WILD_ASIA | V | 0x7B2D2F6CB849E877B945B30757F07FBB -0x939BE0E0BDA945727C1931B5EBDE1322A4A78CBF = WILD_BUNCH_B5 | V | 0xF5178FD622F6589FFB41EEEE342BC2B0 ; MKBv4/FindVUK 0.80 -0x7A680450A13C7E49C0E11930507EE3BC668EA661 = WILD_CHINA_DISC1 | V | 0xADB7E06FF52FF6DD1F712B0F4FB34E79 -0xE67862587270F7B26D77158B3EE9EDE108A32FA0 = WILD_CHINA_DISC1 | V | 0x5DAE05F4E22729CCC4BE0EDBDA070DAE -0x1F11B58E6DCAD00FA37D64B270C4B0500045CED2 = WILD_CHINA_DISC2 | V | 0x8BE1DBC6A40B543B6012E20609E99AD4 -0x4A933C470F0BD991514560DA5604B37748222032 = WILD_CHINA_DISC2 | V | 0x9F898B4EE3E1EF96E0B2DE199969F329 ; MKBv6/FindVUK 1.00 -0x1B591778B0BA9141E4B5FF05B7EC6F84975C9FDC = WILD_OCEAN (Wild Ocean) | V | 0x4356A4F7C659A7034596B150D11D6645 ; MKBv16/FindVUK 0.96 -0xFCF69D3D1B60704A3B11CC6E88E99961830D0CD9 = WILD_PACIFIC_DISC1 | V | 0x2E6810293811CD4BB6D4DC8D0A6189F2 -0x451F74C901D9D88C6206DDE9ED3531C388EF7C3B = WILD_TARGET (Wild Target) | V | 0xBBA8A68BACE3F6D44D5052F22843F0E8 ; MKBv21/FindVUK 0.98 -0xEA574FDB92ECD7CCBA80E1E17EC869667589B3E2 = WILD_THINGS | V | 0x67CEDB741293E65D958145F600F3CF70 -0x8C77E95B8FF893631E54C2FBA3274649D043997D = WILFRED_S1_D1 (Wilfred, Season 1 Disc 1) | V | 0xB81BBF7ADE020B4070AE1F875D01D7FD ; MKBv25/BD+/FindVUK 1.02 -0xA944ACF5E162B828039799DF50126CFE32DB640B = WILFRED_S1_D2 (Wilfred, Season 1 Disc 2) | V | 0xFF940DD2E248116A759B4346E3E2C1EE ; MKBv27/BD+/FindVUK 1.02 -0x903F48EC60E5DBEB79D514B807E7D4CEA5F621A0 = WILFRED_S2_D1 (Wilfred, Season 2, Disc 1 | V | 0x17F524406BE98555ABA0C2397E4E2F63 ; MKBv36/BD+/FindVUK 1.02 -0x2B179A2D18310203017FC6D8BEE18543034BEC8A = WILFRED_S2_D2 (Wilfred, Season 2, Disc 2 | V | 0x5CCBB3E4DDCFCFEE7318328CBBC1C9A4 ; MKBv35/BD+/FindVUK 1.02 -0xAB5AFF7D5D19FFFD22B7584B75AEE63B5AE7FD03 = Willow | V | 0xA7ABCCC310907ED16D3D779C83F02C36 ; MKBv28/BD+/FindVUK 0.65 -0x867ABC8C96657C0E3AD2623099FA53B77ED87881 = Willow (Willow) | V | 0x686882D7751156FC6E0B8E0BC1E035C1 ; MKBv28/BD+/FindVUK 1.00 -0x29000AC638EB4AD05DCA1BE81D2075FEA15CB2EA = WILLY_WONKA | V | 0x53BADA2FA92336CF6116650E33E3B4AA ; MKBv14/FindVUK 0.80 -0xD34C987B154082827560735ABF4347942A07B426 = WILLY_WONKA | V | 0x7C102C53110296EDA52AA2EE43C445FE -0x1BC557E102044244DB2118B87F43DEE7B359AF71 = Winged Migration | V | 0xE1F878EF6D91B57F775EF1041063D0B6 -0x777F3AE893FBA8282C90CB321D9935CB3C13E7D3 = WINGS_OF_DESIRE | V | 0xBF7B94A06905415A22E35E18958078A6 -0x6EE84AB03F25E6E3DC7145BCF0CBA2043CC4B132 = WINGS_OF_DESIRE | V | 0x8A2D80F08DB4082F22D37936B68C3D42 -0xF0E0AFCE5BD3BF431FCB43AE3E732845FEF6510B = WINNETOU_1_BD (Winnetou 1) | V | 0x2DE02068EBD770FD4CD54A83C20993F2 ; MKBv28/FindVUK 0.92 -0xEF065D09F98DD0ED8B5B40D249E47DD596C77115 = WINNETOU_2_BD (Winnetou 2) | V | 0x20396C6C845DD9FD0D3F2B0EA87D3AA4 ; MKBv28/FindVUK 0.92 -0xD39B1DDC1FC6D01FF10BF0F2DB6A07F304BB9B4E = WINNETOU_3_BD (Winnetou 3) | V | 0xACE88D3A9C2294E86FB84E1727DAE471 ; MKBv28/FindVUK 0.92 -0xEABDCD69CF11F4F6C79BDF4A9E0DEF5EB3B9B80C = WINNETOU_D2 (Winnetou - Der Mythos lebt) | V | 0x75A80C709EF4A652FA68A5E37B8EB8A6 ; MKBv62/FindVUK 1.00 -0xC191946C996702FE6E2057104A801EBD31ACE5D7 = WINNIE_MANDELA (Winnie Mandela) | V | 0x1292CF84E7B7F131E57AE7CD7ACF8B23 ; MKBv43/FindVUK 1.00 -0x1177C70591B11C8D62F74D0864F1FF35BB67F5A7 = WINTERKARTOFFELKNOEDEL (Winterkartoffelk | V | 0xECD82494BDBCC91A427BF551E4D154E6 ; MKBv51/FindVUK 0.92 -0x66D9E5EE5E964F6D56492ACA234B1E9C8B7399CF = WINTERS_BONE_BD (Winter s Bone BD) | V | 0xD7FD52B70503F9A27BD0A3E65808698D ; MKBv18/FindVUK 0.96 -0xBA8109737C357E5549730249DFC64FA0AAA493F9 = WINTERS_TALE (Winter s Tale) | V | 0xA67A17FF98B2D29E98C451624B8EBA45 ; MKBv46/FindVUK 0.98 -0x0AA55178EB5C5F921772DCDA273A02E1B18C7615 = WINTERS_TALE (Winter s Tale) | V | 0xBB143161FE5A94EE2BB3E3DEE037ED3C ; MKBv46/FindVUK 1.00 -0xA274476362DC46FF146B083528627C4D33F7167B = WIR SIND DIE NEUEN (WIR SIND DIE NEUEN) | V | 0xF13ADA4514B1032954D7C5270158064F ; MKBv47/FindVUK 0.92 -0xE787925B23796C680BC4C18023278DE2B6FD02A1 = WIR1HLE1 | V | 0x4FDA258FFD85AD7E4BA78DF58C771115 -0xDDE35CEE515298F2D2FE1B8637D34B323FED4298 = WIR1NNE1 | V | 0xE9E8335C835EE53C99E312701CFDA2EF -0x2B6B9711CF5EBC7717B89BF1C487037FE2C2069B = WITCHBLADE_DISC_1 | V | 0x1CD5C503F29501AF9C60542B26AD6F65 ; MKBv12/aacskeys 0.4.0e -0xE55378ED4DF97F3EEE124D9897F325EEEC749996 = WITCHBLADE_DISC_1 (Witchblade Disc 1) | V | 0xFB1F32482E92218C19C021FB0B3F4154 ; MKBv12/FindVUK 0.92 -0x24F082A29CD05CF8AF0EA55ED7E317B57CEDDD39 = WITCHBLADE_DISC_2 | V | 0x622C8EAEF535179DAFD0263B95DB6C90 ; MKBv12/aacskeys 0.4.0e -0x0E82C895BEAF9E219816C731AA5C8AC72A8DA72D = WITCHBLADE_DISC_2 (Witchblade Disc 2) | V | 0x9BD5847FC0E6792069321535D2A97781 ; MKBv12/FindVUK 0.92 -0xC6C0E8103D9B4012FAF6A13CF0EADE5AFACEA940 = WITCHBLADE_DISC_3 | V | 0xFF1332925D2195FF8B3486C413DF96D5 ; MKBv15/aacskeys 0.4.0e -0xECE9A01FD4BB9551DAE293E8BEAB544B744C3B51 = WITCHBLADE_DISC_3 (Witchblade Disc 3) | V | 0xC30202402E1111B5A23EB5AF1BAD1170 ; MKBv15/FindVUK 0.92 -0x00A60BA494944ABA9C8E203F0DE1586731D14729 = WITCHING AND BITCHING | V | 0xEE506277E72E8AE88B164B49959B4F61 ; MKBv44/FindVUK 0.81 -0xA8B9D164103993D4A377E7289BB5363FDE413FE6 = WITCH_UPB2 (The Witch) | V | 0xF135291DB45ADC7E118EB30BBC76DEDF ; MKBv61/FindVUK 1.02 -0xA195AE3BD5DD0D82310DF3F40D1E0CEF5EAF9417 = Within Temptation: Black Symphony | V | 0xC27368B92A3CC2312265EF0EC323EFAB -0x8E16BE9E777B56FD35E6CF6BAA9B3D74ABF308D8 = WITHNAIL AND I | V | 0xA39457A108768E7AD5A2BA18AEC90604 -0x6E1AB1E40DEA69D6DC05317258CEB9299E5DECCA = Withnail and I | V | 0xEF327D673E4D80E7B006FBF61AE014BE -0x810BE8C8E2636F767B8BEFE68C330C88245B699A = WITLESS_PROTECTION_BD | V | 0xDC15798C9C6F71C392AF2AE901C1F64E -0x824F48D01ACBD8709393FD1DCF31167212DE5CAE = Witness (Witness) | V | 0x8590E5AF79707E2CE2DAF606023CC0AC ; MKBv36/FindVUK 1.00 -0x69172113C758E2BDA310FC365C025B07AE705BC6 = WIZARD_OF_OZ_DISC2 (The Wizard of Oz: UC | V | 0x626BB4D37115E5E7AE835CDA37CBD043 ; MKBv14/FindVUK 0.96 -0x689139A89A150D0625282B46392618A9AAB3C41F = WNPWPG (Was nicht passt, wird passend ge | V | 0xDA79B1D8929EE005E35908630571785F ; MKBv48/FindVUK 1.00 -0x6C2285BC899320B18FE43435423709EA3AA9A248 = Wolf | V | 0x8FCF6E001037F1725CD136BCC726C90B -0xDFF2030FC4F41D5373ECC4F684364E7FCAAEBA61 = WOLF | V | 0x8F6EF4326C24DDA125EF2F55FB69E80C ; MKBv16/FindVUK 0.92 -0x99ADFC72FA647D7E5A0368F5447752E7B23133F5 = Wolf Children | V | 0x0ACB4B6576B597D091A939BACA6DE8F1 ; MKBv31/FindVUK 0.84 -0x1E33E6603E063FE66E5AEA3026BBABAD4E8FE6E3 = WOLFMAN_THE | V | 0xE1E0928C90BD64B8424AA260BA848EFF ; mkbv17 -0x6212D15674E49E685A5DF4FEC98C7AC9A5EB1D5D = WOLFMAN_THE_G52 | V | 0xE1DAB0E3F2FEEE9EBDA38155B534FB85 -0xB2116E103FF7469E46A03AD00FBC843317759BAE = Wolf_Children (Wolf Children) | V | 0x8918AE1E6B8D494F00A752B585E83CB5 ; MKBv42/FindVUK 1.02 -0xB19106C2F22FF820979ABD0C8E6CA7BCED66DF2C = WOLF_OF_WALL_STREET_G51 | V | 0x9D2E2A195B1206B0002DC47276A35524 ; MKBrev 47 - FindVUK 0.57 -0x07417538469D8413F8DF6C897FD70665764B6B23 = WOLF_OF_WALL_STREET_G51 | V | 0x34F63B851E71ED31894A1D68FFAEC406 ; MKBv47/FindVUK 1.02 -0x82C30CEAB52D79ABBBBB892610C71884CC146C9B = WOLF_OF_WALL_STREET_G51 | V | 0x9635E10E12DB750F99869ADE9449B395 ; MKBv47/FindVUK 0.99 -0x0EB7C30ACA0DEB82E5F406815288EFA21E5C9BA5 = WOLF_OF_WALL_STREET_G51 ( ) | V | 0xD49C23F2D156790932085AD66252DACF ; MKBv47/FindVUK 0.98 -0xA417646A808B2655199FDB6A87B03A8484F62C0C = Wolkig mit Aussicht auf Fleischb????llch | V | 0xB5AB132DDF626791B4C2CB6AEDA0A769 -0xC3351AF27001C0AED04462251F5C9C18D3BEAA9F = WOLVERINE_3D | V | 0x1D0D80B773AA8F7BF11294DDC8E36287 ; MKBv36/BD+/BEE/VUKNOTVAL!/FindVUK 0.81 -0xFC20602607E321E0BC9D2CC2581CDA81BB520E2B = WOLVERINE_3D | V | 0xACF786C46EA4CB24A8C8649AC0CB63CD ; MKBv31/BD+/BEE/FindVUK 0.80 -0xEB4D46291F442AA9D1E5144F8C9478B3FE736DB2 = WOLVERINE_3D (The Wolverine) | V | 0x57B43A6BBFF924A146CC464E3F3997F4 ; MKBv31/BD+/BEE/FindVUK 0.96 -0x545F6425AE0221D3A517D2B0E54B45DF4155D569 = WOLVERINE_FS | V | 0xDBB1F35E63215B1D36395F66E865B9F2 -0x45AEC03B6182DA2FA50F85B99ED97E0CEA91725E = WOLVERINE_ORIGINS_F3 | V | 0x7EF8199AD008F5650A12DF359B8F0758 -0x45FB466D01AC98C07E26546296DDEE6D8B95996F = WOLVERINE_ORIGINS_F3 (X-Men Origins: Wol | V | 0xBCD7850FF185328F1E432723D56C7177 ; MKBv14/BD+/FindVUK 1.00 -0xF6D6752FC6D8D57F81F5DF9BAE4C5D957D52D3AE = WOMAN_IN_BLACK (Woman In Black, The - Bl | V | 0x69E4B9C4E6B7542E3A85F090CB2F7550 ; MKBv30/FindVUK 0.96 -0x3CC4F9100E4C97B6774DFB74AB86A29CCFA3E3A9 = WOMEN_BD01 | V | 0xCF38ADDD1058C24218F768C23100AF44 -0xCB2CB59A6EE714AF1573BD5D9CFCC3BBB5030479 = Women_in_Cages_Disc_1 | V | 0x9272A2FED04D0CFAA2BBDFF25F72CF7B ; MKBrev 25 - FindVUK 0.54 -0x707DBFCE6AA363C8CD98A6534E9BE84AFF29E50F = Women_in_Cages_Disc_2 | V | 0x321BD73EAE18276FA3324FDA3F345FDE ; MKBrev 25 - FindVUK 0.54 -0x4C3C125C8FEF0416C3BCF10B7CF9D2AB905DBDFF = WONDER WOMAN | V | 0x4F9869E8F02F94F12F30575B9D26F9AC -0x264DF0B24C8BCD53A8B9D86EE4BC13B2E6C068B9 = Wonder Woman | V | 0xD739B15BC551D5AEFE0BE3326A73EFC2 -0x1BADF80A542E6FE594C09C1EAED1F114E25F1BD3 = WONDERFUL_LIFE_D1 | V | 0xD804789ED10CBBFE475D9348BAE46BC9 -0x8049C5CAA72A457B3C35FBF815044809A8B2AEEB = WONDERFUL_LIFE_D2 | V | 0xAA1E5F871AA2C8CBB138FA363053C82A -0x3200647F770C3BD41737E813E8B366B062A2FDF2 = WONDERS_OF_LIFE_D2 (Wonders of Life - Di | V | 0xFB25A68FC0D5A85D47AF624BEC75981F ; MKBv33/FindVUK 1.02 -0x4ABDC2D90C2979118F3CEB553827EB6D60FE6846 = WONDERS_SE_D1 | V | 0xC64C9622C877032EE26AE9BBBA869853 ; MKBv23/FindVUK 0.80 -0x0095F933E9A1ADA6A7B93B81F8CE12E193750C32 = WONDERS_SE_D3 | V | 0x1C6BC071410D8CC7DB5F17E3B3A4F13D ; MKBv25/FindVUK 0.80 -0x2BF2BC60B3E52B1A5EBC5A325AE2B3FCDCA3B37E = WOOCHI (WOOCHI) | V | 0x65987C791D05552744F9132E9EA3012B ; MKBv20/FindVUK 0.84 -0xA3AF0D64D160DF880F97107014D997AFFA450333 = WOODLAWN (Woodlawn) | V | 0xA979AD3D0017F70589A11AA8F7DAE37C ; MKBv57/BEE/VUKNOTVAL!/FindVUK 0.96 -0x89D08611491C8D70B250DEA77C83D611FA0EC901 = WOODSTOCK DIRECTORS CUT BONUS (WOODSTOCK | V | 0x81302F80AF52856521A589652009E2A2 ; MKBv12/FindVUK 0.96 -0x13F43B55E56AA977871529BA7466E63C1C15518C = WOODSTOCK_DIRECTORS_CUT | V | 0xDA34050E2B4CCC46DED89739CB47D8B4 -0x075DEBBEBA6B4901B7FE9BC617B6E8A88690777E = WOODSTOCK_DIRECTORS_CUT | V | 0xA56E7336EA7BED3001CCE0AD7BBED4F6 -0xA70553514449836F97E21E82353BF9A679AFF512 = WOODSTOCK_DIRECTORS_CUT | V | 0xE49E735A3A8B9545BEC6A2629CC2B077 -0xB165A7469F84B717180E1B020F74281B35F4D0B4 = WOODSTOCK_DIR_CUT_BONUS_REVIS (Woodstock | V | 0xB1357032B7E1494F2F97199C04740208 ; MKBv47/FindVUK 0.99 -0xE55ABBF78477FED2B098F74A18DE76C821678FFF = WORLD GOD ONLY KNOWS DISC 1 | V | 0xB8DE2D2B0E824F2CBE30D41CE970AA7D ; MKBv28/aacskeys 0.4.0e -0x0B52D643591BC2B4DB93F2D7CFDE267B6CF96CAD = WORLDS_END_G51 (The World s End) | V | 0x377874CCA25D0D84469C559A07FA5F86 ; MKBv43/FindVUK 0.96 -0xCC239CA8CA8075095F4877170AD4AC2F7D9F76E6 = WORLDS_GREATEST_DAD | V | 0x742A78D29100052883AB74E59ED42C76 -0x626B5D5CBC2E86EB68386844779A3FE1ECD962EF = WORLD_NOT_ENOUGH | V | 0x3A41BAE168F4EF5999DA7B97D40C151D -0x6EE17AFFB373A2A52228FF8CEB5AD21E6E1057AF = WORLD_NOT_ENOUGH (THE WORLD IS NOT ENOUG | V | 0x899BE64B1CBFA89B9603AAD29F6FD8B0 ; MKBv10/BD+/FindVUK 0.99 -0xA45DC632DF9EE7C472893F834B09E00657DB3D2D = WORLD_NOT_ENOUGH_F1 (THE WORLD IS NOT EN | V | 0x658FBF6315F5BFB4B4682578ABE76E9D ; MKBv12/BD+/FindVUK 1.00 -0xD24A97F5312681A4B7D5EE9B9C1804BBA884F2BB = WORLD_NOT_ENOUGH_F1 (THE WORLD IS NOT EN | V | 0x514F7FA062A47005714C97BDE5F1E315 ; MKBv12/BD+/FindVUK 0.96 -0xB00F45E3C5A7FFC97B089C2EC4458AEFEA828740 = WORLD_NOT_ENOUGH_F1 (THE WORLD IS NOT EN | V | 0x60B2B3F4159B0DC834E00D2A8CE2E5BD ; MKBv12/BD+/FindVUK 1.00 -0x30B5BC7FE969FFFC06BEC15207F3DD40E6E33D5B = WORLD_NOT_ENOUGH_F4 | V | 0x5775AF1A8EA2D7BB27EC3E00DFF55BD4 -0x849E0586727DE84D9A98DC6446AAD12306FA505A = WORLD_NOT_ENOUGH_F6 | V | 0x27034429C3458ACC8C70561749A789D4 -0x351A9D604D12BA327F2869D643DFEDDE2B1BC0D6 = WORLD_TOUR_2015_IN_FUJIYAMA (WORLD TOUR | V | 0x82CE4740B638DDFC8C9155DAA637063A ; MKBv57/FindVUK 0.96 -0x05F672BA1E45518EE6804DCE3ED1FD92F9B6275B = World_War_Z | V | 0x22E5018EE20AE5905C1A63BDD94EB2C4 ; MKBv31/FindVUK 0.81 -0x8014B3D9635A7DA9B95A5F8F98883BABBF7BCA05 = World_War_Z (World War Z 3D) | V | 0x2516AB6259A3B359359B73C9C3E458D7 ; MKBv36/FindVUK 1.02 -0xF888F929FD21F0DA566AA11F082E3370C639A9CA = World_War_Z (World War Z Extended) | V | 0x0A1F8696BC8A5DC956EFF8D39FB7A7D1 ; MKBv35/FindVUK 0.89 -0x8C0E0E7D2509E298DB45BE5BB46A6340E322D7DB = World_War_Z (World War Z) | V | 0xA13DC86F0F18A38FFB8B6447AA5793CF ; MKBv39/FindVUK 1.02 -0x35365A812556BA86F4B2D0067005C89522CBD006 = WOYZECK | V | 0x25F03230E6B502BC95490B8881EED106 ; MKBv47/FindVUK 0.99 -0xFF0225D11D5BAC1F78D1E2C498593147A7AD7002 = Woyzeck (WOYZECK) | V | 0x4294AFF6D415ACB7B1FEA5A68404B5F8 ; MKBv47/FindVUK 0.99 -0x65A92DAAC3F5E96E88F2D14A8729A3AA567A2A6E = WRATH_OF_THE_TITANS | V | 0xC3BFD32F88A4462C9B072FD6EE2BFC27 ; MKBv25/FindVUK 0.81 -0x35CEF0824C4A1DD026530D76C1D58CC74912C5D0 = WRATH_OF_THE_TITANS | V | 0xABD75519B8EC040DF2D0A489EC6D427E ; MKBv25/FindVUK 0.81 -0x2836366C92AD61D8E56B4ADDEB8A9F316A65B3B7 = WRECK-IT_RALPH (Wreck-It Ralph - Blu-ray | V | 0x9214610A15E2E86260165DDD0D02E5BA ; MKBv35/FindVUK 1.00 -0x265B6E79594E3F5BC059BCADD56099E7FE912041 = WRECK-IT_RALPH (Wreck-It Ralph - Blu-ray | V | 0x9C8E8BA5982B0D18ED8F93B727F2DECC ; MKBv31/FindVUK 1.00 -0x13A12211B632FECC9C0EF0E9AEFB7990EA612293 = WRECK-IT_RALPH_3D (Wreck-It Ralph - Blu- | V | 0xA66FA0CA97EF055C8D402C5E82947122 ; MKBv31/FindVUK 0.99 -0x6D706848D0F9EDC0DA2D566565555CFE0B69574F = WRECK-IT_RALPH_3D (Wreck-It Ralph - Blu- | V | 0xCB96B6CA5BD17EC97ABEED13A6F45445 ; MKBv31/FindVUK 0.96 -0x6E441AFF3DD3ABF0935E7EE9B4FAE372262D9FBD = WRECK_IT_RALPH (Wreck-It Ralph - Blu-ray | V | 0x24A0C7E34D873DC1902C754A95EC4B6D ; MKBv35/FindVUK 0.96 -0xC15A84E234F17F16038C334398E9288A3B8CD4CE = WRECK_IT_RALPH (Wreck-It Ralph - Blu-ray | V | 0x97272863C7DCCB75CD99FF613891AD07 ; MKBv31/FindVUK 0.96 -0xD9790970C83B066AC35AC22D5E850A3B51821BB8 = WRECK_IT_RALPH (Wreck-It Ralph - Blu-ray | V | 0x5350FCF5A4A8AE7CC5394991552368D3 ; MKBv31/FindVUK 0.94 -0xD6133B6E56E9930CD4C549D0D494DCA17D0B137C = WRECK_IT_RALPH (Wreck-It Ralph - Blu-ray | V | 0xB5BF3AF0FF1FAF3102AAE0E0E753FD81 ; MKBv31/FindVUK 1.02 -0x88A4530DA2C28668429BD35DA0251406C347D94E = WRECK_IT_RALPH (Wreck-It Ralph - Blu-ray | V | 0x1BA6F03E0D9C746A92C518E3676CD64A ; MKBv31/FindVUK 0.92 -0x483F82A6CC19B6632250D7EF6E52F2DA2D413E68 = WRECK_IT_RALPH (Wreck-It Ralph - Blu-ray | V | 0xD93394C38BC83909AEB8F8DCF181E15C ; MKBv31/FindVUK 0.93 -0x63A1285A901046E387113CCAD49958C98167661B = WRECK_IT_RALPH_3D (Wreck-It Ralph - Blu- | V | 0x88242437D57F694DB20405495662D870 ; MKBv31/FindVUK 1.00 -0x3626C7C07BB316DD95E557762485409A4DB23187 = WRECK_IT_RALPH_3D (Wreck-It Ralph - Blu- | V | 0x9C9EC8C60CF5933DFF8182556E0A719D ; MKBv35/FindVUK 0.87 -0x4C72AD21487620C34800879381EABFA74B7344C7 = WRESTLEMANIA XXVI DISC 2 | V | 0xDCD3870FFBF56A7D54C23F53411F682E -0xF949C6EA855984DF126402899D2BAA7F6E4DB470 = WRESTLEMANIA XXVI DISC 3 | V | 0xAE97D530281DD4E1F1B998329C370107 -0x056E3C22C13F212A857589F70711DAA2EB8A5D5F = WRESTLEMANIAXXVDISC1 | V | 0xCA0318D3CA7195D4B44A84E4E5D5AA91 -0xA3DCC7D77E82492A230BA339604233D42B9273AA = WTM1EGE1 (Race to Witch Mountain- Blu-ra | V | 0x96E7FDF3DABEF206EF208D7A09DD349F ; MKBv12/FindVUK 0.96 -0xEB03507AEFE28C3502CA1223D629C8EBAB194F67 = WTM1EUE1 | V | 0xFCB9334F61378EB113EEFCC13141C849 -0x03A6832DBEAB34E2FFB353C7849CBEF415A34661 = WTM1JJE1 | V | 0x8C24D21AB0AD71B0D0B1E0DF18D012A3 -0x265D2834E42B9C321E6D74F53A32EBD5DA67BC63 = WTM1NNE1 | V | 0x2E635F0CD9157D34F0454A639E2BF169 -0xE7BDF6AE3293EB5E437075F4BB51BF7BF2798C88 = WUESTENBLUME | V | 0xB56BE9EAD4F5F3C6BDB7FAC37D6633A9 -0xC62C01654439A25B1FCF213B8CFFF67930F53932 = WUESTENBLUME_BD | V | 0x161034C5FD5DA282735BAD5DACE4CC73 -0xB4ED72B5618E705181A24193AFCAE974E787E29D = WUNDER UNSERER WELT (Wunder unserer Welt | V | 0x0DD139E94957939655B5EBB4D3C05397 ; MKBv57/FindVUK 1.00 -0x1FC6A9F4A9C852EB80934D10C65BA8F02DF67F9D = WWII IN HD D1 | V | 0xF39B691E912D836224971EC5783180C8 -0x42274967F16F25EB7457DC5BB9AF0CFDBC6230FF = WWII IN HD DISC 2 | V | 0xF23D476D6E297FB904015B3C35E8CE14 -0x36FCCD847C05F28669A422DCEC53F8AEA786C894 = WWLE Disc 2 | V | 0x1ED12F6BDDF6554D1FB67B477161E5F3 -0xAED19BE1F340500898736314D3CC8B7AA17EF6F0 = WWLE Disc 3 | V | 0x7E0528C8C5012374AE6C34E46F090A1F -0xEA1E958AEC52FAB39D90640C14F7080A2956E401 = WXIII PATLABOR 3 (WXIII PATLABOR 3) | V | 0x20450D5F11C94E7314C26DE848010AA1 ; MKBv35/FindVUK 1.02 -0x8BF1D1E2DF7188DF9D86B675454DF6B1C2FAA299 = WYATTEARP_B5_FEATURE_V3 | V | 0x7622E645704AFEC2CEE6DC523866379F -0x7AAC34C395D9257817801D38EA6998CB0A091828 = WYATT_EARP | V | 0xF206359107473E5468CDB1ED834A6823 -0xC630D418AFE12DE282BCDD183D4EC5B42F087B62 = X-Men - Days of Future Past (X-Men: Days | V | 0xAD0510EF6A920F92285E3371AEB077F7 ; MKBv47/BD+/BEE/VUKNOTVAL!/FindVUK 0.86.3 -0xD90F3ABA564AA16B0A412EC6EA506649D2FC1373 = X-Men - Days of Future Past Rogue Cut | V | 0xA3F503C0961722703EB2D02FAD2D5182 ; MKBrev 46 - BD+ - BusEncryptionEnabled - -0xA5595A293A003B2A6CF6459807509CA88AD258C3 = X-Men Apocalypse | V | 0x453DC1697FC65A06483EE473C440EB33 ; MKBv50/BD+/BEE/FindVUK 0.80 -0x3199E3602673F427025AE5890536A0FCDB0E04CA = X-Men Days of Future Past | V | 0x83AACFFA62BED82BA6E631E1253C67B0 ; MKBv47/BD+/BEE/FindVUK 0.80 -0x6FA566EA5343659097675B7BB0E70CB428B7F201 = X-Men Days of Future Past (X-Men: Days o | V | 0x8C42FD8041B182A68FCA6167C182B0AC ; MKBv47/BD+/BEE/FindVUK 0.98 -0x9712496BD13199F3D487C16009181CE982B241A5 = X-Men Days of Future Past (X-Men: Days o | V | 0xA42C9F90E53ED74DDA169CAEEF64A14D ; MKBv47/BD+/BEE/VUKNOTVAL!/FindVUK 0.84 -0x12BDFC08FA109C5B94936896D7CCE8D2159CEF46 = X-Men Days of Future Past Rogue Cut Spec | V | 0x076ADB04F68792AFB2CDECC5B15844C5 ; MKBrev 50 - BusEncryptionEnabled - VUKNO -0x1E4FB5894397A7D5777BA70E6286C3199A201C7A = X-Men_Apocalypse (X-Men: Apocalypse) | V | 0xD590DF0687696309641A89DC0E221057 ; MKBv56/BD+/BEE/FindVUK 0.99 -0xDB7D9F72E40D0A1222278AFB27C09D18568458B7 = X-Men_Apocalypse (X-Men: Apocalypse) | V | 0xE9B8E87943D571A05C20A98098EACE75 ; MKBv50/BD+/BEE/VUKNOTVAL!/FindVUK 1.02 -0x3535D83FAD218F97E0F6211DE6CA4064A634C5D2 = X-Men_Apocalypse (X-Men: Apocalypse) | V | 0x49F09F75347C7080EC43A4AB46E41286 ; MKBv50/BD+/BEE/VUKNOTVAL!/FindVUK 0.94 -0x255A2AF95D6555A166BEA1A1F2E5CD57BBB23089 = X-Men_Days of Future Past | V | 0x28FD32E3A99EF85DC0156A02B1FE6B32 ; MKBrev 46 - BD+ - BusEncryptionEnabled - -0xCAA21651B3C567E745DA1BB2854D3A01F7A00C36 = X-Men_Days of Future Past (X-Men: Days o | V | 0xC8B1361E29AAA478DD562A1F3B36ACF5 ; MKBv39/BD+/BEE/FindVUK 0.98 -0xCE6E3E9298472EAD5CE8E2AB827912E7655B6F59 = X-Men_Days of Future Past (X-Men: Days o | V | 0x8D9110F01E7CA9D16A297B09829E824B ; MKBv39/BD+/BEE/FindVUK 0.98 -0x424958869AA95118650D265C9E4F0A95141D87F7 = X-Men_Days of Future Past (X-Men: Days o | V | 0x2F316C7BAC18A2DE7E0183A112AE2406 ; MKB 39 2014-06-30 KRJ BD+ -0xBCC58B56BFDB5233B90E7C2F2A1D0E5893BEAD6C = X-Men_Days of Future Past (X-Men: Days o | V | 0x8DFE3E2428557C1EB04EFF33984C758B ; MKBv39/BD+/BEE/VUKNOTVAL!/FindVUK 0.95 -0x07D1F066E17834697D6C48B20718945AF0A4050A = X-Men_Days of Future Past (X-Men: Days o | V | 0xE60F9C8ABBCD617941542C6F08921D7A ; MKBv39/BD+/BEE/VUKNOTVAL!/FindVUK 0.84 -0xF3164402E47C84A2651653AF041AE1FE68469B0A = X-Men_Days of Future Past (X-Men: Days of Future Past) | V | 0xE1E89CA17D712E859C92D19B8C3B74DB ; MKBv46/BD+/BEE/VUKNOTVAL!/FindVUK 1.00 -0x56BD6476CBB3650E64B12CC69710507DA6D65665 = X2 | V | 0x92230B3642DDF1A224FEE2DC50CC4040 -0x87FD584DAAB2199F344A5B2047BF1375F75902C8 = X2 | V | 0xF495FB0753A2CEABD866AE4A49455D48 -0xEBA27EEF7651757925C3E757F2806EFE35D48C77 = X2_D2 | V | 0x6084AB7DA129A88C5EA27A838586F28A -0x8C41FF9CA364BA3067762DA4E5BD4435C7E17968 = X3_D2_F1 | V | 0xC0885C85A537E58D7A6E108742A7C2BB -0x64DEA321231D490B9C1D5692661A504E92A4D1BE = XAMD COLLECTION DISK 1 | V | 0x7332EF7E956827C8AAD8DDD0470C5228 -0x8F8ED9E34F2484ED74F888621E837252F251AA05 = XAMD COLLECTION DISK 2 | V | 0xB9C78FBBF718C12CBEE07A6D559B56C3 -0x91BC926C948BFA84210E23105AA99E356F7F2002 = XAMD COLLECTION DISK 3 | V | 0x7638136ED8640B7C584498AFFA0D7BB5 -0xABC2A0A171ABD46E75214E61029ACEDB51D441B0 = XANADU_NA (Xanadu) | V | 0xD1775C865FC554654EAA394176B9394C ; MKBv57/FindVUK 0.99 -0x1ED20ACE7DBDDE6CAEEAF07D6C1DAD5570A912CF = XIII | V | 0x02BF97F2D1907D7F434DDAFB7DE61475 -0x917BEC5CE7519996F102A731AF3BA2097A88CC73 = XIII | V | 0x3F3F344ACC0E4A47DC7378E9DBC3E798 -0x0F2C59C89D1C326FC45D7F1E3F04C751818B6B23 = XMEN | V | 0x641F9F58D05ABD27217A2C537A1126E4 -0x24BE156434B7510B9A84705C2FFE82C22F9837D6 = XMEN (X-Men) | V | 0xE897D49300709BA9B5EA2446D02FBC0A ; MKBv12/BD+/FindVUK 1.00 -0x110182DFA4F8B2B6C1C007AD07E7E7DF52B1FEAB = XMEN (X-Men) | V | 0xF53CD7E7F6F4FC8E0AE7769D091EA906 ; MKBv12/BD+/FindVUK 0.99 -0x36AEA96A68760BC491EFB9201A8338F9BCA65F9C = XMEN (X-Men) | V | 0xF0277AE499D293E1F290950B192C94D6 ; MKBv12/BD+/FindVUK 0.98 -0xDD04287E45AFC6770AFF32B3C8715C1209630EC1 = XMEN (X-Men) | V | 0xE1D677B6CCFA628CE5A684ACC5E3870B ; MKBv12/BD+/FindVUK 0.95 -0xA985B700EA6B2C3D8E42B757AA38229A6F9EF5BE = XMEN (X-Men: The Last Stand) | V | 0x14004BAD6ACFBB4BD076CB856F30BEBC ; MKBv12/BD+/FindVUK 1.00 -0xBD03EFE8EEE1370ABB6714FBEDEA88F86A1F3AAF = XMEN (X-Men: The Last Stand) | V | 0x7E14F59FFE21E4D6D0C71CA901AA1285 ; MKBv12/BD+/FindVUK 0.98 -0x506CAEC9D92F11E8E302C3D4A3546A02856DDD46 = XMEN2F1 | V | 0xBF41D1502CBEF1FAA24475C245AC5F8E -0x048E6C04C786E5792FDC4974EE1390D7DDCE30D5 = XMEN2F1 (X-Men 2) | V | 0xB1C8593A25B9E103F08A8E3E4D9F6591 ; MKBv12/BD+/FindVUK 0.98 -0x71766A9816DFBE67F564A4123E479F30F4A52B22 = XMEN2F1 (X-Men 2) | V | 0x701D1FC45150F100D9D34C5B8BB0A263 ; MKBv12/BD+/FindVUK 0.95 -0x6E5F7FDC2B9DB4DA2B2A225D76FCD6B2A149756B = XMEN2F1 (X-Men 2) | V | 0x6EE2EAA6653CD5DDC51A8DD60BD27B02 ; MKBv12/BD+/FindVUK 1.00 -0x0C562F84E06B226D69B53009D496D425D4BAFF92 = XMEN3 | V | 0x405F0A3FE931014370516C9550676198 ; MKBv1/FindVUK 0.98 -0x08346018C3D2C8CCBC1C7763B8663EF4695B7C69 = XMEN3_DISC2 | V | 0xB6E326A9A1D1794BCBF6EFE7DAE970B4 -0xA360A293800AFD0CB61238896972190EB8E512ED = XMEN3_F1 | V | 0xA9FE5DFE2685319FC39825A6D1D0A1BF -0xA2AE6C96AE993F3B8879005DC01B00B064E6D008 = XMEN3_F4 | V | 0x2F684ADA0825BB11685A09BB342568A0 -0xDE539BE23FC87EE2FD8BFDAD97812BF1AE5CA2D2 = XMENORIGINSEM | V | 0x5F6C66D7971533695AF2CF96D47F0E14 -0x20AB0BC577B27AA7006EE8818E69C36C08B75EAC = XMEN_F2 | V | 0x574BE1C95CCAFE76C63157EBB3FBC402 -0x6ABA64F2D8F56AC6F7E3C609FBBF0B8027DD6530 = XMEN_F3 | V | 0x125861B4FF94C8A5132128A04287FF3C -0x3664CD75D6C7F4697C71626C717064A09A0FCBB4 = XMEN_FIRST_CLASS | V | 0x45EEBEE7AEE67330D02526523CFD8BBE ; MKBrev 25 - BD+ - FindVUK 0.54 -0xD3C5F438940A0A08E14E9143214ED4A32BB0A425 = XMEN_FIRST_CLASS | V | 0xEBC3116FF70FD055F0EC08CEBC258E91 -0xFE93A37674645E75A576B3F2F09794B02192CCE7 = XMEN_FIRST_CLASS (X-Men: First Class) | V | 0x66DDB1ADAA40C33E33DF5EDD4B04549D ; MKBv19/BD+/FindVUK 0.98 -0x5C124062D1BD82AB8917EDDE0B110FF6C6FE18D8 = XMEN_FIRST_CLASS (X-Men: First Class) | V | 0xC3AC6C5ADCD3994CB3FA8044A45BFAB5 ; MKBv20/BD+/FindVUK 0.98 -0x4CB773FD9395794ABB8ACD5DF038C354933EA8AB = XMEN_FIRST_CLASS (X-Men: First Class) | V | 0xA5C82A1D5CBCC041AF51D619D7C469AA ; MKBv25/BD+/FindVUK 1.00 -0x159D40243D29849ED855C1B6632C56306E913E64 = XMEN_FIRST_CLASS (X-Men: First Class) | V | 0x69B5914CD7D2CB7ADD5273569BB412F1 ; MKBv25/BD+/FindVUK 0.95 -0x62F86070508B6D8B3C81AD59A4DD297775267161 = XMEN_THELASTSTAND | V | 0xED689ECBF5FFACC0705BE1ED51DA98A6 -0x94205BB520E5DDC75D132D55150379A4847F0343 = XMEN_WOLVERINE | V | 0x2026A23E07DDA8D3A5DA0CB55365C31D -0xA2314AFBC09D96D933C6F83672F2DE76C3BFCCB3 = XMEN_WOLVERINE | V | 0xA578F316644A57756CD1451B345FAAC8 -0x029383066C63DAEA18E280D04ACA06C5EC7532F4 = XMEN_WOLVERINE | V | 0xC6F86198C1736E1C16E0EC7EF8A494DD ; BRAZIL -0xEF3E6626F6B8DB61A6CD7A9793EDCC362DF51740 = XMEN_WOLVERINE (X-Men Origins: Wolverine | V | 0x7DFC9D0954616F7B3CB492E014132FF1 ; MKBv12/BD+/FindVUK 0.98 -0x27877E839FEF6EEF9B27A40961E769FA1D1257E6 = XMEN_WOLVERINE (X-Men Origins: Wolverine | V | 0xB45669268B012757AC567D0781441422 ; MKBv12/BD+/FindVUK 0.98 -0xDD69E94610FF3E58D37CCD08C86533BFF8D98839 = xXx | V | 0x818F01932FE6EF2C05BDAFD1E7059AA9 -0x7FAF104A690D6DA38AA612AE7E03BF9955470DBC = xXx - State of the Union | V | 0xD7EA66BD8B57B2E9329DF9D2E44EA8F9 -0x494BC8BBD8400F7063391F9E2D9057D9241F21A0 = xXx_Return_of_Xander_Cage (xXx Return of Xander Cage) | V | 0xE73FAE2C5182ECE7024E3C7ED51DF5A0 ; MKBv50/BEE/VUKNOTVAL!/FindVUK 1.02 -0xD264C90F3C2CB6E8DB596F85BEAE3131B3A39D7F = XXX_STATE_OF_UNION | V | 0x73589FE2D5232C7A3FB33842F4A5EC4D -0x50EE0CA6803590D907E3ADCA985BF30847972F2D = XXX_STATE_OF_UNION | V | 0x3DEE5C3B22060E69CCD37AEE1A8D7E1A ; mkb v7 -0x63809E0A29D3480DB0F19C2F1982B41AE57E388F = X_FILES1_F1 | V | 0x1DFF09C8862F2AF73C8D21F910F1D352 -0x9E5492CE380D30CB8B85AB0B47906144A28773A3 = X_FILES1_F1 (THE X-FILES�) | V | 0x00802DF8FFD0B89E32B74480F3031AEE ; MKBv9/BD+/FindVUK 0.86.3 -0x2178E423B1304BB5EFC3098C47C8A2F5BE328845 = X_FILES1_US | V | 0x3F84B4FDE77054E1D78D906814C59A74 ; MKBrev 8 - BD+ - FindVUK 0.54 -0xAD0FC90E985578DDDDA85D0B2AD677BDD1644FC9 = X_FILES1_US (THE X-FILES???) | V | 0x93CD4F550142320A62C2A6C534C1E5F5 ; MKBv8/BD+/FindVUK 0.96 -0x078BD2397262B5CB421D42E7FD1062F86B0EB37D = X_FILES_1_F6 | V | 0xDBC72A92F2B4F12F51721F82E554450F -0xD0F9C755DEBAA1F86C15230AD2CFE3DE6C23C9D2 = X_FILES_2_F1 (THE X-FILES???: I WANT TO | V | 0xCDAB587B7B73B6C0700FB9F0A7D705B3 ; MKBv10/BD+/FindVUK 0.92 -0x9225843C56252D057893097A5EA5A076A3036FED = X_FILES_2_F3 | V | 0x025095DD6E63AE3EE00C118F66357096 -0x35FE49D0AB776E41696480B3A8316DA6A3DC5083 = X_FILES_2_F5 (THE X-FILES???: I WANT TO | V | 0x5C5F8B700E82BED66DB55858666A6BBA ; MKBv9/BD+/FindVUK 0.94 -0xF65EB5F7BC8CE53069EB3B6B00CE76A46470A6DD = X_FILES_2_US (THE X-FILES: I WANT TO BEL | V | 0x9892887E2031EAB6540A2FE439FFA588 ; MKBv8/BD+/FindVUK 0.96 -0x3C02B708C9CCFDFA736EC6A9D275A75B24488EC5 = X_VISUAL_SHOCK_BD_BOX_DISC1 (X VISUAL SH | V | 0x207D790BD1CED32A79EF6E98B0858343 ; MKBv62/FindVUK 1.02 -0x2858FBBB32B5866B5B2D2AFFF418F27655F28C4C = X_VISUAL_SHOCK_BD_BOX_DISC2 (X VISUAL SH | V | 0x2C3DAFCE8298BA5461CD09B58E9F19B3 ; MKBv62/FindVUK 1.02 -0x89E9D40545A22362C2F7E7AEF17187CF5D727A3A = X_VISUAL_SHOCK_BD_BOX_DISC3 (X VISUAL SH | V | 0xA6E419A7B6825893B96C219A5303709C ; MKBv62/FindVUK 1.02 -0xD60E5AEAA48B72BA3AB3EEEF12D8F0F3ED9B4BA7 = X_VISUAL_SHOCK_BD_BOX_DISC4 (X VISUAL SH | V | 0x120202FDA7CA72FC1592F24A30BA2956 ; MKBv62/FindVUK 1.02 -0xBDEDF7E14F28703198EB9B7566CC98348BB93F97 = X_VISUAL_SHOCK_BD_BOX_DISC5 (X VISUAL SH | V | 0x4951254C30F4923D538D3528B08D2C67 ; MKBv62/FindVUK 1.02 -0x324AC1916211BBE99082B9A97DBAC4D4582A4C01 = X_VISUAL_SHOCK_BD_BOX_DISC6 (X VISUAL SH | V | 0x928B69180CBC01C93FE5C42C5ECD400B ; MKBv62/FindVUK 1.02 -0xA26F7DAD2EE396CA1354376881441B9B1B599757 = X_VISUAL_SHOCK_BD_BOX_DISC7 (X VISUAL SH | V | 0x35A93069E4D2BA3C8CEB2809D1DBC685 ; MKBv62/FindVUK 1.02 -0xFC3781079CC0E3211B18C8CCB8A4C31F35136909 = X_VISUAL_SHOCK_BD_BOX_DISC8 (X VISUAL SH | V | 0xDD7D2D903827ED502624D422D997B45D ; MKBv62/FindVUK 1.02 -0xF11F556E1358E6FB10828FAE1179699C4855128F = YAMADAS_FIRST_TIME_D1 (Yamadas First Tim | V | 0xB7BCA0AD65B0973977B4A2F25FED5E9D ; MKBv26/FindVUK 0.92 -0x5585739489E2E9EB659F56B67A35ECE07F506A3F = YAMADAS_FIRST_TIME_D2 (Yamadas First Tim | V | 0x260F40E26F7E1D7561CB9B5C732FCE57 ; MKBv26/FindVUK 0.92 -0xC5AF20165C18722332F1294416AB9A5060B625A9 = YEAR_ONE | V | 0xD8D74975D3F46F9BAE085B51594A080D -0x861A2C5E2D1EAA143B160FAFCE554DC54261C94E = YEAR_ONE | V | 0xA5327FB1C035F21AA6853484460E368F -0xB920F15FBC7040C0F9B2310FACA176DEEF3AE386 = YELLOWJACKETS | V | 0x64B280AA407AF12164904FB2BE293891 -0x4F5356311142A3D642C7D35E51EBDD875F423B3A = YELLOWSTONE | V | 0xA20465F5B0580086F13C979F30E769C9 -0xEEE0F0F4B319D1C589DAA47F08749AEA57E40666 = YES MAN | V | 0xCDAD1A5737CC2A0A5EB5E636A12EEAB5 -0x25F341C6D5ACF0C8BC1353C94A57AE8D4DDB6142 = Yes_Man | V | 0x3A67450A3FAA7C843B7B6E00D6917D0C -0xA3A21792F76CB9315CA2A1B91D38143F69CDF6E8 = YES_MAN | V | 0x3F23A9CBA3779FB287CD86244AEAB02D -0xED1DD5E12504733F02260E5D843D01A3C629EDC6 = YES_MONTREUX_2003_EU | V | 0x8A36A8E1AC7A605EF7A643D03AB3BDE2 -0x3355088B93A625548C4DDEC4D4CF6FD2EB1C5015 = YES_MONTREUX_2003_US | V | 0x892C735FDB57327695EAA2D5F2A5801E -0x96D48B616A0EC85667BB4D8AC347A67566DCA542 = YO TAMBIEN (Yo, También) | V | 0x036A11CE9650BB6DD7EFD07E62A81AB5 ; MKBv31/FindVUK 0.98 -0xD00671217DF53110FBF61DAAECF0DDFDC7F24B5C = YOGI_BEAR (Yogi Bear) | V | 0x339ADD31EF05F7FCF8A57D65080F3AF1 ; MKBv19/FindVUK 0.96 -0xD5B4ECA0ECDA7D6FB6A9C42C20DB7384A8CC94C1 = Yogi_Bear_3D (Yogi Bear 3D) | V | 0xCF53F83C307FABDFE538A81614C47EE4 ; MKBv19/FindVUK 0.96 -0xF7038C776CC4B7A1E112A336FC58771C69F4E783 = YOJIMBO | V | 0x96A52486C5AAC3CECF1E247AD35544B1 -0xA1A0693B4509B643C99CFE933489403FCC72AD67 = YOJIMBO_SANJURO | V | 0xDE585462F005E0BDE0678877D9B5AAD3 ; MKBv47/BEE/VUKNOTVAL!/FindVUK 1.00 -0xC348242A2E0F98C822B0EE246BEB04D17A395BC1 = You Again | V | 0xC06CB3A72E722F276D266EDBC8403BDA -0x2DAD0978E0E31922698B91FDB664DA75E93E6136 = YOU ONLY LIVE TWICE (YOU ONLY LIVE TWICE | V | 0x82072D9FBB8E61DD354D647482B4C96E ; MKBv28/BD+/FindVUK 0.99 -0x29AC36A8A8903856BF98030B55F0D178032D6D61 = YOU ONLY LIVE TWICE (YOU ONLY LIVE TWICE | V | 0xD8169B8BAD20397DE3FA6176D8C631A8 ; MKBv28/BD+/FindVUK 1.00 -0x5E4D0F0EC45913E55BA7E22745EF036752B420CE = YOU ONLY LIVE TWICE (YOU ONLY LIVE TWICE | V | 0x9B9FE74C204ECBCE8EB9887395782E7A ; MKBv28/BD+/FindVUK 0.92 -0x13A20555B600DBAE3DB73167F7FB2F7A2005BB06 = YOU ONLY LIVE TWICE (YOU ONLY LIVE TWICE | V | 0x248FC81C02000D17E4D6AED9A3021D0A ; MKBv28/BD+/FindVUK 0.89 -0x862366742935B1C5E04E2497B3315EDE4DA7CC2D = YOU ONLY LIVE TWICE (YOU ONLY LIVE TWICE | V | 0x65F9B13FE87EA356F0C192113B8553DE ; MKBv28/BD+/FindVUK 0.92 -0xDEDE637E58636F07CD35945CA0C9E7E8E3E63FA4 = YOU ONLY LIVE TWICE (YOU ONLY LIVE TWICE | V | 0xC2505FF9A3B665737529D449558257C2 ; MKBv28/BD+/FindVUK 1.00 -0xC25961D2FC41FB25915D8E870D03CFEE72005B0C = YOU ONLY LIVE TWICE (YOU ONLY LIVE TWICE | V | 0x7378A27683FD2A719311B590D98E6D8D ; MKBv28/BD+/FindVUK 0.84 -0x6A938E4801F054AC0DCB1BB0705BBB648235DCA6 = YOUGISYA_X_NO_KENSHIN | V | 0xDE7783A7451B3D49828CD1B7B8C74013 -0x84B498E8E653A0677C2407619C15F6841740E93C = YOUNG ADULT (DE) | V | 0xA019EF27823D2B1FE8C13B1B8BAFA117 -0xD1B79314EA572B28F7524F110473CB6424B36C9E = Young Frankenstein | V | 0x5161FDFADCC936AA3CED97EFBC922299 -0x6F9688BFBD2A0A5B47051735F992BAD61D1D83D4 = Young Guns (Young Guns) | V | 0x8EF139668E971CF960D1C5A681246096 ; MKBv16/FindVUK 1.00 -0x2BA96BE68410CC754B4C802F9CDC123A53AC1A19 = YOUNG_AND_INNOCENT | V | 0x31CF3A6FBA272D7F837D358CF55D74D0 ; MKBv49/FindVUK 0.94 -0x1056BF9EDC72F268637AAEE717FECECD0DE6BCD4 = YOUNG_FRANKENSTEIN | V | 0x713C3E66C9250829E5313B97B39C071C -0x9A3100446A8DAAF4B7752B08FDE893BFE53A3EE8 = YOUNG_FRANKENSTEIN | V | 0xB5211C7747C849D6A020D2B2A9655DE1 ; MKBv8/BD+/FindVUK 1.00 -0xE408E17433947A1575130D072AEFAB17A8DFC404 = YOUNG_FRANKENSTEIN_F1 | V | 0x2E8B390EF703C5E19AC7B81CA26491E7 ; MKBv9/BD+/FindVUK 0.96 -0x45D241969B413BD6E0A845F5BA6895C59F8B905A = YOUNG_RIPE_MELONS_9 | V | 0xBE3356BDB18DD6B9B3A3F5AE6F2BB635 -0x52BFA26AA065C5ED1F55C970C8140EC4F2E82F68 = Your Highness | V | 0x3597D5C81EB095EAC3ED9A3BCBFC9CBC -0x9F2A9A9CBDCF5F5C8B0B3FF85031447840460983 = YOUR HIGHNESS (UK) | V | 0xC34D91422A1C2CE63F091E3B6402660E -0x21788BCB49CBB6F4826C090534C778FDC928DFFA = YOUTH_IN_REVOLT | V | 0x5871EAC0F21D750CEE79241794274BCB -0xDB17F3AFD767CD6F1751FFD98B0BEF3703B6EDC8 = YUMA | V | 0xADE1ACFD1F117E031782494ED9E9A6C4 -0x62846CFB39B4FD07F7553FDFE784C32B7AE9AD30 = YUMA | V | 0x1D650C69155BC6305AC4123249136EEF ; MKBrev 4 - FindVUK 0.54 -0xFAAAA926130B8293B1147F95065EA14492ABA140 = YUMA (3:10 To Yuma - Blu-ray™) | V | 0x9E5F342122CB1E3E7D9BF42A3628DA4C ; MKBv7/FindVUK 0.84 -0xCBBA9AC8CC93F9413F08627D48A2198750662503 = YurikumaArashi_D1 (YurikumaArashi_D1) | V | 0xBF5C591F94AB7C6D8497F0706A7746A1 ; MKBv61/FindVUK 0.99 -0xCC1E4D98585D079FA32E1D254C44DB9654350993 = YurikumaArashi_D2 (YurikumaArashi_D2) | V | 0xB56C5A7451A32BDB7B6BCCC17F6A4B05 ; MKBv61/FindVUK 0.99 -0xE3E35AB3398696778A696F0905FEB2C77361785C = YURUYURI Disc 1 (YURUYURI Disc 1) | V | 0xD3A5B3774A1D1B792DFC6D5746E368B5 ; MKBv42/FindVUK 0.99 -0xBB472B08D5B62908AF79A79CF401CE58F7DA630A = YuruYuri Disc 2 (Yuruyuri D2) | V | 0xCE6B307B5066F23DC4610294239CB733 ; MKBv42/FindVUK 0.99 -0xAC01C7DE9579DB4793241BAB46B50AFE33BCFC5D = Yuruyuri Season 2 Disc 1 (Yuruyuri Seaso | V | 0xBDB4E9EC827F81ED76E97279EB830616 ; MKBv42/FindVUK 0.99 -0x004DBE65BB4F18E3EEE52007ED1414EF5685957F = Yuruyuri Season 2 Disc 2 (Yuruyuri Seaso | V | 0xB9EFA123950891ADCACBA5C581E584A3 ; MKBv42/FindVUK 0.99 -0x56A915601670D65DF323D69BFD56CBB3636A60CD = YUSIBU DISC 1 | V | 0x067645F8B5CF9353920040449E607AEB ; MKBv47/FindVUK 0.86.3 -0xE145B27EECA7852E0973DB7EC3D8FAB771D71898 = YUSIBU DISC 2 | V | 0x658AEC4BC675CE84D95C043F4E2872AA ; MKBv47/FindVUK 0.86.3 -0xF47F3CAED6E8A8E90BB3FB94D6F56DC901BDACB3 = YUYUSHIKI | V | 0x76867B2A6860B258E4FE2ADBB12C174C ; MKBv46/FindVUK 1.02 -0x5E065E99B1B0C2D38649DBA147D558AFA8500308 = Y_TU_MAMA_TAMBIEN | V | 0xEF8609C2ED823BF065FC89C5D5D26413 -0xA0254D4E49EE23DCB545EF1CEA5332BDD6C3E897 = ZA JAKIE GRZECHY | V | 0x24F1B0D1E85C260C175505EABD4DE131 -0x408E4AF1F7F8FDB4859502C57951B9A39F5756FF = Zack and Miri Make a Porno | V | 0x3060EF0370EE5D8F2F26AA630BE66D27 -0x2B106763425E68A26D527E1F5D8CB8C2F8829866 = ZACK_AND_MIRI_MAKE_A_PORNO | V | 0x1D0E2B0BF165C35B03188B31E989F8F6 -0xCB6D142C2FA00CF53E978F5BA0B965C4A467B163 = ZACK_AND_MIRI_MAKE_A_PORNO_BD | V | 0x621BD08822BF9D3373011DA4DE71D1AE -0x0D1A0EAA90B0228966981E22C488078EADECABCA = ZACK_AND_MIRI_MAKE_A_PORNO_BD | V | 0x10D9A7DC96A65323D02A2C272CD34DFC -0x506C3E62FD09AFE15DE52FE3DF979D6AB129898B = ZACK_AND_MIRI_MAKE_A_PORNO_BD | V | 0xFE0A8635646547684BD137609DEACAD5 -0x8274B6E6AFCB5D8FD84E67DBA6CF84BE193766BD = Zarafa | V | 0x4F01884FA0408249C0E145B3803FD880 ; MKBrev 40 - FindVUK 0.57 -0x7274ACD664D7783F13238BC8D732B5C3A8EFCA29 = ZARDOZ (Zardoz - Blu-rayâ„¢) | V | 0x5077E334944A876976F2DC03AD4ACF22 ; MKBv52/FindVUK 0.99 -0xF2179B2D876835CD9DA37279E839C6E20E293FC0 = ZARZUELA | V | 0x897C3DCC5EDB283EDBC727D86519C95F -0xC13F8A9CEDA702B21B9A02DC144C74EC573BFAA3 = Zaslana posta | V | 0x939FC7B1A4FD7794F7C70BBB2CC82403 ; MKBv21/FindVUK 1.00 -0xE296C305F40FD8AAD24F0FDAA145254C57829827 = ZatoichI | V | 0x8943380D8662C1DB786319BC3CBFA300 -0x59827506073DADFC50F72C03A2E9DDB0AE73AB4C = ZATOICHI_USA | V | 0xBA7B1B02D3F7A79857F5C799727445B8 -0xB832EEAD6533CC13920B9C2279D59531D5ACF66E = Zerissene Umarmungen | V | 0xCDBD35B1B0E106B0A2A215FCBA80A658 -0x1FD6BE571667D9AB1ADA9BF19D14C7C5BC3D1CF1 = ZERO_DARK_THIRTY (Zero Dark Thirty - Blu | V | 0xDEA037D7C397834E03ABD08A080BBC6B ; MKBv35/FindVUK 0.96 -0x511BB44C43FBEB56C5E483279F465482BF712766 = ZERO_DARK_THIRTY_G51 | V | 0xD9BD63B87704C2879F450B84F5C6E2B6 ; MKBv35/FindVUK 0.65 -0x396934C7A3587E06074CB5DBDEF000AA9CF9EC5B = ZERO_DARK_THIRTY_G51 (Zero Dark Thirty) | V | 0x52D88597B4552EB79CE9FD52C5CE20C2 ; MKBv35/FindVUK 0.83 -0x6CB3BF7868DA4E925909DE25DC5F5253C0905F16 = ZERO_DARK_THIRTY_G51 (Zero Dark Thirty) | V | 0x4285E85FD39A422AE528641D2A103B79 ; MKBv35/FindVUK 1.00 -0xDA60B4C107ADC8AF77E35C09F24D2D03704DF20B = ZERO_DAYS (Zero Days) | V | 0x50682624A2CAB685A2B98DF8072004FC ; MKBv61/FindVUK 0.97 -0x21999B65ED1764D12D514AFAF69D7B8B3031852C = ZERO_REQUIEM | V | 0xB6739FCEB5FA12B30818DEE5E070BE37 -0x6C6C3C9B175FC2F097FEEBF15D52F05AAA5E65D6 = ZES_GRADEN_WARMER | V | 0x1E1BDEC2AF45CE509F511D8585490AF8 -0x419DC60BFB89104E73B13290B0CC435BAA29DB8F = ZETAGUNDAMPT2BD1 | V | 0x6F9498A59348DE2062C9EE00FC0A90AE ; vukextract v0.1.8 -0x2A1A61A86F064C6D2EAF13F4B2E839F3B166AF3E = ZETA_GUNDAM_BD01 (ZETA_GUNDAM_BD01) | V | 0xC8C488DCDB07CB3835D940D5A951D2AF ; MKBv62/FindVUK 0.98 -0xE8DFE36C42CFA9E522759AD6C528B131A3989326 = ZETA_GUNDAM_BD02 (ZETA_GUNDAM_BD02) | V | 0xC477ECEA3E1D4E1FB315FEBCAA3EF218 ; MKBv62/FindVUK 0.98 -0xA10A33626F919B80130A6F103458C7B49C17148A = ZETA_GUNDAM_BD03 (ZETA_GUNDAM_BD03) | V | 0x6B0E3CEB16E85F318E1267381133F008 ; MKBv62/FindVUK 0.98 -0x784CE699820BF674D16DA0611C5A22747D02FA92 = ZETA_GUNDAM_BD04 (ZETA_GUNDAM_BD04) | V | 0x9DE3DC3BBA34B8164EF2EC6BEBAE8A9C ; MKBv62/FindVUK 0.98 -0xED4620977FCA96E899EB319B48A95ED47EE6A44D = ZETA_GUNDAM_BD05 (ZETA_GUNDAM_BD05) | V | 0x75DF5F2075BAB756F669211B91263220 ; MKBv62/FindVUK 0.98 -0x6AAF6804A7E790ACCD3029A667FD5C96EABC18A8 = ZETA_GUNDAM_BD06 (ZETA_GUNDAM_BD06) | V | 0xA0EFC599E707B334DE78A32909FF2FBD ; MKBv62/FindVUK 0.98 -0xC5EC42C40B05EB6637FD5D59421EDB67374476F6 = ZEUGENHAUS (Das Zeugenhaus) | V | 0x8ECA38F7E061C7FE5D4AC3D8791367DB ; MKBv50/FindVUK 0.99 -0xF0EA8D372095D34FCF76A84803873CEA94F1F6C1 = ZIEMLICH_BESTE (Ziemlich beste Freunde) | V | 0xD35B4A6F97EFFDD6925657FAD299964D ; MKBv32/FindVUK 1.00 -0xF2BA5E4E1D48C3EC160D9A1E2D3C1F5F15B0F884 = ZIMMER_1408_BD | V | 0x3936055C6700F4F32ABD7E91FFC9C7B5 -0xAFE0D3C639C37B6A147D3AE54846E2ABD76010E6 = ZMXZ_9071 (ログ・ホライズン　ＤＩＳＣ１) | V | 0x021EB2FE609167B5B3BD0B9CDA619F49 ; MKBv43/FindVUK 1.02 -0xEC9F66F335D5BE2DD4227729B0019B178ABF2B92 = ZODIAC_D1_AC | V | 0x0B4726350C9D1108E2C62936EBC50FAD -0x8EC2D1A406A39C74787A3EB84D3596D0E6217071 = ZODIAC_DC_B5 | V | 0x685F12E608261798023B9D08399217FA ; MKBv7/FindVUK 1.00 -0x487AFAB6FC4F3C8C364363961301967CB8EE4CCB = ZOHAN_P2_NA | V | 0x59CAE361B399739968ADB7E75A258C70 -0x7CC42F0C7D34B9B30C138B1733D8362FB19F4BEA = ZOHAN_P2_NA | V | 0x0A66B0CA9051DF294880BDD8595A9A50 -0x3DB3411BB4EDA49BFE6FBDD00735DAF013E8AD78 = ZOHAN_P7 (You Don t Mess With The Zohan | V | 0xE59CB4FE609AC03A1C5A0A9E8CD128A0 ; MKBv9/FindVUK 1.00 -0x4746635EB7A8DF8A96B295F2A7BF2D920EB71648 = ZOMBIELAND | V | 0xDBBCEF45C922480A2531C1F79EB8AF12 -0x7CC4E619BF8EE7E776515F9A39D861D41E889937 = ZOMBIELAND | V | 0xDB067F1A28F9D405F3A6F9BFB1AEFB67 -0xE816D6721DB256D4E8FD098B1B4F39BEF2F57EAD = ZOMBIELAND | V | 0xA5F49C62AA14362B754B4C37410E9932 ; MKBV30 -0xBB12C54DB6C49D9A9BCA581FB806E74C8C4A9B4D = ZOMBIELAND | V | 0x7B28A9578F2B57DF547288CE072FCF6A ; mkbv16 -0xC3E6EB56F526D7A7C83B3BB0FA2DDFCF8C9DE753 = ZOMBIELAND (Zombieland - Blu-ray???) | V | 0x03FAB7DF67C134FFE44EC44D2E07E5E1 ; MKBv16/FindVUK 0.96 -0x2BBF908AC4CF759EF2B7739D17C127C9EE022A30 = ZOMBIELAND (Zombieland - Blu-ray???) | V | 0xBF74AB34070D7606E0DA2E7ECCF74A83 ; MKBv30/FindVUK 0.96 -0x9AABAB8F01A302C6D35D1372D0B4224E8513CC47 = ZOMBIELAND (Zombieland - Blu-rayâ„¢) | V | 0x9486301B07C2D7B89EDB7C77CA1DDFC7 ; MKBv16/FindVUK 1.02 -0x7EEC74B19145ACE6C5C53FA3F8CC13481EE4B082 = ZOOKEEPER | V | 0xB9C03B523966A933507B8E76DBA6CECB ; MKBv25/FindVUK 0.80 -0x8360F37B6C3CE53F96552D6544AA61CEF5314BFB = ZOOKEEPER (Zookeeper - Blu-ray???) | V | 0xD2F4402FE2BD05927239939F7D06D23F ; MKBv23/FindVUK 0.96 -0xD25109A9FB4B1D4023AADF5746B1A85AF699411C = Zoolander | V | 0x2C7E3E2EAF19D06100BF4BAD11E48303 ; mkbv27 -0x4D9F9A969C0C717E1D53630518B7F3453848E0F2 = ZOOTOPIA (Zootopia - Blu-ray???) | V | 0x8C3027BA2C869BBE798F0E3175BDAE39 ; MKBv46/FindVUK 0.96 -0x9DE1E5CB792300A17D79B06613E70FFB2024286E = ZOOTOPIA (Zootopia - Blu-ray???) | V | 0x2462390B49A4C323751B5891D3359B67 ; MKBv46/FindVUK 0.96 -0x2BA1A15D77BE59CD538F06CA344D4CDF0BC15ED9 = ZOOTOPIA (Zootopia - Blu-rayâ„¢) | V | 0x65C36D61150553B1BBBCA0B59493DE39 ; MKBv46/FindVUK 1.00 -0xD287900A8F7941D24647387AA27ED03025D951E2 = ZOOTOPIA (Zootopia - Blu-rayâ„¢) | V | 0xF7EA4760B7E9B1D58028511ADC8BCED8 ; MKBv46/FindVUK 0.96 -0xCA32FCD70ECCBECD88C2CF1BA3E6D92EDF70366C = ZOOTOPIA (Zootopia - Blu-rayâ„¢) | V | 0xE5CA2A194CDC67FDED7EE5BD577FF63D ; Ultimate Collector s Edition (Canadian) -0x20B6068C81535904261FBDED0DA1D3430FE25152 = ZOOTOPIA (Zootopia - Blu-rayâ„¢) | V | 0x2E960E705614C5E96BC3AE7BB281355A ; MKBv57/FindVUK 1.02 -0x607D544211DDE9AB3FFC1ECBD72DD2810FD107D6 = ZOOTOPIA (Zootopia - Blu-rayâ„¢) | V | 0x435DD95342A53CBB2D743E5DED227979 ; MKBv57/FindVUK 1.02 -0xA8E1EB66701239C762C90F811D2E4AC7A5E7E582 = ZOOTOPIA_3D (Zootopia - Blu-ray 3D???) | V | 0x4598D9D9B676347109940A8F0E392F5D ; MKBv57/FindVUK 0.96 -0xC89C6605194DEB6ADCDFD46FA2C0CA855B12015F = ZOOTOPIA_3D (Zootopia - Blu-ray 3Dâ„¢) | V | 0xD2D8CD5EFE712532EBE120C4674E4007 ; Ultimate Collector s Edition (Canadian) -0xB9C5B9AEC868EF0BCCA7ACB606628EA6197D34A6 = ZOOTOPIA_3D (Zootopia - Blu-ray 3Dâ„¢) | V | 0x78FE2A574DE713EE829F8571BB5D1579 ; MKBv57/FindVUK 0.98 -0xB64FC403818325203F659036B7D1F03A909F14EA = ZOOTROPOLIS (Zootropolis - Blu-ray???) | V | 0x312DB9F026FB4425C23FE1133B375DDA ; MKBv46/FindVUK 0.96 -0x547204FF2F857180790B3C3B2209C0950EC31C43 = ZOOTROPOLIS (Zootropolis - Blu-ray???) | V | 0xF043962ED7786D30F64490931F8DE597 ; MKBv56/FindVUK 0.96 -0xE6B84083DD57DBE7E4C448421C47780D28040A9F = ZOOTROPOLIS (Zootropolis - Blu-ray???) | V | 0xD5910677C409B963C7C8670D7FFB07A7 ; MKBv56/FindVUK 0.96 -0x5E759D6BFB3C324D92D4FD85B32F27FFB4D1F66D = ZOOTROPOLIS (Zootropolis - Blu-ray???) | V | 0xB74F09D2A494A783F40FB307516C97FA ; MKBv46/FindVUK 0.96 -0x8ADFEB2D3C0C8A6BCDCA744B2D35A07A22A533AB = ZOOTROPOLIS (Zootropolis - Blu-ray???) | V | 0x797B889238C48C3C114DC96AE2E06EA9 ; MKBv46/FindVUK 0.96 -0x6CFA7916DE3E04585BD5D2008CC4156D255D7205 = ZOOTROPOLIS (Zootropolis - Blu-rayâ„¢) | V | 0x62B182729AA29829DDE9CF58167B613F ; MKBv57/FindVUK 0.99 -0xF0B118D2CB4F38E4D3714E5C6820EE5F024AE5D5 = ZOOTROPOLIS_3D (Zootropolis - Blu-ray 3D | V | 0x711E179609F0E553CC0DD5287E413872 ; MKBv57/FindVUK 0.96 -0xE09994840F9D0A87F4ABD402B485188D443EEDEB = ZOOTROPOLIS_3D (Zootropolis - Blu-ray 3D | V | 0x798E61A52440E88FE3177F5FA963A965 ; MKBv46/FindVUK 0.96 -0x3C63DBF06FFF46EEC2624B08F102B19266506326 = ZOOTROPOLIS_3D (Zootropolis - Blu-ray 3D | V | 0xDBEA3AEAC8EE5768F725785764D0182D ; MKBv46/FindVUK 0.96 -0x5DEEFEA783C2405D1E32AEE7A2A711BA6E9E8165 = ZOROASTRE_BD | V | 0x987ABCD72BA335AECCF94D3343573D55 -0x81EEE696130F014043F1B9FE79D55E836CC884C7 = ZugdesLebens | V | 0x877312CB88CED85BBFEE4CDCEB6B2DEF ; MKBv26/FindVUK 0.92 -0xB7037EF89E95E0B5CD29B65D764A42D02EB8C8B1 = ZugdesLebens | V | 0x7DD764EFCC64029C49AB21C504E9034B ; MKBv26/FindVUK 0.83 -0x5B44D701A9529A42656562B3C827490CD07E9516 = ZULU | V | 0xF78A18BBEA2D5382E824681BCDD86A7D -0x29B372A5BE91BD4D0523BDF1528BE873FDD3CDB6 = Zwei Asse Trumpfen Auf (Zwei Asse Tumpfe | V | 0x7741B052E3CD024B311B5398E04FEF90 ; MKBv37/FindVUK 0.96 -0xFE0871BAB1EEF52287AF6FDD706363CEFDF63021 = Zwei Ausser Rand Und Band (Zwei Ausser R | V | 0x665FB66360AE6181F1AF431D12E923A6 ; MKBv35/FindVUK 0.96 -0xC4934D101FB8C46FAB786A089561CC1392C746A4 = Zwei Baerenstarke Typen (Zwei Baerenstar | V | 0xF5F8A848AF18469976A9A5E399B06331 ; MKBv35/FindVUK 0.96 -0x618C405E78380D8D42C218DE6B5C7CFECA942792 = Zwei Himmelhunde auf dem Weg zur (Zwei H | V | 0x09F2269EA1839FC0256E891021DF530C ; MKBv44/FindVUK 0.96 -0x28E26FA99345A01CD60602AB690B9E486B113CFC = Zwei Sind Nicht Zu Bremsen (Zwei Sind Ni | V | 0x869C1FB618A90BCF3A23DC3019EC9953 ; MKBv40/FindVUK 0.96 -0xF6A7FED0C7C393455BEF7EDB45F923CF6039FCD7 = Zwei wie Pech und Schwefel (Zwei wie Pec | V | 0x050F7D429697043AA2F3835FFB849F25 ; MKBv44/FindVUK 0.96 -0x645491A2F0A6082DB635D17F5E4D4EAB3819A821 = ZWEIOHRKUEKEN | V | 0x2567FA90B6A97F5C7964945C8FD16163 ; MKBv17/FindVUK 0.81 -0xE68E4044270A244529CE375053CCDC0390A827F7 = ZWEI_MISSIONARE (Zwei Missionare) | V | 0xFEECA295AAB4B1BA590B13ACB5DBDEDD ; MKBv37/FindVUK 1.00 -0xC847D4AD00229B1C5BCFE710526DE64F080EAAD4 = ZZTOP | V | 0xEDE288CFD555198A63496EC59649F73A -0x1FC4287A1698336BA1755A0CC00F57216E0AB6E7 = ZZTOP | V | 0x4382F316D1C7964068D4ACBFCB039245 -0xAA96C9D651FF96B209F8068C5F3F295A9BA47E47 = Z_GUNDAM_01 | V | 0x2250B30A7287F4FC53931B4DDD9B767F -0x59447207B91EF0028CC1B5D9F976529FC2E42623 = Z_GUNDAM_03 | V | 0xB1DD58B815AB5E2EC532D64B6DE53EE6 -0x5FE29E9836B84E079CA71F4AC824D514EE067E0B = Z_GUNDAM_06 | V | 0x1E0F060E32AA9420B55E7B15C15E1AD4 -0x916E5AB1E7AEAE3518E3D3E02AC101970F58DE69 = _ENTRAPMENT_ | V | 0xC87B4886D1D0F0CDDE9BB17593BFA6D2 ; libaacs -0x82AC8584542A287B6893C2584876ADC7B4498780 = _HISTORY OF THE EAGLES PART ONE_ | V | 0x56FE840A9E09285C388FFF788E6C70AF ; libaacs -0x50A560E99FCE461410DAEA159043EDF930D519DA = _NONAME_ | V | 0x4FF224C08858D0DDD76E5C069712CC5A ; libaacs -0xD63115237BC6F8C73474C14554B1B2BCA7ABFC0C = _NONAME_ | V | 0xC80AA77213B033966D0C009A8D8FB211 ; libaacs -0xF5EE828AAE02C9AFC94CA27108E752CE73F79A0D = _NONAME_ | V | 0xDBCAB46E77A930F83B22ADF3DC064152 ; libaacs -0x5F4BB77AE3D56A33158F3AF230445EEF0C9A05AF = _NONAME_ | V | 0x257668D3D71E1580B9466FA8F811BC3E ; libaacs -0x37C07E5E322F6E91BE84362DC8D7632DBA3C6C45 = _NONAME_ | V | 0x25770323C965DAAAB46505466B2F9F65 ; libaacs -0x5B59FF09279768ECA9680F8F49BD4533EADBDEBB = _NONAME_ | V | 0x6B49BB0ED019EDCE1BD82908711CE720 ; libaacs -0xC1588FD155CA0114542CB15937F69EFD5E2BC042 = _NONAME_ | V | 0x02FA0822B1459168A23ED71F821F889B ; libaacs -0x4136395F876FFC540585937046E89CE7B2C068E8 = _NONAME_ | V | 0xC147DDACD272276D0CE491F724A14A04 ; libaacs -0x34F777CC703923405F04752EA7F1BBE729399227 = _NONAME_ | V | 0x2534725776DB6A5FDFB97853845D8F2A ; libaacs -0xCC78F1FF8A5D6D5212B9204B45FA6DCA9B46DF4A = _NONAME_ | V | 0x56B6DC6774A4EB153120C915F1C35E47 ; libaacs -0x7AC6DFD99EF1B30D54BC2469D57744EE9A4FA5AE = _NONAME_ | V | 0x08C2BFF1E4C0130DA4E2B0B48A445EF3 ; libaacs -0x0A9068FDDFC42097B6B060709F156CD58DB6A327 = _NONAME_ | V | 0xF84D04C3C64F90BD8DA394C12E2F6F34 ; libaacs -0x61A0577E33168F9C80FD5BDAC60A63B30E9D144B = _NONAME_ | V | 0xE4D75ACB4D0160B026922252E6F3F990 ; libaacs -0x63625CC3E60ECCA54DC016FA4A72E7B629D5F9B8 = _NONAME_ | V | 0x73A8F7CEDCCAB04DEDD6780C957D6771 ; libaacs -0x71D04452CE495AE34368C0B945B34EEFAD0E68C2 = _NONAME_ | V | 0xC977D9157551ABD25AAD07ECF064E0E6 ; libaacs -0x4C7446B8F267C484713EEF516E7D610895EEC288 = _NONAME_ | V | 0x3D50A1AC20043B929D0564186203160F ; libaacs -0xAEADBFDFCA27F9FF2F4E3567B83D8A39C0B88EF9 = _NONAME_ | V | 0x65394AF8E54B7BE66F746E09D2794630 ; libaacs -0xCE7BFA35C84A2925A6A23499EECFC44C2E05168F = _NONAME_ | V | 0x0C3A2BC6F86982476AC0207FC4F25801 ; libaacs -0x18B39A4BF0524CA64314F3081074B1CB23359761 = _NONAME_ | V | 0x2511450F64F81054D5659A83A851433C ; libaacs -0x2E7E56494859DD2BF340B8735682BC60B088F0E3 = _NONAME_ | V | 0x147CA6D55C63ED0217CEEB7B8D2EECA4 ; libaacs -0xF106E56FA9D5948F6B04C51C7E1135D86EBAA221 = _NONAME_ | V | 0x66D71D289D1990FBCFCEDDA9787D2132 ; libaacs -0xE987DDE1C7737B648ED0FC70DF4908692AC4AF88 = _NONAME_ | V | 0x1E93CFBD1F5B02850C9C93B3BEE29DEC ; libaacs -0x3D365E14A7AD8824695635F2FFE9AB2F330D2E31 = _NONAME_ | V | 0x75B0B305C7CB93F042E0E66C184ED310 ; libaacs -0xB8D8DA1045907FF651162CB68E7EBB5B069A89DC = _NONAME_ | V | 0x1B311D06142F83CCFA57C065BB000AD1 ; libaacs -0xE13572D13075821789C01023A078C06BCA1B5C4C = _NONAME_ | V | 0xD02B5BBABADC8C6A7E62A0E50D304B40 ; libaacs -0x2EA07C479543F0045CD3F57389D047991E856E8D = _NONAME_ | V | 0x9550156C43A3236D22F8F396D03A9F19 ; libaacs -0x3548FD66AFAF7FA4E6124169F5CD2D7D229EAF91 = _NONAME_ | V | 0x3E9DCCD851749527D20D50BD83162BBD ; libaacs -0x29943E368D2F5C97B39E01164DF0C74CD9F2308F = _NONAME_ | V | 0xAFB364BA8B9BAC3B2FA09DCFB4D99E30 ; libaacs -0x7E523793F40E8691CAAD394699D689C30DBACF7D = _NONAME_ | V | 0x10D80DB5021017574418D47A12015DDF ; libaacs -0x23AD02CA9BD4F96A87B60EC47E5EE2B0629F5424 = _NONAME_ | V | 0x0931B7BC1FCDF699DE01AEA82108014D ; libaacs -0xD82AF5C3A59A57112753D927D3DDD38D30540E74 = _NONAME_ | V | 0x8C011F5D32B3C44DFE587CE2BAFF49E7 ; libaacs -0xF5223C90012FB72B567F6D6D6F5A64D9CE218A5A = _NONAME_ | V | 0xEF95C58519E9ADD7B85EC63BF74F702D ; libaacs -0x2870241BFC5A17A1C645C4E615A4A6A07B39000A = _NONAME_ | V | 0x4427C57FA98BD08027C480CF0B839B8E ; libaacs -0x5791AAAC9B015B71981043FEC23DDA55C7FF4F66 = _NONAME_ | V | 0x9966BA76D31B1B3160FC3E2D27CA8225 ; libaacs -0x9D84F260577AB0746891BFEF749A2D702B237D49 = _NONAME_ | V | 0xE23F40ACD558755ECE56E2FFA10E1DD9 ; libaacs -0xA6303A900174DE966E6020757AC47FCA8118115F = _NONAME_ | V | 0x55AB648570535BD9C593F46364870DCE ; libaacs -0xD018A783283DC6B964A3A47134BE92B5AA7A371F = _NONAME_ | V | 0x02757C8066771B4807C383EFBAC5C210 ; libaacs -0xFFD25D5F742375609B36093CFE076938F2E46EA3 = _NONAME_ | V | 0x2F2089C24A4A31D4F7100BA32CC73059 ; libaacs -0xD5A8DC0EC8A69D2315830066AE89E3867A09C6DB = _NONAME_ | V | 0x77FE967AB727B919E33D852CCF116FB9 ; libaacs -0x168161EEF50F2D18AB131EE4C74B9A4F337391D4 = _NONAME_ | V | 0x9BE16FA5E0213998CB7E3C3AB3DB72F8 ; libaacs -0x7CC7AF274657176F076312EA78769DF4E1816D3D = _NONAME_ | V | 0xD79779836BBDAE3AAFA511D4042C5A58 ; libaacs -0x9FA1A2F3E4386FDF589F27A2C83933CA8F7399B9 = _NONAME_ | V | 0xBF8E225714369BB04EE7CBD6286C3E1B ; libaacs -0x6057A38948918517A515FD3FABAD3BB975EC4ADC = _NONAME_ | V | 0xD8BD201BEEEF3998D27D1CED73BC31C8 ; libaacs -0xCDD66DD01FBDA64B7CA8C8D2EED270A7794C1293 = _NONAME_ | V | 0xDB63001A66E34C6132A815720500F23F ; libaacs -0xC598A98545C3761290597B11AAB7108CB1DCD4F3 = _NONAME_ | V | 0xEB48556EEE3507B5D0DF5C8596A68083 ; libaacs -0x6EFB28571F76680FA5666AB60FEB5D43B9AFB49D = _NONAME_ | V | 0x8522D0AFF60CED2C5F0D08C3F3596470 ; libaacs -0x830199969E880CCFF8AD5977B2DC24E998B7A77A = _NONAME_ | V | 0xC61DC4FA5BDB0C2A7C683FF5B906115D ; libaacs -0xEF77CCFD38C72FF96F8463FE5545AADF1E645B9F = _NONAME_ | V | 0xEEE7CE577108EAB0A9BC5B6E06E7903D ; libaacs -0x4AD9368EB6E4CF9906EC6FB342649FEDB35A12BA = _NONAME_ | V | 0x446EDEC073C029B02C63F90E285291E3 ; libaacs -0xF8160627995B14E2616E614AD6D1917D29075C55 = _NONAME_ | V | 0x3BD59AE05FA71FD20D191FF0811551BB ; libaacs -0x8083D3577098EE9C53054501A9A11226CA7CC975 = _NONAME_ | V | 0x04F04A3F7C5BD5CE21E830F34ABC6D11 ; libaacs -0xF86484026F05BFCAD3C3EB8B27BD76578345F38F = _NONAME_ | V | 0xD0F99901F1BF5D6C23821E62F84649B2 ; libaacs -0xAA732FE444B7770BE95C4B548AE47F7E1D0C4FD7 = _NONAME_ | V | 0x05976A18AA89F16580896B0687C471AB ; libaacs -0x3EAA6E61B237FF9619A234D9AAD444D531FB5740 = _NONAME_ | V | 0xA939CC8773AA896C748C81035F4C4EAC ; libaacs -0x84FD4B209BAE92347D39240C95B36B5323712F96 = _NONAME_ | V | 0xAD8A589FE817645C53DBF34EEE2B85B1 ; libaacs -0xB7194BA1729AF3A4C852BF8C2C7DA439BEEE48B0 = _NONAME_ | V | 0xBF30F6A1BB2A35EA76A90BCFCDD18FAA ; libaacs -0xECA3F5462C6D44145BB1FFE81677FCEE428FBC0C = _NONAME_ | V | 0x9C639DA552C19DFDE666A55D2E102B96 ; libaacs -0xB31A381FA729D838D4CD0CF5520280717E159B62 = _NONAME_ | V | 0x289073EFBA386C5094E8D451A51335D5 ; libaacs -0x5EA4EC67FBC5FC37682F779BFC7C8118409C542F = _NONAME_ | V | 0x132B0638EC643A69CF5541D37CF22DDF ; libaacs -0xCE34CCE23EF1DC0252502F2EC7A71F72CFE312BA = _NONAME_ | V | 0x617573D9CCE4EE0DC3CAF7108E9956CF ; libaacs -0xDB6577454A466DA752EFA7DA938AAB9FEFF1D1FC = _NONAME_ | V | 0xB10DF4BBE4377959DAB9B486564DBF40 ; libaacs -0x013C028AA0D8E59916F38929372CB25A60471243 = _NONAME_ | V | 0xC29303A18492C04845B48A56A3B52917 ; libaacs -0xC70D9CEBE31A5036B0FBAB8BD909E8AF5322F1A5 = _NONAME_ | V | 0xCC410865BC4D1B076F35BE2673092CBA ; libaacs -0xE309017CA307D82193B7F77CB11160113982CDF6 = _NONAME_ | V | 0x0E7568815D5BAE6F2A0F83F60ED118EF ; libaacs -0xF2124F5410F47FF0B1B7FE4C5E4C0CA705BF2F07 = _NONAME_ | V | 0x9F005446D4C156A646B57BCF2F563D15 ; libaacs -0x2988F140F6EB775B877BCEE5593F072F1F65D9DA = _NONAME_ | V | 0xBD1180FC463C7CA47C10D04F91FFBFCE ; libaacs -0x7B14807279539FCD690E2428EB7C5E957EBCE507 = _NONAME_ | V | 0xEB98E5E0E2FE7B567B9971A8E59B2567 ; libaacs -0xA3AB063ACB366A9ACA62101CFEC67066D23778DF = _NONAME_ | V | 0x1E5D70EFF0F429CD8F311B0E3C1F76D2 ; libaacs -0x5EF9AD87D83414CC19E7ED1F172888A32F811AEB = _NONAME_ | V | 0x6308021772197A6D3BF740BC0D6E5BE6 ; libaacs -0x34A29008693A4711E37EB9C5E6752CFD19B626BB = _NONAME_ | V | 0xFA6D52F8ACEF917CF7D6F86CC85E88A0 ; libaacs -0x1B632CB2EEB8FB840F5273992CC9B39C3D59DF62 = _NONAME_ | V | 0xB2363C4ECEAF964F3E9DA63165A23CAE ; libaacs -0x6252F225A9D347C86F00711B19F7CD6DBE09E416 = _NONAME_ | V | 0xF51533DC486C335E49AF9F6BD28AE985 ; libaacs -0x463CE16FE3C67F26177891143CE0178464A7F48F = _NONAME_ | V | 0x8A61D14F96980CB4934270523613D98E ; libaacs -0x4F0B47005CFA73E2ABCFFAB75C906885557BFA27 = _NONAME_ | V | 0x07895C2C1710D2AD0D1B3F65B2FFB0E1 ; libaacs -0xDA920EC56C6A6639A98CBE6C6A3D866562D243E7 = _NONAME_ | V | 0x590CBA1DC42EEFED17ED6782863B5B30 ; libaacs -0x736EA65FC2F4B8BC98B2F2051A7FD39DC2CF3147 = _NONAME_ | V | 0x171BEDEEAFC556D70935E2EBD45B72FF ; libaacs -0xCD0D573281E00C781897F6FBB939D4F37C363666 = _NONAME_ | V | 0xF4E610188542C7946835386316A6014E ; libaacs -0x71BBC6C4939AFC1527910EEC37DB326469A2C7B1 = _NONAME_ | V | 0xA07410F986B447AF894994CA3CB18CBF ; libaacs -0x7AA4B367ACB20A35911A284C530EF2F58B10DF20 = _NONAME_ | V | 0xE37EBA439A10EB833A118D034315EA88 ; libaacs -0xE5889655ED2241BC5D12C6FE6D7C59B40C4D5B37 = _NONAME_ | V | 0x3421070E7B0704BF98CC0E9F02E5C9DB ; libaacs -0xF3A3B155AF3E719033CA8B39C122A95B69D9DC28 = _NONAME_ | V | 0x54CC8E519C077C3887753D766B287394 ; libaacs -0x6850EAA4CFBD969E54BFEBFDE24BB737622FECED = _NONAME_ | V | 0x7238D201D0D02E7A83B83D91F64C0536 ; libaacs -0x8BC49BEEF39CBF1AA73AB687D61D4E493CFB6E61 = _NONAME_ | V | 0x98E1C9C247DC845DCB0B58A0AFF0F96B ; libaacs -0x01A1B5BBB2DB6A49D2BD4DA13C6E1A3D03366F31 = _NONAME_ | V | 0x8E4F531B9A7932E72CC745CADF17FEE9 ; its me -0xA0CAC7AC3D4D94CDEB12E0A1922EB561AA270383 = _NONAME_ | V | 0x956485E5877065A9366C57264F65F1AB ; libaacs -0x17C5B97F3A9526E554CBEAF09DD7D53706B21B70 = _NONAME_ | V | 0xF03C0D492DC05272B5B6B666C5D9A325 ; libaacs -0x331EE11B445D6E81B36BACE1A5E41B9C9B31135F = _NONAME_ | V | 0x031F0008361BAA919C363E7C2AC6CA5C ; libaacs -0x6AC4F05328F763AD06A92D3BC8C661F15BEFE7CF = _NONAME_ | V | 0x2BCD097A7E4B87935F839E03AA2B79A4 ; libaacs -0x0EE5C25BA02A1CFCE0FC9331E58CF6A98BEC8E0F = _NONAME_ | V | 0xDC4154ADD1684F03FF4E5205E2CCEEC4 ; libaacs -0xD1AD5BB1C360EBE54C6A63963C8632D7D7C7F1AB = _NONAME_ | V | 0xA5CABCD5ABE19F47573F7CA1A0A509D6 ; libaacs -0x08B7553FF8AC61510F3B51463D6C979BEDB32EFC = _NONAME_ | V | 0x443BA4420F1B4B254976DFAF528685F5 ; libaacs -0x4FCD11BD357C5692464386875E2E8E0233A602C1 = _NONAME_ | V | 0x46AC9B7228E128E4DAECB942B088DAB2 ; libaacs -0xC83E8ADAB6826469B353419A34A8E7E012F82F4C = _NONAME_ | V | 0x430474FBBD697983D869E1995BFBE8B8 ; libaacs -0xDCD62E3124F11234AE1D5A0A463D5B4FCAE501D6 = _NONAME_ | V | 0x64A9021E8C9DC727C1873F85665AB96E ; libaacs -0x6DDA5CCF2C1D09B52BF3C40DF42749EC42ED27F7 = _NONAME_ | V | 0xC3AAB6B7A1203FB81B8893785AE0B823 ; libaacs -0x996F807F7C3DA4861B78A865ED5F0B97EB05FE2B = _NONAME_ | V | 0xD69A4D732644CBFEAF94A12A6E831D76 ; libaacs -0x30F5EDECF0519FA01DDE8F5BA03EE5CFAC174B49 = _NONAME_ | V | 0xFA1A18937997C2E50CD0F7D3F71786D8 ; libaacs -0x31047F77457C48072FABB1BDA519DED2F8466476 = _NONAME_ | V | 0x490EFE0B44743612F0509C136501CB69 ; libaacs -0x326B8F3296A7BDE667CD34FFA8688278B7289AD7 = _NONAME_ | V | 0x0C49D8B550800CA5A18C9A5543368FD2 ; libaacs -0x39B138BC62A1A031100BEE123854C5222B43A6FE = _NONAME_ | V | 0x64BD7CFB4FB21D21297717445AD01435 ; libaacs -0x6E0EE674FD366299402C3366D5E67C3F1DE7DE1D = _NONAME_ | V | 0x3925834CF6F6E396B8412F8EAD04DDAE ; libaacs -0x3B19270ECF9BCDFF469AADFBB5E61F561F7434B4 = _NONAME_ | V | 0xB1504A6C85EEC50CFFE902A9FA427E8A ; libaacs -0xBF14661F335166FE09AF0EAB227429FF17039E25 = _NONAME_ | V | 0x04E721F6B3482622D5B1BE75C1A3E1F8 ; libaacs -0x6376496004FF7A6C4DF63ABF2ED4DE58D73548E9 = _NONAME_ | V | 0x19F4081B64DEAB6DA628C7FEAB08B434 ; libaacs -0x8107DC3AE2C52558F79593242DA641D05F85A826 = _NONAME_ | V | 0x26329D0746C7A36BCFA94D2EC60CE491 ; libaacs -0x7BE6535A37D91186876787BE96A0E8FAF56F097F = _NONAME_ | V | 0x242A4B71A800519B914AE4BBEC9195C0 ; libaacs -0x3DA8F84D38DBB4DA2CDA6D969541F5D77D3FFB05 = _NONAME_ | V | 0xDC5A8FC6500DAD6B1E4381432DCCFF7C ; libaacs -0xCE628BF51FB460BA130DB0D1C86CB8CC483B3013 = _NONAME_ | V | 0x6DA514238137B25C966BDFDEDD57A230 ; libaacs -0x33EF6FCF9D7C37FDEAEEBDFF5EFC2D3D3CAB27AB = _NONAME_ | V | 0x3196E8842F296616D09369836E259316 ; libaacs -0xD9798BFDD55E7CF5329C37DBEBF4954E40450F32 = _NONAME_ | V | 0x92FB791595250FF5E546264A6488C24C ; libaacs -0xD431EBFC88CD53045F1FE6BE9A2B4A2F05878EE9 = _NONAME_ | V | 0x54B85F6349814FFEDDEE3823207A4937 ; libaacs -0x905D91AC5118871170572C7AA944454A203017FD = _NONAME_ | V | 0x42FEA631B1E8E6445DEF3C991A1ABE58 ; libaacs -0xFBC4DB230062C4D8F8F5F540EC2ABDEA62334104 = _NONAME_ | V | 0x98BD14FFD1FEF5864B32D259FA3F1AF7 ; libaacs -0xB66A81293E85B1936FECB7A4090A4E92843ED8D2 = _NONAME_ | V | 0xFFD8A78613DFC504AC265DFBDEC253F6 ; libaacs -0x7C58F09E0155D13F8279AE0767EFBA2C27F566CB = _NONAME_ | V | 0x5C4BDB5198628A95A2A466DC6F6C2B2D ; libaacs -0xE79A33EF4ADCAFEA90B3BD456A888CC27C9446DA = _NONAME_ | V | 0xFBE8B6615A61B74CFC968FE0939033E9 ; libaacs -0x904BC98E52285DB19FFD28397A1096B3D2B73CA6 = _NONAME_ | V | 0x0C9C16F5526E7331D2FD8A4F85C7B459 ; libaacs -0xC6A0C1026B2DBD161C5FC4B9CC77E981DD4DD858 = _NONAME_ | V | 0xE64C0E8119B96C70E6F7C7182DD16A1C ; libaacs -0x9192970B21FC651DBEBE2F99A0B8B80CDBB4BE64 = _NONAME_ | V | 0xE9BA2FAF67D847851AA0E0A7320921CC ; libaacs -0x71F1C65136B32C16B0B94F9C41F131D7AD48012B = _NONAME_ | V | 0x07F43BC3C61552900909672831784BDE ; libaacs -0x9600484F7DAA44DD9F4E29C465FE31DB8EC7EF2B = _NONAME_ | V | 0x5AE17B3E737696C84101A41F8AC3F536 ; libaacs -0x037A3D0D65165D643F753D37C5A20A0004F39D0D = _NONAME_ | V | 0x6BF2F2630CA454C106A889E56042425B ; libaacs -0xA0371F3CFCA3F7DBC12BB8BC8CA7D850909BC0E2 = _NONAME_ | V | 0xF72F09543A216260AAB974A1EFEB4E0B ; libaacs -0xACE76E0DF1C48D0267DE7BE0FFBEB6B0637A906F = _NONAME_ | V | 0x425F093D90F3AC9EE4ED732C06F0A6E0 ; libaacs -0xC1546F8332706FC3A568546F7986A34DD6EA2476 = _NONAME_ | V | 0x00BC376C9C862295E27FA92B36916D3E ; libaacs -0x87B5B7D5F28071F6E883B74EA3A90D589FC83EFE = _NONAME_ | V | 0xC749AD09806093DF5956539C4C959B29 ; libaacs -0x7DA8F36327F5866862024CAEEBF5DB2AA132EAC6 = _NONAME_ | V | 0xE62E779367D2DDD2234D37E3AF4C1A42 ; libaacs -0xD54304250B57992F0D597B0A679D3CE30068ECAA = _NONAME_ | V | 0xBD9525155A16CEE7FF4F4F9D2CEFD5DB ; libaacs -0x9EEE5754E784F44A01E5327C096861728BD22F64 = _NONAME_ | V | 0xCE9D9856CB6E7B5E41E85C08BDB7CBA0 ; libaacs -0xDA254591360D704421AE6C25FA57140F44F82924 = _NONAME_ | V | 0xF892636D7A5558AC008C005A2DD89EFA ; libaacs -0xB54B36AAA3D329DAF91AFDA4B57E1B295AB22695 = _NONAME_ | V | 0x6D329BB6647BFDB28E6506C8F4F54EF2 ; libaacs -0x48A43DA30623E2DDED58F5AEC44E67F2E2653280 = _NONAME_ | V | 0x5A258C55A61E264BCB8011BC7AED30E0 ; libaacs -0xCD2B05463740E54BF5058229B2A1996CA160F91D = _NONAME_ | V | 0xBFDBB95AE7FD0144F870A1A2516DB010 ; libaacs -0xF65DC658832F366EF6450D448EB4321252C3AB50 = _NONAME_ | V | 0x111391552807451FC6070D4EAB6F7A30 ; libaacs -0x7CF21436BCA30A71F2E0782FC2CC81C7C10BF888 = _NONAME_ | V | 0x34BAF4B6AA99B5915053ED9FDB160A23 ; libaacs -0x145F8A08FCBFBDA40B379835553D46867627F043 = _NONAME_ | V | 0xC4599676CC04F328DEB33542EDE606F1 ; libaacs -0x90718096B83049D0A964726C7945AB9B7423A6D4 = _NONAME_ | V | 0x6306B766B870C4D95537DA2F2341E3A3 ; libaacs -0xE4326653F956BA501BF7BCC33F863A0747F08C99 = _NONAME_ | V | 0xA41A32295383D3E0AFB5EE7B3D58FB37 ; libaacs -0xA4444D63224A4D0728DD6587A75FDEECDD144A13 = _NONAME_ | V | 0xDEED5A8E52D3B977A98C628F8ABD917F ; libaacs -0x2DA3535E3D6DCC66007CBBA0EC3CA50D1211E8BF = _NONAME_ | V | 0xFA2FC48510811DB93D5EF658DA89C8BB ; libaacs -0x05AAE0A13FE1887D57DA0D5D8FCD636CF00B93D2 = _NONAME_ | V | 0x4AE4C09571B05A038EA8B055688C0546 ; libaacs -0xB63F6B7D6935005BAE8DB4D7462FF17E0342C740 = _NONAME_ | V | 0xA63167E6835CE6C6613A356597FB513E ; libaacs -0xBA1EBEA914194B146E25B42740E79AF0B0F2A329 = _NONAME_ | V | 0x74CEC1803A3A783962C6C14D006D9B74 ; libaacs -0xF80F9CEFA3B9BA45864332AD53414CBA3B822C6F = _NONAME_ | V | 0x99758FF4ACB00E923E814833175DCE6F ; libaacs -0x21050FEBB56846A9B66888484FC2DCCA5CE55E6F = _NONAME_ | V | 0x4EE84AAD15BC3AADF2AF21FD10406F32 ; libaacs -0x61C7ADF893C2FD30F910F387C0CEE397A78461A0 = _NONAME_ | V | 0x5024C4F4DA601A89E111BF557BB7E7E9 ; libaacs -0x0947EA9395D8D2A2E5BCAB891EDEAB5455BCDE59 = _NONAME_ | V | 0x6EA3546876405514F62B74098F47A368 ; libaacs -0xFFDCDA6ED57609868C7FBC8B2A944A0A3AF37C04 = _NONAME_ | V | 0xAE29B3CE2AD547CB2F1F4DAAC278A2EB ; libaacs -0xF277017CE0C60B5125CF318C54E0B59F8A7CCE47 = _NONAME_ | V | 0xA3F88421BC010F4C1D52DCE3ADEE895B ; libaacs -0x9088F00099DDCB4CC1481F55929BE45B789B0B6A = _NONAME_ | V | 0x9B36C131B0914B3D26AC21772951B75C ; libaacs -0x81D3E3C0451627726BD215652835EC38A71589EF = _NONAME_ | V | 0x586B584E07639DDCBE4B25F8C80066D3 ; libaacs -0xB4CD6C7871249976FFEC886EEB47A2077CDACF6F = _NONAME_ | V | 0x559DEEC5495B9E71B783AD8E30BEC5A1 ; libaacs -0x9592D80445318526181A3E81A8ADA45613BF67BD = _NONAME_ | V | 0x352894EA1D6D3790974D2B1D929BD10B ; libaacs -0x1945B038491EEB7EAEFD89CF07A241E02162D65B = _NONAME_ | V | 0x13851A6FA5045C80F1CF280B867A0DE2 ; libaacs -0x27DBDBC09F7B1594BD2B83849D46C92889825100 = _NONAME_ | V | 0x5860AC58F9466BDFE61030000C3111E8 ; libaacs -0xE2A4CE9E2F11FAE56A1D044B36B2B8CC6A48E340 = _NONAME_ | V | 0x6A623047898C07697D803F710D07661B ; libaacs -0x7A81987C73501B989004D2E3FEF449594931CC96 = _NONAME_ | V | 0x50267C301067DAE80380C0087AD509C1 ; libaacs -0xB1219F479E70D22E01019205233BD69F2EA8D63E = _NONAME_ | V | 0x7677121DA8EC3D8C47CF9E1B397B6A7D ; libaacs -0x16C5F4D573198F3214495D01F7252D69929F242E = _NONAME_ | V | 0xFD78418AE88531656093E2A45A40C464 ; libaacs -0xAF5496CEC9B7830790EDBAB6688E39243106E72B = _NONAME_ | V | 0x36477304B2B1C88B596AE3D86D266F40 ; libaacs -0x609C3B56A608088BE322B648595CC14596CBCDCD = _NONAME_ | V | 0x3FA821AFE99571A8104150768DE5423B ; libaacs -0x9211AFA4578E2E160246FE9D0058E811E19B6564 = _NONAME_ | V | 0xBE881031201CE0D1EF8C520EFD2879FC ; libaacs -0x7DF798DBFDE57843F195780D7A3E40159FCA47CA = _NONAME_ | V | 0xB2F4527286B4C438513BB7382476849F ; libaacs -0xFA9A24931327E6B1327A263C83AB2AB1B74C8B40 = _NONAME_ | V | 0x7E329DDC6CE436CCBD2313DE6DBB83BA ; libaacs -0x9F436C067E5D642ED9A31F8D62A5A1DEF435A5F4 = _NONAME_ | V | 0xDEE9EF726F4475F1A493ABC33B16C8BD ; libaacs -0x6EF03C93378571342597ABABC1CD5228DC956111 = _NONAME_ | V | 0x9F636F3F972F83084427A3AB40C4C7EC ; libaacs -0xA5890BBC03D80844639724232924C59590D7E49E = _NONAME_ | V | 0x508E159B347C4206D6B5AAEF0456CAC0 ; libaacs -0xB45ECA2BF62BC2577720C036EB0ABE27A8CCB5CA = _NONAME_ | V | 0x9DD1CE36AF4398EB41B481D65C89487B ; libaacs -0x7481C2DDF0C9ECD1DFCCA0B0DE8DDFBB03E80785 = _NONAME_ | V | 0x9714D0720A5B0824D736EF2BE901620D ; libaacs -0xF573879CF172BEA61A02C93616D15654CFB6A118 = _NONAME_ | V | 0xEEB39160F7B986769248FA3A12BF7F8C ; libaacs -0x5821CD71557E069A69E493382D7E55C97352EDF3 = _NONAME_ | V | 0x259A18DD640F4BFBFF859FD4852566FB ; libaacs -0x9CE9EB2B6C7E6C5A0D5268DBCA29835F72EDB7A8 = _NONAME_ | V | 0x0653FDF01579040E929375A11C5B2330 ; libaacs -0xC2A1EDA3BC28E4F8F78C00FF8BE57A17A4DC18D1 = _NONAME_ | V | 0x0EA35861EB9763FC412843973475A056 ; libaacs -0x2B8A25387D918658AEDFB817B71903C6B247682F = _NONAME_ | V | 0x3F95836DC1111D2B6B248C00E14B7BF4 ; libaacs -0x397A5B1348FA4265723E0A76ACA4167A5048690C = _NONAME_ | V | 0x833E7FD80AAEA78D9BF4BC4BD149AFE7 ; libaacs -0xCDE1AFC21FDEB4044B7813B372ADFA85F2744109 = _NONAME_ | V | 0xD5072ADFD4E50EE8E807D5196D81009F ; libaacs -0x22AF70680ADFF2517A548212F5E02C20D57C52D7 = _NONAME_ | V | 0x7ED416870221D158E8F05445ED93DF74 ; libaacs -0xE20E6EFF965C7781A3DAD13F9C91B8306CA5483D = _NONAME_ | V | 0x6632BB06DC41D280AC6E702A5FB70F72 ; libaacs -0xB2F13637B9C87506C10F5CB2677D80C9D24CDE6D = _NONAME_ | V | 0x4B413DA64CB06946FDA7A9EE2A050433 ; libaacs -0x47C31157B40F4D45DBE8AF47BBB91D76675752CF = _NONAME_ | V | 0x162FECBE6D39325F548BF71A39BC24B9 ; libaacs -0x2E5BB84C80CC5EEE22E6015EAB137C75859DE592 = _NONAME_ | V | 0x047368F968E6E46073B1B670EC834B35 ; libaacs -0x89F65DCA741EEB828B5747B0488A9546FDB0385A = _NONAME_ | V | 0x9152524602362D9D6ED6E431CCBC3BEA ; libaacs -0x294A2541D7794E93C58B7E6B166E4373B069D9B5 = _NONAME_ | V | 0xAE546513D98CD92A6954492211CA88EA ; libaacs -0x8F4A694BCB4AFBB64630A4F26DB43C32CE4DE78F = _NONAME_ | V | 0x048E90DD6FB2A354A7C61F4748B63183 ; libaacs -0x0E7D3B4B3D8B1CB68983F9A9971CF5B60A2D4F67 = _NONAME_ | V | 0xD80629DC57DC153C5C1337E2C2C96507 ; libaacs -0xFAD4455F0DF67E6121448E2FC365F0ACDD0C5C5A = _NONAME_ | V | 0x7C1117A9345AAF229C5D7396DF573487 ; libaacs -0xA372AD18901B3DEC864F79B1004FE27386FE6AD7 = _NONAME_ | V | 0x12CBB27A3A5F10DE4A5A311C7DB551E2 ; libaacs -0xD7E2504FB66AA4B799C9EA2C6204AA0A404EFFF3 = _NONAME_ | V | 0x6EF7DA16F50F6859B86804FBCA02C653 ; libaacs -0x769B2418CECD5952705727C15A15A0B20DBDB086 = _NONAME_ | V | 0xFC92D7426024B4AB59CD04484C730E5F ; libaacs -0x90EAEF521F0CE3288D9C518043D76B20368C659B = _NONAME_ | V | 0xCEF1EA304C58254CA252FA806AA5D1D9 ; libaacs -0xA681C15968FCBD081EFF0F92E0FD69519E0E24D0 = _NONAME_ | V | 0x10F200A411BF2E34ACE5ED307C9A76A2 ; libaacs -0x640FC91AEA8BF05572B0B6B35F2C46796DEDD831 = _NONAME_ | V | 0x4815E4B141A81C707F5A84A00249B0FD ; libaacs -0xA583E2636759A46A5C199FA5C09016B892CE8340 = _NONAME_ | V | 0xA58201601381A5A53421F232B0092290 ; libaacs -0x0FE5F11DD29DBAF14BBA8E2FCE480DD1700B9EF4 = _NONAME_ | V | 0x67856411EC1CF0ABCC4FAE7D6CB42D26 ; libaacs -0xF0692E40A14C2BE7EBA0E123022834842E36C82C = _NONAME_ | V | 0x6A7FB2DEF3840780B7BB9878E5DD4A78 ; libaacs -0x462A471584D335604292E0C643A9A0CEC942EA0A = _NONAME_ | V | 0x8AFD5FF601A87AAD9539D5F5E4A15D73 ; libaacs -0x49B4CE02EC7C2807E93099E38108D703419F5922 = _NONAME_ | V | 0x7AB18D1DE17C5B1F0EF4A8BAFA7D12C6 ; libaacs -0x8679DC4D8770070D8255C440C60D29AA5B372B9D = _NONAME_ | V | 0x2B25B861A7C94E836CC11F37F0388402 ; libaacs -0x4018F13CBAB654B39A2534E0449B1A9A4E7C4F20 = _NONAME_ | V | 0xDE311B3EB65DE779E2C3F18EA2CFBD4A ; libaacs -0x8314EA23EA60D0AEA2C3DE923C39CD743FD425A0 = _NONAME_ | V | 0x15D8FD87FCAD9F261FE40D58BEB3F4FB ; libaacs -0xF3A78944ECE0F48F774F18624C7A50302461800E = _NONAME_ | V | 0x885E367A27A21819FE0FBEA978FF727F ; libaacs -0x01A7831D3C1BB77A08C2707A93BB5DF49259F746 = _NONAME_ | V | 0x39BDCD50A283152F80911066B7F35F63 ; libaacs -0x465E2F65769C0C9CC60D0664FE452D98488760C0 = _NONAME_ | V | 0xDCAF90A9DA1806AE8528C45450178EEC ; libaacs -0x6E03E0F9A58947271CEF21C12012BB4B4677501D = _NONAME_ | V | 0x1EBEED863F6E0D398228B6CCBCD85E2D ; libaacs -0xA09C0088F901695F4929FCC19896EB1DB45B0E78 = _NONAME_ | V | 0x70A9E3AE46EC13693C7A2310BC7986DD ; libaacs -0xC4007BDB1410307D517CFB2B93C8B0EFE2E531F8 = _NONAME_ | V | 0xFE2F2F18A472C152790CB23F61CC960B ; libaacs -0x8D1590701B7466F0E16993B76245601C7FD62291 = _NONAME_ | V | 0x871A07ACCB350E1B7E13265C7C5DC2F3 ; libaacs -0x10C379745B2056AF6A0D7925C11B145F96A3B487 = _NONAME_ | V | 0xB9E4818FDC38285124D5EC75F1FB3739 ; libaacs -0x9A80B7BE1ECE4C1FFC928032B983C6456ED3612F = _NONAME_ | V | 0x382EDC6D64DBBAE39E38061A75D8F479 ; libaacs -0x575A34625E71A6AFAB7EF6F45BA56A038D6D1C86 = _NONAME_ | V | 0xA318D94C016926F040E450C064E460C6 ; libaacs -0xF64CA26F919421DBB84A9C79292F7A0632475370 = _NONAME_ | V | 0x0F1A3C451299B8F38CB3BB0485E39179 ; libaacs -0x06AC73B0A4884A0E9E261768B2ADFD723D28525C = _NONAME_ | V | 0xF50922F936E67282B087FA1A428FE531 ; libaacs -0x968FC2C5314FA774A60660A46D01444DCE02C690 = _NONAME_ | V | 0x0770D3788B6414DE5E06F52AADF265D7 ; libaacs -0x189DB29E5E75F48E4EFDE895CF64F93B1DD2D49F = _NONAME_ | V | 0xDC79E2F35423FED5144F9DD7112B6973 ; libaacs -0x38AD37C44E7C62109947B04CC618A80BBD31412E = _NONAME_ | V | 0x247C2A8DAF245186FA3D7756EA0D6179 ; libaacs -0x514788E0B80B6934C4C98076C1B6786C2EC8EF02 = _NONAME_ | V | 0xE67C936436BA6CE4E4523E3A8572E537 ; libaacs -0x47957596DEA6F2A5535434606739A304D43E7DEA = _NONAME_ | V | 0x1814597FAA94F218144527014F2B2ADC ; libaacs -0x6CCDAD75A4D96C12C96E656C05DC1E22545033A0 = _NONAME_ | V | 0xFEA96ED775EB0FC8FA7E8F8CE969D815 ; libaacs -0xE296904F85DF36A3D772D913FCE10CA00B639FFD = _NONAME_ | V | 0xCCD22BC4A703BBB009DA0C605559041F ; libaacs -0x0C9B5F4CC503D3867C2FF5E7A415C85A76C9243F = _NONAME_ | V | 0xFCF731B81283011BDCBFC10DBCD31E5E ; libaacs -0x99AD875936FAB9FB1F21CC6760A168657D857198 = _NONAME_ | V | 0x84CD7EA7CA1F4D04038F61BC89AEAA8C ; libaacs -0xC9E9FBD42EF9A52DC6EA595BC0B7DDBAF31B5194 = _NONAME_ | V | 0x66DCDCCFF3FF7C34F6A0BCD86D688883 ; libaacs -0x160C0F0F22FD9A69723A095B46E6D6122E7C5D7B = _NONAME_ | V | 0x5D087CA12B09EA719DA30B53E3E38FB0 ; libaacs -0xA7D2A747A7370654E41116DAFD6BF02611E8C53A = _NONAME_ | V | 0xE0260E7903F92B8D9A56B918B57DCD89 ; libaacs -0xB44A41D1CFA1851B21313B07CA21384C68C7C8F7 = _NONAME_ | V | 0x3401E002F08CBFF4C9D636A1D7285579 ; libaacs -0xEF251089F0EB40CB88153CF949462B8777994131 = _NONAME_ | V | 0xB480DAA08B3064E7018CEFC48886EF0A ; libaacs -0x46E048BD2067F9300FDE8B2D08FFAD41DBF26A8F = _NONAME_ | V | 0x0132433F3C6FCB7498C01039B947DACB ; libaacs -0x38D070BDF7640CADCBCB2D85FEF66308C33EB91B = _NONAME_ | V | 0x977B090E2B9288D93C73B9DBFE22D1AF ; libaacs -0x9CB1522196CAC3198259A4CBD035B6F1617167A4 = _NONAME_ | V | 0x5A7517228C02B4809BA9C4FAF2021D6D ; libaacs -0xA966310FD2FA25A626A09DB131FE0E8368874F06 = _NONAME_ | V | 0xFDECE1A6C06742C192DE4E3EA82A93FF ; libaacs -0x0FA3C264A4CDCB8AC8DEE5196E3240B388744551 = _NONAME_ | V | 0xBA043742A3E41F3932DA29EDF605B9B1 ; libaacs -0xD8D9A70866B5A315F398341E0BC24D00440FA61C = _NONAME_ | V | 0x6D19C3A9FA05599F5E52EEC33A2F56C7 ; libaacs -0xDF390EC3CE14587A11FDDB09F094E32F4B89CD10 = _NONAME_ | V | 0xD2AAE241A13D10AECB12DE95DF963D1F ; libaacs -0x2B00AB53A86BE2C4E164827E401A7E7ADB9A7705 = _NONAME_ | V | 0xDB154F0985FAC3DCD25F7610C8020A5E ; libaacs -0xEFB3F08CBB593517272D1AFB0C9940222C18C29D = _NONAME_ | V | 0xBD429D0E61C8EF58FE43B8762EF03909 ; libaacs -0xE3F83FD3C3AAAB9FD8F5E666A7B17980F76BE8F3 = _NONAME_ | V | 0x11310C3891B34913633084D5856C7468 ; libaacs -0x1DA5F7168038715D2139EC876A1BEB8C2FB31896 = _NONAME_ | V | 0x23D41B21613B1EC11F6C3F6AB1082777 ; libaacs -0xCE320B70626A14A9E7102C5F1998BAB71CE32AD6 = _NONAME_ | V | 0x8D05D6D7D0DCA329A6DF924F0E292D42 ; libaacs -0x464D4AFBF3C34216C99BAD53A74F6D0B9692644A = _NONAME_ | V | 0x857F187BE893F15EC4AC984C84386903 ; libaacs -0x810B58AAE6DEDA08D305CE06137DFC856D7414FD = _NONAME_ | V | 0x4EBB10682FD36E1D3836C4A9700B4DB5 ; libaacs -0x6504740320896004091D0B7D550E62B3B8A603A9 = _NONAME_ | V | 0x163ABA472212C8629E019AA693247B7F ; libaacs -0x0BC52C07E6ACF60F5C3688F9CE21BD8960834624 = _NONAME_ | V | 0x14ABA483CB37799A241908B7B8CC8326 ; libaacs -0x10C827348A4FA0C1E99626BB29850D21D354B769 = _NONAME_ | V | 0xE2E6AF276384A5DBE5E4C996498CE975 ; libaacs -0x586ACADD6B4A54FF28F81694962CE3266F125C44 = _NONAME_ | V | 0x4F296C78C8B13AC42F9DC1D0DC400C8D ; libaacs -0xEF8FC3CBBB01CB99DA147CB360469F502F761D78 = _NONAME_ | V | 0x8B4EDB5826F9BF436D3AEEB20D4A4D08 ; libaacs -0x0463DEEAFB96FE57C813A62CFCD0580EE823B98A = _NONAME_ | V | 0x4102A6F7BDE12C415C97490C0909D4B2 ; libaacs -0x115347B318CFC6034CF59066EB01CAB7D3EEF3E9 = _NONAME_ | V | 0x3060209F58057E16CE77A1966786F450 ; libaacs -0x834AB48317B47DD083E6CAE108AE5BC4DEA9D355 = _NONAME_ | V | 0x4423EAFA82AB31DDCAD899C27D7CFE80 ; libaacs -0x1FFE4CA6F9BB22652538C7BE9406D92D09B2AC75 = _NONAME_ | V | 0x7D87166B3E622560FEFA2B03AF496961 ; libaacs -0x2A00D96344D002BD16F80C87E054189B9BE65D16 = _NONAME_ | V | 0xF0C2AACF29D3937B8DA5FB8F83A8512D ; libaacs -0x0641174294B0A30E4B493196EFF5697378AA77CD = _NONAME_ | V | 0x36E7DE2ED7EE59B310AF1355D6603924 ; libaacs -0x28DCAC7AB2108077DBCA867A976D02F93622C829 = _NONAME_ | V | 0xA8D16E49B43F53EB8168DE55E03FF146 ; libaacs -0x71F59105DDE37BBC8EFD6F9CF31F1690ED0DD34A = _NONAME_ | V | 0x65F3D7AD5E15E3E89A01C9B6D3BD7127 ; libaacs -0xF7F040BFE3B289BECA570CC32E6609A25DC550F1 = _NONAME_ | V | 0xD851A86ED148922B62A437F6D1950DF2 ; libaacs -0x2A7C584D858385589F9D499BC854044FE5322801 = _NONAME_ | V | 0x112B73326E53EB031468E2066819D1B7 ; libaacs -0x3B86F953650C2F29F0506613B8AE73173E99A1B3 = _NONAME_ | V | 0xD568A96882FCF93C9DD0E5302CD9178C ; libaacs -0x3CB6198D0717D45730EAF8C4E62CF708E35DCC92 = _NONAME_ | V | 0xE556C6C58543A3F1FB4898472D8EBA5F ; libaacs -0x4CC6E3B997423F4EE3853ED2657A89A6A0183727 = _NONAME_ | V | 0xA5F6C6FB907B70DE01AF480816DA4FFC ; libaacs -0x6BDCCE2EBB0472458FB3591758EB3D6AA3F67016 = _NONAME_ | V | 0x1D4E09F8C3E54D019DC1BBED013404FA ; libaacs -0x9FFA65143BE579E1A966549420075B337EBF4A9D = _NONAME_ | V | 0x748F6AB0815B6AD3E5A5C9BD1B386B95 ; libaacs -0xC50DAEBA009D9BA1520C16678D527061E8C58E4C = _NONAME_ | V | 0xA948351D19A0F1B11B9A218FCAC52679 ; libaacs -0xCB99EB2619488EB2AFF24E419E9FF5C0DEF97324 = _NONAME_ | V | 0x2C47DC017580302C08DF8C998F6500D4 ; libaacs -0xE80362FE4744E32B0CF8505D56DCF823BDF72104 = _NONAME_ | V | 0xA844B43E4EB9ACE655146DABA0F7B673 ; libaacs -0x2EC8C0E8D3FEF9DE810558486A4C02B93469EE86 = _NONAME_ | V | 0xC4A59F99884827E31A57DED1A2DDBF15 ; libaacs -0xE4554B641710238B441BF911C66F02BD65BBDBED = _NONAME_ | V | 0x384BFE663BD2750F79B59035ECFD78A3 ; libaacs -0x1FB13DB8A4185440A4C6AB3AF6B41985055EA97A = _NONAME_ | V | 0xFC7F1871518CB47B71BFD620411ADCE8 ; libaacs -0x5F13D33C288A66953FE7E639E26D2B1454A41011 = _NONAME_ | V | 0xA5A69C1C1DE04CEDFA520280B12FF279 ; libaacs -0x58A5FB3B96F9FFD5D7B0D61E46095B6993B8BC4C = _NONAME_ | V | 0x3FDEBC27F38E9717E486D991E39E60A3 ; libaacs -0xFCBF5738E85DB728F86352DAD7946BB7500CF67C = _NONAME_ | V | 0xFBDECECDCE9CFFDC1C400067F0F71A3A ; libaacs -0xFA14747B1AD38B0C96E916AB66EC74EC477CA705 = _NONAME_ | V | 0x79FE13BFF195179A89A94FD53651DCA1 ; libaacs -0x9D3DDA81072D0E3BC2135D9821787CCD9E5CA291 = _NONAME_ | V | 0x10BD524D829D5EC16B8A5346375F6082 ; libaacs -0x7EFC75BF2D13E1F8DE0CBD97B6FE1D1CDCCDFE9E = _NONAME_ | V | 0x7863C160292EFF3EEBC458618FFC13C1 ; libaacs -0x3EF1CE0B28C1EF9A15E0037FF654F5E389C5B17A = _NONAME_ | V | 0x45AAD6C706F2E49BA0280C12F36F3934 ; libaacs -0xA927AE6601506B8A8CD098F98D7B231007355DE0 = _NONAME_ | V | 0x44604A3F130910D51586D7625758AA7A ; libaacs -0xD2C99B8467F510E1BEE51A7F004A55504695E006 = _NONAME_ | V | 0x9D9AC9A729A005160A425315B7DF744D ; libaacs -0x93CF03CA4DBC65E6EFAF3D9C08F04722CE82076F = _NONAME_ | V | 0x3FE3B4AA792A921649D92D81DE6E8ACF ; libaacs -0x02F85E6A9FE2B9B4E8F1ECE8516CE6CC9DC397AA = _NONAME_ | V | 0xFA8630F95A4CE77CCF2069E1F9E2BFF1 ; libaacs -0x9B6C6E6D0851E8B824F95A751A857D9E3F6B378F = _NONAME_ | V | 0x6D96E748AE1C3A5C50CB00C98878DFCE ; libaacs -0x1E1CB3F4DD91C5E0412F0DF0FBD30635241CE14D = _NONAME_ | V | 0x7AA5E7DB1BF67BDDB047C951C4C4C7DE ; libaacs -0x4F13C46D9EF2ABDCF56E4A8844872FB924E06887 = _NONAME_ | V | 0xDE9CD502702728AAA35A2BABF28675F8 ; libaacs -0x21CE3558BEFAC48E2FBE5D92C91D97E50AB8A935 = _NONAME_ | V | 0xE0201BA1187E5DA299FB7D1B2B214AC9 ; libaacs -0x08FF28489B893CE7E392E12B074CDF01568B8835 = _NONAME_ | V | 0x766D89BDEEC27CB31C6A891066FABEDD ; libaacs -0x0038264A872C5D5609209939CDC4BEDB40895E9B = _NONAME_ | V | 0x3C639327E563574ACA01526BF7F0A944 ; libaacs -0x5B2EAB45AF8B750DFBDA6A843D601B3E91FB2E30 = _NONAME_ | V | 0xDE21138E8DCADF4DC4B48A05E48273BD ; libaacs -0x1AAF39EACDCD3E3FE67C37C8159BE14ACE62626A = _NONAME_ | V | 0xD30A72FDB5514765F7F57EC3DD969619 ; libaacs -0xB03F152F47ED21CA571B3A36EF253435AE69D174 = _NONAME_ | V | 0x8E9D4B189E721CC99B6FAB89D9EFCF48 ; libaacs -0x12B3D07DC5837BD88EF1265901A225555D709517 = _NONAME_ | V | 0xFE197D1C2308D9BCE430812806218E6B ; libaacs -0x692BC62913273BEB098BB61A86374B8E1757D550 = _NONAME_ | V | 0x9A1DBAFC72B72F7D220B8ACCCBB89CFE ; libaacs -0x3351C44DAFF7A70A94B12A921CC4B4DF43900CBB = _NONAME_ | V | 0x0F0A1E1012EBB9D231BD7D5E77B863D4 ; libaacs -0xEF80DF975B550BDA1A5982C7AF0BC7E3C1A746C4 = _NONAME_ | V | 0x9E492E20815666D29679CB19C77D215E ; libaacs -0xDFA58249864BC7F6F83649E3ACB40387B66E3558 = _NONAME_ | V | 0xFDE2A339DB7F614A80ADE2915F51CF45 ; libaacs -0x365D2206A68B49066C3F00F7D026B117FCC4E82B = _NONAME_ | V | 0x24DD5D1B58D97F2C5E45559A5B4764AE ; libaacs -0xC4C98909D4DEF22CE01B1B2577EA240461A73AC7 = _NONAME_ | V | 0x380DB99DF399D64A6DFFAFEABE0D2F20 ; libaacs -0xAEA110E068C5DB36B956599794D40F1B4D977F2D = _NONAME_ | V | 0x16F4ADE15AAE464078BB78E60575EFBF ; libaacs -0xD81026FF91786CFF3CC51C71F8E4E071FE93FCFB = _NONAME_ | V | 0xE7CA93E6502DAA8C35E0DB0AEDEE083D ; libaacs -0x411BE1F6F85E948DF20A86C921E962F2AE2F25FC = _NONAME_ | V | 0x957D21E55601FE92ACAC5604AA07D230 ; libaacs -0xA4A69AB17DED8190E1BD6B34864CEB84B8AA64F7 = _NONAME_ | V | 0xE565BFD7F014917613704872125025F5 ; libaacs -0xFE24CAC8363FDFA130954F0B3D271D128A5231BD = _NONAME_ | V | 0x13F0ECBA7A3FBDF0297AE38A8B99B921 ; libaacs -0x5715B1C751B283065E33514AEC694E31C73F9AE2 = _NONAME_ | V | 0x7AE54069A9016742FCED7937C6EB5B61 ; libaacs -0x28B5780805500D6239B6B4C0EFE9AAD156FF937F = _NONAME_ | V | 0xEB39D98DCB885B316971D9571CB5AD6C ; libaacs -0xF1252D86B5E380F9E6AE4BC6DB1A7F1A1E0920EB = _NONAME_ | V | 0xE5434527DD6C1D3898AFD40729528547 ; libaacs -0x2EFAFEF5C616A97228CBFEA963C0B47CC81FEF09 = _NONAME_ | V | 0xF8DC4A009688173641D94CA0FF3F7905 ; libaacs -0xD736410C5BFAE54803DD98666162FECE2425D46B = _NONAME_ | V | 0xF9E708394A3296EC318794E2DC6E4391 ; libaacs -0x09DE7DF69696495FDF74DD5AF53BD3E211DB1585 = _NONAME_ | V | 0xDB1CBD12C89B8DCFDDCA44EFD1EE2596 ; libaacs -0x40E73F7BC3E1636742129C3184CA139249925011 = _NONAME_ | V | 0xB86406654042D6573E2D855E19852C0E ; libaacs -0x373D1F8069C9F6E8DE55D9C9BAEAD2F57520C29C = _NONAME_ | V | 0xCD91844FEB17FB403225D5E2688BA59A ; libaacs -0x9BD06273C56A845C02B93831BF4EE9B96CA26463 = _NONAME_ | V | 0x3EDA0F0EBB190D7F563DB100C24A167C ; libaacs -0x89D1ADEECC04E644AEC54FEA8FCF19AC368BD9D6 = _NONAME_ | V | 0x3B456CE1EC3B19FFA936F0A1F946E57D ; libaacs -0x1646810EA53ED68CC4D5DB7BFAC7D3733CBF838D = _NONAME_ | V | 0x42E88DFFF7347DFAF0559C9D0B6A3400 ; libaacs -0x2E9096FACF22720E0C888047E691AF0FD7B49F44 = _NONAME_ | V | 0xB99F912C52F83EFB4C53AD2D24AC9843 ; libaacs -0x0ABA8CAD52324BDC599663ECAC8533374AD4E296 = _NONAME_ | V | 0x28F967315560A498193495B2A6689057 ; libaacs -0x1B8E2506342B6249EA8D589594FF93CEFD7EA351 = _NONAME_ | V | 0x087AD5D9ACC50BD86B1FF4FED6D51F80 ; libaacs -0x4D8EC1CC81638854847AE0A13B0EE2A72A98ABAF = _NONAME_ | V | 0x0F4A07FD6C0951E2CF34D5D4A285BD7C ; libaacs -0x4E5715E9D070681BA941A01E20C35BBFF4306F9D = _NONAME_ | V | 0x8F763A6DC7B034D90DEE72839F697821 ; libaacs -0x59D902F6053D546E7C8771CAE2A1FC5D6BA18A73 = _NONAME_ | V | 0x4F719218684091F54257243492144555 ; libaacs -0xF1367088941E3D562455384EC634D62C807E2F8E = _NONAME_ | V | 0x7AC188554AA76A9440F1F39249951A3B ; libaacs -0x7DC28181A7878B230B120F259CAB730D185ADDC7 = _NONAME_ | V | 0x4FD8B6C1346EEC3F88D3CD7DBEFBBF5C ; libaacs -0x7FA7B6A919C5FD941D65806878D26C9EEB97F967 = _NONAME_ | V | 0x86EB05590C0CB833B0BB7762E461737B ; libaacs -0x945E8AA955AFF5C63411FD1D7EE1A2553EDFB22B = _NONAME_ | V | 0x2B593E8C760E613C3DA851FF25AAC783 ; libaacs -0x0F9CD966E15ACB39934CC16793B4CB9C9E709E4D = _NONAME_ | V | 0x15DB3B5875EF9EA4EC61E2C0B36AB5A9 ; libaacs -0xB4096312E0F7D8009A506582FEA939CC5C06FF6F = _NONAME_ | V | 0x846110497403C7A72AD6691515FBA8B0 ; libaacs -0x8FF2118FEA8AB48D3E961704E3DA993B778485DF = _NONAME_ | V | 0xFA632A1ABA0254E013938653B0CC8C52 ; libaacs -0x838685A6CA70ABF95C793256C392AF4D0F3534C0 = _NONAME_ | V | 0xA9DEA1032D44C298A2712205F2E2DAAC ; libaacs -0xA6C67A72EF3B3A01CE48DB7441F5BE6F861932FD = _NONAME_ | V | 0x9C9F1084DDE50D189E2AA1DDA24907C6 ; libaacs -0x4FEA579748080E0B6F875353C4B1DA7FE6A127A5 = _NONAME_ | V | 0x9C0810D47E2AE21D00E32A38C21A5443 ; libaacs -0x5E74D5FF88C66D8B94C1F454671CA24FC6E65FC6 = _NONAME_ | V | 0x45D87CB1C304402444F29A34183D927E ; libaacs -0x252E2750D85DFE74EE9DBDB905244A02A3EF72C3 = _NONAME_ | V | 0x442B3DD2153FF7FF25BFD0E0ECAC5AD5 ; libaacs -0xF7404D9FB48C4DA89E74C458C403D2B474D577BB = _NONAME_ | V | 0x7F5A3DEB68BB947F8DCD9C3EEA7C3431 ; libaacs -0xE9E9A6CE2E17AFBADC673EA810E0FAC5B1DAF789 = _NONAME_ | V | 0x950192AC5D78CB3B8F8B6168A8141C09 ; libaacs -0xE60984B1A5D51067311BA216F506E73791FBA7E8 = _NONAME_ | V | 0x74023336A8DD45197554A47F0DBB9E5F ; libaacs -0x04DE6B9CAE2AE63A4B8743FF1E17B7C9A6FBF01B = _NONAME_ | V | 0x0572C288B3B969A95E19D35410029112 ; libaacs -0xFA2BA7B3FC43FC134AC5B3FC1BDB8852BD2AB63E = _NONAME_ | V | 0x27412F10EB50F803EED26B18272CCF61 ; libaacs -0x97C6CEF19AE54AE42C74F2693F2354725E622783 = _NONAME_ | V | 0xD8089CD6B595597625DF224E582D714D ; libaacs -0x47E399ACD3C3D3EB0D0356565AB4059177724D5F = _NONAME_ | V | 0xA75E8D2E66BC4525D48C717370E7E44C ; libaacs -0x5D4422C51B02A7FB9C411D071304DB4A51651E9C = _NONAME_ | V | 0x7C6C4DD5E28BE68A37D9CCDFD9099D1C ; libaacs -0x8FE94E814409695E5E5060C0BF1CA3F37F15789C = _NONAME_ | V | 0xCF40084CEC27D536199F43398F88B39C ; libaacs -0x45E7C6DA2BFEE30CB375FF30E2E280342A02AF54 = _NONAME_ | V | 0x71BA8AC29CE2FD4128DF6588EF94C6B3 ; libaacs -0x1AF575B9BD53123E102C64B0DB03AF854512DA3C = _NONAME_ | V | 0x1E642B395B8B52AFC82BE41CAEBF2946 ; libaacs -0xF5D185C6137DCF6B67825DDCCE8F188995C5880A = _NONAME_ | V | 0x8FCCE255D080A833B6111CC063D35A71 ; libaacs -0x5D86733457FE7E57D22B6E0933DB6A26827236A5 = _NONAME_ | V | 0xAB17A6F396C9F9EDC94437B5713C0833 ; libaacs -0x91D76E74962561AD7DACF9C894903700DD670072 = _NONAME_ | V | 0x45781464A709FC364FF4EC978C6531EA ; libaacs -0xDDC9282C239C08DC50AD06751EDC4C788238122A = _NONAME_ | V | 0xE59689FCF8B8BB7C3DFAC782BEAE69A4 ; libaacs -0xCCD5C9EB9BE4D56B0F18DE26A8534279298CC148 = _NONAME_ | V | 0xA817115773D4D8870388462EB0E0065E ; libaacs -0xDC8B185C992B1A12C7D93A8159E2A6FAD2F69832 = _NONAME_ | V | 0xCEB61DD0067A576B9DBF957391D2444C ; libaacs -0x48D433B95D2CAA453D30802FF433DBD84A402D3F = _NONAME_ | V | 0x3134F130A25FBA0927E177B3F867EA3C ; libaacs -0xD1169BBD034F3E811678435979B3B8661D746ED1 = _NONAME_ | V | 0x010EFA894565F27D4A62E5B003EC01FC ; libaacs -0x17EE9BE0BBA25F558A3A1E9AA7E0FF3A82A21173 = _NONAME_ | V | 0x291F4B48F9467C3FC0D0CCA1628C6083 ; libaacs -0xF2EF0ACD768595F81DD20CC430CBA19DA0BBC9D3 = _NONAME_ | V | 0xE2B77183542196FE9470832C9264023C ; libaacs -0x2D682F3266045F3DE16AE6C6059756CF9D4A6B2C = _NONAME_ | V | 0xB72C8B4EEC0C337D77DBD0FB31D1E9B6 ; libaacs -0xA586030B579D3410FE5B4D32569038EE4A0818F5 = _NONAME_ | V | 0xBE92CC3A7C3113CED44F4F5218D160D4 ; libaacs -0x654860393CB7A0BF869962BF9C254C9C3FFCDDAB = _NONAME_ | V | 0x3134619DFB1638AAD97473C414885490 ; libaacs -0xDE44977D54D6D0AA7E1A1D7E31ED6048A92923EF = _NONAME_ | V | 0x42AF2043150940FFC11DC6775AF52332 ; libaacs -0x640F3903462ACB273EDE73D4EF4B746B1FE41613 = _NONAME_ | V | 0xC813C2A1F68769B61EA92105BCA52EC5 ; libaacs -0x79A5D998E2EA820F8C512DF57F050E5C0B9E9836 = _NONAME_ | V | 0x79AFDA91155BF983C0CD53A068D76E37 ; libaacs -0xB23C5D954C5CB94A77C4C097882618B4787171FC = _NONAME_ | V | 0x5D18D1FCA71681DFB441D1F5575C09B7 ; libaacs -0xCD1A0D9BBEC6238127AA9F121A0F2760344459AA = _NONAME_ | V | 0xDF32D67113D4592FA4576CF0EA987F36 ; libaacs -0x4A446E9B832293954FF1AEED133EF038F424F39D = _NONAME_ | V | 0xE6B2B2F8A690294E54F347640BE5B412 ; libaacs -0x2515B73D46D3FB013FF7848913235BAD0A07E9B4 = _NONAME_ | V | 0xC6411F3365E05443FC16A2B456E5D274 ; libaacs -0xFDEE03EDAE623DD6AADDA2C77F25F3E17B77D9BB = _NONAME_ | V | 0x11E3D6C59871E70140CD74D7C199CEC4 ; libaacs -0x7C38E504A4001B4077B1BBD9E12525B4D6A72790 = _NONAME_ | V | 0x0C9015E122C07639A990E0470CE8260B ; libaacs -0xF516FF92990D5BA279ACF2786748C397EED82641 = _NONAME_ | V | 0x429191F657FE4B6835A6CF372A441591 ; libaacs -0x76C2677C005C13E8450C89A004703D918BD6BEFD = _NONAME_ | V | 0x0DE801389B1EC994DC4E1B6C53E96425 ; libaacs -0xD8F92672948FDA36DC7C7FCADE1DBF52D65EE56C = _NONAME_ | V | 0xCBA245DA6BF469FFC9BC5360C1D1FD15 ; libaacs -0x7EDB5BE942AF00269267EB68FF9BA5E807DF7069 = _NONAME_ | V | 0xC8217452F9128766357B64337AC27920 ; libaacs -0x6CDDB1CCD1267C229F35BBE69F1171C869061001 = _NONAME_ | V | 0xC332CEF77735F8601FB848783926FB22 ; libaacs -0x15A90CA5A0931CAAFAA931560BEFF73425694262 = _NONAME_ | V | 0x31C8642AE112547D60D73E48EA98731A ; libaacs -0xD29C2DC3ACE0D3382B3AEB8A90823D488C95406F = _NONAME_ | V | 0xA843CD93E286E480A4D32FC8CC92A658 ; libaacs -0xBE23343D8E5F0FB325CA0BCD9FBDC0F089D3F29F = _NONAME_ | V | 0x2FA16B8BCA61A646F151F48A5D1F1EB5 ; libaacs -0x5CC9E2F9EC1AC08B2D87B04C491AB408E9E34103 = _NONAME_ | V | 0x60B7C99EF53FC10425D497759B7459F6 ; libaacs -0x2F3DCD5EE9931163D998942C5F167654419AAB18 = _NONAME_ | V | 0x7F770BB72A73D05B99D4AF66E2A495FD ; libaacs -0x5916A1698FAC8DEDBC22FB5B5061FB668C5BB83E = _NONAME_ | V | 0x256B0A95F116E056EF96FAF4425DEE28 ; libaacs -0x647EFCABF4343C415484E36668DCD424205A6F2C = _NONAME_ | V | 0x66364FDEC842C15A5EFF420C86AAB73D ; libaacs -0x848F8F17DC8397D5F4CC39E987A020A14A018671 = _NONAME_ | V | 0xF6C294C72DB4C51EE9CDBF48B2342445 ; libaacs -0x7F6BB279E22CB59ED3E3E286150BD4B33C0F84CD = _NONAME_ | V | 0x06E5B350267AD910E440F88A64BB1A69 ; libaacs -0x86A0ADD75D71F10CA32BEE9E22C1F3788F988CD5 = _NONAME_ | V | 0x03811C370DE98818E7037919A1958185 ; libaacs -0xD5C52D2D1A3F1420EA35957CF9FA5ED1B4022CBD = _NONAME_ | V | 0xF154052D5EABB2F902E405CC02D7F801 ; libaacs -0x5057316392AC48F53BBFABE3D0B44F18E000FB55 = _NONAME_ | V | 0x83A825C15F024E4E041319014A24D2DB ; libaacs -0x31CDC33739A94D927FF086B967BAAFB96CC34234 = _NONAME_ | V | 0xA2FA1BA475FE39C07F62EB86D1D5C097 ; libaacs -0x0BF58D1A127DD4279BEAB57936BCE3F5DB449034 = _NONAME_ | V | 0x3A087569816B18CDC252F3E6057F7BA6 ; libaacs -0x0DF28DC617BD7B00766D92529EA7DCF9E28AE36A = _NONAME_ | V | 0x62B9E45F23F5DB146E5BCBA8120FC390 ; libaacs -0x32B782BF2D1024E57F29D8595D2E77F49A8D2CAD = _NONAME_ | V | 0x3B0866E2F6EAB782932585767A64A673 ; libaacs -0x68A46B2DA3FCCDB343B6E2D5F9D9DFF502378578 = _NONAME_ | V | 0x861B6FBDE538831F5F0BF6F4AE3B6F40 ; libaacs -0x92048CEAACAF9722067000BCAF62B38AE2281AF5 = _NONAME_ | V | 0x2A7BF4B84C1953B2F243BB5D551F042B ; libaacs -0xE7131E706A35EDC938F586F1C040ADDA443C87D3 = _NONAME_ | V | 0x86600314AE6AEC8B5EF77FFF023FE0A1 ; libaacs -0x08730E22AF1814F90EF0E2BB7C1236C43E2DBEBD = _NONAME_ | V | 0x9A880921D20A94F254B277FE437743E5 ; libaacs -0x51C024DE6BDE8FC31959AB78013825490F6A1C63 = _NONAME_ | V | 0xF0B0161F487F3515422A86BB8FD86B0B ; libaacs -0x05C1EB4943D876F241B83A2434526B94452E14C3 = _NONAME_ | V | 0x136662131C1CB6D12CA1E32629150749 ; libaacs -0x95484D57FEAC4484D9603104E1CDA6E80D2A0186 = _NONAME_ | V | 0xEB5BE060F8BAAE53EB806288E88F16F5 ; libaacs -0x410C814337DD47FAAA00C508EB90945AD1386530 = _NONAME_ | V | 0x14B3BB2C765EB0571E6915C12424AD7B ; libaacs -0x749FD6A64DB54F8F8CC3D51FC75317AFDDDFA7C3 = _NONAME_ | V | 0x3C37850D90F33FC1D527DACB63408A31 ; libaacs -0x0AC39CE925E2231EC96635E3A9F301F812351531 = _NONAME_ | V | 0x8A39FC0FDCD9949FDC79A84DFA0FFA5C ; libaacs -0x1D28947F4A0768C93CF6FF8B4B481105848BE333 = _NONAME_ | V | 0xECEE03CFBAA108C6974CC6B279422F8C ; libaacs -0x998F853F9D41A67EADA41D49827C59A3E8788729 = _NONAME_ | V | 0x9357EC0B7E23A19802BCC923350662DB ; libaacs -0x7E9EA3EF5406B87254A600B3592B9B6C72F15FE6 = _NONAME_ | V | 0xB1330FF15F4B8313EFE1132962791272 ; libaacs -0x9B959FB01EF974F4C639425A5FEBF508BF4321DA = _NONAME_ | V | 0xEBBBBE998A3959CAC5C561C00A22FA81 ; libaacs -0x26BE106508C7540B60A0F402898160557BE8EBE1 = _NONAME_ | V | 0x99E2F8266682C75E3F5011A1E4089BA9 ; libaacs -0xA00F6AE11945CEE952756C8CFD7A7BFE6FD25B7A = _NONAME_ | V | 0xFA5D2E9B7508242DFB3F52F2A637D9D3 ; libaacs -0x634DAEE5CB3548FD869C13005ABF995BBE1B4EAC = _NONAME_ | V | 0xBDB886F19F2BC52EEAB622F1D90CA622 ; libaacs -0x3712002F62CA3ABB8830AACE1CE9ACFB6996B404 = _NONAME_ | V | 0xAFF19A3C42F495C3A85379899D190B0B ; libaacs -0x069F287ADD0A1A543738917D4C14BCAB84998E13 = _NONAME_ | V | 0x3C6031364010F33DB2F0D9739E14B300 ; libaacs -0x62894DD9271B776AD47DC1C56407AB423462BC81 = _NONAME_ | V | 0x81F819AC9DB867E2BBDD4F7C5F081667 ; libaacs -0x945B31CDEF1C33F9DCB1D8F2AFF29B4D6B4EDF80 = _NONAME_ | V | 0x18C88F9A5FAF4CC7AA7428320F68A66E ; libaacs -0xB26D5E5D69315A466E14ED86F290111B3FBE7607 = _NONAME_ | V | 0x0EA6AE3CC34D5FB444096334EE9EFA02 ; libaacs -0x2FD693CCB79221437FA17FE6561603A7A59E2FBF = _NONAME_ | V | 0x099A6E746241902C6DFC38CB02D88495 ; libaacs -0x154628CA7726BCE2B78CC9799CF22F10F3C65F57 = _NONAME_ | V | 0xF5BA3E6F99B2B444A0F53D6922D9CA58 ; libaacs -0xD24BAA017EAB9C2BB25FC3D4DC480C7E93A348EF = _NONAME_ | V | 0xDDD43234D4B498FC67C7E01095CCE7E2 ; libaacs -0x52E01AB884D3E466CB190571F85764E5EF06C830 = _NONAME_ | V | 0x5D9CB832AD8188F9E3E4728917C737E5 ; libaacs -0x67A5A4B48E7547FA064D421911786C9E29F62F31 = _NONAME_ | V | 0xEFEE43A770D28013EFABA53E80976F3F ; libaacs -0x3A149A248410D4A9C84021C8BB6A6A82EEA5FCE5 = _NONAME_ | V | 0x01180535CBD2D2823692EE0F7656D174 ; libaacs -0xFD5AA494DA093E5BC5C335CF7EE8C21018790415 = _NONAME_ | V | 0xCE0C4D23438C4E162034D77D9A3A51E4 ; libaacs -0x0F3CB3C24CC77F2ABC97DD00E3F2BEA576FFE22D = _NONAME_ | V | 0xA6585D870C45B2A2638451F30B83B50B ; libaacs -0x85CC7F38D233C6595BC1A25F2D3743FFC43B1BC2 = _NONAME_ | V | 0xAD3DCC369E43F1E56ACDA91F5A4A5F16 ; libaacs -0x944F88C68B31D44C0871663C683B45BE0CC53C34 = _NONAME_ | V | 0xA09B15E234D9DB8643DC13DEED71FD3B ; libaacs -0x203DE1479AA18FE0E85AF699C6151BBD677243E2 = _NONAME_ | V | 0x23789054A0FD0A296246611B55C5D141 ; libaacs -0xD53B77352AF25F78FBB95AAA1805034FC7FF19C3 = _NONAME_ | V | 0x1096CC01230B6A2B44D579C3FE246A92 ; libaacs -0x9EFD107334F6228A31C0BDCA7863FB0A47CE3FFD = _NONAME_ | V | 0xE4A32DBAFD1B68C566769DC4032F4B51 ; libaacs -0xF58D047ADAD7D39451AF2B4EBCF364B68A96EFCC = _NONAME_ | V | 0xF8269BA33174C28931AA689393D21E5E ; libaacs -0x535FA474FB875972B8F0070E9228F3C50C83F178 = _NONAME_ | V | 0xA1B2D589101AFF66F23334180C633981 ; libaacs -0x09DEAB361781A246CCBD0E3F8BCBE5DB76F51BDF = _NONAME_ | V | 0x9B70281546AE774965E18DEF7B0610B6 ; libaacs -0x6E4E1D468CF1F7586D3D221DB4ABE8CCBB7F177C = _NONAME_ | V | 0x8D4AB4D6E9B895B9C56DBE9D9414344D ; libaacs -0x0E38555FD6F28C21FCE4B0993AA4E1882418FAED = _NONAME_ | V | 0x33636D8A3AE314530B8EE7DCCEC620DE ; libaacs -0x6ACCC0DECC213259F7C08041D8779E27FDCB00E1 = _NONAME_ | V | 0xD8884E1748C75CE7C5990989CC9BB6E3 ; libaacs -0xF3A0450B8AE852974E7D98A866322E929F2E019D = _NONAME_ | V | 0x519C48E2136F66F89300281C90715C15 ; libaacs -0x6498CCC17AF07C3DBF61AD255BAB7F8794D56764 = _NONAME_ | V | 0x34B05D9195E8D092A601D0A6D472DD06 ; libaacs -0x34785F7248D07B3B23AF496ACDDFC0686E928C3F = _NONAME_ | V | 0x019FF29D2D85BCDE727A41F956498ECA ; libaacs -0xE9AB4EE0EA4B1E044775ADC5C952564DE011D730 = _NONAME_ | V | 0x4AE10A346FB2CB7B63A5305A5B4C35E0 ; libaacs -0xC1EC00A646AAF995654444D05B1FE83DAD5AE557 = _NONAME_ | V | 0x5410F312E50092C15E5D6FC586221E4F ; libaacs -0xBA9DA3D7B745CD90E33082E344FD4C141FFD562A = _NONAME_ | V | 0x8EC87071E08DF2A1BC99D999C2BA47A4 ; libaacs -0x36DBE4267A1901DCB729A001F4E6871825FAB4D2 = _NONAME_ | V | 0x30CACB75E9459684911806453618714E ; libaacs -0x8140AE8AF5C318D6FCB609C68EBE2CA6D01A27E6 = _NONAME_ | V | 0x0E48B94BBE2A27EC201849F1F3AFEBC3 ; libaacs -0xBC3B6763B22013F47167540DEE476A524C25B2C8 = _NONAME_ | V | 0x80F566C9D887B190C4297CC976FB55D9 ; libaacs -0x58A16128521A892D849A4C29890232E47193AF99 = _NONAME_ | V | 0x9F56C38773BC818EB726EA1A67E0DD57 ; libaacs -0x54643E7ECD576DA238A900A5CCCD687DA3F8236D = _NONAME_ | V | 0x69CB4881D6BBF79D150A79A155F19918 ; libaacs -0xC76ED5813F4EAD1E6D583D8E36A8AECF75B88FA6 = _NONAME_ | V | 0x710513B7E7425C3E52D0ECAC67CFBB06 ; libaacs -0x255A2D915B7F5466E396C83681E939E8EA82F4D0 = _NONAME_ | V | 0x4B0DC345AE7D9BA2F4E64C8B26A70E79 ; libaacs -0x559F2B9B98D63F66D3729FAE6217F5D8A08FCBF6 = _NONAME_ | V | 0x305E58DBC90544DFEA974B6D3BABA4A3 ; libaacs -0x182AC5AA5AEDC1ED0B3C697CE6D8464B812B5F31 = _NONAME_ | V | 0xD186625B8C50975C457E964395D9B20F ; libaacs -0xB675CC1BB1C327212C452BEA0F47FB552DD84EB1 = _NONAME_ | V | 0x83C017F443F9969B997FDA2220480478 ; libaacs -0x957FD40DD6BC6249825D564D835B66F27326C330 = _NONAME_ | V | 0x3E85CAD86BDF88FD690F2FF1FEC596D3 ; libaacs -0xAF60A2A0E3F41A54B4D6043A230D594A38912C6E = _NONAME_ | V | 0x3B5CA3D500490BC51FC4AFAB79CF09EB ; libaacs -0x92AC2AF8EF10BFE702F8D8A7C89CD3C8EE6756E4 = _NONAME_ | V | 0xD1B553B82305F8B36470DD5C9811726B ; libaacs -0xCE08056646BE335F92A5A838404ED24387A338B7 = _NONAME_ | V | 0x11F25832FB937C8EB4194D954D516F96 ; libaacs -0x0C7DE9F0D01710A9F8BDC1C166C45815B22DA752 = _NONAME_ | V | 0xF3AC1F67874EE293CA4E615540682837 ; libaacs -0xE2249B8A66CA48B532C1A2CE4F749249450B9BEB = _NONAME_ | V | 0x5F884DD52460CB7D513DD5F93939EDCE ; libaacs -0xB1446E44B06663406BD6445E587B27E751130F21 = _NONAME_ | V | 0xE01A2C7C3B0455BE8B973093DD6473CD ; libaacs -0xF417DF7AF40FED56898567190B19BDCF7D6038AC = _NONAME_ | V | 0x3E5A8EA2B06C4F26A563A9C55AED2EEF ; libaacs -0xC2B9E9B8DB2E27A48E2CD6856E6F3DA6166985AC = _NONAME_ | V | 0x731D17D14D45B0E1A522A7338E721F29 ; libaacs -0x2F5985A9A9C9DCBF6B2BD79AA6F868645352C8B6 = _NONAME_ | V | 0xD87A8D951A37FE32FBD3618F46C6B750 ; libaacs -0xC78089236D764ADD685355186C84A9B38CD58D45 = _NONAME_ | V | 0xF5D1D7D517F827CE0B9202FB22153628 ; libaacs -0x27AEC978A41A02EE9CB2463D1A70CC4506CBFB03 = _NONAME_ | V | 0x694ED5F2B11D6D8637E575F054E980DE ; libaacs -0x82F71D166F5E2B3D5E3EDC69946C6BFD05A888DD = _NONAME_ | V | 0xCD08B67E692C418786D05BA795536E16 ; libaacs -0x2E6A5C747F49F4DA2894379EFEC2E51EB713CF2C = _NONAME_ | V | 0xEFC9E793B301F3B1B00EEC3F821C76A4 ; libaacs -0x6076391396F2D9B7CB23CA54D80AA85C9572E7BF = _NONAME_ | V | 0x828E02C3439EB0D42DEC706FBF45B36F ; libaacs -0x0EFD8BB720CEFBEF44DB4071A1BB1AAAFAC9A3F8 = _NONAME_ | V | 0xBAF42ACEAC35068E5122FB32CFB03ED4 ; libaacs -0xA2DAA12300403FC61BAF6C3C618D62A798BBDF50 = _NONAME_ | V | 0x1CB41B594FD632B4EB636CB7F4715BFE ; libaacs -0x9E2C46CAAB68E31F82E03F7B234E8D3F2E798773 = _NONAME_ | V | 0xEEADE1E2EBB5F5F26D5165C8EA8102E7 ; libaacs -0xF8E6A966BB1A8B3D417809922ABAE93C5925BC67 = _NONAME_ | V | 0xDAB7904E3F61D63746B07E88D8F72EF5 ; libaacs -0xAE0CFBE541A73E8D4613B538EC67A3C35EB5DB5A = _NONAME_ | V | 0x9AE3F8C8E19DAA09051B73825FB92719 ; libaacs -0xA2FE3051086EF531C94A04E6F007D1F1211A7688 = _NONAME_ | V | 0x011EF9469D369197DFB9D4BAB739CC6E ; libaacs -0xCF721A4C731E5DC3294440E75BA7E71AB64A4A4D = _NONAME_ | V | 0xC2CA3B0656ACF28AB5039C5F882B007B ; libaacs -0xA3A4328E62A9AD4AF436F36A83EFED4997186589 = _NONAME_ | V | 0x1C8C51DAA14B4DAC5C69B13FA34C5842 ; libaacs -0x385AD1969B9BCCFE9ECEEF8EB4EC1F9C3DCF42E3 = _NONAME_ | V | 0x55BD3DCBE23AF0952B34D52342EC06CB ; libaacs -0xBD1C94AB4907796563B3F0603CC2ABBE656B6116 = _NONAME_ | V | 0x4D815F0B841C611EFCC3F77843E82EAD ; libaacs -0xD2DE767BB72FE93560516581BD1A68EDF0CB1C7B = _NONAME_ | V | 0xA7BAD683789538ED28383A94A27649B1 ; libaacs -0xC3D155150D8E2C4410B28C0E0E9E1518D544C330 = _NONAME_ | V | 0x486BAD415F60C67A120E961D3F9808E6 ; libaacs -0x3B271D292123E7B1993360DB2ECCD3DBFB3D08D2 = _NONAME_ | V | 0x2E4CD740BA6FF77E74428731E660E04C ; libaacs -0x6B3D0CAB8A86D9EFF2F327BD3AFB4D51CC871CE1 = _NONAME_ | V | 0x65EE5A42315335F171CA6C6CEADB86B7 ; libaacs -0x8596212F5787E6002B442B2FDD45A946AA3923FB = _NONAME_ | V | 0xAA81F23ACF049FBE2A632B2EDAD7ECD6 ; libaacs -0x949A3731FC270F3D4995E3D9BAB2544F31A3D5A9 = _NONAME_ | V | 0x0824C5FCDD0389979C5C61C45AEC5125 ; libaacs -0x90FDCFCE6487E529A0FF01B70B5BF35E9C567767 = _NONAME_ | V | 0xC8B6C392AC1DADEEF202EFD428009D30 ; libaacs -0xD728318AE2F765DE64E8FEFDD7696138B883BF48 = _NONAME_ | V | 0x24A34561B9B8842E410EEB3F70A39647 ; libaacs -0x3932CDC7D411BC468363C15E95B76470E2F54CD3 = _NONAME_ | V | 0x1E78DAFB8C5E574821A3AFDF7CC558F4 ; libaacs -0x212551EE24A30BEBE6F0CAA6D87D3C77BE83A534 = _NONAME_ | V | 0x8BAD158D710CFA9409C2FF67FEC17892 ; libaacs -0x2294D4DC7DC172AC15481A979BA718C88976A5B7 = _NONAME_ | V | 0x1F2476D06431E09C15E950954E097970 ; libaacs -0x034A6BC8F92100379EB85F3F885946728E1554E2 = _NONAME_ | V | 0xBE257A22E4F871DB5D7B51D5959D7AC7 ; libaacs -0xA4E190831DDCF5136D8A53C2B85159BD85B1EB4C = _NONAME_ | V | 0x5424CB8DB9E2C583C68D3E6FD080E760 ; libaacs -0xD111FF0F50C44D7F0B85E0B611AF5083691156D9 = _NONAME_ | V | 0x409CF76D50691AB07869DB5A66B1B6E9 ; libaacs -0x798918AA475FF7D30A4B7B1CB17A1E025B4F1183 = _NONAME_ | V | 0xC26B8E5B40583CDC8903125141B9BEFC ; libaacs -0x7243E28CF926ABB4060A3F8F03166E999D271809 = _NONAME_ | V | 0xCE1D9392C7E12E3BB7A11038A0D1AB4D ; libaacs -0x0730C02765EBCE4F8D4E6DFEF82944D0EB25A088 = _NONAME_ | V | 0x833B8C983491D94DB372744ABC3ED8CF ; libaacs -0x77B98C2FE0D14D56BF0A6F3C0F1BD0115557870C = _NONAME_ | V | 0x3F93234761D9A9966D85416C77558D60 ; libaacs -0x7780CFDD6A0959972DA9D7E4497F521FFFF1FFBE = _NONAME_ | V | 0x67F6F7CCC41BE5D85FAF05F49A28F8CA ; libaacs -0x94896E46C900E577F32AC748B548BA6EACA22366 = _NONAME_ | V | 0x6DD79FE2B629714E907AA2E7CB651056 ; libaacs -0x85867A23FE82B82B95A4F90517403C6207988876 = _NONAME_ | V | 0x5A17BD1E4A9B26B6A5317C9099318EE2 ; libaacs -0x966AED800B9D0EE49C84E88264CF00FE736C1E52 = _NONAME_ | V | 0x1B6D8F855F049E553C078900597D849A ; libaacs -0x1C7A433C0AA3C37AFF2690372287FCF8FD0026B1 = _NONAME_ | V | 0x3F754EF7A1BA7FF3986CDF45A1893270 ; libaacs -0x729ADE433695913AD67E750246D6FD6FA7D956E1 = _NONAME_ | V | 0x8AC965901D8D465ECD4BCA982F0DA053 ; libaacs -0x15DEDBE693713ED3321FBB4562DCEC5A4073A853 = _NONAME_ | V | 0x194376CD7A5AF342D8CC1876E6296116 ; libaacs -0x6968B39872FD07B60877EC8B21BA1255EB0937C5 = _NONAME_ | V | 0xE3A2EB1926B1553967A498B7B93BC9A0 ; libaacs -0x4CAB71C5C3EBE7027EB44C8B8159E40B8F93E435 = _NONAME_ | V | 0xE22E77C91E89C551F5DACC5D96438F6F ; libaacs -0x656ADDE8213202A1DB5287CE7EAE1593197820DD = _NONAME_ | V | 0x58D52742BC1962784C73A71944C39B92 ; libaacs -0x33DD7B80B64B4F000D2879683165409421DBE14E = _NONAME_ | V | 0x4E9C8D24606DBD4438CFD2837B157BCA ; libaacs -0x1F5BEB249D22E1D63B7D4516A9220469518688EA = _NONAME_ | V | 0x86CA4D8415663818CC11350F9D76F613 -0x125FB1A61F506E5C172C3ADC36E181F0C5B1455F = _NONAME_ | V | 0x778EBC815C8FFD38760125F100C01E67 ; libaacs -0x67033348159C38291F5BDC617E8C4C6830FEDD1A = _NONAME_ | V | 0x5F416DAB709B2DFC3C26AA7956E0D7E7 ; libaacs -0xACD5768ED359404B44FDE0CCD1F6BCF9E74EBA23 = _NONAME_ | V | 0x1D1C3EC50FDE8E8EC14ED35D48F8F94F ; libaacs -0x5393BD541EA64E1CE183313352091D1F1F867102 = _NONAME_ | V | 0xE5FA8B86100BC7CD4A250076A0321E34 ; libaacs -0x343556148D272BC3B58850971243DE40ADDC83B6 = _NONAME_ | V | 0x0734EE2715AD9F16409A672DE7FC7773 ; libaacs -0x34711CF224CE363950A8CF7B8A8ECA3CCDDB4C93 = _NONAME_ | V | 0x88997C75DCDF6236DEBC1B83A7A03638 ; libaacs -0x965320A242CE5FE3588882CE344383913BD59D0E = _NONAME_ | V | 0xF2C5CF02B5B16981EAA362714D3E8727 ; libaacs -0xCBE498A4833C0D9F737F748EF55F44A1644E330F = _NONAME_ | V | 0x91E344DDA49F2E0FDE541D649352AC28 ; libaacs -0x717681FD5AAEBEF838A04F9539B3516B6A37ADE7 = _NONAME_ | V | 0xBE9E1F98E04475CD08337F8212046EF0 ; libaacs -0x756524B846CE201DA12A4FCA4D9238E3DADDF814 = _NONAME_ | V | 0x8D8FEE0432E4B903F49616DC9BB15B18 ; libaacs -0x0E6B031CFB440E034FA8766AA88F21887D9A2D80 = _NONAME_ | V | 0x8573C0CC6D5C1BE6A35F2D0A89894E81 ; libaacs -0xA0609FA5ECFFA01C5ADA1B445665DB85FB2D0CA3 = _NONAME_ | V | 0x0F1112A704971FEC9FCDC4241B054996 ; libaacs -0x2FBACBFC01FD714AD19B0E9959628A72F8C5F832 = _NONAME_ | V | 0x1FD97216DDD660450C76BE7EC30092B6 ; libaacs -0x3511D58390DE7829DFAAF5C2DE77278570CE2771 = _NONAME_ | V | 0x536069DBF47FA35560623F656F609433 ; libaacs -0x99D51708764B4293EE4D96B49060B281524D60EE = _NONAME_ | V | 0x35BD3E362EFB3D1453AF2ED613E329C3 ; libaacs -0x5F6FED5A7EC8B6C814FAB17D4909425D592E9EE2 = _NONAME_ | V | 0x0980EB2415EB566F88ECF194351EF62C ; libaacs -0x8B30C479FA2C2BF226E2CA32F231CDA67B5A0588 = _NONAME_ | V | 0x7E910C02A0F7B55434DD35B1DA0AD2BA ; libaacs -0x8E746D220911F70410DCB16EB6AF8FFBE842E4CA = _NONAME_ | V | 0x4DDFECF5E918481FC4B7836892D32D8E ; libaacs -0x2A63335D7B0D2F38E41AF7A70F96F16655132DBF = _NONAME_ | V | 0xE28A24627FE1B64EE1AC37FB4BC65C36 ; libaacs -0xEABF62DFB4AEDB9F7A0B22220189D8C4806C78B3 = _NONAME_ | V | 0x0416A3FCCCB5B636993D865FCEAADCEE ; libaacs -0xCD256A339B2DF880894168C8F8F8A1C5F3D34CE4 = _NONAME_ | V | 0x2BB1C41A68CA8C763E572ADB42053346 ; libaacs -0x007AC5DC09BD95DBF0ED5E09D0214FA88D3D7F7A = _NONAME_ | V | 0xCE8C9D4E083CEA095B901F65B3F6F016 ; libaacs -0x8755020C40FF4F55616C207C982BF9F9961FD4D4 = _NONAME_ | V | 0xE71F88849E93C9D5FED140C4C884CFF4 ; libaacs -0x5B49100A63CCF40F1DE5844C39DAD0071CC74C43 = _NONAME_ | V | 0x9476F513F116AD13290986CEC099C978 ; libaacs -0x214084A2B080E269888B306B5EA42DA4065DCCAE = _NONAME_ | V | 0x1F94D408883657D80539D00B152322EA ; libaacs -0x0803575DF52DE1EB519D8C06B39EEE6480ABBC14 = _NONAME_ | V | 0xD5BBB2D925AB8C62EAD235E9B5549EAD ; libaacs -0x1CBD6BAF29E0696BAB2F8BE79AA3E0BCA53016E5 = _NONAME_ | V | 0xED711FE564B4E37FE7922321CD60023C ; libaacs -0xEC36F88BEEF97A98FA73FB5C47ECBC92132C9CBB = _NONAME_ | V | 0x88D9A085DC1B9E9A28CA39C0FEFD57CA ; libaacs -0xB0636D72253ECFE9DBB557D31C8755B98164A449 = _NONAME_ | V | 0x9497C77DA30D2A33C9D807C461646B02 ; libaacs -0x6C15C6168DF92CB7DDDC2B1F02A6B8F8A9B00774 = _NONAME_ | V | 0x46BC41D8816C74A3E46C7053B65E36ED ; libaacs -0xA3E8349BB117F70D670268D31E06D25FA7837D7D = _NONAME_ | V | 0x2E8A25A89C289C12C429165C971D4EF4 ; libaacs -0x312C275ED3411E1927F6512410FEFB6082457FCD = _NONAME_ | V | 0xEDA95613EC51A335A8F41FFAEF31A24D ; libaacs -0x44BBDBCC18C3D8646DB8946181328DEE17068AD1 = _NONAME_ | V | 0x6ABFB821B00B80178993739E367220D9 ; libaacs -0x6170770977AFAA4D0CAC5DA0DBBAA268EA4D25C9 = _NONAME_ | V | 0x5475EE2F33747C6D96C62EAE62C278C1 ; libaacs -0xD7242572193EB8333ED460E0AEC918A960D09980 = _NONAME_ | V | 0x4B1678484D84491E53A858F3E418B414 ; libaacs -0x69518AA56DC2A44F38D3E17B6469E3198908AD2D = _NONAME_ | V | 0x38B197392983C8582CE2AF062A972434 ; libaacs -0xF79381C7B227489055C9EF7B4BA97A85BC85EE1B = _NONAME_ | V | 0xC16754039F9141242D2EC57EB22B8B1D ; libaacs -0x88FF40096EE7F777BC224A6E43DB248EAC68B9BE = _NONAME_ | V | 0x6AA157C3F7801F9B90C6CE907AEEBA68 ; libaacs -0xF749C607A9828573D8AFCD3A9F01A40EB5E16BE2 = _NONAME_ | V | 0xC2716D92FB15D38B1FF6990600DF898B ; libaacs -0xC1AA5C5BAE38BD491BB0BB55620869EC8B0FDE1E = _NONAME_ | V | 0x8737AD7BB24E8C82E6612493993757EE ; libaacs -0x719A28116AAD679FE0A6A970C699814F7C517BB5 = _NONAME_ | V | 0x299160264D06818C8B8FEE9279A758AC ; libaacs -0xF6EF81625B9E407F3CD84ACC735E3AD2DBBAF1E8 = _NONAME_ | V | 0xE35093CEC2550CD1CE40E01C0675A315 ; libaacs -0xBEC4A6E06C1D559BB0E4DEDC0A167CC9808F25FC = _NONAME_ | V | 0xE944AAE719B799143CB6942B8753C125 ; libaacs -0x11305537B75D39403531272C82BFD40C9BA510FC = _NONAME_ | V | 0x3541493C9F742BBC84C52DAB47625D22 ; libaacs -0xC584AF37C37AF6378DBBE0C75A672F80E33391A6 = _NONAME_ | V | 0xA320DF7DED3FD61084544C7F6E940823 ; libaacs -0x42C2815BDE4702FA71ADE16E4BB86B4C4D8582F8 = _NONAME_ | V | 0x414F36C728BF31BFDC7D067DBEB1EA09 ; libaacs -0x8A699A3E8FC7F04B5B611CAE3DF4743ED01A1AC7 = _NONAME_ | V | 0xB6247B7BFA00990281EC1AAE3C2ABE83 ; libaacs -0x0E19FF01A5E13AB1A754DCAF621189AD6AC0E010 = _NONAME_ | V | 0x4692BFF6475E5E775728819FB1D453DB ; libaacs -0x7F4EA7D28E8CDE5EAFA73DB6D63B7BD27A1B02CA = _NONAME_ | V | 0xFE0108572F41AFC6E93FC423EF689C9B ; libaacs -0x2A629A785F7CA62F5D3CB9F1A16BEB4ADEBA2962 = _NONAME_ | V | 0x8B6D1A8C5C51EC6DFA11430F972F7DC6 ; libaacs -0xCFEB1B14FB8F566F5E257BF2413402278105133A = _NONAME_ | V | 0x7624AA3D30901DDBC2C3BD4FD7E604B8 ; libaacs -0xBA4F1A4F36C1DD99A17FF8DFFC3D57B5D071385C = _NONAME_ | V | 0x5BDB96B8068886735FD48C7D47A6FCC7 ; libaacs -0x2B45687FD66C696D393DDE8B596EDB4DB5D36935 = _NONAME_ | V | 0x9EBBF48D14783E329F6AF180AD5D04B6 ; libaacs -0xD0081016F444CD504B84D4631A9B3FE779A02162 = _NONAME_ | V | 0xEB602B52F6FBADAE344C08B7737FE5A7 ; libaacs -0xE3A1B7ACC91FE5F020BCE39F3107977A5AB53984 = _NONAME_ | V | 0x6A5638365DC44867D01903F48B0C2ED1 ; libaacs -0x95A8FAD51EC5935B2EC2A791E68F78318A0E439B = _NONAME_ | V | 0x7E1FDB9E5739A8C84B57AB4DAC6FA60B ; libaacs -0xCD269B9A85FA1505100F871A249887726552C108 = _NONAME_ | V | 0x820B2782A17E6440005EC4EE3C9676D5 ; libaacs -0x0E458506477084A2B5A12DDDEE2EF2242C9D56A1 = _NONAME_ | V | 0x8492380C8DCC67DBF798AC39C45412CE ; libaacs -0x5EE2A3B96B890D4E0FA07D5428A34CB763BFD9EF = _NONAME_ | V | 0x64AFD4B7096C417264CC753BDB52A33B ; libaacs -0x4EC311F63B8A0F88247B12F447FE6DCC9D713ADC = _NONAME_ | V | 0x067177A9C9CBB273961D24AEE42681AA ; libaacs -0x36AC7451F0C3171F54883761AF8919915DB2FB11 = _NONAME_ | V | 0xDE077DA96D6E3B359F1EA07C03FE14AE ; libaacs -0xDE266A6ED0148F0FFA6BEF650CF9DFA58158029D = _NONAME_ | V | 0x3CC6F31FFEB0D647FBA6C60071E2D4D3 ; libaacs -0x33EE7A1C399CD92CBD1814AF34B27A2CA9C29997 = _NONAME_ | V | 0xF19C5D365768E9B8F9C8F42834718A75 ; libaacs -0x443558847ACD8273512D7496AE7AEBD2396B5D9F = _NONAME_ | V | 0xFFE667D2D130A67A39A7268C4B3791BB ; libaacs -0xAE949BA997FB5EBD8B9205EEF142849A72B26AC0 = _NONAME_ | V | 0x82A27DD50228D567E3C79FD85A9973F9 ; libaacs -0x0909EA6012E813A0FE48D5AA83A568752039E1CE = _NONAME_ | V | 0x178E4C82667784711DDCF46DC2B33409 ; libaacs -0x64331CB2676B4FA4A57CF3B33762900E5D20DA44 = _NONAME_ | V | 0xE7E83C59112D04F615CC93CE8D6BBFC5 ; libaacs -0x7FDF12DF2EED74D5CA1C70012D6CDE9FE6BF95D7 = _NONAME_ | V | 0x23BB8FC648643459AE77D39A7740F494 ; libaacs -0x2B1BCC7C1698524476B16F00B9B61D32005A839C = _NONAME_ | V | 0xCB4F289DAF84840295D78293FED51190 ; libaacs -0xA0404E1EC675407AC80396B066C67668D5A7D521 = _NONAME_ | V | 0x7796B239D97CF5C095CB8DA2ADCBC4EF ; libaacs -0x65203DF44498DD663458302E63C3D97BF62ACCC1 = _NONAME_ | V | 0xF12C984EAD841DCB2DFE792ED1EA6376 ; libaacs -0xCBB4D41C30039FC6E821E5AA2B73BB71BF300209 = _NONAME_ | V | 0x7DED1AF875478DABB1104E737370CDFA ; libaacs -0x2D77A1BBF1F0D757FD09E2623DE006AA8F9B430F = _NONAME_ | V | 0x377DD21BFE40D1E7F83D6AD705F67995 ; libaacs -0x1253E3BB51EE0053043F4D4B4C5829974CC2B3EE = _NONAME_ | V | 0x1E0F246EAA9B49E0DAE00749B01A71BF ; libaacs -0x693DAA36FD9BF7E7345C8C351786120B345BC55D = _NONAME_ | V | 0xD20ADF6BF65776914BA81B41AD9EA0DC ; libaacs -0xF5DF8B1F390E8746A0355CE34AEA9D7F77BEA0E8 = _NONAME_ | V | 0xE8DBD8EC85443846DBB860F65A59E22B ; libaacs -0xA2A9F08095E7EE9349BF7FE1CCFBFD346C169D8C = _NONAME_ | V | 0x1720461E93FD4212C95CBBAE9678B6D7 ; libaacs -0xE3365187C30F63BC8DAB4478CE3D1C13AFCA5379 = _NONAME_ | V | 0xF272A7474A5DDAEBB01EF4D4DDF0A278 ; libaacs -0x4AC6EC9D7EADD2D9562F95502663669AAC6F740F = _NONAME_ | V | 0x63B57CD2FD17CD5994AA053DF6B3E019 ; libaacs -0xC975A6441E1F7C070C0C1713D0E6F6289DFEEF8D = _NONAME_ | V | 0x75076F38D95C2D010208D367B52E911C ; libaacs -0x865DD7E308A82E877FD4670D058F0FF0E08046C2 = _NONAME_ | V | 0x32DA325B30E4843735E5148BBA311F75 ; libaacs -0xF147BAA4334B929323A2F751463832976CDA27A6 = _NONAME_ | V | 0xC162331FFAC6AEE557E0059C38792DEA ; libaacs -0xE7B189592124E89299B423CB98CDBF4E5D98FFC2 = _NONAME_ | V | 0x41CE37A8EA571A908981830798879EC7 ; libaacs -0x35652A8F155D82A37284BAB7111CDE9AAC084DEE = _NONAME_ | V | 0xF9E30970288D913C8A7A9D80CB08C4E2 ; libaacs -0x15981741F4364FBAEFC5B4633EAA12E37407CFC3 = _NONAME_ | V | 0x6058EEEA19C7C6D20F5B52C4640D0446 ; libaacs -0x1671EE966E0F507718933B231558CFBA25437C83 = _NONAME_ | V | 0x54518A868DE5EB33A189E88B4DC3CAEC ; libaacs -0x44C3E0D045F45363D27F8254EBA46D1328C93C05 = _NONAME_ | V | 0x48ADBAFFE7A8A5F34DD125ACDCFC846C ; libaacs -0x7FFE56804DE1EC49EA5722B7490784CE21816B91 = _NONAME_ | V | 0x7ADF9983A551D0926A3AA2251C81B6F8 ; libaacs -0x9FB8612064D22D56083B7F46EEB34A8091853521 = _NONAME_ | V | 0x3D17B156414A762ACEC5FEB60EC3D64E ; libaacs -0x115FE7E2C5474F5F058755D5DF42C9009274D4A0 = _NONAME_ | V | 0x92B97BCF0E5B41F319C4B33230392DB4 ; libaacs -0x64B5A06796C79F70B907351703D455214066D6B8 = _NONAME_ | V | 0x641BC8DC300A329BBE501FDA14D19F3D ; libaacs -0x94E8232CE8CAB1EB8F99EF2AE7B0160424996BA1 = _NONAME_ | V | 0xDED2337B2FA4DA8C1A36BAB4AE9A2761 ; libaacs -0xB08D4240AF03482BB0F34C3D1B1EBA25B463F095 = _NONAME_ | V | 0x9C88DD91B84B3E99A417C9EE0810AEDB ; libaacs -0xA004CBAC2259C14A3AAB93FCE8745B4C9ADE7313 = _NONAME_ | V | 0x8F4C39604BC1F3CEAFDD995BBCEEB093 ; libaacs -0x7991662C388426D14F45E5B672DC7DE1B6E416D6 = _NONAME_ | V | 0x913DF9B427111A10925F9EE041DDB733 ; libaacs -0xC95E3D2D39B4EF9A9EE80E72854CE0945919A179 = _NONAME_ | V | 0xF2529D3B06954A8DA97E72943C6777C3 ; libaacs -0x090BC53D1D984208BA178970FEA1F41E419993FC = _NONAME_ | V | 0xD1FAC19806444FCB15A3EB02998349EF ; libaacs -0xCE5D68F1FD7E786A726720C14AF4E53508CEF514 = _NONAME_ | V | 0xC8F33B3CBE7757703D5592FF82353B1E ; libaacs -0xE1FEF776EEADE934D3D640F78C2DED4AD7B23669 = _NONAME_ | V | 0xB878856A8101E27A44E1398AF63F3867 ; libaacs -0x13271E294DCCAB7AA8B170B3187D312D89815E54 = _NONAME_ | V | 0xF4965A9FD285B4D8829B04E33E4AEACF ; libaacs -0x1F276F3B86DB5C3C3DA98BBDB4BDD3AABE3DED3E = _NONAME_ | V | 0xD6215DACA3E2347BBE88318A54F78516 ; libaacs -0xE0DAE37D087CB7317A5EABECEA3B0078E54D88F8 = _NONAME_ | V | 0x3A2675719E657F834F93B09C53EF8DF2 ; libaacs -0x012B7B4955F2F3566E826C0FEEE4DD685AC78F56 = _NONAME_ | V | 0x7936022CC05F6A4BD8F0954A1B9EA3BA ; libaacs -0xE186BAB2E7A8E1940A282FB8E07B5F6900DFDB13 = _NONAME_ | V | 0xBD5605858E785B7EC3895A31F641B0BC ; libaacs -0x59B180372D586EF87BE3DE81E47DCB5DA61266AB = _NONAME_ | V | 0x3F41770D03AC837D81A79F9B63063274 ; libaacs -0xDA4DC3ECAD37B926A81CA32300E6DFBCF2307D5B = _NONAME_ | V | 0x91EA6259C4BB657E66FA431B398ABA95 ; libaacs -0xE7518673084DAC6CB4B2CFEF6CC2C08C13B931A9 = _NONAME_ | V | 0xAF7B3EF3EC671D0681AA71D98FB17EBF -0x035356929FF609348EEBF2002B9CC6F84AAC88E1 = _NONAME_ | V | 0x45EE72FE9FFF435D7F470071E228DB3F ; libaacs -0xBC87E11E1EF7E02BC8CFB1E1629E82EA67602533 = _NONAME_ | V | 0x784556D966D725E252C940100FDC1796 ; libaacs -0x82EE71C20708F258FEE66605B6BDB581C8016CE9 = _NONAME_ | V | 0xCF612D1F0C415D2F289FA1FC431B5BC3 ; libaacs -0xCD898AE38733364F383FAFEA8CA076BDC8ABB333 = _NONAME_ | V | 0x375DF588277C1A93F53187AD262B2D73 ; libaacs -0x5E76A10ED61EF9D2CEF3E65932B1399E01990941 = _NONAME_ | V | 0x6CDF0CCF14BF23A2081BD51F07618BA4 ; libaacs -0x598B780C3BA537A7CDBA49DC23396C72F4CAD9C9 = _NONAME_ | V | 0x78BBD5A6E6BF7A323CB2CCFF429AEE0C ; libaacs -0x7F055E7959E77B7EE5FF5F5EBF46BD49AE62BA80 = _NONAME_ | V | 0x902FA70E90E87BEAC036C2839DE32F81 ; libaacs -0x937D88227D629A3CE2A5059AF7A807E77A2FE3DE = _NONAME_ | V | 0x5D2A09C1386F5ED13AD64FB0D899E450 ; libaacs -0xB565253D7A8C00CB1C4BB17EF8FA5BD6E15A28F1 = _NONAME_ | V | 0x7311CC7DD3C9E17AE46C943507792A75 ; libaacs -0xD3FD1AD6B508EC3ED770AE392DA99F73BC508BD3 = _NONAME_ | V | 0xCE1C5472C7B594B7BCC7E8C3408A2E51 ; libaacs -0x558BB7E47AFE30291005AFDD84761865183D10F6 = _NONAME_ | V | 0xE0402E94025BAC6E0EE7FE6EEED967F5 ; libaacs -0xECBE8A2C4C94CFB9DFE2B7411A168D8353DA0C2E = _NONAME_ | V | 0x9C16CD0513BE0BBB49625B54802595D2 ; libaacs -0x460E8E83B53CD03FB21DD34EC51638AFF83B5BEB = _NONAME_ | V | 0xF039306F3BF2EF5152BCB63B359FE1C5 ; libaacs -0xE18BE6740010C167A98AC8805F5EB750886756F7 = _NONAME_ | V | 0xF73B8505D1CC9034D476FA1E3C6C6753 ; libaacs -0x0ABA8A36FA387FD525C2241800853C8F5100D5FF = _NONAME_ | V | 0xD39CD2CC94FB3C685389833106AF37A6 ; libaacs -0x9E4BC6AF4715DE40B8BDE69851B0F0B5716AB0C8 = _NONAME_ | V | 0x995A4761C85B30B11D02515842D26175 ; libaacs -0x337560D8CF7C48853AB9945B99C763CC317E703A = _NONAME_ | V | 0x6FC86C637D7894F7BA52C7DDB3977449 ; libaacs -0xDDC5CB4F4EA949C514738CA8CF22757FF325C124 = _NONAME_ | V | 0x1F3150103EC0AC25C45BF66CF0BAA244 ; libaacs -0x5E954E8F9A11964D9E17855309AA002A90CA1079 = _NONAME_ | V | 0x7EABCF4C5FC90368B15E7930372A39CD ; libaacs -0x6A87324274D541B71383F14F0722E106D0A63027 = _NONAME_ | V | 0x961621AE1C71A9F8E099C53771BE637C ; libaacs -0x1D578F00AEDD07EDF1B696D044EB441923212341 = _NONAME_ | V | 0xC7CAFAFF40080C2FA7948816FC41D19F ; libaacs -0x3DC03D2DDDEBCBB5CFE60241598F03E922DF3A07 = _NONAME_ | V | 0x21BBC20AA8DCB091D9732EA540F07A3E ; libaacs -0x56C3E77843CE159FCBAA09498C7D0AC2448EA3F6 = _NONAME_ | V | 0x7632C9918CB634EC66DED1E2DBA21486 ; libaacs -0xF117A89F9EC6545C7220110704E792F29BE8D106 = _NONAME_ | V | 0xBFD308D60DBBF2AA81DBD61EB944561B ; libaacs -0x7EF36FF611AEE65909513E788A115BC8E5B5E58C = _NONAME_ | V | 0xCC1B9C0EF75D0796F98955898D714B97 ; libaacs -0xA97BD42A6E4E9E7AFD8CAC8641068C6A56D3A566 = _NONAME_ | V | 0x963E8A0039C720B7BFE1F568F26FF758 ; libaacs -0x9FD393105BEE481D3F121EB43C6724912CCB94D2 = _NONAME_ | V | 0xC5738D32E5BD914ECEF47A3849A175E5 ; libaacs -0x1A2B9C2CF4458ABAE021F47DB5B150DFF5621A13 = _NONAME_ | V | 0xD1B745FA33F5CF19FB1534913CFBC7FC ; libaacs -0xE0CF9488F1E06B447AE64C76B1DF26259E21FF19 = _NONAME_ | V | 0x4763A4644B60252664B5E160FB5F52EB ; libaacs -0xFF619278585D33A5C78A23F19925D8378447DE65 = _NONAME_ | V | 0x10F14EDD059CD559AD4BE3079678CE9F ; libaacs -0x32886B3DF8AAC1AAE5C3382E856712EA1C60A491 = _NONAME_ | V | 0xB4C652AB8D21497E20F76D5AE8E3F772 ; libaacs -0x6BB39AEF5A621781F3C15FB96BB0CAC4BAF34E74 = _NONAME_ | V | 0x0AA4202E49F98CC080ED2C20EB0FE75A ; libaacs -0x839C96F3DA35780692131D4B650343F6AF7D395C = _NONAME_ | V | 0xA04B289468AD1A5FA81BF17F03D4094B ; libaacs -0x729CCA9DA7D05582C218A6860F2B2880E9FCA0B6 = _NONAME_ | V | 0xB7E1E37798347799973174DE811EF6A3 ; libaacs -0xA15ED81E65742700620280D6F59F3D3466CE1750 = _NONAME_ | V | 0xD51361252DDA97EC086D43F0BEB6F572 ; libaacs -0x21EA50AE7BE235AF3C90502AE22B5BA70D45AC74 = _NONAME_ | V | 0x286FB34B6272AF33169765D5C1F6A44C ; libaacs -0xDE6DA1AAC4857D9C175B964FFD71537805BE982D = _NONAME_ | V | 0x1F41C6DF5722112DF666193C6D0E4B31 ; libaacs -0x5E80114C48F102960175989C02320618428621BD = _NONAME_ | V | 0x4A245512EF11D57E352B1A89E09671A5 ; libaacs -0x92977856F0582B943043E37A36F7C873A5280877 = _NONAME_ | V | 0xC9BD8FC27C44CDA346DBD582A1DFE6CF ; libaacs -0xF29C2D09C985E9B79039E05259744FE5AC857BB2 = _NONAME_ | V | 0xED0EE01CED925B3969EF53905EBAF1E0 ; libaacs -0xE3D8D33A9D4EF2A200AFB1D7AF7B5C44A1DA2094 = _NONAME_ | V | 0x8C53CBBFAA95C57036CA4E735CF5E12B ; libaacs -0x7F74E72FCF17712B190397AA6372A8FA9D3D9DD1 = _NONAME_ | V | 0x35498CA58E34FE93CAAA5A3019BE05EF ; libaacs -0xF2704DDDE3C2E4C57B646D879A52EBA4D90053BF = _NONAME_ | V | 0xC6F2B73B3BED42632C60F4108DF9BAEE ; libaacs -0x2B3D7575247F35D6CA84FC10CADCF1CDD2BFCD23 = _NONAME_ | V | 0xF34C915947FB76A916C3CF700CE146F3 ; libaacs -0xA2E89C147E98CCDB8F3DE312EBB223E02B5CB93A = _NONAME_ | V | 0x59E37BF0399CC41D101C886BA971F2A2 ; libaacs -0x9FC908DBB83635964523C96AFD2B13765CAF1088 = _NONAME_ | V | 0x78CD7774C8E4C6BE27C0F04CC7445E15 ; libaacs -0x83FE52F635BE0B012A2A02416D4EAAFEABF0626A = _NONAME_ | V | 0x2B4763DF068AD3A1ED6E3F3B17B25771 ; libaacs -0x348B0DF9653E1CDC39C33E6506BEB98BBC0EE9C0 = _NONAME_ | V | 0x95D0956264043955ADC210022850EB19 ; libaacs -0xFE7458134C3008924487AE53BCAB2A8ADB95B861 = _NONAME_ | V | 0x9D58C6937A5EEFA45431F68423B0ABCC ; libaacs -0x7FB801340CC096AEF3108CA13DEB3152BEF2C088 = _NONAME_ | V | 0x7BA572B4F9EDFBA86E5714127403247C ; libaacs -0xC52DB551FAB8B0E969EAE83AABB3B6337868FE28 = _NONAME_ | V | 0x1FA8AB231DABEB4E7260953EF509FFBD ; libaacs -0xE68C0833AA5122763DE1DEC2E483D4A83B8DEF16 = _NONAME_ | V | 0x227FA4AEDB586BCF2468097496F55B22 ; libaacs -0x55D5CBD8186A21395AE15C533E2D6151CF464428 = _NONAME_ | V | 0x82FE6A5E17F8EA9BD6E8EE7DBBBE305C ; libaacs -0x4ACFC5988F187B9C80827767C6CEA6D505C148DD = _NONAME_ | V | 0x6DD0C154AE6558FEB95DB515DC0FAAE0 ; libaacs -0xF0BDB7917511D16652CFD820918F84FAE04F198A = _NONAME_ | V | 0xA12DF6CAD0389535B2D6F390B37D3B34 ; libaacs -0xB4CE791E9A73CAAB0CAA1BCD14D5DB8E923C9DAC = _NONAME_ | V | 0x04B5E40240DFCBB28D7EA6F7B1B2532E ; libaacs -0x0975B4EE68ED2627D872A3FE100B19E9AE98A908 = _NONAME_ | V | 0x833107645DED3905FFBAE83740E06E13 ; libaacs -0x00119428193C7DFDD5CF0DF6D9C87ADDE1C1296E = _NONAME_ | V | 0xC644F651B82E1695262FC8D354698C4B ; libaacs -0xED14D9FB1AB419E569D259403FBF332F282DCBFF = _NONAME_ | V | 0x687053E7FAA6FFFB5E550E243CED904B ; libaacs -0x045B6AABB9817B5292DF9B659A7C161DA16D9FD0 = _NONAME_ | V | 0x16DF047B09E73B7E73D4FE89B9F2A9AE ; libaacs -0xD51579EC8EA0335E6390B7CD18E5882242E2222A = _NONAME_ | V | 0xB0B707546BEF7C27F3F755FC63F98BF5 ; libaacs -0xF601B1CBC76A4CF5FB8C167932B96F5EB721AF3E = _NONAME_ | V | 0x4950519C249A058F6C43A24F1347519E ; libaacs -0x5DF43349D65B0E8D333B1ECC1510097DF44BD000 = _NONAME_ | V | 0xDAB9151B7D61DE4440FEF959FFB441D8 ; libaacs -0x2C0D78305ECD4EED025BD2EFC41CCDE3BC132FCC = _NONAME_ | V | 0x1C7D04CCF78021302DD0481A9BC6E7F7 ; libaacs -0x6A02845A26BE731261F7DB28182C9EBCA654BC1C = _NONAME_ | V | 0xB6471A07DECE2ACFE596C1C9C7873865 ; libaacs -0x9BAAEFDA531C871541321F2D5885118C48AB4DEB = _NONAME_ | V | 0xC66093ED2D829179D189D2F17BADF2A7 ; libaacs -0x782D661DFDBA52C108F50A911578AD750C7E90CC = _NONAME_ | V | 0x85C4628B73C6F56E6A3A3FF71DBBFF6D ; libaacs -0xCCC6DB8F7FDA3ED906B74CF53AD8A876BC3AA172 = _NONAME_ | V | 0x166A3A03F40D3B547C4D56735873E982 ; libaacs -0x1D7D89AED1E2CFB85FC36F21DA1A73F8DB162B08 = _NONAME_ | V | 0x6A3C0F4E12B6B52248CE37869A5B5C7C ; libaacs -0x2DDCF78854C8109E0952F9285959A53CD5406FF9 = _NONAME_ | V | 0xAF1747AB061BABC3AF07F40F6411C611 ; libaacs -0xF08CF2FE80AC148C295CDD037C2FC1DA8A06BCFC = _NONAME_ | V | 0xBF9C3E32BD065312155524F9A5C8CCD4 ; libaacs -0xB6DAEB339557926094A0A9CE63FB718C117A11F3 = _NONAME_ | V | 0xEBC6FFC3FC038A3EA05B22A64B8D0509 ; libaacs -0xC9EA4F0EAB17C2D1FCBFA4FF3BCA4C44A55FB931 = _NONAME_ | V | 0x57FDB92F6C67E37570410296132B862C ; libaacs -0x74D429B83347E0E9CCAAF009EEB57D3FA0A89E6B = _NONAME_ | V | 0x05760433A2922348D9AF5A1DF0343054 ; libaacs -0x5B81060B4D39541ECEE1AF19A3D2571660C285FF = _NONAME_ | V | 0x659D46474B61E16FC998441C7300239D ; libaacs -0x7FD222B95DA85F89BCCCBF1A18FA1776ADA5CB84 = _NONAME_ | V | 0x0C0BCF814852D3A0D854A5981FA0FC8C ; libaacs -0x4D4AC8358BE0250F9545CA0972964BC9B3198C97 = _NONAME_ | V | 0x4CBCEEF2477D58129CC6FB5E04B73D18 ; libaacs -0xDAD0F026D079269B68675288442D067DC7A4BD4A = _NONAME_ | V | 0x330E6C90518DAA798BEC1C05B9C73335 ; libaacs -0x3F0A7BD2460159374E1D726993F70EF62650ABC8 = _NONAME_ | V | 0xF584EA1DF751DDD908DC3B83EFA3A8BE ; libaacs -0x0FDCF70987CBDBB684E6943AC2100EEDCE877A80 = _NONAME_ | V | 0x19FBB65AED3140131AFE7C21C51F9CD5 ; libaacs -0xC9BB3A68A8077DE6B24A61CA73260DC0519CAB74 = _NONAME_ | V | 0x58AB634CA30443A69AA1DC2DC779CFBA ; libaacs -0xD891E8C99579081D75951A48A32809E84076D23F = _NONAME_ | V | 0xB899239D86645F797FEEE76715D88489 ; libaacs -0xBEBA9BAD257F2ECCCBA1D6A89395E51FE386DEF9 = _NONAME_ | V | 0x6AC6ABB04C6A26267138826F92E65824 ; libaacs -0x5A5D2AEBCF2677D60EBA314C1437C2ABD3EB7AA2 = _NONAME_ | V | 0xCFFCC2F444B1AD266849420E4E5877E5 ; libaacs -0x185E50140F8CCA2DC90CBDA4249927A18B737C7D = _NONAME_ | V | 0xCD31D9DC1F5918FC2277182C7B109392 ; libaacs -0xF44484197F9B25468CA847117EBFA810189504FA = _NONAME_ | V | 0x112CA93D61064D5DEC0401415B6D9F66 ; libaacs -0x09095A9229439EF9DE6EED6A0F2379167D6F65BB = _NONAME_ | V | 0xC3EB79E9D1DD7F2E3233B185D150AD05 ; libaacs -0xBA0C847A3E268D9FD1B027A099524309985CD6AB = _NONAME_ | V | 0xFDD2EC212D0CC1F55C96202D4E7AE2AA ; libaacs -0xBC4E2A4F9E442041990D8D53E524FA1C51018DF5 = _NONAME_ | V | 0x12B6F499A855E061B48759AD920D006A ; libaacs -0xD7E4AC2716D37D6B673A497D63C2925EA2C3F8AA = _NONAME_ | V | 0x05C6D37EAB031F2892E4365DCBA7166E ; libaacs -0xED68C93E0E2C652746C1B96ABE3388BADA7950AC = _NONAME_ | V | 0x727C716F4570D539F57F43DD6432BD94 ; libaacs -0x8286AFB1E8E457B253DC07314346475BB2473338 = _NONAME_ | V | 0xA43784650381B450E9840798424D195A ; libaacs -0xEE3EA54D495122E8573DD357F15B8D912CFAE926 = _NONAME_ | V | 0x2C637716C7221B2DB081C32891E1E795 ; libaacs -0x6452038A4D02E457A94A301F656E82567616214D = _NONAME_ | V | 0x0AE29530BE2B5BC6FD3F5F93E88616B8 ; libaacs -0x74CA4AABAEA278913E71F575EADCB0B44D9A7660 = _NONAME_ | V | 0x32F552E25142AD74F021ACEE58CBED7E ; libaacs -0xFCD6ED45BB90B9DD4D3BCE4C6711B2229369C149 = _NONAME_ | V | 0xAF2E947A956F9B2F1644B741DB4CFD78 ; libaacs -0xEA3CBCC7E2C6F9C1232DEA1E6CF595DE204584EF = _NONAME_ | V | 0xC74483E120A61D992283AAF7DC9ED46A ; libaacs -0xC70157742208D83AA6B5C149980D80E60CAEFAA5 = _NONAME_ | V | 0x0CEB4833C91158A6D94DA36A2F55042A ; libaacs -0x5898E99FE0D87560F8EFA2F6716253F7605E0BA5 = _NONAME_ | V | 0xD7422A196619D1D0125F9B7534C4EC15 ; libaacs -0x6BD8F05260FB16C7C1D928D95627CF13039970E6 = _NONAME_ | V | 0xC0B4C3A72680792B4EC4DD624C229BBE ; libaacs -0x523A6C16856DFA13BBC6C0899A2F0B988B29AF73 = _NONAME_ | V | 0x4ADFBD0115137728FE4A14FCE0283B32 ; libaacs -0xC66D89438059607C1EED197CC4EBFE182B738715 = _NONAME_ | V | 0x726995EEAF8A7500D0666008CADDD408 ; libaacs -0x902E849FBB28C981B6144CAE3954ECEB1DE8C1DC = _NONAME_ | V | 0x28C6C0BBB93D22E0D0C5328878765DFB ; libaacs -0x638656C4CF94449EE0E326BA3233CE69E28F96C5 = _NONAME_ | V | 0xE4775476A428A0325021DEFA82D86F70 ; libaacs -0x126FE4196A9B84974D6252288D33CA2BC8C66829 = _NONAME_ | V | 0x94DEE05E8455C65AE10BDB6C47E2C199 ; libaacs -0x00282E181F9121713D6688FE53A7B988E0637AA8 = _NONAME_ | V | 0x825549A296F5F381A9FE60E95207BC65 ; libaacs -0xA6EB36B6CC3130009AF77A0307D97271B947EF0A = _NONAME_ | V | 0xDE69C80A02C6E8A845F192E5CE8244D0 ; libaacs -0x96387A25C94E3C846DEB8733D515C50BB31EF79D = _NONAME_ | V | 0x46CF4B7CFFBA01FF75F0C9AC285C09BA ; libaacs -0xC20BF438181A2D9F075D9E1EEE8889D5B96A5921 = _NONAME_ | V | 0x1600AB2C05BEF4F41413BAAFC1618410 ; libaacs -0xDBC2E2F931BC6C3EA231A221221469B60D5D622E = _NONAME_ | V | 0xF2279A8A489D9BF75C659FC7316F1471 ; libaacs -0x5428D3C6E4D43DD679D4C8FF8AADD996A0D7DB7B = _NONAME_ | V | 0xD1E6F56F22E19384E8DA130904BEABE8 ; libaacs -0x05ABA8A20300BD9A290C36039D93D1CA46EC4B99 = _NONAME_ | V | 0xB0F7C331CB774EFFEC27F7E50FF0D493 ; libaacs -0xF28189B1E62F64BEFDC5BCE7CCBB72223B3F8162 = _NONAME_ | V | 0x24B4DD991E70D8CC2AA7FBA5CDAB3982 ; libaacs -0xDD3D11CA5B326B8A71BFCBF21078CFEB3A8903B9 = _NONAME_ | V | 0x347A6FF84F68A2DC0F2965544E0E3B86 ; libaacs -0x07A25DCB39B3388706D6FDE07B3990FD0DC77DBB = _NONAME_ | V | 0x5E7185BBAB53F0855EF8F5A31B555275 ; libaacs -0xB7DE6EDBFB44D1B47DC5649FCDDA1ACDE4FAC2B2 = _NONAME_ | V | 0x6B8D69AB7512E658CDEF0FF883B247AC ; libaacs -0xBEC84FC8637D38BCF45A551166BC3503FAC43007 = _NONAME_ | V | 0x3EC53E51193673B63A07D36A3B382D8F ; libaacs -0x15C2C751F44FDD58A94E4B125CA39FA679CD253F = _NONAME_ | V | 0xF8D1D21840A3BC89F753BB7DB196E8CE ; libaacs -0x7E3CF170D03112E3094801A61D6AA96479EF1F6C = _NONAME_ | V | 0x95BAE838F715E5464B8509232CAAF7BB ; libaacs -0xF73C84BD1E3D9DFEC649CF3ADCA8C89785292CFE = _NONAME_ | V | 0xFA103287D5473049F9D72308B02207FD ; libaacs -0x09054DBCADDD000AEC34381E62F2237FE75684B6 = _NONAME_ | V | 0xADFB4D08A0BC0A1C17061C3C546F0EBF ; libaacs -0xA87325D8B804208C6CF1EB06572ED089F335FA0D = _NONAME_ | V | 0x52D626C98CFB9F0CEB5A6020E95F3D43 ; libaacs -0x936396EB1290B049D63D8C1E7FEFE3EFEB193ECF = _NONAME_ | V | 0xD65632BFE644B70CFD0D981770B682C9 ; libaacs -0xAC7B9A58C98D47601E699C2D7C72DFCF7E118EE7 = _NONAME_ | V | 0x093574FB26232C033EF44A71E6765433 ; libaacs -0x74973965A0E0058A8BC852416701A944EE43B81A = _NONAME_ | V | 0xE8F1C7CA8D2BD329DC9C95D17A8D2EDB ; libaacs -0xA59F95FA6B3A44A26AA273A94AF271FDC25FCF59 = _NONAME_ | V | 0x955C3EBC64B5BE6AD835906E6892763E ; libaacs -0xB3C301101D427738C4A9BD6C1ABA1F7B46224ACC = _NONAME_ | V | 0xD7E0079B630491EEEB2B0D3842FF153E ; libaacs -0x7903B0F40594887525942647570AE4724CD77913 = _NONAME_ | V | 0xD7652FE7BFE6763F6EBDDEADEB0D5ADF ; libaacs -0xB6ADB5A002DFB5522BD551A4AA09959FAB9E1B04 = _NONAME_ | V | 0x70160EB961FD15EEB5CD5066D68B9DA3 ; libaacs -0x501AD6A7E4D325B883393E0B619B880E4A94DE54 = _NONAME_ | V | 0x61D3A7E9E797A9EA87DC22DBF378D2AF ; libaacs -0xB272B73CAD684F81F38CDDDE2D3F2DFEB0F1CCF5 = _NONAME_ | V | 0x7E232FDDE7865A77D67ABDD8F99E111D ; libaacs -0x906AC8E7C2ABAF5A8093B11D9566B475E3E5806E = _NONAME_ | V | 0x74500F625FF07408F3E527C2A08BA23B ; libaacs -0xEB47D907D4C8579E3DCFB9B4331968222E25E18D = _NONAME_ | V | 0xA018F0E6A4835F56EB785E457A6046AE ; libaacs -0x95CAE0D16516A30F9E6194795EFC99D6AD0AFAF7 = _NONAME_ | V | 0xDA0697896B2D31808FC085CCE74700ED ; libaacs -0xF95A85BF08471856574215B387045624ED110C03 = _NONAME_ | V | 0x07DB5EC66DAC00C723E420E09017BCD6 ; libaacs -0x91385126297E772071686A782D9BD7D6E22E5443 = _NONAME_ | V | 0xC7CE7888EB0729B789086AFC82DC03F5 ; libaacs -0x3BDCC82AD00B9908C298567B6C94EA268DCD0769 = _NONAME_ | V | 0x64F580C8799D28E5B8FFE53595F54791 ; libaacs -0xECBF74E2B4E5662787A10BFA33F22D3D331D4B55 = _NONAME_ | V | 0x55D61628FE0015E35D871152D7831181 ; libaacs -0xD6D49B280509FA99EAC77F0E03AC1A7F7067710C = _NONAME_ | V | 0x6FF60C4C76BA8E1CC108690A23D44747 ; libaacs -0xFDEE3535FA3BC3F11644588C8AA538F10D3BF32A = _NONAME_ | V | 0xBC7F9AC80B70313EDAF895226A36418F ; libaacs -0xF27D44FA5A867AD999CC6E7203704A31F1A6B6B0 = _NONAME_ | V | 0x08C2642E7C42113E6C497ACB06B0A0AF ; libaacs -0x6D1B9764D5D13B21C2637CE294D2B760F13833BB = _NONAME_ | V | 0x5F031D62DBA07A83C694FF48809DA181 ; libaacs -0xFCD932A57F5CCC309CD481A0A99A7A3205D18899 = _NONAME_ | V | 0x457575F21CF4CB05BDA5B0214213AC76 ; libaacs -0xD2DD4AC9741E2953801BA4A15F321F06AF7D0449 = _NONAME_ | V | 0x7903614691EC10F790B9F9DCBA6E7E0D ; libaacs -0xE0BE022B78A9CBE86B4733FF9ECD1D8F773ED541 = _NONAME_ | V | 0x68C03AF5A761BCFEB1BD65897F17F6BD ; libaacs -0x5131A56D9ABEC2368BDE4069C008420044757AEF = _NONAME_ | V | 0xA57F10AE2A1AF336B51124BA114566AE ; libaacs -0x1F879751247C748C1DD2D93EEBDA301B769EEA9C = _NONAME_ | V | 0x164CCD1F03C69CF48F99865CDC047297 ; libaacs -0x203B6AB536F7AB01BF2E2159A60BF6464E2C8D09 = _NONAME_ | V | 0x4A29444C930C237CE8D50B692286ED55 ; libaacs -0x88F2407754B6E0F4B2C0CD4F0D0F3FCC7C8A9177 = _NONAME_ | V | 0x10B3C08675A335208C374DC11AFBFDF1 ; libaacs -0x30DF3AC050F90A33D457105EB2F39C4E31BA372F = _NONAME_ | V | 0x051D0D747068159A1DFF4991FF354511 ; libaacs -0x80D811341F34F00FB11BD48EA25572C31499C115 = _NONAME_ | V | 0xB85BE6128A0F36DB5B54319BA9250087 ; libaacs -0x73E2E1D0F78297CD1F825498F52F929C6941917D = _NONAME_ | V | 0x5404DABD617099BB23D0B0693814E5FE ; libaacs -0xFD3E2D426E81289DF2EA17873E69056EA22989E4 = _NONAME_ | V | 0x002553C041C27D5AC497E924BE64DF68 ; libaacs -0xD524A249976E7E7B167156487ABA551C234B861C = _NONAME_ | V | 0x9ED3B74408D6F0911EA55D848A12045A ; libaacs -0xA320867C73C442DC679101328DE346E3EB71B6C5 = _NONAME_ | V | 0x634B62980F20E26E89F77F56E57CC3E7 ; libaacs -0x4E025D83CD643A140496C0867A176A48A993FD1D = _NONAME_ | V | 0xF32EF2371C149BBCA4CF6030BBE55A5E ; libaacs -0xCFD4554892AD56579DF819C066E7F5B29E63C565 = _NONAME_ | V | 0x7104CD4C0C7E6AB841120A03F6772FAD ; libaacs -0xBCC0E4E1323595B0DCB547F6216A618C7B621C21 = _NONAME_ | V | 0x2ADD9B1D668FC4B68428F90B35BD229B ; libaacs -0xD41E79568332DE366E0BBC0535E3FD12E7D94C86 = _NONAME_ | V | 0xDB57B719A5CE3C7A591603288C79E884 ; libaacs -0x8B81B7687B34C2AC8411096BE87AF88D5F7F2718 = _NONAME_ | V | 0x486E5289471DC9A2DFF8101F22565C34 ; libaacs -0x5A301348126CFC0945B7873A38BC141678B95C5D = _NONAME_ | V | 0x8C540ADFC7EFA53653F3E4A92E22DB2E ; libaacs -0x95F18D4A5BC2F73FD5CE796186AD6AE166C32A61 = _NONAME_ | V | 0xE2ECA39E2F23E74060FEFBB0A3AAC6A4 ; libaacs -0xD410E464A99DDB99EE305E1790143B464BF258DF = _NONAME_ | V | 0x078F2EA2F419252D80EAAF17D72A1BF2 ; libaacs -0x592EE5799243380645972B6442046DB7A7A0EDA2 = _NONAME_ | V | 0x5AF3C47D677F1D893260AF61CC1186CC ; libaacs -0x71521F1BCD11E13E13D0A2F118AB4C1098CA3D85 = _NONAME_ | V | 0x14995B55FCFF366A9A97F2A923648798 ; libaacs -0x79FF2379D9FE8E6EA8DFE6B010F5381541E5E756 = _NONAME_ | V | 0xC799FDA82E47F55217D0AA89D5B748B5 ; libaacs -0xB430786ABE0BC1DB3F143D95D21AEAF211952B93 = _NONAME_ | V | 0x8887E6911D22035B486E7CBE8252BEB8 ; libaacs -0x5E517A915F3BAD301CED5014B71D498A80B0AD82 = _NONAME_ | V | 0x7F73144FE857E337C3ECF4087A8133D7 ; libaacs -0x9EEA1DAA89A019C3E19BF5D47253C771E5C8C652 = _NONAME_ | V | 0x4A4511EB7C7F1E7BAD413EA200C4B50C ; libaacs -0x09589C093B76C3D08CCBE0FF6BD9CBBF43E9F50A = _NONAME_ | V | 0x0D872CC85F8E10E53A80E7D5BE7EBD81 ; libaacs -0x5D15F9F4D06D7DDE522178824FCCEB19527AE3C0 = _NONAME_ | V | 0xA9ABB3D0938382C5E5121AA7289DB2A0 ; libaacs -0x0B0BACD5E5FD215D1092F1911BD447B3FDF06F58 = _NONAME_ | V | 0xEAFAAFA4AB11F7DB1E8B6A0EAAAA9CF1 ; libaacs -0x5EE9E5C5D9EA3A5A7160CEECD465E993D4F522E2 = _NONAME_ | V | 0xA69777BF6180E2B597BA3BAE7C766E7E ; libaacs -0xB4D8066C59AE11B564368EEC3355C88E341E2009 = _NONAME_ | V | 0x9AD4C1D8514290EE7CE1542DBD1E596F ; libaacs -0xDE89F891291D8A665DFD231C0DAC76C863153440 = _NONAME_ | V | 0xE158F8693F520EDB3416C8CD943F45FD ; libaacs -0x1B2D34930BBD6D0DF2554D731AF04E248BC6C44F = _NONAME_ | V | 0x372164C47FE83CA690787BB7F3D0F93F ; libaacs -0x5C503C1174E784DB15D5BF64973865E0677C4EC2 = _NONAME_ | V | 0x4B60A9F8113BB22B3F587E315329CBFD ; libaacs -0xDAB2ED03863EBA4B53DFE5B0E37B49BFD84E34A2 = _NONAME_ | V | 0x058B98A429FE24B516EAF0C8CAB1392C ; libaacs -0x89BF30B5CAF1A12D65E1622627C0F3BC2B770EBF = _NONAME_ | V | 0x5F33B970BCFDF3A4860D6BC337D1D4F9 ; libaacs -0xD17CFCAF72B3B9EB70AAD0E9D3F77589FEBA5B21 = _NONAME_ | V | 0x36BCDE5717DA98FFA00ACE681132B5A1 ; libaacs -0x827351857CC6A2C9F55155AE616880DE2458519C = _NONAME_ | V | 0x87E7DB9FF51C02E6215CC10018D2C733 ; libaacs -0x4F83B22BF010C7BC70F3AF0BAACDE1E6F505357F = _NONAME_ | V | 0xFE9F24F4AE22FE86BABA1605A85529C1 ; libaacs -0x2469CC048332C744A67D8E8BA0B906CFACE126D2 = _NONAME_ | V | 0x7D721D62723987731BB27B36AB385460 ; libaacs -0x458FB15A9C49C10B23132B4B26431F27DA9D865C = _NONAME_ | V | 0xBA13677E3C23E67CB58A62A7C1DE0B92 ; libaacs -0x0434DA90CFCA344959B7FDFC417C99898D948452 = _NONAME_ | V | 0x13AE30126EA118EEB14E10785A0108E4 ; libaacs -0x8A25030F15337A15BEBDB69FFA1B888A43922CB0 = _NONAME_ | V | 0x5948AC01D213ED73E7D2D34AB522F021 ; libaacs -0x036B171794A895B6D5B1F7C666255E5383CE906D = _NONAME_ | V | 0x97C7ED8EBA68261731F8930035667EBD ; libaacs -0x0D87D4A5D648A4D518BCF258F41B625E5F3256AC = _NONAME_ | V | 0xFA11CCB549972D8566A997E7E3B0ECE9 ; libaacs -0x8B643D925E0ED7903251804C517509B8BEB2C9BD = _NONAME_ | V | 0xBA2329EFB668A54443F1E147DE06A9F2 ; libaacs -0xE5539B3E3EE510188761EFBCEDB4070C731DA54A = _NONAME_ | V | 0xB44A976BFCE7D8DA4401104C68FE6352 ; libaacs -0xA9DE4AAC0E307A319FB9E082ABB24F5BA90D2C40 = _NONAME_ | V | 0x869568BD7C7F619CFAB30D02E43A98AD ; libaacs -0x3796D0AAEF15189FAE99758AA8A8FE29CDA9E310 = _NONAME_ | V | 0xEA00F18A1CB7A9CA655042FB7416933C ; libaacs -0xF048ED2B694418B90A71AD479CB3882BBBF71F4F = _NONAME_ | V | 0xDCD088E4D7567C337DE556A1C403372E ; libaacs -0x17B6FAA02CE0E3B0A2D48EC9E1CA5CB1D2DC8A43 = _NONAME_ | V | 0x167D45D316C1154AB05EB059B6B45BD2 ; libaacs -0x8FA04B8153B83A080ABE5FAA4B56FF5F5C4374CF = _NONAME_ | V | 0xB7A3A79C746E025D245035F7E7DA7462 ; libaacs -0xDB1F38BB20F10CFB0A55878A3FD9FCCA9CFF9051 = _NONAME_ | V | 0x957ED62CBDC27D2A4BABEC485BA09EA4 ; libaacs -0xF37F71BE2D8D03056DC84CC86B1EB4945B09CB40 = _NONAME_ | V | 0xF71C856C4B0243CC69082112A1862883 ; libaacs -0xB34E43319F72C241C21BD0EC707CDEF07A6828AC = _NONAME_ | V | 0x4FEB46499DCF8B972A29629D61A0ABEA ; libaacs -0xE04F0EB001DBEC97832EE2CF9F58700E3453EF9D = _NONAME_ | V | 0x97904DC6497F23ACDE3C5B908B14CC94 ; libaacs -0x0170C0D5FBD499420A844E1ABBA363135343933B = _NONAME_ | V | 0x2FEEBEFFA910E5873C4BAAF2151BFA26 ; libaacs -0xA4BF401F9A5F77F4033E24F6AE1C975579EFC426 = _NONAME_ | V | 0xE0275465D866AD88FDC190D89ACE6D00 ; libaacs -0x31AB865D191178E5F279338F5533CAE5F79D5D83 = _NONAME_ | V | 0xF14D75B6C312EDCCE67BF44368F79BF6 ; libaacs -0x4E69A3BBC2AF1EB3C10FC501B3681DF402300364 = _NONAME_ | V | 0xB81AD4D38561D5F4B29B26D99B80AB16 ; libaacs -0xD7EF9BAB018525E065FDBD11C939D782722F48C0 = _NONAME_ | V | 0x7FD1C86CA1DE6E69F6C2041CB2E0914A ; libaacs -0x182FD63E960DE18B34FF9EB3DF44CB248609A11B = _NONAME_ | V | 0x98AA706D3CFB39754A9B4B79AAA2F7DB ; libaacs -0x189E458E819E74C591C321C6FCF180647ED64319 = _NONAME_ | V | 0x089E8807A8B8FDA33A76E00B4BB4F49B ; libaacs -0x1D41AAFBB2A55066A073415D8FED75ED9CBF9A5D = _NONAME_ | V | 0xA7A8BB7C7AB39DECEB50DE5AAECBDD90 ; libaacs -0x1DC380F97AFA1C8F6A7185C6AC37A2AFED8B2C0A = _NONAME_ | V | 0x1F16BFE7FE7E7C044C950C0048211726 ; libaacs -0x28B48B3308A5FF57346C7ECC6C498D3A9E52B56E = _NONAME_ | V | 0x41BB7F998FF388ED0BB9E400C86A6123 ; libaacs -0x29BDEA6C9BD323DE18FDE85C21A13E619E0B50E1 = _NONAME_ | V | 0x1500ECA5F4B3E2F28CDB005EC8E98A70 ; libaacs -0x31267EEBB9216F2E2B0E990712C0A46D5CC53247 = _NONAME_ | V | 0x4B0FB3F6181108596095C69F790175C6 ; libaacs -0x4F6952E7942CAFAC945D2D536087854169C73C99 = _NONAME_ | V | 0xA7AC603B2DD1D16FEFE72CBD3C70C37C ; libaacs -0x5653C1B8C609DD53A0B4051CCCAEF6A56502F38C = _NONAME_ | V | 0x09F0B2FA58F91D56F22D1F104785430E ; libaacs -0x58FFA0729B53F3453BBCFC5BA518D5032E6248A4 = _NONAME_ | V | 0x1E995F17AD3D226A82FA0CB187180D3B ; libaacs -0x5C9A96C9BDCE70E30B78FA89B642B4DED58CCB06 = _NONAME_ | V | 0xAECE0762ED01B80E3C2231362E97D191 ; libaacs -0x11FE8D048F11C29E34837A2AE6B7D57785309E54 = _NONAME_ | V | 0x90DC12BEC1AD41EEF1E50B75B103A1E6 ; libaacs -0x0D6B5A1DA4BE79A815B18C071B28269A1653DE61 = _NONAME_ | V | 0xECBC50ABE78377260476312DE317E8A2 ; libaacs -0x9728BB5DF0D5365944A2B4447128720FE1C1A4BD = _NONAME_ | V | 0x00869E0FDBA7AB002A5CD837740F9A27 ; libaacs -0xD7F36F600C34C79B13493ABC5DD0A289F3FFF798 = _NONAME_ | V | 0xB00E84A4F0118C2F92B7383ACCB429B0 ; libaacs -0x6B8FA756D1EA894799D3F6DC56A01D2B4E154F0F = _NONAME_ | V | 0xF03ECB14E23FF37B2DAEE1E52C25780C ; libaacs -0x14EE5EE77DF5CBC483F8F28F28A7A3C09F56B113 = _NONAME_ | V | 0x1BE2E17BB70C4D387D690305C4107FA2 ; libaacs -0xAAAE3A3E7A21D4C665CA5721486B0F0CDF1610C0 = _NONAME_ | V | 0xE7A10111589AABD108985DFFC34664C1 ; libaacs -0x4E33712690BA3C88FEFD2489037F0515990CF2B8 = _NONAME_ | V | 0xEBE5D965FB032ED18820C49AB289B726 ; libaacs -0xD7C81E03F4C902428101079B1B893136155FCE76 = _NONAME_ | V | 0x8A853588D6EDD40A06DBDC822AA71C3B ; libaacs -0xDC4DCFEA05D9D864C267655BF280096227B82CA2 = _NONAME_ | V | 0xD19A61BEE0CD25B0E876EDF1F35D3ED0 ; libaacs -0x2FE992ED179109832DFA182F04898B596148AE80 = _NONAME_ | V | 0x63DA0660D7E8BCBA7F0C944655EBC486 ; libaacs -0xE99344EF82011E63B1ECA0C3A7B2CC1B97795CED = _NONAME_ | V | 0xA304EC9AFA91B3AFD4E0AE7384695DBE ; libaacs -0x0D5667ACDFCED1E0BB321EB2F89D763BBF2AE41A = _NONAME_ | V | 0xBB4C18CF28A136A8EDB142D54D00F33A ; libaacs -0x5F27B77D1E34955D3075096E8601E0854BAC825C = _NONAME_ | V | 0x8A3612F9AA2520FE9794198820D56902 ; libaacs -0x635422B91583A9159248636FD5935ABCE45373BE = _NONAME_ | V | 0x41587F31C1121341DCB1348317D420ED ; libaacs -0xC57F71E8B19586324389507FDD6C40F6776A8301 = _NONAME_ | V | 0xC071ED7009886AC9EB9456753B06FF47 ; libaacs -0xC63DB62FA726E969B7396B49EE12CB808370594A = _NONAME_ | V | 0x1EA5AC678B5D46210695E5B926FD93CC ; libaacs -0xD44B1CE94213B1D6CD099861080313B7BE908949 = _NONAME_ | V | 0xFF6075A84C86B1440F34E7E6BAD15B39 ; libaacs -0xDA36AD26F9D673746DC907C1C1DD03A1E5A7344C = _NONAME_ | V | 0xB57D09271A132B8150CAD6B9286B222F ; libaacs -0xDAE9F793E802262D8AC7B6B56987FEE8CB2F7F02 = _NONAME_ | V | 0x54D868E98F86A2AA0F40963C4B74240E ; libaacs -0xE5A5D4207E4E8FD1C96AE90C6D71E30A00FD8E81 = _NONAME_ | V | 0x45A320F79C40296C887D1DF07581ACB9 ; libaacs -0xE81A55500BB25B62B8F30D4B942998AF69C4B535 = _NONAME_ | V | 0xAFBD871824334742B0C86D9FD8E5F53F ; libaacs -0xE85008686569343BBFBB2B3D2DFD0968257489E1 = _NONAME_ | V | 0x4FC739D3746FC2B6161B5E738EE5E365 ; libaacs -0xE8EE5F03F28E39C93D75F2CD25BC30A558E9C32A = _NONAME_ | V | 0xF175567FD241AB8A2AD65E5824465539 ; libaacs -0xEF569BFF49BC44DA706D0A6D9D5018292A842E52 = _NONAME_ | V | 0xE498DA82CD21886F5B8DDAD06094B3EB ; libaacs -0xF2C0D7A646ADCEF3A45FF2D2D6E08A9B55CADA11 = _NONAME_ | V | 0xBAD9C60AB8F6876E209ABF6E4DA9B4BA ; libaacs -0xBAD84A30767F027020748E02C865A20FA8F47A47 = _NONAME_ | V | 0x345EC9D2035051664C2CC23AB4CF2744 ; libaacs -0xB6B38E6DBD48D7CD8827CDD55B6B89CB610BB400 = _NONAME_ | V | 0xFD1A1F01AF03C873F691E5C6A6F4B14D ; libaacs -0x66084C31B6B3EB767F1F0FE8E011A43927831342 = _NONAME_ | V | 0x66ACBF4FB70EFE2C0F6DD894129B6186 ; libaacs -0x666698A41D4E29ECFFDF8DA98DE641C88A3D5D35 = _NONAME_ | V | 0x27CF8055B773318F332899C1E49F35FA ; libaacs -0x682603CA70FED35A45BBF916A279F1D3D3A189EC = _NONAME_ | V | 0xC7FBB08252C865CADBF2CB335E359688 ; libaacs -0x6DD1F6A1A60906346FA9D59A5AE1C8B190DF0380 = _NONAME_ | V | 0xDBABF0457DCCB389A9CE5CCF9D9AE7B3 ; libaacs -0x78F95FB9DD7AA6786C59668C4141B8E0DFDCBC44 = _NONAME_ | V | 0xB611D1ACB017145C94D3346BD2C84B3E ; libaacs -0x7DA3E68A03BD04413888E994E95BE6F996B6352E = _NONAME_ | V | 0x29D38710C1D2B682B925A6657BD9A787 ; libaacs -0x8C3C5086F4175FCE72FAFD28032E9324398EFD26 = _NONAME_ | V | 0x24AA0A075AB5038874259A081BFB23E7 ; libaacs -0x8F1003C922DF2AA2B3A3E2EB8355DC166F31E52F = _NONAME_ | V | 0xA6C9DFABE2CFFE03449F5D56B4A4A189 ; libaacs -0x9D97B135FCA61D05BC0B6CCF1410DC0B86632450 = _NONAME_ | V | 0x8527AAFDFEF83ED53D36025E2E6919D5 ; libaacs -0xB2CD75C0C872023491A2130398C0954166C58F46 = _NONAME_ | V | 0xCFB2900B96FB57F59442639C841F4688 ; libaacs -0xB32AD723A1DE1D6A573E68CDC50038980835E1A1 = _NONAME_ | V | 0xEE8AE41CD874C2CF46B04CBA0AE9042B ; libaacs -0xF30849171DB124D0CF06ABAAF927DFFF47FAC9AB = _NONAME_ | V | 0x249279AD67E46BD18BCBC9C3C7B1377B ; libaacs -0x7C9AE4D1301AF39884E662F268CC21E37DDADA1D = _NONAME_ | V | 0xF5EBC7AD24587D625BDBE16EAD27B7BF ; libaacs -0x5BACCB0FAE933153D524D51C001F36633C15A204 = _NONAME_ | V | 0x1C476F9BAF33CE963ED99D0C4BD15AC7 ; libaacs -0x76B7EB3A749CCDEE86464F735F32284F2395391A = _NONAME_ | V | 0x8AC77D8DA1CDBB2F396A4E778119F136 ; libaacs -0x25ADFBF9B79BC6EBBA6919506A46B571E2EE2130 = _NONAME_ | V | 0x97B70AE83282DDA9CAB2784C91BF462D ; libaacs -0x900CA9B7F7F2C847AACFF17A03D81B3A53F776C9 = _NONAME_ | V | 0x37360A112055357E32957296F4272DC2 ; libaacs -0x9EF5E2FBA9D7D95FA9041B2E5D5699A2C9F355B6 = _NONAME_ | V | 0xFA6BEEB55D0539B34E2904BA22025173 ; libaacs -0xBA56DF5E2F2B9742F84BC74B93793A6056DD1146 = _NONAME_ | V | 0x8F8AA977B720D9410FFA0B0DECA5A972 ; libaacs -0xD5464A5D701FD564EBCCFC66F2ED199B6206F815 = _NONAME_ | V | 0x7872A32971B8F7ADACB45641A516725A ; libaacs -0xDEC690E210F215A0B88DC51D8194064D588108A2 = _NONAME_ | V | 0xEED0837869EAAB792ADBF1B5D54CEB59 ; libaacs -0x4AEC27419CF4F02608C757223F1945D2AE8B88A8 = _NONAME_ | V | 0x61696014A088B4243E8BB4A87F1EB09B ; libaacs -0x0380B7BFAA320157CA71DEE74BD5BD0BAC7D9B2A = _NONAME_ | V | 0x0FCFD6A41C7782BC242D6CB5907DE93A ; libaacs -0x200EDAC1A8568DF52E33F3543AD2CD076A7E0B2A = _NONAME_ | V | 0x30DABB185048F9E9B882F34B0083D83E ; libaacs -0x53663768A94E929632C1CD3E60EAA18BCDA0BCFC = _NONAME_ | V | 0x4DBD454943ABC633BD67E2B4E7B0C4EB ; libaacs -0x8B4FF6C2825D658F741DB3BC1C983C11032C6D0E = _NONAME_ | V | 0x0E90517A77F58DCE83330A6B82A55FFB ; libaacs -0x6C83FF19430C36329A3B623317C35BEC4FB93CA5 = _NONAME_ | V | 0x85E4829DDC6122D3BF598B3AE193DD76 ; libaacs -0x20DF1975CDD28BEA00628B7C52059760EF30625F = _NONAME_ | V | 0x92059DAD5789BA2D9D964908E426B78E ; libaacs -0x2AFDA8709D04CACF5D5901473AE42B6BC62DF211 = _NONAME_ | V | 0x860C976FB2F12608AB43E8EAAB692071 ; libaacs -0x31B16F03865EAF1208CAE9840D4E9DAAB9BA0A09 = _NONAME_ | V | 0xCB2FC97412592ECB20EBC8471AE4A90A ; libaacs -0xDA341B29571EB7B35652861498DD5EE7BC23C773 = _NONAME_ | V | 0xE7186C3E587CDCB56922A8EAD802ACAC ; libaacs -0x9D117E52C151ABDEF53E59887BBC9235F0A148D7 = _NONAME_ | V | 0x3E2BF6C10CCF94ECC085E83BE0F38C72 ; libaacs -0x1224CA38FF2BB7CC95F89AF535F84CCE077407E3 = _NONAME_ | V | 0x13A004116732C80065BCB4CD3E50D75C ; libaacs -0x5E919732B9A00EDCFD900E18A601BB5334BEEB83 = _NONAME_ | V | 0x83EA33448824485419C83CCE875B5CEF ; libaacs -0x8BB0573519F94D8A188AECBB7E9E499D97D511FA = _NONAME_ | V | 0xC6DC1A2AFF7940D27042753930E9F4B5 ; libaacs -0xB7012F762E4A9B967BF879DB233DA8F8D068B587 = _NONAME_ | V | 0xCC295F5B71CA0FB7867A988974D09692 ; libaacs -0x6260F39BAF7F42F5D5AA40ED891E317FFA0C7EF7 = _NONAME_ | V | 0x863754AC2C09B5EC0EFFAD1789190E9F ; libaacs -0x89D20E1D8568C53626DAA22965AD20C6F793661C = _NONAME_ | V | 0xC88F2EF07C4FDD9963BFED953F7335E1 ; libaacs -0xE9BA2BDC29CE885357AAB1AF9AE0334360CBC740 = _NONAME_ | V | 0xD1D52150D70459A90D13F926719DCE72 ; libaacs -0x99EE6F4C4AEAB012B4202C449A8823F62BF3EA61 = _NONAME_ | V | 0x206F05A22D1035F76DE7BDA4AF873191 ; libaacs -0x9A6A8C206A3CB2899149C92D99AFBE7909C68B10 = _NONAME_ | V | 0x3F2E952064CC87DFD0DE2529E5236083 ; libaacs -0xC31BF8908C9C0370DA280CF2BE6D56D2A4328109 = _NONAME_ | V | 0xCE7CB35299E9EDC0E09AA128F02639A6 ; libaacs -0xC4D88241E478AAA116A8D1DB1BE2CEEC893C5196 = _NONAME_ | V | 0x98A16CA0B87A8DD4027F98C068A7C340 ; libaacs -0xCB229B62F27D3AF493D41D5C11252B36F83FCF53 = _NONAME_ | V | 0x8AF50779B167CCFDE8C47865BF6FF2F8 ; libaacs -0xF6F0B542254BA6D29FB9D46E2425FC8BCBB4CA7A = _NONAME_ | V | 0xE852F9CEB1280910CA570E2AB5A65D5E ; libaacs -0x52FD4039414157E511299E43BA210BA63BE6E557 = _NONAME_ | V | 0xE03C0E13D3162F7999337E7280150E85 ; libaacs -0x510BCE5EC3C481A9C01C68E4A8B58064BD75A4C2 = _NONAME_ | V | 0x795D048E5DB0DFDEC80C7E25CF732511 ; libaacs -0x6D353954D9D00E48C26E3125B5B4EC231D1AC695 = _NONAME_ | V | 0x6B18D9BD8796EA69716B13881A0E7A3D ; libaacs -0x05D6294ABD98C46E775CB5786D362A7437E25C94 = _NONAME_ | V | 0x5D35D6539ECC7BA42B6AAE9430F65B36 ; libaacs -0x37179B32DE52DC9962F014F852AC6FA866D332BB = _NONAME_ | V | 0x2966C8FE5D42F6AD90453127FDAFFA01 ; libaacs -0x921329D70A0DC23D92743131144CD700EFB8961E = _NONAME_ | V | 0xF559D0BDEFE8F7B6164177AE860FCD9F ; libaacs -0x799A2962ACA3326007BDCF557F2BC51A36665002 = _NONAME_ | V | 0xC8BB86E2FB71C89DB00C5149D5DDBBE1 ; libaacs -0x0520ECCAAB3A9D5B7979F3DD80C0834106BE085A = _NONAME_ | V | 0x69D205D3FD14AB1538E5AF85BDFD9EA4 ; libaacs -0x619FE8F27EC2D805736818E971A8EF2DE69E1874 = _NONAME_ | V | 0x6BA490BD5785AD908D91AC878EA671CF ; libaacs -0xA458AAA5CC256F30592ADA0903211235959DC74B = _NONAME_ | V | 0x756FB3AFE1EF0E32235E346D77B5C657 ; libaacs -0x9345155DBF330D26DBCBF13EB5E8096218591400 = _NONAME_ | V | 0x4BE60EA938F92855FCDD8A91BB87562A ; libaacs -0x0BEFC51368D58530BF6547AF5C5E0F5FB6854585 = _NONAME_ | V | 0x7956212C29560906FB354B4422976B67 ; libaacs -0x12CF501626F9F651F6C8D77C680F4BEB1CC5CC04 = _NONAME_ | V | 0xE95E7AB8C6BD050B3BBFBE7DD803FE65 ; libaacs -0x3A01E1251AE79C4F64594C834C0F8974685FFB00 = _NONAME_ | V | 0xC1FE385611C713430F3F6D39D7D802A3 ; libaacs -0x3D4B212B8AEFAD21C53C1496A321899A33136497 = _NONAME_ | V | 0x47D2F2526F73E1AABFD1B6AC7C1580BA ; libaacs -0x40EECE5E0088CCFED147F0ED014A474717B92AB4 = _NONAME_ | V | 0x7CE136D1649A7CB2AD95F3213C257303 ; libaacs -0x5C81F43F46F321640A56F76FC988CA4E39CF0988 = _NONAME_ | V | 0x3AF6F40B64A830CFE779769F1FDD6495 ; libaacs -0x675539A35D314E644736E93A929237E873CE3A8E = _NONAME_ | V | 0xE7E536DE997B4CCDADFDC0CB5B48096A ; libaacs -0x9D535648167209D502738A4A808583A341A63740 = _NONAME_ | V | 0xDC4548FFBD955A62F015A170EE3CD657 ; libaacs -0x10EEFCC7E576D38FC8EFEA93C81348419856DB0F = _NONAME_ | V | 0x8AFA3173B5A2239D3EBACF05185B5A63 ; libaacs -0xE0DF572C0287B82D4EFAF03C928C44CCB605F1EA = _NONAME_ | V | 0x794CC5B48972EF15AF94CD9C84936AAE ; libaacs -0x64F9EC8F8437526A677DCA9AA2CA28FEA791B6AE = _NONAME_ | V | 0xA79CB39BE1D3B9C47FD7A1359D13D460 ; libaacs -0x0972BA8778C3938929E7ED8ADD1ABDB986F7F76F = _NONAME_ | V | 0x43197375B84D8DE98E9CB4ED5BF1B1F7 ; libaacs -0x27CEED08B2E4C4385ABF75D0350F401ACFDAB8BA = _NONAME_ | V | 0xFA75D2AD8D038526D4C699DF11B4739F ; libaacs -0xACF6835C7FF772CA7F3C433604536114B8E61AFC = _NONAME_ | V | 0x85360937060E1C0502665B45D8A6B2E8 ; libaacs -0x88498A4374CFC25377A0BB148B13A01A3AD8FB86 = _NONAME_ | V | 0xB8A9E2F5505310B9914B3E902B2248B1 ; libaacs -0x5195C791E90A31D0E332E7409E68BD39900E62DD = _NONAME_ | V | 0x500B2C4A0F06C4DD58C6B31DD651B0F1 ; libaacs -0x3AE7B7466CD3F48667E363A60BE92F5DA5B2E1F7 = _NONAME_ | V | 0x9F1BC32756B1A397204F0BEE67DA38D4 ; libaacs -0x5B1505F07F111CFC1C38E639AA8ACBD13471EB0E = _NONAME_ | V | 0xC8480BF16A76A4E7808AEBC8CCC4D11F ; libaacs -0xAA9049F65CEDEF387CFD85544BA52899BD9C154A = _NONAME_ | V | 0x4E7A42DBAC146EA54CC1FE1624FA1EF6 ; libaacs -0x82B4CC66D2EC617ABC4A8E5B5C68931DAA0FC3E5 = _NONAME_ | V | 0xC19F66BE01EF36CD14E2237B4E349005 ; libaacs -0x195C6C972B0274B0B65489E5C55F0366FFE84D39 = _NONAME_ | V | 0x2CF5F44A4F543C97978A3F99DC40D48F ; libaacs -0xED09C9532D45FA9C34336BCF481BFBB83FB1245E = _NONAME_ | V | 0xF1F45D34762059DC95642C36440660BE ; libaacs -0x46C156DE664709342EA4D215F8F1A9E075684C4C = _NONAME_ | V | 0x09C6BEB1915EA2A12FDE28E0A966A7F4 ; libaacs -0x9FBCD20D92AA7E5BC7F4688F9ADAA4EB300884CC = _NONAME_ | V | 0xC1B7C4DB9ED44DE0B1E5E77CFB3E6F32 ; libaacs -0xC69A37907380BEBED85038550E93023216AA86AB = _NONAME_ | V | 0x6255A8EBFEAA528337D6EF6B2E853646 ; libaacs -0x171FEF898EDA2D5711C22CADBD569FCA4458BD32 = _NONAME_ | V | 0xC3DCFB0793EB2F408486487E8D859A4E ; libaacs -0xDFC52A07330E385EE83045DD15A553D75ADAD528 = _NONAME_ | V | 0xF75AB828C4C44ADAAADE2603D5407A7D ; libaacs -0x1ECA09D0236224E4DD46973B79F51B60F9BE27B7 = _NONAME_ | V | 0xF952036BD18AF4B2064783CF329D48DC ; libaacs -0x199B93F16C791A11D1D4509B9D4C0CE4B6E89247 = _NONAME_ | V | 0x03279E8325C935413C423BC85A7348D9 ; libaacs -0xAA00CADFE5B3CC95BC9F59A5E67AA3B119D02F79 = _NONAME_ | V | 0xDC7D2336A0FF3DD90DE4156EC00126C6 ; libaacs -0x9E4013D56F5AF41CA265E035AC6C8310D8AC3A6B = _NONAME_ | V | 0x69B59D16ED662BD7006F2E6242E06483 ; libaacs -0x2AE99BB0B02B5C702270DBDBF94685BBC13C0EF0 = _NONAME_ | V | 0xA28485A0048F2A06476B3B28D032B348 ; libaacs -0x3CD2A9DCEFBDD6467623F2871537E74B056DDD7A = _NONAME_ | V | 0x93BC4FC13C150B62D849EC19944D48F0 ; libaacs -0x76BCAAAAFD55F2EA9CDC08B9E8F905471669F8FA = _NONAME_ | V | 0xF2B2119FA2A1766EB336CC93EA5AB60C ; libaacs -0x990DD7B814EC8692CF276EAE73AA4C6500095382 = _NONAME_ | V | 0xE5C4EDD6577A642A2A505FC63B1C3820 ; libaacs -0xDC9452932DC9C3DE9AC97ADD356498750687DD31 = _NONAME_ | V | 0x1AF056B954FC07EF09BBDC1029769C31 ; libaacs -0xEFAC619BD0EE362FA2DD10012B28F6427DB8FCB3 = _NONAME_ | V | 0x7E68C3B989BAC68ABAC8A9A545F1E5F9 ; libaacs -0x4404B18E662725B3AE90DDFB22C19759068855BB = _NONAME_ | V | 0x213A1ADFAD987D676A4C6931DC568448 ; libaacs -0x7F279406E67277F3BFFDC00CB56B266146AB98DA = _NONAME_ | V | 0x9F97FE205173850EB8EA61EC57E338AF ; libaacs -0xAA9BAD1C9E206F63ED8E19238C3B09ED7C0C8EEA = _NONAME_ | V | 0x5F76AF6631DF2B2373084B73AB4E62EC ; libaacs -0x1D46726467767E15C697F8890D5B3C4695C9C50D = _NONAME_ | V | 0xD77F0DAFCC32ADBAE88DE9FBF5B11DB1 ; libaacs -0x458176F6E096135BC380592396E58C283F2A2816 = _NONAME_ | V | 0xB253229607791798C0497A508331613F ; libaacs -0x75AAE97E3174CBA917D591B9AC1B519BB7C55ED9 = _NONAME_ | V | 0x888CBA82B702FED4284A371F84EA77CF ; libaacs -0x8FA7A960388108B2AA6CDB1A7FF829B81357CDDA = _NONAME_ | V | 0x67CD35F0843DF4D4E870C2A10E11D103 ; libaacs -0x9A0FA4354A6185E3D26F972B46D8117B302931A3 = _NONAME_ | V | 0xD7C43C45672DE2397727065321A43BDB ; libaacs -0xFF256B7519EDBEBF4E99C2F2103F6F52B489C055 = _NONAME_ | V | 0xA08DFE9F09DB23D3EFC6483809F6FC55 ; libaacs -0x8EB7CA5E8D6ABCA045520ABF785E37DB73BB46DC = _NONAME_ | V | 0x92B504B77CD8A2D6B5B84C0E015D6AE3 ; libaacs -0x8A6ECFE0831C5E13900A89056C3336BFC3978018 = _NONAME_ | V | 0x51EF7CDA136B80A39EADBFDBDE2AF42D ; libaacs -0x3EFE89549B50A26D2C7338592F55E878B5C5FE36 = _NONAME_ | V | 0x419567B45EF5D8E6A9396DD269269132 ; libaacs -0x344C23C2DBF914B32F4BAEE212C5BE8DA9180CCA = _NONAME_ | V | 0x8125AC1A96D62754D0A7688E5263288D ; libaacs -0x8AA48641A76B5DCD3CD3A757DC007C70F07A6B39 = _NONAME_ | V | 0xECF2B14D51EF8ECB79C4F371125DA52D ; libaacs -0xBF114E1BA127C0862B25FC32F5F8067674549BA0 = _NONAME_ | V | 0x4A7FB4137692C8938F70B06172A2985D ; libaacs -0x331603683D2CE1E9CF4D2E4721A0DA55F8C8F28A = _NONAME_ | V | 0x91DD109988C471F8017CA10A324256C2 ; libaacs -0x33B06FCF0515F9A2B358D6AE0A6FDDC1CA9E2623 = _NONAME_ | V | 0xCB0FA82EB4C6E5D1232D1A6CD7CFAF79 ; libaacs -0x9BE4A27A28F9D5D389BF43B56E22ABF7B26ABAD9 = _NONAME_ | V | 0x5B247B74B3097E678F307F14515C077B ; libaacs -0xBD914254BA2DD5F50AFC35AF0C3604F45D69B55F = _NONAME_ | V | 0xD42A8463A2A1E19697AEE40E45569DAD ; libaacs -0xD37F9499214074E4312961EACF3A6642AF0E869C = _NONAME_ | V | 0x0588CB10E635991B2C38DCAA529BCA78 ; libaacs -0x8B5AC35D3F0ED4FC13D572FDB4808B4581A7FA93 = _NONAME_ | V | 0x849574249883264F69893AB8F6E5A6D2 ; libaacs -0x67866E4587C1A8CF0BC2ECEC1A6E72BA4EF1F1BC = _NONAME_ | V | 0x1C143B443A2A3BA2177662028BEAF23C ; libaacs -0x11D53179CAE17E43F4B3B4F171BE81E595D80C3D = _NONAME_ | V | 0x53712723AFE5F30D49A50E82C90057CE ; libaacs -0xCCB5F9FA3F13BCD8C45394A562ADE2F989BB7402 = _NONAME_ | V | 0x51B8583EDC24E28175ED81A2E10EBC2C ; libaacs -0xF3E93EC9AE6F3C06BEAB61FF3C48729511740D76 = _NONAME_ | V | 0xBB69B92BBADC48B3E06E15328AD4AA6F ; libaacs -0xBFAE01A6DB72C0CF1437A9DB3D39E7373D02F3C8 = _NONAME_ | V | 0xA9869E3C816B75A83C919D50071CE9A4 ; libaacs -0x3F6FE6169682BBA1AFC8B89741C4DF63572AE0ED = _NONAME_ | V | 0xF2F6571E09027EF25FD4AEBF66D87987 ; libaacs -0x67F19FE5C45BBD72AD6821C691B6340366421B72 = _NONAME_ | V | 0x7B9CBD83522C877CD5E18EEFE4697698 ; libaacs -0xB5B05324693B517B54EC6F453CB246D637151E3C = _NONAME_ | V | 0x184BAF156364C864645B373D9AC13741 ; libaacs -0x60114193630EAB060DCDC083BD8E3AD2ECB84D64 = _NONAME_ | V | 0x27B8DA20A99F38E7F370BE9AA20075CB ; libaacs -0xEF5322E5E39782A46230873B2A6F79CF4E2452D2 = _NONAME_ | V | 0xC6D3AB72530E6B08D449CFBE1728CCE5 ; libaacs -0xFF52D56BA969B3FC0E60EDDD46E83469D2C872BC = _NONAME_ | V | 0xFFBCB8E555CB09CF3BDD1FDDA6636667 ; libaacs -0x02385B6C998D3DC0E9ECCAD7CC3B079244530F98 = _NONAME_ | V | 0x7D6829493EA9824A7581F49D2712956B ; libaacs -0xAA682E84BA2F878F88E87126194730572EDA0141 = _NONAME_ | V | 0x640B6760EED7D8E11F8187D0B52BDD29 ; libaacs -0xD91CEBEDD156E39031DF43E6BD222472971EDA4F = _NONAME_ | V | 0xDD45B86820FCAC098DA936E03DF5913E ; libaacs -0xE363A4F826541767D6DE782E32A8A9353F71F919 = _NONAME_ | V | 0x38097FBA55BBBE7733A7EDA1229F3CC9 ; libaacs -0xE10A2834B3A573F76D754A9BD6AA8543876FB705 = _NONAME_ | V | 0x2D665C69611545926AE01123966640D6 ; libaacs -0x42E08924A2A4A63E12768073DAA36E8F54CFE8EF = _NONAME_ | V | 0x2B94DB6CD486C0FD81DE5A7E4BEC46B5 ; libaacs -0xC57C5178989005DA47302B685C81C0617140B212 = _NONAME_ | V | 0x477DADFCC7172F15BDDA79658B3AACB7 ; libaacs -0x15F937A9250622E95CDFFCE888CA7F0A3CE4699A = _NONAME_ | V | 0x8E2B61F10069D49CCB37CCEEE6E240F5 ; libaacs -0x9488905B2179C987B9F71B2E1AACCC1AC8615139 = _NONAME_ | V | 0x6FD2BD388DF32C2AEA23AF3B677FE089 ; libaacs -0x0265232F8EAA79A205F47E06F8B8B10E898DD65F = _NONAME_ | V | 0x6143F545C8AF720A4A5B955CB550FC94 ; libaacs -0xA46E2E404A2A2BCAD0005A090710739E5ABB9EE0 = _NONAME_ | V | 0x6D409106F480F20AF1D32ACDB3DF3502 ; libaacs -0x4D48C02E10322C0F01A8011A5BFCA192D4C5635C = _NONAME_ | V | 0xB4BB2ABAAB7DE26C2EF7401B93A4F29A ; libaacs -0x4FA94C447CE48588932B77641AE06A6D2767B37B = _NONAME_ | V | 0x5A8F5E5F0EB51AE0A25B2B7F19BEE430 ; libaacs -0xE06686E7F912C49236AECB4834628AD242C1CAAD = _NONAME_ | V | 0x9BA43D2B5C947BDED0326193DAD2B919 ; libaacs -0x3C4D8D25BAA86DE04655F9E164FDDBDD91BD3404 = _NONAME_ | V | 0x9F5EC02331AA4062FEBEE1098BFC7159 ; libaacs -0x85C101914C5F7FAAB2F6798736720CDBB4D786D3 = _NONAME_ | V | 0x12B09D8B47171FAB5C01B125A5CC1A71 ; libaacs -0x9ABD33290BD41AEA692B01DCCF993013E0A59C97 = _NONAME_ | V | 0xB0D66BBFE032E489B8ED5DCB0D95572C ; libaacs -0x8490EAC7AA53B10757019790FE9689F7BEAC70A3 = _NONAME_ | V | 0x916D067A2184F4441CCC63E54F4D4ABB ; libaacs -0x63AD81EAA5287E6AC1A22EFB1ACA0DB1FBC5E5AD = _NONAME_ | V | 0x52D4AF3A68595FD65382521407DE1F62 ; libaacs -0x6C460BA74B7CF94BDBA092620C26CCA379B1B1B4 = _NONAME_ | V | 0x635558FBED8EC21595C397F7DD9127E1 ; libaacs -0xC10F448DD9BA57A520B0676938C677D25E7783FE = _NONAME_ | V | 0xDD5CEE7357BFFA652517F8C8E4B17893 ; libaacs -0xD0F596DB1402E16450696216F650412B9A08346C = _NONAME_ | V | 0x4304CEA44B58D4C1A4D11AD9619D2B57 ; libaacs -0xF8CC6A9080DF23C6B5042D5C8D799AB4850A07EF = _NONAME_ | V | 0x99CC0BBEC19ED3F10CAF8CBCC7B961BB ; libaacs -0xD6958F4306CF1E907009467611722AAD8B1396B9 = _NONAME_ | V | 0x8CC33F640E0739D018B7C5DFC3F0E177 ; libaacs -0x671FB87E6714763CE318F4F7C1941A739AA4D73A = _NONAME_ | V | 0xF1DCED76738BA0298F29A78B271263BE ; libaacs -0xB206E7D5688D3868BCCC3B79470FEF6C491FC9DC = _NONAME_ | V | 0xBD1D959581BA4DAA1E31DD0B866B9015 ; libaacs -0xA710E6B11E123CA8A31CEE082F56176A491567E7 = _NONAME_ | V | 0x1C89F8F95C7C4D5DE872DEF17569159C ; libaacs -0x3A0CA695A36BC41FBF900647E63D65B943E12243 = _NONAME_ | V | 0x8AFD079CA060F732A208F151D85BA3A1 ; libaacs -0x50BD1FE93B676F94037B786A955B4E06D18FE6BC = _NONAME_ | V | 0xC70326CDB3C5C47E3D6A2598A62C66A7 ; libaacs -0xE84FDBC4D03849C267CB4A3FB08410AF18B1FB2C = _NONAME_ | V | 0xD85F0B660EA5542E81D3B1037A1E9B0F ; libaacs -0xE3DDB728F372919BA5F98F1E55E7798DC44F5F05 = _NONAME_ | V | 0x6C1D1E56801F3D5D319962A369A30396 ; libaacs -0x052E897F49E9604BD247547199A1E0808120430B = _NONAME_ | V | 0xB2E4F546E00F14C33CB097F03B6A4915 ; libaacs -0xE804E68C6E1909C86474DDA3FDF7291BDF511307 = _NONAME_ | V | 0x18DCA2CA184DA2AE7D2347186F338E8C ; libaacs -0x07A5BCA3E60FCF360D23134E3F78E29A12A885B2 = _NONAME_ | V | 0x60361ADA65E7F961A2569CA2C74D258A ; libaacs -0xF00E9A8322B7739F91351B08C509CC0AA2355BF5 = _NONAME_ | V | 0xC09908CED674A5A402D65737EAC03FAD ; libaacs -0xFD4BDDD7138348D53482E80D3D6FBF75D5AA9CE7 = _NONAME_ | V | 0x97CF0E892B89117D2EF8A80D27C2E0CC ; libaacs -0x14FA080EBFC01D47AD8418FB13F8B09E6735A934 = _NONAME_ | V | 0xD2ED9D0E6F3373E286A62A4677A53913 ; libaacs -0x4A805CB830E8B24C630D53E876A2E1AEBDD5EAFC = _NONAME_ | V | 0x89E9BFA90E5AF64D19A65E448858121F ; libaacs -0x3A26D013066AD90A413F0FD8D2C1C5A46CB94BDF = _NONAME_ | V | 0x5DD3579799C37ECB19B66112D3ADA260 ; libaacs -0x6C819416B91147BDCFCD7311A1B09488D4344884 = _NONAME_ | V | 0x9B3D45DDA6D60DBC6AD033E8B2A000C9 ; libaacs -0x912C17D5EF8C103B6CF9DEEAC9A37B3DC0A40349 = _NONAME_ | V | 0x5E3AA0C8B0E701DFC0C0B61E1D671585 ; libaacs -0xA41BF3852E2D6EDB4458E3EC9A51795B69CE24FC = _NONAME_ | V | 0x0BDF639AAC40C6B3C12FF89A7D6DA1E7 ; libaacs -0x663D22176B78048344BA6A2EA92480738AE9D226 = _NONAME_ | V | 0x04F491AFA15C0947550313C9A192424C ; libaacs -0xAFE13753ECFBDE1BF64A76E3FAD2FBC8B866C83E = _NONAME_ | V | 0x9359A9B8EA311C507628B569FB352349 ; libaacs -0x7C595438FA3A8F4CFE94F1BC6C36D1799B4D7D5D = _NONAME_ | V | 0x117FDF7D08CB68E5F6DBD56AFAA9EDAD ; libaacs -0x7F7AB5F10EA4D3BB552DE5D884EDC5776D5CEBC0 = _NONAME_ | V | 0x66B1738F6C3690652D067FDC03680D4F ; libaacs -0x046EB6B641DF483EBE1FA9F91AB4B5922C080006 = _NONAME_ | V | 0x298AFA55E86785FBE5167A1DAC3D4268 ; libaacs -0xCDC789748786C0C9CEDD1CE13DBA6FD1F2BD1C86 = _NONAME_ | V | 0x2C640158C05DC25546E5221C68A4AF89 ; libaacs -0xE305AE0F52B2E0DFC4441B9BEC0C58D45997A227 = _NONAME_ | V | 0x62AE35201FA3BBF90871966EA026007C ; libaacs -0xE8A46F541F5F50B2114C11A4BA7DD229D0869D1B = _NONAME_ | V | 0x4A607E20F01C09AB665CD5B0A092BA38 ; libaacs -0xAA1098BAC3B754E4C8DAF75C050047172A300BF7 = _NONAME_ | V | 0x976E9F356A7A633DBB01F9AAAE85A992 ; libaacs -0x1AADA8281F31C8EA0FFA52EFF40BDA5F2671DC9B = _NONAME_ | V | 0x86010D9375DD7E2D5B6A9AF3901E2602 ; libaacs -0xFD5500EE54EE5458212995D793DEA17190228305 = _NONAME_ | V | 0x17F2697123940408E288240A655FD7B8 ; libaacs -0x3E189A56D42C1D085EE19D619D81185A676DE58A = _NONAME_ | V | 0x5802AF3C0FFC426DC98901CCA747A09C ; libaacs -0x8DAC50AD68AF16B96BC9121B6DDF5638572F7574 = _NONAME_ | V | 0x329D96C8B997E57B921099F14EE71EB7 ; libaacs -0x6F2E1781CFE4AD79FC2B6C5CDE927B8202160C1F = _NONAME_ | V | 0xCEADFEAC51C2686B5BC7A7C3001DDC4B ; libaacs -0x5DFE36959CBAE8B83C74983C8C1EB8AE2C60B2F3 = _NONAME_ | V | 0x2F8DC6DF0E0E62707F9E353DA55319C3 ; libaacs -0x7D4F8BDEC2593ABECFF93049EBD09C0E20EDA864 = _NONAME_ | V | 0xFAD550A886C67417B478E5B4DDB3BB85 ; libaacs -0x807A26B4A1C9D6E5734FE8740F9285ABE218ABDB = _NONAME_ | V | 0x3A98A715A57F26CE740E91280839C786 ; libaacs -0x8243709D9136E7E38DC2532C972CF96D6A9085DA = _NONAME_ | V | 0x960646D74C56CFD5E2647A6739E1564E ; libaacs -0x86AD935F730938572A3D034ABFA906C6B8BB323F = _NONAME_ | V | 0xE632B3D7309372410F1F99C45CA6A1F8 ; libaacs -0x9E6FBDBACECFFC3ACAD5C0C1E7F2F52FF58F0277 = _NONAME_ | V | 0xC8923B0AD654A92E1C0FB0AF738FA6DA ; libaacs -0xA48C0DFB63C204FF078E16A160605884A5530551 = _NONAME_ | V | 0x390250118B66C4E04906B605F5B3F473 ; libaacs -0xD01F5039632906CD137860FF9C626D5839BED182 = _NONAME_ | V | 0x07924A833B77D67AD29AAF758C116F38 ; libaacs -0xD55B97AB738DD3E351FBA012091B2FF73F3AF278 = _NONAME_ | V | 0x1CAAB646A9D659086FD64A19616A45F3 ; libaacs -0xD69E6BD4311D8483B79CF0E292924A99F0F58D2D = _NONAME_ | V | 0x88A7ED5E17FA99B57C1151662EE7CCAF ; libaacs -0xF74B1E38FE77BE51829FA7D3711C10B394090404 = _NONAME_ | V | 0x47F694305A4DE2FAF437F82D487BC17A ; libaacs -0x09E42C4736091081996036AE9DD2C5EE10D39E2D = _NONAME_ | V | 0x1F045BCDF19D34C616F01F178751494A ; libaacs -0x0A8FA51B47C357CE6C8B26E5273BC6955394B62E = _NONAME_ | V | 0x73D5187B94B21FA560E5417E0D01A2AF ; libaacs -0x12FD685D669B939A2B0DB32B106E2F80921559D6 = _NONAME_ | V | 0x6EE0E1D09053AE7B6E9249603F74055A ; libaacs -0xB1195F258D8E6FED6BD5DF4165D1A01878289346 = _NONAME_ | V | 0x867F69FCB768165779216B9702D936AB ; libaacs -0x9F3D71EBF944BA2D28E016177A42216469E476EA = _NONAME_ | V | 0xC30C50CE4C27EECDBB3182EEEBF20B66 ; libaacs -0x3C64E45C29186D0ECBC6CB7C44771E12E3EF7D65 = _NONAME_ | V | 0x94BA016FFC816F97D19EC8E1CBC02DAA ; libaacs -0x53162D4DC2C16CB80C900471D5B22EBAF407F4DC = _NONAME_ | V | 0x545DA71E1FCFCE6CC474AD39C1BCE667 ; libaacs -0x9E3BED1C50A1F4D4F1A6D62BD5BA084A49708615 = _NONAME_ | V | 0x9CE623F5FBBD6AA351C93E397AC46353 ; libaacs -0xA21705A728CC8BFB0120136140B146BBC388BBD7 = _NONAME_ | V | 0x7918F62E6A6F67C50BB98D6D2D7D3DFE ; libaacs -0xD25E6EBBA3C1ADE78C03E2FC5C6E5FA90A0C1857 = _NONAME_ | V | 0x8C50AC6AE54BAA530589C360593C3EDA ; libaacs -0x5B658CF1FBEFC9DDECD2CD6C795D756BF83DCD44 = _NONAME_ | V | 0xDAB4142B5E93C001F685507180328365 ; libaacs -0xDFC8B030E3BC7411F1C76F37DCFA238B4C7F042C = _NONAME_ | V | 0x7888CE239AAFBE06BBACD7B67858523B ; libaacs -0x0CBA0555BD61D9CA04130D6C678987F003B3B8F4 = _NONAME_ | V | 0x25BCC9E2F91D6B5411DDDF0D5122A036 ; libaacs -0x169CCC3226369EBB7CB4C007700B52DF91C5D1E7 = _NONAME_ | V | 0x528F4F59298F18B3F03D3AD80443C65E ; libaacs -0xB0D01AFDF6D550FDA25812FBAF1AE566D52EF4DC = _NONAME_ | V | 0xF1E716611D61BB49E01E6A154F392BBE ; libaacs -0x606431813D7470D07D69A55770F6D285255FE9B4 = _NONAME_ | V | 0xCE5BB50F8DE3EF3FC586EC602EC89178 ; libaacs -0x86AD18BCC36854F4E78EB8C4219E6D4D1ACD0457 = _NONAME_ | V | 0xB16EAA5C6454209CC1F6487B9768A7BA ; libaacs -0xAD82C496A1429A8AE0E5A8ABE0BA44AF08C217D2 = _NONAME_ | V | 0xF80075AB8C154FFEF076077831D4EA45 ; libaacs -0xC5113E9B77236EF24F5920EA72CE20FF925B71B2 = _NONAME_ | V | 0x380F2FE0CEFA7D309BE7AA82430FF5A9 ; libaacs -0x1F26E3471400C16D20C5DCCF41F0D7A60D88BE7F = _NONAME_ | V | 0xA5ECE7299C20B3F914CB1262226505B1 ; libaacs -0x1DEEE3DC721AF46F1E955709865EC616A7E95A5F = _NONAME_ | V | 0x836CB9AC889493D273486C02FDA149E5 ; libaacs -0x3BA87DF072E54DFF503DF0A1EB50750C68F5E2A8 = _NONAME_ | V | 0xD616C4EE9C5F473CB496D731393AB06A ; libaacs -0x1E04AABAFB3A5D999123B2067CBE25FC6E088B1E = _NONAME_ | V | 0xEE2AA43C09D7EB25A302C84392D72AF3 ; libaacs -0x274ECA4501EBA0CB30CA64A61CE2F12B27111170 = _NONAME_ | V | 0x9DCE05E9152F686C564473895E9BD0B0 ; libaacs -0xBE41334C4220EDB2620095100E6B34978BEABBC5 = _NONAME_ | V | 0xDD665987B02604F2E617A97BB7AF592D ; libaacs -0x1DB7C977DE45E798B5F878D1FB9ADC731CF47449 = _NONAME_ | V | 0x4B4F4D248D49F1E02B8BEA979F82D010 ; libaacs -0x743D9AF1EAC6EF961D7297389BCCEF13572F360E = _NONAME_ | V | 0x6A7CD2EF2A642A0BF9447D767706746D ; libaacs -0x444D19B1C20BB5F2AC5356711BE130BE1B0525BD = _NONAME_ | V | 0xBA3BB023971B4A29E19C6D2D3F9137C8 ; libaacs -0x8A8AFEB0F90E38EABD728FEF42272CABA77395B7 = _NONAME_ | V | 0x5ABD9C6FEEA0773B643454809131054F ; libaacs -0x9931CAA14AC49C54C44D0BCBE3B11912229F0AA0 = _NONAME_ | V | 0xBE9A02C8BDEA4332FFF661E027BC6E3C ; libaacs -0xCA7DB18FD8A16585863D9CE6FC17B98C076F56E5 = _NONAME_ | V | 0x123EC77342B0E461BC03F38BE0E6970F ; libaacs -0xE038B2D009160E70630175DAECBBA04100A03AC8 = _NONAME_ | V | 0x2A37F48959AB09FFBD435AF9F107B8AF ; libaacs -0xE4F470EDF03AF0D43DEB900DB1E27E8939065A0A = _NONAME_ | V | 0xCE7562B5FA194FBDC7729023F9178580 ; libaacs -0xE57180B95286CFD5AE23A99DAA5062900864F881 = _NONAME_ | V | 0xF74D7EF0BEFAB78ACE2CB80D49104B52 ; libaacs -0xF18C3D412420A237B4938585ECB2DA685A46773D = _NONAME_ | V | 0xCA776A508EC95FAEDFA3DEE0F05253D1 ; libaacs -0x23EFD49191D7481E8AF382C57F2A3419878C87B9 = _NONAME_ | V | 0x0EC122B6E1579000C03AF016FBAF4017 ; libaacs -0x9B97B6FD139C045C1B8AC0C603577451E60CEAC3 = _NONAME_ | V | 0xFE497247660D8D107BEBDF42513B6521 ; libaacs -0xCD46228B7EA3CB5348DAEDEACDB65D318640E235 = _NONAME_ | V | 0x24D33D9B66AF3418279EABBA959FEFA6 ; libaacs -0x879770CAACF99A101B5FC443212C737A121CC080 = _NONAME_ | V | 0x9BB85144054E08DF77817C04B5973B96 ; libaacs -0x7B8018D98715D6CAC895C1110491DC1B1BE5D2FE = _NONAME_ | V | 0xD0FE7EB86C3672E4DE9F818A562B6A6C ; libaacs -0x2F927976D37091A081CD2D6245D7D9420C5CEFBA = _NONAME_ | V | 0x62F0B41B30BE41E09552E6AE8B5768AF ; libaacs -0x71F69B77A9EACB6607C3F2199C3BA5DA66074288 = _NONAME_ | V | 0xD181CB4886C80EECB5972404C036A619 ; libaacs -0xFD0D78B3461844A132EA09252CEDA526A8FF5AE7 = _NONAME_ | V | 0x774C44F2F305A3220C8EBA1C1F1F97E6 ; libaacs -0x6AD68EF39933751A2025BADCB25BD49D431D983C = _NONAME_ | V | 0x6965823E4882F4D56F7CD705FA57D379 ; libaacs -0xADBDC109F033507A4620FB0A91588501D479956C = _NONAME_ | V | 0x00D0B8E084F0732660368F8FC244E6BC ; libaacs -0x63A2C4A93E9C3C6837C6C88004895064CA0C4633 = _NONAME_ | V | 0xB6BCAFFB05A60698B075758D1FF922F8 ; libaacs -0xE03D1F465721B9710A6BBB7A718595002C91DC54 = _NONAME_ | V | 0xDEC93D8F64D2C00199AFF258DEAFC02B ; libaacs -0x030FC0FCBAA542C1B8E2DCCE1C5318A75601FB86 = _NONAME_ | V | 0xBB7DA1A8BEDBF841B213D1398A617B80 ; libaacs -0x2D7E6009C962C3C3CCDF970D49CE1AAC0F90A03D = _NONAME_ | V | 0xDF631E24AF19023D4F0D6024C949D6A3 ; libaacs -0x560939F8048783D9F591D71D1058A79D205EFD57 = _NONAME_ | V | 0x9F003DCFDF41004CB61CADD0386C3ECD ; libaacs -0x8A9AEE748F385D0ADFAD2CA9E5CDAA2C1B136F8D = _NONAME_ | V | 0x524821BA7CF126847461F55DDB124387 ; libaacs -0x7ECCC938BB667A6FCA82B3A0AB3AB80165647F55 = _NONAME_ | V | 0xEEE4C6DD22FBE459834D8393EB5B3A62 ; libaacs -0x79641CE2F394ED5A38E5CCE16E6E67703F08A28A = _NONAME_ | V | 0x3032E8D141D7C476BE6B87E8FDA4B3C4 ; libaacs -0x33A2B396B1C12A89ED6D5F6DE875BEA170A12C1F = _NONAME_ | V | 0x022EF96552589A36A1F72B64D093CA6F ; libaacs -0x38A3E8BA6CB6934B6842732F8EDB04E381B0ACDC = _NONAME_ | V | 0x62DDBE7465C07BAAE8C2FE4D4AD8EBCF ; libaacs -0xD33FCAC1A634D17B31670BF522742BDE684706ED = _NONAME_ | V | 0x6E6664AE8DA54FDB8264B4F813AEBAFB ; libaacs -0x8316EAEF5A502E4BA75B3AE50D182EDF369C0A1C = _NONAME_ | V | 0x543325F2A95659675868B43315427B60 ; libaacs -0xFBC84A4F832CF103B39A42A784FFD34D9412E022 = _NONAME_ | V | 0xB05F506BD4F62C6BEF5449C23C478AD8 ; libaacs -0x2F494A58DF75ECA7D3B525FF0C42132D06482308 = _NONAME_ | V | 0x59D8CB8176B3D5525D44355F5721ACA4 ; libaacs -0x12A5725AE4EC9F6C60E37CD306DF2AC7692431A6 = _NONAME_ | V | 0x02DDF6D7CAAC14744A41967A0D997651 ; libaacs -0x848D4DA90592FC1E30E3DD25F360AFEB0E431D82 = _NONAME_ | V | 0x000BE152317FCDDA4EBAA163CE1E139A ; libaacs -0x86E4DDC0810337457C82794314805CFC38C96CAA = _NONAME_ | V | 0x43881112260C654EC46C6243B375742A ; libaacs -0x3300374E5DD899A98F9EA1AA88A385D78D1F93AF = _NONAME_ | V | 0xFB5FFD64454E020F370D616E046D06C0 ; libaacs -0xA81BBB8AA245B7D6BBB674A97FC48301B3D12889 = _NONAME_ | V | 0xF9F3A961F6A0977757645A5D894166CB ; libaacs -0x911B40D2BD212F619788881DE4EEEEC36287770D = _NONAME_ | V | 0x09D9A27EBD1806812F98F949AA7149DE ; libaacs -0xCF1FBAA4BC3380AD9CC9C3AB40B2717EB3CD9561 = _NONAME_ | V | 0xCB723BB398EF19D260350594AB9F37B2 ; libaacs -0xD87800461FCC212F744EA284B67EE1807D48432A = _NONAME_ | V | 0x3A9BBC137D931374DEA4D6D4960AF440 ; libaacs -0x25BF4CE51576658C35EF6E3B1AAD345A75F62B53 = _NONAME_ | V | 0xF6B6759CD124CE15904780DAA80EE84C ; libaacs -0x13CC0E7569195D4BEA3710985D38F816B1D14767 = _NONAME_ | V | 0xAB06C45591C3C1FB6D8AA0BD16EA4C13 ; libaacs -0x87D2E9404D189E50DD9DDF92AB9D61B77A58A57B = _NONAME_ | V | 0x82AB7A9C1BC161F8AF554F7ADF993278 ; libaacs -0x9CFB4CB821155FDEAA57E8B342926DA45E4E14F2 = _NONAME_ | V | 0xBD13A06A3D31DAFCD71EA137E32B5860 ; libaacs -0xFB41D7BAF337D596240B156A4ABF0AE110B6999E = _NONAME_ | V | 0x6F94237DE0C85F34D917DC5341F04D78 ; libaacs -0x448DEED29CFAB9622A4CF90711A43B9419BA12C1 = _NONAME_ | V | 0xB6410EAB79D72102469C291A1214C786 ; libaacs -0x494A986807D1DE73A6DE343571A47DE606C91744 = _NONAME_ | V | 0x156F36FFCF852F23A2AB356295978F5C ; libaacs -0x5108E8CB50A7534C915FB3936CF649CE9C15CA6C = _NONAME_ | V | 0x388F269A7C6BA6548408F42D0FB429A2 ; libaacs -0x423DD3EBA64B6594568590765D4E4FD8F3DA9932 = _NONAME_ | V | 0xCB9ADB7BB3E94E96989793D2EC4D3BF1 ; libaacs -0x54B89048B860B79B7C83687643E9AF78894708F1 = _NONAME_ | V | 0x2B039E2A64790AF7D3EC6F065C8D6E90 ; libaacs -0x9865122CC8B0945561605F1CC2E780B4F9AE771D = _NONAME_ | V | 0xE4B0C91EB96BE945AD7EE71A014010CF ; libaacs -0x94EE0C0A7CB87760371864923340FBB31DBCD1A3 = _NONAME_ | V | 0xDABCC7B7EEBF81A3C8C9ACDF9E300A99 ; libaacs -0xC6F6B4701D12327A415114DF8B89602AA450FE7F = _NONAME_ | V | 0x0754A4F686F662BAB699625047E48565 ; libaacs -0xE8F2366340CC52FD5E7C87FB505E59E0DA5A56DB = _NONAME_ | V | 0xCDD3C4123039D38FFC259E6889C6DC07 ; libaacs -0xF9BEB40B2E92697ACA1D76E021AEBAC3DE074EDB = _NONAME_ | V | 0xE66527AFB031FD99ECA61876A980DECC ; libaacs -0xC79F590E4F3279174DCFBA9962C364EAAA3B070C = _NONAME_ | V | 0x24760E927B27DA3244142DAF22F6159F ; libaacs -0xBD1BF2CBB9FAE0C0748441D8CA66BEE519939A97 = _NONAME_ | V | 0xF0344CB136CEEF39B3138607AF036F66 ; libaacs -0x5C95445BCC04D8DD64DD5FE2E8298719C4369923 = _NONAME_ | V | 0xD27212F7BA60BBD6FC952DA52FE787AE ; libaacs -0xCE64C69419FA08114F761BD9AC34C4ABC2CD2F14 = _NONAME_ | V | 0xEDC94344535DDC95F486850A84039AD6 ; libaacs -0x40F11E74D4EED21934C9E4A8A8F6738D8519B9D6 = _NONAME_ | V | 0x850084B7A1F275168E12E42008EFB453 ; libaacs -0x3A600FC86C5732C08EBE702D8D8D00B509092F9D = _NONAME_ | V | 0x1EBA2BDBF4C6CC02D0D044698B723DA9 ; libaacs -0x7E75F5ACA708750D857F6A424152E67F8F1854FB = _NONAME_ | V | 0x451EF0F7AA1EAA5D077F51BEEF67D4E7 ; libaacs -0x35F07B5C13AB3AF2C6356BF5549F8F11FDC7F18E = _NONAME_ | V | 0x42DB945CA2B02D2E785B3DA728D36851 ; libaacs -0x09791D2297D4B623CBDE546E107085F3C615DEF9 = _NONAME_ | V | 0xD3B4032115770AB894DEAAAD0ACDFBA7 ; libaacs -0x61AFC2F2E1D96983820BCAF0E0D6B8BB2765709A = _NONAME_ | V | 0x048F198B6BAB3015D7009DA42FFEDDF0 ; libaacs -0xA62A0FA06C35C211DA3E701D29DAF0535C6034AD = _NONAME_ | V | 0x5A2B69BC4859EB3B85C6145DCFEDDF55 ; libaacs -0x44557EB98CCFE93A8F08289C58478A0426735543 = _NONAME_ | V | 0x4A73CBF59050744440BBD4316040CF6F ; libaacs -0x988C7F59E7D723D8835DBA0286F28FF8F781EC99 = _NONAME_ | V | 0xB03D6C33DD445F316A9C521086313112 ; libaacs -0xBDF2007A12DC7F2662881423DB3156B8F6739044 = _NONAME_ | V | 0x05B42D4C6AFAC7546E8F1C6AB16EBB3A ; libaacs -0xADCE29F4908792AE93F5D40572C2AE246AE12BB4 = _NONAME_ | V | 0x9D7FD4754DA653C0AD09CE0329F71962 ; libaacs -0xD308A780177B67ABFD079FF5D55F476867F65EF5 = _NONAME_ | V | 0x6BABCC17B869D7CAED5B482482D7581B ; libaacs -0x501C6E2A1B558FA9BD0CEAA1ACC0A265503563FF = _NONAME_ | V | 0x7106E6C296B8502C48C8946F1DD47E19 ; libaacs -0x98554465212056886D3501D1DDA31C0D1185ACAB = _NONAME_ | V | 0x9ECF95B4A3395057DCC6BAB234846B1A ; libaacs -0x5C19ED0B5CA5FC60B0A1A4AFDE86E9E9E09A8318 = _NONAME_ | V | 0x2239E339C7CEBFF42B0013DA092381BC ; libaacs -0xB5463762F1C6A07C1D99BC09136FCA3A720A4C21 = _NONAME_ | V | 0xEE8C1468AE63B5F7720E24C3AB04C084 ; libaacs -0x9CC685C36C86EB6D2F0A3B2BEF48D0C9FC4665F8 = _NONAME_ | V | 0xABCD3C41F9CCEC222935C49E3DB6D7BF ; libaacs -0x70742055E8BD637C2E3546313CFC7D86C84302D2 = _NONAME_ | V | 0xE095D0C446FFCB04CBAB4581954823F5 ; libaacs -0x32A865301959F7035C55D2A007D7F84BA7673A8B = _NONAME_ | V | 0x2AE9972F244C4DC670184D6BCB6EFEEE ; libaacs -0xCDAA897B210C848AA4CAADFC1979133F208DA449 = _NONAME_ | V | 0x4276FB2F86ED8F935D32FAFA53DCE3F3 ; libaacs -0xDA2F022FD44C5A9D2C9ED97E8424B04A27262531 = _NONAME_ | V | 0xD8BF446D591E9F02832052FB44B5E65A ; libaacs -0x12B424956720380884DE890E15CB6DAF0C62E2EC = _NONAME_ | V | 0xB2D169C2B62E2A588CEB566A6A41F84D ; libaacs -0xD57A62F2101F52CCAAA177F2694C286B66080BDA = _NONAME_ | V | 0x1ED5E6B62257D340876BFF83A1E09779 ; libaacs -0xB9DFC719BC7E3554C3365A8E75DA57D84A8E1781 = _NONAME_ | V | 0x989B50734FFD8CFD457BB0F867E03EFC ; libaacs -0x436147FD4A3D6740EA58ABDC284632FC0B81FA26 = _NONAME_ | V | 0x0A500EE40CEF12637704D0A61A63E6CF ; libaacs -0xC18F851FE508ED20BD80BD3AAB3C7C3A4BB48FE2 = _NONAME_ | V | 0xDCBBD1ECF7B16E074DD8BC003F0D33F8 ; libaacs -0xE25BC0B5D4A132CA0EA7C4D78AF6562E53CE460E = _NONAME_ | V | 0xF34B225F83297DBB7F13476D7A4366FF ; libaacs -0xEBD378ECEBFB045BC9A6B65EAD4D38DBA1FD3892 = _NONAME_ | V | 0xF04B2638D217E792423B1D78FE276FFE ; libaacs -0xF5B8DE7E0DAB6DAD99EA3C13F3051F53CAD4F8ED = _NONAME_ | V | 0xB14A2DDF3ADDEBA66F2778F8F8ADD64A ; libaacs -0xE02F2694B165885847741AA8D9C7F0C9C509CD2F = _NONAME_ | V | 0x901B47F87027C637DDF73AF18ED06AFE ; libaacs -0xEF9DD3A8168B87865918F2A14D6B224C9E79EAF9 = _NONAME_ | V | 0x6F6385A5E0C8E554B18FFAF95E7F1F9D ; libaacs -0x245E2787286CE44B98C55BD963A1479FA48E4A2C = _NONAME_ | V | 0xF619FCE2CFF606CF2EA47239F4F2B03C ; libaacs -0x0768761D6AC7A47B29C58A2963372DF54248C619 = _NONAME_ | V | 0xE489A63376DFABB2E71EB1A62D2B121A ; libaacs -0x44192E1AF282EC15E17A7A7BEC0C25DBA716F463 = _NONAME_ | V | 0x19FA650BBBF25D717245BEB929925189 ; libaacs -0x5B69F24B55633CCECD9B4F0B4B7563C0A11F6358 = _NONAME_ | V | 0x3DABC07A0F65358AFB87DAA23F0724CE ; libaacs -0x19E45A0438565902401003EC8D3147A728CB22D1 = _NONAME_ | V | 0x78F73BDCDF4686525BF04E4BB42DA1B0 ; libaacs -0x3E4554A9AAC6FEBF5E43AA256FAB943FE5E62606 = _NONAME_ | V | 0x743BF7C950255585BEA21BDC99F39DC9 ; libaacs -0xCE6FD3BB74E2B00667859166DEB12B9363228219 = _NONAME_ | V | 0xC5EE1BD58AE510617ADDCFF82DDAD167 ; libaacs -0x5C9FBC8F0B0DDCE193422912D0690C5B9514B8E3 = _NONAME_ | V | 0xFEE1886A1CAEAB9F3EB9B85DA2A40BD9 ; libaacs -0xA1493C3040293AED17EB220D5FDB281CB8CCF523 = _NONAME_ | V | 0xB7C203B9BC0E0E44754020F6A6A0334D ; libaacs -0xF1D9F09F28AC9C31C88BF93D5454AD273CC5C28E = _NONAME_ | V | 0x0B11664A81A6F8B6041A81CD09D7F279 ; libaacs -0xC934BB3E2B15F1B635174E330376020737DD283A = _NONAME_ | V | 0x93DD4C4DA7C8F85275C7E5EC4D5747DE ; libaacs -0xD25210697D40192DEE8EDD0DC6A955B4D0B6B0E7 = _NONAME_ | V | 0x35A42341D47BD67B58B7437471B75ABC ; libaacs -0xB3FCB268841246405FC5D96312BB5374896C3AFD = _NONAME_ | V | 0x02B4E1B74CCC0C1A2B187ADFD0A022AB ; libaacs -0xA9053C279BAA0CFAD49355D66829E4B818F08835 = _NONAME_ | V | 0xE11EA4CC5AB2D46117209B2015BB0BD6 ; libaacs -0x9E6AD427A96CF762E2FBC5BDD44920DA4C589666 = _NONAME_ | V | 0x675500A6024D588572615205AA46D365 ; libaacs -0x9679AE8E4C387453F9A5DBED12AA3719F9757758 = _NONAME_ | V | 0x634203F5A13D9D3D9E0611194CFC9F99 ; libaacs -0x70784CF23C31DFDBCD4F64892770A1856A85EF69 = _NONAME_ | V | 0x3C19FE7CF2FCA2D89B419F9E9F65A331 ; libaacs -0xF23646B7F7EAB077EB05866BE62404020490FEFF = _NONAME_ | V | 0xDE79AA2A987A69FB100E074319EFD5D1 ; libaacs -0x9ED128E021A7FEC53365F4F1E826D3961BDF4854 = _NONAME_ | V | 0x3C49B33D745FD570055B1C76C6EBEE39 ; libaacs -0xC56497FA8360EAC28A6BF68598A747A57E47B290 = _NONAME_ | V | 0xD17305E4DDE5A97E9AA5331B37EA9150 ; libaacs -0x61354AF2D81C2F97018E46E74B845EF773CA825C = _NONAME_ | V | 0xAD2EEC53DE0DAF92EC0F3A95B57165B4 ; libaacs -0xA211094849FAD14A3873798D63F0FE1F25A2F84C = _NONAME_ | V | 0x3FFAFB87ADAC8734226CA7DFF0FDCE7A ; libaacs -0xED2C8D35A1B5023DB6132558E9452428FD859A01 = _NONAME_ | V | 0xE535A4CCE39A4D75F1DF6E3A468A070A ; libaacs -0xC19496A2CFE0E053A2134E41480B8FF611F6C809 = _NONAME_ | V | 0xA1B81B4645B6DE12FBDF18770419A344 ; libaacs -0xA461DE0EA953DB6398F8C32BA56F20F912E2C29E = _NONAME_ | V | 0xA5E7FEE5F77A7AE5D30CAF0E9901FD13 ; libaacs -0x7E8B28B3729EBF802528EF20FBBC0F56164B0F18 = _NONAME_ | V | 0xFB5F245E9186096E67CA709CD4E94A1F ; libaacs -0xB407E3FB34F7E1EBAD3B3A123E0EAB297B6C8FAD = _NONAME_ | V | 0x634ACA47F9CBFB8DAA48EA3C24B00C64 ; libaacs -0x42F710910E57D615A2EABA9B2D36A8B5D938A00E = _NONAME_ | V | 0x7EDC70A16153ADE736F6DC050A67CEE7 ; libaacs -0x96F9C51785D3041474D146812FBCEB55D7D20DCF = _NONAME_ | V | 0xD32663D9B57658364F473E8BA2B92359 ; libaacs -0x1ED8E9AFFC9C8895DD3C6009D21F3417F4D5D980 = _NONAME_ | V | 0xDE557B3ABAD51BBFCF1CA622B3BE1810 ; libaacs -0x9CF9733FE5FACA0DDB1383A955DBB1C42688CC79 = _NONAME_ | V | 0x754D2248FE105AA1872A706699008BBA ; libaacs -0x90EDE8252B448954F83D47949A2AE0C0A4C4A994 = _NONAME_ | V | 0x4740BD876CEA8DC0935EB5A1221FB1E3 ; libaacs -0x15C2A6CC90A40E18DA2883074FD15C8572DD7B9C = _NONAME_ | V | 0x07DB004D799E731B0CFCDE65F20AC64D ; libaacs -0xD6DB53759AE541A108E6A55AA1160AA6AD259FDB = _NONAME_ | V | 0x3F8D671DEB7C024C0E7310CDBFD37B7B ; libaacs -0x0AFDF5BC6AED9B5D83A3194DEEC1102895388574 = _NONAME_ | V | 0xC7892C095CED22ADBE761B8F258FC70D ; libaacs -0x2363A414600520361AD41EB0F007939436BE92B9 = _NONAME_ | V | 0x49D840DB37B685D0DE6DCB1DCD9807DA ; libaacs -0x12EEAAB5F3775E67FBDCE75DD7DB5857325DC372 = _NONAME_ | V | 0x826E64482E6AD146ED378377D0BA0108 ; libaacs -0x43B8FEABE8E3CD588B78ACC1A79FC0B23ACA8237 = _NONAME_ | V | 0x705C656502C95782A3F5355645FEE628 ; libaacs -0xCE6DC37F3EE139C9896F59481DE6970377C6BEE8 = _NONAME_ | V | 0x33F59B10D2D6D4DAB8C51201500B7EBC ; libaacs -0xB3C5CEEB27C41A0FBD3FC63B6385B3C8A9C2162F = _NONAME_ | V | 0xCE1103D560418436982C538A3E02026B ; libaacs -0x31EB7B87BF2734E9D0984A234F92C5D6E193477A = _NONAME_ | V | 0x10F51D4D0DA17E023B97CD203A666900 ; libaacs -0x54F48ABA84D548707266345E3147F9560B5364EE = _NONAME_ | V | 0xB8158880F7526E39191B732D89B7F339 ; libaacs -0x029F9CF03CA84449B22003E6F2CC2D16066BABDB = _NONAME_ | V | 0xBBFF42AFF877C21AFAE255669123F20A ; libaacs -0xF2DCFAE08DCA1C57DE5E77D937D086AA9797E85E = _NONAME_ | V | 0xE2D9ECC7500D2A1DBA9AC0C7BE9615CF ; libaacs -0x4083DE33D9229373E6CE8F510BFBAA01AE369548 = _NONAME_ | V | 0x6254FFF5041F893C5685AEC5313979B4 ; libaacs -0x5794BF008E0D1E2D6AAD31523A5B7B4AB783A9AF = _NONAME_ | V | 0xEAA9AC1F082955BCAD1148A92F8A4EBC ; libaacs -0x562F2EA9A46113B8C335ABD9E0587EF730F23FB1 = _NONAME_ | V | 0xEEFEC7B0346187509F34E19042C5DA3F ; libaacs -0x2B03CCCE8682628BE53DFBED1817CFF12F4F268B = _NONAME_ | V | 0x874454BC43B9803C84347058D0C535AE ; libaacs -0x425CBC6CDB356202CEF66CFB7540DA40CDA637A5 = _NONAME_ | V | 0x0A3697B2F6D0E1C86E82277C04387FAB ; libaacs -0xEC316A91124F59AE54D235D42275DF070FA0CFE8 = _NONAME_ | V | 0x9545DEE00E326BC30B655D78F85DAA42 ; libaacs -0x1CCC92233E87656B68FC96F4688A5F9A450F905D = _NONAME_ | V | 0x3F211D7CE1A72334797646F758855813 ; libaacs -0x76C3147B4318636B36F07DDE43959E9AA86C73E9 = _NONAME_ | V | 0x5793B43CACB9C79CBB57462E1BEF393D ; libaacs -0xD40CD09A41695EA728D09D6D4766AAFC4D077347 = _NONAME_ | V | 0x34AC8E70514D642FF3C2B953DD73C2A8 ; libaacs -0xA4D0FC74D5F9F9E2503B185340642174DA8E4A2B = _NONAME_ | V | 0xB72B7D78B1B2DFEA137558B14F132614 ; libaacs -0x91A74333047B19E8FE761A68D31B143CEFE767C9 = _NONAME_ | V | 0x5375E0327157B4E95FDA19E299D0931B ; libaacs -0x9083EA7A30872AB248BAC1717D80AE51104E489E = _NONAME_ | V | 0xD6F1E7C2B9EE2D4C9A42842956DFE48C ; libaacs -0x302261A6776E017C26D127FA93F17FDFA90121BF = _NONAME_ | V | 0x7F0C737A0421777CB4C201501E815CC9 ; libaacs -0x6AF4E1AFDD6397A4C7F6D1687C8823422865E349 = _NONAME_ | V | 0xAA22CB290DA881B460849B079F6BEBF6 ; libaacs -0x6663954F0D5044367439CFCDA75DCA8896977728 = _NONAME_ | V | 0x2AE75CDED2910DC00916A6D854FA7A93 ; libaacs -0xA898934874217A421764BAD037A8023E949D7979 = _NONAME_ | V | 0xDD9E1C290BC3BBBB550A90AF9850C96D ; libaacs -0x24DCB2BE77B427C6799B0138E32DCD98971DE693 = _NONAME_ | V | 0xE16EC5A4BC31437AD500EE3B14298DBF ; libaacs -0x9C1C574897EB33649CD7F1A42155CD0AA079802D = _NONAME_ | V | 0xEEBDD69208D9582D936ED40BE69C5380 ; libaacs -0x6CFDBC8EA3FD22B16A4EF6DFAFB20F4D014D0B06 = _NONAME_ | V | 0x6DD6F1E226002BF22E0FB49DF37F0A72 ; libaacs -0x94A9A44C685F9417EB616FBCC0F41FEF8E5331D5 = _NONAME_ | V | 0xF7170B5697BA3440FDD405C9C56E3BAF ; libaacs -0xDEE506E4C5DD5274D0A77D6E4CB1E02C4C1001AF = _NONAME_ | V | 0xEA4C6A862CBC9312A7F49BDB1383CE2D ; libaacs -0xA5A4729D72FAD8C84C4C4C21F5C938F876586026 = _NONAME_ | V | 0x949DB4069CE5A7D990B373FE3BBA83DC ; libaacs -0x4733595D5A93992E298ADBC2F70C19B319CF438E = _NONAME_ | V | 0x97BF554FEE18B8A2C3AFB135AC9BE15C ; libaacs -0x7322BD2A99828DEA6ADD07E8444B708F5BC026F7 = _NONAME_ | V | 0xC37152408C86130B7F2BC1E14D528BAF ; libaacs -0xB8AFA5F66B55A4C582025E2E87279944873AED54 = _NONAME_ | V | 0xDA66539F82520434B2DDB16872A648E0 ; libaacs -0x489D373A20FAABA91791C4E42C03A9C250194DC9 = _NONAME_ | V | 0xB5C95B66D057052A10F4BDD55BBFCF10 ; libaacs -0xD1CB88C4CB6C83495B39477F6206BFF8D29007D5 = _NONAME_ | V | 0x6FEECC5D0C12596A7620FFF1152FCCCB ; libaacs -0xC1657876A50F88641FCD0F6FE5DAC5770599EDCB = _NONAME_ | V | 0xA91895D13C027E97D32B27F6B0645828 ; libaacs -0xD8652D3FA1C52D0EE3DF2DBFAAF44F411FB8E62E = _NONAME_ | V | 0x775E489879A952015BCCE874241BDF1C ; libaacs -0x65AA0EAD2B758DBA763B901603159C21BF37147C = _NONAME_ | V | 0x778B674E63425A23BDF82D4E34CF9228 ; libaacs -0xCA34CF89D99E89627058D6318B485FE74A4AB470 = _NONAME_ | V | 0x5CB3885ACDE8EC7DB899C54A54B0CE97 ; libaacs -0x6E4C966A52F122CD198A0F72407CB56F2F6D9248 = _NONAME_ | V | 0xDB38183A3303C9C2AF739868A54335E3 ; libaacs -0x4CE1D59D68435FC15D631646EB0EF995CD9CE687 = _NONAME_ | V | 0x611B487B49223581DF4769F902545DBE ; libaacs -0xAF6722A64EF2FBA42F7C9B7719675FE4968A7243 = _NONAME_ | V | 0xCBB78B95DBF0664A3DB02AAC59F42A28 ; libaacs -0x95D3356CD20BD46BEDB38FD8A1C75BD596AEB81E = _NONAME_ | V | 0x82E9B14B85627EE13CD997557AEA4CD1 ; libaacs -0x49835D5CC9A820337A609B201E36558F115FFCDE = _NONAME_ | V | 0xDE3083F4B5B8E497C30D090E7F866BF2 ; libaacs -0xA3FFF06D127591444EC5E0A1EFB9892508315250 = _NONAME_ | V | 0xFBE062388C60903E9F3192A9F2021B40 ; libaacs -0x21E912FB4F753BF03D917DE2366EBBC55BBC2F30 = _NONAME_ | V | 0x3EA37E86ED601CC6D4B19F5A9D737259 ; libaacs -0x49DD5FBD02E84CB2D56FDE98D6DCFEF676AD3434 = _NONAME_ | V | 0x8821DBE18997367D52FE72378839DB69 ; libaacs -0x2D7002E0B8C3BE1CD633CAC4EF666279FF9AF8D6 = _NONAME_ | V | 0x96420A6DF4E822DC78E36F98AA15E290 ; libaacs -0x356D5DC664130591E6097F70EC3605B16FA3A884 = _NONAME_ | V | 0x2AB1BC58557F8A9ED4F268C9C7A239D6 ; libaacs -0xE580FE91C79A4813AF7AC9D290C62A600E9B3D59 = _NONAME_ | V | 0x1256ECFD68C6535BE9BC30EF2A32D325 ; libaacs -0x8C82850E558D600A3D46BD0FC67CA8A8767A490F = _NONAME_ | V | 0xA1FCE5AE4DF3BC82CD09126B81E1B808 ; libaacs -0xED17FA8414A43F7CA19860D5280B1C220A8B207E = _NONAME_ | V | 0x3D10EB4A53DCA86E16E6CCEAA0F1733A ; libaacs -0x41C96F6509D4858D09029A92F9AC351A765C684D = _NONAME_ | V | 0x774EB0C4237EFE787A82E5A993A50893 ; libaacs -0x0BB7D2E10DBF72CCDDFFE84DD150D40FE69D62BD = _NONAME_ | V | 0x8DE12932866C8D3B99F0944C80076716 ; libaacs -0xCC944E2DD298B425A00124E845F9351D9A327826 = _NONAME_ | V | 0x86AA30DB6F5DBD55E7820E4A3C455CFB ; libaacs -0x2298E02AFB2ADE4F421B86923DCFD7F23037CC84 = _NONAME_ | V | 0x9F1FA2A3F20013DAF5263AA9A01D933C ; libaacs -0x3186CDEECE16B395A7481D4537C037D4B55E4EBC = _NONAME_ | V | 0x1276F824C4AB07CD0BC2D71C5A2965C7 ; libaacs -0x727C3702205389382F088BFEBC8FB27B313B4E30 = _NONAME_ | V | 0xC7817B09490E9A7A3C49047ED4BD17C2 ; libaacs -0x82CFD2FB01907FD844CD5EEA22A49BCF4CCBE95E = _NONAME_ | V | 0xC62CB7E535CA9D27738B4337DBA1758B ; libaacs -0x2E31C9B1237C583950587E214F93AF24C8D9A940 = _NONAME_ | V | 0xABE39225CE9AD510816CEB4EB8424541 ; libaacs -0xFA2550738C9B80254CC23AF58A7FE97C7096F0E3 = _NONAME_ | V | 0x95914D4111881EE44B004B1C4CE2333F ; libaacs -0xE2F73F44B2BC93F130DFEE24BFBC300E26EC4414 = _NONAME_ | V | 0x2C61604E390DB11959E44AF997B7BE49 ; libaacs -0x7AEF5B9E57257F0EA9A62584F9022909831188FA = _NONAME_ | V | 0xFAAE37986AFF4AECEC0E702B8AF52A9A ; libaacs -0x367F96D0FE56FD8B83BE3721D967B6BD2C8C6750 = _NONAME_ | V | 0xADE88B4CF78C566579DDD66637043B5F ; libaacs -0x0576620733F00C82C1E8F3C507C06BE8D5529C6D = _NONAME_ | V | 0x9E7FD78B9F600508F25D0BFB1E80EF3B ; libaacs -0x0D7F7BACFBC5ADCB68E9AECEBBB6F64FA9AF5E2F = _NONAME_ | V | 0xF6DF2B4050F88C8FC3F8315BEE7BF0AE ; libaacs -0xB5036411F0FD5403B6CB100D06C74DB883EE7AF6 = _NONAME_ | V | 0x4E4B7491E2A0F5DE43BB6FDEF6154612 ; libaacs -0xD90A04ED3E6CA7DBCEE1363D7670C7711496469E = _NONAME_ | V | 0xD20E96DB659AEE2D93BC0E03ECFCD222 ; libaacs -0x08CBA9D5DF605B30D7025568E2A69C1A2CC47FB5 = _NONAME_ | V | 0xFB2B3447152524E512B1067A572D387A ; libaacs -0xBF103699CBABAB07E7D5E598343EB98CBE0E8C0F = _NONAME_ | V | 0xA5F754B3FD83D41B51B03156FB0F225D ; libaacs -0x6BA5E8EAB45391E0B7721174E24CAA15A7EEC5EC = _NONAME_ | V | 0xF0C1851E682CC904871A0469CEFF0B7A ; libaacs -0xA7A7F189CD81154927967BA37A7A08E2C33C7956 = _NONAME_ | V | 0xD84BF1A65E4FBB4AB4141B53A3C2D321 ; libaacs -0x01A804EA698D18B679DED7F323E23B214DC854E6 = _NONAME_ | V | 0x4EFB6D72E10B4FEF59F5A2E5D548F4CB ; libaacs -0xC7B8F182B310A965B4C7F6CE893D1EF606FE10B0 = _NONAME_ | V | 0x875D5EB56A0FA66239BF3DAF6FFB82E3 ; libaacs -0x98D285B3772BCBE71892F5FC6B01C41D4EDE3A28 = _NONAME_ | V | 0xC952F4BE7FF71A0DF236CAD5D5EB62D5 ; libaacs -0xB56FD0238478620387F5D41C22236AF0F69EC39A = _NONAME_ | V | 0xCB42242E0FD66AA7858222153CAB644E ; libaacs -0x8ECE198EE7CCD87F9E46A985B7D72C230C7685E5 = _NONAME_ | V | 0xDC43BE1DA357AEB7203CBFBBDB7A32F0 ; libaacs -0x5EB23CCB790788A1FCB29B0E8E2329EC7B652701 = _NONAME_ | V | 0xEBEAAEA51D69C241D34B4286C256F339 ; libaacs -0x1D76674B01803BB01DD60B2583658794E1FE4ADC = _NONAME_ | V | 0x7122E6B8A337FD315E9FB8541B724E8A ; libaacs -0x5984C834BF991FF35C9F1306E714EE53FC79E67C = _NONAME_ | V | 0x9D17C9E29C1E90B32A4495B2BFC824D3 ; libaacs -0xAE5517BD19777AA5001C4958B4F6AFFF3E205F27 = _NONAME_ | V | 0x9DBA58E4DD0B2892B29DD18AB5405338 ; libaacs -0xB36FE5748A689220124BC5956FA85D4337BDAE94 = _NONAME_ | V | 0x35D939BDA85E69BE69BC9B5DE3D3C0BB ; libaacs -0xCEE394B50918B6B4635DB4881CAC179473403DED = _NONAME_ | V | 0x23F396CF89D92EAEF072893E4A6DBA0F ; libaacs -0x2495C1095FEBEAC83A563EAA5DDB8BA9854B81DF = _NONAME_ | V | 0xAD9653A3BA05CD0E9530EFE76EC7CBC5 ; libaacs -0x6B065D9629DB62BBC25C045843C1739F45A64830 = _NONAME_ | V | 0x45723B6AA7EF004BA1E4B72A33FA1941 ; libaacs -0x24201DC1A0760E41FFDDFA88E1E9067C5DC9934D = _NONAME_ | V | 0x837DAD9E72668B7F55AE8B191EFBF7D9 ; libaacs -0xC8917EF5F5F4BAFA0986E734855C5D631908FA22 = _NONAME_ | V | 0xB7BA17170F87B557A069ABB91C52DEE9 ; libaacs -0x8F700045AB3D29905FE62C53544B41DA985D3116 = _NONAME_ | V | 0x0C70B1CF6FB871CB1968001E660E4178 ; libaacs -0xA7DC20B1AA624DDAA93883E84C8E7484E4F9DFCA = _NONAME_ | V | 0x1E230810210D7737474AF600061A6954 ; libaacs -0xEA4F54C050C4718AD5EEEEEBEE393D52B78F9A7C = _NONAME_ | V | 0xCD7E2AE3290A8E3736DC7E65649905F5 ; libaacs -0x6A8C4C791BB64E0542593565AFE8AC815DDE9A03 = _NONAME_ | V | 0xC2C12A60DF35A1C106C907F7608EDD4C ; libaacs -0x5FE4D72F5EEF0DA5D32C4E8EE45F13F1884242FE = _NONAME_ | V | 0x1AE2837BC6E2A44D02BBF073474BDAE9 ; libaacs -0x16BF1D1C7B98F235B38EB6B090D020B23AE900C8 = _NONAME_ | V | 0x940D8582E24274F32D4213A4A27013A2 ; libaacs -0x54866CA0616AE91FED8956E86D43CC51FDE1C85F = _NONAME_ | V | 0x9F9E64D8F595B624A60FCC01BC012137 ; libaacs -0x9AF53EA1C263BAB6E5CF91DF6DCF97B99EDBCFF3 = _NONAME_ | V | 0x0C66C78B1D41447DC4C29B37AA017941 ; libaacs -0x06649F0AA32CFCE4B8F7566CDAB94E924B88D27C = _NONAME_ | V | 0x4DA1891E88AD0D60F629C5705787E811 ; libaacs -0x14526B2C6FAC1D0081E422F4D7B7FB834EDE8334 = _NONAME_ | V | 0xCA77486A3B5579E8EB31F02C83A90F78 ; libaacs -0xD812D8E3D01515758861E1A5AC3E2D049C0120B5 = _NONAME_ | V | 0x3322BBD381CBEBF8A3107AE77B2F6285 ; libaacs -0xBAA27720CA2686A3441B2CF0A8E0FB6181117313 = _NONAME_ | V | 0x4A810C8C648F3C085B1A799DC5414F95 ; libaacs -0xC8C148D65058E1881A0BE0EFFAE10CCB3E70F6AF = _NONAME_ | V | 0x6132C6DD3493E51DAEE27491C22E4158 ; libaacs -0xDE3F21858B828D285A06D73887A00E10C154E451 = _NONAME_ | V | 0x1459BB4BAD8A8BEAECC9B04D0C98F8B6 ; libaacs -0x01C549F37288383B9F5D2CE7646A8CC1D055C365 = _NONAME_ | V | 0xF2A7D16416C01C4653A52591C1EE1BDE ; libaacs -0x60D506990503BB2286C99411964F9316A6E2248A = _NONAME_ | V | 0xEE092C62C78B69DD08A78AE413B38832 ; libaacs -0xA27B50D4D33462B66384D10D97B1B9739AE695EA = _NONAME_ | V | 0x89C879155C5089393DAC70DC9F7B8197 ; libaacs -0xF0D4E6080DDD5C35E95257871FD1B441C0DA5496 = _NONAME_ | V | 0xB1F237DF733EC1480340FC535BC1AD11 ; libaacs -0xFA1DC26598EC2E5F6CEE9834004A8DC58BFA375E = _NONAME_ | V | 0xF8E13CBD634C79744F4336346040919D ; libaacs -0xA99241C8A437CD790FD54BEE49BF879D7AB04D4B = _NONAME_ | V | 0xFA8F1393CD465AB7CBFEA06CD4436A07 ; libaacs -0x400E90124C748CF2B4D830402C5F0644DE698602 = _NONAME_ | V | 0x6B357A9592681415E4493222632A4FC2 ; libaacs -0xCC8A3BDCCA10307A741E17C2C6D2BB77E10BEB6D = _NONAME_ | V | 0xE1BCEB54187B3CD9E1601A2BE00AEE2D ; libaacs -0x3E4E3625A2132DA7898560A076CA2ECEE27FD24F = _NONAME_ | V | 0x94DBCBB8F025DFAAB40BF0E8B6D230A4 ; libaacs -0x3C4E73FEE6AF353DE2538F33E8D0DBE72A555D7D = _NONAME_ | V | 0x86338C285952A345CAE69EADDFF2C52E ; libaacs -0xFD355F525B7CBEDB2EFD1036C3B8300ABCF9C8C3 = _NONAME_ | V | 0xA8A4323F2CBC5F8CCCAEC418318EA093 ; libaacs -0xEC7BF1D338D5FA8A6AC2B974F7CC37D7AADA869B = _NONAME_ | V | 0xAB0FD39CAE78228D28871CC3A421F333 ; libaacs -0x3F55E30A0B6A20F075FBB3F2F95456E207F50B2C = _NONAME_ | V | 0xEEAB97A7CF908F8DA8ADA647CB488AB7 ; libaacs -0x744E84BE55D270E81AFB0401FA55AADBF9145E42 = _NONAME_ | V | 0x16CC3EB3BE00F997CF1782C5EDF57BFA ; libaacs -0xE1D537241B67C74C40DDC099C32BCA6182119E6B = _NONAME_ | V | 0xE6C06EDE0B337AE673EB72B0ED75D43D ; libaacs -0x0A45B3D2ED6863B50DFC8DE0D76A2433EB65AA59 = _NONAME_ | V | 0x637DBC6F61A45471B5512FE851F1BD8B ; libaacs -0xD4ADA3AF16BA3139592A238073ED74BD247C3613 = _NONAME_ | V | 0x17F2C890F797AF25D09087654F431F4C ; libaacs -0x5480B6381BA35ACC303E47201B9AF2E34F6BAA6D = _NONAME_ | V | 0x288F1657FE98659BD80CB9CFB9E3A47C ; libaacs -0xFADD95CCA012E09B6C0C52BFD82CE658AA467534 = _NONAME_ | V | 0x5492EFF202C1A6E603FE6E06ECF07E78 ; libaacs -0x0C65E927E82A268C123B375C649B32C9D43FECF1 = _NONAME_ | V | 0x17383188280EF0E0F0EFDBC360450B5B ; libaacs -0x0DD4D712ABA526357FBDA7350C732987BFCB9A38 = _NONAME_ | V | 0x3AB1E077C9C65C082B0B72A4C078CB90 ; libaacs -0xBAF7D3749E619A88283904C615C8A198B56EF293 = _NONAME_ | V | 0x3C5F06C96DF03118EAF0AE276F4562CF ; libaacs -0xD49099CCDF9D81A00205CCFC77FE6AF5327D57D0 = _NONAME_ | V | 0x7FDC2640CDB53C1D229BE7C19707C30B ; libaacs -0x4F8FD65A1DCE2D39AADCBF42263CDCC611012CAD = _NONAME_ | V | 0xA8B49A2402AC95465BA51B9606237262 ; libaacs -0x589967D7FC101459762FA82BC04D93E5B20FE2C1 = _NONAME_ | V | 0xD5057A66EABEA9BABC507A44C885EECE ; libaacs -0x8709D0B8F9922B0E12731824A54F5B13E8D36AD9 = _NONAME_ | V | 0xF22674A888B88079C70D7B5D7053D206 ; libaacs -0x5D7D6A53F1342B49AFC43669D8C70F9E782BCD38 = _NONAME_ | V | 0xDF0D2BBE5D6019B1DA22473C3D6EFB7C ; libaacs -0x6714AA4ECB2CB60E8C1B353F4C6C5FB8625B0DCE = _NONAME_ | V | 0xED1340E3CF281FCAA395CDA4A2D5B2B3 ; libaacs -0x5162112E3C8994DF6528005327DD9E4174E92ABB = _NONAME_ | V | 0x7D2E9F4A9307A80ECD33F9101AE18E67 ; libaacs -0x26BDD72266E5A1BBDEC0427825388E02037186BF = _NONAME_ | V | 0xE73CD0DAA7D33F661E09EB2BD0037A33 ; libaacs -0xA711A45891C118CE393B848A2A5AA81D5493C9CF = _NONAME_ | V | 0x5570D9A3005EEFC1D74484F26A872986 ; libaacs -0xB7ED61F5BA0905D18A0FFA9227B0C46C7C54B47A = _NONAME_ | V | 0x459B6EADB000A5E6DAAD965F5AC4C60E ; libaacs -0xFD2EA8E863D8AA05D10B512CC2300E60E728FD14 = _NONAME_ | V | 0xBA9F08C290EB6D0AA831A2A0D1BCBCF2 ; libaacs -0x985DADD85AAF9E98E49D82BB1493FF3B98EBF5D7 = _NONAME_ | V | 0xB78F53D8F352F9262E155651A8292DC5 ; libaacs -0xC025D11873683499BB09D535BA89D7277479A5DD = _NONAME_ | V | 0x1EA0C3E00E9F1B7364B621B79B806243 ; libaacs -0x858DF38514BA2525EE8962AE85720F868FB1ACE4 = _NONAME_ | V | 0x157AF4F04338222D0C31335F1A4EBB28 ; libaacs -0xCCA88A35227466DAF88322D584AB7034A39775DC = _NONAME_ | V | 0x6F52F09D45F978BD13925E9B043C120D ; libaacs -0xAEFD3D3E12D746C28D260BD99151D7970DD0E071 = _NONAME_ | V | 0x39F8221EED757C3CB87E6BAC809AABAC ; libaacs -0x18E5B4DA65414E3B973AFBF370F3E24CE509289F = _NONAME_ | V | 0xB3EFD82095BD8334DA0FEC6ADDACB1C2 ; libaacs -0x913AD59ECEF1742E246130227B9D8A1957620A75 = _NONAME_ | V | 0x157CECFE6722483EDA6FAD02709E3533 ; libaacs -0x60C1B7F737C8AC6D759571E23341454701AA2E2A = _NONAME_ | V | 0x14D5542789871F828F4193876E0F716A ; libaacs -0xFAFA8F6591841217DA3D3FA79A7F0D8EC576974C = _NONAME_ | V | 0x8FB1B2C79233BF6418852350A3C522F2 ; libaacs -0x4DDF109FF181252BC144307E8C1DE6ACB6F7BEA2 = _NONAME_ | V | 0xBC9393B0A42404ABE7BC790E6161A83E ; libaacs -0xEFA88B9E02C53FF21B2C682F6733320DA6F7BFCA = _NONAME_ | V | 0x270DD35737752A0992BF20CACF392004 ; libaacs -0x63D59F3A72E4AAEEAEA52E7D610CA091670E45FA = _NONAME_ | V | 0x272DFAE4259927072B24FE33215654CA ; libaacs -0xE6C082609A5CCB3E2B1A7286DB8E60D4AFD806F3 = _NONAME_ | V | 0xFB13A91B5163C48D74202E568066DB0E ; libaacs -0x9CA3AA25FEBB05D33D817D1C7CEF3EF5FD928940 = _NONAME_ | V | 0x0F539F60B8F03ED7C995260C7DCC3D71 ; libaacs -0x00F063D6D67737BD604EBB05DD818A8F4B62B468 = _NONAME_ | V | 0xB106F3A7903A771F305C0987F42CB08A ; libaacs -0x1F08ED5CC6FB9C4AC12F057993B7C293BEF8A14D = _NONAME_ | V | 0x48671D130C55D989843FC8097D9D0CB1 ; libaacs -0x6DD5B8C1FE970F98FEFF1B9EC379F78EE66F0D36 = _NONAME_ | V | 0x32E3591D3DCFA3B9CEB4F2903F526BCF ; libaacs -0xC4586B1B5B814F91939007818E2215F462D7F542 = _NONAME_ | V | 0xC963EB0BB6A7BE6D52B042C01D34DDA9 ; libaacs -0x116675F5CFD96945678B2E4B9031E93202827C9A = _NONAME_ | V | 0x05C72F82781E5D4E16B6B4237475B4D8 ; libaacs -0xCD255FD1B1415E0D87BA8BCC5C11596A42E16402 = _NONAME_ | V | 0x1D933EFB574C619C4F559829992160EE ; libaacs -0x59CA3117FF70F6555F7895FC222880C7051E1764 = _NONAME_ | V | 0xDE857E5F49A7BF3D506EE4540540EAAC ; libaacs -0x9E7C1CEBD8C862C8668DA692A3DD958E3BE83F66 = _NONAME_ | V | 0x480187436B5F8D30DD611E7C005F33DA ; libaacs -0x5CAE7B23E5D0C0149701978CD554925D23133926 = _NONAME_ | V | 0xF7D78349AD9A07E19B4BBFCE2262F415 ; libaacs -0xB4190D098536A62BF73C5821D35B89C4EDF6D925 = _NONAME_ | V | 0xD5AF0114D111E29607F3C27339F7EC9E ; libaacs -0x30973863AB258CE4FF82A2EE8D028836E46888F5 = _NONAME_ | V | 0xEB3C31EA1B77F2A3187ECF1B0D03A6B5 ; libaacs -0x211F4B895634001112D2AF3349DD25839E08BD81 = _NONAME_ | V | 0x07B5AFF52171053EBE92177583018E94 ; libaacs -0x552CC4F72D7A819D960C3F67FBAD18019BB2F663 = _NONAME_ | V | 0xB48E8EE4CAF929F0E59F62A4C3F1A700 ; libaacs -0x0663544ABDA7075CC2701D63EE5E634FADA99ECE = _NONAME_ | V | 0x5E88B7D13EB1520038916EF8F26B0752 ; libaacs -0x67226593A7F39BD2A3911FCAB7BE18B927936E14 = _NONAME_ | V | 0x790711573E2ED1635FEECBD95B137A64 ; libaacs -0x6D72A0BAB0C99F7368E68F19DBA5952FBAFB25DA = _NONAME_ | V | 0xFBE00045BC359B394CC336A1D91CD3D9 ; libaacs -0xA1AE628CDBF6C85C81E0EDEADF1FFF9A44418658 = _NONAME_ | V | 0xA47C2D6B0AB747CD4A3D980CB7ECB30B ; libaacs -0x947004694709A59D0C5A1ACC381EA8B4C5B71427 = _NONAME_ | V | 0x0A9E10959D87513FE9FE7A6DE7314BA9 ; libaacs -0xB6EB17BD08330A4F2D67EAAB3E889170916D18FE = _NONAME_ | V | 0x5421D450D63F4F7CD46AF883B8C7CABB ; libaacs -0x1794FF683A1DF691A729A0C06752B0333D196489 = _NONAME_ | V | 0x9FC0F9FA6D2295AF2A34BDE0D8EB08FF ; libaacs -0xC1EBDFD50E5E54AE4CAA2F226F534DCEBBCC51CB = _NONAME_ | V | 0x79BBD3B83A0321BE2F35715BAF8DFD8C ; libaacs -0x15A2317C58BF7077F951997EA8D0AFDFF0EA6447 = _NONAME_ | V | 0x2626D69C85843472F101AFB981EE29A8 ; libaacs -0xA8FEE20015200427CEB6E64CD2D292ADDD0B405B = _NONAME_ | V | 0x44D9F797E8E7AC9F2E2866CE0CFF223A ; libaacs -0x5EED480101BB628C39A1CC27A2D12CA26913E5C7 = _NONAME_ | V | 0xC298BD59CB111C3C38CE9C106AE6CE7F ; libaacs -0x2E19458038F18161C024EA5665CDDE6715E0189B = _NONAME_ | V | 0x905B1E6ED38CCBA03D890D83159D7C67 ; libaacs -0x1599D34F4A7D1F7664E039BDD796CF980039F5E3 = _NONAME_ | V | 0x67321D302D503DD0FDA542AC558C3586 ; libaacs -0xF02F494B35083328BFBB73AD953F11DF833BCBC3 = _NONAME_ | V | 0x9914014DA81CD7267990B3FBD95AC6B9 ; libaacs -0xF465793E5804DE1DA6BCD3D65CF889174FBE21B4 = _NONAME_ | V | 0x07CD073A3B56E5EC170EB22AF52877C3 ; libaacs -0x0FEA072F8161E12EE6859D556707EEC519512BE1 = _NONAME_ | V | 0x6A299B5B62557FD8070D14FB3428AA9D ; libaacs -0x25B7CE0E8C9FCD3A71F721FAFC2036501E464D78 = _NONAME_ | V | 0x524F13854D619B526C3743216D25A09D ; libaacs -0xA7CF0E04314024B38478FA9ED2EACF83B876D02A = _NONAME_ | V | 0x096F1824980DE68461D9F6CE645CF613 ; libaacs -0xA926CBC75AFEAA6D3D5381E7F8E18CF2EE2861B9 = _NONAME_ | V | 0xFC4D9B2247B78A482704A696CF672B14 ; libaacs -0xB87749AC0CD2F2D5B74FA581B97025D954CB0E94 = _NONAME_ | V | 0x8441596A7C1F18415E2442E12171C2C5 ; libaacs -0xC57A1BEBF2CDC505BB1457A43A6B455367350F7E = _NONAME_ | V | 0x5373CC07BB30D307EC6FABB6B7BA4AA4 ; libaacs -0x36F71D417B613AFAC71AC171F1DBAB1BEE938109 = _NONAME_ | V | 0x57FECD02B5582BA3D715CAFA81FB61EC ; libaacs -0x520DF2799EF4DB2C755A00EA822CDD479FD30D02 = _NONAME_ | V | 0x23700B7E60EE6D816D430218ADEF4497 ; libaacs -0x4FC42ABC74E5C1DC98074918E6A32E0BC8B04333 = _NONAME_ | V | 0x6D4B2B20FBB7183F2151100336D6300A ; libaacs -0x1BA7BEE35D48252690CAFC636CD4131635B64DEA = _NONAME_ | V | 0xE94AA0E12B1B5C5A23821791AF032FB2 ; libaacs -0x910C043346065C0F0E6CC9ED2ED2007932FE0BFE = _NONAME_ | V | 0xA58FF6B1B0EFA363212B067E9F24CD76 ; libaacs -0x78E9F11591E3E592189C5F7F520D803A303D2708 = _NONAME_ | V | 0xC5098FC0305A376E8CCC620DD9DE0520 ; libaacs -0xD8F6F72A511F5604B0C2F2964642188C88F63A61 = _NONAME_ | V | 0x8F53C87AC14665CC1B411F266A6ECA63 ; libaacs -0x7B8C2585647ADE2408D27F5F60B874581AA5BCF9 = _NONAME_ | V | 0x2DC40E5BDF95B6B28D39FAB0ACD79B6A ; libaacs -0x8FE1E4A0EDABF59D56B3365570B9125F6EADB282 = _NONAME_ | V | 0x12174A1B34A0463F666E1C2530FD6EB0 ; libaacs -0x88D909006098884FCB2AAFC6E1A6287F48B86C9E = _NONAME_ | V | 0x98E5FEB355D757A51B42977047B4543D ; libaacs -0x96DF7661293A48DFFC788F29262D2462424C8CDF = _NONAME_ | V | 0x5D8ABAEFC48D1FEBD74DA559FAFA4E05 ; libaacs -0xF093771A07426787288B9D0E684E60B02AF46064 = _NONAME_ | V | 0x816B7B04138D27F74B00D31D19190E63 ; libaacs -0x62A9D589409F0CA093AB11971943B17E0597F4F3 = _NONAME_ | V | 0x0482E3E8C84689CF773C63D62D75B4EC ; libaacs -0x07E486B08796F0855946CE6E6A1D51AD02DF1EBC = _NONAME_ | V | 0xF473CAC818DD7A1802C2E0B4C18BC703 ; libaacs -0x7D58E0A3A5C94C71CC54919DCA601461E012A0A5 = _NONAME_ | V | 0xB04A16A139A66CD4F8BA10226ADF027C ; libaacs -0xA16F68EA9C7A26E7FE24A4EDCFC2BE739B4CB5DE = _NONAME_ | V | 0xD8B8506F4645BE06B0AD04E57D7FE49A ; libaacs -0xF48465D595545A8B5E2109DD5294B69B2026B01C = _NONAME_ | V | 0xECF260EB4454C10209BCD6CB97D67CF3 ; libaacs -0xC0C5097D706BF0E5326DD2986AAC0D105C077615 = _NONAME_ | V | 0xE18A978A89241B69956B74A743C43100 ; libaacs -0xEFC84874A8700EB54AFDCC8E8C57A8FAC779A166 = _NONAME_ | V | 0xD4847D654262D5FFBB1CDA64EDD2F972 ; libaacs -0x4CC36362D1457824D136CD4DA382EC7069A0E491 = _NONAME_ | V | 0xF87587D7A1B7A6D3316448CFACC375D0 ; libaacs -0x5981974FBB92352576FB24B492C5A623060FE8BE = _NONAME_ | V | 0x7C60AB8FCD098AE1BCB00D1B4987AEB3 ; libaacs -0x5DF89219882D671DFF22A42974AB2BD744AF9B66 = _NONAME_ | V | 0x1F1EEB21F7141E117D790E68A2B46DD7 ; libaacs -0x687F7EA962D3500FF5E8FA855A3654DE287F764E = _NONAME_ | V | 0xF750979CDBA192AB264142D15A6E7C0E ; libaacs -0xDC1760805B6DAB2F4F936D5886FB61E9A217EA37 = _NONAME_ | V | 0x8144ACD0A42A5BD36D1ECA3BEDF25E0A ; libaacs -0xE2A063FD651D98CAD40DE550139BB6654FE6D0DA = _NONAME_ | V | 0x89E619F88C1A14F4C8760B67671970DA ; libaacs -0xFC28AE9EC3F63F9FE0A83DE221FE7BB574C0A3DC = _NONAME_ | V | 0x4CE6247BD27E9728174ABC4D9A7A4B99 ; libaacs -0xFDA0005B9B49C90D31A3B6E961CFCEDA4C1CFC51 = _NONAME_ | V | 0xAA4E7F6440C8175ABC42F3B80930BD70 ; libaacs -0x4F2BBA69D1D3384FEF0EBA0BE17EFAA8B235FBE3 = _NONAME_ | V | 0x8541DF8C72CF6AB8B8042CE8C60F3123 ; libaacs -0x16A3F821C77E81A6F0EB9B0BDFCC56AEA1200E0C = _NONAME_ | V | 0x6279D86AB7BC0907F822C4EB4FB813D8 ; libaacs -0xE24CC82C250B93AC9A73708EF03B9F3D32CF0221 = _NONAME_ | V | 0x471E0D3B65066B3FD4953BBF04B30EC2 ; libaacs -0x7284F2E069EBDE676684A63684EEF7FEDABA5EB7 = _NONAME_ | V | 0xFDDA1D721F4C03A082844F9A42A4C3F5 ; libaacs -0x7A75C24471344CE863A491462B91F5C2B536468B = _NONAME_ | V | 0x82C38C5E3B098BF53A696AD15B236029 ; libaacs -0x3171D6A055EAFD88F944D3EFA633C2DBE94C8D7F = _NONAME_ | V | 0x74A981D239C05BA69F2177D2C45D3D78 ; libaacs -0xAC6AD95F1EDFB8D623B7133E55FF0EF50091AE70 = _NONAME_ | V | 0x14362A5C961427D745BE4B1CCC8B8B9E ; libaacs -0x99F14182F665A3C572A09C0C3CCC4F38658189E3 = _NONAME_ | V | 0xF2590D448754902BFFDA517E278F9D98 ; libaacs -0x5D43807C709EA3F232B89B13076198690326A7B9 = _NONAME_ | V | 0xA208F583FBBF48A54A56521D8803151C ; libaacs -0xD8B8F530768BE7254FBE165D5258FA6A178CD45E = _NONAME_ | V | 0x80BD15B0AF44BC0678EFD86A7EB8BF55 ; libaacs -0x6532FEC88BD3A4F808ED89AA711987DE4FAFFB53 = _NONAME_ | V | 0x3526AE4359A9D0AF7E9603DF927D7F1A ; libaacs -0x581F45C5769A5C6DF2F734E22999E3F32FBA33D6 = _NONAME_ | V | 0xAA92EFECF84F58E296E473620477BF78 ; libaacs -0xA5EF92C5F208D4875D08C613E27B57203C842322 = _NONAME_ | V | 0x0600598FF91517BF0B1424F8082FFD6A ; libaacs -0xB76E82A9ED6FA6775CF04CBEDE499CC8587ED5EA = _NONAME_ | V | 0xE991A609153BEAE1859CF8F2FD9F05B2 ; libaacs -0x11B17E081A99C94536BBCD201F41F51807BD1D9B = _NONAME_ | V | 0x3EDB99F4F8477EFE57FA22E3EB1F7F86 ; libaacs -0x99589100428D2A02AA32230AD5A9EBCBC9920D89 = _NONAME_ | V | 0x37814231357B04E5102F8D45F9E29576 ; libaacs -0x9ED39E3D22DEF022C1696B2F26EB399B562F1987 = _NONAME_ | V | 0x8E6C61812D1359FCC2713BAC6D1A7364 ; libaacs -0xAF1ECEFB1BEAD622599E1CDEE317E4292093091B = _NONAME_ | V | 0x1A53926792A328FAE7A2F5EA0AF37D91 ; libaacs -0xB919F8B9791866811B4C4BF53EBAB0A96C3DECA8 = _NONAME_ | V | 0x16956437B25E47BCA0C7B210712F135F ; libaacs -0xBDF5C555011ADC81E61B333714AE7FDB98599D93 = _NONAME_ | V | 0xD53B19BAFB3CD60889C5EEDAF3F3CCFC ; libaacs -0xC3910CBF657B0A21282C7F8B784D326870F86181 = _NONAME_ | V | 0xE2F64AD78D677AB609022286775CB994 ; libaacs -0xC7C40A3AD10CF779171A07591C2E8EF7AAB4729F = _NONAME_ | V | 0x050CBC9962337D869D30A9D89709097B ; libaacs -0xCE2360F176777002ED7EE4AD3B146881D4286946 = _NONAME_ | V | 0x217FD9187C8D8011DFAF66597B51D555 ; libaacs -0xD961C65A5163A12B6BFFFEC3CAF7787A281DD878 = _NONAME_ | V | 0x30F2D1B2E021553DF1A0C4A4831E810D ; libaacs -0xE045F34143F1B5ACB9FBA6DAB5AEED4357483FEF = _NONAME_ | V | 0x6E7D57EE81038F18A22CE8832859E674 ; libaacs -0x92C56302DE13CF1EE4354B35A9367F1FA47E1FA3 = _NONAME_ | V | 0xB80178AC98FD6FBED36D81D5ED891F82 ; libaacs -0x8612C7CD4FF1BA8186DB6DA36C316D76290042FE = _NONAME_ | V | 0x2A5BEC8AA7D3F80BA858329C469D7F71 ; libaacs -0x83590BCE81741891F377D62D2FA6666EB896BB34 = _NONAME_ | V | 0x7854E6C3468E4C7D0386662A55070DD8 ; libaacs -0x1D91A55B6092240141AB628CCC98120833585825 = _NONAME_ | V | 0x2AB4846AB33B718EC9669E83191429D0 ; libaacs -0x22A8255475E91B432E109F097AD8ED5A8B3E7901 = _NONAME_ | V | 0xFCBDA81FC193AE5FE9798F2DFF75F291 ; libaacs -0x2A9F5C84319FAB519E51F35505EE62F16CA1CBE1 = _NONAME_ | V | 0x865E16E043F044E3A9BC82BAD0828277 ; libaacs -0x2E441E934F8F19F9ADC2DA492D1238A92571A47A = _NONAME_ | V | 0x55D6F0E71016E8191A0E11F3262DA64C ; libaacs -0x31438928298743F13B6B6645B7BD315EE5ED27EB = _NONAME_ | V | 0x03BDDE8DCE0FF92EAEB055D7C0582092 ; libaacs -0x49B2FE9ADDE4A704F8E34F3CE1F24B95B250E864 = _NONAME_ | V | 0x9695520EF8D955683F210D8D1A6624CB ; libaacs -0x50C38D2EF2EDBFA76F4F4A22040D8C446A384303 = _NONAME_ | V | 0x347CD3A3E52334599C446E84B9D83192 ; libaacs -0x50F35D250FE73A382A8C5E815EADB3C5F9FAAC0D = _NONAME_ | V | 0xA1246737CBD9582E4E78F84A48226A87 ; libaacs -0x5C01108BFF81A8C419A3E312458073EF67BB5959 = _NONAME_ | V | 0x0F79F71EB554465FB10E061130E49E86 ; libaacs -0x82A573F1816562A5D73CD971033F905993B53D32 = _NONAME_ | V | 0x9E2105CB189CA7FC380B5E0C1B8A59CF ; libaacs -0xE20109AD8DE7483D6FE061A68F5DFEE29CD6E9F3 = _NONAME_ | V | 0x755FF830473B64E61543BA86B32AEBBC ; libaacs -0xE3E015CE3D8EF87DA7D30013F07C77A58B212763 = _NONAME_ | V | 0x98783ACDDCBB3C30037743291CECD903 ; libaacs -0x16DEEF5409CF3D73E4783BF7D6C6B951CFF3486A = _NONAME_ | V | 0x512969E24373276B806122D83EBB4A14 ; libaacs -0x484E3DCFAD8AC0EEB2722A0BA8159FD00C8DB682 = _NONAME_ | V | 0x1654CA6D8DB1F59290BA8E620BB358A9 ; libaacs -0x94CFA10081D53C96597B5DABC7AE990BFEE5950C = _NONAME_ | V | 0x1D5594A925FB08F3B88787B86A86841C ; libaacs -0xE79028A1C9DEDDE8402E3C772636D84CE30462C9 = _NONAME_ | V | 0x2420CA57BF9FDE79C2493AC20A662F8A ; libaacs -0xB738C09B6512FCC112C2A96E92F8F840CD328197 = _NONAME_ | V | 0xBF0460CAE198685DB91E1EC7C1A7E783 ; libaacs -0x4440EED1A59DBF688438629DD9F14F6E7C5494A0 = _NONAME_ | V | 0xEB5025F39A0A7F7B73FAE5FC26EEA53F ; libaacs -0x4CBCD10AC542C4F582086B02A4EA2855CEC08032 = _NONAME_ | V | 0x59D11B3AA96CD7CB35A576C086EFE512 ; libaacs -0x9B28F14784A597B6102C74BAE3935126DD03165A = _NONAME_ | V | 0x818132A1968934737D87C98848E8AF7F ; libaacs -0xEE4CC4AA7F3318103655A9E6E2ED746C832A14D0 = _NONAME_ | V | 0x336CCAEF9AE782A8C63082750E329602 ; libaacs -0xDC3ABCEFB50C4ECABC401070DFD5DC5074B70BBD = _NONAME_ | V | 0x1104394A3DEA0835A171210F8FC53809 ; libaacs -0xD9273278F4C1647F97CD68AF95A6CF6DA884F58E = _NONAME_ | V | 0x6B4FD0000F63A9D4A121AFC94F1C084D ; libaacs -0x76BC9106863270015C8B762ACD4C4B294E7FFFE1 = _NONAME_ | V | 0xD4D93632CA5F6C0CA0A29A98DDE43297 ; libaacs -0xFA58E3C3FB862D0EA9A8289227C09D9313C1596F = _NONAME_ | V | 0xF71337E437E2A991E2BC3975B6897963 ; libaacs -0x838B503076B1C563B9880714F8C124E9FDB7D374 = _NONAME_ | V | 0x5450A993DDB99696B83CEEEBB14756DD ; libaacs -0xA4A7FBAC42001E9AA83DB28B9A217BAE3375B3DA = _NONAME_ | V | 0x2E3DB4F98833E87B21EE77C903E665A8 ; libaacs -0xEB7428EEEC3D5CD55C73ACFA1D9D94120827C493 = _NONAME_ | V | 0x889E277595545AA55390D9BAD29E8FD6 ; libaacs -0x29B85C367A4944623B0422636A5C80045E474B23 = _NONAME_ | V | 0xE760308BAEF3C008A799F6F771254CC3 ; libaacs -0xD56A6267965B7E6020BC255437450C89D017D915 = _NONAME_ | V | 0x91E0AF66006A353F2291C5B0CDD6C06F ; libaacs -0x58288FDC589DBC065E3829EEEE5918DE7740097C = _NONAME_ | V | 0x0D9800A36BC2CA59DBBD64E3C5E8C21D ; libaacs -0xCD56FDDD42E261025E8DC141F9ABD2A2E3543921 = _NONAME_ | V | 0x5FD76116790BCF432670236961FE3DA4 ; libaacs -0x1114F2AECABC0E32FA3B1E400D20B84F2B23C001 = _NONAME_ | V | 0xBEB4DFE9E8EA27647A7D9BCD1A086AC4 ; libaacs -0xC044FBB52C2E4343FD578471E3F1B13116382641 = _NONAME_ | V | 0x3C0E328225F521740BBC176FED06FC67 ; libaacs -0x93F60518BD2DAD4E91C3D20139A7A36F5C11A57A = _NONAME_ | V | 0x9FCF4AEFD5242724040E792F24A69D65 ; libaacs -0xE4A19FE2D58E7507645611A786F5E1C2D4C1CD18 = _NONAME_ | V | 0xA6B40C1B3BDCA64181AE76ADE58000B1 ; libaacs -0xB0DBDB0086BF5A4D8B4842C09581B3C498485A5F = _NONAME_ | V | 0x1A23416403BEE513BAAE6EA9DD49601B ; libaacs -0x11769CA0FA741D692C420C0EEC0EC7491E39080C = _NONAME_ | V | 0x2077A29DE30155DD586AD7B4D34125AE ; libaacs -0x3029E1EF766A394CC915D7A409675723325BB964 = _NONAME_ | V | 0x6DB1E105563C640652E23346D503B754 ; libaacs -0xF4CD2E4E4FB0D69F849ECF0F85A1EB64F49411AF = _NONAME_ | V | 0x8C32408090980F07E6C9F6B84E147D2F ; libaacs -0x1B46DECE88F9F45B22207D32CD5028F9795833B7 = _NONAME_ | V | 0x509B27A12286C4FB0625240168DEA6AE ; libaacs -0x2A76CA52DD1ABE8A175D9D2490DB5750DD0B6AF5 = _NONAME_ | V | 0xCC9512A7331D8070F4B753140E92AE1D ; libaacs -0x469A3900EC4C6380DFA5A3F13F8898C9EF3145DC = _NONAME_ | V | 0xDB7BB56F761F6F06B21C71888F98B918 ; libaacs -0xACCD305BB829535167D85A361EC9BCA0B1FE44D1 = _NONAME_ | V | 0xC0DD5FB7F3E2759118AA6AD8995F4E33 ; libaacs -0xD0B0D7BC96ED59285C134FCA66A432B0770175CF = _NONAME_ | V | 0x66CE67E4D51BE88833B6492CC5FE99B8 ; libaacs -0xFC15F674464FC2A4B994225C57149D9BB205D89F = _NONAME_ | V | 0xC856448F33BA8A788B525DF37A1C136D ; libaacs -0x540AB712EF1B02D0DECEC1B311D71B0412B81A91 = _NONAME_ | V | 0x9D296CC6F5665A860E787848636000FB ; libaacs -0x07C8DB89E93BB2C0318C17FCAFE04ACCA593E10B = _NONAME_ | V | 0x33AC3683CD89D76F1CC7EEF6FB9F18CF ; libaacs -0xA24C127007767E8A9951290DA2B0CAF63013977B = _NONAME_ | V | 0xC2453B4A4985F28A0A1208D0C71250A9 ; libaacs -0xD77AD8F778D983FE31CFA42C2BA910B4BD8B015B = _NONAME_ | V | 0xA3C20F9BB107479FA4F5EBCDA98DF2A2 ; libaacs -0xF103769992176136C2D45600EBF1CDFC36CC22D6 = _NONAME_ | V | 0x05721A9AB0A1941BEDC2ADC9B9142DFA ; libaacs -0x645A6A34ED4AE7237B36A55D3684DE576BF554A7 = _NONAME_ | V | 0xEAEC028E7063608D6B0BDBF524B8D322 ; libaacs -0x7AF4BB22DB83C66AEA83A8B886D20FF73B46EC48 = _NONAME_ | V | 0xFEC1F09213C17652EA66AF8F04C33FC1 ; libaacs -0x92FA6CFA50A6EA235A31EC3D98AC2F607A17B6CA = _NONAME_ | V | 0xAB52468274ECCBB383CAD0899F89024E ; libaacs -0x534D132E3A3FCB26EE58660261D1A85D34BD43E2 = _NONAME_ | V | 0xCB1D96918B2A12A41430576815FD2A7D ; libaacs -0xFA28FD4277CF6A06734220DC24B279705952B61E = _NONAME_ | V | 0x3664BB292A21D3F3C7AE0D4B7707D67B ; libaacs -0xFA7BABD0EB831078533C8229219046681B94C776 = _NONAME_ | V | 0xF5CC04F0B0AE0EF346D452C43FD9128E ; libaacs -0x2DB98BD10DFDADBFE5E6CD464A6DD86813931570 = _NONAME_ | V | 0x861F2ADA81291EB0B89975C35D7CBA36 ; libaacs -0x4E9EBAF6677F3B2C81C43FE36D8BAFF1A199177A = _NONAME_ | V | 0x19AE32DC05702A6469AA7794F6896A72 ; libaacs -0x0259ED415CB5D982A867C4F554AB3B17691D9FF4 = _NONAME_ | V | 0x1ACD059BA7E6C234BCEB4BCF05378925 ; libaacs -0xFB25C0C4319788CCA0BA1611B18A67D45A6C13ED = _NONAME_ | V | 0x6BA6FDA022C7537362EB2DD8C0E38DF7 ; libaacs -0x4359D3D78A94E65154444AAD4718A2B71BF0B452 = _NONAME_ | V | 0xD87564449BA3752772193B195E929BA9 ; libaacs -0xDC328D719D69689CA2574D6931C8C7EE670DD9AE = _NONAME_ | V | 0xC6C364DB7CFE60F56C5E9B001F7CB4B2 ; libaacs -0x78F8F079E6327BC95C2A75E03782B04463B81E71 = _NONAME_ | V | 0x6EA00F86B67DF1E7A4C2F94C55B89B1C ; libaacs -0x834927B2F368FADBCDF773E5FD724BC27B9D4F1E = _NONAME_ | V | 0x8BE51B9B8D9A8034160FD66C05202EFF ; libaacs -0x1AAF0C9871EA55D27F2453A9B5DFFCB33A4D2374 = _NONAME_ | V | 0x4CA8CC215BCC48DC44410F656DF9927B ; libaacs -0xCF51B10A92936DB5C0960616344DF76C1FFF47C3 = _NONAME_ | V | 0x8674A3F8E04EF7C371F41EB901BD2937 ; libaacs -0xA31CB1F15D068500235DD906B81B99F8E076BDB8 = _NONAME_ | V | 0x261B3C854B53DC5688895BFB25D73748 ; libaacs -0x022D314CCBFD3D49458FB9BBDF00406E7C142682 = _NONAME_ | V | 0x50816995C8CB7B411161C8269F0B1E59 ; libaacs -0x6597489A4275AD14A144EA6E170FE7C1EAD78582 = _NONAME_ | V | 0x4E72943C6E13FDD121CCC38602683412 ; libaacs -0xD12C391278E7C68ABAED8019BD88749FC2A99421 = _NONAME_ | V | 0xC40FEDDB948BA63337E110C339642672 ; libaacs -0x2E4D99A5E7FC5F241BE839FAD27514FADA1C12CC = _NONAME_ | V | 0x5291395BEC89A3A96F144382E14F038C ; libaacs -0xB53186155582B74AECDF190C76950C28F1E2DA8F = _NONAME_ | V | 0xE21D2788C4B2500C249013D1AAD3DFAC ; libaacs -0xA5ABDBE0C1CF7167783CAB447A94BD94493A23FC = _NONAME_ | V | 0x4B444EC1BD0C75ADBD9E0E68693ECB43 ; libaacs -0x0550446ACE623340C4A6728D3DE203DB9A9A3763 = _NONAME_ | V | 0x68614B066F0B531C301CF46325C423CC ; libaacs -0x0B4305E4157D82AF4BC785D1503DFFD38C7AB1FA = _NONAME_ | V | 0x64D0C8618B1EA6B7613FD99479976177 ; libaacs -0x47C445859B3B790A542752ECB92FCE0CBFB2F3A5 = _NONAME_ | V | 0x966305C572E70E7F9B5D5B4DF0F85BE9 ; libaacs -0x457C942FC0975EBFA7DFE31084A2028854C24516 = _NONAME_ | V | 0xE67D26A2E44B15B2D0E0E6F4B0971014 ; libaacs -0x5071C9C361E3473BA1094B4B7C1B945E3BF5A982 = _NONAME_ | V | 0xC3B76B4E8C89C0FC1B70892D64F5297C ; libaacs -0x1D9B2CD9D29C9579E51658B9C05B70C1A9A335B2 = _NONAME_ | V | 0x4E069CD40323840F7A0A2290DA6EE862 ; libaacs -0x546A4AD9B5F48DA139076995B63F20A9FAF74D9A = _NONAME_ | V | 0x0C6FD6C0A1FE423C7019809C507BB9FC ; libaacs -0x0823C3C47D34213A14315C664907A919CAC5D174 = _NONAME_ | V | 0x5F65B69812C7992E1BB5C0FF6F98E91F ; libaacs -0x25AF0441CCD9BDEE0E504722C00C6103F94B7C19 = _NONAME_ | V | 0xEE2BE6DA8D6E0DBB8E6D9A8B466CFB69 ; libaacs -0x494B3FA051E0E3567AC28902A7DA85BCD82BAF0F = _NONAME_ | V | 0x9483C7F45DE316D896C41582D114274B ; libaacs -0xA46FB8BE9E22DDF7D517AAA604F1F529C5B27DEB = _NONAME_ | V | 0xAFEEA90A8FF442CE524091D36B009369 ; libaacs -0xA56DF87479AFE72AFC5BEA174D29C5CF9D7AD78E = _NONAME_ | V | 0x6771D306C997948C115357D95162DCDD ; libaacs -0xA005DB8504C0165CEF4A2BC32A73FEC1D16620F9 = _NONAME_ | V | 0x04EB1BB39AC72BBB23D2EDE17AC9C6EC ; libaacs -0x7D443CDC5506FE47CC76D528DCFBFC4BB7BB7DC1 = _NONAME_ | V | 0x501DC6CDF29C8BB72A454D377999829F ; libaacs -0x1DD5FC2657B3016CF30C8DE89895589EFA75DFB5 = _NONAME_ | V | 0xCD529FBD380CB84BBC28B288D1E92FC7 ; libaacs -0x7183127C8DE4365EF9B0EFE45BE988677B50128D = _NONAME_ | V | 0x6A4690D1469B85ACF20C14347F79C214 ; libaacs -0x582EE5569425B135034E69F6CE4D08AD1D47141B = _NONAME_ | V | 0x72EC18E5C12EC467D9792D6B208B692A ; libaacs -0xEC6F53A35EBCC10F71015B79E71D3FCD3A5FC105 = _NONAME_ | V | 0xEACE58DD7C2F568BAE98CAF1D60B7EC3 ; libaacs -0x396D8B7AD7BB1F9F32D42BFC75F19E5D0A3537BE = _NONAME_ | V | 0xC463F091B6F7A153A6D300BF2AE2FAD0 ; libaacs -0xA8E4F11723E0F2A6BBE5A65B568FDB4B79E84A0E = _NONAME_ | V | 0xE43C18DB9CEC0F5C54477828A695BDAA ; libaacs -0xB9E95A727B8E5C8FE8B76C97D33BFEC82CA6E337 = _NONAME_ | V | 0xD0D9BB467C4172105ED96669C5034B59 ; libaacs -0x707A21946EBEED43089C1E3EE87291FB564E10BC = _NONAME_ | V | 0x054AD66836144786A749C3D50F7E822E ; libaacs -0x8DE30B1E107024AEDB0DDD2CE158F175B8485ECD = _NONAME_ | V | 0xF79D3F450A433BB8EDDA6723878871FC ; libaacs -0x4D3E1755B48FF73D196EB12FD616AA297F33B3FF = _NONAME_ | V | 0x7468CA097620F0E976FC0E8D0728065C ; libaacs -0x1BE2B0ADC8FC4EA1B9E9A33E652461DABA081023 = _NONAME_ | V | 0xC041AB34FCBCF72753E91807F11CFED9 ; libaacs -0x4A771FA556EB17EFE369A7E3DF05342EB20B4A0C = _NONAME_ | V | 0xEB53F3410B1BFC12BCBDA5FF9E185608 ; libaacs -0x56FC094D2EA9B83C593C1EB006F038B274EE6704 = _NONAME_ | V | 0xBD42ADFC8F1FF7DF7F5F4DD6E7DE71E3 ; libaacs -0x559101C8F8124CF2F3E5C58ADE6BAD7864234A84 = _NONAME_ | V | 0x30087E62CDF3D93040FFFFFF9B1ABE2B ; libaacs -0xC721779B5D8C2FF0E8F966DA3C525A7B0D09D700 = _NONAME_ | V | 0xC2FA61CD68A2F4B308BCCFF037238176 ; libaacs -0x0CEE99868CC5C1193D04CAEC9AB967F3A2219DC6 = _NONAME_ | V | 0xBE4CF823F285D35B30675B48AAEEAB6A ; libaacs -0x0D57AA3C918F55C85F6A2D5D89FEA87EBF432520 = _NONAME_ | V | 0x749F0572B87E2900B940B22A4D710755 ; libaacs -0x8CB008BBD71C03B6B26A5E70A7DFE428B8D4612D = _NONAME_ | V | 0xC98F07F5DAF3436D99AC7387E6270ED6 ; libaacs -0x45B437A1B2FF504EAE9B5E01D20FA4B99B7AB76F = _NONAME_ | V | 0x1CBDA5D09ED5DF59674CF3F8635D91FD ; libaacs -0x7E08F753FF753957203C93BCC07FF4A50F43D21F = _NONAME_ | V | 0xBEA8773A1A60AB71E2ADAA19B0B14DB6 ; libaacs -0xF5DDD922D9F54B81F322D7EF7F366C1F93A3978C = _NONAME_ | V | 0x2A89C1264553F2F11FDEFE19F8AF9BEE ; libaacs -0x9B1DDC7555C783F27FE124E695F1474D3331C543 = _NONAME_ | V | 0xD7AE606D8C7D34BAD06C99EB95F63721 ; libaacs -0x85762903068AB64D665B81FCA388348067FD5BD6 = _NONAME_ | V | 0xEC5534BE00EBAB3B39FE8E18A5E45DA4 ; libaacs -0xB51A9C17807D894FB11BB9503241215D727D3981 = _NONAME_ | V | 0xD236AA942F4339B3E08EC9C83B2A7D43 ; libaacs -0x0D240B1B8D6A431771F5559698FFD70FE9E91519 = _NONAME_ | V | 0x738E24CEEC2D2ED095F21980A8D5EF13 ; libaacs -0xE1CA6D53846613A7FCC0C5A771D7D69050A6961E = _NONAME_ | V | 0x7E428B9AD1DAFDE1B9A4EB879FD7D155 ; libaacs -0x28A310A87D944CB3CF4AB5B7DAB49CE67E009D5C = _NONAME_ | V | 0xF3D322258046B30A98001343B849C963 ; libaacs -0xA5B336F17F3A1C7F1A802B0737C5E13C590B6545 = _NONAME_ | V | 0xE3C7F85768777B37EF016D0A2E1FDFB3 ; libaacs -0x6F304C80097D47501EE128D6F82BCCDA7C445677 = _NONAME_ | V | 0xE6A968297BE21286D722802339399490 ; libaacs -0x97154E06705458D69C2A1FB12BECF672F9E28C3B = _NONAME_ | V | 0xF42F9D091B6B9A67E778D15C07B364AE ; libaacs -0xDE349778BE17333ADF5F76651C34AC83DFEFD043 = _NONAME_ | V | 0x33BA39E2547BA2C508BA03F41E36EA31 ; libaacs -0x13248AC75917A9E88F4C7551C166C63A4611DEAA = _NONAME_ | V | 0x2AAE479B0741748D0AE451FD004C5F87 ; libaacs -0x180CBE679A1702806449BB23E1DD4C2CD472E78C = _NONAME_ | V | 0x46DA70B4BF52B6A50E6566956154CF88 ; libaacs -0x1AC3145700A54D3FF286F3C092B27D2DBDFA6165 = _NONAME_ | V | 0x75BB268721C3B22E7FCE2956240CE753 ; libaacs -0x28DFD02F06396C748A0E1B2C639284112EF90734 = _NONAME_ | V | 0x4C23DA58E4C5C2560916B03E3F422C6A ; libaacs -0x63ECEC6B5819F4C3A5AC52BFB8D1922F0FE311B3 = _NONAME_ | V | 0xBE3DFA02904CF270AAC97AE5EEE79266 ; libaacs -0x8BFDF35BF438334A46EDC4AC6A5A89D16E3900FF = _NONAME_ | V | 0xB1970C68BEE60D9C91363D94BD7AC1EC ; libaacs -0xE733E91FFD3345A43EB9DA0092F467EF5610B7B3 = _NONAME_ | V | 0x325F3D99375C1F759810E5C995726C62 ; libaacs -0x666EEF5C4DE768FCE1829ED0524D7CE340C8AD4D = _NONAME_ | V | 0x61669D33AB94F29AC2AD729D10EF5665 ; libaacs -0x326F27427D94B712D26661CE1E43939C8AEB4329 = _NONAME_ | V | 0x397E500F2720769E87E35CF3B06AB105 ; libaacs -0x9B78A04101A788DCD44C55D5AD1820C93460BA52 = _NONAME_ | V | 0xA6EFD69BA40C64E3D11F8604D4BE6AF7 ; libaacs -0xD13EAAF48FFE43F64FB14BE472DDBB9FDA12BEF6 = _NONAME_ | V | 0x61ABA4A55EC076B718FE3F95D22826A6 ; libaacs -0x21F4C4BDCCA5155BA86908B8405638370B5F04A8 = _NONAME_ | V | 0x09815ECA5E873894605686D3111C3E95 ; libaacs -0xA06AD7F93ED2DA54B004A166A5D47426C462D3BD = _NONAME_ | V | 0xF73F205992EE80924FFC7A86A28E592D ; libaacs -0xDCDE418256CC09C47A67216AA236C14448A3B3F4 = _NONAME_ | V | 0xC1EBD0533376D2F32DFC3ED87F0D3C2D ; libaacs -0x0BF330B03F12A03C43A71DAF72A8AD401789625F = _NONAME_ | V | 0xC8F0F28E4B7CA5BBDFDA384709E439B7 ; libaacs -0x1ED4541424688CD2B169F94AB3A6F8553AFAA9B1 = _NONAME_ | V | 0x696D6F91750AD504C35D35710AB29DEC ; libaacs -0x35BC67162066E0389CED0438BD0C6572D88B7F19 = _NONAME_ | V | 0xE8E62A8DF03AC9F75A454B69F3DA681F ; libaacs -0x51EE9987AFC890DCAE3BB08A6DA5897288228D89 = _NONAME_ | V | 0x7B00EC13F56C98FDA56DDB82D8B1FCB6 ; libaacs -0xBC8689CDE032D14B55280BDE804992BF8F2DF9E2 = _NONAME_ | V | 0x213165E8D6ADD33B4B49746638A4ABE6 ; libaacs -0xC8E6C185741753AF09F168DFC494DEE28C87FD08 = _NONAME_ | V | 0x1875E39794A2C65B34D033915A64EB9F ; libaacs -0xE824875426E198DDC1A291F7E67EBFB4328DAD21 = _NONAME_ | V | 0x2CE1304AC23FDA6C496EC447B119A2A9 ; libaacs -0x54BE48239C02339620194B2965577432D1CCFB79 = _NONAME_ | V | 0x70B623D4175ACFDA30D039D54784569E ; libaacs -0x7891241A69ED5DB71DCA47B7C15B523966FCED42 = _NONAME_ | V | 0x4683CDDC6A2177E70112F0CF661EB063 ; libaacs -0x824B180B363A09FF4D0A9F87618C29DDC402E1D9 = _NONAME_ | V | 0x272805BCE47F881B80C4A52E2D28BC65 ; libaacs -0xB922246FF1AA5CA8E506D9A3911B3C832E760C2F = _NONAME_ | V | 0xB1AF1C0DEC17C94D715C6A55EA9CBB89 ; libaacs -0xCE2B8C6CF44809C2F5AA5B142154FCB90693E094 = _NONAME_ | V | 0xD65AB14C4FF45A3FB5FFDBD4C6461122 ; libaacs -0xD5552AC2913FA5357E03E6190041B83A88BC761E = _NONAME_ | V | 0xE315EE03860A69DD49F7AE4EDD94D1C2 ; libaacs -0x21FBEEB46DECDD30A6E8961497D73ED475C75473 = _NONAME_ | V | 0x6B64A2C05326638A6F2FF7C76B539869 ; libaacs -0xE5D36A51A66C766096A07143CFB3E485F0725C7D = _NONAME_ | V | 0xAB1E5B1829285148FFD5C2A285D72040 ; libaacs -0xB77E3F9410AE18A7CA2139C28D85534783DC6D5B = _NONAME_ | V | 0x084F10070414A6AD433B3C589EE89BA6 ; libaacs -0x0E68F5F13D02E75D1DBB516BAEC3B39D044DB96F = _NONAME_ | V | 0x4D71573C788CB20F3563E5C8F53B6523 ; libaacs -0xB0B46AE1CD15A50E49E4A3904F23A40CFB173F4D = _NONAME_ | V | 0x11E02E066C718A5BE6ABF4EE3D4ABF99 ; libaacs -0x540B29AC7EF537608638181BFFBC1418B681AB59 = _NONAME_ | V | 0x59D5D687BC454F02A8D4C8AC30530871 ; libaacs -0x6E095383CEDB40C10B4D9A04C1E2476F3738F62B = _NONAME_ | V | 0xCFAAFE68E71B3991F8FEC196014AB4F5 ; libaacs -0x904FA1B503CC02A7F46A2569E67511DCEF49C2E8 = _NONAME_ | V | 0xA97654272D4B524FCE81A7DFE13C9F6F ; libaacs -0xA7DB1CD0679DD17ED6FE8F0210D72A1F49AD7354 = _NONAME_ | V | 0x4B4368CCFC5FD53048A9C67868F05A74 ; libaacs -0x556971A1405E9CC0D5E9D39A7DAAC1FEDB0D8FC4 = _NONAME_ | V | 0xFFA611FC6F0EB2D183B0AFDB48141C10 ; libaacs -0x3DBEAE8BBA072C31950CFD9A374830BE28BAD595 = _NONAME_ | V | 0x57B693A5C0550E978C366BA0A7D9D7CB ; libaacs -0x9B71D7DC83C9838D56F596500BB24BA1A7D30EB3 = _NONAME_ | V | 0x378E0DEADDFBC57DF5FEE105D864CD78 ; libaacs -0x11F14D3AA696FB192E4D237CA7F9A76E837A1C26 = _NONAME_ | V | 0xA4820CC1D58AB32CEF6FE1E9DE561DD2 ; libaacs -0x52E4D6C27B465FF951947BDF6CA49A38D8059183 = _NONAME_ | V | 0xE04CB40BBD0E0935C3B7CFE498FD0448 ; libaacs -0x51B0D0E671745FE731881994624A092D9250C34A = _NONAME_ | V | 0x896C25AE5BE547E197C8E8262C25FD62 ; libaacs -0x5574BF598FE41679491D28ACAD67276272595520 = _NONAME_ | V | 0xCA8C04118F89391FDE7B9011F6FC34FF ; libaacs -0x9694F412744BCA9F7DB4CA00AAABC1152B46A57F = _NONAME_ | V | 0x1B506B6F275E38DC8317BE5669130FF6 ; libaacs -0x9E06447ACC439ADE8080DC692D6416BDB4CC1713 = _NONAME_ | V | 0xC8904D4B9777A39991A42D13BDB5FAFF ; libaacs -0xA183A1968C88F336F2D97C0D76C7875446BC7C71 = _NONAME_ | V | 0x632D57A2519683BBCF8CF84AB29A533F ; libaacs -0x4A4D707C04BE59151D1FA930DA7406263E559E7B = _NONAME_ | V | 0x7F60AD33ECAFBC74C070EA0C2F53C92C ; libaacs -0x73BC196477B6455E20FB8180170FDA9638D0D717 = _NONAME_ | V | 0x9DB31B209A2E803857B4DC6EC91CDF6C ; libaacs -0x1D0D9D9E55609D5B8BA48D7C82859D48025DCEBF = _NONAME_ | V | 0x0693C9AFA6F1012076228DFB12F5135B ; libaacs -0xE5C7A748A96799F3C6535D26EF18FFFE0B2AA7AF = _NONAME_ | V | 0x4E258CCE8332C480563330DA74D476E3 ; libaacs -0x1265023B71DE1B02F2D2A524D6BFA43772AF511C = _NONAME_ | V | 0x0C65AAE187EC257931C4A5B3335B7DE9 ; libaacs -0x25C9488A70619DC879E1E404CB63F0D6A971C046 = _NONAME_ | V | 0xB7434AB18E17432950E169E208175E1B ; libaacs -0x78D510ABE942D7E1594F737D9763B62B03F5CA3E = _NONAME_ | V | 0x373589951DD55BD452FE7069F28565A8 ; libaacs -0x7109A73C6C3BBC30C310286533BAB24BC05BEEBD = _NONAME_ | V | 0x6C94F508B44BDA7B648E9E6849DDAD6C ; libaacs -0x49CD3FEE302A882A89F1191AACEAA80217BF64EE = _NONAME_ | V | 0xF13082A6273D29A4D6185803AC086F00 ; libaacs -0xDA1AADF868B5B2F4E25FFA0DADBF8BB2C65857FE = _NONAME_ | V | 0xA9FB6DA9A3EC92F3E2EA265AC6DA800E ; libaacs -0x1AECC4F4A3781D3FF8A32152F008B0959993CA9C = _NONAME_ | V | 0xC7161E13E6E390F25257B8142320FC4F ; libaacs -0x45D56CCC249D79A1BC395E1B61B2FA0DC7DC367B = _NONAME_ | V | 0x3877609CBF321DF02DC77F66E8298C87 ; libaacs -0x142C9B0260550E4D4DCAE55C4922F87C03683A8E = _NONAME_ | V | 0xE535919FACCD7BE77BDFB04A307B0672 ; libaacs -0xD8EA6E854961919A05C7D176EDA8C72C74C04383 = _NONAME_ | V | 0x3AD0668B07189B161DF6677BA069EAA5 ; libaacs -0xC18274E2DAFDEC23366470235883C2B9739C4E91 = _NONAME_ | V | 0x503BB066DFA8CB6D1AF5D450965057AB ; libaacs -0x953D8A1F36C1B2BB4256B8751221F35444AB0ADF = _NONAME_ | V | 0xF82952D1AEFB993EE96BA5F42EB96DE6 ; libaacs -0x71D893E8FEC96082DEEFE3E3B552E3E7930CEF50 = _NONAME_ | V | 0xE93C415F44598B9027E2887BF6CF35CA ; libaacs -0x95448499AA9D61E2C9180527F3C4FD1B312F3ABB = _NONAME_ | V | 0x34238DC5BB9F61396F545FBD7EEACBE8 ; libaacs -0x67F3E9A433BA3F52A42B8C67AA4717D28B75F89D = _NONAME_ | V | 0xB49668F15C35293C100FDB3661016C10 ; libaacs -0x75F7CA1635D2DFC4326D556ADF3382D4FA0CBC07 = _NONAME_ | V | 0xEEB5C297BF1AFDF93F0304DB7AA05376 ; libaacs -0x80A17752C8519B61270CD78DF58D45063F0DA738 = _NONAME_ | V | 0xC43AF677FB881DF33D573ABB33876252 ; libaacs -0xD765D4A4EAE0A7788EB8BBA93E359C89C2A03AD9 = _NONAME_ | V | 0x4F00BD993C7FD0822D31B633CB64E380 ; libaacs -0xB41E7BD5472098610AB26AA6BCEE9342C40E5DCA = _NONAME_ | V | 0xC20842F00EEFF57883F272B640B5F1CF ; libaacs -0x6D28ED430FFCA6B3DE84A833FF6238488B8B83FF = _NONAME_ | V | 0x975D387CC8664F3B7FE4A78E4012CE68 ; libaacs -0x3BB499D5600F3D5D8FCCA73D59DAC2FB5F6E6A20 = _NONAME_ | V | 0x239F40E5F1180D7B7DEFC016B74075E5 ; libaacs -0x3DD4CF3D0DA5EB8FA3EEA32FFB16976D2A701FE1 = _NONAME_ | V | 0xB852727E4CEAB1BF959FD9D755F803D0 ; libaacs -0x1E6698B4763C2B6A649735A6D27C7399FB3F877B = _NONAME_ | V | 0xF468E02CA0FB0CD8E0DE9BD079B69179 ; libaacs -0x28D046F3377513A6DC73A5422A874B5BC1E5DE7B = _NONAME_ | V | 0x9050697BC9867986CEC340066058B83E ; libaacs -0xBFCA56715BA12A04ECE191B1EA778737FFFB6814 = _NONAME_ | V | 0x35788EC87F148D5FC688C5351A0416C2 ; libaacs -0x2034597E4896FCB4BF306B5F73D930DB9C279FA9 = _NONAME_ | V | 0x21C0502CF90317530FC211E0B9081B37 ; libaacs -0x4023B111033942F93EA49B1EAE4F9BD9B7FD20B4 = _NONAME_ | V | 0x885C52DA3E4C74B34989B17F97D86230 ; libaacs -0x9F06CDBB5F7F48753FC365CA5F096A0C0A5706D0 = _NONAME_ | V | 0x4D7C24E41CCE02131F598D441A232B65 ; libaacs -0xAA99C9E490C04E3F503E8451E5D23A400AFAE3E7 = _NONAME_ | V | 0xE64905D7E1D1FEC3DB1DE19025D83CC4 ; libaacs -0x22C7AEFBD0B6B88C1B55726B3CF766EC1EC6D62E = _NONAME_ | V | 0xC1AF9C0747F157288353A6C935F8FA09 ; libaacs -0x7DA57CD4071B6EAB97D480063D010B979495D208 = _NONAME_ | V | 0x15DB01B94DC27C5502C45E93624C131B ; libaacs -0x4632CF688F4F700D207874F5CC352597EC7EBC02 = _NONAME_ | V | 0x0B0E25D03A8CB49F959650BB595B08A7 ; libaacs -0xB1650199FE9CEEE980AF9D7364B9A9FC57B5872A = _NONAME_ | V | 0xDE4C7B203BF124202FB115023B92A21C ; libaacs -0x07628868B029AD177ADDFFE64F07D12D3C1FDB5B = _NONAME_ | V | 0xD0C3709D5C460ED75C8F5D7B48056DD5 ; libaacs -0x06431AFC108DAB7955CCBC3C4D9E4B8800666335 = _NONAME_ | V | 0xD08377886BBF262B90050E9C2CB798A0 ; libaacs -0xDB77964249FAF17F12B515882BA9020E8882CC80 = _NONAME_ | V | 0xE6057E7346EA314024206A12C7E35E6C ; libaacs -0x037FDD059EDB913B0B0A973CF9C4777B5A11FFDB = _NONAME_ | V | 0x485E045F28D5D66AD2C414DA9C98290C ; libaacs -0xB739EC5581C78FF29E0CA307527CDEE83AD487C2 = _NONAME_ | V | 0x1F9AD7695E6E6BE183F68915F5E0F611 ; libaacs -0x424D9399D280F6EC045CE94BE79E2201FAE6423A = _NONAME_ | V | 0xB370AB49D03289A715B87F72B4B190A6 ; libaacs -0x4E8DE839F9767B4D77342CB08D6B649D84969E6B = _NONAME_ | V | 0x4F5AAF62C4E5EC324F28FED515FB2D4B ; libaacs -0x75DF074C37A42FCB6FE60461F860382D2A8E89F2 = _NONAME_ | V | 0xDC661030EBFB904E0561B79DB24F14F9 ; libaacs -0x97E11F8620E18170AB8AE62E0506DF6335E3ED6C = _NONAME_ | V | 0xB299C8483E08803D7F144E12C026F86F ; libaacs -0xA7A4F952B6670F69E205B444E712974B2F5C098D = _NONAME_ | V | 0x709A910C528FD2059E64ADEC95EAA023 ; libaacs -0xB7CDDACFC854506CF7447E94A0A3C302BF5F3068 = _NONAME_ | V | 0x5E0971C18DF5187CE085FDE9D5B316C2 ; libaacs -0xEC8EADC0E358A35C727820F0A55F83D9F225CB12 = _NONAME_ | V | 0xD68371A684ED7588708725C921D12C59 ; libaacs -0x6E1309750F132BE2AA95B302CCD35A2CAC992A50 = _NONAME_ | V | 0xA39840AACDE17441A689E980AA73B644 ; libaacs -0x757F3C663C39B3D593F2A0CC1B63AAD78738DB17 = _NONAME_ | V | 0x6183E3A69697CEAE3BD39AA43B2B37C0 ; libaacs -0xCB0D7382AEA479C169879181241CAA38209EF57D = _NONAME_ | V | 0x94A1D4FBEF7A39591BFDB6F4E633E2E7 ; libaacs -0x04216FDAE31277A4FCD83C854855DCFC40485B6B = _NONAME_ | V | 0xFA55DCF66D885ECAD26FE014D9A5DAE0 ; libaacs -0x0ED8B1E5BF0FFF1E39A3C78774858F81D87158FA = _NONAME_ | V | 0xE2FCF412FBA5FD601823B8280D47460E ; libaacs -0xC7DE0AF3095AB5DA061A0D4D65EDC4E7250FE937 = _NONAME_ | V | 0x6884543D450AD4D6FA11ECF579CAC765 ; libaacs -0xD7D320FE1A7DC8EDB1FF8AC6D99EC4224FA1AB9B = _NONAME_ | V | 0xA240DCBA4A671D62B3B3E1A972DCFF2B ; libaacs -0xF458202DF2FA1E8BC53A521009A09065454854F9 = _NONAME_ | V | 0x0B4EDBDB26621D3DBB348C0DA043AAB1 ; libaacs -0xFB94D47C9AC1EA3264226BA0838B59A207DC368C = _NONAME_ | V | 0xAA7CE9B6195CD44DE6038CF0F845EB3B ; libaacs -0x9EB30EA1FA4E9DC74F1D75E53C2C7777CC44749F = _NONAME_ | V | 0x068CA0B952A7294522E29F8F4577E6B5 ; libaacs -0x6F3F1A881B51B8A742DAC0B8175365120F4BD447 = _NONAME_ | V | 0xBF55462ABE069D01C6089B3ED192A7BB ; libaacs -0x7F553E8EC3963CDB01A08858EC09272868137E88 = _NONAME_ | V | 0x2D5D5F8823735FA45CA645763FBBB421 ; libaacs -0x2E23C1C85DD2A9290DDD9F0B11E29B945D8DC698 = _NONAME_ | V | 0x45BF1B7C7300982C3470E4D98BDF2A81 ; libaacs -0xA2857BF824CCB2B44512BD6807D47E53C643C5D0 = _NONAME_ | V | 0x8B0A50AC904C5F1DFDF89C9B1096ECBF ; libaacs -0xBFE8B755987D9109A862F1B5D31594F35B739F54 = _NONAME_ | V | 0x27EB3B53DC7122EE3051DFBFAA1B2307 ; libaacs -0x92B8ECA6A48550B82294D0BE002A561F8D003218 = _NONAME_ | V | 0xD29067A7C50FFC98F4209EAC175CC497 ; libaacs -0x8BAAC84474F35D322EF4420360429B070EF08524 = _NONAME_ | V | 0x60D563D130A3C6BCEE4502CC0B9C0979 ; libaacs -0x81836A8345119A94B10274B4DA90F15F7E8FD585 = _NONAME_ | V | 0x17338F591F1738E2E1EA2B28A1459EF4 ; libaacs -0x18C498F18C5C09D435ADB2840A1C0E158DF8B83B = _NONAME_ | V | 0x35482E7A5F6586BC960AFCA09BDA2C1D ; libaacs -0x1D8B9514896AD2155EF61262011F0D8710E2F7C2 = _NONAME_ | V | 0x42CC3394F11DB4D7452982E97367A26C ; libaacs -0x1ED32359CC6EBE4586D565CA56CB16C10A3FEB91 = _NONAME_ | V | 0xC08E32BA406E3D5C83CAEC5E0DEB04A1 ; libaacs -0x2E965116647A3B1327F33BF9B7B5A5E7A826B305 = _NONAME_ | V | 0xD7214AA9763C433FF677CFB2E1807C5E ; libaacs -0x3BC7C46C1927CF993946524698CEFA1DA573AD53 = _NONAME_ | V | 0x79955147A70FFAF4F6955C10B97C44FD ; libaacs -0x40645B36BECDFC777EEDF5130E7FCC585F6C1E95 = _NONAME_ | V | 0xACEF31E30DAB2B29E74EA97652EE98EA ; libaacs -0x4079A88F8AAF51D1788DFEB700DA3BF213C58449 = _NONAME_ | V | 0x74443E3F78FCF81B8A23F3E7E92C5443 ; libaacs -0x4B4086EC4C3AE49D5DAB820BE58AD8C50F111900 = _NONAME_ | V | 0x6919D0AFEFB6E9A0B2B54AD85B22AFE3 ; libaacs -0x5490DD804D93B2A166EB50090B410034D71F0FA7 = _NONAME_ | V | 0x0068B7F3F3ED14B3619716663E42B24B ; libaacs -0x72E9B8C5EFCA0FD8C4C6981996E2E7C4CEE30515 = _NONAME_ | V | 0x76A025C4DFC15BE463E3AFA3E16A1612 ; libaacs -0xC1174D8C8A8D456C29FD30B62B5615EA6D90077D = _NONAME_ | V | 0x17592B3E957F2278F8CEA1A78BCC1259 ; libaacs -0xF7EF359893753660733D69CE7A69033D5AB1EE6A = _NONAME_ | V | 0x1631775896FB5DA9C7D68B7F3A161E0F ; libaacs -0x533024E666AC6870A1C65E624F5FCDB106363C94 = _NONAME_ | V | 0x6FFB84F05C6628A9B396E4D2D86BACCA ; libaacs -0x7A2F4B355CC438B5ED33D2BE34580F710EEF0FC8 = _NONAME_ | V | 0x951B0655CF69FBC1AEB4E16CFF9EC8B9 ; libaacs -0xA250825E82E5B9EC6A9AAA9A4BB9EF588AD371A1 = _NONAME_ | V | 0x42B44A9BC9BF951CEBC392493A873C7E ; libaacs -0xEF921617026EB8F9FBDAD2BE52A3A29F1E15BFDA = _NONAME_ | V | 0x7081725958FF24989CECD32504DA613D ; libaacs -0x2B0DE40A2E622EC9AE5DA06E1F1B9D60FF2E5BFB = _NONAME_ | V | 0xFBACD45EBD37C873EAE1E3F6F058FD70 ; libaacs -0x676038A0F8A2CFF5207552C97FFD3C022FA2EAB9 = _NONAME_ | V | 0x4A06812EC218FB19B8D78B84BC4232AD ; libaacs -0xCB86FAC502F21E612B3E5472A261E084D1A72B6F = _NONAME_ | V | 0xB2E418F3C0BBB0B68D35568C76377D69 ; libaacs -0xE546ED63E9CA4294425607DABE50FEC13006E1DA = _NONAME_ | V | 0x27395D1C3D9CDB9B01E61F4FAC699449 ; libaacs -0x066C92E28591DFFFC8565700775EC8440D97836C = _NONAME_ | V | 0x5A1EDC76950377028986A18553F7185B ; libaacs -0xCABFE1434802F2BA93F6DB1283314DF6491CE85D = _NONAME_ | V | 0xDEC657BD40CD9EEF23CFC7FBCFE29BCB ; libaacs -0x22781044D810FCB4622A6D08EC671DD34C024CEC = _NONAME_ | V | 0x74C4CED58397B6BBDE28F9ABCCF5E37D ; libaacs -0x8242F09EC2E86F8E7795417FD1663DFFB5794446 = _NONAME_ | V | 0x8690182AC095F3E8F2E4EE5E7F6A8CC6 ; libaacs -0x29667191C07D17D5D18B2D7E46FD7F4013770A38 = _NONAME_ | V | 0x7D37FF4A0F2E06D1C6A0C2E0631693A0 ; libaacs -0xECA94C97695E077B6C81242B560D51117027434A = _NONAME_ | V | 0xB5EFBE3F19D5C77C06D5A703AFCECF1F ; libaacs -0x2FD60AF61DB601CC0B7687D1773AC840D16E6185 = _NONAME_ | V | 0xDA3092077A9D3587D39FEFA06FB4ADF5 ; libaacs -0xBD98FACEC8E956C7187311DC480F9244C177A41C = _NONAME_ | V | 0x710AAD50C93CE51D412598B4545F338B ; libaacs -0x35EAF15C339ADA62012212E1FD26CC6394639E7C = _NONAME_ | V | 0xE8A12618744266BDBBC250D8CABB08E1 ; libaacs -0x90A20BA29AB19CBACCA2BA4AA459F80A5ED048B7 = _NONAME_ | V | 0x4F7C7F39A832B6AF8C04D37E3DD22B3E ; libaacs -0x697A6B0514DAB23AA4FC92704AD7FB17F3F8B132 = _NONAME_ | V | 0x6B160289E98E196A8EDF374AF4854700 ; libaacs -0xBAA28FB17E268D17B848FF41D193BAD826C84E4E = _NONAME_ | V | 0x2C36CC91EA621ED0455F3F11EA2D5BC9 ; libaacs -0xBDF6E74E5F9A6B8EACFBB16E0F3AD304F1B796CF = _NONAME_ | V | 0x9FD3EB1B948577A018CCF5D5D98286E7 ; libaacs -0x0DC0E61CC903BA86DB133B0578C96F5FDC71142B = _NONAME_ | V | 0x288F98B8BCF3F133F3D0F9CA4D7A2DD5 ; libaacs -0xFE43047912B9EDACA56A507BBB43416765BAD1B2 = _NONAME_ | V | 0x72DC422461540CDBE6C09DC912F62C1A ; libaacs -0x60D1276EC1B96DBB81BF709DB8A8B1F2C2361FA3 = _NONAME_ | V | 0x5F8179AB1216CCE82A5A63A07A4614FC ; libaacs -0xBB40E18F214A6F11E1A7A141DB3AB3A7B26B0F72 = _NONAME_ | V | 0x219A8D7B947528829493C893584D9FBB ; libaacs -0x7F40CAFA90A493D9F9C716B924AB13E571407C4A = _NONAME_ | V | 0x6764763079B92D8A2DA1F242571960C3 ; libaacs -0x921F5F90B5A4793B9C66993F97D7708DE89115CD = _NONAME_ | V | 0x0F54D275696861380406CBB12244EA44 ; libaacs -0xB4FE05420D70135FDB30C4988391D24E0A7FFE12 = _NONAME_ | V | 0x229BD93A311CA53D1BC80CB184062242 ; libaacs -0x4C3614DE2A5D224CEEEE72C460575FB06B6FC6FC = _NONAME_ | V | 0xB3E88C234C3C27D5D35C92A51707288F ; libaacs -0x3F217183F6977B77BECC0F5F1461788EB71F36E6 = _NONAME_ | V | 0xB44C54E3D03DA28E083B71D36D9351F0 ; libaacs -0x88C80F8FDE247F731EB6D2D0B1658253490609FD = _NONAME_ | V | 0xF896AE2AF366BEEBA4CE1F777DB6ACCD ; libaacs -0xB4CC996EEA60E6678449E47913D304C0B1ACE5E5 = _NONAME_ | V | 0x23BF8466E95D537EF5C119A5E3E1E078 ; libaacs -0xA2E5C0779216FF0F702D4D7A4ED881A8D9538396 = _NONAME_ | V | 0x807A8E1CA4EA37362EBD04847819D5C7 ; libaacs -0xF38A97E960F6B4915F880720FEE022A345CE319A = _NONAME_ | V | 0xF3156724AD4A09833FA8FC3EFA867855 ; libaacs -0xF927314C6EFBDCBBC6013E80C036FCEC74A9A439 = _NONAME_ | V | 0xCD3B849936824E13374B692960EBFE78 ; libaacs -0x07F35DAA633FC036AD2126CD8883B08A7144A940 = _NONAME_ | V | 0xBDE3190B8DCC9EA7F84568723142ED2D ; libaacs -0x3B38E2F5825D159B86EAEB35D0936F0681483082 = _NONAME_ | V | 0x47716BA7748DC62AB1CFFAE130920AE6 ; libaacs -0xAD2B2EFC48DFF4D85192E4F17875817CFD5F2C1D = _NONAME_ | V | 0x1A36377A55428D2B4E647F06BAADDF8F ; libaacs -0xDF50092C438429B845F5C33B6EAC941FCAFAABD7 = _NONAME_ | V | 0xD0222D768CA50683F4425F16AFADFE6A ; libaacs -0xBD7EA7CCA903A9458C0647A782AE5825D9953343 = _NONAME_ | V | 0x8552CB7206AD9F8162FFB852B6F80E8E ; libaacs -0xC0445C927196D56A3C66356BBCAB5C9E1CE01B7B = _NONAME_ | V | 0x252D4A06D65366DABCF1EBDB7359F4E7 ; libaacs -0x348E2AEE2A6193684ECD423230CC9C6A3D5D36ED = _NONAME_ | V | 0x5B8222DAF053601F847BA745AA70FF7A ; libaacs -0x402C2F71D3211D33A08AA81C81C7C7E569242605 = _NONAME_ | V | 0xF8AC3903D752D6EA674784C8EDE37C3B ; libaacs -0x5A8760AD8D28EB29E6971D8E249B5D73DC23107D = _NONAME_ | V | 0x8C240CBE57481FCCDBA669D791B44E16 ; libaacs -0x87A098E29AB803481EE2AC3C4D1773C4E88E3464 = _NONAME_ | V | 0x021332716DB74A3470DFF6493A2EF555 ; libaacs -0x912BB6155E4833C540441D5507A5B8C680233597 = _NONAME_ | V | 0x85B327CB00C6E395CE4C353B77DA3364 ; libaacs -0x91E336709A907AB7E8D4B012E61547D8BBEE30E4 = _NONAME_ | V | 0x8E4980CA9BE4E5510C0C468E4303146E ; libaacs -0x93C80CA53E2EE293C9268E1CFB8C35D5083E661B = _NONAME_ | V | 0x1900BBF37B0798C16EF6DC8A0DFCC858 ; libaacs -0xB9BD563320695F27CED3F592AA674B8BA437521C = _NONAME_ | V | 0x5DCEA67F7F580B6C172BA29BA1B7AFDE ; libaacs -0xBBB5C1911BF68A77AB8F6000879B1843021A6A28 = _NONAME_ | V | 0xAFA8662F0DBEF588A21477171BC46F05 ; libaacs -0xE79F9B59E362A77D1C209A18B814FED44F32E305 = _NONAME_ | V | 0x9985FACEF3DBA6AE142B5C5C01D489CB ; libaacs -0xC04E63E6688F5BAA7C4C8C62E4A8EC0BE1C9AA49 = _NONAME_ | V | 0x370DCB4ED283CC2324CF4AEE1D918AAB ; libaacs -0x4C4A19350D28214D921BDCA0414B24821821D547 = _NONAME_ | V | 0x7CFE167939F8751EF93B1E2F6D3E1AFE ; libaacs -0x62217D84B8159A43E8A96B2ACA6A26A1C2B93F8C = _NONAME_ | V | 0xE5A71779C10CDD8D30F9257DD6869595 ; libaacs -0x1343F641DC56A0B4E76873923E1CF2235AF9BE83 = _NONAME_ | V | 0x508ECFF04E44A0F8ADD9C09C9D3BCD37 ; libaacs -0x19CD1903FB278B101961A0B95096C4F70F67ACEE = _NONAME_ | V | 0xA84C835A538CCB7426A3AC742A16B8A5 ; libaacs -0x2F6116FB8007A17F05D1031FBFFC622C50C2E328 = _NONAME_ | V | 0x4B6043C2FF68059C3890CF61BB4B3BAD ; libaacs -0x5DBADF90880AA7564FD42EDDDE370A79578198B9 = _NONAME_ | V | 0x9B97CAE250EFE34AE6F1718D6587353A ; libaacs -0x08B0B4B38BA9F0AA8437D448B277D11174C57AA3 = _NONAME_ | V | 0xD18DB0620CB23ECCCF1936E54613C507 ; libaacs -0xAC8B5D12D937771B9BA6FBAAF4764879232BF4E6 = _NONAME_ | V | 0x1BCEAA9DF2C068BDB961964B21757515 ; libaacs -0x25CBF64F3C8E817A1F5C79831C15B2E89AA4A5BA = _NONAME_ | V | 0x1A9EB338D7A01D426CCB705F0AF60F34 ; libaacs -0x3A20B724DDA54AF5D774530E785D11CF374A043E = _NONAME_ | V | 0x72B400FCB368FADD88BB00F11617ADB6 ; libaacs -0x770479042D5855CB6C63236CCB2CE0AAF9129ECA = _NONAME_ | V | 0xC065C1B77FB3C5A5132B750AB15C01BC ; libaacs -0x40AC05774C9948DC9D7F317768C392357AB49018 = _NONAME_ | V | 0x760E2D8E64314F7F2856A221AF7FC6D5 ; libaacs -0x1FCD5E1F8BFAAAD37336D4839A180C6BD3938412 = _NONAME_ | V | 0xAE29EC7A105972992A0B91D6CD63E86F ; libaacs -0x6B74DC354BB623A8E22C748CBC8481B86FF0FEB7 = _NONAME_ | V | 0xFB0E41FCBDCF153A302C5C05633251B0 ; libaacs -0xFD9B0AF7F3DB02F6917CA0F342A0C34118F76D99 = _NONAME_ | V | 0xA82016D4C1804CD7197CEC6FF5557E3F ; libaacs -0xE498B443D98DD6CA9BCF91B43E39C81C52E2A60F = _NONAME_ | V | 0xE84E9D82D1D31D61313C51CF8F0DDC03 ; libaacs -0x1B0AAA6AC92A5365B77F23A9364678CBA84F34E4 = _NONAME_ | V | 0x6D5234B3D6F3826D9C1A1428EA578538 ; libaacs -0x43BF6FEC62D6A89ACEA253FDB6EA9D27CCF015F7 = _NONAME_ | V | 0x4D705C92BECD45891508B5BDCC9ABCDF ; libaacs -0x15E1AA259A7F4A34053E137DD371E8EF650D60CE = _NONAME_ | V | 0x9CCC1A61B89FAA03881106629A2BA678 ; libaacs -0xA3B868FAA442DA3FB751EAD5767C2EAE3C07F113 = _NONAME_ | V | 0xC374595828DA97FF392BF4CEDB7F1A95 ; libaacs -0x061A3D6DEA6F07EDE51F7D1CEB43E8D831287ABD = _NONAME_ | V | 0x01F6675A38259C5D139B212EA0828593 ; libaacs -0x9444B1D02EA31C2AAB9A5468448BD11E115E4F75 = _NONAME_ | V | 0xB763E7B4283BA8CB928DDDF90840EA3E ; libaacs -0x9FA39527B920D12E1D4A3A1AE9B6C2B1896F8FA2 = _NONAME_ | V | 0x1E130E3EA95D7C56230BE9CFE929BFAB ; libaacs -0xDCDFF52F43CCB6956D43BEF92120526A67BF6CF0 = _NONAME_ | V | 0x097AF282583E358D54BF934CDAC1DD83 ; libaacs -0x02CFDBB7E8CE07CFD8C2369F9723FB0E2A11B6B9 = _NONAME_ | V | 0x75794756112EF694E7E406B17422FC28 ; libaacs -0xE9EF2937A3833ED09D64EEE2D8948ADDE985BCD9 = _NONAME_ | V | 0x08E1BD465EFC588D05BB22E5A2C3AB98 ; libaacs -0x923BCA01878CBD3B006F03D9D9E439E69BE59E6D = _NONAME_ | V | 0x21C031623689A8DA24B99D354AAFA454 ; libaacs -0x6F9985A4398BB017F2390791478204CB0C24CCF4 = _NONAME_ | V | 0x716A12DA5A6C2951A5BD29C192D3074C ; libaacs -0xB6039CC496E30A72A43A415FF8635ABAC198DA7C = _NONAME_ | V | 0xE4496A188A73262DF25EC37C5A21641B ; libaacs -0x7B7EF2A61C52EF58AF9008C6B4E36F85A2750CAD = _NONAME_ | V | 0x96D23D1453F9CAC09E24D9D57F25AA09 ; libaacs -0x07917B57E2759E2B9BFF0FAEC932A4119D441FF2 = _NONAME_ | V | 0x4B08B12A1988CD785EBB1E35AE0D1D6C ; libaacs -0x3BB5FD475414A1A40D996D6DA8D34183FBA2ABE9 = _NONAME_ | V | 0x86F5096D13072882FE3443C75A149062 ; libaacs -0xB2F6F2C7016C2D0E62B90370863A438848B024D2 = _NONAME_ | V | 0x5D2361C1F529D8F6720FDF5D46FA429A ; libaacs -0xEE8D00808082E3E26437FA3415E3DEA9C53038F4 = _NONAME_ | V | 0xA4261F5863176C57DC6F622E10010A24 ; libaacs -0xA9E6FC7EF7566A4AFF23C77DA55E34CAA7BB7CB5 = _NONAME_ | V | 0x51F337898446F24221628EEF7A38F44D ; libaacs -0x40BD2940EDFBD1747C6EB5E88921F5045B1D9293 = _NONAME_ | V | 0x0509434828A6207F989F614F8D38508F ; libaacs -0x48072ED82F9AD7785BCA75120E033B4EFEDB168C = _NONAME_ | V | 0x2DEA70E9A3EC89FCCE146D3CD11FF0F1 ; libaacs -0xF0C818F5D005CEAC49103A3AB08401ADF925E1CC = _NONAME_ | V | 0x7F56DD52674014B2854BDE6622BD557E ; libaacs -0xD06F836C94137EE4F93EFCDB1A75EA9132CBDD59 = _NONAME_ | V | 0xBC4CA4F63F4B4BB18AB510F028A6901D ; libaacs -0xDEA7B81F6171CD99DDDABB9C2BC8F7915D2EBDAA = _NONAME_ | V | 0xBC76CDB2651455C547955E0BFD85C14B ; libaacs -0x4299AEDC587AEF23C33BA31B271787FAC289315A = _NONAME_ | V | 0x1B51A5B165ACF2DB26848F5B64CE86EF ; libaacs -0x6FF148D313FFC8964B39CF311D9A3A57F53E69DD = _NONAME_ | V | 0xA03456962A8232DAF707366A72436FF1 ; libaacs -0x6094EC0E9794CAE331B944B26FD9CA3CADD78B9E = _NONAME_ | V | 0xA9DDBF1EF179844F2ABC4DB6BABDC2E3 ; libaacs -0x6985C00B2F8566A73654A1B32E4C57316020767E = _NONAME_ | V | 0xDB8BED34EB5BAAF489EA1024DD6FB4DE ; libaacs -0xED8EBA8F9344EB9855B0EF028F838119D05C17A2 = _NONAME_ | V | 0xFB07490CC708A182497E448B99DB1775 ; libaacs -0xEB3018F0F5FFDD6913877198F3DD37C24BDEDA22 = _NONAME_ | V | 0x42987899B9AB0636383869CA65E65AE9 ; libaacs -0x1890CE57B43B72A0F9E09B62AEC7D10432978981 = _NONAME_ | V | 0xBCC7391B5CBABA150D4E0279E5E433C1 ; libaacs -0x34514767CC9B80BB532609BFD1135EF204FE6FC2 = _NONAME_ | V | 0xA81FEBFFDAA491521EFBA955682A3D9B ; libaacs -0xA99C8371A47F06FCFF2E2CFA6FCA8029B27C15A6 = _NONAME_ | V | 0xF5793D58FC1B4CC766CC1BDC7FBDF39D ; libaacs -0x5EEF6A40AAD7D5A232CBBEB82B54B43022EFA2CC = _NONAME_ | V | 0xC22EB490F41C7C5FDB7E8354322B9B76 ; libaacs -0xAD1C1484D90FD1AD639060ECF3BB5CD02DA86CA2 = _NONAME_ | V | 0xAE2B73035E2785E67D673AA2A05E42CF ; libaacs -0xFA143558AE4F58A9740D0C702889C58CB3B9B8D4 = _NONAME_ | V | 0xDB114E7FB21643C7202DBE79F4769899 ; libaacs -0x18A03DE5522B0E63A3C8942B768E33A81042CF07 = _NONAME_ | V | 0x458C2D429582B7FBE38DB57AA9FED84F ; libaacs -0x3ED6A90EA70781E829D6302E3C98079F8FEF49F8 = _NONAME_ | V | 0x03EC0727E2DB6C1ED50CFD13C7E366D3 ; libaacs -0x4A48CF3C227D60891E564DAD27ACEF4FA5AD6D5D = _NONAME_ | V | 0x408C5A71F887E7A407E85117C43B31B1 ; libaacs -0x8686F438E04D5A43A68D427211FAA5ED779F2DF1 = _NONAME_ | V | 0xCBD05F8F08119951F9197267F8A6D0C7 ; libaacs -0xC713886337FBDF3C47C03C5A7829F5FE73647C85 = _NONAME_ | V | 0x57FB38B9C3A66CDB0B61870F7D8A98FD ; libaacs -0xE5F0ED345E9D50FAD9829DB8CCAE27308E72FBB6 = _NONAME_ | V | 0x1B12866B6F4DEA5C204A20AD5B4C1684 ; libaacs -0x3C33959B7FB079D201617732B7C259F347D02D04 = _NONAME_ | V | 0x226CB464898EAA27995E03C91FB7F654 ; libaacs -0x50142EBEAB82FF4CCCBEE645A4D29A6A0EC9354F = _NONAME_ | V | 0x1DCE4458B341A23538BF03E69387BB11 ; libaacs -0x5C12D84B529C4961F935E095B23C19AE5587D187 = _NONAME_ | V | 0x3ED636B631F9CA3EE56C30A10BA551F2 ; libaacs -0x7EC70ACA834E2BD75B55B1B7F71ADF37C41D715C = _NONAME_ | V | 0xC55D94486BB9A93078D00B4C252ADA85 ; libaacs -0x15253BA87FA06D3958675000A78811B518F32CA3 = _NONAME_ | V | 0xAFA41FDFA75B91B7BB9F64C026418C82 ; libaacs -0x2E7B6A30EEDA259C848BA80562A96FFE8E60DF7A = _NONAME_ | V | 0x3A0049811271DF44D4B5DAE2213DF4BB ; libaacs -0x237F1D51C2C18CEE16CFC40F5122C54C9E6FBA92 = _NONAME_ | V | 0x4A9055D81601AA91D76957D3083EFFC2 ; libaacs -0x29C9026279DA933432028082358E97A50293ECDA = _NONAME_ | V | 0x70D94DA6E9EF6CA788B77A151BC55B46 ; libaacs -0x39E2DD61AA8D7CA82A71C17B2460C6DDF945A5D8 = _NONAME_ | V | 0xDE77EE420AE4E1EA56C2B704C4642B85 ; libaacs -0x9853DE1C08084DBD0A956635DD20D017D8F3D05C = _NONAME_ | V | 0x17CCC0655E3363998538E16F3C1FD57A ; libaacs -0x65E617BAD222F740A98FEFA1C72787FDAD8307E1 = _NONAME_ | V | 0x4455ACB8D5F6C7EE34565C21CF7EA59A ; libaacs -0xD9004B4B9C0FB90E1766584654966F129F245634 = _NONAME_ | V | 0x3B02FAD0751EDD6DB1306FE228E20938 ; libaacs -0x23D0A029A921DE9D43CE8E524DEC3D1D07918325 = _NONAME_ | V | 0x33E1452BA025EBFE8D501EB731312219 ; libaacs -0x1F97437AF4C40F021CE0C9E1A2F1DB096B95DF15 = _NONAME_ | V | 0x8BFF0EF0844B5333592A2C32B2147747 ; libaacs -0x9C24F1362E75A49050585361D62584DB8E4F1414 = _NONAME_ | V | 0xE20E3F3612A54410AED471957599977D ; libaacs -0xD84C0486B985C6EE124B6DBCC63CFD6B5D0BAEF8 = _NONAME_ | V | 0x1C0D9A6A74B909C23D4E90E53F673DAB ; libaacs -0x777458F4114A59D7D5E3EF5EA549277BE7FF30ED = _NONAME_ | V | 0x8CAB9F6B8F4D7EFE69E79E8C688311D7 ; libaacs -0x80B23EE6DCD144E47E2EF920F2FC6D3FD8E1856D = _NONAME_ | V | 0x7921701305B6470301BF1A3072385219 ; libaacs -0x89B05251E370A40DAC7CE822AE346307A9170479 = _NONAME_ | V | 0x72A99E88A147CD8E8E81BBEFC98ADF2A ; libaacs -0xC4519EE766262E3C20C8D90F9C9E299311FA6037 = _NONAME_ | V | 0xD786FC8DFC377785A6A572B14BFD45EA ; libaacs -0x6F67FC2AEC54914A0FD2B4C16F96755677C146AA = _NONAME_ | V | 0xBD7A52D49376E513627EA9F22AC81D43 ; libaacs -0x6666C6923DD49C8B33E45CE23A6F094DAA48D469 = _NONAME_ | V | 0xD93AEB3D3208185BA5CEBC00DFD15E60 ; libaacs -0x0AFDB6C20D54962171482ACE9343B2500C32D155 = _NONAME_ | V | 0xE701F7F91E2107C5E61A7D3BB10288A7 ; libaacs -0xEBD41482F40EEF34EA603F3186901F7B62ADFF6B = _NONAME_ | V | 0x678F0D9469C5ED955B8A992006C501DC ; libaacs -0xE97929B13D91F6827E2DCF3FD53481BCCDD88819 = _NONAME_ | V | 0x28DDB8292B275E5D3E6E8CB5B10B3515 ; libaacs -0x08658C08F29C6996D2FCBF6DE0ACA72FBB8C0D58 = _NONAME_ | V | 0x38FD3226B5C67E0B45D445C92C76CBF6 ; libaacs -0x0DCDEBF634818772BEAAA950C11E09D82B9295BB = _NONAME_ | V | 0xEC1081B3E569086827BFFF767207BCCD ; libaacs -0x11B82C9EFEB401898D7619BFCD1424DA3CB0A784 = _NONAME_ | V | 0x6D5438D1AF1C9E0B1C68EA9E0E0491CF ; libaacs -0x5A80315DA1A90D57CBA50BDD5F86F9313FE4DCA5 = _NONAME_ | V | 0xABD57E4BF622F07169A2495C3586E879 ; libaacs -0x6F857B303D0EE6728361F934C2203CDEBA9B0B4F = _NONAME_ | V | 0x066AFDB5C4DE8157671ABCCF89EB7429 ; libaacs -0x34D52351796ADBC0C7C68C219B4C432DE8FF697B = _NONAME_ | V | 0x752C73F1A0473AEE18BF14BEEF22CC5B ; libaacs -0xA0BEA1B330588530CCB810350717831FB0EF6D77 = _NONAME_ | V | 0x6592D2E6F8F1593D59393B53F6320BC0 ; libaacs -0x1621BCB54D21A69081C83C0CBCC6B3FA23332E79 = _NONAME_ | V | 0x73B44660D36793AD7847527CA4D46D64 ; libaacs -0xCAE3924A0459FC38B92F2D977AB3961871A4DF9B = _NONAME_ | V | 0xED855C67FE97429DE1B9E4D4038709EF ; libaacs -0xD06F03F38A0CD198E83C1FD465FA1BBBC73BCC93 = _NONAME_ | V | 0x27C039DA847DDC25815D33D68CCFDD5B ; libaacs -0xAD828338B44FF3518918A7990491138BBA9E9EEE = _NONAME_ | V | 0x817E2A9637C1A28A191E292E47BF0C1E ; libaacs -0x360B333EE4CED6811BA0F1DDA5710A7B1F838C2A = _NONAME_ | V | 0x5D9C5240BA2E9F218331B8A4EC583F54 ; libaacs -0x9BB1D9D94D5B72B5072BCD85099253D9E89148CA = _NONAME_ | V | 0x18E92629ED8F095F58220D60570BFD8E ; libaacs -0xCF08CC71EF81DFDB91C211743F5986E88E625DE7 = _NONAME_ | V | 0x35837EBB2E01F1A2B5099088FEB31F3E ; libaacs -0xA05CD1D4E27852D34CAF0F0035D9A22C8E7E6247 = _NONAME_ | V | 0x5AC3DA8FC386056913F2B10D36045B82 ; libaacs -0xD5BA5DD7726D2E94AB70CC4C30BA844F81B4535E = _NONAME_ | V | 0x9ECF78192FD2F3FF5448584FE8CEEAF4 ; libaacs -0xF490FAD110DED1D404E54CFAAC4274AA0493CEFA = _NONAME_ | V | 0xF6C3DE10A289A2BB336E2A06EBE82F2D ; libaacs -0xA44D56CD5761F06D41C0228FE17C1118CC9E4DAC = _NONAME_ | V | 0x7B79C9D7E29FB5840D963C832A7E4985 ; libaacs -0x806A243C244FBFE71A8D29BF59AE68FA6B472D89 = _NONAME_ | V | 0x868776B3E0729DF1BD862FE528888111 ; libaacs -0xC0F6A7EAD755C6109805573655CE31E031A5EAAF = _NONAME_ | V | 0xF8EDCE14446817E79A559C8BC63FC5F1 ; libaacs -0x3411E53D53DB29EC0D5FF02A161CEA7FCC6E33EF = _NONAME_ | V | 0xDF78AE82FB273E21C1A9684D90AD93F5 ; libaacs -0x73AEBD4E54B9E6E8AB4377A9D808DC01B93A2E43 = _NONAME_ | V | 0x687B2C1F2A2715DDE89F299ADA82A83F ; libaacs -0xAF3FA2FD3D2BCF0FF199D97C3BBA4EFE9BCCBB84 = _NONAME_ | V | 0x60A145A1A3BF9A15688A7AE0CF00F0A5 ; libaacs -0xCF973795A510B236450B0EE449B5D906BC4D2746 = _NONAME_ | V | 0x88F6D2C58F0CCE7B94524511928C7EA6 ; libaacs -0xEDA7B8669BEC772C43B0E1BA1AE05679FC5A677B = _NONAME_ | V | 0x1376218436ABDCB6953B41A9ACCBF9D2 ; libaacs -0xA1193E8FDE9815A824769A07B85B43654295E306 = _NONAME_ | V | 0x54522DDB29FF688078BF61C315E9F200 ; libaacs -0x7E6DF25FE0F7F88A0AAFC042807330422BBE012A = _NONAME_ | V | 0x1C06626F4102D6CB0074FB24E138DACD ; libaacs -0xFA2FE636F395AC17538ABCAA5F791530157A5588 = _NONAME_ | V | 0xBB63BD220BC444D82EF44FE9825B71DD ; libaacs -0xB452568E8E182812BD701B7C79B4975CE5417331 = _NONAME_ | V | 0xDB8958F1833169A33FCAC97C81504237 ; libaacs -0x1A83D81FEEED6653A63FAB046C4CB7F07657823A = _NONAME_ | V | 0x0EEC00D7A9EAAAA14783D00224D35D8A ; libaacs -0x5C97A39EA231F6DDB3B7CB147F728ABCAC8A2DB3 = _NONAME_ | V | 0x8E702513A170CFDCF0B725B7B3C37901 ; libaacs -0x5B712A433BC33B6C96B3D0DF75C694D13C6D4EC2 = _NONAME_ | V | 0x2B58678323E8143009E98C1DD6B75133 ; libaacs -0xB04ECC6BF148A4A916C63BBBF69FAD087A89363D = _NONAME_ | V | 0x9A5CA3EC401F0BDA9FEB39B8E2D70B69 ; libaacs -0x1346B3CFB35D80F353021432D5F40C9CFAF192A9 = _NONAME_ | V | 0x4F097D13794A1A705F460826EB572230 ; libaacs -0x26AFD069140397D2D3D95A6D4F2DB10E4D174E90 = _NONAME_ | V | 0x619C5622AB390D8F404FA78E73B950DF ; libaacs -0x6ADC2AFC426861AAFD0DC573EEA94850656E93D7 = _NONAME_ | V | 0xAF154BBBC61C870864F312AA6BC8BACE ; libaacs -0xBEE0ACED3B72293864F961052C643636E5113D17 = _NONAME_ | V | 0x4CAE7F483A774496CEB1B8FFF1B09FA4 ; libaacs -0xA9BE5BE33EB034B1AA5FE7405DAAD48209D3FF3D = _NONAME_ | V | 0xBE20C320F36027D7561C277389B1B3B0 ; libaacs -0xD8A124D4F50A7E74A6FD073251A4362784D74DE7 = _NONAME_ | V | 0x3BCAB20876A4AD41B18A3D8782B86025 ; libaacs -0xAD0581EAF46BB8C0BD3C5678264BA52930E35A12 = _NONAME_ | V | 0x5061CFE966879D7F354D083CB8EE0FB1 ; libaacs -0x1429F6631B3D8290A9DE9501874998E37FF1FB2B = _NONAME_ | V | 0x19AF5C9541465A40FDEB72EEE420D9A9 ; libaacs -0x3CEAA389769C95C56E8C77B6FD25EE5AD2BECD7D = _NONAME_ | V | 0xF14D11BDD6BFD3D3F70C87BFFC4D19E6 ; libaacs -0x58265C23A5C3AB0F4769200326ACB8C909AD9249 = _NONAME_ | V | 0x3EF3FFE12E0F289880C07F80BA5388F0 ; libaacs -0x2A558F7DC8941D2393AE0F6A797240C1C837522B = _NONAME_ | V | 0xE1E7C5FFCE314FDB4F91D8CDAE95BD14 ; libaacs -0x4B21BA118F9AB29CB163B1014C9883B33F31494D = _NONAME_ | V | 0xBEC39A4088E1C073CC7EE32C9F7E7994 ; libaacs -0x81AE4981B97FB8CD77670AB44228EB4FF086CC7D = _NONAME_ | V | 0xC74058E77E10F0DAC891DB31BAA3AE8D ; libaacs -0x5C44402AA27B153110D8A85349263904DFBEEE5C = _NONAME_ | V | 0xFD5111BF9F81C805A0DF775D841294DE ; libaacs -0x33CD54FA006A679D2D1FEA95AB94A44570B97B8A = _NONAME_ | V | 0x2571F0DE69454EAA77EF8D5A997D93C1 ; libaacs -0x0331D9E42A446238A920E721C3335B6DF134D7C1 = _NONAME_ | V | 0x635E4C1AFD0A0C1CBBD35BCAE9FFABE9 ; libaacs -0xBF8A9F25C28ADC22A38B5F4CE2B7FA2A537DB9D5 = _NONAME_ | V | 0x25F7CDB06B6F4E3E701AAAD214DA70EE ; libaacs -0xFD717CFC157575B2540696CDA2ECE50E314E3734 = _NONAME_ | V | 0xCA3ABACE0DDE448B2CBB21BE9995E4EE ; libaacs -0xA0AA491CF79EFF1E81F3C677CD1EE5BCCF7861D2 = _NONAME_ | V | 0xC2E50CE60278D396C1936C1215DC27DB ; libaacs -0xAD837722C0CEF3491EED25EE1CD9B7F07F919F3A = _NONAME_ | V | 0xEC48640E8F14305EB2DBC659F21D3554 ; libaacs -0x6A206EE545B75F556E4D231A5AD2D927A7A03118 = _NONAME_ | V | 0x3CEFABA3F2C2947BD24EFF5F91F5E2BD ; libaacs -0x85F3E668585F9361D4805CC4178D85B148878ACC = _NONAME_ | V | 0x831E2E42FCF2245921001DABB06F0D5A ; libaacs -0xCA5BD5BFC9037121FEEF7A9548FE784627F5B14B = _NONAME_ | V | 0x01EAB92FBD0514B3FD46BD6867E89001 ; libaacs -0x118EB036EEDBB2A5B408F9C4ECB0EC24E1AA4E96 = _NONAME_ | V | 0x159AE885E05BFDCD9EA3D2BBABFBDC5C ; libaacs -0x28C2EB32940FDA21B92F4487319A6205A718EEF2 = _NONAME_ | V | 0x700DEB8B02266694E48C86E5D5F01EF9 ; libaacs -0x3A01C160CAE1FBE190B0BCE6338C5067CDA23B6B = _NONAME_ | V | 0x2BA965BC5259C78B6573BA682FAA6161 ; libaacs -0xCAEFB9532EA10AFC2ABB8E0D7F6EE1EEC43A0FD8 = _NONAME_ | V | 0x3D8128DD29D95C07FD7C0439BD3A92B3 ; libaacs -0x81AA6B4938D1D953770189F2392538EC63007D6F = _NONAME_ | V | 0xD9B18971BB203B7D03BCED3B1133A10D ; libaacs -0xC16637FBBB3F210BB587C6C883072CCEDCD5B9C8 = _NONAME_ | V | 0x8BB1E3CA03705B7F6CC5989CA805F686 ; libaacs -0x896F9A95F73C6B472B331E18524DE0BF889B93A9 = _NONAME_ | V | 0x891B11A945D0239A7EFAADE24015B367 ; libaacs -0x97F9471B5D660C110ECF84B854152C54FEF5BCEA = _NONAME_ | V | 0xFB447ADEBAD69ECC5B9102058AD021C9 ; libaacs -0xD4AED2064DFB45B33FC156E00F6069A6900F57CA = _NONAME_ | V | 0xF78F31D3CA9D234A80BEC699F2DD0D10 ; libaacs -0x9ADF4DF0FF193FA0333A1EBD3CD8D320D654BF03 = _NONAME_ | V | 0x981543B7B3B5B15130BA2BD20219FE9D ; libaacs -0x15E0D5CF03B575A80562D62C66B3031F613EEF10 = _NONAME_ | V | 0x7E372313FBA5D3208568AB9576E61A6C ; libaacs -0x8E43CE082FFCC82995BE036152D0E57D83A05C16 = _NONAME_ | V | 0x350C5B1506CE1B90FA5CF21EB1E94BDD ; libaacs -0xE7B411D4C8035B323BA9986B34DA18FD36971C99 = _NONAME_ | V | 0xF345FE96AA5C0B9FA36406ACB8C89ACB ; libaacs -0x183B9DB615D89063875F32636C488211322CB64A = _NONAME_ | V | 0xDE295E4831C4641EC1CCC421718F0369 ; libaacs -0xCA58F307B4DD7AFFC6BADAEC021C92CE19E328E2 = _NONAME_ | V | 0xB471586C5CF68B6A0CA48AB26EE1F8F8 ; libaacs -0xC582919287B6AB4638EB9F1E6AE95EFC2E9B96E9 = _NONAME_ | V | 0x435CC29816A23BCBBE57D379C6CA2C10 ; libaacs -0x102E7DFD1DCD1D3215713C100A09FB2CDEFAD256 = _NONAME_ | V | 0x19B065DDBBA4EE728B9935452E6849B3 ; libaacs -0x8B83AFD497581EB48FF3D9658634D8CE67003C3B = _NONAME_ | V | 0x3C6CE2D1D7C5BA158815D03C1DB24E98 ; libaacs -0xA26D64678EB12741FF5339E6891A032C40CAD3C0 = _NONAME_ | V | 0x1377A900C57AD2B044B69B9027C06552 ; libaacs -0xD45CA84F35250A5DEA9EC623BABB52C1CE7D41F1 = _NONAME_ | V | 0x449F4EBCF7D9B70EAA41CE3471EC46C7 ; libaacs -0x6FF16135E4B0ED7925008D858C6BDAA3307849BB = _NONAME_ | V | 0x68FCF84C1593CDACE40D88BD7A220AD9 ; libaacs -0x9D9C3EDC497F640ED6FD3D134E9AD33B1F883D01 = _NONAME_ | V | 0x79EBA5AC493D5BEEC0ED545445892032 ; libaacs -0xFE21ADE42211887A40A2221B36273F48690C732C = _NONAME_ | V | 0x9ED9716D5B4E448D4FF0939CE37BFE8C ; libaacs -0x582093A503CA07353BA1823BF116F3280A8C6277 = _NONAME_ | V | 0x942AB0AAD7D627F7F84781A8DBF41B5E ; libaacs -0xA9D91D5F997E70E855C07E9FE50C9D6C30FACC67 = _NONAME_ | V | 0x08E674FCCD368F0C55C55D06DC2F4C0F ; libaacs -0x7310DA0A71630622D878105D243EB811649BF55F = _NONAME_ | V | 0x3D516C8A75621C1CD48C6EAA94A386CC ; libaacs -0x1D88C4630E00027EF4CDAA559BF6D6BBC616C8C9 = _NONAME_ | V | 0xD5B4CA094DD829C83C392DD8A36DFD65 ; libaacs -0x1FBAD734DA92FDE45F5CFC3F4EFBC9069A01909C = _NONAME_ | V | 0xB551B11342E0065924F7D26BDCF5D0AC ; libaacs -0xE0A75F5E726DC2DCDD20E4FE9EE7AF0767AB9990 = _NONAME_ | V | 0x11309917E5C6446219F9CCC380989CEF ; libaacs -0xF4F320C0AAD96CC299A5DF0E9BB1F0BF5EC20310 = _NONAME_ | V | 0x3437730B4BBB91D0527E831203C29E09 ; libaacs -0xBC004689A314E1F52B6255A8AC1604F6FB3B32D1 = _NONAME_ | V | 0x6D7D7BCB86C31DD64477CE16A9790B42 ; libaacs -0x215C9061C6FA59292C68EC1E814D9397A557938C = _NONAME_ | V | 0x95A7483DC144742B3902A77A5BA5BDF0 ; libaacs -0x3182B0A2D0DB168ECE19F91828B926D74C6484D3 = _NONAME_ | V | 0x070E00405C0B1BC311E6BB92FB5AD81A ; libaacs -0x5BF4E78986665543D386E69EF52E5F419897E62C = _NONAME_ | V | 0xC05EC0CD5D96BAE9C8CA96A9135DD5F1 ; libaacs -0x700652250BC55C99DFA4CA5AA8C7EC2C821D1A14 = _NONAME_ | V | 0x0BB0E83D9F595BC38993CAA778A5B0AC ; libaacs -0x7CCD4B3C60C2BF03E805CD75F17EEC7EF6BF29FB = _NONAME_ | V | 0x857994045A92B1C7711B9D30B11F4121 ; libaacs -0x1B6D6C0900A58C411444F008043DC602C95E2DA1 = _NONAME_ | V | 0xC1609E67A4C639E40C9B32531DEBDEE2 ; libaacs -0x1A2D68375E5DA3A686AAC7AC5A766D116DAC703C = _NONAME_ | V | 0xBCC735E18984D6F085D9C41BD6B33DE1 ; libaacs -0x1B5D66BA76936B6A6D2EE268A3082FFBFB23D62A = _NONAME_ | V | 0xEF963F8B9C81E950706389B726D40F60 ; libaacs -0x1AE7DCA31772F5EE0A123F03B0261A7AE1485470 = _NONAME_ | V | 0x297AFE0C569AF5FF00D12CD8C14A40EC ; libaacs -0x77A62B9168C4271DDC6664E1D199880235093FA4 = _NONAME_ | V | 0x5641DA53C7E709111333B1309482A4FA ; libaacs -0x891A1AC10D95D9CD73D58DD9C6709B95D75FE24B = _NONAME_ | V | 0xD1527CBD1FD40677782010172B5B01A5 ; libaacs -0x371E745E0025AC7DCAA24E4267814C9C2D82AE0B = _NONAME_ | V | 0x162CB76BAF6E7485CC77E3B7EBB1DC91 ; libaacs -0xD04780E7A08642BAD79C46144CA2C5CC64FD0ECB = _NONAME_ | V | 0x1AA4616DE367FA962664174E0F92A2D0 ; libaacs -0x75DB5BDC9FA3CF43D04553483DA1AE3C969FD05E = _NONAME_ | V | 0xBF2A129BD2A6EFCC205C2018E46AD09C ; libaacs -0xE4C476E34A132DEAFD0883BAE4127352FAA48C8D = _NONAME_ | V | 0xED933408D9AB3BB15D787B8BBD560CB0 ; libaacs -0xEE1E057D5A87BBE9DFAB3EA0F99E07297814C7C3 = _NONAME_ | V | 0x88B0E76E97AA9D106434310B4862B990 ; libaacs -0x8D829456A7B803F87489AEA37573C3F3AB6C9220 = _NONAME_ | V | 0x44EED68BF196C14B125E7B2CD5650E3C ; libaacs -0x6217690C9C9B7512D51D077C06AEC46B0BE694ED = _NONAME_ | V | 0x3AD60E36B61856DEB7A4564B8751ACBB ; libaacs -0x9DED2BD4F6D0D53EC08D5330FD08014EA8CCCEFA = _NONAME_ | V | 0xB29733ECE4C7BAAB0919D201F2D07308 ; libaacs -0xB9BA2D45BD094DB21F0C19146321581DA5BBAB74 = _NONAME_ | V | 0x8BE111864126C02A97FEF5CA8109286A ; libaacs -0x343EE4A90D42CC1C79BE98443393EBF46757BB65 = _NONAME_ | V | 0x81A53A062349209A7BFE3EB8689F7561 ; libaacs -0xFAFE9A7FA9B17A6A74196438291C279396BC505D = _NONAME_ | V | 0x0C6C96AD171CD98DF6AD85B8051F1026 ; libaacs -0xC0C369FD4EC9D974DAB182B35154D837B09C4161 = _NONAME_ | V | 0x0259EC64F2344C26F298558338976B64 ; libaacs -0x2D57C2292E212F52B7243EA80691D53195D40518 = _NONAME_ | V | 0x13723D63256BC9D444C002519C48DB03 ; libaacs -0xB0B39988EFD456CC922A46E729083BE6FED79DBE = _NONAME_ | V | 0x5D702C4A14111C8D40E06E9E82591DAC ; libaacs -0xB15F4CB67CCE155170F9ADAC6BBA65D331093707 = _NONAME_ | V | 0x0DE26FAF2DB1BD38818A5FFBA40407BC ; libaacs -0xF47A83D5C12350F693F3E34DDE0D9DE0581976E0 = _NONAME_ | V | 0xDDFA002CA07D025E415FD4D7DCB60A15 ; libaacs -0x023E21B39ED7C456745A0D63865FF8B528FAADD5 = _NONAME_ | V | 0x52041DCBB4526090BF8495CE3741B967 ; libaacs -0xB7BE760E30C941B4F72C20FF4763392CEDFA99BF = _NONAME_ | V | 0x33D863A8330C3753B05630AAA1FC1DC9 ; libaacs -0xDA76C09D7740D6CCB1DF82BA3CD6BE587C99E3BC = _NONAME_ | V | 0x2B707AB01D7539F1E6342268DFB1028D ; libaacs -0xE2FD8C2BBCFBF323CFB9F1593569ED49B1A90857 = _NONAME_ | V | 0x48C38D637A9593254ADE73C1050F6449 ; libaacs -0x93E9DD8151F9859C2152297411515FDD943D22EF = _NONAME_ | V | 0x533977C04AAAEF15883100CE4EFE09B2 ; libaacs -0x9572C749CDE6F2589B67D61333C2B25E2AC2D6A0 = _NONAME_ | V | 0xFA3CE81D2757E1536D80C7517CA2C63A ; libaacs -0xCF9C30C9C1EA60B83CA1E7BD6A8F686468D854E2 = _NONAME_ | V | 0xA1731CFD0FBAE45DA3E7651BA1B97F67 ; libaacs -0xF8D307FAAB5B1F54C49010B8C91207FD9A37FE69 = _NONAME_ | V | 0xB6B86EA35D4A759CEA05FE2CCF0EC456 ; libaacs -0xDF7FBD1FD04BA8C9D0F778C61540A9E54DAB1A63 = _NONAME_ | V | 0xD6C82995C600EA1A6484AAD1332A3729 ; libaacs -0x14B10F2FFFBB6199B46F957C830F9D2E084587A6 = _NONAME_ | V | 0xE58A09382E94BABAEEE10BC6A1E19AA3 ; libaacs -0x5A4EA5355881A4A063AD78D594060CC89C7E7739 = _NONAME_ | V | 0x3A09B551C511524FE34FAA4A3C30964F ; libaacs -0xE8315F4244B6E567618B642F15B093A7AF72F895 = _NONAME_ | V | 0x3D21038506C8517BACC1103C23E1B57E ; libaacs -0x167FDDA5D81C5F4EAAE2755F98020C2000C286C3 = _NONAME_ | V | 0x76F386E8DF4E48541808A2343BD0455F ; libaacs -0x55E83685A755CF88CC52D6659D7EAE0A56978110 = _NONAME_ | V | 0xB9444058FCAB13297A544C2FE208CD29 ; libaacs -0x6742F9BC31940C19160C8D557FB9C85E68043127 = _NONAME_ | V | 0x91AB67678338A78293D0CCD252C4B1C9 ; libaacs -0x78F669FF2148EED4F549B22DC46CDFAC2BCE47DD = _NONAME_ | V | 0x575BC0F8FDC41BF849835F643A050F05 ; libaacs -0x88987484F421889060FFFC10C6FFF657EEDDB114 = _NONAME_ | V | 0xB7BD658D34FE0683B5F7D4BA680ADFF8 ; libaacs -0x9B7F86575A3B2D8961909B77A163B235D4CE7CB0 = _NONAME_ | V | 0x18A177108A43DF1F09ADADBC0CCBBD81 ; libaacs -0xF531F17AD666FF8B6A374D8B32CADA836DAB10F1 = _NONAME_ | V | 0x1D718354687EB080C6689110FAB40AF0 ; libaacs -0x6D57C5B985FB547EA2D9383F8117773FDE0528AE = _NONAME_ | V | 0x858CA443A8592775B1430DA607E9B737 ; libaacs -0x5E20BAC3F35EC529F77CE0C8020A0873D34D5579 = _NONAME_ | V | 0x1FCF71F0858231C073755C0C1695D933 ; libaacs -0x31622FFD71CC7AC2D974C50F4463FF8E37CF98A7 = _NONAME_ | V | 0x77FDEFC2179F797608F1A90DBEB417BF ; libaacs -0x1B7DCDA04C70860F433C8C0A5FDD238B82B596C5 = _NONAME_ | V | 0x2C707B67DED15F2D558CDC8112CC1B01 ; libaacs -0xA47EBC1DA6BA6675B3E8995911FF6EF058111690 = _NONAME_ | V | 0x6D4EF50B721A9C0A07BBBE640205E6A5 ; libaacs -0xA03653F98D20E9A8874C720D1DBA4ED616E5C3A9 = _NONAME_ | V | 0xAD1E962E59FE90418D43D5E4B58BA1E3 ; libaacs -0xD41306AB5FBADFD0AEA7515CDBD2AB434A4B53C2 = _NONAME_ | V | 0xC72025B1DD3C06CB0D00BA46AC4D20C9 ; libaacs -0x14F738C53682D17EE211A3F9627332D1CE3633DB = _NONAME_ | V | 0xDB905C10A83EEB18D568DC53C96D76C9 ; libaacs -0xB20D19FD40AE1BB68701C4A985825FAA91B700E2 = _NONAME_ | V | 0x44C358255293F545D19B8BB55497627B ; libaacs -0x04E689D47E234C87983B5E51E010113DCB4BEE94 = _NONAME_ | V | 0xDF9B372DAD5113EDB323F6F7A032BB62 ; libaacs -0x8626ED4AA5627040CA3EBD519455AB1824D5ADED = _NONAME_ | V | 0x0451D4F783EAF651ADDFD4C11B0E83C7 ; libaacs -0x7A78E256503669B8BDC00A40FE9D86DE36A795F4 = _NONAME_ | V | 0x8D20F956041F3184CF707FFE9202F074 ; libaacs -0xD153B8FB226634D24A3AE53EEE115A859321D168 = _NONAME_ | V | 0x9D20E001FAC7ED4365380367391E883E ; libaacs -0xF955B40AFBF8F7AB0CDAF5AEEB37ACD58893B143 = _NONAME_ | V | 0x4F2586ADEF037D4E54E7F66F55AA74C5 ; libaacs -0x3A51F1C0A9D4D62F8DE306AAD9A4D2AFFC2447D4 = _NONAME_ | V | 0xB229A7C655AB66667419597CEC5F25DA ; libaacs -0x59D20E922D3429933E74FD3AA0907564BE7165DE = _NONAME_ | V | 0x3684D1845956ABF389829C4D07F83E2A ; libaacs -0x58617FA3DBB1BD1CB88FB0D0BF73EC595210405B = _NONAME_ | V | 0xD5612DE21C315B3B6A07F24F72A219A8 ; libaacs -0x831B17E54DF3BF9D8C35E2A33B1289D86E5E16EC = _NONAME_ | V | 0x910FEA09EE4EE08F3571CAAD46AC587E ; libaacs -0x99E7EF700418B7D7829E558F68FAA60E932F1EAF = _NONAME_ | V | 0x3C95BAA93C3049F7FAD2F85E4C17B453 ; libaacs -0x96819CD4A81BED9D5F7FE81110C7D6E4E6C6AF2C = _NONAME_ | V | 0x04F96D4EAFECCB48B97A4AB545EDA9E2 ; libaacs -0xEA2C87F6B84BB5FA438F3F4A06F2922FD8821EBB = _NONAME_ | V | 0x41F824818AF0265334F09B8E5FA777E5 ; libaacs -0xB94F4CA220AB316433922FA66F45F1507D29B86C = _NONAME_ | V | 0xB22457ED5EFB5FF1D14059624A25F27C ; libaacs -0x20A9E7D4301291523785F9A30CDC7918B1AE04CB = _NONAME_ | V | 0x735560A52BD4245B5FE8A350FA94F15D ; libaacs -0x05B45BA0189B658D46506DAA39BFA04B9009E4F2 = _NONAME_ | V | 0xBBBF0E34C0C8D49FAA690F5E36EFA344 ; libaacs -0x047F5A9F15DC5B52587F038D10A2EA800CE1CB75 = _NONAME_ | V | 0x5B8B57202AFC963BC7EE6287B7D19666 ; libaacs -0x7D9E51C515903A21BE9F8153AB7FC9EB3A88053E = _NONAME_ | V | 0xF0F648E00D3C7DEC67085ED7E6F61018 ; libaacs -0xC23905E3A517C73E1AEF0747E2F2D371DF7B3D15 = _NONAME_ | V | 0x5CDB7C92770EF738AFE6B0EAD8E2F4FC ; libaacs -0xD3AFDC1A02DC41071D99B8FE7973AA507038AC56 = _NONAME_ | V | 0x8151DD7453210CF5032DACB723610038 ; libaacs -0x30A361028BEECB8FA9179CBD374B5BAEC27C9001 = _NONAME_ | V | 0x98C9580F358F699453E4CBD9C140BB7C ; libaacs -0x6F244057429DB1641321410A8F69F44C0727A4F1 = _NONAME_ | V | 0xE762A2FD3C41CB30B6F359C0BC734A02 ; libaacs -0x93EB3CEDE5020445FA6CE29D28FFF09A634DD715 = _NONAME_ | V | 0xCA23204D21074AB51FAD89EEED8A4AE6 ; libaacs -0xD9CAE676720AA008125F7BE043EEACAD6364F636 = _NONAME_ | V | 0x37FE50E215902CC665B25EDA07624869 ; libaacs -0x8A20B9866722A061ECAC53560AAA02622DE0BF37 = _NONAME_ | V | 0xD7805CD2BF6610CFDC0C7A328768FAB9 ; libaacs -0xAE0A7F18578C2175A4629B0CE097A572598BB829 = _NONAME_ | V | 0xEF6FC0F3764E70069B6C7E019C273F6B ; libaacs -0xEE60B7F0049B7CE58AE16C0D89A8BA454C4534C2 = _NONAME_ | V | 0xEEAF9BEC2484ABB6A9ECB158178B95AB ; libaacs -0x5344E333105AD8D599516D7F6C53EF5A6DBF6624 = _NONAME_ | V | 0xBF58311D4CDE3AE3FA6977932A499AEB ; libaacs -0x7683B6BFBFB5F46F98D0EBC5F76F49DCFFAA6475 = _NONAME_ | V | 0x56D07CB938C07DEB7A5C6DCBA1D7848D ; libaacs -0xBF4A6D7E2F2C7B7AC7B7962BB79F048ACAD54F5C = _NONAME_ | V | 0x5A853E593F67B7752582388B6F5D922C ; libaacs -0x6C0AEF3773804D063D87F0F10FDFC06382DF4A7F = _NONAME_ | V | 0x5BCBBD4887AD392E26A8128BA9F0F14A ; libaacs -0xFEC5E108A65AF3C725816FC284A03A7ED02C30EE = _NONAME_ | V | 0xD23C08063D9AE6E26A6F1B16C97C6B18 ; libaacs -0x52692BF575B16EFDA7756B8E5090567E1D1A7FCB = _NONAME_ | V | 0xC463AD3D957F542D43C77D9601861CCB ; libaacs -0x1AE1DF0C98F048D5B893728622BA387E077E1F29 = _NONAME_ | V | 0x7C40CB8ACC33BBC3F3F2B17A6B02E2FE ; libaacs -0x8CCD5A580BA74485D900E24200C468255EF106E8 = _NONAME_ | V | 0xA1592903F87C877F9011AA48099BB0F6 ; libaacs -0x35F597010A0B7E40E5D0BBFDED4EC55E13F05350 = _NONAME_ | V | 0x3D026BBB0E1F8100CD293D1BE4FE041F ; libaacs -0x8CD10C222744318105AF11F33023F4B186D50783 = _NONAME_ | V | 0xBE6F75A79C1F500391CA01F5EAE3045C ; libaacs -0xD07DB9AF9F7AB8FCDF4F7432EE71BA69CA37BD9D = _NONAME_ | V | 0x3174B0EEA73664228FFD54CFB9659678 ; libaacs -0xB12BBE9A692A549E37F4C75FEF9FC56B1F6E0289 = _NONAME_ | V | 0xA6BE5C18EB3D6DBBB52F8AC55E8CA5C9 ; libaacs -0xB1E63590D10592EC1C54128E130A3C99B3838365 = _NONAME_ | V | 0x49545A0D51EFCA113AEDB37317C2B93A ; libaacs -0xA784562CC95E72F5C659097CE5B6DBBE6D7CB92D = _NONAME_ | V | 0x83EA08770349EE4E761D5B6149597030 ; libaacs -0x326D1CD23B54F5048B569B161BC0190B18A237BA = _NONAME_ | V | 0x8D69F1AE4611F13724CDC6C97BE8F710 ; libaacs -0xE291CBD649D066087F14A0CE47236EB1806A9E6D = _NONAME_ | V | 0x87EF337D8956713E042D99CFD8229DF7 ; libaacs -0x5C4F3147C8B853C26ED2152616C07559E02FCF87 = _NONAME_ | V | 0x70046A7F8A6D55EA838190ED7C786694 ; libaacs -0x199C3713A07DE5D31898122FA3A2E961EADF8629 = _NONAME_ | V | 0x86C3EFAEDC8C7A70BE3C1AA9DBDC8347 ; libaacs -0xAF4B0051B485A0AD2F86267E40414C1EF9A24F78 = _NONAME_ | V | 0x7B6D8ECFEDD19CF1313FBCA582FA75E8 ; libaacs -0x62EBF96BD622861742FE858E29C3F239F3619BEB = _NONAME_ | V | 0xD93A2ED489F1E56F5BC8A06C6C82EF6C ; libaacs -0x23FF53BFDE230BCA82F2D4303180CBD3243D85C9 = _NONAME_ | V | 0xCB0AAA35F7705DE228F10E80FA671646 ; libaacs -0x2626558E360F3ADF7849656D214740A87C23F5BA = _NONAME_ | V | 0xABF64E2EA912A8453D393B1602B15044 ; libaacs -0x54FA2BEB3AAA69EF2713FAE9A68D356ED1C198FB = _NONAME_ | V | 0x00FD123379C2F511C2DD9FE3CC00DC1E ; libaacs -0x86BBDEFBB99A99C62164D48DAD98746BFA7D6FC7 = _NONAME_ | V | 0x0D739E074F56F107A06C75296AB1A53D ; libaacs -0x9C30A66339CD16252FB9E305E6679B11ED6F3BA1 = _NONAME_ | V | 0x73219856F259A7CD51E0709FF7273695 ; libaacs -0xADCECE9A3AE32E531D884767F4838022AB737A4E = _NONAME_ | V | 0xBCB44B5954E54C06AF80F94F8D42866B ; libaacs -0xB8E563AA0C37F7D4CFCA9F6A9022F95A0719F756 = _NONAME_ | V | 0xD702982CCEB2E7B1663D014B7EA0ABC9 ; libaacs -0xCB3F3A00D636691E5799FE638C25CD40F0D4C523 = _NONAME_ | V | 0xD1709E25593FADDA164EE855B42BC057 ; libaacs -0xB5D15B359AAFA28B519B546941A5F191181BAEDE = _NONAME_ | V | 0x68F0B5EC0569C86C7492FCC62058E69D ; libaacs -0x8B4C1E7CC0653B9C5C97E59E73AA2F6104CEC607 = _NONAME_ | V | 0x5DAC87915EE790E748CA940B39B42ADB ; libaacs -0x1C694B8136E32A00F8EF7AAD0EADB93EB79C8E81 = _NONAME_ | V | 0x99B979F60E48234E5175019167D8AB8A ; libaacs -0x08AA037370B798A806A0409484C208A5ABA0DE4B = _NONAME_ | V | 0xDFA4613C569CB16259E1E018D7D64D90 ; libaacs -0x020AA312F76A23E3ADF1386439C3298A93960AD2 = _NONAME_ | V | 0x1C378CEFC849499083D3576868ED4613 ; libaacs -0x6B41732053B1B94950ECD53D8EA5885092428EE5 = _NONAME_ | V | 0x6081F31BC324072BBD6F16A29687D2FE ; libaacs -0x38A0CEC9A34135F22F6ED011AC2CEB47E5E335D9 = _NONAME_ | V | 0xB43F0C42D5DE55F08462368CAF452DAF ; libaacs -0x5EF4A023745B2EEE361BA6B84ABA010771DB6D67 = _NONAME_ | V | 0x42B5475795922E47F13028A2EB88EF00 ; libaacs -0x9D664A08DA479192493EDD51757B6BBB99F1261E = _NONAME_ | V | 0x3F6D7A2B5094FAC0B566CAC50008DBBB ; libaacs -0x489885A6E2164CA18678DC6954A83BA9B2407405 = _NONAME_ | V | 0x39BCF30864A4641F653163265F5032A4 ; libaacs -0x5160D2E1AAAACF1F0C464EF38680AEB9F9F62F96 = _NONAME_ | V | 0xDC147B4C907CD2AD9E584EFC12CB92D9 ; libaacs -0x893D8C7BAEC4ACEEA29FF650EE6B78D5225549B5 = _NONAME_ | V | 0x19170C2BBBA22397B164B336F1865383 ; libaacs -0x958BEBCA915FB79B007F5E0CCB1FD3FFEF96243D = _NONAME_ | V | 0x8B89C4448A331CC963DEB34A69AB3436 ; libaacs -0xD7B0EAFB2A38EE69FD7A2D10B637366C1B36D1FA = _NONAME_ | V | 0xA22C45DC9FF71AEAAB0D171AC5E16580 ; libaacs -0x89B8C9E950F5A7EF081975763C81D2CAA88D041E = _NONAME_ | V | 0x2D94FF51BB41A8BF08CFF6FA1CBF30A1 ; libaacs -0x927C540D0D73A378BA801CAE42C91F0A6374D5F2 = _NONAME_ | V | 0x971ED1B25CA3AD8D50D6FCA6944F01E3 ; libaacs -0x1BB1C2A6C51A0BB0B081A6BCB7F302617642BEC1 = _NONAME_ | V | 0x3CBF72ED1AE2F55C8F1484D4FA407973 ; libaacs -0xFF502C75C3FC7B3FF4FD15B1FC22E46D2720B21E = _NONAME_ | V | 0x6FBA2CFF53BAC7127BD71A994CE81930 ; libaacs -0x0A0337A1F2BBC868B6D2FAA5139A37057C0434D7 = _NONAME_ | V | 0x55B90386316A245569CB4771D52D0041 ; libaacs -0x57F928D67F01F0532BB2CF06BDBF1D4912036AF3 = _NONAME_ | V | 0x19DD515C64D8F320C1FBE2B90785B2B8 ; libaacs -0x8DB62A4E713A07BA7C1EACF6233A16141AD8C1B7 = _NONAME_ | V | 0x5EA8E690AFE41A67A452C3E3105E502C ; libaacs -0xF490DB940AD0DF6868FF4DFDDF75B02B9FB29406 = _NONAME_ | V | 0x52CA88CA9C1EE3ED1F01C5BA5BE80DE7 ; libaacs -0x3AAB0F5F4FB21F4C10F062366E53D7DB660DAC51 = _NONAME_ | V | 0x551DEAC1803FDD4656C37427B1F0A723 ; libaacs -0x6C35C067E293B2908922BEAA1C7C382129D1D45D = _NONAME_ | V | 0x6A8A5A9ECEDD0E9CF89BE32EA04DDD78 ; libaacs -0xC4D9737D662B99729DFC0BF50DA6E7CF53B64DA8 = _NONAME_ | V | 0x6F6F28319ADB2211540C5571B9FBCA8F ; libaacs -0xFF433CC3851254FB989A0B628A14F5C596C60320 = _NONAME_ | V | 0xFD4FF6116165B372F2807165BBD84277 ; libaacs -0x3D9E8156EDADC9EF4C34D7A9495D118ACE807AD0 = _NONAME_ | V | 0xB5122326055890AA91EB5B4605BD5A38 ; libaacs -0xD5125F83FC98FE20F0C843292A8D14DEA7C0ABB3 = _NONAME_ | V | 0x796084228F3C7DE0F7BC782D3E05D767 ; libaacs -0x3D745FE4E19AEAC5ADC3014432E5654F3A2AB1E5 = _NONAME_ | V | 0xF5A13B94AC7C9423FF8CCA7E20AA36A4 ; libaacs -0x6D83676443DD1111DEA141ECABE384BB15CE1C41 = _NONAME_ | V | 0xF24047939AB2E4131CAF612FD8BE315A ; libaacs -0xA14DAAEA0EB7DC4B354D563F686BE4658CB407C1 = _NONAME_ | V | 0x6E4216C1D45FBFEE224C8DA81E0DA946 ; libaacs -0x2E2019C80E24FAC736668EF182DD3A480DEEF187 = _NONAME_ | V | 0x26371A7C4976150B950F1294ACE16F80 ; libaacs -0x6066C4F818CB3293F7388745B222D9ED97B2598D = _NONAME_ | V | 0x47E0794BA7A47BEBB345103D02C6724C ; libaacs -0x2111E6346E8DE50EE5B8C99B24A6CA1DD7F0FD78 = _NONAME_ | V | 0x456D936399EFB428C863EDB76A55EBBA ; libaacs -0x94B4117E278E0C45897F1F57100EA5E4B472309A = _NONAME_ | V | 0x79B580AC57650E5705777D44A16750C8 ; libaacs -0x0EAE7EF0A9F4BAD2301BA55B9A256B76FC56E7E4 = _NONAME_ | V | 0xE63412855C2B75B17B37E6BD5876013B ; libaacs -0x1BE64CC0F25946BBE90CFB16CAD79C25CFC766DA = _NONAME_ | V | 0xDE654C28569B587A08ADE77A4EF8222F ; libaacs -0x7E4504CEF7E100B06769BB270CBDEA96AC3B153B = _NONAME_ | V | 0x29BC5CA728062AD6DA93D88FCBE944D6 ; libaacs -0x0AEBA8992193972B2A7408770211FF11BA15F221 = _NONAME_ | V | 0x28ABBA0F7D3F432AB513228F34CAA069 ; libaacs -0xC68152511F7C51E506F0B1D515EAB34F62D1FE02 = _NONAME_ | V | 0x19A28DD2C5476ADB3FD0586E3A9EEE95 ; libaacs -0x6E0C8CAA02B589241CDEB0F01350DE917DA46D63 = _NONAME_ | V | 0xAF0DE683B53360FED3A03C23BD99972B ; libaacs -0xF50B63A68239E18F1475E5FEBA684E7CA11060BA = _NONAME_ | V | 0x6856651D40F53C7B89729C9B0AAD2D2C ; libaacs -0x3519BDD6D13A87998593FFD366C0F6325C9B0DB9 = _NONAME_ | V | 0x22822D33550240896F325BA121703E6F ; libaacs -0xCE0A77F8A456B2CA89367096DE97527BD9FB6CB5 = _NONAME_ | V | 0x54CA835D12B7DE4812186F2814A4522A ; libaacs -0x883B4A7ECA6C48D33E8E9AC3ED34AD9CB28F09F4 = _NONAME_ | V | 0xEBAD9B5327E2613EA192B69BECC3F1EC ; libaacs -0x7D29608F2DD392D98D3448CC9C02977F5F38576F = _NONAME_ | V | 0x6D2E06D3FF50FD6290A56EE35D708438 ; libaacs -0xFF2F5AB8844AA9D2A771082C208D56BC569111F9 = _NONAME_ | V | 0x6A4964CB9F7F4FF1444D28E381181ACE ; libaacs -0xFD5B4ED5B625D465DBFC6BFD15F54924128D340A = _NONAME_ | V | 0x3D823EB5F72785FB2B7A520F1DEA28B4 ; libaacs -0xCEC4033C0C0496D8A4D0149EE1D25368FF454117 = _NONAME_ | V | 0x57B35C14AD72265AEB3BADBE1B620212 ; libaacs -0xEE81CD6C3731DC777A7CA4A852AEAC020B33668C = _NONAME_ | V | 0x2AB9436BCB030DA482C334780F79BF6B ; libaacs -0xB6FE4B04934E0B2FA4CB7D6EF2164FB76932E740 = _NONAME_ | V | 0xC5FE9CA94EEA8186A1AB827F572C53AB ; libaacs -0x50C9200E6F97B8428255B48DAB28C322C6FD2945 = _NONAME_ | V | 0xB287F0FB7D96692988EF95DC453C554E ; libaacs -0xFDCE3EC11264C051F6522381F2A0A376CDD369DC = _NONAME_ | V | 0x469BA061269078C6AEA898E3C394103D ; libaacs -0xFB96188F5B4C41F913BA760A4E234AC56BBCCE3B = _NONAME_ | V | 0x5A8055A51002CEFA4FDE20CAF3B4C7BB ; libaacs -0x84959FC0962072F4FBAD3507DB714A2F245A28E3 = _NONAME_ | V | 0x6E0B892734C1063190488D5087C96869 ; libaacs -0x2FCBAD2878F4C03B1D221FF7173896CD629E3276 = _NONAME_ | V | 0xAC8E7E27B804961DD5DB062153678496 ; libaacs -0x91EF1C078CF10474FB8E2EC95E117C611972884D = _NONAME_ | V | 0xD1D2AD3969A65CC4457E12834576F421 ; libaacs -0xBD09C26B20FC2FAA385140B1353DA322E3EC7A7A = _NONAME_ | V | 0x86A5A209CCC51CBAA847FE83150CE4B2 ; libaacs -0xF5145DBC54A2343D09C8E37FA9490A0A4B051496 = _NONAME_ | V | 0x09DC063C94461B3472237627EF903C2B ; libaacs -0xA30EC7F0C046C597F7D0FAC91C7EE9DFF3675F90 = _NONAME_ | V | 0x9689ADABFBDCE6F8453BF6ACC9070F85 ; libaacs -0x08EEA4DBB4EFC59115204991E088CFF7BDC8B27E = _NONAME_ | V | 0x3BB2FC862FE1872717FE31D471540186 ; libaacs -0x0CB0D81EA37BA940D4D99C4841BD979192D32B4E = _NONAME_ | V | 0xF530A0BDBDA4496CE173177970AE832B ; libaacs -0x2F265364EB43420130B1B49D2CBCEA013A6518D3 = _NONAME_ | V | 0x0A5D1196F2E39E432BF24822C256C788 ; libaacs -0x3B1BE963E218370016810B01824A9E1608DD3847 = _NONAME_ | V | 0xE7028DDF706499F3FB431E599277E361 ; libaacs -0x65881164CA1178DC5CFA440C89E70AB9476600BF = _NONAME_ | V | 0x3F45B265DEB5CD30D1F71FDF4FA99A70 ; libaacs -0xA149DDAB9F931FCF2577AFF3A1FBAFBF9E6B2BDC = _NONAME_ | V | 0x8A0327F91B67A88940395B50E4932929 ; libaacs -0x21E2C507A2AA830E93D270546CD84124FB415357 = _NONAME_ | V | 0xE27FCF38C07C4F7114F79303A38685A4 ; libaacs -0x9B5271F2B11F4D36FBC9EF7D716B658AA48315B1 = _NONAME_ | V | 0x8238D98335AC6F7B965EE57321D71C4D ; libaacs -0x42B615A27E9B87A32B97E70BA5C1068435F44246 = _NONAME_ | V | 0xBB5AE56693E385BA221764DD202E8210 ; libaacs -0x5A6E47E1A30C82B79C88254CE1CECB8F38552088 = _NONAME_ | V | 0xE5A4FF000FD3952EF24A4F6BB47C13E2 ; libaacs -0xB1E2C7CDCA55F3213EB5684C207EB4456BB39ADF = _NONAME_ | V | 0x71ABA48C4594BB3A7810A91C3472A826 ; libaacs -0x45B87DE0CD120B3EE4D3AF46EACF19D29824D02A = _NONAME_ | V | 0x5D9408EC4F9F65A41CDF0AEA53FC64C3 ; libaacs -0xF641087B65AC5DEB5DFC7563F102B1B908D18C32 = _NONAME_ | V | 0x2E6CB3BABD61D482694E813564414F30 ; libaacs -0x396F7979CFF17F1A3EB594C33DB16919577A079C = _NONAME_ | V | 0x0674E0C7154B872AB0B0BBAAD2BE3C7B ; libaacs -0xCDEB268C946C5610CEEDFAC96A71C0B7221E6822 = _NONAME_ | V | 0xDD365F48218EC18DD2DC6698F61CF1C9 ; libaacs -0x9FB6F5C22C859720A4EE7126852EB0C8F9FDDF7B = _NONAME_ | V | 0x25A0F456845B0A193AEE6040B309169E ; libaacs -0x58DCE7AD53FF5842F9D6E24EA8C22BDAE175D457 = _NONAME_ | V | 0x67F20025FCF22618B0F6691947020F33 ; libaacs -0xEBB37A78181394F070849DE062318E547A990CD0 = _NONAME_ | V | 0xD29CB5B73A7765BD1A812ED14E1F552E ; libaacs -0xCB0FAA13CDC282E41038314BF8241662C64B663C = _NONAME_ | V | 0x39997E051439D3472C270561A346FB98 ; libaacs -0xAA36866D9818FAE657413FD5783546592A82D7BF = _NONAME_ | V | 0xBC0FABE16E96BAF6C1C2188D0D91A9B4 ; libaacs -0xFD2203100CD9F8EE4263ABA0542B4AB6665E361F = _NONAME_ | V | 0xD3D018BD0AA8077BD22A2C74C4071E4C ; libaacs -0x3D55F0A8D3ABE1F3E8D76B0B1974947D3178360A = _NONAME_ | V | 0xFAE9F7BD39E1078253B01C70BDC8F4AB ; libaacs -0xD303DDAA8248128CF6CE3CD95C68CBAC11E8FB90 = _NONAME_ | V | 0x0F9687937ECE8EAFCC784C1075286CEC ; libaacs -0x7D7C7C3CD54DABFB897F0060C14A40229E487C89 = _NONAME_ | V | 0x86F291179484F1C11C898D72AA2011B6 ; libaacs -0x8C4CE826CC10DD60DF88F973E3931ECFBD1D5DC0 = _NONAME_ | V | 0x4074BB712D2F079E4D4DF3035FAA7B73 ; libaacs -0x9A65C7E5C5FEEC8692A00ECA2027A71C792708F2 = _NONAME_ | V | 0x96863E0B7394754EE8FF14D7274AAED6 ; libaacs -0xC4C8C621D032F37B49527F90670B3ADAAC01F995 = _NONAME_ | V | 0x0D3F4BF0A52AF48BB16FFE2453E51B42 ; libaacs -0xE9BDCA75EB1DFA5120518FCB32B714DEC7CBE8F2 = _NONAME_ | V | 0xFEDD9C012A3889EB79E36F02BC19176E ; libaacs -0x439D31035AB8761082E04B8B4E18680DC3AF59E6 = _NONAME_ | V | 0xF052E18A8ED8DAF4B7C6C588A92ABDB9 ; libaacs -0x6FB2AF097DF223731DE647615A576611103002FD = _NONAME_ | V | 0x8320E5148A0B731758AB1F3976F3AC33 ; libaacs -0x178850C4743062B6489279AEF65D95A4131392CD = _NONAME_ | V | 0x261B46443ED9A91DFAD73DB9784AFA95 ; libaacs -0x19B7B1FC9541092C6CF03336510B46B4D2144FE2 = _NONAME_ | V | 0x6C1004EF0C1BB6395199BCAB75BC1809 ; libaacs -0xBCCEB989D02A68E16C61531FF7B8B8329AF10144 = _NONAME_ | V | 0x4D04EA1DBC58CDD64605760ED917EB30 ; libaacs -0x7E53C838B647306F282B8D71F4AA1433BABFB070 = _NONAME_ | V | 0xB8A473EA8E8CBA97A83C1F4AA4A06633 ; libaacs -0x468BCBA4B2F7FC1BF7B654A58BF3C586349A0391 = _NONAME_ | V | 0x0AEDB165FAE4645BBF66FDEE64CECFF8 ; libaacs -0x9EC4469C39D9CBAE9762370999D2B5D8A20F6381 = _NONAME_ | V | 0x4A53D93174826B0A1E62702657A5181C ; libaacs -0x89654AF57C33D44E4CAB9F22544B509B9417A18E = _NONAME_ | V | 0x1C3172ACDC96C02E28CCB6431BEC5FD5 ; libaacs -0xFC9D653124207A3EF24C8EC9CAE77C3F453924FC = _NONAME_ | V | 0x20A1245925F340D8D0740A5B2D21B5CA ; libaacs -0x917ECAF745FEDC5DA0B86ACECF87F5AFD6299752 = _NONAME_ | V | 0xBE425F16D24960D085A57D1FF62A35BA ; libaacs -0x84E4A02C01264F4FAA81800E449B908894120739 = _NONAME_ | V | 0x52DF2BC27CE255E3C768396797A434B9 ; libaacs -0x581066DFFAD77A99E1931082BE4BD193F799DE2A = _NONAME_ | V | 0xB3F710B0317B6E399725D73BD4BC218E ; libaacs -0xDADC4A88750A784359650452A238B935E1C62101 = _NONAME_ | V | 0x0C49C2C2804C50011A3BDC35D974B800 ; libaacs -0x3CA64AEB6A7C16B32192984A4E79CBE5E090BA18 = _NONAME_ | V | 0xE9B0D04F61A81E7676EB97882DE3F3DD ; libaacs -0x556D288D6B6DF4D21034B65145F62367613E64C5 = _NONAME_ | V | 0xE5FD6EC827C7C57918550FAB2BE02036 ; libaacs -0x5761A96E8A0F281696242D851FF767CEAF3FD8D8 = _NONAME_ | V | 0x37E1D32FEE0722E07F4644420F75B5BD ; libaacs -0x57082447472609BD8ACAB8D881648AF447DAE209 = _NONAME_ | V | 0xA6A939A118A53D39D1A3A9DCDBDC5667 ; libaacs -0x2027D7302C74FEE64D46091B42236EF9E40F0E7B = _NONAME_ | V | 0x487952BA47F56F21A72F4E647880F1FF ; libaacs -0x1E363FC47D6768794D1E338E75E2AF7BD36F519E = _NONAME_ | V | 0x58FD2179D98744ADD80FFD25AAFBD752 ; libaacs -0xA4168008890C1BB6C2EC2C5E4DE3C4C09AEAC25B = _NONAME_ | V | 0x46B4CC54F41D4C5B02B099486C1DF01B ; libaacs -0x3FBF5F9106D0E2F0F79A103CE278E59B6ECDE048 = _NONAME_ | V | 0x6F4404F73462E2EFE4EB0351608C43E7 ; libaacs -0x40C9AB723F1D411F7B1220EEA917875A6E444952 = _NONAME_ | V | 0xE9FD069273A6C99E3927041A2E0F3794 ; libaacs -0xA675153287A0FFFDD818111CCE71A59B7D5B4044 = _NONAME_ | V | 0xABA34A009736697A6563E39BDE315FFF ; libaacs -0xAF6898B53A7D0BED75384B8F8E27789A59172F1F = _NONAME_ | V | 0x7265596E7B23A1D0E3887311A6BB28A3 ; libaacs -0xE9DB9B41CC667EAFBE49DE2E90E6E60402DD24D2 = _NONAME_ | V | 0xAAA0996CFDB9CD1F37E1EDBDAD343749 ; libaacs -0xA0223B577CF2F647E4D379BD41384A9BCE9777D3 = _NONAME_ | V | 0xAC3787582C1C1A244E9B57844DA9B2CA ; libaacs -0xA32F4C2EB7A1148B469E6177098DCDA563303030 = _NONAME_ | V | 0xC362E500D946BB243878C22DBB5FFEFE ; libaacs -0x46F9A909C950BD82D86B5CDE6E60D97F7AD03160 = _NONAME_ | V | 0x4DFCEE0E6BFB32BBF23CBF0691960BA8 ; libaacs -0xE996F5404D8B9924AD15CB929F0197B76158543A = _NONAME_ | V | 0x98584F9B51BC5DF6C4F7055CBE212548 ; libaacs -0xD59B673196C027AD5E0E4751801E45207CF7B93C = _NONAME_ | V | 0x6BDEBF8445284C16E703B3847E97954A ; libaacs -0x792B344020D96FA025012DE4CCBAED4B4D125506 = _NONAME_ | V | 0x3D905B9496FB55D0D16BE1F1C4037AA8 ; libaacs -0xF31C70AC51182070D5AC0B5097A937849F502148 = _NONAME_ | V | 0xC82A016DAB3F40AF21F0565484C8FE10 ; libaacs -0x118238D25480E69BBD71422C8810F4E40B996309 = _NONAME_ | V | 0x7752C5391116622762315105376C25CE ; libaacs -0xAD34BAE7AE07991C20191911DFB7F438DE3E8451 = _NONAME_ | V | 0x55CA98D10C173E4C339639BD9E08E9BD ; libaacs -0x45C35CD35CC3B1889EEBC494EF8D02F564B0BCDF = _NONAME_ | V | 0x7EA8C63E0886154245BCFE98362EE703 ; libaacs -0x0FD8F5D503436808D9225676CF58A9B683E85ECF = _NONAME_ | V | 0xE458545616F97BC7C473D332B36C99C1 ; libaacs -0x977E88D5995317C4D5D21BF67FA524F4939CEE84 = _NONAME_ | V | 0x004AB323665FE9B5F2735037BAE009F6 ; libaacs -0xB6861EE676DBF9BB7B422C5162DD2B60E84118D1 = _NONAME_ | V | 0xBF47E75BD4035101FCBC5142136D637D ; libaacs -0x881226D2A2EC0E1816A667E136F667DE281FD96D = _NONAME_ | V | 0x1A37A0C60A0E73B0E429E142072F0408 ; libaacs -0x56EE7F640795B11B1D97BD792D66BA59280B46DB = _NONAME_ | V | 0x7222E99C6FB698113FC787D0DB8B2AE8 ; libaacs -0xF1E39DFBF4A7D56A1A46ECD9DD3C62DB4A881E67 = _NONAME_ | V | 0x629611D8AA8B4B2C0914B2A19037A6BC ; libaacs -0xF4D133D29E2DE7BEB98984B27185C1A194F416E8 = _NONAME_ | V | 0xC8E9D7CB82BB858F8D69A88C97A2D4C6 ; libaacs -0xEBFA68101B000C52FF12D180995C972DA3FE6EFE = _NONAME_ | V | 0x0553A9FA5C6EAA88DD0F263E7E253F1F ; libaacs -0x14B52FF67C606D5A21B79D0B1F59ECE9D15B4D9E = _NONAME_ | V | 0x4C584A8CFE0E7AEEB6AD0A068C36A276 ; libaacs -0x43104F93BB40640DF766DFFA00ED7B60B44BE956 = _NONAME_ | V | 0xCDD42A8FCD54BD3D53C2120F644CC993 ; libaacs -0x780108EE7754BD92C0348D3DE685CB0E0A55CBEA = _NONAME_ | V | 0xA67D058BB1D6A4A59123596BFF450F57 ; libaacs -0x5EE577D8C3FA2EC184029782E5B037C2C08838C2 = _NONAME_ | V | 0x516D37EC101135D2A3A23DAD1649CF68 ; libaacs -0x74294809DD5F41074D6C3AAA20ADAFDDC0C16717 = _NONAME_ | V | 0x427A0315BE7FCF871AB6463FA3C785AA ; libaacs -0x0AA91871F647B843A4FA46639D1E311362718EFC = _NONAME_ | V | 0x5E3578A65A231A0838367849CCC32EE2 ; libaacs -0x4F9EF9464337C077E0105E1B08E2CAFCBD4C707B = _NONAME_ | V | 0xF3E0200C8AB423941671AD5AAE11128B ; libaacs -0x5AE3CAC0541B5EABEDCB2962636E13087FD83AD8 = _NONAME_ | V | 0x7F77FF7EE9CB5611A3EECE9E7500BB10 ; libaacs -0xD5E3A1911714222786A868EF3164A3435493E95E = _NONAME_ | V | 0xCC063E6DBF2A7E63725AC981FE0D5326 ; libaacs -0x311537C048AA9B1555A1E29A207131382C45F7C6 = _NONAME_ | V | 0xEFA2ECFAF4A33AD384542A013AF262E3 ; libaacs -0xDCC52B67869D191F45090F8E2040FC450C3F117B = _NONAME_ | V | 0x92B61C9D3D8E3BAB3993CB4F9167CB17 ; libaacs -0x8982DDEFC5AA80E99A6E34DDFAEDAFA58664EB6C = _NONAME_ | V | 0xAAF5F219EA4E80A21A9A9F7BAC133BF0 ; libaacs -0x2B7D4C3121253D9F110573E575897F6CDF8C3A3C = _NONAME_ | V | 0xD7448616B06269643190F4DAAC6CE45F ; libaacs -0x95D81510F6255C4769F6C5BED27FB0F04796E458 = _NONAME_ | V | 0xC9159ADA2780B403A8E7F8711A0FCFF1 ; libaacs -0x5BD2A6577D8E5C3B240BBE574C6EEB5CD548D907 = _NONAME_ | V | 0x0F21D4158698679B2AC854CA1DF9B552 ; libaacs -0xBAF7CEC458E0E63F2756F9BC8DB8BB6B59624EB3 = _NONAME_ | V | 0xAE2E106C8358F4E14B42CCB9B90F8162 ; libaacs -0x954311BA97A558597108D4115A30DF8EB1113DEF = _NONAME_ | V | 0x27C945FA7631F70DFA1E35665E662DAD ; libaacs -0xA4D8ACA5DFE4A57B7A2D16D3143F46180B54CC2B = _NONAME_ | V | 0x10CDAEF6F4B86063158F472C73F2CABA ; libaacs -0xDEC4AFD2FAA64864E3A0C670FDED4807DC64B101 = _NONAME_ | V | 0x8F099E922E8D59C2FFEA9C1B8BDBE313 ; libaacs -0x2FC7682EC07F6E3D37C26035EDC64671904F6986 = _NONAME_ | V | 0x05B06254081FAFB4B91E75DF207DD088 ; libaacs -0x77A373CBEFD8014698265BEDE4453D039F686D80 = _NONAME_ | V | 0xABAECA386400C3CF0CC3A887F98218F9 ; libaacs -0x07C2D9668FA84F227EA79746C3BD9B11FB38E826 = _NONAME_ | V | 0x064AC607D13184E725A8AB78AF4E79C2 ; libaacs -0x80FF0D5D8278E9524ECF4613C0EE6BA124916E0A = _NONAME_ | V | 0x3A6074717390765FFFE741BC11DC4DA1 ; libaacs -0xE58B1402B5BBDEC59EED720C0C735A2B88F77178 = _NONAME_ | V | 0xA1909F461BA9236D62A6D63896159CBD ; libaacs -0xFD9E719CDC7BF17F7C32B5A8EDF916E6D5423470 = _NONAME_ | V | 0x1EA889289C0BB4529609CC23A2A3C8F5 ; libaacs -0xCCAC9646B879D366E5DC0F3279EA508978591ACB = _NONAME_ | V | 0xDF40EB01D45F44CA57624344BC4984B4 ; libaacs -0x921F2A2D675275EFC9613A9B38364B2DA64745D2 = _NONAME_ | V | 0x2B07CEBE33775FE7B02F0610C11FDC78 ; libaacs -0x31D297D84F636E15A4EA18E8CB8F1AB5FA496B55 = _NONAME_ | V | 0x459A6149F7E0E6123D0DAB38B3998FFE ; libaacs -0x32C5C9DC7EF85EF46352CB5BED01211CA42E3A41 = _NONAME_ | V | 0x153606FDB5FEBAEB431DB7CE2BA6C9DD ; libaacs -0x68EA930471000700998BEA926A633D55E54BAADD = _NONAME_ | V | 0x40494F372B87321F7611BDBBA2AEC1FB ; libaacs -0x6CB6A21067D9E87398D3E7A5BBA8F0939202057B = _NONAME_ | V | 0xD5CBBD71E8945F6BC87476C375418CCA ; libaacs -0x840789070EEB696D6D30CF65DBE80607F1C2B0A7 = _NONAME_ | V | 0x727E04BFDA62829AB5AC1D993ECF9C4A ; libaacs -0xC829961C3ED0CF8F4537DD6C30C662DA92FE3ED3 = _NONAME_ | V | 0x8FDF47F9323C1F2E5E32235CDB687B75 ; libaacs -0xF6144B8B039613F99B638617A9047D038BF6592F = _NONAME_ | V | 0x4FB687C2F60196B488C52E27DDB681D7 ; libaacs -0x97257074014B8DFC77D71BA8176C82C0931CAEE0 = _NONAME_ | V | 0x6322CB272AEA99063060F3620078C97B ; libaacs -0x1DE26076F06CB6BEA128DF3F7373C271F0550562 = _NONAME_ | V | 0xC530FC629DC6960153E18B773EA3F91E ; libaacs -0x7440E8F3062C79705EB86C096A828CE180AB8922 = _NONAME_ | V | 0x9996771B44659C8066F4AC1C6159255E ; libaacs -0x3C724ADDAB9ECECC471DA9AC7CD1851B3CE717ED = _NONAME_ | V | 0xAF8B570962D30D39BAB07AE9E08A2E0F ; libaacs -0x94A025229A94189ACCDD5A4A494CD8144E04C30F = _NONAME_ | V | 0xB89CCCFEC594CED566B5BB25FCE55C0A ; libaacs -0xC8F416252FBB97FAF05CA35C4DF8F81EDBBA35BC = _NONAME_ | V | 0x04294E37438B18FD72706D5D0C735DD2 ; libaacs -0x13F045AE9B2B6BA533E610433F4683EF0604E7BB = _NONAME_ | V | 0xA817641CA2E666967C662ED6A4FE2777 ; libaacs -0x9C22DB62740983B62F52F97E0F7E277B2CA2FC51 = _NONAME_ | V | 0x516DF39564635D5DA7EB575D8B2D9879 ; libaacs -0xDBAB9DBA6A22331ADC8E50C180BEC0D8BB3A711A = _NONAME_ | V | 0xCBAB711F0F0C57FDC6E739EE1B480187 ; libaacs -0xFB3BCB32D8A8048673F282DC9793937F790300EB = _NONAME_ | V | 0x3485E178D6D17B5F869FB8BECBDE0428 ; libaacs -0xFBB2304200AE954E138A1A01A6D30D0E3F20AD6B = _NONAME_ | V | 0x47C24EBDEE3FF4C2A640A605CABA9E60 ; libaacs -0x104FF8A4028474711CB39F4395CB7CF88A9FAAFE = _NONAME_ | V | 0x132AE593372BCCAA73562F707DFA667A ; libaacs -0x042894CF524A1E80E194AA69DDF3D98739E8B838 = _NONAME_ | V | 0xC9CB44C1BE45ED356EC9B7D5BE9F22A6 ; libaacs -0x713A20A42DB2A222B0B9735A36D4A23FB4D6E6D3 = _NONAME_ | V | 0x2A930A7069335E5DF280D020196363EA ; libaacs -0x87E1CAE377FEC1BE3AAA3625E4CC3C324DD83345 = _NONAME_ | V | 0x4936E5EBCD793AF531362ED99E86C015 ; libaacs -0x91DE455F259EE99EFFB5732E0BE4BE60E96A557A = _NONAME_ | V | 0x7E9264C69364E7DB4BB6031ED950A840 ; libaacs -0x161E6EFC1606B5AE9668F2CBB8E8B67297629D7E = _NONAME_ | V | 0xBC82BBC76126E0547CCCACDD06201E7C ; libaacs -0x1234B1CE758E83E684DF30A93DDEC17573FC2F14 = _NONAME_ | V | 0x5BE920C5DE67E17AE1BD04AA6BCD2385 ; libaacs -0xB13F86D4E25CFE01032471413EFB3D34D8DCC61E = _NONAME_ | V | 0x93D339893E5957A81238C834608A56C0 ; libaacs -0x67D037D853AAC33E6A520FF84D4E62A0D6D5C909 = _NONAME_ | V | 0x34BA9E9DF146245557DCFD73A71AA1AC ; libaacs -0x9956E581BE3DD606FBD81093B84D61714BB56F4E = _NONAME_ | V | 0x74BF6F34C29C6CD5FAB3B133C23493A3 ; libaacs -0x4EB47E4688BE240FE8080F26AAF3EB36CF411541 = _NONAME_ | V | 0xF46F849A8359ABA36659CC97BD0C745A ; libaacs -0xA290E9952090BE7CB2C3393FADF80E21472436E0 = _NONAME_ | V | 0x427238D3F1301518FFB84E7987CCE27A ; libaacs -0xFBBD96FEF58D889069A5BBF0860FFC4EF5439D5F = _NONAME_ | V | 0x246A10408E82C26D341403D9FEF7B043 ; libaacs -0x2A4E95D55CFE77A60841DFB290E8047B3DC1A65F = _NONAME_ | V | 0xA50F310BDBF7D46E2186E26779AA925A ; libaacs -0x390A6FBB3D307FC3F720DBE8C6A5485B0B806558 = _NONAME_ | V | 0x152F049CD2AC45616C44DF2DCE12D824 ; libaacs -0x8EF1CC04117816856C556C5F20FD522549DFE04A = _NONAME_ | V | 0x8BF8893061C8E76AF153462507686FE9 ; libaacs -0xE75D2EC9A52F1FABB8E64947A2CE375F5D4085AD = _NONAME_ | V | 0xF303269D9FAFCF63C931658CC9A353F4 ; libaacs -0xA2FA3882887FD436F2E7399F3254771DFE2ED664 = _NONAME_ | V | 0x10F048CC65F3D149F3BEC5AE8A105B16 ; libaacs -0x9CE863A35A9158F4471864169D745DEF28BDF312 = _NONAME_ | V | 0x1DC473B761FB030B0F9584DCCF8529BD ; libaacs -0x6CCB5426F890C1C6E0EA1395B6F116DE7E1C76B3 = _NONAME_ | V | 0x64B936B324E34313D5EB30F243807A20 ; libaacs -0xD43DCC37B74A5703503DBE874CFBC90EE544FC75 = _NONAME_ | V | 0x6C082E399DABA825020F8E49F917FE65 ; libaacs -0xB1E1F81CE52BFBD943E0E1A0AA612E75AFD249E6 = _NONAME_ | V | 0x6D442E2B9CD16CF1908148643669825C ; libaacs -0xCE8B1E6E04B5ACEF8CF0AEFB9DF607942BF5B5E4 = _NONAME_ | V | 0xFD7A5A9E9A8B6B97FF053EF032F2615B ; libaacs -0x4E7368065516C598E8B556545B11FEB5C44CAC5A = _NONAME_ | V | 0x873EEC31C5DC4D8600523EBF6F8FB2BD ; libaacs -0x79DE832E64ADBDDD5DA240BE22AF27D37AB2D583 = _NONAME_ | V | 0xFBB0D80134403CE78B254F19F6A94C8D ; libaacs -0xB521D8C226F06ECB460B30CF0CE3F60A7D39053D = _NONAME_ | V | 0x5B601DFFB1B84A55CA2C32D0D5DBC0E6 ; libaacs -0xBF38ABBE07E673DF87BB819BBCD226A3465A1381 = _NONAME_ | V | 0xC1074BE643406EAC8A231E4BFBB94C2E ; libaacs -0x53F1772C5CCC31AD7B6643E811F903E238FB08BF = _NONAME_ | V | 0x68B4287F627BCFD4096B9CB9D088D0D0 ; libaacs -0x138E9FA2F6D84CE6B508D9094B0733B1C6E513DE = _NONAME_ | V | 0xB9AB0935E4EC0AF0EB31F551A9315DB9 ; libaacs -0x52F8CC37330D0C418FD233FA9AAED166C60E9048 = _NONAME_ | V | 0x0D8694CD79D21DE5024CDE50757E7896 ; libaacs -0xEAA858FEF0C2D5F58DB0DA48D24D26196F2418D0 = _NONAME_ | V | 0x26D9BE7C4AB38C2D931F2B7FF00864F9 ; libaacs -0xF4E162490E6971EC261CFC10653BD0CB52317F6C = _NONAME_ | V | 0xBEA1C1BDF6AA61FE72E9302B1F26F651 ; libaacs -0xF61D24CDC15D0DF62BA9C43FD6880E11070F6118 = _NONAME_ | V | 0x8B5B9982642387008726E0B72EE18E25 ; libaacs -0xE9807A6E7ADFE66A4FF890EAEDA570785DBEFF19 = _NONAME_ | V | 0xAACC8832F25063A24A0B271F8C72AAB7 ; libaacs -0xA6EFC9C899377C53EDAC0A48E17152B29BD7379B = _NONAME_ | V | 0xC63467C6847A900E8B1B3EB3563413EE ; libaacs -0xD6941D6A543436575645C8F9B549373732D9FCE0 = _NONAME_ | V | 0x22824A15ED11FD80784299D64178A127 ; libaacs -0x2E645B5E1A7A73E7307B9FB1A601CDF53B909C82 = _NONAME_ | V | 0x16F431077C4CC2C2E403D4EB6EED8C21 ; libaacs -0x552A269E15D3C98FFCAFDA7B1DD7B4A39C64B802 = _NONAME_ | V | 0x720D4074FC2763504D8ABDE8DF5DCEEC ; libaacs -0xC3B7454A68059722228DDE9A48F0E5A76E5D678C = _NONAME_ | V | 0xE737E54F94AFEBA08DBCF709C4A2AFDF ; libaacs -0x5B4D6509CB91B6B924BF08BB5C8F329F59FA4C17 = _NONAME_ | V | 0xA1BDB283831CC6EB5B5EF3EF2B7A462E ; libaacs -0xE80DC7DE21ACC7535EE268A7AB5F5F193E265E90 = _NONAME_ | V | 0xA807755990970E763C9B55ED7A7639BB ; libaacs -0x9B96823857B26867BBF0488978E13CB751614EA8 = _NONAME_ | V | 0xE5D97C2F898378AF8AF3086301E7B731 ; libaacs -0x9687E26C9AC4C21745A814FB1BCC0B380CBA6A87 = _NONAME_ | V | 0x33581D35F64920B4733D189C61D09970 ; libaacs -0xE961F136CBD3F4CC1DB94F19936D42D116A70A96 = _NONAME_ | V | 0x0044F6CFEBB30353BD6ABF500D0A2697 ; libaacs -0x9E66AD3175591032C9B82203E2D0ED05C2EBD6D3 = _NONAME_ | V | 0x9D717179A2C987D89D431B7729C8DF3A ; libaacs -0x976965828810B756A6169A78715127C56F09091E = _NONAME_ | V | 0x9637651BB97B36A26B06E853142BD50B ; libaacs -0x7748E2811222E482B73E7FAAD5472D7F540B4C8A = _NONAME_ | V | 0x068C04C4E8E6B599E62846AC92B1787A ; libaacs -0x253C20DE430AD068C05E84C062FB414CD213A58D = _NONAME_ | V | 0x78BC169157D58252A7737FF62D55B600 ; libaacs -0x7F491329E9D27C24856CD6AD4D3D4C53422DA879 = _NONAME_ | V | 0xF81BAF88AB3DF95209DDD16BC0C4AF77 ; libaacs -0xB580DC962A4D5F045271C8891193977409000C4B = _NONAME_ | V | 0xE7C91510A4B0469DC6B1E27CC56A4E93 ; libaacs -0x83EBE97AC5FF140A0D44101BE51C0C4D118F551E = _NONAME_ | V | 0x18D6A6E1FF6BB32B516CBB6826390478 ; libaacs -0x07117EEB2082F0E8C2C4818A849FD3D814CD42F5 = _NONAME_ | V | 0x23983FEE8AC0FB9FCFEF0ABE2710F180 ; libaacs -0x0C8799AC2B3CF4FC6A8537E32E6C254F49B7E7EB = _NONAME_ | V | 0xEE43C71D36F417639ED7E41EDD040D4A ; libaacs -0x1ADDF7FA6FF479A0059E6DBBE2EC0538B36E882F = _NONAME_ | V | 0x41FB12A1742953A5CD44F58056EE0590 ; libaacs -0x1B5220748EFBB83855EE993024F5EE4751C901F4 = _NONAME_ | V | 0x84BAA2E67992B5439A27F1597681E322 ; libaacs -0x4F576A1A25C30943586D790AA2488B69D620D73B = _NONAME_ | V | 0x2862A86766DCAC8DCBA46E9BCC910B80 ; libaacs -0x7484971EF10BB820C6C6170BFBDEFECF832E87D7 = _NONAME_ | V | 0x0FC1CFAD80865C5929B44F0626CAF22F ; libaacs -0x289CC9E4D8753A9E3DC02F1DF07A8FB4B221A431 = _NONAME_ | V | 0x0192AE00AB361315B9F3E201795DE057 ; libaacs -0xD2FB419F8D7FF448F497D56406962743E30934B2 = _NONAME_ | V | 0x1B6D762BD758911AB5EE072C2A659AD3 ; libaacs -0xCB5C83C6EA51B77D7AC5382E0DAF861F2BF5B54E = _NONAME_ | V | 0x18B1E3903369BF585E1D215B6CFC3158 ; libaacs -0x2AF473AF33F0E001529AE3E68CF2DFC239C84AC8 = _NONAME_ | V | 0xAFBA5B72003A6834467DA68AAFE880A2 ; libaacs -0x49178AFE26059777CFA4FB2EFAA57CC55FF8E13B = _NONAME_ | V | 0x3B2344997800373E1437008E081DA821 ; libaacs -0x1D957CB1023D3AC78FF4E4E2A6BF0CC6ED8118C7 = _NONAME_ | V | 0x36264FF512C411E4444E0F94063AE9E5 ; libaacs -0x64D56537052FF5A5BACB1AA42984ABE112CE1D12 = _NONAME_ | V | 0x306830BA4D997A1EABBB20E4E004C18C ; libaacs -0x8BA5C020826DCD50E06A55A404CBBD7F3E4F5DBB = _NONAME_ | V | 0x8F0B41B89A4BDBC7C7A6EBE132E42E9C ; libaacs -0x6BEA6CA2D095BCA0F9934384F0AB324706C46CCC = _NONAME_ | V | 0x2BD4AD3E2C8A0A958BB942DABD189552 ; libaacs -0x9DA5DCF265B0F5C4B13903611711B1CE1C668C15 = _NONAME_ | V | 0xE4FDE38BC052CEEA46496121457B7DD6 ; libaacs -0x657C374C850187F6BF80951EC8B8CF32E8897CAA = _NONAME_ | V | 0xDF8C0B62E2FF49945F885F1ECCEEC337 ; libaacs -0xDE2F7E0949A4E69CDD710574EAC139D9EBA46965 = _NONAME_ | V | 0x5AF6D93258326AE4E5DFE92028E13F1B ; libaacs -0x44AC4A6A8F868A7535356A8B3A369DB7271163E5 = _NONAME_ | V | 0x25B933E2AF412826384AC08F6368D1C7 ; libaacs -0x8B2C919003A26A8DDC69D0F69585260730A79A10 = _NONAME_ | V | 0x352EA26CB5028DD5F4DF33D99EA3977C ; libaacs -0x2319848849A8D2E1A4C49712E07BA1E3ECFF4080 = _NONAME_ | V | 0xA2DBE2D4A854B028A82DE73780CAA240 ; libaacs -0x31E9BE4B0A7076A72B94E9C1F7D342252C7B8789 = _NONAME_ | V | 0x3660E0B4C3DAFCB012F83EA8087EB5BA ; libaacs -0xAA2BFECFF71185C07B115BE3B580E20CB0CBC209 = _NONAME_ | V | 0xBBF99C72ADF75B9C292752B275793EAA ; libaacs -0x756DF0965D6C749AAD888052354473E6E60ACFBE = _NONAME_ | V | 0xEC063E1FD9FDD6D48155DEDD0D8B974C ; libaacs -0x3B9FBCDAE98C36EF8AF2175F34B484D54E162176 = _NONAME_ | V | 0x070F37C3DEE8CA46F74619E8ECB129D5 ; libaacs -0x5A5FB44AE19C7D85E36852DFE81851D12D9D80E4 = _NONAME_ | V | 0x5F190DDE7B97081481EF660A73EACD5E ; libaacs -0x91AAAF63CAE48850545221EFA34BB4FC6F5A2EA0 = _NONAME_ | V | 0x782A5020B18A4808FBCE31E4EDC61570 ; libaacs -0x8A2D818E32BB8A0B31397B3E13F6DDABC17BD7E7 = _NONAME_ | V | 0x253349F85B0A7BCEAE485ECD0C1C51C7 ; libaacs -0x22834ED8CC23875F51F79D375C3FB6C3623620FC = _NONAME_ | V | 0xC7BCC7655800C291CBB97A44F5771ABD ; libaacs -0x3F52FA986628F19022D535513578B83FE5788CA3 = _NONAME_ | V | 0x298A975D9307E529AFD8ABFFF3B10A1F ; libaacs -0x39DF1C565261093CC003122C40FE1F51E6D15813 = _NONAME_ | V | 0xFE321AA0DA6BB375A6CB4CD5E2B45AC2 ; libaacs -0x506881848F0D292B76A97823B233CAB733E17C30 = _NONAME_ | V | 0xCAC7B789CA8943EBC3161430B4D871DF ; libaacs -0x8FAA5F63AF67C7A282D640876D56523D6704113A = _NONAME_ | V | 0xF0871C3CB566C0071EF8C5C439C8B4A2 ; libaacs -0xBB8C77F3EC9A173ACE2CCCEB88988D806E8D0D69 = _NONAME_ | V | 0x70828E5EE399FEDCC66EADC5B1C95666 ; libaacs -0x0D20773C356E14C88A239D859A57636BDBAA5E47 = _NONAME_ | V | 0x1503695AAC3CAAC024884B5C0FE167E2 ; libaacs -0x791866F5FBA29E777F165F0C20F2CFFA85F90559 = _NONAME_ | V | 0xFE4D1D85A7416ABB8BD562F35C8D9887 ; libaacs -0x28B82D044E4DBDF30BFC66E7C8CA4B502B56BCD4 = _NONAME_ | V | 0x4F355CE5A2C86F697187F01693CA4388 ; libaacs -0xA76E8CDC141E3B6214AFD34597FFD6B3A66C6A9C = _NONAME_ | V | 0x89B6BCF8C3B5EDFDC755361D9E4383C7 ; libaacs -0x383DD3DDED9167830A7E343EF6A77A7A25570AA6 = _NONAME_ | V | 0x24068A456648BCB96A6648BCC1BC5628 ; libaacs -0xE3A8DF7BB2E23157842169A986612C9EDDDE0DD6 = _NONAME_ | V | 0x71118E9875F848D6EC1BB8F302B38230 ; libaacs -0xD18DF0A0BBEC8B918BEA434562258A7B3B06A022 = _NONAME_ | V | 0x7E5D0AAF063A5C2BA7177FA4F759262A ; libaacs -0x9AFCDFDD996FFDC8749CF38F511767550CD4CA21 = _NONAME_ | V | 0x3AFBCBE7F98AADFBE31533272C1C436D ; libaacs -0x62170A29647F93A90B4D74D06F0BE4874E2B7096 = _NONAME_ | V | 0xA55C7416F7D185B1D42A39B0E9375804 ; libaacs -0x689A8B524533865F4C36FE06B34B2769AE8E72AA = _NONAME_ | V | 0x1C8E8D3AC6FDFD0BEF8CEEC1D17EAA3A ; libaacs -0x826A398B6039764A6D4BEEFAE8D067DCED679152 = _NONAME_ | V | 0x8983EC863721BFD14318179C02E0404F ; libaacs -0x0A60DC676FBFD75AE791122A83D7238913226C39 = _NONAME_ | V | 0x1B1A8E44A0311F42866E6D7A10210153 ; libaacs -0x7A059DF9D6B7A7F7F648737D05FE41AAE8D2EDD3 = _NONAME_ | V | 0xC66DFDAFF049FC4133416EC1171800BE ; libaacs -0x1BB0FBB9D191FA3801BFAF777FA2A7EB1B5EDFA7 = _NONAME_ | V | 0xF358D595150E2E2D1958B2F530847BD4 ; libaacs -0x2F38A6CBB5B9EE712F6D8F1BA6936460DFBBEDA7 = _NONAME_ | V | 0xBDC269672EDB5AA99438611EE8EC8431 ; libaacs -0x84A220F2C91E587ABADFDCB3F3EFFE144231D34C = _NONAME_ | V | 0x98852C40CA6A908835A2689C1FC67978 ; libaacs -0x3DA488B6721D385DDEF7417CAAE24DE5F35D0DD4 = _NONAME_ | V | 0xF989A0AB141486C03F7A600F932A3D7E ; libaacs -0x0FB4B2B61317F98B8BF557103EE4B77C3A29EF82 = _NONAME_ | V | 0xE249107A476135E1930FE413ADB3BD2F ; libaacs -0xE1A6BAC4D11C45615254002F53D95A2DE3EB8214 = _NONAME_ | V | 0xF813A84B562DD27D5D2FD6F676FBA488 ; libaacs -0x340D29AFC34BD4B7F30ED0B7CD3B1544975F168F = _NONAME_ | V | 0x957162C5565A032221D12E9CAD2BF31F ; libaacs -0xB2D0A970B8C088EE3ADF20D84206DFB0C0481E18 = _NONAME_ | V | 0xF20A65E38B9FD286A35634BA317B17BD ; libaacs -0xEAA87A8E41F938B0542E6E5902BA1B83935233B4 = _NONAME_ | V | 0x085F9AF93AB1F3D7D3AA2DD374C7E7CD ; libaacs -0x407DD2AAADA7CA38B911E2BC963EDD720DDADA21 = _NONAME_ | V | 0xE91834D1BD7014E47C071B8B384B1897 ; libaacs -0xB5EAA3FA526E2DB47A054CE421C04A180117848F = _NONAME_ | V | 0xF222436B24F25853A740156C93211FDA ; libaacs -0x25B66DB8B9F4D378CF150601FDE39CE32138D654 = _NONAME_ | V | 0xE26C95B2590FCD0FC46934861A079644 ; libaacs -0xA141BCAF41401326AC7FE5197ACFCD65D9E70BC3 = _NONAME_ | V | 0xE8666AA0383676387205157E4F76C162 ; libaacs -0xD7B67FE7B4FBEFA519345839BDFE144F0405F413 = _NONAME_ | V | 0x15F4C2FCB431CCF17B959CA9CF82ABA7 ; libaacs -0xCE386638F09F3D060767BF7D91377AA3AF8A2558 = _NONAME_ | V | 0xA5BE8CFF6DA7CA31BD149EEB6E3C3DAA ; libaacs -0x300550DD57BD998636EFCA4C9778F26D2057C231 = _NONAME_ | V | 0x31660861CD559AB2DD2B8C2F2B9B0F14 ; libaacs -0xDCACB1C2A720CD629912638A1F4E963D9CA945C3 = _NONAME_ | V | 0x83CC75AE49F0D12A49A30B19B8E927D3 ; libaacs -0xBF5F6E9EBF80B45DEFB8B71B29390ECE8B386C28 = _NONAME_ | V | 0x7668656FE5E095E9609CB4EC244F8228 ; libaacs -0xBBFC930A327D9181B2C35FCA3600EE72A49CD1B2 = _NONAME_ | V | 0x7D450F8CD58EA8C7DFF16AF15CF160B8 ; libaacs -0x4E9AB99E16840046A508D082A3BA834CAA188270 = _NONAME_ | V | 0xE45199DCB58A6E46F41F18886606299B ; libaacs -0x0CF2011092D44E47B59BED4A9E1033982E5D83F2 = _NONAME_ | V | 0xEF3810B813F7301279667C5BC29A4F50 ; libaacs -0xDAB412A722ACD5123634B76067B3CD1AC665EDBD = _NONAME_ | V | 0xB21F2BA9BC0219C075A581241A405AD6 ; libaacs -0x2DB4470337EDF61B7BCF6B74EE72DFB2A550A66F = _NONAME_ | V | 0xF4F78ED8D299F0C48CDAF5A9D0EB1EB9 ; libaacs -0x4472AE6B9F8063862CA94AA03FAF77F15B8A2510 = _NONAME_ | V | 0x57801997110C8CE77216F38E0C2B304F ; libaacs -0x1915BB96AA527283FE5328FD09DCDC09999F5F2D = _NONAME_ | V | 0x1A447BD5071DCA1B1FD3EFED66267DE4 ; libaacs -0xFA6992011FE59863CCE7BF123BDB3D8A4336FE43 = _NONAME_ | V | 0x77B6021C7918EB2F855C11429A0313BB ; libaacs -0xAFA0A535710EA5A26F398866FC36F601680594F2 = _NONAME_ | V | 0x0708D107D6C2AEAF24F0FECCABAEF72D ; libaacs -0xFB85F5CBC7C66496BFA6014609F7AE21344C4C1E = _NONAME_ | V | 0x715BBBD0B14F55B4BC2DA8282D3BB801 ; libaacs -0x361EC4A9A2787D9A1F0C2425F9D784F3BA21C779 = _NONAME_ | V | 0x182244A25DB7168A441E2D1E2A811546 ; libaacs -0xB7307A476CFA2A47B51B8AA35D65E32DE624D983 = _NONAME_ | V | 0x1330A2EF71B1B65FE9D8DD3522C96B79 ; libaacs -0xF17740210BFAF290A8ADA2E4A8F255FAF9937752 = _NONAME_ | V | 0x9EE8EE5C2E0CB51129E590B5377F3969 ; libaacs -0x3237922E58AEC6D8B432EE0A53B852D1EE7728ED = _NONAME_ | V | 0x6901AEF5D3C8E772B00F7D532A680DDA ; libaacs -0x0DB027FE7AD0B61E35E52D14E38971189B6075EE = _NONAME_ | V | 0x400FC18383B99AAC381F1832C4846337 ; libaacs -0xE63B508944DC74DE22F3A0D6C9D07E85F552CC9F = _NONAME_ | V | 0x9AC5309A4D7942B2D6D36A3B5C82F6CE ; libaacs -0x54ED0B54DA9207B9BE138D277ECAB94D04BF0591 = _NONAME_ | V | 0x7D3AD152B86888AC24C779375F8C893A ; libaacs -0xD34F0586BCB49BC1A0EB837C10BAF6BA2B359376 = _NONAME_ | V | 0x2F49DABAE77553EBA9ED79174E88C96A ; libaacs -0x7868F807434292C78CC5E5B5D7857767A621F283 = _NONAME_ | V | 0xF44A48C67A66A42CE63427E238365DD3 ; libaacs -0x1D004D85F1F3F7B276403039375B1F90F6B8C3BD = _NONAME_ | V | 0x0C421E06218F94ED713F6849E927D6B8 ; libaacs -0xD56FCF04A3FBE0FBEA2C92D798A3734E3BE3F64F = _NONAME_ | V | 0x6E6694DBF1CEB7C230016F91AEBB3C43 ; libaacs -0x987848033EC064BFEB628D98EC3E777BBB6CAC7D = _NONAME_ | V | 0x95B916BDE7433F293D195C1E8E553A54 ; libaacs -0x5177852EA18D9F3D545E182D7584045E526C5337 = _NONAME_ | V | 0x77D95D31BD5991513D4EEEDAF0ED08C7 ; libaacs -0x6DCC7554F0CDC049742B0AD51B53B9118BEADF0E = _NONAME_ | V | 0xB27A8029F40764AE4C51AC837743FA30 ; libaacs -0xB56BF6A4401B8B3B47E77D00F422514D11184168 = _NONAME_ | V | 0x0B860A95E42282F4E3B474A428883475 ; libaacs -0x422B8DC45573C45DF79CC2DD16EE1AAAA5309722 = _NONAME_ | V | 0x0C36121EC198385EC2FC7603808E0250 ; libaacs -0x8436ECB46A5D5E97A2B3286C6CCB886BFF396D1B = _NONAME_ | V | 0x8F3DC96F84CB6FA5AEBA2FEE3D36C235 ; libaacs -0x310DCF5ED37777EC2F4E4B48C055C30B7A732F11 = _NONAME_ | V | 0xC0452584F2C202C8C33E9CDB1617B693 ; libaacs -0x8F560CC2CD4F12F237CE53C5374A85AEE7643F76 = _NONAME_ | V | 0x33320AAE2C9302DF527486E88551EF10 ; libaacs -0xBAA53CC971BB0E306CCAAFA4A80926D5C893F666 = _NONAME_ | V | 0x3856A29125D95110AB70438A202323D4 ; libaacs -0x09F07BF2DC0D61F64DC0B54871126B446D46C4D6 = _NONAME_ | V | 0xD56EE2EDA35F29B3A6107E3069732EFB ; libaacs -0x46EFF32C70FF8A95CA65CF2B724F16C18D1591D3 = _NONAME_ | V | 0xAB1C03EE659CB7EEB86057D71B826DE6 ; libaacs -0x3DCEB7402A07B41081DE69036D15728ADDC9AAFF = _NONAME_ | V | 0xA85CC69351158679A15862D499DF2A57 ; libaacs -0x61D6A472E3F62D1CD479D88232E29F2BF772EAA8 = _NONAME_ | V | 0x6606E2D61B919682C9D8DE5DF8F16E8D ; libaacs -0x027ED3C5D0AE199039C19244906917BC263272F9 = _NONAME_ | V | 0x55082AEBF6C53E93F219C6795810FFA5 ; libaacs -0x382EED6201BB5741DF1BFDFF407DD84FEE9FABE4 = _NONAME_ | V | 0xBF266E3CC6D78FF855E05C29EFBE17AA ; libaacs -0x7B5C1C247ABB24F9A994583C4B73DCABA315678A = _NONAME_ | V | 0xC025345FE81251F031AD5417B70BDD4D ; libaacs -0xFC82ACFE92C3A2A40C6F52BA0150770F32E50D97 = _NONAME_ | V | 0x63D28EBB33FEF7EE7703D0B4B766A022 ; libaacs -0x414DCF80BB2EF9145F310D36BF6E6B2AC60D9DA7 = _NONAME_ | V | 0xC167F420E371FEDC224B1B2253F7C1F1 ; libaacs -0xF86BFE51C1E120CED686E08533A9263CFB5826D1 = _NONAME_ | V | 0x7897BFF7477BF397336825F61F9A76F9 ; libaacs -0xE8D72B4EE3216B6CF36624DF150E904C6208853B = _NONAME_ | V | 0x612F723BA9FE7A469CC65F0F812950DE ; libaacs -0xFEE7C444CE831172FA02EC4FD37319696275DDAC = _NONAME_ | V | 0x3105A04FBDD89272D8BCB12C25EF832B ; libaacs -0x7F9AFEF543776A3E780B5059A9AAEEDEAF487179 = _NONAME_ | V | 0xDCA1328577F10D7373DF16FBA24C07A7 ; libaacs -0x355CD86B512475DB59E61703CA7DD2A4DBEE0FF3 = _NONAME_ | V | 0x56A4A4C8603D07404D7089382D15DC3D ; libaacs -0x3BEAD13FE277EDF26F55B19717E52793D623696D = _NONAME_ | V | 0x3ADA14AE51F85BDD886C7AC545897340 ; libaacs -0x7744410FE8B3C9A362DE5270E9D0E16DA778E627 = _NONAME_ | V | 0x22B4D36184C03EA5006D5ABA65D6B563 ; libaacs -0x433B5F33604FFCADB2879CAF35D2207016B36AA1 = _NONAME_ | V | 0xF4413BB06D5D3BB7EBCCC590685A7966 ; libaacs -0x9E59710C4800FF81B8307FACD1DDCF4D8C832363 = _NONAME_ | V | 0xAF3DDA45EB2B0552577C06FCC29878F3 ; libaacs -0x987546E458BCA89AE91DCD793A6877C1994DAFA4 = _NONAME_ | V | 0x82542C3E54D34140049DBC64D60E4BC1 ; libaacs -0xD6C017BA6803A5215EBE30577DCDA3003E364844 = _NONAME_ | V | 0x805BCB4E9700FB857DA0753E7CBCC25F ; libaacs -0xA3A126AD57E2D0F58E5D47C2B4009E8C24D421FD = _NONAME_ | V | 0x96229713146D36365C00BF1F6A0E9961 ; libaacs -0x4DE22A6D5FACC252073A36BE5D143EB5B53CD19E = _NONAME_ | V | 0xCE5E6D66B03950D7C059A6194B81239E ; libaacs -0x80B9D4F074DD0F4F5ECD5D93A816915A40366EBB = _NONAME_ | V | 0x9AF52AC9CD6F4477EB128F0FAAE76E6D ; libaacs -0x0C80A2B7BD05D60D500A0B8ED3024FCE5405EC7B = _NONAME_ | V | 0x1CE3A8C4EB83AD8057EEF384B755C930 ; libaacs -0xEF55868889D66569A9993586461FD39A45A6ADD2 = _NONAME_ | V | 0x03BCFE8831F49F348A3BED901C910CA1 ; libaacs -0x908825FEB21EF7230288EE79800E582CCB2CAEBD = _NONAME_ | V | 0x0A5C9C9EAECAA86C4E52F0AA5A8CF2BB ; libaacs -0x7245D793D221A0E76F76731FBAA1341B6FE77E7D = _NONAME_ | V | 0xF21BBF540553C8772E26E691668E4E1A ; libaacs -0xFC7B9F2760A8077B9839E8803FBCFCAB9B183A47 = _NONAME_ | V | 0x4CE0FF47F346DEDAE9A592EB5CF5BDED ; libaacs -0x1560864FE81D4489264FD3818060597E427711D4 = _NONAME_ | V | 0x692F06D6719545D2F7EA4D0C91814DFB ; libaacs -0x52D121D058BB3A852A7B14BCF528406F238AF00C = _NONAME_ | V | 0x70F428C7AFEEEEA799E0078475D2A765 ; libaacs -0x7162EF2B286AB671D6270B18F4031FFE6B623331 = _NONAME_ | V | 0x15746D35D8C4BBD32B28108AD1E29D05 ; libaacs -0x74246730F78E38DDAB958C04891B213EE2BA4C93 = _NONAME_ | V | 0xA115F830CCDAF8C3C1E027A2EAF97BEF ; libaacs -0x841CE37B4BD6D3D5FDF9E2CBBB3B25339823FB29 = _NONAME_ | V | 0x5EA5A1A43CCC449642DC56E3A86A427F ; libaacs -0x02126E39BAA072A9878536ED22D0F2FB3E17CB58 = _NONAME_ | V | 0x4269256A0A5710B21CB3118F03FC7C8E ; libaacs -0x8B8ABD5817BDF27F1E6549361CBDEB0AB7149C85 = _NONAME_ | V | 0x0A3054F6F62BE4BF5B61BF3BBE78EA44 ; libaacs -0x24D61A507CADD3EC9D98960BB150F4133A212E1F = _NONAME_ | V | 0x8ADAA04DF5608CB85851466AC6F8A571 ; libaacs -0xF12DDE0D2D6D7F525859388A3BF73441AAF8FAE1 = _NONAME_ | V | 0x5584CF200F17BF20E10D3BF975D1678D ; libaacs -0xAE3F436A380C21102545BA030C29BF155AE42CE8 = _NONAME_ | V | 0xBBB04F4CC4DED9A0EE0997F143188D93 ; libaacs -0xD363B4D0A6763F5B07B37741CB75174FFBE57668 = _NONAME_ | V | 0x6A94995E7D281B2BBD147AA466547045 ; libaacs -0x5BBF78DE590799E767B5F8676D6B51C80E9AA511 = _NONAME_ | V | 0x83948448EFF76067D8FEBC163D9979CF ; libaacs -0x403191EF5749DA8550D6524CB22BC6AD23CB95D8 = _NONAME_ | V | 0x02290D92C1277CF23B76C1C173B5EF3B ; libaacs -0x689975DBAE91B46752CC9768BDCFC9959E984F1E = _NONAME_ | V | 0x1112DE8BBA83B885E7D9A215643E046C ; libaacs -0x8A3A6FEB701A39818F8DF735F3239362523E2563 = _NONAME_ | V | 0x021DF1688E2D7B3F84997DA077D5CB73 ; libaacs -0xFE1063FA5119F1F9E99135B2A061C5FE69D5A886 = _NONAME_ | V | 0x9DA1E7FED58AA595F80887026CD38760 ; libaacs -0x999B1379A1D7BAA6CE440DD8C1A9E18940F38371 = _NONAME_ | V | 0xE3715E56C58C2E89CF8F1B9323FA18ED ; libaacs -0xE7A56857391AD6A3B7FC49A5C4BFC188C20DA2ED = _NONAME_ | V | 0x1086E80971CE135058AEC4436FE024EA ; libaacs -0xFD79F0E3793F9EFAE72790352883714E52771580 = _NONAME_ | V | 0x442A3D5761A7598F52B397D238AEA63A ; libaacs -0x88ADF6EF5B9D02874008263FBC8C0991F5F14E4B = _NONAME_ | V | 0x09F53A723F0F639E35BF99760F41AEC5 ; libaacs -0x8ADA89184A7619292576DB917C215B62855E9965 = _NONAME_ | V | 0xDA68A2EB49F61A747EA5D9104388C217 ; libaacs -0x8F76F6C9DB95BD3C357C1D2FC3AC5066EAA2B827 = _NONAME_ | V | 0xD275BF1ABE01C63E45099362430EDE5B ; libaacs -0x958DE43CFA1CED0BF4894613469E5583B766D39E = _NONAME_ | V | 0xF284FF454C1636BDE13A9FBA89038D5D ; libaacs -0xA25051A6C1070BC203AADC774AE3A0B3179DD923 = _NONAME_ | V | 0xC4B33F0465BBB744F434583547D83AE8 ; libaacs -0xF3E76198AD261513773766C957D588CEAE17A057 = _NONAME_ | V | 0x259D4CD95D5C9D7AC2085092C8988EF8 ; libaacs -0xECE94A9133BF9E7B953E11640EED20D04C2FEA96 = _NONAME_ | V | 0x83A91C461AF3E5B239ECB83C8592E7A9 ; libaacs -0x6ADE5FEE9542B5DCE8CC93C75AD4D8FC3084ADB1 = _NONAME_ | V | 0x253EC4374DA88557E507824179F32976 ; libaacs -0x9A20E9C8239A0143E6EF82C50C4A6667E1D7393F = _NONAME_ | V | 0xDE62F220C60DE068E4A29D5E3F2BE469 ; libaacs -0x199BA08AB76843969FB1170551EE84F6F6061DD0 = _NONAME_ | V | 0x455FCF8458A50A39712805FF36C0A226 ; libaacs -0x17880E8FC500C9C3AA7B1FE9879EF0AC9462F10E = _NONAME_ | V | 0x618671A2395AB3C753FDE917F02E43A5 ; libaacs -0x374209462724D9FBD16A05F2D8727828BD7BADA7 = _NONAME_ | V | 0x83002C0D0E8B8B978F261922E91296D0 ; libaacs -0xF4AF4CF2AB99D12DE524B09A798EE409E797A1A5 = _NONAME_ | V | 0xFF18396F99FECF878C22BF557F373DA2 ; libaacs -0x9CC3521638B4E7320B31AD2B89678845C9A61CA0 = _NONAME_ | V | 0xA4162460F5BBB34A06EDC54EA745177F ; libaacs -0x8F845F14C2DB2FF6A66CE93C673380FDAE313A5F = _NONAME_ | V | 0xCDA70ABC1152CB50257AAB9E66B660CC ; libaacs -0xC2C3D05BECB9D90C0DA1B55D9836F8AA5DC75F8B = _NONAME_ | V | 0x682929D1DE0390169F8EF72E8817C966 ; libaacs -0xCAA89DB7B6ABBC358671C5FF956A79BC9C7C5D71 = _NONAME_ | V | 0xC4D83A54DCB67CEDA5C467EE9AF2734A ; libaacs -0xD815195BF2F725366A42FF57F5184598A6FF3727 = _NONAME_ | V | 0xF5DD65363E3E8DD8246165F3EE742323 ; libaacs -0x23337228D380E26A3C60281381100EEFDCA4F05E = _NONAME_ | V | 0x772288A952D5E306E13AB0F09C53E78B ; libaacs -0x0B3C0286FC5E58D1CF443E0F1C785DC4568FF367 = _NONAME_ | V | 0x1119F24E277603E4BEC3E0510155672A ; libaacs -0x6212A9190B26EFD3CFEB6A60862629CC7EEB685B = _NONAME_ | V | 0x61D2A74A9B69B9F66A634F88F95683DA ; libaacs -0xD22DA28DFAD1892D7600E2818AA9541EB7C277FB = _NONAME_ | V | 0x99BDBA09744014E899E5684EFB7D8A27 ; libaacs -0xBCE16CD90046F7FBF6A9E0827A4E1C021E516990 = _NONAME_ | V | 0x1F10D77D413FA440B5C1ED5DA3118366 ; libaacs -0x3AF20378C3BCD8972870278D08CAEC6F60157289 = _NONAME_ | V | 0x205F7E6E16ABC4303973F69ADDEB1D0C ; libaacs -0xBA72C9FCB9F6A7269F86E5578B37B93BF26FAF08 = _NONAME_ | V | 0x070536DDA0BAEAE27A35CCB388B70338 -0xE877DE9D8B06059DE2283590BDA0D3530891628E = _NONAME_ | V | 0x22CAABEB44F6898A8E46CF5F70C4A329 ; libaacs -0xB4AB126E120E0C70A1C85FF880B9CF3F2F939050 = _NONAME_ | V | 0x4A3D7DFAABFFC0F6DA5BDFD63BDE4767 ; libaacs -0x89FDB3A7EF95CC0754F455CA6352B2B6380D2CA9 = _NONAME_ | V | 0xFED65C05AE6849354C331F236FE68895 ; libaacs -0xFBDBF57B77789E75B18BA718B6F9F2AADED7B73D = _NONAME_ | V | 0xA4F6A25A0611F7F0E0F9129498EE9A91 ; libaacs -0xCAC3869999868841CB6806B0DD68C165E09F26AD = _NONAME_ | V | 0x743E101C1B7EAFCF94FD0787CB885882 ; libaacs -0x589AF8367E48A50D5F7D2D31C316B07446F120ED = _NONAME_ | V | 0x4049DDD059B597682CADBADF66F27B13 ; libaacs -0xB4EC31D5FED59F93A7FC7D1BB5195A86D17083F5 = _NONAME_ | V | 0xDCD16CE8092314DC3BFC98080382E4AB ; libaacs -0x77A8BA7DF89288F232A7E9A40F279BDCBF32A942 = _NONAME_ | V | 0xFEC9674523B5E443E3F6D0451687BAB5 ; libaacs -0x211E645827DF4FF842A0BB8AA6DBC2465631EDED = _NONAME_ | V | 0xDBBC03BFF9CA202887B90AB69F6235DC ; libaacs -0xD1337E2B2E7CBD5CBA99AD7A0297F35F0390DDE7 = _NONAME_ | V | 0xF4EF35631ED8184F715B2C126799AFF6 ; libaacs -0x66B3A7AD3ADB13C442D6BC8DE1BF5BDD09DC9424 = _NONAME_ | V | 0x5421D373CDB13FC66868C86333C80E6E ; libaacs -0xD63BE71F7EDEBB934C14D832DFB63092FF58F2B6 = _NONAME_ | V | 0x93C784954411CF95D50C9BEA4C10C20E ; libaacs -0xBE304A32AB4A8B90AED04629490AA248EE06304D = _NONAME_ | V | 0x86CFC12A717ED3DCFC6380BE83307EE1 ; libaacs -0xB94F24E0AA8D3B0F23AAF8A66F5CB723B7F7EC03 = _NONAME_ | V | 0xF49B87ADD8BFDC2F2F3EEF373AAA667E ; libaacs -0xA663BC79F8FBAD68ADA73792C5BC771A31003BA4 = _NONAME_ | V | 0xDA0C82598AF8DB6CA87236CB6831B92F ; libaacs -0x1209135099FD146C15C15A086E249C715A61A7F4 = _NONAME_ | V | 0x52D7ACDAB225456D3098285D95ADEA50 ; libaacs -0x1BB0EBF4B38174B24E44D78016AB98E5B75B49C5 = _NONAME_ | V | 0x50C8A4CB6F012A6B6AE5CF524A91D99B ; libaacs -0xCEB967FEB3761CDB9E34F6EFA9D9ECE1CB857C86 = _NONAME_ | V | 0x67FB0F034E67CE931903F2B6FB7AA5DF ; libaacs -0xF183B53B116324573B3678EEF886EF66F1257071 = _NONAME_ | V | 0x38B125BE54309653F15052CD5F954CEC ; libaacs -0x6D6DE54DB5B69F8B59F7C6E3A0F6EF5E3D3840CF = _NONAME_ | V | 0x70835F846BD81E98FFC002A624394606 ; libaacs -0x008BE29EF25674BF9CF2A6F6B0E255E51CE79BD3 = _NONAME_ | V | 0xBC96E2763E1DE9BCAFCC5571259B3148 ; libaacs -0x519DC1179514E922BF186F5EA8239312C64B9F46 = _NONAME_ | V | 0xC04EA760D1BED78B81E5E1296C3AD424 ; libaacs -0x74ED549CFD56A1CD2400F6728C9ECF7F394D9349 = _NONAME_ | V | 0xD6AF32F50CA53BE3237EE2CBBCF0BF80 ; libaacs -0xBA0B8851478B3DC605C3FBD7E7D44DF375FAFD42 = _NONAME_ | V | 0x0374043F25A2729BDD69FD6E44272374 ; libaacs -0xC4C71BB7FE245AD1ADDD4F02BAAD5564C18857FB = _NONAME_ | V | 0x5E720B960B970DD2C37978AFB121F6DB ; libaacs -0xDFB438790587CE6B16F5EC14BCF6F6920BA9E253 = _NONAME_ | V | 0xB136FAA1E0E3F7112C93E0F41F69FF3B ; libaacs -0x26FF2C12E1FD7D3CE016EC4C1F8903C19045C988 = _NONAME_ | V | 0x76C9EE67E1ECB6B41D4CD43930D85FF6 ; libaacs -0x068E2CFFBE259E0E617E41592D7B4A58373059E4 = _NONAME_ | V | 0xC34B2CDED201DECE1BE2B5B6BBF4BC09 ; libaacs -0xC12B7F31D9E2F1548DB8A5A31C3948CB573C1F5A = _NONAME_ | V | 0xE067A1F40A04DCA436E3E49DE2B32881 ; libaacs -0xA07CD26B8E8474DB4B99B065933262BAFF3DE6E2 = _NONAME_ | V | 0x96B42530F69AD0DFB3E7DDF8B62A7714 ; libaacs -0xDBDA52468C35F35BE9B115B1E17ACB6730F1034A = _NONAME_ | V | 0x8D15B9C96934A0582C148C5B554E67ED ; libaacs -0xE89ACFC228DBF8B496135B1D5B416D3630CA6C46 = _NONAME_ | V | 0x6A490FA454118F41154E83B79AFA8ABD ; libaacs -0x3128C46B97F4B8F0AA2EDD076A5DD04433E2D12F = _NONAME_ | V | 0xEECA2C85E7932DDD7B84066D2A1195BF ; libaacs -0xE2A8955CA6E6880F376D878E195993E54AE3D3E7 = _NONAME_ | V | 0xCF703849F8BFFE958A20557B27A89771 ; libaacs -0x465FE0E68334C11BCE128AAA4221FEE8FEC77FDC = _NONAME_ | V | 0x3E52F50609953CA150D47FF296DF953D ; libaacs -0x6035CBD65E937512EBF772CDB7A65C117D683BF6 = _NONAME_ | V | 0x4837E41728D63ADBFEC776AD07E5B4D1 ; libaacs -0xB05C5FC65A59DD87341A54CE3033542640C6091F = _NONAME_ | V | 0xFC4985B857344C7F4A9F18A207EB27D2 ; libaacs -0x2A046EF5B6E0488C85678A716E9C9053C2CD811D = _NONAME_ | V | 0xFD33674F64A065F75BB84FF728D80D1A ; libaacs -0x40A8B17022E9656D1373E6CC97EAFBAFD7AA7F2C = _NONAME_ | V | 0x537C8FF68E61FA9142342694AC165911 ; libaacs -0x772BFDDFD3C16BED01279CB57DDC008446B1FBFB = _NONAME_ | V | 0x40893E11AD9C4967DE420631241A1569 ; libaacs -0x24F8F7306298C46B1FEA903212BC5052D7EF1CA1 = _NONAME_ | V | 0xFED9A6E5370B60EB9EE32E1C2AA6C1C4 ; libaacs -0x70A50E5E977EF3C0B3EC7FC424998A56A7DDB3CD = _NONAME_ | V | 0xD9DDFF268AABD67554ADA6B0D00920BC ; libaacs -0xD828546BFD37F66BDFAF3CE68129FDC87B5FA3E6 = _NONAME_ | V | 0x61EA882A8035ABD5D4B74F5723C28499 ; libaacs -0x3F51F9E0B0A48BE3A8021123DB99AE5183FE8833 = _NONAME_ | V | 0x57EEB780666A4974A48435A09E254D09 ; libaacs -0x53D1ADF73DDCC4E4CC5C7C37B05E0A1EA362D8B8 = _NONAME_ | V | 0xFB2DC78D9EF5D9D7A7CFA8DE86006DF9 ; libaacs -0xF341FC0DC28501A0285F18B0041984A802AE0231 = _NONAME_ | V | 0xB2627C0EF5286E5130B914350F2A24EF ; libaacs -0xD46FD9216834948FAA3572CE3DCFB5A3064B12E3 = _NONAME_ | V | 0x1B5E35EBF7A69B3884F661BA2402FABA ; libaacs -0x4BBEB6F89A6ECB25F84F8E2306B8C8219BABE1DB = _NONAME_ | V | 0x89FA4754B5F726A87C9B83A79A829579 ; libaacs -0xDEA8E1B9AFDAE4688A4A01B12BDBBB8F954FC86D = _NONAME_ | V | 0x8397F4671E42D55B1B962CB3C0092616 ; libaacs -0x9A96EAB63A6422BBC64923BD7F0CC0BC32567CEC = _NONAME_ | V | 0x6EF9E76E34EF2E4E7019861F1709731A ; libaacs -0x9075971933A54174CA3B7DCEB4BEE0D7DFECBDB4 = _NONAME_ | V | 0xEEF80296C91115114D38CA40D47EE177 ; libaacs -0xD42ECC559B24302903B6ECB53AC213A10FDF7880 = _NONAME_ | V | 0x783C839489CF253DD072F25927A4F08D ; libaacs -0x4636EE565016E99632C910BEAD8CDEF0C59DF576 = _NONAME_ | V | 0xF1A17DD3E1A52D067B88E9BDF43A530B ; libaacs -0x19858032B132788B640CEDA7A43D152C9CF9B323 = _NONAME_ | V | 0xE164D2315AE87FB2968957E9A70D807E ; libaacs -0xF7CACBDFAB1FE254436B2B28FD6E8DF6D1108A54 = _NONAME_ | V | 0x0A331E0387C9C182A69D7842BCB811EA ; libaacs -0x99FE02A376B2D3F11B11A680E66E857A34EF3F27 = _NONAME_ | V | 0x1596E11F5FCDAA43C081E6C8DCD1E77C ; libaacs -0xE9B68BB52196BB5F7C4B5C108B83CD29FEFE87E5 = _NONAME_ | V | 0xAD91C04AE88A6491E64B716D9E0EF929 ; libaacs -0x5F861082CB937ED1E09C4FEB775B2A543D55ACE6 = _NONAME_ | V | 0xC9F479F509331011938BFDB6E983196B ; libaacs -0x435614F46E62675BDCF6DEF22B0432E37EE0337F = _NONAME_ | V | 0x3889E1CBB1FF309C927294BB88410A82 ; libaacs -0x2A4E3860A6E889CE3DD559A85F3874652ADDEA93 = _NONAME_ | V | 0x909B618362250C4CDC9A43E8F4DDCD0B ; libaacs -0x43DE2F26B7A21BC1C3EFF59A2CDF7095ACED128A = _NONAME_ | V | 0xB502DF39EDE712375E39686470232A30 ; libaacs -0x2AB4F5115E016C1F2CF97DFBE1003CBD16FE89D4 = _NONAME_ | V | 0xEF0946954C361B5D06B60BC5819F20D9 ; libaacs -0x3808DFF0C86C0235EA4B3EB365E2730A1AB4D906 = _NONAME_ | V | 0x5006D4F950F61A0C7BA8CE8A77952D83 ; libaacs -0x557781DBFB98F47BBBE718C916BCAF56FF0422A2 = _NONAME_ | V | 0x9F463E1E625B43A9A2F357F7D74A8F1B ; libaacs -0x594C5E72B1AFFB855669ADE5B9E1435722806925 = _NONAME_ | V | 0x85772E42BD5C85489767CCAA1A04D316 ; libaacs -0xD15A12F71CBBE9D26A3C8FF16855665646F60E64 = _NONAME_ | V | 0xD6C58F2B9769003C5C3469C2CF8BE2F7 ; libaacs -0x984404FD038E8F175B6F01B75780A03BC6918963 = _NONAME_ | V | 0x9F8C6D382351AE014607ACF2AAF467F2 ; libaacs -0x79C7F6E2AF1EDEBABB40B7F48CC918737542677C = _NONAME_ | V | 0x0597FCCACAAC1AC2258B49E01629A389 ; libaacs -0xBDD6A5EA72277BE5779E2871E6A5581DA9969326 = _NONAME_ | V | 0x04DFAD50ED622514C1A2FD768A60313D ; libaacs -0x906AEFECEC26A4C9AB6FE6D895C4EE029F4D26BE = _NONAME_ | V | 0x9D688865DD3E14C0B2F56B14E1E5E9C7 ; libaacs -0x505892CCA5C9AA27FCA7D49C73B34568A1B16D5E = _NONAME_ | V | 0xA44F5A313B0BDA6B8BF3771986AE957F ; libaacs -0x6DFB45771C82684CF3082F9DAAF212809F817FF5 = _NONAME_ | V | 0x1F005C8AE548D75EF71877D96F7C3EE9 ; libaacs -0x961BBB7D90F5DC06E826CB023926FBCBE223F0B0 = _NONAME_ | V | 0xA22122415BF2CC2EEA1D65001F4C2A4B ; libaacs -0x912A8C7076A6DF0BA9EC1CAA69BBE367DF77D9AB = _NONAME_ | V | 0x9D730350D3D6B62FDA7D87BBA58F1931 ; libaacs -0xFF61277D28E5372E1D0315C7C05A4DCDBD4FD760 = _NONAME_ | V | 0x9840BAE804C68E3A4F4422E21F0786EC ; libaacs -0x7D54D45713355D385F95724F95F21012860F95DB = _NONAME_ | V | 0x20B5DCD7057AB636203CCD6B9F1DB97D ; libaacs -0xD76E0178E6DBBC2B39F91025ABD93638A611FA8E = _NONAME_ | V | 0x795F25B37AEDAA89EC7B540657377B49 ; libaacs -0x405EB22B25B6FD95B8265C888769DDA87E29D358 = _NONAME_ | V | 0xF6B32BF5C58454982FAF506732FE258B ; libaacs -0xBCC598A22196F8FDEE5A63AE71385B3C6615709A = _NONAME_ | V | 0x04110C1EFE45701AB805410AC160CBBA ; libaacs -0x2F1FD617B5FDFBAAF28E6121DC5361DA1670EF39 = _NONAME_ | V | 0xA716EAEC1E5FEEFB4241A6FB7A3BF530 ; libaacs -0x4202D7B44CDAA1112B82AC0535DD38682FDC90E4 = _NONAME_ | V | 0x91C1CE18088AA25ACF4F40997F42558D ; libaacs -0x347455C7EA9C871A0DB6335D8FE451D2E967B61A = _NONAME_ | V | 0x14A35BD844DC2271557F98F366C6AF6C ; libaacs -0xB5A70DE5CE2DADF6DCCD377B5772916E51C9B4F7 = _NONAME_ | V | 0x9FF5ED33913CA3D522825B79AAF39B99 ; libaacs -0x7894649D620CC20E61E9D497ED3A12D97029A5F1 = _NONAME_ | V | 0x86B3F543DD5FDB982A6DDD4717CD1E22 ; libaacs -0x08420D6E54E96227967CBE94F2ABFEB534C3610D = _NONAME_ | V | 0x56630401D31060318ACD194A2E3AA3A2 ; libaacs -0x7CDAD8301BFBCB192701FD8C6BAA6ABAE0EEC020 = _NONAME_ | V | 0x2BEF6D8C9BFB2061018203A6B652087C ; libaacs -0x7959DA5CAFEBED4162A8E3B9C9ABC6A575C7BC2F = _NONAME_ | V | 0x369E67A7C65EE9AE14693A5D552E1343 ; libaacs -0x3E9FF4CA493E772AB463ABAC81869C440DEF0BA3 = _NONAME_ | V | 0xFE464CBCA0D193439B8E9253ECE18DD0 ; libaacs -0x0EFE725AF94572A1BE53CE7E07FC054319F7F1CF = _NONAME_ | V | 0xB88AC3A4897B6333A871E99907BDFC35 ; libaacs -0x09B71AF99ECF168D377808A2AB47C1229ED8D0B0 = _NONAME_ | V | 0x5DB6376D862169A027CF2EFF18AEB21A ; libaacs -0x2B971B15A4F3FC5D1C9AA92663105BAD76DE594A = _NONAME_ | V | 0x74EB8E098B2BEFF26301F9CAC2032632 ; libaacs -0x73AF0237B54F087388337A64A3A647C747F51368 = _NONAME_ | V | 0x8F4336F709C6554DCA64031103701DF2 ; libaacs -0x1596EE8FFB688FBA80F3844BF7AA2A216B4EDED8 = _NONAME_ | V | 0xF8C1D40BD9A1BC77443FCC30D6FC9DF4 ; libaacs -0xF1295F0020F840413447AE3F215D3AA8E61ED85E = _NONAME_ | V | 0xDE5C7F29FEA6E3F3A4ED0218C97327D0 ; libaacs -0x62CF115DA8C5381B237E550FA19B634320A15EBE = _NONAME_ | V | 0xCADC0067A6B975C0E4A1B0F31AF4BADA ; libaacs -0x6232041D74AB16004CF971A5E731961DF448F13B = _NONAME_ | V | 0x4806074067DF1049D57FC43AFCB24179 ; libaacs -0x84041E58BC8F540FD694943ADA320D98DBA6E484 = _NONAME_ | V | 0x850B0544D5E221C9B165126EDDD16CEE ; libaacs -0x5865E84276AED0BFD46F7E8B5DE2B6824B019B24 = _NONAME_ | V | 0x6093F68FD9BA5375538E9A77FF84F77F ; libaacs -0xE7D158CDDC0974B0494FD86A1EC7B4EFCCBB9740 = _NONAME_ | V | 0xB43E3D4DF46BFA1E65985825C5675355 ; libaacs -0x11DFAA67DCEE236F444462583A380228A46A7837 = _NONAME_ | V | 0xD2C60966F58E3DE1F3B8809556B52356 ; libaacs -0x4ADDCF0C3B62AD7F3E6015CE318A8070F4559F13 = _NONAME_ | V | 0xD666BADE279585C0478F0D4A946A77C2 ; libaacs -0x1932644A19D633E499E75F06992E525CDCFE55E2 = _NONAME_ | V | 0xC84A63F55C9F932C5970538150273030 ; libaacs -0x7631B796B21F81B5727D0D241255F3F11640DA93 = _NONAME_ | V | 0xCC3A66DC617B93E7F3B1C5C4871F4D5F ; libaacs -0xFFB9F1FCD3AB45F9B0E8FFD2BE0B6228ABE0E138 = _NONAME_ | V | 0x1B05CE85BB02F52F3E0D2B89D8A182A2 ; libaacs -0xD4F9AFD543E2ECFA62E1FDB4D81D2558D9A0A9DA = _NONAME_ | V | 0xF1C421B8501BED396CED5C71CFEB5A2B ; libaacs -0x7BB4876BB9CD1EEE9C1592504EE0A0FFBF7181B9 = _NONAME_ | V | 0xEF5A6CEB510BF12558B340853BDC0F8E ; libaacs -0xF5212A4B2F3CEC677451BBF6312B376E2D4CECFC = _NONAME_ | V | 0x09A576E1EDC0BBEDC3ED6FCE0C5D2788 ; libaacs -0x3ED7C541A7CF76BF7D727EBACC6BC7FD13790969 = _NONAME_ | V | 0x6C9CEB9D442E21F66B379E101F69AD6F ; libaacs -0xE61BAA8EB0325F7FECDF8327DF5FDAB17A233BED = _NONAME_ | V | 0x8995F6AE7781B2573F26EEFB179CBBFB ; libaacs -0xECC277BAD913D0338A70622F775170D0F8B0F5B1 = _NONAME_ | V | 0xA37011B5BF0B1FB2A0E150C9A1329B23 ; libaacs -0xECA80293853EC7B39872F4DB80C4C1DE7386E22A = _NONAME_ | V | 0xFB2B34BB5E73030C70FDD8791213DD8C ; libaacs -0xFEA4BDE4B6CF5620C6214FFE002410F88D8D498E = _NONAME_ | V | 0xF7AD2F6380B36C9F44EF62E697045162 ; libaacs -0x05994E1F90D9EC925A48F267D123E80D3A4F882D = _NONAME_ | V | 0x22709D207142F0DAFC761E4E443CEC0E ; libaacs -0xFCD28147D485600771B8057C673711AB3B1E991C = _NONAME_ | V | 0x6E48B076F8E5F6ADBF5272E3DAD6D486 ; libaacs -0xEC69089605E4417963FA761113816CF00A72F067 = _NONAME_ | V | 0xD3F0BD1A93B09F60BC4DA83559D0B1B0 ; libaacs -0x8426F32C2D9CF6103DBD0B9DC28548496CD9D9C4 = _NONAME_ | V | 0x9719C0C5D5D039B1E4AF1F3241622F8D ; libaacs -0xDE8E63229A9386C803CFB9C9BC7D2A5E653E003C = _NONAME_ | V | 0x7ECB5E938F1F5E34B7F9FDB1BE5E3727 ; libaacs -0x420CFA77DC2800431A5899E834D4A6EBF47AB74E = _NONAME_ | V | 0x36CD5F2EB38C84D111700AA4A1819B6E ; libaacs -0xC6679BE5E24F03DD592997A152E6A889584ADBD7 = _NONAME_ | V | 0x3F68D4FA5BD6153F0A1E58E9326327C3 ; libaacs -0x875615E63236323F0CE3965B13812BA4B4A90F61 = _NONAME_ | V | 0x668941E1BE57690AD597FA53AEA12F5C ; libaacs -0x5F5C804B019AD82ABFE4DD04FC186FFE87D81683 = _NONAME_ | V | 0xE3DAAD8C68BDE7A02A57143F3A4FF31D ; libaacs -0x16BB3C104322C940324A6A0ADDB87145B5758187 = _NONAME_ | V | 0x9FAF25B1E5120066E3E9249891BC3725 ; libaacs -0x61413983C8ADE6E4413EC2B66072E1063CC2D126 = _NONAME_ | V | 0x7285EA6923991F8B6AB114C9DE05905C ; libaacs -0xB5A14406AD55651CD9592ECC26CB09DB9723E637 = _NONAME_ | V | 0xAA8F2265141DB92E8EB4E8F8FB4AE60A ; libaacs -0xC8E41A65EE3B07B501326674544A8EC48E68AF96 = _NONAME_ | V | 0x5E7B18855EE7DFD96627E1F72B41706E ; libaacs -0xF14F8E0E4F0E9634537ED9D7C9D96ED959308215 = _NONAME_ | V | 0xE285A2DB1394EDE8D2AEACA989F65EB6 ; libaacs -0x5C6A0BF3F68E6F4F08E9EAA29999B6E3D6DB0182 = _NONAME_ | V | 0xB02B74089ACF70186271B4BA99480BB7 ; libaacs -0x29522FE08A359E294CF31B40B97179BB8A31612F = _NONAME_ | V | 0xF7C9053B6C8C48CA34B7D64310024D64 ; libaacs -0x222B69DB9E2981B2FD5D0C60FC84747826DEA51D = _NONAME_ | V | 0xD44F48A20C6C2C81B37BF49E684E0D45 ; libaacs -0x2AF128CD5708446DF25699430B1A36227BEBFD1B = _NONAME_ | V | 0x2C1335E5836275534C7514C9EC3073A8 ; libaacs -0x305BD32FAA389D00DB593263B5012245A663D292 = _NONAME_ | V | 0xA0D70FE870D03516E2BB6D1AF2D8492E ; libaacs -0x31D33DFB8A8995DFDFEBC67592BB709E44ED4A87 = _NONAME_ | V | 0xC4157D3ED3925DFB12A90706F607C3A3 ; libaacs -0x3875CC1EEE8915FA65F061E2D117EF6D1C32587F = _NONAME_ | V | 0x8E554F81EC8F79D30FAE15A4EB63C3A4 ; libaacs -0x403A4EF73B5AE4D9A71269D7814EB2934505EF6A = _NONAME_ | V | 0x3BF655102E21EF61154BF81C797E7113 ; libaacs -0x4A934153CBEDCCB8170C4E181CBD98101D772E42 = _NONAME_ | V | 0x403B95208DF66755F589593598E7835B ; libaacs -0x5F72B11CDD6A3F265259BA4EE609C1A542F9DB0A = _NONAME_ | V | 0x3AF1ED79CA6512EA6A43A625273D04AB ; libaacs -0x6137CE7BF597C0937AD39D644F35884F6BFB92C8 = _NONAME_ | V | 0x07C663CC2C3FB4327EF342BF275E90F4 ; libaacs -0x14158E20FC26F88BD08B1FBF3CA794056B9E69E7 = _NONAME_ | V | 0xB99A09B001979C11C8D6996FD5AC5688 ; libaacs -0x5C89A7C5004A9A4305D435572F4C2B55CF1DACC4 = _NONAME_ | V | 0x7A42A27218D15249454CE37B98EC63A7 ; libaacs -0x1571DD894D6C67907D23733D453A6F3B856E3DB0 = _NONAME_ | V | 0xB84585C4D6751005279A44DE24C2096E ; libaacs -0x7F44581C1AC6EAD35276B77DDE354EE6FCA7C8B1 = _NONAME_ | V | 0x801CD0B99A57FF6E41445B54B15E3022 ; libaacs -0xA6E28D7AAFD7298CB9F6E21C9751CF3FA01F3C6D = _NONAME_ | V | 0x2B4F3B92C8B9DB844B3B82CB6566FAE3 ; libaacs -0x7FD186E95EBAEB6E3EB42188866D233AC7B07E4D = _NONAME_ | V | 0x92711AAE7A457FE432ACCE848037A737 ; libaacs -0xCC39E36A003F90D1D66249F5DF02641C6263AE38 = _NONAME_ | V | 0x6CFAC3DA9459C62FE10A8FB00D2FD6C9 ; libaacs -0xF0D8BFC4ADA4A6BFEBFE4B79B4542AE7D4A120AB = _NONAME_ | V | 0x96ADD98178771B3D9681EA731C497430 ; libaacs -0xDDD96C58FDB4984B221D0422BC5D586F8A533439 = _NONAME_ | V | 0xD5346949A1E099A59FFD8D38B74BC00B ; libaacs -0xE4D566051AEF5D7A86985026C93E6585E19F2581 = _NONAME_ | V | 0x4644E8E265BA64FF1FEC858D38BC50B6 ; libaacs -0xB21E17BAF2F699AD40D4D1B2FF70FF6B194D9DD2 = _NONAME_ | V | 0x026FE8868F2538E25F76F65ED42AD9EA ; libaacs -0x26E544613A8E7B55E40048178B1F4ABB0F41E88B = _NONAME_ | V | 0x0D963B675B2871B884F027880A74CB98 ; libaacs -0x8DEB59B61CCB02B8CBB4AE69247C61629CFF6FFC = _NONAME_ | V | 0xDD49216357174E763396E74CD10480A2 ; libaacs -0xA533DAC00CB0DBDF75DAF4A66E942FD5E7BFD6AC = _NONAME_ | V | 0x630A9A2E9FFAA34456470581718E4C6F ; libaacs -0xD4CF4A6A872B3E26F2DDEB41E450DD13234A7F98 = _NONAME_ | V | 0x701C1A65C8E04FEDF99BEDAA2445ED38 ; libaacs -0x03EC51A286CAE388C3B5B536A846E4ADE0BF8E46 = _NONAME_ | V | 0x433ED1C6D4DA67BA49666EA994BB67B8 ; libaacs -0x054DCF41D38E4E31D16340F9FF5F04CBA79B7259 = _NONAME_ | V | 0x945E0514CA460A8FC10C426F60A0DD63 ; libaacs -0x0E5AB7E1B3520134A74F141FE75A9AE5B9D60C6E = _NONAME_ | V | 0xFCF06FFB1660E52EAB939129730D6E50 ; libaacs -0x0F6739CEE3915D20CA6E6CDD4147157F0D268880 = _NONAME_ | V | 0x68F6525A34BEE489B44907AFF065621D ; libaacs -0x10524AD77213F8FC156136C8D15321BD697183C2 = _NONAME_ | V | 0x47D68AB7C6EBF67F6AFC18A4171A27AF ; libaacs -0x1099160030BA8AF07F36A5079B141042906F4219 = _NONAME_ | V | 0x0C30039D8D6B0540C1F8F904E214FF47 ; libaacs -0x1274CA0E3B8974742C9A3AC123667905D765A09B = _NONAME_ | V | 0x4A0741103DE38FC01C73C14DF5109101 ; libaacs -0x130F1D03B83973583C5F0020D559FF0C083C79A1 = _NONAME_ | V | 0xD5164752FD84A157AA0F26FD776D7500 ; libaacs -0xE01850C42F3352DF15E9270DB5F8E46E79BAAB40 = _NONAME_ | V | 0x2ED3B044EEAE8CE1C6E7A355F6F0CB15 ; libaacs -0xA1BE95F695C7227866E9097C30CDC0F7B1B0EBC8 = _NONAME_ | V | 0xE5B4AACC2EB17F70DD95B5C4E12554D4 ; libaacs -0xA2D296262CFEB52942A7B92B04C1E580AD3DAD32 = _NONAME_ | V | 0xDE8861A59716103A54754902C2FA3E49 ; libaacs -0xAF78DF2B374C22E3413A54F6564EEA9BDBDE143F = _NONAME_ | V | 0x26962F9907A4166C21F24FE85E2A810C ; libaacs -0xC193962FDF7B8CA471D0DF01D0B75D876BFFC11E = _NONAME_ | V | 0x3E7C2F5DB39ED532862969894707CF10 ; libaacs -0xC26D996E32D7638A599556531A0B3A63D2257CE9 = _NONAME_ | V | 0xC794B099A2866C7045EBFDB3C13B4137 ; libaacs -0xD605B1183FC651246B697DEC2C3B3654C88FCABA = _NONAME_ | V | 0x31F5CA7E535DECFBB7E9705F5FF84CA3 ; libaacs -0xED0B1B74000ACD10C8705FC668B31533EB5876E7 = _NONAME_ | V | 0x24E27A78C552900E4B4197670D51724E ; libaacs -0x15FB89852E4325612534E5292423A4B67B413DC8 = _NONAME_ | V | 0xD2740FB62B1E83DA1A57BA9C048C7803 ; libaacs -0xB6BB3F185A5163BC88E7741D80057374917CCE79 = _NONAME_ | V | 0xA750F84AE70E9ECB5DB7EC4B4CEE61CF ; libaacs -0x48F4B09E47B4211E0D3F16A2057BABFAE4BCBB42 = _NONAME_ | V | 0xA1E444212044A25C340E6729EA69350C ; libaacs -0xD937C40F125205A08BFEDE1128EE50D702497517 = _NONAME_ | V | 0xD3482E1D9AEF5E43E3785D9990497B4E ; libaacs -0x162B26C06AD3CF7BB7F4F767F65B21C65D232488 = _NONAME_ | V | 0x86251A86B2EC8C92C8788F6622571CF8 ; libaacs -0x85D747B4CBEE81FB40F84A99DFAA0423C986F75C = _NONAME_ | V | 0x05A1D08B43C94E2355A1203561703494 ; libaacs -0x9AA74E82044DDC7C6ED2E0265838A0D6F27A02DF = _NONAME_ | V | 0x2936DC28ED7C2F4BC2E085C95B3AA679 ; libaacs -0xFD50B695ECFCAA8C41F0C9789C59872EE80470C4 = _NONAME_ | V | 0x0C73D120004E22C0C989B41E3670E9FD ; libaacs -0x082ACD6886D83C1F7CDD0D49B2A0FB7D9C15C633 = _NONAME_ | V | 0x77D0486EBD013185CE6803A1753DA7D8 ; libaacs -0x14E679839240614F6DC21994120C69E0BE861D42 = _NONAME_ | V | 0x56AB402AE1B0524CD557CBAFA2C0BDA7 ; libaacs -0x6576AE2CA414E3E65F07E699B56F0D9C6EB24662 = _NONAME_ | V | 0x16180DD2EBA1F418C9B24EEA7390C872 ; libaacs -0x6D47A626BE301A0B3FBF0B2404396913BCC05CF1 = _NONAME_ | V | 0x7CCD3080083BF8D066158F284936D2B3 ; libaacs -0x8859B2B026C4C6FA9FE8B97C110A62BFCEDE9CF8 = _NONAME_ | V | 0x4D48D5BEA0008A6B1CAFA64934052467 ; libaacs -0x035B0517F1ACC62C7AC753A63D7F33595BBA6E8A = _NONAME_ | V | 0x64D18DCB67CE5B949ABC65F845F6A581 ; libaacs -0x4CED50CE4D2BA210EE9CA4C32450F31BA1BC5B4B = _NONAME_ | V | 0xECA98218AFAB96FEEBB9DD929952BC23 ; libaacs -0xAFDF0C37BEC14B271C80E19A2AC489AE43A1A0E3 = _NONAME_ | V | 0x9966AF8E87E3583FB9F9925F329D6E49 ; libaacs -0x1A5706E57428E64A9F9ABA6D2D2068A98A53D092 = _NONAME_ | V | 0x91E3E7C459617C5969E51EBF8CBA5198 ; libaacs -0x5B6BA852B900F1F6ADB9640F7AA8CBFE30C47243 = _NONAME_ | V | 0x0CCC6FC67FDDED9F9F0DF830F98EC9FC ; libaacs -0x3B945D4EF820DCAB5FEBC10377AA03ED114CA1E3 = _NONAME_ | V | 0x7CA1D050EC07438332724821B88830C0 ; libaacs -0xE1D5CDF31C880F7AD9A02DE1F96C5A3E690A6EF0 = _NONAME_ | V | 0xE91DCB54AB78E05967CEC8BEA6F7D1E9 ; libaacs -0x8D944EB155481FBD37C0A61F6B2A78FB1A48348B = _NONAME_ | V | 0x73716955A7FC117B80E9A8C8234603F0 ; libaacs -0x19C190916DA8DEFEB30531053B24FD57026A3688 = _NONAME_ | V | 0xD0BF74414F770145BC79A36B5118D0AD ; libaacs -0x5A4DDC514A218168BBC0728128FDDF4034F70F28 = _NONAME_ | V | 0x2F115F545D3191C1647154A4E2245FB5 ; libaacs -0x35AC6A6DA21B35AFA6B955B3488BBA2F54CE6C10 = _NONAME_ | V | 0xA855EB08F896C696AD99F5DAC478B9EA ; libaacs -0xAFBECD1E3ED3AB6A4F8EEE9ECFE571EBFB01B46C = _NONAME_ | V | 0x5F7211078725E71F34BB2D5ACE872B5E ; libaacs -0xC3B519FADF296C01E4572EF164D0B803E1770ACB = _NONAME_ | V | 0x4383D875C9C529DFB4E7448DC5B9AC0C ; libaacs -0x3A62F93C65EAB6CA404C44500C316113ECEE1739 = _NONAME_ | V | 0x332046D6DDE550C363C4C5D4F3093157 ; libaacs -0x00D47471CB423273BE73B3EB220840F20B131D2F = _NONAME_ | V | 0x9F562BB79CEF92F78A9DF3162F54AAC5 ; libaacs -0x6D020D5683EEA38CFEE8FD26B559A729A791C2B0 = _NONAME_ | V | 0x83519B1947968543CC8BCA66F972D95B ; libaacs -0x7A4CF1ACDE87BC1984A782AF8B0340393BFA796D = _NONAME_ | V | 0x4C20E12000C7C71B464062A80864D141 ; libaacs -0x37BEF284C3641633A0EC3AED7C5555FBDF04D22E = _NONAME_ | V | 0x63C9A5B482792060BF2E471F9D4C4ADD ; libaacs -0x0FFEB30A54B4F70E8700D09F8887B5A3D315ADF8 = _NONAME_ | V | 0x9D33A2F5D72E02EB903CB5CF75C3C882 ; libaacs -0xE6BCEC4548EBC15935F223D308E57A0E65069854 = _NONAME_ | V | 0x3A917B008543816EEE0F84DE17BFA57F ; libaacs -0x282D802AE22D6E2D8E68FF41153910B9D78F947F = _NONAME_ | V | 0x45F19ADE37A2CB8E16D947210FCAE55C ; libaacs -0x4A07AB6CE2545AC656FEAE7473481E3CA77142A5 = _NONAME_ | V | 0x84AC4E5AEEAE1D21E711E8F935C2196F ; libaacs -0xCA04D5963571D29688793F8F4130EA234BFE3B3D = _NONAME_ | V | 0xBC1FED11668766344F1D31851FB691A2 ; libaacs -0x1ABCC5E319C9C9D6D3E04A0072DC15413CF41CB8 = _NONAME_ | V | 0xD76ABDD9D2F8C3A55D9D90D873AE2B2E ; libaacs -0x1840F8790E815981412CCCAE4AE9A922BF120E88 = _NONAME_ | V | 0x16F8B03C0C0177AF7397374B1B60D72E ; libaacs -0xD616735B36E811D389AF43D948E62C8AE7E6FFEE = _NONAME_ | V | 0x517EE97508DFD104336A125EAB4BAB4D ; libaacs -0xE47D2D3322FF54637E0DD90F455545CA88C16622 = _NONAME_ | V | 0xF5C0E66BF11DE7F9CA4F487882FA37B0 ; libaacs -0x983EA99B7199BC2678FAFD490A1CE79B0FDFEEA2 = _NONAME_ | V | 0x786EA514F485D0C7A6B0E2114AA27FBA ; libaacs -0x66BEACF42685B543998CCE9545474EB8CF3B5652 = _NONAME_ | V | 0x1FFB8A2AABECB0ABECF1F8AD707394B8 ; libaacs -0xEB9E83A33AEF40A118E7F994477E90EF29BA8254 = _NONAME_ | V | 0x80213C060A3C986841D0BA590844B9EC ; libaacs -0xDB756C0F8C8197326B4CA7728EE8D58988078660 = _NONAME_ | V | 0xCCC56C2DCCE46E5DBDB52CAF87497F9E ; libaacs -0xCF69A06FE0E2A10E13D688FC587FA6CED2372341 = _NONAME_ | V | 0x30BACC3AAE3C4732521BE6B243427FC1 ; libaacs -0x0557696525FB40F11695944F84EBB60B37522831 = _NONAME_ | V | 0xACECD4D4DA7FDBF65B7D155C67965096 ; libaacs -0x3EDE503FDC3F0CDDDEAC798CCD9EE3536C1942B2 = _NONAME_ | V | 0xF9907D8F2431609E224BDB3B201A7884 ; libaacs -0x7E6B45D955323401E2DACBFF11CC8022F8EAB505 = _NONAME_ | V | 0xE50FCE3E31718A856F24DED66323980F ; libaacs -0x141CAB5D3A055A99A5A581AB29B53F6CB0A169FE = _NONAME_ | V | 0x7A57BC71F731963848AC1123AA32F2A3 ; libaacs -0x9E1386532EC55C7DC1394901C24EE9FED536494F = _NONAME_ | V | 0xA2A363772CF2942F9C3AE1710DEF9DEB ; libaacs -0x0C4C18C885AA57F1274BD8291CDE9E9B6C598282 = _NONAME_ | V | 0xFF8AFFC79DECBB31983214C6467756E5 ; libaacs -0x404EFA48BE94AC0289E079D4A464F8FD89B030F5 = _NONAME_ | V | 0x065DECECB45C0A026E70AE14766EEAD2 ; libaacs -0x176AF32C31F75A51985786DDDFB44E33266ECAD7 = _NONAME_ | V | 0xCEF973FB4F3A639EB0E699E6432E0122 ; libaacs -0x770A6BA355EDFE25B5D06EAA864BA989C2DF79A7 = _NONAME_ | V | 0xDF8DED3DD8900A7FBAD643AD8DD86A14 ; libaacs -0x88DA82566DC018340826667C4F8CAC03C72B8C8B = _NONAME_ | V | 0x7A654C6FBE7AD7C2FF030F21422881F8 ; libaacs -0x8B39F6070A4FE6DB70DCD56F4B56AB528D59D63B = _NONAME_ | V | 0x6D80147E2A43362E082EC72FD85C52E8 ; libaacs -0x8C57C837DEC9C8234A845231606E1A65E838336A = _NONAME_ | V | 0x4279D698820FC1E76BAE9DC3B32D380C ; libaacs -0x8D7632758FE59E24E0F435EB409E0503795D8A7C = _NONAME_ | V | 0xF57A7DFBBD1890319D1FD9D258BC0EDB ; libaacs -0x9138631F377245CC97F62DBFA2FBDBC8A914AC36 = _NONAME_ | V | 0x5DF9A2C42C6276F983D3525FD0DCA931 ; libaacs -0x92A8D5E92AB950755151BF3C24F515BB43396FB0 = _NONAME_ | V | 0x0AE934D16962BF1A22639AC72638B8F2 ; libaacs -0x93E8BD5529D646444183CE28C0E5474DF0154E07 = _NONAME_ | V | 0x1BFFA39A50804BC30C227A7EB046FB5D ; libaacs -0x949D0A7C52CAF1846C37F6DFF6FF5D30C8F1A87B = _NONAME_ | V | 0x7BE1466283A2D64056A76B926A8174B5 ; libaacs -0x98E7926AD080B3086911F9EAA41310B8A60683E4 = _NONAME_ | V | 0xFCBABAF584CF93336F9572B371629204 ; libaacs -0x8788BC57180EB5CDD51C5CE3E9A6E2CE0D7E3536 = _NONAME_ | V | 0x59DF6C65E9BFCE2BA1B6DFB454231417 ; libaacs -0x862B9C7A4092F357C78AABA0EFCDACE864BFCAAF = _NONAME_ | V | 0x4D6B870613CD0691F1C3E1A90C4B8469 ; libaacs -0x8574CBF95EAA2F1999945A46D9153090A6934AFC = _NONAME_ | V | 0x96D3F1DA73AB000A933F58436131926F ; libaacs -0x79CECA04499188F9DA5BE36359CD9A2E9FFD9BD8 = _NONAME_ | V | 0x32F46F9888868397F988EFDFBF772771 ; libaacs -0x7B4A412EAB4BE86D850F8521483F519C7132AEAC = _NONAME_ | V | 0x48D28AD45C0C68E672ED560F5A787F3B ; libaacs -0x7CF66F604EB0726DEDC13CA85E64DFF552835070 = _NONAME_ | V | 0x2C01EAB6F1213DAB0B42430DD8947711 ; libaacs -0x7EB737E67E0F8EE320A0CBF8CA7EF192AAA2D2C9 = _NONAME_ | V | 0x0BD0C413C81C0F9930DCF2ED7971FE25 ; libaacs -0x83858383F1BE439F7903DB29568AE05C86B68BA8 = _NONAME_ | V | 0x8D524A5D3786F0601B00ED92CB8AC04B ; libaacs -0x838CA7B6C511061D8B030343885FA93B2E8AC966 = _NONAME_ | V | 0xAD13AB66D958D0A64793BA876169EDD0 ; libaacs -0x845502724029F115F1A769B000E895D3FDE48776 = _NONAME_ | V | 0x91717B5FE9470EFC7992FD92AB55F3CE ; libaacs -0x84D76D7ED3EBB91A04EBE557484954D58D6F38F5 = _NONAME_ | V | 0xC48FBECB2375C73C1C3234FBE7D60EF6 ; libaacs -0x84DEC3C7523F65D59C7C3558B930619DDAB0345F = _NONAME_ | V | 0xEA9367D098492C4B5B3D138DA3574C14 ; libaacs -0x99CFEAB244F8F64FB2579E2FC16FB758E210410A = _NONAME_ | V | 0xDA2B3A14280A1A97DD2E6D4A07479791 ; libaacs -0x9B3471AEFD1CC88453F3DB31094BC5CFF1DF5708 = _NONAME_ | V | 0x756732C38EE919421CCB37BACD757B9E ; libaacs -0xBC8741BD0347F226CBD6CBFBF50BC91E405FD6D1 = _NONAME_ | V | 0x928396E1DB30F4C31B56EC5CA3778D93 ; libaacs -0xBD6DBEE65EB97F078EE3D800661CB5D6F2576A3A = _NONAME_ | V | 0x232AA7629920422B085894CE7F358372 ; libaacs -0xC05BEBF8469A2FCE0BD7B4E4F0E75C1D8E452E30 = _NONAME_ | V | 0xB44E237EDE960106C0193F4A9B298A57 ; libaacs -0xC071B7FF33324BE6FA8CE6DE7BC8A3309E23B9E9 = _NONAME_ | V | 0x7D665473CAA2D9CE6042C26334D3D42C ; libaacs -0xC16F5C72F69F5E6CEF0C7310F74863E3308861F5 = _NONAME_ | V | 0x9E06BFF4A7776EDBCF70E7B86604F0E4 ; libaacs -0xC22A55CC5AFBCC314B50118C17B16E7835F8AC4C = _NONAME_ | V | 0x93632E5CFFB0C77DEFA0863012AB408F ; libaacs -0xC2B104D6C2769118CB5092C42E661393A904F246 = _NONAME_ | V | 0x8E1AF85BFF51ED60446D06EAE4408B2A ; libaacs -0xC2F9CFCCFDF428F7E75212510C2BE73A84C92181 = _NONAME_ | V | 0xF44375CCBEBA6CAA7BFC69C6AFCE77A4 ; libaacs -0xC6383E879A26FE027F575E40465DBDCB455575A9 = _NONAME_ | V | 0x84A36C37CB54E69A4D8FD6D4D1CACDF4 ; libaacs -0xBA7819C86527116C53BA4E81BFDD5A176E3DF684 = _NONAME_ | V | 0x51435A3C38440DA521436E1806FAFD1C ; libaacs -0xBA67F59F40B8327A207401545C21D3526099ED23 = _NONAME_ | V | 0x7448CA3046293551A33F2849B777E594 ; libaacs -0xBA2AA19035D1F59FDBB3C321F4543C1994F04DC3 = _NONAME_ | V | 0x731C7362ABDD249F58993884F1B199DC ; libaacs -0xA304AD84FBDDC5222FA90CB9E54E1239C3BCC337 = _NONAME_ | V | 0x07BE98500E5C19E5DE9048F17D502F99 ; libaacs -0xA8ECFB0AD2CF0B55C6B3F1D67DB6560243254876 = _NONAME_ | V | 0xC491105149CF65FAE0756617A33A4862 ; libaacs -0xA956FFEB0281B431FD922FA912029E696A0B22D5 = _NONAME_ | V | 0x2D43B73741C10D51B72D140DDCD110C0 ; libaacs -0xA9B903F7B7E7191D5ADC791C70DA21B6FD7D2274 = _NONAME_ | V | 0xB1B380F44CCFC33DD8168F35ACE569C8 ; libaacs -0xAB8BDB030619883AA548A46DA508C218CD85BFA8 = _NONAME_ | V | 0xECADA67EBC5D5DE07984A9707FE60D9D ; libaacs -0xB09D4C4F495B4BE4FD28FCA5E1E0D1D01F0540CE = _NONAME_ | V | 0x09DFA2BDDC0013FDC592861FA035D463 ; libaacs -0xB17F38D0C1A606B8D1C54624E7EA2EE50F8A4266 = _NONAME_ | V | 0xE3A967D51FDC849D25C874C68B9D62B6 ; libaacs -0xB69C43FA527093BEA208907A52721F984D775F4E = _NONAME_ | V | 0xB6FF0B54A22D323D39BC8A15BAA3D854 ; libaacs -0xB71E62DD3D51A27ECD27372AEE6E1CFE0F1B7CA9 = _NONAME_ | V | 0x93758B476D968526F144B42A27C97B78 ; libaacs -0xCBC0CD58F8D0BD4993D532A01E1D280EACC5E63A = _NONAME_ | V | 0x7107700A205952F964326B8709CCBE1C ; libaacs -0x74C01B09D6A94414B314C790D76D6F9F89624C9A = _NONAME_ | V | 0x75EEE57DC85797EE79A2271BEC9032BA ; libaacs -0x1826F8231D7AED04F57E3CE5338066393C8734C9 = _NONAME_ | V | 0x5270CE2FAD2A98E056718E34C52F8608 ; libaacs -0x2A73DE9462372C185E7C1405415021EE32492E05 = _NONAME_ | V | 0xA5B7F26FC050293ADF7CA0A32D842199 ; libaacs -0x2AC15A00C1672AA4A5BCCEB782641AA8D0CCFC0A = _NONAME_ | V | 0x375733EF29A7DB987513F96E4DBCFAAA ; libaacs -0x2C3EA902F2FCE74EC8D3E9A6587C540239688DAE = _NONAME_ | V | 0xB5CB0297BDDBC92DC48E55C22A33A449 ; libaacs -0x2EB5E64CDBF1157C79D962FA8F30E116CD44AABD = _NONAME_ | V | 0x9C62ACFDCE0D8DD29B95F94FDC063D0C ; libaacs -0x408C35B1C039FF8DD94D2ED98EAE9A65543B7D67 = _NONAME_ | V | 0x03C60E20D5411907DAA549D26C06D4CC ; libaacs -0x410B3A5B83E74A69E825C1B99BFB28C590A5B4DA = _NONAME_ | V | 0xADEC121E5554EE038AD9C1AD533A662E ; libaacs -0x42B9C70BA2D71430FDB03A1BE787AC041D88F226 = _NONAME_ | V | 0x34AAC928A11D3CB5D7DA05B843F2F366 ; libaacs -0x443CA3A4143B448B8E29F980554DC7FB20DA2F33 = _NONAME_ | V | 0xF583DF59E885D052F1F34CBB1ABAFB2A ; libaacs -0x493CE161B7723769B178DB715A125C9F7A575226 = _NONAME_ | V | 0xA1247510F841750932C6854C85705CD4 ; libaacs -0x294B0A9104609B4DC473A98024324F31147EBED6 = _NONAME_ | V | 0xC888C2806422EB9EF6311592D1FAB20E ; libaacs -0x27CD0E5B24E237672A966E2AF6E1D4D3596EC21A = _NONAME_ | V | 0xDDE700DEF0D4FC902A80C3B6EBEEE1F2 ; libaacs -0x27BD926EF22028D4E1AE10F5B0DDB30F28169EC1 = _NONAME_ | V | 0xAC20B87C93B655E8BD377E9DC566E502 ; libaacs -0x191BD874627EEB247FA208C892F5F6B974D4C940 = _NONAME_ | V | 0x7A587FDC4F8422191A866A5C257CB315 ; libaacs -0x1A1074CC884F591912F067661E217F7A543D27F9 = _NONAME_ | V | 0xE075EDD84869E5E087CCE4DF79F87C9B ; libaacs -0x1B8DDF0AD9309D35302B6A87E2C6A4CCCA9D54DE = _NONAME_ | V | 0x3144944F2E1496ADDA43CFC1D5523926 ; libaacs -0x1C562EDDDD7669EE50D4C6F8454607401B170DA8 = _NONAME_ | V | 0x4904B0F5F752BD70B6D925FFE57372FF ; libaacs -0x1CCF298711FEEC60FC79E7C3F29F3244EF80BCE6 = _NONAME_ | V | 0x25605D429F028FE8916625BB8A7662C4 ; libaacs -0x1E5FA33B57D7C7E40BE3C2E01BD65BAA7D0AE40E = _NONAME_ | V | 0xD44F3CF3E90762E7FE1D92347754F111 ; libaacs -0x245E4353180B251C6D8574A441E88C2FD47778EB = _NONAME_ | V | 0x0B3180C3262D90AC90D26467CD79CED2 ; libaacs -0x247E3ECC9B639E5B5588BD419FBA09DBEFD735BA = _NONAME_ | V | 0x7B8FFBC73C33CE26708F8EF6FB8C6E0A ; libaacs -0x267444E4C7784F78AA0340CA55303E7FF63E8039 = _NONAME_ | V | 0xCC44FBAEF8AD695C2114CEDE0797CEC8 ; libaacs -0x49A340BD710BB864221C762122A53574896C8012 = _NONAME_ | V | 0x864827BAF13000010B0752A0191F57BC ; libaacs -0x4CC79B31670BDB9B7DD54F3F0A535A2BDD184BAD = _NONAME_ | V | 0xBCC13F07875384CC85B23832D64C1C9B ; libaacs -0x62E631D45D1B20FF8FD93B8173EBB4A722F6C3AD = _NONAME_ | V | 0x33E5DE2C80ABDE1F0AF59A7EC166949A ; libaacs -0x6438A7E86A54003565D80BD51A5052B702D5C24E = _NONAME_ | V | 0x99D2CF3E5E098FC986E2102EFDC98B09 ; libaacs -0x64CBFA89618348DC201F6DE1390EFCBDD610A4A5 = _NONAME_ | V | 0x161A0CEFCD40CDE0599B22AF4B3499CB ; libaacs -0x68B96AE56CDFC8B199414485C7050BBCE3247261 = _NONAME_ | V | 0xAA93B521A468B1E78D25F37E67798C37 ; libaacs -0x6B4223C5AECBFCAB106A3793C6CDBE0BF11F09F0 = _NONAME_ | V | 0xDE752DDF5BDC685EA5CCF981B1E752D1 ; libaacs -0x6CF8B0E6226CF241313DCE2D70E45A70C0984B1E = _NONAME_ | V | 0x6607947E267875DF29B5E569A1D666BD ; libaacs -0x6D12408E387C930F9A0B3CF6F82AFDAFDBD9E0CD = _NONAME_ | V | 0x0EF86F83C170548CFAB30D259394D0E0 ; libaacs -0x6D4FAED28F22B198F0C4ACA65D86F1E885693CA9 = _NONAME_ | V | 0x8F860050B504A0469D64DD81D95C168F ; libaacs -0x6FDC9DC1749D5937F609ECDA9B1D657BDAE18F20 = _NONAME_ | V | 0x19BFAC9B778B406D07A65990756D9BAB ; libaacs -0x5F53EB2701B191C054A6850B00E6F8CA10E2DF35 = _NONAME_ | V | 0x89CBBD709DF40D6834E22129BF91FEB1 ; libaacs -0x5E3A6C5D01FA9340853D008304C4CAFCF2E99A97 = _NONAME_ | V | 0xA1E1E5FE7773BD3A4B8C37FB67A55FBB ; libaacs -0x5E1B657C272C814DD84DBB90BE42F3D4DFD5741A = _NONAME_ | V | 0xE0EAA62960A852A5306252554A940B64 ; libaacs -0x4D1D2B3E7B6F8EC8ED02332EBFFC7BDC3783F0BA = _NONAME_ | V | 0x75A3EDDCC4A40D8F8962DB3E8B60021C ; libaacs -0x4E56D728D62F16F8D89EAAD5F1CCD26DE7761EF9 = _NONAME_ | V | 0xC983221E07436C0E33C077260B75AA87 ; libaacs -0x4F410BD5135EF5FC2084F9A305748BD7CF102A2B = _NONAME_ | V | 0x0ED69142CFBCC4FFD62C33B6C74C1B96 ; libaacs -0x544F7CFE44A9657AF5681136E489A73175339201 = _NONAME_ | V | 0x84E1CA51EC3C8B0CF41A0304D4022C8A ; libaacs -0x5675807C92EF8C63A154FD663BBAD314BF6CDF08 = _NONAME_ | V | 0x639C7A22CD9E786D61D1997C7AB60FBE ; libaacs -0x5959CA5BCFB3A049859650930F844C077FF8D617 = _NONAME_ | V | 0x61C1E81F979653C71ECB4403B41B284F ; libaacs -0x5A3C3040C650C1C1F4F619B82728F79AE26D0C2F = _NONAME_ | V | 0x794901880097048A84876784BB998388 ; libaacs -0x5A91DC8917FA1EDE084ADD682ABE19E74D9301DB = _NONAME_ | V | 0xAFED7742FBF6F2E3E903EE9F4DF7A170 ; libaacs -0x5BB626C0358DF852F74605770E08A15A15C45BBB = _NONAME_ | V | 0x86AEFCC97513730D2454B0CC49885F53 ; libaacs -0x733095133F7EFB0031318F4073123858798C04D5 = _NONAME_ | V | 0x5A5EDFA8478B8EC2DD54687F266595DB ; libaacs -0x81B88DE41BFC32CCC5CD6524537634CA3B9295E1 = _NONAME_ | V | 0x8D794B10DFE0E340199C41F2700BF1DC ; libaacs -0x57F9E08AC1B69CC098616A9A21CFA463E7881D1B = _NONAME_ | V | 0x053C7D891CF1ADF731BE7E6C84D81D5C ; libaacs -0x877C5865A8AC8BF66949A60ECAC3490285972B97 = _NONAME_ | V | 0x000BB9D556A7157B961F73CD29DA6549 ; libaacs -0x9E157F022BD759032F7F8BA962782D315024CF07 = _NONAME_ | V | 0x8DE37C59836865B5F9DEA72D5034DC41 ; libaacs -0xF5E89E28418B2B279A015F9F14CFB97EAED25F92 = _NONAME_ | V | 0xFF81B5D8043E87CED98B7B199DF11D82 ; libaacs -0x14C3C1D562F859FBBFED4C8B81E13C902E532E77 = _NONAME_ | V | 0x1DDF91D16C0C1E822C011A802C12288E ; libaacs -0x35206EA4181936E805B81A8C8004CDB70AC6FC8B = _NONAME_ | V | 0xCAC725EEB8D6D6160E730D377B1AF680 ; libaacs -0x36E64B2C9ACB3E88515614318E680020875F2F6C = _NONAME_ | V | 0xE46C57202F4ED06997B2C812B4F7ED22 ; libaacs -0x49750F6C5022D096F64B4EFDECEF59BE75206FAD = _NONAME_ | V | 0x87D1BD446CFEAABB240DE4C9079AAD31 ; libaacs -0x54C2E12B835C3AA3197671CAFA564FEC88A6BACE = _NONAME_ | V | 0xF56F4E81199DE5ED8669B3BF4BFFC28D ; libaacs -0x4E4276766018E69F5CE24C8643F3A3021CA1718A = _NONAME_ | V | 0x6E8CECC04925C45B3613AE600B703E36 ; libaacs -0xEEF641DC8E713488DF019A27AE65032A067A2370 = _NONAME_ | V | 0x2CE5468DE50246A311DD95592F5E7D80 ; libaacs -0x7611F03EEEE1719F5B90A3E885BE68353D3B0B4D = _NONAME_ | V | 0xBDC60E9084396D869CB2AE36B62F987D ; libaacs -0x24921285EF2334DEB59B47A99F8F53BDFAAD36DB = _NONAME_ | V | 0x25890947E095CBF6F8FCABDBB281DDD4 ; libaacs -0x851EA67A6C76CFAD3923BCFAC28860F40968F78E = _NONAME_ | V | 0xE4EE910BA081908E4D0E694D78F8EFF5 ; libaacs -0x9706ED1C1FF92C68737D78FDA2815EE688AB00F7 = _NONAME_ | V | 0x997B64DAA721D447267C2E180A06D7C0 ; libaacs -0xA5B6DC95CF09FD6F2173DEE0FF64C2AF1E73F7E1 = _NONAME_ | V | 0x267BA32F9D2ECB0C02A38B44AEADE73E ; libaacs -0xD3D1C9842AEF130796D957AE120445D0E3A08F8A = _NONAME_ | V | 0x1B10A74F1F09D06E8D51E7D03ABD6ADC ; libaacs -0xEFD53DAB00AE63A9D7D6FA6B432273D603261FFB = _NONAME_ | V | 0x7BCA34A2F5CAFBE6B338EBC18D18AEB4 ; libaacs -0x78541F7F093F6AA6C9C0DBEDF1B4FE95AB9207D4 = _NONAME_ | V | 0x72CD8A21C2452D8D642BFCCC95D38FB5 ; libaacs -0xCD18F09115A9D36856CB9B4FBEC30E911651C1D2 = _NONAME_ | V | 0x0F89533D19E731DF453B428311A61F67 ; libaacs -0xCDDC86CE39EEDC8390656CB2BFB7F91A92F7ABE2 = _NONAME_ | V | 0x71E78FBAAADD6FFAD151550CE71C67C9 ; libaacs -0x614D61DBE1B183F0DB296BB0C5527B19CE84A21B = _NONAME_ | V | 0x20DE0B423F9013D3A786A015845D5FA7 ; libaacs -0x6D71614E0F40F366B6BD393D991568F633266047 = _NONAME_ | V | 0x8EEEEF799C9D4EDED6BD90DCC67180B4 ; libaacs -0x7CA6F0461BB5365B426BAA53BD9306E863DA1AC3 = _NONAME_ | V | 0xF6D5B149B65E59513BAA39E512212FB6 ; libaacs -0xE993C4EB16DE36A592D6B6A87DE9F277E0703DED = _NONAME_ | V | 0x1178D0B241C4149A3ADB892E54EA58D2 ; libaacs -0x125D84B32DF699577DED2D92C5F878112B41F77C = _NONAME_ | V | 0x3A8DF2FE96EC7F98FDAAC067B6585A07 ; libaacs -0x544F8B52FB2E83DF29B430F1A2FB9363C401E46D = _NONAME_ | V | 0x2159AFF286087E7A52D984A14172EA8D ; libaacs -0xA7D86D97B05A2C771BE044846B25BF43C0E21DBB = _NONAME_ | V | 0x65BE43CDFFDB6E062A8C6778C5236FFA ; libaacs -0xB690570D05AE64C3FB6D8B082782C9486E6E935E = _NONAME_ | V | 0x49A25541C195D9E43B9BBC4ED91046CB ; libaacs -0x88D00F3AD3497AB23D2611F514CB9FE3F255F930 = _NONAME_ | V | 0xC73CB4F02FE31AE2F45410EE6D0707F4 ; libaacs -0xD3EBF8A4911C51379CAC0F5C7935A4FA55ECC1BF = _NONAME_ | V | 0x18D6C9FDDC9C0E5AF7E0E7285C1A0CDB ; libaacs -0x8560AB2CDECEF78834D1711FD51A8ACE31BA43E0 = _NONAME_ | V | 0xA3D8E9BC12B0BC191EBE609E077062CF ; libaacs -0xF99D5BB13A1D7DA1EE2649960EF70169385E3211 = _NONAME_ | V | 0xC0113AFBFA220D7562A72C02B07EF647 ; libaacs -0x754B3D4A3A46561087025DBA7B468FEFA92866EB = _NONAME_ | V | 0x2494AB60C8AD1863FB04288492236C62 ; libaacs -0xABE18378C94A4951B5A552DDDD3DDA820E2E3980 = _NONAME_ | V | 0x3A018BB558267AD66404A7EA1131C36A ; libaacs -0x88FB112D6E03EB9F9577AADB59D1912B0F8DF061 = _NONAME_ | V | 0x8048F838BF06FAB0BBA90DD6670A9D20 ; libaacs -0xA534E25D4C91C8C18DCD712BE87E68289E7963D4 = _NONAME_ | V | 0x905B791A401375C72715FE4333FFA5E3 ; libaacs -0xBB359EE55615A39D0FC9293FF5658D5AA9C44100 = _NONAME_ | V | 0x089E12E527633B2E04FFAB0B1490E413 ; libaacs -0xC6B66488E8F729E09B8D27267F28ACB219D40854 = _NONAME_ | V | 0x613D3D6C750D4FD72CC0C9568BDFD722 ; libaacs -0xD80639E3288F8D0275200E96E5ABAFDA5730E7DF = _NONAME_ | V | 0x6A328028DEEBC928EBC9E7428C124960 ; libaacs -0xE1AC03B3DFC701482FA58AA81D53D0315808AE8C = _NONAME_ | V | 0x7DA54955E91F5996729A94E03F3B5694 ; libaacs -0x0AE45C4F550C763ADE491DA8DC239CC1C4C36BE1 = _NONAME_ | V | 0x4C1EB91607BF459BCB2CB136A3E6BAC8 ; libaacs -0x28649BC63FD591E92213BA2056F60846D9508D0D = _NONAME_ | V | 0x13139E883BD6012F9CFD7F6BA71C0D6F ; libaacs -0x7E55D96BDE7F6F95650C399B86972D1149C4CB73 = _NONAME_ | V | 0x39BBB31D0532A166ADAD455176A8A430 ; libaacs -0xD4912E7D0E11096FDB5A44D72E97EF1E8C6A5B33 = _NONAME_ | V | 0x840494CF6E640394CBD31B1FAAF731E4 ; libaacs -0xA9BCFBA1BB0F6DBD6A7B133D33F2A32F9C502F2C = _NONAME_ | V | 0x4A684BC6124D4553BB7069FF4DFD3C69 ; libaacs -0x8034AD156130818BA5DAE68FC510FB3329CD0751 = _NONAME_ | V | 0x452F8C12DA11667413CFBED593B9A496 ; libaacs -0x0567950DA1CE722B5FA8E3A5003A307C3917B923 = _NONAME_ | V | 0x481E9AAA9B4AF65B6F567314F6B76C6C ; libaacs -0x7C24BCACE3A871B9D3D34726457A13D4E61DD0A8 = _NONAME_ | V | 0x3B2347A58F3D3DD4E5128C5A02D0A0D0 ; libaacs -0xF6CC3869F1F633EFCCCF2B51BB6BB23E79F747F8 = _NONAME_ | V | 0x8FD9F805529EE7D9442848208D3BF96D ; libaacs -0x13DB8A7792F3399C428852CC61F5A8DED16E0495 = _NONAME_ | V | 0x1C99D3AA35D8619D36D6AADD761D802A ; libaacs -0x394110192DB1331B5E14D62772F8576814DEE7B3 = _NONAME_ | V | 0xC8F29D6228198354439F54C9CD1FF342 ; libaacs -0xE70DB1E09143A21667E7917EF9A4A7FA9462B1AF = _NONAME_ | V | 0xE55F895EF105D0697139C4F8E0A0797E ; libaacs -0xE199275435D8707391A0AC8D0886BD9D7B16537E = _NONAME_ | V | 0x73614F43D67DBB71B1F41BD3CE7F3341 ; libaacs -0x810650F7666C5F2F82137C926FE9908D86B1D522 = _NONAME_ | V | 0xA5E779A842C63F50A6F7C6A2B1D23373 ; libaacs -0xF2053955769E87C9BD60EE51073205924CC399FF = _NONAME_ | V | 0x939FE2F3EE9CA1E928181741AD9F688E ; libaacs -0x105558FE0D9E7C954F5D307EBDDCD0EF321B5694 = _NONAME_ | V | 0xA8A788EAD607C7C20A261145E220CFD8 ; libaacs -0x0009F0D6E219C5224D2206D3E07F5F1DB96BC0DA = _NONAME_ | V | 0xA07CF3FE7364E27FECE9A805577B408F ; libaacs -0x50D0E3B3E21A8199C8A7FA04B110C3BF46CEDBB9 = _NONAME_ | V | 0xB2EFF9107B3E8EFC7F11D09660966048 ; libaacs -0x358BC2BECDE4C5711DDC8F2A503D91246706F977 = _NONAME_ | V | 0x05984B0F340619F2C009E69643B192EC ; libaacs -0x509DEF561322BB873AF34657E987FAC0D2C5105A = _NONAME_ | V | 0x9F769F314F6B10D10C9CD3A624926786 ; libaacs -0x34D60148962B584B81AAAEBB80850CB90F4CF1BE = _NONAME_ | V | 0x528C6CD99ABA4C139CAAD8CFECC600A5 ; libaacs -0xCDD8C91644398987D4EF2C87FB7CC79D1A40BF31 = _NONAME_ | V | 0x697AE0F1F7A88DBDDB6F3BBCF842995D ; libaacs -0x0739D3FA547B7FE278A5EF76D2A9A511798E1A7E = _NONAME_ | V | 0x6B95192D4A5F4F9D9290D70D1C68A8FF ; libaacs -0x99E134C62C639632BC9AFC0D24A6D903C4C63109 = _NONAME_ | V | 0x8EF66814A604427EFA53DC3FC2F64B05 ; libaacs -0x969DEE0A53FA6AB3AD9615B115440C93BC885AD5 = _NONAME_ | V | 0x39B1571ACC647A5C47E61A31C246AF01 ; libaacs -0xC64FC6FEE9A46E2051A435532D0E9D54995981A1 = _NONAME_ | V | 0x3B7B526C5FD519077361798D9FBE6FF8 ; libaacs -0x9C318F27B53975189137EA695C54707E9C3188D2 = _NONAME_ | V | 0xF3772E501A7DCE1A836FF172E55A2768 ; libaacs -0xA4E83D03DF6FF73F5C04195FBC7EC9993B7039DB = _NONAME_ | V | 0x021F07C77C4CF2B890898E96EC3DD884 ; libaacs -0xE897CA116CD39AA98F85FDC2E922FF48C56ABB95 = _NONAME_ | V | 0xAD3023066A97141118B064F2110ACB1E ; libaacs -0xD5E3D78AE7321D7B458853AFC067B7D11789B406 = _NONAME_ | V | 0x96508F81081C335038EF5CE4DE9AF112 ; libaacs -0xF567F2108BC05979830B12C90F6D388855CDE099 = _NONAME_ | V | 0x3A71FD58EE9360CC82F76C8078BADBF2 ; libaacs -0x260564F73E4EB6F9E76CC2C73D75F7290F97FF9B = _NONAME_ | V | 0x75751B25EACD63666219E3C5DD7CF19E ; libaacs -0xE287A80E7648F68C3C8CC16BA032FCE5F2685386 = _NONAME_ | V | 0xD9AF9A25A89B45E866875612A858E4D3 ; libaacs -0xE7E44B57498A9672E0ABF2CE7D9E4C8BBA7EB1CF = _NONAME_ | V | 0x90762E1ED8D27DB56D66E2C42355FA28 ; libaacs -0xF565F670FCFE25EFE62945CA2561EA76E0E9EB7B = _NONAME_ | V | 0x3393A05A50FAD5A600296F942583CB16 ; libaacs -0x4E04DB8F059FA1C056E1CD1E3BF3EFF70CE1F944 = _NONAME_ | V | 0x98C7C200149E378117474FA647B14B8B ; libaacs -0xA3DD656612F8C657306B147215FA557182BA9CD4 = _NONAME_ | V | 0x167D2BE95DF6222313ACFA29FF61EAB2 ; libaacs -0x0F4A25BC799B6BBF3EEBEE22C18CC9BC0E931ABF = _NONAME_ | V | 0x377AF254A0B8E02375728ED22FD45E84 ; libaacs -0xA4EDAFB991D54B6EADD95EAAFB3413FCAF88C131 = _NONAME_ | V | 0xF4484D96428D21D55C48CDD0F5811EDA ; libaacs -0x6846CBF48B071B90259F2DAA87615CD0AF171ED4 = _NONAME_ | V | 0x2D193C270666981703A05A151D779EDE ; libaacs -0x5B1BBB7A8F3AA7CABDB9D311201BFB5BC04108D4 = _NONAME_ | V | 0xDF1434BFB2BB5FDFA2BD4C8A341939F7 ; libaacs -0x331FD6E9EDA9FBCF4E23AB19FF1FBE86AAEC8F32 = _NONAME_ | V | 0xB99CB22AC22D2D038884A853893B9AE1 ; libaacs -0x690C61F8B5B2398F48CE47E620D8F9E30F05B0D7 = _NONAME_ | V | 0x0BAC79942C464B02950616DB3BDEFCC4 ; libaacs -0x8C644A935D4C246F45B78CE07E1CEBBD4B4B1013 = _NONAME_ | V | 0x653A91BB9914B99E530C8CE4BF181205 ; libaacs -0xB10FEBC5B5A7846DDC4DE2E4BA90A5A7DA562B4C = _NONAME_ | V | 0xFBBAAE4029E4BF1CF01848AAEA9A92FD ; libaacs -0x9D5F6DC56C7892582BB9967B8E2BCD01FF04E07D = _NONAME_ | V | 0x580064A9F6C7B885A72BE2720CDBFB6F ; libaacs -0xCFE578D6BBA21D4A53A5FF6920C52FABC3C932BC = _NONAME_ | V | 0x810562E69B417609A078C925E7FC24B2 ; libaacs -0x76493139E7B2DE3F96A9EA32A0DD573C9A163B9C = _NONAME_ | V | 0xDD4FC4874276A82A51B81822A5B48EE9 ; libaacs -0x07294FB86907B59E69138D16E2FEA4A3369E0341 = _NONAME_ | V | 0x97C4DEF3060BB7738FD5F11554DCEA81 ; libaacs -0x3439AB18070381CA0E0122DEDFE02BE2111B7BC6 = _NONAME_ | V | 0x394B7EDE54641524DE89EA3EBFA71D7B ; libaacs -0x531271646C010132AD11475014729019F8694B20 = _NONAME_ | V | 0x3A4E08D1EE15F60D1440115FC71D5898 ; libaacs -0x21A9E7A66311108362AA8E2B1F3EF5402DA0814A = _NONAME_ | V | 0xBC391898E20C023E7D43A8C16B3FB2F5 ; libaacs -0x966D942B21FD0C37E53EB4BDE335F86C864CBAC1 = _NONAME_ | V | 0xE175102B532857A520BF2920ED990D44 ; libaacs -0x6F8C39FFD4AFDC79BB51E4EEF124A4F3645A9FFC = _NONAME_ | V | 0xD6D6ADB7849BABFA8B0A9DD0601D7BB4 ; libaacs -0x50E2DB17BC50E5368E4BBD9648FD21A0EE269083 = _NONAME_ | V | 0x58503B2E971D68A05F64503BE0EFEAB8 ; libaacs -0x1D04F5146BA097A5B5447503D2ED85E59874ABAC = _NONAME_ | V | 0x1B310B95E74242389DDF82EB5B91B7B0 ; libaacs -0x6E9EA4549406108FFEC78195BED66ADD644DBFE3 = _NONAME_ | V | 0x203184A902B37DF9F0A5209A8AB2124D ; libaacs -0xF6654B068D471EA9774AE1C030E7823CB710D830 = _NONAME_ | V | 0x7E34D33A49D847E8D2A846F276D188AD -0xDC6292EDF1C8BE813743800BFF0390ADC27BDE5D = _NONAME_ | V | 0x450A5233409EA180707601554E865318 ; libaacs -0xD5C5B5BC7315B99322F2A4F375DE5E1596C8852A = _NONAME_ | V | 0x5F00155C2501DE65A374CCC80A4A32AD ; libaacs -0xF84D9ED8B39D0AFC2248A3A4FADC90695D4723B2 = _NONAME_ | V | 0xF68F7480EBDFA7EE07E3D39E5EC26A58 ; libaacs -0x09E4B16DBEAC01025DB92037CBDB4155F776FC70 = _NONAME_ | V | 0x3EFD4E99841482EDAC7D66ECFD233786 ; libaacs -0x55B485547A2A59E94277EF2208338337519CD691 = _NONAME_ | V | 0xEB6BED045B1483391B9D685C348222EE ; libaacs -0x3D58F46CEAE02EE24739AA930A4F8926FFD9D8E8 = _NONAME_ | V | 0x76E4C5A2EF1B74E34AC1A5011CE67AB1 ; libaacs -0x7C6A8E9CB9CA6CA86019F87CFF5B6B993AB30410 = _NONAME_ | V | 0x91B0FC525F7DC443D993981A921BF9AF ; libaacs -0xACFF1648A4E5AE5301614F1565585BE62B83500F = _NONAME_ | V | 0x8BF854FDCFA57C09F416F40B0FBFF157 ; libaacs -0xAD15133CDC6B1A26C7E8A84791FB1B2F268809EA = _NONAME_ | V | 0x330A98C99A0CE9A3F3860FF31A5DE353 ; libaacs -0xAEB2819400F9961846C7A7D202D8232616D1233D = _NONAME_ | V | 0xCBB25DB2F3167BC2AEFBBD997FAC74C6 ; libaacs -0xB0BA5FDB7C34973088F48EB58E5D36B3E27D84D4 = _NONAME_ | V | 0xFB4CA56656D327739271032764E70AE8 ; libaacs -0xBDB589C33C476469812AF1430FAE2ED9A3A9AFE4 = _NONAME_ | V | 0xF4ECEDE27CCA653B84C734DDFF494B83 ; libaacs -0xBFF312770B15C449D34E6B6F17F6E77C3BF20786 = _NONAME_ | V | 0x8A194311B2FB2E5055B1482ED038DBAB ; libaacs -0xD320FDAF3B5229708A3A432337AF965B571597BD = _NONAME_ | V | 0x72CFE6A444959445EFD0285B08E6CD7C ; libaacs -0xA92F9D3B9F3556927F0C69D277AE71E9C924034D = _NONAME_ | V | 0x9014841284FDB8B3E3A6D060EB075E14 ; libaacs -0x51126A1DF7D68DCC873F62B70D7744C413FCB598 = _NONAME_ | V | 0x7D5C6E8543842EB6EAB6AC2A8E9EE456 ; libaacs -0x1C78359A45F0AD4E6327A3F887A19870FBE676DF = _NONAME_ | V | 0x74FE36B8AD90873BFA0D00CB798AFEC5 ; libaacs -0x5FE19E554C97F125042706FD396BA8C61FF9ADB1 = _NONAME_ | V | 0x525AAE44178FB64807688BF41466BBE7 ; libaacs -0xC0998D25AE37E951B246AABEA4F1E2EDE25B6EEB = _NONAME_ | V | 0xA0A822AB6C7E442DCF63DA7034225E51 ; libaacs -0x8677BCC6D470BE62404DDE6621EAFF67E1A22545 = _NONAME_ | V | 0x930F0B2A758CE3C0881EA5CE35F5C535 ; libaacs -0xF84C1829AA86EA2E65D583B1C472B6F12280DE57 = _NONAME_ | V | 0x38ECD7C0B387CE2F2EFDC5C3E6973535 ; libaacs -0x0FCCA994490ED729BCD2FED839E69AB0DEE81A6E = _NONAME_ | V | 0x58E738CCBEA600A147896C5471C8EAA6 ; libaacs -0xD935F9A50ED9E7FF8AF2F134EA92350B792EFD56 = _NONAME_ | V | 0xF6D1E18AFBCE64BB57CA470F13ABDFDE ; libaacs -0x05F5385399088DA4A3CB3E8DFC1A1F2E8EA1D81D = _NONAME_ | V | 0x06DEFA9C64C7D46146C682B394D67F1C ; libaacs -0x81D5950AB8AED86A189621B6B8409CF42192D4F4 = _NONAME_ | V | 0x825433DAEDADA5A26286B8C2AD1E1236 ; libaacs -0x8F1234CD11B9C26A35AA11E5A19796DBDC0B1D88 = _NONAME_ | V | 0x9FA93DEED95BE077A7B39F0EDD4F7EB2 ; libaacs -0x13957F2E55CFB9E17A8208CA4182035122FC3751 = _NONAME_ | V | 0x01D786B2D4BBC0649408ECB3E470AE2C ; libaacs -0xBF67DD521210A1C38AF389EF5CCBCA2596B4541E = _NONAME_ | V | 0xC4635492673BD2C46FB644815A2128B3 ; libaacs -0xBEFF1B72863EFFDF06E7D647B659B734C7B2148B = _NONAME_ | V | 0xAED669D66F15A3CA5AF6577B7E0A43FC ; libaacs -0x9E336D7CF75102058F83A08EC674440CD25C6386 = _NONAME_ | V | 0x45571EDACEDCD5E60FBEAC4B51EDBB7E ; libaacs -0x2156290FD30DD2CA3D270E8EC738CC54E05C0487 = _NONAME_ | V | 0x5BE8B81CFBAD699F48A61AFBF67C335B ; libaacs -0x2EAB896A14AB5DDC1F913D64906CC53275E0C232 = _NONAME_ | V | 0x6F8D15673401DB82557133E007D3E078 ; libaacs -0xCE47775B1B5B450B25695D6E76E75C4B4BD2371A = _NONAME_ | V | 0x07886A5D207A7CA0404A00ED3F7E4621 ; libaacs -0xF463755EA81866848E3CEF27061BE71465DA968A = _NONAME_ | V | 0xA040A013DC2293E0DC8BCB522130A9F9 ; libaacs -0x19EDB00F0E52F56128B592A261F738A852F4B75D = _NONAME_ | V | 0x88F77077DEFEB0B6E2160D7F9C8B7412 ; libaacs -0x2A1EBBA892CB26EE289329A5575AD8EA67D7DF4F = _NONAME_ | V | 0xCD40C3AFCECD306539E1CBECF1EBE955 ; libaacs -0x416B4DAF8D7624CCEFEF432A490B5B03BC9804E9 = _NONAME_ | V | 0xC3DD856DCE6C3C6276F2270207F4FE52 ; libaacs -0x696E40057A53F279BDE1E6AA149D9ADE2C5E9F91 = _NONAME_ | V | 0x224A09DCE88F93FAD759BBFBBF331C71 ; libaacs -0x7F43ED8D68F575A6896B6193EEBE41E8B1B11C50 = _NONAME_ | V | 0xB0D0FBD7F48CBE4379E80E43BFBAC226 ; libaacs -0x68EC6565FBFE4E9ECD7D22CF93730E2AF0761DF7 = _NONAME_ | V | 0xE44217A6A330B45002869C3214F25396 ; libaacs -0x8BDE06BC7E7AE1BF430727DEF8203DB0742298C7 = _NONAME_ | V | 0xF2D4BC08E199AF21DA6A19E3E93D18B1 ; libaacs -0x8149858EADA6D43D5BAFFAF5A84476BEB7677271 = _NONAME_ | V | 0xD3F4391CE7A67A6D5BE2D3878A17476C ; libaacs -0x4F83E7E441F61B8154E5697694E3330FA9E872A3 = _NONAME_ | V | 0xCE4B68D0DD3FC65137EBA87770F1C41E ; libaacs -0x5F9FD0FE0E33AF7D1B1C7CE49155864CD110144B = _NONAME_ | V | 0x242D4A3681CCDF0A94B3885A6A7E3860 ; libaacs -0x6EC02D83AD374080C0A473A744C45FDE8A2E37A2 = _NONAME_ | V | 0x8013F9405347197B998F83775BC364D1 ; libaacs -0x1574967A4789C2207674412277CA99CC1EA18B34 = _NONAME_ | V | 0x44666735ED53594A575AC702FE0FCE53 ; libaacs -0x16C1EFFFE9275D9D383E4ED16207A060F8D6B3C6 = _NONAME_ | V | 0xCCDE52EA8B1A5EBE3EB8F38D4D2214DD ; libaacs -0x3E33918B70F4ABA88F9F5ABAD03FEB3B3EB5A126 = _NONAME_ | V | 0xE89295BB738A9F7DDD140FBDC6737A29 ; libaacs -0x96E24228B3AEBD3AD0D28CAE27F8B26A06E79368 = _NONAME_ | V | 0x0556283E64CF88A37874E1E7320C8AC9 ; libaacs -0x0BC09CC9E28B001D5D2A4A8EE661DD094C269113 = _NONAME_ | V | 0x0298463C09F179A81DCB95FD8C8EF3A4 ; libaacs -0x81E8A0A002D59418345124CD111A61BB9ED74243 = _NONAME_ | V | 0x5D0AA221D6CE9EF10F8F3A8AB895C9E3 ; libaacs -0x3D282E35CA75C94664A3E5E07FDC7EC4E29DA1DA = _NONAME_ | V | 0x2CEDE2D5A47E75F53FA43C11647C208C ; libaacs -0x81F154B91F318F8F9164027DAFC18ABFCD8D432E = _NONAME_ | V | 0xDDA1C0D2669346ADFEB2786E6E182549 ; libaacs -0xDDD8EFB82E55061CFC1D25913D9B176A6C41E094 = _NONAME_ | V | 0x0EAF537DADBAED8D790FABAB0C1E61A1 ; libaacs -0xDE28F313F24DFA895C4E01FE8D670C439929EB44 = _NONAME_ | V | 0xB840B2E07B20A2FD3814991D1D212F35 ; libaacs -0xBFBFC3D21DA536812E4FA707FEB5AA926F6F6D12 = _NONAME_ | V | 0x513B5818A5A3FAD63326FBA02EC409FB ; libaacs -0x91590282A58CB49CCDF821011F5F307E9FB96672 = _NONAME_ | V | 0x25B8338A1ED8BCA7E2ED24D66FACDB3A ; libaacs -0x9AD7C2501B251077F91E3844CCE3AA762CBD88DD = _NONAME_ | V | 0x442FE828ADB3D04C826AF52139E2950D ; libaacs -0xADE53FECDE4627BB1E70408A57491019F8607681 = _NONAME_ | V | 0xECAF8CF172AD0969A5A5FEAF15E560D9 ; libaacs -0xC335D52F366A7961728114E260DA5964546F2E99 = _NONAME_ | V | 0x7155264E4F415622808C311DE05B7014 ; libaacs -0xD8F77501FE96D557F1E5858BB66D4A5CCCF6D026 = _NONAME_ | V | 0x91D82AFA494DBA8FF32723BB8771E3EB ; libaacs -0x686B8CDBDA42CAC362A553F9532D810D1116722A = _NONAME_ | V | 0x9F4A76FF155AB54F51F2B5627B37E633 ; libaacs -0x721B3F7C3576E92DA7F4F9893A928BF52B582B85 = _NONAME_ | V | 0x994D8E696C167FB53F1E4A7C49CC257C ; libaacs -0x775080F82CB69CAA90E536595746BAD97758CBD6 = _NONAME_ | V | 0x57D96A444D250579166F14375B92B6BC ; libaacs -0x98B8C687F957E691C8830BE31B168DAD4561F1B5 = _NONAME_ | V | 0x0B5165A9499B0E518B978A0A31A41CEA ; libaacs -0x112634E4689B3FB5C1AB5C82DA13AA1B12F7E588 = _NONAME_ | V | 0xC202E16B4CBB7E547322980B22565BD2 ; libaacs -0x23DE5398E9BF727BF7CFA99CCE6D1A55D85BBD5C = _NONAME_ | V | 0x88154A6F0990C38FBB41C206D8DB5C9F ; libaacs -0x3378CAAC571C3D4460A27717745EE81A1DCCEF7F = _NONAME_ | V | 0x4EC64904EF0AABE5683DDA504BFEC0B2 ; libaacs -0x43EF62C5A393E43C57B7C98AC214277C33E99065 = _NONAME_ | V | 0xCF3918F508178FC69395990C9D3DBC09 ; libaacs -0x4A7AC5BBA14ABBCC592018E34545425E72ECF129 = _NONAME_ | V | 0xE72B421215CBDCDC28415F393FDD9BC6 ; libaacs -0x53417B3F2FD45BBFE2597019BE298A249EF84A76 = _NONAME_ | V | 0x40466A9DD203C43F45CC105CB828DFC3 ; libaacs -0x63D69FBF182A3FCB32E2DE1ACBCCBCD124623ECE = _NONAME_ | V | 0x0D4A8A9A1B31780A4F340415D89B0BEC ; libaacs -0x6D09652A45D88E81AAF027DDEE5A008647E91F51 = _NONAME_ | V | 0x3C07752941C51DEBBBA10A318E6ED963 ; libaacs -0x7ABF5E47C1474CC532B98DE2F332AE5AF1EBBCB8 = _NONAME_ | V | 0xF25A828D87E612C7961F2FD1C4677D48 ; libaacs -0x4E2B77F09B89878EB7A63A50444B772B9DDCB186 = _NONAME_ | V | 0xD782908DFE3D849E2834CD807154849E ; libaacs -0x6D7780AB84EA5CF956D158CDF15E11316977EEEC = _NONAME_ | V | 0x5476EEE6252089823989F65758108A2D ; libaacs -0x36CC6A41737541A16D94AEC3779B2E1176C15E08 = _NONAME_ | V | 0xDE4791DA03315EACF0B5474E9EA5FA3D ; libaacs -0xAFE14CF739867E416AE1235927C07E7BEA037AF3 = _NONAME_ | V | 0x912C6632FFBC89CD458C6704C763E075 ; libaacs -0x491AB428EF3BC24EDE8AE9E036BB35BAC1B3F7A2 = _NONAME_ | V | 0xD4FC6A0B955FAB60AA812E8856AB8DF5 ; libaacs -0x9C1CACD1867F906643ED53682BF0477566F9AECF = _NONAME_ | V | 0x3A6167425F38C3FCD7AE975728151ABD ; libaacs -0xE67749D2C52E5604A7AD31CF72EA92FCE26B09F0 = _NONAME_ | V | 0x1EE09C54113E646C23C7027033F3C549 ; libaacs -0xE73562747E029A6B9EA3E08753344C79F9B7A2A6 = _NONAME_ | V | 0xDC1C97111BCF6F8D48746B981AFC8E41 ; libaacs -0x02E05E1ADFA93457B8CB4D066537DC84091EE32F = _NONAME_ | V | 0x2F03E6743B158E36B912D026DA274FE8 ; libaacs -0xA4EBECC98704E77E612AA4C4321A073F3F8E2894 = _NONAME_ | V | 0xBBFE8F2B7A307BB447F08E4D0109C89E ; libaacs -0xD66E528C1B29497D85FD74BD69B52E6EC9A32DCA = _NONAME_ | V | 0x2C8A34B13BE0D37C0BD917D44AE186B3 ; libaacs -0x376514ADD7D92919D93389E6303EDDC70167119D = _NONAME_ | V | 0x1651E9A88EBEBCF13DCB8A2C2E02BCCC ; libaacs -0x8400697700CF2949026AFB5E9AF7FC0BAA09272E = _NONAME_ | V | 0x36E0DDA531DFCFBE8C42856427B5173F ; libaacs -0x86D4CA7A15369D2A09957A0A498AB0ACA965E4C2 = _NONAME_ | V | 0x3CC6574A3DCE8BEA92248CA4945B1F24 ; libaacs -0x67F90DA981DD7267A460CA74755ABFCED5B96F49 = _NONAME_ | V | 0xAB0E9C56634C5D376379AF8123B6673F ; libaacs -0x70D9B9D1469AE9BA12F55F7F835862B0BB19080B = _NONAME_ | V | 0x1F56BA6312B037E2580B84E0B0D438D5 ; libaacs -0x2424F875A240CD1270535EE568700942FD5795BB = _NONAME_ | V | 0xCDA08F44D6ECAB08C00A62F74C0FA002 ; libaacs -0x3A421B7FE98B57C5CFA615F9673B734616EE89E1 = _NONAME_ | V | 0xD96A3A8595CCE1C248BA5A280A722396 ; libaacs -0xC3C14F2D0B548DA8D642025F3DF2CFF5A883BC1F = _NONAME_ | V | 0x0E8B83FD267C78DC228DD6696F6475C5 ; libaacs -0xFB053C7DCDD1D5AE244DD6739FC0AF59FEDEF1B5 = _NONAME_ | V | 0xEC12F1AD38AF5DDF02DD6398FD0EDC6D ; libaacs -0xA736A1492519AF6907EF00AA6E82FDB3771E762A = _NONAME_ | V | 0x4D0928C13E6CD9162D782D436E1D070F ; libaacs -0xCCB2AF56A19793086D64C384744B41A71A3EA745 = _NONAME_ | V | 0x56697D483DF5EB41AA0128DABEB1E414 ; libaacs -0x420B751B331044A1623FBF8FA55898D7E64D2564 = _NONAME_ | V | 0x762723D4002F2B161EEF447C3DED8BD6 ; libaacs -0x3F4ACDD5C2D379227324FF85D871410765F15265 = _NONAME_ | V | 0x6F103A11A3CA584BCB3A3028D7D6DE55 ; libaacs -0x5A534A17A6E64EA13EA3C0EEFC669CE31D11ED06 = _NONAME_ | V | 0xA9BAF03FFA5E79D20CDF3E1AADA56AFD ; libaacs -0x8A3652CCDEBC3DDF3EEC861296E8E7122D9AC65F = _NONAME_ | V | 0x825B566C563ADDF2C670717D7B831865 ; libaacs -0x97992CEB5FECA5F3B194E7B3552ED779738F076B = _NONAME_ | V | 0xD2A10517B6FD74E966B213EB54F53C7C ; libaacs -0x4E033869FAA2214B1DF796D67FA980F2B651A1D0 = _NONAME_ | V | 0xFC21C996090459BFFD0ADD905AA051E8 ; libaacs -0xB0D33B1EA10392DBC77164B99634F75FF0E66F16 = _NONAME_ | V | 0x98013B853C8A0157A0742F15ADF87DA5 ; libaacs -0x2188BF71E8C9A419AD5B69F7B08882C5C5FDF9AF = _NONAME_ | V | 0xAA2FC7BBC6CF6FD60EA9387122FD434E ; libaacs -0xFB09741DA0494F1588E90FD871A2BB43B6B66709 = _NONAME_ | V | 0xE24967B48989B0DC5705338DF2B37659 ; libaacs -0x76AA20100A962D12817C611E9AABCBC90CD9F8D0 = _NONAME_ | V | 0x45E9157A79BB9DAD1247646B181CC54A ; libaacs -0xE8D6358B390641076D02DA278632449BDACA8DBD = _NONAME_ | V | 0x61A396E019A6747E0B6A0A40800BC6B0 ; libaacs -0x3D30171E0CF5EC83BD53F5A63B42BED65613DC0E = _NONAME_ | V | 0x6A17FF04FADA83828F77785078139658 ; libaacs -0x4BA3B29C778707EAAE0D532EE8826A19EDE16C6D = _NONAME_ | V | 0x69718EA1BF6D880D059E1D8791B5334D ; libaacs -0x8CB1FCA30BA6324BBC7404CD08A840972AA6E194 = _NONAME_ | V | 0x8DFB1936D05B641686B0F068F34DF6E3 ; libaacs -0x7B8D6599AE1C045DD2CF0FEFA19B9E3F669AE875 = _NONAME_ | V | 0x290748BE7BBD390A082BBFFC19C9967C ; libaacs -0xE72571561706529677B66057B2830E8F74BBB4DA = _NONAME_ | V | 0xFC47FD20A159A514127C33F7585932BA ; libaacs -0x61DA397F0678E67B76A659EE6F8AEF04D56AE43E = _NONAME_ | V | 0x037042FFC07EB4CF365566E2BACF8BEA ; libaacs -0xDE6D69D3A3483A3D79794808F9B46C1F7407FAB7 = _NONAME_ | V | 0xE3DB883C43BD3B081E3339FF602159CD ; libaacs -0xB0FC523EAD6BF555C234228BC6DB74C80AEAC6E2 = _NONAME_ | V | 0x1DCB2CD587AEB07221C80BE437E2B819 ; libaacs -0x977EC33FE7D0A8C0D24658F751656D407876072B = _NONAME_ | V | 0x5D0DF000FC064DA40C63A29A05CE3442 ; libaacs -0x6ED9759B6D9134BBE994B4A19FE1A0A3E60F1221 = _NONAME_ | V | 0x85CFE4A1D9DCC72FFBAACFDC2A1B4120 ; libaacs -0xE45052497EBA48043C74AEDBCF458C37753D96F4 = _NONAME_ | V | 0x0C764173C3F7E0CC487A1DC9990F0501 ; libaacs -0xC3F022F7CD5E6ACA55BF7EA63552FC4A80400763 = _NONAME_ | V | 0x18BB3AE1BB1A9525C559048A80DD5F09 ; libaacs -0xDB9E3EC5301078F3838AD6B6A1BDE03BF718A2EF = _NONAME_ | V | 0xC549F18D601076AFD197E9942D0B8645 ; libaacs -0xC46800AE9F81CE23DFCB5ED6893609A5630FB5F2 = _NONAME_ | V | 0x7E489744C700EA611475A2A8E89046EA ; libaacs -0xB862CB12719B693F0BEDB368D3B6D0E3FE6F71F4 = _NONAME_ | V | 0x5474ABA631C466C56E1962FF874F0E52 ; libaacs -0x8C24F86C44CC0CD3AEE9F56E05AA9C6CDF712C6E = _NONAME_ | V | 0xD27BAD7E838214E4540801953681DC74 ; libaacs -0x814B1E6B0C9E7BD094A1E7946A2A05D98C83A629 = _NONAME_ | V | 0xCB12CC4EC2352AB6B3EA3C38C04880BA ; libaacs -0xBB2DBB5508D6330D7C8CF5ED7FC69DB3D56E3D93 = _NONAME_ | V | 0x8B6AFF14ABA0664DBF319642B2A130D5 ; libaacs -0xB6FD48ACDA19C491E67E4DBF4E0C8D6044685741 = _NONAME_ | V | 0x119B64FD2AE78CD147DCB5B4CC096C4A ; libaacs -0xEF8EF9DB36F73B365B51EA4351E4B6BF7F434D3F = _NONAME_ | V | 0xD7129734181F668405349A12266B1522 ; libaacs -0x9B8FEFB998D939889B4C647FD348115777652652 = _NONAME_ | V | 0xD003153CB0847A4B24CEEDA9848169BB ; libaacs -0x354A2845D6D751DE2981CB23FD0BA02EDC4CF177 = _NONAME_ | V | 0xADC243313428B554E86CEC0862CA4800 ; libaacs -0xC5170176F4216446B1D6AC82CBD55D37FE98FE91 = _NONAME_ | V | 0xD36A8665F7BC0D425FF5D5399A6D5531 ; libaacs -0xE363AFEC7BC4E28D21169A8B8BA57A0C770E8492 = _NONAME_ | V | 0xF1258607E71F5DB109158A3BA0E0E393 ; libaacs -0x932E1F7B9AD4187719AA7B9A548317A8A7C424F8 = _NONAME_ | V | 0xFCF6C3A94B8975E5E1A5F73EAE85CA7C ; libaacs -0x2ADCCA3EF77EFC1E3DBC32DEFACAFFC8FB970F16 = _NONAME_ | V | 0x767E6FC6474BE99EBF4712AF6B9AB46F ; libaacs -0xED1F89DE83595B2661A9348F0EFCC015841CAC35 = _NONAME_ | V | 0x1D1111CF30F5E02DC6BBDF365FD33C93 ; libaacs -0x163496AD796B148B57DF10FE70E6F0F46DBF826B = _NONAME_ | V | 0x5A486F4AB19C5504BBD856A4C489454E ; libaacs -0xE6BDFF79BC9FA6129C1400556D45A8110398866F = _NONAME_ | V | 0x3ECFBC5C128621503A7E8F7CCEFAC53F ; libaacs -0x5634C6420332BD72D3E0AD51660E83C7EEDFDFC6 = _NONAME_ | V | 0x7B27859CDB34F838CD07CF0560B7E288 ; libaacs -0xA57B50D9AF3E52954C2320E71997BB28B81A0AC4 = _NONAME_ | V | 0x99A956C58C542FCB27264CA5324D0586 ; libaacs -0x3D3506DBEBC86BF4B503F4018E01F0A6F3787098 = _NONAME_ | V | 0xE5AE82E03A299362C9B3F498FF27EC38 ; libaacs -0xDB527EC36D891ADF9AE84E3492E61A79D4339C94 = _NONAME_ | V | 0xD3D7AD9BDC02D0991A13920C94E9B9D2 ; libaacs -0x6B7FE1C6874BC401A54B7B27859F6F6127B9CC30 = _NONAME_ | V | 0x2A0052CB107AC7593D0B88FFDCECE751 ; libaacs -0xC0C589A2E99429E5D672E8FCBFF9F9FA11D730BA = _NONAME_ | V | 0xBFE61A764A096A2F46887DCA0F449544 ; libaacs -0x753B69690A89A581889527F9B261771B327FC6B8 = _NONAME_ | V | 0x2E3C1E3E1CDFCB103C40AE13A8D2A629 ; libaacs -0xEB171996A47C80A20263D3C2FB6B961A3E4DA965 = _NONAME_ | V | 0x4D3EA083E3A755554D0F82F51E35B2E0 ; libaacs -0x4A73BC67CE57810B0B2F346B44B35BC250376366 = _NONAME_ | V | 0x7A603034626C22C56B9F73C2B0F9D725 ; libaacs -0x21A128A0057D79130D3653B025D6D94D9870635E = _NONAME_ | V | 0x54B7D861EBDD8E638DE97B39DD96944E ; libaacs -0xAA99A7E4AAEEB1878F34F35B5127D55A9F313459 = _NONAME_ | V | 0x544E102D43018E5FD819BFA4016338BC ; libaacs -0x206A7A5523EC8D589D5311238E4581DA92D0E021 = _NONAME_ | V | 0xC7F44D858BE6F0259B5B4E8E5083D2EC ; libaacs -0xDF11992AEFE90BB7135936DFC7E2ADB09F0E0D3C = _NONAME_ | V | 0xBC119C084C3B568F5AE84C0FFD917AFF ; libaacs -0x897FF4CAEEDEFB0F7454C718E71725592A90B46D = _NONAME_ | V | 0xE55C6486B730354A411606B4B7AD6112 ; libaacs -0x06B7A2DE6DD59EDE444A7F6BD16E353E2850D736 = _NONAME_ | V | 0xA960BD0C04D8F2A2A174983CD7FD66F2 ; libaacs -0x69F3BDF2156EE7FF17230750B8F32B7F037F29D0 = _NONAME_ | V | 0x9CD250F865B35562C1F9F8C9F88AF723 ; libaacs -0x9E695F5C8F680BC7906DF76DDD8B1344DC9D61A3 = _NONAME_ | V | 0x5B402704FD8B9B84AF680398D28CD47D ; libaacs -0x924DF7796205A11761348CA033A20582E0E0020D = _NONAME_ | V | 0xA73344F894CEBDC86FDD469A6794BAD6 ; libaacs -0x4F21C2E11C0891A405EEEB8D4E517807A2874788 = _NONAME_ | V | 0x06A68BFEAF0ACE2655BDA636D74DBE69 ; libaacs -0x85A4F4297E39B76273EADA8B26A50E01DDD26275 = _NONAME_ | V | 0x1437E8599EF0571841707E427EC4BEF1 ; libaacs -0x7FB6422A5F944F21BBA7FAB29E0C241DAF291703 = _NONAME_ | V | 0xE5EDA6E6D4FC545C8D27410C18F520DF ; libaacs -0xC0D58112D803E3B6162BDFBBEEA0DB22D5A7E7AE = _NONAME_ | V | 0x260DE207F2D8434B86E18394780DE881 ; libaacs -0xBE07424C5607CCD6270D9B88AB4C0CCB78F94BB4 = _NONAME_ | V | 0x1B77C3319C08E62CCCF97F071D8EB331 ; libaacs -0xCF96A65B28483CE654929BC10AAC4BD326591164 = _NONAME_ | V | 0x0CD6A2D50E2B0A9C03D9B309335415B7 ; libaacs -0xD74BE4035CCBEDA07842791A5E21ABB8094E8F59 = _NONAME_ | V | 0x331B31FB550012AEF4E59AEFDA03DCF0 ; libaacs -0x06F817DB94F2C14439D04761447B1E8D2306C07C = _NONAME_ | V | 0xC8DB9C7DE62E84E37AE0AF436F48FFDD ; libaacs -0xE74DDED4F9F3F0941E01B1301FBD76BFCBB78200 = _NONAME_ | V | 0x9DCB563FB3DC3A0F0792EEDFEBD7CCB0 ; libaacs -0xF8E09DF8BDEED36C2A246B3C8DF078C73B84B1E7 = _NONAME_ | V | 0xC2A73D514645337B923C9F1E84D1DC23 ; libaacs -0x7683DA58E37153A2A96C343A45670855D726AF64 = _NONAME_ | V | 0x80CCD71746BA8623DA9B22F55455468A ; libaacs -0xB5E3BBA3F61F02E00C37EBF0C7E888B0A88A0E76 = _NONAME_ | V | 0xE7310D83FEDA4F502C108F0DC1338E01 ; libaacs -0x5025FFC19C08CA3D1895F369C757FF94D1AD2AEE = _NONAME_ | V | 0x8E62A13B432D19D68C9C1EB5BF4D4EF4 ; libaacs -0x54E663FF18AEAA0854FB4C4F79E16538F7C58059 = _NONAME_ | V | 0x489C402454C34926B05391EB0C887554 ; libaacs -0x5A984BF0A00BDDE026ECEB2E9316BA914486B085 = _NONAME_ | V | 0xFBD0A7D8184FE4A8F16237D9EAA78A06 ; libaacs -0x1A11BF9BB8ADA3E182061636E87717F0B25150D0 = _NONAME_ | V | 0x99C344386B57747524F44F67C01EDC60 ; libaacs -0x4F11D8B70F8DFF381DB92077E708FB485E1CD61F = _NONAME_ | V | 0xD4E4B06712DE235128259F15BE4039C7 ; libaacs -0xE58C9F6BB5277B1957856B25E6056BE86AD4FD5F = _NONAME_ | V | 0x88A0CC884427B0E6B1DDD70C3B078307 ; libaacs -0x3D7E7A36CD438FDA5E6C3AA911C5DDAA4A26EC83 = _NONAME_ | V | 0xD5BF61276A1A2FDDFFBF53935C7A530E ; libaacs -0x45738FAAF819E7E7AC787CF4295C9168392EF6DF = _NONAME_ | V | 0x29588E850803EA7B5A01042D4651C033 ; libaacs -0x70785581EC2E86F8FB2D270F2958D90865D4B01A = _NONAME_ | V | 0xC7CCFAC058967D6DE5F5EDE5179DF3A3 ; libaacs -0xDD82A0C79F1456B14FA76C288701F22D80075386 = _NONAME_ | V | 0x6723BB6707D755D04E3D69AD151670C2 ; libaacs -0x36943775AFEEF05AAE7603568503CACCBA35FA6A = _NONAME_ | V | 0x083F0C8E9E0A0BC2881F3390AE1E299E ; libaacs -0x4D32E250ACF1480C42921C4D84B8E5751D47A863 = _NONAME_ | V | 0x3DE1E2B4F69CF031B3A4B2FFA7782C59 ; libaacs -0x9AE7F361BAED158A7F8980CDE92A918CED8B0B1E = _NONAME_ | V | 0x19BF7A4429974DAFD11F155667FF6572 ; libaacs -0x0010DDBF33FB839CB24B750958A4C1A9A48803BA = _NONAME_ | V | 0x0209A18B8E47DFDD17517CB21552EA69 ; libaacs -0x1376572791EE96CD1EEE629429138DFD20BAE06D = _NONAME_ | V | 0x147B30EAFCAA41BEBF58481FF5E73600 ; libaacs -0x44A01B2228E8BBB2D27342761F5C70870BCBC3C0 = _NONAME_ | V | 0x28E7A0E6435417A0CA2082862067C99C ; libaacs -0x63D1C8D5FE6960144CA6ED1307865A428DAB7D57 = _NONAME_ | V | 0x3728D2BF09BD48F380C57C26CBA44832 ; libaacs -0x71461D4D1CBCE51E95BE12641C2BC293222BEBCD = _NONAME_ | V | 0xCC338956FE990D725946BC3B9F773DF3 ; libaacs -0xBD854A8344FDD0F2FA928437B68C5503DF97D7C7 = _NONAME_ | V | 0xB1C0B82A8A951453AE8A958B28707643 ; libaacs -0xE8DDF2674C751F20657B48F6E4C92ADA931347B7 = _NONAME_ | V | 0xB98CBF8A9589E7E4F8510E4B142AD108 ; libaacs -0xD28BBA6DE6FCB81A23F6A6B4769F2E7AD4B96379 = _NONAME_ | V | 0xFAB4C6926C9103A31E7C4C4D1330B222 ; libaacs -0xF2F77A3FF1C3DF8FC1223DD8450AE344400B1117 = _NONAME_ | V | 0x6B3438C3167E117B008A084B29622AD6 ; libaacs -0xD03DB499DAA113C76338D0850E3F4888C7BC4CDB = _NONAME_ | V | 0xA11AD283E7BCDA09C2E54E2B6B9FCA5D ; libaacs -0x19BEDBA51B1449ABD8793049850BF0279ADBA9BC = _NONAME_ | V | 0xA8AFF42CF8D85A4CFEA2AEBC75690B8F ; libaacs -0xF73C1BACF218CE5505DBBD01D6EA518230A6416B = _NONAME_ | V | 0xE1020A12890268A6650074B741F3536B ; libaacs -0xF74FB4F41FE9603CC3DE32EEE8ABAFF51857B726 = _NONAME_ | V | 0x648D8A5299F09325A9EA5388F516D833 ; libaacs -0x8CADD7233F1199FD0DF8F8A514DAD4541EB8645D = _NONAME_ | V | 0x17C33D0A6813669ADBCCEB8D7575DF47 ; libaacs -0x34F36A6FFAC8F88D3DD0830BB5BEA78EFBC87629 = _NONAME_ | V | 0x3F5D1FE4424544D64FF80570DA1498D4 ; libaacs -0xA02901E609B7708494440A6F2E66ABD88B2906F8 = _NONAME_ | V | 0x511A75D1C941BA82F04025122BBC0784 ; libaacs -0xB2BAF597BA741F54839BBC1B30C0836A18A475D0 = _NONAME_ | V | 0x66ECCABB51B23DA386057D3843BAD8BC ; libaacs -0xC96288AEFCE32B0678A1EAC3D1E4E744262A5750 = _NONAME_ | V | 0xC5AE8678FFB38299F7AD4320B19E817B ; libaacs -0xCFBE7D2DCEB3C8384EB432F7567BE249E555285E = _NONAME_ | V | 0x1D331E4F43B60EC157D7163264E1FDCB ; libaacs -0xEF5930D01EA5BB5C700D8E1A1FFE4043C81676B3 = _NONAME_ | V | 0x9EEB83BE49E0AE35E50DBB3D00A8B340 ; libaacs -0xE8F87691782233FFF0B9154B38961D8CE93B4EE8 = _NONAME_ | V | 0x4562C3425939820E397A4702AA728666 ; libaacs -0x9BA526A8A0094C280266A6F3BA78442B5EF1B2E4 = _NONAME_ | V | 0x78D2050E2B6BFF29BAA2405572374C3B ; libaacs -0x5F1281B88934925BB09F1DC1CACEEAEF7204227A = _NONAME_ | V | 0x2AEEC5C25A2A274C99A1C6EDA989BB5F ; libaacs -0x486D42E4EBE9B8D33D849A3F1D61A31BB2B99A5C = _NONAME_ | V | 0x38C5417553A53BED645285ABC48CE340 ; libaacs -0x0E54D5ADF23A58D7ECABA8661EABF391CE521CD0 = _NONAME_ | V | 0xEF88C8B978A0B1C32CF61676DAEA4CF2 ; libaacs -0x119B10948F1CA4F9168BB140186E03E1032CF48B = _NONAME_ | V | 0xB6298C2DC97BCB59E3D1A66446F01855 ; libaacs -0x3098C3D34899DAE55BE27AF40DA8EF409F66A5FE = _NONAME_ | V | 0x8EAE38EDA91C929B8C9DBC66C03E1155 ; libaacs -0x1CCA4CA784AF8C848C99D4308CF00F86828EE8C4 = _NONAME_ | V | 0x5570A720F259081B3783CE802658F7AC ; libaacs -0x898FB184A8BC69E3BBF3025D7D9436A0E40B2A9E = _NONAME_ | V | 0x9052B95EFFD7D926312EFA24185DC2CA ; libaacs -0xFB3D300160EDF9009260353A14C7E9C997A3985B = _NONAME_ | V | 0xAD59A9257DB67CD66A97D596DB6EDC08 ; libaacs -0xFF5CC56351EE3D183C379A05EE3C73F90C2A846F = _NONAME_ | V | 0x7C136AB0E79AA202E731F8D57C17CD56 ; libaacs -0x47689FAC144213B9298C1DB05C15B1E95550B1C6 = _NONAME_ | V | 0x5AD9F59B84CF357EDAB0EEDCF652AA23 ; libaacs -0x9A7EA0D95A3D90983B30EE3CE847BFD54807FDDA = _NONAME_ | V | 0x674BC5B07BC8A1E4E4F77D0FFBF2B377 ; libaacs -0x433B5D99F5544AD3CB9E8C04F33D537123F36EB0 = _NONAME_ | V | 0x21DB7C33DF1806B3AF7B2B440203AC97 ; libaacs -0xC7C947A2C3069A50EEF85C98F1D4A7389EE1B127 = _NONAME_ | V | 0x6FCB9FCCAB3792D3CD5C46949C18663C ; libaacs -0x5DA1724CBE7CDC6F9C2D6BE92276938D693A9AB5 = _NONAME_ | V | 0x8EAC2C4EFCB2C79117DC438AEEEE1C4F ; libaacs -0xA9A86409FA18A929E69EB84EE6CA4C50390BCE66 = _NONAME_ | V | 0xE726490822F4DD674CB36269D4D589CF ; libaacs -0x80AA70EEEE662B74EABD72EFAEA1F1248DB9DD3D = _NONAME_ | V | 0xDE08A548A3E7E49DF500EC85BFC9E1C5 ; libaacs -0x0ABBDCDE478849488D4F2065843BE02CCAD97227 = _NONAME_ | V | 0x5F061152CEE320EA1C5ACECE4E30F953 ; libaacs -0x5BE816A832C27CCBA0DA5978F0CC901C713329A1 = _NONAME_ | V | 0xE0F475A568F13D6E0BEBEE96F5243C5D ; libaacs -0x5E0B596E3D9DDEFC5AD7D41CACAF9B4FC50AA3AD = _NONAME_ | V | 0x5D9BE9AE8E6DB15FA2CD385098E7F44E ; libaacs -0x25B755F8CA7CC9003B1CBCF22A671DA5BEB00558 = _NONAME_ | V | 0xB73627EA8F11BA54EDB1E4078FE45910 ; libaacs -0xFB27F4F10CEB81E36635AF2A6EAE1E83A25E8FA9 = _NONAME_ | V | 0x6010C330D47DF315968C7D3C9F3FCD49 ; libaacs -0xBED66CF0B988F76DEB22B7BFDD4CD87F28588584 = _NONAME_ | V | 0x4E833565C4258711DC08A7D1FC18FBD7 ; libaacs -0xA1D44DD9429486C8F5D831CEC2DCAB6970839B6F = _NONAME_ | V | 0x6F0895EE6AD4C861361C4B6727BFB86B ; libaacs -0x2879F74B080122189B15F407064A8B843DF502D4 = _NONAME_ | V | 0xC92181967ED679672368B1C57890A2B0 ; libaacs -0xC3D04D8F0D85214D764C315699A1CCA91EE9B9CE = _NONAME_ | V | 0xDB4D5635B9BD9970BE7DF26DD0046937 ; libaacs -0x1068C21B7197004AE5DA8ED92F6EDF4E22AC0907 = _NONAME_ | V | 0x934C1733551D17F330C2AF639AB4AD20 ; libaacs -0x5ABBC177384FDBD2F8715BDB7F2AF283C1E9FCBA = _NONAME_ | V | 0x176161D0A68FEF646E8F07320D874273 ; libaacs -0x0146BC1695829F17D5B1EFD752D5AFC35D58CEFA = _NONAME_ | V | 0xC154489B82B28FF412F6AD38E071FB4A ; libaacs -0x970A5BED5C2CD4E66835ED1A044BCEDB7C1937DF = _NONAME_ | V | 0x84709C8767392A8714764EE53A65E9FA ; libaacs -0x262244E8C4747B200635F97424777927AC72D43F = _NONAME_ | V | 0xA6FCCF1F2C8B6BAC4AD89C9AE9CF10DF ; libaacs -0x0F5C920F25D95783B2E87E5DA1ACC29F0ABA0040 = _NONAME_ | V | 0x14F545089A6D313DC64BF8C43A8BCC1D ; libaacs -0x14EEF4DC38220A828A4B99272A4E5D6EC8BD5184 = _NONAME_ | V | 0x37F22403D95BE3E204274D515CAE1374 ; libaacs -0xE4E8852A1B83DBE8E5AEBC3BB564DC525A16745C = _NONAME_ | V | 0x7DAB515173261C90658B95A4BDFB1943 ; libaacs -0xA1334A048925030AB8AAA407EB7060166B41D4C8 = _NONAME_ | V | 0x63110D7511A94D9D469D27C60AEB59B0 ; libaacs -0x4C06B2B179532638038265C3A086C04A66DB7C98 = _NONAME_ | V | 0x3111FA631D939EBF32BF253878A39716 ; libaacs -0x52054B4F1B55F3DEAF46A888E32E426FAA986636 = _NONAME_ | V | 0x1D6AF816CEFD406BFACEC4AB8DD11A5C ; libaacs -0x022BFDA81530C03F68AF87C1255355CFAB82A84A = _NONAME_ | V | 0xB883ACF62768EB22F8AC6FA5AD60DF49 ; libaacs -0x53CC5504816D03B5222214DBF9A2792935C9F79A = _NONAME_ | V | 0x7581C6F083605073235861FBC2C453EB ; libaacs -0xFA48EB1389ADAC58D51924DEECAFE9B80C6D7270 = _NONAME_ | V | 0x5646CF81314D07A5CE04E98C301B55F7 ; libaacs -0xE8BE14C8FBF8C366EA84A132DD80964FDFC18A87 = _NONAME_ | V | 0x94A8B34641205FBE01168F493F174D8A ; libaacs -0x9BF35F7D4A12C5F75FC8F73A3480D59474EC89B6 = _NONAME_ | V | 0xB79299192B625DD75622E6631408C851 ; libaacs -0xE408420CDA95F4F0E3898D822E6647EF110505FC = _NONAME_ | V | 0x338B41F7052A8CBF2CA3C1204F956A7F ; libaacs -0xE7A6FC6120F0E684F229F1609172FD85F6C6EE51 = _NONAME_ | V | 0xD312BF05FB2BF742F8C9BE1F352E5A20 ; libaacs -0x133B6E5225993DB0F14E7A0E21B268B1476402C4 = _NONAME_ | V | 0x1F3EE86E96AE1CADAC39A718BC9C21B5 ; libaacs -0x6C1CD7C6A96E704089FCFB9D82B6C5A14C95302B = _NONAME_ | V | 0xA18E01F4783F125CCF02477329623FC4 ; libaacs -0xF8B17FCCBF305C1E9DC045632480F48539B66208 = _NONAME_ | V | 0x3C7DDB595352706284FC7140FDA287B9 ; libaacs -0x17399B09540484C7797A52C85CE2D27DF8A27F6E = _NONAME_ | V | 0xE7F625E905A6BBD906D690F79C2C84AC ; libaacs -0x645F195FFB7464BDACC022F41C25BC3A960A9BB2 = _NONAME_ | V | 0xBF8208C4C31C9BCB41C5B920E18EF7FB ; libaacs -0xF856FBBB55821F1F53ACBE1F2E874A913A491628 = _NONAME_ | V | 0x1A102561F0CA4CF4498F2476D4E3A601 ; libaacs -0x296CB8F3FD9CDC67376DC7A83B3D0EA5BFEC181D = _NONAME_ | V | 0xF50A7798230AD417688A213E4C494082 ; libaacs -0x37480ACF8A39D160075A6BD8F6E03A8B3E88FBBA = _NONAME_ | V | 0xB6B87C575C1A6F917680FBF31A643454 ; libaacs -0xF87A629BDBB755A35CE609B5E3ACF245C2BDE796 = _NONAME_ | V | 0xC2F9494A0721B995397864BE2640D2DC ; libaacs -0xDE5801D944A7C002AF6DDB372F0FEA7EEA4583EC = _NONAME_ | V | 0xBC699983272B54AC6FA137834FBD1730 ; libaacs -0x0B39D77E25D95FE684121FB9DA258B4EB2B6DBC2 = _NONAME_ | V | 0xF3BC619F5D4A667919E986FAED858DE6 ; libaacs -0x13FDF4EB0471CBF361488054DA82BD30AD9C73A4 = _NONAME_ | V | 0x4A01EBB18BF1D83C0A4681180AA35E6F ; libaacs -0x298170D2CF6D6222FBDC5BF0519FE4474BF9575D = _NONAME_ | V | 0x9A46080053DA2DC6ED101E0607933690 ; libaacs -0x35EA62080DE320875267EA57C08FAA3EFC538459 = _NONAME_ | V | 0x55881582D22F7DD884485E19F88D82DE ; libaacs -0x3EF543B643F98F7CEFAC1EB73DC388125D3F49C3 = _NONAME_ | V | 0x594F400C32DAB41AE95A84C76AA0374B ; libaacs -0x3FC167893D8C61C70744F9997080C566B8B3DE18 = _NONAME_ | V | 0xF8610FE0E980EE5C22445A0CC2E74889 ; libaacs -0x59FD7AA946AB434D3FE9AFAD219D66A124CDBDDB = _NONAME_ | V | 0x32937B534B2768B7952E1AA46CD80DC0 ; libaacs -0x710981C85BB7F9A0224588751A1C316C2483AAF8 = _NONAME_ | V | 0xE64D38F51C6AF23CD67B5E72186FB819 ; libaacs -0x8356AB43F861424FD4A8DA4B9A07FEDCEAA8CF01 = _NONAME_ | V | 0x706525D7E949FDF99CD58A1061D03F2F ; libaacs -0x87803CF0C2EDFBA258FD69AEEAD61680533D86C9 = _NONAME_ | V | 0xA520C272B665F03E6C4180BB363BB5CF ; libaacs -0xBE08DC641539524587B41856322437AE05B91641 = _NONAME_ | V | 0x7EDF402C006622346D7C9CC0348B82A0 ; libaacs -0xC4158F6B144D9D6757B44C0D41081180403BCEEF = _NONAME_ | V | 0x93CBF79012F30EF273B3C869652548BF ; libaacs -0xCC0372B75ED9D5D19A8B3F545BB6BEEB1AF2BFC2 = _NONAME_ | V | 0x0C69EB5B137A59673BB5B9FA9B43A37F ; libaacs -0x6B0DE82922A19C4533417BA44A887EE9E78AA723 = _NONAME_ | V | 0x2ADAB20371C318AA5B0A357B052F8C3C ; libaacs -0xE8F94BD435315992287B04E68CF5EC04C7ACEB34 = _NONAME_ | V | 0x2AF62843FACA931352FC9D912EDECC54 ; libaacs -0xCE4B4105638199320602E86323CBC83DEC2102B6 = _NONAME_ | V | 0xE2F3E7E16947CD0C9C41763339DB8B4E ; libaacs -0x9B4532177ECF4DCCDA1B72F1FEF5D55C82D99761 = _NONAME_ | V | 0x603682ABBC2C4D383F8DF9FAD7C5345A ; libaacs -0x9BEFB52EA2FD7E5D4E95B7823FF35985EC959F95 = _NONAME_ | V | 0xCA03643F5EA7F94D3268944BD9C92497 ; libaacs -0x1D0A30AA3FD65539452E0E0468AB9E54C67035F2 = _NONAME_ | V | 0xE7A72B98761A95F4132E8F34B32FBCFF ; libaacs -0x959AA194D035B26EF936B0EE5792E18C7797E3AA = _NONAME_ | V | 0x13503BC29DB57F4D62E1A31ADD513109 ; libaacs -0x3D6510742E0A96A591456FADF40B74334FEB9B03 = _NONAME_ | V | 0xB323E1180389F96C76F9A34AEB3D3ABE ; libaacs -0x7D5267C5267AE840B2F53120AA08D2B492C8C198 = _NONAME_ | V | 0x39BB51A73009BB84080A461E3109D5F1 ; libaacs -0x883BC9B3C164A2E5FA5D2BB70B671C2967FD84FD = _NONAME_ | V | 0xDC259785A8BD82A426F39C028A070171 ; libaacs -0x89F80A87F3DA0191E0E3BA183A49C411E2F07E68 = _NONAME_ | V | 0xA09AA026948ECB037F6813A093546DF2 ; libaacs -0xDBB5FACE849CF23A2EF357BAB2990F2531845782 = _NONAME_ | V | 0x846D5BB03643C31E855BA7C6E7B1F0F9 ; libaacs -0x2F17ED3B4F382227EED6BEA93B28F43F2064B3F0 = _NONAME_ | V | 0xA54A82EA728EE34605B4E3901BBCA4B0 ; libaacs -0xF8B114184F516CAEAAD2FA63574E048F38ACF249 = _NONAME_ | V | 0xE33028BBFE731CFBC9A2F5C8C09D79F9 ; libaacs -0x89F100685CF348B7432998CF895B3D0B2EC72642 = _NONAME_ | V | 0x6D410116E2BB60B4D966B94346836128 ; libaacs -0x4DAC06C194502E6DCEFB4C7DC59A45BC42818390 = _NONAME_ | V | 0xD88753D64E0430A21F25F7D2D3899759 ; libaacs -0x0413D437C60EAC6D548E25289C52625784E9D6A0 = _NONAME_ | V | 0x0002D841E6ABE7535F608505173F1E66 ; libaacs -0x44FF16A122F0F288B0EAC2CBB677F274D9A8D828 = _NONAME_ | V | 0x943F4A3B5CCB809C9BB1CEE24EBB59E5 ; libaacs -0x249A21C50028086295EED5656706C20927509886 = _NONAME_ | V | 0xC909F0912324823B6438819747FFF9CC ; libaacs -0x4A6087B87CC06D95376408EE716B0DF7D13A15AB = _NONAME_ | V | 0x74993DC461930108C9DBB63D0234018B ; libaacs -0xA70752830A8C33C9ED6D22F04FCF911AFA5D1C0C = _NONAME_ | V | 0x23038E82CF4043E71B0923E860DC5FF9 ; libaacs -0x86D83AC32B698A61B87F8117E1D4562649C0DEFF = _NONAME_ | V | 0x3194DEAA147CF991E5E1D0F0AC4B8477 ; libaacs -0x2942E74A5CD17416832C7FBA8C5797273544F6D2 = _NONAME_ | V | 0x322976CF4C0A3B2F7216F9E047327D92 ; libaacs -0xD48E8C7A6143F9E8EA7D8FE6D797C4C210DAD759 = _NONAME_ | V | 0x2D172BC58612952580C72FC3A9DCCFB9 ; libaacs -0x06E850416627E8D73D9FB5EAF39B904401A771CA = _NONAME_ | V | 0xC39B6ED4DB87DF9BC95E9395A53F9607 ; libaacs -0xE65742D03C897B8EF070E1282763B0AB65C6FD0E = _NONAME_ | V | 0x9C10B9E26E379B5E2CEA4FB4FD52A1A7 ; libaacs -0x48B2D4AA8FBB026F4121453B3A8445358387F962 = _NONAME_ | V | 0xC3B07CAEAD8841AA317B1B287D09A32D ; libaacs -0xBBB3B5FC44527B7493A3FF7E38FFB6EA0A5AA8EF = _NONAME_ | V | 0x37BC27A69D63CB5901D000494316F87D ; libaacs -0xDEA638FEB25D1005AC2B1746DE3FF418836A2E0E = _NONAME_ | V | 0x5A38B4E626591080976B2A9F5BC31C63 ; libaacs -0x8AE3A51D1E37F33C19B8FFB3A90471A47B58012E = _NONAME_ | V | 0xD0D96B57EAD99AAD692C94D2BE767C5D ; libaacs -0x9BA0667043388F8B9BB0612680CC6FEFE39BAE11 = _NONAME_ | V | 0x00FE3348EEFDA940F7AADF8579A62191 ; libaacs -0xF60635C074DB527713B8A2AE6E7070466C6C81C4 = _NONAME_ | V | 0x13C523AE429FE8E687545ADE1E9F2B0B ; libaacs -0xC01BE47DA908FC7484110823840589745D2AA4AA = _NONAME_ | V | 0xEE4C8F0093A8AF61BEF12A241F9EA370 ; libaacs -0x4E31F4E8EB34BD85406B10B97451B5FA43DCF12F = _NONAME_ | V | 0xB165A9BCA294618942165D9F5C847D24 ; libaacs -0xB55B7E16DCC02DBF63EBAD8AFEBBED3A40CC53B1 = _NONAME_ | V | 0x068EB50B635FE93380D2F4D3B767A382 ; libaacs -0x1041A985057A5553078303F6F426AC43FAD5EC91 = _NONAME_ | V | 0xC79FDA260DB15A55387B1FF162367501 ; libaacs -0xA5EC499763BA3656DF83BBF6419D193AC5A4865F = _NONAME_ | V | 0x0F78C9BB5C63F420542436A4E89081AD ; libaacs -0x62566AD530C97F9E40F586A5F481F27EE7503555 = _NONAME_ | V | 0x67CDE8054D909C28A824CC6F75F2EEEC ; libaacs -0x0FC6E4FFF342CB24F57B6754FEA4DFC442EF7352 = _NONAME_ | V | 0x211141A9977CF686D79FCFAFB5D77B6E ; libaacs -0x15113AAA670CD0DF7989C1A1405B5DEEF4C5EA25 = _NONAME_ | V | 0x0D52BB0EA90FEB06EB34A9BB89E7085B ; libaacs -0x62302DB41B5588B07DF108A9E9FED0A5DD48AAAD = _NONAME_ | V | 0xF8EF36FAAD9190DFB9ED2130A771E3B0 ; libaacs -0x9162F9739FF0D11AEDED0A80B438E021768F4DEA = _NONAME_ | V | 0xA8AD33CFC1E9C43237CD388B171943E3 ; libaacs -0xD28507C6CF10530A8A0C0FCF9C752B073F0C8D36 = _NONAME_ | V | 0x054EB0F67BBD92FA9964F76F3E023522 ; libaacs -0x641E47DA1EB29EDAAF768F10D8AA8335CDF30766 = _NONAME_ | V | 0x1269717B24452A2E37353604FC389BF5 ; libaacs -0xFADC9D35E415401CF830BEC34E20DB3A79606187 = _NONAME_ | V | 0x557716DE2B5948756F74630FEEC93EE0 ; libaacs -0xC02F2C98776E9C2FF260CBF75C365F00E52E5285 = _NONAME_ | V | 0x95976311A6F71120E299AE346D2D5653 ; libaacs -0x875F200037F2873262143AB4D79B2D4AF646F0D2 = _NONAME_ | V | 0x69B19C494A5128A3F4279CF7325B7331 ; libaacs -0x691E9D43E172E6BBE185B55DEEF963421EC4507E = _NONAME_ | V | 0xCA895FEFF61111CA40320CF9CE3E8CF3 ; libaacs -0x287598A7A7F0446C88C3993D0BCB0B51C7C34634 = _NONAME_ | V | 0x6BBD5FCC807FF07D8C4E122B8901CAF9 ; libaacs -0xB2DA44C7F48F7CB91D1E8581A98B04EA09DBBC41 = _NONAME_ | V | 0x0AA015F76B04AC8A94123D2D0F3F36AC ; libaacs -0xC91C5555D8A13E104194D40A32D6CA198023FFA2 = _NONAME_ | V | 0x99710052E84D0C78DBDDC13A01AAFEDA ; libaacs -0xB317CF8DDF6CB74C79565C35315CDC4C7A6B7E4D = _NONAME_ | V | 0xD4D3A4615BB3AFE07790F1ACDEC29A40 ; libaacs -0x996186421423E6639C14BCAC2543F4085F340B8F = _NONAME_ | V | 0x9409C2D955B80CEC3218A104F0932A03 ; libaacs -0xF6BAD4D7ADA332B46B6D8054D0E9574B0F673BBF = _NONAME_ | V | 0x354C98FCA9F8CBB42873C49889C17B67 ; libaacs -0x1BC2723C0F52B1211A7C158F6D0D8C11B206CA11 = _NONAME_ | V | 0xBFFB36EFDBB969C3F9F9E1C597A4D805 ; libaacs -0x536B62E7D68F1D6A8A7D79FA065D30F8BA556A8D = _NONAME_ | V | 0xDE55B07ED2414DA0221D3E24DD339632 ; libaacs -0xA912567C33F03221366A3A32F1E05345A4B00C6A = _NONAME_ | V | 0x0A324EA5A67FE872741A325B822349B1 ; libaacs -0xB53C9C284CC5734FD915631F9965809FC8EB5F9F = _NONAME_ | V | 0xE47142DAF88E6522AEBC9089EFA9E88B ; libaacs -0x4B44BE6414EA979B86E3348A7C1DFA63870CAE55 = _NONAME_ | V | 0x2E73C9F0030C1C1FB897B7FB89754F6E ; libaacs -0xEBC50518F49CD0D2D3F78C5DE276648E6F891C5E = _NONAME_ | V | 0xE9265FD4593876E391B97593B281B3B5 ; libaacs -0xF08F4C52C6E7A769B679B9F9A434621B93D9676B = _NONAME_ | V | 0xC1797B4968F96ED303068B19502116DA ; libaacs -0x794FB3D4058F213F19C2DD3A8EEC17EBC3C7992F = _NONAME_ | V | 0xFBECF50CCD905B235CE11DD29B8AD216 ; libaacs -0x083C9C6B7F20623E241DD26C7F17E6636C95BBF4 = _NONAME_ | V | 0xF550D95D651602A4A32B772B518511AD ; libaacs -0x812409AC554DD79FC2EF63168489F52169909608 = _NONAME_ | V | 0xA6DBD0A4644DF110430F2EF03A6B598E ; libaacs -0x87D1CEA1C2EE2777D2D5FDCD4694D11444578E30 = _NONAME_ | V | 0xD9EF5F6F05EAF47FA4E31FFBB5546214 ; libaacs -0x9DB5D0E4086FF098F3CFA29A85F7F47F61C498CB = _NONAME_ | V | 0x7624AEF1C798C3A5B650BB2289BEA9E4 ; libaacs -0xA54050B4501D869B2B32E7788007FD4D821036AD = _NONAME_ | V | 0x8B17DDAA550CC8F74A4FAE2603028008 ; libaacs -0xC78FBDB6D78DCCD0A06C8C7052DEC11E71E05475 = _NONAME_ | V | 0x26B02D5E3DB3E0C558A62F78DEC8FF63 ; libaacs -0xD4023443E3F93E8D4E3F9F9DFAD5B4650E703D3E = _NONAME_ | V | 0x8F1A4E0795C68C5C00C40297589F1AF7 ; libaacs -0xE2560DCD14734DBF7B1D254CD4AD0BDC31C4D127 = _NONAME_ | V | 0x5E438FABCC43555102A90B632F322EF3 ; libaacs -0xE33B7A7EDDFC70B1AE6D3885A29955DA5395B1E6 = _NONAME_ | V | 0x5236189F17E580F4C715C4A61895BBA8 ; libaacs -0xEEDE8334ACDE8002547EEB801F039316DABA14CF = _NONAME_ | V | 0x94DCD10C15604877491B883337971034 ; libaacs -0x202EBA4EE3EA95939B94282675A234FD27EFF574 = _NONAME_ | V | 0xA5654AF7DF624EBAE6484036E80CD1D0 ; libaacs -0x810CAD27862934E6CE02C3473BE0D1DC1064982B = _NONAME_ | V | 0x01AE0492CA281B14D0142DCD040ED4A4 ; libaacs -0xBFC51AE1BC9CDCF8C072D0FCC6C80F71782F92D5 = _NONAME_ | V | 0xA94528A12341BBD0DF8DCD5949BE981B ; libaacs -0x221A8DF509D2B361CE1D29D02AED2E08994FB65D = _NONAME_ | V | 0x0F612845A774F16567A76F5923228E99 ; libaacs -0x644E228BC7E40D9120F0FC16057F595CAB5A6BBC = _NONAME_ | V | 0xD78FE085A323652283554272AB54E2E6 ; libaacs -0x58806F935EE7FE2EE4E8259FE8836A2351FD37A1 = _NONAME_ | V | 0x0A943D5CE9117B807A308B7A1B0B0CFA ; libaacs -0x67BC3A3FB83F66084C986A70C2F8D28FD27499F9 = _NONAME_ | V | 0x790F3DF5B6A2512880B9C4B93EDBEE9A ; libaacs -0x83ADBEF482E0A387352B57138390FEE050608D6B = _NONAME_ | V | 0x3A4E7BDE3DEA1278A62CF2A9DA73182D ; libaacs -0x541BFFF52AEB0E1BC5E5580318270B8FEB283AF6 = _NONAME_ | V | 0x53A0C3D2A60CED05EECC24D7E3821F01 ; libaacs -0x538A52436A331203A4436EE7685D6C70D59B8E04 = _NONAME_ | V | 0x6D80376E1AC7F63113F105194F48ED12 ; libaacs -0x9DB6B77ECBF44E3CA610032B3BA096D356BB7DF4 = _NONAME_ | V | 0x31F640F5838BF438943DE2E08B956266 ; libaacs -0xCA4694193AEDACBD121A1484874A99C6C284AFD4 = _NONAME_ | V | 0x3BA2DACA895847338A0E876AA153689C ; libaacs -0xC0AB25068AF909D51A22FBE05D33AF37BE912D39 = _NONAME_ | V | 0x5CF1959FEECE3E60E3D47A9E1CB56A77 ; libaacs -0x2C53D79DD68CA7B48A669CDC9CC4F66D454D1440 = _NONAME_ | V | 0xD4DB0FF0335D006FF69ABD1E5A5253B8 ; libaacs -0xC608C0BBFBCFFD01CC23D017C74DDB3A0D2EB898 = _NONAME_ | V | 0x356E539F20C9AA3ECA78391DFB54FA37 ; libaacs -0x3F7F1A6C416DCA316B538DFCA618C78F011E5061 = _NONAME_ | V | 0x1BF04771B9FD5867960696AE15C998B6 ; libaacs -0x43C374A2B42B002E91EB41C4FA47024DC46490BB = _NONAME_ | V | 0x2724ECFA37EC1907E766B017F16A7697 ; libaacs -0x451F8C20DF9D59D6BF44EE1146AA39E3619775EE = _NONAME_ | V | 0x1F738C41340E0B87C5606359F12529F9 ; libaacs -0x57609DB30237C319AA5E030D7CD7D1AD1073AEE1 = _NONAME_ | V | 0xA0817A26AE037B6A58A482BAAE64E87C ; libaacs -0x563F29BABEDD93F0FB527BAF702A61699A3FF9A8 = _NONAME_ | V | 0x4700217A1F4E2B06589DF9CB8A013539 ; libaacs -0x7FE5B5876158389C073D2C073FBD228F46A4E50D = _NONAME_ | V | 0x54A7EA3399ED412ECF4ED63797CC139D ; libaacs -0xFC0412C3940FCC7BB620612668A48772A315B7CA = _NONAME_ | V | 0x549D4EA4646C6354D4F63EFEF65CB242 ; libaacs -0xD837A20340880FF9EF4611C60F797A6037F5FC95 = _NONAME_ | V | 0x0673F6A9BA8E0EB4F57443569BDFFA6A ; libaacs -0x91FF0CD52A27FAAD2AFA89F591FF03636F1D791B = _NONAME_ | V | 0x8AC9DEEF199B283B1240E31467A4FC3D ; libaacs -0x4597807CBB0AF9622019AAFC84A4DA8E35595F09 = _NONAME_ | V | 0x3FE4AC1C47CB851B3E02F730F5F47F91 ; libaacs -0xDB23F778DE28A27A9F2DF3148F46D9BFA6E5B228 = _NONAME_ | V | 0x4E7D5E3CBE152DCDDC0A9C71CB6ED39C ; libaacs -0xD7D96952EE82F7C4EBA9D6E6BAA732CA5BA2FBF2 = _NONAME_ | V | 0x7948E6CBD83A0D4572A6BCE0111EF708 ; libaacs -0x2118DCF1BDC0E42A37C443C15B464CB9F1BCE00D = _NONAME_ | V | 0xF90742EC4DA6F090A269E616116C520E ; libaacs -0x3BE4543EEA9D956D1AD918CCCE96F19B37707C0F = _NONAME_ | V | 0xF7300D1FBD50D29B7CA8F659C9ACF492 ; libaacs -0x48F93C7FA2AA7F530DC828DEF0976EC70EAC5778 = _NONAME_ | V | 0xB79638378360DB411066DC091D470AA8 ; libaacs -0x7F87C8A0117E383A7E9AF8CFA09D5F0B3B5E9AC0 = _NONAME_ | V | 0xF7AD67974AC0C7E269631DDA5375C471 ; libaacs -0x80EF9BF74A2F6C9FD7E03CE4C3364E083902E61A = _NONAME_ | V | 0xC21B5BBA0B6D8A44F64D93F0E3684C19 ; libaacs -0x8E29D48A391D57AB9578AB8CC85B997E1CE84E96 = _NONAME_ | V | 0x1538C2592018CB3B24A71946BD306F9A ; libaacs -0x9BE55753DD06A27F713C0F7C14B26D1A403342CE = _NONAME_ | V | 0xFAAEE4794667C2DA37B70AFAF37AD36F ; libaacs -0x4EAD4DB2C18F0BFCD556503224AB83455360BB59 = _NONAME_ | V | 0x188BAE74AC96C64BAB55444AD9A8E701 ; libaacs -0xB70234C6C1F2CAE1059F7127C503B293CF6E25A6 = _NONAME_ | V | 0xA42E7144CBB859AB20F512937E7366DF ; libaacs -0xC47696892EE40C70350F779049EB25A20AD8E391 = _NONAME_ | V | 0x6335ACE998D07F22B76E2F256FFBF197 ; libaacs -0x52BF5C8B2FEB39B49AE0BA47470AFEE2E3772760 = _NONAME_ | V | 0x789B7DB6FC85A6974C6F8C75735ACAB4 ; libaacs -0x4D93AE6CC17AADD091181866E658F94DA7C16E78 = _NONAME_ | V | 0x76797CADDF770D4046212D8370772E7D ; libaacs -0x97655E2A14DC7E5124627CA8B0879A8A85888E56 = _NONAME_ | V | 0x3419F98AC38C91AFCDF8F5DE84F62924 ; libaacs -0x4ECB1E392216FBC835B2D132B6E0EDEFBDB7EAE2 = _NONAME_ | V | 0x8761C8129B1F7ADB7DD75A0B34892916 ; libaacs -0x005CFB23C3A6ADD900BA755C24B9D03ABE3DCC5E = _NONAME_ | V | 0x4DC2FA5D1CE048F1288A358D0B995C54 ; libaacs -0xEBC9C9E04F06018D4C88D4680BD6B9C2A3D23956 = _NONAME_ | V | 0x10B1DF500689D896160E95157B47A32B ; libaacs -0xDBB336424A3ACBD6F10CD128E90923493AFA494F = _NONAME_ | V | 0x0ED996E23DB1F00D92058568CB888BD7 ; libaacs -0xA683073BD070BF763A032445E2D361F7B6DBF862 = _NONAME_ | V | 0x34F7C7CB351C42E2123BA743770D96BE ; libaacs -0x0AADA03136497AAA8D2AB76BBA02A474D8920B9A = _NONAME_ | V | 0xA451CBB0A11A8543720400A8520398AC ; libaacs -0xCD0A833A7F67EEA162638DBCEB3B73B06480CD0D = _NONAME_ | V | 0x72CEBEE946175D7FBED5F0FF66336A96 ; libaacs -0x2FF17B164BA3D03DF27821894135F291D79B8CA8 = _NONAME_ | V | 0x6B706A3FEFB24E6472AE6B46FE148054 ; libaacs -0x6BED3F6823D7A115AD932664B9DE03586C0FD756 = _NONAME_ | V | 0x2891104ED6C6CDE4826B40108DAA2477 ; libaacs -0xADFCCD49703969D147E42D9E52BB111E38DC7DD1 = _NONAME_ | V | 0xE60E1B33085D0C8864E0B3C155F4C490 ; libaacs -0x721A3438F73F06993566C815CA7159E5616300DC = _NONAME_ | V | 0x8D0CF9488A28D5C07D31C51C10B04EDD ; libaacs -0x034B2D109B0824DD99A548BAB3491A8F325524A1 = _NONAME_ | V | 0xD5A86FB31E6CAEF3E16EEFE6AF078D9E ; libaacs -0xDE8CC69D01E12EB02A811286C7C37705A1F1A027 = _NONAME_ | V | 0x64A27498A33A0A6AFE15C0611EFD4751 ; libaacs -0x6E39237E0D91550614C99C1A1E711062E54DBD16 = _NONAME_ | V | 0x4CB8AC1A4FDA398640D98D3CA57D84C1 ; libaacs -0x1478F16E3580DFDEF8E6328E60A983EA37D44477 = _NONAME_ | V | 0x4F870D79489356FE3658FFCE71669F8D ; libaacs -0x3280EE7568A8231C7EC9954CD28434C0BA812B81 = _NONAME_ | V | 0x156F66F868643B46E18A7BCDC4F907F9 ; libaacs -0x4998FA1C28F2F1B0B335FDDEAE7F15F306473C80 = _NONAME_ | V | 0xAC3AB79D7F10D20D8934F6825A61FAB6 ; libaacs -0x4F74C560FE333D529555245D5256641E569D82E4 = _NONAME_ | V | 0x104B2D342BB71BBC029FE425A11FF69E ; libaacs -0xA6A1305A0EACB9DB0ADA170952E73A2524DBEC62 = _NONAME_ | V | 0x59E45EB8B0B38AAF86E4E1EE616ACD53 ; libaacs -0x839698F67C5E8995AEAE980E2D117E7EC81AC942 = _NONAME_ | V | 0x6E81CC60E569816CF8D7B3661055D755 ; libaacs -0x3A8A38FC24A71FFC6AF4C76227B30FC411AB89FA = _NONAME_ | V | 0x47C38930A819846F2774D1A4429F9D2E ; libaacs -0x83CA59F4054AF1625D9708E7EB098BB5A3DDC1E4 = _NONAME_ | V | 0xC3C093122CF69FEAAD2BA6271FFB4F1C ; libaacs -0x38A5FCB7BE2ACD64B98AC32A9834DBFD715A38AD = _NONAME_ | V | 0x0569382C2DD543F419BE4B6D0E7A08B9 ; libaacs -0x734879D302D68C9DCC4D49D4D38E3354EE68F321 = _NONAME_ | V | 0xB1E17AFE138FC1E9A57DCFFFEFFF0CF4 ; libaacs -0xF6F3AB2131F8627E0FA46C892DA443004AA0786B = _NONAME_ | V | 0xC7F51CB3A16D024DB859E3A68B2CD243 ; libaacs -0x0E56648548DCF5AAA12A280F92530722EE07750E = _NONAME_ | V | 0x0CD1E209FDFB5737365C5C2BBB620935 ; libaacs -0x5005E6C1F0C04105E8A89F622289F6CDB25A0AEC = _NONAME_ | V | 0x78AE8C1E28F5D6EB406178AEAC6EFEDD ; libaacs -0x76CF36AC2146A46E2A9B2FAAA359820C6BDD1828 = _NONAME_ | V | 0x63DD9D9A3C0F5A6ADAC5DEDC7DD7CB15 ; libaacs -0x8E140706F391E5BF20162168FD8E401950435F98 = _NONAME_ | V | 0x1EC5600218082C7B970AD5797B5F9BF7 ; libaacs -0x9E4AF8BCB2727E60E3DA09F1687FAC291FC03EE2 = _NONAME_ | V | 0x8C8559EFC8B1043A115CE556FBD3DA9B ; libaacs -0x32036BF24E126596D9298E13D071E4E51914EF03 = _NONAME_ | V | 0xE1B631DED962BAFFE351727BCC05A0C0 ; libaacs -0xD6E398AA691A38035374802450E140FA89928502 = _NONAME_ | V | 0xD65452C15F5B1E166250EC468E39C954 ; libaacs -0xEF5D1DB9BBBF194DA09FBEB6959DC2AF36E01C1B = _NONAME_ | V | 0x1F8E390509032F190A0E4CEE7011CC9D ; libaacs -0x3B29C9F299D06721FA215A2901061E7A0F2E83B4 = _NONAME_ | V | 0x5571E136C6034478D4DA2EF2EA03AE7A ; libaacs -0x5831BDD7CEA7701114B27813F36859275795EF39 = _NONAME_ | V | 0x47C835A6951E56B4E8590F9BEE27B2FD ; libaacs -0x86964498AAFC27E9C4F910931C16903EC1788DA6 = _NONAME_ | V | 0x4D07251686A675962847E3C94CEE6209 ; libaacs -0x8E4B849C2E0C99D028972687331BC43A87617D65 = _NONAME_ | V | 0x42819240B45AF8ADE015889B5BC08A7F ; libaacs -0x407D1EC6B4AC6DAA6B702F9CC0500266263ADE67 = _NONAME_ | V | 0x4605E2DC9A27093FE9B60A115D0FDB34 ; libaacs -0x3655B956AA9E1FC30E733646F8B067470FB6E86E = _NONAME_ | V | 0xAA4014113471FD00D3FDA4B706047B21 ; libaacs -0xA7F9EAA0CC4757692BA2888E8BDFF9F96EB0B204 = _NONAME_ | V | 0x209AAC919B8659D63D044740EA86CA81 ; libaacs -0x0FF3EAA6B073550F4936D4B8B63D311A9DCAB341 = _NONAME_ | V | 0x9D9542140AD30BC806BFDC6EAA93A231 ; libaacs -0x39F4D9FAA03D010A8F3A32436537DF1084FF4F8F = _NONAME_ | V | 0x49CE6F9C64EF7226F741AB2C13344A19 ; libaacs -0x09962444376B0BF06A75006A516EC651EF52B4C8 = _NONAME_ | V | 0xC669B3DAE20F3961A0B2E86180699E25 ; libaacs -0x0BCD0B67D44C7772235DC920B9D801350F7CF18D = _NONAME_ | V | 0x4EA64A039DC3EED2BE29376A6A0A13F3 ; libaacs -0x3DB7BB2463996944376CDE842FFE758FB6CFEE5A = _NONAME_ | V | 0xB01D1E1E3945AB824F2F0FD21F3352CB ; libaacs -0x5CBA20C94CC070779E4D16F7C5DB14EFA137B38F = _NONAME_ | V | 0xFCEFC466A1CBA3987ED1FE59642979DE ; libaacs -0x6EB0A1DF9A03A96CBA34DD3D337351E3AADCFAC8 = _NONAME_ | V | 0x7B8A56F9D263130EA5BC0AD97B20C319 ; libaacs -0x1825605F4E555B7CE3F7E52175ACC4594F889E59 = _NONAME_ | V | 0x503CDCE939473036277FCF7DC17589B2 ; libaacs -0x7B851BA80ADCBC8C09113E1C8CBD846BED9520E6 = _NONAME_ | V | 0x24453F0BC33D49E6B561CAB021F54DAA ; libaacs -0x301591CD34DBE859615C532A750695494CECEE3A = _NONAME_ | V | 0x8A7A29AFEF097B1D9C65BB45C56268A0 ; libaacs -0x0D22FBF9CD086292930BADBA7E92BE9EFE293334 = _NONAME_ | V | 0x7B11C5668FEFA6C5AB563197F8DA26FA ; libaacs -0x9A93A8BED3A4611AD66143D0F48A348A68872208 = _NONAME_ | V | 0x7EB393188017EE3A91BD548180257966 ; libaacs -0x3A4EF817CB81F452C32C7312CDCB3543CF231CAB = _NONAME_ | V | 0x46C91D44CB5FEC15F9EFF188B25EED9D ; libaacs -0x310F305EF29CAC368A17217F7DEC4279F5D50026 = _NONAME_ | V | 0xD00B2BE3991B91CCCB24749DAB24A45B ; libaacs -0xBD7FB2C37641C8F0DA08BF74FCAECEB681241502 = _NONAME_ | V | 0x5D1793B07349B7922710D4C9B13A5A2F ; libaacs -0xB0DFC0C69725A98B02BEB0FC9DC62CED21E3C819 = _NONAME_ | V | 0x7ABD545F5C3635F2E721EAB0158DDBFA ; libaacs -0x48237BA56F7A2D97CABB5BA41D078DA214020BDC = _NONAME_ | V | 0x91FC128547392EB66B82B3F390367B8A ; libaacs -0xE5D0DBBFB388667E614D82B00E25A35A04DD5FBB = _NONAME_ | V | 0x3169DC4C39CE185171470607A1067207 ; libaacs -0xD62DD2F2900654347386DA1A008F96E0C37F023C = _NONAME_ | V | 0x5DCAE7C72BA503192B515E64E5342F41 ; libaacs -0xC0FB52F93BA6A8080EF33D5A9B88A7AD0CFBD812 = _NONAME_ | V | 0x53A9EBEE23B8DCBD4566A3CC2253FD44 ; libaacs -0xBE36DFA7BE97F047103319BE8671C9FC3B31CB61 = _NONAME_ | V | 0x3864824A205B65938250A0FB2FF38CA0 ; libaacs -0x9953238E938F0A5A807A85596D1837B8895E25BD = _NONAME_ | V | 0xE0587B23ADFC8D0088E8D954511BA7B6 ; libaacs -0xA25DD1A089E19D8FE666C9E2E6D2DF9C1E810081 = _NONAME_ | V | 0xAE57C8EC1776D47B0B22426E354844EE ; libaacs -0xD58E6AE0FB01B3894E54958F8BE2BA240EA7C7B3 = _NONAME_ | V | 0x99992C44E08126F8B419000ACB5F8414 ; libaacs -0x588FEC95C0FF57998D4C89A4E5BF058B8F96ADFF = _NONAME_ | V | 0x792F382363B62787637CE37A8E32D8C2 ; libaacs -0xBF3B27B8B829EC62F61AEF5F6A5966BFC301A408 = _NONAME_ | V | 0x28B6F4FE19623C5DA440B10504A4404B ; libaacs -0xE61EF41F745C0FD1F6E646BC600244AC0AFC018E = _NONAME_ | V | 0xB8DD8F3A8F56198BBD0027292807B4A0 ; libaacs -0xE9C884CA65974D47409A6F72DF657EB0DF6CEB4E = _NONAME_ | V | 0x3A7B4B44CB5FF853CAB870869216ED2F ; libaacs -0x483BEAC7CE4366EE97604D3EC58BCFBFBB844F55 = _NONAME_ | V | 0xC2BCEB7DEF09C53C3B6845111F1C7B09 ; libaacs -0x8643ACE77204FD40F3E358BE284517DB17F87535 = _NONAME_ | V | 0x5EE60A8265D90673DDBBA99A108F4C8C ; libaacs -0x9347634A51D001EEB9490A01AEF03B7846AA694C = _NONAME_ | V | 0xEAC22915986D689A638857F11C2B7EE2 ; libaacs -0x891695945E021740B7D02CB7323CD78071C7AD37 = _NONAME_ | V | 0xA901C79EA1726695F2AF1E5D87003B10 ; libaacs -0x5EB68B97A68C2E64A1B99BC9B39C7B7355CF5E42 = _NONAME_ | V | 0x98192BDE98388DE3958CE2AE3C211A6F ; libaacs -0xA51425F463F31CA52D37842F8F047BE526E04F43 = _NONAME_ | V | 0x1FEF7479570E882FE67B7AC4CA7F3555 ; libaacs -0x4FAB8178EDE151BE8C14383E647B16EFF7D1F75D = _NONAME_ | V | 0x6D1D7052B431788619C5A76D3779434D ; libaacs -0x326B6911F7ED2F8FA1DD3B87F85B3E6C259183FA = _NONAME_ | V | 0x26B7F51772A8BB59E72F62F6AF3E9475 ; libaacs -0x1E7E2DFA7560D2DDD5027A01AADDF091016492FC = _NONAME_ | V | 0x3F83A8419519DD26E4245B15EC4EBB7F ; libaacs -0x1B48E71CE6C68F5957AAAFDB3C62E249C7BD74D4 = _NONAME_ | V | 0xC597866685F67DEB509A7DCD2C9BA244 ; libaacs -0x3DAE8120BE355327EE954ABA031ADEBE3728D3EC = _NONAME_ | V | 0x98B92D47FE5C965B339DEDD295DC98EE ; libaacs -0x478F625631D2981366CA7FF03964695BF23B36A3 = _NONAME_ | V | 0xE347023DD7D43A49A100175316D9C9D0 ; libaacs -0x7C7F4AB02497D150FDD0C8C020534AD969AFA0BE = _NONAME_ | V | 0x71B3853AA4DA5E4A86FAAABDFC32F082 ; libaacs -0x9837925AFCD3EB4C2539E6B98B52AD223EE7AFEF = _NONAME_ | V | 0xD20B8EBB3515CE4F37233435250CDF44 ; libaacs -0x21094755AD4550A0ACB92188D1734D7063591361 = _NONAME_ | V | 0x6ED4F9E48222402677FE44E18054F1D3 ; libaacs -0x80773D06B349B2ED81B2D23F26941593B7EE31DA = _NONAME_ | V | 0xFB79C758A26E480502C7C6FA53E34FE9 ; libaacs -0x86F0AC016A1A98E6CE850F2B711F0868CF535030 = _NONAME_ | V | 0x9D98A9ED4F266E9EFB05B641527721AF ; libaacs -0x69D6A9F11DA7D9FA9A666868DCD01CA5BF00B961 = _NONAME_ | V | 0x9CBB33699EB26719FB4D5CFC68C1BCB8 ; libaacs -0xD4BC7B7163A5655824F8F0CBDE406BE7185C46CF = _NONAME_ | V | 0x9559D2F1DB90ED7FC30209411161376B ; libaacs -0x8695B892B8E6B0E630A4CC227323F0AB496DBB47 = _NONAME_ | V | 0x508EB38CB7D1665DA5270BA0B5B72FA3 ; libaacs -0x49378731B7CED621324BECCB541699D5B285D149 = _NONAME_ | V | 0x45D840432B29CEAB55A71FBF58D68BB3 ; libaacs -0x8B8A276435A5CB6302EF05C972E9C203A5843F24 = _NONAME_ | V | 0x887E814C07DA44215F72EC8AF0022761 ; libaacs -0xA1E7CC1D4B204BCA60FD1EF93F4B372A21A492C3 = _NONAME_ | V | 0xB882285AF5A9AB468020DF9531E6B623 ; libaacs -0xA86230B78FB9F98D2407C73E20415C0716CCCF25 = _NONAME_ | V | 0xEC99D1E039E313383C552DEE3B12B203 ; libaacs -0xB207FFB20562D03470A677B4F0903047DE99127E = _NONAME_ | V | 0x85679E6BB0E7A16BC64CF55B1E5E26CE ; libaacs -0xE9FFC60B45FEAA3D62A59966FA9C166C8DC5DED7 = _NONAME_ | V | 0xDF43C4C9D3BA34E22F0E4DB48043EF92 ; libaacs -0x154BA7F3D640BBDC5793AE2C07A2577EFBA4E07F = _NONAME_ | V | 0xA55DD19AADD645E8552FD61F3883A272 ; libaacs -0x3C678F081C6DA8A74C012815FAF5FB6A5A91AC49 = _NONAME_ | V | 0xB485A6B0546F107F47BB51AA4B7B7ED1 ; libaacs -0x093169A0E7CEF05252FBB4708B879310FD46C102 = _NONAME_ | V | 0xC205CCAAF652F994885DCE8B8F4C6ABD ; libaacs -0x6995062CD7C4662FD5447EC255AAA78C438A3566 = _NONAME_ | V | 0xCE9BC22C239983397BEC8FAC6CC511C0 ; libaacs -0x4CE03746B96D2EF9016164DBA28696C1A754FE50 = _NONAME_ | V | 0x9773D3AC08844B446483B982D9340D46 ; libaacs -0x6D2220063DE5B678985BC7F9290762C32713C151 = _NONAME_ | V | 0xAEEC9A7C8563D1BB3DA09AD247600333 ; libaacs -0x7DC75EA4F752FCEC45DE4D9AB2DA3A8441AD723A = _NONAME_ | V | 0xB115B5156BE0AD0E96F02B96B68993FF ; libaacs -0xD6DC2F341709BAB793C1E1F6B12D3DA9A94920FA = _NONAME_ | V | 0x36BC4E18E639E6715E6370F73AF42D05 ; libaacs -0x24B5A282665D7BE66F59E8B3E483351D3A057B53 = _NONAME_ | V | 0x105206E6764F79DFF5DED2C308C125B9 ; libaacs -0xC2E2C1404FD3F2CBDE8E82D5D4A680A34C3960A0 = _NONAME_ | V | 0x15827B9720574B6D37A1EB29ECDA9BEC ; libaacs -0xD176B6ABE1EA7D85DB65E1329FF6ABA63D7DDA8E = _NONAME_ | V | 0xC0B30F4BBE3A1F8220542F2435D25525 ; libaacs -0x10254064D6BFAD618DDAE8FF676C1103F0F76316 = _NONAME_ | V | 0x6A98DB6758E7B04D671601521F2F0DAD ; libaacs -0x82BB0E0AEB1D60E8B014B639E40037AB36678CCF = _NONAME_ | V | 0xC6D2825033D9C392B47CBB22DCC6410B ; libaacs -0xB357506AA789EC7F7AD6353EFBD3CE4A40617295 = _NONAME_ | V | 0x2A28D88362251266D4F5C11E14526264 ; libaacs -0xB56539153DCAD53C0A335A40283CBBB69FF645FF = _NONAME_ | V | 0x75CB3AFE89FA083254C1DC47A5F4F79B ; libaacs -0x3153D0184FAC31F3E983937614816C1574218C0E = _NONAME_ | V | 0xAB2CE23C122BE3CA447547D468679ADB ; libaacs -0xD175CC8A9ADC05F94D966F615DF9A38D7D3C1377 = _NONAME_ | V | 0x2A0EB34FD575A0A5B89CB68070C4C05C ; libaacs -0x7EC3D2DBA3FA45BF9538E115A091BCC7940463FF = _NONAME_ | V | 0xE7D1590B39AB0B08E2A387529EDCCA75 ; libaacs -0x3DF0EAA84FE29B3140909B099AFF1E850EA7D697 = _NONAME_ | V | 0x3B9A7B87727AB37BC6176709E53ED374 ; libaacs -0xDD66D01B6F46D9DB84E60F99BBE6D60D94410147 = _NONAME_ | V | 0x30EBBEDF86D8A82409ECC913EF275658 ; libaacs -0xFCDAB765D5EB16E374E963FB7FF29D276EBD71BC = _NONAME_ | V | 0xB838EA73388C8BA71ED87A39A00125B3 ; libaacs -0xE393A5AF428DE58271E0B03893D8D36BAC17FE07 = _NONAME_ | V | 0x3E412539C7FF35CBD509D6C7C2F341FE ; libaacs -0xE8B7797C2F16C3CE1CF6DDA9F6CBD3E4045C3749 = _NONAME_ | V | 0x8DBFF38E9127B10E1E58290C33F09022 ; libaacs -0x50EAE9A8B400889CA4DE4E2BCF5076A57AAA44F1 = _NONAME_ | V | 0x5F369126EB177F01AB6F5E146562FCE7 ; libaacs -0x09721FE4D6F1AE0EC10ADF720738E7D3FA3DFBE6 = _NONAME_ | V | 0x9F0B5DEFB0592B7FA98A50F5593C819A ; libaacs -0x4163AF8C12D5B89DE08EEF7208AF4246435F1EE9 = _NONAME_ | V | 0x77751E096700E4EAE4C8E0A6F5577134 ; libaacs -0x05A09C3EB8B904D9A36923411B44A56B72B6013B = _NONAME_ | V | 0x3372CF189F520904AA518DAA97E3C76F ; libaacs -0x1A08C68F230D4EEB11A304DD8445006203F7F6C8 = _NONAME_ | V | 0xAA04BF3CFA6A3B0E50F2856671ECA733 ; libaacs -0x2492A7F07FDA71E2395AF25516F560533CA3AC0A = _NONAME_ | V | 0x6D5610844FFE85F78E9351E5E660A3C5 ; libaacs -0x6D41DFA53A32483EE3E3C1FD12CCE7F8221FBC4F = _NONAME_ | V | 0x03479D9CB49DE2B23C374B92F014413F ; libaacs -0x6EE9A09A99E8641C5E86B09A32E105B03E6EBB29 = _NONAME_ | V | 0x7441C9818753D5EE638E4CD3689079BA ; libaacs -0x78B16A84EF09FA518C35E9C8F59681766E69515B = _NONAME_ | V | 0x9D5112B2CADFCBD31551EF9FD1806CD3 ; libaacs -0x79AD0AFAF9840EAFD7F10B4B24D086ED321E4E30 = _NONAME_ | V | 0x22904AF558AB8D1148B8F6F2E1F30871 ; libaacs -0xF7E3A20543866F19AC5577863F40F3988DF476DC = _NONAME_ | V | 0x80B394ED024C0D5F50FF1B5678493E90 ; libaacs -0xC478943F5FFDBFF45A776086FFCA6A964568084B = _NONAME_ | V | 0x5C110EA6353827119E4378666DACD334 ; libaacs -0xA0F6B2E10F0428A16745E5D614616100D7FBBD1C = _NONAME_ | V | 0xA4D33D677715847AF7A6E95A3A36B8AB ; libaacs -0xF79A3FF4FEEA7BFEEF1F879B93672A5B14A9E325 = _NONAME_ | V | 0x3D28A533A5FAB412457F6ECA7BC07475 ; libaacs -0x2CABC8159399CCC38DB9B6D9E2CC3209FA2FD6EF = _NONAME_ | V | 0xB17D9DC58AD8787D98FB94B2AB45EE1B ; libaacs -0xBBE0C43F47CD4429EAC472D3B3313F74374D9796 = _NONAME_ | V | 0x318756F260B779EE04B02C18EC7F28ED ; libaacs -0x532A02854938258B1FABD1CC947C2D7CF5FB8EC5 = _NONAME_ | V | 0xCE72C573C0BA3970F657BE1CF86FF2B6 ; libaacs -0xE748BA9E672A6C77EF589A46DED6A1B46E1B7BA3 = _NONAME_ | V | 0xAF0D121C91A941676D2F0AA174B7C989 ; libaacs -0x7C2C7A23A517ECCAF2F7F8CEBD49756D32FA73FE = _NONAME_ | V | 0xADA4F7118995E466F8E0341387F9F1EC ; libaacs -0x876ADD0592AF9ACBE3481334AAE505E4031A95D1 = _NONAME_ | V | 0xBBDC49AAE031F3E62D458639F9B673C6 ; libaacs -0x7B12BA775A559976FBFCEB38DC0DCCC8D0A54978 = _NONAME_ | V | 0x741D8CC5F227BE820003B158580A9CA7 ; libaacs -0xE985B59135C5B598F74F0D48F9175B20F0CA56FE = _NONAME_ | V | 0x8094767BEF065F84C5936AA2B47436A7 ; libaacs -0x89F198C2788668D0360D59DBA2B9D7088D3281A9 = _NONAME_ | V | 0x742008BFDFECFACAB715341EB19E7DA8 ; libaacs -0x490F564F6CF1F77EF72FFFB098AE60DFBACB7068 = _NONAME_ | V | 0x21D1F8696D5D25550790D0FFD2A42E2B ; libaacs -0x88019C53CA332F89CE6A54BFFACB85F2A0AADEB1 = _NONAME_ | V | 0x31E2072E493C8EBE02866600A0D8AE7A ; libaacs -0x6EB0E60E62A454EDE87D12216148F937D6EF1712 = _NONAME_ | V | 0xC718664F4DF80715C71CE502EA425031 ; libaacs -0x229AA2A3AD0E79800AC2B715ABFFEDE6E8EF7A08 = _NONAME_ | V | 0x826A09FFDE46739A29D0C85C1442B7F9 ; libaacs -0x40BE8D6FCE19192DF04965DF40B90DA7CD78EFEB = _NONAME_ | V | 0x3320B3F97C18013E9F004AF9C95E254E ; libaacs -0x51FA59931E710EC39D980AC099CA126832296720 = _NONAME_ | V | 0xB0656F8EB17DD258D251A852F86CBCC7 ; libaacs -0xD2BBC5DC7505281742005F58BD1574BA9233F1BD = _NONAME_ | V | 0xB55AD309F755D62E84206D0BC9CD9EE7 ; libaacs -0x8482913ABA89BFC8E47FC5A9B99A5F64E77D4477 = _NONAME_ | V | 0x731EA1C3A92D8BB187E40286B849F77B ; libaacs -0xC65553F261560727AC8E153A8D6212C6F319F514 = _NONAME_ | V | 0x93DDA7C00E2CB497AF4F8830DE0187C1 ; libaacs -0xFB16C8E920D9CE508BBBE0586E4A54571704C1E4 = _NONAME_ | V | 0xE49B280532958D5F182F89704EFE1DE9 ; libaacs -0x28882D06DCED1EE75889D243095C7256C8FFABF6 = _NONAME_ | V | 0x2D25ACE9F6F5F0096400C816EF0A130E ; libaacs -0x14298C09EF5CB4CA8B216289CA2EAC2299B6385D = _NONAME_ | V | 0x20C76FB1114C31374DA3E1EF8BD12A75 ; libaacs -0x5DB5BB8F7FAED2CA884EC3BBC124BEDA54BF97EF = _NONAME_ | V | 0x06AB51BD0741D56804DAA3FF7AF60E0C ; libaacs -0xAA180AE771DE4DAFF81F46FF658035F8E97CF6AE = _NONAME_ | V | 0xF320CB8AA4E6140C7419A853D967C8ED ; libaacs -0x68AC5EEEFF5A931E9ABE6E34810355BEDDCAE01B = _NONAME_ | V | 0x3B5ACCC9C9AB70C8A7984DFD632F6CAD ; libaacs -0x2EA133C0093758D2B36817FFDF663105DEFFC2DF = _NONAME_ | V | 0x740DA2BAA7291D2C025F7120EB7CABF6 ; libaacs -0x9795EA1EFA94D6EE61141C9795618532E6EE2481 = _NONAME_ | V | 0x435262CBAB4A2E013FCEA9D2B4FB641F ; libaacs -0x778F1805FCDDB6783CF143C423EB6BC8EE468246 = _NONAME_ | V | 0x48FE6B2EBA09727A29ABE983498DC9B2 ; libaacs -0x1819631103DA4F20A58235F61923F88D576E184D = _NONAME_ | V | 0x7800D42E3C252BCDBA3A33AB5351D7DD ; libaacs -0x62F259895E0713C45997C26ECF3C80C12DF13333 = _NONAME_ | V | 0xD17495B32980450B6455761FA8987C5A ; libaacs -0x666C54A3261F6071C84BE371186A0DD3438A9F45 = _NONAME_ | V | 0x1EC0301028912155485822D237281508 ; libaacs -0x53C6CC21E0A49E0AB384AC5EAFB573D51BA97D10 = _NONAME_ | V | 0x484E504AFD9FDB767E9FB650771373B2 ; libaacs -0xD537E4FB6C33314A2F15181AB1954D2F68D7168D = _NONAME_ | V | 0xE01753808C978EB85672BBEE8EB76597 ; libaacs -0x457D7021D4D0E2558B364FA2D254A9DAA9901020 = _NONAME_ | V | 0x2D9ACF449854C1F6919A8E5CD41C677C ; libaacs -0xE46F5EB81633BBEADB3237AE2CC668996C33906C = _NONAME_ | V | 0x18B0369B3DA4998F2A811F5C8DD78496 ; libaacs -0xF6BA2E8E49DF7DA7002C926F1DA47C600CD8FB7D = _NONAME_ | V | 0xCC4BD06886E0FAEFABA1F72D73F04D9D ; libaacs -0x876B334671641C6CB45E36465F557E29EF6BB7EB = _NONAME_ | V | 0x87081383F8B59D596F760ED7CB37F971 ; libaacs -0x06733D7486C454D695EAB6B600C4A496C8C29710 = _NONAME_ | V | 0x1EF5868473F437C749AF6CF023C91994 ; libaacs -0x73B95A0888EA33EE45A37B21391227A9C1937A6E = _NONAME_ | V | 0xA7024290A824D490952A75F001C145CF ; libaacs -0x9518CFB01895E7EBCB8AC7299B4D4A500A17BDA4 = _NONAME_ | V | 0x6BA3C054AD85C44626D95370A813CDC0 ; libaacs -0x80120F5B4D0CE830963DE50205E4EEDDBBC8F9DB = _NONAME_ | V | 0x09E54D887EC4E26688AFE0ECC71F0664 ; libaacs -0x6FE799A5BD16014E5EF61C1D77ADEA168E168C1A = _NONAME_ | V | 0xB87F98B4D1C95A83D7C3CFE404690DA2 ; libaacs -0xCC78C3EF6944E5A71ABD8DDEFA9A395104BFA3BD = _NONAME_ | V | 0x8983D9A8FAE82B0F40602F7623D5EEF0 ; libaacs -0xD1F8A46B6419CBA7A83BCF161380FAD16939897C = _NONAME_ | V | 0xA8BBE3123A2949AD1D8563F9C786D5BE ; libaacs -0x95F1154B37169BEE71F56AF8AA30B1DD9C1454FF = _NONAME_ | V | 0x3364875B875FAEA3C69A9D879FDA33C2 ; libaacs -0x3BA2453E27754EB666C2C1ACF323FD5CC60F8DFC = _NONAME_ | V | 0xEA141C9D511776DD16F6381B62353291 ; libaacs -0x6004020BE0FAA4CD34517432358EE282A7461553 = _NONAME_ | V | 0xD89C86062D56BDE167B7C35F9D1AA995 ; libaacs -0xD155F1B1AAE47E932FACD7A7C24F65F6FEA3F401 = _NONAME_ | V | 0x946C4531E67AA68138789E3B388FD0A2 ; libaacs -0x48C55DD2C7CB958D22030CBEDA42FA824B9CEE57 = _NONAME_ | V | 0xB07AB3377B95A9D5F7ABF3DB7C192301 ; libaacs -0xF54AC4BA7F06BEBFCD34ED867D1E7A047D06B8AA = _NONAME_ | V | 0xE764529CB54D5730D5581C9AD2406FDD ; libaacs -0x4867FAF8CDDE6E821D6758F20372CFD018391995 = _NONAME_ | V | 0x005411EB109E6FADAAA3F6CAA5656438 ; libaacs -0x6E679569340F9B491B478FF5795328D29B244770 = _NONAME_ | V | 0xF3260171E2D169C6E200F37FD285E5F5 ; libaacs -0x4594DC81A48B8EE204949D520BFE38A7A3EB8F82 = _NONAME_ | V | 0xD400164964C9C84CE0FFE819E1D0D0A9 ; libaacs -0x002AE2752C7A6FAE24B94EF3EB29721E2C9C08E6 = _NONAME_ | V | 0xFC0E7878835003B0D354D1CF7B81DE33 ; libaacs -0xA518AED2FAFEABC097198AA10CA298A76303FC91 = _NONAME_ | V | 0xD95AFDF1797DB30400766180E204DFB5 ; libaacs -0xB87753CC3094178DA509B55008E1DA05E1F21080 = _NONAME_ | V | 0xB935A940B1EA61F742CCA8CD8F35B8E9 ; libaacs -0x0E008F834C9882F9A862EBB4B35AEE0ED50D5027 = _NONAME_ | V | 0xF68E0FA87DCA82C0947B41727EF52105 ; libaacs -0x6CF73C7A8B235CAE37BE7DDAE9722AC28F68D518 = _NONAME_ | V | 0xBE0ADBF47F0175B5031250B1D0CABE28 ; libaacs -0xAECCD62C3C4DEAD37DB413325C25FBC949C913A0 = _NONAME_ | V | 0xC62D1F6254E32F935126D046F987835A ; libaacs -0xE0172389C97619709B166B3973B3A05F1CFCEB98 = _NONAME_ | V | 0x93C6B2E01665258F5D6BC4AB3D38C019 ; libaacs -0x329BBD2E5B89D327FD81B359FB730E1584B31CA5 = _NONAME_ | V | 0xDDC9A5730A1C931CB6422647E43E732F ; libaacs -0x1F899C83A9C9CF77ABC40059EACC1AFF491697C0 = _NONAME_ | V | 0x21EC0B98AD03DD560276DBC91660117C ; libaacs -0x2631B5B04B8AC0161A7F4D6473A2709C840024BD = _NONAME_ | V | 0x64C2615AA15E4BAB1FB65217088266AD ; libaacs -0xFA1FCE08691AD767E15ECD29191EF004CE1580A9 = _NONAME_ | V | 0x695CF594B6E984183CCB0975A308B87F ; libaacs -0x6FAA323524AEE07C60FD42C49D818515C4E588E5 = _NONAME_ | V | 0xDDB0696A29D4EA9EE044D04C80D71EEC ; libaacs -0xED3C923AAB8A36D846604E2AD37FC6ABC91248A0 = _NONAME_ | V | 0x59066F215D734BF3E5F837A940DFABAD ; libaacs -0xA41E5CB39F1375EFC9DC9F33BB7B9C85D09547C2 = _NONAME_ | V | 0x1AAD29FD02E9136B887D052823B92A1A ; libaacs -0xC5A8EE5AAB4B11D073B748F6743394B0CCA9785B = _NONAME_ | V | 0x96091BA949774B6490E833EF2D7E46DD ; libaacs -0xDB9BF8D7623CB1B5CE8FD93BAF98E11C6790D54B = _NONAME_ | V | 0xC61F6AE05235A3C252089BFC4DB8CF4E ; libaacs -0x280AED30C28ABCBBC027EF1C745944552EE713E4 = _NONAME_ | V | 0x8EA27E14FE061344B218DC7CA7EA605B ; libaacs -0x3FFE874DC68B1C1C29D8CC1E593A9C191C89A723 = _NONAME_ | V | 0x5E12A1AA3BD131E79A608B4BDB26170C ; libaacs -0x553EFCCAD79AB9E6E814D28EFB888A80353BF49F = _NONAME_ | V | 0x4273A71EBA71E52A1819AA0EE1A52339 ; libaacs -0x6C974A91402538FFB8159963358684851F31B87A = _NONAME_ | V | 0xE1599B9DC9D2A1A432CB78A4AF66A6A2 ; libaacs -0x820BC8071F1BF324DEDDB97C0F26394E3DCC2ADE = _NONAME_ | V | 0x6232B45F544FA85525944DE1558DB952 ; libaacs -0x940CF48F5EA1246DC4D8539D2DCA7C8FB220E9E0 = _NONAME_ | V | 0xB9AB630CC45E55FF23C9270654439D16 ; libaacs -0xB1CE7C98B21A5C97A9FC7580B84DB7B193FF1C4A = _NONAME_ | V | 0x8C47B78D8F11207CF1C654CD9ABB56A1 ; libaacs -0x1B4B945D2417C2C07F724B3872EDB7B5D7EDF32A = _NONAME_ | V | 0x2C0379E52695730DCF029C0D22CA245E ; libaacs -0xADA9C8063DD89F8577CE921199E2C9140284B486 = _NONAME_ | V | 0xFB9B1816407D9DC38E3ECB4535ACABBC ; libaacs -0x461FD006BE55D32A81A2C4E61694DE07EB5071D8 = _NONAME_ | V | 0x82D00B9D81D44B175E859712A9B37CEB ; libaacs -0xD8E9D6E6AB260E3E7D631F673B2BD848C478D06C = _NONAME_ | V | 0xA442D32FFBC249E956CBAE5399C9E363 ; libaacs -0x8E6D8D776B014510820CBE8A2E073FEC2B182168 = _NONAME_ | V | 0xF588404B72CE0A7AF99F7AA050301F55 ; libaacs -0x870E313570776B8C6DD15A9F27A6E80D68BA8324 = _NONAME_ | V | 0x4AD079A3504366F9AB2893C11895DAB4 ; libaacs -0x8EC880B3AEC956F6FA55046798E1B2AF25286203 = _NONAME_ | V | 0x87ADAF4984CBE3755CEA461B7CA58A65 ; libaacs -0xBA1D9B7F363F8270870AFBD229A313A365FD035B = _NONAME_ | V | 0x55C1FE000B3CBC4F59EF92E961E6B302 ; libaacs -0xEB5F4524D279BC8E18C46D013CEC8C25AE8B73B8 = _NONAME_ | V | 0xF8A09DADB2A62AE32E023703A3AE511D ; libaacs -0x9A65C23A2AFFD663190957AE5E34C6014417724C = _NONAME_ | V | 0xB43F10AD56B91CD6C0B144D326E3AB7D ; libaacs -0x5115AF4E5FA7774FFDD31BB6AAAB73F1ADDA2176 = _NONAME_ | V | 0x32D34FBF0B9C1E7831A86DA3547C5BF8 ; libaacs -0x564BA4985CD3D5AEE322148BA826C15BD6E5700A = _NONAME_ | V | 0x1648007E774F55EA4286741D93632FEE ; libaacs -0x98A30203914C08B249F4F37031AFE0C8131D775F = _NONAME_ | V | 0xAF307657C0BAB2ADFF2987C0615E0ABD ; libaacs -0x043C56F2A69659C624E83FF18988C53079EE3E9F = _NONAME_ | V | 0xC54DC616D894C9330A3EFDD933244C30 ; libaacs -0x87888DAB6868E95AA361BC04F025715A392B714D = _NONAME_ | V | 0xC046335D0F4A036FECD8B3400E674795 ; libaacs -0xED2A33E7534CFBDD8C13189A074E2B45F132E176 = _NONAME_ | V | 0x4D2B41209FC4AA03ECFD94172EEDF8A7 ; libaacs -0x300FA16FF5F3E09D1EF1E38938ACBEADA700BAC5 = _NONAME_ | V | 0xEF89D59676140C5564E7C1D09C3A8FAC ; libaacs -0x5CBF84CA4C91C2BB2FBB23E1E95CDB675DEA75EB = _NONAME_ | V | 0xDD96A95F177465413CFACBD9F446F6BE ; libaacs -0x4CE2074D3F7E12CA635C4042370C1AF33E880E6C = _NONAME_ | V | 0x0C6D9C42ED7FAA72F5B3F57E9D367CED ; libaacs -0x525876B784F5D5A0217131641CEC1B8EE04C1F3C = _NONAME_ | V | 0x57FF07BBE04729E20688A1CE1550B40A ; libaacs -0x6F220A342B70A5C64DD2FD387D80E57CA5909029 = _NONAME_ | V | 0x4D0B8BA38968A654CC15BF914424979C ; libaacs -0x71D6ED4151B6B55C05C4C20435CCF276EE360B1E = _NONAME_ | V | 0xDA1062E56E98DBF88161BC18D027AC00 ; libaacs -0x73B442E698E7841931E57ED3254E3EA232DFEB2E = _NONAME_ | V | 0x4845CB97777561C4FF173B32CEF17E0B ; libaacs -0x88CC42F316E561A63C8E37F31EC83AC8502B18BE = _NONAME_ | V | 0x8F7956AA8FD46CE2D7B5836E917BFE19 ; libaacs -0x93D5251A73699913E414FE7C4FC10C5C8571DB57 = _NONAME_ | V | 0xE7CBCE2B02B7ADEE423661157CB47660 ; libaacs -0xA0E1B024FBE654F7E018AE14037DD651BB975B10 = _NONAME_ | V | 0x9734544A740BF1C4456E55A3C8834F7C ; libaacs -0xA58473327AE656215145230EC777256D07DE9E67 = _NONAME_ | V | 0xC0304B17495D6F0615A1F26DAAFC04FD ; libaacs -0xB085CADD5FE501D5E7732B6C7B6592833487B4AD = _NONAME_ | V | 0x53E6DA9D4C56FDD649340E8BDB6A833A ; libaacs -0xC1BDF274181D57E04548ADA7E856EF3B15E135A6 = _NONAME_ | V | 0xF664613AA74562E43FC6B636A75F10E6 ; libaacs -0x70DA3A2555FE7B770FA23CCC23A60A2397BAB2EF = _NONAME_ | V | 0x560F577A27AC158CD058C2E50E4CFB1E ; libaacs -0x1A7B8C216C59890FAA67D755C600F50953E26106 = _NONAME_ | V | 0xACB40EEFCDB6CD7DE4AEDBFBE90032C7 ; libaacs -0x3F68F77F93225BACE497715317708AED832825C4 = _NONAME_ | V | 0x26D40BF99BD4092B918EA5BE034188B4 ; libaacs -0x2CB3895FCAFB4E4013D9CE5884B4C6A9B79B955A = _NONAME_ | V | 0x3AED6673DF6280ACE8221328E981DC6D ; libaacs -0x796861092E17D3AD5E578A5483C97B63E4BAE64D = _NONAME_ | V | 0x47F863CC1AB58826763C4D5BA057FDF1 ; libaacs -0xF79EB16374BE025A00937A0C332DB8C83CDAB54F = _NONAME_ | V | 0xC5809FBF4EA85DAA27D06E5F5FE5EAD7 ; libaacs -0xFD1CB2DE2B448E29682443E2784D79A106DF7FE0 = _NONAME_ | V | 0x07A5848D8ACA0A1FFE9F1D7F14BC3F11 ; libaacs -0xC8DCC65E6E8D4F9B7606FB0914B378C4376B99BC = _NONAME_ | V | 0x574494A285D5F100AFB39A9A003E272A ; libaacs -0x80FD55CDB5B69DF842C34918DF2837A62F3D3F50 = _NONAME_ | V | 0xAD62F330C339EE5A5D1B8C12B927D8B7 ; libaacs -0x2AB646A06A92C63A5AC6B7E517E0B7489547F54C = _NONAME_ | V | 0x3DE7BA296FBCF09A6C958562CC1BE6FF ; libaacs -0xDE1B3E67A1611209476C71728C35D93F22A68DDC = _NONAME_ | V | 0xAE434C58A659BA9ECF2A2D611A14318A ; libaacs -0xC9FAE9FC1F21DED9EDDC1C3689E47B3687BDFBA8 = _NONAME_ | V | 0x6A4333F95E8ED7FB9AA27CF638380231 ; libaacs -0xDA0C88C64215108F23B933E15291543E3CE03392 = _NONAME_ | V | 0x113E64B473831D081C30D19E4ACDF2B9 ; libaacs -0x3233675ED4C8EF0B7B358750F45C32534596E2E1 = _NONAME_ | V | 0xC30C08D67FD4698A57A7DAB3E58C574F ; libaacs -0x5CBD787FEBF183549CEB125FDE3DD603C567F246 = _NONAME_ | V | 0xCE5448D5092412BEE3B7CB205A6B14B9 ; libaacs -0x0610B1680B2905C1C627C6BDDE0313F791BBEDF9 = _NONAME_ | V | 0x43D6EE89F37F47FF81B3FE8227DC80B7 ; libaacs -0x0CBBC05AF1B257EF92892AD10F40E196B9E96E36 = _NONAME_ | V | 0x9053FD92CF57147A2EE9AA2F361881B3 ; libaacs -0x955B4E2F60BE261196EFAD8CBA9AAC20ADE84386 = _NONAME_ | V | 0x684F9BBC276441A25E4C0B44F07E216A ; libaacs -0x4248E2D0058E5F6FACA682D2F5E8593D6492B897 = _NONAME_ | V | 0xDC046FC5C659FC087D0CF0D7E0B2D7FC ; libaacs -0x5199349CD219B673B7CE4C65DD35A45C5A38C288 = _NONAME_ | V | 0x9EF0CA0E5F8B12C51A81BFA1124C9749 ; libaacs -0xAA96891BA8605D9D6472A7064A849D4B0472794A = _NONAME_ | V | 0x904FB02C3ECD1369688F324CD999F0D4 ; libaacs -0xC6E7777599C2E29A7FB5FFAB04A871D8422FABB1 = _NONAME_ | V | 0xA76B559A89EAB5855C2EF200F6FE27D9 ; libaacs -0x277057A2A940E1DC2E0BDA4048B7DF9B0FAFF5FB = _NONAME_ | V | 0xCAF407452C934DC39A89F5E38EA4A1C5 ; libaacs -0xBDAEE8A34F1A3892BEB804D600B67E2533429758 = _NONAME_ | V | 0x7EF513FF2F9908CA42CBA2EBA39987B3 ; libaacs -0x99E992522C13E7C3CBCD724AB561287BDCE783FC = _NONAME_ | V | 0x8B07D1100260DE510F5F358FD796A047 ; libaacs -0x5CF458ADADBD24493179844BEF2D48391072A666 = _NONAME_ | V | 0x46FB95B792D9949970FAD50502E119E6 ; libaacs -0xB66F5B817380878D4C4988B763B9C1D796228CFF = _NONAME_ | V | 0x430BA8D533CC6611F54073068AD4D659 ; libaacs -0x79F0264BA7913B05C8C1BE6CB30F3DD5AE5F0997 = _NONAME_ | V | 0xCE5FE49051FAAF22A9B861E4FF22C433 ; libaacs -0xD9AC7D9F0A126EC08BF5448DD7E6565B10C80E86 = _NONAME_ | V | 0xE214A4291C68EA083C817E8B92257551 ; libaacs -0x6A65B87F8644809889D67AE30190BA82C7A4E540 = _NONAME_ | V | 0x64A9C7C0DE21500A3C8EC54DF73AFFAB ; libaacs -0x73D37E616B82C1D3FE2F1B3014F219ADF29B0FC5 = _NONAME_ | V | 0x182C622D98CED05D54D5297D9FB15C70 ; libaacs -0xEA0ABFB32A246375C9A96571E83055A4333B1213 = _NONAME_ | V | 0xE72BE17B70CA2F1BB43F7948158D02F6 ; libaacs -0x771F7B6535AF4504C03793D99D64E6E7323B0CBF = _NONAME_ | V | 0xAB067FD6C695C95E205F88DEEA31E239 ; libaacs -0x592C75B950F51E663474F245D6742DA6B2749EA2 = _NONAME_ | V | 0x4647EDF11886E1106A13EC6C08E907E3 ; libaacs -0xB6971D4EAA90170108C633076BA971483908FB3B = _NONAME_ | V | 0x3DE793B03EB038B4FD0DEB0A8E3EC512 ; libaacs -0x6270E6B352B7999924B7327D77EC9EE308684CF7 = _NONAME_ | V | 0x07C8BF5D2E5E8E832B645990B5CC46EC ; libaacs -0x46D4EEAE3FCC6A4263339772AB7D752D1A2A95B5 = _NONAME_ | V | 0x6EF6B2F30D0F1FF864E878C86094147E ; libaacs -0x550C14124E8EDB92F56B41A4152FB2BB83268F96 = _NONAME_ | V | 0x3B6AB7864C5ECDBF1B13966C2523A9D8 ; libaacs -0xEA0FBFFFFF1F0444F40D54422F33128C4E2FFE69 = _NONAME_ | V | 0xD0F230690448E4B4AE6F6746EE0DB597 ; libaacs -0x1EBF44E680B64F029F66DE7D28FE454D36829C3D = _NONAME_ | V | 0x54186946B45318B1E98337C488E6704A ; libaacs -0x8BF1444DF332CA64A843042B24DFACDADC23FCEE = _NONAME_ | V | 0x4D01A4FD250CB97AD56ED64A95D5327E ; libaacs -0xF5DC5B6FDA6092A9D66E541EDF763136914679C2 = _NONAME_ | V | 0x276F16D405503CC95C268660B847F2AF ; libaacs -0x33F4F99F0929D363A6440FEF4530E9A95340782A = _NONAME_ | V | 0xC6152F42A2808F3F07A76A56F398B591 ; libaacs -0xADDDBE36AD013D53EAD5ECBE5A6271F2E4C5DACD = _NONAME_ | V | 0x9E80315C97F4427298F3E1D0BF6DFAD4 ; libaacs -0x8FE02D6CB5830B2844C7EBEB9D590BCE5884C9BD = _NONAME_ | V | 0xC1FEA3BB3B628803CCD05528D26621BD ; libaacs -0xB56925BA07449B82CFAB5BBB1290AC1AD01D7587 = _NONAME_ | V | 0x56CCA070C6B47D39F2643F453B275252 ; libaacs -0xDFC5A87936B2F6EF4CE5666E9FDBF3BE252E97BF = _NONAME_ | V | 0x41A6F84B4627961E1FC0AD93BF779385 ; libaacs -0x0A86DFC48E4B2CF83BC2BA900C2678DEBB443D78 = _NONAME_ | V | 0x9B244981D0A2E1ED0E027AC948D0CA9D ; libaacs -0xC8FB405ED7E49234BA157DF8B8325F35C721F63B = _NONAME_ | V | 0x41B7DBC7B75CB2EFBEEF0E7138806F3E ; libaacs -0xE1DBFB62EBCF4E3CA4F971426127B64AA8263DD5 = _NONAME_ | V | 0xD1685C7BB446B6B785B8E8CFD6D28924 ; libaacs -0xE2D385454223DA635E0AFBB1DAB688970B3EE502 = _NONAME_ | V | 0x89266F860E65810677ACD0E1E28983DF ; libaacs -0xB982273F3B00F3802C3F7672E55A40A04E088851 = _NONAME_ | V | 0x36E98F31F7AD4F99E18113922BB33807 ; libaacs -0xF31046023912063D169A62F1B91FEE4930780D4D = _NONAME_ | V | 0x9A834A81BEAD0DA57B87EF0732B3C13A ; libaacs -0x0D00D75108455D41D69A739847B799E4BF11947C = _NONAME_ | V | 0xCE7FF35ED20BDF65EB0D804BD38BC710 ; libaacs -0xE6CE831E062DCF16C56690623DEF8B2054AAC6AE = _NONAME_ | V | 0xCBCF3D85C78BFB688586CAA0D4FEA0E3 ; libaacs -0xDDEC54D672E5E3123EBD0261F08146213214AF33 = _NONAME_ | V | 0xFA894201432A91012A01FEE08E08BA77 ; libaacs -0x52F94FC69E4C07C488A7B825E9D6AC8D793D7DAF = _NONAME_ | V | 0x87646818569A8F25B663F57BCF548C53 ; libaacs -0x46907764259834BD279072D8BA5C3E300BA14EB9 = _NONAME_ | V | 0xF69DE800B059C5EF41C6E5C87DFCB2D5 ; libaacs -0x3C46D4F40EE52203E2DF00AF75996A3DB97EA0CD = _NONAME_ | V | 0xF7C6734C9E4C3AB870C5DE80792190D1 ; libaacs -0x5F939F9BB4E19730120D2262FE7ABA5DE6A1EC94 = _NONAME_ | V | 0x23D70624F5CE4AF7E4498E0C061B3A9A ; libaacs -0x0D9B9AD1C5DF3E11DC8B7258347EC9949693918F = _NONAME_ | V | 0xF322A297F2DC2810C7D2BA90904F000B ; libaacs -0x511D8EFE7088CDF9CC199249593565B5EBD81DDD = _NONAME_ | V | 0x936EDE838B660BF751A35D84D8628F9F ; libaacs -0xF0FF001E403B6984E06DA64D41787E78B4C4A322 = _NONAME_ | V | 0x251B1D78988321E5F2725B51183DABE8 ; libaacs -0xFE3C160C4608D2D7380EE421DD39191E7A12B777 = _NONAME_ | V | 0xFFDAF5B2EC794AD6CC5F71C79F90161B ; libaacs -0x27672A75EF70C59C105B6F62C63BD3765083463C = _NONAME_ | V | 0x3827EEF1962C63A2793293D5DD0D6A99 ; libaacs -0x1BCF54509DDB5F7C65EB8F557751900169E42109 = _NONAME_ | V | 0xD55D8092436BD09A499F4B60494072EF ; libaacs -0x70B5DE3EBFAA591ABC4B6C04F7679FE700D79FCA = _NONAME_ | V | 0x09C48997E182E0796FDE8C3EF50E781C ; libaacs -0x86BB12B4992F90A24A2B9EB71D06A7063B2A649E = _NONAME_ | V | 0xC55E0E73E1F637A4A769FF5125AD5CF2 ; libaacs -0xAAC7BBE08F94B619CC87049AFF700A9ADA98764A = _NONAME_ | V | 0xF6603837857BB8779044CD1B614400E4 ; libaacs -0x47A6D1BC47C677CD0D2FA33D60E2F6AA1E9FA217 = _NONAME_ | V | 0x7E4C61C9945323DFCA5BC155272A1244 ; libaacs -0x1C6B188CB2C6E4127134B14BE71F236BBEEC07DE = _NONAME_ | V | 0x4297E8DD991FB7E43342E143B460E0DB ; libaacs -0x32050A23A37D2EBEAF83FD8B0EE4573342AD0D79 = _NONAME_ | V | 0x1D53F0066A3C4F0D4C2C9126BABA64D8 ; libaacs -0xF74479DEF0401CA00A73A99927F6B60B93BBFAA9 = _NONAME_ | V | 0xBB30FBD98190D7BCEA87547210F922AD ; libaacs -0xEE73F39C607698EDE862E33A5926E0A121619A16 = _NONAME_ | V | 0x97D953EE1978EC29F96275BE22C5F552 ; libaacs -0xC121A978A177C7AAB78CD72A79AF71CA02E84F2F = _NONAME_ | V | 0x07F408C2A581AF66FC13D22E68AFC9E3 ; libaacs -0x4A502A717F888FC060DCA0B3A8C8C2AB91F4A38F = _NONAME_ | V | 0xDFF1C3948C112D4DCB613546068F9987 ; libaacs -0x89ADC732C23708078269ABFC74A112257E9F7FDC = _NONAME_ | V | 0x42E3A12B14D5C01A1D23E632DEEFB18E ; libaacs -0xB6B6CF9AE847975220C62F82F41786DEA881B238 = _NONAME_ | V | 0x5585A358FA697DE941A01081F3DD1969 ; libaacs -0x5A98B6C88DD5BCE5BEED85AEE319FCD6BACAB52E = _NONAME_ | V | 0xE07A501CB773DBEAE44BDF7B54F106A0 ; libaacs -0x30BA6A01F6F1818716935B96A2B680FCE2DF68C9 = _NONAME_ | V | 0x5AB36FE660C26BE17AF5716BA147DA65 ; libaacs -0x49AB6315C74B08EC9C0A734AAD4A0345ED7BC540 = _NONAME_ | V | 0x18478BF32319E9745F0056DC102B1DE6 ; libaacs -0xEC2D97D514D36101C4BBC88C2CC7CA05088B0E7C = _NONAME_ | V | 0x30D09CDD495DBF3E276A1D14109903BC ; libaacs -0x3724E904AA350006ED3E65D217DAD57D855C02E1 = _NONAME_ | V | 0x2AADDDB70917FF61360DD1092DC2AC2E ; libaacs -0x70E866B98E6A531508726C4BAF6F35DA861B4E13 = _NONAME_ | V | 0xC25A0DF59F529D7686407411D790814E ; libaacs -0x851505F8A90F865F5B099F76F06387E76DCBF13E = _NONAME_ | V | 0x05A5A89B87B190CEB77CB78430EE2D10 ; libaacs -0x8B22A91F592108FB38DD0CA14CB9EEA8CF34C3E5 = _NONAME_ | V | 0x5ECD12604B0D69BAFE858595E537557E ; libaacs -0xC4C2298C7BA8956D4FC65114859ABDBAD39FA090 = _NONAME_ | V | 0xFB21011C94FF4EE85CF69D224211D327 ; libaacs -0xE8CEBEC4F8BF0DAEDBDFB848B0D59743FD59797F = _NONAME_ | V | 0x393CBABF1F965B255E40A78DB52CFC4A ; libaacs -0x1E9DBAEFD72E4DF5B9A97280AD2A7F2CD9A19912 = _NONAME_ | V | 0xF3875CE3BE92D027A3D931876C54EBE0 ; libaacs -0x2D13BDDE940E5A34A8A7C0D60AEAD850D61208B9 = _NONAME_ | V | 0x2FE3721D70322E32E065857377D2AC8B ; libaacs -0x2F24596860A79121CAA14BDAA17B4ED82D2DE510 = _NONAME_ | V | 0x21E4A08FBAF0161EC2FD0B05C51390B4 ; libaacs -0x4A9F51B549632774A998E188143094D424C93532 = _NONAME_ | V | 0x2AD2E42E2737809A16A6867BE9DB18F4 ; libaacs -0x7BCC2F6AA5E02F219126747C84A5D8C4D14B1D40 = _NONAME_ | V | 0xDD57BC4900643778B2DA2E493237B4CB ; libaacs -0x11F521BFCD131D91459F7BEA63D771E4AE30E487 = _NONAME_ | V | 0x08773C722D416CBD5AC08164FAF71BDC ; libaacs -0xEA1357BCB48F40B3C01FEF6B5C1E68CD9B6BC1CA = _NONAME_ | V | 0xFFC8FC815375415F8A12FE661758E7C1 ; libaacs -0x6857ED44A50C881F709A4B392DDB21DF2BB7E20C = _NONAME_ | V | 0xB750DDD3E6B06CF8C92C037534A2CDFA ; libaacs -0xC61D77747BC949A168785818750FCEF34E655645 = _NONAME_ | V | 0xDA722DE5E7AEA320FBE5B0BEBD30AE78 ; libaacs -0x172CF424EE5A7F42EA1A343143239E9E82AB961E = _NONAME_ | V | 0x3DC470AD24DE1C650049223A33BDC6FF ; libaacs -0x6A080EC90E5E84C2267261A1BF7B673196F8EF23 = _NONAME_ | V | 0x1A5DDA0358919E1322C741637C62ED6A ; libaacs -0xAB2E21707C70D0896C3A997310FF92AE2C957D5C = _NONAME_ | V | 0x7FB18BA901AC4EBD478CDCED2E23F3D4 ; libaacs -0xC4E2F77C3D77DCC8764DD8E9641E06E3981ED725 = _NONAME_ | V | 0x26830762BE8AB5150BF2B3D0912D11C6 ; libaacs -0xF6FB2961458F1CDB45A582099BB33DC9287304E8 = _NONAME_ | V | 0x51F935FFF4DDD73EAC5A571171868F64 ; libaacs -0xFB4ABBAF74E739243FD64943AF012A648579DD0E = _NONAME_ | V | 0xDB79CC807BDDEC5CA8544A5CDDB2C2BB ; libaacs -0x7631BC831C8FE21BABC98DDBEFEFCF6157794B93 = _NONAME_ | V | 0x31C9063A9685EEF94A309ACC7FC0599C ; libaacs -0x2E994B6DE2F61060C96C4F361860E948E4F83026 = _NONAME_ | V | 0xA9419180F6F83F7DC38CF36DE1DC21E5 ; libaacs -0xC4F2F196C8075CBE031A31228F52FF6A606E37AD = _NONAME_ | V | 0x422BF9080C1ECF41F710C481E3C6E8FB ; libaacs -0x0CB2180DE884FF657D637528AAA96AD9E6C4824A = _NONAME_ | V | 0x12FA85B48E743426645B95CA12F37815 ; libaacs -0xAB90EFE4A43A443A74BC057EC5273C9D52F0D5F1 = _NONAME_ | V | 0xAD9AF0C54CDFDC9FB03ACE34B22AFAB1 ; libaacs -0x9E4AEFCB8B727DEB74EB9A5AAC6FE48D81BF3FA7 = _NONAME_ | V | 0x5B61EDD79F0B8C93551A41A7995B5E5E ; libaacs -0xAED441F3900E629F53F71F171E64431DAEA31080 = _NONAME_ | V | 0x71D04664C9644D47E6D63876560DC856 ; libaacs -0x73E3ED48E42671CECB9F38B930D9172D56972071 = _NONAME_ | V | 0xB1F16C0DD2283076CA2D263D9F93CC0D ; libaacs -0x974479931BFF150A98CDBAD6DEA6E702CD4BC777 = _NONAME_ | V | 0xA7EF3986F97C6900D8795DBD24044832 ; libaacs -0xDE9E7DF1305A3C657AD81F2C90AE3B1A22EA07C2 = _NONAME_ | V | 0x315A3BD0F5E1275B08DB05D0645CB99D ; libaacs -0x34BF6A836EED3F1AA66C6BA07393269BB48C29E5 = _NONAME_ | V | 0x3AB316ABDBF9D4E687483BAD478D8BD5 ; libaacs -0xFC5A334E6622688773BD9C3BCA46F3F31512F176 = _NONAME_ | V | 0xE1BCDAA5BC620404771E502C81AB99AD ; libaacs -0x8315F1FB116C4EE95AC44F126196F346208EB733 = _NONAME_ | V | 0x4761D5C5A9892FDBB146AAE31CD902CF ; libaacs -0x84446DE20C8C12E97753D349C857ED44416A5A3B = _NONAME_ | V | 0x6FA7D1296711157F3A9A5030BDB69E11 ; libaacs -0x08D9EC0861BB9440E3BDDA3256D88FBB9245ACDD = _NONAME_ | V | 0x327B5926260ED082DCA558F0D4270347 ; libaacs -0x5643F41AB70FD4533DAC98440D6BFF2AF51BFEB0 = _NONAME_ | V | 0x02B54035B416444ACBF0D99C6C44DD18 ; libaacs -0xDBD13CC88ABB75CF48E63F5D93F49FB4E91AD544 = _NONAME_ | V | 0xF7B1B79360D793D31BBC9BF86F51AF64 ; libaacs -0x80E942EE73935A3064CE08AF1F631D097CF7DB8F = _NONAME_ | V | 0xF146DCDD7128A97C50ACF9251675AEFD ; libaacs -0xA27BA08CC1992501ED15E0B4A9E3B4BEBCE51199 = _NONAME_ | V | 0x749176EB632D4B5A63737AA9FF9C5454 ; libaacs -0xF831E8588B62B1E8B16B30C6DD2208CC3D479D15 = _NONAME_ | V | 0xA6CFBCD8D94BF4BD61760FCB21DB04CE ; libaacs -0x2FF933E325C36A27DF27B5ED5B07C69E0A103DC7 = _NONAME_ | V | 0x2A55D7A5F212A85E8CF60D28C74DFACF ; libaacs -0x1E794B9D7BF7B2BB4EDCA19537A695D3DAFF3D78 = _NONAME_ | V | 0x3723C1CEBF936B9CEFF5899CA60EE23C ; libaacs -0xBD73ED0DE917C99882B8A0BFDC165954BE6B8CD6 = _NONAME_ | V | 0xA5D2F5629F2108646E4401788D954D3A ; libaacs -0x35E0634F3D03EE0660F28FE7D2DED65DA7AFFFF9 = _NONAME_ | V | 0xBE06816C3A5CEC531536D0653FF948A2 ; libaacs -0xF90B7E072F57F8551DCE060683F6A954D02DDBFB = _NONAME_ | V | 0x812FDAC6D8802C2CD00A72521448E790 ; libaacs -0x69AE23A3B59BBC7EDF098EBB5AF7B59A55660B73 = _NONAME_ | V | 0xFE6CB05BCE3C42E1C92BE06956066B24 ; libaacs -0x82B9DA08470932F7DF5EBDAEF9EDF8C37B939A53 = _NONAME_ | V | 0x6BDFF3FE4C9802659E0202AE9D0DDCA5 ; libaacs -0x54546E9EC0E1D7AB7F1E93A412958497D13129F6 = _NONAME_ | V | 0x2B93190E676B2C34770970AA11037474 ; libaacs -0x7039D901AC1ECDAFA35D9CF8535A4A281ED3F9D2 = _NONAME_ | V | 0x7F354C12AFB5768C0D8ADC75358B26CF ; libaacs -0x4B0B1402DD6D4121C988BF8200EB33B9697FE1DA = _NONAME_ | V | 0xF9071AFC84BAFB72B95792B073E481C3 ; libaacs -0x7CD73CB30505EDA811C2BA791040BE3788E2AB74 = _NONAME_ | V | 0xF373C4BCC96B6F00362C7ACFC928729C ; libaacs -0xF33678B9C6FF4AE9D9C736736558F9A657E9FBEC = _NONAME_ | V | 0xE61662B7838E70954C90518AFE0784B6 ; libaacs -0x3E4654AC77AE66C21147EF943D40C525E7FE83E3 = _NONAME_ | V | 0xC04DAFCB494C6CC46E1B7E32D74EC823 ; libaacs -0x1752AC0FCE5166959BE317C54ADC0D8FD842A919 = _NONAME_ | V | 0x983E0612B7C34E504AA92A6E62BC6B58 ; libaacs -0x1E1939982A9D71D2CB87C0FFE5DCEFD3B8A03259 = _NONAME_ | V | 0xDB71373CAB2BE6E2FD5BAEFA7C264345 ; libaacs -0x59409CF85809271706A0B5B2A0F7B35E5D6A4714 = _NONAME_ | V | 0x7877CC0A79726C852950561F6552408A ; libaacs -0x137A52AB10EC74BF8E1F1C05FEA12364E9DA6D85 = _NONAME_ | V | 0x9784AB43514BA7BA9AF56E312A9692A6 ; libaacs -0x96812DF97425FA7D7F6533D440AAE71D023CB24A = _NONAME_ | V | 0x59170471EB744649B5F7DF33968578AA ; libaacs -0x816C31D8AEF2C08CA4662AE2F8402F187FAA7037 = _NONAME_ | V | 0xFB83E6F1FC168D8BC2396EC7537083BB ; libaacs -0xFA08DC5396C343F9F4CE61D1498AB7C30B331B95 = _NONAME_ | V | 0xF091CDF024E424B4464F1EAB3FF155A9 ; libaacs -0x932509FD08C3D67CD21CE8F3D15EC23B4B2752B3 = _NONAME_ | V | 0x380B25C6ACBC294FF8CF50DA66260BA2 ; libaacs -0xC89054200A51DAF6F5F6D1634BB8DC3143D16BA9 = _NONAME_ | V | 0xF1DE6D796D498BF269BCD2644809858A ; libaacs -0x472621162D980C5F4FB7B194361C6AFFCCD5B3A5 = _NONAME_ | V | 0x21D2DCFFF92CC57C107E87245432C18E ; libaacs -0xA148F62FAB5F9640D7D2D6C3AC8FCE41981C2087 = _NONAME_ | V | 0x379436202E55234251216C28909739FB ; libaacs -0xF3F5063EF6986F699FE04C3CE4A68F41391B8319 = _NONAME_ | V | 0xF9E38386B9930DB48C25BF6D42D765A5 ; libaacs -0xF088E1414E26B709B95A691623AE25A2ED55C18A = _NONAME_ | V | 0xF5435D81B5DE246421223E56F4FCB3F5 ; libaacs -0xEA89801DC96E9B04199CF323C94BF0178CA12C97 = _NONAME_ | V | 0xE4FC1AECF2C2AA83B7F9F50AECE92408 ; libaacs -0x8597225D7F5FA68E628903FDCEE656703FE949AB = _NONAME_ | V | 0xC4A31BE0434D74BA6EA2BB9B702DE1A6 ; libaacs -0x6B7918E6ACFB7CCF0BAD68AC1D49C75DD4B87952 = _NONAME_ | V | 0xEC7FBFA9A3DE5E635100826745A6689A ; libaacs -0x235EAC37A8BCAF8C701E28C97488D15E7D837A01 = _NONAME_ | V | 0x822B20C904038421D440597D6E608352 ; libaacs -0x9DA04CD2BD4DE2E915748CAF32F7393151AEE326 = _NONAME_ | V | 0xD3C091952BB57A0CA6D8E4D46B412B66 ; libaacs -0x7B5EF39DBD2641BB8E7CBF56BE9FEED83B263E07 = _NONAME_ | V | 0x5D6DCF71CB95C66A4780E62CD203EAB4 ; libaacs -0x5F0094E756EF71B6F244F1661E7403AAC0B3F0D8 = _NONAME_ | V | 0xF6AF56D9F549E31FAF73E66C6DD61AEC ; libaacs -0xA808B170623DCBAE8C724449A2F506CA9359C1FC = _NONAME_ | V | 0xBE6288EE8DFA6C6828859D99F64491DD ; libaacs -0xB1BC930F19254E61C57AEE3598BEDB66F7F42E73 = _NONAME_ | V | 0xC5FC2F26B1CF8EC1C68A75CEACB7B5E8 ; libaacs -0xC8084C65ED8AE6138EAD6C1DC781FCB4426291A3 = _NONAME_ | V | 0x4ED4D142823CE2F4AB9FE0C1D715CD6C ; libaacs -0x47AD91F1A456493EAA737CEC57E771D43F0E4823 = _NONAME_ | V | 0x18150E324C325E9B53C3CF6C311DD320 ; libaacs -0xACC973AECEA5844D6158834DF83C0509C77957B1 = _NONAME_ | V | 0x86CF6EE85EF6F7B1BE8314170DD3C1ED ; libaacs -0xD59B6377F730BD1F91F323EF6C0BF99EE46FC483 = _NONAME_ | V | 0x913D3F8BF54A818B8601D54D2D8CC105 ; libaacs -0x13BA7B1D8421B14F8A1CB90ED9FD3AA2AE6E6BA8 = _NONAME_ | V | 0x350F6806AF4DA3C1268D8CC6D1073621 ; libaacs -0x22B8A3A42FAE099731532C624767D6D5BF82A217 = _NONAME_ | V | 0xB45DEE925398DC8935347BC9B0D14BAB ; libaacs -0xC5E85DE7A8A4999ED1CEDFDA3986CBA05D127F18 = _NONAME_ | V | 0x4541291B2DB63B7C68C3045A8FF9EED8 ; libaacs -0xCDD0B6A105D026DBB44EC443260B822E24444A06 = _NONAME_ | V | 0x23871AD3EB65D9B63739C3788B10D41E ; libaacs -0x215C039243CC5A0EF6208566D798C90C59EA8DF9 = _NONAME_ | V | 0x9A3CE4F96D8B8977FC4FCD3B1C86A654 ; libaacs -0x0039DAB12E93ECBD6E9518CB39CF58D40DD311B8 = _NONAME_ | V | 0x6513F9FF3C3F634FF91D3263F799BE3F ; libaacs -0x112D19F71378E9A0A27A85BD44BDE47F0C283A07 = _NONAME_ | V | 0xDA676077ECD6C9E373CDD36B258E036C ; libaacs -0x170A7EF3A7DCC70D9B47A904920BB1E9C504CEBC = _NONAME_ | V | 0x1E8FD70BFD1EB82813866A38EB3CFC80 ; libaacs -0x74C8208A16709C85A6FAC3B7BA1CF1E4F89DB3BC = _NONAME_ | V | 0xA4671C4A9CFF2685C6F1E03459608970 ; libaacs -0x8EE1F79E5479910CF5B0871B6B71BCEF440E8849 = _NONAME_ | V | 0xDE0483150CB0EEA1791C1D870D8CFE92 ; libaacs -0x05C01C3555B353BF91E4E362707B8614752CFECB = _NONAME_ | V | 0xC84D14B91DFC438D7B56C6B2F1E371C8 ; libaacs -0x8AB400983F79E1E04D65F353AA5F82C1668095A4 = _NONAME_ | V | 0xC44431B3B6A0F05128EBC363166A6DBE ; libaacs -0xD6959EE477E6C30682416D263D2698E79690E9FB = _NONAME_ | V | 0xD453E981459CD29ECBFC184645C889FE ; libaacs -0x6F4FF1A9F13721F7E812ECA08ED87CA18B03ECB1 = _NONAME_ | V | 0xE12CA5F1AFBAAACF29D516290B064ACA ; libaacs -0x0D417C0ABE1446F7FBC2DECCB81CE5522CFE322C = _NONAME_ | V | 0xB7D921BDE0A6610F317CF1CCA225877E ; libaacs -0x52ED29276F55292D5D7AA6E2ED426C7947D63E0E = _NONAME_ | V | 0x870F96821A8766457A4D430240DA56E5 ; libaacs -0xE84F1A70E322C1DF8F04B1E25FEB616FB548884B = _NONAME_ | V | 0xCDCA7437DF065F947F4CBC12CF8CA94D ; libaacs -0x6DDB5F03BAE4A46E948103E09A6BB9E301C79EEA = _NONAME_ | V | 0xA25DF6529850379946DBCE8500C37647 ; libaacs -0xAF1545784576B7246D11C15AFBC26FA875F8799D = _NONAME_ | V | 0x844E4F9EA32982508A415F214FACF100 ; libaacs -0xA48EA3BFFBD8F6CB7CF68E6B2BF040E133FD740C = _NONAME_ | V | 0x0760D184CBA7F9C70426FD1B64F70F90 ; libaacs -0x4F5B205ED72A96EAC5089033D28AC476225C7EA2 = _NONAME_ | V | 0x1A3F64EBA1E7874E9DB57274B0E22181 ; libaacs -0x49AF01F3A4F628C350F6026126292492E221F064 = _NONAME_ | V | 0xBCD2BED06E61043FEDA38F8F4C9ACE31 ; libaacs -0x0C11AA2B53B6E41D33FB3A0E9939DEF2B336A2C0 = _NONAME_ | V | 0x3959B8114E3CF9132FE7484FC82CE1C3 ; libaacs -0x03D11A7D8405382D2964AE54E039AAA72E8A0B36 = _NONAME_ | V | 0x2646B99C228104D8E57B1CA160DDC321 ; libaacs -0x6CE653E8AAC83B916BF05EE7700F505EBB52EA6D = _NONAME_ | V | 0xD7184E39A65E4278DF605BC276CA5263 ; libaacs -0x20A28CC0FE799DA3AB04E078D2FF0AE83F63F396 = _NONAME_ | V | 0x96A759E6C59297498D284F7E6F2B3C55 ; libaacs -0x9E2040DE4E31A876F3B2579906F2B5B77FFF3822 = _NONAME_ | V | 0x3238EDEABFBC1F546C8330E782266601 ; libaacs -0x0190E78778E251D214CB253ABF6B810689CE0052 = _NONAME_ | V | 0x0B387DCB63A707727FC4B792168E65BC ; libaacs -0x2062A11E9A052C83B2CDBA205C958A3CB4673F4A = _NONAME_ | V | 0xCA9BA87A10C4A989EE9B8B54AF58EF76 ; libaacs -0x2A274E37A48331FA12C6FED42C691523F579810F = _NONAME_ | V | 0x776E91176B59443245429FC191EDDEF2 ; libaacs -0x4BE82A6BBC6083F84F9BFE906407F4E3339AA08B = _NONAME_ | V | 0x52BE27170330BB65CC34107BF5C55B66 ; libaacs -0x52991BA5B50F898E9B04F589EDE538539C546FAC = _NONAME_ | V | 0x9CE484A04255BBB6FDB588BDCE90C5FD ; libaacs -0x7F40F558113E145C9511083C7BF82C44BF9F484F = _NONAME_ | V | 0xCBE2A4132800345ACADFAAA14DB5605D ; libaacs -0x8B42F1D213D416A77A979B7E8B2D084BE397B40F = _NONAME_ | V | 0xA53EB74C08E158F38776156F8B94D7D1 ; libaacs -0x2C1F5D32A53512BEB761BBC0C16628B6A09AF34F = _NONAME_ | V | 0x663D36B4245BDE842107CE5BD5E37DEF ; libaacs -0xCE5ED33FB1AE7B844CEBD6BBFA26FF37ADDDE0A1 = _NONAME_ | V | 0xF9F03CA49044DFE8B1A94A3DA506B871 ; libaacs -0xDEE232B82F2557B730369C2F880B733339AC606C = _NONAME_ | V | 0x4382485A6E0436B8E54AAF09C60EDB16 ; libaacs -0xDBA439D92DF79845BB3CCD7DCCBD47AB0AFE110D = _NONAME_ | V | 0x534C3BB4826410ED1F8B0E958CF1E9D5 ; libaacs -0x884BB1E6EE082E190F1975BAA38F68F16C41656B = _NONAME_ | V | 0x4A4F7BB8791220DFCB482A73899E8030 ; libaacs -0xE60894886AF4827E3332E56DA4E76626CBFCAF18 = _NONAME_ | V | 0x88AFA1237B19EF3091B653D2D07ECBA0 ; libaacs -0x2A506EA0BE3045C6DA982B9CACD6C1EC504AE605 = _NONAME_ | V | 0xAF844B40A8A700ECACABF1D1DC2BDC37 ; libaacs -0x65A9B1AE60DDE3867E0C07C8A8740E894D40953A = _NONAME_ | V | 0x21DE917C34FC4D8B47D0275FD94098E1 ; libaacs -0x89922B4355B845C67A9AC549E5495571ECC41F96 = _NONAME_ | V | 0xAED6294FF89E8FEAB24E547D257E178A ; libaacs -0x9F88C68C370C33505BA9FB798AB5F2E9B17CFF83 = _NONAME_ | V | 0x1943A70FD4F11D796BD56A48001005AD ; libaacs -0x775C9DA131BF92FA98DEC50CBAD351DD85942C87 = _NONAME_ | V | 0xC449310298500BD973E0D5C472F50AD8 ; libaacs -0x89CDE70B6C2117DBDA3C0EFE1DC98BDEC901CB70 = _NONAME_ | V | 0xB6A9053F998695509E15BB05C4A87B09 ; libaacs -0xCEFA32955D160DFA800DE4CC76522955AAB8E6C4 = _NONAME_ | V | 0x571A9A122F10BBDAD107CE07B72F7F35 ; libaacs -0x35020461D92EC3B1586DF15DD238049B7C9DE0F0 = _NONAME_ | V | 0xA37684D887E2F65D4C0F337A3055DB2C ; libaacs -0xA1DE9F51B112A8FCA881DC8D9043589FAFC503CF = _NONAME_ | V | 0xFE8C2CB42B4C0BCB398394DDBFDE55AC ; libaacs -0xDD1D00786B26E69C96BD548DDB28AB70F6549382 = _NONAME_ | V | 0xBF28906FC594D4BDA4F74EF04906E9C6 ; libaacs -0x398765A8BED5A2328A20EFACB3FAF79AF0C521CF = _NONAME_ | V | 0xAC79EDD8155B5D8855EE1C9662DEC1AE ; libaacs -0x45A13B5ABB5B463374D4F62185D2E7663CB1FBB5 = _NONAME_ | V | 0x5C5986C00F75E01011487CA27A9F0924 ; libaacs -0xA7B663400DEE9DDB5D898CF58D331D0773BF8FE9 = _NONAME_ | V | 0x3500C99B34F0E3A4AF7209A116A3F25B ; libaacs -0x6A8D1CED6C203C88A1DBA2338FA3C1D972A19B43 = _NONAME_ | V | 0x23492C89F82592567497A2791EEADE78 ; libaacs -0xCB00BA2909C8F9BFF3FB460E6A52E28C67734A19 = _NONAME_ | V | 0xB06D447A27E1255EA1F23CEDC6E80196 ; libaacs -0xECD76C19A87A4B8996AB5421D3EA5F967251B297 = _NONAME_ | V | 0xB0638917AA024B6E0900BDE2906F3820 ; libaacs -0x1F64F296840D12103DAD5763469CFEF63507456F = _NONAME_ | V | 0xD680325F8A0848962E1D11200D42BC5F ; libaacs -0xDDD05C6C9D24170E2F9B2EF12590E883200315F5 = _NONAME_ | V | 0x3C171AECDB0911B293D759764778DEFA ; libaacs -0x689888915AF67744123330DB646D516C06AA4851 = _NONAME_ | V | 0x2D47A11117B18DD5C103DB7B7128F374 ; libaacs -0x6F0DBC8C9C5E2B19B6422D68EA8AA4807F7891C2 = _NONAME_ | V | 0x231ED60C90F3FDD914FA7EB4F2C5F110 ; libaacs -0xA9D15624828DAA4C28F5996551EB7DB3B6923738 = _NONAME_ | V | 0x0E7155C3279967CA293429C4FC9A1CAE ; libaacs -0xF418670D1DFC8440BA5070C04407708E33F05C5E = _NONAME_ | V | 0x3AACBD1DB79923D71CE1B34625D62695 ; libaacs -0x2BED3ADC41294B70A034EC416CDCF3D1ADFC8357 = _NONAME_ | V | 0x8E88DFC4A4642ED18F544F7674418662 ; libaacs -0x4D3DF098A508B2B0455CFA632ECEF1FDBC10F80F = _NONAME_ | V | 0x7A3175DB69FD0A49134589315F1751E4 ; libaacs -0xE0B2AF93E7973E8A67059C7745716EEC12E55356 = _NONAME_ | V | 0x386B929E9E8E7552A430BBEEFF11E4E4 ; libaacs -0x4AC95ED9C809E53F1631991FE6876142C55D3693 = _NONAME_ | V | 0xCB2F5AD5E657906A2D5B3ED08767E043 ; libaacs -0x59ADAC59E3CFD7A5E902C08C0471760764DAC290 = _NONAME_ | V | 0x7A4A112653876C3EF282BF1962277021 ; libaacs -0x60D0E89F7D42C74B5105285BFE65CD7C1FAADB2D = _NONAME_ | V | 0x37036D40F0873A6E380F7113E0037BA7 ; libaacs -0x8DC159FCB7BE21625D4F205468147E2DA0386183 = _NONAME_ | V | 0x3A2C9835B39162216AB62BA23D338DAB ; libaacs -0xDEAAAAD3D2D249B4409F89E74690F12D68AEB070 = _NONAME_ | V | 0xF7E1A57382435DE317FE0375D80D3D55 ; libaacs -0x846DCC098E59C8C47ABBF59CB306CD0EFA0698F5 = _NONAME_ | V | 0x051A77ED2F1D0321C6E297179864455A ; libaacs -0xE6D1BF7289C2117A91FA8B68BA6E78F37E23A9C7 = _NONAME_ | V | 0x5353ED7E7FD8F94E949C1A73CB5412B5 ; libaacs -0x140ABBB74B386DFEDC3DD6BBE2D0A77BE2A97654 = _NONAME_ | V | 0x8CEBD2080199E6338687916A097455AF ; libaacs -0x15B779ED7160073920C1E602DBECEFF5C71BBF82 = _NONAME_ | V | 0x65585435F0A2492B6CB9401BBE9DFF50 ; libaacs -0xD275B864B30B1CE0D7E2B437AC5A141927897F22 = _NONAME_ | V | 0xBEE51C8CA5E5BFD3481DE5761A3E50AD ; libaacs -0x09DBE97000FE193F1BA640A689A702F35D31DE36 = _NONAME_ | V | 0x825AB41F3B48AB597A7D391621E706FC ; libaacs -0x3BD713F780CD40D6479FE9EAC41BD82647A64A6D = _NONAME_ | V | 0xD7D0AE6EE38B984D7927236221492E17 ; libaacs -0x392E455219A241041F641B01789B0AEC78CCC5D3 = _NONAME_ | V | 0x048990A238D272E02AF26308FFEB10B9 ; libaacs -0xF74DD2176F529DC5BF9C9D5209B96133EF9D7C75 = _NONAME_ | V | 0xD362A52A5D5A50BB361E676CB73F929B ; libaacs -0x9F10A6D5A4A812BFBF16B573BABA06C9C2A5DCD5 = _NONAME_ | V | 0x5A75B46859DFC993132A82ACB17AA086 ; libaacs -0x1A7CE3B6470E47EC1591AEC837DA74FB6D4EE814 = _NONAME_ | V | 0x67B245A65440736E3B5E1827E795B1EF ; libaacs -0x1C3847184A83523DBA10F2928A5A64DC28EF0E48 = _NONAME_ | V | 0x72DA44AA679B2B10C3639132DB342FC0 ; libaacs -0x67A4A877303B70AA5AFD5314D1C0A6C0595D1A69 = _NONAME_ | V | 0xB2F473D35E3A01A72D2F287D20D1BDE1 ; libaacs -0x07D94AB1BC67C4E7D283051B2F7F22E0B55D38AE = _NONAME_ | V | 0xF724F09357A8C5F8827A3673793B1981 ; libaacs -0x9FEBE196C78199811C09F565EAD9C003014C0A98 = _NONAME_ | V | 0xBC9415D336FC51550ED5EA31BE9DB4C1 ; libaacs -0xF167B33C616D88D15F5324B2E17B3CB760307191 = _NONAME_ | V | 0xA5BBE1B15BD7462CAAFC46760C9A5368 ; libaacs -0x42E5E0F0B7ECF3EA8C96797B42395556A6E629BE = _NONAME_ | V | 0xE42E85C18F7A9A19CD7AA7DC8A0E51FA ; libaacs -0x4BEC679D1049E714E321277E6EAE163AFCD18992 = _NONAME_ | V | 0x46C48BA94E58B3421512402542B149E4 ; libaacs -0x9BE67378953320B205A40A14360FCD1AF7E0461C = _NONAME_ | V | 0x63FAC2B4A27B95A128AB1A04DA38B1D2 ; libaacs -0x039E591297FBEECC3C5E9CCD0C3FD92700F538EB = _NONAME_ | V | 0x81BBC571F8C6D5250EB7429BC7A45C71 ; libaacs -0x6872CDA2EFBC32006036583955B9581525BB81B3 = _NONAME_ | V | 0x9A6EE8359B1E4BFB3B41863B6C9900B4 ; libaacs -0x3EAD63F227358DCA37AE5509873FCC84666936CA = _NONAME_ | V | 0x601D2F72AE1723A59004448C6F6363D6 ; libaacs -0xAFB57D5E43F0AF9BB1AFDF100B94E1F05BF104CD = _NONAME_ | V | 0xDD7D578F4758428EF3F7A9D033E5BC76 ; libaacs -0xCAE2539B9F44D62A2E13A75272CACB9B5BB9384A = _NONAME_ | V | 0x27C45159C53A12EA29A6824A1A9A973C ; libaacs -0xDB2D6A2B8ED637216B0328616DE2DC8993CF7A59 = _NONAME_ | V | 0xA1223A0929F678F958D465A963073E8A ; libaacs -0xF1EBCA492A2625E6D1D1188295C5EE255A93A2B1 = _NONAME_ | V | 0x7C91108B354ECE6F15622434E760E25B ; libaacs -0xF137A2B62F83B04AD9C08B176570A4FB84CFA3DB = _NONAME_ | V | 0x4F47995B77324304902C28914013BD32 ; libaacs -0x81D15D5380A88D3966C1C3B1CA1D30EE03E46760 = _NONAME_ | V | 0x0D1A708430C0E1F473577CA613C98CF4 ; libaacs -0x5416725F77A5AD0C9982A79A66322F4C29BDA648 = _NONAME_ | V | 0x1F28664630E9B3800F422E438596AA3B ; libaacs -0x1391DC3187677EF3E25F65CC18C7552E1C737585 = _NONAME_ | V | 0xD10926793A27557B4ECE705B185D157D ; libaacs -0x91BC4B05F754562FD6A0B57E3DB2C8070C7D7D4E = _NONAME_ | V | 0xA6B4B49FB5B5D13DA17C1BB2FA5BAA62 ; libaacs -0x9D1E96E5B2582677DA214A1BC7901EBE8E136918 = _NONAME_ | V | 0xF62B75872829B3F0A4329E5179AB0DDF ; libaacs -0xD3E134293ED3C41698ED4C73C2FC273266BBC7A8 = _NONAME_ | V | 0x72B9ACE028B73C00FC16109B3CD7649E ; libaacs -0xE973C24BF80C440C2EAC2EC1D85C3E4AC339F473 = _NONAME_ | V | 0x0DE5D06050381B27B8B01D359AC6FFC2 ; libaacs -0x8C89776C5B21334AB3E3A593FE26E4CA1F2FC6A8 = _NONAME_ | V | 0xBBA0276E0D6E47254F38D9F18F5DDB17 ; libaacs -0x8C58FE1B452D69D7C82628EF2E314EFE066AAD0F = _NONAME_ | V | 0x72C7DB94D0D211C107028C0E58AA025F ; libaacs -0x49530779E79DE1324A237242488EE825FA1E3152 = _NONAME_ | V | 0x8D11B55480102427594BEE2613EF9A5B ; libaacs -0x5A7F69742644B1D89C5ED99BAFC5DB6F94C368D3 = _NONAME_ | V | 0x8268C71BC4A7EE48A8D17504BBE6999C ; libaacs -0x99F266804F7EF2310F65BCAE1E54CD9902C8BC77 = _NONAME_ | V | 0xDB79B6985D18913DF685965ACF49A4F8 ; libaacs -0xB09078D3EE0796686966D6B92488E912CBDE754A = _NONAME_ | V | 0x27CDE3D6BE346A7AFC808F3881DCDC01 ; libaacs -0x3AACC3FD05D4118525C8D99DA51D77D6334ADA20 = _NONAME_ | V | 0xC892B4BC86A0AAD88900430A74D62DE2 ; libaacs -0x7750F795630B81F6E6EEDE311EDE9655665CB8A1 = _NONAME_ | V | 0xD061AA8A4C24A5DA00EC7AEE0BB0809E ; libaacs -0x0DC21AED2F85230F6C4706F6DC3B9CA950C03A3E = _NONAME_ | V | 0x3DCCB4CE4A0408F379A10327CCE907F5 ; libaacs -0x172C1F907C50747DFEB6A974183803E1764C0802 = _NONAME_ | V | 0x04003CA2E9D3B024921397190F436D2A ; libaacs -0x13167126B8F789DB965C02DD78853E81FD99E242 = _NONAME_ | V | 0x8448EF07052055BC8CF7327F0029FCE0 ; libaacs -0x259BCD342576DF1F2B3D25E8980EE1D74D507938 = _NONAME_ | V | 0xFDCDE023EC68663DECC9BCD3450F18D4 ; libaacs -0x38C136C16AFF8F91DC9CD287A4F509B933187EFB = _NONAME_ | V | 0x421F99D7CDC57CB6C9D7CC479278BDE5 ; libaacs -0x40825A3DCB3E16583CF8614CEF07C672AB262E81 = _NONAME_ | V | 0x94EB6308AA72A3DA381B9A89FA765D99 ; libaacs -0x54D5B44F02CB146F323DBB844AFADA342A9CDB12 = _NONAME_ | V | 0x530C9279ACF0FFA0641815C64300608C ; libaacs -0x212E2507AB4184723E84720917AC4D257F6E4764 = _NONAME_ | V | 0x698629D22663ED61B0D6ED28431283A0 ; libaacs -0x79A0C173D5BF0F735BCCA782A79AD716AE062CD5 = _NONAME_ | V | 0x3F0A3308DC4D468B159AC899E6058916 ; libaacs -0xA60282DD2B615318AE0095B60AE080DCA58D9DAC = _NONAME_ | V | 0xC00998BF97FE4D440AEE5D7F889E2518 ; libaacs -0xFD605ADF92246A196DB611030F4141F3E39FFF7F = _NONAME_ | V | 0xC9D52F2BE90234A834F7CA6683F952B5 ; libaacs -0xF0B11614428767DD5DB28BCF125D5093073E2B3E = _NONAME_ | V | 0xD051B4EED08329A58284DD4A23095D36 ; libaacs -0x5F4393B401356D18A8573460AFE5A51CC041EE49 = _NONAME_ | V | 0x639EF28B47DFC124D920F800F55F446A ; libaacs -0xA4907441950011F817E530BAB080D070E42963E6 = _NONAME_ | V | 0x1725921B08B3662E3CF2CE93820444BB ; libaacs -0x775BE4E52ECE0C1CF24682B2D58CE4AF7D3C472F = _NONAME_ | V | 0x0906B56BEBFAE0294DCBA8FA1E919A10 ; libaacs -0xDB6DABC9A17346308D05FD7D04C18EA16004DA71 = _NONAME_ | V | 0xE2D40AADD692B6685D4D293A3B0B3899 ; libaacs -0xDBB57F0FA921D635EE57FAA2F9E4D51D8E0BE1C7 = _NONAME_ | V | 0xE593E33A37B2A97A689DC93B75429135 ; libaacs -0x4952878CDC4E247D957928DED2BA4FAE70DFF0A3 = _NONAME_ | V | 0x0825B11970620E0B909E2A8F015276C1 ; libaacs -0x24658902FF16B93DC1322DB11978646BC515E3C9 = _NONAME_ | V | 0x6778D6B8ABDC2E75A13563E4BFF97860 ; libaacs -0x5BC80B04780AD0E962368F54BA51E080761AD064 = _NONAME_ | V | 0x6FB45BB7340215DD94D3602965DAC158 ; libaacs -0x894CE97748697C8006CC864FBEC8A582E685E30D = _NONAME_ | V | 0x5B807CD3E7344AFFBB93704C8D2EF7D2 ; libaacs -0x90B8F517254FC09E08C9510161EC0C824C8EB859 = _NONAME_ | V | 0xDBB49832E24ABE4DC7686ECD237AF9FF ; libaacs -0xC134959F25F61C4F983A31D1F54B8B5228F4713C = _NONAME_ | V | 0x236F2B0E3053E8D34C9652A4B32C67FB ; libaacs -0xDF406EC04E1E43EBF849CD4832EFD087C8A3466C = _NONAME_ | V | 0xA1879A632EBDBB474238868BCF5638B8 ; libaacs -0x3603283ABAD2A8E76E89F0799C32A9EC78651C0C = _NONAME_ | V | 0x8F722EDA8063FF79BAACF80BD2D2007C ; libaacs -0x305349F08509AA2BE18841716A0A60485EDDE445 = _NONAME_ | V | 0x80E23AC3F047097FBDD794FC8B82D50D ; libaacs -0xBE062B2B4784890D0CB72FA9CCA2A8C94655047B = _NONAME_ | V | 0x790E79DC4E5BAD85B204FDA898315752 ; libaacs -0xF6218DA38D30B9530B4FAA7637B59FDF9F0801CE = _NONAME_ | V | 0x2301EAF478EEA3219BD2188CB69ED96C ; libaacs -0x96997C88F928B1FE6CFC62B23CDF07AEEE2B5F20 = _NONAME_ | V | 0xE0EA6102A62F5AB47B0C5D5D53A18C35 ; libaacs -0x63CA4CBFC45C3D1B9732CD7EE066501A4594029F = _NONAME_ | V | 0x1A25BE9F7F6077288769019212D105A2 ; libaacs -0x1A609DF9A661504CFA7C70942B0A47C33A231732 = _NONAME_ | V | 0xBB225EDDF0C3B9953D9F48AB0F9E56BC ; libaacs -0x239BF5B9E8A7106DEDE42E7625460856E3A35E92 = _NONAME_ | V | 0x8A1E27CDA0D335FAEA0DC9CD0FAFEFC3 ; libaacs -0x2099293503A93482C2336BFC75F66C1E37A6EC4A = _NONAME_ | V | 0x3DDF31C51D2FC4B5C168B00D653B3FF8 ; libaacs -0x4C37632CAA6832139431C8B51B975595536F3DE9 = _NONAME_ | V | 0xEB6EE8902613E2A907F0B5320AD0DF94 ; libaacs -0x6F377D60D61999A206A5A2CF2170CAFF13DD70C4 = _NONAME_ | V | 0x47EAD0D6F2DFC4B0499B0455407605B6 ; libaacs -0x00D7D618CB1E42E5FBF75BF00B0A26A29F1C97B5 = _NONAME_ | V | 0x55A72653C84EFD09A534E7CDE614893C ; libaacs -0x81B5B6A94873A3E8750AAEEDF5412ABE67C3CE8E = _NONAME_ | V | 0x7CBB6CAF0CB27EC0034D9674EF940A1F ; libaacs -0x87BEDABFCBA0AE5A77C721076236C9DC1D5BA253 = _NONAME_ | V | 0x22A0140724409F71775FC9871AAA4DCE ; libaacs -0x96F33A1A50690804D8186508C7243AD0971A505F = _NONAME_ | V | 0xB2195092321D082CBE2BF021BB767EA0 ; libaacs -0x619FDFEADA086DB92EDA8106352599A0BB558436 = _NONAME_ | V | 0xAF1D15F7EC9FB05A83D0BFB82BEED5E2 ; libaacs -0xD96D8A6CCD3C9007D999B73B2D7046CD6AB46881 = _NONAME_ | V | 0xBD2C0CED42667ACF803E419A5B55A32F ; libaacs -0x6BE20255D37B1E50FDD7154EDECCCC62ABB49A08 = _NONAME_ | V | 0x8451CBD9B990153A9D02F5D5F3C910D4 ; libaacs -0x522677AA17D2E602DCBE2D43FD7ED4CE534EC82F = _NONAME_ | V | 0xF4DF7941B0F5BA170D000E9A5B8BA465 ; libaacs -0xE4E10F998E010F5A98C18D0441F870BD96A7F753 = _NONAME_ | V | 0xE133DA9306E3D88F88DE0A01370A098E ; libaacs -0x010B005E5029E75E6764FCBCDEC164640AE36750 = _NONAME_ | V | 0x03CC239B146444BD01F81B015797E6AF ; libaacs -0x17BCF3DCCDE8FB6DC0F8667962E5E2A97BCCF052 = _NONAME_ | V | 0x6A2E4C9481679E7A0B59571D5B6B4EA1 ; libaacs -0x22C6E187941E2635F3A76834FF73B42A18C95E67 = _NONAME_ | V | 0x696AEDF5DAC0C90CC159F8F951D4C00D ; libaacs -0xB5DFFE934FD3F63BB3F6BC8B37FF26CB0DF85810 = _NONAME_ | V | 0xA5AAD7F19D4F1A9A615CC8C11A9610BE ; libaacs -0xC3A3995DE2FDFDB3095C5E851A767298AD799807 = _NONAME_ | V | 0x6EE299371CAAD6BB7F99B927EF419877 ; libaacs -0x4BB24EA608EF7A0D2CE0FE7FFA514FD544E2A55C = _NONAME_ | V | 0x7B98FFEB0EC764346039E5ECD2544908 ; libaacs -0xB24B3D160ACFE3A980F359114A076A33F3B422AF = _NONAME_ | V | 0x5EF5EFFADC1467834F08510158E755A1 ; libaacs -0xB85FDFBA116407749C57D61C0111032D24619CD0 = _NONAME_ | V | 0x927B778A3B29E91545602CB2A7174FA7 ; libaacs -0x0BC405B13838CD438F65870DDC4C56F3CCE3D1B3 = _NONAME_ | V | 0x52DBA24835BA7E040427DDDB12B9CFB0 ; libaacs -0x2717F868FDC389D2CEC33575BD9A9356FD694289 = _NONAME_ | V | 0x52D2A268602BDE3AF7974EF51999578B ; libaacs -0x511265D36164BBCF613A1C0F9F93F1285DC4AFDF = _NONAME_ | V | 0xACE289E328884EC82A73D5453D9F387D ; libaacs -0x7F739783562CBBD0797E3C54A91955CD2BF4A188 = _NONAME_ | V | 0xE21CA3A7960859B12B0300058E0D0D39 ; libaacs -0xB2CF5994558025577C5E500D77E8467E3BFA4C8F = _NONAME_ | V | 0xE757F95FA474FE324095F1F76BCAC28A ; libaacs -0xD13B4E1F1151F6728EC5AFD1A8A0612F0CFCCA2A = _NONAME_ | V | 0x4109A2D939B5C871CCA7B6781E8AD263 ; libaacs -0xEBA121F950C9B0645C6829B9CD5733C2AA5C3FAC = _NONAME_ | V | 0xB7E482757911147A1B9BC1E5D80FFB87 ; libaacs -0xFBF2ACFBDA71ACBCCE3C8F74AF5BDFFE4E387BE1 = _NONAME_ | V | 0x8419D84682E230AA90461139BF20B81A ; libaacs -0x198D0F65E7AC29FC90035D2D83178EEC31303E5B = _NONAME_ | V | 0xEF7E6F059CA406BF1E24167449ACDEEB ; libaacs -0xAEAFAE7304A3FCFDF983FAD0937C12D9659DD781 = _NONAME_ | V | 0x9C7150A8EAAD02C601F289AB26713F37 ; libaacs -0x9BF5154DC5ECC0A092F905A98E3E6ADEB48013A0 = _NONAME_ | V | 0x8D83AEE7043963B3298B1F86FACB30D2 ; libaacs -0x8B7E2BFCEADBC11D0A098E09765D8C55E07B456A = _NONAME_ | V | 0x117A77D3122CF72AFFACE50630F3A1B7 ; libaacs -0xB1D8BC0C04AE38ED47B8F8E5F0CB0D8EEF08AC66 = _NONAME_ | V | 0x2BE58C5E1BB369BB398EB35E5C0EE53D ; libaacs -0x5018AC1FE1E8490841E34107180A12DEDF26DCB7 = _NONAME_ | V | 0xB1F46362ABD9217150998675F5D6ADE6 ; libaacs -0x12E414D8DF1794FBE34850720B06AF851CE05C51 = _NONAME_ | V | 0x161571806EE5CAFD6B8E735C62E62B8A ; libaacs -0x053E1193CA54E85C6D66387CB5665A3E89C5C5A7 = _NONAME_ | V | 0x657226DAF9F5DBB0C886037845D38002 ; libaacs -0x799908DA55E0692EAE18B791CCB6AB7B126AD4E7 = _NONAME_ | V | 0xEBD9B4DDF10A6AE8BF62D5F6B5D9F186 ; libaacs -0x9ABD9F5B3153930405EA67D7930C000701B9A19D = _NONAME_ | V | 0xBD6024F69ABC656C91A5DD5500DA7049 ; libaacs -0xD557F96670C84CC0AB110FAC28C1CA9AC6C30C33 = _NONAME_ | V | 0x4AEB9217D4CB09E85F1DF7D877033538 ; libaacs -0xE3222DDC8FB66CD18818F79203E1A248748A301F = _NONAME_ | V | 0x76DA265EDDDD41CDD84B759A1AAC09FA ; libaacs -0xE940F870ACCCEFB99BC5FF01DE1011BE5BE922F2 = _NONAME_ | V | 0xFF16FE56EC141AD7DB2009DE4560000B ; libaacs -0xB34E85CF83A4601724202BB98B73E12D949311F3 = _NONAME_ | V | 0xFFB0BC7FE79EF9DD2E66759225BE39B3 ; libaacs -0x264E132F9305ACC9F0A3BFD63EE970EE8C54BF7F = _NONAME_ | V | 0x8A8DD7A055A16085C6956B67CD6EC74A ; libaacs -0xCBB87C072955744B4ACF49F619D40E674188220A = _NONAME_ | V | 0x7DEC1AB3A5666068D3E7D8E41442A2CB ; libaacs -0xC9417121ED02F196FB72A80904A396FB39827667 = _NONAME_ | V | 0xD0AB1E006C4D67C275EC36C75F7DE81C ; libaacs -0x0774C951C89900D67B9A43CE55674F201E44A16E = _NONAME_ | V | 0xAB862C85524AAD626F04AD07B68F1D21 ; libaacs -0x52B90EFEF76B001BC42F2EABF6979E9C65AB2E8A = _NONAME_ | V | 0x035F1DAFF0E256B1AE23FC9627095BE3 ; libaacs -0x85599367BFB9F7B751AAF5A73A3B69688ADF37B9 = _NONAME_ | V | 0x47B8326C674BFEB5D70AA2E21BDB9854 ; libaacs -0xD2E2FA19835EE3D0A4F50AA6B006596AB4A8DAFD = _NONAME_ | V | 0x6E229A5BE95309647B05CF7FD997E709 ; libaacs -0xE0CBBC5637794478B7566699FB63D150897B03A8 = _NONAME_ | V | 0x17DB06F7D5959FF5C512B68FAE6130D1 ; libaacs -0x6262F04EF1157D167473FE63766B5E939E37DB75 = _NONAME_ | V | 0xFAE925CFAFDE7027AA411F1E5D7E2F3E ; libaacs -0xA5DDF3C6B672B604F4FC68DFC7F619358485D985 = _NONAME_ | V | 0x13C7507C2D881059011B710EF84DFEDC ; libaacs -0x00DAE7999B9E80CF7F1C6A3158B80E0C6D9E3CBA = _NONAME_ | V | 0xA7056FBAFB0B8DAE00489DEBDAE0E796 ; libaacs -0x423D8F3D7FAC9710B8F04D00B41931B76C0F0665 = _NONAME_ | V | 0xBB9A5ACE402365FE36ABFDDEDD8A435E ; libaacs -0x4EDE2769E2F86C8D938F623F7E53FF478A8FF036 = _NONAME_ | V | 0x082186CB916A27A8F5F41385337C075A ; libaacs -0xDF5BE841AD435F8E0D34078248EB16DC8429B715 = _NONAME_ | V | 0xFEE021A7F939532B5742EBF59F540F99 ; libaacs -0xFDC5D093B38B06828F8EA78B72C4033E1CBFFDD3 = _NONAME_ | V | 0x37D9ADB0CDF616D530DD1BEB53A6DBDA ; libaacs -0x6C4D334DE4B64C1A495BE1D74FE8FE654F127DE8 = _NONAME_ | V | 0x4C6D8FB350C008D63499968C4A3F5D9A ; libaacs -0x87C59586B7F5282DEB2D892905C91C39E38DDB27 = _NONAME_ | V | 0xB10C22A7EAC4E206DDB53C98CD2BB654 ; libaacs -0xC84327D4A57B066EB7D9DB072629813C197BA614 = _NONAME_ | V | 0x66BED0EAC6B300EF59F865D316F6E404 ; libaacs -0xC7C231D04D4CC77E407B02CC48B28E7DB16B2393 = _NONAME_ | V | 0x0E1FB1836686770A0125AFECB700F694 ; libaacs -0x2B4E933B792212DDE9540220388FEB18511FE360 = _NONAME_ | V | 0x6AF440664EB00598DA4FB21897892163 ; libaacs -0x2F71DDB4E40BE1A70587EDBE1055F0F3F507A30E = _NONAME_ | V | 0x4E1D7D94D455544A066D46E44929776F ; libaacs -0xD85B40394326A0DC600F523E35ACA0542A8FA533 = _NONAME_ | V | 0x5D4098B1092465CFC75BF6BAC6E3F57C ; libaacs -0xAF04097730D372004E3B1BD6C2CADF4203CE30C3 = _NONAME_ | V | 0x945AE00004FF4016D79910C5D6650740 ; libaacs -0xEEAD8672E1F33D5E147D22AFA690312CD96BE883 = _NONAME_ | V | 0xF2D728A2CE7E8EAADE1D188FDDD267F7 ; libaacs -0x78B200EC9926568E50893EF4CD68F767F23D361C = _NONAME_ | V | 0xC983E9FC2BF5C7B24C18C62982BD3780 ; libaacs -0x12B5A9F2B63F26FD46576A7478AF07BA088F236C = _NONAME_ | V | 0x7EB2B5A7A8AFF5BD6879A5E5227F49D0 ; libaacs -0x1E288425DC21B70E9EEF91F02CB3F656147E3EF6 = _NONAME_ | V | 0xA9590F97CA8461B55251AA62A57C4CBD ; libaacs -0x21588A4706751E67B0391FA669EBF1400299CEFF = _NONAME_ | V | 0x7DF804B4A48767B87ECE9929DACEE1E7 ; libaacs -0x8A45EF09514042885EBE9836BDD1CDEAF257C6BC = _NONAME_ | V | 0x4EA4A3F3D3F41AA46FF0EE629DF64E48 ; libaacs -0xC86E68B2555D69C04B424C5D2746F4C458589CE3 = _NONAME_ | V | 0x804B4E3BB6AC9650BE886520B82AFF39 ; libaacs -0x41D7410067EDDB7555CB50B5490889BF50C527BB = _NONAME_ | V | 0xBB8C3A5392196ED38A3F15CE01C87885 ; libaacs -0x4931707B623F49FDCAA4272A2A6849BDD4ABCCE2 = _NONAME_ | V | 0x5461C4D0D6619581DEFFB8F19A95B600 ; libaacs -0xE1DBDBC0DAB81C2678D753B5FE77CBED9AFA6533 = _NONAME_ | V | 0x41F86257085A7AFA556AB330B761DFFD ; libaacs -0x6D3DEF2B6FEBCC092293ADCFA350DBE7CA33BDB6 = _NONAME_ | V | 0x6C6A084FE7B15183F655B82EC2716B0F ; libaacs -0xE5F9447BF8AA13518E7167C577EFEEBD55069DD8 = _NONAME_ | V | 0x44B238BAC622EB1FB61736C9BE133876 ; libaacs -0xF8B8737A3DFF0D6A18B6DEC6FCD964D00F6076AD = _NONAME_ | V | 0x2B0CBBD58D596392B80450676F5FBE32 ; libaacs -0xD3B6EEDCDA0C37AE314C856E3DD58D194E3E10D1 = _NONAME_ | V | 0x26381B33B0C8DB6926431444C13853C8 ; libaacs -0xEC5599567AAA1BB0AA3C2F10A490F1AD2AED679E = _NONAME_ | V | 0x2454B3F5C6381CE8E2820DE3ADA6FED8 ; libaacs -0x032F9C53155C76C2787290E68E79773B77216A9C = _NONAME_ | V | 0x71091134DF856ECA68EC583732FF5F88 ; libaacs -0x8B9440FE7EAD2C4CE4038E14F0A0EDDE4FF016E3 = _NONAME_ | V | 0x306152E7B341FDBAC9253276900A0CD2 ; libaacs -0x3B5DAD0405D48D1BDC0673CC17FC6D577752AFFE = _NONAME_ | V | 0x822CA74C1CF9B49D9F1D7376E563411D ; libaacs -0x99AF1BD19CF4ABB3B42EC480CD5808551AE9E8AD = _NONAME_ | V | 0x0656D6D521860268C8C099BEC54534E7 ; libaacs -0xFA273E1758BBBB4AE60AF30580C8D83869C13A63 = _NONAME_ | V | 0xC1A57D7B9EC37E63CD2552FDC3164A57 ; libaacs -0x8DCE9F83DC98C39ACAAABAF8C1218835C59D375A = _NONAME_ | V | 0x1285B72AC32341D3399E06747E4C93DF ; libaacs -0xAE1477CB7728F492250BCF82264F9D76365CB3FC = _NONAME_ | V | 0x807F978A2D22D5769127BD6426ED90A2 ; libaacs -0x80C2C9B7E5D1F60C660D90EA6B873137D23FC4D0 = _NONAME_ | V | 0x5B1F1CB3D47C55D9CF2AD298EB3F0008 ; libaacs -0xA5B802826F0CA2FF2FE82CB7F33CE41DEBC8AFEF = _NONAME_ | V | 0x2B5CFFA48644ADDA76472B0B0C746D7B ; libaacs -0x627B9E15627C1DFF406953DB2B1E36774F896C64 = _NONAME_ | V | 0x3140D31FDCE3CC2A341AED858D062793 ; libaacs -0x0C5619A443C522CBB2F1AE04AE4750C493D951C9 = _NONAME_ | V | 0x7089BF46F6270941B61C8C76AC3C1681 ; libaacs -0x287C18BD32ACC3706B88D6BC1DF1E9693100D0CC = _NONAME_ | V | 0x9A65AF39E6C757C1C0144A13464B1B70 ; libaacs -0xFF1036A21563A05E8C078CA879F952286675B0D4 = _NONAME_ | V | 0xC82EF97FBC3413709757E2D9CD8D2DCF ; libaacs -0x85E892F62B43945641E8C65B44F370242EA0C964 = _NONAME_ | V | 0x49B10082E0B00B0C93014D926881ECC3 ; libaacs -0xAA488D20A345E53C6A459A88E53FB58F565A35F3 = _NONAME_ | V | 0xCA5E03803B1ACBC07CC28389CEE19759 ; libaacs -0xDFD676ACAE57C02026CBEC998E735B048DA869A9 = _NONAME_ | V | 0xB83877479048550B57FDDFEA6492D5A3 ; libaacs -0xBAF3C06462B984AE9BEEBE3253715FF977DFD176 = _NONAME_ | V | 0x8543EEAF2A3696AAFDA745C9E5A7575E ; libaacs -0x2442E9B7E1E62243F7706B66172264EA9FD055AC = _NONAME_ | V | 0x2A64D183E0D1F09DC09CE7F88DD84726 ; libaacs -0x88FAC29EA25B1ABF9BEEF0C7639267E2A3E38017 = _NONAME_ | V | 0xC5C0F760BB2682D85F76FC45B0B31916 ; libaacs -0x976EBC63165AB67A68256658D8C03092F0473D03 = _NONAME_ | V | 0x2C01291E0F415E62D26AC13411FA50DC ; libaacs -0xA82B17B936D8A6744F9C02A5EDAEBFACB7D7F437 = _NONAME_ | V | 0xDDB3A11150855A63FBCDA27A1A2D255E ; libaacs -0xD9391FE7358206A6FA8E4417C27F81674889E7EF = _NONAME_ | V | 0x482B303DA46CD76BD8CDE168DF121A0D ; libaacs -0x6C404EFED1A4A878B896BFD49F900E5C97BCDF61 = _NONAME_ | V | 0xBC9025C73FF2FB7BFAAE43816AC40645 ; libaacs -0x15ADE39F205F0FD02ECAF1B33078929BFE2201AD = _NONAME_ | V | 0x959288B7ECF11CA617F58D3C62354F0D ; libaacs -0x8FD4423B2FEC8CD49DA428E12D81AA41B48401C3 = _NONAME_ | V | 0x6356E256B1376BF51CAE8A8C68A6BE4B ; libaacs -0x3A8F556772D64EB025B2AED14D8AAF9764406548 = _NONAME_ | V | 0x31983714F79498C5680D6E5ED2479D89 ; libaacs -0xC48825294B12F86570DED99446465E27B15B835C = _NONAME_ | V | 0xE440001C936FDBB557D1A5E46952F7AF ; libaacs -0x30F78FFD7CD54A80E44342B066D6EDDB42AF5E5C = _NONAME_ | V | 0x19F4CDC1BCC28A65B31D8B3552ED8317 ; libaacs -0x623A428497565BEFDC52D19CBC38C6133FF02823 = _NONAME_ | V | 0x69BCE27776ADDF97BA0052A40B6BAE72 ; libaacs -0x7DA9CF6CAB63F54A4143E4C52E5922AFD47F79A7 = _NONAME_ | V | 0xB1574667966F140DB7C3A96B68249CDA ; libaacs -0x943ADD72F8DD4AC901340414193816E50D3879E7 = _NONAME_ | V | 0xFF1C1D1393DF8A85250D5C5188D46A11 ; libaacs -0xFC19FD5A6AD48A5FAC2253D06DC58048B5FF24F7 = _NONAME_ | V | 0xF922301FE1A590C4B4CF023D30893E50 ; libaacs -0xF8689C44A830C12CB4AF02CFE1A3B4AF341D9C32 = _NONAME_ | V | 0x61CE58848BC73840A1103F04FE54F116 ; libaacs -0xF9111D1710008359BEE50ACFBF30DC44639055C1 = _NONAME_ | V | 0x27CDCD429D70A5188E104335977EC26F ; libaacs -0xE7D7412513BAE28642983A10B97600F54E9026A4 = _NONAME_ | V | 0xF6D6BE4B9E259227D247082365970627 ; libaacs -0x91B8E0F3018BCBEF30B9127E1416D31300368760 = _NONAME_ | V | 0x36D1C8A04CFFED87F4D22978B55913D8 ; libaacs -0x655435D625D82EF086BAAA41C0AA65B7BC61D07D = _NONAME_ | V | 0x0128886753BC71ECC9F7C9F570E87443 ; libaacs -0x41599B1491636E3CCFFFF46ACB210A8B237FC3C2 = _NONAME_ | V | 0x22A441EE329142CAB4306C34DEC8429B ; libaacs -0xC7E95FACEE125FEE24801DB33219747DCD307EB7 = _NONAME_ | V | 0x32549DD6A60ECF52B52A48372D4434E9 ; libaacs -0x4EEC48588F1292801559DF3597BFF3CCBD5147C3 = _NONAME_ | V | 0x9E5B4420575E2240D57E5F24C3CE4ED0 ; libaacs -0x25EF4CACF96EB3EB46113DB0ECB4ACD76860E358 = _NONAME_ | V | 0xB29D334A6B4C1398FF122DFF69E3B7CC ; libaacs -0xB25118D68DB32F429DA208F19F0680E6C7B7389B = _NONAME_ | V | 0x71F86B453887F925A9B47D7B22247674 ; libaacs -0x224D4193EAB465C31F24A1B868950497A0D738D3 = _NONAME_ | V | 0x2A06F28FD545B262F35111FC4CCB632C ; libaacs -0x00AFEFF4858AF2BFDA1FE3C1C6E310C7D0F8FD31 = _NONAME_ | V | 0x0B2B01C8763EB493C2A26F46A9A173EE ; libaacs -0x4EF26104ACE03B7FF8D25C6F16226D5A7644865C = _NONAME_ | V | 0x0960815158C12DA828BAE25A15793514 ; libaacs -0x47DD3785E279DC0D81293ED0E757AF6152912807 = _NONAME_ | V | 0x34DDB8FB052753A7B561936DBACA34D9 ; libaacs -0x51497BEDA722B4A9F9E047115137A2306D1BC319 = _NONAME_ | V | 0xA521FDAA0849A5DBDEE418F4FF9720F0 ; libaacs -0x3A09B7F1ADDE0CFCFB305D01913CA3A5BC2B7288 = _NONAME_ | V | 0x6F938B974BE0412F81079EB84F1EC0C6 ; libaacs -0x98C2D5199347B55BA752F68789900A4C7509709B = _NONAME_ | V | 0xF69BBC11BC927FB5BF9DC65D34916BD4 ; libaacs -0xF6FC621BB9229E901910A9779CDE4D6667736F90 = _NONAME_ | V | 0x39B215D9231A31A44C7226F8A32B3720 ; libaacs -0x0472E70E0B2DF928C94202861CC91816D28786F9 = _NONAME_ | V | 0xD9AAFACC287B47144D944CD9B62FD302 ; libaacs -0x46E62022B6353C507194311E9A7826181BC7EE0F = _NONAME_ | V | 0x3F9E1BF11B24E96D111A451A4E4A95C3 ; libaacs -0xC32492A86EAF5A160A395F2E9957580363165451 = _NONAME_ | V | 0xEB3C80BDE968A9475D614158F1B97600 ; libaacs -0x0AD9ED8971260B64E147CCC85D91AE32F5099072 = _NONAME_ | V | 0x4C16693F322D7FD92DFEBC5367B2BF08 ; libaacs -0x9F292EBA75DCCBDE109DD295E43E2F91E7B23177 = _NONAME_ | V | 0xD347F1BDE4241F2E6FF4584DC042A461 ; libaacs -0xB6AFA5042F06B9B2B440C12B5BFC5D7EBC7CBE05 = _NONAME_ | V | 0x3C4F4BDCEDB00AF877B1D30FD7A33C14 ; libaacs -0x09E6752FB9235884AF09AF1B2198F275D63DEC27 = _NONAME_ | V | 0xC9E5DFAE8EE46BFAA52E6165AD4B08FB ; libaacs -0x55E11BF708F044FB7890E176A8FE3586094493C3 = _NONAME_ | V | 0x78033C19B0E944BCEAF70D4BE3D0FF39 ; libaacs -0x12799800BA102CA9EC46B34AA2DE5B8A84255091 = _NONAME_ | V | 0x5974AEA73D1CF17FC5D1D6D54C0C24D8 ; libaacs -0x1DFF4CF8DA3CFE5B64951DC87077594AE431C92F = _NONAME_ | V | 0xCE9222592FB4191844B0C50EFF2942B8 ; libaacs -0x0931D3BD6D2948CE04E58ED8B822254011B3CB69 = _NONAME_ | V | 0x462EFF5076E617AA9350B5594BC43A86 ; libaacs -0x541C8032B9D66890C2669EE76FDD11CCF2425735 = _NONAME_ | V | 0x9D12743385B3ACFF6BFF9D3785018995 ; libaacs -0x170BC03FC5E11FD9561ABEC23C4F94335392B161 = _NONAME_ | V | 0x1E04A1F104280E3A61E1DA7A7212D605 ; libaacs -0x37684D24FD5135AB5CCFB03E45B5CE9D20745BFA = _NONAME_ | V | 0x627FFB7C5A6F1D95137DA9451013E158 ; libaacs -0x0774078D0997750DC81E569F67FFA37CE4DB4189 = _NONAME_ | V | 0x35339B351A4B0D6E8A10FB7BF3388760 ; libaacs -0x7F948EFF37F524799C09B2D096D436A5B1278B29 = _NONAME_ | V | 0x9C3D0AB58D40949DAD56A97D91A1EF92 ; libaacs -0x7D7366516ED9558F9BE18E1E14E07077812B5856 = _NONAME_ | V | 0x599A4247DE3B77170A0FE9D409E8A563 ; libaacs -0x6E7FB5FD1187C3F7507F866E025BE38CF38DABF6 = _NONAME_ | V | 0x3A54F10D4A3C398855A92AF372054C61 ; libaacs -0x0AB5E9E32A1FE574C61BCC129693CD41114866E3 = _NONAME_ | V | 0x06ED9BDE27071F56C9E1C4B2AF235F2C ; libaacs -0xEB60B86D7E9DAE6F7B13E7C8D8252BB423D7439A = _NONAME_ | V | 0xD533C6C9FB7F64799B50DB5008C9FCB9 ; libaacs -0xBAD8AA6E0E4B5BC1BAAE10B61314DAE09006A34E = _NONAME_ | V | 0x58C1CF0FB459B7450E1059325FFD5AE1 ; libaacs -0x446D8F6202A6041305F73509781AAC2F3DAA2700 = _NONAME_ | V | 0x3F9DC614CBA3F335739FE4F2C23A2E99 ; libaacs -0x7533F069A3BD8ECC1887BD33AEBADC6866CF6E2C = _NONAME_ | V | 0x0EAAA3AB606649789F4E9EB5D90D6D1C ; libaacs -0xEAD1AFB622F5A03DF902F93558BE00513F72D88C = _NONAME_ | V | 0xBDFC95A46F6046098340A31790002EC4 ; libaacs -0x419D5C4244141B876ACA4EF66FFCBC4049E172DD = _NONAME_ | V | 0x33955E305D2DD3F0A9A9F0A542D27BA2 ; libaacs -0x6C9BADF7F4C61466D1FE6D28233B19879C8570D3 = _NONAME_ | V | 0x11328092EC28561F46835F3E541CC00C ; libaacs -0x639EA004A95DC43B66792083509264E724173B16 = _NONAME_ | V | 0xE11ECA2DFB7686344D1CD47C16285E9E ; libaacs -0x97A6FFB8994784F7F914F4FF65BE18DE218C4AD6 = _NONAME_ | V | 0x3A5E8089CEB18419E118D2A978E6A1D7 ; libaacs -0x0ADC8AFFD68231ACFC78A499899D9B5B2847EAF6 = _NONAME_ | V | 0xDA16FD5EB6D8E618F8FEF4B4F9D2DC36 ; libaacs -0x64453A11C8B79C0CAC81B53CB70172185D51335B = _NONAME_ | V | 0x7D11BD75E9BD57AD9BC25A664D9A0241 ; libaacs -0x1FC33CDFB52EFD3603C0DAB2595A95ACC19BA649 = _NONAME_ | V | 0xE08446C6079992E27C89984A09E7BAF1 ; libaacs -0xC21E93D77B28E94D872E208B5F02C8617CC4E746 = _NONAME_ | V | 0xDF807CF03B8A7A75978B82DD62075130 ; libaacs -0xB2200DAC1CB443ACE23CAF500EF2A6701FFEC0F9 = _NONAME_ | V | 0x463F206D9149E9A039F12F3676111459 ; libaacs -0x7F35E550875B2A265196776F0701CBA81A747415 = _NONAME_ | V | 0x4405B0FEFCE4C6CA7EBB250A21FDBE4B ; libaacs -0xA70D22D9F9F15718F239C8B6D9DD9D666BD28072 = _NONAME_ | V | 0x3A334AC36E8E044E9BA8B45AF7372776 ; libaacs -0x73CD5F5B2D439BEF4D5EE26A47B7647A36E785AE = _NONAME_ | V | 0xAA1F32EFCC2A2336689620883AF92B05 ; libaacs -0x73FFE1B556D7C32B175A04EF9947AE1A89C931BF = _NONAME_ | V | 0xC86D7C6B62AA64088B924D61C2AFD59E ; libaacs -0x804A7866B1320C5581BDBADB00678F20137406DB = _NONAME_ | V | 0x4C052E42D5725B008CEA2CABA91730CF ; libaacs -0xB3D213C7B169549E7BD131819C5F494194F4691D = _NONAME_ | V | 0xFF4B417BC3FBBA212CCA84AC910DABDD ; libaacs -0xBE70A578D82BCAC2F4A56A8D8508CCF5A0BEABD6 = _NONAME_ | V | 0x75922A2AA03E995D0657371860FF3832 ; libaacs -0x59B9949C2E74588D89FEE9755E2891689E8F7C30 = _NONAME_ | V | 0x3F061BDAAC50A918B1CF5A1B37A93456 ; libaacs -0xB9CDC1570D4931FDB5E8EA602A2CC1F1B716E38C = _NONAME_ | V | 0xF6AEFA5A877B1DCA6159FB0122A2E326 ; libaacs -0x73D17EB2E54B2869B8DEF9CCAAA810F8A9B7F670 = _NONAME_ | V | 0x180ACC68887B344C1C3420EC5826C2CF ; libaacs -0xA1F319BB12435498004EB5AAF4F6BA2FA7CF7D71 = _NONAME_ | V | 0xBEE432236FC66BE4DC1193715C7CEC3E ; libaacs -0xD8567BA8EAF1497DE4A0DA9D2F522B045C6CDE35 = _NONAME_ | V | 0xFB7B9D27DE842BE0C7FAACDDB8558205 ; libaacs -0xC128ADB91EB454F0472B663EB00766676B16269D = _NONAME_ | V | 0xC6237F1AFDF77F289C794B76E72FB364 ; libaacs -0x3A3776409250657FD9173B1471C4D4BD730F1AA2 = _NONAME_ | V | 0x25CAAF5161C984CF715E86F8452778B6 ; libaacs -0x867F9622D80F05D65BB403B0D9A322D762EBFA40 = _NONAME_ | V | 0x48051FA86E913432B887702C669F85C1 ; libaacs -0x85916A2B75811B73B5E34054F0F4A35CD86A0E08 = _NONAME_ | V | 0xD672EF2FF541CA533BD9C39C7731D8EA ; libaacs -0x9D8EDCF8766071B6FADB8132C57C51F99EF0AF53 = _NONAME_ | V | 0xDBAE33EDA5AE6F9C0B189D8811B99546 ; libaacs -0x781FE2EA79C3ECBE4F9041C69CF108929EB17D93 = _NONAME_ | V | 0xF1E4BB3A5289FB925D420D3643908801 ; libaacs -0x155F9C81BE0AC434835690B7B403F56D624B4C40 = _NONAME_ | V | 0xA426B7FF33FD8D1706026D51CB9F361B ; libaacs -0xF5D17DD92DD6DE6E75DA88C56C2BC1C4CEFCF6D7 = _NONAME_ | V | 0x0639A396E8489333C2C1D04E9FA7F1B7 ; libaacs -0x9A8DFFF300EBD23222DBBAFD715E66240BC487F0 = _NONAME_ | V | 0x0ED220095DC79EFC7377E13BFD642ECD ; libaacs -0xF76CD23F751CF4961DA650F0D05082E16885E9D2 = _NONAME_ | V | 0xB0F549BD614260677E052FBF0895D634 ; libaacs -0x6D6687C3094DF92D65FCBAE42DCB20C64A85AFFC = _NONAME_ | V | 0xEF92F36BC458341BD99608911AD07CEC ; libaacs -0xF72F12E2700026D4DA2EAAADBDF9DFC03211B400 = _NONAME_ | V | 0x86E088E45E633F88C8A0E62182E3D1F7 ; libaacs -0x9EEBCF1A209A4DF41324DA63BBB12342B32DF847 = _NONAME_ | V | 0xF444AC976469E685101D65E3175E632E ; libaacs -0xBEB9980133A62672178D1AEBF90BD32C4EAAB3AF = _NONAME_ | V | 0xBC1CE176CE5F61EB4B5E8EE61DA5EA4D ; libaacs -0xEB9A89877A59C260D06E1F36308D90C7B42F2DB5 = _NONAME_ | V | 0x2DAAEB1EE3E6CEA9F48A2512C16A496C ; libaacs -0x21A655E2FE207F7CB7A1E43189AFCC78A8AC5DBC = _NONAME_ | V | 0x6537565A8D08759486962CFAE9F7FC99 ; libaacs -0xB8071B0B0A5B14E71533FC838F8BC1B8EAA8A8B9 = _NONAME_ | V | 0x3E5C0F4C645D7876A88A2013CC45CD69 ; libaacs -0x4CDF0FBFBDAA379A2598992FB13153D138B8B126 = _NONAME_ | V | 0xB9338DF7FBD651FE02A2E12797BB2BCE ; libaacs -0x882E4E3D0140ECDCCE412D962639CB632C800C5C = _NONAME_ | V | 0x02E0A79071CD367C3C1DE5EE0B45D62E ; libaacs -0xC491472057AF826340B244553A4F99F015096659 = _NONAME_ | V | 0xE5DE994CA663277098DDC4F8CC8FC0F1 ; libaacs -0x73D18C50DBBC992EBF9EF39465E38397D3DC12B4 = _NONAME_ | V | 0x079FECC022EE6ECC1F68CCB6BF7E4E13 ; libaacs -0xA571C1A217F8D4F8969A15568FE75E77AAD80BE2 = _NONAME_ | V | 0x7052168B4D4731B29822F1212FDE1F42 ; libaacs -0x39996FA8E3F7DC1FBBB2594F12930D24C06E9055 = _NONAME_ | V | 0x3CDECA1DB9D6B2FE297B9054C0E7EBB7 ; libaacs -0xAC53C859BBD3AC80CFCE15F44D33131CADEC5063 = _NONAME_ | V | 0x059B3ECF5EBB69E48A82C14AAD46F612 ; libaacs -0x325B27594D63A46F04B46EDD1127834586031FA2 = _NONAME_ | V | 0xA8BCCDD20B47FF0532A4EFBDABAFB9E5 ; libaacs -0x26DE11D671B0D7EC2A1BDC3A943B91F8A4590578 = _NONAME_ | V | 0x783BA2557ECC512CF7947A80D58C0672 ; libaacs -0xEF0EE4D59E97328D783B329652DE9A3AFFFA823F = _NONAME_ | V | 0x7919785802BA4380DDE7A5A4CC02179C ; libaacs -0x1EE13AE681D6249CFE2C9104423EEACB270F1659 = _NONAME_ | V | 0x953AD637D9E2792DCDB62BD8874C5A25 ; libaacs -0xCCE28523FE612DB040F3FB5BFA4B1CFB3418544D = _NONAME_ | V | 0x762AB3758D430FD77E62B721368B1D72 ; libaacs -0xB0FCC2AB46A7288E8E73E0936E46DDBDC9DABD9D = _NONAME_ | V | 0x18A5164BF766C2C3635056CF27B21666 ; libaacs -0x85C61B314D4AE26377472E84F4F22D510BD77E87 = _NONAME_ | V | 0x555E7C1BFBD06451895EC8A6944CA5DB ; libaacs -0x96D441857EE7417B7B8043B55FBBFE4B80C10BAF = _NONAME_ | V | 0xE68F2CB6405621F6AD310622ED0C7736 ; libaacs -0xE623705109AA050E3AB1C1CEB8503D432CEEA2CC = _NONAME_ | V | 0x6E71F8739402C82960286F8CDF413094 ; libaacs -0x2A94535430CAAEE5E16D100581AA5C958F3BDA84 = _NONAME_ | V | 0x135BE9CE20F012E7394FE77920FC9C65 ; libaacs -0xCB140F20B0A38F9C38B4DD7CE7B8CE7FBE1FDB4E = _NONAME_ | V | 0xAC265F7DC8E3DEF7851EDE2D974C8E06 ; libaacs -0x177D0DD08B03815E4BA06B81D46D8B94375EC826 = _NONAME_ | V | 0x08BB26670E9CADAA5AF482548C7C058E ; libaacs -0xD5E056F9C190E8029D5C4A0EF322680844817981 = _NONAME_ | V | 0xE8B1329A424A6B1578032018A3044363 ; libaacs -0xF17D020279B29A5FF5F989A2B733A245C6B74745 = _NONAME_ | V | 0x1B1272EBE8AE84FD400C3006435C8C65 ; libaacs -0x8EAFB1C2AAAAE581C15742D97B406E87FFB6210A = _NONAME_ | V | 0xE0B9E64992E817893A1375D982ECBC03 ; libaacs -0x501F3D98EB5B728CA2FD0B2D9EA15AA3D679CB09 = _NONAME_ | V | 0x58557E0D92A4BB76D0FF0E128F41D764 ; libaacs -0x30C4124E402EDA3308CC5B154AA4A5A9ABC3E193 = _NONAME_ | V | 0x7926CA8361EF4D4FC2CD7CA9FFAB75F8 ; libaacs -0xBE81266717AD004655168B3E6F75CC74F39F4527 = _NONAME_ | V | 0x8498A1470646EE9DEDA2FD0279E885B7 ; libaacs -0x6E11F618AEAE9B234B03C106CA9014F877BE4C05 = _NONAME_ | V | 0x4F8524EAD3851CA72995AD0B439FEE66 ; libaacs -0x9BE40AC02003C5462971CD549991E0E5086D4BB3 = _NONAME_ | V | 0xDE808420D1F0E9E7E8F7B32EE521B311 ; libaacs -0x7701451BC8DCB0B65600845494977F6C15835FF5 = _NONAME_ | V | 0xE774D689717A9F5010548C111DF9DA0A ; libaacs -0xC604B3181AB0B8B12C853B4E4408EF29FF39B1FC = _NONAME_ | V | 0xEDC89BC40458E4BE69418513BB729AE8 ; libaacs -0x27EEEA5D0B39F8F282E5FAB90CEB635784CA9C97 = _NONAME_ | V | 0x10933C0036E8FF95B1BEE0563CD7EE61 ; libaacs -0xA75ADA921A11C9A83CA216CE91D9AAF81F1F0F79 = _NONAME_ | V | 0x812D5A042924838F3C637E6EF1F8FC0B ; libaacs -0x87309DE5059B77E3EAF013C2A2185575243F7A8F = _NONAME_ | V | 0x243E63FC6C22445D03494B8C08C9A411 ; libaacs -0xBC9BC9A8EC9180000E4DF594B2627519BF90CC14 = _NONAME_ | V | 0x4176FDED93C45EFE0BE995547EDF7E5E ; libaacs -0x89BA0D00901D093D99DA9EE8C877169EF11AB748 = _NONAME_ | V | 0x75BF9D36A806B10FB147D13E5F11E8C6 ; libaacs -0x3891380BBAC1A994B4BD52B1E688D19A842E99E7 = _NONAME_ | V | 0x3853964D06B071E55F69649FDB114003 ; libaacs -0xE92F523C45003DADE052F453B40AB2E2E24188F3 = _NONAME_ | V | 0x0402EC3F68605ADE504198541CDD691F ; libaacs -0xBCFDB856AA3E01AC1CF850855D204BE24F080DE2 = _NONAME_ | V | 0x892807E3A23DB3F2761D6F59A81F9EE9 ; libaacs -0x19E266622F398EECFAE69C849194ACF8F802762E = _NONAME_ | V | 0x7E5D16A322E45CA31FDCA65E161A0943 ; libaacs -0x5BB76080B46FAC7B6C9C19579050DCE7C784BB81 = _NONAME_ | V | 0x10E46D43138380CE9AFDEAA952D62C85 ; libaacs -0x327B5C2283DA8573E04D54AF483A2EA4DC1DFD34 = _NONAME_ | V | 0x2D6750088BD6ED8F9A43B148966D7458 ; libaacs -0xBA708D63BFBA029009BCE4BB26C78052DC1B1DEA = _NONAME_ | V | 0x8D65FF35716CB3730EB1C55EA3C04E65 ; libaacs -0x116FED3C82AD177AE7C4614C704E320F7BF152CC = _NONAME_ | V | 0x59BD8A77CD6089576478DA117E45379E ; libaacs -0xA739E548DC245F53D478BF601D34EA96612889B2 = _NONAME_ | V | 0x3A9379C82D814D283516FCE7A10D59F6 ; libaacs -0x09B31747BA73DE7B1D02C596858218587A3E9464 = _NONAME_ | V | 0x194562A6293AF0705DE0AAFA1AF298DE ; libaacs -0xE903F8C9F8612732DFEF39FFA72A7B2FE12EEA95 = _NONAME_ | V | 0x61E4EB7143BA9232B644953CB4299E8B ; libaacs -0x90FB74F37BC3E73381F67E1AC24A6D453244BE2E = _NONAME_ | V | 0x2376E40AD03110900F6A278A4BC7F6FE ; libaacs -0xFD989E0AB86953C5B7F5DB326D51EE69DB5E4549 = _NONAME_ | V | 0x6695087C8994E8D69E4EB5EC0A8A6A63 ; libaacs -0xABDBEEB64A9D86F8895945A1A3FDC25A650E1058 = _NONAME_ | V | 0x8DDBCFCF8C570A0469A2B7BD3B8DAAA0 ; libaacs -0xCC2A3D2285919B1ED3639B0B9755BD561F12D9E8 = _NONAME_ | V | 0x4FF5FD9D294A14E7A3928890D4A51A07 ; libaacs -0x2E4D459D959A6E307AE51A52E518F8343F0595C8 = _NONAME_ | V | 0xE18C931D1EAA9A388186164FA4C0B2EE ; libaacs -0xA67A39E106550FDEF6D592E2E8A6F282222CBD75 = _NONAME_ | V | 0x5A269CA3F68678886D55456EE35DE0B6 ; libaacs -0xC9624C97C54EBDF27929D9E4220513C6FD6E0E2E = _NONAME_ | V | 0x3904147C9714B3E61C646C712B0FFCA9 ; libaacs -0xF8DFD32D0425D899E47253811DEC2FE8F7D15778 = _NONAME_ | V | 0x31BCEC5BB5367F30768DE7CF6D0EE6C1 ; libaacs -0x1C5C752271971262BBB0FC41915E7EF4414784A3 = _NONAME_ | V | 0x5BE4554E270ECDE8DCBF430B56A7A5FC ; libaacs -0x79A5C6B031ACA88723F5D2601DC6D154733B02CB = _NONAME_ | V | 0x4B5B060D92E0E3D6FFE6896CDBDB2297 ; libaacs -0x4587E4EC3A7262163713E4A1A83C3AFE13A82A2F = _NONAME_ | V | 0x2D03D1424E064FAEBC1536224BDE97F4 ; libaacs -0xC44FFD0968417125655E4950C2A8F39AA9504917 = _NONAME_ | V | 0x31495D7016ABFBFE06342E58C69F5BBA ; libaacs -0xD3193BFB552BD87869AD91A712ADA890DBA8B868 = _NONAME_ | V | 0xF2EF5DBA5F3633A40E7F8D5D9B73B335 ; libaacs -0x56F28950686D45A8EB73D8AF6D85A4A175FFFBFA = _NONAME_ | V | 0x1005C308AFB49DF03717422FB286DAE4 ; libaacs -0x44EA619CC901EBFCCE5344A37AF68C1E7E30EA0C = _NONAME_ | V | 0x2CE88304E8493C3C7F161ADC38BCF75A ; libaacs -0xB290DBCF47084A35CC93DF1C796FF2A07999DA11 = _NONAME_ | V | 0xE7661782EC9C55BAEFDE862FEB6365D5 ; libaacs -0xF4C18B584BDA93D54EFE6BE14B63CB147EA4172F = _NONAME_ | V | 0x834FD046C0FE04CF1E0D1753F385AB80 ; libaacs -0x9AB2453B08F2ECC6280BD2F3C421B68055806DFB = _NONAME_ | V | 0xAFC04663130EA121F63AD24300108950 ; libaacs -0xD87D50F86D84349B5B10B8A30C8829DBA0DA6EBC = _NONAME_ | V | 0x9BB0533FBA70EBB5D9333C4921A152A3 ; libaacs -0x727F609A74918EDA9E766B18F34ACFA9648C06AD = _NONAME_ | V | 0xDC186142443232F24D44A09AD03FF3BE ; libaacs -0x41498A3ADFBFBDDAD66EEBC2B5925F23C3B33D8A = _NONAME_ | V | 0x7595B7D439D9FB759E05E6476412ACF4 ; libaacs -0x38D6E2DCAF01D7052670B0424B3F9E72A8DAC805 = _NONAME_ | V | 0x81063D012583DF6F8AF062E8C26F1B8C ; libaacs -0xCF7420A3DF8DBCD895B7C60695E3BE6D63134F89 = _NONAME_ | V | 0x12F122886A1E808769003E8A9D0C91F3 ; libaacs -0xF694DFFAB1F6EE6885575566AD239A07BDD77DE6 = _NONAME_ | V | 0xB4B34A5EED0D620C6F83D766903B8C09 ; libaacs -0xEF3110744C67D1F28B0FEBC7260E22645B45B689 = _NONAME_ | V | 0xCBBA84C571874E599F10AB6C816C5B36 ; libaacs -0xC671DF4B318E87238260C6D251A9792BA0A24A7F = _NONAME_ | V | 0x31B948950ED96B14F2BCF9AB9ABDC409 ; libaacs -0x4B7F5989A3287C200377BD3BD4868DAE1C1D4F09 = _NONAME_ | V | 0x9B05E58321784A7E91FD36EC3ADB1A6A ; libaacs -0x5D77ACE5FB0F7CCA38F34F9F80B1DEC99A12C5D6 = _NONAME_ | V | 0xBEC08BE81DB40C5E8C9C728375CA9354 ; libaacs -0xB4C46A11257C5ABB360708527A57A02DFD1618BC = _NONAME_ | V | 0x9D829C5B9441EC0B56617499DFB4F632 ; libaacs -0xF01F341F23E47B620811D54DCBD2ED59CC5D2758 = _NONAME_ | V | 0x63E6EACB525DAFF79D8A061B384A45A0 ; libaacs -0xC789F6DC258C86E911B7FB7909D77D9FFA9D8AA9 = _NONAME_ | V | 0xDD1E21B8CF17B2FE1C0E158643EA12E0 ; libaacs -0x0DD421954B29F12346712C6884F41A0FB005343D = _NONAME_ | V | 0xB7B6B60E68F42D730727882C4E4199EE ; libaacs -0x04319BA0944BEC3C3A2960B3300DEFB108AFBDCE = _NONAME_ | V | 0xA8DF9FD809058E603231348D05C575F8 ; libaacs -0x7ACEEAC1644A7E84B3E4C207D25A7D2E597F8313 = _NONAME_ | V | 0x6BEB04DD132817E8AED99A716A68C667 ; libaacs -0x9AF0F91C81FA46448FD498F2E4C39F832A2FCFAE = _NONAME_ | V | 0xB5C611FA7976EAA0AE11AA5FE6B436EE ; libaacs -0xAC619331D530974BA9B317505D90A3A9E732272A = _NONAME_ | V | 0x8B73C9CBD1284263AB820EF85D30A4B4 ; libaacs -0x1B6637E793B4E38EC672D45A4B87C4568F40EAEB = _NONAME_ | V | 0xFB1EBCFF38A1564AEF2BF68CB648522E ; libaacs -0x5639661429882C0E5A31CD0BB33FE5E9C2B6AE95 = _NONAME_ | V | 0x67792FB277CD114551ECF2C27DAE54D3 ; libaacs -0xAB4F20BA24ADAC68A434696FAA632265B3524100 = _NONAME_ | V | 0x3560DAAD2FED76910901D173BBFD3C03 ; libaacs -0x9E0E08F947AFCAD3D65A232562C9F67883F34DC4 = _NONAME_ | V | 0x083552E81DFE77A209E466F1EA5B5AC6 ; libaacs -0x4DC6ABC3E08D1C9232096E63415C3ED9F99EE4E5 = _NONAME_ | V | 0x14BBDEB8E1A74636B8E1A1D041555AD5 ; libaacs -0x1222CB356F5631BC892ACCDFF2C25BCCE14AABF1 = _NONAME_ | V | 0xAF7348C4B5A13BC537FB992DF60F4D34 ; libaacs -0xA51FBD7066F2A10B15F46DB32B8F0BC0E11515BC = _NONAME_ | V | 0x8B6BE0979B1104220B76BD87C55391D2 ; libaacs -0x5D3F9DDD13F9DA7444672EF20A820D254D80BE9C = _NONAME_ | V | 0x9C84CEBAEE194C7EA2A252BF4932F344 ; libaacs -0x9BC7AA80BAACA6766B9C1CB34DB81588DCCB517F = _NONAME_ | V | 0x8D3614C5D8697139C3FD6FB7DFBAF48D ; libaacs -0xCD66F3473B311A6A0B5A35304B0201455D2E9C28 = _NONAME_ | V | 0xD0553FC5A1FC5D2A1A1040DCFEF27E8C ; libaacs -0x6B86DB40BE92314D9A7684017043AA14EDE5A9E0 = _NONAME_ | V | 0x0643293A600DC62E9BCB5D88D947163B ; libaacs -0x8BB50F9F8024FA8E0280F3B61F2A2CEF12AD532A = _NONAME_ | V | 0x253C303A1D3761CD93D8B991D9821F84 ; libaacs -0x618868F2A50F7DD697B0D51D1B9FC88B34BE2925 = _NONAME_ | V | 0xB1B871479D60B758FD2E22DC92BF1623 ; libaacs -0xF2683B4459337BD8CF390AC25D86756F05749D40 = _NONAME_ | V | 0x5F7F9E25AD276130A9BD578818D93B9B ; libaacs -0xF316EFFE9826E33F8B75C73F535F0E987101FED7 = _NONAME_ | V | 0xA696036007BBB5B18B71DCCD8402B648 -0xAAE361CA335B21FF8B70833AD7BAE1A0EB5A669B = _NONAME_ | V | 0xCA1B9EDECC61DE21E53B9EF8912F83CD ; libaacs -0x598AB4450836707998F61D636DB873F6EEF83868 = _NONAME_ | V | 0xEC84435CA5E8442C5834E9F92D87E991 ; libaacs -0xEF6E7D65B8E0CEC068AF39366F759E046EDAAEAE = _NONAME_ | V | 0x76F38FA352582319FAC494369ECCD356 ; libaacs -0xA222C3559F34A816D3A70927CC5B74392048FF6B = _NONAME_ | V | 0xBE41109896FED7193AF95530E1F6B44E ; libaacs -0xB11AD433D3D05E00EF44F7D439789A6C31E6A031 = _NONAME_ | V | 0xC325776B38CCFF457E06BFFB5B1C7CB6 ; libaacs -0xBBDB4009E23031C7FB48E9DB8F489753B3270F13 = _NONAME_ | V | 0x4299E9B7C53B5C467DAC2BB81DD2E347 ; libaacs -0x79F593CBB168F72B1ADB2737F835BB4E948F5D64 = _NONAME_ | V | 0xFB44F418C5777AA5C216187D39EE5B0A ; libaacs -0xCF3C10D680058619F22E084C64AD74773E0DBF53 = _NONAME_ | V | 0xC58F80D51FD7172341B8FA0BF8C6BF6A ; libaacs -0x9648234A1ECAD65430B7E0647FE1156660B6A895 = _NONAME_ | V | 0x5E61A064BEDEFF4DD6F5D8B882D65AF0 ; libaacs -0x8CCB7AA7AB05AA9F8C3625BA9A9A3330E2BF4A33 = _NONAME_ | V | 0xC2D905E71D6451370E395408CA189033 ; libaacs -0x57FD65A87EE92A6B4934F920784C5D7D1E4D38AF = _NONAME_ | V | 0x7D224D87FED072F0AE0D45EA66962EDB ; libaacs -0x14CAC049FF07C99136FAE41F69A2EBB0818B7998 = _NONAME_ | V | 0xC7B5BE52AB2A4DD10212838D9790509A ; libaacs -0xBE7C5922024CA1ABBA7A9FD379EBE6382544CE38 = _NONAME_ | V | 0xA544F7770B1BAEDE931C309EBFF7F5C3 ; libaacs -0x14F205367F9B3473E1C2A92A980C66C1ED9E7584 = _NONAME_ | V | 0xBDD8DAF47E803698B871CAE9F7709E3D ; libaacs -0x57EF79DB6C65CEB9CD4B38F58B6152BFAE798C90 = _NONAME_ | V | 0x4022BF074AAD382968335B1DBC0BC84C ; libaacs -0x20722885AA9D7DE163A0C771304AACA414178A4D = _NONAME_ | V | 0x0C963D5FE70758A4B9B67CA4BCFADFD6 ; libaacs -0x6B4FE16E91778E7EB955BD5E2A756ED043F46BF8 = _NONAME_ | V | 0xA4875F7ED2336A45BA0CD2D72546073A ; libaacs -0x4E1154F542C983B849D0C36EBD48E7D4328C18F9 = _NONAME_ | V | 0xAE6155B7DE4357B38CE63ED033777CBA ; libaacs -0x23A88168B9229F3EC8E5C2D89963A3F1FEF94A94 = _NONAME_ | V | 0x5AD509B1A294CE8F3F509DC77BEC6FBC ; libaacs -0xC653D56DE287BEA501C752338DCC147922910A38 = _NONAME_ | V | 0xFC9F403FDAA5FFF2DC769617EB63AEA9 -0x7B8D705834CFDD5C1CE01DA707E4E2CD5DC53145 = _NONAME_ | V | 0xB9B9AB993528C574B821080B15C7292F ; libaacs -0x9E586F0DD0A97CACCE9B27092508E08B03950B2D = _NONAME_ | V | 0xE74E0014CE913B723F300B12FBC6BD2C ; libaacs -0x443D1574F893A5BBC897CE070BE7681E5926C740 = _NONAME_ | V | 0x969F3565B15A7C15D322F052E4373144 ; libaacs -0x9FDAEDAFFCDD12459EC14AAF7B7406530C3A186C = _NONAME_ | V | 0xE1A3E44C0A99D9E95ED803F62F760944 ; libaacs -0x123A86137E7A4B0BAC37673EAB4475FBDF77324E = _NONAME_ | V | 0x0517E07C9D2A08513069190A7D7F7B44 ; libaacs -0x062154C6B118A10D7E6E97893546F341DD2ED43E = _NONAME_ | V | 0x9BC6057EC3080D43426D9880F4B145C7 ; libaacs -0xF4FF6AA87F8467B20E1196F894A01653CA231A1A = _NONAME_ | V | 0xD3949FC0CFCB34A65188A83141C6B302 ; libaacs -0xF172BD954EB270570A8B2AE2A86FAFA1B0EF7255 = _NONAME_ | V | 0xAE8A9341238BD4BF6F719CC789C8771D ; libaacs -0x967630227C32CDC0EFAD47EA818261C302C2A9C5 = _NONAME_ | V | 0x0D93ACBE4736FF122D9D7260E8B3390F ; libaacs -0xCCB3BAA8961CA46870E04711D062D3352E9BADA2 = _NONAME_ | V | 0x11B5E2FB9AD5A32A353993FD4BB04702 ; libaacs -0x851F90F3C1112292E08B1CEFDE440A3C5E92E257 = _NONAME_ | V | 0xB39B69ACEE1B0706C31CF8C97EF51D83 ; libaacs -0xFBDB627D1BF41C0CC5BF8D7CC852BFD2ACC3F0B2 = _NONAME_ | V | 0x34A17B235E0E3B329DA7971649878A88 ; libaacs -0xC8FD4D193E96536869552280D0F8A01BCF541100 = _NONAME_ | V | 0x7366CDBC0DA868BEFEA419B35A1B6AEC ; libaacs -0x85651BB4EE8CD121ABAA3CD59BEC0E1972893DDE = _NONAME_ | V | 0x88705BFAA1E3F521D1D305719880E855 ; libaacs -0x83891DDF2868717637C6AEC9FB484A5F39F01849 = _NONAME_ | V | 0x4CC805ADC2A09432721D82EE08576D47 ; libaacs -0x262BE8E30D9764198BB8CDE6932710208A960B76 = _NONAME_ | V | 0x6B3F0F04D0B1A0268BEF8AFF56B3C99E ; libaacs -0x1E20DFE826471968C1512C2478DC328847F12E5F = _NONAME_ | V | 0x7CE94FB1D97FFE223BCA0C1B5AC106E3 ; libaacs -0x8CF6B996DBB50A24E35139678746519D4D735848 = _NONAME_ | V | 0xBDD9E7A91C1B581341144B54F844AFD5 ; libaacs -0x6D182B8E140CF654ABBA4060ADE2F9DCC5AF6038 = _NONAME_ | V | 0x3DC599E5B868DD576AEA7EA32FD61702 -0x32845A2EC0E3B128F0665AE265C481AC8ED761A1 = _NONAME_ | V | 0x715F8D915E5578383BD33A327D65F1B2 -0x12A2ED13E79FCC44E9B0D87A03F03C4A33BD7A24 = _NONAME_ | V | 0x76C9958F34A8FFDDE97FF4F1F40FB31D -0x6653470BEC83A3507BDA8659E55EBF5FF4644AF2 = _NONAME_ | V | 0x0F8F1D385AFE9C7A39F6D554EDC1C055 ; libaacs -0x78CEA103D1DBD2222AA7816D4A802C3277146CEE = _NONAME_ | V | 0x09A2998DB92FCEE0D8833FB1CB3887A6 ; libaacs -0xE61C5544B60589BE2A75D5CB3973506BD70265FC = _NONAME_ | V | 0x9717233D4056A638B4CAE8CCFCC992C0 ; libaacs -0xD5932BA2B6567FED9051228C9D06FB430AA670C9 = _NONAME_ | V | 0xAC1D4AD76EAFDF4886B3D93CCF1E28F2 ; libaacs -0x6257032676BCC7D5EBD6D0D422A74E7838739864 = _NONAME_ | V | 0x942C17747DD2F3E15A7EA1222BEABEFE ; libaacs -0x12C7321B60B4BED9F26125ECBF131FFE609762C0 = _NONAME_ | V | 0x1808FF15BC1FAF28C7F4AAB8F5AB2C7F ; libaacs -0xB81043C97548EF28C2FB3D860DB2E798457898B0 = _NONAME_ | V | 0x57347BB376AFD33F9FB3A93A8A02FD98 -0xE2C45E7F5CD366AEC0D8A3FD4A277AD07F6FC89E = _NONAME_ | V | 0xBB686FA6197EB6C4FCD0F4A8B0B07B56 -0x22CB7F931042BF821B34FD8092E9BDC0F05D6E99 = _NONAME_ | V | 0x977CEB53DA59E9BD36ED0DC2F7CDA3DC -0x016B2DAD9D09AD5794265268C6248E00B065CB21 = _NONAME_ | V | 0x13268A5214F8518D4AD0303A8EED6863 -0x34F1FF17176AD6715D4BF438E0769BDE726B0E5A = _NONAME_ | V | 0x6AE54A77F68EF0CD039CBB3F87847ABD -0xA98F411D209BDBE4E2628CD4CB445D4A365BCF7B = _NONAME_ | V | 0xB391938EBA7C164CB3F8764881A82569 ; libaacs -0x57983A3D91012C89363B43A5411ED7E4CC9C0C12 = _NONAME_ | V | 0x4D0871BA01CEA6A3AF67EC7F9D485074 ; libaacs -0x26CE0D188A457010D74B4EF2768DA555C2CFF8F4 = _NONAME_ | V | 0x70DAACE2A57D28AB3DD7A3CC52168F88 ; libaacs -0x49F926FC3AB82E826983BE01E5B24DD256EABE0E = _NONAME_ | V | 0x94C859C739F92B5B5607DE0770C1CF5F ; libaacs -0xAB940225E51BA7E8BD2CCA2005FD7FF704B3B204 = _NONAME_ | V | 0x731BD23D550BF47F79F816DD7757D1DF ; libaacs -0x67784C1ED77AA0ABDADF04005D98C9F3EE24DDCC = _NONAME_ | V | 0x098618496FB808CAB269B52BC138F603 ; libaacs -0x7149AC54BFBBA7F26E31A3D6CD416C6AC1DC2B2B = _NONAME_ | V | 0xA55951FDA31C93306DFBC2A0D4A3FEC9 ; libaacs -0x309F242FEB23C29B75E43A8E8A5A9ED94FC8CC72 = _NONAME_ | V | 0x10489DE84F12BA93FBA964F02038DF42 ; libaacs -0x4202AF27D4027E7DA2D9903686953FC7FBC3A394 = _NONAME_ | V | 0x0345DF71D4357BD03D72C97764AF6444 ; libaacs -0xF5B2B4AE05B220BE2A19AC599A54EAE86312B0A4 = _NONAME_ | V | 0x3F2AE92D49CE0DDA651F73C43D1B6A39 ; libaacs -0x987EFFB6FBE434237EE50C7D05B84886DA7CA2E7 = _NONAME_ | V | 0xD1397EB654CD03C46620D0B28A0F1DD1 ; libaacs -0x5AEDDF3669F1E835F0F15AFCAD1F8D84A31CC5BD = _NONAME_ | V | 0x36629EDE720D63C16167D72929F61CFF ; libaacs -0xAC5C2D7F29B6B8555D136BC11198B3984A14B00E = _NONAME_ | V | 0xD4AFE5B31B1656134076EC2BB2EBB127 ; libaacs -0xA208BF949581785F33F5A875CD89431908A39BA3 = _NONAME_ | V | 0xDE2558A6F0E2A27F0D77ECB9682E75C2 ; libaacs -0xB37BEAD31D9CBE0FD551B8A4A81821C0FE175EEC = _NONAME_ | V | 0xC71DF55E56D8B987AC85F0FE63CC336E ; libaacs -0x15CE46224C99098C2E9E51A15AD7F6607B7A7362 = _NONAME_ | V | 0xE087EF6D8F2A2C3ACBE216F3E30A5B0C ; libaacs -0xA41785E22EA3EC5FE6F9C6644D5CB5880F5A17B3 = _NONAME_ | V | 0x5BDC68B1194E7831E5FEFFE53F4D454E ; libaacs -0xA37A1189D4C5B14ABC3EA4300C7C3217971D0E2A = _NONAME_ | V | 0x997F81BD476B098AAE9299900ECD782C ; libaacs -0x40D917AFA29161DBB95914FF2622A55B98601F5C = _NONAME_ | V | 0x28B6EBB827F7FD8387DF1C99CBE36CA8 ; libaacs -0x156F1435CC12FF57441EFC3BFBD44F9612657F92 = _NONAME_ | V | 0x513482D7D91CD91ED5ADC8ED313880D3 ; libaacs -0x4503AF8298CB13DD15D17F7D3F7E85E3BA40C4B6 = _NONAME_ | V | 0xCC3CF251129A06465314836C9A7E55BE ; libaacs -0x613A4B8D1D6B82208D757D646B7E04FD479C6883 = _NONAME_ | V | 0xC3A08A2B731795343B3E4D7344EB02D0 ; libaacs -0xA19ED577B7ED1CA5C26083B51F4B3B4162AD2EC1 = _NONAME_ | V | 0xCA67D25BFF9BD6F7DEB04C13D9FCEDBC ; libaacs -0x8C42136F6BC2E9B0DF2BD7260B44AEB64EF6595A = _NONAME_ | V | 0x7D63D270A2E3BF09A68EF5BFD0EF1637 ; libaacs -0x7BAC71CBAF473ADEF9A8131AFCE95A7D7511D993 = _NONAME_ | V | 0xFB178B8EC97DB50C6556ECA9CFDD4168 ; libaacs -0x5E9CA21137A9093EB86605D583568083480B0D4A = _NONAME_ | V | 0xBDFD36AC77393D40A68347DE1DB54576 ; libaacs -0x440C9309C371CD255CE585E344355C82B8761E75 = _NONAME_ | V | 0xABEA063CE93472B62CEB6323D49F794E ; libaacs -0x12C7BD6C65DF572702916955F50786FC80DD7A75 = _NONAME_ | V | 0xF9705C2F7DBDA9FA293D9F1FE2A1190B ; libaacs -0x0841E551CBF6CDEE61117F99B25D3811B6CA7274 = _NONAME_ | V | 0x850C54717BF28762FD945678E5D68004 ; libaacs -0xA0B0CBEE8F91CA318DA7357A00499126C4A6EF40 = _NONAME_ | V | 0x2F7F41866DC6B51E63D482B480E9F01C ; libaacs -0x4C1F3CF3491D6042E803BE08944ECF92E20425B5 = _NONAME_ | V | 0x6D6ED359D694C7A28D800B8EE0D70384 ; libaacs -0xDC7BA9D73EB8763D6CE1A1C655E83682AA1232B8 = _NONAME_ | V | 0x3062350B9337F6FE3032FBA1845C912C ; libaacs -0x7837FEA7B586CB7858653FD977573DDB9D2A5BB4 = _NONAME_ | V | 0xBF0912D9E129F6A199652CF7DE3E43C7 ; libaacs -0xB38CE2F2DD4420ACEA84D69B30B259688371E90C = _NONAME_ | V | 0x97DBA9997A167A0A685BD2572F76E828 ; libaacs -0x8894CDD4425AA24434E633422F9E04034FF1CD8A = _NONAME_ | V | 0xC4FAB728F12007B8C8C85A0772EED269 ; libaacs -0xDA4C4D64E2E9136D01AABEDAF69BDADB2BE7688F = _NONAME_ | V | 0xE0C4FC028021705C7F60A6D63382E533 ; libaacs -0x91375C360A66E255C6FA5A5399D8FE7F538615F6 = _NONAME_ | V | 0x9E665962F13E6B96833017AC96F0CAA3 ; libaacs -0xE764C93DA4D39F4BA9B969B908930FEC3E28F038 = _NONAME_ | V | 0x253AC9DDEEAFA73664F84C1455EF6CA7 ; libaacs -0x76FBD62E22D7DC2ED014BAA4A6A15EBCC5B448E3 = _NONAME_ | V | 0x28205E8AD474C0E766C357376844EE1F ; libaacs -0x724C5E77BA48507CF162E6305A75CBF0DA3C45C9 = _NONAME_ | V | 0x2BE8C1C3910C7727708F5931C28423E7 ; libaacs -0xF61B5EF7A258BD0817C9387973379CB65240BEF4 = _NONAME_ | V | 0xC4CA9C93E4DFC64C7D6F20D4D4F4B018 ; libaacs -0xB18A1A30FEEAE66289BDB721DB00FF9B791E9CCB = _NONAME_ | V | 0xCDAD912A09D44B153EC18DCC8250ABB5 ; libaacs -0xF01083027ADAD1A379607FD57997DEC159952EA2 = _NONAME_ | V | 0xB0DBED2A56661181B0886E198E5AC81B ; libaacs -0xD901301C67C6F78A3284B23BBE2F045952D45FEB = _NONAME_ | V | 0xCEB26E6370E1463F5622F8E52DFA81EF ; libaacs -0xAAD01272F48DDE13AC86A6EDACB40222F3DB9B11 = _NONAME_ | V | 0x1F16A3CCF1542192A79AB2DCF0D1E959 ; libaacs -0xA63AFFEB8359D39FA09B514C22761D110F327EAA = _NONAME_ | V | 0xB39F0048CADEAC376E195D966E4FAD6D ; libaacs -0xBFD424D5BE143F08B324F8F809F9DF51AE486A53 = _NONAME_ | V | 0x65EE796AE3724BCDE8800D37480B4929 ; libaacs -0x7E57421D49A834DE8B8411230287A9235B039F6C = _NONAME_ | V | 0x13F83C55B5CF877AF262A6F6CE794C5E ; libaacs -0x7D39099A7BE44B97DDC5C6EC15E392C58F380A37 = _NONAME_ | V | 0xAD930F0B2B5B28D6B84A938FBB568806 ; libaacs -0x7418075C50A0B82B9724BAB2FE151E0DCEA4988E = _NONAME_ | V | 0x47C0EB577A82D6B8325C8CD862E79F2E ; libaacs -0xB1F1E029FA95661839C10AA84BE2D117216DB51A = _NONAME_ | V | 0x519FF0E1F3F0CEDF9C524397915734FA ; libaacs -0xCBADEE978FB4DCC0D93859CFE8A0211BDE2F8E4A = _NONAME_ | V | 0xB66A146E6EDD80544F84BCA9D7D04E3F ; libaacs -0x63D711AFA60B5F13A60A425CE975AD60CE20C0BC = _NONAME_ | V | 0x9402FE81D6559572DE4732E3E5E750A2 ; libaacs -0xCC8828C47CE75668925514C7D393D12BB1FB4F49 = _NONAME_ | V | 0xA52AAB8F88DFF8F4A0B840675CD781AB ; libaacs -0x799F7BD9E38D8684923C941B1FBDE64524396CC1 = _NONAME_ | V | 0x763758A1BD3BA63E559F283ED143CD9C ; libaacs -0x1EDD25E6277DB226EBEB4F8392CF7FDDFCCE9FBA = _NONAME_ | V | 0x5144A6A5938C17F25AFC4587EE857A32 ; libaacs -0x5FDC39B0784A3AA50D647097166C67679A5B4892 = _NONAME_ | V | 0x9A336B04F56EA152B62EDC80BB701BDB ; libaacs -0xF8D5BC56375D5D959D09134A8D58CAECED942F97 = _NONAME_ | V | 0xA1BFE441D0EFC119372F48097897FB31 ; libaacs -0xEFF0D16E0E5D121495D4F4B8A585773A74358FF6 = _NONAME_ | V | 0xDC9DC818AF158D912509CEBEE63ADA2C ; libaacs -0xF665D1B1CA4CB84C1894F958B913FD545A129A81 = _NONAME_ | V | 0x7E141DA24BF08BF06CC7211B8FC32899 ; libaacs -0x39F9C59B6564563B2AB7710209640E1C7F30A4E1 = _NONAME_ | V | 0x4DEC2AB282D2AA8747BC01DFF8D3B36C ; libaacs -0xEF9812B9BA98614E93CDE1492E337FDF63C4410A = _NONAME_ | V | 0x53F2F4E55FE62EFE8DD78A8276DB6065 ; libaacs -0xE7D079C68F21AE4D1C9BC656B44FA19B176CBF20 = _NONAME_ | V | 0x36199B5A908E05C729C6076BACF7C353 ; libaacs -0x77E8A520E84F02C4D32E759F98B2D100E09175A9 = _NONAME_ | V | 0xC9A546B9FCBD8CEF143DD2ACAC389613 ; libaacs -0x527A7C9253E0FFD69FB1EBE761FB9D57F8899EA3 = _NONAME_ | V | 0xD510109C5A90E292D0AC240972083876 ; libaacs -0xC0AEE7CF418377AE5F16CE65F1A87632BF0B076E = _NONAME_ | V | 0xC952404F7EF97B6251FA4A6F96DC827E ; libaacs -0x412D9A6CB4EE3CE6AFA684E8758951DF3537A862 = _NONAME_ | V | 0x2E51D794FA920E6138B433C36D6865AB ; libaacs -0x98B966AE54ADA8D1DD085033D7AB7ACC07702327 = _NONAME_ | V | 0x87381EC41EF1D05437D7352529FD7C39 ; libaacs -0x67740B13A120513290F66A8B8F06DB392D8DEDA5 = _NONAME_ | V | 0x28CFB6FA1E98DD3D2B64EED301FF4E8F ; libaacs -0x79E7ACDEE52E50678CEE698787F1CB93C365F9A2 = _NONAME_ | V | 0xF3F19A93EC7C71791CC38D8560C7297C ; libaacs -0x3498F554DB06E48CF0B81EC7AD4F21F83EC0ECE9 = _NONAME_ | V | 0xF7B139B053B72B19FF6AF9EE5B11E4CA ; libaacs -0x8166065F235F792B0855AC2D7337012182F62DFD = _NONAME_ | V | 0x714DF52AEB321D6F5DC103C713A5BCB6 ; libaacs -0x54F976C9270FF99FB62BFCEECE44759D8E2007B5 = _NONAME_ | V | 0x43A29A89D17968093DE4A4735EDA99E4 ; libaacs -0xF6EA282F5C374CDE591825D1AC5B40C5964194E2 = _NONAME_ | V | 0xAFF549F1DBFB54C20E1DB446C574851D ; libaacs -0x16437A90215623E9A399EB52D59A03C3B34F91B6 = _NONAME_ | V | 0x338CF8CFF3303E7D84BCD4CF63192009 ; libaacs -0xEE28A5DEFBE2C4404215A3659FB32B81CC1F4E1E = _NONAME_ | V | 0x7DBEF161C3E6731ABDE9432DB30C3B7D ; libaacs -0x55F135C3AB6E0D03E8FD88BEC701757E33827ED8 = _NONAME_ | V | 0x7589AC2A0EE444FDA9F08FA96EB9CDEF ; libaacs -0x41B0E3C3DBA3AF5A355E6AD096AC89316A75BB9C = _NONAME_ | V | 0x892059C557FFB612567A2AB9A7C9BB4B ; libaacs -0x86445CA5EC47CD41F12EE24F7AE0569365E15B9C = _NONAME_ | V | 0xD1E546C77F85F899D46CB336B8C79F0D ; libaacs -0xF918E1F7CA4D06539B824AC5F0674650598C5672 = _NONAME_ | V | 0x8D8139C674269809ABA0D2C17EE797EA ; libaacs -0xF42E66DE6ABB3BC1102F1AE99553008FD951037C = _NONAME_ | V | 0xD0D396346C8221793B3C64C3CB595968 ; libaacs -0xEA1A0ACC37EFA749AD64C05309CE3D75F0E0338E = _NONAME_ | V | 0xBE4455D5CDD380248BA288A6C94F458A ; libaacs -0xB4ADC542F05C6A5644EEDBC34F046DD45633F885 = _NONAME_ | V | 0x955694E17C494231857DA0C514D01A3F ; libaacs -0xEA8AC24A8AB2846922FCB6257711D4C9B0B69D35 = _NONAME_ | V | 0xF5D01418EA37D84B1736BB5163273895 ; libaacs -0xB11B61669BB68CED600BB9AD5C0869B4FF0A3CBA = _NONAME_ | V | 0x7A7C9BE5E5E7FDE22CECF342647C495E ; libaacs -0xA0CCF9511C19A0AE24385BF004A78181753B73B1 = _NONAME_ | V | 0x62100FC2107EDDA316A17BD1B19DD156 ; libaacs -0x0092A7C9B9E55EA302F16E8257AD43277960992D = _NONAME_ | V | 0xADC36227D9E720281CB9508102C68234 ; libaacs -0xCBA1AEAE5ABEF30FBC3DFA1A35A9C2AED2181314 = _NONAME_ | V | 0x1BD3FA9CB03AC9F5E9E4DF9204A3A6E7 ; libaacs -0x9DDE1E2FC7E0728D4906DA660CE2E5802755BA43 = _NONAME_ | V | 0x9948B4869DB975929A30FA25E52586CE ; libaacs -0xD9407FCDD19DD3B0BA9077ADACA8CDEA76CCBA1F = _NONAME_ | V | 0x52F21EE67866D812AADAA625586DC694 ; libaacs -0x2E52A96C87BF746E155334E37D461913B5F62DA9 = _NONAME_ | V | 0x6F4C907EB9E2B3420EDC82609237D6F0 ; libaacs -0xE8E2D0BE4CA050FA53E689A0C39EE9EDF42FA820 = _NONAME_ | V | 0x149C64F4AAF1390A589B236DCB4FE484 ; libaacs -0xDA5322FD59D4EC8E705D250263D400481F6C6501 = _NONAME_ | V | 0xA7303023E8E0E979A6E8D74725778779 ; libaacs -0xD54D6281018BA92C66667D5EB27FE63634475C8A = _NONAME_ | V | 0xC4141A4A317E0D6D1097A881B343682E ; libaacs -0x9E292A5E4B8426C8918B925DE2AA452F29C3C249 = _NONAME_ | V | 0x05D34644041B3462B01ACE81585D2EAC ; libaacs -0x824551D2DC77D53777BB2370A658116B67DE8EB2 = _NONAME_ | V | 0x52EB5B781889D66CADB732CCA6691228 ; libaacs -0x69DF06EB4DF59862901C312BC623EDB30D9D5D0C = _NONAME_ | V | 0x3BFFAE330AD0959199E97A6A4F86F4C5 ; libaacs -0x4E2196871D4C9D16DE3AAD8FCF3296F45E72BD83 = _NONAME_ | V | 0x054B56EFD5FDF01B68CEF9287C9DB988 ; libaacs -0x3991F3377FFA189D8645A24560EE019A647D9B47 = _NONAME_ | V | 0x2D6A0D3FA28B78BA924321F7BAB2DD27 ; libaacs -0x2FAA9F438D3BF1B47D0F889589EFD5D4AC0473E9 = _NONAME_ | V | 0xB753853904ACF50108E177E548902602 ; libaacs -0xCF04B86562BE158BBCEBAC9C2374CADAF032756E = _NONAME_ | V | 0xF98628E3D670D94B28A710588ADFE5D8 ; libaacs -0xA82D2ECEC04C96DE9B49C77E8E7EF7098198058F = _NONAME_ | V | 0x677CA0142BB5D08B1093C700A0963D53 ; libaacs -0x31E8C392463BB73E9FDECEBF974D415969E46187 = _NONAME_ | V | 0xE5330F888A65451281C1FF9DFF8E5DA0 ; libaacs -0x9333A34D826F95310EE6902BB5BAB1FB743FAAC2 = _NONAME_ | V | 0x864DC4493099081B220724957C253845 ; libaacs -0x4609B7D1619916AF1BE983A0B631993ADA041673 = _NONAME_ | V | 0xFADE11CEE9CBE2A825B67B038AE87F60 ; libaacs -0xBAE4D1592A774FE2E946534A77B8349C60B220FB = _NONAME_ | V | 0x23303F2310038EFB462A6D99C1670C67 ; libaacs -0xE0C853ABE1C9EC1BEA22435F62058226FB0F1187 = _NONAME_ | V | 0x83F12965D0CEA0B8686E22CC68BC7571 ; libaacs -0x0E0117B97C311C77C73FCC161D2C302A6DD54DD9 = _NONAME_ | V | 0x951849AD4E374755402929CE9C5949ED ; libaacs -0xF81998AEB57B1B9DFF42AEB2BCB744A25214BCA2 = _NONAME_ | V | 0x8B93F3B800CF6D4A235DDB042B87A55F ; libaacs -0xB5147EC24367CE927772C40340B5F85F380EA4D6 = _NONAME_ | V | 0xEF48B58EB1A7EC8E0B5C146C9A5F1615 ; libaacs -0xC47B94AAF312B014F087BFA08FCB32EBFF73C745 = _NONAME_ | V | 0x233907FA49F5B33DF7C30D56A5481163 ; libaacs -0x4DDD792C8E09D6E5CADADB9E40DEE84740259B71 = _NONAME_ | V | 0xD82FF19B293CD0DEB9E19AC8262214D2 ; libaacs -0x7BEC329C0530C86F899688326B74C9E529D58482 = _NONAME_ | V | 0xA7EE9276F7E42F971ACC8CE11E2F3134 ; libaacs -0x3C12111EBA0E74B25B02BD33CB67D1BDBB1DB582 = _NONAME_ | V | 0xFB7A6FB5EB2E088E59448269233AB799 ; libaacs -0x9CE52B5900FFDE0434A3AA8D9A50AB4717D141FB = _NONAME_ | V | 0xA6B0F4CFF5111C8C2725D527729502EA ; libaacs -0x50A9FD31655435288839C9BD9B427AECE87F82D2 = _NONAME_ | V | 0x04688423BB5247C0251CB9075F746F34 ; libaacs -0x299D4259387A570EE39A051EC39575AF6326B642 = _NONAME_ | V | 0x0DE7BCDB656EFC5C8A26CABD6BFBD427 ; libaacs -0x7394EC6842DD1D6EEA5A8A2B05ED68EFEE2AD179 = _NONAME_ | V | 0xAE1F8B5FD887A0E6ACE1DCC026F4B706 ; libaacs -0x74ED72B05FC5D082FD4C6C6EB4ABAA8104DED6BD = _NONAME_ | V | 0x6BC91FBCC2CBE9D7358F70591C06A0BF ; libaacs -0xB33FFC6B7F33B01E02E78C226243B81683E6F754 = _NONAME_ | V | 0x97B337C29325040692E08B340043C1E7 ; libaacs -0xE920E2D09FDEB64DFA8775FD88F3E5BDECA7EA69 = _NONAME_ | V | 0xE19A813BC029DD05354395C8A7AD87E4 ; libaacs -0xC93EE5FF7565A5CAE58602DAD8D0352EDF800329 = _NONAME_ | V | 0x47BC8B961CA7AB485DE507D6A2BD66B5 ; libaacs -0xE0E34F7C532BC962C38A736DDBBA241C6671E738 = _NONAME_ | V | 0xD44CA19380BCEBED70D368F8AB042ED7 ; libaacs -0x553FE73965D6FDC98D401374C4EC7D33490A936E = _NONAME_ | V | 0x4038E5A18CFC282639C4B03A4FCC7B53 ; libaacs -0x64CD2A3F110183DDB0561A13C12941762E2F1EAC = _NONAME_ | V | 0x087F1139AD49A28D03967E66E3D6C9D0 ; libaacs -0xC4A74DA7A48285502CED4D1843811DC0B952940E = _NONAME_ | V | 0x5E86CF166D368D65FD25DA74382BEFCE ; libaacs -0xA224BAA4DD41C0F9848A6CD9FED4B7F5DC7E33B8 = _NONAME_ | V | 0x860864BEFF706C62A3F8E0F276202516 ; libaacs -0x1FC042C29860014DD4DF6566EA115555BD5D6D1E = _NONAME_ | V | 0xD4A3EB290F59E249B6A657ECB774FA9A ; libaacs -0x930C9200F5ADE0B5CD6F575F3821D7F508E1383F = _NONAME_ | V | 0x2954EED2186849ED2E89AB13F4746549 ; libaacs -0x3992F4F6B01351D0ACB8E36BE750289B8392005B = _NONAME_ | V | 0xDC58226A4F7B545473EDFD8C439EAFC8 ; libaacs -0x66459396271E46285704F008C20778351FF79590 = _NONAME_ | V | 0xC3CAFEB4818B9B5845D7862CE26E8E4C ; libaacs -0x670BDAB1CD00FD798D3CF4D09510A85929AEDA79 = _NONAME_ | V | 0xAFB5FBAA13E77EBD95B5ADEDC2A2B236 ; libaacs -0x79582776A0A5D2C2881FB4E1A8706237E2174513 = _NONAME_ | V | 0xDDA47D698F6B2089E7D1DCC027F4CDD3 ; libaacs -0xF0AECBDB2D5CEF2E0D4C48709677A3E3BC4FE4E2 = _NONAME_ | V | 0x8DF3385F4C033C8900F71FE8887DAF5D ; libaacs -0xBBC06D7EDF6D35442033BAF40477A990AEDA973E = _NONAME_ | V | 0x004B2CF9DBFFBD59E10152B52E32ED49 ; libaacs -0xB85599042979DFD7F150B798A0594678107A5BAC = _NONAME_ | V | 0xD34B43161F08AC6365EC49853480D98E ; libaacs -0x0AC127E2618BB066D0D11CB80632128C0AB1B4EB = _NONAME_ | V | 0x405FD2BE3277147611638223F1CE034D ; libaacs -0x13968907DAF816926188CC419F8461E9822683B7 = _NONAME_ | V | 0xE47482B8B045C643BF8392E2AF09816C ; libaacs -0x8D7BE048D85F6D3ED911535E3920801C1DBEFFDF = _NONAME_ | V | 0x2A21D7BE1B9AA504CAE8B298D2633EDA ; libaacs -0x35B785C2D0341F59FB76014FB70ABDD6DD986F68 = _NONAME_ | V | 0xB25C6865732B19F539370055F7B48FF4 ; libaacs -0xA4CF51B2B3EB640B17CDA45C89799F8C38F54DD9 = _NONAME_ | V | 0x013C71A20E63DD23B326EC564955E678 ; libaacs -0x18281B2D935E0FA61C41EAA83D0867A51423C03E = _NONAME_ | V | 0xC9446335D2B948AD204826726A4A694F ; libaacs -0x974CB7CD0F9FA33997CCB7233CAC916DFE975660 = _NONAME_ | V | 0xE013CE59BBCEC54F4800032A353357DF ; libaacs -0xDE731404CB48D15453696B6831A7850A70FFBFDA = _NONAME_ | V | 0x48BBF2D3504206AFD6C5CBEE07D3366D ; libaacs -0xB8FBB6A31BB9285A4AEDD6C5E980C6607448A821 = _NONAME_ | V | 0x62F644DCCCEBF57372A081787C9B41AD ; libaacs -0xB44E4BB57E0BC68A3E27F0DB67BCC1C587FD7A0E = _NONAME_ | V | 0xEFBD2FE32F891F02D8DD1F7F19A05A1C ; libaacs -0x9EB0FBF5A0F231B102684797DEA781F81DA61EEA = _NONAME_ | V | 0xFA5804E3E74BF96387389081B3269CB1 ; libaacs -0x8C557C1E7ECC398BC1BF5F77EF37FACA5AA99042 = _NONAME_ | V | 0x161115CEE21DE27A9211B04B929FC191 ; libaacs -0x7341F3397F8FBDDD5D08A682191354B523D27E2F = _NONAME_ | V | 0xBF338CF1A22362B535CA2CBAA27D3057 ; libaacs -0x4DFC99AE9129828947B22AF812F5CD1EF4400187 = _NONAME_ | V | 0xE975C25B66C45CB795C423C339F2555B ; libaacs -0x3F7FA124F2EA86565108A41C3C81BB188F739EB8 = _NONAME_ | V | 0xEABBC80946C6A394D7224FFD9F5F711C ; libaacs -0x340AB56F22A09A9D31DFF2ADBAB3FBE0A3884C63 = _NONAME_ | V | 0xEDB4D2DFFB331245FC82EA72557FA314 ; libaacs -0x0FE252ADCA3DD4DB8751E693FE5643F6ABD86501 = _NONAME_ | V | 0xAA70E73A05643A866313D5A5D4093F4F ; libaacs -0xC8751FB248116E7EF0689CDDAE2DD1900D232809 = _NONAME_ | V | 0xCDD3B72F0FA7D9899D967844EFF4E1A1 ; libaacs -0x92FB52AED572B5F3DB57A6F17B6A6781010FEF59 = _NONAME_ | V | 0x552591439E0B7C2BFD71FC3CDDEAFC8E ; libaacs -0x31B96EB58842FAC73957D24C82B0B427D68C8A4E = _NONAME_ | V | 0x967361D4BE6F488E27E99672B71B6668 ; libaacs -0x2C884702DA6223FE1E42221217F8B0DCE4FDE5B4 = _NONAME_ | V | 0x0805EBAD5CBDD974F7D4D2674F563742 ; libaacs -0xF4508E3D2A8C0C268D7EFAF27EA1A9ABF2525A7B = _NONAME_ | V | 0x62656C61163835C551125FF117705AB8 ; libaacs -0xE0BE289DB39D0C5DA6BFC092D0E33A704910579C = _NONAME_ | V | 0xF52526EC72FCF038E8DD7FE7497056AD ; libaacs -0xF15CAD82EEB9AF1803D720754FCA9EFEE8E1B169 = _NONAME_ | V | 0xBF8CAE5B704B07C6A37F6D2433038E3C ; libaacs -0x05DFF5419C4291BBFAFDFD050FFD7453841E9CBB = _NONAME_ | V | 0x50FDAA38C201ADE66E35240F2D7091C5 ; libaacs -0x831A6F0C9DDFDA608B2C78BD3BEA0B67630EB49F = _NONAME_ | V | 0xDC28AC01DFADACE27A9EA5E4246B279A ; libaacs -0x50B3F5D0305B5947F036FA1EF63B7F29540ABC1B = _NONAME_ | V | 0x90079BF7E9D4B271CCDA219E5DC3FA65 ; libaacs -0x2555077E78C041A35AD833475D80CCF8F64C829E = _NONAME_ | V | 0x845068CE97840DE95C4145F59C6DBBC2 ; libaacs -0x053939804F490506C9EFEDEAC690FE943878B0F3 = _NONAME_ | V | 0xED0F994D73180BFF135612A3FBB67833 ; libaacs -0x22EF06888D89AA6FDC0C4C765D68055B0C2011D1 = _NONAME_ | V | 0x943C403F1D2E5F250CC21DE528966E20 ; libaacs -0x1B0C4604356D8AA7D055A8660DE4F9B7B8231E04 = _NONAME_ | V | 0xC91BC67C88C48F4AC3D677C903FC8BA5 ; libaacs -0x5909D0925BAC8DF2EABA602D281B7FF311B12F7A = _NONAME_ | V | 0xC8B3EB4FDDADA8E7367F7C1B95A054F1 ; libaacs -0x500E9C6E3B5510F282580540D7CFDC12887EF0B4 = _NONAME_ | V | 0x74B95AC3EFDA644B980EF65F17853351 ; libaacs -0xEBC99D44AEE11C0ECA055C0978DF8850F7A17C02 = _NONAME_ | V | 0x226FC6D1491541529B85FC8B23480FE4 ; libaacs -0xBF06655D70C6A3DC1C1D8ECFCD8DF5A57B86494E = _NONAME_ | V | 0x1E6C4D07B8C2FD84CFED63C88903BB83 ; libaacs -0x6CEC5E1DE6A498809DE6C730CE953B5D656B0E2D = _NONAME_ | V | 0x3A68FBD3AD80F62C8DD6A46F7D909136 ; libaacs -0x230F11C878A37C3A81C435FC86F9096EB673A2F7 = _NONAME_ | V | 0xE252B5FD122DB43FE26365A655D33A1D ; libaacs -0x6F24933EFCBDFCA1FEA85C6CE6C284D8D24C00BE = _NONAME_ | V | 0x3F5C49E959E775D84CB478202716859B ; libaacs -0x4DD451BE20437D1A18C0769685BFF411241B421B = _NONAME_ | V | 0x6F25AC63CCEB5339DABA6A790F05A906 ; libaacs -0x25E76F8C15420E40A2865498F6BD83248D21D064 = _NONAME_ | V | 0xAC4F83C349D7494E62CA552A1D308594 ; libaacs -0x381302ABFD3EE7822EBB231573216BC309DF8CF4 = _NONAME_ | V | 0xC9485CC5918EC7F17F84199B26E9E990 ; libaacs -0x5CB67339A73730E3D9EA872E5042913AF3877938 = _NONAME_ | V | 0xCD6995BCAB9F6AD75897986AA5DBA121 ; libaacs -0x300C29817D588C4186C6643358BD675B443ABE13 = _NONAME_ | V | 0xDC1135D8F818D79F17B2E1C7D8298F92 ; libaacs -0xADA4A941C5B1AD2CA880C5E91A82AD5F457CA98E = _NONAME_ | V | 0x1482456D117039BB1D7CB71DD697D3EC ; libaacs -0x6880D4D970A7EAAFC6D6BC1E86DDB9A585F4C7D5 = _NONAME_ | V | 0x027C1998459E77F04FA832454A42AA6B ; libaacs -0xA974B8EF979B485934453E8561D983AE9321F499 = _NONAME_ | V | 0x94770546CA99393A6663BA0CB257D940 ; libaacs -0xD1195EA54286B46E70E70FF6A385A5F1D4F3BD1B = _NONAME_ | V | 0xB838BD6D0CF36451B9E065C507931124 ; libaacs -0x9755B39785BC467B80A4F45E09569BDD46CC89E0 = _NONAME_ | V | 0x35ADAF2A434920DDF6733C708DBCFA67 ; libaacs -0x4F590AA48B10969C80800370E29291FAF213C861 = _NONAME_ | V | 0x14C9C25A0B1930B4CC4DAEC68C73B942 ; libaacs -0xAFEAE0A852F743E1C8D9E40DD5D72D477EB62B66 = _NONAME_ | V | 0xC8FB5B9FDE5D107927040F341B66A76C ; libaacs -0x47E2D9E3C65ED92E8047B053DF75E2E52170E4C3 = _NONAME_ | V | 0x630C2C86FD231A85FEBCF2AEDE3A1162 ; libaacs -0x49B8923B1F46B25B0AFC86518092AEFC7F1EE6A2 = _NONAME_ | V | 0xD52C96A63FF420D49F0302B36F8CF1B9 ; libaacs -0x3F157631A27F397F24A5C2ABD0EAB82F62466CFB = _NONAME_ | V | 0x7238B1325839EFE20EC288FCF1D93D46 ; libaacs -0xB64640732A7CDBB558F26F12C65C3676B7B78303 = _NONAME_ | V | 0x9F344989DD598DF6519860400538D1B7 ; libaacs -0x42F29FAB9DEE6ED83EC16C68FCE1EAAED0DA53B5 = _NONAME_ | V | 0xF96AE5375DA0F59C4594E0624893AA15 ; libaacs -0xA1D04B57A350D16649EEE3C65ED80FB2C2F57CA0 = _NONAME_ | V | 0x221E004E6CC9CCC63D0DBC59C40CD704 ; libaacs -0xF09870E0BF67950A09519F3E85EDD567F03E1521 = _NONAME_ | V | 0x585690C60F0CFF57D99996E9F2DBF8FE ; libaacs -0xB602A68F6185609A98981DE0EA164739E71C5356 = _NONAME_ | V | 0x64D9A065B11C0F7E150CFAD9C76085C3 ; libaacs -0xBEFD5826FA022D4EBF2E012E6C777A6713F27887 = _NONAME_ | V | 0x609D3D472C1B8FFC6CAEB14F00FA867B ; libaacs -0x51B8BB262DEAB11A78817D80DE1A6B0693E2878B = _NONAME_ | V | 0xB3F7921A35CF53E78DB7C291CB4F9608 ; libaacs -0x34AE5E938251F878E0CAD91CEBD7D0185EC8D86A = _NONAME_ | V | 0x278F1EF752E261F20411DCC3BD0CFDA0 ; libaacs -0xF25723032F7D60626507C475EA371E30DC3184E3 = _NONAME_ | V | 0xA8E819F1F0AE81F42F1F6A2918F2662A ; libaacs -0xED446C4583196227E336F990710A11A8E557F749 = _NONAME_ | V | 0x9D0303E075229AD93059D7E8F88A0F15 ; libaacs -0x5BEEA157BFB8761E099794F667695CC7151E3F34 = _NONAME_ | V | 0x6A66C5CA18401FC0C26C8ECB47812DFF ; libaacs -0xE98BE2F6FF438C2ED0AFAAC1561D3EE734412C31 = _NONAME_ | V | 0x4F624E009D6465460D4F459DB3A314C3 ; libaacs -0xAD74CAAAA152FE9BD16E86A3F6CE5F924638F271 = _NONAME_ | V | 0x69787226E710AC82205D5AE86306A94D ; libaacs -0x8A0823E2A5AF605D241EA51F93E8EF6BBD7586FF = _NONAME_ | V | 0x5209D2336665BF8604DE5C895C6A002E ; libaacs -0x91ECED1B5B336F52220768D8969BD090B25EA32B = _NONAME_ | V | 0x592E1D82E682C60D495C168D41874B39 ; libaacs -0x644C24F793961D161A1EB6EDF098709386612BA9 = _NONAME_ | V | 0x178DEB319BE9811450349740BF2F2C23 ; libaacs -0x4AEB6A53E8BBB340CE55617735AE7227E3FE7D50 = _NONAME_ | V | 0x846CB01FCFA35E6813AFE68AE433D7AB ; libaacs -0x233CDF7056549867B1645357405ECA3CC2A26818 = _NONAME_ | V | 0xE954A0BEC76BF811174CD883D5E9AF88 ; libaacs -0xADCB3481BC9ADE4FE568CBA6CE68F290A4573F3C = _NONAME_ | V | 0x270361D4FD52DEF2E3BE619DE3195FDA ; libaacs -0xF1F022540D35074AB7231C0FD4D00C19B2D25CC3 = _NONAME_ | V | 0xFF57BA5374BA447AFB33C4FE10072568 ; libaacs -0xDDA5C66451A57B96A630373B1FD1A6C61446C9AD = _NONAME_ | V | 0x7316C8B891DAFCB86C61CCCB57DC68B9 ; libaacs -0x192797B5DF3611AEB7FD2B9EA8A29BD92F2943AC = _NONAME_ | V | 0x17EF8BE000275FC88F3EFDA7FF4099CB ; libaacs -0xC4C0D53292FD09B133D45B05CFA27932A7C3CA58 = _NONAME_ | V | 0x4F402558E2E232FC945E97EC635CF193 ; libaacs -0x44D1395C6F8DDAECCBB98E9865FB8D1278C75432 = _NONAME_ | V | 0x46262F5020405FA5B26A9B7113E6E584 ; libaacs -0xAAFC2B64BBBB8669C2CBF06AF99EF86BD819015F = _NONAME_ | V | 0xFB86E8893129E8F785BC9489DCCF2E71 ; libaacs -0x4AB157F7B72EAC19C528A41455AC5288576EFCD4 = _NONAME_ | V | 0x46C1C8B9CBD2E0F242B384C07721107B ; libaacs -0xB0BDA02E5A335EC571D90976BDCFBF2BEBF5E93E = _NONAME_ | V | 0x4A2BD69227AA6615BA4DD275DB3B37CB ; libaacs -0x4559F61E750B7BE3DC048D1AAB574D3E1436CA24 = _NONAME_ | V | 0xA113B1E35E30A978AFC12D3C598BFDCA ; libaacs -0x9464B162E2068D2BB8E9FCBC26D2340224EC7CE1 = _NONAME_ | V | 0x264C866E8AB700CC42506D81F4DDC60A ; libaacs -0x4BAB72868663EBCC8DEC24D6093C12425700C0DD = _NONAME_ | V | 0x98047F283954BED8D38FC1B1AFE86E9F ; libaacs -0x3BE32A931D3934154044BF15D51027007A9ACE9E = _NONAME_ | V | 0xDF2A7CE73B9F59EB2F75CBA343C5BA45 ; libaacs -0x32B232BBEBB0971CFDD4545191838A4CA95C3648 = _NONAME_ | V | 0x808D039DCC58747EB5FE98DD6D30290B ; libaacs -0xC549398EE32DDB12CB27B2C475E1D888F3A29BEC = _NONAME_ | V | 0x50CECBA4A50ED36DF69252A679AD7847 ; libaacs -0x69DC52F26186DAB3D7EC2E7943D575D97679E3DA = _NONAME_ | V | 0x6AF49B1A9AAF113AAF78D0D4D595852E ; libaacs -0x2E1E87B53E93A2FB8C6181447798BFB3779DC42A = _NONAME_ | V | 0x909480E6514C6B11CDFBAE29EBFD25C0 ; libaacs -0x64A4B55E1AE3BF961F91D598186811C30A9DABBC = _NONAME_ | V | 0xA28A428399AC08920A9CE2B574C65717 ; libaacs -0xEDF12BF96F6F19317EDE981D3FD14C5FEC206D59 = _NONAME_ | V | 0x47E1C386735C92521381039741BF7FA0 ; libaacs -0x2CC11643BB1C82303FF01F69E0D0020BCF1EA3E2 = _NONAME_ | V | 0xF4BC5980C0C2930E3E6C56D64967DD38 ; libaacs -0x59B703FA65E7F5E128068B7722A29CFA76F188D7 = _NONAME_ | V | 0x5BA595D3CD6CE784B4A433E250B3E8E8 ; libaacs -0x540295677A73C6DB55DF240C3CA8F16C232EC853 = _NONAME_ | V | 0x7EF5DC07EC8F448D6FE781CA1B2CDB4F ; libaacs -0xCA58576F366D00CDA863BBEE72727B5CBCB69B95 = _NONAME_ | V | 0x9430EF25CE1E1E44F29487574E3A5881 ; libaacs -0xA16AA619C60B76D8E95DF66825537F7F1FD5238C = _NONAME_ | V | 0xAA1715ADBD9234A35FD5883EED376E60 ; libaacs -0x8A52A8AB1183B22802D1E51A2761D457F8E3DB2B = _NONAME_ | V | 0xA68FCE910581640B323E2F35E98E8CB8 ; libaacs -0x905FCCE90980C889FF39D5C4FC63B628CD463098 = _NONAME_ | V | 0x55F5318841096B57A67A9D647E8BE650 ; libaacs -0xBF6EF418E6A926149D060DDB1E61809502BCDDE4 = _NONAME_ | V | 0x9B4B7959A6991D23120CAA63488EA275 ; libaacs -0x6B8AAC38652983BB60BB4E302E10B832B59DD7A9 = _NONAME_ | V | 0x3D75E1891B041E158ADB82E07199E34A ; libaacs -0xBD8F23680F0BBAD83404009D81EE3458FF2DDDF6 = _NONAME_ | V | 0xC1608CF464B4F9CB9DD255598AE2E602 ; libaacs -0xF216A831B7FEC433BDDD20E94DF3D05C59CDF0E6 = _NONAME_ | V | 0x100FADC0C96CCC622E756F5B7CB3CCD4 ; libaacs -0x08283A7CDB8604C3350E442A9A187C709914A26E = _NONAME_ | V | 0xC765A1D8C35EF3359590C3966A5BD17B ; libaacs -0xD26EC4691F1294D3B349D8995EF7FACA63A0F942 = _NONAME_ | V | 0xCA0D27BCE6B1772AF881591A45F3579E ; libaacs -0xCC68C06E41DEBA66CBBD7B0EC7AE7B354CCA23F1 = _NONAME_ | V | 0xD9915429D04C309F5C1280BC70095268 ; libaacs -0x8CCA2088C6AF6119F3743F01CBFAE592DFFD0712 = _NONAME_ | V | 0x48CE4861CF4E83F40FAF18BEF1DC6356 ; libaacs -0x7FAB39262F662F22801D218A5E8302D767D3D33E = _NONAME_ | V | 0x39C5B1EC3B21BD9E78EC6B9BFEDA3D0A ; libaacs -0x6F15FA81571A55EC6C3C66F9C11495DAD04262C7 = _NONAME_ | V | 0xD961918DAD0C0967FE1B0427E94080C9 ; libaacs -0x622548D59C9ED5C614741187D4A2E708AAED71F9 = _NONAME_ | V | 0xE662CE954B3AACC91B8A974AF389BF0F ; libaacs -0x13ED68FBEC75E0200DE0CAA546315BEE83B827E1 = _NONAME_ | V | 0x06E55E33C3A9DA887B3330D2EE6E10D7 ; libaacs -0xD712E604E9F650ACB2460DEE9E498417A059FDA4 = _NONAME_ | V | 0xF896149F8AFFE291C1F0705488125D11 ; libaacs -0xF4A13C16CDAD53E244896B5ADC05299E6B9885EF = _NONAME_ | V | 0x3586B2E9FD85DBA417149AF1F528007E ; libaacs -0xD0BCE15FE3C3405A27F38546C034082004554DC2 = _NONAME_ | V | 0xE5539777A926A524B1F19E65EB49D081 ; libaacs -0x78DEE7CB3BCD59F2743DA09ABD6933059CC9B0E4 = _NONAME_ | V | 0x4A37BF8B1E7B9D85697E4A6DF22D750E ; libaacs -0x8B94AE1C46292BA17542B130346721D3B59AA5F9 = _NONAME_ | V | 0x9AB9CB26077FC77188671A16793383CE ; libaacs -0x7929388061F5B3F9E80863F138FAF76DB77D658A = _NONAME_ | V | 0xA3EFB97A4037B21C9E7650800F481700 ; libaacs -0xC6DA4E865E53E7E0FB1381DEBA457FF431A2A9D7 = _NONAME_ | V | 0x5AEBFAB3FB31C0E15D1B07A49A5EED46 ; libaacs -0x02DD74656A9C17CBD31D3298FA3460970526F946 = _NONAME_ | V | 0x2BC4961007C872921C5916AF124C9B23 ; libaacs -0xA2DDC4A44E19A3C9E77364ABBDD9983A87F12C30 = _NONAME_ | V | 0xF3BFB38CB0D9CD8C2BB6599DC5919C6E ; libaacs -0xE46358FB263C7A540E405E0EB5A9848728F1856A = _NONAME_ | V | 0xDA8DE58D005E8F882FC2C02578D08C5C ; libaacs -0x513D6019C49E5A0AB6E9C3B2533BD03DBE93407B = _NONAME_ | V | 0x4B1E257AD8B50C5B66F0CDA38181ED6F ; libaacs -0xF5C21B0CE4284F546418F68FFB1794CFE58DF71A = _NONAME_ | V | 0xAAF19665EBD65BFD8F4D31A0CA14E934 ; libaacs -0x598DE0DDB47B25E931D73321EACE643A87D0780D = _NONAME_ | V | 0x182160CC0ABCC49973779AB98EA4286C ; libaacs -0x05FD8CDF697E4D066DC525E6F6EFD8B7EEF902FC = _NONAME_ | V | 0x516D594000CF7D019DCD545B4324CA8F ; libaacs -0xEB58933998F1CBFCB5B2106A999132EFA6D37479 = _NONAME_ | V | 0x397F03597F1AB51B4019346569D28AE4 ; libaacs -0x5376F29F9AB1C65F33048D61E59801947E791684 = _NONAME_ | V | 0x1577CFBA092E8EFDE924724F04805C9B ; libaacs -0xA591855F4C1A9B535211ED9839AE83EDF124D243 = _NONAME_ | V | 0xA44597D755FDCF830D1928D6CD112CA4 ; libaacs -0x4474A415ACF3349816B467604A978BC5F7274A58 = _NONAME_ | V | 0x9DE2062D5F03CD7FF7A1B2F5A144FFFB ; libaacs -0x1B9F6866BC712286134D08E67B4CA6ABAE7500D2 = _NONAME_ | V | 0x16B3E190445F0C58C5FCD44A19335C4D ; libaacs -0x26B181465EFEF5C2F851850B0ED85CA4A1E27E90 = _NONAME_ | V | 0x29F7D3050684625B1345B31C8F932FE8 ; libaacs -0x2505D04A92DC7B892298408DF9A23D0213B01E6A = _NONAME_ | V | 0xB71528774FF7FE27E513A6B11766E4DC ; libaacs -0x906D4A6F7B204F94CFE6E775408FC7FB2080724F = _NONAME_ | V | 0x948C65D6BB07618CB0C3AE05E98B5FBB ; libaacs -0x5204DE634F58668964E8086B5DE441D9549426D2 = _NONAME_ | V | 0xFEEA04F1A51BCFF51487557778D9CDB6 ; libaacs -0x55C05E74B6888A2AC18F66AE661436AA33AF2122 = _NONAME_ | V | 0xA191A3EB31100FD35D02F3DF2759BF3D ; libaacs -0xF4344E4F70B91AFA8136105D7C3141E3CBD7E3E0 = _NONAME_ | V | 0xE3941445BCF71E0932210B12B4A7B6D4 ; libaacs -0x246B8C7173C58A64687A5584DDF2A34EDF4E9EDA = _NONAME_ | V | 0xA02814D474544611C9B4C3E009262C0D ; libaacs -0xF788741089E91085BDF620A82904149BA2852722 = _NONAME_ | V | 0xDA983EC104A07D0A53659B9BE4C61351 ; libaacs -0x1F784023F0400A8D7A5070E3563EEEE431ED2037 = _NONAME_ | V | 0x4CF5B8031D6A1AEC5862B3E93B3B5BBA ; libaacs -0x0250BC15C88C51F31258AD17BAD50E7EF593C840 = _NONAME_ | V | 0x3C6ECC5208D09C9EC26FE42B17B9A4A5 ; libaacs -0x47B70688388C23C79F1005BB97633C6CA7E89CC5 = _NONAME_ | V | 0xFE169241FEFB4857C418A0C4C241250C ; libaacs -0x2A789295AA9FC752758E6DF2DEC11101A508C9EC = _NONAME_ | V | 0xF4DD72640D1720C83318A896D4F0CCA0 ; libaacs -0x685D5F14C8FE31235AE99E2010227BE939118AA3 = _NONAME_ | V | 0x69F8D6FC16070CE862676D733E5E6C5B ; libaacs -0x45A243AB9CB518BEE32193A4CFDC9A54A2889433 = _NONAME_ | V | 0x347680BE71182169599D94F5789B2CED ; libaacs -0x29A655B082C4C2F3337C80B3E4231FFEE2743460 = _NONAME_ | V | 0x593324A04F33AFED8F1D9A342A962C3B ; libaacs -0x0A34A10ACF80C9580294CCABDDFB30B9758C92A1 = _NONAME_ | V | 0x86564E76B7859E0FA56B4FEC1044FEFB ; libaacs -0x39171A28735B33646918F1B71984C9836826A670 = _NONAME_ | V | 0xA43EA86E1D4164C92ABADBE4C7473958 ; libaacs -0xFD06A27B69CEBEF0110FAB0BD27A229725A0874D = _NONAME_ | V | 0x78AE1A9FD357C4AFDD98AEC6E22841B0 ; libaacs -0x417C96EC10A300BD88C3C7EEF518741478EE845E = _NONAME_ | V | 0xD02923B34AE808E79DCBE51222E80225 ; libaacs -0x64F9AE6B3A55834B90E788717BE83E070C153E22 = _NONAME_ | V | 0x664F33E53E70475341F72A020E8175F8 ; libaacs -0xCBE18EB732FF419EC098EF74E48149794E126A97 = _NONAME_ | V | 0x27E888C332E70E3037D8152B9E6DAA26 ; libaacs -0x80751730CDAB6188F6354CE485ABC9FFA0EF7F35 = _NONAME_ | V | 0xD6D131DB5AAA8712DED157DAD0FA4B41 ; libaacs -0xDF74FBE1D87AFE180B1B2C4066502B0140ADFF3D = _NONAME_ | V | 0x27765C4991A57D703BB4C4B05B5A1754 ; libaacs -0xD8DF449A0CBF2DF24C63F21644EC5226C55E34F4 = _NONAME_ | V | 0xEFA1A633E3B1919DECC50FC952FD3B31 ; libaacs -0x454C7EF1083E626B9D42507E7AB1E9513196FF38 = _NONAME_ | V | 0xD2D2437B81B45F30798842D3136BC0C2 ; libaacs -0xB35C703A03C6748A2874CB1F59D0806A4D50FFC7 = _NONAME_ | V | 0x0E4FCA5CC853F2C5E15BBB31187E22FF ; libaacs -0x3B982162029D4239EF699E91CDAB1CE846335620 = _NONAME_ | V | 0xE95B0FF7258E8F18FBA6CBBC22A8608F ; libaacs -0x5E9EFABEF3F779C0FE2EE79E2063A553F6DC1714 = _NONAME_ | V | 0x1B8F209AAA8F6E78AAAD3ED9EFF9650F ; libaacs -0x727F40341436777846A5D241AE389E7EF6D59981 = _NONAME_ | V | 0x277A9209F20820FFD4FF5CC2743B7568 ; libaacs -0x74F48BFD0CA6B172E190B01BACD9CAE8FAEC6779 = _NONAME_ | V | 0xF0D866E9ED3C3D83016DD0017BADEC9A ; libaacs -0xF01B9E683492B4C0238651A6D5EFE867A89E6F62 = _NONAME_ | V | 0xD948CF3C024E8AF5C01889E86EDD3069 ; libaacs -0xF095BF8C13A4BA3D859BC059E7E935F0FD793E83 = _NONAME_ | V | 0xDBA5C74B35C4E81D2E5225A35AB456D4 ; libaacs -0x8B5615E3B880D95090E5DD68DF098840901A9687 = _NONAME_ | V | 0x4AA3FB7AE90ED0320954519B669DC5F0 ; libaacs -0x7E5A489863D4DD338B8B3A42234683347E792A22 = _NONAME_ | V | 0xF81CD89DFB50C865A25BA8C9E8ACD827 ; libaacs -0x8280AF4DE71FF9464B0506CB569705827706BC4A = _NONAME_ | V | 0x739BD82FD6E3C29581B82935FDDE478F ; libaacs -0x1190D000C74E1819E64103EE0D839DCC72C2083E = _NONAME_ | V | 0x5747F450212F1BC0477169BE2D25E415 ; libaacs -0xC7D3C9BE555FCEC828726C67B5C4D19A4C01335E = _NONAME_ | V | 0x162E4F81D8C33D268CF7F688817ACC5B ; libaacs -0x78128356CD4E22D5BA873535F33B9998067EF346 = _NONAME_ | V | 0xBB44B6C5004E7D3AA341A248408CB86F ; libaacs -0x21B6A77B3E9F782C45D4EDC606A9FA84BB6B039E = _NONAME_ | V | 0x79DF096A3E0E012FA8250975BE3E48E0 ; libaacs -0x64BC4F67101E60FB3FEBCFF374DD2F8255A0203D = _NONAME_ | V | 0x3ADA539F97B05E158C4A0ECD2EFFF721 ; libaacs -0xBEBCA6E96E9B4EBBE494A83B3226A7503253D209 = _NONAME_ | V | 0xE80DDC6BF62A9CC396C1D09CAE9CD6B2 ; libaacs -0x9414412FB5DA2D07FA214DFC77FC785CC37C98FD = _NONAME_ | V | 0x324123EA62964EBAE9F4173C8C645EA6 ; libaacs -0xCE5FC8701862481F773B623D4DB1CB7099A54DBF = _NONAME_ | V | 0x8C0FAC1F5E5BBB80A47594163CD42A78 ; libaacs -0xE2A1E65A83742956A94A75111EF373AECE1AE237 = _NONAME_ | V | 0x10820D6BB6F6B9375598497AC7C4ECC2 ; libaacs -0xCD00E3F70FAB0B54A22A4A3538DC8E9284139595 = _NONAME_ | V | 0x11133D2AB046D334E0902180C4CB4141 ; libaacs -0x01CD448ECB748A44B9F558D75DD0BDB220C0CB33 = _NONAME_ | V | 0xD16763C5732520A92D67EC5D27935ED3 ; libaacs -0x5F2D3C9429ED606D86067C6C87FE4A3B7B5B2AD4 = _NONAME_ | V | 0x539F2F238AB1A7810D573285305CC892 ; libaacs -0x64E8694F884D9C6A3C8AA98256FA183EC0FC7C0C = _NONAME_ | V | 0xBAC363656DFC02B3BF0D0677BBAF1A94 ; libaacs -0x11E5D4EA1AE4578299D1AE756F8DC2FF4307C48B = _NONAME_ | V | 0x962F97D3A234AD4DBC66E02BF0CB032B ; libaacs -0x68CDE9A878C09DDE51D9961A8096883C4B761BB4 = _NONAME_ | V | 0x93648B73F8D94B5046E8E8FF598130A6 ; libaacs -0x174A50D746E66E2F02B19C2331A3910C3BDE160A = _NONAME_ | V | 0xCDA6551F29E2AD7AAFA186843BF4DC42 ; libaacs -0x36C92E70A52C838A69515F3826673300AD46266A = _NONAME_ | V | 0xBCB2A2C767EF2AA7BCFA47F9422326C3 ; libaacs -0x46A6657870F07371DA371FC6F310AF1E4C43CC95 = _NONAME_ | V | 0x0F917422E26C57599662B3DD21AAB826 ; libaacs -0x5E48E51E649DF42388843EFEBABE21822F5E345A = _NONAME_ | V | 0xB332C12F06416A939CAB49158D99EDDF ; libaacs -0x8A83619F2B166479997BACB7CB16E03D6A82B482 = _NONAME_ | V | 0x1A622FDF48326B7031FFED6FA4C3C6BE ; libaacs -0xDF628F10CF7AE4E8F0A28BE11CD832344AC5AE05 = _NONAME_ | V | 0x3949C7770B5B694E53618358CD2B7E71 ; libaacs -0x052BE991E20B5914C874C28DC0D96B28D93FE55E = _NONAME_ | V | 0x5E65707EB0FE9476B04841488AF69AEF ; libaacs -0x1C0CBE44A0E0D9499529F5A6D2569AB11F238405 = _NONAME_ | V | 0x66F42D9FA2374D61B93385BBD868722C ; libaacs -0xEE75A3563129DEB5744E13AA1F83283F5418BD40 = _NONAME_ | V | 0x6683CBFEF41ED9EF4CCFF33C2D090AF1 ; libaacs -0xF1DC9912834D96AC20D825F056650D24A20B283C = _NONAME_ | V | 0x5254186941E58154C481FA31F606589A ; libaacs -0x841C5C0DF2F70EC7D4CD4F24C0FE057FFBF4064B = _NONAME_ | V | 0x20A4FC61290D102434C7A60DCD3A771C ; libaacs -0x439193BD6F69C8E0D2C578642E04CC858AF83FD6 = _NONAME_ | V | 0xC625F365E3743D41E4DE00E9A9D2B1CD ; libaacs -0x974A5540E67B31D825640253B5A18DD977CA00B4 = _NONAME_ | V | 0x3CFB8634C2316909301ECC2E232A0EEF ; libaacs -0xB1AC9A9C9E4D3AFA322112E54B2EF92F4AC2F78E = _NONAME_ | V | 0xAE526FD39D5735008AC4537A08B45A1C ; libaacs -0xCB67D3433BA84C6C1AAA25AD458333C7B1538A26 = _NONAME_ | V | 0xCE6E322B3AEDFC9BA9A99A36804B74E1 ; libaacs -0xB19FF1D9FA3F9A97200C33223FED9171B2993203 = _NONAME_ | V | 0x4DC9A8CDFED6339726F6D0035FC21AE3 ; libaacs -0x8436DAC495D21AD3A05EAC60CBC37897A70D6D5A = _NONAME_ | V | 0x4DD2545AE5D6456B82B2BFE265F0B417 ; libaacs -0x98A271B7BBE47FFE9276C6255C9E6B60A6E3ECAD = _NONAME_ | V | 0x6652F211E8AF01873DFDEBE7995756D6 ; libaacs -0x1F8DA542390C1F5CBBB08B6E99E189D5CC93FF43 = _NONAME_ | V | 0x389E3B66A4F34D62C0825DB1780C8B73 ; libaacs -0xEF5EF142984F939551FEDA31868E553F6E3806D5 = _NONAME_ | V | 0xAF265C1AEE0F1EC33E020F98F9EE99AF ; libaacs -0xFEA02D14D20E201B7633A4EE285F1E0FFF945A06 = _NONAME_ | V | 0xF3D30DF7597FA8ACF9626873833D4D5E ; libaacs -0x7F32189B20D5A685620D931B4F55AB839A8FB007 = _NONAME_ | V | 0x68FC14BDB2A93109716D4B1AA8475C10 ; libaacs -0x2A212DF3DED2EF271DED3C75CEECAF248A37EE23 = _NONAME_ | V | 0xBACBEBB39D45C5254292DB079B6503FE ; libaacs -0xDE589C3DCF3BF29318E5F56C021D8FE19FE12C7F = _NONAME_ | V | 0xCAA8D4E4E13EC8D293A73DD298D6DD80 ; libaacs -0x6BFCEB00F3C1D3DAB887F4440681A40FF4FDBAAA = _NONAME_ | V | 0xCE07AFFC75DDCA0B5B384F9B31B8F80D ; libaacs -0x1BED929F75BDF14A6AB58537B5FCF555BAC18521 = _NONAME_ | V | 0xB428A42651E4A11F074BAA8283C3879C ; libaacs -0x30BE57A86706FF828461A275D18EF1D85ADCDA48 = _NONAME_ | V | 0xB0FA43CDC348FBE0EBFE69B84159274F ; libaacs -0x3DC42145F3FAB7B98C8E01DF0B280D2871A172C5 = _NONAME_ | V | 0x5A8CA6BB7907ECDD975EA1005D659D1D ; libaacs -0x34F7A4768FB05BFB01785F4B49F0D80270130E8E = _NONAME_ | V | 0x312CD66027A0CE5C8F3B9B628EAE7117 ; libaacs -0x1FA5B5C71DD347DD8885D87D147AF4511E942715 = _NONAME_ | V | 0xC2E112DA1720D36AB7A265BD3539A7D9 ; libaacs -0xC0EF4A00676E7FB212F735576850899699BBC5F7 = _NONAME_ | V | 0x7A80290A7409259009F288E1348E0A26 ; libaacs -0x6D57B8C15FF25F0F90E5D344E0E3779A7C138E52 = _NONAME_ | V | 0xAEAE3F911B2A7E03AE2FDB036F2F4AD7 ; libaacs -0xA09C4F5042A76AF692227795211ACFAB59C189E3 = _NONAME_ | V | 0x5D9EFB2EA2D4E7D7A3B0AE880F362166 ; libaacs -0x873DFE7CED222DDE88B55F4B2E92F7C607DCE739 = _NONAME_ | V | 0x51F1F6ED1100231490A7F88BE36589C2 ; libaacs -0x7A343A98F9D1BE77B1C4DD03C93E68F75A33DA1E = _NONAME_ | V | 0x811763427873A6C457F17F3052C93A0D ; libaacs -0xBA25B350B40EB5B6223C25FF270725464CCACEA2 = _NONAME_ | V | 0xF5E867C9A9C97AFFE01D6A94FA64BDC0 ; libaacs -0x2459C3854EAB1D789205AFC5638AB883F9286EB9 = _NONAME_ | V | 0x0A9C0AEDEEFFC76951414FCB466B2855 ; libaacs -0x6CD59296EB078635C7414020C6E4A0F4F4ACD2C1 = _NONAME_ | V | 0xC5408587720D2F6F103811F5339FCCE7 ; libaacs -0x32A17A29613B28B62F092DC94B26C673AA415C04 = _NONAME_ | V | 0xEFE58A9CC4E459AA9231E636522F49E7 ; libaacs -0x2612771A6EB089A91145A07CA3E1DAE1D9BF160A = _NONAME_ | V | 0x866D261903DB9C075E2459501A2B7486 ; libaacs -0x305DAC7239F47F1C95F956BB179DE1A7629749C0 = _NONAME_ | V | 0xCA1E2F7297ECC84029488CE7A4C0F72D ; libaacs -0xAB303DA32F9753ABA8D3DD351BBAF65E56738D4D = _NONAME_ | V | 0x7DC82DAD7A688E0528DCFED2D000115A ; libaacs -0x395C59876B7A8E9A5F4A7D9E20C250A1EE7BE9AD = _NONAME_ | V | 0xDA1C09908DF97911E56989730CE785FA ; libaacs -0xB1FF1A59BE368B929962ADAE6DBA37EB20058B2F = _NONAME_ | V | 0x6CDBD148CD690100BFF97349C0936D45 ; libaacs -0x5153786E25B255F03238BB11EC9D967C12A48CCA = _NONAME_ | V | 0x135A897BDE5605751CED2326504BE0B1 ; libaacs -0xC04EAF1BC49F88C735ED9CF102986356817185FF = _NONAME_ | V | 0xC9592BAFFB280E892DBDC24F36572088 ; libaacs -0x6D956DCBF4186E188F981F749B7865DC7DF4DFBF = _NONAME_ | V | 0x88387A1705ADA3468FC03F2B3EF33711 ; libaacs -0x9A87ED8C168E340A4A52F6ED396B428350CDB3B8 = _NONAME_ | V | 0x2D5629F5656817EF31824901360363A2 ; libaacs -0xDC0B7A2721224A82A9E473D8607010D5CEEE65A6 = _NONAME_ | V | 0xC90053A1D332A1328AB32BAB394F4FF4 ; libaacs -0xCB89B9A46FEE66BCE4102997FD017E819C6C728F = _NONAME_ | V | 0x0678FAF8DACB40996F6F92BA207BAB39 ; libaacs -0xB9EADF779FF6D272F793F9F87C8130D9CB89C3AE = _NONAME_ | V | 0x85B074DE1E54174FA18FC854FDAD995C ; libaacs -0x0B73D8E4FF91CDE6A906BB87280C0A6BA2C8C42C = _NONAME_ | V | 0x6AD9E2E82F06D4945803AE0A7D760BE2 ; libaacs -0xB2F0E82334AECD4BF6A140C5330C5A8DE5A8750C = _NONAME_ | V | 0x78277B6D9A70846CCF7CE44C0CE71C6C ; libaacs -0x0B67919DDAB351FF8D431F4C4C6CD87C001B8C98 = _NONAME_ | V | 0x6E615B6DB8E05C7AA130F8C1C8D1DDF4 ; libaacs -0x95C1B5DB7DF9507D0FF59226C93678109CFCF58C = _NONAME_ | V | 0xB16B26881996BB1885630720E8C5D5BF ; libaacs -0xCF022AAE21858D893664E2B4FA565833C35C1169 = _NONAME_ | V | 0x1B70BFE24B48E014617DD057EBC21273 ; libaacs -0x3329AC59BFB17C3EAF7139E6B2ADDA9D44521289 = _NONAME_ | V | 0x272CEDFF604CF6A890797077D78C76CC ; libaacs -0x3575FE872A60A311CBE9936250393D08C647E53E = _NONAME_ | V | 0x7543FA9F79A17E27786053CFB0D85DDC ; libaacs -0x4748D3DD08C2432033BDAAD0E22F62EE81ED9AB0 = _NONAME_ | V | 0x9C4996BD91C46B50768462AF991362D3 ; libaacs -0x57336B4CE48E905FCBE96036BF029B01E10EEEC7 = _NONAME_ | V | 0xEF1DF6D83EC83CB63F5495C5C3C42F15 ; libaacs -0xC6FA1ABBF46893E7390BD56CE55C2936CDEEFDB8 = _NONAME_ | V | 0xC60F83A06C06D38CE421FD6B262C14E8 ; libaacs -0x620F4607BA835301838A5617094B02C5C68B6577 = _NONAME_ | V | 0x385031890DA746FAD47D0D204183B9B5 ; libaacs -0xA4AD8FBD7193AA6724CCBDC7E1EE4FDED0785839 = _NONAME_ | V | 0x8736E5EB2C7F82E88CEA51A37BF020E0 ; libaacs -0x3CD14B0588C74D89ECF3AA0C47574A936A899F86 = _NONAME_ | V | 0xE31670397F777FBD24BD9DCE8F4448B0 ; libaacs -0x0A98FC03E81351B86D51A385F87CB163502164E4 = _NONAME_ | V | 0x2B4C63A6CFA571C9696F5C157CAADCC7 ; libaacs -0x1DA0C0489153203EBAAF994536F0BDDECDD8A156 = _NONAME_ | V | 0x027A57F9B3FA7CFBA1B27F6A120205CD ; libaacs -0x603C4AA17DC08D0C6229779D32D491FEE7F7A1D9 = _NONAME_ | V | 0x3D0DD734134D6E8C98D3698E90229BCC ; libaacs -0xE75109B58B6648C13FE756EEAE24C720EF28F770 = _NONAME_ | V | 0x619273B9771D9B777FDD7E382B90948F ; libaacs -0x164B0C7F4AA9C1B01B9F5547812812C14A65DE36 = _NONAME_ | V | 0xFB7868065CE0588C73D2FC634E6741DB ; libaacs -0x02ACE311F651D00D57C592B5105F473F65A1161D = _NONAME_ | V | 0x7E3C4E0D5B58E4F43808322C9612AC61 ; libaacs -0xEE11D5D14918374A096577C1CD380158106E09B1 = _NONAME_ | V | 0xDDF6A9D188F12671372800A13E54858A ; libaacs -0x08388A0890F3EE85DA527D64791C3FB9E07F7A0B = _NONAME_ | V | 0x6154BCA30A4EB278AE04D20E67A70516 ; libaacs -0x5D78392A6B7119A37D56BDE80CFB272A1B7F7ED6 = _NONAME_ | V | 0x74F0B9C8C485FA632DBAA4EC57F253F3 ; libaacs -0xC9A05B26DF39D6CDE0D26749A30D41B841232FAC = _NONAME_ | V | 0xCF89A79949F90E98F52DEF99FC975DA5 ; libaacs -0xCF52FD9B39A7B4E5C9E5AFFFA583442AB04C2323 = _NONAME_ | V | 0x20E5D818B93A7767C8EED0B0DEED5756 ; libaacs -0x617C8E9AF13057B9E2CBD9B65DD2FE828F179039 = _NONAME_ | V | 0x3315BB92CB54DA3EEBEE753BF2057DF0 ; libaacs -0xF7C31F29059295A05E9F19AF111986F1636BE352 = _NONAME_ | V | 0x5DE255A69DBD6AF652E31592ABBE729D ; libaacs -0x62A20E40A55A02577C8CA531FCB47A618B3C6C0B = _NONAME_ | V | 0x932C190763E2E8DA7A937AA97E2DE53C ; libaacs -0xD6F954D329A31E056970A250697DCBEA9FDBBE44 = _NONAME_ | V | 0x6D463D907E716CDD73ACEE002F50E756 ; libaacs -0x079B342747AE751EDEDFF86E4A464DE56AE68ED1 = _NONAME_ | V | 0x1863F7A13BF104481E2296E2814CAA42 ; libaacs -0xC828E69B6FB16602777DBA5E0B9BFD9E62168FAF = _NONAME_ | V | 0x48AB925D847BE5BBB5F749B59910ED2B ; libaacs -0xD753B7951A21275E4143A69EEB20596BD93B4717 = _NONAME_ | V | 0x93A5548FA9523759705316338447F943 ; libaacs -0x8D013325AE0AC26DD5ADCB2F2A476047143F8E4F = _NONAME_ | V | 0xE554DB91FBDDDF07D3FFC26F8B56124A ; libaacs -0xFB73ED16C7AE2F4C092A1BEE160A19727586BFB7 = _NONAME_ | V | 0x1C2DF693ADB7D384EB36E78573211F24 ; libaacs -0xB67FCB55F86638F369F329CDA98CF804EF617A1B = _NONAME_ | V | 0xD49C32F8F913D66A7CE0AB921DBACBFB ; libaacs -0xFC649C3746BE468F9FACD111DD18126608D578D2 = _NONAME_ | V | 0x44835C5B4303731DEA3B7633EB01EC07 ; libaacs -0x29125D7F0D0FCCDE6DF6E9AA4AEF2AA2245EB5EC = _NONAME_ | V | 0x3096B2B0B00E7C83597588C61FA9923C ; libaacs -0x798EE9C661782455BB440969C665003E4F70EDF6 = _NONAME_ | V | 0x853C6794929B0CE0D16A8CB4567AA068 ; libaacs -0xB57116994269EB50A7702485C3A7EA5D57DCC830 = _NONAME_ | V | 0x6168F7FA5507AD393AF58B7C793817C0 ; libaacs -0x5F09781EF518C3D61EE7291885CB06E08EC9D869 = _NONAME_ | V | 0x57B9AC63F838778BFCB7C35A31049889 ; libaacs -0xADEE90CF7523553CBBC01AEBB1B2E8AC1416F5D5 = _NONAME_ | V | 0xC30C5B60F723CD7E55A3D34C246EC760 ; libaacs -0x4D0B2F447E2827354463F7BF7E04972C58E9AE4F = _NONAME_ | V | 0x662A55BAC7B9EAE529D6C12BD9571A4D ; libaacs -0x059210C12C6B3D664D1E7D03C62CF333BAD84AF8 = _NONAME_ | V | 0x94389BF5183812E196101973410C42F5 ; libaacs -0xBAA2DDC30A2CF31928088BE424CE1982F98D41A0 = _NONAME_ | V | 0x82F49DEB0E29DD47D503301164E73C7C ; libaacs -0x31495F38EAAAF756CCBCD7BC8D4AD030D300E9C9 = _NONAME_ | V | 0xDE2B5B332D287E98B1B332CA5829BB80 ; libaacs -0xA4705EA3C13266157D3D546BEAAA5468D61B8778 = _NONAME_ | V | 0x3C225E6FD45E8D659A087FE1422C2FDC ; libaacs -0xC7B3E04ADC5C45C36C21F4C16073B8EA2B4B82BE = _NONAME_ | V | 0xA483A940647CE5220982BE9554F79E59 ; libaacs -0xFBA1371C29037729E1208BF7D7B7E1A645B7012A = _NONAME_ | V | 0x5E8FB172EBF69E3CA9C4E54F70C1711C ; libaacs -0x9EB773D7B3F37B574863CF33084FAA046186CE73 = _NONAME_ | V | 0x3B37CC6624353B3FDE8859FCD59CFAC5 ; libaacs -0x6FA79CFB83777F5E9AEE97F80B59C6CA64EF2177 = _NONAME_ | V | 0x54AFF4698075E6572093AC8FFAA90682 ; libaacs -0xE12C63295A487307A49A110B4D41C1243D4482BE = _NONAME_ | V | 0x6ADF8EED1CA741F4D9FD3A06A89494C1 ; libaacs -0x902759AA7250A2666CF1181D4F44CA70C436E5AB = _NONAME_ | V | 0x426DDB014C4EAE3B89B7D64A2E15CA3D ; libaacs -0xA8C7B8056F3A66C4FC388919082AB8CB7A302DD8 = _NONAME_ | V | 0x0963E1CCD8B7240C96EC3CC533763B0D ; libaacs -0x5865C8C74AA817150B6C91B4C56CC70E86D06BFA = _NONAME_ | V | 0x17564EB2D9214642F2946F4E476755BD ; libaacs -0x7D5141B063CD59CE44E51A4FC32164D0E572F357 = _NONAME_ | V | 0xFE2031EE7FCD5EC63B071FA11B03B7D2 ; libaacs -0xC005B1ED3B577223D2B6EFBD6235A282714B44E8 = _NONAME_ | V | 0x4CC92E0BC7997621E6E715E8C7269D25 ; libaacs -0x26C118E8835235D7075A26622344936E308F7D1F = _NONAME_ | V | 0x8F6AE811E8C6894AEAE449B1765496BF ; libaacs -0x031F8D36E1B31EBF03293669112AD0E525F93077 = _NONAME_ | V | 0x8C6B6797FE7F3AC250A6B268B0426D2A ; libaacs -0xDA49420331089058817C81142D8EB7781579A32E = _NONAME_ | V | 0x79FB56E020A0AC7C8CC34062EC084147 ; libaacs -0xCB5132749C65FD9C9C997E708BDBF02B8D9EAB89 = _NONAME_ | V | 0xE0AB530E9F056168702BBD5106689E6B ; libaacs -0x1434D7B4A3A22A40DE6288AFAEE746B99DA7A26F = _NONAME_ | V | 0x4DD1AAC4DD91097A9A5F4C29979FD05D ; libaacs -0xA6917AD9BD323B13BCBCF0FC7EDD850F8466A3E6 = _NONAME_ | V | 0xA637EEB0DF06384BF8DCCFD66D90FB7B ; libaacs -0xDA3606E14CEE3464641EB90483665924A7489A72 = _NONAME_ | V | 0xAEAA4A86E3B652968C4FF92072C1A06C ; libaacs -0x4B12C2CB100724CB81F1F5FF436112B08562C902 = _NONAME_ | V | 0xDFD8C2BD4F15D16C76CCC8328C2009DC ; libaacs -0x5E5E13A3A16C5C4DFC4467E98131F685BBF8EDA7 = _NONAME_ | V | 0xEA7DAE2FF04596CD7264A9BB95DC4E2A ; libaacs -0x0FC33C6878D7F848218C1AECFE39C76ACE17EDB1 = _NONAME_ | V | 0x014D323EAB6F0E002710FAF7BA29B2BE ; libaacs -0x09E768545FD3E2907699B0B5290A1CD0231F18C8 = _NONAME_ | V | 0x7BA37E15CD49FA71DA5947D31605E28A ; libaacs -0x1E2E463BDD9AF41D93BCAA5D7AC64B759A4CF49D = _NONAME_ | V | 0x4C1B4E9A9753C0DC99B7CA5D677A0753 ; libaacs -0x4F8C641095389D2555298728AB0279572E784CC5 = _NONAME_ | V | 0xFFD52BA47B0CEC49C0909F3D9C9AD051 ; libaacs -0x09426E6510B597E62C486A4F312A26BBD7E30A8B = _NONAME_ | V | 0x8850010DE7CD884362BE736A3F9EFF36 ; libaacs -0x7C7A02ECDF2DBC12AE41E1BDC477EA512417015E = _NONAME_ | V | 0x746E173F17B3BA25BB7C91343CB9D9CB ; libaacs -0x798333BA47CE3FDE1A704347E8A201DD3D448B88 = _NONAME_ | V | 0xE0E0D56F3D596A678C75EF591D586264 ; libaacs -0x6B9E095C8DFB780FCFDE11786162F1F3167C5D64 = _NONAME_ | V | 0x1D442EF50707AD2682A44ED6B4E38716 ; libaacs -0x368FBC59DBFFE1C53F6A68DBF4C96AD90C9CB927 = _NONAME_ | V | 0xFA5AAFE748CFD79AA8B3BA62CD6A1901 ; libaacs -0xEB2FFE7A9F068FC5F0121F6F1CED513F9F74CF8C = _NONAME_ | V | 0x55563D44CAE5CBF7BCD8B5BE10C1A012 ; libaacs -0x804A8E7A03CB7A0282CBED620DE2CA3F0D8046B3 = _NONAME_ | V | 0x3D4F6E432C20E6BD83C8EBCC30167F53 ; libaacs -0x9BA688F368D36334B0EF11A2525E01C6EDC94F04 = _NONAME_ | V | 0xA0D24A4C1C38D0AB4F67329A5FCF63A9 ; libaacs -0xA9ED27CA78FF2A257A64CEEAD676C79267A6EE4E = _NONAME_ | V | 0xD3630B5DFD69F3F0FD375740DD25152A ; libaacs -0xF23DF061CDC0366B7C3CD18ECA3654BBBC9B8653 = _NONAME_ | V | 0xD9134FD28058E06EFB1F96FC54A4A409 ; libaacs -0xCA71E19038C17304DE663C5BC5BCEBCC616DFEEA = _NONAME_ | V | 0xF2447ABF30E14271A933E70FF4DAEA33 ; libaacs -0x80A442295116E261467E273C241A3DB172235524 = _NONAME_ | V | 0x7F6C2E309EC4534E1A3A182E8A4782AD ; libaacs -0x6FB2DD8832F257BC4B153D36A9407528A212BD94 = _NONAME_ | V | 0x552A4CD14312127742ECC5F6D17BA8EC ; libaacs -0x1F0E233930AEE6E868BA244A3133BF89593AB49F = _NONAME_ | V | 0xBDC566369D925C5AB06B5CC93B53A684 ; libaacs -0x6FCB63A309DD1D8D2D9BE13F99195A54D757BEB6 = _NONAME_ | V | 0xE368B3673CD25C497D965437C59CCE8E ; libaacs -0xB7EB509776677D4EB35DA1CBFE9B493F8A45413B = _NONAME_ | V | 0xB3F7EA5160196DC94CB0C355DA95FE04 ; libaacs -0x3723F3B0B151F5C189E526A5DAD00DC4C8D58424 = _NONAME_ | V | 0xC52B6CD25C7CC666B862FB89689D34A2 ; libaacs -0x6DD56E30036F2E5D747C9FFCC6A38D9456F987C6 = _NONAME_ | V | 0xF7CE4770E7ABFECDBE2E98581BD9F8EB ; libaacs -0x0BA5CFEF62062F4A9753ED55C6753BD07C672EEA = _NONAME_ | V | 0xBB7F16E6687183C5AE1AC885E13705E0 ; libaacs -0x2BE21BBBFE81AB890E6EC5667BE52D42466E2F61 = _NONAME_ | V | 0xC4EC38C8E1244C23C5E9740DB52D4982 ; libaacs -0x944FA100D5785CD33903A8A1563964B2971BA73F = _NONAME_ | V | 0x2DEDF8D4C33E3CCE0A4C6A9829AB6C1E ; libaacs -0x8D9B014926CEF25BA4697F7A90E850C66AB99975 = _NONAME_ | V | 0x90DECA951ADF4385E5BA7F2AB32FAF78 ; libaacs -0x3A4AF257AB6933A0E22E1E3E3896FF06A6D358CF = _NONAME_ | V | 0x578937374A8B0C599C3561FCEC3A1B37 ; libaacs -0x6401385E74CB50126DF8E7867335E5BB22A06E6B = _NONAME_ | V | 0x9BB272045FCF19E7567FED01A1625665 ; libaacs -0xEB6416EEBCC6D3AB73ED12C243A341E96AA3D945 = _NONAME_ | V | 0x47232EF65C69F3ACAF1D676DB72EA629 ; libaacs -0x2B48712117D3EEEB45222C5DC1B285E8E7CCDBAA = _NONAME_ | V | 0x3540B3F989BE5733F0FB53FCE08E56DD ; libaacs -0xC907EDA94C1DECDC9E7541BD55F4023BC09D25C2 = _NONAME_ | V | 0xEF4CC76B6D2ACF28BF21ACABAC48C28A ; libaacs -0xE804B5DD70759836AE08272B08535021AC1268AA = _NONAME_ | V | 0xDE312DFD3A334930642964FA55395CBA ; libaacs -0xBA5BA6E0FF6D3BAE30E755B04938E3AF6E3285FA = _NONAME_ | V | 0xE8B36307DF0E4F687CC1942E0DEBF079 ; libaacs -0x65F29BB4739338D5AB8AD1B7315857CB8B69F6F2 = _NONAME_ | V | 0x6CC4B01857DFAAA459846CEBE6069DD4 ; libaacs -0xAD202D75114AE9C213447DCA51DD4930181699E1 = _NONAME_ | V | 0xCC0072B99FBFC5CA41BC3A204A0DE03E ; libaacs -0xF02064FF8CA1D98E540991D03C246C675416F4B6 = _NONAME_ | V | 0xF8D21C7A80D652D4F96B7AFE6940A785 ; libaacs -0x4D65CF7CF871B22FE6E513C879FA45E45EFD7D65 = _NONAME_ | V | 0x16C02FEFF460DDDE8EEEC16A71CABFBF ; libaacs -0xBECEA38B9264C6F831154034407FD3ED07891CB8 = _NONAME_ | V | 0x070D41534F1A16C28F58AF50EF38B600 ; libaacs -0x361607CFF4F8AEEDE8815EE7F25EF031B4CCA585 = _NONAME_ | V | 0x8954888D11E42BDABD760AC38B319C20 ; libaacs -0xB867B6C09AE6F6B1B5D8C946EED475624900FDA2 = _NONAME_ | V | 0x534334A094A7A5685CC7578FBBD12D9B ; libaacs -0xD8DB0156E0FC522B3D37EC76D1378E94A96F2F6E = _NONAME_ | V | 0xF09A861B6C5A1E7B5EFD33CA3036EDF7 ; libaacs -0xEFC54678D08A72D8E1E482FFA678F7BE5F64AC3A = _NONAME_ | V | 0x2DB100B887FA730E514DF8E0A9D5D308 ; libaacs -0xBF816C895799C23B3F1C8FDD9F34FF4E8D6156AA = _NONAME_ | V | 0xE8FC3F13CCE02EDD6084C1004649A1CC ; libaacs -0x9AEA9EC45A450B8D56379346B06E896C6B444063 = _NONAME_ | V | 0xF6E573937923F42566E2BE29634972DC ; libaacs -0x2ADCEB3DADFE21A30CCB86D26C6AF4C1470BB413 = _NONAME_ | V | 0x9855060C7B289168E875FF0AC77674B7 ; libaacs -0x86DD8935792808A7F2415EFC8AA2C22D2BF8B7E6 = _NONAME_ | V | 0x6983CC3BF2FA26614CAA77E2BDD35FCA ; libaacs -0xE379B65D904FDEA62AEBFEBF3856F9A4D7ADA434 = _NONAME_ | V | 0x9EA377F8C98CA6164A43D78E30011163 ; libaacs -0xF6FF06724489AAEE5271446057A5061FC27B05ED = _NONAME_ | V | 0xBD4F948CA027770B8F7E202675A55875 ; libaacs -0x274A2EE2DD61BFD0133628CDA0CF12B21D80ADD4 = _NONAME_ | V | 0x5DBE51B3FCE27BCCF8CD21CF12C8A313 ; libaacs -0x30A0DCD812F9A78C59D18065D16C2859A33E6758 = _NONAME_ | V | 0xC74622814F57DB9536D44A8D3D05A182 ; libaacs -0xD7DACC3667A9A2169538CAB5223D86A1B09083DF = _NONAME_ | V | 0xDDD50BA7EE3CE4D95896C18D734E2B6D ; libaacs -0x1515C2C917F81BCB810D8DDA549702BBA97E13D6 = _NONAME_ | V | 0xB62A168DD5FCF788BBDD03B8073CD22C ; libaacs -0x0C3517156F22566A893F8642C00D130C89A1A80A = _NONAME_ | V | 0x7ACDD5178A367402712BDAA1B14B1708 ; libaacs -0xD48E73E51FA3E4B201DD160B04B359A7A52ABA69 = _NONAME_ | V | 0xB70ED041C1AA1578B6457AA0290E3FF8 ; libaacs -0x4800016A1B64CDEE570632A448921390B4DFF5EC = _NONAME_ | V | 0xEEA4DEBEB089B0C5E3A06A7A1370AC19 ; libaacs -0x6450BF2DD4E636EDD01B7EC9B64D0414A9742C1B = _NONAME_ | V | 0x783ABD401D83C2A0B3E10580B725F1CF ; libaacs -0x96F5C9197504D7829BFF72C278D7AF44BAF0BFF7 = _NONAME_ | V | 0x76313FDC85B1AF88FCD44D0DC0D21048 ; libaacs -0x11011398F0AF1A6E5122A8461A76FD5FCD7CE577 = _NONAME_ | V | 0xB527D71C094FDF13FA2FBE2D2E3F6CB6 ; libaacs -0x63D83E25D50C5F92EC60AE822A44E6A91E13D5EC = _NONAME_ | V | 0x99EE136811AD5D880C3D6452420DE2AF ; libaacs -0xB803C9DE6D604C2D1E4599DAC54DE2EF7BC8614E = _NONAME_ | V | 0xF8EF1F2272B84287E392B95B92D069F9 ; libaacs -0xFA81CFA3D7ECB1EBC855C6DFE655522256819F5D = _NONAME_ | V | 0xEFB9F3A3AE4EB8A88A97FE9D9B83B100 ; libaacs -0xD5BFFBB272D55F443E7BDEAD0B07AE7F44887201 = _NONAME_ | V | 0x42F1395EB9D2BED1EC113B0D48A7E073 ; libaacs -0xD109DE5897A73F09BE13DB9624660985B2936BFA = _NONAME_ | V | 0x9A22FDCDB50FF0E89D74874EAEECF48C ; libaacs -0xCFD57B0248082E262EBC463C2AFEA6140B529F66 = _NONAME_ | V | 0xE7C492F83E9DB33F0818CBCC87C5E007 ; libaacs -0x8084130EDE9B44065E9C940C127079137899B021 = _NONAME_ | V | 0xCCCAD95C6603F773BD5CA6E23E83A640 ; libaacs -0x0359204F802D757BFDC4A25C4E87F2929B38DE1C = _NONAME_ | V | 0x6E5F0162B26EE48F2E27EC85C03BCF47 ; libaacs -0xADC316045DD100DFC00B83E7D8500D68324F1BD3 = _NONAME_ | V | 0x41E537A7BABA090D884E8F47B7C77AF4 ; libaacs -0xF552DA10C2D0FCFCB8F10D94880700FA4DF83F18 = _NONAME_ | V | 0x743CCA9D90BDCD171F3100BCC996F3C1 ; libaacs -0xE436C5AC8A9B697E70217ED7A4A7AA8689C72B5B = _NONAME_ | V | 0xAA3E78FCE63B0E5480E8EF1600CEBA5F ; libaacs -0x7A6B5497D3F112ED5C52C89112FC4A5DB2A1E284 = _NONAME_ | V | 0xE4E043214A13D44DFAC9512E470B360D ; libaacs -0xBDDB254B603E3BFD1F18B4278FB7D66D479229B1 = _NONAME_ | V | 0x870B1AA214E344D9E58ED12F44452D1B ; libaacs -0x8DEDBC69A8CB5437D230C0E818E60F6F337E31E6 = _NONAME_ | V | 0xB009CA34EA013430AF0D03DB49228DC3 ; libaacs -0x5A99F7CC1BE45BE5B8BFE6B4E72B50E9970A244E = _NONAME_ | V | 0xAA0798B4423DE1F299CF4C912ACAEB58 ; libaacs -0x779E40686F6FBB3F247313ECFD8ED52E7063998C = _NONAME_ | V | 0xE6DE3735CE21548E5A4A07D09DCB59E7 ; libaacs -0x2A9C8229DF3629924D803661F6498B1A3EAC0B6A = _NONAME_ | V | 0xFB2F22850DF1F686E0B5CF1ACDA21FFD ; libaacs -0xEA9D1E83CEC4783B7924CB9A1BED1A1D48C88DFD = _NONAME_ | V | 0x6559E55645A1EFCB155D637EA09CEA38 ; libaacs -0x8D7BA07648F5FEFB4840CBF46F8BE2BAFB12C111 = _NONAME_ | V | 0xD1D9D862100994AA9C21A612B29BBABD ; libaacs -0xB1E3FFE332ABE4AE2502DFC49109B378EE723CC7 = _NONAME_ | V | 0xCCC2577BB388835F1DE099CE2566F376 ; libaacs -0x17C7FF721A685325219568F5054976899D561009 = _NONAME_ | V | 0xA8485984E3DC67CD5B419B61759C0437 ; MKBv16 -0x8CC679BA8725884EEFA702849805D00540795435 = _NONAME_ | V | 0x376B07610D9BF7576751D8A8D6D355B1 ; libaacs -0x40E6828A0615EFE0EB3F3C8F913E980252E30775 = _NONAME_ | V | 0x50F124877CFBCEC4E91FBDE88CF71D0A ; libaacs -0x3A618D0A6D8DA9747227E8A88A2DAF4CCE9CDCCB = _NONAME_ | V | 0x77A46AA20ECA0A43654EB318C10B7051 ; libaacs -0x140B026E164D8F1DD3445EFBB3CFDFADAAA3CE13 = _NONAME_ | V | 0x91647AB45AA33E37254D13C7ADD61BAF ; libaacs -0x8F36921E150A66A1EE748F07253C427D1866157C = _NONAME_ | V | 0x5323445A523A91A87BA2D787059F0690 ; libaacs -0x326607F4209E4775DB7DC373046A35161A4671A6 = _NONAME_ | V | 0x52E53742C5E1564745EBDCAFCF8C2694 ; libaacs -0x751D759DD09A1D3660C7F380A33693109B53DC2F = _NONAME_ | V | 0x772DD3E0FC0E94FD4E96BC5C179CC4D7 ; libaacs -0x64F38E79F815B68BAE7EE5E2672123297D2074C9 = _NONAME_ | V | 0x722C8129FD6424F9F917D1604E20DC7D ; libaacs -0x4567A4B600AE55B869F7D4CEB54F5334EF1A501E = _NONAME_ | V | 0x5B9C09B1755685436F07DAA759A12096 ; libaacs -0xC4459B0FA65AFCACA503B59008AD3F73F5AE9FF6 = _NONAME_ | V | 0x9EC8A166D6EDA4D71EB5EC09AEAACF23 ; libaacs -0xF7CE7D01F1FBBD1209012D2417F454E56E9D6070 = _NONAME_ | V | 0x00C24B10D152D71C2D931ED0373EDC6A ; libaacs -0x873F48C7B066A3FBF1BD77CEB92BF3D0C75C88D1 = _NONAME_ | V | 0xF325F24BDF837A8AC8C7E61C9FB385B9 ; libaacs -0xB3727B7D0498F42AACBB7AD869AED21E821A556D = _NONAME_ | V | 0xC2A1ACBC0A509660F7E2D8BF34EAB786 ; libaacs -0xEE714C888120F5C99888A2897EDA7675E83E6EEB = _NONAME_ | V | 0xAA3ECB329CDD04C210DA678F8088CB92 ; libaacs -0x39FB8CC591801F0F799FEDAF12706379D85D371C = _NONAME_ | V | 0x07088CDCCAD6A131387187088CCE5198 ; libaacs -0x92C1E4BD18B3AA23F2B27B0A303B8C18B4CAD710 = _NONAME_ | V | 0x8CADEC713A9E75A210DD70459FAB0C2C ; libaacs -0xAB2767BDB93DD03E1BCF232CFA24059E39BA8CB6 = _NONAME_ | V | 0xF48447976D273C1610889AA42D0B3DC3 ; libaacs -0x353F1D1D5AE0636F03345AF471D05C08E705493A = _NONAME_ | V | 0x777AB840940CD766D9C636C27AB08048 ; libaacs -0x321B3F3740A0904E88B28885704AA9C0AA684942 = _NONAME_ | V | 0x9225252C3E9851D4A7BAC2E8DC727BC5 ; libaacs -0xC5A29B609F40E054DD5A98B66246010697E155E6 = _NONAME_ | V | 0x50CFD9347346F25B87F2289BE2D8ACF2 ; libaacs -0xAC32861E28BA8EB7915865E7B1FFB82F41E57618 = _NONAME_ | V | 0x23C430EEE4001C1BBBE321033FB36F4B ; libaacs -0x0B1D25D3BE548C3DE548721001222EB271A43E16 = _NONAME_ | V | 0x741E87F15AF152A0D6F6BFAF333E51BA ; libaacs -0x98D7AE686CACDBA3A89441C3B1CA5754B6F40F55 = _NONAME_ | V | 0xC98CBD2D8DD80D72C90DFAEAAE325F79 ; libaacs -0xCE24BF4446CF6FFBDA7334045CFDC74B8763B2DF = _NONAME_ | V | 0x835051A9C01FAEE9BA82DDB151ED25A4 ; libaacs -0xAFE8A40AEFDC9AFE72F97B61EB7A4F34B18D0501 = _NONAME_ | V | 0x288A58547C958629057144D4FE5BBAE2 ; libaacs -0xDEA39A4769359B1F6CB173A6BBD42F9F1619753F = _NONAME_ | V | 0xA7C085848F415A97A831D97F681ACCD0 ; libaacs -0x0A1013259EE4AA49575C2BF8618B17025AB44ED7 = _NONAME_ | V | 0xCFB24E05BF550FE1C01DEECF1C8F5B23 ; libaacs -0xA320A0933CA566FE010938829448FF987D8CD419 = _NONAME_ | V | 0x57A31F6C63D6A3F542684D09BBDB413B ; libaacs -0xB031807262D0A90D850C4E1428DA7B145FFBD525 = _NONAME_ | V | 0xAD6A08C1BE803BA385681F8EFF5C2267 ; libaacs -0x007D8169965C536FCB5432B93F1D8F347C364636 = _NONAME_ | V | 0xCD583952858A4DDB75F8E637E4009B67 ; libaacs -0x3B66C377D369DD948EB34E1B051F9758D9AD730F = _NONAME_ | V | 0x7FBE7255BBB07D31E2381222A763F4D5 ; libaacs -0x767E2EDD04CAE2269F79A070322430F2222EE3C9 = _NONAME_ | V | 0x51C0E71015B888E943E53989ADEA468D ; libaacs -0xB14EFBEB7A5A688E50989B66246CDD45117E2068 = _NONAME_ | V | 0xDA860E1EDFF56711FFECF1384947D527 ; libaacs -0xBF9DB9D98A5859608CC3A7972108D331AC431476 = _NONAME_ | V | 0x17DB404A8883E4FECFD16B2AC73CB6A7 ; libaacs -0x5EA0FA0943D73B0A258A8E9D38E04D0D5D049623 = _NONAME_ | V | 0xF443FF6E3D77CBA394715EFCFA7CE49A ; libaacs -0xE006774DBAB65171B64CC43945280EEC261835EB = _NONAME_ | V | 0xAB646E811044818E8E0316C7F0D34EBC ; libaacs -0xA08F38DF6D4BCCBE5360F992CEAA490FE058E1EA = _NONAME_ | V | 0x3002607ED2714E593E0E2CE9B863607B ; libaacs -0x9D99CECBC64CF5ABB71FA8D7320064BC2DEB0407 = _NONAME_ | V | 0x37B7F5699496F7FF8D4C07B63B705B69 ; libaacs -0x7522EF4421742B4FBEC8A6905283898991AF4CD0 = _NONAME_ | V | 0x2B3FB235CF56CB17BCAC8CB47DB23ED3 ; libaacs -0x50F9BE3B3586B992A406DCAF9ACF52299C2BB0EF = _NONAME_ | V | 0x648333482251F6137B7FD6936CC6140A ; libaacs -0xE2266A718210403D7234069F3E26474D6BD86A2D = _NONAME_ | V | 0xD0F2A179A7C3D14D9EAAF4CF13CC7457 ; libaacs -0x6753C63741D998A3F11224740038FD8FF4311B0D = _NONAME_ | V | 0xD635D7BECC95CF0B033B46E4E606C109 ; libaacs -0x2A12D4AA819661533C17D47A0682047F271006FD = _NONAME_ | V | 0x9A18884B348569B7041EE32AAEF6D502 ; libaacs -0x8520C034C887D77BE97AB1EA01D6CD94972220D9 = _NONAME_ | V | 0xBEBCD5FEE9146962FC1D33F84B2A2692 ; libaacs -0x3D460C4DC598403F53E0E64DB0EC4E4F32E13DD0 = _NONAME_ | V | 0x954E815C5BC81746EECC9B7A3612AEB9 ; libaacs -0x224D35469803516150D29C9312F262E95E282792 = _NONAME_ | V | 0xB9E5E64DD1CD6E48E58CFB1DAB99428B ; libaacs -0x9DC1B26D5DB307671220C30F4B053032A6D0C12C = _NONAME_ | V | 0x6702A5840295583AC27BD4AD72B070C0 ; libaacs -0x5A376FD774344440000713407011CF6004B89481 = _NONAME_ | V | 0xDDC5E5D2C1C1BC71F62B7792A4E80A0B ; libaacs -0xAC671E4F2465D0EA07C77C5339E8356EC61BB383 = _NONAME_ | V | 0x5A33FC83B78FA94D8A98678C6C2CBDC6 ; libaacs -0xC8646F79CA61537BFF62EF88B3E0243FD13B7967 = _NONAME_ | V | 0x140EA0389D1443196F74211333610A13 ; MKBv56/FindVUK 0.83 -0xA0C111B8E6CB690763BEA2BAA1367924ED9E50DD = _NONAME_ | V | 0xB2712E975D91B975EB09081DBF18A851 ; MKBv46/FindVUK 0.83 -0x5ACF967C33FA399890EA96818C6CFE0865BF03EF = _NONAME_ | V | 0x5A066170407853EE974617A9BB16BA6C ; libaacs -0x13C8EBA1D2562D01264AA9D07F0DCD3062CFD844 = _NONAME_ | V | 0x6CB7A967C009FADD43DEBFFDA1064B9C ; libaacs -0x0FA311D300985E578DCDBDE3F4440D7ACC58E266 = _NONAME_ | V | 0x55F603BBA9B6B4D0D1F27ADBFA0EA942 ; libaacs -0x1B36DD754998A1B4C1599780037C43F4400C145E = _NONAME_ | V | 0xD0DEC3761AA8B6F8EE756339D2A32ED2 ; libaacs -0x5DDC005BFB93A79CD969DAFFF6CC7753675E0B1C = _NONAME_ | V | 0xFCC49E5D0DC2E291D5E12E5F9FD744C5 ; libaacs -0xE31A5AD47C32F453A1D908FBCF3533D9440CE9B9 = _NONAME_ | V | 0x6136ABB147DB92D708A8467A61A953A2 ; libaacs -0x64F3295BEEEC4A2D39EA00B04DF1369A1E829874 = _NONAME_ | V | 0x2E97BAE4AA46565FBDA6584EFFA2BCCA ; libaacs -0x7BD1D6EE436669099D574794927ACC3CE803778E = _NONAME_ | V | 0xA7A2DB4953E142546F18F59292825EC8 ; libaacs -0xFF1B14440B58E3AEDDB1169E5A94B1223A52CC6D = _NONAME_ | V | 0xA18A2391F9BAD5EB483BF6ADCD785D3F ; libaacs -0xE55675E73A162519D16AC76A81BD40BE3FC9BDC1 = _NONAME_ | V | 0xC46D98A7D2A4994F0240B2D9207B9F12 ; libaacs -0x1A820E446CD199B4222EC5DE57814A04434CE16B = _NONAME_ | V | 0x3AFF85E75C6B91736695F4C34B7C4C98 ; libaacs -0xA696FF3C557D9CB41C012654C8919DF74926C548 = _NONAME_ | V | 0xF37631395E98F8901CE1886577E7CC02 ; libaacs -0x995491F081C94268629FC7DC0EB3BD7A7F991808 = _NONAME_ | V | 0x9DE8BC503435A6533DB9E0B65590D4B8 ; libaacs -0x35230FC7128486047120B9323D9489BB72F1B231 = _NONAME_ | V | 0x9FE0CF754274B47B4FDE9E2D47865198 ; libaacs -0xB24A1291A3DB9534F23606113758DB257E54849A = _NONAME_ | V | 0xA6AF4CD67634E298E104B7AFD299AC5A ; libaacs -0xB7A74E3AA71974DC0D633112363A4F470C887D7E = _NONAME_ | V | 0x695CA15CFC3D5B212A7A116675DDC3CB ; libaacs -0x6FD5679E86B5CDD9B5F4D3695608FE720C4A5E8A = _NONAME_ | V | 0xDA00FC6D530B23E603697B6E3A0B8CBA ; libaacs -0x7EC0F02A5CCC9DFF408C1AB05F4EA60389885219 = _NONAME_ | V | 0x3F4008662A8C66EBEB42D58F5EC2A948 ; libaacs -0x9A372D68BE4B7A5161C91ED38848FF12209AF744 = _NONAME_ | V | 0x9FDD55931BCC8DFF4DE76B0C22906E54 ; libaacs -0x74BF2D5670021160DA506B161DCFBF9243B5D794 = _NONAME_ | V | 0x05B435EB75BC7C96D2CA2700CD3A8061 ; libaacs -0x05D8ECEE8CBE68F2A55AE281341AC135025836D4 = _NONAME_ | V | 0x5DFDB72119A2A18009BC417A7712C68C ; libaacs -0xFA2C9AA740C622ED1439CE8329DD2BCE8CC38286 = _NONAME_ | V | 0x9CEE8966CE90BF6294BE48362E729D9D ; libaacs -0xE0EE4055798D0871820F1AD28ED1C0B95D7349AA = _NONAME_ | V | 0xF2F8036B7659515AFFD850BC032BB2DF ; libaacs -0xAD26B5115622A5A2C19D512E1146DF07BEEE8E87 = _NONAME_ | V | 0x9EFFF9773F882EEFBA5EDCA83C44AC11 ; libaacs -0xB2333D00F5537344AA41A6D94B7D708653A4849E = _NONAME_ | V | 0xF5C24AA533A3B4661CB7BC7B9CF7DE55 ; libaacs -0xC204BE43E5E37C6B19CB7B1486E0BEAF65550064 = _NONAME_ | V | 0xBB2B97FEBEBDB09CBB228BD2F17ADEEB ; libaacs -0x77535E5DE8CCB6D8F42F3E63FCFF96093C6E1276 = _NONAME_ | V | 0xD68E36FD5D72C93D6BC1F7E6C44E8E5F ; libaacs -0x302AEB53457F66F771CB5F4CB120D782DFB24182 = _NONAME_ | V | 0x6AED03C8AB2AED84BA94BCCB3B0DDFE2 ; libaacs -0x0364FF91919DA616BD3CEC9C617C296F71FD2EC5 = _NONAME_ | V | 0x6FE4E4E120D2A84DEC176BB79315FB6F ; libaacs -0xF282E8E841E6B9DA6EA280E4E5551E54E523DF8D = _NONAME_ | V | 0x91D0774CE6E0E491088B1694BC708555 ; libaacs -0x907B68F63210E0E8082712C326420BD7E48A03E4 = _NONAME_ | V | 0xE7265A27F46BC6ADCB146B15865BB4C6 ; libaacs -0xCA8AE49339FE603CFC6929258E60496CE6A319E1 = _NONAME_ | V | 0x0A1983BB559B9365542B23F7E85207B9 ; libaacs -0xC8E41AA2C06FF8EE5C011FE3A5BD95601222E966 = _NONAME_ | V | 0xAAAD4C4AD0EA85F4B2D20C6FC897621C ; libaacs -0x1803A790311184E659FF97D6C50E48183CE55477 = _NONAME_ | V | 0x9D78BEFE10C421223D1BB0FADE45B45F ; libaacs -0x4D8B6D9FBFC3BECE10F0437F3A393200A3736F03 = _NONAME_ | V | 0x171A94AEE1BFF0A140165883D1B0E9A4 ; libaacs -0x03D40309CA7B874700057DA29C8D1DFA99915CE2 = _NONAME_ | V | 0x7A577844FEF3FEE60B659B88C0315C43 ; libaacs -0xC13552035C4E4DF269A464CED3E6590CB801764D = _NONAME_ | V | 0xD0BECF51F2E5B5AAF5F43A7C3660D9E0 ; libaacs -0x855E8E3C57E0EAB8659835E08167E85D7A3CAA76 = _NONAME_ | V | 0x6A350BAD9211ECA368062922124822B7 ; libaacs -0xF380585A0088C6651875FFFB83EF25F1797C9150 = _NONAME_ | V | 0x837027C8790B1A77E89D63AAD633FED8 ; libaacs -0x36EDE729434D9D255AFD394C24450E7EB50BB338 = _NONAME_ | V | 0x0896058ADC49969AEA5AE8D440ADF3C2 ; libaacs -0x1592C8C5F32F4BB8E79A8F19981EF0AA0D812B4E = _NONAME_ | V | 0x65521A86BCD6753D6192FD9DB6785812 ; libaacs -0x712D608EE7E2AEFF6D87128D316E27BB0E26B58C = _NONAME_ | V | 0x55DF891C86C6422445353EEA5A532F32 ; libaacs -0x2F491F886A69B76457FE150CFDE31B09B5AAC695 = _NONAME_ | V | 0xC374119AF035807DFFA88F6350743B2C ; libaacs -0x73624FC148228E6C4E435D01E15B7A12B8848ECF = _NONAME_ | V | 0xA3DDD27FBEA225F3C7F3A8273A0669BD ; libaacs -0xD53F01DB2412615D0166B4F01CCB15BA706D4A9E = _NONAME_ | V | 0x4AF7F0EF9EB8EEBF0D4D6EB650912CBE ; libaacs -0x8AA259DAC78D626EAE6D90105EAFE7E846682C94 = _NONAME_ | V | 0x336C21C4562D37AE77776E8044529125 ; libaacs -0xC1FCC79575D859EC5D444918DE8F4B5DEBD72F86 = _NONAME_ | V | 0xF9A2A708B24683E40EECC25B17388396 ; libaacs -0xA1DEA37EB98A58E05CD1758432546189059E0383 = _NONAME_ | V | 0x8389500F73CC86E5138508BEE7F7B35C ; libaacs -0x90DAE10CFF536AA6AA8FEE65294403C753C98383 = _NONAME_ | V | 0x3CD2FE53FE230CCF466860067E4647F5 ; libaacs -0xBCDBC69750C9A3930EF727BF7BD5F483F95C0D95 = _NONAME_ | V | 0x20331DC6FB87A1AFDFBEB3FE22A09E35 ; libaacs -0xC90F268A0D63C160817DD21409E690ABF2F9CFB8 = _NONAME_ | V | 0x21023B68956A61F40118C0CEEA6ED888 ; libaacs -0xFF7A8234A92A25180F003D9BA06A7E9A8A5CF2BC = _NONAME_ | V | 0x98B18BA9C6E0D920FACE39F2873D7FAF ; libaacs -0x415A00CCDEB3C9D2451034907489EB154597A3B5 = _NONAME_ | V | 0xC1A916EBF98B7DC4B09B7E5700C11757 ; libaacs -0x0FD50BCD95C3BF6668CEED335D61316B7F5C2875 = _NONAME_ | V | 0x519896556B132D984278C2003E82D926 ; libaacs -0xF7DDB83437A9EF28ED07104717021E3FB9C42F94 = _NONAME_ | V | 0x15EABE1767A9B7A2B39076CEC67786DC ; libaacs -0x9F6C9F04D6E4C7B00439661C6CA195BC8FD5F71F = _NONAME_ | V | 0xFBF56DFC10BDC1A6991094BBE91C471F ; libaacs -0xFD5820F81C89FB329F5C23B2A69C068A2F859DB4 = _NONAME_ | V | 0x61CB6A2D66B0812F1267A0DE4C350C6B ; libaacs -0xB707ED2F5EDE8B444AF08C0655B11AAF6A4677B6 = _NONAME_ | V | 0x8497720570D44063B860EFE062DB24C2 ; libaacs -0xB2588F9B41B50E7B7892A0A30EA3F9869713846A = _NONAME_ | V | 0x520C8C272144EB9FF502F615E2DD878E ; libaacs -0x96948F4419FEB112DA69951FA856C190CAA7283A = _NONAME_ | V | 0xDEC57C3A7889936F65E5DC35D1F1968C ; libaacs -0x22CFDE486220BD151A18CD65E037417FF993E50C = _NONAME_ | V | 0xAD105C8A19AD8F41A3FA2B7F87CCBDBB ; libaacs -0xED5325D0BD8C0896EB3672E8151AE35171374DB0 = _NONAME_ | V | 0x92B07E238AFEA1061C3EEEA8AD048AA9 ; libaacs -0x524CBB32ACE66DDE65DA792C974F199BACF0A120 = _NONAME_ | V | 0x33244C2DBEDA5E126A0DF3CBAB1FD5E6 ; libaacs -0x8BA20A98689EB12C17419CAFC5F66B29B9397D6C = _NONAME_ | V | 0x0B18493CE308DD33FCE85F08E1CA700B ; libaacs -0x197D3FA2307210D7A6CE6421ED7D16B752729DC7 = _NONAME_ | V | 0xBF4F323E0A3C535FDE27B132E881A423 ; libaacs -0x6816F3023E123248F5A8192A1A76C6BD9C427944 = _NONAME_ | V | 0x3F561B4D87F68817C704DF05E55CAE58 ; libaacs -0x4120D3A6679B26DDD834E1CE87CF0DD905DD6EA1 = _NONAME_ | V | 0x3480788D1E84519BF7F3AC1C5838C3BA ; libaacs -0x3BEC108A90DD8090A730DA7D1AC646D5A5A8E180 = _NONAME_ | V | 0xE912FE39F0DFE942D75144BE60AEDF99 ; libaacs -0x20F64AA88B74DFD22076265EE93E78EEB90BA90C = _NONAME_ | V | 0xC370773FEA6DA880CC1BF7F3EE785854 ; libaacs -0x83D38AEEB706D7EC74DF60B521A20D9B53F3771C = _NONAME_ | V | 0x0A75A3F3838CF688307CC7D4F288F317 ; libaacs -0x908F5054943328C83485D5EE441106AA5A6FA3C9 = _NONAME_ | V | 0x1CCC5AE53FE0601D67FC7235E621E30C ; libaacs -0x0EC7D32628C99C268B0FC3C1851C02F1CFFB1039 = _NONAME_ | V | 0x315FC86F030175E0E3B27E1146EF522A ; libaacs -0x1276948DB196FBA32E604585F514A94235737B9B = _NONAME_ | V | 0xAA34D582D638B744EC3A1E92E367B326 ; libaacs -0x87FF46FA4BDDF9C53C1C7409452A810FC6D6A04E = _NONAME_ | V | 0xF4668D97BA78993B7877E540DE66BD67 ; libaacs -0xFC62C6977EC72DC760B427BCB34D66BC6917C59D = _NONAME_ | V | 0xD262AD65DA40031EDCC1C43E60F75D0D ; libaacs -0xC54737EBC4C88F5E8A578E4E08F6558AA384B199 = _NONAME_ | V | 0xBAC24C7A3B91506E45795FB3111C629B ; libaacs -0x387C7D5DB33A823ABCED0E4398603D33CA35CD99 = _NONAME_ | V | 0xDFE17ECE1EDB832DAB8180F9BF00EA6D ; libaacs -0xDC0BEF8A24F98EDAA5C8CD2DA1640D1D08674D49 = _NONAME_ | V | 0x92C1D695C704482EE6E4A67C594EEA22 ; libaacs -0x0883FD4195C01A3A340FFE18EF6804BD50366CFF = _NONAME_ | V | 0x623F6C0C5EA96924102D93DBF92A7890 ; libaacs -0x8DCAC5155F173275673AD351098C98934CD82965 = _NONAME_ | V | 0xAECAF28324FC58C0D7B93979BFA77D65 ; libaacs -0x451BFF5689AC898A5A550C626B317423A0092EDC = _NONAME_ | V | 0x98A8ADE09176ED537CEC8C465ADFA02B ; libaacs -0x00BB2EE7BBAFD11A7FF731E6D9EA6563F94DB470 = _NONAME_ | V | 0x33391F4CF106AD87C82EA7A9F7586FCD ; libaacs -0x360A2E6457D1D86DBA3B9FAFCAF6A590C57853A0 = _NONAME_ | V | 0xF7F9E86665F99E7364A21C03B59AAA58 ; libaacs -0xF2D89BCB8B836EAD41DA5B258969D21E6C98D8D3 = _NONAME_ | V | 0x8F82DFAAF0E34DE5B6DBCB444ED3950D ; libaacs -0x5A0224B4D89D97B79E56C933A992C4BC7A09738C = _NONAME_ | V | 0x5EF28DFDE91B9B57E9D6F6FBF91CBA83 ; libaacs -0x93E1010A7AC300DE6BF6E15F97971B29F4312D1B = _NONAME_ | V | 0x20BEF5D64D34675907368756AB523EC9 ; libaacs -0xCC74753D32FB3F74C9F9C716B32D05D92225E8B7 = _NONAME_ | V | 0xFF9881ADE2D4A57C422318A66D3A1FEF ; libaacs -0xB82EFD7D86B16DF012D187DC043E2DE14A0DBB88 = _NONAME_ | V | 0x378B4EF403D4717D7D4E2DCB1A3B4DC7 ; libaacs -0xF8E35662FC5C46FE224E43B7034335DB2F52AE13 = _NONAME_ | V | 0xB1726A8F046DD81AB031E3CAFF580AAC ; libaacs -0x0D573C732DA7FFD2F43FFD7281823912E9F90A62 = _NONAME_ | V | 0x55A504CD360F317D6E71C8E4DC322217 ; libaacs -0xF5D4D46263862CE31DA88DFA65455F935BB20E60 = _NONAME_ | V | 0xB751EE4DB1D4268009B2EB39B3483FD2 ; libaacs -0x26B19A98E1DD8ABAE9705E7BE57528612CE3F1EC = _NONAME_ | V | 0x2150DF0F7639C7DABB5D48535AD8B158 ; libaacs -0xE889C84D714A02A9FF5B7AE6758835F8B5A9869A = _NONAME_ | V | 0x5A0F6EAE65268E321EA929BDB03FE94B ; libaacs -0xC418CE7E3B6C5D5E15120632FBED6E05FCA44675 = _NONAME_ | V | 0x41F6990B9DBE8FCE1328AB1CA334EEA1 ; libaacs -0xE69A0181D05E606BA63121F2ED9A7AA73AB89BA7 = _NONAME_ | V | 0x84A768743FFD60E20319B2D25E2BA62E ; libaacs -0x796CCD33543790F7FEBD09EB49F439A44D71A6F2 = _NONAME_ | V | 0x8F5F1F150BB5946F2EA8B9ED6327641C ; libaacs -0xBB4B1BE350D112DB70101DF86D4795F79FEC6B3F = _NONAME_ | V | 0xDE1DBF55A6D906C0DD04910C19F5F704 ; libaacs -0x732E6C50E0BED0C5B29E2306876E8FB7E87BED03 = _NONAME_ | V | 0x7FAF9C781E5C58096B6E3091B2CD416D ; libaacs -0xD9CA25AD2EFAF826D64DACC9C0EB7897D79F536E = _NONAME_ | V | 0x2C662BEB3A92A0CE12F3E52C2AA95523 ; libaacs -0x8AB807D888934B2EDF0643FFA50D8535BA4FDB44 = _NONAME_ | V | 0x328822A4D16BBDB742AC4398801C8807 ; libaacs -0x4C3093F17007F6F9F8289EC32F2B1B5E1CB81307 = _NONAME_ | V | 0xC636610C99390ECF71BBC0ED47600F3E ; libaacs -0xCE6BF1C96FFF054597FCF855507068D9CF7F21E9 = _NONAME_ | V | 0x0CCA212FE3E0E8B0B7DAB9555AD9E1D1 ; libaacs -0xCB14FC0D7FA9BA299389A26833E4A256452A94BC = _NONAME_ | V | 0x0A164C7BDC9DBD4995E1D9F64DC40123 ; libaacs -0xD8E9A992A2437F61D1E13994CE1E358635692E00 = _NONAME_ | V | 0xFC5FF68A72EDBFA65F3CD8C330A49274 ; libaacs -0x1A73345A39BC0CCBD5E6200FE2DC0A2D6BA44691 = _NONAME_ | V | 0x6CC6B64481CC395E7AF281615AFBA502 ; libaacs -0x167D4154F6E2C294A3C0C40E384C548F66CA7FE8 = _NONAME_ | V | 0x5B7B376B91C5AE0F3012BECC994BA170 ; libaacs -0x8DFF1A84204DA5DD7F120C39706FFA1995A4A586 = _NONAME_ | V | 0x3E180ACF198F1209CFA7A47806F4F59C ; libaacs -0xB84054DD16009D59C354808E4E2AB8437257A42A = _NONAME_ | V | 0xC9BD0C0CACCAFD43C128707C07E269F2 ; libaacs -0xF7B15A997ECA42F956D7091B4C8CC274427059BE = _NONAME_ | V | 0x42D629F8BD9BDFB9690977B1C69D8509 ; libaacs -0xC5977517463F74054EB6683FC8D353EF1D8B10FA = _NONAME_ | V | 0x787E3EDB0E6ED2A0FED744E20DD15D89 ; libaacs -0x24BD317BD5F54210604007B6D9C3EF80BB093C42 = _NONAME_ | V | 0x412A6A8201A93E84E8D10592F681877E ; libaacs -0x864A5EB7A47B103A8AF82AF74A5982188569CDB5 = _NONAME_ | V | 0xA4757AF1EE52AA2AC279117EE0C0D1FF ; libaacs -0x1191E719B2B4A9E1F144E728CCBBA35F0A571498 = _NONAME_ | V | 0x73CCB8B3E0EB6D62FFDE8E0EFDC0C740 ; libaacs -0x98A22B9D32D84E79986F6F5C2E1643360A39CB57 = _NONAME_ | V | 0xBD9578890599DEE9A340917C2DDE08FE ; libaacs -0x390435D59CFC58D5B4013EAE747054FC15C541F7 = _NONAME_ | V | 0x5172100E362C5F31157AE7D121D382C6 ; libaacs -0x8D1D7D630F72223DB9834D893EAED7192F9CB6C5 = _NONAME_ | V | 0x0823B25B5F0AD9CDC530F002ECB49A6E ; libaacs -0x700F66F288184B209C5367439801723B66486786 = _NONAME_ | V | 0xC8160E910C653056BA5202E9276D52CF ; libaacs -0x335F04F48E462271343F1F855000730D4C154947 = _NONAME_ | V | 0x01B0877427372546826277D7F6F07853 ; libaacs -0x2FD47E9CA0C3D49B93843E51FA16A3EE05DC6C76 = _NONAME_ | V | 0x4595B273BA0DCF1D9647386675DE3525 ; libaacs -0x19139F1C21F10A37184A968F10E6B6477C3074B6 = _NONAME_ | V | 0x42D5650D07546C9B108DFB6F85E04FE6 ; libaacs -0xECBCC6BA789C3BA88147C95F642BF575E36F9DFC = _NONAME_ | V | 0x794D6685DC156B2336DB57C2A766298E ; libaacs -0x2ECBA4A60F12F3ADE50A8919793F868C4FADEEB3 = _NONAME_ | V | 0x0E57B982B852B47364467905226B58F6 ; libaacs -0xB160C08DAC41C5264041646577092B941231BCC1 = _NONAME_ | V | 0x2AEB8162D1FE70B7E5B561990039089F ; libaacs -0xA563654CFFAD748173EA3810E45C968382C2638B = _NONAME_ | V | 0xCCAE1E3CDD78D363662970E9775A6CAA ; libaacs -0xA322808ECAC742B818EA48AEDE7C0737D1B76460 = _NONAME_ | V | 0x7BDDC81036212E718916D4D51C344086 ; libaacs -0x0161B0A397874D16688B5C66F3E199C3930ECB88 = _NONAME_ | V | 0x6EFAEB21ADEB76AFBB08D0082BF02F25 ; libaacs -0x8BA6196B8620350AB611A0CD236F999777333FF3 = _NONAME_ | V | 0xFE0CA50573D26D44277A9FEA4603D978 ; libaacs -0x937D09C09DB9EED03D39D1BA3245E8B12D0D6766 = _NONAME_ | V | 0x93F515347C2B1669FE903CC59BF3C9D8 ; libaacs -0xC8326990D5E6FA636F2AD0D0413A9F1EE5685B45 = _NONAME_ | V | 0xC9ED464F1291F6F748ADD5E12DFCCFC8 ; libaacs -0x2E3F8BB145DDC7E0A862AD06954EF614330C75A9 = _NONAME_ | V | 0x5CDBA21D3A21E4FE9BA671ED2484F0E9 ; libaacs -0x23E0F3E4EA6A66A338FEE3B7EB97BFB33518AD33 = _NONAME_ | V | 0x96C401A957A13B5BAC15A1073EE8F7CA ; libaacs -0xD96C6A095566F0839D06B98AD71A494FCAC54AC5 = _NONAME_ | V | 0x4F126329A53E51E34CA2A692250A2A14 ; libaacs -0xCDF3A2D57237EF30F0A8DB42025B369EECB2DD9D = _NONAME_ | V | 0x73469C86E0B3DAC355E28BDB87FE0BE3 ; libaacs -0xAE06673F736706D9F7173DC1181089859427DE8B = _NONAME_ | V | 0x014C55019F07506F107658BDDC8FF07E ; libaacs -0xD7191972D7B2452E5EF5B6CA01314FA14F18A822 = _NONAME_ | V | 0x6ECAF9AFF2379AAD2FDE2DBB342612FF ; libaacs -0x87CDA9BFE3F58FBD4F1D672306F6509BEF5ED619 = _NONAME_ | V | 0x828311E1D6A6A5B57693684C37D47DF7 ; libaacs -0xFBFA5EDEE917DF5A467D90E8DD0B99CD6C2A6E00 = _NONAME_ | V | 0xACF5BBAA129A18AF209261637A926B18 ; libaacs -0xB33000962D17608A0E5B36C2AF6C3324A448E9B1 = _NONAME_ | V | 0x26D442B830DE8910789D7CB7FF3DD0C4 ; libaacs -0x51757554E19895BF30BFC9B8CF4C7C26DD7F3A77 = _NONAME_ | V | 0x7ADA4BEE90B4575D69938E8390525338 ; libaacs -0x0A59FB18733BD6F5EF1D13813EA6EC947D1D1997 = _NONAME_ | V | 0xECBDC115316FEE4E490438446715A66A ; libaacs -0x63B154E7E6AD75AE43375E2EC780478C2DBB9641 = _NONAME_ | V | 0xD26E1ADCFAA1968D9F1B4C707F54C6F2 ; libaacs -0x949C1DBAACA0347C540228518DA0D64446D0B1AF = _NONAME_ | V | 0x2CBD377AF458DFF21F8ADAA61A539011 ; libaacs -0x7FDE343119A63EA26DB6A283B0D659A1B9D3FAD8 = _NONAME_ | V | 0xA0398518BC93FF176592FF77E504CC8D ; libaacs -0x88BC23DD9815D8C5CBEDE3EC319CDC0A145024D9 = _NONAME_ | V | 0x94BF25B72451228E23F070275C5C69E3 ; libaacs -0x0FF4D11C372F64F814938BAA75A565C8DFCFCF1E = _NONAME_ | V | 0xBDB134A8C3B635BDDD8F1FB7D7EB3CF9 ; libaacs -0x3033F4A262A779B50C85531E8850CA14C0DE8637 = _NONAME_ | V | 0x10A97665AECC1F9FD7FD5D49E4110733 ; libaacs -0x01ED6B25466887087EF4096C56236AEABA6374CD = _NONAME_ | V | 0x184919782F11CB2CFAB97F803DD06D42 ; libaacs -0x6E66DE608969B8091273B1CCAE92C5BA3F8293E7 = _NONAME_ | V | 0xB53BB267A826CE8A83E3A127B1D52C8B ; libaacs -0xBE888CE17A6C41D360ED929FB4ADAFF9EADA46C6 = _NONAME_ | V | 0xE930DE95EFB674D9B4BA28495A5A351A ; libaacs -0x5D97D2D465E626A72A6EECA866BD0972E460CC21 = _NONAME_ | V | 0x368684F58FE5907D62E202A9045B05A6 ; libaacs -0x0AAF9F98CF02FEC112DFC7D538121383D7BD7410 = _NONAME_ | V | 0xCBAAAAF8C961F39644CA6652ACBB6C57 ; libaacs -0x7E6824DB75965F70C4862F4977B37569443A7D7F = _NONAME_ | V | 0x7190F1526F218B83CBABD38AA1936B6F ; libaacs -0xE94A310917F9EA75B329B7A851AE5DFAA58981BD = _NONAME_ | V | 0x8AB9E408661607C9862183498DDEEBFF ; libaacs -0xBA8009A079338176DC6B601BCF7A24A7EFCEAA30 = _NONAME_ | V | 0x4C04D0A13CC5E961AE346713764D75AE ; libaacs -0xCDFDDF145FD0BA0CD29231B11D29A286C6D8F663 = _NONAME_ | V | 0xAB0D07ED49C2C8FDB310A4EDDB4A6B4B ; libaacs -0xCD042C10291931CA284DFFD15CE7FD1054444D0C = _NONAME_ | V | 0x8F1500FAE33E992E72A415F7F4440909 ; libaacs -0x6AA6DD67935578BA38435E60006BF6588F248EF9 = _NONAME_ | V | 0xF980BB4E66C73476B214727559103C19 ; libaacs -0x0C153B04ACBBF3EE821D35D62F98F4F5B2936DC9 = _NONAME_ | V | 0x47C8B492EEAAE09FD56CEA2DA5F71E4F ; libaacs -0x4900BAE9DB76A18C5C19B1CBE6FCABA5537578D9 = _NONAME_ | V | 0x69583BCBE4D795D97EE920CF309E1C6F ; libaacs -0xB969BC77286B09569CBA081DBBB2BBEDEAE173ED = _NONAME_ | V | 0x2E5AAC7532F9042DEEA4C574FB6B52FC ; libaacs -0xB153B516EB72DCABF00E4823BBD9DB4E8C45A4B9 = _NONAME_ | V | 0x54BBA958656052818247ADA262DF3B94 ; libaacs -0x114DEAFE69CF375B0F94C5B2A924BE1EE5C8DEC6 = _NONAME_ | V | 0xD13E12AF37565BF033727E0F1CA59149 ; libaacs -0xE0B3653F166D5C332EFE193B903CACAAA5A8B637 = _NONAME_ | V | 0x89109F407C0693EF266E02B728B913DD ; libaacs -0xFB4E94534AD0D71BA42071540C01F870AF57C15B = _NONAME_ | V | 0x6D9061C38B31D0208F7F3604887EBB1D ; libaacs -0x6C2217D8EBC9EBFBFAE0A5863E246918D7503AFB = _NONAME_ | V | 0xFAE455944A646148563C0E8411BE3A2B ; libaacs -0x03DB4CD3FEA2714EA70AFC5161600F7ACF69AC9E = _NONAME_ | V | 0xE7D10FD218B431F3F377E35B22779145 ; libaacs -0xE88BAD469E5F460DECE30AF690EF06CBE477FCF5 = _NONAME_ | V | 0x9CAB50BB7BEFEEF44578A641393C62C6 ; libaacs -0x95242B10A78E760A132C554CBCB11E91BC58F14E = _NONAME_ | V | 0x8AE3D5E96EF8378271A79AFCCCB8918A ; libaacs -0x5366191F84983E659D9849A029D992356BB2A446 = _NONAME_ | V | 0xA22A779A0FB8C6771A9AE8E33A80549B ; libaacs -0xCF99D80CE38CC9D258BE2D166F3D54BA2560A189 = _NONAME_ | V | 0x6E5775F72357BF6D53A14D051588F33F ; libaacs -0xBB23D5AF037B47A2631BDFF79668ABF8F4FD2018 = _NONAME_ | V | 0xDA59FFEBA1C083D930F7BC512B37BB80 ; libaacs -0x1E1C50C3083D3836246A0AE416D879936ED4B615 = _NONAME_ | V | 0x8E844895623A72D8F5956F869744F8B8 ; libaacs -0x1BB137076A43E74802D09ABCAD0B1D114B7D08C7 = _NONAME_ | V | 0xEC83E02EA1E1C786305565020529C02C ; libaacs -0x94DFEB66EF54D9ADDE1B78A2C9FC23485276B215 = _NONAME_ | V | 0xA9F9283F81EF1C8E022DC0AFA2F9BEDF ; libaacs -0x3EEA17C9A5C44AFB5695840D1AECF18C8DB5F268 = _NONAME_ | V | 0x78AA7397F108B78AE85B19837DB26429 ; libaacs -0x0230D5065FB8038656AE8C0AA60A8E3E62D6670A = _NONAME_ | V | 0xD8457F5775FECB2178CEB815B290EF11 ; libaacs -0x838DCA40E99D765A4370C165DDF0E0B7CCAA9524 = _NONAME_ | V | 0x26F35FFEA62A5E35CE7EC8F86B61B4E8 ; libaacs -0x28DF9BCE084A236AEA9908F84621A1A0D80E833A = _NONAME_ | V | 0xC9629160817D8E0E17ADB7AFA9BDEA03 ; libaacs -0x5454FC079C79897159198AA28D3D04E35F1868FB = _NONAME_ | V | 0x0864C524C9E90B688E71D6D691BD3A3E ; libaacs -0x6F47CE6237CA161710A58D64C7752E025784F295 = _NONAME_ | V | 0x6E2D5A5A302F70328A391D345FF78352 ; libaacs -0xD09EC383C003CA97C80A3ED4C725D6F0E590391C = _NONAME_ | V | 0x2403E7A6697FBEEFFC771B82F0726559 ; libaacs -0xBEFEC71C4135ADE5B5FE4CE67B0C01FF56B3D07B = _NONAME_ | V | 0x0B8541ED13ECC6D379408B99E661A7BD ; libaacs -0x929E7F5F579431DE0F52AD2907F658AFACA12ED5 = _NONAME_ | V | 0xE0BFA9F91CF2A2FB1D3CC99095CC9381 ; libaacs -0x33FBC62536075630F2649112D071F47B8E35915A = _NONAME_ | V | 0x37BBCEDF6DEAD64A3D8B3E98822F02BB ; libaacs -0xF861528064048C5BE1D111AC46449C3C9A35F34F = _NONAME_ | V | 0xB6AF8F69DBDCE8E92A8441DF91FB6113 ; libaacs -0xD8E0965CC8E8FD0C2B7838CD6AF96D2784BC6978 = _NONAME_ | V | 0x11E351E4AD2B8CCBB869B1CAF4B9FA37 ; libaacs -0xC338EA8802A3BD82683C6082823D398AD4350CB1 = _NONAME_ | V | 0xD4E38494F2B0B921673BE27562D3F659 ; libaacs -0x7BF4DA5EC6C6B3367CC57C2378E42E7786CF48F8 = _NONAME_ | V | 0x645D2A9ABB4CA5A292374E23E3E4D686 ; libaacs -0x70EB22F6E6D7EA45DDD99552FF947E4D10DB2FCA = _NONAME_ | V | 0x1901A051A9F5B9D17F7259867D5EC7FF ; libaacs -0x5A117822E4A280931F02838E08858027CCA9F240 = _NONAME_ | V | 0x99CF8A819875841F35135AD4737E1C0E ; libaacs -0x2DDC60DA44CB49C078CF085A4491548DA69D3AD7 = _NONAME_ | V | 0x13A57907CED7B7C3760BF56C124DB3C9 ; libaacs -0x66CB4498CF4340E578A240663B9C05F6B010FD9D = _NONAME_ | V | 0xFA3BDD15C76302E7B487297B0435EA0C ; libaacs -0x526EF2627C36755500C54DF8498CE326173F5CC0 = _NONAME_ | V | 0xD0FAF731667FAD98D75C2125DD8FC2B7 ; libaacs -0xAC9ED89FEB93A19F6AAF9E2DEBC019283BD83F34 = _NONAME_ | V | 0x492E531A75DCE5FD2BA088FDD67BAE1A ; libaacs -0x4A526AC302DC8B2D71F681EF08FF1FB16C1B8480 = _NONAME_ | V | 0x7F1ED7B3051D1A9C7E32A82017130BF4 ; libaacs -0x870C3996BE6CD72012FEE9AD126035DE0C6881DE = _NONAME_ | V | 0xB6E354E244D8DDDCBEE46BBBD2915AC4 ; libaacs -0x2D4D47DD9D1A13D3231AB25A047EFCC7ECB5D4E0 = _NONAME_ | V | 0x1E065F949617133C3C67AC33B69193C2 ; libaacs -0x9126151BFB7344AE6BC09D974769DE6AB48A9A02 = _NONAME_ | V | 0x1DF20A8985D28A76516EE674AA46868A ; libaacs -0x04289DC43AD04B445C8CE7324FB0DF2E6B29AEE4 = _NONAME_ | V | 0x01266EDC025C5F2CC5B852D91A5C6FBD ; libaacs -0x3A9C18AA7968280C9403569F4F3CA99C72836855 = _NONAME_ | V | 0xCB0BFC8FBE9667F4DBE8E6578E24FDD0 ; libaacs -0x263BCF0999438AAF75A0715E09F03A07654A1B88 = _NONAME_ | V | 0x00145EF78C7FBF35DEE2F0DA99C44A5E ; libaacs -0x6A5773436DA2E8C62D4BDC81E4D4726058FCFBB6 = _NONAME_ | V | 0x8A378384CF597B36DDF3A370DD967B0F ; libaacs -0x420F88EAA735A4883A9C70A28688B3A206D572F2 = _NONAME_ | V | 0x371169CFCD6F57E9E23E94FB19243C63 ; libaacs -0x908CD87F813D013A297B048508F9FE060F6D058F = _NONAME_ | V | 0x602E65D31F3D4D472C6AA3F22A7F899C ; libaacs -0x44A9F271C376261866BA363ABE8889F5899B0774 = _NONAME_ | V | 0xAC73AAA4F940FC94A2CDE67BCA901C4C ; libaacs -0x40C1216636278BDF6B132B9C1347B5A474C732E1 = _NONAME_ | V | 0x881124F25CB68F1D82227B4C5322FA04 ; libaacs -0xB3082425B2128D0ABF6368A9B65822D4501B5852 = _NONAME_ | V | 0xAEF3D9D39A58B0ADBB4A80ED3314C572 ; libaacs -0xC9B16D694A9CA13C8DF72FC663E0BF146EBEAA0C = _NONAME_ | V | 0x3D70ECC9B728AC37EAF938E02BCADBD5 ; libaacs -0xBC68FDB6B6ADD931384FB6A8BB9EA7442CA5F6E6 = _NONAME_ | V | 0x5127253B4982E8475AB81EB47DF90D52 ; libaacs -0xF93A5BEA1D17B85085EADC1514B01206E9CC2A6D = _NONAME_ | V | 0x62AE29F365CDC1D650A1D27D4E27587F ; libaacs -0x644DE7575AB6C260DCDC82293FA17F0BDAE36AD9 = _NONAME_ | V | 0xE6BCBC8EC66414C5B93C8B83FAFD2B30 ; libaacs -0x0975CC84839CAA4E4BE6F05278E4AD10EEBB45C8 = _NONAME_ | V | 0x93F1EE366F13EC475A3C6700411F3C5E ; libaacs -0xE478C9EB66369E48131E311D4541187E32519913 = _NONAME_ | V | 0xCEAC7E84B33CC10FB283EB41A21AEC26 ; libaacs -0x52E41F142D673A499BFF6A1346D64EC432C4F5DB = _NONAME_ | V | 0x4E74A865DB2EB2A3BD34739F00D50BB5 ; libaacs -0x7B39F93C3064E21205AC2C2A0CD0DB2FE5476EE3 = _NONAME_ | V | 0xC0B65D06B262DFB168F84C97B9420ECD ; libaacs -0xC4B1D0BB9E7D7B4DDEA65B99C5D786A4727EADDA = _NONAME_ | V | 0x7404755E715C24658F5F717F549B3EC4 ; libaacs -0x51F8FC648AA576E646D7DF3886CB8FAB9B3F7A3C = _NONAME_ | V | 0x8254692110A22822D0ABA60C9D6BCBDE ; libaacs -0xEB95E0D741BE02CCE4249C17D51547C336D649B0 = _NONAME_ | V | 0x9A4BF1D8FDC99D866D794D8651286FC3 ; libaacs -0x6A22292E321A39DA50783E26C1707625A829F02A = _NONAME_ | V | 0x5477284DA51F25DC3B6126DBC81BD366 ; libaacs -0xFEA26E325C4E6CA34E96ED5C014027E12F3DA632 = _NONAME_ | V | 0x2C5CCE56029742270AEE60FB05C9F082 ; libaacs -0xD6E87AECA92BFE7F4A4D0FEF60EB5BAA40420ADE = _NONAME_ | V | 0xD59DC3F1AFA8E4F038B225A60AD462B9 ; libaacs -0xC8AC808F97F524A96F4400C3BF8255943F5A0B0D = _NONAME_ | V | 0xD55CFD69D64A6FB71CAF8F8C0CAAF6C4 ; libaacs -0x8C8256020A0F532D3C3E1AC7E8891483A223AD4D = _NONAME_ | V | 0xA6D3E8E0BDAB657C0C782EE01D8CA4C6 ; libaacs -0x889B4A95B455B57A8BB87B8C8849369CF8B8CAA7 = _NONAME_ | V | 0x13447FAEEF58B48D829E90448ECE166D ; libaacs -0x6C1C7C9FC8E5358108D28AE1CB05D812217C30FD = _NONAME_ | V | 0x052FDC8DE36805F196EE244DE12B2C7A ; libaacs -0x59125FBB761B0DF8F583D0FDCCC8CE8F1EBE2546 = _NONAME_ | V | 0xA4FD7A50B21A2FAD74E0DD28B79372D6 ; libaacs -0x4A0B92874980BF3257D89B28CF8026856C43E5FC = _NONAME_ | V | 0x7E6114FF292B462A1EB28FC577EFCF59 ; libaacs -0x7050B5BD890CFA9066E0E6AEE63392048AFBBD6F = _NONAME_ | V | 0x5FB0A0106C977E883DB3E2DB7E5E8164 ; libaacs -0xF9CC9FB25C23522148086D50C7A26E11DD420DA1 = _NONAME_ | V | 0xC1D52FE1DBBC7B24502EE996C71A78F8 ; libaacs -0x20D19EC17CACC091C88F370C007D31D9F986EEF4 = _NONAME_ | V | 0x7BC22F36431C3374CB142A8A836FDB44 ; libaacs -0x03EEBDEEA58B890A15EF3F4F8E9BEBDEA15A513A = _NONAME_ | V | 0xDB019B64DAB5CD3F3D4825D56BC6C689 ; libaacs -0xED69E9F0BF864D4C951C786313CED3D1658683C3 = _NONAME_ | V | 0x5402260D39040AA6896BFB6E6B474919 ; libaacs -0xCE3C6FCCB0B73F3D7F2E7AB509D3649A5E922D2C = _NONAME_ | V | 0xA1AE6D3F5A986FEF056AF1D7C8D3692A ; libaacs -0xCBEF47DE3543BB76FB79946DD4A80C7DB7776C8F = _NONAME_ | V | 0x07087E3C5739386A0D9B57367433BE0A ; libaacs -0xF3CFA8C73E04F20675DFBEADBBAB020D603CBCAD = _NONAME_ | V | 0x729DCFD1F25CD1476B6980741B594DDA ; libaacs -0x83100FBE777C692C637355B072055FD0199DD137 = _NONAME_ | V | 0xA10BAE977C3567B3E7E63C5D99E3D5F3 ; libaacs -0x5AF47ED98028CD64041A68646F2F45FC31C47CBF = _NONAME_ | V | 0x8C253D98F3F915CD49A6763666B5D09F ; libaacs -0x57F8DCF5140E6CD5AFA6BD1513176D5F3BCF3A2F = _NONAME_ | V | 0x9541597946E0631521C4F591FBDDA4FA ; libaacs -0x23FC5664984150C54BB4674A48F96561E20AF58A = _NONAME_ | V | 0xE1366AD5C070036EAD69E62BB64CDA6C ; libaacs -0x23F24F49B003BC26BBBE1498EB77A37E202DDFCA = _NONAME_ | V | 0x7142554BC2F8D92B94AAEB8086B27A44 ; libaacs -0x9111577BB8A4B226C9293D2B6540AAD073B05334 = _NONAME_ | V | 0xE49BF9512A6D8F1FDC0F5576919A3D4A ; libaacs -0x96439AAA921E1E3B185D89624A438CAD601D2609 = _NONAME_ | V | 0xAD1ACA308E9F3D5EB65228C95826430D ; libaacs -0x184486B3B3924E8D1A369E81DADC07445AA1D257 = _NONAME_ | V | 0xE2A50D05BE549ADB9830109A8BC3F01F ; libaacs -0x54BF6B3E0930104841B2A7C9C66F8AF2D7654CD6 = _NONAME_ | V | 0x11D9170E18C0BC0E14DF4CBE11AC7A05 ; libaacs -0x7340262AA28ED5D62746D0773C7EE109A770CFA3 = _NONAME_ | V | 0x83271952C121AA11EF02192BFA5B17C8 ; libaacs -0x16E32298BCDEAA4893D21F08C396E4FE2A4A3977 = _NONAME_ | V | 0x23F572F525F2D6D0E0266F72B54F4DDB ; libaacs -0x7F2FB61D8F48AAA6D333729E3958D0A5CAABB609 = _NONAME_ | V | 0x40E83736EB5994EFA072E55118ECA44D ; libaacs -0x005DED65A716AA667CCC7A5EB03001B4C2210843 = _NONAME_ | V | 0xCDB15C9292180024005F55A5E184610F ; libaacs -0xDF7ADA0923A002BFB8F0EBB1BE8DD1F2493514E6 = _NONAME_ | V | 0xF262DC659D7377C4AD19DBB8F7D52495 ; libaacs -0x510057EB0EFB0B1A815E3422B73D8A72C8E1133C = _NONAME_ | V | 0xD72F73D7355E4B26E24C551A91A12CFA ; libaacs -0x3D893EDF9BCA3427CD87F2AB0956757A6B060D98 = _NONAME_ | V | 0xC1340F54F7AF5332B7C6F9E32C8F6110 ; libaacs -0x36B8E22D9A1AC4BDA5C3C6CAD627715149010E34 = _NONAME_ | V | 0x23813D11FE95A014BE2F5C8C83840969 ; libaacs -0x4F282EA7AB0EC8EC44E9CA16EA1D2661DEFAFF6B = _NONAME_ | V | 0x90CD92B76D3D213548E41A3699C6FA6C ; libaacs -0xF1E45D88A24C6AC03EB4F8F035D838B6E8055A94 = _NONAME_ | V | 0x5D3ECE078BC1EE4084C88C0F811C8318 ; libaacs -0x01B3C29C81F70C5BC31A33F47E8A696279E88110 = _NONAME_ | V | 0x3DB39A00FCDE4E36D4E9B329A54C666D ; libaacs -0xCA653E051610600D45565A133D112C3AA2421787 = _NONAME_ | V | 0x4537697A096E39D0B52BEBD4D1ECB085 ; libaacs -0x16A8A87E58215EB269EBEE42B5E32533B1E822AC = _NONAME_ | V | 0xAD62BE9CB7E37D84A20491673569601F ; libaacs -0x80648877B76EDF7D6595C7E0E60A63B1212E635E = _NONAME_ | V | 0x96A92303947FCA15638D5BBD2F0C52FC ; libaacs -0x743F7CB07FFEB3302F650E7C2EA5AE6A106615B0 = _NONAME_ | V | 0xCCC4C5D24A90E964651F41FB2A1D4FD6 ; libaacs -0x0E8B37BDE8D3625505566BB824A21C4D7B586E47 = _NONAME_ | V | 0x09A806E122EFF02B7AAE796C968A9F82 ; libaacs -0xF593E91CF52B73FBF723AFD5D57116B598326606 = _NONAME_ | V | 0xF637DF914CF6851DC06EE2660E458C28 ; libaacs -0xF39474A16486F67C60E26D697E65C35EAF1D2D5B = _NONAME_ | V | 0xA6D71B83BD7C05DD8037AFEEB6E001E2 ; libaacs -0xE4E73052079C9CBFC2F40A9360F81CD09FA82FA8 = _NONAME_ | V | 0x0D31175054AE4C09C6B7588DF6F6AEAE ; libaacs -0x69C0755049005A75C51BB80C2EF5DB7AFDE890E0 = _NONAME_ | V | 0x1DD689BBAA3EC1CC703A9CF9051F1711 ; libaacs -0xFB58E5263B924CC6A205C6AE2B06271E1ADFDD05 = _NONAME_ | V | 0x4B1700FD41445D4F0C6545B9002E2182 ; libaacs -0xFB5A55B02EDA39B82057F4E6664958533DCED797 = _NONAME_ | V | 0x3ABC5C9B19CE929BD430E32F9AD01869 ; libaacs -0x2CDF6181D9B632603A594ED53B699C81E7E79D29 = _NONAME_ | V | 0x98BCE1C6A4AA29DFA7D3C5BCC38493DE ; libaacs -0x0102499597B40EF57149FCA5D5A1DA1825FC2434 = _NONAME_ | V | 0x4CBFE7A14D15125DBBA7820050E710A5 ; libaacs -0xDD3EAC4D67CF76B69D7FC91114358A0C0F4EDF50 = _NONAME_ | V | 0x792C63F4E46E53905455C7C3822137A5 ; libaacs -0x1F804ED47A9EE9E68725269DD8F0D057FEBF38BE = _NONAME_ | V | 0x0CFE953224A09752981B365C88B8D07E ; libaacs -0x54A17566E901167B246B1AABEEC69973B4521390 = _NONAME_ | V | 0x1FD8F25B316EE929B27CAD988502216D ; libaacs -0x537A2E911C3E7EF8D750E39FF2AB1F2E6BCB360C = _NONAME_ | V | 0x088FEC1F4C79D2392E65D884BC1E70C4 ; libaacs -0x302F61B91B3A6E9369BF8B23D854AB6D2979F938 = _NONAME_ | V | 0x74518AE6B749A1452E4774F94D7D7497 ; libaacs -0x713338C4B293C52CE05D3D62B2E2189944A4491A = _NONAME_ | V | 0x944112AAA9BC7EAF3E45220FC023776C ; libaacs -0x57A34881FA8A80D27F6DA35C22F108D2E60D2ECD = _NONAME_ | V | 0x8103CE4E30989693BD14A316151853BE ; libaacs -0x5425B42751FD8B4EBA2F4E3840B1DD580A98A200 = _NONAME_ | V | 0xEFA06485BBE1B91E73B44EBBD2D81C98 ; libaacs -0x113EA02C37CED21AFFEBAC52D5C73D6C099075B6 = _NONAME_ | V | 0x6805A949668AECCA568BBE3E15BBC761 ; libaacs -0xFD900E310EAB765C477E3566B38171494366F46C = _NONAME_ | V | 0xEE8BB864B227F79A5F8C481F78E59316 ; libaacs -0x79B1C69674EAA35B1FA1DF8A62388E7ED03CA5B3 = _NONAME_ | V | 0x8D4E64633D36FA064B3AF8643413FAD3 ; libaacs -0x10B54D688634138CD451122EA14EF632126A1ACB = _NONAME_ | V | 0xCE9DC3928C57584EFA398E2B2FBEC536 ; libaacs -0xA251B295D59E3A950A9BC362A790A5E1B1FE87E9 = _NONAME_ | V | 0xF301F9545E7A78CC5AF214F8D0BFB3FA ; libaacs -0xCA0BD28ADF4058BEE4183AF7E4BFC5297629FD27 = _NONAME_ | V | 0x7CD3D2BEF1A4B7F9931D45C3601FF74F ; libaacs -0x9BC34C69E99BAAB104045A2F102C9E88684CA150 = _NONAME_ | V | 0xD94104DEA54058FEF2D6F205912B319A ; libaacs -0xDB65EC297C0376744EF6E84B76DB43BBA0436F73 = _NONAME_ | V | 0x69D16363C2A91D0EE92D8EA95E973CF2 ; libaacs -0xD44F7DDF5E02718991D2DD3ECF95D0509DB4298F = _NONAME_ | V | 0xBEE47651B2945FA457A3ABC835CA9273 ; libaacs -0x4E4B54953E7D2834750F78F34FDB82AEBEE91A1A = _NONAME_ | V | 0x4E628AC84604E603F6CA6E4F1F9D38C4 ; libaacs -0x8E22FE089433AF7071E2C97B965E4A951555BBF3 = _NONAME_ | V | 0x1B121A7CD3FC24624DA7A525F026C26E ; libaacs -0x034CCE473D1CC26BA55CF925F249E23812EACE59 = _NONAME_ | V | 0x40404CA1ED2597E0B1C73D2961B56C9F ; libaacs -0xD05F6BBE9BEBD4009CEC5F68C69CB276F5D9E1A8 = _NONAME_ | V | 0x2F2EC34A7AD6746BDE08D79619597B77 ; libaacs -0xC4D81D44AF8743319774A74B1E2D37BE8BD5EC6A = _NONAME_ | V | 0x107DF543ECAF135F1A540FD83C7119AC ; libaacs -0x75D4617D29C0E97DC446296B55A44BA4003A8C86 = _NONAME_ | V | 0xC2DDD11454D9BA3AF07D1202D95E9B5B ; libaacs -0x85223968B76F1734718D130FADEA7BA7ADB993E2 = _NONAME_ | V | 0xE50351E004863030A898D54975E9902D ; Aeon Flux -0xB2C85D0B92E589DCF83BEE334A6AF221D056D2AC = _NONAME_ | V | 0xE7EACC31DBE547117C3D30A95F493DDF ; libaacs -0x4124AE9C197D95804FE014EE8AF8E01846F06CB8 = _NONAME_ | V | 0x17A773B5DD3A25C2EBF1403A5A715352 ; libaacs -0x0E1BE483C539286B11A77C92BF09703B0A74F3B5 = _NONAME_ | V | 0x9765F7FD5C83879038E88A7D9B6D8710 ; libaacs -0x50E4BE9029B628274F6F5E3A1611472000128C31 = _NONAME_ | V | 0x644A786E12D5F592A65A9D26229F3A73 ; libaacs -0x5A59A48DD5E55AB3F29CB5E0BAADEDDA84157CFF = _NONAME_ | V | 0x131998659B9E47760FA295A7BFED93A7 ; libaacs -0xAF31471DC1A8689C2C3B48178126C3AF8130207E = _NONAME_ | V | 0xF5EB206B69630834AB2832B72FDB5901 ; libaacs -0x4D33522B36A2D722580C903B28582F478F57C817 = _NONAME_ | V | 0x69362DFB6BA28E1A71161D6AC850DE9C ; libaacs -0x4F29BAE7705C10CB39A47DA3BE2A024CA5D034DC = _NONAME_ | V | 0xB4FF4563DC33DC88396BB0683BB06B71 ; libaacs -0x99C48D9B119A4DC7CD078CE1CC8EC1C784F9253D = _NONAME_ | V | 0xFDEF8E38076750318594E060EA18C63C ; libaacs -0x1351F4CF83944B831653E62054114A9054F8100E = _NONAME_ | V | 0x0F7D5E1EC4D7623F0341E399A1E6CCA4 ; libaacs -0x77DA7341C6665F812B1CD8F6941F74D78C977AFC = _NONAME_ | V | 0xCCB4ADF343A892AD699DF6BF3F2CC62B ; libaacs -0xE98E4F594A4E141427FEAEC58532332DF0CE4E21 = _NONAME_ | V | 0xF1AC375E89C84F64CDFD0E2FCB7B9BDB ; libaacs -0xDC13FC6741520C628600F75BC03523A54AA51034 = _NONAME_ | V | 0x602909A2144E4A4C5BC52734C5B59314 ; libaacs -0x06C98E4A42C7E355CE1CD418237E358D3A74D6CE = _NONAME_ | V | 0x1F14BBE6FEC12AE8F4D98CBB1E8405FF ; libaacs -0x50D8310936E905BB40BE2483B56B1EDBFB639888 = _NONAME_ | V | 0xA45AD19F19F9CDF36CDB904A7F2187BC ; libaacs -0xDEA1A277E08159D317B2F51914E8D799C10EA82F = _NONAME_ | V | 0xA25FF0A1AEC5A587E88E282D8C4BB848 ; libaacs -0x1017E1E109C0EB8808529C266167F7C94872862E = _NONAME_ | V | 0x7CC6FAEA6B412250D096EE16E0D94F42 ; libaacs -0xABB1711FD28E9BE02262AD596165BC3ACAB9EDC8 = _NONAME_ | V | 0x6B77C5B1A3CE22B09155D220E557BD79 ; libaacs -0xAA37AF40635319ED92DA6F8BD2F04956AF2A46C8 = _NONAME_ | V | 0x7B8953D9342439F4C98030B4D59A1B45 ; libaacs -0x4AB990CC33BEACF97E14F1FE5A6878707AD3FDC0 = _NONAME_ | V | 0x986F874F8B24BF2DA125172B11D68DB0 ; libaacs -0xDCD1434BD3304CBD477428D1F239DF81ECBF5E54 = _NONAME_ | V | 0x56659FF081B4326E72764D894EEE3749 ; libaacs -0xC060BB7EA0F897CA4A233B497AA538912704DFA3 = _NONAME_ | V | 0xBBFF7559D54A3CA8C9324807540B307F ; libaacs -0xA6A52D3EB26FD7FF5F98AD0C5D5669CFE305213A = _NONAME_ | V | 0x861D7FDA6537F90D14A7C6E933264DEE ; libaacs -0x4060CEE534D5FA27EB2BB8F9A27E9145E0911472 = _NONAME_ | V | 0xB791835862CCCF247611B7EA465E5985 ; libaacs -0x6F05C21638DBEDBBB33C2AF3D3372D7BF30BF34C = _NONAME_ | V | 0xC5AFEA38FBFBC76169D7E7A910B1C7C7 ; libaacs -0xAD364EB9B8AF569FB2BAEEE76133ED6617DF9C27 = _NONAME_ | V | 0x4E5174A011FD15592CD546A58F9F692C ; libaacs -0xE1A871C52EB1C259C3D7360B69B4107ECB97AF19 = _NONAME_ | V | 0xD5DD93647422FC2A518D3A80D55CA567 ; libaacs -0x2B7BE58702335C96A3F9F056147BE89A0E76A70D = _NONAME_ | V | 0xC19ACE68CEAE18DF53BF93ABDD73166E ; libaacs -0x500BB483C2E85D77EACD9F964D2B976C9E2B8894 = _NONAME_ | V | 0x371ADA6111D222481651A281A5C74C51 ; libaacs -0x3A826B1CB43B340E4FD87DEA34AAB6664ED2E65C = _NONAME_ | V | 0xF8D5DBF93E87D9281AF5827A63E91779 ; libaacs -0xB780893081EDC3E0552CD8C653ADEAEBD0ACBF53 = _NONAME_ | V | 0xC3B3771E55B44F41593EDD7F815373A9 ; libaacs -0xF0507A3F6F096CAF2771D0D4A775DC68EFDD6F0D = _NONAME_ | V | 0xF5C55DC8C3CDA6DCC961F4829263AA41 ; libaacs -0x7421F9B65E24F48E3A04DACE52F38718F4765216 = _NONAME_ | V | 0x35DC142A1ECE0DCB8E5A9FAF53FB200C ; libaacs -0xA7793DB200A54D2AE1F1963492FED57AF6A68318 = _NONAME_ | V | 0x4E72C3229E71A8505D555EA1E427B7BE ; libaacs -0x8A68284B9810FB98D3E26736F1BBCCCE24B98533 = _NONAME_ | V | 0x6B4D9F03C610697B4C38ADA23315BE28 ; libaacs -0xBC947988F1C0A917F4242211762EDFFFD71EDDE9 = _NONAME_ | V | 0x53EF1AEDE84A377F2B7208D3C86449BD ; libaacs -0x787D42A5A3EF0B7E72DA7B5B0EF4E6E1DAEDA369 = _NONAME_ | V | 0x1BF7EB6FFEAC09CA46B45341C143728A ; libaacs -0x3E21563A9E2068A3E9D02AE02E884F2076A1F868 = _NONAME_ | V | 0xD72FB15311A76CB3F5A4151707756B69 ; libaacs -0xF548B65022758E15907861EE85427EB752C57749 = _NONAME_ | V | 0x018C5AD9F2D02357190874692961338E ; libaacs -0xFF51EBBF00CB6B2344CC83572E02B551E51F7803 = _NONAME_ | V | 0x3AFD5A96A1E50E22F2BF1EE2015F7AAA ; libaacs -0x93EAF54B874D2E830893ED880B63E51B53F8F77C = _NONAME_ | V | 0x513184E8A3114B8D7CC3E2226D108DED ; libaacs -0x0E99D3FC1E40FC6E452224F025CBD96124B48E5E = _NONAME_ | V | 0xA2A99549A44788D9A78C7D1A612A9B53 ; libaacs -0x19F7CC1577A6F2456CE45E901565F56701462EF9 = _NONAME_ | V | 0x4195819A2A2C126E601E2CDDBCC5134E ; libaacs -0x6A13E90979892C406185CCDE279CC55A8C01CC2A = _NONAME_ | V | 0x405D676A5AF03127BB828C23D92B0F70 ; libaacs -0x42FFF9E7D236AB0E4C438F12836E2BD1592CF5C9 = _NONAME_ | V | 0x77AC7ADF412625A4AA64EB16B0A61F3D ; libaacs -0x3E7BF275C77757B7F9B9C8E56D900613E845EA3C = _NONAME_ | V | 0x1FB0C8DE0565CEE6DF2EC2F4C12E4189 ; libaacs -0xFDEB62647E913A76AB981F7A50FF4630AE200A34 = _NONAME_ | V | 0xC0545A206CC74087E9825580FE8E4146 ; libaacs -0xB4B5CCD5DB5D9F57F9FEE2C183D7BE53937D340B = _NONAME_ | V | 0xAD2C61C1EDCA15D4B75E6DC73E7BD9B7 ; libaacs -0xAF15A9E8B21AB0AEF04A4F7D34BB5A4EB57E0A8D = _NONAME_ | V | 0x9415367688FA922FA8DA6BA6F45A089E ; libaacs -0x7AA609FC37AA94C39F0E1F59CAD72B3C943053F2 = _NONAME_ | V | 0xF09D1AEDE52E3A3A4DFFFFC6B5BBDC88 ; libaacs -0xA5C5807D6AA86C072FEBFC5FE86AC812832BA901 = _NONAME_ | V | 0x1560723D33D5BA3320C8BCFF98B78295 ; libaacs -0x6AFF9CDD0F4D8A01F5EE25417F41A99A09BD5D85 = _NONAME_ | V | 0xD106EE1B82FF2DD84BA05460BC571792 ; libaacs -0xF39D65FFDD07CF79F061DE76D51D5B122EFB1BF7 = _NONAME_ | V | 0xA08CC481447086C96F3676793CC3BEF8 ; libaacs -0xDB7CC8621E189CF6068D65B14415103F3402E19A = _NONAME_ | V | 0xF2281AB17EE3A66EE573254DF33C114D ; libaacs -0xB58CAF383531263765B9A7274ADC22B0BC829C52 = _NONAME_ | V | 0x243A56919996C78E0A58D683DC3A9EDA ; libaacs -0xB408E8252AFAF1E471B37F76ABB0608F80F8D98A = _NONAME_ | V | 0x386F79B764B0A0DE389818D607DB362F ; libaacs -0x7C30D1202FEDEE8C7598487290F47096B0CBAB6A = _NONAME_ | V | 0xF1FDA31E7316DE5D7FE1269FBC0B10DF ; libaacs -0x7269C9602D42A45BC6CD54F34796FB0B2AC9E64D = _NONAME_ | V | 0xEB31B6BF61F89B1A8D4650B3B542615F ; libaacs -0xCED026E57C4F61A81F0C0F22F955F1434E274471 = _NONAME_ | V | 0xE3C50307109068B7AB7573DDD6E48B65 ; libaacs -0xD0289FD56B2D451DC291E34CF53880D53341E85D = _NONAME_ | V | 0x1379898CBA20E727A2FBD97B869CEA45 ; libaacs -0xD2978EEF78898292FF341C746374C392D1FA9771 = _NONAME_ | V | 0x3BA59385147F3BC616D856903EB1F86C ; libaacs -0xAF0891558CA76C9AD74F4103CD93FCB36AD5BDB1 = _NONAME_ | V | 0x38B228FD8130A0C18BD74A508C983864 ; libaacs -0x55AD7AB59B8091D691FF316A0F07458BE763C47B = _NONAME_ | V | 0x26BA73E5C4830739B5CB4C1102A39D99 ; libaacs -0x5D868F12B02AAEBB61A1C32253C533019131BC20 = _NONAME_ | V | 0x23315E591DB63E76D7CD3493E8EE3989 ; libaacs -0x51CE36A1D68F9857FD11AF500AE9EFCEA9B15C2E = _NONAME_ | V | 0x53EE4F727B8354815B8BF9034FE617F3 ; libaacs -0x2E255D222A6D253D376171F459DA9227D8959C93 = _NONAME_ | V | 0x80118A4E826E5EE1970DC5268A39E9C4 ; libaacs -0x5421E743A79924D020FE3D25475E2190DEC1DB30 = _NONAME_ | V | 0xEC247AB0D36EA99DC4B238F56224099B ; libaacs -0x017E82B7BB8203D1B0DF4E1C10396BFA0809DD88 = _NONAME_ | V | 0x4A374666A51216A82D1A2741F44FA0F6 ; libaacs -0xF58783ECFF3241BBC22AA0E91347CECE47A9AD5E = _NONAME_ | V | 0xAC9B9DF02432C1F77CEFB4F87A214F3D ; libaacs -0x7355C91E46B44195E0711DA2D8E1678D3D34105B = _NONAME_ | V | 0x4C6D2C5EDA0F39692B9F5454400B35F9 ; libaacs -0x36321CA244708CB26B6AF404221A2455E68B2E30 = _NONAME_ | V | 0x73885DDE290217C6A97C157E868BAF53 ; libaacs -0x0E7CFB51CA58E903E462E5D7C142BD381CA3ED58 = _NONAME_ | V | 0x0EA7CF42DD508F7D2C353747BECC7585 ; libaacs -0x42E60AA923B8C4DDB99EDA5AC4E4FB9D6926B382 = _NONAME_ | V | 0x8A4BF0FFE984624B6F2344FFC3DAF25A ; libaacs -0x8019BBCB53D907001A10D82E16550FCEA5C4B490 = _NONAME_ | V | 0xE159BFEB1B87C2ABAAAED1BC4F6480ED ; libaacs -0x757781230FAA720842C33A81390A0BCEACDF2F1B = _NONAME_ | V | 0x501C7395C0130DE43D99247AD5703B26 ; libaacs -0x8A16B4E0399D97A67047E78F9C3E2EFCC20F6F0B = _NONAME_ | V | 0x6A4399DBDE03C83FE827B8F12DA76890 ; libaacs -0x4AD0AF76DC0AF1FC23AA87DE05195C0C3DEBFD83 = _NONAME_ | V | 0xB86686F6AC7712994827F6BA49C6979D ; libaacs -0xDD413C97ADA94C53EADA4542EE4CBBCF1AAD9C43 = _NONAME_ | V | 0xD34FBF0C3968BFDCE497A031512741BA ; libaacs -0x012881A1791C8D1AF074FD8E23C24F36F7FD9346 = _NONAME_ | V | 0x7E3496EA6095CF0557E5A17653213129 ; libaacs -0x91F8C555210DB36352278E31D0E54FABB0F816C6 = _NONAME_ | V | 0x75298DFBB0109F38A4D18CE299294BC5 ; libaacs -0x6E283B5AA79A344A356C59F99BE3E5FB35F60FFB = _NONAME_ | V | 0x8563DC3ABF8525051A44D26A35C7A4F6 ; libaacs -0x0514B3FBA5336FB6C11CDCFCCAF97AEAF13E7977 = _NONAME_ | V | 0x43A0D8E9ECC617EA1C5B151412F00742 ; libaacs -0x51DAB86735EF5F1603DA94618E7D49550ECB1D54 = _NONAME_ | V | 0x2C101A633B78474B0B305BC790DC3A88 ; libaacs -0xC32C08FFF50B19081698380E502D42676C1BFDDE = _NONAME_ | V | 0x188FA5021050DCE56E811B50446BAABF ; libaacs -0x5223216516F6C246384E97902689BCD1E33F6242 = _NONAME_ | V | 0xCD37F6A5F50A296B9F886DED5960503C ; libaacs -0xAF0704D9087259AB188F1041768AE83B48AF97BE = _NONAME_ | V | 0x3390B7F3F13AF278BA9881E3131DE1B4 ; libaacs -0x1D2EF57DF83C6BCC93588763FBC970D283635961 = _NONAME_ | V | 0xB4AEBB5DF409BB35ECFCA707CA87FA4A ; libaacs -0x820A867217CF8A19D2257DBCB957C32993FDAAB5 = _NONAME_ | V | 0x57166A862699F5A5710FBB2E8B194190 ; libaacs -0x98AD5332EABB48AC7087CC9E10AD486E1383938A = _NONAME_ | V | 0x3576BC0BFD171CB218C73C7FDD5C1988 ; libaacs -0xB30EE786D41A5ECBF90505708363356D547F46E8 = _NONAME_ | V | 0xBDACEC1EF61B25E49E1858A6134F018D ; libaacs -0x496EFA6CF986D04BE700EB26CC7D754AEBFF6F11 = _NONAME_ | V | 0x57B09A99433450369C83E63A047E3E35 ; libaacs -0xDEB4FDF00EE01F647E4DDB57508B2932233C5382 = _NONAME_ | V | 0x685822C92566D7E57F1D6F8AE2A3696E ; libaacs -0x1A6789B22B336E93CF55DC63A4C6CE35951D1823 = _NONAME_ | V | 0xD7FA2D55B7673822431CB73FC906EC22 ; libaacs -0xEC1C32069D4FE2FDD164BF999DEB953106717AD6 = _NONAME_ | V | 0x0F6C950EF22FCC58D7030505A2025599 ; libaacs -0x200A52934F1716F8D30AB3FD96AA1F0AD43A7272 = _NONAME_ | V | 0x80681179EEC5A377D0FA897E3B54E65F ; libaacs -0x09F47B3F2AF70E3C5FD5C790D10E51BD0035E789 = _NONAME_ | V | 0x18CD37B7195FB9C35A1317970CBDE32F ; libaacs -0xE3D8CA2AEFE836DA3384BAD3FADCF2CA1B0CE07F = _NONAME_ | V | 0x5AB5BC32A23028880F09E48A779D8C5E ; libaacs -0x4CC298BA347717CBA32439725BF296F80109128F = _NONAME_ | V | 0xCC5F61D040F3F85B4C6AD3DD6A4AA6EE ; libaacs -0x2788DABD520FEE41D8C4780259711C230B9BBBEB = _NONAME_ | V | 0xFD71EA0CECDD98B43588D533555D83F0 ; libaacs -0x2A8A55476069FBB32CCCA56BA7C0D3E54689259B = _NONAME_ | V | 0x6FA2615EF238BFCB8C84320E67853FF6 ; libaacs -0x0D09D754EF51E33643AE0FF32082412C4B46343D = _NONAME_ | V | 0x2EE66CCED45224FEC523CD786C3525CE ; libaacs -0x7F6023DCBA5C00979C39246CC4FCD8CE42455D0E = _NONAME_ | V | 0x1DA0EF15874C45463F9EBE6B9BE00558 ; libaacs -0x16BC1B56EDFF5EDC0E33F2D4A2E3F9FC83D6F177 = _NONAME_ | V | 0x98B3459EEBAAB009DE7ADFB9F8E6B8B0 ; libaacs -0x5B408ED329618A6171A96AAEDB901EF9D82AB84B = _NONAME_ | V | 0xC696E41A85AE00C4CFFE20253F3B44F6 ; libaacs -0x0D9BCF077DB70D7A2E5043691CF2AC88E09E3BCA = _NONAME_ | V | 0x506377950E03846AABEF7837CA73F1A5 ; libaacs -0x700E7D2106458886F1170DF6A632E84183A0DD8B = _NONAME_ | V | 0xAF0452DC9AD4B12E0795FCFB9E804275 ; libaacs -0x576F9EC85B038E7D8B012B80AE13811F96DE980F = _NONAME_ | V | 0xC23482E3C710562D397AAF57715AD8C6 ; libaacs -0x06151DB0651B7C616A6AF7867DE7A5D5E771F6DD = _NONAME_ | V | 0x054A0407CA2D65484F9A05953CAA5894 ; libaacs -0xB36B54D1374382151E718141AB23CCF8906A3E1D = _NONAME_ | V | 0x474CA419E47B5574E2AA48B269DCB588 ; libaacs -0x111E462CEA98F91ABDF780B247B1EC0FAAF03BCE = _NONAME_ | V | 0xFDCF927E26F2DEF424E617860EAABC5C ; libaacs -0xAE8F6147F50249CE908E68A6D16AE452BBEAF6A6 = _NONAME_ | V | 0x340796D503CC413D3A034786A767CAA9 ; libaacs -0xD6EDC0A9B6CFBEAFB9456CA8D04B97DC8C91AF01 = _NONAME_ | V | 0xC9852299C43D24F280595C5DF9CC6BF7 ; libaacs -0x12710E20536ED54E661F509A956E1FEA0ACEBA1E = _NONAME_ | V | 0x0DD3C4A6759B4F227B90720B37A0AE96 ; libaacs -0xE79396FED6B76CA2F7111AF4BF03FB10099DAB2C = _NONAME_ | V | 0xD18193316B7730E8A42E798B910F1FE8 ; libaacs -0x2CBE9E1CA5BDAA921863BD44362FFE181FBD64AD = _NONAME_ | V | 0xB5FB01DDFCB0B47ECB99D028EBCADC6F ; libaacs -0x472643F88F03708932CD4C84ACF6C3AF31699C1F = _NONAME_ | V | 0x83DB30DBA096E610AC4C73E5F452A602 ; libaacs -0xA5E5259C0AAFE08CD270EE9E3ED46FD04ECAA3A0 = _NONAME_ | V | 0x8942CDC68DD5D3BA4EAFFC4418B4A1FB ; libaacs -0x31CC31016C49FC1D134EED8511EB5328A78A30D8 = _NONAME_ | V | 0x118A9FEF5205C0F2F36FF36402D7F500 ; libaacs -0xDD1D5FE59EE451718BC52932F740A9D7FECE7091 = _NONAME_ | V | 0x41B531B317D36D082C6810086C40E573 ; libaacs -0x7E73D6E42AB8868C4A7E96D508B882E39B237575 = _NONAME_ | V | 0xD6B85C96E2D3E5B551D9F5A1243A3653 ; libaacs -0xFA427610E2DD019EBE08E89F204DAB1C394FE95D = _NONAME_ | V | 0x98F9275205C87140127BE773A3DB2ACA ; libaacs -0x08EB3E594E0D5336B4C2EE853EF93357D575811C = _NONAME_ | V | 0x7BD628962ABF8C4191F9E4A8D888A6F7 ; libaacs -0xD87D2BAAF2D26D201B5E114AA6C0F9012CE63187 = _NONAME_ | V | 0x7844CB7B6A6C28EFA55EF1968ACCFD9E ; libaacs -0x28B736C20E18C37668B89E369C2DF0A9A5E45885 = _NONAME_ | V | 0xEA94F031069015C5F2EADFA07AC4CC9A ; libaacs -0x84E3AB3D5B2FE9EACACA520086EFADA771C522D9 = _NONAME_ | V | 0x73A38CF20FAF6D0FCA5564174911E9CB ; libaacs -0xAC6949C1381A04B0CD1E375584A4B3472F5D8A13 = _NONAME_ | V | 0x0960BA79C2AF827050B51CE0E943946B ; libaacs -0x2AE7759A429ED3308CC48E1D1C519143AC15C8E3 = _NONAME_ | V | 0xA7A82A9A80889F21CACCCF8E5F0573FC ; libaacs -0x3F971579A10F24A7DA6E864B42E547ADC05BED74 = _NONAME_ | V | 0x1AA39A9D4DD4295C4E519AB7561DF8B7 ; libaacs -0xA9E6B8D5E5A2568D2C5CAAA514073A63A3B3C072 = _NONAME_ | V | 0x65DFCA71A1D026D9C5D3BF408047DD0E ; libaacs -0x68B00C4FA42567555646981B872316B25E59BD2A = _NONAME_ | V | 0x63660D587F25EA006DBB114AE9C7AEC8 ; libaacs -0x3D3A15BB4769AFF04B8D572788A91B7D6BA69F48 = _NONAME_ | V | 0x43F12CB9255AFC9237C3EC9B9A1461B7 ; libaacs -0x4F7EB1A3EAEA87F4C5B732703D2CDB464DA12BBA = _NONAME_ | V | 0xD579CEAE9458EE969C8378C59E38E2F5 ; libaacs -0x8E3B2D4F47D21E18633517ACC01B1958101B9AE2 = _NONAME_ | V | 0xC1DDF583F3D247838393B34A122C433B ; libaacs -0xA939583B9F8AFB2FD713FFE1D46D56B3F8B752FE = _NONAME_ | V | 0x06A7B1B66DD61ED99A6CAA518F44351F ; libaacs -0xAF1427622A9061E1C2359B22004FB7F479F6B5F8 = _NONAME_ | V | 0x7030C1E29240F4610859C3BBB1016C95 ; libaacs -0x8BDD2A84B8804CB52EC338ECB72E774903AB5F28 = _NONAME_ | V | 0xA2B21DE578FBF69DB3975AEE5C9C494D ; libaacs -0xEF354B3CBB9DDFDFBC232B9F39DAEEF1C96ECF15 = _NONAME_ | V | 0xE95BB3080B408BDF69B1D32E77EDAC3A ; libaacs -0xAEA7F03755C86AA70A7B8BD8DB619E8B24AD60E1 = _NONAME_ | V | 0x5C1FA5FDBF279D2EB8E2B9BCA12B9E08 ; libaacs -0x91D1027643D8096B672DED403458CA5A6E10BF37 = _NONAME_ | V | 0x49AA74E9FC250FC4FB71919B5BDF1CDB ; libaacs -0xE469C9260CBA2A643374DE4E342AE87A9E185144 = _NONAME_ | V | 0x9E44A56710FD53AC7F2BBC18B2B0197A ; libaacs -0x1B1D88D7C5958EA64F22BAC4E7868561D4030FE8 = _NONAME_ | V | 0x0A03E9E8192B238E5A9FB349D1F0E437 ; libaacs -0xC78910BC5B36883B638B34E62D5EC9EE444F24E0 = _NONAME_ | V | 0x37AC41D9C1D4535896A2AB833F2869AB ; libaacs -0xBFFE08833EAF69AD2E039077840864C07E544D73 = _NONAME_ | V | 0xD44AA7E45B7360FE354E9CE2FA93FF2B ; libaacs -0x1FE591955D40942EBDAE3F526879B32466E9F7A8 = _NONAME_ | V | 0x286B58E1984355994277B07A69130FFD ; libaacs -0x0FA6A96B9BADEB2416E51B2EF87019E173193348 = _NONAME_ | V | 0x7D1CF885E907C9719F622972B3A0D667 ; libaacs -0x2957D4B9AA3C3DBAC161D6C1E0C09FE943C23D9E = _NONAME_ | V | 0xCBDE64403C27845CAD32F54D39DE442B ; libaacs -0x1DD7DBE90CA0724F730F5C036D5966DD709D428C = _NONAME_ | V | 0x203EB09DEABADA90EE2C99CA4979DB48 ; libaacs -0x86950EA5014CBAA79C0E539B69515F15F4AB61FA = _NONAME_ | V | 0x0FA39C01BB64E7E0473D16916589FBD4 ; libaacs -0x88559F306876A8101B903C618A170F0015868CD1 = _NONAME_ | V | 0x6CEAB67F3F45CF9225BF82DEE7886C09 ; libaacs -0xCA2061C18F618C6EC48310184B04E6902743745B = _NONAME_ | V | 0x38D8DC17CFE043471A498460CA6EF96C ; libaacs -0x4C183B9EC5D4F2FE53997478D3CB36D324E064DF = _NONAME_ | V | 0xF0C5F772E4BFCD079868521A342CBF20 ; libaacs -0x91DE1CFE77AF24AB4A5D74A6D278A73E7825214C = _NONAME_ | V | 0x90AC0F6677DF8CC60AD84D3F555FBF45 ; libaacs -0xA109B3036F6A85D1D3377BFE24BA46AED9C750CE = _NONAME_ | V | 0xBF3B12DE9D839BB63835E2F03D4D455B ; libaacs -0x9CE347147654096880E12395A2D4D5504C5EA323 = _NONAME_ | V | 0x703EEBF3EB95BF7CE0101D14B2BBD5E5 ; libaacs -0x972F243A44183C18C5A8BF99D677A22F4668AAC5 = _NONAME_ | V | 0xDD9BC290AB2786365B6CADC9A9605A71 ; libaacs -0x8DD39838F046F0782BE8B49C8A32D4869062FA88 = _NONAME_ | V | 0x86F3E6A24C05E3D776026F46936849D2 ; libaacs -0x88F95490B041082F163C6BD019F33CF4EA87BF6A = _NONAME_ | V | 0xC37BF6969C1F2DB111AED74ED7BC38AD ; libaacs -0x83B7EFB0885681A19F1E7DD523B58318B369A82E = _NONAME_ | V | 0x23E39DCD797CDFAD19D3A65ABB615466 ; libaacs -0x7C6BF0DAD74FE76C8CB5D6ED6A4BAF5102D65B57 = _NONAME_ | V | 0xB7F5C19080B240F047811D60455F3C48 ; libaacs -0x55D569ADE83460E361CD760EAB8EF3CE98D8E3DA = _NONAME_ | V | 0x93AED0276BAD1B0B1722E5156635AC11 ; libaacs -0x4EA0DCE61D0C2233C249FC4A32A3E8F030E71184 = _NONAME_ | V | 0x49DD600F534CC13E887951F17110DF59 ; libaacs -0x472FE2EAA0B38EBA46EA19BD7CC0358C1658D0EC = _NONAME_ | V | 0x25EFEAF176F16C767A665242EA8A5D2F ; libaacs -0x3C1675A5C66D778BDB2496AD19F26708E0DFFBBA = _NONAME_ | V | 0xA9186630537DE868EB9196744BE5C1A4 ; libaacs -0x2D87A994116BEF34CC8CC33825635BAF5FF3C59A = _NONAME_ | V | 0x73504B43B67D544BE7BFAC030C592466 ; libaacs -0x07CC46639EFCFF89FDEFC8A0CB180BCF23D88520 = _NONAME_ | V | 0xB973FA0BA169BBAE7A3A06D836C29F0D ; libaacs -0xE9F97D35EC0EE148889A49BB9DEE5D2173F40BDC = _NONAME_ | V | 0x8C95AAF29BBA304A91270910425BCEE4 ; libaacs -0xB46B23AAAAA56C84DC407A4BB8BE2D3148DE261A = _NONAME_ | V | 0xC47FAFC046A1BC5E3FD5EA01F2A6C973 ; libaacs -0xE7A683A68AB1BC8C0DD119F65581435596091DE2 = _NONAME_ | V | 0x6E44C4F51A94EE991D7A577CC081D1FD ; libaacs -0xD8E516C2E3BA7ABB2753E5F87609515FD281084A = _NONAME_ | V | 0x702F17F59F83E337CA84A08C7086F73B ; libaacs -0x0C4CEC34C547AFC63B934BF36508C5CC36F8BFBB = _NONAME_ | V | 0x70B8018075460347283E398285A98E24 ; libaacs -0xE0A5AC37B5CD9E662FA5A70D81C7A7DF7BBFE05B = _NONAME_ | V | 0x6B53A7C1D1611A1C4D7A49B9F3768052 ; libaacs -0xCC7606C27A8A2A10A881A0544CA20D042947D37E = _NONAME_ | V | 0x8F14555811D3A4C07CA3AAA963FE9110 ; libaacs -0xC6D83665A31D669B2B7D383005D3B057B22E6A06 = _NONAME_ | V | 0x6A6254903396D1BE9F2258CCF8AABDB8 ; libaacs -0xAF4ADCF9AD1A2BAB9C5F9523941A030E06EE2237 = _NONAME_ | V | 0x5689CD5CEA56DCD3772B35ECE28C6DBC ; libaacs -0x9D5B341E781D9825E8D7E1DD850DEAD34E299D0C = _NONAME_ | V | 0x2F2E44883616199CDEB9CBF14CB573EA ; libaacs -0x9C83FD7519FC28F8D12D2AEE5A7C304F350BAAA2 = _NONAME_ | V | 0x8F83CE206316DFF8BF75964991ABDEFF ; libaacs -0x9474ECFECD0B32A58C43952E9420F150C8C8F4CD = _NONAME_ | V | 0xDE2F51C5F872C23886B4D2135F330117 ; libaacs -0x6D8BC4725D5F4F5E65A67077C2619EDEACF43A40 = _NONAME_ | V | 0xD5F6643CCC4062E0C11D5F0594C5F3EE ; libaacs -0x3BF615ACEFE7A4E6B21D719AA0D1FE0D167BA030 = _NONAME_ | V | 0x6ED6729744850C08B832286FBBF300FA ; libaacs -0x2A48504D909B28F978CD342D296E0C97F7F9753F = _NONAME_ | V | 0x3CF50C17EF78207F9580B81993DB296D ; libaacs -0x0FE604AB7962E76AABA14C4E38CF64894C4817A1 = _NONAME_ | V | 0xD71FDE763A38E65CA452747CBF1E8E0D ; libaacs -0x0ECB68A5D74D2E04D488DB783301012DA230264E = _NONAME_ | V | 0xEFE8F799E87DF5226AD939F7E5094C59 ; libaacs -0x0D3684BC65ECF0ACE34F84176662E252D67039E2 = _NONAME_ | V | 0x90B5BA53983C5997DE243BD27BA67939 ; libaacs -0xFEC17B73C0987B2493E9016536B9E81B5292BC31 = _NONAME_ | V | 0x653A4238CB8016DF69BA33E5F568A16E ; libaacs -0xAC02F71750F60474349AAE1974FD4DA9EE5ED509 = _NONAME_ | V | 0x6EDF1B4FCA71E613E794594C43D16E97 ; libaacs -0xE1215E9C21AA783940185457049E191C23E995D7 = _NONAME_ | V | 0x36C831712E074C84292A1E70EDCAE78D ; libaacs -0xEF759F2845F1603323064FB1637D9FA3E62EFF98 = _NONAME_ | V | 0x6E3816CCC57619C781A3A6A21FFC52DD ; libaacs -0x0BC48D5631B40FCE4C69611020EA3AF0CCB1A114 = _NONAME_ | V | 0xB03B7F393C4752DDB005547DB6EDF196 ; libaacs -0xD8136F65F8E85D371AB8F9210BA9672952CB3AB8 = _NONAME_ | V | 0xE1641FB2E58D5416F61345A0482AC43A ; libaacs -0x211D6536C8572B74E162FEB8119F4B14557BA2AF = _NONAME_ | V | 0xDEF73D65D392475365D4456732BBBCAF ; libaacs -0x5574DA73D52791BA9847601FE49AB29764CC80DC = _NONAME_ | V | 0xDE723D5167C6E4DD3AC37DC572FBD56F ; libaacs -0x452ED568922492A87C55DD6D4AF51C43382EFE6F = _NONAME_ | V | 0xBE22E65A784067797CA9FC8EA1826F55 ; libaacs -0x1DD0A5D6659FCAFF72AC51E66483A33655597703 = _NONAME_ | V | 0x645E4DB0D1FBC54A238BB3BDB6DDAAB1 ; libaacs -0x5422CE3135F39CA1540C510F3C412A6D0E93FFB2 = _NONAME_ | V | 0xFD55C81A52CD9C9BDD5F583AF3F42185 ; libaacs -0xFAD6BAEF1090AA56E10FED86BDC07A3CAB253528 = _NONAME_ | V | 0xD49B1E945EE1B9FC57396D7F9B302D4C ; libaacs -0x976AC1823D7A8CC026A0F5E1D7B6B9447C9123A9 = _NONAME_ | V | 0xEA0F81E524BAAEC81ABF72937625E377 ; libaacs -0x6264803AF1D33883C5A2122BB4C8E654B557D3BD = _NONAME_ | V | 0x831DF0DF9A5B96EF59828AD82833E944 ; libaacs -0x0600F7A5C8F48D52BC0EF10DADD58C0A589E8B8C = _NONAME_ | V | 0x77E844ED755A93900818EF870217904B ; libaacs -0xE0065F8855E5666E47762437049AA2E52EA28485 = _NONAME_ | V | 0x9262B647C2E5F42E185EBF5D9F0BA573 ; libaacs -0xD0C27FE9396B9D08AF6619D1C714B2A7CDA27721 = _NONAME_ | V | 0xBE274B66BA56A932F45924FE14121B39 ; libaacs -0x9BD2AA56917AA7BBF61D7D58CE4A436F0C8282B2 = _NONAME_ | V | 0x5703645CFC037163BDAD1F61FB82D947 ; libaacs -0x3F1A0616BBC1A0E22E47E32A1DD365E32932421B = _NONAME_ | V | 0x5AAED6944BF48C3BE8CE9B9995BC98D6 ; libaacs -0xE878C550C29803506EA1C6CA40DC929B9E324A0A = _NONAME_ | V | 0x183950D9C32CF457A12ED9004B5FE25D ; libaacs -0xEC80368086EDDF6D06DFC6A95786AC10257958FC = _NONAME_ | V | 0xD761E5599201E57D1513A6DA198E531A ; libaacs -0xA2A47A81F4B9E4B2F2A1AA3B722CDD4700EC6DA7 = _NONAME_ | V | 0x881CE3CF9BCA08BF7ACBCC0F9BDAB4A5 -0xFF359B5CF50FC0E8C1F9ACB36CF5611A1D1EE2BC = _NONAME_ | V | 0xEA8F30E89D5B39401886B13C756BDD27 -0xFB58E5A7F6451FB4B9B979BD11A7A10A0B7FDE1A = _NONAME_ | V | 0x08C2DD8F4E5864C19FD477F3336D9C0E -0x1D4C06CDB25B244C82F80760C700DC84E8A38E9C = _NONAME_ | V | 0x6D8272EDA70382C3E098A39C16FEFFA9 -0x6D544756F9A08F0E4C7205208D06C54E55E7E767 = _NONAME_ | V | 0x69BF21AF9A5DA371E56967A4AEB83E9B -0x8506FE27627DF2E570D7A3C3C5889477B6E0CE97 = _NONAME_ | V | 0x2E8A5F2E7F976AB1DD881A771589546E -0xF459CC3FEFC2FF5C0D1A120560D812552DD1ECB8 = _NONAME_ | V | 0xEB4677C4282D79C3A51A28546F1546D8 -0x7E0F72E75A5074D3AD18E64D40F23D59DB9EE378 = _NONAME_ | V | 0xD156CB50A7D994FAAADD911FA4DEE9B9 -0x9513DBBC268A971D9BE07AC5F72E71766222306A = _NONAME_ | V | 0x7FCFC2DC41974B4C5A17C99C7EF063D2 -0x843E3C77F60B5A2254A10DB5AC5B2C52895BE9DE = _NONAME_ | V | 0x57A42846BB529361DFF3DD71226CCF43 -0xDC196A7ECB9125E5DD2239E81413269C90BA76E3 = _NONAME_ | V | 0xA93AA1EC39D16B14CE5541D349389989 -0x8ACE3AD667EE925088B450E7990606A13CF9B247 = _NONAME_ | V | 0x5AC30D1DA8D212417BC1DA5362E0AEF1 ; libaacs -0xFEF7F0AAE609879C6C892068AD580ED73F96FA0A = _NONAME_ | V | 0x7BB971D64E64762511952403E97E03DB ; libaacs -0x94A7B55D921DAF5BC6495A8B2CEF3E92A0FB880B = _NONAME_ | V | 0x7D72CC61729AB9DE1CFD9F1261898A93 ; libaacs -0xE860F4507B96E33A0A102AD9EBF9D84B52741A4C = _NONAME_ | V | 0x0F2B0CABEFD56634B568E3A532D56FEA -0xF734184EDFD2A4EB9450D084CF6E34ECCA581E60 = _NONAME_ | V | 0x173FC305DF7AFBDF693CDB4D1711EA10 -0x81619F3FBEACA409C75D499C0E53DFA316DBA7BD = _NONAME_ | V | 0x803F48A45747BFB1FD705E91AB4B5BC6 -0x0C506C979C7400F110C3E26CD86B28F57B618651 = _NONAME_ | V | 0x63B8FF49B90F454BC488F86C309E3CB2 -0x8B2AF38681441C28A5871A7173A97A88EDB202DC = _NONAME_ | V | 0xFC2BAC8F3AEB930DEC3B084DFB265717 -0x4D79DF35DF9AA4350F2225FDCD8BE2AA6B7E7562 = _NONAME_ | V | 0xD2496EBF58B901C4A59ACD16F82B6EED -0xD96BDAFCF6162571702D59A5DB3D0F7766322F52 = _NONAME_ | V | 0xA3A75CCC6823C5B6EB9FCD2E57F8B6AD -0xC784FF3853D85AD30D5AD7EC6953606F43C970E5 = _NONAME_ | V | 0x13A68A830983B07999FAC06496800DB0 -0xF8F3498F64D7EDF94CF31B7CA8903F2A2D2B2BC4 = _NONAME_ | V | 0x96561105FA56E0CE9BF60369FA73403D -0xA58F77EBBBED3F4268DA2EB221118C559F2257EA = _NONAME_ | V | 0xE171F3B70523244649A819C92068FA94 ; libaacs -0xD1C4F1F75076CCEF56A48CD45F6FD86EC9C2EB70 = _NONAME_ | V | 0x62D3F2BABA65DF49169FDC8ED0E3D051 ; libaacs -0x364168C865D8E7AA5E00EC16DD41267E75F4F5AE = _NONAME_ | V | 0x13CEF1AAF02F12D4458DE6B08EFF19F5 -0x42CB30CEB8477A8F8302CD1887BBFA05199957B1 = _NONAME_ | V | 0x17A618C18B21A6D3FFD5278A684A92B9 -0xD3D776E3EBA4AABE558142D870929C02CD849580 = _NONAME_ | V | 0xA7180B87A30481CD2FB3DBF7C1AA7141 -0xB01EA4197FD037ACECE357E1FB02C9157065B4CF = _NONAME_ | V | 0x40EB296EB5428767FF77C0342A52A6D3 -0x353B441A53C5BF7996C597E94DD5D77EAC8AA291 = _NONAME_ | V | 0x213488465F60381D7DDB3376557A2AAF -0xCB136128FAFEEE36B3D6D145CAC7060A81AE4F34 = _NONAME_ | V | 0x3232AB201A2C0046752A01E6BF03156F -0xBFC77C50B4C4ED9083AFE9B20089C1B25FF0F1E2 = _NONAME_ | V | 0x4417F475576C4C5B38BE3821AEE4C4DD -0xEDFA19F9C36DDE62A811CD396CE459F0E20AE629 = _NONAME_ | V | 0xB8AC25044AADDDDB70AD442A2252FA10 -0x27D7C69E20213564C973336AD27FB69990C51E0E = _NONAME_ | V | 0xC16BAB2E6A4348C016ACC2E4D7B8930C -0x57F6A15443E021E2872F207B0B191CE0AB74AA9B = _NONAME_ | V | 0x8D5305F0E5A8E1D244772349D4793EF4 -0xE00DAD407D0ADC6A1BED35A85D1851A64D39D33B = _NONAME_ | V | 0x77197161564B83A5312FB6BEC46FB8AD -0xA7601A2BF720AE9ADD1FC87C4211DD31FBC398C2 = _NONAME_ | V | 0x32C1403A3C0440CB4407B7AA473D2B29 -0xDCDC30AC5A66D9A7F0D9C6C076A16526E6E38783 = _NONAME_ | V | 0x2A0D6BFE43DB454AAC84AF30E73E5279 -0x1CBAA9EBF58BE26051EDE2CF9CAFC0EDDF6EACC6 = _NONAME_ | V | 0xAFB913AE03AD1089C434A3E7B2F6E963 -0xD6630E5AA891CE4164A44E627E5672F092D0D717 = _NONAME_ | V | 0xF283D691673583569819F114460A6BF7 -0xFA9E8E045CF5CC34E71D54B6A6CA2C130DD484D0 = _NONAME_ | V | 0x51DA8A9DCBE568A43ACAB63C74654519 -0x4F4774948C3D313CB081BE7D024DD0AB795E17C4 = _NONAME_ | V | 0x5158E938F37E1BCDEFE292284F1F4077 -0xAB496ADAE5F40AC74822C74B3FB32608F5A5EC33 = _NONAME_ | V | 0x01A7A34BD02D89A3A8F7AD708F476EF4 -0xB9F18D0B6A1B2C2822D60383247A93F6D454D99C = _NONAME_ | V | 0xEF66771202971F68653561EE4D25017F -0xEBB532B6CB68BCCF1FF171423496BFCFD4CEAF1A = _NONAME_ | V | 0xBC484EA13A40374955E5712856A29B7E -0xCAF8D7B65A5D0255BB8A0C8C2AEF3BC985C69E60 = _NONAME_ | V | 0x21CC51D7739861262D09A010DA891A24 -0xDD37E9E3D24D2F5A1EF7E9E7A13D5A86781E430A = _NONAME_ | V | 0x3523005C9F141AA150D9C51ABBB859D7 -0x725D24B77C1C305D06F6938BA40A11D195B7124E = _NONAME_ | V | 0x0904AE5603420E2085E805B991E2EC08 -0xB6CBAAA9925C3232E5016ABDC785F40F950D20F0 = _NONAME_ | V | 0xA35C0F35F1E83BDECE57A1DFD777E039 -0xF7302E88B4DBE8808783D3ED798D02CBD9E9087C = _NONAME_ | V | 0xF974D1BD7448B2F9F7CE1FF0E77FB133 -0xFB158FC8538B792BE3A220043185DB90DEC35D74 = _NONAME_ | V | 0x559A19C424FAE773E8EFC48432FC088A -0x913FF6665CB572307EB0A8B2FC07CE59750CE0B1 = _NONAME_ | V | 0x939631623396B10AC76121A368063208 -0x91D6400116EA2F9EE9CAF0923D4AB23E9F8EFF0F = _NONAME_ | V | 0x7E10567FB6382C83CD186EC677BAC714 -0x85CFF37FB8118B2BF002967AAB29A562E42FDAF9 = _NONAME_ | V | 0xCCA0A7F259133066C203B92C2BA46D7A -0x5BC6557F8F8E261F98C38EBC04F6FEE92A54D1F2 = _NONAME_ | V | 0x827C826AE2DA171F3039376DA48D871A -0x74FC7934D00D21C5054290AEAAD97F6F46849FD9 = _NONAME_ | V | 0xB3E4691BB6D9D522DE7F6A08889E0E94 -0x2389EBCA2154A776DC0E4E629B7A2C8E92F373C2 = _NONAME_ | V | 0x02CE0493A8FE6F0698C5850E08CD288C -0x985586CC2C5CF0AE32AD6B57A5D07BA759C8143C = _NONAME_ | V | 0xE6FEB9E8298861519BD4D90B6F5D7AA8 -0xF2B602E78FF72CC9B9DF46F8BB4ECD68A3641405 = _NONAME_ | V | 0xD9A0ED6B7621E523DAAD27FEB68D0E72 ; libaacs -0xD024968B794FCBDA5D5967797443FEE3A0EF917C = _NONAME_ | V | 0x123DC1E0857531F913F9C0FD10853D7B ; libaacs -0xFEF215CFE62C5F95F00F9A9074A3F29FE96F8FEB = _NONAME_ | V | 0x4EDE2A82462DF993E24F87AFB6F49789 ; libaacs -0xAB0ECDB9BD04B2BDBE248255AB2D5081FC50092C = _NONAME_ | V | 0x637ABA31D2624E48068CEDE0CEEB0FA4 -0x3722328CE39E597119513DC63FC91DAB043CD93D = _NONAME_ | V | 0xBA3B35BEA88A637EDD80983B1FB45685 ; libaacs -0x4964521B5D270D4487927755DC2AF1BB30A3CD98 = _NONAME_ | V | 0xA1227291EA3BAB88EA2D420951C5165E ; libaacs -0x7E2056B67C5EAC196DD4E3BB4A6557A927B408F5 = _NONAME_ | V | 0x1574A7414C3386CB18D59EF54CA7EA26 ; libaacs -0x917FF2114845626A95DD01F922DB4095EB3DC5C2 = _NONAME_ | V | 0xDC5024C5D39BEEEDEFBCBA7A69F3A778 ; libaacs -0xACD09C91A7F262E5FDBA8B46D285596F192B6DE8 = _NONAME_ | V | 0x15F65AF7F4D94609B5DE742F37A1D45C ; libaacs -0xDE8687AD902235414373067E87F0D9A988E01773 = _NONAME_ | V | 0x697437142BB0E01966C46764D0199141 ; libaacs -0xEFF8D4841540D57036E365F65A56AB7588606CB6 = _NONAME_ | V | 0x1D8169FF47F0581560530B41FC294E1E ; libaacs -0x5E12D51D2BB75FEAD3D5DD27DAE3E152E10F42A5 = _NONAME_ | V | 0x9C4F930563D7F496D6F83D6818D1B466 -0xF84EC0B2B619F1027D3A146E609691692EC8B925 = _NONAME_ | V | 0x3659E581BBCEBC18D9FF1D7B045DFEA5 ; libaacs -0x480FE8E65335B811EF31B818CBC2670BF135F584 = _NONAME_ | V | 0xB3FA8DF9E1147ED337F16973ED30D33F ; libaacs -0xEEF034463CC6BCF41A65B2691026B6B6ABE68CD0 = _NONAME_ | V | 0x3BF0923669AF174026B9DFFB5A6BAB31 ; libaacs -0x0992FB21421D1ED31FE11FBDDEE7B18686186761 = _NONAME_ | V | 0xCA0049F6EC7D9153427BD9DB62438BD8 ; libaacs -0xEFA263294E011F35A3AA99E84D5ED0F51A3BC1E6 = _NONAME_ | V | 0x3DF7787B3511BC642D8DEF8687AB32BB ; libaacs -0xEFFE42D2A88B5B75698C60A3DCDF886C2741ED44 = _NONAME_ | V | 0x498D342012CA5606486189002E57C7D9 ; libaacs -0xF010BD7E874D3D47D561A9B8CE7635F6AB366618 = _NONAME_ | V | 0xF2A9285C108831AE37E0224F21D76B99 ; libaacs -0xF36321E1ECC83530252E6CC0506221B35D04B51B = _NONAME_ | V | 0x18E4169EF26886959F3DD44A2F1C0167 ; libaacs -0xF7D880BA00FACE1D701C6C76BF3E703404823F69 = _NONAME_ | V | 0x4F22B5D117451D5B80B3268DC9D2E621 ; libaacs -0xF810DBF4E958D1466FDD93EBADA08E0B3C61335E = _NONAME_ | V | 0x0B069F60C1467EBBC9E964AA5B867F06 ; libaacs -0x8AB43FC64530ADA7E2503C3B11597A7CB23928F4 = _NONAME_ | V | 0x995B695750846DB38A1B5054703AF50C -0xDC8D8117153E5A69E53A91B944ECA5649268ECB0 = _NONAME_ | V | 0xE994D66C68C3C65B7BC5FA595E3E378C -0x4320E3DB5182214AEE4AAF8B12AF12E34A50AF44 = _NONAME_ | V | 0xF186831D46F2C24A905274579E06E6D9 -0xAA7A9F27A86182ED7D4A77E43DC43CDD7912DD98 = _NONAME_ | V | 0x04347D9A1C28A8BD1A2474E7CFB8E393 ; libaacs -0xA1B855C3011AC6DC2228AFAD86298B1DEFFB04D4 = _NONAME_ | V | 0xCC3CB6424AE48071031D7435F7556F7A -0xD7965C891120BF7C414052AC44BA9FE8A8E25FC6 = _NONAME_ | V | 0x0BB9CB5A20E02682824B15BD9F80A68F ; libaacs -0xCCA9B321F7FA6B2BA2E30F3248E1A087E86CD038 = _NONAME_ | V | 0xDBD4C3A4EC9AE35BF1CC2D5707C8D944 ; libaacs -0xC89C6225F3768A9C3A42C18AE45989B1A01C1010 = _NONAME_ | V | 0xE01A87006200119A78473AD37005557B ; libaacs -0x77A3DF98986175E359936B30C8244B8EF077435F = _NONAME_ | V | 0x49AB8D576554F18F3067B3592F1360B0 ; libaacs -0x5E976EF95F640E5AD48108609CD435E6C1217318 = _NONAME_ | V | 0xEC2963E7E9F7F7051FF80BCC0A6E4272 ; libaacs -0xAC0FB09A923F80E86C37EA4412FD256C3C532859 = _NONAME_ | V | 0xDEFD72DDB2276B9780F978A657EE3D4B -0x3163FCCDD282CDEE16349EBABE7B255BEAB48065 = _NONAME_ | V | 0xBAE96BEC0E200121658F429ED6816C80 ; libaacs -0x8B60AE440744307E2906B23649BF9184F97C8E35 = _NONAME_ | V | 0x6ECBB2A482218EF5F04E55E5D078ABA4 ; libaacs -0xAE5B22DA9B33EADC30FC7FE0E338BA21B4DD7FC3 = _NONAME_ | V | 0xA5FB5C10175E939EECDAC71281EFEC75 ; libaacs -0x2AFD614AF9B8BC19067BD41DA55EAF620836A50D = _NONAME_ | V | 0x9B6849AE3B008943436AC16C6FBF9BEC -0x68DDD895C4DBBB9FC1C5E3E4DB0F7950AADAF0B1 = _NONAME_ | V | 0x30BA813F61A39A484445DE63C3CF59A3 -0xEE42D82CECC1B2C74429BDDADD231708E6F45051 = _NONAME_ | V | 0x7CE4BC0BC2777B5E1BC24FFB98F20322 -0xD6AB47B15482D1DFD942FD63F4A3D0B2EE9D6E64 = _NONAME_ | V | 0xA9B3189009FE412817F38B4C94DD5ABB -0xA74F3FADB70DCFCDC18D292EB447DD0630FC41DB = _NONAME_ | V | 0x89FF3418CCA37A468C7625CD5983150E ; libaacs -0x4C8CAEA063157FA4F380C979FC73726C04D1A082 = _NONAME_ | V | 0xFECA6DE641EF248A0AD635C352084366 -0x3FFFD4DE1111129093FBB0C7F11772D3C6539A3B = _NONAME_ | V | 0x4643FA6D65BAC40685E953AF5D6250BE ; libaacs -0x9091C884E0D7D6E83BDFD3A04CCAEC579A134EE3 = _NONAME_ | V | 0x500A914EE37114E31A99466285C19FA5 ; libaacs -0x6016A80966C23CE6B318B5ACFDB6CB12D5510A90 = _NONAME_ | V | 0x645C4F189A39F82356B5E6C3EBBA40CF ; libaacs -0xCFD26F3D281CC13705B18C39630D3ACD52017FC4 = _NONAME_ | V | 0x59D80E7550B73FA11405104A68D76884 -0x7E2741474271434274D7A6AFEFB357C023BFA7E6 = _NONAME_ | V | 0x2F4025C7CAE1CEC0DD611B59E16D27F4 ; libaacs -0xBD4F81B598D9CC883D44C50F00360B466D195144 = _NONAME_ | V | 0xEC2D02ACFD96B3791EDB05BFDCD3AA61 -0x7345EEC654454DBEDCFB4FEDE2D87495427EAB7D = _NONAME_ | V | 0x5D13D5BC891EDD38C4DEC3BE1496A142 -0x3E9FA56B1549AB8468F70806B597AA31BDD9CC63 = _NONAME_ | V | 0x18BCFC2EC4B75115FFCDD25E5DAD2D67 -0x9C87A5D0C7B39F4D5D946122E58B652574097956 = _NONAME_ | V | 0x79CCBF1E1F7885154D5543DFF1B4329B -0xD8224C52A413273B90F04803EF2B847D4C5E7B28 = _NONAME_ | V | 0x5D451BE41D0328A781018E88F3935354 ; libaacs -0x4BDF234AF1142487FA4644023EE9CD6874498FA9 = _NONAME_ | V | 0x483C788F18DF6E047C00A05487BBF799 -0x1B7F18221CE65ACB9E073B117B06FD23A9C61809 = _NONAME_ | V | 0xD1E1E1D02371324B1954C62535D38CF0 -0x5FB196E9D81DFA4599F023A8430214C1A9775C8D = _NONAME_ | V | 0x57368962AAA9743A47CC382C1C613E8D -0x541F4040C97D16E72EE8755393AEB97984B6F297 = _NONAME_ | V | 0xEAE2243111E7DE1C5BE4BC52208D2C36 -0xD818E39CFB38075300BF7FB5E2E82DB90AB66DD2 = _NONAME_ | V | 0x7F475C2632FBF9CB787D55524597DCC2 ; libaacs -0x34830C43B62713435F26333081EFC56C99501251 = _NONAME_ | V | 0xB66CE95DDFDD35959D71917D2345176E -0xED7E88E7AE6757EEEEFD37633BF24545A92A06DC = _NONAME_ | V | 0x067FBCCB432E2EF09CDF580487D3C588 -0x16BE42C82C6DD5DD15740FC4CBCE178B6E4826E9 = _NONAME_ | V | 0x8337596892173524B6B4E0284CC50109 -0x0743AA3663C63E639972290250B4C2F685C258CD = _NONAME_ | V | 0x1B65079D011870BE1498293ECB361E79 ; libaacs -0xD53B3E02823220413616474213B6D0E7BC54778B = _NONAME_ | V | 0x66F62F422AF655DFC432D434DF5040B1 ; libaacs -0xD7B96CB5C6D1A8F6A99A34D40BE75A3D42EF7CBA = _NONAME_ | V | 0x4C6B9D8F267B0C6D40B5E17A20836D47 ; libaacs -0xD790F682DF58B2545E0AD0858F0CF10321281A1D = _NONAME_ | V | 0xFA3D85FAF6EACA8A6513DA0D64F21268 ; libaacs -0xC44B6BECDF47E69A6E33FF05F7AA98C3B684E18A = _NONAME_ | V | 0x0DCA87CED9EEDA44EAEDC69F4455C13F -0xEA157AA8A6170081B091AFF5D24A47F8DACC9CBA = _NONAME_ | V | 0xDDA2A74521A1EB1D2CF6C2574253977D -0x81F4A489D2EC79E891864F4B4E5E5DB0489160ED = _NONAME_ | V | 0xCF70C8755D860D2A62530796CEB6B70E -0x98A68FE2D0AE74CAE921A375673DFBE7A745AFF3 = _NONAME_ | V | 0xE542986F7340148056D669BAD22C32D2 -0x1AA6752D1BF8F0BAF10CA6E6ACAB98110A2E9177 = _NONAME_ | V | 0x6ECFC384CC2C2E2B2792F93C9BCFDAAE -0xB73B3E7B89EF87FE4C68B5F633F28AF6C50A51CF = _NONAME_ | V | 0x0B40AF50AEAB55C6EFC7A9481D20712C -0x1387D0D0AAB96DB9ECD7B93BF1A193B5978BB960 = _NONAME_ | V | 0x5E028A865314F4051EE4852D6CEA398A -0xE1A96239D4E7924B6BA7C600E598402200EA79F2 = _NONAME_ | V | 0xDA87425F7720154E817D0390C8BA2FBD ; libaacs -0xE1D326D04F06E7BCC98EDABDAF3BE9595D744E28 = _NONAME_ | V | 0xE878D644AA4CD4EDF60FE7961513C691 ; libaacs -0x7A80FAF5C305FAE3038C5AAC2C1C0E1E842932BA = _NONAME_ | V | 0x2F4015871C995CC73B2CAD1C06EB45BA -0x61E54566245BAFBC09A0DDEE88A23ABE63F76058 = _NONAME_ | V | 0x50376139185AE836B8E5D6AF0CAF090F -0xE5199D80FE596B3AFA08AA990C1873078DC1DE33 = _NONAME_ | V | 0x1EA8E64F9920BDFE73948BE91C91D3A2 ; libaacs -0xE595FADC932B87FD6ADF29E9788EF5EAF28A2E5B = _NONAME_ | V | 0x8BFB437FAB53C51C51ED7C759C731DFE ; libaacs -0xD00C1F16B6AC670F9195EB0D56B2B11D159D59A7 = _NONAME_ | V | 0x10A5D5AF8C95BB71A58840516D3762DE ; libaacs -0x9A81C79D04FD6229AC5534CF2BCCADDBE5BC5D28 = _NONAME_ | V | 0x1B4C326907ABBF775D66C995905FEFE9 ; libaacs -0xE18202DDF5EA302516BE43157580217C34D17A43 = _NONAME_ | V | 0x5B6959121C14B2B4BB1AD3674C2B2626 ; libaacs -0x4C3BA064BF5F03BA356503E02A4E8836B3C27018 = _NONAME_ | V | 0xA20DE42165F9E9B32FEA6A6E35DA4F58 -0xF8D0015B0A563224766CBEDA1B4C9F758647084D = _NONAME_ | V | 0xF7DF1D5DB9B5902F816D494A48DC8D8C -0xAA332611E508A64EE22987876720400139CA3634 = _NONAME_ | V | 0x4A565FB1318221AB80CC8DE68D2839E1 -0xDD708F9D7E2388F39F0AB3C29DB1ACD8A942A7C6 = _NONAME_ | V | 0x886A8D19799CCA94C45EF203FF2EF3F0 -0x3C2047FC31A25C76E38483F9123F430FB2858CCC = _NONAME_ | V | 0x86773ED5BA9492EFC52F22BB22A44185 -0x3C7BAEFB459367CA1ED4906487244346E8514685 = _NONAME_ | V | 0x21A6417BBAE27F05FE8F914821FE5150 -0xDA3E17D1A8296A0776154A6AE92B9318B66F2255 = _NONAME_ | V | 0x87943470C2F3E09E674C84CB38D042C6 ; libaacs -0x064B31790DF1C50AC35FCBB538BE2782912679E8 = _NONAME_ | V | 0x15BA4B091F332FCF928F62C612C6FA28 -0x02E69990EAFA8E0A682DF300310675336EF1B4C5 = _NONAME_ | V | 0xC370F65E169EF16E0B6C3FD33D04AE55 -0xDC01DE78417ACB55F53CFD80A19D950AB725F2A3 = _NONAME_ | V | 0x80EEC5B883E507C94E11F49F32EECF78 ; libaacs -0xE5EAC6E6D03CB980377C40A8A7058A4C41B1F02E = _NONAME_ | V | 0x4A13285E3358362B6A5B48E2FE54DA45 ; libaacs -0x32365A45FBDFC4D700CC51BEADD2E9700C06DAE3 = _NONAME_ | V | 0x4ABCA76254F3F161838D7B7FC851C5CB ; libaacs -0x63D96CA39EF3B166774266D97996215CE7E1E9D2 = _NONAME_ | V | 0xC2C4BE61515A8A0DDC408EBE95DAF8E2 ; libaacs -0x193D1AA34033843AAB235902D13F6FE8AD817B56 = _NONAME_ | V | 0x16497C4929D31C7149C84AE8EEEE3002 ; libaacs -0x7D1720200B2AA0649D9CC15B9898D8B1CFCA54C9 = _NONAME_ | V | 0xCA70644E968C0342D17CFD466E13E145 ; libaacs -0x04C41D4826455F134F72F6993999B9DEAA3E2BB3 = _NONAME_ | V | 0x223A1C91785C60B05E79A17AE7D1FA84 ; libaacs -0x2D9E572523895A063CC105CB472947BC645E72C8 = _NONAME_ | V | 0xE366A41F82DD6F8ED30DEFEDEB32DACE ; libaacs -0x588C400EEA577A802DF4411925DD37C30512DFCE = _NONAME_ | V | 0xE72DF06E9335996364419320B69850EA ; libaacs -0x93D450B6DBA52856EC29713CED4CD4E96BA758EE = _NONAME_ | V | 0xCDA8B10C374DED62821625C8C488F24D ; libaacs -0x9746761557C1EFB6972FD9DF6C48912D91DDDCC6 = _NONAME_ | V | 0x068BEDB400115ACA5851CE6D20CD1097 ; libaacs -0x227F7EB1E2808C143111D847B094009EF432C66B = _NONAME_ | V | 0xFA6AB6756FC043BF97950569D1467897 ; libaacs -0x710D05A2A9BF4C85D0EFDBDFDC59B74CFFFE08E7 = _NONAME_ | V | 0x601CA987008467D452A7BC1C177769A3 ; libaacs -0x2FC842F3BA2CEC4DE57AA05B5CC9500FE5118B4B = _NONAME_ | V | 0x28B0C1E342970A24BA190F034E217B7B ; libaacs -0x51E0B426EC4AAC38B120693A6ED0A18ACBF36210 = _NONAME_ | V | 0x59B829278295E00223222B5202DC4215 ; libaacs -0xBBA4B044F0E0FF24770E2ACCF40B33AB63EA2727 = _NONAME_ | V | 0xA0A54A4041935137F881D2D7D9ABF7F3 ; libaacs -0xE61B541767B5C07216E4DA01548ACA43AB5F010E = _NONAME_ | V | 0x5F62648A1238CA30E5F7B140B9D5DAC1 ; libaacs -0x8C04AC9E208F47129AB6AFD5EFCC748E44BF4234 = _NONAME_ | V | 0xCEE17B6A448BE1FD76AAA39988B69B34 ; libaacs -0x1CC1D2C26AE72A04A3E68D8765A89B6F525891AC = _NONAME_ | V | 0x609DDA8C27C9FBC86C45CC51A5D2D50D ; libaacs -0x25BC6AE40C891D530550F8215DE83ED294FC4256 = _NONAME_ | V | 0x54D6201E6C4E73D67D5E5E1F236F623A ; libaacs -0x7DCFE32B491A77DBC8862DDDC69FBA3F40C47FCB = _NONAME_ | V | 0x14163D0035AA78617B6D21C58D02E2CD ; libaacs -0xDB2265891EE22EA87B99AB43F4894378D0A1BA90 = _NONAME_ | V | 0xB050EC1FFF494352B9BCAE698D467754 ; libaacs -0xF9F8F8BDCDA1FFC1C65C39544BBEB6500F797A89 = _NONAME_ | V | 0xEE19EC10C0E81AF3E5BE373A4C918D6D ; libaacs -0x2CB78CA38E41525573B4A853C1B0B90595421E11 = _NONAME_ | V | 0x6A900A0F28F2EC6FC65E0F19BE91EDA4 ; libaacs -0x039C4F45D5D74EBC34A1E911E42493701A925E1B = _NONAME_ | V | 0xDEA74A906251EDE1FC1043F7083A50AC ; libaacs -0xA4EA285A42D21F232C4F592E3C7F054DE1D5CC42 = _NONAME_ | V | 0x622B5DA6BAF3091ACE26DDBA8D90829D ; libaacs -0xFF95181F1D8E17CDE3B9C5263D6740AB6EF6BEA8 = _NONAME_ | V | 0xEA96C1578AB4D1382A375FF2954D329E ; libaacs -0x7C0C0B251E3D3B68C0B53933582F822A27F6FA38 = _NONAME_ | V | 0x063351720517548A865754971D0E235D ; libaacs -0xEC1CE9A52E5CC1F4CB40AB24C3B7BEFCB8FDED97 = _NONAME_ | V | 0x1A0768714C8F67791806D2972B122DEB ; libaacs -0x7ADE80A6C8FA25E2775EC41579C0B83F15FEAC4B = _NONAME_ | V | 0x0E5A51D54078C4FA95E5BB10A027EFD2 ; libaacs -0xC481941C433C10A21FF52AC8512034B3E55F96B6 = _NONAME_ | V | 0xA5BDE8EB71B9BA01AF016F635D85F44F ; libaacs -0x6D0B6C43D94BD92D8281860F233628A487271450 = _NONAME_ | V | 0x26A173BCFBA89D54A1F42D4FC0A008D6 ; libaacs -0x3530026BE3ABBF2FAA6E797F39D8FB190C257A0F = _NONAME_ | V | 0x63DE21E15799A206E1DC5713D242537A ; libaacs -0x12EE112457FC03357DCCC02BD7AB447A49316181 = _NONAME_ | V | 0x3A2A46CB63DD248385856A63A4E949D0 ; libaacs -0x0171645F4DA044C8DF951DE3DCC05BB57CFCF0AE = _NONAME_ | V | 0xA5546EC1A6E484C71DD6277F16001689 ; libaacs -0x91D5A5BBB45E3690B43FFC6D7B8940ECBC2536A2 = _NONAME_ | V | 0x7D6D880B0AD9A431A202E906519937A1 ; libaacs -0x46757F7D83B7F15F8F6A335DD8D32C7C71316FDE = _NONAME_ | V | 0x52E07C9686B0733DA8F3C4622F094474 ; libaacs -0x0B6BEF710AE35A594E5BEDC7AEEA5D5877A5F618 = _NONAME_ | V | 0x0535BA4E111E48FC1CB3C5A78BAD6E6F ; libaacs -0x742E7B42CE5812229EC412BA9E39A9580D23F0CB = _NONAME_ | V | 0x87D6BF7381848BE3D2CF0613DF185B6A ; libaacs -0xB2DA407B962C0376CDBC630425304FC4A3E41EC1 = _NONAME_ | V | 0x3188584ECC946A45E31E55CD0AA9941C ; libaacs -0xC15BBDAA35CA325EFFBE8DA48F99CFFB6AF4AE4A = _NONAME_ | V | 0x337202B40F266FE659A8974037E4459B ; libaacs -0x1D88A94C8B582C1495FD6F4DEEF129D22C582460 = _NONAME_ | V | 0xD1AB8C8CE6CC75349FABD6A8E5D0F630 ; libaacs -0x825B7F17717E37A3742286C10045C96FC230EB28 = _NONAME_ | V | 0x58B19C5F676659134DABCBEA27FCA552 ; libaacs -0x98F1E98B33C136D97B064BA4D34F9274D2D21D61 = _NONAME_ | V | 0xC2F8694FE4696D63ECE44A379F3BE13E ; libaacs -0x94B5E274CA021E9DBFA7CEEA00862C385A9AC663 = _NONAME_ | V | 0x75A8160E5EA0440BA8106A630E2D94E9 ; libaacs -0x8B454A41644FE6BF56B13A9C5E42D50B970EF5BB = _NONAME_ | V | 0x400E6D285EE6D35629DEFE40105F182C ; libaacs -0xD277F3A020B86F68BEC6F6808D83884342A0E4AA = _NONAME_ | V | 0x21E8B6D7A4AA7DAE42536ABE5184C369 ; libaacs -0xB1A133F43785E2EE76EDCB16ECB4ED54AC248ACF = _NONAME_ | V | 0x77B4C2C8DF191C3B6A12DE514D36CA76 ; libaacs -0xFFF1AE91ED793B6E02FE2631A98E20B04D18BAEC = _NONAME_ | V | 0xD1787BC61BE36C3328831357C91EED22 ; libaacs -0xB5C6621DD3ABB0A8F08D3A3137EB164F92A997A7 = _NONAME_ | V | 0x21CF2AD4F8747F6F36D4BF7865B80127 ; libaacs -0x0066F35A04D089BF8BD52DBC3E02DCA61BB0B4FA = _NONAME_ | V | 0xEAF354F1E1CC15E1F46203E2458C76FD ; libaacs -0x5B4267437FAB0A50A9A18EAE65F020C4DD78803F = _NONAME_ | V | 0x12218410EA66EED0F62C6BCFF80D6ADB ; libaacs -0x7F273A72B3EB5B330F5472E2DE72000D5BAA0F61 = _NONAME_ | V | 0x5A81804957109586B23D4A463015913D ; libaacs -0xEB551EDF095D50AD6B9695017D8047313DFFB857 = _NONAME_ | V | 0xEC9C897BDFE4D7468C1262C0C35492A0 ; libaacs -0xA7BF6F40D74B6BF61B6203E5427F02067CB35947 = _NONAME_ | V | 0xC342423D3C705499872613AC05B4A92B ; libaacs -0x8D6B8BE7A0EA1A4355ED4363D281991420E4E36D = _NONAME_ | V | 0x08B09C4540D5DE24B506C551FC7A89FE ; libaacs -0xA31A3E84CCA50A4E882084DB30D3BF06BDA30F19 = _NONAME_ | V | 0x497032CAD373D47DEE17BA716BBB0E8C ; libaacs -0xAB71B08A853DDB7C8337B6B030C494B05D24B962 = _NONAME_ | V | 0x2EAB683F7F17A43481DE527348AEDDAB ; libaacs -0xB22DE777B588048DF1E95425FAA8837C2F57D8A4 = _NONAME_ | V | 0x9F527B7323F1B9C6A9677BEB9CC8E20E ; libaacs -0xC496AF77D1CE69061A90B156BD603463CA7059C8 = _NONAME_ | V | 0xA50925A3C733FE3FCEC107C15589BB33 ; libaacs -0xCDE3D328AEC54912A66D1B150C947D8DE981EA0F = _NONAME_ | V | 0x6BB926E51A83132E1BB5369DDC9BD516 ; libaacs -0xDA68E24344DC4C26D12F520A1FC76569E5532AB2 = _NONAME_ | V | 0x773587A845A558C869D24E250D0DE6DA ; libaacs -0xDF14F0ECF35128780FDE2AD3E17E1030E315388B = _NONAME_ | V | 0xFA947D1999CF2DAA6EEEC379EF2A8A00 ; libaacs -0xFE6A5F1E465A87EF6DB2752DFBD8CAB2362E1090 = _NONAME_ | V | 0x09F26CED4F3810A4AB763A02FD905B20 ; libaacs -0x1A5526C758A7CDA5722ED2756C3F188FBF889E62 = _NONAME_ | V | 0xA6D205B058DB601558620EB8A87A374A ; libaacs -0x697F62AA34FEA687CA8C170677AF53D1ED2AAE4E = _NONAME_ | V | 0x1BBC485097882FE3CB6FE4E62F81295F ; libaacs -0x17ECE4D24E14A200812330E950D22E7AFF7E0063 = _NONAME_ | V | 0x9B9B383CB245F57DB0BAC93F20CFBF10 ; libaacs -0xE06FA3C320A0C08DDC0BE8AB2B3A67E7AC923D4D = _NONAME_ | V | 0xA2D7DE73EBB14FB6C7B01C3D1F5B26AB ; libaacs -0x5B8E5B8E762D069FE05FBF8253524E34FED6329B = _NONAME_ | V | 0x9CFDC4DC2CC62FF829324CB336B6835E ; libaacs -0x328F5178E42C63102BF1BD935EEE7391B8E4E176 = _NONAME_ | V | 0x0E737D80D1FD650B446EF345BBB095A6 ; libaacs -0xAFCA071ABB44B530727EA42E691E4D7145162590 = _NONAME_ | V | 0xFA0DCFBD6D65BB0356BD298B26363557 ; libaacs -0x933BE71BF7D5421D73F9995A4786FFFA85BBBB99 = _NONAME_ | V | 0x39662D1F9FA7EAD99017A0BFAEEB8867 ; libaacs -0x04A92D88DE48940F46D79B01DF69A902A8C7B71C = _NONAME_ | V | 0xE5705A475E51664F86AFC40CA6BCC4CF ; libaacs -0x83371F363FAE12B2A586A10F0C59457B2A778C8B = _NONAME_ | V | 0x79FCB906DFE2F75E1FCB3B111D1F610F ; libaacs -0x048C8973366A9371605F9D75B47E5E8F0D3093E1 = _NONAME_ | V | 0x910C9415AEA12DF056D07992E94F8916 ; libaacs -0xE2A9289F6A1714571686BA96DF2E3FD63A6F687E = _NONAME_ | V | 0x2CD979FD6A42DDEE44BE9C642803000D ; libaacs -0x3C6F5BF671402AEA5696E80A5AF2B716B089F81F = _NONAME_ | V | 0xF6626611F75264C1051A00E160E5372F ; libaacs -0x8E18D8C5E56305515F3A92785CC4A9105B8F2996 = _NONAME_ | V | 0x0C865D4135AF2B35BCE26D435E809CD4 ; libaacs -0xA290986AC22A253A9C8B4C2B9C500CF2D869115C = _NONAME_ | V | 0x9EC1BF81673C2097FDA3FCB6889F96C0 ; libaacs -0xA34DC23C5D7EA85E9ADDF6471EB05F2095AF2CB4 = _NONAME_ | V | 0xC209B9A7F96DA97BBDDE988A8838DD9A ; libaacs -0xC2DAB90A1D0B375E5CCB7732395880942271BF21 = _NONAME_ | V | 0x488499B854FB1A216CF9F3119BB2FA76 ; libaacs -0x161698D51BCCF1D2947E11C8251A4C89C524CD60 = _NONAME_ | V | 0x0FE76EE79067442D9523F350DA9A3D89 ; libaacs -0x7399F68309392C9322F1E406DD5FA19E43303D67 = _NONAME_ | V | 0x9A28473C752F503745164BF0C5F5E4FB ; libaacs -0x3A0FA5DF13492F19A39DB6C9193024C8D26344DE = _NONAME_ | V | 0xA7BD33EECCF24AD8608C8A4E1F3FA28F ; libaacs -0x39554F53F39130DE7C3E11ED1A7F9B5B001C6A08 = _NONAME_ | V | 0x1064768FC4E14E924A4F56FF752C59CD ; libaacs -0x286EBD067323658148ACCDEBC33EBDD08B54266E = _NONAME_ | V | 0x6E57059CE06B1723C93B826D9F8E75F3 ; libaacs -0x622293042B5E1692104981AF81D9AF94433CA621 = _NONAME_ | V | 0xB467C2EB92FA0B64E9ADC465AEF66535 ; libaacs -0x81C1960778D980DBB788527C2E648F341DAF9237 = _NONAME_ | V | 0x909FA5D0D8749AE916480C6C52D642E5 ; libaacs -0x8215179C635008634755AC95F02C72A45D329B35 = _NONAME_ | V | 0x08F11A1A97ED1CAAA6760A30FE7196B7 ; libaacs -0x85B2085DEDEF7E028F7A35A741A9112098CB744D = _NONAME_ | V | 0x80002ECF99D33BD2557D128E420DB83C ; libaacs -0x8806DFBC0577434A768B55309537E2985DDE8E34 = _NONAME_ | V | 0x5805DF33CF3EFA3A9DF6A2EEC2BA6355 ; libaacs -0x88562298F1EC6389E025D82D239D46FE1553E7BF = _NONAME_ | V | 0xF12DD991D2697976366E12527BB176A6 ; libaacs -0x8942F2D537F76A4548D7462229BD67F4FA86A5DA = _NONAME_ | V | 0x86AC0560D67DAF19128B48D6E709347E ; libaacs -0x89B10E6272ACAB95BA60CE2B17D1F71E0414EFA2 = _NONAME_ | V | 0x12CBB530DC54CA0DC6141C304DE06F3D ; libaacs -0x8AF0A0515185D6BE116573C1F0A002FA330080C9 = _NONAME_ | V | 0x727817E851FE05F27A33F2A4EA6E47FB ; libaacs -0x7D240390E6066769B29516965A9FF3A0874A0F56 = _NONAME_ | V | 0x49070D23BE4CD166A9EBA5BDA472BDA5 ; libaacs -0x7BCAC279310C32923361385C99B37F68C1A76017 = _NONAME_ | V | 0x50FED38AE4C7E19D1C0EF05C9F0672EF ; libaacs -0x799EC53FE0C94BA26992FCD41232ADF90C0B456C = _NONAME_ | V | 0x10E7D6FB59A86A6FE4FB44EF0EE89747 ; libaacs -0x635C9D6A3533A697FD032BDAE13332E51CBAC390 = _NONAME_ | V | 0xBA1E374D8BEB041FEBC7FBC80D273D12 ; libaacs -0x647D2F1C4B730F3A75D5398A644DDFF11A4E80A5 = _NONAME_ | V | 0xC133CC4065C4ABE2422D60E9C2BBBFD6 ; libaacs -0x64D1687985DA99AD3E39A15D9526B46B7D6C292B = _NONAME_ | V | 0x9A0561AF25A035D332E8911C2CD881D2 ; libaacs -0x671FF338D39E9A08D6FCCC05DDBFCE60F5B3486F = _NONAME_ | V | 0x43BE02A34A0595904D6A6539D952B198 ; libaacs -0x73B0CE5AF04366FAE55C49FF78F7B2627DD429D1 = _NONAME_ | V | 0x400BFDEFB6657FF123F4606BF02CF82F ; libaacs -0x73F38CEFD1AD6FB895856DBFB32945106F67642E = _NONAME_ | V | 0xB9DE2ABE850A9089ADAF1595D9379351 ; libaacs -0x74941B7401B52B5477D48C35666B0C2D0EF14B0C = _NONAME_ | V | 0x2DBB650F7B5DF00165E04CB1FDCD2A73 ; libaacs -0x79275E394FFEFCE4393CB624CD530644E37F1AE6 = _NONAME_ | V | 0x7567B369E9706615A012E7324E69F2A8 ; libaacs -0x8AFCE95F52537F4BFAC225AF56275E7B1633AAAB = _NONAME_ | V | 0x2524CE6169A5363711232F65165C8DB8 ; libaacs -0x8E46A0B1DD3B387627704C87AEFA04D2EF1A9D28 = _NONAME_ | V | 0xAFBDBDB159A8B1B2769402FFBC69E488 ; libaacs -0xA693184A85AE6BB96185AA69F00789B8FAAE3CD0 = _NONAME_ | V | 0x16817249598D2FD98F299C7DF715D066 ; libaacs -0xAF7FE67CDC2F98403B112391B0E4D30E8E688E63 = _NONAME_ | V | 0x16402A76618A188343D5D3F8ED5AFE69 ; libaacs -0xB033D497BF9C7489069B0E44862B75594C558165 = _NONAME_ | V | 0x8CE1A44E2A8212A65338790E96F7CA6E ; libaacs -0xB3C5556218D6C5E08FCC9C4D09C03DFC4BF22588 = _NONAME_ | V | 0x0E4F10665E8B2088EE17C0618BBA2018 ; libaacs -0xB3E291B8FC6C189DC5F12D27AC8110E8896F912F = _NONAME_ | V | 0x04F184E5BB2EC9F01E3A3484C8264441 ; libaacs -0xB6531CC63F10A1A07FEF6C00B69BD104DFEC286C = _NONAME_ | V | 0x31515CE037097DF35A6B3D9A3ABADE58 ; libaacs -0xBC56FAD8A6C37B08E3A1EDFFD984EE0B42762275 = _NONAME_ | V | 0xE7F0C9420482E6888E99969CF8706FC3 ; libaacs -0xBC6808350E0D4506D155D3F88B111679A7FE3E9A = _NONAME_ | V | 0xFF08D489417D97EE6B6ED62F7A3A2803 ; libaacs -0xA463769EA229D9055EEA024F4A56AC4653107350 = _NONAME_ | V | 0xC5896B64C926D595DADA58F1B13891DD ; libaacs -0xA13F873C1C78883E82E4D3F8FEEF998967D480BD = _NONAME_ | V | 0x85957141EDFC68BAD8502D7859B258F2 ; libaacs -0x9F978BC28B6743B71A54E3AF2026AEFFF5A6D2F0 = _NONAME_ | V | 0x171BFE575A6AB2B2B1CD2F5A7D8AB9B9 ; libaacs -0x90E1AD1F305030252A5623F2BDEA789EDBE7A044 = _NONAME_ | V | 0xB99F37C262339A220DFBB2061B0B3E05 ; libaacs -0x914F0683B4B772E57F2D3C4D9100EB6F56DC5B62 = _NONAME_ | V | 0xAA402A080660D85DFEBFC8577592D518 ; libaacs -0x9186BC0008BC1DD571EAB3611CF0940083116A65 = _NONAME_ | V | 0x5196A0275F5BDFBCBCFCB184F70DEE32 ; libaacs -0x936CFBAE6B4317273E60D4F1A5B102B1C44684EA = _NONAME_ | V | 0x4CFD174063505CD5CBDD37CFE2C19EBC ; libaacs -0x947914A1BBFCED03BB401E21048E7749EC5DC75D = _NONAME_ | V | 0xB315CA0F073040FA3D60DB91F06F1922 ; libaacs -0x979FA0495C3DC48984E34028DAF7B31FF28DDCBB = _NONAME_ | V | 0x311BFC6EE878B329A548E0004A6F4D9C ; libaacs -0x9C83DDB4D369E6A672BEDDC33939E5EF5FB68676 = _NONAME_ | V | 0xF3845FCFFBDF0A0F616CDCFB2AF6706D ; libaacs -0x9EC1888F843E4A4EB79D09BB5D8A39803F5FD1A8 = _NONAME_ | V | 0xAD2D21E1194422829FE4FA2E5C1D38AD ; libaacs -0xBE0C3ADA9F358F52CC1D762E496DECD60E20CFE6 = _NONAME_ | V | 0x9DBB4C1EED71CE7A021BB8D6F0EE1526 ; libaacs -0xAE04626317C9AEA739272D15992728CB636A5DB9 = _NONAME_ | V | 0x2D4352DE349506A08F16200ED9ECA12C ; libaacs -0x08C4C1B69E73BEE3D056BD389A2822264383B32E = _NONAME_ | V | 0x6D469C0633C7074714328F7C7F4C7F50 ; libaacs -0x09E5F1D826B3CE51EC550C8838D01FAE28E013E8 = _NONAME_ | V | 0x00EAAEF78F4E4B13E0766991E71C31BF ; libaacs -0x0E79CB5D09853EC6BD1FF56E2D8BD384644317E7 = _NONAME_ | V | 0x767F5B6720E8AFE456E845047C32646E ; libaacs -0x1534788F8DCDB4FF553480012FF3EFD6CAE2138F = _NONAME_ | V | 0xD10859A58083B2CA1DA8EFEF5E0BC3C3 ; libaacs -0x1750EADE0561D1D1E782A041A091E79F693D93BB = _NONAME_ | V | 0xE0D9D614E46ECF79194D589964899729 ; libaacs -0x1C85471CA8E01CBF02EC95D32E4C9BC0507DF240 = _NONAME_ | V | 0x746250D9BC2C92E9BD49F0868C0787D2 ; libaacs -0x1CEFD0939C4209F4C9EC561C06D23B54DC003431 = _NONAME_ | V | 0x044F1FEB3E84D6F7ADB04C59CEF32990 ; libaacs -0x1D1AF350AF9FCF69434723C1C1E60E743CFCEC5E = _NONAME_ | V | 0xBCF1C78960ACE08D487023BA03F25960 ; libaacs -0x06790A44B1D0FDBBF99F1B99CA0F89CEF5CE7ABD = _NONAME_ | V | 0xC247B2B255F2972F1607F1D70E6FEAC7 ; libaacs -0x066F0EA4DDCC66A0F1C0F2B9E2D23B1979525911 = _NONAME_ | V | 0xDEA1DE86BFFE8260CC46C52B2D47DD6A ; libaacs -0x03D43C48AC7795A47D9F02ED6285FCC8E3C04D67 = _NONAME_ | V | 0x1AF02AD7B4F193363AE2F4BDBDFAB278 ; libaacs -0x03DE38B07B12BA32D25746EDB4C9A8DD3CEDF738 = _NONAME_ | V | 0x00A2A13D7E48E28E03E1BE99B571E61F ; libaacs -0xBD3620A68F82F5F26D18D13A7C29AB9468C0FE6F = _NONAME_ | V | 0xEED9BD19F476AC5DFDF531FE9E3EA227 ; libaacs -0xB1AF8952ADFDDF250CB8A2A02AECB37B14B57269 = _NONAME_ | V | 0x51B367B9A7420DA7CA9E0A0F7EAF4CCD ; libaacs -0x2B0E4EF8E21907F8FE8ED1DAEAA704418652EA55 = _NONAME_ | V | 0x9D1FC84D64473A00199DC0A36B529D0D ; libaacs -0x6CCFA048C5AAC14BBCCD8E63886985ECDA518320 = _NONAME_ | V | 0x49740845DC9BED7707977EFAC0DD0659 ; libaacs -0xD22D861C55404E22631BA179F0D6FBCAE7FCD851 = _NONAME_ | V | 0x3AAA76C57A6E7835862A8D82D75AEA5C ; libaacs -0x013D0A73FDFDAE7A6B5FCBB97C3FB68796B99109 = _NONAME_ | V | 0xFFD7DBE3F7EEF6D81DE1D3B68F331E5D ; libaacs -0x01589F308D31FE3906D9E8E7472FAF0C4E7C3EC7 = _NONAME_ | V | 0xE5B378C4AC5B01608C904074BE961036 ; libaacs -0x23D2863ABD910B01D4C0F50627915B661C746737 = _NONAME_ | V | 0x7258B8BF4FE7727DE4A28D31F26042E0 ; libaacs -0x24E25D9E49EDA41D8EB76B0A31381FAD38F2AB3B = _NONAME_ | V | 0xC9BB625DEB25C5F3BB34E39D50F98287 ; libaacs -0x4150D4FF5FAFCD953B3DE41EF67D1CEFBF3217B7 = _NONAME_ | V | 0x02149E3BB6D5C1F4777DE39B974F2D34 ; libaacs -0x4276430B7D31D7D28772C30745B352B86D76CAE9 = _NONAME_ | V | 0x5C556897B1AF24C6293D482A956F6A14 ; libaacs -0x4C30D2E695BFC2A45508BBB550438B49799C9B46 = _NONAME_ | V | 0x90B60BA4AF5262B4169BA64F09DCE607 ; libaacs -0x4F2A4EA756E4DCBACEE3B2D70282D920DF973CB4 = _NONAME_ | V | 0xD1A6D31C5594BFC7CA52B0A0E2F2104D ; libaacs -0x50013F75533B0D8749A89BA67D01B3B1C0C5CE20 = _NONAME_ | V | 0xFBE1BCE17861F7B64829BB27277EE1B6 ; libaacs -0x5885C5280F92295275FC645946C52063D39CABF8 = _NONAME_ | V | 0xB18BCC18D96A47B9F61A8312E976620B ; libaacs -0x5A84DA7336E2A0ABC35AF90B7C6857FD2CB206FE = _NONAME_ | V | 0x5272D48BCA85B0B0F24F7F20BB35B3A9 ; libaacs -0x5B026C513A8AA6153F51AA0CDB4677A52C64B4AE = _NONAME_ | V | 0x5D12D7801E8495F0A0507056C89B85DF ; libaacs -0x40B370114868D76CFC678B2BFBD75AD3CA141B0E = _NONAME_ | V | 0x96C57D559AA280090A539F44E4F5D45A ; libaacs -0x3ED7E2E2622DC733FF921B368963F3FAAC0A1548 = _NONAME_ | V | 0x6827D51EB237566AFDD06A1E6E07BEBB ; libaacs -0x341FD6FC9E903E87CEF37EB961B45E622AA76602 = _NONAME_ | V | 0x473076D7ECD1B34A04F043946C776D1E ; libaacs -0x251B5D4B1021057EABAF8E89341657794804A5F3 = _NONAME_ | V | 0xB6FB9D2C3F1E30BEDBAC65B71FE8795E ; libaacs -0x274A94B7F685B7E434A00D8857F13865AFDBDDA9 = _NONAME_ | V | 0xA0BDA37CF15E621DB28215BDDDC2A335 ; libaacs -0x2779DFF04CB58161C3B448768B1B31AF3767FAEF = _NONAME_ | V | 0x15F5F609F39A132CDF20BBB9C341657B ; libaacs -0x2937E14C0DA4ABB1B4CA374E4104FFCB85174D85 = _NONAME_ | V | 0xA758AECDC26D840CBA7D9C1F88F7A638 ; libaacs -0x2B3F302F60F1B4132E27D3089B5EC1127224ECC1 = _NONAME_ | V | 0xC382B48B91EC622D06D17282FB7B6E00 ; libaacs -0x2E0E498DDD17FD46C2905245A5F0E241008D1371 = _NONAME_ | V | 0x66C44327BD03E3D8D3B19D24A8A33235 ; libaacs -0x328F283F7D0B6F69BF2E2DF7B68F520EEEF1E489 = _NONAME_ | V | 0x904E884A1791EB86FCCB71141127CCEF ; libaacs -0x32FA6D3AF126828877214CEC5A45EA3421A62759 = _NONAME_ | V | 0xFAFE2AE971A639D86EDAAF94DE22D55D ; libaacs -0x5B6E325939B10382917E4024820EA5E9A65190EF = _NONAME_ | V | 0x741EE0CA0C7A241B9071A512F4B71C21 ; libaacs -0x3D995A0F95F4CACFADAAA615135A1F5B59A5E262 = _NONAME_ | V | 0x6939A87856EC3F87DFE74BE4ED5AA71A ; libaacs -0xB98E0F3E65BB9FE4EFC1CBE40B95562527BE1875 = _NONAME_ | V | 0x395613438DB142F83A44639FCD7C685D ; libaacs -0xC4F6075C3BF42BD36AF074B44DA218D7ABB45074 = _NONAME_ | V | 0xDA09CB0821C90629DB65C320AF9BEA3A ; libaacs -0x771BA635069293AEDDCF904155E9ED16BF4E5841 = _NONAME_ | V | 0x4B1F213A4DEAB387A53A0C31C0955D7D ; libaacs -0x41A9F41D36035CB7ABDE6F8939781E9F83876687 = _NONAME_ | V | 0xC9CB24CC07856C767FC76497D125669F ; libaacs -0x9F78B00FAD96D573C353B72DDF712E6532E77BAE = _NONAME_ | V | 0x19570A1B419E31D90BFD89A5A4DD9953 ; libaacs -0x061A0059290ADE44A33470D3CAAD6A7EE4CC8454 = _NONAME_ | V | 0x4950DD487B359140D22D0D7E5BAEFC1C ; libaacs -0x51209728270BD7511FD8F2A235D5EE82145ABE19 = _NONAME_ | V | 0xC115225EF1F0D112B83B5DFEB20B69B4 ; libaacs -0x10B9164EB15CB05040826A0A22E9B8AAD19C40EA = _NONAME_ | V | 0x3602C345BE2FD5CCA3F9DCEB6FE5E146 ; libaacs -0x0461537261E62AC0ECFC7C8ADF8E48ED48E2BD60 = _NONAME_ | V | 0xEC868A16106379E345D2F4B932EA9338 ; libaacs -0xCE9A0344FAFF5CCE65D59CCCDBE8E3688B73A5DD = _NONAME_ | V | 0x34188E4E6814D455A6791E79BD0D27EA ; libaacs -0x4DD84EAFFC98D90051416FF88C668F093CF895CA = _NONAME_ | V | 0x3380AE73CCC63A074312AB75BBC2B5CE ; libaacs -0x69A2DC57DE53C8C76552FAD26E9F06D7F540865B = _NONAME_ | V | 0x7D5B3991BEEE3FDCA7E8012D94CAE2DE ; libaacs -0x8D8C68D87740E9C8A18F539E5FFFC94262C86B0B = _NONAME_ | V | 0xEF07EFA9ED20568F2867DF7E30591A87 ; libaacs -0x11EADCAF179F466A20403699939324C82C6E9D50 = _NONAME_ | V | 0x94ED25861D4DA9A5E4918873231C8E1D ; libaacs -0x11DC3F2C4C3E40E9668B7D7C2F74D99C150C4D57 = _NONAME_ | V | 0x74A7009A93920CAAC6A37FD93E12C24B ; libaacs -0x29D7358A4FC378C5FCAEDFDDD2FC3444968BE2C0 = _NONAME_ | V | 0x989C91BB5421B6BA036A8A9FFDD210D2 ; libaacs -0x8F73661D4743940A4DF387597B08F10A3DA6F2FF = _NONAME_ | V | 0xF5E5139B5FC8CFD5E106497845AED0D3 ; libaacs -0x0AA2859E94FB987588574BAC164AA28DB0C377C4 = _NONAME_ | V | 0xBA2D3C86B358383DFA9FC01068B61297 ; libaacs -0xB0F0BEC9D5CBD7C027C6325ED22C6A7E682A468B = _NONAME_ | V | 0x786C93608B82D454FE7FA3E729FE15A5 ; libaacs -0xC41715602603AE1E08CE610799D9560E5E15A541 = _NONAME_ | V | 0x43FCDE7E2B0079CC1DD0E547C54F4A82 ; libaacs -0x2E97327FBAC466520CE421711D5983050F9C32D7 = _NONAME_ | V | 0xC3521D42CD7FC987F80E7873BA5D1CE5 ; libaacs -0xC944BE0B9E22557443CE0BB8795E7A8F028E031B = _NONAME_ | V | 0x0FB863C1E34DE7F9CE89D3501FD3A05D ; libaacs -0xE4089FDB9906CE1F4B958FF3B39A6B7B2F4568E0 = _NONAME_ | V | 0x2E3B7C9F293CA8B7E6F836BAB26A4ED9 ; libaacs -0xEF01DE5413604F4C551CD10C2BD2D3112BD262F1 = _NONAME_ | V | 0x60D1A2AFD973055CA5FA93E4EA3E2735 ; libaacs -0x36C84D38CDCE5E71EEC617633D9D40114A66DFA0 = _NONAME_ | V | 0x9FA2D03126B27FFA0C97DD42C19FF57F ; libaacs -0xEB19D5F8CAF3CC3B542A367E6331C95525313571 = _NONAME_ | V | 0x596C50DDB2609B75227D5EE4623AB104 ; libaacs -0x69ACBD0C2C14FD1469B199CCDAB776A970F0550E = _NONAME_ | V | 0x346CF1051956AD9C6864C9B57946D4D5 ; libaacs -0x307F3C20D2F6B347173EAF59012229746653ED38 = _NONAME_ | V | 0x4B8089939CF6D73AD4ADC075F538AF63 ; libaacs -0x9C91BE26F30B60851AF2244768DF5B13753EB788 = _NONAME_ | V | 0xA5EC7C2AF2CA86D6CAEB73714EA8FFCA ; libaacs -0xA838F2D8DB3FF5DBB54F4E0D2E9710EDEF757395 = _NONAME_ | V | 0xF2F8E5A8F848E4247945A1EF9C4F0AAF ; libaacs -0x5BD9251224074C1A14B034877F5B66166EBA9A65 = _NONAME_ | V | 0x8AA2B8D185037E929BF84AAD6163FA6F ; libaacs -0x280BA2DF70618371A1C66D2E7F754C0954D9FEAB = _NONAME_ | V | 0xDCC3DB416A2CFE9CE2BA369BD2FD1273 ; libaacs -0x20658811357A9CEE9E8852145A1335DB06ACF065 = _NONAME_ | V | 0x63D976FCA651BA8F3B8832BF980C8AF0 ; libaacs -0x32D6515D29C57A1C0649C02330D569718A0D6181 = _NONAME_ | V | 0x917BC4BCBCD9A2704F3C6B5BE75ED6DA ; libaacs -0x3FD5E4F6D40D7CB7CD3F80EBE7FF9DC894DE7BEE = _NONAME_ | V | 0x65C1DA88AAEF8ED00ECE94E421BA92D9 ; libaacs -0x184E39A62808750E5D741439720EEE99FB8102E2 = _NONAME_ | V | 0x9EF09CC0E55E37F635949A0172E77CB8 ; libaacs -0x3C8DC8CA83EF98DE7DB61F95C74C5203BB7026F7 = _NONAME_ | V | 0xD6415D90E294BD49A21F9A223DF7A515 ; libaacs -0x7A8B20ADDE8BA0EFB3C0689804860AAE3A4468E6 = _NONAME_ | V | 0xACA9ECAB5FE54DBBEE4FCD8CE87D0C88 ; libaacs -0xC2F5F23D539A8EFA84BD20504573DDB319754C1F = _NONAME_ | V | 0xF7A4529EB75EFCC2D0CECB0CB6D26F2C ; libaacs -0x8A1ACC080F43C85BC87C79E50DA3BBC2C2909920 = _NONAME_ | V | 0x384DBD41FBDFFDC6168ABBFB89B0F4DB ; libaacs -0x66414795D2B8108124764D292E0E39AA7FD33B6A = _NONAME_ | V | 0x4EB6405698CFFA83F526146E5385F476 ; libaacs -0xA6E1EB64024FF42F29AAB1B057EA62B609708D75 = _NONAME_ | V | 0x9B5F45116F9A1D0A0933DAE6B9004A47 ; libaacs -0xF996DDA9B91D92485CCC446B4EBE19036CECDFCF = _NONAME_ | V | 0x81F5FE58E376931D1430F95A6E7D32F5 ; libaacs -0xBBB945359E8039598944688160B920DAF88413B2 = _NONAME_ | V | 0x7E6C0DECEBB97F9FF45F426AC98C48D5 ; libaacs -0x6CB1EF8C0AFE4CF74CD0C01FE60617BF794083A6 = _NONAME_ | V | 0xD2B40F7201C643E442C3BCBB0EAC01C0 ; libaacs -0xB5D884EE4388C367561F8E1DE54343537989F329 = _NONAME_ | V | 0xCB9D1C54534B7AF727304227A8DF7EE0 ; libaacs -0x6A30E753F58B0E6C28220B1E679ED769C61000FC = _NONAME_ | V | 0x09A766BC164BAD15983E31B34FA88E57 ; libaacs -0xA14B12BD8AE8C5353540556EBE5DD935D7474800 = _NONAME_ | V | 0xB4C5F961F456096E571A2560626F9F42 ; libaacs -0xF20280171E87C779E6549FD9C16C3FDCD8C6CE44 = _NONAME_ | V | 0x82AB930D489FB5D7CB1716826457C5DE ; libaacs -0xF9CD355CBB6FFAE95B939F84A92C5E345BD7B3F5 = _NONAME_ | V | 0x36561D41D4FCF90CEBD8E40C0AE5486B ; libaacs -0xB95C46CA9A89AAE06C531A92E55AE7809077278B = _NONAME_ | V | 0xF2AAF7C7FFBFC5DA2C71E9EF23C8F4CF ; libaacs -0xACB16032D0D00FB619C34949D914E8A418542D12 = _NONAME_ | V | 0x57991001F262766D0E1590586AB95971 ; libaacs -0x96230418FB2054EAE82637E1E243D6B75ACFF21E = _NONAME_ | V | 0xEAA3887737E04E6A60D37BB7EE36CFF8 ; libaacs -0x1E0EDE375BF6D540632A99B75F1981143BD35353 = _NONAME_ | V | 0xCF868F6EB29250D99D3A8F1FDC58691D ; libaacs -0x9BF7298059C1A2E601E0B8185E0D64FEF4D431AD = _NONAME_ | V | 0x7CF3F08FAC4A41B4F05B7119AC36012A ; libaacs -0x3241EB465B7935BA1F2D9431EB83CEB1C461A666 = _NONAME_ | V | 0x4912F337BC680E5BCA84306EA5E8DA0F ; libaacs -0xF30EC01CB432CB975E704632E9BE5E023F7539D1 = _NONAME_ | V | 0x1B0FA021DB319151EBB730A7E21D4E6A ; libaacs -0x55A95A3FCABB7B323BBF86DCC91A23C28D821C49 = _NONAME_ | V | 0xEAA07AD49E3C5E6F5B58FC3A7CF1B634 ; libaacs -0x62857C842D4C4C62FCD4E2ECF1E340EC3D53C2BF = _NONAME_ | V | 0xBD597EEA3EBC80B5A1EF1AF04F392090 ; libaacs -0x88469BA26A8D00EE202561930912419177732B23 = _NONAME_ | V | 0xE4FC16EF59C993E2A68FEFD635D4EB1D ; libaacs -0x9145ACE1D4A2C6BFE1E82CE2E3FF8BBB060D7C9C = _NONAME_ | V | 0xDE8B59DD1E6759B54864354635089CCF ; libaacs -0x94364E3138756303C53BA4507028C33799785F38 = _NONAME_ | V | 0x1D25F75470F49C6AA189460FCE698118 ; libaacs -0xCB177DA37CCA1AED8EBFC0906C95F1E5BC0370BD = _NONAME_ | V | 0xFF930D65B433CC494F15A8C21A69F804 ; libaacs -0xC2D070F63A4D0F277E1BC1F2F3D9F8326CCCDF12 = _NONAME_ | V | 0x766F846CE246E1522EF072B5E7D61573 ; libaacs -0xE21729B95239ED1B5C7605451A7E97926524366E = _NONAME_ | V | 0x7A0734AEF239FB28E0A7E305E26192A9 ; libaacs -0x3250F81988E64644E7510E8060F46983D4EBC508 = _NONAME_ | V | 0x05B4477CE1AC529666A296D788483FF7 ; libaacs -0x1FC00C2A07EE2F08DE7DC926DFEDCE7EDAD57BE0 = _NONAME_ | V | 0x55D1C766A73F6CFB0CD816D3E6EEAC8B ; libaacs -0x6709E972669364A29F6C271E0EC299B9BFE129CB = _NONAME_ | V | 0x1EE9D404BA76B93E60BEB8370334E5A9 ; libaacs -0xE3674AD32E9FBEDBC3E9C098A1EF392D232711D8 = _NONAME_ | V | 0x0E834EE5DDD39DA28C3C4561968D3D56 ; libaacs -0x8FAFE6CE63528E4647BBEF99433C58F5F9A30150 = _NONAME_ | V | 0xD8FD1BA8E6D0CF473AF963EA001E94D5 ; libaacs -0x3EA396F8ABA5ACD1677F0869596D1FF07D509D37 = _NONAME_ | V | 0x7EC681367FEED9061D366A191B8EF5F4 ; libaacs -0x6312C3E36CF2EBEF5EA6D4148A6119C540B08649 = _NONAME_ | V | 0xCF4EFDB770C9F04C44787B0C6FFE8892 ; libaacs -0x8262DD2007D2C5F0AC4D27E4BE79090BB3C06ADE = _NONAME_ | V | 0x7D495BBD7117DF3A9DEF42DBC330616F ; libaacs -0x37D0D1D97E561950466FE5071E4AFA6657433923 = _NONAME_ | V | 0xAC5B4CBBC606D0ED1025439A1D0ECAC2 ; libaacs -0x8BD4D4634E87F5576A25867F32FA342B77E4B26E = _NONAME_ | V | 0x652C61FC1E76758BDF9FD71198563212 ; libaacs -0x26A2583FD1270CD70BD1E360A70BE7774BA26EC5 = _NONAME_ | V | 0x822040F143D449646E0E60C045194C28 ; libaacs -0x498E5113B602D9AD615E6928E9D2F37B4D4F447E = _NONAME_ | V | 0x76009F0DD7333D5658B72E32145257B4 ; libaacs -0x0123456789012345678901234567890123456789 = _NONAME_ | V | 0x44444444444444444444444444444444 -0x7ACA097E0B7AF15088DCF43C31CC9A377F4CD958 = _NONAME_ | V | 0xE34D6293F2BD58934BA38884B31A2622 ; libaacs -0xB14C9CC3961FEB2E97C17CF5126AA9F057E90E8F = _NONAME_ | V | 0xF9195CCA3E41843E01C95F75EA5E809F ; libaacs -0x29F500DBC8B1E71DB685DB5488605200CF7797F9 = _NONAME_ | V | 0x4C806EA58CE1998E85129C3DA8646208 ; libaacs -0xDD126B0F71942EA1BFF4753E2BAE26F434E4CE36 = _NONAME_ | V | 0x727E12C1E754019BF24571A8C5F15418 ; libaacs -0x948EE06C30BD957310BD6AE79B3251A151F7DF65 = _NONAME_ | V | 0x5B31303D030028F01B4F277AFF0A876E ; libaacs -0x9927EA1A63A2D2F68C16F1B40B7A6C630B7535D0 = _NONAME_ | V | 0xDFA1153F02B859B3137B1C60846E1AD9 ; libaacs -0x6089C3FE5DDCCF459B220796E9DE56DB14A3ED98 = _NONAME_ | V | 0x188387DEAAF4005597332DA75A705829 ; libaacs -0x0486B25C15BF2342E7255FAF9A6DF20D4A8969B3 = _NONAME_ | V | 0xC9FC121F1A1AFA13F54BEE283EA7254F ; libaacs -0x548D062DDB446E892D99C517193569C623BB615E = _NONAME_ | V | 0x2B9AA8013EF8D6C403285DBB2BB0EE8C ; libaacs -0x86EB4BE061BBFBA6695B7310133D68337FC135DC = _NONAME_ | V | 0xEEBDDC7944BF2A60DCACC1FAB12820C2 ; libaacs -0xCF39AFA3D54A67E9EACBC6BE94ACCE04EFC69642 = _NONAME_ | V | 0x755E42708DD277A319B1A80110CEB60E ; libaacs -0xE6CA95D7294D63E58438FAC2E5ED07D462B53285 = _NONAME_ | V | 0x4E5AEAA0B2A0A653169297E5D515F3D7 ; libaacs -0x56DE188805F06D0DE0AF08EB38ECA4BD37F156CC = _NONAME_ | V | 0x08B8138271173FD561D6AAD9988C0B85 ; libaacs -0xFBB3398C09F448D7765C50701E7BD4C15E65A7CF = _NONAME_ | V | 0x0FD8F49853C14AD31D3222B2BB5E24E3 ; libaacs -0xF6014036A854B712A172395AC275FBB6C96EC3DE = _NONAME_ | V | 0xA5EE4FA351342F7A4D8A5E82C83044F7 ; libaacs -0xD14BDDB916E5607458E2FA31AF39A539EC035F32 = _NONAME_ | V | 0xDACC95CA0E59732E5E6F3FE3C3917311 ; libaacs -0xD73BB34248B468FE606CC54A23E0235C3A838B99 = _NONAME_ | V | 0x94FD77302E8495580597FAD15F64B391 ; libaacs -0x3F9CF92DB1E0A175D059180F0C837BB821C60A26 = _NONAME_ | V | 0x5FB498D0EA2462DF6144D30967374F8C ; libaacs -0x751C5EC92CE68938BC6E088E6989BFB7D151BE08 = _NONAME_ | V | 0xDEDF23384A5846649B24BD5CB1FCF23D ; libaacs -0x6CFB082FE1633023B2A1C6BC715DEC242641FB54 = _NONAME_ | V | 0x393F68B77B42593F5F78DECE6F06664D ; libaacs -0x16677CD203B566DF98E40088B1FB0ACA5E45F1C4 = _NONAME_ | V | 0x6B3D44B4E3D9476BC528E68D42163ED7 ; libaacs -0x1BB40A7FC4392090A63549DB2E79F562DFBC9220 = _NONAME_ | V | 0x6A3230CE23D95EF70B8E417EE13D547E ; libaacs -0x559AB0CC9459232B7BDBA2D748410246AD9CBC1A = _NONAME_ | V | 0x38029966D728571328D74A29CC1134A7 ; libaacs -0x91E879B5383AC217EBDA226DAB6000BAAF6F2EE5 = _NONAME_ | V | 0xE5C222C091DB4FCF0A2F8A34384E8A60 ; libaacs -0x0DFA7D681BFF004436AFC2588293868852E1287D = _NONAME_ | V | 0xB9A6E1043E32C7A6EE6B2518C0B7494C ; libaacs -0x9CA5BE0E814FA3FFF177C67ABA2AB35F87902E4A = _NONAME_ | V | 0x787399316D9F7718E796237358D4EFC5 ; libaacs -0x39862108F46366A70DD2823FCCB91A812D02AB25 = _NONAME_ | V | 0x54CA7765311D7B1F6DB9A361A884E075 ; libaacs -0x2538CCA8D0A3B58AD352E60F54A27760805E7599 = _NONAME_ | V | 0x7601E6121FAE3F7D293586B41D41F3BE ; libaacs -0xF264DE97A3F532499F6B0E9CB4B5393F10260229 = _NONAME_ | V | 0xA710E27237CD6EA4A0C8EA0B65CF730E ; libaacs -0x33D6D1DB9D8A2C2E012372F2F990ED1769A7A80E = _NONAME_ | V | 0x2A9C146BEC524F32430236DD7832FFDB ; libaacs -0xE5FCAFA717632CF6902F74C6BF7C109F2C81B84F = _NONAME_ | V | 0xE1AAF22CA38512DA3ECF662E07D7B4E1 ; libaacs -0x450764F6271188F444FE24052D5A9FE1D42C3FA8 = _NONAME_ | V | 0xBBF24F9DDCF2CA908ED60974BF9113F2 ; libaacs -0x807ECA26F941766B124920B2DE57BC0830DAC720 = _NONAME_ | V | 0xC75768F2B5497D1719FD5D46F0F6073D ; libaacs -0x43E0663E3D3135354C507338F2AB20357E967225 = _NONAME_ | V | 0xD0F9577F27A45FD0367D58877F49808B ; libaacs -0x51B3C87B653E53C9CE9DADD82CBBCF4A5497654D = _NONAME_ | V | 0x49975A3E0217F4C5F03F58571170AB5D ; libaacs -0x0720C5C92BF0C74901154902885B8D861D0B9733 = _NONAME_ | V | 0x0206B5C0E45DD5C32D96CF579CB254D0 ; libaacs -0xF000EF75FD8A8387E24A7F589BEAB0584206B103 = _NONAME_ | V | 0x588E765DA758F936F17788389151ACA5 ; libaacs -0xB95A5C5E7236052D7E8AE759FE64BF69A180613C = _NONAME_ | V | 0xD7FD5AAD1F88EAAEE69C57B09A03704F ; libaacs -0x226FBAD92F7F82D31DED618BF6FB8FDF453A494E = _NONAME_ | V | 0x99B2046D8E74FB9BC9B60D132B8FC686 ; libaacs -0xC2302DA58F94664586ACEDBBFCA42F0AB97145E0 = _NONAME_ | V | 0xB42143BD912FAAEEC040A4ECCA755B56 ; libaacs -0x12ACCFE62141F881E59F506CD0F01D759F868E91 = _NONAME_ | V | 0xD32FE78AA753BF7DF820C86C1092D1A6 ; libaacs -0x1E96568F6C0E2F97FBBDDA008806882AF9878AB4 = _NONAME_ | V | 0xF1CC613FFBD932432C80C4B5EB5FD2E5 ; libaacs -0x28CBB67F929F7F09C1B429B4C56B96B77123152F = _NONAME_ | V | 0x5D473DB319EEED210F9B2612CD4862B5 ; libaacs -0x51B73F1873B04626DF9FA63E3A07A6B1056AFCEE = _NONAME_ | V | 0x61F813E1B59FE457A5A2C359047B9A99 ; libaacs -0x7944DEBD188716E918792AD0B396D8E1E794D37F = _NONAME_ | V | 0x996A9A71011074B76FF11FD2507276AC ; libaacs -0xB5FFBF2116F3A199B40E0BA572EFED69E1B41EDB = _NONAME_ | V | 0xA181CF351D27A51E5CE15F652CE1611A ; libaacs -0x8ABC4DE038F0BF4E6E3FDCA677C659758C20A31D = _NONAME_ | V | 0xC98D533D32611E131920FEDBBF59F1A9 ; libaacs -0x2DB6DB0F95557D4472C4E2B9EB4D6707FE15098A = _NONAME_ | V | 0xA92E11E06CC73E129247388CB9CDA385 ; libaacs -0x31D42761BA3FB9D6C68F46F0FDD3692121398F34 = _NONAME_ | V | 0xAA44DCEFAD9064904BD57BEB82E5EDBD ; libaacs -0x963B6D5C2B059E6ABF152DBC8E22EF78434E7489 = _NONAME_ | V | 0x3AE55A1AE43AE35CD5CA483A094B8EC7 ; libaacs -0x076EC88646084C7C8CC3E1E4DA605A37AACD746A = _NONAME_ | V | 0xB01E212E9C3D6AD7C825C759AFA04A8D ; libaacs -0x33BA8017BFE22E0F473774C1385CBC68522B1ED0 = _NONAME_ | V | 0x9F4B71F41B9D34CB4424DB1B9684D4EE ; libaacs -0x61FD4FDD914BD4F4650CE11268D2444C247CFE96 = _NONAME_ | V | 0xFA270C7AF2E945BBD92B38F60FDC061F ; libaacs -0x20A55FBA9BEDB78E65EFEB70DC8182F19CC75FB8 = _NONAME_ | V | 0x6B9F6D3E88920A09FB5D05E06D4062F9 ; libaacs -0x9961BDB9610A63BA46FD560572D517F5595B6173 = _NONAME_ | V | 0x2196C0107AA5441141BEC532732C525F ; libaacs -0x2992C61D3F5482EE8110BFF2B053F207E66B83A8 = _NONAME_ | V | 0x1428B3B5061EBEA9936A4BEF436C77CC ; libaacs -0x05F4F3FA22833F9D140AFD864A66244B5C0C02C6 = _NONAME_ | V | 0x23DC059DD720AC1128AD8EFE74686828 ; libaacs -0x31A60C70D7F12B6C0D7449BA2BADB85E1B3EC335 = _NONAME_ | V | 0x7CB03306DF6B42C4DC561BCCE73BC035 ; libaacs -0xBA2D7C66D17255196AFD344A6FB7D2AAB091A239 = _NONAME_ | V | 0xB289A01ED57A0B2C224DAF74B1601E9F ; libaacs -0x78D19031A437B004197FD663A248D71225CAD398 = _NONAME_ | V | 0xE95039C2AF69991A6C2A538FB03C7E2F ; libaacs -0x18D8B9374D9C4B2531F2FE44619DDC9886894D81 = _NONAME_ | V | 0x8F0FB240E94BFCC2FB62C96C6D67F2B5 ; libaacs -0x22434220E771BD46D89117A8ED0191FC623446CE = _NONAME_ | V | 0xB5D0675E16DC71B0158F8FFD3D0C9EE3 ; libaacs -0x442CC5D131C8BD6CAE228E0A78BEEEC7EAAE801C = _NONAME_ | V | 0xA41A8E19A7B2C653CEAFF7C10833762D ; libaacs -0x2CB430658B50A0F4D459A0353D5E4BFD0F6F66DF = _NONAME_ | V | 0xACA3809BC53A3ADAF54A90613A950CE6 ; libaacs -0x1C341F4DB1AD5933EEE640EEF868C4D7898E48A6 = _NONAME_ | V | 0x3E23FC58652EC01C92A788D8860E1187 ; libaacs -0x534C4089F25CDD60C54A12261190C1067270CBE8 = _NONAME_ | V | 0x9D06E3BAA65F5D679D1BA1E15AAE6D07 ; libaacs -0xECF2132A7BB54640CEA62368B1040F918766A5B9 = _NONAME_ | V | 0xDEA5BE27F13A507E1792CEFA1C671D06 ; libaacs -0x334EF2CBB046DAA652C80587DB99BCB1E7A75198 = _NONAME_ | V | 0x059BBBE357F92E0D22A2AC363D21A76F ; libaacs -0xC6B42F4BE3F971878376DB61B24FF6949D3F6F14 = _NONAME_ | V | 0x110E3B2A93B45C7ABC6C39D517EF7D65 ; libaacs -0x4A2441CF9C3137DBB478CA88C5C36CA16165252D = _NONAME_ | V | 0xE4F77EA5533BE31E3755ACF8C0F658E0 ; libaacs -0xC3FD689BF92C9F5730CF067CEB2768ABBEAB1941 = _NONAME_ | V | 0x4F68102B33640ABB601E869050EA659A ; libaacs -0x2ADEFC3D6622EB30E9945950F20380F1E8D862F6 = _NONAME_ | V | 0x5A48BBEE69BBF41990AC1BF93BE01A39 ; libaacs -0x4DA357423EBCD72D10AF201D08AD1D85B184A786 = _NONAME_ | V | 0x51B33F235E5E3745AE378D2F5765AD92 ; libaacs -0x788FE085C072EBD9F31C677552AB9AF075BA4B7A = _NONAME_ | V | 0xBEF5AC4E134AED82B28BB1B279A56ADB ; libaacs -0xCAE7891A4A1193892FFC39D027A6B0F06F16F8FD = _NONAME_ | V | 0xE6529C8D3C46B4A78F1008598E570AA1 ; libaacs -0xBFA821EDD7E6681394AEC7FC61FE460DC8577BD7 = _NONAME_ | V | 0x52DB7086E23F419C9577A8FD055CA1CD ; libaacs -0xF63742BB766590F4928199B3FE9CDD9714A63EB8 = _NONAME_ | V | 0x46DE7ED5548D7AC59351D8E2EDFD6D2A ; libaacs -0x0C9FE6C234D5B88192030F0ECD4F4138524E8719 = _NONAME_ | V | 0x224EACF0D3A9C97C88322DA0612248B7 ; libaacs -0x364CE0EA0BF3D5986E21A385FA25C1D002078639 = _NONAME_ | V | 0xB21909384393432519E148436960AF50 ; libaacs -0x66D63FBB5E89D092B81252767EECE986186DDF2C = _NONAME_ | V | 0xDCED519F9435E5F5032AC7995CB80A6C ; libaacs -0xD0CF69C891A9AD8E7698B17C3ECD0EC7A73B7531 = _NONAME_ | V | 0x3C1804D5E26584E0B11303FD1798561F ; libaacs -0xE46CD55129A8BEF08B80B975D84C82C19E1D9531 = _NONAME_ | V | 0x7EE677E3B6C9819C38020C6DF133227F ; libaacs -0x2209B9281C2BE5A64FEA090B096F6FAECB9B9E1A = _NONAME_ | V | 0x5F1DDF5CC9389884932D1F249CEC34E7 ; libaacs -0xC3973A072F4CC178E7CEF3370E2BBBB0E805420E = _NONAME_ | V | 0xFF293661713D5DB1E0445D3B5801FE46 ; libaacs -0x00C164981320506C39E192D04D7DEF1273830668 = _NONAME_ | V | 0x4EDAE37021483BC7ABE9A46CD89A12C2 ; libaacs -0x14A051AC62B6AB14A50DDD592728114104428453 = _NONAME_ | V | 0x236E6E59B5608E18605ECE20F936BD0C ; libaacs -0xD783B79A86374A24A3ACF3A6812E38EC457CFA1D = _NONAME_ | V | 0x91BAA04DB90EA05C27C7046AB352EB03 ; libaacs -0xE2B14F71B64A1AF7E07F4E395A3FA26FABDE136B = _NONAME_ | V | 0x5359174E00DC750FF74B59CDFA4B7021 ; libaacs -0xE0B3DD8E71E88EF8D9D0C5B06078C75D1E022671 = _NONAME_ | V | 0xCE808ADB6FD5114415E60C06F7BC660A ; libaacs -0x2E27EDB17EF567519CF63228457AD0923BAF7EDC = _NONAME_ | V | 0x1AEA9F2C85F385B28C9A265A1810ED7E ; libaacs -0xBDBB99A0A174A73323B0909E4701B07039462780 = _NONAME_ | V | 0x10B69B039EB929F24797B0FB9265265D ; libaacs -0xA518F283FD510FF42B54531BA9EF707D5A05E202 = _NONAME_ | V | 0xA1D2C6476F3BDC192A3C3FE402F08210 ; libaacs -0xDCF2E7B7192D07D52CE161C2B98ACD1B6563BC1C = _NONAME_ | V | 0x6CCD541971A7472EEFF546974FFD7325 ; libaacs -0x5DF5D81B9103FDACFD4B26E6A8E4B2DBD0D420B1 = _NONAME_ | V | 0x4287419B7B7112A1A0CABAA567D29AA3 ; libaacs -0x3A199A547D631D59D39E5838BEAE41559B42F71D = _NONAME_ | V | 0xCFD905E52C996B1813F04E93F1FC5AE2 ; libaacs -0xDD68DC6B82AFC0E65E5D0961CBC05EFC0400FBC3 = _NONAME_ | V | 0xC5ED74775021915B43475B37A205F67C ; libaacs -0x2A122D8E48391DDE9D432D3DF9129B5FEC719DB7 = _NONAME_ | V | 0xC59184192FE92017C192E418B19594B2 ; libaacs -0x029357636037CA1932D87814542420BD63C45E81 = _NONAME_ | V | 0xC65867C0E8DDA441E2C9FF048B16F3AA ; libaacs -0x2ADD00494C30CEED98817D27D19FAACEB4096A66 = _NONAME_ | V | 0x63820AFCDA67514DDA5424714B1E536E ; libaacs -0x4D3EF3924641A83BE885EB0199D778729C44DE2A = _NONAME_ | V | 0xD55B14BF0172FA53FB19BE1DCED60DCD ; libaacs -0xB911E82CC4B755F6EED5D14507024842454E2695 = _NONAME_ | V | 0x26BE3998CAA77EEBEB0DEA21AB0485AE ; libaacs -0xDB8A38162EA51836BD69BB5743FCC4783C231610 = _NONAME_ | V | 0x4A027E058EE035C228523B65EF6B3E3C ; libaacs -0xB7D529D00B2A1A14200647D22440F6807B2EDED8 = _NONAME_ | V | 0x84463CF68006EED34D9F76152A468C16 ; libaacs -0xCF54B5C190F57FC4829F12C7CC3D21D0ADA1D811 = _NONAME_ | V | 0x36FD16CDC3B3CA50EF7561D04387CFF4 ; libaacs -0x5BC653C412A90DF32A1459B3A9E446ECC57B710B = _NONAME_ | V | 0x0136A3297660B5619F051DD7C2F54100 ; libaacs -0x053900C1546CC8B05F48410B02AE6E543E67370A = _NONAME_ | V | 0x292DC7CD10362AA6DD79662D66D97AB8 ; libaacs -0xCC1C642DDFCF40DB20BF3AB1650FAA91E183559C = _NONAME_ | V | 0x8F34419877532D84D9123D9719E7A20D ; libaacs -0xE1ACEAFAB6F1E9BAAB59C6061470505284D3EC28 = _NONAME_ | V | 0xEB710A04F4E413B645D5C986912C336E ; libaacs -0x0DA72685370FE556D1F3BDDB310F58E0F5E7DB8F = _NONAME_ | V | 0x2D0EBD5EF9C9D741574676CEC872E05A ; libaacs -0x95D6575A44C573F360D1115E73E8A6E4D157ADAA = _NONAME_ | V | 0x86A9D43BEF643CD30A99BAF647CA8EB3 ; libaacs -0xDBD2E5D5A8D9B79BFB7E3C3C0401D4CEB866513D = _NONAME_ | V | 0x4CC9102B3EC2D17E0ADE4FA80E3B6DC7 ; libaacs -0x832BDAB78D54643065FB3DDDEAF4CA6E193E698B = _NONAME_ | V | 0x0229D4A0F84B445429FFA4B428263124 ; libaacs -0x99E132B72E8EEC96AE05702C10D21CB3A4E9FD97 = _NONAME_ | V | 0xAB91765C6D21FDF0E2B5EFDA42F6EB30 ; libaacs -0xFCCB2D024A3EAAD1708A01765C77E25A1B779665 = _NONAME_ | V | 0x34E15B7D5D466A14AC239A26ECDEE9B6 ; libaacs -0x59C865B8D2C1386F05666D3B65762824BFD086D8 = _NONAME_ | V | 0xF43E4FA3DA7E8B4AD3F845968841DD42 ; libaacs -0x472857DA4E5B8B218F642F569642A340F57EDE2C = _NONAME_ | V | 0x3DA9F8CED85DF286B19DAAE9430B92F2 ; libaacs -0x3D6E8867F68A2CDC8639ACDE34A0FFF9B2623ABC = _NONAME_ | V | 0x938474FBD300F56AE199BD8D7667DCBA ; libaacs -0x4FAC2DCCA2160DA8ECAC0D9A3F6901207B472DEF = _NONAME_ | V | 0x956D863F235AD0EA4B036DA554C49771 ; libaacs -0x43AC77E83141CE554936D67A12C6AA8A4F1D1E0F = _NONAME_ | V | 0xB49B589AA46B206853846DE01CAD0998 ; libaacs -0xC4564BDD293FC109AB02666F739700296E7C6BFD = _NONAME_ | V | 0xA1DCCC5FFA7540886C06D9960BDF01C3 ; libaacs -0x7B3317395F82FEE8313C046307D123D5088858EB = _NONAME_ | V | 0xE26B3C130A9FD4409EAC2A02DC0B03B8 ; libaacs -0xBC32EC4E4232BFFF171D40786FA12EC1D4E48B0C = _NONAME_ | V | 0xEE9138A258F6D2F50867819362EBB0A9 ; libaacs -0x5C4F72382635995DDC7CF55F6C8F7409659AE338 = _NONAME_ | V | 0x097BB671842670F3EC3C4ABEE43DA1FA ; libaacs -0xB10131BA55A52A2B054427C2A751A054C4ABCDC8 = _NONAME_ | V | 0x9507F08AB8F3876F9D9DD78CDBD86405 ; libaacs -0x06F8B84D46A750EC5552075DF5D951146B9CADE3 = _NONAME_ | V | 0xC66A2A2581437DA43E26A0560DD10935 ; libaacs -0x5E7B18981A82BB9CD045E28D38F1D36E989CB765 = _NONAME_ | V | 0xF8441ACBD28EDF7D61A790BE334AF1EE ; libaacs -0x71218BEEC96564DFB1E5E214AED4110A15D14791 = _NONAME_ | V | 0x1F0D0F405FAED40E289BC4D69977D244 ; libaacs -0x58495E796AD2C7CC49361B0543B3869A9C65E8D9 = _NONAME_ | V | 0x6AC3217FDFE99EC72DD7591086390700 ; libaacs -0x0821E0BD460C739785981463610C6C31F1B06696 = _NONAME_ | V | 0xCA642C83C7A504D35480AFE4AAD8F33E ; libaacs -0xD52A2DADD235981EAA3E296F8D983CB7925F5091 = _NONAME_ | V | 0xE7C113DFD0E78A66429C50C17B84CA7D ; libaacs -0xD1529EFD21891BA99F73732A395780025A4739A1 = _NONAME_ | V | 0xEFB10DD76EBEB3C8805097C39600CF92 ; libaacs -0xCD64A08D4256B360BCFCF33EA78CD4CF54C16DEE = _NONAME_ | V | 0xB1DE7BD48F0972D704276CB277460FBB ; libaacs -0x2AA11937752E7B3C0B3303B22C1CC5B6AB11FE38 = _NONAME_ | V | 0x817C4F249FA149FC6DF957B984BB994D ; libaacs -0xEE5DB3F5AA02A6E6294924EE50BCCD2D649E5AB1 = _NONAME_ | V | 0x121AE05B065659A5809A332F38C24009 ; libaacs -0x4A3A3494AEF443AE73349B09EF8669C1F47EF3CB = _NONAME_ | V | 0x886F4A477AAB6A881258BE16DFE0EAB5 ; libaacs -0xBDA966A547D44FAA1D64EE419653A9DB6E1561C8 = _NONAME_ | V | 0xD951E0D5535B4DE771B06CB15C3F3EB3 ; libaacs -0x04B90052941FE059648036880A971CE3272BAE18 = _NONAME_ | V | 0x1B0D0ACEE6F3AA7D8F7AF5979A5F9208 ; libaacs -0x085AF1BA27657CE8615108444BE1D127127F8FB9 = _NONAME_ | V | 0x64FAA57C19D2D2D2B54AA0682EBC4C88 ; libaacs -0x60962D054FEAF3337D3ECDE8A6C68A2AE910EB50 = _NONAME_ | V | 0x3D85896F75F82243B35FFC5D2048ADD2 ; libaacs -0x6E85454BE32C41F058CEC58072DBFE539D68DE88 = _NONAME_ | V | 0xFD0E216711B7F7097606BACA19B251C7 ; libaacs -0x735952600B567C1235B2105E0B8AE1934A2BBB37 = _NONAME_ | V | 0x1D9AC7E9088D6AE6D77972B0ACDB9874 ; libaacs -0xC63D5EDD0D4166B5BC55742F9CB7FEC1B2F38DD0 = _NONAME_ | V | 0x636C9E957E77918D669621EE2884AB63 ; libaacs -0xFE61A54BADE91FBCAAD8AAE9E25B971556D30EBB = _NONAME_ | V | 0x9055C5DDF390FF7B9CD046AB058D57D4 ; libaacs -0x5BE6FE13911BE96EBDCE317CB2CE5B2B35293F1F = _NONAME_ | V | 0x45BBD1B051FC8A70220025F582854CEA ; libaacs -0x23B8E434850531D38AD8D145842BDA7F68D34B7A = _NONAME_ | V | 0xFDA96C37184A46E05EDB3BB83441BF33 ; libaacs -0xBEF565CCAC68C195AB58D98A6B6A09BAF7EDF439 = _NONAME_ | V | 0xE3DD8004B6F2F3FC46B9DBEBB53F30CF ; libaacs -0x2E45D751283753888CFBF843FF205743D65C4D55 = _NONAME_ | V | 0xFF16072AA80BC5B4A30AD9248C02865B ; libaacs -0x15711244105344282E89E743CF6371ECA92CD215 = _NONAME_ | V | 0x7422E93DFB22EC72A4E0461B4103B9BD ; libaacs -0x5B627690102A30842184AEA9AB3697854A522510 = _NONAME_ | V | 0x3E6F9973A5596D10D0F699084449BFED ; libaacs -0x37A8049F3D641AC4B62886CA1F6F4604EE9C28DC = _NONAME_ | V | 0xA93D82B3B8E5BCA0301712C82B66BC4A ; libaacs -0x7C0C7F4C6CB4104E0DAB7FCE199FE600A1F23718 = _NONAME_ | V | 0x0E4E5E709393B56EA4B0C128DED174AB ; libaacs -0xBD1A3B70D88A1598A7163A019E00FF7632BB0A3E = _NONAME_ | V | 0x625FE2CD9C3EF4F9FB226666397C8CBA ; libaacs -0x5A420C3BAB78C0A5CC834EBC8AB9CA7F5C405810 = _NONAME_ | V | 0x993100A9ABA56C3173FC5C1FA891F052 ; libaacs -0x777BC5D35631365D7A3037B3ADC6ED796C720339 = _NONAME_ | V | 0xA98357D1F58A7728CCE5F742B2F553DB ; libaacs -0xA0647B3B274440A593835DB95BFC8BE32699040A = _NONAME_ | V | 0x8E690C312D042EA6DB8E748617E93A88 ; libaacs -0x0266ABED6614CCFD69C59F14C82DF19C4EEABB01 = _NONAME_ | V | 0x340ECC542752C3D7A7C3B41CC2A75E78 ; libaacs -0xE5D8F54EF70F107DC55047AD61DD3EB2BC0F0627 = _NONAME_ | V | 0xB7364E799FD446D2B7F6D21182E88C6D ; libaacs -0xF86342A9F791AF6D4755686994D48B4255589FA8 = _NONAME_ | V | 0xE67B0DEE086B6F6E0B642210FFD73436 ; libaacs -0x2EF8A06F2F6F57939CEA5C85B532965F047610A0 = _NONAME_ | V | 0xBDFDBA84584B323A4B395840F4247A38 ; libaacs -0x5A185B2C5F38108F5FA482114ADF41C78A89B43D = _NONAME_ | V | 0xE50E6DE293936CDD3A6DD281050F8A8E ; libaacs -0x5D04ADB75461151E1DE1CD22B5B24AD41F9F2515 = _NONAME_ | V | 0x474A21788B5D7DFC67D1B0A551616E4D ; libaacs -0x5EE4170F830D013F81418DEB87DD57389951345C = _NONAME_ | V | 0xD3ACEFD8317C59D633BA7E7D43B78854 ; libaacs -0xA78FB5E87E3AEFD71736D3285892D8655AEE9DFC = _NONAME_ | V | 0x36D244E0B260C533A881A3290FAAEBA1 ; libaacs -0x8A92E114058FD140096A05B4905D998D39A6CA1E = _NONAME_ | V | 0xF5B50C1CECC686B3107DB97C1E07B535 ; libaacs -0xDDCE9AB4E0AEF16CACEDC9BFD5FA03494D6C91E1 = _NONAME_ | V | 0xAA43851D55D09833F54A217B028BBC07 ; libaacs -0x1861BEAE60D93954E0312151D178E69581CEA133 = _NONAME_ | V | 0x0B4337EFDF73560FD7739502069CB3AF ; libaacs -0x6A807AC6EAC2F28A36B911D988C98D9AF49E2E38 = _NONAME_ | V | 0x37EF9BBC2F571AB75A0160A0CFA0E35D ; libaacs -0x47960E044024EC583013A3203899F7F22E6E7D78 = _NONAME_ | V | 0xFDD5CEB1FCF03248F66A8C6EF0879660 ; libaacs -0x9373611C3BE09182749BF17D8F7B8B99716883D7 = _NONAME_ | V | 0x89EF796A5C9E7EFF829F3D761A38B7B2 ; libaacs -0x8D8DE5485F0CB5A875E41BB8C22EB78F19416E71 = _NONAME_ | V | 0x341B99AADF0D8DB0DC7E86DC360752D2 ; libaacs -0xE6CC148902EC3E3F1910176AF5E9133AB003C359 = _NONAME_ | V | 0x56EFBDF415402DA3208D40DA1AFBD996 ; libaacs -0x7A20B59C0041784294AC2AD1C138B1B6510C01B8 = _NONAME_ | V | 0x1DA502343D8A9D4FE8F5B99E1184D9F6 ; libaacs -0x8F2AF5105A599B4C59FCDA10319F0AD9915C1A18 = _NONAME_ | V | 0xDE30CE9ADF807542B602DECD4F069033 ; libaacs -0x1A49C749CD08D40ECAE9CD979F07FE6312B7AE7D = _NONAME_ | V | 0xFA53EC7C7DB509270019FB4C3AB49290 ; libaacs -0xB27E35BB07107C11642D871958CFE3E2C00BE530 = _NONAME_ | V | 0x9D72400B8BBBAFFCCA5AA60D765DE0B7 ; libaacs -0x4D61FEA26ABDCCA12CE9FDAE0481F3D01EE81C03 = _NONAME_ | V | 0xCD66881DA0EB2C06D077D41657308BD2 ; libaacs -0xD663E5A1CDA38F1CC1267A022BEBE841DC1E69E2 = _NONAME_ | V | 0x87925820B5D4859965AA0F71705E1F8D ; libaacs -0xD61923CE0258BC5BD29BAD32BD44D226A63BA585 = _NONAME_ | V | 0x80BBD4895640F5153064DC994CC656D6 ; libaacs -0x4EB1D2209EFCE9B85E0B2E578A386FB6E63997E2 = _NONAME_ | V | 0x55BFCBBC591E10C81907D8C750A010E7 ; libaacs -0x3DDE8D6A13312D77CD42841BC66B50BD445EE803 = _NONAME_ | V | 0xF63A5A6F86FA862FA8F3DE6A8F030963 ; libaacs -0xD6D67492191FC96948DEDBF4294036260F120653 = _NONAME_ | V | 0x4C08C35505B2ED374838D85825F88532 ; libaacs -0x2ACE40A66D760905261E237F1B1DE18DDA91BEDB = _NONAME_ | V | 0x1A36AC45EA7E07DE09317354F3D25FFE ; libaacs -0x060927DB0C00E15B13E4C23CDE7D44AEF375AF4D = _NONAME_ | V | 0x0CBE86A9E8978667F6723EFC4E80C1ED ; libaacs -0x28E5D4EDC8FDA63561CA9D3FEAED26BD6DC4C32A = _NONAME_ | V | 0x8319890D0C489397BA9CB6A0F71103BE ; libaacs -0xD59BEF6B56D4CA846AF24396009F0C62FA9C9A02 = _NONAME_ | V | 0x05C289C50754CC207A72BC4F5CE905CA ; libaacs -0x71D8E57FEF2CB9CDE9F102BEE669B307C3B3FCFE = _NONAME_ | V | 0xA84F04AC92A4175829AF751AFCAD529E ; libaacs -0xDCC848FD721D7D6E2112BDAC42097A0D028ED162 = _NONAME_ | V | 0x7515EB01912AFC529930A528239830A7 ; libaacs -0x0F7A6AE83CD70C3C9472EB1B3467890DBA736890 = _NONAME_ | V | 0xB5C422ABDDF717F57AA4075DBB585A5D ; libaacs -0x5A6B051C228173A2E91F1ABF2D366FAF5A659F9C = _NONAME_ | V | 0x361823859268498900F0D93039E0F8E9 ; libaacs -0x8121526F38BA72F78731F2DD34ACEE5B0050A2FF = _NONAME_ | V | 0x8B2DA1E64A151DF86B59F09DFF3E55CB ; libaacs -0xF0FDC0AF0E437550FF5BF17F2D609B3FCBE8F0A0 = _NONAME_ | V | 0x2D22489B242F3D53C752C1FBF7E5A297 ; libaacs -0x5727E4487AB35F03C6C4ECA8E090F2AB463F6C2E = _NONAME_ | V | 0x300CA493086BBBB06751D9FBC3D6D2FF ; libaacs -0xD17D30DD5D9930C81309385BC659E0555CF77A7C = _NONAME_ | V | 0xC92082AE8857C31B48C243868220353D ; libaacs -0x00D57279338018E5B087A9B527C622ABFCB23F85 = _NONAME_ | V | 0x13F1EB708E4CE9275A992FDC76D38A0C ; libaacs -0x10913F2FB0F13A01BB166DA934DE7A070104812F = _NONAME_ | V | 0x72E83B773A35BB8B6646CAA92963B36B ; libaacs -0x0790F303F05AECA5CBF5B0DDAC5C765B88D6E239 = _NONAME_ | V | 0x1381AE8FCE2D1D7BEF03033F70BD69D7 ; libaacs -0x193A6651FC34284357D4C8F3ECC87487E1CF296E = _NONAME_ | V | 0xCE505C2678033B9EA593259D5F727911 ; libaacs -0xAA33882A6CE8393F9B62665E09AC186C39416734 = _NONAME_ | V | 0x31915C9BC738F21453A054A2095C9BF0 ; libaacs -0xAC1897DEAC9E7140B9733361B080C0886A14ADB5 = _NONAME_ | V | 0x623C7861BDC26E0F72B4085E00D736DE ; libaacs -0xAB97403562C5FD400605A0644A1596F5BB0D7BA3 = _NONAME_ | V | 0x6EC1E823206639C1C4004CF71508686A ; libaacs -0xA66C5056652A9A335088565C25D25C19BC090E2D = _NONAME_ | V | 0xF422EF219A96323DCCA94752222E4EEE ; libaacs -0x19B59480285E5E25232C11E686AD514885489B55 = _NONAME_ | V | 0xE93F0B4EF066D4B067A64285CB5E393D ; libaacs -0x0CA894EFB46C3F8FD5DC2CBFD4698CEADEA47476 = _NONAME_ | V | 0x63E120D5F4B73C6E7B0D9BD6F0836A4A ; libaacs -0x1076A39B2151489A77CCBC10E060FDDBB962F16D = _NONAME_ | V | 0x2BE651FF99AB243E5B2FC7801F889767 ; libaacs -0x1320968CFE1B5A168BF075FF90785F2F546DFF1E = _NONAME_ | V | 0xACD8B2BEF6FED9FFA086F7AB34242CD4 ; libaacs -0x16872EE06C6A22E0E05A1E33D585F321A57B943B = _NONAME_ | V | 0xAA8B65640E88023C825AB195F40F0214 ; libaacs -0x2CA9D29F4D512C471A53D5E827022A5151F1B280 = _NONAME_ | V | 0x7B067ED06BDFCA1AA067EBA990FBBC57 ; libaacs -0x46BAF46EFF1F09CF8F7AB5EAA4FC4A76A781DB9D = _NONAME_ | V | 0x03391642C2EB22C0A7F153469697F77C ; libaacs -0x63B7B99A6E313AD7B7AB65CF4CB52A23ECA3C71C = _NONAME_ | V | 0xE9B423C30F3B39800C98F96D61DEDA27 ; libaacs -0xBD82F8DF42171275237B68DED764A7767AAE9BEE = _NONAME_ | V | 0xDDFB20C716205B0EC39CECA0B4747F26 ; libaacs -0xC5F2A258E8DA4E1A12A8A6F04D856E58BAB8AFA0 = _NONAME_ | V | 0xABABC514713C08A61F111597ABA85F09 ; libaacs -0xC8071C21BF64162594D732DFA48D18A7667354B5 = _NONAME_ | V | 0x32DE4CFC4E2253E157C3CE33143908C5 ; libaacs -0xF3C09861142D41FCC68A7882434CA6808BBAE72E = _NONAME_ | V | 0xDC30996CF93473E78AAD37FD7C8CBCCB ; libaacs -0x482CEC16094C0ED7B3F6365CA1999937F4C87FE2 = _NONAME_ | V | 0x2C30A7590B622D33A8391B240EA0B84C ; libaacs -0x198BD8305945DB548843563E516EB9A4BD6D40DB = _NONAME_ | V | 0x135574361B0773D9EA76EB8F73B100FB ; libaacs -0xAC0C539086C729F158E3AA781173A40385A45E30 = _NONAME_ | V | 0x7DF0E29680125C48AE6D2A799713E3FE ; libaacs -0x1AFD15718D4E15CF982EA3B8731205724FA96DEF = _NONAME_ | V | 0x25F989761D13322F7739EF526A5FF7FA ; libaacs -0x59778D655E168449B0F21199942641CD0F0F7235 = _NONAME_ | V | 0x1CBAC09FC88C797C1505781FB8672479 ; libaacs -0x27247A58A671DE5E1C6FD0DEFB319DCA43EB3593 = _NONAME_ | V | 0x0EAB466ABFB4287F92AC50B4DB836039 ; libaacs -0xE65C287B83EA2225A1A7FA252B4F49C29A5E63BF = _NONAME_ | V | 0x3DA91726DB5DA60F3177C8AB5D99F21E ; libaacs -0x197F144D700D74D65D66467B0E8139099CC1DAF5 = _NONAME_ | V | 0x062B609D49E0F12ECA8D272CD8D83499 ; libaacs -0x9D9375971890825812243F95BC07B30E89691F0D = _NONAME_ | V | 0x43F2F3DD5703ABF90974E7EC8E042755 ; libaacs -0xA7F24E42ED6864C4066D2B13CF10DB55BA92D8D5 = _NONAME_ | V | 0x38A8E604E94B60031E5E6FFDE56A2ACB ; libaacs -0xDA4969B4B6190098FC59A24C505947DF29DAE7DB = _NONAME_ | V | 0xA19A89E0B067965615850A3A19200605 ; libaacs -0x66BCE1E6E1BD89C34BB9C732EF8E528A83EF5F22 = _NONAME_ | V | 0xF9394607F16C13497D4A638907B718FB ; libaacs -0xA3B125D0C90942ADA93E46FA13D182879C8AB0B9 = _NONAME_ | V | 0x5B747FCEC531D7334BC85E5360F553AC ; libaacs -0x2492B370AA17661FC01030D964FE48FB923EE768 = _NONAME_ | V | 0x6B1F1C1E2522EFC82974FC787DE92FB8 ; libaacs -0x66E5520C0181E8F1D4F1E3A004F5A9411469B5CB = _NONAME_ | V | 0x4CB96035746A4B8C4695A16305F8CEF6 ; libaacs -0x8C262F2A25753A7AFDEEB8164010BE620D3FD9F6 = _NONAME_ | V | 0x180A680804379363457A38F1F4B742BE ; libaacs -0xA02C8CFDCEC8B574BC6B9614484A7946F74D4EEC = _NONAME_ | V | 0x1443CF2ED7AE0506EE48D9B6B8CD3F31 ; libaacs -0x14F8C557D125438043F25CDAEAFA96D5B7698C09 = _NONAME_ | V | 0x7F64B34E901186D8291EFA64C3C5B474 ; libaacs -0x7BFCA8A4160E139C79D269F0B7FC6DB151777398 = _NONAME_ | V | 0x6964B8A069E01ED9D89EBBE01E5FE8A0 ; libaacs -0x54D1D38072CD572EB1D90E4A391497BAAE7B142E = _NONAME_ | V | 0x4C47E433F7D525D1BDC1A6FB0F215946 ; libaacs -0x2D7A9396515842951D993BEDDB099A28CC164B78 = _NONAME_ | V | 0x27ABCC820ED0FA72AE521827FF3552F8 ; libaacs -0x7483E8EBB982D29B321E1A5838CEA73D9839FFB6 = _NONAME_ | V | 0x31E9AD0BEF7BA916EBEB25C4F6B63FEF ; libaacs -0xCD694A818CE6B4B478BA26D25DE33433B37C9179 = _NONAME_ | V | 0xF6891AE7DA299A138EE9CE2F5DAB92BB ; libaacs -0xBDBEA6FBB7E76050408632926CC6A88FD6D43071 = _NONAME_ | V | 0xC0C44E19529B60403BCE9F7EDA80F216 ; libaacs -0x844BA4D71B23A497E3A328A2CD6FE0E2220CEC9A = _NONAME_ | V | 0x1C31185E8D12D1415B8A3BD051234D7F ; libaacs -0xB1734D49D671FC3AF419DFE225B83E934667B797 = _NONAME_ | V | 0x3D1EB778CAB5CDD6CA500D2E0923DCDE ; libaacs -0x16C4DE0FDE150514EE9B76830807DA808ACBBA5F = _NONAME_ | V | 0xF31E42DDDCA71547BC0B81A8ABBBE07F ; libaacs -0xF7C964206D2CCE1DBC8662C4A4E4919DA3A1D686 = _NONAME_ | V | 0xF5812F09CE4D246EF8639D8D1085F6D6 ; libaacs -0xCD6C30B864628392E861A837816311F68A9219B8 = _NONAME_ | V | 0x6A706BBE5638B0C881F2EEBB750F2B5B ; libaacs -0xEAAF7A65E4938AE083422893C43D50A168834881 = _NONAME_ | V | 0x364DE75E8A33C0CDE45ACE1CC3EFFD3A ; libaacs -0x8CD7CAD05B3C9A3D71A3FF0F3FD8F3EF4BBB8059 = _NONAME_ | V | 0x0F5F19871E07B41426D2ADB60C0576C4 ; libaacs -0xBCF05974DC2E80E2A5283AAE9552EDBF21E2DE12 = _NONAME_ | V | 0x04CE2C8CF3866CCFA3622D892A646E9C ; libaacs -0x45CDC12958DE41F02F557B5BA5080A5A2418C3D3 = _NONAME_ | V | 0xE1F55FD10674CACFEE8D0460AEA610BF ; libaacs -0x598AA2AA219EC3EADB0D9FD5A087EA44978EA222 = _NONAME_ | V | 0x078FDA6945E0B2883D011AD82B32DAD6 ; libaacs -0xE07AE70828B606195E12E94016061404ACF0936C = _NONAME_ | V | 0xFD09AB4F26157E229C4CF11FC05B5655 ; libaacs -0x665DB207125B579A477993F7CA81EBFF2D2AB853 = _NONAME_ | V | 0x2752FA4C2BC14F0D4431E1C2203CD2E8 ; libaacs -0x87F5380DC0089AE83B4DD35B57CADFA1AD206349 = _NONAME_ | V | 0x3E8B2CD4CD630337675F2157EF3618F3 ; libaacs -0x7BD30FD1C2C52BFC2D28C92A8D5B39B41B93DB99 = _NONAME_ | V | 0x3731253AB891226851FB2B9FA7BA23AB ; libaacs -0x1A028C9FA4842CF5577E9C382C50B062E96DB4BB = _NONAME_ | V | 0xB02B0B4676E7B2186B42DE16BF74DE51 ; libaacs -0x2B099718A255792E82F14DAB3A54773026524491 = _NONAME_ | V | 0x1EACDA92F557162F78E9B0F8C4179090 ; libaacs -0x46EAE6661B39549A09C7B2F64891FED974F85EA6 = _NONAME_ | V | 0xB9B83DA7D21E33D934A95D01EF77E7B6 ; libaacs -0x8798295A366E269AFB8450B8B3DD2CA0DC8476F4 = _NONAME_ | V | 0x5274DECB7E2CB028BD9A66E9EBDC1D06 ; libaacs -0xBFB30A02B5311D9920A9EF3FBC34ABA99C5E561B = _NONAME_ | V | 0xF62F460E444EFCEDF785241CF918DB5D ; libaacs -0xC6B25C9AAF144492BFF575E6751CBD6096FBD253 = _NONAME_ | V | 0x7D382D4317695C86F20951A954901BC2 ; libaacs -0x5602938E66374F33C07DF5AF264C032251FF8F37 = _NONAME_ | V | 0xE9092EDA593A8E10EB129F6C99C48A5B ; libaacs -0x89A604CB377FF326B692C23463220BA5BE7E2C78 = _NONAME_ | V | 0x94F6A16C62F0283720DA930F1A482A54 ; libaacs -0xB3AF6BD29515724DA835D3C4ADB73C8B257D3699 = _NONAME_ | V | 0x6EE654B92F78A86A00652D7CE762D8F5 ; libaacs -0x847CA88A78A7C77C79DB00519A08FCB544612AD1 = _NONAME_ | V | 0xFA088D9E9C6627D478A1BA1B2DC32F0E ; libaacs -0xAAE6BB2586ECF5B9D921A5E661FC86564594F959 = _NONAME_ | V | 0x6C93193F5438B60736B412088022DDCD ; libaacs -0x0131867AF91A0F12E0D9B432E8A7F4E19BEA94C8 = _NONAME_ | V | 0xC4C1EF1BC1B783FB4AF4DE182A0D1C90 ; libaacs -0x03CF6D53B74C6FB8A961D16EBE1E7DE2794D5B4B = _NONAME_ | V | 0x54F7A0564E38F78F37E9C085D283292B ; libaacs -0x762AF31B97CE08AD84C806F2D6648CA73C6BF799 = _NONAME_ | V | 0x4B53AB4F1634813F35C7DE586E8196CC ; libaacs -0x68618BC3673377FCD703A0C410064DD02C51CFF6 = _NONAME_ | V | 0xD485D08A0B10FA7020572273E447FDBF ; libaacs -0x8A1CCCB7D1B7AE12B93AAD07AEE8584D1D9CD152 = _NONAME_ | V | 0x84931CAADEB9FBB151BA09AD7268A1E5 ; libaacs -0xC86F76761CEB76117D0184525FEE869873AF0AF3 = _NONAME_ | V | 0xF111122E2B0EFD0D45BE95D9B8013A7D ; libaacs -0xA16A6AFA754AAD4421769DE929770C8B05F3C74D = _NONAME_ | V | 0x0D52220EC3D1BB5DF39FFAE0BCF99C85 ; libaacs -0x73A695BED8BC24F282C14EAF8045110E7EB36F49 = _NONAME_ | V | 0x9A67A1BA82B5BB5C6BF528E34051D578 ; libaacs -0x733C51A296BEFDDFEE8CBD10F44066EB05833772 = _NONAME_ | V | 0xE69D323F08B66388A79EDE4CAFA3C819 ; libaacs -0xC637B91154D263711D524E4BF2C705EA394E3EC7 = _NONAME_ | V | 0x99E5B5A674030FCB17C3F8190955CFE5 ; libaacs -0x8393CF3258B2B2C7767CE76A7BBBB7BB69141B52 = _NONAME_ | V | 0xEDC36BF05A97E97F68241757F4E5B8AF ; libaacs -0x2EA64098F0521E98F36F65039DF2123FA07AC6E9 = _NONAME_ | V | 0x2F539940DEDF920809E525C1E9C9F087 ; libaacs -0x474D10C4FB12F238C494626A83C0513733FDFCF0 = _NONAME_ | V | 0xE45D1F84F7B1406176F14AF866880D31 ; libaacs -0x73C3D19B860700914E61370DDB189E57E3F6B899 = _NONAME_ | V | 0xA97803EA602CA51F515B7A552AB7E00D ; libaacs -0x954789F8BB82ADE43ED088BF8F95910ED28EB626 = _NONAME_ | V | 0xC885D79DC605334B1A5DCD6CF119CE74 ; libaacs -0xF720098B9565965B4190779343D1D5BC888FDD4F = _NONAME_ | V | 0xC1994E026FCC292DC301C545DFB94241 ; libaacs -0x3E3DCED4D081593854D23EEDA100A7059C343EA8 = _NONAME_ | V | 0x25ACFDF23568E260ED4B12A40F3871CB ; libaacs -0x7F0BAA9E61FF128564637AA2864CB829F9E24298 = _NONAME_ | V | 0x4D0520FCC91CC17F60824C6E14DB54BF ; libaacs -0xA5F7FF85CFA57DCDBFBF1A1797EE87D6D54542A8 = _NONAME_ | V | 0xD97C93CD1A7A7EBDF623D64C89BFBFAA ; libaacs -0xAA30E3624DC6D363332C3D41CC3E335F7A49C42C = _NONAME_ | V | 0x6C664C94E791416309783143A2C9DEE5 ; libaacs -0x20A299DD87DBB4BA7FEDE7E542ED5F65D82D826A = _NONAME_ | V | 0x0E00ACA35240EE1612A5AF1BA876C4CB ; libaacs -0x934376CB53DA2319371228733C375DFEA68937D8 = _NONAME_ | V | 0x9B373064C60B76C178E839E507ECE0BB ; libaacs -0xACF69E0C1A25DE76CA1358B4BB0958C66F0EB33B = _NONAME_ | V | 0x0FD9E55255308CCE3421D51C0B5F2838 ; libaacs -0xC0F7257AD804A36AC5E1890DC4C49CA0405275F9 = _NONAME_ | V | 0x6B183C1016AC54D157624F28243ABDB1 ; libaacs -0xB9931786ACDEB012283FE36E2EAE7639985D7507 = _NONAME_ | V | 0x4D624109F1FC4421DF9B45593F7B7F14 ; libaacs -0x8043AAF6B1259AB8ABF8B86B12B962F533F589FF = _NONAME_ | V | 0x8432D26CAEDD34EBA5253621EF071A8B ; libaacs -0xAF8B7FBB57CA5CE6F2A5A4F3F2C84FF25457F346 = _NONAME_ | V | 0x1E8A999048A1B3BB8D0FB8627C7D2344 ; libaacs -0x72A8583A86C9681B6DB8FE792BA923813283FF62 = _NONAME_ | V | 0x26967922E0547C696A67454DE856D391 ; libaacs -0x728A1FA073D395CFEEA73AB7C6C00917A4F62171 = _NONAME_ | V | 0x38FA9EFDFBA84D472316F01C4B058CB7 ; libaacs -0x1B3FC464EC69558CBD73CC1BEBA8AD585FD7B3E6 = _NONAME_ | V | 0xF156F173AAF7DC256D0A9E8A1DC6CFF9 ; libaacs -0x2AC8F48FFC3D3A0251C5D66BC46AC9B4BE687F71 = _NONAME_ | V | 0xBF7B0815528369F47D68ACD44277A71A ; libaacs -0x9496D84C27E32EF429A222F4644632F38F3F10C9 = _NONAME_ | V | 0xAB2BEC5F19A528D63FC0568762EE4A9E ; libaacs -0xBF8869E3A6F7C9D6985D23FD4661D8CCBB4140BB = _NONAME_ | V | 0x2F2BA1C3A3B771022A09A1A09DB1B8BD ; libaacs -0xA81DD8CDC1D5854CEEA4EA2C0E7AD8EED8602576 = _NONAME_ | V | 0x60C15EDC5FD3EA3AA23FA97D56ADDE14 ; libaacs -0x724509F5EDE34AD2F4DC623FDE0082581CADF766 = _NONAME_ | V | 0x45ABA307442E2026DFB17A515115857D ; libaacs -0x5186D7A752D796A9297F60F4A5AE472555E0D91C = _NONAME_ | V | 0xEFF2E73CC6A2FE6CE3D82B74FC0389C4 ; libaacs -0xDEFD06B8B89A97BAF90A6958A2A63D2E396BD5AA = _NONAME_ | V | 0x5F3C2193CB33534EDB11C71EB621ABFD ; libaacs -0xBF5763ED42716A8DD17401420D780C7C272EEC36 = _NONAME_ | V | 0x5C2F534B6D22A8F766B32E59A5343729 ; libaacs -0x1E3D0A627A599A79F1BB1BF2CCBD1AB242678690 = _NONAME_ | V | 0xC2888F89858C593BB4EE47B9E8FE77DA ; libaacs -0xF1544EE652BCAF5DFFAA43B7F2DFB91722076B5F = _NONAME_ | V | 0xDD2E6C1603B93D4F5F20980CBDFB79FA ; libaacs -0x56BAB7D1CA44C6A2C1085B2F9929907B1E135E54 = _NONAME_ | V | 0xB4A8F517210046800DA2F065375CE672 ; libaacs -0x0B36D9BF49D3C7973995D3E0D4576A762F42AF0D = _NONAME_ | V | 0x31AA8AF8FAB9E673EFFE201CB9A95CE7 ; libaacs -0xEEB228BC9CCD3009EB16A7D0B18A3C891DB3131F = _NONAME_ | V | 0xABE366ABDF11924EE7DF824F596AB4B1 ; libaacs -0xAF4686A4FC6A6EE131C2411E5B39E4D2D0B13DC7 = _NONAME_ | V | 0xAAC94047D81CC5153C1FAB2237BBFE01 ; libaacs -0x2B812CE1F537A91956556CFC2C5CA8325B44C97C = _NONAME_ | V | 0xA79C89BAAC2A9AAF0969C2A056FE3A2A ; libaacs -0x25B58CE23CBD506D52AD068D614DA5A0D47F95E8 = _NONAME_ | V | 0x3788471D2147AC667B72E45658490420 ; libaacs -0x3E0B234BD6EB6E638F5709828C09EFDE169BD7B4 = _NONAME_ | V | 0x21B9325271A059B2D3C2812CDB7E17DA ; libaacs -0x349B9D1DAF0394CD7F1662752B5E2FD59A74DDA3 = _NONAME_ | V | 0x984E61401D39909A83D7C6B48DF89B7C ; libaacs -0x9EE14F495ED5497B46DB7AA134955F4BB503E1DF = _NONAME_ | V | 0x75536644A02E864B0009FAF189DF5493 ; libaacs -0xFD82DD6E876B8C05FA5C9CE189DE92CDA65499F1 = _NONAME_ | V | 0x5833DDCDB5772264A189B7845BF63B04 ; libaacs -0xDDE0FA5489CAD9DC976C0EBC1EB75F679BB50174 = _NONAME_ | V | 0xB64898598A6013FA066147D68E68E011 ; libaacs -0x197F23740750804A391EEAB0B55771811F397A4A = _NONAME_ | V | 0x44E27BE457B8FFDAE9CE3F4FA525E2EA ; libaacs -0xEA7DC7A7B021D1DCF4A6E158172735DF05D056AE = _NONAME_ | V | 0x02B70E8DAE3B026649B7F333AB2AFD5F ; libaacs -0xEA6B982DC31C5716A4087F2D07255232F0E7BB74 = _NONAME_ | V | 0xA677AB9B30F70F932277A763394A06A0 ; libaacs -0x459EBEA3E1E4C8A5C5FDB5FDBA7F1301C5225054 = _NONAME_ | V | 0x23ED02EE508470C52327DBD3FED79815 ; libaacs -0x49E2774FE9DD7D4738A0C1A13EC8B9B853CB0BF1 = _NONAME_ | V | 0x807BE26B09EE34C40D37FA1AECC5AE6B ; libaacs -0x575603A9FFC654EC244A795A9A06B414D25BF315 = _NONAME_ | V | 0x4BC1B77276271FE2CDED0ABD4CF3B012 ; libaacs -0xCE2B7CCC8DFA15FFC27C30528D4D94B538F62D63 = _NONAME_ | V | 0x2ECE421275195E89287FDFCB05370E68 ; libaacs -0x32038E8796D4169AC0620DEE2C2D7974CA8D3186 = _NONAME_ | V | 0x32071387D724E65A33855B6084066EB3 ; libaacs -0x6E8A89F0C6B2A5A184AC0A70521786709221AF29 = _NONAME_ | V | 0xD12A84CF8D7D7F81BC30417815E39CCB ; libaacs -0x8E104C00AAF59E15B82DD4CB4A60332CC59CB257 = _NONAME_ | V | 0xE9AFCD1CF25F00BD0010C3075B5F0AF9 ; libaacs -0xE5E2770EEB2F3A09EAE5DD5C93DED10F595C29E1 = _NONAME_ | V | 0x154B499B3E9ED03DBA59794210035C70 ; libaacs -0xF979EE87796FE8287F79DF5C3DCB3A67EA4DDB79 = _NONAME_ | V | 0x8C34F318F047842FC9D1D881913C1C8F ; libaacs -0x04465FBFA4F03986E9B974246ECE84189E7F3725 = _NONAME_ | V | 0x3569FAB0F8C40FB830FDF2176FE795D7 ; libaacs -0xBE55F67609C38401E5D180C83947D0AB50CBBA29 = _NONAME_ | V | 0x80602EED0C496C7C23A971790C83C163 ; libaacs -0x695F23563DE5B14E0361B04FFA19E74BACE0E7AE = _NONAME_ | V | 0xD8BF04259A63DA60EF38EDFD8F18D49A ; libaacs -0x54ECDF2EFB8A9562E6B0329E4C92358223D50CE3 = _NONAME_ | V | 0x65BCF7F8F02F9EFAF51C5AEABB34A635 ; libaacs -0x56D9A54B92F4A3E4E7EE9F841F665AE373CCDA12 = _NONAME_ | V | 0x75672E364F98536F482A6EC8D844AD40 ; libaacs -0x01BD33812B4AF2E06D1029F14B1ADC073FE27448 = _NONAME_ | V | 0x72828A9567902D6145725A2D4310AB3A ; libaacs -0x7352FAAE9AF110F0B53DAC821CA233C48D80922C = _NONAME_ | V | 0xCB6C43A01CBAD5787175DEB7029AD55C ; libaacs -0xB99C4A4A5279DFB5780D284FC301F09602C6F409 = _NONAME_ | V | 0x6573286CD320D2256F1931F9476C806D ; libaacs -0xDF04F5CC71E2C7AF3B6D616AC1B278803557667C = _NONAME_ | V | 0x814AB3AEF35C88B6AFA70B2F03A2A876 ; libaacs -0x7FCFE2B8A42E7629358EBF17B6EEF444F7DD410D = _NONAME_ | V | 0x83D385511CC961827D1A02EFC7E1452F ; libaacs -0x4CBE57FC7EBDE30100E542C417C6DE2778730A9E = _NONAME_ | V | 0x8E36035748C4B3E21F65CBC16CB1F966 ; libaacs -0xAFD153C437B3E66D7A56B7026A8A09D1A1333DDA = _NONAME_ | V | 0xA91C5F989F7CCA3AB6F0BCF18AC8BA81 ; libaacs -0x97FE4F41723C65C6F7FC3AEFDA78CB0C593AFD3A = _NONAME_ | V | 0x7B3A967C1B243761050AF5D492C8F94F ; libaacs -0xA0307EA608281F805D3A1F60E102FE32C6BBA738 = _NONAME_ | V | 0xFE736C0AB851AAD52AF903598DA00630 ; libaacs -0x0BDB54DB25473F76BFDB084B9B000F23A703D330 = _NONAME_ | V | 0x4265C567E8D823BB96777B3429036C6E ; libaacs -0x7503DCA198EC47D78E7F19558ECB0E049FC67037 = _NONAME_ | V | 0x588097E9DA12ADED762D4529173F3454 ; libaacs -0xD039DF9C6660CFB9D358D3F43B477441CD112FDF = _NONAME_ | V | 0x8FE331BDE332A86B5C23C6FEC9ED0492 ; libaacs -0x353583428F0FEC37DB5E44E78C043479A13E43DE = _NONAME_ | V | 0x6ECBD9040BA93E2E304F9286545CEF2A ; libaacs -0x3CC946EA38DA2D74D6EA9F14B5DABDA2F3FC43AA = _NONAME_ | V | 0x004A5D9E75AF0B15A9A30F0CD0E52EE0 ; libaacs -0xF3B2DFC439B1C60F45081158270B30EA402DCF23 = _NONAME_ | V | 0xD32B87FD603AFE7FB840F40306C334B9 ; libaacs -0xDE87CB4CC684B67246BCE27CD508D9848BA13221 = _NONAME_ | V | 0x47AD8059D0CEF6D9ED306FE5700D15B1 ; libaacs -0x61AC3DC78C17892E4569DFB3498AAC575F698DC3 = _NONAME_ | V | 0x29884D023E5AA5D72F5E7B1D6BFE0352 ; libaacs -0x0D5E2903C742CA1AAACE8E4D868F6ECC113AF470 = _NONAME_ | V | 0x3D2AAA369BFB99A087A5FD8E720D6543 ; libaacs -0x5F76E944DB0DF80AD567ECD8A6F89740A0B2C8EB = _NONAME_ | V | 0xD49F13AE027C06E76AA2E6AAD9EE5D62 ; libaacs -0x6C1CD6794703CDBED908C70C81E0F26D21079161 = _NONAME_ | V | 0xB35335C2C014D6556C1DE47BA786D55B ; libaacs -0xEAA750F7014205B7C070018B9B05BE18209B96ED = _NONAME_ | V | 0x9964C75594768A3D62FD19CD4223EFE3 ; libaacs -0x3E041968030644F27C1E80496F4E7216B41ADDD8 = _NONAME_ | V | 0xB3DE49D5CF1E6DA2B703C6278CA2E279 ; libaacs -0x81A43F6CB8992C208C0CA39CFECE4A6CEA884E3E = _NONAME_ | V | 0xCAB174684F39BE8816144DE7EF739AD7 ; libaacs -0x095C04BBA0FDB74B9AA4FCAC85D97CCD47A8CB95 = _NONAME_ | V | 0x54510705D081D43061A4A3E5E6409928 ; libaacs -0x021B42646323A1BE9C8F87FA4C252022717999ED = _NONAME_ | V | 0xBA7A4D1F69D29428EA9AA36C7519B838 ; libaacs -0x3B759CE14C98AF507506F726F9BA12E356809FF5 = _NONAME_ | V | 0x17DEB0C5933B76CE652D3ACED3504DF1 ; libaacs -0x461F7227AF1151A3F1A1ACA07EAE241EBF225BDA = _NONAME_ | V | 0x4A2B6C0D5A5219F00AF9B1EA7D3B6D80 ; libaacs -0xCD8108324A7582B12BC2EBAA8CBE9DC9F3A4F2E6 = _NONAME_ | V | 0x503FDB4DDA5C9DCE91AF81442619F6C3 ; libaacs -0xC4FAAC7218C1DEC12B4608AEDB7465E0BB1D97DB = _NONAME_ | V | 0x1B60BA9080F91F90FB55F0C997FB3E99 ; libaacs -0x984A3717CE395C056BF92A76545414E3F092E0A2 = _NONAME_ | V | 0x1CAAC43B80197BFC851E0FDD7CF26155 ; libaacs -0x7C0D0A114D2220F6F6BE529EC11D828415DA2A7E = _NONAME_ | V | 0x5FEE8E9A01C27656747AB02C6E94FE8F ; libaacs -0xAA0ED3075F288CEF2089B2C881A198134683AF3D = _NONAME_ | V | 0x1F3E0D80F61B8E101476F9637C677CCE ; libaacs -0x78B125A8BEEAA3BE9EED743C4953EBF716DE8B14 = _NONAME_ | V | 0xFD81DED3335FB533D9C34F8E0388EF57 ; libaacs -0x1B69B5AD75E5D23F35B2BAECFBB22878C397474B = _NONAME_ | V | 0x5911771FD1FB21CA00DC7F8CA8BAB310 ; libaacs -0x9131984E839B24318FE532F1C07B6D183CAF4EE0 = _NONAME_ | V | 0x24A1A9CEF4C49BCC8353A09A0CD5678E ; libaacs -0x7D6BCCE21D77C5C24C452288DBF3F235471262D8 = _NONAME_ | V | 0x53DE49A6E62D51A20F8ADA468B1747E2 ; libaacs -0x95A542D3AC034E0CB6A026AB96504A06E34EB2B7 = _NONAME_ | V | 0xAA4936F7ECF5F703AE075B6F13FF9FD6 ; libaacs -0x1E28C8CD88C70B195CEE91FD188B423CD97AE0DF = _NONAME_ | V | 0xBC52CB8AACA2EBC70911F03C8CED2E12 ; libaacs -0x1B631E0C5419E03D440D0A48058F418ABA5B7544 = _NONAME_ | V | 0x88626C7D93351A23DEE9A835D360491B ; libaacs -0xE253B0863D52B220123817E6797EF4BF9BB0A215 = _NONAME_ | V | 0xBBFE96E3EDA3D832406D21B617E8DDEB ; libaacs -0xF90AAD24598D9600A089471CA49F25DBDD657E9B = _NONAME_ | V | 0x80B19E58996BB13079BBD856E362595C ; libaacs -0xE983455C0F9BC0C5C0CDBF49914296AB62056EEC = _NONAME_ | V | 0x26D5A679637FF312F734B0EF5DE36E7B ; libaacs -0xE6F8AD7C9DFE6DB412014B357C9BD527BDFD4E13 = _NONAME_ | V | 0xDD0B4D4553E05E241C3336236D1F2F5A -0xA3684A438216A8047E9FD2B9432EB576F9CD555C = _NONAME_ | V | 0xBA3E61D8BBCDEF7E8DA0285A2CA82527 ; libaacs -0x61C09631877DAD3D76AF37D04F698FFE225EE299 = _NONAME_ | V | 0x55EF37632DA538BF6AA7E7376D00425C ; libaacs -0x13C59BB052678EC635396F8D5F9852C32563E17D = _NONAME_ | V | 0x5723FD0C4887B92E1EA04D1614E913F5 ; libaacs -0xA1A42A140C81B95555450F4C94CDFF661A6F7064 = _NONAME_ | V | 0x9040209287120B1F3C9F8C5C8A5E2103 ; libaacs -0xA44067C713C683CEFA2A4C505F0C71A0561134B3 = _NONAME_ | V | 0x5088B8D54777BA7C4705429206E5774A ; libaacs -0x7E559963682CBB563B6AAC4C4317E0BECED79CAB = _NONAME_ | V | 0xBC66796D02FE35E722227682954046E9 ; libaacs -0xB731A8DCE43F85DCC0EBB2E72367B193570EB864 = _NONAME_ | V | 0x5CF6388D4027ECF1E6BC013709AE1774 ; libaacs -0x06D7E8AE4B976A8C3FEF588421366A94F50B1A49 = _NONAME_ | V | 0xA95C8C9DFEEEAEFE2FD0697D86DC9B8E ; libaacs -0xCD2498774811984BC5E952AA12680178D834287D = _NONAME_ | V | 0x067274BA0670C4E09658F9A58E961AA7 ; libaacs -0x18414BD9D4786704C820ACA5725E83C3EABA77E8 = _NONAME_ | V | 0x4E4CA731E972A1230BB5E97E44566008 ; libaacs -0x185D5A80ED4F515B484331BD06DA72BB235ED839 = _NONAME_ | V | 0x36CB4592F781372FF388ACEC0994EADE ; libaacs -0xE12F09700AAFB166C77BDC8160226D7534842D81 = _NONAME_ | V | 0x65D2ED62139B274777557AB07502F519 ; libaacs -0xA424FB297D9A5713E86044EFBC2A5B2B88C52637 = _NONAME_ | V | 0x83C66894388FAAC83DDE44B5D24A37AB ; libaacs -0xC55F34FB11884A0D520238721CC8A3627D5284B6 = _NONAME_ | V | 0x8E19C73F0259217DFB979605BD5CD33F ; libaacs -0x4BAEF4BD9EE0944C615B2C0BB54C5BE989A13312 = _NONAME_ | V | 0x9913C5A4982CD6C0AD723D5C09474CF8 ; libaacs -0xEB0BCD115F9043E506271B559FEA15A6F0D24E13 = _NONAME_ | V | 0xF1BDD1C27A0451F74F2D12C5AB46B530 ; libaacs -0x1BA2717594B5BA2DD47A0BFE3C2CB5C96062DCB2 = _NONAME_ | V | 0x3AC9BC7ADCA31F27BD350D00467AA06C ; libaacs -0x95DBCD411765B0331A958327C918DED73B00386B = _NONAME_ | V | 0xA82EF90ED200A412D26C1C9014525CA0 ; libaacs -0xB0E125B9D189241B1B18795F4AC355A04065FBDB = _NONAME_ | V | 0xC5F9EC6068D4F444FCA34071B9772935 ; libaacs -0x2610C39CDE713B40F6C6385613149B93EBC3EBE5 = _NONAME_ | V | 0xBC9E9458744E8CFE355636A0FA322AB7 ; libaacs -0xE585544110113911E3F66D067DDBCD763D29BA91 = _NONAME_ | V | 0x2667B19CB3610244DF83EAE03DB470E8 ; libaacs -0x07EE4FABEC8683CD450A0456C28CFCB7C1CE2D62 = _NONAME_ | V | 0xBD77DA3836B51F1758D5EA5DECF1503D ; libaacs -0x92F6E0A728A32279242119F69D0F8C10E50DE12F = _NONAME_ | V | 0x4AC56C7E34B083AE5764E79C76552A4C ; libaacs -0xECAD2D9684BE74424087A819C43B669BED38A943 = _NONAME_ | V | 0x62EB605DD00671D7D4534CF24E16EC00 ; libaacs -0x056852CD037D1FA0DB09870B1662E6B30F855A1B = _NONAME_ | V | 0x4187DB72F28523728792954323ABDD70 ; libaacs -0xE2ADCCDC1B4D9EBB064CB45E4952816CBD0EC4B0 = _NONAME_ | V | 0xCC101BCB799E47E8A11D39670C6C4745 ; libaacs -0xB20C58B116C7C95DB49DED51B70A385BC4FDB588 = _NONAME_ | V | 0x584DC523752C0C1E8E85E1DA737E1755 ; libaacs -0x39017A496DA41BAB5EF03D699A08E4DB69EBE771 = _NONAME_ | V | 0x795A4402662691DA08574285904E0B01 ; libaacs -0xFE1A8E02057FECF243764A6914CC16E59B439754 = _NONAME_ | V | 0xB919A969F9BE7BB92E9198B09E9B3402 ; libaacs -0x2892B5FED3485B79F3328F97B47DC11199F8C625 = _NONAME_ | V | 0x49B2A092EB8F453F9494973A2E25E398 ; libaacs -0x5B71263C71624F3D609BB6A1EF747F0156D1F467 = _NONAME_ | V | 0xC1EA05D69D2EC922003FE3C5499DD330 ; libaacs -0xAF8ADAD061182DCC523E312C2EB870CDA6A1C407 = _NONAME_ | V | 0x789AB815A2FEEB619F4F87412710058F ; libaacs -0xC870B53393ED002035AE74BEC5E6EB5DFB0974BC = _NONAME_ | V | 0xC1C3D99CAE72E849A8D873550526E92E ; libaacs -0x9EE7361172F02E913DB6605726DAB3B975307E35 = _NONAME_ | V | 0xBFF28A49AB561E8BE1183C90FD5DB086 ; libaacs -0x39D28D6E91BF011720F9D93A52C677EE80887C28 = _NONAME_ | V | 0xDF93DB003BE8996E7E8DEFE74F0D50E3 ; libaacs -0x119CB460A6F0DE8BF48D4940AEB6CA3DED58212F = _NONAME_ | V | 0xFC49F426DA0D22B4CF5EEDABEAEED518 ; libaacs -0xE227A7984876C4CDD0818D222F4740848A27ABBC = _NONAME_ | V | 0x4F1294E4B0C3E66DF9F3A45119F756E7 ; libaacs -0x906030304B962A20506AB08FBCA3AA3A2A82676E = _NONAME_ | V | 0xE044BD622DB447F3C3C68BB2520088AF ; libaacs -0xB1DEEC78CD9376C435784111B06FEB86D25F60B1 = _NONAME_ | V | 0x8B2CC0B53FA19F532EAFB5C118F23F36 ; libaacs -0xA98A5EC1F9F3F3A90E43A39AAED1658DBB165AF1 = _NONAME_ | V | 0x057E7D972B8BB97E5775AC900DAD1639 ; libaacs -0xC36DA37AC9E6AC2B8538B3CC959CBB47168C1EAB = _NONAME_ | V | 0x6FEA8ABB62FA2B3D8E312565CFFFEA67 ; libaacs -0xC2005ABD320CED62301317EA9CDEC9B25D94455A = _NONAME_ | V | 0x76B9A9BEF582260FE57A6AB8EB99DF08 ; libaacs -0x51EF44FED16F2AABA00716FD96BF12CB20D196A3 = _NONAME_ | V | 0xD82DD8E70D13AF5A9701FDF98523BF35 ; libaacs -0xF19963EF027CE6D007284617C57E6D4DFEA7C404 = _NONAME_ | V | 0xDAD6637F50663C9A5E8FF11C4BED2CCC ; libaacs -0xBB00B7FEBA8927597C2260D10EA3773940881305 = _NONAME_ | V | 0xF867F4AF9CD8E97D6B319A6CE69ECD3C ; libaacs -0x39B1AE7CBECBC55D537DEEE825AA8CEEB44CA479 = _NONAME_ | V | 0x57956E688034382D9CD5FEE250D7B1A5 ; libaacs -0xF46BFB7142F7F5A05755D8636F8BB3DB4FC5D7C0 = _NONAME_ | V | 0xB0C9AD40F700A02A7C0E35233A08B47E ; libaacs -0xC0FFB381C08FD6174937763C2656245C139A42E8 = _NONAME_ | V | 0x1CB25F8553BC59F014B982F9AF3153D5 ; libaacs -0x2C6B17E6110D18099D918C74B47B02CC9D5045E6 = _NONAME_ | V | 0x37F23CC1085EAF0CC7FCF6682BC9F758 ; libaacs -0x26E60F7B27204FFAB0ACD456F7015E88E0D8915A = _NONAME_ | V | 0x27B89779091A84818C2EFD0040B6D1C3 ; libaacs -0x20B97A3EEF227B6AC72E764F4B97DAF152DF7F50 = _NONAME_ | V | 0xFC32AB7B195AEE2BFC3FCB348871F506 ; libaacs -0x1C9AAE3A6514FEAC63F4150F76FDC209B63FB7CE = _NONAME_ | V | 0xED38C710F6D224D9CE66AA71B6593615 ; libaacs -0x3F51806B9585AD3CC9475DA679582623C43C8597 = _NONAME_ | V | 0x71579C17B3B8FD515E3982B51E76A264 ; libaacs -0xA394480EED3AFFDCCA8EB50927D7286BE8A3AF23 = _NONAME_ | V | 0x5AC20871CEFFCC6C2895550ECC2D3D6D ; libaacs -0x27D9E4AA3BB6FB6CCD6D857E70E7B7A5A0FCF1B9 = _NONAME_ | V | 0xAD7184BA739C58940700A7888AF5963D ; libaacs -0xA77D99E27628B5A1DA7780B3EC2E76CAB6F4F76C = _NONAME_ | V | 0xECCEEF0FEAC2DAE9C3163EE5B014E5E3 ; libaacs -0xBDEBF540E8F2842AEEF020C648532B2F6A723FA7 = _NONAME_ | V | 0xC3C5748A4BCE7F4FF1666697F4C4066F ; libaacs -0xDB47D76142487C98576EF0F1C25242A1759DEE52 = _NONAME_ | V | 0x2DADF1B007445322466D0F14F141FD96 ; libaacs -0x0428B276B4B31A03F05E896F5BCD8251A1B583B0 = _NONAME_ | V | 0xB07A1EB5C63D87697568D34800F22F8E ; libaacs -0xF1278018378D571B7ECA9F2A43CAB37D6C4AD356 = _NONAME_ | V | 0xCFA09508DF8565D7A187600376EAE478 ; libaacs -0x4D258176C1F8FB33BBF7C3A18172A60C4844BC76 = _NONAME_ | V | 0x6F2C78D4B89FC59CCA71C969E7DE72DA ; libaacs -0x9290040E4501315039E05C7A9AF2AF5C843CAAB9 = _NONAME_ | V | 0xB3FF3B739A9CE5EBDB5C38D4394C3042 ; libaacs -0xD952A071E90EE19B4A952771D0A4AB9AFAC35DFC = _NONAME_ | V | 0x924D56B758E17C0D9BDC63511CD15D77 ; libaacs -0xC70557F1B2AAB4C725DC42A499471B5CFA366AD5 = _NONAME_ | V | 0x91CDC48391BF0D5B3CF810FE0022521B ; libaacs -0xB32E194CA558E1F086C1BA41BA7A7899A46E4CB3 = _NONAME_ | V | 0x570C68F458472E91533614D0EFA7E148 ; libaacs -0x062769C6A5E7BA942C8219DE82DDC15D3EA5BA7B = _NONAME_ | V | 0xCD612F84B125AE9A2FDB3A5A4FE3885D ; libaacs -0xC68251557C37C3284FA34463842586DEB5864383 = _NONAME_ | V | 0x6774CDA5A1F0C7C48A63CB3C5E0C722A ; libaacs -0xAE2FC08716DD3192E2DE1B39F44193DB4A85CEE0 = _NONAME_ | V | 0x5841F73AB14F0BB0DCD2F722C4647EDD ; libaacs -0x8329E2956DB2CA07E66A6F9EB78B077CC0B0EFD5 = _NONAME_ | V | 0x610E8357DD69FF1515656625F3FC7F35 ; libaacs -0x7EED5228B1007C6D7E309931DA2E68140B301168 = _NONAME_ | V | 0xE442D3BFBDEC6BA653E326EAF83EA6F1 ; libaacs -0x70100CF39F6F62F6708347C421A8F290EDBA9236 = _NONAME_ | V | 0x4D08E07861AE9946A0C18779C9C3AB12 ; libaacs -0x684F988AB1AE6576862486B8B13F5F2AAB1C1F65 = _NONAME_ | V | 0x85D2F664DF020A4E4FB8A74EEC94A4F6 ; libaacs -0x516C80C4DCB7A6487D32B8216FD9B531B75CF751 = _NONAME_ | V | 0xB16625E68B8480377D2F3E49C61DABAD ; libaacs -0x48B54800AC1E8E53A7E3B8EBE379C2E64BB883D2 = _NONAME_ | V | 0x10C8D34CBACC2CCB1043AEF12B408373 ; libaacs -0xFB4DB4076C2A1BF3A57D6BF7CCCBF0202C06D406 = _NONAME_ | V | 0x46908180E2C5979D3545A88FA99543EF ; libaacs -0x2B04F0049EC70196BCFC2199A047A6E849B84A4F = _NONAME_ | V | 0x8E2A0E59A4FD716E059B8B105AB19189 ; libaacs -0x973A9F41F8820C5D81DCFC92A228586DE700A00F = _NONAME_ | V | 0x5C17828AA98866C74C682503E53C45F7 ; libaacs -0x5EF0B3765F884A3D8CAF57165EC2E6082C753190 = _NONAME_ | V | 0xD70F9A552674CC0B3A961DE4F69369B5 ; libaacs -0xF15629730D0AB9390B5B8B62A0827B76BC5B877E = _NONAME_ | V | 0x64BB9D2F8FECBB5A58712A89E3122C92 ; libaacs -0xA97C2558F7697AA82180A8A2B1351A6C88770818 = _NONAME_ | V | 0xA0529C038956A58C9CB09B568566406A ; libaacs -0x6B0607888E11CD0CC3FADB5431C6BB7449A29D6A = _NONAME_ | V | 0x391820BB18B87A02550479097DCD654F ; libaacs -0x2F6BA6ED6AD10167E9DA3B7D3D86532CD0A6AD12 = _NONAME_ | V | 0x2D08239D5F2A60B8E7BD48E343032EC6 ; libaacs -0x2DF707A87085F5DD5548D97A9018840AFE12DB0E = _NONAME_ | V | 0xF1E47A6F18D3F8025A1CEFCCB93F2B16 ; libaacs -0x37876657E268FD96DE8CC2EDD9099F9D1F665BD4 = _NONAME_ | V | 0x845320CF3D7169F7ABAB6F879595CAD4 ; libaacs -0xF25B14B95C9705614496E9735E5D8B457E41B996 = _NONAME_ | V | 0xDC221EDB8C36EC1D607CBD58B1B8BD0A ; libaacs -0xDADC9FCFE8E211AA4006B36FBCC40C060DD0C20C = _NONAME_ | V | 0x11B3565019BFB8116936E0447EAD5154 ; libaacs -0xD7FC341B3595F178244BACC41890C085BF05B158 = _NONAME_ | V | 0xA37FE1DEFD4D3D53A1DCF17C0EE23108 ; libaacs -0xCD083F13F50F85CB7CE3C99A296327674F875385 = _NONAME_ | V | 0x27803A31C21E3562878DE72F43EA76FF ; libaacs -0xB6EA3C55145371D487402A7D2B298F7521CC4D83 = _NONAME_ | V | 0xE2FD8B1F1686F4E9CBD65026F6DD539D ; libaacs -0xAB7489E02D32D31731B63D6F916689CE04F514AD = _NONAME_ | V | 0x73EDCF0B29F65EF1B2652A50C24688BD ; libaacs -0xC7A30F0A3BDE1B7FDF9F9A42F94F85885CE7FE5B = _NONAME_ | V | 0x765E4FB8B9F91C9714A9B1834241A49E ; libaacs -0x024CFB249C131FCBC29886DAA1F56A6B97FE8809 = _NONAME_ | V | 0xA8EC2208DE7E78A2AB84B290C9E529B7 ; libaacs -0xBC58EA341E40564251DDF84BA2A323B0788E2229 = _NONAME_ | V | 0x422847EAAC8F93F858FF8318959212CE ; libaacs -0x3FD89059955A78DB6E1641B260E14EE3AC42E52A = _NONAME_ | V | 0x2D4FE8865F4A4D434DDE8945CB387E73 ; libaacs -0x4E71901A57EC4417951DA294ADCEC22C0A6570B4 = _NONAME_ | V | 0x11651A7F43F9190300AEA6679364DCF9 ; libaacs -0x376864AFF5A8A303474025594D905516F94A845B = _NONAME_ | V | 0x01DB1E5544B1FB6EBFBFCEAC3677B5D8 ; libaacs -0x3848F8FA5F5E98FC8558E7637A435D04E965E1F3 = _NONAME_ | V | 0x847271075E5ED372F0526E07D656F211 ; libaacs -0xB469949DC94AF8F9ED685C13241DA941C4955624 = _NONAME_ | V | 0xD6D055DE21571EE4E7038FC2940775ED ; libaacs -0x48CD2A0C6A685DF8960EA94709169C4FB5B4FD0C = _NONAME_ | V | 0x06BEA28F0F90D3281B0B449237C7C27F ; libaacs -0x7FAA2793CD27A0FA4EC83F01552ED5DF72069EC6 = _NONAME_ | V | 0x2EA067B3303DB8E3D93AD446B4105409 ; libaacs -0x77449AAB09D81D54FC32AB10068FB794A8B35C0B = _NONAME_ | V | 0x2579A05337B742D6EBBB795824874059 ; libaacs -0x9046CAF72D012800607806A2F4C3FDF0AF7D7FD4 = _NONAME_ | V | 0x5847E48420ADFF19A84EAE02C1487B2D ; libaacs -0xD05617C5C2A96EB7CCF28F4F50345141B058C816 = _NONAME_ | V | 0x43D3719FC4658E2346DF31F2BE166F9C ; libaacs -0x551086B6CF9AD239A21ACF1A875638B97071AFD4 = _NONAME_ | V | 0x756744FB13EBE032ABEF4B26DA9162C3 ; libaacs -0x15354A243664D22E52EE6DA0C7319D850C35C676 = _NONAME_ | V | 0x613023648DA32B6C69F7969B04F0C880 ; libaacs -0xA695ECA7BE3CB5DA6A55A3058DED1E37EEA96940 = _NONAME_ | V | 0xB127DBDFFC34EF05082D1D3E6ADFF87F ; libaacs -0xA0A9464540101062D1322FB41898550F9E8343E4 = _NONAME_ | V | 0x9424BE21AC208CF09EFF9C801C10D125 ; libaacs -0x9F5C6C309378F357E0AD4380E9427024A597A713 = _NONAME_ | V | 0x33D26888A4C87DDE490BD533A4B90005 ; libaacs -0x366F9F583009735C7621378591C738937A81E732 = _NONAME_ | V | 0xED92085B9BAE7D1C4126D9EF2A3ACF41 ; libaacs -0x34D2FF504A824E5ABBCC168E0F9799FB7DC308E7 = _NONAME_ | V | 0x2C97A549038AAB0D2A78B81EE222DB92 ; libaacs -0x2A3B628ACDEE50A30A73DFDE3F054ED5C8FC8F8B = _NONAME_ | V | 0x9F0633C5C1656CE8E2FC3CCEC7384878 ; libaacs -0x26C28FF248758BD63C94AB5C63D9125BC61D7E7F = _NONAME_ | V | 0xAB77B38C6C12733469A1A12651D3B25B ; libaacs -0x26BE7C1F2C8381C96150E83B5FEC129987D15C8C = _NONAME_ | V | 0x57DCCA7DFE1E71029C896AB02441A65B ; libaacs -0x24E83860D575D338694B7F23494F9EA64412B3BA = _NONAME_ | V | 0xE00B8D75F487E381D7F72AD165DDC0E2 ; libaacs -0x1D7EAEAC0111933961074A94AE5E8173A384424B = _NONAME_ | V | 0x0036942B3136499301C8112DFBA0D55C ; libaacs -0x0E959F0986665B207B9DA4003A435096B58B5083 = _NONAME_ | V | 0xFC3B5BB2CBD9DC711A0FE9527C6FF42E ; libaacs -0xBE388413F390FA6C6C740325B1D6CCCA70152790 = _NONAME_ | V | 0x8A433431CCA9F8D19A587922AB62F1CD ; libaacs -0x044651D5AEA282D475E56F62B2FD8D27D42B34BF = _NONAME_ | V | 0x4AF3A4CD063024042500F89A313BE946 ; libaacs -0xB770DD679DA70539B9A6EBB80D62BB2CE973E10F = _NONAME_ | V | 0xFA4779F8A9309B0EBDF5A7FCED61018C ; libaacs -0x1013AAA91E9ED0E5A38F8A7D2E82A7B25118FDE0 = _NONAME_ | V | 0xA9FB420410E7263575212FCFDE90C0BA ; libaacs -0x3C3DC3440E8A9E9BF21B59FCBF7B61B48EB6E77E = _NONAME_ | V | 0xE6497E14C5A5751989BE4F99BD3BB150 ; libaacs -0x3FA8A003BEFF10BB75703807C080808FF3E4F7C1 = _NONAME_ | V | 0x43FF79FFE69DFD5EA62C9648B9D4C1FC ; libaacs -0x49312E8DD598181236AF85234BA10E37B7FB2915 = _NONAME_ | V | 0x3E4F4F8580F1C0AC5C2496529CDE3DE9 ; libaacs -0x99D4A21F7C3ABB6733A8543D8D3FCB35044A4231 = _NONAME_ | V | 0x6DC3E5CA18FB2715114ED4BDC37D2DEB ; libaacs -0x96A05E2410428998E1DA4F218D1BE670AB2D9AC9 = _NONAME_ | V | 0xE42B2137635DAEAB5B043C5A856C603B ; libaacs -0x80B077518FF4016ABD2E9BCD1A15CEB39A48935E = _NONAME_ | V | 0x4A4260095E06CF6BF901F4528384649E ; libaacs -0x7C4ECE308F15A71AE12459A60C6215165C560931 = _NONAME_ | V | 0xC7588A33323FC1EBC7316A937E3C3DA2 ; libaacs -0x7AFD59DDE60F0E070A95D2DB1276D4BAA03EA141 = _NONAME_ | V | 0x37856ABF3E4DFCD68D34971A45522F05 ; libaacs -0x658DE2283033BF072E020D25B7DAEF0F2E042D42 = _NONAME_ | V | 0xBB7469971B62500FCE5B831641FA37F3 ; libaacs -0x5F3B6324EF95627B49ABE52FD16BE5F53389EF8F = _NONAME_ | V | 0xF48E41EF660B64C8F0F9797FC67F738A ; libaacs -0x5DA5037A55F125A29CBFD3FF6A5138F02C2028E2 = _NONAME_ | V | 0x296A3D28EADCCFF380FD515923312DDC ; libaacs -0x56B1586EB266BD4CAD2C7DA311DE5C87E1595ED7 = _NONAME_ | V | 0x700BD5DCFDA80BA51A89D5B20F762590 ; libaacs -0x56AE37244770A687DE5FD6B62341A9234195D27F = _NONAME_ | V | 0xC1B0AD0BD8AE9058972D845D80224457 ; libaacs -0x4E08B7170DA6A8F96F60DDE78658A83166CD8B39 = _NONAME_ | V | 0x314B8EB53564AF5079A940FC45D9C875 ; libaacs -0x4A8EC643115CAAC5F33EA25966E05206E4A831BD = _NONAME_ | V | 0x0071ABB5BDE08E304BBB4780A4FA7D7F ; libaacs -0x92E5D68A25B31025186D0F0AC2DA1344BCB2C954 = _NONAME_ | V | 0xA498B8B3A4B30C028EC6CF4361ECF75A ; libaacs -0x014B3F0E56007290A2C184D8B1D38BE5AAD2DD50 = _NONAME_ | V | 0xADB9297829D2639DD8E0CB9C99CB3ACC ; libaacs -0x9A7E9755AB273A61D117F519DEB3003949ED31E9 = _NONAME_ | V | 0x2E2DF0404040F83BC1C38671D04E061C ; libaacs -0x3FECF11EBF75C2554D0351153B1771CBFDE546A8 = _NONAME_ | V | 0x2A65B6FA9A59A2521DE2EA78981DC914 ; libaacs -0xCE8D17ADE8B6D69F00F552E14A1979B27C776B49 = _NONAME_ | V | 0x0F187589BC1D027F3F63A8E7CE8F36EA ; libaacs -0xBFEAC8D02DD4EE97DF1D9F63EF62F808DBBFDD86 = _NONAME_ | V | 0x0E5AE586F0FCFFE9B1ACE3C0FD48D4F1 ; libaacs -0xBB122CB20BEF960BE4ACAFF731537162FE8FCD6F = _NONAME_ | V | 0x3459AF6FFCD87B0F3EBA625E83865B71 ; libaacs -0x8EB48155F20C5FC9BBCDE403023DBC55686C9641 = _NONAME_ | V | 0xF195EBEBEE65832F29E5262014F78881 ; libaacs -0x1F6ACE7E2BA1B39E4092CB6CA8D8C9FBFE718731 = _NONAME_ | V | 0xF36C3F149121BE0F23533E9AE30B3A5F ; libaacs -0xC15E88046C43ECD405826EA424C79061C5296833 = _NONAME_ | V | 0xCCA06274B4D4A6DD571106002299E4E5 ; libaacs -0x4C6C08D4A4625F59618BABA290A4DF471782FFAE = _NONAME_ | V | 0xE4428EA365D2CF63E3689B05F540CE46 ; libaacs -0x755A9CD98D7E8119A21750C34CC487E22DAB876E = _NONAME_ | V | 0x5203126C6936DC6366FAA6C0AA23B844 ; libaacs -0xD37F65C22270A8D167E905FD5981CFC4323D85DA = _NONAME_ | V | 0x6735B6B5AAF7E9C86EA1B23F0098B7C1 ; libaacs -0x2CA180ACBA3D87EE3F3845FED902BCB4C90E1AED = _NONAME_ | V | 0xA87686320935955B2164A1333EAC1299 ; libaacs -0x1A2E2ED0C14499F00E47CC69BA122DD8F0212888 = _NONAME_ | V | 0xF38FFC3ECF732CE03FA3E51FAFFDF2A3 ; libaacs -0x42B258DD822856C6ED0AA91BDDCB81341C3CE923 = _NONAME_ | V | 0x810E818B575D0B8746A04D05E7938F26 ; libaacs -0xCB3C816BDF7C3EC8A6693673F0AAACDA3B599B8E = _NONAME_ | V | 0x77F9DFCB4495C9B520D48D82556B97CB ; libaacs -0x3DE3DFDD985B9FF40744B96B04FE4CDCF570053F = _NONAME_ | V | 0x41A7C3EB41E8143EF3451EC74CDBD77A ; libaacs -0xDAC880689B3BF713CFB4A94151D958DEA0473A52 = _NONAME_ | V | 0x1DDC5495B967937D6A28EE0570D48DBE ; libaacs -0xCA0C3D56B90C0734FCE7A33962A81CDCC04B1CE1 = _NONAME_ | V | 0x62CB2553C3D10B07F44B74CA01781419 ; libaacs -0xB3880C4ABA559ED566936D060D041B4148DF0062 = _NONAME_ | V | 0xA905A200312694E34E2F445F2B01B653 ; libaacs -0x3D0C442FBA892ED109F7525ED9E075B448C0CCD4 = _NONAME_ | V | 0x02D68AA0704EF4974C3EC72DACB7DFC2 ; libaacs -0xE30F0DFB04AEB68E8CDF0214DF50682FB3425FD6 = _NONAME_ | V | 0xA0BD7CF61C4E9FD608DEDC68C815640F ; libaacs -0x90B6B4C57A434711C9844DB7BBA92A6B466495AB = _NONAME_ | V | 0xAD105AD9F25FD136EC8744511AB84484 ; libaacs -0x75E031DEC614E82BB161067A7A8407D6ECB807CE = _NONAME_ | V | 0xE50950F34A4B10FC49C6F2413AAB2F2A ; libaacs -0x28EAEE942F4C18D69561D0A0FE728D57D4F3267A = _NONAME_ | V | 0xEE46B03CD86409D2D39390B28F70F0D0 ; libaacs -0x583F07D48617F6C410AF239D82D0E7E8B711EB11 = _NONAME_ | V | 0x71DD0B707FA5FCEF88E1F76D68E724C8 ; libaacs -0x61C896DC9291955FC710D2236E91FAE38780F90F = _NONAME_ | V | 0xB81EE91F9008AFAF0F273C16A333CE3F ; libaacs -0xFBAA65C35183ADB60A99C94E2C75C688FB4FEF1C = _NONAME_ | V | 0xEAF51815927502AEE5440F26B28AF445 ; libaacs -0xC0EBDBC080F883457373CBD10C6FD939658399FA = _NONAME_ | V | 0xFD84B508E47F292DBFACDD182A6AB78E ; libaacs -0x8677F07528255246632D7790102FEB8A6231CDE6 = _NONAME_ | V | 0xA8251ADA42B4E56D94406CDAE732E740 ; libaacs -0x165B8374463414AAB9966AF2F5E5A7518F6EB801 = _NONAME_ | V | 0xC89C6A706DE38C6478AA1B16B5F0F2DA ; libaacs -0x7760CE1A8207DA0934A89C65A42CCB6D42A7E1B8 = _NONAME_ | V | 0x131ECEA5B3AC9DD757B26F97D0D0A3FB ; libaacs -0x6F2AA4C0C440CD16687D2CA68621C7BA78E414FE = _NONAME_ | V | 0x71C4EFAA582AAD1D7F4919BB1F2B38DF ; libaacs -0xA4B80308BB96B29907C92896273950A6CBF25DEB = _NONAME_ | V | 0xBC41BEB5332111BFC0451BDD8C394650 ; libaacs -0x8EE15602380AEF20D4A0EFCA5E4FC8A14AB58CA1 = _NONAME_ | V | 0xBF1D26ED418C5355B8D61BC634898E32 ; libaacs -0x073D4A3301DBF7D9DBDD97893352EABF35697609 = _NONAME_ | V | 0xF1085EE1E16EF90B4FEF97A7F8925BCE ; libaacs -0x3DD537D43791E40830146AA98382F4B7EBE060B5 = _NONAME_ | V | 0xE7E2B807EBF98539686DAB30D39B55C1 ; libaacs -0xF465AC12CB455338B8354DC2E9424FBFB13CA492 = _NONAME_ | V | 0x807E772FAC4D83D7445F9CD09561E32A ; libaacs -0x55B9BE77A712418010D680EFED2C4D420808759B = _NONAME_ | V | 0x06E4087F4E02411E840B0C0ED7AC702C ; libaacs -0x2E008CC59C59958128EF0C06B4E7BF7CE9AB8469 = _NONAME_ | V | 0x8630CD7B1FEA1A00863CDAB603C5DC96 ; libaacs -0x2C296A366D6C8F7BD19F79D117998F824258A5E3 = _NONAME_ | V | 0x2E6FB45DAA66281CBA1E0656501FCC68 ; libaacs -0x6DC40155E738BF64A5F1EBDD3097A9B47E93A212 = _NONAME_ | V | 0x41A1F90AF94E2C96DE2930F295553663 ; libaacs -0x42504149AF667577860D5B5D9F7AABF1DD4CC4A1 = _NONAME_ | V | 0x58704CA6DC161F542722BFB55A9B7F2D ; libaacs -0xF1A069C9C1DD5FE7EB32DCA1E2FBFB9F1044DCF1 = _NONAME_ | V | 0x25AF678448681BDA67BCB9B172DD1E24 ; libaacs -0x703244B62A6221447B62171EA7A1C221FA700F22 = _NONAME_ | V | 0x87BEECC3E8D0ADBEAAA006996931FA85 ; libaacs -0x866DF39C995144EA0A06F1D9E861D0392A54658A = _NONAME_ | V | 0x352EB5B52FAF7C314150880964ECDDD7 ; libaacs -0x1793688463F4A059069858EE377588064538A970 = _NONAME_ | V | 0xBD3E29C951F78031171C530C5D92C109 ; libaacs -0xD6E10D8E6A925CB7A46A82B749B03EC8F899D65A = _NONAME_ | V | 0x1489280585DC2560CA85A168D1EDF715 ; libaacs -0x1EEEE4926D4BD63D7D728116DF8B73963CC4C862 = _NONAME_ | V | 0x53EAB5C66F04B75432CF3796C38843B4 ; libaacs -0x28B0A301AE9F57458612AF027723A873180ED4CE = _NONAME_ | V | 0x18C54CDBC6847E3E5CD2586788D793BE ; libaacs -0xFFAA249BE8198BA5E5A991E6A7E3D34467FAD983 = _NONAME_ | V | 0x8557218C8C049E899C707160A9C3665D ; libaacs -0xF7B45FCC6639FBFC56BF5CFCC842B50280984AD6 = _NONAME_ | V | 0xEA0F307EB461EA02E1925F189403CE44 ; libaacs -0x99D1A513E7D2C423D74C107E6450FE9565062D17 = _NONAME_ | V | 0xB83D291C57DCA3F2B95C24B64437AA2A ; libaacs -0x79796DB45FE2C41F77268128172914B550296931 = _NONAME_ | V | 0x354E823737409CD231883DD56533D0ED ; libaacs -0xE8339CFB7F3B22F4F680F1A1BC811782ACC3700B = _NONAME_ | V | 0xAD8AD734A50A1FBDB88E59DC76105A00 ; libaacs -0x3199FD30B68251FE2A6A6164A54CADCB244C8971 = _NONAME_ | V | 0xDF3C54E0D7661208006C24DE2B438627 ; libaacs -0xABED75991979076C923C7762A00EDB3AD9F09E2C = _NONAME_ | V | 0xEB52E3A93D7F2C186B38B8DA4A2ACA46 ; libaacs -0x2E3C3A15C4DA59CA7C8C714F232AAD144944F7CC = _NONAME_ | V | 0x2F3A87BACB4BB5E641D99D724E5B8C94 ; libaacs -0x3A1D09563F4C88C18AB8C9C3CBC0D28577E48531 = _NONAME_ | V | 0x029D1732F9D68DCB0A09C9F40009402B ; libaacs -0x72CEAF4038EC5C192E4626DDFF9B125FA9AC0EA8 = _NONAME_ | V | 0x926DCDD26E1B0E4024C212FB35479BC4 ; libaacs -0x6775B8D7E62538F32ABD2E129EB597F445F2CF5A = _NONAME_ | V | 0x2AAA075AC129BBFF3899C421F4E2DD98 ; libaacs -0x968A7C32E92C3ACA273146CAFAF33393E181F956 = _NONAME_ | V | 0xDF2D595D83C171FA3C451236F1E36102 ; libaacs -0x21577106661222AFC778CB7563D32136FE6A1009 = _NONAME_ | V | 0xC30AD0FB70339B021CD966FDDABCA7B9 ; libaacs -0x7D88B264341F5DE248A4B79EA79F682555390684 = _NONAME_ | V | 0xC5E9C8D87FECD9F06775F2882FF30C16 ; libaacs -0x2F3EACF558462F55AAC87308E4342979D75871A5 = _NONAME_ | V | 0x5089F4BFCB451E3F6E385B86E1B86B98 ; libaacs -0xE8C4FE1047E40097628717AA0489F5BE0D100C23 = _NONAME_ | V | 0xE940C1E8C02CE3F981F31FED0FA2D12C ; libaacs -0xDB595DDA16457DCE7A1F82F4A554B9C1B2FD5BED = _NONAME_ | V | 0x09777B4FC64BAF56D81F2752A018FA72 ; libaacs -0xF78C0BFFF85158D79EE49009987CB7A912CAABD9 = _NONAME_ | V | 0xBADD63D8224CADD49017AB0153E83F08 ; libaacs -0xEAC930F559919A58F76392F6A5601940C5DAF115 = _NONAME_ | V | 0xB0829FC9FB991842029020C5257E21DF ; libaacs -0x6E5CAB7F69EC29B753809BB82F67E971EE4C13F1 = _NONAME_ | V | 0xC4A2E3D65E9E953A3E967A290100CAFA ; libaacs -0x89CD6FB13A6FEBB2CC6D562CB5FE66B7A81283D9 = _NONAME_ | V | 0x2365E5532DA65D1B6A8AE70E6DBF7947 ; libaacs -0x239ECD2E0DE2E087D41647DBBE9DCE8ED37949F8 = _NONAME_ | V | 0x09DFBBA669D2006195A03A73EDB81BC4 ; libaacs -0x24561377ADC2A4DFAA4D876B3A2CD52F0BD8057B = _NONAME_ | V | 0x1964930D15FA3868F0467EE310227542 ; libaacs -0x41EB14B3CF97ABCA62BDF6DF7DB2A5674A8AE47C = _NONAME_ | V | 0x51E25D73AC9AF1A6340F5960BF80AA14 ; libaacs -0xE17D33F049EA9E0F837B9E857D3D9151C326EA56 = _NONAME_ | V | 0x42263A7681C82205968BE3C8A7BA0B0E ; libaacs -0xE5A4D1EF132839390867E216B20C66FFE8237503 = _NONAME_ | V | 0xE73FB07AA0442D72F53BA47E02046703 ; libaacs -0x359ECCFD9DF364F2D6C8DC0AC356BBD44AE5DC48 = _NONAME_ | V | 0xA602B1780CBE34C63C6165170BAB02A2 ; libaacs -0x040AE0D73DADA4FD404CA345BB0F77ACF2669610 = _NONAME_ | V | 0xA5EC3811790A567BE8E4EDBFDFE757B0 ; libaacs -0x42A739D495679ABED56BF17D24FA1BDF5395B813 = _NONAME_ | V | 0x983F5FBC1ACDF71CE3A94B7C31380AC5 ; libaacs -0xA55F4C271DE5C7141C45E19A220709A4C5D0CCD7 = _NONAME_ | V | 0xF175EFABAD5A30813FF095250AAC4637 ; libaacs -0xB18320929B0CC07AC365CF7200361F2198A2BD2B = _NONAME_ | V | 0x816B9A8357678E3A56E22730C03744BE ; libaacs -0xA687C19DD0E5A3C40821423DDEB3D6B3A2B47E21 = _NONAME_ | V | 0xF08BA39EA160BDAAB02A2BE0ED88FBB2 ; libaacs -0x41AA2BB8D2F04C6CE0FCBF02F7A48F9DE44D9416 = _NONAME_ | V | 0x4168C31675541851EDFC23C83070BC1C ; libaacs -0x9C2C9D20CEFA9B39629486023D35E4079BC4A9E6 = _NONAME_ | V | 0x8B58AA871F087BAC2D55F2D57065CA12 ; libaacs -0x5F3A9A801E67038BE8BF7CAF0BB575BB740E5ABE = _NONAME_ | V | 0x9CD21AFF532834D958FAE1643861D6C3 ; libaacs -0x0C831F2E325292EC949B085218304A114DDD5CC6 = _NONAME_ | V | 0xB88D730E2470A42FEC13A298E15DC808 ; libaacs -0x93B8C584A6AF6F11A21B39E44ED5221D7E3AE327 = _NONAME_ | V | 0x77DCC57D92D827C13DC950E9CF9C999E ; libaacs -0x767734081CD82DCCFE519902AABD6E7BA80496E6 = _NONAME_ | V | 0xD9DBC58758DACD6204A4CA5D08C96209 ; libaacs -0xAE38701451707D0156A4FF90ABB8B2DE5952A8FC = _NONAME_ | V | 0x152AA20FBB49A9AB9E214E42274541B7 ; libaacs -0xB3DE80083C51727E0774893529C630C733EF2C28 = _NONAME_ | V | 0xDAAF19E9E097F0B83A80807993336F68 ; libaacs -0x77B29469A6C33923D3628D175B70613CD58FD2CD = _NONAME_ | V | 0x56AF8D3F3526419039D558572629E3F2 ; libaacs -0x909E967D9F64380B58F8583C14E9281730D9A039 = _NONAME_ | V | 0xD69E228A089F7EFAE6CA57620A4ED862 ; libaacs -0xF55374EF97F395D70FF1B5C99A56926E1E0950F4 = _NONAME_ | V | 0x7AF6750A4EDD92E4AB6F69DD02EE985C ; libaacs -0xE6AA9CD44BA697FDE4DC4ACD2E26CF5A032FA42A = _NONAME_ | V | 0xADFDED1FFC2884156C0287DD03431719 ; libaacs -0xAE0A071C4C7A68B1292B4F5BC0BD318845DA6527 = _NONAME_ | V | 0x2060F9B56E8BB65EA5C30A3AB0F5FD1F ; libaacs -0xABED49C3EA45D7DF321CD54BF80211ECDFFB0606 = _NONAME_ | V | 0x8C5AA7AD915488BA72815B9576A0994F ; libaacs -0x988EE3D2B0785C442248CFD92E39DF4C4FBE9868 = _NONAME_ | V | 0xEC6A29445A173566FECB86C9B80E0BD2 ; libaacs -0x6EA0A2992FB33D38522EF3F5C137BBF89DC05F75 = _NONAME_ | V | 0x60D8B70078544E06D4BAB9052E9401B8 ; libaacs -0x565D957714F928188D3CA9B52CB5B39D37831C90 = _NONAME_ | V | 0x4586AE92CF56D2E748C5B5D0ED7AA131 ; libaacs -0x90FE0F6A866350139383E5F8421E89630391B353 = _NONAME_ | V | 0x1B094A0CC883FCD2216A72075A6CA80D ; libaacs -0x4BE3F24AEB7B115CDDD18A30F76F47258F47AB62 = _NONAME_ | V | 0xE9DE40F0C51714A84744DC016CC45900 ; libaacs -0x510FF40408E0F8534C738E6635D81B0CA9F8B9D9 = _NONAME_ | V | 0xFBBB873456738EC3092914F5C1BC7661 ; libaacs -0x6A619559CE0D5E69B02B2FD418951561CF130370 = _NONAME_ | V | 0xF99A4BD2DDDAA7ECFF3397A918D1CFDA ; libaacs -0xEC75E9C8B633AC6212A76CB0EC60A3479DAC9AAB = _NONAME_ | V | 0x11D576355795F249EE6E7ACC89A9DEF7 ; libaacs -0xFCF659B6ED747971D8629D5B2BE67ED3BD125C74 = _NONAME_ | V | 0x80483739B37CC68EACBE40098456665D ; libaacs -0xF6A85BB303F4DA7B956F7192031F6EC17B3966F6 = _NONAME_ | V | 0xB6EBD9AC215E9F50B7AE78B2270953E0 ; libaacs -0x8F6A191205E527665640F5627C6C0B7E8D29263A = _NONAME_ | V | 0x8CA6916C9A4E81DFBAC4E19BE427323B ; libaacs -0x7AB71023DE4B16AEFE167BD6240F3C2661F5F666 = _NONAME_ | V | 0xEA0069DE868864F64E73668E8968D9E5 ; libaacs -0x836C39D88E1DD3CF563EA95BFFE3DA487E7BC1D7 = _NONAME_ | V | 0x3904AC8B5EF1232EFABCD9DF9800EADA ; libaacs -0xF6DAC3961D8B29F3827561562DD716EBA2F6B0D6 = _NONAME_ | V | 0x8D4CCA46BCA86BB2FD8035E04CE706AF ; libaacs -0xF5DE4781511CD1F724FFEC758EC48C7F0BDAFC17 = _NONAME_ | V | 0xB0087C52B729FD18D1A994A898CD91AB ; libaacs -0xDE170F07A21046CE0A348AD67A796030EF5006DD = _NONAME_ | V | 0xDC044296E0E8E507DF1C452596328D45 ; libaacs -0x71B8D7A9E4FFC3CAAEE615E735E9A88148BDD3B7 = _NONAME_ | V | 0xCC735602D47DACE817C7B9D862F1F335 ; libaacs -0x6D2E032362B99BE576CE657DFF73969FEEFF6742 = _NONAME_ | V | 0x575043E29C3EE4F7F5F8853804CD9E48 ; libaacs -0x4D596F31325733C8E63FE5D0E99C415660A996C3 = _NONAME_ | V | 0x6CECC3C571460068A1180FB940B54A02 ; libaacs -0x39114B475C913A3C59F5749F1A993DE321049100 = _NONAME_ | V | 0xB3662785D0C97D4345B6E3479C35AC8F ; libaacs -0x1E808945701ED839308A899E2C0454030128A10B = _NONAME_ | V | 0x6C2B79B9E59BF3DD6FEB7BDFE1C57EA1 ; libaacs -0x988ADEE726A8B50D13FFB78092CCC1EDB7A919E1 = _NONAME_ | V | 0x5E05F95F39732C77DD063E2B3B1F2022 ; libaacs -0x76A37901F8D65C763B47286EDBB8F5CB7664E6EC = _NONAME_ | V | 0x30886D9BCA91C73A7B741F4486F5E774 ; libaacs -0x4B8A28E6C03C5101CCF9E39CE9892800F62C1EEC = _NONAME_ | V | 0xF4C7B1D37D453BD00B19EC6BD8112825 ; libaacs -0xD2275EE7C379072C2A1B2950CEA9E0DFAB23DC37 = _NONAME_ | V | 0x92C9674967F9004DBFCB69CBC6B88821 ; libaacs -0xA353B79BE2E25194F37B186B446890777F1515FF = _NONAME_ | V | 0x1671A854993847B1023400095BAEC88A ; libaacs -0x790D77CC3C755F16F6725CE3814FF6AD4C3F5C0C = _NONAME_ | V | 0xD0EB5E8BE51F57FB5ECF8CEB20150CE7 ; libaacs -0x4C0AF5F9508E34DA76823B6D437E8F1817D41141 = _NONAME_ | V | 0x6887EB32733517716D6274B2CF9697C8 ; libaacs -0xF47F2E4D1FA1BB59FB2D9C4F434EDC70616F9BCE = _NONAME_ | V | 0x4CDCF443A0F2030E111C01FEF4B1951B ; libaacs -0xDD08B4DED3D3C15DF48C73BFDBA19635E35D6930 = _NONAME_ | V | 0xC60424AC696038323E12ADBE74901B07 ; libaacs -0x8F764AF9573532FAE7D85C5CD85457921E92ED58 = _NONAME_ | V | 0x4AD206D00518687C1EA4416616D87D03 ; libaacs -0xC994D32413F56B87946466D9E0A5F37FC3696212 = _NONAME_ | V | 0xF12BA093A2FFE0AED1A7395C42006522 ; libaacs -0x9B0B8B1B2EE6DCE11D7D088A470A183A835A4AF6 = _NONAME_ | V | 0xCDB36B5C95D588AF14C78813F10C2A9E ; libaacs -0x11686AE68476C69D31A42E5132BD656B450E7954 = _NONAME_ | V | 0xF84080F97FB45EE6D15DDD9B55E6A490 ; libaacs -0x9ED2CBE19060CCD4E7037314A041A1AB2A98A02E = _NONAME_ | V | 0xA29BFF74EC5DB1EE79263A848714A1FB ; libaacs -0x1745EE5CE047ABA39AEAF7DD7DFE6DAA2ECF7310 = _NONAME_ | V | 0x90E618539271476C7CC6308EF82D10FF ; libaacs -0x3A045A39FA5761D6D3776EC986FDAA1C919F190F = _NONAME_ | V | 0x69EBDD7FE569057B32E48379A7CCC2D8 ; libaacs -0x3BAD0BB37356E54B364339A7D7490EA09E76DDE8 = _NONAME_ | V | 0x00830FC2D938EB83899223BB3E27BB3A ; libaacs -0xCD21065BFB4FAAA54D119A05CCD9FE1A3F0B2524 = _NONAME_ | V | 0x6FDCFD8ADC9D2177BA6FD8B1F39EC0A7 ; libaacs -0xC9B7BD1711D38983B4F85DD1FBFFFFC5315741F2 = _NONAME_ | V | 0x567AFEABA900AEA690C2B4C4F5467B48 ; libaacs -0xC052A106E944AFAD7D4D61E2625EAC391CD9D970 = _NONAME_ | V | 0xE4123D98FF362C5AC63D41E01E231801 ; libaacs -0xB5BE023898320D8471E82BE174E07ED06A3834E2 = _NONAME_ | V | 0x3B6BE1670B2C467F8E6013E373006CD5 ; libaacs -0xB0DA83D82DB7F7544119E6DA7120096B6346E652 = _NONAME_ | V | 0x7DBAEC15838455204721E3928C7CD9F9 ; libaacs -0xABAAD3FFECDEBFE4994DC4D0FB620C79D751B2E7 = _NONAME_ | V | 0x152FF1B306752E7F02C81D5E2947AA1A ; libaacs -0x95F14558958A8DD4844E3FC8D8BBE62D39E4BDB9 = _NONAME_ | V | 0x0824E4CFD2584E2571681DD4E7DE5214 ; libaacs -0x6F8D3BD004B97DA6D203E3D6D8294E01EA787FF7 = _NONAME_ | V | 0x1ADF11AEC940A04CB3F976783D1308D5 ; libaacs -0x6D5905BFE4560CAB17C1F5B702BDAD4E521DE314 = _NONAME_ | V | 0xCCF04A8DEA438768E9A92534E403D06D ; libaacs -0x69FAE42D05D04EF6F3C2B7DA3A02974A79E846F7 = _NONAME_ | V | 0x187FDEB2B1696C9551B09AD1BBA089CC ; libaacs -0x5D0367B2AD6FBDDD3C749921DF99BCCB685290DB = _NONAME_ | V | 0xA3A99F7EDD095E9BF67C6792ECADA633 ; libaacs -0x92C321987D68CDE98BE41E2B5F1B3AD71440FA0C = _NONAME_ | V | 0xCC6D4A896CBFC5BD5C4AD8754FD7062F ; libaacs -0x539EE9843C229D91CBFB74098A67E624AB74B99E = _NONAME_ | V | 0x87521D3D70D35B1190ADDBCDE4F9043D ; libaacs -0x0E95A0C6FC6669E99BDD95EC3EF0794C1DE06E82 = _NONAME_ | V | 0xEA08C8C1FF6355C938D3EF137532DB83 ; libaacs -0x9ABE7D075E929EE9FCB64582BFF671A81ED5AF42 = _NONAME_ | V | 0xDDCCAC8F84980EFED3F22468878E81E2 ; libaacs -0x6DD9770AD731DE8C617812F982248B147A3C9A13 = _NONAME_ | V | 0xA56B9BDE76896119A36AC7192E7D44BB ; libaacs -0x50DFE13528B56762575332DC112F406A8C211212 = _NONAME_ | V | 0x059B61DE582FB7E1DF849DAA13DC3EF4 ; libaacs -0x4206E8D397A4D8C34150511C4424239946C1D4D7 = _NONAME_ | V | 0xB8AC3E3D039C4416C5399123BFC345FA ; libaacs -0x3639C7482679A6865035F77104D23406FA4C3792 = _NONAME_ | V | 0xC158928CBCDDE1AFC6CBC9262D92B058 ; libaacs -0xC92FB43AEF838B8938209D21D2F81DD2B87AA247 = _NONAME_ | V | 0x50A6F0116DDB97E0A2CA4A9FF0142EB9 ; libaacs -0x220A3057D81C949E18DEDD6BEAA09651E433AEF1 = _NONAME_ | V | 0xC5B3C4D0B1D8C546618C3CD301D085D5 ; libaacs -0x5E3C48E8093892BEBFF2D2A477F26723222D540B = _NONAME_ | V | 0x2F36E70B2091FF9A9D6BF8874F78DD80 ; libaacs -0x59E5B31F05E3DF5F2737200C2DE7DD4B7707EAA7 = _NONAME_ | V | 0xDF0157BB1CCDC958AD249BF993C17430 ; libaacs -0x68BF7C5B7AA70C9A802081200949265EB25AEDFC = _NONAME_ | V | 0x2088D716D98D64A727AEBF09713EE579 ; libaacs -0xB70FB437F96E060269312140017557115BEC38F1 = _NONAME_ | V | 0xC881AC116DE21695C8A2B693DC4D554E ; libaacs -0xCD3991A63FA2726D4B58EE6CF4452CEF86544333 = _NONAME_ | V | 0x5A4EA10E0425EBFB744CD09A9AF26BB4 ; libaacs -0x5729656638731C3892F73EE4241E5078E240DBB4 = _NONAME_ | V | 0x597A9932C50E551D8AC0E537187C67B6 ; libaacs -0x9B9BCB599ADD8C79BFE95155D63FB0379A86B9A9 = _NONAME_ | V | 0x401B3CF7BC3FBB4419059A7C64AACC65 ; libaacs -0x02817D601226A8707B1330D994C8B8C5F07FBD4A = _NONAME_ | V | 0x14FDF3C1F2E12D78202535B21B952B54 ; libaacs -0x45927C3AAA5774A49561C19FC7E8934BEE8B57CA = _NONAME_ | V | 0x018BA56F0841F96BD0ED6CFB8746F7C2 ; libaacs -0xC8A3818713F97FBE50462A181F47F5F07490298F = _NONAME_ | V | 0x563BCD136F31D877E0976CB6B68FEAF0 ; libaacs -0xADE5E95B68C3DE0E19DA32D9363455E915C8ABDD = _NONAME_ | V | 0x30A96765846DC7FF583BC6C54215D129 ; libaacs -0x89788DA46C34F2326492D6F1F0CE0BCB160A1D1F = _NONAME_ | V | 0xD07935131E7DE411A726C684B596BDDF ; libaacs -0x0EF74F8B87991D8977236D42C775D6D7D4D344FA = _NONAME_ | V | 0x33D188B956D36ADEC113818488FB334D ; libaacs -0xD58AF882730D871D10BFF46AEF34FF21664AD324 = _NONAME_ | V | 0xDCD4A9BD3C8B1281DBA4D8BFACAF6C15 ; libaacs -0x70051B3E8501165718FF52B8273E357650478125 = _NONAME_ | V | 0x0E81CAF502012D989B44CDD4CB8481C4 ; libaacs -0xDBD47CA8AC91B3FEC15E41FB43FE2225DAE96930 = _NONAME_ | V | 0x704F07077F7D1B31E0FEECC126BD70FA ; libaacs -0x75BDE196D99F4E1D55ABFDB33BDFAF4F394D86F9 = _NONAME_ | V | 0x0801C9CCF4620E167F35DBE77C716A20 ; libaacs -0x76C6814B8A86CCC43E31442B96F6997E33578F5B = _NONAME_ | V | 0x50342F51928BE4AB4D6EEA31733922C2 ; libaacs -0x33D075DDEA65C72D66CFD97F2D32296261C10737 = _NONAME_ | V | 0x2C0B3EC12C6776B589A9A9DF9900FE51 ; libaacs -0xF8B8E41DD5147B071944A64E16E8CB2FDED80630 = _NONAME_ | V | 0x8557AA1F8D919FB7A44865DBB9BE3341 ; libaacs -0x932C292C1B9B282703D2911870BC568C1524A769 = _NONAME_ | V | 0x203B55BC5F10B79616260D2229A8A99E ; libaacs -0x47DC60A181239993DEB1FD4BC3E8767BA6072E0D = _NONAME_ | V | 0xAB6C1DB2CDCED9704A2BB8416441F7B7 ; libaacs -0x7AD66505C6A6A80B8D2899C3429D07CAF4785935 = _NONAME_ | V | 0x9292846111D7929C25300DB4751F3189 ; libaacs -0xB033C85BE0CE77CB434B2AE120F54DDF75BE458A = _NONAME_ | V | 0x6C8700B47E27BBC6180DEA6503433973 ; libaacs -0xF584B5BD1060CE0A69DCDE697FCD3A0CCC472111 = _NONAME_ | V | 0x4713CAEA21B7965EAE3CF9E49735DBF6 ; libaacs -0xCF5EFC3C8A8AAFD18CCF2D09052A12B8E7A02F53 = _NONAME_ | V | 0x6178D875F324291E2713AC0B95CBB4BA ; libaacs -0xB7015FD01C4CF16271A4959C35D4E06C66E56014 = _NONAME_ | V | 0x78B123FBEEDDFC3C71DE9E1F5E21118C ; libaacs -0xB9C5C4A110BB4827E9630A689091D8F007D232CB = _NONAME_ | V | 0x4FFE12DD55286060B35FAC95A76AC3B4 ; libaacs -0x49EE51B4A21EB4CC946CEEAA98424D53D1459BE9 = _NONAME_ | V | 0xC69F2A0D0C73B980F0C73A5FB4A2BCCB ; libaacs -0x507E4B1E45961358E3C90169525045AA60CA638B = _NONAME_ | V | 0xB9BC5A1C24741F71481A1274355308DD ; libaacs -0xF14ED6DF3191F802B5945FBEA456893C5354C950 = _NONAME_ | V | 0x28DC35018B22A116C63C252C71E7CCD3 ; libaacs -0xA098EAC17B0872EE5B1BB2352DC5F1E7E29BD1C5 = _NONAME_ | V | 0x3BD5A42E5D7F200308E293DF3EB29B13 ; libaacs -0xE9E3B4410AFB69C57D4D38A5CD3FDAA3797EF8E8 = _NONAME_ | V | 0xF482405403C0587F47BF806C984B0C89 ; libaacs -0x89E24F17267AED6575544684FA43D41B647DCC9A = _NONAME_ | V | 0x6E279B69445E3DB1B41DE7368512E4B0 ; libaacs -0x801A03E09A5EE785C40365358E7F3E9637DEB94C = _NONAME_ | V | 0xCE87FF05DC9E8C2E4B5538C0AAB86977 ; libaacs -0x0062982E791F84145B0CDABB8E1D6E7EBC594C21 = _NONAME_ | V | 0x1A456872A3DC1E5BC847A991CC21B240 ; libaacs -0xDD2DFAF7DC9A858D2AA6D500435F680B426B5097 = _NONAME_ | V | 0xE3FEE9821E0CAFEBB8C220FF2CEA2C8B ; libaacs -0x7237CAFAD4621F21C0AF8020C906603216E57CF5 = _NONAME_ | V | 0xC4F8D8E13E3B473CD99602F13A7E3884 ; libaacs -0xF9DB0DB69BBC635C0EDF026CC88DD07DB6B28299 = _NONAME_ | V | 0x223E87B28BED97F101F494FC5B1F8A2C ; libaacs -0x7DC073F5A9FE3780CE2C0AAED497471FF24F200A = _NONAME_ | V | 0x1DF2A6C37F148D38AE19B0E98E72C188 ; libaacs -0x92F6C7C3382872670B43225FDF91EC46361DE4B5 = _NONAME_ | V | 0x9D15CCCA8D9B24511EEDB7ABB19099FA ; libaacs -0x7F1D6B8268F37FCB93C68E91DDF163222EBEF6FA = _NONAME_ | V | 0x538A2C69A7FE879AC26B8326638325ED ; libaacs -0x78FC4214F46A10B4024C319E290121F2492DB574 = _NONAME_ | V | 0x23AA4375DC3A3489AF634541A30227C2 ; libaacs -0xF3FC94FC83C5ED2F0B8B675B34ADE72703EEF24B = _NONAME_ | V | 0xF6F79ACF57C783B4244AEEC73E987982 ; libaacs -0x82B4E27194BCFEF80F3A15EE2ED8D5B3B7EBFF91 = _NONAME_ | V | 0x33F624E085C6E3A2C6455DBD264D23E5 ; libaacs -0x52CB0D675EE132EA18972FA4C9FCB2B777B1422B = _NONAME_ | V | 0xBE217CD95D3E0E6EB64B3710D4F813E6 ; libaacs -0x5229578B70240CA5E1EBD89F1EE0DD1BEB7178C9 = _NONAME_ | V | 0x421EFB76C76C75A98617643CFD14924A ; libaacs -0xC18BDF085A7EBC61EBC663B1C782D662CFF92126 = _NONAME_ | V | 0x7EEAD8B0EA1222FF2A3B0322791ACA29 ; libaacs -0x51D38B2303AEF53F45D47BDD610395358E836341 = _NONAME_ | V | 0x3A097F714759CA20A2C2EC805CAFC35C ; libaacs -0x346C8F3C164129D2ECD80169D6D24292FE5AC00E = _NONAME_ | V | 0xACA959AAE339EFAE997C8703DAE41783 ; libaacs -0x3CF3A85F31267F84319AA412CDAD59BD99E241C0 = _NONAME_ | V | 0x5224C624A9AD58F0DEA2888C90D5355D ; libaacs -0x46F4ACAD5B7AF2B5F4B25718DFE981A3ADC28E00 = _NONAME_ | V | 0x9B58DA72D30482326DCB9CAD1A943784 ; libaacs -0xA10164E20EEC9BE5CF79F7D28066ABEDD05AF75E = _NONAME_ | V | 0x99EE64E1CE67B622BF04BFD2C8CAC967 ; libaacs -0x3396E065618F72E43ADE91C022F5F98E010F8250 = _NONAME_ | V | 0x308A401983D7CE6279132BA6F7CB2972 ; libaacs -0x923E1ACF58FB1CA2F963D5A3FD6AAA6E24653A27 = _NONAME_ | V | 0x53CCE02F287AEFF108DE03350925DFE8 ; libaacs -0x773B1ACA68A7C36A4ED7E51D161DD627593DCA53 = _NONAME_ | V | 0xA0C7612548F89B2E87B04F5F081D39EA ; libaacs -0x4E13322FDEFE7D4DAE14AFDD5A931DC1A96FD59B = _NONAME_ | V | 0x00CC0B938C6DD383543C49E851413740 ; libaacs -0x28A30161C895D23FD2E45DD55E6663CD02B7A433 = _NONAME_ | V | 0xFFECE4A931EA7B7768F5172B3480942E ; libaacs -0xB9458CD2693F1E9BF11D8BA39E2ADFA265F57AEB = _NONAME_ | V | 0xAC5A5F9CCDD69E68B258200541E7C3F2 ; libaacs -0xCFD6886B4FA9DB84224BC05350AE7E29378142B0 = _NONAME_ | V | 0x00888DE393B1404C65569CD180069F0E ; libaacs -0x59B34BD16A8267681E1777A3F9F48A866C6A4A8F = _NONAME_ | V | 0xBD55470A4FF820C1C555177D9E6FA003 ; libaacs -0xAEEAF2572F21176B79E31B96FBD8E3264648DDDD = _NONAME_ | V | 0xDC1CF82AA4316640C2CF975860EC88F0 ; libaacs -0xA4BED6EBA6059B0FFF9C160C9CFD97B1AB4FBBB8 = _NONAME_ | V | 0xA7DD93951051937056CCB9DB7974CDE4 ; libaacs -0x1F41BD82C041BC545609CF52A292F3F9127889F2 = _NONAME_ | V | 0x01C86219A9C5D76EF36CC2A730AB32F2 ; libaacs -0xE2F26E96980E4798C0EFE0F36C0493A8D828912E = _NONAME_ | V | 0x8AA94B76DFD354A1896E6AE0A403E3C3 ; libaacs -0xE84090AE839DE40BC596C3D4F046F5E7D926FA1A = _NONAME_ | V | 0x48293CA45D7136A0318A77461BEE8EE4 ; libaacs -0x9E1BDD728B8C148A7EA8B5A51F3BCFCCF00F610C = _NONAME_ | V | 0x0C31D81A51CEB3DC60CD8D38C0F64D5C ; libaacs -0x08D19E940B236D6F5C7E7B03024129845EABFBB4 = _NONAME_ | V | 0xC26321BF611F5E66F91F9BF81041408E ; libaacs -0x4684508FFF1106935C0FD9390DF82C3F98041344 = _NONAME_ | V | 0x4747DAB9D8E2F2E259F8CB7D8AAEC3AD ; libaacs -0x7C287ECABD2949A05B51B92507035460FBBAE9A2 = _NONAME_ | V | 0x1A69CEAB62A4AF5B0FA0CBE7A3581B37 ; libaacs -0x59B3DBC35F55F930246310FCCB52A450DB3ADB7C = _NONAME_ | V | 0x7A76948C935A7B092ABC8484600D2FB6 ; libaacs -0xAC17EE10DF9039C38B2FA29D362CB68E9F888218 = _NONAME_ | V | 0x0715873AD7FED55A4A0BFD3DF95D4556 ; libaacs -0x9AE851DDDAC537B7C7B64D5A9D9E5598968C49B0 = _NONAME_ | V | 0x940CE81EA5BD2C21076E77DC8ACD4774 ; libaacs -0x58D1AD8728DCAD75532AB2A7ECC92C96BBA34F1D = _NONAME_ | V | 0x28C517A06D43F33123BF932B2B929B7F ; libaacs -0x15B18D122F3678264B14DEC14233CD48440A9FAB = _NONAME_ | V | 0xC81AE13B25D8D4BAEEC30492F3477B69 ; libaacs -0xCE2ACC25F6D0498BBF6F528D0A65487475BE5C06 = _NONAME_ | V | 0x8E3DEB372BBEDF8EC329943256958D98 ; libaacs -0x8255877F248AFAD5D8F08C75A0C4589BE288B326 = _NONAME_ | V | 0x8264D1C7AD39153E4E33310E83579270 ; libaacs -0xB369CBA97AD478FC7109A9AE859245258DD208F6 = _NONAME_ | V | 0xF6D19F936B51CE22932F84B8CAF033DA ; libaacs -0x2194EA4D32DCC5E0B0E97CB7A2FD42BCE6CA53F0 = _NONAME_ | V | 0xE3E432F8385D66B024B79DE309364295 ; libaacs -0x274C317F5CE69614FBB6901AE1334D651F309A4F = _NONAME_ | V | 0x7E2B089F3EE00D05689C810C1F47EB48 ; libaacs -0x7C3FFEC088CEDF3A7F3CC7262622AAA10C9FDF69 = _NONAME_ | V | 0x38073C2D92456313C7EC657F118F8433 ; libaacs -0x053E8B11C773B89DDDEE33BB5C68BB145C433D66 = _NONAME_ | V | 0x7B432D78E8E4F06B2DAC9BF0C78B0EE2 ; libaacs -0x7EB9D9E2735BC969ABB2344E0115A6001C95D544 = _NONAME_ | V | 0x7C78E04B985B2C3977B2564BDCA7BC7D ; libaacs -0x4EC78B9EA149B93DC070358BFEDB4278C15FCB4E = _NONAME_ | V | 0x5D88C0F25EA8D5C73F1B5ABC2A82AC1F ; libaacs -0xC52869027C3C8D7F3C3BF8C27BF1E571ACC5DB3E = _NONAME_ | V | 0x1B3EAC97C0279AA96656D2475EA838D8 ; libaacs -0x88EA570C1E79778B996DF54427796DF7D3516B52 = _NONAME_ | V | 0x004E3F7346E344287858563A0D667A90 ; libaacs -0x7BCBBAA15ECC2C165E56D68E4C7DD72737D772EE = _NONAME_ | V | 0x37D9FF66BE975C3D52E34658E6120A3B ; libaacs -0x7772066B5C60C4BD9F5826465641BDF2F390466D = _NONAME_ | V | 0x5572198C290F3D664390FEA7086A7D87 ; libaacs -0xED495A05DA8E658DE531A4D13FC435605DDCADAA = _NONAME_ | V | 0x4EFB9A2F8FA8E2A65A6F1101969EC3DD ; libaacs -0x2EBCDB0432D32614398B60C680BFFEAB668B34F5 = _NONAME_ | V | 0xE50A27AD02ACC4CE2E61D5F53ACC036B ; libaacs -0x510548250B80BAA053C5B73C1B95F6BDB53BAB4E = _NONAME_ | V | 0xFDCEC83A8CE5D1CB58113EDCD6480486 ; libaacs -0x74E3D45094CB3D116868FF030D772362BFC335A4 = _NONAME_ | V | 0x04358629FB1BE3528ED612B9905E2EB5 ; libaacs -0x21F2CE12AD8BEC238A944B424924E0C6E16A15CB = _NONAME_ | V | 0x64E4C5F8E51A0B2A0CBDCE8B5ECA5C20 ; libaacs -0x1469A4EC0F4269020C5700EE3B906DA1BC9D09E9 = _NONAME_ | V | 0x0FBAE76B424D3F818E08960F1A7C3712 ; libaacs -0xD568439AD3426ACE8A1697FC43243C66AD0EECE3 = _NONAME_ | V | 0x92A995CB36B8FA162F14772905D3C0DA ; libaacs -0xF3CE63D73A4BEE72379FCABDFBB9CA28F828FE5A = _NONAME_ | V | 0xF5B7442E6C84E1A12E2FB8C36B28757B ; libaacs -0x481A56A23FC676ED29D278B703BB4C552EEFFE34 = _NONAME_ | V | 0x365D6F0092F4C526D5C971D8798D41DF ; libaacs -0x46F11A91D27EAE20AE85F0929275D1117C9F1CBD = _NONAME_ | V | 0xFE3520CA795EEF27950913C3AEFE60FA ; libaacs -0xA3DB3FFF6D9C5E25E8594B448C4D818DDB5B40C9 = _NONAME_ | V | 0x53286EE9608AB2FCCCCBAC34BE271928 ; libaacs -0xE7BDAB2BD03DE8B35CD9FD8E3F2A52FE701B83C1 = _NONAME_ | V | 0x89C758745FCE0AC8D29ED850B5836882 ; libaacs -0x1654B4CE4900C5B0AF3FE41F4382B05AE165E094 = _NONAME_ | V | 0x8DDFF863E0108475168C6C8903CEF536 ; libaacs -0xE57EA0A92692092D26D95BED783146CD6FA4E6D7 = _NONAME_ | V | 0xA5799B4A6D3CCBFD1234752FFA8112EE ; libaacs -0x24E2C4A80607FDB38C471F2A3DEA2F9F77437944 = _NONAME_ | V | 0xB46E447C6837E8612BEC929750504E1D ; libaacs -0x2FEE64304A3E7DE85CB5D816652E41984B58CA4A = _NONAME_ | V | 0x273D10BC241E4A8B1D91E05D433AAAAE ; libaacs -0x158655DD7350043B8885FCEC150240EE01A0E8DE = _NONAME_ | V | 0x3575DE5CED678C3C9823C65F1DFA6C0B ; libaacs -0x618C9EF79BDCB964C5776824B33C2DE4BC3EDE43 = _NONAME_ | V | 0xC2F3B8509F9F4ED538BF54B13F107C12 ; libaacs -0x543F45FB11FB9809BFA43A31CF02697225D461FD = _NONAME_ | V | 0x4F6EE651CF55B9A6435475B78F435F9E ; libaacs -0x16233B2BC2374A91FA5CC067B2ABEB1D18BA48C7 = _NONAME_ | V | 0xA99F505FD68B53717BB9BE2161E8C47A ; libaacs -0x99CADBFAD45A68F0223AD0381E5954F4AE084C2B = _NONAME_ | V | 0xCF99C9ED6A0C9016ACFEB2FD5B186015 ; libaacs -0x85B0958614117C25AB3CCC96FBCBC947A768E16C = _NONAME_ | V | 0x7F3BA2045CE30325BEA2CA68F9BDD4FA ; libaacs -0x816C63964AE35970471078D0FAAD7DC9B09C93FB = _NONAME_ | V | 0x06E1F9DE97ED8A3767960B4B9DBAF007 ; libaacs -0xE015C034C66C67CC5CB9D7859829C5115C5B765F = _NONAME_ | V | 0xC162A318651AE7619E28A797F0AE234C ; libaacs -0x0FDF04E55B4AD0665046D601CEDDCDF98A1C22C0 = _NONAME_ | V | 0x9FBC5C9D2B7FA59B369EF0D89C759320 ; libaacs -0xBCF0E26E608E1512ED44DCAE36D879DD03A58C3E = _NONAME_ | V | 0xE9A3173C76BC326E6BF60A2D3AEF44E1 ; libaacs -0x6C5444E3A38A9F350B642DBB934F6DD7EDD255EB = _NONAME_ | V | 0x2E09F163699760B4F2245279CD139580 ; libaacs -0x26D53F743F5A2CC0B83E905E6C4FB6C6122857D8 = _NONAME_ | V | 0x793CB65AC572AADA49E5D28873D2D10F ; libaacs -0xB794671BBDB7719C0FFC7CA9BAB13A705554D744 = _NONAME_ | V | 0xD6DFB2E2FD693A0085ADBB2A32E27B65 ; libaacs -0x4F1B442963DA26DFE98177DD2D94BB7046C903EC = _NONAME_ | V | 0xC8A9A5722393B47CEB377590E90F101A ; libaacs -0x0B4EE8B819F6B0E010488C53C07DF4C67D8CA3A8 = _NONAME_ | V | 0x774AFA599CA5EB6B21F5039A734420B3 ; libaacs -0x6C9F773B0B552309E50805A090FD06BE461CA5DC = _NONAME_ | V | 0xA17D08611472C29F413F3E9AF93DCA1F ; libaacs -0xBB8905B6548C684FF8A21C61B323A70B5FF3CAB8 = _NONAME_ | V | 0x3C5E1DE35AA0690D3470002057DFE2F5 ; libaacs -0x22C8988404F98D61F8078CD5AD421D888BFFDFF4 = _NONAME_ | V | 0x12F39251C9F939B40739FB6955DDA634 ; libaacs -0xCFD4F02FB037FC7E3C72CCF4E6F8AADB55FDECA5 = _NONAME_ | V | 0xE7E13BE20B2855E9B18F2309585F6D33 ; libaacs -0xDE54DE4A4562A745EF2AA72484BAA649F58D3873 = _NONAME_ | V | 0x560819B727BAF3EC105509105E6C2E70 ; libaacs -0x53EBF0CD02B62BECCED3B00C0FF2ED92826925AE = _NONAME_ | V | 0xD78CA3566788F977F0227CB5153C8E6A ; libaacs -0xAA07A9EE2995819CA621DAE51A52842D60575F2D = _NONAME_ | V | 0x60DA5DB92A2B47D036D61BD1A8EC4F5E ; libaacs -0xE1586FFFF21FD7DAC1D57D75507FA35AB31D111D = _NONAME_ | V | 0x70D6E5F767D5EB691B8DE6D102319FAC ; libaacs -0x67012439344B09080EF6607EE081F17563E6AE83 = _NONAME_ | V | 0xDD4FD9560277E40C4A188B14CB12853D ; libaacs -0xC50BFAF501308CD2F6BAF283C4164F99D058DBBE = _NONAME_ | V | 0x26B1F61F27357EF1BB4238A57F1BC5BB ; libaacs -0x0BFA5BD70B92D10E334F9ACB872A166B80502A7D = _NONAME_ | V | 0xF0CA04E4485AFA4B803E5C8D02BE5C0A ; libaacs -0xADC483E2D07151D4B7A309E7589C82F1CAF6A962 = _NONAME_ | V | 0x69F7C75CBCCA2EA8BCB106A283319F12 ; libaacs -0xF89E005A7FACE6744E504185D5C3C2F84E6D5FB6 = _NONAME_ | V | 0x3640AAD285E16F5A8BC39EEEF3364304 ; libaacs -0xCF18DA3B6E35585B64EA3B7E1CC72C7B339F2DC2 = _NONAME_ | V | 0xB3A6DA57CE0979F174A452847DF65C13 ; libaacs -0x9BC3FAD5537D2CB92E7BB25D6DE8573D295339AB = _NONAME_ | V | 0x3CB95463D50CB963B556BE884D3C3FFC ; libaacs -0x199D166ADF345AEA576936D6FD02BFA5D47827D3 = _NONAME_ | V | 0x6E0C2FED108C3FF58E28B9D8FE458EB7 ; libaacs -0x8067579FD5400F68BB76FA29E47C2451F9115A42 = _NONAME_ | V | 0xFB7AA8DE2FEDE137F7BA6D71423B79D3 ; libaacs -0x4AA1CFA49E37C30198E797006C8D871A7F60EAC3 = _NONAME_ | V | 0xCBB21DF3CC445F39CA793CECB8738220 ; libaacs -0xE221854196EEA5C5A13A1FA032F2050838694149 = _NONAME_ | V | 0xAC3A9510C04D704643C11C5DA95E1C93 ; libaacs -0xAF5E90BC4E931A5A5C69A4BD7931A4F997992098 = _NONAME_ | V | 0xE014780099ACC45D6E23B9607652F6A2 ; libaacs -0x7EE312280DC284988DDF0B12725E05A7B5C9FAA2 = _NONAME_ | V | 0xEC904A210C6DC0C2AFAFDE65C165E005 ; libaacs -0x8DC5879BF3FA7AEC6F81E09FD7CB73889CD092CC = _NONAME_ | V | 0x96B380F6F3DB876B59D9CDB865FA1852 ; libaacs -0x0C3CE27F9096D3D5E8BA07B614520FB93AA7AD7F = _NONAME_ | V | 0x7EA2BF7E9F30C53005EA2D4EB49B9B93 ; libaacs -0xC137E33477E30510AE9A012250CDCAA4061926C5 = _NONAME_ | V | 0x856A9A49B3ADF86AF1AE4E51853832E2 ; libaacs -0x1FCA2B8D4A891AE7B12DE2AB990315B89EC8E623 = _NONAME_ | V | 0x57C2B264A7EAC26C4FE8E3169ABF84D3 ; libaacs -0xA54DE07D793F58F1B596DC3457EF7370E6BACD79 = _NONAME_ | V | 0x21E9541AB3BF9E7AF2458A457E077B24 ; libaacs -0x98C8B8BF6C82036B3EDA90FDFD2A11654AB16D22 = _NONAME_ | V | 0xAB98BB625EA734CE260EFEBE034770BA ; libaacs -0x913D508CDE993AD14239C3BEC85459B0959F4242 = _NONAME_ | V | 0xFF395802188F3F9E5268775E44C1AE23 ; libaacs -0x2EADFC550672B643BB4DBAA71E6684FEBD5C835D = _NONAME_ | V | 0x8E2FF12D047C8CF28C3120154AA4F7DB ; libaacs -0x2539A4D2D654ED879A3D664ABA52FD1CEC90A02B = _NONAME_ | V | 0x7E0C75FD6A7F1295E85DE24C1315E31D ; libaacs -0x1FC0CC4C07D3C4ECB3F58582C640118BFBB25614 = _NONAME_ | V | 0xA6E6763C1723086721E16082D576924A ; libaacs -0x29E7E712A609B51A826E198CA93F0808B9B0774B = _NONAME_ | V | 0x856AD8ECAFFE90FA1AE248C6989DEA14 ; libaacs -0x348B3D752B9506F9CE0DEBE24CCACEAAF6DFFE59 = _NONAME_ | V | 0x80F2E4A4E3532F80A8E27305537F6D78 ; libaacs -0x273B0CEA835F17F799A9AF46B905DDFA48EA1D2A = _NONAME_ | V | 0x6CADA82BA53A068EC1D9F5CB7247F2D1 ; libaacs -0x9678E99C639F33AA16E3CD70DABBFDC76C4C08D7 = _NONAME_ | V | 0xE5206B7AE124FB4F406E872439211527 ; libaacs -0x5F21516C9E2BAC7976C244943C5E1FEA8225FFC7 = _NONAME_ | V | 0x749FDB223FF8F4A4EC29100E782C01B2 ; libaacs -0xE79371B1AE2FE161254E1D622DEFAFE69B80E65B = _NONAME_ | V | 0x0FFD1BF5086DF8F437045CDCDAF2CF3F ; libaacs -0x20B423576EDB1A0429A901EB499AF0FDFD5973CE = _NONAME_ | V | 0xFF3780E3341C04B121BF783619A3D308 ; libaacs -0xB789B0D2ABBDBEBBA53D84067E55D2DFAAC467E0 = _NONAME_ | V | 0x28FF27880824DE663630C4DDE195DC28 ; libaacs -0x8DC981C550E6645AF8631406F7D657FA35D40CB9 = _NONAME_ | V | 0xE93236E87FE15F4955A419D13B817773 ; libaacs -0x44BBA730EB758380F68D03C4BA64F5442FFBA771 = _NONAME_ | V | 0xC2AAA419A88EB434CA1FB8560388302C ; libaacs -0x9CCF178B34285B3B10798F54F655307F621CCC5B = _NONAME_ | V | 0x20EAC783192FF0BEC6C2FB46357C3B94 ; libaacs -0xF4AE03FF911C9003834A273D38CE981CDADD2F3F = _NONAME_ | V | 0x02E5F50B7C9019CA6B80DDA415FACA49 ; libaacs -0xF14E42994E5BDCD36DC96A929E81E9DC331E39B6 = _NONAME_ | V | 0x2D2D15A3B8BDBF22FC85CE85A669D8F1 ; libaacs -0xD240988DE6E92D0E2487869E870CB9FD02C0CA12 = _NONAME_ | V | 0xC5F73CDC1BD8AACFE935588593A41538 ; libaacs -0xC7E913C7EE17D3950B0FD8E0F2C9C6F98D1D4BAB = _NONAME_ | V | 0x04224BFC032E8B988487F03DAE5EB405 ; libaacs -0x56B281EC6433C612D66791EC7F66921BE4CD2DCD = _NONAME_ | V | 0xBB769C6591DB308938D958E26424E6D9 ; libaacs -0x5850AB327EF25533D74A3DE67903A3BDE91495C7 = _NONAME_ | V | 0x0746F444BCE22FBBCA35ADC5624415A2 ; libaacs -0x2BC006ABBC05A472AD761C941390A817D7B1B70B = _NONAME_ | V | 0x5542071CB13647839BF579ED8742B461 -0xD2D1E18CECB96A7C00F5161A3CFE3FABF599F11B = _NONAME_ | V | 0xBDCDEF35C0A9AE492115D3543D99BA81 ; libaacs -0xD28C3C9014A4932E74A149985CB4E572433D4C1E = _NONAME_ | V | 0xBCDCA8DDE52B0E8DCF4E7C7FC2F87810 ; libaacs -0xBF350066A6B41298FD9B0F592DDDFB81EDFA943D = _NONAME_ | V | 0x2B52449EBB2042348E53E2302A0B4D86 ; libaacs -0xB678E3653D53C1B0836CD4F1F2EE24E11AB31D51 = _NONAME_ | V | 0xEB632C537FA386A82D87956F6DFF867C ; libaacs -0xAEE67EDC3F0DC5433496910B6117CADF4E2792C9 = _NONAME_ | V | 0x6A84B6B81D25C0240E648F34EDDE79B6 ; libaacs -0x9DFFB2DFF14449C6502F61A4D7DBCD0261B5BF8C = _NONAME_ | V | 0x77D51A40C2C630042AD30F3AD7FBBCE2 ; libaacs -0x9DE5F9AA2C5A19D3105762C2A2CB612A82E9094B = _NONAME_ | V | 0xB8B15C7F8C86E2C4FD935B14F3D14C20 ; libaacs -0x9A385519C6D1DA396A62BBC420616D71F28A47B5 = _NONAME_ | V | 0x450CB36B618302C99CCAE4C8087C2297 ; libaacs -0x85560F28570F36EF468AC4B6B60F8817E6F3BC79 = _NONAME_ | V | 0xD92AEBF10A813D57CAC85FC95205886B ; libaacs -0x79735CAA8114A651D4554F41BC915E68A851320C = _NONAME_ | V | 0xCE371F68585414E32C17764B3B5BCF09 ; libaacs -0xDB76561635753F587BC920F93637AE8C398E925E = _NONAME_ | V | 0x564D42E23B03F68355398350A9A36D77 ; libaacs -0xF5F352FB7F8CAB5B51E46C04A0A7E45AF4A4339B = _NONAME_ | V | 0x5B0FF5651DCCEEE3EE7C684227D067D4 ; libaacs -0x73A83503754CD8F25B46B0234FDB565AD826D879 = _NONAME_ | V | 0xB4141CDC232ECBDCF98BB05C9179654B ; libaacs -0x88A4F141987FE5C8CCE71D26E9EA7EBCB8C8C448 = _NONAME_ | V | 0xCE430B88A5D5E731C9A679ADE493AFD0 ; libaacs -0x947543F96011668522C1B61F78BDAB813AF17559 = _NONAME_ | V | 0x473E540C4B9E5ADCC58E13A99DCE39E1 ; libaacs -0x3993626279365FCCAA78F063F4636FC08429CB0D = _NONAME_ | V | 0x6CA4CD7FD7133BBED495B0DAE7F546C6 ; libaacs -0x8DC6791E686787CE84B7C0D3CF00308A32C3C753 = _NONAME_ | V | 0xB928E27CB306D91F218D5009814E7277 ; libaacs -0xC2B0A7AC00F440CC97F260034908EF16DD13459D = _NONAME_ | V | 0xA473E283E33AB5F2C03E1AD500023E45 ; libaacs -0x85C271FBACE8E0A48C8540158E04D87233754D0B = _NONAME_ | V | 0x22CDA23D5C2B08DCC16698C0DD90835B ; libaacs -0x7E312A4D0661DF06620EAEB97166B0CC7609CDA0 = _NONAME_ | V | 0x75083753550D76AD0F111260644DED24 ; libaacs -0x26F463AA4A1754589AACE1E1EAB26E950C9B8C84 = _NONAME_ | V | 0x898567FD01F38EDB660F0906D2193C45 ; libaacs -0xFFCD6FA291A3AEC03BABFF8D2004C85E53E74557 = _NONAME_ | V | 0xF7A563E70F08EBA61F21006B182567A0 ; libaacs -0x298CC15D51E4E83A51B1DFA4CA661A6ACA6026AC = _NONAME_ | V | 0x6CD22F6DCD80B4DDB059112BFA4D1DB9 ; libaacs -0x72BB889B7F5C164DBEAD279A0CA1BA5F4D55B9C1 = _NONAME_ | V | 0x4F1E4BA4ACCE347BE25B59F60D5ECFDB ; libaacs -0x69F825FAF074296EF45EF03BD8C9D665D133598E = _NONAME_ | V | 0xC1B5ECABEE64028520CEA1073A36C354 ; libaacs -0x3622AB14DB1C97EB00E101D76EC6D10EDAB4C9D9 = _NONAME_ | V | 0xDAC9AB7C8A2D3F1311E8995B8D016207 ; libaacs -0xDE9404D1AC3FEFA04FED0CDDBF1D38A36D823916 = _NONAME_ | V | 0x9EF8C2634B1CE090367ACB22DBC66E28 ; libaacs -0x67EE76B95EFAB80EDDD3897D9483C9A5530F5AF0 = _NONAME_ | V | 0xE7F1A0A851DB5495848D661484EF1B50 ; libaacs -0xDA960CD7A530199AEDC5DD368AEBCD4C48E71560 = _NONAME_ | V | 0xEAD44C444661195E0EE9704EDDFAC17E ; libaacs -0xC0343AAF913CB26BC10968FC091A9B037322E2A0 = _NONAME_ | V | 0x96F6FBA85A77CB52FB7432C05DCE1B0F ; libaacs -0xD104A0F118B9C457626809DA0A70831A70C7ECA8 = _NONAME_ | V | 0x5C0670CBA0297B313E8C7B1C985CC2DC ; libaacs -0xA3D3301E3E6B0009A255FE0FF6E7A021F10FF47A = _NONAME_ | V | 0xF2EC53213F4DC5F77D72A34E88BA8C15 ; libaacs -0xC88FD8AE440603E3F5A8BA859D8891A5F0DD97AF = _NONAME_ | V | 0x32C4A6E73A5E3286FA3C8A977D53CDB3 ; libaacs -0x3F3E4C4F8DABD493DF25E6C1EB5C60AD243BC210 = _NONAME_ | V | 0x42EBAE58BC6B21FA91FAD5BE14176DB2 ; libaacs -0xD848FCAE545E16A7E8706DAB343811CAB9B9F91A = _NONAME_ | V | 0xFC751115238665F86A46ED6393F28471 ; libaacs -0xD7798A5AC0DF28CA428EEF12CF4B9C6E9EF4929E = _NONAME_ | V | 0xE0C67BB6134FA214D6B93D626C7484D9 ; libaacs -0x04C2E120AF1CB4E880E91353A89D8513A5223854 = _NONAME_ | V | 0xE726CC1A6375A4A43F110B3D1DD4855C ; libaacs -0x04FC1751DBDD4517FA81D76CEBAA64F9E0457256 = _NONAME_ | V | 0xA7CCEE19FBD1AB1E6AF1A6070393DE17 ; libaacs -0x5E01EE63B897C9307D6929319D4D76D45CAC8914 = _NONAME_ | V | 0x1937853B6A78A1F1B4B659149238DEC0 ; libaacs -0x5CEA9216AAFBAD57B248178CFB572E28CB90F768 = _NONAME_ | V | 0xB951165A5983743A93C5386E9DF1E658 ; libaacs -0x5AFA1C0A89AE0F80B57BAC534DECD583E279D357 = _NONAME_ | V | 0xB4BE20600D2A380DD7D4B5E70F3E267C ; libaacs -0x4E7C911DFC800CD18BFE477DA70362768A32F92A = _NONAME_ | V | 0x244370A80EC1C97BA5E4989CC105D0C3 ; libaacs -0x468548E3315C543D480F6DAEFF94E4E95AE25BB4 = _NONAME_ | V | 0xEF6166A1B89A4AC6B86B9DAE749ADDCB ; libaacs -0x422052A0A93F8F4038E06DD70FEEB96A8BEEC95C = _NONAME_ | V | 0x5013417804FC0C292B8BE08D9EB7F89B ; libaacs -0x35CE824FF2993A0815B8B60DC9C9A3E2133CA67D = _NONAME_ | V | 0x95A4A8A946A85421ADAEFE9A41D3E2A5 ; libaacs -0x21D1D7004111126071AF5BF42E3D3F355B27E75C = _NONAME_ | V | 0x14301BF8282CEFE33B543A09741AFA98 ; libaacs -0x14543FD5CD769FE4F23DD812919682C4D82A640D = _NONAME_ | V | 0xB4015D871C1680A3B0DE1BBC1E15F23A ; libaacs -0x0D5E4798B34EF1D66BAA71DABB506DB52F8E156C = _NONAME_ | V | 0x988DE07FAF6A14781DE73D21EAB6BBB7 ; libaacs -0x08ADF1D1F1F0D5F10554E81A7717A0DBDB974A04 = _NONAME_ | V | 0x03436333953B0BF8E51322F1541CBEAF ; libaacs -0xBE8312D272DAD74818F1421F7C52BF347A3FE3A1 = _NONAME_ | V | 0x0497CE2F98215F248E60D5AB0577C34E -0xBC76211D7E1BB3CB70E8C0BA5DCEB0D02A16784F = _NONAME_ | V | 0xD3E638A0FA187E80DD29B4435C288283 ; libaacs -0xF3252261F9BBA5012462D6AEFC4A2024894A633A = _NONAME_ | V | 0xF3EABCDBC5AB88F33DFEFCD6F98D0B39 ; libaacs -0x3F5A7727C4E7743604BA6705190FC939A60E2394 = _NONAME_ | V | 0xDB9ECBDF8CC709072869BF64CBB4FE8C ; libaacs -0xEE197FF4EC67C2A75891628AC62DDC61A126AC13 = _NONAME_ | V | 0xB2D2CC33DFB1ADBC8CA3FCB261611368 ; libaacs -0xF7B2B4EC57D8608081B6BE9989843992F62B0C49 = _NONAME_ | V | 0xDABCF1E407D75A253BA9A5D1309FB978 ; libaacs -0x9941FB78A7BB88DB066E6AC6085AA75C97249F60 = _NONAME_ | V | 0x38697186D6C953A3BD544BDA0D11A3B8 ; libaacs -0xEA363F62658E18B87114BB3C78C97A5E0E28F6DA = _NONAME_ | V | 0x536FD61FB72157B52CC9456B5AAF8F61 ; libaacs -0xFAF8D069FCD7A0F73F29925235AB8D92D6F06F84 = _NONAME_ | V | 0x5926AB7C81517D66ABDC962CE109E219 ; libaacs -0xF03554F905166AFD49B0117F4B22E507FABB2EA5 = _NONAME_ | V | 0x07F00F9C679134FE9DA785348C3FDFA2 ; libaacs -0xCBC53A56C923BE4ECDD295F16DCCD62CA724617B = _NONAME_ | V | 0x81B38A0F2D197E86879F839F8B5E8E98 ; libaacs -0x0D57B0919102128F10C8B0F267040B5796D9E856 = _NONAME_ | V | 0x90FD354855EC59B636A9C5E64B085F0B ; libaacs -0xE7C148924BED4D3AB831199C3881869198864153 = _NONAME_ | V | 0x124AA87F82D31CE54E05EE439C713DB0 ; libaacs -0xCDBAFB728080E71E4E692ED3D46130336D8AC722 = _NONAME_ | V | 0xE464201473CBA15D5709C32188DE1099 ; libaacs -0xCBAC790E884AA79C118F0050128F262B61A49E4B = _NONAME_ | V | 0x52BC95A4BDAC9E6B0ED0B6F68CBB07E4 ; libaacs -0xC2F4B86FF80AF95D9CA6189A4AE55B7E487F69A9 = _NONAME_ | V | 0x577A8BEEA95F1C23E35B2D316E99A8BF ; libaacs -0xBA5ADD8B07B1269A228AE745E53B83B2B0116195 = _NONAME_ | V | 0x401641352505775B7FBF6478A6C0FBC7 ; libaacs -0xD11FDD3B62483E59314FCD02C24C984B92DB2C6D = _NONAME_ | V | 0x6254F7DDB87A394DBA94921BABC3607D ; libaacs -0xC18F5394F9A65F1C371D34B97E3A0D7593CCFE85 = _NONAME_ | V | 0x8DBA90A7AA6A80307DFCB314A342E382 ; libaacs -0xDA09E528919F50B35737862970C5640B554E82F0 = _NONAME_ | V | 0x7EB2814C9D3FC7DDD95EC38447F85EC3 ; libaacs -0x3B150AE6D5A73AEC34C36DDBC755BD72DABC19F9 = _NONAME_ | V | 0x28CF2D00E84EEB6279F512B8850FE8A3 ; libaacs -0xBD12A74F0ACC2E2FD2DAC6A5DDE608D98F6D0D82 = _NONAME_ | V | 0x2EADADB06B4145B4F4FC3249E6106B4F ; libaacs -0x226E96DC15E894E93CEB5922E08C6D7FBEC3268D = _NONAME_ | V | 0x364D52499B03D0997124480184A2CEB8 ; libaacs -0x7085B282EE0A75D2D4EAFD2297EDCAC636640300 = _NONAME_ | V | 0x13546FE510089BBF92E037B5BB54D5D1 ; libaacs -0x71075947E09AF0C3BC603B453F361E5CBF16FE74 = _NONAME_ | V | 0x0B9CC70CCF58477BE73CDA436C749E29 ; libaacs -0x08DAF1783E64C2D32D57C2548186412CD2977F9C = _NONAME_ | V | 0x63C4925A365E730B9618004367977A7D ; libaacs -0x1A685305D005493B69C19AA887ADC0E03A819875 = _NONAME_ | V | 0xC668DA28CB1A6F4FD381425EEE26D8F3 ; libaacs -0x4B1F7052E5AC3314CD89B6349AACCC3CD5DB8DD4 = _NONAME_ | V | 0xF3B1596E63001DAC7691359FFB048743 ; libaacs -0xA55EE8B51E48D88C6E9E2B26AC82D480BAA2B766 = _NONAME_ | V | 0x11FF9CC897305E3F042B2FFC1221BEE3 ; libaacs -0x15C73F43ACA8AD39E76166DF020EAB03F8CCDFDF = _NONAME_ | V | 0xF0A42F4E4701D099FC56B8FEC967550B ; libaacs -0x16A504875727CB26A52DC9D5E55775C1A4E84636 = _NONAME_ | V | 0x0CB917F6C085EA0A95A0FE531452A7DC ; libaacs -0xA96C89D6E3CB79E0ECE198F7D8F16A221B4CEE19 = _NONAME_ | V | 0x375F2C5E4951D7A8ACE612AE1C18EE14 ; libaacs -0x2E75C3F79DCE8CCEB08ABE0E08B666ABB12B007B = _NONAME_ | V | 0xBBB94D3657CC8287D53A04CC9951649B ; libaacs -0x7F4D89C902E5E70061B0B86EFAFF3FF935C6168D = _NONAME_ | V | 0x78CF161DFAF9B034FB2996F676807326 -0xD377EE75BF8FB7D6D81369ACC64DDBD09973B72D = _NONAME_ | V | 0x758C81BB55030A863B11C0ECC5E53CFD -0xAAF57DFFE7D306D25ACB0192DF53CD283B28C2E0 = _NONAME_ | V | 0xAB0233F0EA127757A8AC7238FB1A386F ; libaacs -0x36AE520E6500AF86AAD32BA0B0ABAD2F4680F432 = _NONAME_ | V | 0xA5B6A02464E513115AB84B384A8970B2 ; libaacs -0xBDDDF2892185E1F8F94424465C671089A34CAC67 = _NONAME_ | V | 0x56A521E03323535F32867BC6DE6B4628 ; libaacs -0xA1326C11780C18B6E6C71DACF7C08E9E589E77BD = _NONAME_ | V | 0x0590A96D8298240AA12C918A8073A19D ; libaacs -0x00E0AA08ECF244CFBC8D39B8E92B978147FB32B9 = _NONAME_ | V | 0x368D4272631FAC26AECE75E7A62B3D9B ; libaacs -0x31256135BC8DBCDE05D23C2409CF1287A7D7BE26 = _NONAME_ | V | 0xDA7CD16591E87E5B027D720E7E7A23F4 ; libaacs -0x4C09CA44686A8017DEDC02D0D84EE75EF7F9B59C = _NONAME_ | V | 0xF5C3E72C254CC48968CD53E1E387281A -0x4D9EA248D87FFBA9F472AED795CEDAF01AA23F00 = _NONAME_ | V | 0xD1E2DB0F8039943F86059E2407348B7C -0x0ED4ACD3657CBED3B6EF3803615BE2291AA6F307 = _NONAME_ | V | 0x6AA8F95E81FF50C9678DB55CB4E7A23E ; libaacs -0x6449C8C2D2C507FD51571064E0A422CC0129E04B = _NONAME_ | V | 0x435189EA94575B14E01D22FE7951AA6E ; libaacs -0x6CA4EF8E990D0EED5CE18CF363E84F3B50C89E4B = _NONAME_ | V | 0x672A3DA898A8A8F49FE00A9FBF87F786 ; libaacs -0xCCDFD6000814E1CE3CC5C0DFDB7A41F8424C5B09 = _NONAME_ | V | 0xCB268F7BB3587BA9A9EA9297D59A250A ; libaacs -0x8CAA924D5CECA81044E5E76B23665DFFAACBAD87 = _NONAME_ | V | 0xDD40EE139E924C1C3ACD20EAE5773F51 ; libaacs -0xF2053589FBE5CCD880A8BEC64509299F59C6D3F9 = _NONAME_ | V | 0x9E55E4BCF7F456935EBA3279DFF70E21 ; libaacs -0x1F8A6FEC87AC8EA1CBA6E64BAFADDB96DAC55039 = _NONAME_ | V | 0x37F83BEC8627A78ABC1D77E959A5CAFB ; libaacs -0x31407C81357348FDBBF972B4D184998B16091F43 = _NONAME_ | V | 0x2F66CEE2A0B3FB097EE28153EA1BF46F -0x49C64DBEAD316162D55631E617F3F94431BF9B93 = _NONAME_ | V | 0x2B2DFB7286590191D3F14EC7A0F1D3DA ; libaacs -0x733D8E1612399E0B66D0EEA0B394959DE781974C = _NONAME_ | V | 0x1486852B7FF16AE508BD33E29878C02B ; libaacs -0x461B40EA3E16CF1CCA54799704808700F69C9D07 = _NONAME_ | V | 0x7D67B1A73CAAB9A79A5E4EBBC3CBCCAC ; libaacs -0x32B9089EA16C6568E4AD5FB3AC01A8376DC30866 = _NONAME_ | V | 0x6F7EB7700135B8844416B23AA9C538DA ; libaacs -0x274B8013B6142FB134181BD72A259ECF304D4960 = _NONAME_ | V | 0x885B83428C1D138F050A192FD45CD751 ; libaacs -0x67D4AE7541500E2E0EB2E14A278B7A9C189FC048 = _NONAME_ | V | 0xB2EA9DE1D8570E8A6C8BDEF5C1771558 ; libaacs -0xC5A25756C1C447AB2AE98AB56EEC2FDD04740E2C = _NONAME_ | V | 0x2925DD7FD73A38607089CB9C535EBAF8 ; libaacs -0x25D1D59CC9523346AF91C53178550C450E72ED09 = _NONAME_ | V | 0xC45B0E571394A6BEE96FD68528BBA880 ; libaacs -0xDD425FC86BD20D1103A3D9A5E2D1279FBFB5E1E6 = _NONAME_ | V | 0x3A03BF0A80F5B41322FACE6CAC9FF8AD ; libaacs -0xCFD64734DE7AEBD9234FD6726824A5A5F1FC3DFA = _NONAME_ | V | 0xFDB42913705C2CFF10BECC4FD88B4B94 ; libaacs -0xCA09917B7BEBC871034F6A353597F3081A4946B9 = _NONAME_ | V | 0xFA64EC977BB3F841C931CC52BF2CC51B ; libaacs -0xBCA2F31C5F56FD8E495DDA292D509D2B761D61D8 = _NONAME_ | V | 0xDBCC2C64002E7BFA0D7F09C8CC299F42 ; libaacs -0xDF9EF19E019657265EB398E0A9662C8A13CB62C7 = _NONAME_ | V | 0x84AC5320DB10A550D2058C1B398CF240 ; libaacs -0xEC04CED35E66CC7867CEE66AAE92EBC5EB08C74D = _NONAME_ | V | 0x4EE65D312DD557F9B66E0F438EFF0FA7 ; libaacs -0xE3A53710A37F009ACC62A21D47DA2007F4E8B190 = _NONAME_ | V | 0xDEC99A08D9A7B947FE200575C5E0043D ; libaacs -0x6AA4A3F6CE7994E8350CE6C147A5C68E868C9BD6 = _NONAME_ | V | 0x77CCA8008E3DC6D10A220545460EA0E8 ; libaacs -0x719BA62C8BE77C229566F640FA0143F863D86D86 = _NONAME_ | V | 0x8BC994FB7B0F48726930EC72674ECEE6 ; libaacs -0xF1D05264B7AE49FB90FC316124C46C69C3C95B79 = _NONAME_ | V | 0xE1CDA2C011E2AEA3CB45ED84A86FC9C5 ; libaacs -0x3E4B84E9500EA2F3FA3FF2471DB8B3E608CDD513 = _NONAME_ | V | 0xFDACD5C68E07DFA64A98AADF929CBE6E ; libaacs -0xDD8EA17E68E1223C03073C5A3DCF3042277F6D3A = _NONAME_ | V | 0x04C324D47E3934F14A90A3DB8916ECBD ; libaacs -0x71481492CCFDD6DDD0383B4902630D7D2997C5B6 = _NONAME_ | V | 0xAECFAC84A7BA908345EE9B5198C3E9FF ; libaacs -0xF7CAA277436F80CD3DFD4AFC550EC13440163954 = _NONAME_ | V | 0x683D97547D12566ABD569CCAF6837053 ; libaacs -0xB798BC9398DF19C1A63E7FD0B8B608774AE88B7E = _NONAME_ | V | 0x1E04C5EC9DA0F4EF9AD4E28ACFCE1640 ; libaacs -0xCAD905061A65C77183A27DE5BE253E1673B41D9D = _NONAME_ | V | 0xC0E37DE7F5D8162FB25E75393CB655AF ; libaacs -0xE675EDD8C539596A033C90173A3362D2EF08DAD5 = _NONAME_ | V | 0xFE5AD9F8595476AD8628E05AC2E8A43D ; libaacs -0xD72A10B2CCE54E458427B9BCEC3855AF0A7E660B = _NONAME_ | V | 0x95F3C9017279EDEE51EE740C856CDB40 ; libaacs -0x27A7D63871607E1910C84BF6A22B7F038A42B936 = _NONAME_ | V | 0x1BD952139FF04042DBEE6CE453A5431F ; libaacs -0x8182E098CBB609A633B77EA8257A0049B8E5E4BE = _NONAME_ | V | 0xC20A816FC1278B8F2921E73D813798A4 ; libaacs -0x45F1AB3D80806A955B6A2A0E4B5FF172CE8B96AD = _NONAME_ | V | 0x70D7C7833B3E4372804844C99AAA87BB ; libaacs -0x1F125971DC27B9BC806B31B8C4C70C8D0D38E672 = _NONAME_ | V | 0x6A91FB9C7C54A13404AF287300B97958 ; libaacs -0x72A4F95BDE052CCB6850916F9ABECB6724DE6F56 = _NONAME_ | V | 0x91FDDA5A6A3D12A3DE5C6A77F51B9FEA ; libaacs -0xA96E63F0174F95C6A08F122C1985A2242452D091 = _NONAME_ | V | 0x391E53A6DED859DFA520C10576C8F9AE ; libaacs -0xD9332556F9F1315DEF27C094C3A0662DC603517C = _NONAME_ | V | 0x1F4A92CAEB7073F4A6DD45ED37CD131D ; libaacs -0x7A5777D2CC9C31D94AC0B97EDBFD2DF9D2525BFF = _NONAME_ | V | 0x76E0FD914021B10DD07B8944697877BD ; libaacs -0x22358C16BF1609F86C18BF0C70A5437ACF527C7C = _NONAME_ | V | 0xA6CDE6BCC8E488DFF3ACAB78C4402459 ; libaacs -0x9FC7BEEF77EB7490ECC25EC28AD23ECA227214A3 = _NONAME_ | V | 0x15B59E774B4FB4035AE5A7293C0A477A ; libaacs -0x2FEF3DA881B38C061C52CF411A9007571D0C6FE7 = _NONAME_ | V | 0xA813C5243ACA6551277A4322368237AE ; libaacs -0x31660803EE527A0DA1D6A87F1517F41A1731EDEC = _NONAME_ | V | 0xFBB6C8CBBCEC1836334D3E3EB06CB7BF ; libaacs -0x382584C75E6514ACC374967853EA3D8D3C0D271E = _NONAME_ | V | 0x354E73C547AC4129E819621D3D317285 ; libaacs -0x58334310F2F10AE313CCC7573556CC3DEC7AD355 = _NONAME_ | V | 0xCCF16E2B7B8AFD9BDF2DE2432CB7C9CF ; libaacs -0xBDB8C30BB57781307E100D90291B691E3A6D57F2 = _NONAME_ | V | 0x076A337DC25D8F75B2027E8D4D0C17F3 ; libaacs -0xABD3FA6CEA3FBA98CCFCFB21C5CB9CFF6DEFD571 = _NONAME_ | V | 0xD04923E2E448077A70323E77540717EA ; libaacs -0x8FB6B4BFC4BD8A9112C37B60CAE18A35AF8079DA = _NONAME_ | V | 0xBA610C34528BA10EE066CF0C387E9A0F ; libaacs -0x537B772C712EF130541CB05FE858669F6932541E = _NONAME_ | V | 0x24B5FD4A94B484DF826B2677F8EDBF54 ; libaacs -0x4FC714720CBDDA47707F3617BD2A4FAF1A9E90B8 = _NONAME_ | V | 0xA26A296230794AAB88186449181CF585 ; libaacs -0x04D78F72A83138DC16568CBDE3DB799490F04EB2 = _NONAME_ | V | 0x694739CEF71AEFEB6FC00ECDDF24F9B0 ; libaacs -0x31FEE48B196B07B296118C10740ABD00046C927E = _NONAME_ | V | 0x04C0D9E9D663B3F5B2CB72DFD5BF44B9 ; libaacs -0xEDE8A03AA5E325DA1737F2D0E41678D181E9CB0C = _NONAME_ | V | 0x980E19A0F61AFDD8FA235A44AD09D4F6 ; libaacs -0xB6385CEE8F92BA822FFD1F1A58E976A74541C019 = _NONAME_ | V | 0xB4EF822BC3A2360F271C07AB6BC828F3 ; libaacs -0x912303094516368C71C1D3CF8C63D70C35FBF088 = _NONAME_ | V | 0x6483B1D3F1B5DEFA6CAD09180BAFC123 ; libaacs -0x1FDFC4479048E24ECAC02716CEA234AAC3C8E75F = _NONAME_ | V | 0xAA7731EF976C1384B28E3CEBF3C3F054 ; libaacs -0xAE8C8B2DEB89D0A2D95E915FC06BE678CD2372E3 = _NONAME_ | V | 0xF844B087E50E67CA0225F2F851F13212 ; libaacs -0xE66B571AE4236EFCE17DFD10ECDE7215D49AD008 = _NONAME_ | V | 0xD830239926F8BECF704001ABA3180E82 ; libaacs -0x3E607533AD7F527C58E53B89865DBD39EE12B01B = _NONAME_ | V | 0x101F06FA6918E70E9298F9857CE86997 ; libaacs -0x16F4EEECA4416137A46A7C3BB0044C3FF7B0941E = _NONAME_ | V | 0x82314A8982E47C798ACA1019F5A252BB ; libaacs -0x37B667C2692EAD817B71B285BF994D97267F8722 = _NONAME_ | V | 0x361441D5C273B7F02AB457187B0681B4 ; libaacs -0xC372E73BC2460ACE7F79E8890050E6F69DF2DB1A = _NONAME_ | V | 0x176E542E10EC1749E50EF12E935C9296 ; libaacs -0x0AF44228B6EF5654C3B49AB2F4EFED923544298D = _NONAME_ | V | 0xE7A12D3F4C62BD36CE4DB943DAB0E556 ; libaacs -0x80511F20100DFBB4B45DD5EDFB6A27797FD5AA4D = _NONAME_ | V | 0xCD7B82217738E28F1614FCDC2FFD8FD7 ; libaacs -0xE51C27F33BF6F616157338270FD1DE3A1B3D5693 = _NONAME_ | V | 0x90E0A424F5704DE34AB6FCCEFDABFC43 ; libaacs -0xD00EB1CB07593D67A2FAE124012E3C097CE0150F = _NONAME_ | V | 0x8B0AF1A9A3254BF5B30FCDA23825660E ; libaacs -0xC6E32A92C06725C9F53BB1873578371F02D85BD1 = _NONAME_ | V | 0x7CAB72C5A306E4D3AC27E1C6A7F6F428 ; libaacs -0x6ED3334429AEE978C06E3D5D6A529BB05BB32805 = _NONAME_ | V | 0x3CF0099DBA931ED45EBE60E7FEBAE2C5 ; libaacs -0x5A5040BD42B47E88DD33AF14B5A579881DEE98D8 = _NONAME_ | V | 0xAC53EE293CAD694C16B7757E149B7C23 ; libaacs -0xADB8C7D6D0B4ECD9215EFCD52480B18C0610E5CD = _NONAME_ | V | 0x34131114879DE45D8648CF7C82687BEE ; libaacs -0xE6ECC96A2C5FC0A123B0A59C022908DE5229F950 = _NONAME_ | V | 0xFAAA150AAE62359412650A7BE9EED8B3 ; libaacs -0x41FC703113B428EEDB8643790BDA420D2BAE5428 = _NONAME_ | V | 0x24C9DEE50756677014D5D83D3FB2D539 ; libaacs -0x899E3C6EF7B4F1543AC61D14D797D8FB7BB77828 = _NONAME_ | V | 0x3523FEB49BB6C458A4566A3AA9BAA54A ; libaacs -0x17381D71363D6221F3122B48C479CA50D616D87F = _NONAME_ | V | 0xD68C4B4AAF605022FD9E3819BBE43D8B ; libaacs -0x02767E6A4BBE65913E67AEF6356216EABABDCF47 = _NONAME_ | V | 0x70BF111836D94ACA67FE42FA13B80B6D ; libaacs -0x0D26507F811C2E5AE59A0C91C4F3BC000481F525 = _NONAME_ | V | 0x17265EAF4447B3A9237CA5AF14E47B27 ; libaacs -0x21096AFC7CF89947846C62F4EE09797E19A604FD = _NONAME_ | V | 0x8556B506ACACE78C727301C5050DC4CB ; libaacs -0x2050E3DE2E19F0FAC90D8B54071B84BD2A5AB097 = _NONAME_ | V | 0x04CB697B6853489CAC2CACA56517F708 ; libaacs -0x0A87D95D14FD85744B8EEC339F34FD6C50003D75 = _NONAME_ | V | 0xCCC60B1BFC7E93A27C61F3C5356D6004 ; libaacs -0x04FB7BF8A537F0C9366B9CEE5C40F2CA2BBB1FB0 = _NONAME_ | V | 0x9E965DD822B89466E764BFD503104369 ; libaacs -0x6EEF34DAA3E9040A25F22B0364E217FAD60776D4 = _NONAME_ | V | 0x5626EFEDDBDF31413ECB41268DB51D85 ; libaacs -0x3A95D9BBF79C96FD82EF8BD9E596DDE017C3652A = _NONAME_ | V | 0x1DB3799C83112EC7B3B92233B75A9154 ; libaacs -0xA3D7E3C2943DCB50F1F343B9ED6EAA178F8CB717 = _NONAME_ | V | 0xAFBAD3E6AFE7AEE5ACBA60CFE1223977 ; libaacs -0xB3818ECF86A631E189A3C86117CDF57826A7D95D = _NONAME_ | V | 0xE9248E423DA93381B70FE0E270D77454 ; libaacs -0x2B8532685DED178CA0C2DFE00B4D8C5263839ADC = _NONAME_ | V | 0x84305FDE19793E0B889DF3043226B442 ; libaacs -0xA676ACB435D5EB495CFC42EE2F6A1D7692ECC9CD = _NONAME_ | V | 0x0D2F8978CA1A868159F58BFA00BA76F5 ; libaacs -0x4D8BB948143D7D0E48E65DE559A1AE899186D5E1 = _NONAME_ | V | 0x8D5ACEFE3EDCB8EEA1F511CBF1425456 ; libaacs -0x3F0C6D4C154B9008A5F402CFBF09B92410835CB8 = _NONAME_ | V | 0x03BA7A2C4719FE08A4EEC611E40EDA80 ; libaacs -0x2B99F1C684C241EF960ADCFEA4716EBCD48097D6 = _NONAME_ | V | 0xCCCA37E714A77E1E1CB2029B63C2A0C8 ; libaacs -0x56D931D39899754741C99981CF96F0270957BDD9 = _NONAME_ | V | 0xDD33D3D736A6DA8970674DE8DA4BAEF0 ; libaacs -0xD65085000CE466FDDC08D66E78B2FBF0D73CA750 = _NONAME_ | V | 0x071242C408959713D956F5F064BA60F0 ; libaacs -0x61879BE75CC125FD4BE26B64F25461548038F16B = _NONAME_ | V | 0xBF30C2F9031CF6EE4691CCD216904984 ; libaacs -0xAB15BFAAABF47AD7A45E40B695272AC6B420FF9F = _NONAME_ | V | 0xF2F6714EB7C87DB1D19255940EBF7E66 ; libaacs -0xAC7EC0EDB86FC1BBC39AE565DDE79F16A3EE6C36 = _NONAME_ | V | 0x9AC51E5595375BF77AA0BAAF86BBE38E ; libaacs -0xB86E6956E97CB04895FA4E75481958B9A6A1F240 = _NONAME_ | V | 0xD9113B4B7BB9E31D6315D49A3ED4D6E6 ; libaacs -0x0C836BD8F94F792738D96EB0CF73B23B8EAD9848 = _NONAME_ | V | 0xFC26E7061D37E925B7D0D4DCCC8D89AF ; libaacs -0xD640F1AC2B2434BA4206AD3BDEFB38EEC019BC34 = _NONAME_ | V | 0x9C689484E970B1D3C52DD68EB34E74DF ; libaacs -0x3BE6618337B799C0354C256AEACA6B5EDE7D8920 = _NONAME_ | V | 0x33E15569C51414E74EBE18F379877E5A ; libaacs -0xDCC8787E9D17317AF823047703E7BB026E71D115 = _NONAME_ | V | 0xC863336C0815F9E31A849F9DD3F9B56C -0xB6CB84C67B0255365984E60601525CA3ACEFEAEA = _NONAME_ | V | 0x7671C4C7D0BD04572330FA24ACB3BFEE -0x32A55E52E2F7552B3742F4FDAAE50D330EC6C000 = _NONAME_ | V | 0xEC8EAA0BAA568947DE15B1EE464DC003 -0x8F5F04DE5627058DB3BFCAE099C808C2EB6BA0B1 = _NONAME_ | V | 0x5953CA41E494F206A1ACC28A8C13499D -0x9736C670016B2E005811F3963DCE1612D6DD6D22 = _NONAME_ | V | 0x9897DF7CB45625163A309E8B4ECCD4B2 ; libaacs -0xD0BBEB69ADB8EF1F94D0F1DD1EECE0E35C3696E6 = _NONAME_ | V | 0xEC2C1429ADC47E53EC6FF54AD6F3391D ; libaacs -0x5B4C886E1FAA4E0A639BE66F21CF63179F053838 = _NONAME_ | V | 0x8E443BDC712A8A3D32424FCB6146AD6E ; libaacs -0x88306F5430AE3D0E60A193A318D63AE544E24FDC = _NONAME_ | V | 0xE8282A6C93C2F4147E45C0806210A46D ; libaacs -0x8B5FF07882AC04638BD66B8E0C529C710FB4F679 = _NONAME_ | V | 0x6EA05276FF656292D91D7B9F97037122 ; libaacs -0x49909253E55A464D9211ACB1B2A2F3A1A58FCA3E = _NONAME_ | V | 0x2053D6E8EDB28EFB2F7846F16825FDBB ; libaacs -0x6C99F9D87A009D9EE533CD7BE860B229D9BFC321 = _NONAME_ | V | 0xE6F227306A9FB6CA193E861B737C6D79 ; libaacs -0x64DF5B4C7E5BB4A28DA9495484919B35453AD9DC = _NONAME_ | V | 0x564E3DB3C48F953DE2D44C520233DC8F ; libaacs -0x4426A864870ABEC964A313C3644EBDB6C064ACDA = _NONAME_ | V | 0x5B7E4A0D1878669F9ABF66C9034ED997 ; libaacs -0x9B532694C66EBBC76162CF6AED542A184CB1F61A = _NONAME_ | V | 0x4C33D41BA683C9755AFD173645C64905 ; libaacs -0x273EA1B0A0479BC380EC47580473F9C395B1082A = _NONAME_ | V | 0xC4623E17578F494570CF4095AAF40931 ; libaacs -0xC77C60DD29AEB5940D8C8F7F04913B93EE85A087 = _NONAME_ | V | 0x8C83A02D090DE7C80B5DBAC0C13FC46C ; libaacs -0x28EA25263221072E5508F85A556F730AD5267936 = _NONAME_ | V | 0x6679FE9A1DF418E2E89693390B00DC78 ; libaacs -0x617E1088389B4BC93B206B6D96326C60B163C86B = _NONAME_ | V | 0xF2A0EAEC9D1E8EA5740B08E0DE8F8B9E ; libaacs -0x3CE37CEAA4FCAFC2BCE1041588AC2794AB30068D = _NONAME_ | V | 0xC027EBC554AF87BA6344CC12344F88D9 ; libaacs -0xB7F7F69C358406B354A5BF17A647C4FB1D5BDFAC = _NONAME_ | V | 0xECE3EF8365874B2CFCFB7D9DF677F3A5 ; libaacs -0xAAF8E48D6AB713191B9A6A5E8C448DE7F9AECB7A = _NONAME_ | V | 0x42DC2E37C9613CF6655C6F7F7A6AD413 ; libaacs -0x7EF94D5BC635E4FF07AC23250452B5663A3F8834 = _NONAME_ | V | 0x00ED27D8548EC832FE96D3A3CFE1E65F ; libaacs -0x8E586C990C4AB2B0EB2651C09E139218B9994F92 = _NONAME_ | V | 0x262A110B76756C70BA6ADB65DC8F8558 ; libaacs -0xD7C407282A270B180CCF51FA37F8269B0277F1CB = _NONAME_ | V | 0xE3353A9AE464FAEE3AADD786AF14FBE1 ; libaacs -0xE035BDAC5FAFCA5F806BF738EF3B82A67BB823BD = _NONAME_ | V | 0xEA9E3241E4AB7A831DA823EE175F1C31 ; libaacs -0x9AF409FBD7E45496FE710BB8D9D1D277BCA2A3B5 = _NONAME_ | V | 0xE1BA1AEE31050A51D950CF9950D0C2B3 ; libaacs -0x2634ABACBD4C616FA1EB7408D8816ADCA525412D = _NONAME_ | V | 0xD374E3326E3A5FCAA6764FEF98E6BCB5 ; libaacs -0x86A4BE7E99AF4EDD8202DF4233DA3F45F98F6EC2 = _NONAME_ | V | 0xA0B03D116C0FD731B4D7A1056F7CB9DD ; libaacs -0xFC37C1B3306BFFF3C84DDD46185BE090FF97D4B4 = _NONAME_ | V | 0x43B8C7F0FE05BD8E1D4398FFCCB8A8B6 ; libaacs -0x811A891F20D391E0BEBCCCBCC6DA44946A0BD6E0 = _NONAME_ | V | 0xFCEAC0E366B5693B1A5D0CF4428296AC ; libaacs -0x47C5BEB526C7851E472CC40353D53AA39A49AFEE = _NONAME_ | V | 0x5DBA363AEABD7B9A37EA5E5D867EFF21 ; libaacs -0xBDB1737A72BD33C6CBA58BF08254F72AC57DEFD1 = _NONAME_ | V | 0x18A635F84ACDBB6B4467E5F4E591243B ; libaacs -0xB5E46ACFA68E382166CBC7EF49447F894112789C = _NONAME_ | V | 0xDCC51FF87A710449F2003543C669E3BB ; libaacs -0x75AD409290F73BFA993A3C7E53926CC603EBB225 = _NONAME_ | V | 0x52D2F2653D50CA55689C7C53E602D649 ; libaacs -0x2711D227EECCD81E9F6BF5CFE913C9B25532A78D = _NONAME_ | V | 0x0C32CED988131B7488B946A242E75CCD ; libaacs -0x005E42AA77B5621ACCC06C60CF17170F3F382CE8 = _NONAME_ | V | 0xD691F6F9EE68C44C7A88C5BAF622564A ; libaacs -0x85EF638245F7A65195E838568CBC626C7BA83BE9 = _NONAME_ | V | 0xA4B4BAC1FA5D6EE249890DE9A96A354D ; libaacs -0xC9A2CCD3CA8FCDDE28924CA010C40F4980C057D9 = _NONAME_ | V | 0xADECADDAC21EABFE1E104BEB08619A9C ; libaacs -0x6DED3E6B004735C6472D06EF95039A4246D40917 = _NONAME_ | V | 0x06A0642201966CCCE5DEB43BD7F7BD52 ; libaacs -0x2D327A157E27702ABFCD8EC647E79EAFBA37FC30 = _NONAME_ | V | 0x216770AAED6B1B6DC02B5944597925F8 ; libaacs -0xBB4F6AB8C8AEA448B5E73909C935D70447168DDE = _NONAME_ | V | 0x09BD0C99D5B926426D04B26C2B1F16B5 ; libaacs -0x1A531511E951A0DB4C75D26A8AB151923A6958DD = _NONAME_ | V | 0x19B40183232A37C0B2E5D2FE8FEE9B36 ; libaacs -0x8789462EC33B4290FE3AA386B3039B04E6E24F8B = _NONAME_ | V | 0xD1521DA7F2703B431EF54B5ECF464740 ; libaacs -0xC2F6E870FDE2D9607BA405044910F2770C63853D = _NONAME_ | V | 0x257F8F609E8C75D4DE8CF97290B223C1 ; libaacs -0x89FCD3DF1F557E6EC7534E708D09C06DB7EE0E89 = _NONAME_ | V | 0x5BBA2F04A4DE66CE2475892EB33AD73E ; libaacs -0xACB1E69AA2C86790841686E3A33E707041C63F94 = _NONAME_ | V | 0x3D501D5AF80795C6BFD3074F1508DC79 ; libaacs -0x3ED33EBA7A90731DBB2D96E488C7A38FF8841ACB = _NONAME_ | V | 0x1AB0E64B98A1476A6390FB59943821E2 ; libaacs -0xDCBFF22421DFF6AAAB22495AAC66A88B931BBC10 = _NONAME_ | V | 0xC5F9FA45A80EA6A74ED89DB2C0D0C9D3 ; libaacs -0xDE591548B932733A9592242B54D095BE3ADD79C3 = _NONAME_ | V | 0xCE1370AF7034F376F7D1F623DAFDB4F0 ; libaacs -0xDA254F1337C966127F647F440AB667505B27787D = _NONAME_ | V | 0x3878A1878787D948B95116B70E39FE95 ; libaacs -0x8F7858DD99A2EB8E104455A6E0D8D9ABB4DE19EC = _NONAME_ | V | 0xF5B3991C8982280391F6B0EE17D0177F ; libaacs -0x7C299318C16A1EF694DC2047AC52663EEF62A17B = _NONAME_ | V | 0xDF3313AEFFBA4E84A5272CCA9E184BB0 ; libaacs -0x33FDB592DAB9A65C22F9FEF94F53421F328BA144 = _NONAME_ | V | 0xD5EB1E812E685D786770F5568094C331 ; libaacs -0x27B7EAC390E9A9D0DD145000CF143A6270679C2B = _NONAME_ | V | 0xEFDEE6E03CF9A855B28F5FF3C630CE41 ; libaacs -0xF8D0D1846BB339BBD749372242498CDC788F0DFD = _NONAME_ | V | 0x2EC1D23A07DE6CE25058C40B987E255A ; libaacs -0xA3C47D61B10C33F68C983D4BEF4B4D0589033149 = _NONAME_ | V | 0x957E43700A34AD08D1A62A23D9042A28 ; libaacs -0x979EAEAF6907FEF2767E9D81C5487B5BD668D1E1 = _NONAME_ | V | 0x889CFFE933AB540965B182E72F30D755 ; libaacs -0x2EFF2D7E5DD9239897519F0C6E15E1B6772F60E5 = _NONAME_ | V | 0x448BDBF28BF9348648C1C3D8D65F598D ; libaacs -0x1EA395719AB9EA5E3DBC1F9AD47753D2A25BAAEE = _NONAME_ | V | 0x920C8FE24B166A98E4E6F1D56E1A8766 ; libaacs -0xC67323FD51B992FE6A7FC998F7477F6E1787E1E1 = _NONAME_ | V | 0x6FACD7AC1971BB3C9A730538B6AF52E8 ; libaacs -0xF9B725224E0B620842CE661C36635B928862A861 = _NONAME_ | V | 0xE3F76C743CB07338E980C47E5C39DD71 ; libaacs -0xFF5397F81AAE4BE8550566834A4067A0894A089F = _NONAME_ | V | 0x36FD34AF2231B553BCC9315D5F3C232C ; libaacs -0x4AD121E78E9360337E64FA6138162CF4ECC9070F = _NONAME_ | V | 0x523E8586969D955C9C38AE7FA8F8FC6B ; libaacs -0x98B473702B6FD33C7EBCA8953B535AD538FB1846 = _NONAME_ | V | 0x346C7D0A21A94BBA90AA0907A76C24EF ; libaacs -0xD2D5EEAC0CBFC3AF6D8A5776F4CCE084B4D2556B = _NONAME_ | V | 0x3D7DF9635B6BA78422C333E8DA202183 ; libaacs -0x4D6FC9BC827B46E006D5C2B203DC3D74656F72A5 = _NONAME_ | V | 0x5D533C93460F08A27F984C63255F9E3D ; libaacs -0x10EA71BA9E08D01E0A8C241A26715D74BDB37DF5 = _NONAME_ | V | 0xCAEBBF49F45A65E2220D1FC95981024B ; libaacs -0x299190DCA8125BE59EB6F0FCB1ECB94EA521B04F = _NONAME_ | V | 0x5E844BF38F0F41ECCE59822B04A49F9B ; libaacs -0x3796D58E9881E72A7113E9C56FBA315F96E6CDE0 = _NONAME_ | V | 0x6B43329DA7C5194A1290DF13D3018567 ; libaacs -0x7A86D0F8057673DADA3AFA6E741749B8F2E4A71A = _NONAME_ | V | 0x2084F03C91C2DFE54C96579E98A32EA2 ; libaacs -0x487BFE92C3CF1C901F9939D100BB404F9939FA6B = _NONAME_ | V | 0x18200C688A3F83C098CB28FFDC91EC83 ; libaacs -0x8F54993779069B979DB2525C6527E7EA0514F144 = _NONAME_ | V | 0x5D72E95545768BB7C729930158F1F78E ; libaacs -0x49763AF3D42CBE628641D3729DAEAF9D90BA03F5 = _NONAME_ | V | 0x61EFE995C8C73B2FC0621830B1045AC6 ; libaacs -0x39403F6E6D810491A9C06C4B1ECFA48888D02808 = _NONAME_ | V | 0xC64F72563A0FE502D36A2FCC29B3997D ; libaacs -0x0059B9BDBA93F5AEF93E19ADC3065FE51360FB80 = _NONAME_ | V | 0x1C67B47BB1079671763D3643FE3FD842 ; libaacs -0xFE0CC6CAD5F712060DF36973A5FA75DE7137F07B = _NONAME_ | V | 0x41640511EC70320D4F5C297E8FCF03F1 ; libaacs -0x72DDD44334E28A688BB62A2519E422EF699FA4A1 = _NONAME_ | V | 0x1AEEE37259E5B577BB2D031267BF1038 ; libaacs -0xC31237B9034A80B334298245B69E253EA781A4B8 = _NONAME_ | V | 0xF9C6743E31C7B0B3CEBA785A3B311662 ; libaacs -0xCDE41C7EA29D1E24CF0AF4BF9799A588F04B3D45 = _NONAME_ | V | 0x8B8EC1702B01738D1E396846C631831D ; libaacs -0x62D371C7CA3347907B7517D4C10A4F3258817E6F = _NONAME_ | V | 0xCEE6620B0AE3ED8922A97DE3886771F6 ; libaacs -0x5B88711FEBDE45FBB97B93B4BD435CB90830CA75 = _NONAME_ | V | 0x50D6BACD5D95EA3EDA7A8BB26F7C86E0 ; libaacs -0x77C8F1B5D48D8648CB466FA00335CDE47761B234 = _NONAME_ | V | 0x3C82E54990F0FE6C21DFA562612FD8CE ; libaacs -0x9B15693F87F1AD3C6FA215EFCDD21C4D3931CA59 = _NONAME_ | V | 0x49C5703F6E720E4C99C305B43F3E5B19 ; libaacs -0xBC9CC51D436B2FACB5B441DE98F9A2B1B31B057F = _NONAME_ | V | 0x96841BC41826E13D460ADC5B1E104845 ; libaacs -0x30F773049CD1A17307AC0B44183F35A25545070B = _NONAME_ | V | 0x7FEA0384F0C8F4686895FC2FFF49D125 ; libaacs -0x9AA91512A99C2587B4D3D356CE5A14176452CE60 = _NONAME_ | V | 0x297BE51229017A232B814381E0D16E26 ; libaacs -0x04C90151C611E9A7DD13F1D9F693F08BBA984F17 = _NONAME_ | V | 0x61EBCC71A14084C45A9C6DF4A909CD86 ; libaacs -0x76C2058791648596150EBF285279F81DA6C98D94 = _NONAME_ | V | 0xAA36DB83B8CC27BEF7C09F77CF80BFAA ; libaacs -0xC3845AF1184B6F38A3C9E8C797925D9B423CFFB4 = _NONAME_ | V | 0x9FBF0DFF7CA810A813441A8E68FBF5A7 ; libaacs -0xCA7DA5C73BA514065E252EA55DEB2CEA347C9C03 = _NONAME_ | V | 0x717E3F494278A0487683CE4A8A39715E ; libaacs -0xD2F7B85B9A4A6AF505C9EF8E7571E7C521DFA7C7 = _NONAME_ | V | 0x2D4A9D8D293EB734FFB2E8B74613D96C ; libaacs -0x1DAA62D4075E8C2DAA3869B8A79ED6675D7204CE = _NONAME_ | V | 0xC7B83C78881C5D993F5B33CD3E73C92E ; libaacs -0xC05FD78B1BC2237333542E1B6C978AA2AFD6FC85 = _NONAME_ | V | 0xC79256E0F24057815255DDBF3FD320F3 ; libaacs -0x3F17CF171107F8846E779751B076408AA35247EA = _NONAME_ | V | 0x9AF3413DFFF509780394F0B77CAD3C27 ; libaacs -0x47EDD466958EADE1CF2D78D851577D50E8CCF223 = _NONAME_ | V | 0x3AE46399E0FBB10EEC59EFE5C763F0F5 ; libaacs -0xDE051A23B1D4D14C830158A8F64F4DA52628D7B2 = _NONAME_ | V | 0x9CDBF823FD61E25A96CCD713FDC911FB ; libaacs -0x1D297F0072F6FAEF9ABCF9A27EAB57FCE064453A = _NONAME_ | V | 0xE353767671E964CD82FECF2F7CD02A33 ; libaacs -0x82D42A6EF28539CB3738F25A038297593C2D1F92 = _NONAME_ | V | 0x966812DB5C7459AC401F2DE587BA5F16 ; libaacs -0x565A6980F69471E28A301CB8A4346E87F6B5C49B = _NONAME_ | V | 0x751A861C4D4702EDB5C5269422BEBA9D ; libaacs -0x0A1D9E2F945B12EE5F1A983C87C980A0EBF35527 = _NONAME_ | V | 0x0560A4EEEB2C808E88E0D0C093FAF09E ; libaacs -0x1CBDAB2AF4E1D5167D6E51FD5C34AB11D69C9929 = _NONAME_ | V | 0x408279861BB36FCAFCB41AF747BEA0AD ; libaacs -0xBE126379BBED1530B1125CAB38E2A1F27562699D = _NONAME_ | V | 0xC162FF70BC35D545D89B12CA3B9067CF ; libaacs -0xADCE7CEB81EF7BAD4E25DE1897A92A0A709AF5CC = _NONAME_ | V | 0xE7D6ED89A1FFAA8F31362AA764504D96 ; libaacs -0x6B64E6F119D5DE40C4862303FE78F0D9573D52D6 = _NONAME_ | V | 0xFFD4A2C74A434B81AF5FB92FD87D713A ; libaacs -0x0D94CD3A84A675F96EFAB439CA17685E064FAD49 = _NONAME_ | V | 0x775C8A6E82F39A54C53A4B57E63CC6CC ; libaacs -0x58C448D39254E603BF1BBFEE3DAB83081E2BBE75 = _NONAME_ | V | 0x8319B42BBDC3D68E87934A420128F5AA ; libaacs -0xCCD9D3D7CE7286308A8A4788B4C922DBCA6E0405 = _NONAME_ | V | 0x52B04702FA571E1599E41F2E69CD55C0 ; libaacs -0x2A2FD620A65856D9674D8AF340B4803D2C713558 = _NONAME_ | V | 0x40188AF16E06F31BD38DB866FA9C183C ; libaacs -0xDA665457ED046E0FA2241831A90B199EF6B1F27F = _NONAME_ | V | 0xB70CF0663BE72DE67AFDFBE198D251FA ; libaacs -0x710DE672167551F56200D677622DAF3664A66B12 = _NONAME_ | V | 0xE78B455F264B4024A0E5DF483ACF2A0C ; libaacs -0x0D35767195B2A451068082167638D40B983A46CD = _NONAME_ | V | 0x6FDB697C883C217A2D2526B94E79BCF8 ; libaacs -0x66186992C999CFA696ABC69252F4BE36D3ECB24A = _NONAME_ | V | 0x7C3BA94A8E39DBF0EE69133A3136F960 ; libaacs -0x2900F2123F153A805E922F021BFBB3DABC932B53 = _NONAME_ | V | 0x67E4EB6659695372D7D22811D695D555 ; libaacs -0xF3C51188CBE24144217BF95FC7109AFDFC96185F = _NONAME_ | V | 0x9BFA883989203FA66629E805BB1343FF ; libaacs -0x1A7F48F76B560B6FB3774C4BDD7ED4205229CE62 = _NONAME_ | V | 0xC8DF69CDBBDEE58FD2012990394CC87C ; libaacs -0xEA84FC0A96505869AA354B413A311D3AFC23FA0A = _NONAME_ | V | 0x16E29BA45FE5DA7FA6CD061EFC89796B ; libaacs -0x9BCD262033BC077F76D3476C67D89EC10010FAFE = _NONAME_ | V | 0xDF326E7CF83231D9A3AC79CC9018A059 ; libaacs -0xF150B2094920059B6ED4BC0AFC4F4D4627CA0764 = _NONAME_ | V | 0xB933B78DBCA3256D55031AA9C30AA832 ; libaacs -0x134377DB8D02EF02D4906B75A7AF7C37A0BE8943 = _NONAME_ | V | 0xF7D866B01363ECEBF6BA95F4E7960484 ; libaacs -0xB89D6D7455CB495F1B67CA64DF52F2FBA8EE2891 = _NONAME_ | V | 0xEA34764B93A2B1F5829C027A762A9F5F ; libaacs -0x858BB62AB9B4D4F29C8F3E8D825EA33BE508CD3E = _NONAME_ | V | 0x9C76950B75BA4FC11673764714222A7E ; libaacs -0xE066C3C07B75A887725BEEA496C38C827996B25A = _NONAME_ | V | 0x4027DEA235F460A8B6086AA51CA06118 ; libaacs -0x9BE565C3C938C3191E7A1089E77932EBA69FB17A = _NONAME_ | V | 0x5A5F2E72A824F05679E56EBC38597121 ; libaacs -0xB02ACAD3B522C59B6A2A5C42F84A9973EAF4DC7D = _NONAME_ | V | 0xB9A23935AADBD0D59E39202F9758E4F0 ; libaacs -0xC6E08E9087E796D39DC3169110E9A0E11692316A = _NONAME_ | V | 0xD6563B4C32B8EDA67A3FE34009AF05B2 ; libaacs -0x16BC8F446E23383BCCFE89736EB6AEB3C1C841AD = _NONAME_ | V | 0x1CF8A5305C0B3C8A80862237402AE2B2 ; libaacs -0x13082022167BB1204A605607CCEE52154981830D = _NONAME_ | V | 0x71F94CCD2468D1A04557E437C3B49439 ; libaacs -0x4931B0E9A23689E36AEE45AFD0B7FC7A91B289FB = _NONAME_ | V | 0x5A5D76BAFAC5A6DB263EA494A642DAA2 ; libaacs -0xD61961DFDD978CEA7C3B385A86ABC5545F7345B2 = _NONAME_ | V | 0x6D6C8891E60EA4E63E59ABFD153D9227 ; libaacs -0x5E4604EA26CB7663A037FB344F694DA5DF4E2C24 = _NONAME_ | V | 0xBD0DD253A295BBCE7C0317E91FE3BD1C ; libaacs -0xA81CB98E51B295E64D43E1FD06F8E8491D9A9A18 = _NONAME_ | V | 0xBE6C7A8EBDEACA0E40293933A65BE677 ; libaacs -0x2D794EDD2DFD404B0E1A406054E803D0F0CE2D19 = _NONAME_ | V | 0x774F0AC738AB5FF489EC7F1A56957B0B ; libaacs -0x440DEC87BC8707F835D9823135A7235749552EFA = _NONAME_ | V | 0x2B2B339364B06303A2D78927F88B64FF ; libaacs -0x86DB0E354C5BF9CB250C03DC693225B64E7A2460 = _NONAME_ | V | 0x9A39EC7A59109C54468B4E1E015B79D3 ; libaacs -0x90CEE689446DE1129E89DE6AEAC37CD9D0812ECB = _NONAME_ | V | 0xF972C9A5B45A725307610215B8FF0259 ; libaacs -0x73ABB9E7CDDD0293BB4D7870AB8E0151FAF01A84 = _NONAME_ | V | 0xAD3DF6099A0B5087D0BEF79299444FA7 ; libaacs -0x98594D420C2E54DDDFA2A0F534DA0FA5AFBB0FCB = _NONAME_ | V | 0xE2B1BA2845FA78C74EF5054660521BE5 ; libaacs -0x8114B915A3AFCAD1506A2F8CB59680852309F849 = _NONAME_ | V | 0xA8CA2210C8274611C813E8955D6DA405 ; libaacs -0x727474416B37047CE986328A272AED93B83C810F = _NONAME_ | V | 0x1D2E237731B16C98B6E0242B14416A06 ; libaacs -0xAE33D5F48B90CEC0F4661619868A8F0CFC5607DA = _NONAME_ | V | 0x7CDC374AC76A32FDEE28E38571134865 ; libaacs -0x177710C1C16562D3A18C79C247C580ABA9ACE282 = _NONAME_ | V | 0xE21F2DD5DEBE1CB8CA2B7FA2DEA65CA9 ; libaacs -0x673BFEED91C004EDF84AE76997CF8B5C16B6AF50 = _NONAME_ | V | 0xABBF8BC52CE1AEF53410C3BEE6549406 ; libaacs -0x98B5B0D9A9431D70A5929921761C674BDC2CFDB8 = _NONAME_ | V | 0x15C2871E1FD4C89398084DE9F4620154 ; libaacs -0x9B5A4BEAACE01930F1D46B3E0A03769A7B73D704 = _NONAME_ | V | 0xA0BE038ABDC68D3E965450B6E56E91CC ; libaacs -0x11393AFD7F885075DCD241A6AFBE7DE8534E763A = _NONAME_ | V | 0x8ED9F5D9CD14D4022E973EDE677121BD ; libaacs -0x75151AC17C06BD48C8AADCC1CC8E465D523EF2B5 = _NONAME_ | V | 0xA43C13AD8583F3581B7F28E23262336C ; libaacs -0xC6A7CDE0F108838E63C53E066E6EF0DFE9A4A6C1 = _NONAME_ | V | 0xD2B67804D327DAB8E42F7A15F7C00F4E ; libaacs -0x2AF0A8812020663D68E1B333ABE1470EC37DE41E = _NONAME_ | V | 0x0A412626BF651E84B54CE8792348CFA6 ; libaacs -0xEE18120A887C077EC10668675FE00402679A4925 = _NONAME_ | V | 0x1CBB133F138080466A69DAA4FA777C14 ; libaacs -0xC0068167F9D1BCBEDC5FC4702592330C5C7851E4 = _NONAME_ | V | 0x3F135000539391C0DA68F56E59D96E2D ; libaacs -0x101B66A294009C915FDE38394B44E871A9887ED6 = _NONAME_ | V | 0xF3590A3AAEE099F83D8EB9F174A80ABB ; libaacs -0x4ECE97CBA7FEBD4DF3A1C36124BC219FF3D7A832 = _NONAME_ | V | 0xD1E1C722A64166ABD31DAF5ED87E737A ; libaacs -0xB3949CFDC2F1E3B3DCBEE20B1D9C8E92093AF8B5 = _NONAME_ | V | 0x8238A9A464F2B9E2980FC65BE11551F5 ; libaacs -0xEEE001F443624DC2018AA1491D99D9041970A475 = _NONAME_ | V | 0xEC737533F296222A73566A2B923125C5 ; libaacs -0x733EE03BC286D4B4B9E0978570057D64F5EBBE44 = _NONAME_ | V | 0xBE3758D801C27D651C155C2D408E208E ; libaacs -0x624C8437DED13D1E73A271311808FBB6E87150CB = _NONAME_ | V | 0x072BD4370D7F3C6DE7896F88A18C33BA ; libaacs -0x444FEFD81B2BB9722B0FA618B623992B6F359EF9 = _NONAME_ | V | 0xB02BBAE491347EB8F9A5990B2099AEEC ; libaacs -0xEFB5A182DACC1231CD5D98A6784C7D8433FFC0FE = _NONAME_ | V | 0xACC442B15FB9B50CF61BEAE8F22AFE84 ; libaacs -0x560B7DEDBD0C75615F5EC2C8AF20B712CEC54B33 = _NONAME_ | V | 0xED81DE12F85A5427AA2D9CB7635F527E ; libaacs -0xB10C4C595EA5664A06943C9E2326A3B056FFC723 = _NONAME_ | V | 0x00F23DA4A40EF46788A081A143A0AFFD ; libaacs -0xC94759528326BB65423AE33E9F9D514A3C4D5E37 = _NONAME_ | V | 0xAEB494FB4D786BB29726A5C18CFD5331 ; libaacs -0xF1B9A897518A8C18E1DD434F987CB2E061F16AC5 = _NONAME_ | V | 0x4803DFB91BF0F6D8224F6AE0B0C8718A ; libaacs -0x0323D990060BDEF883CC1DE29DDDE79436AB1386 = _NONAME_ | V | 0x78FBCBE4EFF747AA742F7DEBCDAFFB77 ; libaacs -0xB041254D07379C7743EBD16B0537D2B2183CE028 = _NONAME_ | V | 0x93D384878993A8166900C7C9B0EB3644 ; libaacs -0x1AADD9852E6B825DAAFA9418FC330FD6CB91D4DF = _NONAME_ | V | 0xB96ABFB2482F063083B21DD4E1830976 ; libaacs -0x588DEC4E966205E33B713E37D29BA96CC65C296B = _NONAME_ | V | 0x60F24DC611EE66599FF07EE06FA7B102 ; libaacs -0x7D6D1D24BAF0C23B6BAA748FC2427075A271B2E6 = _NONAME_ | V | 0x0A5D0A4DDC12A3440647E40853461570 ; libaacs -0x28485BE5644DC73E7A5D5A106007B5182FB76E84 = _NONAME_ | V | 0x60284F0297AE8FE272009CE298C5081D ; libaacs -0x2DC08D0DA83C574CA29EE322307456813CDBDB76 = _NONAME_ | V | 0x247C32F5BFCEB66754C652ABE4CD264C ; libaacs -0x69B92F7A9D60B6938682F3494454DB9AB7A83C84 = _NONAME_ | V | 0xFF1CAAC218EDADBE4E8DD4E595716E67 ; libaacs -0xE35DF3C04B6BC2B5A9040E4C765A0F5AFF9E5A34 = _NONAME_ | V | 0x838E550B88C9F1B4B15D0805F3A8E4D5 ; libaacs -0xCD4BA1E5203E3184B88250377F041353F4927743 = _NONAME_ | V | 0x96DD9D406E1B3AE6AF356DC258687A1D ; libaacs -0x29EE79B01CAC1D7C8FDAF8F8CC17BE1B449875B2 = _NONAME_ | V | 0x1E2F5BEA3608308A3FF11EBB924DB4B2 ; libaacs -0x81B73B91DA90B408E77D14A70EC7BC3AB9473A44 = _NONAME_ | V | 0xCE9F2FEA0A99588201C96B463641FEA4 ; libaacs -0x302A500AD46F83643B5D9AA41AC083D25A22464C = _NONAME_ | V | 0xDAE800D30BE2B71A161B31E068E6E57D ; libaacs -0x0788FE609440CE93FC1B08B4596A28F7A3137D75 = _NONAME_ | V | 0xD6574E274858E258AA8FBE64F79D878C ; libaacs -0xC4D0E1310CD2D9FA75B862307CBDDDBB3D33CF7C = _NONAME_ | V | 0x4DFCB51DB699F3C6FA5EF658F2138DE0 ; libaacs -0x82062CD3EE3F8D91442A90907272EB2E0939AD8E = _NONAME_ | V | 0xBDA917E645E71BE0791B73E4A4CA692F ; libaacs -0xA8D3F42B563E2B4EF37BC8D61B60BA0327ECE264 = _NONAME_ | V | 0x31167D4FF17FF07D0D2CED9E43155E9D ; libaacs -0x6F2FD8E3229E2A02C17EDE69DAF342C0B60D7494 = _NONAME_ | V | 0xEEAE049DD5F59870F634B7F313FAF067 ; libaacs -0x25D3DFB3ED44A1A5127F99D6BC8DCDA44B6E4478 = _NONAME_ | V | 0x3EDC4AD992DD565E8BBD05EFD8DDD37C ; libaacs -0x4AC72C2EB11B684C5A341CD8D88F3A67E0B36F27 = _NONAME_ | V | 0x8693163CE1EAF6D11DF929CC1F6761EA ; libaacs -0x5E6B5CBA4D19E0B57F0E43DA37384F6018351574 = _NONAME_ | V | 0xB0CB970AC99E61BA1763CBDC92D5BD75 ; libaacs -0x7AC386BC2E8172D63A87D4C3FDE1E018F6DE7E2E = _NONAME_ | V | 0x0A552038569E043EB1AB43E75017C8A3 ; libaacs -0x33CD55E400ED011763813CB2E7BFC19CC039F747 = _NONAME_ | V | 0xE8487CF5875739E8AACF4E35EB632948 ; libaacs -0xB495969FDFB5F6F6EC4215C0D948DAB9AF2A1BA8 = _NONAME_ | V | 0x83BF47A62C3180098C4FE4BA72561F2C ; libaacs -0xAA0FFBD8234976D1178E396DA8681093FA2CEC75 = _NONAME_ | V | 0x425FFC46ABA427A73C439BC9FDBA9AA1 ; libaacs -0xCF6DAD6704CA1BF183667DE1B463B2C2835032DD = _NONAME_ | V | 0x9B29553CE3F61CC68CB47AADE82CC98B ; libaacs -0x25787B9207D37E29CFCCF2F6AA2327A903CAA176 = _NONAME_ | V | 0xC0651819EDA645B4F6BB695B2905EF5F ; libaacs -0x3409C991C11C6FDADC7EE5C35373C73A99245218 = _NONAME_ | V | 0xE93008093B0E72FF546B1526E6C22371 ; libaacs -0x88CB9B02CF46EB49AF96AE6A947AE1334B2E1B4C = _NONAME_ | V | 0x9B8C5F0FA1C1C3C7583378FCC9734E2C ; libaacs -0xA0B63CC9DB59662D36A8550C1E379F1CFA66B21C = _NONAME_ | V | 0xEAFB28F8E755AEA29B0C1A88193A5681 ; libaacs -0xB7BF9C4421B7846860AEB2DD5B0865520B958786 = _NONAME_ | V | 0xD72CA08B7781BE661CA51612E3B2D3DD ; libaacs -0xDD6A1DFEE2C9E7C2E735E59E97533D8A85E41558 = _NONAME_ | V | 0x28904D8026803E81DA78D539B5471B5E ; libaacs -0x879B79046E919AB990D8A91BC332C1B6F160EA76 = _NONAME_ | V | 0xC9E91C12C92193DE1EFA5ABB74438F40 ; libaacs -0x11443763C0306AF6977A31CE8C41E954E02E1CC4 = _NONAME_ | V | 0xBE7A976A9196B998FB91CEDF739E3F82 ; libaacs -0xB5B3102AE0249F15021360C831D06F331B29D3D5 = _NONAME_ | V | 0x40E4B0BFF4FFB964D363400132B53ACB ; libaacs -0x2D30CF9E987BD1AA2881519B2781CE5A17C87469 = _NONAME_ | V | 0x3AF93192093EEA45C0C23E59FB007955 ; libaacs -0x120563E6181F0C9CA0F43FC057BE052EEE0E4756 = _NONAME_ | V | 0xCFE42A429A8D1E5FB056BBC301702CFB ; libaacs -0x2A9CC3DA1D3FE2A230A687995A8CA0DC58E08AE2 = _NONAME_ | V | 0x85B326F328895361F9C9620D8F83AE2D ; libaacs -0x8B66C6DED737023D463F13D04ACE6029EA9F29C0 = _NONAME_ | V | 0x457F7294BCC1A95E7956273C1DA2D575 ; libaacs -0x1231BD8AF1C740D064392BE3599AFF6AB4AFE7F6 = _NONAME_ | V | 0x2C01B5301F7443365AECEDB93635E392 ; libaacs -0xC8A68D81C250C41B87A8BADD4805D4404B0847C1 = _NONAME_ | V | 0xB86608729C690E0207B920F004A99A7C ; libaacs -0x6FF36DFDBE2CFC3C6ABD43DFB1663A2973804EB7 = _NONAME_ | V | 0x6A9857BDD58AE474D75FADD6098DAA81 ; libaacs -0x446670B16D4DF6798A575E574939B0B4D88C393D = _NONAME_ | V | 0xE14ED5DB1F806F50A3F984FAF2FCB6F6 ; libaacs -0x1B84ADDB8097DB4F6E17F4D9928F2D2022ADFC5F = _NONAME_ | V | 0xF810A4A4C1F250944AB4E4D7E0DF629B ; libaacs -0xC89A7C49A05A20FF89A1607BA17C5260A447481B = _NONAME_ | V | 0xDC16565B2F761A16D0599EF11EE713E5 ; libaacs -0x8CDFA3363E7252285E0E483BA280FE2B456344D8 = _NONAME_ | V | 0x0FD3C3172074CEC3CB0E333408368F0D ; libaacs -0x705B07ECD1E121EEDD55A59AC8CAEF1E031A6D59 = _NONAME_ | V | 0x379E66D8FD9AECB53F358B9E39FDDF2E ; libaacs -0xE266501A986D1065211B3040DD146DAEB62CBA2A = _NONAME_ | V | 0x953D151C5B8537BE3D92F4B567A4A385 ; libaacs -0x6FED1B5331B32F85C16DD8EDC47FA8ED07429489 = _NONAME_ | V | 0x2840B49C0E6D0F6E9C2494A231DD9550 ; libaacs -0x2FCA96C1DC9BD0E79CEE112A5AA022B34DEAAC61 = _NONAME_ | V | 0x4D1E87ED37FE789676D5699BF965B400 ; libaacs -0xE91102EFB7EE5B0E32A3AAE01FD2A0D81AFC5241 = _NONAME_ | V | 0x641A5D352220B62F43A961F37EF79A98 ; libaacs -0x1D2511EE9A3FDE7A2E3DDC813F5D8A5E2D4D8CC7 = _NONAME_ | V | 0x68CF5A0052863C23921FE786157283DC ; libaacs -0x26F85AA49D3732CF45E45DB70625C8F98D7C52DD = _NONAME_ | V | 0xAACAAB0A13A6B12E47DA158944F6E04C ; libaacs -0x5AC40973E8ED2B9778ECC313C3AFEDFB7F18B1A1 = _NONAME_ | V | 0x05AFA5B689A3A6D2098B7BEBEF9E9118 ; libaacs -0x81E782DBD22DF43640F6CC3B9E5DCA6E7F2024F1 = _NONAME_ | V | 0x78315D585D4FC7B8E61FC445103D5E83 ; libaacs -0x92FABC1C0940320DF1F859820C79D8E58BD43134 = _NONAME_ | V | 0x23A5B693AF5E6EF8D7FF57901FD75536 ; libaacs -0x69E1476E88BD072FE53DDEE722A530D6873F9E0E = _NONAME_ | V | 0x2F6E8E8A27D4CE6FF3308EF997C631D6 ; libaacs -0xE314B7EA03EC5E5EA52C29361AFA1B16295ECD2F = _NONAME_ | V | 0xB7DE574707BE51C0155ABA2FCDCAB24B ; libaacs -0x9FBF60C58A8B692BFAA67132A5B605414F5CB70E = _NONAME_ | V | 0x7AA59A59DD852C38F45F201F3E1A1061 ; libaacs -0x83C6A4CFC68CDD1A332E796AA491EA4C6EB38AB0 = _NONAME_ | V | 0x7FF6EAC0B1B6A1D2A17FA19DF90CE72E ; libaacs -0xAA676994140A403EAB1C5605627D3FB7AF96EDFC = _NONAME_ | V | 0x59434BF19F85FE44576BC2C22B4BC160 ; libaacs -0x8E43EFEFB6D9204512954D8E83065FAF23A9D8F5 = _NONAME_ | V | 0x204A064267864D41B8FF278FFB2C63B6 ; libaacs -0x562B383A112757D2529764EF76141E7DC0EAB764 = _NONAME_ | V | 0x671CE7E898D9E5AE9B67230ADD0C7FCE ; libaacs -0x85CC01638156ACBC8E4D1D6D911D07E54871F3E2 = _NONAME_ | V | 0xC9B0530F5E350E02CF7DEE4BD020B043 ; libaacs -0xF5CA2B2E9A74389ECFB484620EA7BC661705FDB9 = _NONAME_ | V | 0x46392A0B9E2637108B6D96779BD3362C ; libaacs -0x33221AD65C06825334BCFDBFD383851C41156CA6 = _NONAME_ | V | 0xAE2BCF14FD87199E59AEB4C95FB7D5B3 ; libaacs -0x763E5B972D9FC98D4317B6F505DC6B94F38FB456 = _NONAME_ | V | 0xA1ED6F94293DA5D8EF33E9687A14B2FA ; libaacs -0xD49EC8389D409B1753C04507B19D333F9855401E = _NONAME_ | V | 0x036A3B408D4E7E00560F4D85EE66D117 ; libaacs -0x5E78E6A19426A6ADE8E4CF90BB60C048ABFC5DCB = _NONAME_ | V | 0x7E42B2951FBCED3A0CEEEC0E9C994082 ; libaacs -0x282B4CDD03818DE5212A7C1914D0229B20F0D524 = _NONAME_ | V | 0x8E1589BCD0DCAAC20F07B6AE2448AFB6 ; libaacs -0x951E08F511AECA2E1C4C25F98EB7AB8AC6D25D21 = _NONAME_ | V | 0x28D5CD11B9417430BEFAD19D61A8F328 ; libaacs -0x256F1B8207F74B6448CAA42F71AB2FFA3C07BB1C = _NONAME_ | V | 0x242FF51EAAC32C840352F515D71718E1 ; libaacs -0x8B76D01F4DDB5E604D730DFF84F3FBD7FBFBF13C = _NONAME_ | V | 0x935D217708BA10D04EA85C81BC6AC4AC ; libaacs -0xF2FE82A194FFF75BEE709C5E4F7A8ACBCEACC934 = _NONAME_ | V | 0x2D46E82B9BD98AD7649B2580E297FD0E ; libaacs -0x3D8531924DAA9E38D69438AD438CB815C455B6EB = _NONAME_ | V | 0xC2C1E33C3B7451F9CADCBFE81FF71D8D ; libaacs -0x925C770AB8BE37E7DCCBE429D9A38693C16C3290 = _NONAME_ | V | 0xD4EB3E64AB4D0F997280DDE00892FC0C ; libaacs -0x872C54DF9643D1419B1A1AA7551007AF66D0E26B = _NONAME_ | V | 0x6DFC4664EB4964F98A306F241B36D320 ; libaacs -0x9E39A68EE00AEE57743A7EDF32BC8AD348BD3E46 = _NONAME_ | V | 0xB380AE2B1348AC8327E078F7F8777323 ; libaacs -0x8DE10045EA19BE65DB7770A16D75B415697B3681 = _NONAME_ | V | 0x30D6EE7DD2FA37A46338E86E1467296A ; libaacs -0x85E3EE0A420F638EEEC044291CC1FD1612D3B708 = _NONAME_ | V | 0xDDEF2FE77C053BFD8FEE2FF795894148 ; libaacs -0xDDD6A251881D5ED239FD0110D597F15FB4BB68D9 = _NONAME_ | V | 0xFB3D016F51A4709F26AA67D73AD2E755 ; libaacs -0xA4042D70A9333E09251358D5BE8940D87E515E82 = _NONAME_ | V | 0xCD3393399D273C71F6605FE3854C7908 ; libaacs -0x7D57945BBBD64BEEE2C437BA511A81F5147F8DAC = _NONAME_ | V | 0x1A08A92408F9932C28FF2D0F9BD905FA ; libaacs -0x97296087E11043F6C7BF0F4A9FE0715D4DE1AA42 = _NONAME_ | V | 0x93B6C803B363949E4BCD3C40E2FA1A42 ; libaacs -0xFBFE24F8489131FE97DF181B7ADDED205E2137C4 = _NONAME_ | V | 0xE64AB68273663D31083D55AA78F895C9 ; libaacs -0x938B3A8EC2FDE218DE270D3DF0D7F2DDD57EAA13 = _NONAME_ | V | 0x582294285DAD5DDCDDDC7205FBE03E72 ; libaacs -0x536C7BDD868A4F664354439022536C1CC7F2FD32 = _NONAME_ | V | 0x0BE279D28559B4547042669C46B1B2F7 ; libaacs -0xBF8DF62FACC60DD3A2AD224DAD741D012EA93D48 = _NONAME_ | V | 0x98BA9F0B9710E8E5D4F0D6CFFE70A1B0 ; libaacs -0xC6D63E451B7F5C505676118512A06F2A591594D8 = _NONAME_ | V | 0x1DFF6A60677BD9A4205113172EE4B4F0 ; libaacs -0x6149F0F0B36837422F532D3C6A61E907653D3214 = _NONAME_ | V | 0x061FA856BE683B44EC30FF17E6455B48 ; libaacs -0x64E143D4DF7000F4904F28BAE1829D0C7E17D44C = _NONAME_ | V | 0x548E8F06F97EF75789006C03C8599F71 ; libaacs -0xBF4B2AC74E8CAA515384E62E7469ABBCFE34D825 = _NONAME_ | V | 0xFB5236CAE69C19FF57F2B009F0E42095 ; libaacs -0xE7845B4AAD7F236462C7081DFD8098BAD9D02801 = _NONAME_ | V | 0x16C184FCA6D1C981F5FDF50CCD02181A ; libaacs -0x713E9C2D593B9DF3CDFE128F257195F47A6FF74B = _NONAME_ | V | 0x673A82C6376AB4653EE1281AD911FAC3 ; libaacs -0x249B5BA13A6C546820A92BA4E6B9651149C1F54A = _NONAME_ | V | 0x7C50F336B84E7F64DAB69F56010B6F4E ; libaacs -0x87FF0F60042C418BA73CE7A5D4476CEE744B019B = _NONAME_ | V | 0x7EEEEE44E084955AA0975C8762767B6F ; libaacs -0x9B1BE590E33E5A90142490DD66E21D90163E1B59 = _NONAME_ | V | 0x609D895E267F158D1E0CC93E3A7BDCFD ; libaacs -0xA510DA7E5357E0E8B0B7FD2CFFC57E8A9A2CE558 = _NONAME_ | V | 0x4EEE951F8268CDBE1AE9623C6E1BBB4B ; libaacs -0x3E3E82DA3BAD293F54A18EB3438F52C7D9B8F924 = _NONAME_ | V | 0x68B79FE2C1C5379F17B8DFDEC8FF92A4 ; libaacs -0xB91F07CA3BEF779877B93BEE925CFC3D2157C3CB = _NONAME_ | V | 0x379BEFD52FC94066CDAB85DC0315F0F4 ; libaacs -0x851D4D960377906CA0A549312FDAB52B25306D4B = _NONAME_ | V | 0x92EA3AF227C83F7826639C7020607B0D ; libaacs -0xFFFFA2E78D9EFE7A74A606A5E3B22CD89B9D2FB0 = _NONAME_ | V | 0xC614795D0450404D2A15F91BE9C57F32 ; libaacs -0xEB09B29F0E1F654E3B04B35587D0EB113384592D = _NONAME_ | V | 0x5F4B6D0FCF1A9E9F33369691B014608B ; libaacs -0xED2DEC4030E4EF3140392C97476C2E3FE24AA6CF = _NONAME_ | V | 0x623D88CCC5E962A6B736E626C1575BB1 ; libaacs -0x4D8E2D1B276669BDEC2C711D5A1501A4F8CA6965 = _NONAME_ | V | 0x418C96FE004DB5CD42E5DA397F217998 ; libaacs -0xB64F915EA9742DA0EA286BE828DD74EA0362C1FA = _NONAME_ | V | 0x3CBCF0B95B0F1CF8F344BCB152B25A80 ; libaacs -0x1E76933723C0FAC61DD2C8986DAD62021539AE5D = _NONAME_ | V | 0xB20906829A006E2C40B1ABCFB4EA6499 ; libaacs -0x89A72546D1B32DC1C0E95DB112D6584FF920415A = _NONAME_ | V | 0xD5375FD0727B899663AA2D41DEF8FBDB ; libaacs -0x6C6CD8D1B50F1E34875F4B64E4422BD14026705A = _NONAME_ | V | 0x097FCD5824F859E94ABF2987645A413F ; libaacs -0x1B45778DCB177798CA6B71803ADED2439BE53D36 = _NONAME_ | V | 0x2D6B62C76C4A7CC736FD3203359B1BB6 ; libaacs -0x7777C9920E8152DD49A79763D62672F72E958FCD = _NONAME_ | V | 0x486B09D6B71EE5DC42453E6FC89A7112 ; libaacs -0xEA34D23759C8994F56DBAD475CA94E10C21512D0 = _NONAME_ | V | 0xF87B5A218342BED13E8AF1CA2E2C0E15 ; libaacs -0xF640D4BFC74F298CA16BEECE3903FEBF3B4FFC2A = _NONAME_ | V | 0xC2F542A59C914E9C1449791AAA48579A ; libaacs -0x31DFB7270070387C352F6632E62B83AB84E58203 = _NONAME_ | V | 0xF42CC4D4F8EBCFD4E1CD98EA09647526 ; libaacs -0xE73D4E38553AC173FF2817ED48E15C4B9B62AFBA = _NONAME_ | V | 0x1B3EA7371C93877D151FEE05315557AD ; libaacs -0xFE81C2CFADEF4F6447A9C241A3A44D39ED4BB7CC = _NONAME_ | V | 0x2A64F6C3C8C894A3B9F12EDB253ABAF8 ; libaacs -0x73E152102197E56E476D5E0337F1C28DF5A6A3B2 = _NONAME_ | V | 0xDD9153BE353499033F71B96CD3C7EE95 ; libaacs -0xE3E283F4F94A5F3DD7E0F746F9E0E5CC35DCF864 = _NONAME_ | V | 0x720420230BF87392F0F9FC514ABCF4AE ; libaacs -0x2E71EB8FD8480C5122C182C75846619E70B6B812 = _NONAME_ | V | 0x62BAD1F575A61D684A457EF62133E9A5 ; libaacs -0xD8EFCB26FD25A6120017A6E418322C560C9164FC = _NONAME_ | V | 0xC7956C728C3B69EF4D2BBDD6C0DD0624 ; libaacs -0x2EB05E411B5883BA7308FB7C03A9FE95F4DB216E = _NONAME_ | V | 0x875EB8873D79995135B70721A28915E9 ; libaacs -0x04BF5DC618B1BFD1A9E7AD4E026EE9765CE24026 = _NONAME_ | V | 0x61DE236DA3A1D5034CBEF2F03C62F44F ; libaacs -0x192E2B0BB3A46A638B54AE55218952C3E5AB6121 = _NONAME_ | V | 0x3D99ACE985B51C74015CBC07C6E3D8DC ; libaacs -0x346447DD4BC748D0019842F5ED89095FAF3721EC = _NONAME_ | V | 0x699D9150F32B2944DB5DD7FB8A7A11F9 ; libaacs -0x3C95D01E6DACAC7D6379139A9F23A9FC37012501 = _NONAME_ | V | 0x54BF82DB3DFF917BE5B932E60374108F ; libaacs -0x3F3C7C1FF3E13542112B6D1D7CD4AB51DF17A92E = _NONAME_ | V | 0x3898EF3CCB048844B563CC11A13111A8 ; libaacs -0x4EC56D08BFDD74E4B4CEB7B4DEA73CF47B198D7C = _NONAME_ | V | 0x50E93282EC8B0F8D28FAC4BCCC15F78A ; libaacs -0x6A40E80DCDB4461EAC8565078C6E99FAC9E05852 = _NONAME_ | V | 0xC152E5F840F3646B1EA1F3E1F1DC293B ; libaacs -0x79746D403F79CF45D34245560161CA21E6D07508 = _NONAME_ | V | 0xA61DC9071E6138F297CD2DC714F5490B ; libaacs -0xD4A8D5221E07E429BD86A448BF4C7DE3625608BC = _NONAME_ | V | 0xF131459F4207C168EF646073C4F97610 ; libaacs -0x5F4E94047EBFE4CC4F5CF6425899E3C126050C1B = _NONAME_ | V | 0xC4B927D7B5F101F8E4FB56B973FEE203 ; libaacs -0x8EAC98B6B203F81300567F5EED738835274E19A3 = _NONAME_ | V | 0xAA2D691C81C499A06507E6D87F73D50A ; libaacs -0x97246FCE16EF7A8A25A9024F6F106FBA794DA7A1 = _NONAME_ | V | 0x7FF07CAA9EAEE0158706FC3F9AA092D7 ; libaacs -0xEA6892854ADE09420A8D519C5E92439F99DDFAAB = _NONAME_ | V | 0x5075D7483813168D0CB3A25146F0A34A ; libaacs -0x432F56983DEA20197B812A0F78009789E8192EAE = _NONAME_ | V | 0x43F92E7428EC7F9C2BD0EA682B6579C4 ; libaacs -0x8235398A2BCFC4B338D4715325603086B4D97CA9 = _NONAME_ | V | 0xC520D763B706B7EDF5A17F30E18CEC8C ; libaacs -0xF5682EEC3D60930205BB65CFCC3594E8F98B6112 = _NONAME_ | V | 0x43F36180A2D312AF6E7B011662C57176 ; libaacs -0xBCDE2799DEF8F87E6E6B2253E2D9679F5EADE868 = _NONAME_ | V | 0x3B2A693345AD9D1D7CE85F0A64E9E891 ; libaacs -0xAEC19785A96E4E7BAB5FC96E8F12EBD38158E2BD = _NONAME_ | V | 0x5B3BD77BA168081B7BF192C9E1A950C4 ; libaacs -0x0D89368D8A3AB89FACF1D51F9ABC88E3E69F2AF0 = _NONAME_ | V | 0x5263B60C508FEDED062767A5485ABCC1 ; libaacs -0xE4F1639E22790C0BECEA53824D1AAC67B45581B2 = _NONAME_ | V | 0x1A5773ADA229990CAA745FF1C02271A4 ; libaacs -0xF47B18F2261B57C54418241BFF575E3D2A2AC50C = _NONAME_ | V | 0x382CB3E0EA5CB6B962FFF8B95ED2619F ; libaacs -0xFC1B05DEE69EE03BAF3E0D84FC874F957ADA22ED = _NONAME_ | V | 0x1C5FEEAB24CDE7A8D67A4620459A95FF ; libaacs -0x80C23FBE0837FB7C2F522FDEFBA1370086E3D80B = _NONAME_ | V | 0x33AAFC721E342B0677E7B3C598CD6D6E ; libaacs -0x6A505A1008A7BE3860B0EBAE14976C3669B8A606 = _NONAME_ | V | 0xDFD50E5609D1A58AA7B7628357CDF378 ; libaacs -0x227A6579366D8AE79DF81DFCCB3EF1C271A54B8A = _NONAME_ | V | 0x7677C2CEF58563F6F937A470BF64D2F6 ; libaacs -0xE94EE1AD0EA03EE26B0EBB06D85ABF57239B2150 = _NONAME_ | V | 0xAB3FE6200AFD7FBEB39C9579175DABB9 ; libaacs -0xE3193B247F91A6C3B40D24C5D5C35A822D954A2C = _NONAME_ | V | 0x9CF87DB9C1C327A04236B3A244673A20 ; libaacs -0x267050C21F03308816AA00075C972916E3DAC680 = _NONAME_ | V | 0x43C9BE92226AFFB4F5F583046102E9E0 ; libaacs -0x0684403C34666B1BCC6FD2F47F5DDB747421D6E0 = _NONAME_ | V | 0x10875F0BC8E08E512E47E16042C410E3 ; libaacs -0xFA83B96EC52C12CAF5EA9B9BD889B8099689F833 = _NONAME_ | V | 0x8BBCE8CB54EABA9F8AB25D80527A26AE ; libaacs -0xDE8DD2C8D3EECBA584683E18DD1C2B1FF4A010C7 = _NONAME_ | V | 0x352407498C32032FEB16722E40D97831 ; libaacs -0x90C5FC559C9E43311BC2E32724876F2872AE3C2C = _NONAME_ | V | 0x9D7E6EA1E075ABA4E2D54DFC6BA848BF ; libaacs -0xBDBA9A3274C31F295E53AB297F1700A1C78BC38E = _NONAME_ | V | 0xFC8B720A648CA2678FB035D98DBCE4F1 ; libaacs -0xC1DC55DF58A3DB49F7A8C8752406952EC3FDA749 = _NONAME_ | V | 0xBE87CE42F053EB050D81FCE6B2CB3C4B ; libaacs -0x1DE61A4211837C18C1289D39B79F88C253AF8826 = _NONAME_ | V | 0xC27F8414A084A3BA8597FA88366FD976 ; libaacs -0x43B86B54ADAEC45A32E99929B056569314142542 = _NONAME_ | V | 0xBCB2AF77F403C84A6BED34BCC64767AD ; libaacs -0xF2C2EF289AECF05496F5833B4D305252D0690E5E = _NONAME_ | V | 0x66EDBEF96FA3754776E2450E5DF1290B ; libaacs -0x63C4D4910576663B34B7026C97DDA1E4067D7281 = _NONAME_ | V | 0x35192704E62B6E2F17344D36996E0AA0 ; libaacs -0x9D068A8A357158F461FB78A742AEA860A330ACAF = _NONAME_ | V | 0x8362915F2713E921FC646E2489CBE303 ; libaacs -0xAB533AB7922E7DA68D1633DF2AA2E6A83C12416B = _NONAME_ | V | 0x16EB7CD243C32730815E751F94773837 ; libaacs -0xA9C4420EE1F69807E1A41F585DF7A86342C88FB2 = _NONAME_ | V | 0x6825344EBA8CFAA63104E98BEEE01434 ; libaacs -0xBF38F932C2E76C1A1CA12736B7B6B7F3206012B7 = _NONAME_ | V | 0xF84581215566A079622A0AE976062CD8 ; libaacs -0x9C69908F26D26087EC7FD9E8F4934F865AA43E1A = _NONAME_ | V | 0x7FE278FF892D5E2F950CCF5E1C22F0C1 ; libaacs -0x2B9117AA8076F4DD35BECAFF0A1EC7FCE9935C1C = _NONAME_ | V | 0x0BCA97B2A55913630365041055896E63 ; libaacs -0xF70B7993149DEA57BDABF166F3BFD23E4BACACB4 = _NONAME_ | V | 0xA187D0FFF793E6BD95DD82C88330EBB6 ; libaacs -0xFB78C4F712662233E7ACCF0F6798ACBF4CC9A2CB = _NONAME_ | V | 0xFDEEF3386218C8CC6EDDA3B233AE826A ; libaacs -0xC893D54FFDD849F28FD49E26B1F30FBEB073DC33 = _NONAME_ | V | 0xBBEBE0E11E5ED80613624E8F45E32012 ; libaacs -0x1B43343D1575DE355D1E5FFA4770321A22EE47C2 = _NONAME_ | V | 0x806BF12625532D628991850FF494DBCE ; libaacs -0xB6BF5FA3A73E5658D3D68EDDF8F20739539E8733 = _NONAME_ | V | 0x2AB35C6434414CD68288F0CCBC0817D3 ; libaacs -0xF2F8995622E9BE2DCC6DDE3BD9D042CD5C392AB6 = _NONAME_ | V | 0x4C69E6923E31C702365492C426895DED ; libaacs -0x33D25C995F03A5DBEDAEDB5F7ABCE61AB47DE8DA = _NONAME_ | V | 0x04EE55F0D8C2B9115799B50728A86CE6 ; libaacs -0xF46AB6BCF74A980B746309CAC87CECA3C5D486AC = _NONAME_ | V | 0x9E19BF2ADEB7DF447515007905D96110 ; libaacs -0xE5348A8B5BA562E859A029B8C03310B130DAD1AF = _NONAME_ | V | 0xB69745DEF7B0AE73DAB022255A3F5204 ; libaacs -0x2537DA025CD8960C922528A372EDF11B1CA25925 = _NONAME_ | V | 0x93DC4A0767FB268DFA363FD5268CB09E ; libaacs -0xC8286C7131E29E90CADB0F801C9C21D39B665CD2 = _NONAME_ | V | 0xCFBF18A07D5F74E5721C871EE921004D ; libaacs -0x890714C82288599369DB90D2187D277E9D9E57B9 = _NONAME_ | V | 0xBD624E60912A60F958D0333419FC21BA ; libaacs -0xDFD65EE8EC4CDD7062CE79F313BD56A705FB63D9 = _NONAME_ | V | 0x940158E02FD46E4F3B1CA0A22338BD4E ; libaacs -0x35F60D5F80CBB54F4CDE72E71CEF1E9CE4A464CF = _NONAME_ | V | 0x64587CE98CC2963757B50CD85E8562C1 ; libaacs -0xFF901BF469C2A3BA5235C36D8B67A92612197809 = _NONAME_ | V | 0xF56C8EF7E8ABC363522B9B389E3B5EBE ; libaacs -0x1424FED5BA3C60A64656253FA919C9E38D353E33 = _NONAME_ | V | 0x4ED36B27F85041AEDC0E5A65094B7D38 ; libaacs -0x81CCD12139607A9271FA488B03263FF6A117B241 = _NONAME_ | V | 0x759D7A97AEFC25D4A87D6249E98C519F ; libaacs -0x53340F5CEDD7F4F14270E2374C0E9CFE67A2A24B = _NONAME_ | V | 0x70390AA9D542607A0723A87C7B8A9C80 ; libaacs -0x2A853DB73AB238F54379B1A5B3F90F7A4049AE71 = _NONAME_ | V | 0x2D100B7D41B6D884830747A6DE347D59 ; libaacs -0x03E85F9E900FD85E3F38D80F05856111A4DB9449 = _NONAME_ | V | 0xA68FD2096051FBA3663EC174DF864E9C ; libaacs -0x4B08CA00DC4112001AA44B2BBB5C53E6E83A098B = _NONAME_ | V | 0x29683705082AB39EAA822FC02D33F0DD ; libaacs -0xC2321C3BFC2DA1BC1F7F748D5707D4DE93C6BC4A = _NONAME_ | V | 0x3184085A1CC4720F6847327565F63773 ; libaacs -0x7CBD2ABAF6E7303BB9ED87FF5ACE6CA0D048CCB5 = _NONAME_ | V | 0x8B013471A588086F91FF6DCB4DF81948 ; libaacs -0x2A4B58AA18ABD0EAEA3B187C65D67BCF0FE30B60 = _NONAME_ | V | 0x97FD19CECB6F1949BF3C0D6D587F2C06 ; libaacs -0x58F5A47F4B5A1C7E9F591940E3EB9B6D0411EC0F = _NONAME_ | V | 0xF52AE26EF15D0F86A3DCE0CF6B788068 ; libaacs -0x8EB107A582C341DB963D13C23666E1BF9A231D8C = _NONAME_ | V | 0xE6E0813B0082D07BA3F3083313E9FF24 ; libaacs -0x3D72BFAEBDC7E9F37FBEAD3FAA8F02E36B6A8367 = _NONAME_ | V | 0xB74C5ED11CA3FA473A6C515144359B0E ; libaacs -0xEF765DA4D812BB385C9772F8103B4791C72BC5D8 = _NONAME_ | V | 0xB158C8373D41BA5198434F7AD29B1E6E ; libaacs -0x1DB0D524A1CFE1804DE1D7135406A8290F2400DB = _NONAME_ | V | 0x33C88957FB4F4673D096D3BA0823A97B ; libaacs -0x224D80BB151DAC28FAAF59229E027B5AF838C784 = _NONAME_ | V | 0x866176D19DBA0E0E1C6D8E1C7922CC60 ; libaacs -0xD4EDFEDAA2D0876ACD490F84222B37D645E3A804 = _NONAME_ | V | 0x55A40A2DD09DA511AAF5BAA715AC3524 ; libaacs -0xCB891FE258E44C661C6C9B8177B1F5C4E99E8F08 = _NONAME_ | V | 0x6BD3902CCBBEF18EB064ECF8A47E44C8 ; libaacs -0x109C73DCFCD5C919A624C51885D15CA755B7008D = _NONAME_ | V | 0x8CD278539E5FCBCE8385843B70525FBD ; libaacs -0x0F2251A14B92D1D78BEC2C37E14C0E4D7AD04369 = _NONAME_ | V | 0x8A08DE5E955BB271E883C70CDD4ACC0D ; libaacs -0x98122839ACCC2E4A907C80F814CE5693D8D364B8 = _NONAME_ | V | 0x03A5FA3504D821966866A1B8B14FCC6F ; libaacs -0xF359EBA5CE789D0D9AEB2A68784AAB5EF8E845E8 = _NONAME_ | V | 0xFD9265C7957497ACC37746B9C666AD91 ; libaacs -0xD01FF6D34B80C64C1CE4432581984A9B9C61400F = _NONAME_ | V | 0xAE536A4BD4A86CFB0E40A98F3979CDA0 ; libaacs -0xA96D9FD6AD87620694BC58D401C32F893C9E9898 = _NONAME_ | V | 0x856EBD4C00ACC56196D68320AD004795 ; libaacs -0x53500B15C23BE96D80E255841AE30BC484BF9984 = _NONAME_ | V | 0x4627F6B546981C850261C574708D43D7 ; libaacs -0xA65B0580770B3F41500DEB08535409A5A042107C = _NONAME_ | V | 0x539B218162137722EEF160A0FEEECAC0 ; libaacs -0xC352294CEEF7BB4E15D2A28C907C8841BCF050DC = _NONAME_ | V | 0x72C0C6917991503574CD9DF84FACEF3C ; libaacs -0x59A3910967EE30AC79BD85C83FC52F359868B1AC = _NONAME_ | V | 0x3B04AF29DA87DDACD7557FEA6FD44365 ; libaacs -0x3B82022E454616707FB86E74A95C7B3E77199E7F = _NONAME_ | V | 0xB6EDA2C0219032E98D9761B847D1D1DD ; libaacs -0x0EA6F43C56EFFC5A1411F8D9E004DB5C6C9B5033 = _NONAME_ | V | 0xC5D7C0C7B6BC9C9A41F55AABBDB9E79B ; libaacs -0xBED0A34E0CB2BCD0B5030AB5753B150438307C3E = _NONAME_ | V | 0x84977E78E9EED44FCB34CD962D040791 ; libaacs -0xEB0409B8A2D3E6EB91E6008738C2FF6269C91743 = _NONAME_ | V | 0xF1DBE2211A2AAC98DA798193C18A7032 ; libaacs -0x004E185501ED1FE1B462B205C2BEE1844DEF702F = _NONAME_ | V | 0xAFE2B1F8F4A4CF0AFAEDAF59B08E118D ; libaacs -0xC7FA195310D99F3D57CDD6A8A7F044008A4D08FA = _NONAME_ | V | 0x567803B37C80749775F7BFD0F88FE2DF ; libaacs -0xC19850683648C52E6007951BC1B89497B0434498 = _NONAME_ | V | 0xEDF232B2DF21BC410F898A7C8C41A708 ; libaacs -0x5CF9CB39C6DAFD92143F825D7928118E28382DA6 = _NONAME_ | V | 0x64BB78340672ECB3AC5D9889F7E9F5CE ; libaacs -0xE49AF93C2F404798F4C12A9295619671D47BB69A = _NONAME_ | V | 0x1F65434B7AD220DE867F6CC60FE83EDA ; libaacs -0x589728599F80A3AADBBEA40D90A2F8078E557CB0 = _NONAME_ | V | 0x294A8288A558778CA95B80B716698AAA ; libaacs -0xFA4534D96F41D0483DFEA4A9D7ED8508FEAC3F44 = _NONAME_ | V | 0x31DAEA235071D8B6654B3D5D1494E39C ; libaacs -0x170661582F12446AF96E0117EEBD15D64FFEB828 = _NONAME_ | V | 0xF00EF06E02F125F0B0682A837A9197B1 ; libaacs -0xE99EB479EB3B3F95C08377CD7290FDB0C7ADBAA6 = _NONAME_ | V | 0x288216068D521F15D094050D56270D1A ; libaacs -0xE13CB5E5DE173071E6AE33F5C62005049EBFF5AD = _NONAME_ | V | 0xE132DCEA2B51583EFCA1E85F85727BB3 ; libaacs -0x8326A259512633D497CC3262E89086FC1D68A59C = _NONAME_ | V | 0x4671E01A125F68C1E1DD25D162E92341 ; libaacs -0x4E1497288B2999C68324123B602CBE8C0DBE5F7D = _NONAME_ | V | 0xA944F15C74B448BA92D8CA4AA06D1576 ; libaacs -0x2A2470573C9FCA3EBEA8E8CBB433A960564735CB = _NONAME_ | V | 0x964BA26EB636333AAB5FC6F12A377B44 ; libaacs -0xBFB6B83F6B247DC43DE65B50A8D7ED30272324D6 = _NONAME_ | V | 0xB85351184D7DAF698958644F925A0C49 ; libaacs -0x722D05BCEB90B3302915868CFEACD7817B9A5C83 = _NONAME_ | V | 0x57E34F01FE309160DACA88D921CDA02A ; libaacs -0x84A09F9049F1299270D8DE276C96E92B9A7A8B5F = _NONAME_ | V | 0x1E1A4E17C2A203438797591CC6F619EF ; libaacs -0xF63F812A794D562512BDCC7EF3DE26E11B4C79A8 = _NONAME_ | V | 0x24120073A61BB37C2ED1149328903C37 ; libaacs -0x82495F7E93E2B4DAA91F2300874C321796839032 = _NONAME_ | V | 0xA46435D8A374D42408D1FFD6DC34C689 ; libaacs -0xE25F5AA6D869A0E6A5ECB092865C816E68820AC5 = _NONAME_ | V | 0x67B714383EDE001F2143C7C0143EF620 ; libaacs -0x4A6C176A71F968AE1547F4B2655D9B65498C53F3 = _NONAME_ | V | 0x31F8967DBE0DB5A3CE7BB8F6B12D3ACB ; libaacs -0xCD1432B54C3ADBCAA72B23C14BC6DAB752D974EA = _NONAME_ | V | 0x249CB84BDD44A014F3162A6108F8524F ; libaacs -0xA695B2983EC140A65D1FC707EEF815F619514C13 = _NONAME_ | V | 0x660BDE0B13703D5E85E6ABF3006F617B ; libaacs -0x8A99D2E931835A9A649252935DBE30F976557E71 = _NONAME_ | V | 0x8F9E4F18D97811E5AF5A3D7439D6313B ; libaacs -0x7AE356757D31A8A8D429F6F86F9382F9DD6ACDED = _NONAME_ | V | 0x611820820EA163ABE84ECB0F553A8C65 ; libaacs -0x3869F4F1DA9A12EEC5A9486753BA9B9B00445634 = _NONAME_ | V | 0xC08327FCC2CE87B626E32A874E412CF1 ; libaacs -0xD7B36D6CC42F4340C1D1F90C9D7EB01DFF10D52F = _NONAME_ | V | 0x5CA5801FCFC072AB8D97BE076206C0F1 ; libaacs -0x63E61440D4BBC0189AD9854D11B95223D8B120E5 = _NONAME_ | V | 0x05C9264A95E75E02F0D8D11732632FDE ; libaacs -0x3CB01E1B6BD97898B13BACF022540E44BE869074 = _NONAME_ | V | 0xA091A35AF155543A9ECD7C5E2ECAD4D7 ; libaacs -0x196D1AC350B41C85C8C32CF233421B6CEE361E90 = _NONAME_ | V | 0xCB78A477A2764010723454353BF57665 ; libaacs -0x96609F9DDF6A5F049475CB71B35AF9FFD2DBBC6E = _NONAME_ | V | 0xBB83DA9A8011BF89821AE7917CECDEF2 ; libaacs -0x8FC2ACC16FAE31192CE4D15B1E368E9FD232077A = _NONAME_ | V | 0xF9649690390F889CE9F0A5C685BBD2E5 ; libaacs -0x84C7FCF9A6CCB1DC70CA43050912984E6D78ED4F = _NONAME_ | V | 0x1B15AB5DFA207402D80D4E69C50D2507 ; libaacs -0x81122ACD3BB8AC7FD4D7066C63751B2C8C4EF935 = _NONAME_ | V | 0x3D7BE8EAB74EC9F88D5F43A0E2A0066C ; libaacs -0x71149F013EA227DAEA4F88C534579DCD20A560E7 = _NONAME_ | V | 0x2A767EDE009E1DAB292FD22C95ADAF4F ; libaacs -0x69ACC66A80A67537AF1B8F8D072D4FC910625445 = _NONAME_ | V | 0xC582EBA8492919A574846BC9C7E5989F ; libaacs -0x67373D7236AB128BB1EC9C305AC80B3F4070839B = _NONAME_ | V | 0xFF08B115D023914F8B3F0F4045BA4FC1 ; libaacs -0x54BD9CA0E019BAB5C8F62E74CD1036B9741321D1 = _NONAME_ | V | 0xC5BCA045018DD5E52665C32ADDE976C4 ; libaacs -0x47522AD95057BBF2746FB10F9A5D5AC15AF3ACB0 = _NONAME_ | V | 0x7FBAB097F8945B56D4186DE82390303D ; libaacs -0x3D15506FD73A680197C3F120DE946E8331F05A7F = _NONAME_ | V | 0x49F35CDBEA5015D6EF013D6B21091D12 ; libaacs -0x3A8A1F6A517C84E244ED215ED272A68844E145B3 = _NONAME_ | V | 0x63FB40A88B2CEA39702B16793930B499 ; libaacs -0x25A48A7D106DAB6E9D365FB37F9AB68840B04222 = _NONAME_ | V | 0x40DB941180E042AE21DCA83A52330A13 ; libaacs -0x9AC5F65A44CEE4C738BE26941F795A14319552DA = _NONAME_ | V | 0xE4058DEB634FD743F19298D2367F490E ; libaacs -0x9ADA098A86D8EBBDD396D51F0011447FA0E8BBE5 = _NONAME_ | V | 0xE0FBD0C3A6D6BEF4484438DB086C2928 ; libaacs -0x9BD9EE2E843FE4F0DD3AEE588E6106DE0E29E104 = _NONAME_ | V | 0xF121BC19D0D5C4B7013CFD89602D29E2 ; libaacs -0x87414612FEAEFD9F21AC426D419453496BBC6EA2 = _NONAME_ | V | 0x4BDCA75944B7E418435DB03298C404C1 ; libaacs -0xFAC80788AAE860CF8802B616C092F00A0B49B3AE = _NONAME_ | V | 0x488F289328AF85EA9ECA6391D3E4AD49 ; libaacs -0xF4C4B1DE4DEDF54FB9ED6F1B4D9F9ECDC30C7C91 = _NONAME_ | V | 0x922898F485A592A6BF4DA1D4C0045071 ; libaacs -0xE93B35AF358D031EC8C745E5C344EA600872D6C8 = _NONAME_ | V | 0x1A7B6CBD4B6ACDE948C29C46EDC5CEC7 ; libaacs -0xE3849B897CE400963D553FE82E1A2592EFBE913B = _NONAME_ | V | 0xDF5FB6D96EC66B3066DAD1E34D4D9DD9 ; libaacs -0xD61BCDF001D4C9E14015CF3E2CDC12720880934A = _NONAME_ | V | 0x42020D1E101D1C257C77C05907A865B9 ; libaacs -0xD12B6E7573C4DA41699D432BACAB40F9F291F8CB = _NONAME_ | V | 0x4658C6B212155D640F452BCB8AD61986 ; libaacs -0x823B315F73B9DC33A7A3B63C499B0073D8DD841A = _NONAME_ | V | 0x6C60A49FFF828084D6FD74DA7A14C2C1 ; libaacs -0xBE7EA319A7C6F2FF31830D9AA36B1B2392622B2E = _NONAME_ | V | 0x2BECD4869B675B9DE6636B988E8F3924 ; libaacs -0xBD5F639C0044C60C129145A8A6598A85B569C3DC = _NONAME_ | V | 0x3944DD6F9457B359EF3243F1801ACDCE ; libaacs -0xB0337080FC72570C07A58A5FBAC4C1C7CFA85EEF = _NONAME_ | V | 0x2A876D29C349197BE47AAD6CDA2F991C ; libaacs -0xA696713F8E80A668E570A6BFF2626C373E65BE61 = _NONAME_ | V | 0x5EF03A674AA190E5ADC03FA7DA10E42D ; libaacs -0x10680CE38EB835ECDE87D83DC92C3DF51888F05F = _NONAME_ | V | 0xEE1F94FC6A67D0B976695F9A2C6E223F ; libaacs -0xAE2B779EF6ECED4F9F22829C4F0367575D953FBF = _NONAME_ | V | 0xA5BCE1CD30D6BA13F5096655ED73CBB5 ; libaacs -0x29BA928DC7F107F8AAB94DC27EEE8EDC0AF9A59B = _NONAME_ | V | 0x1E0F3E91CB5FF5A9421F1C1E3217AC9C ; libaacs -0xEDA7611511D2BF4719BC9C181367C9265680C1B3 = _NONAME_ | V | 0xF7294C8924F0CFB0C34383A9F74A31ED ; libaacs -0x1507547864120618B27FB304A50FBC3F998254C4 = _NONAME_ | V | 0x7080D421EE4ECEDE99428F206F8D4F14 ; libaacs -0x28469A68B85D6195127B464BD22BB812C18C1A5E = _NONAME_ | V | 0xEDD9C07F566AB5C177AA02F99B6AF07B ; libaacs -0x22B93854B0A44E49E33C5B1310B72A74F0ECBDD2 = _NONAME_ | V | 0xE199B04FAF427E5D8E05196D9FF5E98B ; libaacs -0x5BFC97913A3056DFC6165E2750688FE23A796722 = _NONAME_ | V | 0x2159381EF313F6344F9A7F427D3F4A70 ; libaacs -0x6606A45F8B9017C948188810A8C9D1058CB3ACBB = _NONAME_ | V | 0xA8C64DD6791597D4F92794C3F153972D ; libaacs -0x29198FDBE91C52B7FEF4EA04655C07EE9C94E8DF = _NONAME_ | V | 0x31E79BA688463F2AAD62499B00FE97CB ; libaacs -0x64C9859B95E7D44602B87BF2584F6A4170E25C14 = _NONAME_ | V | 0x33887033FB6FCAC550FD78A12EF87893 ; libaacs -0x5B68BF4FEE2F2893C76DA6114773C26F81384ABC = _NONAME_ | V | 0x45FAE01FC28A96BB79D00BA833DC12DC ; libaacs -0x9411A047D8B88DC358D81F8CD2EB0E4A0484FBFA = _NONAME_ | V | 0x882FA90443532BD4E6268FA7A4BA886F ; libaacs -0x43B06A36D8866444B63A226282BB91DA0A535C77 = _NONAME_ | V | 0xBEEF8E52EDF188C62DF4900360026952 ; libaacs -0x4CE9BEE6B1A78F47599E4592402349F9F655024F = _NONAME_ | V | 0xFADE126AED74F4DD14FF892000D83FFC ; libaacs -0x73C2B366769E4B563E2AD2715BD74C038B522E0F = _NONAME_ | V | 0x1FD04C5D35F96992766AF4B33B76AC38 ; libaacs -0x50BC992CB0E7A28A620359B459472A325BD6C034 = _NONAME_ | V | 0x79C481CECA190790D43E50F3A9A8A89F ; libaacs -0x337A780D34D947C49544C67C203496A7AD3EE7EB = _NONAME_ | V | 0x12B174BB549DE1B4EFA9147A5CEBB4F6 ; libaacs -0x33E7E1996CCBA57EC421DE46A8803816AC7203F8 = _NONAME_ | V | 0xF22DA27BB21756AE10D1403FB8901F38 ; libaacs -0x188CE3FE2C36CB6A58A99D22BC8BE40EF17CF662 = _NONAME_ | V | 0xF04FE0E020C67A1D9B3D33E1514ED948 ; libaacs -0x19B97F22619CD46DB2DB6F4BA69D1D558AA8FB6C = _NONAME_ | V | 0xCE3E8B1153B17D09E6A0C377F7EDBE2F ; libaacs -0x554C507EE55D39F7D4D1B79912EEBF94DCADC0AA = _NONAME_ | V | 0x157D15041510DD4DBD862448587E5149 ; libaacs -0xF08A1EBD892577814F91569967CAEADBCEB186CA = _NONAME_ | V | 0xE65D3B1A329415616996D8A2927CAE25 ; libaacs -0x56CEFE5D13DB67ED658CB9ED4C8DC67E5542FE76 = _NONAME_ | V | 0x8382AE11E6B14123011B8A5790B148AA ; libaacs -0xF18672AE5303C92E402D3F3897A2BB5A54767BF2 = _NONAME_ | V | 0xA398B4BF8E9D9963971781B9634AF131 ; libaacs -0xA714BFDF61D753DF6FD921E598AAB524106E57EE = _NONAME_ | V | 0x5635448329CB2F518E2A82C76C926F7A ; libaacs -0x0AEF254B25F4AAD6E718C7FAE2061B5B09CEBA45 = _NONAME_ | V | 0x736276E20F79E82B234F706143AE3118 ; libaacs -0x43DD672899863014859F2C2FC162A9AA79DF8002 = _NONAME_ | V | 0xA646998D8F44AA3A22DC99E892A60700 ; libaacs -0xA6503F8E56F0C1E56F1592B240A36784EE13B6DE = _NONAME_ | V | 0xA08CB2B3E71912ABBCBA49689E6D0CCB ; libaacs -0x723683F3BFA4F00405AB53099DE5F71B20CF92A8 = _NONAME_ | V | 0x63F6DE521942E4F9F4757C04AF641165 ; libaacs -0x70AB8BAA2758E2FCF79B3341D574B899FA8F1066 = _NONAME_ | V | 0x0FFC7F945CD7502B5CDAD0F30B14BB0F ; libaacs -0x4CF182EA3828B4F89ACF933FF6EBEAB175FBE72B = _NONAME_ | V | 0x2B3F452DF8D006D83543AC28243A1E06 ; libaacs -0xCBC9FC9A9B902924E2345C4DEDF7846B9AE5A596 = _NONAME_ | V | 0x4C7DE8FC3065E3A48C48C2A87696328C ; libaacs -0xF29397435DEAB3CA55DDE0E4F37CB60204A1FCED = _NONAME_ | V | 0x8B31FD5C5BA32F162125EF55A7F0CE20 ; libaacs -0xFF22953F06ACD59AA93204B815E6726F6A3C0AE8 = _NONAME_ | V | 0x53C207C13D44153759DC250590A7702B ; libaacs -0xD2DE26234D0F1E57C9698BD42868C6A600D18C6F = _NONAME_ | V | 0xD9D12261F9535F9E018F41B12FCE2D77 ; libaacs -0x0463010739555927EB01DB334404874349388747 = _NONAME_ | V | 0x231B688C76AFEA9EB0E0AFB400137080 ; libaacs -0x68E57F88726F0260D5EC87655A9E0731BC65F04E = _NONAME_ | V | 0x5A2466C1C7D781E350D665B13871FB8F ; libaacs -0x07E485154A356FE5B7780287841911C3B2FB3EEC = _NONAME_ | V | 0x408462C2C932F28DA6B71813E98722DD ; libaacs -0x2616223775D9ABDAE355E9B061037B9131DFD599 = _NONAME_ | V | 0xE68978D83A4E859807EAEFA17B169292 ; libaacs -0x38759C03F6464E8C16CE4878288D8389BF19FAB2 = _NONAME_ | V | 0x32EC194B604876104ABBE4799493426D ; libaacs -0xA2709636A9D2B2D0A671112168F3CF684A751346 = _NONAME_ | V | 0xC0ACF7A69FE5C1022BAB1418036F1961 ; libaacs -0xB8924D5CEED71B1484B2225935158E0C922432D5 = _NONAME_ | V | 0xAFB1985501F39A40F2BB87A2137725D0 ; libaacs -0x7C3B663894E35EFF5B94509C328F9849AD31F366 = _NONAME_ | V | 0x29F08BB65E2BE9C33E10721C1FDD48FE ; libaacs -0x94E0AF2D09AE32E6542F3D6F8427CD6AC6A00A61 = _NONAME_ | V | 0xDA55F80FC1278DA92AE6EB990D2BA707 ; libaacs -0x62F6B1A7A6F4CD15DEBE7F8791DB8548D5B85235 = _NONAME_ | V | 0x4B3750A994AABB28CF7BAC9197D17091 ; libaacs -0x5997D1F0C5DC70B20479F5255CA45E7DB88B9F9D = _NONAME_ | V | 0x8484821667D37810647964E390C64849 ; libaacs -0x1CE454A9540B93E7EC096671DD930737281ABA09 = _NONAME_ | V | 0xA9CFDD7F6543897776908CCBFCB1047E ; libaacs -0xBDF2130FA20DA912AD203AA2EDD01F5CBC3D5C40 = _NONAME_ | V | 0x2D6105CFD6EE7CA73BD49665EFFB9F28 ; libaacs -0xE9523B4C53F59A2F5B9012AE53D772F769F3400E = _NONAME_ | V | 0x1245B24731DE035E11DC02DDD1A2A4BD ; libaacs -0x2B18D7CC52D84F04AE2C7EE233A49ED4A09488EE = _NONAME_ | V | 0x7E3567885706BA0B07223CC2E32FBC12 ; libaacs -0x5C7907B622ECC331F147AF7D206FB821D75EC2E7 = _NONAME_ | V | 0x17A21D82220B8C19FD431554FC161CA2 ; libaacs -0x7AA13855D9254C7975B6C11BFCCE6BA77DE54117 = _NONAME_ | V | 0xE77F79388ECC2FF912CD3D3401458727 ; libaacs -0xA00C51E3705DE4EA34926A7A286B922EDC2B055D = _NONAME_ | V | 0xC723DF930A39C4C64D40B3FF38947FB6 ; libaacs -0xC0B3C1248DB8A83939D4032D26096948AB3891AF = _NONAME_ | V | 0xA3C5F07EE9B68EED7B65BD993EFF610C ; libaacs -0xFC699261287F9A546A7248C1DDF9938657684DA7 = _NONAME_ | V | 0x48017A8FA380A1A684B82E860A7AEF63 ; libaacs -0x2D22870135BBE7EB4E39A6FA98CE8DB9712AF9A2 = _NONAME_ | V | 0x2ABE976C8165AC1B674F074C82CFE148 ; libaacs -0x450F27C19CFF0E29E07700AC77DE4C3AD3809216 = _NONAME_ | V | 0xBD15F32D0E33D68F4831073E91B76ADE ; libaacs -0x4E28ABDF4A53315E35CFF2F4685F86DC9723FF8B = _NONAME_ | V | 0x6772E418B17B15F6BF6BC53A32CAEAE4 ; libaacs -0xF2CE0765F86015A8AFB16BDB3A6DB94087C637C4 = _NONAME_ | V | 0xD0B38828A5CA745C202AF4A9FBCCB6EC ; libaacs -0x084AA5CFC2669291C6AD75A0B48AD747A77E89BB = _NONAME_ | V | 0x29562AB2A325C04C6C980DE5B8994DF3 ; libaacs -0x17D3F59C4BEAA3782749789320335C709D85679E = _NONAME_ | V | 0x54E51017DCFEA6C1DDAFC6F2EAE78B5B ; libaacs -0xE7484245347F21EB84A29F5CD2012AA91A769C91 = _NONAME_ | V | 0x21D86BEAB08C2CDF11FD1A078CBEBD37 ; libaacs -0x21C1C07493831206209E662E60F79352CF8BC2D4 = _NONAME_ | V | 0x0C37F05CA1BF0C2A76EAE5D39F214245 ; libaacs -0x40339C921C159EAEBE310AD978F83EB094D1DF31 = _NONAME_ | V | 0x33A1F4D2E7F3697CD16DCB11333CAD6A ; libaacs -0x51539E675A64C467501EF600D3967BDA89CA0138 = _NONAME_ | V | 0xB2C4F2F4A96FE9C4FA90BA0D1EAF87FD ; libaacs -0x95217D5A6E0599AD9F7A6FBAD36F8FAF61426F82 = _NONAME_ | V | 0x28D7902A7DEEF40E510F72BB662F1E8E ; libaacs -0x384555C2F0BC113571B93672C343D0925A155B05 = _NONAME_ | V | 0x92C57D9A8A1B05B46651C442766AAABF ; libaacs -0x716356A8E29AB81714E4B48B5475CDA1934F9E4F = _NONAME_ | V | 0x59BE279E7F44AF0F1D8C8052D96F7229 ; libaacs -0xF53823C98433E9344A016886AB9E4442634E2E10 = _NONAME_ | V | 0x966898411A23C1C829CDA3F0E689D5D3 ; libaacs -0x7EDB2EC5311E2CB0F64F30B772CA3C313782B2E7 = _NONAME_ | V | 0x6B61FA3F7C3548D620958C85A25B54B8 ; libaacs -0xEAB8220ACBFFAC17EADC25AC85A5894F6FBDE85A = _NONAME_ | V | 0x43FB66B02292294F4057D4AB8DC5DD59 ; libaacs -0x1F791A40ACD38537C0FA5FF9B412646EA93EE9BD = _NONAME_ | V | 0xF20191B9D948347BF04B505A62188CBE ; libaacs -0xCFC66A0A1CFF3B07040AEE5C6A96B491A4F71984 = _NONAME_ | V | 0x2DCE3F25305DA5374B13892085C80A7E ; libaacs -0x32B6280C505E0621CFFBD760CFE56EF9B5D6CD57 = _NONAME_ | V | 0x3D8B466D286B95C5BBFDF08CD8ECF1E7 ; libaacs -0x7413A93F82E0C30CC7E020B3F899FF401A90CD7F = _NONAME_ | V | 0xA9022F95C934187706F768497F0D1B30 ; libaacs -0xF7EE6C98AF80A9ACAC7FE1C1774A3A44FDD0183E = _NONAME_ | V | 0x4C7CFE6CDAA35B17DB973A988B8C6A8A ; libaacs -0x173CC490570F9FFB65E0BB24EEB33C03E0EF5A67 = _NONAME_ | V | 0x2ED7006CFE9B191F6E8938498A9A03BC ; libaacs -0x59FF06F75B89620BAE16B8A154896648D40CE0E2 = _NONAME_ | V | 0x80DDE110B41F2DCF2CBD6D17FF5AB6C6 ; libaacs -0x9EDF447D3E5BDB51863065A9740EA5B3305B6766 = _NONAME_ | V | 0x9458D834F2BD1E1F920222B4564D844D ; libaacs -0xBB248D6BA558A3161C749DE3C5F340374341A113 = _NONAME_ | V | 0x7D311214886430F5741BE70BCC112365 ; libaacs -0xF107D861FBA0E35219235CD8F2B0564CC985D77E = _NONAME_ | V | 0xEF455A97A3F8CF6FE80479F946D95D70 ; libaacs -0x2F7E37711D38A5BEBBAB16359AF8AE1DA8117953 = _NONAME_ | V | 0x449DDF6A9C9B5BF24B481D1E3466A5F3 ; libaacs -0xBFB0E1791DBC3194A79C4D309A820027938CF414 = _NONAME_ | V | 0x5FBEF163BB359852C50D985B37DCDB8E ; libaacs -0x53CFBFB41698501C9BC4BED6B18648CB5BFBF74D = _NONAME_ | V | 0x91574F08370B6EEB76B1100263010947 ; libaacs -0x8438FF9F4121BCC199613AD985CEE88096F5C487 = _NONAME_ | V | 0x3BD31C731B71F544D63699D209B1F4C8 ; libaacs -0xA39A164809BE0ED8B594888D44AE94CD477A706D = _NONAME_ | V | 0x4A158810F15636720DAEA82220634839 ; libaacs -0xFD297DD0DD82D319473E4A605AFD6380E40B8A38 = _NONAME_ | V | 0x1DAAAA8F70F66236FCF42C5358BBCB90 ; libaacs -0x678EA5ED36EE72638DE6EF1F6B917BC0E834FB16 = _NONAME_ | V | 0xE4E259A47BF0142D15C035157292F5E7 ; libaacs -0x49EB9FFE80949EAAFAAE70ABBF4EB40F04BBD720 = _NONAME_ | V | 0xA0AD575FCAF522262824BC6BCD0DC964 ; libaacs -0x8A0CE6801DE647F0C932929D58962CCE4D116D30 = _NONAME_ | V | 0xE1F5F1556CECED63949DE522F13AB846 ; libaacs -0xC6986687F163A504A0E0F04F7786B3F412AD88DB = _NONAME_ | V | 0xBD98FFA6EDE11C355245426A21F94F79 ; libaacs -0x17366D9737E375224ADE9044F936357140AE00DE = _NONAME_ | V | 0x5DDE27564288491A9EA2220CFB094862 ; libaacs -0xD1BBDD892ACE9580C5BA5A2DDE11CD2E80B1440E = _NONAME_ | V | 0xC7F9D14094D407601049965E2855C9F1 ; libaacs -0x33AEDEE7F30CA9532A40FC03C3AFE0BEA57DE00F = _NONAME_ | V | 0x8EACCE1D09FB56EFD9C94F66F2F65D2D ; libaacs -0x27424E2D95AC800E2E92C0C9DD7FB7D078701E11 = _NONAME_ | V | 0xA7C202351661D99AB58ADD7FDD9600AA ; libaacs -0x957FEE8D22E8F78949497766617CB1BDA8818A6E = _NONAME_ | V | 0x31F8C3C171816440C55AF98095A72F10 ; libaacs -0xE3912998B096E7A01D85795102D77A64ECCE0731 = _NONAME_ | V | 0xF1662106D1529DF514D1572B6037E8DE ; libaacs -0x0A5953614F37EED2CA1D18433F23DA4571DE0191 = _NONAME_ | V | 0x2755169DDBD7BC42FFC7C20E9767402E ; libaacs -0x8FB94CFA902B6AD49AA99A1B7891CB0066A3042D = _NONAME_ | V | 0xFC2E995BE6D2371B7A222222E65C130E ; libaacs -0xD89B781E7DD8875487DA70C2F2C0CB6110D869DA = _NONAME_ | V | 0x3E8CF8C691D4BC9CD6B8876C7604F3D4 ; libaacs -0x6BBED345A779D3A4A91948D7189C5C46705FEBB9 = _NONAME_ | V | 0x4062CE1B119C1F1BF559F7C9846DF9CC ; libaacs -0xA01956E99B7A0D27EDDABBF5ED22774172A53379 = _NONAME_ | V | 0xF6A6D65F3D519D47CBB37B2B3F29E9DF ; libaacs -0x9107F64CD0687B9DD3C129CFC7F02E6C14BEF680 = _NONAME_ | V | 0x89B06D33DC8DF0763AFD7B7171613B73 ; libaacs -0xD4ED9701C6F29A1B156AFE0A440033F63E5F71FE = _NONAME_ | V | 0xACABB6982FA0B8797D09E59A72EC2D1C ; libaacs -0x9722228A1A6DF32D766B689E53B41AC80DCE84B7 = _NONAME_ | V | 0x5F5C37208D45120FC0F6E0A669D703A6 ; libaacs -0x0B558B6071DEEDF218BB3D8F0BB8654764910A03 = _NONAME_ | V | 0x94252369F4F20518177DF1EAB3E65191 ; libaacs -0xA9D804D4E8275685054F74909FF7CF7DDB388531 = _NONAME_ | V | 0x30BE692103A1D66A90A1F62A7554DA5D ; libaacs -0x37D5A7A6B34E6E89A938BE216C29F43EFD481E14 = _NONAME_ | V | 0x4B375DA066339E61F243462B2DD6DE69 ; libaacs -0x53D1939EA0943E25A7ABE7E968C9509C40D899A2 = _NONAME_ | V | 0xF2F0E62B80B496A02A67AE4E8F4BEA0E ; libaacs -0x4B1F44C6375F75F9E07D9563775D18F789B65365 = _NONAME_ | V | 0xE5B5FDE8AA4DB29516BC69CA00DDC78A ; libaacs -0x877C5337EF3BC5C80FFD97E8E88DC339CBBB3EC3 = _NONAME_ | V | 0x905D31FE7FC67E99C39ED10D3B44A72D ; libaacs -0x0FEB27D665E1D1D9A0BE8D7F886A2BF4986523F5 = _NONAME_ | V | 0xCC33D4176F72797992D006E41E859E84 ; libaacs -0xC0B52ADC53D43B51DD7063E1B87E35C4E9B473C6 = _NONAME_ | V | 0x8953C642BAA1B3BA21C2B736E2D46FF3 ; libaacs -0xF083B6755A86E660B995D9C3C508BEB63551B2E4 = _NONAME_ | V | 0xC4F6A9F9D2970176AB93527DFC45BFFE ; libaacs -0x13D9B939362BFEE8967BE50D7DDD8760F558B0E6 = _NONAME_ | V | 0x8127E77122AA804859987175668F0227 ; libaacs -0x2C33CD51CAC950EAFB0E8B67283ADFDFD7FF9F29 = _NONAME_ | V | 0x5F9EBF291802A296E1E9709AA406A447 ; libaacs -0x3457F7917F8FAAC148D545C6B960403F176EC76D = _NONAME_ | V | 0xC4AACFDEA2D15E0CEDF8D9A0D56AD6CD ; libaacs -0xCA5C3F67A9BD0A24ECC7CE0313095AFC59B2FB66 = _NONAME_ | V | 0x31C978364FA3C2861C55CAEF9134A5C4 ; libaacs -0xA9CCE59DB24E8FC2E46151500C7DAA4430DC09F8 = _NONAME_ | V | 0x9080D573CE50E951AA780E4AC782DB55 ; libaacs -0x46388A53065E19C69B6203861DFF8908CDDB0944 = _NONAME_ | V | 0x7EEFB00A39DFB12EBE74365BECE3590D ; libaacs -0xF090C9A0290CC748873CAFC45377BAE56ACD09A7 = _NONAME_ | V | 0x439209956040F60A3BB7691A4A0E1165 ; libaacs -0xAC426EDD989F0F5E8D867A5908271BF695D240CD = _NONAME_ | V | 0x934052556B517337158D11D29C2EE7DE ; libaacs -0xB24B8DEF2BB38D8DE2623BCB4C8B539F65185427 = _NONAME_ | V | 0x27ABA68F3FBE522CCBAAF438DF6C2301 ; libaacs -0xCF2480079D283F6C315BF4A65BE5F1CC9F44DBA2 = _NONAME_ | V | 0xA803500DCEC3ACCC438F8552F1B07013 ; libaacs -0x467728905221426EB1C21FA48BA1DCFB2F65E44A = _NONAME_ | V | 0xF92AB136F634ECFA030F2A3A75443CB4 ; libaacs -0x8CA59ED9239302529514101B1F8135E1A26409E5 = _NONAME_ | V | 0x88FB0A535265A8FDB4A7FC6C31A71DBA ; libaacs -0xB4ED5741496C929AB768B5A01EA9A3AA9E1DF743 = _NONAME_ | V | 0xDC2DC02E687B320FB7CE6E7DE5162D5E ; libaacs -0x11B01BB8B040AC8CC98B6AF1EE0B734E3E01AA6B = _NONAME_ | V | 0x9D50B10D48B7FEC43F530CBBFA2C7C67 ; libaacs -0xCE92CF90ACFA745E21AF2BEEA808CDEB10636EC9 = _NONAME_ | V | 0x5C2094EA696CF35776C0044B413D4F51 ; libaacs -0xDABBDF0F3689737A7550D2B88C9753584CA379F2 = _NONAME_ | V | 0x19A56AC260575A389FCA23EA7935CDE2 ; libaacs -0xDFAA0AFBB2946E793F7267BDF3E627BFAF187F3A = _NONAME_ | V | 0x8EA69C8098540C4434AEB14EF940E06D ; libaacs -0x53FFF8B40CA11BD08D6D4178D7F9BC1ECD89E183 = _NONAME_ | V | 0x29EE6834C48580411432A0BEC4C01D5C ; libaacs -0x7757D1ACAB9A20ADEBE675E8FE87D0B8C538FDEF = _NONAME_ | V | 0xF3FEDAAE58C90E21ADBEC0B733556A85 ; libaacs -0x91A5BD3A5EB72FC884754B5D64F42228142054BB = _NONAME_ | V | 0x57A6A8C7B638C8CC48D995C438B9CB33 ; libaacs -0xCD71BD0F540A1348734FA03752C10C5F16A2A166 = _NONAME_ | V | 0x4684FE4808253258219CFCA734AD7099 ; libaacs -0x41F759D4BCB8DD6D63FA7E2687FE7906676AFCB5 = _NONAME_ | V | 0x80854EEF4F12FC75BECD5E0ABC7E8507 ; libaacs -0x1BCCEC993B5E3733BC78EA3167115A874786F233 = _NONAME_ | V | 0xCE9CB652471E7358BE0B59EE4BA7B793 ; libaacs -0xCC7A9166119DED47C753A8287C5E79EEBAB0BAB2 = _NONAME_ | V | 0xB1CDB67554401E815582F6C6D9694BD4 ; libaacs -0x2F79C819F7252D4CDD37538627240467185AEEEB = _NONAME_ | V | 0x6C2128A035D578C4FD9AD50C6E078FFE ; libaacs -0x70E91AD071473D9163017CE429B5B62FE6C3BDC7 = _NONAME_ | V | 0x21675F9B2F5F94B65B5A9CD8B5F1B31B ; libaacs -0x1B3012E633508235823467104B45F1DC41F6F938 = _NONAME_ | V | 0x3EA935346F0CD780F841A9D2C38CB9C0 ; libaacs -0x14668630083121C93F63F83987805C1EF6E83855 = _NONAME_ | V | 0x40ED6DFD1590DFB07AA604C22A32AB99 ; libaacs -0xD4A050420471AA1A64342674FB14BFE94A9A62D4 = _NONAME_ | V | 0x3586EB08480997B36E1067BE339A8B4B ; libaacs -0xFF844EB1F409E6B63E44845983CDD726D0397791 = _NONAME_ | V | 0x1EFF25314193C00E1AF0420E73493DC0 ; libaacs -0x62C2B6EE735D1CF40984C7E9360D7F4A15AA4446 = _NONAME_ | V | 0x9CF7270FB74CB2655CA26012BBCA9538 ; libaacs -0xFA213D8634A601FE3A0457930332856B96B130AA = _NONAME_ | V | 0x8B31554CE8525D63781087B5B975EA33 ; libaacs -0x2EF50604B12821D40D3E42FFE0311476669D091E = _NONAME_ | V | 0x38ACFCBD95C34038CDEB735D819378E5 ; libaacs -0xD002B1E60A1991DAE7107113D1C510BB3182088F = _NONAME_ | V | 0x2B74FA2AF5DFC31BF561E6436E1EB55D ; libaacs -0x4BD010AD1CF6CE34BEC2322673AD5DD53262717C = _NONAME_ | V | 0x06F0A63308ADFE28E86E58D675DF4B62 ; libaacs -0x1C2B06FAD15E5A55F9EABEE023A511CFD81343A1 = _NONAME_ | V | 0xB3A6FEFC9313037F59674553F1071001 ; libaacs -0x9233D8678F5909753BF26E99C5B3FD402B1E283E = _NONAME_ | V | 0x015D41F0AEBE852BB92EE842FB2B6673 ; libaacs -0x32FC1BA3857E5BBFCCC445FE6EDDC67EF6EE6612 = _NONAME_ | V | 0xDB1DD2190F944BCDC44DC822ECE9F354 ; libaacs -0x6FC0D9E1CD1A5F29520083A2477EE3E94FD0E12F = _NONAME_ | V | 0xCFB90F859CC71D1181B4366CA1E4F8E9 ; libaacs -0x36A416ECCD39713FD3FF7314E78BFBBDC3091570 = _NONAME_ | V | 0x6B78E9ACE99E3B494CFEA9500E6BD515 ; libaacs -0x23DD14BD39B4301B131F35E2F9D4B86E3F6B662C = _NONAME_ | V | 0x9DE02A82F9E11E3CB7B6F07A4DADB9CD ; libaacs -0x920D315CEEFFC77D5498B12433DB95C5FBC80232 = _NONAME_ | V | 0x77C195EFBC9ABB8439FDD8B0EB196214 ; libaacs -0x4CAFD1A4A4A468BFE750FD288295B81A9BB8250C = _NONAME_ | V | 0x6C3739F680B1D8CA3AD42C1418F1D73B ; libaacs -0x8969F84B292005396539700AE6A0297894226A1F = _NONAME_ | V | 0x7EB43759048D5993D8E6EF58162EAB9D ; libaacs -0xFA8006F2BBC011E3ABBB8849F8932FA04736BF30 = _NONAME_ | V | 0xBB4A3DB8ADF21AC0D46CBD8D870BFD9E ; libaacs -0xF817B120E9ABFEBA49B587052481ACEB7A8B3EB7 = _NONAME_ | V | 0xA5E98386B0D85077AD56851B29F2D337 ; libaacs -0x7600951E36FE0CDDD6A217B8813B1EE99EF7477E = _NONAME_ | V | 0x2A559BC8A01DDC49C40678F7F327A9E5 ; libaacs -0x431BA476013105585F3DB46FD3CFB91FD44A48F8 = _NONAME_ | V | 0xC832170E62CC33B3E3409C300D6C986A ; libaacs -0xFD23BA2F5ED5F76E31E7873C80F25F00777A95C0 = _NONAME_ | V | 0x7981AA9680CFFE7DA4560A3577096ED2 ; libaacs -0x9D9B478AFFCDD81CFDD39CDC2925654AD7A7E5C2 = _NONAME_ | V | 0x8B272C50793D73C593666D6F3BD6994D ; libaacs -0xDE35D907B2DCFACDDEDF53A43D5AEA3483A81807 = _NONAME_ | V | 0x561514BC6E78AB63DEEBBD4B0F8AA856 ; libaacs -0xE24ABC780C5BC4C6F36526DA37E3C8310BD1F6AF = _NONAME_ | V | 0x93A5230741BA605FC720AD75E2931994 ; libaacs -0x47B77B5FEB76A96DAC00560C97C45A8C2A165FFA = _NONAME_ | V | 0x73222B45C0E7858DCF842B46B353ADEA ; libaacs -0xB612D8E9D46C7507A6353381CCC43084FA763C65 = _NONAME_ | V | 0x5F962BD466417B011599D36F76D7ACFD ; libaacs -0x9C08383F02224130107A84ACE0DB1A0D49E2D894 = _NONAME_ | V | 0x79B29601F744E6E34A5B5057C0F1CBEC ; libaacs -0xCF99639234406C5C94B963DE34C59DB4C56E2C52 = _NONAME_ | V | 0x9688D531F2C4BD8C7ACBE558C557F6D0 ; libaacs -0xBFDD6ECAC9D42A9FA4D34D13319A95F610ED2C6B = _NONAME_ | V | 0xBCE3D5D94002EFDB7845E5D8EA9F862D ; libaacs -0xA931851B91DAA0DAA1ADBE8C51AD34E64E35E779 = _NONAME_ | V | 0x87D0DBDB96A97D4150EAD16BD870C1CB ; libaacs -0xA7072A900AE4831AC56DB67B5253B89B59F18246 = _NONAME_ | V | 0xE92C6BCEF9751CA7ADF265CF864D21E2 ; libaacs -0xB5DC38947BC02E89186DF353D9753061670F89AD = _NONAME_ | V | 0x7A6B7F368330B2CB44A887031CAB3DEE ; libaacs -0x335B9C3A92369A6C721EB40C5E303786D6F86457 = _NONAME_ | V | 0xDA5D4B4584FB8FD7D3932366594BF813 ; libaacs -0x6080A00E2B5BA43F06695030B3735D17BF497A28 = _NONAME_ | V | 0xE92795C5016DA3CFBF5BD48938EB75F2 ; libaacs -0x3FA7785BD7D13BE304ADBBED7418B5866D175536 = _NONAME_ | V | 0x6002C0D2712007F3E863342D24610F3B ; libaacs -0x7F43ED256645247BA1A59E0234A346DC3A720E94 = _NONAME_ | V | 0x0C03091E6812D68159C92C60C5226ABB ; libaacs -0x9EF4E4BEDE12E1B02F2CA17124ADA250C68E26DF = _NONAME_ | V | 0xFC696D51E5B29143AB00C29AB01375B7 ; libaacs -0xFB0A7BA8B5F870A0674210EBBF2CEB849D9466D3 = _NONAME_ | V | 0xA714179F77E653303B21B5EA7DB50749 ; libaacs -0xADEFA2A817FF7A8232F7880FD4854ED11AAE8E95 = _NONAME_ | V | 0xD6700ED111B15C110BA1C30C0AEAA6FC ; libaacs -0x1407DF1FA3A6D8F3A0AF1A87FC0413BEFE1A8830 = _NONAME_ | V | 0x49684F5EAB99CA58687DACFB57BD920E ; libaacs -0x9D0186E9E3AB3CFE0E65B4918BD1ECDAE4C74CEE = _NONAME_ | V | 0xB13217CB894BB67B7208D9F2EE12D0A7 ; libaacs -0xDC37822627431A8D521758533B6E17C1834CAA44 = _NONAME_ | V | 0x09B3A9CBD29290295E0EE77D40673314 ; libaacs -0x1E8B69807631D0B2553D3886568D50DA09A07CC4 = _NONAME_ | V | 0x81375C0DC983B46A72BF1BC524A465BF ; libaacs -0x5A47B5AEFE6B11F216F490D4CFB34D5F1F891029 = _NONAME_ | V | 0x6F0619BC2F10DF49658509D6756024C1 ; libaacs -0x71DE1319DB9C0C8A0ED14EB6BBC145000A9B22FE = _NONAME_ | V | 0xAB679C1051F3ADCE6FF393D234DCC236 ; libaacs -0x9645F55E4B887F5F30ABD8A13308B7503217B8F7 = _NONAME_ | V | 0x3412F3DEA95F7D684FBF3A8BCE91510B ; libaacs -0xC2FD0BAED879889767F101FF9BFE67F41E49C4A8 = _NONAME_ | V | 0x5B3915AAB95DD1C23E9EF06916B69C32 ; libaacs -0x096D93B1D235409E44863333EE2C05A7D1233824 = _NONAME_ | V | 0x9A9A524F87BCB6646427B72C6D6303A6 ; libaacs -0x914368EC1D5FE7114159EAC64BF60E80B6B4AB70 = _NONAME_ | V | 0x92EF88AAC97E4C6F838BCBE2E9994C3B ; libaacs -0x8DE26AEE7B317FFEEF9CDD2C87CCBFA288391DBC = _NONAME_ | V | 0x2F2A093649055371E65387BFFD613EBE ; libaacs -0xE64695628F07F5AEDB7F97903FF79E0B6A03C4AA = _NONAME_ | V | 0xB43C11CC8DD10EFE778F76AEDEAF55EE ; libaacs -0x7F80E3FFBDC45B59B7BF017805838BF894E23EC3 = _NONAME_ | V | 0x1B955D20EDEB9D887D3718F25558C021 ; libaacs -0x2A1CA4DE3BF3F3484357CE80367771E1F316EE38 = _NONAME_ | V | 0xF03B5F54053038338441331143385B56 ; libaacs -0xF8D3BEEBB34E1730ABD3DDAD82B1104A68A613F0 = _NONAME_ | V | 0x4B4A66D5420FBF7BB474E82E6AD8A5CD ; libaacs -0x1EC67E709568982F916471867F539DC4F89B4722 = _NONAME_ | V | 0xFE282D02A1E0A3780AFCD2B8F24B8233 ; libaacs -0x04045C4F100A3FBA858D0A10FD0547580AACA6C0 = _NONAME_ | V | 0x4808B6F4823897D323446031C60CABB4 ; libaacs -0x3975607A4E423F6EDEDF0F7AEF0F32C87738CE3D = _NONAME_ | V | 0x0E23FD8D80206FE5B3B1049058FD3CCE ; libaacs -0x439D66D0852EC4B3633717356832DABB41C862C9 = _NONAME_ | V | 0xB9D47E9224BB638CB0F6A63C20063DC5 ; libaacs -0xF3D8867E473881F877FBC459DB401F65596CF6EC = _NONAME_ | V | 0x52A2134A4155316A490487CC6E076F34 ; libaacs -0xC45E3D3D96318845B9E6F851FBD5AFA809A1BC34 = _NONAME_ | V | 0xE8A0F74458B3ADF7A0CBF80184CE79EA ; libaacs -0xD53A13D83FAF40E536AF5E1E017FE19C341E3883 = _NONAME_ | V | 0x6E5D8F0688736F3E44213986420739FD ; libaacs -0x8E9D2C2383E8FBDE52D8F4E225376AC1E15AE41C = _NONAME_ | V | 0xBCBABFDE41C42B41C1FFAE72F806BC51 ; libaacs -0x45A57A0254748491C7670A4DABDC1B7527D8641D = _NONAME_ | V | 0x583CC8DFC85EBCA57CBBB3F46926D378 ; libaacs -0x4644739DF1250C3E4E119392DE69489791A001A1 = _NONAME_ | V | 0x55A2D9A303ABCC61A82FA079D78C3E65 ; libaacs -0x4BB167482BAE45C9D281DFC2BAD6769229100B9A = _NONAME_ | V | 0xC4B98B9079F2AF06DEBC082EE9594D0B ; libaacs -0x57F70A139A7341E65A05B2D9AF887A6FDDA86641 = _NONAME_ | V | 0x438BCA19DED18DC48FEB5A1D23CA4DD3 ; libaacs -0x6BF2BF7C9E157CBD21F61FEA92131C169B4A8DAA = _NONAME_ | V | 0x5973D13B3765EF137F9A686179E0EC93 ; libaacs -0x00B84BEF9F74CC532FA25417411D919EA259194F = _NONAME_ | V | 0x3ABE18BBB7052D5816D0DDAACA210879 ; libaacs -0x9BAE90C220EB80411A4C663E1F380610A4B40CF2 = _NONAME_ | V | 0x4B2742282ACB15612FF40663D173ED56 ; libaacs -0x15532938735544DCC90D972098023752F5C4084A = _NONAME_ | V | 0xF43251E98E75D69A53FED86660C27219 ; libaacs -0x46792DF31EAA77EBEE49C64B02CF0A68B261CE1D = _NONAME_ | V | 0x816A38090D3D803D0CA4B75A68B2DA80 ; libaacs -0x57140920C2E6260C3FE0249F4F030A88E7DF5D6E = _NONAME_ | V | 0xBE60DDCDBF930BF25AFD00703F762F7C ; libaacs -0x2884693FD02039AEAC9AF359A6F9FFB1A7CE6985 = _NONAME_ | V | 0x408A3547589738CE22EB3525965CBA5F ; libaacs -0xA26B6E8BF7F176DBCF57839209BD29667DA4DB7A = _NONAME_ | V | 0x5F2C7F8AF1BF4297676C9D9B674365BF ; libaacs -0x5A701AAB9907E6CAEB2C725344C9AC135AEB291C = _NONAME_ | V | 0x7C53571D7D416465E183BC5F01819439 ; libaacs -0xC0FBEF74D12045C5DF953C0D9720107F0B21ECFC = _NONAME_ | V | 0x4B63F5EA0B96287883BF53746A84E5B1 ; libaacs -0x527CB7296669C46BCCCE7B5DF39E6A260628F803 = _NONAME_ | V | 0xD91F72C0CAE31396D3FBC1968734F081 ; libaacs -0x042EEF1C36381C736631805D91AAE92179D9360D = _NONAME_ | V | 0x486B3854B961F287CCE31CE04C2BD6E8 ; libaacs -0x0753C30B5B32AEBAEED883B6C4E62E57B2B78330 = _NONAME_ | V | 0x427C8939C0C01AE95542DD0AF2B035A9 ; libaacs -0x0E5BE84F2DD1EE1821F354A8B0102A12D27DADCA = _NONAME_ | V | 0xA722C99ABD08B6E72EE0B5E7EB14D43E ; libaacs -0x0262D4351A3C7FB34F6538A1F1997907D3C35245 = _NONAME_ | V | 0x71509FAE2E71A36F8678A702858F9F2C ; libaacs -0xDE5A60CD0B6CB7A9F7A74B7D6F5B0B5A6CA58E79 = _NONAME_ | V | 0x4307EFF8868FAC3B1B80A6E0E37B6F08 ; libaacs -0x3DCD365B86A8034FD04792A73EE6AF3AC284A3B3 = _NONAME_ | V | 0x563F1D66B0DC3C81212CDB8C84DAA495 ; libaacs -0x6F145E0A4AA0F6AFB4A6982710232488487AE6F3 = _NONAME_ | V | 0xB024E9ED195FC254CC89B091AAAA2B65 ; libaacs -0xBE594E0C0C1C63A5BCB7F9E23B81C0A4ECB5A50C = _NONAME_ | V | 0x411226E2FDDC4E4B0CEDF09D45ACA265 ; libaacs -0x77F32FB7818F842C1424C22DD6525FFA7D3CE1DA = _NONAME_ | V | 0x88FFDC26921DEC319927CE073E5A405B ; libaacs -0x4F6CEA2F8287C4FFE644E4CF5DA5F80BE36BA6AB = _NONAME_ | V | 0x5F5B31E1CBE1FAE3AA2175B6B000934A ; libaacs -0x125DE3B1667962B9D4201A9121008A42ED58A4F2 = _NONAME_ | V | 0xEEBC6A793BAD6DA1A920A1F98E861BD0 ; libaacs -0xCE81CD7C07B94AA494EB3642174258E1EC892DBD = _NONAME_ | V | 0xAF2D160B259C0F494B7C73FC0674ABA4 ; libaacs -0x1E6C0EFA5F06EF57DE64570DCD132B898774B2BA = _NONAME_ | V | 0xFF0A7DB87643675879D2B26EEEFCA673 ; libaacs -0x2C1DAE5943F0D7CBD0260A177B6513AABB1AC328 = _NONAME_ | V | 0xAB429936B96C2F65CE6B0F4D2AE271D8 ; libaacs -0x8312BA0333F109933E1157ECD29476062A08E91D = _NONAME_ | V | 0x944B48138A5067716A28BB2C28A12F4B ; libaacs -0xDB572DD156BD9C843525C2D2508F563ECB6AB847 = _NONAME_ | V | 0xFEC4F82D9F57E27B77AEAA9A81272AED ; libaacs -0xA80CD3F583CF2E03E139EC283605F6F8D93D8CB5 = _NONAME_ | V | 0xF5A89C60E91A98BE7C32B3AF735433FE ; libaacs -0x9062DC29326D9E80A0BF64CC71857F890D1846B9 = _NONAME_ | V | 0x322F6F68CA1176F8360CB1E02F85DCB1 ; libaacs -0xB81826A1CFA0A0B88BAFCEF8BDEB3A7CA29DFE46 = _NONAME_ | V | 0x504653A12D89E2CA7F0A32C3CCFE81E9 ; libaacs -0x0BFF3E05C6A659D95B14D9CA3FF24E1C7BE78E00 = _NONAME_ | V | 0x8D9318020BBA8DE4D65222652D3FCC08 ; libaacs -0x8634528B60D42911C5AACBFD8968BEC07666DAE2 = _NONAME_ | V | 0x7C45A96F0329E8E6D1095254E962EEE2 ; libaacs -0x05A14EBA545FC16A4E6893D19A96A676B6488331 = _NONAME_ | V | 0x7C4B57F16E44CA574F00EC6AD3508D59 ; libaacs -0x96B647F32919B10222F3B6181A2C5303A68833DD = _NONAME_ | V | 0x156ADCF6D8040E5D6633A9C83CA5341E ; libaacs -0xA09A6AAA9C3600C1FF7A3C626F356BAD9B1464EE = _NONAME_ | V | 0x5903B4D8834B1C8A75D0698E3C03B5B8 ; libaacs -0x52E4E4E8EC875A3CFC37504B0BC6B87B176CB1F2 = _NONAME_ | V | 0xE8C0B5F408B857A5CA1BA70D7144C89F ; libaacs -0xF6A30E87830816586DB9B048C061F2ED30AE9B3C = _NONAME_ | V | 0x9B537C6AD51FFB6BEED2C499F6ADC8E8 ; libaacs -0xEA3E15FD22CC555A60CBD0F5479BED7186B5AD3C = _NONAME_ | V | 0x4E65475EACA86EAB06E2E15DC0674804 ; libaacs -0xB4285A475A629ED1BDED5C2FBF77AEFF41083E2A = _NONAME_ | V | 0x6DFE165A6C24BE1CBFC0AFDB419E4152 ; libaacs -0xB38E83831D9DC94D8773377541628B9FC0312ED9 = _NONAME_ | V | 0x089000D672B3988678CAFE059FA65DF1 ; libaacs -0xABB9A4547C7570EB233DA5C3058149E816DACF55 = _NONAME_ | V | 0x7B52F1A67DE8948F5E20302EFFDE7014 ; libaacs -0xA2CF5ACB16A2011F71BC7C7AD97971053B7BE9E5 = _NONAME_ | V | 0xEA1FF4C6451D1F9564B2A13F53C531EB ; libaacs -0x2F57E6AC2C8DC8401D006EC830CF6B8FB37AD8F9 = _NONAME_ | V | 0x2476CAB6F1118E01FCCFE517CFE1240E ; libaacs -0x8052294C057A5DEF5DE37498783F5347609C994B = _NONAME_ | V | 0x9B2BB035DA14B787682D1090091AFA89 ; libaacs -0x841D777FBC1F20E90526F7EB102E59BF68269798 = _NONAME_ | V | 0xDE027CDD8CB4C690DD7C811EA6EB7FD7 ; libaacs -0x7411F5244D9DAF2CCBDD125283A22375F593D1A1 = _NONAME_ | V | 0xD346AB158F28E7CEC89823E2BF22E879 ; libaacs -0x5A34EDB74207CF1800AAD7A3BE8D92046A8570EA = _NONAME_ | V | 0x9E2A17E0AF34237438116C2D6BBCCEC7 ; libaacs -0x2BD87F99547448B6AA945B08F7C70377E9769451 = _NONAME_ | V | 0x5AF5438949A8635E3695BC61A87290F2 ; libaacs -0x7F937A10B866D40CBE2A199725F6578D15E693EE = _NONAME_ | V | 0x0551D0DA9D612D30061295F968894D7B ; libaacs -0x2862B0C6C3E89BC9108A815E9A1FDBE02ED612CA = _NONAME_ | V | 0xEF40591815800678F7604FB90AA97384 ; libaacs -0xFB03F363932D87D2D063FF2DEE3309AD4BCB652E = _NONAME_ | V | 0x1B0642BEC4D58E9A19F741CBA506F139 ; libaacs -0xB3A0F3CD91C9DC9FFB95BC29400263665F50F284 = _NONAME_ | V | 0x267C4A5E0D7991564D259A0AD22F4032 ; libaacs -0xD568CE62E569B2516BD07CB8CB54E65A0B9B1A79 = _NONAME_ | V | 0xDD8FC06952EB4C6C64C0E9B139B1C410 ; libaacs -0xB742454B254AC9D06FC9E1F2317F032201BDCE31 = _NONAME_ | V | 0xAF053A0288E6F7B74C859E4BEFA0BBD6 ; libaacs -0x88B177F0E1D28678DE9EB2365E27D1D525BAB0B3 = _NONAME_ | V | 0x8CF6F7621DA3DACD74360A3C7DB6F420 ; libaacs -0xABB68E16F3AC3B76AD6B10EAE6D6E5BA3E386133 = _NONAME_ | V | 0x094DF75E6C43F01D05A8A10F10A8B9B1 ; libaacs -0xA5683E4884BC7EAA52D4C61D7050AD1472AF2987 = _NONAME_ | V | 0x73049193B9308BB056782D5A43E3014D ; libaacs -0x9D81CE4F6A753A44DEDF16B041E64020F084E9D2 = _NONAME_ | V | 0x8B49FFE346D54964C82E615FEF40F5CD ; libaacs -0x7A983FEEFE6C04E9158E738D19495AE27025BEB6 = _NONAME_ | V | 0x7C2B5AC3CBC8D287487968740CF317A4 ; libaacs -0x5F4C74DDBD5D6D54297B7EB709E66E1640744469 = _NONAME_ | V | 0x8B0642FC1F1C6DD32071DD700E2860CC ; libaacs -0xD62DB052565BC4313D2D666C7A767907C362010B = _NONAME_ | V | 0xFEA6D491CE6AF4150C7DC08EF15466C9 ; libaacs -0x1BA77559116496083319EE3662B2C1A50F7CE3A2 = _NONAME_ | V | 0x890D89481580E21AB32557AF89BF8110 ; libaacs -0x48659C3B3AF5CB8553E80163CD28A9F98327C416 = _NONAME_ | V | 0x2FA5BA6FEF5DED036EBED30A2AC3516A ; libaacs -0xB1CD0F8DC5F9270550EAC6FCAA06DE4A61FC63CA = _NONAME_ | V | 0xD020E7C4846B9A27E154A5B5BBDE00BC ; libaacs -0xBBA9BBAAC184070F7128DF20934E120A05FAFCE1 = _NONAME_ | V | 0x5F31A3754AF9A3BDE80440E8D98F2686 ; libaacs -0x7C01A34EC9AC42A2BCB405C1FD815C74E30EB523 = _NONAME_ | V | 0xB2DFAFFA3BCACA22CFB6AE95C59ABFD7 ; libaacs -0xFDECF7433863531BB14606276955B855BADDB241 = _NONAME_ | V | 0x591C0058A5129F72BB8AD74044872690 ; libaacs -0x66CF9DAA918A4CB71681C8FE30BC1B5DCB57CC10 = _NONAME_ | V | 0xD7890E0062C0C1C010546F825534567B ; libaacs -0x06B9103497B22A860CA99F131E8355E8D2A27E7C = _NONAME_ | V | 0x83320A5A47CE6C1E512C2772714E967D ; libaacs -0x07E025C85C38934BC61B6401072BCE83AB75F193 = _NONAME_ | V | 0x486FD4F7D5E9788CA45AF69F9CFCD057 ; libaacs -0x83DC7849E1CA0C5A0A9554B34FA685B87A1D8A16 = _NONAME_ | V | 0xA99F9E03C73F222FBA998AA5D832E151 ; libaacs -0xE8AAB2F27F5D492B6B92FA56036D3ABD02A2D4BD = _NONAME_ | V | 0xE4B0B9C42505C27CE42837FB4C4B38BB ; libaacs -0x5C680B05F0D78C01341A20F9E143AAD7D86BEB29 = _NONAME_ | V | 0x4B73322C6501E239CCC67020D50E42E5 ; libaacs -0x4FAFDA54A20E4D0CB73D19ABADBA9C80699A44AF = _NONAME_ | V | 0x6327C2D3CD9A89D76BC81EBC187381E7 ; libaacs -0x4175EDE3EDFF9ABFBC182C36C4DFCA5F019B9B36 = _NONAME_ | V | 0x9E2AD1708549747F09CDB8F6A2F36DB9 ; libaacs -0x5020900B81D955F333590E433AB5CDA882EF8F12 = _NONAME_ | V | 0xAE247B6A36832EF056A77718627D0150 ; libaacs -0x4632BEDFABDD2B1EAABA19BECCF9D0D8123C03C6 = _NONAME_ | V | 0xFA921D9125EA50789633F3C666E92AB3 ; libaacs -0x4628DFEAA7488F836186007DDCABCB7E0A2B1024 = _NONAME_ | V | 0x1BB4CCD6CDFEED18577E108E4E4AC879 ; libaacs -0x4255A0640AC67040C1E23D43FEBB3A5D71F6E684 = _NONAME_ | V | 0xCDD385A223AB1472B74347F79A05EF9D ; libaacs -0x3C2F1B4307CCD18263D99E9507321A03036A3A24 = _NONAME_ | V | 0x62A3712B4551D738C88865C69DCA8917 ; libaacs -0x0F3E7ED4C62EAEFAB9405886E2E3E1BA21710912 = _NONAME_ | V | 0xEBB054B46C06D79F6DBF7A2B4647E033 ; libaacs -0x0DD930634DC2B59E52C56BFE9305E368BD6C53F8 = _NONAME_ | V | 0x7F6B4C514B630604FF154C3EB530DE06 ; libaacs -0xC2EFD1237533BF45155C2BC6F67AA15742FDDDFC = _NONAME_ | V | 0xC317DE8A1C962E380CD9BBAFC4B9CDCB ; libaacs -0xFD8424D0ED84E136E3EDCBA16D301F4B95DC7B29 = _NONAME_ | V | 0x452204291F20DCA6A8D9379A79C7DF1C ; libaacs -0xE223044B8DD1BE689E4F8146E8F1ED3A22037B16 = _NONAME_ | V | 0x6FF152A9E20C8D109CB4553CEBB46A25 ; libaacs -0xDC8B4E87F63A9716842A52827A8F0F75E11F85A7 = _NONAME_ | V | 0xAAE06A03618018388C63373951C8ED87 ; libaacs -0xBDFEC23327A5A1DF42348E7863F1C6782B087569 = _NONAME_ | V | 0x3C901F6D09B7647C6CDBF9D7F76EA95B ; libaacs -0x0C0C5854884F0EBF234DCDADBFEC02644D1AC073 = _NONAME_ | V | 0x0D4BC543F7671D4AAFF2DF303E4C20DE ; libaacs -0x0374CBF08B184D73FAF2BCADF9C34C7960DF70F2 = _NONAME_ | V | 0x10EBDD6BEED3B0B17F91E85B3FA3B07A ; libaacs -0xC20375803E1409A89B824A0665EB428A55940AF3 = _NONAME_ | V | 0xC9BBA1F4FB99D0ACF6A74AE8830BD956 ; libaacs -0x03DC400E12AF65F5C0AFD2F447A6D49A131A0627 = _NONAME_ | V | 0x1EFB81D0133A6E72C5BA29F2099AC39E ; libaacs -0x0FAEE33D9D9309841B1E3FA590366405F81E3BFF = _NONAME_ | V | 0xFAD6E0B94435A0788759441981219E82 ; libaacs -0x65B36F1A068B2E351C13BA0D9BEF9E35E28D1970 = _NONAME_ | V | 0x6CE872D77892C9E82EF29A2C302B832D ; libaacs -0x86F36361ABED68BE7A535EC2615F2964E62F6C92 = _NONAME_ | V | 0xB536614C8DFFE1E04B9B11EDDFF63CA2 ; libaacs -0x9B8A6D95066277436F5D7FD638D7A6E5A4C8B630 = _NONAME_ | V | 0xC967ADBED1BC9834EC8DCDAB40277D3B ; libaacs -0xCDAB71F5F48CBB7D3B39ADC645187DB096A5F5A3 = _NONAME_ | V | 0x1903EB571B860C670CFB3902EC60AEDB ; libaacs -0x4F0FD05A6BC666838CBD805B5EB26F2F1D7F4549 = _NONAME_ | V | 0x2E40500B3736DA99929EEF94C2DC1DED ; libaacs -0x18430E1739D82E0AE19FB53163C31B7F0ABB04C3 = _NONAME_ | V | 0x4FC03E34DEEA6408BEC1EF1F746B2BAD ; libaacs -0x14A4E7B0C0C415C4EC4955340BE032396FFA2478 = _NONAME_ | V | 0x14C7350115897FC6F568E8D4E677FCA0 ; libaacs -0x456955463D19F935C3253C00854C2BB9C6BF4D82 = _NONAME_ | V | 0xCD7EBBCEDA73EFF63DB14A330096CE67 ; libaacs -0x276099DF4D9C67C1A57735C15D2C25A06F550679 = _NONAME_ | V | 0x3FA8E864DE736D961ADFB15C505679E0 ; libaacs -0x3CA558E0F74EF6BD06A6C72BEDE6DC133BE502DD = _NONAME_ | V | 0x18CCF906A55CDFC3F064556AD8D74FFD ; libaacs -0xDDDDCA2A5200E12C9C14A8C594F458F7C1AC1D93 = _NONAME_ | V | 0xC26B387DEF4512D50757CA57AFD8D298 ; libaacs -0x69733E285246C9CEF7039F8CAF83D0479F2D98F1 = _NONAME_ | V | 0xC439276ABD8B155462F5BBCE3C9CD828 ; libaacs -0x4E898B7FDC6440606BE9E4CD6E08334133430FA9 = _NONAME_ | V | 0x37DAF7B29DB49B7049ED0F8935EF47D9 ; libaacs -0x954CE2FBEC6575B40BFA0497CA3127C24FC64C10 = _NONAME_ | V | 0x32EAEDEDEBB9A0C27D53FB2A8A4DA3AB ; libaacs -0x1ABC6BCDFD14D681CF2C338221D20EC9FEF09C5D = _NONAME_ | V | 0xFB645DD7DDFBE25D5360C4B1EE7201EE ; libaacs -0xE799B61D997DDA8272C111CFF43CD8251C643D2A = _NONAME_ | V | 0xAA2FCEF2B768147AB5588CD4F85127FE ; libaacs -0x1198AF983EEA1FA68FD22AA94BA1F44022D2CB09 = _NONAME_ | V | 0x109617BEDA3C761A0A70FB58379834B0 ; libaacs -0xE3915514A900100AAAC7DFCFBAC34DAA67B74B7A = _NONAME_ | V | 0xA8CE6D86ABA0B083EA839AEF8A72DDA4 ; libaacs -0x7608464DA5BF19B8F36839F932DE0C2DFB808985 = _NONAME_ | V | 0xD2F270F1C92D484DE07369845804D8F7 ; libaacs -0x870F57286E30D551922DBD931284BC141FAD65CB = _NONAME_ | V | 0xFD9DCD6076276318325406EF29B82A37 ; libaacs -0x24F2B29A80D0493530F1D8F704D550CCEA665667 = _NONAME_ | V | 0xF06353D1AB1C8D006FE3E878C373F435 ; libaacs -0x0B7C40FDD8516D673490F01C9EF63610774744FC = _NONAME_ | V | 0x2738A766691E932DDA7ED61CF98D5DCB ; libaacs -0x0B6E60112CB6EEFB9BBDD07718B444D0072667F0 = _NONAME_ | V | 0x4B26BFFED4C59800620CDB5A5A6B52C9 ; libaacs -0x8A036D32B48F029AC836BD9E2B1E178FF79F71CF = _NONAME_ | V | 0x9614E290152CACA5E2BA555B01F84B35 ; libaacs -0x1B16DB82C5D71C3088156378C43CFF094A336545 = _NONAME_ | V | 0xF227855671FD1AE345F069ACB130FC84 ; libaacs -0x16F7387F9B285AA4C0E7140FCFF332F90C06E8F6 = _NONAME_ | V | 0x933A6DD0FFD576214631400825F4DA9B ; libaacs -0x184E73DCD0E7F3FDF2A3FEB9D3EA011F69C988A3 = _NONAME_ | V | 0xC64843BD8A3A0E3F22AD47CFF894AE31 ; libaacs -0xEA2EF3998420279EF651431F04C864A0E660CDCB = _NONAME_ | V | 0x8C7D8ED7319CD03E8E010AA2792813C1 ; libaacs -0xC806CF8F1F22662EF23F860E805E3D43D2B90462 = _NONAME_ | V | 0x7EAAAB2491F38B8A87BBF8E9FE5D7704 ; libaacs -0xA7BE7C46B8EDA6F88EE22FF1F74D6FD89A9BE1E3 = _NONAME_ | V | 0xD0FAF4B86BD13068EA006B8EC2BA6AC3 ; libaacs -0x9C2C281EE44730A0514B8078ACA2D9D49C7C0193 = _NONAME_ | V | 0xC3575A9FCE96869734AC7C79FA624E1B ; libaacs -0x801CAF80E9140B5CCC4736A47653736EC9EA175A = _NONAME_ | V | 0x4970148EED56B4CD7EE435D50E46CED9 ; libaacs -0xDDCB83013887B7C066ABEA7CE95806B0122EB2E0 = _NONAME_ | V | 0x7868A5DD299FE52C3A10EA4766EA5C29 ; libaacs -0x4AF4552020EB06C4467997417CD8BF1B15B06572 = _NONAME_ | V | 0x1D770E3B3D83AE118472677FECA14B28 ; libaacs -0x8516467980A43D9CE965F39D5AC66B452A5C8818 = _NONAME_ | V | 0xF809792E7E7815B8D2301AA330CB3420 ; libaacs -0x87444FEABA919924B59CD9A2DA5575D6C2559036 = _NONAME_ | V | 0x7AD00FCF1087A3E7A43B97BA68A7EE1E ; libaacs -0x7931B69B6B26EA515C983037B7AE27E7F11BB813 = _NONAME_ | V | 0xC86F422438822C4A1D02BA4F54BCF6F4 ; libaacs -0x41C6FF208984C1C47AB81E816CE31571892D7458 = _NONAME_ | V | 0x5F8D787DD7A21FBEA056F67EDD16631D ; libaacs -0x8F3C51C18E0130C472E0D44329B07F9EB3F13213 = _NONAME_ | V | 0x62AA2E317F6667A723F712DC6B4C441C ; libaacs -0xCB88B55B45E148C6316A5B683534939101F39118 = _NONAME_ | V | 0x92E149F6C518D5D1AC5FE3184BEF7125 ; libaacs -0x1327577FBE8458861CB27B28546B9EEE57358E10 = _NONAME_ | V | 0x72CB1DADF04D1E20043CCA5FBE85C17B ; libaacs -0x374D367A0F44FAF499807ECC54CF9D73E0038375 = _NONAME_ | V | 0x2096C60E68B63BDA06AF3F9761A89D4C ; libaacs -0xDD15F146AF62F8451DC6CF1036448EB1F27C2006 = _NONAME_ | V | 0xA9EDD7EE0726DB6905477D9EFF51597E ; libaacs -0x1FEF376848E5B95BE3046F3EFC07800AD783B9EC = _NONAME_ | V | 0xC2C2B7C697CA4ED6E5F4B98D51A1FE62 ; libaacs -0x7E4F8EA2782393085E694143C650769DE99EDBF6 = _NONAME_ | V | 0x2A86640B00D071EFB7453E95247BF839 ; libaacs -0x945320266CD173AA1835BEFDDA1B884DB1042DFE = _NONAME_ | V | 0x9719135F95FF9010CDCF33D8F5E06DFD ; libaacs -0x13C4019C00F16C3C2101BFE5338C918DAB9E9E6E = _NONAME_ | V | 0x4BCCAFDE95F8C586954F4DA1AD709263 ; libaacs -0xBD8EDFC4DB562DF17D6F0AAA0956F51F4E7EB1ED = _NONAME_ | V | 0x14259E8BA9A0E512B50CD144F39B6A07 ; libaacs -0xFC84EF434C4CF18519E19B90CD46366297F1F1C0 = _NONAME_ | V | 0x60ACA369A7F3D804129F33FE85C6910F ; libaacs -0x2E69CA6479FB9EF5E57D76D042FC5237CFD66CA0 = _NONAME_ | V | 0x0299559356E0ABB30F1921F1CDAEE624 ; libaacs -0x87DFB63B787C1DA413D4DE98F88A8E656674138F = _NONAME_ | V | 0x2B01D49E0DF2F47ACE01C8BFC00AAF66 ; libaacs -0xBE14275FC5C860076E7C2DFCA0265F81F8B3502D = _NONAME_ | V | 0x2B6C8273AC034E5C0D0D9E76823F435D ; libaacs -0xFEEFC09A7DF07DA7D7943260F35E7AF631BB1C5E = _NONAME_ | V | 0xF1AA4AC2208D4CE8BDDEA0382F0D257B ; libaacs -0x1AED03455B25FF26A03ABBB9151167FFF2E5DA9F = _NONAME_ | V | 0x9F89CA41B449A664624F58653E40991E ; libaacs -0xFE5EC7C6CFA812436006D449A838CE7FAC08EB0D = _NONAME_ | V | 0x2701B5AB5C0E6EDB359C61D8BE6FD4D0 ; libaacs -0xC4DDB87623AE2D6E28E334D4E544A383E4B3C984 = _NONAME_ | V | 0x747A99698803383B8E9D46A709EC9E7A ; libaacs -0xBF642C5879756A3248497CD43D3223C70D66401F = _NONAME_ | V | 0xF9D1A43833079A3F27721364565CBCFF -0x986A52229C2AE1002FCB4FF800BD7B783F0033AD = _NONAME_ | V | 0x12DD77F405736B6D2879EB7B5B1186ED -0x3D9084041DCBD21D00874340B4468F9BB0758024 = _NONAME_ | V | 0x2E5A79D63E4AC3DF3E775D4398927EDD -0x134B4D465377EC48ED34629F0ABEDE5FF6B71F2A = _NONAME_ | V | 0x542DDE397837183A7B10DC1F26D985E3 -0x7DCE877130FA7CE49324185571CDE697FFE452C4 = _NONAME_ | V | 0x988C2E27CF64015572CC00CF00AE81DB -0x021840F7EE8A00DFEDFE9F54714817173B10CF4A = _NONAME_ | V | 0x610FB355BE1E95DA58135956D45B8F9A ; libaacs -0xF02B5FCB1FB3021E71D9AFBBC15DFCB6945094DD = _NONAME_ | V | 0x4DC033999A285ECF12D1A9BE83BB8F9E ; libaacs -0x71097B15BAA1E4AB4410850CB0A97F1932AC113E = _NONAME_ | V | 0x63CE32F493E32407E02C3531AC2E6BD3 ; libaacs -0xFFA222A80020E37ACC75965F050CD369DF2A05A3 = _NONAME_ | V | 0x26E3058906C030ABC8571C7F50C1F9D6 ; libaacs -0x2537A94B442F328BF877ECFE86814D74ABD8513D = _NONAME_ | V | 0xA6AFDB444888E9CF29AE51BDC6257D20 ; libaacs -0x3459CBC2790FBB2B8A016F8D9448E1E628B10DCB = _NONAME_ | V | 0xD70EF1E4F7920A17B389EA4CC285C5EC ; libaacs -0x365703214A62FE2A55D7A98DF3E6654ED071C2C1 = _NONAME_ | V | 0x8C1ABE174CAE8EA8EF26E6872DA4709B ; libaacs -0xD41EEC1A84AFAD898E01F60FB640CC79052978B7 = _NONAME_ | V | 0x572147E630ADB0C8B6FA23CB65867873 -0xF054E72369BF9BF474C5A3D5DB85352650C26CD7 = _NONAME_ | V | 0xF3AE7FAD20BAFBC6F8BDEAAA3C6CF989 -0x2C00EF5FE1C2C0995C0105DA93CBA25774B629E0 = _NONAME_ | V | 0xEC3B878A444AB6CA559734D85FBBF08A -0xC5BFA5DE1939CFC30ABB6FAFCF288C0884F97B68 = _NONAME_ | V | 0x7A15B86C01F321D545AA0EB6F51B7BB3 ; libaacs -0x4243D150732EA82856D520AEA5AC2D3C1D585286 = _NONAME_ | V | 0x8294ADE8E80F32AEBC6CB1867ABA5DE2 ; libaacs -0xDF869C8CC3E6134FA0F24E8E6145624A259809D2 = _NONAME_ | V | 0xEF06EE95968E9F9868A7F2385DA177CC ; libaacs -0xFD34D808A2508E64842B35E359090188A06F0611 = _NONAME_ | V | 0xEC8210E0DEE874A3F9933D001CC7004A ; libaacs -0x6614AFD92A3BE87BE84F4E6F1E8827044D24A920 = _NONAME_ | V | 0x999415903F66878094D88DB49EF6CED7 ; libaacs -0x0255CCFEBB6058195277648D2D6A77034469B8B7 = _NONAME_ | V | 0xE32F6945410F33701F110EE3BD80F95A ; libaacs -0xC08F81656FC9B9A200DDAF04FBD81B999C57D747 = _NONAME_ | V | 0x26024E4D0FB2859D1F07266A16545B82 ; libaacs -0x8E58A6AB303AE2B01750FDA397AD83B3930A66E1 = _NONAME_ | V | 0x2C9F98A106C00469C765CB460F5104F3 ; libaacs -0x9D37472D66CB881B34D5519FC8D10D91E8C2FF92 = _NONAME_ | V | 0x6364BA5EA8249B420F42EF6060B9C368 -0x72FF807DD084ACA8B4F3359C89271CB8D9BDE164 = _NONAME_ | V | 0x8BA7DB762984C819B1CFB1F73CC5868D -0x8B352AAAB0116A776510639B420E6CC24A708C99 = _NONAME_ | V | 0xBF5071D29AE46DA86FDA540D27238E15 -0x2AC5A0DA123EEBEB6090257874D01ADC97AD21A9 = _NONAME_ | V | 0x39AE16D71AF31E201A2A85A32A3228C6 -0x698A5A5F0F5792D5B2BCEE61E02B048695AE772B = _NONAME_ | V | 0xEC4E2F179D19543A4B2D3E94BA4FDDC8 ; libaacs -0xB6FC6DBD42561FF94C270C61300B2BE7520CF878 = _NONAME_ | V | 0x7DD4547CC79684CC63393B1FFD6D5390 ; libaacs -0xC483ED0AA5C69A7360AF225E56E7DEE6AADFB7EC = _NONAME_ | V | 0x220A9091124AD1268B52BDF03AE0E86C ; libaacs -0xA180325210B61843A96B89574E27A8A2A2154408 = _NONAME_ | V | 0x35196465E9DE51D897E20C1EE41BB803 ; libaacs -0xA9D97C27688C87E751619AEBD3FECDFDBCBEBC3E = _NONAME_ | V | 0x9B1AA3CE31A737ED97913341D91DCA52 ; libaacs -0x4E9593DE4C253EF1B300A3932BD5782089C54AC1 = _NONAME_ | V | 0xF6D449021E9799B459CCE248E6E186FC ; libaacs -0x852C0B100446DB2813E4134A544DF2AA55F0985F = _NONAME_ | V | 0xEA718E5A4E2445064EB0A4507715320D ; libaacs -0x7A389119E9B8A14127AC283A8F267543074F46CD = _NONAME_ | V | 0xA2F69E1D77293FB9701B3AF259CF7B25 ; libaacs -0x4261287F03BEC4D9FAC2C535D5588896CAA54B70 = _NONAME_ | V | 0x2E7CDBD51DBC75A17D69A36C791BA4EA ; libaacs -0xD6A4DF8C6A4E6CF940FA1E517D04C55050228D9E = _NONAME_ | V | 0x52A347D298B80F5D8E00C5E617581080 ; libaacs -0x65AD34747C89214349A73669EA7A65F2CC0487FE = _NONAME_ | V | 0x95B6A607633C0D66FB8CDBC086874529 ; libaacs -0xDF2A022291ED3D67AF8C412AA15B07CA7283A10C = _NONAME_ | V | 0x6F4D4675D5141EB9387E66366AC8D6C0 ; libaacs -0x2A69DEA3DA3CF95129BC1BA0A3C4A935860AAE4E = _NONAME_ | V | 0xB30D01B035F7EC7F1A74329D3EDED2B7 ; libaacs -0x8C0DC9F5F91D3CEBDFF1C33885CB3CD41C14915D = _NONAME_ | V | 0xEA365BB31E83C300FC5F60A5EBE7EE9D ; libaacs -0xD50585D9A390DC916EFFC164D36FB14E186D8A10 = _NONAME_ | V | 0x36D7E37FC5AC4F343D533E9793298B3B ; libaacs -0x709D3815C6837A4A9CDABB1477FED2B890FF2E9F = _NONAME_ | V | 0x365213F300D7A35E5428BCFC7ECAB470 ; libaacs -0x705CC73AD1B35FBE380566F4A6039A8F44330EE8 = _NONAME_ | V | 0xB26B497F8CE91B25B923DABB0A7EA189 ; libaacs -0x2FCDCF054438839608960E85BB2B26E11DE5793A = _NONAME_ | V | 0xB368E36040BC46AEF82319FCC367BB2E ; libaacs -0xC7559B57C4F321B90D454682F06A9A56E9877D24 = _NONAME_ | V | 0x7EC722C6280B9B015E1DD5E891BCD6A8 ; libaacs -0xE5420C3AA3EA9EB651696448BE5BABE380E27049 = _NONAME_ | V | 0x6B916F01D3A3CE34E3EB0EE2B0E403BC ; libaacs -0x80B0A0A732BD381D01C51710B233EE0F5272E797 = _NONAME_ | V | 0xB36946EA7F82753510D90942734B8172 ; libaacs -0x10697AD68100B7E5C9CBA022303CC873DDAA80B0 = _NONAME_ | V | 0x3D5715AD07FBBE8C7EB7D16D57268344 ; libaacs -0xE2540510F1C0075521D101034DE05A1C2A0AFCDF = _NONAME_ | V | 0x60BE54F3F50C45105266E9884826E29D ; libaacs -0xFCB839E23D13B01471F8528C78C5057BC2ED5CA5 = _NONAME_ | V | 0xB402011C7C012B2120185714EBFB5ABB ; libaacs -0x90FB59D0C61BB7E7EB22D0D99B93D10B3C5B391F = _NONAME_ | V | 0xCE4FE4C9AED49927B871C660DD945060 ; libaacs -0xA62F2210902767AE46F683A8A79CBF3153524162 = _NONAME_ | V | 0x7FBEC3467F7888B79CD1E412F77CC35E ; libaacs -0xB6864DAC644EEDAF49C89F456CEE4007864AF95C = _NONAME_ | V | 0x160EC762E0998BEC39A2E687B7028F1A ; libaacs -0xD8E06D6603EE0F8933EF1B7A2E3788A24075093F = _NONAME_ | V | 0x4E781DE7744E3993AE9D5CF3399742EA ; libaacs -0x8E0818793B23F5BB4F852D74472E82AF8816377A = _NONAME_ | V | 0x7A7FAC9DA01BB8972ABDB706A823326A ; libaacs -0x13E9EE290E0CC2581DB2EF1B3E1BB614E143F67A = _NONAME_ | V | 0x5AFC3C4E662FDB375E868D7ED6A0AC0C ; libaacs -0x53858C0782261F591D397E4CFA303C8C5969A479 = _NONAME_ | V | 0xEC37C0F7BE22F19A6B5CFC4F28999724 ; libaacs -0x3388E95C02E5378284192B5874FBDC14F4AAD973 = _NONAME_ | V | 0x30961D9531EF48155AACD6B34685243C ; libaacs -0xDB3ABBFA03BFAE9D88C23B401FB020033C6069B7 = _NONAME_ | V | 0xC54718627EF30CB0BC619D76D15277D4 ; libaacs -0xE55D7F3238E73AA13B80CCAE3DA3FD6E711C4711 = _NONAME_ | V | 0xBC94320B1077BE550685689B65C1B2B5 ; libaacs -0xF52C44182F0F7FAD2A90AC6FA165335AB8E5A43E = _NONAME_ | V | 0x17B931ED541C6DD5318A8D05279C97A2 ; libaacs -0x429131AA9E84CF7621D5A94D1805D2FB533C18B4 = _NONAME_ | V | 0x66CEB5D89326699F68289698B77F3C8E ; libaacs -0x4B1C7826DA20726B8FC677AEBD93C756F66BBEFF = _NONAME_ | V | 0x155D6615CCF6A9A36994D6D85E9D108F ; libaacs -0x79B3508EF4AABE19689C548BCB5E7DB67396FE2E = _NONAME_ | V | 0x77CE83E8A8D7C3F7E13C5C5FDB19C835 ; libaacs -0xC6AE39FA903C1F07AFFD66CB757D161BB669C80E = _NONAME_ | V | 0xBDAF0D38B2894FAA784041CB6305CFF7 ; libaacs -0x2E436AEEF9FDE119997F6D320BBFB5BE0AAE71FB = _NONAME_ | V | 0x7E1E434D2EC23A77B7202A0C3589789A ; libaacs -0x55E1FECCE2ED930677DE2A673FC59A1689FCD96F = _NONAME_ | V | 0x167DF0AB78BB0E14F8AEA26B1175DEEF ; libaacs -0x9D37F31948B0D88E37DE9DA58F438D4AC8E034F5 = _NONAME_ | V | 0xCDF76953C065FD842AE2EF8CCE06DBE5 ; libaacs -0xED92B0BC596FDEF85BE1756B7342B0DED5A0A300 = _NONAME_ | V | 0x00178FE5DDBD5ADE940B2FED0ADD9133 ; libaacs -0x5B1961AF1D0A50AA6AEBE6452F34A715536E186C = _NONAME_ | V | 0x9C6CD6246D119CA646C713E0B0DBA32C ; libaacs -0xA591E8E58D580ACCF71F8458899246E3FAFCDC1C = _NONAME_ | V | 0x9F6733F92A004B83396F546C5C4F1360 ; libaacs -0x9C8EBC375323480C1E4D0E87F4709EEF7463EC6F = _NONAME_ | V | 0x41A420F5294EFDFB94E2DEA5BF29AB14 ; libaacs -0x97B98167AAC455F21F729B2CEF7307D98EDB2ADE = _NONAME_ | V | 0xA968A499F9EBD3A3D6F8A89F822702A0 ; libaacs -0x8BF6C6620A84C2AA55B6BA011FD03CD23B3504EE = _NONAME_ | V | 0x50FBD8715DFB0892FB23F9EE3BAFBF44 ; libaacs -0xC9DA87604B46259F966A73C26EDD6F0FF193965C = _NONAME_ | V | 0x49BAA10B6E640D0D907D241AB6F84F04 ; libaacs -0xD9D76EE65E0335906F0831A3A8FF27A435F8BC87 = _NONAME_ | V | 0xAFD6A6A83B97633B5A94CE6FA8B9A25F ; libaacs -0x45A028DD2530B302DE3A3942A8232D348F938B93 = _NONAME_ | V | 0x247B1BEF63E00A6A6405D6511CE98A95 ; libaacs -0x940077534ED253EF8C024FC999CCAE16BDA013DF = _NONAME_ | V | 0x2D774E06EBE326F33805F1E1EDAFC48D ; libaacs -0xBD0D359E17C49FE7A80B19ECC02667B6B637BC22 = _NONAME_ | V | 0x8CDED9CDE7B3AA0666DA8DE8BD0CFE41 ; libaacs -0x029483008CE87FC0A4F1103A5FE0F28773F648F9 = _NONAME_ | V | 0x4E1C2982C2EDAE513CF3B51E8AE43EE2 ; libaacs -0x1582BFD275DC4CC99171FDE99650CB02786887BA = _NONAME_ | V | 0x37059F215A44016A03CFC7FB082D59C3 ; libaacs -0x3B87B3B42AA6054A2B82CD308D335EDCCDE1FDE5 = _NONAME_ | V | 0xEA1B8CDB7CEC4E220AE56E8A7E73262A ; libaacs -0x7458B372002C007AF5F72E8B095F7EF258F455B1 = _NONAME_ | V | 0x14101F92FE56399C716B7C6874294A5E ; libaacs -0x7916B0512A5F4444262715AD01819A428973D27A = _NONAME_ | V | 0x4CEC7FF34B1535BFA7AF804CA50A12A5 ; libaacs -0x79CCBE8FDE9A4CF8735874D6B1AD255A6ACBB327 = _NONAME_ | V | 0x5E405CB991A949F34E0433E16191C165 ; libaacs -0x64927219020536A510FCC2CE12487EE3CAFD1ABB = _NONAME_ | V | 0xD3D40E77708AF02A6172A034FCA160B3 ; libaacs -0x6E1F73C502A0645AF9679ABAC1B0CDDCA8567459 = _NONAME_ | V | 0x83E87FFB17CCC8ED0CD1B47082BD8FB4 ; libaacs -0x2048D7583EC043146DB4C9F40B8D95B492A98243 = _NONAME_ | V | 0xE988244770F612B4CEBA132FAA9001BF ; libaacs -0xBB3B6F9EC0F53120643BE0F1AE86133AD2D3B742 = _NONAME_ | V | 0x5F21B0BCAADF3F407DE044D31BA802FB ; libaacs -0x7FF03DBBC9041DB39A51C7A49DFC5347888AAC84 = _NONAME_ | V | 0x8991D03C6319B313119578D066F56D98 ; libaacs -0x9FC44D4D1DB965616AF84EC1F220CDA880F07673 = _NONAME_ | V | 0x73070F27E83B798F378078B3C9B22E3B ; libaacs -0x1ED4051C0744000FD0E5DB6355FAD6505C763EBA = _NONAME_ | V | 0x6536CC37BCA6C8FE21262643DCE9257D ; libaacs -0xE81B5626FCAF8AF7E3C630891B1A7B49337B8FE9 = _NONAME_ | V | 0x5CB1C2A24CA38B2724882E3A9336901A ; libaacs -0xB07A551281D6B01E0AA2FA34CEA644ABF994A115 = _NONAME_ | V | 0xB462456776C146E00C5902BE8DAFADC0 ; libaacs -0xFD60067ED591BBC2C6CF9FA9D7CDEA8472C68726 = _NONAME_ | V | 0x8F710315F882618F6C834EBB440E0689 ; libaacs -0x4496534CE20A58EC5948246C16DA2ED8EB96AA2B = _NONAME_ | V | 0x7CB5D63693D09B59950C921BED6CC2C4 ; libaacs -0x95EE12F969596F4778AB16E73AF6EF20E69CF3FF = _NONAME_ | V | 0x5710FFFE8300103278C7A1C607E59708 ; libaacs -0xB9E4585D9272A79B788761257C76C26A4FCFABE8 = _NONAME_ | V | 0x0768A9FB528889D1E26C4054D29CED2C ; libaacs -0x0DBF391099FF62A2370E6807DDA70D4DAC1DC6C1 = _NONAME_ | V | 0xB4C8B896A15BCBFEC67B892A93C590CF ; libaacs -0x12AE5A12D446A664D6B94345C187A795CED651C4 = _NONAME_ | V | 0x29D821209EBFD40B6C965DF96A95627F ; libaacs -0x90A7AC70A55BB2F277D0666DDA9454C414666726 = _NONAME_ | V | 0x77685F99C607896759F2173A682AC298 ; libaacs -0x80EEB031704F815128D2651247916C4BECF4DE9F = _NONAME_ | V | 0x0E3F25A083D3A30AE149E9D67474E770 ; libaacs -0x1CAEF37CB208F9573BAD8098CD8E2B6AD0509D64 = _NONAME_ | V | 0x726654991802862C7E2F7249AE721898 ; libaacs -0xD83E562B3397D1B0C21E8845FBF54F065CAE1312 = _NONAME_ | V | 0xBC984F51FC750921C7482EBF6D172F72 ; libaacs -0xF7081327FDBD64B446E7A204C916A7DCBFB6452F = _NONAME_ | V | 0xCDEA5C3B1E62719447441C01AFBD5FC0 ; libaacs -0x16DE7646BDAC89DB5D91081BA932329E7DAA8071 = _NONAME_ | V | 0xA6808A9C112CCE16A5CE69A5344D4745 ; libaacs -0x31324D1BA23098390BFE8FFD7232D731B7F223C5 = _NONAME_ | V | 0x77811C53EE06BC31D714B487F0D7D70A ; libaacs -0x341A13003AB4C87C672D256DDB5F4C723AA8B281 = _NONAME_ | V | 0x352192521448558BF5B8F16FD6FC3625 ; libaacs -0x4CE95DF948908D39AFB788CC05E5F647CEBD4267 = _NONAME_ | V | 0x5C35CB54F63F540BD05BD2F82D0705F7 ; libaacs -0x89E7C5C4B31FAC137A9E349C82C9DFE742104CF8 = _NONAME_ | V | 0xA2C026CCF7D2C5AAF61463B00895201A ; libaacs -0x91A2A6765D60E2B68FE6135E9D84C66F4F31EB03 = _NONAME_ | V | 0xC2B6D485564FDBE04DB08D068285A4F1 ; libaacs -0xA0CB746A70320B2562E6463420A4A5F7BA114D56 = _NONAME_ | V | 0x66C105D1268E0174AB66566E9E7E4E5A ; libaacs -0xD436AB66620493BC292DF24D21ACBFF3B7C056F8 = _NONAME_ | V | 0xA065643A5FF867C7A4C6AF6C6389604C ; libaacs -0xEA98A7C6FFCE7461B9F29B1B164ED9085873A001 = _NONAME_ | V | 0xB4BE7E08B9016B0A430CE81E71F4BB37 ; libaacs -0x2B0AE775DC7B8AE6441C3E3AC3835613403B4B90 = _NONAME_ | V | 0xE53C8A0A0C939C51E289F8C254D62BE5 ; libaacs -0x3CE26796B07DE641B5F8F02C29BC1DD715EFB92E = _NONAME_ | V | 0x82B13B80A9B8A8AC1E560D5E91D1FF21 ; libaacs -0xC5975A796B4174BD46B5E73E7C561699B315CE14 = _NONAME_ | V | 0x8BB9F3A26D932BD1C78D78652CBB0C17 ; libaacs -0x77638357A3C2036B91E390BD1EDBF8116BAD2A52 = _NONAME_ | V | 0xCD4E89F2AFDA2AC0D5A57C2762D7DAEF ; libaacs -0x3891EEC7861305204F7086121FDDEF0D53EA99F3 = _NONAME_ | V | 0x627D6595E555A263EE11EB4432787C18 ; libaacs -0x1EAE9F5652F05DAC3F60A1B597564A727DCB7D36 = _NONAME_ | V | 0x4FC931C546CE7CA49EC64DE798FD2A42 ; libaacs -0xE17C0EB3BA3636CEF0C5644E22AAA5A272768AD9 = _NONAME_ | V | 0x8BEB485AD26E1B18338CE44D21031170 ; libaacs -0xC529239B161609B658713FB8DAA99A1D4807B7E2 = _NONAME_ | V | 0x92633EBC608D55D49B84BC34EF23F0B4 ; libaacs -0x58D06B708FFFB5856229076F935C3E713666DBE6 = _NONAME_ | V | 0x740578BAFCB03ABE8C32A593258513BD ; libaacs -0x687978E6A281AD4FDEAAB2C4DA3AFDA77DB8BF3E = _NONAME_ | V | 0x3D9D32E6EDE5E8D87D37149A9157AF21 ; libaacs -0xC248027BB84044826FCA48C48448A9E1F53D66F4 = _NONAME_ | V | 0xB2657F82B0528B9254132BC346DBDA71 ; libaacs -0x37C0549F276875AA4BF5C36EC4B92D1FA927CCC6 = _NONAME_ | V | 0x72324CFC4279BFB23B416D08B462D448 ; libaacs -0xE586824BE7D8A38EE95692218646DAC8B3B11832 = _NONAME_ | V | 0xCA05C25C309F1FB67605ACEBBFB26480 ; libaacs -0xC0977309A00095139EDB1BFFD3AE641F40DE29B5 = _NONAME_ | V | 0x735139DFB74E9AEC3A8D4383D2F9FB07 ; libaacs -0x53766D7EC783A4F052457B105816024E49A9E99D = _NONAME_ | V | 0x78EE85636FD28975EA0AA1590E778AD8 ; libaacs -0xC8AFAFC4123C2428C2D6FCFCFBCFAA5CD9BE78E9 = _NONAME_ | V | 0xAAB7A0606E7AD838D84A4257C0DDC89D ; libaacs -0xA631A441C9D2657EB302B07E207F842E354F4E68 = _NONAME_ | V | 0x545E2C33645ECA9909758239726EF83D ; libaacs -0x4B915C79E935C48993654AC0CB8282D8624B3EE8 = _NONAME_ | V | 0x685E5F1D8D76F08F9BA2CCBCA20732B8 ; libaacs -0x6E4D3E18E66A1983F8A9806B70ADDA64E479E0A1 = _NONAME_ | V | 0xA0184E47052AFA6D4A1CE96140EE831D ; libaacs -0x63E6A8428D8F4CB011DA3BEBE25A7946C77DC776 = _NONAME_ | V | 0xD6E489A6F8360F2E411AB811F6116788 ; libaacs -0x281B36435F3AAB129AC674E67D7BF9D72CFC9A78 = _NONAME_ | V | 0x32914E0C31729B5445F46E9BA2829C5B ; libaacs -0x821A007A09BCAAAE024EBA2E26E223D364D729EF = _NONAME_ | V | 0xE04A259169C21A50FC7996DA8C269367 ; libaacs -0x3A09ACDDDFF6023A45C5AD6948A1AC274BE68F7F = _NONAME_ | V | 0xC16A06C263AD6134FB9B9D1D92E83CAA ; libaacs -0xA373C34E92EE64623E970599485FF7AFDD5D659D = _NONAME_ | V | 0xA9BB1F4539D1D42A8312B0D6EFCBB31A ; libaacs -0x501E9EE9B13C736C643970A9D7072DAA463746E7 = _NONAME_ | V | 0x41313AE7C9CFFCA39D5672F5E6764E42 ; libaacs -0x4DF9F3A428F78D64B3CE0861D36CB9BD9BB3B6F3 = _NONAME_ | V | 0x164495CAFEFBF9ED72638C5C134E546A ; libaacs -0xEE2B868CC56639CEA4DD4109999E8E502F7E0D73 = _NONAME_ | V | 0x8DFE0C8FECCBBCA33CE50F4C0080AE6E ; libaacs -0x67FB791C03041E26D10F1D12D877462B19F7108D = _NONAME_ | V | 0xA28B18F8A7C4738A598E219DDC4B9FA5 ; libaacs -0x5BB0D70572BCF73BF4B6C5EB31DBBE7DDC7BD74E = _NONAME_ | V | 0x3B27697F2403354C6063881D40C5D488 ; libaacs -0x690072356D0F538B6A04A30702D16E08D1E37F6F = _NONAME_ | V | 0x58BF9C84C90849EA8F536DAB8AB38933 ; libaacs -0xA394E85C0A5F8F9A4F5C30865F350745E6ECF37D = _NONAME_ | V | 0xC640365497C31C763B7C6CA6A924BB27 ; libaacs -0x74B2629C6EBECCAB5A011A78B6F722CB8482267F = _NONAME_ | V | 0x3614303B900E91063219E5B05F5BFA54 ; libaacs -0x520DC97559D21D1A01EAB9489254329B09D7C5D0 = _NONAME_ | V | 0x30F3649E1311FACD4E68B42A5F66A5E3 ; libaacs -0x3683393AE81A975B359D33933BD48C63A40A1B40 = _NONAME_ | V | 0xABA8D993B37BCF86E652F9639365BDFB ; libaacs -0xD19083AB4D75D5DA65064D5FAF418A01C3BBD57A = _NONAME_ | V | 0xCF8A68E560BC42AB08FA0E5556393C74 ; libaacs -0xCF27CB3DCE9C3F63C902173E92D1737B5FD07E6A = _NONAME_ | V | 0xD487F3053EE308FA015874F44A3646D1 ; libaacs -0x9B7BA01C857B3679CAC4C9A429578F020973B752 = _NONAME_ | V | 0x54F3FABF44F54EAF3BDBF48873969C91 ; libaacs -0x7C11AC153BDA4AA5B9EC456E37FAA0F054AF26DC = _NONAME_ | V | 0x4163BA91F960E245B6854A3AB0A83A5C ; libaacs -0xEF754F327578E87F7C8D15D5629BDE59DB7DC8AC = _NONAME_ | V | 0xD48DB928BA46C1341FD813224334CB5F ; libaacs -0xCDC7C35D9D06C425A4FC222F30E516394F033400 = _NONAME_ | V | 0x0E1AB55F24DFC65FE163F3055FB54742 ; libaacs -0x25E8B10C6CBB330CFE9601D492B0C9542B51324D = _NONAME_ | V | 0x8EF6E740232BF487D05F504C20380F87 ; libaacs -0x8F3953F9E36CEF8A6266BB8585704135FAAA788E = _NONAME_ | V | 0xCC9CDDC827668D755271CFB709142C60 ; libaacs -0xFC4021DAF1D1DACE6C021E9D00555BCE1CC8FA63 = _NONAME_ | V | 0x3B0F1AD020F78C26EB2A975F62119031 ; libaacs -0x81452E4671274D79A115A268974B95A82AF55858 = _NONAME_ | V | 0x3D72370189B40A777211B3D8CE263670 ; libaacs -0x2A2FA29E3AED665FC3CF34DE293F60FBB34166EF = _NONAME_ | V | 0xB8BB861B1B17EC1F322C58AD4A595252 ; libaacs -0xB5AED433E1AC5EC0FC02D9B4D7287FE1A3751037 = _NONAME_ | V | 0xA03E342694168784C9A4C25F4F0CF06F ; libaacs -0x00EE0040D07D31312CAF4397FF687B4552FA2374 = _NONAME_ | V | 0x96B8FE7F0D45584E45D97F0B49E56BD9 ; libaacs -0xF487F9E93BCA2C2D4B17A5E43B1A0D766BA5C2E4 = _NONAME_ | V | 0x4D0E15030EB8F8172412F6E134F15446 ; libaacs -0x29B27B63F9AED77880EE96932236341061A2EB9D = _NONAME_ | V | 0x37259CC54D52BDE4DACC95DEE75B4EA6 ; libaacs -0x3BF8D41AF0EE5FE8F09CFBFA9828CDCAE2E1F61C = _NONAME_ | V | 0x5D8811C2B4B2B4A0F61E62517773251D ; libaacs -0xD154F92842781E548F84A7468CEFDEF7650F74FB = _NONAME_ | V | 0x95AE01EB99E383E7956924768A49C6D4 -0xCB622D25FF540F2B6825A78F5FF031B051AD8133 = _NONAME_ | V | 0x9008B15399481DEF792D1D599923A329 ; libaacs -0x1B6C5184523884BD88B0FF6CB506136EF9752C03 = _NONAME_ | V | 0x62234D1223C28516193D3784C00B2FDC ; libaacs -0x4E619DC5E369A86FAEBA8D75415554E93BDD59FF = _NONAME_ | V | 0x30CBE4D20E05A26EFE6BBC398BA71F3E ; libaacs -0x6898257865A8F05F924D1A8DD1FAED5364D77B3E = _NONAME_ | V | 0xE078A2E3D24C94D972AB6A98F7277EC5 ; libaacs -0x74B4808B5C8C29207EC4F1DA97274BD8BB541235 = _NONAME_ | V | 0x48C8421650E2428B93213B84A2FFE8CD ; libaacs -0x23877FB3698FAB82C80E85FE69D63906D8A3B271 = _NONAME_ | V | 0x98CE38D525D12CFE95BC691CEF0EEDC4 ; libaacs -0xB5EC38DF54D4E199B556480CA0A366D97C70C116 = _NONAME_ | V | 0x3211CED522377A280C98D385C329C122 ; libaacs -0xCFD907DE95A8C4101674E67377CDCE406966A939 = _NONAME_ | V | 0xC4308AAFF30C9EE99251F23E27AC4918 ; libaacs -0x423A636B86512BE591B9621654CCE3905A31E259 = _NONAME_ | V | 0x3F6E812B1D614D08EBDCCC938698951C ; libaacs -0xC40C85487A88C5340EF3E5398DAF015AAA4F9751 = _NONAME_ | V | 0xF8B7C96A8705892CD20BE83762566192 ; libaacs -0x73A80054889766FC38871D5F05FA19D2BB328171 = _NONAME_ | V | 0xCB95DCED4A5FBDBC6DF3C871B203AD69 ; libaacs -0x4343D544AE2883B3726376AAAF4C785616F258DE = _NONAME_ | V | 0x0340C6BD840CD8EC8BF324CD9CAD5ACF ; libaacs -0xBD89B8FEB62D90F2F28005A28780EA810B7A4263 = _NONAME_ | V | 0xE38CB0DEC45452D4C9BED6F9AD5BEAAD ; libaacs -0x00DD7F8A892E86D6406FD83DC2DF90452220BEF6 = _NONAME_ | V | 0x090B32126560664451B7033233A8B733 ; libaacs -0xC09BF7BA0BD0F5AC0A719758BF11020CCC192D59 = _NONAME_ | V | 0x5889BCB7024FE54F0E3212991BC936BD ; libaacs -0xB4FC444125B45A03943F37699DF71ABBA59E2BC9 = _NONAME_ | V | 0x9A1E0287BFBA2B13925999FF3CC472BB ; libaacs -0x988ADB9F1E332865F20C95369106CBA2BB3D1C1C = _NONAME_ | V | 0xF59A70374C2EA1100D70CD2D156D61DE ; libaacs -0x8CBBAAC14FE7F29CBECEB5AE3F4EA53E1187B8E5 = _NONAME_ | V | 0x5B38A0D571C11155375D04C270EE9122 ; libaacs -0x40F48E8EC0B4B1C1A5904CBD7495F1FD85C28144 = _NONAME_ | V | 0x3B6093D7EBC0776FBF358B7DA2AF9AD9 ; libaacs -0xF5804590B3B43EF2A7CFA21805DC2A983A83CAD0 = _NONAME_ | V | 0x848DD927B77E2894F722335EAFFBBF80 ; libaacs -0x8EF0FDBB392D2066A8AA74D5F727188DF352ECF5 = _NONAME_ | V | 0x0D1BAC39B4C6D3C0C3D58D86A4E1923E ; libaacs -0x5FDC75315393B6E6FB3395590074A2A11EA2ED32 = _NONAME_ | V | 0x22B433A5E8BA030C9EE717F396FFF4D6 ; libaacs -0xD8C4A8D075E485C84079FA25373189E9354D1BE6 = _NONAME_ | V | 0xC8D6A689A872327A8C096A274FD8BFC9 ; libaacs -0xD2BD3A588FCB8B9A1D570D85F6570EE9F32D7E6A = _NONAME_ | V | 0xEFBD0FAB498666E4F4E0CFF7EC14C25D ; libaacs -0x1A776577AFB1788F9EB63014B60C809AF3243277 = _NONAME_ | V | 0xBD0618A3BAC45133D26B66025B754306 ; libaacs -0x29F97CF76AF40FE92AABB9550B55A2B7F2C18C49 = _NONAME_ | V | 0x9439205A35DC95C38BCBFE45F85DA681 ; libaacs -0x8B873D569D8A22EB0C2DAB26763964EF68874608 = _NONAME_ | V | 0x82279211FBEF344BEEA3C9EEF5C72B40 ; libaacs -0x19E5F9EED1D4035357372280F797155C351C9656 = _NONAME_ | V | 0x060FE937962BC98CEDF115A3BAFE6713 ; libaacs -0x5435FD0017E32B2F7BC003313D2500D2BB23E7BC = _NONAME_ | V | 0x134D105EEF02B3A60EB49CC9D94A908F ; libaacs -0xB537E2B3885D02271A0162335925D51114AA2118 = _NONAME_ | V | 0xCE5711F9525610972330FB3EA6AE5B22 ; libaacs -0x0F688106AAC76D732F0F54D9A82C8A7DAC23542C = _NONAME_ | V | 0x248D0CE3191EB82A7925B9DA83F54100 ; libaacs -0x70EE766E73F8072A36C244992E901E4D3764CEF9 = _NONAME_ | V | 0xA34C027D72BF8C89148F14DA3D42DCD4 ; libaacs -0x05FC762A667F3F553CF59E70CF9D5F87EF138D1C = _NONAME_ | V | 0xB346CE609F3BAF9F4C1F16249E1819AF ; libaacs -0x3F5DDA4AAA838FE8D20E07CFE8EDE6EE3EE4D8E8 = _NONAME_ | V | 0x2C64FC2F6EF73414790B7AFE02590987 ; libaacs -0x964A2EC14470D23E59C00585A501BF6ADAA1D934 = _NONAME_ | V | 0x12485DF2B69903782E83EAD90856E801 ; libaacs -0x55020D329F3F994623265FBDCAD93D90572EE6B2 = _NONAME_ | V | 0xAEC4863C169E7536A2F3EF70A31C67CB ; libaacs -0x54E2D68FCEA16A7F42FA78675D11FF569C757468 = _NONAME_ | V | 0xE38C39CE14CBF25B6113E156940D8275 ; libaacs -0x3CE7687C74DC96434CEEBB329B540304F497EC17 = _NONAME_ | V | 0xEEBCC91D707130027DB531DADC18F11A ; libaacs -0xCAE0D9FE60A56A4EC8437064EB6337B8D866D6E0 = _NONAME_ | V | 0xA875C8EE5CB17D76881A269C30698E79 ; libaacs -0x201AB9C5972C7542F230C7A19AB71B850A2139F3 = _NONAME_ | V | 0x786FA52ACC9D32ED700332C7B4008A15 ; libaacs -0x117D894E67B4BBDC93AD0BA31DDB0ACECF59B601 = _NONAME_ | V | 0x199EABA854D7DC61BA7BFC975D7FC9F9 ; libaacs -0x0B4C8D876FAB0F68775F97023AF07E9F0BCCB15F = _NONAME_ | V | 0x84956F82D70F2E0DA2169AE1424BF019 ; libaacs -0x73C36183BC80C02CB1B82D5B69A8EC8A373A65E3 = _NONAME_ | V | 0x1E9564B5CC126409498B026AB154CA2E ; libaacs -0xEAD12951713E3F50DAA301D7B6E5BBF6CE8A5104 = _NONAME_ | V | 0xE500E942BB02018F7779F9BFD28F429C ; libaacs -0x06BCEB95F12BD21FC012754B2B43C8690DCBAD0B = _NONAME_ | V | 0xDA3CEC5E990E7E8E6FF1A3698B2360E0 ; libaacs -0x3C6457B1E1B94E4E6576F5C0B4B103BA687C42E1 = _NONAME_ | V | 0x4C95D09C726EEF4FE450A97909B45FAA ; libaacs -0x29314F5E47E9D6D98C282C9A55CB2CBD9778B2AB = _NONAME_ | V | 0x42A729BE2AF0EEA6E55F50E78EAB4E09 ; libaacs -0x1C1277BA0EED260E01E8469CD82C28EDB302A8A1 = _NONAME_ | V | 0xF5B6813348860ED456B9ABF65B332A8F ; libaacs -0xFFF733E006A6026BF373FCE7CF9A5E0F438FE86E = _NONAME_ | V | 0x92978FABB7D6232735C77D3ADEF76BB8 ; libaacs -0xB0FE855D1D20FC7E5EC709707F39B4B562EC7D42 = _NONAME_ | V | 0x347FC88F6708B6742B86C2CF40C6BDB9 ; libaacs -0x76BCC1134D80C81524F9E3C7054CF81D871F7F60 = _NONAME_ | V | 0xC03362F5AB40252AC308F2D9D133B6FF ; libaacs -0xFCA5A1D7ACA177FC4F83C4B7656594C3C18825E5 = _NONAME_ | V | 0x050356383562D81C6BBCFF89F9226E4A ; libaacs -0x8346C6884AD423A029728882065A7FEFED8C1B7F = _NONAME_ | V | 0xE05A7924CA9AC738F22D59C66AB3F297 ; libaacs -0x2AAE73844BF0921831B292C01F445B653EADBE79 = _NONAME_ | V | 0x6D2489425CD82C8B1573541AD4DBAFCA ; libaacs -0xF731A444B342BA18BFA3EE15D0D64B5C1CA888DD = _NONAME_ | V | 0xE8BE85339F12CFADC8772D3FF711F030 ; libaacs -0x6E39BC0491DC28760AA43638CB6EC7EB287E050D = _NONAME_ | V | 0xCEAC0209242A24DC924732B42654EB6F ; libaacs -0xA9BE276A7F3D141C3A8E1D38B554ABD91C53F396 = _NONAME_ | V | 0x4D61763DA02A51514107E25DC265B0C2 ; libaacs -0x2CAA33714EE74122B1F6400A102CFC5881CACF3F = _NONAME_ | V | 0xCC0A5471EB79BC8BCDFCE91862876450 ; libaacs -0x6B162193579F03E50551A50CB2FCD0F2E15B4619 = _NONAME_ | V | 0x378C7B5EF380993FB35F153EC3EE7F94 ; libaacs -0x5832D3578E6C70624A0E4F3D7C91ACFEBA99DDC8 = _NONAME_ | V | 0x23DAB980F9D7ED1223AA6F7A35B72C80 ; libaacs -0x65644A3C53470B5BF59E1A7B5EE9BBA539AE2E55 = _NONAME_ | V | 0xFD97BBDF017ABA4F843ABE15EBB2DCAC ; libaacs -0x8C32A02BA871CA08C4C4239FE48FAF181561C489 = _NONAME_ | V | 0xF754C3C23F6AF0B489A07738AFD3FF85 ; libaacs -0xE352443394D44252F6C8016BC0A73F1C1F97FE0F = _NONAME_ | V | 0x4B504CAADEC101951AA3BAAEAEE59D42 ; libaacs -0x3FEC9BD019D725F61960F349A79147CC4EC80737 = _NONAME_ | V | 0xAAC9FE8D7BF573FD842133B48047A3A6 ; libaacs -0x21539EA3FF7C958E70B3575C6A89EDA1231AEDCD = _NONAME_ | V | 0x4B71DB0DC18570EF2F560F6ABB6669E8 ; libaacs -0x56A5FC81DF4BC5A9B1F43396C55E6D1C01026FF7 = _NONAME_ | V | 0xA8CB441150FCE8FE9DE72DFB973F6CCD ; libaacs -0x3218775B33CA5904A4CEF515BCECE84C53341A81 = _NONAME_ | V | 0x2C7D0A586DC12F1C38E22FE4D5739DD5 ; libaacs -0x20E30549381D0562774C98A2D2C39FAE29533605 = _NONAME_ | V | 0x34675BEB82B535654B568005EBEABED3 ; libaacs -0x8CB5873155F0EF886037BE22F129B191FFF295BE = _NONAME_ | V | 0xD7C38098F6BB9F961FCAF52446102DC6 ; libaacs -0x3DB80A466D18F0D5A8DA6F215AB45DCA60D0CCFC = _NONAME_ | V | 0x06FA7CCBD110BF53D844BB554CBAB23B ; libaacs -0xC63388D057EC7605E9F80D54D8D2F8F179C40CB1 = _NONAME_ | V | 0x6F4455240ACFAFF70A5A73D526FF4CDE ; libaacs -0x7DBA9D5920B42052AFD5FA6294BA72D55A267D33 = _NONAME_ | V | 0x9C4246DFE184263A0601EE13381C2BEC ; libaacs -0x1E25E28446E9B9E06A26DB009DD0F36B3EE205E1 = _NONAME_ | V | 0xAEC12E0907D3A23E9ACF105B5862505B ; libaacs -0xB9938B1F73C8E0070E2AB284070195D2F3C4039A = _NONAME_ | V | 0x53766859275F4A78ACCF92FF484C065F ; libaacs -0x1511F697BAE64A033F18015E4B2F82BB8C5879D4 = _NONAME_ | V | 0x932DDF2E054C29713E37413907265AD9 ; libaacs -0xB2CF75BBEEDFA653C8565E0C0C5C864BFBCB2798 = _NONAME_ | V | 0xB24C0F3793ADA663DA6A118B733F5347 ; libaacs -0xD13B082D68E6163AB28E066158D231E2C508B4F6 = _NONAME_ | V | 0xFBE8541CF63C44BB50D2C9AB8D32216C ; libaacs -0xDBEB0D2C6406DB5DA2CC325585F02DA1CA984D96 = _NONAME_ | V | 0x3B9BA74F35A8B1AB19F385D14FD6B3C8 ; libaacs -0x5CACA10BDD5CF663CFFED72AA6F0868205FA5D96 = _NONAME_ | V | 0x6857C0486DAA1EEF9CFF61F01D3F23CE ; libaacs -0x5BB7C96CFEDD311220996389ED35949283A86548 = _NONAME_ | V | 0xA0911E0EE0AE205AE04E665A3B39BBF3 ; libaacs -0xDE37BC6372EDA705E913E7EC74A4045B5C84A4B8 = _NONAME_ | V | 0xF7814C9FCE2B48613C57FAB8C796C00C ; libaacs -0xC36437E7412A68133112EE7E11F3C28652013E17 = _NONAME_ | V | 0xB42EF9E8954D633F1DFCD995CF98963D ; libaacs -0x7612939A865D1F2AD738A9B90FBD3EF834073B31 = _NONAME_ | V | 0xCE051C4F85FD335D4D485DBEBCE92816 ; libaacs -0x1ECF238401E094ACE52AD037432E4331D07D18A6 = _NONAME_ | V | 0x113B1FF47FCBA540AAF417DA840467E3 ; libaacs -0xCFE78EA3122E4A26C8E836AB2EC0E3A703363CF6 = _NONAME_ | V | 0xBBA898A6A67DF0D371F1AED4D692C8C2 ; libaacs -0xE290C5DCC4492366547511489B13ED59FD42955E = _NONAME_ | V | 0x07E1941ACB393D52419106B5559FAD28 ; libaacs -0xA5F77A0591B84EDF688FE48072C67813C1258FF4 = _NONAME_ | V | 0xFD589C4EFECA945AD99122CAAD4DAAE1 ; libaacs -0x7B8E1E74A6AA774933566D6D5BA40C313A0D57A4 = _NONAME_ | V | 0x0EC5B592C79C7D8C211FE824C2341A0B ; libaacs -0x7E72FB23E81F9DD4A020D96502F94379D87479EE = _NONAME_ | V | 0x69F1F2F32E314750A4641019F6B503C3 ; libaacs -0x971F1EB983CF978913854AD6420FCBC380321CFE = _NONAME_ | V | 0x7913FC09486E4875C2E6CD9F23EF0146 ; libaacs -0x6E264D28CE2A24A4F2354E9B93350F40D9098DE5 = _NONAME_ | V | 0x9AE10E909B6ED789DEA8772A7A99FC67 ; libaacs -0x3E7E51120660D6B6BF491DF4C06AE106ECBD47B1 = _NONAME_ | V | 0x34253841567CC952187D5FC272563C1C ; libaacs -0xA716F25902FAB460D6AC300FB303CB3289D876D1 = _NONAME_ | V | 0x784EFEC861094BAF86275EC5CF7D7E6B ; libaacs -0xA649ED4D0DD2C74A1EDEC0992B357DBEA3276393 = _NONAME_ | V | 0x1E428B3B31799A55F2C1AF55B219CDCF ; libaacs -0xA5FC6E4FC45E57B7D9E6E374C3613E662F34F3EC = _NONAME_ | V | 0x21707EB5BA60B7CF036F16EA16ED3436 ; libaacs -0x7F33AAB54D05A783F07FF7AEF98C0D400C90B456 = _NONAME_ | V | 0xCB3B1E380592E75028A57D615882BEFD ; libaacs -0x3E82D65320302C246724ACF66CDC336BECCAEDBE = _NONAME_ | V | 0xDBFFB036CFECE6E129BF9F091E35146B ; libaacs -0x2443C9F1E6528DB35AB1BDAB8C8E93E80F259232 = _NONAME_ | V | 0x517321AA97D8C272B9DFBACEB20A585B ; libaacs -0x5CB6AC06EAEFD106666A8B8D8D6EBB3B6BDD2E65 = _NONAME_ | V | 0x8A331E94782E4C9A8097043362FD4EB0 ; libaacs -0xE07459CE5083AFA562C37AFBD4225F8848B82672 = _NONAME_ | V | 0xA593415995893A75218034CD7CB8F722 ; libaacs -0x11EE61E6DC2D528D3660886CCDC63A67A000D73E = _NONAME_ | V | 0xF01EF4875D21981F1E80A5ABEFFA1911 ; libaacs -0x4E3A2DF03D7348583EE45399BAAC3AAAE0D14316 = _NONAME_ | V | 0xDB58B2332EA43E61C25AEC776CCF00DD ; libaacs -0xD655774882A23AD77AF20DB63E191987FA2ABBD0 = _NONAME_ | V | 0xAD86445F161A0B35B8E42B84E485E54E ; libaacs -0x5B7620C0ECE7768B56D71E82CDA2201AA2515490 = _NONAME_ | V | 0xC64C3B24E36AAEB9ED252C2CC7A36976 ; libaacs -0x44201AF1D22EB5290B529F59229DAA251F992A40 = _NONAME_ | V | 0x73747F234245DD855FD130BC2E53B4B2 ; libaacs -0xF02E955EC57B95655766BC9E32F882527FAC9CCE = _NONAME_ | V | 0x94EFF48D56D2146A9238FF35E56EA0D1 ; libaacs -0x64277CF3F078E370A611051F26DED5CDEB734BEE = _NONAME_ | V | 0x7146392EE513C7C780C3506735097EBE ; libaacs -0x595DAE8547DE058DADF7D370A3F0909C48A16C6E = _NONAME_ | V | 0xD7D4F5F6C118FA0F6EDFD871F6081775 ; libaacs -0xE2D831874451678FA97BDC4ED84A44733E3CB626 = _NONAME_ | V | 0xDA2B8EF7CE0A40875ABDBFE6FBC7E94B ; libaacs -0x099FD62CCEAE90CEF67A202FA0DEF519ED0E667A = _NONAME_ | V | 0x1444F6E3B1F40937F172C1B9E8C1EBEC ; libaacs -0xC765DC6426FACDA6E5A2D522906074D960C5DC3C = _NONAME_ | V | 0xF24DB976918D99216BB5D80B8FDB027D ; libaacs -0x76F906E58264607E99C81F61D8C4E5C83264C329 = _NONAME_ | V | 0x929C417EB3DD0BFFC094D25F25C857F9 ; libaacs -0x19412A8BB0A3210016447F5458D7CAE42C4059A1 = _NONAME_ | V | 0x24AE31F7B9AA042622A99EE32EC2F1E6 ; libaacs -0xF48052832680432B281DCDB82E0FD373AB2EDABD = _NONAME_ | V | 0xD694DB9EA0530A15749A8CB64F93679C ; libaacs -0x0CF86A852FA9A3A0951BFEFC3BD0250C3B84334E = _NONAME_ | V | 0xF563020705C89B9AD67FC8A44897A5F1 ; libaacs -0x69183F3BC25A96AA8C79E53EEE4A512493741347 = _NONAME_ | V | 0x45A2E4F55187693F52C2895208696181 ; libaacs -0x72D21FDB4D037E1304141346ACA7F1CFD5FB3C4A = _NONAME_ | V | 0x4CEF286D4A2DE87F3DA0405A0C73E4E2 ; libaacs -0x17A94412EE47C0BB3AD32784A9F8C760948306E3 = _NONAME_ | V | 0x3C562190D97012C852A56D009274139B ; libaacs -0xEF47F23ABB76FB620586816C42A12DC8A11F41F6 = _NONAME_ | V | 0xFDD87D2BD4A8EE385EE68483BF307374 ; libaacs -0x65294BEE7969DB8ED8FDC76185E9E4D2D1AFC997 = _NONAME_ | V | 0x6B484000C2D3A3B723D8D20E897901E5 ; libaacs -0x076B411396EF77896F9977D3EDABAE757289D5DF = _NONAME_ | V | 0x11528F2BAF3D595A0B435D85FC1161A1 ; libaacs -0x98A8C3CBD5EF2FC4B4DA705FF02B8A34CCC1B17E = _NONAME_ | V | 0x1D90FE8E15ACD8F7502A7A64739ED7F8 ; libaacs -0xFCBDCCD1626E2A700DF911250D7763CC30D0BC42 = _NONAME_ | V | 0xAB069AF80BD400C5422399105F661FA5 ; libaacs -0xA445990B7B1EFB46C1E9FE8CB418581446ACD8D9 = _NONAME_ | V | 0x5374BDEAE0AD54D21EE3FB0540870870 ; libaacs -0x3364F512E5EBB4AAF7FBF22677B6AC8B8BEFF820 = _NONAME_ | V | 0xB99E647174E7A8942C58FC0031541924 ; libaacs -0x0B5EF310BD292F9983BBDFD8D86E7BBB34205340 = _NONAME_ | V | 0xF7512AAB760DAF1505847F5080F2CE84 ; libaacs -0xEA523D73777B7748584E973048ACFEBEC953FD04 = _NONAME_ | V | 0x60B7B90076C12336A8B0E73C4AFA8AD4 ; libaacs -0xF3E33421429C73F3C7DE9D354234BBC519E67EBB = _NONAME_ | V | 0xAE460AB48E479C0D7294B6649DE5A666 ; libaacs -0x5445B151D1D164EFC4E11741ECA03C8A7571DB49 = _NONAME_ | V | 0x72DE5988CCC768F7099C3DF4F4441728 ; libaacs -0x3526AD68F832A7391956A928BF5E48F145B920E0 = _NONAME_ | V | 0x548D0F01244E847A32BC1F6B4020DDC7 ; libaacs -0x2E17CCC8ACBB084C1EE63110BC477356671B2E96 = _NONAME_ | V | 0x59B1658E5D0646C55C469F5BB06E8833 ; libaacs -0xB9B33A50A82E11A209AB7D2B0F7CAFDA70896A9D = _NONAME_ | V | 0x1579B7EB2A7599681778E21306657F46 ; libaacs -0xF65BD2540F0BFC8BE3A676B26FCF1CE2A5512F98 = _NONAME_ | V | 0x68268A8F426028668ADA0879A5790D33 ; libaacs -0x848DA6A161491BBC303480FEDEC1CF23E2C7437B = _NONAME_ | V | 0x698820B626E1071ED4515F7CEFD34605 ; libaacs -0x5FB2EADD5437AD9CB81182036E8519F20A3942F7 = _NONAME_ | V | 0xDA8CBB90936A2933AEE6E816F923E05C ; libaacs -0x22C13D9AE55DFA180AE8E5560496F801DF7D6606 = _NONAME_ | V | 0xB3888BCDC7C160EB21774BC39C67F2F4 ; libaacs -0xB0E5F6D9B48093351314B522E6BE25A10C24C549 = _NONAME_ | V | 0xD0E3A5BC409E9B00513C452C984ADA85 ; libaacs -0x00CEC4D4966EC387A5662F05FEAD2BC7EC226036 = _NONAME_ | V | 0xB7457D783DD93C5220D6AD25E3009619 ; libaacs -0x8D59638ACE87315351C29CA79623ECB73D8E6041 = _NONAME_ | V | 0x285DD54AC6E8B85ABCB0051C3509858E ; libaacs -0x8B7C23FBEB703FC9E9D6F93DB369BD0EDB5110B5 = _NONAME_ | V | 0xAB6DDE6F9A118CF11E498728E0F078EF ; libaacs -0x63D5EE7830533CD3586FC504ECA97461DB013052 = _NONAME_ | V | 0x589CA1669E167E57515D8242B2A7E70B ; libaacs -0x1BB21F0ABF210590EB418598656BF1D9E35FD401 = _NONAME_ | V | 0x1FE34D3D1C2997D6CC5F2D57BEEDECBD ; libaacs -0x3AC4DEAD7B13ADF4238AE1FD85ABF9A9E5D9E2CB = _NONAME_ | V | 0xF6190282D6B6AB4C26D723D7A9CB270D ; libaacs -0x837DEE095A259399973358E9450D896200BCE2ED = _NONAME_ | V | 0x26EFAAD65EF31B4369B33E9D138CA624 ; libaacs -0x35DA07B60230F91B803FCA6A1CCA9B1ECF0BF8A1 = _NONAME_ | V | 0xAAAF8DFEF6849FDA7C596C6A88A78DC5 ; libaacs -0x7D807F13D5948FE89DA2E3BF21CEAFE265D8401B = _NONAME_ | V | 0x1AA7C2F98D320FAB647B73A4F777BB25 ; libaacs -0xF0EE975BC71CFA61F1B99B782FC579993ED4F13B = _NONAME_ | V | 0x954D5BFF1E181D90E7D8CC07A992338C ; libaacs -0xEC73599808661EF48E5C95117C6C47871A2C661B = _NONAME_ | V | 0x7415849E5B47E3BA487F10F15D5E0C86 ; libaacs -0xCB97554E1FCEAF8BA9D1D01873971E816FE6E2FA = _NONAME_ | V | 0x9D2F1098DB99EAA0796F0911C4D7DC07 ; libaacs -0x905B2962DEBDC59106AF5FEFB6945CC3466791C5 = _NONAME_ | V | 0x97B8EC4D26DA98BFF809F7938235825E ; libaacs -0xC0B914093C2ABA5D130944D6E4115471F4C77335 = _NONAME_ | V | 0xFECB3557BA70ECF6BF96F337A28D4060 ; libaacs -0x567809A485E4170091EF1B3C5D53BD483B357C62 = _NONAME_ | V | 0x582A1E9F1E470C2BBE8F70C5D9462D27 ; libaacs -0x1DE41D24BC267D55F98BAA3DEAAF04A915F13C4A = _NONAME_ | V | 0x0D2EB69B0C4B2171157632444D29064F ; libaacs -0x62FA5D0A189ED9AACC8CC31BAE032E567133D28D = _NONAME_ | V | 0x674CC158BEE8BA2120A42C7856B78C86 ; libaacs -0x8D149270DEC206A925342EF222B36D754BBB6766 = _NONAME_ | V | 0x596EF81943741729B75E574F4DF96F26 ; libaacs -0x4B685D96D3FDF2FB72C77EB7948ACC3E4829B699 = _NONAME_ | V | 0x4A376F5B205D7938045E33667DD9C8D8 ; libaacs -0x279247112BF39267ACB7D0849F5FB4FDCCCA72FB = _NONAME_ | V | 0xD90A8278BCFB5E79E1847C95154FD012 ; libaacs -0x05F2360F9E5B5341F760166A66043134F625D90E = _NONAME_ | V | 0xA180972B90C11A0E18242003B0A6011F ; libaacs -0xECD2C2619111AAC4501FBD9A751540B1C5CCD422 = _NONAME_ | V | 0x0E8ABD970129125620767C0A295A1461 ; libaacs -0x719EC4B9E3EFD587DE669E13779A17FA420432E7 = _NONAME_ | V | 0xBE5E4A376477DF4D85FC3B958950A6F0 ; libaacs -0x6B215D287200D5827834BE8216FB89C73C800EA9 = _NONAME_ | V | 0xF9DBB221CFB53D7229A87909A07F7148 ; libaacs -0xDC51CE280C6BFC96B756AA887385691F773BA912 = _NONAME_ | V | 0xE54798B90D1046B61F800B552B7DE453 ; libaacs -0xC07A6D2C2F6BE82ADB9962E05097974E04AF6D13 = _NONAME_ | V | 0x32CBD5CC28A81B850BB8139288F3A902 ; libaacs -0x55052592FF403DF817A57F3983BAA7BFB91E8481 = _NONAME_ | V | 0x7A3FA78A06FF50A663F91F7070A21443 ; libaacs -0x3E5747210A14C66800040EBD484A447E2AE3AA16 = _NONAME_ | V | 0x6B7182F211D6DDF875E3144CFE405E58 ; libaacs -0xB2724A49749430D25F42B20ABA24272FD18F9359 = _NONAME_ | V | 0x925AD2C9ECA9B66388077E09559BA33D ; libaacs -0xDAEB2C9B8353C9BFBF71901A42F42D2A89A4E474 = _NONAME_ | V | 0x1D34ACA1BBAF9A5F7CE69594D56ECDD8 ; libaacs -0xAFDD6E50FE08219A4093EAEB1EACE3280C078FE0 = _NONAME_ | V | 0x9BC4409E6E415002FF0636739B083810 ; libaacs -0xBD9E4470E996F720D6B7342F6DF371DFD82F1D4C = _NONAME_ | V | 0xD88747BF9F2930763D60A0760D1F1C81 ; libaacs -0xEE4C04BFAE56A02DB518E57149AC995CB6B93A2D = _NONAME_ | V | 0x4BF65F168CF6CD3038DE4F14D7FB1895 ; libaacs -0x32EB09D200279BA6F229F823216F3E4929248ADA = _NONAME_ | V | 0xED345C06A75C653D15B844889BF2F702 ; libaacs -0x3D0D1CEB6949DAE24EEBA9FE98E621B401CF95EA = _NONAME_ | V | 0x0D72794E051CE5FB4CFCB0214C6D7713 ; libaacs -0x170BB360E6E2C0B6CC4243B482EB51FA493452FE = _NONAME_ | V | 0x7CFBFE7B3D1F3FA7C9DD565468BA9058 ; libaacs -0x52765E00EA60C97E48F2A7D59059589192E5FFB0 = _NONAME_ | V | 0x16A714B71EFE3E404E90302847FB7C49 ; libaacs -0x523F81CBA1C3BDBA538F96DC1413712FE6980019 = _NONAME_ | V | 0xEF9B765D8CF5AF021631161DD690704D ; libaacs -0x7F6A162E08F3711DE58B4ACFF02224D7D1DB4DC5 = _NONAME_ | V | 0xD6733D908132B4EE5819BE4617BA627F ; libaacs -0x0DAB127B03DAD789FC2844764BC81631CBFF8D34 = _NONAME_ | V | 0x3E017594D692508427FED808F5978D0D ; libaacs -0x3B1ED842ACB201AC5E369D619A1834B6CB8CFD04 = _NONAME_ | V | 0xCA0A644D70B2C4A4E88781E5C2C7E071 ; libaacs -0xBC57B1DB06280E284CC04B2BBF20642723F50656 = _NONAME_ | V | 0xB86AAB61ED6D830919E0EA01F94E964C ; libaacs -0x4125704A341809BD292BBAC0AE6850E7923F0B85 = _NONAME_ | V | 0x30D20B8B12D4FB6F375375BB35BBC80B ; libaacs -0xE2757A39AE5E02BFFF1C5A2FE81340DF46E0ADC6 = _NONAME_ | V | 0xE8E1962F47E826001C189A5710302DBD ; libaacs -0xE0A00D2FEF8B2ADD623427C4DF399780683FD9E8 = _NONAME_ | V | 0x30FF24B7342E028792291EF451F8429C ; libaacs -0xDF423BB095FBB2178A0F16D411A6F1DF40C7BCEA = _NONAME_ | V | 0x1D6D2DD53A3907112FD4461B2B9C33AF ; libaacs -0x365169553EF87FAC65DE2C089F7147C2BEEBF1F0 = _NONAME_ | V | 0x520C938615F9B72C3B595430013D887B ; libaacs -0xCA9B0744E0050B431FBF2D76364BFDE463ECA61F = _NONAME_ | V | 0xAB5E44D8B943B00D21448D9A5DBA93A5 ; libaacs -0x167F2CCCA376A38104B0BA4108AEC07D50BB27D9 = _NONAME_ | V | 0xD88924C221234558760C5937429068C5 ; libaacs -0xBDB39BD5F6B6BCEE2A3B1A5699A20F17C0C65C90 = _NONAME_ | V | 0xB42E66831C0E12972981103605069C75 ; libaacs -0x886D6543FF549A941D47DEBF4DBF3D17AE5A8193 = _NONAME_ | V | 0x74496A9C091F928DE4AE378F643C0977 ; libaacs -0x3525F0AC27B2557DD1FBEBC9FB756D253776465D = _NONAME_ | V | 0xA34C2D61E82E1F580ECE35CD0B4EE482 ; libaacs -0xD7FF2DA5D9FECF81D7314FB48296880757C89461 = _NONAME_ | V | 0x11F9DF29C4AA2E16990F1E2E33893709 ; libaacs -0x2E139EF5C05F1CF438E2801CCBFA8685C9BF847B = _NONAME_ | V | 0xF6370DB2CC8A6E4D9210E64C8F468B38 ; libaacs -0x047598740C8DA3FD6B2CBC50F5B44ECA5D64B66B = _NONAME_ | V | 0x9A124259BEF62AA94D1C08D0359F46E5 ; libaacs -0x63BA6049197FA9A4E20623997284A7EEA9C6B5D0 = _NONAME_ | V | 0xA7A172228822B4099BD72E30F709684D ; libaacs -0xB66EFEB237B000E57508A28AC1AAC8CBBA925C9C = _NONAME_ | V | 0x6F672CBFE546409FEDBE7ECFB83A0C4B ; libaacs -0x8FECC0D872A7880C56279D817CFECBB49B0882A5 = _NONAME_ | V | 0xF8F9CD176C976142CAE917FC0672D030 ; libaacs -0xD4CCAB186B1EF53DA4BB6867659418EF2B3039B9 = _NONAME_ | V | 0x56D39044967AD3B0C59534F01807A4B7 ; libaacs -0x16841976F3057ED735A6FC9C6C9FB267B5873674 = _NONAME_ | V | 0x8BE8CCC5CD6F7A92DFC08384CFE4A55D ; libaacs -0x267236AA9A0B958AF6AEBB8840E6EEB2DFEB17C5 = _NONAME_ | V | 0x483D4A646C93516D3A69E2AEF7DC0168 ; libaacs -0x29E83FD7C623DDB381CC83D6ED8F447E14FEB8EB = _NONAME_ | V | 0x660E6B3E2A28385D94116B516211C835 ; libaacs -0xD388E340BB597468DA46EFE932EB7A2D6ACC895E = _NONAME_ | V | 0x0FF7119DD838E01E0EFA2166821272BF ; libaacs -0x6DDA3502F84272DC56A71C01B4B16657D1543B95 = _NONAME_ | V | 0xA6A403111A2A80D1917ECEEC2BB0E298 ; libaacs -0x23A1AE093FEEA84588E98BA618223A8419B3C31F = _NONAME_ | V | 0xC63170546D35981A7CE3F78882B61377 ; libaacs -0xC6DF3C24460A05413E7AB099E184813331449BED = _NONAME_ | V | 0x9CF4C03AB1528173101FCDB90833224D ; libaacs -0x08EC254B58F4B14E9E0372CF0408DC0C2F482AA9 = _NONAME_ | V | 0xC10D33D45359C604FE858283995EB2EC ; libaacs -0x279D4CFEF69E65E21C3B55847F23C3ED2132EA72 = _NONAME_ | V | 0xADDE8219202E86754B98F739180DA415 ; libaacs -0xFA1415E60E9822BBA4DBAE354FEBFBE1E477E5E0 = _NONAME_ | V | 0x155410AA0CB50B57D80B8336FA47A283 ; libaacs -0x1EFC3DE3E55BEC3E6EF910D17A856E909E2438C2 = _NONAME_ | V | 0x1D2B6E576CA8C03DF11E26606E349296 ; libaacs -0x0A613E9783E05CE11CC344D29281FE717D6FD619 = _NONAME_ | V | 0x8AF9F6650AAAE5980F6E2F90D625A055 ; libaacs -0xE070BC418C9A670BB41947513A0E04D12E388CD2 = _NONAME_ | V | 0xBC1F75493B6FB6E188CCAEA8AE9C3E68 ; libaacs -0x6704B2B1ABB6CC10A9C0F6E02340AE91945281E1 = _NONAME_ | V | 0x229B82A3483238135FDDE1E8F1D9EF93 ; libaacs -0xB8FDCC62EC50069A54E3472CC294E69B9E702C1F = _NONAME_ | V | 0x7749DD86A0243E02BEBE5563175A60CF ; libaacs -0x9415991F0944665307D292591C82ED3889D72C6A = _NONAME_ | V | 0x00ECA1FCC746986247E0FDD872CBF103 ; libaacs -0xD0480D829B233B4BA5CEC6CFA9A09D7976C4092C = _NONAME_ | V | 0x2CADA195C708AFE902B89B2E3D678BEF ; libaacs -0xBC38859505651E6C7101F87B439FD65EFDB94B75 = _NONAME_ | V | 0x24765327E0D977B3CB46B8D17D55B885 ; libaacs -0x947E51BA9DFCFDC4E335383EDD66F7B0F7D576EC = _NONAME_ | V | 0x619E2839EEAE89FD3F6FFBD0A331EDF3 ; libaacs -0xAFF79EF2148B757A460F6BD25E92854363C83B28 = _NONAME_ | V | 0x4F4CB2D651C460C315D08562CE60E8B4 ; libaacs -0x345D78689966F8E2AA9E87596AF1E61421DDED49 = _NONAME_ | V | 0x6362BFFD0B16AC64ECC6EA65E079C1C4 ; libaacs -0xDB71166BAAF7298122918CD85559854B317AB056 = _NONAME_ | V | 0x91D9F66A3A15C4122EFABE0E50FF4F6E ; libaacs -0x00943CA6774D32732AE0C4A7AA4C2EEB0B19DA1C = _NONAME_ | V | 0x8398943F94CFDBD74316095AE4BB2A11 ; libaacs -0xE4E8A79C38E77BC89A7B3B0F00BE15FA1DC1E559 = _NONAME_ | V | 0x68BAE397563CBAD1434E9B83862CA32C ; libaacs -0x9C8AE49128E09728E4EC14C60E2D92F0143FCADF = _NONAME_ | V | 0x3734E06443FEA0AD1AB7B48EB48158BA ; libaacs -0x4F5407B5DEC756DD8DB46AAC0BA86CE90844ACE9 = _NONAME_ | V | 0xF08E216533EE97761AA4F86A6117EABA ; libaacs -0x96CB82DFFB775C13180A7F710B3F8E0BAA984BB0 = _NONAME_ | V | 0x3C7F708E7649364E11C99DDA4C35C307 ; libaacs -0x16F2155A9188756374481413C353121F546E06B3 = _NONAME_ | V | 0x58F565D346ADC1D0A77615941AC03695 ; libaacs -0xBFDD7978A7918D6246E5CCAF1D0722FED9167132 = _NONAME_ | V | 0x18D0D1B2B9096EE5F480954ECB757BBB ; libaacs -0x6C15B698AA9E61431AEF58AFD3BD165D1159018B = _NONAME_ | V | 0xABBEB0837CD1C07517B28BF176DDCA62 ; libaacs -0x1916B933A9AD90569B85979B3C9A33A476B54632 = _NONAME_ | V | 0xC986617C1B6779D4C4427330A4B1C9B7 ; libaacs -0x83B7BFC31938ED5104F70AB0C98BB3D2B7F944BE = _NONAME_ | V | 0x0D1C9B619ED0160EA4F11CBCBA084072 ; libaacs -0x0FEB5A6DE8BD20957E56CD346A9E66F340784D06 = _NONAME_ | V | 0x7B9573311BDD2C20D0498FE209F57F3E ; libaacs -0x8F2B08089E93A3AA4254433010B7F8F31CBE433A = _NONAME_ | V | 0x2F0D238E2B4CD520274B3A1B9F3187F5 ; libaacs -0x06C22956CA7E415AC4FBD0E41090F7AD2401EE2B = _NONAME_ | V | 0xCF49AB153FF961AE3F5B6AA89E7A6FD5 ; libaacs -0x5DA9010F46C87FF535039EAC2092C5CDDEB6C8D9 = _NONAME_ | V | 0x6462F0BE9CAD7720103E7C4C8329AFA5 ; libaacs -0x4D8BA1612F8527ECE9D201B88AF1EF4306F8483E = _NONAME_ | V | 0xE202BF21240CB42666CF0AC51B5280B9 ; libaacs -0x0FA57DCE0E429B6CDCBA0A692DFB06F33F64B181 = _NONAME_ | V | 0x8CEF06F83850F815590EB4B67088BB09 ; libaacs -0xDDE3FE956C612F270DD5262BDB591A0BA32E5C5A = _NONAME_ | V | 0xFC9503F5FFCBADF77AB84DD3C5D4013B ; libaacs -0xBF14C232EDFDE2ABBB2C86F51A9A095312A478B1 = _NONAME_ | V | 0x0749B353C61AFC395E2CF5ECC6DCC42A ; libaacs -0x3344245D811F1947D066791A47857237A86C066D = _NONAME_ | V | 0x41703A2FE991C241321752398A3F1992 ; libaacs -0x3456A6679BD5F0C89024D4204744C5116E351D3E = _NONAME_ | V | 0xF767844D64906BE3EDA4E263C4AA9EB0 ; libaacs -0xF1FF892DB6A64FA9F2F5ADBE913585775492D42A = _NONAME_ | V | 0xBEF30540DEBA607BCA3DA93DDBD49FC1 ; libaacs -0x198FDB249F53E0EF5426F0355EEB56BA70BE36EA = _NONAME_ | V | 0xF6E2CD8861239DCEBCED7B8BB66724F7 ; libaacs -0x8E6BD544E5E59E13FF49FFDA6129C70E316F0EEA = _NONAME_ | V | 0x419D29B65D75C4E315E6D04306FFF3D6 ; libaacs -0x1FAAFF49883EF48FE242B225AFC6E150380CB5CB = _NONAME_ | V | 0x8D16DC004833FB98234D7D3DBFCD1439 ; libaacs -0x19C065B700B086475E8B5E240C29FF57A0C852DA = _NONAME_ | V | 0xC03E9EDF499B12D485CE697D47063D7D ; libaacs -0x0E5C0F63B4497CC98D28FB215A7D6F6EE66604F5 = _NONAME_ | V | 0x2CD784942B524ADAD56D8871AEB11853 ; libaacs -0x8A12C5253BF2292658315310B7450817AA7424A0 = _NONAME_ | V | 0xF4AC1EBED21476EBCD8B5DD58B058C9D ; libaacs -0xABD771C98FA97762019A7F24462E6542F205A472 = _NONAME_ | V | 0x0AE95CF8ED970495093A5935FECC3165 ; libaacs -0x6765ED4EE97E2510003E9BC9C6FB46564DD003CC = _NONAME_ | V | 0x6E38079BFE7A2CFCB9CDADE60A0E5E65 ; libaacs -0xD725DD7DAB7630959DA548CA2427953EA25CA08D = _NONAME_ | V | 0x89D287BEF752D35DBCA1EDB3F1EDD415 ; libaacs -0xD6E42EB9F6893738553BAF07A57BA41C034976C0 = _NONAME_ | V | 0x8715F43723EA60051F2C8EAB77851A34 ; libaacs -0x3914521216BE40880FB489A2969B78D5C5DB4BD1 = _NONAME_ | V | 0x337AAC5E78F8C7C622827058BA01154C ; libaacs -0x1B3170D57690034D6473DD892B24B7E94E3489E2 = _NONAME_ | V | 0x07DE748E89849C082FA656E2FA29D3BD ; libaacs -0x1AA3894272393791C4C08E7B4B79056F74B3F9CF = _NONAME_ | V | 0x1FADB87C5F0BE767064A56055230BDD5 ; libaacs -0x0FDCA9B3EE9E0C066869E99442EB8B5C936B9B7F = _NONAME_ | V | 0x2E0F31A2DCC9CB794BDBBDF44BFAC359 ; libaacs -0xCC6D630BDD99114F64BCCA97CA3EDBA7AFBE88BD = _NONAME_ | V | 0xFC77581F6F84C7A8FF898CF9A7B38196 ; libaacs -0xC7CA01DC587740EC385BE3DCBC5D1AC87CF4B233 = _NONAME_ | V | 0x1B5B0A74B435CD9A0B094A7B10FB2D42 ; libaacs -0x546F9F1D481EF507C82963D973F5BB6952A75EDB = _NONAME_ | V | 0xF1E30D0EF9B71AD9A7491F8F52850598 ; libaacs -0xF128D5D6442896A4D716A8B63FE105F28A9B22E6 = _NONAME_ | V | 0xF68A22A16B257F1FE98623C00347BB8D ; libaacs -0xEC1F50194F1C305C703FB29612B20D4221EB444B = _NONAME_ | V | 0xA6619CACF910690F8D3CC09BD3F983A5 ; libaacs -0xE13DFF5C9586605BA25EB1C1401627CF6ED7D100 = _NONAME_ | V | 0xC7D835B98A2D8A969BF33F28373738C7 ; libaacs -0x61B7CA357B9E8853788AE71C3C8FE63869AAA75A = _NONAME_ | V | 0x0F98B6BD903114A2DF22BEDBED36135E ; libaacs -0x5526B305005B0F3DB05326F9E91D60350EE94CE7 = _NONAME_ | V | 0xA20D26CFC1F1B8DD8C58D293380FABD2 ; libaacs -0xE220CB9DB84A94F727EC08E608D2CECADBB78F81 = _NONAME_ | V | 0xA18605B6A5F53E76BA0E9AB07A754E63 ; libaacs -0x26B183D0F263331A2D12976A445346A2ABC40F4F = _NONAME_ | V | 0xF99A49E9B92F328A7BF3A3A446600732 ; libaacs -0x7914BD11D540DF594A60E41F4045C1F0E63C9B17 = _NONAME_ | V | 0x813D4D70157260A95C5113070C3C849F ; libaacs -0x90B6387A14D03DBAEB349EDF34A2AB7375F9010A = _NONAME_ | V | 0x2AFDC2B2CCE08EC07F02BFAC58D21BE5 ; libaacs -0xE29B8F7455E829585F490422BEE8160E900423A4 = _NONAME_ | V | 0xAFC61ABFA99F37206B6EFE0F91DB5007 ; libaacs -0xDA9E340B1B6A2226B7B45820B9994043D5C12F48 = _NONAME_ | V | 0x3FA1D59FC76AD110BD04493B77ED5490 ; libaacs -0xE3B3330AA040A7DEA777918A568CAA3A84B2784B = _NONAME_ | V | 0x7B6470CBB632C4B418E44BF3C8A6CFDD ; libaacs -0x347F55BFF7CE31A0024E19C815C2CA568800D8B2 = _NONAME_ | V | 0x5521FCA95929C9BF8E24146DFF9A6663 ; libaacs -0xF90505AE6AEE75220EF31BF2914261A056432F10 = _NONAME_ | V | 0xBCC6694A19DD9C330DFB790A21D50974 ; libaacs -0xA4A57773CDA68C578B01B9810BCC03EB3E26580E = _NONAME_ | V | 0x524A00C00AC8C299B184903D781A9FED ; libaacs -0x6610D6BFF24BB9A202D145F3C3B9152CFE0E1633 = _NONAME_ | V | 0xA0EC1BD2FA070CC91A0DE264AD420C72 ; libaacs -0x60B9AE9AAD503F7807155DD5E9F3EDBDC3C5A1F4 = _NONAME_ | V | 0xF51EDD01EDBCEECBE6FEC0AD77D5F5D1 ; libaacs -0x9C994A0A3144A0F0FD67EAC5B4751AC2A54808BE = _NONAME_ | V | 0xD5E5193BDA15B39FFA7CFBFC9F50646D ; libaacs -0x0AF7A680770161710CD97F2451D14E363ADA815B = _NONAME_ | V | 0xAB379F374FA3B6E43E0D77DAC3B25B3B ; libaacs -0xDA6AABFA8B93C65912AB767826C77ABBBB8D017D = _NONAME_ | V | 0x9D71ABB20758CC5C481E4EE8F3EA16F8 ; libaacs -0x4206C442990BEE690033E98132C8059004936F94 = _NONAME_ | V | 0x5623869701C9D52A03992C89EB78C8E4 ; libaacs -0x3CE6AD7DEF06264D63A1778234DDD5A18D16C4B9 = _NONAME_ | V | 0x4D37A26016CBAA2B51CF3DB4ED5A2B38 ; libaacs -0x933D821A14355A24AA0B47D4C2D093609DEC22A6 = _NONAME_ | V | 0x5D06556809D5B6B65FA4D3161DD36C0C ; libaacs -0x08B8B2C834F3B3DEF9236EDB72CB247E3B55B525 = _NONAME_ | V | 0x8B249467CC1B2BEC4B0A77A944D2D571 ; libaacs -0x4008A92EEDB97149A39A453AE94C7CCE10BB278F = _NONAME_ | V | 0xF275DC9FBED3C6539648396FEB3731E4 ; libaacs -0x3860CC02DF8B5F96785A887C1B0EA6BFA4BFBA42 = _NONAME_ | V | 0x3386DBB93BDD0F2D3A0ACD1B88154DF1 ; libaacs -0x30DB804694372998EC41B6497178E3864D8B5A08 = _NONAME_ | V | 0x9F75B3BDD2ECF9084AA6BAFFF953798D ; libaacs -0xA5CC10093C4FAC6556F81FDF8BF485F8E0E8430E = _NONAME_ | V | 0x5B861231636BB7BB1E371416D7A639EE ; libaacs -0xA41A3DF36F5D1610D5B172D8984EAC26F37C450E = _NONAME_ | V | 0xAC2AF3B651E541609767B6008C65BA85 ; libaacs -0x2F6CAEF21CBF8573F06D818AD60ADC831B1098BF = _NONAME_ | V | 0x5CC0BF28C1848120BA0779B547657C5F ; libaacs -0xEBBA4580259C5170AA51A43C47E5D770E0144CE1 = _NONAME_ | V | 0x8B089BF7AE1F410723B1068FA10BEDE7 ; libaacs -0xE44E73A3FCA2B6C7DA0EA8603C7D8ABF88DAFD5E = _NONAME_ | V | 0x9CF3E5F715606467A178123DEF992468 ; libaacs -0xE329167A5BB29C8C8CE7013EA6B076675B0E8A6F = _NONAME_ | V | 0x8793C950EE2E4008AD029D3A768AEC05 ; libaacs -0xE1EA705FE3CFD4316D52AAE9CE5A41CCEE54FE5F = _NONAME_ | V | 0x0EAD93183E720B3E2E399AF2AC2784F8 ; libaacs -0xB8AE48857EC425434F0A6739871D4CC6C1EFBED2 = _NONAME_ | V | 0xE6BCE101FAC974701438F836A158EA65 ; libaacs -0x84689A3F7F35B7860856B699C90F12328CBEC7E2 = _NONAME_ | V | 0x815E7B3AD7CC6BC58CC8E2B8CA82F31D ; libaacs -0x6C059F45EAD294495A1E2F18362A9007196F6537 = _NONAME_ | V | 0xE8891B8C1A6B9BEEE648452224C4A751 ; libaacs -0xB11D737560EAE5BF8BCF51D61068021F7A1BC511 = _NONAME_ | V | 0xA25EDBD5AB3839C08EBCC4D47E048F74 ; libaacs -0xFA0977C2599D2A907384770070013ED14B0998E9 = _NONAME_ | V | 0xCEC43ED14C58AB489EF12DEB06D6D0B9 ; libaacs -0x46C6D90467B1A97DC47B50D2694AC81884217C65 = _NONAME_ | V | 0xDB575D4F3C27A9DDBDAC838A4C4557D3 ; libaacs -0xAA0523B0B48540D564232C47664DBE44F1798D75 = _NONAME_ | V | 0xAE40496DFB1C7948D4AF7D1000B35965 ; libaacs -0x55EE688B57FAC8EF3265A374F34AB67F4796F341 = _NONAME_ | V | 0xD72E525015C4306DCE6703B541A302B2 ; libaacs -0x0447B2ED6D3699AD1AB424AECD90472FDC5A7A9F = _NONAME_ | V | 0x7A406D8CC3FF4F607180923729180BCF ; libaacs -0x00DAB3ACC70ED15D51B6F63A3DEBBB525A059CEF = _NONAME_ | V | 0xEFE91C2E5073193154EE26A36D34A43E ; libaacs -0x20056DE0B9B3572F9F5DC999ACC37DD996AE1005 = _NONAME_ | V | 0xF7FF7CF26C91286979FEA00C1D90D549 ; libaacs -0x0CD1C5A7870BBDCD4CD70ED139E646F3C709B933 = _NONAME_ | V | 0x9EE42357136BE4F909B500062F399672 ; libaacs -0xB163494CDC6E6A3F022B86F9371366BA6216DA88 = _NONAME_ | V | 0xA655881814440BA6512E953C4DA1E24F ; libaacs -0x9087300A4034A4230D4386A7CBA331E9439920D5 = _NONAME_ | V | 0xFC919EC20817725A2808ECD301E71C14 ; libaacs -0xFD290B035004BDCAA6747E26BE37634D8114B1EE = _NONAME_ | V | 0xAB0BC81F0F6854BA71CB81FF0059597D ; libaacs -0x662B15E6CD8D5724426D072A9A225C1D4C4F9BA6 = _NONAME_ | V | 0x5653AEA8210154C3D3B32A6C873A040A ; libaacs -0x3981178840F1563FD840EF0D73B64D709F1508FF = _NONAME_ | V | 0x523106774FA01C7691431D2E8CACA1E9 ; libaacs -0x2764DDDCF2FB2B318BF83CFCB1E841B1C136B50E = _NONAME_ | V | 0x10848238E60DD8CAB914FDE9F2B5A365 ; libaacs -0x1D3C92275988F374BE336B7C873511D0E9B4FB80 = _NONAME_ | V | 0x4223109F9171157A6E63414233373007 ; libaacs -0xA54DE5A006CB5B22C4691C05E386B8BB881C02F3 = _NONAME_ | V | 0xC5E2EAEEA081733DF6CBC504341AE380 ; libaacs -0xA7765D477E4028604C92ED985842E3BC97B498BA = _NONAME_ | V | 0x818771C0292689A8F875F9E18E672446 ; libaacs -0x8E82EBC77E81C8A19B7B6FB6F6A81E2B2C176C60 = _NONAME_ | V | 0x3C74CCDC7281E695504E775502574E69 ; libaacs -0x6750F7AE55160128C49E1526B2F1190BDA0EB56C = _NONAME_ | V | 0x8AF9F3F80C9BDAF50EBA9316E93041FD ; libaacs -0xD09B421A0724F8E328C5EADCC1322CD1743B566D = _NONAME_ | V | 0xACFCCA7CFAAE94A2587FFFEAFCC3057E ; libaacs -0x87CEE1F0A21FF6E0C183F55B2D00F6F68EE47781 = _NONAME_ | V | 0xB63EBD147979A27FFEC2D720709CD39E ; libaacs -0x4C09F317F1C2A80C69DA5D36EC4A2FE06A714BAC = _NONAME_ | V | 0x9B80E8212114100A6ECAAD65876485B1 ; libaacs -0x5DB441A4FB28C8A3B8179912040FC79B88E35908 = _NONAME_ | V | 0xFE344DC48D94BAA4BC3139DDE96EB30F ; libaacs -0xF51CA40369DBECFE4D4F800BA6F5F569E147B722 = _NONAME_ | V | 0x58433A5F0F9F07431ECCC3188AA27924 ; libaacs -0xEA18BFAF14C878EEFD881119B51CBC4EF1FAF0A2 = _NONAME_ | V | 0xA164E72E51062C1C07D6D329E4E7E89E ; libaacs -0x830DDAD1FE067F9DA1B68AF7237452D2055E6EA6 = _NONAME_ | V | 0x2BC81CD93D5B32C9F4C13A3B4195FE54 ; libaacs -0x59F382DBBDFCA1604006D4B59FF7FB9F524FE153 = _NONAME_ | V | 0x993AE87F9B8389DD07E7FDFBC94309E1 ; libaacs -0x585418E72E347AFE0D011905C2ED657AEE7D4E52 = _NONAME_ | V | 0x08D98A7A6AC8DC5C126764B1A81E28FD ; libaacs -0x33CB73B5B44B9E6998CE02FBA8CE354B656EB985 = _NONAME_ | V | 0x6F60A602385B8F2C378B2021125C0A07 ; libaacs -0xD0E4EA368CF13FE3EA4C829B07ED626A1ED4EAA1 = _NONAME_ | V | 0xE5AA9303ACAFF3D2ACACBB427EE137EC ; libaacs -0x5CA7A389A4E112216F09E525F3F084AF7A2A2E90 = _NONAME_ | V | 0x62C14B3B20C356E7321C35EFC88F6893 ; libaacs -0xEBE7C266A3BF3B53F9EDD4ABFCB08441BD718278 = _NONAME_ | V | 0x8F0BDBA3372842D7677A9CECBD4BD2F0 ; libaacs -0xBAEB6A9E134F82E99ED49832C8442EA6867E7B24 = _NONAME_ | V | 0x6D9CD27B22842F29CA41E4C69D45A464 ; libaacs -0x7EAC5F224EABD5F77A3AE027D753AA38A8EBCEA2 = _NONAME_ | V | 0x78029F1202DFEC84F07191B476EFC6B9 ; libaacs -0x51265E633F49A0DAC5890234BF027CAC97E63B34 = _NONAME_ | V | 0x5483014CFF6A15EC807E9AECF16D98A1 ; libaacs -0x2B0246100FBB7A621116FECDCECEDBF80C707A95 = _NONAME_ | V | 0x0B432E12D6AB8EBC98DC3B63D10B42EF ; libaacs -0x13CC41EE6287429432BA22B726DDB707E8A8DEBD = _NONAME_ | V | 0x087AC79FA090EFF64EFAE85A4C011C28 ; libaacs -0x0CD2DCA2EBD009977A19578B195B07CB988ABFBA = _NONAME_ | V | 0x4FBA150B9364DAE18A1F7C6A870505DC ; libaacs -0xED776C77835E67A9594912D27FF032B7168F28B6 = _NONAME_ | V | 0xB4CE5622BE14678E25C69E8CC7DD837C ; libaacs -0xB0EB0E75EC14D54B6B2E6E44183FD8E0EE456F83 = _NONAME_ | V | 0xD1F374492375074C6EDFEB2F1362DBA8 ; libaacs -0x7974CD2DE4626268A10F789850B5D50BAA127314 = _NONAME_ | V | 0x77233172BBA5E57630622243EA6518F7 ; libaacs -0xEA99A35C4FB2EEC23AC4B9F8498ED419F4F9FBDD = _NONAME_ | V | 0x8D5CCBBCC29FB88F6B7FEBF2B6E9BDF4 ; libaacs -0xB17BAF37AA8BDF3BEB7395DE9D454B1865EC1AD0 = _NONAME_ | V | 0x985710CC78AE7DF8BD2811D2B980F2A0 ; libaacs -0x9572D9A623904F1A31CB00ABD70BB0BD50517213 = _NONAME_ | V | 0xF8FEFB33C6E1D22CB6E02A3FB0AFF5D2 ; libaacs -0x5CEB947F2EBA28B15511DEBE558612F1509E6783 = _NONAME_ | V | 0x6F3C936DD241797689C58FF58DC72C15 ; libaacs -0x66650FBCEF8195D1A9AEF88F3F9F40859FEE21FE = _NONAME_ | V | 0xAAE04B04007133DBC31E9BAAB556503B ; libaacs -0x9413295382886EE707DFBCF0567C6D4F9A96B179 = _NONAME_ | V | 0x33BFB9CDF05C4E91D0C6161C25714C27 ; libaacs -0xF8B86F400B20830C36CFA769FC8D0B40369439CB = _NONAME_ | V | 0x2FAD1708ADE2F5B0CDE1BD17FBD4D5BB ; libaacs -0x7B1838B2B531CACBD66DDD1128B46CE4B1519437 = _NONAME_ | V | 0x020C98C84707285DF51BEE1AFF85738B ; libaacs -0x91CAC9F91EF35EFF0850A7F46E0E62EC72B4FC40 = _NONAME_ | V | 0xC65227F09B1313D4AAA1E41A83177B9A ; libaacs -0x4411BDD59B8F9965080C5DFD6129C1B5C9686EA2 = _NONAME_ | V | 0xA4CF76AFDB5BA095B80AEAF333543B35 ; libaacs -0x30437656F70CD4EB6DBE7A456B5256EE0BF2CB60 = _NONAME_ | V | 0xE4403AC3C93698606A59A2295C3FE7E2 ; libaacs -0x1CEF26631AFD27DBE2E8FCB188FB393AACDF11A8 = _NONAME_ | V | 0xF8860275070B990ADCD794AE7A473CD0 ; libaacs -0xA9BB765A6550EE498F47E293C967DE56EB343A99 = _NONAME_ | V | 0xA85EAFA0B9C63656590BA366670EA214 ; libaacs -0xAFBA4CFDDE27500C399FEBAA0B7B8160122FAF91 = _NONAME_ | V | 0xEB141FA57D1DE03E578E0AD63928541E ; libaacs -0x88A1D05D5459D98A83B4A3685863D680C4BB8ABE = _NONAME_ | V | 0x0EEB1FA7247DBF2A1673FBEC9FCFEE6B ; libaacs -0x7E59EEC99320C57CF16AC61799546FE8316AE42F = _NONAME_ | V | 0x8315F2C2F3C7634E18E333D10381FCCA ; libaacs -0xE85444EBC8F4B2FAABEAE27F18C114228BE28023 = _NONAME_ | V | 0x519EA2E079D9B11438C84BB2E0AD12F9 ; libaacs -0xA03EE5DEACC45FE27C53AA6EB3136DE19169274E = _NONAME_ | V | 0x164800B79CA73AF6910770252E2F2399 ; libaacs -0xA9C984A6DC626E3DC83B30FCA706146B8546A641 = _NONAME_ | V | 0x5D2803F098AE21072830E958F0567E94 ; libaacs -0xBEE96E1C5BC12C4C0B24AA091E2A24C537AEF603 = _NONAME_ | V | 0xAB4510F5621B764FF6EAFF7A3B6F1763 ; libaacs -0x0D4EA632AF490CE672FA946A72636CD42066716C = _NONAME_ | V | 0xDF248474205AC0270EB81DEA60584787 ; libaacs -0x85939B2F45B7A756F7F8867C04485574AF49DD42 = _NONAME_ | V | 0x786802E78776211DF6CCE28E941C4B60 ; libaacs -0xCF0B30D4EABA1603F384C27833EB0743D4058FEA = _NONAME_ | V | 0xBFE3C8475DE87EBE4EF5823E582D114B ; libaacs -0xB18A506AA59C3C360EEBFF8937DD81B2443DDB73 = _NONAME_ | V | 0x4E2FB09B79110A404FFD0CBC6CCE91F5 ; libaacs -0xBB98D02F1AA7DCB58D6154875FC9CD1A16B14686 = _NONAME_ | V | 0xF7137C304796C0F59D2378E20DCAC05F ; libaacs -0xB498CBF2F95BE9526545C59438F717ED439ECE3C = _NONAME_ | V | 0x49D09F6B80CBA3CB5B35876DC0551B3E ; libaacs -0xA66EE6337CC9E61373048594CAF73A811C0525FC = _NONAME_ | V | 0xD6827CA06DEF29DA3F4A6A6440F20E8C ; libaacs -0x9091003D7316785347B6D3545B7D31896418A1F1 = _NONAME_ | V | 0xC2B03F8EAD7F27C2954AE468510226B6 ; libaacs -0x84B7E91F6F7F4CC4564113D86C7B839E09317DEF = _NONAME_ | V | 0x3584C4E3636DAB7CC27B8AD960C755FE ; libaacs -0x565007F5E82256221FD06A531D8687987431C35D = _NONAME_ | V | 0xBCFC0868B392F8AC8F9909D83D235701 ; libaacs -0x484984EC23C8388D03B63423B6CEB11200EE02F7 = _NONAME_ | V | 0x560FF78B9ED8EA33ACD96E9635F5D7C1 ; libaacs -0xBB3BE86B54F100FABC1191AE4B84BA8574A56973 = _NONAME_ | V | 0xF4A90C45B72E09DA2F01FE7C736CD76A ; libaacs -0x684D0D818177B3C7AE86E147CF201F937DDAC688 = _NONAME_ | V | 0x3C6CB89E46F7ECEE9BBF37E3D3F10579 ; libaacs -0xE569A36B5BA15D824C304A3F3BA86E969B5104FB = _NONAME_ | V | 0x932A2619628ECCCCC57E205C0F24A10A ; libaacs -0x091074932DF5B7AD2A2E4A2EBC26B8779D4CCFE4 = _NONAME_ | V | 0xA263891917A4D080D802EE14E5F3C9B8 ; libaacs -0xCE94988F78F6424486C03F613C17C768341716F7 = _NONAME_ | V | 0x1C9C1EF6919A04C4ED15F793D7716371 ; libaacs -0xDEB4F86D5D8E21F249258C91ADCA318CD8FE01BA = _NONAME_ | V | 0x57E6353C3268CE8FF1117B2AB585BB0F ; libaacs -0x2A6E3D93934CF1CD7D15B0D93C0F51F72D20B1BC = _NONAME_ | V | 0x9E5A944F4579101086EFB21629885086 ; libaacs -0xB3E2D5F0435C49CD6B820AFC95D7E0B98B3047FD = _NONAME_ | V | 0x6DA5689539FD013D112E5DD15AC99076 ; libaacs -0x6023E777C8873E8023C7D4DF6976D3B79010864F = _NONAME_ | V | 0x57E6160ED75895E7781E2C6CBDE5F368 ; libaacs -0x62666E2E68CAED709B8E1C810F5B0A26DC3A50F5 = _NONAME_ | V | 0xDA6D0451A93FEE9E9E2103310C1A41BE ; libaacs -0x74F4B684C2AA7EA46BEEC90E9535CE91F84B0831 = _NONAME_ | V | 0x1C01F5DC7FCC7770F3D570142B985C69 ; libaacs -0x835A23240D3458E8ADF7D7586B5FF8B7ED31C83A = _NONAME_ | V | 0x3317F9C4EF478295422E9925648471EE ; libaacs -0x2A53ADD220D399742DB5444287463DECF0794A75 = _NONAME_ | V | 0x727C189B6989C5B761D3EBCC97EE7C65 ; libaacs -0x9885EED6530CDF907338269740AB82949009F765 = _NONAME_ | V | 0x1F905803BA8E6B40EDD6304E82B41AD8 ; libaacs -0x0B0BFEFBA2832CDD88F59C39BDD9244F36D965D4 = _NONAME_ | V | 0xAD7CEA96A52EAEA45BD9B9E0B875B698 ; libaacs -0xB0EFC0D10A8CECB2ED084824AD71648AD61AD6BE = _NONAME_ | V | 0xEF2AC3BC9BBDFA34F3F274A463C0D749 ; libaacs -0xA132CBD41DE210C83A228E2C6EF90FD4D3A52CF3 = _NONAME_ | V | 0x40C474F9A117F8506958E9E05B198FB4 ; libaacs -0x87A62C62A303D0DAE40C3AB3A05C8C1811938B89 = _NONAME_ | V | 0xB6116518B0F24CBA35A0B4C5CE6A588D ; libaacs -0x4EA468292E913881B1D1D6BE99697E481DD43EDE = _NONAME_ | V | 0x958C74E6A1D96E8D826A13C9A734C4C2 ; libaacs -0x01C07A2E1D6C127752A36077ACBA8869EBE07BE6 = _NONAME_ | V | 0xF4056F9898516CA9515DBF0C31671AD8 ; libaacs -0xB5543DD83A8EA8740F33AD949AF1AA20D18683A7 = _NONAME_ | V | 0x538021BB1D91E1F16613C2CA58161E23 ; libaacs -0x1A6E86FFF352A3102938027AB4592E9EF2EA1580 = _NONAME_ | V | 0xFE419B1BA3509F40B52E0988DD2157DB ; libaacs -0xBB864A693AF26A26746057E06C8803C8BD9346D4 = _NONAME_ | V | 0xF6871D271154C1CB0E27DA7BD130236B ; libaacs -0xD80CCE02F04B4A0F55ADD6DC3407F2D03FDC2991 = _NONAME_ | V | 0x04F06C83EEEE0B3C4AF2C3FEA1955E93 ; libaacs -0xC3E39623F3BE145C4AA16DB6E8C04C8F14FCFBAF = _NONAME_ | V | 0x36F6AB538343ED968B487B63DA7691D4 ; libaacs -0xB93F9F2CCAA88CB3B0DCA7AF65D01EDE1B20088F = _NONAME_ | V | 0x8CF1843F082D2129076698D13882C00A ; libaacs -0xA6893212EE643C07EC6E34F59C0A10CED98AC50C = _NONAME_ | V | 0x4BC71C6A5FC83F46F496A73093936FD6 ; libaacs -0x7D41256BB71946338962228CBFBF5DAC890F00C7 = _NONAME_ | V | 0x5207C2EC3A94FBA340216693A140FD95 ; libaacs -0x666A10A6E7C0E59D5F4EA0F81B404CD5C9B1AF24 = _NONAME_ | V | 0xA0EC12723583697A7DA0D2D3B9EBF25A ; libaacs -0x449F244FA1B34F82BDCBE9291A49B4AEB6653128 = _NONAME_ | V | 0xB5DFB4A10E74B062C967DC5242ABCA8F ; libaacs -0x351C70C040C473C385EC962A8B18AEC90202E9AB = _NONAME_ | V | 0xDCF2F78F501B915189CFA48F7EA0CC6E ; libaacs -0x8B450CE3E549828AFC67F8FAB496DC2EFBAF0E89 = _NONAME_ | V | 0xB42F8B6EC191A4CA9C9B80F16B339051 ; libaacs -0xF60CC094CFAF8F640792DDA32EC2B5643CD36B61 = _NONAME_ | V | 0x0E280AF992E4BD300D2D9CA73C314FF8 ; libaacs -0x89F72047E5AFE95FE6476E82C5A55E814EEC4C12 = _NONAME_ | V | 0x2B48F6FF2195E0CFBF98AA567525850B ; libaacs -0x3C707AEF13FDA562FC4085A4AD0655D03161BBE7 = _NONAME_ | V | 0x487C903348BF17DEF24C7641D11BBDCD ; libaacs -0x5634F1FA7F647A40C54F134DEB89A2AB036FAD24 = _NONAME_ | V | 0xC8D4C63029BB232AB0B24D57CBF1C937 ; libaacs -0xDC22EA2501EE2D5EB07009D11CA41AA417261396 = _NONAME_ | V | 0x647A9F1BFF37F335DE3D13F0A215B4B7 ; libaacs -0x2E46FDD6BF744B73ED6571E39615A2F1FB2136F3 = _NONAME_ | V | 0x37868D9E425E44DE0BC5C299A3F7F298 ; libaacs -0x505CEF899480F2AF02511A460A833B921CA58AF5 = _NONAME_ | V | 0x027BFAD62E1979F7CF776069983B37B9 ; libaacs -0x93480D3EA732AF5357FEFD520C0F829B14418B26 = _NONAME_ | V | 0x52E720AB638FDB9B7C416ACF5FDDF9B8 ; libaacs -0xC5966A2ED2A6C1CD69F7DDAADA2FE41A1B848239 = _NONAME_ | V | 0x38EAB00D6C421B90C20561B74CCE00FC ; libaacs -0x76AE928DC2CC8B9850EDC045D1E35E27663CD070 = _NONAME_ | V | 0xEAC6F67C23A5769359D2E9E2DB68B9C5 ; libaacs -0xCC90DB6028A894FACF9B12D8F61C289F8B28BB0D = _NONAME_ | V | 0xBBF5E1A02D96233F7C43CF293FD3A72A ; libaacs -0x2434FA98609A5D805579EB9B59D794872167E425 = _NONAME_ | V | 0xF328179EB4AA52713E28B9E7334F7D4E ; libaacs -0xD512F765BAACDFFB7F723F47945C4857BDFE346E = _NONAME_ | V | 0x02ABAB844ED421D621430B74409059F7 ; libaacs -0x9338924C00ED107C057A9B62329246CDBA5052B1 = _NONAME_ | V | 0xCCAD13188033BD778BFC6C57AF476619 ; libaacs -0x402EB904DC43430B86442575FA7067EA28BDB0EC = _NONAME_ | V | 0x6FD604ADEC6D6A36B0B294FE2799DEEA ; libaacs -0x260CC96289899276FFA6F3A6CF3080D87FEBFF9F = _NONAME_ | V | 0x8CD0D05617B6CF0A28093A6AD4628F90 ; libaacs -0x1DE6528A5506B7C5DF7FA6056CD7DBE91DB4C5E2 = _NONAME_ | V | 0x4179D0F683D76A6581309BCEC82DF8FD ; libaacs -0x1D8F0035660E5F51BCDD02827F0C18E6D50EE31E = _NONAME_ | V | 0xD1967351B6E2E37B135153D11F438C31 ; libaacs -0x083D5C049078F76748D11F6B8CFF763AC09DFC3E = _NONAME_ | V | 0x80E3E9FD0BEB56C91CEDF808B048B3D0 ; libaacs -0xA16B7783444D26AA08C9ED375A6A064FAD654AE4 = _NONAME_ | V | 0x82AC42C862723FB2F89A66F10B9EEEC3 ; libaacs -0x23F352F92E67EFD492D4C03349EFBBC603B19116 = _NONAME_ | V | 0xBFD175312D2D012488006A2A2F1466CC ; libaacs -0x6626B1F5620FE28076914620FCEC6B507F1251A3 = _NONAME_ | V | 0x58D228C9D581C12F732C5DB1FCB8CB3D ; libaacs -0x4B8685C6F29642C11D912A795C3841401656E49E = _NONAME_ | V | 0xC42CAA82AD3FA512FE8B926BBED2CB03 ; libaacs -0x53F92BBB45D62B54AAF178FEF3E4238D0F0D200E = _NONAME_ | V | 0xE8C6D77320254E386794F246948CB4FF ; libaacs -0x5B206EFD3EB7E6BED3B9B67E67697D5EBF681C79 = _NONAME_ | V | 0x0B8688E8CDD7461F7D11D5E8AAC62FE3 ; libaacs -0x7EEF47B5A1526FFB7662A7E39D78F8E32CA658C9 = _NONAME_ | V | 0x21CC159E98B2FB49AEBADAC206993F33 ; libaacs -0x95025F66FA1D0F5C061EC6826E414B8C9B87177B = _NONAME_ | V | 0x0109207FD8F774BDE6CCE9584A5DB481 ; libaacs -0xB236803512447E329373A2B96B00D09AE89CE286 = _NONAME_ | V | 0x1D1E7DA1474F3F0D6774D4843764306B ; libaacs -0xB0A873E063675A61D43094B7B231FE394B8AA779 = _NONAME_ | V | 0x0D2CE49957313E03B836CDF57E4557CC ; libaacs -0x9FB303C9FB68E2F3F7180F6AF664CB8581D26527 = _NONAME_ | V | 0x52E40974C9EEDCD990706CAEEE97554E ; libaacs -0x0A6F6F4D984C5FF69A1B3E8E7C7BF639A6A8C58D = _NONAME_ | V | 0x197F24897BC0F8A0722E09E8D53C27F1 ; libaacs -0xE514B1AFD1419384C461BB048B1A8ADD56E35711 = _NONAME_ | V | 0xDC91FE9C7A881B87A6419D1A86D1A789 ; libaacs -0xB8CBF1D58CEF8260F855404B2F308C9FA1F6CE5E = _NONAME_ | V | 0x1AF786669D00AE2731FBA2B37E58690E ; libaacs -0x9DD31E3B2D7A26AC383464BE34EEA5DF6F763D81 = _NONAME_ | V | 0xF541E8C6DE07FD5E2E2A7A9253563E9E ; libaacs -0x97B3D09177850F89054A602F47E3C6CE27E1CF45 = _NONAME_ | V | 0x4653E746CF7CAA5A7F410E666B15D5CD ; libaacs -0x2FD431678A17657D6C944049DACAF8BC0CF24036 = _NONAME_ | V | 0x8AA8E2443A7D739D4A725CCA6652B20F ; libaacs -0xAC3A56583BB6CAED4C3ADA9EBF0C6F35805202E8 = _NONAME_ | V | 0x3623C9D21A299B78AB7F14230440631A ; libaacs -0x350C126F0A9478EF9994BF7E9BE5CFF49450592D = _NONAME_ | V | 0x16E4AB44A60A0F0C42236C653F5E6AF6 ; libaacs -0xDD8F2E178E42250F2C8D619295024CCF439FD2F4 = _NONAME_ | V | 0xE3547CC35E6C0E12A2A7D49A2AD6290C ; libaacs -0xDC6488037451708A751387197149CB3A650C59FC = _NONAME_ | V | 0xE759E2A82B4F7FC29BC1C3C3F3016DD4 ; libaacs -0xD3110719F5262B00DC7CAE80CF7839423DF75BDA = _NONAME_ | V | 0xFA66940920A7B4DC48F18B2E7D554A31 ; libaacs -0xAD88BD7A6BF6A414994F1FDEC4BF8E1F2721D734 = _NONAME_ | V | 0xD088CB8B12F3EBA91DC653D8AE740D71 ; libaacs -0x8BCA6125B93360CE930FE7313117E675A4E9DBCB = _NONAME_ | V | 0xE1E24CD1B7124C907734190B5C6E4032 ; libaacs -0x816F5FCA214453A3700B9E582D00FDAD56961AA2 = _NONAME_ | V | 0xF43448A7639C7F9A7700723B13CB3451 ; libaacs -0x68B1370CAA133E4C86AA44571709D40C3DA113F7 = _NONAME_ | V | 0x35CC983DAF2518CB2E185B17691C5BD2 ; libaacs -0x565AD599D0950C2615082E5A50E6DF73AB03168B = _NONAME_ | V | 0xA43CEAFFA59EE477915CF31F796949D0 ; libaacs -0x3716D6D15EB440A34120D94D5F2D73540BA664ED = _NONAME_ | V | 0x1DA565518A01C5F89CBFDA9D8E0CA5A3 ; libaacs -0x0EE5933E8D6DD0F26477CF2518493BDE80FE125F = _NONAME_ | V | 0x29491E5223250E2909D282A9531FD3DA ; libaacs -0x71900040049106AF3E28BFCCF9D6FCC71C898A7D = _NONAME_ | V | 0x12AA99D2D09194E8E445F3ED04E52CE1 ; libaacs -0xC4BCA98EA5F2FBA739EC7F7FF962CCFD1B1758F9 = _NONAME_ | V | 0xF61444BE67E0676D775045F68C8FB03A ; libaacs -0x70EF20B91CBDCBB6BC876B64AE14E6FEF1E9ACB5 = _NONAME_ | V | 0x7EC7CD9A62485CA3365D3C5602CF3FE5 ; libaacs -0xBD34B586C8D42F97C7157B7965304E098F62663E = _NONAME_ | V | 0xF6AD541211D98F61E61FA935D122C124 ; libaacs -0x16E646651B973AF1F62A47C5877BFEFECA07B1A5 = _NONAME_ | V | 0x743E1EA492FD7FB6B92F813A8ADA0D5B ; libaacs -0x6D7820815FBA8D6EAFB7423598707D6DC69041C6 = _NONAME_ | V | 0xA69D8DCD5702595B7F260978580CADC3 ; libaacs -0x4BEC7CA4D6E1774BD52411C215B73779E38275BF = _NONAME_ | V | 0xA549BB526EEBC46EE8C8CFC15DC3ABEB ; libaacs -0xE2885A053EC89C8F1DBE451DDC5F48675F6E5061 = _NONAME_ | V | 0x2EDD3B3C9ABB70F4A6196C48FD8D3D76 ; libaacs -0x626FF57481385EABE006376CAA93C0B394DE8B67 = _NONAME_ | V | 0x37A4321F2BDFE62C373DB105BB2B85BC ; libaacs -0xF8F715D52C8E5CD9DC9CE4C3B05624F75BF044A2 = _NONAME_ | V | 0x2E26024289CD701CBADCFFC63BD912CE ; libaacs -0xC1E2BED3DB9BC2D0D8F437EB09618C35B0DA8551 = _NONAME_ | V | 0x8F2E9EC8B80618BCA9F1693443BDC0D9 ; libaacs -0x573EAD798AC36BD8414F5912F9EE7C1AF344439E = _NONAME_ | V | 0xF887E1FDE5D660B31867684EE5750747 ; libaacs -0xEDFB8C2E7F984EA3770AAFE057A12E39D41CA4B6 = _NONAME_ | V | 0x27A16130879550C56B7A9E2027859229 ; libaacs -0x75D5511C6DA5B905927AFA1B9C7B443147CC1746 = _NONAME_ | V | 0x2E0CEF7AA80FCA262AE49A608EB87406 ; libaacs -0x6332990969EADB1A77171D9983D7A7B4F5B7288F = _NONAME_ | V | 0xE4BF9C6253DE6C3550867BBE652CC458 ; libaacs -0x1B1A4E48DAD37CB993225EC6028B0F352187AF6F = _NONAME_ | V | 0xEA81199297DB6CDDE16B8B7FD24E3351 ; libaacs -0x91A5BBF5EDD45D31B7541DB4A3B2F0A8774BF69A = _NONAME_ | V | 0xE0A0378FB550115DA16668F504B28BFC ; libaacs -0xCB21095C54486F7D46560E09AB1F686B2A4A3D3F = _NONAME_ | V | 0x40B2FCAF14D1680B504AC1A9F6E11C76 ; libaacs -0x4411B7C598536876DA713E53EB22D134AA42A8FD = _NONAME_ | V | 0x9CAABC7B45953BF30929CF11B147149E ; libaacs -0xCA77D4DC6A25A91D56006E949CD66CA279E30CEF = _NONAME_ | V | 0x9CA81B63B957348925DF88EF8B10A8FD ; libaacs -0xF1ABD8B7ED54656DE0CD80F0FAA526EF09A50203 = _NONAME_ | V | 0x2770FDAE7356A45D4E1FC1336C4E12A2 ; libaacs -0xD099876D66969BFA5AC097379E9CEF13F6CF2226 = _NONAME_ | V | 0x526EAAAB6D1C3AA98FCEBA5A77F30E88 ; libaacs -0xBCA8F405AAAB0891292E0DF2ED1974FAA47B1897 = _NONAME_ | V | 0xBE18A9623C8405CC49A5718329B38D93 ; libaacs -0xCA896674569CBA0F4961EF3F7692CC0A2A2A16E0 = _NONAME_ | V | 0x4B6FF9024C71B8334DC822960ADB9094 ; libaacs -0xBBEAEBC61CD2378B64BA9F865BFABC9FD11C121A = _NONAME_ | V | 0xB4671C232F4985A42ED17A6A50F2AD01 ; libaacs -0x7D4CFF44D20E424E5110933817845B9546743F8A = _NONAME_ | V | 0x8CF4301D4F23E71270DB518867E207D2 ; libaacs -0x5F220B9861B6BFE165E49375FEBE30A40E4E8BA8 = _NONAME_ | V | 0x1FD1D86E778C9DDAB36533C23B574A5A ; libaacs -0x734078A043F37D657ED040B13F36A67739E6F9A0 = _NONAME_ | V | 0x6F2259F8162F6A353D80442CF09E5D68 ; libaacs -0x586E890C3FC9797304D35E71CC3E1DDC4FD5887C = _NONAME_ | V | 0xE221F6FDCD0DD058FE8C2BF8663F024A ; libaacs -0x3B16166F1760DE75595492EF757A2191074F9E79 = _NONAME_ | V | 0x9B7E80D64082EA065B554A9660813845 ; libaacs -0x2A64E4843B744674D146E2A062DC517FBFEBF315 = _NONAME_ | V | 0x6383F7E59658B9FB2A4F05CF46C60E6B ; libaacs -0x3A653154DB695EC2ACE61EF8D8B61EDA38325279 = _NONAME_ | V | 0xD87DF29C94D31FFDE342816304C0A0EA ; libaacs -0xD1D3E41C4ECDF3460B752409D9910778E59EAD5A = _NONAME_ | V | 0x1BCA0EC7FDB0F14A859EF584AEA8D714 ; libaacs -0x172EB042F22324B5CF15E33A02C30D4D0DD95596 = _NONAME_ | V | 0x1D07CE64FDAA779B33F6F2DAC29419A8 ; libaacs -0x536FC5A60B2298DA2760816489AA75AAF45C4EA9 = _NONAME_ | V | 0xCEDFDB09A8EDECDBFF750712D73AE4B1 ; libaacs -0x11360B6B62F006E81421E33A65D8E40BE52B2AAD = _NONAME_ | V | 0xE46814F0F9E2D0F035CE7B8F71ABD4F9 ; libaacs -0xFB5865F073DC78AB80DAABE14CE25DB5ED23358F = _NONAME_ | V | 0x03F6CC6AEFE2E450A6C4E97C0AA01BAD ; libaacs -0xE8509C468CEF429F02B0C739ACD355A14F6B5C7A = _NONAME_ | V | 0x45C529AE0CA73DC2E7CA612CBD52943A ; libaacs -0xE362B3D272FE505AF806146656F75EB427FDA93C = _NONAME_ | V | 0x57B6B2E51A70472AF0DEBF687A5B6484 ; libaacs -0xC0CB6A54600570902BAD5CF883DC693EBFBDD8BA = _NONAME_ | V | 0x12EB0A6F535282A2B33285385C9240EE ; libaacs -0x3DDBB6242FBD1BB4FCFADBE829FE713373E05E2C = _NONAME_ | V | 0x93F17F36D512C02CE67FE6E3F5B7BE7B ; libaacs -0xD7E57D691DF4486B4646AFBECCC62D4B23580C94 = _NONAME_ | V | 0x24D43ED7157E5B98EEA1E476A5DB5C77 ; libaacs -0xFBB5E6DAE256872922DCB542CD67DE8460FB0A46 = _NONAME_ | V | 0x6E98DACC460E42AC0138EC02CC9BD58A ; libaacs -0x80A9A9CE4083EFBAEAD08061137F0D7A88223DD7 = _NONAME_ | V | 0xF5039D3CC2562B290A58D9865EDC8B83 ; libaacs -0xD2C6D9DA31AA41EFC7FC362025D99242D91F37CA = _NONAME_ | V | 0x040B998F6B45B397E9CC874782A013E0 ; libaacs -0x0CDD78E37818BC4D2D57A4613B22075E86FEE87E = _NONAME_ | V | 0x444EB078575405E4A010DB024A6F4AF0 ; libaacs -0x19FBDA8DDEB5F6498DD34E2DA5BCB040D0E23E71 = _NONAME_ | V | 0xC316A7F6A2C18AE413290BA9018DEE30 ; libaacs -0x9AD54532F1276F77CD4A129D65CDD0F4C0514EBF = _NONAME_ | V | 0x90D3255F88C33B9911A29BFA95BFB761 ; libaacs -0x164921F4F185A6BA0E1C1F3197C3089846FA0C01 = _NONAME_ | V | 0xBA48AF88B9B0B461FBC2BA93EE271FF2 ; libaacs -0x6DA1264000A7580E59E98A6D01335AA77FED1B41 = _NONAME_ | V | 0x32EECA61DE18814156EA75DE43834C28 ; libaacs -0x331F9A5FB61C8F597C597834A2E50C84EF84CD75 = _NONAME_ | V | 0x9D4405DE5DEB489A7BB7F3FABB6B6ADA ; libaacs -0x57E821070C0F86FC9FB9A55D2D1F6917E32C3C7A = _NONAME_ | V | 0xDF45A0B284F753EF1F4F89E9C5608A26 ; libaacs -0x07AA5169B590555714422868B268256CA5493E07 = _NONAME_ | V | 0x80BC25B75DE1AE676B4B641313C6B7F1 ; libaacs -0xBF4308F99D1829953173B1FE68C4757B085374AF = _NONAME_ | V | 0xC00323DD6ACE576530B99966B6B9E762 ; libaacs -0x331199C07399C36ECB23E3284C03DF447F8B448F = _NONAME_ | V | 0xADEB48EBF91512934AA7D232920B9907 ; libaacs -0xF204A992C79AF7D7CB84B952A282A0BC98490B38 = _NONAME_ | V | 0x14FAD24E1532F0D1E97FEBDFCB1B594C ; libaacs -0x24D1E41FA358650F5355DA51E00142C929FFA9C0 = _NONAME_ | V | 0x98F62B6B965EE90B70D3E6BBFA63FBCA ; libaacs -0xFC07D43C4B550068F136FDF035E4E42B471E0147 = _NONAME_ | V | 0x76D25E2CCA0789ADAC272063A518F71C ; libaacs -0x62B977305060CC53D2FB27A862B417B02C490646 = _NONAME_ | V | 0xAC159752A2FD45C8AB2A90F2CE493CD5 ; libaacs -0x812D009EF6F965C4AEF17EE3E28727C6232EB84D = _NONAME_ | V | 0x10C596362C3484C3B5CDD1FAE121C15A ; libaacs -0x08332A017F90EDE6736EEFEF07A2C686E21CAD64 = _NONAME_ | V | 0xCA98DB15CF337D8AEBB31FE063DC21F1 ; libaacs -0x8058AA4F41C66307FC04746512DF4BFF2920C931 = _NONAME_ | V | 0x4AEC61FD0791ED73BB197091BA480777 ; libaacs -0x655E67484F36F5734ED4BDDBA3FBC2CAA938ECEB = _NONAME_ | V | 0xABC2457BA0055C2D3AE9A953FE720E0F ; libaacs -0x8EE40DB5403EB5B9ED2A34BE66081ABD2E42AE32 = _NONAME_ | V | 0x0E4EB5C98DFDA76DB90715FD7E3BA55F ; libaacs -0xFB63F4FB21C9A846A570539185663570D7D28165 = _NONAME_ | V | 0x7B9419A783F45508DCCFEC32AD11B62C ; libaacs -0x9FA5B751A8745D850471BDC4F89D42EF12ED619C = _NONAME_ | V | 0x44B0955B3624B5FE8E175D722D3FC7C8 ; libaacs -0x679590A43FF867F8C427C47C414E763A27E10E0B = _NONAME_ | V | 0xA895B0070D8DBC1FED34BED0D45802E3 ; libaacs -0xD2560145D239E20324640F1B6D01629FE5C97D41 = _NONAME_ | V | 0xA36B2E259249E2E0EEAD33D3B48CB3A1 ; libaacs -0x43F5FBD1487B73434D7D6D288C7F89F9611A9DC9 = _NONAME_ | V | 0x7B93841088B84073490B00D8E023B4B3 ; libaacs -0xFEB0671BCF1FA2DF5194C738CCF581E540FE1743 = _NONAME_ | V | 0x5E55A1FF4A3B6FC4FC1EA2AF8CA35E1F ; libaacs -0xB95DB65CAFAC4E94AB0DE59B04E50535C3D862D6 = _NONAME_ | V | 0x49D08780FB6167B88D3846479A0A8B65 ; libaacs -0x83C7BD890A862A070EEFA30A0526480949378BFF = _NONAME_ | V | 0x62548A8E281C57D4B0DAD34626FEF0B9 ; libaacs -0xBC34A22C65C608C81F26775EE78F2A93342C6C7F = _NONAME_ | V | 0x3E0B0B15DFE3EC20DB821A8C1D460019 ; libaacs -0x915A7110A6808CCE795B5468EC9565DCD678F0C0 = _NONAME_ | V | 0x9302D3B3E4AE9523F350190878BD1205 ; libaacs -0xCCFB1BC51DB10B940E37FA8EE0CAF651FFAF3FE8 = _NONAME_ | V | 0xDA1AE6BE69C70C38A9E8CC69AFBDF569 ; libaacs -0x894910B7A88C221B6F59E1CED836CCB6ED5CBC66 = _NONAME_ | V | 0x118EC96454D821CC2992CEDC0E9467AA ; libaacs -0xED1C41796B0DDC57829C01F27683036EE1486EB3 = _NONAME_ | V | 0x19249229F53D8D3497B9F36768D99F98 ; libaacs -0xCBB7231B33D8B78B7202365A5F33DD1C60C3F198 = _NONAME_ | V | 0x2FD07B545E9E83AFF74E7E9DE98152FE ; libaacs -0x0CA81E0FFAF1574AB56C8BA2B373E63DE8AC45DC = _NONAME_ | V | 0x19590298D6D6E88F0D3751F05865BDC3 ; libaacs -0x652C1F09276C145C74A0D95D968AB3D36F337B22 = _NONAME_ | V | 0x6BC7C8F65CBA8B1F5524101424C4551A ; libaacs -0xBA959F74CD85B00DD8DCC15CE57ABA4DE1261DFD = _NONAME_ | V | 0x2997D8B0E9CC62392E2D771A1A47D8C2 ; libaacs -0xEDBC816AD86FBB831EE6701DE21935774531CD2B = _NONAME_ | V | 0x7BF81C74F51E21FD95EDD23BEF321AC5 ; libaacs -0xA57D3C90C1BF24428CD2A41C3E7327E8E2C64BFA = _NONAME_ | V | 0x16394D2ACAB3020D4AD7BF9245DC0EC5 ; libaacs -0xB85765F3F6BCA1BA18862E0CBAC6E8707D8A1241 = _NONAME_ | V | 0x7E6BA2F221841EB2D90E999475F9AF21 ; libaacs -0x34F0E0276E6F51DFCAF0793119699F6563A42DB1 = _NONAME_ | V | 0x80E8F19A462A410876785AFDF789C8BD ; libaacs -0x828CBD96BBA8A54771E49BA05AB254F79B6ACA63 = _NONAME_ | V | 0xB529617D9A77F917BF48A241D0EEAFA8 ; libaacs -0x2A87E667191A2C1EE710B015B518665AB7B895D8 = _NONAME_ | V | 0xDF850278C4FF28948F491E211B8A0AE4 ; libaacs -0xD8BA588C8263A0A7ECBD4C450999737774FF8EB6 = _NONAME_ | V | 0x8212F6B5E39295A400BAE7FA9A362373 ; libaacs -0xD0542B017BDF919E588C014163666D9C4289A688 = _NONAME_ | V | 0x4E6B9F1AF6AC261E12D8BD5F4BB879E1 ; libaacs -0x1A31C27E8E21266C203BE39BE4DBE723C34B0135 = _NONAME_ | V | 0x8A517BA9FB4F32E4CD9E5026BB28F060 ; libaacs -0xDF62EBF1139613C73F65D40DB988AA1505AAAF38 = _NONAME_ | V | 0x3990B0B1B0FCED1ED66E006928180339 ; libaacs -0xD0F442CE9FAF61AD8D1973598085BE816A35FC32 = _NONAME_ | V | 0x6C5BE568A99DBCCC921D3BFFE5D47456 ; libaacs -0x4BC59BABB98FA8282D14CEE7E901FCD7740400D3 = _NONAME_ | V | 0xB26B73343EEA6832D7290F3301B61A3F ; libaacs -0x0A2E4951EA8DC06A2E260915A4D04CAA6773B3F3 = _NONAME_ | V | 0xB78DF2E48CD341F3DCEF864ADE5D9343 ; libaacs -0xC21733BDD264E0A14C115A118FE3EB8CA870799F = _NONAME_ | V | 0xC2A7FB5F4B1FB1B9C08F2A1B3CC14CB1 ; libaacs -0x6255171328170E57F808D6D5DD1E047ADFF883C4 = _NONAME_ | V | 0x7D50FC89C54EF588648DA88FB4DEE4EC ; libaacs -0x55DF58676A663F27F0EF0ADF57B282D8D0345569 = _NONAME_ | V | 0x11412AF6F825BB61E402D96C3E7EB2E0 ; libaacs -0x1F8851B03D43E55CC242F2E165D2927E7EC2C0C2 = _NONAME_ | V | 0x0A108F698B002FEEC41F2342E977FC79 ; libaacs -0x8ABAC56634AFB8EF6D07FBAD1CC788206DA7E3ED = _NONAME_ | V | 0xE33B89E3ADACE5BBABC9BF1BE0880441 ; libaacs -0xF87DBA13EB2F055065C617643730F3B69AF94966 = _NONAME_ | V | 0x1715247B19F4C4C4EC7F162B45934176 ; libaacs -0xDF6B190F99E13DCDE7D261B97454944086C955FF = _NONAME_ | V | 0xFDD6ADD1B0BE544041EFF89881BB64D0 ; libaacs -0xE75424FE3BF49478498ECD394B6425F1EAFB0594 = _NONAME_ | V | 0xAF17270267ED4C94FD688550BF744932 ; libaacs -0x268A82903F3C93224EFD89D6A83FDA470D509B9E = _NONAME_ | V | 0xA2C5BFFAE1182AF0EB74CA4AD6CFDE52 ; libaacs -0x111C7FA5B4D2059E928F4580829680281FF3A02A = _NONAME_ | V | 0xADFBF89BC0D25D91EDD033E2F0D812F0 ; libaacs -0xEAC0D1305FCED62C7C81133C50469740452CD05D = _NONAME_ | V | 0x3E24AA96618257CB90B1185ECF059ECB ; libaacs -0x24011F4FD5AD41E0972D83A0AC8EB74DA721D061 = _NONAME_ | V | 0x4A8CE7D41FBBD7F4016F22D167596E58 ; libaacs -0x48E25BC4918C14C6ED1E2064625242210C7C54C3 = _NONAME_ | V | 0xCBB847C1A6FE2B8AC851174642CDBDDD ; libaacs -0xC296DAF84CC318F97A76B5192F8AA587605A530E = _NONAME_ | V | 0xDCD5AE3F7BE847D1DF14A61AB4A46D6E ; libaacs -0xB200039606B9BBF7D397F698DBC1E57FA41AE32B = _NONAME_ | V | 0x7BDC361D20DAE8F758278813B70A860E ; libaacs -0x96449471B5EC95D565B4198CD5832D2EAECF8224 = _NONAME_ | V | 0x773AF2B115C937C5BC01A5E05445EF2E ; libaacs -0x5832350B288B8005FB54A7B63B5DAC272F351A1E = _NONAME_ | V | 0x36DAD617D8AF17863FA275DE5156518F ; libaacs -0xC1C230CC07E5101235085AE51CF69D027EE7AC00 = _NONAME_ | V | 0x0C0DCABA893456C2AD2176785F93BE1A ; libaacs -0x4A7FF59D0EDD3BC25DB6DBDA687E55BA6ADEB754 = _NONAME_ | V | 0xC7C13DF26B74AA1E6B5DC108929E2107 ; libaacs -0x93E268C22FEC5EDC855923B16D83F48CEB957C5F = _NONAME_ | V | 0x0E3522CE7BF970F71A85E5E5A77F8A1E ; libaacs -0xD993873B3081AED98DC405FB35ED383D498C0957 = _NONAME_ | V | 0x98997FAC0A66490F64F9FC324FBF7A04 ; libaacs -0x3AF096394E6A632AEA0B25808F93402925F099F0 = _NONAME_ | V | 0x8A4B1DADD8F8FBDB6294A82C65CA7326 ; libaacs -0x17B27A45FA674EBC64DC27837A8794C63F2D566E = _NONAME_ | V | 0xFBDC9F269A65C092729BE1FB37874DAE ; libaacs -0xF251A607B5F56B722796C73729CA17C520759F84 = _NONAME_ | V | 0x5256FCE5FF5B5FC639600309107C5FD6 ; libaacs -0x1F5396514CA9D8A63A9BAD532207066DEC49AE22 = _NONAME_ | V | 0xD06D786B8FE1D2FF79EF0AE74D078FC2 ; libaacs -0xF1ED32F29DA61E4689F5CBA76F177BF70AF9F196 = _NONAME_ | V | 0xACB527DACA42DAED7F69ECBC347CC062 ; libaacs -0x5C427E9D1D742F3D562AC315D3E4EA6216217CD7 = _NONAME_ | V | 0x20E80CC7303F5DEF42BA4D91A9AE4759 ; libaacs -0x998AD1A4BFCF092B962386A822254033A55B4949 = _NONAME_ | V | 0x581FDB00507F002B0B871C157D896970 ; libaacs -0xCCCBC6A9810B77CC7044269A300AC3F7A4B8DF04 = _NONAME_ | V | 0xB98AB83D230E8FD950FD6601BCE2F769 ; libaacs -0xD5AABF6C64C0BABE2CC2AA62F9C0D967B542A415 = _NONAME_ | V | 0x61B82C6517F9F814F62D887FEEC27B4B ; libaacs -0xCBB9AB7484D4C0EF833780BA9E5AED960B0F63F8 = _NONAME_ | V | 0x4350DCD155C2774FEFFC6663EF6565EF ; libaacs -0x9BF0B5660FB6C026D4097D23DFA0B81EDC0271CE = _NONAME_ | V | 0xAD65BB4D3129E3DF7A54108D2D0B7982 ; libaacs -0x6AEDD8C992F16B7580576407C24D8D90C047B4B4 = _NONAME_ | V | 0x5616CCF6E4F18EB0D324D5104076C884 ; libaacs -0x2749A9BCD64E3F215D9EE7891ABAF4B853546442 = _NONAME_ | V | 0xA4A650541CE4D28A50062B4413BE62BB ; libaacs -0x8E09D409D4B0FD3A1C6515B4B2B3F1531482E024 = _NONAME_ | V | 0xA30F291CFF6E620215F7AEE180003A60 ; libaacs -0x7CDD7FEF8C539C67586C2EE5C48B5371585060AF = _NONAME_ | V | 0x4838A4C0E88DD5C0EC186F3C3BB44B84 ; libaacs -0x2F332286F03546D69439C789F827FB1E877E5450 = _NONAME_ | V | 0xA824DE6BAF5C2EEC721B7B2B516A4974 ; libaacs -0xFA502D1556EC1F46F2BF88C009C91B2B574EEDE2 = _NONAME_ | V | 0xCCCB286E8B531F30DDC6E46B44CDA994 ; libaacs -0x183E0A416AD03BBDC9ED9A67BE8F5FB58D87A676 = _NONAME_ | V | 0x955694B6E3FEF7E32013AC7095C06825 ; libaacs -0xD3CC21933CE49E3B511FD4EFC214B32CFD0415A8 = _NONAME_ | V | 0x816C4942AAEE239192D6B57D47B06BB5 ; libaacs -0xEF0D2E5AC24B3755B8C29928D3AAA19524C41A48 = _NONAME_ | V | 0xADBCE63654EE03413D81DB39A78E18BE ; libaacs -0x3E24658DFF612420824A1012584A72E0B3B7037A = _NONAME_ | V | 0x9A959431DCEFDFC0A74245FFC3D622B6 ; libaacs -0x44C11BE101148D47C484A49F9D16A543301B6BD2 = _NONAME_ | V | 0x2A3BE5E852B2D4C4DE3E907DF715CC4D ; libaacs -0xB6F443696183DB6F45D18F9F01B4A322E5F023A0 = _NONAME_ | V | 0xD4C959CB36A1727ABB07FD42965122B1 ; libaacs -0x5377DF6C11AE94804D08EBB1DD868EAAEBAB7B89 = _NONAME_ | V | 0x21525998912D3689ACE6CAF324E2C90C ; libaacs -0x2F927AEBF257CA31E8055478648EAFBA9FEC1B74 = _NONAME_ | V | 0x03E93253D3376D9DBD704A962A8EFFBF ; libaacs -0xADD56A748E9118BAD848D7CEA264CD3BAAC1CF8B = _NONAME_ | V | 0x8124C34A1BB5A1110658E1E980C6DEB0 ; libaacs -0x62F156B065F64869A935232411A92AA38506973D = _NONAME_ | V | 0x1C8537115FA97168276E9A3698C81558 ; libaacs -0x6D9AEA41E62F02D49664D0957E71175FDE1840BD = _NONAME_ | V | 0x749A083C3DE703C6B9CC7F31AD490CE5 ; libaacs -0x14CFE1C20B63807F43A73791BB3C71B18E241E7B = _NONAME_ | V | 0xF2B8FE552CF25B7FF9C4EAD461145D05 ; libaacs -0x72EE28A205A0AC2E4699EA32FDA0CBA3EEF9A642 = _NONAME_ | V | 0x6CEE7D7488D1FFCBDC4AD4F15DA118C3 ; libaacs -0x79F4019951208845DD44513AFF1DE049477CEA98 = _NONAME_ | V | 0xD99DDB537671ACA0D8990F45B25D127B ; libaacs -0x83E726F1B58A7895EB97A6ED63E1892A4F4454B3 = _NONAME_ | V | 0x6C5CD92789B8D64D551DCAA8B04120AF ; libaacs -0xF08BEB95D1E19FBF8AE0291A94EA3B7795C13040 = _NONAME_ | V | 0x10416578560AEF395BFDC6515EDDE2BF ; libaacs -0x422B9BD8C59AF2961097709A9418F39D6D8230B9 = _NONAME_ | V | 0x559E8C017A03AC583817AAE01AD620A2 ; libaacs -0x2C001660C777E6D3259A5A0E1C3476F28B041608 = _NONAME_ | V | 0x4A91733369011792D15FE02D4CB464ED ; libaacs -0x4B6BB042005B663EDA8EC141B01B1D95626BA8C7 = _NONAME_ | V | 0xA61DFD7E13D28E28AE58B429500EBEC3 ; libaacs -0xAD4D82E7C9BF2FC11FB1ABA6DB54D7E3E3E1023F = _NONAME_ | V | 0x3CDBC1B46A53B499E9F1F7413C4C4EC6 ; libaacs -0xEF3C4268ED7629A7411D62C64A7A4B618CB90184 = _NONAME_ | V | 0x238985E9F85038535C0368573D417F5B ; libaacs -0xB41F88A8CC378A61DAFBC30B04F75713C88BC4EE = _NONAME_ | V | 0x1C1133E96503C621FA33C40A2EBAE301 ; libaacs -0xAD084DC5CF76C508C76EBDB0772C19448C779A59 = _NONAME_ | V | 0x7A806B3E6C7ECAEA263DF6C73F5691FC ; libaacs -0x785505E0FEC2E87F51683D3B8958F2E86418FA4F = _NONAME_ | V | 0xBFC6CE781FDF13DF6FFE6A0769BF92E0 ; libaacs -0x877C2C6D05D45E8D5A5262575175556269284008 = _NONAME_ | V | 0x957FF83F4D87F855F752668C1C99256E ; libaacs -0x79F8D5452127CC616E9CC5C258E520EE807F8862 = _NONAME_ | V | 0xCAB895D57650CCC7A5F6A53A7B942D24 ; libaacs -0xCFA89429833022418E73530B7111930E9294AFAF = _NONAME_ | V | 0x5FF45FD7FDE9786AF9125444C215A2C3 ; libaacs -0xEF09DBBF9E949C1CA017424ADF1F9786F75F5253 = _NONAME_ | V | 0xA9975CB7814DC774F147DA93C622B19E ; libaacs -0xDD33402B3D50ED4AEC48D306C904B37BDB596BBF = _NONAME_ | V | 0x7D06285DC90385B0900337E1D7CE8069 ; libaacs -0xE0E09D6905D801C0BFB3F7166932ACC211AF8336 = _NONAME_ | V | 0xA14BEF46A8DD7ADFB564AEA47440BE92 ; libaacs -0xD56246AB3214AE537864E7D980BCBF0ACA327B98 = _NONAME_ | V | 0x181EDD483064DEDEBDDAC6F5EDDA8609 ; libaacs -0xD248AADBE7F35553298F64AD444177EAC733F448 = _NONAME_ | V | 0xC6FF9253CB8D74CD1FA758C2A8951EDB ; libaacs -0xD18646B1E5236DE2C73FB08550F299BF0AFED584 = _NONAME_ | V | 0xA0A41FDCB99647280C48E07C34E1436D ; libaacs -0xD0C472D301DD4ABD1BB90A59A80FBC78012ACEF0 = _NONAME_ | V | 0xD19CD6CC8C4B26B9BF97992261D09EED ; libaacs -0xD01616586DF321506869438582A94B710E50B7E6 = _NONAME_ | V | 0xAAE316AADFDA8FA1CCD72296E1564C20 ; libaacs -0xCDBBD9EC0BC67D6C1F3A2220B04A1AB150687335 = _NONAME_ | V | 0x1E6C7AE2CC22B49D0D0168FC52E8E3E4 ; libaacs -0xCC53B028F9F7BC5E24BF5D6B1C5A7FA90C98D8EC = _NONAME_ | V | 0x01678E8AB1A7359919FAC4471B45D851 ; libaacs -0xCB467E5B603450D7E95E20EFD91716B223CD0CBF = _NONAME_ | V | 0x5E551C281EAA5DFA7C91AE9DD31C9528 ; libaacs -0xC947FC2B5281C74B6F07EDFFF3BC0282BACA4208 = _NONAME_ | V | 0x95AF815E0CCE8105C62D96B4A9C14A2E ; libaacs -0xC6A5F25A2577DE4217C284F04BA93DD4574452A9 = _NONAME_ | V | 0x70108A2437B6402EB92FBA1DC2F714B4 ; libaacs -0xC649B404D13CAEA86287DBBCE3A7B8C96F88BF82 = _NONAME_ | V | 0x103D169C473B01301A38855A8078F8F1 ; libaacs -0xBFA6023C4CED56DDF31594426B40099A5D2AE220 = _NONAME_ | V | 0x33D1841F464DFA0B1AAAC4597563BDD6 ; libaacs -0xE3D60F4C86A5650B23E03425671F25C3528506E6 = _NONAME_ | V | 0xC3068D638B0E1C99B892716ABDFB45D4 ; libaacs -0xED8E5675B9FD5E02C69B46A59331191C4687C748 = _NONAME_ | V | 0x0CA905C4AA388BD4FD533B2E40918DC0 ; libaacs -0xEF7D2603DE1CA2D2F520403FFA2BF0AB6D7226B9 = _NONAME_ | V | 0xA8261DA52BD8F0A22A464261DD0A2E63 ; libaacs -0x28908E72F68BFE75C4A62374D5EC4AE05370A00A = _NONAME_ | V | 0x0672829AD8359B72209511F8EC0A8330 ; libaacs -0x66E63F9C8B4265C0CA58CD9B20C10FBEB219EFD2 = _NONAME_ | V | 0x43A706957EABB45F76BBACF90A780F48 ; libaacs -0xC4E9D9B93C67AF18968B6F5A868998DD1716A55A = _NONAME_ | V | 0xA26E8E20724B90EE76C7BC4C841C5E9A ; libaacs -0xB4C14AA31F07B72853D484CF1FDA054B81368D78 = _NONAME_ | V | 0x4B06D608AD9A3277A612BEF6306A2887 ; libaacs -0x03996B61722E6D854FDC4CC8CFA1810CAA06E4DD = _NONAME_ | V | 0x43F5D995D2C1D74082FCEC8C88160553 ; libaacs -0x01F8FC2F8346BB7BD879B45A772CCB9F4A810759 = _NONAME_ | V | 0x69098CD232E76FD6DC793C0467528423 ; libaacs -0xC6F1FA474C3E56B2DABA197A4657CA77283A3559 = _NONAME_ | V | 0xA94BB2C39730278AC602641CEFF9DC73 ; libaacs -0x755F91964796C5A2E4F3ACCD96E86E9371A79672 = _NONAME_ | V | 0x9A36E68CBC42C16E38B21DB88EAC8A08 ; libaacs -0xFF507A3DF948EC7F22B66E1051B909125FA83A08 = _NONAME_ | V | 0x23F1033A6535884CBF7863EC1DD77A95 ; libaacs -0xFF1EB210D5BA8321AE1C3008FB957F043B961E46 = _NONAME_ | V | 0x8ED713CE5255B1B05391DA5853FA77AC ; libaacs -0xFA5177E5A8BB6ACB2D46D7BAA99EE602CCA161B3 = _NONAME_ | V | 0x84AC4BDFDF069B03FE9AE4D25F73FC34 ; libaacs -0xF6882420409CA2E90B662E60C67939359A2263C8 = _NONAME_ | V | 0x72B800524BDAE4255F3B3DA8484E6BB1 ; libaacs -0xF5CCF634D186A1CCEE35B028F4FABD794A46E3DE = _NONAME_ | V | 0xD723B1341C87931FDCB26B6CEEB69F59 ; libaacs -0xBE5511282C2FDC3D2E8C0F2629FEE31B6316F6B6 = _NONAME_ | V | 0x2ABB629A420B8EF401586FF1576C756E ; libaacs -0x65669870D7F23A3F6BB108E3B748950C5A543485 = _NONAME_ | V | 0x33563384505C292FA92E5D57AD1AC8CE ; libaacs -0x7BF0D0095AB694A0D10AA8593D9D37FBF7507EFD = _NONAME_ | V | 0x39F0685E284F6F9FD4E1257109ED7B8C ; libaacs -0x4BE158FB4B1489B6C03AF3396DDAA428994D6133 = _NONAME_ | V | 0x77C08E5DF6B59228DBEC83C78C5E841B ; libaacs -0xC45214B6B952B1B82B3B1749A54844E502DD1ADE = _NONAME_ | V | 0x32C585D526316967998FCB47301B4E1D ; libaacs -0xC1DC737B386E75108F7559950327CB6CD41FAB80 = _NONAME_ | V | 0xDA3C17C31F7147ACF1AE43921D187FAE ; libaacs -0x9F602A9C56573FA5F708DA2D076E054D38DBE9CD = _NONAME_ | V | 0x53301F706527CA153EF6EC40F5A3A266 ; libaacs -0x85A0BBC2633F36292CE0B55D7265AFBCF56B90B2 = _NONAME_ | V | 0xBC191AA35E94685A5AF0E027EED77E88 ; libaacs -0xE39CDB251F064C79877DFD4CE6075FC9BC735072 = _NONAME_ | V | 0x928EB0EAB24B46CA9AC515F925C43B77 ; libaacs -0xA41F8EAC095D7E247A6AFD3F2CA5155214405098 = _NONAME_ | V | 0x00AA6142DA1BDDDF94984DC95F54FAE9 ; libaacs -0x5B4839D75F5F74CA07DB9462E3A90639C31C5564 = _NONAME_ | V | 0xC463B2853C4162D47B7459DC42FBB01C ; libaacs -0x376C1F2EDF6FBF134EACEF6C6923D9B43EBD5C14 = _NONAME_ | V | 0x7A2411CBEACCA16DC35BAF36C6E91A95 ; libaacs -0xAC5992ABEB516A8FB5EBEEDBBC09275D4C7B0D64 = _NONAME_ | V | 0xF82DFD3B57D8A4C5736DBF235325F831 ; libaacs -0xAE8A66AAAB0F5F0EADD597F8357F523A74F2498C = _NONAME_ | V | 0xACEF4AF2BBCA907BB7DF6BB02423CACE ; libaacs -0xF2FE9922E01D597F6B72AD4683075D860DAE5CA6 = _NONAME_ | V | 0xF8A003C73BEAC349D06A892E5D955B28 ; libaacs -0x3F8D871B2C5D5F4699305C7D7ABBA21309FAD3B1 = _NONAME_ | V | 0x9C32CA124848A7D8A5023C76D77D7D6D ; libaacs -0x6B4AD95C887DD0BD0C8D8A0BC93B911DBCFD4657 = _NONAME_ | V | 0x199F827BD412FF62CAAB2343370B182A ; libaacs -0xC398C22E39B7E24C6C6A43EF89A703EAF2815922 = _NONAME_ | V | 0xB1794DFEE977D4EF2F56B2275FCE348F ; libaacs -0x3F4E0F1E8B40F9A31615BE4CB78AA0A5F93DAF07 = _NONAME_ | V | 0x5F0DDE398C6DDAFD6767CDFD2FBF9F87 ; libaacs -0x922B94F31DD714CFD4DD07AF7804AD0260DC8E6A = _NONAME_ | V | 0x1E716C10CB7EF0BBCB8FC7B760CD3188 ; libaacs -0x045D3057FAC1E0A0E89D9A9C886813E062E51F0A = _NONAME_ | V | 0x44516343364A11038A4660907A35E145 ; libaacs -0x1422D70CB7513190D9A9297BA7199644CEDAACCE = _NONAME_ | V | 0xBC624AF1D2D2E48E754D349E47DEB6E5 ; libaacs -0x5E7AAAC1D1E4E0A5D2F4E4C00CC4B4341D92D0C5 = _NONAME_ | V | 0x3E118A8E5E93E78A84360C4A74B136AE ; libaacs -0x43197FC302E54B4F7FA02D93F800E92314758CF8 = _NONAME_ | V | 0x3C71D4F8B27F6D64543B1993AEF55768 ; libaacs -0x99DB7F45275654AABF1763EFAC4D88FD18EEA276 = _NONAME_ | V | 0x432CC41DAE7B0FD8E038D9C210DD900A ; libaacs -0xF0C42558C8C6EF63F3012B6F6574CB30744C410E = _NONAME_ | V | 0xCB197866781FEA49DC661EF2607DBD64 ; libaacs -0xAE6FDE20E3A8F8310A13D8D009A465E25B5E1960 = _NONAME_ | V | 0xFC259E002318E5E95164A6B2ADD56652 ; libaacs -0x7A17EC4EDBB2CBFB8E81396CCFCDE5862B115145 = _NONAME_ | V | 0xE24A5ACE3466F0648C3E9959AF9A1E82 ; libaacs -0xC8A930D33210536DAC0F755CF6F687797350092A = _NONAME_ | V | 0x0CF30D51541EB43BCFF4FBA4BF09AE86 ; libaacs -0xDE8104504E44CD81ECA003A72DAE7C3E26E1253A = _NONAME_ | V | 0xD5A36660E27413CD05574A8504F343BD ; libaacs -0xFE99EF9B9F284EDBAD486CAF2B20AA86A9C2872E = _NONAME_ | V | 0x8555A3E16AB15E2549A8304F22EF5CBD ; libaacs -0xB7D04A49264F045F8BCF0CD66C1C3D74D4B513BA = _NONAME_ | V | 0xF75B65F15F7266EAF823657535F13714 ; libaacs -0x15F75AC534E1793075B2E250FA475863A70125F4 = _NONAME_ | V | 0x80884156518C034783ABAEFEA21EEBA2 ; libaacs -0xA10C6096093D05F87BC15E70C1541887CB764199 = _NONAME_ | V | 0x58D9556DF7815B6843335C0213789DAF ; libaacs -0x31FEF198EF16144BB8B77FA9951E6BD17B3F5293 = _NONAME_ | V | 0xD74B26113DEE9E02290B204E1AE3177A ; libaacs -0x45AB2C3EB5BE3A601A5C533493BA500998BB8D74 = _NONAME_ | V | 0x545E7C1B50C7A54D6D5C1DA835D39FC2 ; libaacs -0xCB26F4CB944FFFD0CE7A707A2DE3E4A286442DE6 = _NONAME_ | V | 0x5FBFD55E78562DD4FCE3116D052AB521 ; libaacs -0xB75DFC6D4DBC93B24B75FB8C6C544746422008F5 = _NONAME_ | V | 0xF91CC989EA0ADC7C29233D1C5B2C138E ; libaacs -0x2A3CE534D09C6F389E76B5DAC59F824DC0723141 = _NONAME_ | V | 0x7DF0A573D617F7E05EAD2C4F42A2133C ; libaacs -0xB251E479930A2129D468A8096A8F7E52DC1DBF3D = _NONAME_ | V | 0x0DCA109AC24CAA476C8BD0010F76709C ; libaacs -0xAA5F1690EB587954C6033F7E9188936023186809 = _NONAME_ | V | 0x5F2C75252C7734127E96A19797275170 ; libaacs -0x832C58A1DA552559B371F2323A0384A8CC764E9C = _NONAME_ | V | 0x555CEAD060BBAF7329CE7ED4E5079363 ; libaacs -0x3D24DCFF5B6716C0F85D030567DD37249453367D = _NONAME_ | V | 0x2BF78B0448AC0B84AF38DC68CD522340 ; libaacs -0x363427B93FC37F77209EB4D3D0848D72802BF85A = _NONAME_ | V | 0x1E7ECE106231F17551A276BBE3606A42 ; libaacs -0x262AB4ABB0DD0BC97CC82C3704EFA06CA61F37F9 = _NONAME_ | V | 0x675D0D906989085FD186F9B9B8007BE8 ; libaacs -0x207366480BB032DE7E84E1081B4F556CDEA15D17 = _NONAME_ | V | 0xBA3B78CB6E8284C7BD48D70DE738C68C ; libaacs -0xEDBEABA0779DC9A265F47E2D52AF5D06523C7EC4 = _NONAME_ | V | 0x26FA9D4DBE3227C3ED2C9B2A8F0CC0C9 ; libaacs -0x7B4566B30024E2F62775C826FDA60947582FD8F5 = _NONAME_ | V | 0x22F3A722C44F56D9B36EFECE9C718556 ; libaacs -0x618DAE1EBF8E1ABCDCBAB8319E845AD044CF118C = _NONAME_ | V | 0xD432EC099080E24AE553CA7808F3DBDF ; libaacs -0xCA9977CA8692EC75790F0D17237287335E1AE24A = _NONAME_ | V | 0x6BC2D866B0323541848C2B7FFB16C3E6 ; libaacs -0x50EFF31AA360DAF62B93CEC477C147FF40EC8C12 = _NONAME_ | V | 0x9E2C753DC8860D9B92E8902732025B7A ; libaacs -0xAC338B8944EC12DAD9DC96FA9E7F83337310A083 = _NONAME_ | V | 0xBC3288C41BC9F07F34AE60F856B52F41 ; libaacs -0x52273EFB6F1D92408E7FA6B2ED9516F2BDE4349D = _NONAME_ | V | 0x4A764250BC8334452AAEFECC38F5D5AB ; libaacs -0xB0D3990834F8FCAD983245444E115ABDB9063997 = _NONAME_ | V | 0xAEEAB77EC31AEB10C9492CD46D95EED4 ; libaacs -0x836DC13087B478D5B4D451FBE5BA5C76CEE07272 = _NONAME_ | V | 0x32EEF5B3DF477740A67103E59C9C5733 ; libaacs -0x537EAE57FB629EBD3E6C8AA26ABCCBE95BF6B46E = _NONAME_ | V | 0x2D87333BF83EED14D0EE93C1E73BDCFB ; libaacs -0x0D9442B85C04D8F17CD7430B5F2C5B7D434386AF = _NONAME_ | V | 0xF999282541D0395D07A2DB77F62CB1F8 ; libaacs -0x9596920F186424C6F3C180A18F55786DAE0692BA = _NONAME_ | V | 0x257B3F0DB3E960226F1F5ED16652D2B4 ; libaacs -0x4E75D99AC199E85EF274EE53A7F60ACFA405B0DF = _NONAME_ | V | 0xB4A92A9486A5723AE4DC5D82DA515E8D ; libaacs -0x82082EC595A709D7EC1DBB1A921CDC894A0D9AEB = _NONAME_ | V | 0xBA4121F16E10DDD4BB9834F04203CECD ; libaacs -0x47A54401EB45070B8115464ABCEAD8D26784AE2D = _NONAME_ | V | 0x1D95DA5D0F1E4F565E7C252F068D3A89 ; libaacs -0x1454845A7CA554A42FE96E17209982A53644FAA4 = _NONAME_ | V | 0x10837423971CE055534C44E85FAB612F ; libaacs -0xE1BC2ACF99D41B9EE567F55A8B4C5A5B99FD04C0 = _NONAME_ | V | 0xC9D9AFA8083D3E09B062EDFDAF6AEA13 ; libaacs -0xBA8D5C4E240394B0B6256FAFEE9B6D29ACF0ABEB = _NONAME_ | V | 0x7BE88C08F8564A246E9104E21EC183D7 ; libaacs -0xC6C8029E60B351A7CE78E8013A3868BEEABB9D93 = _NONAME_ | V | 0x2F5A2652F81479B8B24F60E6D4D45FDA ; libaacs -0x33D255F7FDE1393FDF57214F90542E8209BDEF13 = _NONAME_ | V | 0x8725842FAB317B98DAC01B5FC579EB0D ; libaacs -0xB1D1E5BAA63FA02DA4D679BA96626CD3FC56CAEE = _NONAME_ | V | 0x5966350D2C0104C95A65EB2EF9863FA3 ; libaacs -0xAE48DE62A78E5063C2E509010F008457F3328DBD = _NONAME_ | V | 0xD6BA2F9BD072D00851D1736945FE10B5 ; libaacs -0xD70B76F4D289043807B5DBDDD3821807961E72DC = _NONAME_ | V | 0xD26F4D107DB6498688EAE7B3EF85FD90 ; libaacs -0x27095CC361C34D22CDE85CBBF12B1A8866E35F87 = _NONAME_ | V | 0xE822DE5D54F08C41DE1751A6821F7C61 ; libaacs -0x342CEA134F38B5B0DC4A27DAD958E0C03A41DD33 = _NONAME_ | V | 0xC14012C33CE0DAC259E86C4F5410CF31 ; libaacs -0x83EFCC29571C7A6AE83DF1BF0966AF8805397CD4 = _NONAME_ | V | 0x371EEEF12DFF25680B7DA477309EF343 ; libaacs -0xD53FEAA84EBB0F55C45DA5D65A480DC54121EC69 = _NONAME_ | V | 0xAEB3262BC934D8151FAB4F88D0266E99 ; libaacs -0x2C528830155E476F22018878A1CFA4214C9EA0C1 = _NONAME_ | V | 0x875A1F0D337D1FA0AB2FC6C5EBC22AEB ; libaacs -0xCC519CFF473C5B433F1640557BEBFE0A89FB664E = _NONAME_ | V | 0x2E3231846A260DFF76F52B63D0FAA149 ; libaacs -0xB2A9059BC2170D956E2A248AEDD6481E15BD3D03 = _NONAME_ | V | 0x13628AFD97D8AD638CC73617A9F3D8E9 ; libaacs -0x594D7162F86EDB1DAB069D0E8C72F6E45D9D7102 = _NONAME_ | V | 0x9F311934C7471AD185ECB9D368A09E02 ; libaacs -0x7E3704F9B105C56A7139092B95879733B76AB30D = _NONAME_ | V | 0x8FB7806C3A0722CD1B08269485A64549 ; libaacs -0xB16CA120B3EF1AAA50676F9565775EE3D1509E15 = _NONAME_ | V | 0xCB21A273EA07BA381D6CEF6C163BE925 ; libaacs -0xB790AFC1B4750589A6E50536091F518276D27465 = _NONAME_ | V | 0x5DDEFCD79434542E41BDED5D36838477 ; libaacs -0xD7172C13634DC8D415413627B6FD7E1062D14BB3 = _NONAME_ | V | 0x3437B28C80B3E90FF7136C3A1E9F1723 ; libaacs -0xC19CD9CC33B91D74345152C5F486839CF90B1367 = _NONAME_ | V | 0x369454E1C39681E5F195554001B2B880 ; libaacs -0xD17FC92E51DA27010F139B5E75F8FFE2578BFA6C = _NONAME_ | V | 0x0E7410D64258AD5B619236DAC78EC8DF ; libaacs -0xC92E81A5FE685E2130515EB435603DD23F1D185F = _NONAME_ | V | 0xF79DC53C7C4A4A65F30D62FC61793459 ; libaacs -0x76D6DBEADEFB3DB8C533420E5F12E46921A9A5B7 = _NONAME_ | V | 0x624AA79AD0AE306C5317915CBCC23C2E ; libaacs -0x58EF7ABEB38543025EBEAB62A2E11BB08E4CF2D3 = _NONAME_ | V | 0xE49A7ED1568C49D09F5E2001253D261E ; libaacs -0x53441D5ABBB07B5280E4C1000636B7C47582255B = _NONAME_ | V | 0x24209B58F03575EF3F2FBFE291F644E3 ; libaacs -0xCD57232C8FC5D5BD2AA8195237D2ABEEBA45F16B = _NONAME_ | V | 0x1EC25C33FE10217DF806EE4FAA47F4C5 ; libaacs -0x8CEA533A48A564F11CCE85D1D1BE3BE552B65B3D = _NONAME_ | V | 0x1FD1ED066AAC4C60B49319475B6DED89 ; libaacs -0x08CAAC35C4836F560F3FAA64FB5719F8A0B829C9 = _NONAME_ | V | 0x2BDB266ACD433C658BDE151B0C68A2AE ; libaacs -0x9412DC6841F26E6188366867C29D082AAFF845F4 = _NONAME_ | V | 0x1A90FCDEA0DCC5DB637D11A29D2B9FFE ; libaacs -0xC373B822A5906699ADDD2F0C61092E3F99D65A39 = _NONAME_ | V | 0x25009D74CF52A9D53AF2AB528AD0668E ; libaacs -0x0ACE94E91F630C23E4259551FE1519D074449372 = _NONAME_ | V | 0x90706DC4E9C827CF958FA84C1085E05A ; libaacs -0xB79B47E4513B1C09AC12C5818A740E8ED52A5415 = _NONAME_ | V | 0xFDF5F50AAA58D52F9AF4B2CFF595C414 ; libaacs -0xA3CD05C0F42DAF89C5913CA8510778F5C454DD91 = _NONAME_ | V | 0x839F0DB0954633C2B5F4CB9A857CCC07 ; libaacs -0x5028E61DA0DE3A36773EBCEE0C9EB19D00CFABDE = _NONAME_ | V | 0x69B4AAFCCADF7D664786600848A6E157 ; libaacs -0x068A600F808546188DBF496816F46072150070A9 = _NONAME_ | V | 0xA03D6EFE8673591B2686440748AA5001 ; libaacs -0x905F1777C14462A1C4FF2DE988BCB9875BFB86E7 = _NONAME_ | V | 0xBA4CE996D1F8B39B16D8EA1882435904 ; libaacs -0xA926C8DC92910CC718B2B06FBC5AE6D7F7799C8B = _NONAME_ | V | 0xCE190551CC9A3E5C9484F57682962B51 ; libaacs -0x648D3FB1A71E2FC3B259AECEF008A7CE6E9513D6 = _NONAME_ | V | 0x0D623AAB43AE6BE79157EEE0C352E49F ; libaacs -0x05D46EE51BF5519E96161958BF4C2F1AD7F26E3B = _NONAME_ | V | 0x12B6405300E40F99ED3774B86E40976B ; libaacs -0x27A94FAC26A07E536F42D4042188F83AD1653F55 = _NONAME_ | V | 0x7E2EAC59821F691A3C0EF321DA6B26B9 ; Pink Floyd, Wish You Were Here Immersion -0x9B52A29B994984C1CB65E7D7C8BBBB5BCF9A0010 = _NONAME_ | V | 0x35A4846BBB19538F22AED99484D78C39 ; libaacs -0x5277DE1D15FE640A274DEE148F61DBFECAAB64D5 = _NONAME_ | V | 0x023A48189940187841EE8BFAF22F203F ; libaacs -0x2D652F0349685B8660E05F8373EFE3B1B20B5C47 = _NONAME_ | V | 0x47FFC00B95D46EC6E72211DB78DB6CCE ; libaacs -0xED90347E9273BB6DD8967432D14A25E21700038E = _NONAME_ | V | 0xBA411E6459AC7514633FCFE1F81AC308 ; libaacs -0x9877AD5254A6B96A49BD34293B374983F093BF4D = _NONAME_ | V | 0x82FC504EA9D4A652BCA6CAEE50C08F5F ; libaacs -0x2E4047C37AD450E6EE376A72FC31DEAD81666C5F = _NONAME_ | V | 0xBA5141448F825C1BD938A5B37CE54012 ; libaacs -0x077041A3D98AEA86125D69908005EFD584D629AE = _NONAME_ | V | 0x1494C451AE7193E60B5DB18A05F624E8 ; libaacs -0x0316AB202B410F6471E8C5C363F5C443B3C5C383 = _NONAME_ | V | 0x8091648E5951D17063F33FBBFB9BF465 ; libaacs -0xB22D45F07AAC2ED75A1A965F5242E30F4B7D4907 = _NONAME_ | V | 0x09996DBF613012300BB633FDF6D30958 ; libaacs -0x7E00A2FCCC0DAFE1615330271EBDF98D99AEF2F3 = _NONAME_ | V | 0x36286F78996C14D1743806163C81D303 ; libaacs -0x30F0099DD082D060C619CE2B6C48045A608167B5 = _NONAME_ | V | 0x20502B9C438AB3ED59329697DD74C51F ; libaacs -0x1DE122A46D920821F1AE1126E829D3163F3EF972 = _NONAME_ | V | 0x0A4ABE19EEE71A172236C74CB9F2F829 ; libaacs -0x1C12723E632399C063ED749591FEAF0439CAF307 = _NONAME_ | V | 0x7D62E2E67909E293A2E1962277181F37 ; libaacs -0x9C04D3FFF39AE35216D459B6A9B5D65E844C542F = _NONAME_ | V | 0x47B634B045C22F788043CE7A42ABF885 ; libaacs -0xCCF5DA204E69777ED39439EB0ADBA6AFD871D8F0 = _NONAME_ | V | 0x7E12EEF8C529082E44F253DE0D63D4A3 ; libaacs -0x365A467C1FD7977D3BEF1EDA5063D9827BE44AC0 = _NONAME_ | V | 0xA0986394686B11D3F02191E045C179EE ; libaacs -0x991A811D25CE26434195AD47B4FB37506E11B380 = _NONAME_ | V | 0x671B070CD9624C8202BBC1605DC23F8C ; libaacs -0x3ED8087D954A6A74D5DFCF197EF5B89E12C08A5A = _NONAME_ | V | 0x8596926F5CB3A2AF8160187B381E6DB1 ; libaacs -0x0BC62D9A70CD7C01D6CA5C53A20855FB9B7E8934 = _NONAME_ | V | 0xA794FE0E040F8CEFEC6687D6EC395020 ; libaacs -0x9D250BB2CE03EB4239EF3C403155573D4ED10715 = _NONAME_ | V | 0x03B821CAF2C75783C651C73C338A767F ; libaacs -0x7699311BF242B5FA11AD0E9BB5B476BBDD7246CB = _NONAME_ | V | 0xC30790912BFA8E35C31BE96E8185DC2D ; libaacs -0x718846FFB67E19032DC13DCEF4B1BFC20B52C734 = _NONAME_ | V | 0xF56DBFC8813392286CA6841EFD4BD5E2 ; libaacs -0x349097F2FC53278BC1A3CAF914E111DC4737E0D3 = _NONAME_ | V | 0x12091D6022D2CA2C040913097D2FE0F9 ; libaacs -0x16E07B714D49869A0DD1B6808A6416611B7419FC = _NONAME_ | V | 0xB53FFB4CD71ADDAF9CF03EC0DD79C193 ; libaacs -0x6AB79FFE254922372D08D0BAC7B0CD2440F3007F = _NONAME_ | V | 0x5F51B1E85EEE14229AED042AB693451F ; libaacs -0x837EFC9F9FCEE150579363DA1F9F1011E6B7838C = _NONAME_ | V | 0x37D7DA9BADE46E8A7371E36EF9A2DC75 ; libaacs -0x061B70D1C3A8A97E3E7CD83BE69B7102129ABF93 = _NONAME_ | V | 0xF27B516603F8A9B0E1ED5DCA62CA646E ; libaacs -0xCAF90DA0CD678A65517E92C72200664240886DC5 = _NONAME_ | V | 0xC5E55420FA2C4EFD9E0F2AA0D39469DC ; libaacs -0x81799B8D9A4BBD9D23A43B76D56BA8729CC331DA = _NONAME_ | V | 0x5CE348F3E67C3F52E0A0401671CA8E83 ; libaacs -0x0610B1FFA8C0F8B9A7D61FEC62D721529A9EDCE1 = _NONAME_ | V | 0x9A0AA5D17646C20A08AF5139777D44FB ; libaacs -0xEFF589897DFD6AC10BCD7EFFFB526B2585AA9D8D = _NONAME_ | V | 0x0650E69046CD2494583C7A80F968511C ; libaacs -0xF857DE4CDCE03870AB73FDBC96F7562919E5FC75 = _NONAME_ | V | 0x7B4DA1F194E37A9EDCF3C8708476C968 ; libaacs -0x9BD9970D1572BF2F1002E6A8EE6591E43774878E = _NONAME_ | V | 0x8FE1AF055132C2B80FB1BE422DC40C1C ; libaacs -0x592BC32FC4DF709441A932AF49892E7CB5B307D5 = _NONAME_ | V | 0x6D3C3ABF7FB1CBDF35F065EEDA290889 ; libaacs -0x78D314152B88A0CC71D19798D71CA0A6124CD340 = _NONAME_ | V | 0xC568ABD03977CECBEAB5CB401F5381E3 ; libaacs -0x8D925C99C5842D240AEE244923F70520955E4CBC = _NONAME_ | V | 0x228D1E5E2C0329D4349393FFC74B194A ; libaacs -0xFE334C90CD0494C152FDE1A780D9EEB0A230BA36 = _NONAME_ | V | 0x9A5D32F7D4DE9B6917427D67372B7809 ; libaacs -0xA15BB903C9CA58F9E74473C6D041F65B6C8EEAE4 = _NONAME_ | V | 0x409E9C97FADE132AFA048334FD8FE902 ; libaacs -0xE1085D58476268D234F3B32225BF8DACB6F97112 = _NONAME_ | V | 0xB2E5E7A9600A66F68FFB15E0DE3BA756 ; libaacs -0x1F88B663CAFB7AAA06704AC5B6AAE782605F38D3 = _NONAME_ | V | 0xF7069992B49E567C079F6499113F4EE8 ; libaacs -0xDA15B5CB5494FE779D18EB15AE2BC5D47B3EF860 = _NONAME_ | V | 0x8BCF712978E9B27EBE7690E3391A1315 ; libaacs -0xC3CEDAE874B90E499367C8B98A9989B5B53F9627 = _NONAME_ | V | 0x4EF97D23C21B196A4A5FCFC10C93B0B9 ; libaacs -0x916A12A246DF3831C882D1E2B9C20CC7C4898B07 = _NONAME_ | V | 0x247F024736E15050D2AEE4B8AFC83842 ; libaacs -0xCA15F4E76B22C230C4254C1D2F9A2BA30ECD1C99 = _NONAME_ | V | 0xC928B83698E28DDDF04B2927FDEAF4E5 ; libaacs -0x8D6F6EA5EDEEE56DBBD879870E6C475C8DE1A03C = _NONAME_ | V | 0x532DBCB8BA430209AF4DA14367B9A435 ; libaacs -0x19C36217D5692BA03BDBA6055B664ECBECFBBBA0 = _NONAME_ | V | 0x65ABD4E6396DA88FC648DEDAEF227619 ; libaacs -0xA0646648180D5CCD4B207ED612190B1E420BC14B = _NONAME_ | V | 0xA2A2DFF22D5A4777E625AC782CF0DC30 ; libaacs -0x794F5779B1892DC9F7FF7E3BCC8055DAA6D0F46F = _NONAME_ | V | 0x946F3853DAABF88D8CD9B4136623B285 ; libaacs -0x21D16A04AFCFCC74DAC99456A6FD75FBCCAB3EE5 = _NONAME_ | V | 0x435F6E4F5C26A422FBC4F972669560F9 ; libaacs -0x74A238A2471D36A46E8DEDBC8E5021E6EB418A60 = _NONAME_ | V | 0xBA29407F4B7B9CB77B7DABA28BDE3D46 ; libaacs -0x907F2A1E7318442669CD3F758AB1731F1A23F24F = _NONAME_ | V | 0xB0968C2B1EF57307211079363BC22B76 ; libaacs -0xFB5DFEDF0AB968272DC77CE424440D434CA79940 = _NONAME_ | V | 0xB644EBC15E8F7CE920EC66CF27B52DF4 ; libaacs -0x3EFA541D15BD631AA9EB6859806BFC2FC5475E30 = _NONAME_ | V | 0xD0B4AF5471B939207DC42AF258DEE09F ; libaacs -0xE07A44503F4BDDE778075B7D7559628BA80E4ED2 = _NONAME_ | V | 0x1D33CE9A592A2BC20927C6E2B58AEC59 ; libaacs -0x315CAA46A2BFA5F5E30DEE2AA36CBD377B713DA5 = _NONAME_ | V | 0x4B23AEAF03E7BD408C1660C600C8610E ; libaacs -0x69B4D82F41ADB8D67673AC7E77E8879AA2F9DAFB = _NONAME_ | V | 0x5CDC2FC727A84CAD1A1CC20B2947F0F5 ; libaacs -0xCDEA82080B19A1BD6E81F09D525BA7EDFF871D8D = _NONAME_ | V | 0x2BA505E97361E71C1F94090E805C1798 ; libaacs -0x53B3D5C71A4FE9512A92940FE9E79667212EBA43 = _NONAME_ | V | 0xA7FD48613B035DFBDAA81EA852CA232E ; libaacs -0x2B6D13BA4D539DC18149EC717D6D232F88957272 = _NONAME_ | V | 0xCFD95BC94DF19E8C55BE32878EC09379 ; libaacs -0x24461AE9282BBA081BD7A458366532166B166F0F = _NONAME_ | V | 0x864ACE0E52D26F403E693389A7DCBD84 ; libaacs -0x10829948D8ACE34FB011C71FF21310F96E746457 = _NONAME_ | V | 0xF185407EF7F34F5F62DF36FCC882D186 ; libaacs -0x9596A62DCC56485F2F6551C29B693AE3F3C04D91 = _NONAME_ | V | 0xE75916CAC2E75EA2C9A8C2F74DDE0ECF ; libaacs -0x7F126D409CA2E880E001CC28F0DC371E0367FA14 = _NONAME_ | V | 0xD214BA894598D46AA118BE184A06FE6E ; libaacs -0x7A47BA94DFE8F039BEF59211FB6990F88997BA26 = _NONAME_ | V | 0x861063B4B8C7DA2D8A337A737C140A8D ; libaacs -0x7A9F78DC742407BC4083A64D56950FBEF240627A = _NONAME_ | V | 0x4A33C844A5CA5244EC55726DE6144E1A ; libaacs -0x0155C685CE1FA28941312C48F8106333AEF89F81 = _NONAME_ | V | 0xAAC63D850BB4F79F370D47E219BFCED6 ; libaacs -0x98F7DCF20C635A484A66B9488024353326B2ABE9 = _NONAME_ | V | 0x94490AAA412846FE861B5494A22C0FE2 ; libaacs -0x68096C7FDE43048D99D3E7416F0AEC3720A1A709 = _NONAME_ | V | 0x4ED3EEA1F993A9D9DBC16DE3AAAC6581 ; libaacs -0xE5D7161E5516BC9F9ABD7B84BF9DBFA0CAE0AFB2 = _NONAME_ | V | 0x4D0150318E5C0FFE9E34C82B6B9BB525 ; libaacs -0xADCD62438C2B014BAC3A52293CE3BF9803971DDB = _NONAME_ | V | 0x6379CDC64DB35C22790C0308BC1C65C9 ; libaacs -0x2DF8781F77DC13D203B78E76C97880E32887CCF0 = _NONAME_ | V | 0x9541319D7242DDAFC52CA80FC2F1A13F ; libaacs -0x5060AD946FD3D574B1DC660758AD5B298ABAC775 = _NONAME_ | V | 0x9F5AE323B1E0C3B7E90C5C0A60AE9A70 ; libaacs -0x5FEB094DAFD1BB765219436DFB212453355E4067 = _NONAME_ | V | 0x2607DCB3A364663F3197003B48EEAEB6 ; libaacs -0xD8F60433C5FE5356A0459FFDEB24722B742266C0 = _NONAME_ | V | 0x9381C2FCC2877327F9A03BC9301EA13C ; libaacs -0x52BD0F593F91701449DF24D34E15EEDA49532A8C = _NONAME_ | V | 0x8B1ADD381A40A721EDE2E8379F0DEF39 ; libaacs -0xCFFF0B99C7E6857FEB3322B814D05B4E416FFD49 = _NONAME_ | V | 0xE119D21686A8419941EF22497C96EDC6 ; libaacs -0x97F35EF60003B4E6BD706F41B25DE4A2A5941CE3 = _NONAME_ | V | 0x9F93409F55E674E541D201F5752C8055 ; libaacs -0x0662AEB09E0CD0F6EADF3B129D5B7A23699761D2 = _NONAME_ | V | 0x961C772077791944A20D52A67C85B204 ; libaacs -0x51C3276A81424A83649B81F33BFAAEF6A204C919 = _NONAME_ | V | 0xCB45BE84E29172CCB4432A314B6D488D ; libaacs -0xC0CB482368EA330559D4F36154425C3C379A8F9A = _NONAME_ | V | 0xF2A25DC9A038D9B1CB59F42EF1202083 ; libaacs -0x3708C796A380210DAF7CA65D5021E1DD4748C3ED = _NONAME_ | V | 0x6AD502EB460932E084B42FDA994423EE ; libaacs -0xE46C77D59EB57D3B4F4ACB48BB83D823DA90D7E1 = _NONAME_ | V | 0x283AD5EA469512B6C935501510CFFD1D ; libaacs -0xD969B3E7E90078F6595B3A265BD460D70C6B2950 = _NONAME_ | V | 0xF47FD5DB6FFC2B00361ADAB1629C8F23 ; libaacs -0x62499B32C43F02225005EC2E8868ED05A46D6F33 = _NONAME_ | V | 0xA8AEC3D93EF11E291082053EC55E752F ; libaacs -0x57C2EF8276677EEA058703BDBA8DF56569186904 = _NONAME_ | V | 0xBE92960FBFC9A6BB8E142642C579ED24 ; libaacs -0x446353D0DC809E42A908099D5F2A951B5ACE758E = _NONAME_ | V | 0x87D390F426298EA78042C8E66BDDC98D ; libaacs -0xDDAA7498075311926374391200726AD89544D375 = _NONAME_ | V | 0x45F60766F0D8A537304D06C4917B61D8 ; libaacs -0xF0F5CFE54B48D1F1092B16A136599150D6838A1F = _NONAME_ | V | 0xBF886FF4857BCBB7616B678CCE02926F ; libaacs -0x303DBDF55FE165BAB37D67C7A587051D018CA11E = _NONAME_ | V | 0x4E01351B86B3BA9334ADD8882626EB1E ; libaacs -0x7FBBB54F5B505F8D4E9A38FA523953ABA8043BC4 = _NONAME_ | V | 0xDB82F30915AE77374C5C04679F810436 ; libaacs -0x8D90296FFF43D1FF069629B4FC45E1CA81C34A5F = _NONAME_ | V | 0x3BEF66B8C16C0C46FDBACB6C9F909F1C ; libaacs -0x75320B2DDCC97BDC2619F4209C55FD8DA0F0F7BF = _NONAME_ | V | 0xDF4584E550FFFA776EAB43594D4DFCC5 ; libaacs -0xF7F45406B218693BBB71DAC8060025BADA11CBD9 = _NONAME_ | V | 0x9C633B79A7DAE15CE53CA5ACCD276485 ; libaacs -0xB61646525EB4FA993CF7286C4890FFB48953458F = _NONAME_ | V | 0xB01C03686A4A511395AE7643E95BDE4B ; libaacs -0xE4ED44EC91ACB5F24E07B63B7F01D4A40E4C9755 = _NONAME_ | V | 0x1E45925225C3F64E56058D993E80F2C0 ; libaacs -0x58CC25BE9389672406B44099F4D571385E64AABF = _NONAME_ | V | 0xD1DCE718860B7D8F39263B1671EF2AD2 ; libaacs -0xF1AA74707ADA2795CF8FF1575D88ADBE27C56FA6 = _NONAME_ | V | 0x56BEEE2CB11270F40C2EC99C45010D08 ; libaacs -0xAE159FBC50527B148DACEC7E8C5490C9422884BB = _NONAME_ | V | 0x87614C646622978E4892216BDAB90C7B ; libaacs -0x6B5556684ED1A203581AAB6393006C228C76A825 = _NONAME_ | V | 0xE8D1173C1FF49281251B9E265E241B69 ; libaacs -0x7AD13643F0634253A3B19D7FD6570750B3F0E84E = _NONAME_ | V | 0xB9EC9422D02BE46C967B44F1838EDFE0 ; libaacs -0x7DBDB390FFD2FE87ED518E72068CE1E46525F3E9 = _NONAME_ | V | 0x8957897A5C045624001FAA6671762F5E ; libaacs -0x5791C6AE5992CD7C7279B43BEC3258CAE9716555 = _NONAME_ | V | 0x1FDDB384C8B7288A72C6B532196F77DC ; libaacs -0x67234EB9EBB12581B9132C39ACDFB31804D4363A = _NONAME_ | V | 0x96FCCB07C0AB76F7B7912393B5B664D9 ; libaacs -0x40387864B7088B4CAF85778778EBA8FAB0BFB05E = _NONAME_ | V | 0x2E3CE1CBAB429CF1162E5A9A64628F1B ; libaacs -0x8E8F197B0E46AC35D9DBEB1F2BA386D782EE7355 = _NONAME_ | V | 0xD3A1B942694A8832E7AADAE8F37453A6 ; libaacs -0x742393B6E54D467EB87E2A0A8819787BB5C06A3A = _NONAME_ | V | 0xEF47475B23D8ACEED0C471B440BBEF06 ; libaacs -0xC447DE7DA6C5CDBBE298752C49405E59C604B576 = _NONAME_ | V | 0xCF6ABB4B48FA7CD87869F716BD10F023 ; libaacs -0x6E227A82F302102CEC73B691548963C63A1E2E94 = _NONAME_ | V | 0x895FED899B003A076859A9B0778F7E55 ; libaacs -0x01080B4D4FF0D5E80C119459AEFC168092A70687 = _NONAME_ | V | 0xF090D04B6F0664D1E62D1A5BB3E233DD ; libaacs -0x3E025DDB3D5309CD47C7EC10642C9C7FDE858CBE = _NONAME_ | V | 0x059D48EB010F787EB1E08A7695742EDA ; libaacs -0xFD7E9237F04894200C74BB5AE02B4454151E5738 = _NONAME_ | V | 0x5A2E0041ECCC4B3C58DEF9A134895089 ; libaacs -0xE78DD38421293815CA70A70E058C8EF5FC953C0B = _NONAME_ | V | 0x540CA05A64868BF4D3E358121CDE61AB ; libaacs -0xBEF2D47CC468183349D31889F436C2713795617F = _NONAME_ | V | 0x3A59DB4CF868D810FCC05421E398FA61 ; libaacs -0x632D385747834FC89F4D1DCD81BA435BCCB06D34 = _NONAME_ | V | 0x3C79B0EF25E05FF7322F3DE3113F68D0 ; libaacs -0xEC5B06C9D6435ED10F745384830AD27AAAE3881B = _NONAME_ | V | 0xFE60D4AD5ABB2FA637E5E3CF6D7C1696 ; libaacs -0xCD9C79F26B5BEA35A837FFD94ABBD87EBA91190F = _NONAME_ | V | 0x2D43FE56D04813745BFCDE5D89000A15 ; libaacs -0xC64DD5B12538A4C61C06097A8314528E4E96C67A = _NONAME_ | V | 0xA75E504F3CB21D714B2C77E8D0643330 ; libaacs -0x0E04254ADDB809A577DDBD7F785721ABBF3F7D04 = _NONAME_ | V | 0x8F9C550F67682986CF8D325CDDE35238 ; libaacs -0x96A2C61AC0DDB70C671A93A2327B11F418B086C4 = _NONAME_ | V | 0x0487D235D60EC553908FB360B12C4B52 ; libaacs -0x289AFF547F36A503DDCD042D403C8AA2C2B52C89 = _NONAME_ | V | 0x4220BFA4735212B10FF74BD7CC3CA2B7 ; libaacs -0x06838CEC4ECC333A01DE1B38D7E596F88DFFCE5C = _NONAME_ | V | 0x2643EBA3C70F9A038EF162A0D3CF1C8A ; libaacs -0xA52EFD2A5BC33112686BAFB457A3530053C149DB = _NONAME_ | V | 0x353DDB239E3D65E69D3B54BBA13F44A6 ; libaacs -0x00832AD020D621E8E468CCB3149E3CB26B14817C = _NONAME_ | V | 0x7281AE38490BCF10E1F60376082B2F00 ; libaacs -0x6B718E035F4CE9C28848DD8C4BF7555EAAB92D5E = _NONAME_ | V | 0xC5BA615E4A231F6299819513BE12A2B1 ; libaacs -0x2CDC4B640EE9D3CBDCCE334921B9893161758D45 = _NONAME_ | V | 0xEBEB94A41B851377CDF96AF068083FD6 ; libaacs -0x073880545F3698FFE66CBABA72258505286501D1 = _NONAME_ | V | 0x44CD5BE0F068758D7D852E46E49F2357 ; libaacs -0xD1B8BB79C670D2EB358153C358EF272BCC6D04C1 = _NONAME_ | V | 0xD4701BB588727FE9CB4590CEA19AAC36 ; libaacs -0xCEFB36020260DE5B808F7405C32EF55E0D235527 = _NONAME_ | V | 0xE0E48BA1A8235BF22616E5C34D8F69B1 ; libaacs -0x785D496591F6664D128A3DF4DC0CE3F448A96F90 = _NONAME_ | V | 0x8DEDA83A09C023A406CC3FF32FA11C8F ; libaacs -0x36F3C32766B9DE354F60E934C4E3623BEC68D5B4 = _NONAME_ | V | 0xD1B99828BA95092CF4C3FAF0D9093C40 ; libaacs -0x1B8FD8A4DBAB3AA22E95C705EE8C6FE9D602B85A = _NONAME_ | V | 0x6531B1B419A2FDA1D985B0E1355D9ED0 ; libaacs -0xDBB104EDF3FCFAC333E97120C89B98B8B9BAD3ED = _NONAME_ | V | 0xA51C193B3FE4F5EC0FFD09A1A35305CB ; libaacs -0x12922663AEA2D638544BBCBBD35C95403851061D = _NONAME_ | V | 0xD03F7599507EEB1FEAE7D16ADBF705CC ; libaacs -0xF0F129758636D6E753CADBAC783CB8291DD74DF2 = _NONAME_ | V | 0x2D05DD02B4D95B5A699DEF8B1718099B ; libaacs -0xF283D0E77D9B9BBF0B6A4FAB362BC69C9CCF1013 = _NONAME_ | V | 0x06278462BACEA1680D37ED57558384C4 ; libaacs -0x0733821827E00556BC51B870DBC2A14A427D5973 = _NONAME_ | V | 0x7154549E8E250F09529D053560322850 ; libaacs -0xD5F9F2FD0E17FAEEA25C8A7B65BACF4FBEE06569 = _NONAME_ | V | 0xDB0830D4DAB46CED81855403F3892E6F ; libaacs -0xA796485622693C23172F562AC314095AFADC9A5C = _NONAME_ | V | 0x095FE49652BD87E216F9FE574DE5A096 ; libaacs -0xAC8CA5826DB3BF0A8A0BF0735994EC05D1AD41B3 = _NONAME_ | V | 0x0E873F63C9238C09882033E597702008 ; libaacs -0x7395F5A97FFA72D61D59E36487494810985D0895 = _NONAME_ | V | 0xD752339F2B3591D4B56B88CD8CAF4E23 ; libaacs -0xA721E1F0EC500012492D665FE2207E468B4D4CDA = _NONAME_ | V | 0x671A8DAFEBEB088D60FA4E1D4D803A23 ; libaacs -0x0183F76454E4F9DFE365C0DCDF243AACB7465198 = _NONAME_ | V | 0xD6E5681D729036FA09EB3219BCD505F6 ; libaacs -0x58E284D9ACD522944A2A8231171A85B360709DC9 = _NONAME_ | V | 0xF0947016C59F1134C9AA04E91792FBF6 ; libaacs -0x68841DB839A2D8FBF4749DC6E01617571BBCF420 = _NONAME_ | V | 0xA3F4A9220FD0BBDE11B1CE4B44B04F81 ; libaacs -0x75EF549997A8AEAAB508C1BA7CC8F32CDD1076CD = _NONAME_ | V | 0x7D38C788E86224D26D794752298F0645 ; libaacs -0xF86AB371A50E18FADB15B22B00A0A6DAA71ECCD4 = _NONAME_ | V | 0x7EDDA1F2BF2EEE659CF30C0877BE1972 ; libaacs -0x94B08669702871957EF5AE88941BD15C8D91F9E5 = _NONAME_ | V | 0xE36A8071622397645D8DDCD5111D97A7 ; libaacs -0x786EAF9B3F238BF30004C4F55325A71C748A8A0D = _NONAME_ | V | 0xE009BA65CA71B19504F3260BF09847F7 ; libaacs -0x995E0D9E1A3E678F0FBCADC3DFC27CD3BE180D52 = _NONAME_ | V | 0xB6BA787255FEC69738EF2418D4D08616 ; libaacs -0xDEDB130CE9871A019D9DE423E97D6187A5D1510C = _NONAME_ | V | 0xACE19D6E2FF23DC06AB0C6F48F163B05 ; libaacs -0x33C662DFC622482C561C15E54D3A0796A507F0C3 = _NONAME_ | V | 0x5ABD6113BFF89195FBAE02227D2C6CB3 ; libaacs -0x006C437D85B4AC0C664816F66235A5C26558FEBE = _NONAME_ | V | 0x22C94A9755BF72B35BF9EEF371FCB773 ; libaacs -0x5DBC40F7B8FA7858E7CF140C46DE9B5E7D6298AF = _NONAME_ | V | 0x9406286DF4960109F0DE3673DBB9CF58 ; libaacs -0xF09FEF2237DA5A1B8D8EDF492AB2D37580839260 = _NONAME_ | V | 0xA05F157FD552566F5DF065D99D174B42 ; libaacs -0x5E40E3216CAF698EF89914786ACDD7CE7A370C33 = _NONAME_ | V | 0xE83E68058FA83EC3F9671A9E30EF86F9 ; libaacs -0x363A03E1025F757C16581941C80B4B5C0C54B898 = _NONAME_ | V | 0x92DA9C2993873A8440E8E13AFE4EB834 ; libaacs -0xB0898F347508D202CF321BF6A90BE0079ABA50EB = _NONAME_ | V | 0x53CE100B3714CDFC1764310BE58A4377 ; libaacs -0x9090A980ECF967430AE6A58F76399F875B98C24C = _NONAME_ | V | 0x72ACA2C8CE6A395E5EBF5711CF8A7141 ; libaacs -0xF8335D6FD53F2509CFFB9599876BF73B49C45533 = _NONAME_ | V | 0xE12613F5FAB426B29806E427B6C21123 ; libaacs -0x93ABA7DFDCEC7B395782EE30036627194B771158 = _NONAME_ | V | 0xB26D534064A571DEF7C86A2AB3689B83 ; libaacs -0x6F44C845AEB168D4FDEB3BD98DEFF6BB5EC016C6 = _NONAME_ | V | 0xC4F4F4857CA4E244A8EFD267D22426E2 ; libaacs -0x6E6C42014A45BD4B44AA16C02231431CD732EA58 = _NONAME_ | V | 0x51DB16AB6816DDFBFFCA229E1BCD8E0C ; libaacs -0x850CC4A52AA35685EDDD65AF1CBB7C40D31AC37E = _NONAME_ | V | 0x28D6B717A3A569B8333BC18C6EE6EBD2 ; libaacs -0xD02DBF1A1CC4134B29F5D4BCAD0BDB7AB3DC8107 = _NONAME_ | V | 0x78A222ABFF2AD0CC7139D7C2C1818781 ; libaacs -0xB4E5CBB1AB17F27DF7C4B09510D4EB0BD8D1B026 = _NONAME_ | V | 0xA9F4EA1F9F10041325B938422391B116 ; libaacs -0xC8D27DF9B458FC63A81B989CA0502C75C1AA3E8D = _NONAME_ | V | 0xEA6BA95D197D47C7653BEA0FC994A323 ; libaacs -0xA756AABE202B245740563F826DC6DCAB3C133984 = _NONAME_ | V | 0x5B85FC84D1BBB951D2F545DD0A20EC5F ; libaacs -0xE75058DBD0EC602FCEFBEA1BE0D536263E8046F5 = _NONAME_ | V | 0x0A17869994748156F23AE8A0AA71A438 ; libaacs -0xE116252D64903E838B128322688ACD49672737D2 = _NONAME_ | V | 0x266F1B08A3C6D4EB26847F5A00D34490 ; libaacs -0x4953BF4937FDA3CD45E4955143B992E3BAE8A246 = _NONAME_ | V | 0x2FDA7D1D1C80454FA62C034970EECBD4 ; libaacs -0xF684F1E9E9B649DFE34980F393CADAD8C364873C = _NONAME_ | V | 0x249B0DEFDE482BC50AFD2F4707138627 ; libaacs -0x780C45C97459F9F5913AA00D1078100C0228C292 = _NONAME_ | V | 0xF6BD5E3C1384C4001515D857442BD1C5 ; libaacs -0x8E0849F4E423502B558AC93D7E11658D5913DDAB = _NONAME_ | V | 0x5E3D18C7696548DE0ED6311E05A2057A ; libaacs -0xD46B081275AE13C2954C50D824F07F1A68F9CC97 = _NONAME_ | V | 0x4EB78FE60FE8FD77CB4989693939D42F ; libaacs -0x3A5A0B8ACB38E32B9BD30F63368FC26711134851 = _NONAME_ | V | 0x396D1DE20FB6CFE22256935B602589CF ; libaacs -0x2CE82FBBD63FF4BB1367FE18BB6FA7541AD6C0AD = _NONAME_ | V | 0x0E849300BD7829615C11469C94CCDC13 ; libaacs -0x97D4586FE7F9C7E65E8DCC3D666797E865D7D530 = _NONAME_ | V | 0x736DF0D6A05FF62405FBD50CED4DA033 ; libaacs -0xD427F90ACC9EB294DC7159ED4769167828686D7E = _NONAME_ | V | 0x4EF22F2C1123628B434426FA407EB8EA ; libaacs -0xB001F7A3DB9CD7DFECFCBEE986C93655B61CDA82 = _NONAME_ | V | 0x2E0841B41F33551624DC18260A1F1E9A ; libaacs -0xD2096F016C58D5C925DB4AC9425E54D46EF23B2D = _NONAME_ | V | 0x758BE5F1B1F346CAC5A07DA74150CDD5 ; libaacs -0x5359D8BABF1C77309601D56B7663BE457F0AE291 = _NONAME_ | V | 0xD23DEDEA5CFBB65A4557A4ACB1386D4E ; libaacs -0x60FFF878A6143A1243CEF8323FD6A2ACF9F38B02 = _NONAME_ | V | 0x0172865B0E469464C926A6ACC4884CBC ; libaacs -0x9F84E55F88180C5871339D00E1967490039117A6 = _NONAME_ | V | 0x407CEFD99B5A3D0DF298B4264D1C0CDC ; libaacs -0xACE3018908C1564A9122429FD68025554A2A0DE2 = _NONAME_ | V | 0xDA755D5C5B86201F55E20718373A91A7 ; libaacs -0x94B186E66C09F4F0ED7665450414A7545AC6CB0E = _NONAME_ | V | 0xAEC95C6713CC19A882F34E6B39BBB5CD ; libaacs -0x0C343E34864C26A4CE6315E13AE05FD8E7E04991 = _NONAME_ | V | 0x4345DBA6CFF51E7673E86675F91FF7B6 ; libaacs -0x461D817C01E805BCE68506016F0091C4A66D81CE = _NONAME_ | V | 0xEA0234275D08476F95D628660F04537A ; libaacs -0xB4DE17B85C22882421C311E04A82A2375F4FB7FE = _NONAME_ | V | 0xD821653BA3637FE4264FB98C820CC1B6 ; libaacs -0x28E1C194E549E44466ED1C682958F60CDBDD6A54 = _NONAME_ | V | 0x4531276443FCB276AC5C901CCEC39691 ; libaacs -0x211370E0ADFE243953BC3C3A6C0133062259BBDD = _NONAME_ | V | 0x8004A1719E73819FA2A88B4A2F2933DB ; libaacs -0x0DF9691B0A61C02FD273A94F8D585BBE19C9C880 = _NONAME_ | V | 0xDF1825825DCA03A73F60B84F4093558F ; libaacs -0x06B96094B68F59907A04151A0D0F6F0D34F08B1B = _NONAME_ | V | 0x9737A5C7DF9346FCEB20C4FCC9F3BDDF ; libaacs -0x81C723820455A6C646A2008AAAD92B12694CA144 = _NONAME_ | V | 0x7E0512CB1EA24321560D13764D6D55B7 ; libaacs -0x32277B8AB7EC1ED825D659AFC1EE0B0FD065C1DA = _NONAME_ | V | 0x0C1214899D249D40FA147A5A15CDADCF ; libaacs -0xAA551AC0C927CE739DF37D3C4752A89286CDC59D = _NONAME_ | V | 0x43135B939F5187B09C67C13AC1F576BC ; libaacs -0x5822332918834FAB7C94ED5174D23986886478B8 = _NONAME_ | V | 0x9CE1A0F80CE011F029014574F9790027 ; libaacs -0x428BB3B762918665A78F84C902C38423F66D53AE = _NONAME_ | V | 0x5EF5AA301869DD6D451E12BB5DC18A86 ; libaacs -0x7EA459667B79D850B0F9E018C562A3BD4F116677 = _NONAME_ | V | 0x3CE4413822E41720B2F2E8ECEF1DA0AE ; libaacs -0xB8C6CDA7D24F8CB2E4071F005CF941DA43EFB1F0 = _NONAME_ | V | 0x69EA27BA8FF52D046C659BF3DBC4A221 ; libaacs -0x2B472D7B06EB3F85420463D9BFAC9ECE33531922 = _NONAME_ | V | 0xE30705FDDC0040E367066DFE957E9B39 ; libaacs -0x0D0E7D8E7D3224C611133F7F085947AB0AFEA83B = _NONAME_ | V | 0xC10700D526730D463ED1096A5798C8E4 ; libaacs -0xCF407754081EBB04E06C8F21ABC4353DD88682FF = _NONAME_ | V | 0x0DE1532703A62E3FE3F44FFBE02F79FE ; libaacs -0xC6FFE63ED336F48E87100DE68A6E56F9BA4F452E = _NONAME_ | V | 0xC5DBD8D8EBE25CAAE01AF604DD0F64D9 ; libaacs -0xD4C8C3254DFDA93B7386EADF590757A2106D84D7 = _NONAME_ | V | 0xF150F9080DE80DA2495431A0DEF341A5 ; libaacs -0xD6F8A4ACCBEDAD894F3AF7FD5DEB0149BD688EF4 = _NONAME_ | V | 0xBA4AB111124476980F52DCDAC1E4A99E ; libaacs -0xB055B2FBDE42B187D4CFE2AD9F3991E610B488F4 = _NONAME_ | V | 0xE5AD747BB2B8F21AC9F3651093976A37 ; libaacs -0xA7F67359D736476342306097EAC4D00AE4A1C278 = _NONAME_ | V | 0x7CA59A35C38BE57A8D2EFA21823F901B ; libaacs -0x62AD6F9FA8E277A7B6FD8117E1F50BE738F7C268 = _NONAME_ | V | 0x8108CAA3E9299F630D1FA8C583365BFD ; libaacs -0x926B0D225A78E19E866C69A66593700185CA75BF = _NONAME_ | V | 0xA72FA3B6299D4DC2F8CBEE5047E06076 ; libaacs -0xA255C00A142C56C2851B15D606040AE21133394A = _NONAME_ | V | 0x36ED0A95778304D5B77D045A77FF8800 ; libaacs -0x44B8C5138646759EE73B8019262B6D3B4CF0D00F = _NONAME_ | V | 0xE9CB06D8077F5B926F3945A29E9FE0DE ; libaacs - -; AACS Updater 2.0 -; 2017-09-03 15:10:42 -; -; keys uploaded to central database -; processing keys: 0 -; host certificates: 0 -; disc VUK keys: 1 - -0x94F4983E98A383FAB816BF0C7549940FAE7B65D6 = _NONAME_ | V | 0xF6B104B495128F7B8711C472A9A66E43 ; libaacs - - -; LATEST KEYS FROM DOOM9.ORG - -; 171128 - -0x4D0B016B304B8E86C082D0E64BD55EB6151024F4 = MRROBOT_S2D1_UPB1 (Mr. Robot: Season Two(Disc 1)) | V | 0xC19D0DFC88C4146D82AF71A584C75974 ; MKBv61/FindVUK 1.02 -0x0EC0FA8FB6D2AC23984681AE29A164D6301B5155 = MRROBOT_S2D2_UPB1 (Mr. Robot: Season Two(Disc 2)) | V | 0x3E16D8920C0134DF513357903CEFC8FA ; MKBv57/FindVUK 1.02 -0xCDC3F5E7E5E8DCB8927BEFFED237BB4D469EDCF7 = MR_ROBOT_S2D3_UPB1 (Mr. Robot: Season Two(Disc 3)) | V | 0x8E9715BBDEFB75267EF4022CAF71884F ; MKBv58/FindVUK 1.02 - -; 171204 - -0x7A3C818B3722DCA0B7C16A4527C475BFE79BFB5A = ALLEGIANT | V | 0xE360FA78B205BA030E53A0D6DC14F7B0 ; AACS 2.0 MKB v60 -0x8831CF34E0FBA7B0DFB59AF53BF44518B4676D75 = AMAZING_SPIDER-MAN_THE | V | 0xF1AEF5411CD7666629BC080D3E1B6A9B ; AACS 2.0 MKB v60 -0x2C788A63768C9BD1D82594830D1EDE01315E75A0 = Angels and Demons | V | 0xA82DED84BD71CDB930CC12B2EE547340 ; AACS 2.0 MKB v60 -0xEF79B6EFDE3755CD73C78900B31C8023CABA53DD = Angry Birds Movie, The | V | 0x707017F7D9B1DF865773A5F8722EBF3C ; AACS 2.0 MKB v60 -0xF636B4A0943E5D05D82A9B0303A0B77E80F0BD5F = Arrival_2016 | V | 0x64F5BF1E0B5B9D5F2EA614B9EB353E36 ; AACS 2.0 MKB v60 -0x90BCE2A2BDEC2179174BF5DD38F254E7D5D279CE = Billy_Lynns_Long_Halftime_Walk | V | 0x106989552EC676FF88E9DB062211B691 ; AACS 2.0 MKB v60 -0x1C4F2E1F689E3C3A84BAFA718C59E30C66A7199A = CATCHING_FIRE | V | 0x796DC6450AD93E6799D1A14027BE5452 ; AACS 2.0 MKB v60 -0x9F2E15A8166C046C2E415669549C4262F258204F = CRIMINAL | V | 0x174231EF98198B0889DC8054DEEBEC90 ; AACS 2.0 MKB v60 -0x26080AF461C2EC7A9A0B37A778DB80B9BE9C65FD = Chappie | V | 0xD1BF5814D80F632C6C3BAAE5C04954F5 ; AACS 2.0 MKB v57 -0x5B48612E8878854BDC67A65830FB8E89A436F1D7 = Concussion | V | 0x28BA80B59F97125E2EAD3DBA1D73B23F ; AACS 2.0 MKB v60 -0xE2B4D18258BC17E7661DC14909ABA518C4ABD19D = Crouching Tiger, Hidden Dragon | V | 0x57DD189958C6E2C55A35CC9E7D39C07B ; AACS 2.0 MKB v60 -0xC68FA3609767D14177ACA168853BD4E18E7CD91D = DEADPOOL | V | 0xD7AFCF1DCE08D6655E7379BF8B1D5118 ; AACS 2.0 MKB v60 -0x9420E6F16116C96EA3DE64CAB5BF71117124B9BD = DEADPOOL | V | 0x418BD6BEF509BE919CFD7228CFA1E123 ; AACS 2.0 MKB v60 -0xF8A76C9831CEBF61D5E34AB4997EB9CE44ADC4EB = DEEPWATER_HORIZON | V | 0x5044C084007470705F9C6A91B634F96F ; AACS 2.0 MKB v60 -0x4C22CA5CEFBC33A1D6C15E0BD0D1CE6B24F2B5EC = DIVERGENT | V | 0x268BE81659580659F109ABA3E009CB12 ; AACS 2.0 MKB v60 -0x3AA41A87A7864A66982B125C4CD9708A5999D5D6 = Da Vinci Code, The | V | 0xE60D4261AF4232555C19F608ECEED23E ; AACS 2.0 MKB v60 -0xC02714AA2459052411A0111C0EC6B746A1EA901A = EVEREST | V | 0xB4549BD12904A899202CD8AEDAAB4CD5 ; AACS 2.0 MKB v60 -0xD0C026BE3DE040873E4B53502FF5950DF7AA8672 = EXPENDABLES_3 | V | 0x0259D6CCC1E7FF3086F02AE0CC60158F ; AACS 2.0 MKB v60 -0xD284E8BFC907972EDE321A090621F4D7CB44C9BD = FANTASTIC FOUR | V | 0xC3FD81DC440B2551EE69DD033B8B87F4 ; AACS 2.0 MKB v57 -0x1800B824A1135BB514F92A3F4524EE05ED25724F = GODS_OF_EGYPT | V | 0x53FAC946FA946F63F2BA5AEC06F5E4B6 ; AACS 2.0 MKB v60 -0x537272DE8BD3E9CF6CFF4BF69264487406D7BEF8 = Ghostbusters | V | 0x25EB9E96DECF79EC0286E6DD7E00B594 ; AACS 2.0 MKB v60 -0x9597929EEE4F50F3818C9F59E94594AAA876F3F0 = Ghostbusters II | V | 0x72313E463DD3F4E482EB4E93AA3F1BF3 ; AACS 2.0 MKB v60 -0xAEF13185BFE6123E862487C4D569211AB74E364F = HUNGER_GAMES | V | 0xEECA6174C50411FB0A80216C4F5B9101 ; AACS 2.0 MKB v60 -0xC38787A215B17DFB648BD0B668B3AC4A3657E35F = HUNGER_GAMES_MOCKINGJAY_2 | V | 0x9A0F0AC32B1F2DBADFD98F3A696EDA82 ; AACS 2.0 MKB v60 -0xAA8A458AC68E285ECDF1CC1BD22FC0CB3619BD7B = Hancock | V | 0xF903D98032A0A45FC8C96BA9F12543E9 ; AACS 2.0 MKB v60 -0x7662BBA8558FBE0050780C677514F9FCAA3629E9 = Hancock | V | 0x77C3FEDB35392A457DBBFC5557420026 ; AACS 2.0 MKB v57 -0x54C0EBDF4CA7EEA7BA68658E0172BADFB88A5240 = INDEPENDENCE_DAY | V | 0x9A579A16B7C65B174E22B5406E8BF7A9 ; AACS 2.0 MKB v60 -0x55D929A10C92EBDB77083E449F738CB7818977D0 = INSURGENT | V | 0x99E3300A50871083177FB809611EDF36 ; AACS 2.0 MKB v60 -0xD929B35C05FA82505CA65F0033A6206F93170F9D = Inferno_2016 | V | 0xDD53F431369D567CA4CF050B7DEB3AB5 ; AACS 2.0 MKB v60 -0xCE4F8B63A2F5E988F01046173115D02767C16114 = JOY | V | 0xFB01D6D061ECAFF93F1533A758AA3145 ; AACS 2.0 MKB v60 -0x8D48B811F4E0E2455677E5E5E0EE121EA42D4AB9 = KINGSMAN | V | 0x3A16E2FC3C63D6DADF82BB026DEC3736 ; AACS 2.0 MKB v57 -0x79F8084F68A860477B6A8060479F907D27A53142 = KINGSMAN | V | 0xA781DC3870EF303C0090547AF4C85DBE ; AACS 2.0 MKB v60 -0x55338B9FECB416B9516FF71DCAA83C845E033CAF = LUCYUHD_UPK1 | V | 0xCE527DD5F448BAFC6444C4A41DC60A79 ; AACS 2.0 MKB v60 -0xDC0E45E753919001309A591251336BC46706A9B3 = Labyrinth (1986) | V | 0x53C21AC3717EB55692912A3FE773084E ; AACS 2.0 MKB v60 -0xCCCB45CD7C28CF989AC2EF42DCE395158F75A86E = MAD_MAX_FURY_ROAD | V | 0x1AB4FAECF03D64FA956D6E4809FCA5B4 ; AACS 2.0 MKB v57 -0xAF4C098DD56B344E0A775361AFC884989694D4EF = MAZE_RUNNER_SCORCH_TRIALS | V | 0x3D19FD04722438382AF74D4B3E0B4E7B ; AACS 2.0 MKB v57 -0x8BFEF6BAD1C39C31F69563BF858618B74F7BCA33 = MOCKINGJAY_PT1 | V | 0xB813729A7E6B519389A1F391E15C7AA1 ; AACS 2.0 MKB v60 -0xD53BC23D7E0A9B966A74A7BB043A288ED2EA1B1E = NOW_YOU_SEE_ME | V | 0x323449E8639BC707A08937077B7EE7EC ; AACS 2.0 MKB v60 -0xAF7C01A0C3366DF7DB59F251A21C4DF74AF027C3 = NOW_YOU_SEE_ME_2 | V | 0xF076DCD638B588BC1C7BD9E5419DC15E ; AACS 2.0 MKB v60 -0x89DED8816F7732DF87E3B3F07CB68D0AC2ECB034 = OBLIVIONUHD_UPK1 | V | 0x9566C64FE999628A776F4575F86EBA5F ; AACS 2.0 MKB v60 -0xE80C8A7DE5A5BCEE9087C5F728FA146419DA0B5D = PAN | V | 0x4E2E42405EC8F83D68D575DB1C395030 ; AACS 2.0 MKB v57 -0xAC482032CE01A5CF2F322F74E37D16BEEE74C823 = Passengers_2016 | V | 0x79A97AB32FDA05892D6DCBC06520ACDE ; AACS 2.0 MKB v60 -0xB0785ADFC37C757B55EEA9AB801B0FC1BF26158A = Passengers_2016 | V | 0xCDE6A4A37B63F48D1A931722445A5BD7 ; AACS 2.0 MKB v60 -0x964F682FD3C1995B49990C09C01059FD43C5BE9E = Pineapple Express | V | 0xB0B637DCB110FFFBC17E35524599F652 ; AACS 2.0 MKB v60 -0x2780C96DDA1BD3F7D4B63CFDE022307AEA8DEB04 = RESIDENTEVILTHEFINALCHAPTER | V | 0xA7C3D70341430BB55BBD164822801551 ; AACS 2.0 MKB v60 -0x45E9F777072DB3FFF5AD32CD5D07748BDAE7B31E = Resident_Evil_Afterlife | V | 0xAE27A8AE7910F31BCFC947C9E6484157 ; AACS 2.0 MKB v60 -0x957B2AEF9EA4D40BC9A7A3179F23231C12FD8595 = SAN_ANDREAS | V | 0x80CB8CBA400BDA606A71017D52AF055A ; AACS 2.0 MKB v57 -0x305C3BC4C4E8BE8FECFDA5B33D539D737FD1A5B3 = STAR TREK 2009 | V | 0x8C0C497E35F408BF9E71E01F027210C8 ; AACS 2.0 MKB v60 -0x403E158B873688B50468978C1E775D02902BBF37 = STAR TREK 2009 | V | 0xB7F30ACD2F6868198C8F45041BB4CC2D ; AACS 2.0 MKB v60 -0x782703544B760FD9680FA0CEA9AA7202CF126D6B = STAR TREK INTO DARKNESS | V | 0xA7667842C3638488F3CEF21A5FD8E679 ; AACS 2.0 MKB v60 -0x47FAA33252098BD7C0C6CEB362E6F3AE607A888F = STAR TREK INTO DARKNESS | V | 0x1984BEF460B9ADE3B57E2C77055F449E ; AACS 2.0 MKB v60 -0xF78658D3EBFB5F65B5998123524B885F4DADED38 = SWATHUHD_NA | V | 0xB3849464C89C5B33BC605A7F7D198E7E ; AACS 2.0 MKB v60 -0xC4B1A69BFB0A2A32D73011E573DFE825BDA9DA93 = Salt | V | 0xC844119F42DE2F2E9939FF369DDFBCD2 ; AACS 2.0 MKB v60 -0x8A13818F97E32EDE8D8A4FA87C650A9D9591C3F0 = Salt | V | 0x8E6F63EB1A3A00AEE6E10009A1108980 ; AACS 2.0 MKB v57 -0x2285BB60ACB826B6D7551BB05BA83CF11CF0CB63 = Shallows, The | V | 0xB1B4FC1E0D5674E5F18DA78108F7992A ; AACS 2.0 MKB v60 -0x9950652BAB77458DB947EA0808A0B015E5C98F1A = THE MARTIAN | V | 0xCBC363B704FCC4C80194C247D087D670 ; AACS 2.0 MKB v60 -0x50B488E488EC1C4F6EF4A1F9CE9DDCF28671DC8A = THE MARTIAN | V | 0x52DBD4BF56180C7B7D697DD37C36222A ; AACS 2.0 MKB v60 -0x613C1A4FFDEF1E3F3407A07EDD8FE453BAF71871 = THE MARTIAN | V | 0xAC21525D19DB10D701452C093468D11F ; AACS 2.0 MKB v57 -0x652FCE1801AB21D7F8C0F0458CDEA25402791B38 = THE MARTIAN EXTENDED EDITION | V | 0x8CE7E19842B35E61A8249FCD8C306093 ; AACS 2.0 MKB v60 -0xB715CDD4827DD20C02895BE6D057B27495ECA132 = THE MAZE RUNNER | V | 0x1570E05B8080E3E0E889C4B749F19588 ; AACS 2.0 MKB v60 -0x7CC5794156800752E0D57F8F4BFEEC55D6ADE8B7 = THE PEANUTS MOVIE | V | 0x235E541F5CE6D76D082688070F48C4B0 ; AACS 2.0 MKB v57 -0xAF7C6706197A603F76A6B6F35B55CF4B18C38A36 = THE_LAST_WITCH_HUNTER | V | 0xC2582FB5EDE1EBFB3360BED2C97029DA ; AACS 2.0 MKB v57 -0x472D69A15AAB68BD1F114BA3344EF8D9E386A421 = THE_REVENANT | V | 0xFDA062EFF0EF9F83A6CF4C034D0A9C6E ; AACS 2.0 MKB v60 -0x4392D794BFE9CF7F0395976A759644278AC97171 = THE_REVENANT | V | 0xAADE1F393F57C3651AB79AC35F787BF3 ; AACS 2.0 MKB v60 -0xCCE47E606E2A0C779702F18036961827B641A698 = The 5th Wave | V | 0x1B24A8EFAC12EDCFB049599665E91596 ; AACS 2.0 MKB v60 -0x61D8D91C78A85C1E101AE887A3E2E34EE0B27527 = The Amazing Spider-Man 2 | V | 0x66B6220661F1BCD4158D5B21FEE5CBC8 ; AACS 2.0 MKB v57 -0xD996DC4A34742E76C32E766406A599AEA35FACA0 = The Amazing Spider-Man 2 | V | 0xA2C53E9F5B217F5E8315EE32B4861F59 ; AACS 2.0 MKB v57 -0xFE795C66EB5B8CF16CD9A9FADA7D31F61273D3B3 = UHD_IMAX_FOB | V | 0x51F4C78D4D8A461E25AA6C2C2C2803DD ; AACS 2.0 MKB v60 -0x9E4F16832F823FDE53F7936BF0461EF818E669F5 = UHD_IMAX_HBW | V | 0x796B7F9C86DB49A2D987951809AEF60B ; AACS 2.0 MKB v60 -0xCF2E7046A3BDFAE198E331650045D1CB9F553687 = UNDERWORLD_BLOOD_WARS | V | 0x9D925887B4DB143E053F22FA8D7A2E67 ; AACS 2.0 MKB v60 -0xA167952474038086540ADD9E82D96903E25F79C5 = Underworld_2003 | V | 0x1A30BA92EABB4AE9B407B9391D6EDC0F ; AACS 2.0 MKB v60 -0x84B65D7D6B74B82F13FB4CACCC86D63DDFDAA331 = XMEN DAYS OF FUTURE PAST | V | 0xBC0D6D33442F2369C5B09919EC6F2574 ; AACS 2.0 MKB v60 - -; 171215 - -0x6C0BA8C5A35357D13BF36BDA27665E859FE98101 = 310_TO_YUMA | V | 0x18D78A41422C0C9E7C594D82AEA5A865 ; AACS 2.0 MKB v60 -0x056ACEDB415482A1D1A75D7B69E51BF9FE31EA25 = Billy_Lynns_Long_Halftime_Walk | V | 0xBEA4AAD57067C54BF5F1E3918871297C ; AACS 2.0 MKB v60 -0xEF67E5B2E42167BD58F95B04434C0602A5939523 = Chappie | V | 0xDBBD8DCE9F5ACDEBCDDDB44BA3E30244 ; AACS 2.0 MKB v60 -0xA13CA2F0DC3AFE3E2956A6438676CF6383BF011F = Concussion | V | 0xA235B40FE3F22CCDD0D9A00AFCD8B4BB ; AACS 2.0 MKB v57 -0x966067B668F73756C64AB5BAC44AFB18E1D2BB5E = Concussion | V | 0xC067144F4505FA81A4ECA226C8709F59 ; AACS 2.0 MKB v60 -0x7B58DC89D2C4C72CEE307554E9C2FEEA754C0E34 = ENDERS_GAME | V | 0x3C4310940B5E6721A57A58E5E260B2DB ; AACS 2.0 MKB v57 -0x8A559807011724381E5077629E27525DB0EC52B0 = EXODUS GODS AND KINGS | V | 0xAE42310465AA6CE83DC454CFA0184AD6 ; AACS 2.0 MKB v57 -0xA3F2E46A5276A27604F90515725F92B95366A5E7 = EXODUS GODS AND KINGS | V | 0xED74D3B39F006A23BA8ABE1A7C51461A ; AACS 2.0 MKB v60 -0x4FEC773E8A1E380425F8207E91C52EB549C0D68D = Ghostbusters (2016) | V | 0x839754A3937CDEAACBCCA23897A0A1A2 ; AACS 2.0 MKB v60 -0xEB55C9631A2DD3750854102B476F53FC430043D0 = Ghostbusters (2016) | V | 0x89D9D037A2FC2E1504F3CCD3C96B4E11 ; AACS 2.0 MKB v60 -0x91B0D37F54283F7683CD46D59959270ECEFDDB3C = Ghostbusters (2016) | V | 0xA39F55DCB62CFC7067D70306D848460E ; AACS 2.0 MKB v60 -0xEFD9B3BAC1C60C0F959A86CC7E924367C6036FB5 = HACKSAW_RIDGE | V | 0xE12157922E304204B5599378E7C79530 ; AACS 2.0 MKB v60 -0x74A87E31FED3C3CE70F7401C2D8A28869A8B12A0 = HITMAN_AGENT_47 | V | 0x558976258E43B9BF5F044C5B7ADD5B6F ; AACS 2.0 MKB v57 -0xE5000CB21BDAF3C9FB33D9E120FD8C187AF49484 = HITMAN_AGENT_47 | V | 0x480CCD878E435F40A145F50DC77DE67F ; AACS 2.0 MKB v60 -0xBD53DCCED0DFFAB7ABDDBCCEE1DDCB60FD119C55 = LONESURVIVORUHD_NA | V | 0x84CB7BA61823387B13DBE7841B392D36 ; AACS 2.0 MKB v60 -0x25786E9FEA8EB608BE99763D1481BD47762FF21B = LUCYUHD_NA | V | 0x29A6514B73FE67A3C2B23540839674AE ; AACS 2.0 MKB v60 -0xBED0C6D6F79ABAAC2F7E57A4971D2C433A4776FD = LUCYUHD_UPK1 | V | 0x99DB684C9423C64BAB15C6AE81EE2462 ; AACS 2.0 MKB v60 -0x166D526BC1C465BDE43775165019506650A52985 = Life of Pi | V | 0x46512488F51ED1A97978952C9462009C ; AACS 2.0 MKB v60 -0x091848FECD86C4758671EDD7AE95DFE1189754CF = MAZE_RUNNER_SCORCH_TRIALS | V | 0x654FB0E1C1C725DD0884CBDB84CD1BB5 ; AACS 2.0 MKB v60 -0x4B7CBF3E0050082FF85F264288675F9B9BC47D01 = MAZE_RUNNER_SCORCH_TRIALS | V | 0xEF93A9B69C7E165219E4D582D373320B ; AACS 2.0 MKB v60 -0x95C2AAB2BC6F840C460FF1D95D999535E487ABCF = OBLIVIONUHD_NA | V | 0x7341C2222DD981C41C2BA839E823DC84 ; AACS 2.0 MKB v60 -0x95F4B5C0786D510A784629150BB135F6A43DB691 = PatriotsDay | V | 0xED654209FF060A65905FDB73F8455E0C ; AACS 2.0 MKB v60 -0x6CE119D49B00692FFD1E2F770D67600A6CAD278D = Risen | V | 0x514833F52FE75D8C1B19F17AB805FAE8 ; AACS 2.0 MKB v60 -0x11FB7EB27F450799A0C5074C5BF3DB0718994BBD = Risen | V | 0xE2CF4C16F5D5FC3C4D67B0A31A8D3D99 ; AACS 2.0 MKB v60 -0x0CE4552928EAC3384FC497C6B289C6A21825004C = STAR TREK INTO DARKNESS | V | 0x92BF416EF42D8B8383104805200DF7D3 ; AACS 2.0 MKB v60 -0xFC60B522E2C4677C46586077DCC77FDD60C43E82 = TEENAGE MUTANT NINJA TURTLES 2 | V | 0x36EA746A0AA99A5D40BF72C5EA204ADE ; AACS 2.0 MKB v60 -0x9FA4028094CD41283259A91D30189EBEE8A0600D = THE_LEGO_MOVIE | V | 0x552A164DFD5A77C9BF192C0A769D8530 ; AACS 2.0 MKB v57 -0x2C7DF47509F7034C71B52749BA498D6545909878 = THE_SMURFS_2011 | V | 0xB5A5CCD6B1DFC3A54E7E5CED28E2452B ; AACS 2.0 MKB v60 -0xFDC927F24820C64A04C1C7D831789FEF967967F4 = The Amazing Spider-Man 2 | V | 0xB5FCE46AE8CD3AF0F66D3A873639F920 ; AACS 2.0 MKB v57 -0x38D495B7F8BAC3090CBD1E00F42BFF83A3AF4543 = The Smurfs 2 | V | 0xD57746DB0245ECD81C5D3C9F3E18863E ; AACS 2.0 MKB v57 -0x8D61117ECDAE5F27AAFAB8211307225391DD0005 = The_Magnificent_Seven_2016 | V | 0x8642C3AEFD865571FEC5D6D17438A930 ; AACS 2.0 MKB v60 -0xA89F5F51572FA3B95F2F09B1DFA78197ED45C791 = UHD_IMAX_JTS | V | 0x0CA34A150AD1E90B6A9F7793C1D05319 ; AACS 2.0 MKB v60 -0xADC766047E650953680E6720283EDFFCB7A5EE6C = UNDERWORLD_BLOOD_WARS | V | 0x0C0134CBD63486C5A24D98EB58E36233 ; AACS 2.0 MKB v60 -0xF60098581262C76272E8215514F72FB77DD04D77 = WILD | V | 0x39B020C514725A33E9D698B4B911C995 ; AACS 2.0 MKB v57 - -; 171227 - -0x1B4A5B67FB32EAF4C7507D16902394F53B7AB5C8 = BLADE_RUNNER_THE_FINAL_CUT | V | 0xB010639F51842A243202D0F44C84DB0D ; AACS 2.0 MKB v61 -0x7FA39EBFCB35E334ADC7228A7AA161885F925E46 = BLADE_RUNNER_THE_FINAL_CUT | V | 0x6173FC5543A070B20D772FE3B9E154A0 ; AACS 2.0 MKB v61 -0xB828EA0848659D175015E7A9DC26BAE5F296C741 = BLADE_RUNNER_THE_FINAL_CUT | V | 0xA262B799CACCFD75396E5D0FF73CEE3C ; AACS 2.0 MKB v61 -0x2AAAF86A3C9E5C6BF646FDCC4F36DF2BD721EEDE = BLADE_RUNNER_THE_FINAL_CUT | V | 0xFAF74CF9F9195FBC763D225971558B95 ; AACS 2.0 MKB v61 - -; 171227 - -0x60C769A868DE0661D92971613475123E6C412FFE = ADVENTURE | V | 0xAC2906BF5F06F0CDAA7471FB55BFE448 ; AACS 2.0 MKB v60 -0xE179255DF2C27CBD8ACDA524A0096426A514B68C = DEADPOOL | V | 0xAD37CB37D388078AD3EADAC3C620D2E0 ; AACS 2.0 MKB v60 -0x8D947B7F475462EC16392DE3C5795D57C00BEBE3 = DEADPOOL | V | 0xC78667A89FABB822940F384F1813270D ; AACS 2.0 MKB v60 -0x3C21494EF1C6341CB8D6BD0EF56A7ADBE731CC3F = DIVERGENT | V | 0x97251852212855EC70D8291B16A5367F ; AACS 2.0 MKB v60 -0x84F5166FCF6865D450CD423158988BF2CE77D2E5 = EDDIE THE EAGLE | V | 0xDE2CD3094DA28FA54997A3E3AC8D17C5 ; AACS 2.0 MKB v60 -0x600157391C1161E63ED09431FBD688348993D50B = EUROPE UHD | V | 0x3221C14C3CD36BA295818429DB7E5C18 ; AACS 2.0 MKB v57 -0x99FD0EEFEFB80EE44182EBB536B40D7B66EDECC6 = EVEREST | V | 0x173C2FE645A16149FC39A845FD35E5D2 ; AACS 2.0 MKB v60 -0x8C1197288A6A299A394FE48DD239320958D96E68 = HUNTSMAN_2 | V | 0x014438C1BAE5E2AAC9589DBD311BCC21 ; AACS 2.0 MKB v60 -0x27A97565287B4607A13E04C10D6CDB10A0B8D6E7 = INDEPENDENCE_DAY | V | 0x557FABEDD21631343482A165A1DAF046 ; AACS 2.0 MKB v60 -0x69594327C16879A231E457C7D103DEA81D5577C9 = KINGSMAN | V | 0x302B55550D30FC24FF1B6EBB84F14518 ; AACS 2.0 MKB v57 -0x52DBF94ED0545D2FC6E366E05B5088B78D34058C = LA_LA_LAND | V | 0xE7E42F8CE52D412C27EC2C9FB4520B30 ; AACS 2.0 MKB v60 -0x90FF09275DD73E8D7E1F1A50D9560CA9701D360B = LONESURVIVORUHD_NA | V | 0xC028CC855001DF25F9C4B773438254C8 ; AACS 2.0 MKB v60 -0x74E00F6E2607A3783A31A470DCF1B8A4FE529C82 = Life of Pi | V | 0x6C2972E897C3EB434E886296D323D127 ; AACS 2.0 MKB v60 -0x47C63B83E9DDF1693C2D9DA5DD71B89C2ACF6B53 = MAD_MAX_FURY_ROAD | V | 0x19BF1A89E655210ADF19C36DC2610AB1 ; AACS 2.0 MKB v57 -0xD7B9C4DA856C1645597A499FBAFCD962504A4C0D = MAZE_RUNNER_SCORCH_TRIALS | V | 0x31633DC7D7FC0B21AC76005D14018414 ; AACS 2.0 MKB v57 -0x2228B96FCC909FBA7A9F2384ADBEB23296803673 = NATURE | V | 0x93398D9D7E33906D25ECB99A88B112E5 ; AACS 2.0 MKB v60 -0xA64FF70E82B76C33253274B7F4F4DC011CC187A3 = OBLIVIONUHD_NA | V | 0x61721921CCC0D14FB574C4E30439157E ; AACS 2.0 MKB v60 -0x78A22188C92C46781EFE878AEC080DF3FFFB7F0B = OBLIVIONUHD_UPK1 | V | 0x973B997E20C7C11381A2BC5ED202F93C ; AACS 2.0 MKB v60 -0x4059EEC1A9E30FD51039A78D8A4DA66F59D7EF0A = Pineapple Express | V | 0xF3C4212AAFEA4DC839CA94B08E63F476 ; AACS 2.0 MKB v57 -0xBC6667D6F175EAF30029DA89BA874D016D888041 = Pride & Prejudice & Zombies | V | 0x71E963705C49EC47C67B5B8DEF870E75 ; AACS 2.0 MKB v60 -0xABB67149366BA6F12D7B33DA2F2F527F3A9C4904 = SICARIO | V | 0xD60DAE6648890A7D51A01D136F298975 ; AACS 2.0 MKB v57 -0x9711DA96F9DCC1AB608C6175B9093F555A0249AD = STAR TREK 2009 | V | 0xF09E1A5E8713EBBD7ACE21E55EF28AE6 ; AACS 2.0 MKB v60 -0x084D37F15C0324E6077F8FBF9E6A9EA7DE54F862 = SWATHUHD_NA | V | 0xC127DDFAAB512E67F6EA0BA688386F3C ; AACS 2.0 MKB v60 -0x1957E31626FF7662DDB66A5E05EF0A75677DB851 = THE MARTIAN | V | 0x61E96F49F100B1805844627BD088E41D ; AACS 2.0 MKB v60 -0x579D6E0FD3F823186CD24B861CD0DC7FAAA366E6 = THE MARTIAN EXTENDED EDITION | V | 0x59C1789176D15EBB234DF67829BA67A2 ; AACS 2.0 MKB v60 -0x66DAD1DF301EA99693FFB97B14F7DE2AD2E6B111 = THE MARTIAN EXTENDED EDITION | V | 0xFFAD3E3318472A433E021AC1C99BCF3F ; AACS 2.0 MKB v60 -0x834B104D5757F7C8A1EE80D594A033FB7C768B95 = THE MARTIAN EXTENDED EDITION | V | 0x41ACF4145244CDFDEEEAB4B5EF7BB19D ; AACS 2.0 MKB v60 -0x64C9D52F53D43C22FB1A0A7CDA7C95E88CC1A0CF = THE MAZE RUNNER | V | 0x78C701C6DC138B41512EAB9CE1309053 ; AACS 2.0 MKB v57 -0x4BFCDD5D8F047DFB625BBF52EFA680B991DB06AC = THE_REVENANT | V | 0xCBFBEBD1390351D90732953F91598EDC ; AACS 2.0 MKB v60 -0x68B68F7A91A99F438BF1C49D0E47A3ACA206F8CC = THE_REVENANT | V | 0x8161B49EBAE2612077299BDD22FD969D ; AACS 2.0 MKB v60 -0xE812E314438D4E5C3D22AAEB2E6F832010AD365F = THE_REVENANT | V | 0x81B26C26FB13B8738BAFA41CC60E7A75 ; AACS 2.0 MKB v60 -0x4A19903466BBC1FA380891676E017316117DB3E5 = The Smurfs 2 | V | 0x98BD837EB4849DF5FF065BC7D7393599 ; AACS 2.0 MKB v60 -0x5A454D0F919E97273DA868CC66A049459993FD07 = XMEN DAYS OF FUTURE PAST | V | 0x9B506D532C2850C8603250675CA3B33F ; AACS 2.0 MKB v60 - -;180108 - -0xD1F3789224630A26FEF3DD87C0F65A070D875D86 = Angry Birds Movie, The | V | 0x3585C86BB12DA0F0C7D23FD6325FB4B5 ; AACS 2.0 MKB v60 -0x6BD21A4B174060F032CBCB481595C409DA897617 = Billy_Lynns_Long_Halftime_Walk | V | 0x7F7C4DDA18D0B1AC224DCD4218744EBD ; AACS 2.0 MKB v60 -0xBF817D024CFEC402F151D06720C19EA83ADB2CB2 = CRIMINAL | V | 0x83E6E9AE9996AA4B47CECC6E6E6E7C4D ; AACS 2.0 MKB v60 -0xE6E3BC002BA008A32DF6BBA2F787218E7846B241 = Crouching Tiger, Hidden Dragon | V | 0x110156C189FCD0C23927B1BE76682293 ; AACS 2.0 MKB v60 -0xF58AA868C40D5894C332F9BDB978522432D5CC82 = DEADPOOL | V | 0x2113A68309292AA60D04EDBD082D3B19 ; AACS 2.0 MKB v60 -0x9A300ABFF66087B268987778C56DD51AABC6F4BA = DIVERGENT | V | 0xED91ED4CC8F2F3C613D0408634334610 ; AACS 2.0 MKB v60 -0x0774EEA42936B552B4EFD3D6B3565082EF54D37C = FANTASTIC FOUR | V | 0xD0866EAC06470F6FAD94DD3B65A07364 ; AACS 2.0 MKB v60 -0x6D1C604A8F88DB9D5D9862CB66C082F7BD05E5D4 = FUKKATSUNOHI_UHDBD | V | 0x5F8D2236EA05714A6B3AF839992FD1BB ; AACS 2.0 MKB v60 -0xCBB88F84B7D3C80CA3452D51F029FA94770A81EA = HUNTSMAN_2 | V | 0x27BBCCF391E64FA0AB7A2FA3513DC57C ; AACS 2.0 MKB v60 -0x5DC01BB8221DE9D138D005B60955BC69E5CC76E4 = KINGSMAN | V | 0x67EC02A0C0D90CA95D9FDE4A6207BBF5 ; AACS 2.0 MKB v60 -0x4A9C63C375F54582F51D6B0827E589AEB865A346 = LUCYUHD_NA | V | 0x79589843C4F7B2D89D6661547BAEDA97 ; AACS 2.0 MKB v60 -0xF37582A3889116E0B2A287951320A1227FA982C8 = OBLIVIONUHD_NA | V | 0x24CCEBB77F756EA19675EC1C39A6B9A5 ; AACS 2.0 MKB v60 -0xAD090395DEAF48E54D2C23D2FF88CD1F137EC21A = SWATHUHD_UPK1 | V | 0xB811A5F363E6628EF6AE8A7CE8224124 ; AACS 2.0 MKB v60 -0x9436DA7560AC8B3748CED20C2BDC2B9AE39FBC2C = THE MARTIAN EXTENDED EDITION | V | 0xF3724DC4CC4E75371E91C14A41720EDA ; AACS 2.0 MKB v60 -0x7B78BAFCB4FD22FD9C73BECB6B078AF8FEC1C9E6 = WildesVenedig | V | 0x2FBDAD7F7F0B589158A096E98A745D92 ; AACS 2.0 MKB v60 - -; 180311 - -0x99976B2B197F01399438DB0AA51704D6388A51D6 = BEAUTY_AND_THE_BEAST (Beauty And The Beast (Live Action) - Blu-ray™) | D | 2017-04-20 | V | 0xF4BE6C6D5CA1BF05CE7A5936B81E91D9 | M | 0x7B6CD136C173F41A71D0B718A5285E7A | I | 0x486331CE0A44167B176A86F5B4D42B2F | U | 1-0x18E3D853886629A8D04DC99190D9090F | 2-0x26FEECF29AE73AB184E815244ECA8066 | 3-0x36B45A820392867605D718D28980D7E3 | 4-0xEF5F4416BF6F146CF86C38BF284C6C18 | 5-0x2F3CC513CA5CE10D632A0683D2929483 | 6-0x68A7C88C54D7DB93BD094E199EA5FA02 | 7-0x59FECBEDBF40B1E1FCA04F9AAAD66336 ; MKBv57/FindVUK 1.09 -0x0662B401995F75D32DA25ED9B875F9CF95B59F02 = LOGAN (LOGAN) | D | 2017-03-22 | V | 0x2E0CADD602AFB631A0C415006B2DAB57 | M | 0xB49EF4718DE4077BC796D7A564FF82AE | I | 0x252ABCDBF648881233967530871188E2 | U | 1-0x938DEA19173E14F9984CA01B6D20FEF8 ; MKBv57/BD+/BEE/VUKNOTVAL!/FindVUK 1.09 -0xCFC68F3D31093942BE12908CED8C02C4494F1C5E = Deadpool (Deadpool) | D | 2016-02-23 | V | 0xA4944CD349ABF30495041421CF5E0D9E | M | 0x1DA932EC0D68D8E635A23CD6F22907D0 | I | 0xD64682B838C640CB8140B6A584A66521 | U | 1-0x3CEC3BE61A0866A62B7FF59744209ED9 ; MKBv46/BD+/BEE/VUKNOTVAL!/FindVUK 1.09 - - -; 180325 - -0x7C6B3E83C66795F42C186390E1D3F4AF63ECE3F4 = Ghost_in_the_Shell (Ghost in the Shell) | D | 2017-05-17 | V | 0x53DDDF79E6E38832F339D86679082164 | M | 0x6E3BE91C4FEEF126F3386FCC070235A9 | I | 0xF07525B3E6F188EA8CDEB37181742E82 | U | 1-0x4A475A3E918C78EA4C47ACF354BE44DD | 2-0x63AA0A7852EAAFD09CBDC03B27D639D5 | 3-0x98B3340E420FAFC22D53BB433DC99ACA | 4-0xA844D31FD1A4BB72B9BBA8C69DBADD48 | 5-0xFA5D94B46B69841861767FA719958D6D | 6-0x27742EF11DF47F28E8E0C26BF6FBC376 | 7-0x6FC302558E3380AA1B7E2C84A80021CA ; MKBv58/BEE/FindVUK 1.10 -0x224CC9F95E46281844632871FEC85B475B9D68F7 = Life of Pi (Life of Pi) | D | 2012-11-29 | V | 0xAF6E8880FB2C7CD2FCCCAC96F1586D91 | M | 0x2ACF65F444FB8D18EEA68D94A4543F3E | I | 0x40CB5633AEA7BF023C2EA75CA77DAFFE | U | 1-0x2F9F6351D03778CFEE0003DC8A8A768A | 2-0x85581552DC02679109AF39A4EA5077EB | 3-0x407D2D5D1BE67544B947F8D35F23836D | 4-0xACCF42DE44C9959F6DAC707A952C8CC3 | 5-0xEE6D398A14C18F8CDDF117C71E9A77DC | 6-0x6275E3CFA2604E8526B5A28EAAD15B0D | 7-0x6A8CFA7364626913E07F24AF1261A893 ; MKBv31/BD+/FindVUK 1.10 -0x2F4CD0B0E9CA02ECCB5F4A577865387B0AA44672 = LIFE_OF_PI (Life of Pi) | D | 2013-01-08 | V | 0x03700D9950B623EDC81208D033501BDF | M | 0xD761B441016D4369C18062014CE16971 | I | 0x1E30D1653B7C283FC99F86E886C905C3 | U | 1-0x5F215B12866FEBC2EDC841DBCD5D2365 | 2-0x85581552DC02679109AF39A4EA5077EB | 3-0xFA4C2106B7071FA0F55058C143552D5B | 4-0xC89125680D865BB9802EEA28A8A72A6E | 5-0x93645DFF36F29328A4C393DE5052309C | 6-0x6035F49D64042070796E31994038D5C0 | 7-0x16485874C6513CBFD2B50C054FE37183 ; MKBv31/BD+/FindVUK 1.10 - -0xDC0F3AE11E7494784F439BF26149945CAA74646B = KULT_UNPLUGGED (KULT_UNPLUGGED) | D | 2010-11-25 | V | 0x24AAE5B04B199EBC71AE45A201152EDC | M | 0x12B215A9E9F80BC0E20667D4BBA35869 | I | 0x8F90B85DDED3FF624F5B98EC98CD6B48 | U | 1-0xE964931366FFDFD6CFCF71A37B521409 ; MKBv19/FindVUK 1.10 -0x0081612DEC4CDC8E841B30C535E32D1106A66FF6 = CLOUD ATLAS (Cloud Atlas) | D | 2013-02-25 | V | 0x86EFDB701B2B3DB01677DDBF165C3E0C | M | 0x2B4BE0A04BBC3BE4046B461CCAACCE90 | I | 0xF03119F587F8BBD3C3460AE9A9AA5596 | U | 1-0xAEE4967BD302C4F90563D62CD52AD1DA ; MKBv37/FindVUK 1.10 -0x9A6A994B092ACEB8A15203E5FD233C690C47C07E = Gravity (Gravity) | D | 2014-01-13 | V | 0x33C83F579F161ADB4588B5DD48FC7728 | M | 0x2DABBFCA8F7E1E0397D3EF1627AE614D | I | 0x744DBC915C4D61B9BE074AB18A902FEA | U | 1-0x91927F8ED9EDE468B09D10892281337C ; MKBv36/FindVUK 1.10 -0x017BC6FD72FE93D1EDADBEF13C0137E937BA0466 = Gravity (Gravity) | D | 2013-12-25 | V | 0xB80C0AB6D9EAE71F627960C4041ED249 | M | 0x0460DE567630A7D613197805501B2A3F | I | 0x430C779EDE6B6DA0C05ABFCDBFEC503B | U | 1-0x4339EDFAB90FF4751624654ECEB0CBF7 ; MKBv36/FindVUK 1.10 -0x080FFA6B5E0F07376539A36556AB0BE734585F16 = MAD_MAX_FURY_ROAD (Mad Max: Fury Road) | D | 2015-06-30 | V | 0x9F25E37CF8FF2C191CED00FE6F69865E | M | 0xF21604EDFF6BFBC52F6D46DFB104D4F7 | I | 0x848621D9425D990AA31F8D96BF95A9FE | U | 1-0x5FC93D3947A4BC9A69D81D7DF1D130DB ; MKBv50/FindVUK 1.10 -0x46E2300DD7CB21605C2972318F6563EF04F250CE = AVATAR_CE_D1 (Extended Collector’s Edition Disc 1) | D | 2010-10-23 | V | 0x5555A8B25AF8AFDE6D349C7A878560AE | M | 0x5EC6123FADA90A969CEC952F97123B23 | I | 0x3B57C3830E9BC63E0FD327EAA7CBF02E | U | 1-0x46F35E2A085F23D18D83455C66D554EE | 2-0x85581552DC02679109AF39A4EA5077EB | 3-0x6E95952A77C12F1AE712BF8424034768 | 4-0x9CEA8116268AED0CBE1F26BD84A82177 | 5-0xDF71DDEF3F7B984A5664C953F300D10E | 6-0xA3521673835607B2457BFEC3A8DB4D32 | 7-0xD709EC6FE451EDAABEC80FF2DA02DE5B ; MKBv19/BD+/FindVUK 1.10 -0x263BCF0999438AAF75A0715E09F03A07654A1B88 = AVATAR_CE_D2 (Extended Collector's Edition Disc 2) | D | 2010-10-12 | V | 0x00145EF78C7FBF35DEE2F0DA99C44A5E | M | 0xD86BFF834ECC114B940F5340544924A0 | I | 0x2B5B1F91830B189161D988488869A70E | U | 1-0xCF4807A2DD84F2916FB28063EF0B9C24 | 2-0x85581552DC02679109AF39A4EA5077EB | 3-0x55DCCF1BEDD56028FEA6DF1836C579D9 | 4-0xDAA82208915546D05B0271C861625E2C | 5-0xC3DC835763DB9DB088ED52CBBB0A8260 | 6-0x8C87E16F7A2A56185C4913EA4707F3F8 | 7-0xD049AF2734DA17982AFFD307399F6E4C ; MKBv19/BD+/FindVUK 1.10 -0xD341B041D946A38ECB506ED9B9199E558A4C51C6 = AVATAR_CE_D3 (Extended Collector's Edition Disc 3) | D | 2010-10-17 | V | 0x49CC344F97AA8FCEB6FB637236216ACF | M | 0x402D441FC38A1D501F9A4BAC29BD14CB | I | 0x876E8011A62BD0F2E8EDD14791668D6A | U | 1-0x57B2B7455BE7D0FF509DEB896451018F | 2-0x85581552DC02679109AF39A4EA5077EB | 3-0x5165369E2E5D6DE24B939FF997391CF2 | 4-0x6412BD27A661E8913ED9F6B8560F42AC | 5-0xDF211DC3E2D20F85D883CA56D6DB562E | 6-0x3BE7897628E3F51F6DB32391F3FC73F7 | 7-0x6537225784620A243F9B4595AE84D654 ; MKBv19/FindVUK 1.10 diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml deleted file mode 100644 index 39b80d7e..00000000 --- a/home/.config/alacritty/alacritty.yml +++ /dev/null @@ -1,192 +0,0 @@ -window: - opacity: 1.0 - dimensions: - columns: 0 - lines: 0 - padding: - x: 30 - y: 20 - dynamic_padding: false - dynamic_title: true - decorations: full - -scrolling: - history: 10000 - multiplier: 3 - -font: - normal: - family: Hack Nerd Font Mono - size: 12.0 - offset: - x: 0 - y: 0 - glyph_offset: - x: 0 - y: 0 - use_thin_strokes: true - -# Colors (One Dark) -colors: - # Default colors - primary: - background: '0x282c34' - foreground: '0xabb2bf' - - # Cursor colors - cursor: - text: '0x282c34' - cursor: '0xabb2bf' - - # Normal colors - normal: - black: '0x282c34' - red: '0xe06c75' - green: '0x98c379' - yellow: '0xe5c07b' - blue: '0x61afef' - magenta: '0xc678dd' - cyan: '0x56b6c2' - white: '0xabb2bf' - - # Bright colors - bright: - black: '0x3e4452' - red: '0xbe5046' - green: '0x98c379' - yellow: '0xd19a66' - blue: '0x61afef' - magenta: '0xc678dd' - cyan: '0x56b6c2' - white: '0x5c6370' - -bell: - animation: EaseOutExpo - duration: 0 - color: '#ffffff' - -mouse_bindings: - - { mouse: Middle, action: PasteSelection } - -mouse: - double_click: { threshold: 300 } - triple_click: { threshold: 300 } - hide_when_typing: false - -selection: - semantic_escape_chars: ',│`|:"'' ()[]{}<>' - save_to_clipboard: false - -cursor: - style: Block - unfocused_hollow: true - -live_config_reload: true - -enable_experimental_conpty_backend: true - -alt_send_esc: true - -key_bindings: - - { key: Paste, action: Paste } - - { key: Copy, action: Copy } - - { key: L, mods: Control, action: ClearLogNotice } - - { key: L, mods: Control, chars: "\x0c" } - - { key: Home, chars: "\x1bOH", mode: AppCursor } - - { key: Home, chars: "\x1b[H", mode: ~AppCursor } - - { key: End, chars: "\x1bOF", mode: AppCursor } - - { key: End, chars: "\x1b[F", mode: ~AppCursor } - - { key: PageUp, mods: Shift, action: ScrollPageUp, mode: ~Alt } - - { key: PageUp, mods: Shift, chars: "\x1b[5;2~", mode: Alt } - - { key: PageUp, mods: Control, chars: "\x1b[5;5~" } - - { key: PageUp, chars: "\x1b[5~" } - - { key: PageDown, mods: Shift, action: ScrollPageDown, mode: ~Alt } - - { key: PageDown, mods: Shift, chars: "\x1b[6;2~", mode: Alt } - - { key: PageDown, mods: Control, chars: "\x1b[6;5~" } - - { key: PageDown, chars: "\x1b[6~" } - - { key: Tab, mods: Shift, chars: "\x1b[Z" } - - { key: Back, chars: "\x7f" } - - { key: Back, mods: Alt, chars: "\x1b\x7f" } - - { key: Insert, chars: "\x1b[2~" } - - { key: Delete, chars: "\x1b[3~" } - - { key: Left, mods: Shift, chars: "\x1b[1;2D" } - - { key: Left, mods: Control, chars: "\x1b[1;5D" } - - { key: Left, mods: Alt, chars: "\x1b[1;3D" } - - { key: Left, chars: "\x1b[D", mode: ~AppCursor } - - { key: Left, chars: "\x1bOD", mode: AppCursor } - - { key: Right, mods: Shift, chars: "\x1b[1;2C" } - - { key: Right, mods: Control, chars: "\x1b[1;5C" } - - { key: Right, mods: Alt, chars: "\x1b[1;3C" } - - { key: Right, chars: "\x1b[C", mode: ~AppCursor } - - { key: Right, chars: "\x1bOC", mode: AppCursor } - - { key: Up, mods: Shift, chars: "\x1b[1;2A" } - - { key: Up, mods: Control, chars: "\x1b[1;5A" } - - { key: Up, mods: Alt, chars: "\x1b[1;3A" } - - { key: Up, chars: "\x1b[A", mode: ~AppCursor } - - { key: Up, chars: "\x1bOA", mode: AppCursor } - - { key: Down, mods: Shift, chars: "\x1b[1;2B" } - - { key: Down, mods: Control, chars: "\x1b[1;5B" } - - { key: Down, mods: Alt, chars: "\x1b[1;3B" } - - { key: Down, chars: "\x1b[B", mode: ~AppCursor } - - { key: Down, chars: "\x1bOB", mode: AppCursor } - - { key: F1, chars: "\x1bOP" } - - { key: F2, chars: "\x1bOQ" } - - { key: F3, chars: "\x1bOR" } - - { key: F4, chars: "\x1bOS" } - - { key: F5, chars: "\x1b[15~" } - - { key: F6, chars: "\x1b[17~" } - - { key: F7, chars: "\x1b[18~" } - - { key: F8, chars: "\x1b[19~" } - - { key: F9, chars: "\x1b[20~" } - - { key: F10, chars: "\x1b[21~" } - - { key: F11, chars: "\x1b[23~" } - - { key: F12, chars: "\x1b[24~" } - - { key: F1, mods: Shift, chars: "\x1b[1;2P" } - - { key: F2, mods: Shift, chars: "\x1b[1;2Q" } - - { key: F3, mods: Shift, chars: "\x1b[1;2R" } - - { key: F4, mods: Shift, chars: "\x1b[1;2S" } - - { key: F5, mods: Shift, chars: "\x1b[15;2~" } - - { key: F6, mods: Shift, chars: "\x1b[17;2~" } - - { key: F7, mods: Shift, chars: "\x1b[18;2~" } - - { key: F8, mods: Shift, chars: "\x1b[19;2~" } - - { key: F9, mods: Shift, chars: "\x1b[20;2~" } - - { key: F10, mods: Shift, chars: "\x1b[21;2~" } - - { key: F11, mods: Shift, chars: "\x1b[23;2~" } - - { key: F12, mods: Shift, chars: "\x1b[24;2~" } - - { key: F1, mods: Control, chars: "\x1b[1;5P" } - - { key: F2, mods: Control, chars: "\x1b[1;5Q" } - - { key: F3, mods: Control, chars: "\x1b[1;5R" } - - { key: F4, mods: Control, chars: "\x1b[1;5S" } - - { key: F5, mods: Control, chars: "\x1b[15;5~" } - - { key: F6, mods: Control, chars: "\x1b[17;5~" } - - { key: F7, mods: Control, chars: "\x1b[18;5~" } - - { key: F8, mods: Control, chars: "\x1b[19;5~" } - - { key: F9, mods: Control, chars: "\x1b[20;5~" } - - { key: F10, mods: Control, chars: "\x1b[21;5~" } - - { key: F11, mods: Control, chars: "\x1b[23;5~" } - - { key: F12, mods: Control, chars: "\x1b[24;5~" } - - { key: F1, mods: Alt, chars: "\x1b[1;6P" } - - { key: F2, mods: Alt, chars: "\x1b[1;6Q" } - - { key: F3, mods: Alt, chars: "\x1b[1;6R" } - - { key: F4, mods: Alt, chars: "\x1b[1;6S" } - - { key: F5, mods: Alt, chars: "\x1b[15;6~" } - - { key: F6, mods: Alt, chars: "\x1b[17;6~" } - - { key: F7, mods: Alt, chars: "\x1b[18;6~" } - - { key: F8, mods: Alt, chars: "\x1b[19;6~" } - - { key: F9, mods: Alt, chars: "\x1b[20;6~" } - - { key: F10, mods: Alt, chars: "\x1b[21;6~" } - - { key: F11, mods: Alt, chars: "\x1b[23;6~" } - - { key: F12, mods: Alt, chars: "\x1b[24;6~" } - - { key: F1, mods: Super, chars: "\x1b[1;3P" } - - { key: F2, mods: Super, chars: "\x1b[1;3Q" } - - { key: F3, mods: Super, chars: "\x1b[1;3R" } - - { key: F4, mods: Super, chars: "\x1b[1;3S" } - - { key: F5, mods: Super, chars: "\x1b[15;3~" } - - { key: F6, mods: Super, chars: "\x1b[17;3~" } - - { key: F7, mods: Super, chars: "\x1b[18;3~" } - - { key: F8, mods: Super, chars: "\x1b[19;3~" } - - { key: F9, mods: Super, chars: "\x1b[20;3~" } - - { key: F10, mods: Super, chars: "\x1b[21;3~" } - - { key: F11, mods: Super, chars: "\x1b[23;3~" } - - { key: F12, mods: Super, chars: "\x1b[24;3~" } - - { key: NumpadEnter, chars: "\n" } diff --git a/home/.config/aria2/aria2.conf b/home/.config/aria2/aria2.conf deleted file mode 100644 index 7a514d97..00000000 --- a/home/.config/aria2/aria2.conf +++ /dev/null @@ -1,9 +0,0 @@ -continue -file-allocation=falloc -log-level=warn -max-connection-per-server=4 -max-concurrent-downloads=3 -max-overall-download-limit=0 -min-split-size=5M -enable-http-pipelining=true -rpc-secret="{{@@ env['PASS_ARIA2'] @@}}" diff --git a/home/.config/beets/config.yaml b/home/.config/beets/config.yaml deleted file mode 100644 index cea0277d..00000000 --- a/home/.config/beets/config.yaml +++ /dev/null @@ -1,39 +0,0 @@ -directory: ~/Music -library: ~/Music/beets.db -plugins: - - edit - - fetchart - - fuzzy - - info - - lastgenre - - lyrics - # - mbcollection - - mpdupdate - - play - - replaygain - - thumbnails - - web -import: - write: yes - copy: yes -lastgenre: - whitelist: ~/.config/beets/whitelist -lyrics: - fallback: '' -play: - command: mpv --no-vid --no-resume-playback -mpd: - host: localhost - port: 6600 - password: "{{@@ env['PASS_MPD_ADMIN'] @@}}" -follow: - email: reekymarko@reekynet.com - password: "{{@@ env['PASS_MUSPY'] @@}}" - userid: w8njp08ude90mfzsgumjhqinnirj4g - auto: yes -replaygain: - backend: gstreamer - auto: yes -#mbcollection: -# auto: 'yes' -# collection: 'a4955b5c-db7f-4e27-9887-f77f820bad34' diff --git a/home/.config/beets/whitelist b/home/.config/beets/whitelist deleted file mode 100644 index ac9ac916..00000000 --- a/home/.config/beets/whitelist +++ /dev/null @@ -1,37 +0,0 @@ -avantgarde -experimental music -lofi -blues -classical -comedy -comedy music -comedy rock -humor -parody music -standup -country -country rap -country rock -rockabilly -easy listening -electronic -drum and bass -hardcore -house -techno -uk garage -dubstep -rap -folk -hip hop -countryrap -rap rock -jazz -pop -rhythm and blues -rock -hard rock -alternative rock -heavy metal -punk rock -reggae diff --git a/home/.config/bspwm/bspwmrc b/home/.config/bspwm/bspwmrc deleted file mode 100755 index 10efe887..00000000 --- a/home/.config/bspwm/bspwmrc +++ /dev/null @@ -1,75 +0,0 @@ -#! /bin/sh - -# set screen timeout -xset s 300 120 -xset dpms 422 - -# screen locker -xss-lock -n ~/Scripts/dim-screen.sh -- evenbetterlockscreen -l & - -# lock screen -evenbetterlockscreen -l & - -# set wallpaper -wal -R - -# Start hotkey daemon -sxhkd & - -bspc monitor -d web term chat mail music 6 7 - -bspc config border_width 0 -bspc config window_gap 37 - -bspc config split_ratio 0.52 -bspc config borderless_monocle true -bspc config gapless_monocle true - -bspc rule -a TelegramDesktop desktop=^3 -bspc rule -a Franz desktop=^3 -bspc rule -a Thunderbird desktop=^4 - -bspc rule -a Zathura state=tiled -bspc rule -a Nightly:Navigator state=tiled -bspc rule -a kdeconnect-indicator state=tiled -bspc rule -a libreoffice state=tiled -bspc rule -a Screenkey manage=off - -bspc config super mod4 -bspc config pointer_action1 move -bspc config pointer_action2 none -bspc config pointer_action3 resize_corner -bspc config click_to_focus true - -# set pywal colors -. "${HOME}/.cache/wal/colors.sh" -bspc config normal_border_color "$color1" -bspc config active_border_color "$color2" -bspc config focused_border_color "$color15" -bspc config presel_feedback_color "$color1" - - -# set cursor style -xsetroot -cursor_name left_ptr - -# startup applications -joplin-desktop & -compton -f --config ~/.config/compton/config & -redshift & -/usr/lib/xfce4/notifyd/xfce4-notifyd & -telegram-desktop & -setxkbmap eu & -/usr/lib/kdeconnectd & -kdeconnect-indicator & -udiskie --tray & -xfce4-clipman & -/usr/bin/gnome-keyring-daemon --start --components=secrets & -~/Scripts/polybar.sh & -/usr/lib/mate-polkit/polkit-mate-authentication-agent-1 & -blueberry-tray & -nm-applet & -thunderbird & -mpDris2 & - -# hide mouse cursor -unclutter -idle 1 & diff --git a/home/.config/compton/config b/home/.config/compton/config deleted file mode 100644 index 79996456..00000000 --- a/home/.config/compton/config +++ /dev/null @@ -1,53 +0,0 @@ -backend = "glx"; -glx-no-stencil = true; -glx-copy-from-front = false; -glx-swap-method = 1; -inactive-opacity-override = true; - -# Fix tearing -vsync = "opengl-swc"; -unredir-if-possible = false; -paint-on-overlay = true; - -# Shadow -shadow = true; # Enabled client-side shadows on windows. -no-dock-shadow = true; # Avoid drawing shadows on dock/panel windows. -no-dnd-shadow = true; # Don't draw shadows on DND windows. -shadow-radius = 10; # The blur radius for shadows. (default 12) -shadow-offset-x = -15; # The left offset for shadows. (default -15) -shadow-offset-y = -15; # The top offset for shadows. (default -15) -shadow-opacity = 0.5; -menu-opacity = 1; -shadow-exclude = [ - "class_g = 'slop'", - "n:e:Notification", - "class_g ?= 'Xfce4-notifyd'", - #"class_g ?= 'Xfce4-power-manager'" -]; - -opacity-rule = [ - "50:class_g = 'Bspwm' && class_i = 'presel_feedback'", - "99:class_g = 'slop'" -]; - -# The shadow exclude options are helpful if you have shadows enabled. Due to the way compton draws its shadows, certain applications will have visual glitches -# (most applications are fine, only apps that do weird things with xshapes or argb are affected). -# This list includes all the affected apps I found in my testing. The "! name~=''" part excludes shadows on any "Unknown" windows, this prevents a visual glitch with the XFWM alt tab switcher. - -# Fading -fading = true; # Fade windows during opacity changes. -fade-delta = 4; # The time between steps in a fade in milliseconds. (default 10). -fade-in-step = 0.03; # Opacity change between steps while fading in. (default 0.028). -fade-out-step = 0.03; # Opacity change between steps while fading out. (default 0.03). -no-fading-openclose = false; # Fade windows in/out when opening/closing - -detect-client-opacity = true; # This prevents opacity being ignored for some apps. For example without this enabled my xfce4-notifyd is 100% opacity no matter what. - -#Window type settings -wintypes: -{ - tooltip = { fade = true; shadow = false; }; - menu = { shadow = false; }; - dropdown_menu = { shadow = false; }; - popup_menu = { shadow = false; }; -}; diff --git a/home/.config/dconf.ini b/home/.config/dconf.ini deleted file mode 100644 index 15d59d20..00000000 --- a/home/.config/dconf.ini +++ /dev/null @@ -1,88 +0,0 @@ -[io/github/celluloid-player/celluloid] -dark-theme-enable=false -mpv-config-enable=true -mpv-config-file='file:///home/{{@@ env['USER'] @@}}/.config/mpv/mpv.conf' -mpv-input-config-enable=true -mpv-input-config-file='file:///home/{{@@ env['USER'] @@}}/.config/mpv/input.conf' -settings-migrated=true - -[org/gnome/Connections] -first-run=false - -[org/gnome/shell/weather] -automatic-location=false -locations=[<(uint32 2, <('Lappeenranta', 'EFLP', false, [(1.0654507804726074, 0.49128594181309354)], @a(dd) [])>)>] - -[org/gnome/Weather] -locations=[<(uint32 2, <('Lappeenranta', 'EFLP', false, [(1.0654507804726074, 0.49128594181309354)], @a(dd) [])>)>] - -[org/gnome/shell/world-clocks] -locations=[<(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>] - -[org/gnome/clocks] -world-clocks=[{'location': <(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>}] - -[org/gnome/desktop/a11y/mouse] -dwell-click-enabled=false -dwell-threshold=10 -dwell-time=1.2 -secondary-click-enabled=true -secondary-click-time=1.2 - -[org/gnome/desktop/calendar] -show-weekdate=true - -[org/gnome/desktop/input-sources] -show-all-sources=true -sources=[('xkb', 'eu'), ('xkb', 'fi')] -xkb-options=['lv3:ralt_switch'] - -[org/gnome/desktop/peripherals/touchpad] -tap-to-click=true -two-finger-scrolling-enabled=true - -[org/gnome/desktop/privacy] -disable-microphone=false -old-files-age=uint32 14 -recent-files-max-age=-1 -remove-old-temp-files=true -remove-old-trash-files=true - -[org/gnome/desktop/wm/keybindings] -close=['w'] -move-to-workspace-down=['j'] -move-to-workspace-left=['h'] -move-to-workspace-right=['l'] -move-to-workspace-up=['k'] -switch-to-workspace-down=['j'] -switch-to-workspace-left=['h'] -switch-to-workspace-right=['l'] -switch-to-workspace-up=['k'] -toggle-fullscreen=@as [] -toggle-maximized=['f'] - -[org/gnome/settings-daemon/plugins/media-keys] -custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/'] -screensaver=['BackSpace'] -www=['b'] -volume-step=1 - -[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0] -binding='Return' -command='kgx' -name='Open terminal' - -[org/gnome/file-roller/dialogs/new] -default-extension='.tar.zst' - -[org/gnome/software] -check-timestamp=int64 1667730233 -download-updates=true -download-updates-notify=true -first-run=false - -[org/gnome/system/location] -enabled=true - -[org/gnome/tweaks] -show-extensions-notice=false diff --git a/home/.config/efm-langserver/config.yaml b/home/.config/efm-langserver/config.yaml deleted file mode 100644 index 7b447d0d..00000000 --- a/home/.config/efm-langserver/config.yaml +++ /dev/null @@ -1,6 +0,0 @@ -languages: - markdown: - lint-command: 'yarn --cwd ~/.bin/node run markdownlint -s' - lint-stdin: true - lint-formats: - - '%f: %l: %m' diff --git a/home/.config/electron-flags.conf b/home/.config/electron-flags.conf deleted file mode 100644 index 51bdd86f..00000000 --- a/home/.config/electron-flags.conf +++ /dev/null @@ -1,2 +0,0 @@ ---enable-features=UseOzonePlatform ---ozone-platform=wayland diff --git a/home/.config/electron12-flags.conf b/home/.config/electron12-flags.conf deleted file mode 100644 index 51bdd86f..00000000 --- a/home/.config/electron12-flags.conf +++ /dev/null @@ -1,2 +0,0 @@ ---enable-features=UseOzonePlatform ---ozone-platform=wayland diff --git a/home/.config/environment.d/firefox.conf b/home/.config/environment.d/firefox.conf deleted file mode 100644 index a882e761..00000000 --- a/home/.config/environment.d/firefox.conf +++ /dev/null @@ -1,3 +0,0 @@ -MOZ_ENABLE_WAYLAND=1 -MOZ_USE_XINPUT2=1 -MOZ_WEBRENDER=1 diff --git a/home/.config/environment.d/sway.conf b/home/.config/environment.d/sway.conf deleted file mode 100644 index 449de9ba..00000000 --- a/home/.config/environment.d/sway.conf +++ /dev/null @@ -1,14 +0,0 @@ -# Fix java on wayland -_JAVA_AWT_WM_NONREPARENTING=1 -_JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' - -# Enable qt5 theming and wayland support -QT_QPA_PLATFORMTHEME=qt5ct -QT_QPA_PLATFORM=wayland-egl -QT_WAYLAND_DISABLE_WINDOWDECORATION=1 - -# Fix redshift on wlroots -WLR_DRM_NO_ATOMIC=1 - -# Use wayland in SDL2 -SDL_VIDEODRIVER=wayland diff --git a/home/.config/flashfocus/flashfocus.yml b/home/.config/flashfocus/flashfocus.yml deleted file mode 100644 index 7708f4f1..00000000 --- a/home/.config/flashfocus/flashfocus.yml +++ /dev/null @@ -1,8 +0,0 @@ -flash-opacity: 0.8 -default-opacity: 1 -time: 300 -simple: false -ntimepoints: 10 -flash-on-focus: true -flash-fullscreen: true -flash-lone-windows: 'always' diff --git a/home/.config/fontconfig/fonts.conf b/home/.config/fontconfig/fonts.conf deleted file mode 100644 index f00c9381..00000000 --- a/home/.config/fontconfig/fonts.conf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - sans-serif - - Overpass - - - - serif - - Overpass - - - - monospace - - Hack Nerd Font Mono - - - diff --git a/home/.config/foot/foot-light.ini b/home/.config/foot/foot-light.ini deleted file mode 100644 index 47cc25dd..00000000 --- a/home/.config/foot/foot-light.ini +++ /dev/null @@ -1,45 +0,0 @@ -pad=10x0 -dpi-aware=yes - -[scrollback] -lines=1000 - -[cursor] -blink=yes - -[mouse] -hide-when-typing=yes - -[colors] -foreground = 545464 -background = f2ecbc - -selection-foreground = 43436c -selection-background = c9cbd1 - -regular0 = 1F1F28 -regular1 = c84053 -regular2 = 6f894e -regular3 = 77713f -regular4 = 4d699b -regular5 = b35b79 -regular6 = 597b75 -regular7 = 545464 - -bright0 = 8a8980 -bright1 = d7474b -bright2 = 6e915f -bright3 = 836f4a -bright4 = 6693bf -bright5 = 624c83 -bright6 = 5e857a -bright7 = 43436c - - -16 = cc6d00 -17 = e82424 - -[csd] -color = fff2ecbc -button-color = ff545464 -hide-when-maximized = yes diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini deleted file mode 100644 index eb9fd24c..00000000 --- a/home/.config/foot/foot.ini +++ /dev/null @@ -1,44 +0,0 @@ -pad=10x0 -dpi-aware=yes - -[scrollback] -lines=1000 - -[cursor] -blink=yes - -[mouse] -hide-when-typing=yes - -[colors] -foreground = dcd7ba -background = 1f1f28 - -selection-foreground = c8c093 -selection-background = 2d4f67 - -regular0 = 090618 -regular1 = c34043 -regular2 = 76946a -regular3 = c0a36e -regular4 = 7e9cd8 -regular5 = 957fb8 -regular6 = 6a9589 -regular7 = c8c093 - -bright0 = 727169 -bright1 = e82424 -bright2 = 98bb6c -bright3 = e6c384 -bright4 = 7fb4ca -bright5 = 938aa9 -bright6 = 7aa89f -bright7 = dcd7ba - -16 = ffa066 -17 = ff5d62 - -[csd] -color = ff1f1f28 -button-color = ffdcd7ba -hide-when-maximized = yes diff --git a/home/.config/git/config b/home/.config/git/config deleted file mode 100644 index dde22dfc..00000000 --- a/home/.config/git/config +++ /dev/null @@ -1,59 +0,0 @@ -[user] -email = marko.korhonen@rossum.fi -name = Marko Korhonen -signingkey = F2B9F713E7ED627336DD85E444FA3F28CD931BB0 - -[commit] -signoff = true -gpgsign = true - -[tag] -gpgSign = true -signoff = true - -[format] -signoff = true - -[merge] -prompt = false -conflictstyle = diff3 -tool = nvim - -[mergetool] -keepBackup = false -prompt = false - -[mergetool "nvim"] -cmd = nvim +DiffviewOpen - -[pull] -rebase = merges - -[alias] -mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 -upstream = !git push -u origin HEAD -sync = !git pull && git push -recommit = !git commit -eF $(git rev-parse --git-dir)/COMMIT_EDITMSG -pull-merge = pull --no-rebase --no-ff --no-edit -log-merge = log -i --grep=merge --pretty=oneline -log-fp = log --first-parent --pretty=oneline -ll = log --pretty=oneline - -[color] -pager = no - -[init] -defaultBranch = main - -[credential] -helper = cache --timeout=600 -helper = !pass-git-helper $@ - -[rerere] -enabled = true - -[submodule] -recurse = true - -[push] -recurseSubmodules = check diff --git a/home/.config/gtk-3.0/gtk.css b/home/.config/gtk-3.0/gtk.css deleted file mode 100644 index da7a019d..00000000 --- a/home/.config/gtk-3.0/gtk.css +++ /dev/null @@ -1,4 +0,0 @@ -VteTerminal, -vte-terminal { - padding: 40px; -} diff --git a/home/.config/i3/config b/home/.config/i3/config deleted file mode 100644 index 8a57b58a..00000000 --- a/home/.config/i3/config +++ /dev/null @@ -1,266 +0,0 @@ -# ~/.config/i3/config - -client.focused #3F8AC2 #096BAA #00BAA7 #00DA8E -client.focused_inactive #333333 #5F676A #ffffff #484e50 -client.unfocused #333333 #424242 #888888 #292d2e -client.urgent #C10004 #900000 #ffffff #900000 - -# GAPS -gaps inner 20 -set $mode_gaps Gaps: (o) outer, (i) inner -set $mode_gaps_outer Outer Gaps: +|-|0 (local), Shift + +|-|0 (global) -set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global) -bindsym $mod+Shift+g mode "$mode_gaps" - -# Modes for controlling gaps -mode "$mode_gaps" { - bindsym o mode "$mode_gaps_outer" - bindsym i mode "$mode_gaps_inner" - bindsym Return mode "default" - bindsym Escape mode "default" -} - -mode "$mode_gaps_inner" { - bindsym plus gaps inner current plus 5 - bindsym minus gaps inner current minus 5 - bindsym 0 gaps inner current set 0 - - bindsym Shift+plus gaps inner all plus 5 - bindsym Shift+minus gaps inner all minus 5 - bindsym Shift+0 gaps inner all set 0 - - bindsym Return mode "default" - bindsym Escape mode "default" -} -mode "$mode_gaps_outer" { - bindsym plus gaps outer current plus 5 - bindsym minus gaps outer current minus 5 - bindsym 0 gaps outer current set 0 - - bindsym Shift+plus gaps outer all plus 5 - bindsym Shift+minus gaps outer all minus 5 - bindsym Shift+0 gaps outer all set 0 - - bindsym Return mode "default" - bindsym Escape mode "default" -} - -set $mod mod4 -set $term termite - -bindsym $mod+d exec --no-startup-id rofi -show-icons -show drun -config /home/reekymarko/.config/rofi/config -bindsym $mod+p exec --no-startup-id rofi-pass --last-used -bindsym $mod+Shift+p exec --no-startup-id rofi-pass --bmarks --last-used - -font pango:System San Francisco Display 11 - -new_window 1pixel -hide_edge_borders vertical - -# Use Mouse+$mod to drag floating windows to their wanted position -floating_modifier $mod - -# start a terminal -bindsym $mod+Return exec --no-startup-id $term - -# kill focused window -bindsym $mod+Shift+q kill - -# change focus -bindsym $mod+h focus left -bindsym $mod+j focus down -bindsym $mod+k focus up -bindsym $mod+l focus right - -# alternatively, you can use the cursor keys: -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right - -# move focused window -bindsym $mod+Shift+h move left -bindsym $mod+Shift+j move down -bindsym $mod+Shift+k move up -bindsym $mod+Shift+l move right - -# alternatively, you can use the cursor keys: -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right - -# split in horizontal orientation -bindsym $mod+y split h - -# split in vertical orientation -bindsym $mod+x split v - -# enter fullscreen mode for the focused container -bindsym $mod+f fullscreen toggle - -# change container layout (stacked, tabbed, toggle split) -bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed -bindsym $mod+e layout toggle split - -# toggle tiling / floating -bindsym $mod+Shift+space floating toggle - -# change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle - -# focus the parent container -bindsym $mod+a focus parent - -focus_follows_mouse no - -# focus the child container -#bindsym $mod+d focus child - -# open with clipboard contents -bindsym $mod+v exec --no-startup-id mpv --ytdl-format="bestvideo[ext=mp4][height<=?1080]+bestaudio[ext=m4a]" $(xclip -o) -bindym $mod+Shift+b exec --no-startup-id firefox-nightly $(xclip -o) - -#workspace names -set $workspace1 "1: Start " -set $workspace2 "2" -set $workspace3 "3" -set $workspace4 "4" -set $workspace5 "5" -set $workspace6 "6" -set $workspace7 "7" -set $workspace8 "8: Mail " -set $workspace9 "9: Messaging " -set $workspace10 "10: Music " - -# switch to workspace -bindsym $mod+1 workspace $workspace1 -bindsym $mod+2 workspace $workspace2 -bindsym $mod+3 workspace $workspace3 -bindsym $mod+4 workspace $workspace4 -bindsym $mod+5 workspace $workspace5 -bindsym $mod+6 workspace $workspace6 -bindsym $mod+7 workspace $workspace7 -bindsym $mod+8 workspace $workspace8 -bindsym $mod+9 workspace $workspace9 -bindsym $mod+0 workspace $workspace10 - -# classes -for_window [class="TelegramDesktop"] move to workspace $workspace9 -for_window [class="Thunderbird"] move to workspace $workspace8 - - -# move focused container to workspace -bindsym $mod+Shift+1 move container to workspace $workspace1 -bindsym $mod+Shift+2 move container to workspace $workspace2 -bindsym $mod+Shift+3 move container to workspace $workspace3 -bindsym $mod+Shift+4 move container to workspace $workspace4 -bindsym $mod+Shift+5 move container to workspace $workspace5 -bindsym $mod+Shift+6 move container to workspace $workspace6 -bindsym $mod+Shift+7 move container to workspace $workspace7 -bindsym $mod+Shift+8 move container to workspace $workspace8 -bindsym $mod+Shift+9 move container to workspace $workspace9 -bindsym $mod+Shift+0 move container to workspace $workspace10 - -# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) -bindsym $mod+Shift+r restart -# exit i3 (logs you out of your X session) -bindsym $mod+Shift+e exec --no-startup-id i3-msg exit - -# resize window (you can also use the mouse for that) -mode "resize" { - # These bindings trigger as soon as you enter the resize mode - - # Pressing left will shrink the window’s width. - # Pressing right will grow the window’s width. - # Pressing up will shrink the window’s height. - # Pressing down will grow the window’s height. - bindsym j resize shrink width 10 px or 10 ppt - bindsym k resize grow height 10 px or 10 ppt - bindsym l resize shrink height 10 px or 10 ppt - bindsym semicolon resize grow width 10 px or 10 ppt - - # same bindings, but for the arrow keys - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt - - # back to normal: Enter or Escape - bindsym Return mode "default" - bindsym Escape mode "default" -} - -bindsym $mod+r mode "resize" - -set $bg-color #263238 -set $inactive-bg-color #263238 -set $text-color #f3f4f5 -set $inactive-text-color #676E7D -set $urgent-bg-color #E53935 - -# window colors -# border background text indicator -client.focused $bg-color $bg-color $text-color #00ff00 -client.unfocused $inactive-bg-color $inactive-bg-color $inactive-text-color #00ff00 -client.focused_inactive $inactive-bg-color $inactive-bg-color $inactive-text-color #00ff00 -client.urgent $urgent-bg-color $urgent-bg-color $text-color #00ff00 - -# pulseaudio controls -bindsym XF86AudioRaiseVolume exec --no-startup-id amixer -D pulse sset Master 5%+ # increase sound volume -bindsym XF86AudioLowerVolume exec --no-startup-id amixer -D pulse sset Master 5%- # decrease sound volume -bindsym XF86AudioMute exec --no-startup-id amixer -D pulse set Master 1+ toggle # mute sound - -# sreen brightness controls -bindsym XF86MonBrightnessUp exec --no-startup-id light -A 5 # increase screen brightness -bindsym XF86MonBrightnessDown exec --no-startup-id light -U 5 # decrease screen brightness - -# screenshot and screencast -bindsym Print exec --no-startup-id "maim -u -s -l -c 0.157,0.333,0.466,0.4 | xclip -selection clipboard -t image/png && canberra-gtk-play -i camera-shutter" -bindsym $mod+Print exec --no-startup-id ~/scripts/record-screen.sh - - -# mpd controls -bindsym XF86AudioNext exec --no-startup-id mpc next -bindsym XF86AudioPrev exec --no-startup-id mpc prev -bindsym XF86AudioPlay exec --no-startup-id mpc toggle -bindsym XF86AudioStop exec --no-startup-id mpc clear - -# connect bluetooth headset -bindsym $mod+c exec --no-startup-id bluetoothctl connect 17:08:01:0D:09:33 - -# connect bluetooth speaker -bindsym $mod+Shift+c exec --no-startup-id bluetoothctl connect 27:59:BE:CE:45:42 - -# lock screen -bindsym Control+Shift+l exec --no-startup-id evenbetterlockscreen -l - -# open browser -bindsym $mod+b exec --no-startup-id firefox-nightly - -{%@@ if profile == "ReekyPC" @@%} -# desktop only -exec_always --no-startup-id ~/scripts/desktop_screenlayout.sh -{%@@ endif @@%} - -# autostart applications -exec_always --no-startup-id ~/Scripts/polybar.sh -exec --no-startup-id redshift -exec --no-startup-id unclutter -exec --no-startup-id nm-applet -exec --no-startup-id compton -f --config ~/.config/compton/compton.conf -exec --no-startup-id LANG=en_DK.UTF-8 telegram-desktop -exec --no-startup-id setxkbmap eu -exec --no-startup-id blueberry-tray -exec --no-startup-id mpDris2 -exec --no-startup-id /usr/lib/kdeconnectd -exec --no-startup-id kdeconnect-indicator -exec --no-startup-id /usr/lib/xfce4/notifyd/xfce4-notifyd -exec --no-startup-id udiskie --tray -exec --no-startup-id pamac-tray -exec --no-startup-id xfce4-clipman -exec --no-startup-id thunderbird -exec --no-startup-id /usr/bin/gnome-keyring-daemon --start --components=secrets -exec --no-startup-id evenbetterlockscreen -w -exec --no-startup-id evenbetterlockscreen -l diff --git a/home/.config/i3/config-teapot b/home/.config/i3/config-teapot deleted file mode 100644 index 064ee23f..00000000 --- a/home/.config/i3/config-teapot +++ /dev/null @@ -1,132 +0,0 @@ -# ~/.config/i3/config -set $mod mod4 -set $term alacritty - -bindsym $mod+d exec --no-startup-id rofi -show-icons -show drun -config /home/reekymarko/.config/rofi/config - -font pango:System San Francisco Display 11 - -new_window 1pixel -hide_edge_borders vertical - -# Use Mouse+$mod to drag floating windows to their wanted position -floating_modifier $mod - -# start a terminal -bindsym $mod+Return exec --no-startup-id $term - -# kill focused window -bindsym $mod+w kill - -# change focus -bindsym $mod+h focus left -bindsym $mod+j focus down -bindsym $mod+k focus up -bindsym $mod+l focus right - -# alternatively, you can use the cursor keys: -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right - -# move focused window -bindsym $mod+Shift+h move left -bindsym $mod+Shift+j move down -bindsym $mod+Shift+k move up -bindsym $mod+Shift+l move right - -# alternatively, you can use the cursor keys: -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right - -# split in horizontal orientation -bindsym $mod+y split h - -# split in vertical orientation -bindsym $mod+x split v - -# enter fullscreen mode for the focused container -bindsym $mod+f fullscreen toggle - -# change container layout (stacked, tabbed, toggle split) -bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed -bindsym $mod+e layout toggle split - -# toggle tiling / floating -bindsym $mod+Shift+space floating toggle - -# change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle -# focus the parent container -bindsym $mod+a focus parent - -focus_follows_mouse no - -# focus the child container -#bindsym $mod+d focus child - -# open with clipboard contents -bindsym $mod+v exec --no-startup-id mpv --ytdl-format="bestvideo[ext=mp4][height<=?1080]+bestaudio[ext=m4a]" $(xclip -o) -bindym $mod+Shift+b exec --no-startup-id firefox-nightly $(xclip -o) - -#workspace names -set $workspace1 "1: Start " -set $workspace2 "2" -set $workspace3 "3" -set $workspace4 "4" -set $workspace5 "5" -set $workspace6 "6" -set $workspace7 "7" -set $workspace8 "8: Mail " -set $workspace9 "9: Messaging " -set $workspace10 "10: Music " - -# switch to workspace -bindsym $mod+1 workspace $workspace1 -bindsym $mod+2 workspace $workspace2 -bindsym $mod+3 workspace $workspace3 -bindsym $mod+4 workspace $workspace4 -bindsym $mod+5 workspace $workspace5 -bindsym $mod+6 workspace $workspace6 -bindsym $mod+7 workspace $workspace7 -bindsym $mod+8 workspace $workspace8 -bindsym $mod+9 workspace $workspace9 -bindsym $mod+0 workspace $workspace10 - -# move focused container to workspace -bindsym $mod+Shift+1 move container to workspace $workspace1 -bindsym $mod+Shift+2 move container to workspace $workspace2 -bindsym $mod+Shift+3 move container to workspace $workspace3 -bindsym $mod+Shift+4 move container to workspace $workspace4 -bindsym $mod+Shift+5 move container to workspace $workspace5 -bindsym $mod+Shift+6 move container to workspace $workspace6 -bindsym $mod+Shift+7 move container to workspace $workspace7 -bindsym $mod+Shift+8 move container to workspace $workspace8 -bindsym $mod+Shift+9 move container to workspace $workspace9 -bindsym $mod+Shift+0 move container to workspace $workspace10 - -# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) -bindsym $mod+Shift+r restart -# exit i3 (logs you out of your X session) -bindsym $mod+Shift+e exec --no-startup-id i3-msg exit - - -# pulseaudio controls -bindsym XF86AudioRaiseVolume exec --no-startup-id amixer -D pulse sset Master 5%+ # increase sound volume -bindsym XF86AudioLowerVolume exec --no-startup-id amixer -D pulse sset Master 5%- # decrease sound volume -bindsym XF86AudioMute exec --no-startup-id amixer -D pulse set Master 1+ toggle # mute sound - -# open browser -bindsym $mod+b exec --no-startup-id firefox-nightly - -# window rules -for_window [class="Steam"] move to workspace $workspace2 - -# autostart applications -exec --no-startup-id setxkbmap eu -exec --no-startup-id steam-native -exec --no-startup-id kodi diff --git a/home/.config/imapnotify/admin@korhonen.cc.js b/home/.config/imapnotify/admin@korhonen.cc.js deleted file mode 100644 index 40d02d17..00000000 --- a/home/.config/imapnotify/admin@korhonen.cc.js +++ /dev/null @@ -1,19 +0,0 @@ -var child_process = require('child_process'); - -function getStdout(cmd) { - var stdout = child_process.execSync(cmd); - return stdout.toString().trim(); -} - -exports.host = 'imap.migadu.com'; -exports.port = 993; -exports.tls = true; -exports.tlsOptions = { - rejectUnauthorized: true, -}; -exports.username = 'admin@korhonen.cc'; -exports.password = "{{@@ env['PASS_EMAIL_ADMIN'] @@}}"; -exports.onNewMail = 'mbsync admin@korhonen.cc'; -exports.onNewMailPost = - '~/git/dotfiles/scripts/mail/notify-new-mail.sh admin@korhonen.cc'; -exports.boxes = ['INBOX']; diff --git a/home/.config/imapnotify/functionalhacker@korhonen.cc.js b/home/.config/imapnotify/functionalhacker@korhonen.cc.js deleted file mode 100644 index 50746dfd..00000000 --- a/home/.config/imapnotify/functionalhacker@korhonen.cc.js +++ /dev/null @@ -1,19 +0,0 @@ -var child_process = require('child_process'); - -function getStdout(cmd) { - var stdout = child_process.execSync(cmd); - return stdout.toString().trim(); -} - -exports.host = 'imap.migadu.com'; -exports.port = 993; -exports.tls = true; -exports.tlsOptions = { - rejectUnauthorized: true, -}; -exports.username = 'functionalhacker@korhonen.cc'; -exports.password = "{{@@ env['PASS_EMAIL_HACKER'] @@}}"; -exports.onNewMail = 'mbsync functionalhacker@korhonen.cc'; -exports.onNewMailPost = - '~/git/dotfiles/scripts/mail/notify-new-mail.sh functionalhacker@korhonen.cc'; -exports.boxes = ['INBOX']; diff --git a/home/.config/imapnotify/marko@korhonen.cc.js b/home/.config/imapnotify/marko@korhonen.cc.js deleted file mode 100644 index afac7b4c..00000000 --- a/home/.config/imapnotify/marko@korhonen.cc.js +++ /dev/null @@ -1,19 +0,0 @@ -var child_process = require('child_process'); - -function getStdout(cmd) { - var stdout = child_process.execSync(cmd); - return stdout.toString().trim(); -} - -exports.host = 'imap.migadu.com'; -exports.port = 993; -exports.tls = true; -exports.tlsOptions = { - rejectUnauthorized: true, -}; -exports.username = 'marko@korhonen.cc'; -exports.password = "{{@@ env['PASS_EMAIL_MARKO'] @@}}"; -exports.onNewMail = 'mbsync marko@korhonen.cc'; -exports.onNewMailPost = - '~/git/dotfiles/scripts/mail/notify-new-mail.sh marko@korhonen.cc'; -exports.boxes = ['INBOX']; diff --git a/home/.config/khal/config b/home/.config/khal/config deleted file mode 100644 index 8519ed10..00000000 --- a/home/.config/khal/config +++ /dev/null @@ -1,28 +0,0 @@ -[calendars] - -[[birthdays]] -path = ~/.calendars/contact_birthdays -type = calendar -color = light green -readonly = True - -[[school]] -path = ~/.calendars/school -type = calendar -color = light green - -[[personal]] -path = ~/.calendars/personal -type = calendar -color = light green - -[[card_local]] -path = ~/.contacts/* -type = discover - -[locale] -timeformat = %H:%M -dateformat = %Y-%m-%d -longdateformat = %Y-%m-%d -datetimeformat = %Y-%m-%d %H:%M -longdatetimeformat = %Y-%m-%d %H:%M diff --git a/home/.config/khard/khard.conf b/home/.config/khard/khard.conf deleted file mode 100644 index c57cb886..00000000 --- a/home/.config/khard/khard.conf +++ /dev/null @@ -1,28 +0,0 @@ -# example configuration file for khard version >= 0.11.0 -# place it under $HOME/.config/khard/khard.conf - -[addressbooks] -[[contacts]] -path = ~/.contacts - -[general] -debug = no -default_action = list -editor = vim -merge_editor = vimdiff - -[contact table] -# display names by first or last name: first_name / last_name -display = first_name -# group by address book: yes / no -group_by_addressbook = no -# reverse table ordering: yes / no -reverse = no -# append nicknames to name column: yes / no -show_nicknames = no -# show uid table column: yes / no -show_uids = yes -# sort by first or last name: first_name / last_name -sort = last_name -# localize dates: yes / no -localize_dates = yes diff --git a/home/.config/libra/config.toml b/home/.config/libra/config.toml deleted file mode 100644 index 465b7094..00000000 --- a/home/.config/libra/config.toml +++ /dev/null @@ -1,2 +0,0 @@ -MPDAddress = "127.0.0.1:6600" -ListenbrainzToken = "{{@@ env['PASS_LISTENBRAINZ'] @@}}" diff --git a/home/.config/mako/config b/home/.config/mako/config deleted file mode 100644 index 993dd074..00000000 --- a/home/.config/mako/config +++ /dev/null @@ -1,12 +0,0 @@ -background-color=#1E1D2F -text-color=#D9E0EE -border-color=#96CDFB -progress-color=over #302D41 - -icons=1 -default-timeout=5000 -max-visible=6 -layer=overlay - -[urgency=high] -border-color=#F8BD96 diff --git a/home/.config/mimeo/associations.txt b/home/.config/mimeo/associations.txt deleted file mode 100644 index d9a37f2d..00000000 --- a/home/.config/mimeo/associations.txt +++ /dev/null @@ -1,50 +0,0 @@ -mpvqueue %U - ^https?://invidio.us/.* - -mpvqueue %U - ^https?://(m.)?(www.)?youtube.com/watch\?.*v= - -mpvqueue %U - ^https?://(www.)?youtube.com/playlist\?.*list= - -mpvqueue %U - ^https?://(www.)?youtu.be/ - -mpvqueue %U - ^https?://(www.)?(m.)?twitch.tv/ - -mpvqueue %U - ^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:mp4|mkv|webm|avi|3gp|gif|gifv) - -mpvqueue %U - ^https?://www.facebook.com/watch/?v=.* - -mpvqueue %U - ^https?://www.facebook.com/.*/videos/.* - -mpvqueue %U - ^https://fb.watch/.* - -mpvqueue %U - ^https?://gfycat.com/.* - -mpvqueue %U - ^https?://vimeo.com/.* - -mpvqueue %U - ^https?://v.redd.it/.* - -mpvqueue %U - ^https?://areena.yle.fi.* - -imageviewer %U - ^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:jpg|jpeg|png|svg) - -zathura %U - ^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:pdf) - -alacritty -e rtv "%U" - ^https?://(www.)?reddit.com.* - -alacritty -e rtv "%U" - ^https?://redd.it.* diff --git a/home/.config/mpDris2/mpDris2.conf b/home/.config/mpDris2/mpDris2.conf deleted file mode 100644 index a55d3805..00000000 --- a/home/.config/mpDris2/mpDris2.conf +++ /dev/null @@ -1,7 +0,0 @@ -[Connection] -host = localhost -port = 6600 -password = {{@@ env['PASS_MPD'] @@}} - -[Bling] -notify = False diff --git a/home/.config/mpd/mpd.conf b/home/.config/mpd/mpd.conf deleted file mode 100644 index 38a2a616..00000000 --- a/home/.config/mpd/mpd.conf +++ /dev/null @@ -1,24 +0,0 @@ -music_directory "~/Music" -playlist_directory "~/Music/Playlists" -db_file "~/.mpd/database" -log_file "~/.mpd/log" -state_file "~/.mpd/state" -sticker_file "~/.mpd/sticker.sql" - -replaygain "track" - -default_permissions "read,add,control" -password "{{@@ env['PASS_MPD'] @@}}@read,add,control" -password "{{@@ env['PASS_MPD_ADMIN'] @@}}@read,add,control,admin" - -audio_output { - type "fifo" - name "Visualizer" - path "/tmp/mpd.fifo" - format "44100:16:2" -} - -audio_output { - type "pipewire" - name "MPD PipeWire" -} diff --git a/home/.config/mpv/input.conf b/home/.config/mpv/input.conf deleted file mode 100644 index 28f13934..00000000 --- a/home/.config/mpv/input.conf +++ /dev/null @@ -1,26 +0,0 @@ -Alt+LEFT add video-pan-x -0.1 -Alt+h add video-pan-x -0.1 - -Alt+DOWN add video-pan-y +0.1 -Alt+j add video-pan-y +0.1 - -Alt+UP add video-pan-y -0.1 -Alt+k add video-pan-y -0.1 - -Alt+RIGHT add video-pan-x +0.1 -Alt+l add video-pan-x +0.1 - -# control pulseaudio volume -9 add ao-volume -2 -0 add ao-volume +2 -/ add ao-volume -2 -* add ao-volume +2 -m cycle ao-mute -VOLUME_DOWN add ao-volume -2 -VOLUME_UP add ao-volume +2 -MUTE cycle ao-mute - -= add audio-delay 0.100 -- add audio-delay -0.100 - -s playlist-shuffle diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf deleted file mode 100644 index 28e7c939..00000000 --- a/home/.config/mpv/mpv.conf +++ /dev/null @@ -1,109 +0,0 @@ -############# -# Video # -############# - -# Hardware decoding -vo=gpu -hwdec=vaapi -hwdec-codecs=all - -{%@@ if wayland @@%} -gpu-context=wayland -{%@@ endif @@%} - -############# -# Audio # -############# -pulse-buffer=50 # using a large buffer causes seeking issues -audio-pitch-correction=yes # automatically insert scaletempo when playing with higher speed -replaygain=track - -############# -# misc # -############# - -# Start ipc server -input-ipc-server=/tmp/mpvsocket - -# set youtube-dl max res -{%@@ if profile == "Moria" @@%} -ytdl-format=bestvideo[height<=2160]+bestaudio/best[height<=2160] -{%@@ else @@%} -ytdl-format=bestvideo[height<=1080]+bestaudio/best[height<=1080] -{%@@ endif @@%} - -# continue watching -save-position-on-quit - -############# -# Languages # -############# -slang=eng,en,enUS,en-US,fi,fiFI,fi-FI # automatically select these subtitles (decreasing priority) -alang=eng,en,enUS,en-US,fi,fiFI,fi-FI # automatically select these audio tracks (decreasing priority) -ytdl-raw-options=sub-lang="en,eng,enUS,en-US,fi,fiFI,fi-FI" - -############# -# Subtitles # -############# -no-sub # subtitles off on startup -demuxer-mkv-subtitle-preroll # try to correctly show embedded subs when seeking -sub-auto=fuzzy # external subs don't have to match the file name exactly to autoload -sub-file-paths=ass:srt:sub:subs:subtitles # search for external subs in the listed subdirectories -embeddedfonts=yes # use embedded fonts for SSA/ASS subs -sub-ass-force-style=Kerning=yes # allows you to override style parameters of ASS scripts - -# the following options only apply to subtitles without own styling (i.e. not ASS but e.g. SRT) -sub-font="Overpass" -sub-font-size=45 -sub-color="#FFFFFFFF" -sub-border-color="#FF262626" -sub-border-size=3.2 -sub-shadow-offset=1 -sub-shadow-color="#33000000" -sub-spacing=0.5 - -# OSD customizations -osd-font="Lucida Console" -osd-font-size=30 -osd-color="#ffffffff" # ARGB format -osd-border-color="#ff151515" # ARGB format -osd-bar-align-y=0 # progress bar y alignment (-1 top, 0 centered, 1 bottom) -osd-border-size=2 # size for osd text and progress bar -osd-shadow-offset=1 # pixel width for osd text and progress bar -osd-bar-w=60 # width of " " " -osd-shadow-color="#11000000" -osd-fractions - -# Protocol specific configuration -[protocol.https] -cache=yes -user-agent='Mozilla/5.0 (X11; Linux x86_64; rv:72.0) Gecko/20100101 Firefox/72.0' - -[protocol.http] -cache=yes -user-agent='Mozilla/5.0 (X11; Linux x86_64; rv:72.0) Gecko/20100101 Firefox/72.0' - -# Some settings for gifs -[extension.gif] -cache=no -no-pause -loop-file=yes - -[extension.gifv] -cache=no -no-pause -loop-file=yes - -# Profiles for different qualities -[360p] -ytdl-format="bestvideo[height<=360]+bestaudio/best[height<=360]" -[480p] -ytdl-format="bestvideo[height<=480]+bestaudio/best[height<=480]" -[720p] -ytdl-format="bestvideo[height<=720]+bestaudio/best[height<=720]" -[4k] -ytdl-format="bestvideo[height<=2160]+bestaudio/best[height<=2160]" -[best] -ytdl-format="bestvideo+bestaudio" - -script-opts-append=ytdl_hook-ytdl_path=yt-dlp diff --git a/home/.config/mpv/script-opts/osc.conf b/home/.config/mpv/script-opts/osc.conf deleted file mode 100644 index 5161d406..00000000 --- a/home/.config/mpv/script-opts/osc.conf +++ /dev/null @@ -1 +0,0 @@ -hidetimeout=2000 diff --git a/home/.config/mpv/scripts/autosub.lua b/home/.config/mpv/scripts/autosub.lua deleted file mode 100644 index f028d767..00000000 --- a/home/.config/mpv/scripts/autosub.lua +++ /dev/null @@ -1,30 +0,0 @@ --- default keybinding: b --- add the following to your input.conf to change the default keybinding: --- keyname script_binding auto_load_subs -local utils = require 'mp.utils' - -function display_error() - mp.msg.warn("Subtitle download failed: ") - mp.osd_message("Subtitle download failed") -end - -function load_sub_fn() - path = mp.get_property("path") - srt_path = string.gsub(path, "%.%w+$", ".srt") - t = { args = { "subliminal", "download", "-s", "-f", "-l", "en", path } } - - mp.osd_message("Searching subtitle") - res = utils.subprocess(t) - if res.error == nil then - if mp.commandv("sub_add", srt_path) then - mp.msg.warn("Subtitle download succeeded") - mp.osd_message("Subtitle '" .. srt_path .. "' download succeeded") - else - display_error() - end - else - display_error() - end -end - -mp.add_key_binding("b", "auto_load_subs", load_sub_fn) diff --git a/home/.config/mpv/scripts/iptv.lua b/home/.config/mpv/scripts/iptv.lua deleted file mode 100644 index ab43a6d5..00000000 --- a/home/.config/mpv/scripts/iptv.lua +++ /dev/null @@ -1,505 +0,0 @@ ---redefine keybindings here if needed; multiple bindings are possible -keybinds = { - activate = {'\\', 'MOUSE_BTN2'}, - plsup = {'UP', 'MOUSE_BTN3'}, - plsdown = {'DOWN', 'MOUSE_BTN4'}, - plsenter = {'ENTER', 'MOUSE_BTN0'} - } ---hide playlist after specified number of seconds -osd_time=10 ---show only specified number of playlist entries -window=7 ---fade video when showing playlist -fade=false ---if fade=true; -100 — black, 0 — normal -plsbrightness=-70 ---favorites get promotion to the top of the pls -favorites = {} --- END OF CONFIGURABLE VARIABLES - --- put your settings in (SCRIPTS DIR)/_iptvconf.lua -pcall(require, "_iptvconf") - -local timer ---local plscount -local pattern="" -local is_active -local is_playlist_loaded - --- UTF-8 lower/upper conversion -local utf8_lc_uc = { - ["a"] = "A", - ["b"] = "B", - ["c"] = "C", - ["d"] = "D", - ["e"] = "E", - ["f"] = "F", - ["g"] = "G", - ["h"] = "H", - ["i"] = "I", - ["j"] = "J", - ["k"] = "K", - ["l"] = "L", - ["m"] = "M", - ["n"] = "N", - ["o"] = "O", - ["p"] = "P", - ["q"] = "Q", - ["r"] = "R", - ["s"] = "S", - ["t"] = "T", - ["u"] = "U", - ["v"] = "V", - ["w"] = "W", - ["x"] = "X", - ["y"] = "Y", - ["z"] = "Z", - ["а"] = "А", - ["б"] = "Б", - ["в"] = "В", - ["г"] = "Г", - ["д"] = "Д", - ["е"] = "Е", - ["ж"] = "Ж", - ["з"] = "З", - ["и"] = "И", - ["й"] = "Й", - ["к"] = "К", - ["л"] = "Л", - ["м"] = "М", - ["н"] = "Н", - ["о"] = "О", - ["п"] = "П", - ["р"] = "Р", - ["с"] = "С", - ["т"] = "Т", - ["у"] = "У", - ["ф"] = "Ф", - ["х"] = "Х", - ["ц"] = "Ц", - ["ч"] = "Ч", - ["ш"] = "Ш", - ["щ"] = "Щ", - ["ъ"] = "Ъ", - ["ы"] = "Ы", - ["ь"] = "Ь", - ["э"] = "Э", - ["ю"] = "Ю", - ["я"] = "Я", - ["ё"] = "Ё" -} - -local utf8_uc_lc = { - ["A"] = "a", - ["B"] = "b", - ["C"] = "c", - ["D"] = "d", - ["E"] = "e", - ["F"] = "f", - ["G"] = "g", - ["H"] = "h", - ["I"] = "i", - ["J"] = "j", - ["K"] = "k", - ["L"] = "l", - ["M"] = "m", - ["N"] = "n", - ["O"] = "o", - ["P"] = "p", - ["Q"] = "q", - ["R"] = "r", - ["S"] = "s", - ["T"] = "t", - ["U"] = "u", - ["V"] = "v", - ["W"] = "w", - ["X"] = "x", - ["Y"] = "y", - ["Z"] = "z", - ["А"] = "а", - ["Б"] = "б", - ["В"] = "в", - ["Г"] = "г", - ["Д"] = "д", - ["Е"] = "е", - ["Ж"] = "ж", - ["З"] = "з", - ["И"] = "и", - ["Й"] = "й", - ["К"] = "к", - ["Л"] = "л", - ["М"] = "м", - ["Н"] = "н", - ["О"] = "о", - ["П"] = "п", - ["Р"] = "р", - ["С"] = "с", - ["Т"] = "т", - ["У"] = "у", - ["Ф"] = "ф", - ["Х"] = "х", - ["Ц"] = "ц", - ["Ч"] = "ч", - ["Ш"] = "ш", - ["Щ"] = "щ", - ["Ъ"] = "ъ", - ["Ы"] = "ы", - ["Ь"] = "ь", - ["Э"] = "э", - ["Ю"] = "ю", - ["Я"] = "я", - ["Ё"] = "ё" -} - ---utf8 char pattern -local utf8_char="[\1-\127\192-\223][\128-\191]*" - -local cyr_chars={'а','б','в','г','д','е','ё','ж','з','и','й','к','л','м','н','о','п','р','с','т','у','ф','х','ц','ч','ш','щ','ъ','ы','ь','э','ю','я'} - --- символы, которые возможно вводить для поиска -local chars={} -for i=string.byte('a'),string.byte('z') do - table.insert(chars,i) -end -for i=string.byte('A'),string.byte('Z') do - table.insert(chars,i) -end -for i=string.byte('0'),string.byte('9') do - table.insert(chars,i) -end -for _,v in ipairs({',','^','$','(',')','%','.','[',']','*','+','-','?','`',"'",";"}) do - table.insert(chars,string.byte(v)) -end - -local keybinder = { - remove = function(action) - for i,_ in ipairs(keybinds[action]) do - mp.remove_key_binding(action..tostring(i)) - end - end, - add = function(action, func, repeatable) - for i,key in ipairs(keybinds[action]) do - assert(type(func)=="function", "not a function") - if repeatable then - mp.add_forced_key_binding(key, action..tostring(i), func, "repeatable") - else - mp.add_forced_key_binding(key, action..tostring(i), func) - end - end - end -} - -local fader = { - saved_brtns, - on = function(self) - if fade and not self.saved_brtns then - self.saved_brtns = mp.get_property("brightness") - mp.set_property("brightness", plsbrightness) - end - end, - off = function(self) - if fade and self.saved_brtns then - mp.set_property("brightness", self.saved_brtns) - self.saved_brtns=nil - end - end -} - -local playlister = { --- pls — список элементов плейлиста - pls, --- plsfiltered — список индексов выбранных фильтром элементов плейлиста - plsfiltered, - plspos, - wndstart, - wndend, - cursor, - - init = function(self) - if not self.pls then - self.pls = mp.get_property_native("playlist") - end - mp.commandv("stop") - --need to mark first entry non-current (mpv bug?) - if self.pls[1] then - self.pls[1].current = false - end - if favorites and #favorites>0 then - self:sortfavs() - end - pattern = "" - self.plsfiltered = tablekeys(self.pls) - end, - - show = function(self) - local i - local newpos - local msg - --media-title - --playlist t[2].title - - if not self.plsfiltered then - return - end - if not self.plspos then - self.plspos=mp.get_property_native("playlist-pos-1") - --plscount=mp.get_property_native("playlist-count") - end - if not self.wndstart or not self.cursor then - self.wndstart=1 - self.cursor=0 - end - - msg="" - i = self.wndstart - local prefix - while self.plsfiltered[i] and i<=self.wndstart+window-1 do - if self.pls[self.plsfiltered[i]].current then - prefix="*" - elseif i==self.wndstart+self.cursor then - prefix=">" - else - prefix=" " - end - msg = msg..prefix..(self.pls[self.plsfiltered[i]].title or "").."\n" - i=i+1 - end - if self.wndstart>1 then - msg = "...\n"..msg - else - msg = " \n"..msg - end - if self.wndstart+window-1<#self.plsfiltered then - msg = msg.."..." - end - msg="/"..pattern.."\n"..msg - mp.osd_message(msg, osd_time) - end, - - sortfavs = function(self) - --favorites bubbles to the top - local favs={} - local nonfavs={} - for _,v in ipairs(self.pls) do - if in_array(favorites,v.title) then - favs[#favs+1] = v - else - nonfavs[#nonfavs+1] = v - end - end - for i=1,#nonfavs do - favs[#favs+1] = nonfavs[i] - end - self.pls = favs - end, - - filter = function(self) - self.plsfiltered={} - for i,v in ipairs(self.pls) do - if string.match(mylower(v.title),'.*'..prepat(pattern)..'.*') then - table.insert(self.plsfiltered,i) - end - end - self.wndstart=1 - self.cursor=0 - end, - - down = function(self) - if self.cursor >= #self.plsfiltered-1 then return end - if self.cursor0 then - self.cursor=self.cursor-1 - self.show(self) - else - if self.wndstart>1 then - self.wndstart=self.wndstart-1 - self.show(self) - end - end - end, - - play = function(self) - mp.commandv("loadfile",self.pls[self.plsfiltered[self.wndstart+self.cursor]].filename) - if self.plspos then - self.pls[self.plspos].current=false - end - self.plspos=self.plsfiltered[self.wndstart+self.cursor] - self.pls[self.plspos].current=true - end -} - -function add_bindings() - keybinder.add("plsup", up, true) - keybinder.add("plsdown", down, true) - for i,v in ipairs(chars) do - c=string.char(v) - mp.add_forced_key_binding(c, 'search'..v, typing(c),"repeatable") - end - mp.add_forced_key_binding('SPACE', 'search32', typing(' '),"repeatable") - ---[[ mp.add_key_binding('а', 'search1000', typing('а'),"repeatable") - mp.add_key_binding('с', 'search1001', typing('с'),"repeatable")]] - - mp.add_forced_key_binding('BS', 'searchbs', backspace,"repeatable") - keybinder.add("plsenter", play) - for i,v in ipairs(cyr_chars) do - mp.add_forced_key_binding(v, 'search'..i+1000, typing(v),"repeatable") - end -end - -function remove_bindings() - keybinder.remove('plsup') - keybinder.remove('plsdown') - keybinder.remove('plsenter') - for i,v in ipairs(chars) do - c=string.char(v) - mp.remove_key_binding('search'..v) - end - mp.remove_key_binding('search32') - mp.remove_key_binding('searchbs') - for i,v in ipairs(cyr_chars) do - mp.remove_key_binding('search'..i+1000) - end -end - -function activate() - if is_active then - shutdown() - return - else - is_active=true - fader:on() - playlister:show() - add_bindings() - if not timer then - timer=mp.add_periodic_timer(osd_time, shutdown) - timer.oneshot=true - else - resumetimer() - end - end -end - -function tablekeys(t) - local result={} - for i,v in ipairs(t) do - table.insert(result,i) - end - return result -end - -function in_array(array, value) - for _,v in ipairs(array) do - if v==value then - return true - end - end - return false -end - -function mylower(s) - local res,n = string.gsub(s,utf8_char,function (c) - return utf8_uc_lc[c] - end) - return res -end - -function myupper(s) - local res,n = string.gsub(s,utf8_char,function (c) - return utf8_lc_uc[c] - end) - return res -end - -function prepat(s) ---prepare nocase and magic chars - s = string.gsub(s, "[%^%$%(%)%%%.%[%]%*%+%-%?]",function (c) - return '%'..c - end) ---[[ s = string.gsub(s, utf8_char, function (c) - return string.format("[%s%s]", utf8_uc_lc[c] or c, utf8_lc_uc[c] or c) - end)]] - return s -end - -function resumetimer() - timer:kill() - timer:resume() -end - -function typing(char) - return function() - local c=string.lower(char) - pattern = pattern..c - playlister:filter() - playlister:show() - resumetimer() - end -end - -function backspace() - if string.len(pattern)>0 then --- pattern = string.sub(pattern,1,-2) --- for unicode - pattern = string.match(pattern,"(.*)"..utf8_char.."$") - playlister:filter() - playlister:show() - resumetimer() - end -end - -function play() --- mp.commandv("playlist-move", wndstart+cursor, 1) --- mp.commandv("playlist-clear") --- mp.commandv("playlist-next") - fader:off() - playlister:play() - playlister:show() - resumetimer() -end - -function shutdown() - fader:off() - remove_bindings() - is_active=false - mp.osd_message("", 1) -end - -function down() - fader:on() - playlister:down() - resumetimer() -end - -function up() - fader:on() - playlister:up() - resumetimer() -end - -function on_start_file() - if is_playlist_loaded then - playlister:init() - mp.unregister_event(on_start_file) - activate() - else - is_playlist_loaded = true - end -end - -if mp.get_opt("iptv") then - mp.set_property_bool("idle", true) - mp.set_property_bool("force-window", true) - mp.register_event("start-file", on_start_file) - keybinder.add("activate", activate) -end - diff --git a/home/.config/mpv/scripts/mines.lua b/home/.config/mpv/scripts/mines.lua deleted file mode 100644 index af298b09..00000000 --- a/home/.config/mpv/scripts/mines.lua +++ /dev/null @@ -1,367 +0,0 @@ -local assdraw = require 'mp.assdraw' - -local W = 0 -local H = 0 --- 2D array of size W*H that's addressed via gField[x][y]. Each entry is a --- table, with the following fields: --- is_mine: true or false --- area_mines: mine count in the 3x3 surrounding area --- is_covered: true or false, for visibility --- flag: flag put by user, one of FLAG_* -local gField = nil - -local FLAG_NONE = "" -- not flagged -local FLAG_MINE = "⚑" -- "⚐" -- flagged as containing mine -local FLAG_MAYBE_MINE = "!" -- flagged as maybe containing mine -local FLAG_MAYBE_SAFE = "?" -- flagged as maybe empty - -local STATUS_PLAYING = "playing" -local STATUS_WON = "won" -local STATUS_LOST = "lost" - -local gStatus = nil - -local gMines = 0 - -local gX = 0 -local gY = 0 - -local gNeedRefresh = false -local gHidden = true -local gTransparent = false - -local PRESETS = { - -- taken from kmines - { name = "easy", w = 9, h = 9, mines = 10 }, - { name = "medium", w = 16, h = 16, mines = 40 }, - { name = "hard", w = 30, h = 16, mines = 99 }, -} -local gCurrentPreset = 2 - -function init_field() - local preset = PRESETS[gCurrentPreset] - gStatus = STATUS_PLAYING - gField = {} - W = preset.w - H = preset.h - gMines = math.min(preset.mines, W * H - 1) - gX = 1 - gY = 1 - - for x = 1, W do - gField[x] = {} - for y = 1, H do - gField[x][y] = { - is_mine = false, - area_mines = 0, - is_covered = true, - flag = FLAG_NONE, - } - end - end - - -- place mines using the dumbfuck algorithm - local place_mines = gMines - while place_mines > 0 do - local x = math.random(1, W) - local y = math.random(1, H) - if not gField[x][y].is_mine then - gField[x][y].is_mine = true - place_mines = place_mines - 1 - end - end - - -- pick a random start position (also using dumbfuck algorithm) - for i = 1, 1000000 do - local x = math.random(1, W) - local y = math.random(1, H) - if not gField[x][y].is_mine then - gX = x - gY = y - break - end - end - - -- compute proximities after mines have been placed - for y = 1, H do - for x = 1, W do - local tile = gField[x][y] - for a_x = -1, 1 do - for a_y = -1, 1 do - local t_x = x + a_x - local t_y = y + a_y - if t_x >= 1 and t_x <= W and t_y >= 1 and t_y <= H and - gField[t_x][t_y].is_mine - then - tile.area_mines = tile.area_mines + 1 - end - end - end - end - end - - uncover() - - check_status() - - gNeedRefresh = true -end - -function uncover_at(x, y) - if x < 1 or x > W or y < 1 or y > H then - return - end - - local tile = gField[x][y] - - if not tile.is_covered then - return - end - - tile.is_covered = false - - if tile.is_mine then - return -- lost anyway - end - - -- uncover mines as far as it goes - -- apparently, the standard thing to do is recursively uncovering all - -- tiles which have 0 neightbours - tiles with 1 or more neighbours are - -- uncovered, but not recursively - if tile.area_mines == 0 then - for a_x = -1, 1 do - for a_y = -1, 1 do - uncover_at(x + a_x, y + a_y) - end - end - end - - gNeedRefresh = true -end - -function check_status() - if gStatus ~= STATUS_PLAYING then - return - end - - local won = true - local lost = false - - for y = 1, H do - for x = 1, W do - local tile = gField[x][y] - won = won and (tile.is_mine == tile.is_covered) - lost = lost or (tile.is_mine and not tile.is_covered) - end - end - - if lost then - gStatus = STATUS_LOST - gNeedRefresh = true - elseif won then - gStatus = STATUS_WON - gNeedRefresh = true - end -end - -function uncover() - if gStatus ~= STATUS_PLAYING and not gField[gX][gY].is_covered then - init_field() - render() - return - end - uncover_at(gX, gY) - check_status() - render() -end - -function flag() - local tile = gField[gX][gY] - local cycle = {FLAG_NONE, FLAG_MINE, FLAG_MAYBE_MINE, FLAG_MAYBE_SAFE} - for i = 1, #cycle do - if tile.flag == cycle[i] then - tile.flag = cycle[(i - 1 + 1) % #cycle + 1] - break - end - end - if not tile.is_covered then - tile.flag = FLAG_NONE - end - force_render() -end - -function move(x, y) - gX = math.min(math.max(gX + x, 1), W) - gY = math.min(math.max(gY + y, 1), H) - - force_render() -end - -function force_render() - gNeedRefresh = true - render() -end - -function render() - if not gNeedRefresh then - return - end - - if gHidden then - mp.set_osd_ass(1280, 720, "") - return - end - - local canvas_w = 1280 - local canvas_h = 720 - local dw, dh, da = mp.get_osd_size() - if dw ~= nil and dw > 0 and dh > 0 then - canvas_w = dw / dh * canvas_h - end - - local tile_wh = 32 - - local o_x = canvas_w / 2 - tile_wh * W / 2 - local o_y = canvas_h / 2 - tile_wh * (H + 2) / 2 + tile_wh - - local ass = assdraw.ass_new() - - local transp = nil - if gTransparent then - transp = "{\\1a&HA0&\\3a&HA0&}" - end - - -- some shitty background - ass:new_event() - ass:append("{\\1c&Ha3a3a3&\\1a&H30&}") - if transp then - ass:append(transp) - end - ass:pos(o_x - tile_wh, o_y - tile_wh) - ass:draw_start() - ass:rect_cw(0, 0, (W + 2) * tile_wh, (H + 2) * tile_wh) - -- grid - local function grid_line(x0, y0, x1, y1) - ass:new_event() - ass:append("{\\bord0.5}") - if transp then - ass:append(transp) - end - ass:pos(x0, y0) - ass:draw_start() - ass:coord(0, 0) - ass:line_to(x1 - x0, y1 - y0) - end - for x = 0, W do - local p_x = x * tile_wh + o_x - grid_line(p_x, o_y, p_x, o_y + tile_wh * H) - end - for y = 0, H do - local p_y = y * tile_wh + o_y - grid_line(o_x, p_y, o_x + tile_wh * W, p_y) - end - - local function draw_sym(x, y, sym, c) - ass:new_event() - ass:pos(x, y) - ass:append("{\\an5\\fs25\\bord0\\1c&H" .. c .. "&\\b1}" .. sym) - end - - for x = 1, W do - for y = 1, H do - local tile = gField[x][y] - local p_x = (x - 1) * tile_wh + tile_wh / 2 + o_x - local p_y = (y - 1) * tile_wh + tile_wh / 2 + o_y - local wh = tile_wh - 4 - local sym = nil - if tile.is_covered then - ass:new_event() - if transp then - ass:append(transp) - end - ass:pos(p_x, p_y) - ass:draw_start() - ass:round_rect_cw(-wh / 2, -wh / 2, wh / 2, wh / 2, 5) - ass:draw_stop() - elseif tile.is_mine then - draw_sym(p_x, p_y, "💣", "0000FF") - elseif tile.area_mines > 0 then - draw_sym(p_x, p_y, tile.area_mines, "000000") - end - if tile.flag ~= FLAG_NONE then - draw_sym(p_x, p_y, tile.flag, "FF0000") - end - if x == gX and y == gY then - local wh = tile_wh - 12 - ass:new_event() - ass:append("{\\1a&HFF&}") - ass:pos(p_x, p_y) - ass:draw_start() - ass:rect_cw(-wh / 2, -wh / 2, wh / 2, wh / 2) - ass:draw_stop() - end - end - end - - local banner = nil - if gStatus == STATUS_WON then - banner = "You may have won, but actually you just wasted time." - elseif gStatus == STATUS_LOST then - banner = "You lost (and wasted time)." - end - if banner then - ass:new_event() - ass:pos(o_x + tile_wh * W / 2, o_y - tile_wh - 10) - ass:append("{\\fs40\\b1\\an2}" .. banner) - end - - mp.set_osd_ass(canvas_w, canvas_h, ass.text) -end - -mp.observe_property("osd-width", "native", force_render) -mp.observe_property("osd-height", "native", force_render) - -init_field() -force_render() - -function toggle_transp() - gTransparent = not gTransparent - force_render() -end - -function cycle_preset() - gCurrentPreset = (gCurrentPreset + 1 - 1) % #PRESETS + 1 - init_field() - render() -end - -function toggle_show() - if gHidden then - gHidden = false - - local REP = {repeatable = true} - mp.add_forced_key_binding("left", "mines-left", function() move(-1, 0) end, REP) - mp.add_forced_key_binding("right", "mines-right", function() move(1, 0) end, REP) - mp.add_forced_key_binding("up", "mines-up", function() move(0, -1) end, REP) - mp.add_forced_key_binding("down", "mines-down", function() move(0, 1) end, REP) - mp.add_forced_key_binding("space", "mines-uncover", uncover) - mp.add_forced_key_binding("b", "mines-flag", flag) - mp.add_forced_key_binding("t", "mines-transp", toggle_transp) - mp.add_forced_key_binding("w", "mines-preset", cycle_preset) - else - gHidden = true - - mp.remove_key_binding("mines-left") - mp.remove_key_binding("mines-right") - mp.remove_key_binding("mines-up") - mp.remove_key_binding("mines-down") - mp.remove_key_binding("mines-uncover") - mp.remove_key_binding("mines-flag") - mp.remove_key_binding("mines-transp") - mp.remove_key_binding("mines-preset") - end - - force_render() -end - -mp.add_forced_key_binding("ctrl+x", "mines-show", toggle_show) diff --git a/home/.config/mpv/scripts/redshift_toggle.lua b/home/.config/mpv/scripts/redshift_toggle.lua deleted file mode 100644 index 5cdd47cd..00000000 --- a/home/.config/mpv/scripts/redshift_toggle.lua +++ /dev/null @@ -1,43 +0,0 @@ --- Toggle redshift when viewing videos with mpv - -if os.execute("pgrep -x redshift >/dev/null") ~= 0 -then - return -end - --- Consider that redshift is enabled when starting -rs_enabled = true - -function rs_toggle() - os.execute("pkill -x -USR1 redshift") -end - -function rs_disable() - if rs_enabled - then - rs_toggle() - rs_enabled = false - mp.msg.log("info", "Disabling redshift") - end -end - -function rs_enable() - if not rs_enabled - then - rs_toggle() - rs_enabled = true - mp.msg.log("info", "Reenabling redshift") - end -end - -function rs_handler() - if mp.get_property("video") ~= "no" - then - rs_disable() - else - rs_enable() - end -end - -mp.register_event("file-loaded", rs_handler) -mp.register_event("shutdown", rs_enable) diff --git a/home/.config/mpv/scripts/slicing.lua b/home/.config/mpv/scripts/slicing.lua deleted file mode 100644 index 2ce24042..00000000 --- a/home/.config/mpv/scripts/slicing.lua +++ /dev/null @@ -1,145 +0,0 @@ -local msg = require "mp.msg" -local utils = require "mp.utils" -local options = require "mp.options" - -local cut_pos = nil -local copy_audio = true -local o = { - target_dir = "~", - vcodec = "rawvideo", - acodec = "pcm_s16le", - prevf = "", - vf = "format=yuv444p16$hqvf,scale=in_color_matrix=$matrix,format=bgr24", - hqvf = "", - postvf = "", - opts = "", - ext = "avi", - command_template = [[ - ffmpeg -v warning -y -stats - -ss $shift -i "$in" -t $duration - -c:v $vcodec -c:a $acodec $audio - -vf $prevf$vf$postvf $opts "$out.$ext" - ]], -} -options.read_options(o) - -function timestamp(duration) - local hours = duration / 3600 - local minutes = duration % 3600 / 60 - local seconds = duration % 60 - return string.format("%02d:%02d:%02.03f", hours, minutes, seconds) -end - -function osd(str) - return mp.osd_message(str, 3) -end - -function get_homedir() - -- It would be better to do platform detection instead of fallback but - -- it's not that easy in Lua. - return os.getenv("HOME") or os.getenv("USERPROFILE") or "" -end - -function log(str) - local logpath = utils.join_path( - o.target_dir:gsub("~", get_homedir()), - "mpv_slicing.log") - f = io.open(logpath, "a") - f:write(string.format("# %s\n%s\n", - os.date("%Y-%m-%d %H:%M:%S"), - str)) - f:close() -end - -function escape(str) - -- FIXME(Kagami): This escaping is NOT enough, see e.g. - -- https://stackoverflow.com/a/31413730 - -- Consider using `utils.subprocess` instead. - return str:gsub("\\", "\\\\"):gsub('"', '\\"') -end - -function trim(str) - return str:gsub("^%s+", ""):gsub("%s+$", "") -end - -function get_csp() - local csp = mp.get_property("colormatrix") - if csp == "bt.601" then return "bt601" - elseif csp == "bt.709" then return "bt709" - elseif csp == "smpte-240m" then return "smpte240m" - else - local err = "Unknown colorspace: " .. csp - osd(err) - error(err) - end -end - -function get_outname(shift, endpos) - local name = mp.get_property("filename") - local dotidx = name:reverse():find(".", 1, true) - if dotidx then name = name:sub(1, -dotidx-1) end - name = name:gsub(" ", "_") - name = name:gsub(":", "-") - name = name .. string.format(".%s-%s", timestamp(shift), timestamp(endpos)) - return name -end - -function cut(shift, endpos) - local cmd = trim(o.command_template:gsub("%s+", " ")) - local inpath = escape(utils.join_path( - utils.getcwd(), - mp.get_property("stream-path"))) - local outpath = escape(utils.join_path( - o.target_dir:gsub("~", get_homedir()), - get_outname(shift, endpos))) - - cmd = cmd:gsub("$shift", shift) - cmd = cmd:gsub("$duration", endpos - shift) - cmd = cmd:gsub("$vcodec", o.vcodec) - cmd = cmd:gsub("$acodec", o.acodec) - cmd = cmd:gsub("$audio", copy_audio and "" or "-an") - cmd = cmd:gsub("$prevf", o.prevf) - cmd = cmd:gsub("$vf", o.vf) - cmd = cmd:gsub("$hqvf", o.hqvf) - cmd = cmd:gsub("$postvf", o.postvf) - cmd = cmd:gsub("$matrix", get_csp()) - cmd = cmd:gsub("$opts", o.opts) - -- Beware that input/out filename may contain replacing patterns. - cmd = cmd:gsub("$ext", o.ext) - cmd = cmd:gsub("$out", outpath) - cmd = cmd:gsub("$in", inpath, 1) - - msg.info(cmd) - log(cmd) - os.execute(cmd) -end - -function toggle_mark() - local pos = mp.get_property_number("time-pos") - if cut_pos then - local shift, endpos = cut_pos, pos - if shift > endpos then - shift, endpos = endpos, shift - end - if shift == endpos then - osd("Cut fragment is empty") - else - cut_pos = nil - osd(string.format("Cut fragment: %s - %s", - timestamp(shift), - timestamp(endpos))) - cut(shift, endpos) - end - else - cut_pos = pos - osd(string.format("Marked %s as start position", timestamp(pos))) - end -end - -function toggle_audio() - copy_audio = not copy_audio - osd("Audio capturing is " .. (copy_audio and "enabled" or "disabled")) -end - -mp.add_key_binding("c", "slicing_mark", toggle_mark) -mp.add_key_binding("a", "slicing_audio", toggle_audio) diff --git a/home/.config/mpv/scripts/yledl_hook.lua b/home/.config/mpv/scripts/yledl_hook.lua deleted file mode 100644 index 1ff15ff1..00000000 --- a/home/.config/mpv/scripts/yledl_hook.lua +++ /dev/null @@ -1,76 +0,0 @@ --- Copied from https://github.com/pekkarr/mpv-yledl --- Copyright 2021 Pekka Ristola - --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation, either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see . - -local msg = require 'mp.msg' -local utils = require 'mp.utils' - -local function add_series(data) - local playlist = { "#EXTM3U" } - for _, episode in pairs(data) do - table.insert(playlist, episode["webpage"]) - end - mp.set_property("stream-open-filename", "memory://" .. table.concat(playlist, "\n")) -end - -local function add_single_video(data) - local flavors = data["flavors"] - table.sort(flavors, function(a, b) return a["bitrate"] > b["bitrate"] end) - local best = flavors[1] - mp.set_property("stream-open-filename", best["url"]) - mp.set_property("file-local-options/force-media-title", data["title"]) - for _, sub in ipairs(data["subtitles"]) do - local lang = sub["language"] - msg.verbose("Adding subtitles for " .. lang) - mp.commandv("sub-add", sub["url"], "auto", sub["category"], lang) - end -end - -mp.add_hook("on_load", 9, function() - msg.verbose('yle-dl hook') - local url = mp.get_property("stream-open-filename", "") - if (url:find("https?://%a+%.yle%.fi/") == 1) or (url:find("https?://yle%.fi/") == 1) then - local start_time = os.clock() - local command = { "yle-dl", "--showmetadata", url } - msg.debug("Running: " .. table.concat(command, ' ')) - local ret = mp.command_native({name = "subprocess", - args = command, - capture_stdout = true, - capture_stderr = false}) - if ret.killed_by_us then - return - end - if (ret.status < 0) or (ret.stdout == nil) or (ret.stdout == "") then - msg.error("yle-dl failed to parse url") - return - end - - local json, err = utils.parse_json(ret.stdout) - if (json == nil) then - msg.error("failed to parse JSON: " .. err) - return - end - msg.verbose("yle-dl succeeded") - msg.debug("running yle-dl took " .. os.clock() - start_time .. " seconds") - - if #json == 1 then - add_single_video(json[1]) - else - add_series(json) - end - else - msg.verbose('not an areena url') - end -end) diff --git a/home/.config/msmtp/config b/home/.config/msmtp/config deleted file mode 100644 index 1179ee87..00000000 --- a/home/.config/msmtp/config +++ /dev/null @@ -1,26 +0,0 @@ -defaults -auth on -tls on -tls_starttls off -tls_trust_file /etc/ssl/certs/ca-certificates.crt -logfile ~/.log/msmtp.log -host smtp.migadu.com -port 465 - -# functionalhacker@korhonen.cc -account functionalhacker@korhonen.cc -from functionalhacker@korhonen.cc -user functionalhacker@korhonen.cc -password "{{@@ env['PASS_EMAIL_HACKER'] @@}}" - -# marko@korhonen.cc -account marko@korhonen.cc -from marko@korhonen.cc -user marko@korhonen.cc -password "{{@@ env['PASS_EMAIL_MARKO'] @@}}" - -# admin@korhonen.cc -account admin@korhonen.cc -from admin@korhonen.cc -user admin@korhonen.cc -password "{{@@ env['PASS_EMAIL_ADMIN'] @@}}" diff --git a/home/.config/ncmpcpp/bindings b/home/.config/ncmpcpp/bindings deleted file mode 100644 index be2b4e15..00000000 --- a/home/.config/ncmpcpp/bindings +++ /dev/null @@ -1,551 +0,0 @@ -############################################################## -## This is the example bindings file. Copy it to ## -## ~/.ncmpcpp/bindings or $XDG_CONFIG_HOME/ncmpcpp/bindings ## -## and set up your preferences ## -############################################################## -## -##### General rules ##### -## -## 1) Because each action has runtime checks whether it's -## ok to run it, a few actions can be bound to one key. -## Actions will be bound in order given in configuration -## file. When a key is pressed, first action in order -## will test itself whether it's possible to run it. If -## test succeeds, action is executed and other actions -## bound to this key are ignored. If it doesn't, next -## action in order tests itself etc. -## -## 2) It's possible to bind more that one action at once -## to a key. It can be done using the following syntax: -## -## def_key "key" -## action1 -## action2 -## ... -## -## This creates a chain of actions. When such chain is -## executed, each action in chain is run until the end of -## chain is reached or one of its actions fails to execute -## due to its requirements not being met. If multiple actions -## and/or chains are bound to the same key, they will be -## consecutively run until one of them gets fully executed. -## -## 3) When ncmpcpp starts, bindings configuration file is -## parsed and then ncmpcpp provides "missing pieces" -## of default keybindings. If you want to disable some -## bindings, there is a special action called 'dummy' -## for that purpose. Eg. if you want to disable ability -## to crop playlists, you need to put the following -## into configuration file: -## -## def_key "C" -## dummy -## -## After that ncmpcpp will not bind any default action -## to this key. -## -## 4) To let you write simple macros, the following special -## actions are provided: -## -## - push_character "character" - pushes given special -## character into input queue, so it will be immediately -## picked by ncmpcpp upon next call to readKey function. -## Accepted values: mouse, up, down, page_up, page_down, -## home, end, space, enter, insert, delete, left, right, -## tab, ctrl-a, ctrl-b, ..., ctrl-z, ctrl-[, ctrl-\\, -## ctrl-], ctrl-^, ctrl-_, f1, f2, ..., f12, backspace. -## In addition, most of these names can be prefixed with -## alt-/ctrl-/shift- to be recognized with the appropriate -## modifier key(s). -## -## - push_characters "string" - pushes given string into -## input queue. -## -## - require_runnable "action" - checks whether given action -## is runnable and fails if it isn't. This is especially -## useful when mixed with previous two functions. Consider -## the following macro definition: -## -## def_key "key" -## push_characters "custom_filter" -## apply_filter -## -## If apply_filter can't be currently run, we end up with -## sequence of characters in input queue which will be -## treated just as we typed them. This may lead to unexpected -## results (in this case 'c' will most likely clear current -## playlist, 'u' will trigger database update, 's' will stop -## playback etc.). To prevent such thing from happening, we -## need to change above definition to this one: -## -## def_key "key" -## require_runnable "apply_filter" -## push_characters "custom_filter" -## apply_filter -## -## Here, first we test whether apply_filter can be actually run -## before we stuff characters into input queue, so if condition -## is not met, whole chain is aborted and we're fine. -## -## - require_screen "screen" - checks whether given screen is -## currently active. accepted values: browser, clock, help, -## media_library, outputs, playlist, playlist_editor, -## search_engine, tag_editor, visualizer, last_fm, lyrics, -## selected_items_adder, server_info, song_info, -## sort_playlist_dialog, tiny_tag_editor. -## -## - run_external_command "command" - runs given command using -## system() function. -## -## 5) In addition to binding to a key, you can also bind actions -## or chains of actions to a command. If it comes to commands, -## syntax is very similar to defining keys. Here goes example -## definition of a command: -## -## def_command "quit" [deferred] -## stop -## quit -## -## If you execute the above command (which can be done by -## invoking action execute_command, typing 'quit' and pressing -## enter), ncmpcpp will stop the player and then quit. Note the -## presence of word 'deferred' enclosed in square brackets. It -## tells ncmpcpp to wait for confirmation (ie. pressing enter) -## after you typed quit. Instead of 'deferred', 'immediate' -## could be used. Then ncmpcpp will not wait for confirmation -## (enter) and will execute the command the moment it sees it. -## -## Note: while command chains are executed, internal environment -## update (which includes current window refresh and mpd status -## update) is not performed for performance reasons. However, it -## may be desirable to do so in some situration. Therefore it's -## possible to invoke by hand by performing 'update enviroment' -## action. -## -## Note: There is a difference between: -## -## def_key "key" -## action1 -## -## def_key "key" -## action2 -## -## and -## -## def_key "key" -## action1 -## action2 -## -## First one binds two single actions to the same key whilst -## second one defines a chain of actions. The behavior of -## these two is different and is described in (1) and (2). -## -## Note: Function def_key accepts non-ascii characters. -## -##### List of unbound actions ##### -## -## The following actions are not bound to any key/command: -## -## - set_volume -## -# -#def_key "mouse" -# mouse_event -# -#def_key "h" -# previous_column -def_key "j" - scroll_down -def_key "k" - scroll_up -#def_key "l" -# next_column -#def_key "up" -# scroll_up -# -#def_key "shift-up" -# select_item -# scroll_up -# -#def_key "down" -# scroll_down -# -#def_key "shift-down" -# select_item -# scroll_down -# -#def_key "[" -# scroll_up_album -# -#def_key "]" -# scroll_down_album -# -#def_key "{" -# scroll_up_artist -# -#def_key "}" -# scroll_down_artist -# -#def_key "page_up" -# page_up -# -#def_key "page_down" -# page_down -# -#def_key "home" -# move_home -# -#def_key "end" -# move_end -# -#def_key "insert" -# select_item -# -#def_key "enter" -# enter_directory -# -#def_key "enter" -# toggle_output -# -#def_key "enter" -# run_action -# -#def_key "enter" -# play_item -# -#def_key "space" -# add_item_to_playlist -# -#def_key "space" -# toggle_lyrics_update_on_song_change -# -#def_key "space" -# toggle_visualization_type -# -#def_key "delete" -# delete_playlist_items -# -#def_key "delete" -# delete_browser_items -# -#def_key "delete" -# delete_stored_playlist -# -#def_key "right" -# next_column -# -#def_key "right" -# slave_screen -# -#def_key "right" -# volume_up -# -#def_key "+" -# volume_up -# -#def_key "left" -# previous_column -# -#def_key "left" -# master_screen -# -#def_key "left" -# volume_down -# -#def_key "-" -# volume_down -# -#def_key ":" -# execute_command -# -#def_key "tab" -# next_screen -# -#def_key "shift-tab" -# previous_screen -# -#def_key "f1" -# show_help -# -#def_key "1" -# show_playlist -# -#def_key "2" -# show_browser -# -#def_key "2" -# change_browse_mode -# -#def_key "3" -# show_search_engine -# -#def_key "3" -# reset_search_engine -# -#def_key "4" -# show_media_library -# -#def_key "4" -# toggle_media_library_columns_mode -# -#def_key "5" -# show_playlist_editor -# -#def_key "6" -# show_tag_editor -# -#def_key "7" -# show_outputs -# -#def_key "8" -# show_visualizer -# -#def_key "=" -# show_clock -# -#def_key "@" -# show_server_info -# -#def_key "s" -# stop -# -#def_key "p" -# pause -# -#def_key ">" -# next -# -#def_key "<" -# previous -# -#def_key "ctrl-h" -# jump_to_parent_directory -# -#def_key "ctrl-h" -# replay_song -# -#def_key "backspace" -# jump_to_parent_directory -# -#def_key "backspace" -# replay_song -# -#def_key "f" -# seek_forward -# -#def_key "b" -# seek_backward -# -#def_key "r" -# toggle_repeat -# -#def_key "z" -# toggle_random -# -#def_key "y" -# save_tag_changes -# -#def_key "y" -# start_searching -# -#def_key "y" -# toggle_single -# -#def_key "R" -# toggle_consume -# -#def_key "Y" -# toggle_replay_gain_mode -# -#def_key "T" -# toggle_add_mode -# -#def_key "|" -# toggle_mouse -# -#def_key "#" -# toggle_bitrate_visibility -# -#def_key "Z" -# shuffle -# -#def_key "x" -# toggle_crossfade -# -#def_key "X" -# set_crossfade -# -#def_key "u" -# update_database -# -#def_key "ctrl-s" -# sort_playlist -# -#def_key "ctrl-s" -# toggle_browser_sort_mode -# -#def_key "ctrl-s" -# toggle_media_library_sort_mode -# -#def_key "ctrl-r" -# reverse_playlist -# -#def_key "ctrl-f" -# apply_filter -# -#def_key "ctrl-_" -# select_found_items -# -#def_key "/" -# find -# -#def_key "/" -# find_item_forward -# -#def_key "?" -# find -# -#def_key "?" -# find_item_backward -# -#def_key "." -# next_found_item -# -#def_key "," -# previous_found_item -# -#def_key "w" -# toggle_find_mode -# -#def_key "e" -# edit_song -# -#def_key "e" -# edit_library_tag -# -#def_key "e" -# edit_library_album -# -#def_key "e" -# edit_directory_name -# -#def_key "e" -# edit_playlist_name -# -#def_key "e" -# edit_lyrics -# -#def_key "i" -# show_song_info -# -#def_key "I" -# show_artist_info -# -#def_key "g" -# jump_to_position_in_song -# -#def_key "l" -# show_lyrics -# -#def_key "ctrl-v" -# select_range -# -#def_key "v" -# reverse_selection -# -#def_key "V" -# remove_selection -# -#def_key "B" -# select_album -# -#def_key "a" -# add_selected_items -# -#def_key "c" -# clear_playlist -# -#def_key "c" -# clear_main_playlist -# -#def_key "C" -# crop_playlist -# -#def_key "C" -# crop_main_playlist -# -#def_key "m" -# move_sort_order_up -# -#def_key "m" -# move_selected_items_up -# -#def_key "n" -# move_sort_order_down -# -#def_key "n" -# move_selected_items_down -# -#def_key "M" -# move_selected_items_to -# -#def_key "A" -# add -# -#def_key "S" -# save_playlist -# -#def_key "o" -# jump_to_playing_song -# -#def_key "G" -# jump_to_browser -# -#def_key "G" -# jump_to_playlist_editor -# -#def_key "~" -# jump_to_media_library -# -#def_key "E" -# jump_to_tag_editor -# -#def_key "U" -# toggle_playing_song_centering -# -#def_key "P" -# toggle_display_mode -# -#def_key "\\" -# toggle_interface -# -#def_key "!" -# toggle_separators_between_albums -# -#def_key "L" -# toggle_lyrics_fetcher -# -#def_key "F" -# fetch_lyrics_in_background -# -#def_key "alt-l" -# toggle_fetching_lyrics_in_background -# -#def_key "ctrl-l" -# toggle_screen_lock -# -#def_key "`" -# toggle_library_tag_type -# -#def_key "`" -# refetch_lyrics -# -#def_key "`" -# add_random_items -# -#def_key "ctrl-p" -# set_selected_items_priority -# -#def_key "q" -# quit -# diff --git a/home/.config/ncmpcpp/config b/home/.config/ncmpcpp/config deleted file mode 100644 index ebe09fb9..00000000 --- a/home/.config/ncmpcpp/config +++ /dev/null @@ -1,156 +0,0 @@ -##### directories ###### -ncmpcpp_directory = ~/.ncmpcpp -lyrics_directory = ~/.lyrics -##### MPD settings ##### -mpd_host = {{@@ env['PASS_MPD_ADMIN'] @@}}@localhost -mpd_port = 6600 -mpd_connection_timeout = 5 -mpd_music_dir = ~/Music -mpd_crossfade_time = 2 - -##### visualizer ##### -visualizer_data_source = /tmp/mpd.fifo -visualizer_output_name = Visualizer -visualizer_in_stereo = yes -# spectrum,wave,wave_filled,ellipse. -visualizer_type = wave_filled -visualizer_look = ●▮ -visualizer_color = 41, 83, 119, 155, 185, 215, 209, 203, 197, 161 - -##### delays ##### -# Time of inactivity (in seconds) after playlist highlighting will be disabled -## (0 = always on). -playlist_disable_highlight_delay = 5 -message_delay_time = 5 - -##### song format ##### -# %l - length -# %f - filename -# %D - directory -# %a - artist -# %A - album artist -# %t - title -# %b - album -# %y - date -# %n - track number (01/12 -> 01) -# %N - full track info (01/12 -> 01/12) -# %g - genre -# %c - composer -# %p - performer -# %d - disc -# %C - comment -# %P - priority -# $R - begin right alignment - -song_list_format = {%a - }{%t}|{$8%f$9}$R{$3(%l)$9} -song_status_format = {{%a{ "%b"{ (%y)}} - }{%t}}|{%f} -song_library_format = {%n - }{%t}|{%f} -alternative_header_first_line_format = $b$1$aqqu$/a$9 {%t}|{%f} $1$atqq$/a$9$/b -alternative_header_second_line_format = {{$4$b%a$/b$9}{ - $7%b$9}{ ($4%y$9)}}|{%D} -current_item_prefix = $(yellow)$r -current_item_suffix = $/r$(end) -current_item_inactive_column_prefix = $(white)$r -current_item_inactive_column_suffix = $/r$(end) -now_playing_prefix = $b -now_playing_suffix = $/b -browser_playlist_prefix = "$2playlist$9 " -selected_item_prefix = $6 -selected_item_suffix = $9 -modified_item_prefix = $3> $9 -song_window_title_format = {%a - }{%t}|{%f} -browser_sort_mode = name -browser_sort_format = {%a - }{%t}|{%f} {(%l)} - -##### columns ##### -song_columns_list_format = (20)[]{a} (6f)[green]{NE} (50)[white]{t|f:Title} (20)[cyan]{b} (7f)[magenta]{l} - -##### misc ##### -execute_on_song_change = "" -execute_on_player_state_change = "" -playlist_show_mpd_host = no -playlist_show_remaining_time = no -playlist_shorten_total_times = no -playlist_separate_albums = no -playlist_display_mode = columns -browser_display_mode = classic -search_engine_display_mode = classic -playlist_editor_display_mode = classic -discard_colors_if_item_is_selected = yes -show_duplicate_tags = yes -incremental_seeking = yes -seek_time = 1 -volume_change_step = 2 -autocenter_mode = no -centered_cursor = no -progressbar_look = => -default_place_to_search_in = database -user_interface = alternative -data_fetching_delay = yes -media_library_primary_tag = album_artist -media_library_albums_split_by_date = yes -default_find_mode = wrapped -default_tag_editor_pattern = %n - %t -header_visibility = yes -statusbar_visibility = yes -titles_visibility = yes -header_text_scrolling = yes -cyclic_scrolling = no -lines_scrolled = 2 -lastfm_preferred_language = en -screen_switcher_mode = playlist, browser -startup_screen = playlist -startup_slave_screen = "" -startup_slave_screen_focus = no -locked_screen_width_part = 50 -ask_for_locked_screen_width_part = yes -jump_to_now_playing_song_at_start = yes -ask_before_clearing_playlists = yes -clock_display_seconds = no -display_volume_level = yes -display_bitrate = no -display_remaining_time = no -regular_expressions = perl -ignore_leading_the = no -ignore_diacritics = no -block_search_constraints_change_if_items_found = yes -mouse_support = yes -mouse_list_scroll_whole_page = yes -empty_tag_marker = -tags_separator = " | " -tag_editor_extended_numeration = no -media_library_sort_by_mtime = no -enable_window_title = yes -search_engine_default_search_mode = 1 -external_editor = nvim -use_console_editor = yes - -##### lyrics ##### -#lyrics_fetchers = embedded -follow_now_playing_lyrics = yes -fetch_lyrics_for_current_song_in_background = no -store_lyrics_in_song_dir = no - -##### files ##### -generate_win32_compatible_filenames = yes -allow_for_physical_item_deletion = no -space_add_mode = add_remove -show_hidden_files_in_local_browser = no - -##### colors ##### -colors_enabled = yes -empty_tag_color = cyan -header_window_color = red -volume_color = default -state_line_color = default -state_flags_color = default:b -main_window_color = yellow -color1 = white -color2 = green -progressbar_color = black:b -progressbar_elapsed_color = green:b -statusbar_color = default -statusbar_time_color = default:b -player_state_color = default:b -alternative_ui_separator_color = black:b -window_border_color = green -active_window_border = red diff --git a/home/.config/neomutt/accounts/marko@korhonen.cc b/home/.config/neomutt/accounts/marko@korhonen.cc deleted file mode 100644 index d054f631..00000000 --- a/home/.config/neomutt/accounts/marko@korhonen.cc +++ /dev/null @@ -1,9 +0,0 @@ -# vim: filetype=neomuttrc - -set folder = ~/.mail/marko@korhonen.cc -set spoolfile = +INBOX -set postponed = +Drafts -set record = +Sent - -set realname='Marko Korhonen' -set from=marko@korhonen.cc diff --git a/home/.config/neomutt/neomuttrc b/home/.config/neomutt/neomuttrc deleted file mode 100644 index f37ec331..00000000 --- a/home/.config/neomutt/neomuttrc +++ /dev/null @@ -1,9 +0,0 @@ -# vim: filetype=neomuttrc - -## General options -set header_cache = "~/.cache/neomutt" -set mbox_type=Maildir - -# Accounts -source "~/.config/neomutt/accounts/marko@korhonen.cc" -folder-hook $folder 'source ~/.config/neomutt/accounts/marko@korhonen.cc' diff --git a/home/.config/networkmanager-dmenu/config.ini b/home/.config/networkmanager-dmenu/config.ini deleted file mode 100644 index b3518827..00000000 --- a/home/.config/networkmanager-dmenu/config.ini +++ /dev/null @@ -1,28 +0,0 @@ -[dmenu] -fn = -*-SF-Pro-Display-Regular-*-*-*-10-*-*-*-*-*-*-* -dmenu_command = /usr/bin/rofi -l = 10 -# # Note that dmenu_command can contain arguments as well like `rofi -width 30` -# # Rofi and dmenu are set to case insensitive by default `-i` -# l = number of lines to display, defaults to number of total network options -# fn = font string -# nb = normal background (name, #RGB, or #RRGGBB) -# nf = normal foreground -# sb = selected background -# sf = selected foreground -# b = (just set to empty value and menu will appear at the bottom -# m = number of monitor to display on -# p = Custom Prompt for the networks menu -# pinentry = Pinentry command -# rofi_highlight = # (Default: False) use rofi highlighting instead of '**' - -# # override normal foreground and background colors (dmenu) or use the -# # -password option (rofi) to obscure passphrase entry -# [dmenu_passphrase] -# nf = #222222 -# nb = #222222 -# rofi_obscure = True - -[editor] -terminal = termite -gui_if_available = True diff --git a/home/.config/nvim/README.adoc b/home/.config/nvim/README.adoc deleted file mode 100644 index caabc08f..00000000 --- a/home/.config/nvim/README.adoc +++ /dev/null @@ -1,16 +0,0 @@ -= FunctionalHacker's NeoVim configuration - -This is my personal NeoVim configuration I use for all text editing in my free -time and at my day job. I mostly code in Java, TypeScript and ReactJS, with -a bit of Rust and Python once in a blue moon. - -The configuration is quite minimal but still fully featured. Some highlights -include - -* LSP support with neovim's built in LSP client -** LSP servers are easily installed and auto-configured with Mason -* Treesitter -** Code folding -** Code highlighting -** Text objects -* Lazy plugin manager for fast startup times diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua deleted file mode 100644 index 58e0b620..00000000 --- a/home/.config/nvim/ftplugin/java.lua +++ /dev/null @@ -1,111 +0,0 @@ -local nvim_local_dir = vim.fn.expand("~/.local/share/nvim") -local mason_packages = nvim_local_dir .. "/mason/packages" -local lombok_jar = mason_packages .. "/jdtls/lombok.jar" -local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") -local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name -local lsp_utils = require("lsp_utils") -local jvm = "/usr/lib/jvm" -local java_version = 21 - -require("jdtls").start_or_attach({ - cmd = { - jvm .. "/java-" .. java_version .. "-openjdk-amd64/bin/java", - "-Declipse.application=org.eclipse.jdt.ls.core.id1", - "-Dosgi.bundles.defaultStartLevel=4", - "-Declipse.product=org.eclipse.jdt.ls.core.product", - "-Dlog.protocol=true", - "-Dlog.level=ALL", - "-Xms1g", - "--add-modules=ALL-SYSTEM", - "--add-opens", - "java.base/java.util=ALL-UNNAMED", - "--add-opens", - "java.base/java.lang=ALL-UNNAMED", - "-javaagent:" .. lombok_jar, - "-jar", - vim.fn.glob(mason_packages .. "/jdtls/plugins/org.eclipse.equinox.launcher_*.jar"), - "-configuration", - nvim_local_dir .. "/mason/packages/jdtls/config_linux", - "-data", - workspace_dir, - }, - settings = { - java = { - signatureHelp = { enabled = true }, - autobuild = { enabled = false }, - configuration = { - runtimes = { - { - name = "JavaSE-1.8", - path = jvm .. "/java-8-openjdk-amd64/", - }, - { - name = "JavaSE-11", - path = jvm .. "/java-11-openjdk-amd64/", - }, - { - name = "JavaSE-17", - path = jvm .. "/java-17-openjdk-amd64/", - }, - { - name = "JavaSE-21", - path = jvm .. "/java-21-openjdk-amd64/", - }, - }, - }, - }, - }, - completion = { favoriteStaticMembers = { "java.text.MessageFormat.format" } }, - handlers = { - ["language/status"] = function() end, - }, - init_options = { - bundles = { - vim.fn.glob(mason_packages .. "/java-debug-adapter/extension/server/com.microsoft.java.debug.plugin-*.jar"), - }, - }, - capabilities = lsp_utils.get_capabilities(), - on_attach = lsp_utils.map_keys, -}) - -function RunJava() - local function show_output(output) - vim.cmd("split") - vim.cmd("enew") - vim.fn.append(0, output) - --vim.cmd("1d") -- Remove the empty first line - vim.bo[0].modifiable = false - end - - local filename = vim.fn.expand("%") -- Get the current file name - local class_name = vim.fn.fnamemodify(filename, ":r") -- Extract the class name - local compile_cmd = "javac " .. filename - local run_cmd = "java " .. class_name - - -- Create a temporary file to capture the compile output - local temp_file = vim.fn.tempname() - - -- Run the compilation command and save the output to the temporary file - local compile_exit_code = vim.fn.system(compile_cmd .. " > " .. temp_file .. " 2>&1") - - -- Check the exit code of the compile command - if compile_exit_code == 0 then - -- Compilation was successful, run the Java program - show_output(vim.fn.systemlist(run_cmd)) - else - -- Compilation failed, display the error output from the temporary file - show_output(vim.fn.readfile(temp_file)) - end - - -- Clean up the temporary file and class file - vim.fn.delete(temp_file) - vim.fn.delete(vim.fn.expand("%:p:h") .. "/" .. class_name .. ".class") -end - --- Define a VimScript command to execute the Lua function -vim.api.nvim_exec( - [[ - command! RunJava lua RunJava() -]], - false -) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua deleted file mode 100644 index a23743b8..00000000 --- a/home/.config/nvim/init.lua +++ /dev/null @@ -1,28 +0,0 @@ --- Install lazy if it's not yet installed -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) -end -vim.opt.rtp:prepend(lazypath) - -require("settings") -require("keybinds") -require("neovide") -require("highlight_yank") -require("lazy").setup({ - spec = { import = "plugins" }, - lockfile = "~/git/dotfiles/home/.config/nvim/lazy-lock.json", - performance = { - disabled_plugins = { "netrwPlugin" }, - }, - defaults = { - -- version = "*", -- Disabled for now - }, -}) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json deleted file mode 100644 index 2fd9a9b5..00000000 --- a/home/.config/nvim/lazy-lock.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, - "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "14cad96b80a07e9e92a0dcbe235092ed14113fb2" }, - "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, - "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-git": { "branch": "main", "commit": "50d526dff0f6bc441b51fc269d9fdc99a50c76af" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, - "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, - "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, - "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "d26bf92161cd70e049dc138b44ffa0246dbf7178" }, - "firenvim": { "branch": "master", "commit": "bb70728c13c305ff35193586d5f6ce68668af063" }, - "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "fugitive-gitea": { "branch": "master", "commit": "d93176028d13820f941c165c14039a6019744a5a" }, - "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, - "indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" }, - "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, - "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, - "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-extra-cmds": { "branch": "main", "commit": "1bf94d631a9d35061e694ab49dbdea83172a8e51" }, - "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1c55991321d1a861537e32446affc5de5d9a6eaf" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "fe573c7fb74252076d6c6d40837a92a7138dbb00" }, - "neoformat": { "branch": "master", "commit": "b3b38589b39038dc12c2f5a59a828ed43439363a" }, - "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, - "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "50708bea09cead374bf0b4b9c50686de68951d5c" }, - "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" }, - "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" }, - "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, - "nvim-jdtls": { "branch": "master", "commit": "99e4b2081de1d9162666cc7b563cbeb01c26b66b" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "43200fb3a820ed1b6c526e0eb0f3e6e6edd9fd64" }, - "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "ad0b95dee55955817af635fa121f6e2486b10583" }, - "nvim-treesitter": { "branch": "master", "commit": "cfd2095e66e49ea0dfbef6b41be2efd0ba6cc4ee" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "41e3abf6bfd9a9a681eb1f788bdeba91c9004b2b" }, - "nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" }, - "nvim-ufo": { "branch": "main", "commit": "7dcb8fea3e7b3ccdb50f2c3ae7c248cdf6fe1ae1" }, - "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, - "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, - "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "statuscol.nvim": { "branch": "main", "commit": "93d8bcda516fc86e11c03f9ef577bae9a72fba0e" }, - "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, - "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, - "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, - "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, - "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, - "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } -} diff --git a/home/.config/nvim/lua/highlight_yank.lua b/home/.config/nvim/lua/highlight_yank.lua deleted file mode 100644 index 649506bb..00000000 --- a/home/.config/nvim/lua/highlight_yank.lua +++ /dev/null @@ -1,12 +0,0 @@ --- Highlight yanked text - -local ag = vim.api.nvim_create_augroup -local au = vim.api.nvim_create_autocmd - -au('TextYankPost', { - group = ag('yank_highlight', {}), - pattern = '*', - callback = function() - vim.highlight.on_yank { higroup='IncSearch', timeout=300 } - end, -}) diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua deleted file mode 100644 index 6676d121..00000000 --- a/home/.config/nvim/lua/keybinds.lua +++ /dev/null @@ -1,15 +0,0 @@ -vim.keymap.set("n", "b", function() - local current_theme = vim.fn.eval("&background") - if current_theme == "dark" then - vim.cmd("set background=light") - else - vim.cmd("set background=dark") - end -end, { desc = "Toggle background between dark and light" }) - -vim.keymap.set("n", "h", "nohlsearch", { desc = "Turn off search highlight" }) -vim.keymap.set("n", "co", 'silent! execute "%bd|e#|bd#"', { desc = "Close other buffers" }) -vim.keymap.set("n", "a", "e#", { desc = "Edit alternate file" }) -vim.keymap.set("n", "", "bnext", { desc = "Next buffer" }) -vim.keymap.set("n", "", "bprevious", { desc = "Previous buffer" }) -vim.keymap.set("t", "", "", { desc = "Exit terminal insert mode with esc" }) diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua deleted file mode 100644 index 8851c307..00000000 --- a/home/.config/nvim/lua/lsp_utils.lua +++ /dev/null @@ -1,56 +0,0 @@ --- This module contains lsp related --- reusable functions -local m = {} - -local lsp = vim.lsp -local diagnostic = vim.diagnostic -local k = vim.keymap.set - --- Maps LSP specific keybinds. --- This makes them only available when LSP is running -function m.map_keys() - local builtin = require("telescope.builtin") - - require("which-key").add({ - { "w", group = "Workspace" }, - }) - - k("n", "F", lsp.buf.format, { desc = "Format with LSP" }) - k("n", "ca", lsp.buf.code_action, { desc = "Code action" }) - k("n", "e", diagnostic.open_float, { desc = "Open diagnostics" }) - k("n", "k", lsp.buf.signature_help, { desc = "Signature help" }) - k("n", "rn", lsp.buf.rename, { desc = "Rename symbol" }) - k("n", "wa", lsp.buf.add_workspace_folder, { desc = "Add folder" }) - k("n", "wl", function() - print(vim.inspect(lsp.buf.list_workspace_folders())) - end, { desc = "List folders" }) - k("n", "wr", lsp.buf.remove_workspace_folder, { desc = "Remove folder" }) - k("n", "K", lsp.buf.hover, { desc = "Hover" }) - k("n", "[d", diagnostic.goto_prev, { desc = "Previous diagnostic" }) - k("n", "]d", diagnostic.goto_next, { desc = "Next diagnostic" }) - k("n", "gD", lsp.buf.declaration, { desc = "Declaration" }) - k("n", "gd", builtin.lsp_definitions, { desc = "Definition" }) - k("n", "gi", builtin.lsp_implementations, { desc = "Implementation" }) - k("n", "gr", builtin.lsp_references, { desc = "References" }) - k("n", "gs", builtin.lsp_document_symbols, { desc = "Symbols" }) - k("n", "gt", lsp.buf.type_definition, { desc = "Type definition" }) -end - --- Combine built-in LSP and cmp cabaibilities --- and additional capabilities from other plugins -function m.get_capabilities() - local capabilities = vim.tbl_deep_extend( - "force", - lsp.protocol.make_client_capabilities(), - require("cmp_nvim_lsp").default_capabilities() - ) - - -- Neovim hasn't added foldingRange to default capabilities, users must add it manually for ufo - capabilities.textDocument.foldingRange = { - dynamicRegistration = false, - lineFoldingOnly = true, - } - return capabilities -end - -return m diff --git a/home/.config/nvim/lua/neovide.lua b/home/.config/nvim/lua/neovide.lua deleted file mode 100644 index e0037efb..00000000 --- a/home/.config/nvim/lua/neovide.lua +++ /dev/null @@ -1,29 +0,0 @@ -local g = vim.g -local o = vim.o - --- Change scale factor with C+ and C- -g.neovide_scale_factor = {{@@ scale_factor|default(1.0) @@}} -local change_scale_factor = function(delta) - g.neovide_scale_factor = g.neovide_scale_factor * delta -end -vim.keymap.set("n", "", function() - change_scale_factor(1.25) -end) -vim.keymap.set("n", "", function() - change_scale_factor(1 / 1.25) -end) - --- Hide mouse when typing in neovide (disabled) -g.neovide_hide_mouse_when_typing = false - --- Enable cursor particles in neovide -g.neovide_cursor_vfx_mode = "railgun" - --- Enable dark/light theme detection -g.neovide_theme = "auto" - --- Confirm quit -g.neovide_confirm_quit = true - --- Set font ---o.guifont = "Hack Nerd Font Mono:h15" diff --git a/home/.config/nvim/lua/pager.lua b/home/.config/nvim/lua/pager.lua deleted file mode 100644 index aea0b8d7..00000000 --- a/home/.config/nvim/lua/pager.lua +++ /dev/null @@ -1,2 +0,0 @@ --- Settings for pager mode -vim.keymap.set("n", "q", vim.cmd.q) diff --git a/home/.config/nvim/lua/plugins/alpha.lua b/home/.config/nvim/lua/plugins/alpha.lua deleted file mode 100644 index 792ea76d..00000000 --- a/home/.config/nvim/lua/plugins/alpha.lua +++ /dev/null @@ -1,39 +0,0 @@ --- Startup dashboard ---- @type LazyPluginSpec -return { - "goolord/alpha-nvim", - config = function() - local alpha = require("alpha") - local dashboard = require("alpha.themes.dashboard") - dashboard.section.header.val = { - [[ __ ]], - [[ ___ ___ ___ __ __ /\_\ ___ ___ ]], - [[ / _ `\ / __`\ / __`\/\ \/\ \\/\ \ / __` __`\ ]], - [[/\ \/\ \/\ __//\ \_\ \ \ \_/ |\ \ \/\ \/\ \/\ \ ]], - [[\ \_\ \_\ \____\ \____/\ \___/ \ \_\ \_\ \_\ \_\]], - [[ \/_/\/_/\/____/\/___/ \/__/ \/_/\/_/\/_/\/_/]], - } - dashboard.section.buttons.val = { - dashboard.button( - "p", - "📽 Open a project", - ":lua require('telescope').extensions.project.project()" - ), - dashboard.button("e", " New file", ":ene startinsert "), - dashboard.button("", "🔍 Find file", "Telescope find_files"), - dashboard.button("", "𑪢 Grep files", "Telescope live_grep"), - dashboard.button("l", "🛋 Lazy", ":Lazy"), - dashboard.button("m", "📦 Mason", ":Mason"), - dashboard.button("q", "ꭙ Quit NeoVim", ":qa"), - } - - -- Fortune in footer - dashboard.section.footer.val = require("alpha.fortune")() - - dashboard.config.opts.noautocmd = true - - vim.cmd([[autocmd User AlphaReady echo 'ready']]) - - alpha.setup(dashboard.config) - end, -} diff --git a/home/.config/nvim/lua/plugins/asciidoc.lua b/home/.config/nvim/lua/plugins/asciidoc.lua deleted file mode 100644 index d723b3fc..00000000 --- a/home/.config/nvim/lua/plugins/asciidoc.lua +++ /dev/null @@ -1,15 +0,0 @@ --- AsciiDoc plugins are grouped together here -return { - -- Vim ♥️ Asciidoctor - --- @type LazyPluginSpec - { - "habamax/vim-asciidoctor", - ft = { "asciidoctor", "asciidoc" }, - }, - -- AsciiDoc preview - --- @type LazyPluginSpec - { - "tigion/nvim-asciidoc-preview", - ft = { "asciidoctor", "asciidoc" }, - }, -} diff --git a/home/.config/nvim/lua/plugins/autopairs.lua b/home/.config/nvim/lua/plugins/autopairs.lua deleted file mode 100644 index cde6d85c..00000000 --- a/home/.config/nvim/lua/plugins/autopairs.lua +++ /dev/null @@ -1,6 +0,0 @@ --- Automatic brackets ---- @type LazyPluginSpec -return { - "windwp/nvim-autopairs", - config = true -} diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua deleted file mode 100644 index e4c85983..00000000 --- a/home/.config/nvim/lua/plugins/bufferline.lua +++ /dev/null @@ -1,16 +0,0 @@ --- Bufferline ---- @type LazyPluginSpec -return { - "akinsho/bufferline.nvim", - dependencies = { "kyazdani42/nvim-web-devicons" }, - --- @type BufferlineConfig - opts = { - options = { - diagnostics = "nvim_lsp", - diagnostics_indicator = function(count, level) - local icon = level:match("error") and " " or " " - return " " .. icon .. count - end, - }, - }, -} diff --git a/home/.config/nvim/lua/plugins/caddyfile.lua b/home/.config/nvim/lua/plugins/caddyfile.lua deleted file mode 100644 index ec4c5273..00000000 --- a/home/.config/nvim/lua/plugins/caddyfile.lua +++ /dev/null @@ -1,6 +0,0 @@ --- Caddyfile syntax support ---- @type LazyPluginSpec -return { - "isobit/vim-caddyfile", - ft = "caddyfile", -} diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua deleted file mode 100644 index 9f6537d5..00000000 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ /dev/null @@ -1,150 +0,0 @@ --- Auto completion ---- @type LazyPluginSpec -return { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-buffer", -- Buffer source - -- Git source - { - "petertriho/cmp-git", - dependencies = { "nvim-lua/plenary.nvim" }, - config = true, - }, - "hrsh7th/cmp-nvim-lsp", -- LSP source - "hrsh7th/cmp-nvim-lua", -- Neovim Lua API documentation source - "hrsh7th/cmp-path", -- Path source - "hrsh7th/cmp-cmdline", -- cmdline source - "saadparwaiz1/cmp_luasnip", -- Snippets source - "f3fora/cmp-spell", -- Spell check source - "petertriho/cmp-git", -- Git source - -- Copilot source - { - "zbirenbaum/copilot-cmp", - opts = { fix_pairs = true }, - }, - }, - config = function() - local cmp = require("cmp") - local luasnip = require("luasnip") - - local has_words_before = function() - unpack = unpack or table.unpack - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil - end - - -- Set completeopt to have a better completion experience - vim.o.completeopt = "menuone,noselect" - - local bordered = cmp.config.window.bordered() - - cmp.setup({ - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - window = { - completion = bordered, - documentation = bordered, - }, - mapping = { - [""] = cmp.mapping.select_prev_item(), - [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.close(), - [""] = cmp.mapping.confirm({ - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }), - -- Snippet placeholder forward - [""] = cmp.mapping(function(fallback) - if luasnip.jumpable(1) then - luasnip.jump(1) - else - fallback() - end - end, { "i", "s" }), - -- Snippet placeholder backward - [""] = cmp.mapping(function(fallback) - if luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - -- Completion menu forward - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - -- If only one entry, select it - if #cmp.get_entries() == 1 then - cmp.confirm({ select = true }) - else - cmp.select_next_item() - end - elseif has_words_before() then - cmp.complete() - if #cmp.get_entries() == 1 then - cmp.confirm({ select = true }) - end - else - fallback() - end - end, { "i", "s" }), - -- Completion menu backward - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - else - fallback() - end - end, { "i", "s" }), - }, - sources = { - { name = "luasnip" }, - { name = "nvim_lsp" }, - { name = "nvim_lua" }, - { name = "git" }, - { name = "copilot" }, - { name = "buffer" }, - { name = "spell" }, - { name = "path" }, - { - name = "lazydev", - group_index = 0, -- set group index to 0 to skip loading LuaLS completions - }, - }, - }) - - require("cmp_git").setup() - - -- Enable autopairs when enter is processed - -- on completion - local cmp_autopairs = require("nvim-autopairs.completion.cmp") - cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) - - -- search cmdline setup. - cmp.setup.cmdline({ "/", "?" }, { - mapping = cmp.mapping.preset.cmdline(), - sources = { - { name = "buffer" }, - }, - }) - -- `:` cmdline setup. - cmp.setup.cmdline(":", { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ - { name = "path" }, - }, { - { - name = "cmdline", - option = { - ignore_cmds = { "Man", "!" }, - }, - }, - }), - }) - end, -} diff --git a/home/.config/nvim/lua/plugins/confirm-quit.lua b/home/.config/nvim/lua/plugins/confirm-quit.lua deleted file mode 100644 index f140e7af..00000000 --- a/home/.config/nvim/lua/plugins/confirm-quit.lua +++ /dev/null @@ -1,10 +0,0 @@ --- Confirm before quit ---- @type LazyPluginSpec -return { - cond = vim.g.neovide == not nil, - "yutkat/confirm-quit.nvim", - event = "CmdlineEnter", - opts = { - quit_message = "You are in Neovide, are you sure you want to quit?", - }, -} diff --git a/home/.config/nvim/lua/plugins/copilot.lua b/home/.config/nvim/lua/plugins/copilot.lua deleted file mode 100644 index c1b6a3ed..00000000 --- a/home/.config/nvim/lua/plugins/copilot.lua +++ /dev/null @@ -1,9 +0,0 @@ --- GitHub Copilot ---- @type LazyPluginSpec -return { - "zbirenbaum/copilot.lua", - opts = { - suggestion = { enabled = false }, - panel = { enabled = false }, - }, -} diff --git a/home/.config/nvim/lua/plugins/diffview.lua b/home/.config/nvim/lua/plugins/diffview.lua deleted file mode 100644 index aa17c163..00000000 --- a/home/.config/nvim/lua/plugins/diffview.lua +++ /dev/null @@ -1,3 +0,0 @@ --- Improved diffs ---- @type LazyPluginSpec -return { "sindrets/diffview.nvim" } diff --git a/home/.config/nvim/lua/plugins/dropbar.lua b/home/.config/nvim/lua/plugins/dropbar.lua deleted file mode 100644 index 30ef6fff..00000000 --- a/home/.config/nvim/lua/plugins/dropbar.lua +++ /dev/null @@ -1,6 +0,0 @@ --- Show the current LSP context in winbar ---- @type LazyPluginSpec -return { - enabled = vim.fn.has("nvim-0.10") == 1, - "Bekaboo/dropbar.nvim", -} diff --git a/home/.config/nvim/lua/plugins/firenvim.lua b/home/.config/nvim/lua/plugins/firenvim.lua deleted file mode 100644 index dba55753..00000000 --- a/home/.config/nvim/lua/plugins/firenvim.lua +++ /dev/null @@ -1,17 +0,0 @@ --- Neovim inside Firefox ---- @type LazyPluginSpec -return { - "glacambre/firenvim", - build = function() - vim.fn["firenvim#install"](0) - end, - config = function() - vim.g.firenvim_config = { - localSettings = { - [".*"] = { - takeOver = "never", - }, - }, - } - end, -} diff --git a/home/.config/nvim/lua/plugins/fugitive.lua b/home/.config/nvim/lua/plugins/fugitive.lua deleted file mode 100644 index f6282331..00000000 --- a/home/.config/nvim/lua/plugins/fugitive.lua +++ /dev/null @@ -1,12 +0,0 @@ --- Git commands ---- @type LazyPluginSpec -return { - "tpope/vim-fugitive", - dependencies = { "borissov/fugitive-gitea" }, - config = function() - vim.g.fugitive_gitea_domains = { - "https://git.korhonen.cc", - "https://git.rossum.fi", - } - end, -} diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua deleted file mode 100644 index 000ef9d5..00000000 --- a/home/.config/nvim/lua/plugins/gitsigns.lua +++ /dev/null @@ -1,34 +0,0 @@ -local k = vim.keymap.set - ---- @type LazyPluginSpec -return { - "lewis6991/gitsigns.nvim", - config = function() - local gs = require("gitsigns") - gs.setup() - - -- Add groups for which-key - require("which-key").add({ - { "g", group = "Git" }, - { "gr", group = "Reset" }, - { "ga", group = "Add" }, - }) - - -- Keybinds - local opts - - -- Hunk navigation - k("n", "[h", gs.prev_hunk, { desc = "Previous hunk" }) - k("n", "]h", gs.next_hunk, { desc = "Next hunk" }) - - -- Hunk actions - opts = { desc = "Hunk" } - k("n", "grh", gs.reset_hunk, opts) - k("n", "gah", gs.stage_hunk, opts) - - -- Buffer actions - opts = { desc = "Buffer" } - k("n", "gab", gs.stage_buffer, opts) - k("n", "grb", gs.reset_buffer, opts) - end, -} diff --git a/home/.config/nvim/lua/plugins/gnupg.lua b/home/.config/nvim/lua/plugins/gnupg.lua deleted file mode 100644 index 4da3d9d8..00000000 --- a/home/.config/nvim/lua/plugins/gnupg.lua +++ /dev/null @@ -1,6 +0,0 @@ --- Edit GPG encrypted files transparently ---- @type LazyPluginSpec -return { - "jamessan/vim-gnupg", - ft = { "gpg" }, -} diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua deleted file mode 100644 index 8ddab8c7..00000000 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ /dev/null @@ -1,24 +0,0 @@ --- Indent characters ---- @type LazyPluginSpec -return { - "lukas-reineke/indent-blankline.nvim", - --- @type ibl.config - opts = { - exclude = { - filetypes = { - "", - "checkhealth", - "alpha", - "git", - "gitcommit", - "TelescopePrompt", - "TelescopeResults", - "help", - "lazy", - "lspinfo", - "man", - }, - }, - }, - main = "ibl", -} diff --git a/home/.config/nvim/lua/plugins/kanagawa.lua b/home/.config/nvim/lua/plugins/kanagawa.lua deleted file mode 100644 index 3cd3beac..00000000 --- a/home/.config/nvim/lua/plugins/kanagawa.lua +++ /dev/null @@ -1,56 +0,0 @@ --- Colorscheme ---- @type LazyPluginSpec -return { - "rebelot/kanagawa.nvim", - dependencies = { { "f-person/auto-dark-mode.nvim", config = true } }, - --- @type KanagawaConfig - opts = { - compile = true, - dimInactive = true, - colors = { - theme = { - all = { - ui = { - bg_gutter = "none", -- Hide gutter background - }, - }, - }, - }, - background = { - dark = "wave", - light = "lotus", - }, - overrides = function(colors) - local theme = colors.theme - return { - -- Transparent floating windows - NormalFloat = { bg = "none" }, - FloatBorder = { bg = "none" }, - FloatTitle = { bg = "none" }, - NormalDark = { fg = theme.ui.fg_dim, bg = theme.ui.bg_m3 }, - LazyNormal = { bg = theme.ui.bg_m3, fg = theme.ui.fg_dim }, - MasonNormal = { bg = theme.ui.bg_m3, fg = theme.ui.fg_dim }, - - -- Block-like modern Telescope UI - TelescopeTitle = { fg = theme.ui.special, bold = true }, - TelescopePromptNormal = { bg = theme.ui.bg_p1 }, - TelescopePromptBorder = { fg = theme.ui.bg_p1, bg = theme.ui.bg_p1 }, - TelescopeResultsNormal = { fg = theme.ui.fg_dim, bg = theme.ui.bg_m1 }, - TelescopeResultsBorder = { fg = theme.ui.bg_m1, bg = theme.ui.bg_m1 }, - TelescopePreviewNormal = { bg = theme.ui.bg_dim }, - TelescopePreviewBorder = { bg = theme.ui.bg_dim, fg = theme.ui.bg_dim }, - - -- More uniform look for the popup menu - Pmenu = { fg = theme.ui.shade0, bg = theme.ui.bg_p1, blend = vim.o.pumblend }, - PmenuSel = { fg = "NONE", bg = theme.ui.bg_p2 }, - PmenuSbar = { bg = theme.ui.bg_m1 }, - PmenuThumb = { bg = theme.ui.bg_p2 }, - } - end, - }, - --- @param opts KanagawaConfig - config = function(_, opts) - require("kanagawa").setup(opts) - vim.cmd("colorscheme kanagawa") - end, -} diff --git a/home/.config/nvim/lua/plugins/lazydev.lua b/home/.config/nvim/lua/plugins/lazydev.lua deleted file mode 100644 index 4e9b1b54..00000000 --- a/home/.config/nvim/lua/plugins/lazydev.lua +++ /dev/null @@ -1,15 +0,0 @@ --- Neovim setup for init.lua and plugin development with full signature help, docs and completion for the nvim lua API. ---- @type LazyPluginSpec -return { - { - "folke/lazydev.nvim", - ft = "lua", -- only load on lua files - opts = { - library = { - -- See the configuration section for more details - -- Load luvit types when the `vim.uv` word is found - { path = "luvit-meta/library", words = { "vim%.uv" } }, - }, - }, - }, -} diff --git a/home/.config/nvim/lua/plugins/lualine.lua b/home/.config/nvim/lua/plugins/lualine.lua deleted file mode 100644 index 1aaba3e7..00000000 --- a/home/.config/nvim/lua/plugins/lualine.lua +++ /dev/null @@ -1,38 +0,0 @@ -local noice_mode = require("noice").api.statusline.mode --- Statusline ---- @type LazyPluginSpec -return { - "nvim-lualine/lualine.nvim", - dependencies = { "kyazdani42/nvim-web-devicons" }, - opts = { - sections = { - lualine_x = { - "encoding", - "fileformat", - "filetype", - { - noice_mode.get, - cond = noice_mode.has, - color = { fg = "#ff9e64" }, - }, - }, - lualine_z = { - { - "selectioncount", - cond = function() - local mode = vim.fn.mode() - return mode == "v" or mode == "V" or mode == "\22" - end, - }, - { - "location", - cond = function() - local mode = vim.fn.mode() - return mode ~= "v" and mode ~= "V" and mode ~= "\22" - end, - }, - }, - }, - }, - config = true, -} diff --git a/home/.config/nvim/lua/plugins/luasnip.lua b/home/.config/nvim/lua/plugins/luasnip.lua deleted file mode 100644 index 1364a570..00000000 --- a/home/.config/nvim/lua/plugins/luasnip.lua +++ /dev/null @@ -1,19 +0,0 @@ --- Snippets plugin ---- @type LazyPluginSpec -return { - "L3MON4D3/LuaSnip", - -- Snippets collection - dependencies = { "rafamadriz/friendly-snippets" }, - config = function() - local vsCodeLoader = require("luasnip/loaders/from_vscode") - - -- Load friendly-snippets - vsCodeLoader.lazy_load() - - -- Load my custom snippets - vsCodeLoader.lazy_load({ - paths = { "./snippets" }, - }) - end, - run = "make install_jsregexp", -} diff --git a/home/.config/nvim/lua/plugins/markdown-preview.lua b/home/.config/nvim/lua/plugins/markdown-preview.lua deleted file mode 100644 index 731496ab..00000000 --- a/home/.config/nvim/lua/plugins/markdown-preview.lua +++ /dev/null @@ -1,10 +0,0 @@ --- Markdown preview ---- @type LazyPluginSpec -return { - "iamcco/markdown-preview.nvim", - build = "cd app && yarn install", - config = function() - vim.g.mkdp_filetypes = { "markdown" } - end, - ft = { "markdown" }, -} diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua deleted file mode 100644 index b357e5d4..00000000 --- a/home/.config/nvim/lua/plugins/mason.lua +++ /dev/null @@ -1,60 +0,0 @@ --- Package manager for LSP servers, DAP adapters etc. --- It also handles starting all of my LSP servers ---- @type LazyPluginSpec -return { - "williamboman/mason.nvim", - dependencies = { - "neovim/nvim-lspconfig", - "williamboman/mason-lspconfig.nvim", - -- Add MasonUpdateAll - { "Zeioth/mason-extra-cmds", opts = {} }, - -- Add lockfile support - { - "zapling/mason-lock.nvim", - opts = { - lockfile_path = vim.fn.expand("~/git/dotfiles/home/.config/nvim/mason-lock.json"), - }, - }, - -- Extended functionality for jdtls - "mfussenegger/nvim-jdtls", - -- Add support for LSP file operations - { "antosha417/nvim-lsp-file-operations", opts = {} }, - }, - config = function() - require("mason").setup() - - local mlspc = require("mason-lspconfig") - local lsp_utils = require("lsp_utils") - - local commonLspConfigArgs = { - on_attach = lsp_utils.map_keys, - capabilities = lsp_utils.get_capabilities(), - } - - mlspc.setup() - mlspc.setup_handlers({ - -- Default handler - function(server_name) - require("lspconfig")[server_name].setup(commonLspConfigArgs) - end, - - -- Disable tsserver diagnostics diagnostics - -- that come from ESLint - ["tsserver"] = function() - require("lspconfig").tsserver.setup(vim.tbl_extend("force", commonLspConfigArgs, { - settings = { - diagnostics = { - ignoredCodes = { - 6133, -- Unused variable - 6192, -- Unused import - }, - }, - }, - })) - end, - - -- Don't set up jdtls, it is set up by nvim-jdtls - ["jdtls"] = function() end, - }) - end, -} diff --git a/home/.config/nvim/lua/plugins/mini.lua b/home/.config/nvim/lua/plugins/mini.lua deleted file mode 100644 index 1c2c25a9..00000000 --- a/home/.config/nvim/lua/plugins/mini.lua +++ /dev/null @@ -1,12 +0,0 @@ --- Library of 30+ independent Lua modules improving overall Neovim ---- @type LazyPluginSpec -return { - "echasnovski/mini.nvim", - config = function() - require("mini.surround").setup() - require("mini.comment").setup() - - -- Recommended for which-key - require("mini.icons").setup() - end, -} diff --git a/home/.config/nvim/lua/plugins/neoformat.lua b/home/.config/nvim/lua/plugins/neoformat.lua deleted file mode 100644 index 1bdc479a..00000000 --- a/home/.config/nvim/lua/plugins/neoformat.lua +++ /dev/null @@ -1,12 +0,0 @@ --- Formatter plugin ---- @type LazyPluginSpec -return { - "sbdchd/neoformat", - keys = { - { - desc = "Format with Neoformat", - "f", - "Neoformat", - }, - }, -} diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua deleted file mode 100644 index 1de8aae2..00000000 --- a/home/.config/nvim/lua/plugins/noice.lua +++ /dev/null @@ -1,30 +0,0 @@ --- Replace much of neovim's default UI --- with a modern replacement ---- @type LazyPluginSpec -return { - "folke/noice.nvim", - event = "VeryLazy", - dependencies = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify" }, - --- @type NoiceConfig - opts = { - lsp = { - -- override markdown rendering so that **cmp** and other plugins use **Treesitter** - override = { - ["vim.lsp.util.convert_input_to_markdown_lines"] = true, - ["vim.lsp.util.stylize_markdown"] = true, - ["cmp.entry.get_documentation"] = true, - }, - }, - presets = { - -- add a border to hover docs and signature help - lsp_doc_border = true, - }, - }, - keys = { - { - desc = "Dismiss notifications", - "d", - "NoiceDismiss", - }, - }, -} diff --git a/home/.config/nvim/lua/plugins/nvim-colorizer.lua b/home/.config/nvim/lua/plugins/nvim-colorizer.lua deleted file mode 100644 index ce3131d5..00000000 --- a/home/.config/nvim/lua/plugins/nvim-colorizer.lua +++ /dev/null @@ -1,6 +0,0 @@ --- High performance color highlighter ---- @type LazyPluginSpec -return { - "norcalli/nvim-colorizer.lua", - config = true, -} diff --git a/home/.config/nvim/lua/plugins/nvim-dap.lua b/home/.config/nvim/lua/plugins/nvim-dap.lua deleted file mode 100644 index 7eb63a51..00000000 --- a/home/.config/nvim/lua/plugins/nvim-dap.lua +++ /dev/null @@ -1,123 +0,0 @@ --- Debug adapter for NeoVim - -local masonPkg = vim.fn.stdpath("data") .. "/mason/packages" ---- @type LazyPluginSpec -return { - "mfussenegger/nvim-dap", - dependencies = { - { - "rcarriga/nvim-dap-ui", - dependencies = { "nvim-neotest/nvim-nio" }, - config = true, - }, - }, - config = function() - local dap = require("dap") - local configurations = dap.configurations - local adapters = dap.adapters - local pick_process = require("dap.utils").pick_process - - -- Applies all given configurations to the given filetypes - --- @param filetypes string[] - --- @param configs Configuration[] - local function dapConfigure(filetypes, configs) - for _, ft in ipairs(filetypes) do - configurations[ft] = configs - end - end - - -- Bash/sh - local bashAdapter = masonPkg .. "/bash-debug-adapter" - local bashExtension = bashAdapter .. "/extension" - adapters.bashdb = { - type = "executable", - command = bashAdapter .. "/bash-debug-adapter", - name = "bashdb", - } - configurations.sh = { - name = "Debug with bashdb", - type = "bashdb", - request = "launch", - showDebugOutput = true, - trace = true, - pathBashdbLib = bashExtension .. "/bashdb_dir", - pathBashdb = bashExtension .. "/bashdb_dir/bashdb", - file = "${file}", - program = "${file}", - cwd = "${workspaceFolder}", - pathCat = "cat", - pathBash = "/bin/bash", - pathMkfifo = "mkfifo", - pathPkill = "pkill", - args = {}, - env = {}, - terminalKind = "integrated", - } - - -- JavaScript/TypeScript in Firefox/Chrome/Node - adapters.libreWolf = { - type = "executable", - command = "node", - args = { masonPkg .. "/firefox-debug-adapter/dist/adapter.bundle.js" }, - } - adapters["pwa-node"] = { - type = "server", - host = "localhost", - port = "${port}", - executable = { - command = "node", - args = { masonPkg .. "/js-debug-adapter/js-debug/src/dapDebugServer.js", "8123" }, - }, - } - - --- @type Configuration[] - local browserConfigs = { - { - name = "LibreWolf attach", - type = "libreWolf", - request = "attach", - url = "http://localhost:4000", - webRoot = "${workspaceFolder}", - }, - { - name = "Chrome attach", - type = "pwa-chrome", - request = "attach", - cwd = "${workspaceFolder}", - }, - } - - --- @type Configuration[] - local nodeConfigs = { - { - name = "Node attach", - type = "pwa-node", - request = "attach", - processId = pick_process, - cwd = "${workspaceFolder}", - }, - { - name = "Node launch", - type = "pwa-node", - request = "launch", - program = "${file}", - cwd = "${workspaceFolder}", - port = "8123", - }, - } - - dapConfigure({ "typescriptreact", "javascriptreact" }, browserConfigs) - dapConfigure({ "typescript", "javascript" }, vim.tbl_extend("force", browserConfigs, nodeConfigs)) - - -- Java - configurations.java = { - { - name = "Debug (Attach) - Remote", - type = "java", - request = "attach", - hostName = "127.0.0.1", - port = 9009, - }, - } - end, -} diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua deleted file mode 100644 index fb185398..00000000 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ /dev/null @@ -1,25 +0,0 @@ --- Tree explorer ---- @type LazyPluginSpec -return { - "kyazdani42/nvim-tree.lua", - dependencies = { "kyazdani42/nvim-web-devicons" }, - opts = { - diagnostics = { - enable = true, - show_on_dirs = true, - }, - renderer = { - highlight_git = true, - }, - update_focused_file = { - enable = true, - }, - }, - keys = { - { - desc = "Open/close nvim-tree", - "o", - "NvimTreeToggle", - }, - }, -} diff --git a/home/.config/nvim/lua/plugins/redact_pass.lua b/home/.config/nvim/lua/plugins/redact_pass.lua deleted file mode 100644 index 984de136..00000000 --- a/home/.config/nvim/lua/plugins/redact_pass.lua +++ /dev/null @@ -1,8 +0,0 @@ --- Make editing passwords safer ---- @type LazyPluginSpec -return { - "https://git.zx2c4.com/password-store", - config = function(plugin) - vim.opt.rtp:append(plugin.dir .. "contrib/vim/redact_pass.vim") - end, -} diff --git a/home/.config/nvim/lua/plugins/statuscol.lua b/home/.config/nvim/lua/plugins/statuscol.lua deleted file mode 100644 index c8890013..00000000 --- a/home/.config/nvim/lua/plugins/statuscol.lua +++ /dev/null @@ -1,16 +0,0 @@ --- Customize statuscolumn ---- @type LazyPluginSpec -return { - "luukvbaal/statuscol.nvim", - config = function() - local builtin = require("statuscol.builtin") - require("statuscol").setup({ - relculright = true, - segments = { - { text = { builtin.foldfunc }, click = "v:lua.ScFa" }, - { text = { "%s" }, click = "v:lua.ScSa" }, - { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" }, - }, - }) - end, -} diff --git a/home/.config/nvim/lua/plugins/suda.lua b/home/.config/nvim/lua/plugins/suda.lua deleted file mode 100644 index e02bd3ae..00000000 --- a/home/.config/nvim/lua/plugins/suda.lua +++ /dev/null @@ -1,3 +0,0 @@ --- Do stuff as sudo ---- @type LazyPluginSpec -return { "lambdalisue/suda.vim" } diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua deleted file mode 100644 index 0a8435a9..00000000 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ /dev/null @@ -1,107 +0,0 @@ ---- @type LazyPluginSpec -return { - "nvim-telescope/telescope.nvim", - dependencies = { - -- Internal dependency for telescope - "nvim-lua/plenary.nvim", - - -- Use fzf for fuzzy finder - { - "nvim-telescope/telescope-fzf-native.nvim", - build = "make", - }, - - -- Replace vim built in select with telescope - "nvim-telescope/telescope-ui-select.nvim", - - -- cd plugin for telescope - "zane-/cder.nvim", - - -- project plugin for telescope - "nvim-telescope/telescope-project.nvim", - }, - opts = { - -- Set layout to vertical - defaults = { - layout_strategy = "flex", - layout_config = { - flex = { - flip_columns = 200, - }, - }, - }, - pickers = { - find_files = { find_command = { "fd", "-Ht", "f" } }, - lsp_references = { show_line = false }, - live_grep = { - additional_args = function() - return { "--hidden" } - end, - }, - }, - extensions = { - cder = { - previewer_command = "eza " - .. "-a " - .. "--color=always " - .. "-T " - .. "--level=3 " - .. "--icons " - .. "--git-ignore " - .. "--long " - .. "--no-permissions " - .. "--no-user " - .. "--no-filesize " - .. "--git " - .. "--ignore-glob=.git", - dir_command = { "fd", "-Ht", "d", ".", os.getenv("HOME") }, - }, - }, - }, - keys = function() - local telescope = require("telescope") - local builtin = require("telescope.builtin") - local extensions = telescope.extensions - - return { - { - desc = "Open Telescope", - "t", - function() - builtin.builtin({ include_extensions = true }) - end, - }, - { - desc = "Change directories", - "cd", - extensions.cder.cder, - }, - { - desc = "Find files", - "", - builtin.find_files, - }, - { - desc = "Grep files", - "", - builtin.live_grep, - }, - { - desc = "Open a project", - "p", - extensions.project.project, - }, - } - end, - config = function(_, opts) - local telescope = require("telescope") - telescope.setup(opts) - - -- Load extensions - telescope.load_extension("fzf") - telescope.load_extension("ui-select") - telescope.load_extension("cder") - telescope.load_extension("project") - telescope.load_extension("notify") - end, -} diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua deleted file mode 100644 index 1c8d78c9..00000000 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ /dev/null @@ -1,153 +0,0 @@ -return { - -- Improved syntax highlighting, text objects and more - --- @type LazyPluginSpec - { - "nvim-treesitter/nvim-treesitter", - build = ":TSUpdate", - init = function() - require("nvim-treesitter.install").update({ - with_sync = true, - }) - end, - --- @type TSConfig - opts = { - highlight = { enable = true }, - indent = { enable = true }, - ensure_installed = { - "bash", - "css", - "diff", - "dockerfile", - "git_config", - "git_rebase", - "gitattributes", - "gitcommit", - "gitignore", - "html", - "http", - "java", - "javascript", - "jsdoc", - "json", - "json5", - "jsonc", - "latex", - "lua", - "luadoc", - "luap", - "make", - "markdown", - "markdown_inline", - "php", - "python", - "query", - "rasi", - "regex", - "rst", - "scss", - "toml", - "tsx", - "typescript", - "vim", - "vimdoc", - "yaml", - }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = "", - node_incremental = "", - scope_incremental = false, - node_decremental = "", - }, - }, - textobjects = { - move = { - enable = true, - goto_next_start = { ["]f"] = "@function.outer", ["]c"] = "@class.outer" }, - goto_next_end = { ["]F"] = "@function.outer", ["]C"] = "@class.outer" }, - goto_previous_start = { ["[f"] = "@function.outer", ["[c"] = "@class.outer" }, - goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer" }, - }, - select = { - enable = true, - lookahead = true, - keymaps = { - ["af"] = { - query = "@function.outer", - desc = "Select outer part of a function", - }, - ["if"] = { - query = "@function.inner", - desc = "Select inner part of a function", - }, - ["ac"] = { - query = "@class.outer", - desc = "Select outer part of a class", - }, - ["ic"] = { - query = "@class.inner", - desc = "Select inner part of a class", - }, - ["as"] = { - query = "@scope", - query_group = "locals", - desc = "Select language scope", - }, - }, - }, - }, - }, - --- @param opts TSConfig - config = function(_, opts) - if type(opts.ensure_installed) == "table" then - --- @type table - local added = {} - opts.ensure_installed = vim.tbl_filter(function(lang) - if added[lang] then - return false - end - added[lang] = true - return true - end, opts.ensure_installed) - end - require("nvim-treesitter.configs").setup(opts) - end, - dependencies = { - { - "nvim-treesitter/nvim-treesitter-textobjects", - config = function() - -- When in diff mode, we want to use the default - -- vim text objects c & C instead of the treesitter ones. - --- @type table - local move = require("nvim-treesitter.textobjects.move") - local configs = require("nvim-treesitter.configs") - for name, fn in pairs(move) do - if name:find("goto") == 1 then - move[name] = function(q, ...) - if vim.wo.diff then - --- @type table - local config = configs.get_module("textobjects.move")[name] - for key, query in pairs(config or {}) do - if q == query and key:find("[%]%[][cC]") then - vim.cmd("normal! " .. key) - return - end - end - end - return fn(q, ...) - end - end - end - end, - }, - }, - }, - - -- Automatically add closing tags for HTML and JSX - --- @type LazyPluginSpec - { - "windwp/nvim-ts-autotag", - config = true, - }, -} diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua deleted file mode 100644 index 9615f83c..00000000 --- a/home/.config/nvim/lua/plugins/ufo.lua +++ /dev/null @@ -1,28 +0,0 @@ --- Better folds ---- @type LazyPluginSpec -return { - "kevinhwang91/nvim-ufo", - dependencies = { "kevinhwang91/promise-async" }, - --- @type UfoConfig - opts = { - close_fold_kinds_for_ft = { - default = { "imports" }, - }, - }, - --- @param opts UfoConfig - config = function(_, opts) - local ufo = require("ufo") - ufo.setup(opts) - - -- Using ufo, we need to remap `zR` and `zM` - vim.keymap.set("n", "zR", ufo.openAllFolds) - vim.keymap.set("n", "zM", ufo.closeAllFolds) - - -- Fold settings - local o = vim.o - o.foldcolumn = "1" - o.foldlevel = 99 - o.foldlevelstart = 99 - o.foldenable = true - end, -} diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua deleted file mode 100644 index 481adc15..00000000 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ /dev/null @@ -1,20 +0,0 @@ --- Display possible keybinds ---- @type LazyPluginSpec -return { - "folke/which-key.nvim", - config = function() - require("which-key").add({ - { "", group = "Leader" }, - { "g", group = "Go to" }, - }) - end, - keys = { - { - "?", - function() - require("which-key").show({ global = false }) - end, - desc = "Buffer Local Keymaps (which-key)", - }, - }, -} diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua deleted file mode 100644 index a02c5de0..00000000 --- a/home/.config/nvim/lua/settings.lua +++ /dev/null @@ -1,53 +0,0 @@ -local o = vim.o -local g = vim.g -o.pumblend = 10 - --- Relative line numbers -o.number = true -o.relativenumber = true - --- True colors -o.termguicolors = true - --- Enable cursorline highlighting -o.cursorline = true - --- Floating window transparency -o.winblend = 10 - --- Set window title -o.title = true -o.titlestring = "NeoVim: " .. vim.fn.getcwd() - --- Diff settings -o.diffopt = "filler,internal,algorithm:histogram,indent-heuristic" - --- Allow switching buffers with unsaved changes -o.hidden = true - -o.guicursor = table.concat({ - "i:ver1", -- Vertical bar cursor in insert mode - "a:blinkon1", -- Blinking cursor in all modes -}, ",") - --- Enable global statusline -o.laststatus = 3 - --- Use suda by default -g.suda_smart_edit = 1 - --- Case insensitive search -o.ignorecase = true -o.smartcase = true - --- Set leader -g.mapleader = " " - --- Indentation settings -o.tabstop = 4 -o.softtabstop = -1 -o.expandtab = true -o.shiftwidth = 4 -o.smartindent = true - -o.showmode = false diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json deleted file mode 100644 index 18047f30..00000000 --- a/home/.config/nvim/mason-lock.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "bash-language-server": "5.4.0", - "css-lsp": "4.10.0", - "docker-compose-language-service": "0.2.0", - "dockerfile-language-server": "0.13.0", - "eslint-lsp": "4.10.0", - "google-java-format": "v1.23.0", - "html-lsp": "4.10.0", - "java-debug-adapter": "0.58.0", - "jdtls": "v1.38.0", - "json-lsp": "4.10.0", - "lemminx": "0.27.1", - "lua-language-server": "3.10.5", - "prettier": "3.3.3", - "prettierd": "0.25.3", - "stylua": "v0.20.0", - "taplo": "0.9.3", - "tree-sitter-cli": "v0.22.6", - "typescript-language-server": "4.3.3", - "yaml-language-server": "1.15.0" -} diff --git a/home/.config/nvim/snippets/java.json b/home/.config/nvim/snippets/java.json deleted file mode 100644 index 6ab73774..00000000 --- a/home/.config/nvim/snippets/java.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "queryListFromModel": { - "scope": "java", - "description": "Create a method to get a List from the database (Rossum JpaBaseDAO)", - "prefix": "queryListFromModel", - "body": [ - "public List<$1> $2($3) {", - " return queryFromModelObject()", - " .where((cb, root) -> $0)", - " .results();", - "}" - ] - } -} diff --git a/home/.config/nvim/snippets/package.json b/home/.config/nvim/snippets/package.json deleted file mode 100644 index 70b1949d..00000000 --- a/home/.config/nvim/snippets/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "functionalhacker-snippets", - "engines": { - "vscode": "^1.11.0" - }, - "contributes": { - "snippets": [ - { - "language": "java", - "path": "./java.json" - } - ] - } -} diff --git a/home/.config/pacman/makepkg.conf b/home/.config/pacman/makepkg.conf deleted file mode 100644 index 4cb42c50..00000000 --- a/home/.config/pacman/makepkg.conf +++ /dev/null @@ -1,54 +0,0 @@ -PACKAGER="Marko Korhonen " -DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u' - 'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' - 'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'rsync::/usr/bin/rsync --no-motd -z %u %o' - 'scp::/usr/bin/scp -C %u %o') - - -VCSCLIENTS=('bzr::bzr' - 'git::git' - 'hg::mercurial' - 'svn::subversion') - -CARCH="x86_64" -CHOST="x86_64-pc-linux-gnu" - -CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \ - -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \ - -fstack-clash-protection -fcf-protection \ - -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" -CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" -LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \ - -Wl,-z,pack-relative-relocs" -LTOFLAGS="-flto=auto" -RUSTFLAGS="-Cforce-frame-pointers=yes" -DEBUG_CFLAGS="-g" -DEBUG_CXXFLAGS="$DEBUG_CFLAGS" -DEBUG_RUSTFLAGS="-C debuginfo=2" - -BUILDENV=(!distcc color !ccache check !sign) - -OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug) - -INTEGRITY_CHECK=(md5) -STRIP_BINARIES="--strip-all" -STRIP_SHARED="--strip-unneeded" -STRIP_STATIC="--strip-debug" -MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) -DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) -PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) -DBGSRCDIR="/usr/src/debug" - - -COMPRESSGZ=(pigz -c -f -n) -COMPRESSBZ2=(bzip2 -c -f) -COMPRESSXZ=(xz -c -z - --threads=0) -COMPRESSZST=(zstd -c -z -q -) -COMPRESSLRZ=(lrzip -q) -COMPRESSLZO=(lzop -q) -COMPRESSZ=(compress -c -f) - -PKGEXT='.pkg.tar.zst' -SRCEXT='.src.tar.gz' diff --git a/home/.config/paru/paru.conf b/home/.config/paru/paru.conf deleted file mode 100644 index 98eeaf95..00000000 --- a/home/.config/paru/paru.conf +++ /dev/null @@ -1,6 +0,0 @@ -[options] -NewsOnUpgrade - -[bin] -Sudo = doas -Bat = /dev/null diff --git a/home/.config/pass-git-helper/git-pass-mapping.ini b/home/.config/pass-git-helper/git-pass-mapping.ini deleted file mode 100644 index aeb49ee9..00000000 --- a/home/.config/pass-git-helper/git-pass-mapping.ini +++ /dev/null @@ -1,9 +0,0 @@ -[DEFAULT] -username_extractor=regex_search -regex_username=^username: (.*)$ - -[git.rossum.fi*] -target=work/ldap.rossum.fi - -[git.korhonen.cc*] -target=git/git.korhonen.cc diff --git a/home/.config/plasma-workspace/env/wayland.sh b/home/.config/plasma-workspace/env/wayland.sh deleted file mode 100644 index 17afd060..00000000 --- a/home/.config/plasma-workspace/env/wayland.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -# Set environment variables for Sway - -# Firefox -export MOZ_ENABLE_WAYLAND=1 -export MOZ_USE_XINPUT2=1 -export MOZ_WEBRENDER=1 -export MOZ_DBUS_REMOTE=1 - -# Fix java on wayland -export _JAVA_AWT_WM_NONREPARENTING=1 -export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' - -# Enable wayland support on clutter -export CLUTTER_BACKEND=wayland diff --git a/home/.config/polybar/config b/home/.config/polybar/config deleted file mode 100644 index 9599adb1..00000000 --- a/home/.config/polybar/config +++ /dev/null @@ -1,263 +0,0 @@ -[colors] -background = ${xrdb:color0:#222} -foreground = ${xrdb:color7:#222} -foreground-alt = ${xrdb:color7:#222} -primary = ${xrdb:color1:#222} -secondary = ${xrdb:color2:#222} -alert = ${xrdb:color3:#222} - -[bar/top] -monitor= eDP -width = 100% -height = 35 -offset-x = 0 -offset-y = -1 -;bottom = true - -background = ${colors.background} -foreground = ${colors.foreground} - -underline-size = 2 -underline-color = #eee - -spacing = 1 -module-margin-left = 0 -module-margin-right = 0 - -font-0 = "SF Pro Display:style=regular:pixelsize=13;0" -font-1 = "Material Design Icons:style=Regular:pixelsize=13;1" - -modules-left = bspwm -modules-center = player-mpris-tail -modules-right = battery pulseaudio date - -tray-position = right -tray-padding = 2 -tray-background = ${xrdb:color0:#222} - -wm-restack = bspwm - -scroll-up = bspwm-desknext -scroll-down = bspwm-deskprev - -; MODULES - -[module/network] -type = internal/network -interface = wlp1s0 -format-connected = -ramp-signal-0 = 浪 -ramp-signal-1 = 冷 -ramp-signal-2 = 爛 -ramp-signal-3 = 嵐 -ramp-signal-4 = 襤 -ramp-signal-5 = 蠟 - -[module/bspwm] -type = internal/bspwm - -ws-icon-0 = web; -ws-icon-1 = term; -ws-icon-2 = chat;ﭕ -ws-icon-3 = mail; -ws-icon-4 = music; -ws-icon-default =  - -format = - -label-focused = %icon% -label-focused-background = #88000000 -label-focused-underline= #ddd -label-focused-padding = 4 - -label-occupied = %icon% -label-occupied-padding = 4 - -label-urgent = %icon% -label-urgent-padding = 4 - -label-empty = %icon% -label-empty-foreground = #44ffffff -label-empty-padding = 4 - -[module/xwindow] -type = internal/xwindow -label = %title:0:120:...% -label-padding = 4 - -[module/weather] -type = custom/script -exec = weather-bar -tail = true - -[module/date] -type = internal/date - -; Seconds to sleep between updates -interval = 1.0 - -; See "man date" for details on how to format the date string -; NOTE: if you want to use syntax tags here you need to use %%{...} -date = " %a %Y-%m-%d" - -; Optional time format -time = %H:%M - -; if `date-alt` or `time-alt` is defined, clicking -; the module will toggle between formats -date-alt = %A, %d %B %Y -time-alt = %H:%M:%S - -label = %date% %time% -format = 